diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8d0fbf3309f..ca278ff2576 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -31,6 +31,9 @@ updates:
     servo-media-related:
       patterns:
         - "servo-media*"
+    objc2-related:
+      patterns:
+        - "objc2*"
   ignore:
   # Ignore all stylo crates as their upgrades are coordinated via companion PRs.
   - dependency-name: selectors
diff --git a/.github/workflows/dispatch-workflow.yml b/.github/workflows/dispatch-workflow.yml
index c938b1acd39..2e4b8ef7076 100644
--- a/.github/workflows/dispatch-workflow.yml
+++ b/.github/workflows/dispatch-workflow.yml
@@ -8,12 +8,18 @@ on:
       profile:
         required: true
         type: string
+      build-args:
+        required: true
+        type: string
       wpt-args:
         required: true
         type: string
       wpt:
         required: true
         type: boolean
+      number-of-wpt-chunks:
+        required: true
+        type: number
       unit-tests:
         required: true
         type: boolean
@@ -32,6 +38,7 @@ jobs:
     secrets: inherit
     with:
       profile: ${{ inputs.profile }}
+      build-args: ${{ inputs.build-args }}
       unit-tests: ${{ inputs.unit-tests }}
       build-libservo: ${{ inputs.build-libservo }}
       bencher: ${{ inputs.bencher }}
@@ -43,6 +50,7 @@ jobs:
     secrets: inherit
     with:
       profile: ${{ inputs.profile }}
+      build-args: ${{ inputs.build-args }}
       wpt: ${{ inputs.wpt }}
       unit-tests: ${{ inputs.unit-tests }}
       build-libservo: ${{ inputs.build-libservo }}
@@ -56,7 +64,9 @@ jobs:
     secrets: inherit
     with:
       profile: ${{ inputs.profile }}
+      build-args: ${{ inputs.build-args }}
       wpt: ${{ inputs.wpt }}
+      number-of-wpt-chunks: ${{ inputs.number-of-wpt-chunks }}
       unit-tests: ${{ inputs.unit-tests }}
       build-libservo: ${{ inputs.build-libservo }}
       wpt-args: ${{ inputs.wpt-args }}
diff --git a/.github/workflows/linux-wpt.yml b/.github/workflows/linux-wpt.yml
index 03dce7456b2..e3425a39575 100644
--- a/.github/workflows/linux-wpt.yml
+++ b/.github/workflows/linux-wpt.yml
@@ -13,6 +13,10 @@ on:
         default: false
         required: false
         type: boolean
+      number-of-wpt-chunks:
+        default: 20
+        required: false
+        type: number
 
 env:
   RUST_BACKTRACE: 1
@@ -24,15 +28,25 @@ env:
   WPT_ALWAYS_SUCCEED_ARG: "${{ inputs.wpt-sync-from-upstream && '--always-succeed' || '' }}"
 
 jobs:
+  chunks:
+    name: Generate chunks array
+    runs-on: ubuntu-22.04
+    outputs:
+      chunks-array: ${{ steps.generate-chunks-array.outputs.result }}
+    steps:
+      - uses: actions/github-script@v7
+        id: generate-chunks-array
+        with:
+          script: |
+            return Array.from({length: ${{ inputs.number-of-wpt-chunks }}}, (_, i) => i + 1)
   linux-wpt:
     name: WPT
     runs-on: ubuntu-22.04
-    env:
-      max_chunk_id: 20
+    needs: chunks
     strategy:
       fail-fast: false
       matrix:
-        chunk_id: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
+        chunk_id: ${{ fromJson(needs.chunks.outputs.chunks-array) }}
     steps:
       - uses: actions/checkout@v4
         if: github.event_name != 'pull_request_target'
@@ -66,7 +80,7 @@ jobs:
           ./mach test-wpt \
             $WPT_ALWAYS_SUCCEED_ARG \
             --${{ inputs.profile }} --processes $(nproc) --timeout-multiplier 2 \
-            --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
+            --total-chunks ${{ inputs.number-of-wpt-chunks }} --this-chunk ${{ matrix.chunk_id }} \
             --log-raw wpt-full-logs/linux/raw/${{ matrix.chunk_id }}.log \
             --log-wptreport wpt-full-logs/linux/wptreport/${{ matrix.chunk_id }}.json \
             --log-raw-unexpected wpt-filtered-logs/linux/${{ matrix.chunk_id }}.log \
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index b8914a2e810..b47f1906160 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -6,6 +6,10 @@ on:
         required: false
         default: "release"
         type: string
+      build-args:
+        default: ""
+        required: false
+        type: string
       wpt-args:
         default: ""
         required: false
@@ -17,6 +21,10 @@ on:
       wpt:
         required: false
         type: boolean
+      number-of-wpt-chunks:
+        default: 20
+        required: false
+        type: number
       unit-tests:
         required: false
         default: false
@@ -58,6 +66,10 @@ on:
       wpt:
         required: false
         type: boolean
+      number-of-wpt-chunks:
+        default: 20
+        required: false
+        type: number
       unit-tests:
         required: false
         default: false
@@ -90,10 +102,10 @@ jobs:
     uses: ./.github/workflows/self-hosted-runner-select.yml
     secrets: inherit
     with:
-      # Ubuntu 22.04 has glibc 2.34 so the binaries produced
-      # won't run on systems with older glibc e.g wpt.fyi
-      # runners which still use 20.04.
-      github-hosted-runner-label: ubuntu-${{ inputs.upload && '20.04' || '22.04' }}
+      # Before updating the GH action runner image for the nightly job, ensure
+      # that the system has a glibc version that is compatible with the one
+      # used by the wpt.fyi runners.
+      github-hosted-runner-label: ubuntu-22.04
       self-hosted-image-name: servo-ubuntu2204
       force-github-hosted-runner: ${{ inputs.upload || inputs.force-github-hosted-runner }}
   runner-timeout:
@@ -138,16 +150,8 @@ jobs:
           tool-cache: false
           large-packages: false
           swap-storage: false
-      - name: Install LLVM and Clang
-        # Expliclity install Clang 14 on Ubuntu 20.04 used by the nightly job (#34713).
-        if: ${{ runner.environment != 'self-hosted' && inputs.upload }}
-        uses: KyleMayes/install-llvm-action@v2
-        with:
-          version: 14
-        # FIXME: It would be better to use the above step for regular Linux jobs
-        # and remove the following step, but currenty that is failing and needs investigation.
       - name: Set LIBCLANG_PATH env # needed for bindgen in mozangle
-        if: ${{ runner.environment != 'self-hosted' && !inputs.upload }} # not needed on ubuntu 20.04 used for nightly
+        if: ${{ runner.environment != 'self-hosted' }}
         run: echo "LIBCLANG_PATH=/usr/lib/llvm-14/lib" >> $GITHUB_ENV
       - name: Setup Python
         if: ${{ runner.environment != 'self-hosted' }}
@@ -166,7 +170,7 @@ jobs:
 
       - name: Build (${{ inputs.profile }})
         run: |
-          ./mach build --use-crown --locked --${{ inputs.profile }}
+          ./mach build --use-crown --locked --${{ inputs.profile }} ${{ inputs.build-args }}
           cp -r target/cargo-timings target/cargo-timings-linux
       - name: Smoketest
         run: xvfb-run ./mach smoketest --${{ inputs.profile  }}
@@ -223,6 +227,7 @@ jobs:
       wpt-args: ${{ inputs.wpt-args }}
       profile: ${{ inputs.profile }}
       wpt-sync-from-upstream: ${{ inputs.wpt-sync-from-upstream }}
+      number-of-wpt-chunks: ${{ inputs. number-of-wpt-chunks }}
     secrets: inherit
 
   bencher:
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index e27c0a54180..4c19def57d2 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -7,6 +7,10 @@ on:
         required: false
         default: "release"
         type: string
+      build-args:
+        default: ""
+        required: false
+        type: string
       wpt-args:
         default: ""
         required: false
@@ -146,7 +150,7 @@ jobs:
           brew install gnu-tar
       - name: Build (${{ inputs.profile }})
         run: |
-          ./mach build --use-crown --locked --${{ inputs.profile }}
+          ./mach build --use-crown --locked --${{ inputs.profile }}  ${{ inputs.build-args }}
           cp -r target/cargo-timings target/cargo-timings-macos
       - name: Smoketest
         uses: nick-fields/retry@v3
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c2bda1a7c2c..1d11033a326 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -56,6 +56,8 @@ jobs:
       unit-tests: ${{ matrix.unit_tests }}
       build-libservo: ${{ matrix.build_libservo }}
       wpt-args: ${{ matrix.wpt_args }}
+      build-args: ${{ matrix.build_args }}
+      number-of-wpt-chunks: ${{ matrix.number_of_wpt_chunks }}
       bencher: ${{ matrix.bencher }}
 
   build-result:
diff --git a/.github/workflows/ohos.yml b/.github/workflows/ohos.yml
index 8728d31865c..505186903b0 100644
--- a/.github/workflows/ohos.yml
+++ b/.github/workflows/ohos.yml
@@ -223,10 +223,8 @@ jobs:
           hdc shell snapshot_display -f /data/local/tmp/servo.jpeg
           hdc file recv /data/local/tmp/servo.jpeg  test_output/servo_hos_screenshot.jpeg
           hdc file recv /data/local/tmp/ohtrace.txt  test_output/servo.ftrace
-          # To limit the logsize we only save logs from servo. 
-          # Todo:  investigate giving servo a custom domain tag, so we can also log appspawn etc, 
-          # since another common error might be the dynamic loader failing to relocate libservoshell.so
-          hdc shell hilog --exit --pid=${servo_pid} > test_output/servo.log
+          # To limit the logsize we only save logs from servo.
+          hdc shell hilog --exit -D 0xE0C3 > test_output/servo.log
       # todo: Also benchmark some other websites....
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/try-label.yml b/.github/workflows/try-label.yml
index 5444b75a4bd..d4ce3f944f6 100644
--- a/.github/workflows/try-label.yml
+++ b/.github/workflows/try-label.yml
@@ -128,6 +128,8 @@ jobs:
       unit-tests: ${{ matrix.unit_tests }}
       build-libservo: ${{ matrix.build_libservo }}
       wpt-args: ${{ matrix.wpt_args }}
+      build-args: ${{ matrix.build_args }}
+      number-of-wpt-chunks: ${{ matrix.number_of_wpt_chunks }}
       bencher: ${{ matrix.bencher }}
 
   results:
diff --git a/.github/workflows/try.yml b/.github/workflows/try.yml
index 274ad7483ff..c3a49af8857 100644
--- a/.github/workflows/try.yml
+++ b/.github/workflows/try.yml
@@ -10,6 +10,10 @@ on:
         default: "release"
         type: choice
         options: ["release", "debug", "production"]
+      build-args:
+        default: ""
+        required: false
+        type: string
       wpt-args:
         default: ""
         required: false
@@ -79,6 +83,7 @@ jobs:
               // WPT-related overrides only affect Linux currently, as tests don't run by default on other platforms.
               configuration.matrix[0].wpt = Boolean(${{ inputs.wpt }});
               configuration.matrix[0].wpt_args = "${{ inputs.wpt-args }}" || "";
+              configuration.matrix[0].build_args = "${{ inputs.build-args }}" || "";
 
               let unit_tests = Boolean(${{ inputs.unit-tests }});
               let profile = '${{ inputs.profile }}';
@@ -107,7 +112,9 @@ jobs:
       profile: ${{ matrix.profile }}
       unit-tests: ${{ matrix.unit_tests }}
       build-libservo: ${{ matrix.build_libservo }}
+      build-args: ${{ matrix.build_args }}
       wpt-args: ${{ matrix.wpt_args }}
+      number-of-wpt-chunks: ${{ matrix.number_of_wpt_chunks }}
       bencher: ${{ matrix.bencher }}
 
   build-result:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 5cf1e50b853..93e1710e464 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -7,6 +7,10 @@ on:
         required: false
         default: "release"
         type: string
+      build-args:
+        default: ""
+        required: false
+        type: string
       unit-tests:
         required: false
         default: false
@@ -161,7 +165,7 @@ jobs:
 
       - name: Build (${{ inputs.profile }})
         run: |
-          .\mach build --use-crown --locked --${{ inputs.profile }}
+          .\mach build --use-crown --locked --${{ inputs.profile }} ${{ inputs.build-args }}
           cp C:\a\servo\servo\target\cargo-timings C:\a\servo\servo\target\cargo-timings-windows -Recurse
       - name: Copy resources
         if: ${{ runner.environment != 'self-hosted' }}
diff --git a/.gitignore b/.gitignore
index 73c2fce6cda..630eb63b9bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,9 @@ webrender-captures/
 Session.vim
 Sessionx.vim
 
+# Zed
+/.zed
+
 /unminified-js
 /unminified-css
 
diff --git a/Cargo.lock b/Cargo.lock
index 83a6eb2e358..363ca82cfb7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -249,9 +249,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "app_units"
@@ -282,6 +282,12 @@ dependencies = [
  "x11rb",
 ]
 
+[[package]]
+name = "arc-swap"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+
 [[package]]
 name = "arkui-sys"
 version = "0.2.4"
@@ -324,9 +330,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a194f9d963d8099596278594b3107448656ba73831c9d8c783e613ce86da64"
+checksum = "b37fc50485c4f3f736a4fb14199f6d5f5ba008d7f28fe710306c92780f004c07"
 dependencies = [
  "brotli",
  "flate2",
@@ -387,9 +393,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.12.6"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dabb68eb3a7aa08b46fddfd59a3d55c978243557a90ab804769f7e20e67d2b01"
+checksum = "93fcc8f365936c834db5514fc45aee5b1202d677e6b40e48468aaaa8183ca8c7"
 dependencies = [
  "aws-lc-sys",
  "zeroize",
@@ -397,9 +403,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.27.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77926887776171ced7d662120a75998e444d3750c951abfe07f90da130514b1f"
+checksum = "61b1d86e7705efe1be1b569bab41d4fa1e14e220b60a160f78de2db687add079"
 dependencies = [
  "bindgen 0.69.5",
  "cc",
@@ -436,9 +442,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.74"
+version = "0.3.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
 dependencies = [
  "addr2line",
  "cfg-if",
@@ -520,7 +526,7 @@ dependencies = [
  "bitflags 2.9.0",
  "cexpr",
  "clang-sys",
- "itertools 0.13.0",
+ "itertools 0.10.5",
  "proc-macro2",
  "quote",
  "regex",
@@ -595,7 +601,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
 dependencies = [
- "objc2",
+ "objc2 0.5.2",
 ]
 
 [[package]]
@@ -663,9 +669,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "7.0.0"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
+checksum = "9991eea70ea4f293524138648e41ee89b0b2b12ddef3b255effa43c8056e0e0d"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -674,9 +680,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "4.0.2"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74fa05ad7d803d413eb8380983b092cbbaf9a85f151b871360e7b00cd7060b37"
+checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -707,18 +713,18 @@ checksum = "28346c117b50270785fbc123bd6e4ecad20d0c6d5f43d081dc80a3abcc62be64"
 
 [[package]]
 name = "bytemuck"
-version = "1.22.0"
+version = "1.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540"
+checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.9.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ff22c2722516255d1823ce3cc4bc0b154dbc9364be5c905d6baa6eccbbc8774"
+checksum = "7ecc273b49b3205b83d648f0690daa588925572cc5063745bfe547fe7ec8e1a1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -778,17 +784,13 @@ name = "canvas"
 version = "0.0.1"
 dependencies = [
  "app_units",
- "bitflags 2.9.0",
- "byteorder",
  "canvas_traits",
+ "compositing_traits",
  "crossbeam-channel",
  "cssparser",
  "euclid",
- "fnv",
  "font-kit",
  "fonts",
- "glow",
- "half",
  "ipc-channel",
  "log",
  "lyon_geom",
@@ -798,14 +800,10 @@ dependencies = [
  "range",
  "raqote",
  "servo_arc",
+ "snapshot",
  "stylo",
- "surfman",
  "unicode-script",
- "webrender",
  "webrender_api",
- "webrender_traits",
- "webxr",
- "webxr-api",
 ]
 
 [[package]]
@@ -823,6 +821,7 @@ dependencies = [
  "serde_bytes",
  "servo_config",
  "servo_malloc_size_of",
+ "snapshot",
  "stylo",
  "webrender_api",
  "webxr-api",
@@ -845,9 +844,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.17"
+version = "1.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a"
+checksum = "32db95edf998450acc7881c932f94cd9b05c87b4b2599e8bab064753da4acfd1"
 dependencies = [
  "jobserver",
  "libc",
@@ -902,9 +901,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.40"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -965,18 +964,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.32"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
+checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.32"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
+checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -1038,10 +1037,11 @@ dependencies = [
 
 [[package]]
 name = "codespan-reporting"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
 dependencies = [
+ "serde",
  "termcolor",
  "unicode-width",
 ]
@@ -1083,6 +1083,7 @@ name = "compositing"
 version = "0.0.1"
 dependencies = [
  "base",
+ "bincode",
  "bitflags 2.9.0",
  "compositing_traits",
  "constellation_traits",
@@ -1099,6 +1100,7 @@ dependencies = [
  "pixels",
  "profile_traits",
  "script_traits",
+ "servo_allocator",
  "servo_config",
  "servo_geometry",
  "stylo_traits",
@@ -1106,8 +1108,8 @@ dependencies = [
  "tracing",
  "webrender",
  "webrender_api",
- "webrender_traits",
  "webxr",
+ "wr_malloc_size_of",
 ]
 
 [[package]]
@@ -1115,17 +1117,28 @@ name = "compositing_traits"
 version = "0.0.1"
 dependencies = [
  "base",
+ "bincode",
  "crossbeam-channel",
+ "dpi",
  "embedder_traits",
  "euclid",
+ "gleam",
+ "glow",
+ "image",
  "ipc-channel",
  "log",
+ "malloc_size_of_derive",
  "pixels",
- "script_traits",
+ "profile_traits",
+ "raw-window-handle",
+ "serde",
+ "servo_geometry",
+ "servo_malloc_size_of",
  "strum_macros",
+ "stylo",
  "stylo_traits",
+ "surfman",
  "webrender_api",
- "webrender_traits",
 ]
 
 [[package]]
@@ -1162,6 +1175,7 @@ dependencies = [
  "net",
  "net_traits",
  "parking_lot",
+ "profile",
  "profile_traits",
  "script_layout_interface",
  "script_traits",
@@ -1172,9 +1186,9 @@ dependencies = [
  "stylo_traits",
  "tracing",
  "webgpu",
+ "webgpu_traits",
  "webrender",
  "webrender_api",
- "webrender_traits",
  "webxr-api",
 ]
 
@@ -1184,23 +1198,32 @@ version = "0.0.1"
 dependencies = [
  "base",
  "bitflags 2.9.0",
+ "canvas_traits",
+ "devtools_traits",
  "embedder_traits",
  "euclid",
+ "http 1.3.1",
+ "hyper_serde",
  "ipc-channel",
+ "log",
  "malloc_size_of_derive",
+ "net_traits",
+ "profile_traits",
  "serde",
  "servo_malloc_size_of",
  "servo_url",
+ "strum",
  "strum_macros",
- "stylo_traits",
+ "uuid",
+ "webgpu_traits",
  "webrender_api",
+ "wgpu-core",
 ]
 
 [[package]]
 name = "content-security-policy"
 version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f33b8ed5a7a80fdf6b7b1946f0d804c08ba348d72725b09a58fe804c48b7354f"
+source = "git+https://github.com/servo/rust-content-security-policy/?branch=servo-csp#334bfcbf0a3f503b21c90aee6aee30d4b8c9558a"
 dependencies = [
  "base64 0.22.1",
  "bitflags 2.9.0",
@@ -1368,9 +1391,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.14"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1468,9 +1491,9 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
 
 [[package]]
 name = "darling"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -1478,23 +1501,22 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim",
  "syn",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core",
  "quote",
@@ -1503,9 +1525,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
 
 [[package]]
 name = "data-url"
@@ -1548,42 +1570,11 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "derive_builder"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
-dependencies = [
- "derive_builder_core",
- "syn",
-]
-
 [[package]]
 name = "derive_more"
-version = "0.99.19"
+version = "0.99.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da29a38df43d6f156149c9b43ded5e018ddff2a855cf2cfd62e8cd7d079c69f"
+checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1618,6 +1609,7 @@ version = "0.0.1"
 dependencies = [
  "base",
  "bitflags 2.9.0",
+ "embedder_traits",
  "http 1.3.1",
  "ipc-channel",
  "malloc_size_of_derive",
@@ -1722,6 +1714,16 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
+[[package]]
+name = "dispatch2"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
+dependencies = [
+ "bitflags 2.9.0",
+ "objc2 0.6.1",
+]
+
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -1776,9 +1778,9 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
 [[package]]
 name = "dpi"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
+checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
 [[package]]
 name = "dtoa"
@@ -1803,9 +1805,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
 [[package]]
 name = "dwrote"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70182709525a3632b2ba96b6569225467b18ecb4a77f46d255f713a6bebf05fd"
+checksum = "bfe1f192fcce01590bd8d839aca53ce0d11d803bf291b2a6c4ad925a8f0024be"
 dependencies = [
  "lazy_static",
  "libc",
@@ -1931,7 +1933,6 @@ dependencies = [
  "url",
  "webdriver",
  "webrender_api",
- "webxr-api",
 ]
 
 [[package]]
@@ -1983,9 +1984,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.7"
+version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697"
+checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2026,9 +2027,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -2036,9 +2037,9 @@ dependencies = [
 
 [[package]]
 name = "error-code"
-version = "3.3.1"
+version = "3.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
+checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
 
 [[package]]
 name = "etagere"
@@ -2123,9 +2124,9 @@ checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
 
 [[package]]
 name = "flate2"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
+checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -2183,6 +2184,7 @@ dependencies = [
  "base",
  "bitflags 2.9.0",
  "byteorder",
+ "compositing_traits",
  "core-foundation 0.9.4",
  "core-graphics",
  "core-text",
@@ -2194,7 +2196,7 @@ dependencies = [
  "freetype-sys",
  "harfbuzz-sys",
  "ipc-channel",
- "itertools 0.13.0",
+ "itertools 0.14.0",
  "libc",
  "log",
  "malloc_size_of_derive",
@@ -2202,6 +2204,7 @@ dependencies = [
  "net_traits",
  "num-traits",
  "parking_lot",
+ "profile_traits",
  "range",
  "serde",
  "servo_allocator",
@@ -2218,7 +2221,6 @@ dependencies = [
  "unicode-script",
  "url",
  "webrender_api",
- "webrender_traits",
  "xml-rs",
  "yeslogic-fontconfig-sys",
 ]
@@ -2236,7 +2238,7 @@ dependencies = [
 [[package]]
 name = "fontsan"
 version = "0.5.2"
-source = "git+https://github.com/servo/fontsan#8fbc406506cfd1f8ab60e625d1e926a0e72e1d8a"
+source = "git+https://github.com/servo/fontsan#c0d0b5333117901e1c31bc3c502c384115b93e6f"
 dependencies = [
  "cc",
  "glob",
@@ -2478,9 +2480,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
@@ -2522,9 +2524,9 @@ dependencies = [
 
 [[package]]
 name = "gilrs-core"
-version = "0.6.1"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed2326d21aa97752d41b2c195aee1d99cd84456ff4d5a7f5e6e1cdbd3dcb0b8"
+checksum = "a6d95ae10ce5aa99543a28cf74e41c11f3b9e3c14f0452bbde46024753cd683e"
 dependencies = [
  "core-foundation 0.10.0",
  "inotify",
@@ -2549,9 +2551,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "gio-sys"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "160eb5250a26998c3e1b54e6a3d4ea15c6c7762a6062a19a7b63eff6e2b33f9e"
+checksum = "521e93a7e56fc89e84aea9a52cfc9436816a4b363b030260b699950ff1336c83"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -2560,19 +2562,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "git2"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
-dependencies = [
- "bitflags 2.9.0",
- "libc",
- "libgit2-sys",
- "log",
- "url",
-]
-
 [[package]]
 name = "gl_generator"
 version = "0.14.0"
@@ -2595,9 +2584,9 @@ dependencies = [
 
 [[package]]
 name = "glib"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707b819af8059ee5395a2de9f2317d87a53dbad8846a2f089f0bb44703f37686"
+checksum = "c501c495842c2b23cdacead803a5a343ca2a5d7a7ddaff14cc5f6cf22cfb92c2"
 dependencies = [
  "bitflags 2.9.0",
  "futures-channel",
@@ -2616,9 +2605,9 @@ dependencies = [
 
 [[package]]
 name = "glib-macros"
-version = "0.20.7"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715601f8f02e71baef9c1f94a657a9a77c192aea6097cf9ae7e5e177cd8cde68"
+checksum = "ebe6dc9ce29887c4b3b74d78d5ba473db160a258ae7ed883d23632ac7fed7bc9"
 dependencies = [
  "heck",
  "proc-macro-crate",
@@ -2629,9 +2618,9 @@ dependencies = [
 
 [[package]]
 name = "glib-sys"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8928869a44cfdd1fccb17d6746e4ff82c8f82e41ce705aa026a52ca8dc3aefb"
+checksum = "8ab79e1ed126803a8fb827e3de0e2ff95191912b8db65cee467edb56fc4cc215"
 dependencies = [
  "libc",
  "system-deps",
@@ -2675,9 +2664,9 @@ dependencies = [
 
 [[package]]
 name = "gobject-sys"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c773a3cb38a419ad9c26c81d177d96b4b08980e8bdbbf32dace883e96e96e7e3"
+checksum = "ec9aca94bb73989e3cfdbf8f2e0f1f6da04db4d291c431f444838925c4c63eda"
 dependencies = [
  "glib-sys",
  "libc",
@@ -2723,7 +2712,7 @@ checksum = "dcf29e94d6d243368b7a56caa16bc213e4f9f8ed38c4d9557069527b5d5281ca"
 dependencies = [
  "bitflags 2.9.0",
  "gpu-descriptor-types",
- "hashbrown 0.15.2",
+ "hashbrown",
 ]
 
 [[package]]
@@ -2743,9 +2732,9 @@ checksum = "36119f3a540b086b4e436bb2b588cf98a68863470e0e880f4d0842f112a3183a"
 
 [[package]]
 name = "gstreamer"
-version = "0.23.5"
+version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2188fe829b0ebe12e4cf2bbcf6658470a936269daba7afae92847a2af32c9105"
+checksum = "50ab4c88f731596a2511a6f14cabdd666e0d8efab62a1d58e6ddb57faa96e22e"
 dependencies = [
  "cfg-if",
  "futures-channel",
@@ -2753,7 +2742,7 @@ dependencies = [
  "futures-util",
  "glib",
  "gstreamer-sys",
- "itertools 0.13.0",
+ "itertools 0.14.0",
  "libc",
  "muldiv",
  "num-integer",
@@ -2796,9 +2785,9 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-audio"
-version = "0.23.5"
+version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49118ca684e2fc42207509fcac8497d91079c2ffe8ff2b4ae99e71dbafef1ede"
+checksum = "2e7ec7e0374298897e669db7c79544bc44df12011985e7dd5f38644edaf2caf4"
 dependencies = [
  "cfg-if",
  "glib",
@@ -2812,9 +2801,9 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-audio-sys"
-version = "0.23.5"
+version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d469526ecf30811b50a6460fd285ee40d189c46048b3d0c69b67a04b414fb51"
+checksum = "2b5f3e09e7c04ec91d78c2a6ca78d50b574b9ed49fdf5e72f3693adca4306a87"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -2826,9 +2815,9 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-base"
-version = "0.23.5"
+version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad33dd444db0d215ac363164f900f800ffb93361ad8a60840e95e14b7de985e8"
+checksum = "f19a74fd04ffdcb847dd322640f2cf520897129d00a7bcb92fd62a63f3e27404"
 dependencies = [
  "atomic_refcell",
  "cfg-if",
@@ -2840,9 +2829,9 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-base-sys"
-version = "0.23.5"
+version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "114b2a704f19a70f20c54b00e54f5d5376bbf78bd2791e6beb0776c997d8bf24"
+checksum = "87f2fb0037b6d3c5b51f60dea11e667910f33be222308ca5a101450018a09840"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -2853,9 +2842,9 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-gl"
-version = "0.23.5"
+version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02818bd81028abc4ee7b0106c21625be9a2f86ba5fd41ccff58359537637db59"
+checksum = "34aa19feafc4da2c7635abce0e0768892ff97ad73586bef02d9a60b251d9fe09"
 dependencies = [
  "glib",
  "gstreamer",
@@ -2868,9 +2857,9 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-gl-egl"
-version = "0.23.5"
+version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc5fad98961d18ed5dba4be44787d4735b78a1f53b7db392be004b96f1f2430b"
+checksum = "8de1f4247cf2d009b41ab5efb03e4d826b7ccaafb9a75d3ea10e68e46f65e8aa"
 dependencies = [
  "glib",
  "gstreamer",
@@ -2881,9 +2870,9 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-gl-egl-sys"
-version = "0.23.5"
+version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7ebdc94dc34e2b135b2610676b47d30ce88b80862f01e2acf7e29b9b42a14e4"
+checksum = "dda4d852ed107cc48692af4e109e5e4775b6ce1044d13df79f6f431c195096d7"
 dependencies = [
  "glib-sys",
  "gstreamer-gl-sys",
@@ -2893,9 +2882,9 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-gl-sys"
-version = "0.23.5"
+version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2984f8c246407fabbecf852c4595dd1487f4cc495386e17ad31acb69db7d39"
+checksum = "a832c21d4522ed5e1b8dfc676a45361969216b144fc03af413a38c471f38bcf7"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -2983,9 +2972,9 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-sys"
-version = "0.23.5"
+version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe159238834058725808cf6604a7c5d9e4a50e1eacd7b0c63bce2fe3a067dbd1"
+checksum = "feea73b4d92dbf9c24a203c9cd0bcc740d584f6b5960d5faf359febf288919b2"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -2995,9 +2984,9 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-video"
-version = "0.23.5"
+version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad242d388b63c91652c8157de3b0c1f709e49c941a0aae1952455f6ee326ca2d"
+checksum = "1318b599d77ca4f7702ecbdeac1672d6304cb16b7e5752fabb3ee8260449a666"
 dependencies = [
  "cfg-if",
  "futures-channel",
@@ -3012,9 +3001,9 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-video-sys"
-version = "0.23.5"
+version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "465ff496889fb38be47f5e821163c2e83414d87c4aa55f5aae62dc7200971d4d"
+checksum = "0a70f0947f12d253b9de9bc3fd92f981e4d025336c18389c7f08cdf388a99f5c"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -3090,12 +3079,13 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7db2ff139bba50379da6aa0766b52fdcb62cb5b263009b09ed58ba604e14bbd1"
+checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
 dependencies = [
  "cfg-if",
  "crunchy",
+ "num-traits",
 ]
 
 [[package]]
@@ -3115,21 +3105,12 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash",
- "serde",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 dependencies = [
  "foldhash",
+ "serde",
 ]
 
 [[package]]
@@ -3218,10 +3199,11 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
 [[package]]
 name = "hilog"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e862eccf1f9bf3ec24a45b65f1369b2dfe053f9066c591623e0b1e58937178d"
+checksum = "ae00913bdb22425089eab7ff3307019717b5f948172c0cf8cceac49ada086ce4"
 dependencies = [
+ "arc-swap",
  "env_filter",
  "hilog-sys",
  "log",
@@ -3262,9 +3244,9 @@ dependencies = [
 
 [[package]]
 name = "html5ever"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5bf3413d61499f71fe4f627bbecfbec2977ce280525701df788f47370b0c507"
+checksum = "953cbbe631aae7fc0a112702ad5d3aaf09da38beaf45ea84610d6e1c358f569c"
 dependencies = [
  "log",
  "mac",
@@ -3406,9 +3388,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -3416,6 +3398,7 @@ dependencies = [
  "http 1.3.1",
  "http-body 1.0.1",
  "hyper 1.6.0",
+ "libc",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -3439,9 +3422,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.62"
+version = "0.1.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2fd658b06e56721792c5df4475705b6cda790e9298d19d2f8af083457bcd127"
+checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -3449,7 +3432,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core 0.52.0",
+ "windows-core 0.58.0",
 ]
 
 [[package]]
@@ -3480,9 +3463,9 @@ dependencies = [
 
 [[package]]
 name = "icu_calendar_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e009b7f0151ee6fb28c40b1283594397e0b7183820793e9ace3dcd13db126d0"
+checksum = "820499e77e852162190608b4f444e7b4552619150eafc39a9e39333d9efae9e1"
 
 [[package]]
 name = "icu_capi"
@@ -3535,9 +3518,9 @@ dependencies = [
 
 [[package]]
 name = "icu_casemap_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d57966d5ab748f74513be4046867f9a20e801e2775d41f91d04a0f560b61f08"
+checksum = "02bd9f6276270c85a5cd54611adbbf94e993ec464a2a86a452a6c565b7ded5d9"
 
 [[package]]
 name = "icu_collator"
@@ -3560,9 +3543,9 @@ dependencies = [
 
 [[package]]
 name = "icu_collator_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee3f88741364b7d6269cce6827a3e6a8a2cf408a78f766c9224ab479d5e4ae5"
+checksum = "7b353986d77d28991eca4dea5ef2b8982f639342ae19ca81edc44f048bc38ebb"
 
 [[package]]
 name = "icu_collections"
@@ -3601,9 +3584,9 @@ dependencies = [
 
 [[package]]
 name = "icu_datetime_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ba7e7f7a01269b9afb0a39eff4f8676f693b55f509b3120e43a0350a9f88bea"
+checksum = "bef5f04076123cab1b7a926a7083db27fe0d7a0e575adb984854aae3f3a6507d"
 
 [[package]]
 name = "icu_decimal"
@@ -3621,9 +3604,9 @@ dependencies = [
 
 [[package]]
 name = "icu_decimal_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d424c994071c6f5644f999925fc868c85fec82295326e75ad5017bc94b41523"
+checksum = "67c95dd97f5ccf6d837a9c115496ec7d36646fa86ca18e7f1412115b4c820ae2"
 
 [[package]]
 name = "icu_experimental"
@@ -3657,9 +3640,9 @@ dependencies = [
 
 [[package]]
 name = "icu_experimental_data"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c178b9a34083fca5bd70d61f647575335e9c197d0f30c38e8ccd187babc69d0"
+checksum = "121df92eafb8f5286d4e8ff401c1e7db8384377f806db3f8db77b91e5b7bd4dd"
 
 [[package]]
 name = "icu_list"
@@ -3677,9 +3660,9 @@ dependencies = [
 
 [[package]]
 name = "icu_list_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1825170d2c6679cb20dbd96a589d034e49f698aed9a2ef4fafc9a0101ed298f"
+checksum = "52b1a7fbdbf3958f1be8354cb59ac73f165b7b7082d447ff2090355c9a069120"
 
 [[package]]
 name = "icu_locid"
@@ -3710,9 +3693,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locid_transform_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d"
 
 [[package]]
 name = "icu_normalizer"
@@ -3734,9 +3717,9 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7"
 
 [[package]]
 name = "icu_pattern"
@@ -3767,9 +3750,9 @@ dependencies = [
 
 [[package]]
 name = "icu_plurals_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3e8f775b215d45838814a090a2227247a7431d74e9156407d9c37f6ef0f208"
+checksum = "a483403238cb7d6a876a77a5f8191780336d80fe7b8b00bfdeb20be6abbfd112"
 
 [[package]]
 name = "icu_properties"
@@ -3789,9 +3772,9 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2"
 
 [[package]]
 name = "icu_provider"
@@ -3853,9 +3836,9 @@ dependencies = [
 
 [[package]]
 name = "icu_segmenter_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f739ee737260d955e330bc83fdeaaf1631f7fb7ed218761d3c04bb13bb7d79df"
+checksum = "a1e52775179941363cc594e49ce99284d13d6948928d8e72c755f55e98caa1eb"
 
 [[package]]
 name = "icu_timezone"
@@ -3874,9 +3857,9 @@ dependencies = [
 
 [[package]]
 name = "icu_timezone_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c588878c508a3e2ace333b3c50296053e6483c6a7541251b546cc59dcd6ced8e"
+checksum = "1adcf7b613a268af025bc2a2532b4b9ee294e6051c5c0832d8bff20ac0232e68"
 
 [[package]]
 name = "ident_case"
@@ -3931,12 +3914,12 @@ checksum = "76a49eaebc8750bcba241df1e1e47ebb51b81eb35c65e8f11ffa0aebac353f7f"
 
 [[package]]
 name = "indexmap"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
+ "hashbrown",
 ]
 
 [[package]]
@@ -4038,9 +4021,9 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
 dependencies = [
  "either",
 ]
@@ -4053,9 +4036,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jiff"
-version = "0.2.5"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c102670231191d07d37a35af3eb77f1f0dbf7a71be51a962dcd57ea607be7260"
+checksum = "f02000660d30638906021176af16b17498bd0d12813dbfe7b276d8bc7f3c0806"
 dependencies = [
  "jiff-static",
  "log",
@@ -4066,9 +4049,9 @@ dependencies = [
 
 [[package]]
 name = "jiff-static"
-version = "0.2.5"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cdde31a9d349f1b1f51a0b3714a5940ac022976f4b49485fc04be052b183b4c"
+checksum = "f3c30758ddd7188629c6713fc45d1188af4f44c90582311d0c8d8c9907f60c48"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4163,7 +4146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
 [[package]]
-name = "layout_2020"
+name = "layout"
 version = "0.0.1"
 dependencies = [
  "app_units",
@@ -4171,6 +4154,8 @@ dependencies = [
  "base",
  "bitflags 2.9.0",
  "canvas_traits",
+ "compositing_traits",
+ "constellation_traits",
  "data-url",
  "embedder_traits",
  "euclid",
@@ -4182,21 +4167,28 @@ dependencies = [
  "icu_locid",
  "icu_segmenter",
  "ipc-channel",
- "itertools 0.13.0",
+ "itertools 0.14.0",
  "log",
+ "malloc_size_of_derive",
  "net_traits",
+ "num-traits",
  "parking_lot",
  "pixels",
+ "profile_traits",
  "quickcheck",
  "range",
  "rayon",
+ "script",
  "script_layout_interface",
+ "script_traits",
  "selectors",
  "servo_arc",
  "servo_config",
  "servo_geometry",
+ "servo_malloc_size_of",
  "servo_url",
  "stylo",
+ "stylo_atoms",
  "stylo_traits",
  "taffy",
  "tracing",
@@ -4204,47 +4196,9 @@ dependencies = [
  "unicode-script",
  "url",
  "webrender_api",
- "webrender_traits",
  "xi-unicode",
 ]
 
-[[package]]
-name = "layout_thread_2020"
-version = "0.0.1"
-dependencies = [
- "app_units",
- "base",
- "constellation_traits",
- "embedder_traits",
- "euclid",
- "fnv",
- "fonts",
- "fonts_traits",
- "fxhash",
- "ipc-channel",
- "layout_2020",
- "log",
- "metrics",
- "net_traits",
- "parking_lot",
- "profile_traits",
- "script",
- "script_layout_interface",
- "script_traits",
- "servo_allocator",
- "servo_arc",
- "servo_config",
- "servo_malloc_size_of",
- "servo_url",
- "stylo",
- "stylo_atoms",
- "stylo_traits",
- "tracing",
- "url",
- "webrender_api",
- "webrender_traits",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -4280,9 +4234,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "libdbus-sys"
@@ -4293,33 +4247,21 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "libgit2-sys"
-version = "0.18.1+1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1dcb20f84ffcdd825c7a311ae347cce604a6f084a767dec4a4929829645290e"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "pkg-config",
-]
-
 [[package]]
 name = "libloading"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "libm"
-version = "0.2.11"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
 [[package]]
 name = "libredox"
@@ -4336,6 +4278,7 @@ dependencies = [
 name = "libservo"
 version = "0.0.1"
 dependencies = [
+ "anyhow",
  "arboard",
  "background_hang_monitor",
  "base",
@@ -4354,7 +4297,7 @@ dependencies = [
  "devtools_traits",
  "dpi",
  "embedder_traits",
- "env_logger 0.11.7",
+ "env_logger 0.11.8",
  "euclid",
  "fonts",
  "gaol",
@@ -4363,7 +4306,7 @@ dependencies = [
  "http 1.3.1",
  "ipc-channel",
  "keyboard-types",
- "layout_thread_2020",
+ "layout",
  "libservo",
  "log",
  "media",
@@ -4382,6 +4325,8 @@ dependencies = [
  "servo-media",
  "servo-media-dummy",
  "servo-media-gstreamer",
+ "servo-tracing",
+ "servo_allocator",
  "servo_config",
  "servo_geometry",
  "servo_url",
@@ -4391,10 +4336,10 @@ dependencies = [
  "tracing",
  "url",
  "webdriver_server",
+ "webgl",
  "webgpu",
  "webrender",
  "webrender_api",
- "webrender_traits",
  "webxr",
  "webxr-api",
  "winit",
@@ -4512,16 +4457,13 @@ dependencies = [
 
 [[package]]
 name = "markup5ever"
-version = "0.15.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a7b81dfb91586d0677086d40a6d755070e0799b71bb897485bac408dfd5c69"
+checksum = "d0a8096766c229e8c88a3900c9b44b7e06aa7f7343cc229158c3e58ef8f9973a"
 dependencies = [
  "log",
- "phf",
- "phf_codegen",
- "string_cache",
- "string_cache_codegen",
  "tendril",
+ "web_atoms",
 ]
 
 [[package]]
@@ -4554,6 +4496,7 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 name = "media"
 version = "0.0.1"
 dependencies = [
+ "compositing_traits",
  "euclid",
  "fnv",
  "ipc-channel",
@@ -4562,7 +4505,6 @@ dependencies = [
  "servo-media",
  "servo_config",
  "webrender_api",
- "webrender_traits",
 ]
 
 [[package]]
@@ -4623,6 +4565,7 @@ name = "metrics"
 version = "0.0.1"
 dependencies = [
  "base",
+ "constellation_traits",
  "ipc-channel",
  "log",
  "malloc_size_of_derive",
@@ -4667,9 +4610,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.5"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
+checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
 dependencies = [
  "adler2",
  "simd-adler32",
@@ -4703,7 +4646,7 @@ dependencies = [
 [[package]]
 name = "mozjs"
 version = "0.14.1"
-source = "git+https://github.com/servo/mozjs#39db84352d79ffa3e4fe756c8034af9def788f22"
+source = "git+https://github.com/servo/mozjs#728acdf3d4ce0604e9f75dd1d539dc6f291ccec7"
 dependencies = [
  "bindgen 0.71.1",
  "cc",
@@ -4714,8 +4657,8 @@ dependencies = [
 
 [[package]]
 name = "mozjs_sys"
-version = "0.128.9-0"
-source = "git+https://github.com/servo/mozjs#39db84352d79ffa3e4fe756c8034af9def788f22"
+version = "0.128.9-2"
+source = "git+https://github.com/servo/mozjs#728acdf3d4ce0604e9f75dd1d539dc6f291ccec7"
 dependencies = [
  "bindgen 0.71.1",
  "cc",
@@ -4737,22 +4680,25 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
 
 [[package]]
 name = "naga"
-version = "24.0.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=2f255edc60e9669c8c737464c59af10d59a31126#2f255edc60e9669c8c737464c59af10d59a31126"
+version = "25.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b977c445f26e49757f9aca3631c3b8b836942cb278d69a92e7b80d3b24da632"
 dependencies = [
  "arrayvec",
  "bit-set",
  "bitflags 2.9.0",
  "cfg_aliases",
  "codespan-reporting",
- "hashbrown 0.14.5",
+ "half",
+ "hashbrown",
  "hexf-parse",
  "indexmap",
  "log",
+ "num-traits",
+ "once_cell",
  "rustc-hash 1.1.0",
  "spirv",
  "strum",
- "termcolor",
  "thiserror 2.0.9",
  "unicode-ident",
 ]
@@ -4854,6 +4800,7 @@ dependencies = [
  "base64 0.22.1",
  "bytes",
  "chrono",
+ "compositing_traits",
  "content-security-policy",
  "cookie 0.18.1",
  "crossbeam-channel",
@@ -4874,6 +4821,7 @@ dependencies = [
  "hyper_serde",
  "imsz",
  "ipc-channel",
+ "itertools 0.14.0",
  "log",
  "malloc_size_of_derive",
  "mime",
@@ -4904,7 +4852,6 @@ dependencies = [
  "uuid",
  "webpki-roots",
  "webrender_api",
- "webrender_traits",
 ]
 
 [[package]]
@@ -4912,6 +4859,7 @@ name = "net_traits"
 version = "0.0.1"
 dependencies = [
  "base",
+ "compositing_traits",
  "content-security-policy",
  "cookie 0.18.1",
  "crossbeam-channel",
@@ -4927,6 +4875,7 @@ dependencies = [
  "num-traits",
  "percent-encoding",
  "pixels",
+ "profile_traits",
  "rustls-pki-types",
  "serde",
  "servo_arc",
@@ -4935,7 +4884,6 @@ dependencies = [
  "servo_url",
  "url",
  "uuid",
- "webrender_traits",
 ]
 
 [[package]]
@@ -5126,6 +5074,15 @@ dependencies = [
  "objc2-encode",
 ]
 
+[[package]]
+name = "objc2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88c6597e14493ab2e44ce58f2fdecf095a51f12ca57bec060a11c57332520551"
+dependencies = [
+ "objc2-encode",
+]
+
 [[package]]
 name = "objc2-app-kit"
 version = "0.2.2"
@@ -5135,13 +5092,24 @@ dependencies = [
  "bitflags 2.9.0",
  "block2",
  "libc",
- "objc2",
+ "objc2 0.5.2",
  "objc2-core-data",
  "objc2-core-image",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
  "objc2-quartz-core",
 ]
 
+[[package]]
+name = "objc2-app-kit"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6f29f568bec459b0ddff777cec4fe3fd8666d82d5a40ebd0ff7e66134f89bcc"
+dependencies = [
+ "bitflags 2.9.0",
+ "objc2 0.6.1",
+ "objc2-foundation 0.3.1",
+]
+
 [[package]]
 name = "objc2-cloud-kit"
 version = "0.2.2"
@@ -5150,9 +5118,9 @@ checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
  "bitflags 2.9.0",
  "block2",
- "objc2",
+ "objc2 0.5.2",
  "objc2-core-location",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
@@ -5162,8 +5130,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
 dependencies = [
  "block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
@@ -5174,8 +5142,19 @@ checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
  "bitflags 2.9.0",
  "block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-core-foundation"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
+dependencies = [
+ "bitflags 2.9.0",
+ "dispatch2",
+ "objc2 0.6.1",
 ]
 
 [[package]]
@@ -5185,8 +5164,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
 dependencies = [
  "block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
  "objc2-metal",
 ]
 
@@ -5197,9 +5176,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
 dependencies = [
  "block2",
- "objc2",
+ "objc2 0.5.2",
  "objc2-contacts",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
@@ -5218,7 +5197,18 @@ dependencies = [
  "block2",
  "dispatch",
  "libc",
- "objc2",
+ "objc2 0.5.2",
+]
+
+[[package]]
+name = "objc2-foundation"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c"
+dependencies = [
+ "bitflags 2.9.0",
+ "objc2 0.6.1",
+ "objc2-core-foundation",
 ]
 
 [[package]]
@@ -5228,9 +5218,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
 dependencies = [
  "block2",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
@@ -5241,8 +5231,8 @@ checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
  "bitflags 2.9.0",
  "block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
@@ -5253,8 +5243,8 @@ checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
  "bitflags 2.9.0",
  "block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
  "objc2-metal",
 ]
 
@@ -5264,8 +5254,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
 dependencies = [
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
@@ -5276,12 +5266,12 @@ checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
  "bitflags 2.9.0",
  "block2",
- "objc2",
+ "objc2 0.5.2",
  "objc2-cloud-kit",
  "objc2-core-data",
  "objc2-core-image",
  "objc2-core-location",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
  "objc2-link-presentation",
  "objc2-quartz-core",
  "objc2-symbols",
@@ -5296,8 +5286,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
 dependencies = [
  "block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
@@ -5308,9 +5298,9 @@ checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
  "bitflags 2.9.0",
  "block2",
- "objc2",
+ "objc2 0.5.2",
  "objc2-core-location",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
@@ -5388,9 +5378,9 @@ checksum = "93e60dacb893ed4eb57e8fd9eff81b8ad0153842661b3093927bdfd861506652"
 
 [[package]]
 name = "once_cell"
-version = "1.21.1"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "oorandom"
@@ -5530,7 +5520,7 @@ dependencies = [
 [[package]]
 name = "peek-poke"
 version = "0.3.0"
-source = "git+https://github.com/servo/webrender?branch=0.66#88462530746749163bcf1dc89be20a19f2394e71"
+source = "git+https://github.com/servo/webrender?branch=0.67#ae2477d9a6da403e5b5dce8a17415a2cd1563074"
 dependencies = [
  "euclid",
  "peek-poke-derive",
@@ -5539,13 +5529,12 @@ dependencies = [
 [[package]]
 name = "peek-poke-derive"
 version = "0.3.0"
-source = "git+https://github.com/servo/webrender?branch=0.66#88462530746749163bcf1dc89be20a19f2394e71"
+source = "git+https://github.com/servo/webrender?branch=0.67#ae2477d9a6da403e5b5dce8a17415a2cd1563074"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
  "synstructure",
- "unicode-xid",
 ]
 
 [[package]]
@@ -5792,9 +5781,9 @@ checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
 
 [[package]]
 name = "prettyplease"
-version = "0.2.31"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5316f57387668042f561aae71480de936257848f9c43ce528e311d89a07cadeb"
+checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
 dependencies = [
  "proc-macro2",
  "syn",
@@ -5811,9 +5800,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -5825,6 +5814,7 @@ dependencies = [
  "base",
  "ipc-channel",
  "libc",
+ "log",
  "parking_lot",
  "profile_traits",
  "regex",
@@ -5857,6 +5847,7 @@ dependencies = [
  "log",
  "malloc_size_of_derive",
  "serde",
+ "servo_allocator",
  "servo_config",
  "servo_malloc_size_of",
  "signpost",
@@ -5905,9 +5896,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.37.3"
+version = "0.37.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf763ab1c7a3aa408be466efc86efe35ed1bd3dd74173ed39d6b0d0a6f0ba148"
+checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
 dependencies = [
  "memchr",
 ]
@@ -6143,14 +6134,15 @@ dependencies = [
 
 [[package]]
 name = "ron"
-version = "0.8.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
+checksum = "beceb6f7bf81c73e73aeef6dd1356d9a1b2b4909e1f0fc3e59b034f9572d7b7f"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "bitflags 2.9.0",
  "serde",
  "serde_derive",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -6195,9 +6187,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.25"
+version = "0.23.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c"
+checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
 dependencies = [
  "aws-lc-rs",
  "log",
@@ -6219,15 +6211,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "zeroize",
+]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.1"
+version = "0.103.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03"
+checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -6291,6 +6286,7 @@ dependencies = [
  "cbc",
  "chrono",
  "cipher",
+ "compositing_traits",
  "constellation_traits",
  "content-security-policy",
  "cookie 0.18.1",
@@ -6317,12 +6313,13 @@ dependencies = [
  "image",
  "indexmap",
  "ipc-channel",
- "itertools 0.13.0",
+ "itertools 0.14.0",
  "jstraceable_derive",
  "keyboard-types",
  "libc",
  "log",
  "malloc_size_of_derive",
+ "markup5ever",
  "media",
  "metrics",
  "mime",
@@ -6356,6 +6353,7 @@ dependencies = [
  "servo_rand",
  "servo_url",
  "smallvec",
+ "snapshot",
  "strum",
  "strum_macros",
  "stylo",
@@ -6372,13 +6370,15 @@ dependencies = [
  "unicode-bidi",
  "unicode-segmentation",
  "url",
+ "urlpattern",
  "utf-8",
  "uuid",
  "webdriver",
- "webgpu",
+ "webgpu_traits",
  "webrender_api",
- "webrender_traits",
  "webxr-api",
+ "wgpu-core",
+ "wgpu-types",
  "xml5ever",
 ]
 
@@ -6389,6 +6389,9 @@ dependencies = [
  "bitflags 2.9.0",
  "crossbeam-channel",
  "cssparser",
+ "deny_public_fields",
+ "dom_struct",
+ "domobject_derive",
  "html5ever",
  "indexmap",
  "jstraceable_derive",
@@ -6398,6 +6401,7 @@ dependencies = [
  "mozjs",
  "num-traits",
  "parking_lot",
+ "phf",
  "phf_codegen",
  "phf_shared",
  "regex",
@@ -6405,10 +6409,12 @@ dependencies = [
  "servo_arc",
  "servo_config",
  "servo_malloc_size_of",
+ "servo_url",
  "smallvec",
  "stylo",
  "stylo_atoms",
  "tendril",
+ "tracing",
  "webxr-api",
  "xml5ever",
 ]
@@ -6421,11 +6427,14 @@ dependencies = [
  "atomic_refcell",
  "base",
  "canvas_traits",
+ "compositing_traits",
  "constellation_traits",
+ "embedder_traits",
  "euclid",
  "fnv",
  "fonts",
  "fonts_traits",
+ "fxhash",
  "html5ever",
  "ipc-channel",
  "libc",
@@ -6444,7 +6453,6 @@ dependencies = [
  "stylo",
  "stylo_traits",
  "webrender_api",
- "webrender_traits",
 ]
 
 [[package]]
@@ -6463,21 +6471,17 @@ version = "0.0.1"
 dependencies = [
  "background_hang_monitor_api",
  "base",
- "bitflags 2.9.0",
  "bluetooth_traits",
  "canvas_traits",
+ "compositing_traits",
  "constellation_traits",
- "cookie 0.18.1",
  "crossbeam-channel",
  "devtools_traits",
  "embedder_traits",
  "euclid",
  "http 1.3.1",
- "hyper_serde",
  "ipc-channel",
  "keyboard-types",
- "libc",
- "log",
  "malloc_size_of_derive",
  "media",
  "net_traits",
@@ -6490,11 +6494,8 @@ dependencies = [
  "strum_macros",
  "stylo_atoms",
  "stylo_traits",
- "uuid",
- "webdriver",
- "webgpu",
+ "webgpu_traits",
  "webrender_api",
- "webrender_traits",
  "webxr-api",
 ]
 
@@ -6513,8 +6514,8 @@ dependencies = [
 
 [[package]]
 name = "selectors"
-version = "0.27.0"
-source = "git+https://github.com/servo/stylo?branch=2025-03-15#bc4717c7842ad59243f00ae76ba23f998c749b94"
+version = "0.28.0"
+source = "git+https://github.com/servo/stylo?branch=2025-05-01#bc815af4b5ae01768eaef64d21cebe6d66be06ea"
 dependencies = [
  "bitflags 2.9.0",
  "cssparser",
@@ -6624,7 +6625,7 @@ dependencies = [
 [[package]]
 name = "servo-media"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#c7eab1ae326b8b95b938741660553342f7cd94b7"
+source = "git+https://github.com/servo/media#eb96030cdd153ebcbbe3836dc6471303187740e9"
 dependencies = [
  "once_cell",
  "servo-media-audio",
@@ -6637,7 +6638,7 @@ dependencies = [
 [[package]]
 name = "servo-media-audio"
 version = "0.2.0"
-source = "git+https://github.com/servo/media#c7eab1ae326b8b95b938741660553342f7cd94b7"
+source = "git+https://github.com/servo/media#eb96030cdd153ebcbbe3836dc6471303187740e9"
 dependencies = [
  "byte-slice-cast",
  "euclid",
@@ -6658,7 +6659,7 @@ dependencies = [
 [[package]]
 name = "servo-media-derive"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#c7eab1ae326b8b95b938741660553342f7cd94b7"
+source = "git+https://github.com/servo/media#eb96030cdd153ebcbbe3836dc6471303187740e9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6668,7 +6669,7 @@ dependencies = [
 [[package]]
 name = "servo-media-dummy"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#c7eab1ae326b8b95b938741660553342f7cd94b7"
+source = "git+https://github.com/servo/media#eb96030cdd153ebcbbe3836dc6471303187740e9"
 dependencies = [
  "ipc-channel",
  "servo-media",
@@ -6682,7 +6683,7 @@ dependencies = [
 [[package]]
 name = "servo-media-gstreamer"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#c7eab1ae326b8b95b938741660553342f7cd94b7"
+source = "git+https://github.com/servo/media#eb96030cdd153ebcbbe3836dc6471303187740e9"
 dependencies = [
  "byte-slice-cast",
  "glib",
@@ -6715,7 +6716,7 @@ dependencies = [
 [[package]]
 name = "servo-media-gstreamer-render"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#c7eab1ae326b8b95b938741660553342f7cd94b7"
+source = "git+https://github.com/servo/media#eb96030cdd153ebcbbe3836dc6471303187740e9"
 dependencies = [
  "gstreamer",
  "gstreamer-video",
@@ -6725,7 +6726,7 @@ dependencies = [
 [[package]]
 name = "servo-media-gstreamer-render-android"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#c7eab1ae326b8b95b938741660553342f7cd94b7"
+source = "git+https://github.com/servo/media#eb96030cdd153ebcbbe3836dc6471303187740e9"
 dependencies = [
  "glib",
  "gstreamer",
@@ -6739,7 +6740,7 @@ dependencies = [
 [[package]]
 name = "servo-media-gstreamer-render-unix"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#c7eab1ae326b8b95b938741660553342f7cd94b7"
+source = "git+https://github.com/servo/media#eb96030cdd153ebcbbe3836dc6471303187740e9"
 dependencies = [
  "glib",
  "gstreamer",
@@ -6754,7 +6755,7 @@ dependencies = [
 [[package]]
 name = "servo-media-player"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#c7eab1ae326b8b95b938741660553342f7cd94b7"
+source = "git+https://github.com/servo/media#eb96030cdd153ebcbbe3836dc6471303187740e9"
 dependencies = [
  "ipc-channel",
  "serde",
@@ -6766,7 +6767,7 @@ dependencies = [
 [[package]]
 name = "servo-media-streams"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#c7eab1ae326b8b95b938741660553342f7cd94b7"
+source = "git+https://github.com/servo/media#eb96030cdd153ebcbbe3836dc6471303187740e9"
 dependencies = [
  "uuid",
 ]
@@ -6774,18 +6775,28 @@ dependencies = [
 [[package]]
 name = "servo-media-traits"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#c7eab1ae326b8b95b938741660553342f7cd94b7"
+source = "git+https://github.com/servo/media#eb96030cdd153ebcbbe3836dc6471303187740e9"
 
 [[package]]
 name = "servo-media-webrtc"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#c7eab1ae326b8b95b938741660553342f7cd94b7"
+source = "git+https://github.com/servo/media#eb96030cdd153ebcbbe3836dc6471303187740e9"
 dependencies = [
  "log",
  "servo-media-streams",
  "uuid",
 ]
 
+[[package]]
+name = "servo-tracing"
+version = "0.0.1"
+dependencies = [
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "servo_allocator"
 version = "0.0.1"
@@ -6798,8 +6809,8 @@ dependencies = [
 
 [[package]]
 name = "servo_arc"
-version = "0.4.0"
-source = "git+https://github.com/servo/stylo?branch=2025-03-15#bc4717c7842ad59243f00ae76ba23f998c749b94"
+version = "0.4.1"
+source = "git+https://github.com/servo/stylo?branch=2025-05-01#bc815af4b5ae01768eaef64d21cebe6d66be06ea"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -6843,6 +6854,7 @@ version = "0.0.1"
 dependencies = [
  "accountable-refcell",
  "app_units",
+ "atomic_refcell",
  "content-security-policy",
  "crossbeam-channel",
  "euclid",
@@ -6858,9 +6870,13 @@ dependencies = [
  "stylo",
  "stylo_dom",
  "stylo_malloc_size_of",
+ "taffy",
  "thin-vec",
  "tokio",
+ "unicode-bidi",
+ "unicode-script",
  "url",
+ "urlpattern",
  "uuid",
  "webrender_api",
  "wr_malloc_size_of",
@@ -6931,14 +6947,15 @@ dependencies = [
  "net",
  "net_traits",
  "nix",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2-app-kit 0.3.1",
+ "objc2-foundation 0.3.1",
  "ohos-ime",
  "ohos-ime-sys",
  "ohos-vsync",
  "raw-window-handle",
  "rustls",
  "serde_json",
+ "servo-tracing",
  "servo_allocator",
  "shellwords",
  "sig",
@@ -6948,7 +6965,6 @@ dependencies = [
  "tracing-perfetto",
  "tracing-subscriber",
  "url",
- "vergen-git2",
  "windows-sys 0.59.0",
  "winit",
  "winres",
@@ -6968,9 +6984,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -7066,9 +7082,9 @@ checksum = "d31d263dd118560e1a492922182ab6ca6dc1d03a3bf54e7699993f31a4150e3f"
 
 [[package]]
 name = "smallvec"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
 dependencies = [
  "serde",
 ]
@@ -7118,11 +7134,21 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "snapshot"
+version = "0.0.1"
+dependencies = [
+ "euclid",
+ "ipc-channel",
+ "pixels",
+ "serde",
+]
+
 [[package]]
 name = "socket2"
-version = "0.5.8"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -7179,9 +7205,9 @@ checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
 
 [[package]]
 name = "string_cache"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938d512196766101d333398efde81bc1f37b00cb42c2f8350e5df639f040bbbe"
+checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f"
 dependencies = [
  "new_debug_unreachable",
  "parking_lot",
@@ -7202,12 +7228,6 @@ dependencies = [
  "quote",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
 [[package]]
 name = "strum"
 version = "0.26.3"
@@ -7250,8 +7270,8 @@ dependencies = [
 
 [[package]]
 name = "stylo"
-version = "0.2.0"
-source = "git+https://github.com/servo/stylo?branch=2025-03-15#bc4717c7842ad59243f00ae76ba23f998c749b94"
+version = "0.3.0"
+source = "git+https://github.com/servo/stylo?branch=2025-05-01#bc815af4b5ae01768eaef64d21cebe6d66be06ea"
 dependencies = [
  "app_units",
  "arrayvec",
@@ -7265,12 +7285,11 @@ dependencies = [
  "fxhash",
  "icu_segmenter",
  "indexmap",
- "itertools 0.10.5",
+ "itertools 0.14.0",
  "itoa",
  "lazy_static",
  "log",
  "malloc_size_of_derive",
- "markup5ever",
  "matches",
  "mime",
  "new_debug_unreachable",
@@ -7304,12 +7323,13 @@ dependencies = [
  "url",
  "void",
  "walkdir",
+ "web_atoms",
 ]
 
 [[package]]
 name = "stylo_atoms"
-version = "0.2.0"
-source = "git+https://github.com/servo/stylo?branch=2025-03-15#bc4717c7842ad59243f00ae76ba23f998c749b94"
+version = "0.3.0"
+source = "git+https://github.com/servo/stylo?branch=2025-05-01#bc815af4b5ae01768eaef64d21cebe6d66be06ea"
 dependencies = [
  "string_cache",
  "string_cache_codegen",
@@ -7317,13 +7337,13 @@ dependencies = [
 
 [[package]]
 name = "stylo_config"
-version = "0.2.0"
-source = "git+https://github.com/servo/stylo?branch=2025-03-15#bc4717c7842ad59243f00ae76ba23f998c749b94"
+version = "0.3.0"
+source = "git+https://github.com/servo/stylo?branch=2025-05-01#bc815af4b5ae01768eaef64d21cebe6d66be06ea"
 
 [[package]]
 name = "stylo_derive"
-version = "0.2.0"
-source = "git+https://github.com/servo/stylo?branch=2025-03-15#bc4717c7842ad59243f00ae76ba23f998c749b94"
+version = "0.3.0"
+source = "git+https://github.com/servo/stylo?branch=2025-05-01#bc815af4b5ae01768eaef64d21cebe6d66be06ea"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -7334,8 +7354,8 @@ dependencies = [
 
 [[package]]
 name = "stylo_dom"
-version = "0.2.0"
-source = "git+https://github.com/servo/stylo?branch=2025-03-15#bc4717c7842ad59243f00ae76ba23f998c749b94"
+version = "0.3.0"
+source = "git+https://github.com/servo/stylo?branch=2025-05-01#bc815af4b5ae01768eaef64d21cebe6d66be06ea"
 dependencies = [
  "bitflags 2.9.0",
  "stylo_malloc_size_of",
@@ -7343,8 +7363,8 @@ dependencies = [
 
 [[package]]
 name = "stylo_malloc_size_of"
-version = "0.2.0"
-source = "git+https://github.com/servo/stylo?branch=2025-03-15#bc4717c7842ad59243f00ae76ba23f998c749b94"
+version = "0.3.0"
+source = "git+https://github.com/servo/stylo?branch=2025-05-01#bc815af4b5ae01768eaef64d21cebe6d66be06ea"
 dependencies = [
  "app_units",
  "cssparser",
@@ -7360,13 +7380,13 @@ dependencies = [
 
 [[package]]
 name = "stylo_static_prefs"
-version = "0.2.0"
-source = "git+https://github.com/servo/stylo?branch=2025-03-15#bc4717c7842ad59243f00ae76ba23f998c749b94"
+version = "0.3.0"
+source = "git+https://github.com/servo/stylo?branch=2025-05-01#bc815af4b5ae01768eaef64d21cebe6d66be06ea"
 
 [[package]]
 name = "stylo_traits"
-version = "0.2.0"
-source = "git+https://github.com/servo/stylo?branch=2025-03-15#bc4717c7842ad59243f00ae76ba23f998c749b94"
+version = "0.3.0"
+source = "git+https://github.com/servo/stylo?branch=2025-05-01#bc815af4b5ae01768eaef64d21cebe6d66be06ea"
 dependencies = [
  "app_units",
  "bitflags 2.9.0",
@@ -7421,9 +7441,9 @@ dependencies = [
 
 [[package]]
 name = "svg_fmt"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce5d813d71d82c4cbc1742135004e4a79fd870214c155443451c139c9470a0aa"
+checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb"
 
 [[package]]
 name = "sw-composite"
@@ -7439,9 +7459,9 @@ checksum = "e454d048db5527d000bfddb77bd072bbf3a1e2ae785f16d9bd116e07c2ab45eb"
 
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7450,9 +7470,9 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7749,7 +7769,7 @@ dependencies = [
 [[package]]
 name = "to_shmem"
 version = "0.2.0"
-source = "git+https://github.com/servo/stylo?branch=2025-03-15#bc4717c7842ad59243f00ae76ba23f998c749b94"
+source = "git+https://github.com/servo/stylo?branch=2025-05-01#bc815af4b5ae01768eaef64d21cebe6d66be06ea"
 dependencies = [
  "cssparser",
  "servo_arc",
@@ -7762,7 +7782,7 @@ dependencies = [
 [[package]]
 name = "to_shmem_derive"
 version = "0.1.0"
-source = "git+https://github.com/servo/stylo?branch=2025-03-15#bc4717c7842ad59243f00ae76ba23f998c749b94"
+source = "git+https://github.com/servo/stylo?branch=2025-05-01#bc815af4b5ae01768eaef64d21cebe6d66be06ea"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -7773,9 +7793,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.44.1"
+version = "1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
+checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
 dependencies = [
  "backtrace",
  "bytes",
@@ -7821,9 +7841,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.14"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034"
+checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
 dependencies = [
  "bytes",
  "futures-core",
@@ -7855,18 +7875,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.24"
+version = "0.22.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
+checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
 dependencies = [
  "indexmap",
  "serde",
@@ -8039,6 +8059,47 @@ dependencies = [
  "arrayvec",
 ]
 
+[[package]]
+name = "unic-char-property"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221"
+dependencies = [
+ "unic-char-range",
+]
+
+[[package]]
+name = "unic-char-range"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc"
+
+[[package]]
+name = "unic-common"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc"
+
+[[package]]
+name = "unic-ucd-ident"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987"
+dependencies = [
+ "unic-char-property",
+ "unic-char-range",
+ "unic-ucd-version",
+]
+
+[[package]]
+name = "unic-ucd-version"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"
+dependencies = [
+ "unic-common",
+]
+
 [[package]]
 name = "unicase"
 version = "2.8.1"
@@ -8081,12 +8142,6 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
-[[package]]
-name = "unicode-xid"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
-
 [[package]]
 name = "universal-hash"
 version = "0.5.1"
@@ -8125,6 +8180,18 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "urlpattern"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d"
+dependencies = [
+ "regex",
+ "serde",
+ "unic-ucd-ident",
+ "url",
+]
+
 [[package]]
 name = "utf-8"
 version = "0.7.6"
@@ -8177,45 +8244,6 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
-[[package]]
-name = "vergen"
-version = "9.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0d2f179f8075b805a43a2a21728a46f0cc2921b3c58695b28fa8817e103cd9a"
-dependencies = [
- "anyhow",
- "derive_builder",
- "rustversion",
- "time",
- "vergen-lib",
-]
-
-[[package]]
-name = "vergen-git2"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d86bae87104cb2790cdee615c2bb54729804d307191732ab27b1c5357ea6ddc5"
-dependencies = [
- "anyhow",
- "derive_builder",
- "git2",
- "rustversion",
- "time",
- "vergen",
- "vergen-lib",
-]
-
-[[package]]
-name = "vergen-lib"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b07e6010c0f3e59fcb164e0163834597da68d1f864e2b8ca49f74de01e9c166"
-dependencies = [
- "anyhow",
- "derive_builder",
- "rustversion",
-]
-
 [[package]]
 name = "version-compare"
 version = "0.2.0"
@@ -8356,9 +8384,9 @@ checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49"
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.8"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7208998eaa3870dad37ec8836979581506e0c5c64c20c9e79e9d2a10d6f47bf"
+checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121"
 dependencies = [
  "cc",
  "downcast-rs",
@@ -8370,9 +8398,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.8"
+version = "0.31.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2120de3d33638aaef5b9f4472bff75f07c56379cf76ea320bd3a3d65ecaf73f"
+checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61"
 dependencies = [
  "bitflags 2.9.0",
  "rustix",
@@ -8393,9 +8421,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-cursor"
-version = "0.31.8"
+version = "0.31.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a93029cbb6650748881a00e4922b076092a6a08c11e7fbdb923f064b23968c5d"
+checksum = "a65317158dec28d00416cb16705934070aef4f8393353d41126c54264ae0f182"
 dependencies = [
  "rustix",
  "wayland-client",
@@ -8404,9 +8432,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols"
-version = "0.32.6"
+version = "0.32.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0781cf46869b37e36928f7b432273c0995aa8aed9552c556fb18754420541efc"
+checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a"
 dependencies = [
  "bitflags 2.9.0",
  "wayland-backend",
@@ -8416,9 +8444,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-plasma"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ccaacc76703fefd6763022ac565b590fcade92202492381c95b2edfdf7d46b3"
+checksum = "4fd38cdad69b56ace413c6bcc1fbf5acc5e2ef4af9d5f8f1f9570c0c83eae175"
 dependencies = [
  "bitflags 2.9.0",
  "wayland-backend",
@@ -8429,9 +8457,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248a02e6f595aad796561fa82d25601bd2c8c3b145b1c7453fc8f94c1a58f8b2"
+checksum = "1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf"
 dependencies = [
  "bitflags 2.9.0",
  "wayland-backend",
@@ -8496,12 +8524,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "webdriver"
-version = "0.51.0"
+name = "web_atoms"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310ce9d3648c5ff1915ca7dd09c44eabb7eb17f9ff4a6e7e5f4a902c8d1e269f"
+checksum = "0b9c5f0bc545ea3b20b423e33b9b457764de0b3730cd957f6c6aa6c301785f6e"
 dependencies = [
- "base64 0.21.7",
+ "phf",
+ "phf_codegen",
+ "string_cache",
+ "string_cache_codegen",
+]
+
+[[package]]
+name = "webdriver"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91d53921e1bef27512fa358179c9a22428d55778d2c2ae3c5c37a52b82ce6e92"
+dependencies = [
+ "base64 0.22.1",
  "bytes",
  "cookie 0.16.2",
  "http 0.2.12",
@@ -8546,30 +8586,72 @@ dependencies = [
  "webdriver",
 ]
 
+[[package]]
+name = "webgl"
+version = "0.0.1"
+dependencies = [
+ "bitflags 2.9.0",
+ "byteorder",
+ "canvas_traits",
+ "compositing_traits",
+ "crossbeam-channel",
+ "euclid",
+ "fnv",
+ "glow",
+ "half",
+ "ipc-channel",
+ "itertools 0.14.0",
+ "log",
+ "pixels",
+ "snapshot",
+ "surfman",
+ "webrender",
+ "webrender_api",
+ "webxr",
+ "webxr-api",
+]
+
 [[package]]
 name = "webgpu"
 version = "0.0.1"
 dependencies = [
  "arrayvec",
  "base",
+ "compositing_traits",
  "euclid",
  "ipc-channel",
  "log",
  "serde",
  "servo_config",
  "servo_malloc_size_of",
+ "snapshot",
+ "webgpu_traits",
  "webrender",
  "webrender_api",
- "webrender_traits",
+ "wgpu-core",
+ "wgpu-types",
+]
+
+[[package]]
+name = "webgpu_traits"
+version = "0.0.1"
+dependencies = [
+ "arrayvec",
+ "base",
+ "ipc-channel",
+ "serde",
+ "servo_malloc_size_of",
+ "snapshot",
+ "webrender_api",
  "wgpu-core",
  "wgpu-types",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.8"
+version = "0.26.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
+checksum = "37493cadf42a2a939ed404698ded7fb378bf301b5011f973361779a3a74f8c93"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -8577,7 +8659,7 @@ dependencies = [
 [[package]]
 name = "webrender"
 version = "0.66.0"
-source = "git+https://github.com/servo/webrender?branch=0.66#88462530746749163bcf1dc89be20a19f2394e71"
+source = "git+https://github.com/servo/webrender?branch=0.67#ae2477d9a6da403e5b5dce8a17415a2cd1563074"
 dependencies = [
  "allocator-api2",
  "bincode",
@@ -8612,7 +8694,7 @@ dependencies = [
 [[package]]
 name = "webrender_api"
 version = "0.66.0"
-source = "git+https://github.com/servo/webrender?branch=0.66#88462530746749163bcf1dc89be20a19f2394e71"
+source = "git+https://github.com/servo/webrender?branch=0.67#ae2477d9a6da403e5b5dce8a17415a2cd1563074"
 dependencies = [
  "app_units",
  "bitflags 2.9.0",
@@ -8633,41 +8715,18 @@ dependencies = [
 [[package]]
 name = "webrender_build"
 version = "0.0.2"
-source = "git+https://github.com/servo/webrender?branch=0.66#88462530746749163bcf1dc89be20a19f2394e71"
+source = "git+https://github.com/servo/webrender?branch=0.67#ae2477d9a6da403e5b5dce8a17415a2cd1563074"
 dependencies = [
  "bitflags 2.9.0",
  "lazy_static",
 ]
 
-[[package]]
-name = "webrender_traits"
-version = "0.0.1"
-dependencies = [
- "base",
- "constellation_traits",
- "dpi",
- "embedder_traits",
- "euclid",
- "gleam",
- "glow",
- "image",
- "ipc-channel",
- "libc",
- "log",
- "raw-window-handle",
- "serde",
- "servo-media",
- "servo_geometry",
- "stylo",
- "surfman",
- "webrender_api",
-]
-
 [[package]]
 name = "webxr"
 version = "0.0.1"
 dependencies = [
  "crossbeam-channel",
+ "embedder_traits",
  "euclid",
  "glow",
  "log",
@@ -8684,6 +8743,7 @@ dependencies = [
 name = "webxr-api"
 version = "0.0.1"
 dependencies = [
+ "embedder_traits",
  "euclid",
  "ipc-channel",
  "log",
@@ -8698,15 +8758,17 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "wgpu-core"
-version = "24.0.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=2f255edc60e9669c8c737464c59af10d59a31126#2f255edc60e9669c8c737464c59af10d59a31126"
+version = "25.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a19813e647da7aa3cdaa84f5846e2c64114970ea7c86b1e6aae8be08091f4bdc"
 dependencies = [
  "arrayvec",
+ "bit-set",
  "bit-vec",
  "bitflags 2.9.0",
  "cfg_aliases",
  "document-features",
- "hashbrown 0.14.5",
+ "hashbrown",
  "indexmap",
  "log",
  "naga",
@@ -8726,32 +8788,36 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core-deps-apple"
-version = "24.0.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=2f255edc60e9669c8c737464c59af10d59a31126#2f255edc60e9669c8c737464c59af10d59a31126"
+version = "25.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfd488b3239b6b7b185c3b045c39ca6bf8af34467a4c5de4e0b1a564135d093d"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-emscripten"
-version = "24.0.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=2f255edc60e9669c8c737464c59af10d59a31126#2f255edc60e9669c8c737464c59af10d59a31126"
+version = "25.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f09ad7aceb3818e52539acc679f049d3475775586f3f4e311c30165cf2c00445"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-windows-linux-android"
-version = "24.0.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=2f255edc60e9669c8c737464c59af10d59a31126#2f255edc60e9669c8c737464c59af10d59a31126"
+version = "25.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cba5fb5f7f9c98baa7c889d444f63ace25574833df56f5b817985f641af58e46"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-hal"
-version = "24.0.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=2f255edc60e9669c8c737464c59af10d59a31126#2f255edc60e9669c8c737464c59af10d59a31126"
+version = "25.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb7c4a1dc42ff14c23c9b11ebf1ee85cde661a9b1cf0392f79c1faca5bc559fb"
 dependencies = [
  "android_system_properties",
  "arrayvec",
@@ -8760,6 +8826,7 @@ dependencies = [
  "bitflags 2.9.0",
  "block",
  "bytemuck",
+ "cfg-if",
  "cfg_aliases",
  "core-graphics-types",
  "glow",
@@ -8767,7 +8834,7 @@ dependencies = [
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
- "hashbrown 0.14.5",
+ "hashbrown",
  "js-sys",
  "khronos-egl",
  "libc",
@@ -8777,7 +8844,6 @@ dependencies = [
  "naga",
  "ndk-sys 0.5.0+25.2.9519653",
  "objc",
- "once_cell",
  "ordered-float",
  "parking_lot",
  "profiling",
@@ -8794,10 +8860,12 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "24.0.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=2f255edc60e9669c8c737464c59af10d59a31126#2f255edc60e9669c8c737464c59af10d59a31126"
+version = "25.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2aa49460c2a8ee8edba3fca54325540d904dd85b2e086ada762767e17d06e8bc"
 dependencies = [
  "bitflags 2.9.0",
+ "bytemuck",
  "js-sys",
  "log",
  "serde",
@@ -8868,15 +8936,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.57.0"
@@ -9196,9 +9255,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winit"
-version = "0.30.9"
+version = "0.30.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a809eacf18c8eca8b6635091543f02a5a06ddf3dad846398795460e6e0ae3cc0"
+checksum = "b0d05bd8908e14618c9609471db04007e644fd9cce6529756046cfc577f9155e"
 dependencies = [
  "ahash",
  "android-activity",
@@ -9217,9 +9276,9 @@ dependencies = [
  "libc",
  "memmap2",
  "ndk",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
  "objc2-ui-kit",
  "orbclient",
  "percent-encoding",
@@ -9248,9 +9307,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.4"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
+checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
 dependencies = [
  "memchr",
 ]
@@ -9276,7 +9335,7 @@ dependencies = [
 [[package]]
 name = "wr_glyph_rasterizer"
 version = "0.1.0"
-source = "git+https://github.com/servo/webrender?branch=0.66#88462530746749163bcf1dc89be20a19f2394e71"
+source = "git+https://github.com/servo/webrender?branch=0.67#ae2477d9a6da403e5b5dce8a17415a2cd1563074"
 dependencies = [
  "core-foundation 0.9.4",
  "core-graphics",
@@ -9300,8 +9359,8 @@ dependencies = [
 
 [[package]]
 name = "wr_malloc_size_of"
-version = "0.0.3"
-source = "git+https://github.com/servo/webrender?branch=0.66#88462530746749163bcf1dc89be20a19f2394e71"
+version = "0.2.0"
+source = "git+https://github.com/servo/webrender?branch=0.67#ae2477d9a6da403e5b5dce8a17415a2cd1563074"
 dependencies = [
  "app_units",
  "euclid",
@@ -9419,15 +9478,15 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.25"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5b940ebc25896e71dd073bad2dbaa2abfe97b0a391415e22ad1326d9c54e3c4"
+checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda"
 
 [[package]]
 name = "xml5ever"
-version = "0.21.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9f61eba2105dcadbee9232cfcf75c96abea184bf3805a8bfe022cf7fe7fa11d"
+checksum = "0a91563ba5a5ab749488164063f1317e327ca1daa80f00e5bd1e670ad0d78154"
 dependencies = [
  "log",
  "mac",
diff --git a/Cargo.toml b/Cargo.toml
index 7e5aac53ed4..4045a0ffcb9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,7 +25,7 @@ arboard = "3"
 arrayvec = "0.7"
 async-tungstenite = { version = "0.28", features = ["tokio-rustls-webpki-roots"] }
 atomic_refcell = "0.1.13"
-aws-lc-rs = { version = "1.12", default-features = false, features = ["aws-lc-sys"] }
+aws-lc-rs = { version = "1.13", default-features = false, features = ["aws-lc-sys"] }
 background_hang_monitor_api = { path = "components/shared/background_hang_monitor" }
 backtrace = "0.3"
 base = { path = "components/shared/base" }
@@ -41,7 +41,7 @@ chrono = { version = "0.4", features = ["serde"] }
 cipher = { version = "0.4.4", features = ["alloc"] }
 compositing_traits = { path = "components/shared/compositing" }
 constellation_traits = { path = "components/shared/constellation" }
-content-security-policy = { version = "0.5", features = ["serde"] }
+content-security-policy = { git = "https://github.com/servo/rust-content-security-policy/", branch = "servo-csp", features = ["serde"] }
 cookie = { package = "cookie", version = "0.18" }
 crossbeam-channel = "0.5"
 cssparser = { version = "0.35", features = ["serde"] }
@@ -49,7 +49,7 @@ ctr = "0.9.2"
 darling = { version = "0.20", default-features = false }
 data-url = "0.3"
 devtools_traits = { path = "components/shared/devtools" }
-dpi = { version = "0.1" }
+dpi = "0.1"
 embedder_traits = { path = "components/shared/embedder" }
 encoding_rs = "0.8"
 env_logger = "0.11"
@@ -71,7 +71,7 @@ gstreamer-video = "0.23"
 harfbuzz-sys = "0.6.1"
 headers = "0.4"
 hitrace = "0.1.4"
-html5ever = "0.30"
+html5ever = "0.31"
 http = "1.3"
 http-body-util = "0.1"
 hyper = "1.6"
@@ -82,9 +82,9 @@ icu_locid = "1.5.0"
 icu_segmenter = "1.5.0"
 image = "0.24"
 imsz = "0.2"
-indexmap = { version = "2.8.0", features = ["std"] }
+indexmap = { version = "2.9.0", features = ["std"] }
 ipc-channel = "0.19"
-itertools = "0.13"
+itertools = "0.14"
 js = { package = "mozjs", git = "https://github.com/servo/mozjs" }
 keyboard-types = "0.7"
 libc = "0.2"
@@ -92,7 +92,7 @@ log = "0.4"
 mach2 = "0.4"
 malloc_size_of = { package = "servo_malloc_size_of", path = "components/malloc_size_of" }
 malloc_size_of_derive = "0.1"
-markup5ever = "0.15"
+markup5ever = "0.16.1"
 memmap2 = "0.9.5"
 mime = "0.3.13"
 mime_guess = "2.0.5"
@@ -115,30 +115,32 @@ rayon = "1"
 regex = "1.11"
 rustls = { version = "0.23", default-features = false, features = ["logging", "std", "tls12"] }
 rustls-pemfile = "2.0"
-rustls-pki-types = "1.11"
+rustls-pki-types = "1.12"
 script_layout_interface = { path = "components/shared/script_layout" }
 script_traits = { path = "components/shared/script" }
-selectors = { git = "https://github.com/servo/stylo", branch = "2025-03-15" }
+selectors = { git = "https://github.com/servo/stylo", branch = "2025-05-01" }
 serde = "1.0.219"
 serde_bytes = "0.11"
 serde_json = "1.0"
 servo-media = { git = "https://github.com/servo/media" }
 servo-media-dummy = { git = "https://github.com/servo/media" }
 servo-media-gstreamer = { git = "https://github.com/servo/media" }
-servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-03-15" }
-stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-03-15" }
+servo-tracing = { path = "components/servo_tracing" }
+servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-05-01" }
 smallbitvec = "2.6.0"
-smallvec = "1.14"
+smallvec = "1.15"
+snapshot = { path = "./components/shared/snapshot" }
 static_assertions = "1.1"
 string_cache = "0.8"
 string_cache_codegen = "0.5"
 strum = "0.26"
 strum_macros = "0.26"
-stylo = { git = "https://github.com/servo/stylo", branch = "2025-03-15" }
-stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-03-15" }
-stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-03-15" }
-stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-03-15" }
-stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-03-15" }
+stylo = { git = "https://github.com/servo/stylo", branch = "2025-05-01" }
+stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-05-01" }
+stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-05-01" }
+stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-05-01" }
+stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-05-01" }
+stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-05-01" }
 surfman = { git = "https://github.com/servo/surfman", rev = "f7688b4585f9e0b5d4bf8ee8e4a91e82349610b1", features = ["chains"] }
 syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] }
 synstructure = "0.13"
@@ -160,21 +162,22 @@ unicode-properties = { version = "0.1.3", features = ["emoji"] }
 unicode-script = "0.5"
 unicode-segmentation = "1.12.0"
 url = "2.5"
+urlpattern = "0.3"
 uuid = { version = "1.12.1", features = ["v4"] }
-webdriver = "0.51.0"
+webdriver = "0.53.0"
+webgpu_traits = { path = "components/shared/webgpu" }
 webpki-roots = "0.26"
-webrender = { git = "https://github.com/servo/webrender", branch = "0.66", features = ["capture"] }
-webrender_api = { git = "https://github.com/servo/webrender", branch = "0.66" }
-webrender_traits = { path = "components/shared/webrender" }
+webrender = { git = "https://github.com/servo/webrender", branch = "0.67", features = ["capture"] }
+webrender_api = { git = "https://github.com/servo/webrender", branch = "0.67" }
 webxr-api = { path = "components/shared/webxr" }
-wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "2f255edc60e9669c8c737464c59af10d59a31126" }
-wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "2f255edc60e9669c8c737464c59af10d59a31126" }
+wgpu-core = "25"
+wgpu-types = "25"
 winapi = "0.3"
 windows-sys = "0.59"
 wio = "0.2"
-wr_malloc_size_of = { git = "https://github.com/servo/webrender", branch = "0.66" }
+wr_malloc_size_of = { git = "https://github.com/servo/webrender", branch = "0.67" }
 xi-unicode = "0.3.0"
-xml5ever = "0.21"
+xml5ever = "0.22"
 
 [profile.release]
 opt-level = 3
@@ -214,8 +217,8 @@ codegen-units = 1
 #
 # For html5ever:
 #
-# markup5ever = { path = "../html5ever/markup5ever" }
 # html5ever = { path = "../html5ever/html5ever" }
+# markup5ever = { path = "../html5ever/markup5ever" }
 # xml5ever = { path = "../html5ever/xml5ever" }
 #
 # Or for Stylo:
@@ -223,8 +226,8 @@ codegen-units = 1
 # [patch."https://github.com/servo/stylo"]
 # selectors = { path = "../stylo/selectors" }
 # servo_arc = { path = "../stylo/servo_arc" }
-# stylo_atoms = { path = "../stylo/stylo_atoms" }
 # stylo = { path = "../stylo/style" }
+# stylo_atoms = { path = "../stylo/stylo_atoms" }
 # stylo_config = { path = "../stylo/stylo_config" }
 # stylo_dom = { path = "../stylo/stylo_dom" }
 # stylo_malloc_size_of = { path = "../stylo/malloc_size_of" }
@@ -241,3 +244,7 @@ codegen-units = 1
 #
 # [patch."https://github.com/servo/<repository>"]
 # <crate> = { path = "/path/to/local/checkout" }
+#
+# [patch."https://github.com/servo/rust-content-security-policy"]
+# content-security-policy = { path = "../rust-content-security-policy/" }
+# content-security-policy = { git = "https://github.com/timvdlippe/rust-content-security-policy/", branch = "fix-report-checks", features = ["serde"] }
diff --git a/LICENSE_WHATWG_SPECS b/LICENSE_WHATWG_SPECS
new file mode 100644
index 00000000000..745d5b38e24
--- /dev/null
+++ b/LICENSE_WHATWG_SPECS
@@ -0,0 +1,15 @@
+BSD 3-Clause License
+
+Copyright WHATWG (Apple, Google, Mozilla, Microsoft)
+
+This license applies to portions of WHATWG specification incorporated into source code.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 611ce0909c8..9e531904581 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -1,16 +1,4 @@
-<!-- Please describe your changes on the following line: -->
+*Describe the changes that this pull request makes here. This will be the commit message.*
 
-
----
-<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
-- [ ] `./mach build -d` does not report any errors
-- [ ] `./mach test-tidy` does not report any errors
-- [ ] These changes fix #___ (GitHub issue number if applicable)
-
-<!-- Either: -->
-- [ ] There are tests for these changes OR
-- [ ] These changes do not require tests because ___
-
-<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
-
-<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
+Testing: *Describe how this pull request is tested or why it doesn't require tests*
+Fixes: *Link to an issue this pull requests fixes or remove this line if there is no issue*
diff --git a/components/allocator/Cargo.toml b/components/allocator/Cargo.toml
index ce66c31833b..ae38e78db82 100644
--- a/components/allocator/Cargo.toml
+++ b/components/allocator/Cargo.toml
@@ -14,9 +14,9 @@ path = "lib.rs"
 use-system-allocator = ["libc"]
 
 [target.'cfg(not(any(windows, target_env = "ohos")))'.dependencies]
-tikv-jemallocator = { workspace = true }
-tikv-jemalloc-sys = { workspace = true }
 libc = { workspace = true, optional = true }
+tikv-jemalloc-sys = { workspace = true }
+tikv-jemallocator = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]
 windows-sys = { workspace = true, features = ["Win32_System_Memory"] }
diff --git a/components/background_hang_monitor/Cargo.toml b/components/background_hang_monitor/Cargo.toml
index 2fce92ec05d..20216ec78b7 100644
--- a/components/background_hang_monitor/Cargo.toml
+++ b/components/background_hang_monitor/Cargo.toml
@@ -23,12 +23,12 @@ libc = { workspace = true }
 log = { workspace = true }
 serde_json = { workspace = true }
 
-[features]
-sampler = ["unwind-sys", "mach2", "nix"]
-
 [target.'cfg(target_os = "macos")'.dependencies]
 mach2 = { version = "0.4", optional = true }
 
 [target.'cfg(all(target_os = "linux", not(any(target_arch = "arm", target_arch = "aarch64", target_env = "ohos", target_env = "musl"))))'.dependencies]
 nix = { workspace = true, features = ["signal"], optional = true }
 unwind-sys = { version = "0.1.4", optional = true }
+
+[features]
+sampler = ["unwind-sys", "mach2", "nix"]
diff --git a/components/bluetooth/Cargo.toml b/components/bluetooth/Cargo.toml
index 8b22ccbd137..4be0c04c6bf 100644
--- a/components/bluetooth/Cargo.toml
+++ b/components/bluetooth/Cargo.toml
@@ -23,11 +23,6 @@ servo_config = { path = "../config" }
 servo_rand = { path = "../rand" }
 uuid = { workspace = true }
 
-[features]
-default = ["bluetooth-test"]
-native-bluetooth = ["blurz", "blurdroid", "blurmac", "bluetooth-test"]
-bluetooth-test = ["blurmock"]
-
 [target.'cfg(target_os = "linux")'.dependencies]
 blurz = { version = "0.3", optional = true }
 
@@ -36,3 +31,8 @@ blurdroid = { version = "0.1.2", optional = true }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 blurmac = { path = "../../third_party/blurmac", optional = true }
+
+[features]
+default = ["bluetooth-test"]
+native-bluetooth = ["blurz", "blurdroid", "blurmac", "bluetooth-test"]
+bluetooth-test = ["blurmock"]
diff --git a/components/bluetooth/README.md b/components/bluetooth/README.md
index ec6e536d66a..1e3a42a2e1b 100644
--- a/components/bluetooth/README.md
+++ b/components/bluetooth/README.md
@@ -1,55 +1,165 @@
-# Bluetooth Rust lib using macOS CoreBluetooth
+# Bluetooth
 
-[![Build Status](https://travis-ci.org/akosthekiss/blurmac.svg?branch=master)](https://travis-ci.org/akosthekiss/blurmac)
-[![Crates.io](https://img.shields.io/crates/v/blurmac.svg)](https://crates.io/crates/blurmac)
+Servo-specific APIs to access Bluetooth devices.
 
-The main aim of BlurMac is to enable [WebBluetooth](https://webbluetoothcg.github.io)
-in [Servo](https://github.com/servo/servo) on macOS. Thus, API and implementation
-decisions are affected by the encapsulating [Devices](https://github.com/servo/devices),
-and the sibling [BlurZ](https://github.com/szeged/blurz) and [BlurDroid](https://github.com/szeged/blurdroid)
-crates.
+Bluetooth related code is located in `bluetooth.rs`.
 
+### Implementation
 
-## Run Servo with WebBluetooth Enabled
+Underlying dependency crates:
 
-Usually, you don't want to work with BlurMac on its own but use it within Servo.
-So, most probably you'll want to run Servo with WebBluetooth enabled:
+- Android platform: [blurdroid](https://crates.io/crates/blurdroid)
+- Linux platform: [blurz](https://crates.io/crates/blurz)
+- macOS platform: [blurmac](https://crates.io/crates/blurmac)
+- `Fake` prefixed structures: [blurmock](https://crates.io/crates/blurmock)
 
-```
-RUST_LOG=blurmac \
-./mach run \
-    --dev \
-    --pref=dom.bluetooth.enabled \
-    --pref=dom.permissions.testing.allowed_in_nonsecure_contexts \
-    URL
+`Empty` prefixed structures are located in `empty.rs`.
+
+### Usage
+
+#### Without the *bluetooth-test* feature
+
+There are three supported platforms (Android, Linux, macOS), on other platforms we fall back to a default (`Empty` prefixed) implementation. Each enum (`BluetoothAdapter`, `BluetoothDevice`, etc.) will contain only one variant for each targeted platform. See the following `BluetoothAdapter` example:
+
+Android:
+
+```rust
+pub enum BluetoothAdapter {
+    Android(Arc<BluetoothAdapterAndroid>),
+}
 ```
 
-Notes:
-* The above command is actually not really BlurMac-specific (except for the `RUST_LOG`
-  part). It runs Servo with WBT enabled on any platform where WBT is supported.
-* You don't need the `RUST_LOG=blurmac` part if you don't want to see BlurMac debug
-  messages on the console.
-* You don't need the `--dev` part if you want to run a release build.
-* You don't need the `--pref=dom.permissions.testing.allowed_in_nonsecure_contexts`
-  part if your `URL` is https (but you do need it if you test a local file).
+Linux:
 
+```rust
+pub enum BluetoothAdapter {
+    Bluez(Arc<BluetoothAdapterBluez>),
+}
+```
 
-## Known Issues
+macOS:
 
-* Device RSSI can not be retrieved yet.
-* Support for included services is incomplete.
-* Descriptors are not supported yet.
-* Notifications on characteristics are not supported yet (the limitation comes from
-  Devices).
+```rust
+pub enum BluetoothAdapter {
+    Mac(Arc<BluetoothAdapterMac>),
+}
+```
 
+Unsupported platforms:
 
-## Compatibility
+```rust
+pub enum BluetoothAdapter {
+    Empty(Arc<BluetoothAdapterEmpty>),
+}
+```
 
-Tested on:
+You will have a platform specific adapter, e.g. on Android target, `BluetoothAdapter::init()` will create a `BluetoothAdapter::Android` enum variant, which wraps an `Arc<BluetoothAdapterAndroid>`.
 
-* macOS Sierra 10.12.
+```rust
+pub fn init() -> Result<BluetoothAdapter, Box<Error>> {
+    let blurdroid_adapter = try!(BluetoothAdapterAndroid::get_adapter());
+    Ok(BluetoothAdapter::Android(Arc::new(blurdroid_adapter)))
+}
+```
 
+On each platform you can call the same functions to reach the same GATT hierarchy elements. The following code can access the same Bluetooth device on all supported platforms:
 
-## Copyright and Licensing
+```rust
+use device::{BluetoothAdapter, BluetoothDevice};
 
-Licensed under the BSD 3-Clause [License](LICENSE.md).
+fn main() {
+    // Get the bluetooth adapter.
+    let adapter = BluetoothAdpater::init().expect("No bluetooth adapter found!");
+    // Get a device with the id 01:2A:00:4D:00:04 if it exists.
+    let device = adapter.get_device("01:2A:00:4D:00:04".to_owned() /*device address*/)
+                        .expect("No bluetooth device found!");
+}
+```
+
+#### With the *bluetooth-test* feature
+
+Each enum (`BluetoothAdapter`, `BluetoothDevice`, etc.) will contain one variant of the three possible default target, and a `Mock` variant, which wraps a `Fake` structure.
+
+Android:
+
+```rust
+pub enum BluetoothAdapter {
+    Android(Arc<BluetoothAdapterAndroid>),
+    Mock(Arc<FakeBluetoothAdapter>),
+}
+```
+
+Linux:
+
+```rust
+pub enum BluetoothAdapter {
+    Bluez(Arc<BluetoothAdapterBluez>),
+    Mock(Arc<FakeBluetoothAdapter>),
+}
+```
+
+macOS:
+
+```rust
+pub enum BluetoothAdapter {
+    Mac(Arc<BluetoothAdapterMac>),
+    Mock(Arc<FakeBluetoothAdapter>),
+}
+```
+
+Unsupported platforms:
+
+```rust
+pub enum BluetoothAdapter {
+    Empty(Arc<BluetoothAdapterEmpty>),
+    Mock(Arc<FakeBluetoothAdapter>),
+}
+```
+
+Beside the platform specific structures, you can create and access mock adapters, devices, services etc. These mock structures implements all the platform specific functions too. To create a mock GATT hierarchy, first you need to call the `BluetoothAdapter::init_mock()` function, insted of `BluetoothAdapter::init()`.
+
+```rust
+use device::{BluetoothAdapter, BluetoothDevice};
+use std::String;
+
+// This function takes a BluetoothAdapter,
+// and print the ids of the devices, which the adapter can find.
+fn print_device_ids(adapter: &BluetoothAdpater) {
+    let devices = match adapter.get_devices().expect("No devices on the adapter!");
+    for device in devices {
+        println!("{:?}", device.get_id());
+    }
+}
+
+fn main() {
+// This code uses a real adapter.
+    // Get the bluetooth adapter.
+    let adapter = BluetoothAdpater::init().expect("No bluetooth adapter found!");
+    // Get a device with the id 01:2A:00:4D:00:04 if it exists.
+    let device = adapter.get_device("01:2A:00:4D:00:04".to_owned() /*device address*/)
+                        .expect("No bluetooth device found!");
+
+// This code uses a mock adapter.
+    // Creating a mock adapter.
+    let mock_adapter = BluetoothAdpater::init_mock().unwrap();
+    // Creating a mock device.
+    let mock_device =
+        BluetoothDevice::create_mock_device(mock_adapter,
+                                            "device_id_string_goes_here".to_owned())
+        .unwrap();
+    // Changing its device_id.
+    let new_device_id = String::from("new_device_id_string".to_owned());
+    mock_device.set_id(new_device_id.clone());
+    // Calling the get_id function must return the last id we set.
+    assert_equals!(new_device_id, mock_device.get_id());
+    // Getting the mock_device with its id
+    // must return the same mock device object we created before.
+    assert_equals!(Some(mock_device),
+                   mock_adapter.get_device(new_device_id.clone()).unwrap());
+    // The print_device_ids function accept real and mock adapters too.
+    print_device_ids(&adapter);
+    print_device_ids(&mock_adapter);
+}
+```
+
+Calling a test function on a not `Mock` structure, will result an error with the message: `Error! Test functions are not supported on real devices!`.
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index 10ac5a35cd4..6084fc6e434 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -11,23 +11,15 @@ rust-version.workspace = true
 name = "canvas"
 path = "lib.rs"
 
-[features]
-webgl_backtrace = ["canvas_traits/webgl_backtrace"]
-webxr = ["dep:webxr", "dep:webxr-api"]
-
 [dependencies]
 app_units = { workspace = true }
-bitflags = { workspace = true }
-byteorder = { workspace = true }
 canvas_traits = { workspace = true }
+compositing_traits = { workspace = true }
 crossbeam-channel = { workspace = true }
 cssparser = { workspace = true }
 euclid = { workspace = true }
-fnv = { workspace = true }
 font-kit = "0.14"
 fonts = { path = "../fonts" }
-glow = { workspace = true }
-half = "2"
 ipc-channel = { workspace = true }
 log = { workspace = true }
 lyon_geom = "1.0.4"
@@ -37,11 +29,7 @@ pixels = { path = "../pixels" }
 range = { path = "../range" }
 raqote = "0.8.5"
 servo_arc = { workspace = true }
+snapshot = { workspace = true }
 stylo = { workspace = true }
-surfman = { workspace = true }
 unicode-script = { workspace = true }
-webrender = { workspace = true }
 webrender_api = { workspace = true }
-webrender_traits = { workspace = true }
-webxr = { path = "../webxr", features = ["ipc"], optional = true }
-webxr-api = { workspace = true, features = ["ipc"], optional = true }
diff --git a/components/canvas/backend.rs b/components/canvas/backend.rs
new file mode 100644
index 00000000000..7e348fbc9b9
--- /dev/null
+++ b/components/canvas/backend.rs
@@ -0,0 +1,270 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use canvas_traits::canvas::{
+    CompositionOrBlending, FillOrStrokeStyle, LineCapStyle, LineJoinStyle,
+};
+use euclid::Angle;
+use euclid::default::{Point2D, Rect, Size2D, Transform2D, Vector2D};
+use lyon_geom::Arc;
+use style::color::AbsoluteColor;
+
+use crate::canvas_data::{CanvasPaintState, Filter, TextRun};
+
+pub(crate) trait Backend: Clone + Sized {
+    type Pattern<'a>: PatternHelpers + Clone;
+    type StrokeOptions: StrokeOptionsHelpers + Clone;
+    type Color: Clone;
+    type DrawOptions: DrawOptionsHelpers + Clone;
+    type CompositionOp;
+    type DrawTarget: GenericDrawTarget<Self>;
+    type PathBuilder: GenericPathBuilder<Self>;
+    type SourceSurface;
+    type Bytes<'a>: AsRef<[u8]>;
+    type Path: PathHelpers<Self> + Clone;
+    type GradientStop;
+    type GradientStops;
+
+    fn get_composition_op(&self, opts: &Self::DrawOptions) -> Self::CompositionOp;
+    fn need_to_draw_shadow(&self, color: &Self::Color) -> bool;
+    fn set_shadow_color(&mut self, color: AbsoluteColor, state: &mut CanvasPaintState<'_, Self>);
+    fn set_fill_style(
+        &mut self,
+        style: FillOrStrokeStyle,
+        state: &mut CanvasPaintState<'_, Self>,
+        drawtarget: &Self::DrawTarget,
+    );
+    fn set_stroke_style(
+        &mut self,
+        style: FillOrStrokeStyle,
+        state: &mut CanvasPaintState<'_, Self>,
+        drawtarget: &Self::DrawTarget,
+    );
+    fn set_global_composition(
+        &mut self,
+        op: CompositionOrBlending,
+        state: &mut CanvasPaintState<'_, Self>,
+    );
+    fn create_drawtarget(&self, size: Size2D<u64>) -> Self::DrawTarget;
+    fn new_paint_state<'a>(&self) -> CanvasPaintState<'a, Self>;
+}
+
+// This defines required methods for a DrawTarget (currently only implemented for raqote).  The
+// prototypes are derived from the now-removed Azure backend's methods.
+pub(crate) trait GenericDrawTarget<B: Backend> {
+    fn clear_rect(&mut self, rect: &Rect<f32>);
+    fn copy_surface(
+        &mut self,
+        surface: B::SourceSurface,
+        source: Rect<i32>,
+        destination: Point2D<i32>,
+    );
+    fn create_path_builder(&self) -> B::PathBuilder;
+    fn create_similar_draw_target(&self, size: &Size2D<i32>) -> Self;
+    fn create_source_surface_from_data(&self, data: &[u8]) -> Option<B::SourceSurface>;
+    fn draw_surface(
+        &mut self,
+        surface: B::SourceSurface,
+        dest: Rect<f64>,
+        source: Rect<f64>,
+        filter: Filter,
+        draw_options: &B::DrawOptions,
+    );
+    fn draw_surface_with_shadow(
+        &self,
+        surface: B::SourceSurface,
+        dest: &Point2D<f32>,
+        color: &B::Color,
+        offset: &Vector2D<f32>,
+        sigma: f32,
+        operator: B::CompositionOp,
+    );
+    fn fill(&mut self, path: &B::Path, pattern: B::Pattern<'_>, draw_options: &B::DrawOptions);
+    fn fill_text(
+        &mut self,
+        text_runs: Vec<TextRun>,
+        start: Point2D<f32>,
+        pattern: &B::Pattern<'_>,
+        draw_options: &B::DrawOptions,
+    );
+    fn fill_rect(
+        &mut self,
+        rect: &Rect<f32>,
+        pattern: B::Pattern<'_>,
+        draw_options: Option<&B::DrawOptions>,
+    );
+    fn get_size(&self) -> Size2D<i32>;
+    fn get_transform(&self) -> Transform2D<f32>;
+    fn pop_clip(&mut self);
+    fn push_clip(&mut self, path: &B::Path);
+    fn set_transform(&mut self, matrix: &Transform2D<f32>);
+    fn stroke(
+        &mut self,
+        path: &B::Path,
+        pattern: B::Pattern<'_>,
+        stroke_options: &B::StrokeOptions,
+        draw_options: &B::DrawOptions,
+    );
+    fn stroke_line(
+        &mut self,
+        start: Point2D<f32>,
+        end: Point2D<f32>,
+        pattern: B::Pattern<'_>,
+        stroke_options: &B::StrokeOptions,
+        draw_options: &B::DrawOptions,
+    );
+    fn stroke_rect(
+        &mut self,
+        rect: &Rect<f32>,
+        pattern: B::Pattern<'_>,
+        stroke_options: &B::StrokeOptions,
+        draw_options: &B::DrawOptions,
+    );
+    fn surface(&self) -> B::SourceSurface;
+    fn bytes(&'_ self) -> B::Bytes<'_>;
+}
+
+/// A generic PathBuilder that abstracts the interface for azure's and raqote's PathBuilder.
+pub(crate) trait GenericPathBuilder<B: Backend> {
+    fn arc(
+        &mut self,
+        origin: Point2D<f32>,
+        radius: f32,
+        start_angle: f32,
+        end_angle: f32,
+        anticlockwise: bool,
+    ) {
+        Self::ellipse(
+            self,
+            origin,
+            radius,
+            radius,
+            0.,
+            start_angle,
+            end_angle,
+            anticlockwise,
+        );
+    }
+    fn bezier_curve_to(
+        &mut self,
+        control_point1: &Point2D<f32>,
+        control_point2: &Point2D<f32>,
+        control_point3: &Point2D<f32>,
+    );
+    fn close(&mut self);
+    #[allow(clippy::too_many_arguments)]
+    fn ellipse(
+        &mut self,
+        origin: Point2D<f32>,
+        radius_x: f32,
+        radius_y: f32,
+        rotation_angle: f32,
+        start_angle: f32,
+        end_angle: f32,
+        anticlockwise: bool,
+    ) {
+        let mut start = Angle::radians(start_angle);
+        let mut end = Angle::radians(end_angle);
+
+        // Wrap angles mod 2 * PI if necessary
+        if !anticlockwise && start > end + Angle::two_pi() ||
+            anticlockwise && end > start + Angle::two_pi()
+        {
+            start = start.positive();
+            end = end.positive();
+        }
+
+        // Calculate the total arc we're going to sweep.
+        let sweep = match anticlockwise {
+            true => {
+                if end - start == Angle::two_pi() {
+                    -Angle::two_pi()
+                } else if end > start {
+                    -(Angle::two_pi() - (end - start))
+                } else {
+                    -(start - end)
+                }
+            },
+            false => {
+                if start - end == Angle::two_pi() {
+                    Angle::two_pi()
+                } else if start > end {
+                    Angle::two_pi() - (start - end)
+                } else {
+                    end - start
+                }
+            },
+        };
+
+        let arc: Arc<f32> = Arc {
+            center: origin,
+            radii: Vector2D::new(radius_x, radius_y),
+            start_angle: start,
+            sweep_angle: sweep,
+            x_rotation: Angle::radians(rotation_angle),
+        };
+
+        self.line_to(arc.from());
+
+        arc.for_each_quadratic_bezier(&mut |q| {
+            self.quadratic_curve_to(&q.ctrl, &q.to);
+        });
+    }
+    fn get_current_point(&mut self) -> Option<Point2D<f32>>;
+    fn line_to(&mut self, point: Point2D<f32>);
+    fn move_to(&mut self, point: Point2D<f32>);
+    fn quadratic_curve_to(&mut self, control_point: &Point2D<f32>, end_point: &Point2D<f32>);
+    fn svg_arc(
+        &mut self,
+        radius_x: f32,
+        radius_y: f32,
+        rotation_angle: f32,
+        large_arc: bool,
+        sweep: bool,
+        end_point: Point2D<f32>,
+    ) {
+        let Some(start) = self.get_current_point() else {
+            return;
+        };
+
+        let arc = lyon_geom::SvgArc {
+            from: start,
+            to: end_point,
+            radii: lyon_geom::vector(radius_x, radius_y),
+            x_rotation: lyon_geom::Angle::degrees(rotation_angle),
+            flags: lyon_geom::ArcFlags { large_arc, sweep },
+        };
+
+        arc.for_each_quadratic_bezier(&mut |q| {
+            self.quadratic_curve_to(&q.ctrl, &q.to);
+        });
+    }
+    fn finish(&mut self) -> B::Path;
+}
+
+pub(crate) trait PatternHelpers {
+    fn is_zero_size_gradient(&self) -> bool;
+    fn draw_rect(&self, rect: &Rect<f32>) -> Rect<f32>;
+}
+
+pub(crate) trait StrokeOptionsHelpers {
+    fn set_line_width(&mut self, _val: f32);
+    fn set_miter_limit(&mut self, _val: f32);
+    fn set_line_join(&mut self, val: LineJoinStyle);
+    fn set_line_cap(&mut self, val: LineCapStyle);
+    fn set_line_dash(&mut self, items: Vec<f32>);
+    fn set_line_dash_offset(&mut self, offset: f32);
+}
+
+pub(crate) trait DrawOptionsHelpers {
+    fn set_alpha(&mut self, val: f32);
+}
+
+pub(crate) trait PathHelpers<B: Backend> {
+    fn transformed_copy_to_builder(&self, transform: &Transform2D<f32>) -> B::PathBuilder;
+
+    fn contains_point(&self, x: f64, y: f64, path_transform: &Transform2D<f32>) -> bool;
+
+    fn copy_to_builder(&self) -> B::PathBuilder;
+}
diff --git a/components/canvas/canvas_data.rs b/components/canvas/canvas_data.rs
index 5462098abf5..ea30589d0af 100644
--- a/components/canvas/canvas_data.rs
+++ b/components/canvas/canvas_data.rs
@@ -2,11 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use std::marker::PhantomData;
 use std::mem;
 use std::sync::Arc;
 
 use app_units::Au;
 use canvas_traits::canvas::*;
+use compositing_traits::{CrossProcessCompositorApi, ImageUpdate, SerializableImageData};
 use euclid::default::{Box2D, Point2D, Rect, Size2D, Transform2D, Vector2D};
 use euclid::point2;
 use fonts::{
@@ -15,20 +17,26 @@ use fonts::{
 };
 use ipc_channel::ipc::{IpcSender, IpcSharedMemory};
 use log::warn;
-use num_traits::ToPrimitive;
 use range::Range;
 use servo_arc::Arc as ServoArc;
+use snapshot::Snapshot;
 use style::color::AbsoluteColor;
 use style::properties::style_structs::Font as FontStyleStruct;
 use unicode_script::Script;
 use webrender_api::units::RectExt as RectExt_;
 use webrender_api::{ImageDescriptor, ImageDescriptorFlags, ImageFormat, ImageKey};
-use webrender_traits::{CrossProcessCompositorApi, ImageUpdate, SerializableImageData};
 
-use crate::raqote_backend::Repetition;
+use crate::backend::{
+    Backend, DrawOptionsHelpers as _, GenericDrawTarget as _, GenericPathBuilder, PathHelpers,
+    PatternHelpers, StrokeOptionsHelpers as _,
+};
 
-fn to_path(path: &[PathSegment], mut builder: Box<dyn GenericPathBuilder>) -> Path {
-    let mut build_ref = PathBuilderRef {
+// Asserts on WR texture cache update for zero sized image with raw data.
+// https://github.com/servo/webrender/blob/main/webrender/src/texture_cache.rs#L1475
+const MIN_WR_IMAGE_SIZE: Size2D<u64> = Size2D::new(1, 1);
+
+fn to_path<B: Backend>(path: &[PathSegment], mut builder: B::PathBuilder) -> B::Path {
+    let mut build_ref = PathBuilderRef::<B> {
         builder: &mut builder,
         transform: Transform2D::identity(),
     };
@@ -107,20 +115,20 @@ fn to_path(path: &[PathSegment], mut builder: Box<dyn GenericPathBuilder>) -> Pa
 /// draw the path, we convert it back to userspace and draw it
 /// with the correct transform applied.
 /// TODO: De-abstract now that Azure is removed?
-enum PathState {
+enum PathState<B: Backend> {
     /// Path builder in user-space. If a transform has been applied
     /// but no further path operations have occurred, it is stored
     /// in the optional field.
-    UserSpacePathBuilder(Box<dyn GenericPathBuilder>, Option<Transform2D<f32>>),
+    UserSpacePathBuilder(B::PathBuilder, Option<Transform2D<f32>>),
     /// Path builder in device-space.
-    DeviceSpacePathBuilder(Box<dyn GenericPathBuilder>),
+    DeviceSpacePathBuilder(B::PathBuilder),
     /// Path in user-space. If a transform has been applied but
     /// but no further path operations have occurred, it is stored
     /// in the optional field.
-    UserSpacePath(Path, Option<Transform2D<f32>>),
+    UserSpacePath(B::Path, Option<Transform2D<f32>>),
 }
 
-impl PathState {
+impl<B: Backend> PathState<B> {
     fn is_path(&self) -> bool {
         match *self {
             PathState::UserSpacePath(..) => true,
@@ -128,7 +136,7 @@ impl PathState {
         }
     }
 
-    fn path(&self) -> &Path {
+    fn path(&self) -> &B::Path {
         match *self {
             PathState::UserSpacePath(ref p, _) => p,
             PathState::UserSpacePathBuilder(..) | PathState::DeviceSpacePathBuilder(..) => {
@@ -138,84 +146,14 @@ impl PathState {
     }
 }
 
-pub trait Backend {
-    fn get_composition_op(&self, opts: &DrawOptions) -> CompositionOp;
-    fn need_to_draw_shadow(&self, color: &Color) -> bool;
-    fn set_shadow_color(&mut self, color: AbsoluteColor, state: &mut CanvasPaintState<'_>);
-    fn set_fill_style(
-        &mut self,
-        style: FillOrStrokeStyle,
-        state: &mut CanvasPaintState<'_>,
-        drawtarget: &dyn GenericDrawTarget,
-    );
-    fn set_stroke_style(
-        &mut self,
-        style: FillOrStrokeStyle,
-        state: &mut CanvasPaintState<'_>,
-        drawtarget: &dyn GenericDrawTarget,
-    );
-    fn set_global_composition(
-        &mut self,
-        op: CompositionOrBlending,
-        state: &mut CanvasPaintState<'_>,
-    );
-    fn create_drawtarget(&self, size: Size2D<u64>) -> Box<dyn GenericDrawTarget>;
-    fn recreate_paint_state<'a>(&self, state: &CanvasPaintState<'a>) -> CanvasPaintState<'a>;
-}
-
-/// A generic PathBuilder that abstracts the interface for azure's and raqote's PathBuilder.
-/// TODO: De-abstract now that Azure is removed?
-pub trait GenericPathBuilder {
-    fn arc(
-        &mut self,
-        origin: Point2D<f32>,
-        radius: f32,
-        start_angle: f32,
-        end_angle: f32,
-        anticlockwise: bool,
-    );
-    fn bezier_curve_to(
-        &mut self,
-        control_point1: &Point2D<f32>,
-        control_point2: &Point2D<f32>,
-        control_point3: &Point2D<f32>,
-    );
-    fn close(&mut self);
-    #[allow(clippy::too_many_arguments)]
-    fn ellipse(
-        &mut self,
-        origin: Point2D<f32>,
-        radius_x: f32,
-        radius_y: f32,
-        rotation_angle: f32,
-        start_angle: f32,
-        end_angle: f32,
-        anticlockwise: bool,
-    );
-    fn get_current_point(&mut self) -> Option<Point2D<f32>>;
-    fn line_to(&mut self, point: Point2D<f32>);
-    fn move_to(&mut self, point: Point2D<f32>);
-    fn quadratic_curve_to(&mut self, control_point: &Point2D<f32>, end_point: &Point2D<f32>);
-    fn svg_arc(
-        &mut self,
-        radius_x: f32,
-        radius_y: f32,
-        rotation_angle: f32,
-        large_arc: bool,
-        sweep: bool,
-        end_point: Point2D<f32>,
-    );
-    fn finish(&mut self) -> Path;
-}
-
 /// A wrapper around a stored PathBuilder and an optional transformation that should be
 /// applied to any points to ensure they are in the matching device space.
-struct PathBuilderRef<'a> {
-    builder: &'a mut Box<dyn GenericPathBuilder>,
+struct PathBuilderRef<'a, B: Backend> {
+    builder: &'a mut B::PathBuilder,
     transform: Transform2D<f32>,
 }
 
-impl PathBuilderRef<'_> {
+impl<B: Backend> PathBuilderRef<'_, B> {
     fn line_to(&mut self, pt: &Point2D<f32>) {
         let pt = self.transform.transform_point(*pt);
         self.builder.line_to(pt);
@@ -336,7 +274,7 @@ impl PathBuilderRef<'_> {
     }
 
     #[allow(clippy::too_many_arguments)]
-    pub fn ellipse(
+    pub(crate) fn ellipse(
         &mut self,
         center: &Point2D<f32>,
         radius_x: f32,
@@ -425,9 +363,9 @@ impl UnshapedTextRun<'_> {
     }
 }
 
-pub struct TextRun {
-    pub font: FontRef,
-    pub glyphs: Arc<GlyphStore>,
+pub(crate) struct TextRun {
+    pub(crate) font: FontRef,
+    pub(crate) glyphs: Arc<GlyphStore>,
 }
 
 impl TextRun {
@@ -453,149 +391,31 @@ impl TextRun {
     }
 }
 
-// This defines required methods for a DrawTarget (currently only implemented for raqote).  The
-// prototypes are derived from the now-removed Azure backend's methods.
-pub trait GenericDrawTarget {
-    fn clear_rect(&mut self, rect: &Rect<f32>);
-    fn copy_surface(
-        &mut self,
-        surface: SourceSurface,
-        source: Rect<i32>,
-        destination: Point2D<i32>,
-    );
-    fn create_gradient_stops(&self, gradient_stops: Vec<GradientStop>) -> GradientStops;
-    fn create_path_builder(&self) -> Box<dyn GenericPathBuilder>;
-    fn create_similar_draw_target(&self, size: &Size2D<i32>) -> Box<dyn GenericDrawTarget>;
-    fn create_source_surface_from_data(&self, data: &[u8]) -> Option<SourceSurface>;
-    fn draw_surface(
-        &mut self,
-        surface: SourceSurface,
-        dest: Rect<f64>,
-        source: Rect<f64>,
-        filter: Filter,
-        draw_options: &DrawOptions,
-    );
-    fn draw_surface_with_shadow(
-        &self,
-        surface: SourceSurface,
-        dest: &Point2D<f32>,
-        color: &Color,
-        offset: &Vector2D<f32>,
-        sigma: f32,
-        operator: CompositionOp,
-    );
-    fn fill(&mut self, path: &Path, pattern: Pattern, draw_options: &DrawOptions);
-    fn fill_text(
-        &mut self,
-        text_runs: Vec<TextRun>,
-        start: Point2D<f32>,
-        pattern: &Pattern,
-        draw_options: &DrawOptions,
-    );
-    fn fill_rect(&mut self, rect: &Rect<f32>, pattern: Pattern, draw_options: Option<&DrawOptions>);
-    fn get_size(&self) -> Size2D<i32>;
-    fn get_transform(&self) -> Transform2D<f32>;
-    fn pop_clip(&mut self);
-    fn push_clip(&mut self, path: &Path);
-    fn set_transform(&mut self, matrix: &Transform2D<f32>);
-    fn snapshot(&self) -> SourceSurface;
-    fn stroke(
-        &mut self,
-        path: &Path,
-        pattern: Pattern,
-        stroke_options: &StrokeOptions,
-        draw_options: &DrawOptions,
-    );
-    fn stroke_line(
-        &mut self,
-        start: Point2D<f32>,
-        end: Point2D<f32>,
-        pattern: Pattern,
-        stroke_options: &StrokeOptions,
-        draw_options: &DrawOptions,
-    );
-    fn stroke_rect(
-        &mut self,
-        rect: &Rect<f32>,
-        pattern: Pattern,
-        stroke_options: &StrokeOptions,
-        draw_options: &DrawOptions,
-    );
-    fn snapshot_data(&self, f: &dyn Fn(&[u8]) -> Vec<u8>) -> Vec<u8>;
-    fn snapshot_data_owned(&self) -> Vec<u8>;
-}
-
-pub enum GradientStop {
-    Raqote(raqote::GradientStop),
-}
-
-pub enum GradientStops {
-    Raqote(Vec<raqote::GradientStop>),
-}
-
-#[derive(Clone)]
-pub enum Color {
-    Raqote(raqote::SolidSource),
-}
-
-#[derive(Clone)]
-pub enum CompositionOp {
-    Raqote(raqote::BlendMode),
-}
-
-#[derive(Clone)]
-pub enum SourceSurface {
-    Raqote(Vec<u8>), // TODO: See if we can avoid the alloc (probably?)
-}
-
-#[derive(Clone)]
-pub enum Path {
-    Raqote(raqote::Path),
-}
-
-#[derive(Clone)]
-pub enum Pattern<'a> {
-    Raqote(crate::raqote_backend::Pattern<'a>),
-}
-
-#[derive(Clone)]
-pub enum DrawOptions {
-    Raqote(raqote::DrawOptions),
-}
-
-#[derive(Clone)]
-pub enum StrokeOptions {
-    Raqote(raqote::StrokeStyle),
-}
-
 #[derive(Clone, Copy)]
-pub enum Filter {
+pub(crate) enum Filter {
     Bilinear,
     Nearest,
 }
 
-pub struct CanvasData<'a> {
-    backend: Box<dyn Backend>,
-    drawtarget: Box<dyn GenericDrawTarget>,
-    path_state: Option<PathState>,
-    state: CanvasPaintState<'a>,
-    saved_states: Vec<CanvasPaintState<'a>>,
+pub(crate) struct CanvasData<'a, B: Backend> {
+    backend: B,
+    drawtarget: B::DrawTarget,
+    path_state: Option<PathState<B>>,
+    state: CanvasPaintState<'a, B>,
+    saved_states: Vec<CanvasPaintState<'a, B>>,
     compositor_api: CrossProcessCompositorApi,
     image_key: ImageKey,
     font_context: Arc<FontContext>,
 }
 
-fn create_backend() -> Box<dyn Backend> {
-    Box::new(crate::raqote_backend::RaqoteBackend)
-}
-
-impl<'a> CanvasData<'a> {
-    pub fn new(
+impl<'a, B: Backend> CanvasData<'a, B> {
+    pub(crate) fn new(
         size: Size2D<u64>,
         compositor_api: CrossProcessCompositorApi,
         font_context: Arc<FontContext>,
-    ) -> CanvasData<'a> {
-        let backend = create_backend();
+        backend: B,
+    ) -> CanvasData<'a, B> {
+        let size = size.max(MIN_WR_IMAGE_SIZE);
         let draw_target = backend.create_drawtarget(size);
         let image_key = compositor_api.generate_image_key().unwrap();
         let descriptor = ImageDescriptor {
@@ -605,15 +425,14 @@ impl<'a> CanvasData<'a> {
             offset: 0,
             flags: ImageDescriptorFlags::empty(),
         };
-        let data = SerializableImageData::Raw(IpcSharedMemory::from_bytes(
-            &draw_target.snapshot_data_owned(),
-        ));
+        let data =
+            SerializableImageData::Raw(IpcSharedMemory::from_bytes(draw_target.bytes().as_ref()));
         compositor_api.update_images(vec![ImageUpdate::AddImage(image_key, descriptor, data)]);
         CanvasData {
+            state: backend.new_paint_state(),
             backend,
             drawtarget: draw_target,
             path_state: None,
-            state: CanvasPaintState::default(),
             saved_states: vec![],
             compositor_api,
             image_key,
@@ -621,14 +440,14 @@ impl<'a> CanvasData<'a> {
         }
     }
 
-    pub fn image_key(&self) -> ImageKey {
+    pub(crate) fn image_key(&self) -> ImageKey {
         self.image_key
     }
 
-    pub fn draw_image(
+    pub(crate) fn draw_image(
         &mut self,
         image_data: &[u8],
-        image_size: Size2D<f64>,
+        image_size: Size2D<u64>,
         dest_rect: Rect<f64>,
         source_rect: Rect<f64>,
         smoothing_enabled: bool,
@@ -637,15 +456,15 @@ impl<'a> CanvasData<'a> {
         // We round up the floating pixel values to draw the pixels
         let source_rect = source_rect.ceil();
         // It discards the extra pixels (if any) that won't be painted
-        let image_data = if Rect::from_size(image_size).contains_rect(&source_rect) {
-            pixels::rgba8_get_rect(image_data, image_size.to_u64(), source_rect.to_u64()).into()
+        let image_data = if Rect::from_size(image_size.to_f64()).contains_rect(&source_rect) {
+            pixels::rgba8_get_rect(image_data, image_size, source_rect.to_u64()).into()
         } else {
             image_data.into()
         };
 
         let draw_options = self.state.draw_options.clone();
-        let writer = |draw_target: &mut dyn GenericDrawTarget| {
-            write_image(
+        let writer = |draw_target: &mut B::DrawTarget| {
+            write_image::<B>(
                 draw_target,
                 image_data,
                 source_rect.size,
@@ -665,15 +484,15 @@ impl<'a> CanvasData<'a> {
             // TODO(pylbrecht) pass another closure for raqote
             self.draw_with_shadow(&rect, writer);
         } else {
-            writer(&mut *self.drawtarget);
+            writer(&mut self.drawtarget);
         }
     }
 
-    pub fn save_context_state(&mut self) {
+    pub(crate) fn save_context_state(&mut self) {
         self.saved_states.push(self.state.clone());
     }
 
-    pub fn restore_context_state(&mut self) {
+    pub(crate) fn restore_context_state(&mut self) {
         if let Some(state) = self.saved_states.pop() {
             let _ = mem::replace(&mut self.state, state);
             self.drawtarget.set_transform(&self.state.transform);
@@ -681,7 +500,7 @@ impl<'a> CanvasData<'a> {
         }
     }
 
-    pub fn fill_text_with_size(
+    pub(crate) fn fill_text_with_size(
         &mut self,
         text: String,
         x: f64,
@@ -760,7 +579,7 @@ impl<'a> CanvasData<'a> {
     }
 
     /// <https://html.spec.whatwg.org/multipage/#text-preparation-algorithm>
-    pub fn fill_text(
+    pub(crate) fn fill_text(
         &mut self,
         text: String,
         x: f64,
@@ -778,7 +597,7 @@ impl<'a> CanvasData<'a> {
 
     /// <https://html.spec.whatwg.org/multipage/#text-preparation-algorithm>
     /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-measuretext>
-    pub fn measure_text(&mut self, text: String) -> TextMetrics {
+    pub(crate) fn measure_text(&mut self, text: String) -> TextMetrics {
         // > Step 2: Replace all ASCII whitespace in text with U+0020 SPACE characters.
         let text = replace_ascii_whitespace(text);
         let Some(ref font_style) = self.state.font_style else {
@@ -930,49 +749,15 @@ impl<'a> CanvasData<'a> {
         point2(x + anchor_x, y + anchor_y)
     }
 
-    pub fn fill_rect(&mut self, rect: &Rect<f32>) {
+    pub(crate) fn fill_rect(&mut self, rect: &Rect<f32>) {
         if self.state.fill_style.is_zero_size_gradient() {
             return; // Paint nothing if gradient size is zero.
         }
 
-        let draw_rect = match &self.state.fill_style {
-            Pattern::Raqote(pattern) => match pattern {
-                crate::raqote_backend::Pattern::Surface(pattern) => {
-                    let pattern_rect = Rect::new(Point2D::origin(), pattern.size());
-                    let mut draw_rect = rect.intersection(&pattern_rect).unwrap_or(Rect::zero());
-
-                    match pattern.repetition() {
-                        Repetition::NoRepeat => {
-                            draw_rect.size.width =
-                                draw_rect.size.width.min(pattern_rect.size.width);
-                            draw_rect.size.height =
-                                draw_rect.size.height.min(pattern_rect.size.height);
-                        },
-                        Repetition::RepeatX => {
-                            draw_rect.size.width = rect.size.width;
-                            draw_rect.size.height =
-                                draw_rect.size.height.min(pattern_rect.size.height);
-                        },
-                        Repetition::RepeatY => {
-                            draw_rect.size.height = rect.size.height;
-                            draw_rect.size.width =
-                                draw_rect.size.width.min(pattern_rect.size.width);
-                        },
-                        Repetition::Repeat => {
-                            draw_rect = *rect;
-                        },
-                    }
-
-                    draw_rect
-                },
-                crate::raqote_backend::Pattern::Color(..) |
-                crate::raqote_backend::Pattern::LinearGradient(..) |
-                crate::raqote_backend::Pattern::RadialGradient(..) => *rect,
-            },
-        };
+        let draw_rect = self.state.fill_style.draw_rect(rect);
 
         if self.need_to_draw_shadow() {
-            self.draw_with_shadow(&draw_rect, |new_draw_target: &mut dyn GenericDrawTarget| {
+            self.draw_with_shadow(&draw_rect, |new_draw_target: &mut B::DrawTarget| {
                 new_draw_target.fill_rect(
                     &draw_rect,
                     self.state.fill_style.clone(),
@@ -988,17 +773,17 @@ impl<'a> CanvasData<'a> {
         }
     }
 
-    pub fn clear_rect(&mut self, rect: &Rect<f32>) {
+    pub(crate) fn clear_rect(&mut self, rect: &Rect<f32>) {
         self.drawtarget.clear_rect(rect);
     }
 
-    pub fn stroke_rect(&mut self, rect: &Rect<f32>) {
+    pub(crate) fn stroke_rect(&mut self, rect: &Rect<f32>) {
         if self.state.stroke_style.is_zero_size_gradient() {
             return; // Paint nothing if gradient size is zero.
         }
 
         if self.need_to_draw_shadow() {
-            self.draw_with_shadow(rect, |new_draw_target: &mut dyn GenericDrawTarget| {
+            self.draw_with_shadow(rect, |new_draw_target: &mut B::DrawTarget| {
                 new_draw_target.stroke_rect(
                     rect,
                     self.state.stroke_style.clone(),
@@ -1026,12 +811,12 @@ impl<'a> CanvasData<'a> {
         }
     }
 
-    pub fn begin_path(&mut self) {
+    pub(crate) fn begin_path(&mut self) {
         // Erase any traces of previous paths that existed before this.
         self.path_state = None;
     }
 
-    pub fn close_path(&mut self) {
+    pub(crate) fn close_path(&mut self) {
         self.path_builder().close();
     }
 
@@ -1093,14 +878,14 @@ impl<'a> CanvasData<'a> {
         assert!(self.path_state.as_ref().unwrap().is_path())
     }
 
-    fn path(&self) -> &Path {
+    fn path(&self) -> &B::Path {
         self.path_state
             .as_ref()
             .expect("Should have called ensure_path()")
             .path()
     }
 
-    pub fn fill(&mut self) {
+    pub(crate) fn fill(&mut self) {
         if self.state.fill_style.is_zero_size_gradient() {
             return; // Paint nothing if gradient size is zero.
         }
@@ -1109,16 +894,16 @@ impl<'a> CanvasData<'a> {
         self.drawtarget.fill(
             &self.path().clone(),
             self.state.fill_style.clone(),
-            &self.state.draw_options,
+            &self.state.draw_options.clone(),
         );
     }
 
-    pub fn fill_path(&mut self, path: &[PathSegment]) {
+    pub(crate) fn fill_path(&mut self, path: &[PathSegment]) {
         if self.state.fill_style.is_zero_size_gradient() {
             return; // Paint nothing if gradient size is zero.
         }
 
-        let path = to_path(path, self.drawtarget.create_path_builder());
+        let path = to_path::<B>(path, self.drawtarget.create_path_builder());
 
         self.drawtarget.fill(
             &path,
@@ -1127,7 +912,7 @@ impl<'a> CanvasData<'a> {
         );
     }
 
-    pub fn stroke(&mut self) {
+    pub(crate) fn stroke(&mut self) {
         if self.state.stroke_style.is_zero_size_gradient() {
             return; // Paint nothing if gradient size is zero.
         }
@@ -1141,12 +926,12 @@ impl<'a> CanvasData<'a> {
         );
     }
 
-    pub fn stroke_path(&mut self, path: &[PathSegment]) {
+    pub(crate) fn stroke_path(&mut self, path: &[PathSegment]) {
         if self.state.stroke_style.is_zero_size_gradient() {
             return; // Paint nothing if gradient size is zero.
         }
 
-        let path = to_path(path, self.drawtarget.create_path_builder());
+        let path = to_path::<B>(path, self.drawtarget.create_path_builder());
 
         self.drawtarget.stroke(
             &path,
@@ -1156,18 +941,18 @@ impl<'a> CanvasData<'a> {
         );
     }
 
-    pub fn clip(&mut self) {
+    pub(crate) fn clip(&mut self) {
         self.ensure_path();
         let path = self.path().clone();
         self.drawtarget.push_clip(&path);
     }
 
-    pub fn clip_path(&mut self, path: &[PathSegment]) {
-        let path = to_path(path, self.drawtarget.create_path_builder());
+    pub(crate) fn clip_path(&mut self, path: &[PathSegment]) {
+        let path = to_path::<B>(path, self.drawtarget.create_path_builder());
         self.drawtarget.push_clip(&path);
     }
 
-    pub fn is_point_in_path(
+    pub(crate) fn is_point_in_path(
         &mut self,
         x: f64,
         y: f64,
@@ -1186,7 +971,7 @@ impl<'a> CanvasData<'a> {
         chan.send(result).unwrap();
     }
 
-    pub fn is_point_in_path_(
+    pub(crate) fn is_point_in_path_(
         &mut self,
         path: &[PathSegment],
         x: f64,
@@ -1198,7 +983,7 @@ impl<'a> CanvasData<'a> {
             Some(PathState::UserSpacePath(_, Some(transform))) => transform,
             Some(_) | None => &self.drawtarget.get_transform(),
         };
-        let result = to_path(path, self.drawtarget.create_path_builder()).contains_point(
+        let result = to_path::<B>(path, self.drawtarget.create_path_builder()).contains_point(
             x,
             y,
             path_transform,
@@ -1206,15 +991,15 @@ impl<'a> CanvasData<'a> {
         chan.send(result).unwrap();
     }
 
-    pub fn move_to(&mut self, point: &Point2D<f32>) {
+    pub(crate) fn move_to(&mut self, point: &Point2D<f32>) {
         self.path_builder().move_to(point);
     }
 
-    pub fn line_to(&mut self, point: &Point2D<f32>) {
+    pub(crate) fn line_to(&mut self, point: &Point2D<f32>) {
         self.path_builder().line_to(point);
     }
 
-    fn path_builder(&mut self) -> PathBuilderRef {
+    fn path_builder(&mut self) -> PathBuilderRef<B> {
         if self.path_state.is_none() {
             self.path_state = Some(PathState::UserSpacePathBuilder(
                 self.drawtarget.create_path_builder(),
@@ -1279,18 +1064,18 @@ impl<'a> CanvasData<'a> {
         }
     }
 
-    pub fn rect(&mut self, rect: &Rect<f32>) {
+    pub(crate) fn rect(&mut self, rect: &Rect<f32>) {
         self.path_builder().rect(rect);
     }
 
-    pub fn quadratic_curve_to(&mut self, cp: &Point2D<f32>, endpoint: &Point2D<f32>) {
+    pub(crate) fn quadratic_curve_to(&mut self, cp: &Point2D<f32>, endpoint: &Point2D<f32>) {
         if self.path_state.is_none() {
             self.move_to(cp);
         }
         self.path_builder().quadratic_curve_to(cp, endpoint);
     }
 
-    pub fn bezier_curve_to(
+    pub(crate) fn bezier_curve_to(
         &mut self,
         cp1: &Point2D<f32>,
         cp2: &Point2D<f32>,
@@ -1302,7 +1087,7 @@ impl<'a> CanvasData<'a> {
         self.path_builder().bezier_curve_to(cp1, cp2, endpoint);
     }
 
-    pub fn arc(
+    pub(crate) fn arc(
         &mut self,
         center: &Point2D<f32>,
         radius: f32,
@@ -1314,12 +1099,12 @@ impl<'a> CanvasData<'a> {
             .arc(center, radius, start_angle, end_angle, ccw);
     }
 
-    pub fn arc_to(&mut self, cp1: &Point2D<f32>, cp2: &Point2D<f32>, radius: f32) {
+    pub(crate) fn arc_to(&mut self, cp1: &Point2D<f32>, cp2: &Point2D<f32>, radius: f32) {
         self.path_builder().arc_to(cp1, cp2, radius);
     }
 
     #[allow(clippy::too_many_arguments)]
-    pub fn ellipse(
+    pub(crate) fn ellipse(
         &mut self,
         center: &Point2D<f32>,
         radius_x: f32,
@@ -1340,37 +1125,45 @@ impl<'a> CanvasData<'a> {
         );
     }
 
-    pub fn set_fill_style(&mut self, style: FillOrStrokeStyle) {
+    pub(crate) fn set_fill_style(&mut self, style: FillOrStrokeStyle) {
         self.backend
-            .set_fill_style(style, &mut self.state, &*self.drawtarget);
+            .set_fill_style(style, &mut self.state, &self.drawtarget);
     }
 
-    pub fn set_stroke_style(&mut self, style: FillOrStrokeStyle) {
+    pub(crate) fn set_stroke_style(&mut self, style: FillOrStrokeStyle) {
         self.backend
-            .set_stroke_style(style, &mut self.state, &*self.drawtarget);
+            .set_stroke_style(style, &mut self.state, &self.drawtarget);
     }
 
-    pub fn set_line_width(&mut self, width: f32) {
+    pub(crate) fn set_line_width(&mut self, width: f32) {
         self.state.stroke_opts.set_line_width(width);
     }
 
-    pub fn set_line_cap(&mut self, cap: LineCapStyle) {
+    pub(crate) fn set_line_cap(&mut self, cap: LineCapStyle) {
         self.state.stroke_opts.set_line_cap(cap);
     }
 
-    pub fn set_line_join(&mut self, join: LineJoinStyle) {
+    pub(crate) fn set_line_join(&mut self, join: LineJoinStyle) {
         self.state.stroke_opts.set_line_join(join);
     }
 
-    pub fn set_miter_limit(&mut self, limit: f32) {
+    pub(crate) fn set_miter_limit(&mut self, limit: f32) {
         self.state.stroke_opts.set_miter_limit(limit);
     }
 
-    pub fn get_transform(&self) -> Transform2D<f32> {
+    pub(crate) fn set_line_dash(&mut self, items: Vec<f32>) {
+        self.state.stroke_opts.set_line_dash(items);
+    }
+
+    pub(crate) fn set_line_dash_offset(&mut self, offset: f32) {
+        self.state.stroke_opts.set_line_dash_offset(offset);
+    }
+
+    pub(crate) fn get_transform(&self) -> Transform2D<f32> {
         self.drawtarget.get_transform()
     }
 
-    pub fn set_transform(&mut self, transform: &Transform2D<f32>) {
+    pub(crate) fn set_transform(&mut self, transform: &Transform2D<f32>) {
         // If there is an in-progress path, store the existing transformation required
         // to move between device and user space.
         match self.path_state.as_mut() {
@@ -1386,34 +1179,28 @@ impl<'a> CanvasData<'a> {
         self.drawtarget.set_transform(transform)
     }
 
-    pub fn set_global_alpha(&mut self, alpha: f32) {
+    pub(crate) fn set_global_alpha(&mut self, alpha: f32) {
         self.state.draw_options.set_alpha(alpha);
     }
 
-    pub fn set_global_composition(&mut self, op: CompositionOrBlending) {
+    pub(crate) fn set_global_composition(&mut self, op: CompositionOrBlending) {
         self.backend.set_global_composition(op, &mut self.state);
     }
 
-    pub fn recreate(&mut self, size: Option<Size2D<u64>>) {
-        let size = size.unwrap_or_else(|| self.drawtarget.get_size().to_u64());
+    pub(crate) fn recreate(&mut self, size: Option<Size2D<u64>>) {
+        let size = size
+            .unwrap_or_else(|| self.drawtarget.get_size().to_u64())
+            .max(MIN_WR_IMAGE_SIZE);
         self.drawtarget = self
             .backend
             .create_drawtarget(Size2D::new(size.width, size.height));
-        self.state = self.backend.recreate_paint_state(&self.state);
+        self.state = self.backend.new_paint_state();
         self.saved_states.clear();
         self.update_image_rendering();
     }
 
-    pub fn send_pixels(&mut self, chan: IpcSender<IpcSharedMemory>) {
-        self.drawtarget.snapshot_data(&|bytes| {
-            let data = IpcSharedMemory::from_bytes(bytes);
-            chan.send(data).unwrap();
-            vec![]
-        });
-    }
-
     /// Update image in WebRender
-    pub fn update_image_rendering(&mut self) {
+    pub(crate) fn update_image_rendering(&mut self) {
         let descriptor = ImageDescriptor {
             size: self.drawtarget.get_size().cast_unit(),
             stride: None,
@@ -1422,7 +1209,7 @@ impl<'a> CanvasData<'a> {
             flags: ImageDescriptorFlags::empty(),
         };
         let data = SerializableImageData::Raw(IpcSharedMemory::from_bytes(
-            &self.drawtarget.snapshot_data_owned(),
+            self.drawtarget.bytes().as_ref(),
         ));
 
         self.compositor_api
@@ -1434,7 +1221,7 @@ impl<'a> CanvasData<'a> {
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata
-    pub fn put_image_data(&mut self, mut imagedata: Vec<u8>, rect: Rect<u64>) {
+    pub(crate) fn put_image_data(&mut self, mut imagedata: Vec<u8>, rect: Rect<u64>) {
         assert_eq!(imagedata.len() % 4, 0);
         assert_eq!(rect.size.area() as usize, imagedata.len() / 4);
         pixels::rgba8_byte_swap_and_premultiply_inplace(&mut imagedata);
@@ -1449,31 +1236,31 @@ impl<'a> CanvasData<'a> {
         );
     }
 
-    pub fn set_shadow_offset_x(&mut self, value: f64) {
+    pub(crate) fn set_shadow_offset_x(&mut self, value: f64) {
         self.state.shadow_offset_x = value;
     }
 
-    pub fn set_shadow_offset_y(&mut self, value: f64) {
+    pub(crate) fn set_shadow_offset_y(&mut self, value: f64) {
         self.state.shadow_offset_y = value;
     }
 
-    pub fn set_shadow_blur(&mut self, value: f64) {
+    pub(crate) fn set_shadow_blur(&mut self, value: f64) {
         self.state.shadow_blur = value;
     }
 
-    pub fn set_shadow_color(&mut self, value: AbsoluteColor) {
+    pub(crate) fn set_shadow_color(&mut self, value: AbsoluteColor) {
         self.backend.set_shadow_color(value, &mut self.state);
     }
 
-    pub fn set_font(&mut self, font_style: FontStyleStruct) {
+    pub(crate) fn set_font(&mut self, font_style: FontStyleStruct) {
         self.state.font_style = Some(ServoArc::new(font_style))
     }
 
-    pub fn set_text_align(&mut self, text_align: TextAlign) {
+    pub(crate) fn set_text_align(&mut self, text_align: TextAlign) {
         self.state.text_align = text_align;
     }
 
-    pub fn set_text_baseline(&mut self, text_baseline: TextBaseline) {
+    pub(crate) fn set_text_baseline(&mut self, text_baseline: TextBaseline) {
         self.state.text_baseline = text_baseline;
     }
 
@@ -1485,7 +1272,7 @@ impl<'a> CanvasData<'a> {
                 self.state.shadow_blur != 0.0f64)
     }
 
-    fn create_draw_target_for_shadow(&self, source_rect: &Rect<f32>) -> Box<dyn GenericDrawTarget> {
+    fn create_draw_target_for_shadow(&self, source_rect: &Rect<f32>) -> B::DrawTarget {
         let mut draw_target = self.drawtarget.create_similar_draw_target(&Size2D::new(
             source_rect.size.width as i32,
             source_rect.size.height as i32,
@@ -1499,13 +1286,13 @@ impl<'a> CanvasData<'a> {
 
     fn draw_with_shadow<F>(&self, rect: &Rect<f32>, draw_shadow_source: F)
     where
-        F: FnOnce(&mut dyn GenericDrawTarget),
+        F: FnOnce(&mut B::DrawTarget),
     {
         let shadow_src_rect = self.state.transform.outer_transformed_rect(rect);
         let mut new_draw_target = self.create_draw_target_for_shadow(&shadow_src_rect);
-        draw_shadow_source(&mut *new_draw_target);
+        draw_shadow_source(&mut new_draw_target);
         self.drawtarget.draw_surface_with_shadow(
-            new_draw_target.snapshot(),
+            new_draw_target.surface(),
             &Point2D::new(shadow_src_rect.origin.x, shadow_src_rect.origin.y),
             &self.state.shadow_color,
             &Vector2D::new(
@@ -1521,22 +1308,40 @@ impl<'a> CanvasData<'a> {
     /// canvas_size: The size of the canvas we're reading from
     /// read_rect: The area of the canvas we want to read from
     #[allow(unsafe_code)]
-    pub fn read_pixels(&self, read_rect: Rect<u64>, canvas_size: Size2D<u64>) -> Vec<u8> {
-        let canvas_rect = Rect::from_size(canvas_size);
-        if canvas_rect
-            .intersection(&read_rect)
-            .is_none_or(|rect| rect.is_empty())
-        {
-            return vec![];
-        }
+    pub(crate) fn read_pixels(
+        &self,
+        read_rect: Option<Rect<u64>>,
+        canvas_size: Option<Size2D<u64>>,
+    ) -> Snapshot {
+        let canvas_size = canvas_size.unwrap_or(self.drawtarget.get_size().cast());
 
-        self.drawtarget.snapshot_data(&|bytes| {
-            pixels::rgba8_get_rect(bytes, canvas_size, read_rect).into_owned()
-        })
+        let data = if let Some(read_rect) = read_rect {
+            let canvas_rect = Rect::from_size(canvas_size);
+            if canvas_rect
+                .intersection(&read_rect)
+                .is_none_or(|rect| rect.is_empty())
+            {
+                vec![]
+            } else {
+                pixels::rgba8_get_rect(self.drawtarget.bytes().as_ref(), canvas_size, read_rect)
+                    .to_vec()
+            }
+        } else {
+            self.drawtarget.bytes().as_ref().to_vec()
+        };
+
+        Snapshot::from_vec(
+            canvas_size,
+            snapshot::PixelFormat::BGRA,
+            snapshot::AlphaMode::Transparent {
+                premultiplied: true,
+            },
+            data,
+        )
     }
 }
 
-impl Drop for CanvasData<'_> {
+impl<B: Backend> Drop for CanvasData<'_, B> {
     fn drop(&mut self) {
         self.compositor_api
             .update_images(vec![ImageUpdate::DeleteImage(self.image_key)]);
@@ -1547,20 +1352,21 @@ const HANGING_BASELINE_DEFAULT: f32 = 0.8;
 const IDEOGRAPHIC_BASELINE_DEFAULT: f32 = 0.5;
 
 #[derive(Clone)]
-pub struct CanvasPaintState<'a> {
-    pub draw_options: DrawOptions,
-    pub fill_style: Pattern<'a>,
-    pub stroke_style: Pattern<'a>,
-    pub stroke_opts: StrokeOptions,
+pub(crate) struct CanvasPaintState<'a, B: Backend> {
+    pub(crate) draw_options: B::DrawOptions,
+    pub(crate) fill_style: B::Pattern<'a>,
+    pub(crate) stroke_style: B::Pattern<'a>,
+    pub(crate) stroke_opts: B::StrokeOptions,
     /// The current 2D transform matrix.
-    pub transform: Transform2D<f32>,
-    pub shadow_offset_x: f64,
-    pub shadow_offset_y: f64,
-    pub shadow_blur: f64,
-    pub shadow_color: Color,
-    pub font_style: Option<ServoArc<FontStyleStruct>>,
-    pub text_align: TextAlign,
-    pub text_baseline: TextBaseline,
+    pub(crate) transform: Transform2D<f32>,
+    pub(crate) shadow_offset_x: f64,
+    pub(crate) shadow_offset_y: f64,
+    pub(crate) shadow_blur: f64,
+    pub(crate) shadow_color: B::Color,
+    pub(crate) font_style: Option<ServoArc<FontStyleStruct>>,
+    pub(crate) text_align: TextAlign,
+    pub(crate) text_baseline: TextBaseline,
+    pub(crate) _backend: PhantomData<B>,
 }
 
 /// It writes an image to the destination target
@@ -1570,14 +1376,14 @@ pub struct CanvasPaintState<'a> {
 /// dest_rect: Area of the destination target where the pixels will be copied
 /// smoothing_enabled: It determines if smoothing is applied to the image result
 /// premultiply: Determines whenever the image data should be premultiplied or not
-fn write_image(
-    draw_target: &mut dyn GenericDrawTarget,
+fn write_image<B: Backend>(
+    draw_target: &mut B::DrawTarget,
     mut image_data: Vec<u8>,
     image_size: Size2D<f64>,
     dest_rect: Rect<f64>,
     smoothing_enabled: bool,
     premultiply: bool,
-    draw_options: &DrawOptions,
+    draw_options: &B::DrawOptions,
 ) {
     if image_data.is_empty() {
         return;
@@ -1606,25 +1412,11 @@ fn write_image(
     draw_target.draw_surface(source_surface, dest_rect, image_rect, filter, draw_options);
 }
 
-pub trait RectToi32 {
-    fn to_i32(&self) -> Rect<i32>;
+pub(crate) trait RectToi32 {
     fn ceil(&self) -> Rect<f64>;
 }
 
 impl RectToi32 for Rect<f64> {
-    fn to_i32(&self) -> Rect<i32> {
-        Rect::new(
-            Point2D::new(
-                self.origin.x.to_i32().unwrap(),
-                self.origin.y.to_i32().unwrap(),
-            ),
-            Size2D::new(
-                self.size.width.to_i32().unwrap(),
-                self.size.height.to_i32().unwrap(),
-            ),
-        )
-    }
-
     fn ceil(&self) -> Rect<f64> {
         Rect::new(
             Point2D::new(self.origin.x.ceil(), self.origin.y.ceil()),
@@ -1633,22 +1425,6 @@ impl RectToi32 for Rect<f64> {
     }
 }
 
-pub trait RectExt {
-    fn to_u64(&self) -> Rect<u64>;
-}
-
-impl RectExt for Rect<f64> {
-    fn to_u64(&self) -> Rect<u64> {
-        self.cast()
-    }
-}
-
-impl RectExt for Rect<u32> {
-    fn to_u64(&self) -> Rect<u64> {
-        self.cast()
-    }
-}
-
 fn replace_ascii_whitespace(text: String) -> String {
     text.chars()
         .map(|c| match c {
diff --git a/components/canvas/canvas_paint_thread.rs b/components/canvas/canvas_paint_thread.rs
index 09d670d5274..82a221d560d 100644
--- a/components/canvas/canvas_paint_thread.rs
+++ b/components/canvas/canvas_paint_thread.rs
@@ -9,20 +9,23 @@ use std::thread;
 
 use canvas_traits::ConstellationCanvasMsg;
 use canvas_traits::canvas::*;
+use compositing_traits::CrossProcessCompositorApi;
 use crossbeam_channel::{Sender, select, unbounded};
-use euclid::default::Size2D;
+use euclid::default::{Point2D, Rect, Size2D, Transform2D};
 use fonts::{FontContext, SystemFontServiceProxy};
 use ipc_channel::ipc::{self, IpcSender};
 use ipc_channel::router::ROUTER;
 use log::warn;
 use net_traits::ResourceThreads;
+use style::color::AbsoluteColor;
+use style::properties::style_structs::Font as FontStyleStruct;
 use webrender_api::ImageKey;
-use webrender_traits::CrossProcessCompositorApi;
 
 use crate::canvas_data::*;
+use crate::raqote_backend::RaqoteBackend;
 
 pub struct CanvasPaintThread<'a> {
-    canvases: HashMap<CanvasId, CanvasData<'a>>,
+    canvases: HashMap<CanvasId, Canvas<'a>>,
     next_canvas_id: CanvasId,
     compositor_api: CrossProcessCompositorApi,
     font_context: Arc<FontContext>,
@@ -76,7 +79,11 @@ impl<'a> CanvasPaintThread<'a> {
                                 },
                                 Ok(CanvasMsg::FromScript(message, canvas_id)) => match message {
                                     FromScriptMsg::SendPixels(chan) => {
-                                        canvas_paint_thread.canvas(canvas_id).send_pixels(chan);
+                                        chan.send(canvas_paint_thread
+                                            .canvas(canvas_id)
+                                            .read_pixels(None, None)
+                                            .as_ipc()
+                                        ).unwrap();
                                     },
                                 },
                                 Err(e) => {
@@ -109,10 +116,14 @@ impl<'a> CanvasPaintThread<'a> {
         let canvas_id = self.next_canvas_id;
         self.next_canvas_id.0 += 1;
 
-        let canvas_data =
-            CanvasData::new(size, self.compositor_api.clone(), self.font_context.clone());
+        let canvas_data = CanvasData::new(
+            size,
+            self.compositor_api.clone(),
+            self.font_context.clone(),
+            RaqoteBackend,
+        );
         let image_key = canvas_data.image_key();
-        self.canvases.insert(canvas_id, canvas_data);
+        self.canvases.insert(canvas_id, Canvas::Raqote(canvas_data));
 
         (canvas_id, image_key)
     }
@@ -159,24 +170,21 @@ impl<'a> CanvasPaintThread<'a> {
             Canvas2dMsg::IsPointInPath(path, x, y, fill_rule, chan) => self
                 .canvas(canvas_id)
                 .is_point_in_path_(&path[..], x, y, fill_rule, chan),
-            Canvas2dMsg::DrawImage(
-                ref image_data,
-                image_size,
-                dest_rect,
-                source_rect,
-                smoothing_enabled,
-            ) => self.canvas(canvas_id).draw_image(
-                image_data,
-                image_size,
-                dest_rect,
-                source_rect,
-                smoothing_enabled,
-                true,
-            ),
+            Canvas2dMsg::DrawImage(snapshot, dest_rect, source_rect, smoothing_enabled) => {
+                let snapshot = snapshot.to_owned();
+                self.canvas(canvas_id).draw_image(
+                    snapshot.data(),
+                    snapshot.size(),
+                    dest_rect,
+                    source_rect,
+                    smoothing_enabled,
+                    !snapshot.alpha_mode().is_premultiplied(),
+                )
+            },
             Canvas2dMsg::DrawEmptyImage(image_size, dest_rect, source_rect) => {
                 self.canvas(canvas_id).draw_image(
                     &vec![0; image_size.area() as usize * 4],
-                    image_size,
+                    image_size.to_u64(),
                     dest_rect,
                     source_rect,
                     false,
@@ -192,10 +200,10 @@ impl<'a> CanvasPaintThread<'a> {
             ) => {
                 let image_data = self
                     .canvas(canvas_id)
-                    .read_pixels(source_rect.to_u64(), image_size.to_u64());
+                    .read_pixels(Some(source_rect.to_u64()), Some(image_size.to_u64()));
                 self.canvas(other_canvas_id).draw_image(
-                    &image_data,
-                    source_rect.size,
+                    image_data.data(),
+                    source_rect.size.to_u64(),
                     dest_rect,
                     source_rect,
                     smoothing,
@@ -230,6 +238,10 @@ impl<'a> CanvasPaintThread<'a> {
             Canvas2dMsg::SetLineCap(cap) => self.canvas(canvas_id).set_line_cap(cap),
             Canvas2dMsg::SetLineJoin(join) => self.canvas(canvas_id).set_line_join(join),
             Canvas2dMsg::SetMiterLimit(limit) => self.canvas(canvas_id).set_miter_limit(limit),
+            Canvas2dMsg::SetLineDash(items) => self.canvas(canvas_id).set_line_dash(items),
+            Canvas2dMsg::SetLineDashOffset(offset) => {
+                self.canvas(canvas_id).set_line_dash_offset(offset)
+            },
             Canvas2dMsg::GetTransform(sender) => {
                 let transform = self.canvas(canvas_id).get_transform();
                 sender.send(transform).unwrap();
@@ -240,8 +252,10 @@ impl<'a> CanvasPaintThread<'a> {
                 self.canvas(canvas_id).set_global_composition(op)
             },
             Canvas2dMsg::GetImageData(dest_rect, canvas_size, sender) => {
-                let pixels = self.canvas(canvas_id).read_pixels(dest_rect, canvas_size);
-                sender.send(&pixels).unwrap();
+                let snapshot = self
+                    .canvas(canvas_id)
+                    .read_pixels(Some(dest_rect), Some(canvas_size));
+                sender.send(snapshot.as_ipc()).unwrap();
             },
             Canvas2dMsg::PutImageData(rect, receiver) => {
                 self.canvas(canvas_id)
@@ -269,7 +283,347 @@ impl<'a> CanvasPaintThread<'a> {
         }
     }
 
-    fn canvas(&mut self, canvas_id: CanvasId) -> &mut CanvasData<'a> {
+    fn canvas(&mut self, canvas_id: CanvasId) -> &mut Canvas<'a> {
         self.canvases.get_mut(&canvas_id).expect("Bogus canvas id")
     }
 }
+
+enum Canvas<'a> {
+    Raqote(CanvasData<'a, RaqoteBackend>),
+}
+
+impl Canvas<'_> {
+    fn set_fill_style(&mut self, style: FillOrStrokeStyle) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_fill_style(style),
+        }
+    }
+
+    fn fill(&mut self) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.fill(),
+        }
+    }
+
+    fn fill_text(&mut self, text: String, x: f64, y: f64, max_width: Option<f64>, is_rtl: bool) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.fill_text(text, x, y, max_width, is_rtl),
+        }
+    }
+
+    fn fill_rect(&mut self, rect: &Rect<f32>) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.fill_rect(rect),
+        }
+    }
+
+    fn set_stroke_style(&mut self, style: FillOrStrokeStyle) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_stroke_style(style),
+        }
+    }
+
+    fn stroke_rect(&mut self, rect: &Rect<f32>) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.stroke_rect(rect),
+        }
+    }
+
+    fn begin_path(&mut self) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.begin_path(),
+        }
+    }
+
+    fn close_path(&mut self) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.close_path(),
+        }
+    }
+
+    fn fill_path(&mut self, path: &[PathSegment]) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.fill_path(path),
+        }
+    }
+
+    fn stroke(&mut self) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.stroke(),
+        }
+    }
+
+    fn stroke_path(&mut self, path: &[PathSegment]) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.stroke_path(path),
+        }
+    }
+
+    fn clip(&mut self) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.clip(),
+        }
+    }
+
+    fn is_point_in_path(&mut self, x: f64, y: f64, fill_rule: FillRule, chan: IpcSender<bool>) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.is_point_in_path(x, y, fill_rule, chan),
+        }
+    }
+
+    fn is_point_in_path_(
+        &mut self,
+        path: &[PathSegment],
+        x: f64,
+        y: f64,
+        fill_rule: FillRule,
+        chan: IpcSender<bool>,
+    ) {
+        match self {
+            Canvas::Raqote(canvas_data) => {
+                canvas_data.is_point_in_path_(path, x, y, fill_rule, chan)
+            },
+        }
+    }
+
+    fn clear_rect(&mut self, rect: &Rect<f32>) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.clear_rect(rect),
+        }
+    }
+
+    fn draw_image(
+        &mut self,
+        data: &[u8],
+        size: Size2D<u64>,
+        dest_rect: Rect<f64>,
+        source_rect: Rect<f64>,
+        smoothing_enabled: bool,
+        is_premultiplied: bool,
+    ) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.draw_image(
+                data,
+                size,
+                dest_rect,
+                source_rect,
+                smoothing_enabled,
+                is_premultiplied,
+            ),
+        }
+    }
+
+    fn read_pixels(
+        &mut self,
+        read_rect: Option<Rect<u64>>,
+        canvas_size: Option<Size2D<u64>>,
+    ) -> snapshot::Snapshot {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.read_pixels(read_rect, canvas_size),
+        }
+    }
+
+    fn move_to(&mut self, point: &Point2D<f32>) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.move_to(point),
+        }
+    }
+
+    fn line_to(&mut self, point: &Point2D<f32>) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.line_to(point),
+        }
+    }
+
+    fn rect(&mut self, rect: &Rect<f32>) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.rect(rect),
+        }
+    }
+
+    fn quadratic_curve_to(&mut self, cp: &Point2D<f32>, pt: &Point2D<f32>) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.quadratic_curve_to(cp, pt),
+        }
+    }
+
+    fn bezier_curve_to(&mut self, cp1: &Point2D<f32>, cp2: &Point2D<f32>, pt: &Point2D<f32>) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.bezier_curve_to(cp1, cp2, pt),
+        }
+    }
+
+    fn arc(&mut self, center: &Point2D<f32>, radius: f32, start: f32, end: f32, ccw: bool) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.arc(center, radius, start, end, ccw),
+        }
+    }
+
+    fn arc_to(&mut self, cp1: &Point2D<f32>, cp2: &Point2D<f32>, radius: f32) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.arc_to(cp1, cp2, radius),
+        }
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn ellipse(
+        &mut self,
+        center: &Point2D<f32>,
+        radius_x: f32,
+        radius_y: f32,
+        rotation: f32,
+        start: f32,
+        end: f32,
+        ccw: bool,
+    ) {
+        match self {
+            Canvas::Raqote(canvas_data) => {
+                canvas_data.ellipse(center, radius_x, radius_y, rotation, start, end, ccw)
+            },
+        }
+    }
+
+    fn restore_context_state(&mut self) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.restore_context_state(),
+        }
+    }
+
+    fn save_context_state(&mut self) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.save_context_state(),
+        }
+    }
+
+    fn set_line_width(&mut self, width: f32) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_line_width(width),
+        }
+    }
+
+    fn set_line_cap(&mut self, cap: LineCapStyle) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_line_cap(cap),
+        }
+    }
+
+    fn set_line_join(&mut self, join: LineJoinStyle) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_line_join(join),
+        }
+    }
+
+    fn set_miter_limit(&mut self, limit: f32) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_miter_limit(limit),
+        }
+    }
+
+    fn set_line_dash(&mut self, items: Vec<f32>) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_line_dash(items),
+        }
+    }
+
+    fn set_line_dash_offset(&mut self, offset: f32) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_line_dash_offset(offset),
+        }
+    }
+
+    fn set_transform(&mut self, matrix: &Transform2D<f32>) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_transform(matrix),
+        }
+    }
+
+    fn set_global_alpha(&mut self, alpha: f32) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_global_alpha(alpha),
+        }
+    }
+
+    fn set_global_composition(&mut self, op: CompositionOrBlending) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_global_composition(op),
+        }
+    }
+
+    fn set_shadow_offset_x(&mut self, value: f64) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_shadow_offset_x(value),
+        }
+    }
+
+    fn set_shadow_offset_y(&mut self, value: f64) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_shadow_offset_y(value),
+        }
+    }
+
+    fn set_shadow_blur(&mut self, value: f64) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_shadow_blur(value),
+        }
+    }
+
+    fn set_shadow_color(&mut self, color: AbsoluteColor) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_shadow_color(color),
+        }
+    }
+
+    fn set_font(&mut self, font_style: FontStyleStruct) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_font(font_style),
+        }
+    }
+
+    fn set_text_align(&mut self, text_align: TextAlign) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_text_align(text_align),
+        }
+    }
+
+    fn set_text_baseline(&mut self, text_baseline: TextBaseline) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.set_text_baseline(text_baseline),
+        }
+    }
+
+    fn measure_text(&mut self, text: String) -> TextMetrics {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.measure_text(text),
+        }
+    }
+
+    fn clip_path(&mut self, path: &[PathSegment]) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.clip_path(path),
+        }
+    }
+
+    fn get_transform(&self) -> Transform2D<f32> {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.get_transform(),
+        }
+    }
+
+    fn put_image_data(&mut self, unwrap: Vec<u8>, rect: Rect<u64>) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.put_image_data(unwrap, rect),
+        }
+    }
+
+    fn update_image_rendering(&mut self) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.update_image_rendering(),
+        }
+    }
+
+    fn recreate(&mut self, size: Option<Size2D<u64>>) {
+        match self {
+            Canvas::Raqote(canvas_data) => canvas_data.recreate(size),
+        }
+    }
+}
diff --git a/components/canvas/lib.rs b/components/canvas/lib.rs
index d2c62c1d8b6..91ab58b0e8b 100644
--- a/components/canvas/lib.rs
+++ b/components/canvas/lib.rs
@@ -4,14 +4,8 @@
 
 #![deny(unsafe_code)]
 
+mod backend;
 mod raqote_backend;
 
-pub use webgl_mode::WebGLComm;
-
 pub mod canvas_data;
 pub mod canvas_paint_thread;
-mod webgl_limits;
-mod webgl_mode;
-pub mod webgl_thread;
-#[cfg(feature = "webxr")]
-mod webxr;
diff --git a/components/canvas/raqote_backend.rs b/components/canvas/raqote_backend.rs
index bc8d20e9dcf..ecf780c36d5 100644
--- a/components/canvas/raqote_backend.rs
+++ b/components/canvas/raqote_backend.rs
@@ -7,20 +7,19 @@ use std::collections::HashMap;
 
 use canvas_traits::canvas::*;
 use cssparser::color::clamp_unit_f32;
-use euclid::Angle;
 use euclid::default::{Point2D, Rect, Size2D, Transform2D, Vector2D};
 use font_kit::font::Font;
 use fonts::{ByteIndex, FontIdentifier, FontTemplateRefMethods};
 use log::warn;
-use lyon_geom::Arc;
 use range::Range;
 use raqote::PathOp;
 use style::color::AbsoluteColor;
 
-use crate::canvas_data::{
-    self, Backend, CanvasPaintState, Color, CompositionOp, DrawOptions, Filter, GenericDrawTarget,
-    GenericPathBuilder, GradientStop, GradientStops, Path, SourceSurface, StrokeOptions, TextRun,
+use crate::backend::{
+    Backend, DrawOptionsHelpers, GenericDrawTarget, GenericPathBuilder, PathHelpers,
+    PatternHelpers, StrokeOptionsHelpers,
 };
+use crate::canvas_data::{CanvasPaintState, Filter, TextRun};
 
 thread_local! {
     /// The shared font cache used by all canvases that render on a thread. It would be nicer
@@ -30,80 +29,85 @@ thread_local! {
     static SHARED_FONT_CACHE: RefCell<HashMap<FontIdentifier, Font>> = RefCell::default();
 }
 
-#[derive(Default)]
-pub struct RaqoteBackend;
+#[derive(Clone, Default)]
+pub(crate) struct RaqoteBackend;
 
 impl Backend for RaqoteBackend {
-    fn get_composition_op(&self, opts: &DrawOptions) -> CompositionOp {
-        CompositionOp::Raqote(opts.as_raqote().blend_mode)
+    type Pattern<'a> = Pattern<'a>;
+    type StrokeOptions = raqote::StrokeStyle;
+    type Color = raqote::SolidSource;
+    type DrawOptions = raqote::DrawOptions;
+    type CompositionOp = raqote::BlendMode;
+    type DrawTarget = raqote::DrawTarget;
+    type PathBuilder = PathBuilder;
+    type SourceSurface = Vec<u8>; // TODO: See if we can avoid the alloc (probably?)
+    type Bytes<'a> = &'a [u8];
+    type Path = raqote::Path;
+    type GradientStop = raqote::GradientStop;
+    type GradientStops = Vec<raqote::GradientStop>;
+
+    fn get_composition_op(&self, opts: &Self::DrawOptions) -> Self::CompositionOp {
+        opts.blend_mode
     }
 
-    fn need_to_draw_shadow(&self, color: &Color) -> bool {
-        color.as_raqote().a != 0
+    fn need_to_draw_shadow(&self, color: &Self::Color) -> bool {
+        color.a != 0
     }
 
-    fn set_shadow_color(&mut self, color: AbsoluteColor, state: &mut CanvasPaintState<'_>) {
-        state.shadow_color = Color::Raqote(color.to_raqote_style());
+    fn set_shadow_color(&mut self, color: AbsoluteColor, state: &mut CanvasPaintState<'_, Self>) {
+        state.shadow_color = color.to_raqote_style();
     }
 
     fn set_fill_style(
         &mut self,
         style: FillOrStrokeStyle,
-        state: &mut CanvasPaintState<'_>,
-        _drawtarget: &dyn GenericDrawTarget,
+        state: &mut CanvasPaintState<'_, Self>,
+        _drawtarget: &Self::DrawTarget,
     ) {
         if let Some(pattern) = style.to_raqote_pattern() {
-            state.fill_style = canvas_data::Pattern::Raqote(pattern);
+            state.fill_style = pattern;
         }
     }
 
     fn set_stroke_style(
         &mut self,
         style: FillOrStrokeStyle,
-        state: &mut CanvasPaintState<'_>,
-        _drawtarget: &dyn GenericDrawTarget,
+        state: &mut CanvasPaintState<'_, Self>,
+        _drawtarget: &Self::DrawTarget,
     ) {
         if let Some(pattern) = style.to_raqote_pattern() {
-            state.stroke_style = canvas_data::Pattern::Raqote(pattern);
+            state.stroke_style = pattern;
         }
     }
 
     fn set_global_composition(
         &mut self,
         op: CompositionOrBlending,
-        state: &mut CanvasPaintState<'_>,
+        state: &mut CanvasPaintState<'_, Self>,
     ) {
-        state.draw_options.as_raqote_mut().blend_mode = op.to_raqote_style();
+        state.draw_options.blend_mode = op.to_raqote_style();
     }
 
-    fn create_drawtarget(&self, size: Size2D<u64>) -> Box<dyn GenericDrawTarget> {
-        Box::new(raqote::DrawTarget::new(
-            size.width as i32,
-            size.height as i32,
-        ))
+    fn create_drawtarget(&self, size: Size2D<u64>) -> Self::DrawTarget {
+        raqote::DrawTarget::new(size.width as i32, size.height as i32)
     }
 
-    fn recreate_paint_state<'a>(&self, _state: &CanvasPaintState<'a>) -> CanvasPaintState<'a> {
-        CanvasPaintState::default()
-    }
-}
-
-impl Default for CanvasPaintState<'_> {
-    fn default() -> Self {
+    fn new_paint_state<'a>(&self) -> CanvasPaintState<'a, Self> {
         let pattern = Pattern::Color(255, 0, 0, 0);
         CanvasPaintState {
-            draw_options: DrawOptions::Raqote(raqote::DrawOptions::new()),
-            fill_style: canvas_data::Pattern::Raqote(pattern.clone()),
-            stroke_style: canvas_data::Pattern::Raqote(pattern),
-            stroke_opts: StrokeOptions::Raqote(Default::default()),
+            draw_options: raqote::DrawOptions::new(),
+            fill_style: pattern.clone(),
+            stroke_style: pattern,
+            stroke_opts: Default::default(),
             transform: Transform2D::identity(),
             shadow_offset_x: 0.0,
             shadow_offset_y: 0.0,
             shadow_blur: 0.0,
-            shadow_color: Color::Raqote(raqote::SolidSource::from_unpremultiplied_argb(0, 0, 0, 0)),
+            shadow_color: raqote::SolidSource::from_unpremultiplied_argb(0, 0, 0, 0),
             font_style: None,
             text_align: TextAlign::default(),
             text_baseline: TextBaseline::default(),
+            _backend: std::marker::PhantomData,
         }
     }
 }
@@ -230,126 +234,122 @@ impl Repetition {
     }
 }
 
-impl canvas_data::Pattern<'_> {
-    pub fn source(&self) -> raqote::Source {
+pub fn source<'a>(pattern: &Pattern<'a>) -> raqote::Source<'a> {
+    match pattern {
+        Pattern::Color(a, r, g, b) => raqote::Source::Solid(
+            raqote::SolidSource::from_unpremultiplied_argb(*a, *r, *g, *b),
+        ),
+        Pattern::LinearGradient(pattern) => raqote::Source::new_linear_gradient(
+            pattern.gradient.clone(),
+            pattern.start,
+            pattern.end,
+            raqote::Spread::Pad,
+        ),
+        Pattern::RadialGradient(pattern) => raqote::Source::new_two_circle_radial_gradient(
+            pattern.gradient.clone(),
+            pattern.center1,
+            pattern.radius1,
+            pattern.center2,
+            pattern.radius2,
+            raqote::Spread::Pad,
+        ),
+        Pattern::Surface(pattern) => raqote::Source::Image(
+            pattern.image,
+            pattern.extend,
+            pattern.filter,
+            pattern.transform,
+        ),
+    }
+}
+
+impl PatternHelpers for Pattern<'_> {
+    fn is_zero_size_gradient(&self) -> bool {
         match self {
-            canvas_data::Pattern::Raqote(pattern) => match pattern {
-                Pattern::Color(a, r, g, b) => raqote::Source::Solid(
-                    raqote::SolidSource::from_unpremultiplied_argb(*a, *r, *g, *b),
-                ),
-                Pattern::LinearGradient(pattern) => raqote::Source::new_linear_gradient(
-                    pattern.gradient.clone(),
-                    pattern.start,
-                    pattern.end,
-                    raqote::Spread::Pad,
-                ),
-                Pattern::RadialGradient(pattern) => raqote::Source::new_two_circle_radial_gradient(
-                    pattern.gradient.clone(),
-                    pattern.center1,
-                    pattern.radius1,
-                    pattern.center2,
-                    pattern.radius2,
-                    raqote::Spread::Pad,
-                ),
-                Pattern::Surface(pattern) => raqote::Source::Image(
-                    pattern.image,
-                    pattern.extend,
-                    pattern.filter,
-                    pattern.transform,
-                ),
+            Pattern::RadialGradient(pattern) => {
+                let centers_equal = pattern.center1 == pattern.center2;
+                let radii_equal = pattern.radius1 == pattern.radius2;
+                (centers_equal && radii_equal) || pattern.gradient.stops.is_empty()
             },
-        }
-    }
-    pub fn is_zero_size_gradient(&self) -> bool {
-        match self {
-            canvas_data::Pattern::Raqote(pattern) => match pattern {
-                Pattern::RadialGradient(pattern) => {
-                    let centers_equal = pattern.center1 == pattern.center2;
-                    let radii_equal = pattern.radius1 == pattern.radius2;
-                    (centers_equal && radii_equal) || pattern.gradient.stops.is_empty()
-                },
-                Pattern::LinearGradient(pattern) => {
-                    (pattern.start == pattern.end) || pattern.gradient.stops.is_empty()
-                },
-                Pattern::Color(..) | Pattern::Surface(..) => false,
+            Pattern::LinearGradient(pattern) => {
+                (pattern.start == pattern.end) || pattern.gradient.stops.is_empty()
             },
+            Pattern::Color(..) | Pattern::Surface(..) => false,
+        }
+    }
+
+    fn draw_rect(&self, rect: &Rect<f32>) -> Rect<f32> {
+        match self {
+            Pattern::Surface(pattern) => {
+                let pattern_rect = Rect::new(Point2D::origin(), pattern.size());
+                let mut draw_rect = rect.intersection(&pattern_rect).unwrap_or(Rect::zero());
+
+                match pattern.repetition() {
+                    Repetition::NoRepeat => {
+                        draw_rect.size.width = draw_rect.size.width.min(pattern_rect.size.width);
+                        draw_rect.size.height = draw_rect.size.height.min(pattern_rect.size.height);
+                    },
+                    Repetition::RepeatX => {
+                        draw_rect.size.width = rect.size.width;
+                        draw_rect.size.height = draw_rect.size.height.min(pattern_rect.size.height);
+                    },
+                    Repetition::RepeatY => {
+                        draw_rect.size.height = rect.size.height;
+                        draw_rect.size.width = draw_rect.size.width.min(pattern_rect.size.width);
+                    },
+                    Repetition::Repeat => {
+                        draw_rect = *rect;
+                    },
+                }
+
+                draw_rect
+            },
+            Pattern::Color(..) | Pattern::LinearGradient(..) | Pattern::RadialGradient(..) => *rect,
         }
     }
 }
 
-impl StrokeOptions {
-    pub fn set_line_width(&mut self, _val: f32) {
-        match self {
-            StrokeOptions::Raqote(options) => options.width = _val,
-        }
+impl StrokeOptionsHelpers for raqote::StrokeStyle {
+    fn set_line_width(&mut self, _val: f32) {
+        self.width = _val;
     }
-    pub fn set_miter_limit(&mut self, _val: f32) {
-        match self {
-            StrokeOptions::Raqote(options) => options.miter_limit = _val,
-        }
+    fn set_miter_limit(&mut self, _val: f32) {
+        self.miter_limit = _val;
     }
-    pub fn set_line_join(&mut self, val: LineJoinStyle) {
-        match self {
-            StrokeOptions::Raqote(options) => options.join = val.to_raqote_style(),
-        }
+    fn set_line_join(&mut self, val: LineJoinStyle) {
+        self.join = val.to_raqote_style();
     }
-    pub fn set_line_cap(&mut self, val: LineCapStyle) {
-        match self {
-            StrokeOptions::Raqote(options) => options.cap = val.to_raqote_style(),
-        }
+    fn set_line_cap(&mut self, val: LineCapStyle) {
+        self.cap = val.to_raqote_style();
     }
-    pub fn as_raqote(&self) -> &raqote::StrokeStyle {
-        match self {
-            StrokeOptions::Raqote(options) => options,
-        }
+    fn set_line_dash(&mut self, items: Vec<f32>) {
+        self.dash_array = items;
+    }
+    fn set_line_dash_offset(&mut self, offset: f32) {
+        self.dash_offset = offset;
     }
 }
 
-impl DrawOptions {
-    pub fn set_alpha(&mut self, val: f32) {
-        match self {
-            DrawOptions::Raqote(draw_options) => draw_options.alpha = val,
-        }
-    }
-    pub fn as_raqote(&self) -> &raqote::DrawOptions {
-        match self {
-            DrawOptions::Raqote(options) => options,
-        }
-    }
-    fn as_raqote_mut(&mut self) -> &mut raqote::DrawOptions {
-        match self {
-            DrawOptions::Raqote(options) => options,
-        }
+impl DrawOptionsHelpers for raqote::DrawOptions {
+    fn set_alpha(&mut self, val: f32) {
+        self.alpha = val;
     }
 }
 
-impl Path {
-    pub fn transformed_copy_to_builder(
-        &self,
-        transform: &Transform2D<f32>,
-    ) -> Box<dyn GenericPathBuilder> {
-        Box::new(PathBuilder(Some(raqote::PathBuilder::from(
-            self.as_raqote().clone().transform(transform),
-        ))))
+impl PathHelpers<RaqoteBackend> for raqote::Path {
+    fn transformed_copy_to_builder(&self, transform: &Transform2D<f32>) -> PathBuilder {
+        PathBuilder(Some(raqote::PathBuilder::from(
+            self.clone().transform(transform),
+        )))
     }
 
-    pub fn contains_point(&self, x: f64, y: f64, path_transform: &Transform2D<f32>) -> bool {
-        self.as_raqote()
-            .clone()
+    fn contains_point(&self, x: f64, y: f64, path_transform: &Transform2D<f32>) -> bool {
+        self.clone()
             .transform(path_transform)
             .contains_point(0.1, x as f32, y as f32)
     }
 
-    pub fn copy_to_builder(&self) -> Box<dyn GenericPathBuilder> {
-        Box::new(PathBuilder(Some(raqote::PathBuilder::from(
-            self.as_raqote().clone(),
-        ))))
-    }
-
-    pub fn as_raqote(&self) -> &raqote::Path {
-        match self {
-            Path::Raqote(p) => p,
-        }
+    fn copy_to_builder(&self) -> PathBuilder {
+        PathBuilder(Some(raqote::PathBuilder::from(self.clone())))
     }
 }
 
@@ -363,7 +363,7 @@ fn create_gradient_stops(gradient_stops: Vec<CanvasGradientStop>) -> Vec<raqote:
     stops
 }
 
-impl GenericDrawTarget for raqote::DrawTarget {
+impl GenericDrawTarget<RaqoteBackend> for raqote::DrawTarget {
     fn clear_rect(&mut self, rect: &Rect<f32>) {
         let mut pb = raqote::PathBuilder::new();
         pb.rect(
@@ -375,59 +375,47 @@ impl GenericDrawTarget for raqote::DrawTarget {
         let mut options = raqote::DrawOptions::new();
         options.blend_mode = raqote::BlendMode::Clear;
         let pattern = Pattern::Color(0, 0, 0, 0);
-        GenericDrawTarget::fill(
-            self,
-            &Path::Raqote(pb.finish()),
-            canvas_data::Pattern::Raqote(pattern),
-            &DrawOptions::Raqote(options),
-        );
+        <Self as GenericDrawTarget<RaqoteBackend>>::fill(self, &pb.finish(), pattern, &options);
     }
     #[allow(unsafe_code)]
     fn copy_surface(
         &mut self,
-        surface: SourceSurface,
+        surface: <RaqoteBackend as Backend>::SourceSurface,
         source: Rect<i32>,
         destination: Point2D<i32>,
     ) {
         let mut dt = raqote::DrawTarget::new(source.size.width, source.size.height);
-        let data = surface.as_raqote();
+        let data = surface;
         let s = unsafe { std::slice::from_raw_parts(data.as_ptr() as *const u32, data.len() / 4) };
         dt.get_data_mut().copy_from_slice(s);
         raqote::DrawTarget::copy_surface(self, &dt, source.to_box2d(), destination);
     }
-    // TODO(pylbrecht)
-    // Somehow a duplicate of `create_gradient_stops()` with different types.
-    // It feels cumbersome to convert GradientStop back and forth just to use
-    // `create_gradient_stops()`, so I'll leave this here for now.
-    fn create_gradient_stops(&self, gradient_stops: Vec<GradientStop>) -> GradientStops {
-        let mut stops = gradient_stops
-            .into_iter()
-            .map(|item| *item.as_raqote())
-            .collect::<Vec<raqote::GradientStop>>();
-        // https://www.w3.org/html/test/results/2dcontext/annotated-spec/canvas.html#testrefs.2d.gradient.interpolate.overlap
-        stops.sort_by(|a, b| a.position.partial_cmp(&b.position).unwrap());
-        GradientStops::Raqote(stops)
-    }
 
-    fn create_path_builder(&self) -> Box<dyn GenericPathBuilder> {
-        Box::new(PathBuilder::new())
+    fn create_path_builder(&self) -> <RaqoteBackend as Backend>::PathBuilder {
+        PathBuilder::new()
     }
-    fn create_similar_draw_target(&self, size: &Size2D<i32>) -> Box<dyn GenericDrawTarget> {
-        Box::new(raqote::DrawTarget::new(size.width, size.height))
+    fn create_similar_draw_target(
+        &self,
+        size: &Size2D<i32>,
+    ) -> <RaqoteBackend as Backend>::DrawTarget {
+        raqote::DrawTarget::new(size.width, size.height)
     }
-    fn create_source_surface_from_data(&self, data: &[u8]) -> Option<SourceSurface> {
-        Some(SourceSurface::Raqote(data.to_vec()))
+    fn create_source_surface_from_data(
+        &self,
+        data: &[u8],
+    ) -> Option<<RaqoteBackend as Backend>::SourceSurface> {
+        Some(data.to_vec())
     }
     #[allow(unsafe_code)]
     fn draw_surface(
         &mut self,
-        surface: SourceSurface,
+        surface: <RaqoteBackend as Backend>::SourceSurface,
         dest: Rect<f64>,
         source: Rect<f64>,
         filter: Filter,
-        draw_options: &DrawOptions,
+        draw_options: &<RaqoteBackend as Backend>::DrawOptions,
     ) {
-        let surface_data = surface.as_raqote();
+        let surface_data = surface;
         let image = raqote::Image {
             width: source.size.width as i32,
             height: source.size.height as i32,
@@ -460,33 +448,29 @@ impl GenericDrawTarget for raqote::DrawTarget {
             dest.size.height as f32,
         );
 
-        GenericDrawTarget::fill(
-            self,
-            &Path::Raqote(pb.finish()),
-            canvas_data::Pattern::Raqote(pattern),
-            draw_options,
-        );
+        <Self as GenericDrawTarget<RaqoteBackend>>::fill(self, &pb.finish(), pattern, draw_options);
     }
     fn draw_surface_with_shadow(
         &self,
-        _surface: SourceSurface,
+        _surface: <RaqoteBackend as Backend>::SourceSurface,
         _dest: &Point2D<f32>,
-        _color: &Color,
+        _color: &<RaqoteBackend as Backend>::Color,
         _offset: &Vector2D<f32>,
         _sigma: f32,
-        _operator: CompositionOp,
+        _operator: <RaqoteBackend as Backend>::CompositionOp,
     ) {
         warn!("no support for drawing shadows");
     }
-    fn fill(&mut self, path: &Path, pattern: canvas_data::Pattern, draw_options: &DrawOptions) {
-        match draw_options.as_raqote().blend_mode {
+    fn fill(
+        &mut self,
+        path: &<RaqoteBackend as Backend>::Path,
+        pattern: <RaqoteBackend as Backend>::Pattern<'_>,
+        draw_options: &<RaqoteBackend as Backend>::DrawOptions,
+    ) {
+        match draw_options.blend_mode {
             raqote::BlendMode::Src => {
                 self.clear(raqote::SolidSource::from_unpremultiplied_argb(0, 0, 0, 0));
-                self.fill(
-                    path.as_raqote(),
-                    &pattern.source(),
-                    draw_options.as_raqote(),
-                );
+                self.fill(path, &source(&pattern), draw_options);
             },
             raqote::BlendMode::Clear |
             raqote::BlendMode::SrcAtop |
@@ -495,26 +479,19 @@ impl GenericDrawTarget for raqote::DrawTarget {
             raqote::BlendMode::Xor |
             raqote::BlendMode::DstOver |
             raqote::BlendMode::SrcOver => {
-                self.fill(
-                    path.as_raqote(),
-                    &pattern.source(),
-                    draw_options.as_raqote(),
-                );
+                self.fill(path, &source(&pattern), draw_options);
             },
             raqote::BlendMode::SrcIn |
             raqote::BlendMode::SrcOut |
             raqote::BlendMode::DstIn |
             raqote::BlendMode::DstAtop => {
-                let mut options = *draw_options.as_raqote();
+                let mut options = *draw_options;
                 self.push_layer_with_blend(1., options.blend_mode);
                 options.blend_mode = raqote::BlendMode::SrcOver;
-                self.fill(path.as_raqote(), &pattern.source(), &options);
+                self.fill(path, &source(&pattern), &options);
                 self.pop_layer();
             },
-            _ => warn!(
-                "unrecognized blend mode: {:?}",
-                draw_options.as_raqote().blend_mode
-            ),
+            _ => warn!("unrecognized blend mode: {:?}", draw_options.blend_mode),
         }
     }
 
@@ -522,8 +499,8 @@ impl GenericDrawTarget for raqote::DrawTarget {
         &mut self,
         text_runs: Vec<TextRun>,
         start: Point2D<f32>,
-        pattern: &canvas_data::Pattern,
-        draw_options: &DrawOptions,
+        pattern: &<RaqoteBackend as Backend>::Pattern<'_>,
+        draw_options: &<RaqoteBackend as Backend>::DrawOptions,
     ) {
         let mut advance = 0.;
         for run in text_runs.iter() {
@@ -571,8 +548,8 @@ impl GenericDrawTarget for raqote::DrawTarget {
                     run.font.descriptor.pt_size.to_f32_px(),
                     &ids,
                     &positions,
-                    &pattern.source(),
-                    draw_options.as_raqote(),
+                    &source(pattern),
+                    draw_options,
                 );
             })
         }
@@ -581,8 +558,8 @@ impl GenericDrawTarget for raqote::DrawTarget {
     fn fill_rect(
         &mut self,
         rect: &Rect<f32>,
-        pattern: canvas_data::Pattern,
-        draw_options: Option<&DrawOptions>,
+        pattern: <RaqoteBackend as Backend>::Pattern<'_>,
+        draw_options: Option<&<RaqoteBackend as Backend>::DrawOptions>,
     ) {
         let mut pb = raqote::PathBuilder::new();
         pb.rect(
@@ -592,16 +569,16 @@ impl GenericDrawTarget for raqote::DrawTarget {
             rect.size.height,
         );
         let draw_options = if let Some(options) = draw_options {
-            *options.as_raqote()
+            *options
         } else {
             raqote::DrawOptions::new()
         };
 
-        GenericDrawTarget::fill(
+        <Self as GenericDrawTarget<RaqoteBackend>>::fill(
             self,
-            &Path::Raqote(pb.finish()),
+            &pb.finish(),
             pattern,
-            &DrawOptions::Raqote(draw_options),
+            &draw_options,
         );
     }
     fn get_size(&self) -> Size2D<i32> {
@@ -613,41 +590,36 @@ impl GenericDrawTarget for raqote::DrawTarget {
     fn pop_clip(&mut self) {
         self.pop_clip();
     }
-    fn push_clip(&mut self, path: &Path) {
-        self.push_clip(path.as_raqote());
+    fn push_clip(&mut self, path: &<RaqoteBackend as Backend>::Path) {
+        self.push_clip(path);
     }
     fn set_transform(&mut self, matrix: &Transform2D<f32>) {
         self.set_transform(matrix);
     }
-    fn snapshot(&self) -> SourceSurface {
-        SourceSurface::Raqote(self.snapshot_data_owned())
+    fn surface(&self) -> <RaqoteBackend as Backend>::SourceSurface {
+        self.bytes().to_vec()
     }
     fn stroke(
         &mut self,
-        path: &Path,
-        pattern: canvas_data::Pattern,
-        stroke_options: &StrokeOptions,
-        draw_options: &DrawOptions,
+        path: &<RaqoteBackend as Backend>::Path,
+        pattern: Pattern<'_>,
+        stroke_options: &<RaqoteBackend as Backend>::StrokeOptions,
+        draw_options: &<RaqoteBackend as Backend>::DrawOptions,
     ) {
-        self.stroke(
-            path.as_raqote(),
-            &pattern.source(),
-            stroke_options.as_raqote(),
-            draw_options.as_raqote(),
-        );
+        self.stroke(path, &source(&pattern), stroke_options, draw_options);
     }
     fn stroke_line(
         &mut self,
         start: Point2D<f32>,
         end: Point2D<f32>,
-        pattern: canvas_data::Pattern,
-        stroke_options: &StrokeOptions,
-        draw_options: &DrawOptions,
+        pattern: <RaqoteBackend as Backend>::Pattern<'_>,
+        stroke_options: &<RaqoteBackend as Backend>::StrokeOptions,
+        draw_options: &<RaqoteBackend as Backend>::DrawOptions,
     ) {
         let mut pb = raqote::PathBuilder::new();
         pb.move_to(start.x, start.y);
         pb.line_to(end.x, end.y);
-        let mut stroke_options = stroke_options.as_raqote().clone();
+        let mut stroke_options = stroke_options.clone();
         let cap = match stroke_options.join {
             raqote::LineJoin::Round => raqote::LineCap::Round,
             _ => raqote::LineCap::Butt,
@@ -656,17 +628,17 @@ impl GenericDrawTarget for raqote::DrawTarget {
 
         self.stroke(
             &pb.finish(),
-            &pattern.source(),
+            &source(&pattern),
             &stroke_options,
-            draw_options.as_raqote(),
+            draw_options,
         );
     }
     fn stroke_rect(
         &mut self,
         rect: &Rect<f32>,
-        pattern: canvas_data::Pattern,
-        stroke_options: &StrokeOptions,
-        draw_options: &DrawOptions,
+        pattern: <RaqoteBackend as Backend>::Pattern<'_>,
+        stroke_options: &<RaqoteBackend as Backend>::StrokeOptions,
+        draw_options: &<RaqoteBackend as Backend>::DrawOptions,
     ) {
         let mut pb = raqote::PathBuilder::new();
         pb.rect(
@@ -678,26 +650,15 @@ impl GenericDrawTarget for raqote::DrawTarget {
 
         self.stroke(
             &pb.finish(),
-            &pattern.source(),
-            stroke_options.as_raqote(),
-            draw_options.as_raqote(),
+            &source(&pattern),
+            stroke_options,
+            draw_options,
         );
     }
     #[allow(unsafe_code)]
-    fn snapshot_data(&self, f: &dyn Fn(&[u8]) -> Vec<u8>) -> Vec<u8> {
+    fn bytes(&self) -> &[u8] {
         let v = self.get_data();
-        f(
-            unsafe {
-                std::slice::from_raw_parts(v.as_ptr() as *const u8, std::mem::size_of_val(v))
-            },
-        )
-    }
-    #[allow(unsafe_code)]
-    fn snapshot_data_owned(&self) -> Vec<u8> {
-        let v = self.get_data();
-        unsafe {
-            std::slice::from_raw_parts(v.as_ptr() as *const u8, std::mem::size_of_val(v)).into()
-        }
+        unsafe { std::slice::from_raw_parts(v.as_ptr() as *const u8, std::mem::size_of_val(v)) }
     }
 }
 
@@ -710,7 +671,7 @@ impl Filter {
     }
 }
 
-struct PathBuilder(Option<raqote::PathBuilder>);
+pub(crate) struct PathBuilder(Option<raqote::PathBuilder>);
 
 impl PathBuilder {
     fn new() -> PathBuilder {
@@ -718,25 +679,7 @@ impl PathBuilder {
     }
 }
 
-impl GenericPathBuilder for PathBuilder {
-    fn arc(
-        &mut self,
-        origin: Point2D<f32>,
-        radius: f32,
-        start_angle: f32,
-        end_angle: f32,
-        anticlockwise: bool,
-    ) {
-        self.ellipse(
-            origin,
-            radius,
-            radius,
-            0.,
-            start_angle,
-            end_angle,
-            anticlockwise,
-        );
-    }
+impl GenericPathBuilder<RaqoteBackend> for PathBuilder {
     fn bezier_curve_to(
         &mut self,
         control_point1: &Point2D<f32>,
@@ -752,98 +695,16 @@ impl GenericPathBuilder for PathBuilder {
             control_point3.y,
         );
     }
+
     fn close(&mut self) {
         self.0.as_mut().unwrap().close();
     }
-    fn ellipse(
-        &mut self,
-        origin: Point2D<f32>,
-        radius_x: f32,
-        radius_y: f32,
-        rotation_angle: f32,
-        start_angle: f32,
-        end_angle: f32,
-        anticlockwise: bool,
-    ) {
-        let mut start = Angle::radians(start_angle);
-        let mut end = Angle::radians(end_angle);
-
-        // Wrap angles mod 2 * PI if necessary
-        if !anticlockwise && start > end + Angle::two_pi() ||
-            anticlockwise && end > start + Angle::two_pi()
-        {
-            start = start.positive();
-            end = end.positive();
-        }
-
-        // Calculate the total arc we're going to sweep.
-        let sweep = match anticlockwise {
-            true => {
-                if end - start == Angle::two_pi() {
-                    -Angle::two_pi()
-                } else if end > start {
-                    -(Angle::two_pi() - (end - start))
-                } else {
-                    -(start - end)
-                }
-            },
-            false => {
-                if start - end == Angle::two_pi() {
-                    Angle::two_pi()
-                } else if start > end {
-                    Angle::two_pi() - (start - end)
-                } else {
-                    end - start
-                }
-            },
-        };
-
-        let arc: Arc<f32> = Arc {
-            center: origin,
-            radii: Vector2D::new(radius_x, radius_y),
-            start_angle: start,
-            sweep_angle: sweep,
-            x_rotation: Angle::radians(rotation_angle),
-        };
-
-        self.line_to(arc.from());
-
-        arc.for_each_quadratic_bezier(&mut |q| {
-            self.quadratic_curve_to(&q.ctrl, &q.to);
-        });
-    }
-
-    fn svg_arc(
-        &mut self,
-        radius_x: f32,
-        radius_y: f32,
-        rotation_angle: f32,
-        large_arc: bool,
-        sweep: bool,
-        end_point: Point2D<f32>,
-    ) {
-        let Some(start) = self.get_current_point() else {
-            return;
-        };
-
-        let arc = lyon_geom::SvgArc {
-            from: start,
-            to: end_point,
-            radii: lyon_geom::vector(radius_x, radius_y),
-            x_rotation: lyon_geom::Angle::degrees(rotation_angle),
-            flags: lyon_geom::ArcFlags { large_arc, sweep },
-        };
-
-        arc.for_each_quadratic_bezier(&mut |q| {
-            self.quadratic_curve_to(&q.ctrl, &q.to);
-        });
-    }
 
     fn get_current_point(&mut self) -> Option<Point2D<f32>> {
         let path = self.finish();
-        self.0 = Some(path.as_raqote().clone().into());
+        self.0 = Some(path.clone().into());
 
-        path.as_raqote().ops.iter().last().and_then(|op| match op {
+        path.ops.iter().last().and_then(|op| match op {
             PathOp::MoveTo(point) | PathOp::LineTo(point) => Some(Point2D::new(point.x, point.y)),
             PathOp::CubicTo(_, _, point) => Some(Point2D::new(point.x, point.y)),
             PathOp::QuadTo(_, point) => Some(Point2D::new(point.x, point.y)),
@@ -865,8 +726,8 @@ impl GenericPathBuilder for PathBuilder {
             end_point.y,
         );
     }
-    fn finish(&mut self) -> Path {
-        Path::Raqote(self.0.take().unwrap().finish())
+    fn finish(&mut self) -> raqote::Path {
+        self.0.take().unwrap().finish()
     }
 }
 
@@ -978,14 +839,6 @@ impl ToRaqotePattern<'_> for FillOrStrokeStyle {
     }
 }
 
-impl Color {
-    fn as_raqote(&self) -> &raqote::SolidSource {
-        match self {
-            Color::Raqote(s) => s,
-        }
-    }
-}
-
 impl ToRaqoteStyle for AbsoluteColor {
     type Target = raqote::SolidSource;
 
@@ -1055,19 +908,3 @@ impl ToRaqoteStyle for CompositionStyle {
         }
     }
 }
-
-impl SourceSurface {
-    fn as_raqote(&self) -> &Vec<u8> {
-        match self {
-            SourceSurface::Raqote(s) => s,
-        }
-    }
-}
-
-impl GradientStop {
-    fn as_raqote(&self) -> &raqote::GradientStop {
-        match self {
-            GradientStop::Raqote(s) => s,
-        }
-    }
-}
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index 11d87635f32..8a670a4b4a7 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -13,12 +13,12 @@ path = "lib.rs"
 
 [features]
 default = []
-multiview = []
 tracing = ["dep:tracing"]
 webxr = ["dep:webxr"]
 
 [dependencies]
 base = { workspace = true }
+bincode = { workspace = true }
 bitflags = { workspace = true }
 compositing_traits = { workspace = true }
 constellation_traits = { workspace = true }
@@ -35,14 +35,15 @@ net = { path = "../net" }
 pixels = { path = "../pixels" }
 profile_traits = { workspace = true }
 script_traits = { workspace = true }
+servo_allocator = { path = "../allocator" }
 servo_config = { path = "../config" }
 servo_geometry = { path = "../geometry" }
 stylo_traits = { workspace = true }
 tracing = { workspace = true, optional = true }
 webrender = { workspace = true }
 webrender_api = { workspace = true }
-webrender_traits = { workspace = true }
 webxr = { path = "../webxr", optional = true }
+wr_malloc_size_of = { workspace = true }
 
 [dev-dependencies]
 surfman = { workspace = true }
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index 7f8864120b4..b1669277ba1 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -5,8 +5,7 @@
 use std::cell::{Cell, RefCell};
 use std::collections::HashMap;
 use std::env;
-use std::fs::{File, create_dir_all};
-use std::io::Write;
+use std::fs::create_dir_all;
 use std::iter::once;
 use std::mem::take;
 use std::rc::Rc;
@@ -17,30 +16,30 @@ use base::cross_process_instant::CrossProcessInstant;
 use base::id::{PipelineId, WebViewId};
 use base::{Epoch, WebRenderEpochToU16};
 use bitflags::bitflags;
+use compositing_traits::display_list::{CompositorDisplayListInfo, HitTestInfo, ScrollTree};
+use compositing_traits::rendering_context::RenderingContext;
 use compositing_traits::{
-    CompositionPipeline, CompositorMsg, CompositorReceiver, SendableFrameTree,
+    CompositionPipeline, CompositorMsg, ImageUpdate, SendableFrameTree, WebViewTrait,
 };
-use constellation_traits::{
-    AnimationTickType, CompositorHitTestResult, ConstellationMsg, PaintMetricEvent,
-    UntrustedNodeAddress, WindowSizeData, WindowSizeType,
-};
-use crossbeam_channel::Sender;
+use constellation_traits::{EmbedderToConstellationMessage, PaintMetricEvent};
+use crossbeam_channel::{Receiver, Sender};
 use dpi::PhysicalSize;
 use embedder_traits::{
-    Cursor, InputEvent, MouseButtonEvent, MouseMoveEvent, ShutdownState, TouchEventType,
+    CompositorHitTestResult, Cursor, InputEvent, MouseButtonEvent, MouseMoveEvent, ShutdownState,
+    TouchEventType, UntrustedNodeAddress, ViewportDetails, WheelDelta, WheelEvent, WheelMode,
 };
-use euclid::{Box2D, Point2D, Rect, Scale, Size2D, Transform3D};
+use euclid::{Point2D, Rect, Scale, Size2D, Transform3D, Vector2D};
 use fnv::FnvHashMap;
 use ipc_channel::ipc::{self, IpcSharedMemory};
 use libc::c_void;
 use log::{debug, info, trace, warn};
 use pixels::{CorsStatus, Image, ImageFrame, PixelFormat};
+use profile_traits::mem::{ProcessReports, ProfilerRegistration, Report, ReportKind};
 use profile_traits::time::{self as profile_time, ProfilerCategory};
-use profile_traits::time_profile;
-use script_traits::AnimationState;
+use profile_traits::{path, time_profile};
 use servo_config::opts;
 use servo_geometry::DeviceIndependentPixel;
-use style_traits::{CSSPixel, PinchZoomFactor};
+use style_traits::CSSPixel;
 use webrender::{CaptureBits, RenderApi, Transaction};
 use webrender_api::units::{
     DeviceIntPoint, DeviceIntRect, DevicePixel, DevicePoint, DeviceRect, LayoutPoint, LayoutRect,
@@ -53,13 +52,10 @@ use webrender_api::{
     RenderReasons, SampledScrollOffset, ScrollLocation, SpaceAndClipInfo, SpatialId,
     SpatialTreeItemKey, TransformStyle,
 };
-use webrender_traits::display_list::{HitTestInfo, ScrollTree};
-use webrender_traits::rendering_context::RenderingContext;
-use webrender_traits::{CrossProcessCompositorMessage, ImageUpdate};
 
 use crate::InitialCompositorState;
-use crate::webview::{UnknownWebView, WebView, WebViewManager};
-use crate::windowing::{self, EmbedderCoordinates, WebRenderDebugOption, WindowMethods};
+use crate::webview_manager::WebViewManager;
+use crate::webview_renderer::{UnknownWebView, WebViewRenderer};
 
 #[derive(Debug, PartialEq)]
 enum UnableToComposite {
@@ -73,10 +69,6 @@ enum NotReadyToPaint {
     WaitingOnConstellation,
 }
 
-// Default viewport constraints
-const MAX_ZOOM: f32 = 8.0;
-const MIN_ZOOM: f32 = 0.1;
-
 /// Holds the state when running reftests that determines when it is
 /// safe to save the output image.
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -85,6 +77,14 @@ enum ReadyState {
     WaitingForConstellationReply,
     ReadyToSaveImage,
 }
+
+/// An option to control what kind of WebRender debugging is enabled while Servo is running.
+#[derive(Clone)]
+pub enum WebRenderDebugOption {
+    Profiler,
+    TextureCacheDebug,
+    RenderTargetDebug,
+}
 /// Data that is shared by all WebView renderers.
 pub struct ServoRenderer {
     /// This is a temporary map between [`PipelineId`]s and their associated [`WebViewId`]. Once
@@ -97,10 +97,10 @@ pub struct ServoRenderer {
     shutdown_state: Rc<Cell<ShutdownState>>,
 
     /// The port on which we receive messages.
-    compositor_receiver: CompositorReceiver,
+    compositor_receiver: Receiver<CompositorMsg>,
 
     /// The channel on which messages can be sent to the constellation.
-    pub(crate) constellation_sender: Sender<ConstellationMsg>,
+    pub(crate) constellation_sender: Sender<EmbedderToConstellationMessage>,
 
     /// The channel on which messages can be sent to the time profiler.
     time_profiler_chan: profile_time::ProfilerChan,
@@ -114,10 +114,6 @@ pub struct ServoRenderer {
     /// The GL bindings for webrender
     webrender_gl: Rc<dyn gleam::gl::Gl>,
 
-    /// The string representing the version of Servo that is running. This is used to tag
-    /// WebRender capture output.
-    version_string: String,
-
     #[cfg(feature = "webxr")]
     /// Some XR devices want to run on the main thread.
     webxr_main_thread: webxr::MainThreadRegistry,
@@ -137,31 +133,12 @@ pub struct IOCompositor {
     /// Data that is shared by all WebView renderers.
     global: Rc<RefCell<ServoRenderer>>,
 
-    /// Our top-level browsing contexts.
-    webviews: WebViewManager<WebView>,
-
-    /// The application window.
-    pub window: Rc<dyn WindowMethods>,
-
-    /// "Mobile-style" zoom that does not reflow the page.
-    viewport_zoom: PinchZoomFactor,
-
-    /// Viewport zoom constraints provided by @viewport.
-    min_viewport_zoom: Option<PinchZoomFactor>,
-    max_viewport_zoom: Option<PinchZoomFactor>,
-
-    /// "Desktop-style" zoom that resizes the viewport to fit the window.
-    page_zoom: Scale<f32, CSSPixel, DeviceIndependentPixel>,
+    /// Our [`WebViewRenderer`]s, one for every `WebView`.
+    webview_renderers: WebViewManager<WebViewRenderer>,
 
     /// Tracks whether or not the view needs to be repainted.
     needs_repaint: Cell<RepaintReason>,
 
-    /// Tracks whether the zoom action has happened recently.
-    zoom_action: bool,
-
-    /// The time of the last zoom action has started.
-    zoom_time: f64,
-
     /// Used by the logic that determines when it is safe to output an
     /// image for the reftest framework.
     ready_to_save_state: ReadyState,
@@ -172,15 +149,16 @@ pub struct IOCompositor {
     /// The surfman instance that webrender targets
     rendering_context: Rc<dyn RenderingContext>,
 
-    /// The coordinates of the native window, its view and the screen.
-    embedder_coordinates: EmbedderCoordinates,
-
     /// The number of frames pending to receive from WebRender.
     pending_frames: usize,
 
     /// The [`Instant`] of the last animation tick, used to avoid flooding the Constellation and
     /// ScriptThread with a deluge of animation ticks.
     last_animation_tick: Instant,
+
+    /// A handle to the memory profiler which will automatically unregister
+    /// when it's dropped.
+    _mem_profiler_registration: ProfilerRegistration,
 }
 
 /// Why we need to be repainted. This is used for debugging.
@@ -219,9 +197,6 @@ pub(crate) struct PipelineDetails {
     /// The pipeline associated with this PipelineDetails object.
     pub pipeline: Option<CompositionPipeline>,
 
-    /// The [`PipelineId`] of this pipeline.
-    pub id: PipelineId,
-
     /// The id of the parent pipeline, if any.
     pub parent_pipeline_id: Option<PipelineId>,
 
@@ -262,38 +237,15 @@ impl PipelineDetails {
         self.animation_callbacks_running
     }
 
-    pub(crate) fn tick_animations(&self, compositor: &IOCompositor) -> bool {
-        let animation_callbacks_running = self.animation_callbacks_running;
-        let animations_running = self.animations_running;
-        if !animation_callbacks_running && !animations_running {
-            return false;
-        }
-
-        if self.throttled {
-            return false;
-        }
-
-        let mut tick_type = AnimationTickType::empty();
-        if animations_running {
-            tick_type.insert(AnimationTickType::CSS_ANIMATIONS_AND_TRANSITIONS);
-        }
-        if animation_callbacks_running {
-            tick_type.insert(AnimationTickType::REQUEST_ANIMATION_FRAME);
-        }
-
-        let msg = ConstellationMsg::TickAnimation(self.id, tick_type);
-        if let Err(e) = compositor.global.borrow().constellation_sender.send(msg) {
-            warn!("Sending tick to constellation failed ({:?}).", e);
-        }
-        true
+    pub(crate) fn animating(&self) -> bool {
+        !self.throttled && (self.animation_callbacks_running || self.animations_running)
     }
 }
 
 impl PipelineDetails {
-    pub(crate) fn new(id: PipelineId) -> PipelineDetails {
+    pub(crate) fn new() -> PipelineDetails {
         PipelineDetails {
             pipeline: None,
-            id,
             parent_pipeline_id: None,
             most_recent_display_list_epoch: None,
             animations_running: false,
@@ -417,7 +369,9 @@ impl ServoRenderer {
         self.cursor = cursor;
         if let Err(e) = self
             .constellation_sender
-            .send(ConstellationMsg::SetCursor(webview_id, cursor))
+            .send(EmbedderToConstellationMessage::SetCursor(
+                webview_id, cursor,
+            ))
         {
             warn!("Sending event to constellation failed ({:?}).", e);
         }
@@ -425,12 +379,12 @@ impl ServoRenderer {
 }
 
 impl IOCompositor {
-    pub fn new(
-        window: Rc<dyn WindowMethods>,
-        state: InitialCompositorState,
-        convert_mouse_to_touch: bool,
-        version_string: String,
-    ) -> Self {
+    pub fn new(state: InitialCompositorState, convert_mouse_to_touch: bool) -> Self {
+        let registration = state.mem_profiler_chan.prepare_memory_reporting(
+            "compositor".into(),
+            state.sender.clone(),
+            CompositorMsg::CollectMemoryReport,
+        );
         let compositor = IOCompositor {
             global: Rc::new(RefCell::new(ServoRenderer {
                 shutdown_state: state.shutdown_state,
@@ -441,28 +395,20 @@ impl IOCompositor {
                 webrender_api: state.webrender_api,
                 webrender_document: state.webrender_document,
                 webrender_gl: state.webrender_gl,
-                version_string,
                 #[cfg(feature = "webxr")]
                 webxr_main_thread: state.webxr_main_thread,
                 convert_mouse_to_touch,
                 cursor: Cursor::None,
                 cursor_pos: DevicePoint::new(0.0, 0.0),
             })),
-            webviews: WebViewManager::default(),
-            embedder_coordinates: window.get_coordinates(),
-            window,
+            webview_renderers: WebViewManager::default(),
             needs_repaint: Cell::default(),
-            page_zoom: Scale::new(1.0),
-            viewport_zoom: PinchZoomFactor::new(1.0),
-            min_viewport_zoom: Some(PinchZoomFactor::new(1.0)),
-            max_viewport_zoom: None,
-            zoom_action: false,
-            zoom_time: 0f64,
             ready_to_save_state: ReadyState::Unknown,
             webrender: Some(state.webrender),
             rendering_context: state.rendering_context,
             pending_frames: 0,
             last_animation_tick: Instant::now(),
+            _mem_profiler_registration: registration,
         };
 
         {
@@ -483,6 +429,21 @@ impl IOCompositor {
         }
     }
 
+    pub fn rendering_context_size(&self) -> Size2D<u32, DevicePixel> {
+        self.rendering_context.size2d()
+    }
+
+    pub fn webxr_running(&self) -> bool {
+        #[cfg(feature = "webxr")]
+        {
+            self.global.borrow().webxr_main_thread.running()
+        }
+        #[cfg(not(feature = "webxr"))]
+        {
+            false
+        }
+    }
+
     fn set_needs_repaint(&self, reason: RepaintReason) {
         let mut needs_repaint = self.needs_repaint.get();
         needs_repaint.insert(reason);
@@ -500,8 +461,8 @@ impl IOCompositor {
             .global
             .borrow_mut()
             .compositor_receiver
-            .try_recv_compositor_msg()
-            .is_some()
+            .try_recv()
+            .is_ok()
         {}
 
         // Tell the profiler, memory profiler, and scrolling timer to shut down.
@@ -530,27 +491,43 @@ impl IOCompositor {
         }
 
         match msg {
+            CompositorMsg::CollectMemoryReport(sender) => {
+                let ops =
+                    wr_malloc_size_of::MallocSizeOfOps::new(servo_allocator::usable_size, None);
+                let report = self.global.borrow().webrender_api.report_memory(ops);
+                let reports = vec![
+                    Report {
+                        path: path!["webrender", "fonts"],
+                        kind: ReportKind::ExplicitJemallocHeapSize,
+                        size: report.fonts,
+                    },
+                    Report {
+                        path: path!["webrender", "images"],
+                        kind: ReportKind::ExplicitJemallocHeapSize,
+                        size: report.images,
+                    },
+                    Report {
+                        path: path!["webrender", "display-list"],
+                        kind: ReportKind::ExplicitJemallocHeapSize,
+                        size: report.display_list,
+                    },
+                ];
+                sender.send(ProcessReports::new(reports));
+            },
+
             CompositorMsg::ChangeRunningAnimationsState(
                 webview_id,
                 pipeline_id,
                 animation_state,
             ) => {
-                let mut throttled = true;
-                if let Some(webview) = self.webviews.get_mut(webview_id) {
-                    throttled =
-                        webview.change_running_animations_state(pipeline_id, animation_state);
-                }
-
-                // These operations should eventually happen per-WebView, but they are global now as rendering
-                // is still global to all WebViews.
-                if !throttled && animation_state == AnimationState::AnimationsPresent {
-                    self.set_needs_repaint(RepaintReason::ChangedAnimationState);
-                }
-
-                if !throttled && animation_state == AnimationState::AnimationCallbacksPresent {
-                    // We need to fetch the WebView again in order to avoid a double borrow.
-                    if let Some(webview) = self.webviews.get(webview_id) {
-                        webview.tick_animations_for_pipeline(pipeline_id, self);
+                if let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) {
+                    if webview_renderer
+                        .change_pipeline_running_animations_state(pipeline_id, animation_state) &&
+                        webview_renderer.animating()
+                    {
+                        // These operations should eventually happen per-WebView, but they are
+                        // global now as rendering is still global to all WebViews.
+                        self.process_animations(true);
                     }
                 }
             },
@@ -564,15 +541,15 @@ impl IOCompositor {
             },
 
             CompositorMsg::TouchEventProcessed(webview_id, result) => {
-                let Some(webview) = self.webviews.get_mut(webview_id) else {
+                let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) else {
                     warn!("Handling input event for unknown webview: {webview_id}");
                     return;
                 };
-                webview.on_touch_event_processed(result);
+                webview_renderer.on_touch_event_processed(result);
             },
 
-            CompositorMsg::CreatePng(page_rect, reply) => {
-                let res = self.render_to_shared_memory(page_rect);
+            CompositorMsg::CreatePng(webview_id, page_rect, reply) => {
+                let res = self.render_to_shared_memory(webview_id, page_rect);
                 if let Err(ref e) = res {
                     info!("Error retrieving PNG: {:?}", e);
                 }
@@ -596,9 +573,14 @@ impl IOCompositor {
             },
 
             CompositorMsg::SetThrottled(webview_id, pipeline_id, throttled) => {
-                if let Some(webview) = self.webviews.get_mut(webview_id) {
-                    webview.set_throttled(pipeline_id, throttled);
-                    self.process_animations(true);
+                if let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) {
+                    if webview_renderer.set_throttled(pipeline_id, throttled) &&
+                        webview_renderer.animating()
+                    {
+                        // These operations should eventually happen per-WebView, but they are
+                        // global now as rendering is still global to all WebViews.
+                        self.process_animations(true);
+                    }
                 }
             },
 
@@ -607,8 +589,8 @@ impl IOCompositor {
                     "Compositor got pipeline exited: {:?} {:?}",
                     webview_id, pipeline_id
                 );
-                if let Some(webview) = self.webviews.get_mut(webview_id) {
-                    webview.remove_pipeline(pipeline_id);
+                if let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) {
+                    webview_renderer.remove_pipeline(pipeline_id);
                 }
                 let _ = sender.send(());
             },
@@ -640,13 +622,13 @@ impl IOCompositor {
             },
 
             CompositorMsg::WebDriverMouseButtonEvent(webview_id, action, button, x, y) => {
-                let dppx = self.device_pixels_per_page_pixel();
-                let point = dppx.transform_point(Point2D::new(x, y));
-                let Some(webview) = self.webviews.get_mut(webview_id) else {
+                let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) else {
                     warn!("Handling input event for unknown webview: {webview_id}");
                     return;
                 };
-                webview.dispatch_input_event(InputEvent::MouseButton(MouseButtonEvent {
+                let dppx = webview_renderer.device_pixels_per_page_pixel();
+                let point = dppx.transform_point(Point2D::new(x, y));
+                webview_renderer.dispatch_input_event(InputEvent::MouseButton(MouseButtonEvent {
                     point,
                     action,
                     button,
@@ -654,48 +636,51 @@ impl IOCompositor {
             },
 
             CompositorMsg::WebDriverMouseMoveEvent(webview_id, x, y) => {
-                let dppx = self.device_pixels_per_page_pixel();
-                let point = dppx.transform_point(Point2D::new(x, y));
-                let Some(webview) = self.webviews.get_mut(webview_id) else {
+                let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) else {
                     warn!("Handling input event for unknown webview: {webview_id}");
                     return;
                 };
-                webview.dispatch_input_event(InputEvent::MouseMove(MouseMoveEvent { point }));
+                let dppx = webview_renderer.device_pixels_per_page_pixel();
+                let point = dppx.transform_point(Point2D::new(x, y));
+                webview_renderer
+                    .dispatch_input_event(InputEvent::MouseMove(MouseMoveEvent { point }));
             },
 
-            CompositorMsg::CrossProcess(cross_proces_message) => {
-                self.handle_cross_process_message(cross_proces_message);
+            CompositorMsg::WebDriverWheelScrollEvent(webview_id, x, y, delta_x, delta_y) => {
+                let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) else {
+                    warn!("Handling input event for unknown webview: {webview_id}");
+                    return;
+                };
+                let delta = WheelDelta {
+                    x: delta_x,
+                    y: delta_y,
+                    z: 0.0,
+                    mode: WheelMode::DeltaPixel,
+                };
+                let dppx = webview_renderer.device_pixels_per_page_pixel();
+                let point = dppx.transform_point(Point2D::new(x, y));
+                let scroll_delta =
+                    dppx.transform_vector(Vector2D::new(delta_x as f32, delta_y as f32));
+                webview_renderer
+                    .dispatch_input_event(InputEvent::Wheel(WheelEvent { delta, point }));
+                webview_renderer.on_webdriver_wheel_action(scroll_delta, point);
             },
-        }
-    }
 
-    /// Accept messages from content processes that need to be relayed to the WebRender
-    /// instance in the parent process.
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn handle_cross_process_message(&mut self, msg: CrossProcessCompositorMessage) {
-        match msg {
-            CrossProcessCompositorMessage::SendInitialTransaction(pipeline) => {
+            CompositorMsg::SendInitialTransaction(pipeline) => {
                 let mut txn = Transaction::new();
                 txn.set_display_list(WebRenderEpoch(0), (pipeline, Default::default()));
                 self.generate_frame(&mut txn, RenderReasons::SCENE);
                 self.global.borrow_mut().send_transaction(txn);
             },
 
-            CrossProcessCompositorMessage::SendScrollNode(
-                webview_id,
-                pipeline_id,
-                point,
-                external_scroll_id,
-            ) => {
-                let Some(webview) = self.webviews.get_mut(webview_id) else {
+            CompositorMsg::SendScrollNode(webview_id, pipeline_id, point, external_scroll_id) => {
+                let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) else {
                     return;
                 };
 
                 let pipeline_id = pipeline_id.into();
-                let Some(pipeline_details) = webview.pipelines.get_mut(&pipeline_id) else {
+                let Some(pipeline_details) = webview_renderer.pipelines.get_mut(&pipeline_id)
+                else {
                     return;
                 };
 
@@ -723,13 +708,25 @@ impl IOCompositor {
                 self.global.borrow_mut().send_transaction(txn);
             },
 
-            CrossProcessCompositorMessage::SendDisplayList {
+            CompositorMsg::SendDisplayList {
                 webview_id,
-                display_list_info,
                 display_list_descriptor,
                 display_list_receiver,
             } => {
                 // This must match the order from the sender, currently in `shared/script/lib.rs`.
+                let display_list_info = match display_list_receiver.recv() {
+                    Ok(display_list_info) => display_list_info,
+                    Err(error) => {
+                        return warn!("Could not receive display list info: {error}");
+                    },
+                };
+                let display_list_info: CompositorDisplayListInfo =
+                    match bincode::deserialize(&display_list_info) {
+                        Ok(display_list_info) => display_list_info,
+                        Err(error) => {
+                            return warn!("Could not deserialize display list info: {error}");
+                        },
+                    };
                 let items_data = match display_list_receiver.recv() {
                     Ok(display_list_data) => display_list_data,
                     Err(error) => {
@@ -770,12 +767,12 @@ impl IOCompositor {
                 )
                 .entered();
 
-                let Some(webview) = self.webviews.get_mut(webview_id) else {
+                let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) else {
                     return warn!("Could not find WebView for incoming display list");
                 };
 
                 let pipeline_id = display_list_info.pipeline_id;
-                let details = webview.ensure_pipeline_details(pipeline_id.into());
+                let details = webview_renderer.ensure_pipeline_details(pipeline_id.into());
                 details.most_recent_display_list_epoch = Some(display_list_info.epoch);
                 details.hit_test_items = display_list_info.hit_test_info;
                 details.install_new_scroll_tree(display_list_info.scroll_tree);
@@ -800,7 +797,7 @@ impl IOCompositor {
                 self.global.borrow_mut().send_transaction(transaction);
             },
 
-            CrossProcessCompositorMessage::HitTest(pipeline, point, flags, sender) => {
+            CompositorMsg::HitTest(pipeline, point, flags, sender) => {
                 // When a display list is sent to WebRender, it starts scene building in a
                 // separate thread and then that display list is available for hit testing.
                 // Without flushing scene building, any hit test we do might be done against
@@ -826,11 +823,11 @@ impl IOCompositor {
                 let _ = sender.send(result);
             },
 
-            CrossProcessCompositorMessage::GenerateImageKey(sender) => {
+            CompositorMsg::GenerateImageKey(sender) => {
                 let _ = sender.send(self.global.borrow().webrender_api.generate_image_key());
             },
 
-            CrossProcessCompositorMessage::UpdateImages(updates) => {
+            CompositorMsg::UpdateImages(updates) => {
                 let mut txn = Transaction::new();
                 for update in updates {
                     match update {
@@ -846,26 +843,21 @@ impl IOCompositor {
                 self.global.borrow_mut().send_transaction(txn);
             },
 
-            CrossProcessCompositorMessage::AddFont(font_key, data, index) => {
+            CompositorMsg::AddFont(font_key, data, index) => {
                 self.add_font(font_key, index, data);
             },
 
-            CrossProcessCompositorMessage::AddSystemFont(font_key, native_handle) => {
+            CompositorMsg::AddSystemFont(font_key, native_handle) => {
                 let mut transaction = Transaction::new();
                 transaction.add_native_font(font_key, native_handle);
                 self.global.borrow_mut().send_transaction(transaction);
             },
 
-            CrossProcessCompositorMessage::AddFontInstance(
-                font_instance_key,
-                font_key,
-                size,
-                flags,
-            ) => {
+            CompositorMsg::AddFontInstance(font_instance_key, font_key, size, flags) => {
                 self.add_font_instance(font_instance_key, font_key, size, flags);
             },
 
-            CrossProcessCompositorMessage::RemoveFonts(keys, instance_keys) => {
+            CompositorMsg::RemoveFonts(keys, instance_keys) => {
                 let mut transaction = Transaction::new();
 
                 for instance in instance_keys.into_iter() {
@@ -878,13 +870,13 @@ impl IOCompositor {
                 self.global.borrow_mut().send_transaction(transaction);
             },
 
-            CrossProcessCompositorMessage::AddImage(key, desc, data) => {
+            CompositorMsg::AddImage(key, desc, data) => {
                 let mut txn = Transaction::new();
                 txn.add_image(key, desc, data.into(), None);
                 self.global.borrow_mut().send_transaction(txn);
             },
 
-            CrossProcessCompositorMessage::GenerateFontKeys(
+            CompositorMsg::GenerateFontKeys(
                 number_of_font_keys,
                 number_of_font_instance_keys,
                 result_sender,
@@ -902,22 +894,36 @@ impl IOCompositor {
                     .collect();
                 let _ = result_sender.send((font_keys, font_instance_keys));
             },
-            CrossProcessCompositorMessage::GetClientWindowRect(req) => {
-                if let Err(e) = req.send(self.embedder_coordinates.window_rect) {
-                    warn!("Sending response to get client window failed ({:?}).", e);
+            CompositorMsg::GetClientWindowRect(webview_id, response_sender) => {
+                let client_window_rect = self
+                    .webview_renderers
+                    .get(webview_id)
+                    .map(|webview_renderer| {
+                        webview_renderer.client_window_rect(self.rendering_context.size2d())
+                    })
+                    .unwrap_or_default();
+                if let Err(error) = response_sender.send(client_window_rect) {
+                    warn!("Sending response to get client window failed ({error:?}).");
                 }
             },
-            CrossProcessCompositorMessage::GetScreenSize(req) => {
-                if let Err(e) = req.send(self.embedder_coordinates.screen_size) {
-                    warn!("Sending response to get screen size failed ({:?}).", e);
+            CompositorMsg::GetScreenSize(webview_id, response_sender) => {
+                let screen_size = self
+                    .webview_renderers
+                    .get(webview_id)
+                    .map(WebViewRenderer::screen_size)
+                    .unwrap_or_default();
+                if let Err(error) = response_sender.send(screen_size) {
+                    warn!("Sending response to get screen size failed ({error:?}).");
                 }
             },
-            CrossProcessCompositorMessage::GetAvailableScreenSize(req) => {
-                if let Err(e) = req.send(self.embedder_coordinates.available_screen_size) {
-                    warn!(
-                        "Sending response to get screen avail size failed ({:?}).",
-                        e
-                    );
+            CompositorMsg::GetAvailableScreenSize(webview_id, response_sender) => {
+                let available_screen_size = self
+                    .webview_renderers
+                    .get(webview_id)
+                    .map(WebViewRenderer::available_screen_size)
+                    .unwrap_or_default();
+                if let Err(error) = response_sender.send(available_screen_size) {
+                    warn!("Sending response to get screen size failed ({error:?}).");
                 }
             },
         }
@@ -939,21 +945,19 @@ impl IOCompositor {
                     "Compositor got pipeline exited: {:?} {:?}",
                     webview_id, pipeline_id
                 );
-                if let Some(webview) = self.webviews.get_mut(webview_id) {
-                    webview.remove_pipeline(pipeline_id);
+                if let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) {
+                    webview_renderer.remove_pipeline(pipeline_id);
                 }
                 let _ = sender.send(());
             },
-            CompositorMsg::CrossProcess(CrossProcessCompositorMessage::GenerateImageKey(
-                sender,
-            )) => {
+            CompositorMsg::GenerateImageKey(sender) => {
                 let _ = sender.send(self.global.borrow().webrender_api.generate_image_key());
             },
-            CompositorMsg::CrossProcess(CrossProcessCompositorMessage::GenerateFontKeys(
+            CompositorMsg::GenerateFontKeys(
                 number_of_font_keys,
                 number_of_font_instance_keys,
                 result_sender,
-            )) => {
+            ) => {
                 let font_keys = (0..number_of_font_keys)
                     .map(|_| self.global.borrow().webrender_api.generate_font_key())
                     .collect();
@@ -967,26 +971,19 @@ impl IOCompositor {
                     .collect();
                 let _ = result_sender.send((font_keys, font_instance_keys));
             },
-            CompositorMsg::CrossProcess(CrossProcessCompositorMessage::GetClientWindowRect(
-                req,
-            )) => {
-                if let Err(e) = req.send(self.embedder_coordinates.window_rect) {
-                    warn!("Sending response to get client window failed ({:?}).", e);
+            CompositorMsg::GetClientWindowRect(_, response_sender) => {
+                if let Err(error) = response_sender.send(Default::default()) {
+                    warn!("Sending response to get client window failed ({error:?}).");
                 }
             },
-            CompositorMsg::CrossProcess(CrossProcessCompositorMessage::GetScreenSize(req)) => {
-                if let Err(e) = req.send(self.embedder_coordinates.screen_size) {
-                    warn!("Sending response to get screen size failed ({:?}).", e);
+            CompositorMsg::GetScreenSize(_, response_sender) => {
+                if let Err(error) = response_sender.send(Default::default()) {
+                    warn!("Sending response to get client window failed ({error:?}).");
                 }
             },
-            CompositorMsg::CrossProcess(CrossProcessCompositorMessage::GetAvailableScreenSize(
-                req,
-            )) => {
-                if let Err(e) = req.send(self.embedder_coordinates.available_screen_size) {
-                    warn!(
-                        "Sending response to get screen avail size failed ({:?}).",
-                        e
-                    );
+            CompositorMsg::GetAvailableScreenSize(_, response_sender) => {
+                if let Err(error) = response_sender.send(Default::default()) {
+                    warn!("Sending response to get client window failed ({error:?}).");
                 }
             },
             CompositorMsg::NewWebRenderFrameReady(..) => {
@@ -1031,43 +1028,50 @@ impl IOCompositor {
         let mut builder = webrender_api::DisplayListBuilder::new(root_pipeline);
         builder.begin();
 
-        let zoom_factor = self.device_pixels_per_page_pixel().0;
-        let zoom_reference_frame = builder.push_reference_frame(
+        let root_reference_frame = SpatialId::root_reference_frame(root_pipeline);
+
+        let viewport_size = self.rendering_context.size2d().to_f32().to_untyped();
+        let viewport_rect = LayoutRect::from_origin_and_size(
             LayoutPoint::zero(),
-            SpatialId::root_reference_frame(root_pipeline),
-            TransformStyle::Flat,
-            PropertyBinding::Value(Transform3D::scale(zoom_factor, zoom_factor, 1.)),
-            ReferenceFrameKind::Transform {
-                is_2d_scale_translation: true,
-                should_snap: true,
-                paired_with_perspective: false,
-            },
-            SpatialTreeItemKey::new(0, 0),
+            LayoutSize::from_untyped(viewport_size),
         );
 
-        let scaled_viewport_size =
-            self.rendering_context.size2d().to_f32().to_untyped() / zoom_factor;
-        let scaled_viewport_rect = LayoutRect::from_origin_and_size(
-            LayoutPoint::zero(),
-            LayoutSize::from_untyped(scaled_viewport_size),
-        );
-
-        let root_clip_id = builder.define_clip_rect(zoom_reference_frame, scaled_viewport_rect);
+        let root_clip_id = builder.define_clip_rect(root_reference_frame, viewport_rect);
         let clip_chain_id = builder.define_clip_chain(None, [root_clip_id]);
-        for (_, webview) in self.webviews.painting_order() {
-            if let Some(pipeline_id) = webview.root_pipeline_id {
-                let scaled_webview_rect = webview.rect / zoom_factor;
-                builder.push_iframe(
-                    LayoutRect::from_untyped(&scaled_webview_rect.to_untyped()),
-                    LayoutRect::from_untyped(&scaled_webview_rect.to_untyped()),
-                    &SpaceAndClipInfo {
-                        spatial_id: zoom_reference_frame,
-                        clip_chain_id,
-                    },
-                    pipeline_id.into(),
-                    true,
-                );
-            }
+        for (_, webview_renderer) in self.webview_renderers.painting_order() {
+            let Some(pipeline_id) = webview_renderer.root_pipeline_id else {
+                continue;
+            };
+
+            let device_pixels_per_page_pixel = webview_renderer.device_pixels_per_page_pixel().0;
+            let webview_reference_frame = builder.push_reference_frame(
+                LayoutPoint::zero(),
+                root_reference_frame,
+                TransformStyle::Flat,
+                PropertyBinding::Value(Transform3D::scale(
+                    device_pixels_per_page_pixel,
+                    device_pixels_per_page_pixel,
+                    1.,
+                )),
+                ReferenceFrameKind::Transform {
+                    is_2d_scale_translation: true,
+                    should_snap: true,
+                    paired_with_perspective: false,
+                },
+                SpatialTreeItemKey::new(0, 0),
+            );
+
+            let scaled_webview_rect = webview_renderer.rect / device_pixels_per_page_pixel;
+            builder.push_iframe(
+                LayoutRect::from_untyped(&scaled_webview_rect.to_untyped()),
+                LayoutRect::from_untyped(&scaled_webview_rect.to_untyped()),
+                &SpaceAndClipInfo {
+                    spatial_id: webview_reference_frame,
+                    clip_chain_id,
+                },
+                pipeline_id.into(),
+                true,
+            );
         }
 
         let built_display_list = builder.end();
@@ -1088,8 +1092,8 @@ impl IOCompositor {
     /// TODO(mrobinson): Could we only send offsets for the branch being modified
     /// and not the entire scene?
     fn update_transaction_with_all_scroll_offsets(&self, transaction: &mut Transaction) {
-        for webview in self.webviews.iter() {
-            for details in webview.pipelines.values() {
+        for webview_renderer in self.webview_renderers.iter() {
+            for details in webview_renderer.pipelines.values() {
                 for node in details.scroll_tree.nodes.iter() {
                     let (Some(offset), Some(external_id)) = (node.offset(), node.external_id())
                     else {
@@ -1109,33 +1113,38 @@ impl IOCompositor {
         }
     }
 
-    pub fn add_webview(&mut self, webview_id: WebViewId) {
-        let size = self.rendering_context.size2d().to_f32();
-        self.webviews.entry(webview_id).or_insert(WebView::new(
-            webview_id,
-            Box2D::from_origin_and_size(Point2D::origin(), size),
-            self.global.clone(),
-        ));
+    pub fn add_webview(
+        &mut self,
+        webview: Box<dyn WebViewTrait>,
+        viewport_details: ViewportDetails,
+    ) {
+        self.webview_renderers
+            .entry(webview.id())
+            .or_insert(WebViewRenderer::new(
+                self.global.clone(),
+                webview,
+                viewport_details,
+            ));
     }
 
     fn set_frame_tree_for_webview(&mut self, frame_tree: &SendableFrameTree) {
         debug!("{}: Setting frame tree for webview", frame_tree.pipeline.id);
 
         let webview_id = frame_tree.pipeline.webview_id;
-        let Some(webview) = self.webviews.get_mut(webview_id) else {
+        let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) else {
             warn!(
                 "Attempted to set frame tree on unknown WebView (perhaps closed?): {webview_id:?}"
             );
             return;
         };
 
-        webview.set_frame_tree(frame_tree);
+        webview_renderer.set_frame_tree(frame_tree);
         self.send_root_pipeline_display_list();
     }
 
     fn remove_webview(&mut self, webview_id: WebViewId) {
         debug!("{}: Removing", webview_id);
-        if self.webviews.remove(webview_id).is_err() {
+        if self.webview_renderers.remove(webview_id).is_err() {
             warn!("{webview_id}: Removing unknown webview");
             return;
         };
@@ -1143,31 +1152,6 @@ impl IOCompositor {
         self.send_root_pipeline_display_list();
     }
 
-    pub fn move_resize_webview(&mut self, webview_id: WebViewId, rect: DeviceRect) {
-        debug!("{webview_id}: Moving and/or resizing webview; rect={rect:?}");
-        let rect_changed;
-        let size_changed;
-        match self.webviews.get_mut(webview_id) {
-            Some(webview) => {
-                rect_changed = rect != webview.rect;
-                size_changed = rect.size() != webview.rect.size();
-                webview.rect = rect;
-            },
-            None => {
-                warn!("{webview_id}: MoveResizeWebView on unknown webview id");
-                return;
-            },
-        };
-
-        if rect_changed {
-            if size_changed {
-                self.send_window_size_message_for_top_level_browser_context(rect, webview_id);
-            }
-
-            self.send_root_pipeline_display_list();
-        }
-    }
-
     pub fn show_webview(
         &mut self,
         webview_id: WebViewId,
@@ -1176,15 +1160,15 @@ impl IOCompositor {
         debug!("{webview_id}: Showing webview; hide_others={hide_others}");
         let painting_order_changed = if hide_others {
             let result = self
-                .webviews
+                .webview_renderers
                 .painting_order()
                 .map(|(&id, _)| id)
                 .ne(once(webview_id));
-            self.webviews.hide_all();
-            self.webviews.show(webview_id)?;
+            self.webview_renderers.hide_all();
+            self.webview_renderers.show(webview_id)?;
             result
         } else {
-            self.webviews.show(webview_id)?
+            self.webview_renderers.show(webview_id)?
         };
         if painting_order_changed {
             self.send_root_pipeline_display_list();
@@ -1194,7 +1178,7 @@ impl IOCompositor {
 
     pub fn hide_webview(&mut self, webview_id: WebViewId) -> Result<(), UnknownWebView> {
         debug!("{webview_id}: Hiding webview");
-        if self.webviews.hide(webview_id)? {
+        if self.webview_renderers.hide(webview_id)? {
             self.send_root_pipeline_display_list();
         }
         Ok(())
@@ -1208,15 +1192,15 @@ impl IOCompositor {
         debug!("{webview_id}: Raising webview to top; hide_others={hide_others}");
         let painting_order_changed = if hide_others {
             let result = self
-                .webviews
+                .webview_renderers
                 .painting_order()
                 .map(|(&id, _)| id)
                 .ne(once(webview_id));
-            self.webviews.hide_all();
-            self.webviews.raise_to_top(webview_id)?;
+            self.webview_renderers.hide_all();
+            self.webview_renderers.raise_to_top(webview_id)?;
             result
         } else {
-            self.webviews.raise_to_top(webview_id)?
+            self.webview_renderers.raise_to_top(webview_id)?
         };
         if painting_order_changed {
             self.send_root_pipeline_display_list();
@@ -1224,43 +1208,46 @@ impl IOCompositor {
         Ok(())
     }
 
-    fn send_window_size_message_for_top_level_browser_context(
-        &self,
-        rect: DeviceRect,
-        webview_id: WebViewId,
-    ) {
-        // The device pixel ratio used by the style system should include the scale from page pixels
-        // to device pixels, but not including any pinch zoom.
-        let device_pixel_ratio = self.device_pixels_per_page_pixel_not_including_page_zoom();
-        let initial_viewport = rect.size().to_f32() / device_pixel_ratio;
-        let msg = ConstellationMsg::WindowSize(
-            webview_id,
-            WindowSizeData {
-                device_pixel_ratio,
-                initial_viewport,
-            },
-            WindowSizeType::Resize,
-        );
-        if let Err(e) = self.global.borrow().constellation_sender.send(msg) {
-            warn!("Sending window resize to constellation failed ({:?}).", e);
-        }
-    }
-
-    pub fn on_embedder_window_moved(&mut self) {
-        self.embedder_coordinates = self.window.get_coordinates();
-    }
-
-    pub fn resize_rendering_context(&mut self, new_size: PhysicalSize<u32>) -> bool {
+    pub fn move_resize_webview(&mut self, webview_id: WebViewId, rect: DeviceRect) {
         if self.global.borrow().shutdown_state() != ShutdownState::NotShuttingDown {
-            return false;
+            return;
+        }
+        let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) else {
+            return;
+        };
+        if !webview_renderer.set_rect(rect) {
+            return;
         }
 
-        let old_hidpi_factor = self.embedder_coordinates.hidpi_factor;
-        self.embedder_coordinates = self.window.get_coordinates();
-        if self.embedder_coordinates.hidpi_factor == old_hidpi_factor &&
-            self.rendering_context.size() == new_size
-        {
-            return false;
+        self.send_root_pipeline_display_list();
+        self.set_needs_repaint(RepaintReason::Resize);
+    }
+
+    pub fn set_hidpi_scale_factor(
+        &mut self,
+        webview_id: WebViewId,
+        new_scale_factor: Scale<f32, DeviceIndependentPixel, DevicePixel>,
+    ) {
+        if self.global.borrow().shutdown_state() != ShutdownState::NotShuttingDown {
+            return;
+        }
+        let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) else {
+            return;
+        };
+        if !webview_renderer.set_hidpi_scale_factor(new_scale_factor) {
+            return;
+        }
+
+        self.send_root_pipeline_display_list();
+        self.set_needs_repaint(RepaintReason::Resize);
+    }
+
+    pub fn resize_rendering_context(&mut self, new_size: PhysicalSize<u32>) {
+        if self.global.borrow().shutdown_state() != ShutdownState::NotShuttingDown {
+            return;
+        }
+        if self.rendering_context.size() == new_size {
+            return;
         }
 
         self.rendering_context.resize(new_size);
@@ -1273,9 +1260,8 @@ impl IOCompositor {
         transaction.set_document_view(output_region);
         self.global.borrow_mut().send_transaction(transaction);
 
-        self.update_after_zoom_or_hidpi_change();
+        self.send_root_pipeline_display_list();
         self.set_needs_repaint(RepaintReason::Resize);
-        true
     }
 
     /// If there are any animations running, dispatches appropriate messages to the constellation.
@@ -1291,64 +1277,45 @@ impl IOCompositor {
         }
         self.last_animation_tick = Instant::now();
 
-        #[cfg(feature = "webxr")]
-        let webxr_running = self.global.borrow().webxr_main_thread.running();
-        #[cfg(not(feature = "webxr"))]
-        let webxr_running = false;
-
-        let any_webviews_animating = !self
-            .webviews
+        let animating_webviews: Vec<_> = self
+            .webview_renderers
             .iter()
-            .all(|webview| !webview.tick_all_animations(self));
-
-        let animation_state = if !any_webviews_animating && !webxr_running {
-            windowing::AnimationState::Idle
-        } else {
-            windowing::AnimationState::Animating
-        };
-
-        self.window.set_animation_state(animation_state);
+            .filter_map(|webview_renderer| {
+                if webview_renderer.animating() {
+                    Some(webview_renderer.id)
+                } else {
+                    None
+                }
+            })
+            .collect();
+        if !animating_webviews.is_empty() {
+            if let Err(error) = self.global.borrow().constellation_sender.send(
+                EmbedderToConstellationMessage::TickAnimation(animating_webviews),
+            ) {
+                warn!("Sending tick to constellation failed ({error:?}).");
+            }
+        }
     }
 
-    fn hidpi_factor(&self) -> Scale<f32, DeviceIndependentPixel, DevicePixel> {
-        self.embedder_coordinates.hidpi_factor
-    }
-
-    pub(crate) fn device_pixels_per_page_pixel(&self) -> Scale<f32, CSSPixel, DevicePixel> {
-        self.device_pixels_per_page_pixel_not_including_page_zoom() * self.pinch_zoom_level()
-    }
-
-    fn device_pixels_per_page_pixel_not_including_page_zoom(
-        &self,
-    ) -> Scale<f32, CSSPixel, DevicePixel> {
-        self.page_zoom * self.hidpi_factor()
-    }
-
-    pub fn on_zoom_reset_window_event(&mut self) {
+    pub fn on_zoom_reset_window_event(&mut self, webview_id: WebViewId) {
         if self.global.borrow().shutdown_state() != ShutdownState::NotShuttingDown {
             return;
         }
 
-        self.page_zoom = Scale::new(1.0);
-        self.update_after_zoom_or_hidpi_change();
+        if let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) {
+            webview_renderer.set_page_zoom(1.0);
+        }
+        self.send_root_pipeline_display_list();
     }
 
-    pub fn on_zoom_window_event(&mut self, magnification: f32) {
+    pub fn on_zoom_window_event(&mut self, webview_id: WebViewId, magnification: f32) {
         if self.global.borrow().shutdown_state() != ShutdownState::NotShuttingDown {
             return;
         }
 
-        self.page_zoom =
-            Scale::new((self.page_zoom.get() * magnification).clamp(MIN_ZOOM, MAX_ZOOM));
-        self.update_after_zoom_or_hidpi_change();
-    }
-
-    fn update_after_zoom_or_hidpi_change(&mut self) {
-        for (webview_id, webview) in self.webviews.painting_order() {
-            self.send_window_size_message_for_top_level_browser_context(webview.rect, *webview_id);
+        if let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) {
+            webview_renderer.set_page_zoom(magnification);
         }
-
-        // Update the root transform in WebRender to reflect the new zoom.
         self.send_root_pipeline_display_list();
     }
 
@@ -1359,21 +1326,24 @@ impl IOCompositor {
             .pipeline_to_webview_map
             .get(&pipeline_id)
             .cloned()?;
-        self.webviews.get(webview_id)?.pipelines.get(&pipeline_id)
+        self.webview_renderers
+            .get(webview_id)?
+            .pipelines
+            .get(&pipeline_id)
     }
 
     // Check if any pipelines currently have active animations or animation callbacks.
     fn animations_or_animation_callbacks_running(&self) -> bool {
-        self.webviews
+        self.webview_renderers
             .iter()
-            .any(WebView::animations_or_animation_callbacks_running)
+            .any(WebViewRenderer::animations_or_animation_callbacks_running)
     }
 
     /// Returns true if any animation callbacks (ie `requestAnimationFrame`) are waiting for a response.
     fn animation_callbacks_running(&self) -> bool {
-        self.webviews
+        self.webview_renderers
             .iter()
-            .any(WebView::animation_callbacks_running)
+            .any(WebViewRenderer::animation_callbacks_running)
     }
 
     /// Query the constellation to see if the current compositor
@@ -1389,7 +1359,11 @@ impl IOCompositor {
                 // This gets sent to the constellation for comparison with the current
                 // frame tree.
                 let mut pipeline_epochs = HashMap::new();
-                for id in self.webviews.iter().flat_map(WebView::pipeline_ids) {
+                for id in self
+                    .webview_renderers
+                    .iter()
+                    .flat_map(WebViewRenderer::pipeline_ids)
+                {
                     if let Some(WebRenderEpoch(epoch)) = self
                         .webrender
                         .as_ref()
@@ -1402,7 +1376,7 @@ impl IOCompositor {
 
                 // Pass the pipeline/epoch states to the constellation and check
                 // if it's safe to output the image.
-                let msg = ConstellationMsg::IsReadyToSaveImage(pipeline_epochs);
+                let msg = EmbedderToConstellationMessage::IsReadyToSaveImage(pipeline_epochs);
                 if let Err(e) = self.global.borrow().constellation_sender.send(msg) {
                     warn!("Sending ready to save to constellation failed ({:?}).", e);
                 }
@@ -1448,13 +1422,19 @@ impl IOCompositor {
     /// [`IOCompositor`]. If succesful return the output image in shared memory.
     fn render_to_shared_memory(
         &mut self,
+        webview_id: WebViewId,
         page_rect: Option<Rect<f32, CSSPixel>>,
     ) -> Result<Option<Image>, UnableToComposite> {
         self.render_inner()?;
 
         let size = self.rendering_context.size2d().to_i32();
         let rect = if let Some(rect) = page_rect {
-            let rect = self.device_pixels_per_page_pixel().transform_rect(&rect);
+            let scale = self
+                .webview_renderers
+                .get(webview_id)
+                .map(WebViewRenderer::device_pixels_per_page_pixel)
+                .unwrap_or_else(|| Scale::new(1.0));
+            let rect = scale.transform_rect(&rect);
 
             let x = rect.origin.x as i32;
             // We need to convert to the bottom-left origin coordinate
@@ -1549,8 +1529,8 @@ impl IOCompositor {
     fn send_pending_paint_metrics_messages_after_composite(&mut self) {
         let paint_time = CrossProcessInstant::now();
         let document_id = self.webrender_document();
-        for webview_details in self.webviews.iter_mut() {
-            for (pipeline_id, pipeline) in webview_details.pipelines.iter_mut() {
+        for webview_renderer in self.webview_renderers.iter_mut() {
+            for (pipeline_id, pipeline) in webview_renderer.pipelines.iter_mut() {
                 let Some(current_epoch) = self
                     .webrender
                     .as_ref()
@@ -1567,7 +1547,7 @@ impl IOCompositor {
                     PaintMetricState::Seen(epoch, first_reflow) if epoch <= current_epoch => {
                         assert!(epoch <= current_epoch);
                         if let Err(error) = self.global.borrow().constellation_sender.send(
-                            ConstellationMsg::PaintMetric(
+                            EmbedderToConstellationMessage::PaintMetric(
                                 *pipeline_id,
                                 PaintMetricEvent::FirstPaint(paint_time, first_reflow),
                             ),
@@ -1584,7 +1564,7 @@ impl IOCompositor {
                 match pipeline.first_contentful_paint_metric {
                     PaintMetricState::Seen(epoch, first_reflow) if epoch <= current_epoch => {
                         if let Err(error) = self.global.borrow().constellation_sender.send(
-                            ConstellationMsg::PaintMetric(
+                            EmbedderToConstellationMessage::PaintMetric(
                                 *pipeline_id,
                                 PaintMetricEvent::FirstContentfulPaint(paint_time, first_reflow),
                             ),
@@ -1648,12 +1628,7 @@ impl IOCompositor {
         // Check for new messages coming from the other threads in the system.
         let mut compositor_messages = vec![];
         let mut found_recomposite_msg = false;
-        while let Some(msg) = self
-            .global
-            .borrow_mut()
-            .compositor_receiver
-            .try_recv_compositor_msg()
-        {
+        while let Ok(msg) = self.global.borrow_mut().compositor_receiver.try_recv() {
             match msg {
                 CompositorMsg::NewWebRenderFrameReady(..) if found_recomposite_msg => {
                     // Only take one of duplicate NewWebRendeFrameReady messages, but do subtract
@@ -1685,15 +1660,6 @@ impl IOCompositor {
             return false;
         }
 
-        let now = SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .unwrap_or_default()
-            .as_secs() as f64;
-        // If a pinch-zoom happened recently, ask for tiles at the new resolution
-        if self.zoom_action && now - self.zoom_time > 0.3 {
-            self.zoom_action = false;
-        }
-
         #[cfg(feature = "webxr")]
         // Run the WebXR main thread
         self.global.borrow_mut().webxr_main_thread.run_one_frame();
@@ -1702,30 +1668,14 @@ impl IOCompositor {
         if let Err(err) = self.rendering_context.make_current() {
             warn!("Failed to make the rendering context current: {:?}", err);
         }
-        let mut webviews = take(&mut self.webviews);
-        for webview in webviews.iter_mut() {
-            webview.process_pending_scroll_events(self);
+        let mut webview_renderers = take(&mut self.webview_renderers);
+        for webview_renderer in webview_renderers.iter_mut() {
+            webview_renderer.process_pending_scroll_events(self);
         }
-        self.webviews = webviews;
+        self.webview_renderers = webview_renderers;
         self.global.borrow().shutdown_state() != ShutdownState::FinishedShuttingDown
     }
 
-    pub fn pinch_zoom_level(&self) -> Scale<f32, DevicePixel, DevicePixel> {
-        Scale::new(self.viewport_zoom.get())
-    }
-
-    pub(crate) fn set_pinch_zoom_level(&mut self, mut zoom: f32) -> bool {
-        if let Some(min) = self.min_viewport_zoom {
-            zoom = f32::max(min.get(), zoom);
-        }
-        if let Some(max) = self.max_viewport_zoom {
-            zoom = f32::min(max.get(), zoom);
-        }
-
-        let old_zoom = std::mem::replace(&mut self.viewport_zoom, PinchZoomFactor::new(zoom));
-        old_zoom != self.viewport_zoom
-    }
-
     pub fn toggle_webrender_debug(&mut self, option: WebRenderDebugOption) {
         let Some(webrender) = self.webrender.as_mut() else {
             return;
@@ -1773,13 +1723,6 @@ impl IOCompositor {
             .borrow()
             .webrender_api
             .save_capture(capture_path.clone(), CaptureBits::all());
-
-        let version_file_path = capture_path.join("servo-version.txt");
-        if let Err(error) = File::create(version_file_path)
-            .and_then(|mut file| write!(file, "{}", self.global.borrow().version_string))
-        {
-            eprintln!("Unable to write servo version for WebRender Capture: {error:?}");
-        }
     }
 
     fn add_font_instance(
@@ -1814,8 +1757,8 @@ impl IOCompositor {
     }
 
     pub fn notify_input_event(&mut self, webview_id: WebViewId, event: InputEvent) {
-        if let Some(webview) = self.webviews.get_mut(webview_id) {
-            webview.notify_input_event(event);
+        if let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) {
+            webview_renderer.notify_input_event(event);
         }
     }
 
@@ -1826,20 +1769,20 @@ impl IOCompositor {
         cursor: DeviceIntPoint,
         event_type: TouchEventType,
     ) {
-        if let Some(webview) = self.webviews.get_mut(webview_id) {
-            webview.notify_scroll_event(scroll_location, cursor, event_type);
+        if let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) {
+            webview_renderer.notify_scroll_event(scroll_location, cursor, event_type);
         }
     }
 
     pub fn on_vsync(&mut self, webview_id: WebViewId) {
-        if let Some(webview) = self.webviews.get_mut(webview_id) {
-            webview.on_vsync();
+        if let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) {
+            webview_renderer.on_vsync();
         }
     }
 
     pub fn set_pinch_zoom(&mut self, webview_id: WebViewId, magnification: f32) {
-        if let Some(webview) = self.webviews.get_mut(webview_id) {
-            webview.set_pinch_zoom(magnification);
+        if let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) {
+            webview_renderer.set_pinch_zoom(magnification);
         }
     }
 
diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs
index 683677d437d..a66c61499e5 100644
--- a/components/compositing/lib.rs
+++ b/components/compositing/lib.rs
@@ -7,33 +7,33 @@
 use std::cell::Cell;
 use std::rc::Rc;
 
-use compositing_traits::{CompositorProxy, CompositorReceiver};
-use constellation_traits::ConstellationMsg;
-use crossbeam_channel::Sender;
+use compositing_traits::rendering_context::RenderingContext;
+use compositing_traits::{CompositorMsg, CompositorProxy};
+use constellation_traits::EmbedderToConstellationMessage;
+use crossbeam_channel::{Receiver, Sender};
 use embedder_traits::ShutdownState;
 use profile_traits::{mem, time};
 use webrender::RenderApi;
 use webrender_api::DocumentId;
-use webrender_traits::rendering_context::RenderingContext;
 
-pub use crate::compositor::IOCompositor;
+pub use crate::compositor::{IOCompositor, WebRenderDebugOption};
 
 #[macro_use]
 mod tracing;
 
 mod compositor;
 mod touch;
-pub mod webview;
-pub mod windowing;
+pub mod webview_manager;
+pub mod webview_renderer;
 
 /// Data used to construct a compositor.
 pub struct InitialCompositorState {
     /// A channel to the compositor.
     pub sender: CompositorProxy,
     /// A port on which messages inbound to the compositor can be received.
-    pub receiver: CompositorReceiver,
+    pub receiver: Receiver<CompositorMsg>,
     /// A channel to the constellation.
-    pub constellation_chan: Sender<ConstellationMsg>,
+    pub constellation_chan: Sender<EmbedderToConstellationMessage>,
     /// A channel to the time profiler thread.
     pub time_profiler_chan: time::ProfilerChan,
     /// A channel to the memory profiler thread.
diff --git a/components/compositing/touch.rs b/components/compositing/touch.rs
index 9975630951b..76d87732b32 100644
--- a/components/compositing/touch.rs
+++ b/components/compositing/touch.rs
@@ -282,6 +282,10 @@ impl TouchHandler {
         debug_assert!(old.is_some(), "Sequence already removed?");
     }
 
+    pub fn try_get_current_touch_sequence(&self) -> Option<&TouchSequenceInfo> {
+        self.touch_sequence_map.get(&self.current_sequence_id)
+    }
+
     pub fn get_current_touch_sequence_mut(&mut self) -> &mut TouchSequenceInfo {
         self.touch_sequence_map
             .get_mut(&self.current_sequence_id)
@@ -329,10 +333,7 @@ impl TouchHandler {
                 .active_touch_points
                 .push(TouchPoint::new(id, point));
             match touch_sequence.active_touch_points.len() {
-                2 => {
-                    touch_sequence.state = Pinching;
-                },
-                3.. => {
+                2.. => {
                     touch_sequence.state = MultiTouch;
                 },
                 0..2 => {
@@ -381,7 +382,8 @@ impl TouchHandler {
         {
             Some(i) => i,
             None => {
-                unreachable!("Got a touchmove event for a non-active touch point");
+                error!("Got a touchmove event for a non-active touch point");
+                return TouchMoveAction::NoAction;
             },
         };
         let old_point = touch_sequence.active_touch_points[idx].point;
diff --git a/components/compositing/tracing.rs b/components/compositing/tracing.rs
index 907c931aebe..a8bb8b42bb8 100644
--- a/components/compositing/tracing.rs
+++ b/components/compositing/tracing.rs
@@ -42,7 +42,23 @@ mod from_constellation {
                 Self::LoadComplete(..) => target!("LoadComplete"),
                 Self::WebDriverMouseButtonEvent(..) => target!("WebDriverMouseButtonEvent"),
                 Self::WebDriverMouseMoveEvent(..) => target!("WebDriverMouseMoveEvent"),
-                Self::CrossProcess(_) => target!("CrossProcess"),
+                Self::WebDriverWheelScrollEvent(..) => target!("WebDriverWheelScrollEvent"),
+                Self::SendInitialTransaction(..) => target!("SendInitialTransaction"),
+                Self::SendScrollNode(..) => target!("SendScrollNode"),
+                Self::SendDisplayList { .. } => target!("SendDisplayList"),
+                Self::HitTest(..) => target!("HitTest"),
+                Self::GenerateImageKey(..) => target!("GenerateImageKey"),
+                Self::AddImage(..) => target!("AddImage"),
+                Self::UpdateImages(..) => target!("UpdateImages"),
+                Self::GenerateFontKeys(..) => target!("GenerateFontKeys"),
+                Self::AddFont(..) => target!("AddFont"),
+                Self::AddSystemFont(..) => target!("AddSystemFont"),
+                Self::AddFontInstance(..) => target!("AddFontInstance"),
+                Self::RemoveFonts(..) => target!("RemoveFonts"),
+                Self::GetClientWindowRect(..) => target!("GetClientWindowRect"),
+                Self::GetScreenSize(..) => target!("GetScreenSize"),
+                Self::GetAvailableScreenSize(..) => target!("GetAvailableScreenSize"),
+                Self::CollectMemoryReport(..) => target!("CollectMemoryReport"),
             }
         }
     }
diff --git a/components/compositing/webview.rs b/components/compositing/webview.rs
deleted file mode 100644
index 17402f7f988..00000000000
--- a/components/compositing/webview.rs
+++ /dev/null
@@ -1,1071 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::collections::hash_map::{Entry, Keys, Values, ValuesMut};
-use std::rc::Rc;
-
-use base::id::{PipelineId, WebViewId};
-use compositing_traits::SendableFrameTree;
-use constellation_traits::{CompositorHitTestResult, ConstellationMsg, ScrollState};
-use embedder_traits::{
-    InputEvent, MouseButton, MouseButtonAction, MouseButtonEvent, MouseMoveEvent, ShutdownState,
-    TouchEvent, TouchEventType, TouchId,
-};
-use euclid::{Point2D, Scale, Vector2D};
-use fnv::FnvHashSet;
-use log::{debug, warn};
-use script_traits::{AnimationState, TouchEventResult};
-use webrender::Transaction;
-use webrender_api::units::{DeviceIntPoint, DevicePoint, DeviceRect, LayoutVector2D};
-use webrender_api::{
-    ExternalScrollId, HitTestFlags, RenderReasons, SampledScrollOffset, ScrollLocation,
-};
-
-use crate::IOCompositor;
-use crate::compositor::{PipelineDetails, ServoRenderer};
-use crate::touch::{TouchHandler, TouchMoveAction, TouchMoveAllowed, TouchSequenceState};
-
-#[derive(Clone, Copy)]
-struct ScrollEvent {
-    /// Scroll by this offset, or to Start or End
-    scroll_location: ScrollLocation,
-    /// Apply changes to the frame at this location
-    cursor: DeviceIntPoint,
-    /// The number of OS events that have been coalesced together into this one event.
-    event_count: u32,
-}
-
-#[derive(Clone, Copy)]
-enum ScrollZoomEvent {
-    /// An pinch zoom event that magnifies the view by the given factor.
-    PinchZoom(f32),
-    /// A scroll event that scrolls the scroll node at the given location by the
-    /// given amount.
-    Scroll(ScrollEvent),
-}
-
-pub(crate) struct WebView {
-    /// The [`WebViewId`] of the `WebView` associated with this [`WebViewDetails`].
-    pub id: WebViewId,
-    /// The root [`PipelineId`] of the currently displayed page in this WebView.
-    pub root_pipeline_id: Option<PipelineId>,
-    pub rect: DeviceRect,
-    /// Tracks details about each active pipeline that the compositor knows about.
-    pub pipelines: HashMap<PipelineId, PipelineDetails>,
-    /// Data that is shared by all WebView renderers.
-    pub(crate) global: Rc<RefCell<ServoRenderer>>,
-    /// Pending scroll/zoom events.
-    pending_scroll_zoom_events: Vec<ScrollZoomEvent>,
-    /// Touch input state machine
-    touch_handler: TouchHandler,
-}
-
-impl Drop for WebView {
-    fn drop(&mut self) {
-        self.global
-            .borrow_mut()
-            .pipeline_to_webview_map
-            .retain(|_, webview_id| self.id != *webview_id);
-    }
-}
-
-impl WebView {
-    pub(crate) fn new(id: WebViewId, rect: DeviceRect, global: Rc<RefCell<ServoRenderer>>) -> Self {
-        Self {
-            id,
-            root_pipeline_id: None,
-            rect,
-            pipelines: Default::default(),
-            touch_handler: TouchHandler::new(),
-            global,
-            pending_scroll_zoom_events: Default::default(),
-        }
-    }
-
-    pub(crate) fn animations_or_animation_callbacks_running(&self) -> bool {
-        self.pipelines
-            .values()
-            .any(PipelineDetails::animations_or_animation_callbacks_running)
-    }
-
-    pub(crate) fn animation_callbacks_running(&self) -> bool {
-        self.pipelines
-            .values()
-            .any(PipelineDetails::animation_callbacks_running)
-    }
-
-    pub(crate) fn pipeline_ids(&self) -> Keys<'_, PipelineId, PipelineDetails> {
-        self.pipelines.keys()
-    }
-
-    /// Returns the [`PipelineDetails`] for the given [`PipelineId`], creating it if needed.
-    pub(crate) fn ensure_pipeline_details(
-        &mut self,
-        pipeline_id: PipelineId,
-    ) -> &mut PipelineDetails {
-        self.pipelines.entry(pipeline_id).or_insert_with(|| {
-            self.global
-                .borrow_mut()
-                .pipeline_to_webview_map
-                .insert(pipeline_id, self.id);
-            PipelineDetails::new(pipeline_id)
-        })
-    }
-
-    pub(crate) fn set_throttled(&mut self, pipeline_id: PipelineId, throttled: bool) {
-        self.ensure_pipeline_details(pipeline_id).throttled = throttled;
-    }
-
-    pub(crate) fn remove_pipeline(&mut self, pipeline_id: PipelineId) {
-        self.global
-            .borrow_mut()
-            .pipeline_to_webview_map
-            .remove(&pipeline_id);
-        self.pipelines.remove(&pipeline_id);
-    }
-
-    pub(crate) fn set_frame_tree(&mut self, frame_tree: &SendableFrameTree) {
-        let pipeline_id = frame_tree.pipeline.id;
-        let old_pipeline_id = std::mem::replace(&mut self.root_pipeline_id, Some(pipeline_id));
-
-        if old_pipeline_id != self.root_pipeline_id {
-            debug!(
-                "Updating webview ({:?}) from pipeline {:?} to {:?}",
-                3, old_pipeline_id, self.root_pipeline_id
-            );
-        }
-
-        self.set_frame_tree_on_pipeline_details(frame_tree, None);
-        self.reset_scroll_tree_for_unattached_pipelines(frame_tree);
-        self.send_scroll_positions_to_layout_for_pipeline(pipeline_id);
-    }
-
-    pub(crate) fn send_scroll_positions_to_layout_for_pipeline(&self, pipeline_id: PipelineId) {
-        let Some(details) = self.pipelines.get(&pipeline_id) else {
-            return;
-        };
-
-        let mut scroll_states = Vec::new();
-        details.scroll_tree.nodes.iter().for_each(|node| {
-            if let (Some(scroll_id), Some(scroll_offset)) = (node.external_id(), node.offset()) {
-                scroll_states.push(ScrollState {
-                    scroll_id,
-                    scroll_offset,
-                });
-            }
-        });
-
-        let _ = self
-            .global
-            .borrow()
-            .constellation_sender
-            .send(ConstellationMsg::SetScrollStates(
-                pipeline_id,
-                scroll_states,
-            ));
-    }
-
-    pub(crate) fn set_frame_tree_on_pipeline_details(
-        &mut self,
-        frame_tree: &SendableFrameTree,
-        parent_pipeline_id: Option<PipelineId>,
-    ) {
-        let pipeline_id = frame_tree.pipeline.id;
-        let pipeline_details = self.ensure_pipeline_details(pipeline_id);
-        pipeline_details.pipeline = Some(frame_tree.pipeline.clone());
-        pipeline_details.parent_pipeline_id = parent_pipeline_id;
-
-        for kid in &frame_tree.children {
-            self.set_frame_tree_on_pipeline_details(kid, Some(pipeline_id));
-        }
-    }
-
-    pub(crate) fn reset_scroll_tree_for_unattached_pipelines(
-        &mut self,
-        frame_tree: &SendableFrameTree,
-    ) {
-        // TODO(mrobinson): Eventually this can selectively preserve the scroll trees
-        // state for some unattached pipelines in order to preserve scroll position when
-        // navigating backward and forward.
-        fn collect_pipelines(
-            pipelines: &mut FnvHashSet<PipelineId>,
-            frame_tree: &SendableFrameTree,
-        ) {
-            pipelines.insert(frame_tree.pipeline.id);
-            for kid in &frame_tree.children {
-                collect_pipelines(pipelines, kid);
-            }
-        }
-
-        let mut attached_pipelines: FnvHashSet<PipelineId> = FnvHashSet::default();
-        collect_pipelines(&mut attached_pipelines, frame_tree);
-
-        self.pipelines
-            .iter_mut()
-            .filter(|(id, _)| !attached_pipelines.contains(id))
-            .for_each(|(_, details)| {
-                details.scroll_tree.nodes.iter_mut().for_each(|node| {
-                    node.set_offset(LayoutVector2D::zero());
-                })
-            })
-    }
-
-    /// Sets or unsets the animations-running flag for the given pipeline, and schedules a
-    /// recomposite if necessary. Returns true if the pipeline is throttled.
-    pub(crate) fn change_running_animations_state(
-        &mut self,
-        pipeline_id: PipelineId,
-        animation_state: AnimationState,
-    ) -> bool {
-        let pipeline_details = self.ensure_pipeline_details(pipeline_id);
-        match animation_state {
-            AnimationState::AnimationsPresent => {
-                pipeline_details.animations_running = true;
-            },
-            AnimationState::AnimationCallbacksPresent => {
-                pipeline_details.animation_callbacks_running = true;
-            },
-            AnimationState::NoAnimationsPresent => {
-                pipeline_details.animations_running = false;
-            },
-            AnimationState::NoAnimationCallbacksPresent => {
-                pipeline_details.animation_callbacks_running = false;
-            },
-        }
-        pipeline_details.throttled
-    }
-
-    pub(crate) fn tick_all_animations(&self, compositor: &IOCompositor) -> bool {
-        let mut ticked_any = false;
-        for pipeline_details in self.pipelines.values() {
-            ticked_any = pipeline_details.tick_animations(compositor) || ticked_any;
-        }
-        ticked_any
-    }
-
-    pub(crate) fn tick_animations_for_pipeline(
-        &self,
-        pipeline_id: PipelineId,
-        compositor: &IOCompositor,
-    ) {
-        if let Some(pipeline_details) = self.pipelines.get(&pipeline_id) {
-            pipeline_details.tick_animations(compositor);
-        }
-    }
-
-    /// On a Window refresh tick (e.g. vsync)
-    pub fn on_vsync(&mut self) {
-        if let Some(fling_action) = self.touch_handler.on_vsync() {
-            self.on_scroll_window_event(
-                ScrollLocation::Delta(fling_action.delta),
-                fling_action.cursor,
-            );
-        }
-    }
-
-    pub(crate) fn dispatch_input_event(&mut self, event: InputEvent) {
-        // Events that do not need to do hit testing are sent directly to the
-        // constellation to filter down.
-        let Some(point) = event.point() else {
-            return;
-        };
-
-        // If we can't find a pipeline to send this event to, we cannot continue.
-        let get_pipeline_details = |pipeline_id| self.pipelines.get(&pipeline_id);
-        let Some(result) = self
-            .global
-            .borrow()
-            .hit_test_at_point(point, get_pipeline_details)
-        else {
-            return;
-        };
-
-        self.global.borrow_mut().update_cursor(point, &result);
-
-        if let Err(error) =
-            self.global
-                .borrow()
-                .constellation_sender
-                .send(ConstellationMsg::ForwardInputEvent(
-                    self.id,
-                    event,
-                    Some(result),
-                ))
-        {
-            warn!("Sending event to constellation failed ({error:?}).");
-        }
-    }
-
-    pub fn notify_input_event(&mut self, event: InputEvent) {
-        if self.global.borrow().shutdown_state() != ShutdownState::NotShuttingDown {
-            return;
-        }
-
-        if let InputEvent::Touch(event) = event {
-            self.on_touch_event(event);
-            return;
-        }
-
-        if self.global.borrow().convert_mouse_to_touch {
-            match event {
-                InputEvent::MouseButton(event) => {
-                    match event.action {
-                        MouseButtonAction::Click => {},
-                        MouseButtonAction::Down => self.on_touch_down(TouchEvent::new(
-                            TouchEventType::Down,
-                            TouchId(0),
-                            event.point,
-                        )),
-                        MouseButtonAction::Up => self.on_touch_up(TouchEvent::new(
-                            TouchEventType::Up,
-                            TouchId(0),
-                            event.point,
-                        )),
-                    }
-                    return;
-                },
-                InputEvent::MouseMove(event) => {
-                    self.on_touch_move(TouchEvent::new(
-                        TouchEventType::Move,
-                        TouchId(0),
-                        event.point,
-                    ));
-                    return;
-                },
-                _ => {},
-            }
-        }
-
-        self.dispatch_input_event(event);
-    }
-
-    fn send_touch_event(&self, mut event: TouchEvent) -> bool {
-        let get_pipeline_details = |pipeline_id| self.pipelines.get(&pipeline_id);
-        let Some(result) = self
-            .global
-            .borrow()
-            .hit_test_at_point(event.point, get_pipeline_details)
-        else {
-            return false;
-        };
-
-        event.init_sequence_id(self.touch_handler.current_sequence_id);
-        let event = InputEvent::Touch(event);
-        if let Err(e) =
-            self.global
-                .borrow()
-                .constellation_sender
-                .send(ConstellationMsg::ForwardInputEvent(
-                    self.id,
-                    event,
-                    Some(result),
-                ))
-        {
-            warn!("Sending event to constellation failed ({:?}).", e);
-            false
-        } else {
-            true
-        }
-    }
-
-    pub fn on_touch_event(&mut self, event: TouchEvent) {
-        if self.global.borrow().shutdown_state() != ShutdownState::NotShuttingDown {
-            return;
-        }
-
-        match event.event_type {
-            TouchEventType::Down => self.on_touch_down(event),
-            TouchEventType::Move => self.on_touch_move(event),
-            TouchEventType::Up => self.on_touch_up(event),
-            TouchEventType::Cancel => self.on_touch_cancel(event),
-        }
-    }
-
-    fn on_touch_down(&mut self, event: TouchEvent) {
-        self.touch_handler.on_touch_down(event.id, event.point);
-        self.send_touch_event(event);
-    }
-
-    fn on_touch_move(&mut self, mut event: TouchEvent) {
-        let action: TouchMoveAction = self.touch_handler.on_touch_move(event.id, event.point);
-        if TouchMoveAction::NoAction != action {
-            // if first move processed and allowed, we directly process the move event,
-            // without waiting for the script handler.
-            if self
-                .touch_handler
-                .move_allowed(self.touch_handler.current_sequence_id)
-            {
-                // https://w3c.github.io/touch-events/#cancelability
-                event.disable_cancelable();
-                match action {
-                    TouchMoveAction::Scroll(delta, point) => self.on_scroll_window_event(
-                        ScrollLocation::Delta(LayoutVector2D::from_untyped(delta.to_untyped())),
-                        point.cast(),
-                    ),
-                    TouchMoveAction::Zoom(magnification, scroll_delta) => {
-                        let cursor = Point2D::new(-1, -1); // Make sure this hits the base layer.
-
-                        // The order of these events doesn't matter, because zoom is handled by
-                        // a root display list and the scroll event here is handled by the scroll
-                        // applied to the content display list.
-                        self.pending_scroll_zoom_events
-                            .push(ScrollZoomEvent::PinchZoom(magnification));
-                        self.pending_scroll_zoom_events
-                            .push(ScrollZoomEvent::Scroll(ScrollEvent {
-                                scroll_location: ScrollLocation::Delta(
-                                    LayoutVector2D::from_untyped(scroll_delta.to_untyped()),
-                                ),
-                                cursor,
-                                event_count: 1,
-                            }));
-                    },
-                    _ => {},
-                }
-            }
-            // When the event is touchmove, if the script thread is processing the touch
-            // move event, we skip sending the event to the script thread.
-            // This prevents the script thread from stacking up for a large amount of time.
-            if !self
-                .touch_handler
-                .is_handling_touch_move(self.touch_handler.current_sequence_id) &&
-                self.send_touch_event(event) &&
-                event.is_cancelable()
-            {
-                self.touch_handler
-                    .set_handling_touch_move(self.touch_handler.current_sequence_id, true);
-            }
-        }
-    }
-
-    fn on_touch_up(&mut self, event: TouchEvent) {
-        self.touch_handler.on_touch_up(event.id, event.point);
-        self.send_touch_event(event);
-    }
-
-    fn on_touch_cancel(&mut self, event: TouchEvent) {
-        // Send the event to script.
-        self.touch_handler.on_touch_cancel(event.id, event.point);
-        self.send_touch_event(event);
-    }
-
-    pub(crate) fn on_touch_event_processed(&mut self, result: TouchEventResult) {
-        match result {
-            TouchEventResult::DefaultPrevented(sequence_id, event_type) => {
-                debug!(
-                    "Touch event {:?} in sequence {:?} prevented!",
-                    event_type, sequence_id
-                );
-                match event_type {
-                    TouchEventType::Down => {
-                        // prevents both click and move
-                        self.touch_handler.prevent_click(sequence_id);
-                        self.touch_handler.prevent_move(sequence_id);
-                        self.touch_handler
-                            .remove_pending_touch_move_action(sequence_id);
-                    },
-                    TouchEventType::Move => {
-                        // script thread processed the touch move event, mark this false.
-                        if let Some(info) = self.touch_handler.get_touch_sequence_mut(sequence_id) {
-                            info.prevent_move = TouchMoveAllowed::Prevented;
-                            if let TouchSequenceState::PendingFling { .. } = info.state {
-                                info.state = TouchSequenceState::Finished;
-                            }
-                            self.touch_handler.set_handling_touch_move(
-                                self.touch_handler.current_sequence_id,
-                                false,
-                            );
-                            self.touch_handler
-                                .remove_pending_touch_move_action(sequence_id);
-                        }
-                    },
-                    TouchEventType::Up => {
-                        // Note: We don't have to consider PendingFling here, since we handle that
-                        // in the DefaultAllowed case of the touch_move event.
-                        // Note: Removing can and should fail, if we still have an active Fling,
-                        let Some(info) =
-                            &mut self.touch_handler.get_touch_sequence_mut(sequence_id)
-                        else {
-                            // The sequence ID could already be removed, e.g. if Fling finished,
-                            // before the touch_up event was handled (since fling can start
-                            // immediately if move was previously allowed, and clicks are anyway not
-                            // happening from fling).
-                            return;
-                        };
-                        match info.state {
-                            TouchSequenceState::PendingClick(_) => {
-                                info.state = TouchSequenceState::Finished;
-                                self.touch_handler.remove_touch_sequence(sequence_id);
-                            },
-                            TouchSequenceState::Flinging { .. } => {
-                                // We can't remove the touch sequence yet
-                            },
-                            TouchSequenceState::Finished => {
-                                self.touch_handler.remove_touch_sequence(sequence_id);
-                            },
-                            TouchSequenceState::Touching |
-                            TouchSequenceState::Panning { .. } |
-                            TouchSequenceState::Pinching |
-                            TouchSequenceState::MultiTouch |
-                            TouchSequenceState::PendingFling { .. } => {
-                                // It's possible to transition from Pinch to pan, Which means that
-                                // a touch_up event for a pinch might have arrived here, but we
-                                // already transitioned to pan or even PendingFling.
-                                // We don't need to do anything in these cases though.
-                            },
-                        }
-                    },
-                    TouchEventType::Cancel => {
-                        // We could still have pending event handlers, so we remove the pending
-                        // actions, and try to remove the touch sequence.
-                        self.touch_handler
-                            .remove_pending_touch_move_action(sequence_id);
-                        self.touch_handler.try_remove_touch_sequence(sequence_id);
-                    },
-                }
-            },
-            TouchEventResult::DefaultAllowed(sequence_id, event_type) => {
-                debug!(
-                    "Touch event {:?} in sequence {:?} allowed",
-                    event_type, sequence_id
-                );
-                match event_type {
-                    TouchEventType::Down => {},
-                    TouchEventType::Move => {
-                        if let Some(action) =
-                            self.touch_handler.pending_touch_move_action(sequence_id)
-                        {
-                            match action {
-                                TouchMoveAction::Scroll(delta, point) => self
-                                    .on_scroll_window_event(
-                                        ScrollLocation::Delta(LayoutVector2D::from_untyped(
-                                            delta.to_untyped(),
-                                        )),
-                                        point.cast(),
-                                    ),
-                                TouchMoveAction::Zoom(magnification, scroll_delta) => {
-                                    let cursor = Point2D::new(-1, -1);
-                                    // Make sure this hits the base layer.
-                                    // The order of these events doesn't matter, because zoom is handled by
-                                    // a root display list and the scroll event here is handled by the scroll
-                                    // applied to the content display list.
-                                    self.pending_scroll_zoom_events
-                                        .push(ScrollZoomEvent::PinchZoom(magnification));
-                                    self.pending_scroll_zoom_events
-                                        .push(ScrollZoomEvent::Scroll(ScrollEvent {
-                                            scroll_location: ScrollLocation::Delta(
-                                                LayoutVector2D::from_untyped(
-                                                    scroll_delta.to_untyped(),
-                                                ),
-                                            ),
-                                            cursor,
-                                            event_count: 1,
-                                        }));
-                                },
-                                TouchMoveAction::NoAction => {
-                                    // This shouldn't happen, but we can also just ignore it.
-                                },
-                            }
-                            self.touch_handler
-                                .remove_pending_touch_move_action(sequence_id);
-                        }
-                        self.touch_handler
-                            .set_handling_touch_move(self.touch_handler.current_sequence_id, false);
-                        if let Some(info) = self.touch_handler.get_touch_sequence_mut(sequence_id) {
-                            info.prevent_move = TouchMoveAllowed::Allowed;
-                            if let TouchSequenceState::PendingFling { velocity, cursor } =
-                                info.state
-                            {
-                                info.state = TouchSequenceState::Flinging { velocity, cursor }
-                            }
-                        }
-                    },
-                    TouchEventType::Up => {
-                        let Some(info) = self.touch_handler.get_touch_sequence_mut(sequence_id)
-                        else {
-                            // The sequence was already removed because there is no default action.
-                            return;
-                        };
-                        match info.state {
-                            TouchSequenceState::PendingClick(point) => {
-                                info.state = TouchSequenceState::Finished;
-                                // PreventDefault from touch_down may have been processed after
-                                // touch_up already occurred.
-                                if !info.prevent_click {
-                                    self.simulate_mouse_click(point);
-                                }
-                                self.touch_handler.remove_touch_sequence(sequence_id);
-                            },
-                            TouchSequenceState::Flinging { .. } => {
-                                // We can't remove the touch sequence yet
-                            },
-                            TouchSequenceState::Finished => {
-                                self.touch_handler.remove_touch_sequence(sequence_id);
-                            },
-                            TouchSequenceState::Panning { .. } |
-                            TouchSequenceState::Pinching |
-                            TouchSequenceState::PendingFling { .. } => {
-                                // It's possible to transition from Pinch to pan, Which means that
-                                // a touch_up event for a pinch might have arrived here, but we
-                                // already transitioned to pan or even PendingFling.
-                                // We don't need to do anything in these cases though.
-                            },
-                            TouchSequenceState::MultiTouch | TouchSequenceState::Touching => {
-                                // We transitioned to touching from multi-touch or pinching.
-                            },
-                        }
-                    },
-                    TouchEventType::Cancel => {
-                        self.touch_handler
-                            .remove_pending_touch_move_action(sequence_id);
-                        self.touch_handler.try_remove_touch_sequence(sequence_id);
-                    },
-                }
-            },
-        }
-    }
-
-    /// <http://w3c.github.io/touch-events/#mouse-events>
-    fn simulate_mouse_click(&mut self, point: DevicePoint) {
-        let button = MouseButton::Left;
-        self.dispatch_input_event(InputEvent::MouseMove(MouseMoveEvent { point }));
-        self.dispatch_input_event(InputEvent::MouseButton(MouseButtonEvent {
-            button,
-            action: MouseButtonAction::Down,
-            point,
-        }));
-        self.dispatch_input_event(InputEvent::MouseButton(MouseButtonEvent {
-            button,
-            action: MouseButtonAction::Up,
-            point,
-        }));
-        self.dispatch_input_event(InputEvent::MouseButton(MouseButtonEvent {
-            button,
-            action: MouseButtonAction::Click,
-            point,
-        }));
-    }
-
-    pub fn notify_scroll_event(
-        &mut self,
-        scroll_location: ScrollLocation,
-        cursor: DeviceIntPoint,
-        event_type: TouchEventType,
-    ) {
-        if self.global.borrow().shutdown_state() != ShutdownState::NotShuttingDown {
-            return;
-        }
-
-        match event_type {
-            TouchEventType::Move => self.on_scroll_window_event(scroll_location, cursor),
-            TouchEventType::Up | TouchEventType::Cancel => {
-                self.on_scroll_window_event(scroll_location, cursor);
-            },
-            TouchEventType::Down => {
-                self.on_scroll_window_event(scroll_location, cursor);
-            },
-        }
-    }
-
-    fn on_scroll_window_event(&mut self, scroll_location: ScrollLocation, cursor: DeviceIntPoint) {
-        self.pending_scroll_zoom_events
-            .push(ScrollZoomEvent::Scroll(ScrollEvent {
-                scroll_location,
-                cursor,
-                event_count: 1,
-            }));
-    }
-
-    pub(crate) fn process_pending_scroll_events(&mut self, compositor: &mut IOCompositor) {
-        if self.pending_scroll_zoom_events.is_empty() {
-            return;
-        }
-
-        // Batch up all scroll events into one, or else we'll do way too much painting.
-        let mut combined_scroll_event: Option<ScrollEvent> = None;
-        let mut combined_magnification = 1.0;
-        for scroll_event in self.pending_scroll_zoom_events.drain(..) {
-            match scroll_event {
-                ScrollZoomEvent::PinchZoom(magnification) => {
-                    combined_magnification *= magnification
-                },
-                ScrollZoomEvent::Scroll(scroll_event_info) => {
-                    let combined_event = match combined_scroll_event.as_mut() {
-                        None => {
-                            combined_scroll_event = Some(scroll_event_info);
-                            continue;
-                        },
-                        Some(combined_event) => combined_event,
-                    };
-
-                    match (
-                        combined_event.scroll_location,
-                        scroll_event_info.scroll_location,
-                    ) {
-                        (ScrollLocation::Delta(old_delta), ScrollLocation::Delta(new_delta)) => {
-                            // Mac OS X sometimes delivers scroll events out of vsync during a
-                            // fling. This causes events to get bunched up occasionally, causing
-                            // nasty-looking "pops". To mitigate this, during a fling we average
-                            // deltas instead of summing them.
-                            let old_event_count = Scale::new(combined_event.event_count as f32);
-                            combined_event.event_count += 1;
-                            let new_event_count = Scale::new(combined_event.event_count as f32);
-                            combined_event.scroll_location = ScrollLocation::Delta(
-                                (old_delta * old_event_count + new_delta) / new_event_count,
-                            );
-                        },
-                        (ScrollLocation::Start, _) | (ScrollLocation::End, _) => {
-                            // Once we see Start or End, we shouldn't process any more events.
-                            break;
-                        },
-                        (_, ScrollLocation::Start) | (_, ScrollLocation::End) => {
-                            // If this is an event which is scrolling to the start or end of the page,
-                            // disregard other pending events and exit the loop.
-                            *combined_event = scroll_event_info;
-                            break;
-                        },
-                    }
-                },
-            }
-        }
-
-        let zoom_changed = compositor
-            .set_pinch_zoom_level(compositor.pinch_zoom_level().get() * combined_magnification);
-        let scroll_result = combined_scroll_event.and_then(|combined_event| {
-            self.scroll_node_at_device_point(
-                combined_event.cursor.to_f32(),
-                combined_event.scroll_location,
-                compositor,
-            )
-        });
-        if !zoom_changed && scroll_result.is_none() {
-            return;
-        }
-
-        let mut transaction = Transaction::new();
-        if zoom_changed {
-            compositor.send_root_pipeline_display_list_in_transaction(&mut transaction);
-        }
-
-        if let Some((pipeline_id, external_id, offset)) = scroll_result {
-            let offset = LayoutVector2D::new(-offset.x, -offset.y);
-            transaction.set_scroll_offsets(
-                external_id,
-                vec![SampledScrollOffset {
-                    offset,
-                    generation: 0,
-                }],
-            );
-            self.send_scroll_positions_to_layout_for_pipeline(pipeline_id);
-        }
-
-        compositor.generate_frame(&mut transaction, RenderReasons::APZ);
-        self.global.borrow_mut().send_transaction(transaction);
-    }
-
-    /// Perform a hit test at the given [`DevicePoint`] and apply the [`ScrollLocation`]
-    /// scrolling to the applicable scroll node under that point. If a scroll was
-    /// performed, returns the [`PipelineId`] of the node scrolled, the id, and the final
-    /// scroll delta.
-    fn scroll_node_at_device_point(
-        &mut self,
-        cursor: DevicePoint,
-        scroll_location: ScrollLocation,
-        compositor: &mut IOCompositor,
-    ) -> Option<(PipelineId, ExternalScrollId, LayoutVector2D)> {
-        let scroll_location = match scroll_location {
-            ScrollLocation::Delta(delta) => {
-                let device_pixels_per_page = compositor.device_pixels_per_page_pixel();
-                let scaled_delta = (Vector2D::from_untyped(delta.to_untyped()) /
-                    device_pixels_per_page)
-                    .to_untyped();
-                let calculated_delta = LayoutVector2D::from_untyped(scaled_delta);
-                ScrollLocation::Delta(calculated_delta)
-            },
-            // Leave ScrollLocation unchanged if it is Start or End location.
-            ScrollLocation::Start | ScrollLocation::End => scroll_location,
-        };
-
-        let get_pipeline_details = |pipeline_id| self.pipelines.get(&pipeline_id);
-        let hit_test_results = self
-            .global
-            .borrow()
-            .hit_test_at_point_with_flags_and_pipeline(
-                cursor,
-                HitTestFlags::FIND_ALL,
-                None,
-                get_pipeline_details,
-            );
-
-        // Iterate through all hit test results, processing only the first node of each pipeline.
-        // This is needed to propagate the scroll events from a pipeline representing an iframe to
-        // its ancestor pipelines.
-        let mut previous_pipeline_id = None;
-        for CompositorHitTestResult {
-            pipeline_id,
-            scroll_tree_node,
-            ..
-        } in hit_test_results.iter()
-        {
-            let pipeline_details = self.pipelines.get_mut(pipeline_id)?;
-            if previous_pipeline_id.replace(pipeline_id) != Some(pipeline_id) {
-                let scroll_result = pipeline_details
-                    .scroll_tree
-                    .scroll_node_or_ancestor(scroll_tree_node, scroll_location);
-                if let Some((external_id, offset)) = scroll_result {
-                    return Some((*pipeline_id, external_id, offset));
-                }
-            }
-        }
-        None
-    }
-
-    /// Simulate a pinch zoom
-    pub fn set_pinch_zoom(&mut self, magnification: f32) {
-        if self.global.borrow().shutdown_state() != ShutdownState::NotShuttingDown {
-            return;
-        }
-
-        // TODO: Scroll to keep the center in view?
-        self.pending_scroll_zoom_events
-            .push(ScrollZoomEvent::PinchZoom(magnification));
-    }
-}
-#[derive(Debug)]
-pub struct WebViewManager<WebView> {
-    /// Our top-level browsing contexts. In the WebRender scene, their pipelines are the children of
-    /// a single root pipeline that also applies any pinch zoom transformation.
-    webviews: HashMap<WebViewId, WebView>,
-
-    /// The order to paint them in, topmost last.
-    pub(crate) painting_order: Vec<WebViewId>,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct UnknownWebView(pub WebViewId);
-
-impl<WebView> Default for WebViewManager<WebView> {
-    fn default() -> Self {
-        Self {
-            webviews: Default::default(),
-            painting_order: Default::default(),
-        }
-    }
-}
-
-impl<WebView> WebViewManager<WebView> {
-    pub fn remove(&mut self, webview_id: WebViewId) -> Result<WebView, UnknownWebView> {
-        self.painting_order.retain(|b| *b != webview_id);
-        self.webviews
-            .remove(&webview_id)
-            .ok_or(UnknownWebView(webview_id))
-    }
-
-    pub fn get(&self, webview_id: WebViewId) -> Option<&WebView> {
-        self.webviews.get(&webview_id)
-    }
-
-    pub fn get_mut(&mut self, webview_id: WebViewId) -> Option<&mut WebView> {
-        self.webviews.get_mut(&webview_id)
-    }
-
-    /// Returns true iff the painting order actually changed.
-    pub fn show(&mut self, webview_id: WebViewId) -> Result<bool, UnknownWebView> {
-        if !self.webviews.contains_key(&webview_id) {
-            return Err(UnknownWebView(webview_id));
-        }
-        if !self.painting_order.contains(&webview_id) {
-            self.painting_order.push(webview_id);
-            return Ok(true);
-        }
-        Ok(false)
-    }
-
-    /// Returns true iff the painting order actually changed.
-    pub fn hide(&mut self, webview_id: WebViewId) -> Result<bool, UnknownWebView> {
-        if !self.webviews.contains_key(&webview_id) {
-            return Err(UnknownWebView(webview_id));
-        }
-        if self.painting_order.contains(&webview_id) {
-            self.painting_order.retain(|b| *b != webview_id);
-            return Ok(true);
-        }
-        Ok(false)
-    }
-
-    /// Returns true iff the painting order actually changed.
-    pub fn hide_all(&mut self) -> bool {
-        if !self.painting_order.is_empty() {
-            self.painting_order.clear();
-            return true;
-        }
-        false
-    }
-
-    /// Returns true iff the painting order actually changed.
-    pub fn raise_to_top(&mut self, webview_id: WebViewId) -> Result<bool, UnknownWebView> {
-        if !self.webviews.contains_key(&webview_id) {
-            return Err(UnknownWebView(webview_id));
-        }
-        if self.painting_order.last() != Some(&webview_id) {
-            self.hide(webview_id)?;
-            self.show(webview_id)?;
-            return Ok(true);
-        }
-        Ok(false)
-    }
-
-    pub fn painting_order(&self) -> impl Iterator<Item = (&WebViewId, &WebView)> {
-        self.painting_order
-            .iter()
-            .flat_map(move |webview_id| self.get(*webview_id).map(|b| (webview_id, b)))
-    }
-
-    pub fn entry(&mut self, webview_id: WebViewId) -> Entry<'_, WebViewId, WebView> {
-        self.webviews.entry(webview_id)
-    }
-
-    pub fn iter(&self) -> Values<'_, WebViewId, WebView> {
-        self.webviews.values()
-    }
-
-    pub fn iter_mut(&mut self) -> ValuesMut<'_, WebViewId, WebView> {
-        self.webviews.values_mut()
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::num::NonZeroU32;
-
-    use base::id::{
-        BrowsingContextId, BrowsingContextIndex, PipelineNamespace, PipelineNamespaceId, WebViewId,
-    };
-
-    use crate::webview::{UnknownWebView, WebViewAlreadyExists, WebViewManager};
-
-    fn top_level_id(namespace_id: u32, index: u32) -> WebViewId {
-        WebViewId(BrowsingContextId {
-            namespace_id: PipelineNamespaceId(namespace_id),
-            index: BrowsingContextIndex(NonZeroU32::new(index).unwrap()),
-        })
-    }
-
-    fn webviews_sorted<WebView: Clone>(
-        webviews: &WebViewManager<WebView>,
-    ) -> Vec<(WebViewId, WebView)> {
-        let mut keys = webviews.webviews.keys().collect::<Vec<_>>();
-        keys.sort();
-        keys.iter()
-            .map(|&id| (*id, webviews.webviews.get(id).cloned().unwrap()))
-            .collect()
-    }
-
-    #[test]
-    fn test() {
-        PipelineNamespace::install(PipelineNamespaceId(0));
-        let mut webviews = WebViewManager::default();
-
-        // add() adds the webview to the map, but not the painting order.
-        assert!(webviews.add(WebViewId::new(), 'a').is_ok());
-        assert!(webviews.add(WebViewId::new(), 'b').is_ok());
-        assert!(webviews.add(WebViewId::new(), 'c').is_ok());
-        assert_eq!(
-            webviews_sorted(&webviews),
-            vec![
-                (top_level_id(0, 1), 'a'),
-                (top_level_id(0, 2), 'b'),
-                (top_level_id(0, 3), 'c'),
-            ]
-        );
-        assert!(webviews.painting_order.is_empty());
-
-        // add() returns WebViewAlreadyExists if the webview id already exists.
-        assert_eq!(
-            webviews.add(top_level_id(0, 3), 'd'),
-            Err(WebViewAlreadyExists(top_level_id(0, 3)))
-        );
-
-        // Other methods return UnknownWebView or None if the webview id doesn’t exist.
-        assert_eq!(
-            webviews.remove(top_level_id(1, 1)),
-            Err(UnknownWebView(top_level_id(1, 1)))
-        );
-        assert_eq!(webviews.get(top_level_id(1, 1)), None);
-        assert_eq!(webviews.get_mut(top_level_id(1, 1)), None);
-        assert_eq!(
-            webviews.show(top_level_id(1, 1)),
-            Err(UnknownWebView(top_level_id(1, 1)))
-        );
-        assert_eq!(
-            webviews.hide(top_level_id(1, 1)),
-            Err(UnknownWebView(top_level_id(1, 1)))
-        );
-        assert_eq!(
-            webviews.raise_to_top(top_level_id(1, 1)),
-            Err(UnknownWebView(top_level_id(1, 1)))
-        );
-
-        // For webviews not yet visible, both show() and raise_to_top() add the given webview on top.
-        assert_eq!(webviews.show(top_level_id(0, 2)), Ok(true));
-        assert_eq!(webviews.show(top_level_id(0, 2)), Ok(false));
-        assert_eq!(webviews.painting_order, vec![top_level_id(0, 2)]);
-        assert_eq!(webviews.raise_to_top(top_level_id(0, 1)), Ok(true));
-        assert_eq!(webviews.raise_to_top(top_level_id(0, 1)), Ok(false));
-        assert_eq!(
-            webviews.painting_order,
-            vec![top_level_id(0, 2), top_level_id(0, 1)]
-        );
-        assert_eq!(webviews.show(top_level_id(0, 3)), Ok(true));
-        assert_eq!(webviews.show(top_level_id(0, 3)), Ok(false));
-        assert_eq!(
-            webviews.painting_order,
-            vec![top_level_id(0, 2), top_level_id(0, 1), top_level_id(0, 3)]
-        );
-
-        // For webviews already visible, show() does nothing, while raise_to_top() makes it on top.
-        assert_eq!(webviews.show(top_level_id(0, 1)), Ok(false));
-        assert_eq!(
-            webviews.painting_order,
-            vec![top_level_id(0, 2), top_level_id(0, 1), top_level_id(0, 3)]
-        );
-        assert_eq!(webviews.raise_to_top(top_level_id(0, 1)), Ok(true));
-        assert_eq!(webviews.raise_to_top(top_level_id(0, 1)), Ok(false));
-        assert_eq!(
-            webviews.painting_order,
-            vec![top_level_id(0, 2), top_level_id(0, 3), top_level_id(0, 1)]
-        );
-
-        // hide() removes the webview from the painting order, but not the map.
-        assert_eq!(webviews.hide(top_level_id(0, 3)), Ok(true));
-        assert_eq!(webviews.hide(top_level_id(0, 3)), Ok(false));
-        assert_eq!(
-            webviews.painting_order,
-            vec![top_level_id(0, 2), top_level_id(0, 1)]
-        );
-        assert_eq!(
-            webviews_sorted(&webviews),
-            vec![
-                (top_level_id(0, 1), 'a'),
-                (top_level_id(0, 2), 'b'),
-                (top_level_id(0, 3), 'c'),
-            ]
-        );
-
-        // painting_order() returns only the visible webviews, in painting order.
-        let mut painting_order = webviews.painting_order();
-        assert_eq!(painting_order.next(), Some((&top_level_id(0, 2), &'b')));
-        assert_eq!(painting_order.next(), Some((&top_level_id(0, 1), &'a')));
-        assert_eq!(painting_order.next(), None);
-        drop(painting_order);
-
-        // remove() removes the given webview from both the map and the painting order.
-        assert!(webviews.remove(top_level_id(0, 1)).is_ok());
-        assert!(webviews.remove(top_level_id(0, 2)).is_ok());
-        assert!(webviews.remove(top_level_id(0, 3)).is_ok());
-        assert!(webviews_sorted(&webviews).is_empty());
-        assert!(webviews.painting_order.is_empty());
-    }
-}
diff --git a/components/compositing/webview_manager.rs b/components/compositing/webview_manager.rs
new file mode 100644
index 00000000000..201f9d1c5c5
--- /dev/null
+++ b/components/compositing/webview_manager.rs
@@ -0,0 +1,242 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::collections::HashMap;
+use std::collections::hash_map::{Entry, Values, ValuesMut};
+
+use base::id::WebViewId;
+
+use crate::webview_renderer::UnknownWebView;
+
+#[derive(Debug)]
+pub struct WebViewManager<WebView> {
+    /// Our top-level browsing contexts. In the WebRender scene, their pipelines are the children of
+    /// a single root pipeline that also applies any pinch zoom transformation.
+    webviews: HashMap<WebViewId, WebView>,
+
+    /// The order to paint them in, topmost last.
+    pub(crate) painting_order: Vec<WebViewId>,
+}
+
+impl<WebView> Default for WebViewManager<WebView> {
+    fn default() -> Self {
+        Self {
+            webviews: Default::default(),
+            painting_order: Default::default(),
+        }
+    }
+}
+
+impl<WebView> WebViewManager<WebView> {
+    pub fn remove(&mut self, webview_id: WebViewId) -> Result<WebView, UnknownWebView> {
+        self.painting_order.retain(|b| *b != webview_id);
+        self.webviews
+            .remove(&webview_id)
+            .ok_or(UnknownWebView(webview_id))
+    }
+
+    pub fn get(&self, webview_id: WebViewId) -> Option<&WebView> {
+        self.webviews.get(&webview_id)
+    }
+
+    pub fn get_mut(&mut self, webview_id: WebViewId) -> Option<&mut WebView> {
+        self.webviews.get_mut(&webview_id)
+    }
+
+    /// Returns true iff the painting order actually changed.
+    pub fn show(&mut self, webview_id: WebViewId) -> Result<bool, UnknownWebView> {
+        if !self.webviews.contains_key(&webview_id) {
+            return Err(UnknownWebView(webview_id));
+        }
+        if !self.painting_order.contains(&webview_id) {
+            self.painting_order.push(webview_id);
+            return Ok(true);
+        }
+        Ok(false)
+    }
+
+    /// Returns true iff the painting order actually changed.
+    pub fn hide(&mut self, webview_id: WebViewId) -> Result<bool, UnknownWebView> {
+        if !self.webviews.contains_key(&webview_id) {
+            return Err(UnknownWebView(webview_id));
+        }
+        if self.painting_order.contains(&webview_id) {
+            self.painting_order.retain(|b| *b != webview_id);
+            return Ok(true);
+        }
+        Ok(false)
+    }
+
+    /// Returns true iff the painting order actually changed.
+    pub fn hide_all(&mut self) -> bool {
+        if !self.painting_order.is_empty() {
+            self.painting_order.clear();
+            return true;
+        }
+        false
+    }
+
+    /// Returns true iff the painting order actually changed.
+    pub fn raise_to_top(&mut self, webview_id: WebViewId) -> Result<bool, UnknownWebView> {
+        if !self.webviews.contains_key(&webview_id) {
+            return Err(UnknownWebView(webview_id));
+        }
+        if self.painting_order.last() != Some(&webview_id) {
+            self.hide(webview_id)?;
+            self.show(webview_id)?;
+            return Ok(true);
+        }
+        Ok(false)
+    }
+
+    pub fn painting_order(&self) -> impl Iterator<Item = (&WebViewId, &WebView)> {
+        self.painting_order
+            .iter()
+            .flat_map(move |webview_id| self.get(*webview_id).map(|b| (webview_id, b)))
+    }
+
+    pub fn entry(&mut self, webview_id: WebViewId) -> Entry<'_, WebViewId, WebView> {
+        self.webviews.entry(webview_id)
+    }
+
+    pub fn iter(&self) -> Values<'_, WebViewId, WebView> {
+        self.webviews.values()
+    }
+
+    pub fn iter_mut(&mut self) -> ValuesMut<'_, WebViewId, WebView> {
+        self.webviews.values_mut()
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use base::id::{BrowsingContextId, Index, PipelineNamespace, PipelineNamespaceId, WebViewId};
+
+    use crate::webview_manager::WebViewManager;
+    use crate::webview_renderer::UnknownWebView;
+
+    fn top_level_id(namespace_id: u32, index: u32) -> WebViewId {
+        WebViewId(BrowsingContextId {
+            namespace_id: PipelineNamespaceId(namespace_id),
+            index: Index::new(index).unwrap(),
+        })
+    }
+
+    fn webviews_sorted<WebView: Clone>(
+        webviews: &WebViewManager<WebView>,
+    ) -> Vec<(WebViewId, WebView)> {
+        let mut keys = webviews.webviews.keys().collect::<Vec<_>>();
+        keys.sort();
+        keys.iter()
+            .map(|&id| (*id, webviews.webviews.get(id).cloned().unwrap()))
+            .collect()
+    }
+
+    #[test]
+    fn test() {
+        PipelineNamespace::install(PipelineNamespaceId(0));
+        let mut webviews = WebViewManager::default();
+
+        // entry() adds the webview to the map, but not the painting order.
+        webviews.entry(WebViewId::new()).or_insert('a');
+        webviews.entry(WebViewId::new()).or_insert('b');
+        webviews.entry(WebViewId::new()).or_insert('c');
+        assert!(webviews.get(top_level_id(0, 1)).is_some());
+        assert!(webviews.get(top_level_id(0, 2)).is_some());
+        assert!(webviews.get(top_level_id(0, 3)).is_some());
+        assert_eq!(
+            webviews_sorted(&webviews),
+            vec![
+                (top_level_id(0, 1), 'a'),
+                (top_level_id(0, 2), 'b'),
+                (top_level_id(0, 3), 'c'),
+            ]
+        );
+        assert!(webviews.painting_order.is_empty());
+
+        // add() returns WebViewAlreadyExists if the webview id already exists.
+        webviews.entry(top_level_id(0, 3)).or_insert('d');
+        assert!(webviews.get(top_level_id(0, 3)).is_some());
+
+        // Other methods return UnknownWebView or None if the webview id doesn’t exist.
+        assert_eq!(
+            webviews.remove(top_level_id(1, 1)),
+            Err(UnknownWebView(top_level_id(1, 1)))
+        );
+        assert_eq!(webviews.get(top_level_id(1, 1)), None);
+        assert_eq!(webviews.get_mut(top_level_id(1, 1)), None);
+        assert_eq!(
+            webviews.show(top_level_id(1, 1)),
+            Err(UnknownWebView(top_level_id(1, 1)))
+        );
+        assert_eq!(
+            webviews.hide(top_level_id(1, 1)),
+            Err(UnknownWebView(top_level_id(1, 1)))
+        );
+        assert_eq!(
+            webviews.raise_to_top(top_level_id(1, 1)),
+            Err(UnknownWebView(top_level_id(1, 1)))
+        );
+
+        // For webviews not yet visible, both show() and raise_to_top() add the given webview on top.
+        assert_eq!(webviews.show(top_level_id(0, 2)), Ok(true));
+        assert_eq!(webviews.show(top_level_id(0, 2)), Ok(false));
+        assert_eq!(webviews.painting_order, vec![top_level_id(0, 2)]);
+        assert_eq!(webviews.raise_to_top(top_level_id(0, 1)), Ok(true));
+        assert_eq!(webviews.raise_to_top(top_level_id(0, 1)), Ok(false));
+        assert_eq!(
+            webviews.painting_order,
+            vec![top_level_id(0, 2), top_level_id(0, 1)]
+        );
+        assert_eq!(webviews.show(top_level_id(0, 3)), Ok(true));
+        assert_eq!(webviews.show(top_level_id(0, 3)), Ok(false));
+        assert_eq!(
+            webviews.painting_order,
+            vec![top_level_id(0, 2), top_level_id(0, 1), top_level_id(0, 3)]
+        );
+
+        // For webviews already visible, show() does nothing, while raise_to_top() makes it on top.
+        assert_eq!(webviews.show(top_level_id(0, 1)), Ok(false));
+        assert_eq!(
+            webviews.painting_order,
+            vec![top_level_id(0, 2), top_level_id(0, 1), top_level_id(0, 3)]
+        );
+        assert_eq!(webviews.raise_to_top(top_level_id(0, 1)), Ok(true));
+        assert_eq!(webviews.raise_to_top(top_level_id(0, 1)), Ok(false));
+        assert_eq!(
+            webviews.painting_order,
+            vec![top_level_id(0, 2), top_level_id(0, 3), top_level_id(0, 1)]
+        );
+
+        // hide() removes the webview from the painting order, but not the map.
+        assert_eq!(webviews.hide(top_level_id(0, 3)), Ok(true));
+        assert_eq!(webviews.hide(top_level_id(0, 3)), Ok(false));
+        assert_eq!(
+            webviews.painting_order,
+            vec![top_level_id(0, 2), top_level_id(0, 1)]
+        );
+        assert_eq!(
+            webviews_sorted(&webviews),
+            vec![
+                (top_level_id(0, 1), 'a'),
+                (top_level_id(0, 2), 'b'),
+                (top_level_id(0, 3), 'c'),
+            ]
+        );
+
+        // painting_order() returns only the visible webviews, in painting order.
+        let mut painting_order = webviews.painting_order();
+        assert_eq!(painting_order.next(), Some((&top_level_id(0, 2), &'b')));
+        assert_eq!(painting_order.next(), Some((&top_level_id(0, 1), &'a')));
+        assert_eq!(painting_order.next(), None);
+        drop(painting_order);
+
+        // remove() removes the given webview from both the map and the painting order.
+        assert!(webviews.remove(top_level_id(0, 1)).is_ok());
+        assert!(webviews.remove(top_level_id(0, 2)).is_ok());
+        assert!(webviews.remove(top_level_id(0, 3)).is_ok());
+        assert!(webviews_sorted(&webviews).is_empty());
+        assert!(webviews.painting_order.is_empty());
+    }
+}
diff --git a/components/compositing/webview_renderer.rs b/components/compositing/webview_renderer.rs
new file mode 100644
index 00000000000..a51dd5f8cda
--- /dev/null
+++ b/components/compositing/webview_renderer.rs
@@ -0,0 +1,991 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::cell::RefCell;
+use std::collections::HashMap;
+use std::collections::hash_map::Keys;
+use std::rc::Rc;
+
+use base::id::{PipelineId, WebViewId};
+use compositing_traits::{SendableFrameTree, WebViewTrait};
+use constellation_traits::{EmbedderToConstellationMessage, ScrollState, WindowSizeType};
+use embedder_traits::{
+    AnimationState, CompositorHitTestResult, InputEvent, MouseButton, MouseButtonAction,
+    MouseButtonEvent, MouseMoveEvent, ShutdownState, TouchEvent, TouchEventResult, TouchEventType,
+    TouchId, ViewportDetails,
+};
+use euclid::{Box2D, Point2D, Scale, Size2D, Vector2D};
+use fnv::FnvHashSet;
+use log::{debug, warn};
+use servo_geometry::DeviceIndependentPixel;
+use style_traits::{CSSPixel, PinchZoomFactor};
+use webrender::Transaction;
+use webrender_api::units::{
+    DeviceIntPoint, DeviceIntRect, DevicePixel, DevicePoint, DeviceRect, LayoutVector2D,
+};
+use webrender_api::{
+    ExternalScrollId, HitTestFlags, RenderReasons, SampledScrollOffset, ScrollLocation,
+};
+
+use crate::IOCompositor;
+use crate::compositor::{PipelineDetails, ServoRenderer};
+use crate::touch::{TouchHandler, TouchMoveAction, TouchMoveAllowed, TouchSequenceState};
+
+// Default viewport constraints
+const MAX_ZOOM: f32 = 8.0;
+const MIN_ZOOM: f32 = 0.1;
+
+#[derive(Clone, Copy)]
+struct ScrollEvent {
+    /// Scroll by this offset, or to Start or End
+    scroll_location: ScrollLocation,
+    /// Apply changes to the frame at this location
+    cursor: DeviceIntPoint,
+    /// The number of OS events that have been coalesced together into this one event.
+    event_count: u32,
+}
+
+#[derive(Clone, Copy)]
+enum ScrollZoomEvent {
+    /// An pinch zoom event that magnifies the view by the given factor.
+    PinchZoom(f32),
+    /// A scroll event that scrolls the scroll node at the given location by the
+    /// given amount.
+    Scroll(ScrollEvent),
+}
+
+/// A renderer for a libservo `WebView`. This is essentially the [`ServoRenderer`]'s interface to a
+/// libservo `WebView`, but the code here cannot depend on libservo in order to prevent circular
+/// dependencies, which is why we store a `dyn WebViewTrait` here instead of the `WebView` itself.
+pub(crate) struct WebViewRenderer {
+    /// The [`WebViewId`] of the `WebView` associated with this [`WebViewDetails`].
+    pub id: WebViewId,
+    /// The renderer's view of the embedding layer `WebView` as a trait implementation,
+    /// so that the renderer doesn't need to depend on the embedding layer. This avoids
+    /// a dependency cycle.
+    pub webview: Box<dyn WebViewTrait>,
+    /// The root [`PipelineId`] of the currently displayed page in this WebView.
+    pub root_pipeline_id: Option<PipelineId>,
+    pub rect: DeviceRect,
+    /// Tracks details about each active pipeline that the compositor knows about.
+    pub pipelines: HashMap<PipelineId, PipelineDetails>,
+    /// Data that is shared by all WebView renderers.
+    pub(crate) global: Rc<RefCell<ServoRenderer>>,
+    /// Pending scroll/zoom events.
+    pending_scroll_zoom_events: Vec<ScrollZoomEvent>,
+    /// Touch input state machine
+    touch_handler: TouchHandler,
+    /// "Desktop-style" zoom that resizes the viewport to fit the window.
+    pub page_zoom: Scale<f32, CSSPixel, DeviceIndependentPixel>,
+    /// "Mobile-style" zoom that does not reflow the page.
+    viewport_zoom: PinchZoomFactor,
+    /// Viewport zoom constraints provided by @viewport.
+    min_viewport_zoom: Option<PinchZoomFactor>,
+    max_viewport_zoom: Option<PinchZoomFactor>,
+    /// The HiDPI scale factor for the `WebView` associated with this renderer. This is controlled
+    /// by the embedding layer.
+    hidpi_scale_factor: Scale<f32, DeviceIndependentPixel, DevicePixel>,
+    /// Whether or not this [`WebViewRenderer`] isn't throttled and has a pipeline with
+    /// active animations or animation frame callbacks.
+    animating: bool,
+}
+
+impl Drop for WebViewRenderer {
+    fn drop(&mut self) {
+        self.global
+            .borrow_mut()
+            .pipeline_to_webview_map
+            .retain(|_, webview_id| self.id != *webview_id);
+    }
+}
+
+impl WebViewRenderer {
+    pub(crate) fn new(
+        global: Rc<RefCell<ServoRenderer>>,
+        renderer_webview: Box<dyn WebViewTrait>,
+        viewport_details: ViewportDetails,
+    ) -> Self {
+        let hidpi_scale_factor = viewport_details.hidpi_scale_factor;
+        let size = viewport_details.size * viewport_details.hidpi_scale_factor;
+        Self {
+            id: renderer_webview.id(),
+            webview: renderer_webview,
+            root_pipeline_id: None,
+            rect: DeviceRect::from_origin_and_size(DevicePoint::origin(), size),
+            pipelines: Default::default(),
+            touch_handler: TouchHandler::new(),
+            global,
+            pending_scroll_zoom_events: Default::default(),
+            page_zoom: Scale::new(1.0),
+            viewport_zoom: PinchZoomFactor::new(1.0),
+            min_viewport_zoom: Some(PinchZoomFactor::new(1.0)),
+            max_viewport_zoom: None,
+            hidpi_scale_factor: Scale::new(hidpi_scale_factor.0),
+            animating: false,
+        }
+    }
+
+    pub(crate) fn animations_or_animation_callbacks_running(&self) -> bool {
+        self.pipelines
+            .values()
+            .any(PipelineDetails::animations_or_animation_callbacks_running)
+    }
+
+    pub(crate) fn animation_callbacks_running(&self) -> bool {
+        self.pipelines
+            .values()
+            .any(PipelineDetails::animation_callbacks_running)
+    }
+
+    pub(crate) fn pipeline_ids(&self) -> Keys<'_, PipelineId, PipelineDetails> {
+        self.pipelines.keys()
+    }
+
+    pub(crate) fn animating(&self) -> bool {
+        self.animating
+    }
+
+    /// Returns the [`PipelineDetails`] for the given [`PipelineId`], creating it if needed.
+    pub(crate) fn ensure_pipeline_details(
+        &mut self,
+        pipeline_id: PipelineId,
+    ) -> &mut PipelineDetails {
+        self.pipelines.entry(pipeline_id).or_insert_with(|| {
+            self.global
+                .borrow_mut()
+                .pipeline_to_webview_map
+                .insert(pipeline_id, self.id);
+            PipelineDetails::new()
+        })
+    }
+
+    pub(crate) fn remove_pipeline(&mut self, pipeline_id: PipelineId) {
+        self.global
+            .borrow_mut()
+            .pipeline_to_webview_map
+            .remove(&pipeline_id);
+        self.pipelines.remove(&pipeline_id);
+    }
+
+    pub(crate) fn set_frame_tree(&mut self, frame_tree: &SendableFrameTree) {
+        let pipeline_id = frame_tree.pipeline.id;
+        let old_pipeline_id = std::mem::replace(&mut self.root_pipeline_id, Some(pipeline_id));
+
+        if old_pipeline_id != self.root_pipeline_id {
+            debug!(
+                "Updating webview ({:?}) from pipeline {:?} to {:?}",
+                3, old_pipeline_id, self.root_pipeline_id
+            );
+        }
+
+        self.set_frame_tree_on_pipeline_details(frame_tree, None);
+        self.reset_scroll_tree_for_unattached_pipelines(frame_tree);
+        self.send_scroll_positions_to_layout_for_pipeline(pipeline_id);
+    }
+
+    pub(crate) fn send_scroll_positions_to_layout_for_pipeline(&self, pipeline_id: PipelineId) {
+        let Some(details) = self.pipelines.get(&pipeline_id) else {
+            return;
+        };
+
+        let mut scroll_states = Vec::new();
+        details.scroll_tree.nodes.iter().for_each(|node| {
+            if let (Some(scroll_id), Some(scroll_offset)) = (node.external_id(), node.offset()) {
+                scroll_states.push(ScrollState {
+                    scroll_id,
+                    scroll_offset,
+                });
+            }
+        });
+
+        let _ = self.global.borrow().constellation_sender.send(
+            EmbedderToConstellationMessage::SetScrollStates(pipeline_id, scroll_states),
+        );
+    }
+
+    pub(crate) fn set_frame_tree_on_pipeline_details(
+        &mut self,
+        frame_tree: &SendableFrameTree,
+        parent_pipeline_id: Option<PipelineId>,
+    ) {
+        let pipeline_id = frame_tree.pipeline.id;
+        let pipeline_details = self.ensure_pipeline_details(pipeline_id);
+        pipeline_details.pipeline = Some(frame_tree.pipeline.clone());
+        pipeline_details.parent_pipeline_id = parent_pipeline_id;
+
+        for kid in &frame_tree.children {
+            self.set_frame_tree_on_pipeline_details(kid, Some(pipeline_id));
+        }
+    }
+
+    pub(crate) fn reset_scroll_tree_for_unattached_pipelines(
+        &mut self,
+        frame_tree: &SendableFrameTree,
+    ) {
+        // TODO(mrobinson): Eventually this can selectively preserve the scroll trees
+        // state for some unattached pipelines in order to preserve scroll position when
+        // navigating backward and forward.
+        fn collect_pipelines(
+            pipelines: &mut FnvHashSet<PipelineId>,
+            frame_tree: &SendableFrameTree,
+        ) {
+            pipelines.insert(frame_tree.pipeline.id);
+            for kid in &frame_tree.children {
+                collect_pipelines(pipelines, kid);
+            }
+        }
+
+        let mut attached_pipelines: FnvHashSet<PipelineId> = FnvHashSet::default();
+        collect_pipelines(&mut attached_pipelines, frame_tree);
+
+        self.pipelines
+            .iter_mut()
+            .filter(|(id, _)| !attached_pipelines.contains(id))
+            .for_each(|(_, details)| {
+                details.scroll_tree.nodes.iter_mut().for_each(|node| {
+                    node.set_offset(LayoutVector2D::zero());
+                })
+            })
+    }
+
+    /// Sets or unsets the animations-running flag for the given pipeline. Returns
+    /// true if the [`WebViewRenderer`]'s overall animating state changed.
+    pub(crate) fn change_pipeline_running_animations_state(
+        &mut self,
+        pipeline_id: PipelineId,
+        animation_state: AnimationState,
+    ) -> bool {
+        let pipeline_details = self.ensure_pipeline_details(pipeline_id);
+        match animation_state {
+            AnimationState::AnimationsPresent => {
+                pipeline_details.animations_running = true;
+            },
+            AnimationState::AnimationCallbacksPresent => {
+                pipeline_details.animation_callbacks_running = true;
+            },
+            AnimationState::NoAnimationsPresent => {
+                pipeline_details.animations_running = false;
+            },
+            AnimationState::NoAnimationCallbacksPresent => {
+                pipeline_details.animation_callbacks_running = false;
+            },
+        }
+        self.update_animation_state()
+    }
+
+    /// Sets or unsets the throttled flag for the given pipeline. Returns
+    /// true if the [`WebViewRenderer`]'s overall animating state changed.
+    pub(crate) fn set_throttled(&mut self, pipeline_id: PipelineId, throttled: bool) -> bool {
+        self.ensure_pipeline_details(pipeline_id).throttled = throttled;
+
+        // Throttling a pipeline can cause it to be taken into the "not-animating" state.
+        self.update_animation_state()
+    }
+
+    pub(crate) fn update_animation_state(&mut self) -> bool {
+        let animating = self.pipelines.values().any(PipelineDetails::animating);
+        let old_animating = std::mem::replace(&mut self.animating, animating);
+        self.webview.set_animating(self.animating);
+        old_animating != self.animating
+    }
+
+    /// On a Window refresh tick (e.g. vsync)
+    pub(crate) fn on_vsync(&mut self) {
+        if let Some(fling_action) = self.touch_handler.on_vsync() {
+            self.on_scroll_window_event(
+                ScrollLocation::Delta(fling_action.delta),
+                fling_action.cursor,
+            );
+        }
+    }
+
+    pub(crate) fn dispatch_input_event(&mut self, event: InputEvent) {
+        // Events that do not need to do hit testing are sent directly to the
+        // constellation to filter down.
+        let Some(point) = event.point() else {
+            return;
+        };
+
+        // If we can't find a pipeline to send this event to, we cannot continue.
+        let get_pipeline_details = |pipeline_id| self.pipelines.get(&pipeline_id);
+        let Some(result) = self
+            .global
+            .borrow()
+            .hit_test_at_point(point, get_pipeline_details)
+        else {
+            return;
+        };
+
+        self.global.borrow_mut().update_cursor(point, &result);
+
+        if let Err(error) = self.global.borrow().constellation_sender.send(
+            EmbedderToConstellationMessage::ForwardInputEvent(self.id, event, Some(result)),
+        ) {
+            warn!("Sending event to constellation failed ({error:?}).");
+        }
+    }
+
+    pub(crate) fn notify_input_event(&mut self, event: InputEvent) {
+        if self.global.borrow().shutdown_state() != ShutdownState::NotShuttingDown {
+            return;
+        }
+
+        if let InputEvent::Touch(event) = event {
+            self.on_touch_event(event);
+            return;
+        }
+
+        if self.global.borrow().convert_mouse_to_touch {
+            match event {
+                InputEvent::MouseButton(event) => {
+                    match (event.button, event.action) {
+                        (MouseButton::Left, MouseButtonAction::Down) => self.on_touch_down(
+                            TouchEvent::new(TouchEventType::Down, TouchId(0), event.point),
+                        ),
+                        (MouseButton::Left, MouseButtonAction::Up) => self.on_touch_up(
+                            TouchEvent::new(TouchEventType::Up, TouchId(0), event.point),
+                        ),
+                        _ => {},
+                    }
+                    return;
+                },
+                InputEvent::MouseMove(event) => {
+                    if let Some(state) = self.touch_handler.try_get_current_touch_sequence() {
+                        // We assume that the debug option `-Z convert-mouse-to-touch` will only
+                        // be used on devices without native touch input, so we can directly
+                        // reuse the touch handler for tracking the state of pressed buttons.
+                        match state.state {
+                            TouchSequenceState::Touching | TouchSequenceState::Panning { .. } => {
+                                self.on_touch_move(TouchEvent::new(
+                                    TouchEventType::Move,
+                                    TouchId(0),
+                                    event.point,
+                                ));
+                            },
+                            TouchSequenceState::MultiTouch => {
+                                // Multitouch simulation currently is not implemented.
+                                // Since we only get one mouse move event, we would need to
+                                // dispatch one mouse move event per currently pressed mouse button.
+                            },
+                            TouchSequenceState::Pinching => {
+                                // We only have one mouse button, so Pinching should be impossible.
+                                #[cfg(debug_assertions)]
+                                log::error!(
+                                    "Touch handler is in Pinching state, which should be unreachable with \
+                                -Z convert-mouse-to-touch debug option."
+                                );
+                            },
+                            TouchSequenceState::PendingFling { .. } |
+                            TouchSequenceState::Flinging { .. } |
+                            TouchSequenceState::PendingClick(_) |
+                            TouchSequenceState::Finished => {
+                                // Mouse movement without a button being pressed is not
+                                // translated to touch events.
+                            },
+                        }
+                    }
+                    // We don't want to (directly) dispatch mouse events when simulating touch input.
+                    return;
+                },
+                _ => {},
+            }
+        }
+
+        self.dispatch_input_event(event);
+    }
+
+    fn send_touch_event(&self, mut event: TouchEvent) -> bool {
+        let get_pipeline_details = |pipeline_id| self.pipelines.get(&pipeline_id);
+        let Some(result) = self
+            .global
+            .borrow()
+            .hit_test_at_point(event.point, get_pipeline_details)
+        else {
+            return false;
+        };
+
+        event.init_sequence_id(self.touch_handler.current_sequence_id);
+        let event = InputEvent::Touch(event);
+        if let Err(e) = self.global.borrow().constellation_sender.send(
+            EmbedderToConstellationMessage::ForwardInputEvent(self.id, event, Some(result)),
+        ) {
+            warn!("Sending event to constellation failed ({:?}).", e);
+            false
+        } else {
+            true
+        }
+    }
+
+    pub(crate) fn on_touch_event(&mut self, event: TouchEvent) {
+        if self.global.borrow().shutdown_state() != ShutdownState::NotShuttingDown {
+            return;
+        }
+
+        match event.event_type {
+            TouchEventType::Down => self.on_touch_down(event),
+            TouchEventType::Move => self.on_touch_move(event),
+            TouchEventType::Up => self.on_touch_up(event),
+            TouchEventType::Cancel => self.on_touch_cancel(event),
+        }
+    }
+
+    fn on_touch_down(&mut self, event: TouchEvent) {
+        self.touch_handler.on_touch_down(event.id, event.point);
+        self.send_touch_event(event);
+    }
+
+    fn on_touch_move(&mut self, mut event: TouchEvent) {
+        let action: TouchMoveAction = self.touch_handler.on_touch_move(event.id, event.point);
+        if TouchMoveAction::NoAction != action {
+            // if first move processed and allowed, we directly process the move event,
+            // without waiting for the script handler.
+            if self
+                .touch_handler
+                .move_allowed(self.touch_handler.current_sequence_id)
+            {
+                // https://w3c.github.io/touch-events/#cancelability
+                event.disable_cancelable();
+                match action {
+                    TouchMoveAction::Scroll(delta, point) => self.on_scroll_window_event(
+                        ScrollLocation::Delta(LayoutVector2D::from_untyped(delta.to_untyped())),
+                        point.cast(),
+                    ),
+                    TouchMoveAction::Zoom(magnification, scroll_delta) => {
+                        let cursor = Point2D::new(-1, -1); // Make sure this hits the base layer.
+
+                        // The order of these events doesn't matter, because zoom is handled by
+                        // a root display list and the scroll event here is handled by the scroll
+                        // applied to the content display list.
+                        self.pending_scroll_zoom_events
+                            .push(ScrollZoomEvent::PinchZoom(magnification));
+                        self.pending_scroll_zoom_events
+                            .push(ScrollZoomEvent::Scroll(ScrollEvent {
+                                scroll_location: ScrollLocation::Delta(
+                                    LayoutVector2D::from_untyped(scroll_delta.to_untyped()),
+                                ),
+                                cursor,
+                                event_count: 1,
+                            }));
+                    },
+                    _ => {},
+                }
+            }
+            // When the event is touchmove, if the script thread is processing the touch
+            // move event, we skip sending the event to the script thread.
+            // This prevents the script thread from stacking up for a large amount of time.
+            if !self
+                .touch_handler
+                .is_handling_touch_move(self.touch_handler.current_sequence_id) &&
+                self.send_touch_event(event) &&
+                event.is_cancelable()
+            {
+                self.touch_handler
+                    .set_handling_touch_move(self.touch_handler.current_sequence_id, true);
+            }
+        }
+    }
+
+    fn on_touch_up(&mut self, event: TouchEvent) {
+        self.touch_handler.on_touch_up(event.id, event.point);
+        self.send_touch_event(event);
+    }
+
+    fn on_touch_cancel(&mut self, event: TouchEvent) {
+        // Send the event to script.
+        self.touch_handler.on_touch_cancel(event.id, event.point);
+        self.send_touch_event(event);
+    }
+
+    pub(crate) fn on_touch_event_processed(&mut self, result: TouchEventResult) {
+        match result {
+            TouchEventResult::DefaultPrevented(sequence_id, event_type) => {
+                debug!(
+                    "Touch event {:?} in sequence {:?} prevented!",
+                    event_type, sequence_id
+                );
+                match event_type {
+                    TouchEventType::Down => {
+                        // prevents both click and move
+                        self.touch_handler.prevent_click(sequence_id);
+                        self.touch_handler.prevent_move(sequence_id);
+                        self.touch_handler
+                            .remove_pending_touch_move_action(sequence_id);
+                    },
+                    TouchEventType::Move => {
+                        // script thread processed the touch move event, mark this false.
+                        if let Some(info) = self.touch_handler.get_touch_sequence_mut(sequence_id) {
+                            info.prevent_move = TouchMoveAllowed::Prevented;
+                            if let TouchSequenceState::PendingFling { .. } = info.state {
+                                info.state = TouchSequenceState::Finished;
+                            }
+                            self.touch_handler.set_handling_touch_move(
+                                self.touch_handler.current_sequence_id,
+                                false,
+                            );
+                            self.touch_handler
+                                .remove_pending_touch_move_action(sequence_id);
+                        }
+                    },
+                    TouchEventType::Up => {
+                        // Note: We don't have to consider PendingFling here, since we handle that
+                        // in the DefaultAllowed case of the touch_move event.
+                        // Note: Removing can and should fail, if we still have an active Fling,
+                        let Some(info) =
+                            &mut self.touch_handler.get_touch_sequence_mut(sequence_id)
+                        else {
+                            // The sequence ID could already be removed, e.g. if Fling finished,
+                            // before the touch_up event was handled (since fling can start
+                            // immediately if move was previously allowed, and clicks are anyway not
+                            // happening from fling).
+                            return;
+                        };
+                        match info.state {
+                            TouchSequenceState::PendingClick(_) => {
+                                info.state = TouchSequenceState::Finished;
+                                self.touch_handler.remove_touch_sequence(sequence_id);
+                            },
+                            TouchSequenceState::Flinging { .. } => {
+                                // We can't remove the touch sequence yet
+                            },
+                            TouchSequenceState::Finished => {
+                                self.touch_handler.remove_touch_sequence(sequence_id);
+                            },
+                            TouchSequenceState::Touching |
+                            TouchSequenceState::Panning { .. } |
+                            TouchSequenceState::Pinching |
+                            TouchSequenceState::MultiTouch |
+                            TouchSequenceState::PendingFling { .. } => {
+                                // It's possible to transition from Pinch to pan, Which means that
+                                // a touch_up event for a pinch might have arrived here, but we
+                                // already transitioned to pan or even PendingFling.
+                                // We don't need to do anything in these cases though.
+                            },
+                        }
+                    },
+                    TouchEventType::Cancel => {
+                        // We could still have pending event handlers, so we remove the pending
+                        // actions, and try to remove the touch sequence.
+                        self.touch_handler
+                            .remove_pending_touch_move_action(sequence_id);
+                        self.touch_handler.try_remove_touch_sequence(sequence_id);
+                    },
+                }
+            },
+            TouchEventResult::DefaultAllowed(sequence_id, event_type) => {
+                debug!(
+                    "Touch event {:?} in sequence {:?} allowed",
+                    event_type, sequence_id
+                );
+                match event_type {
+                    TouchEventType::Down => {},
+                    TouchEventType::Move => {
+                        if let Some(action) =
+                            self.touch_handler.pending_touch_move_action(sequence_id)
+                        {
+                            match action {
+                                TouchMoveAction::Scroll(delta, point) => self
+                                    .on_scroll_window_event(
+                                        ScrollLocation::Delta(LayoutVector2D::from_untyped(
+                                            delta.to_untyped(),
+                                        )),
+                                        point.cast(),
+                                    ),
+                                TouchMoveAction::Zoom(magnification, scroll_delta) => {
+                                    let cursor = Point2D::new(-1, -1);
+                                    // Make sure this hits the base layer.
+                                    // The order of these events doesn't matter, because zoom is handled by
+                                    // a root display list and the scroll event here is handled by the scroll
+                                    // applied to the content display list.
+                                    self.pending_scroll_zoom_events
+                                        .push(ScrollZoomEvent::PinchZoom(magnification));
+                                    self.pending_scroll_zoom_events
+                                        .push(ScrollZoomEvent::Scroll(ScrollEvent {
+                                            scroll_location: ScrollLocation::Delta(
+                                                LayoutVector2D::from_untyped(
+                                                    scroll_delta.to_untyped(),
+                                                ),
+                                            ),
+                                            cursor,
+                                            event_count: 1,
+                                        }));
+                                },
+                                TouchMoveAction::NoAction => {
+                                    // This shouldn't happen, but we can also just ignore it.
+                                },
+                            }
+                            self.touch_handler
+                                .remove_pending_touch_move_action(sequence_id);
+                        }
+                        self.touch_handler
+                            .set_handling_touch_move(self.touch_handler.current_sequence_id, false);
+                        if let Some(info) = self.touch_handler.get_touch_sequence_mut(sequence_id) {
+                            if info.prevent_move == TouchMoveAllowed::Pending {
+                                info.prevent_move = TouchMoveAllowed::Allowed;
+                                if let TouchSequenceState::PendingFling { velocity, cursor } =
+                                    info.state
+                                {
+                                    info.state = TouchSequenceState::Flinging { velocity, cursor }
+                                }
+                            }
+                        }
+                    },
+                    TouchEventType::Up => {
+                        let Some(info) = self.touch_handler.get_touch_sequence_mut(sequence_id)
+                        else {
+                            // The sequence was already removed because there is no default action.
+                            return;
+                        };
+                        match info.state {
+                            TouchSequenceState::PendingClick(point) => {
+                                info.state = TouchSequenceState::Finished;
+                                // PreventDefault from touch_down may have been processed after
+                                // touch_up already occurred.
+                                if !info.prevent_click {
+                                    self.simulate_mouse_click(point);
+                                }
+                                self.touch_handler.remove_touch_sequence(sequence_id);
+                            },
+                            TouchSequenceState::Flinging { .. } => {
+                                // We can't remove the touch sequence yet
+                            },
+                            TouchSequenceState::Finished => {
+                                self.touch_handler.remove_touch_sequence(sequence_id);
+                            },
+                            TouchSequenceState::Panning { .. } |
+                            TouchSequenceState::Pinching |
+                            TouchSequenceState::PendingFling { .. } => {
+                                // It's possible to transition from Pinch to pan, Which means that
+                                // a touch_up event for a pinch might have arrived here, but we
+                                // already transitioned to pan or even PendingFling.
+                                // We don't need to do anything in these cases though.
+                            },
+                            TouchSequenceState::MultiTouch | TouchSequenceState::Touching => {
+                                // We transitioned to touching from multi-touch or pinching.
+                            },
+                        }
+                    },
+                    TouchEventType::Cancel => {
+                        self.touch_handler
+                            .remove_pending_touch_move_action(sequence_id);
+                        self.touch_handler.try_remove_touch_sequence(sequence_id);
+                    },
+                }
+            },
+        }
+    }
+
+    /// <http://w3c.github.io/touch-events/#mouse-events>
+    fn simulate_mouse_click(&mut self, point: DevicePoint) {
+        let button = MouseButton::Left;
+        self.dispatch_input_event(InputEvent::MouseMove(MouseMoveEvent { point }));
+        self.dispatch_input_event(InputEvent::MouseButton(MouseButtonEvent {
+            button,
+            action: MouseButtonAction::Down,
+            point,
+        }));
+        self.dispatch_input_event(InputEvent::MouseButton(MouseButtonEvent {
+            button,
+            action: MouseButtonAction::Up,
+            point,
+        }));
+    }
+
+    pub(crate) fn notify_scroll_event(
+        &mut self,
+        scroll_location: ScrollLocation,
+        cursor: DeviceIntPoint,
+        event_type: TouchEventType,
+    ) {
+        if self.global.borrow().shutdown_state() != ShutdownState::NotShuttingDown {
+            return;
+        }
+
+        match event_type {
+            TouchEventType::Move => self.on_scroll_window_event(scroll_location, cursor),
+            TouchEventType::Up | TouchEventType::Cancel => {
+                self.on_scroll_window_event(scroll_location, cursor);
+            },
+            TouchEventType::Down => {
+                self.on_scroll_window_event(scroll_location, cursor);
+            },
+        }
+    }
+
+    fn on_scroll_window_event(&mut self, scroll_location: ScrollLocation, cursor: DeviceIntPoint) {
+        self.pending_scroll_zoom_events
+            .push(ScrollZoomEvent::Scroll(ScrollEvent {
+                scroll_location,
+                cursor,
+                event_count: 1,
+            }));
+    }
+
+    /// Push scroll pending event when receiving wheel action from webdriver
+    pub(crate) fn on_webdriver_wheel_action(
+        &mut self,
+        scroll_delta: Vector2D<f32, DevicePixel>,
+        point: Point2D<f32, DevicePixel>,
+    ) {
+        if self.global.borrow().shutdown_state() != ShutdownState::NotShuttingDown {
+            return;
+        }
+
+        let scroll_location =
+            ScrollLocation::Delta(LayoutVector2D::from_untyped(scroll_delta.to_untyped()));
+        let cursor = DeviceIntPoint::new(point.x as i32, point.y as i32);
+        self.on_scroll_window_event(scroll_location, cursor)
+    }
+
+    pub(crate) fn process_pending_scroll_events(&mut self, compositor: &mut IOCompositor) {
+        if self.pending_scroll_zoom_events.is_empty() {
+            return;
+        }
+
+        // Batch up all scroll events into one, or else we'll do way too much painting.
+        let mut combined_scroll_event: Option<ScrollEvent> = None;
+        let mut combined_magnification = 1.0;
+        for scroll_event in self.pending_scroll_zoom_events.drain(..) {
+            match scroll_event {
+                ScrollZoomEvent::PinchZoom(magnification) => {
+                    combined_magnification *= magnification
+                },
+                ScrollZoomEvent::Scroll(scroll_event_info) => {
+                    let combined_event = match combined_scroll_event.as_mut() {
+                        None => {
+                            combined_scroll_event = Some(scroll_event_info);
+                            continue;
+                        },
+                        Some(combined_event) => combined_event,
+                    };
+
+                    match (
+                        combined_event.scroll_location,
+                        scroll_event_info.scroll_location,
+                    ) {
+                        (ScrollLocation::Delta(old_delta), ScrollLocation::Delta(new_delta)) => {
+                            // Mac OS X sometimes delivers scroll events out of vsync during a
+                            // fling. This causes events to get bunched up occasionally, causing
+                            // nasty-looking "pops". To mitigate this, during a fling we average
+                            // deltas instead of summing them.
+                            let old_event_count = Scale::new(combined_event.event_count as f32);
+                            combined_event.event_count += 1;
+                            let new_event_count = Scale::new(combined_event.event_count as f32);
+                            combined_event.scroll_location = ScrollLocation::Delta(
+                                (old_delta * old_event_count + new_delta) / new_event_count,
+                            );
+                        },
+                        (ScrollLocation::Start, _) | (ScrollLocation::End, _) => {
+                            // Once we see Start or End, we shouldn't process any more events.
+                            break;
+                        },
+                        (_, ScrollLocation::Start) | (_, ScrollLocation::End) => {
+                            // If this is an event which is scrolling to the start or end of the page,
+                            // disregard other pending events and exit the loop.
+                            *combined_event = scroll_event_info;
+                            break;
+                        },
+                    }
+                },
+            }
+        }
+
+        let zoom_changed =
+            self.set_pinch_zoom_level(self.pinch_zoom_level().get() * combined_magnification);
+        let scroll_result = combined_scroll_event.and_then(|combined_event| {
+            self.scroll_node_at_device_point(
+                combined_event.cursor.to_f32(),
+                combined_event.scroll_location,
+            )
+        });
+        if !zoom_changed && scroll_result.is_none() {
+            return;
+        }
+
+        let mut transaction = Transaction::new();
+        if zoom_changed {
+            compositor.send_root_pipeline_display_list_in_transaction(&mut transaction);
+        }
+
+        if let Some((pipeline_id, external_id, offset)) = scroll_result {
+            let offset = LayoutVector2D::new(-offset.x, -offset.y);
+            transaction.set_scroll_offsets(
+                external_id,
+                vec![SampledScrollOffset {
+                    offset,
+                    generation: 0,
+                }],
+            );
+            self.send_scroll_positions_to_layout_for_pipeline(pipeline_id);
+        }
+
+        compositor.generate_frame(&mut transaction, RenderReasons::APZ);
+        self.global.borrow_mut().send_transaction(transaction);
+    }
+
+    /// Perform a hit test at the given [`DevicePoint`] and apply the [`ScrollLocation`]
+    /// scrolling to the applicable scroll node under that point. If a scroll was
+    /// performed, returns the [`PipelineId`] of the node scrolled, the id, and the final
+    /// scroll delta.
+    fn scroll_node_at_device_point(
+        &mut self,
+        cursor: DevicePoint,
+        scroll_location: ScrollLocation,
+    ) -> Option<(PipelineId, ExternalScrollId, LayoutVector2D)> {
+        let scroll_location = match scroll_location {
+            ScrollLocation::Delta(delta) => {
+                let device_pixels_per_page = self.device_pixels_per_page_pixel();
+                let scaled_delta = (Vector2D::from_untyped(delta.to_untyped()) /
+                    device_pixels_per_page)
+                    .to_untyped();
+                let calculated_delta = LayoutVector2D::from_untyped(scaled_delta);
+                ScrollLocation::Delta(calculated_delta)
+            },
+            // Leave ScrollLocation unchanged if it is Start or End location.
+            ScrollLocation::Start | ScrollLocation::End => scroll_location,
+        };
+
+        let get_pipeline_details = |pipeline_id| self.pipelines.get(&pipeline_id);
+        let hit_test_results = self
+            .global
+            .borrow()
+            .hit_test_at_point_with_flags_and_pipeline(
+                cursor,
+                HitTestFlags::FIND_ALL,
+                None,
+                get_pipeline_details,
+            );
+
+        // Iterate through all hit test results, processing only the first node of each pipeline.
+        // This is needed to propagate the scroll events from a pipeline representing an iframe to
+        // its ancestor pipelines.
+        let mut previous_pipeline_id = None;
+        for CompositorHitTestResult {
+            pipeline_id,
+            scroll_tree_node,
+            ..
+        } in hit_test_results.iter()
+        {
+            let pipeline_details = self.pipelines.get_mut(pipeline_id)?;
+            if previous_pipeline_id.replace(pipeline_id) != Some(pipeline_id) {
+                let scroll_result = pipeline_details
+                    .scroll_tree
+                    .scroll_node_or_ancestor(scroll_tree_node, scroll_location);
+                if let Some((external_id, offset)) = scroll_result {
+                    return Some((*pipeline_id, external_id, offset));
+                }
+            }
+        }
+        None
+    }
+
+    pub(crate) fn pinch_zoom_level(&self) -> Scale<f32, DevicePixel, DevicePixel> {
+        Scale::new(self.viewport_zoom.get())
+    }
+
+    fn set_pinch_zoom_level(&mut self, mut zoom: f32) -> bool {
+        if let Some(min) = self.min_viewport_zoom {
+            zoom = f32::max(min.get(), zoom);
+        }
+        if let Some(max) = self.max_viewport_zoom {
+            zoom = f32::min(max.get(), zoom);
+        }
+
+        let old_zoom = std::mem::replace(&mut self.viewport_zoom, PinchZoomFactor::new(zoom));
+        old_zoom != self.viewport_zoom
+    }
+
+    pub(crate) fn set_page_zoom(&mut self, magnification: f32) {
+        self.page_zoom =
+            Scale::new((self.page_zoom.get() * magnification).clamp(MIN_ZOOM, MAX_ZOOM));
+    }
+
+    pub(crate) fn device_pixels_per_page_pixel(&self) -> Scale<f32, CSSPixel, DevicePixel> {
+        self.page_zoom * self.hidpi_scale_factor * self.pinch_zoom_level()
+    }
+
+    pub(crate) fn device_pixels_per_page_pixel_not_including_pinch_zoom(
+        &self,
+    ) -> Scale<f32, CSSPixel, DevicePixel> {
+        self.page_zoom * self.hidpi_scale_factor
+    }
+
+    /// Simulate a pinch zoom
+    pub(crate) fn set_pinch_zoom(&mut self, magnification: f32) {
+        if self.global.borrow().shutdown_state() != ShutdownState::NotShuttingDown {
+            return;
+        }
+
+        // TODO: Scroll to keep the center in view?
+        self.pending_scroll_zoom_events
+            .push(ScrollZoomEvent::PinchZoom(magnification));
+    }
+
+    fn send_window_size_message(&self) {
+        // The device pixel ratio used by the style system should include the scale from page pixels
+        // to device pixels, but not including any pinch zoom.
+        let device_pixel_ratio = self.device_pixels_per_page_pixel_not_including_pinch_zoom();
+        let initial_viewport = self.rect.size().to_f32() / device_pixel_ratio;
+        let msg = EmbedderToConstellationMessage::ChangeViewportDetails(
+            self.id,
+            ViewportDetails {
+                hidpi_scale_factor: device_pixel_ratio,
+                size: initial_viewport,
+            },
+            WindowSizeType::Resize,
+        );
+        if let Err(e) = self.global.borrow().constellation_sender.send(msg) {
+            warn!("Sending window resize to constellation failed ({:?}).", e);
+        }
+    }
+
+    /// Set the `hidpi_scale_factor` for this renderer, returning `true` if the value actually changed.
+    pub(crate) fn set_hidpi_scale_factor(
+        &mut self,
+        new_scale: Scale<f32, DeviceIndependentPixel, DevicePixel>,
+    ) -> bool {
+        let old_scale_factor = std::mem::replace(&mut self.hidpi_scale_factor, new_scale);
+        if self.hidpi_scale_factor == old_scale_factor {
+            return false;
+        }
+
+        self.send_window_size_message();
+        true
+    }
+
+    /// Set the `rect` for this renderer, returning `true` if the value actually changed.
+    pub(crate) fn set_rect(&mut self, new_rect: DeviceRect) -> bool {
+        let old_rect = std::mem::replace(&mut self.rect, new_rect);
+        if old_rect.size() != self.rect.size() {
+            self.send_window_size_message();
+        }
+        old_rect != self.rect
+    }
+
+    pub(crate) fn client_window_rect(
+        &self,
+        rendering_context_size: Size2D<u32, DevicePixel>,
+    ) -> Box2D<i32, DeviceIndependentPixel> {
+        let screen_geometry = self.webview.screen_geometry().unwrap_or_default();
+        let rect = DeviceIntRect::from_origin_and_size(
+            screen_geometry.offset,
+            rendering_context_size.to_i32(),
+        )
+        .to_f32() /
+            self.hidpi_scale_factor;
+        rect.to_i32()
+    }
+
+    pub(crate) fn screen_size(&self) -> Size2D<i32, DeviceIndependentPixel> {
+        let screen_geometry = self.webview.screen_geometry().unwrap_or_default();
+        (screen_geometry.size.to_f32() / self.hidpi_scale_factor).to_i32()
+    }
+
+    pub(crate) fn available_screen_size(&self) -> Size2D<i32, DeviceIndependentPixel> {
+        let screen_geometry = self.webview.screen_geometry().unwrap_or_default();
+        (screen_geometry.available_size.to_f32() / self.hidpi_scale_factor).to_i32()
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct UnknownWebView(pub WebViewId);
diff --git a/components/compositing/windowing.rs b/components/compositing/windowing.rs
deleted file mode 100644
index 2ac4e82b81d..00000000000
--- a/components/compositing/windowing.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-//! Abstract windowing methods. The concrete implementations of these can be found in `platform/`.
-
-use std::fmt::Debug;
-
-use embedder_traits::{EventLoopWaker, MouseButton};
-use euclid::Scale;
-use net::protocols::ProtocolRegistry;
-use servo_geometry::{DeviceIndependentIntRect, DeviceIndependentIntSize, DeviceIndependentPixel};
-use webrender_api::units::{DevicePixel, DevicePoint};
-
-#[derive(Clone)]
-pub enum MouseWindowEvent {
-    Click(MouseButton, DevicePoint),
-    MouseDown(MouseButton, DevicePoint),
-    MouseUp(MouseButton, DevicePoint),
-}
-
-/// Various debug and profiling flags that WebRender supports.
-#[derive(Clone)]
-pub enum WebRenderDebugOption {
-    Profiler,
-    TextureCacheDebug,
-    RenderTargetDebug,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum AnimationState {
-    Idle,
-    Animating,
-}
-
-// TODO: this trait assumes that the window is responsible
-// for creating the GL context, making it current, buffer
-// swapping, etc. Really that should all be done by surfman.
-pub trait WindowMethods {
-    /// Get the coordinates of the native window, the screen and the framebuffer.
-    fn get_coordinates(&self) -> EmbedderCoordinates;
-    /// Set whether the application is currently animating.
-    /// Typically, when animations are active, the window
-    /// will want to avoid blocking on UI events, and just
-    /// run the event loop at the vsync interval.
-    fn set_animation_state(&self, _state: AnimationState);
-}
-
-pub trait EmbedderMethods {
-    /// Returns a thread-safe object to wake up the window's event loop.
-    fn create_event_loop_waker(&mut self) -> Box<dyn EventLoopWaker>;
-
-    #[cfg(feature = "webxr")]
-    /// Register services with a WebXR Registry.
-    fn register_webxr(
-        &mut self,
-        _: &mut webxr::MainThreadRegistry,
-        _: embedder_traits::EmbedderProxy,
-    ) {
-    }
-
-    /// Returns the user agent string to report in network requests.
-    fn get_user_agent_string(&self) -> Option<String> {
-        None
-    }
-
-    /// Returns the version string of this embedder.
-    fn get_version_string(&self) -> Option<String> {
-        None
-    }
-
-    /// Returns the protocol handlers implemented by that embedder.
-    /// They will be merged with the default internal ones.
-    fn get_protocol_handlers(&self) -> ProtocolRegistry {
-        ProtocolRegistry::default()
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct EmbedderCoordinates {
-    /// The pixel density of the display.
-    pub hidpi_factor: Scale<f32, DeviceIndependentPixel, DevicePixel>,
-    /// Size of the screen.
-    pub screen_size: DeviceIndependentIntSize,
-    /// Size of the available screen space (screen without toolbars and docks).
-    pub available_screen_size: DeviceIndependentIntSize,
-    /// Position and size of the native window.
-    pub window_rect: DeviceIndependentIntRect,
-}
diff --git a/components/config/prefs.rs b/components/config/prefs.rs
index f8dfb63a7ac..a9ec112e3eb 100644
--- a/components/config/prefs.rs
+++ b/components/config/prefs.rs
@@ -9,7 +9,7 @@ use servo_config_macro::ServoPreferences;
 
 pub use crate::pref_util::PrefValue;
 
-static PREFERENCES: RwLock<Preferences> = RwLock::new(Preferences::new());
+static PREFERENCES: RwLock<Preferences> = RwLock::new(Preferences::const_default());
 
 #[inline]
 /// Get the current set of global preferences for Servo.
@@ -69,6 +69,7 @@ pub struct Preferences {
     /// List of comma-separated backends to be used by wgpu.
     pub dom_webgpu_wgpu_backend: String,
     pub dom_abort_controller_enabled: bool,
+    pub dom_async_clipboard_enabled: bool,
     pub dom_bluetooth_enabled: bool,
     pub dom_bluetooth_testing_enabled: bool,
     pub dom_allow_scripts_to_close_windows: bool,
@@ -81,7 +82,6 @@ pub struct Preferences {
     pub dom_document_dblclick_timeout: i64,
     pub dom_document_dblclick_dist: i64,
     pub dom_fontface_enabled: bool,
-    pub dom_forcetouch_enabled: bool,
     pub dom_fullscreen_test: bool,
     pub dom_gamepad_enabled: bool,
     pub dom_imagebitmap_enabled: bool,
@@ -114,6 +114,13 @@ pub struct Preferences {
     pub dom_testing_element_activation_enabled: bool,
     pub dom_testing_html_input_element_select_files_enabled: bool,
     pub dom_testperf_enabled: bool,
+    // https://testutils.spec.whatwg.org#availability
+    pub dom_testutils_enabled: bool,
+    pub dom_trusted_types_enabled: bool,
+    /// Enable the [URLPattern] API.
+    ///
+    /// [URLPattern]: https://developer.mozilla.org/en-US/docs/Web/API/URLPattern
+    pub dom_urlpattern_enabled: bool,
     pub dom_xpath_enabled: bool,
     /// Enable WebGL2 APIs.
     pub dom_webgl2_enabled: bool,
@@ -226,16 +233,22 @@ pub struct Preferences {
     pub threadpools_resource_workers_max: i64,
     /// Maximum number of workers for webrender
     pub threadpools_webrender_workers_max: i64,
+    /// The user-agent to use for Servo. This can also be set via [`UserAgentPlatform`] in
+    /// order to set the value to the default value for the given platform.
+    pub user_agent: String,
+
+    pub log_filter: String,
 }
 
 impl Preferences {
-    const fn new() -> Self {
+    const fn const_default() -> Self {
         Self {
             css_animations_testing_enabled: false,
             devtools_server_enabled: false,
             devtools_server_port: 0,
             dom_abort_controller_enabled: false,
             dom_allow_scripts_to_close_windows: false,
+            dom_async_clipboard_enabled: false,
             dom_bluetooth_enabled: false,
             dom_bluetooth_testing_enabled: false,
             dom_canvas_capture_enabled: false,
@@ -247,7 +260,6 @@ impl Preferences {
             dom_document_dblclick_dist: 1,
             dom_document_dblclick_timeout: 300,
             dom_fontface_enabled: false,
-            dom_forcetouch_enabled: false,
             dom_fullscreen_test: false,
             dom_gamepad_enabled: true,
             dom_imagebitmap_enabled: false,
@@ -280,6 +292,9 @@ impl Preferences {
             dom_testing_element_activation_enabled: false,
             dom_testing_html_input_element_select_files_enabled: false,
             dom_testperf_enabled: false,
+            dom_testutils_enabled: false,
+            dom_trusted_types_enabled: false,
+            dom_urlpattern_enabled: false,
             dom_webgl2_enabled: false,
             dom_webgpu_enabled: false,
             dom_webgpu_wgpu_backend: String::new(),
@@ -384,12 +399,88 @@ impl Preferences {
             threadpools_resource_workers_max: 4,
             threadpools_webrender_workers_max: 4,
             webgl_testing_context_creation_error: false,
+            user_agent: String::new(),
+            log_filter: String::new(),
         }
     }
 }
 
 impl Default for Preferences {
     fn default() -> Self {
-        Self::new()
+        let mut preferences = Self::const_default();
+        preferences.user_agent = UserAgentPlatform::default().to_user_agent_string();
+        preferences
+    }
+}
+
+pub enum UserAgentPlatform {
+    Desktop,
+    Android,
+    OpenHarmony,
+    Ios,
+}
+
+impl UserAgentPlatform {
+    /// Return the default `UserAgentPlatform` for this platform. This is
+    /// not an implementation of `Default` so that it can be `const`.
+    const fn default() -> Self {
+        if cfg!(target_os = "android") {
+            Self::Android
+        } else if cfg!(target_env = "ohos") {
+            Self::OpenHarmony
+        } else if cfg!(target_os = "ios") {
+            Self::Ios
+        } else {
+            Self::Desktop
+        }
+    }
+}
+
+impl UserAgentPlatform {
+    /// Convert this [`UserAgentPlatform`] into its corresponding `String` value, ie the
+    /// default user-agent to use for this platform.
+    pub fn to_user_agent_string(&self) -> String {
+        const SERVO_VERSION: &str = env!("CARGO_PKG_VERSION");
+        match self {
+            UserAgentPlatform::Desktop
+                if cfg!(all(target_os = "windows", target_arch = "x86_64")) =>
+            {
+                #[cfg(target_arch = "x86_64")]
+                const ARCHITECTURE: &str = "x86; ";
+                #[cfg(not(target_arch = "x86_64"))]
+                const ARCHITECTURE: &str = "";
+
+                format!(
+                    "Mozilla/5.0 (Windows NT 10.0; Win64; {ARCHITECTURE}rv:128.0) Servo/{SERVO_VERSION} Firefox/128.0"
+                )
+            },
+            UserAgentPlatform::Desktop if cfg!(target_os = "macos") => {
+                format!(
+                    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:128.0) Servo/{SERVO_VERSION} Firefox/128.0"
+                )
+            },
+            UserAgentPlatform::Desktop => {
+                #[cfg(target_arch = "x86_64")]
+                const ARCHITECTURE: &str = "x86_64";
+                // TODO: This is clearly wrong for other platforms.
+                #[cfg(not(target_arch = "x86_64"))]
+                const ARCHITECTURE: &str = "i686";
+
+                format!(
+                    "Mozilla/5.0 (X11; Linux {ARCHITECTURE}; rv:128.0) Servo/{SERVO_VERSION} Firefox/128.0"
+                )
+            },
+            UserAgentPlatform::Android => {
+                format!(
+                    "Mozilla/5.0 (Android; Mobile; rv:128.0) Servo/{SERVO_VERSION} Firefox/128.0"
+                )
+            },
+            UserAgentPlatform::OpenHarmony => format!(
+                "Mozilla/5.0 (OpenHarmony; Mobile; rv:128.0) Servo/{SERVO_VERSION} Firefox/128.0"
+            ),
+            UserAgentPlatform::Ios => format!(
+                "Mozilla/5.0 (iPhone; CPU iPhone OS 18_0 like Mac OS X; rv:128.0) Servo/{SERVO_VERSION} Firefox/128.0"
+            ),
+        }
     }
 }
diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml
index 10623c540d6..1053a23948a 100644
--- a/components/constellation/Cargo.toml
+++ b/components/constellation/Cargo.toml
@@ -14,13 +14,12 @@ path = "lib.rs"
 [features]
 bluetooth = ["bluetooth_traits"]
 default = []
-multiview = []
 tracing = ["dep:tracing"]
 webgpu = ["script_traits/webgpu"]
 
 [dependencies]
-background_hang_monitor_api = { workspace = true }
 background_hang_monitor = { path = "../background_hang_monitor" }
+background_hang_monitor_api = { workspace = true }
 backtrace = { workspace = true }
 base = { workspace = true }
 bluetooth_traits = { workspace = true, optional = true }
@@ -39,6 +38,7 @@ media = { path = "../media" }
 net = { path = "../net" }
 net_traits = { workspace = true }
 parking_lot = { workspace = true }
+profile = { path = "../profile" }
 profile_traits = { workspace = true }
 script_layout_interface = { workspace = true }
 script_traits = { workspace = true }
@@ -49,9 +49,9 @@ servo_url = { path = "../url" }
 stylo_traits = { workspace = true }
 tracing = { workspace = true, optional = true }
 webgpu = { path = "../webgpu" }
+webgpu_traits = { workspace = true }
 webrender = { workspace = true }
 webrender_api = { workspace = true }
-webrender_traits = { workspace = true }
 webxr-api = { workspace = true, features = ["ipc"] }
 
 [target.'cfg(any(target_os="macos", all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_env="ohos"), not(target_arch="arm"), not(target_arch="aarch64"))))'.dependencies]
diff --git a/components/constellation/browsingcontext.rs b/components/constellation/browsingcontext.rs
index 6f8b24dabcb..0a6974a1f2a 100644
--- a/components/constellation/browsingcontext.rs
+++ b/components/constellation/browsingcontext.rs
@@ -5,9 +5,8 @@
 use std::collections::{HashMap, HashSet};
 
 use base::id::{BrowsingContextGroupId, BrowsingContextId, PipelineId, WebViewId};
-use euclid::Size2D;
+use embedder_traits::ViewportDetails;
 use log::warn;
-use style_traits::CSSPixel;
 
 use crate::pipeline::Pipeline;
 
@@ -50,8 +49,8 @@ pub struct BrowsingContext {
     /// The top-level browsing context ancestor
     pub top_level_id: WebViewId,
 
-    /// The size of the frame.
-    pub size: Size2D<f32, CSSPixel>,
+    /// The [`ViewportDetails`] of the frame that this [`BrowsingContext`] represents.
+    pub viewport_details: ViewportDetails,
 
     /// Whether this browsing context is in private browsing mode.
     pub is_private: bool,
@@ -85,7 +84,7 @@ impl BrowsingContext {
         top_level_id: WebViewId,
         pipeline_id: PipelineId,
         parent_pipeline_id: Option<PipelineId>,
-        size: Size2D<f32, CSSPixel>,
+        viewport_details: ViewportDetails,
         is_private: bool,
         inherited_secure_context: Option<bool>,
         throttled: bool,
@@ -96,7 +95,7 @@ impl BrowsingContext {
             bc_group_id,
             id,
             top_level_id,
-            size,
+            viewport_details,
             is_private,
             inherited_secure_context,
             throttled,
diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
index b8fd7a465aa..5db37800c42 100644
--- a/components/constellation/constellation.rs
+++ b/components/constellation/constellation.rs
@@ -84,7 +84,7 @@
 //!
 //! See <https://github.com/servo/servo/issues/14704>
 
-use std::borrow::{Cow, ToOwned};
+use std::borrow::ToOwned;
 use std::collections::hash_map::Entry;
 use std::collections::{HashMap, HashSet, VecDeque};
 use std::marker::PhantomData;
@@ -108,12 +108,19 @@ use bluetooth_traits::BluetoothRequest;
 use canvas_traits::ConstellationCanvasMsg;
 use canvas_traits::canvas::{CanvasId, CanvasMsg};
 use canvas_traits::webgl::WebGLThreads;
-use compositing_traits::{CompositorMsg, CompositorProxy, SendableFrameTree};
-use constellation_traits::{
-    AnimationTickType, CompositorHitTestResult, ConstellationMsg as FromCompositorMsg, LogEntry,
-    PaintMetricEvent, ScrollState, TraversalDirection, WindowSizeData, WindowSizeType,
+use compositing_traits::{
+    CompositorMsg, CompositorProxy, SendableFrameTree, WebrenderExternalImageRegistry,
 };
-use crossbeam_channel::{Receiver, Sender, select, unbounded};
+use constellation_traits::{
+    AuxiliaryWebViewCreationRequest, AuxiliaryWebViewCreationResponse, BroadcastMsg, DocumentState,
+    EmbedderToConstellationMessage, IFrameLoadInfo, IFrameLoadInfoWithData, IFrameSandboxState,
+    IFrameSizeMsg, Job, LoadData, LoadOrigin, LogEntry, MessagePortMsg, NavigationHistoryBehavior,
+    PaintMetricEvent, PortMessageTask, PortTransferInfo, SWManagerMsg, SWManagerSenders,
+    ScriptToConstellationChan, ScriptToConstellationMessage, ScrollState,
+    ServiceWorkerManagerFactory, ServiceWorkerMsg, StructuredSerializedData, TraversalDirection,
+    WindowSizeType,
+};
+use crossbeam_channel::{Receiver, Select, Sender, unbounded};
 use devtools_traits::{
     ChromeToDevtoolsControlMsg, DevtoolsControlMsg, DevtoolsPageInfo, NavigationState,
     ScriptToDevtoolsControlMsg,
@@ -121,9 +128,11 @@ use devtools_traits::{
 use embedder_traits::resources::{self, Resource};
 use embedder_traits::user_content_manager::UserContentManager;
 use embedder_traits::{
-    Cursor, EmbedderMsg, EmbedderProxy, ImeEvent, InputEvent, MediaSessionActionType,
-    MediaSessionEvent, MediaSessionPlaybackState, MouseButton, MouseButtonAction, MouseButtonEvent,
-    Theme, WebDriverCommandMsg, WebDriverLoadStatus,
+    AnimationState, CompositorHitTestResult, Cursor, EmbedderMsg, EmbedderProxy,
+    FocusSequenceNumber, ImeEvent, InputEvent, JSValue, JavaScriptEvaluationError,
+    JavaScriptEvaluationId, MediaSessionActionType, MediaSessionEvent, MediaSessionPlaybackState,
+    MouseButton, MouseButtonAction, MouseButtonEvent, Theme, ViewportDetails, WebDriverCommandMsg,
+    WebDriverLoadStatus,
 };
 use euclid::Size2D;
 use euclid::default::Size2D as UntypedSize2D;
@@ -142,13 +151,8 @@ use net_traits::{self, IpcSend, ReferrerPolicy, ResourceThreads};
 use profile_traits::{mem, time};
 use script_layout_interface::{LayoutFactory, ScriptThreadFactory};
 use script_traits::{
-    AnimationState, AuxiliaryWebViewCreationRequest, AuxiliaryWebViewCreationResponse,
-    BroadcastMsg, ConstellationInputEvent, DiscardBrowsingContext, DocumentActivity, DocumentState,
-    IFrameLoadInfo, IFrameLoadInfoWithData, IFrameSandboxState, IFrameSizeMsg, Job, LoadData,
-    LoadOrigin, MessagePortMsg, NavigationHistoryBehavior, PortMessageTask,
-    ProgressiveWebMetricType, SWManagerMsg, SWManagerSenders, ScriptMsg as FromScriptMsg,
-    ScriptThreadMessage, ScriptToConstellationChan, ServiceWorkerManagerFactory, ServiceWorkerMsg,
-    StructuredSerializedData, UpdatePipelineIdReason,
+    ConstellationInputEvent, DiscardBrowsingContext, DocumentActivity, ProgressiveWebMetricType,
+    ScriptThreadMessage, UpdatePipelineIdReason,
 };
 use serde::{Deserialize, Serialize};
 use servo_config::{opts, pref};
@@ -158,12 +162,11 @@ use style_traits::CSSPixel;
 #[cfg(feature = "webgpu")]
 use webgpu::swapchain::WGPUImageMap;
 #[cfg(feature = "webgpu")]
-use webgpu::{self, WebGPU, WebGPURequest};
+use webgpu_traits::{WebGPU, WebGPURequest};
 #[cfg(feature = "webgpu")]
 use webrender::RenderApi;
 use webrender::RenderApiSender;
 use webrender_api::{DocumentId, ImageKey};
-use webrender_traits::WebrenderExternalImageRegistry;
 
 use crate::browsingcontext::{
     AllBrowsingContextsIterator, BrowsingContext, FullyActiveBrowsingContextsIterator,
@@ -171,11 +174,12 @@ use crate::browsingcontext::{
 };
 use crate::event_loop::EventLoop;
 use crate::pipeline::{InitialPipelineState, Pipeline};
+use crate::process_manager::ProcessManager;
 use crate::serviceworker::ServiceWorkerUnprivilegedContent;
 use crate::session_history::{
     JointSessionHistory, NeedsToReload, SessionHistoryChange, SessionHistoryDiff,
 };
-use crate::webview::WebViewManager;
+use crate::webview_manager::WebViewManager;
 
 type PendingApprovalNavigations = HashMap<PipelineId, (LoadData, NavigationHistoryBehavior)>;
 
@@ -200,9 +204,6 @@ enum TransferState {
     /// While a completion failed, another global requested to complete the transfer.
     /// We are still buffering messages, and awaiting the return of the buffer from the global who failed.
     CompletionRequested(MessagePortRouterId, VecDeque<PortMessageTask>),
-    /// The entangled port has been removed while the port was in-transfer,
-    /// the current port should be removed as well once it is managed again.
-    EntangledRemoved,
 }
 
 #[derive(Debug)]
@@ -284,11 +285,11 @@ pub struct Constellation<STF, SWF> {
 
     /// An IPC channel for script threads to send messages to the constellation.
     /// This is the script threads' view of `script_receiver`.
-    script_sender: IpcSender<(PipelineId, FromScriptMsg)>,
+    script_sender: IpcSender<(PipelineId, ScriptToConstellationMessage)>,
 
     /// A channel for the constellation to receive messages from script threads.
     /// This is the constellation's view of `script_sender`.
-    script_receiver: Receiver<Result<(PipelineId, FromScriptMsg), IpcError>>,
+    script_receiver: Receiver<Result<(PipelineId, ScriptToConstellationMessage), IpcError>>,
 
     /// A handle to register components for hang monitoring.
     /// None when in multiprocess mode.
@@ -313,7 +314,7 @@ pub struct Constellation<STF, SWF> {
     layout_factory: Arc<dyn LayoutFactory>,
 
     /// A channel for the constellation to receive messages from the compositor thread.
-    compositor_receiver: Receiver<FromCompositorMsg>,
+    compositor_receiver: Receiver<EmbedderToConstellationMessage>,
 
     /// A channel through which messages can be sent to the embedder.
     embedder_proxy: EmbedderProxy,
@@ -371,6 +372,7 @@ pub struct Constellation<STF, SWF> {
     mem_profiler_chan: mem::ProfilerChan,
 
     /// A single WebRender document the constellation operates on.
+    #[cfg(feature = "webgpu")]
     webrender_document: DocumentId,
 
     /// Webrender related objects required by WebGPU threads
@@ -415,9 +417,6 @@ pub struct Constellation<STF, SWF> {
     /// and the namespaces are allocated by the constellation.
     next_pipeline_namespace_id: PipelineNamespaceId,
 
-    /// The size of the top-level window.
-    window_size: WindowSizeData,
-
     /// Bits of state used to interact with the webdriver implementation
     webdriver: WebDriverData,
 
@@ -465,9 +464,6 @@ pub struct Constellation<STF, SWF> {
     /// Pipeline ID of the active media session.
     active_media_session: Option<PipelineId>,
 
-    /// User agent string to report in network requests.
-    user_agent: Cow<'static, str>,
-
     /// The image bytes associated with the RippyPNG embedder resource.
     /// Read during startup and provided to image caches that are created
     /// on an as-needed basis, rather than retrieving it every time.
@@ -475,6 +471,9 @@ pub struct Constellation<STF, SWF> {
 
     /// User content manager
     user_content_manager: UserContentManager,
+
+    /// The process manager.
+    process_manager: ProcessManager,
 }
 
 /// State needed to construct a constellation.
@@ -522,9 +521,6 @@ pub struct InitialConstellationState {
     /// The XR device registry
     pub webxr_registry: Option<webxr_api::Registry>,
 
-    /// User agent string to report in network requests.
-    pub user_agent: Cow<'static, str>,
-
     #[cfg(feature = "webgpu")]
     pub wgpu_image_map: WGPUImageMap,
 
@@ -607,13 +603,12 @@ where
     pub fn start(
         state: InitialConstellationState,
         layout_factory: Arc<dyn LayoutFactory>,
-        initial_window_size: WindowSizeData,
         random_pipeline_closure_probability: Option<f32>,
         random_pipeline_closure_seed: Option<usize>,
         hard_fail: bool,
         canvas_create_sender: Sender<ConstellationCanvasMsg>,
         canvas_ipc_sender: IpcSender<CanvasMsg>,
-    ) -> Sender<FromCompositorMsg> {
+    ) -> Sender<EmbedderToConstellationMessage> {
         let (compositor_sender, compositor_receiver) = unbounded();
 
         // service worker manager to communicate with constellation
@@ -718,11 +713,11 @@ where
                     // namespace 0 for the embedder, and 0 for the constellation
                     next_pipeline_namespace_id: PipelineNamespaceId(2),
                     time_profiler_chan: state.time_profiler_chan,
-                    mem_profiler_chan: state.mem_profiler_chan,
-                    window_size: initial_window_size,
+                    mem_profiler_chan: state.mem_profiler_chan.clone(),
                     phantom: PhantomData,
                     webdriver: WebDriverData::new(),
                     document_states: HashMap::new(),
+                    #[cfg(feature = "webgpu")]
                     webrender_document: state.webrender_document,
                     #[cfg(feature = "webgpu")]
                     webrender_wgpu,
@@ -744,9 +739,9 @@ where
                     active_keyboard_modifiers: Modifiers::empty(),
                     hard_fail,
                     active_media_session: None,
-                    user_agent: state.user_agent,
                     rippy_data,
                     user_content_manager: state.user_content_manager,
+                    process_manager: ProcessManager::new(state.mem_profiler_chan),
                 };
 
                 constellation.run();
@@ -884,7 +879,7 @@ where
         webview_id: WebViewId,
         parent_pipeline_id: Option<PipelineId>,
         opener: Option<BrowsingContextId>,
-        initial_window_size: Size2D<f32, CSSPixel>,
+        initial_viewport_details: ViewportDetails,
         // TODO: we have to provide ownership of the LoadData
         // here, because it will be send on an ipc channel,
         // and ipc channels take onership of their data.
@@ -974,21 +969,16 @@ where
             resource_threads,
             time_profiler_chan: self.time_profiler_chan.clone(),
             mem_profiler_chan: self.mem_profiler_chan.clone(),
-            window_size: WindowSizeData {
-                initial_viewport: initial_window_size,
-                device_pixel_ratio: self.window_size.device_pixel_ratio,
-            },
+            viewport_details: initial_viewport_details,
             event_loop,
             load_data,
             prev_throttled: throttled,
-            webrender_document: self.webrender_document,
             webgl_chan: self
                 .webgl_threads
                 .as_ref()
                 .map(|threads| threads.pipeline()),
             webxr_registry: self.webxr_registry.clone(),
             player_context: WindowGLContext::get(),
-            user_agent: self.user_agent.clone(),
             rippy_data: self.rippy_data.clone(),
             user_content_manager: self.user_content_manager.clone(),
         });
@@ -1012,6 +1002,12 @@ where
             );
         }
 
+        if let Some((lifeline_receiver, process)) = pipeline.lifeline {
+            let crossbeam_receiver =
+                route_ipc_receiver_to_new_crossbeam_receiver_preserving_errors(lifeline_receiver);
+            self.process_manager.add(crossbeam_receiver, process);
+        }
+
         assert!(!self.pipelines.contains_key(&pipeline_id));
         self.pipelines.insert(pipeline_id, pipeline.pipeline);
     }
@@ -1048,6 +1044,44 @@ where
         }
     }
 
+    /// Enumerate the specified browsing context's ancestor pipelines up to
+    /// the top-level pipeline.
+    fn ancestor_pipelines_of_browsing_context_iter(
+        &self,
+        browsing_context_id: BrowsingContextId,
+    ) -> impl Iterator<Item = &Pipeline> + '_ {
+        let mut state: Option<PipelineId> = self
+            .browsing_contexts
+            .get(&browsing_context_id)
+            .and_then(|browsing_context| browsing_context.parent_pipeline_id);
+        std::iter::from_fn(move || {
+            if let Some(pipeline_id) = state {
+                let pipeline = self.pipelines.get(&pipeline_id)?;
+                let browsing_context = self.browsing_contexts.get(&pipeline.browsing_context_id)?;
+                state = browsing_context.parent_pipeline_id;
+                Some(pipeline)
+            } else {
+                None
+            }
+        })
+    }
+
+    /// Enumerate the specified browsing context's ancestor-or-self pipelines up
+    /// to the top-level pipeline.
+    fn ancestor_or_self_pipelines_of_browsing_context_iter(
+        &self,
+        browsing_context_id: BrowsingContextId,
+    ) -> impl Iterator<Item = &Pipeline> + '_ {
+        let this_pipeline = self
+            .browsing_contexts
+            .get(&browsing_context_id)
+            .map(|browsing_context| browsing_context.pipeline_id)
+            .and_then(|pipeline_id| self.pipelines.get(&pipeline_id));
+        this_pipeline
+            .into_iter()
+            .chain(self.ancestor_pipelines_of_browsing_context_iter(browsing_context_id))
+    }
+
     /// Create a new browsing context and update the internal bookkeeping.
     #[allow(clippy::too_many_arguments)]
     fn new_browsing_context(
@@ -1056,7 +1090,7 @@ where
         top_level_id: WebViewId,
         pipeline_id: PipelineId,
         parent_pipeline_id: Option<PipelineId>,
-        size: Size2D<f32, CSSPixel>,
+        viewport_details: ViewportDetails,
         is_private: bool,
         inherited_secure_context: Option<bool>,
         throttled: bool,
@@ -1089,7 +1123,7 @@ where
             top_level_id,
             pipeline_id,
             parent_pipeline_id,
-            size,
+            viewport_details,
             is_private,
             inherited_secure_context,
             throttled,
@@ -1126,10 +1160,11 @@ where
         #[derive(Debug)]
         enum Request {
             PipelineNamespace(PipelineNamespaceRequest),
-            Script((PipelineId, FromScriptMsg)),
+            Script((PipelineId, ScriptToConstellationMessage)),
             BackgroundHangMonitor(HangMonitorAlert),
-            Compositor(FromCompositorMsg),
+            Compositor(EmbedderToConstellationMessage),
             FromSWManager(SWManagerMsg),
+            RemoveProcess(usize),
         }
         // Get one incoming request.
         // This is one of the few places where the compositor is
@@ -1142,26 +1177,49 @@ where
         // produces undefined behaviour, resulting in the destructor
         // being called. If this happens, there's not much we can do
         // other than panic.
+        let mut sel = Select::new();
+        sel.recv(&self.namespace_receiver);
+        sel.recv(&self.script_receiver);
+        sel.recv(&self.background_hang_monitor_receiver);
+        sel.recv(&self.compositor_receiver);
+        sel.recv(&self.swmanager_receiver);
+
+        self.process_manager.register(&mut sel);
+
         let request = {
+            let oper = sel.select();
+            let index = oper.index();
+
             #[cfg(feature = "tracing")]
             let _span =
                 tracing::trace_span!("handle_request::select", servo_profiling = true).entered();
-            select! {
-                recv(self.namespace_receiver) -> msg => {
-                    msg.expect("Unexpected script channel panic in constellation").map(Request::PipelineNamespace)
-                }
-                recv(self.script_receiver) -> msg => {
-                    msg.expect("Unexpected script channel panic in constellation").map(Request::Script)
-                }
-                recv(self.background_hang_monitor_receiver) -> msg => {
-                    msg.expect("Unexpected BHM channel panic in constellation").map(Request::BackgroundHangMonitor)
-                }
-                recv(self.compositor_receiver) -> msg => {
-                    Ok(Request::Compositor(msg.expect("Unexpected compositor channel panic in constellation")))
-                }
-                recv(self.swmanager_receiver) -> msg => {
-                    msg.expect("Unexpected SW channel panic in constellation").map(Request::FromSWManager)
-                }
+            match index {
+                0 => oper
+                    .recv(&self.namespace_receiver)
+                    .expect("Unexpected script channel panic in constellation")
+                    .map(Request::PipelineNamespace),
+                1 => oper
+                    .recv(&self.script_receiver)
+                    .expect("Unexpected script channel panic in constellation")
+                    .map(Request::Script),
+                2 => oper
+                    .recv(&self.background_hang_monitor_receiver)
+                    .expect("Unexpected BHM channel panic in constellation")
+                    .map(Request::BackgroundHangMonitor),
+                3 => Ok(Request::Compositor(
+                    oper.recv(&self.compositor_receiver)
+                        .expect("Unexpected compositor channel panic in constellation"),
+                )),
+                4 => oper
+                    .recv(&self.swmanager_receiver)
+                    .expect("Unexpected SW channel panic in constellation")
+                    .map(Request::FromSWManager),
+                _ => {
+                    // This can only be a error reading on a closed lifeline receiver.
+                    let process_index = index - 5;
+                    let _ = oper.recv(self.process_manager.receiver_at(process_index));
+                    Ok(Request::RemoveProcess(process_index))
+                },
             }
         };
 
@@ -1184,6 +1242,7 @@ where
             Request::FromSWManager(message) => {
                 self.handle_request_from_swmanager(message);
             },
+            Request::RemoveProcess(index) => self.process_manager.remove(index),
         }
     }
 
@@ -1226,19 +1285,27 @@ where
         feature = "tracing",
         tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
     )]
-    fn handle_request_from_compositor(&mut self, message: FromCompositorMsg) {
+    fn handle_request_from_compositor(&mut self, message: EmbedderToConstellationMessage) {
         trace_msg_from_compositor!(message, "{message:?}");
         match message {
-            FromCompositorMsg::Exit => {
+            EmbedderToConstellationMessage::Exit => {
                 self.handle_exit();
             },
-            FromCompositorMsg::GetFocusTopLevelBrowsingContext(resp_chan) => {
-                let _ = resp_chan.send(self.webviews.focused_webview().map(|(id, _)| id));
+            EmbedderToConstellationMessage::GetFocusTopLevelBrowsingContext(resp_chan) => {
+                let focused_context = self
+                    .webviews
+                    .focused_webview()
+                    .filter(|(_, webview)| {
+                        self.browsing_contexts
+                            .contains_key(&webview.focused_browsing_context_id)
+                    })
+                    .map(|(id, _)| id);
+                let _ = resp_chan.send(focused_context);
             },
             // Perform a navigation previously requested by script, if approved by the embedder.
             // If there is already a pending page (self.pending_changes), it will not be overridden;
             // However, if the id is not encompassed by another change, it will be.
-            FromCompositorMsg::AllowNavigationResponse(pipeline_id, allowed) => {
+            EmbedderToConstellationMessage::AllowNavigationResponse(pipeline_id, allowed) => {
                 let pending = self.pending_approval_navigations.remove(&pipeline_id);
 
                 let webview_id = match self.pipelines.get(&pipeline_id) {
@@ -1285,14 +1352,14 @@ where
                     },
                 }
             },
-            FromCompositorMsg::ClearCache => {
+            EmbedderToConstellationMessage::ClearCache => {
                 self.public_resource_threads.clear_cache();
                 self.private_resource_threads.clear_cache();
             },
             // Load a new page from a typed url
             // If there is already a pending page (self.pending_changes), it will not be overridden;
             // However, if the id is not encompassed by another change, it will be.
-            FromCompositorMsg::LoadUrl(webview_id, url) => {
+            EmbedderToConstellationMessage::LoadUrl(webview_id, url) => {
                 let load_data = LoadData::new(
                     LoadOrigin::Constellation,
                     url,
@@ -1301,6 +1368,7 @@ where
                     ReferrerPolicy::EmptyString,
                     None,
                     None,
+                    false,
                 );
                 let ctx_id = BrowsingContextId::from(webview_id);
                 let pipeline_id = match self.browsing_contexts.get(&ctx_id) {
@@ -1318,7 +1386,7 @@ where
                     NavigationHistoryBehavior::Push,
                 );
             },
-            FromCompositorMsg::IsReadyToSaveImage(pipeline_states) => {
+            EmbedderToConstellationMessage::IsReadyToSaveImage(pipeline_states) => {
                 let is_ready = self.handle_is_ready_to_save_image(pipeline_states);
                 debug!("Ready to save image {:?}.", is_ready);
                 self.compositor_proxy
@@ -1328,57 +1396,65 @@ where
             },
             // Create a new top level browsing context. Will use response_chan to return
             // the browsing context id.
-            FromCompositorMsg::NewWebView(url, webview_id) => {
-                self.handle_new_top_level_browsing_context(url, webview_id, None);
+            EmbedderToConstellationMessage::NewWebView(url, webview_id, viewport_details) => {
+                self.handle_new_top_level_browsing_context(url, webview_id, viewport_details, None);
             },
             // Close a top level browsing context.
-            FromCompositorMsg::CloseWebView(webview_id) => {
+            EmbedderToConstellationMessage::CloseWebView(webview_id) => {
                 self.handle_close_top_level_browsing_context(webview_id);
             },
             // Panic a top level browsing context.
-            FromCompositorMsg::SendError(webview_id, error) => {
+            EmbedderToConstellationMessage::SendError(webview_id, error) => {
                 debug!("constellation got SendError message");
                 if webview_id.is_none() {
                     warn!("constellation got a SendError message without top level id");
                 }
                 self.handle_panic(webview_id, error, None);
             },
-            FromCompositorMsg::FocusWebView(webview_id) => {
+            EmbedderToConstellationMessage::FocusWebView(webview_id) => {
                 self.handle_focus_web_view(webview_id);
             },
-            FromCompositorMsg::BlurWebView => {
+            EmbedderToConstellationMessage::BlurWebView => {
                 self.webviews.unfocus();
                 self.embedder_proxy.send(EmbedderMsg::WebViewBlurred);
             },
             // Handle a forward or back request
-            FromCompositorMsg::TraverseHistory(webview_id, direction) => {
+            EmbedderToConstellationMessage::TraverseHistory(webview_id, direction) => {
                 self.handle_traverse_history_msg(webview_id, direction);
             },
-            FromCompositorMsg::WindowSize(webview_id, new_size, size_type) => {
-                self.handle_window_size_msg(webview_id, new_size, size_type);
+            EmbedderToConstellationMessage::ChangeViewportDetails(
+                webview_id,
+                new_viewport_details,
+                size_type,
+            ) => {
+                self.handle_change_viewport_details_msg(
+                    webview_id,
+                    new_viewport_details,
+                    size_type,
+                );
             },
-            FromCompositorMsg::ThemeChange(theme) => {
+            EmbedderToConstellationMessage::ThemeChange(theme) => {
                 self.handle_theme_change(theme);
             },
-            FromCompositorMsg::TickAnimation(pipeline_id, tick_type) => {
-                self.handle_tick_animation(pipeline_id, tick_type)
+            EmbedderToConstellationMessage::TickAnimation(webview_ids) => {
+                self.handle_tick_animation(webview_ids)
             },
-            FromCompositorMsg::WebDriverCommand(command) => {
+            EmbedderToConstellationMessage::WebDriverCommand(command) => {
                 self.handle_webdriver_msg(command);
             },
-            FromCompositorMsg::Reload(webview_id) => {
+            EmbedderToConstellationMessage::Reload(webview_id) => {
                 self.handle_reload_msg(webview_id);
             },
-            FromCompositorMsg::LogEntry(webview_id, thread_name, entry) => {
+            EmbedderToConstellationMessage::LogEntry(webview_id, thread_name, entry) => {
                 self.handle_log_entry(webview_id, thread_name, entry);
             },
-            FromCompositorMsg::ForwardInputEvent(webview_id, event, hit_test) => {
+            EmbedderToConstellationMessage::ForwardInputEvent(webview_id, event, hit_test) => {
                 self.forward_input_event(webview_id, event, hit_test);
             },
-            FromCompositorMsg::SetCursor(webview_id, cursor) => {
+            EmbedderToConstellationMessage::SetCursor(webview_id, cursor) => {
                 self.handle_set_cursor_msg(webview_id, cursor)
             },
-            FromCompositorMsg::ToggleProfiler(rate, max_duration) => {
+            EmbedderToConstellationMessage::ToggleProfiler(rate, max_duration) => {
                 for background_monitor_control_sender in &self.background_monitor_control_senders {
                     if let Err(e) = background_monitor_control_sender.send(
                         BackgroundHangMonitorControlMsg::ToggleSampler(rate, max_duration),
@@ -1387,21 +1463,28 @@ where
                     }
                 }
             },
-            FromCompositorMsg::ExitFullScreen(webview_id) => {
+            EmbedderToConstellationMessage::ExitFullScreen(webview_id) => {
                 self.handle_exit_fullscreen_msg(webview_id);
             },
-            FromCompositorMsg::MediaSessionAction(action) => {
+            EmbedderToConstellationMessage::MediaSessionAction(action) => {
                 self.handle_media_session_action_msg(action);
             },
-            FromCompositorMsg::SetWebViewThrottled(webview_id, throttled) => {
+            EmbedderToConstellationMessage::SetWebViewThrottled(webview_id, throttled) => {
                 self.set_webview_throttled(webview_id, throttled);
             },
-            FromCompositorMsg::SetScrollStates(pipeline_id, scroll_states) => {
+            EmbedderToConstellationMessage::SetScrollStates(pipeline_id, scroll_states) => {
                 self.handle_set_scroll_states(pipeline_id, scroll_states)
             },
-            FromCompositorMsg::PaintMetric(pipeline_id, paint_metric_event) => {
+            EmbedderToConstellationMessage::PaintMetric(pipeline_id, paint_metric_event) => {
                 self.handle_paint_metric(pipeline_id, paint_metric_event);
             },
+            EmbedderToConstellationMessage::EvaluateJavaScript(
+                webview_id,
+                evaluation_id,
+                script,
+            ) => {
+                self.handle_evaluate_javascript(webview_id, evaluation_id, script);
+            },
         }
     }
 
@@ -1409,7 +1492,46 @@ where
         feature = "tracing",
         tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
     )]
-    fn handle_request_from_script(&mut self, message: (PipelineId, FromScriptMsg)) {
+    fn handle_evaluate_javascript(
+        &mut self,
+        webview_id: WebViewId,
+        evaluation_id: JavaScriptEvaluationId,
+        script: String,
+    ) {
+        let browsing_context_id = BrowsingContextId::from(webview_id);
+        let Some(pipeline) = self
+            .browsing_contexts
+            .get(&browsing_context_id)
+            .and_then(|browsing_context| self.pipelines.get(&browsing_context.pipeline_id))
+        else {
+            self.handle_finish_javascript_evaluation(
+                evaluation_id,
+                Err(JavaScriptEvaluationError::InternalError),
+            );
+            return;
+        };
+
+        if pipeline
+            .event_loop
+            .send(ScriptThreadMessage::EvaluateJavaScript(
+                pipeline.id,
+                evaluation_id,
+                script,
+            ))
+            .is_err()
+        {
+            self.handle_finish_javascript_evaluation(
+                evaluation_id,
+                Err(JavaScriptEvaluationError::InternalError),
+            );
+        }
+    }
+
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn handle_request_from_script(&mut self, message: (PipelineId, ScriptToConstellationMessage)) {
         let (source_pipeline_id, content) = message;
         trace_script_msg!(content, "{source_pipeline_id}: {content:?}");
 
@@ -1423,35 +1545,43 @@ where
         };
 
         match content {
-            FromScriptMsg::CompleteMessagePortTransfer(router_id, ports) => {
+            ScriptToConstellationMessage::CompleteMessagePortTransfer(router_id, ports) => {
                 self.handle_complete_message_port_transfer(router_id, ports);
             },
-            FromScriptMsg::MessagePortTransferResult(router_id, succeeded, failed) => {
+            ScriptToConstellationMessage::MessagePortTransferResult(
+                router_id,
+                succeeded,
+                failed,
+            ) => {
                 self.handle_message_port_transfer_completed(router_id, succeeded);
                 self.handle_message_port_transfer_failed(failed);
             },
-            FromScriptMsg::RerouteMessagePort(port_id, task) => {
+            ScriptToConstellationMessage::RerouteMessagePort(port_id, task) => {
                 self.handle_reroute_messageport(port_id, task);
             },
-            FromScriptMsg::MessagePortShipped(port_id) => {
+            ScriptToConstellationMessage::MessagePortShipped(port_id) => {
                 self.handle_messageport_shipped(port_id);
             },
-            FromScriptMsg::NewMessagePortRouter(router_id, ipc_sender) => {
+            ScriptToConstellationMessage::NewMessagePortRouter(router_id, ipc_sender) => {
                 self.handle_new_messageport_router(router_id, ipc_sender);
             },
-            FromScriptMsg::RemoveMessagePortRouter(router_id) => {
+            ScriptToConstellationMessage::RemoveMessagePortRouter(router_id) => {
                 self.handle_remove_messageport_router(router_id);
             },
-            FromScriptMsg::NewMessagePort(router_id, port_id) => {
+            ScriptToConstellationMessage::NewMessagePort(router_id, port_id) => {
                 self.handle_new_messageport(router_id, port_id);
             },
-            FromScriptMsg::RemoveMessagePort(port_id) => {
-                self.handle_remove_messageport(port_id);
-            },
-            FromScriptMsg::EntanglePorts(port1, port2) => {
+            ScriptToConstellationMessage::EntanglePorts(port1, port2) => {
                 self.handle_entangle_messageports(port1, port2);
             },
-            FromScriptMsg::NewBroadcastChannelRouter(router_id, response_sender, origin) => {
+            ScriptToConstellationMessage::DisentanglePorts(port1, port2) => {
+                self.handle_disentangle_messageports(port1, port2);
+            },
+            ScriptToConstellationMessage::NewBroadcastChannelRouter(
+                router_id,
+                response_sender,
+                origin,
+            ) => {
                 self.handle_new_broadcast_channel_router(
                     source_pipeline_id,
                     router_id,
@@ -1459,7 +1589,11 @@ where
                     origin,
                 );
             },
-            FromScriptMsg::NewBroadcastChannelNameInRouter(router_id, channel_name, origin) => {
+            ScriptToConstellationMessage::NewBroadcastChannelNameInRouter(
+                router_id,
+                channel_name,
+                origin,
+            ) => {
                 self.handle_new_broadcast_channel_name_in_router(
                     source_pipeline_id,
                     router_id,
@@ -1467,7 +1601,11 @@ where
                     origin,
                 );
             },
-            FromScriptMsg::RemoveBroadcastChannelNameInRouter(router_id, channel_name, origin) => {
+            ScriptToConstellationMessage::RemoveBroadcastChannelNameInRouter(
+                router_id,
+                channel_name,
+                origin,
+            ) => {
                 self.handle_remove_broadcast_channel_name_in_router(
                     source_pipeline_id,
                     router_id,
@@ -1475,38 +1613,38 @@ where
                     origin,
                 );
             },
-            FromScriptMsg::RemoveBroadcastChannelRouter(router_id, origin) => {
+            ScriptToConstellationMessage::RemoveBroadcastChannelRouter(router_id, origin) => {
                 self.handle_remove_broadcast_channel_router(source_pipeline_id, router_id, origin);
             },
-            FromScriptMsg::ScheduleBroadcast(router_id, message) => {
+            ScriptToConstellationMessage::ScheduleBroadcast(router_id, message) => {
                 self.handle_schedule_broadcast(source_pipeline_id, router_id, message);
             },
-            FromScriptMsg::ForwardToEmbedder(embedder_msg) => {
+            ScriptToConstellationMessage::ForwardToEmbedder(embedder_msg) => {
                 self.embedder_proxy.send(embedder_msg);
             },
-            FromScriptMsg::PipelineExited => {
+            ScriptToConstellationMessage::PipelineExited => {
                 self.handle_pipeline_exited(source_pipeline_id);
             },
-            FromScriptMsg::DiscardDocument => {
+            ScriptToConstellationMessage::DiscardDocument => {
                 self.handle_discard_document(webview_id, source_pipeline_id);
             },
-            FromScriptMsg::DiscardTopLevelBrowsingContext => {
+            ScriptToConstellationMessage::DiscardTopLevelBrowsingContext => {
                 self.handle_close_top_level_browsing_context(webview_id);
             },
-            FromScriptMsg::ScriptLoadedURLInIFrame(load_info) => {
+            ScriptToConstellationMessage::ScriptLoadedURLInIFrame(load_info) => {
                 self.handle_script_loaded_url_in_iframe_msg(load_info);
             },
-            FromScriptMsg::ScriptNewIFrame(load_info) => {
+            ScriptToConstellationMessage::ScriptNewIFrame(load_info) => {
                 self.handle_script_new_iframe(load_info);
             },
-            FromScriptMsg::CreateAuxiliaryWebView(load_info) => {
+            ScriptToConstellationMessage::CreateAuxiliaryWebView(load_info) => {
                 self.handle_script_new_auxiliary(load_info);
             },
-            FromScriptMsg::ChangeRunningAnimationsState(animation_state) => {
+            ScriptToConstellationMessage::ChangeRunningAnimationsState(animation_state) => {
                 self.handle_change_running_animations_state(source_pipeline_id, animation_state)
             },
             // Ask the embedder for permission to load a new page.
-            FromScriptMsg::LoadUrl(load_data, history_handling) => {
+            ScriptToConstellationMessage::LoadUrl(load_data, history_handling) => {
                 self.schedule_navigation(
                     webview_id,
                     source_pipeline_id,
@@ -1514,38 +1652,38 @@ where
                     history_handling,
                 );
             },
-            FromScriptMsg::AbortLoadUrl => {
+            ScriptToConstellationMessage::AbortLoadUrl => {
                 self.handle_abort_load_url_msg(source_pipeline_id);
             },
             // A page loaded has completed all parsing, script, and reflow messages have been sent.
-            FromScriptMsg::LoadComplete => {
+            ScriptToConstellationMessage::LoadComplete => {
                 self.handle_load_complete_msg(webview_id, source_pipeline_id)
             },
             // Handle navigating to a fragment
-            FromScriptMsg::NavigatedToFragment(new_url, replacement_enabled) => {
+            ScriptToConstellationMessage::NavigatedToFragment(new_url, replacement_enabled) => {
                 self.handle_navigated_to_fragment(source_pipeline_id, new_url, replacement_enabled);
             },
             // Handle a forward or back request
-            FromScriptMsg::TraverseHistory(direction) => {
+            ScriptToConstellationMessage::TraverseHistory(direction) => {
                 self.handle_traverse_history_msg(webview_id, direction);
             },
             // Handle a push history state request.
-            FromScriptMsg::PushHistoryState(history_state_id, url) => {
+            ScriptToConstellationMessage::PushHistoryState(history_state_id, url) => {
                 self.handle_push_history_state_msg(source_pipeline_id, history_state_id, url);
             },
-            FromScriptMsg::ReplaceHistoryState(history_state_id, url) => {
+            ScriptToConstellationMessage::ReplaceHistoryState(history_state_id, url) => {
                 self.handle_replace_history_state_msg(source_pipeline_id, history_state_id, url);
             },
             // Handle a joint session history length request.
-            FromScriptMsg::JointSessionHistoryLength(response_sender) => {
+            ScriptToConstellationMessage::JointSessionHistoryLength(response_sender) => {
                 self.handle_joint_session_history_length(webview_id, response_sender);
             },
             // Notification that the new document is ready to become active
-            FromScriptMsg::ActivateDocument => {
+            ScriptToConstellationMessage::ActivateDocument => {
                 self.handle_activate_document_msg(source_pipeline_id);
             },
             // Update pipeline url after redirections
-            FromScriptMsg::SetFinalUrl(final_url) => {
+            ScriptToConstellationMessage::SetFinalUrl(final_url) => {
                 // The script may have finished loading after we already started shutting down.
                 if let Some(ref mut pipeline) = self.pipelines.get_mut(&source_pipeline_id) {
                     pipeline.url = final_url;
@@ -1553,7 +1691,7 @@ where
                     warn!("constellation got set final url message for dead pipeline");
                 }
             },
-            FromScriptMsg::PostMessage {
+            ScriptToConstellationMessage::PostMessage {
                 target: browsing_context_id,
                 source: source_pipeline_id,
                 target_origin: origin,
@@ -1568,38 +1706,45 @@ where
                     data,
                 );
             },
-            FromScriptMsg::Focus => {
-                self.handle_focus_msg(source_pipeline_id);
+            ScriptToConstellationMessage::Focus(focused_child_browsing_context_id, sequence) => {
+                self.handle_focus_msg(
+                    source_pipeline_id,
+                    focused_child_browsing_context_id,
+                    sequence,
+                );
             },
-            FromScriptMsg::SetThrottledComplete(throttled) => {
+            ScriptToConstellationMessage::FocusRemoteDocument(focused_browsing_context_id) => {
+                self.handle_focus_remote_document_msg(focused_browsing_context_id);
+            },
+            ScriptToConstellationMessage::SetThrottledComplete(throttled) => {
                 self.handle_set_throttled_complete(source_pipeline_id, throttled);
             },
-            FromScriptMsg::RemoveIFrame(browsing_context_id, response_sender) => {
+            ScriptToConstellationMessage::RemoveIFrame(browsing_context_id, response_sender) => {
                 let removed_pipeline_ids = self.handle_remove_iframe_msg(browsing_context_id);
                 if let Err(e) = response_sender.send(removed_pipeline_ids) {
                     warn!("Error replying to remove iframe ({})", e);
                 }
             },
-            FromScriptMsg::CreateCanvasPaintThread(size, response_sender) => {
+            ScriptToConstellationMessage::CreateCanvasPaintThread(size, response_sender) => {
                 self.handle_create_canvas_paint_thread_msg(size, response_sender)
             },
-            FromScriptMsg::SetDocumentState(state) => {
+            ScriptToConstellationMessage::SetDocumentState(state) => {
                 self.document_states.insert(source_pipeline_id, state);
             },
-            FromScriptMsg::SetLayoutEpoch(epoch, response_sender) => {
+            ScriptToConstellationMessage::SetLayoutEpoch(epoch, response_sender) => {
                 if let Some(pipeline) = self.pipelines.get_mut(&source_pipeline_id) {
                     pipeline.layout_epoch = epoch;
                 }
 
                 response_sender.send(true).unwrap_or_default();
             },
-            FromScriptMsg::LogEntry(thread_name, entry) => {
+            ScriptToConstellationMessage::LogEntry(thread_name, entry) => {
                 self.handle_log_entry(Some(webview_id), thread_name, entry);
             },
-            FromScriptMsg::TouchEventProcessed(result) => self
+            ScriptToConstellationMessage::TouchEventProcessed(result) => self
                 .compositor_proxy
                 .send(CompositorMsg::TouchEventProcessed(webview_id, result)),
-            FromScriptMsg::GetBrowsingContextInfo(pipeline_id, response_sender) => {
+            ScriptToConstellationMessage::GetBrowsingContextInfo(pipeline_id, response_sender) => {
                 let result = self
                     .pipelines
                     .get(&pipeline_id)
@@ -1612,7 +1757,10 @@ where
                     );
                 }
             },
-            FromScriptMsg::GetTopForBrowsingContext(browsing_context_id, response_sender) => {
+            ScriptToConstellationMessage::GetTopForBrowsingContext(
+                browsing_context_id,
+                response_sender,
+            ) => {
                 let result = self
                     .browsing_contexts
                     .get(&browsing_context_id)
@@ -1624,7 +1772,7 @@ where
                     );
                 }
             },
-            FromScriptMsg::GetChildBrowsingContextId(
+            ScriptToConstellationMessage::GetChildBrowsingContextId(
                 browsing_context_id,
                 index,
                 response_sender,
@@ -1642,17 +1790,23 @@ where
                     );
                 }
             },
-            FromScriptMsg::ScheduleJob(job) => {
+            ScriptToConstellationMessage::ScheduleJob(job) => {
                 self.handle_schedule_serviceworker_job(source_pipeline_id, job);
             },
-            FromScriptMsg::ForwardDOMMessage(msg_vec, scope_url) => {
+            ScriptToConstellationMessage::ForwardDOMMessage(msg_vec, scope_url) => {
                 if let Some(mgr) = self.sw_managers.get(&scope_url.origin()) {
                     let _ = mgr.send(ServiceWorkerMsg::ForwardDOMMessage(msg_vec, scope_url));
                 } else {
                     warn!("Unable to forward DOMMessage for postMessage call");
                 }
             },
-            FromScriptMsg::BroadcastStorageEvent(storage, url, key, old_value, new_value) => {
+            ScriptToConstellationMessage::BroadcastStorageEvent(
+                storage,
+                url,
+                key,
+                old_value,
+                new_value,
+            ) => {
                 self.handle_broadcast_storage_event(
                     source_pipeline_id,
                     storage,
@@ -1662,7 +1816,7 @@ where
                     new_value,
                 );
             },
-            FromScriptMsg::MediaSessionEvent(pipeline_id, event) => {
+            ScriptToConstellationMessage::MediaSessionEvent(pipeline_id, event) => {
                 // Unlikely at this point, but we may receive events coming from
                 // different media sessions, so we set the active media session based
                 // on Playing events.
@@ -1684,29 +1838,35 @@ where
                     .send(EmbedderMsg::MediaSessionEvent(webview_id, event));
             },
             #[cfg(feature = "webgpu")]
-            FromScriptMsg::RequestAdapter(response_sender, options, ids) => self
+            ScriptToConstellationMessage::RequestAdapter(response_sender, options, ids) => self
                 .handle_wgpu_request(
                     source_pipeline_id,
                     BrowsingContextId::from(webview_id),
-                    FromScriptMsg::RequestAdapter(response_sender, options, ids),
+                    ScriptToConstellationMessage::RequestAdapter(response_sender, options, ids),
                 ),
             #[cfg(feature = "webgpu")]
-            FromScriptMsg::GetWebGPUChan(response_sender) => self.handle_wgpu_request(
-                source_pipeline_id,
-                BrowsingContextId::from(webview_id),
-                FromScriptMsg::GetWebGPUChan(response_sender),
-            ),
-            FromScriptMsg::TitleChanged(pipeline, title) => {
+            ScriptToConstellationMessage::GetWebGPUChan(response_sender) => self
+                .handle_wgpu_request(
+                    source_pipeline_id,
+                    BrowsingContextId::from(webview_id),
+                    ScriptToConstellationMessage::GetWebGPUChan(response_sender),
+                ),
+            ScriptToConstellationMessage::TitleChanged(pipeline, title) => {
                 if let Some(pipeline) = self.pipelines.get_mut(&pipeline) {
                     pipeline.title = title;
                 }
             },
-            FromScriptMsg::IFrameSizes(iframe_sizes) => self.handle_iframe_size_msg(iframe_sizes),
-            FromScriptMsg::ReportMemory(sender) => {
+            ScriptToConstellationMessage::IFrameSizes(iframe_sizes) => {
+                self.handle_iframe_size_msg(iframe_sizes)
+            },
+            ScriptToConstellationMessage::ReportMemory(sender) => {
                 // get memory report and send it back.
                 self.mem_profiler_chan
                     .send(mem::ProfilerMsg::Report(sender));
             },
+            ScriptToConstellationMessage::FinishJavaScriptEvaluation(evaluation_id, result) => {
+                self.handle_finish_javascript_evaluation(evaluation_id, result)
+            },
         }
     }
 
@@ -1900,8 +2060,10 @@ where
         &mut self,
         source_pipeline_id: PipelineId,
         browsing_context_id: BrowsingContextId,
-        request: FromScriptMsg,
+        request: ScriptToConstellationMessage,
     ) {
+        use webgpu::start_webgpu_thread;
+
         let browsing_context_group_id = match self.browsing_contexts.get(&browsing_context_id) {
             Some(bc) => &bc.bc_group_id,
             None => return warn!("Browsing context not found"),
@@ -1923,7 +2085,7 @@ where
             return warn!("Browsing context group not found");
         };
         let webgpu_chan = match browsing_context_group.webgpus.entry(host) {
-            Entry::Vacant(v) => WebGPU::new(
+            Entry::Vacant(v) => start_webgpu_thread(
                 self.webrender_wgpu.webrender_api.create_sender(),
                 self.webrender_document,
                 self.webrender_wgpu.webrender_external_images.clone(),
@@ -1942,7 +2104,7 @@ where
             Entry::Occupied(o) => Some(o.get().clone()),
         };
         match request {
-            FromScriptMsg::RequestAdapter(response_sender, options, adapter_id) => {
+            ScriptToConstellationMessage::RequestAdapter(response_sender, options, adapter_id) => {
                 match webgpu_chan {
                     None => {
                         if let Err(e) = response_sender.send(None) {
@@ -1961,7 +2123,7 @@ where
                     },
                 }
             },
-            FromScriptMsg::GetWebGPUChan(response_sender) => {
+            ScriptToConstellationMessage::GetWebGPUChan(response_sender) => {
                 if response_sender.send(webgpu_chan).is_err() {
                     warn!(
                         "{}: Failed to send WebGPU channel to pipeline",
@@ -2005,17 +2167,6 @@ where
                 Entry::Occupied(entry) => entry,
             };
             match entry.get().state {
-                TransferState::EntangledRemoved => {
-                    // If the entangled port has been removed while this one was in-transfer,
-                    // remove it now.
-                    if let Some(ipc_sender) = self.message_port_routers.get(&router_id) {
-                        let _ = ipc_sender.send(MessagePortMsg::RemoveMessagePort(port_id));
-                    } else {
-                        warn!("No message-port sender for {:?}", router_id);
-                    }
-                    entry.remove_entry();
-                    continue;
-                },
                 TransferState::CompletionInProgress(expected_router_id) => {
                     // Here, the transfer was normally completed.
 
@@ -2039,9 +2190,9 @@ where
 
     fn handle_message_port_transfer_failed(
         &mut self,
-        ports: HashMap<MessagePortId, VecDeque<PortMessageTask>>,
+        ports: HashMap<MessagePortId, PortTransferInfo>,
     ) {
-        for (port_id, mut previous_buffer) in ports.into_iter() {
+        for (port_id, mut transfer_info) in ports.into_iter() {
             let entry = match self.message_ports.remove(&port_id) {
                 None => {
                     warn!(
@@ -2053,11 +2204,6 @@ where
                 Some(entry) => entry,
             };
             let new_info = match entry.state {
-                TransferState::EntangledRemoved => {
-                    // If the entangled port has been removed while this one was in-transfer,
-                    // just drop it.
-                    continue;
-                },
                 TransferState::CompletionFailed(mut current_buffer) => {
                     // The transfer failed,
                     // and now the global has returned us the buffer we previously sent.
@@ -2065,7 +2211,7 @@ where
 
                     // Tasks in the previous buffer are older,
                     // hence need to be added to the front of the current one.
-                    while let Some(task) = previous_buffer.pop_back() {
+                    while let Some(task) = transfer_info.port_message_queue.pop_back() {
                         current_buffer.push_front(task);
                     }
                     // Update the state to transfer-in-progress.
@@ -2084,7 +2230,7 @@ where
 
                     // Tasks in the previous buffer are older,
                     // hence need to be added to the front of the current one.
-                    while let Some(task) = previous_buffer.pop_back() {
+                    while let Some(task) = transfer_info.port_message_queue.pop_back() {
                         current_buffer.push_front(task);
                     }
                     // Forward the buffered message-queue to complete the current transfer.
@@ -2092,7 +2238,10 @@ where
                         if ipc_sender
                             .send(MessagePortMsg::CompletePendingTransfer(
                                 port_id,
-                                current_buffer,
+                                PortTransferInfo {
+                                    port_message_queue: current_buffer,
+                                    disentangled: entry.entangled_with.is_none(),
+                                },
                             ))
                             .is_err()
                         {
@@ -2139,18 +2288,14 @@ where
                 Some(entry) => entry,
             };
             let new_info = match entry.state {
-                TransferState::EntangledRemoved => {
-                    // If the entangled port has been removed while this one was in-transfer,
-                    // remove it now.
-                    if let Some(ipc_sender) = self.message_port_routers.get(&router_id) {
-                        let _ = ipc_sender.send(MessagePortMsg::RemoveMessagePort(port_id));
-                    } else {
-                        warn!("No message-port sender for {:?}", router_id);
-                    }
-                    continue;
-                },
                 TransferState::TransferInProgress(buffer) => {
-                    response.insert(port_id, buffer);
+                    response.insert(
+                        port_id,
+                        PortTransferInfo {
+                            port_message_queue: buffer,
+                            disentangled: entry.entangled_with.is_none(),
+                        },
+                    );
 
                     // If the port was in transfer, and a global is requesting completion,
                     // we note the start of the completion.
@@ -2229,10 +2374,6 @@ where
             TransferState::TransferInProgress(queue) => queue.push_back(task),
             TransferState::CompletionFailed(queue) => queue.push_back(task),
             TransferState::CompletionRequested(_, queue) => queue.push_back(task),
-            TransferState::EntangledRemoved => warn!(
-                "Messageport received a message, but entangled has alread been removed {:?}",
-                port_id
-            ),
         }
     }
 
@@ -2294,59 +2435,6 @@ where
         }
     }
 
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn handle_remove_messageport(&mut self, port_id: MessagePortId) {
-        let entangled = match self.message_ports.remove(&port_id) {
-            Some(info) => info.entangled_with,
-            None => {
-                return warn!(
-                    "Constellation asked to remove unknown messageport {:?}",
-                    port_id
-                );
-            },
-        };
-        let entangled_id = match entangled {
-            Some(id) => id,
-            None => return,
-        };
-        let info = match self.message_ports.get_mut(&entangled_id) {
-            Some(info) => info,
-            None => {
-                return warn!(
-                    "Constellation asked to remove unknown entangled messageport {:?}",
-                    entangled_id
-                );
-            },
-        };
-        let router_id = match info.state {
-            TransferState::EntangledRemoved => {
-                return warn!(
-                    "Constellation asked to remove entangled messageport by a port that was already removed {:?}",
-                    port_id
-                );
-            },
-            TransferState::TransferInProgress(_) |
-            TransferState::CompletionInProgress(_) |
-            TransferState::CompletionFailed(_) |
-            TransferState::CompletionRequested(_, _) => {
-                // Note: since the port is in-transer, we don't have a router to send it a message
-                // to let it know that its entangled port has been removed.
-                // Hence we mark it so that it will be messaged and removed once the transfer completes.
-                info.state = TransferState::EntangledRemoved;
-                return;
-            },
-            TransferState::Managed(router_id) => router_id,
-        };
-        if let Some(sender) = self.message_port_routers.get(&router_id) {
-            let _ = sender.send(MessagePortMsg::RemoveMessagePort(entangled_id));
-        } else {
-            warn!("No message-port sender for {:?}", router_id);
-        }
-    }
-
     #[cfg_attr(
         feature = "tracing",
         tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
@@ -2370,6 +2458,57 @@ where
         }
     }
 
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    /// <https://html.spec.whatwg.org/multipage/#disentangle>
+    fn handle_disentangle_messageports(
+        &mut self,
+        port1: MessagePortId,
+        port2: Option<MessagePortId>,
+    ) {
+        // Disentangle initiatorPort and otherPort,
+        // so that they are no longer entangled or associated with each other.
+        // Note: If `port2` is some, then this is the first message
+        // and `port1` is the initiatorPort, `port2` is the otherPort.
+        // We can immediately remove the initiator.
+        let _ = self.message_ports.remove(&port1);
+
+        // Note: the none case is when otherPort sent this message
+        // in response to completing its own local disentanglement.
+        let Some(port2) = port2 else {
+            return;
+        };
+
+        // Start disentanglement of the other port.
+        if let Some(info) = self.message_ports.get_mut(&port2) {
+            info.entangled_with = None;
+            match &mut info.state {
+                TransferState::Managed(router_id) |
+                TransferState::CompletionInProgress(router_id) => {
+                    // We try to disentangle the other port now,
+                    // and if it has been transfered out by the time the message is received,
+                    // it will be ignored,
+                    // and disentanglement will be completed as part of the transfer.
+                    if let Some(ipc_sender) = self.message_port_routers.get(router_id) {
+                        let _ = ipc_sender.send(MessagePortMsg::CompleteDisentanglement(port2));
+                    } else {
+                        warn!("No message-port sender for {:?}", router_id);
+                    }
+                },
+                _ => {
+                    // Note: the port is in transfer, disentanglement will complete along with it.
+                },
+            }
+        } else {
+            warn!(
+                "Constellation asked to disentangle unknown messageport: {:?}",
+                port2
+            );
+        }
+    }
+
     /// <https://w3c.github.io/ServiceWorker/#schedule-job-algorithm>
     /// and
     /// <https://w3c.github.io/ServiceWorker/#dfn-job-queue>
@@ -2404,13 +2543,24 @@ where
                     own_sender: own_sender.clone(),
                     receiver,
                 };
-                let content = ServiceWorkerUnprivilegedContent::new(sw_senders, origin);
 
                 if opts::get().multiprocess {
-                    if content.spawn_multiprocess().is_err() {
+                    let (sender, receiver) =
+                        ipc::channel().expect("Failed to create lifeline channel for sw");
+                    let content =
+                        ServiceWorkerUnprivilegedContent::new(sw_senders, origin, Some(sender));
+
+                    if let Ok(process) = content.spawn_multiprocess() {
+                        let crossbeam_receiver =
+                            route_ipc_receiver_to_new_crossbeam_receiver_preserving_errors(
+                                receiver,
+                            );
+                        self.process_manager.add(crossbeam_receiver, process);
+                    } else {
                         return warn!("Failed to spawn process for SW manager.");
                     }
                 } else {
+                    let content = ServiceWorkerUnprivilegedContent::new(sw_senders, origin, None);
                     content.start::<SWF>();
                 }
                 entry.insert(own_sender)
@@ -2720,7 +2870,7 @@ where
             Some(context) => context,
             None => return warn!("failed browsing context is missing"),
         };
-        let window_size = browsing_context.size;
+        let viewport_details = browsing_context.viewport_details;
         let pipeline_id = browsing_context.pipeline_id;
         let throttled = browsing_context.throttled;
 
@@ -2765,7 +2915,7 @@ where
             webview_id,
             None,
             opener,
-            window_size,
+            viewport_details,
             new_load_data,
             sandbox,
             is_private,
@@ -2779,7 +2929,7 @@ where
             // to avoid closing again in handle_activate_document_msg (though it would be harmless)
             replace: Some(NeedsToReload::Yes(old_pipeline_id, old_load_data)),
             new_browsing_context_info: None,
-            window_size,
+            viewport_details,
         });
     }
 
@@ -2956,9 +3106,9 @@ where
         &mut self,
         url: ServoUrl,
         webview_id: WebViewId,
+        viewport_details: ViewportDetails,
         response_sender: Option<IpcSender<WebDriverLoadStatus>>,
     ) {
-        let window_size = self.window_size.initial_viewport;
         let pipeline_id = PipelineId::new();
         let browsing_context_id = BrowsingContextId::from(webview_id);
         let load_data = LoadData::new(
@@ -2969,6 +3119,7 @@ where
             ReferrerPolicy::EmptyString,
             None,
             None,
+            false,
         );
         let sandbox = IFrameSandboxState::IFrameUnsandboxed;
         let is_private = false;
@@ -2999,7 +3150,7 @@ where
             webview_id,
             None,
             None,
-            window_size,
+            viewport_details,
             load_data,
             sandbox,
             is_private,
@@ -3016,7 +3167,7 @@ where
                 inherited_secure_context: None,
                 throttled,
             }),
-            window_size,
+            viewport_details,
         });
 
         if let Some(response_sender) = response_sender {
@@ -3073,15 +3224,26 @@ where
             type_,
         } in iframe_sizes
         {
-            let window_size = WindowSizeData {
-                initial_viewport: size,
-                device_pixel_ratio: self.window_size.device_pixel_ratio,
-            };
-
-            self.resize_browsing_context(window_size, type_, browsing_context_id);
+            self.resize_browsing_context(size, type_, browsing_context_id);
         }
     }
 
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn handle_finish_javascript_evaluation(
+        &mut self,
+        evaluation_id: JavaScriptEvaluationId,
+        result: Result<JSValue, JavaScriptEvaluationError>,
+    ) {
+        self.embedder_proxy
+            .send(EmbedderMsg::FinishJavaScriptEvaluation(
+                evaluation_id,
+                result,
+            ));
+    }
+
     #[cfg_attr(
         feature = "tracing",
         tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
@@ -3206,14 +3368,13 @@ where
             None
         };
 
-        // https://github.com/rust-lang/rust/issues/59159
-        let browsing_context_size = browsing_context.size;
+        let browsing_context_size = browsing_context.viewport_details;
         let browsing_context_throttled = browsing_context.throttled;
         // TODO(servo#30571) revert to debug_assert_eq!() once underlying bug is fixed
         #[cfg(debug_assertions)]
-        if !(browsing_context_size == load_info.window_size.initial_viewport) {
+        if !(browsing_context_size == load_info.viewport_details) {
             log::warn!(
-                "debug assertion failed! browsing_context_size == load_info.window_size.initial_viewport"
+                "debug assertion failed! browsing_context_size == load_info.viewport_details.initial_viewport"
             );
         }
 
@@ -3237,7 +3398,7 @@ where
             replace,
             // Browsing context for iframe already exists.
             new_browsing_context_info: None,
-            window_size: load_info.window_size.initial_viewport,
+            viewport_details: load_info.viewport_details,
         });
     }
 
@@ -3301,7 +3462,7 @@ where
                 inherited_secure_context: is_parent_secure,
                 throttled: is_parent_throttled,
             }),
-            window_size: load_info.window_size.initial_viewport,
+            viewport_details: load_info.viewport_details,
         });
     }
 
@@ -3329,8 +3490,8 @@ where
             opener_webview_id,
             webview_id_sender,
         ));
-        let new_webview_id = match webview_id_receiver.recv() {
-            Ok(Some(webview_id)) => webview_id,
+        let (new_webview_id, viewport_details) = match webview_id_receiver.recv() {
+            Ok(Some((webview_id, viewport_details))) => (webview_id, viewport_details),
             Ok(None) | Err(_) => {
                 let _ = response_sender.send(None);
                 return;
@@ -3415,7 +3576,7 @@ where
                 inherited_secure_context: is_opener_secure,
                 throttled: is_opener_throttled,
             }),
-            window_size: self.window_size.initial_viewport,
+            viewport_details,
         });
     }
 
@@ -3454,15 +3615,24 @@ where
         feature = "tracing",
         tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
     )]
-    fn handle_tick_animation(&mut self, pipeline_id: PipelineId, tick_type: AnimationTickType) {
-        let pipeline = match self.pipelines.get(&pipeline_id) {
-            Some(pipeline) => pipeline,
-            None => return warn!("{}: Got script tick after closure", pipeline_id),
-        };
+    fn handle_tick_animation(&mut self, webview_ids: Vec<WebViewId>) {
+        let mut animating_event_loops = HashSet::new();
 
-        let message = ScriptThreadMessage::TickAllAnimations(pipeline_id, tick_type);
-        if let Err(e) = pipeline.event_loop.send(message) {
-            self.handle_send_error(pipeline_id, e);
+        for webview_id in webview_ids.iter() {
+            for browsing_context in self.fully_active_browsing_contexts_iter(*webview_id) {
+                let Some(pipeline) = self.pipelines.get(&browsing_context.pipeline_id) else {
+                    continue;
+                };
+                animating_event_loops.insert(pipeline.event_loop.clone());
+            }
+        }
+
+        for event_loop in animating_event_loops {
+            // No error handling here. It's unclear what to do when this fails as the error isn't associated
+            // with a particular pipeline. In addition, the danger of not progressing animations is pretty
+            // low, so it's probably safe to ignore this error and handle the crashed ScriptThread on
+            // some other message.
+            let _ = event_loop.send(ScriptThreadMessage::TickAllAnimations(webview_ids.clone()));
         }
     }
 
@@ -3534,10 +3704,10 @@ where
                 return None;
             },
         };
-        let (window_size, pipeline_id, parent_pipeline_id, is_private, is_throttled) =
+        let (viewport_details, pipeline_id, parent_pipeline_id, is_private, is_throttled) =
             match self.browsing_contexts.get(&browsing_context_id) {
                 Some(ctx) => (
-                    ctx.size,
+                    ctx.viewport_details,
                     ctx.pipeline_id,
                     ctx.parent_pipeline_id,
                     ctx.is_private,
@@ -3614,7 +3784,7 @@ where
                     webview_id,
                     None,
                     opener,
-                    window_size,
+                    viewport_details,
                     load_data,
                     sandbox,
                     is_private,
@@ -3627,7 +3797,7 @@ where
                     replace,
                     // `load_url` is always invoked on an existing browsing context.
                     new_browsing_context_info: None,
-                    window_size,
+                    viewport_details,
                 });
                 Some(new_pipeline_id)
             },
@@ -3662,8 +3832,8 @@ where
     fn handle_load_complete_msg(&mut self, webview_id: WebViewId, pipeline_id: PipelineId) {
         let mut webdriver_reset = false;
         if let Some((expected_pipeline_id, ref reply_chan)) = self.webdriver.load_channel {
-            debug!("Sending load for {:?} to WebDriver", expected_pipeline_id);
             if expected_pipeline_id == pipeline_id {
+                debug!("Sending load for {:?} to WebDriver", expected_pipeline_id);
                 let _ = reply_chan.send(WebDriverLoadStatus::Complete);
                 webdriver_reset = true;
             }
@@ -3907,7 +4077,7 @@ where
                     top_level_id,
                     old_pipeline_id,
                     parent_pipeline_id,
-                    window_size,
+                    viewport_details,
                     is_private,
                     throttled,
                 ) = match self.browsing_contexts.get(&browsing_context_id) {
@@ -3915,7 +4085,7 @@ where
                         ctx.top_level_id,
                         ctx.pipeline_id,
                         ctx.parent_pipeline_id,
-                        ctx.size,
+                        ctx.viewport_details,
                         ctx.is_private,
                         ctx.throttled,
                     ),
@@ -3932,7 +4102,7 @@ where
                     top_level_id,
                     parent_pipeline_id,
                     opener,
-                    window_size,
+                    viewport_details,
                     load_data.clone(),
                     sandbox,
                     is_private,
@@ -3945,7 +4115,7 @@ where
                     replace: Some(NeedsToReload::Yes(pipeline_id, load_data)),
                     // Browsing context must exist at this point.
                     new_browsing_context_info: None,
-                    window_size,
+                    viewport_details,
                 });
                 return;
             },
@@ -3988,6 +4158,7 @@ where
             }
 
             new_pipeline.set_throttled(false);
+            self.notify_focus_state(new_pipeline_id);
         }
 
         self.update_activity(old_pipeline_id);
@@ -4193,22 +4364,96 @@ where
         feature = "tracing",
         tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
     )]
-    fn handle_focus_msg(&mut self, pipeline_id: PipelineId) {
-        let (browsing_context_id, webview_id) = match self.pipelines.get(&pipeline_id) {
-            Some(pipeline) => (pipeline.browsing_context_id, pipeline.webview_id),
+    fn handle_focus_msg(
+        &mut self,
+        pipeline_id: PipelineId,
+        focused_child_browsing_context_id: Option<BrowsingContextId>,
+        sequence: FocusSequenceNumber,
+    ) {
+        let (browsing_context_id, webview_id) = match self.pipelines.get_mut(&pipeline_id) {
+            Some(pipeline) => {
+                pipeline.focus_sequence = sequence;
+                (pipeline.browsing_context_id, pipeline.webview_id)
+            },
             None => return warn!("{}: Focus parent after closure", pipeline_id),
         };
 
+        // Ignore if the pipeline isn't fully active.
+        if self.get_activity(pipeline_id) != DocumentActivity::FullyActive {
+            debug!(
+                "Ignoring the focus request because pipeline {} is not \
+                fully active",
+                pipeline_id
+            );
+            return;
+        }
+
         // Focus the top-level browsing context.
         self.webviews.focus(webview_id);
         self.embedder_proxy
             .send(EmbedderMsg::WebViewFocused(webview_id));
 
+        // If a container with a non-null nested browsing context is focused,
+        // the nested browsing context's active document becomes the focused
+        // area of the top-level browsing context instead.
+        let focused_browsing_context_id =
+            focused_child_browsing_context_id.unwrap_or(browsing_context_id);
+
+        // Send focus messages to the affected pipelines, except
+        // `pipeline_id`, which has already its local focus state
+        // updated.
+        self.focus_browsing_context(Some(pipeline_id), focused_browsing_context_id);
+    }
+
+    fn handle_focus_remote_document_msg(&mut self, focused_browsing_context_id: BrowsingContextId) {
+        let pipeline_id = match self.browsing_contexts.get(&focused_browsing_context_id) {
+            Some(browsing_context) => browsing_context.pipeline_id,
+            None => return warn!("Browsing context {} not found", focused_browsing_context_id),
+        };
+
+        // Ignore if its active document isn't fully active.
+        if self.get_activity(pipeline_id) != DocumentActivity::FullyActive {
+            debug!(
+                "Ignoring the remote focus request because pipeline {} of \
+                browsing context {} is not fully active",
+                pipeline_id, focused_browsing_context_id,
+            );
+            return;
+        }
+
+        self.focus_browsing_context(None, focused_browsing_context_id);
+    }
+
+    /// Perform [the focusing steps][1] for the active document of
+    /// `focused_browsing_context_id`.
+    ///
+    /// If `initiator_pipeline_id` is specified, this method avoids sending
+    /// a message to `initiator_pipeline_id`, assuming its local focus state has
+    /// already been updated. This is necessary for performing the focusing
+    /// steps for an object that is not the document itself but something that
+    /// belongs to the document.
+    ///
+    /// [1]: https://html.spec.whatwg.org/multipage/#focusing-steps
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn focus_browsing_context(
+        &mut self,
+        initiator_pipeline_id: Option<PipelineId>,
+        focused_browsing_context_id: BrowsingContextId,
+    ) {
+        let webview_id = match self.browsing_contexts.get(&focused_browsing_context_id) {
+            Some(browsing_context) => browsing_context.top_level_id,
+            None => return warn!("Browsing context {} not found", focused_browsing_context_id),
+        };
+
         // Update the webview’s focused browsing context.
-        match self.webviews.get_mut(webview_id) {
-            Some(webview) => {
-                webview.focused_browsing_context_id = browsing_context_id;
-            },
+        let old_focused_browsing_context_id = match self.webviews.get_mut(webview_id) {
+            Some(browser) => replace(
+                &mut browser.focused_browsing_context_id,
+                focused_browsing_context_id,
+            ),
             None => {
                 return warn!(
                     "{}: Browsing context for focus msg does not exist",
@@ -4217,42 +4462,133 @@ where
             },
         };
 
-        // Focus parent iframes recursively
-        self.focus_parent_pipeline(browsing_context_id);
-    }
+        // The following part is similar to [the focus update steps][1] except
+        // that only `Document`s in the given focus chains are considered. It's
+        // ultimately up to the script threads to fire focus events at the
+        // affected objects.
+        //
+        // [1]: https://html.spec.whatwg.org/multipage/#focus-update-steps
+        let mut old_focus_chain_pipelines: Vec<&Pipeline> = self
+            .ancestor_or_self_pipelines_of_browsing_context_iter(old_focused_browsing_context_id)
+            .collect();
+        let mut new_focus_chain_pipelines: Vec<&Pipeline> = self
+            .ancestor_or_self_pipelines_of_browsing_context_iter(focused_browsing_context_id)
+            .collect();
 
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn focus_parent_pipeline(&mut self, browsing_context_id: BrowsingContextId) {
-        let parent_pipeline_id = match self.browsing_contexts.get(&browsing_context_id) {
-            Some(ctx) => ctx.parent_pipeline_id,
-            None => {
-                return warn!("{}: Focus parent after closure", browsing_context_id);
-            },
-        };
-        let parent_pipeline_id = match parent_pipeline_id {
-            Some(parent_id) => parent_id,
-            None => {
-                return debug!("{}: Focus has no parent", browsing_context_id);
-            },
-        };
+        debug!(
+            "old_focus_chain_pipelines = {:?}",
+            old_focus_chain_pipelines
+                .iter()
+                .map(|p| p.id.to_string())
+                .collect::<Vec<_>>()
+        );
+        debug!(
+            "new_focus_chain_pipelines = {:?}",
+            new_focus_chain_pipelines
+                .iter()
+                .map(|p| p.id.to_string())
+                .collect::<Vec<_>>()
+        );
 
-        // Send a message to the parent of the provided browsing context (if it
-        // exists) telling it to mark the iframe element as focused.
-        let msg = ScriptThreadMessage::FocusIFrame(parent_pipeline_id, browsing_context_id);
-        let (result, parent_browsing_context_id) = match self.pipelines.get(&parent_pipeline_id) {
-            Some(pipeline) => {
-                let result = pipeline.event_loop.send(msg);
-                (result, pipeline.browsing_context_id)
+        // At least the last entries should match. Otherwise something is wrong,
+        // and we don't want to proceed and crash the top-level pipeline by
+        // sending an impossible `Unfocus` message to it.
+        match (
+            &old_focus_chain_pipelines[..],
+            &new_focus_chain_pipelines[..],
+        ) {
+            ([.., p1], [.., p2]) if p1.id == p2.id => {},
+            _ => {
+                warn!("Aborting the focus operation - focus chain sanity check failed");
+                return;
             },
-            None => return warn!("{}: Focus after closure", parent_pipeline_id),
-        };
-        if let Err(e) = result {
-            self.handle_send_error(parent_pipeline_id, e);
         }
-        self.focus_parent_pipeline(parent_browsing_context_id);
+
+        // > If the last entry in `old chain` and the last entry in `new chain`
+        // > are the same, pop the last entry from `old chain` and the last
+        // > entry from `new chain` and redo this step.
+        let mut first_common_pipeline_in_chain = None;
+        while let ([.., p1], [.., p2]) = (
+            &old_focus_chain_pipelines[..],
+            &new_focus_chain_pipelines[..],
+        ) {
+            if p1.id != p2.id {
+                break;
+            }
+            old_focus_chain_pipelines.pop();
+            first_common_pipeline_in_chain = new_focus_chain_pipelines.pop();
+        }
+
+        let mut send_errors = Vec::new();
+
+        // > For each entry `entry` in `old chain`, in order, run these
+        // > substeps: [...]
+        for &pipeline in old_focus_chain_pipelines.iter() {
+            if Some(pipeline.id) != initiator_pipeline_id {
+                let msg = ScriptThreadMessage::Unfocus(pipeline.id, pipeline.focus_sequence);
+                trace!("Sending {:?} to {}", msg, pipeline.id);
+                if let Err(e) = pipeline.event_loop.send(msg) {
+                    send_errors.push((pipeline.id, e));
+                }
+            } else {
+                trace!(
+                    "Not notifying {} - it's the initiator of this focus operation",
+                    pipeline.id
+                );
+            }
+        }
+
+        // > For each entry entry in `new chain`, in reverse order, run these
+        // > substeps: [...]
+        let mut child_browsing_context_id = None;
+        for &pipeline in new_focus_chain_pipelines.iter().rev() {
+            // Don't send a message to the browsing context that initiated this
+            // focus operation. It already knows that it has gotten focus.
+            if Some(pipeline.id) != initiator_pipeline_id {
+                let msg = if let Some(child_browsing_context_id) = child_browsing_context_id {
+                    // Focus the container element of `child_browsing_context_id`.
+                    ScriptThreadMessage::FocusIFrame(
+                        pipeline.id,
+                        child_browsing_context_id,
+                        pipeline.focus_sequence,
+                    )
+                } else {
+                    // Focus the document.
+                    ScriptThreadMessage::FocusDocument(pipeline.id, pipeline.focus_sequence)
+                };
+                trace!("Sending {:?} to {}", msg, pipeline.id);
+                if let Err(e) = pipeline.event_loop.send(msg) {
+                    send_errors.push((pipeline.id, e));
+                }
+            } else {
+                trace!(
+                    "Not notifying {} - it's the initiator of this focus operation",
+                    pipeline.id
+                );
+            }
+            child_browsing_context_id = Some(pipeline.browsing_context_id);
+        }
+
+        if let (Some(pipeline), Some(child_browsing_context_id)) =
+            (first_common_pipeline_in_chain, child_browsing_context_id)
+        {
+            if Some(pipeline.id) != initiator_pipeline_id {
+                // Focus the container element of `child_browsing_context_id`.
+                let msg = ScriptThreadMessage::FocusIFrame(
+                    pipeline.id,
+                    child_browsing_context_id,
+                    pipeline.focus_sequence,
+                );
+                trace!("Sending {:?} to {}", msg, pipeline.id);
+                if let Err(e) = pipeline.event_loop.send(msg) {
+                    send_errors.push((pipeline.id, e));
+                }
+            }
+        }
+
+        for (pipeline_id, e) in send_errors {
+            self.handle_send_error(pipeline_id, e);
+        }
     }
 
     #[cfg_attr(
@@ -4354,14 +4690,15 @@ where
                 };
                 self.embedder_proxy
                     .send(EmbedderMsg::AllowOpeningWebView(webview_id, chan));
-                let webview_id = match port.recv() {
-                    Ok(Some(webview_id)) => webview_id,
+                let (webview_id, viewport_details) = match port.recv() {
+                    Ok(Some((webview_id, viewport_details))) => (webview_id, viewport_details),
                     Ok(None) => return warn!("Embedder refused to allow opening webview"),
                     Err(error) => return warn!("Failed to receive webview id: {error:?}"),
                 };
                 self.handle_new_top_level_browsing_context(
                     ServoUrl::parse_with_base(None, "about:blank").expect("Infallible parse"),
                     webview_id,
+                    viewport_details,
                     Some(load_sender),
                 );
                 let _ = sender.send(webview_id);
@@ -4369,8 +4706,14 @@ where
             WebDriverCommandMsg::FocusWebView(webview_id) => {
                 self.handle_focus_web_view(webview_id);
             },
-            WebDriverCommandMsg::GetWindowSize(_, response_sender) => {
-                let _ = response_sender.send(self.window_size.initial_viewport);
+            WebDriverCommandMsg::GetWindowSize(webview_id, response_sender) => {
+                let browsing_context_id = BrowsingContextId::from(webview_id);
+                let size = self
+                    .browsing_contexts
+                    .get(&browsing_context_id)
+                    .map(|browsing_context| browsing_context.viewport_details.size)
+                    .unwrap_or_default();
+                let _ = response_sender.send(size);
             },
             WebDriverCommandMsg::SetWindowSize(webview_id, size, response_sender) => {
                 self.webdriver.resize_channel = Some(response_sender);
@@ -4386,6 +4729,7 @@ where
                     ReferrerPolicy::EmptyString,
                     None,
                     None,
+                    false,
                 );
                 self.load_url_for_webdriver(
                     webview_id,
@@ -4413,6 +4757,7 @@ where
                     NavigationHistoryBehavior::Replace,
                 );
             },
+            // TODO: This should use the ScriptThreadMessage::EvaluateJavaScript command
             WebDriverCommandMsg::ScriptCommand(browsing_context_id, cmd) => {
                 let pipeline_id = match self.browsing_contexts.get(&browsing_context_id) {
                     Some(browsing_context) => browsing_context.pipeline_id,
@@ -4505,9 +4850,18 @@ where
                 self.compositor_proxy
                     .send(CompositorMsg::WebDriverMouseMoveEvent(webview_id, x, y));
             },
-            WebDriverCommandMsg::TakeScreenshot(_, rect, response_sender) => {
+            WebDriverCommandMsg::WheelScrollAction(webview, x, y, delta_x, delta_y) => {
                 self.compositor_proxy
-                    .send(CompositorMsg::CreatePng(rect, response_sender));
+                    .send(CompositorMsg::WebDriverWheelScrollEvent(
+                        webview, x, y, delta_x, delta_y,
+                    ));
+            },
+            WebDriverCommandMsg::TakeScreenshot(webview_id, rect, response_sender) => {
+                self.compositor_proxy.send(CompositorMsg::CreatePng(
+                    webview_id,
+                    rect,
+                    response_sender,
+                ));
             },
         }
     }
@@ -4732,7 +5086,7 @@ where
                     change.webview_id,
                     change.new_pipeline_id,
                     new_context_info.parent_pipeline_id,
-                    change.window_size,
+                    change.viewport_details,
                     new_context_info.is_private,
                     new_context_info.inherited_secure_context,
                     new_context_info.throttled,
@@ -4836,10 +5190,42 @@ where
             self.trim_history(top_level_id);
         }
 
+        self.notify_focus_state(change.new_pipeline_id);
+
         self.notify_history_changed(change.webview_id);
         self.update_webview_in_compositor(change.webview_id);
     }
 
+    /// Update the focus state of the specified pipeline that recently became
+    /// active (thus doesn't have a focused container element) and may have
+    /// out-dated information.
+    fn notify_focus_state(&mut self, pipeline_id: PipelineId) {
+        let pipeline = match self.pipelines.get(&pipeline_id) {
+            Some(pipeline) => pipeline,
+            None => return warn!("Pipeline {} is closed", pipeline_id),
+        };
+
+        let is_focused = match self.webviews.get(pipeline.webview_id) {
+            Some(webview) => webview.focused_browsing_context_id == pipeline.browsing_context_id,
+            None => {
+                return warn!(
+                    "Pipeline {}'s top-level browsing context {} is closed",
+                    pipeline_id, pipeline.webview_id
+                );
+            },
+        };
+
+        // If the browsing context is focused, focus the document
+        let msg = if is_focused {
+            ScriptThreadMessage::FocusDocument(pipeline_id, pipeline.focus_sequence)
+        } else {
+            ScriptThreadMessage::Unfocus(pipeline_id, pipeline.focus_sequence)
+        };
+        if let Err(e) = pipeline.event_loop.send(msg) {
+            self.handle_send_error(pipeline_id, e);
+        }
+    }
+
     #[cfg_attr(
         feature = "tracing",
         tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
@@ -4975,25 +5361,23 @@ where
         feature = "tracing",
         tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
     )]
-    fn handle_window_size_msg(
+    fn handle_change_viewport_details_msg(
         &mut self,
         webview_id: WebViewId,
-        new_size: WindowSizeData,
+        new_viewport_details: ViewportDetails,
         size_type: WindowSizeType,
     ) {
         debug!(
-            "handle_window_size_msg: {:?}",
-            new_size.initial_viewport.to_untyped()
+            "handle_change_viewport_details_msg: {:?}",
+            new_viewport_details.size.to_untyped()
         );
 
         let browsing_context_id = BrowsingContextId::from(webview_id);
-        self.resize_browsing_context(new_size, size_type, browsing_context_id);
+        self.resize_browsing_context(new_viewport_details, size_type, browsing_context_id);
 
         if let Some(response_sender) = self.webdriver.resize_channel.take() {
-            let _ = response_sender.send(new_size.initial_viewport);
+            let _ = response_sender.send(new_viewport_details.size);
         }
-
-        self.window_size = new_size;
     }
 
     /// Called when the window exits from fullscreen mode
@@ -5067,7 +5451,7 @@ where
             // If the rectangle for this pipeline is zero sized, it will
             // never be painted. In this case, don't query the layout
             // thread as it won't contribute to the final output image.
-            if browsing_context.size == Size2D::zero() {
+            if browsing_context.viewport_details.size == Size2D::zero() {
                 continue;
             }
 
@@ -5162,12 +5546,12 @@ where
     )]
     fn resize_browsing_context(
         &mut self,
-        new_size: WindowSizeData,
+        new_viewport_details: ViewportDetails,
         size_type: WindowSizeType,
         browsing_context_id: BrowsingContextId,
     ) {
         if let Some(browsing_context) = self.browsing_contexts.get_mut(&browsing_context_id) {
-            browsing_context.size = new_size.initial_viewport;
+            browsing_context.viewport_details = new_viewport_details;
             // Send Resize (or ResizeInactive) messages to each pipeline in the frame tree.
             let pipeline_id = browsing_context.pipeline_id;
             let pipeline = match self.pipelines.get(&pipeline_id) {
@@ -5176,7 +5560,7 @@ where
             };
             let _ = pipeline.event_loop.send(ScriptThreadMessage::Resize(
                 pipeline.id,
-                new_size,
+                new_viewport_details,
                 size_type,
             ));
             let pipeline_ids = browsing_context
@@ -5187,7 +5571,10 @@ where
                 if let Some(pipeline) = self.pipelines.get(id) {
                     let _ = pipeline
                         .event_loop
-                        .send(ScriptThreadMessage::ResizeInactive(pipeline.id, new_size));
+                        .send(ScriptThreadMessage::ResizeInactive(
+                            pipeline.id,
+                            new_viewport_details,
+                        ));
                 }
             }
         }
@@ -5205,7 +5592,7 @@ where
             if pipeline.browsing_context_id == browsing_context_id {
                 let _ = pipeline.event_loop.send(ScriptThreadMessage::Resize(
                     pipeline.id,
-                    new_size,
+                    new_viewport_details,
                     size_type,
                 ));
             }
@@ -5288,7 +5675,29 @@ where
                 None => {
                     warn!("{parent_pipeline_id}: Child closed after parent");
                 },
-                Some(parent_pipeline) => parent_pipeline.remove_child(browsing_context_id),
+                Some(parent_pipeline) => {
+                    parent_pipeline.remove_child(browsing_context_id);
+
+                    // If `browsing_context_id` has focus, focus the parent
+                    // browsing context
+                    if let Some(webview) = self.webviews.get_mut(browsing_context.top_level_id) {
+                        if webview.focused_browsing_context_id == browsing_context_id {
+                            trace!(
+                                "About-to-be-closed browsing context {} is currently focused, so \
+                                focusing its parent {}",
+                                browsing_context_id, parent_pipeline.browsing_context_id
+                            );
+                            webview.focused_browsing_context_id =
+                                parent_pipeline.browsing_context_id;
+                        }
+                    } else {
+                        warn!(
+                            "Browsing context {} contains a reference to \
+                                a non-existent top-level browsing context {}",
+                            browsing_context_id, browsing_context.top_level_id
+                        );
+                    }
+                },
             };
         }
         debug!("{}: Closed", browsing_context_id);
diff --git a/components/constellation/event_loop.rs b/components/constellation/event_loop.rs
index 362960eba64..46542e7212f 100644
--- a/components/constellation/event_loop.rs
+++ b/components/constellation/event_loop.rs
@@ -6,17 +6,36 @@
 //! view of a script thread. When an `EventLoop` is dropped, an `ExitScriptThread`
 //! message is sent to the script thread, asking it to shut down.
 
+use std::hash::Hash;
 use std::marker::PhantomData;
 use std::rc::Rc;
+use std::sync::atomic::{AtomicUsize, Ordering};
 
 use ipc_channel::Error;
 use ipc_channel::ipc::IpcSender;
 use script_traits::ScriptThreadMessage;
 
+static CURRENT_EVENT_LOOP_ID: AtomicUsize = AtomicUsize::new(0);
+
 /// <https://html.spec.whatwg.org/multipage/#event-loop>
 pub struct EventLoop {
     script_chan: IpcSender<ScriptThreadMessage>,
     dont_send_or_sync: PhantomData<Rc<()>>,
+    id: usize,
+}
+
+impl PartialEq for EventLoop {
+    fn eq(&self, other: &Self) -> bool {
+        self.id == other.id
+    }
+}
+
+impl Eq for EventLoop {}
+
+impl Hash for EventLoop {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.id.hash(state);
+    }
 }
 
 impl Drop for EventLoop {
@@ -28,9 +47,11 @@ impl Drop for EventLoop {
 impl EventLoop {
     /// Create a new event loop from the channel to its script thread.
     pub fn new(script_chan: IpcSender<ScriptThreadMessage>) -> Rc<EventLoop> {
+        let id = CURRENT_EVENT_LOOP_ID.fetch_add(1, Ordering::Relaxed);
         Rc::new(EventLoop {
             script_chan,
             dont_send_or_sync: PhantomData,
+            id,
         })
     }
 
diff --git a/components/constellation/lib.rs b/components/constellation/lib.rs
index e00bc060cd5..c24543743b7 100644
--- a/components/constellation/lib.rs
+++ b/components/constellation/lib.rs
@@ -12,12 +12,13 @@ mod constellation;
 mod event_loop;
 mod logging;
 mod pipeline;
+mod process_manager;
 mod sandboxing;
 mod serviceworker;
 mod session_history;
-mod webview;
+mod webview_manager;
 
 pub use crate::constellation::{Constellation, InitialConstellationState};
-pub use crate::logging::{FromCompositorLogger, FromScriptLogger};
+pub use crate::logging::{FromEmbedderLogger, FromScriptLogger};
 pub use crate::pipeline::UnprivilegedPipelineContent;
 pub use crate::sandboxing::{UnprivilegedContent, content_process_sandbox_profile};
diff --git a/components/constellation/logging.rs b/components/constellation/logging.rs
index fd17494b18a..97ff0202bd8 100644
--- a/components/constellation/logging.rs
+++ b/components/constellation/logging.rs
@@ -12,11 +12,13 @@ use std::thread;
 
 use backtrace::Backtrace;
 use base::id::WebViewId;
-use constellation_traits::{ConstellationMsg as FromCompositorMsg, LogEntry};
+use constellation_traits::{
+    EmbedderToConstellationMessage, LogEntry, ScriptToConstellationChan,
+    ScriptToConstellationMessage,
+};
 use crossbeam_channel::Sender;
 use log::{Level, LevelFilter, Log, Metadata, Record};
 use parking_lot::ReentrantMutex;
-use script_traits::{ScriptMsg as FromScriptMsg, ScriptToConstellationChan};
 
 /// A logger directed at the constellation from content processes
 /// #[derive(Clone)]
@@ -50,7 +52,7 @@ impl Log for FromScriptLogger {
     fn log(&self, record: &Record) {
         if let Some(entry) = log_entry(record) {
             let thread_name = thread::current().name().map(ToOwned::to_owned);
-            let msg = FromScriptMsg::LogEntry(thread_name, entry);
+            let msg = ScriptToConstellationMessage::LogEntry(thread_name, entry);
             let chan = self.script_to_constellation_chan.lock();
             let _ = chan.send(msg);
         }
@@ -61,15 +63,15 @@ impl Log for FromScriptLogger {
 
 /// A logger directed at the constellation from the compositor
 #[derive(Clone)]
-pub struct FromCompositorLogger {
+pub struct FromEmbedderLogger {
     /// A channel to the constellation
-    pub constellation_chan: Arc<ReentrantMutex<Sender<FromCompositorMsg>>>,
+    pub constellation_chan: Arc<ReentrantMutex<Sender<EmbedderToConstellationMessage>>>,
 }
 
-impl FromCompositorLogger {
+impl FromEmbedderLogger {
     /// Create a new constellation logger.
-    pub fn new(constellation_chan: Sender<FromCompositorMsg>) -> FromCompositorLogger {
-        FromCompositorLogger {
+    pub fn new(constellation_chan: Sender<EmbedderToConstellationMessage>) -> FromEmbedderLogger {
+        FromEmbedderLogger {
             constellation_chan: Arc::new(ReentrantMutex::new(constellation_chan)),
         }
     }
@@ -80,7 +82,7 @@ impl FromCompositorLogger {
     }
 }
 
-impl Log for FromCompositorLogger {
+impl Log for FromEmbedderLogger {
     fn enabled(&self, metadata: &Metadata) -> bool {
         metadata.level() <= Level::Warn
     }
@@ -89,7 +91,7 @@ impl Log for FromCompositorLogger {
         if let Some(entry) = log_entry(record) {
             let top_level_id = WebViewId::installed();
             let thread_name = thread::current().name().map(ToOwned::to_owned);
-            let msg = FromCompositorMsg::LogEntry(top_level_id, thread_name, entry);
+            let msg = EmbedderToConstellationMessage::LogEntry(top_level_id, thread_name, entry);
             let chan = self.constellation_chan.lock();
             let _ = chan.send(msg);
         }
diff --git a/components/constellation/pipeline.rs b/components/constellation/pipeline.rs
index 65f0c9dbfbd..556ef9bd60f 100644
--- a/components/constellation/pipeline.rs
+++ b/components/constellation/pipeline.rs
@@ -2,7 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use std::borrow::Cow;
 use std::collections::HashSet;
 use std::rc::Rc;
 use std::sync::Arc;
@@ -19,11 +18,14 @@ use base::id::{
 #[cfg(feature = "bluetooth")]
 use bluetooth_traits::BluetoothRequest;
 use canvas_traits::webgl::WebGLPipeline;
-use compositing_traits::{CompositionPipeline, CompositorMsg, CompositorProxy};
-use constellation_traits::WindowSizeData;
+use compositing_traits::{
+    CompositionPipeline, CompositorMsg, CompositorProxy, CrossProcessCompositorApi,
+};
+use constellation_traits::{LoadData, SWManagerMsg, ScriptToConstellationChan};
 use crossbeam_channel::{Sender, unbounded};
 use devtools_traits::{DevtoolsControlMsg, ScriptToDevtoolsControlMsg};
 use embedder_traits::user_content_manager::UserContentManager;
+use embedder_traits::{AnimationState, FocusSequenceNumber, ViewportDetails};
 use fonts::{SystemFontServiceProxy, SystemFontServiceProxySender};
 use ipc_channel::Error;
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
@@ -33,20 +35,21 @@ use media::WindowGLContext;
 use net::image_cache::ImageCacheImpl;
 use net_traits::ResourceThreads;
 use net_traits::image_cache::ImageCache;
+use profile::system_reporter;
+use profile_traits::mem::{ProfilerMsg, Reporter};
 use profile_traits::{mem as profile_mem, time};
 use script_layout_interface::{LayoutFactory, ScriptThreadFactory};
 use script_traits::{
-    AnimationState, DiscardBrowsingContext, DocumentActivity, InitialScriptState, LoadData,
-    NewLayoutInfo, SWManagerMsg, ScriptThreadMessage, ScriptToConstellationChan,
+    DiscardBrowsingContext, DocumentActivity, InitialScriptState, NewLayoutInfo,
+    ScriptThreadMessage,
 };
 use serde::{Deserialize, Serialize};
 use servo_config::opts::{self, Opts};
 use servo_config::prefs::{self, Preferences};
 use servo_url::ServoUrl;
-use webrender_api::DocumentId;
-use webrender_traits::CrossProcessCompositorApi;
 
 use crate::event_loop::EventLoop;
+use crate::process_manager::Process;
 use crate::sandboxing::{UnprivilegedContent, spawn_multiprocess};
 
 /// A `Pipeline` is the constellation's view of a `Window`. Each pipeline has an event loop
@@ -99,6 +102,8 @@ pub struct Pipeline {
     /// The last compositor [`Epoch`] that was laid out in this pipeline if "exit after load" is
     /// enabled.
     pub layout_epoch: Epoch,
+
+    pub focus_sequence: FocusSequenceNumber,
 }
 
 /// Initial setup data needed to construct a pipeline.
@@ -162,8 +167,8 @@ pub struct InitialPipelineState {
     /// A channel to the memory profiler thread.
     pub mem_profiler_chan: profile_mem::ProfilerChan,
 
-    /// Information about the initial window size.
-    pub window_size: WindowSizeData,
+    /// The initial [`ViewportDetails`] to use when starting this new [`Pipeline`].
+    pub viewport_details: ViewportDetails,
 
     /// The ID of the pipeline namespace for this script thread.
     pub pipeline_namespace_id: PipelineNamespaceId,
@@ -180,9 +185,6 @@ pub struct InitialPipelineState {
     /// compositor threads after spawning a pipeline.
     pub prev_throttled: bool,
 
-    /// The ID of the document processed by this script thread.
-    pub webrender_document: DocumentId,
-
     /// A channel to the WebGL thread.
     pub webgl_chan: Option<WebGLPipeline>,
 
@@ -192,9 +194,6 @@ pub struct InitialPipelineState {
     /// Application window's GL Context for Media player
     pub player_context: WindowGLContext,
 
-    /// User agent string to report in network requests.
-    pub user_agent: Cow<'static, str>,
-
     /// The image bytes associated with the RippyPNG embedder resource.
     pub rippy_data: Vec<u8>,
 
@@ -205,6 +204,7 @@ pub struct InitialPipelineState {
 pub struct NewPipeline {
     pub pipeline: Pipeline,
     pub bhm_control_chan: Option<IpcSender<BackgroundHangMonitorControlMsg>>,
+    pub lifeline: Option<(IpcReceiver<()>, Process)>,
 }
 
 impl Pipeline {
@@ -214,7 +214,7 @@ impl Pipeline {
     ) -> Result<NewPipeline, Error> {
         // Note: we allow channel creation to panic, since recovering from this
         // probably requires a general low-memory strategy.
-        let (script_chan, bhm_control_chan) = match state.event_loop {
+        let (script_chan, (bhm_control_chan, lifeline)) = match state.event_loop {
             Some(script_chan) => {
                 let new_layout_info = NewLayoutInfo {
                     parent_info: state.parent_pipeline_id,
@@ -223,14 +223,14 @@ impl Pipeline {
                     webview_id: state.webview_id,
                     opener: state.opener,
                     load_data: state.load_data.clone(),
-                    window_size: state.window_size,
+                    viewport_details: state.viewport_details,
                 };
 
                 if let Err(e) = script_chan.send(ScriptThreadMessage::AttachLayout(new_layout_info))
                 {
                     warn!("Sending to script during pipeline creation failed ({})", e);
                 }
-                (script_chan, None)
+                (script_chan, (None, None))
             },
             None => {
                 let (script_chan, script_port) = ipc::channel().expect("Pipeline script chan");
@@ -279,14 +279,13 @@ impl Pipeline {
                     resource_threads: state.resource_threads,
                     time_profiler_chan: state.time_profiler_chan,
                     mem_profiler_chan: state.mem_profiler_chan,
-                    window_size: state.window_size,
+                    viewport_details: state.viewport_details,
                     script_chan: script_chan.clone(),
                     load_data: state.load_data.clone(),
                     script_port,
                     opts: (*opts::get()).clone(),
                     prefs: Box::new(prefs::get().clone()),
                     pipeline_namespace_id: state.pipeline_namespace_id,
-                    webrender_document: state.webrender_document,
                     cross_process_compositor_api: state
                         .compositor_proxy
                         .cross_process_compositor_api
@@ -294,20 +293,23 @@ impl Pipeline {
                     webgl_chan: state.webgl_chan,
                     webxr_registry: state.webxr_registry,
                     player_context: state.player_context,
-                    user_agent: state.user_agent,
                     rippy_data: state.rippy_data,
                     user_content_manager: state.user_content_manager,
+                    lifeline_sender: None,
                 };
 
                 // Spawn the child process.
                 //
                 // Yes, that's all there is to it!
-                let bhm_control_chan = if opts::get().multiprocess {
+                let multiprocess_data = if opts::get().multiprocess {
                     let (bhm_control_chan, bhm_control_port) =
                         ipc::channel().expect("Sampler chan");
                     unprivileged_pipeline_content.bhm_control_port = Some(bhm_control_port);
-                    unprivileged_pipeline_content.spawn_multiprocess()?;
-                    Some(bhm_control_chan)
+                    let (sender, receiver) =
+                        ipc::channel().expect("Failed to create lifeline channel");
+                    unprivileged_pipeline_content.lifeline_sender = Some(sender);
+                    let process = unprivileged_pipeline_content.spawn_multiprocess()?;
+                    (Some(bhm_control_chan), Some((receiver, process)))
                 } else {
                     // Should not be None in single-process mode.
                     let register = state
@@ -318,10 +320,10 @@ impl Pipeline {
                         state.layout_factory,
                         register,
                     );
-                    None
+                    (None, None)
                 };
 
-                (EventLoop::new(script_chan), bhm_control_chan)
+                (EventLoop::new(script_chan), multiprocess_data)
             },
         };
 
@@ -338,6 +340,7 @@ impl Pipeline {
         Ok(NewPipeline {
             pipeline,
             bhm_control_chan,
+            lifeline,
         })
     }
 
@@ -369,6 +372,7 @@ impl Pipeline {
             completely_loaded: false,
             title: String::new(),
             layout_epoch: Epoch(0),
+            focus_sequence: FocusSequenceNumber::default(),
         };
 
         pipeline.set_throttled(throttled);
@@ -489,7 +493,7 @@ pub struct UnprivilegedPipelineContent {
     resource_threads: ResourceThreads,
     time_profiler_chan: time::ProfilerChan,
     mem_profiler_chan: profile_mem::ProfilerChan,
-    window_size: WindowSizeData,
+    viewport_details: ViewportDetails,
     script_chan: IpcSender<ScriptThreadMessage>,
     load_data: LoadData,
     script_port: IpcReceiver<ScriptThreadMessage>,
@@ -497,13 +501,12 @@ pub struct UnprivilegedPipelineContent {
     prefs: Box<Preferences>,
     pipeline_namespace_id: PipelineNamespaceId,
     cross_process_compositor_api: CrossProcessCompositorApi,
-    webrender_document: DocumentId,
     webgl_chan: Option<WebGLPipeline>,
     webxr_registry: Option<webxr_api::Registry>,
     player_context: WindowGLContext,
-    user_agent: Cow<'static, str>,
     rippy_data: Vec<u8>,
     user_content_manager: UserContentManager,
+    lifeline_sender: Option<IpcSender<()>>,
 }
 
 impl UnprivilegedPipelineContent {
@@ -540,12 +543,11 @@ impl UnprivilegedPipelineContent {
                 time_profiler_sender: self.time_profiler_chan.clone(),
                 memory_profiler_sender: self.mem_profiler_chan.clone(),
                 devtools_server_sender: self.devtools_ipc_sender,
-                window_size: self.window_size,
+                viewport_details: self.viewport_details,
                 pipeline_namespace_id: self.pipeline_namespace_id,
                 content_process_shutdown_sender: content_process_shutdown_chan,
                 webgl_chan: self.webgl_chan,
                 webxr_registry: self.webxr_registry,
-                webrender_document: self.webrender_document,
                 compositor_api: self.cross_process_compositor_api.clone(),
                 player_context: self.player_context.clone(),
                 inherited_secure_context: self.load_data.inherited_secure_context,
@@ -554,7 +556,6 @@ impl UnprivilegedPipelineContent {
             layout_factory,
             Arc::new(self.system_font_service.to_proxy()),
             self.load_data.clone(),
-            self.user_agent,
         );
 
         if wait_for_completion {
@@ -565,7 +566,7 @@ impl UnprivilegedPipelineContent {
         }
     }
 
-    pub fn spawn_multiprocess(self) -> Result<(), Error> {
+    pub fn spawn_multiprocess(self) -> Result<Process, Error> {
         spawn_multiprocess(UnprivilegedContent::Pipeline(self))
     }
 
@@ -590,4 +591,24 @@ impl UnprivilegedPipelineContent {
     pub fn prefs(&self) -> &Preferences {
         &self.prefs
     }
+
+    pub fn register_system_memory_reporter(&self) {
+        // Register the system memory reporter, which will run on its own thread. It never needs to
+        // be unregistered, because as long as the memory profiler is running the system memory
+        // reporter can make measurements.
+        let (system_reporter_sender, system_reporter_receiver) =
+            ipc::channel().expect("failed to create ipc channel");
+        ROUTER.add_typed_route(
+            system_reporter_receiver,
+            Box::new(|message| {
+                if let Ok(request) = message {
+                    system_reporter::collect_reports(request);
+                }
+            }),
+        );
+        self.mem_profiler_chan.send(ProfilerMsg::RegisterReporter(
+            format!("system-content-{}", std::process::id()),
+            Reporter(system_reporter_sender),
+        ));
+    }
 }
diff --git a/components/constellation/process_manager.rs b/components/constellation/process_manager.rs
new file mode 100644
index 00000000000..7da2e9c63df
--- /dev/null
+++ b/components/constellation/process_manager.rs
@@ -0,0 +1,79 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::process::Child;
+
+use crossbeam_channel::{Receiver, Select};
+use log::{debug, warn};
+use profile_traits::mem::{ProfilerChan, ProfilerMsg};
+
+pub enum Process {
+    Unsandboxed(Child),
+    Sandboxed(u32),
+}
+
+impl Process {
+    fn pid(&self) -> u32 {
+        match self {
+            Self::Unsandboxed(child) => child.id(),
+            Self::Sandboxed(pid) => *pid,
+        }
+    }
+
+    fn wait(&mut self) {
+        match self {
+            Self::Unsandboxed(child) => {
+                let _ = child.wait();
+            },
+            Self::Sandboxed(_pid) => {
+                // TODO: use nix::waitpid() on supported platforms.
+                warn!("wait() is not yet implemented for sandboxed processes.");
+            },
+        }
+    }
+}
+
+type ProcessReceiver = Receiver<Result<(), ipc_channel::Error>>;
+
+pub(crate) struct ProcessManager {
+    processes: Vec<(Process, ProcessReceiver)>,
+    mem_profiler_chan: ProfilerChan,
+}
+
+impl ProcessManager {
+    pub fn new(mem_profiler_chan: ProfilerChan) -> Self {
+        Self {
+            processes: vec![],
+            mem_profiler_chan,
+        }
+    }
+
+    pub fn add(&mut self, receiver: ProcessReceiver, process: Process) {
+        debug!("Adding process pid={}", process.pid());
+        self.processes.push((process, receiver));
+    }
+
+    pub fn register<'a>(&'a self, select: &mut Select<'a>) {
+        for (_, receiver) in &self.processes {
+            select.recv(receiver);
+        }
+    }
+
+    pub fn receiver_at(&self, index: usize) -> &ProcessReceiver {
+        let (_, receiver) = &self.processes[index];
+        receiver
+    }
+
+    pub fn remove(&mut self, index: usize) {
+        let (mut process, _) = self.processes.swap_remove(index);
+        debug!("Removing process pid={}", process.pid());
+        // Unregister this process system memory profiler
+        self.mem_profiler_chan
+            .send(ProfilerMsg::UnregisterReporter(format!(
+                "system-content-{}",
+                process.pid()
+            )));
+        process.wait();
+    }
+}
diff --git a/components/constellation/sandboxing.rs b/components/constellation/sandboxing.rs
index 0f883b4743a..b4c6e7a9a39 100644
--- a/components/constellation/sandboxing.rs
+++ b/components/constellation/sandboxing.rs
@@ -25,6 +25,7 @@ use servo_config::opts::Opts;
 use servo_config::prefs::Preferences;
 
 use crate::pipeline::UnprivilegedPipelineContent;
+use crate::process_manager::Process;
 use crate::serviceworker::ServiceWorkerUnprivilegedContent;
 
 #[derive(Deserialize, Serialize)]
@@ -146,7 +147,7 @@ pub fn content_process_sandbox_profile() {
     target_arch = "arm",
     all(target_arch = "aarch64", not(target_os = "windows"))
 ))]
-pub fn spawn_multiprocess(content: UnprivilegedContent) -> Result<(), Error> {
+pub fn spawn_multiprocess(content: UnprivilegedContent) -> Result<Process, Error> {
     use ipc_channel::ipc::{IpcOneShotServer, IpcSender};
     // Note that this function can panic, due to process creation,
     // avoiding this panic would require a mechanism for dealing
@@ -159,14 +160,14 @@ pub fn spawn_multiprocess(content: UnprivilegedContent) -> Result<(), Error> {
     setup_common(&mut child_process, token);
 
     #[allow(clippy::zombie_processes)]
-    let _ = child_process
+    let child = child_process
         .spawn()
         .expect("Failed to start unsandboxed child process!");
 
     let (_receiver, sender) = server.accept().expect("Server failed to accept.");
     sender.send(content)?;
 
-    Ok(())
+    Ok(Process::Unsandboxed(child))
 }
 
 #[cfg(all(
@@ -177,7 +178,7 @@ pub fn spawn_multiprocess(content: UnprivilegedContent) -> Result<(), Error> {
     not(target_arch = "arm"),
     not(target_arch = "aarch64")
 ))]
-pub fn spawn_multiprocess(content: UnprivilegedContent) -> Result<(), Error> {
+pub fn spawn_multiprocess(content: UnprivilegedContent) -> Result<Process, Error> {
     use gaol::sandbox::{self, Sandbox, SandboxMethods};
     use ipc_channel::ipc::{IpcOneShotServer, IpcSender};
 
@@ -208,33 +209,37 @@ pub fn spawn_multiprocess(content: UnprivilegedContent) -> Result<(), Error> {
         .expect("Failed to create IPC one-shot server.");
 
     // If there is a sandbox, use the `gaol` API to create the child process.
-    if content.opts().sandbox {
+    let process = if content.opts().sandbox {
         let mut command = sandbox::Command::me().expect("Failed to get current sandbox.");
         setup_common(&mut command, token);
 
         let profile = content_process_sandbox_profile();
-        let _ = Sandbox::new(profile)
-            .start(&mut command)
-            .expect("Failed to start sandboxed child process!");
+        Process::Sandboxed(
+            Sandbox::new(profile)
+                .start(&mut command)
+                .expect("Failed to start sandboxed child process!")
+                .pid as u32,
+        )
     } else {
         let path_to_self = env::current_exe().expect("Failed to get current executor.");
         let mut child_process = process::Command::new(path_to_self);
         setup_common(&mut child_process, token);
 
-        #[allow(clippy::zombie_processes)]
-        let _ = child_process
-            .spawn()
-            .expect("Failed to start unsandboxed child process!");
-    }
+        Process::Unsandboxed(
+            child_process
+                .spawn()
+                .expect("Failed to start unsandboxed child process!"),
+        )
+    };
 
     let (_receiver, sender) = server.accept().expect("Server failed to accept.");
     sender.send(content)?;
 
-    Ok(())
+    Ok(process)
 }
 
 #[cfg(any(target_os = "windows", target_os = "ios"))]
-pub fn spawn_multiprocess(_content: UnprivilegedContent) -> Result<(), Error> {
+pub fn spawn_multiprocess(_content: UnprivilegedContent) -> Result<Process, Error> {
     log::error!("Multiprocess is not supported on Windows or iOS.");
     process::exit(1);
 }
diff --git a/components/constellation/serviceworker.rs b/components/constellation/serviceworker.rs
index e3de4355fc9..e566b8b01a0 100644
--- a/components/constellation/serviceworker.rs
+++ b/components/constellation/serviceworker.rs
@@ -2,14 +2,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use constellation_traits::{SWManagerSenders, ServiceWorkerManagerFactory};
 use ipc_channel::Error;
-use script_traits::{SWManagerSenders, ServiceWorkerManagerFactory};
+use ipc_channel::ipc::IpcSender;
 use serde::{Deserialize, Serialize};
 use servo_config::opts::{self, Opts};
 use servo_config::prefs;
 use servo_config::prefs::Preferences;
 use servo_url::ImmutableOrigin;
 
+use crate::process_manager::Process;
 use crate::sandboxing::{UnprivilegedContent, spawn_multiprocess};
 
 /// Conceptually, this is glue to start an agent-cluster for a service worker agent.
@@ -20,18 +22,21 @@ pub struct ServiceWorkerUnprivilegedContent {
     prefs: Box<Preferences>,
     senders: SWManagerSenders,
     origin: ImmutableOrigin,
+    lifeline_sender: Option<IpcSender<()>>,
 }
 
 impl ServiceWorkerUnprivilegedContent {
     pub fn new(
         senders: SWManagerSenders,
         origin: ImmutableOrigin,
+        lifeline_sender: Option<IpcSender<()>>,
     ) -> ServiceWorkerUnprivilegedContent {
         ServiceWorkerUnprivilegedContent {
             opts: (*opts::get()).clone(),
             prefs: Box::new(prefs::get().clone()),
             senders,
             origin,
+            lifeline_sender,
         }
     }
 
@@ -44,7 +49,7 @@ impl ServiceWorkerUnprivilegedContent {
     }
 
     /// Start the agent-cluster in it's own process.
-    pub fn spawn_multiprocess(self) -> Result<(), Error> {
+    pub fn spawn_multiprocess(self) -> Result<Process, Error> {
         spawn_multiprocess(UnprivilegedContent::ServiceWorker(self))
     }
 
diff --git a/components/constellation/session_history.rs b/components/constellation/session_history.rs
index 9155ffcfca8..4d7c9979497 100644
--- a/components/constellation/session_history.rs
+++ b/components/constellation/session_history.rs
@@ -6,11 +6,10 @@ use std::cmp::PartialEq;
 use std::fmt;
 
 use base::id::{BrowsingContextId, HistoryStateId, PipelineId, WebViewId};
-use euclid::Size2D;
+use constellation_traits::LoadData;
+use embedder_traits::ViewportDetails;
 use log::debug;
-use script_traits::LoadData;
 use servo_url::ServoUrl;
-use style_traits::CSSPixel;
 
 use crate::browsingcontext::NewBrowsingContextInfo;
 
@@ -127,8 +126,8 @@ pub struct SessionHistoryChange {
     /// easily available when they need to be constructed.
     pub new_browsing_context_info: Option<NewBrowsingContextInfo>,
 
-    /// The size of the viewport for the browsing context.
-    pub window_size: Size2D<f32, CSSPixel>,
+    /// The size and hidpi scale factor of the viewport for the browsing context.
+    pub viewport_details: ViewportDetails,
 }
 
 /// Represents a pipeline or discarded pipeline in a history entry.
diff --git a/components/constellation/tracing.rs b/components/constellation/tracing.rs
index 08e6fecc099..fd7fe7dd251 100644
--- a/components/constellation/tracing.rs
+++ b/components/constellation/tracing.rs
@@ -46,7 +46,7 @@ mod from_compositor {
         };
     }
 
-    impl LogTarget for constellation_traits::ConstellationMsg {
+    impl LogTarget for constellation_traits::EmbedderToConstellationMessage {
         fn log_target(&self) -> &'static str {
             match self {
                 Self::Exit => target!("Exit"),
@@ -58,7 +58,7 @@ mod from_compositor {
                 Self::LoadUrl(..) => target!("LoadUrl"),
                 Self::ClearCache => target!("ClearCache"),
                 Self::TraverseHistory(..) => target!("TraverseHistory"),
-                Self::WindowSize(..) => target!("WindowSize"),
+                Self::ChangeViewportDetails(..) => target!("ChangeViewportDetails"),
                 Self::ThemeChange(..) => target!("ThemeChange"),
                 Self::TickAnimation(..) => target!("TickAnimation"),
                 Self::WebDriverCommand(..) => target!("WebDriverCommand"),
@@ -77,6 +77,7 @@ mod from_compositor {
                 Self::SetWebViewThrottled(_, _) => target!("SetWebViewThrottled"),
                 Self::SetScrollStates(..) => target!("SetScrollStates"),
                 Self::PaintMetric(..) => target!("PaintMetric"),
+                Self::EvaluateJavaScript(..) => target!("EvaluateJavaScript"),
             }
         }
     }
@@ -113,7 +114,7 @@ mod from_script {
         };
     }
 
-    impl LogTarget for script_traits::ScriptMsg {
+    impl LogTarget for constellation_traits::ScriptToConstellationMessage {
         fn log_target(&self) -> &'static str {
             match self {
                 Self::CompleteMessagePortTransfer(..) => target!("CompleteMessagePortTransfer"),
@@ -123,8 +124,8 @@ mod from_script {
                 Self::RemoveMessagePortRouter(..) => target!("RemoveMessagePortRouter"),
                 Self::RerouteMessagePort(..) => target!("RerouteMessagePort"),
                 Self::MessagePortShipped(..) => target!("MessagePortShipped"),
-                Self::RemoveMessagePort(..) => target!("RemoveMessagePort"),
                 Self::EntanglePorts(..) => target!("EntanglePorts"),
+                Self::DisentanglePorts(..) => target!("DisentanglePorts"),
                 Self::NewBroadcastChannelRouter(..) => target!("NewBroadcastChannelRouter"),
                 Self::RemoveBroadcastChannelRouter(..) => target!("RemoveBroadcastChannelRouter"),
                 Self::NewBroadcastChannelNameInRouter(..) => {
@@ -138,7 +139,8 @@ mod from_script {
                 Self::BroadcastStorageEvent(..) => target!("BroadcastStorageEvent"),
                 Self::ChangeRunningAnimationsState(..) => target!("ChangeRunningAnimationsState"),
                 Self::CreateCanvasPaintThread(..) => target!("CreateCanvasPaintThread"),
-                Self::Focus => target!("Focus"),
+                Self::Focus(..) => target!("Focus"),
+                Self::FocusRemoteDocument(..) => target!("FocusRemoteDocument"),
                 Self::GetTopForBrowsingContext(..) => target!("GetTopForBrowsingContext"),
                 Self::GetBrowsingContextInfo(..) => target!("GetBrowsingContextInfo"),
                 Self::GetChildBrowsingContextId(..) => target!("GetChildBrowsingContextId"),
@@ -175,6 +177,7 @@ mod from_script {
                 Self::TitleChanged(..) => target!("TitleChanged"),
                 Self::IFrameSizes(..) => target!("IFrameSizes"),
                 Self::ReportMemory(..) => target!("ReportMemory"),
+                Self::FinishJavaScriptEvaluation(..) => target!("FinishJavaScriptEvaluation"),
             }
         }
     }
@@ -236,6 +239,10 @@ mod from_script {
                 Self::StopGamepadHapticEffect(..) => target_variant!("StopGamepadHapticEffect"),
                 Self::ShutdownComplete => target_variant!("ShutdownComplete"),
                 Self::ShowNotification(..) => target_variant!("ShowNotification"),
+                Self::ShowSelectElementMenu(..) => target_variant!("ShowSelectElementMenu"),
+                Self::FinishJavaScriptEvaluation(..) => {
+                    target_variant!("FinishJavaScriptEvaluation")
+                },
             }
         }
     }
diff --git a/components/constellation/webview.rs b/components/constellation/webview.rs
deleted file mode 100644
index 8b134b62f2e..00000000000
--- a/components/constellation/webview.rs
+++ /dev/null
@@ -1,183 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::collections::HashMap;
-
-use base::id::WebViewId;
-
-#[derive(Debug)]
-pub struct WebViewManager<WebView> {
-    /// Our top-level browsing contexts. In the WebRender scene, their pipelines are the children of
-    /// a single root pipeline that also applies any pinch zoom transformation.
-    webviews: HashMap<WebViewId, WebView>,
-
-    /// The order in which they were focused, latest last.
-    focus_order: Vec<WebViewId>,
-
-    /// Whether the latest webview in focus order is currently focused.
-    is_focused: bool,
-}
-
-impl<WebView> Default for WebViewManager<WebView> {
-    fn default() -> Self {
-        Self {
-            webviews: HashMap::default(),
-            focus_order: Vec::default(),
-            is_focused: false,
-        }
-    }
-}
-
-impl<WebView> WebViewManager<WebView> {
-    pub fn add(&mut self, webview_id: WebViewId, webview: WebView) {
-        self.webviews.insert(webview_id, webview);
-    }
-
-    pub fn remove(&mut self, webview_id: WebViewId) -> Option<WebView> {
-        if self.focus_order.last() == Some(&webview_id) {
-            self.is_focused = false;
-        }
-        self.focus_order.retain(|b| *b != webview_id);
-        self.webviews.remove(&webview_id)
-    }
-
-    pub fn get(&self, webview_id: WebViewId) -> Option<&WebView> {
-        self.webviews.get(&webview_id)
-    }
-
-    pub fn get_mut(&mut self, webview_id: WebViewId) -> Option<&mut WebView> {
-        self.webviews.get_mut(&webview_id)
-    }
-
-    pub fn focused_webview(&self) -> Option<(WebViewId, &WebView)> {
-        if !self.is_focused {
-            return None;
-        }
-
-        if let Some(webview_id) = self.focus_order.last().cloned() {
-            debug_assert!(
-                self.webviews.contains_key(&webview_id),
-                "BUG: webview in .focus_order not in .webviews!",
-            );
-            self.get(webview_id).map(|webview| (webview_id, webview))
-        } else {
-            debug_assert!(false, "BUG: .is_focused but no webviews in .focus_order!");
-            None
-        }
-    }
-
-    pub fn focus(&mut self, webview_id: WebViewId) {
-        debug_assert!(self.webviews.contains_key(&webview_id));
-        self.focus_order.retain(|b| *b != webview_id);
-        self.focus_order.push(webview_id);
-        self.is_focused = true;
-    }
-
-    pub fn unfocus(&mut self) {
-        self.is_focused = false;
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::num::NonZeroU32;
-
-    use base::id::{
-        BrowsingContextId, BrowsingContextIndex, PipelineNamespace, PipelineNamespaceId, WebViewId,
-    };
-
-    use crate::webview::WebViewManager;
-
-    fn id(namespace_id: u32, index: u32) -> WebViewId {
-        WebViewId(BrowsingContextId {
-            namespace_id: PipelineNamespaceId(namespace_id),
-            index: BrowsingContextIndex(NonZeroU32::new(index).expect("Incorrect test case")),
-        })
-    }
-
-    fn webviews_sorted<WebView: Clone>(
-        webviews: &WebViewManager<WebView>,
-    ) -> Vec<(WebViewId, WebView)> {
-        let mut keys = webviews.webviews.keys().collect::<Vec<_>>();
-        keys.sort();
-        keys.iter()
-            .map(|&id| {
-                (
-                    *id,
-                    webviews
-                        .webviews
-                        .get(id)
-                        .cloned()
-                        .expect("Incorrect test case"),
-                )
-            })
-            .collect()
-    }
-
-    #[test]
-    fn test() {
-        PipelineNamespace::install(PipelineNamespaceId(0));
-        let mut webviews = WebViewManager::default();
-
-        // add() adds the webview to the map, but does not focus it.
-        webviews.add(WebViewId::new(), 'a');
-        webviews.add(WebViewId::new(), 'b');
-        webviews.add(WebViewId::new(), 'c');
-        assert_eq!(
-            webviews_sorted(&webviews),
-            vec![(id(0, 1), 'a'), (id(0, 2), 'b'), (id(0, 3), 'c'),]
-        );
-        assert!(webviews.focus_order.is_empty());
-        assert_eq!(webviews.is_focused, false);
-
-        // focus() makes the given webview the latest in focus order.
-        webviews.focus(id(0, 2));
-        assert_eq!(webviews.focus_order, vec![id(0, 2)]);
-        assert_eq!(webviews.is_focused, true);
-        webviews.focus(id(0, 1));
-        assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 1)]);
-        assert_eq!(webviews.is_focused, true);
-        webviews.focus(id(0, 3));
-        assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 1), id(0, 3)]);
-        assert_eq!(webviews.is_focused, true);
-
-        // unfocus() clears the “is focused” flag, but does not touch the focus order.
-        webviews.unfocus();
-        assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 1), id(0, 3)]);
-        assert_eq!(webviews.is_focused, false);
-
-        // focus() avoids duplicates in focus order, when the given webview has been focused before.
-        webviews.focus(id(0, 1));
-        assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 3), id(0, 1)]);
-        assert_eq!(webviews.is_focused, true);
-
-        // remove() clears the “is focused” flag iff the given webview was focused.
-        webviews.remove(id(1, 1));
-        assert_eq!(webviews.is_focused, true);
-        webviews.remove(id(1, 2));
-        assert_eq!(webviews.is_focused, true);
-        webviews.remove(id(2, 1));
-        assert_eq!(webviews.is_focused, true);
-        webviews.remove(id(2, 2));
-        assert_eq!(webviews.is_focused, true);
-        webviews.remove(id(2, 3));
-        assert_eq!(webviews.is_focused, true);
-        webviews.remove(id(2, 4));
-        assert_eq!(webviews.is_focused, true);
-        webviews.remove(id(3, 1));
-        assert_eq!(webviews.is_focused, true);
-        webviews.remove(id(4, 1));
-        assert_eq!(webviews.is_focused, true);
-        webviews.remove(id(0, 2));
-        assert_eq!(webviews.is_focused, true);
-        webviews.remove(id(0, 1));
-        assert_eq!(webviews.is_focused, false);
-        webviews.remove(id(0, 3));
-        assert_eq!(webviews.is_focused, false);
-
-        // remove() removes the given webview from both the map and the focus order.
-        assert!(webviews_sorted(&webviews).is_empty());
-        assert!(webviews.focus_order.is_empty());
-    }
-}
diff --git a/components/constellation/webview_manager.rs b/components/constellation/webview_manager.rs
new file mode 100644
index 00000000000..7d6e98a54ea
--- /dev/null
+++ b/components/constellation/webview_manager.rs
@@ -0,0 +1,179 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::collections::HashMap;
+
+use base::id::WebViewId;
+
+#[derive(Debug)]
+pub struct WebViewManager<WebView> {
+    /// Our top-level browsing contexts. In the WebRender scene, their pipelines are the children of
+    /// a single root pipeline that also applies any pinch zoom transformation.
+    webviews: HashMap<WebViewId, WebView>,
+
+    /// The order in which they were focused, latest last.
+    focus_order: Vec<WebViewId>,
+
+    /// Whether the latest webview in focus order is currently focused.
+    is_focused: bool,
+}
+
+impl<WebView> Default for WebViewManager<WebView> {
+    fn default() -> Self {
+        Self {
+            webviews: HashMap::default(),
+            focus_order: Vec::default(),
+            is_focused: false,
+        }
+    }
+}
+
+impl<WebView> WebViewManager<WebView> {
+    pub fn add(&mut self, webview_id: WebViewId, webview: WebView) {
+        self.webviews.insert(webview_id, webview);
+    }
+
+    pub fn remove(&mut self, webview_id: WebViewId) -> Option<WebView> {
+        if self.focus_order.last() == Some(&webview_id) {
+            self.is_focused = false;
+        }
+        self.focus_order.retain(|b| *b != webview_id);
+        self.webviews.remove(&webview_id)
+    }
+
+    pub fn get(&self, webview_id: WebViewId) -> Option<&WebView> {
+        self.webviews.get(&webview_id)
+    }
+
+    pub fn get_mut(&mut self, webview_id: WebViewId) -> Option<&mut WebView> {
+        self.webviews.get_mut(&webview_id)
+    }
+
+    pub fn focused_webview(&self) -> Option<(WebViewId, &WebView)> {
+        if !self.is_focused {
+            return None;
+        }
+
+        if let Some(webview_id) = self.focus_order.last().cloned() {
+            debug_assert!(
+                self.webviews.contains_key(&webview_id),
+                "BUG: webview in .focus_order not in .webviews!",
+            );
+            self.get(webview_id).map(|webview| (webview_id, webview))
+        } else {
+            debug_assert!(false, "BUG: .is_focused but no webviews in .focus_order!");
+            None
+        }
+    }
+
+    pub fn focus(&mut self, webview_id: WebViewId) {
+        debug_assert!(self.webviews.contains_key(&webview_id));
+        self.focus_order.retain(|b| *b != webview_id);
+        self.focus_order.push(webview_id);
+        self.is_focused = true;
+    }
+
+    pub fn unfocus(&mut self) {
+        self.is_focused = false;
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use base::id::{BrowsingContextId, Index, PipelineNamespace, PipelineNamespaceId, WebViewId};
+
+    use crate::webview_manager::WebViewManager;
+
+    fn id(namespace_id: u32, index: u32) -> WebViewId {
+        WebViewId(BrowsingContextId {
+            namespace_id: PipelineNamespaceId(namespace_id),
+            index: Index::new(index).expect("Incorrect test case"),
+        })
+    }
+
+    fn webviews_sorted<WebView: Clone>(
+        webviews: &WebViewManager<WebView>,
+    ) -> Vec<(WebViewId, WebView)> {
+        let mut keys = webviews.webviews.keys().collect::<Vec<_>>();
+        keys.sort();
+        keys.iter()
+            .map(|&id| {
+                (
+                    *id,
+                    webviews
+                        .webviews
+                        .get(id)
+                        .cloned()
+                        .expect("Incorrect test case"),
+                )
+            })
+            .collect()
+    }
+
+    #[test]
+    fn test() {
+        PipelineNamespace::install(PipelineNamespaceId(0));
+        let mut webviews = WebViewManager::default();
+
+        // add() adds the webview to the map, but does not focus it.
+        webviews.add(WebViewId::new(), 'a');
+        webviews.add(WebViewId::new(), 'b');
+        webviews.add(WebViewId::new(), 'c');
+        assert_eq!(
+            webviews_sorted(&webviews),
+            vec![(id(0, 1), 'a'), (id(0, 2), 'b'), (id(0, 3), 'c'),]
+        );
+        assert!(webviews.focus_order.is_empty());
+        assert_eq!(webviews.is_focused, false);
+
+        // focus() makes the given webview the latest in focus order.
+        webviews.focus(id(0, 2));
+        assert_eq!(webviews.focus_order, vec![id(0, 2)]);
+        assert_eq!(webviews.is_focused, true);
+        webviews.focus(id(0, 1));
+        assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 1)]);
+        assert_eq!(webviews.is_focused, true);
+        webviews.focus(id(0, 3));
+        assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 1), id(0, 3)]);
+        assert_eq!(webviews.is_focused, true);
+
+        // unfocus() clears the “is focused” flag, but does not touch the focus order.
+        webviews.unfocus();
+        assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 1), id(0, 3)]);
+        assert_eq!(webviews.is_focused, false);
+
+        // focus() avoids duplicates in focus order, when the given webview has been focused before.
+        webviews.focus(id(0, 1));
+        assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 3), id(0, 1)]);
+        assert_eq!(webviews.is_focused, true);
+
+        // remove() clears the “is focused” flag iff the given webview was focused.
+        webviews.remove(id(1, 1));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(1, 2));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(2, 1));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(2, 2));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(2, 3));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(2, 4));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(3, 1));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(4, 1));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(0, 2));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(0, 1));
+        assert_eq!(webviews.is_focused, false);
+        webviews.remove(id(0, 3));
+        assert_eq!(webviews.is_focused, false);
+
+        // remove() removes the given webview from both the map and the focus order.
+        assert!(webviews_sorted(&webviews).is_empty());
+        assert!(webviews.focus_order.is_empty());
+    }
+}
diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml
index a74cbb88b9b..bc7322d9ebc 100644
--- a/components/devtools/Cargo.toml
+++ b/components/devtools/Cargo.toml
@@ -11,9 +11,6 @@ rust-version.workspace = true
 name = "devtools"
 path = "lib.rs"
 
-[build-dependencies]
-chrono = { workspace = true }
-
 [dependencies]
 base = { workspace = true }
 chrono = { workspace = true }
@@ -31,3 +28,6 @@ servo_config = { path = "../config" }
 servo_rand = { path = "../rand" }
 servo_url = { path = "../url" }
 uuid = { workspace = true }
+
+[build-dependencies]
+chrono = { workspace = true }
diff --git a/components/devtools/actors/browsing_context.rs b/components/devtools/actors/browsing_context.rs
index 5875f039c66..81a00e82d47 100644
--- a/components/devtools/actors/browsing_context.rs
+++ b/components/devtools/actors/browsing_context.rs
@@ -10,9 +10,12 @@ use std::cell::{Cell, RefCell};
 use std::collections::HashMap;
 use std::net::TcpStream;
 
-use base::id::{BrowsingContextId, PipelineId, WebViewId};
-use devtools_traits::DevtoolScriptControlMsg::{self, GetCssDatabase, WantsLiveNotifications};
+use base::id::PipelineId;
+use devtools_traits::DevtoolScriptControlMsg::{
+    self, GetCssDatabase, SimulateColorScheme, WantsLiveNotifications,
+};
 use devtools_traits::{DevtoolsPageInfo, NavigationState};
+use embedder_traits::Theme;
 use ipc_channel::ipc::{self, IpcSender};
 use serde::Serialize;
 use serde_json::{Map, Value};
@@ -26,9 +29,17 @@ use crate::actors::stylesheets::StyleSheetsActor;
 use crate::actors::tab::TabDescriptorActor;
 use crate::actors::thread::ThreadActor;
 use crate::actors::watcher::{SessionContext, SessionContextType, WatcherActor};
+use crate::id::{DevtoolsBrowserId, DevtoolsBrowsingContextId, DevtoolsOuterWindowId, IdMap};
 use crate::protocol::JsonPacketStream;
+use crate::resource::ResourceAvailable;
 use crate::{EmptyReplyMsg, StreamId};
 
+#[derive(Serialize)]
+struct ListWorkersReply {
+    from: String,
+    workers: Vec<()>,
+}
+
 #[derive(Serialize)]
 struct FrameUpdateReply {
     from: String,
@@ -46,14 +57,6 @@ struct FrameUpdateMsg {
     title: String,
 }
 
-#[derive(Serialize)]
-struct ResourceAvailableReply<T: Serialize> {
-    from: String,
-    #[serde(rename = "type")]
-    type_: String,
-    array: Vec<(String, Vec<T>)>,
-}
-
 #[derive(Serialize)]
 struct TabNavigated {
     from: String,
@@ -124,10 +127,11 @@ pub(crate) struct BrowsingContextActor {
     pub name: String,
     pub title: RefCell<String>,
     pub url: RefCell<String>,
-    /// This correspond to webview_id
-    pub browser_id: WebViewId,
-    pub active_pipeline: Cell<PipelineId>,
-    pub browsing_context_id: BrowsingContextId,
+    /// This corresponds to webview_id
+    pub browser_id: DevtoolsBrowserId,
+    pub active_pipeline_id: Cell<PipelineId>,
+    pub active_outer_window_id: Cell<DevtoolsOuterWindowId>,
+    pub browsing_context_id: DevtoolsBrowsingContextId,
     pub accessibility: String,
     pub console: String,
     pub css_properties: String,
@@ -141,6 +145,12 @@ pub(crate) struct BrowsingContextActor {
     pub watcher: String,
 }
 
+impl ResourceAvailable for BrowsingContextActor {
+    fn actor_name(&self) -> String {
+        self.name.clone()
+    }
+}
+
 impl Actor for BrowsingContextActor {
     fn name(&self) -> String {
         self.name.clone()
@@ -161,6 +171,14 @@ impl Actor for BrowsingContextActor {
                 let _ = stream.write_json_packet(&msg);
                 ActorMessageStatus::Processed
             },
+            "listWorkers" => {
+                let _ = stream.write_json_packet(&ListWorkersReply {
+                    from: self.name(),
+                    // TODO: Find out what needs to be listed here
+                    workers: vec![],
+                });
+                ActorMessageStatus::Processed
+            },
             _ => ActorMessageStatus::Ignored,
         })
     }
@@ -169,19 +187,21 @@ impl Actor for BrowsingContextActor {
         self.streams.borrow_mut().remove(&id);
         if self.streams.borrow().is_empty() {
             self.script_chan
-                .send(WantsLiveNotifications(self.active_pipeline.get(), false))
+                .send(WantsLiveNotifications(self.active_pipeline_id.get(), false))
                 .unwrap();
         }
     }
 }
 
 impl BrowsingContextActor {
+    #[allow(clippy::too_many_arguments)]
     pub(crate) fn new(
         console: String,
-        browser_id: WebViewId,
-        browsing_context_id: BrowsingContextId,
+        browser_id: DevtoolsBrowserId,
+        browsing_context_id: DevtoolsBrowsingContextId,
         page_info: DevtoolsPageInfo,
         pipeline_id: PipelineId,
+        outer_window_id: DevtoolsOuterWindowId,
         script_sender: IpcSender<DevtoolScriptControlMsg>,
         actors: &mut ActorRegistry,
     ) -> BrowsingContextActor {
@@ -230,7 +250,8 @@ impl BrowsingContextActor {
             script_chan: script_sender,
             title: RefCell::new(title),
             url: RefCell::new(url.into_string()),
-            active_pipeline: Cell::new(pipeline_id),
+            active_pipeline_id: Cell::new(pipeline_id),
+            active_outer_window_id: Cell::new(outer_window_id),
             browser_id,
             browsing_context_id,
             accessibility: accessibility.name(),
@@ -270,11 +291,9 @@ impl BrowsingContextActor {
             },
             title: self.title.borrow().clone(),
             url: self.url.borrow().clone(),
-            browser_id: self.browser_id.0.index.0.get(),
-            //FIXME: shouldn't ignore pipeline namespace field
-            browsing_context_id: self.browsing_context_id.index.0.get(),
-            //FIXME: shouldn't ignore pipeline namespace field
-            outer_window_id: self.active_pipeline.get().index.0.get(),
+            browser_id: self.browser_id.value(),
+            browsing_context_id: self.browsing_context_id.value(),
+            outer_window_id: self.active_outer_window_id.get().value(),
             is_top_level_target: true,
             accessibility_actor: self.accessibility.clone(),
             console_actor: self.console.clone(),
@@ -286,15 +305,17 @@ impl BrowsingContextActor {
         }
     }
 
-    pub(crate) fn navigate(&self, state: NavigationState) {
-        let (pipeline, title, url, state) = match state {
+    pub(crate) fn navigate(&self, state: NavigationState, id_map: &mut IdMap) {
+        let (pipeline_id, title, url, state) = match state {
             NavigationState::Start(url) => (None, None, url, "start"),
             NavigationState::Stop(pipeline, info) => {
                 (Some(pipeline), Some(info.title), info.url, "stop")
             },
         };
-        if let Some(p) = pipeline {
-            self.active_pipeline.set(p);
+        if let Some(pipeline_id) = pipeline_id {
+            let outer_window_id = id_map.outer_window_id(pipeline_id);
+            self.active_outer_window_id.set(outer_window_id);
+            self.active_pipeline_id.set(pipeline_id);
         }
         url.as_str().clone_into(&mut self.url.borrow_mut());
         if let Some(ref t) = title {
@@ -317,7 +338,7 @@ impl BrowsingContextActor {
     }
 
     pub(crate) fn title_changed(&self, pipeline_id: PipelineId, title: String) {
-        if pipeline_id != self.active_pipeline.get() {
+        if pipeline_id != self.active_pipeline_id.get() {
             return;
         }
         *self.title.borrow_mut() = title;
@@ -328,7 +349,7 @@ impl BrowsingContextActor {
             from: self.name(),
             type_: "frameUpdate".into(),
             frames: vec![FrameUpdateMsg {
-                id: self.browsing_context_id.index.0.get(),
+                id: self.browsing_context_id.value(),
                 is_top_level: true,
                 title: self.title.borrow().clone(),
                 url: self.url.borrow().clone(),
@@ -336,15 +357,9 @@ impl BrowsingContextActor {
         });
     }
 
-    pub(crate) fn resource_available<T: Serialize>(&self, message: T, resource_type: String) {
-        let msg = ResourceAvailableReply::<T> {
-            from: self.name(),
-            type_: "resources-available-array".into(),
-            array: vec![(resource_type, vec![message])],
-        };
-
-        for stream in self.streams.borrow_mut().values_mut() {
-            let _ = stream.write_json_packet(&msg);
-        }
+    pub fn simulate_color_scheme(&self, theme: Theme) -> Result<(), ()> {
+        self.script_chan
+            .send(SimulateColorScheme(self.active_pipeline_id.get(), theme))
+            .map_err(|_| ())
     }
 }
diff --git a/components/devtools/actors/console.rs b/components/devtools/actors/console.rs
index bd22ef8e7b6..fd0bd184bfa 100644
--- a/components/devtools/actors/console.rs
+++ b/components/devtools/actors/console.rs
@@ -30,6 +30,7 @@ use crate::actors::browsing_context::BrowsingContextActor;
 use crate::actors::object::ObjectActor;
 use crate::actors::worker::WorkerActor;
 use crate::protocol::JsonPacketStream;
+use crate::resource::ResourceAvailable;
 use crate::{StreamId, UniqueId};
 
 trait EncodableConsoleMessage {
@@ -152,7 +153,7 @@ impl ConsoleActor {
             Root::BrowsingContext(bc) => UniqueId::Pipeline(
                 registry
                     .find::<BrowsingContextActor>(bc)
-                    .active_pipeline
+                    .active_pipeline_id
                     .get(),
             ),
             Root::DedicatedWorker(w) => UniqueId::Worker(registry.find::<WorkerActor>(w).worker_id),
@@ -251,6 +252,7 @@ impl ConsoleActor {
         page_error: PageError,
         id: UniqueId,
         registry: &ActorRegistry,
+        stream: &mut TcpStream,
     ) {
         self.cached_events
             .borrow_mut()
@@ -261,7 +263,11 @@ impl ConsoleActor {
             if let Root::BrowsingContext(bc) = &self.root {
                 registry
                     .find::<BrowsingContextActor>(bc)
-                    .resource_available(PageErrorWrapper { page_error }, "error-message".into())
+                    .resource_available(
+                        PageErrorWrapper { page_error },
+                        "error-message".into(),
+                        stream,
+                    )
             };
         }
     }
@@ -271,6 +277,7 @@ impl ConsoleActor {
         console_message: ConsoleMessage,
         id: UniqueId,
         registry: &ActorRegistry,
+        stream: &mut TcpStream,
     ) {
         let log_message: ConsoleLog = console_message.into();
         self.cached_events
@@ -282,7 +289,7 @@ impl ConsoleActor {
             if let Root::BrowsingContext(bc) = &self.root {
                 registry
                     .find::<BrowsingContextActor>(bc)
-                    .resource_available(log_message, "console-message".into())
+                    .resource_available(log_message, "console-message".into(), stream)
             };
         }
     }
diff --git a/components/devtools/actors/inspector.rs b/components/devtools/actors/inspector.rs
index 0dd886ada9f..28a4d7ccf94 100644
--- a/components/devtools/actors/inspector.rs
+++ b/components/devtools/actors/inspector.rs
@@ -80,7 +80,7 @@ impl Actor for InspectorActor {
         _id: StreamId,
     ) -> Result<ActorMessageStatus, ()> {
         let browsing_context = registry.find::<BrowsingContextActor>(&self.browsing_context);
-        let pipeline = browsing_context.active_pipeline.get();
+        let pipeline = browsing_context.active_pipeline_id.get();
         Ok(match msg_type {
             "getWalker" => {
                 let (tx, rx) = ipc::channel().unwrap();
@@ -166,6 +166,8 @@ impl Actor for InspectorActor {
                 if self.highlighter.borrow().is_none() {
                     let highlighter_actor = HighlighterActor {
                         name: registry.new_name("highlighter"),
+                        pipeline,
+                        script_sender: self.script_chan.clone(),
                     };
                     let mut highlighter = self.highlighter.borrow_mut();
                     *highlighter = Some(highlighter_actor.name());
diff --git a/components/devtools/actors/inspector/highlighter.rs b/components/devtools/actors/inspector/highlighter.rs
index f75d25f2175..0dbf2b1e52f 100644
--- a/components/devtools/actors/inspector/highlighter.rs
+++ b/components/devtools/actors/inspector/highlighter.rs
@@ -7,6 +7,9 @@
 
 use std::net::TcpStream;
 
+use base::id::PipelineId;
+use devtools_traits::DevtoolScriptControlMsg;
+use ipc_channel::ipc::IpcSender;
 use serde::Serialize;
 use serde_json::{self, Map, Value};
 
@@ -21,6 +24,8 @@ pub struct HighlighterMsg {
 
 pub struct HighlighterActor {
     pub name: String,
+    pub script_sender: IpcSender<DevtoolScriptControlMsg>,
+    pub pipeline: PipelineId,
 }
 
 #[derive(Serialize)]
@@ -41,14 +46,39 @@ impl Actor for HighlighterActor {
     /// - `hide`: Disables highlighting for the selected node
     fn handle_message(
         &self,
-        _registry: &ActorRegistry,
+        registry: &ActorRegistry,
         msg_type: &str,
-        _msg: &Map<String, Value>,
+        msg: &Map<String, Value>,
         stream: &mut TcpStream,
         _id: StreamId,
     ) -> Result<ActorMessageStatus, ()> {
         Ok(match msg_type {
             "show" => {
+                let Some(node_actor) = msg.get("node") else {
+                    // TODO: send missing parameter error
+                    return Ok(ActorMessageStatus::Ignored);
+                };
+
+                let Some(node_actor_name) = node_actor.as_str() else {
+                    // TODO: send invalid parameter error
+                    return Ok(ActorMessageStatus::Ignored);
+                };
+
+                if node_actor_name.starts_with("inspector") {
+                    // TODO: For some reason, the client initially asks us to highlight
+                    // the inspector? Investigate what this is supposed to mean.
+                    let msg = ShowReply {
+                        from: self.name(),
+                        value: false,
+                    };
+                    let _ = stream.write_json_packet(&msg);
+                    return Ok(ActorMessageStatus::Processed);
+                }
+
+                self.instruct_script_thread_to_highlight_node(
+                    Some(node_actor_name.to_owned()),
+                    registry,
+                );
                 let msg = ShowReply {
                     from: self.name(),
                     value: true,
@@ -58,6 +88,8 @@ impl Actor for HighlighterActor {
             },
 
             "hide" => {
+                self.instruct_script_thread_to_highlight_node(None, registry);
+
                 let msg = EmptyReplyMsg { from: self.name() };
                 let _ = stream.write_json_packet(&msg);
                 ActorMessageStatus::Processed
@@ -67,3 +99,19 @@ impl Actor for HighlighterActor {
         })
     }
 }
+
+impl HighlighterActor {
+    fn instruct_script_thread_to_highlight_node(
+        &self,
+        node_actor: Option<String>,
+        registry: &ActorRegistry,
+    ) {
+        let node_id = node_actor.map(|node_actor| registry.actor_to_script(node_actor));
+        self.script_sender
+            .send(DevtoolScriptControlMsg::HighlightDomNode(
+                self.pipeline,
+                node_id,
+            ))
+            .unwrap();
+    }
+}
diff --git a/components/devtools/actors/inspector/node.rs b/components/devtools/actors/inspector/node.rs
index 10ff9801844..a731f15b2d8 100644
--- a/components/devtools/actors/inspector/node.rs
+++ b/components/devtools/actors/inspector/node.rs
@@ -78,6 +78,18 @@ pub struct NodeActorMsg {
     shadow_root_mode: Option<String>,
     traits: HashMap<String, ()>,
     attrs: Vec<AttrMsg>,
+
+    /// The `DOCTYPE` name if this is a `DocumentType` node, `None` otherwise
+    #[serde(skip_serializing_if = "Option::is_none")]
+    name: Option<String>,
+
+    /// The `DOCTYPE` public identifier if this is a `DocumentType` node, `None` otherwise
+    #[serde(skip_serializing_if = "Option::is_none")]
+    public_id: Option<String>,
+
+    /// The `DOCTYPE` system identifier if this is a `DocumentType` node, `None` otherwise
+    #[serde(skip_serializing_if = "Option::is_none")]
+    system_id: Option<String>,
 }
 
 pub struct NodeActor {
@@ -276,6 +288,9 @@ impl NodeInfoToProtocol for NodeInfo {
                     value: attr.value,
                 })
                 .collect(),
+            name: self.doctype_name,
+            public_id: self.doctype_public_identifier,
+            system_id: self.doctype_system_identifier,
         }
     }
 }
diff --git a/components/devtools/actors/root.rs b/components/devtools/actors/root.rs
index 2fb3c4de722..8ad21fc4bda 100644
--- a/components/devtools/actors/root.rs
+++ b/components/devtools/actors/root.rs
@@ -9,6 +9,7 @@
 //!
 //! [Firefox JS implementation]: https://searchfox.org/mozilla-central/source/devtools/server/actors/root.js
 
+use std::cell::RefCell;
 use std::net::TcpStream;
 
 use serde::Serialize;
@@ -129,6 +130,7 @@ pub struct RootActor {
     pub device: String,
     pub preference: String,
     pub process: String,
+    pub active_tab: RefCell<Option<String>>,
 }
 
 impl Actor for RootActor {
@@ -303,13 +305,24 @@ impl RootActor {
         registry: &ActorRegistry,
         browser_id: u32,
     ) -> Option<TabDescriptorActorMsg> {
-        self.tabs
+        let tab_msg = self
+            .tabs
             .iter()
             .map(|target| {
                 registry
                     .find::<TabDescriptorActor>(target)
                     .encodable(registry, true)
             })
-            .find(|tab| tab.browser_id() == browser_id)
+            .find(|tab| tab.browser_id() == browser_id);
+
+        if let Some(ref msg) = tab_msg {
+            *self.active_tab.borrow_mut() = Some(msg.actor());
+        }
+        tab_msg
+    }
+
+    #[allow(dead_code)]
+    pub fn active_tab(&self) -> Option<String> {
+        self.active_tab.borrow().clone()
     }
 }
diff --git a/components/devtools/actors/source.rs b/components/devtools/actors/source.rs
new file mode 100644
index 00000000000..9d29bc1d3ef
--- /dev/null
+++ b/components/devtools/actors/source.rs
@@ -0,0 +1,50 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::cell::{Ref, RefCell};
+use std::collections::BTreeSet;
+
+use serde::Serialize;
+use servo_url::ServoUrl;
+
+#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct SourceData {
+    pub actor: String,
+    /// URL of the script, or URL of the page for inline scripts.
+    pub url: String,
+    pub is_black_boxed: bool,
+}
+
+#[derive(Serialize)]
+pub(crate) struct SourcesReply {
+    pub from: String,
+    pub sources: Vec<SourceData>,
+}
+
+pub(crate) struct Source {
+    actor_name: String,
+    source_urls: RefCell<BTreeSet<SourceData>>,
+}
+
+impl Source {
+    pub fn new(actor_name: String) -> Self {
+        Self {
+            actor_name,
+            source_urls: RefCell::new(BTreeSet::default()),
+        }
+    }
+
+    pub fn add_source(&self, url: ServoUrl) {
+        self.source_urls.borrow_mut().insert(SourceData {
+            actor: self.actor_name.clone(),
+            url: url.to_string(),
+            is_black_boxed: false,
+        });
+    }
+
+    pub fn sources(&self) -> Ref<BTreeSet<SourceData>> {
+        self.source_urls.borrow()
+    }
+}
diff --git a/components/devtools/actors/tab.rs b/components/devtools/actors/tab.rs
index 702e765535e..4a1c60b06c3 100644
--- a/components/devtools/actors/tab.rs
+++ b/components/devtools/actors/tab.rs
@@ -43,6 +43,10 @@ impl TabDescriptorActorMsg {
     pub fn browser_id(&self) -> u32 {
         self.browser_id
     }
+
+    pub fn actor(&self) -> String {
+        self.actor.clone()
+    }
 }
 
 #[derive(Serialize)]
@@ -142,18 +146,15 @@ impl TabDescriptorActor {
 
     pub fn encodable(&self, registry: &ActorRegistry, selected: bool) -> TabDescriptorActorMsg {
         let ctx_actor = registry.find::<BrowsingContextActor>(&self.browsing_context_actor);
-        let browser_id = ctx_actor.browser_id.0.index.0.get();
-        let browsing_context_id = ctx_actor.browsing_context_id.index.0.get();
-        let outer_window_id = ctx_actor.active_pipeline.get().index.0.get();
         let title = ctx_actor.title.borrow().clone();
         let url = ctx_actor.url.borrow().clone();
 
         TabDescriptorActorMsg {
             actor: self.name(),
-            browser_id,
-            browsing_context_id,
+            browser_id: ctx_actor.browser_id.value(),
+            browsing_context_id: ctx_actor.browsing_context_id.value(),
             is_zombie_tab: false,
-            outer_window_id,
+            outer_window_id: ctx_actor.active_outer_window_id.get().value(),
             selected,
             title,
             traits: DescriptorTraits {
@@ -167,4 +168,9 @@ impl TabDescriptorActor {
     pub(crate) fn is_top_level_global(&self) -> bool {
         self.is_top_level_global
     }
+
+    #[allow(dead_code)]
+    pub fn browsing_context(&self) -> String {
+        self.browsing_context_actor.clone()
+    }
 }
diff --git a/components/devtools/actors/thread.rs b/components/devtools/actors/thread.rs
index 6e272cd3d28..7ff11dff675 100644
--- a/components/devtools/actors/thread.rs
+++ b/components/devtools/actors/thread.rs
@@ -7,6 +7,7 @@ use std::net::TcpStream;
 use serde::Serialize;
 use serde_json::{Map, Value};
 
+use super::source::{Source, SourcesReply};
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::JsonPacketStream;
 use crate::{EmptyReplyMsg, StreamId};
@@ -49,22 +50,17 @@ struct ThreadInterruptedReply {
     type_: String,
 }
 
-#[derive(Serialize)]
-struct SourcesReply {
-    from: String,
-    sources: Vec<Source>,
-}
-
-#[derive(Serialize)]
-enum Source {}
-
 pub struct ThreadActor {
-    name: String,
+    pub name: String,
+    pub source_manager: Source,
 }
 
 impl ThreadActor {
     pub fn new(name: String) -> ThreadActor {
-        ThreadActor { name }
+        ThreadActor {
+            name: name.clone(),
+            source_manager: Source::new(name),
+        }
     }
 }
 
@@ -125,6 +121,8 @@ impl Actor for ThreadActor {
                 ActorMessageStatus::Processed
             },
 
+            // Client has attached to the thread and wants to load script sources.
+            // <https://firefox-source-docs.mozilla.org/devtools/backend/protocol.html#loading-script-sources>
             "sources" => {
                 let msg = SourcesReply {
                     from: self.name(),
diff --git a/components/devtools/actors/watcher.rs b/components/devtools/actors/watcher.rs
index 94a15b36e7a..061ffc92336 100644
--- a/components/devtools/actors/watcher.rs
+++ b/components/devtools/actors/watcher.rs
@@ -19,8 +19,11 @@ use serde::Serialize;
 use serde_json::{Map, Value};
 
 use self::network_parent::{NetworkParentActor, NetworkParentActorMsg};
+use super::thread::ThreadActor;
+use super::worker::WorkerMsg;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::actors::browsing_context::{BrowsingContextActor, BrowsingContextActorMsg};
+use crate::actors::root::RootActor;
 use crate::actors::watcher::target_configuration::{
     TargetConfigurationActor, TargetConfigurationActorMsg,
 };
@@ -28,7 +31,8 @@ use crate::actors::watcher::thread_configuration::{
     ThreadConfigurationActor, ThreadConfigurationActorMsg,
 };
 use crate::protocol::JsonPacketStream;
-use crate::{EmptyReplyMsg, StreamId};
+use crate::resource::ResourceAvailable;
+use crate::{EmptyReplyMsg, StreamId, WorkerActor};
 
 pub mod network_parent;
 pub mod target_configuration;
@@ -53,7 +57,7 @@ impl SessionContext {
             supported_targets: HashMap::from([
                 ("frame", true),
                 ("process", false),
-                ("worker", false),
+                ("worker", true),
                 ("service_worker", false),
                 ("shared_worker", false),
             ]),
@@ -78,7 +82,7 @@ impl SessionContext {
                 ("network-event-stacktrace", false),
                 ("reflow", false),
                 ("stylesheet", false),
-                ("source", false),
+                ("source", true),
                 ("thread-state", false),
                 ("server-sent-event", false),
                 ("websocket", false),
@@ -100,12 +104,19 @@ pub enum SessionContextType {
     _All,
 }
 
+#[derive(Serialize)]
+#[serde(untagged)]
+enum TargetActorMsg {
+    BrowsingContext(BrowsingContextActorMsg),
+    Worker(WorkerMsg),
+}
+
 #[derive(Serialize)]
 struct WatchTargetsReply {
     from: String,
     #[serde(rename = "type")]
     type_: String,
-    target: BrowsingContextActorMsg,
+    target: TargetActorMsg,
 }
 
 #[derive(Serialize)]
@@ -133,6 +144,18 @@ struct GetThreadConfigurationActorReply {
     configuration: ThreadConfigurationActorMsg,
 }
 
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
+struct GetBreakpointListActorReply {
+    from: String,
+    breakpoint_list: GetBreakpointListActorReplyInner,
+}
+
+#[derive(Serialize)]
+struct GetBreakpointListActorReplyInner {
+    actor: String,
+}
+
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
 struct DocumentEvent {
@@ -198,16 +221,38 @@ impl Actor for WatcherActor {
         _id: StreamId,
     ) -> Result<ActorMessageStatus, ()> {
         let target = registry.find::<BrowsingContextActor>(&self.browsing_context_actor);
+        let root = registry.find::<RootActor>("root");
         Ok(match msg_type {
             "watchTargets" => {
-                let msg = WatchTargetsReply {
-                    from: self.name(),
-                    type_: "target-available-form".into(),
-                    target: target.encodable(),
-                };
-                let _ = stream.write_json_packet(&msg);
+                // As per logs we either get targetType as "frame" or "worker"
+                let target_type = msg
+                    .get("targetType")
+                    .and_then(Value::as_str)
+                    .unwrap_or("frame"); // default to "frame"
 
-                target.frame_update(stream);
+                if target_type == "frame" {
+                    let msg = WatchTargetsReply {
+                        from: self.name(),
+                        type_: "target-available-form".into(),
+                        target: TargetActorMsg::BrowsingContext(target.encodable()),
+                    };
+                    let _ = stream.write_json_packet(&msg);
+
+                    target.frame_update(stream);
+                } else if target_type == "worker" {
+                    for worker_name in &root.workers {
+                        let worker = registry.find::<WorkerActor>(worker_name);
+                        let worker_msg = WatchTargetsReply {
+                            from: self.name(),
+                            type_: "target-available-form".into(),
+                            target: TargetActorMsg::Worker(worker.encodable()),
+                        };
+                        let _ = stream.write_json_packet(&worker_msg);
+                    }
+                } else {
+                    warn!("Unexpected target_type: {}", target_type);
+                    return Ok(ActorMessageStatus::Ignored);
+                }
 
                 // Messages that contain a `type` field are used to send event callbacks, but they
                 // don't count as a reply. Since every message needs to be responded, we send an
@@ -246,7 +291,28 @@ impl Actor for WatcherActor {
                                     title: Some(target.title.borrow().clone()),
                                     url: Some(target.url.borrow().clone()),
                                 };
-                                target.resource_available(event, "document-event".into());
+                                target.resource_available(event, "document-event".into(), stream);
+                            }
+                        },
+                        "source" => {
+                            let thread_actor = registry.find::<ThreadActor>(&target.thread);
+                            let sources = thread_actor.source_manager.sources();
+                            target.resources_available(
+                                sources.iter().collect(),
+                                "source".into(),
+                                stream,
+                            );
+
+                            for worker_name in &root.workers {
+                                let worker = registry.find::<WorkerActor>(worker_name);
+                                let thread = registry.find::<ThreadActor>(&worker.thread);
+                                let worker_sources = thread.source_manager.sources();
+
+                                worker.resources_available(
+                                    worker_sources.iter().collect(),
+                                    "source".into(),
+                                    stream,
+                                );
                             }
                         },
                         "console-message" | "error-message" => {},
@@ -259,10 +325,9 @@ impl Actor for WatcherActor {
                 ActorMessageStatus::Processed
             },
             "getParentBrowsingContextID" => {
-                let browsing_context_id = target.browsing_context_id.index.0.get();
                 let msg = GetParentBrowsingContextIDReply {
                     from: self.name(),
-                    browsing_context_id,
+                    browsing_context_id: target.browsing_context_id.value(),
                 };
                 let _ = stream.write_json_packet(&msg);
                 ActorMessageStatus::Processed
@@ -296,6 +361,15 @@ impl Actor for WatcherActor {
                 let _ = stream.write_json_packet(&msg);
                 ActorMessageStatus::Processed
             },
+            "getBreakpointListActor" => {
+                let _ = stream.write_json_packet(&GetBreakpointListActorReply {
+                    from: self.name(),
+                    breakpoint_list: GetBreakpointListActorReplyInner {
+                        actor: registry.new_name("breakpoint-list"),
+                    },
+                });
+                ActorMessageStatus::Processed
+            },
             _ => ActorMessageStatus::Ignored,
         })
     }
diff --git a/components/devtools/actors/watcher/target_configuration.rs b/components/devtools/actors/watcher/target_configuration.rs
index 7b83cdde698..0d366e81475 100644
--- a/components/devtools/actors/watcher/target_configuration.rs
+++ b/components/devtools/actors/watcher/target_configuration.rs
@@ -8,12 +8,16 @@
 use std::collections::HashMap;
 use std::net::TcpStream;
 
+use embedder_traits::Theme;
+use log::warn;
 use serde::Serialize;
 use serde_json::{Map, Value};
 
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::actors::browsing_context::BrowsingContextActor;
+use crate::actors::tab::TabDescriptorActor;
 use crate::protocol::JsonPacketStream;
-use crate::{EmptyReplyMsg, StreamId};
+use crate::{EmptyReplyMsg, RootActor, StreamId};
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -44,15 +48,39 @@ impl Actor for TargetConfigurationActor {
     /// - `updateConfiguration`: Receives new configuration flags from the devtools host.
     fn handle_message(
         &self,
-        _registry: &ActorRegistry,
+        registry: &ActorRegistry,
         msg_type: &str,
-        _msg: &Map<String, Value>,
+        msg: &Map<String, Value>,
         stream: &mut TcpStream,
         _id: StreamId,
     ) -> Result<ActorMessageStatus, ()> {
         Ok(match msg_type {
             "updateConfiguration" => {
-                // TODO: Actually update configuration
+                let config = match msg.get("configuration").and_then(|v| v.as_object()) {
+                    Some(config) => config,
+                    None => {
+                        let msg = EmptyReplyMsg { from: self.name() };
+                        let _ = stream.write_json_packet(&msg);
+                        return Ok(ActorMessageStatus::Processed);
+                    },
+                };
+                if let Some(scheme) = config.get("colorSchemeSimulation").and_then(|v| v.as_str()) {
+                    let theme = match scheme {
+                        "dark" => Theme::Dark,
+                        "light" => Theme::Light,
+                        _ => Theme::Light,
+                    };
+                    let root_actor = registry.find::<RootActor>("root");
+                    if let Some(tab_name) = root_actor.active_tab() {
+                        let tab_actor = registry.find::<TabDescriptorActor>(&tab_name);
+                        let browsing_context_name = tab_actor.browsing_context();
+                        let browsing_context_actor =
+                            registry.find::<BrowsingContextActor>(&browsing_context_name);
+                        browsing_context_actor.simulate_color_scheme(theme)?;
+                    } else {
+                        warn!("No active tab for updateConfiguration");
+                    }
+                }
                 let msg = EmptyReplyMsg { from: self.name() };
                 let _ = stream.write_json_packet(&msg);
                 ActorMessageStatus::Processed
@@ -69,7 +97,7 @@ impl TargetConfigurationActor {
             configuration: HashMap::new(),
             supported_options: HashMap::from([
                 ("cacheDisabled", false),
-                ("colorSchemeSimulation", false),
+                ("colorSchemeSimulation", true),
                 ("customFormatters", false),
                 ("customUserAgent", false),
                 ("javascriptEnabled", false),
diff --git a/components/devtools/actors/worker.rs b/components/devtools/actors/worker.rs
index b5d1370c320..f3ca4f2aed7 100644
--- a/components/devtools/actors/worker.rs
+++ b/components/devtools/actors/worker.rs
@@ -17,6 +17,7 @@ use servo_url::ServoUrl;
 use crate::StreamId;
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::JsonPacketStream;
+use crate::resource::ResourceAvailable;
 
 #[derive(Clone, Copy)]
 #[allow(dead_code)]
@@ -43,16 +44,24 @@ impl WorkerActor {
             actor: self.name.clone(),
             console_actor: self.console.clone(),
             thread_actor: self.thread.clone(),
-            worker_id: self.worker_id.0.to_string(),
+            id: self.worker_id.0.to_string(),
             url: self.url.to_string(),
             traits: WorkerTraits {
                 is_parent_intercept_enabled: false,
+                supports_top_level_target_flag: false,
             },
             type_: self.type_ as u32,
+            target_type: "worker".to_string(),
         }
     }
 }
 
+impl ResourceAvailable for WorkerActor {
+    fn actor_name(&self) -> String {
+        self.name.clone()
+    }
+}
+
 impl Actor for WorkerActor {
     fn name(&self) -> String {
         self.name.clone()
@@ -149,6 +158,7 @@ struct ConnectReply {
 #[serde(rename_all = "camelCase")]
 struct WorkerTraits {
     is_parent_intercept_enabled: bool,
+    supports_top_level_target_flag: bool,
 }
 
 #[derive(Serialize)]
@@ -157,9 +167,11 @@ pub(crate) struct WorkerMsg {
     actor: String,
     console_actor: String,
     thread_actor: String,
-    worker_id: String,
+    id: String,
     url: String,
     traits: WorkerTraits,
     #[serde(rename = "type")]
     type_: u32,
+    #[serde(rename = "targetType")]
+    target_type: String,
 }
diff --git a/components/devtools/id.rs b/components/devtools/id.rs
new file mode 100644
index 00000000000..40408d91f95
--- /dev/null
+++ b/components/devtools/id.rs
@@ -0,0 +1,175 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::collections::HashMap;
+
+use base::id::{BrowsingContextId, PipelineId, WebViewId};
+
+#[derive(Debug, Default)]
+pub(crate) struct IdMap {
+    pub(crate) browser_ids: HashMap<WebViewId, u32>,
+    pub(crate) browsing_context_ids: HashMap<BrowsingContextId, u32>,
+    pub(crate) outer_window_ids: HashMap<PipelineId, u32>,
+}
+
+impl IdMap {
+    pub(crate) fn browser_id(&mut self, webview_id: WebViewId) -> DevtoolsBrowserId {
+        let len = self
+            .browser_ids
+            .len()
+            .checked_add(1)
+            .expect("WebViewId count overflow")
+            .try_into()
+            .expect("DevtoolsBrowserId overflow");
+        DevtoolsBrowserId(*self.browser_ids.entry(webview_id).or_insert(len))
+    }
+    pub(crate) fn browsing_context_id(
+        &mut self,
+        browsing_context_id: BrowsingContextId,
+    ) -> DevtoolsBrowsingContextId {
+        let len = self
+            .browsing_context_ids
+            .len()
+            .checked_add(1)
+            .expect("BrowsingContextId count overflow")
+            .try_into()
+            .expect("DevtoolsBrowsingContextId overflow");
+        DevtoolsBrowsingContextId(
+            *self
+                .browsing_context_ids
+                .entry(browsing_context_id)
+                .or_insert(len),
+        )
+    }
+    pub(crate) fn outer_window_id(&mut self, pipeline_id: PipelineId) -> DevtoolsOuterWindowId {
+        let len = self
+            .outer_window_ids
+            .len()
+            .checked_add(1)
+            .expect("PipelineId count overflow")
+            .try_into()
+            .expect("DevtoolsOuterWindowId overflow");
+        DevtoolsOuterWindowId(*self.outer_window_ids.entry(pipeline_id).or_insert(len))
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub(crate) struct DevtoolsBrowserId(u32);
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub(crate) struct DevtoolsBrowsingContextId(u32);
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub(crate) struct DevtoolsOuterWindowId(u32);
+
+impl DevtoolsBrowserId {
+    pub(crate) fn value(&self) -> u32 {
+        self.0
+    }
+}
+
+impl DevtoolsBrowsingContextId {
+    pub(crate) fn value(&self) -> u32 {
+        self.0
+    }
+}
+
+impl DevtoolsOuterWindowId {
+    pub(crate) fn value(&self) -> u32 {
+        self.0
+    }
+}
+
+#[test]
+pub(crate) fn test_id_map() {
+    use std::thread;
+
+    use base::id::{PipelineNamespace, PipelineNamespaceId};
+    use crossbeam_channel::unbounded;
+
+    macro_rules! test_sequential_id_assignment {
+        ($id_type:ident, $new_id_function:expr, $map_id_function:expr) => {
+            let (sender, receiver) = unbounded();
+            let sender1 = sender.clone();
+            let sender2 = sender.clone();
+            let sender3 = sender.clone();
+            let threads = [
+                thread::spawn(move || {
+                    PipelineNamespace::install(PipelineNamespaceId(1));
+                    sender1.send($new_id_function()).expect("Send failed");
+                    sender1.send($new_id_function()).expect("Send failed");
+                    sender1.send($new_id_function()).expect("Send failed");
+                }),
+                thread::spawn(move || {
+                    PipelineNamespace::install(PipelineNamespaceId(2));
+                    sender2.send($new_id_function()).expect("Send failed");
+                    sender2.send($new_id_function()).expect("Send failed");
+                    sender2.send($new_id_function()).expect("Send failed");
+                }),
+                thread::spawn(move || {
+                    PipelineNamespace::install(PipelineNamespaceId(3));
+                    sender3.send($new_id_function()).expect("Send failed");
+                    sender3.send($new_id_function()).expect("Send failed");
+                    sender3.send($new_id_function()).expect("Send failed");
+                }),
+            ];
+            for thread in threads {
+                thread.join().expect("Thread join failed");
+            }
+            let mut id_map = IdMap::default();
+            assert_eq!(
+                $map_id_function(&mut id_map, receiver.recv().expect("Recv failed")),
+                $id_type(1)
+            );
+            assert_eq!(
+                $map_id_function(&mut id_map, receiver.recv().expect("Recv failed")),
+                $id_type(2)
+            );
+            assert_eq!(
+                $map_id_function(&mut id_map, receiver.recv().expect("Recv failed")),
+                $id_type(3)
+            );
+            assert_eq!(
+                $map_id_function(&mut id_map, receiver.recv().expect("Recv failed")),
+                $id_type(4)
+            );
+            assert_eq!(
+                $map_id_function(&mut id_map, receiver.recv().expect("Recv failed")),
+                $id_type(5)
+            );
+            assert_eq!(
+                $map_id_function(&mut id_map, receiver.recv().expect("Recv failed")),
+                $id_type(6)
+            );
+            assert_eq!(
+                $map_id_function(&mut id_map, receiver.recv().expect("Recv failed")),
+                $id_type(7)
+            );
+            assert_eq!(
+                $map_id_function(&mut id_map, receiver.recv().expect("Recv failed")),
+                $id_type(8)
+            );
+            assert_eq!(
+                $map_id_function(&mut id_map, receiver.recv().expect("Recv failed")),
+                $id_type(9)
+            );
+        };
+    }
+
+    test_sequential_id_assignment!(
+        DevtoolsBrowserId,
+        || WebViewId::new(),
+        |id_map: &mut IdMap, id| id_map.browser_id(id)
+    );
+    test_sequential_id_assignment!(
+        DevtoolsBrowsingContextId,
+        || BrowsingContextId::new(),
+        |id_map: &mut IdMap, id| id_map.browsing_context_id(id)
+    );
+    test_sequential_id_assignment!(
+        DevtoolsOuterWindowId,
+        || PipelineId::new(),
+        |id_map: &mut IdMap, id| id_map.outer_window_id(id)
+    );
+}
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs
index eb3aa80dbf9..d097cb25e9d 100644
--- a/components/devtools/lib.rs
+++ b/components/devtools/lib.rs
@@ -19,16 +19,18 @@ use std::net::{Shutdown, TcpListener, TcpStream};
 use std::sync::{Arc, Mutex};
 use std::thread;
 
+use actors::source::SourceData;
 use base::id::{BrowsingContextId, PipelineId, WebViewId};
 use crossbeam_channel::{Receiver, Sender, unbounded};
 use devtools_traits::{
     ChromeToDevtoolsControlMsg, ConsoleMessage, ConsoleMessageBuilder, DevtoolScriptControlMsg,
     DevtoolsControlMsg, DevtoolsPageInfo, LogLevel, NavigationState, NetworkEvent, PageError,
-    ScriptToDevtoolsControlMsg, WorkerId,
+    ScriptToDevtoolsControlMsg, SourceInfo, WorkerId,
 };
 use embedder_traits::{AllowOrDeny, EmbedderMsg, EmbedderProxy};
 use ipc_channel::ipc::{self, IpcSender};
 use log::trace;
+use resource::ResourceAvailable;
 use serde::Serialize;
 use servo_rand::RngCore;
 
@@ -44,6 +46,7 @@ use crate::actors::process::ProcessActor;
 use crate::actors::root::RootActor;
 use crate::actors::thread::ThreadActor;
 use crate::actors::worker::{WorkerActor, WorkerType};
+use crate::id::IdMap;
 use crate::network_handler::handle_network_event;
 use crate::protocol::JsonPacketStream;
 
@@ -63,6 +66,7 @@ mod actors {
     pub mod process;
     pub mod reflow;
     pub mod root;
+    pub mod source;
     pub mod stylesheets;
     pub mod tab;
     pub mod thread;
@@ -70,8 +74,10 @@ mod actors {
     pub mod watcher;
     pub mod worker;
 }
+mod id;
 mod network_handler;
 mod protocol;
+mod resource;
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
 enum UniqueId {
@@ -106,6 +112,7 @@ pub(crate) struct StreamId(u32);
 
 struct DevtoolsInstance {
     actors: Arc<Mutex<ActorRegistry>>,
+    id_map: Arc<Mutex<IdMap>>,
     browsing_contexts: HashMap<BrowsingContextId, String>,
     receiver: Receiver<DevtoolsControlMsg>,
     pipelines: HashMap<PipelineId, BrowsingContextId>,
@@ -153,6 +160,7 @@ impl DevtoolsInstance {
             performance: performance.name(),
             preference: preference.name(),
             process: process.name(),
+            active_tab: None.into(),
         });
 
         registry.register(root);
@@ -166,6 +174,7 @@ impl DevtoolsInstance {
 
         let instance = Self {
             actors,
+            id_map: Arc::new(Mutex::new(IdMap::default())),
             browsing_contexts: HashMap::new(),
             pipelines: HashMap::new(),
             receiver,
@@ -242,6 +251,10 @@ impl DevtoolsInstance {
                     console_message,
                     worker_id,
                 )) => self.handle_console_message(pipeline_id, worker_id, console_message),
+                DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::ScriptSourceLoaded(
+                    pipeline_id,
+                    source_info,
+                )) => self.handle_script_source_info(pipeline_id, source_info),
                 DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::ReportPageError(
                     pipeline_id,
                     page_error,
@@ -298,7 +311,7 @@ impl DevtoolsInstance {
             .lock()
             .unwrap()
             .find::<BrowsingContextActor>(actor_name)
-            .navigate(state);
+            .navigate(state, &mut self.id_map.lock().expect("Mutex poisoned"));
     }
 
     // We need separate actor representations for each script global that exists;
@@ -313,6 +326,10 @@ impl DevtoolsInstance {
         let mut actors = self.actors.lock().unwrap();
 
         let (browsing_context_id, pipeline_id, worker_id, webview_id) = ids;
+        let id_map = &mut self.id_map.lock().expect("Mutex poisoned");
+        let devtools_browser_id = id_map.browser_id(webview_id);
+        let devtools_browsing_context_id = id_map.browsing_context_id(browsing_context_id);
+        let devtools_outer_window_id = id_map.outer_window_id(pipeline_id);
 
         let console_name = actors.new_name("console");
 
@@ -320,7 +337,7 @@ impl DevtoolsInstance {
             assert!(self.pipelines.contains_key(&pipeline_id));
             assert!(self.browsing_contexts.contains_key(&browsing_context_id));
 
-            let thread = ThreadActor::new(actors.new_name("context"));
+            let thread = ThreadActor::new(actors.new_name("thread"));
             let thread_name = thread.name();
             actors.register(Box::new(thread));
 
@@ -350,10 +367,11 @@ impl DevtoolsInstance {
                 .or_insert_with(|| {
                     let browsing_context_actor = BrowsingContextActor::new(
                         console_name.clone(),
-                        webview_id,
-                        browsing_context_id,
+                        devtools_browser_id,
+                        devtools_browsing_context_id,
                         page_info,
                         pipeline_id,
+                        devtools_outer_window_id,
                         script_sender,
                         &mut actors,
                     );
@@ -396,7 +414,7 @@ impl DevtoolsInstance {
     }
 
     fn handle_page_error(
-        &self,
+        &mut self,
         pipeline_id: PipelineId,
         worker_id: Option<WorkerId>,
         page_error: PageError,
@@ -408,11 +426,13 @@ impl DevtoolsInstance {
         let actors = self.actors.lock().unwrap();
         let console_actor = actors.find::<ConsoleActor>(&console_actor_name);
         let id = worker_id.map_or(UniqueId::Pipeline(pipeline_id), UniqueId::Worker);
-        console_actor.handle_page_error(page_error, id, &actors);
+        for stream in self.connections.values_mut() {
+            console_actor.handle_page_error(page_error.clone(), id.clone(), &actors, stream);
+        }
     }
 
     fn handle_console_message(
-        &self,
+        &mut self,
         pipeline_id: PipelineId,
         worker_id: Option<WorkerId>,
         console_message: ConsoleMessage,
@@ -424,7 +444,9 @@ impl DevtoolsInstance {
         let actors = self.actors.lock().unwrap();
         let console_actor = actors.find::<ConsoleActor>(&console_actor_name);
         let id = worker_id.map_or(UniqueId::Pipeline(pipeline_id), UniqueId::Worker);
-        console_actor.handle_console_api(console_message, id, &actors);
+        for stream in self.connections.values_mut() {
+            console_actor.handle_console_api(console_message.clone(), id.clone(), &actors, stream);
+        }
     }
 
     fn find_console_actor(
@@ -488,6 +510,65 @@ impl DevtoolsInstance {
             },
         }
     }
+
+    fn handle_script_source_info(&mut self, pipeline_id: PipelineId, source_info: SourceInfo) {
+        let mut actors = self.actors.lock().unwrap();
+
+        if let Some(worker_id) = source_info.worker_id {
+            let Some(worker_actor_name) = self.actor_workers.get(&worker_id) else {
+                return;
+            };
+
+            let thread_actor_name = actors.find::<WorkerActor>(worker_actor_name).thread.clone();
+
+            let thread_actor = actors.find_mut::<ThreadActor>(&thread_actor_name);
+            thread_actor
+                .source_manager
+                .add_source(source_info.url.clone());
+
+            let source = SourceData {
+                actor: thread_actor_name.clone(),
+                url: source_info.url.to_string(),
+                is_black_boxed: false,
+            };
+
+            let worker_actor = actors.find::<WorkerActor>(worker_actor_name);
+
+            for stream in self.connections.values_mut() {
+                worker_actor.resource_available(&source, "source".into(), stream);
+            }
+        } else {
+            let Some(browsing_context_id) = self.pipelines.get(&pipeline_id) else {
+                return;
+            };
+            let Some(actor_name) = self.browsing_contexts.get(browsing_context_id) else {
+                return;
+            };
+
+            let thread_actor_name = actors
+                .find::<BrowsingContextActor>(actor_name)
+                .thread
+                .clone();
+
+            let thread_actor = actors.find_mut::<ThreadActor>(&thread_actor_name);
+            thread_actor
+                .source_manager
+                .add_source(source_info.url.clone());
+
+            let source = SourceData {
+                actor: thread_actor_name.clone(),
+                url: source_info.url.to_string(),
+                is_black_boxed: false,
+            };
+
+            // Notify browsing context about the new source
+            let browsing_context = actors.find::<BrowsingContextActor>(actor_name);
+
+            for stream in self.connections.values_mut() {
+                browsing_context.resource_available(&source, "source".into(), stream);
+            }
+        }
+    }
 }
 
 fn allow_devtools_client(stream: &mut TcpStream, embedder: &EmbedderProxy, token: &str) -> bool {
diff --git a/components/devtools/resource.rs b/components/devtools/resource.rs
new file mode 100644
index 00000000000..4e6aa4042b8
--- /dev/null
+++ b/components/devtools/resource.rs
@@ -0,0 +1,45 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::net::TcpStream;
+
+use serde::Serialize;
+
+use crate::protocol::JsonPacketStream;
+
+#[derive(Serialize)]
+pub(crate) struct ResourceAvailableReply<T: Serialize> {
+    pub from: String,
+    #[serde(rename = "type")]
+    pub type_: String,
+    pub array: Vec<(String, Vec<T>)>,
+}
+
+pub(crate) trait ResourceAvailable {
+    fn actor_name(&self) -> String;
+
+    fn resource_available<T: Serialize>(
+        &self,
+        resource: T,
+        resource_type: String,
+        stream: &mut TcpStream,
+    ) {
+        self.resources_available(vec![resource], resource_type, stream);
+    }
+
+    fn resources_available<T: Serialize>(
+        &self,
+        resources: Vec<T>,
+        resource_type: String,
+        stream: &mut TcpStream,
+    ) {
+        let msg = ResourceAvailableReply::<T> {
+            from: self.actor_name(),
+            type_: "resources-available-array".into(),
+            array: vec![(resource_type, resources)],
+        };
+
+        let _ = stream.write_json_packet(&msg);
+    }
+}
diff --git a/components/fonts/Cargo.toml b/components/fonts/Cargo.toml
index 15f5d6e81e2..ce51a9f9112 100644
--- a/components/fonts/Cargo.toml
+++ b/components/fonts/Cargo.toml
@@ -21,10 +21,11 @@ app_units = { workspace = true }
 atomic_refcell = { workspace = true }
 base = { workspace = true }
 bitflags = { workspace = true }
+compositing_traits = { workspace = true }
 euclid = { workspace = true }
 fnv = { workspace = true }
-fontsan = { git = "https://github.com/servo/fontsan" }
 fonts_traits = { workspace = true }
+fontsan = { git = "https://github.com/servo/fontsan" }
 # FIXME (#34517): macOS only needs this when building libservo without `--features media-gstreamer`
 harfbuzz-sys = { workspace = true, features = ["bundled"] }
 ipc-channel = { workspace = true }
@@ -37,23 +38,20 @@ memmap2 = { workspace = true }
 net_traits = { workspace = true }
 num-traits = { workspace = true }
 parking_lot = { workspace = true }
+profile_traits = { workspace = true }
 range = { path = "../range" }
 serde = { workspace = true }
 servo_arc = { workspace = true }
-stylo_atoms = { workspace = true }
 servo_config = { path = "../config" }
 servo_url = { path = "../url" }
 smallvec = { workspace = true, features = ["union"] }
 stylo = { workspace = true }
+stylo_atoms = { workspace = true }
 tracing = { workspace = true, optional = true }
 unicode-properties = { workspace = true }
 unicode-script = { workspace = true }
 url = { workspace = true }
 webrender_api = { workspace = true }
-webrender_traits = { workspace = true }
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(ohos_mock)'] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 byteorder = { workspace = true }
@@ -74,3 +72,6 @@ xml-rs = "0.8"
 [target.'cfg(target_os = "windows")'.dependencies]
 dwrote = "0.11.2"
 truetype = { version = "0.47.3", features = ["ignore-invalid-language-ids"] }
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(ohos_mock)'] }
diff --git a/components/fonts/font_context.rs b/components/fonts/font_context.rs
index b11a922abdf..58c08b29d3e 100644
--- a/components/fonts/font_context.rs
+++ b/components/fonts/font_context.rs
@@ -10,6 +10,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
 
 use app_units::Au;
 use base::id::WebViewId;
+use compositing_traits::CrossProcessCompositorApi;
 use fnv::FnvHasher;
 use fonts_traits::StylesheetWebFontLoadFinishedCallback;
 use log::{debug, trace};
@@ -32,7 +33,6 @@ use style::stylesheets::{CssRule, DocumentStyleSheet, FontFaceRule, StylesheetIn
 use style::values::computed::font::{FamilyName, FontFamilyNameSyntax, SingleFontFamily};
 use url::Url;
 use webrender_api::{FontInstanceFlags, FontInstanceKey, FontKey};
-use webrender_traits::CrossProcessCompositorApi;
 
 use crate::font::{
     Font, FontDescriptor, FontFamilyDescriptor, FontGroup, FontRef, FontSearchScope,
@@ -900,9 +900,9 @@ impl RemoteWebFontDownloader {
         response_message: FetchResponseMsg,
     ) -> DownloaderResponseResult {
         match response_message {
-            FetchResponseMsg::ProcessRequestBody(..) | FetchResponseMsg::ProcessRequestEOF(..) => {
-                DownloaderResponseResult::InProcess
-            },
+            FetchResponseMsg::ProcessRequestBody(..) |
+            FetchResponseMsg::ProcessRequestEOF(..) |
+            FetchResponseMsg::ProcessCspViolations(..) => DownloaderResponseResult::InProcess,
             FetchResponseMsg::ProcessResponse(_, meta_result) => {
                 trace!(
                     "@font-face {} metadata ok={:?}",
diff --git a/components/fonts/font_store.rs b/components/fonts/font_store.rs
index 826be947672..0099c56c266 100644
--- a/components/fonts/font_store.rs
+++ b/components/fonts/font_store.rs
@@ -5,8 +5,8 @@
 use std::collections::HashMap;
 use std::sync::Arc;
 
-use atomic_refcell::AtomicRefCell;
 use log::warn;
+use malloc_size_of_derive::MallocSizeOf;
 use parking_lot::RwLock;
 use style::stylesheets::DocumentStyleSheet;
 use style::values::computed::{FontStyle, FontWeight};
@@ -15,7 +15,7 @@ use crate::font::FontDescriptor;
 use crate::font_template::{FontTemplate, FontTemplateRef, FontTemplateRefMethods, IsOblique};
 use crate::system_font_service::{FontIdentifier, LowercaseFontFamilyName};
 
-#[derive(Default)]
+#[derive(Default, MallocSizeOf)]
 pub struct FontStore {
     pub(crate) families: HashMap<LowercaseFontFamilyName, FontTemplates>,
     web_fonts_loading_for_stylesheets: Vec<(DocumentStyleSheet, usize)>,
@@ -134,7 +134,7 @@ impl FontStore {
 ///
 /// This optimization is taken from:
 /// <https://searchfox.org/mozilla-central/source/gfx/thebes/gfxFontEntry.cpp>.
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug, Default, MallocSizeOf)]
 struct SimpleFamily {
     regular: Option<FontTemplateRef>,
     bold: Option<FontTemplateRef>,
@@ -190,7 +190,7 @@ impl SimpleFamily {
     }
 }
 /// A list of font templates that make up a given font family.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, MallocSizeOf)]
 pub struct FontTemplates {
     pub(crate) templates: Vec<FontTemplateRef>,
     simple_family: Option<SimpleFamily>,
@@ -263,7 +263,7 @@ impl FontTemplates {
             }
         }
 
-        let new_template = Arc::new(AtomicRefCell::new(new_template));
+        let new_template = FontTemplateRef::new(new_template);
         self.templates.push(new_template.clone());
         self.update_simple_family(new_template);
     }
diff --git a/components/fonts/font_template.rs b/components/fonts/font_template.rs
index eca1017d14e..b8173ee0317 100644
--- a/components/fonts/font_template.rs
+++ b/components/fonts/font_template.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use std::fmt::{Debug, Error, Formatter};
-use std::ops::RangeInclusive;
+use std::ops::{Deref, RangeInclusive};
 use std::sync::Arc;
 
 use atomic_refcell::AtomicRefCell;
@@ -20,7 +20,21 @@ use crate::system_font_service::{
 };
 
 /// A reference to a [`FontTemplate`] with shared ownership and mutability.
-pub type FontTemplateRef = Arc<AtomicRefCell<FontTemplate>>;
+#[derive(Clone, Debug, MallocSizeOf)]
+pub struct FontTemplateRef(#[conditional_malloc_size_of] Arc<AtomicRefCell<FontTemplate>>);
+
+impl FontTemplateRef {
+    pub fn new(template: FontTemplate) -> Self {
+        Self(Arc::new(AtomicRefCell::new(template)))
+    }
+}
+
+impl Deref for FontTemplateRef {
+    type Target = Arc<AtomicRefCell<FontTemplate>>;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
 
 /// Describes how to select a font from a given family. This is very basic at the moment and needs
 /// to be expanded or refactored when we support more of the font styling parameters.
diff --git a/components/fonts/glyph.rs b/components/fonts/glyph.rs
index e0e85ed7f74..db97ee0ebee 100644
--- a/components/fonts/glyph.rs
+++ b/components/fonts/glyph.rs
@@ -741,9 +741,10 @@ impl fmt::Debug for GlyphStore {
 }
 
 /// A single series of glyphs within a text run.
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
 pub struct GlyphRun {
     /// The glyphs.
+    #[conditional_malloc_size_of]
     pub glyph_store: Arc<GlyphStore>,
     /// The byte range of characters in the containing run.
     pub range: Range<ByteIndex>,
diff --git a/components/fonts/system_font_service.rs b/components/fonts/system_font_service.rs
index 61b36e699df..f799affa7c8 100644
--- a/components/fonts/system_font_service.rs
+++ b/components/fonts/system_font_service.rs
@@ -6,15 +6,19 @@ use std::borrow::ToOwned;
 use std::cell::OnceCell;
 use std::collections::HashMap;
 use std::ops::{Deref, RangeInclusive};
-use std::sync::Arc;
 use std::{fmt, thread};
 
 use app_units::Au;
-use atomic_refcell::AtomicRefCell;
+use compositing_traits::CrossProcessCompositorApi;
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use log::debug;
+use malloc_size_of::MallocSizeOf as MallocSizeOfTrait;
 use malloc_size_of_derive::MallocSizeOf;
 use parking_lot::{Mutex, RwLock};
+use profile_traits::mem::{
+    ProcessReports, ProfilerChan, Report, ReportKind, ReportsChan, perform_memory_report,
+};
+use profile_traits::path;
 use serde::{Deserialize, Serialize};
 use servo_config::pref;
 use servo_url::ServoUrl;
@@ -25,7 +29,6 @@ use style::values::computed::font::{
 use style::values::computed::{FontStretch, FontWeight};
 use style::values::specified::FontStretch as SpecifiedFontStretch;
 use webrender_api::{FontInstanceFlags, FontInstanceKey, FontKey};
-use webrender_traits::CrossProcessCompositorApi;
 
 use crate::font::FontDescriptor;
 use crate::font_store::FontStore;
@@ -66,11 +69,12 @@ pub enum SystemFontServiceMessage {
     ),
     GetFontKey(IpcSender<FontKey>),
     GetFontInstanceKey(IpcSender<FontInstanceKey>),
+    CollectMemoryReport(ReportsChan),
     Exit(IpcSender<()>),
     Ping,
 }
 
-#[derive(Default)]
+#[derive(Default, MallocSizeOf)]
 struct ResolvedGenericFontFamilies {
     default: OnceCell<LowercaseFontFamilyName>,
     serif: OnceCell<LowercaseFontFamilyName>,
@@ -84,6 +88,7 @@ struct ResolvedGenericFontFamilies {
 /// The system font service. There is one of these for every Servo instance. This is a thread,
 /// responsible for reading the list of system fonts, handling requests to match against
 /// them, and ensuring that only one copy of system font data is loaded at a time.
+#[derive(MallocSizeOf)]
 pub struct SystemFontService {
     port: IpcReceiver<SystemFontServiceMessage>,
     local_families: FontStore,
@@ -118,8 +123,12 @@ impl SystemFontServiceProxySender {
 }
 
 impl SystemFontService {
-    pub fn spawn(compositor_api: CrossProcessCompositorApi) -> SystemFontServiceProxySender {
+    pub fn spawn(
+        compositor_api: CrossProcessCompositorApi,
+        memory_profiler_sender: ProfilerChan,
+    ) -> SystemFontServiceProxySender {
         let (sender, receiver) = ipc::channel().unwrap();
+        let memory_reporter_sender = sender.clone();
 
         thread::Builder::new()
             .name("SystemFontService".to_owned())
@@ -138,7 +147,13 @@ impl SystemFontService {
 
                 cache.fetch_new_keys();
                 cache.refresh_local_families();
-                cache.run();
+
+                memory_profiler_sender.run_with_memory_reporting(
+                    || cache.run(),
+                    "system-fonts".to_owned(),
+                    memory_reporter_sender,
+                    SystemFontServiceMessage::CollectMemoryReport,
+                );
             })
             .expect("Thread spawning failed");
 
@@ -172,6 +187,9 @@ impl SystemFontService {
                     self.fetch_new_keys();
                     let _ = result_sender.send(self.free_font_instance_keys.pop().unwrap());
                 },
+                SystemFontServiceMessage::CollectMemoryReport(report_sender) => {
+                    self.collect_memory_report(report_sender);
+                },
                 SystemFontServiceMessage::Ping => (),
                 SystemFontServiceMessage::Exit(result) => {
                     let _ = result.send(());
@@ -181,6 +199,17 @@ impl SystemFontService {
         }
     }
 
+    fn collect_memory_report(&self, report_sender: ReportsChan) {
+        perform_memory_report(|ops| {
+            let reports = vec![Report {
+                path: path!["system-fonts"],
+                kind: ReportKind::ExplicitSystemHeapSize,
+                size: self.size_of(ops),
+            }];
+            report_sender.send(ProcessReports::new(reports));
+        });
+    }
+
     #[cfg_attr(
         feature = "tracing",
         tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
@@ -528,11 +557,7 @@ impl SystemFontServiceProxy {
             panic!("SystemFontService has already exited.");
         };
 
-        let templates: Vec<_> = templates
-            .into_iter()
-            .map(AtomicRefCell::new)
-            .map(Arc::new)
-            .collect();
+        let templates: Vec<_> = templates.into_iter().map(FontTemplateRef::new).collect();
         self.templates.write().insert(cache_key, templates.clone());
 
         templates
diff --git a/components/fonts/tests/font.rs b/components/fonts/tests/font.rs
index 78c507e7b93..a473be9222b 100644
--- a/components/fonts/tests/font.rs
+++ b/components/fonts/tests/font.rs
@@ -5,14 +5,13 @@
 use std::fs::File;
 use std::io::Read;
 use std::path::PathBuf;
-use std::sync::Arc;
 
 use app_units::Au;
 use euclid::num::Zero;
 use fonts::platform::font::PlatformFont;
 use fonts::{
-    Font, FontData, FontDescriptor, FontIdentifier, FontTemplate, PlatformFontMethods,
-    ShapingFlags, ShapingOptions,
+    Font, FontData, FontDescriptor, FontIdentifier, FontTemplate, FontTemplateRef,
+    PlatformFontMethods, ShapingFlags, ShapingOptions,
 };
 use servo_url::ServoUrl;
 use style::properties::longhands::font_variant_caps::computed_value::T as FontVariantCaps;
@@ -42,13 +41,7 @@ fn make_font(path: PathBuf) -> Font {
         variant: FontVariantCaps::Normal,
         pt_size: Au::from_px(24),
     };
-    Font::new(
-        Arc::new(atomic_refcell::AtomicRefCell::new(template)),
-        descriptor,
-        Some(data),
-        None,
-    )
-    .unwrap()
+    Font::new(FontTemplateRef::new(template), descriptor, Some(data), None).unwrap()
 }
 
 #[test]
diff --git a/components/fonts/tests/font_context.rs b/components/fonts/tests/font_context.rs
index ed102069eee..0793c1e4ce1 100644
--- a/components/fonts/tests/font_context.rs
+++ b/components/fonts/tests/font_context.rs
@@ -14,6 +14,7 @@ mod font_context {
     use std::thread;
 
     use app_units::Au;
+    use compositing_traits::CrossProcessCompositorApi;
     use fonts::platform::font::PlatformFont;
     use fonts::{
         FallbackFontSelectionOptions, FontContext, FontDescriptor, FontFamilyDescriptor,
@@ -34,7 +35,6 @@ mod font_context {
     };
     use stylo_atoms::Atom;
     use webrender_api::{FontInstanceKey, FontKey, IdNamespace};
-    use webrender_traits::CrossProcessCompositorApi;
 
     struct TestContext {
         context: FontContext,
@@ -137,6 +137,7 @@ mod font_context {
                         break;
                     },
                     SystemFontServiceMessage::Ping => {},
+                    SystemFontServiceMessage::CollectMemoryReport(..) => {},
                 }
             }
         }
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
new file mode 100644
index 00000000000..0505581fba7
--- /dev/null
+++ b/components/layout/Cargo.toml
@@ -0,0 +1,69 @@
+[package]
+name = "layout"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
+rust-version.workspace = true
+
+[lib]
+name = "layout"
+path = "lib.rs"
+test = true
+doctest = false
+
+[features]
+tracing = ["dep:tracing"]
+
+[dependencies]
+app_units = { workspace = true }
+atomic_refcell = { workspace = true }
+base = { workspace = true }
+bitflags = { workspace = true }
+canvas_traits = { workspace = true }
+compositing_traits = { workspace = true }
+constellation_traits = { workspace = true }
+data-url = { workspace = true }
+embedder_traits = { workspace = true }
+euclid = { workspace = true }
+fnv = { workspace = true }
+fonts = { path = "../fonts" }
+fonts_traits = { workspace = true }
+fxhash = { workspace = true }
+html5ever = { workspace = true }
+icu_locid = { workspace = true }
+icu_segmenter = { workspace = true }
+ipc-channel = { workspace = true }
+itertools = { workspace = true }
+log = { workspace = true }
+malloc_size_of = { workspace = true }
+malloc_size_of_derive = { workspace = true }
+net_traits = { workspace = true }
+parking_lot = { workspace = true }
+pixels = { path = "../pixels" }
+profile_traits = { workspace = true }
+range = { path = "../range" }
+rayon = { workspace = true }
+script = { path = "../script" }
+script_layout_interface = { workspace = true }
+script_traits = { workspace = true }
+selectors = { workspace = true }
+servo_arc = { workspace = true }
+servo_config = { path = "../config" }
+servo_geometry = { path = "../geometry" }
+servo_url = { path = "../url" }
+stylo = { workspace = true }
+stylo_atoms = { workspace = true }
+stylo_traits = { workspace = true }
+taffy = { workspace = true }
+tracing = { workspace = true, optional = true }
+unicode-bidi = { workspace = true }
+unicode-script = { workspace = true }
+url = { workspace = true }
+webrender_api = { workspace = true }
+xi-unicode = { workspace = true }
+
+[dev-dependencies]
+num-traits = { workspace = true }
+quickcheck = "1"
diff --git a/components/layout_2020/cell.rs b/components/layout/cell.rs
similarity index 89%
rename from components/layout_2020/cell.rs
rename to components/layout/cell.rs
index 910a6ab2104..8b35fdf7943 100644
--- a/components/layout_2020/cell.rs
+++ b/components/layout/cell.rs
@@ -6,9 +6,12 @@ use std::fmt;
 use std::ops::Deref;
 
 use atomic_refcell::AtomicRefCell;
+use malloc_size_of_derive::MallocSizeOf;
 use servo_arc::Arc;
 
-pub(crate) struct ArcRefCell<T> {
+#[derive(MallocSizeOf)]
+pub struct ArcRefCell<T> {
+    #[conditional_malloc_size_of]
     value: Arc<AtomicRefCell<T>>,
 }
 
diff --git a/components/layout_2020/construct_modern.rs b/components/layout/construct_modern.rs
similarity index 82%
rename from components/layout_2020/construct_modern.rs
rename to components/layout/construct_modern.rs
index e66082234ee..8f1282ec9f6 100644
--- a/components/layout_2020/construct_modern.rs
+++ b/components/layout/construct_modern.rs
@@ -5,12 +5,14 @@
 //! Layout construction code that is shared between modern layout modes (Flexbox and CSS Grid)
 
 use std::borrow::Cow;
+use std::sync::LazyLock;
 
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
+use style::selector_parser::PseudoElement;
 
 use crate::PropagatedBoxTreeData;
 use crate::context::LayoutContext;
-use crate::dom::{BoxSlot, NodeExt};
+use crate::dom::BoxSlot;
 use crate::dom_traversal::{Contents, NodeAndStyleInfo, TraversalHandler};
 use crate::flow::inline::construct::InlineFormattingContextBuilder;
 use crate::flow::{BlockContainer, BlockFormattingContext};
@@ -22,32 +24,32 @@ use crate::layout_box_base::LayoutBoxBase;
 use crate::style_ext::DisplayGeneratingBox;
 
 /// A builder used for both flex and grid containers.
-pub(crate) struct ModernContainerBuilder<'a, 'dom, Node> {
+pub(crate) struct ModernContainerBuilder<'a, 'dom> {
     context: &'a LayoutContext<'a>,
-    info: &'a NodeAndStyleInfo<Node>,
+    info: &'a NodeAndStyleInfo<'dom>,
     propagated_data: PropagatedBoxTreeData,
-    contiguous_text_runs: Vec<ModernContainerTextRun<'dom, Node>>,
+    contiguous_text_runs: Vec<ModernContainerTextRun<'dom>>,
     /// To be run in parallel with rayon in `finish`
-    jobs: Vec<ModernContainerJob<'dom, Node>>,
+    jobs: Vec<ModernContainerJob<'dom>>,
     has_text_runs: bool,
 }
 
-enum ModernContainerJob<'dom, Node> {
+enum ModernContainerJob<'dom> {
     ElementOrPseudoElement {
-        info: NodeAndStyleInfo<Node>,
+        info: NodeAndStyleInfo<'dom>,
         display: DisplayGeneratingBox,
         contents: Contents,
         box_slot: BoxSlot<'dom>,
     },
-    TextRuns(Vec<ModernContainerTextRun<'dom, Node>>),
+    TextRuns(Vec<ModernContainerTextRun<'dom>>),
 }
 
-struct ModernContainerTextRun<'dom, Node> {
-    info: NodeAndStyleInfo<Node>,
+struct ModernContainerTextRun<'dom> {
+    info: NodeAndStyleInfo<'dom>,
     text: Cow<'dom, str>,
 }
 
-impl<Node> ModernContainerTextRun<'_, Node> {
+impl ModernContainerTextRun<'_> {
     /// <https://drafts.csswg.org/css-text/#white-space>
     fn is_only_document_white_space(&self) -> bool {
         // FIXME: is this the right definition? See
@@ -71,11 +73,8 @@ pub(crate) struct ModernItem<'dom> {
     pub formatting_context: IndependentFormattingContext,
 }
 
-impl<'dom, Node: 'dom> TraversalHandler<'dom, Node> for ModernContainerBuilder<'_, 'dom, Node>
-where
-    Node: NodeExt<'dom>,
-{
-    fn handle_text(&mut self, info: &NodeAndStyleInfo<Node>, text: Cow<'dom, str>) {
+impl<'dom> TraversalHandler<'dom> for ModernContainerBuilder<'_, 'dom> {
+    fn handle_text(&mut self, info: &NodeAndStyleInfo<'dom>, text: Cow<'dom, str>) {
         self.contiguous_text_runs.push(ModernContainerTextRun {
             info: info.clone(),
             text,
@@ -85,7 +84,7 @@ where
     /// Or pseudo-element
     fn handle_element(
         &mut self,
-        info: &NodeAndStyleInfo<Node>,
+        info: &NodeAndStyleInfo<'dom>,
         display: DisplayGeneratingBox,
         contents: Contents,
         box_slot: BoxSlot<'dom>,
@@ -101,13 +100,10 @@ where
     }
 }
 
-impl<'a, 'dom, Node: 'dom> ModernContainerBuilder<'a, 'dom, Node>
-where
-    Node: NodeExt<'dom>,
-{
+impl<'a, 'dom> ModernContainerBuilder<'a, 'dom> {
     pub fn new(
         context: &'a LayoutContext<'a>,
-        info: &'a NodeAndStyleInfo<Node>,
+        info: &'a NodeAndStyleInfo<'dom>,
         propagated_data: PropagatedBoxTreeData,
     ) -> Self {
         ModernContainerBuilder {
@@ -136,27 +132,17 @@ where
     pub(crate) fn finish(mut self) -> Vec<ModernItem<'dom>> {
         self.wrap_any_text_in_anonymous_block_container();
 
-        let anonymous_style = if self.has_text_runs {
-            Some(
-                self.context
-                    .shared_context()
-                    .stylist
-                    .style_for_anonymous::<Node::ConcreteElement>(
-                        &self.context.shared_context().guards,
-                        &style::selector_parser::PseudoElement::ServoAnonymousBox,
-                        &self.info.style,
-                    ),
-            )
-        } else {
-            None
-        };
-
+        let anonymous_info = LazyLock::new(|| {
+            self.info
+                .pseudo(self.context, PseudoElement::ServoAnonymousBox)
+                .expect("Should always be able to construct info for anonymous boxes.")
+        });
         let mut children: Vec<ModernItem> = std::mem::take(&mut self.jobs)
             .into_par_iter()
             .filter_map(|job| match job {
                 ModernContainerJob::TextRuns(runs) => {
                     let mut inline_formatting_context_builder =
-                        InlineFormattingContextBuilder::new();
+                        InlineFormattingContextBuilder::new(self.info);
                     for flex_text_run in runs.into_iter() {
                         inline_formatting_context_builder
                             .push_text(flex_text_run.text, &flex_text_run.info);
@@ -173,7 +159,7 @@ where
                     let block_formatting_context = BlockFormattingContext::from_block_container(
                         BlockContainer::InlineFormattingContext(inline_formatting_context),
                     );
-                    let info = &self.info.new_anonymous(anonymous_style.clone().unwrap());
+                    let info: &NodeAndStyleInfo = &anonymous_info;
                     let formatting_context = IndependentFormattingContext {
                         base: LayoutBoxBase::new(info.into(), info.style.clone()),
                         contents: IndependentFormattingContextContents::NonReplaced(
diff --git a/components/layout/context.rs b/components/layout/context.rs
new file mode 100644
index 00000000000..3411eed486c
--- /dev/null
+++ b/components/layout/context.rs
@@ -0,0 +1,242 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::sync::Arc;
+
+use base::id::PipelineId;
+use euclid::Size2D;
+use fnv::FnvHashMap;
+use fonts::FontContext;
+use fxhash::FxHashMap;
+use net_traits::image_cache::{
+    ImageCache, ImageCacheResult, ImageOrMetadataAvailable, UsePlaceholder,
+};
+use parking_lot::{Mutex, RwLock};
+use pixels::Image as PixelImage;
+use script_layout_interface::{IFrameSizes, ImageAnimationState, PendingImage, PendingImageState};
+use servo_url::{ImmutableOrigin, ServoUrl};
+use style::context::SharedStyleContext;
+use style::dom::OpaqueNode;
+use style::values::computed::image::{Gradient, Image};
+
+use crate::display_list::WebRenderImageInfo;
+
+pub struct LayoutContext<'a> {
+    pub id: PipelineId,
+    pub use_rayon: bool,
+    pub origin: ImmutableOrigin,
+
+    /// Bits shared by the layout and style system.
+    pub style_context: SharedStyleContext<'a>,
+
+    /// A FontContext to be used during layout.
+    pub font_context: Arc<FontContext>,
+
+    /// Reference to the script thread image cache.
+    pub image_cache: Arc<dyn ImageCache>,
+
+    /// A list of in-progress image loads to be shared with the script thread.
+    pub pending_images: Mutex<Vec<PendingImage>>,
+
+    /// A collection of `<iframe>` sizes to send back to script.
+    pub iframe_sizes: Mutex<IFrameSizes>,
+
+    pub webrender_image_cache:
+        Arc<RwLock<FnvHashMap<(ServoUrl, UsePlaceholder), WebRenderImageInfo>>>,
+
+    pub node_image_animation_map: Arc<RwLock<FxHashMap<OpaqueNode, ImageAnimationState>>>,
+
+    /// The DOM node that is highlighted by the devtools inspector, if any
+    pub highlighted_dom_node: Option<OpaqueNode>,
+}
+
+pub enum ResolvedImage<'a> {
+    Gradient(&'a Gradient),
+    Image(WebRenderImageInfo),
+}
+
+impl Drop for LayoutContext<'_> {
+    fn drop(&mut self) {
+        if !std::thread::panicking() {
+            assert!(self.pending_images.lock().is_empty());
+        }
+    }
+}
+
+#[derive(Debug)]
+pub enum ResolveImageError {
+    LoadError,
+    ImagePending,
+    ImageRequested,
+    OnlyMetadata,
+    InvalidUrl,
+    MissingNode,
+    ImageMissingFromImageSet,
+    FailedToResolveImageFromImageSet,
+    NotImplementedYet(&'static str),
+    None,
+}
+
+impl LayoutContext<'_> {
+    #[inline(always)]
+    pub fn shared_context(&self) -> &SharedStyleContext {
+        &self.style_context
+    }
+
+    pub fn get_or_request_image_or_meta(
+        &self,
+        node: OpaqueNode,
+        url: ServoUrl,
+        use_placeholder: UsePlaceholder,
+    ) -> Result<ImageOrMetadataAvailable, ResolveImageError> {
+        // Check for available image or start tracking.
+        let cache_result = self.image_cache.get_cached_image_status(
+            url.clone(),
+            self.origin.clone(),
+            None,
+            use_placeholder,
+        );
+
+        match cache_result {
+            ImageCacheResult::Available(img_or_meta) => Ok(img_or_meta),
+            // Image has been requested, is still pending. Return no image for this paint loop.
+            // When the image loads it will trigger a reflow and/or repaint.
+            ImageCacheResult::Pending(id) => {
+                let image = PendingImage {
+                    state: PendingImageState::PendingResponse,
+                    node: node.into(),
+                    id,
+                    origin: self.origin.clone(),
+                };
+                self.pending_images.lock().push(image);
+                Result::Err(ResolveImageError::ImagePending)
+            },
+            // Not yet requested - request image or metadata from the cache
+            ImageCacheResult::ReadyForRequest(id) => {
+                let image = PendingImage {
+                    state: PendingImageState::Unrequested(url),
+                    node: node.into(),
+                    id,
+                    origin: self.origin.clone(),
+                };
+                self.pending_images.lock().push(image);
+                Result::Err(ResolveImageError::ImageRequested)
+            },
+            // Image failed to load, so just return nothing
+            ImageCacheResult::LoadError => Result::Err(ResolveImageError::LoadError),
+        }
+    }
+
+    pub fn handle_animated_image(&self, node: OpaqueNode, image: Arc<PixelImage>) {
+        let mut store = self.node_image_animation_map.write();
+
+        // 1. first check whether node previously being track for animated image.
+        if let Some(image_state) = store.get(&node) {
+            // a. if the node is not containing the same image as before.
+            if image_state.image_key() != image.id {
+                if image.should_animate() {
+                    // i. Register/Replace tracking item in image_animation_manager.
+                    store.insert(node, ImageAnimationState::new(image));
+                } else {
+                    // ii. Cancel Action if the node's image is no longer animated.
+                    store.remove(&node);
+                }
+            }
+        } else if image.should_animate() {
+            store.insert(node, ImageAnimationState::new(image));
+        }
+    }
+
+    fn get_webrender_image_for_url(
+        &self,
+        node: OpaqueNode,
+        url: ServoUrl,
+        use_placeholder: UsePlaceholder,
+    ) -> Result<WebRenderImageInfo, ResolveImageError> {
+        if let Some(existing_webrender_image) = self
+            .webrender_image_cache
+            .read()
+            .get(&(url.clone(), use_placeholder))
+        {
+            return Ok(*existing_webrender_image);
+        }
+        let image_or_meta =
+            self.get_or_request_image_or_meta(node, url.clone(), use_placeholder)?;
+        match image_or_meta {
+            ImageOrMetadataAvailable::ImageAvailable { image, .. } => {
+                self.handle_animated_image(node, image.clone());
+                let image_info = WebRenderImageInfo {
+                    size: Size2D::new(image.width, image.height),
+                    key: image.id,
+                };
+                if image_info.key.is_none() {
+                    Ok(image_info)
+                } else {
+                    let mut webrender_image_cache = self.webrender_image_cache.write();
+                    webrender_image_cache.insert((url, use_placeholder), image_info);
+                    Ok(image_info)
+                }
+            },
+            ImageOrMetadataAvailable::MetadataAvailable(..) => {
+                Result::Err(ResolveImageError::OnlyMetadata)
+            },
+        }
+    }
+
+    pub fn resolve_image<'a>(
+        &self,
+        node: Option<OpaqueNode>,
+        image: &'a Image,
+    ) -> Result<ResolvedImage<'a>, ResolveImageError> {
+        match image {
+            // TODO: Add support for PaintWorklet and CrossFade rendering.
+            Image::None => Result::Err(ResolveImageError::None),
+            Image::CrossFade(_) => Result::Err(ResolveImageError::NotImplementedYet("CrossFade")),
+            Image::PaintWorklet(_) => {
+                Result::Err(ResolveImageError::NotImplementedYet("PaintWorklet"))
+            },
+            Image::Gradient(gradient) => Ok(ResolvedImage::Gradient(gradient)),
+            Image::Url(image_url) => {
+                // FIXME: images won’t always have in intrinsic width or
+                // height when support for SVG is added, or a WebRender
+                // `ImageKey`, for that matter.
+                //
+                // FIXME: It feels like this should take into account the pseudo
+                // element and not just the node.
+                let image_url = image_url.url().ok_or(ResolveImageError::InvalidUrl)?;
+                let node = node.ok_or(ResolveImageError::MissingNode)?;
+                let webrender_info = self.get_webrender_image_for_url(
+                    node,
+                    image_url.clone().into(),
+                    UsePlaceholder::No,
+                )?;
+                Ok(ResolvedImage::Image(webrender_info))
+            },
+            Image::ImageSet(image_set) => {
+                image_set
+                    .items
+                    .get(image_set.selected_index)
+                    .ok_or(ResolveImageError::ImageMissingFromImageSet)
+                    .and_then(|image| {
+                        self.resolve_image(node, &image.image)
+                            .map(|info| match info {
+                                ResolvedImage::Image(mut image_info) => {
+                                    // From <https://drafts.csswg.org/css-images-4/#image-set-notation>:
+                                    // > A <resolution> (optional). This is used to help the UA decide
+                                    // > which <image-set-option> to choose. If the image reference is
+                                    // > for a raster image, it also specifies the image’s natural
+                                    // > resolution, overriding any other source of data that might
+                                    // > supply a natural resolution.
+                                    image_info.size = (image_info.size.to_f32() /
+                                        image.resolution.dppx())
+                                    .to_u32();
+                                    ResolvedImage::Image(image_info)
+                                },
+                                _ => info,
+                            })
+                    })
+            },
+        }
+    }
+}
diff --git a/components/layout_2020/display_list/background.rs b/components/layout/display_list/background.rs
similarity index 100%
rename from components/layout_2020/display_list/background.rs
rename to components/layout/display_list/background.rs
diff --git a/components/layout_2020/display_list/clip_path.rs b/components/layout/display_list/clip_path.rs
similarity index 100%
rename from components/layout_2020/display_list/clip_path.rs
rename to components/layout/display_list/clip_path.rs
diff --git a/components/layout_2020/display_list/conversions.rs b/components/layout/display_list/conversions.rs
similarity index 100%
rename from components/layout_2020/display_list/conversions.rs
rename to components/layout/display_list/conversions.rs
diff --git a/components/layout_2020/display_list/gradient.rs b/components/layout/display_list/gradient.rs
similarity index 100%
rename from components/layout_2020/display_list/gradient.rs
rename to components/layout/display_list/gradient.rs
diff --git a/components/layout/display_list/mod.rs b/components/layout/display_list/mod.rs
new file mode 100644
index 00000000000..f017642908d
--- /dev/null
+++ b/components/layout/display_list/mod.rs
@@ -0,0 +1,1736 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::cell::{OnceCell, RefCell};
+use std::sync::Arc;
+
+use app_units::{AU_PER_PX, Au};
+use base::WebRenderEpochToU16;
+use base::id::ScrollTreeNodeId;
+use compositing_traits::display_list::{AxesScrollSensitivity, CompositorDisplayListInfo};
+use embedder_traits::Cursor;
+use euclid::{Point2D, SideOffsets2D, Size2D, UnknownUnit};
+use fonts::GlyphStore;
+use gradient::WebRenderGradient;
+use range::Range as ServoRange;
+use servo_arc::Arc as ServoArc;
+use servo_geometry::MaxRect;
+use style::Zero;
+use style::color::{AbsoluteColor, ColorSpace};
+use style::computed_values::border_image_outset::T as BorderImageOutset;
+use style::computed_values::text_decoration_style::T as ComputedTextDecorationStyle;
+use style::dom::OpaqueNode;
+use style::properties::ComputedValues;
+use style::properties::longhands::visibility::computed_value::T as Visibility;
+use style::properties::style_structs::Border;
+use style::values::computed::{
+    BorderImageSideWidth, BorderImageWidth, BorderStyle, LengthPercentage,
+    NonNegativeLengthOrNumber, NumberOrPercentage, OutlineStyle,
+};
+use style::values::generics::NonNegative;
+use style::values::generics::rect::Rect;
+use style::values::specified::text::TextDecorationLine;
+use style::values::specified::ui::CursorKind;
+use style_traits::CSSPixel;
+use webrender_api::units::{DevicePixel, LayoutPixel, LayoutRect, LayoutSize};
+use webrender_api::{
+    self as wr, BorderDetails, BoxShadowClipMode, ClipChainId, CommonItemProperties,
+    ImageRendering, NinePatchBorder, NinePatchBorderSource, SpatialId, units,
+};
+use wr::units::LayoutVector2D;
+
+use crate::cell::ArcRefCell;
+use crate::context::{LayoutContext, ResolvedImage};
+pub use crate::display_list::conversions::ToWebRender;
+use crate::display_list::stacking_context::StackingContextSection;
+use crate::fragment_tree::{
+    BackgroundMode, BoxFragment, Fragment, FragmentFlags, FragmentTree, SpecificLayoutInfo, Tag,
+    TextFragment,
+};
+use crate::geom::{
+    LengthPercentageOrAuto, PhysicalPoint, PhysicalRect, PhysicalSides, PhysicalSize,
+};
+use crate::replaced::NaturalSizes;
+use crate::style_ext::{BorderStyleColor, ComputedValuesExt};
+
+mod background;
+mod clip_path;
+mod conversions;
+mod gradient;
+mod stacking_context;
+
+use background::BackgroundPainter;
+pub use stacking_context::*;
+
+#[derive(Clone, Copy)]
+pub struct WebRenderImageInfo {
+    pub size: Size2D<u32, UnknownUnit>,
+    pub key: Option<wr::ImageKey>,
+}
+
+// webrender's `ItemTag` is private.
+type ItemTag = (u64, u16);
+type HitInfo = Option<ItemTag>;
+const INSERTION_POINT_LOGICAL_WIDTH: Au = Au(AU_PER_PX);
+
+/// Where the information that's used to build display lists is stored. This
+/// includes both a [wr::DisplayListBuilder] for building up WebRender-specific
+/// display list information and a [CompositorDisplayListInfo] used to store
+/// information used by the compositor, such as a compositor-side scroll tree.
+pub struct DisplayList {
+    /// The [wr::DisplayListBuilder] used to collect display list items.
+    pub wr: wr::DisplayListBuilder,
+
+    /// The information about the WebRender display list that the compositor
+    /// consumes. This curerntly contains the out-of-band hit testing information
+    /// data structure that the compositor uses to map hit tests to information
+    /// about the item hit.
+    pub compositor_info: CompositorDisplayListInfo,
+
+    /// A count of the number of SpatialTree nodes pushed to the WebRender display
+    /// list. This is merely to ensure that the currently-unused SpatialTreeItemKey
+    /// produced for every SpatialTree node is unique.
+    pub spatial_tree_count: u64,
+}
+
+impl DisplayList {
+    /// Create a new [DisplayList] given the dimensions of the layout and the WebRender
+    /// pipeline id.
+    pub fn new(
+        viewport_size: units::LayoutSize,
+        content_size: units::LayoutSize,
+        pipeline_id: wr::PipelineId,
+        epoch: wr::Epoch,
+        viewport_scroll_sensitivity: AxesScrollSensitivity,
+        first_reflow: bool,
+    ) -> Self {
+        Self {
+            wr: wr::DisplayListBuilder::new(pipeline_id),
+            compositor_info: CompositorDisplayListInfo::new(
+                viewport_size,
+                content_size,
+                pipeline_id,
+                epoch,
+                viewport_scroll_sensitivity,
+                first_reflow,
+            ),
+            spatial_tree_count: 0,
+        }
+    }
+
+    pub fn define_clip_chain<I>(&mut self, parent: ClipChainId, clips: I) -> ClipChainId
+    where
+        I: IntoIterator<Item = wr::ClipId>,
+        I::IntoIter: ExactSizeIterator + Clone,
+    {
+        // WebRender has two different ways of expressing "no clip." ClipChainId::INVALID should be
+        // used for primitives, but `None` is used for stacking contexts and clip chains. We convert
+        // to the `Option<ClipChainId>` representation here. Just passing Some(ClipChainId::INVALID)
+        // leads to a crash.
+        let parent = match parent {
+            ClipChainId::INVALID => None,
+            parent => Some(parent),
+        };
+        self.wr.define_clip_chain(parent, clips)
+    }
+}
+
+pub(crate) struct DisplayListBuilder<'a> {
+    /// The current [ScrollTreeNodeId] for this [DisplayListBuilder]. This
+    /// allows only passing the builder instead passing the containing
+    /// [stacking_context::StackingContextContent::Fragment] as an argument to display
+    /// list building functions.
+    current_scroll_node_id: ScrollTreeNodeId,
+
+    /// The current [ScrollTreeNodeId] for this [DisplayListBuilder]. This is necessary in addition
+    /// to the [Self::current_scroll_node_id], because some pieces of fragments as backgrounds with
+    /// `background-attachment: fixed` need to not scroll while the rest of the fragment does.
+    current_reference_frame_scroll_node_id: ScrollTreeNodeId,
+
+    /// The current [wr::ClipId] for this [DisplayListBuilder]. This allows
+    /// only passing the builder instead passing the containing
+    /// [stacking_context::StackingContextContent::Fragment] as an argument to display
+    /// list building functions.
+    current_clip_chain_id: ClipChainId,
+
+    /// A [LayoutContext] used to get information about the device pixel ratio
+    /// and get handles to WebRender images.
+    pub context: &'a LayoutContext<'a>,
+
+    /// The [DisplayList] used to collect display list items and metadata.
+    pub display_list: &'a mut DisplayList,
+
+    /// Data about the fragments that are highlighted by the inspector, if any.
+    ///
+    /// This data is collected during the traversal of the fragment tree and used
+    /// to paint the highlight at the very end.
+    inspector_highlight: Option<InspectorHighlight>,
+
+    /// Whether or not the `<body>` element should be painted. This is false if the root `<html>`
+    /// element inherits the `<body>`'s background to paint the page canvas background.
+    /// See <https://drafts.csswg.org/css-backgrounds/#body-background>.
+    paint_body_background: bool,
+}
+
+struct InspectorHighlight {
+    /// The node that should be highlighted
+    tag: Tag,
+
+    /// Accumulates information about the fragments that belong to the highlighted node.
+    ///
+    /// This information is collected as the fragment tree is traversed to build the
+    /// display list.
+    state: Option<HighlightTraversalState>,
+}
+
+struct HighlightTraversalState {
+    /// The smallest rectangle that fully encloses all fragments created by the highlighted
+    /// dom node, if any.
+    content_box: euclid::Rect<Au, CSSPixel>,
+
+    spatial_id: SpatialId,
+
+    clip_chain_id: ClipChainId,
+
+    /// When the highlighted fragment is a box fragment we remember the information
+    /// needed to paint padding, border and margin areas.
+    maybe_box_fragment: Option<ArcRefCell<BoxFragment>>,
+}
+
+impl InspectorHighlight {
+    fn for_node(node: OpaqueNode) -> Self {
+        Self {
+            tag: Tag::new(node),
+            state: None,
+        }
+    }
+}
+
+impl DisplayList {
+    pub fn build(
+        &mut self,
+        context: &LayoutContext,
+        fragment_tree: &FragmentTree,
+        root_stacking_context: &StackingContext,
+    ) {
+        #[cfg(feature = "tracing")]
+        let _span = tracing::trace_span!("display_list::build", servo_profiling = true).entered();
+        let mut builder = DisplayListBuilder {
+            current_scroll_node_id: self.compositor_info.root_reference_frame_id,
+            current_reference_frame_scroll_node_id: self.compositor_info.root_reference_frame_id,
+            current_clip_chain_id: ClipChainId::INVALID,
+            context,
+            display_list: self,
+            inspector_highlight: context
+                .highlighted_dom_node
+                .map(InspectorHighlight::for_node),
+            paint_body_background: true,
+        };
+        fragment_tree.build_display_list(&mut builder, root_stacking_context);
+
+        if let Some(highlight) = builder
+            .inspector_highlight
+            .take()
+            .and_then(|highlight| highlight.state)
+        {
+            builder.paint_dom_inspector_highlight(highlight);
+        }
+    }
+}
+
+impl DisplayListBuilder<'_> {
+    fn wr(&mut self) -> &mut wr::DisplayListBuilder {
+        &mut self.display_list.wr
+    }
+
+    fn mark_is_contentful(&mut self) {
+        self.display_list.compositor_info.is_contentful = true;
+    }
+
+    fn common_properties(
+        &self,
+        clip_rect: units::LayoutRect,
+        style: &ComputedValues,
+    ) -> wr::CommonItemProperties {
+        // TODO(mrobinson): We should take advantage of this field to pass hit testing
+        // information. This will allow us to avoid creating hit testing display items
+        // for fragments that paint their entire border rectangle.
+        wr::CommonItemProperties {
+            clip_rect,
+            spatial_id: self.current_scroll_node_id.spatial_id,
+            clip_chain_id: self.current_clip_chain_id,
+            flags: style.get_webrender_primitive_flags(),
+        }
+    }
+
+    fn hit_info(
+        &mut self,
+        style: &ComputedValues,
+        tag: Option<Tag>,
+        auto_cursor: Cursor,
+    ) -> HitInfo {
+        use style::computed_values::pointer_events::T as PointerEvents;
+
+        let inherited_ui = style.get_inherited_ui();
+        if inherited_ui.pointer_events == PointerEvents::None {
+            return None;
+        }
+
+        let hit_test_index = self.display_list.compositor_info.add_hit_test_info(
+            tag?.node.0 as u64,
+            Some(cursor(inherited_ui.cursor.keyword, auto_cursor)),
+            self.current_scroll_node_id,
+        );
+        Some((
+            hit_test_index as u64,
+            self.display_list.compositor_info.epoch.as_u16(),
+        ))
+    }
+
+    /// Draw highlights around the node that is currently hovered in the devtools.
+    fn paint_dom_inspector_highlight(&mut self, highlight: HighlightTraversalState) {
+        const CONTENT_BOX_HIGHLIGHT_COLOR: webrender_api::ColorF = webrender_api::ColorF {
+            r: 0.23,
+            g: 0.7,
+            b: 0.87,
+            a: 0.5,
+        };
+
+        const PADDING_BOX_HIGHLIGHT_COLOR: webrender_api::ColorF = webrender_api::ColorF {
+            r: 0.49,
+            g: 0.3,
+            b: 0.7,
+            a: 0.5,
+        };
+
+        const BORDER_BOX_HIGHLIGHT_COLOR: webrender_api::ColorF = webrender_api::ColorF {
+            r: 0.2,
+            g: 0.2,
+            b: 0.2,
+            a: 0.5,
+        };
+
+        const MARGIN_BOX_HIGHLIGHT_COLOR: webrender_api::ColorF = webrender_api::ColorF {
+            r: 1.,
+            g: 0.93,
+            b: 0.,
+            a: 0.5,
+        };
+
+        // Highlight content box
+        let content_box = highlight.content_box.to_webrender();
+        let properties = wr::CommonItemProperties {
+            clip_rect: content_box,
+            spatial_id: highlight.spatial_id,
+            clip_chain_id: highlight.clip_chain_id,
+            flags: wr::PrimitiveFlags::default(),
+        };
+
+        self.display_list
+            .wr
+            .push_rect(&properties, content_box, CONTENT_BOX_HIGHLIGHT_COLOR);
+
+        // Highlight margin, border and padding
+        if let Some(box_fragment) = highlight.maybe_box_fragment {
+            let mut paint_highlight =
+                |color: webrender_api::ColorF,
+                 fragment_relative_bounds: PhysicalRect<Au>,
+                 widths: webrender_api::units::LayoutSideOffsets| {
+                    if widths.is_zero() {
+                        return;
+                    }
+
+                    let bounds = box_fragment
+                        .borrow()
+                        .offset_by_containing_block(&fragment_relative_bounds)
+                        .to_webrender();
+
+                    // We paint each highlighted area as if it was a border for simplicity
+                    let border_style = wr::BorderSide {
+                        color,
+                        style: webrender_api::BorderStyle::Solid,
+                    };
+
+                    let details = wr::BorderDetails::Normal(wr::NormalBorder {
+                        top: border_style,
+                        right: border_style,
+                        bottom: border_style,
+                        left: border_style,
+                        radius: webrender_api::BorderRadius::default(),
+                        do_aa: true,
+                    });
+
+                    let common = wr::CommonItemProperties {
+                        clip_rect: bounds,
+                        spatial_id: highlight.spatial_id,
+                        clip_chain_id: highlight.clip_chain_id,
+                        flags: wr::PrimitiveFlags::default(),
+                    };
+                    self.wr().push_border(&common, bounds, widths, details)
+                };
+
+            let box_fragment = box_fragment.borrow();
+            paint_highlight(
+                PADDING_BOX_HIGHLIGHT_COLOR,
+                box_fragment.padding_rect(),
+                box_fragment.padding.to_webrender(),
+            );
+            paint_highlight(
+                BORDER_BOX_HIGHLIGHT_COLOR,
+                box_fragment.border_rect(),
+                box_fragment.border.to_webrender(),
+            );
+            paint_highlight(
+                MARGIN_BOX_HIGHLIGHT_COLOR,
+                box_fragment.margin_rect(),
+                box_fragment.margin.to_webrender(),
+            );
+        }
+    }
+}
+
+impl InspectorHighlight {
+    fn register_fragment_of_highlighted_dom_node(
+        &mut self,
+        fragment: &Fragment,
+        spatial_id: SpatialId,
+        clip_chain_id: ClipChainId,
+        containing_block: &PhysicalRect<Au>,
+    ) {
+        let state = self.state.get_or_insert(HighlightTraversalState {
+            content_box: euclid::Rect::zero(),
+            spatial_id,
+            clip_chain_id,
+            maybe_box_fragment: None,
+        });
+
+        // We expect all fragments generated by one node to be in the same scroll tree node and clip node
+        debug_assert_eq!(spatial_id, state.spatial_id);
+        if clip_chain_id != ClipChainId::INVALID && state.clip_chain_id != ClipChainId::INVALID {
+            debug_assert_eq!(
+                clip_chain_id, state.clip_chain_id,
+                "Fragments of the same node must either have no clip chain or the same one"
+            );
+        }
+
+        let fragment_relative_rect = match fragment {
+            Fragment::Box(fragment) | Fragment::Float(fragment) => {
+                state.maybe_box_fragment = Some(fragment.clone());
+
+                fragment.borrow().content_rect
+            },
+            Fragment::Positioning(fragment) => fragment.borrow().rect,
+            Fragment::Text(fragment) => fragment.borrow().rect,
+            Fragment::Image(image_fragment) => image_fragment.borrow().rect,
+            Fragment::AbsoluteOrFixedPositioned(_) => return,
+            Fragment::IFrame(iframe_fragment) => iframe_fragment.borrow().rect,
+        };
+
+        state.content_box = state
+            .content_box
+            .union(&fragment_relative_rect.translate(containing_block.origin.to_vector()));
+    }
+}
+
+impl Fragment {
+    pub(crate) fn build_display_list(
+        &self,
+        builder: &mut DisplayListBuilder,
+        containing_block: &PhysicalRect<Au>,
+        section: StackingContextSection,
+        is_hit_test_for_scrollable_overflow: bool,
+        is_collapsed_table_borders: bool,
+    ) {
+        if let Some(inspector_highlight) = &mut builder.inspector_highlight {
+            if self.tag() == Some(inspector_highlight.tag) {
+                inspector_highlight.register_fragment_of_highlighted_dom_node(
+                    self,
+                    builder.current_scroll_node_id.spatial_id,
+                    builder.current_clip_chain_id,
+                    containing_block,
+                );
+            }
+        }
+
+        match self {
+            Fragment::Box(box_fragment) | Fragment::Float(box_fragment) => {
+                let box_fragment = &*box_fragment.borrow();
+                match box_fragment.style.get_inherited_box().visibility {
+                    Visibility::Visible => BuilderForBoxFragment::new(
+                        box_fragment,
+                        containing_block,
+                        is_hit_test_for_scrollable_overflow,
+                        is_collapsed_table_borders,
+                    )
+                    .build(builder, section),
+                    Visibility::Hidden => (),
+                    Visibility::Collapse => (),
+                }
+            },
+            Fragment::AbsoluteOrFixedPositioned(_) => {},
+            Fragment::Positioning(positioning_fragment) => {
+                let positioning_fragment = positioning_fragment.borrow();
+                let rect = positioning_fragment
+                    .rect
+                    .translate(containing_block.origin.to_vector());
+                self.maybe_push_hit_test_for_style_and_tag(
+                    builder,
+                    &positioning_fragment.style,
+                    positioning_fragment.base.tag,
+                    rect,
+                    Cursor::Default,
+                );
+            },
+            Fragment::Image(image) => {
+                let image = image.borrow();
+                match image.style.get_inherited_box().visibility {
+                    Visibility::Visible => {
+                        builder.mark_is_contentful();
+
+                        let image_rendering = image
+                            .style
+                            .get_inherited_box()
+                            .image_rendering
+                            .to_webrender();
+                        let rect = image
+                            .rect
+                            .translate(containing_block.origin.to_vector())
+                            .to_webrender();
+                        let clip = image
+                            .clip
+                            .translate(containing_block.origin.to_vector())
+                            .to_webrender();
+                        let common = builder.common_properties(clip, &image.style);
+
+                        if let Some(image_key) = image.image_key {
+                            builder.wr().push_image(
+                                &common,
+                                rect,
+                                image_rendering,
+                                wr::AlphaType::PremultipliedAlpha,
+                                image_key,
+                                wr::ColorF::WHITE,
+                            );
+                        }
+                    },
+                    Visibility::Hidden => (),
+                    Visibility::Collapse => (),
+                }
+            },
+            Fragment::IFrame(iframe) => {
+                let iframe = iframe.borrow();
+                match iframe.style.get_inherited_box().visibility {
+                    Visibility::Visible => {
+                        builder.mark_is_contentful();
+                        let rect = iframe.rect.translate(containing_block.origin.to_vector());
+
+                        let common = builder.common_properties(rect.to_webrender(), &iframe.style);
+                        builder.wr().push_iframe(
+                            rect.to_webrender(),
+                            common.clip_rect,
+                            &wr::SpaceAndClipInfo {
+                                spatial_id: common.spatial_id,
+                                clip_chain_id: common.clip_chain_id,
+                            },
+                            iframe.pipeline_id.into(),
+                            true,
+                        );
+                    },
+                    Visibility::Hidden => (),
+                    Visibility::Collapse => (),
+                }
+            },
+            Fragment::Text(text) => {
+                let text = &*text.borrow();
+                match text
+                    .inline_styles
+                    .style
+                    .borrow()
+                    .get_inherited_box()
+                    .visibility
+                {
+                    Visibility::Visible => {
+                        self.build_display_list_for_text_fragment(text, builder, containing_block)
+                    },
+                    Visibility::Hidden => (),
+                    Visibility::Collapse => (),
+                }
+            },
+        }
+    }
+
+    fn maybe_push_hit_test_for_style_and_tag(
+        &self,
+        builder: &mut DisplayListBuilder,
+        style: &ComputedValues,
+        tag: Option<Tag>,
+        rect: PhysicalRect<Au>,
+        cursor: Cursor,
+    ) {
+        let hit_info = builder.hit_info(style, tag, cursor);
+        let hit_info = match hit_info {
+            Some(hit_info) => hit_info,
+            None => return,
+        };
+
+        let clip_chain_id = builder.current_clip_chain_id;
+        let spatial_id = builder.current_scroll_node_id.spatial_id;
+        builder.wr().push_hit_test(
+            rect.to_webrender(),
+            clip_chain_id,
+            spatial_id,
+            style.get_webrender_primitive_flags(),
+            hit_info,
+        );
+    }
+
+    fn build_display_list_for_text_fragment(
+        &self,
+        fragment: &TextFragment,
+        builder: &mut DisplayListBuilder,
+        containing_block: &PhysicalRect<Au>,
+    ) {
+        // NB: The order of painting text components (CSS Text Decoration Module Level 3) is:
+        // shadows, underline, overline, text, text-emphasis, and then line-through.
+
+        builder.mark_is_contentful();
+
+        let rect = fragment.rect.translate(containing_block.origin.to_vector());
+        let mut baseline_origin = rect.origin;
+        baseline_origin.y += fragment.font_metrics.ascent;
+        let glyphs = glyphs(
+            &fragment.glyphs,
+            baseline_origin,
+            fragment.justification_adjustment,
+            !fragment.has_selection(),
+        );
+        if glyphs.is_empty() {
+            return;
+        }
+
+        let parent_style = fragment.inline_styles.style.borrow();
+        self.maybe_push_hit_test_for_style_and_tag(
+            builder,
+            &parent_style,
+            fragment.base.tag,
+            rect,
+            Cursor::Text,
+        );
+
+        let color = parent_style.clone_color();
+        let font_metrics = &fragment.font_metrics;
+        let dppx = builder.context.style_context.device_pixel_ratio().get();
+        let common = builder.common_properties(rect.to_webrender(), &parent_style);
+
+        // Shadows. According to CSS-BACKGROUNDS, text shadows render in *reverse* order (front to
+        // back).
+        let shadows = &parent_style.get_inherited_text().text_shadow;
+        for shadow in shadows.0.iter().rev() {
+            builder.wr().push_shadow(
+                &wr::SpaceAndClipInfo {
+                    spatial_id: common.spatial_id,
+                    clip_chain_id: common.clip_chain_id,
+                },
+                wr::Shadow {
+                    offset: LayoutVector2D::new(shadow.horizontal.px(), shadow.vertical.px()),
+                    color: rgba(shadow.color.resolve_to_absolute(&color)),
+                    blur_radius: shadow.blur.px(),
+                },
+                true, /* should_inflate */
+            );
+        }
+
+        if fragment
+            .text_decoration_line
+            .contains(TextDecorationLine::UNDERLINE)
+        {
+            let mut rect = rect;
+            rect.origin.y += font_metrics.ascent - font_metrics.underline_offset;
+            rect.size.height = Au::from_f32_px(font_metrics.underline_size.to_nearest_pixel(dppx));
+            self.build_display_list_for_text_decoration(&parent_style, builder, &rect, &color);
+        }
+
+        if fragment
+            .text_decoration_line
+            .contains(TextDecorationLine::OVERLINE)
+        {
+            let mut rect = rect;
+            rect.size.height = Au::from_f32_px(font_metrics.underline_size.to_nearest_pixel(dppx));
+            self.build_display_list_for_text_decoration(&parent_style, builder, &rect, &color);
+        }
+
+        // TODO: This caret/text selection implementation currently does not account for vertical text
+        // and RTL text properly.
+        if let Some(range) = fragment.selection_range {
+            let baseline_origin = rect.origin;
+            if !range.is_empty() {
+                let start = glyphs_advance_by_index(
+                    &fragment.glyphs,
+                    range.begin(),
+                    baseline_origin,
+                    fragment.justification_adjustment,
+                );
+
+                let end = glyphs_advance_by_index(
+                    &fragment.glyphs,
+                    range.end(),
+                    baseline_origin,
+                    fragment.justification_adjustment,
+                );
+
+                let selection_rect = LayoutRect::new(
+                    Point2D::new(start.x.to_f32_px(), containing_block.min_y().to_f32_px()),
+                    Point2D::new(end.x.to_f32_px(), containing_block.max_y().to_f32_px()),
+                );
+                if let Some(selection_color) = fragment
+                    .inline_styles
+                    .selected
+                    .borrow()
+                    .clone_background_color()
+                    .as_absolute()
+                {
+                    let selection_common = builder.common_properties(selection_rect, &parent_style);
+                    builder.wr().push_rect(
+                        &selection_common,
+                        selection_rect,
+                        rgba(*selection_color),
+                    );
+                }
+            } else {
+                let insertion_point = glyphs_advance_by_index(
+                    &fragment.glyphs,
+                    range.begin(),
+                    baseline_origin,
+                    fragment.justification_adjustment,
+                );
+
+                let insertion_point_rect = LayoutRect::new(
+                    Point2D::new(
+                        insertion_point.x.to_f32_px(),
+                        containing_block.min_y().to_f32_px(),
+                    ),
+                    Point2D::new(
+                        insertion_point.x.to_f32_px() + INSERTION_POINT_LOGICAL_WIDTH.to_f32_px(),
+                        containing_block.max_y().to_f32_px(),
+                    ),
+                );
+                let insertion_point_common =
+                    builder.common_properties(insertion_point_rect, &parent_style);
+                // TODO: The color of the caret is currently hardcoded to the text color.
+                // We should be retrieving the caret color from the style properly.
+                builder
+                    .wr()
+                    .push_rect(&insertion_point_common, insertion_point_rect, rgba(color));
+            }
+        }
+
+        builder.wr().push_text(
+            &common,
+            rect.to_webrender(),
+            &glyphs,
+            fragment.font_key,
+            rgba(color),
+            None,
+        );
+
+        if fragment
+            .text_decoration_line
+            .contains(TextDecorationLine::LINE_THROUGH)
+        {
+            let mut rect = rect;
+            rect.origin.y += font_metrics.ascent - font_metrics.strikeout_offset;
+            rect.size.height = Au::from_f32_px(font_metrics.strikeout_size.to_nearest_pixel(dppx));
+            self.build_display_list_for_text_decoration(&parent_style, builder, &rect, &color);
+        }
+
+        if !shadows.0.is_empty() {
+            builder.wr().pop_all_shadows();
+        }
+    }
+
+    fn build_display_list_for_text_decoration(
+        &self,
+        parent_style: &ServoArc<ComputedValues>,
+        builder: &mut DisplayListBuilder,
+        rect: &PhysicalRect<Au>,
+        color: &AbsoluteColor,
+    ) {
+        let rect = rect.to_webrender();
+        let wavy_line_thickness = (0.33 * rect.size().height).ceil();
+        let text_decoration_color = parent_style
+            .clone_text_decoration_color()
+            .resolve_to_absolute(color);
+        let text_decoration_style = parent_style.clone_text_decoration_style();
+        if text_decoration_style == ComputedTextDecorationStyle::MozNone {
+            return;
+        }
+        builder.display_list.wr.push_line(
+            &builder.common_properties(rect, parent_style),
+            &rect,
+            wavy_line_thickness,
+            wr::LineOrientation::Horizontal,
+            &rgba(text_decoration_color),
+            text_decoration_style.to_webrender(),
+        );
+        // XXX(ferjm) support text-decoration-style: double
+    }
+}
+
+struct BuilderForBoxFragment<'a> {
+    fragment: &'a BoxFragment,
+    containing_block: &'a PhysicalRect<Au>,
+    border_rect: units::LayoutRect,
+    margin_rect: OnceCell<units::LayoutRect>,
+    padding_rect: OnceCell<units::LayoutRect>,
+    content_rect: OnceCell<units::LayoutRect>,
+    border_radius: wr::BorderRadius,
+    border_edge_clip_chain_id: RefCell<Option<ClipChainId>>,
+    padding_edge_clip_chain_id: RefCell<Option<ClipChainId>>,
+    content_edge_clip_chain_id: RefCell<Option<ClipChainId>>,
+    is_hit_test_for_scrollable_overflow: bool,
+    is_collapsed_table_borders: bool,
+}
+
+impl<'a> BuilderForBoxFragment<'a> {
+    fn new(
+        fragment: &'a BoxFragment,
+        containing_block: &'a PhysicalRect<Au>,
+        is_hit_test_for_scrollable_overflow: bool,
+        is_collapsed_table_borders: bool,
+    ) -> Self {
+        let border_rect = fragment
+            .border_rect()
+            .translate(containing_block.origin.to_vector());
+
+        let webrender_border_rect = border_rect.to_webrender();
+        let border_radius = {
+            let resolve = |radius: &LengthPercentage, box_size: Au| {
+                radius.to_used_value(box_size).to_f32_px()
+            };
+            let corner = |corner: &style::values::computed::BorderCornerRadius| {
+                Size2D::new(
+                    resolve(&corner.0.width.0, border_rect.size.width),
+                    resolve(&corner.0.height.0, border_rect.size.height),
+                )
+            };
+            let b = fragment.style.get_border();
+            let mut radius = wr::BorderRadius {
+                top_left: corner(&b.border_top_left_radius),
+                top_right: corner(&b.border_top_right_radius),
+                bottom_right: corner(&b.border_bottom_right_radius),
+                bottom_left: corner(&b.border_bottom_left_radius),
+            };
+
+            normalize_radii(&webrender_border_rect, &mut radius);
+            radius
+        };
+
+        Self {
+            fragment,
+            containing_block,
+            border_rect: webrender_border_rect,
+            border_radius,
+            margin_rect: OnceCell::new(),
+            padding_rect: OnceCell::new(),
+            content_rect: OnceCell::new(),
+            border_edge_clip_chain_id: RefCell::new(None),
+            padding_edge_clip_chain_id: RefCell::new(None),
+            content_edge_clip_chain_id: RefCell::new(None),
+            is_hit_test_for_scrollable_overflow,
+            is_collapsed_table_borders,
+        }
+    }
+
+    fn content_rect(&self) -> &units::LayoutRect {
+        self.content_rect.get_or_init(|| {
+            self.fragment
+                .content_rect
+                .translate(self.containing_block.origin.to_vector())
+                .to_webrender()
+        })
+    }
+
+    fn padding_rect(&self) -> &units::LayoutRect {
+        self.padding_rect.get_or_init(|| {
+            self.fragment
+                .padding_rect()
+                .translate(self.containing_block.origin.to_vector())
+                .to_webrender()
+        })
+    }
+
+    fn margin_rect(&self) -> &units::LayoutRect {
+        self.margin_rect.get_or_init(|| {
+            self.fragment
+                .margin_rect()
+                .translate(self.containing_block.origin.to_vector())
+                .to_webrender()
+        })
+    }
+
+    fn border_edge_clip(
+        &self,
+        builder: &mut DisplayListBuilder,
+        force_clip_creation: bool,
+    ) -> Option<ClipChainId> {
+        if let Some(clip) = *self.border_edge_clip_chain_id.borrow() {
+            return Some(clip);
+        }
+
+        let maybe_clip = create_clip_chain(
+            self.border_radius,
+            self.border_rect,
+            builder,
+            force_clip_creation,
+        );
+        *self.border_edge_clip_chain_id.borrow_mut() = maybe_clip;
+        maybe_clip
+    }
+
+    fn padding_edge_clip(
+        &self,
+        builder: &mut DisplayListBuilder,
+        force_clip_creation: bool,
+    ) -> Option<ClipChainId> {
+        if let Some(clip) = *self.padding_edge_clip_chain_id.borrow() {
+            return Some(clip);
+        }
+
+        let radii = inner_radii(self.border_radius, self.fragment.border.to_webrender());
+        let maybe_clip =
+            create_clip_chain(radii, *self.padding_rect(), builder, force_clip_creation);
+        *self.padding_edge_clip_chain_id.borrow_mut() = maybe_clip;
+        maybe_clip
+    }
+
+    fn content_edge_clip(
+        &self,
+        builder: &mut DisplayListBuilder,
+        force_clip_creation: bool,
+    ) -> Option<ClipChainId> {
+        if let Some(clip) = *self.content_edge_clip_chain_id.borrow() {
+            return Some(clip);
+        }
+
+        let radii = inner_radii(
+            self.border_radius,
+            (self.fragment.border + self.fragment.padding).to_webrender(),
+        );
+        let maybe_clip =
+            create_clip_chain(radii, *self.content_rect(), builder, force_clip_creation);
+        *self.content_edge_clip_chain_id.borrow_mut() = maybe_clip;
+        maybe_clip
+    }
+
+    fn build(&mut self, builder: &mut DisplayListBuilder, section: StackingContextSection) {
+        if self.is_hit_test_for_scrollable_overflow {
+            self.build_hit_test(
+                builder,
+                self.fragment
+                    .reachable_scrollable_overflow_region()
+                    .to_webrender(),
+            );
+            return;
+        }
+
+        if self.is_collapsed_table_borders {
+            self.build_collapsed_table_borders(builder);
+            return;
+        }
+
+        if section == StackingContextSection::Outline {
+            self.build_outline(builder);
+            return;
+        }
+
+        self.build_hit_test(builder, self.border_rect);
+        if self
+            .fragment
+            .base
+            .flags
+            .contains(FragmentFlags::DO_NOT_PAINT)
+        {
+            return;
+        }
+
+        self.build_background(builder);
+        self.build_box_shadow(builder);
+        self.build_border(builder);
+    }
+
+    fn build_hit_test(&self, builder: &mut DisplayListBuilder, rect: LayoutRect) {
+        let hit_info = builder.hit_info(
+            &self.fragment.style,
+            self.fragment.base.tag,
+            Cursor::Default,
+        );
+        let hit_info = match hit_info {
+            Some(hit_info) => hit_info,
+            None => return,
+        };
+
+        let mut common = builder.common_properties(rect, &self.fragment.style);
+        if let Some(clip_chain_id) = self.border_edge_clip(builder, false) {
+            common.clip_chain_id = clip_chain_id;
+        }
+        builder.wr().push_hit_test(
+            common.clip_rect,
+            common.clip_chain_id,
+            common.spatial_id,
+            common.flags,
+            hit_info,
+        );
+    }
+
+    fn build_background_for_painter(
+        &mut self,
+        builder: &mut DisplayListBuilder,
+        painter: &BackgroundPainter,
+    ) {
+        let b = painter.style.get_background();
+        let background_color = painter.style.resolve_color(&b.background_color);
+        if background_color.alpha > 0.0 {
+            // https://drafts.csswg.org/css-backgrounds/#background-color
+            // “The background color is clipped according to the background-clip
+            //  value associated with the bottom-most background image layer.”
+            let layer_index = b.background_image.0.len() - 1;
+            let bounds = painter.painting_area(self, builder, layer_index);
+            let common = painter.common_properties(self, builder, layer_index, bounds);
+            builder
+                .wr()
+                .push_rect(&common, bounds, rgba(background_color))
+        }
+
+        self.build_background_image(builder, painter);
+    }
+
+    fn build_background(&mut self, builder: &mut DisplayListBuilder) {
+        let flags = self.fragment.base.flags;
+
+        // The root element's background is painted separately as it might inherit the `<body>`'s
+        // background.
+        if flags.intersects(FragmentFlags::IS_ROOT_ELEMENT) {
+            return;
+        }
+        // If the `<body>` background was inherited by the root element, don't paint it again here.
+        if !builder.paint_body_background &&
+            flags.intersects(FragmentFlags::IS_BODY_ELEMENT_OF_HTML_ELEMENT_ROOT)
+        {
+            return;
+        }
+
+        // If this BoxFragment does not paint a background, do nothing.
+        if let BackgroundMode::None = self.fragment.background_mode {
+            return;
+        }
+
+        // Paint all extra backgrounds for this BoxFragment. These are painted first, as that's
+        // the order that they are expected to be painted for table cells (where this feature
+        // is used).
+        if let BackgroundMode::Extra(ref extra_backgrounds) = self.fragment.background_mode {
+            for extra_background in extra_backgrounds {
+                let positioning_area = extra_background.rect;
+                let painter = BackgroundPainter {
+                    style: &extra_background.style.borrow_mut(),
+                    painting_area_override: None,
+                    positioning_area_override: Some(
+                        positioning_area
+                            .translate(self.containing_block.origin.to_vector())
+                            .to_webrender(),
+                    ),
+                };
+                self.build_background_for_painter(builder, &painter);
+            }
+        }
+
+        let painter = BackgroundPainter {
+            style: &self.fragment.style,
+            painting_area_override: None,
+            positioning_area_override: None,
+        };
+        self.build_background_for_painter(builder, &painter);
+    }
+
+    fn build_background_image(
+        &mut self,
+        builder: &mut DisplayListBuilder,
+        painter: &BackgroundPainter,
+    ) {
+        let style = painter.style;
+        let b = style.get_background();
+        let node = self.fragment.base.tag.map(|tag| tag.node);
+        // Reverse because the property is top layer first, we want to paint bottom layer first.
+        for (index, image) in b.background_image.0.iter().enumerate().rev() {
+            match builder.context.resolve_image(node, image) {
+                Err(_) => {},
+                Ok(ResolvedImage::Gradient(gradient)) => {
+                    let intrinsic = NaturalSizes::empty();
+                    let Some(layer) =
+                        &background::layout_layer(self, painter, builder, index, intrinsic)
+                    else {
+                        continue;
+                    };
+
+                    match gradient::build(style, gradient, layer.tile_size, builder) {
+                        WebRenderGradient::Linear(linear_gradient) => builder.wr().push_gradient(
+                            &layer.common,
+                            layer.bounds,
+                            linear_gradient,
+                            layer.tile_size,
+                            layer.tile_spacing,
+                        ),
+                        WebRenderGradient::Radial(radial_gradient) => {
+                            builder.wr().push_radial_gradient(
+                                &layer.common,
+                                layer.bounds,
+                                radial_gradient,
+                                layer.tile_size,
+                                layer.tile_spacing,
+                            )
+                        },
+                        WebRenderGradient::Conic(conic_gradient) => {
+                            builder.wr().push_conic_gradient(
+                                &layer.common,
+                                layer.bounds,
+                                conic_gradient,
+                                layer.tile_size,
+                                layer.tile_spacing,
+                            )
+                        },
+                    }
+                },
+                Ok(ResolvedImage::Image(image_info)) => {
+                    // FIXME: https://drafts.csswg.org/css-images-4/#the-image-resolution
+                    let dppx = 1.0;
+                    let intrinsic = NaturalSizes::from_width_and_height(
+                        image_info.size.width as f32 / dppx,
+                        image_info.size.height as f32 / dppx,
+                    );
+                    let Some(image_key) = image_info.key else {
+                        continue;
+                    };
+
+                    if let Some(layer) =
+                        background::layout_layer(self, painter, builder, index, intrinsic)
+                    {
+                        if layer.repeat {
+                            builder.wr().push_repeating_image(
+                                &layer.common,
+                                layer.bounds,
+                                layer.tile_size,
+                                layer.tile_spacing,
+                                style.clone_image_rendering().to_webrender(),
+                                wr::AlphaType::PremultipliedAlpha,
+                                image_key,
+                                wr::ColorF::WHITE,
+                            )
+                        } else {
+                            builder.wr().push_image(
+                                &layer.common,
+                                layer.bounds,
+                                style.clone_image_rendering().to_webrender(),
+                                wr::AlphaType::PremultipliedAlpha,
+                                image_key,
+                                wr::ColorF::WHITE,
+                            )
+                        }
+                    }
+                },
+            }
+        }
+    }
+
+    fn build_border_side(&mut self, style_color: BorderStyleColor) -> wr::BorderSide {
+        wr::BorderSide {
+            color: rgba(style_color.color),
+            style: match style_color.style {
+                BorderStyle::None => wr::BorderStyle::None,
+                BorderStyle::Solid => wr::BorderStyle::Solid,
+                BorderStyle::Double => wr::BorderStyle::Double,
+                BorderStyle::Dotted => wr::BorderStyle::Dotted,
+                BorderStyle::Dashed => wr::BorderStyle::Dashed,
+                BorderStyle::Hidden => wr::BorderStyle::Hidden,
+                BorderStyle::Groove => wr::BorderStyle::Groove,
+                BorderStyle::Ridge => wr::BorderStyle::Ridge,
+                BorderStyle::Inset => wr::BorderStyle::Inset,
+                BorderStyle::Outset => wr::BorderStyle::Outset,
+            },
+        }
+    }
+
+    fn build_collapsed_table_borders(&mut self, builder: &mut DisplayListBuilder) {
+        let Some(SpecificLayoutInfo::TableGridWithCollapsedBorders(table_info)) =
+            &self.fragment.specific_layout_info
+        else {
+            return;
+        };
+        let mut common =
+            builder.common_properties(units::LayoutRect::default(), &self.fragment.style);
+        let radius = wr::BorderRadius::default();
+        let mut column_sum = Au::zero();
+        for (x, column_size) in table_info.track_sizes.x.iter().enumerate() {
+            let mut row_sum = Au::zero();
+            for (y, row_size) in table_info.track_sizes.y.iter().enumerate() {
+                let left_border = &table_info.collapsed_borders.x[x][y];
+                let right_border = &table_info.collapsed_borders.x[x + 1][y];
+                let top_border = &table_info.collapsed_borders.y[y][x];
+                let bottom_border = &table_info.collapsed_borders.y[y + 1][x];
+                let details = wr::BorderDetails::Normal(wr::NormalBorder {
+                    left: self.build_border_side(left_border.style_color.clone()),
+                    right: self.build_border_side(right_border.style_color.clone()),
+                    top: self.build_border_side(top_border.style_color.clone()),
+                    bottom: self.build_border_side(bottom_border.style_color.clone()),
+                    radius,
+                    do_aa: true,
+                });
+                let mut border_widths = PhysicalSides::new(
+                    top_border.width,
+                    right_border.width,
+                    bottom_border.width,
+                    left_border.width,
+                );
+                let left_adjustment = if x == 0 {
+                    -border_widths.left / 2
+                } else {
+                    std::mem::take(&mut border_widths.left) / 2
+                };
+                let top_adjustment = if y == 0 {
+                    -border_widths.top / 2
+                } else {
+                    std::mem::take(&mut border_widths.top) / 2
+                };
+                let origin =
+                    PhysicalPoint::new(column_sum + left_adjustment, row_sum + top_adjustment);
+                let size = PhysicalSize::new(
+                    *column_size - left_adjustment + border_widths.right / 2,
+                    *row_size - top_adjustment + border_widths.bottom / 2,
+                );
+                let border_rect = PhysicalRect::new(origin, size)
+                    .translate(self.fragment.content_rect.origin.to_vector())
+                    .translate(self.containing_block.origin.to_vector())
+                    .to_webrender();
+                common.clip_rect = border_rect;
+                builder.wr().push_border(
+                    &common,
+                    border_rect,
+                    border_widths.to_webrender(),
+                    details,
+                );
+                row_sum += *row_size;
+            }
+            column_sum += *column_size;
+        }
+    }
+
+    fn build_border(&mut self, builder: &mut DisplayListBuilder) {
+        if self.fragment.has_collapsed_borders() {
+            // Avoid painting borders for tables and table parts in collapsed-borders mode,
+            // since the resulting collapsed borders are painted on their own in a special way.
+            return;
+        }
+
+        let border = self.fragment.style.get_border();
+        let border_widths = self.fragment.border.to_webrender();
+
+        if border_widths == SideOffsets2D::zero() {
+            return;
+        }
+
+        // `border-image` replaces an element's border entirely.
+        let common = builder.common_properties(self.border_rect, &self.fragment.style);
+        if self.build_border_image(builder, &common, border, border_widths) {
+            return;
+        }
+
+        let current_color = self.fragment.style.get_inherited_text().clone_color();
+        let style_color = BorderStyleColor::from_border(border, &current_color);
+        let details = wr::BorderDetails::Normal(wr::NormalBorder {
+            top: self.build_border_side(style_color.top),
+            right: self.build_border_side(style_color.right),
+            bottom: self.build_border_side(style_color.bottom),
+            left: self.build_border_side(style_color.left),
+            radius: self.border_radius,
+            do_aa: true,
+        });
+        builder
+            .wr()
+            .push_border(&common, self.border_rect, border_widths, details)
+    }
+
+    /// Add a display item for image borders if necessary.
+    fn build_border_image(
+        &self,
+        builder: &mut DisplayListBuilder,
+        common: &CommonItemProperties,
+        border: &Border,
+        border_widths: SideOffsets2D<f32, LayoutPixel>,
+    ) -> bool {
+        let border_style_struct = self.fragment.style.get_border();
+        let border_image_outset =
+            resolve_border_image_outset(border_style_struct.border_image_outset, border_widths);
+        let border_image_area = self.border_rect.to_rect().outer_rect(border_image_outset);
+        let border_image_size = border_image_area.size;
+        let border_image_widths = resolve_border_image_width(
+            &border_style_struct.border_image_width,
+            border_widths,
+            border_image_size,
+        );
+        let border_image_repeat = &border_style_struct.border_image_repeat;
+        let border_image_fill = border_style_struct.border_image_slice.fill;
+        let border_image_slice = &border_style_struct.border_image_slice.offsets;
+
+        let stops = Vec::new();
+        let mut width = border_image_size.width;
+        let mut height = border_image_size.height;
+        let node = self.fragment.base.tag.map(|tag| tag.node);
+        let source = match builder
+            .context
+            .resolve_image(node, &border.border_image_source)
+        {
+            Err(_) => return false,
+            Ok(ResolvedImage::Image(image_info)) => {
+                let Some(key) = image_info.key else {
+                    return false;
+                };
+
+                width = image_info.size.width as f32;
+                height = image_info.size.height as f32;
+                NinePatchBorderSource::Image(key, ImageRendering::Auto)
+            },
+            Ok(ResolvedImage::Gradient(gradient)) => {
+                match gradient::build(&self.fragment.style, gradient, border_image_size, builder) {
+                    WebRenderGradient::Linear(gradient) => {
+                        NinePatchBorderSource::Gradient(gradient)
+                    },
+                    WebRenderGradient::Radial(gradient) => {
+                        NinePatchBorderSource::RadialGradient(gradient)
+                    },
+                    WebRenderGradient::Conic(gradient) => {
+                        NinePatchBorderSource::ConicGradient(gradient)
+                    },
+                }
+            },
+        };
+
+        let size = euclid::Size2D::new(width as i32, height as i32);
+        let details = BorderDetails::NinePatch(NinePatchBorder {
+            source,
+            width: size.width,
+            height: size.height,
+            slice: resolve_border_image_slice(border_image_slice, size),
+            fill: border_image_fill,
+            repeat_horizontal: border_image_repeat.0.to_webrender(),
+            repeat_vertical: border_image_repeat.1.to_webrender(),
+        });
+        builder.wr().push_border(
+            common,
+            border_image_area.to_box2d(),
+            border_image_widths,
+            details,
+        );
+        builder.wr().push_stops(&stops);
+        true
+    }
+
+    fn build_outline(&mut self, builder: &mut DisplayListBuilder) {
+        let style = &self.fragment.style;
+        let outline = style.get_outline();
+        let width = outline.outline_width.to_f32_px();
+        if width == 0.0 {
+            return;
+        }
+        let offset = outline
+            .outline_offset
+            .px()
+            .max(-self.border_rect.width() / 2.0)
+            .max(-self.border_rect.height() / 2.0) +
+            width;
+        let outline_rect = self.border_rect.inflate(offset, offset);
+        let common = builder.common_properties(outline_rect, &self.fragment.style);
+        let widths = SideOffsets2D::new_all_same(width);
+        let border_style = match outline.outline_style {
+            // TODO: treating 'auto' as 'solid' is allowed by the spec,
+            // but we should do something better.
+            OutlineStyle::Auto => BorderStyle::Solid,
+            OutlineStyle::BorderStyle(s) => s,
+        };
+        let side = self.build_border_side(BorderStyleColor {
+            style: border_style,
+            color: style.resolve_color(&outline.outline_color),
+        });
+        let details = wr::BorderDetails::Normal(wr::NormalBorder {
+            top: side,
+            right: side,
+            bottom: side,
+            left: side,
+            radius: offset_radii(self.border_radius, offset),
+            do_aa: true,
+        });
+        builder
+            .wr()
+            .push_border(&common, outline_rect, widths, details)
+    }
+
+    fn build_box_shadow(&self, builder: &mut DisplayListBuilder<'_>) {
+        let box_shadows = &self.fragment.style.get_effects().box_shadow.0;
+        if box_shadows.is_empty() {
+            return;
+        }
+
+        // NB: According to CSS-BACKGROUNDS, box shadows render in *reverse* order (front to back).
+        let common = builder.common_properties(MaxRect::max_rect(), &self.fragment.style);
+        for box_shadow in box_shadows.iter().rev() {
+            let (rect, clip_mode) = if box_shadow.inset {
+                (*self.padding_rect(), BoxShadowClipMode::Inset)
+            } else {
+                (self.border_rect, BoxShadowClipMode::Outset)
+            };
+
+            builder.wr().push_box_shadow(
+                &common,
+                rect,
+                LayoutVector2D::new(
+                    box_shadow.base.horizontal.px(),
+                    box_shadow.base.vertical.px(),
+                ),
+                rgba(self.fragment.style.resolve_color(&box_shadow.base.color)),
+                box_shadow.base.blur.px(),
+                box_shadow.spread.px(),
+                self.border_radius,
+                clip_mode,
+            );
+        }
+    }
+}
+
+fn rgba(color: AbsoluteColor) -> wr::ColorF {
+    let rgba = color.to_color_space(ColorSpace::Srgb);
+    wr::ColorF::new(
+        rgba.components.0.clamp(0.0, 1.0),
+        rgba.components.1.clamp(0.0, 1.0),
+        rgba.components.2.clamp(0.0, 1.0),
+        rgba.alpha,
+    )
+}
+
+fn glyphs(
+    glyph_runs: &[Arc<GlyphStore>],
+    mut baseline_origin: PhysicalPoint<Au>,
+    justification_adjustment: Au,
+    ignore_whitespace: bool,
+) -> Vec<wr::GlyphInstance> {
+    use fonts_traits::ByteIndex;
+    use range::Range;
+
+    let mut glyphs = vec![];
+    for run in glyph_runs {
+        for glyph in run.iter_glyphs_for_byte_range(&Range::new(ByteIndex(0), run.len())) {
+            if !run.is_whitespace() || !ignore_whitespace {
+                let glyph_offset = glyph.offset().unwrap_or(Point2D::zero());
+                let point = units::LayoutPoint::new(
+                    baseline_origin.x.to_f32_px() + glyph_offset.x.to_f32_px(),
+                    baseline_origin.y.to_f32_px() + glyph_offset.y.to_f32_px(),
+                );
+                let glyph = wr::GlyphInstance {
+                    index: glyph.id(),
+                    point,
+                };
+                glyphs.push(glyph);
+            }
+
+            if glyph.char_is_word_separator() {
+                baseline_origin.x += justification_adjustment;
+            }
+            baseline_origin.x += glyph.advance();
+        }
+    }
+    glyphs
+}
+
+// TODO: The implementation here does not account for multiple glyph runs properly.
+fn glyphs_advance_by_index(
+    glyph_runs: &[Arc<GlyphStore>],
+    index: fonts_traits::ByteIndex,
+    baseline_origin: PhysicalPoint<Au>,
+    justification_adjustment: Au,
+) -> PhysicalPoint<Au> {
+    let mut point = baseline_origin;
+    let mut index = index;
+    for run in glyph_runs {
+        let range = ServoRange::new(fonts::ByteIndex(0), index.min(run.len()));
+        index = index - range.length();
+        let total_advance = run.advance_for_byte_range(&range, justification_adjustment);
+        point.x += total_advance;
+    }
+    point
+}
+
+fn cursor(kind: CursorKind, auto_cursor: Cursor) -> Cursor {
+    match kind {
+        CursorKind::Auto => auto_cursor,
+        CursorKind::None => Cursor::None,
+        CursorKind::Default => Cursor::Default,
+        CursorKind::Pointer => Cursor::Pointer,
+        CursorKind::ContextMenu => Cursor::ContextMenu,
+        CursorKind::Help => Cursor::Help,
+        CursorKind::Progress => Cursor::Progress,
+        CursorKind::Wait => Cursor::Wait,
+        CursorKind::Cell => Cursor::Cell,
+        CursorKind::Crosshair => Cursor::Crosshair,
+        CursorKind::Text => Cursor::Text,
+        CursorKind::VerticalText => Cursor::VerticalText,
+        CursorKind::Alias => Cursor::Alias,
+        CursorKind::Copy => Cursor::Copy,
+        CursorKind::Move => Cursor::Move,
+        CursorKind::NoDrop => Cursor::NoDrop,
+        CursorKind::NotAllowed => Cursor::NotAllowed,
+        CursorKind::Grab => Cursor::Grab,
+        CursorKind::Grabbing => Cursor::Grabbing,
+        CursorKind::EResize => Cursor::EResize,
+        CursorKind::NResize => Cursor::NResize,
+        CursorKind::NeResize => Cursor::NeResize,
+        CursorKind::NwResize => Cursor::NwResize,
+        CursorKind::SResize => Cursor::SResize,
+        CursorKind::SeResize => Cursor::SeResize,
+        CursorKind::SwResize => Cursor::SwResize,
+        CursorKind::WResize => Cursor::WResize,
+        CursorKind::EwResize => Cursor::EwResize,
+        CursorKind::NsResize => Cursor::NsResize,
+        CursorKind::NeswResize => Cursor::NeswResize,
+        CursorKind::NwseResize => Cursor::NwseResize,
+        CursorKind::ColResize => Cursor::ColResize,
+        CursorKind::RowResize => Cursor::RowResize,
+        CursorKind::AllScroll => Cursor::AllScroll,
+        CursorKind::ZoomIn => Cursor::ZoomIn,
+        CursorKind::ZoomOut => Cursor::ZoomOut,
+    }
+}
+
+/// Radii for the padding edge or content edge
+fn inner_radii(mut radii: wr::BorderRadius, insets: units::LayoutSideOffsets) -> wr::BorderRadius {
+    assert!(insets.left >= 0.0, "left inset must not be negative");
+    radii.top_left.width -= insets.left;
+    radii.bottom_left.width -= insets.left;
+
+    assert!(insets.right >= 0.0, "left inset must not be negative");
+    radii.top_right.width -= insets.right;
+    radii.bottom_right.width -= insets.right;
+
+    assert!(insets.top >= 0.0, "top inset must not be negative");
+    radii.top_left.height -= insets.top;
+    radii.top_right.height -= insets.top;
+
+    assert!(insets.bottom >= 0.0, "bottom inset must not be negative");
+    radii.bottom_left.height -= insets.bottom;
+    radii.bottom_right.height -= insets.bottom;
+    radii
+}
+
+fn offset_radii(mut radii: wr::BorderRadius, offset: f32) -> wr::BorderRadius {
+    if offset == 0.0 {
+        return radii;
+    }
+    if offset < 0.0 {
+        return inner_radii(radii, units::LayoutSideOffsets::new_all_same(-offset));
+    }
+    let expand = |radius: &mut f32| {
+        // Expand the radius by the specified amount, but keeping sharp corners.
+        // TODO: this behavior is not continuous, it's being discussed in the CSSWG:
+        // https://github.com/w3c/csswg-drafts/issues/7103
+        if *radius > 0.0 {
+            *radius += offset;
+        }
+    };
+    expand(&mut radii.top_left.width);
+    expand(&mut radii.top_left.height);
+    expand(&mut radii.top_right.width);
+    expand(&mut radii.top_right.height);
+    expand(&mut radii.bottom_right.width);
+    expand(&mut radii.bottom_right.height);
+    expand(&mut radii.bottom_left.width);
+    expand(&mut radii.bottom_left.height);
+    radii
+}
+
+fn create_clip_chain(
+    radii: wr::BorderRadius,
+    rect: units::LayoutRect,
+    builder: &mut DisplayListBuilder,
+    force_clip_creation: bool,
+) -> Option<ClipChainId> {
+    if radii.is_zero() && !force_clip_creation {
+        return None;
+    }
+
+    let spatial_id = builder.current_scroll_node_id.spatial_id;
+    let parent_clip_chain_id = builder.current_clip_chain_id;
+    let new_clip_id = if radii.is_zero() {
+        builder.wr().define_clip_rect(spatial_id, rect)
+    } else {
+        builder.wr().define_clip_rounded_rect(
+            spatial_id,
+            wr::ComplexClipRegion {
+                rect,
+                radii,
+                mode: wr::ClipMode::Clip,
+            },
+        )
+    };
+
+    Some(
+        builder
+            .display_list
+            .define_clip_chain(parent_clip_chain_id, [new_clip_id]),
+    )
+}
+
+/// Resolve the WebRender border-image outset area from the style values.
+fn resolve_border_image_outset(
+    outset: BorderImageOutset,
+    border: SideOffsets2D<f32, LayoutPixel>,
+) -> SideOffsets2D<f32, LayoutPixel> {
+    fn image_outset_for_side(outset: NonNegativeLengthOrNumber, border_width: f32) -> f32 {
+        match outset {
+            NonNegativeLengthOrNumber::Length(length) => length.px(),
+            NonNegativeLengthOrNumber::Number(factor) => border_width * factor.0,
+        }
+    }
+
+    SideOffsets2D::new(
+        image_outset_for_side(outset.0, border.top),
+        image_outset_for_side(outset.1, border.right),
+        image_outset_for_side(outset.2, border.bottom),
+        image_outset_for_side(outset.3, border.left),
+    )
+}
+
+/// Resolve the WebRender border-image width from the style values.
+fn resolve_border_image_width(
+    width: &BorderImageWidth,
+    border: SideOffsets2D<f32, LayoutPixel>,
+    border_area: Size2D<f32, LayoutPixel>,
+) -> SideOffsets2D<f32, LayoutPixel> {
+    fn image_width_for_side(
+        border_image_width: &BorderImageSideWidth,
+        border_width: f32,
+        total_length: f32,
+    ) -> f32 {
+        match border_image_width {
+            BorderImageSideWidth::LengthPercentage(v) => {
+                v.to_used_value(Au::from_f32_px(total_length)).to_f32_px()
+            },
+            BorderImageSideWidth::Number(x) => border_width * x.0,
+            BorderImageSideWidth::Auto => border_width,
+        }
+    }
+
+    SideOffsets2D::new(
+        image_width_for_side(&width.0, border.top, border_area.height),
+        image_width_for_side(&width.1, border.right, border_area.width),
+        image_width_for_side(&width.2, border.bottom, border_area.height),
+        image_width_for_side(&width.3, border.left, border_area.width),
+    )
+}
+
+/// Resolve the WebRender border-image slice from the style values.
+fn resolve_border_image_slice(
+    border_image_slice: &Rect<NonNegative<NumberOrPercentage>>,
+    size: Size2D<i32, UnknownUnit>,
+) -> SideOffsets2D<i32, DevicePixel> {
+    fn resolve_percentage(value: NonNegative<NumberOrPercentage>, length: i32) -> i32 {
+        match value.0 {
+            NumberOrPercentage::Percentage(p) => (p.0 * length as f32).round() as i32,
+            NumberOrPercentage::Number(n) => n.round() as i32,
+        }
+    }
+
+    SideOffsets2D::new(
+        resolve_percentage(border_image_slice.0, size.height),
+        resolve_percentage(border_image_slice.1, size.width),
+        resolve_percentage(border_image_slice.2, size.height),
+        resolve_percentage(border_image_slice.3, size.width),
+    )
+}
+
+pub(super) fn normalize_radii(rect: &units::LayoutRect, radius: &mut wr::BorderRadius) {
+    // Normalize radii that add up to > 100%.
+    // https://www.w3.org/TR/css-backgrounds-3/#corner-overlap
+    // > Let f = min(L_i/S_i), where i ∈ {top, right, bottom, left},
+    // > S_i is the sum of the two corresponding radii of the corners on side i,
+    // > and L_top = L_bottom = the width of the box,
+    // > and L_left = L_right = the height of the box.
+    // > If f < 1, then all corner radii are reduced by multiplying them by f.
+    let f = (rect.width() / (radius.top_left.width + radius.top_right.width))
+        .min(rect.width() / (radius.bottom_left.width + radius.bottom_right.width))
+        .min(rect.height() / (radius.top_left.height + radius.bottom_left.height))
+        .min(rect.height() / (radius.top_right.height + radius.bottom_right.height));
+    if f < 1.0 {
+        radius.top_left *= f;
+        radius.top_right *= f;
+        radius.bottom_right *= f;
+        radius.bottom_left *= f;
+    }
+}
+
+/// <https://drafts.csswg.org/css-shapes-1/#valdef-shape-box-margin-box>
+/// > The corner radii of this shape are determined by the corresponding
+/// > border-radius and margin values. If the ratio of border-radius/margin is 1 or more,
+/// > or margin is negative or zero, then the margin box corner radius is
+/// > max(border-radius + margin, 0). If the ratio of border-radius/margin is less than 1,
+/// > and margin is positive, then the margin box corner radius is
+/// > border-radius + margin * (1 + (ratio-1)^3).
+pub(super) fn compute_margin_box_radius(
+    radius: wr::BorderRadius,
+    layout_rect: LayoutSize,
+    fragment: &BoxFragment,
+) -> wr::BorderRadius {
+    let margin = fragment.style.physical_margin();
+    let adjust_radius = |radius: f32, margin: f32| -> f32 {
+        if margin <= 0. || (radius / margin) >= 1. {
+            (radius + margin).max(0.)
+        } else {
+            radius + (margin * (1. + (radius / margin - 1.).powf(3.)))
+        }
+    };
+    let compute_margin_radius = |radius: LayoutSize,
+                                 layout_rect: LayoutSize,
+                                 margin: Size2D<LengthPercentageOrAuto, UnknownUnit>|
+     -> LayoutSize {
+        let zero = LengthPercentage::zero();
+        let width = margin
+            .width
+            .auto_is(|| &zero)
+            .to_used_value(Au::from_f32_px(layout_rect.width));
+        let height = margin
+            .height
+            .auto_is(|| &zero)
+            .to_used_value(Au::from_f32_px(layout_rect.height));
+        LayoutSize::new(
+            adjust_radius(radius.width, width.to_f32_px()),
+            adjust_radius(radius.height, height.to_f32_px()),
+        )
+    };
+    wr::BorderRadius {
+        top_left: compute_margin_radius(
+            radius.top_left,
+            layout_rect,
+            Size2D::new(margin.left, margin.top),
+        ),
+        top_right: compute_margin_radius(
+            radius.top_right,
+            layout_rect,
+            Size2D::new(margin.right, margin.top),
+        ),
+        bottom_left: compute_margin_radius(
+            radius.bottom_left,
+            layout_rect,
+            Size2D::new(margin.left, margin.bottom),
+        ),
+        bottom_right: compute_margin_radius(
+            radius.bottom_right,
+            layout_rect,
+            Size2D::new(margin.right, margin.bottom),
+        ),
+    }
+}
diff --git a/components/layout_2020/display_list/stacking_context.rs b/components/layout/display_list/stacking_context.rs
similarity index 94%
rename from components/layout_2020/display_list/stacking_context.rs
rename to components/layout/display_list/stacking_context.rs
index 62e4085086e..27fa73a680c 100644
--- a/components/layout_2020/display_list/stacking_context.rs
+++ b/components/layout/display_list/stacking_context.rs
@@ -9,6 +9,7 @@ use std::mem;
 use app_units::Au;
 use base::id::ScrollTreeNodeId;
 use base::print_tree::PrintTree;
+use compositing_traits::display_list::{AxesScrollSensitivity, ScrollableNodeInfo};
 use euclid::SideOffsets2D;
 use euclid::default::{Point2D, Rect, Size2D};
 use log::warn;
@@ -28,7 +29,6 @@ use style::values::generics::transform::{self, GenericRotate, GenericScale, Gene
 use style::values::specified::box_::DisplayOutside;
 use webrender_api::units::{LayoutPoint, LayoutRect, LayoutTransform, LayoutVector2D};
 use webrender_api::{self as wr, BorderRadius};
-use webrender_traits::display_list::{AxesScrollSensitivity, ScrollableNodeInfo};
 use wr::units::{LayoutPixel, LayoutSize};
 use wr::{ClipChainId, SpatialTreeItemKey, StickyOffsetBounds};
 
@@ -530,7 +530,7 @@ impl StackingContext {
         if effects.filter.0.is_empty() &&
             effects.opacity == 1.0 &&
             effects.mix_blend_mode == ComputedMixBlendMode::Normal &&
-            !style.has_transform_or_perspective(FragmentFlags::empty()) &&
+            !style.has_effective_transform_or_perspective(FragmentFlags::empty()) &&
             style.clone_clip_path() == ClipPath::None
         {
             return false;
@@ -582,15 +582,42 @@ impl StackingContext {
         &self,
         builder: &mut DisplayListBuilder,
         fragment_tree: &crate::FragmentTree,
-        containing_block_rect: &PhysicalRect<Au>,
     ) {
-        let style = if let Some(style) = &fragment_tree.canvas_background.style {
-            style
-        } else {
-            // The root element has `display: none`,
-            // or the canvas background is taken from `<body>` which has `display: none`
+        let Some(root_fragment) = fragment_tree.root_fragments.iter().find(|fragment| {
+            fragment
+                .base()
+                .is_some_and(|base| base.flags.intersects(FragmentFlags::IS_ROOT_ELEMENT))
+        }) else {
             return;
         };
+        let root_fragment = match root_fragment {
+            Fragment::Box(box_fragment) | Fragment::Float(box_fragment) => box_fragment,
+            _ => return,
+        }
+        .borrow();
+
+        let source_style = {
+            // > For documents whose root element is an HTML HTML element or an XHTML html element
+            // > [HTML]: if the computed value of background-image on the root element is none and its
+            // > background-color is transparent, user agents must instead propagate the computed
+            // > values of the background properties from that element’s first HTML BODY or XHTML body
+            // > child element.
+            if root_fragment.style.background_is_transparent() {
+                let body_fragment = fragment_tree.body_fragment();
+                builder.paint_body_background = body_fragment.is_none();
+                body_fragment
+                    .map(|body_fragment| body_fragment.borrow().style.clone())
+                    .unwrap_or(root_fragment.style.clone())
+            } else {
+                root_fragment.style.clone()
+            }
+        };
+
+        // This can happen if the root fragment does not have a `<body>` child (either because it is
+        // `display: none` or `display: contents`) or if the `<body>`'s background is transparent.
+        if source_style.background_is_transparent() {
+            return;
+        }
 
         // The painting area is theoretically the infinite 2D plane,
         // but we need a rectangle with finite coordinates.
@@ -598,14 +625,15 @@ impl StackingContext {
         // If the document is smaller than the viewport (and doesn’t scroll),
         // we still want to paint the rest of the viewport.
         // If it’s larger, we also want to paint areas reachable after scrolling.
-        let mut painting_area = fragment_tree
+        let painting_area = fragment_tree
             .initial_containing_block
             .union(&fragment_tree.scrollable_overflow)
             .to_webrender();
 
-        let background_color = style.resolve_color(&style.get_background().background_color);
+        let background_color =
+            source_style.resolve_color(&source_style.get_background().background_color);
         if background_color.alpha > 0.0 {
-            let common = builder.common_properties(painting_area, style);
+            let common = builder.common_properties(painting_area, &source_style);
             let color = super::rgba(background_color);
             builder
                 .display_list
@@ -613,97 +641,14 @@ impl StackingContext {
                 .push_rect(&common, painting_area, color)
         }
 
-        // `background-color` was comparatively easy,
-        // but `background-image` needs a positioning area based on the root element.
-        // Let’s find the corresponding fragment.
-
-        // The fragment generated by the root element is the first one here, unless…
-        let first_if_any = self.contents.first().or_else(|| {
-            // There wasn’t any `StackingContextFragment` in the root `StackingContext`,
-            // because the root element generates a stacking context. Let’s find that one.
-            self.real_stacking_contexts_and_positioned_stacking_containers
-                .first()
-                .and_then(|first_child_stacking_context| {
-                    first_child_stacking_context.contents.first()
-                })
-        });
-
-        macro_rules! debug_panic {
-            ($msg: expr) => {
-                if cfg!(debug_assertions) {
-                    panic!($msg);
-                } else {
-                    warn!($msg);
-                    return;
-                }
-            };
-        }
-
-        let first_stacking_context_fragment = if let Some(first) = first_if_any {
-            first
-        } else {
-            // This should only happen if the root element has `display: none`
-            // TODO(servo#30569) revert to debug_panic!() once underlying bug is fixed
-            log::warn!(
-                "debug assertion failed! `CanvasBackground::for_root_element` should have returned `style: None`",
-            );
-            return;
-        };
-
-        let StackingContextContent::Fragment {
-            fragment,
-            scroll_node_id,
-            containing_block,
-            ..
-        } = first_stacking_context_fragment
-        else {
-            debug_panic!("Expected a fragment, not a stacking container");
-        };
-        let box_fragment = match fragment {
-            Fragment::Box(box_fragment) | Fragment::Float(box_fragment) => box_fragment,
-            _ => debug_panic!("Expected a box-generated fragment"),
-        };
-        let box_fragment = &*box_fragment.borrow();
-
-        // The `StackingContextFragment` we found is for the root DOM element:
-        debug_assert_eq!(
-            fragment.tag().map(|tag| tag.node),
-            Some(fragment_tree.canvas_background.root_element),
-        );
-
-        // The root element may have a CSS transform, and we want the canvas’
-        // background image to be transformed. To do so, take its `SpatialId`
-        // (but not its `ClipId`)
-        builder.current_scroll_node_id = *scroll_node_id;
-
-        // Now we need express the painting area rectangle in the local coordinate system,
-        // which differs from the top-level coordinate system based on…
-
-        // Convert the painting area rectangle to the local coordinate system of this `SpatialId`
-        if let Some(reference_frame_data) =
-            box_fragment.reference_frame_data_if_necessary(containing_block_rect)
-        {
-            painting_area.min -= reference_frame_data.origin.to_webrender().to_vector();
-            if let Some(transformed) = reference_frame_data
-                .transform
-                .inverse()
-                .and_then(|inversed| inversed.outer_transformed_rect(&painting_area.to_rect()))
-            {
-                painting_area = transformed.to_box2d();
-            } else {
-                // The desired rect cannot be represented, so skip painting this background-image
-                return;
-            }
-        }
-
         let mut fragment_builder = BuilderForBoxFragment::new(
-            box_fragment,
-            containing_block,
+            &root_fragment,
+            &fragment_tree.initial_containing_block,
             false, /* is_hit_test_for_scrollable_overflow */
             false, /* is_collapsed_table_borders */
         );
         let painter = super::background::BackgroundPainter {
-            style,
+            style: &source_style,
             painting_area_override: Some(painting_area),
             positioning_area_override: None,
         };
@@ -986,7 +931,7 @@ impl BoxFragment {
             return Some(StackingContextType::FloatStackingContainer);
         }
 
-        if box_style.display.is_atomic_inline_level() {
+        if self.is_atomic_inline_level() {
             return Some(StackingContextType::AtomicInlineStackingContainer);
         }
 
@@ -1477,7 +1422,7 @@ impl BoxFragment {
             y: overflow.y.into(),
         };
 
-        let content_rect = self.scrollable_overflow().to_webrender();
+        let content_rect = self.reachable_scrollable_overflow_region().to_webrender();
 
         let scroll_tree_node_id = display_list.define_scroll_frame(
             parent_scroll_node_id,
@@ -1584,7 +1529,10 @@ impl BoxFragment {
         &self,
         containing_block_rect: &PhysicalRect<Au>,
     ) -> Option<ReferenceFrameData> {
-        if !self.style.has_transform_or_perspective(self.base.flags) {
+        if !self
+            .style
+            .has_effective_transform_or_perspective(self.base.flags)
+        {
             return None;
         }
 
diff --git a/components/layout/dom.rs b/components/layout/dom.rs
new file mode 100644
index 00000000000..e3a22eb5197
--- /dev/null
+++ b/components/layout/dom.rs
@@ -0,0 +1,405 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::any::Any;
+use std::marker::PhantomData;
+use std::sync::Arc;
+
+use atomic_refcell::{AtomicRef, AtomicRefCell, AtomicRefMut};
+use base::id::{BrowsingContextId, PipelineId};
+use html5ever::{local_name, ns};
+use malloc_size_of_derive::MallocSizeOf;
+use pixels::Image;
+use script::layout_dom::ServoLayoutNode;
+use script_layout_interface::wrapper_traits::{
+    LayoutDataTrait, LayoutNode, ThreadSafeLayoutElement, ThreadSafeLayoutNode,
+};
+use script_layout_interface::{
+    GenericLayoutDataTrait, LayoutElementType, LayoutNodeType as ScriptLayoutNodeType,
+};
+use servo_arc::Arc as ServoArc;
+use style::context::SharedStyleContext;
+use style::properties::ComputedValues;
+use style::selector_parser::PseudoElement;
+
+use crate::cell::ArcRefCell;
+use crate::flexbox::FlexLevelBox;
+use crate::flow::BlockLevelBox;
+use crate::flow::inline::{InlineItem, SharedInlineStyles};
+use crate::fragment_tree::Fragment;
+use crate::geom::PhysicalSize;
+use crate::replaced::CanvasInfo;
+use crate::table::TableLevelBox;
+use crate::taffy::TaffyItemBox;
+
+/// The data that is stored in each DOM node that is used by layout.
+#[derive(Default, MallocSizeOf)]
+pub struct InnerDOMLayoutData {
+    pub(super) self_box: ArcRefCell<Option<LayoutBox>>,
+    pub(super) pseudo_before_box: ArcRefCell<Option<LayoutBox>>,
+    pub(super) pseudo_after_box: ArcRefCell<Option<LayoutBox>>,
+    pub(super) pseudo_marker_box: ArcRefCell<Option<LayoutBox>>,
+}
+
+impl InnerDOMLayoutData {
+    pub(crate) fn for_pseudo(
+        &self,
+        pseudo_element: Option<PseudoElement>,
+    ) -> AtomicRef<Option<LayoutBox>> {
+        match pseudo_element {
+            Some(PseudoElement::Before) => self.pseudo_before_box.borrow(),
+            Some(PseudoElement::After) => self.pseudo_after_box.borrow(),
+            Some(PseudoElement::Marker) => self.pseudo_marker_box.borrow(),
+            _ => self.self_box.borrow(),
+        }
+    }
+}
+
+/// A box that is stored in one of the `DOMLayoutData` slots.
+#[derive(MallocSizeOf)]
+pub(super) enum LayoutBox {
+    DisplayContents(SharedInlineStyles),
+    BlockLevel(ArcRefCell<BlockLevelBox>),
+    InlineLevel(Vec<ArcRefCell<InlineItem>>),
+    FlexLevel(ArcRefCell<FlexLevelBox>),
+    TableLevelBox(TableLevelBox),
+    TaffyItemBox(ArcRefCell<TaffyItemBox>),
+}
+
+impl LayoutBox {
+    fn invalidate_cached_fragment(&self) {
+        match self {
+            LayoutBox::DisplayContents(..) => {},
+            LayoutBox::BlockLevel(block_level_box) => {
+                block_level_box.borrow().invalidate_cached_fragment()
+            },
+            LayoutBox::InlineLevel(inline_items) => {
+                for inline_item in inline_items.iter() {
+                    inline_item.borrow().invalidate_cached_fragment()
+                }
+            },
+            LayoutBox::FlexLevel(flex_level_box) => {
+                flex_level_box.borrow().invalidate_cached_fragment()
+            },
+            LayoutBox::TaffyItemBox(taffy_item_box) => {
+                taffy_item_box.borrow_mut().invalidate_cached_fragment()
+            },
+            LayoutBox::TableLevelBox(table_box) => table_box.invalidate_cached_fragment(),
+        }
+    }
+
+    pub(crate) fn fragments(&self) -> Vec<Fragment> {
+        match self {
+            LayoutBox::DisplayContents(..) => vec![],
+            LayoutBox::BlockLevel(block_level_box) => block_level_box.borrow().fragments(),
+            LayoutBox::InlineLevel(inline_items) => inline_items
+                .iter()
+                .flat_map(|inline_item| inline_item.borrow().fragments())
+                .collect(),
+            LayoutBox::FlexLevel(flex_level_box) => flex_level_box.borrow().fragments(),
+            LayoutBox::TaffyItemBox(taffy_item_box) => taffy_item_box.borrow().fragments(),
+            LayoutBox::TableLevelBox(table_box) => table_box.fragments(),
+        }
+    }
+
+    fn repair_style(
+        &self,
+        context: &SharedStyleContext,
+        node: &ServoLayoutNode,
+        new_style: &ServoArc<ComputedValues>,
+    ) {
+        match self {
+            LayoutBox::DisplayContents(inline_shared_styles) => {
+                *inline_shared_styles.style.borrow_mut() = new_style.clone();
+                *inline_shared_styles.selected.borrow_mut() = node.to_threadsafe().selected_style();
+            },
+            LayoutBox::BlockLevel(block_level_box) => {
+                block_level_box
+                    .borrow_mut()
+                    .repair_style(context, node, new_style);
+            },
+            LayoutBox::InlineLevel(inline_items) => {
+                for inline_item in inline_items {
+                    inline_item
+                        .borrow_mut()
+                        .repair_style(context, node, new_style);
+                }
+            },
+            LayoutBox::FlexLevel(flex_level_box) => {
+                flex_level_box.borrow_mut().repair_style(context, new_style)
+            },
+            LayoutBox::TableLevelBox(table_level_box) => {
+                table_level_box.repair_style(context, new_style)
+            },
+            LayoutBox::TaffyItemBox(taffy_item_box) => {
+                taffy_item_box.borrow_mut().repair_style(context, new_style)
+            },
+        }
+    }
+}
+
+/// A wrapper for [`InnerDOMLayoutData`]. This is necessary to give the entire data
+/// structure interior mutability, as we will need to mutate the layout data of
+/// non-mutable DOM nodes.
+#[derive(Default, MallocSizeOf)]
+pub struct DOMLayoutData(AtomicRefCell<InnerDOMLayoutData>);
+
+// The implementation of this trait allows the data to be stored in the DOM.
+impl LayoutDataTrait for DOMLayoutData {}
+impl GenericLayoutDataTrait for DOMLayoutData {
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+}
+
+pub struct BoxSlot<'dom> {
+    pub(crate) slot: Option<ArcRefCell<Option<LayoutBox>>>,
+    pub(crate) marker: PhantomData<&'dom ()>,
+}
+
+/// A mutable reference to a `LayoutBox` stored in a DOM element.
+impl BoxSlot<'_> {
+    pub(crate) fn new(slot: ArcRefCell<Option<LayoutBox>>) -> Self {
+        *slot.borrow_mut() = None;
+        let slot = Some(slot);
+        Self {
+            slot,
+            marker: PhantomData,
+        }
+    }
+
+    pub(crate) fn dummy() -> Self {
+        let slot = None;
+        Self {
+            slot,
+            marker: PhantomData,
+        }
+    }
+
+    pub(crate) fn set(mut self, box_: LayoutBox) {
+        if let Some(slot) = &mut self.slot {
+            *slot.borrow_mut() = Some(box_);
+        }
+    }
+}
+
+impl Drop for BoxSlot<'_> {
+    fn drop(&mut self) {
+        if !std::thread::panicking() {
+            if let Some(slot) = &mut self.slot {
+                assert!(slot.borrow().is_some(), "failed to set a layout box");
+            }
+        }
+    }
+}
+
+pub(crate) trait NodeExt<'dom> {
+    /// Returns the image if it’s loaded, and its size in image pixels
+    /// adjusted for `image_density`.
+    fn as_image(&self) -> Option<(Option<Arc<Image>>, PhysicalSize<f64>)>;
+    fn as_canvas(&self) -> Option<(CanvasInfo, PhysicalSize<f64>)>;
+    fn as_iframe(&self) -> Option<(PipelineId, BrowsingContextId)>;
+    fn as_video(&self) -> Option<(Option<webrender_api::ImageKey>, Option<PhysicalSize<f64>>)>;
+    fn as_typeless_object_with_data_attribute(&self) -> Option<String>;
+    fn style(&self, context: &SharedStyleContext) -> ServoArc<ComputedValues>;
+
+    fn layout_data_mut(&self) -> AtomicRefMut<'dom, InnerDOMLayoutData>;
+    fn layout_data(&self) -> Option<AtomicRef<'dom, InnerDOMLayoutData>>;
+    fn element_box_slot(&self) -> BoxSlot<'dom>;
+    fn pseudo_element_box_slot(&self, which: PseudoElement) -> BoxSlot<'dom>;
+    fn unset_pseudo_element_box(&self, which: PseudoElement);
+
+    /// Remove boxes for the element itself, and its `:before` and `:after` if any.
+    fn unset_all_boxes(&self);
+
+    fn fragments_for_pseudo(&self, pseudo_element: Option<PseudoElement>) -> Vec<Fragment>;
+    fn invalidate_cached_fragment(&self);
+
+    fn repair_style(&self, context: &SharedStyleContext);
+}
+
+impl<'dom> NodeExt<'dom> for ServoLayoutNode<'dom> {
+    fn as_image(&self) -> Option<(Option<Arc<Image>>, PhysicalSize<f64>)> {
+        let node = self.to_threadsafe();
+        let (resource, metadata) = node.image_data()?;
+        let (width, height) = resource
+            .as_ref()
+            .map(|image| (image.width, image.height))
+            .or_else(|| metadata.map(|metadata| (metadata.width, metadata.height)))
+            .unwrap_or((0, 0));
+        let (mut width, mut height) = (width as f64, height as f64);
+        if let Some(density) = node.image_density().filter(|density| *density != 1.) {
+            width /= density;
+            height /= density;
+        }
+        Some((resource, PhysicalSize::new(width, height)))
+    }
+
+    fn as_video(&self) -> Option<(Option<webrender_api::ImageKey>, Option<PhysicalSize<f64>>)> {
+        let node = self.to_threadsafe();
+        let data = node.media_data()?;
+        let natural_size = if let Some(frame) = data.current_frame {
+            Some(PhysicalSize::new(frame.width.into(), frame.height.into()))
+        } else {
+            data.metadata
+                .map(|meta| PhysicalSize::new(meta.width.into(), meta.height.into()))
+        };
+        Some((
+            data.current_frame.map(|frame| frame.image_key),
+            natural_size,
+        ))
+    }
+
+    fn as_canvas(&self) -> Option<(CanvasInfo, PhysicalSize<f64>)> {
+        let node = self.to_threadsafe();
+        let canvas_data = node.canvas_data()?;
+        let source = canvas_data.source;
+        Some((
+            CanvasInfo { source },
+            PhysicalSize::new(canvas_data.width.into(), canvas_data.height.into()),
+        ))
+    }
+
+    fn as_iframe(&self) -> Option<(PipelineId, BrowsingContextId)> {
+        let node = self.to_threadsafe();
+        match (node.iframe_pipeline_id(), node.iframe_browsing_context_id()) {
+            (Some(pipeline_id), Some(browsing_context_id)) => {
+                Some((pipeline_id, browsing_context_id))
+            },
+            _ => None,
+        }
+    }
+
+    fn as_typeless_object_with_data_attribute(&self) -> Option<String> {
+        if LayoutNode::type_id(self) !=
+            ScriptLayoutNodeType::Element(LayoutElementType::HTMLObjectElement)
+        {
+            return None;
+        }
+
+        // TODO: This is the what the legacy layout system did, but really if Servo
+        // supports any `<object>` that's an image, it should support those with URLs
+        // and `type` attributes with image mime types.
+        let element = self.to_threadsafe().as_element()?;
+        if element.get_attr(&ns!(), &local_name!("type")).is_some() {
+            return None;
+        }
+        element
+            .get_attr(&ns!(), &local_name!("data"))
+            .map(|string| string.to_owned())
+    }
+
+    fn style(&self, context: &SharedStyleContext) -> ServoArc<ComputedValues> {
+        self.to_threadsafe().style(context)
+    }
+
+    fn layout_data_mut(&self) -> AtomicRefMut<'dom, InnerDOMLayoutData> {
+        if LayoutNode::layout_data(self).is_none() {
+            self.initialize_layout_data::<DOMLayoutData>();
+        }
+        LayoutNode::layout_data(self)
+            .unwrap()
+            .as_any()
+            .downcast_ref::<DOMLayoutData>()
+            .unwrap()
+            .0
+            .borrow_mut()
+    }
+
+    fn layout_data(&self) -> Option<AtomicRef<'dom, InnerDOMLayoutData>> {
+        LayoutNode::layout_data(self).map(|data| {
+            data.as_any()
+                .downcast_ref::<DOMLayoutData>()
+                .unwrap()
+                .0
+                .borrow()
+        })
+    }
+
+    fn element_box_slot(&self) -> BoxSlot<'dom> {
+        BoxSlot::new(self.layout_data_mut().self_box.clone())
+    }
+
+    fn pseudo_element_box_slot(&self, pseudo_element_type: PseudoElement) -> BoxSlot<'dom> {
+        let data = self.layout_data_mut();
+        let cell = match pseudo_element_type {
+            PseudoElement::Before => &data.pseudo_before_box,
+            PseudoElement::After => &data.pseudo_after_box,
+            PseudoElement::Marker => &data.pseudo_marker_box,
+            _ => unreachable!(
+                "Asked for box slot for unsupported pseudo-element: {:?}",
+                pseudo_element_type
+            ),
+        };
+        BoxSlot::new(cell.clone())
+    }
+
+    fn unset_pseudo_element_box(&self, pseudo_element_type: PseudoElement) {
+        let data = self.layout_data_mut();
+        let cell = match pseudo_element_type {
+            PseudoElement::Before => &data.pseudo_before_box,
+            PseudoElement::After => &data.pseudo_after_box,
+            PseudoElement::Marker => &data.pseudo_marker_box,
+            _ => unreachable!(
+                "Asked for box slot for unsupported pseudo-element: {:?}",
+                pseudo_element_type
+            ),
+        };
+        *cell.borrow_mut() = None;
+    }
+
+    fn unset_all_boxes(&self) {
+        let data = self.layout_data_mut();
+        *data.self_box.borrow_mut() = None;
+        *data.pseudo_before_box.borrow_mut() = None;
+        *data.pseudo_after_box.borrow_mut() = None;
+        *data.pseudo_marker_box.borrow_mut() = None;
+        // Stylo already takes care of removing all layout data
+        // for DOM descendants of elements with `display: none`.
+    }
+
+    fn invalidate_cached_fragment(&self) {
+        let data = self.layout_data_mut();
+        if let Some(data) = data.self_box.borrow_mut().as_mut() {
+            data.invalidate_cached_fragment();
+        }
+    }
+
+    fn fragments_for_pseudo(&self, pseudo_element: Option<PseudoElement>) -> Vec<Fragment> {
+        NodeExt::layout_data(self)
+            .and_then(|layout_data| {
+                layout_data
+                    .for_pseudo(pseudo_element)
+                    .as_ref()
+                    .map(LayoutBox::fragments)
+            })
+            .unwrap_or_default()
+    }
+
+    fn repair_style(&self, context: &SharedStyleContext) {
+        let data = self.layout_data_mut();
+        if let Some(layout_object) = &*data.self_box.borrow() {
+            let style = self.to_threadsafe().style(context);
+            layout_object.repair_style(context, self, &style);
+        }
+
+        if let Some(layout_object) = &*data.pseudo_before_box.borrow() {
+            if let Some(node) = self.to_threadsafe().with_pseudo(PseudoElement::Before) {
+                layout_object.repair_style(context, self, &node.style(context));
+            }
+        }
+
+        if let Some(layout_object) = &*data.pseudo_after_box.borrow() {
+            if let Some(node) = self.to_threadsafe().with_pseudo(PseudoElement::After) {
+                layout_object.repair_style(context, self, &node.style(context));
+            }
+        }
+
+        if let Some(layout_object) = &*data.pseudo_marker_box.borrow() {
+            if let Some(node) = self.to_threadsafe().with_pseudo(PseudoElement::Marker) {
+                layout_object.repair_style(context, self, &node.style(context));
+            }
+        }
+    }
+}
diff --git a/components/layout/dom_traversal.rs b/components/layout/dom_traversal.rs
new file mode 100644
index 00000000000..0201d72dbe2
--- /dev/null
+++ b/components/layout/dom_traversal.rs
@@ -0,0 +1,564 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::borrow::Cow;
+use std::iter::FusedIterator;
+
+use fonts::ByteIndex;
+use html5ever::{LocalName, local_name};
+use range::Range;
+use script::layout_dom::ServoLayoutNode;
+use script_layout_interface::wrapper_traits::{
+    LayoutNode, ThreadSafeLayoutElement, ThreadSafeLayoutNode,
+};
+use script_layout_interface::{LayoutElementType, LayoutNodeType};
+use selectors::Element as SelectorsElement;
+use servo_arc::Arc as ServoArc;
+use style::dom::{NodeInfo, TElement, TNode, TShadowRoot};
+use style::properties::ComputedValues;
+use style::selector_parser::PseudoElement;
+use style::values::generics::counters::{Content, ContentItem};
+use style::values::specified::Quotes;
+
+use crate::context::LayoutContext;
+use crate::dom::{BoxSlot, LayoutBox, NodeExt};
+use crate::flow::inline::SharedInlineStyles;
+use crate::fragment_tree::{BaseFragmentInfo, FragmentFlags, Tag};
+use crate::quotes::quotes_for_lang;
+use crate::replaced::ReplacedContents;
+use crate::style_ext::{Display, DisplayGeneratingBox, DisplayInside, DisplayOutside};
+
+/// A data structure used to pass and store related layout information together to
+/// avoid having to repeat the same arguments in argument lists.
+#[derive(Clone)]
+pub(crate) struct NodeAndStyleInfo<'dom> {
+    pub node: ServoLayoutNode<'dom>,
+    pub pseudo_element_type: Option<PseudoElement>,
+    pub style: ServoArc<ComputedValues>,
+}
+
+impl<'dom> NodeAndStyleInfo<'dom> {
+    fn new_with_pseudo(
+        node: ServoLayoutNode<'dom>,
+        pseudo_element_type: PseudoElement,
+        style: ServoArc<ComputedValues>,
+    ) -> Self {
+        Self {
+            node,
+            pseudo_element_type: Some(pseudo_element_type),
+            style,
+        }
+    }
+
+    pub(crate) fn new(node: ServoLayoutNode<'dom>, style: ServoArc<ComputedValues>) -> Self {
+        Self {
+            node,
+            pseudo_element_type: None,
+            style,
+        }
+    }
+
+    pub(crate) fn is_single_line_text_input(&self) -> bool {
+        self.node.type_id() == LayoutNodeType::Element(LayoutElementType::HTMLInputElement)
+    }
+
+    pub(crate) fn pseudo(
+        &self,
+        context: &LayoutContext,
+        pseudo_element_type: PseudoElement,
+    ) -> Option<Self> {
+        let style = self
+            .node
+            .to_threadsafe()
+            .as_element()?
+            .with_pseudo(pseudo_element_type)?
+            .style(context.shared_context());
+        Some(NodeAndStyleInfo {
+            node: self.node,
+            pseudo_element_type: Some(pseudo_element_type),
+            style,
+        })
+    }
+
+    pub(crate) fn get_selected_style(&self) -> ServoArc<ComputedValues> {
+        self.node.to_threadsafe().selected_style()
+    }
+
+    pub(crate) fn get_selection_range(&self) -> Option<Range<ByteIndex>> {
+        self.node.to_threadsafe().selection()
+    }
+}
+
+impl<'dom> From<&NodeAndStyleInfo<'dom>> for BaseFragmentInfo {
+    fn from(info: &NodeAndStyleInfo<'dom>) -> Self {
+        let node = info.node;
+        let pseudo = info.pseudo_element_type;
+        let threadsafe_node = node.to_threadsafe();
+        let mut flags = FragmentFlags::empty();
+
+        // Anonymous boxes should not have a tag, because they should not take part in hit testing.
+        //
+        // TODO(mrobinson): It seems that anonymous boxes should take part in hit testing in some
+        // cases, but currently this means that the order of hit test results isn't as expected for
+        // some WPT tests. This needs more investigation.
+        if matches!(
+            pseudo,
+            Some(PseudoElement::ServoAnonymousBox) |
+                Some(PseudoElement::ServoAnonymousTable) |
+                Some(PseudoElement::ServoAnonymousTableCell) |
+                Some(PseudoElement::ServoAnonymousTableRow)
+        ) {
+            return Self::anonymous();
+        }
+
+        if let Some(element) = threadsafe_node.as_html_element() {
+            if element.is_body_element_of_html_element_root() {
+                flags.insert(FragmentFlags::IS_BODY_ELEMENT_OF_HTML_ELEMENT_ROOT);
+            }
+
+            match element.get_local_name() {
+                &local_name!("br") => {
+                    flags.insert(FragmentFlags::IS_BR_ELEMENT);
+                },
+                &local_name!("table") | &local_name!("th") | &local_name!("td") => {
+                    flags.insert(FragmentFlags::IS_TABLE_TH_OR_TD_ELEMENT);
+                },
+                _ => {},
+            }
+
+            if matches!(
+                element.type_id(),
+                Some(LayoutNodeType::Element(
+                    LayoutElementType::HTMLInputElement | LayoutElementType::HTMLTextAreaElement
+                ))
+            ) {
+                flags.insert(FragmentFlags::IS_TEXT_CONTROL);
+            }
+
+            if ThreadSafeLayoutElement::is_root(&element) {
+                flags.insert(FragmentFlags::IS_ROOT_ELEMENT);
+            }
+        };
+
+        Self {
+            tag: Some(Tag::new_pseudo(threadsafe_node.opaque(), pseudo)),
+            flags,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub(super) enum Contents {
+    /// Any kind of content that is not replaced, including the contents of pseudo-elements.
+    NonReplaced(NonReplacedContents),
+    /// Example: an `<img src=…>` element.
+    /// <https://drafts.csswg.org/css2/conform.html#replaced-element>
+    Replaced(ReplacedContents),
+}
+
+#[derive(Debug)]
+#[allow(clippy::enum_variant_names)]
+pub(super) enum NonReplacedContents {
+    /// Refers to a DOM subtree, plus `::before` and `::after` pseudo-elements.
+    OfElement,
+    /// Content of a `::before` or `::after` pseudo-element that is being generated.
+    /// <https://drafts.csswg.org/css2/generate.html#content>
+    OfPseudoElement(Vec<PseudoElementContentItem>),
+    /// Workaround for input and textarea element until we properly implement `display-inside`.
+    OfTextControl,
+}
+
+#[derive(Debug)]
+pub(super) enum PseudoElementContentItem {
+    Text(String),
+    Replaced(ReplacedContents),
+}
+
+pub(super) trait TraversalHandler<'dom> {
+    fn handle_text(&mut self, info: &NodeAndStyleInfo<'dom>, text: Cow<'dom, str>);
+
+    /// Or pseudo-element
+    fn handle_element(
+        &mut self,
+        info: &NodeAndStyleInfo<'dom>,
+        display: DisplayGeneratingBox,
+        contents: Contents,
+        box_slot: BoxSlot<'dom>,
+    );
+
+    /// Notify the handler that we are about to recurse into a `display: contents` element.
+    fn enter_display_contents(&mut self, _: SharedInlineStyles) {}
+
+    /// Notify the handler that we have finished a `display: contents` element.
+    fn leave_display_contents(&mut self) {}
+}
+
+fn traverse_children_of<'dom>(
+    parent_element: ServoLayoutNode<'dom>,
+    context: &LayoutContext,
+    handler: &mut impl TraversalHandler<'dom>,
+) {
+    traverse_eager_pseudo_element(PseudoElement::Before, parent_element, context, handler);
+
+    let is_text_input_element = matches!(
+        parent_element.type_id(),
+        LayoutNodeType::Element(LayoutElementType::HTMLInputElement)
+    );
+
+    let is_textarea_element = matches!(
+        parent_element.type_id(),
+        LayoutNodeType::Element(LayoutElementType::HTMLTextAreaElement)
+    );
+
+    if is_text_input_element || is_textarea_element {
+        let info = NodeAndStyleInfo::new(
+            parent_element,
+            parent_element.style(context.shared_context()),
+        );
+        let node_text_content = parent_element.to_threadsafe().node_text_content();
+        if node_text_content.is_empty() {
+            // The addition of zero-width space here forces the text input to have an inline formatting
+            // context that might otherwise be trimmed if there's no text. This is important to ensure
+            // that the input element is at least as tall as the line gap of the caret:
+            // <https://drafts.csswg.org/css-ui/#element-with-default-preferred-size>.
+            //
+            // This is also used to ensure that the caret will still be rendered when the input is empty.
+            // TODO: Is there a less hacky way to do this?
+            handler.handle_text(&info, "\u{200B}".into());
+        } else {
+            handler.handle_text(&info, node_text_content);
+        }
+    }
+
+    if !is_text_input_element && !is_textarea_element {
+        for child in iter_child_nodes(parent_element) {
+            if child.is_text_node() {
+                let info = NodeAndStyleInfo::new(child, child.style(context.shared_context()));
+                handler.handle_text(&info, child.to_threadsafe().node_text_content());
+            } else if child.is_element() {
+                traverse_element(child, context, handler);
+            }
+        }
+    }
+
+    traverse_eager_pseudo_element(PseudoElement::After, parent_element, context, handler);
+}
+
+fn traverse_element<'dom>(
+    element: ServoLayoutNode<'dom>,
+    context: &LayoutContext,
+    handler: &mut impl TraversalHandler<'dom>,
+) {
+    // Clear any existing pseudo-element box slot, because markers are not handled like
+    // `::before`` and `::after`. They are processed during box tree creation.
+    element.unset_pseudo_element_box(PseudoElement::Marker);
+
+    let replaced = ReplacedContents::for_element(element, context);
+    let style = element.style(context.shared_context());
+    match Display::from(style.get_box().display) {
+        Display::None => element.unset_all_boxes(),
+        Display::Contents => {
+            if replaced.is_some() {
+                // `display: content` on a replaced element computes to `display: none`
+                // <https://drafts.csswg.org/css-display-3/#valdef-display-contents>
+                element.unset_all_boxes()
+            } else {
+                let shared_inline_styles: SharedInlineStyles =
+                    (&NodeAndStyleInfo::new(element, style)).into();
+                element
+                    .element_box_slot()
+                    .set(LayoutBox::DisplayContents(shared_inline_styles.clone()));
+
+                handler.enter_display_contents(shared_inline_styles);
+                traverse_children_of(element, context, handler);
+                handler.leave_display_contents();
+            }
+        },
+        Display::GeneratingBox(display) => {
+            let contents = if let Some(replaced) = replaced {
+                Contents::Replaced(replaced)
+            } else if matches!(
+                element.type_id(),
+                LayoutNodeType::Element(
+                    LayoutElementType::HTMLInputElement | LayoutElementType::HTMLTextAreaElement
+                )
+            ) {
+                NonReplacedContents::OfTextControl.into()
+            } else {
+                NonReplacedContents::OfElement.into()
+            };
+            let display = display.used_value_for_contents(&contents);
+            let box_slot = element.element_box_slot();
+            let info = NodeAndStyleInfo::new(element, style);
+            handler.handle_element(&info, display, contents, box_slot);
+        },
+    }
+}
+
+fn traverse_eager_pseudo_element<'dom>(
+    pseudo_element_type: PseudoElement,
+    node: ServoLayoutNode<'dom>,
+    context: &LayoutContext,
+    handler: &mut impl TraversalHandler<'dom>,
+) {
+    assert!(pseudo_element_type.is_eager());
+
+    // First clear any old contents from the node.
+    node.unset_pseudo_element_box(pseudo_element_type);
+
+    let Some(element) = node.to_threadsafe().as_element() else {
+        return;
+    };
+    let Some(pseudo_element) = element.with_pseudo(pseudo_element_type) else {
+        return;
+    };
+
+    let style = pseudo_element.style(context.shared_context());
+    if style.ineffective_content_property() {
+        return;
+    }
+
+    let info = NodeAndStyleInfo::new_with_pseudo(node, pseudo_element_type, style);
+    match Display::from(info.style.get_box().display) {
+        Display::None => {},
+        Display::Contents => {
+            let items = generate_pseudo_element_content(&info.style, node, context);
+            let box_slot = node.pseudo_element_box_slot(pseudo_element_type);
+            let shared_inline_styles: SharedInlineStyles = (&info).into();
+            box_slot.set(LayoutBox::DisplayContents(shared_inline_styles.clone()));
+
+            handler.enter_display_contents(shared_inline_styles);
+            traverse_pseudo_element_contents(&info, context, handler, items);
+            handler.leave_display_contents();
+        },
+        Display::GeneratingBox(display) => {
+            let items = generate_pseudo_element_content(&info.style, node, context);
+            let box_slot = node.pseudo_element_box_slot(pseudo_element_type);
+            let contents = NonReplacedContents::OfPseudoElement(items).into();
+            handler.handle_element(&info, display, contents, box_slot);
+        },
+    }
+}
+
+fn traverse_pseudo_element_contents<'dom>(
+    info: &NodeAndStyleInfo<'dom>,
+    context: &LayoutContext,
+    handler: &mut impl TraversalHandler<'dom>,
+    items: Vec<PseudoElementContentItem>,
+) {
+    let mut anonymous_info = None;
+    for item in items {
+        match item {
+            PseudoElementContentItem::Text(text) => handler.handle_text(info, text.into()),
+            PseudoElementContentItem::Replaced(contents) => {
+                let anonymous_info = anonymous_info.get_or_insert_with(|| {
+                    info.pseudo(context, PseudoElement::ServoAnonymousBox)
+                        .unwrap_or_else(|| info.clone())
+                });
+                let display_inline = DisplayGeneratingBox::OutsideInside {
+                    outside: DisplayOutside::Inline,
+                    inside: DisplayInside::Flow {
+                        is_list_item: false,
+                    },
+                };
+                // `display` is not inherited, so we get the initial value
+                debug_assert!(
+                    Display::from(anonymous_info.style.get_box().display) ==
+                        Display::GeneratingBox(display_inline)
+                );
+                handler.handle_element(
+                    anonymous_info,
+                    display_inline,
+                    Contents::Replaced(contents),
+                    // We don’t keep pointers to boxes generated by contents of pseudo-elements
+                    BoxSlot::dummy(),
+                )
+            },
+        }
+    }
+}
+
+impl Contents {
+    /// Returns true iff the `try_from` impl below would return `Err(_)`
+    pub fn is_replaced(&self) -> bool {
+        matches!(self, Contents::Replaced(_))
+    }
+}
+
+impl From<NonReplacedContents> for Contents {
+    fn from(non_replaced_contents: NonReplacedContents) -> Self {
+        Contents::NonReplaced(non_replaced_contents)
+    }
+}
+
+impl std::convert::TryFrom<Contents> for NonReplacedContents {
+    type Error = &'static str;
+
+    fn try_from(contents: Contents) -> Result<Self, Self::Error> {
+        match contents {
+            Contents::NonReplaced(non_replaced_contents) => Ok(non_replaced_contents),
+            Contents::Replaced(_) => {
+                Err("Tried to covnert a `Contents::Replaced` into `NonReplacedContent`")
+            },
+        }
+    }
+}
+
+impl NonReplacedContents {
+    pub(crate) fn traverse<'dom>(
+        self,
+        context: &LayoutContext,
+        info: &NodeAndStyleInfo<'dom>,
+        handler: &mut impl TraversalHandler<'dom>,
+    ) {
+        match self {
+            NonReplacedContents::OfElement | NonReplacedContents::OfTextControl => {
+                traverse_children_of(info.node, context, handler)
+            },
+            NonReplacedContents::OfPseudoElement(items) => {
+                traverse_pseudo_element_contents(info, context, handler, items)
+            },
+        }
+    }
+}
+
+fn get_quote_from_pair<I, S>(item: &ContentItem<I>, opening: &S, closing: &S) -> String
+where
+    S: ToString + ?Sized,
+{
+    match item {
+        ContentItem::OpenQuote => opening.to_string(),
+        ContentItem::CloseQuote => closing.to_string(),
+        _ => unreachable!("Got an unexpected ContentItem type when processing quotes."),
+    }
+}
+
+/// <https://www.w3.org/TR/CSS2/generate.html#propdef-content>
+fn generate_pseudo_element_content(
+    pseudo_element_style: &ComputedValues,
+    element: ServoLayoutNode<'_>,
+    context: &LayoutContext,
+) -> Vec<PseudoElementContentItem> {
+    match &pseudo_element_style.get_counters().content {
+        Content::Items(items) => {
+            let mut vec = vec![];
+            for item in items.items.iter() {
+                match item {
+                    ContentItem::String(s) => {
+                        vec.push(PseudoElementContentItem::Text(s.to_string()));
+                    },
+                    ContentItem::Attr(attr) => {
+                        let element = element
+                            .to_threadsafe()
+                            .as_element()
+                            .expect("Expected an element");
+
+                        // From
+                        // <https://html.spec.whatwg.org/multipage/#case-sensitivity-of-the-css-%27attr%28%29%27-function>
+                        //
+                        // > CSS Values and Units leaves the case-sensitivity of attribute names for
+                        // > the purpose of the `attr()` function to be defined by the host language.
+                        // > [[CSSVALUES]].
+                        // >
+                        // > When comparing the attribute name part of a CSS `attr()`function to the
+                        // > names of namespace-less attributes on HTML elements in HTML documents,
+                        // > the name part of the CSS `attr()` function must first be converted to
+                        // > ASCII lowercase. The same function when compared to other attributes must
+                        // > be compared according to its original case. In both cases, to match the
+                        // > values must be identical to each other (and therefore the comparison is
+                        // > case sensitive).
+                        let attr_name = match element.is_html_element_in_html_document() {
+                            true => &*attr.attribute.to_ascii_lowercase(),
+                            false => &*attr.attribute,
+                        };
+
+                        let attr_val =
+                            element.get_attr(&attr.namespace_url, &LocalName::from(attr_name));
+                        vec.push(PseudoElementContentItem::Text(
+                            attr_val.map_or("".to_string(), |s| s.to_string()),
+                        ));
+                    },
+                    ContentItem::Image(image) => {
+                        if let Some(replaced_content) =
+                            ReplacedContents::from_image(element, context, image)
+                        {
+                            vec.push(PseudoElementContentItem::Replaced(replaced_content));
+                        }
+                    },
+                    ContentItem::OpenQuote | ContentItem::CloseQuote => {
+                        // TODO(xiaochengh): calculate quote depth
+                        let maybe_quote = match &pseudo_element_style.get_list().quotes {
+                            Quotes::QuoteList(quote_list) => {
+                                quote_list.0.first().map(|quote_pair| {
+                                    get_quote_from_pair(
+                                        item,
+                                        &*quote_pair.opening,
+                                        &*quote_pair.closing,
+                                    )
+                                })
+                            },
+                            Quotes::Auto => {
+                                let lang = &pseudo_element_style.get_font()._x_lang;
+                                let quotes = quotes_for_lang(lang.0.as_ref(), 0);
+                                Some(get_quote_from_pair(item, &quotes.opening, &quotes.closing))
+                            },
+                        };
+                        if let Some(quote) = maybe_quote {
+                            vec.push(PseudoElementContentItem::Text(quote));
+                        }
+                    },
+                    ContentItem::Counter(_, _) |
+                    ContentItem::Counters(_, _, _) |
+                    ContentItem::NoOpenQuote |
+                    ContentItem::NoCloseQuote => {
+                        // TODO: Add support for counters and quotes.
+                    },
+                }
+            }
+            vec
+        },
+        Content::Normal | Content::None => unreachable!(),
+    }
+}
+
+pub enum ChildNodeIterator<'dom> {
+    /// Iterating over the children of a node
+    Node(Option<ServoLayoutNode<'dom>>),
+    /// Iterating over the assigned nodes of a `HTMLSlotElement`
+    Slottables(<Vec<ServoLayoutNode<'dom>> as IntoIterator>::IntoIter),
+}
+
+pub(crate) fn iter_child_nodes(parent: ServoLayoutNode<'_>) -> ChildNodeIterator<'_> {
+    if let Some(element) = parent.as_element() {
+        if let Some(shadow) = element.shadow_root() {
+            return iter_child_nodes(shadow.as_node());
+        };
+
+        let slotted_nodes = element.slotted_nodes();
+        if !slotted_nodes.is_empty() {
+            #[allow(clippy::unnecessary_to_owned)] // Clippy is wrong.
+            return ChildNodeIterator::Slottables(slotted_nodes.to_owned().into_iter());
+        }
+    }
+
+    let first = parent.first_child();
+    ChildNodeIterator::Node(first)
+}
+
+impl<'dom> Iterator for ChildNodeIterator<'dom> {
+    type Item = ServoLayoutNode<'dom>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match self {
+            Self::Node(node) => {
+                let old = *node;
+                *node = old?.next_sibling();
+                old
+            },
+            Self::Slottables(slots) => slots.next(),
+        }
+    }
+}
+
+impl FusedIterator for ChildNodeIterator<'_> {}
diff --git a/components/layout/flexbox/geom.rs b/components/layout/flexbox/geom.rs
new file mode 100644
index 00000000000..90145dceafe
--- /dev/null
+++ b/components/layout/flexbox/geom.rs
@@ -0,0 +1,272 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! <https://drafts.csswg.org/css-flexbox/#box-model>
+
+use malloc_size_of_derive::MallocSizeOf;
+use style::properties::longhands::flex_direction::computed_value::T as FlexDirection;
+
+use crate::geom::{LogicalRect, LogicalSides, LogicalVec2};
+
+#[derive(Clone, Copy, Debug, Default)]
+pub(super) struct FlexRelativeVec2<T> {
+    pub main: T,
+    pub cross: T,
+}
+
+#[derive(Clone, Copy, Debug)]
+pub(super) struct FlexRelativeSides<T> {
+    pub cross_start: T,
+    pub main_start: T,
+    pub cross_end: T,
+    pub main_end: T,
+}
+
+pub(super) struct FlexRelativeRect<T> {
+    pub start_corner: FlexRelativeVec2<T>,
+    pub size: FlexRelativeVec2<T>,
+}
+
+impl<T> std::ops::Add for FlexRelativeVec2<T>
+where
+    T: std::ops::Add,
+{
+    type Output = FlexRelativeVec2<T::Output>;
+    fn add(self, rhs: Self) -> Self::Output {
+        FlexRelativeVec2 {
+            main: self.main + rhs.main,
+            cross: self.cross + rhs.cross,
+        }
+    }
+}
+
+impl<T> std::ops::Sub for FlexRelativeVec2<T>
+where
+    T: std::ops::Sub,
+{
+    type Output = FlexRelativeVec2<T::Output>;
+    fn sub(self, rhs: Self) -> Self::Output {
+        FlexRelativeVec2 {
+            main: self.main - rhs.main,
+            cross: self.cross - rhs.cross,
+        }
+    }
+}
+
+impl<T> FlexRelativeSides<T> {
+    pub fn sum_by_axis(self) -> FlexRelativeVec2<T::Output>
+    where
+        T: std::ops::Add,
+    {
+        FlexRelativeVec2 {
+            main: self.main_start + self.main_end,
+            cross: self.cross_start + self.cross_end,
+        }
+    }
+}
+
+/// One of the two bits set by the `flex-direction` property
+/// (The other is "forward" v.s. reverse.)
+#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq)]
+pub(super) enum FlexAxis {
+    /// The main axis is the inline axis of the container (not necessarily of flex items!),
+    /// cross is block.
+    Row,
+    /// The main axis is the block axis, cross is inline.
+    Column,
+}
+
+/// Which flow-relative sides map to the main-start and cross-start sides, respectively.
+/// See <https://drafts.csswg.org/css-flexbox/#box-model>
+#[derive(Clone, Copy, Debug, MallocSizeOf)]
+pub(super) enum MainStartCrossStart {
+    InlineStartBlockStart,
+    InlineStartBlockEnd,
+    BlockStartInlineStart,
+    BlockStartInlineEnd,
+    InlineEndBlockStart,
+    InlineEndBlockEnd,
+    BlockEndInlineStart,
+    BlockEndInlineEnd,
+}
+
+impl FlexAxis {
+    pub fn from(flex_direction: FlexDirection) -> Self {
+        match flex_direction {
+            FlexDirection::Row | FlexDirection::RowReverse => FlexAxis::Row,
+            FlexDirection::Column | FlexDirection::ColumnReverse => FlexAxis::Column,
+        }
+    }
+
+    pub fn vec2_to_flex_relative<T>(self, flow_relative: LogicalVec2<T>) -> FlexRelativeVec2<T> {
+        let LogicalVec2 { inline, block } = flow_relative;
+        match self {
+            FlexAxis::Row => FlexRelativeVec2 {
+                main: inline,
+                cross: block,
+            },
+            FlexAxis::Column => FlexRelativeVec2 {
+                main: block,
+                cross: inline,
+            },
+        }
+    }
+
+    pub fn vec2_to_flow_relative<T>(self, flex_relative: FlexRelativeVec2<T>) -> LogicalVec2<T> {
+        let FlexRelativeVec2 { main, cross } = flex_relative;
+        match self {
+            FlexAxis::Row => LogicalVec2 {
+                inline: main,
+                block: cross,
+            },
+            FlexAxis::Column => LogicalVec2 {
+                block: main,
+                inline: cross,
+            },
+        }
+    }
+}
+
+macro_rules! sides_mapping_methods {
+    (
+        $(
+            $variant: path => {
+                $( $flex_relative_side: ident <=> $flow_relative_side: ident, )+
+            },
+        )+
+    ) => {
+        pub fn sides_to_flex_relative<T>(self, flow_relative: LogicalSides<T>) -> FlexRelativeSides<T> {
+            match self {
+                $(
+                    $variant => FlexRelativeSides {
+                        $( $flex_relative_side: flow_relative.$flow_relative_side, )+
+                    },
+                )+
+            }
+        }
+
+        pub fn sides_to_flow_relative<T>(self, flex_relative: FlexRelativeSides<T>) -> LogicalSides<T> {
+            match self {
+                $(
+                    $variant => LogicalSides {
+                        $( $flow_relative_side: flex_relative.$flex_relative_side, )+
+                    },
+                )+
+            }
+        }
+    }
+}
+
+impl MainStartCrossStart {
+    pub fn from(flex_direction: FlexDirection, flex_wrap_reverse: bool) -> Self {
+        match (flex_direction, flex_wrap_reverse) {
+            // See definition of each keyword in
+            // https://drafts.csswg.org/css-flexbox/#flex-direction-property and
+            // https://drafts.csswg.org/css-flexbox/#flex-wrap-property,
+            // or the tables (though they map to physical rather than flow-relative) at
+            // https://drafts.csswg.org/css-flexbox/#axis-mapping
+            (FlexDirection::Row, true) => MainStartCrossStart::InlineStartBlockEnd,
+            (FlexDirection::Row, false) => MainStartCrossStart::InlineStartBlockStart,
+            (FlexDirection::Column, true) => MainStartCrossStart::BlockStartInlineEnd,
+            (FlexDirection::Column, false) => MainStartCrossStart::BlockStartInlineStart,
+            (FlexDirection::RowReverse, true) => MainStartCrossStart::InlineEndBlockEnd,
+            (FlexDirection::RowReverse, false) => MainStartCrossStart::InlineEndBlockStart,
+            (FlexDirection::ColumnReverse, true) => MainStartCrossStart::BlockEndInlineEnd,
+            (FlexDirection::ColumnReverse, false) => MainStartCrossStart::BlockEndInlineStart,
+        }
+    }
+
+    sides_mapping_methods! {
+        MainStartCrossStart::InlineStartBlockStart => {
+            main_start <=> inline_start,
+            cross_start <=> block_start,
+            main_end <=> inline_end,
+            cross_end <=> block_end,
+        },
+        MainStartCrossStart::InlineStartBlockEnd => {
+            main_start <=> inline_start,
+            cross_start <=> block_end,
+            main_end <=> inline_end,
+            cross_end <=> block_start,
+        },
+        MainStartCrossStart::BlockStartInlineStart => {
+            main_start <=> block_start,
+            cross_start <=> inline_start,
+            main_end <=> block_end,
+            cross_end <=> inline_end,
+        },
+        MainStartCrossStart::BlockStartInlineEnd => {
+            main_start <=> block_start,
+            cross_start <=> inline_end,
+            main_end <=> block_end,
+            cross_end <=> inline_start,
+        },
+        MainStartCrossStart::InlineEndBlockStart => {
+            main_start <=> inline_end,
+            cross_start <=> block_start,
+            main_end <=> inline_start,
+            cross_end <=> block_end,
+        },
+        MainStartCrossStart::InlineEndBlockEnd => {
+            main_start <=> inline_end,
+            cross_start <=> block_end,
+            main_end <=> inline_start,
+            cross_end <=> block_start,
+        },
+        MainStartCrossStart::BlockEndInlineStart => {
+            main_start <=> block_end,
+            cross_start <=> inline_start,
+            main_end <=> block_start,
+            cross_end <=> inline_end,
+        },
+        MainStartCrossStart::BlockEndInlineEnd => {
+            main_start <=> block_end,
+            cross_start <=> inline_end,
+            main_end <=> block_start,
+            cross_end <=> inline_start,
+        },
+    }
+}
+
+/// The start corner coordinates in both the input rectangle and output rectangle
+/// are relative to some “base rectangle” whose size is passed here.
+pub(super) fn rect_to_flow_relative<T>(
+    flex_axis: FlexAxis,
+    main_start_cross_start_sides_are: MainStartCrossStart,
+    base_rect_size: FlexRelativeVec2<T>,
+    rect: FlexRelativeRect<T>,
+) -> LogicalRect<T>
+where
+    T: Copy + std::ops::Add<Output = T> + std::ops::Sub<Output = T>,
+{
+    // First, convert from (start corner, size) to offsets from the edges of the base rectangle
+
+    let end_corner_position = rect.start_corner + rect.size;
+    let end_corner_offsets = base_rect_size - end_corner_position;
+    // No-ops, but hopefully clarifies to human readers:
+    let start_corner_position = rect.start_corner;
+    let start_corner_offsets = start_corner_position;
+
+    // Then, convert to flow-relative using methods above
+    let flow_relative_offsets =
+        main_start_cross_start_sides_are.sides_to_flow_relative(FlexRelativeSides {
+            main_start: start_corner_offsets.main,
+            cross_start: start_corner_offsets.cross,
+            main_end: end_corner_offsets.main,
+            cross_end: end_corner_offsets.cross,
+        });
+    let flow_relative_base_rect_size = flex_axis.vec2_to_flow_relative(base_rect_size);
+
+    // Finally, convert back to (start corner, size)
+    let start_corner = LogicalVec2 {
+        inline: flow_relative_offsets.inline_start,
+        block: flow_relative_offsets.block_start,
+    };
+    let end_corner_position = LogicalVec2 {
+        inline: flow_relative_base_rect_size.inline - flow_relative_offsets.inline_end,
+        block: flow_relative_base_rect_size.block - flow_relative_offsets.block_end,
+    };
+    let size = end_corner_position - start_corner;
+    LogicalRect { start_corner, size }
+}
diff --git a/components/layout/flexbox/layout.rs b/components/layout/flexbox/layout.rs
new file mode 100644
index 00000000000..3ddbb71ba89
--- /dev/null
+++ b/components/layout/flexbox/layout.rs
@@ -0,0 +1,2730 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::cell::{Cell, LazyCell};
+use std::cmp::Ordering;
+
+use app_units::Au;
+use atomic_refcell::AtomicRef;
+use itertools::izip;
+use rayon::iter::{
+    IndexedParallelIterator, IntoParallelRefIterator, ParallelDrainRange, ParallelIterator,
+};
+use style::Zero;
+use style::computed_values::position::T as Position;
+use style::logical_geometry::Direction;
+use style::properties::ComputedValues;
+use style::properties::longhands::align_items::computed_value::T as AlignItems;
+use style::properties::longhands::box_sizing::computed_value::T as BoxSizing;
+use style::properties::longhands::flex_direction::computed_value::T as FlexDirection;
+use style::properties::longhands::flex_wrap::computed_value::T as FlexWrap;
+use style::values::computed::LengthPercentage;
+use style::values::generics::flex::GenericFlexBasis as FlexBasis;
+use style::values::generics::length::LengthPercentageOrNormal;
+use style::values::specified::align::AlignFlags;
+
+use super::geom::{FlexAxis, FlexRelativeRect, FlexRelativeSides, FlexRelativeVec2};
+use super::{FlexContainer, FlexContainerConfig, FlexItemBox, FlexLevelBox};
+use crate::cell::ArcRefCell;
+use crate::context::LayoutContext;
+use crate::formatting_contexts::{Baselines, IndependentFormattingContextContents};
+use crate::fragment_tree::{
+    BoxFragment, CollapsedBlockMargins, Fragment, FragmentFlags, SpecificLayoutInfo,
+};
+use crate::geom::{AuOrAuto, LogicalRect, LogicalSides, LogicalVec2, Size, Sizes};
+use crate::layout_box_base::CacheableLayoutResult;
+use crate::positioned::{
+    AbsolutelyPositionedBox, PositioningContext, PositioningContextLength, relative_adjustement,
+};
+use crate::sizing::{
+    ComputeInlineContentSizes, ContentSizes, InlineContentSizesResult, IntrinsicSizingMode,
+};
+use crate::style_ext::{AspectRatio, Clamp, ComputedValuesExt, ContentBoxSizesAndPBM, LayoutStyle};
+use crate::{
+    ConstraintSpace, ContainingBlock, ContainingBlockSize, IndefiniteContainingBlock,
+    SizeConstraint,
+};
+
+/// Layout parameters and intermediate results about a flex container,
+/// grouped to avoid passing around many parameters
+struct FlexContext<'a> {
+    config: FlexContainerConfig,
+    layout_context: &'a LayoutContext<'a>,
+    containing_block: &'a ContainingBlock<'a>, // For items
+    container_inner_size_constraint: FlexRelativeVec2<SizeConstraint>,
+}
+
+/// A flex item with some intermediate results
+struct FlexItem<'a> {
+    box_: &'a FlexItemBox,
+
+    /// The preferred, min and max inner cross sizes. If the flex container is single-line
+    /// and [`Self::cross_size_stretches_to_line`] is true, then the preferred cross size
+    /// is set to [`Size::Stretch`].
+    content_cross_sizes: Sizes,
+
+    padding: FlexRelativeSides<Au>,
+    border: FlexRelativeSides<Au>,
+    margin: FlexRelativeSides<AuOrAuto>,
+
+    /// Sum of padding, border, and margin (with `auto` assumed to be zero) in each axis.
+    /// This is the difference between an outer and inner size.
+    pbm_auto_is_zero: FlexRelativeVec2<Au>,
+
+    /// <https://drafts.csswg.org/css-flexbox/#algo-main-item>
+    flex_base_size: Au,
+
+    /// Whether the [`Self::flex_base_size`] comes from a definite `flex-basis`.
+    /// If false and the container main size is also indefinite, percentages in the item's
+    /// content that resolve against its main size should be indefinite.
+    flex_base_size_is_definite: bool,
+
+    /// <https://drafts.csswg.org/css-flexbox/#algo-main-item>
+    hypothetical_main_size: Au,
+
+    /// The used min main size of the flex item.
+    /// <https://drafts.csswg.org/css-flexbox/#min-main-size-property>
+    content_min_main_size: Au,
+
+    /// The used max main size of the flex item.
+    /// <https://drafts.csswg.org/css-flexbox/#max-main-size-property>
+    content_max_main_size: Option<Au>,
+
+    /// This is `align-self`, defaulting to `align-items` if `auto`
+    align_self: AlignItems,
+
+    /// Whether or not the size of this [`FlexItem`] depends on its block constraints.
+    depends_on_block_constraints: bool,
+
+    /// <https://drafts.csswg.org/css-sizing-4/#preferred-aspect-ratio>
+    preferred_aspect_ratio: Option<AspectRatio>,
+
+    /// Whether the preferred cross size of the item stretches to fill the flex line.
+    /// This happens when the size computes to `auto`, the used value of `align-self`
+    /// is `stretch`, and neither of the cross-axis margins are `auto`.
+    /// <https://drafts.csswg.org/css-flexbox-1/#stretched>
+    ///
+    /// Note the following sizes are not sufficient:
+    ///  - A size that only behaves as `auto` (like a cyclic percentage).
+    ///    The computed value needs to be `auto` too.
+    ///  - A `stretch` size. It stretches to the containing block, not to the line
+    ///    (under discussion in <https://github.com/w3c/csswg-drafts/issues/11784>).
+    cross_size_stretches_to_line: bool,
+}
+
+/// Child of a FlexContainer. Can either be absolutely positioned, or not. If not,
+/// a placeholder is used and flex content is stored outside of this enum.
+enum FlexContent {
+    AbsolutelyPositionedBox(ArcRefCell<AbsolutelyPositionedBox>),
+    FlexItemPlaceholder,
+}
+
+/// Return type of `FlexItem::layout`
+struct FlexItemLayoutResult {
+    hypothetical_cross_size: Au,
+    fragments: Vec<Fragment>,
+    positioning_context: PositioningContext,
+
+    // Either the first or the last baseline, depending on ‘align-self’.
+    baseline_relative_to_margin_box: Option<Au>,
+
+    // The content size of this layout. For replaced elements this is known before layout,
+    // but for non-replaced it's only known after layout.
+    content_size: LogicalVec2<Au>,
+
+    // The containing block inline size used to generate this layout.
+    containing_block_inline_size: Au,
+
+    // The containing block block size used to generate this layout.
+    containing_block_block_size: SizeConstraint,
+
+    // Whether or not this layout depended on block constraints.
+    depends_on_block_constraints: bool,
+
+    // Whether or not this layout had a child that dependeded on block constraints.
+    has_child_which_depends_on_block_constraints: bool,
+
+    // The specific layout info that this flex item had.
+    specific_layout_info: Option<SpecificLayoutInfo>,
+}
+
+impl FlexItemLayoutResult {
+    fn compatible_with_containing_block_size(&self, containing_block: &ContainingBlock) -> bool {
+        if containing_block.size.inline == self.containing_block_inline_size &&
+            (containing_block.size.block == self.containing_block_block_size ||
+                (!self.depends_on_block_constraints &&
+                    !self.has_child_which_depends_on_block_constraints))
+        {
+            return true;
+        }
+
+        #[cfg(feature = "tracing")]
+        tracing::warn!(
+            name: "NonReplaced stretch cache miss",
+            cached_inline = ?self.containing_block_inline_size,
+            cached_block = ?self.containing_block_block_size,
+            required_inline = ?containing_block.size.inline,
+            required_block = ?containing_block.size.block,
+            depends_on_block_constraints = self.depends_on_block_constraints,
+            has_child_which_depends_on_block_constraints = self.has_child_which_depends_on_block_constraints,
+        );
+
+        false
+    }
+
+    fn compatible_with_containing_block_size_and_content_size(
+        &self,
+        containing_block: &ContainingBlock,
+        size: LogicalVec2<Au>,
+    ) -> bool {
+        size == self.content_size && self.compatible_with_containing_block_size(containing_block)
+    }
+}
+
+/// A data structure to hold all of the information about a flex item that has been placed
+/// into a flex line. This happens once the item is laid out and its line has been determined.
+struct FlexLineItem<'a> {
+    /// The items that are placed in this line.
+    item: FlexItem<'a>,
+
+    /// The layout results of the initial layout pass for a flex line. These may be replaced
+    /// if necessary due to the use of `align-content: stretch` or `align-self: stretch`.
+    layout_result: FlexItemLayoutResult,
+
+    /// The used main size of this item in its line.
+    used_main_size: Au,
+}
+
+impl FlexLineItem<'_> {
+    fn get_or_synthesize_baseline_with_cross_size(&self, cross_size: Au) -> Au {
+        self.layout_result
+            .baseline_relative_to_margin_box
+            .unwrap_or_else(|| {
+                self.item
+                    .synthesized_baseline_relative_to_margin_box(cross_size)
+            })
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn collect_fragment(
+        mut self,
+        initial_flex_layout: &InitialFlexLineLayout,
+        item_used_size: FlexRelativeVec2<Au>,
+        item_margin: FlexRelativeSides<Au>,
+        item_main_interval: Au,
+        final_line_cross_size: Au,
+        shared_alignment_baseline: &Option<Au>,
+        flex_context: &mut FlexContext,
+        all_baselines: &mut Baselines,
+        main_position_cursor: &mut Au,
+    ) -> (ArcRefCell<BoxFragment>, PositioningContext) {
+        // https://drafts.csswg.org/css-flexbox/#algo-main-align
+        // “Align the items along the main-axis”
+        *main_position_cursor +=
+            item_margin.main_start + self.item.border.main_start + self.item.padding.main_start;
+        let item_content_main_start_position = *main_position_cursor;
+
+        *main_position_cursor += item_used_size.main +
+            self.item.padding.main_end +
+            self.item.border.main_end +
+            item_margin.main_end +
+            item_main_interval;
+
+        // https://drafts.csswg.org/css-flexbox/#algo-cross-align
+        let item_content_cross_start_position = self.item.align_along_cross_axis(
+            &item_margin,
+            &item_used_size.cross,
+            final_line_cross_size,
+            self.layout_result
+                .baseline_relative_to_margin_box
+                .unwrap_or_default(),
+            shared_alignment_baseline.unwrap_or_default(),
+            flex_context.config.flex_wrap_is_reversed,
+        );
+
+        let start_corner = FlexRelativeVec2 {
+            main: item_content_main_start_position,
+            cross: item_content_cross_start_position,
+        };
+
+        // Need to collect both baselines from baseline participation and other baselines.
+        let final_line_size = FlexRelativeVec2 {
+            main: initial_flex_layout.line_size.main,
+            cross: final_line_cross_size,
+        };
+        let content_rect = flex_context.rect_to_flow_relative(
+            final_line_size,
+            FlexRelativeRect {
+                start_corner,
+                size: item_used_size,
+            },
+        );
+
+        if let Some(item_baseline) = self.layout_result.baseline_relative_to_margin_box.as_ref() {
+            let item_baseline = *item_baseline + item_content_cross_start_position -
+                self.item.border.cross_start -
+                self.item.padding.cross_start -
+                item_margin.cross_start;
+            all_baselines.first.get_or_insert(item_baseline);
+            all_baselines.last = Some(item_baseline);
+        }
+
+        let mut fragment_info = self.item.box_.base_fragment_info();
+        fragment_info
+            .flags
+            .insert(FragmentFlags::IS_FLEX_OR_GRID_ITEM);
+        if self.item.depends_on_block_constraints {
+            fragment_info.flags.insert(
+                FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM,
+            );
+        }
+        let flags = fragment_info.flags;
+
+        let containing_block = flex_context.containing_block;
+        let container_writing_mode = containing_block.style.writing_mode;
+        let style = self.item.box_.style();
+
+        let mut fragment = BoxFragment::new(
+            fragment_info,
+            style.clone(),
+            self.layout_result.fragments,
+            content_rect.as_physical(Some(flex_context.containing_block)),
+            flex_context
+                .sides_to_flow_relative(self.item.padding)
+                .to_physical(container_writing_mode),
+            flex_context
+                .sides_to_flow_relative(self.item.border)
+                .to_physical(container_writing_mode),
+            flex_context
+                .sides_to_flow_relative(item_margin)
+                .to_physical(container_writing_mode),
+            None, /* clearance */
+        )
+        .with_specific_layout_info(self.layout_result.specific_layout_info);
+
+        // If this flex item establishes a containing block for absolutely-positioned
+        // descendants, then lay out any relevant absolutely-positioned children. This
+        // will remove those children from `self.positioning_context`.
+        if style.establishes_containing_block_for_absolute_descendants(flags) {
+            self.layout_result
+                .positioning_context
+                .layout_collected_children(flex_context.layout_context, &mut fragment);
+        }
+
+        if style.clone_position() == Position::Relative {
+            fragment.content_rect.origin += relative_adjustement(style, containing_block)
+                .to_physical_size(containing_block.style.writing_mode)
+        }
+
+        let fragment = ArcRefCell::new(fragment);
+        self.item
+            .box_
+            .independent_formatting_context
+            .base
+            .set_fragment(Fragment::Box(fragment.clone()));
+        (fragment, self.layout_result.positioning_context)
+    }
+}
+
+/// Once the final cross size of a line is known, the line can go through their final
+/// layout and this the return value. See [`InitialFlexLineLayout::finish_with_final_cross_size`].
+struct FinalFlexLineLayout {
+    /// The final cross size of this flex line.
+    cross_size: Au,
+    /// The [`BoxFragment`]s and [`PositioningContext`]s of all flex items,
+    /// one per flex item in "order-modified document order."
+    item_fragments: Vec<(ArcRefCell<BoxFragment>, PositioningContext)>,
+    /// The 'shared alignment baseline' of this flex line. This is the baseline used for
+    /// baseline-aligned items if there are any, otherwise `None`.
+    shared_alignment_baseline: Option<Au>,
+    /// This is the baseline of the first and last items with compatible writing mode, regardless of
+    /// whether they particpate in baseline alignement. This is used as a fallback baseline for the
+    /// container, if there are no items participating in baseline alignment in the first or last
+    /// flex lines.
+    all_baselines: Baselines,
+}
+
+impl FlexContainerConfig {
+    fn resolve_reversable_flex_alignment(
+        &self,
+        align_flags: AlignFlags,
+        reversed: bool,
+    ) -> AlignFlags {
+        match (align_flags.value(), reversed) {
+            (AlignFlags::FLEX_START, false) => AlignFlags::START | align_flags.flags(),
+            (AlignFlags::FLEX_START, true) => AlignFlags::END | align_flags.flags(),
+            (AlignFlags::FLEX_END, false) => AlignFlags::END | align_flags.flags(),
+            (AlignFlags::FLEX_END, true) => AlignFlags::START | align_flags.flags(),
+            (_, _) => align_flags,
+        }
+    }
+
+    fn resolve_align_self_for_child(&self, child_style: &ComputedValues) -> AlignFlags {
+        self.resolve_reversable_flex_alignment(
+            child_style
+                .resolve_align_self(self.align_items, AlignItems(AlignFlags::STRETCH))
+                .0,
+            self.flex_wrap_is_reversed,
+        )
+    }
+
+    fn resolve_justify_content_for_child(&self) -> AlignFlags {
+        self.resolve_reversable_flex_alignment(
+            self.justify_content.0.primary(),
+            self.flex_direction_is_reversed,
+        )
+    }
+
+    fn sides_to_flex_relative<T>(&self, sides: LogicalSides<T>) -> FlexRelativeSides<T> {
+        self.main_start_cross_start_sides_are
+            .sides_to_flex_relative(sides)
+    }
+
+    fn sides_to_flow_relative<T>(&self, sides: FlexRelativeSides<T>) -> LogicalSides<T> {
+        self.main_start_cross_start_sides_are
+            .sides_to_flow_relative(sides)
+    }
+}
+
+impl FlexContext<'_> {
+    #[inline]
+    fn sides_to_flow_relative<T>(&self, x: FlexRelativeSides<T>) -> LogicalSides<T> {
+        self.config.sides_to_flow_relative(x)
+    }
+
+    #[inline]
+    fn rect_to_flow_relative(
+        &self,
+        base_rect_size: FlexRelativeVec2<Au>,
+        rect: FlexRelativeRect<Au>,
+    ) -> LogicalRect<Au> {
+        super::geom::rect_to_flow_relative(
+            self.config.flex_axis,
+            self.config.main_start_cross_start_sides_are,
+            base_rect_size,
+            rect,
+        )
+    }
+}
+
+#[derive(Debug, Default)]
+struct DesiredFlexFractionAndGrowOrShrinkFactor {
+    desired_flex_fraction: f32,
+    flex_grow_or_shrink_factor: f32,
+}
+
+#[derive(Default)]
+struct FlexItemBoxInlineContentSizesInfo {
+    outer_flex_base_size: Au,
+    content_min_main_size: Au,
+    content_max_main_size: Option<Au>,
+    pbm_auto_is_zero: FlexRelativeVec2<Au>,
+    min_flex_factors: DesiredFlexFractionAndGrowOrShrinkFactor,
+    max_flex_factors: DesiredFlexFractionAndGrowOrShrinkFactor,
+    min_content_main_size_for_multiline_container: Au,
+    depends_on_block_constraints: bool,
+}
+
+impl ComputeInlineContentSizes for FlexContainer {
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(
+            name = "FlexContainer::compute_inline_content_sizes",
+            skip_all,
+            fields(servo_profiling = true),
+            level = "trace",
+        )
+    )]
+    fn compute_inline_content_sizes(
+        &self,
+        layout_context: &LayoutContext,
+        constraint_space: &ConstraintSpace,
+    ) -> InlineContentSizesResult {
+        match self.config.flex_axis {
+            FlexAxis::Row => {
+                self.main_content_sizes(layout_context, &constraint_space.into(), || {
+                    unreachable!(
+                        "Unexpected FlexContext query during row flex intrinsic size calculation."
+                    )
+                })
+            },
+            FlexAxis::Column => self.cross_content_sizes(layout_context, &constraint_space.into()),
+        }
+    }
+}
+
+impl FlexContainer {
+    fn cross_content_sizes(
+        &self,
+        layout_context: &LayoutContext,
+        containing_block_for_children: &IndefiniteContainingBlock,
+    ) -> InlineContentSizesResult {
+        // <https://drafts.csswg.org/css-flexbox/#intrinsic-cross-sizes>
+        assert_eq!(
+            self.config.flex_axis,
+            FlexAxis::Column,
+            "The cross axis should be the inline one"
+        );
+        let mut sizes = ContentSizes::zero();
+        let mut depends_on_block_constraints = false;
+        for kid in self.children.iter() {
+            let kid = &*kid.borrow();
+            match kid {
+                FlexLevelBox::FlexItem(item) => {
+                    // TODO: For the max-content size we should distribute items into
+                    // columns, and sum the column sizes and gaps.
+                    // TODO: Use the proper automatic minimum size.
+                    let ifc = &item.independent_formatting_context;
+                    let result = ifc.outer_inline_content_sizes(
+                        layout_context,
+                        containing_block_for_children,
+                        &LogicalVec2::zero(),
+                        false, /* auto_block_size_stretches_to_containing_block */
+                    );
+                    sizes.max_assign(result.sizes);
+                    depends_on_block_constraints |= result.depends_on_block_constraints;
+                },
+                FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(_) => {},
+            }
+        }
+        InlineContentSizesResult {
+            sizes,
+            depends_on_block_constraints,
+        }
+    }
+
+    fn main_content_sizes<'a>(
+        &self,
+        layout_context: &LayoutContext,
+        containing_block_for_children: &IndefiniteContainingBlock,
+        flex_context_getter: impl Fn() -> &'a FlexContext<'a>,
+    ) -> InlineContentSizesResult {
+        // - TODO: calculate intrinsic cross sizes when container is a column
+        // (and check for ‘writing-mode’?)
+        // - TODO: Collapsed flex items need to be skipped for intrinsic size calculation.
+
+        // <https://drafts.csswg.org/css-flexbox-1/#intrinsic-main-sizes>
+        // > It is calculated, considering only non-collapsed flex items, by:
+        // > 1. For each flex item, subtract its outer flex base size from its max-content
+        // > contribution size.
+        let mut chosen_max_flex_fraction = f32::NEG_INFINITY;
+        let mut chosen_min_flex_fraction = f32::NEG_INFINITY;
+        let mut sum_of_flex_grow_factors = 0.0;
+        let mut sum_of_flex_shrink_factors = 0.0;
+        let mut item_infos = vec![];
+
+        for kid in self.children.iter() {
+            let kid = &*kid.borrow();
+            match kid {
+                FlexLevelBox::FlexItem(item) => {
+                    sum_of_flex_grow_factors += item.style().get_position().flex_grow.0;
+                    sum_of_flex_shrink_factors += item.style().get_position().flex_shrink.0;
+
+                    let info = item.main_content_size_info(
+                        layout_context,
+                        containing_block_for_children,
+                        &self.config,
+                        &flex_context_getter,
+                    );
+
+                    // > 2. Place all flex items into lines of infinite length. Within
+                    // > each line, find the greatest (most positive) desired flex
+                    // > fraction among all the flex items. This is the line’s chosen flex
+                    // > fraction.
+                    chosen_max_flex_fraction =
+                        chosen_max_flex_fraction.max(info.max_flex_factors.desired_flex_fraction);
+                    chosen_min_flex_fraction =
+                        chosen_min_flex_fraction.max(info.min_flex_factors.desired_flex_fraction);
+
+                    item_infos.push(info)
+                },
+                FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(_) => {},
+            }
+        }
+
+        let normalize_flex_fraction = |chosen_flex_fraction| {
+            if chosen_flex_fraction > 0.0 && sum_of_flex_grow_factors < 1.0 {
+                // > 3. If the chosen flex fraction is positive, and the sum of the line’s
+                // > flex grow factors is less than 1, > divide the chosen flex fraction by that
+                // > sum.
+                chosen_flex_fraction / sum_of_flex_grow_factors
+            } else if chosen_flex_fraction < 0.0 && sum_of_flex_shrink_factors < 1.0 {
+                // > If the chosen flex fraction is negative, and the sum of the line’s flex
+                // > shrink factors is less than 1, > multiply the chosen flex fraction by that
+                // > sum.
+                chosen_flex_fraction * sum_of_flex_shrink_factors
+            } else {
+                chosen_flex_fraction
+            }
+        };
+
+        let chosen_min_flex_fraction = normalize_flex_fraction(chosen_min_flex_fraction);
+        let chosen_max_flex_fraction = normalize_flex_fraction(chosen_max_flex_fraction);
+
+        let main_gap = match self.config.flex_axis {
+            FlexAxis::Row => self.style.clone_column_gap(),
+            FlexAxis::Column => self.style.clone_row_gap(),
+        };
+        let main_gap = match main_gap {
+            LengthPercentageOrNormal::LengthPercentage(length_percentage) => {
+                length_percentage.to_used_value(Au::zero())
+            },
+            LengthPercentageOrNormal::Normal => Au::zero(),
+        };
+        let extra_space_from_main_gap = main_gap * (item_infos.len() as i32 - 1);
+        let mut container_max_content_size = extra_space_from_main_gap;
+        let mut container_min_content_size = if self.config.flex_wrap == FlexWrap::Nowrap {
+            extra_space_from_main_gap
+        } else {
+            Au::zero()
+        };
+        let mut container_depends_on_block_constraints = false;
+
+        for FlexItemBoxInlineContentSizesInfo {
+            outer_flex_base_size,
+            content_min_main_size,
+            content_max_main_size,
+            pbm_auto_is_zero,
+            min_flex_factors,
+            max_flex_factors,
+            min_content_main_size_for_multiline_container,
+            depends_on_block_constraints,
+        } in item_infos.iter()
+        {
+            // > 4. Add each item’s flex base size to the product of its flex grow factor (scaled flex shrink
+            // > factor, if shrinking) and the chosen flex fraction, then clamp that result by the max main size
+            // > floored by the min main size.
+            let outer_min_main_size = *content_min_main_size + pbm_auto_is_zero.main;
+            let outer_max_main_size = content_max_main_size.map(|v| v + pbm_auto_is_zero.main);
+
+            // > 5. The flex container’s max-content size is the largest sum (among all the lines) of the
+            // > afore-calculated sizes of all items within a single line.
+            container_max_content_size += (*outer_flex_base_size +
+                Au::from_f32_px(
+                    max_flex_factors.flex_grow_or_shrink_factor * chosen_max_flex_fraction,
+                ))
+            .clamp_between_extremums(outer_min_main_size, outer_max_main_size);
+
+            // > The min-content main size of a single-line flex container is calculated
+            // > identically to the max-content main size, except that the flex items’
+            // > min-content contributions are used instead of their max-content contributions.
+            //
+            // > However, for a multi-line container, the min-content main size is simply the
+            // > largest min-content contribution of all the non-collapsed flex items in the
+            // > flex container. For this purpose, each item’s contribution is capped by the
+            // > item’s flex base size if the item is not growable, floored by the item’s flex
+            // > base size if the item is not shrinkable, and then further clamped by the item’s
+            // > min and max main sizes.
+            if self.config.flex_wrap == FlexWrap::Nowrap {
+                container_min_content_size += (*outer_flex_base_size +
+                    Au::from_f32_px(
+                        min_flex_factors.flex_grow_or_shrink_factor * chosen_min_flex_fraction,
+                    ))
+                .clamp_between_extremums(outer_min_main_size, outer_max_main_size);
+            } else {
+                container_min_content_size
+                    .max_assign(*min_content_main_size_for_multiline_container);
+            }
+
+            container_depends_on_block_constraints |= depends_on_block_constraints;
+        }
+
+        InlineContentSizesResult {
+            sizes: ContentSizes {
+                min_content: container_min_content_size,
+                max_content: container_max_content_size,
+            },
+            depends_on_block_constraints: container_depends_on_block_constraints,
+        }
+    }
+
+    /// <https://drafts.csswg.org/css-flexbox/#layout-algorithm>
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(
+            name = "FlexContainer::layout",
+            skip_all,
+            fields(servo_profiling = true, self_address = self as *const _ as usize),
+            level = "trace",
+        )
+    )]
+    pub(crate) fn layout(
+        &self,
+        layout_context: &LayoutContext,
+        positioning_context: &mut PositioningContext,
+        containing_block: &ContainingBlock,
+        depends_on_block_constraints: bool,
+    ) -> CacheableLayoutResult {
+        let depends_on_block_constraints =
+            depends_on_block_constraints || self.config.flex_direction == FlexDirection::Column;
+
+        let mut flex_context = FlexContext {
+            config: self.config.clone(),
+            layout_context,
+            containing_block,
+            // https://drafts.csswg.org/css-flexbox/#definite-sizes
+            container_inner_size_constraint: self.config.flex_axis.vec2_to_flex_relative(
+                LogicalVec2 {
+                    inline: SizeConstraint::Definite(containing_block.size.inline),
+                    block: containing_block.size.block,
+                },
+            ),
+        };
+
+        // “Determine the main size of the flex container”
+        // https://drafts.csswg.org/css-flexbox/#algo-main-container
+        let container_main_size = match self.config.flex_axis {
+            FlexAxis::Row => containing_block.size.inline,
+            FlexAxis::Column => match containing_block.size.block {
+                SizeConstraint::Definite(size) => size,
+                SizeConstraint::MinMax(min, max) => self
+                    .main_content_sizes(layout_context, &containing_block.into(), || &flex_context)
+                    .sizes
+                    .max_content
+                    .clamp_between_extremums(min, max),
+            },
+        };
+
+        // Actual length may be less, but we guess that usually not by a lot
+        let mut flex_items = Vec::with_capacity(self.children.len());
+
+        // Absolutely-positioned children of the flex container may be interleaved
+        // with flex items. We need to preserve their relative order for correct painting order,
+        // which is the order of `Fragment`s in this function’s return value.
+        //
+        // Example:
+        // absolutely_positioned_items_with_original_order = [Some(item), Some(item), None, Some(item), None]
+        // flex_items                                      =                         [item,             item]
+        let absolutely_positioned_items_with_original_order = self
+            .children
+            .iter()
+            .map(|arcrefcell| {
+                let borrowed = arcrefcell.borrow();
+                match &*borrowed {
+                    FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(absolutely_positioned) => {
+                        FlexContent::AbsolutelyPositionedBox(absolutely_positioned.clone())
+                    },
+                    FlexLevelBox::FlexItem(_) => {
+                        let item = AtomicRef::map(borrowed, |child| match child {
+                            FlexLevelBox::FlexItem(item) => item,
+                            _ => unreachable!(),
+                        });
+                        flex_items.push(item);
+                        FlexContent::FlexItemPlaceholder
+                    },
+                }
+            })
+            .collect::<Vec<_>>();
+
+        let flex_item_boxes = flex_items.iter().map(|child| &**child);
+        let flex_items = flex_item_boxes
+            .map(|flex_item_box| FlexItem::new(&flex_context, flex_item_box))
+            .collect::<Vec<_>>();
+
+        let row_gap = self.style.clone_row_gap();
+        let column_gap = self.style.clone_column_gap();
+        let (cross_gap, main_gap) = match flex_context.config.flex_axis {
+            FlexAxis::Row => (row_gap, column_gap),
+            FlexAxis::Column => (column_gap, row_gap),
+        };
+        let cross_gap = match cross_gap {
+            LengthPercentageOrNormal::LengthPercentage(length_percent) => length_percent
+                .maybe_to_used_value(
+                    flex_context
+                        .container_inner_size_constraint
+                        .cross
+                        .to_definite(),
+                )
+                .unwrap_or_default(),
+            LengthPercentageOrNormal::Normal => Au::zero(),
+        };
+        let main_gap = match main_gap {
+            LengthPercentageOrNormal::LengthPercentage(length_percent) => length_percent
+                .maybe_to_used_value(
+                    flex_context
+                        .container_inner_size_constraint
+                        .main
+                        .to_definite(),
+                )
+                .unwrap_or_default(),
+            LengthPercentageOrNormal::Normal => Au::zero(),
+        };
+
+        // “Resolve the flexible lengths of all the flex items to find their *used main size*.”
+        // https://drafts.csswg.org/css-flexbox/#algo-flex
+        let initial_line_layouts = do_initial_flex_line_layout(
+            &mut flex_context,
+            container_main_size,
+            flex_items,
+            main_gap,
+        );
+
+        let line_count = initial_line_layouts.len();
+        let content_cross_size = initial_line_layouts
+            .iter()
+            .map(|layout| layout.line_size.cross)
+            .sum::<Au>() +
+            cross_gap * (line_count as i32 - 1);
+
+        // https://drafts.csswg.org/css-flexbox/#algo-cross-container
+        let container_cross_size = match flex_context.container_inner_size_constraint.cross {
+            SizeConstraint::Definite(cross_size) => cross_size,
+            SizeConstraint::MinMax(min, max) => {
+                content_cross_size.clamp_between_extremums(min, max)
+            },
+        };
+
+        let container_size = FlexRelativeVec2 {
+            main: container_main_size,
+            cross: container_cross_size,
+        };
+        let content_block_size = flex_context
+            .config
+            .flex_axis
+            .vec2_to_flow_relative(container_size)
+            .block;
+
+        let mut remaining_free_cross_space =
+            match flex_context.container_inner_size_constraint.cross {
+                SizeConstraint::Definite(cross_size) => cross_size - content_cross_size,
+                _ => Au::zero(),
+            };
+
+        // Implement fallback alignment.
+        //
+        // In addition to the spec at https://www.w3.org/TR/css-align-3/ this implementation follows
+        // the resolution of https://github.com/w3c/csswg-drafts/issues/10154
+        let num_lines = initial_line_layouts.len();
+        let resolved_align_content: AlignFlags = {
+            // Computed value from the style system
+            let align_content_style = flex_context.config.align_content.0.primary();
+            let mut is_safe = align_content_style.flags() == AlignFlags::SAFE;
+
+            // From https://drafts.csswg.org/css-align/#distribution-flex
+            // > `normal` behaves as `stretch`.
+            let mut resolved_align_content = match align_content_style.value() {
+                AlignFlags::NORMAL => AlignFlags::STRETCH,
+                align_content => align_content,
+            };
+
+            // From https://drafts.csswg.org/css-flexbox/#algo-line-align:
+            // > Some alignments can only be fulfilled in certain situations or are
+            // > limited in how much space they can consume; for example, space-between
+            // > can only operate when there is more than one alignment subject, and
+            // > baseline alignment, once fulfilled, might not be enough to absorb all
+            // > the excess space. In these cases a fallback alignment takes effect (as
+            // > defined below) to fully consume the excess space.
+            let fallback_is_needed = match resolved_align_content {
+                _ if remaining_free_cross_space <= Au::zero() => true,
+                AlignFlags::STRETCH => num_lines < 1,
+                AlignFlags::SPACE_BETWEEN | AlignFlags::SPACE_AROUND | AlignFlags::SPACE_EVENLY => {
+                    num_lines < 2
+                },
+                _ => false,
+            };
+
+            if fallback_is_needed {
+                (resolved_align_content, is_safe) = match resolved_align_content {
+                    AlignFlags::STRETCH => (AlignFlags::FLEX_START, true),
+                    AlignFlags::SPACE_BETWEEN => (AlignFlags::FLEX_START, true),
+                    AlignFlags::SPACE_AROUND => (AlignFlags::CENTER, true),
+                    AlignFlags::SPACE_EVENLY => (AlignFlags::CENTER, true),
+                    _ => (resolved_align_content, is_safe),
+                }
+            };
+
+            // 2. If free space is negative the "safe" alignment variants all fallback to Start alignment
+            if remaining_free_cross_space <= Au::zero() && is_safe {
+                resolved_align_content = AlignFlags::START;
+            }
+
+            resolved_align_content
+        };
+
+        // Implement "unsafe" alignment. "safe" alignment is handled by the fallback process above.
+        let flex_wrap_is_reversed = flex_context.config.flex_wrap_is_reversed;
+        let resolved_align_content = self
+            .config
+            .resolve_reversable_flex_alignment(resolved_align_content, flex_wrap_is_reversed);
+        let mut cross_start_position_cursor = match resolved_align_content {
+            AlignFlags::START if flex_wrap_is_reversed => remaining_free_cross_space,
+            AlignFlags::START => Au::zero(),
+            AlignFlags::END if flex_wrap_is_reversed => Au::zero(),
+            AlignFlags::END => remaining_free_cross_space,
+            AlignFlags::CENTER => remaining_free_cross_space / 2,
+            AlignFlags::STRETCH => Au::zero(),
+            AlignFlags::SPACE_BETWEEN => Au::zero(),
+            AlignFlags::SPACE_AROUND => remaining_free_cross_space / num_lines as i32 / 2,
+            AlignFlags::SPACE_EVENLY => remaining_free_cross_space / (num_lines as i32 + 1),
+
+            // TODO: Implement all alignments. Note: not all alignment values are valid for content distribution
+            _ => Au::zero(),
+        };
+
+        let inline_axis_is_main_axis = self.config.flex_axis == FlexAxis::Row;
+        let mut baseline_alignment_participating_baselines = Baselines::default();
+        let mut all_baselines = Baselines::default();
+        let flex_item_fragments: Vec<_> = initial_line_layouts
+            .into_iter()
+            .enumerate()
+            .flat_map(|(index, initial_line_layout)| {
+                // We call `allocate_free_cross_space_for_flex_line` for each line to avoid having
+                // leftover space when the number of lines doesn't evenly divide the total free space,
+                // considering the precision of app units.
+                let (space_to_add_to_line, space_to_add_after_line) =
+                    allocate_free_cross_space_for_flex_line(
+                        resolved_align_content,
+                        remaining_free_cross_space,
+                        (num_lines - index) as i32,
+                    );
+                remaining_free_cross_space -= space_to_add_to_line + space_to_add_after_line;
+
+                let final_line_cross_size =
+                    initial_line_layout.line_size.cross + space_to_add_to_line;
+                let mut final_line_layout = initial_line_layout.finish_with_final_cross_size(
+                    &mut flex_context,
+                    main_gap,
+                    final_line_cross_size,
+                );
+
+                let line_cross_start_position = cross_start_position_cursor;
+                cross_start_position_cursor = line_cross_start_position +
+                    final_line_cross_size +
+                    space_to_add_after_line +
+                    cross_gap;
+
+                let flow_relative_line_position =
+                    match (self.config.flex_axis, flex_wrap_is_reversed) {
+                        (FlexAxis::Row, false) => LogicalVec2 {
+                            block: line_cross_start_position,
+                            inline: Au::zero(),
+                        },
+                        (FlexAxis::Row, true) => LogicalVec2 {
+                            block: container_cross_size -
+                                line_cross_start_position -
+                                final_line_layout.cross_size,
+                            inline: Au::zero(),
+                        },
+                        (FlexAxis::Column, false) => LogicalVec2 {
+                            block: Au::zero(),
+                            inline: line_cross_start_position,
+                        },
+                        (FlexAxis::Column, true) => LogicalVec2 {
+                            block: Au::zero(),
+                            inline: container_cross_size -
+                                line_cross_start_position -
+                                final_line_cross_size,
+                        },
+                    };
+
+                if inline_axis_is_main_axis {
+                    let line_shared_alignment_baseline = final_line_layout
+                        .shared_alignment_baseline
+                        .map(|baseline| baseline + flow_relative_line_position.block);
+                    if index == 0 {
+                        baseline_alignment_participating_baselines.first =
+                            line_shared_alignment_baseline;
+                    }
+                    if index == num_lines - 1 {
+                        baseline_alignment_participating_baselines.last =
+                            line_shared_alignment_baseline;
+                    }
+                }
+
+                let line_all_baselines = final_line_layout
+                    .all_baselines
+                    .offset(flow_relative_line_position.block);
+                if index == 0 {
+                    all_baselines.first = line_all_baselines.first;
+                }
+                if index == num_lines - 1 {
+                    all_baselines.last = line_all_baselines.last;
+                }
+
+                let physical_line_position =
+                    flow_relative_line_position.to_physical_size(self.style.writing_mode);
+                for (fragment, _) in &mut final_line_layout.item_fragments {
+                    fragment.borrow_mut().content_rect.origin += physical_line_position;
+                }
+                final_line_layout.item_fragments
+            })
+            .collect();
+
+        let mut flex_item_fragments = flex_item_fragments.into_iter();
+        let fragments = absolutely_positioned_items_with_original_order
+            .into_iter()
+            .map(|child_as_abspos| match child_as_abspos {
+                FlexContent::AbsolutelyPositionedBox(absolutely_positioned_box) => self
+                    .create_absolutely_positioned_flex_child_fragment(
+                        absolutely_positioned_box,
+                        containing_block,
+                        container_size,
+                        positioning_context,
+                    ),
+                FlexContent::FlexItemPlaceholder => {
+                    // The `flex_item_fragments` iterator yields one fragment
+                    // per flex item, in the original order.
+                    let (fragment, mut child_positioning_context) =
+                        flex_item_fragments.next().unwrap();
+                    let fragment = Fragment::Box(fragment);
+                    child_positioning_context.adjust_static_position_of_hoisted_fragments(
+                        &fragment,
+                        PositioningContextLength::zero(),
+                    );
+                    positioning_context.append(child_positioning_context);
+                    fragment
+                },
+            })
+            .collect::<Vec<_>>();
+
+        // There should be no more flex items
+        assert!(flex_item_fragments.next().is_none());
+
+        let baselines = Baselines {
+            first: baseline_alignment_participating_baselines
+                .first
+                .or(all_baselines.first),
+            last: baseline_alignment_participating_baselines
+                .last
+                .or(all_baselines.last),
+        };
+
+        CacheableLayoutResult {
+            fragments,
+            content_block_size,
+            content_inline_size_for_table: None,
+            baselines,
+            depends_on_block_constraints,
+            specific_layout_info: None,
+            collapsible_margins_in_children: CollapsedBlockMargins::zero(),
+        }
+    }
+
+    /// Create a absolutely positioned flex child fragment, using the rules the
+    /// specification dictates. This should take into account the alignment and
+    /// justification values of the container and the child to position it within a
+    /// "inset-modified containing block," which may be either the "static-position
+    /// rectangle" that's calculated below or a modified version of the absolute's
+    /// containing block adjusted by the insets specified in the item's style.
+    ///
+    /// From <https://drafts.csswg.org/css-flexbox/#abspos-items>:
+    /// > The cross-axis edges of the static-position rectangle of an
+    /// > absolutely-positioned child of a flex container are the content edges of the
+    /// > flex container The main-axis edges of the static-position rectangle are where
+    /// > the margin edges of the child would be positioned if it were the sole flex item
+    /// > in the flex container, assuming both the child and the flex container were
+    /// > fixed-size boxes of their used size. (For this purpose, auto margins are
+    /// > treated as zero.)
+    fn create_absolutely_positioned_flex_child_fragment(
+        &self,
+        absolutely_positioned_box: ArcRefCell<AbsolutelyPositionedBox>,
+        containing_block: &ContainingBlock,
+        container_size: FlexRelativeVec2<Au>,
+        positioning_context: &mut PositioningContext,
+    ) -> Fragment {
+        let alignment = {
+            let fragment = absolutely_positioned_box.borrow();
+            let make_flex_only_values_directional_for_absolutes =
+                |value: AlignFlags, reversed: bool| match (value.value(), reversed) {
+                    (AlignFlags::NORMAL | AlignFlags::AUTO | AlignFlags::STRETCH, true) => {
+                        AlignFlags::END | AlignFlags::SAFE
+                    },
+                    (AlignFlags::STRETCH, false) => AlignFlags::START | AlignFlags::SAFE,
+                    (AlignFlags::SPACE_BETWEEN, false) => AlignFlags::START | AlignFlags::SAFE,
+                    (AlignFlags::SPACE_BETWEEN, true) => AlignFlags::END | AlignFlags::SAFE,
+                    _ => value,
+                };
+            let cross = make_flex_only_values_directional_for_absolutes(
+                self.config
+                    .resolve_align_self_for_child(fragment.context.style()),
+                self.config.flex_wrap_is_reversed,
+            );
+            let main = make_flex_only_values_directional_for_absolutes(
+                self.config.resolve_justify_content_for_child(),
+                self.config.flex_direction_is_reversed,
+            );
+
+            FlexRelativeVec2 { cross, main }
+        };
+        let logical_alignment = self.config.flex_axis.vec2_to_flow_relative(alignment);
+
+        let static_position_rect = LogicalRect {
+            start_corner: LogicalVec2::zero(),
+            size: self.config.flex_axis.vec2_to_flow_relative(container_size),
+        }
+        .as_physical(Some(containing_block));
+
+        let hoisted_box = AbsolutelyPositionedBox::to_hoisted(
+            absolutely_positioned_box,
+            static_position_rect,
+            logical_alignment,
+            self.config.writing_mode,
+        );
+        let hoisted_fragment = hoisted_box.fragment.clone();
+        positioning_context.push(hoisted_box);
+        Fragment::AbsoluteOrFixedPositioned(hoisted_fragment)
+    }
+
+    #[inline]
+    pub(crate) fn layout_style(&self) -> LayoutStyle {
+        LayoutStyle::Default(&self.style)
+    }
+}
+
+/// Align all flex lines per `align-content` according to
+/// <https://drafts.csswg.org/css-flexbox/#algo-line-align>. Returns the space to add to
+/// each line or the space to add after each line.
+fn allocate_free_cross_space_for_flex_line(
+    resolved_align_content: AlignFlags,
+    remaining_free_cross_space: Au,
+    remaining_line_count: i32,
+) -> (Au, Au) {
+    if remaining_free_cross_space.is_zero() {
+        return (Au::zero(), Au::zero());
+    }
+
+    match resolved_align_content {
+        AlignFlags::START => (Au::zero(), Au::zero()),
+        AlignFlags::FLEX_START => (Au::zero(), Au::zero()),
+        AlignFlags::END => (Au::zero(), Au::zero()),
+        AlignFlags::FLEX_END => (Au::zero(), Au::zero()),
+        AlignFlags::CENTER => (Au::zero(), Au::zero()),
+        AlignFlags::STRETCH => (
+            remaining_free_cross_space / remaining_line_count,
+            Au::zero(),
+        ),
+        AlignFlags::SPACE_BETWEEN => {
+            if remaining_line_count > 1 {
+                (
+                    Au::zero(),
+                    remaining_free_cross_space / (remaining_line_count - 1),
+                )
+            } else {
+                (Au::zero(), Au::zero())
+            }
+        },
+        AlignFlags::SPACE_AROUND => (
+            Au::zero(),
+            remaining_free_cross_space / remaining_line_count,
+        ),
+        AlignFlags::SPACE_EVENLY => (
+            Au::zero(),
+            remaining_free_cross_space / (remaining_line_count + 1),
+        ),
+
+        // TODO: Implement all alignments. Note: not all alignment values are valid for content distribution
+        _ => (Au::zero(), Au::zero()),
+    }
+}
+
+impl<'a> FlexItem<'a> {
+    fn new(flex_context: &FlexContext, box_: &'a FlexItemBox) -> Self {
+        let containing_block = IndefiniteContainingBlock::from(flex_context.containing_block);
+        let content_box_sizes_and_pbm = box_
+            .independent_formatting_context
+            .layout_style()
+            .content_box_sizes_and_padding_border_margin(&containing_block);
+        box_.to_flex_item(
+            flex_context.layout_context,
+            &containing_block,
+            &content_box_sizes_and_pbm,
+            &flex_context.config,
+            &|| flex_context,
+        )
+    }
+}
+
+fn cross_axis_is_item_block_axis(
+    container_is_horizontal: bool,
+    item_is_horizontal: bool,
+    flex_axis: FlexAxis,
+) -> bool {
+    let item_is_orthogonal = item_is_horizontal != container_is_horizontal;
+    let container_is_row = flex_axis == FlexAxis::Row;
+
+    container_is_row ^ item_is_orthogonal
+}
+
+/// Whether an item with a computed preferred cross size of `auto` will stretch
+/// to fill the cross size of its flex line.
+/// <https://drafts.csswg.org/css-flexbox/#stretched>
+fn item_with_auto_cross_size_stretches_to_line_size(
+    align_self: AlignItems,
+    margin: &FlexRelativeSides<AuOrAuto>,
+) -> bool {
+    align_self.0.value() == AlignFlags::STRETCH &&
+        !margin.cross_start.is_auto() &&
+        !margin.cross_end.is_auto()
+}
+
+/// “Collect flex items into flex lines”
+/// <https://drafts.csswg.org/css-flexbox/#algo-line-break>
+fn do_initial_flex_line_layout<'items>(
+    flex_context: &mut FlexContext,
+    container_main_size: Au,
+    mut items: Vec<FlexItem<'items>>,
+    main_gap: Au,
+) -> Vec<InitialFlexLineLayout<'items>> {
+    let construct_line = |(items, outer_hypothetical_main_size)| {
+        InitialFlexLineLayout::new(
+            flex_context,
+            items,
+            outer_hypothetical_main_size,
+            container_main_size,
+            main_gap,
+        )
+    };
+
+    if flex_context.config.container_is_single_line {
+        let outer_hypothetical_main_sizes_sum = items
+            .iter()
+            .map(|item| item.hypothetical_main_size + item.pbm_auto_is_zero.main)
+            .sum();
+        return vec![construct_line((items, outer_hypothetical_main_sizes_sum))];
+    }
+
+    let mut lines = Vec::new();
+    let mut line_size_so_far = Au::zero();
+    let mut line_so_far_is_empty = true;
+    let mut index = 0;
+
+    while let Some(item) = items.get(index) {
+        let item_size = item.hypothetical_main_size + item.pbm_auto_is_zero.main;
+        let mut line_size_would_be = line_size_so_far + item_size;
+        if !line_so_far_is_empty {
+            line_size_would_be += main_gap;
+        }
+        let item_fits = line_size_would_be <= container_main_size;
+        if item_fits || line_so_far_is_empty {
+            line_size_so_far = line_size_would_be;
+            line_so_far_is_empty = false;
+            index += 1;
+            continue;
+        }
+
+        // We found something that doesn’t fit. This line ends *before* this item.
+        let remaining = items.split_off(index);
+        lines.push((items, line_size_so_far));
+        items = remaining;
+
+        // The next line has this item.
+        line_size_so_far = item_size;
+        index = 1;
+    }
+
+    // We didn't reach the end of the last line, so add all remaining items there.
+    lines.push((items, line_size_so_far));
+
+    lines.par_drain(..).map(construct_line).collect()
+}
+
+/// The result of splitting the flex items into lines using their intrinsic sizes and doing an
+/// initial layout of each item. A final layout still needs to happen after this is produced to
+/// handle stretching.
+struct InitialFlexLineLayout<'a> {
+    /// The items that are placed in this line.
+    items: Vec<FlexLineItem<'a>>,
+
+    /// The initial size of this flex line, not taking into account `align-content: stretch`.
+    line_size: FlexRelativeVec2<Au>,
+
+    /// The free space available to this line after the initial layout.
+    free_space_in_main_axis: Au,
+}
+
+impl InitialFlexLineLayout<'_> {
+    fn new<'items>(
+        flex_context: &FlexContext,
+        items: Vec<FlexItem<'items>>,
+        outer_hypothetical_main_sizes_sum: Au,
+        container_main_size: Au,
+        main_gap: Au,
+    ) -> InitialFlexLineLayout<'items> {
+        let item_count = items.len();
+        let (item_used_main_sizes, free_space_in_main_axis) = Self::resolve_flexible_lengths(
+            &items,
+            outer_hypothetical_main_sizes_sum,
+            container_main_size - main_gap * (item_count as i32 - 1),
+        );
+
+        // https://drafts.csswg.org/css-flexbox/#algo-cross-item
+        let layout_results = items
+            .par_iter()
+            .zip(&item_used_main_sizes)
+            .map(|(item, used_main_size)| {
+                item.layout(*used_main_size, flex_context, None, None)
+                    .unwrap()
+            })
+            .collect::<Vec<_>>();
+
+        let items: Vec<_> = izip!(
+            items.into_iter(),
+            layout_results.into_iter(),
+            item_used_main_sizes.into_iter()
+        )
+        .map(|(item, layout_result, used_main_size)| FlexLineItem {
+            item,
+            layout_result,
+            used_main_size,
+        })
+        .collect();
+
+        // https://drafts.csswg.org/css-flexbox/#algo-cross-line
+        let line_cross_size = Self::cross_size(&items, flex_context);
+        let line_size = FlexRelativeVec2 {
+            main: container_main_size,
+            cross: line_cross_size,
+        };
+
+        InitialFlexLineLayout {
+            items,
+            line_size,
+            free_space_in_main_axis,
+        }
+    }
+
+    /// Return the *main size* of each item, and the line’s remainaing free space
+    /// <https://drafts.csswg.org/css-flexbox/#resolve-flexible-lengths>
+    fn resolve_flexible_lengths<'items>(
+        items: &'items [FlexItem<'items>],
+        outer_hypothetical_main_sizes_sum: Au,
+        container_main_size: Au,
+    ) -> (Vec<Au>, Au) {
+        struct FlexibleLengthResolutionItem<'items> {
+            item: &'items FlexItem<'items>,
+            frozen: Cell<bool>,
+            target_main_size: Cell<Au>,
+            flex_factor: f32,
+        }
+
+        // > 1. Determine the used flex factor. Sum the outer hypothetical main sizes of all
+        // > items on the line. If the sum is less than the flex container’s inner main
+        // > size, use the flex grow factor for the rest of this algorithm; otherwise, use
+        // > the flex shrink factor.
+        let grow = outer_hypothetical_main_sizes_sum < container_main_size;
+
+        let mut frozen_count = 0;
+        let items: Vec<_> = items
+            .iter()
+            .map(|item| {
+                // > 2. Each item in the flex line has a target main size, initially set to its
+                // > flex base size. Each item is initially unfrozen and may become frozen.
+                let target_main_size = Cell::new(item.flex_base_size);
+
+                // > 3. Size inflexible items. Freeze, setting its target main size to its hypothetical main size…
+                // > - any item that has a flex factor of zero
+                // > - if using the flex grow factor: any item that has a flex base size
+                // >   greater than its hypothetical main size
+                // > - if using the flex shrink factor: any item that has a flex base size
+                // >   smaller than its hypothetical main size
+                let flex_factor = if grow {
+                    item.box_.style().get_position().flex_grow.0
+                } else {
+                    item.box_.style().get_position().flex_shrink.0
+                };
+
+                let is_inflexible = flex_factor == 0. ||
+                    if grow {
+                        item.flex_base_size > item.hypothetical_main_size
+                    } else {
+                        item.flex_base_size < item.hypothetical_main_size
+                    };
+
+                let frozen = Cell::new(false);
+                if is_inflexible {
+                    frozen_count += 1;
+                    frozen.set(true);
+                    target_main_size.set(item.hypothetical_main_size);
+                }
+
+                FlexibleLengthResolutionItem {
+                    item,
+                    frozen,
+                    target_main_size,
+                    flex_factor,
+                }
+            })
+            .collect();
+
+        let unfrozen_items = || items.iter().filter(|item| !item.frozen.get());
+        let main_sizes = |items: Vec<FlexibleLengthResolutionItem>| {
+            items
+                .into_iter()
+                .map(|item| item.target_main_size.get())
+                .collect()
+        };
+
+        // https://drafts.csswg.org/css-flexbox/#initial-free-space
+        // > 4. Calculate initial free space. Sum the outer sizes of all items on the line, and
+        // > subtract this from the flex container’s inner main size. For frozen items, use
+        // > their outer target main size; for other items, use their outer flex base size.
+        let free_space = |all_items_frozen| {
+            let items_size = items
+                .iter()
+                .map(|item| {
+                    item.item.pbm_auto_is_zero.main +
+                        if all_items_frozen || item.frozen.get() {
+                            item.target_main_size.get()
+                        } else {
+                            item.item.flex_base_size
+                        }
+                })
+                .sum();
+            container_main_size - items_size
+        };
+
+        let initial_free_space = free_space(false);
+        loop {
+            // https://drafts.csswg.org/css-flexbox/#remaining-free-space
+            let mut remaining_free_space = free_space(false);
+            // > 5. a. Check for flexible items. If all the flex items on the line are
+            // >       frozen, free space has been distributed; exit this loop.
+            if frozen_count >= items.len() {
+                return (main_sizes(items), remaining_free_space);
+            }
+
+            // > 5. b. Calculate the remaining free space as for initial free space, above. If the
+            // > sum of the unfrozen flex items’ flex factors is less than one, multiply the
+            // > initial free space by this sum. If the magnitude of this value is less than
+            // > the magnitude of the remaining free space, use this as the remaining free
+            // > space.
+            let unfrozen_items_flex_factor_sum =
+                unfrozen_items().map(|item| item.flex_factor).sum();
+            if unfrozen_items_flex_factor_sum < 1. {
+                let multiplied = initial_free_space.scale_by(unfrozen_items_flex_factor_sum);
+                if multiplied.abs() < remaining_free_space.abs() {
+                    remaining_free_space = multiplied
+                }
+            }
+
+            // > 5. c. If the remaining free space is non-zero, distribute it proportional
+            // to the flex factors:
+            //
+            // FIXME: is it a problem if floating point precision errors accumulate
+            // and we get not-quite-zero remaining free space when we should get zero here?
+            if !remaining_free_space.is_zero() {
+                // > If using the flex grow factor:
+                // > For every unfrozen item on the line, find the ratio of the item’s flex grow factor to
+                // > the sum of the flex grow factors of all unfrozen items on the line. Set the item’s
+                // > target main size to its flex base size plus a fraction of the remaining free space
+                // > proportional to the ratio.
+                if grow {
+                    for item in unfrozen_items() {
+                        let ratio = item.flex_factor / unfrozen_items_flex_factor_sum;
+                        item.target_main_size
+                            .set(item.item.flex_base_size + remaining_free_space.scale_by(ratio));
+                    }
+                // > If using the flex shrink factor
+                // > For every unfrozen item on the line, multiply its flex shrink factor by its inner flex
+                // > base size, and note this as its scaled flex shrink factor. Find the ratio of the
+                // > item’s scaled flex shrink factor to the sum of the scaled flex shrink factors of all
+                // > unfrozen items on the line. Set the item’s target main size to its flex base size
+                // > minus a fraction of the absolute value of the remaining free space proportional to the
+                // > ratio. Note this may result in a negative inner main size; it will be corrected in the
+                // > next step.
+                } else {
+                    // https://drafts.csswg.org/css-flexbox/#scaled-flex-shrink-factor
+                    let scaled_shrink_factor = |item: &FlexibleLengthResolutionItem| {
+                        item.item.flex_base_size.scale_by(item.flex_factor)
+                    };
+                    let scaled_shrink_factors_sum: Au =
+                        unfrozen_items().map(scaled_shrink_factor).sum();
+                    if scaled_shrink_factors_sum > Au::zero() {
+                        for item in unfrozen_items() {
+                            let ratio = scaled_shrink_factor(item).0 as f32 /
+                                scaled_shrink_factors_sum.0 as f32;
+                            item.target_main_size.set(
+                                item.item.flex_base_size -
+                                    remaining_free_space.abs().scale_by(ratio),
+                            );
+                        }
+                    }
+                }
+            }
+
+            // > 5. d. Fix min/max violations. Clamp each non-frozen item’s target main size
+            // > by its used min and max main sizes and floor its content-box size at zero.
+            // > If the item’s target main size was made smaller by this, it’s a max
+            // > violation. If the item’s target main size was made larger by this, it’s a
+            // > min violation.
+            let violation = |item: &FlexibleLengthResolutionItem| {
+                let size = item.target_main_size.get();
+                let clamped = size.clamp_between_extremums(
+                    item.item.content_min_main_size,
+                    item.item.content_max_main_size,
+                );
+                clamped - size
+            };
+
+            // > 5. e. Freeze over-flexed items. The total violation is the sum of the
+            // > adjustments from the previous step ∑(clamped size - unclamped size). If the
+            // > total violation is:
+            // > - Zero:  Freeze all items.
+            // > - Positive: Freeze all the items with min violations.
+            // > - Negative:  Freeze all the items with max violations.
+            let total_violation: Au = unfrozen_items().map(violation).sum();
+            match total_violation.cmp(&Au::zero()) {
+                Ordering::Equal => {
+                    // “Freeze all items.”
+                    // Return instead, as that’s what the next loop iteration would do.
+                    let remaining_free_space = free_space(true);
+                    return (main_sizes(items), remaining_free_space);
+                },
+                Ordering::Greater => {
+                    // “Freeze all the items with min violations.”
+                    // “If the item’s target main size was made larger by [clamping],
+                    //  it’s a min violation.”
+                    for item in items.iter() {
+                        if violation(item) > Au::zero() {
+                            item.target_main_size.set(item.item.content_min_main_size);
+                            item.frozen.set(true);
+                            frozen_count += 1;
+                        }
+                    }
+                },
+                Ordering::Less => {
+                    // Negative total violation
+                    // “Freeze all the items with max violations.”
+                    // “If the item’s target main size was made smaller by [clamping],
+                    //  it’s a max violation.”
+                    for item in items.iter() {
+                        if violation(item) < Au::zero() {
+                            let Some(max_size) = item.item.content_max_main_size else {
+                                unreachable!()
+                            };
+                            item.target_main_size.set(max_size);
+                            item.frozen.set(true);
+                            frozen_count += 1;
+                        }
+                    }
+                },
+            }
+        }
+    }
+
+    /// <https://drafts.csswg.org/css-flexbox/#algo-cross-line>
+    fn cross_size<'items>(items: &'items [FlexLineItem<'items>], flex_context: &FlexContext) -> Au {
+        if flex_context.config.container_is_single_line {
+            if let SizeConstraint::Definite(size) =
+                flex_context.container_inner_size_constraint.cross
+            {
+                return size;
+            }
+        }
+
+        let mut max_ascent = Au::zero();
+        let mut max_descent = Au::zero();
+        let mut max_outer_hypothetical_cross_size = Au::zero();
+        for item in items.iter() {
+            // TODO: check inline-axis is parallel to main axis, check no auto cross margins
+            if matches!(
+                item.item.align_self.0.value(),
+                AlignFlags::BASELINE | AlignFlags::LAST_BASELINE
+            ) {
+                let baseline = item.get_or_synthesize_baseline_with_cross_size(
+                    item.layout_result.hypothetical_cross_size,
+                );
+                let hypothetical_margin_box_cross_size =
+                    item.layout_result.hypothetical_cross_size + item.item.pbm_auto_is_zero.cross;
+                max_ascent = max_ascent.max(baseline);
+                max_descent = max_descent.max(hypothetical_margin_box_cross_size - baseline);
+            } else {
+                max_outer_hypothetical_cross_size = max_outer_hypothetical_cross_size.max(
+                    item.layout_result.hypothetical_cross_size + item.item.pbm_auto_is_zero.cross,
+                );
+            }
+        }
+
+        // https://drafts.csswg.org/css-flexbox/#baseline-participation
+        let largest = max_outer_hypothetical_cross_size.max(max_ascent + max_descent);
+        match flex_context.container_inner_size_constraint.cross {
+            SizeConstraint::MinMax(min, max) if flex_context.config.container_is_single_line => {
+                largest.clamp_between_extremums(min, max)
+            },
+            _ => largest,
+        }
+    }
+
+    fn finish_with_final_cross_size(
+        mut self,
+        flex_context: &mut FlexContext,
+        main_gap: Au,
+        final_line_cross_size: Au,
+    ) -> FinalFlexLineLayout {
+        // FIXME: Collapse `visibility: collapse` items
+        // This involves “restart layout from the beginning” with a modified second round,
+        // which will make structuring the code… interesting.
+        // https://drafts.csswg.org/css-flexbox/#algo-visibility
+
+        // Distribute any remaining main free space to auto margins according to
+        // https://drafts.csswg.org/css-flexbox/#algo-main-align.
+        let auto_margins_count = self
+            .items
+            .iter()
+            .map(|item| {
+                item.item.margin.main_start.is_auto() as u32 +
+                    item.item.margin.main_end.is_auto() as u32
+            })
+            .sum::<u32>();
+        let (space_distributed_to_auto_main_margins, free_space_in_main_axis) =
+            if self.free_space_in_main_axis > Au::zero() && auto_margins_count > 0 {
+                (
+                    self.free_space_in_main_axis / auto_margins_count as i32,
+                    Au::zero(),
+                )
+            } else {
+                (Au::zero(), self.free_space_in_main_axis)
+            };
+
+        // Determine the used cross size of each flex item
+        // https://drafts.csswg.org/css-flexbox/#algo-stretch
+        let item_count = self.items.len();
+        let mut shared_alignment_baseline = None;
+        let mut item_used_cross_sizes = Vec::with_capacity(item_count);
+        let mut item_margins = Vec::with_capacity(item_count);
+        for item in self.items.iter_mut() {
+            let used_cross_size = if item.item.cross_size_stretches_to_line {
+                let (axis, content_size) = match flex_context.config.flex_axis {
+                    FlexAxis::Row => (Direction::Block, item.layout_result.content_size.block),
+                    FlexAxis::Column => (Direction::Inline, item.layout_result.content_size.inline),
+                };
+                item.item.content_cross_sizes.resolve(
+                    axis,
+                    Size::Stretch,
+                    Au::zero,
+                    Some(final_line_cross_size - item.item.pbm_auto_is_zero.cross),
+                    || content_size.into(),
+                    // Tables have a special sizing in the block axis in that handles collapsed rows,
+                    // but it would prevent stretching. So we only recognize tables in the inline axis.
+                    // The interaction of collapsed table tracks and the flexbox algorithms is unclear,
+                    // see https://github.com/w3c/csswg-drafts/issues/11408.
+                    item.item.is_table() && axis == Direction::Inline,
+                )
+            } else {
+                item.layout_result.hypothetical_cross_size
+            };
+            item_used_cross_sizes.push(used_cross_size);
+
+            // “If the flex item has `align-self: stretch`, redo layout for its contents,
+            // treating this used size as its definite cross size so that percentage-sized
+            // children can be resolved.”
+            if item.item.cross_size_stretches_to_line {
+                let new_layout = item.item.layout(
+                    item.used_main_size,
+                    flex_context,
+                    Some(used_cross_size),
+                    Some(&mut item.layout_result),
+                );
+                if let Some(layout) = new_layout {
+                    item.layout_result = layout;
+                }
+            }
+
+            let baseline = item.get_or_synthesize_baseline_with_cross_size(used_cross_size);
+            if matches!(
+                item.item.align_self.0.value(),
+                AlignFlags::BASELINE | AlignFlags::LAST_BASELINE
+            ) {
+                shared_alignment_baseline =
+                    Some(shared_alignment_baseline.unwrap_or(baseline).max(baseline));
+            }
+            item.layout_result.baseline_relative_to_margin_box = Some(baseline);
+
+            item_margins.push(item.item.resolve_auto_margins(
+                flex_context,
+                final_line_cross_size,
+                used_cross_size,
+                space_distributed_to_auto_main_margins,
+            ));
+        }
+
+        // Align the items along the main-axis per justify-content.
+        // Implement fallback alignment.
+        //
+        // In addition to the spec at https://www.w3.org/TR/css-align-3/ this implementation follows
+        // the resolution of https://github.com/w3c/csswg-drafts/issues/10154
+        let resolved_justify_content: AlignFlags = {
+            let justify_content_style = flex_context.config.justify_content.0.primary();
+
+            // Inital values from the style system
+            let mut resolved_justify_content = justify_content_style.value();
+            let mut is_safe = justify_content_style.flags() == AlignFlags::SAFE;
+
+            // Fallback occurs in two cases:
+
+            // 1. If there is only a single item being aligned and alignment is a distributed alignment keyword
+            //    https://www.w3.org/TR/css-align-3/#distribution-values
+            if item_count <= 1 || free_space_in_main_axis <= Au::zero() {
+                (resolved_justify_content, is_safe) = match resolved_justify_content {
+                    AlignFlags::STRETCH => (AlignFlags::FLEX_START, true),
+                    AlignFlags::SPACE_BETWEEN => (AlignFlags::FLEX_START, true),
+                    AlignFlags::SPACE_AROUND => (AlignFlags::CENTER, true),
+                    AlignFlags::SPACE_EVENLY => (AlignFlags::CENTER, true),
+                    _ => (resolved_justify_content, is_safe),
+                }
+            };
+
+            // 2. If free space is negative the "safe" alignment variants all fallback to Start alignment
+            if free_space_in_main_axis <= Au::zero() && is_safe {
+                resolved_justify_content = AlignFlags::START;
+            }
+
+            resolved_justify_content
+        };
+
+        // Implement "unsafe" alignment. "safe" alignment is handled by the fallback process above.
+        let main_start_position = match resolved_justify_content {
+            AlignFlags::START => Au::zero(),
+            AlignFlags::FLEX_START => {
+                if flex_context.config.flex_direction_is_reversed {
+                    free_space_in_main_axis
+                } else {
+                    Au::zero()
+                }
+            },
+            AlignFlags::END => free_space_in_main_axis,
+            AlignFlags::FLEX_END => {
+                if flex_context.config.flex_direction_is_reversed {
+                    Au::zero()
+                } else {
+                    free_space_in_main_axis
+                }
+            },
+            AlignFlags::CENTER => free_space_in_main_axis / 2,
+            AlignFlags::STRETCH => Au::zero(),
+            AlignFlags::SPACE_BETWEEN => Au::zero(),
+            AlignFlags::SPACE_AROUND => (free_space_in_main_axis / item_count as i32) / 2,
+            AlignFlags::SPACE_EVENLY => free_space_in_main_axis / (item_count + 1) as i32,
+
+            // TODO: Implement all alignments. Note: not all alignment values are valid for content distribution
+            _ => Au::zero(),
+        };
+
+        let item_main_interval = match resolved_justify_content {
+            AlignFlags::START => Au::zero(),
+            AlignFlags::FLEX_START => Au::zero(),
+            AlignFlags::END => Au::zero(),
+            AlignFlags::FLEX_END => Au::zero(),
+            AlignFlags::CENTER => Au::zero(),
+            AlignFlags::STRETCH => Au::zero(),
+            AlignFlags::SPACE_BETWEEN => free_space_in_main_axis / (item_count - 1) as i32,
+            AlignFlags::SPACE_AROUND => free_space_in_main_axis / item_count as i32,
+            AlignFlags::SPACE_EVENLY => free_space_in_main_axis / (item_count + 1) as i32,
+
+            // TODO: Implement all alignments. Note: not all alignment values are valid for content distribution
+            _ => Au::zero(),
+        };
+        let item_main_interval = item_main_interval + main_gap;
+
+        let mut all_baselines = Baselines::default();
+        let mut main_position_cursor = main_start_position;
+
+        let items = std::mem::take(&mut self.items);
+        let item_fragments = izip!(items, item_margins, item_used_cross_sizes.iter())
+            .map(|(item, item_margin, item_used_cross_size)| {
+                let item_used_size = FlexRelativeVec2 {
+                    main: item.used_main_size,
+                    cross: *item_used_cross_size,
+                };
+                item.collect_fragment(
+                    &self,
+                    item_used_size,
+                    item_margin,
+                    item_main_interval,
+                    final_line_cross_size,
+                    &shared_alignment_baseline,
+                    flex_context,
+                    &mut all_baselines,
+                    &mut main_position_cursor,
+                )
+            })
+            .collect();
+
+        FinalFlexLineLayout {
+            cross_size: final_line_cross_size,
+            item_fragments,
+            all_baselines,
+            shared_alignment_baseline,
+        }
+    }
+}
+
+impl FlexItem<'_> {
+    /// Return the hypothetical cross size together with laid out contents of the fragment.
+    /// From <https://drafts.csswg.org/css-flexbox/#algo-cross-item>:
+    /// > performing layout as if it were an in-flow block-level box with the used main
+    /// > size and the given available space, treating `auto` as `fit-content`.
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(
+            name = "FlexItem::layout",
+            skip_all,
+            fields(
+                servo_profiling = true,
+                self_address = self as *const _ as usize,
+                box_address = self.box_ as *const _ as usize,
+                for_stretch = non_stretch_layout_result.is_some(),
+            ),
+            level = "trace",
+        )
+    )]
+    #[allow(clippy::too_many_arguments)]
+    fn layout(
+        &self,
+        used_main_size: Au,
+        flex_context: &FlexContext,
+        used_cross_size_override: Option<Au>,
+        non_stretch_layout_result: Option<&mut FlexItemLayoutResult>,
+    ) -> Option<FlexItemLayoutResult> {
+        let containing_block = flex_context.containing_block;
+        let independent_formatting_context = &self.box_.independent_formatting_context;
+        let mut positioning_context = PositioningContext::default();
+        let item_writing_mode = independent_formatting_context.style().writing_mode;
+        let item_is_horizontal = item_writing_mode.is_horizontal();
+        let flex_axis = flex_context.config.flex_axis;
+        let cross_axis_is_item_block_axis = cross_axis_is_item_block_axis(
+            containing_block.style.writing_mode.is_horizontal(),
+            item_is_horizontal,
+            flex_axis,
+        );
+
+        let (inline_size, block_size) = if cross_axis_is_item_block_axis {
+            let cross_size = match used_cross_size_override {
+                Some(s) => SizeConstraint::Definite(s),
+                None => {
+                    // This means that an auto size with stretch alignment will behave different than
+                    // a stretch size. That's not what the spec says, but matches other browsers.
+                    // To be discussed in https://github.com/w3c/csswg-drafts/issues/11784.
+                    let stretch_size = containing_block
+                        .size
+                        .block
+                        .to_definite()
+                        .map(|size| Au::zero().max(size - self.pbm_auto_is_zero.cross));
+                    self.content_cross_sizes.resolve_extrinsic(
+                        Size::FitContent,
+                        Au::zero(),
+                        stretch_size,
+                    )
+                },
+            };
+            (used_main_size, cross_size)
+        } else {
+            let cross_size = used_cross_size_override.unwrap_or_else(|| {
+                let stretch_size =
+                    Au::zero().max(containing_block.size.inline - self.pbm_auto_is_zero.cross);
+                let get_content_size = || {
+                    let constraint_space = ConstraintSpace::new(
+                        SizeConstraint::Definite(used_main_size),
+                        item_writing_mode,
+                        self.preferred_aspect_ratio,
+                    );
+                    independent_formatting_context
+                        .inline_content_sizes(flex_context.layout_context, &constraint_space)
+                        .sizes
+                };
+                self.content_cross_sizes.resolve(
+                    Direction::Inline,
+                    Size::FitContent,
+                    Au::zero,
+                    Some(stretch_size),
+                    get_content_size,
+                    self.is_table(),
+                )
+            });
+            // The main size of a flex item is considered to be definite if its flex basis is definite
+            // or the flex container has a definite main size.
+            // <https://drafts.csswg.org/css-flexbox-1/#definite-sizes>
+            let main_size = if self.flex_base_size_is_definite ||
+                flex_context
+                    .container_inner_size_constraint
+                    .main
+                    .is_definite()
+            {
+                SizeConstraint::Definite(used_main_size)
+            } else {
+                SizeConstraint::default()
+            };
+            (cross_size, main_size)
+        };
+
+        let container_writing_mode = containing_block.style.writing_mode;
+        let item_style = independent_formatting_context.style();
+        match &independent_formatting_context.contents {
+            IndependentFormattingContextContents::Replaced(replaced) => {
+                let min_size = flex_axis.vec2_to_flow_relative(FlexRelativeVec2 {
+                    main: Size::Numeric(self.content_min_main_size),
+                    cross: self.content_cross_sizes.min,
+                });
+                let max_size = flex_axis.vec2_to_flow_relative(FlexRelativeVec2 {
+                    main: self
+                        .content_max_main_size
+                        .map_or(Size::Initial, Size::Numeric),
+                    cross: self.content_cross_sizes.max,
+                });
+                let size = replaced.used_size_as_if_inline_element_from_content_box_sizes(
+                    containing_block,
+                    item_style,
+                    self.preferred_aspect_ratio,
+                    LogicalVec2 {
+                        block: &Sizes::new(
+                            block_size
+                                .to_definite()
+                                .map_or(Size::Initial, Size::Numeric),
+                            min_size.block,
+                            max_size.block,
+                        ),
+                        inline: &Sizes::new(
+                            Size::Numeric(inline_size),
+                            min_size.inline,
+                            max_size.inline,
+                        ),
+                    },
+                    Size::FitContent.into(),
+                    flex_axis.vec2_to_flow_relative(self.pbm_auto_is_zero),
+                );
+
+                if let Some(non_stretch_layout_result) = non_stretch_layout_result {
+                    if non_stretch_layout_result
+                        .compatible_with_containing_block_size_and_content_size(
+                            containing_block,
+                            size,
+                        )
+                    {
+                        return None;
+                    }
+                }
+
+                let hypothetical_cross_size = flex_axis.vec2_to_flex_relative(size).cross;
+                let fragments = replaced.make_fragments(
+                    flex_context.layout_context,
+                    item_style,
+                    size.to_physical_size(container_writing_mode),
+                );
+
+                Some(FlexItemLayoutResult {
+                    hypothetical_cross_size,
+                    fragments,
+                    positioning_context,
+                    content_size: size,
+                    containing_block_inline_size: containing_block.size.inline,
+                    containing_block_block_size: containing_block.size.block,
+                    depends_on_block_constraints: false,
+                    has_child_which_depends_on_block_constraints: false,
+
+                    // We will need to synthesize the baseline, but since the used cross
+                    // size can differ from the hypothetical cross size, we should defer
+                    // synthesizing until needed.
+                    baseline_relative_to_margin_box: None,
+                    specific_layout_info: None,
+                })
+            },
+            IndependentFormattingContextContents::NonReplaced(non_replaced) => {
+                let item_as_containing_block = ContainingBlock {
+                    size: ContainingBlockSize {
+                        inline: inline_size,
+                        block: block_size,
+                    },
+                    style: item_style,
+                };
+
+                if let Some(non_stretch_layout_result) = non_stretch_layout_result {
+                    if non_stretch_layout_result
+                        .compatible_with_containing_block_size(&item_as_containing_block)
+                    {
+                        return None;
+                    }
+                }
+
+                let layout = non_replaced.layout(
+                    flex_context.layout_context,
+                    &mut positioning_context,
+                    &item_as_containing_block,
+                    containing_block,
+                    &independent_formatting_context.base,
+                    flex_axis == FlexAxis::Column ||
+                        self.cross_size_stretches_to_line ||
+                        self.depends_on_block_constraints,
+                );
+                let CacheableLayoutResult {
+                    fragments,
+                    content_block_size,
+                    baselines: content_box_baselines,
+                    depends_on_block_constraints,
+                    specific_layout_info,
+                    ..
+                } = layout;
+
+                let has_child_which_depends_on_block_constraints = fragments.iter().any(|fragment| {
+                        fragment.base().is_some_and(|base|
+                                base.flags.contains(
+                                    FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM))
+                });
+
+                let hypothetical_cross_size = if cross_axis_is_item_block_axis {
+                    // This means that an auto size with stretch alignment will behave different than
+                    // a stretch size. That's not what the spec says, but matches other browsers.
+                    // To be discussed in https://github.com/w3c/csswg-drafts/issues/11784.
+                    let stretch_size = containing_block
+                        .size
+                        .block
+                        .to_definite()
+                        .map(|size| Au::zero().max(size - self.pbm_auto_is_zero.cross));
+                    self.content_cross_sizes.resolve(
+                        Direction::Block,
+                        Size::FitContent,
+                        Au::zero,
+                        stretch_size,
+                        || content_block_size.into(),
+                        self.is_table(),
+                    )
+                } else {
+                    inline_size
+                };
+
+                let item_writing_mode_is_orthogonal_to_container_writing_mode =
+                    flex_context.config.writing_mode.is_horizontal() !=
+                        item_style.writing_mode.is_horizontal();
+                let has_compatible_baseline = match flex_axis {
+                    FlexAxis::Row => !item_writing_mode_is_orthogonal_to_container_writing_mode,
+                    FlexAxis::Column => item_writing_mode_is_orthogonal_to_container_writing_mode,
+                };
+
+                let baselines_relative_to_margin_box = if has_compatible_baseline {
+                    content_box_baselines.offset(
+                        self.margin.cross_start.auto_is(Au::zero) +
+                            self.padding.cross_start +
+                            self.border.cross_start,
+                    )
+                } else {
+                    Baselines::default()
+                };
+
+                let baseline_relative_to_margin_box = match self.align_self.0.value() {
+                    // ‘baseline’ computes to ‘first baseline’.
+                    AlignFlags::BASELINE => baselines_relative_to_margin_box.first,
+                    AlignFlags::LAST_BASELINE => baselines_relative_to_margin_box.last,
+                    _ => None,
+                };
+
+                Some(FlexItemLayoutResult {
+                    hypothetical_cross_size,
+                    fragments,
+                    positioning_context,
+                    baseline_relative_to_margin_box,
+                    content_size: LogicalVec2 {
+                        inline: item_as_containing_block.size.inline,
+                        block: content_block_size,
+                    },
+                    containing_block_inline_size: item_as_containing_block.size.inline,
+                    containing_block_block_size: item_as_containing_block.size.block,
+                    depends_on_block_constraints,
+                    has_child_which_depends_on_block_constraints,
+                    specific_layout_info,
+                })
+            },
+        }
+    }
+
+    fn synthesized_baseline_relative_to_margin_box(&self, content_size: Au) -> Au {
+        // If the item does not have a baseline in the necessary axis,
+        // then one is synthesized from the flex item’s border box.
+        // https://drafts.csswg.org/css-flexbox/#valdef-align-items-baseline
+        content_size +
+            self.margin.cross_start.auto_is(Au::zero) +
+            self.padding.cross_start +
+            self.border.cross_start +
+            self.border.cross_end +
+            self.padding.cross_end
+    }
+
+    /// Return the cross-start, cross-end, main-start, and main-end margins, with `auto` values resolved.
+    /// See:
+    ///
+    /// - <https://drafts.csswg.org/css-flexbox/#algo-cross-margins>
+    /// - <https://drafts.csswg.org/css-flexbox/#algo-main-align>
+    fn resolve_auto_margins(
+        &self,
+        flex_context: &FlexContext,
+        line_cross_size: Au,
+        item_cross_content_size: Au,
+        space_distributed_to_auto_main_margins: Au,
+    ) -> FlexRelativeSides<Au> {
+        let main_start = self
+            .margin
+            .main_start
+            .auto_is(|| space_distributed_to_auto_main_margins);
+        let main_end = self
+            .margin
+            .main_end
+            .auto_is(|| space_distributed_to_auto_main_margins);
+
+        let auto_count = match (self.margin.cross_start, self.margin.cross_end) {
+            (AuOrAuto::LengthPercentage(cross_start), AuOrAuto::LengthPercentage(cross_end)) => {
+                return FlexRelativeSides {
+                    cross_start,
+                    cross_end,
+                    main_start,
+                    main_end,
+                };
+            },
+            (AuOrAuto::Auto, AuOrAuto::Auto) => 2,
+            _ => 1,
+        };
+        let outer_cross_size = self.pbm_auto_is_zero.cross + item_cross_content_size;
+        let available = line_cross_size - outer_cross_size;
+        let cross_start;
+        let cross_end;
+        if available > Au::zero() {
+            let each_auto_margin = available / auto_count;
+            cross_start = self.margin.cross_start.auto_is(|| each_auto_margin);
+            cross_end = self.margin.cross_end.auto_is(|| each_auto_margin);
+        } else {
+            // “the block-start or inline-start margin (whichever is in the cross axis)”
+            // This margin is the cross-end on iff `flex-wrap` is `wrap-reverse`,
+            // cross-start otherwise.
+            // We know this because:
+            // https://drafts.csswg.org/css-flexbox/#flex-wrap-property
+            // “For the values that are not wrap-reverse,
+            //  the cross-start direction is equivalent to
+            //  either the inline-start or block-start direction of the current writing mode
+            //  (whichever is in the cross axis)
+            //  and the cross-end direction is the opposite direction of cross-start.
+            //  When flex-wrap is wrap-reverse,
+            //  the cross-start and cross-end directions are swapped.”
+            let flex_wrap = flex_context.containing_block.style.get_position().flex_wrap;
+            let flex_wrap_reverse = match flex_wrap {
+                FlexWrap::Nowrap | FlexWrap::Wrap => false,
+                FlexWrap::WrapReverse => true,
+            };
+            // “if the block-start or inline-start margin (whichever is in the cross axis) is auto,
+            //  set it to zero. Set the opposite margin so that the outer cross size of the item
+            //  equals the cross size of its flex line.”
+            if flex_wrap_reverse {
+                cross_start = self.margin.cross_start.auto_is(|| available);
+                cross_end = self.margin.cross_end.auto_is(Au::zero);
+            } else {
+                cross_start = self.margin.cross_start.auto_is(Au::zero);
+                cross_end = self.margin.cross_end.auto_is(|| available);
+            }
+        }
+
+        FlexRelativeSides {
+            cross_start,
+            cross_end,
+            main_start,
+            main_end,
+        }
+    }
+
+    /// Return the coordinate of the cross-start side of the content area
+    fn align_along_cross_axis(
+        &self,
+        margin: &FlexRelativeSides<Au>,
+        used_cross_size: &Au,
+        line_cross_size: Au,
+        propagated_baseline: Au,
+        max_propagated_baseline: Au,
+        wrap_reverse: bool,
+    ) -> Au {
+        let ending_alignment = line_cross_size - *used_cross_size - self.pbm_auto_is_zero.cross;
+        let outer_cross_start =
+            if self.margin.cross_start.is_auto() || self.margin.cross_end.is_auto() {
+                Au::zero()
+            } else {
+                match self.align_self.0.value() {
+                    AlignFlags::STRETCH => Au::zero(),
+                    AlignFlags::CENTER => ending_alignment / 2,
+                    AlignFlags::BASELINE | AlignFlags::LAST_BASELINE => {
+                        max_propagated_baseline - propagated_baseline
+                    },
+                    AlignFlags::START => {
+                        if !wrap_reverse {
+                            Au::zero()
+                        } else {
+                            ending_alignment
+                        }
+                    },
+                    AlignFlags::END => {
+                        if !wrap_reverse {
+                            ending_alignment
+                        } else {
+                            Au::zero()
+                        }
+                    },
+                    _ => Au::zero(),
+                }
+            };
+        outer_cross_start + margin.cross_start + self.border.cross_start + self.padding.cross_start
+    }
+
+    #[inline]
+    fn is_table(&self) -> bool {
+        self.box_.is_table()
+    }
+}
+
+impl FlexItemBox {
+    fn to_flex_item<'a>(
+        &self,
+        layout_context: &LayoutContext,
+        containing_block: &IndefiniteContainingBlock,
+        content_box_sizes_and_pbm: &ContentBoxSizesAndPBM,
+        config: &FlexContainerConfig,
+        flex_context_getter: &impl Fn() -> &'a FlexContext<'a>,
+    ) -> FlexItem {
+        let flex_axis = config.flex_axis;
+        let style = self.style();
+        let cross_axis_is_item_block_axis = cross_axis_is_item_block_axis(
+            containing_block.writing_mode.is_horizontal(),
+            style.writing_mode.is_horizontal(),
+            flex_axis,
+        );
+        let main_axis = if cross_axis_is_item_block_axis {
+            Direction::Inline
+        } else {
+            Direction::Block
+        };
+        let align_self = AlignItems(config.resolve_align_self_for_child(style));
+
+        let ContentBoxSizesAndPBM {
+            content_box_sizes,
+            pbm,
+            depends_on_block_constraints,
+            preferred_size_computes_to_auto,
+        } = content_box_sizes_and_pbm;
+
+        let preferred_aspect_ratio = self
+            .independent_formatting_context
+            .preferred_aspect_ratio(&pbm.padding_border_sums);
+        let padding = config.sides_to_flex_relative(pbm.padding);
+        let border = config.sides_to_flex_relative(pbm.border);
+        let margin = config.sides_to_flex_relative(pbm.margin);
+        let padding_border = padding.sum_by_axis() + border.sum_by_axis();
+        let margin_auto_is_zero = config.sides_to_flex_relative(pbm.margin.auto_is(Au::zero));
+        let pbm_auto_is_zero = FlexRelativeVec2 {
+            main: padding_border.main,
+            cross: padding_border.cross,
+        } + margin_auto_is_zero.sum_by_axis();
+        let (content_main_sizes, mut content_cross_sizes, cross_size_computes_to_auto) =
+            match flex_axis {
+                FlexAxis::Row => (
+                    &content_box_sizes.inline,
+                    content_box_sizes.block.clone(),
+                    preferred_size_computes_to_auto.block,
+                ),
+                FlexAxis::Column => (
+                    &content_box_sizes.block,
+                    content_box_sizes.inline.clone(),
+                    preferred_size_computes_to_auto.inline,
+                ),
+            };
+        let cross_size_stretches_to_line = cross_size_computes_to_auto &&
+            item_with_auto_cross_size_stretches_to_line_size(align_self, &margin);
+        if cross_size_stretches_to_line && config.container_is_single_line {
+            // <https://drafts.csswg.org/css-flexbox-1/#definite-sizes>
+            // > If a single-line flex container has a definite cross size, the automatic preferred
+            // > outer cross size of any stretched flex items is the flex container’s inner cross size.
+            // Therefore, set it to `stretch`, which has the desired behavior.
+            content_cross_sizes.preferred = Size::Stretch;
+        }
+        let containing_block_size = flex_axis.vec2_to_flex_relative(containing_block.size);
+        let stretch_size = FlexRelativeVec2 {
+            main: containing_block_size
+                .main
+                .map(|v| Au::zero().max(v - pbm_auto_is_zero.main)),
+            cross: containing_block_size
+                .cross
+                .map(|v| Au::zero().max(v - pbm_auto_is_zero.cross)),
+        };
+
+        // <https://drafts.csswg.org/css-flexbox/#definite-sizes>
+        // > If a single-line flex container has a definite cross size, the automatic preferred
+        // > outer cross size of any stretched flex items is the flex container’s inner cross size
+        // > (clamped to the flex item’s min and max cross size) and is considered definite.
+        let (preferred_cross_size, min_cross_size, max_cross_size) = content_cross_sizes
+            .resolve_each_extrinsic(Size::FitContent, Au::zero(), stretch_size.cross);
+        let cross_size = SizeConstraint::new(preferred_cross_size, min_cross_size, max_cross_size);
+
+        // <https://drafts.csswg.org/css-flexbox/#transferred-size-suggestion>
+        // > If the item has a preferred aspect ratio and its preferred cross size is definite, then the
+        // > transferred size suggestion is that size (clamped by its minimum and maximum cross sizes if they
+        // > are definite), converted through the aspect ratio. It is otherwise undefined.
+        let transferred_size_suggestion =
+            LazyCell::new(|| match (preferred_aspect_ratio, cross_size) {
+                (Some(ratio), SizeConstraint::Definite(cross_size)) => {
+                    Some(ratio.compute_dependent_size(main_axis, cross_size))
+                },
+                _ => None,
+            });
+
+        // <https://drafts.csswg.org/css-flexbox/#algo-main-item>
+        let flex_base_size_is_definite = Cell::new(true);
+        let main_content_sizes = LazyCell::new(|| {
+            let flex_item = &self.independent_formatting_context;
+            // > B: If the flex item has ...
+            // >   - a preferred aspect ratio,
+            // >   - a used flex basis of content, and
+            // >   - a definite cross size,
+            // > then the flex base size is calculated from its used cross size and the flex item’s aspect ratio.
+            if let Some(transferred_size_suggestion) = *transferred_size_suggestion {
+                return transferred_size_suggestion.into();
+            }
+
+            flex_base_size_is_definite.set(false);
+
+            // FIXME: implement cases C, D.
+
+            // > E. Otherwise, size the item into the available space using its used flex basis in place of
+            // > its main size, treating a value of content as max-content. If a cross size is needed to
+            // > determine the main size (e.g. when the flex item’s main size is in its block axis, or when
+            // > it has a preferred aspect ratio) and the flex item’s cross size is auto and not definite,
+            // > in this calculation use fit-content as the flex item’s cross size. The flex base size is
+            // > the item’s resulting main size.
+            if cross_axis_is_item_block_axis {
+                // The main axis is the inline axis, so we can get the content size from the normal
+                // preferred widths calculation.
+                let constraint_space =
+                    ConstraintSpace::new(cross_size, style.writing_mode, preferred_aspect_ratio);
+                let content_sizes = flex_item
+                    .inline_content_sizes(layout_context, &constraint_space)
+                    .sizes;
+                if let Some(ratio) = preferred_aspect_ratio {
+                    let transferred_min = ratio.compute_dependent_size(main_axis, min_cross_size);
+                    let transferred_max =
+                        max_cross_size.map(|v| ratio.compute_dependent_size(main_axis, v));
+                    content_sizes
+                        .map(|size| size.clamp_between_extremums(transferred_min, transferred_max))
+                } else {
+                    content_sizes
+                }
+            } else {
+                self.layout_for_block_content_size(
+                    flex_context_getter(),
+                    &pbm_auto_is_zero,
+                    content_box_sizes,
+                    preferred_aspect_ratio,
+                    content_cross_sizes.preferred == Size::Stretch,
+                    IntrinsicSizingMode::Size,
+                )
+                .into()
+            }
+        });
+
+        let flex_base_size = self
+            .flex_basis(
+                containing_block_size.main,
+                content_main_sizes.preferred,
+                padding_border.main,
+            )
+            .resolve_for_preferred(Size::MaxContent, stretch_size.main, &main_content_sizes);
+        let flex_base_size_is_definite = flex_base_size_is_definite.take();
+
+        let content_max_main_size = content_main_sizes
+            .max
+            .resolve_for_max(stretch_size.main, &main_content_sizes);
+
+        let get_automatic_minimum_size = || {
+            // This is an implementation of <https://drafts.csswg.org/css-flexbox/#min-size-auto>.
+            if style.establishes_scroll_container(self.base_fragment_info().flags) {
+                return Au::zero();
+            }
+
+            // > **specified size suggestion**
+            // > If the item’s preferred main size is definite and not automatic, then the specified
+            // > size suggestion is that size. It is otherwise undefined.
+            let specified_size_suggestion = content_main_sizes
+                .preferred
+                .maybe_resolve_extrinsic(stretch_size.main);
+
+            let is_replaced = self.independent_formatting_context.is_replaced();
+
+            // > **content size suggestion**
+            // > The content size suggestion is the min-content size in the main axis, clamped, if it has a
+            // > preferred aspect ratio, by any definite minimum and maximum cross sizes converted through the
+            // > aspect ratio.
+            let content_size_suggestion = match preferred_aspect_ratio {
+                Some(ratio) => main_content_sizes.min_content.clamp_between_extremums(
+                    ratio.compute_dependent_size(main_axis, min_cross_size),
+                    max_cross_size.map(|l| ratio.compute_dependent_size(main_axis, l)),
+                ),
+                None => main_content_sizes.min_content,
+            };
+
+            // > The content-based minimum size of a flex item is the smaller of its specified size
+            // > suggestion and its content size suggestion if its specified size suggestion exists;
+            // > otherwise, the smaller of its transferred size suggestion and its content size
+            // > suggestion if the element is replaced and its transferred size suggestion exists;
+            // > otherwise its content size suggestion. In all cases, the size is clamped by the maximum
+            // > main size if it’s definite.
+            match (specified_size_suggestion, *transferred_size_suggestion) {
+                (Some(specified), _) => specified.min(content_size_suggestion),
+                (_, Some(transferred)) if is_replaced => transferred.min(content_size_suggestion),
+                _ => content_size_suggestion,
+            }
+            .clamp_below_max(content_max_main_size)
+        };
+        let content_min_main_size = content_main_sizes.min.resolve_for_min(
+            get_automatic_minimum_size,
+            stretch_size.main,
+            &main_content_sizes,
+            self.is_table(),
+        );
+
+        FlexItem {
+            box_: self,
+            content_cross_sizes,
+            padding,
+            border,
+            margin: config.sides_to_flex_relative(pbm.margin),
+            pbm_auto_is_zero,
+            flex_base_size,
+            flex_base_size_is_definite,
+            hypothetical_main_size: flex_base_size
+                .clamp_between_extremums(content_min_main_size, content_max_main_size),
+            content_min_main_size,
+            content_max_main_size,
+            align_self,
+            depends_on_block_constraints: *depends_on_block_constraints,
+            preferred_aspect_ratio,
+            cross_size_stretches_to_line,
+        }
+    }
+
+    fn main_content_size_info<'a>(
+        &self,
+        layout_context: &LayoutContext,
+        containing_block: &IndefiniteContainingBlock,
+        config: &FlexContainerConfig,
+        flex_context_getter: &impl Fn() -> &'a FlexContext<'a>,
+    ) -> FlexItemBoxInlineContentSizesInfo {
+        let content_box_sizes_and_pbm = self
+            .independent_formatting_context
+            .layout_style()
+            .content_box_sizes_and_padding_border_margin(containing_block);
+
+        // TODO: when laying out a column container with an indefinite main size,
+        // we compute the base sizes of the items twice. We should consider caching.
+        let FlexItem {
+            content_cross_sizes,
+            flex_base_size,
+            content_min_main_size,
+            content_max_main_size,
+            pbm_auto_is_zero,
+            preferred_aspect_ratio,
+            ..
+        } = self.to_flex_item(
+            layout_context,
+            containing_block,
+            &content_box_sizes_and_pbm,
+            config,
+            flex_context_getter,
+        );
+
+        // Compute the min-content and max-content contributions of the item.
+        // <https://drafts.csswg.org/css-flexbox/#intrinsic-item-contributions>
+        let (content_contribution_sizes, depends_on_block_constraints) = match config.flex_axis {
+            FlexAxis::Row => {
+                let auto_minimum = LogicalVec2 {
+                    inline: content_min_main_size,
+                    block: Au::zero(),
+                };
+                let InlineContentSizesResult {
+                    sizes,
+                    depends_on_block_constraints,
+                } = self
+                    .independent_formatting_context
+                    .outer_inline_content_sizes(
+                        layout_context,
+                        containing_block,
+                        &auto_minimum,
+                        content_cross_sizes.preferred == Size::Stretch,
+                    );
+                (sizes, depends_on_block_constraints)
+            },
+            FlexAxis::Column => {
+                let size = self.layout_for_block_content_size(
+                    flex_context_getter(),
+                    &pbm_auto_is_zero,
+                    &content_box_sizes_and_pbm.content_box_sizes,
+                    preferred_aspect_ratio,
+                    content_cross_sizes.preferred == Size::Stretch,
+                    IntrinsicSizingMode::Contribution,
+                );
+                (size.into(), true)
+            },
+        };
+
+        let outer_flex_base_size = flex_base_size + pbm_auto_is_zero.main;
+        let max_flex_factors = self.desired_flex_factors_for_preferred_width(
+            content_contribution_sizes.max_content,
+            flex_base_size,
+            outer_flex_base_size,
+        );
+
+        // > The min-content main size of a single-line flex container is calculated
+        // > identically to the max-content main size, except that the flex items’
+        // > min-content contributions are used instead of their max-content contributions.
+        let min_flex_factors = self.desired_flex_factors_for_preferred_width(
+            content_contribution_sizes.min_content,
+            flex_base_size,
+            outer_flex_base_size,
+        );
+
+        // > However, for a multi-line container, the min-content main size is simply the
+        // > largest min-content contribution of all the non-collapsed flex items in the
+        // > flex container. For this purpose, each item’s contribution is capped by the
+        // > item’s flex base size if the item is not growable, floored by the item’s flex
+        // > base size if the item is not shrinkable, and then further clamped by the item’s
+        // > min and max main sizes.
+        let mut min_content_main_size_for_multiline_container =
+            content_contribution_sizes.min_content;
+        let style_position = &self.style().get_position();
+        if style_position.flex_grow.is_zero() {
+            min_content_main_size_for_multiline_container.min_assign(flex_base_size);
+        }
+        if style_position.flex_shrink.is_zero() {
+            min_content_main_size_for_multiline_container.max_assign(flex_base_size);
+        }
+        min_content_main_size_for_multiline_container =
+            min_content_main_size_for_multiline_container
+                .clamp_between_extremums(content_min_main_size, content_max_main_size);
+
+        FlexItemBoxInlineContentSizesInfo {
+            outer_flex_base_size,
+            content_min_main_size,
+            content_max_main_size,
+            pbm_auto_is_zero,
+            min_flex_factors,
+            max_flex_factors,
+            min_content_main_size_for_multiline_container,
+            depends_on_block_constraints,
+        }
+    }
+
+    fn desired_flex_factors_for_preferred_width(
+        &self,
+        preferred_width: Au,
+        flex_base_size: Au,
+        outer_flex_base_size: Au,
+    ) -> DesiredFlexFractionAndGrowOrShrinkFactor {
+        let difference = (preferred_width - outer_flex_base_size).to_f32_px();
+        let (flex_grow_or_scaled_flex_shrink_factor, desired_flex_fraction) = if difference > 0.0 {
+            // > If that result is positive, divide it by the item’s flex
+            // > grow factor if the flex grow > factor is ≥ 1, or multiply
+            // > it by the flex grow factor if the flex grow factor is < 1;
+            let flex_grow_factor = self.style().get_position().flex_grow.0;
+
+            (
+                flex_grow_factor,
+                if flex_grow_factor >= 1.0 {
+                    difference / flex_grow_factor
+                } else {
+                    difference * flex_grow_factor
+                },
+            )
+        } else if difference < 0.0 {
+            // > if the result is negative, divide it by the item’s scaled
+            // > flex shrink factor (if dividing > by zero, treat the result
+            // > as negative infinity).
+            let flex_shrink_factor = self.style().get_position().flex_shrink.0;
+            let scaled_flex_shrink_factor = flex_shrink_factor * flex_base_size.to_f32_px();
+
+            (
+                scaled_flex_shrink_factor,
+                if scaled_flex_shrink_factor != 0.0 {
+                    difference / scaled_flex_shrink_factor
+                } else {
+                    f32::NEG_INFINITY
+                },
+            )
+        } else {
+            (0.0, 0.0)
+        };
+
+        DesiredFlexFractionAndGrowOrShrinkFactor {
+            desired_flex_fraction,
+            flex_grow_or_shrink_factor: flex_grow_or_scaled_flex_shrink_factor,
+        }
+    }
+
+    /// <https://drafts.csswg.org/css-flexbox-1/#flex-basis-property>
+    /// Returns the used value of the `flex-basis` property, after resolving percentages,
+    /// resolving `auto`, and taking `box-sizing` into account.
+    /// Note that a return value of `Size::Initial` represents `flex-basis: content`,
+    /// not `flex-basis: auto`, since the latter always resolves to something else.
+    fn flex_basis(
+        &self,
+        container_definite_main_size: Option<Au>,
+        main_preferred_size: Size<Au>,
+        main_padding_border_sum: Au,
+    ) -> Size<Au> {
+        let style_position = &self.independent_formatting_context.style().get_position();
+        match &style_position.flex_basis {
+            // https://drafts.csswg.org/css-flexbox-1/#valdef-flex-basis-content
+            // > Indicates an automatic size based on the flex item’s content.
+            FlexBasis::Content => Size::Initial,
+
+            FlexBasis::Size(size) => match Size::<LengthPercentage>::from(size.clone()) {
+                // https://drafts.csswg.org/css-flexbox-1/#valdef-flex-basis-auto
+                // > When specified on a flex item, the `auto` keyword retrieves
+                // > the value of the main size property as the used `flex-basis`.
+                Size::Initial => main_preferred_size,
+
+                // https://drafts.csswg.org/css-flexbox-1/#flex-basis-property
+                // > For all values other than `auto` and `content` (defined above),
+                // > `flex-basis` is resolved the same way as `width` in horizontal
+                // > writing modes, except that if a value would resolve to `auto`
+                // > for `width`, it instead resolves to `content` for `flex-basis`.
+                // > For example, percentage values of `flex-basis` are resolved
+                // > against the flex item’s containing block (i.e. its flex container);
+                // > and if that containing block’s size is indefinite,
+                // > the used value for `flex-basis` is `content`.
+                size => {
+                    let apply_box_sizing = |length: Au| {
+                        match style_position.box_sizing {
+                            BoxSizing::ContentBox => length,
+                            // This may make `length` negative,
+                            // but it will be clamped in the hypothetical main size
+                            BoxSizing::BorderBox => length - main_padding_border_sum,
+                        }
+                    };
+                    size.resolve_percentages_for_preferred(container_definite_main_size)
+                        .map(apply_box_sizing)
+                },
+            },
+        }
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(
+            name = "FlexContainer::layout_for_block_content_size",
+            skip_all,
+            fields(servo_profiling = true),
+            level = "trace",
+        )
+    )]
+    fn layout_for_block_content_size(
+        &self,
+        flex_context: &FlexContext,
+        pbm_auto_is_zero: &FlexRelativeVec2<Au>,
+        content_box_sizes: &LogicalVec2<Sizes>,
+        preferred_aspect_ratio: Option<AspectRatio>,
+        cross_size_stretches_to_container_size: bool,
+        intrinsic_sizing_mode: IntrinsicSizingMode,
+    ) -> Au {
+        let mut positioning_context = PositioningContext::default();
+        let style = self.independent_formatting_context.style();
+        match &self.independent_formatting_context.contents {
+            IndependentFormattingContextContents::Replaced(replaced) => {
+                let get_used_size = |block_sizes| {
+                    replaced.used_size_as_if_inline_element_from_content_box_sizes(
+                        flex_context.containing_block,
+                        style,
+                        preferred_aspect_ratio,
+                        LogicalVec2 {
+                            block: block_sizes,
+                            inline: &content_box_sizes.inline,
+                        },
+                        Size::FitContent.into(),
+                        LogicalVec2 {
+                            inline: pbm_auto_is_zero.cross,
+                            block: pbm_auto_is_zero.main,
+                        },
+                    )
+                };
+                if intrinsic_sizing_mode == IntrinsicSizingMode::Size {
+                    get_used_size(&Sizes::default()).block
+                } else {
+                    get_used_size(&content_box_sizes.block).block
+                }
+            },
+            IndependentFormattingContextContents::NonReplaced(non_replaced) => {
+                // TODO: This is wrong if the item writing mode is different from the flex
+                // container's writing mode.
+                let inline_size = {
+                    let initial_behavior = if cross_size_stretches_to_container_size {
+                        Size::Stretch
+                    } else {
+                        Size::FitContent
+                    };
+                    let stretch_size =
+                        flex_context.containing_block.size.inline - pbm_auto_is_zero.cross;
+                    let get_content_size = || {
+                        let constraint_space = ConstraintSpace::new(
+                            SizeConstraint::default(),
+                            style.writing_mode,
+                            non_replaced.preferred_aspect_ratio(),
+                        );
+                        self.independent_formatting_context
+                            .inline_content_sizes(flex_context.layout_context, &constraint_space)
+                            .sizes
+                    };
+                    content_box_sizes.inline.resolve(
+                        Direction::Inline,
+                        initial_behavior,
+                        Au::zero,
+                        Some(stretch_size),
+                        get_content_size,
+                        false,
+                    )
+                };
+                let item_as_containing_block = ContainingBlock {
+                    size: ContainingBlockSize {
+                        inline: inline_size,
+                        block: SizeConstraint::default(),
+                    },
+                    style,
+                };
+                let mut content_block_size = || {
+                    non_replaced
+                        .layout(
+                            flex_context.layout_context,
+                            &mut positioning_context,
+                            &item_as_containing_block,
+                            flex_context.containing_block,
+                            &self.independent_formatting_context.base,
+                            false, /* depends_on_block_constraints */
+                        )
+                        .content_block_size
+                };
+                match intrinsic_sizing_mode {
+                    IntrinsicSizingMode::Contribution => {
+                        let stretch_size = flex_context
+                            .containing_block
+                            .size
+                            .block
+                            .to_definite()
+                            .map(|block_size| block_size - pbm_auto_is_zero.main);
+                        let inner_block_size = content_box_sizes.block.resolve(
+                            Direction::Block,
+                            Size::FitContent,
+                            Au::zero,
+                            stretch_size,
+                            || ContentSizes::from(content_block_size()),
+                            // Tables have a special sizing in the block axis that handles collapsed rows
+                            // by ignoring the sizing properties and instead relying on the content block size,
+                            // which should indirectly take sizing properties into account.
+                            // However, above we laid out the table with a SizeConstraint::default() block size,
+                            // so the content block size doesn't take sizing properties into account.
+                            // Therefore, pretending that it's never a table tends to provide a better result.
+                            false, /* is_table */
+                        );
+                        inner_block_size + pbm_auto_is_zero.main
+                    },
+                    IntrinsicSizingMode::Size => content_block_size(),
+                }
+            },
+        }
+    }
+
+    #[inline]
+    fn is_table(&self) -> bool {
+        match &self.independent_formatting_context.contents {
+            IndependentFormattingContextContents::NonReplaced(content) => content.is_table(),
+            IndependentFormattingContextContents::Replaced(_) => false,
+        }
+    }
+}
diff --git a/components/layout/flexbox/mod.rs b/components/layout/flexbox/mod.rs
new file mode 100644
index 00000000000..91a12b31812
--- /dev/null
+++ b/components/layout/flexbox/mod.rs
@@ -0,0 +1,222 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use geom::{FlexAxis, MainStartCrossStart};
+use malloc_size_of_derive::MallocSizeOf;
+use servo_arc::Arc as ServoArc;
+use style::context::SharedStyleContext;
+use style::logical_geometry::WritingMode;
+use style::properties::ComputedValues;
+use style::properties::longhands::align_items::computed_value::T as AlignItems;
+use style::properties::longhands::flex_direction::computed_value::T as FlexDirection;
+use style::properties::longhands::flex_wrap::computed_value::T as FlexWrap;
+use style::values::computed::{AlignContent, JustifyContent};
+use style::values::specified::align::AlignFlags;
+
+use crate::PropagatedBoxTreeData;
+use crate::cell::ArcRefCell;
+use crate::construct_modern::{ModernContainerBuilder, ModernItemKind};
+use crate::context::LayoutContext;
+use crate::dom::LayoutBox;
+use crate::dom_traversal::{NodeAndStyleInfo, NonReplacedContents};
+use crate::formatting_contexts::IndependentFormattingContext;
+use crate::fragment_tree::{BaseFragmentInfo, Fragment};
+use crate::positioned::AbsolutelyPositionedBox;
+
+mod geom;
+mod layout;
+
+/// A structure to hold the configuration of a flex container for use during layout
+/// and preferred width calculation.
+#[derive(Clone, Debug, MallocSizeOf)]
+pub(crate) struct FlexContainerConfig {
+    container_is_single_line: bool,
+    writing_mode: WritingMode,
+    flex_axis: FlexAxis,
+    flex_direction: FlexDirection,
+    flex_direction_is_reversed: bool,
+    flex_wrap: FlexWrap,
+    flex_wrap_is_reversed: bool,
+    main_start_cross_start_sides_are: MainStartCrossStart,
+    align_content: AlignContent,
+    align_items: AlignItems,
+    justify_content: JustifyContent,
+}
+
+impl FlexContainerConfig {
+    fn new(container_style: &ComputedValues) -> FlexContainerConfig {
+        let flex_direction = container_style.clone_flex_direction();
+        let flex_axis = FlexAxis::from(flex_direction);
+        let flex_wrap = container_style.get_position().flex_wrap;
+        let container_is_single_line = match flex_wrap {
+            FlexWrap::Nowrap => true,
+            FlexWrap::Wrap | FlexWrap::WrapReverse => false,
+        };
+        let flex_direction_is_reversed = match flex_direction {
+            FlexDirection::Row | FlexDirection::Column => false,
+            FlexDirection::RowReverse | FlexDirection::ColumnReverse => true,
+        };
+        let flex_wrap_reverse = match flex_wrap {
+            FlexWrap::Nowrap | FlexWrap::Wrap => false,
+            FlexWrap::WrapReverse => true,
+        };
+
+        let align_content = container_style.clone_align_content();
+        let align_items = AlignItems(match container_style.clone_align_items().0 {
+            AlignFlags::AUTO | AlignFlags::NORMAL => AlignFlags::STRETCH,
+            align => align,
+        });
+        let justify_content = container_style.clone_justify_content();
+        let main_start_cross_start_sides_are =
+            MainStartCrossStart::from(flex_direction, flex_wrap_reverse);
+
+        FlexContainerConfig {
+            container_is_single_line,
+            writing_mode: container_style.writing_mode,
+            flex_axis,
+            flex_direction,
+            flex_direction_is_reversed,
+            flex_wrap,
+            flex_wrap_is_reversed: flex_wrap_reverse,
+            main_start_cross_start_sides_are,
+            align_content,
+            align_items,
+            justify_content,
+        }
+    }
+}
+
+#[derive(Debug, MallocSizeOf)]
+pub(crate) struct FlexContainer {
+    children: Vec<ArcRefCell<FlexLevelBox>>,
+
+    style: ServoArc<ComputedValues>,
+
+    /// The configuration of this [`FlexContainer`].
+    config: FlexContainerConfig,
+}
+
+impl FlexContainer {
+    pub fn construct(
+        context: &LayoutContext,
+        info: &NodeAndStyleInfo<'_>,
+        contents: NonReplacedContents,
+        propagated_data: PropagatedBoxTreeData,
+    ) -> Self {
+        let mut builder =
+            ModernContainerBuilder::new(context, info, propagated_data.union(&info.style));
+        contents.traverse(context, info, &mut builder);
+        let items = builder.finish();
+
+        let children = items
+            .into_iter()
+            .map(|item| {
+                let box_ = match item.kind {
+                    ModernItemKind::InFlow => ArcRefCell::new(FlexLevelBox::FlexItem(
+                        FlexItemBox::new(item.formatting_context),
+                    )),
+                    ModernItemKind::OutOfFlow => {
+                        let abs_pos_box =
+                            ArcRefCell::new(AbsolutelyPositionedBox::new(item.formatting_context));
+                        ArcRefCell::new(FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(abs_pos_box))
+                    },
+                };
+
+                if let Some(box_slot) = item.box_slot {
+                    box_slot.set(LayoutBox::FlexLevel(box_.clone()));
+                }
+
+                box_
+            })
+            .collect();
+
+        Self {
+            children,
+            style: info.style.clone(),
+            config: FlexContainerConfig::new(&info.style),
+        }
+    }
+
+    pub(crate) fn repair_style(&mut self, new_style: &ServoArc<ComputedValues>) {
+        self.config = FlexContainerConfig::new(new_style);
+        self.style = new_style.clone();
+    }
+}
+
+#[derive(Debug, MallocSizeOf)]
+pub(crate) enum FlexLevelBox {
+    FlexItem(FlexItemBox),
+    OutOfFlowAbsolutelyPositionedBox(ArcRefCell<AbsolutelyPositionedBox>),
+}
+
+impl FlexLevelBox {
+    pub(crate) fn repair_style(
+        &mut self,
+        context: &SharedStyleContext,
+        new_style: &ServoArc<ComputedValues>,
+    ) {
+        match self {
+            FlexLevelBox::FlexItem(flex_item_box) => flex_item_box
+                .independent_formatting_context
+                .repair_style(context, new_style),
+            FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(positioned_box) => positioned_box
+                .borrow_mut()
+                .context
+                .repair_style(context, new_style),
+        }
+    }
+
+    pub(crate) fn invalidate_cached_fragment(&self) {
+        match self {
+            FlexLevelBox::FlexItem(flex_item_box) => flex_item_box
+                .independent_formatting_context
+                .base
+                .invalidate_cached_fragment(),
+            FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(positioned_box) => positioned_box
+                .borrow()
+                .context
+                .base
+                .invalidate_cached_fragment(),
+        }
+    }
+
+    pub(crate) fn fragments(&self) -> Vec<Fragment> {
+        match self {
+            FlexLevelBox::FlexItem(flex_item_box) => flex_item_box
+                .independent_formatting_context
+                .base
+                .fragments(),
+            FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(positioned_box) => {
+                positioned_box.borrow().context.base.fragments()
+            },
+        }
+    }
+}
+
+#[derive(MallocSizeOf)]
+pub(crate) struct FlexItemBox {
+    independent_formatting_context: IndependentFormattingContext,
+}
+
+impl std::fmt::Debug for FlexItemBox {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str("FlexItemBox")
+    }
+}
+
+impl FlexItemBox {
+    fn new(independent_formatting_context: IndependentFormattingContext) -> Self {
+        Self {
+            independent_formatting_context,
+        }
+    }
+
+    fn style(&self) -> &ServoArc<ComputedValues> {
+        self.independent_formatting_context.style()
+    }
+
+    fn base_fragment_info(&self) -> BaseFragmentInfo {
+        self.independent_formatting_context.base_fragment_info()
+    }
+}
diff --git a/components/layout/flow/construct.rs b/components/layout/flow/construct.rs
new file mode 100644
index 00000000000..334da8ae2b0
--- /dev/null
+++ b/components/layout/flow/construct.rs
@@ -0,0 +1,785 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::borrow::Cow;
+use std::convert::TryFrom;
+
+use rayon::iter::{IntoParallelIterator, ParallelIterator};
+use servo_arc::Arc;
+use style::properties::ComputedValues;
+use style::properties::longhands::list_style_position::computed_value::T as ListStylePosition;
+use style::selector_parser::PseudoElement;
+use style::str::char_is_whitespace;
+
+use super::OutsideMarker;
+use super::inline::construct::InlineFormattingContextBuilder;
+use super::inline::inline_box::InlineBox;
+use super::inline::{InlineFormattingContext, SharedInlineStyles};
+use crate::PropagatedBoxTreeData;
+use crate::cell::ArcRefCell;
+use crate::context::LayoutContext;
+use crate::dom::{BoxSlot, LayoutBox, NodeExt};
+use crate::dom_traversal::{
+    Contents, NodeAndStyleInfo, NonReplacedContents, PseudoElementContentItem, TraversalHandler,
+};
+use crate::flow::float::FloatBox;
+use crate::flow::{BlockContainer, BlockFormattingContext, BlockLevelBox};
+use crate::formatting_contexts::IndependentFormattingContext;
+use crate::fragment_tree::FragmentFlags;
+use crate::layout_box_base::LayoutBoxBase;
+use crate::positioned::AbsolutelyPositionedBox;
+use crate::style_ext::{ComputedValuesExt, DisplayGeneratingBox, DisplayInside, DisplayOutside};
+use crate::table::{AnonymousTableContent, Table};
+
+impl BlockFormattingContext {
+    pub(crate) fn construct(
+        context: &LayoutContext,
+        info: &NodeAndStyleInfo<'_>,
+        contents: NonReplacedContents,
+        propagated_data: PropagatedBoxTreeData,
+        is_list_item: bool,
+    ) -> Self {
+        Self::from_block_container(BlockContainer::construct(
+            context,
+            info,
+            contents,
+            propagated_data,
+            is_list_item,
+        ))
+    }
+
+    pub(crate) fn from_block_container(contents: BlockContainer) -> Self {
+        let contains_floats = contents.contains_floats();
+        Self {
+            contents,
+            contains_floats,
+        }
+    }
+}
+
+struct BlockLevelJob<'dom> {
+    info: NodeAndStyleInfo<'dom>,
+    box_slot: BoxSlot<'dom>,
+    propagated_data: PropagatedBoxTreeData,
+    kind: BlockLevelCreator,
+}
+
+enum BlockLevelCreator {
+    SameFormattingContextBlock(IntermediateBlockContainer),
+    Independent {
+        display_inside: DisplayInside,
+        contents: Contents,
+    },
+    OutOfFlowAbsolutelyPositionedBox {
+        display_inside: DisplayInside,
+        contents: Contents,
+    },
+    OutOfFlowFloatBox {
+        display_inside: DisplayInside,
+        contents: Contents,
+    },
+    OutsideMarker {
+        list_item_style: Arc<ComputedValues>,
+        contents: Vec<PseudoElementContentItem>,
+    },
+    AnonymousTable {
+        table_block: ArcRefCell<BlockLevelBox>,
+    },
+}
+
+/// A block container that may still have to be constructed.
+///
+/// Represents either the inline formatting context of an anonymous block
+/// box or the yet-to-be-computed block container generated from the children
+/// of a given element.
+///
+/// Deferring allows using rayon’s `into_par_iter`.
+enum IntermediateBlockContainer {
+    InlineFormattingContext(BlockContainer),
+    Deferred {
+        contents: NonReplacedContents,
+        propagated_data: PropagatedBoxTreeData,
+        is_list_item: bool,
+    },
+}
+
+/// A builder for a block container.
+///
+/// This builder starts from the first child of a given DOM node
+/// and does a preorder traversal of all of its inclusive siblings.
+pub(crate) struct BlockContainerBuilder<'dom, 'style> {
+    context: &'style LayoutContext<'style>,
+
+    /// This NodeAndStyleInfo contains the root node, the corresponding pseudo
+    /// content designator, and the block container style.
+    info: &'style NodeAndStyleInfo<'dom>,
+
+    /// The list of block-level boxes to be built for the final block container.
+    ///
+    /// Contains all the block-level jobs we found traversing the tree
+    /// so far, if this is empty at the end of the traversal and the ongoing
+    /// inline formatting context is not empty, the block container establishes
+    /// an inline formatting context (see end of `build`).
+    ///
+    /// DOM nodes which represent block-level boxes are immediately pushed
+    /// to this list with their style without ever being traversed at this
+    /// point, instead we just move to their next sibling. If the DOM node
+    /// doesn't have a next sibling, we either reached the end of the container
+    /// root or there are ongoing inline-level boxes
+    /// (see `handle_block_level_element`).
+    block_level_boxes: Vec<BlockLevelJob<'dom>>,
+
+    /// Whether or not this builder has yet produced a block which would be
+    /// be considered the first line for the purposes of `text-indent`.
+    have_already_seen_first_line_for_text_indent: bool,
+
+    /// The propagated data to use for BoxTree construction.
+    propagated_data: PropagatedBoxTreeData,
+
+    /// The [`InlineFormattingContextBuilder`] if we have encountered any inline items,
+    /// otherwise None.
+    ///
+    /// TODO: This can be `OnceCell` once `OnceCell::get_mut_or_init` is stabilized.
+    inline_formatting_context_builder: Option<InlineFormattingContextBuilder>,
+
+    /// The [`NodeAndStyleInfo`] to use for anonymous block boxes pushed to the list of
+    /// block-level boxes, lazily initialized.
+    anonymous_box_info: Option<NodeAndStyleInfo<'dom>>,
+
+    /// A collection of content that is being added to an anonymous table. This is
+    /// composed of any sequence of internal table elements or table captions that
+    /// are found outside of a table.
+    anonymous_table_content: Vec<AnonymousTableContent<'dom>>,
+
+    /// Any [`InlineFormattingContexts`] created need to know about the ongoing `display: contents`
+    /// ancestors that have been processed. This `Vec` allows passing those into new
+    /// [`InlineFormattingContext`]s that we create.
+    display_contents_shared_styles: Vec<SharedInlineStyles>,
+}
+
+impl BlockContainer {
+    pub fn construct(
+        context: &LayoutContext,
+        info: &NodeAndStyleInfo<'_>,
+        contents: NonReplacedContents,
+        propagated_data: PropagatedBoxTreeData,
+        is_list_item: bool,
+    ) -> BlockContainer {
+        let mut builder = BlockContainerBuilder::new(context, info, propagated_data);
+
+        if is_list_item {
+            if let Some((marker_info, marker_contents)) = crate::lists::make_marker(context, info) {
+                match marker_info.style.clone_list_style_position() {
+                    ListStylePosition::Inside => {
+                        builder.handle_list_item_marker_inside(&marker_info, info, marker_contents)
+                    },
+                    ListStylePosition::Outside => builder.handle_list_item_marker_outside(
+                        &marker_info,
+                        info,
+                        marker_contents,
+                        info.style.clone(),
+                    ),
+                }
+            }
+        }
+
+        contents.traverse(context, info, &mut builder);
+        builder.finish()
+    }
+}
+
+impl<'dom, 'style> BlockContainerBuilder<'dom, 'style> {
+    pub(crate) fn new(
+        context: &'style LayoutContext,
+        info: &'style NodeAndStyleInfo<'dom>,
+        propagated_data: PropagatedBoxTreeData,
+    ) -> Self {
+        BlockContainerBuilder {
+            context,
+            info,
+            block_level_boxes: Vec::new(),
+            propagated_data: propagated_data.union(&info.style),
+            have_already_seen_first_line_for_text_indent: false,
+            anonymous_box_info: None,
+            anonymous_table_content: Vec::new(),
+            inline_formatting_context_builder: None,
+            display_contents_shared_styles: Vec::new(),
+        }
+    }
+
+    fn currently_processing_inline_box(&self) -> bool {
+        self.inline_formatting_context_builder
+            .as_ref()
+            .is_some_and(InlineFormattingContextBuilder::currently_processing_inline_box)
+    }
+
+    fn ensure_inline_formatting_context_builder(&mut self) -> &mut InlineFormattingContextBuilder {
+        self.inline_formatting_context_builder
+            .get_or_insert_with(|| {
+                let mut builder = InlineFormattingContextBuilder::new(self.info);
+                for shared_inline_styles in self.display_contents_shared_styles.iter() {
+                    builder.enter_display_contents(shared_inline_styles.clone());
+                }
+                builder
+            })
+    }
+
+    fn finish_ongoing_inline_formatting_context(&mut self) -> Option<InlineFormattingContext> {
+        self.inline_formatting_context_builder.take()?.finish(
+            self.context,
+            self.propagated_data,
+            !self.have_already_seen_first_line_for_text_indent,
+            self.info.is_single_line_text_input(),
+            self.info.style.writing_mode.to_bidi_level(),
+        )
+    }
+
+    pub(crate) fn finish(mut self) -> BlockContainer {
+        debug_assert!(!self.currently_processing_inline_box());
+
+        self.finish_anonymous_table_if_needed();
+
+        if let Some(inline_formatting_context) = self.finish_ongoing_inline_formatting_context() {
+            // There are two options here. This block was composed of both one or more inline formatting contexts
+            // and child blocks OR this block was a single inline formatting context. In the latter case, we
+            // just return the inline formatting context as the block itself.
+            if self.block_level_boxes.is_empty() {
+                return BlockContainer::InlineFormattingContext(inline_formatting_context);
+            }
+            self.push_block_level_job_for_inline_formatting_context(inline_formatting_context);
+        }
+
+        let context = self.context;
+        let block_level_boxes = if self.context.use_rayon {
+            self.block_level_boxes
+                .into_par_iter()
+                .map(|block_level_job| block_level_job.finish(context))
+                .collect()
+        } else {
+            self.block_level_boxes
+                .into_iter()
+                .map(|block_level_job| block_level_job.finish(context))
+                .collect()
+        };
+
+        BlockContainer::BlockLevelBoxes(block_level_boxes)
+    }
+
+    fn finish_anonymous_table_if_needed(&mut self) {
+        if self.anonymous_table_content.is_empty() {
+            return;
+        }
+
+        // From https://drafts.csswg.org/css-tables/#fixup-algorithm:
+        //  > If the box’s parent is an inline, run-in, or ruby box (or any box that would perform
+        //  > inlinification of its children), then an inline-table box must be generated; otherwise
+        //  > it must be a table box.
+        //
+        // Note that text content in the inline formatting context isn't enough to force the
+        // creation of an inline table. It requires the parent to be an inline box.
+        let inline_table = self.currently_processing_inline_box();
+
+        // Text decorations are not propagated to atomic inline-level descendants.
+        // From https://drafts.csswg.org/css2/#lining-striking-props:
+        // >  Note that text decorations are not propagated to floating and absolutely
+        // > positioned descendants, nor to the contents of atomic inline-level descendants
+        // > such as inline blocks and inline tables.
+        let propagated_data = match inline_table {
+            true => self.propagated_data.without_text_decorations(),
+            false => self.propagated_data,
+        };
+
+        let contents: Vec<AnonymousTableContent<'dom>> =
+            self.anonymous_table_content.drain(..).collect();
+        let last_text = match contents.last() {
+            Some(AnonymousTableContent::Text(info, text)) => Some((info.clone(), text.clone())),
+            _ => None,
+        };
+
+        let (table_info, ifc) =
+            Table::construct_anonymous(self.context, self.info, contents, propagated_data);
+
+        if inline_table {
+            self.ensure_inline_formatting_context_builder()
+                .push_atomic(ifc);
+        } else {
+            let table_block = ArcRefCell::new(BlockLevelBox::Independent(ifc));
+
+            if let Some(inline_formatting_context) = self.finish_ongoing_inline_formatting_context()
+            {
+                self.push_block_level_job_for_inline_formatting_context(inline_formatting_context);
+            }
+
+            self.block_level_boxes.push(BlockLevelJob {
+                info: table_info,
+                box_slot: BoxSlot::dummy(),
+                kind: BlockLevelCreator::AnonymousTable { table_block },
+                propagated_data,
+            });
+        }
+
+        // If the last element in the anonymous table content is whitespace, that
+        // whitespace doesn't actually belong to the table. It should be processed outside
+        // ie become a space between the anonymous table and the rest of the block
+        // content. Anonymous tables are really only constructed around internal table
+        // elements and the whitespace between them, so this trailing whitespace should
+        // not be included.
+        //
+        // See https://drafts.csswg.org/css-tables/#fixup-algorithm sections "Remove
+        // irrelevant boxes" and "Generate missing parents."
+        if let Some((info, text)) = last_text {
+            self.handle_text(&info, text);
+        }
+    }
+}
+
+impl<'dom> TraversalHandler<'dom> for BlockContainerBuilder<'dom, '_> {
+    fn handle_element(
+        &mut self,
+        info: &NodeAndStyleInfo<'dom>,
+        display: DisplayGeneratingBox,
+        contents: Contents,
+        box_slot: BoxSlot<'dom>,
+    ) {
+        match display {
+            DisplayGeneratingBox::OutsideInside { outside, inside } => {
+                self.finish_anonymous_table_if_needed();
+
+                match outside {
+                    DisplayOutside::Inline => {
+                        self.handle_inline_level_element(info, inside, contents, box_slot)
+                    },
+                    DisplayOutside::Block => {
+                        let box_style = info.style.get_box();
+                        // Floats and abspos cause blockification, so they only happen in this case.
+                        // https://drafts.csswg.org/css2/visuren.html#dis-pos-flo
+                        if box_style.position.is_absolutely_positioned() {
+                            self.handle_absolutely_positioned_element(
+                                info, inside, contents, box_slot,
+                            )
+                        } else if box_style.float.is_floating() {
+                            self.handle_float_element(info, inside, contents, box_slot)
+                        } else {
+                            self.handle_block_level_element(info, inside, contents, box_slot)
+                        }
+                    },
+                };
+            },
+            DisplayGeneratingBox::LayoutInternal(_) => {
+                self.anonymous_table_content
+                    .push(AnonymousTableContent::Element {
+                        info: info.clone(),
+                        display,
+                        contents,
+                        box_slot,
+                    });
+            },
+        }
+    }
+
+    fn handle_text(&mut self, info: &NodeAndStyleInfo<'dom>, text: Cow<'dom, str>) {
+        if text.is_empty() {
+            return;
+        }
+
+        // If we are building an anonymous table ie this text directly followed internal
+        // table elements that did not have a `<table>` ancestor, then we forward all
+        // whitespace to the table builder.
+        if !self.anonymous_table_content.is_empty() && text.chars().all(char_is_whitespace) {
+            self.anonymous_table_content
+                .push(AnonymousTableContent::Text(info.clone(), text));
+            return;
+        } else {
+            self.finish_anonymous_table_if_needed();
+        }
+
+        self.ensure_inline_formatting_context_builder()
+            .push_text(text, info);
+    }
+
+    fn enter_display_contents(&mut self, styles: SharedInlineStyles) {
+        self.display_contents_shared_styles.push(styles.clone());
+        if let Some(builder) = self.inline_formatting_context_builder.as_mut() {
+            builder.enter_display_contents(styles);
+        }
+    }
+
+    fn leave_display_contents(&mut self) {
+        self.display_contents_shared_styles.pop();
+        if let Some(builder) = self.inline_formatting_context_builder.as_mut() {
+            builder.leave_display_contents();
+        }
+    }
+}
+
+impl<'dom> BlockContainerBuilder<'dom, '_> {
+    fn handle_list_item_marker_inside(
+        &mut self,
+        marker_info: &NodeAndStyleInfo<'dom>,
+        container_info: &NodeAndStyleInfo<'dom>,
+        contents: Vec<crate::dom_traversal::PseudoElementContentItem>,
+    ) {
+        // TODO: We do not currently support saving box slots for ::marker pseudo-elements
+        // that are part nested in ::before and ::after pseudo elements. For now, just
+        // forget about them once they are built.
+        let box_slot = match container_info.pseudo_element_type {
+            Some(_) => BoxSlot::dummy(),
+            None => marker_info
+                .node
+                .pseudo_element_box_slot(PseudoElement::Marker),
+        };
+
+        self.handle_inline_level_element(
+            marker_info,
+            DisplayInside::Flow {
+                is_list_item: false,
+            },
+            NonReplacedContents::OfPseudoElement(contents).into(),
+            box_slot,
+        );
+    }
+
+    fn handle_list_item_marker_outside(
+        &mut self,
+        marker_info: &NodeAndStyleInfo<'dom>,
+        container_info: &NodeAndStyleInfo<'dom>,
+        contents: Vec<crate::dom_traversal::PseudoElementContentItem>,
+        list_item_style: Arc<ComputedValues>,
+    ) {
+        // TODO: We do not currently support saving box slots for ::marker pseudo-elements
+        // that are part nested in ::before and ::after pseudo elements. For now, just
+        // forget about them once they are built.
+        let box_slot = match container_info.pseudo_element_type {
+            Some(_) => BoxSlot::dummy(),
+            None => marker_info
+                .node
+                .pseudo_element_box_slot(PseudoElement::Marker),
+        };
+
+        self.block_level_boxes.push(BlockLevelJob {
+            info: marker_info.clone(),
+            box_slot,
+            kind: BlockLevelCreator::OutsideMarker {
+                contents,
+                list_item_style,
+            },
+            propagated_data: self.propagated_data.without_text_decorations(),
+        });
+    }
+
+    fn handle_inline_level_element(
+        &mut self,
+        info: &NodeAndStyleInfo<'dom>,
+        display_inside: DisplayInside,
+        contents: Contents,
+        box_slot: BoxSlot<'dom>,
+    ) {
+        let (DisplayInside::Flow { is_list_item }, false) =
+            (display_inside, contents.is_replaced())
+        else {
+            // If this inline element is an atomic, handle it and return.
+            let context = self.context;
+            let propagaged_data = self.propagated_data.without_text_decorations();
+            let atomic = self.ensure_inline_formatting_context_builder().push_atomic(
+                IndependentFormattingContext::construct(
+                    context,
+                    info,
+                    display_inside,
+                    contents,
+                    // Text decorations are not propagated to atomic inline-level descendants.
+                    propagaged_data,
+                ),
+            );
+            box_slot.set(LayoutBox::InlineLevel(vec![atomic]));
+            return;
+        };
+
+        // Otherwise, this is just a normal inline box. Whatever happened before, all we need to do
+        // before recurring is to remember this ongoing inline level box.
+        self.ensure_inline_formatting_context_builder()
+            .start_inline_box(InlineBox::new(info), None);
+
+        if is_list_item {
+            if let Some((marker_info, marker_contents)) =
+                crate::lists::make_marker(self.context, info)
+            {
+                // Ignore `list-style-position` here:
+                // “If the list item is an inline box: this value is equivalent to `inside`.”
+                // https://drafts.csswg.org/css-lists/#list-style-position-outside
+                self.handle_list_item_marker_inside(&marker_info, info, marker_contents)
+            }
+        }
+
+        // `unwrap` doesn’t panic here because `is_replaced` returned `false`.
+        NonReplacedContents::try_from(contents)
+            .unwrap()
+            .traverse(self.context, info, self);
+
+        self.finish_anonymous_table_if_needed();
+
+        // As we are ending this inline box, during the course of the `traverse()` above, the ongoing
+        // inline formatting context may have been split around block-level elements. In that case,
+        // more than a single inline box tree item may have been produced for this inline-level box.
+        // `InlineFormattingContextBuilder::end_inline_box()` is returning all of those box tree
+        // items.
+        box_slot.set(LayoutBox::InlineLevel(
+            self.inline_formatting_context_builder
+                .as_mut()
+                .expect("Should be building an InlineFormattingContext")
+                .end_inline_box(),
+        ));
+    }
+
+    fn handle_block_level_element(
+        &mut self,
+        info: &NodeAndStyleInfo<'dom>,
+        display_inside: DisplayInside,
+        contents: Contents,
+        box_slot: BoxSlot<'dom>,
+    ) {
+        // We just found a block level element, all ongoing inline level boxes
+        // need to be split around it.
+        //
+        // After calling `split_around_block_and_finish`,
+        // `self.inline_formatting_context_builder` is set up with the state
+        // that we want to have after we push the block below.
+        if let Some(inline_formatting_context) = self
+            .inline_formatting_context_builder
+            .as_mut()
+            .and_then(|builder| {
+                builder.split_around_block_and_finish(
+                    self.context,
+                    self.propagated_data,
+                    !self.have_already_seen_first_line_for_text_indent,
+                    self.info.style.writing_mode.to_bidi_level(),
+                )
+            })
+        {
+            self.push_block_level_job_for_inline_formatting_context(inline_formatting_context);
+        }
+
+        let propagated_data = self.propagated_data;
+        let kind = match contents {
+            Contents::NonReplaced(contents) => match display_inside {
+                DisplayInside::Flow { is_list_item }
+                    // Fragment flags are just used to indicate that the element is not replaced, so empty
+                    // flags are okay here.
+                    if !info.style.establishes_block_formatting_context(
+                        FragmentFlags::empty()
+                    ) =>
+                {
+                    BlockLevelCreator::SameFormattingContextBlock(
+                        IntermediateBlockContainer::Deferred {
+                            contents,
+                            propagated_data,
+                            is_list_item,
+                        },
+                    )
+                },
+                _ => BlockLevelCreator::Independent {
+                    display_inside,
+                    contents: contents.into(),
+                },
+            },
+            Contents::Replaced(contents) => {
+                let contents = Contents::Replaced(contents);
+                BlockLevelCreator::Independent {
+                    display_inside,
+                    contents,
+                }
+            },
+        };
+        self.block_level_boxes.push(BlockLevelJob {
+            info: info.clone(),
+            box_slot,
+            kind,
+            propagated_data,
+        });
+
+        // Any block also counts as the first line for the purposes of text indent. Even if
+        // they don't actually indent.
+        self.have_already_seen_first_line_for_text_indent = true;
+    }
+
+    fn handle_absolutely_positioned_element(
+        &mut self,
+        info: &NodeAndStyleInfo<'dom>,
+        display_inside: DisplayInside,
+        contents: Contents,
+        box_slot: BoxSlot<'dom>,
+    ) {
+        if let Some(builder) = self.inline_formatting_context_builder.as_mut() {
+            if !builder.is_empty() {
+                let inline_level_box =
+                    builder.push_absolutely_positioned_box(AbsolutelyPositionedBox::construct(
+                        self.context,
+                        info,
+                        display_inside,
+                        contents,
+                    ));
+                box_slot.set(LayoutBox::InlineLevel(vec![inline_level_box]));
+                return;
+            }
+        }
+
+        let kind = BlockLevelCreator::OutOfFlowAbsolutelyPositionedBox {
+            contents,
+            display_inside,
+        };
+        self.block_level_boxes.push(BlockLevelJob {
+            info: info.clone(),
+            box_slot,
+            kind,
+            propagated_data: self.propagated_data.without_text_decorations(),
+        });
+    }
+
+    fn handle_float_element(
+        &mut self,
+        info: &NodeAndStyleInfo<'dom>,
+        display_inside: DisplayInside,
+        contents: Contents,
+        box_slot: BoxSlot<'dom>,
+    ) {
+        if let Some(builder) = self.inline_formatting_context_builder.as_mut() {
+            if !builder.is_empty() {
+                let inline_level_box = builder.push_float_box(FloatBox::construct(
+                    self.context,
+                    info,
+                    display_inside,
+                    contents,
+                    self.propagated_data,
+                ));
+                box_slot.set(LayoutBox::InlineLevel(vec![inline_level_box]));
+                return;
+            }
+        }
+
+        let kind = BlockLevelCreator::OutOfFlowFloatBox {
+            contents,
+            display_inside,
+        };
+        self.block_level_boxes.push(BlockLevelJob {
+            info: info.clone(),
+            box_slot,
+            kind,
+            propagated_data: self.propagated_data.without_text_decorations(),
+        });
+    }
+
+    fn push_block_level_job_for_inline_formatting_context(
+        &mut self,
+        inline_formatting_context: InlineFormattingContext,
+    ) {
+        let layout_context = self.context;
+        let info = self
+            .anonymous_box_info
+            .get_or_insert_with(|| {
+                self.info
+                    .pseudo(layout_context, PseudoElement::ServoAnonymousBox)
+                    .expect("Should never fail to create anonymous box")
+            })
+            .clone();
+
+        self.block_level_boxes.push(BlockLevelJob {
+            info,
+            // FIXME(nox): We should be storing this somewhere.
+            box_slot: BoxSlot::dummy(),
+            kind: BlockLevelCreator::SameFormattingContextBlock(
+                IntermediateBlockContainer::InlineFormattingContext(
+                    BlockContainer::InlineFormattingContext(inline_formatting_context),
+                ),
+            ),
+            propagated_data: self.propagated_data,
+        });
+
+        self.have_already_seen_first_line_for_text_indent = true;
+    }
+}
+
+impl BlockLevelJob<'_> {
+    fn finish(self, context: &LayoutContext) -> ArcRefCell<BlockLevelBox> {
+        let info = &self.info;
+        let block_level_box = match self.kind {
+            BlockLevelCreator::SameFormattingContextBlock(intermediate_block_container) => {
+                let contents = intermediate_block_container.finish(context, info);
+                let contains_floats = contents.contains_floats();
+                ArcRefCell::new(BlockLevelBox::SameFormattingContextBlock {
+                    base: LayoutBoxBase::new(info.into(), info.style.clone()),
+                    contents,
+                    contains_floats,
+                })
+            },
+            BlockLevelCreator::Independent {
+                display_inside,
+                contents,
+            } => {
+                let context = IndependentFormattingContext::construct(
+                    context,
+                    info,
+                    display_inside,
+                    contents,
+                    self.propagated_data,
+                );
+                ArcRefCell::new(BlockLevelBox::Independent(context))
+            },
+            BlockLevelCreator::OutOfFlowAbsolutelyPositionedBox {
+                display_inside,
+                contents,
+            } => ArcRefCell::new(BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(
+                ArcRefCell::new(AbsolutelyPositionedBox::construct(
+                    context,
+                    info,
+                    display_inside,
+                    contents,
+                )),
+            )),
+            BlockLevelCreator::OutOfFlowFloatBox {
+                display_inside,
+                contents,
+            } => ArcRefCell::new(BlockLevelBox::OutOfFlowFloatBox(FloatBox::construct(
+                context,
+                info,
+                display_inside,
+                contents,
+                self.propagated_data,
+            ))),
+            BlockLevelCreator::OutsideMarker {
+                contents,
+                list_item_style,
+            } => {
+                let contents = NonReplacedContents::OfPseudoElement(contents);
+                let block_container = BlockContainer::construct(
+                    context,
+                    info,
+                    contents,
+                    self.propagated_data.without_text_decorations(),
+                    false, /* is_list_item */
+                );
+                ArcRefCell::new(BlockLevelBox::OutsideMarker(OutsideMarker {
+                    base: LayoutBoxBase::new(info.into(), info.style.clone()),
+                    block_container,
+                    list_item_style,
+                }))
+            },
+            BlockLevelCreator::AnonymousTable { table_block } => table_block,
+        };
+        self.box_slot
+            .set(LayoutBox::BlockLevel(block_level_box.clone()));
+        block_level_box
+    }
+}
+
+impl IntermediateBlockContainer {
+    fn finish(self, context: &LayoutContext, info: &NodeAndStyleInfo<'_>) -> BlockContainer {
+        match self {
+            IntermediateBlockContainer::Deferred {
+                contents,
+                propagated_data,
+                is_list_item,
+            } => BlockContainer::construct(context, info, contents, propagated_data, is_list_item),
+            IntermediateBlockContainer::InlineFormattingContext(block_container) => block_container,
+        }
+    }
+}
diff --git a/components/layout_2020/flow/float.rs b/components/layout/flow/float.rs
similarity index 99%
rename from components/layout_2020/flow/float.rs
rename to components/layout/flow/float.rs
index f07c6a91594..f1ae2b4459a 100644
--- a/components/layout_2020/flow/float.rs
+++ b/components/layout/flow/float.rs
@@ -13,6 +13,7 @@ use std::ops::Range;
 
 use app_units::{Au, MAX_AU, MIN_AU};
 use euclid::num::Zero;
+use malloc_size_of_derive::MallocSizeOf;
 use servo_arc::Arc;
 use style::computed_values::float::T as FloatProperty;
 use style::computed_values::position::T as Position;
@@ -21,7 +22,6 @@ use style::properties::ComputedValues;
 use style::values::computed::Clear as StyleClear;
 
 use crate::context::LayoutContext;
-use crate::dom::NodeExt;
 use crate::dom_traversal::{Contents, NodeAndStyleInfo};
 use crate::formatting_contexts::IndependentFormattingContext;
 use crate::fragment_tree::{BoxFragment, CollapsedMargin};
@@ -31,7 +31,7 @@ use crate::style_ext::{DisplayInside, PaddingBorderMargin};
 use crate::{ContainingBlock, PropagatedBoxTreeData};
 
 /// A floating box.
-#[derive(Debug)]
+#[derive(Debug, MallocSizeOf)]
 pub(crate) struct FloatBox {
     /// The formatting context that makes up the content of this box.
     pub contents: IndependentFormattingContext,
@@ -884,9 +884,9 @@ impl FloatBandLink {
 
 impl FloatBox {
     /// Creates a new float box.
-    pub fn construct<'dom>(
+    pub fn construct(
         context: &LayoutContext,
-        info: &NodeAndStyleInfo<impl NodeExt<'dom>>,
+        info: &NodeAndStyleInfo<'_>,
         display_inside: DisplayInside,
         contents: Contents,
         propagated_data: PropagatedBoxTreeData,
@@ -912,11 +912,10 @@ impl FloatBox {
         positioning_context: &mut PositioningContext,
         containing_block: &ContainingBlock,
     ) -> BoxFragment {
-        let style = self.contents.style().clone();
         positioning_context.layout_maybe_position_relative_fragment(
             layout_context,
             containing_block,
-            &style,
+            &self.contents.base,
             |positioning_context| {
                 self.contents
                     .layout_float_or_atomic_inline(
diff --git a/components/layout/flow/inline/construct.rs b/components/layout/flow/inline/construct.rs
new file mode 100644
index 00000000000..a99de1679a4
--- /dev/null
+++ b/components/layout/flow/inline/construct.rs
@@ -0,0 +1,706 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::borrow::Cow;
+use std::char::{ToLowercase, ToUppercase};
+
+use icu_segmenter::WordSegmenter;
+use itertools::izip;
+use style::computed_values::white_space_collapse::T as WhiteSpaceCollapse;
+use style::values::specified::text::TextTransformCase;
+use unicode_bidi::Level;
+
+use super::text_run::TextRun;
+use super::{
+    InlineBox, InlineBoxIdentifier, InlineBoxes, InlineFormattingContext, InlineItem,
+    SharedInlineStyles,
+};
+use crate::PropagatedBoxTreeData;
+use crate::cell::ArcRefCell;
+use crate::context::LayoutContext;
+use crate::dom_traversal::NodeAndStyleInfo;
+use crate::flow::float::FloatBox;
+use crate::formatting_contexts::IndependentFormattingContext;
+use crate::positioned::AbsolutelyPositionedBox;
+use crate::style_ext::ComputedValuesExt;
+
+#[derive(Default)]
+pub(crate) struct InlineFormattingContextBuilder {
+    /// A stack of [`SharedInlineStyles`] including one for the root, one for each inline box on the
+    /// inline box stack, and importantly, one for every `display: contents` element that we are
+    /// currently processing. Normally `display: contents` elements don't affect the structure of
+    /// the [`InlineFormattingContext`], but the styles they provide do style their children.
+    shared_inline_styles_stack: Vec<SharedInlineStyles>,
+
+    /// The collection of text strings that make up this [`InlineFormattingContext`] under
+    /// construction.
+    pub text_segments: Vec<String>,
+
+    /// The current offset in the final text string of this [`InlineFormattingContext`],
+    /// used to properly set the text range of new [`InlineItem::TextRun`]s.
+    current_text_offset: usize,
+
+    /// Whether the last processed node ended with whitespace. This is used to
+    /// implement rule 4 of <https://www.w3.org/TR/css-text-3/#collapse>:
+    ///
+    /// > Any collapsible space immediately following another collapsible space—even one
+    /// > outside the boundary of the inline containing that space, provided both spaces are
+    /// > within the same inline formatting context—is collapsed to have zero advance width.
+    /// > (It is invisible, but retains its soft wrap opportunity, if any.)
+    last_inline_box_ended_with_collapsible_white_space: bool,
+
+    /// Whether or not the current state of the inline formatting context is on a word boundary
+    /// for the purposes of `text-transform: capitalize`.
+    on_word_boundary: bool,
+
+    /// Whether or not this inline formatting context will contain floats.
+    pub contains_floats: bool,
+
+    /// The current list of [`InlineItem`]s in this [`InlineFormattingContext`] under
+    /// construction. This is stored in a flat list to make it easy to access the last
+    /// item.
+    pub inline_items: Vec<ArcRefCell<InlineItem>>,
+
+    /// The current [`InlineBox`] tree of this [`InlineFormattingContext`] under construction.
+    pub inline_boxes: InlineBoxes,
+
+    /// The ongoing stack of inline boxes stack of the builder.
+    ///
+    /// Contains all the currently ongoing inline boxes we entered so far.
+    /// The traversal is at all times as deep in the tree as this stack is,
+    /// which is why the code doesn't need to keep track of the actual
+    /// container root (see `handle_inline_level_element`).
+    //_
+    /// When an inline box ends, it's removed from this stack.
+    inline_box_stack: Vec<InlineBoxIdentifier>,
+
+    /// Normally, an inline box produces a single box tree [`InlineItem`]. When a block
+    /// element causes an inline box [to be split], it can produce multiple
+    /// [`InlineItem`]s, all inserted into different [`InlineFormattingContext`]s.
+    /// [`Self::block_in_inline_splits`] is responsible for tracking all of these split
+    /// inline box results, so that they can be inserted into the [`crate::dom::BoxSlot`]
+    /// for the DOM element once it has been processed for BoxTree construction.
+    ///
+    /// [to be split]: https://www.w3.org/TR/CSS2/visuren.html#anonymous-block-level
+    block_in_inline_splits: Vec<Vec<ArcRefCell<InlineItem>>>,
+
+    /// Whether or not the inline formatting context under construction has any
+    /// uncollapsible text content.
+    pub has_uncollapsible_text_content: bool,
+}
+
+impl InlineFormattingContextBuilder {
+    pub(crate) fn new(info: &NodeAndStyleInfo) -> Self {
+        Self::new_for_shared_styles(vec![info.into()])
+    }
+
+    pub(crate) fn new_for_shared_styles(
+        shared_inline_styles_stack: Vec<SharedInlineStyles>,
+    ) -> Self {
+        Self {
+            // For the purposes of `text-transform: capitalize` the start of the IFC is a word boundary.
+            on_word_boundary: true,
+            shared_inline_styles_stack,
+            ..Default::default()
+        }
+    }
+
+    pub(crate) fn currently_processing_inline_box(&self) -> bool {
+        !self.inline_box_stack.is_empty()
+    }
+
+    fn push_control_character_string(&mut self, string_to_push: &str) {
+        self.text_segments.push(string_to_push.to_owned());
+        self.current_text_offset += string_to_push.len();
+    }
+
+    fn shared_inline_styles(&self) -> SharedInlineStyles {
+        self.shared_inline_styles_stack
+            .last()
+            .expect("Should always have at least one SharedInlineStyles")
+            .clone()
+    }
+
+    /// Return true if this [`InlineFormattingContextBuilder`] is empty for the purposes of ignoring
+    /// during box tree construction. An IFC is empty if it only contains TextRuns with
+    /// completely collapsible whitespace. When that happens it can be ignored completely.
+    pub(crate) fn is_empty(&self) -> bool {
+        if self.has_uncollapsible_text_content {
+            return false;
+        }
+
+        if !self.inline_box_stack.is_empty() {
+            return false;
+        }
+
+        fn inline_level_box_is_empty(inline_level_box: &InlineItem) -> bool {
+            match inline_level_box {
+                InlineItem::StartInlineBox(_) => false,
+                InlineItem::EndInlineBox => false,
+                // Text content is handled by `self.has_uncollapsible_text` content above in order
+                // to avoid having to iterate through the character once again.
+                InlineItem::TextRun(_) => true,
+                InlineItem::OutOfFlowAbsolutelyPositionedBox(..) => false,
+                InlineItem::OutOfFlowFloatBox(_) => false,
+                InlineItem::Atomic(..) => false,
+            }
+        }
+
+        self.inline_items
+            .iter()
+            .all(|inline_level_box| inline_level_box_is_empty(&inline_level_box.borrow()))
+    }
+
+    pub(crate) fn push_atomic(
+        &mut self,
+        independent_formatting_context: IndependentFormattingContext,
+    ) -> ArcRefCell<InlineItem> {
+        let inline_level_box = ArcRefCell::new(InlineItem::Atomic(
+            ArcRefCell::new(independent_formatting_context),
+            self.current_text_offset,
+            Level::ltr(), /* This will be assigned later if necessary. */
+        ));
+        self.inline_items.push(inline_level_box.clone());
+
+        // Push an object replacement character for this atomic, which will ensure that the line breaker
+        // inserts a line breaking opportunity here.
+        self.push_control_character_string("\u{fffc}");
+
+        self.last_inline_box_ended_with_collapsible_white_space = false;
+        self.on_word_boundary = true;
+
+        inline_level_box
+    }
+
+    pub(crate) fn push_absolutely_positioned_box(
+        &mut self,
+        absolutely_positioned_box: AbsolutelyPositionedBox,
+    ) -> ArcRefCell<InlineItem> {
+        let absolutely_positioned_box = ArcRefCell::new(absolutely_positioned_box);
+        let inline_level_box = ArcRefCell::new(InlineItem::OutOfFlowAbsolutelyPositionedBox(
+            absolutely_positioned_box,
+            self.current_text_offset,
+        ));
+
+        self.inline_items.push(inline_level_box.clone());
+        inline_level_box
+    }
+
+    pub(crate) fn push_float_box(&mut self, float_box: FloatBox) -> ArcRefCell<InlineItem> {
+        let inline_level_box =
+            ArcRefCell::new(InlineItem::OutOfFlowFloatBox(ArcRefCell::new(float_box)));
+        self.inline_items.push(inline_level_box.clone());
+        self.contains_floats = true;
+        inline_level_box
+    }
+
+    pub(crate) fn start_inline_box(
+        &mut self,
+        inline_box: InlineBox,
+        block_in_inline_splits: Option<Vec<ArcRefCell<InlineItem>>>,
+    ) {
+        self.push_control_character_string(inline_box.base.style.bidi_control_chars().0);
+
+        // Don't push a `SharedInlineStyles` if we are pushing this box when splitting
+        // an IFC for a block-in-inline split. Shared styles are pushed as part of setting
+        // up the second split of the IFC.
+        if inline_box.is_first_split {
+            self.shared_inline_styles_stack
+                .push(inline_box.shared_inline_styles.clone());
+        }
+
+        let (identifier, inline_box) = self.inline_boxes.start_inline_box(inline_box);
+        let inline_level_box = ArcRefCell::new(InlineItem::StartInlineBox(inline_box));
+        self.inline_items.push(inline_level_box.clone());
+        self.inline_box_stack.push(identifier);
+
+        let mut block_in_inline_splits = block_in_inline_splits.unwrap_or_default();
+        block_in_inline_splits.push(inline_level_box);
+        self.block_in_inline_splits.push(block_in_inline_splits);
+    }
+
+    /// End the ongoing inline box in this [`InlineFormattingContextBuilder`], returning
+    /// shared references to all of the box tree items that were created for it. More than
+    /// a single box tree items may be produced for a single inline box when that inline
+    /// box is split around a block-level element.
+    pub(crate) fn end_inline_box(&mut self) -> Vec<ArcRefCell<InlineItem>> {
+        self.shared_inline_styles_stack.pop();
+
+        let (identifier, block_in_inline_splits) = self.end_inline_box_internal();
+        let inline_level_box = self.inline_boxes.get(&identifier);
+        {
+            let mut inline_level_box = inline_level_box.borrow_mut();
+            inline_level_box.is_last_split = true;
+            self.push_control_character_string(inline_level_box.base.style.bidi_control_chars().1);
+        }
+
+        block_in_inline_splits.unwrap_or_default()
+    }
+
+    fn end_inline_box_internal(
+        &mut self,
+    ) -> (InlineBoxIdentifier, Option<Vec<ArcRefCell<InlineItem>>>) {
+        let identifier = self
+            .inline_box_stack
+            .pop()
+            .expect("Ended non-existent inline box");
+        self.inline_items
+            .push(ArcRefCell::new(InlineItem::EndInlineBox));
+
+        self.inline_boxes.end_inline_box(identifier);
+
+        // This might be `None` if this builder has already drained its block-in-inline-splits
+        // into the new builder on the other side of a new block-in-inline split.
+        let block_in_inline_splits = self.block_in_inline_splits.pop();
+
+        (identifier, block_in_inline_splits)
+    }
+
+    pub(crate) fn push_text<'dom>(&mut self, text: Cow<'dom, str>, info: &NodeAndStyleInfo<'dom>) {
+        let white_space_collapse = info.style.clone_white_space_collapse();
+        let collapsed = WhitespaceCollapse::new(
+            text.chars(),
+            white_space_collapse,
+            self.last_inline_box_ended_with_collapsible_white_space,
+        );
+
+        // TODO: Not all text transforms are about case, this logic should stop ignoring
+        // TextTransform::FULL_WIDTH and TextTransform::FULL_SIZE_KANA.
+        let text_transform = info.style.clone_text_transform().case();
+        let capitalized_text: String;
+        let char_iterator: Box<dyn Iterator<Item = char>> = match text_transform {
+            TextTransformCase::None => Box::new(collapsed),
+            TextTransformCase::Capitalize => {
+                // `TextTransformation` doesn't support capitalization, so we must capitalize the whole
+                // string at once and make a copy. Here `on_word_boundary` indicates whether or not the
+                // inline formatting context as a whole is on a word boundary. This is different from
+                // `last_inline_box_ended_with_collapsible_white_space` because the word boundaries are
+                // between atomic inlines and at the start of the IFC, and because preserved spaces
+                // are a word boundary.
+                let collapsed_string: String = collapsed.collect();
+                capitalized_text = capitalize_string(&collapsed_string, self.on_word_boundary);
+                Box::new(capitalized_text.chars())
+            },
+            _ => {
+                // If `text-transform` is active, wrap the `WhitespaceCollapse` iterator in
+                // a `TextTransformation` iterator.
+                Box::new(TextTransformation::new(collapsed, text_transform))
+            },
+        };
+
+        let white_space_collapse = info.style.clone_white_space_collapse();
+        let new_text: String = char_iterator
+            .inspect(|&character| {
+                self.has_uncollapsible_text_content |= matches!(
+                    white_space_collapse,
+                    WhiteSpaceCollapse::Preserve | WhiteSpaceCollapse::BreakSpaces
+                ) || !character.is_ascii_whitespace() ||
+                    (character == '\n' && white_space_collapse != WhiteSpaceCollapse::Collapse);
+            })
+            .collect();
+
+        if new_text.is_empty() {
+            return;
+        }
+
+        let selection_range = info.get_selection_range();
+        if let Some(last_character) = new_text.chars().next_back() {
+            self.on_word_boundary = last_character.is_whitespace();
+            self.last_inline_box_ended_with_collapsible_white_space =
+                self.on_word_boundary && white_space_collapse != WhiteSpaceCollapse::Preserve;
+        }
+
+        let new_range = self.current_text_offset..self.current_text_offset + new_text.len();
+        self.current_text_offset = new_range.end;
+        self.text_segments.push(new_text);
+
+        if let Some(inline_item) = self.inline_items.last() {
+            if let InlineItem::TextRun(text_run) = &mut *inline_item.borrow_mut() {
+                text_run.borrow_mut().text_range.end = new_range.end;
+                return;
+            }
+        }
+
+        self.inline_items
+            .push(ArcRefCell::new(InlineItem::TextRun(ArcRefCell::new(
+                TextRun::new(
+                    info.into(),
+                    self.shared_inline_styles(),
+                    new_range,
+                    selection_range,
+                ),
+            ))));
+    }
+
+    pub(crate) fn enter_display_contents(&mut self, shared_inline_styles: SharedInlineStyles) {
+        self.shared_inline_styles_stack.push(shared_inline_styles);
+    }
+
+    pub(crate) fn leave_display_contents(&mut self) {
+        self.shared_inline_styles_stack.pop();
+    }
+
+    pub(crate) fn split_around_block_and_finish(
+        &mut self,
+        layout_context: &LayoutContext,
+        propagated_data: PropagatedBoxTreeData,
+        has_first_formatted_line: bool,
+        default_bidi_level: Level,
+    ) -> Option<InlineFormattingContext> {
+        if self.is_empty() {
+            return None;
+        }
+
+        // Create a new inline builder which will be active after the block splits this inline formatting
+        // context. It has the same inline box structure as this builder, except the boxes are
+        // marked as not being the first fragment. No inline content is carried over to this new
+        // builder.
+        let mut new_builder = Self::new_for_shared_styles(self.shared_inline_styles_stack.clone());
+
+        let block_in_inline_splits = std::mem::take(&mut self.block_in_inline_splits);
+        for (identifier, historical_inline_boxes) in
+            izip!(self.inline_box_stack.iter(), block_in_inline_splits)
+        {
+            // Start a new inline box for every ongoing inline box in this
+            // InlineFormattingContext once we are done processing this block element,
+            // being sure to give the block-in-inline-split to the new
+            // InlineFormattingContext. These will finally be inserted into the DOM's
+            // BoxSlot once the inline box has been fully processed.
+            new_builder.start_inline_box(
+                self.inline_boxes
+                    .get(identifier)
+                    .borrow()
+                    .split_around_block(),
+                Some(historical_inline_boxes),
+            );
+        }
+        let mut inline_builder_from_before_split = std::mem::replace(self, new_builder);
+
+        // End all ongoing inline boxes in the first builder, but ensure that they are not
+        // marked as the final fragments, so that they do not get inline end margin, borders,
+        // and padding.
+        while !inline_builder_from_before_split.inline_box_stack.is_empty() {
+            inline_builder_from_before_split.end_inline_box_internal();
+        }
+
+        inline_builder_from_before_split.finish(
+            layout_context,
+            propagated_data,
+            has_first_formatted_line,
+            /* is_single_line_text_input = */ false,
+            default_bidi_level,
+        )
+    }
+
+    /// Finish the current inline formatting context, returning [`None`] if the context was empty.
+    pub(crate) fn finish(
+        self,
+        layout_context: &LayoutContext,
+        propagated_data: PropagatedBoxTreeData,
+        has_first_formatted_line: bool,
+        is_single_line_text_input: bool,
+        default_bidi_level: Level,
+    ) -> Option<InlineFormattingContext> {
+        if self.is_empty() {
+            return None;
+        }
+
+        assert!(self.inline_box_stack.is_empty());
+        Some(InlineFormattingContext::new_with_builder(
+            self,
+            layout_context,
+            propagated_data,
+            has_first_formatted_line,
+            is_single_line_text_input,
+            default_bidi_level,
+        ))
+    }
+}
+
+fn preserve_segment_break() -> bool {
+    true
+}
+
+pub struct WhitespaceCollapse<InputIterator> {
+    char_iterator: InputIterator,
+    white_space_collapse: WhiteSpaceCollapse,
+
+    /// Whether or not we should collapse white space completely at the start of the string.
+    /// This is true when the last character handled in our owning [`super::InlineFormattingContext`]
+    /// was collapsible white space.
+    remove_collapsible_white_space_at_start: bool,
+
+    /// Whether or not the last character produced was newline. There is special behavior
+    /// we do after each newline.
+    following_newline: bool,
+
+    /// Whether or not we have seen any non-white space characters, indicating that we are not
+    /// in a collapsible white space section at the beginning of the string.
+    have_seen_non_white_space_characters: bool,
+
+    /// Whether the last character that we processed was a non-newline white space character. When
+    /// collapsing white space we need to wait until the next non-white space character or the end
+    /// of the string to push a single white space.
+    inside_white_space: bool,
+
+    /// When we enter a collapsible white space region, we may need to wait to produce a single
+    /// white space character as soon as we encounter a non-white space character. When that
+    /// happens we queue up the non-white space character for the next iterator call.
+    character_pending_to_return: Option<char>,
+}
+
+impl<InputIterator> WhitespaceCollapse<InputIterator> {
+    pub fn new(
+        char_iterator: InputIterator,
+        white_space_collapse: WhiteSpaceCollapse,
+        trim_beginning_white_space: bool,
+    ) -> Self {
+        Self {
+            char_iterator,
+            white_space_collapse,
+            remove_collapsible_white_space_at_start: trim_beginning_white_space,
+            inside_white_space: false,
+            following_newline: false,
+            have_seen_non_white_space_characters: false,
+            character_pending_to_return: None,
+        }
+    }
+
+    fn is_leading_trimmed_white_space(&self) -> bool {
+        !self.have_seen_non_white_space_characters && self.remove_collapsible_white_space_at_start
+    }
+
+    /// Whether or not we need to produce a space character if the next character is not a newline
+    /// and not white space. This happens when we are exiting a section of white space and we
+    /// waited to produce a single space character for the entire section of white space (but
+    /// not following or preceding a newline).
+    fn need_to_produce_space_character_after_white_space(&self) -> bool {
+        self.inside_white_space && !self.following_newline && !self.is_leading_trimmed_white_space()
+    }
+}
+
+impl<InputIterator> Iterator for WhitespaceCollapse<InputIterator>
+where
+    InputIterator: Iterator<Item = char>,
+{
+    type Item = char;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        // Point 4.1.1 first bullet:
+        // > If white-space is set to normal, nowrap, or pre-line, whitespace
+        // > characters are considered collapsible
+        // If whitespace is not considered collapsible, it is preserved entirely, which
+        // means that we can simply return the input string exactly.
+        if self.white_space_collapse == WhiteSpaceCollapse::Preserve ||
+            self.white_space_collapse == WhiteSpaceCollapse::BreakSpaces
+        {
+            // From <https://drafts.csswg.org/css-text-3/#white-space-processing>:
+            // > Carriage returns (U+000D) are treated identically to spaces (U+0020) in all respects.
+            //
+            // In the non-preserved case these are converted to space below.
+            return match self.char_iterator.next() {
+                Some('\r') => Some(' '),
+                next => next,
+            };
+        }
+
+        if let Some(character) = self.character_pending_to_return.take() {
+            self.inside_white_space = false;
+            self.have_seen_non_white_space_characters = true;
+            self.following_newline = false;
+            return Some(character);
+        }
+
+        while let Some(character) = self.char_iterator.next() {
+            // Don't push non-newline whitespace immediately. Instead wait to push it until we
+            // know that it isn't followed by a newline. See `push_pending_whitespace_if_needed`
+            // above.
+            if character.is_ascii_whitespace() && character != '\n' {
+                self.inside_white_space = true;
+                continue;
+            }
+
+            // Point 4.1.1:
+            // > 2. Collapsible segment breaks are transformed for rendering according to the
+            // >    segment break transformation rules.
+            if character == '\n' {
+                // From <https://drafts.csswg.org/css-text-3/#line-break-transform>
+                // (4.1.3 -- the segment break transformation rules):
+                //
+                // > When white-space is pre, pre-wrap, or pre-line, segment breaks are not
+                // > collapsible and are instead transformed into a preserved line feed"
+                if self.white_space_collapse != WhiteSpaceCollapse::Collapse {
+                    self.inside_white_space = false;
+                    self.following_newline = true;
+                    return Some(character);
+
+                // Point 4.1.3:
+                // > 1. First, any collapsible segment break immediately following another
+                // >    collapsible segment break is removed.
+                // > 2. Then any remaining segment break is either transformed into a space (U+0020)
+                // >    or removed depending on the context before and after the break.
+                } else if !self.following_newline &&
+                    preserve_segment_break() &&
+                    !self.is_leading_trimmed_white_space()
+                {
+                    self.inside_white_space = false;
+                    self.following_newline = true;
+                    return Some(' ');
+                } else {
+                    self.following_newline = true;
+                    continue;
+                }
+            }
+
+            // Point 4.1.1:
+            // > 2. Any sequence of collapsible spaces and tabs immediately preceding or
+            // >    following a segment break is removed.
+            // > 3. Every collapsible tab is converted to a collapsible space (U+0020).
+            // > 4. Any collapsible space immediately following another collapsible space—even
+            // >    one outside the boundary of the inline containing that space, provided both
+            // >    spaces are within the same inline formatting context—is collapsed to have zero
+            // >    advance width.
+            if self.need_to_produce_space_character_after_white_space() {
+                self.inside_white_space = false;
+                self.character_pending_to_return = Some(character);
+                return Some(' ');
+            }
+
+            self.inside_white_space = false;
+            self.have_seen_non_white_space_characters = true;
+            self.following_newline = false;
+            return Some(character);
+        }
+
+        if self.need_to_produce_space_character_after_white_space() {
+            self.inside_white_space = false;
+            return Some(' ');
+        }
+
+        None
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.char_iterator.size_hint()
+    }
+
+    fn count(self) -> usize
+    where
+        Self: Sized,
+    {
+        self.char_iterator.count()
+    }
+}
+
+enum PendingCaseConversionResult {
+    Uppercase(ToUppercase),
+    Lowercase(ToLowercase),
+}
+
+impl PendingCaseConversionResult {
+    fn next(&mut self) -> Option<char> {
+        match self {
+            PendingCaseConversionResult::Uppercase(to_uppercase) => to_uppercase.next(),
+            PendingCaseConversionResult::Lowercase(to_lowercase) => to_lowercase.next(),
+        }
+    }
+}
+
+/// This is an interator that consumes a char iterator and produces character transformed
+/// by the given CSS `text-transform` value. It currently does not support
+/// `text-transform: capitalize` because Unicode segmentation libraries do not support
+/// streaming input one character at a time.
+pub struct TextTransformation<InputIterator> {
+    /// The input character iterator.
+    char_iterator: InputIterator,
+    /// The `text-transform` value to use.
+    text_transform: TextTransformCase,
+    /// If an uppercasing or lowercasing produces more than one character, this
+    /// caches them so that they can be returned in subsequent iterator calls.
+    pending_case_conversion_result: Option<PendingCaseConversionResult>,
+}
+
+impl<InputIterator> TextTransformation<InputIterator> {
+    pub fn new(char_iterator: InputIterator, text_transform: TextTransformCase) -> Self {
+        Self {
+            char_iterator,
+            text_transform,
+            pending_case_conversion_result: None,
+        }
+    }
+}
+
+impl<InputIterator> Iterator for TextTransformation<InputIterator>
+where
+    InputIterator: Iterator<Item = char>,
+{
+    type Item = char;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if let Some(character) = self
+            .pending_case_conversion_result
+            .as_mut()
+            .and_then(|result| result.next())
+        {
+            return Some(character);
+        }
+        self.pending_case_conversion_result = None;
+
+        for character in self.char_iterator.by_ref() {
+            match self.text_transform {
+                TextTransformCase::None => return Some(character),
+                TextTransformCase::Uppercase => {
+                    let mut pending_result =
+                        PendingCaseConversionResult::Uppercase(character.to_uppercase());
+                    if let Some(character) = pending_result.next() {
+                        self.pending_case_conversion_result = Some(pending_result);
+                        return Some(character);
+                    }
+                },
+                TextTransformCase::Lowercase => {
+                    let mut pending_result =
+                        PendingCaseConversionResult::Lowercase(character.to_lowercase());
+                    if let Some(character) = pending_result.next() {
+                        self.pending_case_conversion_result = Some(pending_result);
+                        return Some(character);
+                    }
+                },
+                // `text-transform: capitalize` currently cannot work on a per-character basis,
+                // so must be handled outside of this iterator.
+                TextTransformCase::Capitalize => return Some(character),
+            }
+        }
+        None
+    }
+}
+
+/// Given a string and whether the start of the string represents a word boundary, create a copy of
+/// the string with letters after word boundaries capitalized.
+fn capitalize_string(string: &str, allow_word_at_start: bool) -> String {
+    let mut output_string = String::new();
+    output_string.reserve(string.len());
+
+    let word_segmenter = WordSegmenter::new_auto();
+    let mut bounds = word_segmenter.segment_str(string).peekable();
+    let mut byte_index = 0;
+    for character in string.chars() {
+        let current_byte_index = byte_index;
+        byte_index += character.len_utf8();
+
+        if let Some(next_index) = bounds.peek() {
+            if *next_index == current_byte_index {
+                bounds.next();
+
+                if current_byte_index != 0 || allow_word_at_start {
+                    output_string.extend(character.to_uppercase());
+                    continue;
+                }
+            }
+        }
+
+        output_string.push(character);
+    }
+
+    output_string
+}
diff --git a/components/layout_2020/flow/inline/inline_box.rs b/components/layout/flow/inline/inline_box.rs
similarity index 77%
rename from components/layout_2020/flow/inline/inline_box.rs
rename to components/layout/flow/inline/inline_box.rs
index 8550a076184..b547f3b5935 100644
--- a/components/layout_2020/flow/inline/inline_box.rs
+++ b/components/layout/flow/inline/inline_box.rs
@@ -6,60 +6,83 @@ use std::vec::IntoIter;
 
 use app_units::Au;
 use fonts::FontMetrics;
-use servo_arc::Arc;
+use malloc_size_of_derive::MallocSizeOf;
+use script::layout_dom::ServoLayoutNode;
+use script_layout_interface::wrapper_traits::{LayoutNode, ThreadSafeLayoutNode};
+use servo_arc::Arc as ServoArc;
 use style::properties::ComputedValues;
 
-use super::{InlineContainerState, InlineContainerStateFlags, inline_container_needs_strut};
+use super::{
+    InlineContainerState, InlineContainerStateFlags, SharedInlineStyles,
+    inline_container_needs_strut,
+};
 use crate::ContainingBlock;
 use crate::cell::ArcRefCell;
 use crate::context::LayoutContext;
-use crate::dom::NodeExt;
 use crate::dom_traversal::NodeAndStyleInfo;
 use crate::fragment_tree::BaseFragmentInfo;
+use crate::layout_box_base::LayoutBoxBase;
 use crate::style_ext::{LayoutStyle, PaddingBorderMargin};
 
-#[derive(Debug)]
+#[derive(Debug, MallocSizeOf)]
 pub(crate) struct InlineBox {
-    pub base_fragment_info: BaseFragmentInfo,
-    pub style: Arc<ComputedValues>,
+    pub base: LayoutBoxBase,
+    /// The [`SharedInlineStyles`] for this [`InlineBox`] that are used to share styles
+    /// with all [`super::TextRun`] children.
+    pub(super) shared_inline_styles: SharedInlineStyles,
     /// The identifier of this inline box in the containing [`super::InlineFormattingContext`].
     pub(super) identifier: InlineBoxIdentifier,
-    pub is_first_fragment: bool,
-    pub is_last_fragment: bool,
+    /// Whether or not this is the first instance of an [`InlineBox`] before a possible
+    /// block-in-inline split. When no split occurs, this is always true.
+    pub is_first_split: bool,
+    /// Whether or not this is the last instance of an [`InlineBox`] before a possible
+    /// block-in-inline split. When no split occurs, this is always true.
+    pub is_last_split: bool,
     /// The index of the default font in the [`super::InlineFormattingContext`]'s font metrics store.
     /// This is initialized during IFC shaping.
     pub default_font_index: Option<usize>,
 }
 
 impl InlineBox {
-    pub(crate) fn new<'dom, Node: NodeExt<'dom>>(info: &NodeAndStyleInfo<Node>) -> Self {
+    pub(crate) fn new(info: &NodeAndStyleInfo) -> Self {
         Self {
-            base_fragment_info: info.into(),
-            style: info.style.clone(),
+            base: LayoutBoxBase::new(info.into(), info.style.clone()),
+            shared_inline_styles: info.into(),
             // This will be assigned later, when the box is actually added to the IFC.
             identifier: InlineBoxIdentifier::default(),
-            is_first_fragment: true,
-            is_last_fragment: false,
+            is_first_split: true,
+            is_last_split: false,
             default_font_index: None,
         }
     }
 
     pub(crate) fn split_around_block(&self) -> Self {
         Self {
-            style: self.style.clone(),
-            is_first_fragment: false,
-            is_last_fragment: false,
+            base: LayoutBoxBase::new(self.base.base_fragment_info, self.base.style.clone()),
+            shared_inline_styles: self.shared_inline_styles.clone(),
+            is_first_split: false,
+            is_last_split: false,
             ..*self
         }
     }
 
     #[inline]
     pub(crate) fn layout_style(&self) -> LayoutStyle {
-        LayoutStyle::Default(&self.style)
+        LayoutStyle::Default(&self.base.style)
+    }
+
+    pub(crate) fn repair_style(
+        &mut self,
+        node: &ServoLayoutNode,
+        new_style: &ServoArc<ComputedValues>,
+    ) {
+        self.base.repair_style(new_style);
+        *self.shared_inline_styles.style.borrow_mut() = new_style.clone();
+        *self.shared_inline_styles.selected.borrow_mut() = node.to_threadsafe().selected_style();
     }
 }
 
-#[derive(Debug, Default)]
+#[derive(Debug, Default, MallocSizeOf)]
 pub(crate) struct InlineBoxes {
     /// A collection of all inline boxes in a particular [`super::InlineFormattingContext`].
     inline_boxes: Vec<ArcRefCell<InlineBox>>,
@@ -76,6 +99,10 @@ impl InlineBoxes {
         self.inline_boxes.len()
     }
 
+    pub(super) fn iter(&self) -> impl Iterator<Item = &ArcRefCell<InlineBox>> {
+        self.inline_boxes.iter()
+    }
+
     pub(super) fn get(&self, identifier: &InlineBoxIdentifier) -> ArcRefCell<InlineBox> {
         self.inline_boxes[identifier.index_in_inline_boxes as usize].clone()
     }
@@ -161,7 +188,7 @@ impl InlineBoxes {
     }
 }
 
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq)]
 pub(super) enum InlineBoxTreePathToken {
     Start(InlineBoxIdentifier),
     End(InlineBoxIdentifier),
@@ -182,7 +209,7 @@ impl InlineBoxTreePathToken {
 /// [`u32`] is used for the index, in order to save space. The value refers to the token
 /// in the start tree data structure which can be fetched to find the actual index of
 /// of the [`InlineBox`] in [`InlineBoxes::inline_boxes`].
-#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, MallocSizeOf, PartialEq)]
 pub(crate) struct InlineBoxIdentifier {
     pub index_of_start_in_tree: u32,
     pub index_in_inline_boxes: u32,
@@ -218,7 +245,7 @@ impl InlineBoxContainerState {
         is_last_fragment: bool,
         font_metrics: Option<&FontMetrics>,
     ) -> Self {
-        let style = inline_box.style.clone();
+        let style = inline_box.base.style.clone();
         let pbm = inline_box
             .layout_style()
             .padding_border_margin(containing_block);
@@ -237,7 +264,7 @@ impl InlineBoxContainerState {
                 font_metrics,
             ),
             identifier: inline_box.identifier,
-            base_fragment_info: inline_box.base_fragment_info,
+            base_fragment_info: inline_box.base.base_fragment_info,
             pbm,
             is_last_fragment,
         }
diff --git a/components/layout_2020/flow/inline/line.rs b/components/layout/flow/inline/line.rs
similarity index 92%
rename from components/layout_2020/flow/inline/line.rs
rename to components/layout/flow/inline/line.rs
index 420d79ead9f..3b92078d67d 100644
--- a/components/layout_2020/flow/inline/line.rs
+++ b/components/layout/flow/inline/line.rs
@@ -4,9 +4,9 @@
 
 use app_units::Au;
 use bitflags::bitflags;
-use fonts::{FontMetrics, GlyphStore};
+use fonts::{ByteIndex, FontMetrics, GlyphStore};
 use itertools::Either;
-use servo_arc::Arc;
+use range::Range;
 use style::Zero;
 use style::computed_values::position::T as Position;
 use style::computed_values::white_space_collapse::T as WhiteSpaceCollapse;
@@ -20,11 +20,9 @@ use unicode_bidi::{BidiInfo, Level};
 use webrender_api::FontInstanceKey;
 
 use super::inline_box::{InlineBoxContainerState, InlineBoxIdentifier, InlineBoxTreePathToken};
-use super::{InlineFormattingContextLayout, LineBlockSizes};
+use super::{InlineFormattingContextLayout, LineBlockSizes, SharedInlineStyles};
 use crate::cell::ArcRefCell;
-use crate::fragment_tree::{
-    BaseFragmentInfo, BoxFragment, CollapsedBlockMargins, Fragment, TextFragment,
-};
+use crate::fragment_tree::{BaseFragmentInfo, BoxFragment, Fragment, TextFragment};
 use crate::geom::{LogicalRect, LogicalVec2, PhysicalRect, ToLogical};
 use crate::positioned::{
     AbsolutelyPositionedBox, PositioningContext, PositioningContextLength, relative_adjustement,
@@ -327,13 +325,12 @@ impl LineItemLayout<'_, '_> {
         let inline_box = self.layout.ifc.inline_boxes.get(identifier);
         let inline_box = &*(inline_box.borrow());
 
-        let style = &inline_box.style;
         let space_above_baseline = inline_box_state.calculate_space_above_baseline();
         let block_start_offset =
             self.calculate_inline_box_block_start(inline_box_state, space_above_baseline);
 
         let positioning_context_or_start_offset_in_parent =
-            match PositioningContext::new_for_style(style) {
+            match PositioningContext::new_for_layout_box_base(&inline_box.base) {
                 Some(positioning_context) => Either::Left(positioning_context),
                 None => Either::Right(self.current_positioning_context_mut().len()),
             };
@@ -379,7 +376,7 @@ impl LineItemLayout<'_, '_> {
 
         let containing_block_writing_mode = self.layout.containing_block.style.writing_mode;
         if containing_block_writing_mode.is_bidi_ltr() !=
-            inline_box.style.writing_mode.is_bidi_ltr()
+            inline_box.base.style.writing_mode.is_bidi_ltr()
         {
             std::mem::swap(&mut had_start, &mut had_end)
         }
@@ -419,7 +416,7 @@ impl LineItemLayout<'_, '_> {
 
         // Relative adjustment should not affect the rest of line layout, so we can
         // do it right before creating the Fragment.
-        let style = &inline_box.style;
+        let style = &inline_box.base.style;
         if style.get_box().position == Position::Relative {
             content_rect.start_corner += relative_adjustement(style, self.layout.containing_block);
         }
@@ -456,7 +453,7 @@ impl LineItemLayout<'_, '_> {
         // but they need to be made relative to this fragment.
         let physical_content_rect = content_rect.as_physical(Some(self.layout.containing_block));
         let mut fragment = BoxFragment::new(
-            inline_box.base_fragment_info,
+            inline_box.base.base_fragment_info,
             style.clone(),
             fragments,
             physical_content_rect,
@@ -464,7 +461,6 @@ impl LineItemLayout<'_, '_> {
             border.to_physical(ifc_writing_mode),
             margin.to_physical(ifc_writing_mode),
             None, /* clearance */
-            CollapsedBlockMargins::zero(),
         );
 
         let offset_from_parent_ifc = LogicalVec2 {
@@ -494,9 +490,11 @@ impl LineItemLayout<'_, '_> {
         }
 
         self.current_state.inline_advance += inner_state.inline_advance + pbm_sums.inline_sum();
-        self.current_state
-            .fragments
-            .push((Fragment::Box(ArcRefCell::new(fragment)), content_rect));
+
+        let fragment = Fragment::Box(ArcRefCell::new(fragment));
+        inline_box.base.add_fragment(fragment.clone());
+
+        self.current_state.fragments.push((fragment, content_rect));
     }
 
     fn calculate_inline_box_block_start(
@@ -569,13 +567,14 @@ impl LineItemLayout<'_, '_> {
         self.current_state.fragments.push((
             Fragment::Text(ArcRefCell::new(TextFragment {
                 base: text_item.base_fragment_info.into(),
-                parent_style: text_item.parent_style,
+                inline_styles: text_item.inline_styles.clone(),
                 rect: PhysicalRect::zero(),
                 font_metrics: text_item.font_metrics,
                 font_key: text_item.font_key,
                 glyphs: text_item.text,
                 text_decoration_line: text_item.text_decoration_line,
                 justification_adjustment: self.justification_adjustment,
+                selection_range: text_item.selection_range,
             })),
             content_rect,
         ));
@@ -587,32 +586,34 @@ impl LineItemLayout<'_, '_> {
         // This needs to be added to the calculated block and inline positions.
         // Make the final result relative to the parent box.
         let ifc_writing_mode = self.layout.containing_block.style.writing_mode;
-        let padding_border_margin_sides = atomic
-            .fragment
-            .padding_border_margin()
-            .to_logical(ifc_writing_mode);
+        let content_rect = {
+            let block_start = atomic.calculate_block_start(&self.line_metrics);
+            let atomic_fragment = atomic.fragment.borrow_mut();
+            let padding_border_margin_sides = atomic_fragment
+                .padding_border_margin()
+                .to_logical(ifc_writing_mode);
 
-        let mut atomic_offset = LogicalVec2 {
-            inline: self.current_state.inline_advance + padding_border_margin_sides.inline_start,
-            block: atomic.calculate_block_start(&self.line_metrics) -
-                self.current_state.parent_offset.block +
-                padding_border_margin_sides.block_start,
-        };
+            let mut atomic_offset = LogicalVec2 {
+                inline: self.current_state.inline_advance +
+                    padding_border_margin_sides.inline_start,
+                block: block_start - self.current_state.parent_offset.block +
+                    padding_border_margin_sides.block_start,
+            };
 
-        if atomic.fragment.style.get_box().position == Position::Relative {
-            atomic_offset +=
-                relative_adjustement(&atomic.fragment.style, self.layout.containing_block);
-        }
+            if atomic_fragment.style.get_box().position == Position::Relative {
+                atomic_offset +=
+                    relative_adjustement(&atomic_fragment.style, self.layout.containing_block);
+            }
 
-        // Reconstruct a logical rectangle relative to the inline box container that will be used
-        // after the inline box is procesed to find a final physical rectangle.
-        let content_rect = LogicalRect {
-            start_corner: atomic_offset,
-            size: atomic
-                .fragment
-                .content_rect
-                .size
-                .to_logical(ifc_writing_mode),
+            // Reconstruct a logical rectangle relative to the inline box container that will be used
+            // after the inline box is procesed to find a final physical rectangle.
+            LogicalRect {
+                start_corner: atomic_offset,
+                size: atomic_fragment
+                    .content_rect
+                    .size
+                    .to_logical(ifc_writing_mode),
+            }
         };
 
         if let Some(mut positioning_context) = atomic.positioning_context {
@@ -628,10 +629,10 @@ impl LineItemLayout<'_, '_> {
         }
 
         self.current_state.inline_advance += atomic.size.inline;
-        self.current_state.fragments.push((
-            Fragment::Box(ArcRefCell::new(atomic.fragment)),
-            content_rect,
-        ));
+
+        self.current_state
+            .fragments
+            .push((Fragment::Box(atomic.fragment), content_rect));
     }
 
     fn layout_absolute(&mut self, absolute: AbsolutelyPositionedLineItem) {
@@ -691,7 +692,7 @@ impl LineItemLayout<'_, '_> {
         ));
     }
 
-    fn layout_float(&mut self, mut float: FloatLineItem) {
+    fn layout_float(&mut self, float: FloatLineItem) {
         self.current_state
             .flags
             .insert(LineLayoutInlineContainerFlags::HAD_ANY_FLOATS);
@@ -705,13 +706,12 @@ impl LineItemLayout<'_, '_> {
             inline: self.current_state.parent_offset.inline,
             block: self.line_metrics.block_offset + self.current_state.parent_offset.block,
         };
-        float.fragment.content_rect.origin -= distance_from_parent_to_ifc
+        float.fragment.borrow_mut().content_rect.origin -= distance_from_parent_to_ifc
             .to_physical_size(self.layout.containing_block.style.writing_mode);
 
-        self.current_state.fragments.push((
-            Fragment::Float(ArcRefCell::new(float.fragment)),
-            LogicalRect::zero(),
-        ));
+        self.current_state
+            .fragments
+            .push((Fragment::Float(float.fragment), LogicalRect::zero()));
     }
 }
 
@@ -761,19 +761,24 @@ impl LineItem {
 
 pub(super) struct TextRunLineItem {
     pub base_fragment_info: BaseFragmentInfo,
-    pub parent_style: Arc<ComputedValues>,
+    pub inline_styles: SharedInlineStyles,
     pub text: Vec<std::sync::Arc<GlyphStore>>,
     pub font_metrics: FontMetrics,
     pub font_key: FontInstanceKey,
     pub text_decoration_line: TextDecorationLine,
     /// The BiDi level of this [`TextRunLineItem`] to enable reordering.
     pub bidi_level: Level,
+    pub selection_range: Option<Range<ByteIndex>>,
 }
 
 impl TextRunLineItem {
     fn trim_whitespace_at_end(&mut self, whitespace_trimmed: &mut Au) -> bool {
         if matches!(
-            self.parent_style.get_inherited_text().white_space_collapse,
+            self.inline_styles
+                .style
+                .borrow()
+                .get_inherited_text()
+                .white_space_collapse,
             WhiteSpaceCollapse::Preserve | WhiteSpaceCollapse::BreakSpaces
         ) {
             return false;
@@ -799,7 +804,11 @@ impl TextRunLineItem {
 
     fn trim_whitespace_at_start(&mut self, whitespace_trimmed: &mut Au) -> bool {
         if matches!(
-            self.parent_style.get_inherited_text().white_space_collapse,
+            self.inline_styles
+                .style
+                .borrow()
+                .get_inherited_text()
+                .white_space_collapse,
             WhiteSpaceCollapse::Preserve | WhiteSpaceCollapse::BreakSpaces
         ) {
             return false;
@@ -827,7 +836,7 @@ impl TextRunLineItem {
 }
 
 pub(super) struct AtomicLineItem {
-    pub fragment: BoxFragment,
+    pub fragment: ArcRefCell<BoxFragment>,
     pub size: LogicalVec2<Au>,
     pub positioning_context: Option<PositioningContext>,
 
@@ -847,7 +856,7 @@ impl AtomicLineItem {
     /// Given the metrics for a line, our vertical alignment, and our block size, find a block start
     /// position relative to the top of the line.
     fn calculate_block_start(&self, line_metrics: &LineMetrics) -> Au {
-        match self.fragment.style.clone_vertical_align() {
+        match self.fragment.borrow().style.clone_vertical_align() {
             GenericVerticalAlign::Keyword(VerticalAlignKeyword::Top) => Au::zero(),
             GenericVerticalAlign::Keyword(VerticalAlignKeyword::Bottom) => {
                 line_metrics.block_size - self.size.block
@@ -867,7 +876,7 @@ pub(super) struct AbsolutelyPositionedLineItem {
 }
 
 pub(super) struct FloatLineItem {
-    pub fragment: BoxFragment,
+    pub fragment: ArcRefCell<BoxFragment>,
     /// Whether or not this float Fragment has been placed yet. Fragments that
     /// do not fit on a line need to be placed after the hypothetical block start
     /// of the next line.
diff --git a/components/layout_2020/flow/inline/line_breaker.rs b/components/layout/flow/inline/line_breaker.rs
similarity index 100%
rename from components/layout_2020/flow/inline/line_breaker.rs
rename to components/layout/flow/inline/line_breaker.rs
diff --git a/components/layout/flow/inline/mod.rs b/components/layout/flow/inline/mod.rs
new file mode 100644
index 00000000000..7e69aa1aaae
--- /dev/null
+++ b/components/layout/flow/inline/mod.rs
@@ -0,0 +1,2577 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! # Inline Formatting Context Layout
+//!
+//! Inline layout is divided into three phases:
+//!
+//! 1. Box Tree Construction
+//! 2. Box to Line Layout
+//! 3. Line to Fragment Layout
+//!
+//! The first phase happens during normal box tree constrution, while the second two phases happen
+//! during fragment tree construction (sometimes called just "layout").
+//!
+//! ## Box Tree Construction
+//!
+//! During box tree construction, DOM elements are transformed into a box tree. This phase collects
+//! all of the inline boxes, text, atomic inline elements (boxes with `display: inline-block` or
+//! `display: inline-table` as well as things like images and canvas), absolutely positioned blocks,
+//! and floated blocks.
+//!
+//! During the last part of this phase, whitespace is collapsed and text is segmented into
+//! [`TextRun`]s based on script, chosen font, and line breaking opportunities. In addition, default
+//! fonts are selected for every inline box. Each segment of text is shaped using HarfBuzz and
+//! turned into a series of glyphs, which all have a size and a position relative to the origin of
+//! the [`TextRun`] (calculated in later phases).
+//!
+//! The code for this phase is mainly in `construct.rs`, but text handling can also be found in
+//! `text_runs.rs.`
+//!
+//! ## Box to Line Layout
+//!
+//! During the first phase of fragment tree construction, box tree items are laid out into
+//! [`LineItem`]s and fragmented based on line boundaries. This is where line breaking happens. This
+//! part of layout fragments boxes and their contents across multiple lines while positioning floats
+//! and making sure non-floated contents flow around them. In addition, all atomic elements are laid
+//! out, which may descend into their respective trees and create fragments. Finally, absolutely
+//! positioned content is collected in order to later hoist it to the containing block for
+//! absolutes.
+//!
+//! Note that during this phase, layout does not know the final block position of content. Only
+//! during line to fragment layout, are the final block positions calculated based on the line's
+//! final content and its vertical alignment. Instead, positions and line heights are calculated
+//! relative to the line's final baseline which will be determined in the final phase.
+//!
+//! [`LineItem`]s represent a particular set of content on a line. Currently this is represented by
+//! a linear series of items that describe the line's hierarchy of inline boxes and content. The
+//! item types are:
+//!
+//!  - [`LineItem::InlineStartBoxPaddingBorderMargin`]
+//!  - [`LineItem::InlineEndBoxPaddingBorderMargin`]
+//!  - [`LineItem::TextRun`]
+//!  - [`LineItem::Atomic`]
+//!  - [`LineItem::AbsolutelyPositioned`]
+//!  - [`LineItem::Float`]
+//!
+//! The code for this can be found by looking for methods of the form `layout_into_line_item()`.
+//!
+//! ## Line to Fragment Layout
+//!
+//! During the second phase of fragment tree construction, the final block position of [`LineItem`]s
+//! is calculated and they are converted into [`Fragment`]s. After layout, the [`LineItem`]s are
+//! discarded and the new fragments are incorporated into the fragment tree. The final static
+//! position of absolutely positioned content is calculated and it is hoisted to its containing
+//! block via [`PositioningContext`].
+//!
+//! The code for this phase, can mainly be found in `line.rs`.
+//!
+
+pub mod construct;
+pub mod inline_box;
+pub mod line;
+mod line_breaker;
+pub mod text_run;
+
+use std::cell::{OnceCell, RefCell};
+use std::mem;
+use std::rc::Rc;
+
+use app_units::{Au, MAX_AU};
+use bitflags::bitflags;
+use construct::InlineFormattingContextBuilder;
+use fonts::{ByteIndex, FontMetrics, GlyphStore};
+use inline_box::{InlineBox, InlineBoxContainerState, InlineBoxIdentifier, InlineBoxes};
+use line::{
+    AbsolutelyPositionedLineItem, AtomicLineItem, FloatLineItem, LineItem, LineItemLayout,
+    TextRunLineItem,
+};
+use line_breaker::LineBreaker;
+use malloc_size_of_derive::MallocSizeOf;
+use range::Range;
+use script::layout_dom::ServoLayoutNode;
+use servo_arc::Arc;
+use style::Zero;
+use style::computed_values::text_wrap_mode::T as TextWrapMode;
+use style::computed_values::vertical_align::T as VerticalAlign;
+use style::computed_values::white_space_collapse::T as WhiteSpaceCollapse;
+use style::context::{QuirksMode, SharedStyleContext};
+use style::properties::ComputedValues;
+use style::properties::style_structs::InheritedText;
+use style::values::generics::box_::VerticalAlignKeyword;
+use style::values::generics::font::LineHeight;
+use style::values::specified::box_::BaselineSource;
+use style::values::specified::text::{TextAlignKeyword, TextDecorationLine};
+use style::values::specified::{TextAlignLast, TextJustify};
+use text_run::{
+    TextRun, XI_LINE_BREAKING_CLASS_GL, XI_LINE_BREAKING_CLASS_WJ, XI_LINE_BREAKING_CLASS_ZWJ,
+    add_or_get_font, get_font_for_first_font_for_style,
+};
+use unicode_bidi::{BidiInfo, Level};
+use webrender_api::FontInstanceKey;
+use xi_unicode::linebreak_property;
+
+use super::float::{Clear, PlacementAmongFloats};
+use super::{
+    CacheableLayoutResult, IndependentFloatOrAtomicLayoutResult,
+    IndependentFormattingContextContents,
+};
+use crate::cell::ArcRefCell;
+use crate::context::LayoutContext;
+use crate::dom_traversal::NodeAndStyleInfo;
+use crate::flow::CollapsibleWithParentStartMargin;
+use crate::flow::float::{FloatBox, SequentialLayoutState};
+use crate::formatting_contexts::{
+    Baselines, IndependentFormattingContext, IndependentNonReplacedContents,
+};
+use crate::fragment_tree::{
+    BoxFragment, CollapsedBlockMargins, CollapsedMargin, Fragment, FragmentFlags,
+    PositioningFragment,
+};
+use crate::geom::{LogicalRect, LogicalVec2, ToLogical};
+use crate::positioned::{AbsolutelyPositionedBox, PositioningContext};
+use crate::sizing::{ComputeInlineContentSizes, ContentSizes, InlineContentSizesResult};
+use crate::style_ext::{ComputedValuesExt, PaddingBorderMargin};
+use crate::{ConstraintSpace, ContainingBlock, PropagatedBoxTreeData, SharedStyle};
+
+// From gfxFontConstants.h in Firefox.
+static FONT_SUBSCRIPT_OFFSET_RATIO: f32 = 0.20;
+static FONT_SUPERSCRIPT_OFFSET_RATIO: f32 = 0.34;
+
+#[derive(Debug, MallocSizeOf)]
+pub(crate) struct InlineFormattingContext {
+    /// All [`InlineItem`]s in this [`InlineFormattingContext`] stored in a flat array.
+    /// [`InlineItem::StartInlineBox`] and [`InlineItem::EndInlineBox`] allow representing
+    /// the tree of inline boxes within the formatting context, but a flat array allows
+    /// easy iteration through all inline items.
+    pub(super) inline_items: Vec<ArcRefCell<InlineItem>>,
+
+    /// The tree of inline boxes in this [`InlineFormattingContext`]. These are stored in
+    /// a flat array with each being given a [`InlineBoxIdentifier`].
+    pub(super) inline_boxes: InlineBoxes,
+
+    /// The text content of this inline formatting context.
+    pub(super) text_content: String,
+
+    /// A store of font information for all the shaped segments in this formatting
+    /// context in order to avoid duplicating this information.
+    pub font_metrics: Vec<FontKeyAndMetrics>,
+
+    pub(super) text_decoration_line: TextDecorationLine,
+
+    /// Whether this IFC contains the 1st formatted line of an element:
+    /// <https://www.w3.org/TR/css-pseudo-4/#first-formatted-line>.
+    pub(super) has_first_formatted_line: bool,
+
+    /// Whether or not this [`InlineFormattingContext`] contains floats.
+    pub(super) contains_floats: bool,
+
+    /// Whether or not this is an [`InlineFormattingContext`] for a single line text input.
+    pub(super) is_single_line_text_input: bool,
+
+    /// Whether or not this is an [`InlineFormattingContext`] has right-to-left content, which
+    /// will require reordering during layout.
+    pub(super) has_right_to_left_content: bool,
+}
+
+/// [`TextRun`] and `TextFragment`s need a handle on their parent inline box (or inline
+/// formatting context root)'s style. In order to implement incremental layout, these are
+/// wrapped in [`SharedStyle`]. This allows updating the parent box tree element without
+/// updating every single descendant box tree node and fragment.
+#[derive(Clone, Debug, MallocSizeOf)]
+pub(crate) struct SharedInlineStyles {
+    pub style: SharedStyle,
+    pub selected: SharedStyle,
+}
+
+impl From<&NodeAndStyleInfo<'_>> for SharedInlineStyles {
+    fn from(info: &NodeAndStyleInfo) -> Self {
+        Self {
+            style: SharedStyle::new(info.style.clone()),
+            selected: SharedStyle::new(info.get_selected_style()),
+        }
+    }
+}
+
+/// A collection of data used to cache [`FontMetrics`] in the [`InlineFormattingContext`]
+#[derive(Debug, MallocSizeOf)]
+pub(crate) struct FontKeyAndMetrics {
+    pub key: FontInstanceKey,
+    pub pt_size: Au,
+    pub metrics: FontMetrics,
+}
+
+#[derive(Debug, MallocSizeOf)]
+pub(crate) enum InlineItem {
+    StartInlineBox(ArcRefCell<InlineBox>),
+    EndInlineBox,
+    TextRun(ArcRefCell<TextRun>),
+    OutOfFlowAbsolutelyPositionedBox(
+        ArcRefCell<AbsolutelyPositionedBox>,
+        usize, /* offset_in_text */
+    ),
+    OutOfFlowFloatBox(ArcRefCell<FloatBox>),
+    Atomic(
+        ArcRefCell<IndependentFormattingContext>,
+        usize, /* offset_in_text */
+        Level, /* bidi_level */
+    ),
+}
+
+impl InlineItem {
+    pub(crate) fn repair_style(
+        &self,
+        context: &SharedStyleContext,
+        node: &ServoLayoutNode,
+        new_style: &Arc<ComputedValues>,
+    ) {
+        match self {
+            InlineItem::StartInlineBox(inline_box) => {
+                inline_box.borrow_mut().repair_style(node, new_style);
+            },
+            InlineItem::EndInlineBox => {},
+            // TextRun holds a handle the `InlineSharedStyles` which is updated when repairing inline box
+            // and `display: contents` styles.
+            InlineItem::TextRun(..) => {},
+            InlineItem::OutOfFlowAbsolutelyPositionedBox(positioned_box, ..) => positioned_box
+                .borrow_mut()
+                .context
+                .repair_style(context, new_style),
+            InlineItem::OutOfFlowFloatBox(float_box) => float_box
+                .borrow_mut()
+                .contents
+                .repair_style(context, new_style),
+            InlineItem::Atomic(atomic, ..) => atomic.borrow_mut().repair_style(context, new_style),
+        }
+    }
+
+    pub(crate) fn invalidate_cached_fragment(&self) {
+        match self {
+            InlineItem::StartInlineBox(inline_box) => {
+                inline_box.borrow().base.invalidate_cached_fragment()
+            },
+            InlineItem::EndInlineBox | InlineItem::TextRun(..) => {},
+            InlineItem::OutOfFlowAbsolutelyPositionedBox(positioned_box, ..) => {
+                positioned_box
+                    .borrow()
+                    .context
+                    .base
+                    .invalidate_cached_fragment();
+            },
+            InlineItem::OutOfFlowFloatBox(float_box) => float_box
+                .borrow()
+                .contents
+                .base
+                .invalidate_cached_fragment(),
+            InlineItem::Atomic(independent_formatting_context, ..) => {
+                independent_formatting_context
+                    .borrow()
+                    .base
+                    .invalidate_cached_fragment();
+            },
+        }
+    }
+
+    pub(crate) fn fragments(&self) -> Vec<Fragment> {
+        match self {
+            InlineItem::StartInlineBox(inline_box) => inline_box.borrow().base.fragments(),
+            InlineItem::EndInlineBox | InlineItem::TextRun(..) => {
+                unreachable!("Should never have these kind of fragments attached to a DOM node")
+            },
+            InlineItem::OutOfFlowAbsolutelyPositionedBox(positioned_box, ..) => {
+                positioned_box.borrow().context.base.fragments()
+            },
+            InlineItem::OutOfFlowFloatBox(float_box) => {
+                float_box.borrow().contents.base.fragments()
+            },
+            InlineItem::Atomic(independent_formatting_context, ..) => {
+                independent_formatting_context.borrow().base.fragments()
+            },
+        }
+    }
+}
+
+/// Information about the current line under construction for a particular
+/// [`InlineFormattingContextLayout`]. This tracks position and size information while
+/// [`LineItem`]s are collected and is used as input when those [`LineItem`]s are
+/// converted into [`Fragment`]s during the final phase of line layout. Note that this
+/// does not store the [`LineItem`]s themselves, as they are stored as part of the
+/// nesting state in the [`InlineFormattingContextLayout`].
+struct LineUnderConstruction {
+    /// The position where this line will start once it is laid out. This includes any
+    /// offset from `text-indent`.
+    start_position: LogicalVec2<Au>,
+
+    /// The current inline position in the line being laid out into [`LineItem`]s in this
+    /// [`InlineFormattingContext`] independent of the depth in the nesting level.
+    inline_position: Au,
+
+    /// The maximum block size of all boxes that ended and are in progress in this line.
+    /// This uses [`LineBlockSizes`] instead of a simple value, because the final block size
+    /// depends on vertical alignment.
+    max_block_size: LineBlockSizes,
+
+    /// Whether any active linebox has added a glyph or atomic element to this line, which
+    /// indicates that the next run that exceeds the line length can cause a line break.
+    has_content: bool,
+
+    /// Whether or not there are floats that did not fit on the current line. Before
+    /// the [`LineItem`]s of this line are laid out, these floats will need to be
+    /// placed directly below this line, but still as children of this line's Fragments.
+    has_floats_waiting_to_be_placed: bool,
+
+    /// A rectangular area (relative to the containing block / inline formatting
+    /// context boundaries) where we can fit the line box without overlapping floats.
+    /// Note that when this is not empty, its start corner takes precedence over
+    /// [`LineUnderConstruction::start_position`].
+    placement_among_floats: OnceCell<LogicalRect<Au>>,
+
+    /// The LineItems for the current line under construction that have already
+    /// been committed to this line.
+    line_items: Vec<LineItem>,
+}
+
+impl LineUnderConstruction {
+    fn new(start_position: LogicalVec2<Au>) -> Self {
+        Self {
+            inline_position: start_position.inline,
+            start_position,
+            max_block_size: LineBlockSizes::zero(),
+            has_content: false,
+            has_floats_waiting_to_be_placed: false,
+            placement_among_floats: OnceCell::new(),
+            line_items: Vec::new(),
+        }
+    }
+
+    fn line_block_start_considering_placement_among_floats(&self) -> Au {
+        match self.placement_among_floats.get() {
+            Some(placement_among_floats) => placement_among_floats.start_corner.block,
+            None => self.start_position.block,
+        }
+    }
+
+    fn replace_placement_among_floats(&mut self, new_placement: LogicalRect<Au>) {
+        self.placement_among_floats.take();
+        let _ = self.placement_among_floats.set(new_placement);
+    }
+
+    /// Trim the trailing whitespace in this line and return the width of the whitespace trimmed.
+    fn trim_trailing_whitespace(&mut self) -> Au {
+        // From <https://www.w3.org/TR/css-text-3/#white-space-phase-2>:
+        // > 3. A sequence of collapsible spaces at the end of a line is removed,
+        // >    as well as any trailing U+1680   OGHAM SPACE MARK whose white-space
+        // >    property is normal, nowrap, or pre-line.
+        let mut whitespace_trimmed = Au::zero();
+        for item in self.line_items.iter_mut().rev() {
+            if !item.trim_whitespace_at_end(&mut whitespace_trimmed) {
+                break;
+            }
+        }
+
+        whitespace_trimmed
+    }
+
+    /// Count the number of justification opportunities in this line.
+    fn count_justification_opportunities(&self) -> usize {
+        self.line_items
+            .iter()
+            .filter_map(|item| match item {
+                LineItem::TextRun(_, text_run) => Some(
+                    text_run
+                        .text
+                        .iter()
+                        .map(|glyph_store| glyph_store.total_word_separators())
+                        .sum::<usize>(),
+                ),
+                _ => None,
+            })
+            .sum()
+    }
+}
+
+/// A block size relative to a line's final baseline. This is to track the size
+/// contribution of a particular element of a line above and below the baseline.
+/// These sizes can be combined with other baseline relative sizes before the
+/// final baseline position is known. The values here are relative to the
+/// overall line's baseline and *not* the nested baseline of an inline box.
+#[derive(Clone, Debug)]
+struct BaselineRelativeSize {
+    /// The ascent above the baseline, where a positive value means a larger
+    /// ascent. Thus, the top of this size contribution is `baseline_offset -
+    /// ascent`.
+    ascent: Au,
+
+    /// The descent below the baseline, where a positive value means a larger
+    /// descent. Thus, the bottom of this size contribution is `baseline_offset +
+    /// descent`.
+    descent: Au,
+}
+
+impl BaselineRelativeSize {
+    fn zero() -> Self {
+        Self {
+            ascent: Au::zero(),
+            descent: Au::zero(),
+        }
+    }
+
+    fn max(&self, other: &Self) -> Self {
+        BaselineRelativeSize {
+            ascent: self.ascent.max(other.ascent),
+            descent: self.descent.max(other.descent),
+        }
+    }
+
+    /// Given an offset from the line's root baseline, adjust this [`BaselineRelativeSize`]
+    /// by that offset. This is used to adjust a [`BaselineRelativeSize`] for different kinds
+    /// of baseline-relative `vertical-align`. This will "move" measured size of a particular
+    /// inline box's block size. For example, in the following HTML:
+    ///
+    /// ```html
+    ///     <div>
+    ///         <span style="vertical-align: 5px">child content</span>
+    ///     </div>
+    /// ````
+    ///
+    /// If this [`BaselineRelativeSize`] is for the `<span>` then the adjustment
+    /// passed here would be equivalent to -5px.
+    fn adjust_for_nested_baseline_offset(&mut self, baseline_offset: Au) {
+        self.ascent -= baseline_offset;
+        self.descent += baseline_offset;
+    }
+}
+
+#[derive(Clone, Debug)]
+struct LineBlockSizes {
+    line_height: Au,
+    baseline_relative_size_for_line_height: Option<BaselineRelativeSize>,
+    size_for_baseline_positioning: BaselineRelativeSize,
+}
+
+impl LineBlockSizes {
+    fn zero() -> Self {
+        LineBlockSizes {
+            line_height: Au::zero(),
+            baseline_relative_size_for_line_height: None,
+            size_for_baseline_positioning: BaselineRelativeSize::zero(),
+        }
+    }
+
+    fn resolve(&self) -> Au {
+        let height_from_ascent_and_descent = self
+            .baseline_relative_size_for_line_height
+            .as_ref()
+            .map(|size| (size.ascent + size.descent).abs())
+            .unwrap_or_else(Au::zero);
+        self.line_height.max(height_from_ascent_and_descent)
+    }
+
+    fn max(&self, other: &LineBlockSizes) -> LineBlockSizes {
+        let baseline_relative_size = match (
+            self.baseline_relative_size_for_line_height.as_ref(),
+            other.baseline_relative_size_for_line_height.as_ref(),
+        ) {
+            (Some(our_size), Some(other_size)) => Some(our_size.max(other_size)),
+            (our_size, other_size) => our_size.or(other_size).cloned(),
+        };
+        Self {
+            line_height: self.line_height.max(other.line_height),
+            baseline_relative_size_for_line_height: baseline_relative_size,
+            size_for_baseline_positioning: self
+                .size_for_baseline_positioning
+                .max(&other.size_for_baseline_positioning),
+        }
+    }
+
+    fn max_assign(&mut self, other: &LineBlockSizes) {
+        *self = self.max(other);
+    }
+
+    fn adjust_for_baseline_offset(&mut self, baseline_offset: Au) {
+        if let Some(size) = self.baseline_relative_size_for_line_height.as_mut() {
+            size.adjust_for_nested_baseline_offset(baseline_offset)
+        }
+        self.size_for_baseline_positioning
+            .adjust_for_nested_baseline_offset(baseline_offset);
+    }
+
+    /// From <https://drafts.csswg.org/css2/visudet.html#line-height>:
+    ///  > The inline-level boxes are aligned vertically according to their 'vertical-align'
+    ///  > property. In case they are aligned 'top' or 'bottom', they must be aligned so as
+    ///  > to minimize the line box height. If such boxes are tall enough, there are multiple
+    ///  > solutions and CSS 2 does not define the position of the line box's baseline (i.e.,
+    ///  > the position of the strut, see below).
+    fn find_baseline_offset(&self) -> Au {
+        match self.baseline_relative_size_for_line_height.as_ref() {
+            Some(size) => size.ascent,
+            None => {
+                // This is the case mentinoned above where there are multiple solutions.
+                // This code is putting the baseline roughly in the middle of the line.
+                let leading = self.resolve() -
+                    (self.size_for_baseline_positioning.ascent +
+                        self.size_for_baseline_positioning.descent);
+                leading.scale_by(0.5) + self.size_for_baseline_positioning.ascent
+            },
+        }
+    }
+}
+
+/// The current unbreakable segment under construction for an inline formatting context.
+/// Items accumulate here until we reach a soft line break opportunity during processing
+/// of inline content or we reach the end of the formatting context.
+struct UnbreakableSegmentUnderConstruction {
+    /// The size of this unbreakable segment in both dimension.
+    inline_size: Au,
+
+    /// The maximum block size that this segment has. This uses [`LineBlockSizes`] instead of a
+    /// simple value, because the final block size depends on vertical alignment.
+    max_block_size: LineBlockSizes,
+
+    /// The LineItems for the segment under construction
+    line_items: Vec<LineItem>,
+
+    /// The depth in the inline box hierarchy at the start of this segment. This is used
+    /// to prefix this segment when it is pushed to a new line.
+    inline_box_hierarchy_depth: Option<usize>,
+
+    /// Whether any active linebox has added a glyph or atomic element to this line
+    /// segment, which indicates that the next run that exceeds the line length can cause
+    /// a line break.
+    has_content: bool,
+
+    /// The inline size of any trailing whitespace in this segment.
+    trailing_whitespace_size: Au,
+}
+
+impl UnbreakableSegmentUnderConstruction {
+    fn new() -> Self {
+        Self {
+            inline_size: Au::zero(),
+            max_block_size: LineBlockSizes {
+                line_height: Au::zero(),
+                baseline_relative_size_for_line_height: None,
+                size_for_baseline_positioning: BaselineRelativeSize::zero(),
+            },
+            line_items: Vec::new(),
+            inline_box_hierarchy_depth: None,
+            has_content: false,
+            trailing_whitespace_size: Au::zero(),
+        }
+    }
+
+    /// Reset this segment after its contents have been committed to a line.
+    fn reset(&mut self) {
+        assert!(self.line_items.is_empty()); // Preserve allocated memory.
+        self.inline_size = Au::zero();
+        self.max_block_size = LineBlockSizes::zero();
+        self.inline_box_hierarchy_depth = None;
+        self.has_content = false;
+        self.trailing_whitespace_size = Au::zero();
+    }
+
+    /// Push a single line item to this segment. In addition, record the inline box
+    /// hierarchy depth if this is the first segment. The hierarchy depth is used to
+    /// duplicate the necessary `StartInlineBox` tokens if this segment is ultimately
+    /// placed on a new empty line.
+    fn push_line_item(&mut self, line_item: LineItem, inline_box_hierarchy_depth: usize) {
+        if self.line_items.is_empty() {
+            self.inline_box_hierarchy_depth = Some(inline_box_hierarchy_depth);
+        }
+        self.line_items.push(line_item);
+    }
+
+    /// Trim whitespace from the beginning of this UnbreakbleSegmentUnderConstruction.
+    ///
+    /// From <https://www.w3.org/TR/css-text-3/#white-space-phase-2>:
+    ///
+    /// > Then, the entire block is rendered. Inlines are laid out, taking bidi
+    /// > reordering into account, and wrapping as specified by the text-wrap
+    /// > property. As each line is laid out,
+    /// >  1. A sequence of collapsible spaces at the beginning of a line is removed.
+    ///
+    /// This prevents whitespace from being added to the beginning of a line.
+    fn trim_leading_whitespace(&mut self) {
+        let mut whitespace_trimmed = Au::zero();
+        for item in self.line_items.iter_mut() {
+            if !item.trim_whitespace_at_start(&mut whitespace_trimmed) {
+                break;
+            }
+        }
+        self.inline_size -= whitespace_trimmed;
+    }
+}
+
+bitflags! {
+    pub struct InlineContainerStateFlags: u8 {
+        const CREATE_STRUT = 0b0001;
+        const IS_SINGLE_LINE_TEXT_INPUT = 0b0010;
+    }
+}
+
+pub(super) struct InlineContainerState {
+    /// The style of this inline container.
+    style: Arc<ComputedValues>,
+
+    /// Flags which describe details of this [`InlineContainerState`].
+    flags: InlineContainerStateFlags,
+
+    /// Whether or not we have processed any content (an atomic element or text) for
+    /// this inline box on the current line OR any previous line.
+    has_content: RefCell<bool>,
+
+    /// Indicates whether this nesting level have text decorations in effect.
+    /// From <https://drafts.csswg.org/css-text-decor/#line-decoration>
+    // "When specified on or propagated to a block container that establishes
+    //  an IFC..."
+    text_decoration_line: TextDecorationLine,
+
+    /// The block size contribution of this container's default font ie the size of the
+    /// "strut." Whether this is integrated into the [`Self::nested_strut_block_sizes`]
+    /// depends on the line-height quirk described in
+    /// <https://quirks.spec.whatwg.org/#the-line-height-calculation-quirk>.
+    strut_block_sizes: LineBlockSizes,
+
+    /// The strut block size of this inline container maxed with the strut block
+    /// sizes of all inline container ancestors. In quirks mode, this will be
+    /// zero, until we know that an element has inline content.
+    nested_strut_block_sizes: LineBlockSizes,
+
+    /// The baseline offset of this container from the baseline of the line. The is the
+    /// cumulative offset of this container and all of its parents. In contrast to the
+    /// `vertical-align` property a positive value indicates an offset "below" the
+    /// baseline while a negative value indicates one "above" it (when the block direction
+    /// is vertical).
+    pub baseline_offset: Au,
+
+    /// The font metrics of the non-fallback font for this container.
+    font_metrics: FontMetrics,
+}
+
+pub(super) struct InlineFormattingContextLayout<'layout_data> {
+    positioning_context: &'layout_data mut PositioningContext,
+    containing_block: &'layout_data ContainingBlock<'layout_data>,
+    sequential_layout_state: Option<&'layout_data mut SequentialLayoutState>,
+    layout_context: &'layout_data LayoutContext<'layout_data>,
+
+    /// The [`InlineFormattingContext`] that we are laying out.
+    ifc: &'layout_data InlineFormattingContext,
+
+    /// The [`InlineContainerState`] for the container formed by the root of the
+    /// [`InlineFormattingContext`]. This is effectively the "root inline box" described
+    /// by <https://drafts.csswg.org/css-inline/#model>:
+    ///
+    /// > The block container also generates a root inline box, which is an anonymous
+    /// > inline box that holds all of its inline-level contents. (Thus, all text in an
+    /// > inline formatting context is directly contained by an inline box, whether the root
+    /// > inline box or one of its descendants.) The root inline box inherits from its
+    /// > parent block container, but is otherwise unstyleable.
+    root_nesting_level: InlineContainerState,
+
+    /// A stack of [`InlineBoxContainerState`] that is used to produce [`LineItem`]s either when we
+    /// reach the end of an inline box or when we reach the end of a line. Only at the end
+    /// of the inline box is the state popped from the stack.
+    inline_box_state_stack: Vec<Rc<InlineBoxContainerState>>,
+
+    /// A collection of [`InlineBoxContainerState`] of all the inlines that are present
+    /// in this inline formatting context. We keep this as well as the stack, so that we
+    /// can access them during line layout, which may happen after relevant [`InlineBoxContainerState`]s
+    /// have been popped of the the stack.
+    inline_box_states: Vec<Rc<InlineBoxContainerState>>,
+
+    /// A vector of fragment that are laid out. This includes one [`Fragment::Positioning`]
+    /// per line that is currently laid out plus fragments for all floats, which
+    /// are currently laid out at the top-level of each [`InlineFormattingContext`].
+    fragments: Vec<Fragment>,
+
+    /// Information about the line currently being laid out into [`LineItem`]s.
+    current_line: LineUnderConstruction,
+
+    /// Information about the unbreakable line segment currently being laid out into [`LineItem`]s.
+    current_line_segment: UnbreakableSegmentUnderConstruction,
+
+    /// After a forced line break (for instance from a `<br>` element) we wait to actually
+    /// break the line until seeing more content. This allows ongoing inline boxes to finish,
+    /// since in the case where they have no more content they should not be on the next
+    /// line.
+    ///
+    /// For instance:
+    ///
+    /// ``` html
+    ///    <span style="border-right: 30px solid blue;">
+    ///         first line<br>
+    ///    </span>
+    ///    second line
+    /// ```
+    ///
+    /// In this case, the `<span>` should not extend to the second line. If we linebreak
+    /// as soon as we encounter the `<br>` the `<span>`'s ending inline borders would be
+    /// placed on the second line, because we add those borders in
+    /// [`InlineFormattingContextLayout::finish_inline_box()`].
+    linebreak_before_new_content: bool,
+
+    /// When a `<br>` element has `clear`, this needs to be applied after the linebreak,
+    /// which will be processed *after* the `<br>` element is processed. This member
+    /// stores any deferred `clear` to apply after a linebreak.
+    deferred_br_clear: Clear,
+
+    /// Whether or not a soft wrap opportunity is queued. Soft wrap opportunities are
+    /// queued after replaced content and they are processed when the next text content
+    /// is encountered.
+    pub have_deferred_soft_wrap_opportunity: bool,
+
+    /// Whether or not this InlineFormattingContext has processed any in flow content at all.
+    had_inflow_content: bool,
+
+    /// Whether or not the layout of this InlineFormattingContext depends on the block size
+    /// of its container for the purposes of flexbox layout.
+    depends_on_block_constraints: bool,
+
+    /// The currently white-space-collapse setting of this line. This is stored on the
+    /// [`InlineFormattingContextLayout`] because when a soft wrap opportunity is defined
+    /// by the boundary between two characters, the white-space-collapse property of their
+    /// nearest common ancestor is used.
+    white_space_collapse: WhiteSpaceCollapse,
+
+    /// The currently text-wrap-mode setting of this line. This is stored on the
+    /// [`InlineFormattingContextLayout`] because when a soft wrap opportunity is defined
+    /// by the boundary between two characters, the text-wrap-mode property of their nearest
+    /// common ancestor is used.
+    text_wrap_mode: TextWrapMode,
+
+    /// The offset of the first and last baselines in the inline formatting context that we
+    /// are laying out. This is used to propagate baselines to the ancestors of
+    /// `display: inline-block` elements and table content.
+    baselines: Baselines,
+}
+
+impl InlineFormattingContextLayout<'_> {
+    fn current_inline_container_state(&self) -> &InlineContainerState {
+        match self.inline_box_state_stack.last() {
+            Some(inline_box_state) => &inline_box_state.base,
+            None => &self.root_nesting_level,
+        }
+    }
+
+    fn current_inline_box_identifier(&self) -> Option<InlineBoxIdentifier> {
+        self.inline_box_state_stack
+            .last()
+            .map(|state| state.identifier)
+    }
+
+    fn current_line_max_block_size_including_nested_containers(&self) -> LineBlockSizes {
+        self.current_inline_container_state()
+            .nested_strut_block_sizes
+            .max(&self.current_line.max_block_size)
+    }
+
+    fn propagate_current_nesting_level_white_space_style(&mut self) {
+        let style = match self.inline_box_state_stack.last() {
+            Some(inline_box_state) => &inline_box_state.base.style,
+            None => self.containing_block.style,
+        };
+        let style_text = style.get_inherited_text();
+        self.white_space_collapse = style_text.white_space_collapse;
+        self.text_wrap_mode = style_text.text_wrap_mode;
+    }
+
+    fn processing_br_element(&self) -> bool {
+        self.inline_box_state_stack
+            .last()
+            .map(|state| {
+                state
+                    .base_fragment_info
+                    .flags
+                    .contains(FragmentFlags::IS_BR_ELEMENT)
+            })
+            .unwrap_or(false)
+    }
+
+    /// Start laying out a particular [`InlineBox`] into line items. This will push
+    /// a new [`InlineBoxContainerState`] onto [`Self::inline_box_state_stack`].
+    fn start_inline_box(&mut self, inline_box: &InlineBox) {
+        let inline_box_state = InlineBoxContainerState::new(
+            inline_box,
+            self.containing_block,
+            self.layout_context,
+            self.current_inline_container_state(),
+            inline_box.is_last_split,
+            inline_box
+                .default_font_index
+                .map(|index| &self.ifc.font_metrics[index].metrics),
+        );
+
+        self.depends_on_block_constraints |= inline_box
+            .base
+            .style
+            .depends_on_block_constraints_due_to_relative_positioning(
+                self.containing_block.style.writing_mode,
+            );
+
+        // If we are starting a `<br>` element prepare to clear after its deferred linebreak has been
+        // processed. Note that a `<br>` is composed of the element itself and the inner pseudo-element
+        // with the actual linebreak. Both will have this `FragmentFlag`; that's why this code only
+        // sets `deferred_br_clear` if it isn't set yet.
+        if inline_box_state
+            .base_fragment_info
+            .flags
+            .contains(FragmentFlags::IS_BR_ELEMENT) &&
+            self.deferred_br_clear == Clear::None
+        {
+            self.deferred_br_clear = Clear::from_style_and_container_writing_mode(
+                &inline_box_state.base.style,
+                self.containing_block.style.writing_mode,
+            );
+        }
+
+        if inline_box.is_first_split {
+            self.current_line_segment.inline_size += inline_box_state.pbm.padding.inline_start +
+                inline_box_state.pbm.border.inline_start +
+                inline_box_state.pbm.margin.inline_start.auto_is(Au::zero);
+            self.current_line_segment
+                .line_items
+                .push(LineItem::InlineStartBoxPaddingBorderMargin(
+                    inline_box.identifier,
+                ));
+        }
+
+        let inline_box_state = Rc::new(inline_box_state);
+
+        // Push the state onto the IFC-wide collection of states. Inline boxes are numbered in
+        // the order that they are encountered, so this should correspond to the order they
+        // are pushed onto `self.inline_box_states`.
+        assert_eq!(
+            self.inline_box_states.len(),
+            inline_box.identifier.index_in_inline_boxes as usize
+        );
+        self.inline_box_states.push(inline_box_state.clone());
+        self.inline_box_state_stack.push(inline_box_state);
+    }
+
+    /// Finish laying out a particular [`InlineBox`] into line items. This will
+    /// pop its state off of [`Self::inline_box_state_stack`].
+    fn finish_inline_box(&mut self) {
+        let inline_box_state = match self.inline_box_state_stack.pop() {
+            Some(inline_box_state) => inline_box_state,
+            None => return, // We are at the root.
+        };
+
+        self.current_line_segment
+            .max_block_size
+            .max_assign(&inline_box_state.base.nested_strut_block_sizes);
+
+        // If the inline box that we just finished had any content at all, we want to propagate
+        // the `white-space` property of its parent to future inline children. This is because
+        // when a soft wrap opportunity is defined by the boundary between two elements, the
+        // `white-space` used is that of their nearest common ancestor.
+        if *inline_box_state.base.has_content.borrow() {
+            self.propagate_current_nesting_level_white_space_style();
+        }
+
+        if inline_box_state.is_last_fragment {
+            let pbm_end = inline_box_state.pbm.padding.inline_end +
+                inline_box_state.pbm.border.inline_end +
+                inline_box_state.pbm.margin.inline_end.auto_is(Au::zero);
+            self.current_line_segment.inline_size += pbm_end;
+            self.current_line_segment
+                .line_items
+                .push(LineItem::InlineEndBoxPaddingBorderMargin(
+                    inline_box_state.identifier,
+                ))
+        }
+    }
+
+    fn finish_last_line(&mut self) {
+        // We are at the end of the IFC, and we need to do a few things to make sure that
+        // the current segment is committed and that the final line is finished.
+        //
+        // A soft wrap opportunity makes it so the current segment is placed on a new line
+        // if it doesn't fit on the current line under construction.
+        self.process_soft_wrap_opportunity();
+
+        // `process_soft_line_wrap_opportunity` does not commit the segment to a line if
+        // there is no line wrapping, so this forces the segment into the current line.
+        self.commit_current_segment_to_line();
+
+        // Finally we finish the line itself and convert all of the LineItems into
+        // fragments.
+        self.finish_current_line_and_reset(true /* last_line_or_forced_line_break */);
+    }
+
+    /// Finish layout of all inline boxes for the current line. This will gather all
+    /// [`LineItem`]s and turn them into [`Fragment`]s, then reset the
+    /// [`InlineFormattingContextLayout`] preparing it for laying out a new line.
+    fn finish_current_line_and_reset(&mut self, last_line_or_forced_line_break: bool) {
+        let whitespace_trimmed = self.current_line.trim_trailing_whitespace();
+        let (inline_start_position, justification_adjustment) = self
+            .calculate_current_line_inline_start_and_justification_adjustment(
+                whitespace_trimmed,
+                last_line_or_forced_line_break,
+            );
+
+        let block_start_position = self
+            .current_line
+            .line_block_start_considering_placement_among_floats();
+        let had_inline_advance =
+            self.current_line.inline_position != self.current_line.start_position.inline;
+
+        let effective_block_advance = if self.current_line.has_content ||
+            had_inline_advance ||
+            self.linebreak_before_new_content
+        {
+            self.current_line_max_block_size_including_nested_containers()
+        } else {
+            LineBlockSizes::zero()
+        };
+
+        let resolved_block_advance = effective_block_advance.resolve();
+        let mut block_end_position = block_start_position + resolved_block_advance;
+        if let Some(sequential_layout_state) = self.sequential_layout_state.as_mut() {
+            // This amount includes both the block size of the line and any extra space
+            // added to move the line down in order to avoid overlapping floats.
+            let increment = block_end_position - self.current_line.start_position.block;
+            sequential_layout_state.advance_block_position(increment);
+
+            // This newline may have been triggered by a `<br>` with clearance, in which case we
+            // want to make sure that we make space not only for the current line, but any clearance
+            // from floats.
+            if let Some(clearance) = sequential_layout_state
+                .calculate_clearance(self.deferred_br_clear, &CollapsedMargin::zero())
+            {
+                sequential_layout_state.advance_block_position(clearance);
+                block_end_position += clearance;
+            };
+            self.deferred_br_clear = Clear::None;
+        }
+
+        // Set up the new line now that we no longer need the old one.
+        let mut line_to_layout = std::mem::replace(
+            &mut self.current_line,
+            LineUnderConstruction::new(LogicalVec2 {
+                inline: Au::zero(),
+                block: block_end_position,
+            }),
+        );
+
+        if line_to_layout.has_floats_waiting_to_be_placed {
+            place_pending_floats(self, &mut line_to_layout.line_items);
+        }
+
+        let start_position = LogicalVec2 {
+            block: block_start_position,
+            inline: inline_start_position,
+        };
+
+        let baseline_offset = effective_block_advance.find_baseline_offset();
+        let start_positioning_context_length = self.positioning_context.len();
+        let fragments = LineItemLayout::layout_line_items(
+            self,
+            line_to_layout.line_items,
+            start_position,
+            &effective_block_advance,
+            justification_adjustment,
+        );
+
+        // If the line doesn't have any fragments, we don't need to add a containing fragment for it.
+        if fragments.is_empty() &&
+            self.positioning_context.len() == start_positioning_context_length
+        {
+            return;
+        }
+
+        let baseline = baseline_offset + block_start_position;
+        self.baselines.first.get_or_insert(baseline);
+        self.baselines.last = Some(baseline);
+
+        // The inline part of this start offset was taken into account when determining
+        // the inline start of the line in `calculate_inline_start_for_current_line` so
+        // we do not need to include it in the `start_corner` of the line's main Fragment.
+        let start_corner = LogicalVec2 {
+            inline: Au::zero(),
+            block: block_start_position,
+        };
+
+        let logical_origin_in_physical_coordinates =
+            start_corner.to_physical_vector(self.containing_block.style.writing_mode);
+        self.positioning_context
+            .adjust_static_position_of_hoisted_fragments_with_offset(
+                &logical_origin_in_physical_coordinates,
+                start_positioning_context_length,
+            );
+
+        let physical_line_rect = LogicalRect {
+            start_corner,
+            size: LogicalVec2 {
+                inline: self.containing_block.size.inline,
+                block: effective_block_advance.resolve(),
+            },
+        }
+        .as_physical(Some(self.containing_block));
+        self.fragments
+            .push(Fragment::Positioning(PositioningFragment::new_anonymous(
+                self.root_nesting_level.style.clone(),
+                physical_line_rect,
+                fragments,
+            )));
+    }
+
+    /// Given the amount of whitespace trimmed from the line and taking into consideration
+    /// the `text-align` property, calculate where the line under construction starts in
+    /// the inline axis as well as the adjustment needed for every justification opportunity
+    /// to account for `text-align: justify`.
+    fn calculate_current_line_inline_start_and_justification_adjustment(
+        &self,
+        whitespace_trimmed: Au,
+        last_line_or_forced_line_break: bool,
+    ) -> (Au, Au) {
+        enum TextAlign {
+            Start,
+            Center,
+            End,
+        }
+        let style = self.containing_block.style;
+        let mut text_align_keyword = style.clone_text_align();
+
+        if last_line_or_forced_line_break {
+            text_align_keyword = match style.clone_text_align_last() {
+                TextAlignLast::Auto if text_align_keyword == TextAlignKeyword::Justify => {
+                    TextAlignKeyword::Start
+                },
+                TextAlignLast::Auto => text_align_keyword,
+                TextAlignLast::Start => TextAlignKeyword::Start,
+                TextAlignLast::End => TextAlignKeyword::End,
+                TextAlignLast::Left => TextAlignKeyword::Left,
+                TextAlignLast::Right => TextAlignKeyword::Right,
+                TextAlignLast::Center => TextAlignKeyword::Center,
+                TextAlignLast::Justify => TextAlignKeyword::Justify,
+            };
+        }
+
+        let text_align = match text_align_keyword {
+            TextAlignKeyword::Start => TextAlign::Start,
+            TextAlignKeyword::Center | TextAlignKeyword::MozCenter => TextAlign::Center,
+            TextAlignKeyword::End => TextAlign::End,
+            TextAlignKeyword::Left | TextAlignKeyword::MozLeft => {
+                if style.writing_mode.line_left_is_inline_start() {
+                    TextAlign::Start
+                } else {
+                    TextAlign::End
+                }
+            },
+            TextAlignKeyword::Right | TextAlignKeyword::MozRight => {
+                if style.writing_mode.line_left_is_inline_start() {
+                    TextAlign::End
+                } else {
+                    TextAlign::Start
+                }
+            },
+            TextAlignKeyword::Justify => TextAlign::Start,
+        };
+
+        let (line_start, available_space) = match self.current_line.placement_among_floats.get() {
+            Some(placement_among_floats) => (
+                placement_among_floats.start_corner.inline,
+                placement_among_floats.size.inline,
+            ),
+            None => (Au::zero(), self.containing_block.size.inline),
+        };
+
+        // Properly handling text-indent requires that we do not align the text
+        // into the text-indent.
+        // See <https://drafts.csswg.org/css-text/#text-indent-property>
+        // "This property specifies the indentation applied to lines of inline content in
+        // a block. The indent is treated as a margin applied to the start edge of the
+        // line box."
+        let text_indent = self.current_line.start_position.inline;
+        let line_length = self.current_line.inline_position - whitespace_trimmed - text_indent;
+        let adjusted_line_start = line_start +
+            match text_align {
+                TextAlign::Start => text_indent,
+                TextAlign::End => (available_space - line_length).max(text_indent),
+                TextAlign::Center => (available_space - line_length + text_indent)
+                    .scale_by(0.5)
+                    .max(text_indent),
+            };
+
+        // Calculate the justification adjustment. This is simply the remaining space on the line,
+        // dividided by the number of justficiation opportunities that we recorded when building
+        // the line.
+        let text_justify = self.containing_block.style.clone_text_justify();
+        let justification_adjustment = match (text_align_keyword, text_justify) {
+            // `text-justify: none` should disable text justification.
+            // TODO: Handle more `text-justify` values.
+            (TextAlignKeyword::Justify, TextJustify::None) => Au::zero(),
+            (TextAlignKeyword::Justify, _) => {
+                match self.current_line.count_justification_opportunities() {
+                    0 => Au::zero(),
+                    num_justification_opportunities => {
+                        (available_space - text_indent - line_length)
+                            .scale_by(1. / num_justification_opportunities as f32)
+                    },
+                }
+            },
+            _ => Au::zero(),
+        };
+
+        // If the content overflows the line, then justification adjustment will become negative. In
+        // that case, do not make any adjustment for justification.
+        let justification_adjustment = justification_adjustment.max(Au::zero());
+
+        (adjusted_line_start, justification_adjustment)
+    }
+
+    fn place_float_fragment(&mut self, fragment: &mut BoxFragment) {
+        let state = self
+            .sequential_layout_state
+            .as_mut()
+            .expect("Tried to lay out a float with no sequential placement state!");
+
+        let block_offset_from_containining_block_top = state
+            .current_block_position_including_margins() -
+            state.current_containing_block_offset();
+        state.place_float_fragment(
+            fragment,
+            self.containing_block,
+            CollapsedMargin::zero(),
+            block_offset_from_containining_block_top,
+        );
+    }
+
+    /// Place a FloatLineItem. This is done when an unbreakable segment is committed to
+    /// the current line. Placement of FloatLineItems might need to be deferred until the
+    /// line is complete in the case that floats stop fitting on the current line.
+    ///
+    /// When placing floats we do not want to take into account any trailing whitespace on
+    /// the line, because that whitespace will be trimmed in the case that the line is
+    /// broken. Thus this function takes as an argument the new size (without whitespace) of
+    /// the line that these floats are joining.
+    fn place_float_line_item_for_commit_to_line(
+        &mut self,
+        float_item: &mut FloatLineItem,
+        line_inline_size_without_trailing_whitespace: Au,
+    ) {
+        let mut float_fragment = float_item.fragment.borrow_mut();
+        let logical_margin_rect_size = float_fragment
+            .margin_rect()
+            .size
+            .to_logical(self.containing_block.style.writing_mode);
+        let inline_size = logical_margin_rect_size.inline.max(Au::zero());
+
+        let available_inline_size = match self.current_line.placement_among_floats.get() {
+            Some(placement_among_floats) => placement_among_floats.size.inline,
+            None => self.containing_block.size.inline,
+        } - line_inline_size_without_trailing_whitespace;
+
+        // If this float doesn't fit on the current line or a previous float didn't fit on
+        // the current line, we need to place it starting at the next line BUT still as
+        // children of this line's hierarchy of inline boxes (for the purposes of properly
+        // parenting in their stacking contexts). Once all the line content is gathered we
+        // will place them later.
+        let has_content = self.current_line.has_content || self.current_line_segment.has_content;
+        let fits_on_line = !has_content || inline_size <= available_inline_size;
+        let needs_placement_later =
+            self.current_line.has_floats_waiting_to_be_placed || !fits_on_line;
+
+        if needs_placement_later {
+            self.current_line.has_floats_waiting_to_be_placed = true;
+        } else {
+            self.place_float_fragment(&mut float_fragment);
+            float_item.needs_placement = false;
+        }
+
+        // We've added a new float to the IFC, but this may have actually changed the
+        // position of the current line. In order to determine that we regenerate the
+        // placement among floats for the current line, which may adjust its inline
+        // start position.
+        let new_placement = self.place_line_among_floats(&LogicalVec2 {
+            inline: line_inline_size_without_trailing_whitespace,
+            block: self.current_line.max_block_size.resolve(),
+        });
+        self.current_line
+            .replace_placement_among_floats(new_placement);
+    }
+
+    /// Given a new potential line size for the current line, create a "placement" for that line.
+    /// This tells us whether or not the new potential line will fit in the current block position
+    /// or need to be moved. In addition, the placement rect determines the inline start and end
+    /// of the line if it's used as the final placement among floats.
+    fn place_line_among_floats(&self, potential_line_size: &LogicalVec2<Au>) -> LogicalRect<Au> {
+        let sequential_layout_state = self
+            .sequential_layout_state
+            .as_ref()
+            .expect("Should not have called this function without having floats.");
+
+        let ifc_offset_in_float_container = LogicalVec2 {
+            inline: sequential_layout_state
+                .floats
+                .containing_block_info
+                .inline_start,
+            block: sequential_layout_state.current_containing_block_offset(),
+        };
+
+        let ceiling = self
+            .current_line
+            .line_block_start_considering_placement_among_floats();
+        let mut placement = PlacementAmongFloats::new(
+            &sequential_layout_state.floats,
+            ceiling + ifc_offset_in_float_container.block,
+            LogicalVec2 {
+                inline: potential_line_size.inline,
+                block: potential_line_size.block,
+            },
+            &PaddingBorderMargin::zero(),
+        );
+
+        let mut placement_rect = placement.place();
+        placement_rect.start_corner -= ifc_offset_in_float_container;
+        placement_rect
+    }
+
+    /// Returns true if a new potential line size for the current line would require a line
+    /// break. This takes into account floats and will also update the "placement among
+    /// floats" for this line if the potential line size would not cause a line break.
+    /// Thus, calling this method has side effects and should only be done while in the
+    /// process of laying out line content that is always going to be committed to this
+    /// line or the next.
+    fn new_potential_line_size_causes_line_break(
+        &mut self,
+        potential_line_size: &LogicalVec2<Au>,
+    ) -> bool {
+        let available_line_space = if self.sequential_layout_state.is_some() {
+            self.current_line
+                .placement_among_floats
+                .get_or_init(|| self.place_line_among_floats(potential_line_size))
+                .size
+        } else {
+            LogicalVec2 {
+                inline: self.containing_block.size.inline,
+                block: MAX_AU,
+            }
+        };
+
+        let inline_would_overflow = potential_line_size.inline > available_line_space.inline;
+        let block_would_overflow = potential_line_size.block > available_line_space.block;
+
+        // The first content that is added to a line cannot trigger a line break and
+        // the `white-space` propertly can also prevent all line breaking.
+        let can_break = self.current_line.has_content;
+
+        // If this is the first content on the line and we already have a float placement,
+        // that means that the placement was initialized by a leading float in the IFC.
+        // This placement needs to be updated, because the first line content might push
+        // the block start of the line downward. If there is no float placement, we want
+        // to make one to properly set the block position of the line.
+        if !can_break {
+            // Even if we cannot break, adding content to this line might change its position.
+            // In that case we need to redo our placement among floats.
+            if self.sequential_layout_state.is_some() &&
+                (inline_would_overflow || block_would_overflow)
+            {
+                let new_placement = self.place_line_among_floats(potential_line_size);
+                self.current_line
+                    .replace_placement_among_floats(new_placement);
+            }
+
+            return false;
+        }
+
+        // If the potential line is larger than the containing block we do not even need to consider
+        // floats. We definitely have to do a linebreak.
+        if potential_line_size.inline > self.containing_block.size.inline {
+            return true;
+        }
+
+        // Not fitting in the block space means that our block size has changed and we had a
+        // placement among floats that is no longer valid. This same placement might just
+        // need to be expanded or perhaps we need to line break.
+        if block_would_overflow {
+            // If we have a limited block size then we are wedging this line between floats.
+            assert!(self.sequential_layout_state.is_some());
+            let new_placement = self.place_line_among_floats(potential_line_size);
+            if new_placement.start_corner.block !=
+                self.current_line
+                    .line_block_start_considering_placement_among_floats()
+            {
+                return true;
+            } else {
+                self.current_line
+                    .replace_placement_among_floats(new_placement);
+                return false;
+            }
+        }
+
+        // Otherwise the new potential line size will require a newline if it fits in the
+        // inline space available for this line. This space may be smaller than the
+        // containing block if floats shrink the available inline space.
+        inline_would_overflow
+    }
+
+    pub(super) fn defer_forced_line_break(&mut self) {
+        // If the current portion of the unbreakable segment does not fit on the current line
+        // we need to put it on a new line *before* actually triggering the hard line break.
+        if !self.unbreakable_segment_fits_on_line() {
+            self.process_line_break(false /* forced_line_break */);
+        }
+
+        // Defer the actual line break until we've cleared all ending inline boxes.
+        self.linebreak_before_new_content = true;
+
+        // In quirks mode, the line-height isn't automatically added to the line. If we consider a
+        // forced line break a kind of preserved white space, quirks mode requires that we add the
+        // line-height of the current element to the line box height.
+        //
+        // The exception here is `<br>` elements. They are implemented with `pre-line` in Servo, but
+        // this is an implementation detail. The "magic" behavior of `<br>` elements is that they
+        // add line-height to the line conditionally: only when they are on an otherwise empty line.
+        let line_is_empty =
+            !self.current_line_segment.has_content && !self.current_line.has_content;
+        if !self.processing_br_element() || line_is_empty {
+            let strut_size = self
+                .current_inline_container_state()
+                .strut_block_sizes
+                .clone();
+            self.update_unbreakable_segment_for_new_content(
+                &strut_size,
+                Au::zero(),
+                SegmentContentFlags::empty(),
+            );
+        }
+
+        self.had_inflow_content = true;
+    }
+
+    pub(super) fn possibly_flush_deferred_forced_line_break(&mut self) {
+        if !self.linebreak_before_new_content {
+            return;
+        }
+
+        self.commit_current_segment_to_line();
+        self.process_line_break(true /* forced_line_break */);
+        self.linebreak_before_new_content = false;
+    }
+
+    fn push_line_item_to_unbreakable_segment(&mut self, line_item: LineItem) {
+        self.current_line_segment
+            .push_line_item(line_item, self.inline_box_state_stack.len());
+    }
+
+    pub(super) fn push_glyph_store_to_unbreakable_segment(
+        &mut self,
+        glyph_store: std::sync::Arc<GlyphStore>,
+        text_run: &TextRun,
+        font_index: usize,
+        bidi_level: Level,
+        range: range::Range<ByteIndex>,
+    ) {
+        let inline_advance = glyph_store.total_advance();
+        let flags = if glyph_store.is_whitespace() {
+            SegmentContentFlags::from(text_run.inline_styles.style.borrow().get_inherited_text())
+        } else {
+            SegmentContentFlags::empty()
+        };
+
+        // If the metrics of this font don't match the default font, we are likely using a fallback
+        // font and need to adjust the line size to account for a potentially different font.
+        // If somehow the metrics match, the line size won't change.
+        let ifc_font_info = &self.ifc.font_metrics[font_index];
+        let font_metrics = ifc_font_info.metrics.clone();
+        let using_fallback_font =
+            self.current_inline_container_state().font_metrics != font_metrics;
+
+        let quirks_mode = self.layout_context.style_context.quirks_mode() != QuirksMode::NoQuirks;
+        let strut_size = if using_fallback_font {
+            // TODO(mrobinson): This value should probably be cached somewhere.
+            let container_state = self.current_inline_container_state();
+            let vertical_align = effective_vertical_align(
+                &container_state.style,
+                self.inline_box_state_stack.last().map(|c| &c.base),
+            );
+            let mut block_size = container_state.get_block_size_contribution(
+                vertical_align,
+                &font_metrics,
+                &container_state.font_metrics,
+            );
+            block_size.adjust_for_baseline_offset(container_state.baseline_offset);
+            block_size
+        } else if quirks_mode && !flags.is_collapsible_whitespace() {
+            // Normally, the strut is incorporated into the nested block size. In quirks mode though
+            // if we find any text that isn't collapsed whitespace, we need to incorporate the strut.
+            // TODO(mrobinson): This isn't quite right for situations where collapsible white space
+            // ultimately does not collapse because it is between two other pieces of content.
+            self.current_inline_container_state()
+                .strut_block_sizes
+                .clone()
+        } else {
+            LineBlockSizes::zero()
+        };
+        self.update_unbreakable_segment_for_new_content(&strut_size, inline_advance, flags);
+
+        let current_inline_box_identifier = self.current_inline_box_identifier();
+        match self.current_line_segment.line_items.last_mut() {
+            Some(LineItem::TextRun(inline_box_identifier, line_item))
+                if *inline_box_identifier == current_inline_box_identifier &&
+                    line_item.can_merge(ifc_font_info.key, bidi_level) =>
+            {
+                line_item.text.push(glyph_store);
+                return;
+            },
+            _ => {},
+        }
+
+        let selection_range = if let Some(selection) = &text_run.selection_range {
+            let intersection = selection.intersect(&range);
+            if intersection.is_empty() {
+                let insertion_point_index = selection.begin();
+                // We only allow the caret to be shown in the start of the fragment if it is the first fragment.
+                // Otherwise this will cause duplicate caret, especially apparent when encountered line break.
+                if insertion_point_index >= range.begin() &&
+                    insertion_point_index <= range.end() &&
+                    (range.begin() != insertion_point_index || range.begin().0 == 0)
+                {
+                    Some(Range::new(
+                        insertion_point_index - range.begin(),
+                        ByteIndex(0),
+                    ))
+                } else {
+                    None
+                }
+            } else {
+                Some(Range::new(
+                    intersection.begin() - range.begin(),
+                    intersection.length(),
+                ))
+            }
+        } else {
+            None
+        };
+
+        self.push_line_item_to_unbreakable_segment(LineItem::TextRun(
+            current_inline_box_identifier,
+            TextRunLineItem {
+                text: vec![glyph_store],
+                base_fragment_info: text_run.base_fragment_info,
+                inline_styles: text_run.inline_styles.clone(),
+                font_metrics,
+                font_key: ifc_font_info.key,
+                text_decoration_line: self.current_inline_container_state().text_decoration_line,
+                bidi_level,
+                selection_range,
+            },
+        ));
+    }
+
+    fn update_unbreakable_segment_for_new_content(
+        &mut self,
+        block_sizes_of_content: &LineBlockSizes,
+        inline_size: Au,
+        flags: SegmentContentFlags,
+    ) {
+        if flags.is_collapsible_whitespace() || flags.is_wrappable_and_hangable() {
+            self.current_line_segment.trailing_whitespace_size = inline_size;
+        } else {
+            self.current_line_segment.trailing_whitespace_size = Au::zero();
+        }
+        if !flags.is_collapsible_whitespace() {
+            self.current_line_segment.has_content = true;
+            self.had_inflow_content = true;
+        }
+
+        // This may or may not include the size of the strut depending on the quirks mode setting.
+        let container_max_block_size = &self
+            .current_inline_container_state()
+            .nested_strut_block_sizes
+            .clone();
+        self.current_line_segment
+            .max_block_size
+            .max_assign(container_max_block_size);
+        self.current_line_segment
+            .max_block_size
+            .max_assign(block_sizes_of_content);
+
+        self.current_line_segment.inline_size += inline_size;
+
+        // Propagate the whitespace setting to the current nesting level.
+        *self
+            .current_inline_container_state()
+            .has_content
+            .borrow_mut() = true;
+        self.propagate_current_nesting_level_white_space_style();
+    }
+
+    fn process_line_break(&mut self, forced_line_break: bool) {
+        self.current_line_segment.trim_leading_whitespace();
+        self.finish_current_line_and_reset(forced_line_break);
+    }
+
+    pub(super) fn unbreakable_segment_fits_on_line(&mut self) -> bool {
+        let potential_line_size = LogicalVec2 {
+            inline: self.current_line.inline_position + self.current_line_segment.inline_size -
+                self.current_line_segment.trailing_whitespace_size,
+            block: self
+                .current_line_max_block_size_including_nested_containers()
+                .max(&self.current_line_segment.max_block_size)
+                .resolve(),
+        };
+
+        !self.new_potential_line_size_causes_line_break(&potential_line_size)
+    }
+
+    /// Process a soft wrap opportunity. This will either commit the current unbreakble
+    /// segment to the current line, if it fits within the containing block and float
+    /// placement boundaries, or do a line break and then commit the segment.
+    pub(super) fn process_soft_wrap_opportunity(&mut self) {
+        if self.current_line_segment.line_items.is_empty() {
+            return;
+        }
+        if self.text_wrap_mode == TextWrapMode::Nowrap {
+            return;
+        }
+
+        let potential_line_size = LogicalVec2 {
+            inline: self.current_line.inline_position + self.current_line_segment.inline_size -
+                self.current_line_segment.trailing_whitespace_size,
+            block: self
+                .current_line_max_block_size_including_nested_containers()
+                .max(&self.current_line_segment.max_block_size)
+                .resolve(),
+        };
+
+        if self.new_potential_line_size_causes_line_break(&potential_line_size) {
+            self.process_line_break(false /* forced_line_break */);
+        }
+        self.commit_current_segment_to_line();
+    }
+
+    /// Commit the current unbrekable segment to the current line. In addition, this will
+    /// place all floats in the unbreakable segment and expand the line dimensions.
+    fn commit_current_segment_to_line(&mut self) {
+        // The line segments might have no items and have content after processing a forced
+        // linebreak on an empty line.
+        if self.current_line_segment.line_items.is_empty() && !self.current_line_segment.has_content
+        {
+            return;
+        }
+
+        if !self.current_line.has_content {
+            self.current_line_segment.trim_leading_whitespace();
+        }
+
+        self.current_line.inline_position += self.current_line_segment.inline_size;
+        self.current_line.max_block_size = self
+            .current_line_max_block_size_including_nested_containers()
+            .max(&self.current_line_segment.max_block_size);
+        let line_inline_size_without_trailing_whitespace =
+            self.current_line.inline_position - self.current_line_segment.trailing_whitespace_size;
+
+        // Place all floats in this unbreakable segment.
+        let mut segment_items = mem::take(&mut self.current_line_segment.line_items);
+        for item in segment_items.iter_mut() {
+            if let LineItem::Float(_, float_item) = item {
+                self.place_float_line_item_for_commit_to_line(
+                    float_item,
+                    line_inline_size_without_trailing_whitespace,
+                );
+            }
+        }
+
+        // If the current line was never placed among floats, we need to do that now based on the
+        // new size. Calling `new_potential_line_size_causes_line_break()` here triggers the
+        // new line to be positioned among floats. This should never ask for a line
+        // break because it is the first content on the line.
+        if self.current_line.line_items.is_empty() {
+            let will_break = self.new_potential_line_size_causes_line_break(&LogicalVec2 {
+                inline: line_inline_size_without_trailing_whitespace,
+                block: self.current_line_segment.max_block_size.resolve(),
+            });
+            assert!(!will_break);
+        }
+
+        self.current_line.line_items.extend(segment_items);
+        self.current_line.has_content |= self.current_line_segment.has_content;
+
+        self.current_line_segment.reset();
+    }
+}
+
+bitflags! {
+    pub struct SegmentContentFlags: u8 {
+        const COLLAPSIBLE_WHITESPACE = 0b00000001;
+        const WRAPPABLE_AND_HANGABLE_WHITESPACE = 0b00000010;
+    }
+}
+
+impl SegmentContentFlags {
+    fn is_collapsible_whitespace(&self) -> bool {
+        self.contains(Self::COLLAPSIBLE_WHITESPACE)
+    }
+
+    fn is_wrappable_and_hangable(&self) -> bool {
+        self.contains(Self::WRAPPABLE_AND_HANGABLE_WHITESPACE)
+    }
+}
+
+impl From<&InheritedText> for SegmentContentFlags {
+    fn from(style_text: &InheritedText) -> Self {
+        let mut flags = Self::empty();
+
+        // White-space with `white-space-collapse: break-spaces` or `white-space-collapse: preserve`
+        // never collapses.
+        if !matches!(
+            style_text.white_space_collapse,
+            WhiteSpaceCollapse::Preserve | WhiteSpaceCollapse::BreakSpaces
+        ) {
+            flags.insert(Self::COLLAPSIBLE_WHITESPACE);
+        }
+
+        // White-space with `white-space-collapse: break-spaces` never hangs and always takes up
+        // space.
+        if style_text.text_wrap_mode == TextWrapMode::Wrap &&
+            style_text.white_space_collapse != WhiteSpaceCollapse::BreakSpaces
+        {
+            flags.insert(Self::WRAPPABLE_AND_HANGABLE_WHITESPACE);
+        }
+        flags
+    }
+}
+
+impl InlineFormattingContext {
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(
+            name = "InlineFormattingContext::new_with_builder",
+            skip_all,
+            fields(servo_profiling = true),
+            level = "trace",
+        )
+    )]
+    pub(super) fn new_with_builder(
+        builder: InlineFormattingContextBuilder,
+        layout_context: &LayoutContext,
+        propagated_data: PropagatedBoxTreeData,
+        has_first_formatted_line: bool,
+        is_single_line_text_input: bool,
+        starting_bidi_level: Level,
+    ) -> Self {
+        // This is to prevent a double borrow.
+        let text_content: String = builder.text_segments.into_iter().collect();
+        let mut font_metrics = Vec::new();
+
+        let bidi_info = BidiInfo::new(&text_content, Some(starting_bidi_level));
+        let has_right_to_left_content = bidi_info.has_rtl();
+
+        let mut new_linebreaker = LineBreaker::new(text_content.as_str());
+        for item in builder.inline_items.iter() {
+            match &mut *item.borrow_mut() {
+                InlineItem::TextRun(text_run) => {
+                    text_run.borrow_mut().segment_and_shape(
+                        &text_content,
+                        &layout_context.font_context,
+                        &mut new_linebreaker,
+                        &mut font_metrics,
+                        &bidi_info,
+                    );
+                },
+                InlineItem::StartInlineBox(inline_box) => {
+                    let inline_box = &mut *inline_box.borrow_mut();
+                    if let Some(font) = get_font_for_first_font_for_style(
+                        &inline_box.base.style,
+                        &layout_context.font_context,
+                    ) {
+                        inline_box.default_font_index = Some(add_or_get_font(
+                            &font,
+                            &mut font_metrics,
+                            &layout_context.font_context,
+                        ));
+                    }
+                },
+                InlineItem::Atomic(_, index_in_text, bidi_level) => {
+                    *bidi_level = bidi_info.levels[*index_in_text];
+                },
+                InlineItem::OutOfFlowAbsolutelyPositionedBox(..) |
+                InlineItem::OutOfFlowFloatBox(_) |
+                InlineItem::EndInlineBox => {},
+            }
+        }
+
+        InlineFormattingContext {
+            text_content,
+            inline_items: builder.inline_items,
+            inline_boxes: builder.inline_boxes,
+            font_metrics,
+            text_decoration_line: propagated_data.text_decoration,
+            has_first_formatted_line,
+            contains_floats: builder.contains_floats,
+            is_single_line_text_input,
+            has_right_to_left_content,
+        }
+    }
+
+    pub(super) fn layout(
+        &self,
+        layout_context: &LayoutContext,
+        positioning_context: &mut PositioningContext,
+        containing_block: &ContainingBlock,
+        sequential_layout_state: Option<&mut SequentialLayoutState>,
+        collapsible_with_parent_start_margin: CollapsibleWithParentStartMargin,
+    ) -> CacheableLayoutResult {
+        let first_line_inline_start = if self.has_first_formatted_line {
+            containing_block
+                .style
+                .get_inherited_text()
+                .text_indent
+                .length
+                .to_used_value(containing_block.size.inline)
+        } else {
+            Au::zero()
+        };
+
+        // Clear any cached inline fragments from previous layouts.
+        for inline_box in self.inline_boxes.iter() {
+            inline_box.borrow().base.clear_fragments();
+        }
+
+        let style = containing_block.style;
+
+        // It's unfortunate that it isn't possible to get this during IFC text processing, but in
+        // that situation the style of the containing block is unknown.
+        let default_font_metrics =
+            get_font_for_first_font_for_style(style, &layout_context.font_context)
+                .map(|font| font.metrics.clone());
+
+        let style_text = containing_block.style.get_inherited_text();
+        let mut inline_container_state_flags = InlineContainerStateFlags::empty();
+        if inline_container_needs_strut(style, layout_context, None) {
+            inline_container_state_flags.insert(InlineContainerStateFlags::CREATE_STRUT);
+        }
+        if self.is_single_line_text_input {
+            inline_container_state_flags
+                .insert(InlineContainerStateFlags::IS_SINGLE_LINE_TEXT_INPUT);
+        }
+
+        let mut layout = InlineFormattingContextLayout {
+            positioning_context,
+            containing_block,
+            sequential_layout_state,
+            layout_context,
+            ifc: self,
+            fragments: Vec::new(),
+            current_line: LineUnderConstruction::new(LogicalVec2 {
+                inline: first_line_inline_start,
+                block: Au::zero(),
+            }),
+            root_nesting_level: InlineContainerState::new(
+                style.to_arc(),
+                inline_container_state_flags,
+                None, /* parent_container */
+                self.text_decoration_line,
+                default_font_metrics.as_ref(),
+            ),
+            inline_box_state_stack: Vec::new(),
+            inline_box_states: Vec::with_capacity(self.inline_boxes.len()),
+            current_line_segment: UnbreakableSegmentUnderConstruction::new(),
+            linebreak_before_new_content: false,
+            deferred_br_clear: Clear::None,
+            have_deferred_soft_wrap_opportunity: false,
+            had_inflow_content: false,
+            depends_on_block_constraints: false,
+            white_space_collapse: style_text.white_space_collapse,
+            text_wrap_mode: style_text.text_wrap_mode,
+            baselines: Baselines::default(),
+        };
+
+        // FIXME(pcwalton): This assumes that margins never collapse through inline formatting
+        // contexts (i.e. that inline formatting contexts are never empty). Is that right?
+        // FIXME(mrobinson): This should not happen if the IFC collapses through.
+        if let Some(ref mut sequential_layout_state) = layout.sequential_layout_state {
+            sequential_layout_state.collapse_margins();
+            // FIXME(mrobinson): Collapse margins in the containing block offsets as well??
+        }
+
+        for item in self.inline_items.iter() {
+            let item = &*item.borrow();
+
+            // Any new box should flush a pending hard line break.
+            if !matches!(item, InlineItem::EndInlineBox) {
+                layout.possibly_flush_deferred_forced_line_break();
+            }
+
+            match item {
+                InlineItem::StartInlineBox(inline_box) => {
+                    layout.start_inline_box(&inline_box.borrow());
+                },
+                InlineItem::EndInlineBox => layout.finish_inline_box(),
+                InlineItem::TextRun(run) => run.borrow().layout_into_line_items(&mut layout),
+                InlineItem::Atomic(atomic_formatting_context, offset_in_text, bidi_level) => {
+                    atomic_formatting_context.borrow().layout_into_line_items(
+                        &mut layout,
+                        *offset_in_text,
+                        *bidi_level,
+                    );
+                },
+                InlineItem::OutOfFlowAbsolutelyPositionedBox(positioned_box, _) => {
+                    layout.push_line_item_to_unbreakable_segment(LineItem::AbsolutelyPositioned(
+                        layout.current_inline_box_identifier(),
+                        AbsolutelyPositionedLineItem {
+                            absolutely_positioned_box: positioned_box.clone(),
+                        },
+                    ));
+                },
+                InlineItem::OutOfFlowFloatBox(float_box) => {
+                    float_box.borrow().layout_into_line_items(&mut layout);
+                },
+            }
+        }
+
+        layout.finish_last_line();
+
+        let mut collapsible_margins_in_children = CollapsedBlockMargins::zero();
+        let content_block_size = layout.current_line.start_position.block;
+        collapsible_margins_in_children.collapsed_through = !layout.had_inflow_content &&
+            content_block_size.is_zero() &&
+            collapsible_with_parent_start_margin.0;
+
+        CacheableLayoutResult {
+            fragments: layout.fragments,
+            content_block_size,
+            collapsible_margins_in_children,
+            baselines: layout.baselines,
+            depends_on_block_constraints: layout.depends_on_block_constraints,
+            content_inline_size_for_table: None,
+            specific_layout_info: None,
+        }
+    }
+
+    fn next_character_prevents_soft_wrap_opportunity(&self, index: usize) -> bool {
+        let Some(character) = self.text_content[index..].chars().nth(1) else {
+            return false;
+        };
+        char_prevents_soft_wrap_opportunity_when_before_or_after_atomic(character)
+    }
+
+    fn previous_character_prevents_soft_wrap_opportunity(&self, index: usize) -> bool {
+        let Some(character) = self.text_content[0..index].chars().next_back() else {
+            return false;
+        };
+        char_prevents_soft_wrap_opportunity_when_before_or_after_atomic(character)
+    }
+}
+
+impl InlineContainerState {
+    fn new(
+        style: Arc<ComputedValues>,
+        flags: InlineContainerStateFlags,
+        parent_container: Option<&InlineContainerState>,
+        parent_text_decoration_line: TextDecorationLine,
+        font_metrics: Option<&FontMetrics>,
+    ) -> Self {
+        let text_decoration_line = parent_text_decoration_line | style.clone_text_decoration_line();
+        let font_metrics = font_metrics.cloned().unwrap_or_else(FontMetrics::empty);
+        let line_height = line_height(
+            &style,
+            &font_metrics,
+            flags.contains(InlineContainerStateFlags::IS_SINGLE_LINE_TEXT_INPUT),
+        );
+
+        let mut baseline_offset = Au::zero();
+        let mut strut_block_sizes = Self::get_block_sizes_with_style(
+            effective_vertical_align(&style, parent_container),
+            &style,
+            &font_metrics,
+            &font_metrics,
+            line_height,
+        );
+        if let Some(parent_container) = parent_container {
+            // The baseline offset from `vertical-align` might adjust where our block size contribution is
+            // within the line.
+            baseline_offset = parent_container.get_cumulative_baseline_offset_for_child(
+                style.clone_vertical_align(),
+                &strut_block_sizes,
+            );
+            strut_block_sizes.adjust_for_baseline_offset(baseline_offset);
+        }
+
+        let mut nested_block_sizes = parent_container
+            .map(|container| container.nested_strut_block_sizes.clone())
+            .unwrap_or_else(LineBlockSizes::zero);
+        if flags.contains(InlineContainerStateFlags::CREATE_STRUT) {
+            nested_block_sizes.max_assign(&strut_block_sizes);
+        }
+
+        Self {
+            style,
+            flags,
+            has_content: RefCell::new(false),
+            text_decoration_line,
+            nested_strut_block_sizes: nested_block_sizes,
+            strut_block_sizes,
+            baseline_offset,
+            font_metrics,
+        }
+    }
+
+    fn get_block_sizes_with_style(
+        vertical_align: VerticalAlign,
+        style: &ComputedValues,
+        font_metrics: &FontMetrics,
+        font_metrics_of_first_font: &FontMetrics,
+        line_height: Au,
+    ) -> LineBlockSizes {
+        if !is_baseline_relative(vertical_align) {
+            return LineBlockSizes {
+                line_height,
+                baseline_relative_size_for_line_height: None,
+                size_for_baseline_positioning: BaselineRelativeSize::zero(),
+            };
+        }
+
+        // From https://drafts.csswg.org/css-inline/#inline-height
+        // > If line-height computes to `normal` and either `text-box-edge` is `leading` or this
+        // > is the root inline box, the font’s line gap metric may also be incorporated
+        // > into A and D by adding half to each side as half-leading.
+        //
+        // `text-box-edge` isn't implemented (and this is a draft specification), so it's
+        // always effectively `leading`, which means we always take into account the line gap
+        // when `line-height` is normal.
+        let mut ascent = font_metrics.ascent;
+        let mut descent = font_metrics.descent;
+        if style.get_font().line_height == LineHeight::Normal {
+            let half_leading_from_line_gap =
+                (font_metrics.line_gap - descent - ascent).scale_by(0.5);
+            ascent += half_leading_from_line_gap;
+            descent += half_leading_from_line_gap;
+        }
+
+        // The ascent and descent we use for computing the line's final line height isn't
+        // the same the ascent and descent we use for finding the baseline. For finding
+        // the baseline we want the content rect.
+        let size_for_baseline_positioning = BaselineRelativeSize { ascent, descent };
+
+        // From https://drafts.csswg.org/css-inline/#inline-height
+        // > When its computed line-height is not normal, its layout bounds are derived solely
+        // > from metrics of its first available font (ignoring glyphs from other fonts), and
+        // > leading is used to adjust the effective A and D to add up to the used line-height.
+        // > Calculate the leading L as L = line-height - (A + D). Half the leading (its
+        // > half-leading) is added above A of the first available font, and the other half
+        // > below D of the first available font, giving an effective ascent above the baseline
+        // > of A′ = A + L/2, and an effective descent of D′ = D + L/2.
+        //
+        // Note that leading might be negative here and the line-height might be zero. In
+        // the case where the height is zero, ascent and descent will move to the same
+        // point in the block axis.  Even though the contribution to the line height is
+        // zero in this case, the line may get some height when taking them into
+        // considering with other zero line height boxes that converge on other block axis
+        // locations when using the above formula.
+        if style.get_font().line_height != LineHeight::Normal {
+            ascent = font_metrics_of_first_font.ascent;
+            descent = font_metrics_of_first_font.descent;
+            let half_leading = (line_height - (ascent + descent)).scale_by(0.5);
+            // We want the sum of `ascent` and `descent` to equal `line_height`.
+            // If we just add `half_leading` to both, then we may not get `line_height`
+            // due to precision limitations of `Au`. Instead, we set `descent` to
+            // the value that will guarantee the correct sum.
+            ascent += half_leading;
+            descent = line_height - ascent;
+        }
+
+        LineBlockSizes {
+            line_height,
+            baseline_relative_size_for_line_height: Some(BaselineRelativeSize { ascent, descent }),
+            size_for_baseline_positioning,
+        }
+    }
+
+    fn get_block_size_contribution(
+        &self,
+        vertical_align: VerticalAlign,
+        font_metrics: &FontMetrics,
+        font_metrics_of_first_font: &FontMetrics,
+    ) -> LineBlockSizes {
+        Self::get_block_sizes_with_style(
+            vertical_align,
+            &self.style,
+            font_metrics,
+            font_metrics_of_first_font,
+            line_height(
+                &self.style,
+                font_metrics,
+                self.flags
+                    .contains(InlineContainerStateFlags::IS_SINGLE_LINE_TEXT_INPUT),
+            ),
+        )
+    }
+
+    fn get_cumulative_baseline_offset_for_child(
+        &self,
+        child_vertical_align: VerticalAlign,
+        child_block_size: &LineBlockSizes,
+    ) -> Au {
+        let block_size = self.get_block_size_contribution(
+            child_vertical_align.clone(),
+            &self.font_metrics,
+            &self.font_metrics,
+        );
+        self.baseline_offset +
+            match child_vertical_align {
+                // `top` and `bottom are not actually relative to the baseline, but this value is unused
+                // in those cases.
+                // TODO: We should distinguish these from `baseline` in order to implement "aligned subtrees" properly.
+                // See https://drafts.csswg.org/css2/#aligned-subtree.
+                VerticalAlign::Keyword(VerticalAlignKeyword::Baseline) |
+                VerticalAlign::Keyword(VerticalAlignKeyword::Top) |
+                VerticalAlign::Keyword(VerticalAlignKeyword::Bottom) => Au::zero(),
+                VerticalAlign::Keyword(VerticalAlignKeyword::Sub) => {
+                    block_size.resolve().scale_by(FONT_SUBSCRIPT_OFFSET_RATIO)
+                },
+                VerticalAlign::Keyword(VerticalAlignKeyword::Super) => {
+                    -block_size.resolve().scale_by(FONT_SUPERSCRIPT_OFFSET_RATIO)
+                },
+                VerticalAlign::Keyword(VerticalAlignKeyword::TextTop) => {
+                    child_block_size.size_for_baseline_positioning.ascent - self.font_metrics.ascent
+                },
+                VerticalAlign::Keyword(VerticalAlignKeyword::Middle) => {
+                    // "Align the vertical midpoint of the box with the baseline of the parent
+                    // box plus half the x-height of the parent."
+                    (child_block_size.size_for_baseline_positioning.ascent -
+                        child_block_size.size_for_baseline_positioning.descent -
+                        self.font_metrics.x_height)
+                        .scale_by(0.5)
+                },
+                VerticalAlign::Keyword(VerticalAlignKeyword::TextBottom) => {
+                    self.font_metrics.descent -
+                        child_block_size.size_for_baseline_positioning.descent
+                },
+                VerticalAlign::Length(length_percentage) => {
+                    -length_percentage.to_used_value(child_block_size.line_height)
+                },
+            }
+    }
+}
+
+impl IndependentFormattingContext {
+    fn layout_into_line_items(
+        &self,
+        layout: &mut InlineFormattingContextLayout,
+        offset_in_text: usize,
+        bidi_level: Level,
+    ) {
+        // We need to know the inline size of the atomic before deciding whether to do the line break.
+        let mut child_positioning_context = PositioningContext::default();
+        let IndependentFloatOrAtomicLayoutResult {
+            mut fragment,
+            baselines,
+            pbm_sums,
+        } = self.layout_float_or_atomic_inline(
+            layout.layout_context,
+            &mut child_positioning_context,
+            layout.containing_block,
+        );
+
+        // If this Fragment's layout depends on the block size of the containing block,
+        // then the entire layout of the inline formatting context does as well.
+        layout.depends_on_block_constraints |= fragment.base.flags.contains(
+            FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM,
+        );
+
+        // Offset the content rectangle by the physical offset of the padding, border, and margin.
+        let container_writing_mode = layout.containing_block.style.writing_mode;
+        let pbm_physical_offset = pbm_sums
+            .start_offset()
+            .to_physical_size(container_writing_mode);
+        fragment.content_rect = fragment
+            .content_rect
+            .translate(pbm_physical_offset.to_vector());
+
+        // Apply baselines if necessary.
+        let mut fragment = match baselines {
+            Some(baselines) => fragment.with_baselines(baselines),
+            None => fragment,
+        };
+
+        // Lay out absolutely positioned children if this new atomic establishes a containing block
+        // for absolutes.
+        let positioning_context = if self.is_replaced() {
+            None
+        } else {
+            if fragment
+                .style
+                .establishes_containing_block_for_absolute_descendants(fragment.base.flags)
+            {
+                child_positioning_context
+                    .layout_collected_children(layout.layout_context, &mut fragment);
+            }
+            Some(child_positioning_context)
+        };
+
+        if layout.text_wrap_mode == TextWrapMode::Wrap &&
+            !layout
+                .ifc
+                .previous_character_prevents_soft_wrap_opportunity(offset_in_text)
+        {
+            layout.process_soft_wrap_opportunity();
+        }
+
+        let size = pbm_sums.sum() +
+            fragment
+                .content_rect
+                .size
+                .to_logical(container_writing_mode);
+        let baseline_offset = self
+            .pick_baseline(&fragment.baselines(container_writing_mode))
+            .map(|baseline| pbm_sums.block_start + baseline)
+            .unwrap_or(size.block);
+
+        let (block_sizes, baseline_offset_in_parent) =
+            self.get_block_sizes_and_baseline_offset(layout, size.block, baseline_offset);
+        layout.update_unbreakable_segment_for_new_content(
+            &block_sizes,
+            size.inline,
+            SegmentContentFlags::empty(),
+        );
+
+        let fragment = ArcRefCell::new(fragment);
+        self.base.set_fragment(Fragment::Box(fragment.clone()));
+
+        layout.push_line_item_to_unbreakable_segment(LineItem::Atomic(
+            layout.current_inline_box_identifier(),
+            AtomicLineItem {
+                fragment,
+                size,
+                positioning_context,
+                baseline_offset_in_parent,
+                baseline_offset_in_item: baseline_offset,
+                bidi_level,
+            },
+        ));
+
+        // If there's a soft wrap opportunity following this atomic, defer a soft wrap opportunity
+        // for when we next process text content.
+        if !layout
+            .ifc
+            .next_character_prevents_soft_wrap_opportunity(offset_in_text)
+        {
+            layout.have_deferred_soft_wrap_opportunity = true;
+        }
+    }
+
+    /// Picks either the first or the last baseline, depending on `baseline-source`.
+    /// TODO: clarify that this is not to be used for box alignment in flex/grid
+    /// <https://drafts.csswg.org/css-inline/#baseline-source>
+    fn pick_baseline(&self, baselines: &Baselines) -> Option<Au> {
+        match self.style().clone_baseline_source() {
+            BaselineSource::First => baselines.first,
+            BaselineSource::Last => baselines.last,
+            BaselineSource::Auto => match &self.contents {
+                IndependentFormattingContextContents::NonReplaced(
+                    IndependentNonReplacedContents::Flow(_),
+                ) => baselines.last,
+                _ => baselines.first,
+            },
+        }
+    }
+
+    fn get_block_sizes_and_baseline_offset(
+        &self,
+        ifc: &InlineFormattingContextLayout,
+        block_size: Au,
+        baseline_offset_in_content_area: Au,
+    ) -> (LineBlockSizes, Au) {
+        let mut contribution = if !is_baseline_relative(self.style().clone_vertical_align()) {
+            LineBlockSizes {
+                line_height: block_size,
+                baseline_relative_size_for_line_height: None,
+                size_for_baseline_positioning: BaselineRelativeSize::zero(),
+            }
+        } else {
+            let baseline_relative_size = BaselineRelativeSize {
+                ascent: baseline_offset_in_content_area,
+                descent: block_size - baseline_offset_in_content_area,
+            };
+            LineBlockSizes {
+                line_height: block_size,
+                baseline_relative_size_for_line_height: Some(baseline_relative_size.clone()),
+                size_for_baseline_positioning: baseline_relative_size,
+            }
+        };
+
+        let baseline_offset = ifc
+            .current_inline_container_state()
+            .get_cumulative_baseline_offset_for_child(
+                self.style().clone_vertical_align(),
+                &contribution,
+            );
+        contribution.adjust_for_baseline_offset(baseline_offset);
+
+        (contribution, baseline_offset)
+    }
+}
+
+impl FloatBox {
+    fn layout_into_line_items(&self, layout: &mut InlineFormattingContextLayout) {
+        let fragment = ArcRefCell::new(self.layout(
+            layout.layout_context,
+            layout.positioning_context,
+            layout.containing_block,
+        ));
+
+        self.contents
+            .base
+            .set_fragment(Fragment::Box(fragment.clone()));
+        layout.push_line_item_to_unbreakable_segment(LineItem::Float(
+            layout.current_inline_box_identifier(),
+            FloatLineItem {
+                fragment,
+                needs_placement: true,
+            },
+        ));
+    }
+}
+
+fn place_pending_floats(ifc: &mut InlineFormattingContextLayout, line_items: &mut [LineItem]) {
+    for item in line_items.iter_mut() {
+        if let LineItem::Float(_, float_line_item) = item {
+            if float_line_item.needs_placement {
+                ifc.place_float_fragment(&mut float_line_item.fragment.borrow_mut());
+            }
+        }
+    }
+}
+
+fn line_height(
+    parent_style: &ComputedValues,
+    font_metrics: &FontMetrics,
+    is_single_line_text_input: bool,
+) -> Au {
+    let font = parent_style.get_font();
+    let font_size = font.font_size.computed_size();
+    let mut line_height = match font.line_height {
+        LineHeight::Normal => font_metrics.line_gap,
+        LineHeight::Number(number) => (font_size * number.0).into(),
+        LineHeight::Length(length) => length.0.into(),
+    };
+
+    // Single line text inputs line height is clamped to the size of `normal`. See
+    // <https://github.com/whatwg/html/pull/5462>.
+    if is_single_line_text_input {
+        line_height.max_assign(font_metrics.line_gap);
+    }
+
+    line_height
+}
+
+fn effective_vertical_align(
+    style: &ComputedValues,
+    container: Option<&InlineContainerState>,
+) -> VerticalAlign {
+    if container.is_none() {
+        // If we are at the root of the inline formatting context, we shouldn't use the
+        // computed `vertical-align`, since it has no effect on the contents of this IFC
+        // (it can just affect how the block container is aligned within the parent IFC).
+        VerticalAlign::Keyword(VerticalAlignKeyword::Baseline)
+    } else {
+        style.clone_vertical_align()
+    }
+}
+
+fn is_baseline_relative(vertical_align: VerticalAlign) -> bool {
+    !matches!(
+        vertical_align,
+        VerticalAlign::Keyword(VerticalAlignKeyword::Top) |
+            VerticalAlign::Keyword(VerticalAlignKeyword::Bottom)
+    )
+}
+
+/// Whether or not a strut should be created for an inline container. Normally
+/// all inline containers get struts. In quirks mode this isn't always the case
+/// though.
+///
+/// From <https://quirks.spec.whatwg.org/#the-line-height-calculation-quirk>
+///
+/// > ### § 3.3. The line height calculation quirk
+/// > In quirks mode and limited-quirks mode, an inline box that matches the following
+/// > conditions, must, for the purpose of line height calculation, act as if the box had a
+/// > line-height of zero.
+/// >
+/// >  - The border-top-width, border-bottom-width, padding-top and padding-bottom
+/// >    properties have a used value of zero and the box has a vertical writing mode, or the
+/// >    border-right-width, border-left-width, padding-right and padding-left properties have
+/// >    a used value of zero and the box has a horizontal writing mode.
+/// >  - It either contains no text or it contains only collapsed whitespace.
+/// >
+/// > ### § 3.4. The blocks ignore line-height quirk
+/// > In quirks mode and limited-quirks mode, for a block container element whose content is
+/// > composed of inline-level elements, the element’s line-height must be ignored for the
+/// > purpose of calculating the minimal height of line boxes within the element.
+///
+/// Since we incorporate the size of the strut into the line-height calculation when
+/// adding text, we can simply not incorporate the strut at the start of inline box
+/// processing. This also works the same for the root of the IFC.
+fn inline_container_needs_strut(
+    style: &ComputedValues,
+    layout_context: &LayoutContext,
+    pbm: Option<&PaddingBorderMargin>,
+) -> bool {
+    if layout_context.style_context.quirks_mode() == QuirksMode::NoQuirks {
+        return true;
+    }
+
+    // This is not in a standard yet, but all browsers disable this quirk for list items.
+    // See https://github.com/whatwg/quirks/issues/38.
+    if style.get_box().display.is_list_item() {
+        return true;
+    }
+
+    pbm.map(|pbm| !pbm.padding_border_sums.inline.is_zero())
+        .unwrap_or(false)
+}
+
+impl ComputeInlineContentSizes for InlineFormattingContext {
+    // This works on an already-constructed `InlineFormattingContext`,
+    // Which would have to change if/when
+    // `BlockContainer::construct` parallelize their construction.
+    fn compute_inline_content_sizes(
+        &self,
+        layout_context: &LayoutContext,
+        constraint_space: &ConstraintSpace,
+    ) -> InlineContentSizesResult {
+        ContentSizesComputation::compute(self, layout_context, constraint_space)
+    }
+}
+
+/// A struct which takes care of computing [`ContentSizes`] for an [`InlineFormattingContext`].
+struct ContentSizesComputation<'layout_data> {
+    layout_context: &'layout_data LayoutContext<'layout_data>,
+    constraint_space: &'layout_data ConstraintSpace,
+    paragraph: ContentSizes,
+    current_line: ContentSizes,
+    /// Size for whitespace pending to be added to this line.
+    pending_whitespace: ContentSizes,
+    /// Whether or not the current line has seen any content (excluding collapsed whitespace),
+    /// when sizing under a min-content constraint.
+    had_content_yet_for_min_content: bool,
+    /// Whether or not the current line has seen any content (excluding collapsed whitespace),
+    /// when sizing under a max-content constraint.
+    had_content_yet_for_max_content: bool,
+    /// Stack of ending padding, margin, and border to add to the length
+    /// when an inline box finishes.
+    ending_inline_pbm_stack: Vec<Au>,
+    depends_on_block_constraints: bool,
+}
+
+impl<'layout_data> ContentSizesComputation<'layout_data> {
+    fn traverse(
+        mut self,
+        inline_formatting_context: &InlineFormattingContext,
+    ) -> InlineContentSizesResult {
+        for inline_item in inline_formatting_context.inline_items.iter() {
+            self.process_item(&inline_item.borrow(), inline_formatting_context);
+        }
+        self.forced_line_break();
+
+        InlineContentSizesResult {
+            sizes: self.paragraph,
+            depends_on_block_constraints: self.depends_on_block_constraints,
+        }
+    }
+
+    fn process_item(
+        &mut self,
+        inline_item: &InlineItem,
+        inline_formatting_context: &InlineFormattingContext,
+    ) {
+        match inline_item {
+            InlineItem::StartInlineBox(inline_box) => {
+                // For margins and paddings, a cyclic percentage is resolved against zero
+                // for determining intrinsic size contributions.
+                // https://drafts.csswg.org/css-sizing-3/#min-percentage-contribution
+                let inline_box = inline_box.borrow();
+                let zero = Au::zero();
+                let writing_mode = self.constraint_space.writing_mode;
+                let layout_style = inline_box.layout_style();
+                let padding = layout_style
+                    .padding(writing_mode)
+                    .percentages_relative_to(zero);
+                let border = layout_style.border_width(writing_mode);
+                let margin = inline_box
+                    .base
+                    .style
+                    .margin(writing_mode)
+                    .percentages_relative_to(zero)
+                    .auto_is(Au::zero);
+
+                let pbm = margin + padding + border;
+                if inline_box.is_first_split {
+                    self.add_inline_size(pbm.inline_start);
+                }
+                if inline_box.is_last_split {
+                    self.ending_inline_pbm_stack.push(pbm.inline_end);
+                } else {
+                    self.ending_inline_pbm_stack.push(Au::zero());
+                }
+            },
+            InlineItem::EndInlineBox => {
+                let length = self.ending_inline_pbm_stack.pop().unwrap_or_else(Au::zero);
+                self.add_inline_size(length);
+            },
+            InlineItem::TextRun(text_run) => {
+                let text_run = &*text_run.borrow();
+                let parent_style = text_run.inline_styles.style.borrow();
+                for segment in text_run.shaped_text.iter() {
+                    let style_text = parent_style.get_inherited_text();
+                    let can_wrap = style_text.text_wrap_mode == TextWrapMode::Wrap;
+
+                    // TODO: This should take account whether or not the first and last character prevent
+                    // linebreaks after atomics as in layout.
+                    if can_wrap && segment.break_at_start {
+                        self.line_break_opportunity()
+                    }
+
+                    for run in segment.runs.iter() {
+                        let advance = run.glyph_store.total_advance();
+                        if run.glyph_store.is_whitespace() {
+                            // If this run is a forced line break, we *must* break the line
+                            // and start measuring from the inline origin once more.
+                            if run.is_single_preserved_newline() {
+                                self.forced_line_break();
+                                continue;
+                            }
+                            if !matches!(
+                                style_text.white_space_collapse,
+                                WhiteSpaceCollapse::Preserve | WhiteSpaceCollapse::BreakSpaces
+                            ) {
+                                if can_wrap {
+                                    self.line_break_opportunity();
+                                } else if self.had_content_yet_for_min_content {
+                                    self.pending_whitespace.min_content += advance;
+                                }
+                                if self.had_content_yet_for_max_content {
+                                    self.pending_whitespace.max_content += advance;
+                                }
+                                continue;
+                            }
+                            if can_wrap {
+                                self.pending_whitespace.max_content += advance;
+                                self.commit_pending_whitespace();
+                                self.line_break_opportunity();
+                                continue;
+                            }
+                        }
+
+                        self.commit_pending_whitespace();
+                        self.add_inline_size(advance);
+
+                        // Typically whitespace glyphs are placed in a separate store,
+                        // but for `white-space: break-spaces` we place the first whitespace
+                        // with the preceding text. That prevents a line break before that
+                        // first space, but we still need to allow a line break after it.
+                        if can_wrap && run.glyph_store.ends_with_whitespace() {
+                            self.line_break_opportunity();
+                        }
+                    }
+                }
+            },
+            InlineItem::Atomic(atomic, offset_in_text, _level) => {
+                // TODO: need to handle TextWrapMode::Nowrap.
+                if !inline_formatting_context
+                    .previous_character_prevents_soft_wrap_opportunity(*offset_in_text)
+                {
+                    self.line_break_opportunity();
+                }
+
+                let InlineContentSizesResult {
+                    sizes: outer,
+                    depends_on_block_constraints,
+                } = atomic.borrow().outer_inline_content_sizes(
+                    self.layout_context,
+                    &self.constraint_space.into(),
+                    &LogicalVec2::zero(),
+                    false, /* auto_block_size_stretches_to_containing_block */
+                );
+                self.depends_on_block_constraints |= depends_on_block_constraints;
+
+                if !inline_formatting_context
+                    .next_character_prevents_soft_wrap_opportunity(*offset_in_text)
+                {
+                    self.line_break_opportunity();
+                }
+
+                self.commit_pending_whitespace();
+                self.current_line += outer;
+            },
+            _ => {},
+        }
+    }
+
+    fn add_inline_size(&mut self, l: Au) {
+        self.current_line.min_content += l;
+        self.current_line.max_content += l;
+    }
+
+    fn line_break_opportunity(&mut self) {
+        // Clear the pending whitespace, assuming that at the end of the line
+        // it needs to either hang or be removed. If that isn't the case,
+        // `commit_pending_whitespace()` should be called first.
+        self.pending_whitespace.min_content = Au::zero();
+        let current_min_content = mem::take(&mut self.current_line.min_content);
+        self.paragraph.min_content.max_assign(current_min_content);
+        self.had_content_yet_for_min_content = false;
+    }
+
+    fn forced_line_break(&mut self) {
+        // Handle the line break for min-content sizes.
+        self.line_break_opportunity();
+
+        // Repeat the same logic, but now for max-content sizes.
+        self.pending_whitespace.max_content = Au::zero();
+        let current_max_content = mem::take(&mut self.current_line.max_content);
+        self.paragraph.max_content.max_assign(current_max_content);
+        self.had_content_yet_for_max_content = false;
+    }
+
+    fn commit_pending_whitespace(&mut self) {
+        self.current_line += mem::take(&mut self.pending_whitespace);
+        self.had_content_yet_for_min_content = true;
+        self.had_content_yet_for_max_content = true;
+    }
+
+    /// Compute the [`ContentSizes`] of the given [`InlineFormattingContext`].
+    fn compute(
+        inline_formatting_context: &InlineFormattingContext,
+        layout_context: &'layout_data LayoutContext,
+        constraint_space: &'layout_data ConstraintSpace,
+    ) -> InlineContentSizesResult {
+        Self {
+            layout_context,
+            constraint_space,
+            paragraph: ContentSizes::zero(),
+            current_line: ContentSizes::zero(),
+            pending_whitespace: ContentSizes::zero(),
+            had_content_yet_for_min_content: false,
+            had_content_yet_for_max_content: false,
+            ending_inline_pbm_stack: Vec::new(),
+            depends_on_block_constraints: false,
+        }
+        .traverse(inline_formatting_context)
+    }
+}
+
+/// Whether or not this character will rpevent a soft wrap opportunity when it
+/// comes before or after an atomic inline element.
+///
+/// From <https://www.w3.org/TR/css-text-3/#line-break-details>:
+///
+/// > For Web-compatibility there is a soft wrap opportunity before and after each
+/// > replaced element or other atomic inline, even when adjacent to a character that
+/// > would normally suppress them, including U+00A0 NO-BREAK SPACE. However, with
+/// > the exception of U+00A0 NO-BREAK SPACE, there must be no soft wrap opportunity
+/// > between atomic inlines and adjacent characters belonging to the Unicode GL, WJ,
+/// > or ZWJ line breaking classes.
+fn char_prevents_soft_wrap_opportunity_when_before_or_after_atomic(character: char) -> bool {
+    if character == '\u{00A0}' {
+        return false;
+    }
+    let class = linebreak_property(character);
+    class == XI_LINE_BREAKING_CLASS_GL ||
+        class == XI_LINE_BREAKING_CLASS_WJ ||
+        class == XI_LINE_BREAKING_CLASS_ZWJ
+}
diff --git a/components/layout_2020/flow/inline/text_run.rs b/components/layout/flow/inline/text_run.rs
similarity index 90%
rename from components/layout_2020/flow/inline/text_run.rs
rename to components/layout/flow/inline/text_run.rs
index ead6c394131..591c7b9b5e2 100644
--- a/components/layout_2020/flow/inline/text_run.rs
+++ b/components/layout/flow/inline/text_run.rs
@@ -12,6 +12,7 @@ use fonts::{
 };
 use fonts_traits::ByteIndex;
 use log::warn;
+use malloc_size_of_derive::MallocSizeOf;
 use range::Range as ServoRange;
 use servo_arc::Arc;
 use style::computed_values::text_rendering::T as TextRendering;
@@ -25,7 +26,7 @@ use unicode_script::Script;
 use xi_unicode::linebreak_property;
 
 use super::line_breaker::LineBreaker;
-use super::{FontKeyAndMetrics, InlineFormattingContextLayout};
+use super::{FontKeyAndMetrics, InlineFormattingContextLayout, SharedInlineStyles};
 use crate::fragment_tree::BaseFragmentInfo;
 
 // These constants are the xi-unicode line breaking classes that are defined in
@@ -36,18 +37,6 @@ pub(crate) const XI_LINE_BREAKING_CLASS_ZW: u8 = 28;
 pub(crate) const XI_LINE_BREAKING_CLASS_WJ: u8 = 30;
 pub(crate) const XI_LINE_BREAKING_CLASS_ZWJ: u8 = 42;
 
-/// <https://www.w3.org/TR/css-display-3/#css-text-run>
-#[derive(Debug)]
-pub(crate) struct TextRun {
-    pub base_fragment_info: BaseFragmentInfo,
-    pub parent_style: Arc<ComputedValues>,
-    pub text_range: Range<usize>,
-
-    /// The text of this [`TextRun`] with a font selected, broken into unbreakable
-    /// segments, and shaped.
-    pub shaped_text: Vec<TextRunSegment>,
-}
-
 // There are two reasons why we might want to break at the start:
 //
 //  1. The line breaker told us that a break was necessary between two separate
@@ -62,7 +51,7 @@ enum SegmentStartSoftWrapPolicy {
     FollowLinebreaker,
 }
 
-#[derive(Debug)]
+#[derive(Debug, MallocSizeOf)]
 pub(crate) struct TextRunSegment {
     /// The index of this font in the parent [`super::InlineFormattingContext`]'s collection of font
     /// information.
@@ -140,6 +129,7 @@ impl TextRunSegment {
             soft_wrap_policy = SegmentStartSoftWrapPolicy::Force;
         }
 
+        let mut byte_processed = ByteIndex(0);
         for (run_index, run) in self.runs.iter().enumerate() {
             ifc.possibly_flush_deferred_forced_line_break();
 
@@ -147,6 +137,7 @@ impl TextRunSegment {
             // see any content. We don't line break immediately, because we'd like to finish processing
             // any ongoing inline boxes before ending the line.
             if run.is_single_preserved_newline() {
+                byte_processed = byte_processed + run.range.length();
                 ifc.defer_forced_line_break();
                 continue;
             }
@@ -160,7 +151,12 @@ impl TextRunSegment {
                 text_run,
                 self.font_index,
                 self.bidi_level,
+                ServoRange::<ByteIndex>::new(
+                    byte_processed + ByteIndex(self.range.start as isize),
+                    ByteIndex(self.range.len() as isize) - byte_processed,
+                ),
             );
+            byte_processed = byte_processed + run.range.length();
         }
     }
 
@@ -322,17 +318,49 @@ impl TextRunSegment {
     }
 }
 
+/// A single [`TextRun`] for the box tree. These are all descendants of
+/// [`super::InlineBox`] or the root of the [`super::InlineFormattingContext`].  During
+/// box tree construction, text is split into [`TextRun`]s based on their font, script,
+/// etc. When these are created text is already shaped.
+///
+/// <https://www.w3.org/TR/css-display-3/#css-text-run>
+#[derive(Debug, MallocSizeOf)]
+pub(crate) struct TextRun {
+    /// The [`BaseFragmentInfo`] for this [`TextRun`]. Usually this comes from the
+    /// original text node in the DOM for the text.
+    pub base_fragment_info: BaseFragmentInfo,
+
+    /// The [`crate::SharedStyle`] from this [`TextRun`]s parent element. This is
+    /// shared so that incremental layout can simply update the parent element and
+    /// this [`TextRun`] will be updated automatically.
+    pub inline_styles: SharedInlineStyles,
+
+    /// The range of text in [`super::InlineFormattingContext::text_content`] of the
+    /// [`super::InlineFormattingContext`] that owns this [`TextRun`]. These are UTF-8 offsets.
+    pub text_range: Range<usize>,
+
+    /// The text of this [`TextRun`] with a font selected, broken into unbreakable
+    /// segments, and shaped.
+    pub shaped_text: Vec<TextRunSegment>,
+
+    /// The selection range for the DOM text node that originated this [`TextRun`]. This
+    /// comes directly from the DOM.
+    pub selection_range: Option<ServoRange<ByteIndex>>,
+}
+
 impl TextRun {
     pub(crate) fn new(
         base_fragment_info: BaseFragmentInfo,
-        parent_style: Arc<ComputedValues>,
+        inline_styles: SharedInlineStyles,
         text_range: Range<usize>,
+        selection_range: Option<ServoRange<ByteIndex>>,
     ) -> Self {
         Self {
             base_fragment_info,
-            parent_style,
+            inline_styles,
             text_range,
             shaped_text: Vec::new(),
+            selection_range,
         }
     }
 
@@ -344,11 +372,12 @@ impl TextRun {
         font_cache: &mut Vec<FontKeyAndMetrics>,
         bidi_info: &BidiInfo,
     ) {
-        let inherited_text_style = self.parent_style.get_inherited_text().clone();
+        let parent_style = self.inline_styles.style.borrow().clone();
+        let inherited_text_style = parent_style.get_inherited_text().clone();
         let letter_spacing = inherited_text_style
             .letter_spacing
             .0
-            .resolve(self.parent_style.clone_font().font_size.computed_size());
+            .resolve(parent_style.clone_font().font_size.computed_size());
         let letter_spacing = if letter_spacing.px() != 0. {
             Some(app_units::Au::from(letter_spacing))
         } else {
@@ -368,7 +397,13 @@ impl TextRun {
         let style_word_spacing: Option<Au> = specified_word_spacing.to_length().map(|l| l.into());
 
         let segments = self
-            .segment_text_by_font(formatting_context_text, font_context, font_cache, bidi_info)
+            .segment_text_by_font(
+                formatting_context_text,
+                font_context,
+                font_cache,
+                bidi_info,
+                &parent_style,
+            )
             .into_iter()
             .map(|(mut segment, font)| {
                 let word_spacing = style_word_spacing.unwrap_or_else(|| {
@@ -391,7 +426,7 @@ impl TextRun {
                 };
 
                 segment.shape_text(
-                    &self.parent_style,
+                    &parent_style,
                     formatting_context_text,
                     linebreaker,
                     &shaping_options,
@@ -414,8 +449,9 @@ impl TextRun {
         font_context: &FontContext,
         font_cache: &mut Vec<FontKeyAndMetrics>,
         bidi_info: &BidiInfo,
+        parent_style: &Arc<ComputedValues>,
     ) -> Vec<(TextRunSegment, FontRef)> {
-        let font_group = font_context.font_group(self.parent_style.clone_font());
+        let font_group = font_context.font_group(parent_style.clone_font());
         let mut current: Option<(TextRunSegment, FontRef)> = None;
         let mut results = Vec::new();
 
diff --git a/components/layout/flow/mod.rs b/components/layout/flow/mod.rs
new file mode 100644
index 00000000000..6adb63153d6
--- /dev/null
+++ b/components/layout/flow/mod.rs
@@ -0,0 +1,2484 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+#![allow(rustdoc::private_intra_doc_links)]
+
+//! Flow layout, also known as block-and-inline layout.
+
+use app_units::{Au, MAX_AU};
+use inline::InlineFormattingContext;
+use malloc_size_of_derive::MallocSizeOf;
+use rayon::iter::{IndexedParallelIterator, IntoParallelRefIterator, ParallelIterator};
+use script::layout_dom::ServoLayoutNode;
+use servo_arc::Arc;
+use style::Zero;
+use style::computed_values::clear::T as StyleClear;
+use style::context::SharedStyleContext;
+use style::logical_geometry::Direction;
+use style::properties::ComputedValues;
+use style::servo::selector_parser::PseudoElement;
+use style::values::computed::Size as StyleSize;
+use style::values::specified::align::AlignFlags;
+use style::values::specified::{Display, TextAlignKeyword};
+
+use crate::cell::ArcRefCell;
+use crate::context::LayoutContext;
+use crate::dom::NodeExt;
+use crate::flow::float::{
+    Clear, ContainingBlockPositionInfo, FloatBox, FloatSide, PlacementAmongFloats,
+    SequentialLayoutState,
+};
+use crate::formatting_contexts::{
+    Baselines, IndependentFormattingContext, IndependentFormattingContextContents,
+    IndependentNonReplacedContents,
+};
+use crate::fragment_tree::{
+    BaseFragmentInfo, BoxFragment, CollapsedBlockMargins, CollapsedMargin, Fragment, FragmentFlags,
+};
+use crate::geom::{
+    AuOrAuto, LogicalRect, LogicalSides, LogicalSides1D, LogicalVec2, PhysicalPoint, PhysicalRect,
+    PhysicalSides, Size, Sizes, ToLogical, ToLogicalWithContainingBlock,
+};
+use crate::layout_box_base::{CacheableLayoutResult, LayoutBoxBase};
+use crate::positioned::{AbsolutelyPositionedBox, PositioningContext, PositioningContextLength};
+use crate::replaced::ReplacedContents;
+use crate::sizing::{self, ComputeInlineContentSizes, ContentSizes, InlineContentSizesResult};
+use crate::style_ext::{ContentBoxSizesAndPBM, LayoutStyle, PaddingBorderMargin};
+use crate::{
+    ConstraintSpace, ContainingBlock, ContainingBlockSize, IndefiniteContainingBlock,
+    SizeConstraint,
+};
+
+mod construct;
+pub mod float;
+pub mod inline;
+mod root;
+
+pub(crate) use construct::BlockContainerBuilder;
+pub use root::BoxTree;
+
+#[derive(Debug, MallocSizeOf)]
+pub(crate) struct BlockFormattingContext {
+    pub contents: BlockContainer,
+    pub contains_floats: bool,
+}
+
+#[derive(Debug, MallocSizeOf)]
+pub(crate) enum BlockContainer {
+    BlockLevelBoxes(Vec<ArcRefCell<BlockLevelBox>>),
+    InlineFormattingContext(InlineFormattingContext),
+}
+
+impl BlockContainer {
+    fn contains_floats(&self) -> bool {
+        match self {
+            BlockContainer::BlockLevelBoxes(boxes) => boxes
+                .iter()
+                .any(|block_level_box| block_level_box.borrow().contains_floats()),
+            BlockContainer::InlineFormattingContext(context) => context.contains_floats,
+        }
+    }
+}
+
+#[derive(Debug, MallocSizeOf)]
+pub(crate) enum BlockLevelBox {
+    Independent(IndependentFormattingContext),
+    OutOfFlowAbsolutelyPositionedBox(ArcRefCell<AbsolutelyPositionedBox>),
+    OutOfFlowFloatBox(FloatBox),
+    OutsideMarker(OutsideMarker),
+    SameFormattingContextBlock {
+        base: LayoutBoxBase,
+        contents: BlockContainer,
+        contains_floats: bool,
+    },
+}
+
+impl BlockLevelBox {
+    pub(crate) fn repair_style(
+        &mut self,
+        context: &SharedStyleContext,
+        node: &ServoLayoutNode,
+        new_style: &Arc<ComputedValues>,
+    ) {
+        self.with_base_mut(|base| {
+            base.repair_style(new_style);
+        });
+
+        match self {
+            BlockLevelBox::Independent(independent_formatting_context) => {
+                independent_formatting_context.repair_style(context, new_style)
+            },
+            BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(positioned_box) => positioned_box
+                .borrow_mut()
+                .context
+                .repair_style(context, new_style),
+            BlockLevelBox::OutOfFlowFloatBox(float_box) => {
+                float_box.contents.repair_style(context, new_style)
+            },
+            BlockLevelBox::OutsideMarker(outside_marker) => {
+                outside_marker.repair_style(context, node, new_style)
+            },
+            BlockLevelBox::SameFormattingContextBlock { base, .. } => {
+                base.repair_style(new_style);
+            },
+        }
+    }
+
+    pub(crate) fn invalidate_cached_fragment(&self) {
+        self.with_base(LayoutBoxBase::invalidate_cached_fragment);
+    }
+
+    pub(crate) fn fragments(&self) -> Vec<Fragment> {
+        self.with_base(LayoutBoxBase::fragments)
+    }
+
+    pub(crate) fn with_base<T>(&self, callback: impl Fn(&LayoutBoxBase) -> T) -> T {
+        match self {
+            BlockLevelBox::Independent(independent_formatting_context) => {
+                callback(&independent_formatting_context.base)
+            },
+            BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(positioned_box) => {
+                callback(&positioned_box.borrow().context.base)
+            },
+            BlockLevelBox::OutOfFlowFloatBox(float_box) => callback(&float_box.contents.base),
+            BlockLevelBox::OutsideMarker(outside_marker) => callback(&outside_marker.base),
+            BlockLevelBox::SameFormattingContextBlock { base, .. } => callback(base),
+        }
+    }
+
+    pub(crate) fn with_base_mut<T>(&mut self, callback: impl Fn(&mut LayoutBoxBase) -> T) -> T {
+        match self {
+            BlockLevelBox::Independent(independent_formatting_context) => {
+                callback(&mut independent_formatting_context.base)
+            },
+            BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(positioned_box) => {
+                callback(&mut positioned_box.borrow_mut().context.base)
+            },
+            BlockLevelBox::OutOfFlowFloatBox(float_box) => callback(&mut float_box.contents.base),
+            BlockLevelBox::OutsideMarker(outside_marker) => callback(&mut outside_marker.base),
+            BlockLevelBox::SameFormattingContextBlock { base, .. } => callback(base),
+        }
+    }
+
+    fn contains_floats(&self) -> bool {
+        match self {
+            BlockLevelBox::SameFormattingContextBlock {
+                contains_floats, ..
+            } => *contains_floats,
+            BlockLevelBox::OutOfFlowFloatBox { .. } => true,
+            _ => false,
+        }
+    }
+
+    fn find_block_margin_collapsing_with_parent(
+        &self,
+        layout_context: &LayoutContext,
+        collected_margin: &mut CollapsedMargin,
+        containing_block: &ContainingBlock,
+    ) -> bool {
+        let layout_style = match self {
+            BlockLevelBox::SameFormattingContextBlock { base, contents, .. } => {
+                contents.layout_style(base)
+            },
+            BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(_) |
+            BlockLevelBox::OutOfFlowFloatBox(_) => return true,
+            BlockLevelBox::OutsideMarker(_) => return false,
+            BlockLevelBox::Independent(context) => {
+                // FIXME: If the element doesn't fit next to floats, it will get clearance.
+                // In that case this should be returning false.
+                context.layout_style()
+            },
+        };
+
+        // FIXME: This should only return false when 'clear' causes clearance.
+        let style = layout_style.style();
+        if style.get_box().clear != StyleClear::None {
+            return false;
+        }
+
+        let ContentBoxSizesAndPBM {
+            content_box_sizes,
+            pbm,
+            ..
+        } = layout_style.content_box_sizes_and_padding_border_margin(&containing_block.into());
+        let margin = pbm.margin.auto_is(Au::zero);
+        collected_margin.adjoin_assign(&CollapsedMargin::new(margin.block_start));
+
+        let child_boxes = match self {
+            BlockLevelBox::SameFormattingContextBlock { contents, .. } => match contents {
+                BlockContainer::BlockLevelBoxes(boxes) => boxes,
+                BlockContainer::InlineFormattingContext(_) => return false,
+            },
+            _ => return false,
+        };
+
+        if !pbm.padding.block_start.is_zero() || !pbm.border.block_start.is_zero() {
+            return false;
+        }
+
+        let available_inline_size =
+            containing_block.size.inline - pbm.padding_border_sums.inline - margin.inline_sum();
+        let available_block_size = containing_block.size.block.to_definite().map(|block_size| {
+            Au::zero().max(block_size - pbm.padding_border_sums.block - margin.block_sum())
+        });
+
+        let tentative_block_size = content_box_sizes.block.resolve_extrinsic(
+            Size::FitContent,
+            Au::zero(),
+            available_block_size,
+        );
+
+        let get_inline_content_sizes = || {
+            let constraint_space = ConstraintSpace::new(
+                tentative_block_size,
+                style.writing_mode,
+                None, /* TODO: support preferred aspect ratios on non-replaced boxes */
+            );
+            self.inline_content_sizes(layout_context, &constraint_space)
+                .sizes
+        };
+        let inline_size = content_box_sizes.inline.resolve(
+            Direction::Inline,
+            Size::Stretch,
+            Au::zero,
+            Some(available_inline_size),
+            get_inline_content_sizes,
+            false, /* is_table */
+        );
+
+        let containing_block_for_children = ContainingBlock {
+            size: ContainingBlockSize {
+                inline: inline_size,
+                block: tentative_block_size,
+            },
+            style,
+        };
+
+        if !Self::find_block_margin_collapsing_with_parent_from_slice(
+            layout_context,
+            child_boxes,
+            collected_margin,
+            &containing_block_for_children,
+        ) {
+            return false;
+        }
+
+        if !block_size_is_zero_or_intrinsic(style.content_block_size(), containing_block) ||
+            !block_size_is_zero_or_intrinsic(style.min_block_size(), containing_block) ||
+            !pbm.padding_border_sums.block.is_zero()
+        {
+            return false;
+        }
+
+        collected_margin.adjoin_assign(&CollapsedMargin::new(margin.block_end));
+
+        true
+    }
+
+    fn find_block_margin_collapsing_with_parent_from_slice(
+        layout_context: &LayoutContext,
+        boxes: &[ArcRefCell<BlockLevelBox>],
+        margin: &mut CollapsedMargin,
+        containing_block: &ContainingBlock,
+    ) -> bool {
+        boxes.iter().all(|block_level_box| {
+            block_level_box
+                .borrow()
+                .find_block_margin_collapsing_with_parent(layout_context, margin, containing_block)
+        })
+    }
+}
+
+#[derive(Clone, Copy)]
+pub(crate) struct CollapsibleWithParentStartMargin(bool);
+
+/// The contentes of a BlockContainer created to render a list marker
+/// for a list that has `list-style-position: outside`.
+#[derive(Debug, MallocSizeOf)]
+pub(crate) struct OutsideMarker {
+    pub list_item_style: Arc<ComputedValues>,
+    pub base: LayoutBoxBase,
+    pub block_container: BlockContainer,
+}
+
+impl OutsideMarker {
+    fn inline_content_sizes(
+        &self,
+        layout_context: &LayoutContext,
+        constraint_space: &ConstraintSpace,
+    ) -> InlineContentSizesResult {
+        self.base
+            .inline_content_sizes(layout_context, constraint_space, &self.block_container)
+    }
+
+    fn layout(
+        &self,
+        layout_context: &LayoutContext<'_>,
+        containing_block: &ContainingBlock<'_>,
+        positioning_context: &mut PositioningContext,
+        sequential_layout_state: Option<&mut SequentialLayoutState>,
+        collapsible_with_parent_start_margin: Option<CollapsibleWithParentStartMargin>,
+    ) -> Fragment {
+        let constraint_space = ConstraintSpace::new_for_style_and_ratio(
+            &self.base.style,
+            None, /* TODO: support preferred aspect ratios on non-replaced boxes */
+        );
+        let content_sizes = self.inline_content_sizes(layout_context, &constraint_space);
+        let containing_block_for_children = ContainingBlock {
+            size: ContainingBlockSize {
+                inline: content_sizes.sizes.max_content,
+                block: SizeConstraint::default(),
+            },
+            style: &self.base.style,
+        };
+
+        // A ::marker can't have a stretch size (must be auto), so this doesn't matter.
+        // https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing
+        let ignore_block_margins_for_stretch = LogicalSides1D::new(false, false);
+
+        let flow_layout = self.block_container.layout(
+            layout_context,
+            positioning_context,
+            &containing_block_for_children,
+            sequential_layout_state,
+            collapsible_with_parent_start_margin.unwrap_or(CollapsibleWithParentStartMargin(false)),
+            ignore_block_margins_for_stretch,
+        );
+
+        let max_inline_size =
+            flow_layout
+                .fragments
+                .iter()
+                .fold(Au::zero(), |current_max, fragment| {
+                    current_max.max(
+                        match fragment {
+                            Fragment::Text(text) => text.borrow().rect,
+                            Fragment::Image(image) => image.borrow().rect,
+                            Fragment::Positioning(positioning) => positioning.borrow().rect,
+                            Fragment::Box(_) |
+                            Fragment::Float(_) |
+                            Fragment::AbsoluteOrFixedPositioned(_) |
+                            Fragment::IFrame(_) => {
+                                unreachable!(
+                                    "Found unexpected fragment type in outside list marker!"
+                                );
+                            },
+                        }
+                        .to_logical(&containing_block_for_children)
+                        .max_inline_position(),
+                    )
+                });
+
+        // Position the marker beyond the inline start of the border box list item. This needs to
+        // take into account the border and padding of the item.
+        //
+        // TODO: This is the wrong containing block, as it should be the containing block of the
+        // parent of this list item. What this means in practice is that the writing mode could be
+        // wrong and padding defined as a percentage will be resolved incorrectly.
+        //
+        // TODO: This should use the LayoutStyle of the list item, not the default one. Currently
+        // they are the same, but this could change in the future.
+        let pbm_of_list_item =
+            LayoutStyle::Default(&self.list_item_style).padding_border_margin(containing_block);
+        let content_rect = LogicalRect {
+            start_corner: LogicalVec2 {
+                inline: -max_inline_size -
+                    (pbm_of_list_item.border.inline_start +
+                        pbm_of_list_item.padding.inline_start),
+                block: Zero::zero(),
+            },
+            size: LogicalVec2 {
+                inline: max_inline_size,
+                block: flow_layout.content_block_size,
+            },
+        };
+
+        let mut base_fragment_info = BaseFragmentInfo::anonymous();
+        base_fragment_info.flags |= FragmentFlags::IS_OUTSIDE_LIST_ITEM_MARKER;
+
+        Fragment::Box(ArcRefCell::new(BoxFragment::new(
+            base_fragment_info,
+            self.base.style.clone(),
+            flow_layout.fragments,
+            content_rect.as_physical(Some(containing_block)),
+            PhysicalSides::zero(),
+            PhysicalSides::zero(),
+            PhysicalSides::zero(),
+            None,
+        )))
+    }
+
+    fn repair_style(
+        &mut self,
+        context: &SharedStyleContext,
+        node: &ServoLayoutNode,
+        new_style: &Arc<ComputedValues>,
+    ) {
+        self.list_item_style = node.style(context);
+        self.base.repair_style(new_style);
+    }
+}
+
+impl BlockFormattingContext {
+    pub(super) fn layout(
+        &self,
+        layout_context: &LayoutContext,
+        positioning_context: &mut PositioningContext,
+        containing_block: &ContainingBlock,
+        depends_on_block_constraints: bool,
+    ) -> CacheableLayoutResult {
+        let mut sequential_layout_state = if self.contains_floats || !layout_context.use_rayon {
+            Some(SequentialLayoutState::new(containing_block.size.inline))
+        } else {
+            None
+        };
+
+        // Since this is an independent formatting context, we don't ignore block margins when
+        // resolving a stretch block size of the children.
+        // https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing
+        let ignore_block_margins_for_stretch = LogicalSides1D::new(false, false);
+
+        let flow_layout = self.contents.layout(
+            layout_context,
+            positioning_context,
+            containing_block,
+            sequential_layout_state.as_mut(),
+            CollapsibleWithParentStartMargin(false),
+            ignore_block_margins_for_stretch,
+        );
+        debug_assert!(
+            !flow_layout
+                .collapsible_margins_in_children
+                .collapsed_through
+        );
+
+        // The content height of a BFC root should include any float participating in that BFC
+        // (https://drafts.csswg.org/css2/#root-height), we implement this by imagining there is
+        // an element with `clear: both` after the actual contents.
+        let clearance = sequential_layout_state.and_then(|sequential_layout_state| {
+            sequential_layout_state.calculate_clearance(Clear::Both, &CollapsedMargin::zero())
+        });
+
+        CacheableLayoutResult {
+            fragments: flow_layout.fragments,
+            content_block_size: flow_layout.content_block_size +
+                flow_layout.collapsible_margins_in_children.end.solve() +
+                clearance.unwrap_or_default(),
+            content_inline_size_for_table: None,
+            baselines: flow_layout.baselines,
+            depends_on_block_constraints: depends_on_block_constraints ||
+                flow_layout.depends_on_block_constraints,
+            specific_layout_info: None,
+            collapsible_margins_in_children: CollapsedBlockMargins::zero(),
+        }
+    }
+
+    #[inline]
+    pub(crate) fn layout_style<'a>(&self, base: &'a LayoutBoxBase) -> LayoutStyle<'a> {
+        LayoutStyle::Default(&base.style)
+    }
+}
+
+/// Finds the min/max-content inline size of the block-level children of a block container.
+/// The in-flow boxes will stack vertically, so we only need to consider the maximum size.
+/// But floats can flow horizontally depending on 'clear', so we may need to sum their sizes.
+/// CSS 2 does not define the exact algorithm, this logic is based on the behavior observed
+/// on Gecko and Blink.
+fn compute_inline_content_sizes_for_block_level_boxes(
+    boxes: &[ArcRefCell<BlockLevelBox>],
+    layout_context: &LayoutContext,
+    containing_block: &IndefiniteContainingBlock,
+) -> InlineContentSizesResult {
+    let get_box_info = |box_: &ArcRefCell<BlockLevelBox>| {
+        match &*box_.borrow() {
+            BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(_) |
+            BlockLevelBox::OutsideMarker { .. } => None,
+            BlockLevelBox::OutOfFlowFloatBox(float_box) => {
+                let inline_content_sizes_result = float_box.contents.outer_inline_content_sizes(
+                    layout_context,
+                    containing_block,
+                    &LogicalVec2::zero(),
+                    false, /* auto_block_size_stretches_to_containing_block */
+                );
+                let style = &float_box.contents.style();
+                Some((
+                    inline_content_sizes_result,
+                    FloatSide::from_style_and_container_writing_mode(
+                        style,
+                        containing_block.writing_mode,
+                    ),
+                    Clear::from_style_and_container_writing_mode(
+                        style,
+                        containing_block.writing_mode,
+                    ),
+                ))
+            },
+            BlockLevelBox::SameFormattingContextBlock { base, contents, .. } => {
+                let inline_content_sizes_result = sizing::outer_inline(
+                    &contents.layout_style(base),
+                    containing_block,
+                    &LogicalVec2::zero(),
+                    false, /* auto_block_size_stretches_to_containing_block */
+                    false, /* is_replaced */
+                    !matches!(base.style.pseudo(), Some(PseudoElement::ServoAnonymousBox)),
+                    |_| None, /* TODO: support preferred aspect ratios on non-replaced boxes */
+                    |constraint_space| {
+                        base.inline_content_sizes(layout_context, constraint_space, contents)
+                    },
+                );
+                // A block in the same BFC can overlap floats, it's not moved next to them,
+                // so we shouldn't add its size to the size of the floats.
+                // Instead, we treat it like an independent block with 'clear: both'.
+                Some((inline_content_sizes_result, None, Clear::Both))
+            },
+            BlockLevelBox::Independent(independent) => {
+                let inline_content_sizes_result = independent.outer_inline_content_sizes(
+                    layout_context,
+                    containing_block,
+                    &LogicalVec2::zero(),
+                    false, /* auto_block_size_stretches_to_containing_block */
+                );
+                Some((
+                    inline_content_sizes_result,
+                    None,
+                    Clear::from_style_and_container_writing_mode(
+                        independent.style(),
+                        containing_block.writing_mode,
+                    ),
+                ))
+            },
+        }
+    };
+
+    /// When iterating the block-level boxes to compute the inline content sizes,
+    /// this struct contains the data accumulated up to the current box.
+    #[derive(Default)]
+    struct AccumulatedData {
+        /// Whether the inline size depends on the block one.
+        depends_on_block_constraints: bool,
+        /// The maximum size seen so far, not including trailing uncleared floats.
+        max_size: ContentSizes,
+        /// The size of the trailing uncleared floats on the inline-start side
+        /// of the containing block.
+        start_floats: ContentSizes,
+        /// The size of the trailing uncleared floats on the inline-end side
+        /// of the containing block.
+        end_floats: ContentSizes,
+    }
+
+    impl AccumulatedData {
+        fn max_size_including_uncleared_floats(&self) -> ContentSizes {
+            self.max_size.max(self.start_floats.union(&self.end_floats))
+        }
+        fn clear_floats(&mut self, clear: Clear) {
+            match clear {
+                Clear::InlineStart => {
+                    self.max_size = self.max_size_including_uncleared_floats();
+                    self.start_floats = ContentSizes::zero();
+                },
+                Clear::InlineEnd => {
+                    self.max_size = self.max_size_including_uncleared_floats();
+                    self.end_floats = ContentSizes::zero();
+                },
+                Clear::Both => {
+                    self.max_size = self.max_size_including_uncleared_floats();
+                    self.start_floats = ContentSizes::zero();
+                    self.end_floats = ContentSizes::zero();
+                },
+                Clear::None => {},
+            };
+        }
+    }
+
+    let accumulate =
+        |mut data: AccumulatedData,
+         (inline_content_sizes_result, float, clear): (InlineContentSizesResult, _, _)| {
+            let size = inline_content_sizes_result.sizes.max(ContentSizes::zero());
+            let depends_on_block_constraints =
+                inline_content_sizes_result.depends_on_block_constraints;
+            data.depends_on_block_constraints |= depends_on_block_constraints;
+            data.clear_floats(clear);
+            match float {
+                Some(FloatSide::InlineStart) => data.start_floats = data.start_floats.union(&size),
+                Some(FloatSide::InlineEnd) => data.end_floats = data.end_floats.union(&size),
+                None => {
+                    data.max_size = data
+                        .max_size
+                        .max(data.start_floats.union(&data.end_floats).union(&size));
+                    data.start_floats = ContentSizes::zero();
+                    data.end_floats = ContentSizes::zero();
+                },
+            }
+            data
+        };
+    let data = if layout_context.use_rayon {
+        boxes
+            .par_iter()
+            .filter_map(get_box_info)
+            .collect::<Vec<_>>()
+            .into_iter()
+            .fold(AccumulatedData::default(), accumulate)
+    } else {
+        boxes
+            .iter()
+            .filter_map(get_box_info)
+            .fold(AccumulatedData::default(), accumulate)
+    };
+    InlineContentSizesResult {
+        depends_on_block_constraints: data.depends_on_block_constraints,
+        sizes: data.max_size_including_uncleared_floats(),
+    }
+}
+
+impl BlockContainer {
+    fn layout(
+        &self,
+        layout_context: &LayoutContext,
+        positioning_context: &mut PositioningContext,
+        containing_block: &ContainingBlock,
+        sequential_layout_state: Option<&mut SequentialLayoutState>,
+        collapsible_with_parent_start_margin: CollapsibleWithParentStartMargin,
+        ignore_block_margins_for_stretch: LogicalSides1D<bool>,
+    ) -> CacheableLayoutResult {
+        match self {
+            BlockContainer::BlockLevelBoxes(child_boxes) => layout_block_level_children(
+                layout_context,
+                positioning_context,
+                child_boxes,
+                containing_block,
+                sequential_layout_state,
+                collapsible_with_parent_start_margin,
+                ignore_block_margins_for_stretch,
+            ),
+            BlockContainer::InlineFormattingContext(ifc) => ifc.layout(
+                layout_context,
+                positioning_context,
+                containing_block,
+                sequential_layout_state,
+                collapsible_with_parent_start_margin,
+            ),
+        }
+    }
+
+    #[inline]
+    pub(crate) fn layout_style<'a>(&self, base: &'a LayoutBoxBase) -> LayoutStyle<'a> {
+        LayoutStyle::Default(&base.style)
+    }
+}
+
+impl ComputeInlineContentSizes for BlockContainer {
+    fn compute_inline_content_sizes(
+        &self,
+        layout_context: &LayoutContext,
+        constraint_space: &ConstraintSpace,
+    ) -> InlineContentSizesResult {
+        match &self {
+            Self::BlockLevelBoxes(boxes) => compute_inline_content_sizes_for_block_level_boxes(
+                boxes,
+                layout_context,
+                &constraint_space.into(),
+            ),
+            Self::InlineFormattingContext(context) => {
+                context.compute_inline_content_sizes(layout_context, constraint_space)
+            },
+        }
+    }
+}
+
+fn layout_block_level_children(
+    layout_context: &LayoutContext,
+    positioning_context: &mut PositioningContext,
+    child_boxes: &[ArcRefCell<BlockLevelBox>],
+    containing_block: &ContainingBlock,
+    mut sequential_layout_state: Option<&mut SequentialLayoutState>,
+    collapsible_with_parent_start_margin: CollapsibleWithParentStartMargin,
+    ignore_block_margins_for_stretch: LogicalSides1D<bool>,
+) -> CacheableLayoutResult {
+    let mut placement_state =
+        PlacementState::new(collapsible_with_parent_start_margin, containing_block);
+
+    let fragments = match sequential_layout_state {
+        Some(ref mut sequential_layout_state) => layout_block_level_children_sequentially(
+            layout_context,
+            positioning_context,
+            child_boxes,
+            containing_block,
+            sequential_layout_state,
+            &mut placement_state,
+            ignore_block_margins_for_stretch,
+        ),
+        None => layout_block_level_children_in_parallel(
+            layout_context,
+            positioning_context,
+            child_boxes,
+            containing_block,
+            &mut placement_state,
+            ignore_block_margins_for_stretch,
+        ),
+    };
+
+    let depends_on_block_constraints = fragments.iter().any(|fragment| {
+        fragment.base().is_some_and(|base| {
+            base.flags.contains(
+                FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM,
+            )
+        })
+    });
+
+    let (content_block_size, collapsible_margins_in_children, baselines) = placement_state.finish();
+    CacheableLayoutResult {
+        fragments,
+        content_block_size,
+        collapsible_margins_in_children,
+        baselines,
+        depends_on_block_constraints,
+        content_inline_size_for_table: None,
+        specific_layout_info: None,
+    }
+}
+
+fn layout_block_level_children_in_parallel(
+    layout_context: &LayoutContext,
+    positioning_context: &mut PositioningContext,
+    child_boxes: &[ArcRefCell<BlockLevelBox>],
+    containing_block: &ContainingBlock,
+    placement_state: &mut PlacementState,
+    ignore_block_margins_for_stretch: LogicalSides1D<bool>,
+) -> Vec<Fragment> {
+    let mut layout_results: Vec<(Fragment, PositioningContext)> =
+        Vec::with_capacity(child_boxes.len());
+
+    child_boxes
+        .par_iter()
+        .map(|child_box| {
+            let mut child_positioning_context = PositioningContext::default();
+            let fragment = child_box.borrow().layout(
+                layout_context,
+                &mut child_positioning_context,
+                containing_block,
+                /* sequential_layout_state = */ None,
+                /* collapsible_with_parent_start_margin = */ None,
+                ignore_block_margins_for_stretch,
+            );
+            (fragment, child_positioning_context)
+        })
+        .collect_into_vec(&mut layout_results);
+
+    layout_results
+        .into_iter()
+        .map(|(mut fragment, mut child_positioning_context)| {
+            placement_state.place_fragment_and_update_baseline(&mut fragment, None);
+            child_positioning_context.adjust_static_position_of_hoisted_fragments(
+                &fragment,
+                PositioningContextLength::zero(),
+            );
+            positioning_context.append(child_positioning_context);
+            fragment
+        })
+        .collect()
+}
+
+fn layout_block_level_children_sequentially(
+    layout_context: &LayoutContext,
+    positioning_context: &mut PositioningContext,
+    child_boxes: &[ArcRefCell<BlockLevelBox>],
+    containing_block: &ContainingBlock,
+    sequential_layout_state: &mut SequentialLayoutState,
+    placement_state: &mut PlacementState,
+    ignore_block_margins_for_stretch: LogicalSides1D<bool>,
+) -> Vec<Fragment> {
+    // Because floats are involved, we do layout for this block formatting context in tree
+    // order without parallelism. This enables mutable access to a `SequentialLayoutState` that
+    // tracks every float encountered so far (again in tree order).
+    child_boxes
+        .iter()
+        .map(|child_box| {
+            let positioning_context_length_before_layout = positioning_context.len();
+            let mut fragment = child_box.borrow().layout(
+                layout_context,
+                positioning_context,
+                containing_block,
+                Some(&mut *sequential_layout_state),
+                Some(CollapsibleWithParentStartMargin(
+                    placement_state.next_in_flow_margin_collapses_with_parent_start_margin,
+                )),
+                ignore_block_margins_for_stretch,
+            );
+
+            placement_state
+                .place_fragment_and_update_baseline(&mut fragment, Some(sequential_layout_state));
+            positioning_context.adjust_static_position_of_hoisted_fragments(
+                &fragment,
+                positioning_context_length_before_layout,
+            );
+
+            fragment
+        })
+        .collect()
+}
+
+impl BlockLevelBox {
+    fn layout(
+        &self,
+        layout_context: &LayoutContext,
+        positioning_context: &mut PositioningContext,
+        containing_block: &ContainingBlock,
+        sequential_layout_state: Option<&mut SequentialLayoutState>,
+        collapsible_with_parent_start_margin: Option<CollapsibleWithParentStartMargin>,
+        ignore_block_margins_for_stretch: LogicalSides1D<bool>,
+    ) -> Fragment {
+        let fragment = match self {
+            BlockLevelBox::SameFormattingContextBlock { base, contents, .. } => Fragment::Box(
+                ArcRefCell::new(positioning_context.layout_maybe_position_relative_fragment(
+                    layout_context,
+                    containing_block,
+                    base,
+                    |positioning_context| {
+                        layout_in_flow_non_replaced_block_level_same_formatting_context(
+                            layout_context,
+                            positioning_context,
+                            containing_block,
+                            base,
+                            contents,
+                            sequential_layout_state,
+                            collapsible_with_parent_start_margin,
+                            ignore_block_margins_for_stretch,
+                        )
+                    },
+                )),
+            ),
+            BlockLevelBox::Independent(independent) => Fragment::Box(ArcRefCell::new(
+                positioning_context.layout_maybe_position_relative_fragment(
+                    layout_context,
+                    containing_block,
+                    &independent.base,
+                    |positioning_context| {
+                        independent.layout_in_flow_block_level(
+                            layout_context,
+                            positioning_context,
+                            containing_block,
+                            sequential_layout_state,
+                            ignore_block_margins_for_stretch,
+                        )
+                    },
+                ),
+            )),
+            BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(box_) => {
+                // The static position of zero here is incorrect, however we do not know
+                // the correct positioning until later, in place_block_level_fragment, and
+                // this value will be adjusted there.
+                let hoisted_box = AbsolutelyPositionedBox::to_hoisted(
+                    box_.clone(),
+                    // This is incorrect, however we do not know the correct positioning
+                    // until later, in PlacementState::place_fragment, and this value will be
+                    // adjusted there
+                    PhysicalRect::zero(),
+                    LogicalVec2 {
+                        inline: AlignFlags::START,
+                        block: AlignFlags::START,
+                    },
+                    containing_block.style.writing_mode,
+                );
+                let hoisted_fragment = hoisted_box.fragment.clone();
+                positioning_context.push(hoisted_box);
+                Fragment::AbsoluteOrFixedPositioned(hoisted_fragment)
+            },
+            BlockLevelBox::OutOfFlowFloatBox(float_box) => Fragment::Float(ArcRefCell::new(
+                float_box.layout(layout_context, positioning_context, containing_block),
+            )),
+            BlockLevelBox::OutsideMarker(outside_marker) => outside_marker.layout(
+                layout_context,
+                containing_block,
+                positioning_context,
+                sequential_layout_state,
+                collapsible_with_parent_start_margin,
+            ),
+        };
+
+        self.with_base(|base| base.set_fragment(fragment.clone()));
+
+        fragment
+    }
+
+    fn inline_content_sizes(
+        &self,
+        layout_context: &LayoutContext,
+        constraint_space: &ConstraintSpace,
+    ) -> InlineContentSizesResult {
+        let independent_formatting_context = match self {
+            BlockLevelBox::Independent(independent) => independent,
+            BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(box_) => &box_.borrow().context,
+            BlockLevelBox::OutOfFlowFloatBox(float_box) => &float_box.contents,
+            BlockLevelBox::OutsideMarker(outside_marker) => {
+                return outside_marker.inline_content_sizes(layout_context, constraint_space);
+            },
+            BlockLevelBox::SameFormattingContextBlock { base, contents, .. } => {
+                return base.inline_content_sizes(layout_context, constraint_space, contents);
+            },
+        };
+        independent_formatting_context.inline_content_sizes(layout_context, constraint_space)
+    }
+}
+
+/// Lay out a normal flow non-replaced block that does not establish a new formatting
+/// context.
+///
+/// - <https://drafts.csswg.org/css2/visudet.html#blockwidth>
+/// - <https://drafts.csswg.org/css2/visudet.html#normal-block>
+#[allow(clippy::too_many_arguments)]
+fn layout_in_flow_non_replaced_block_level_same_formatting_context(
+    layout_context: &LayoutContext,
+    positioning_context: &mut PositioningContext,
+    containing_block: &ContainingBlock,
+    base: &LayoutBoxBase,
+    contents: &BlockContainer,
+    mut sequential_layout_state: Option<&mut SequentialLayoutState>,
+    collapsible_with_parent_start_margin: Option<CollapsibleWithParentStartMargin>,
+    ignore_block_margins_for_stretch: LogicalSides1D<bool>,
+) -> BoxFragment {
+    let style = &base.style;
+    let layout_style = contents.layout_style(base);
+    let containing_block_writing_mode = containing_block.style.writing_mode;
+    let get_inline_content_sizes = |constraint_space: &ConstraintSpace| {
+        base.inline_content_sizes(layout_context, constraint_space, contents)
+            .sizes
+    };
+    let ContainingBlockPaddingAndBorder {
+        containing_block: containing_block_for_children,
+        pbm,
+        block_sizes,
+        depends_on_block_constraints,
+        available_block_size,
+        justify_self,
+    } = solve_containing_block_padding_and_border_for_in_flow_box(
+        containing_block,
+        &layout_style,
+        get_inline_content_sizes,
+        ignore_block_margins_for_stretch,
+    );
+    let ResolvedMargins {
+        margin,
+        effective_margin_inline_start,
+    } = solve_margins(
+        containing_block,
+        &pbm,
+        containing_block_for_children.size.inline,
+        justify_self,
+    );
+
+    let computed_block_size = style.content_block_size();
+    let start_margin_can_collapse_with_children =
+        pbm.padding.block_start.is_zero() && pbm.border.block_start.is_zero();
+
+    let mut clearance = None;
+    let parent_containing_block_position_info;
+    match sequential_layout_state {
+        None => parent_containing_block_position_info = None,
+        Some(ref mut sequential_layout_state) => {
+            let clear =
+                Clear::from_style_and_container_writing_mode(style, containing_block_writing_mode);
+            let mut block_start_margin = CollapsedMargin::new(margin.block_start);
+
+            // The block start margin may collapse with content margins,
+            // compute the resulting one in order to place floats correctly.
+            // Only need to do this if the element isn't also collapsing with its parent,
+            // otherwise we should have already included the margin in an ancestor.
+            // Note this lookahead stops when finding a descendant whose `clear` isn't `none`
+            // (since clearance prevents collapsing margins with the parent).
+            // But then we have to decide whether to actually add clearance or not,
+            // so look forward again regardless of `collapsible_with_parent_start_margin`.
+            // TODO: This isn't completely right: if we don't add actual clearance,
+            // the margin should have been included in the parent (or some ancestor).
+            // The lookahead should stop for actual clearance, not just for `clear`.
+            let collapsible_with_parent_start_margin = collapsible_with_parent_start_margin.expect(
+                "We should know whether we are collapsing the block start margin with the parent \
+                when laying out sequentially",
+            ).0 && clear == Clear::None;
+            if !collapsible_with_parent_start_margin && start_margin_can_collapse_with_children {
+                if let BlockContainer::BlockLevelBoxes(child_boxes) = contents {
+                    BlockLevelBox::find_block_margin_collapsing_with_parent_from_slice(
+                        layout_context,
+                        child_boxes,
+                        &mut block_start_margin,
+                        &containing_block_for_children,
+                    );
+                }
+            }
+
+            // Introduce clearance if necessary.
+            clearance = sequential_layout_state.calculate_clearance(clear, &block_start_margin);
+            if clearance.is_some() {
+                sequential_layout_state.collapse_margins();
+            }
+            sequential_layout_state.adjoin_assign(&block_start_margin);
+            if !start_margin_can_collapse_with_children {
+                sequential_layout_state.collapse_margins();
+            }
+
+            // NB: This will be a no-op if we're collapsing margins with our children since that
+            // can only happen if we have no block-start padding and border.
+            sequential_layout_state.advance_block_position(
+                pbm.padding.block_start +
+                    pbm.border.block_start +
+                    clearance.unwrap_or_else(Au::zero),
+            );
+
+            // We are about to lay out children. Update the offset between the block formatting
+            // context and the containing block that we create for them. This offset is used to
+            // ajust BFC relative coordinates to coordinates that are relative to our content box.
+            // Our content box establishes the containing block for non-abspos children, including
+            // floats.
+            let inline_start = sequential_layout_state
+                .floats
+                .containing_block_info
+                .inline_start +
+                pbm.padding.inline_start +
+                pbm.border.inline_start +
+                effective_margin_inline_start;
+            let new_cb_offsets = ContainingBlockPositionInfo {
+                block_start: sequential_layout_state.bfc_relative_block_position,
+                block_start_margins_not_collapsed: sequential_layout_state.current_margin,
+                inline_start,
+                inline_end: inline_start + containing_block_for_children.size.inline,
+            };
+            parent_containing_block_position_info = Some(
+                sequential_layout_state.replace_containing_block_position_info(new_cb_offsets),
+            );
+        },
+    };
+
+    // https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing
+    // > If this is a block axis size, and the element is in a Block Layout formatting context,
+    // > and the parent element does not have a block-start border or padding and is not an
+    // > independent formatting context, treat the element’s block-start margin as zero
+    // > for the purpose of calculating this size. Do the same for the block-end margin.
+    let ignore_block_margins_for_stretch = LogicalSides1D::new(
+        pbm.border.block_start.is_zero() && pbm.padding.block_start.is_zero(),
+        pbm.border.block_end.is_zero() && pbm.padding.block_end.is_zero(),
+    );
+
+    let flow_layout = contents.layout(
+        layout_context,
+        positioning_context,
+        &containing_block_for_children,
+        sequential_layout_state.as_deref_mut(),
+        CollapsibleWithParentStartMargin(start_margin_can_collapse_with_children),
+        ignore_block_margins_for_stretch,
+    );
+    let mut content_block_size: Au = flow_layout.content_block_size;
+
+    // Update margins.
+    let mut block_margins_collapsed_with_children = CollapsedBlockMargins::from_margin(&margin);
+    let mut collapsible_margins_in_children = flow_layout.collapsible_margins_in_children;
+    if start_margin_can_collapse_with_children {
+        block_margins_collapsed_with_children
+            .start
+            .adjoin_assign(&collapsible_margins_in_children.start);
+        if collapsible_margins_in_children.collapsed_through {
+            block_margins_collapsed_with_children
+                .start
+                .adjoin_assign(&std::mem::replace(
+                    &mut collapsible_margins_in_children.end,
+                    CollapsedMargin::zero(),
+                ));
+        }
+    }
+
+    let collapsed_through = collapsible_margins_in_children.collapsed_through &&
+        pbm.padding_border_sums.block.is_zero() &&
+        block_size_is_zero_or_intrinsic(computed_block_size, containing_block) &&
+        block_size_is_zero_or_intrinsic(style.min_block_size(), containing_block);
+    block_margins_collapsed_with_children.collapsed_through = collapsed_through;
+
+    let end_margin_can_collapse_with_children = collapsed_through ||
+        (pbm.padding.block_end.is_zero() &&
+            pbm.border.block_end.is_zero() &&
+            !containing_block_for_children.size.block.is_definite());
+    if end_margin_can_collapse_with_children {
+        block_margins_collapsed_with_children
+            .end
+            .adjoin_assign(&collapsible_margins_in_children.end);
+    } else {
+        content_block_size += collapsible_margins_in_children.end.solve();
+    }
+
+    let block_size = block_sizes.resolve(
+        Direction::Block,
+        Size::FitContent,
+        Au::zero,
+        available_block_size,
+        || content_block_size.into(),
+        false, /* is_table */
+    );
+
+    if let Some(ref mut sequential_layout_state) = sequential_layout_state {
+        // Now that we're done laying out our children, we can restore the
+        // parent's containing block position information.
+        sequential_layout_state
+            .replace_containing_block_position_info(parent_containing_block_position_info.unwrap());
+
+        // Account for padding and border. We also might have to readjust the
+        // `bfc_relative_block_position` if it was different from the content size (i.e. was
+        // non-`auto` and/or was affected by min/max block size).
+        //
+        // If this adjustment is positive, that means that a block size was specified, but
+        // the content inside had a smaller block size. If this adjustment is negative, a
+        // block size was specified, but the content inside overflowed this container in
+        // the block direction. In that case, the ceiling for floats is effectively raised
+        // as long as no floats in the overflowing content lowered it.
+        sequential_layout_state.advance_block_position(
+            block_size - content_block_size + pbm.padding.block_end + pbm.border.block_end,
+        );
+
+        if !end_margin_can_collapse_with_children {
+            sequential_layout_state.collapse_margins();
+        }
+        sequential_layout_state.adjoin_assign(&CollapsedMargin::new(margin.block_end));
+    }
+
+    let content_rect = LogicalRect {
+        start_corner: LogicalVec2 {
+            block: (pbm.padding.block_start +
+                pbm.border.block_start +
+                clearance.unwrap_or_else(Au::zero)),
+            inline: pbm.padding.inline_start +
+                pbm.border.inline_start +
+                effective_margin_inline_start,
+        },
+        size: LogicalVec2 {
+            block: block_size,
+            inline: containing_block_for_children.size.inline,
+        },
+    };
+
+    let mut base_fragment_info = base.base_fragment_info;
+    if depends_on_block_constraints {
+        base_fragment_info
+            .flags
+            .insert(FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM);
+    }
+
+    BoxFragment::new(
+        base_fragment_info,
+        style.clone(),
+        flow_layout.fragments,
+        content_rect.as_physical(Some(containing_block)),
+        pbm.padding.to_physical(containing_block_writing_mode),
+        pbm.border.to_physical(containing_block_writing_mode),
+        margin.to_physical(containing_block_writing_mode),
+        clearance,
+    )
+    .with_baselines(flow_layout.baselines)
+    .with_block_margins_collapsed_with_children(block_margins_collapsed_with_children)
+}
+
+impl IndependentNonReplacedContents {
+    /// Lay out a normal in flow non-replaced block that establishes an independent
+    /// formatting context in its containing formatting context.
+    ///
+    /// - <https://drafts.csswg.org/css2/visudet.html#blockwidth>
+    /// - <https://drafts.csswg.org/css2/visudet.html#normal-block>
+    pub(crate) fn layout_in_flow_block_level(
+        &self,
+        base: &LayoutBoxBase,
+        layout_context: &LayoutContext,
+        positioning_context: &mut PositioningContext,
+        containing_block: &ContainingBlock,
+        sequential_layout_state: Option<&mut SequentialLayoutState>,
+        ignore_block_margins_for_stretch: LogicalSides1D<bool>,
+    ) -> BoxFragment {
+        if let Some(sequential_layout_state) = sequential_layout_state {
+            return self.layout_in_flow_block_level_sequentially(
+                base,
+                layout_context,
+                positioning_context,
+                containing_block,
+                sequential_layout_state,
+                ignore_block_margins_for_stretch,
+            );
+        }
+
+        let get_inline_content_sizes = |constraint_space: &ConstraintSpace| {
+            base.inline_content_sizes(layout_context, constraint_space, self)
+                .sizes
+        };
+        let layout_style = self.layout_style(base);
+        let ContainingBlockPaddingAndBorder {
+            containing_block: containing_block_for_children,
+            pbm,
+            block_sizes,
+            depends_on_block_constraints,
+            available_block_size,
+            justify_self,
+        } = solve_containing_block_padding_and_border_for_in_flow_box(
+            containing_block,
+            &layout_style,
+            get_inline_content_sizes,
+            ignore_block_margins_for_stretch,
+        );
+
+        let layout = self.layout(
+            layout_context,
+            positioning_context,
+            &containing_block_for_children,
+            containing_block,
+            base,
+            false, /* depends_on_block_constraints */
+        );
+
+        let inline_size = layout
+            .content_inline_size_for_table
+            .unwrap_or(containing_block_for_children.size.inline);
+        let block_size = block_sizes.resolve(
+            Direction::Block,
+            Size::FitContent,
+            Au::zero,
+            available_block_size,
+            || layout.content_block_size.into(),
+            layout_style.is_table(),
+        );
+
+        let ResolvedMargins {
+            margin,
+            effective_margin_inline_start,
+        } = solve_margins(containing_block, &pbm, inline_size, justify_self);
+
+        let content_rect = LogicalRect {
+            start_corner: LogicalVec2 {
+                block: pbm.padding.block_start + pbm.border.block_start,
+                inline: pbm.padding.inline_start +
+                    pbm.border.inline_start +
+                    effective_margin_inline_start,
+            },
+            size: LogicalVec2 {
+                block: block_size,
+                inline: inline_size,
+            },
+        };
+
+        let block_margins_collapsed_with_children = CollapsedBlockMargins::from_margin(&margin);
+        let containing_block_writing_mode = containing_block.style.writing_mode;
+
+        let mut base_fragment_info = base.base_fragment_info;
+        if depends_on_block_constraints {
+            base_fragment_info.flags.insert(
+                FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM,
+            );
+        }
+        BoxFragment::new(
+            base_fragment_info,
+            base.style.clone(),
+            layout.fragments,
+            content_rect.as_physical(Some(containing_block)),
+            pbm.padding.to_physical(containing_block_writing_mode),
+            pbm.border.to_physical(containing_block_writing_mode),
+            margin.to_physical(containing_block_writing_mode),
+            None, /* clearance */
+        )
+        .with_baselines(layout.baselines)
+        .with_specific_layout_info(layout.specific_layout_info)
+        .with_block_margins_collapsed_with_children(block_margins_collapsed_with_children)
+    }
+
+    /// Lay out a normal in flow non-replaced block that establishes an independent
+    /// formatting context in its containing formatting context but handling sequential
+    /// layout concerns, such clearing and placing the content next to floats.
+    fn layout_in_flow_block_level_sequentially(
+        &self,
+        base: &LayoutBoxBase,
+        layout_context: &LayoutContext<'_>,
+        positioning_context: &mut PositioningContext,
+        containing_block: &ContainingBlock<'_>,
+        sequential_layout_state: &mut SequentialLayoutState,
+        ignore_block_margins_for_stretch: LogicalSides1D<bool>,
+    ) -> BoxFragment {
+        let style = &base.style;
+        let containing_block_writing_mode = containing_block.style.writing_mode;
+        let ContentBoxSizesAndPBM {
+            content_box_sizes,
+            pbm,
+            depends_on_block_constraints,
+            ..
+        } = self
+            .layout_style(base)
+            .content_box_sizes_and_padding_border_margin(&containing_block.into());
+
+        let (margin_block_start, margin_block_end) =
+            solve_block_margins_for_in_flow_block_level(&pbm);
+        let collapsed_margin_block_start = CollapsedMargin::new(margin_block_start);
+
+        // From https://drafts.csswg.org/css2/#floats:
+        // "The border box of a table, a block-level replaced element, or an element in
+        //  the normal flow that establishes a new block formatting context (such as an
+        //  element with overflow other than visible) must not overlap the margin box of
+        //  any floats in the same block formatting context as the element itself. If
+        //  necessary, implementations should clear the said element by placing it below
+        //  any preceding floats, but may place it adjacent to such floats if there is
+        //  sufficient space. They may even make the border box of said element narrower
+        //  than defined by section 10.3.3. CSS 2 does not define when a UA may put said
+        //  element next to the float or by how much said element may become narrower."
+        let mut content_size;
+        let mut layout;
+        let mut placement_rect;
+
+        // First compute the clear position required by the 'clear' property.
+        // The code below may then add extra clearance when the element can't fit
+        // next to floats not covered by 'clear'.
+        let clear_position = sequential_layout_state.calculate_clear_position(
+            Clear::from_style_and_container_writing_mode(style, containing_block_writing_mode),
+            &collapsed_margin_block_start,
+        );
+        let ceiling = clear_position.unwrap_or_else(|| {
+            sequential_layout_state.position_without_clearance(&collapsed_margin_block_start)
+        });
+
+        // Then compute a tentative block size, only taking extrinsic values into account.
+        let pbm_sums = pbm.sums_auto_is_zero(ignore_block_margins_for_stretch);
+        let available_block_size = containing_block
+            .size
+            .block
+            .to_definite()
+            .map(|block_size| Au::zero().max(block_size - pbm_sums.block));
+        let (preferred_block_size, min_block_size, max_block_size) = content_box_sizes
+            .block
+            .resolve_each_extrinsic(Size::FitContent, Au::zero(), available_block_size);
+        let tentative_block_size =
+            SizeConstraint::new(preferred_block_size, min_block_size, max_block_size);
+
+        // With the tentative block size we can compute the inline min/max-content sizes.
+        let get_inline_content_sizes = || {
+            let constraint_space = ConstraintSpace::new(
+                tentative_block_size,
+                style.writing_mode,
+                self.preferred_aspect_ratio(),
+            );
+            base.inline_content_sizes(layout_context, &constraint_space, self)
+                .sizes
+        };
+
+        let justify_self = resolve_justify_self(style, containing_block.style);
+        let is_table = self.is_table();
+        let compute_inline_size = |stretch_size| {
+            content_box_sizes.inline.resolve(
+                Direction::Inline,
+                automatic_inline_size(justify_self, is_table),
+                Au::zero,
+                Some(stretch_size),
+                get_inline_content_sizes,
+                is_table,
+            )
+        };
+
+        let compute_block_size = |layout: &CacheableLayoutResult| {
+            content_box_sizes.block.resolve(
+                Direction::Block,
+                Size::FitContent,
+                Au::zero,
+                available_block_size,
+                || layout.content_block_size.into(),
+                is_table,
+            )
+        };
+
+        // The final inline size can depend on the available space, which depends on where
+        // we are placing the box, since floats reduce the available space.
+        // Here we assume that `compute_inline_size()` is a monotonically increasing function
+        // with respect to the available space. Therefore, if we get the same result for 0
+        // and for MAX_AU, it means that the function is constant.
+        // TODO: `compute_inline_size()` may not be monotonic with `calc-size()`. For example,
+        // `calc-size(stretch, (1px / (size + 1px) + sign(size)) * 1px)` would result in 1px
+        // both when the available space is zero and infinity, but it's not constant.
+        let inline_size_with_no_available_space = compute_inline_size(Au::zero());
+        if inline_size_with_no_available_space == compute_inline_size(MAX_AU) {
+            // If the inline size doesn't depend on the available inline space, we can just
+            // compute it with an available inline space of zero. Then, after layout we can
+            // compute the block size, and finally place among floats.
+            let inline_size = inline_size_with_no_available_space;
+            layout = self.layout(
+                layout_context,
+                positioning_context,
+                &ContainingBlock {
+                    size: ContainingBlockSize {
+                        inline: inline_size,
+                        block: tentative_block_size,
+                    },
+                    style,
+                },
+                containing_block,
+                base,
+                false, /* depends_on_block_constraints */
+            );
+
+            content_size = LogicalVec2 {
+                block: compute_block_size(&layout),
+                inline: layout.content_inline_size_for_table.unwrap_or(inline_size),
+            };
+
+            let mut placement = PlacementAmongFloats::new(
+                &sequential_layout_state.floats,
+                ceiling,
+                content_size + pbm.padding_border_sums,
+                &pbm,
+            );
+            placement_rect = placement.place();
+        } else {
+            // If the inline size depends on the available space, then we need to iterate
+            // the various placement candidates, resolve both the inline and block sizes
+            // on each one placement area, and then check if the box actually fits it.
+            // As an optimization, we first compute a lower bound of the final box size,
+            // and skip placement candidates where not even the lower bound would fit.
+            let minimum_size_of_block = LogicalVec2 {
+                // For the lower bound of the inline size, simply assume no available space.
+                // TODO: this won't work for things like `calc-size(stretch, 100px - size)`,
+                // which should result in a bigger size when the available space gets smaller.
+                inline: inline_size_with_no_available_space,
+                block: match tentative_block_size {
+                    // If we were able to resolve the preferred and maximum block sizes,
+                    // use the tentative block size (it takes the 3 sizes into account).
+                    SizeConstraint::Definite(size) if max_block_size.is_some() => size,
+                    // Oherwise the preferred or maximum block size might end up being zero,
+                    // so can only rely on the minimum block size.
+                    _ => min_block_size,
+                },
+            } + pbm.padding_border_sums;
+            let mut placement = PlacementAmongFloats::new(
+                &sequential_layout_state.floats,
+                ceiling,
+                minimum_size_of_block,
+                &pbm,
+            );
+
+            loop {
+                // First try to place the block using the minimum size as the object size.
+                placement_rect = placement.place();
+                let available_inline_size =
+                    placement_rect.size.inline - pbm.padding_border_sums.inline;
+                let proposed_inline_size = compute_inline_size(available_inline_size);
+
+                // Now lay out the block using the inline size we calculated from the placement.
+                // Later we'll check to see if the resulting block size is compatible with the
+                // placement.
+                let positioning_context_length = positioning_context.len();
+                layout = self.layout(
+                    layout_context,
+                    positioning_context,
+                    &ContainingBlock {
+                        size: ContainingBlockSize {
+                            inline: proposed_inline_size,
+                            block: tentative_block_size,
+                        },
+                        style,
+                    },
+                    containing_block,
+                    base,
+                    false, /* depends_on_block_constraints */
+                );
+
+                let inline_size = if let Some(inline_size) = layout.content_inline_size_for_table {
+                    // This is a table that ended up being smaller than predicted because of
+                    // collapsed columns. Note we don't backtrack to consider areas that we
+                    // previously thought weren't big enough.
+                    // TODO: Should `minimum_size_of_block.inline` be zero for tables?
+                    debug_assert!(inline_size < proposed_inline_size);
+                    inline_size
+                } else {
+                    proposed_inline_size
+                };
+                content_size = LogicalVec2 {
+                    block: compute_block_size(&layout),
+                    inline: inline_size,
+                };
+
+                // Now we know the block size of this attempted layout of a box with block
+                // size of auto. Try to fit it into our precalculated placement among the
+                // floats. If it fits, then we can stop trying layout candidates.
+                if placement.try_to_expand_for_auto_block_size(
+                    content_size.block + pbm.padding_border_sums.block,
+                    &placement_rect.size,
+                ) {
+                    break;
+                }
+
+                // The previous attempt to lay out this independent formatting context
+                // among the floats did not work, so we must unhoist any boxes from that
+                // attempt.
+                positioning_context.truncate(&positioning_context_length);
+            }
+        }
+
+        // Only set clearance if we would have cleared or the placement among floats moves
+        // the block further in the block direction. These two situations are the ones that
+        // prevent margin collapse.
+        let has_clearance = clear_position.is_some() || placement_rect.start_corner.block > ceiling;
+        let clearance = has_clearance.then(|| {
+            placement_rect.start_corner.block -
+                sequential_layout_state
+                    .position_with_zero_clearance(&collapsed_margin_block_start)
+        });
+
+        let ((margin_inline_start, margin_inline_end), effective_margin_inline_start) =
+            solve_inline_margins_avoiding_floats(
+                sequential_layout_state,
+                containing_block,
+                &pbm,
+                content_size.inline + pbm.padding_border_sums.inline,
+                placement_rect,
+                justify_self,
+            );
+
+        let margin = LogicalSides {
+            inline_start: margin_inline_start,
+            inline_end: margin_inline_end,
+            block_start: margin_block_start,
+            block_end: margin_block_end,
+        };
+
+        // Clearance prevents margin collapse between this block and previous ones,
+        // so in that case collapse margins before adjoining them below.
+        if clearance.is_some() {
+            sequential_layout_state.collapse_margins();
+        }
+        sequential_layout_state.adjoin_assign(&collapsed_margin_block_start);
+
+        // Margins can never collapse into independent formatting contexts.
+        sequential_layout_state.collapse_margins();
+        sequential_layout_state.advance_block_position(
+            pbm.padding_border_sums.block + content_size.block + clearance.unwrap_or_else(Au::zero),
+        );
+        sequential_layout_state.adjoin_assign(&CollapsedMargin::new(margin.block_end));
+
+        let content_rect = LogicalRect {
+            start_corner: LogicalVec2 {
+                block: pbm.padding.block_start +
+                    pbm.border.block_start +
+                    clearance.unwrap_or_else(Au::zero),
+                inline: pbm.padding.inline_start +
+                    pbm.border.inline_start +
+                    effective_margin_inline_start,
+            },
+            size: content_size,
+        };
+
+        let mut base_fragment_info = base.base_fragment_info;
+        if depends_on_block_constraints {
+            base_fragment_info.flags.insert(
+                FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM,
+            );
+        }
+
+        BoxFragment::new(
+            base_fragment_info,
+            style.clone(),
+            layout.fragments,
+            content_rect.as_physical(Some(containing_block)),
+            pbm.padding.to_physical(containing_block_writing_mode),
+            pbm.border.to_physical(containing_block_writing_mode),
+            margin.to_physical(containing_block_writing_mode),
+            clearance,
+        )
+        .with_baselines(layout.baselines)
+        .with_specific_layout_info(layout.specific_layout_info)
+        .with_block_margins_collapsed_with_children(CollapsedBlockMargins::from_margin(&margin))
+    }
+}
+
+impl ReplacedContents {
+    /// <https://drafts.csswg.org/css2/visudet.html#block-replaced-width>
+    /// <https://drafts.csswg.org/css2/visudet.html#inline-replaced-width>
+    /// <https://drafts.csswg.org/css2/visudet.html#inline-replaced-height>
+    fn layout_in_flow_block_level(
+        &self,
+        base: &LayoutBoxBase,
+        layout_context: &LayoutContext,
+        containing_block: &ContainingBlock,
+        mut sequential_layout_state: Option<&mut SequentialLayoutState>,
+        ignore_block_margins_for_stretch: LogicalSides1D<bool>,
+    ) -> BoxFragment {
+        let content_box_sizes_and_pbm = self
+            .layout_style(base)
+            .content_box_sizes_and_padding_border_margin(&containing_block.into());
+        let pbm = &content_box_sizes_and_pbm.pbm;
+        let content_size = self.used_size_as_if_inline_element(
+            containing_block,
+            &base.style,
+            &content_box_sizes_and_pbm,
+            ignore_block_margins_for_stretch,
+        );
+
+        let margin_inline_start;
+        let margin_inline_end;
+        let effective_margin_inline_start;
+        let (margin_block_start, margin_block_end) =
+            solve_block_margins_for_in_flow_block_level(pbm);
+        let justify_self = resolve_justify_self(&base.style, containing_block.style);
+
+        let containing_block_writing_mode = containing_block.style.writing_mode;
+        let physical_content_size = content_size.to_physical_size(containing_block_writing_mode);
+        let fragments = self.make_fragments(layout_context, &base.style, physical_content_size);
+
+        let clearance;
+        if let Some(ref mut sequential_layout_state) = sequential_layout_state {
+            // From https://drafts.csswg.org/css2/#floats:
+            // "The border box of a table, a block-level replaced element, or an element in
+            //  the normal flow that establishes a new block formatting context (such as an
+            //  element with overflow other than visible) must not overlap the margin box of
+            //  any floats in the same block formatting context as the element itself. If
+            //  necessary, implementations should clear the said element by placing it below
+            //  any preceding floats, but may place it adjacent to such floats if there is
+            //  sufficient space. They may even make the border box of said element narrower
+            //  than defined by section 10.3.3. CSS 2 does not define when a UA may put said
+            //  element next to the float or by how much said element may become narrower."
+            let collapsed_margin_block_start = CollapsedMargin::new(margin_block_start);
+            let size = content_size + pbm.padding_border_sums;
+            let placement_rect;
+            (clearance, placement_rect) = sequential_layout_state
+                .calculate_clearance_and_inline_adjustment(
+                    Clear::from_style_and_container_writing_mode(
+                        &base.style,
+                        containing_block.style.writing_mode,
+                    ),
+                    &collapsed_margin_block_start,
+                    pbm,
+                    size,
+                );
+            (
+                (margin_inline_start, margin_inline_end),
+                effective_margin_inline_start,
+            ) = solve_inline_margins_avoiding_floats(
+                sequential_layout_state,
+                containing_block,
+                pbm,
+                size.inline,
+                placement_rect,
+                justify_self,
+            );
+
+            // Clearance prevents margin collapse between this block and previous ones,
+            // so in that case collapse margins before adjoining them below.
+            if clearance.is_some() {
+                sequential_layout_state.collapse_margins();
+            }
+            sequential_layout_state.adjoin_assign(&collapsed_margin_block_start);
+
+            // Margins can never collapse into replaced elements.
+            sequential_layout_state.collapse_margins();
+            sequential_layout_state
+                .advance_block_position(size.block + clearance.unwrap_or_else(Au::zero));
+            sequential_layout_state.adjoin_assign(&CollapsedMargin::new(margin_block_end));
+        } else {
+            clearance = None;
+            (
+                (margin_inline_start, margin_inline_end),
+                effective_margin_inline_start,
+            ) = solve_inline_margins_for_in_flow_block_level(
+                containing_block,
+                pbm,
+                content_size.inline,
+                justify_self,
+            );
+        };
+
+        let margin = LogicalSides {
+            inline_start: margin_inline_start,
+            inline_end: margin_inline_end,
+            block_start: margin_block_start,
+            block_end: margin_block_end,
+        };
+
+        let start_corner = LogicalVec2 {
+            block: pbm.padding.block_start +
+                pbm.border.block_start +
+                clearance.unwrap_or_else(Au::zero),
+            inline: pbm.padding.inline_start +
+                pbm.border.inline_start +
+                effective_margin_inline_start,
+        };
+        let content_rect = LogicalRect {
+            start_corner,
+            size: content_size,
+        }
+        .as_physical(Some(containing_block));
+
+        let mut base_fragment_info = base.base_fragment_info;
+        if content_box_sizes_and_pbm.depends_on_block_constraints {
+            base_fragment_info.flags.insert(
+                FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM,
+            );
+        }
+
+        BoxFragment::new(
+            base_fragment_info,
+            base.style.clone(),
+            fragments,
+            content_rect,
+            pbm.padding.to_physical(containing_block_writing_mode),
+            pbm.border.to_physical(containing_block_writing_mode),
+            margin.to_physical(containing_block_writing_mode),
+            clearance,
+        )
+        .with_block_margins_collapsed_with_children(CollapsedBlockMargins::from_margin(&margin))
+    }
+}
+
+struct ContainingBlockPaddingAndBorder<'a> {
+    containing_block: ContainingBlock<'a>,
+    pbm: PaddingBorderMargin,
+    block_sizes: Sizes,
+    depends_on_block_constraints: bool,
+    available_block_size: Option<Au>,
+    justify_self: AlignFlags,
+}
+
+struct ResolvedMargins {
+    /// Used value for the margin properties, as exposed in getComputedStyle().
+    pub margin: LogicalSides<Au>,
+
+    /// Distance between the border box and the containing block on the inline-start side.
+    /// This is typically the same as the inline-start margin, but can be greater when
+    /// the box is justified within the free space in the containing block.
+    /// The reason we aren't just adjusting the used margin-inline-start is that
+    /// this shouldn't be observable via getComputedStyle().
+    /// <https://drafts.csswg.org/css-align/#justify-self-property>
+    pub effective_margin_inline_start: Au,
+}
+
+/// Given the style for an in-flow box and its containing block, determine the containing
+/// block for its children.
+/// Note that in the presence of floats, this shouldn't be used for a block-level box
+/// that establishes an independent formatting context (or is replaced), since the
+/// inline size could then be incorrect.
+fn solve_containing_block_padding_and_border_for_in_flow_box<'a>(
+    containing_block: &ContainingBlock<'_>,
+    layout_style: &'a LayoutStyle,
+    get_inline_content_sizes: impl FnOnce(&ConstraintSpace) -> ContentSizes,
+    ignore_block_margins_for_stretch: LogicalSides1D<bool>,
+) -> ContainingBlockPaddingAndBorder<'a> {
+    let style = layout_style.style();
+    if matches!(style.pseudo(), Some(PseudoElement::ServoAnonymousBox)) {
+        // <https://drafts.csswg.org/css2/#anonymous-block-level>
+        // > Anonymous block boxes are ignored when resolving percentage values that would
+        // > refer to it: the closest non-anonymous ancestor box is used instead.
+        let containing_block_for_children = ContainingBlock {
+            size: ContainingBlockSize {
+                inline: containing_block.size.inline,
+                block: containing_block.size.block,
+            },
+            style,
+        };
+        // <https://drafts.csswg.org/css2/#anonymous-block-level>
+        // > Non-inherited properties have their initial value.
+        return ContainingBlockPaddingAndBorder {
+            containing_block: containing_block_for_children,
+            pbm: PaddingBorderMargin::zero(),
+            block_sizes: Sizes::default(),
+            depends_on_block_constraints: false,
+            // The available block size may actually be definite, but it should be irrelevant
+            // since the sizing properties are set to their initial value.
+            available_block_size: None,
+            // The initial `justify-self` is `auto`, but use `normal` (behaving as `stretch`).
+            // This is being discussed in <https://github.com/w3c/csswg-drafts/issues/11461>.
+            justify_self: AlignFlags::NORMAL,
+        };
+    }
+
+    let ContentBoxSizesAndPBM {
+        content_box_sizes,
+        pbm,
+        depends_on_block_constraints,
+        ..
+    } = layout_style.content_box_sizes_and_padding_border_margin(&containing_block.into());
+
+    let pbm_sums = pbm.sums_auto_is_zero(ignore_block_margins_for_stretch);
+    let writing_mode = style.writing_mode;
+    let available_inline_size = Au::zero().max(containing_block.size.inline - pbm_sums.inline);
+    let available_block_size = containing_block
+        .size
+        .block
+        .to_definite()
+        .map(|block_size| Au::zero().max(block_size - pbm_sums.block));
+
+    // https://drafts.csswg.org/css2/#the-height-property
+    // https://drafts.csswg.org/css2/visudet.html#min-max-heights
+    let tentative_block_size = content_box_sizes.block.resolve_extrinsic(
+        Size::FitContent,
+        Au::zero(),
+        available_block_size,
+    );
+
+    // https://drafts.csswg.org/css2/#the-width-property
+    // https://drafts.csswg.org/css2/visudet.html#min-max-widths
+    let get_inline_content_sizes = || {
+        get_inline_content_sizes(&ConstraintSpace::new(
+            tentative_block_size,
+            writing_mode,
+            None, /* TODO: support preferred aspect ratios on non-replaced boxes */
+        ))
+    };
+    let justify_self = resolve_justify_self(style, containing_block.style);
+    let is_table = layout_style.is_table();
+    let inline_size = content_box_sizes.inline.resolve(
+        Direction::Inline,
+        automatic_inline_size(justify_self, is_table),
+        Au::zero,
+        Some(available_inline_size),
+        get_inline_content_sizes,
+        is_table,
+    );
+
+    let containing_block_for_children = ContainingBlock {
+        size: ContainingBlockSize {
+            inline: inline_size,
+            block: tentative_block_size,
+        },
+        style,
+    };
+    // https://drafts.csswg.org/css-writing-modes/#orthogonal-flows
+    assert_eq!(
+        containing_block.style.writing_mode.is_horizontal(),
+        containing_block_for_children
+            .style
+            .writing_mode
+            .is_horizontal(),
+        "Vertical writing modes are not supported yet"
+    );
+    ContainingBlockPaddingAndBorder {
+        containing_block: containing_block_for_children,
+        pbm,
+        block_sizes: content_box_sizes.block,
+        depends_on_block_constraints,
+        available_block_size,
+        justify_self,
+    }
+}
+
+/// Given the containing block and size of an in-flow box, determine the margins.
+/// Note that in the presence of floats, this shouldn't be used for a block-level box
+/// that establishes an independent formatting context (or is replaced), since the
+/// margins could then be incorrect.
+fn solve_margins(
+    containing_block: &ContainingBlock<'_>,
+    pbm: &PaddingBorderMargin,
+    inline_size: Au,
+    justify_self: AlignFlags,
+) -> ResolvedMargins {
+    let (inline_margins, effective_margin_inline_start) =
+        solve_inline_margins_for_in_flow_block_level(
+            containing_block,
+            pbm,
+            inline_size,
+            justify_self,
+        );
+    let block_margins = solve_block_margins_for_in_flow_block_level(pbm);
+    ResolvedMargins {
+        margin: LogicalSides {
+            inline_start: inline_margins.0,
+            inline_end: inline_margins.1,
+            block_start: block_margins.0,
+            block_end: block_margins.1,
+        },
+        effective_margin_inline_start,
+    }
+}
+
+/// Resolves 'auto' margins of an in-flow block-level box in the block axis.
+/// <https://drafts.csswg.org/css2/#normal-block>
+/// <https://drafts.csswg.org/css2/#block-root-margin>
+fn solve_block_margins_for_in_flow_block_level(pbm: &PaddingBorderMargin) -> (Au, Au) {
+    (
+        pbm.margin.block_start.auto_is(Au::zero),
+        pbm.margin.block_end.auto_is(Au::zero),
+    )
+}
+
+/// Resolves the `justify-self` value, preserving flags.
+fn resolve_justify_self(style: &ComputedValues, parent_style: &ComputedValues) -> AlignFlags {
+    let is_ltr = |style: &ComputedValues| style.writing_mode.line_left_is_inline_start();
+    let alignment = match style.clone_justify_self().0.0 {
+        AlignFlags::AUTO => parent_style.clone_justify_items().computed.0,
+        alignment => alignment,
+    };
+    let alignment_value = match alignment.value() {
+        AlignFlags::LEFT if is_ltr(parent_style) => AlignFlags::START,
+        AlignFlags::LEFT => AlignFlags::END,
+        AlignFlags::RIGHT if is_ltr(parent_style) => AlignFlags::END,
+        AlignFlags::RIGHT => AlignFlags::START,
+        AlignFlags::SELF_START if is_ltr(parent_style) == is_ltr(style) => AlignFlags::START,
+        AlignFlags::SELF_START => AlignFlags::END,
+        AlignFlags::SELF_END if is_ltr(parent_style) == is_ltr(style) => AlignFlags::END,
+        AlignFlags::SELF_END => AlignFlags::START,
+        alignment_value => alignment_value,
+    };
+    alignment.flags() | alignment_value
+}
+
+/// Determines the automatic size for the inline axis of a block-level box.
+/// <https://drafts.csswg.org/css-sizing-3/#automatic-size>
+#[inline]
+fn automatic_inline_size<T>(justify_self: AlignFlags, is_table: bool) -> Size<T> {
+    match justify_self {
+        AlignFlags::STRETCH => Size::Stretch,
+        AlignFlags::NORMAL if !is_table => Size::Stretch,
+        _ => Size::FitContent,
+    }
+}
+
+/// Justifies a block-level box, distributing the free space according to `justify-self`.
+/// Note `<center>` and `<div align>` are implemented via internal 'text-align' values,
+/// which are also handled here.
+/// The provided free space should already take margins into account. In particular,
+/// it should be zero if there is an auto margin.
+/// <https://drafts.csswg.org/css-align/#justify-block>
+fn justify_self_alignment(
+    containing_block: &ContainingBlock,
+    free_space: Au,
+    justify_self: AlignFlags,
+) -> Au {
+    let mut alignment = justify_self.value();
+    let is_safe = justify_self.flags() == AlignFlags::SAFE || alignment == AlignFlags::NORMAL;
+    if is_safe && free_space <= Au::zero() {
+        alignment = AlignFlags::START
+    }
+    match alignment {
+        AlignFlags::NORMAL => {},
+        AlignFlags::CENTER => return free_space / 2,
+        AlignFlags::END => return free_space,
+        _ => return Au::zero(),
+    }
+
+    // For `justify-self: normal`, fall back to the special 'text-align' values.
+    let style = containing_block.style;
+    match style.clone_text_align() {
+        TextAlignKeyword::MozCenter => free_space / 2,
+        TextAlignKeyword::MozLeft if !style.writing_mode.line_left_is_inline_start() => free_space,
+        TextAlignKeyword::MozRight if style.writing_mode.line_left_is_inline_start() => free_space,
+        _ => Au::zero(),
+    }
+}
+
+/// Resolves 'auto' margins of an in-flow block-level box in the inline axis,
+/// distributing the free space in the containing block.
+///
+/// This is based on CSS2.1 § 10.3.3 <https://drafts.csswg.org/css2/#blockwidth>
+/// but without adjusting the margins in "over-contrained" cases, as mandated by
+/// <https://drafts.csswg.org/css-align/#justify-block>.
+///
+/// Note that in the presence of floats, this shouldn't be used for a block-level box
+/// that establishes an independent formatting context (or is replaced).
+///
+/// In addition to the used margins, it also returns the effective margin-inline-start
+/// (see ContainingBlockPaddingAndBorder).
+fn solve_inline_margins_for_in_flow_block_level(
+    containing_block: &ContainingBlock,
+    pbm: &PaddingBorderMargin,
+    inline_size: Au,
+    justify_self: AlignFlags,
+) -> ((Au, Au), Au) {
+    let free_space = containing_block.size.inline - pbm.padding_border_sums.inline - inline_size;
+    let mut justification = Au::zero();
+    let inline_margins = match (pbm.margin.inline_start, pbm.margin.inline_end) {
+        (AuOrAuto::Auto, AuOrAuto::Auto) => {
+            let start = Au::zero().max(free_space / 2);
+            (start, free_space - start)
+        },
+        (AuOrAuto::Auto, AuOrAuto::LengthPercentage(end)) => {
+            (Au::zero().max(free_space - end), end)
+        },
+        (AuOrAuto::LengthPercentage(start), AuOrAuto::Auto) => (start, free_space - start),
+        (AuOrAuto::LengthPercentage(start), AuOrAuto::LengthPercentage(end)) => {
+            // In the cases above, the free space is zero after taking 'auto' margins into account.
+            // But here we may still have some free space to perform 'justify-self' alignment.
+            // This aligns the margin box within the containing block, or in other words,
+            // aligns the border box within the margin-shrunken containing block.
+            justification =
+                justify_self_alignment(containing_block, free_space - start - end, justify_self);
+            (start, end)
+        },
+    };
+    let effective_margin_inline_start = inline_margins.0 + justification;
+    (inline_margins, effective_margin_inline_start)
+}
+
+/// Resolves 'auto' margins of an in-flow block-level box in the inline axis
+/// similarly to |solve_inline_margins_for_in_flow_block_level|. However,
+/// they align within the provided rect (instead of the containing block),
+/// to avoid overlapping floats.
+/// In addition to the used margins, it also returns the effective
+/// margin-inline-start (see ContainingBlockPaddingAndBorder).
+/// It may differ from the used inline-start margin if the computed value
+/// wasn't 'auto' and there are floats to avoid or the box is justified.
+/// See <https://github.com/w3c/csswg-drafts/issues/9174>
+fn solve_inline_margins_avoiding_floats(
+    sequential_layout_state: &SequentialLayoutState,
+    containing_block: &ContainingBlock,
+    pbm: &PaddingBorderMargin,
+    inline_size: Au,
+    placement_rect: LogicalRect<Au>,
+    justify_self: AlignFlags,
+) -> ((Au, Au), Au) {
+    let free_space = placement_rect.size.inline - inline_size;
+    debug_assert!(free_space >= Au::zero());
+    let cb_info = &sequential_layout_state.floats.containing_block_info;
+    let start_adjustment = placement_rect.start_corner.inline - cb_info.inline_start;
+    let end_adjustment = cb_info.inline_end - placement_rect.max_inline_position();
+    let mut justification = Au::zero();
+    let inline_margins = match (pbm.margin.inline_start, pbm.margin.inline_end) {
+        (AuOrAuto::Auto, AuOrAuto::Auto) => {
+            let half = free_space / 2;
+            (start_adjustment + half, end_adjustment + free_space - half)
+        },
+        (AuOrAuto::Auto, AuOrAuto::LengthPercentage(end)) => (start_adjustment + free_space, end),
+        (AuOrAuto::LengthPercentage(start), AuOrAuto::Auto) => (start, end_adjustment + free_space),
+        (AuOrAuto::LengthPercentage(start), AuOrAuto::LengthPercentage(end)) => {
+            // The spec says 'justify-self' aligns the margin box within the float-shrunken
+            // containing block. That's wrong (https://github.com/w3c/csswg-drafts/issues/9963),
+            // and Blink and WebKit are broken anyways. So we match Gecko instead: this aligns
+            // the border box within the instersection of the float-shrunken containing-block
+            // and the margin-shrunken containing-block.
+            justification = justify_self_alignment(containing_block, free_space, justify_self);
+            (start, end)
+        },
+    };
+    let effective_margin_inline_start = inline_margins.0.max(start_adjustment) + justification;
+    (inline_margins, effective_margin_inline_start)
+}
+
+/// State that we maintain when placing blocks.
+///
+/// In parallel mode, this placement is done after all child blocks are laid out. In
+/// sequential mode, this is done right after each block is laid out.
+struct PlacementState<'container> {
+    next_in_flow_margin_collapses_with_parent_start_margin: bool,
+    last_in_flow_margin_collapses_with_parent_end_margin: bool,
+    start_margin: CollapsedMargin,
+    current_margin: CollapsedMargin,
+    current_block_direction_position: Au,
+    inflow_baselines: Baselines,
+    is_inline_block_context: bool,
+
+    /// If this [`PlacementState`] is laying out a list item with an outside marker. Record the
+    /// block size of that marker, because the content block size of the list item needs to be at
+    /// least as tall as the marker size -- even though the marker doesn't advance the block
+    /// position of the placement.
+    marker_block_size: Option<Au>,
+
+    /// The [`ContainingBlock`] of the container into which this [`PlacementState`] is laying out
+    /// fragments. This is used to convert between physical and logical geometry.
+    containing_block: &'container ContainingBlock<'container>,
+}
+
+impl<'container> PlacementState<'container> {
+    fn new(
+        collapsible_with_parent_start_margin: CollapsibleWithParentStartMargin,
+        containing_block: &'container ContainingBlock<'container>,
+    ) -> PlacementState<'container> {
+        let is_inline_block_context =
+            containing_block.style.get_box().clone_display() == Display::InlineBlock;
+        PlacementState {
+            next_in_flow_margin_collapses_with_parent_start_margin:
+                collapsible_with_parent_start_margin.0,
+            last_in_flow_margin_collapses_with_parent_end_margin: true,
+            start_margin: CollapsedMargin::zero(),
+            current_margin: CollapsedMargin::zero(),
+            current_block_direction_position: Au::zero(),
+            inflow_baselines: Baselines::default(),
+            is_inline_block_context,
+            marker_block_size: None,
+            containing_block,
+        }
+    }
+
+    fn place_fragment_and_update_baseline(
+        &mut self,
+        fragment: &mut Fragment,
+        sequential_layout_state: Option<&mut SequentialLayoutState>,
+    ) {
+        self.place_fragment(fragment, sequential_layout_state);
+
+        let box_fragment = match fragment {
+            Fragment::Box(box_fragment) => box_fragment,
+            _ => return,
+        };
+        let box_fragment = box_fragment.borrow();
+
+        // From <https://drafts.csswg.org/css-align-3/#baseline-export>:
+        // > When finding the first/last baseline set of an inline-block, any baselines
+        // > contributed by table boxes must be skipped. (This quirk is a legacy behavior from
+        // > [CSS2].)
+        if self.is_inline_block_context && box_fragment.is_table_wrapper() {
+            return;
+        }
+
+        let box_block_offset = box_fragment
+            .content_rect
+            .origin
+            .to_logical(self.containing_block)
+            .block;
+        let box_fragment_baselines =
+            box_fragment.baselines(self.containing_block.style.writing_mode);
+        if let (None, Some(first)) = (self.inflow_baselines.first, box_fragment_baselines.first) {
+            self.inflow_baselines.first = Some(first + box_block_offset);
+        }
+        if let Some(last) = box_fragment_baselines.last {
+            self.inflow_baselines.last = Some(last + box_block_offset);
+        }
+    }
+
+    /// Place a single [Fragment] in a block level context using the state so far and
+    /// information gathered from the [Fragment] itself.
+    fn place_fragment(
+        &mut self,
+        fragment: &mut Fragment,
+        sequential_layout_state: Option<&mut SequentialLayoutState>,
+    ) {
+        match fragment {
+            Fragment::Box(fragment) => {
+                // If this child is a marker positioned outside of a list item, then record its
+                // size, but also ensure that it doesn't advance the block position of the placment.
+                // This ensures item content is placed next to the marker.
+                //
+                // This is a pretty big hack because it doesn't properly handle all interactions
+                // between the marker and the item. For instance the marker should be positioned at
+                // the baseline of list item content and the first line of the item content should
+                // be at least as tall as the marker -- not the entire list item itself.
+                let fragment = &mut *fragment.borrow_mut();
+                let is_outside_marker = fragment
+                    .base
+                    .flags
+                    .contains(FragmentFlags::IS_OUTSIDE_LIST_ITEM_MARKER);
+                if is_outside_marker {
+                    assert!(self.marker_block_size.is_none());
+                    self.marker_block_size = Some(
+                        fragment
+                            .content_rect
+                            .size
+                            .to_logical(self.containing_block.style.writing_mode)
+                            .block,
+                    );
+                    return;
+                }
+
+                let fragment_block_margins = fragment.block_margins_collapsed_with_children();
+                let mut fragment_block_size = fragment
+                    .border_rect()
+                    .size
+                    .to_logical(self.containing_block.style.writing_mode)
+                    .block;
+
+                // We use `last_in_flow_margin_collapses_with_parent_end_margin` to implement
+                // this quote from https://drafts.csswg.org/css2/#collapsing-margins
+                // > If the top and bottom margins of an element with clearance are adjoining,
+                // > its margins collapse with the adjoining margins of following siblings but that
+                // > resulting margin does not collapse with the bottom margin of the parent block.
+                if let Some(clearance) = fragment.clearance {
+                    fragment_block_size += clearance;
+                    // Margins can't be adjoining if they are separated by clearance.
+                    // Setting `next_in_flow_margin_collapses_with_parent_start_margin` to false
+                    // prevents collapsing with the start margin of the parent, and will set
+                    // `collapsed_through` to false, preventing the parent from collapsing through.
+                    self.current_block_direction_position += self.current_margin.solve();
+                    self.current_margin = CollapsedMargin::zero();
+                    self.next_in_flow_margin_collapses_with_parent_start_margin = false;
+                    if fragment_block_margins.collapsed_through {
+                        self.last_in_flow_margin_collapses_with_parent_end_margin = false;
+                    }
+                } else if !fragment_block_margins.collapsed_through {
+                    self.last_in_flow_margin_collapses_with_parent_end_margin = true;
+                }
+
+                if self.next_in_flow_margin_collapses_with_parent_start_margin {
+                    debug_assert!(self.current_margin.solve().is_zero());
+                    self.start_margin
+                        .adjoin_assign(&fragment_block_margins.start);
+                    if fragment_block_margins.collapsed_through {
+                        self.start_margin.adjoin_assign(&fragment_block_margins.end);
+                        return;
+                    }
+                    self.next_in_flow_margin_collapses_with_parent_start_margin = false;
+                } else {
+                    self.current_margin
+                        .adjoin_assign(&fragment_block_margins.start);
+                }
+
+                fragment.content_rect.origin += LogicalVec2 {
+                    inline: Au::zero(),
+                    block: self.current_margin.solve() + self.current_block_direction_position,
+                }
+                .to_physical_size(self.containing_block.style.writing_mode);
+
+                if fragment_block_margins.collapsed_through {
+                    // `fragment_block_size` is typically zero when collapsing through,
+                    // but we still need to consider it in case there is clearance.
+                    self.current_block_direction_position += fragment_block_size;
+                    self.current_margin
+                        .adjoin_assign(&fragment_block_margins.end);
+                } else {
+                    self.current_block_direction_position +=
+                        self.current_margin.solve() + fragment_block_size;
+                    self.current_margin = fragment_block_margins.end;
+                }
+            },
+            Fragment::AbsoluteOrFixedPositioned(fragment) => {
+                // The alignment of absolutes in block flow layout is always "start", so the size of
+                // the static position rectangle does not matter.
+                fragment.borrow_mut().static_position_rect = LogicalRect {
+                    start_corner: LogicalVec2 {
+                        block: (self.current_margin.solve() +
+                            self.current_block_direction_position),
+                        inline: Au::zero(),
+                    },
+                    size: LogicalVec2::zero(),
+                }
+                .as_physical(Some(self.containing_block));
+            },
+            Fragment::Float(box_fragment) => {
+                let sequential_layout_state = sequential_layout_state
+                    .expect("Found float fragment without SequentialLayoutState");
+                let block_offset_from_containing_block_top =
+                    self.current_block_direction_position + self.current_margin.solve();
+                let box_fragment = &mut *box_fragment.borrow_mut();
+                sequential_layout_state.place_float_fragment(
+                    box_fragment,
+                    self.containing_block,
+                    self.start_margin,
+                    block_offset_from_containing_block_top,
+                );
+            },
+            Fragment::Positioning(_) => {},
+            _ => unreachable!(),
+        }
+    }
+
+    fn finish(mut self) -> (Au, CollapsedBlockMargins, Baselines) {
+        if !self.last_in_flow_margin_collapses_with_parent_end_margin {
+            self.current_block_direction_position += self.current_margin.solve();
+            self.current_margin = CollapsedMargin::zero();
+        }
+        let (total_block_size, collapsed_through) = match self.marker_block_size {
+            Some(marker_block_size) => (
+                self.current_block_direction_position.max(marker_block_size),
+                // If this is a list item (even empty) with an outside marker, then it
+                // should not collapse through.
+                false,
+            ),
+            None => (
+                self.current_block_direction_position,
+                self.next_in_flow_margin_collapses_with_parent_start_margin,
+            ),
+        };
+
+        (
+            total_block_size,
+            CollapsedBlockMargins {
+                collapsed_through,
+                start: self.start_margin,
+                end: self.current_margin,
+            },
+            self.inflow_baselines,
+        )
+    }
+}
+
+fn block_size_is_zero_or_intrinsic(size: &StyleSize, containing_block: &ContainingBlock) -> bool {
+    match size {
+        StyleSize::Auto |
+        StyleSize::MinContent |
+        StyleSize::MaxContent |
+        StyleSize::FitContent |
+        StyleSize::FitContentFunction(_) => true,
+        StyleSize::Stretch => {
+            // TODO: Should this return true when the containing block has a definite size of 0px?
+            !containing_block.size.block.is_definite()
+        },
+        StyleSize::LengthPercentage(lp) => {
+            // TODO: Should this resolve definite percentages? Blink does it, Gecko and WebKit don't.
+            lp.is_definitely_zero() ||
+                (lp.0.has_percentage() && !containing_block.size.block.is_definite())
+        },
+        StyleSize::AnchorSizeFunction(_) | StyleSize::AnchorContainingCalcFunction(_) => {
+            unreachable!("anchor-size() should be disabled")
+        },
+    }
+}
+
+pub(crate) struct IndependentFloatOrAtomicLayoutResult {
+    pub fragment: BoxFragment,
+    pub baselines: Option<Baselines>,
+    pub pbm_sums: LogicalSides<Au>,
+}
+
+impl IndependentFormattingContext {
+    pub(crate) fn layout_in_flow_block_level(
+        &self,
+        layout_context: &LayoutContext,
+        positioning_context: &mut PositioningContext,
+        containing_block: &ContainingBlock,
+        sequential_layout_state: Option<&mut SequentialLayoutState>,
+        ignore_block_margins_for_stretch: LogicalSides1D<bool>,
+    ) -> BoxFragment {
+        match &self.contents {
+            IndependentFormattingContextContents::NonReplaced(contents) => contents
+                .layout_in_flow_block_level(
+                    &self.base,
+                    layout_context,
+                    positioning_context,
+                    containing_block,
+                    sequential_layout_state,
+                    ignore_block_margins_for_stretch,
+                ),
+            IndependentFormattingContextContents::Replaced(contents) => contents
+                .layout_in_flow_block_level(
+                    &self.base,
+                    layout_context,
+                    containing_block,
+                    sequential_layout_state,
+                    ignore_block_margins_for_stretch,
+                ),
+        }
+    }
+    pub(crate) fn layout_float_or_atomic_inline(
+        &self,
+        layout_context: &LayoutContext,
+        child_positioning_context: &mut PositioningContext,
+        containing_block: &ContainingBlock,
+    ) -> IndependentFloatOrAtomicLayoutResult {
+        let style = self.style();
+        let container_writing_mode = containing_block.style.writing_mode;
+        let layout_style = self.layout_style();
+        let content_box_sizes_and_pbm =
+            layout_style.content_box_sizes_and_padding_border_margin(&containing_block.into());
+        let pbm = &content_box_sizes_and_pbm.pbm;
+        let margin = pbm.margin.auto_is(Au::zero);
+        let pbm_sums = pbm.padding + pbm.border + margin;
+
+        let (fragments, content_rect, baselines) = match &self.contents {
+            IndependentFormattingContextContents::Replaced(replaced) => {
+                // Floats and atomic inlines can't collapse margins with their parent,
+                // so don't ignore block margins when resolving a stretch block size.
+                // https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing
+                let ignore_block_margins_for_stretch = LogicalSides1D::new(false, false);
+
+                // https://drafts.csswg.org/css2/visudet.html#float-replaced-width
+                // https://drafts.csswg.org/css2/visudet.html#inline-replaced-height
+                let content_size = replaced
+                    .used_size_as_if_inline_element(
+                        containing_block,
+                        style,
+                        &content_box_sizes_and_pbm,
+                        ignore_block_margins_for_stretch,
+                    )
+                    .to_physical_size(container_writing_mode);
+                let fragments = replaced.make_fragments(layout_context, style, content_size);
+
+                let content_rect = PhysicalRect::new(PhysicalPoint::zero(), content_size);
+                (fragments, content_rect, None)
+            },
+            IndependentFormattingContextContents::NonReplaced(non_replaced) => {
+                let writing_mode = self.style().writing_mode;
+                let available_inline_size =
+                    Au::zero().max(containing_block.size.inline - pbm_sums.inline_sum());
+                let available_block_size = containing_block
+                    .size
+                    .block
+                    .to_definite()
+                    .map(|block_size| Au::zero().max(block_size - pbm_sums.block_sum()));
+                let tentative_block_size = content_box_sizes_and_pbm
+                    .content_box_sizes
+                    .block
+                    .resolve_extrinsic(Size::FitContent, Au::zero(), available_block_size);
+
+                let get_content_size = || {
+                    let constraint_space = ConstraintSpace::new(
+                        tentative_block_size,
+                        writing_mode,
+                        non_replaced.preferred_aspect_ratio(),
+                    );
+                    self.inline_content_sizes(layout_context, &constraint_space)
+                        .sizes
+                };
+
+                let is_table = layout_style.is_table();
+                let inline_size = content_box_sizes_and_pbm.content_box_sizes.inline.resolve(
+                    Direction::Inline,
+                    Size::FitContent,
+                    Au::zero,
+                    Some(available_inline_size),
+                    get_content_size,
+                    is_table,
+                );
+
+                let containing_block_for_children = ContainingBlock {
+                    size: ContainingBlockSize {
+                        inline: inline_size,
+                        block: tentative_block_size,
+                    },
+                    style: self.style(),
+                };
+                assert_eq!(
+                    container_writing_mode.is_horizontal(),
+                    writing_mode.is_horizontal(),
+                    "Mixed horizontal and vertical writing modes are not supported yet"
+                );
+
+                let independent_layout = non_replaced.layout(
+                    layout_context,
+                    child_positioning_context,
+                    &containing_block_for_children,
+                    containing_block,
+                    &self.base,
+                    false, /* depends_on_block_constraints */
+                );
+                let inline_size = independent_layout
+                    .content_inline_size_for_table
+                    .unwrap_or(inline_size);
+                let block_size = content_box_sizes_and_pbm.content_box_sizes.block.resolve(
+                    Direction::Block,
+                    Size::FitContent,
+                    Au::zero,
+                    available_block_size,
+                    || independent_layout.content_block_size.into(),
+                    is_table,
+                );
+
+                let content_size = LogicalVec2 {
+                    block: block_size,
+                    inline: inline_size,
+                }
+                .to_physical_size(container_writing_mode);
+                let content_rect = PhysicalRect::new(PhysicalPoint::zero(), content_size);
+
+                (
+                    independent_layout.fragments,
+                    content_rect,
+                    Some(independent_layout.baselines),
+                )
+            },
+        };
+
+        let mut base_fragment_info = self.base_fragment_info();
+        if content_box_sizes_and_pbm.depends_on_block_constraints {
+            base_fragment_info.flags.insert(
+                FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM,
+            );
+        }
+
+        let fragment = BoxFragment::new(
+            base_fragment_info,
+            self.style().clone(),
+            fragments,
+            content_rect,
+            pbm.padding.to_physical(container_writing_mode),
+            pbm.border.to_physical(container_writing_mode),
+            margin.to_physical(container_writing_mode),
+            // Floats can have clearance, but it's handled internally by the float placement logic,
+            // so there's no need to store it explicitly in the fragment.
+            // And atomic inlines don't have clearance.
+            None, /* clearance */
+        );
+
+        IndependentFloatOrAtomicLayoutResult {
+            fragment,
+            baselines,
+            pbm_sums,
+        }
+    }
+}
diff --git a/components/layout/flow/root.rs b/components/layout/flow/root.rs
new file mode 100644
index 00000000000..a37db54065d
--- /dev/null
+++ b/components/layout/flow/root.rs
@@ -0,0 +1,427 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use app_units::Au;
+use atomic_refcell::AtomicRef;
+use compositing_traits::display_list::AxesScrollSensitivity;
+use malloc_size_of_derive::MallocSizeOf;
+use script::layout_dom::ServoLayoutNode;
+use script_layout_interface::wrapper_traits::{
+    LayoutNode, ThreadSafeLayoutElement, ThreadSafeLayoutNode,
+};
+use script_layout_interface::{LayoutElementType, LayoutNodeType};
+use servo_arc::Arc;
+use style::dom::{NodeInfo, TNode};
+use style::properties::ComputedValues;
+use style::values::computed::Overflow;
+use style_traits::CSSPixel;
+
+use crate::cell::ArcRefCell;
+use crate::context::LayoutContext;
+use crate::dom::{LayoutBox, NodeExt};
+use crate::dom_traversal::{Contents, NodeAndStyleInfo, NonReplacedContents, iter_child_nodes};
+use crate::flexbox::FlexLevelBox;
+use crate::flow::float::FloatBox;
+use crate::flow::inline::InlineItem;
+use crate::flow::{BlockContainer, BlockFormattingContext, BlockLevelBox};
+use crate::formatting_contexts::IndependentFormattingContext;
+use crate::fragment_tree::FragmentTree;
+use crate::geom::{LogicalVec2, PhysicalPoint, PhysicalRect, PhysicalSize};
+use crate::positioned::{AbsolutelyPositionedBox, PositioningContext};
+use crate::replaced::ReplacedContents;
+use crate::style_ext::{Display, DisplayGeneratingBox, DisplayInside};
+use crate::taffy::{TaffyItemBox, TaffyItemBoxInner};
+use crate::{DefiniteContainingBlock, PropagatedBoxTreeData};
+
+#[derive(MallocSizeOf)]
+pub struct BoxTree {
+    /// Contains typically exactly one block-level box, which was generated by the root element.
+    /// There may be zero if that element has `display: none`.
+    root: BlockFormattingContext,
+
+    /// Whether or not the viewport should be sensitive to scrolling input events in two axes
+    viewport_scroll_sensitivity: AxesScrollSensitivity,
+}
+
+impl BoxTree {
+    pub fn construct(context: &LayoutContext, root_element: ServoLayoutNode<'_>) -> Self {
+        let boxes = construct_for_root_element(context, root_element);
+
+        // Zero box for `:root { display: none }`, one for the root element otherwise.
+        assert!(boxes.len() <= 1);
+
+        // From https://www.w3.org/TR/css-overflow-3/#overflow-propagation:
+        // > UAs must apply the overflow-* values set on the root element to the viewport when the
+        // > root element’s display value is not none. However, when the root element is an [HTML]
+        // > html element (including XML syntax for HTML) whose overflow value is visible (in both
+        // > axes), and that element has as a child a body element whose display value is also not
+        // > none, user agents must instead apply the overflow-* values of the first such child
+        // > element to the viewport. The element from which the value is propagated must then have a
+        // > used overflow value of visible.
+        let root_style = root_element.style(context.shared_context());
+
+        let mut viewport_overflow_x = root_style.clone_overflow_x();
+        let mut viewport_overflow_y = root_style.clone_overflow_y();
+        if viewport_overflow_x == Overflow::Visible &&
+            viewport_overflow_y == Overflow::Visible &&
+            !root_style.get_box().display.is_none()
+        {
+            for child in iter_child_nodes(root_element) {
+                if !child
+                    .to_threadsafe()
+                    .as_element()
+                    .is_some_and(|element| element.is_body_element_of_html_element_root())
+                {
+                    continue;
+                }
+
+                let style = child.style(context.shared_context());
+                if !style.get_box().display.is_none() {
+                    viewport_overflow_x = style.clone_overflow_x();
+                    viewport_overflow_y = style.clone_overflow_y();
+
+                    break;
+                }
+            }
+        }
+
+        let contents = BlockContainer::BlockLevelBoxes(boxes);
+        let contains_floats = contents.contains_floats();
+        Self {
+            root: BlockFormattingContext {
+                contents,
+                contains_floats,
+            },
+            // From https://www.w3.org/TR/css-overflow-3/#overflow-propagation:
+            // > If visible is applied to the viewport, it must be interpreted as auto.
+            // > If clip is applied to the viewport, it must be interpreted as hidden.
+            viewport_scroll_sensitivity: AxesScrollSensitivity {
+                x: viewport_overflow_x.to_scrollable().into(),
+                y: viewport_overflow_y.to_scrollable().into(),
+            },
+        }
+    }
+
+    /// This method attempts to incrementally update the box tree from an
+    /// arbitrary node that is not necessarily the document's root element.
+    ///
+    /// If the node is not a valid candidate for incremental update, the method
+    /// loops over its parent. The only valid candidates for now are absolutely
+    /// positioned boxes which don't change their outside display mode (i.e. it
+    /// will not attempt to update from an absolutely positioned inline element
+    /// which became an absolutely positioned block element). The value `true`
+    /// is returned if an incremental update could be done, and `false`
+    /// otherwise.
+    ///
+    /// There are various pain points that need to be taken care of to extend
+    /// the set of valid candidates:
+    /// * it is not obvious how to incrementally check whether a block
+    ///   formatting context still contains floats or not;
+    /// * the propagation of text decorations towards node descendants is
+    ///   hard to do incrementally with our current representation of boxes
+    /// * how intrinsic content sizes are computed eagerly makes it hard
+    ///   to update those sizes for ancestors of the node from which we
+    ///   made an incremental update.
+    pub fn update(context: &LayoutContext, mut dirty_node: ServoLayoutNode<'_>) -> bool {
+        #[allow(clippy::enum_variant_names)]
+        enum UpdatePoint {
+            AbsolutelyPositionedBlockLevelBox(ArcRefCell<BlockLevelBox>),
+            AbsolutelyPositionedInlineLevelBox(ArcRefCell<InlineItem>, usize),
+            AbsolutelyPositionedFlexLevelBox(ArcRefCell<FlexLevelBox>),
+            AbsolutelyPositionedTaffyLevelBox(ArcRefCell<TaffyItemBox>),
+        }
+
+        fn update_point(
+            node: ServoLayoutNode<'_>,
+        ) -> Option<(Arc<ComputedValues>, DisplayInside, UpdatePoint)> {
+            if !node.is_element() {
+                return None;
+            }
+
+            if node.type_id() == LayoutNodeType::Element(LayoutElementType::HTMLBodyElement) {
+                // This can require changes to the canvas background.
+                return None;
+            }
+
+            // Don't update unstyled nodes or nodes that have pseudo-elements.
+            let element_data = node.style_data()?.element_data.borrow();
+            if !element_data.styles.pseudos.is_empty() {
+                return None;
+            }
+
+            let layout_data = NodeExt::layout_data(&node)?;
+            if layout_data.pseudo_before_box.borrow().is_some() {
+                return None;
+            }
+            if layout_data.pseudo_after_box.borrow().is_some() {
+                return None;
+            }
+
+            let primary_style = element_data.styles.primary();
+            let box_style = primary_style.get_box();
+
+            if !box_style.position.is_absolutely_positioned() {
+                return None;
+            }
+
+            let display_inside = match Display::from(box_style.display) {
+                Display::GeneratingBox(DisplayGeneratingBox::OutsideInside { inside, .. }) => {
+                    inside
+                },
+                _ => return None,
+            };
+
+            let update_point =
+                match &*AtomicRef::filter_map(layout_data.self_box.borrow(), Option::as_ref)? {
+                    LayoutBox::DisplayContents(..) => return None,
+                    LayoutBox::BlockLevel(block_level_box) => match &*block_level_box.borrow() {
+                        BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(_)
+                            if box_style.position.is_absolutely_positioned() =>
+                        {
+                            UpdatePoint::AbsolutelyPositionedBlockLevelBox(block_level_box.clone())
+                        },
+                        _ => return None,
+                    },
+                    LayoutBox::InlineLevel(inline_level_items) => {
+                        let inline_level_box = inline_level_items.first()?;
+                        let InlineItem::OutOfFlowAbsolutelyPositionedBox(_, text_offset_index) =
+                            &*inline_level_box.borrow()
+                        else {
+                            return None;
+                        };
+                        UpdatePoint::AbsolutelyPositionedInlineLevelBox(
+                            inline_level_box.clone(),
+                            *text_offset_index,
+                        )
+                    },
+                    LayoutBox::FlexLevel(flex_level_box) => match &*flex_level_box.borrow() {
+                        FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(_)
+                            if box_style.position.is_absolutely_positioned() =>
+                        {
+                            UpdatePoint::AbsolutelyPositionedFlexLevelBox(flex_level_box.clone())
+                        },
+                        _ => return None,
+                    },
+                    LayoutBox::TableLevelBox(..) => return None,
+                    LayoutBox::TaffyItemBox(taffy_level_box) => match &taffy_level_box
+                        .borrow()
+                        .taffy_level_box
+                    {
+                        TaffyItemBoxInner::OutOfFlowAbsolutelyPositionedBox(_)
+                            if box_style.position.is_absolutely_positioned() =>
+                        {
+                            UpdatePoint::AbsolutelyPositionedTaffyLevelBox(taffy_level_box.clone())
+                        },
+                        _ => return None,
+                    },
+                };
+            Some((primary_style.clone(), display_inside, update_point))
+        }
+
+        loop {
+            let Some((primary_style, display_inside, update_point)) = update_point(dirty_node)
+            else {
+                dirty_node = match dirty_node.parent_node() {
+                    Some(parent) => parent,
+                    None => return false,
+                };
+                continue;
+            };
+
+            let contents = ReplacedContents::for_element(dirty_node, context)
+                .map_or_else(|| NonReplacedContents::OfElement.into(), Contents::Replaced);
+            let info = NodeAndStyleInfo::new(dirty_node, Arc::clone(&primary_style));
+            let out_of_flow_absolutely_positioned_box = ArcRefCell::new(
+                AbsolutelyPositionedBox::construct(context, &info, display_inside, contents),
+            );
+            match update_point {
+                UpdatePoint::AbsolutelyPositionedBlockLevelBox(block_level_box) => {
+                    *block_level_box.borrow_mut() = BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(
+                        out_of_flow_absolutely_positioned_box,
+                    );
+                },
+                UpdatePoint::AbsolutelyPositionedInlineLevelBox(
+                    inline_level_box,
+                    text_offset_index,
+                ) => {
+                    *inline_level_box.borrow_mut() = InlineItem::OutOfFlowAbsolutelyPositionedBox(
+                        out_of_flow_absolutely_positioned_box,
+                        text_offset_index,
+                    );
+                },
+                UpdatePoint::AbsolutelyPositionedFlexLevelBox(flex_level_box) => {
+                    *flex_level_box.borrow_mut() = FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(
+                        out_of_flow_absolutely_positioned_box,
+                    );
+                },
+                UpdatePoint::AbsolutelyPositionedTaffyLevelBox(taffy_level_box) => {
+                    taffy_level_box.borrow_mut().taffy_level_box =
+                        TaffyItemBoxInner::OutOfFlowAbsolutelyPositionedBox(
+                            out_of_flow_absolutely_positioned_box,
+                        );
+                },
+            }
+            break;
+        }
+
+        // We are going to rebuild the box tree from the update point downward, but this update
+        // point is an absolute, which means that it needs to be laid out again in the containing
+        // block for absolutes, which is established by one of its ancestors. In addition,
+        // absolutes, when laid out, can produce more absolutes (either fixed or absolutely
+        // positioned) elements, so there may be yet more layout that has to happen in this
+        // ancestor.
+        //
+        // We do not know which ancestor is the one that established the containing block for this
+        // update point, so just invalidate the fragment cache of all ancestors, meaning that even
+        // though the box tree is preserved, the fragment tree from the root to the update point and
+        // all of its descendants will need to be rebuilt. This isn't as bad as it seems, because
+        // siblings and siblings of ancestors of this path through the tree will still have cached
+        // fragments.
+        //
+        // TODO: Do better. This is still a very crude way to do incremental layout.
+        while let Some(parent_node) = dirty_node.parent_node() {
+            parent_node.invalidate_cached_fragment();
+            dirty_node = parent_node;
+        }
+
+        true
+    }
+}
+
+fn construct_for_root_element(
+    context: &LayoutContext,
+    root_element: ServoLayoutNode<'_>,
+) -> Vec<ArcRefCell<BlockLevelBox>> {
+    let info = NodeAndStyleInfo::new(root_element, root_element.style(context.shared_context()));
+    let box_style = info.style.get_box();
+
+    let display_inside = match Display::from(box_style.display) {
+        Display::None => {
+            root_element.unset_all_boxes();
+            return Vec::new();
+        },
+        Display::Contents => {
+            // Unreachable because the style crate adjusts the computed values:
+            // https://drafts.csswg.org/css-display-3/#transformations
+            // “'display' of 'contents' computes to 'block' on the root element”
+            unreachable!()
+        },
+        // The root element is blockified, ignore DisplayOutside
+        Display::GeneratingBox(display_generating_box) => display_generating_box.display_inside(),
+    };
+
+    let contents = ReplacedContents::for_element(root_element, context)
+        .map_or_else(|| NonReplacedContents::OfElement.into(), Contents::Replaced);
+
+    let propagated_data = PropagatedBoxTreeData::default().union(&info.style);
+    let root_box = if box_style.position.is_absolutely_positioned() {
+        BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(ArcRefCell::new(
+            AbsolutelyPositionedBox::construct(context, &info, display_inside, contents),
+        ))
+    } else if box_style.float.is_floating() {
+        BlockLevelBox::OutOfFlowFloatBox(FloatBox::construct(
+            context,
+            &info,
+            display_inside,
+            contents,
+            propagated_data,
+        ))
+    } else {
+        BlockLevelBox::Independent(IndependentFormattingContext::construct(
+            context,
+            &info,
+            display_inside,
+            contents,
+            propagated_data,
+        ))
+    };
+
+    let root_box = ArcRefCell::new(root_box);
+    root_element
+        .element_box_slot()
+        .set(LayoutBox::BlockLevel(root_box.clone()));
+    vec![root_box]
+}
+
+impl BoxTree {
+    pub fn layout(
+        &self,
+        layout_context: &LayoutContext,
+        viewport: euclid::Size2D<f32, CSSPixel>,
+    ) -> FragmentTree {
+        let style = layout_context
+            .style_context
+            .stylist
+            .device()
+            .default_computed_values();
+
+        // FIXME: use the document’s mode:
+        // https://drafts.csswg.org/css-writing-modes/#principal-flow
+        let physical_containing_block = PhysicalRect::new(
+            PhysicalPoint::zero(),
+            PhysicalSize::new(
+                Au::from_f32_px(viewport.width),
+                Au::from_f32_px(viewport.height),
+            ),
+        );
+        let initial_containing_block = DefiniteContainingBlock {
+            size: LogicalVec2 {
+                inline: physical_containing_block.size.width,
+                block: physical_containing_block.size.height,
+            },
+            style,
+        };
+
+        let mut positioning_context = PositioningContext::default();
+        let independent_layout = self.root.layout(
+            layout_context,
+            &mut positioning_context,
+            &(&initial_containing_block).into(),
+            false, /* depends_on_block_constraints */
+        );
+
+        let mut root_fragments = independent_layout.fragments.into_iter().collect::<Vec<_>>();
+
+        // Zero box for `:root { display: none }`, one for the root element otherwise.
+        assert!(root_fragments.len() <= 1);
+
+        // There may be more fragments at the top-level
+        // (for positioned boxes whose containing is the initial containing block)
+        // but only if there was one fragment for the root element.
+        positioning_context.layout_initial_containing_block_children(
+            layout_context,
+            &initial_containing_block,
+            &mut root_fragments,
+        );
+
+        let scrollable_overflow = root_fragments
+            .iter()
+            .fold(PhysicalRect::zero(), |acc, child| {
+                let child_overflow = child.scrollable_overflow_for_parent();
+
+                // https://drafts.csswg.org/css-overflow/#scrolling-direction
+                // We want to clip scrollable overflow on box-start and inline-start
+                // sides of the scroll container.
+                //
+                // FIXME(mrobinson, bug 25564): This should take into account writing
+                // mode.
+                let child_overflow = PhysicalRect::new(
+                    euclid::Point2D::zero(),
+                    euclid::Size2D::new(
+                        child_overflow.size.width + child_overflow.origin.x,
+                        child_overflow.size.height + child_overflow.origin.y,
+                    ),
+                );
+                acc.union(&child_overflow)
+            });
+
+        FragmentTree::new(
+            layout_context,
+            root_fragments,
+            scrollable_overflow,
+            physical_containing_block,
+            self.viewport_scroll_sensitivity,
+        )
+    }
+}
diff --git a/components/layout_2020/formatting_contexts.rs b/components/layout/formatting_contexts.rs
similarity index 86%
rename from components/layout_2020/formatting_contexts.rs
rename to components/layout/formatting_contexts.rs
index 573e9100cec..d704011d0e7 100644
--- a/components/layout_2020/formatting_contexts.rs
+++ b/components/layout/formatting_contexts.rs
@@ -3,12 +3,14 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use app_units::Au;
+use malloc_size_of_derive::MallocSizeOf;
+use script::layout_dom::ServoLayoutElement;
 use servo_arc::Arc;
+use style::context::SharedStyleContext;
 use style::properties::ComputedValues;
 use style::selector_parser::PseudoElement;
 
 use crate::context::LayoutContext;
-use crate::dom::NodeExt;
 use crate::dom_traversal::{Contents, NodeAndStyleInfo};
 use crate::flexbox::FlexContainer;
 use crate::flow::BlockFormattingContext;
@@ -27,13 +29,13 @@ use crate::{
 };
 
 /// <https://drafts.csswg.org/css-display/#independent-formatting-context>
-#[derive(Debug)]
+#[derive(Debug, MallocSizeOf)]
 pub(crate) struct IndependentFormattingContext {
     pub base: LayoutBoxBase,
     pub contents: IndependentFormattingContextContents,
 }
 
-#[derive(Debug)]
+#[derive(Debug, MallocSizeOf)]
 pub(crate) enum IndependentFormattingContextContents {
     NonReplaced(IndependentNonReplacedContents),
     Replaced(ReplacedContents),
@@ -41,7 +43,7 @@ pub(crate) enum IndependentFormattingContextContents {
 
 // Private so that code outside of this module cannot match variants.
 // It should got through methods instead.
-#[derive(Debug)]
+#[derive(Debug, MallocSizeOf)]
 pub(crate) enum IndependentNonReplacedContents {
     Flow(BlockFormattingContext),
     Flex(FlexContainer),
@@ -52,7 +54,7 @@ pub(crate) enum IndependentNonReplacedContents {
 
 /// The baselines of a layout or a [`crate::fragment_tree::BoxFragment`]. Some layout
 /// uses the first and some layout uses the last.
-#[derive(Clone, Copy, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default, MallocSizeOf)]
 pub(crate) struct Baselines {
     pub first: Option<Au>,
     pub last: Option<Au>,
@@ -68,9 +70,9 @@ impl Baselines {
 }
 
 impl IndependentFormattingContext {
-    pub fn construct<'dom, Node: NodeExt<'dom>>(
+    pub fn construct(
         context: &LayoutContext,
-        node_and_style_info: &NodeAndStyleInfo<Node>,
+        node_and_style_info: &NodeAndStyleInfo,
         display_inside: DisplayInside,
         contents: Contents,
         propagated_data: PropagatedBoxTreeData,
@@ -110,11 +112,11 @@ impl IndependentFormattingContext {
                         let table_grid_style = context
                             .shared_context()
                             .stylist
-                            .style_for_anonymous::<Node::ConcreteElement>(
-                            &context.shared_context().guards,
-                            &PseudoElement::ServoTableGrid,
-                            &node_and_style_info.style,
-                        );
+                            .style_for_anonymous::<ServoLayoutElement>(
+                                &context.shared_context().guards,
+                                &PseudoElement::ServoTableGrid,
+                                &node_and_style_info.style,
+                            );
                         base_fragment_info.flags.insert(FragmentFlags::DO_NOT_PAINT);
                         IndependentNonReplacedContents::Table(Table::construct(
                             context,
@@ -216,10 +218,24 @@ impl IndependentFormattingContext {
             },
         }
     }
+
+    pub(crate) fn repair_style(
+        &mut self,
+        context: &SharedStyleContext,
+        new_style: &Arc<ComputedValues>,
+    ) {
+        self.base.repair_style(new_style);
+        match &mut self.contents {
+            IndependentFormattingContextContents::NonReplaced(content) => {
+                content.repair_style(context, new_style);
+            },
+            IndependentFormattingContextContents::Replaced(..) => {},
+        }
+    }
 }
 
 impl IndependentNonReplacedContents {
-    pub fn layout(
+    pub(crate) fn layout_without_caching(
         &self,
         layout_context: &LayoutContext,
         positioning_context: &mut PositioningContext,
@@ -265,7 +281,7 @@ impl IndependentNonReplacedContents {
             level = "trace",
         )
     )]
-    pub fn layout_with_caching(
+    pub fn layout(
         &self,
         layout_context: &LayoutContext,
         positioning_context: &mut PositioningContext,
@@ -275,6 +291,7 @@ impl IndependentNonReplacedContents {
         depends_on_block_constraints: bool,
     ) -> CacheableLayoutResult {
         if let Some(cache) = base.cached_layout_result.borrow().as_ref() {
+            let cache = &**cache;
             if cache.containing_block_for_children_size.inline ==
                 containing_block_for_children.size.inline &&
                 (cache.containing_block_for_children_size.block ==
@@ -293,11 +310,8 @@ impl IndependentNonReplacedContents {
             );
         }
 
-        let mut child_positioning_context = PositioningContext::new_for_subtree(
-            positioning_context.collects_for_nearest_positioned_ancestor(),
-        );
-
-        let result = self.layout(
+        let mut child_positioning_context = PositioningContext::default();
+        let result = self.layout_without_caching(
             layout_context,
             &mut child_positioning_context,
             containing_block_for_children,
@@ -305,11 +319,11 @@ impl IndependentNonReplacedContents {
             depends_on_block_constraints,
         );
 
-        *base.cached_layout_result.borrow_mut() = Some(CacheableLayoutResultAndInputs {
+        *base.cached_layout_result.borrow_mut() = Some(Box::new(CacheableLayoutResultAndInputs {
             result: result.clone(),
             positioning_context: child_positioning_context.clone(),
             containing_block_for_children_size: containing_block_for_children.size.clone(),
-        });
+        }));
         positioning_context.append(child_positioning_context);
 
         result
@@ -335,6 +349,19 @@ impl IndependentNonReplacedContents {
     pub(crate) fn is_table(&self) -> bool {
         matches!(self, Self::Table(_))
     }
+
+    fn repair_style(&mut self, context: &SharedStyleContext, new_style: &Arc<ComputedValues>) {
+        match self {
+            IndependentNonReplacedContents::Flow(..) => {},
+            IndependentNonReplacedContents::Flex(flex_container) => {
+                flex_container.repair_style(new_style)
+            },
+            IndependentNonReplacedContents::Grid(taffy_container) => {
+                taffy_container.repair_style(new_style)
+            },
+            IndependentNonReplacedContents::Table(table) => table.repair_style(context, new_style),
+        }
+    }
 }
 
 impl ComputeInlineContentSizes for IndependentNonReplacedContents {
diff --git a/components/layout_2020/fragment_tree/base_fragment.rs b/components/layout/fragment_tree/base_fragment.rs
similarity index 88%
rename from components/layout_2020/fragment_tree/base_fragment.rs
rename to components/layout/fragment_tree/base_fragment.rs
index 2b23e42100d..ff5df44c225 100644
--- a/components/layout_2020/fragment_tree/base_fragment.rs
+++ b/components/layout/fragment_tree/base_fragment.rs
@@ -3,6 +3,8 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use bitflags::bitflags;
+use malloc_size_of::malloc_size_of_is_0;
+use malloc_size_of_derive::MallocSizeOf;
 use script_layout_interface::combine_id_with_fragment_type;
 use style::dom::OpaqueNode;
 use style::selector_parser::PseudoElement;
@@ -10,11 +12,11 @@ use style::selector_parser::PseudoElement;
 /// This data structure stores fields that are common to all non-base
 /// Fragment types and should generally be the first member of all
 /// concrete fragments.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, MallocSizeOf)]
 pub(crate) struct BaseFragment {
     /// A tag which identifies the DOM node and pseudo element of this
-    /// Fragment's content. If this fragment isn't related to any DOM
-    /// node at all, the tag will be None.
+    /// Fragment's content. If this fragment is for an anonymous box,
+    /// the tag will be None.
     pub tag: Option<Tag>,
 
     /// Flags which various information about this fragment used during
@@ -30,15 +32,13 @@ impl BaseFragment {
         }
     }
 
-    /// Returns true if this fragment is non-anonymous and it is for the given
-    /// OpaqueNode, regardless of the pseudo element.
-    pub(crate) fn is_for_node(&self, node: OpaqueNode) -> bool {
-        self.tag.map(|tag| tag.node == node).unwrap_or(false)
+    pub(crate) fn is_anonymous(&self) -> bool {
+        self.tag.is_none()
     }
 }
 
 /// Information necessary to construct a new BaseFragment.
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, MallocSizeOf)]
 pub(crate) struct BaseFragmentInfo {
     /// The tag to use for the new BaseFragment, if it is not an anonymous Fragment.
     pub tag: Option<Tag>,
@@ -102,12 +102,16 @@ bitflags! {
         /// and the fragment can be a flex item. This flag is used to cache items during flex
         /// layout.
         const SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM = 1 << 8;
+        /// Whether or not the node that created this fragment is the root element.
+        const IS_ROOT_ELEMENT = 1 << 9;
     }
 }
 
+malloc_size_of_is_0!(FragmentFlags);
+
 /// A data structure used to hold DOM and pseudo-element information about
 /// a particular layout object.
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[derive(Clone, Copy, Debug, Eq, MallocSizeOf, PartialEq)]
 pub(crate) struct Tag {
     pub(crate) node: OpaqueNode,
     pub(crate) pseudo: Option<PseudoElement>,
@@ -126,11 +130,6 @@ impl Tag {
         Tag { node, pseudo }
     }
 
-    /// Returns true if this tag is for a pseudo element.
-    pub(crate) fn is_pseudo(&self) -> bool {
-        self.pseudo.is_some()
-    }
-
     pub(crate) fn to_display_list_fragment_id(self) -> u64 {
         combine_id_with_fragment_type(self.node.id(), self.pseudo.into())
     }
diff --git a/components/layout/fragment_tree/box_fragment.rs b/components/layout/fragment_tree/box_fragment.rs
new file mode 100644
index 00000000000..9b96b1c4fb4
--- /dev/null
+++ b/components/layout/fragment_tree/box_fragment.rs
@@ -0,0 +1,488 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use app_units::{Au, MAX_AU, MIN_AU};
+use atomic_refcell::AtomicRefCell;
+use base::print_tree::PrintTree;
+use malloc_size_of_derive::MallocSizeOf;
+use servo_arc::Arc as ServoArc;
+use servo_geometry::f32_rect_to_au_rect;
+use style::Zero;
+use style::computed_values::border_collapse::T as BorderCollapse;
+use style::computed_values::overflow_x::T as ComputedOverflow;
+use style::computed_values::position::T as ComputedPosition;
+use style::logical_geometry::WritingMode;
+use style::properties::ComputedValues;
+use style::values::specified::box_::DisplayOutside;
+
+use super::{BaseFragment, BaseFragmentInfo, CollapsedBlockMargins, Fragment, FragmentFlags};
+use crate::SharedStyle;
+use crate::display_list::ToWebRender;
+use crate::formatting_contexts::Baselines;
+use crate::geom::{
+    AuOrAuto, LengthPercentageOrAuto, PhysicalPoint, PhysicalRect, PhysicalSides, ToLogical,
+};
+use crate::style_ext::ComputedValuesExt;
+use crate::table::SpecificTableGridInfo;
+use crate::taffy::SpecificTaffyGridInfo;
+
+/// Describes how a [`BoxFragment`] paints its background.
+#[derive(MallocSizeOf)]
+pub(crate) enum BackgroundMode {
+    /// Draw the normal [`BoxFragment`] background as well as the extra backgrounds
+    /// based on the style and positioning rectangles in this data structure.
+    Extra(Vec<ExtraBackground>),
+    /// Do not draw a background for this Fragment. This is used for elements like
+    /// table tracks and table track groups, which rely on cells to paint their
+    /// backgrounds.
+    None,
+    /// Draw the background normally, getting information from the Fragment style.
+    Normal,
+}
+#[derive(MallocSizeOf)]
+pub(crate) struct ExtraBackground {
+    pub style: SharedStyle,
+    pub rect: PhysicalRect<Au>,
+}
+
+#[derive(Clone, Debug, MallocSizeOf)]
+pub(crate) enum SpecificLayoutInfo {
+    Grid(Box<SpecificTaffyGridInfo>),
+    TableCellWithCollapsedBorders,
+    TableGridWithCollapsedBorders(Box<SpecificTableGridInfo>),
+    TableWrapper,
+}
+
+#[derive(MallocSizeOf)]
+pub(crate) struct BoxFragment {
+    pub base: BaseFragment,
+
+    pub style: ServoArc<ComputedValues>,
+    pub children: Vec<Fragment>,
+
+    /// The content rect of this fragment in the parent fragment's content rectangle. This
+    /// does not include padding, border, or margin -- it only includes content.
+    pub content_rect: PhysicalRect<Au>,
+
+    /// This [`BoxFragment`]'s containing block rectangle in coordinates relative to
+    /// the initial containing block, but not taking into account any transforms.
+    pub cumulative_containing_block_rect: PhysicalRect<Au>,
+
+    pub padding: PhysicalSides<Au>,
+    pub border: PhysicalSides<Au>,
+    pub margin: PhysicalSides<Au>,
+
+    /// When the `clear` property is not set to `none`, it may introduce clearance.
+    /// Clearance is some extra spacing that is added above the top margin,
+    /// so that the element doesn't overlap earlier floats in the same BFC.
+    /// The presence of clearance prevents the top margin from collapsing with
+    /// earlier margins or with the bottom margin of the parent block.
+    /// <https://drafts.csswg.org/css2/#clearance>
+    pub clearance: Option<Au>,
+
+    /// When this [`BoxFragment`] is for content that has a baseline, this tracks
+    /// the first and last baselines of that content. This is used to propagate baselines
+    /// to things such as tables and inline formatting contexts.
+    baselines: Baselines,
+
+    block_margins_collapsed_with_children: Option<Box<CollapsedBlockMargins>>,
+
+    /// The scrollable overflow of this box fragment.
+    pub scrollable_overflow_from_children: PhysicalRect<Au>,
+
+    /// The resolved box insets if this box is `position: sticky`. These are calculated
+    /// during stacking context tree construction because they rely on the size of the
+    /// scroll container.
+    pub(crate) resolved_sticky_insets: AtomicRefCell<Option<PhysicalSides<AuOrAuto>>>,
+
+    pub background_mode: BackgroundMode,
+
+    /// Additional information of from layout that could be used by Javascripts and devtools.
+    pub specific_layout_info: Option<SpecificLayoutInfo>,
+}
+
+impl BoxFragment {
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        base_fragment_info: BaseFragmentInfo,
+        style: ServoArc<ComputedValues>,
+        children: Vec<Fragment>,
+        content_rect: PhysicalRect<Au>,
+        padding: PhysicalSides<Au>,
+        border: PhysicalSides<Au>,
+        margin: PhysicalSides<Au>,
+        clearance: Option<Au>,
+    ) -> BoxFragment {
+        let scrollable_overflow_from_children =
+            children.iter().fold(PhysicalRect::zero(), |acc, child| {
+                acc.union(&child.scrollable_overflow_for_parent())
+            });
+
+        BoxFragment {
+            base: base_fragment_info.into(),
+            style,
+            children,
+            content_rect,
+            cumulative_containing_block_rect: Default::default(),
+            padding,
+            border,
+            margin,
+            clearance,
+            baselines: Baselines::default(),
+            block_margins_collapsed_with_children: None,
+            scrollable_overflow_from_children,
+            resolved_sticky_insets: AtomicRefCell::default(),
+            background_mode: BackgroundMode::Normal,
+            specific_layout_info: None,
+        }
+    }
+
+    pub fn with_baselines(mut self, baselines: Baselines) -> Self {
+        self.baselines = baselines;
+        self
+    }
+
+    /// Get the baselines for this [`BoxFragment`] if they are compatible with the given [`WritingMode`].
+    /// If they are not compatible, [`Baselines::default()`] is returned.
+    pub fn baselines(&self, writing_mode: WritingMode) -> Baselines {
+        let mut baselines =
+            if writing_mode.is_horizontal() == self.style.writing_mode.is_horizontal() {
+                self.baselines
+            } else {
+                // If the writing mode of the container requesting baselines is not
+                // compatible, ensure that the baselines established by this fragment are
+                // not used.
+                Baselines::default()
+            };
+
+        // From the https://drafts.csswg.org/css-align-3/#baseline-export section on "block containers":
+        // > However, for legacy reasons if its baseline-source is auto (the initial
+        // > value) a block-level or inline-level block container that is a scroll container
+        // > always has a last baseline set, whose baselines all correspond to its block-end
+        // > margin edge.
+        //
+        // This applies even if there is no baseline set, so we unconditionally set the value here
+        // and ignore anything that is set via [`Self::with_baselines`].
+        if self.style.establishes_scroll_container(self.base.flags) {
+            let content_rect_size = self.content_rect.size.to_logical(writing_mode);
+            let padding = self.padding.to_logical(writing_mode);
+            let border = self.border.to_logical(writing_mode);
+            let margin = self.margin.to_logical(writing_mode);
+            baselines.last = Some(
+                content_rect_size.block + padding.block_end + border.block_end + margin.block_end,
+            )
+        }
+        baselines
+    }
+
+    pub fn add_extra_background(&mut self, extra_background: ExtraBackground) {
+        match self.background_mode {
+            BackgroundMode::Extra(ref mut backgrounds) => backgrounds.push(extra_background),
+            _ => self.background_mode = BackgroundMode::Extra(vec![extra_background]),
+        }
+    }
+
+    pub fn set_does_not_paint_background(&mut self) {
+        self.background_mode = BackgroundMode::None;
+    }
+
+    pub fn with_specific_layout_info(mut self, info: Option<SpecificLayoutInfo>) -> Self {
+        self.specific_layout_info = info;
+        self
+    }
+
+    pub fn with_block_margins_collapsed_with_children(
+        mut self,
+        collapsed_margins: CollapsedBlockMargins,
+    ) -> Self {
+        self.block_margins_collapsed_with_children = Some(collapsed_margins.into());
+        self
+    }
+
+    /// Get the scrollable overflow for this [`BoxFragment`] relative to its
+    /// containing block.
+    pub fn scrollable_overflow(&self) -> PhysicalRect<Au> {
+        let physical_padding_rect = self.padding_rect();
+        let content_origin = self.content_rect.origin.to_vector();
+        physical_padding_rect.union(
+            &self
+                .scrollable_overflow_from_children
+                .translate(content_origin),
+        )
+    }
+
+    pub(crate) fn set_containing_block(&mut self, containing_block: &PhysicalRect<Au>) {
+        self.cumulative_containing_block_rect = *containing_block;
+    }
+
+    pub fn offset_by_containing_block(&self, rect: &PhysicalRect<Au>) -> PhysicalRect<Au> {
+        rect.translate(self.cumulative_containing_block_rect.origin.to_vector())
+    }
+
+    pub(crate) fn padding_rect(&self) -> PhysicalRect<Au> {
+        self.content_rect.outer_rect(self.padding)
+    }
+
+    pub(crate) fn border_rect(&self) -> PhysicalRect<Au> {
+        self.padding_rect().outer_rect(self.border)
+    }
+
+    pub(crate) fn margin_rect(&self) -> PhysicalRect<Au> {
+        self.border_rect().outer_rect(self.margin)
+    }
+
+    pub(crate) fn padding_border_margin(&self) -> PhysicalSides<Au> {
+        self.margin + self.border + self.padding
+    }
+
+    pub(crate) fn is_root_element(&self) -> bool {
+        self.base.flags.intersects(FragmentFlags::IS_ROOT_ELEMENT)
+    }
+
+    pub(crate) fn is_body_element_of_html_element_root(&self) -> bool {
+        self.base
+            .flags
+            .intersects(FragmentFlags::IS_BODY_ELEMENT_OF_HTML_ELEMENT_ROOT)
+    }
+
+    pub fn print(&self, tree: &mut PrintTree) {
+        tree.new_level(format!(
+            "Box\
+                \nbase={:?}\
+                \ncontent={:?}\
+                \npadding rect={:?}\
+                \nborder rect={:?}\
+                \nmargin={:?}\
+                \nclearance={:?}\
+                \nscrollable_overflow={:?}\
+                \nbaselines={:?}\
+                \noverflow={:?}",
+            self.base,
+            self.content_rect,
+            self.padding_rect(),
+            self.border_rect(),
+            self.margin,
+            self.clearance,
+            self.scrollable_overflow(),
+            self.baselines,
+            self.style.effective_overflow(self.base.flags),
+        ));
+
+        for child in &self.children {
+            child.print(tree);
+        }
+        tree.end_level();
+    }
+
+    pub fn scrollable_overflow_for_parent(&self) -> PhysicalRect<Au> {
+        let mut overflow = self.border_rect();
+        if !self.style.establishes_scroll_container(self.base.flags) {
+            // https://www.w3.org/TR/css-overflow-3/#scrollable
+            // Only include the scrollable overflow of a child box if it has overflow: visible.
+            let scrollable_overflow = self.scrollable_overflow();
+            let bottom_right = PhysicalPoint::new(
+                overflow.max_x().max(scrollable_overflow.max_x()),
+                overflow.max_y().max(scrollable_overflow.max_y()),
+            );
+
+            let overflow_style = self.style.effective_overflow(self.base.flags);
+            if overflow_style.y == ComputedOverflow::Visible {
+                overflow.origin.y = overflow.origin.y.min(scrollable_overflow.origin.y);
+                overflow.size.height = bottom_right.y - overflow.origin.y;
+            }
+
+            if overflow_style.x == ComputedOverflow::Visible {
+                overflow.origin.x = overflow.origin.x.min(scrollable_overflow.origin.x);
+                overflow.size.width = bottom_right.x - overflow.origin.x;
+            }
+        }
+
+        // <https://drafts.csswg.org/css-overflow-3/#scrollable-overflow-region>
+        // > ...accounting for transforms by projecting each box onto the plane of
+        // > the element that establishes its 3D rendering context. [CSS3-TRANSFORMS]
+        // Both boxes and its scrollable overflow (if it is included) should be transformed accordingly.
+        //
+        // TODO(stevennovaryo): We are supposed to handle perspective transform and 3d context, but it is yet to happen.
+        if self
+            .style
+            .has_effective_transform_or_perspective(self.base.flags)
+        {
+            if let Some(transform) =
+                self.calculate_transform_matrix(&self.border_rect().to_untyped())
+            {
+                if let Some(transformed_overflow_box) =
+                    transform.outer_transformed_rect(&overflow.to_webrender().to_rect())
+                {
+                    overflow =
+                        f32_rect_to_au_rect(transformed_overflow_box.to_untyped()).cast_unit();
+                }
+            }
+        }
+
+        overflow
+    }
+
+    /// <https://drafts.csswg.org/css-overflow/#unreachable-scrollable-overflow-region>
+    /// > area beyond the scroll origin in either axis is considered the unreachable scrollable overflow region
+    ///
+    /// Return the clipped the scrollable overflow based on its scroll origin, determined by overflow direction.
+    /// For an element, the clip rect is the padding rect and for viewport, it is the initial containing block.
+    pub fn clip_unreachable_scrollable_overflow_region(
+        &self,
+        scrollable_overflow: PhysicalRect<Au>,
+        clipping_rect: PhysicalRect<Au>,
+    ) -> PhysicalRect<Au> {
+        let scrolling_direction = self.style.overflow_direction();
+        let mut scrollable_overflow_box = scrollable_overflow.to_box2d();
+        let mut clipping_box = clipping_rect.to_box2d();
+
+        if scrolling_direction.rightward {
+            clipping_box.max.x = MAX_AU;
+        } else {
+            clipping_box.min.x = MIN_AU;
+        }
+
+        if scrolling_direction.downward {
+            clipping_box.max.y = MAX_AU;
+        } else {
+            clipping_box.min.y = MIN_AU;
+        }
+
+        scrollable_overflow_box = scrollable_overflow_box.intersection_unchecked(&clipping_box);
+
+        match scrollable_overflow_box.is_negative() {
+            true => PhysicalRect::zero(),
+            false => scrollable_overflow_box.to_rect(),
+        }
+    }
+
+    /// <https://drafts.csswg.org/css-overflow/#unreachable-scrollable-overflow-region>
+    /// > area beyond the scroll origin in either axis is considered the unreachable scrollable overflow region
+    ///
+    /// Return the clipped the scrollable overflow based on its scroll origin, determined by overflow direction.
+    /// This will coincides with the scrollport if the fragment is a scroll container.
+    pub fn reachable_scrollable_overflow_region(&self) -> PhysicalRect<Au> {
+        self.clip_unreachable_scrollable_overflow_region(
+            self.scrollable_overflow(),
+            self.padding_rect(),
+        )
+    }
+
+    pub(crate) fn calculate_resolved_insets_if_positioned(&self) -> PhysicalSides<AuOrAuto> {
+        let position = self.style.get_box().position;
+        debug_assert_ne!(
+            position,
+            ComputedPosition::Static,
+            "Should not call this method on statically positioned box."
+        );
+
+        if let Some(resolved_sticky_insets) = *self.resolved_sticky_insets.borrow() {
+            return resolved_sticky_insets;
+        }
+
+        let convert_to_au_or_auto = |sides: PhysicalSides<Au>| {
+            PhysicalSides::new(
+                AuOrAuto::LengthPercentage(sides.top),
+                AuOrAuto::LengthPercentage(sides.right),
+                AuOrAuto::LengthPercentage(sides.bottom),
+                AuOrAuto::LengthPercentage(sides.left),
+            )
+        };
+
+        // "A resolved value special case property like top defined in another
+        // specification If the property applies to a positioned element and the
+        // resolved value of the display property is not none or contents, and
+        // the property is not over-constrained, then the resolved value is the
+        // used value. Otherwise the resolved value is the computed value."
+        // https://drafts.csswg.org/cssom/#resolved-values
+        let insets = self.style.physical_box_offsets();
+        let (cb_width, cb_height) = (
+            self.cumulative_containing_block_rect.width(),
+            self.cumulative_containing_block_rect.height(),
+        );
+        if position == ComputedPosition::Relative {
+            let get_resolved_axis = |start: &LengthPercentageOrAuto,
+                                     end: &LengthPercentageOrAuto,
+                                     container_length: Au| {
+                let start = start.map(|value| value.to_used_value(container_length));
+                let end = end.map(|value| value.to_used_value(container_length));
+                match (start.non_auto(), end.non_auto()) {
+                    (None, None) => (Au::zero(), Au::zero()),
+                    (None, Some(end)) => (-end, end),
+                    (Some(start), None) => (start, -start),
+                    // This is the overconstrained case, for which the resolved insets will
+                    // simply be the computed insets.
+                    (Some(start), Some(end)) => (start, end),
+                }
+            };
+            let (left, right) = get_resolved_axis(&insets.left, &insets.right, cb_width);
+            let (top, bottom) = get_resolved_axis(&insets.top, &insets.bottom, cb_height);
+            return convert_to_au_or_auto(PhysicalSides::new(top, right, bottom, left));
+        }
+
+        debug_assert!(
+            position == ComputedPosition::Fixed || position == ComputedPosition::Absolute
+        );
+
+        let margin_rect = self.margin_rect();
+        let (top, bottom) = match (&insets.top, &insets.bottom) {
+            (
+                LengthPercentageOrAuto::LengthPercentage(top),
+                LengthPercentageOrAuto::LengthPercentage(bottom),
+            ) => (
+                top.to_used_value(cb_height),
+                bottom.to_used_value(cb_height),
+            ),
+            _ => (margin_rect.origin.y, cb_height - margin_rect.max_y()),
+        };
+        let (left, right) = match (&insets.left, &insets.right) {
+            (
+                LengthPercentageOrAuto::LengthPercentage(left),
+                LengthPercentageOrAuto::LengthPercentage(right),
+            ) => (left.to_used_value(cb_width), right.to_used_value(cb_width)),
+            _ => (margin_rect.origin.x, cb_width - margin_rect.max_x()),
+        };
+
+        convert_to_au_or_auto(PhysicalSides::new(top, right, bottom, left))
+    }
+
+    /// Whether this is a non-replaced inline-level box whose inner display type is `flow`.
+    /// <https://drafts.csswg.org/css-display-3/#inline-box>
+    pub(crate) fn is_inline_box(&self) -> bool {
+        self.style.is_inline_box(self.base.flags)
+    }
+
+    /// Whether this is an atomic inline-level box.
+    /// <https://drafts.csswg.org/css-display-3/#atomic-inline>
+    pub(crate) fn is_atomic_inline_level(&self) -> bool {
+        self.style.get_box().display.outside() == DisplayOutside::Inline && !self.is_inline_box()
+    }
+
+    /// Whether this is a table wrapper box.
+    /// <https://www.w3.org/TR/css-tables-3/#table-wrapper-box>
+    pub(crate) fn is_table_wrapper(&self) -> bool {
+        matches!(
+            self.specific_layout_info,
+            Some(SpecificLayoutInfo::TableWrapper)
+        )
+    }
+
+    pub(crate) fn has_collapsed_borders(&self) -> bool {
+        match &self.specific_layout_info {
+            Some(SpecificLayoutInfo::TableCellWithCollapsedBorders) => true,
+            Some(SpecificLayoutInfo::TableGridWithCollapsedBorders(_)) => true,
+            Some(SpecificLayoutInfo::TableWrapper) => {
+                self.style.get_inherited_table().border_collapse == BorderCollapse::Collapse
+            },
+            _ => false,
+        }
+    }
+
+    pub(crate) fn block_margins_collapsed_with_children(&self) -> CollapsedBlockMargins {
+        match self.block_margins_collapsed_with_children.as_ref() {
+            Some(collapsed_block_margins) => *(collapsed_block_margins).clone(),
+            _ => CollapsedBlockMargins::zero(),
+        }
+    }
+}
diff --git a/components/layout_2020/fragment_tree/containing_block.rs b/components/layout/fragment_tree/containing_block.rs
similarity index 100%
rename from components/layout_2020/fragment_tree/containing_block.rs
rename to components/layout/fragment_tree/containing_block.rs
diff --git a/components/layout/fragment_tree/fragment.rs b/components/layout/fragment_tree/fragment.rs
new file mode 100644
index 00000000000..1ebc7b3c989
--- /dev/null
+++ b/components/layout/fragment_tree/fragment.rs
@@ -0,0 +1,412 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::sync::Arc;
+
+use app_units::Au;
+use base::id::PipelineId;
+use base::print_tree::PrintTree;
+use euclid::{Point2D, Rect, Size2D, UnknownUnit};
+use fonts::{ByteIndex, FontMetrics, GlyphStore};
+use malloc_size_of_derive::MallocSizeOf;
+use range::Range as ServoRange;
+use servo_arc::Arc as ServoArc;
+use style::Zero;
+use style::properties::ComputedValues;
+use style::values::specified::text::TextDecorationLine;
+use webrender_api::{FontInstanceKey, ImageKey};
+
+use super::{
+    BaseFragment, BoxFragment, ContainingBlockManager, HoistedSharedFragment, PositioningFragment,
+    Tag,
+};
+use crate::cell::ArcRefCell;
+use crate::flow::inline::SharedInlineStyles;
+use crate::geom::{LogicalSides, PhysicalPoint, PhysicalRect};
+use crate::style_ext::ComputedValuesExt;
+
+#[derive(Clone, MallocSizeOf)]
+pub(crate) enum Fragment {
+    Box(ArcRefCell<BoxFragment>),
+    /// Floating content. A floated fragment is very similar to a normal
+    /// [BoxFragment] but it isn't positioned using normal in block flow
+    /// positioning rules (margin collapse, etc). Instead, they are laid
+    /// out by the [crate::flow::float::SequentialLayoutState] of their
+    /// float containing block formatting context.
+    Float(ArcRefCell<BoxFragment>),
+    Positioning(ArcRefCell<PositioningFragment>),
+    /// Absolute and fixed position fragments are hoisted up so that they
+    /// are children of the BoxFragment that establishes their containing
+    /// blocks, so that they can be laid out properly. When this happens
+    /// an `AbsoluteOrFixedPositioned` fragment is left at the original tree
+    /// position. This allows these hoisted fragments to be painted with
+    /// regard to their original tree order during stacking context tree /
+    /// display list construction.
+    AbsoluteOrFixedPositioned(ArcRefCell<HoistedSharedFragment>),
+    Text(ArcRefCell<TextFragment>),
+    Image(ArcRefCell<ImageFragment>),
+    IFrame(ArcRefCell<IFrameFragment>),
+}
+
+#[derive(Clone, MallocSizeOf)]
+pub(crate) struct CollapsedBlockMargins {
+    pub collapsed_through: bool,
+    pub start: CollapsedMargin,
+    pub end: CollapsedMargin,
+}
+
+#[derive(Clone, Copy, Debug, MallocSizeOf)]
+pub(crate) struct CollapsedMargin {
+    max_positive: Au,
+    min_negative: Au,
+}
+
+#[derive(MallocSizeOf)]
+pub(crate) struct TextFragment {
+    pub base: BaseFragment,
+    pub inline_styles: SharedInlineStyles,
+    pub rect: PhysicalRect<Au>,
+    pub font_metrics: FontMetrics,
+    pub font_key: FontInstanceKey,
+    #[conditional_malloc_size_of]
+    pub glyphs: Vec<Arc<GlyphStore>>,
+
+    /// A flag that represents the _used_ value of the text-decoration property.
+    pub text_decoration_line: TextDecorationLine,
+
+    /// Extra space to add for each justification opportunity.
+    pub justification_adjustment: Au,
+    pub selection_range: Option<ServoRange<ByteIndex>>,
+}
+
+#[derive(MallocSizeOf)]
+pub(crate) struct ImageFragment {
+    pub base: BaseFragment,
+    pub style: ServoArc<ComputedValues>,
+    pub rect: PhysicalRect<Au>,
+    pub clip: PhysicalRect<Au>,
+    pub image_key: Option<ImageKey>,
+}
+
+#[derive(MallocSizeOf)]
+pub(crate) struct IFrameFragment {
+    pub base: BaseFragment,
+    pub pipeline_id: PipelineId,
+    pub rect: PhysicalRect<Au>,
+    pub style: ServoArc<ComputedValues>,
+}
+
+impl Fragment {
+    pub fn base(&self) -> Option<BaseFragment> {
+        Some(match self {
+            Fragment::Box(fragment) => fragment.borrow().base.clone(),
+            Fragment::Text(fragment) => fragment.borrow().base.clone(),
+            Fragment::AbsoluteOrFixedPositioned(_) => return None,
+            Fragment::Positioning(fragment) => fragment.borrow().base.clone(),
+            Fragment::Image(fragment) => fragment.borrow().base.clone(),
+            Fragment::IFrame(fragment) => fragment.borrow().base.clone(),
+            Fragment::Float(fragment) => fragment.borrow().base.clone(),
+        })
+    }
+
+    pub(crate) fn mutate_content_rect(&mut self, callback: impl FnOnce(&mut PhysicalRect<Au>)) {
+        match self {
+            Fragment::Box(box_fragment) | Fragment::Float(box_fragment) => {
+                callback(&mut box_fragment.borrow_mut().content_rect)
+            },
+            Fragment::Positioning(_) | Fragment::AbsoluteOrFixedPositioned(_) => {},
+            Fragment::Text(text_fragment) => callback(&mut text_fragment.borrow_mut().rect),
+            Fragment::Image(image_fragment) => callback(&mut image_fragment.borrow_mut().rect),
+            Fragment::IFrame(iframe_fragment) => callback(&mut iframe_fragment.borrow_mut().rect),
+        }
+    }
+
+    pub(crate) fn set_containing_block(&self, containing_block: &PhysicalRect<Au>) {
+        match self {
+            Fragment::Box(box_fragment) => box_fragment
+                .borrow_mut()
+                .set_containing_block(containing_block),
+            Fragment::Float(float_fragment) => float_fragment
+                .borrow_mut()
+                .set_containing_block(containing_block),
+            Fragment::Positioning(positioning_fragment) => positioning_fragment
+                .borrow_mut()
+                .set_containing_block(containing_block),
+            Fragment::AbsoluteOrFixedPositioned(hoisted_shared_fragment) => {
+                if let Some(ref fragment) = hoisted_shared_fragment.borrow().fragment {
+                    fragment.set_containing_block(containing_block);
+                }
+            },
+            Fragment::Text(_) => {},
+            Fragment::Image(_) => {},
+            Fragment::IFrame(_) => {},
+        }
+    }
+
+    pub fn tag(&self) -> Option<Tag> {
+        self.base().and_then(|base| base.tag)
+    }
+
+    pub fn print(&self, tree: &mut PrintTree) {
+        match self {
+            Fragment::Box(fragment) => fragment.borrow().print(tree),
+            Fragment::Float(fragment) => {
+                tree.new_level("Float".to_string());
+                fragment.borrow().print(tree);
+                tree.end_level();
+            },
+            Fragment::AbsoluteOrFixedPositioned(_) => {
+                tree.add_item("AbsoluteOrFixedPositioned".to_string());
+            },
+            Fragment::Positioning(fragment) => fragment.borrow().print(tree),
+            Fragment::Text(fragment) => fragment.borrow().print(tree),
+            Fragment::Image(fragment) => fragment.borrow().print(tree),
+            Fragment::IFrame(fragment) => fragment.borrow().print(tree),
+        }
+    }
+
+    pub fn unclipped_scrolling_area(&self) -> PhysicalRect<Au> {
+        match self {
+            Fragment::Box(fragment) | Fragment::Float(fragment) => {
+                let fragment = fragment.borrow();
+                fragment.offset_by_containing_block(&fragment.scrollable_overflow())
+            },
+            _ => self.scrollable_overflow_for_parent(),
+        }
+    }
+
+    pub fn scrolling_area(&self) -> PhysicalRect<Au> {
+        match self {
+            Fragment::Box(fragment) | Fragment::Float(fragment) => {
+                let fragment = fragment.borrow();
+                fragment
+                    .offset_by_containing_block(&fragment.reachable_scrollable_overflow_region())
+            },
+            _ => self.scrollable_overflow_for_parent(),
+        }
+    }
+
+    pub fn scrollable_overflow_for_parent(&self) -> PhysicalRect<Au> {
+        match self {
+            Fragment::Box(fragment) | Fragment::Float(fragment) => {
+                fragment.borrow().scrollable_overflow_for_parent()
+            },
+            Fragment::AbsoluteOrFixedPositioned(_) => PhysicalRect::zero(),
+            Fragment::Positioning(fragment) => fragment.borrow().scrollable_overflow,
+            Fragment::Text(fragment) => fragment.borrow().rect,
+            Fragment::Image(fragment) => fragment.borrow().rect,
+            Fragment::IFrame(fragment) => fragment.borrow().rect,
+        }
+    }
+
+    pub(crate) fn cumulative_border_box_rect(&self) -> Option<PhysicalRect<Au>> {
+        match self {
+            Fragment::Box(fragment) | Fragment::Float(fragment) => {
+                let fragment = fragment.borrow();
+                Some(fragment.offset_by_containing_block(&fragment.border_rect()))
+            },
+            Fragment::Positioning(fragment) => {
+                let fragment = fragment.borrow();
+                Some(fragment.offset_by_containing_block(&fragment.rect))
+            },
+            Fragment::Text(_) |
+            Fragment::AbsoluteOrFixedPositioned(_) |
+            Fragment::Image(_) |
+            Fragment::IFrame(_) => None,
+        }
+    }
+
+    pub(crate) fn client_rect(&self) -> Rect<i32, UnknownUnit> {
+        let rect = match self {
+            Fragment::Box(fragment) | Fragment::Float(fragment) => {
+                // https://drafts.csswg.org/cssom-view/#dom-element-clienttop
+                // " If the element has no associated CSS layout box or if the
+                //   CSS layout box is inline, return zero." For this check we
+                // also explicitly ignore the list item portion of the display
+                // style.
+                let fragment = fragment.borrow();
+                if fragment.is_inline_box() {
+                    return Rect::zero();
+                }
+
+                if fragment.is_table_wrapper() {
+                    // For tables the border actually belongs to the table grid box,
+                    // so we need to include it in the dimension of the table wrapper box.
+                    let mut rect = fragment.border_rect();
+                    rect.origin = PhysicalPoint::zero();
+                    rect
+                } else {
+                    let mut rect = fragment.padding_rect();
+                    rect.origin = PhysicalPoint::new(fragment.border.left, fragment.border.top);
+                    rect
+                }
+            },
+            _ => return Rect::zero(),
+        }
+        .to_untyped();
+
+        let rect = Rect::new(
+            Point2D::new(rect.origin.x.to_f32_px(), rect.origin.y.to_f32_px()),
+            Size2D::new(rect.size.width.to_f32_px(), rect.size.height.to_f32_px()),
+        );
+        rect.round().to_i32()
+    }
+
+    pub(crate) fn find<T>(
+        &self,
+        manager: &ContainingBlockManager<PhysicalRect<Au>>,
+        level: usize,
+        process_func: &mut impl FnMut(&Fragment, usize, &PhysicalRect<Au>) -> Option<T>,
+    ) -> Option<T> {
+        let containing_block = manager.get_containing_block_for_fragment(self);
+        if let Some(result) = process_func(self, level, containing_block) {
+            return Some(result);
+        }
+
+        match self {
+            Fragment::Box(fragment) | Fragment::Float(fragment) => {
+                let fragment = fragment.borrow();
+                let content_rect = fragment
+                    .content_rect
+                    .translate(containing_block.origin.to_vector());
+                let padding_rect = fragment
+                    .padding_rect()
+                    .translate(containing_block.origin.to_vector());
+                let new_manager = if fragment
+                    .style
+                    .establishes_containing_block_for_all_descendants(fragment.base.flags)
+                {
+                    manager.new_for_absolute_and_fixed_descendants(&content_rect, &padding_rect)
+                } else if fragment
+                    .style
+                    .establishes_containing_block_for_absolute_descendants(fragment.base.flags)
+                {
+                    manager.new_for_absolute_descendants(&content_rect, &padding_rect)
+                } else {
+                    manager.new_for_non_absolute_descendants(&content_rect)
+                };
+
+                fragment
+                    .children
+                    .iter()
+                    .find_map(|child| child.find(&new_manager, level + 1, process_func))
+            },
+            Fragment::Positioning(fragment) => {
+                let fragment = fragment.borrow();
+                let content_rect = fragment.rect.translate(containing_block.origin.to_vector());
+                let new_manager = manager.new_for_non_absolute_descendants(&content_rect);
+                fragment
+                    .children
+                    .iter()
+                    .find_map(|child| child.find(&new_manager, level + 1, process_func))
+            },
+            _ => None,
+        }
+    }
+
+    pub(crate) fn repair_style(&self, style: &ServoArc<ComputedValues>) {
+        match self {
+            Fragment::Box(box_fragment) | Fragment::Float(box_fragment) => {
+                box_fragment.borrow_mut().style = style.clone()
+            },
+            Fragment::Positioning(positioning_fragment) => {
+                positioning_fragment.borrow_mut().style = style.clone();
+            },
+            Fragment::AbsoluteOrFixedPositioned(positioned_fragment) => {
+                if let Some(ref fragment) = positioned_fragment.borrow().fragment {
+                    fragment.repair_style(style);
+                }
+            },
+            Fragment::Text(..) => unreachable!("Should never try to repair style of TextFragment"),
+            Fragment::Image(image_fragment) => image_fragment.borrow_mut().style = style.clone(),
+            Fragment::IFrame(iframe_fragment) => iframe_fragment.borrow_mut().style = style.clone(),
+        }
+    }
+}
+
+impl TextFragment {
+    pub fn print(&self, tree: &mut PrintTree) {
+        tree.add_item(format!(
+            "Text num_glyphs={} box={:?}",
+            self.glyphs
+                .iter()
+                .map(|glyph_store| glyph_store.len().0)
+                .sum::<isize>(),
+            self.rect,
+        ));
+    }
+
+    pub fn has_selection(&self) -> bool {
+        self.selection_range.is_some()
+    }
+}
+
+impl ImageFragment {
+    pub fn print(&self, tree: &mut PrintTree) {
+        tree.add_item(format!(
+            "Image\
+                \nrect={:?}",
+            self.rect
+        ));
+    }
+}
+
+impl IFrameFragment {
+    pub fn print(&self, tree: &mut PrintTree) {
+        tree.add_item(format!(
+            "IFrame\
+                \npipeline={:?} rect={:?}",
+            self.pipeline_id, self.rect
+        ));
+    }
+}
+
+impl CollapsedBlockMargins {
+    pub fn from_margin(margin: &LogicalSides<Au>) -> Self {
+        Self {
+            collapsed_through: false,
+            start: CollapsedMargin::new(margin.block_start),
+            end: CollapsedMargin::new(margin.block_end),
+        }
+    }
+
+    pub fn zero() -> Self {
+        Self {
+            collapsed_through: false,
+            start: CollapsedMargin::zero(),
+            end: CollapsedMargin::zero(),
+        }
+    }
+}
+
+impl CollapsedMargin {
+    pub fn zero() -> Self {
+        Self {
+            max_positive: Au::zero(),
+            min_negative: Au::zero(),
+        }
+    }
+
+    pub fn new(margin: Au) -> Self {
+        Self {
+            max_positive: margin.max(Au::zero()),
+            min_negative: margin.min(Au::zero()),
+        }
+    }
+
+    pub fn adjoin(&self, other: &Self) -> Self {
+        Self {
+            max_positive: self.max_positive.max(other.max_positive),
+            min_negative: self.min_negative.min(other.min_negative),
+        }
+    }
+
+    pub fn adjoin_assign(&mut self, other: &Self) {
+        *self = self.adjoin(other);
+    }
+
+    pub fn solve(&self) -> Au {
+        self.max_positive + self.min_negative
+    }
+}
diff --git a/components/layout/fragment_tree/fragment_tree.rs b/components/layout/fragment_tree/fragment_tree.rs
new file mode 100644
index 00000000000..979bd0090fc
--- /dev/null
+++ b/components/layout/fragment_tree/fragment_tree.rs
@@ -0,0 +1,195 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use app_units::Au;
+use base::print_tree::PrintTree;
+use compositing_traits::display_list::AxesScrollSensitivity;
+use euclid::default::Size2D;
+use fxhash::FxHashSet;
+use malloc_size_of_derive::MallocSizeOf;
+use style::animation::AnimationSetKey;
+use webrender_api::units;
+
+use super::{BoxFragment, ContainingBlockManager, Fragment};
+use crate::ArcRefCell;
+use crate::context::LayoutContext;
+use crate::display_list::StackingContext;
+use crate::geom::PhysicalRect;
+
+#[derive(MallocSizeOf)]
+pub struct FragmentTree {
+    /// Fragments at the top-level of the tree.
+    ///
+    /// If the root element has `display: none`, there are zero fragments.
+    /// Otherwise, there is at least one:
+    ///
+    /// * The first fragment is generated by the root element.
+    /// * There may be additional fragments generated by positioned boxes
+    ///   that have the initial containing block.
+    pub(crate) root_fragments: Vec<Fragment>,
+
+    /// The scrollable overflow rectangle for the entire tree
+    /// <https://drafts.csswg.org/css-overflow/#scrollable>
+    pub(crate) scrollable_overflow: PhysicalRect<Au>,
+
+    /// The containing block used in the layout of this fragment tree.
+    pub(crate) initial_containing_block: PhysicalRect<Au>,
+
+    /// Whether or not the viewport is sensitive to scroll input events.
+    pub viewport_scroll_sensitivity: AxesScrollSensitivity,
+}
+
+impl FragmentTree {
+    pub(crate) fn new(
+        layout_context: &LayoutContext,
+        root_fragments: Vec<Fragment>,
+        scrollable_overflow: PhysicalRect<Au>,
+        initial_containing_block: PhysicalRect<Au>,
+        viewport_scroll_sensitivity: AxesScrollSensitivity,
+    ) -> Self {
+        let fragment_tree = Self {
+            root_fragments,
+            scrollable_overflow,
+            initial_containing_block,
+            viewport_scroll_sensitivity,
+        };
+
+        // As part of building the fragment tree, we want to stop animating elements and
+        // pseudo-elements that used to be animating or had animating images attached to
+        // them. Create a set of all elements that used to be animating.
+        let mut animations = layout_context.style_context.animations.sets.write();
+        let mut invalid_animating_nodes: FxHashSet<_> = animations.keys().cloned().collect();
+        let mut image_animations = layout_context.node_image_animation_map.write().to_owned();
+        let mut invalid_image_animating_nodes: FxHashSet<_> = image_animations
+            .keys()
+            .cloned()
+            .map(|node| AnimationSetKey::new(node, None))
+            .collect();
+
+        fragment_tree.find(|fragment, _level, containing_block| {
+            if let Some(tag) = fragment.tag() {
+                invalid_animating_nodes.remove(&AnimationSetKey::new(tag.node, tag.pseudo));
+                invalid_image_animating_nodes.remove(&AnimationSetKey::new(tag.node, tag.pseudo));
+            }
+
+            fragment.set_containing_block(containing_block);
+            None::<()>
+        });
+
+        // Cancel animations for any elements and pseudo-elements that are no longer found
+        // in the fragment tree.
+        for node in &invalid_animating_nodes {
+            if let Some(state) = animations.get_mut(node) {
+                state.cancel_all_animations();
+            }
+        }
+        for node in &invalid_image_animating_nodes {
+            image_animations.remove(&node.node);
+        }
+
+        fragment_tree
+    }
+
+    pub(crate) fn build_display_list(
+        &self,
+        builder: &mut crate::display_list::DisplayListBuilder,
+        root_stacking_context: &StackingContext,
+    ) {
+        // Paint the canvas’ background (if any) before/under everything else
+        root_stacking_context.build_canvas_background_display_list(builder, self);
+        root_stacking_context.build_display_list(builder);
+    }
+
+    pub fn print(&self) {
+        let mut print_tree = PrintTree::new("Fragment Tree".to_string());
+        for fragment in &self.root_fragments {
+            fragment.print(&mut print_tree);
+        }
+    }
+
+    pub fn scrollable_overflow(&self) -> units::LayoutSize {
+        units::LayoutSize::from_untyped(Size2D::new(
+            self.scrollable_overflow.size.width.to_f32_px(),
+            self.scrollable_overflow.size.height.to_f32_px(),
+        ))
+    }
+
+    pub(crate) fn find<T>(
+        &self,
+        mut process_func: impl FnMut(&Fragment, usize, &PhysicalRect<Au>) -> Option<T>,
+    ) -> Option<T> {
+        let info = ContainingBlockManager {
+            for_non_absolute_descendants: &self.initial_containing_block,
+            for_absolute_descendants: None,
+            for_absolute_and_fixed_descendants: &self.initial_containing_block,
+        };
+        self.root_fragments
+            .iter()
+            .find_map(|child| child.find(&info, 0, &mut process_func))
+    }
+
+    /// <https://drafts.csswg.org/cssom-view/#scrolling-area>
+    ///
+    /// Scrolling area for a viewport that is clipped according to overflow direction of root element.
+    pub fn get_scrolling_area_for_viewport(&self) -> PhysicalRect<Au> {
+        let mut scroll_area = self.initial_containing_block;
+        if let Some(root_fragment) = self.root_fragments.first() {
+            for fragment in self.root_fragments.iter() {
+                scroll_area = fragment.unclipped_scrolling_area().union(&scroll_area);
+            }
+            match root_fragment {
+                Fragment::Box(fragment) | Fragment::Float(fragment) => fragment
+                    .borrow()
+                    .clip_unreachable_scrollable_overflow_region(
+                        scroll_area,
+                        self.initial_containing_block,
+                    ),
+                _ => scroll_area,
+            }
+        } else {
+            scroll_area
+        }
+    }
+
+    /// Find the `<body>` element's [`Fragment`], if it exists in this [`FragmentTree`].
+    pub(crate) fn body_fragment(&self) -> Option<ArcRefCell<BoxFragment>> {
+        fn find_body(children: &[Fragment]) -> Option<ArcRefCell<BoxFragment>> {
+            children.iter().find_map(|fragment| {
+                match fragment {
+                    Fragment::Box(box_fragment) | Fragment::Float(box_fragment) => {
+                        let borrowed_box_fragment = box_fragment.borrow();
+                        if borrowed_box_fragment.is_body_element_of_html_element_root() {
+                            return Some(box_fragment.clone());
+                        }
+
+                        // The fragment for the `<body>` element is typically a child of the root (though,
+                        // not if it's absolutely positioned), so we need to recurse into the children of
+                        // the root to find it.
+                        //
+                        // Additionally, recurse into any anonymous fragments, as the `<body>` fragment may
+                        // have created anonymous parents (for instance by creating an inline formatting context).
+                        if borrowed_box_fragment.is_root_element() ||
+                            borrowed_box_fragment.base.is_anonymous()
+                        {
+                            find_body(&borrowed_box_fragment.children)
+                        } else {
+                            None
+                        }
+                    },
+                    Fragment::Positioning(positioning_context)
+                        if positioning_context.borrow().base.is_anonymous() =>
+                    {
+                        // If the `<body>` element is a `display: inline` then it might be nested inside of a
+                        // `PositioningFragment` for the purposes of putting it on the first line of the implied
+                        // inline formatting context.
+                        find_body(&positioning_context.borrow().children)
+                    },
+                    _ => None,
+                }
+            })
+        }
+
+        find_body(&self.root_fragments)
+    }
+}
diff --git a/components/layout_2020/fragment_tree/hoisted_shared_fragment.rs b/components/layout/fragment_tree/hoisted_shared_fragment.rs
similarity index 97%
rename from components/layout_2020/fragment_tree/hoisted_shared_fragment.rs
rename to components/layout/fragment_tree/hoisted_shared_fragment.rs
index 4d3eb1f7265..fa3862058da 100644
--- a/components/layout_2020/fragment_tree/hoisted_shared_fragment.rs
+++ b/components/layout/fragment_tree/hoisted_shared_fragment.rs
@@ -3,6 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use app_units::Au;
+use malloc_size_of_derive::MallocSizeOf;
 use style::logical_geometry::WritingMode;
 use style::values::specified::align::AlignFlags;
 
@@ -12,6 +13,7 @@ use crate::geom::{LogicalVec2, PhysicalRect, PhysicalVec};
 /// A reference to a Fragment which is shared between `HoistedAbsolutelyPositionedBox`
 /// and its placeholder `AbsoluteOrFixedPositionedFragment` in the original tree position.
 /// This will be used later in order to paint this hoisted box in tree order.
+#[derive(MallocSizeOf)]
 pub(crate) struct HoistedSharedFragment {
     pub fragment: Option<Fragment>,
     /// The "static-position rect" of this absolutely positioned box. This is defined by the
diff --git a/components/layout_2020/fragment_tree/mod.rs b/components/layout/fragment_tree/mod.rs
similarity index 100%
rename from components/layout_2020/fragment_tree/mod.rs
rename to components/layout/fragment_tree/mod.rs
diff --git a/components/layout/fragment_tree/positioning_fragment.rs b/components/layout/fragment_tree/positioning_fragment.rs
new file mode 100644
index 00000000000..e45a6137bff
--- /dev/null
+++ b/components/layout/fragment_tree/positioning_fragment.rs
@@ -0,0 +1,98 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use app_units::Au;
+use base::print_tree::PrintTree;
+use malloc_size_of_derive::MallocSizeOf;
+use servo_arc::Arc as ServoArc;
+use style::properties::ComputedValues;
+
+use super::{BaseFragment, BaseFragmentInfo, Fragment};
+use crate::cell::ArcRefCell;
+use crate::geom::PhysicalRect;
+
+/// Can contain child fragments with relative coordinates, but does not contribute to painting
+/// itself. [`PositioningFragment`]s may be completely anonymous, or just non-painting Fragments
+/// generated by boxes.
+#[derive(MallocSizeOf)]
+pub(crate) struct PositioningFragment {
+    pub base: BaseFragment,
+    pub rect: PhysicalRect<Au>,
+    pub children: Vec<Fragment>,
+
+    /// The scrollable overflow of this anonymous fragment's children.
+    pub scrollable_overflow: PhysicalRect<Au>,
+
+    /// The style of the fragment.
+    pub style: ServoArc<ComputedValues>,
+
+    /// This [`PositioningFragment`]'s containing block rectangle in coordinates relative to
+    /// the initial containing block, but not taking into account any transforms.
+    pub cumulative_containing_block_rect: PhysicalRect<Au>,
+}
+
+impl PositioningFragment {
+    pub fn new_anonymous(
+        style: ServoArc<ComputedValues>,
+        rect: PhysicalRect<Au>,
+        children: Vec<Fragment>,
+    ) -> ArcRefCell<Self> {
+        Self::new_with_base_fragment(BaseFragment::anonymous(), style, rect, children)
+    }
+
+    pub fn new_empty(
+        base_fragment_info: BaseFragmentInfo,
+        rect: PhysicalRect<Au>,
+        style: ServoArc<ComputedValues>,
+    ) -> ArcRefCell<Self> {
+        Self::new_with_base_fragment(base_fragment_info.into(), style, rect, Vec::new())
+    }
+
+    fn new_with_base_fragment(
+        base: BaseFragment,
+        style: ServoArc<ComputedValues>,
+        rect: PhysicalRect<Au>,
+        children: Vec<Fragment>,
+    ) -> ArcRefCell<Self> {
+        let content_origin = rect.origin;
+        let scrollable_overflow = children.iter().fold(PhysicalRect::zero(), |acc, child| {
+            acc.union(
+                &child
+                    .scrollable_overflow_for_parent()
+                    .translate(content_origin.to_vector()),
+            )
+        });
+        ArcRefCell::new(PositioningFragment {
+            base,
+            style,
+            rect,
+            children,
+            scrollable_overflow,
+            cumulative_containing_block_rect: PhysicalRect::zero(),
+        })
+    }
+
+    pub(crate) fn set_containing_block(&mut self, containing_block: &PhysicalRect<Au>) {
+        self.cumulative_containing_block_rect = *containing_block;
+    }
+
+    pub fn offset_by_containing_block(&self, rect: &PhysicalRect<Au>) -> PhysicalRect<Au> {
+        rect.translate(self.cumulative_containing_block_rect.origin.to_vector())
+    }
+
+    pub fn print(&self, tree: &mut PrintTree) {
+        tree.new_level(format!(
+            "PositioningFragment\
+                \nbase={:?}\
+                \nrect={:?}\
+                \nscrollable_overflow={:?}",
+            self.base, self.rect, self.scrollable_overflow
+        ));
+
+        for child in &self.children {
+            child.print(tree);
+        }
+        tree.end_level();
+    }
+}
diff --git a/components/layout/geom.rs b/components/layout/geom.rs
new file mode 100644
index 00000000000..6a09519b7ed
--- /dev/null
+++ b/components/layout/geom.rs
@@ -0,0 +1,1104 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::cell::LazyCell;
+use std::convert::From;
+use std::fmt;
+use std::ops::{Add, AddAssign, Neg, Sub, SubAssign};
+
+use app_units::{Au, MAX_AU};
+use malloc_size_of_derive::MallocSizeOf;
+use style::Zero;
+use style::logical_geometry::{BlockFlowDirection, Direction, InlineBaseDirection, WritingMode};
+use style::values::computed::{
+    CSSPixelLength, LengthPercentage, MaxSize as StyleMaxSize, Percentage, Size as StyleSize,
+};
+use style::values::generics::length::GenericLengthPercentageOrAuto as AutoOr;
+use style_traits::CSSPixel;
+
+use crate::ContainingBlock;
+use crate::sizing::ContentSizes;
+use crate::style_ext::Clamp;
+
+pub type PhysicalPoint<U> = euclid::Point2D<U, CSSPixel>;
+pub type PhysicalSize<U> = euclid::Size2D<U, CSSPixel>;
+pub type PhysicalVec<U> = euclid::Vector2D<U, CSSPixel>;
+pub type PhysicalRect<U> = euclid::Rect<U, CSSPixel>;
+pub type PhysicalSides<U> = euclid::SideOffsets2D<U, CSSPixel>;
+pub type AuOrAuto = AutoOr<Au>;
+pub type LengthPercentageOrAuto<'a> = AutoOr<&'a LengthPercentage>;
+
+#[derive(Clone, Copy, MallocSizeOf, PartialEq)]
+pub struct LogicalVec2<T> {
+    pub inline: T,
+    pub block: T,
+}
+
+#[derive(Clone, Copy)]
+pub struct LogicalRect<T> {
+    pub start_corner: LogicalVec2<T>,
+    pub size: LogicalVec2<T>,
+}
+
+#[derive(Clone, Copy, Debug, Default)]
+pub struct LogicalSides<T> {
+    pub inline_start: T,
+    pub inline_end: T,
+    pub block_start: T,
+    pub block_end: T,
+}
+
+#[derive(Clone, Copy, Debug)]
+pub(crate) struct LogicalSides1D<T> {
+    pub start: T,
+    pub end: T,
+}
+
+impl<T: fmt::Debug> fmt::Debug for LogicalVec2<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        // Not using f.debug_struct on purpose here, to keep {:?} output somewhat compact
+        f.write_str("Vec2 { i: ")?;
+        self.inline.fmt(f)?;
+        f.write_str(", b: ")?;
+        self.block.fmt(f)?;
+        f.write_str(" }")
+    }
+}
+
+impl<T: Default> Default for LogicalVec2<T> {
+    fn default() -> Self {
+        Self {
+            inline: T::default(),
+            block: T::default(),
+        }
+    }
+}
+
+impl<T: Copy> From<T> for LogicalVec2<T> {
+    fn from(value: T) -> Self {
+        Self {
+            inline: value,
+            block: value,
+        }
+    }
+}
+
+impl<T> LogicalVec2<T> {
+    pub(crate) fn as_ref(&self) -> LogicalVec2<&T> {
+        LogicalVec2 {
+            inline: &self.inline,
+            block: &self.block,
+        }
+    }
+
+    pub fn map_inline_and_block_axes<U>(
+        &self,
+        inline_f: impl FnOnce(&T) -> U,
+        block_f: impl FnOnce(&T) -> U,
+    ) -> LogicalVec2<U> {
+        LogicalVec2 {
+            inline: inline_f(&self.inline),
+            block: block_f(&self.block),
+        }
+    }
+}
+
+impl<T: Clone> LogicalVec2<Size<T>> {
+    pub fn map_inline_and_block_sizes<U>(
+        &self,
+        inline_f: impl FnOnce(T) -> U,
+        block_f: impl FnOnce(T) -> U,
+    ) -> LogicalVec2<Size<U>> {
+        self.map_inline_and_block_axes(|size| size.map(inline_f), |size| size.map(block_f))
+    }
+}
+
+impl<T: Clone> LogicalVec2<T> {
+    pub fn from_physical_size(physical_size: &PhysicalSize<T>, mode: WritingMode) -> Self {
+        // https://drafts.csswg.org/css-writing-modes/#logical-to-physical
+        let (i, b) = if mode.is_horizontal() {
+            (&physical_size.width, &physical_size.height)
+        } else {
+            (&physical_size.height, &physical_size.width)
+        };
+        LogicalVec2 {
+            inline: i.clone(),
+            block: b.clone(),
+        }
+    }
+
+    pub fn map<U>(&self, f: impl Fn(&T) -> U) -> LogicalVec2<U> {
+        LogicalVec2 {
+            inline: f(&self.inline),
+            block: f(&self.block),
+        }
+    }
+
+    pub(crate) fn map_with<U, V>(
+        &self,
+        other: &LogicalVec2<U>,
+        f: impl Fn(&T, &U) -> V,
+    ) -> LogicalVec2<V> {
+        LogicalVec2 {
+            inline: f(&self.inline, &other.inline),
+            block: f(&self.block, &other.block),
+        }
+    }
+}
+
+impl<T: Add<Output = T> + Copy> Add<LogicalVec2<T>> for LogicalVec2<T> {
+    type Output = LogicalVec2<T>;
+    fn add(self, other: Self) -> Self::Output {
+        LogicalVec2 {
+            inline: self.inline + other.inline,
+            block: self.block + other.block,
+        }
+    }
+}
+
+impl<T: Sub<Output = T> + Copy> Sub<LogicalVec2<T>> for LogicalVec2<T> {
+    type Output = LogicalVec2<T>;
+    fn sub(self, other: Self) -> Self::Output {
+        LogicalVec2 {
+            inline: self.inline - other.inline,
+            block: self.block - other.block,
+        }
+    }
+}
+
+impl<T: AddAssign<T> + Copy> AddAssign<LogicalVec2<T>> for LogicalVec2<T> {
+    fn add_assign(&mut self, other: LogicalVec2<T>) {
+        self.inline += other.inline;
+        self.block += other.block;
+    }
+}
+
+impl<T: SubAssign<T> + Copy> SubAssign<LogicalVec2<T>> for LogicalVec2<T> {
+    fn sub_assign(&mut self, other: LogicalVec2<T>) {
+        self.inline -= other.inline;
+        self.block -= other.block;
+    }
+}
+
+impl<T: Neg<Output = T> + Copy> Neg for LogicalVec2<T> {
+    type Output = LogicalVec2<T>;
+    fn neg(self) -> Self::Output {
+        Self {
+            inline: -self.inline,
+            block: -self.block,
+        }
+    }
+}
+
+impl<T: Zero> LogicalVec2<T> {
+    pub fn zero() -> Self {
+        Self {
+            inline: T::zero(),
+            block: T::zero(),
+        }
+    }
+}
+
+impl<T: Clone> LogicalVec2<AutoOr<T>> {
+    pub fn auto_is(&self, f: impl Fn() -> T) -> LogicalVec2<T> {
+        self.map(|t| t.auto_is(&f))
+    }
+}
+
+impl<T: Zero> LogicalRect<T> {
+    pub fn zero() -> Self {
+        Self {
+            start_corner: LogicalVec2::zero(),
+            size: LogicalVec2::zero(),
+        }
+    }
+}
+
+impl fmt::Debug for LogicalRect<Au> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(
+            f,
+            "Rect(i{}×b{} @ (i{},b{}))",
+            self.size.inline.to_f32_px(),
+            self.size.block.to_f32_px(),
+            self.start_corner.inline.to_f32_px(),
+            self.start_corner.block.to_f32_px(),
+        )
+    }
+}
+
+impl<T: Clone> LogicalVec2<T> {
+    pub fn to_physical_size(&self, mode: WritingMode) -> PhysicalSize<T> {
+        // https://drafts.csswg.org/css-writing-modes/#logical-to-physical
+        let (x, y) = if mode.is_horizontal() {
+            (&self.inline, &self.block)
+        } else {
+            (&self.block, &self.inline)
+        };
+        PhysicalSize::new(x.clone(), y.clone())
+    }
+}
+
+impl<T: Copy + Neg<Output = T>> LogicalVec2<T> {
+    pub fn to_physical_vector(&self, mode: WritingMode) -> PhysicalVec<T> {
+        if mode.is_horizontal() {
+            if mode.is_bidi_ltr() {
+                PhysicalVec::new(self.inline, self.block)
+            } else {
+                PhysicalVec::new(-self.inline, self.block)
+            }
+        } else if mode.is_inline_tb() {
+            PhysicalVec::new(self.block, self.inline)
+        } else {
+            PhysicalVec::new(-self.block, self.inline)
+        }
+    }
+}
+
+impl<T: Clone> LogicalSides<T> {
+    pub fn from_physical(sides: &PhysicalSides<T>, mode: WritingMode) -> Self {
+        // https://drafts.csswg.org/css-writing-modes/#logical-to-physical
+        let block_flow = mode.block_flow_direction();
+        let (bs, be) = match mode.block_flow_direction() {
+            BlockFlowDirection::TopToBottom => (&sides.top, &sides.bottom),
+            BlockFlowDirection::RightToLeft => (&sides.right, &sides.left),
+            BlockFlowDirection::LeftToRight => (&sides.left, &sides.right),
+        };
+        use BlockFlowDirection::TopToBottom;
+        let (is, ie) = match (block_flow, mode.inline_base_direction()) {
+            (TopToBottom, InlineBaseDirection::LeftToRight) => (&sides.left, &sides.right),
+            (TopToBottom, InlineBaseDirection::RightToLeft) => (&sides.right, &sides.left),
+            (_, InlineBaseDirection::LeftToRight) => (&sides.top, &sides.bottom),
+            (_, InlineBaseDirection::RightToLeft) => (&sides.bottom, &sides.top),
+        };
+        LogicalSides {
+            inline_start: is.clone(),
+            inline_end: ie.clone(),
+            block_start: bs.clone(),
+            block_end: be.clone(),
+        }
+    }
+}
+
+impl<T> LogicalSides<T> {
+    pub fn map<U>(&self, f: impl Fn(&T) -> U) -> LogicalSides<U> {
+        LogicalSides {
+            inline_start: f(&self.inline_start),
+            inline_end: f(&self.inline_end),
+            block_start: f(&self.block_start),
+            block_end: f(&self.block_end),
+        }
+    }
+
+    pub fn map_inline_and_block_axes<U>(
+        &self,
+        inline_f: impl Fn(&T) -> U,
+        block_f: impl Fn(&T) -> U,
+    ) -> LogicalSides<U> {
+        LogicalSides {
+            inline_start: inline_f(&self.inline_start),
+            inline_end: inline_f(&self.inline_end),
+            block_start: block_f(&self.block_start),
+            block_end: block_f(&self.block_end),
+        }
+    }
+
+    pub fn inline_sum(&self) -> T::Output
+    where
+        T: Add + Copy,
+    {
+        self.inline_start + self.inline_end
+    }
+
+    pub fn block_sum(&self) -> T::Output
+    where
+        T: Add + Copy,
+    {
+        self.block_start + self.block_end
+    }
+
+    pub fn sum(&self) -> LogicalVec2<T::Output>
+    where
+        T: Add + Copy,
+    {
+        LogicalVec2 {
+            inline: self.inline_sum(),
+            block: self.block_sum(),
+        }
+    }
+
+    pub fn to_physical(&self, mode: WritingMode) -> PhysicalSides<T>
+    where
+        T: Clone,
+    {
+        let top;
+        let right;
+        let bottom;
+        let left;
+        if mode.is_vertical() {
+            if mode.is_vertical_lr() {
+                left = self.block_start.clone();
+                right = self.block_end.clone();
+            } else {
+                right = self.block_start.clone();
+                left = self.block_end.clone();
+            }
+
+            if mode.is_inline_tb() {
+                top = self.inline_start.clone();
+                bottom = self.inline_end.clone();
+            } else {
+                bottom = self.inline_start.clone();
+                top = self.inline_end.clone();
+            }
+        } else {
+            top = self.block_start.clone();
+            bottom = self.block_end.clone();
+            if mode.is_bidi_ltr() {
+                left = self.inline_start.clone();
+                right = self.inline_end.clone();
+            } else {
+                right = self.inline_start.clone();
+                left = self.inline_end.clone();
+            }
+        }
+        PhysicalSides::new(top, right, bottom, left)
+    }
+}
+
+impl<T: Copy> LogicalSides<T> {
+    pub fn start_offset(&self) -> LogicalVec2<T> {
+        LogicalVec2 {
+            inline: self.inline_start,
+            block: self.block_start,
+        }
+    }
+
+    #[inline]
+    pub(crate) fn inline_sides(&self) -> LogicalSides1D<T> {
+        LogicalSides1D::new(self.inline_start, self.inline_end)
+    }
+
+    #[inline]
+    pub(crate) fn block_sides(&self) -> LogicalSides1D<T> {
+        LogicalSides1D::new(self.block_start, self.block_end)
+    }
+}
+
+impl LogicalSides<LengthPercentage> {
+    pub fn percentages_relative_to(&self, basis: Au) -> LogicalSides<Au> {
+        self.map(|value| value.to_used_value(basis))
+    }
+}
+
+impl LogicalSides<LengthPercentageOrAuto<'_>> {
+    pub fn percentages_relative_to(&self, basis: Au) -> LogicalSides<AuOrAuto> {
+        self.map(|value| value.map(|value| value.to_used_value(basis)))
+    }
+}
+
+impl<T: Clone> LogicalSides<AutoOr<T>> {
+    pub fn auto_is(&self, f: impl Fn() -> T) -> LogicalSides<T> {
+        self.map(|s| s.auto_is(&f))
+    }
+}
+
+impl<T: Add<Output = T> + Copy> Add<LogicalSides<T>> for LogicalSides<T> {
+    type Output = LogicalSides<T>;
+
+    fn add(self, other: Self) -> Self::Output {
+        LogicalSides {
+            inline_start: self.inline_start + other.inline_start,
+            inline_end: self.inline_end + other.inline_end,
+            block_start: self.block_start + other.block_start,
+            block_end: self.block_end + other.block_end,
+        }
+    }
+}
+
+impl<T: Sub<Output = T> + Copy> Sub<LogicalSides<T>> for LogicalSides<T> {
+    type Output = LogicalSides<T>;
+
+    fn sub(self, other: Self) -> Self::Output {
+        LogicalSides {
+            inline_start: self.inline_start - other.inline_start,
+            inline_end: self.inline_end - other.inline_end,
+            block_start: self.block_start - other.block_start,
+            block_end: self.block_end - other.block_end,
+        }
+    }
+}
+
+impl<T: Neg<Output = T> + Copy> Neg for LogicalSides<T> {
+    type Output = LogicalSides<T>;
+    fn neg(self) -> Self::Output {
+        Self {
+            inline_start: -self.inline_start,
+            inline_end: -self.inline_end,
+            block_start: -self.block_start,
+            block_end: -self.block_end,
+        }
+    }
+}
+
+impl<T: Zero> LogicalSides<T> {
+    pub(crate) fn zero() -> LogicalSides<T> {
+        Self {
+            inline_start: T::zero(),
+            inline_end: T::zero(),
+            block_start: T::zero(),
+            block_end: T::zero(),
+        }
+    }
+}
+
+impl From<LogicalSides<CSSPixelLength>> for LogicalSides<Au> {
+    fn from(value: LogicalSides<CSSPixelLength>) -> Self {
+        Self {
+            inline_start: value.inline_start.into(),
+            inline_end: value.inline_end.into(),
+            block_start: value.block_start.into(),
+            block_end: value.block_end.into(),
+        }
+    }
+}
+
+impl From<LogicalSides<Au>> for LogicalSides<CSSPixelLength> {
+    fn from(value: LogicalSides<Au>) -> Self {
+        Self {
+            inline_start: value.inline_start.into(),
+            inline_end: value.inline_end.into(),
+            block_start: value.block_start.into(),
+            block_end: value.block_end.into(),
+        }
+    }
+}
+
+impl<T> LogicalSides1D<T> {
+    #[inline]
+    pub(crate) fn new(start: T, end: T) -> Self {
+        Self { start, end }
+    }
+}
+
+impl<T> LogicalSides1D<AutoOr<T>> {
+    #[inline]
+    pub(crate) fn either_specified(&self) -> bool {
+        !self.start.is_auto() || !self.end.is_auto()
+    }
+
+    #[inline]
+    pub(crate) fn either_auto(&self) -> bool {
+        self.start.is_auto() || self.end.is_auto()
+    }
+}
+
+impl<T: Add + Copy> LogicalSides1D<T> {
+    #[inline]
+    pub(crate) fn sum(&self) -> T::Output {
+        self.start + self.end
+    }
+}
+
+impl<T> LogicalRect<T> {
+    pub fn max_inline_position(&self) -> T
+    where
+        T: Add<Output = T> + Copy,
+    {
+        self.start_corner.inline + self.size.inline
+    }
+
+    pub fn max_block_position(&self) -> T
+    where
+        T: Add<Output = T> + Copy,
+    {
+        self.start_corner.block + self.size.block
+    }
+
+    pub fn inflate(&self, sides: &LogicalSides<T>) -> Self
+    where
+        T: Add<Output = T> + Copy,
+        T: Sub<Output = T> + Copy,
+    {
+        Self {
+            start_corner: LogicalVec2 {
+                inline: self.start_corner.inline - sides.inline_start,
+                block: self.start_corner.block - sides.block_start,
+            },
+            size: LogicalVec2 {
+                inline: self.size.inline + sides.inline_sum(),
+                block: self.size.block + sides.block_sum(),
+            },
+        }
+    }
+
+    pub fn deflate(&self, sides: &LogicalSides<T>) -> Self
+    where
+        T: Add<Output = T> + Copy,
+        T: Sub<Output = T> + Copy,
+    {
+        LogicalRect {
+            start_corner: LogicalVec2 {
+                inline: self.start_corner.inline + sides.inline_start,
+                block: self.start_corner.block + sides.block_start,
+            },
+            size: LogicalVec2 {
+                inline: self.size.inline - sides.inline_sum(),
+                block: self.size.block - sides.block_sum(),
+            },
+        }
+    }
+}
+
+impl LogicalRect<Au> {
+    pub(crate) fn as_physical(
+        &self,
+        containing_block: Option<&ContainingBlock<'_>>,
+    ) -> PhysicalRect<Au> {
+        let mode = containing_block.map_or_else(WritingMode::horizontal_tb, |containing_block| {
+            containing_block.style.writing_mode
+        });
+        let (x, y, width, height) = if mode.is_vertical() {
+            // TODO: Bottom-to-top writing modes are not supported.
+            (
+                self.start_corner.block,
+                self.start_corner.inline,
+                self.size.block,
+                self.size.inline,
+            )
+        } else {
+            let y = self.start_corner.block;
+            let x = match containing_block {
+                Some(containing_block) if !mode.is_bidi_ltr() => {
+                    containing_block.size.inline - self.max_inline_position()
+                },
+                _ => self.start_corner.inline,
+            };
+            (x, y, self.size.inline, self.size.block)
+        };
+
+        PhysicalRect::new(PhysicalPoint::new(x, y), PhysicalSize::new(width, height))
+    }
+}
+
+impl From<LogicalVec2<CSSPixelLength>> for LogicalVec2<Au> {
+    fn from(value: LogicalVec2<CSSPixelLength>) -> Self {
+        LogicalVec2 {
+            inline: value.inline.into(),
+            block: value.block.into(),
+        }
+    }
+}
+
+impl From<LogicalVec2<Au>> for LogicalVec2<CSSPixelLength> {
+    fn from(value: LogicalVec2<Au>) -> Self {
+        LogicalVec2 {
+            inline: value.inline.into(),
+            block: value.block.into(),
+        }
+    }
+}
+
+impl From<LogicalRect<Au>> for LogicalRect<CSSPixelLength> {
+    fn from(value: LogicalRect<Au>) -> Self {
+        LogicalRect {
+            start_corner: value.start_corner.into(),
+            size: value.size.into(),
+        }
+    }
+}
+
+impl From<LogicalRect<CSSPixelLength>> for LogicalRect<Au> {
+    fn from(value: LogicalRect<CSSPixelLength>) -> Self {
+        LogicalRect {
+            start_corner: value.start_corner.into(),
+            size: value.size.into(),
+        }
+    }
+}
+
+pub(crate) trait ToLogical<Unit, LogicalType> {
+    fn to_logical(&self, writing_mode: WritingMode) -> LogicalType;
+}
+
+impl<Unit: Copy> ToLogical<Unit, LogicalVec2<Unit>> for PhysicalSize<Unit> {
+    fn to_logical(&self, writing_mode: WritingMode) -> LogicalVec2<Unit> {
+        LogicalVec2::from_physical_size(self, writing_mode)
+    }
+}
+
+impl<Unit: Copy> ToLogical<Unit, LogicalSides<Unit>> for PhysicalSides<Unit> {
+    fn to_logical(&self, writing_mode: WritingMode) -> LogicalSides<Unit> {
+        LogicalSides::from_physical(self, writing_mode)
+    }
+}
+
+pub(crate) trait ToLogicalWithContainingBlock<LogicalType> {
+    fn to_logical(&self, containing_block: &ContainingBlock) -> LogicalType;
+}
+
+impl ToLogicalWithContainingBlock<LogicalVec2<Au>> for PhysicalPoint<Au> {
+    fn to_logical(&self, containing_block: &ContainingBlock) -> LogicalVec2<Au> {
+        let writing_mode = containing_block.style.writing_mode;
+        // TODO: Bottom-to-top and right-to-left vertical writing modes are not supported yet.
+        if writing_mode.is_vertical() {
+            LogicalVec2 {
+                inline: self.y,
+                block: self.x,
+            }
+        } else {
+            LogicalVec2 {
+                inline: if writing_mode.is_bidi_ltr() {
+                    self.x
+                } else {
+                    containing_block.size.inline - self.x
+                },
+                block: self.y,
+            }
+        }
+    }
+}
+
+impl ToLogicalWithContainingBlock<LogicalRect<Au>> for PhysicalRect<Au> {
+    fn to_logical(&self, containing_block: &ContainingBlock) -> LogicalRect<Au> {
+        let inline_start;
+        let block_start;
+        let inline;
+        let block;
+
+        let writing_mode = containing_block.style.writing_mode;
+        if writing_mode.is_vertical() {
+            // TODO: Bottom-to-top and right-to-left vertical writing modes are not supported yet.
+            inline = self.size.height;
+            block = self.size.width;
+            block_start = self.origin.x;
+            inline_start = self.origin.y;
+        } else {
+            inline = self.size.width;
+            block = self.size.height;
+            block_start = self.origin.y;
+            if writing_mode.is_bidi_ltr() {
+                inline_start = self.origin.x;
+            } else {
+                inline_start = containing_block.size.inline - (self.origin.x + self.size.width);
+            }
+        }
+        LogicalRect {
+            start_corner: LogicalVec2 {
+                inline: inline_start,
+                block: block_start,
+            },
+            size: LogicalVec2 { inline, block },
+        }
+    }
+}
+
+/// The possible values accepted by the sizing properties.
+/// <https://drafts.csswg.org/css-sizing/#sizing-properties>
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) enum Size<T> {
+    /// Represents an `auto` value for the preferred and minimum size properties,
+    /// or `none` for the maximum size properties.
+    /// <https://drafts.csswg.org/css-sizing/#valdef-width-auto>
+    /// <https://drafts.csswg.org/css-sizing/#valdef-max-width-none>
+    Initial,
+    /// <https://drafts.csswg.org/css-sizing/#valdef-width-min-content>
+    MinContent,
+    /// <https://drafts.csswg.org/css-sizing/#valdef-width-max-content>
+    MaxContent,
+    /// <https://drafts.csswg.org/css-sizing-4/#valdef-width-fit-content>
+    FitContent,
+    /// <https://drafts.csswg.org/css-sizing-3/#funcdef-width-fit-content>
+    FitContentFunction(T),
+    /// <https://drafts.csswg.org/css-sizing-4/#valdef-width-stretch>
+    Stretch,
+    /// Represents a numeric `<length-percentage>`, but resolved as a `T`.
+    /// <https://drafts.csswg.org/css-sizing/#valdef-width-length-percentage-0>
+    Numeric(T),
+}
+
+impl<T: Copy> Copy for Size<T> {}
+
+impl<T> Default for Size<T> {
+    #[inline]
+    fn default() -> Self {
+        Self::Initial
+    }
+}
+
+impl<T> Size<T> {
+    #[inline]
+    pub(crate) fn is_initial(&self) -> bool {
+        matches!(self, Self::Initial)
+    }
+}
+
+impl<T: Clone> Size<T> {
+    #[inline]
+    pub(crate) fn to_numeric(&self) -> Option<T> {
+        match self {
+            Self::Numeric(numeric) => Some(numeric).cloned(),
+            _ => None,
+        }
+    }
+
+    #[inline]
+    pub(crate) fn map<U>(&self, f: impl FnOnce(T) -> U) -> Size<U> {
+        match self {
+            Size::Initial => Size::Initial,
+            Size::MinContent => Size::MinContent,
+            Size::MaxContent => Size::MaxContent,
+            Size::FitContent => Size::FitContent,
+            Size::FitContentFunction(size) => Size::FitContentFunction(f(size.clone())),
+            Size::Stretch => Size::Stretch,
+            Size::Numeric(numeric) => Size::Numeric(f(numeric.clone())),
+        }
+    }
+}
+
+impl From<StyleSize> for Size<LengthPercentage> {
+    fn from(size: StyleSize) -> Self {
+        match size {
+            StyleSize::LengthPercentage(lp) => Size::Numeric(lp.0),
+            StyleSize::Auto => Size::Initial,
+            StyleSize::MinContent => Size::MinContent,
+            StyleSize::MaxContent => Size::MaxContent,
+            StyleSize::FitContent => Size::FitContent,
+            StyleSize::FitContentFunction(lp) => Size::FitContentFunction(lp.0),
+            StyleSize::Stretch => Size::Stretch,
+            StyleSize::AnchorSizeFunction(_) | StyleSize::AnchorContainingCalcFunction(_) => {
+                unreachable!("anchor-size() should be disabled")
+            },
+        }
+    }
+}
+
+impl From<StyleMaxSize> for Size<LengthPercentage> {
+    fn from(max_size: StyleMaxSize) -> Self {
+        match max_size {
+            StyleMaxSize::LengthPercentage(lp) => Size::Numeric(lp.0),
+            StyleMaxSize::None => Size::Initial,
+            StyleMaxSize::MinContent => Size::MinContent,
+            StyleMaxSize::MaxContent => Size::MaxContent,
+            StyleMaxSize::FitContent => Size::FitContent,
+            StyleMaxSize::FitContentFunction(lp) => Size::FitContentFunction(lp.0),
+            StyleMaxSize::Stretch => Size::Stretch,
+            StyleMaxSize::AnchorSizeFunction(_) | StyleMaxSize::AnchorContainingCalcFunction(_) => {
+                unreachable!("anchor-size() should be disabled")
+            },
+        }
+    }
+}
+
+impl Size<LengthPercentage> {
+    #[inline]
+    pub(crate) fn to_percentage(&self) -> Option<Percentage> {
+        self.to_numeric()
+            .and_then(|length_percentage| length_percentage.to_percentage())
+    }
+
+    /// Resolves percentages in a preferred size, against the provided basis.
+    /// If the basis is missing, percentages are considered cyclic.
+    /// <https://www.w3.org/TR/css-sizing-3/#preferred-size-properties>
+    /// <https://www.w3.org/TR/css-sizing-3/#cyclic-percentage-size>
+    #[inline]
+    pub(crate) fn resolve_percentages_for_preferred(&self, basis: Option<Au>) -> Size<Au> {
+        match self {
+            Size::Numeric(numeric) => numeric
+                .maybe_to_used_value(basis)
+                .map_or(Size::Initial, Size::Numeric),
+            Size::FitContentFunction(numeric) => {
+                // Under discussion in https://github.com/w3c/csswg-drafts/issues/11805
+                numeric
+                    .maybe_to_used_value(basis)
+                    .map_or(Size::FitContent, Size::FitContentFunction)
+            },
+            _ => self.map(|_| unreachable!("This shouldn't be called for keywords")),
+        }
+    }
+
+    /// Resolves percentages in a maximum size, against the provided basis.
+    /// If the basis is missing, percentages are considered cyclic.
+    /// <https://www.w3.org/TR/css-sizing-3/#preferred-size-properties>
+    /// <https://www.w3.org/TR/css-sizing-3/#cyclic-percentage-size>
+    #[inline]
+    pub(crate) fn resolve_percentages_for_max(&self, basis: Option<Au>) -> Size<Au> {
+        match self {
+            Size::Numeric(numeric) => numeric
+                .maybe_to_used_value(basis)
+                .map_or(Size::Initial, Size::Numeric),
+            Size::FitContentFunction(numeric) => {
+                // Under discussion in https://github.com/w3c/csswg-drafts/issues/11805
+                numeric
+                    .maybe_to_used_value(basis)
+                    .map_or(Size::MaxContent, Size::FitContentFunction)
+            },
+            _ => self.map(|_| unreachable!("This shouldn't be called for keywords")),
+        }
+    }
+}
+
+impl LogicalVec2<Size<LengthPercentage>> {
+    pub(crate) fn percentages_relative_to_basis(
+        &self,
+        basis: &LogicalVec2<Au>,
+    ) -> LogicalVec2<Size<Au>> {
+        LogicalVec2 {
+            inline: self.inline.map(|value| value.to_used_value(basis.inline)),
+            block: self.block.map(|value| value.to_used_value(basis.block)),
+        }
+    }
+}
+
+impl Size<Au> {
+    /// Resolves a preferred size into a numerical value.
+    /// <https://www.w3.org/TR/css-sizing-3/#preferred-size-properties>
+    #[inline]
+    pub(crate) fn resolve_for_preferred<F: FnOnce() -> ContentSizes>(
+        &self,
+        automatic_size: Size<Au>,
+        stretch_size: Option<Au>,
+        content_size: &LazyCell<ContentSizes, F>,
+    ) -> Au {
+        match self {
+            Self::Initial => {
+                assert!(!automatic_size.is_initial());
+                automatic_size.resolve_for_preferred(automatic_size, stretch_size, content_size)
+            },
+            Self::MinContent => content_size.min_content,
+            Self::MaxContent => content_size.max_content,
+            Self::FitContentFunction(size) => content_size.shrink_to_fit(*size),
+            Self::FitContent => {
+                content_size.shrink_to_fit(stretch_size.unwrap_or_else(|| content_size.max_content))
+            },
+            Self::Stretch => stretch_size.unwrap_or_else(|| content_size.max_content),
+            Self::Numeric(numeric) => *numeric,
+        }
+    }
+
+    /// Resolves a minimum size into a numerical value.
+    /// <https://www.w3.org/TR/css-sizing-3/#min-size-properties>
+    #[inline]
+    pub(crate) fn resolve_for_min<F: FnOnce() -> ContentSizes>(
+        &self,
+        get_automatic_minimum_size: impl FnOnce() -> Au,
+        stretch_size: Option<Au>,
+        content_size: &LazyCell<ContentSizes, F>,
+        is_table: bool,
+    ) -> Au {
+        let result = match self {
+            Self::Initial => get_automatic_minimum_size(),
+            Self::MinContent => content_size.min_content,
+            Self::MaxContent => content_size.max_content,
+            Self::FitContentFunction(size) => content_size.shrink_to_fit(*size),
+            Self::FitContent => content_size.shrink_to_fit(stretch_size.unwrap_or_default()),
+            Self::Stretch => stretch_size.unwrap_or_default(),
+            Self::Numeric(numeric) => *numeric,
+        };
+        if is_table {
+            // In addition to the specified minimum, the inline size of a table is forced to be
+            // at least as big as its min-content size.
+            //
+            // Note that if there are collapsed columns, only the inline size of the table grid will
+            // shrink, while the size of the table wrapper (being computed here) won't be affected.
+            // However, collapsed rows should typically affect the block size of the table wrapper,
+            // so it might be wrong to use this function for that case.
+            // This is being discussed in https://github.com/w3c/csswg-drafts/issues/11408
+            result.max(content_size.min_content)
+        } else {
+            result
+        }
+    }
+
+    /// Resolves a maximum size into a numerical value.
+    /// <https://www.w3.org/TR/css-sizing-3/#max-size-properties>
+    #[inline]
+    pub(crate) fn resolve_for_max<F: FnOnce() -> ContentSizes>(
+        &self,
+        stretch_size: Option<Au>,
+        content_size: &LazyCell<ContentSizes, F>,
+    ) -> Option<Au> {
+        Some(match self {
+            Self::Initial => return None,
+            Self::MinContent => content_size.min_content,
+            Self::MaxContent => content_size.max_content,
+            Self::FitContentFunction(size) => content_size.shrink_to_fit(*size),
+            Self::FitContent => content_size.shrink_to_fit(stretch_size.unwrap_or(MAX_AU)),
+            Self::Stretch => return stretch_size,
+            Self::Numeric(numeric) => *numeric,
+        })
+    }
+
+    /// Tries to resolve an extrinsic size into a numerical value.
+    /// Extrinsic sizes are those based on the context of an element, without regard for its contents.
+    /// <https://drafts.csswg.org/css-sizing-3/#extrinsic>
+    ///
+    /// Returns `None` if either:
+    /// - The size is intrinsic.
+    /// - The size is the initial one.
+    ///   TODO: should we allow it to behave as `stretch` instead of assuming it's intrinsic?
+    /// - The provided `stretch_size` is `None` but we need its value.
+    #[inline]
+    pub(crate) fn maybe_resolve_extrinsic(&self, stretch_size: Option<Au>) -> Option<Au> {
+        match self {
+            Self::Initial |
+            Self::MinContent |
+            Self::MaxContent |
+            Self::FitContent |
+            Self::FitContentFunction(_) => None,
+            Self::Stretch => stretch_size,
+            Self::Numeric(numeric) => Some(*numeric),
+        }
+    }
+}
+
+/// Represents the sizing constraint that the preferred, min and max sizing properties
+/// impose on one axis.
+#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq)]
+pub(crate) enum SizeConstraint {
+    /// Represents a definite preferred size, clamped by minimum and maximum sizes (if any).
+    Definite(Au),
+    /// Represents an indefinite preferred size that allows a range of values between
+    /// the first argument (minimum size) and the second one (maximum size).
+    MinMax(Au, Option<Au>),
+}
+
+impl Default for SizeConstraint {
+    #[inline]
+    fn default() -> Self {
+        Self::MinMax(Au::default(), None)
+    }
+}
+
+impl SizeConstraint {
+    #[inline]
+    pub(crate) fn new(preferred_size: Option<Au>, min_size: Au, max_size: Option<Au>) -> Self {
+        preferred_size.map_or_else(
+            || Self::MinMax(min_size, max_size),
+            |size| Self::Definite(size.clamp_between_extremums(min_size, max_size)),
+        )
+    }
+
+    #[inline]
+    pub(crate) fn is_definite(self) -> bool {
+        matches!(self, Self::Definite(_))
+    }
+
+    #[inline]
+    pub(crate) fn to_definite(self) -> Option<Au> {
+        match self {
+            Self::Definite(size) => Some(size),
+            _ => None,
+        }
+    }
+}
+
+impl From<Option<Au>> for SizeConstraint {
+    fn from(size: Option<Au>) -> Self {
+        size.map(SizeConstraint::Definite).unwrap_or_default()
+    }
+}
+
+#[derive(Clone, Default)]
+pub(crate) struct Sizes {
+    /// <https://drafts.csswg.org/css-sizing-3/#preferred-size-properties>
+    pub preferred: Size<Au>,
+    /// <https://drafts.csswg.org/css-sizing-3/#min-size-properties>
+    pub min: Size<Au>,
+    /// <https://drafts.csswg.org/css-sizing-3/#max-size-properties>
+    pub max: Size<Au>,
+}
+
+impl Sizes {
+    #[inline]
+    pub(crate) fn new(preferred: Size<Au>, min: Size<Au>, max: Size<Au>) -> Self {
+        Self {
+            preferred,
+            min,
+            max,
+        }
+    }
+
+    /// Resolves the three sizes into a single numerical value.
+    #[inline]
+    pub(crate) fn resolve(
+        &self,
+        axis: Direction,
+        automatic_size: Size<Au>,
+        get_automatic_minimum_size: impl FnOnce() -> Au,
+        stretch_size: Option<Au>,
+        get_content_size: impl FnOnce() -> ContentSizes,
+        is_table: bool,
+    ) -> Au {
+        // The provided `get_content_size` is a FnOnce but we may need its result multiple times.
+        // A LazyCell will only invoke it once if needed, and then reuse the result.
+        let content_size = LazyCell::new(get_content_size);
+
+        if is_table && axis == Direction::Block {
+            // The intrinsic block size of a table already takes sizing properties into account,
+            // but it can be a smaller amount if there are collapsed rows.
+            // Therefore, disregard sizing properties and just defer to the intrinsic size.
+            // This is being discussed in https://github.com/w3c/csswg-drafts/issues/11408
+            return content_size.max_content;
+        }
+
+        let preferred =
+            self.preferred
+                .resolve_for_preferred(automatic_size, stretch_size, &content_size);
+        let min = self.min.resolve_for_min(
+            get_automatic_minimum_size,
+            stretch_size,
+            &content_size,
+            is_table,
+        );
+        let max = self.max.resolve_for_max(stretch_size, &content_size);
+        preferred.clamp_between_extremums(min, max)
+    }
+
+    /// Tries to extrinsically resolve the three sizes into a single [`SizeConstraint`].
+    /// Values that are intrinsic or need `stretch_size` when it's `None` are handled as such:
+    /// - On the preferred size, they make the returned value be an indefinite [`SizeConstraint::MinMax`].
+    /// - On the min size, they are treated as `auto`, enforcing the automatic minimum size.
+    /// - On the max size, they are treated as `none`, enforcing no maximum.
+    #[inline]
+    pub(crate) fn resolve_extrinsic(
+        &self,
+        automatic_size: Size<Au>,
+        automatic_minimum_size: Au,
+        stretch_size: Option<Au>,
+    ) -> SizeConstraint {
+        let (preferred, min, max) =
+            self.resolve_each_extrinsic(automatic_size, automatic_minimum_size, stretch_size);
+        SizeConstraint::new(preferred, min, max)
+    }
+
+    /// Tries to extrinsically resolve each of the three sizes into a numerical value, separately.
+    /// This can't resolve values that are intrinsic or need `stretch_size` but it's `None`.
+    /// - The 1st returned value is the resolved preferred size. If it can't be resolved then
+    ///   the returned value is `None`. Note that this is different than treating it as `auto`.
+    ///   TODO: This needs to be discussed in <https://github.com/w3c/csswg-drafts/issues/11387>.
+    /// - The 2nd returned value is the resolved minimum size. If it can't be resolved then we
+    ///   treat it as the initial `auto`, returning the automatic minimum size.
+    /// - The 3rd returned value is the resolved maximum size. If it can't be resolved then we
+    ///   treat it as the initial `none`, returning `None`.
+    #[inline]
+    pub(crate) fn resolve_each_extrinsic(
+        &self,
+        automatic_size: Size<Au>,
+        automatic_minimum_size: Au,
+        stretch_size: Option<Au>,
+    ) -> (Option<Au>, Au, Option<Au>) {
+        (
+            if self.preferred.is_initial() {
+                automatic_size.maybe_resolve_extrinsic(stretch_size)
+            } else {
+                self.preferred.maybe_resolve_extrinsic(stretch_size)
+            },
+            self.min
+                .maybe_resolve_extrinsic(stretch_size)
+                .unwrap_or(automatic_minimum_size),
+            self.max.maybe_resolve_extrinsic(stretch_size),
+        )
+    }
+}
diff --git a/components/layout/layout_box_base.rs b/components/layout/layout_box_base.rs
new file mode 100644
index 00000000000..161aee0f9bb
--- /dev/null
+++ b/components/layout/layout_box_base.rs
@@ -0,0 +1,148 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::fmt::{Debug, Formatter};
+
+use app_units::Au;
+use atomic_refcell::AtomicRefCell;
+use malloc_size_of_derive::MallocSizeOf;
+use servo_arc::Arc;
+use style::properties::ComputedValues;
+
+use crate::context::LayoutContext;
+use crate::formatting_contexts::Baselines;
+use crate::fragment_tree::{BaseFragmentInfo, CollapsedBlockMargins, Fragment, SpecificLayoutInfo};
+use crate::geom::SizeConstraint;
+use crate::positioned::PositioningContext;
+use crate::sizing::{ComputeInlineContentSizes, InlineContentSizesResult};
+use crate::{ConstraintSpace, ContainingBlockSize};
+
+/// A box tree node that handles containing information about style and the original DOM
+/// node or pseudo-element that it is based on. This also handles caching of layout values
+/// such as the inline content sizes to avoid recalculating these values during layout
+/// passes.
+///
+/// In the future, this will hold layout results to support incremental layout.
+#[derive(MallocSizeOf)]
+pub(crate) struct LayoutBoxBase {
+    pub base_fragment_info: BaseFragmentInfo,
+    pub style: Arc<ComputedValues>,
+    pub cached_inline_content_size:
+        AtomicRefCell<Option<Box<(SizeConstraint, InlineContentSizesResult)>>>,
+    pub cached_layout_result: AtomicRefCell<Option<Box<CacheableLayoutResultAndInputs>>>,
+    pub fragments: AtomicRefCell<Vec<Fragment>>,
+}
+
+impl LayoutBoxBase {
+    pub(crate) fn new(base_fragment_info: BaseFragmentInfo, style: Arc<ComputedValues>) -> Self {
+        Self {
+            base_fragment_info,
+            style,
+            cached_inline_content_size: AtomicRefCell::default(),
+            cached_layout_result: AtomicRefCell::default(),
+            fragments: AtomicRefCell::default(),
+        }
+    }
+
+    /// Get the inline content sizes of a box tree node that extends this [`LayoutBoxBase`], fetch
+    /// the result from a cache when possible.
+    pub(crate) fn inline_content_sizes(
+        &self,
+        layout_context: &LayoutContext,
+        constraint_space: &ConstraintSpace,
+        layout_box: &impl ComputeInlineContentSizes,
+    ) -> InlineContentSizesResult {
+        let mut cache = self.cached_inline_content_size.borrow_mut();
+        if let Some(cached_inline_content_size) = cache.as_ref() {
+            let (previous_cb_block_size, result) = **cached_inline_content_size;
+            if !result.depends_on_block_constraints ||
+                previous_cb_block_size == constraint_space.block_size
+            {
+                return result;
+            }
+            // TODO: Should we keep multiple caches for various block sizes?
+        }
+
+        let result =
+            layout_box.compute_inline_content_sizes_with_fixup(layout_context, constraint_space);
+        *cache = Some(Box::new((constraint_space.block_size, result)));
+        result
+    }
+
+    pub(crate) fn invalidate_cached_fragment(&self) {
+        let _ = self.cached_layout_result.borrow_mut().take();
+    }
+
+    pub(crate) fn fragments(&self) -> Vec<Fragment> {
+        self.fragments.borrow().clone()
+    }
+
+    pub(crate) fn add_fragment(&self, fragment: Fragment) {
+        self.fragments.borrow_mut().push(fragment);
+    }
+
+    pub(crate) fn set_fragment(&self, fragment: Fragment) {
+        *self.fragments.borrow_mut() = vec![fragment];
+    }
+
+    pub(crate) fn clear_fragments(&self) {
+        self.fragments.borrow_mut().clear();
+    }
+
+    pub(crate) fn repair_style(&mut self, new_style: &Arc<ComputedValues>) {
+        self.style = new_style.clone();
+        for fragment in self.fragments.borrow_mut().iter_mut() {
+            fragment.repair_style(new_style);
+        }
+    }
+}
+
+impl Debug for LayoutBoxBase {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
+        f.debug_struct("LayoutBoxBase").finish()
+    }
+}
+
+#[derive(Clone, MallocSizeOf)]
+pub(crate) struct CacheableLayoutResult {
+    pub fragments: Vec<Fragment>,
+
+    /// <https://drafts.csswg.org/css2/visudet.html#root-height>
+    pub content_block_size: Au,
+
+    /// If this layout is for a block container, this tracks the collapsable size
+    /// of start and end margins and whether or not the block container collapsed through.
+    pub collapsible_margins_in_children: CollapsedBlockMargins,
+
+    /// The contents of a table may force it to become wider than what we would expect
+    /// from 'width' and 'min-width'. This is the resulting inline content size,
+    /// or None for non-table layouts.
+    pub content_inline_size_for_table: Option<Au>,
+
+    /// The offset of the last inflow baseline of this layout in the content area, if
+    /// there was one. This is used to propagate baselines to the ancestors of `display:
+    /// inline-block`.
+    pub baselines: Baselines,
+
+    /// Whether or not this layout depends on the containing block size.
+    pub depends_on_block_constraints: bool,
+
+    /// Additional information of this layout that could be used by Javascripts and devtools.
+    pub specific_layout_info: Option<SpecificLayoutInfo>,
+}
+
+/// A collection of layout inputs and a cached layout result for a [`LayoutBoxBase`].
+#[derive(MallocSizeOf)]
+pub(crate) struct CacheableLayoutResultAndInputs {
+    /// The [`CacheableLayoutResult`] for this layout.
+    pub result: CacheableLayoutResult,
+
+    /// The [`ContainingBlockSize`] to use for this box's contents, but not
+    /// for the box itself.
+    pub containing_block_for_children_size: ContainingBlockSize,
+
+    /// A [`PositioningContext`] holding absolutely-positioned descendants
+    /// collected during the layout of this box.
+    pub positioning_context: PositioningContext,
+}
diff --git a/components/layout/layout_impl.rs b/components/layout/layout_impl.rs
new file mode 100644
index 00000000000..fcf658036b2
--- /dev/null
+++ b/components/layout/layout_impl.rs
@@ -0,0 +1,1223 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#![allow(unsafe_code)]
+
+use std::cell::{Cell, RefCell};
+use std::collections::HashMap;
+use std::fmt::Debug;
+use std::process;
+use std::sync::{Arc, LazyLock};
+
+use app_units::Au;
+use base::Epoch;
+use base::id::{PipelineId, WebViewId};
+use compositing_traits::CrossProcessCompositorApi;
+use constellation_traits::ScrollState;
+use embedder_traits::{UntrustedNodeAddress, ViewportDetails};
+use euclid::default::{Point2D as UntypedPoint2D, Rect as UntypedRect, Size2D as UntypedSize2D};
+use euclid::{Point2D, Scale, Size2D, Vector2D};
+use fnv::FnvHashMap;
+use fonts::{FontContext, FontContextWebFontMethods};
+use fonts_traits::StylesheetWebFontLoadFinishedCallback;
+use fxhash::FxHashMap;
+use ipc_channel::ipc::IpcSender;
+use log::{debug, error};
+use malloc_size_of::{MallocConditionalSizeOf, MallocSizeOf, MallocSizeOfOps};
+use net_traits::image_cache::{ImageCache, UsePlaceholder};
+use parking_lot::{Mutex, RwLock};
+use profile_traits::mem::{Report, ReportKind};
+use profile_traits::time::{
+    self as profile_time, TimerMetadata, TimerMetadataFrameType, TimerMetadataReflowType,
+};
+use profile_traits::{path, time_profile};
+use rayon::ThreadPool;
+use script::layout_dom::{ServoLayoutDocument, ServoLayoutElement, ServoLayoutNode};
+use script_layout_interface::{
+    Layout, LayoutConfig, LayoutFactory, NodesFromPointQueryType, OffsetParentResponse, ReflowGoal,
+    ReflowRequest, ReflowResult, TrustedNodeAddress,
+};
+use script_traits::{DrawAPaintImageResult, PaintWorkletError, Painter, ScriptThreadMessage};
+use servo_arc::Arc as ServoArc;
+use servo_config::opts::{self, DebugOptions};
+use servo_config::pref;
+use servo_url::ServoUrl;
+use style::animation::DocumentAnimationSet;
+use style::context::{
+    QuirksMode, RegisteredSpeculativePainter, RegisteredSpeculativePainters, SharedStyleContext,
+};
+use style::dom::{OpaqueNode, ShowSubtreeDataAndPrimaryValues, TElement, TNode};
+use style::error_reporting::RustLogReporter;
+use style::font_metrics::FontMetrics;
+use style::global_style_data::GLOBAL_STYLE_DATA;
+use style::invalidation::element::restyle_hints::RestyleHint;
+use style::media_queries::{Device, MediaList, MediaType};
+use style::properties::style_structs::Font;
+use style::properties::{ComputedValues, PropertyId};
+use style::queries::values::PrefersColorScheme;
+use style::selector_parser::{PseudoElement, RestyleDamage, SnapshotMap};
+use style::servo::media_queries::FontMetricsProvider;
+use style::shared_lock::{SharedRwLock, SharedRwLockReadGuard, StylesheetGuards};
+use style::stylesheets::{
+    DocumentStyleSheet, Origin, Stylesheet, StylesheetInDocument, UrlExtraData,
+    UserAgentStylesheets,
+};
+use style::stylist::Stylist;
+use style::traversal::DomTraversal;
+use style::traversal_flags::TraversalFlags;
+use style::values::computed::font::GenericFontFamily;
+use style::values::computed::{CSSPixelLength, FontSize, Length, NonNegativeLength};
+use style::values::specified::font::{KeywordInfo, QueryFontMetricsFlags};
+use style::{Zero, driver};
+use style_traits::{CSSPixel, SpeculativePainter};
+use stylo_atoms::Atom;
+use url::Url;
+use webrender_api::units::{DevicePixel, DevicePoint, LayoutPixel, LayoutPoint, LayoutSize};
+use webrender_api::{ExternalScrollId, HitTestFlags};
+
+use crate::context::LayoutContext;
+use crate::display_list::{DisplayList, WebRenderImageInfo};
+use crate::query::{
+    get_the_text_steps, process_client_rect_request, process_content_box_request,
+    process_content_boxes_request, process_node_scroll_area_request, process_offset_parent_query,
+    process_resolved_font_style_query, process_resolved_style_request, process_text_index_request,
+};
+use crate::traversal::{RecalcStyle, compute_damage_and_repair_style};
+use crate::{BoxTree, FragmentTree};
+
+// This mutex is necessary due to syncronisation issues between two different types of thread-local storage
+// which manifest themselves when the layout thread tries to layout iframes in parallel with the main page
+//
+// See: https://github.com/servo/servo/pull/29792
+// And: https://gist.github.com/mukilan/ed57eb61b83237a05fbf6360ec5e33b0
+static STYLE_THREAD_POOL: Mutex<&style::global_style_data::STYLE_THREAD_POOL> =
+    Mutex::new(&style::global_style_data::STYLE_THREAD_POOL);
+
+/// A CSS file to style the user agent stylesheet.
+static USER_AGENT_CSS: &[u8] = include_bytes!("./stylesheets/user-agent.css");
+
+/// A CSS file to style the Servo browser.
+static SERVO_CSS: &[u8] = include_bytes!("./stylesheets/servo.css");
+
+/// A CSS file to style the presentational hints.
+static PRESENTATIONAL_HINTS_CSS: &[u8] = include_bytes!("./stylesheets/presentational-hints.css");
+
+/// A CSS file to style the quirks mode.
+static QUIRKS_MODE_CSS: &[u8] = include_bytes!("./stylesheets/quirks-mode.css");
+
+/// Information needed by layout.
+pub struct LayoutThread {
+    /// The ID of the pipeline that we belong to.
+    id: PipelineId,
+
+    /// The webview that contains the pipeline we belong to.
+    webview_id: WebViewId,
+
+    /// The URL of the pipeline that we belong to.
+    url: ServoUrl,
+
+    /// Performs CSS selector matching and style resolution.
+    stylist: Stylist,
+
+    /// Is the current reflow of an iframe, as opposed to a root window?
+    is_iframe: bool,
+
+    /// The channel on which messages can be sent to the script thread.
+    script_chan: IpcSender<ScriptThreadMessage>,
+
+    /// The channel on which messages can be sent to the time profiler.
+    time_profiler_chan: profile_time::ProfilerChan,
+
+    /// Reference to the script thread image cache.
+    image_cache: Arc<dyn ImageCache>,
+
+    /// A FontContext to be used during layout.
+    font_context: Arc<FontContext>,
+
+    /// Is this the first reflow in this LayoutThread?
+    first_reflow: Cell<bool>,
+
+    /// The box tree.
+    box_tree: RefCell<Option<Arc<BoxTree>>>,
+
+    /// The fragment tree.
+    fragment_tree: RefCell<Option<Arc<FragmentTree>>>,
+
+    /// A counter for epoch messages
+    epoch: Cell<Epoch>,
+
+    /// The size of the viewport. This may be different from the size of the screen due to viewport
+    /// constraints.
+    viewport_size: UntypedSize2D<Au>,
+
+    /// Scroll offsets of nodes that scroll.
+    scroll_offsets: RefCell<HashMap<ExternalScrollId, Vector2D<f32, LayoutPixel>>>,
+
+    webrender_image_cache: Arc<RwLock<FnvHashMap<(ServoUrl, UsePlaceholder), WebRenderImageInfo>>>,
+
+    /// The executors for paint worklets.
+    registered_painters: RegisteredPaintersImpl,
+
+    /// Cross-process access to the Compositor API.
+    compositor_api: CrossProcessCompositorApi,
+
+    /// Debug options, copied from configuration to this `LayoutThread` in order
+    /// to avoid having to constantly access the thread-safe global options.
+    debug: DebugOptions,
+}
+
+pub struct LayoutFactoryImpl();
+
+impl LayoutFactory for LayoutFactoryImpl {
+    fn create(&self, config: LayoutConfig) -> Box<dyn Layout> {
+        Box::new(LayoutThread::new(config))
+    }
+}
+
+impl Drop for LayoutThread {
+    fn drop(&mut self) {
+        let (keys, instance_keys) = self
+            .font_context
+            .collect_unused_webrender_resources(true /* all */);
+        self.compositor_api
+            .remove_unused_font_resources(keys, instance_keys)
+    }
+}
+
+impl Layout for LayoutThread {
+    fn device(&self) -> &Device {
+        self.stylist.device()
+    }
+
+    fn current_epoch(&self) -> Epoch {
+        self.epoch.get()
+    }
+
+    fn load_web_fonts_from_stylesheet(&self, stylesheet: ServoArc<Stylesheet>) {
+        let guard = stylesheet.shared_lock.read();
+        self.load_all_web_fonts_from_stylesheet_with_guard(
+            &DocumentStyleSheet(stylesheet.clone()),
+            &guard,
+        );
+    }
+
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn add_stylesheet(
+        &mut self,
+        stylesheet: ServoArc<Stylesheet>,
+        before_stylesheet: Option<ServoArc<Stylesheet>>,
+    ) {
+        let guard = stylesheet.shared_lock.read();
+        let stylesheet = DocumentStyleSheet(stylesheet.clone());
+        self.load_all_web_fonts_from_stylesheet_with_guard(&stylesheet, &guard);
+
+        match before_stylesheet {
+            Some(insertion_point) => self.stylist.insert_stylesheet_before(
+                stylesheet,
+                DocumentStyleSheet(insertion_point),
+                &guard,
+            ),
+            None => self.stylist.append_stylesheet(stylesheet, &guard),
+        }
+    }
+
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn remove_stylesheet(&mut self, stylesheet: ServoArc<Stylesheet>) {
+        let guard = stylesheet.shared_lock.read();
+        let stylesheet = DocumentStyleSheet(stylesheet.clone());
+        self.stylist.remove_stylesheet(stylesheet.clone(), &guard);
+        self.font_context
+            .remove_all_web_fonts_from_stylesheet(&stylesheet);
+    }
+
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn query_content_box(&self, node: TrustedNodeAddress) -> Option<UntypedRect<Au>> {
+        let node = unsafe { ServoLayoutNode::new(&node) };
+        process_content_box_request(node)
+    }
+
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn query_content_boxes(&self, node: TrustedNodeAddress) -> Vec<UntypedRect<Au>> {
+        let node = unsafe { ServoLayoutNode::new(&node) };
+        process_content_boxes_request(node)
+    }
+
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn query_client_rect(&self, node: TrustedNodeAddress) -> UntypedRect<i32> {
+        let node = unsafe { ServoLayoutNode::new(&node) };
+        process_client_rect_request(node)
+    }
+
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn query_element_inner_outer_text(
+        &self,
+        node: script_layout_interface::TrustedNodeAddress,
+    ) -> String {
+        let node = unsafe { ServoLayoutNode::new(&node) };
+        get_the_text_steps(node)
+    }
+
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn query_nodes_from_point(
+        &self,
+        point: UntypedPoint2D<f32>,
+        query_type: NodesFromPointQueryType,
+    ) -> Vec<UntrustedNodeAddress> {
+        let mut flags = match query_type {
+            NodesFromPointQueryType::Topmost => HitTestFlags::empty(),
+            NodesFromPointQueryType::All => HitTestFlags::FIND_ALL,
+        };
+
+        // The point we get is not relative to the entire WebRender scene, but to this
+        // particular pipeline, so we need to tell WebRender about that.
+        flags.insert(HitTestFlags::POINT_RELATIVE_TO_PIPELINE_VIEWPORT);
+
+        let client_point = DevicePoint::from_untyped(point);
+        let results = self
+            .compositor_api
+            .hit_test(Some(self.id.into()), client_point, flags);
+
+        results.iter().map(|result| result.node).collect()
+    }
+
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn query_offset_parent(&self, node: TrustedNodeAddress) -> OffsetParentResponse {
+        let node = unsafe { ServoLayoutNode::new(&node) };
+        process_offset_parent_query(node).unwrap_or_default()
+    }
+
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn query_resolved_style(
+        &self,
+        node: TrustedNodeAddress,
+        pseudo: Option<PseudoElement>,
+        property_id: PropertyId,
+        animations: DocumentAnimationSet,
+        animation_timeline_value: f64,
+    ) -> String {
+        let node = unsafe { ServoLayoutNode::new(&node) };
+        let document = node.owner_doc();
+        let document_shared_lock = document.style_shared_lock();
+        let guards = StylesheetGuards {
+            author: &document_shared_lock.read(),
+            ua_or_user: &UA_STYLESHEETS.shared_lock.read(),
+        };
+        let snapshot_map = SnapshotMap::new();
+
+        let shared_style_context = self.build_shared_style_context(
+            guards,
+            &snapshot_map,
+            animation_timeline_value,
+            &animations,
+            TraversalFlags::empty(),
+        );
+
+        process_resolved_style_request(&shared_style_context, node, &pseudo, &property_id)
+    }
+
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn query_resolved_font_style(
+        &self,
+        node: TrustedNodeAddress,
+        value: &str,
+        animations: DocumentAnimationSet,
+        animation_timeline_value: f64,
+    ) -> Option<ServoArc<Font>> {
+        let node = unsafe { ServoLayoutNode::new(&node) };
+        let document = node.owner_doc();
+        let document_shared_lock = document.style_shared_lock();
+        let guards = StylesheetGuards {
+            author: &document_shared_lock.read(),
+            ua_or_user: &UA_STYLESHEETS.shared_lock.read(),
+        };
+        let snapshot_map = SnapshotMap::new();
+        let shared_style_context = self.build_shared_style_context(
+            guards,
+            &snapshot_map,
+            animation_timeline_value,
+            &animations,
+            TraversalFlags::empty(),
+        );
+
+        process_resolved_font_style_query(
+            &shared_style_context,
+            node,
+            value,
+            self.url.clone(),
+            document_shared_lock,
+        )
+    }
+
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn query_scrolling_area(&self, node: Option<TrustedNodeAddress>) -> UntypedRect<i32> {
+        let node = node.map(|node| unsafe { ServoLayoutNode::new(&node) });
+        process_node_scroll_area_request(node, self.fragment_tree.borrow().clone())
+    }
+
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn query_text_indext(
+        &self,
+        node: OpaqueNode,
+        point_in_node: UntypedPoint2D<f32>,
+    ) -> Option<usize> {
+        let point_in_node = Point2D::new(
+            Au::from_f32_px(point_in_node.x),
+            Au::from_f32_px(point_in_node.y),
+        );
+        process_text_index_request(node, point_in_node)
+    }
+
+    fn exit_now(&mut self) {}
+
+    fn collect_reports(&self, reports: &mut Vec<Report>, ops: &mut MallocSizeOfOps) {
+        // TODO: Measure more than just display list, stylist, and font context.
+        let formatted_url = &format!("url({})", self.url);
+        reports.push(Report {
+            path: path![formatted_url, "layout-thread", "display-list"],
+            kind: ReportKind::ExplicitJemallocHeapSize,
+            size: 0,
+        });
+
+        reports.push(Report {
+            path: path![formatted_url, "layout-thread", "stylist"],
+            kind: ReportKind::ExplicitJemallocHeapSize,
+            size: self.stylist.size_of(ops),
+        });
+
+        reports.push(Report {
+            path: path![formatted_url, "layout-thread", "font-context"],
+            kind: ReportKind::ExplicitJemallocHeapSize,
+            size: self.font_context.conditional_size_of(ops),
+        });
+
+        reports.push(Report {
+            path: path![formatted_url, "layout-thread", "box-tree"],
+            kind: ReportKind::ExplicitJemallocHeapSize,
+            size: self
+                .box_tree
+                .borrow()
+                .as_ref()
+                .map_or(0, |tree| tree.conditional_size_of(ops)),
+        });
+
+        reports.push(Report {
+            path: path![formatted_url, "layout-thread", "fragment-tree"],
+            kind: ReportKind::ExplicitJemallocHeapSize,
+            size: self
+                .fragment_tree
+                .borrow()
+                .as_ref()
+                .map(|tree| tree.conditional_size_of(ops))
+                .unwrap_or_default(),
+        });
+
+        reports.push(self.image_cache.memory_report(formatted_url, ops));
+    }
+
+    fn set_quirks_mode(&mut self, quirks_mode: QuirksMode) {
+        self.stylist.set_quirks_mode(quirks_mode);
+    }
+
+    fn reflow(&mut self, reflow_request: ReflowRequest) -> Option<ReflowResult> {
+        time_profile!(
+            profile_time::ProfilerCategory::LayoutPerform,
+            self.profiler_metadata(),
+            self.time_profiler_chan.clone(),
+            || self.handle_reflow(reflow_request),
+        )
+    }
+
+    fn register_paint_worklet_modules(
+        &mut self,
+        _name: Atom,
+        _properties: Vec<Atom>,
+        _painter: Box<dyn Painter>,
+    ) {
+    }
+
+    fn set_scroll_offsets(&mut self, scroll_states: &[ScrollState]) {
+        *self.scroll_offsets.borrow_mut() = scroll_states
+            .iter()
+            .map(|scroll_state| (scroll_state.scroll_id, scroll_state.scroll_offset))
+            .collect();
+    }
+}
+
+impl LayoutThread {
+    fn new(config: LayoutConfig) -> LayoutThread {
+        // Let webrender know about this pipeline by sending an empty display list.
+        config
+            .compositor_api
+            .send_initial_transaction(config.id.into());
+
+        let mut font = Font::initial_values();
+        let default_font_size = pref!(fonts_default_size);
+        font.font_size = FontSize {
+            computed_size: NonNegativeLength::new(default_font_size as f32),
+            used_size: NonNegativeLength::new(default_font_size as f32),
+            keyword_info: KeywordInfo::medium(),
+        };
+
+        // The device pixel ratio is incorrect (it does not have the hidpi value),
+        // but it will be set correctly when the initial reflow takes place.
+        let device = Device::new(
+            MediaType::screen(),
+            QuirksMode::NoQuirks,
+            config.viewport_details.size,
+            Scale::new(config.viewport_details.hidpi_scale_factor.get()),
+            Box::new(LayoutFontMetricsProvider(config.font_context.clone())),
+            ComputedValues::initial_values_with_font_override(font),
+            // TODO: obtain preferred color scheme from embedder
+            PrefersColorScheme::Light,
+        );
+
+        LayoutThread {
+            id: config.id,
+            webview_id: config.webview_id,
+            url: config.url,
+            is_iframe: config.is_iframe,
+            script_chan: config.script_chan.clone(),
+            time_profiler_chan: config.time_profiler_chan,
+            registered_painters: RegisteredPaintersImpl(Default::default()),
+            image_cache: config.image_cache,
+            font_context: config.font_context,
+            first_reflow: Cell::new(true),
+            box_tree: Default::default(),
+            fragment_tree: Default::default(),
+            // Epoch starts at 1 because of the initial display list for epoch 0 that we send to WR
+            epoch: Cell::new(Epoch(1)),
+            viewport_size: Size2D::new(
+                Au::from_f32_px(config.viewport_details.size.width),
+                Au::from_f32_px(config.viewport_details.size.height),
+            ),
+            compositor_api: config.compositor_api,
+            scroll_offsets: Default::default(),
+            stylist: Stylist::new(device, QuirksMode::NoQuirks),
+            webrender_image_cache: Default::default(),
+            debug: opts::get().debug.clone(),
+        }
+    }
+
+    fn build_shared_style_context<'a>(
+        &'a self,
+        guards: StylesheetGuards<'a>,
+        snapshot_map: &'a SnapshotMap,
+        animation_timeline_value: f64,
+        animations: &DocumentAnimationSet,
+        traversal_flags: TraversalFlags,
+    ) -> SharedStyleContext<'a> {
+        SharedStyleContext {
+            stylist: &self.stylist,
+            options: GLOBAL_STYLE_DATA.options.clone(),
+            guards,
+            visited_styles_enabled: false,
+            animations: animations.clone(),
+            registered_speculative_painters: &self.registered_painters,
+            current_time_for_animations: animation_timeline_value,
+            traversal_flags,
+            snapshot_map,
+        }
+    }
+
+    fn load_all_web_fonts_from_stylesheet_with_guard(
+        &self,
+        stylesheet: &DocumentStyleSheet,
+        guard: &SharedRwLockReadGuard,
+    ) {
+        if !stylesheet.is_effective_for_device(self.stylist.device(), guard) {
+            return;
+        }
+
+        let locked_script_channel = Mutex::new(self.script_chan.clone());
+        let pipeline_id = self.id;
+        let web_font_finished_loading_callback = move |succeeded: bool| {
+            let _ = locked_script_channel
+                .lock()
+                .send(ScriptThreadMessage::WebFontLoaded(pipeline_id, succeeded));
+        };
+
+        self.font_context.add_all_web_fonts_from_stylesheet(
+            self.webview_id,
+            stylesheet,
+            guard,
+            self.stylist.device(),
+            Arc::new(web_font_finished_loading_callback) as StylesheetWebFontLoadFinishedCallback,
+        );
+    }
+
+    /// The high-level routine that performs layout.
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn handle_reflow(&mut self, mut reflow_request: ReflowRequest) -> Option<ReflowResult> {
+        let document = unsafe { ServoLayoutNode::new(&reflow_request.document) };
+        let document = document.as_document().unwrap();
+        let Some(root_element) = document.root_element() else {
+            debug!("layout: No root node: bailing");
+            return None;
+        };
+
+        let document_shared_lock = document.style_shared_lock();
+        let author_guard = document_shared_lock.read();
+        let ua_stylesheets = &*UA_STYLESHEETS;
+        let ua_or_user_guard = ua_stylesheets.shared_lock.read();
+        let rayon_pool = STYLE_THREAD_POOL.lock();
+        let rayon_pool = rayon_pool.pool();
+        let rayon_pool = rayon_pool.as_ref();
+        let guards = StylesheetGuards {
+            author: &author_guard,
+            ua_or_user: &ua_or_user_guard,
+        };
+
+        if self.update_device_if_necessary(&reflow_request, &guards) {
+            if let Some(mut data) = root_element.mutate_data() {
+                data.hint.insert(RestyleHint::recascade_subtree());
+            }
+        }
+
+        let mut snapshot_map = SnapshotMap::new();
+        let _snapshot_setter = SnapshotSetter::new(&mut reflow_request, &mut snapshot_map);
+        self.prepare_stylist_for_reflow(
+            &reflow_request,
+            document,
+            root_element,
+            &guards,
+            ua_stylesheets,
+            &snapshot_map,
+        );
+
+        let mut layout_context = LayoutContext {
+            id: self.id,
+            origin: reflow_request.origin.clone(),
+            style_context: self.build_shared_style_context(
+                guards,
+                &snapshot_map,
+                reflow_request.animation_timeline_value,
+                &reflow_request.animations,
+                match reflow_request.stylesheets_changed {
+                    true => TraversalFlags::ForCSSRuleChanges,
+                    false => TraversalFlags::empty(),
+                },
+            ),
+            image_cache: self.image_cache.clone(),
+            font_context: self.font_context.clone(),
+            webrender_image_cache: self.webrender_image_cache.clone(),
+            pending_images: Mutex::default(),
+            node_image_animation_map: Arc::new(RwLock::new(std::mem::take(
+                &mut reflow_request.node_to_image_animation_map,
+            ))),
+            iframe_sizes: Mutex::default(),
+            use_rayon: rayon_pool.is_some(),
+            highlighted_dom_node: reflow_request.highlighted_dom_node,
+        };
+
+        self.restyle_and_build_trees(
+            &reflow_request,
+            root_element,
+            rayon_pool,
+            &mut layout_context,
+        );
+        self.build_display_list(&reflow_request, &mut layout_context);
+        self.first_reflow.set(false);
+
+        if let ReflowGoal::UpdateScrollNode(scroll_state) = reflow_request.reflow_goal {
+            self.update_scroll_node_state(&scroll_state);
+        }
+
+        let pending_images = std::mem::take(&mut *layout_context.pending_images.lock());
+        let iframe_sizes = std::mem::take(&mut *layout_context.iframe_sizes.lock());
+        let node_to_image_animation_map =
+            std::mem::take(&mut *layout_context.node_image_animation_map.write());
+        Some(ReflowResult {
+            pending_images,
+            iframe_sizes,
+            node_to_image_animation_map,
+        })
+    }
+
+    fn update_device_if_necessary(
+        &mut self,
+        reflow_request: &ReflowRequest,
+        guards: &StylesheetGuards,
+    ) -> bool {
+        let had_used_viewport_units = self.stylist.device().used_viewport_units();
+        let viewport_size_changed = self.viewport_did_change(reflow_request.viewport_details);
+        let theme_changed = self.theme_did_change(reflow_request.theme);
+        if !viewport_size_changed && !theme_changed {
+            return false;
+        }
+        self.update_device(
+            reflow_request.viewport_details,
+            reflow_request.theme,
+            guards,
+        );
+        (viewport_size_changed && had_used_viewport_units) || theme_changed
+    }
+
+    fn prepare_stylist_for_reflow<'dom>(
+        &mut self,
+        reflow_request: &ReflowRequest,
+        document: ServoLayoutDocument<'dom>,
+        root_element: ServoLayoutElement<'dom>,
+        guards: &StylesheetGuards,
+        ua_stylesheets: &UserAgentStylesheets,
+        snapshot_map: &SnapshotMap,
+    ) {
+        if self.first_reflow.get() {
+            for stylesheet in &ua_stylesheets.user_or_user_agent_stylesheets {
+                self.stylist
+                    .append_stylesheet(stylesheet.clone(), guards.ua_or_user);
+                self.load_all_web_fonts_from_stylesheet_with_guard(stylesheet, guards.ua_or_user);
+            }
+
+            if self.stylist.quirks_mode() != QuirksMode::NoQuirks {
+                self.stylist.append_stylesheet(
+                    ua_stylesheets.quirks_mode_stylesheet.clone(),
+                    guards.ua_or_user,
+                );
+                self.load_all_web_fonts_from_stylesheet_with_guard(
+                    &ua_stylesheets.quirks_mode_stylesheet,
+                    guards.ua_or_user,
+                );
+            }
+        }
+
+        if reflow_request.stylesheets_changed {
+            self.stylist
+                .force_stylesheet_origins_dirty(Origin::Author.into());
+        }
+
+        // Flush shadow roots stylesheets if dirty.
+        document.flush_shadow_roots_stylesheets(&mut self.stylist, guards.author);
+
+        self.stylist
+            .flush(guards, Some(root_element), Some(snapshot_map));
+    }
+
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
+    )]
+    fn restyle_and_build_trees(
+        &self,
+        reflow_request: &ReflowRequest,
+        root_element: ServoLayoutElement<'_>,
+        rayon_pool: Option<&ThreadPool>,
+        layout_context: &mut LayoutContext<'_>,
+    ) {
+        let dirty_root = unsafe {
+            ServoLayoutNode::new(&reflow_request.dirty_root.unwrap())
+                .as_element()
+                .unwrap()
+        };
+
+        let recalc_style_traversal = RecalcStyle::new(layout_context);
+        let token = {
+            let shared =
+                DomTraversal::<ServoLayoutElement>::shared_context(&recalc_style_traversal);
+            RecalcStyle::pre_traverse(dirty_root, shared)
+        };
+
+        if !token.should_traverse() {
+            layout_context.style_context.stylist.rule_tree().maybe_gc();
+            return;
+        }
+
+        let dirty_root: ServoLayoutNode =
+            driver::traverse_dom(&recalc_style_traversal, token, rayon_pool).as_node();
+
+        let root_node = root_element.as_node();
+        let damage = compute_damage_and_repair_style(layout_context.shared_context(), root_node);
+        if damage == RestyleDamage::REPAINT {
+            layout_context.style_context.stylist.rule_tree().maybe_gc();
+            return;
+        }
+
+        let mut box_tree = self.box_tree.borrow_mut();
+        let box_tree = &mut *box_tree;
+        let mut build_box_tree = || {
+            if !BoxTree::update(recalc_style_traversal.context(), dirty_root) {
+                *box_tree = Some(Arc::new(BoxTree::construct(
+                    recalc_style_traversal.context(),
+                    root_node,
+                )));
+            }
+        };
+        if let Some(pool) = rayon_pool {
+            pool.install(build_box_tree)
+        } else {
+            build_box_tree()
+        };
+
+        let viewport_size = Size2D::new(
+            self.viewport_size.width.to_f32_px(),
+            self.viewport_size.height.to_f32_px(),
+        );
+        let run_layout = || {
+            box_tree
+                .as_ref()
+                .unwrap()
+                .layout(recalc_style_traversal.context(), viewport_size)
+        };
+        let fragment_tree = Arc::new(if let Some(pool) = rayon_pool {
+            pool.install(run_layout)
+        } else {
+            run_layout()
+        });
+
+        *self.fragment_tree.borrow_mut() = Some(fragment_tree);
+
+        if self.debug.dump_style_tree {
+            println!(
+                "{:?}",
+                ShowSubtreeDataAndPrimaryValues(root_element.as_node())
+            );
+        }
+        if self.debug.dump_rule_tree {
+            recalc_style_traversal
+                .context()
+                .style_context
+                .stylist
+                .rule_tree()
+                .dump_stdout(&layout_context.shared_context().guards);
+        }
+
+        // GC the rule tree if some heuristics are met.
+        layout_context.style_context.stylist.rule_tree().maybe_gc();
+    }
+
+    fn build_display_list(
+        &self,
+        reflow_request: &ReflowRequest,
+        layout_context: &mut LayoutContext<'_>,
+    ) {
+        let Some(fragment_tree) = &*self.fragment_tree.borrow() else {
+            return;
+        };
+        if !reflow_request.reflow_goal.needs_display_list() {
+            return;
+        }
+
+        let mut epoch = self.epoch.get();
+        epoch.next();
+        self.epoch.set(epoch);
+
+        let viewport_size = LayoutSize::from_untyped(Size2D::new(
+            self.viewport_size.width.to_f32_px(),
+            self.viewport_size.height.to_f32_px(),
+        ));
+        let mut display_list = DisplayList::new(
+            viewport_size,
+            fragment_tree.scrollable_overflow(),
+            self.id.into(),
+            epoch.into(),
+            fragment_tree.viewport_scroll_sensitivity,
+            self.first_reflow.get(),
+        );
+        display_list.wr.begin();
+
+        // `dump_serialized_display_list` doesn't actually print anything. It sets up
+        // the display list for printing the serialized version when `finalize()` is called.
+        // We need to call this before adding any display items so that they are printed
+        // during `finalize()`.
+        if self.debug.dump_display_list {
+            display_list.wr.dump_serialized_display_list();
+        }
+
+        // Build the root stacking context. This turns the `FragmentTree` into a
+        // tree of fragments in CSS painting order and also creates all
+        // applicable spatial and clip nodes.
+        let root_stacking_context =
+            display_list.build_stacking_context_tree(fragment_tree, &self.debug);
+
+        // Build the rest of the display list which inclues all of the WebRender primitives.
+        display_list.build(layout_context, fragment_tree, &root_stacking_context);
+
+        if self.debug.dump_flow_tree {
+            fragment_tree.print();
+        }
+        if self.debug.dump_stacking_context_tree {
+            root_stacking_context.debug_print();
+        }
+
+        if reflow_request.reflow_goal.needs_display() {
+            self.compositor_api.send_display_list(
+                self.webview_id,
+                display_list.compositor_info,
+                display_list.wr.end().1,
+            );
+
+            let (keys, instance_keys) = self
+                .font_context
+                .collect_unused_webrender_resources(false /* all */);
+            self.compositor_api
+                .remove_unused_font_resources(keys, instance_keys)
+        }
+    }
+
+    fn update_scroll_node_state(&self, state: &ScrollState) {
+        self.scroll_offsets
+            .borrow_mut()
+            .insert(state.scroll_id, state.scroll_offset);
+        let point = Point2D::new(-state.scroll_offset.x, -state.scroll_offset.y);
+        self.compositor_api.send_scroll_node(
+            self.webview_id,
+            self.id.into(),
+            LayoutPoint::from_untyped(point),
+            state.scroll_id,
+        );
+    }
+
+    /// Returns profiling information which is passed to the time profiler.
+    fn profiler_metadata(&self) -> Option<TimerMetadata> {
+        Some(TimerMetadata {
+            url: self.url.to_string(),
+            iframe: if self.is_iframe {
+                TimerMetadataFrameType::IFrame
+            } else {
+                TimerMetadataFrameType::RootWindow
+            },
+            incremental: if self.first_reflow.get() {
+                TimerMetadataReflowType::FirstReflow
+            } else {
+                TimerMetadataReflowType::Incremental
+            },
+        })
+    }
+
+    fn viewport_did_change(&mut self, viewport_details: ViewportDetails) -> bool {
+        let new_pixel_ratio = viewport_details.hidpi_scale_factor.get();
+        let new_viewport_size = Size2D::new(
+            Au::from_f32_px(viewport_details.size.width),
+            Au::from_f32_px(viewport_details.size.height),
+        );
+
+        // TODO: eliminate self.viewport_size in favour of using self.device.au_viewport_size()
+        self.viewport_size = new_viewport_size;
+
+        let device = self.stylist.device();
+        let size_did_change = device.au_viewport_size() != new_viewport_size;
+        let pixel_ratio_did_change = device.device_pixel_ratio().get() != new_pixel_ratio;
+
+        size_did_change || pixel_ratio_did_change
+    }
+
+    fn theme_did_change(&self, theme: PrefersColorScheme) -> bool {
+        theme != self.device().color_scheme()
+    }
+
+    /// Update layout given a new viewport. Returns true if the viewport changed or false if it didn't.
+    fn update_device(
+        &mut self,
+        viewport_details: ViewportDetails,
+        theme: PrefersColorScheme,
+        guards: &StylesheetGuards,
+    ) {
+        let device = Device::new(
+            MediaType::screen(),
+            self.stylist.quirks_mode(),
+            viewport_details.size,
+            Scale::new(viewport_details.hidpi_scale_factor.get()),
+            Box::new(LayoutFontMetricsProvider(self.font_context.clone())),
+            self.stylist.device().default_computed_values().to_arc(),
+            theme,
+        );
+
+        // Preserve any previously computed root font size.
+        device.set_root_font_size(self.stylist.device().root_font_size().px());
+
+        let sheet_origins_affected_by_device_change = self.stylist.set_device(device, guards);
+        self.stylist
+            .force_stylesheet_origins_dirty(sheet_origins_affected_by_device_change);
+    }
+}
+
+fn get_ua_stylesheets() -> Result<UserAgentStylesheets, &'static str> {
+    fn parse_ua_stylesheet(
+        shared_lock: &SharedRwLock,
+        filename: &str,
+        content: &[u8],
+    ) -> Result<DocumentStyleSheet, &'static str> {
+        let url = Url::parse(&format!("chrome://resources/{:?}", filename))
+            .ok()
+            .unwrap();
+        Ok(DocumentStyleSheet(ServoArc::new(Stylesheet::from_bytes(
+            content,
+            url.into(),
+            None,
+            None,
+            Origin::UserAgent,
+            MediaList::empty(),
+            shared_lock.clone(),
+            None,
+            None,
+            QuirksMode::NoQuirks,
+        ))))
+    }
+
+    let shared_lock = &GLOBAL_STYLE_DATA.shared_lock;
+
+    // FIXME: presentational-hints.css should be at author origin with zero specificity.
+    //        (Does it make a difference?)
+    let mut user_or_user_agent_stylesheets = vec![
+        parse_ua_stylesheet(shared_lock, "user-agent.css", USER_AGENT_CSS)?,
+        parse_ua_stylesheet(shared_lock, "servo.css", SERVO_CSS)?,
+        parse_ua_stylesheet(
+            shared_lock,
+            "presentational-hints.css",
+            PRESENTATIONAL_HINTS_CSS,
+        )?,
+    ];
+
+    for (contents, url) in &opts::get().user_stylesheets {
+        user_or_user_agent_stylesheets.push(DocumentStyleSheet(ServoArc::new(
+            Stylesheet::from_bytes(
+                contents,
+                UrlExtraData(url.get_arc()),
+                None,
+                None,
+                Origin::User,
+                MediaList::empty(),
+                shared_lock.clone(),
+                None,
+                Some(&RustLogReporter),
+                QuirksMode::NoQuirks,
+            ),
+        )));
+    }
+
+    let quirks_mode_stylesheet =
+        parse_ua_stylesheet(shared_lock, "quirks-mode.css", QUIRKS_MODE_CSS)?;
+
+    Ok(UserAgentStylesheets {
+        shared_lock: shared_lock.clone(),
+        user_or_user_agent_stylesheets,
+        quirks_mode_stylesheet,
+    })
+}
+
+static UA_STYLESHEETS: LazyLock<UserAgentStylesheets> =
+    LazyLock::new(|| match get_ua_stylesheets() {
+        Ok(stylesheets) => stylesheets,
+        Err(filename) => {
+            error!("Failed to load UA stylesheet {}!", filename);
+            process::exit(1);
+        },
+    });
+
+struct RegisteredPainterImpl {
+    painter: Box<dyn Painter>,
+    name: Atom,
+    // FIXME: Should be a PrecomputedHashMap.
+    properties: FxHashMap<Atom, PropertyId>,
+}
+
+impl SpeculativePainter for RegisteredPainterImpl {
+    fn speculatively_draw_a_paint_image(
+        &self,
+        properties: Vec<(Atom, String)>,
+        arguments: Vec<String>,
+    ) {
+        self.painter
+            .speculatively_draw_a_paint_image(properties, arguments);
+    }
+}
+
+impl RegisteredSpeculativePainter for RegisteredPainterImpl {
+    fn properties(&self) -> &FxHashMap<Atom, PropertyId> {
+        &self.properties
+    }
+    fn name(&self) -> Atom {
+        self.name.clone()
+    }
+}
+
+impl Painter for RegisteredPainterImpl {
+    fn draw_a_paint_image(
+        &self,
+        size: Size2D<f32, CSSPixel>,
+        device_pixel_ratio: Scale<f32, CSSPixel, DevicePixel>,
+        properties: Vec<(Atom, String)>,
+        arguments: Vec<String>,
+    ) -> Result<DrawAPaintImageResult, PaintWorkletError> {
+        self.painter
+            .draw_a_paint_image(size, device_pixel_ratio, properties, arguments)
+    }
+}
+
+struct RegisteredPaintersImpl(FnvHashMap<Atom, RegisteredPainterImpl>);
+
+impl RegisteredSpeculativePainters for RegisteredPaintersImpl {
+    fn get(&self, name: &Atom) -> Option<&dyn RegisteredSpeculativePainter> {
+        self.0
+            .get(name)
+            .map(|painter| painter as &dyn RegisteredSpeculativePainter)
+    }
+}
+
+struct LayoutFontMetricsProvider(Arc<FontContext>);
+
+impl FontMetricsProvider for LayoutFontMetricsProvider {
+    fn query_font_metrics(
+        &self,
+        _vertical: bool,
+        font: &Font,
+        base_size: CSSPixelLength,
+        _flags: QueryFontMetricsFlags,
+    ) -> FontMetrics {
+        let font_context = &self.0;
+        let font_group = self
+            .0
+            .font_group_with_size(ServoArc::new(font.clone()), base_size.into());
+
+        let Some(first_font_metrics) = font_group
+            .write()
+            .first(font_context)
+            .map(|font| font.metrics.clone())
+        else {
+            return Default::default();
+        };
+
+        // Only use the x-height of this font if it is non-zero. Some fonts return
+        // inaccurate metrics, which shouldn't be used.
+        let x_height = Some(first_font_metrics.x_height)
+            .filter(|x_height| !x_height.is_zero())
+            .map(CSSPixelLength::from);
+
+        let zero_advance_measure = first_font_metrics
+            .zero_horizontal_advance
+            .or_else(|| {
+                font_group
+                    .write()
+                    .find_by_codepoint(font_context, '0', None, None)?
+                    .metrics
+                    .zero_horizontal_advance
+            })
+            .map(CSSPixelLength::from);
+
+        let ic_width = first_font_metrics
+            .ic_horizontal_advance
+            .or_else(|| {
+                font_group
+                    .write()
+                    .find_by_codepoint(font_context, '\u{6C34}', None, None)?
+                    .metrics
+                    .ic_horizontal_advance
+            })
+            .map(CSSPixelLength::from);
+
+        FontMetrics {
+            x_height,
+            zero_advance_measure,
+            cap_height: None,
+            ic_width,
+            ascent: first_font_metrics.ascent.into(),
+            script_percent_scale_down: None,
+            script_script_percent_scale_down: None,
+        }
+    }
+
+    fn base_size_for_generic(&self, generic: GenericFontFamily) -> Length {
+        Length::new(match generic {
+            GenericFontFamily::Monospace => pref!(fonts_default_monospace_size),
+            _ => pref!(fonts_default_size),
+        } as f32)
+        .max(Length::new(0.0))
+    }
+}
+
+impl Debug for LayoutFontMetricsProvider {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_tuple("LayoutFontMetricsProvider").finish()
+    }
+}
+
+struct SnapshotSetter<'dom> {
+    elements_with_snapshot: Vec<ServoLayoutElement<'dom>>,
+}
+
+impl SnapshotSetter<'_> {
+    fn new(reflow_request: &mut ReflowRequest, snapshot_map: &mut SnapshotMap) -> Self {
+        debug!(
+            "Draining restyles: {}",
+            reflow_request.pending_restyles.len()
+        );
+        let restyles = std::mem::take(&mut reflow_request.pending_restyles);
+
+        let elements_with_snapshot: Vec<_> = restyles
+            .iter()
+            .filter(|r| r.1.snapshot.is_some())
+            .map(|r| unsafe { ServoLayoutNode::new(&r.0).as_element().unwrap() })
+            .collect();
+
+        for (element, restyle) in restyles {
+            let element = unsafe { ServoLayoutNode::new(&element).as_element().unwrap() };
+
+            // If we haven't styled this node yet, we don't need to track a
+            // restyle.
+            let Some(mut style_data) = element.mutate_data() else {
+                unsafe { element.unset_snapshot_flags() };
+                continue;
+            };
+
+            debug!("Noting restyle for {:?}: {:?}", element, style_data);
+            if let Some(s) = restyle.snapshot {
+                unsafe { element.set_has_snapshot() };
+                snapshot_map.insert(element.as_node().opaque(), s);
+            }
+
+            // Stash the data on the element for processing by the style system.
+            style_data.hint.insert(restyle.hint);
+            style_data.damage = restyle.damage;
+        }
+        Self {
+            elements_with_snapshot,
+        }
+    }
+}
+
+impl Drop for SnapshotSetter<'_> {
+    fn drop(&mut self) {
+        for element in &self.elements_with_snapshot {
+            unsafe { element.unset_snapshot_flags() }
+        }
+    }
+}
diff --git a/components/layout/lib.rs b/components/layout/lib.rs
new file mode 100644
index 00000000000..cd992387277
--- /dev/null
+++ b/components/layout/lib.rs
@@ -0,0 +1,202 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#![deny(unsafe_code)]
+
+//! Layout. Performs layout on the DOM, builds display lists and sends them to be
+//! painted.
+
+mod cell;
+pub mod context;
+pub mod display_list;
+pub mod dom;
+mod dom_traversal;
+mod flexbox;
+pub mod flow;
+mod formatting_contexts;
+mod fragment_tree;
+pub mod geom;
+mod layout_box_base;
+mod layout_impl;
+mod taffy;
+#[macro_use]
+mod construct_modern;
+mod lists;
+mod positioned;
+pub mod query;
+mod quotes;
+mod replaced;
+mod sizing;
+mod style_ext;
+pub mod table;
+pub mod traversal;
+
+use app_units::Au;
+pub use cell::ArcRefCell;
+pub use flow::BoxTree;
+pub use fragment_tree::FragmentTree;
+pub use layout_impl::LayoutFactoryImpl;
+use malloc_size_of_derive::MallocSizeOf;
+use servo_arc::Arc as ServoArc;
+use style::logical_geometry::WritingMode;
+use style::properties::ComputedValues;
+use style::values::computed::TextDecorationLine;
+
+use crate::geom::{LogicalVec2, SizeConstraint};
+use crate::style_ext::AspectRatio;
+
+/// At times, a style is "owned" by more than one layout object. For example, text
+/// fragments need a handle on their parent inline box's style. In order to make
+/// incremental layout easier to implement, another layer of shared ownership is added via
+/// [`SharedStyle`]. This allows updating the style in originating layout object and
+/// having all "depdendent" objects update automatically.
+///
+///  Note that this is not a cost-free data structure, so should only be
+/// used when necessary.
+pub(crate) type SharedStyle = ArcRefCell<ServoArc<ComputedValues>>;
+
+/// Represents the set of constraints that we use when computing the min-content
+/// and max-content inline sizes of an element.
+pub(crate) struct ConstraintSpace {
+    pub block_size: SizeConstraint,
+    pub writing_mode: WritingMode,
+    pub preferred_aspect_ratio: Option<AspectRatio>,
+}
+
+impl ConstraintSpace {
+    fn new(
+        block_size: SizeConstraint,
+        writing_mode: WritingMode,
+        preferred_aspect_ratio: Option<AspectRatio>,
+    ) -> Self {
+        Self {
+            block_size,
+            writing_mode,
+            preferred_aspect_ratio,
+        }
+    }
+
+    fn new_for_style_and_ratio(
+        style: &ComputedValues,
+        preferred_aspect_ratio: Option<AspectRatio>,
+    ) -> Self {
+        Self::new(
+            SizeConstraint::default(),
+            style.writing_mode,
+            preferred_aspect_ratio,
+        )
+    }
+}
+
+/// A variant of [`ContainingBlock`] that allows an indefinite inline size.
+/// Useful for code that is shared for both layout (where we know the inline size
+/// of the containing block) and intrinsic sizing (where we don't know it).
+pub(crate) struct IndefiniteContainingBlock {
+    pub size: LogicalVec2<Option<Au>>,
+    pub writing_mode: WritingMode,
+}
+
+impl From<&ConstraintSpace> for IndefiniteContainingBlock {
+    fn from(constraint_space: &ConstraintSpace) -> Self {
+        Self {
+            size: LogicalVec2 {
+                inline: None,
+                block: constraint_space.block_size.to_definite(),
+            },
+            writing_mode: constraint_space.writing_mode,
+        }
+    }
+}
+
+impl<'a> From<&'_ ContainingBlock<'a>> for IndefiniteContainingBlock {
+    fn from(containing_block: &ContainingBlock<'a>) -> Self {
+        Self {
+            size: LogicalVec2 {
+                inline: Some(containing_block.size.inline),
+                block: containing_block.size.block.to_definite(),
+            },
+            writing_mode: containing_block.style.writing_mode,
+        }
+    }
+}
+
+impl<'a> From<&'_ DefiniteContainingBlock<'a>> for IndefiniteContainingBlock {
+    fn from(containing_block: &DefiniteContainingBlock<'a>) -> Self {
+        Self {
+            size: containing_block.size.map(|v| Some(*v)),
+            writing_mode: containing_block.style.writing_mode,
+        }
+    }
+}
+
+#[derive(Clone, Debug, MallocSizeOf)]
+pub(crate) struct ContainingBlockSize {
+    inline: Au,
+    block: SizeConstraint,
+}
+
+pub(crate) struct ContainingBlock<'a> {
+    size: ContainingBlockSize,
+    style: &'a ComputedValues,
+}
+
+struct DefiniteContainingBlock<'a> {
+    size: LogicalVec2<Au>,
+    style: &'a ComputedValues,
+}
+
+impl<'a> From<&'_ DefiniteContainingBlock<'a>> for ContainingBlock<'a> {
+    fn from(definite: &DefiniteContainingBlock<'a>) -> Self {
+        ContainingBlock {
+            size: ContainingBlockSize {
+                inline: definite.size.inline,
+                block: SizeConstraint::Definite(definite.size.block),
+            },
+            style: definite.style,
+        }
+    }
+}
+
+/// Data that is propagated from ancestors to descendants during [`crate::flow::BoxTree`]
+/// construction.  This allows data to flow in the reverse direction of the typical layout
+/// propoagation, but only during `BoxTree` construction.
+#[derive(Clone, Copy, Debug)]
+struct PropagatedBoxTreeData {
+    text_decoration: TextDecorationLine,
+    allow_percentage_column_in_tables: bool,
+}
+
+impl Default for PropagatedBoxTreeData {
+    fn default() -> Self {
+        Self {
+            text_decoration: Default::default(),
+            allow_percentage_column_in_tables: true,
+        }
+    }
+}
+
+impl PropagatedBoxTreeData {
+    pub(crate) fn union(&self, style: &ComputedValues) -> Self {
+        Self {
+            // FIXME(#31736): This is only taking into account the line style and not the decoration
+            // color. This should collect information about both so that they can be rendered properly.
+            text_decoration: self.text_decoration | style.clone_text_decoration_line(),
+            allow_percentage_column_in_tables: self.allow_percentage_column_in_tables,
+        }
+    }
+
+    pub(crate) fn without_text_decorations(&self) -> Self {
+        Self {
+            text_decoration: TextDecorationLine::NONE,
+            allow_percentage_column_in_tables: self.allow_percentage_column_in_tables,
+        }
+    }
+
+    fn disallowing_percentage_table_columns(&self) -> PropagatedBoxTreeData {
+        Self {
+            text_decoration: self.text_decoration,
+            allow_percentage_column_in_tables: false,
+        }
+    }
+}
diff --git a/components/layout_2020/lists.rs b/components/layout/lists.rs
similarity index 83%
rename from components/layout_2020/lists.rs
rename to components/layout/lists.rs
index ee8db260c8c..8c653cb6858 100644
--- a/components/layout_2020/lists.rs
+++ b/components/layout/lists.rs
@@ -2,38 +2,30 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use log::warn;
 use style::properties::longhands::list_style_type::computed_value::T as ListStyleType;
 use style::properties::style_structs;
 use style::values::computed::Image;
 
 use crate::context::LayoutContext;
-use crate::dom::NodeExt;
 use crate::dom_traversal::{NodeAndStyleInfo, PseudoElementContentItem};
 use crate::replaced::ReplacedContents;
 
 /// <https://drafts.csswg.org/css-lists/#content-property>
-pub(crate) fn make_marker<'dom, Node>(
+pub(crate) fn make_marker<'dom>(
     context: &LayoutContext,
-    info: &NodeAndStyleInfo<Node>,
-) -> Option<Vec<PseudoElementContentItem>>
-where
-    Node: NodeExt<'dom>,
-{
-    let style = info.style.get_list();
-    let node = match info.node {
-        Some(node) => node,
-        None => {
-            warn!("Tried to make a marker for an anonymous node!");
-            return None;
-        },
-    };
+    info: &NodeAndStyleInfo<'dom>,
+) -> Option<(NodeAndStyleInfo<'dom>, Vec<PseudoElementContentItem>)> {
+    let marker_info = info.pseudo(context, style::selector_parser::PseudoElement::Marker)?;
+    let style = &marker_info.style;
+    let list_style = style.get_list();
 
     // https://drafts.csswg.org/css-lists/#marker-image
-    let marker_image = || match &style.list_style_image {
+    let marker_image = || match &list_style.list_style_image {
         Image::Url(url) => Some(vec![
             PseudoElementContentItem::Replaced(ReplacedContents::from_image_url(
-                node, context, url,
+                marker_info.node,
+                context,
+                url,
             )?),
             PseudoElementContentItem::Text(" ".into()),
         ]),
@@ -44,11 +36,13 @@ where
         Image::PaintWorklet(..) |
         Image::None => None,
     };
-    marker_image().or_else(|| {
+    let content = marker_image().or_else(|| {
         Some(vec![PseudoElementContentItem::Text(
-            marker_string(style)?.into(),
+            marker_string(list_style)?.into(),
         )])
-    })
+    })?;
+
+    Some((marker_info, content))
 }
 
 /// <https://drafts.csswg.org/css-lists/#marker-string>
diff --git a/components/layout/positioned.rs b/components/layout/positioned.rs
new file mode 100644
index 00000000000..b607462d6eb
--- /dev/null
+++ b/components/layout/positioned.rs
@@ -0,0 +1,981 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::mem;
+
+use app_units::Au;
+use malloc_size_of_derive::MallocSizeOf;
+use rayon::iter::IntoParallelRefMutIterator;
+use rayon::prelude::{IndexedParallelIterator, ParallelIterator};
+use style::Zero;
+use style::computed_values::position::T as Position;
+use style::logical_geometry::{Direction, WritingMode};
+use style::properties::ComputedValues;
+use style::values::specified::align::AlignFlags;
+
+use crate::cell::ArcRefCell;
+use crate::context::LayoutContext;
+use crate::dom_traversal::{Contents, NodeAndStyleInfo};
+use crate::formatting_contexts::{
+    IndependentFormattingContext, IndependentFormattingContextContents,
+};
+use crate::fragment_tree::{
+    BoxFragment, Fragment, FragmentFlags, HoistedSharedFragment, SpecificLayoutInfo,
+};
+use crate::geom::{
+    AuOrAuto, LengthPercentageOrAuto, LogicalRect, LogicalSides, LogicalSides1D, LogicalVec2,
+    PhysicalPoint, PhysicalRect, PhysicalSides, PhysicalSize, PhysicalVec, Size, Sizes, ToLogical,
+    ToLogicalWithContainingBlock,
+};
+use crate::layout_box_base::LayoutBoxBase;
+use crate::sizing::ContentSizes;
+use crate::style_ext::{Clamp, ComputedValuesExt, ContentBoxSizesAndPBM, DisplayInside};
+use crate::{
+    ConstraintSpace, ContainingBlock, ContainingBlockSize, DefiniteContainingBlock,
+    PropagatedBoxTreeData, SizeConstraint,
+};
+
+#[derive(Debug, MallocSizeOf)]
+pub(crate) struct AbsolutelyPositionedBox {
+    pub context: IndependentFormattingContext,
+}
+
+#[derive(Clone, MallocSizeOf)]
+pub(crate) struct HoistedAbsolutelyPositionedBox {
+    absolutely_positioned_box: ArcRefCell<AbsolutelyPositionedBox>,
+
+    /// A reference to a Fragment which is shared between this `HoistedAbsolutelyPositionedBox`
+    /// and its placeholder `AbsoluteOrFixedPositionedFragment` in the original tree position.
+    /// This will be used later in order to paint this hoisted box in tree order.
+    pub fragment: ArcRefCell<HoistedSharedFragment>,
+}
+
+impl AbsolutelyPositionedBox {
+    pub fn new(context: IndependentFormattingContext) -> Self {
+        Self { context }
+    }
+
+    pub fn construct(
+        context: &LayoutContext,
+        node_info: &NodeAndStyleInfo,
+        display_inside: DisplayInside,
+        contents: Contents,
+    ) -> Self {
+        Self {
+            context: IndependentFormattingContext::construct(
+                context,
+                node_info,
+                display_inside,
+                contents,
+                // Text decorations are not propagated to any out-of-flow descendants. In addition,
+                // absolutes don't affect the size of ancestors so it is fine to allow descendent
+                // tables to resolve percentage columns.
+                PropagatedBoxTreeData::default(),
+            ),
+        }
+    }
+
+    pub(crate) fn to_hoisted(
+        absolutely_positioned_box: ArcRefCell<Self>,
+        static_position_rectangle: PhysicalRect<Au>,
+        resolved_alignment: LogicalVec2<AlignFlags>,
+        original_parent_writing_mode: WritingMode,
+    ) -> HoistedAbsolutelyPositionedBox {
+        HoistedAbsolutelyPositionedBox {
+            fragment: ArcRefCell::new(HoistedSharedFragment::new(
+                static_position_rectangle,
+                resolved_alignment,
+                original_parent_writing_mode,
+            )),
+            absolutely_positioned_box,
+        }
+    }
+}
+
+#[derive(Clone, Default, MallocSizeOf)]
+pub(crate) struct PositioningContext {
+    absolutes: Vec<HoistedAbsolutelyPositionedBox>,
+}
+
+impl PositioningContext {
+    #[inline]
+    pub(crate) fn new_for_layout_box_base(layout_box_base: &LayoutBoxBase) -> Option<Self> {
+        Self::new_for_style_and_fragment_flags(
+            &layout_box_base.style,
+            &layout_box_base.base_fragment_info.flags,
+        )
+    }
+
+    fn new_for_style_and_fragment_flags(
+        style: &ComputedValues,
+        flags: &FragmentFlags,
+    ) -> Option<Self> {
+        if style.establishes_containing_block_for_absolute_descendants(*flags) {
+            Some(Self::default())
+        } else {
+            None
+        }
+    }
+
+    /// Absolute and fixed position fragments are hoisted up to their containing blocks
+    /// from their tree position. When these fragments have static inset start positions,
+    /// that position (relative to the ancestor containing block) needs to be included
+    /// with the hoisted fragment so that it can be laid out properly at the containing
+    /// block.
+    ///
+    /// This function is used to update the static position of hoisted boxes added after
+    /// the given index at every level of the fragment tree as the hoisted fragments move
+    /// up to their containing blocks. Once an ancestor fragment is laid out, this
+    /// function can be used to aggregate its offset to any descendent boxes that are
+    /// being hoisted. In this case, the appropriate index to use is the result of
+    /// [`PositioningContext::len()`] cached before laying out the [`Fragment`].
+    pub(crate) fn adjust_static_position_of_hoisted_fragments(
+        &mut self,
+        parent_fragment: &Fragment,
+        index: PositioningContextLength,
+    ) {
+        let start_offset = match &parent_fragment {
+            Fragment::Box(fragment) | Fragment::Float(fragment) => {
+                fragment.borrow().content_rect.origin
+            },
+            Fragment::AbsoluteOrFixedPositioned(_) => return,
+            Fragment::Positioning(fragment) => fragment.borrow().rect.origin,
+            _ => unreachable!(),
+        };
+        self.adjust_static_position_of_hoisted_fragments_with_offset(
+            &start_offset.to_vector(),
+            index,
+        );
+    }
+
+    /// See documentation for [PositioningContext::adjust_static_position_of_hoisted_fragments].
+    pub(crate) fn adjust_static_position_of_hoisted_fragments_with_offset(
+        &mut self,
+        offset: &PhysicalVec<Au>,
+        index: PositioningContextLength,
+    ) {
+        self.absolutes
+            .iter_mut()
+            .skip(index.0)
+            .for_each(|hoisted_fragment| {
+                hoisted_fragment
+                    .fragment
+                    .borrow_mut()
+                    .adjust_offsets(offset)
+            })
+    }
+
+    /// Given `fragment_layout_fn`, a closure which lays out a fragment in a provided
+    /// `PositioningContext`, create a new positioning context if necessary for the fragment and
+    /// lay out the fragment and all its children. Returns the newly created `BoxFragment`.
+    pub(crate) fn layout_maybe_position_relative_fragment(
+        &mut self,
+        layout_context: &LayoutContext,
+        containing_block: &ContainingBlock,
+        base: &LayoutBoxBase,
+        fragment_layout_fn: impl FnOnce(&mut Self) -> BoxFragment,
+    ) -> BoxFragment {
+        // If a new `PositioningContext` isn't necessary, simply create the fragment using
+        // the given closure and the current `PositioningContext`.
+        let establishes_containing_block_for_absolutes = base
+            .style
+            .establishes_containing_block_for_absolute_descendants(base.base_fragment_info.flags);
+        if !establishes_containing_block_for_absolutes {
+            return fragment_layout_fn(self);
+        }
+
+        let mut new_context = PositioningContext::default();
+        let mut new_fragment = fragment_layout_fn(&mut new_context);
+
+        // Lay out all of the absolutely positioned children for this fragment, and, if it
+        // isn't a containing block for fixed elements, then pass those up to the parent.
+        new_context.layout_collected_children(layout_context, &mut new_fragment);
+        self.append(new_context);
+
+        if base.style.clone_position() == Position::Relative {
+            new_fragment.content_rect.origin += relative_adjustement(&base.style, containing_block)
+                .to_physical_vector(containing_block.style.writing_mode)
+        }
+
+        new_fragment
+    }
+
+    fn take_boxes_for_fragment(
+        &mut self,
+        new_fragment: &BoxFragment,
+        boxes_to_layout_out: &mut Vec<HoistedAbsolutelyPositionedBox>,
+        boxes_to_continue_hoisting_out: &mut Vec<HoistedAbsolutelyPositionedBox>,
+    ) {
+        debug_assert!(
+            new_fragment
+                .style
+                .establishes_containing_block_for_absolute_descendants(new_fragment.base.flags)
+        );
+
+        if new_fragment
+            .style
+            .establishes_containing_block_for_all_descendants(new_fragment.base.flags)
+        {
+            boxes_to_layout_out.append(&mut self.absolutes);
+            return;
+        }
+
+        // TODO: This could potentially use `extract_if` when that is stabilized.
+        let (mut boxes_to_layout, mut boxes_to_continue_hoisting) = self
+            .absolutes
+            .drain(..)
+            .partition(|hoisted_box| hoisted_box.position() != Position::Fixed);
+        boxes_to_layout_out.append(&mut boxes_to_layout);
+        boxes_to_continue_hoisting_out.append(&mut boxes_to_continue_hoisting);
+    }
+
+    // Lay out the hoisted boxes collected into this `PositioningContext` and add them
+    // to the given `BoxFragment`.
+    pub(crate) fn layout_collected_children(
+        &mut self,
+        layout_context: &LayoutContext,
+        new_fragment: &mut BoxFragment,
+    ) {
+        if self.absolutes.is_empty() {
+            return;
+        }
+
+        // Sometimes we create temporary PositioningContexts just to collect hoisted absolutes and
+        // then these are processed later. In that case and if this fragment doesn't establish a
+        // containing block for absolutes at all, we just do nothing. All hoisted fragments will
+        // later be passed up to a parent PositioningContext.
+        //
+        // Handling this case here, when the PositioningContext is completely ineffectual other than
+        // as a temporary container for hoisted boxes, means that callers can execute less conditional
+        // code.
+        if !new_fragment
+            .style
+            .establishes_containing_block_for_absolute_descendants(new_fragment.base.flags)
+        {
+            return;
+        }
+
+        let padding_rect = PhysicalRect::new(
+            // Ignore the content rect’s position in its own containing block:
+            PhysicalPoint::origin(),
+            new_fragment.content_rect.size,
+        )
+        .outer_rect(new_fragment.padding);
+        let containing_block = DefiniteContainingBlock {
+            size: padding_rect
+                .size
+                .to_logical(new_fragment.style.writing_mode),
+            style: &new_fragment.style,
+        };
+
+        let mut fixed_position_boxes_to_hoist = Vec::new();
+        let mut boxes_to_layout = Vec::new();
+        self.take_boxes_for_fragment(
+            new_fragment,
+            &mut boxes_to_layout,
+            &mut fixed_position_boxes_to_hoist,
+        );
+
+        // Laying out a `position: absolute` child (which only establishes a containing block for
+        // `position: absolute` descendants) can result in more `position: fixed` descendants
+        // collecting in `self.absolutes`. We need to loop here in order to keep either laying them
+        // out or putting them into `fixed_position_boxes_to_hoist`. We know there aren't any more
+        // when `self.absolutes` is empty.
+        while !boxes_to_layout.is_empty() {
+            HoistedAbsolutelyPositionedBox::layout_many(
+                layout_context,
+                std::mem::take(&mut boxes_to_layout),
+                &mut new_fragment.children,
+                &mut self.absolutes,
+                &containing_block,
+                new_fragment.padding,
+            );
+
+            self.take_boxes_for_fragment(
+                new_fragment,
+                &mut boxes_to_layout,
+                &mut fixed_position_boxes_to_hoist,
+            );
+        }
+
+        // We replace here instead of simply preserving these in `take_boxes_for_fragment`
+        // so that we don't have to continually re-iterate over them when laying out in the
+        // loop above.
+        self.absolutes = fixed_position_boxes_to_hoist;
+    }
+
+    pub(crate) fn push(&mut self, hoisted_box: HoistedAbsolutelyPositionedBox) {
+        debug_assert!(matches!(
+            hoisted_box.position(),
+            Position::Absolute | Position::Fixed
+        ));
+        self.absolutes.push(hoisted_box);
+    }
+
+    pub(crate) fn append(&mut self, mut other: Self) {
+        if other.absolutes.is_empty() {
+            return;
+        }
+        if self.absolutes.is_empty() {
+            self.absolutes = other.absolutes;
+        } else {
+            self.absolutes.append(&mut other.absolutes)
+        }
+    }
+
+    pub(crate) fn layout_initial_containing_block_children(
+        &mut self,
+        layout_context: &LayoutContext,
+        initial_containing_block: &DefiniteContainingBlock,
+        fragments: &mut Vec<Fragment>,
+    ) {
+        // Laying out a `position: absolute` child (which only establishes a containing block for
+        // `position: absolute` descendants) can result in more `position: fixed` descendants
+        // collecting in `self.absolutes`. We need to loop here in order to keep laying them out. We
+        // know there aren't any more when `self.absolutes` is empty.
+        while !self.absolutes.is_empty() {
+            HoistedAbsolutelyPositionedBox::layout_many(
+                layout_context,
+                mem::take(&mut self.absolutes),
+                fragments,
+                &mut self.absolutes,
+                initial_containing_block,
+                Default::default(),
+            )
+        }
+    }
+
+    /// Get the length of this [PositioningContext].
+    pub(crate) fn len(&self) -> PositioningContextLength {
+        PositioningContextLength(self.absolutes.len())
+    }
+
+    /// Truncate this [PositioningContext] to the given [PositioningContextLength].  This
+    /// is useful for "unhoisting" boxes in this context and returning it to the state at
+    /// the time that [`PositioningContext::len()`] was called.
+    pub(crate) fn truncate(&mut self, length: &PositioningContextLength) {
+        self.absolutes.truncate(length.0)
+    }
+}
+
+/// A data structure which stores the size of a positioning context.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub(crate) struct PositioningContextLength(usize);
+
+impl Zero for PositioningContextLength {
+    fn zero() -> Self {
+        Self(0)
+    }
+
+    fn is_zero(&self) -> bool {
+        self.0.is_zero()
+    }
+}
+
+impl HoistedAbsolutelyPositionedBox {
+    fn position(&self) -> Position {
+        let position = self
+            .absolutely_positioned_box
+            .borrow()
+            .context
+            .style()
+            .clone_position();
+        assert!(position == Position::Fixed || position == Position::Absolute);
+        position
+    }
+
+    pub(crate) fn layout_many(
+        layout_context: &LayoutContext,
+        mut boxes: Vec<Self>,
+        fragments: &mut Vec<Fragment>,
+        for_nearest_containing_block_for_all_descendants: &mut Vec<HoistedAbsolutelyPositionedBox>,
+        containing_block: &DefiniteContainingBlock,
+        containing_block_padding: PhysicalSides<Au>,
+    ) {
+        if layout_context.use_rayon {
+            let mut new_fragments = Vec::new();
+            let mut new_hoisted_boxes = Vec::new();
+
+            boxes
+                .par_iter_mut()
+                .map(|hoisted_box| {
+                    let mut new_hoisted_boxes: Vec<HoistedAbsolutelyPositionedBox> = Vec::new();
+                    let new_fragment = hoisted_box.layout(
+                        layout_context,
+                        &mut new_hoisted_boxes,
+                        containing_block,
+                        containing_block_padding,
+                    );
+
+                    hoisted_box.fragment.borrow_mut().fragment = Some(new_fragment.clone());
+                    (new_fragment, new_hoisted_boxes)
+                })
+                .unzip_into_vecs(&mut new_fragments, &mut new_hoisted_boxes);
+
+            fragments.extend(new_fragments);
+            for_nearest_containing_block_for_all_descendants
+                .extend(new_hoisted_boxes.into_iter().flatten());
+        } else {
+            fragments.extend(boxes.iter_mut().map(|box_| {
+                let new_fragment = box_.layout(
+                    layout_context,
+                    for_nearest_containing_block_for_all_descendants,
+                    containing_block,
+                    containing_block_padding,
+                );
+
+                box_.fragment.borrow_mut().fragment = Some(new_fragment.clone());
+                new_fragment
+            }))
+        }
+    }
+
+    pub(crate) fn layout(
+        &mut self,
+        layout_context: &LayoutContext,
+        hoisted_absolutes_from_children: &mut Vec<HoistedAbsolutelyPositionedBox>,
+        containing_block: &DefiniteContainingBlock,
+        containing_block_padding: PhysicalSides<Au>,
+    ) -> Fragment {
+        let cbis = containing_block.size.inline;
+        let cbbs = containing_block.size.block;
+        let containing_block_writing_mode = containing_block.style.writing_mode;
+        let absolutely_positioned_box = self.absolutely_positioned_box.borrow();
+        let context = &absolutely_positioned_box.context;
+        let style = context.style().clone();
+        let layout_style = context.layout_style();
+        let ContentBoxSizesAndPBM {
+            content_box_sizes,
+            pbm,
+            ..
+        } = layout_style.content_box_sizes_and_padding_border_margin(&containing_block.into());
+        let containing_block = &containing_block.into();
+        let is_table = layout_style.is_table();
+        let shared_fragment = self.fragment.borrow();
+
+        // The static position rect was calculated assuming that the containing block would be
+        // established by the content box of some ancestor, but the actual containing block is
+        // established by the padding box. So we need to add the padding of that ancestor.
+        let mut static_position_rect = shared_fragment
+            .static_position_rect
+            .outer_rect(-containing_block_padding);
+        static_position_rect.size = static_position_rect.size.max(PhysicalSize::zero());
+        let static_position_rect = static_position_rect.to_logical(containing_block);
+
+        let box_offset = style.box_offsets(containing_block.style.writing_mode);
+
+        // When the "static-position rect" doesn't come into play, we do not do any alignment
+        // in the inline axis.
+        let inline_box_offsets = box_offset.inline_sides();
+        let inline_alignment = match inline_box_offsets.either_specified() {
+            true => style.clone_justify_self().0.0,
+            false => shared_fragment.resolved_alignment.inline,
+        };
+
+        let inline_axis_solver = AbsoluteAxisSolver {
+            axis: Direction::Inline,
+            containing_size: cbis,
+            padding_border_sum: pbm.padding_border_sums.inline,
+            computed_margin_start: pbm.margin.inline_start,
+            computed_margin_end: pbm.margin.inline_end,
+            computed_sizes: content_box_sizes.inline,
+            avoid_negative_margin_start: true,
+            box_offsets: inline_box_offsets,
+            static_position_rect_axis: static_position_rect.get_axis(Direction::Inline),
+            alignment: inline_alignment,
+            flip_anchor: shared_fragment.original_parent_writing_mode.is_bidi_ltr() !=
+                containing_block_writing_mode.is_bidi_ltr(),
+            is_table,
+        };
+
+        // When the "static-position rect" doesn't come into play, we re-resolve "align-self"
+        // against this containing block.
+        let block_box_offsets = box_offset.block_sides();
+        let block_alignment = match block_box_offsets.either_specified() {
+            true => style.clone_align_self().0.0,
+            false => shared_fragment.resolved_alignment.block,
+        };
+        let block_axis_solver = AbsoluteAxisSolver {
+            axis: Direction::Block,
+            containing_size: cbbs,
+            padding_border_sum: pbm.padding_border_sums.block,
+            computed_margin_start: pbm.margin.block_start,
+            computed_margin_end: pbm.margin.block_end,
+            computed_sizes: content_box_sizes.block,
+            avoid_negative_margin_start: false,
+            box_offsets: block_box_offsets,
+            static_position_rect_axis: static_position_rect.get_axis(Direction::Block),
+            alignment: block_alignment,
+            flip_anchor: false,
+            is_table,
+        };
+
+        let mut positioning_context = PositioningContext::default();
+        let mut new_fragment = {
+            let content_size: LogicalVec2<Au>;
+            let fragments;
+            let mut specific_layout_info: Option<SpecificLayoutInfo> = None;
+            match &context.contents {
+                IndependentFormattingContextContents::Replaced(replaced) => {
+                    // https://drafts.csswg.org/css2/visudet.html#abs-replaced-width
+                    // https://drafts.csswg.org/css2/visudet.html#abs-replaced-height
+                    let inset_sums = LogicalVec2 {
+                        inline: inline_axis_solver.inset_sum(),
+                        block: block_axis_solver.inset_sum(),
+                    };
+                    let automatic_size = |alignment: AlignFlags, offsets: &LogicalSides1D<_>| {
+                        if alignment.value() == AlignFlags::STRETCH && !offsets.either_auto() {
+                            Size::Stretch
+                        } else {
+                            Size::FitContent
+                        }
+                    };
+                    content_size = replaced.used_size_as_if_inline_element_from_content_box_sizes(
+                        containing_block,
+                        &style,
+                        context.preferred_aspect_ratio(&pbm.padding_border_sums),
+                        LogicalVec2 {
+                            inline: &inline_axis_solver.computed_sizes,
+                            block: &block_axis_solver.computed_sizes,
+                        },
+                        LogicalVec2 {
+                            inline: automatic_size(
+                                inline_alignment,
+                                &inline_axis_solver.box_offsets,
+                            ),
+                            block: automatic_size(block_alignment, &block_axis_solver.box_offsets),
+                        },
+                        pbm.padding_border_sums + pbm.margin.auto_is(Au::zero).sum() + inset_sums,
+                    );
+                    fragments = replaced.make_fragments(
+                        layout_context,
+                        &style,
+                        content_size.to_physical_size(containing_block_writing_mode),
+                    );
+                },
+                IndependentFormattingContextContents::NonReplaced(non_replaced) => {
+                    // https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width
+                    // https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-height
+
+                    // The block size can depend on layout results, so we only solve it extrinsically,
+                    // we may have to resolve it properly later on.
+                    let extrinsic_block_size = block_axis_solver.solve_size_extrinsically();
+
+                    // The inline axis can be fully resolved, computing intrinsic sizes using the
+                    // extrinsic block size.
+                    let inline_size = inline_axis_solver.solve_size(|| {
+                        let ratio = context.preferred_aspect_ratio(&pbm.padding_border_sums);
+                        let constraint_space =
+                            ConstraintSpace::new(extrinsic_block_size, style.writing_mode, ratio);
+                        context
+                            .inline_content_sizes(layout_context, &constraint_space)
+                            .sizes
+                    });
+
+                    let containing_block_for_children = ContainingBlock {
+                        size: ContainingBlockSize {
+                            inline: inline_size,
+                            block: extrinsic_block_size,
+                        },
+                        style: &style,
+                    };
+                    // https://drafts.csswg.org/css-writing-modes/#orthogonal-flows
+                    assert_eq!(
+                        containing_block_writing_mode.is_horizontal(),
+                        style.writing_mode.is_horizontal(),
+                        "Mixed horizontal and vertical writing modes are not supported yet"
+                    );
+
+                    let independent_layout = non_replaced.layout(
+                        layout_context,
+                        &mut positioning_context,
+                        &containing_block_for_children,
+                        containing_block,
+                        &context.base,
+                        false, /* depends_on_block_constraints */
+                    );
+
+                    // Tables can become narrower than predicted due to collapsed columns
+                    let inline_size = independent_layout
+                        .content_inline_size_for_table
+                        .unwrap_or(inline_size);
+
+                    // Now we can properly solve the block size.
+                    let block_size = block_axis_solver
+                        .solve_size(|| independent_layout.content_block_size.into());
+
+                    content_size = LogicalVec2 {
+                        inline: inline_size,
+                        block: block_size,
+                    };
+                    fragments = independent_layout.fragments;
+                    specific_layout_info = independent_layout.specific_layout_info;
+                },
+            };
+
+            let inline_margins = inline_axis_solver.solve_margins(content_size.inline);
+            let block_margins = block_axis_solver.solve_margins(content_size.block);
+            let margin = LogicalSides {
+                inline_start: inline_margins.start,
+                inline_end: inline_margins.end,
+                block_start: block_margins.start,
+                block_end: block_margins.end,
+            };
+
+            let pb = pbm.padding + pbm.border;
+            let margin_rect_size = content_size + pbm.padding_border_sums + margin.sum();
+            let inline_origin = inline_axis_solver.origin_for_margin_box(
+                margin_rect_size.inline,
+                style.writing_mode,
+                shared_fragment.original_parent_writing_mode,
+                containing_block_writing_mode,
+            );
+            let block_origin = block_axis_solver.origin_for_margin_box(
+                margin_rect_size.block,
+                style.writing_mode,
+                shared_fragment.original_parent_writing_mode,
+                containing_block_writing_mode,
+            );
+
+            let content_rect = LogicalRect {
+                start_corner: LogicalVec2 {
+                    inline: inline_origin + margin.inline_start + pb.inline_start,
+                    block: block_origin + margin.block_start + pb.block_start,
+                },
+                size: content_size,
+            };
+            BoxFragment::new(
+                context.base_fragment_info(),
+                style,
+                fragments,
+                content_rect.as_physical(Some(containing_block)),
+                pbm.padding.to_physical(containing_block_writing_mode),
+                pbm.border.to_physical(containing_block_writing_mode),
+                margin.to_physical(containing_block_writing_mode),
+                None, /* clearance */
+            )
+            .with_specific_layout_info(specific_layout_info)
+        };
+
+        // This is an absolutely positioned element, which means it also establishes a
+        // containing block for absolutes. We lay out any absolutely positioned children
+        // here and pass the rest to `hoisted_absolutes_from_children.`
+        positioning_context.layout_collected_children(layout_context, &mut new_fragment);
+
+        // Any hoisted boxes that remain in this positioning context are going to be hoisted
+        // up above this absolutely positioned box. These will necessarily be fixed position
+        // elements, because absolutely positioned elements form containing blocks for all
+        // other elements. If any of them have a static start position though, we need to
+        // adjust it to account for the start corner of this absolute.
+        positioning_context.adjust_static_position_of_hoisted_fragments_with_offset(
+            &new_fragment.content_rect.origin.to_vector(),
+            PositioningContextLength::zero(),
+        );
+
+        hoisted_absolutes_from_children.extend(positioning_context.absolutes);
+
+        let fragment = Fragment::Box(ArcRefCell::new(new_fragment));
+        context.base.set_fragment(fragment.clone());
+        fragment
+    }
+}
+
+#[derive(Clone, Copy, Debug)]
+struct RectAxis {
+    origin: Au,
+    length: Au,
+}
+
+impl LogicalRect<Au> {
+    fn get_axis(&self, axis: Direction) -> RectAxis {
+        match axis {
+            Direction::Block => RectAxis {
+                origin: self.start_corner.block,
+                length: self.size.block,
+            },
+            Direction::Inline => RectAxis {
+                origin: self.start_corner.inline,
+                length: self.size.inline,
+            },
+        }
+    }
+}
+
+struct AbsoluteAxisSolver<'a> {
+    axis: Direction,
+    containing_size: Au,
+    padding_border_sum: Au,
+    computed_margin_start: AuOrAuto,
+    computed_margin_end: AuOrAuto,
+    computed_sizes: Sizes,
+    avoid_negative_margin_start: bool,
+    box_offsets: LogicalSides1D<LengthPercentageOrAuto<'a>>,
+    static_position_rect_axis: RectAxis,
+    alignment: AlignFlags,
+    flip_anchor: bool,
+    is_table: bool,
+}
+
+impl AbsoluteAxisSolver<'_> {
+    /// Returns the amount that we need to subtract from the containing block size in order to
+    /// obtain the inset-modified containing block that we will use for sizing purposes.
+    /// (Note that for alignment purposes, we may re-resolve auto insets to a different value.)
+    /// <https://drafts.csswg.org/css-position/#resolving-insets>
+    fn inset_sum(&self) -> Au {
+        match (
+            self.box_offsets.start.non_auto(),
+            self.box_offsets.end.non_auto(),
+        ) {
+            (None, None) => {
+                if self.flip_anchor {
+                    self.containing_size -
+                        self.static_position_rect_axis.origin -
+                        self.static_position_rect_axis.length
+                } else {
+                    self.static_position_rect_axis.origin
+                }
+            },
+            (Some(start), None) => start.to_used_value(self.containing_size),
+            (None, Some(end)) => end.to_used_value(self.containing_size),
+            (Some(start), Some(end)) => {
+                start.to_used_value(self.containing_size) + end.to_used_value(self.containing_size)
+            },
+        }
+    }
+
+    #[inline]
+    fn automatic_size(&self) -> Size<Au> {
+        match self.alignment.value() {
+            _ if self.box_offsets.either_auto() => Size::FitContent,
+            AlignFlags::NORMAL | AlignFlags::AUTO if !self.is_table => Size::Stretch,
+            AlignFlags::STRETCH => Size::Stretch,
+            _ => Size::FitContent,
+        }
+    }
+
+    #[inline]
+    fn stretch_size(&self) -> Au {
+        Au::zero().max(
+            self.containing_size -
+                self.inset_sum() -
+                self.padding_border_sum -
+                self.computed_margin_start.auto_is(Au::zero) -
+                self.computed_margin_end.auto_is(Au::zero),
+        )
+    }
+
+    #[inline]
+    fn solve_size_extrinsically(&self) -> SizeConstraint {
+        self.computed_sizes.resolve_extrinsic(
+            self.automatic_size(),
+            Au::zero(),
+            Some(self.stretch_size()),
+        )
+    }
+
+    #[inline]
+    fn solve_size(&self, get_content_size: impl FnOnce() -> ContentSizes) -> Au {
+        self.computed_sizes.resolve(
+            self.axis,
+            self.automatic_size(),
+            Au::zero,
+            Some(self.stretch_size()),
+            get_content_size,
+            self.is_table,
+        )
+    }
+
+    fn solve_margins(&self, size: Au) -> LogicalSides1D<Au> {
+        if self.box_offsets.either_auto() {
+            LogicalSides1D::new(
+                self.computed_margin_start.auto_is(Au::zero),
+                self.computed_margin_end.auto_is(Au::zero),
+            )
+        } else {
+            let free_space =
+                self.containing_size - self.inset_sum() - self.padding_border_sum - size;
+            match (self.computed_margin_start, self.computed_margin_end) {
+                (AuOrAuto::Auto, AuOrAuto::Auto) => {
+                    if self.avoid_negative_margin_start && free_space < Au::zero() {
+                        LogicalSides1D::new(Au::zero(), free_space)
+                    } else {
+                        let margin_start = free_space / 2;
+                        LogicalSides1D::new(margin_start, free_space - margin_start)
+                    }
+                },
+                (AuOrAuto::Auto, AuOrAuto::LengthPercentage(end)) => {
+                    LogicalSides1D::new(free_space - end, end)
+                },
+                (AuOrAuto::LengthPercentage(start), AuOrAuto::Auto) => {
+                    LogicalSides1D::new(start, free_space - start)
+                },
+                (AuOrAuto::LengthPercentage(start), AuOrAuto::LengthPercentage(end)) => {
+                    LogicalSides1D::new(start, end)
+                },
+            }
+        }
+    }
+
+    fn origin_for_margin_box(
+        &self,
+        size: Au,
+        self_writing_mode: WritingMode,
+        original_parent_writing_mode: WritingMode,
+        containing_block_writing_mode: WritingMode,
+    ) -> Au {
+        let (alignment_container, alignment_container_writing_mode, flip_anchor, offsets) = match (
+            self.box_offsets.start.non_auto(),
+            self.box_offsets.end.non_auto(),
+        ) {
+            (None, None) => (
+                self.static_position_rect_axis,
+                original_parent_writing_mode,
+                self.flip_anchor,
+                None,
+            ),
+            (Some(start), Some(end)) => {
+                let offsets = LogicalSides1D {
+                    start: start.to_used_value(self.containing_size),
+                    end: end.to_used_value(self.containing_size),
+                };
+                let alignment_container = RectAxis {
+                    origin: offsets.start,
+                    length: self.containing_size - offsets.sum(),
+                };
+                (
+                    alignment_container,
+                    containing_block_writing_mode,
+                    false,
+                    Some(offsets),
+                )
+            },
+            // If a single offset is auto, for alignment purposes it resolves to the amount
+            // that makes the inset-modified containing block be exactly as big as the abspos.
+            // Therefore the free space is zero and the alignment value is irrelevant.
+            (Some(start), None) => return start.to_used_value(self.containing_size),
+            (None, Some(end)) => {
+                return self.containing_size - size - end.to_used_value(self.containing_size);
+            },
+        };
+
+        assert_eq!(
+            self_writing_mode.is_horizontal(),
+            original_parent_writing_mode.is_horizontal(),
+            "Mixed horizontal and vertical writing modes are not supported yet"
+        );
+        assert_eq!(
+            self_writing_mode.is_horizontal(),
+            containing_block_writing_mode.is_horizontal(),
+            "Mixed horizontal and vertical writing modes are not supported yet"
+        );
+        let self_value_matches_container = || {
+            self.axis == Direction::Block ||
+                self_writing_mode.is_bidi_ltr() == alignment_container_writing_mode.is_bidi_ltr()
+        };
+
+        // Here we resolve the alignment to either start, center, or end.
+        // Note we need to handle both self-alignment values (when some inset isn't auto)
+        // and distributed alignment values (when both insets are auto).
+        // The latter are treated as their fallback alignment.
+        let alignment = match self.alignment.value() {
+            // https://drafts.csswg.org/css-align/#valdef-self-position-center
+            // https://drafts.csswg.org/css-align/#valdef-align-content-space-around
+            // https://drafts.csswg.org/css-align/#valdef-align-content-space-evenly
+            AlignFlags::CENTER | AlignFlags::SPACE_AROUND | AlignFlags::SPACE_EVENLY => {
+                AlignFlags::CENTER
+            },
+            // https://drafts.csswg.org/css-align/#valdef-self-position-self-start
+            AlignFlags::SELF_START if self_value_matches_container() => AlignFlags::START,
+            AlignFlags::SELF_START => AlignFlags::END,
+            // https://drafts.csswg.org/css-align/#valdef-self-position-self-end
+            AlignFlags::SELF_END if self_value_matches_container() => AlignFlags::END,
+            AlignFlags::SELF_END => AlignFlags::START,
+            // https://drafts.csswg.org/css-align/#valdef-justify-content-left
+            AlignFlags::LEFT if alignment_container_writing_mode.is_bidi_ltr() => AlignFlags::START,
+            AlignFlags::LEFT => AlignFlags::END,
+            // https://drafts.csswg.org/css-align/#valdef-justify-content-right
+            AlignFlags::RIGHT if alignment_container_writing_mode.is_bidi_ltr() => AlignFlags::END,
+            AlignFlags::RIGHT => AlignFlags::START,
+            // https://drafts.csswg.org/css-align/#valdef-self-position-end
+            // https://drafts.csswg.org/css-align/#valdef-self-position-flex-end
+            AlignFlags::END | AlignFlags::FLEX_END => AlignFlags::END,
+            // https://drafts.csswg.org/css-align/#valdef-self-position-start
+            // https://drafts.csswg.org/css-align/#valdef-self-position-flex-start
+            _ => AlignFlags::START,
+        };
+
+        let alignment = match alignment {
+            AlignFlags::START if flip_anchor => AlignFlags::END,
+            AlignFlags::END if flip_anchor => AlignFlags::START,
+            alignment => alignment,
+        };
+
+        let free_space = alignment_container.length - size;
+        let flags = self.alignment.flags();
+        let alignment = if flags == AlignFlags::SAFE && free_space < Au::zero() {
+            AlignFlags::START
+        } else {
+            alignment
+        };
+
+        let origin = match alignment {
+            AlignFlags::START => alignment_container.origin,
+            AlignFlags::CENTER => alignment_container.origin + free_space / 2,
+            AlignFlags::END => alignment_container.origin + free_space,
+            _ => unreachable!(),
+        };
+        if matches!(flags, AlignFlags::SAFE | AlignFlags::UNSAFE) ||
+            matches!(
+                self.alignment,
+                AlignFlags::NORMAL | AlignFlags::AUTO | AlignFlags::STRETCH
+            )
+        {
+            return origin;
+        }
+        let Some(offsets) = offsets else {
+            return origin;
+        };
+
+        // Handle default overflow alignment.
+        // https://drafts.csswg.org/css-align/#auto-safety-position
+        let min = Au::zero().min(offsets.start);
+        let max = self.containing_size - Au::zero().min(offsets.end) - size;
+        origin.clamp_between_extremums(min, Some(max))
+    }
+}
+
+/// <https://drafts.csswg.org/css2/visuren.html#relative-positioning>
+pub(crate) fn relative_adjustement(
+    style: &ComputedValues,
+    containing_block: &ContainingBlock,
+) -> LogicalVec2<Au> {
+    // It's not completely clear what to do with indefinite percentages
+    // (https://github.com/w3c/csswg-drafts/issues/9353), so we match
+    // other browsers and treat them as 'auto' offsets.
+    let cbis = containing_block.size.inline;
+    let cbbs = containing_block.size.block;
+    let box_offsets = style
+        .box_offsets(containing_block.style.writing_mode)
+        .map_inline_and_block_axes(
+            |value| value.map(|value| value.to_used_value(cbis)),
+            |value| match cbbs {
+                SizeConstraint::Definite(cbbs) => value.map(|value| value.to_used_value(cbbs)),
+                _ => match value.non_auto().and_then(|value| value.to_length()) {
+                    Some(value) => AuOrAuto::LengthPercentage(value.into()),
+                    None => AuOrAuto::Auto,
+                },
+            },
+        );
+    fn adjust(start: AuOrAuto, end: AuOrAuto) -> Au {
+        match (start, end) {
+            (AuOrAuto::Auto, AuOrAuto::Auto) => Au::zero(),
+            (AuOrAuto::Auto, AuOrAuto::LengthPercentage(end)) => -end,
+            (AuOrAuto::LengthPercentage(start), _) => start,
+        }
+    }
+    LogicalVec2 {
+        inline: adjust(box_offsets.inline_start, box_offsets.inline_end),
+        block: adjust(box_offsets.block_start, box_offsets.block_end),
+    }
+}
diff --git a/components/layout/query.rs b/components/layout/query.rs
new file mode 100644
index 00000000000..ca9db9ceaf1
--- /dev/null
+++ b/components/layout/query.rs
@@ -0,0 +1,1101 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! Utilities for querying the layout, as needed by layout.
+use std::sync::Arc;
+
+use app_units::Au;
+use euclid::default::{Point2D, Rect};
+use euclid::{SideOffsets2D, Size2D};
+use itertools::Itertools;
+use script::layout_dom::ServoLayoutNode;
+use script_layout_interface::wrapper_traits::{
+    LayoutNode, ThreadSafeLayoutElement, ThreadSafeLayoutNode,
+};
+use script_layout_interface::{LayoutElementType, LayoutNodeType, OffsetParentResponse};
+use servo_arc::Arc as ServoArc;
+use servo_url::ServoUrl;
+use style::computed_values::display::T as Display;
+use style::computed_values::position::T as Position;
+use style::computed_values::visibility::T as Visibility;
+use style::computed_values::white_space_collapse::T as WhiteSpaceCollapseValue;
+use style::context::{QuirksMode, SharedStyleContext, StyleContext, ThreadLocalStyleContext};
+use style::dom::{NodeInfo, OpaqueNode, TElement, TNode};
+use style::properties::style_structs::Font;
+use style::properties::{
+    ComputedValues, Importance, LonghandId, PropertyDeclarationBlock, PropertyDeclarationId,
+    PropertyId, ShorthandId, SourcePropertyDeclaration, parse_one_declaration_into,
+};
+use style::selector_parser::PseudoElement;
+use style::shared_lock::SharedRwLock;
+use style::stylesheets::{CssRuleType, Origin, UrlExtraData};
+use style::stylist::RuleInclusion;
+use style::traversal::resolve_style;
+use style::values::computed::{Float, Size};
+use style::values::generics::font::LineHeight;
+use style::values::generics::position::AspectRatio;
+use style::values::specified::GenericGridTemplateComponent;
+use style::values::specified::box_::DisplayInside;
+use style_traits::{ParsingMode, ToCss};
+
+use crate::ArcRefCell;
+use crate::dom::NodeExt;
+use crate::flow::inline::construct::{TextTransformation, WhitespaceCollapse};
+use crate::fragment_tree::{
+    BoxFragment, Fragment, FragmentFlags, FragmentTree, SpecificLayoutInfo,
+};
+use crate::taffy::SpecificTaffyGridInfo;
+
+pub fn process_content_box_request(node: ServoLayoutNode<'_>) -> Option<Rect<Au>> {
+    let rects: Vec<_> = node
+        .fragments_for_pseudo(None)
+        .iter()
+        .filter_map(Fragment::cumulative_border_box_rect)
+        .collect();
+    if rects.is_empty() {
+        return None;
+    }
+
+    Some(rects.iter().fold(Rect::zero(), |unioned_rect, rect| {
+        rect.to_untyped().union(&unioned_rect)
+    }))
+}
+
+pub fn process_content_boxes_request(node: ServoLayoutNode<'_>) -> Vec<Rect<Au>> {
+    node.fragments_for_pseudo(None)
+        .iter()
+        .filter_map(Fragment::cumulative_border_box_rect)
+        .map(|rect| rect.to_untyped())
+        .collect()
+}
+
+pub fn process_client_rect_request(node: ServoLayoutNode<'_>) -> Rect<i32> {
+    node.fragments_for_pseudo(None)
+        .first()
+        .map(Fragment::client_rect)
+        .unwrap_or_default()
+}
+
+/// <https://drafts.csswg.org/cssom-view/#scrolling-area>
+pub fn process_node_scroll_area_request(
+    requested_node: Option<ServoLayoutNode<'_>>,
+    fragment_tree: Option<Arc<FragmentTree>>,
+) -> Rect<i32> {
+    let Some(tree) = fragment_tree else {
+        return Rect::zero();
+    };
+
+    let rect = match requested_node {
+        Some(node) => node
+            .fragments_for_pseudo(None)
+            .first()
+            .map(Fragment::scrolling_area)
+            .unwrap_or_default(),
+        None => tree.get_scrolling_area_for_viewport(),
+    };
+
+    Rect::new(
+        Point2D::new(rect.origin.x.to_f32_px(), rect.origin.y.to_f32_px()),
+        Size2D::new(rect.size.width.to_f32_px(), rect.size.height.to_f32_px()),
+    )
+    .round()
+    .to_i32()
+    .to_untyped()
+}
+
+/// Return the resolved value of property for a given (pseudo)element.
+/// <https://drafts.csswg.org/cssom/#resolved-value>
+pub fn process_resolved_style_request(
+    context: &SharedStyleContext,
+    node: ServoLayoutNode<'_>,
+    pseudo: &Option<PseudoElement>,
+    property: &PropertyId,
+) -> String {
+    if !node.as_element().unwrap().has_data() {
+        return process_resolved_style_request_for_unstyled_node(context, node, pseudo, property);
+    }
+
+    // We call process_resolved_style_request after performing a whole-document
+    // traversal, so in the common case, the element is styled.
+    let layout_element = node.to_threadsafe().as_element().unwrap();
+    let layout_element = match pseudo {
+        Some(pseudo_element_type) => {
+            match layout_element.with_pseudo(*pseudo_element_type) {
+                Some(layout_element) => layout_element,
+                None => {
+                    // The pseudo doesn't exist, return nothing.  Chrome seems to query
+                    // the element itself in this case, Firefox uses the resolved value.
+                    // https://www.w3.org/Bugs/Public/show_bug.cgi?id=29006
+                    return String::new();
+                },
+            }
+        },
+        None => layout_element,
+    };
+
+    let style = &*layout_element.style(context);
+    let longhand_id = match *property {
+        PropertyId::NonCustom(id) => match id.longhand_or_shorthand() {
+            Ok(longhand_id) => longhand_id,
+            Err(shorthand_id) => return shorthand_to_css_string(shorthand_id, style),
+        },
+        PropertyId::Custom(ref name) => {
+            return style.computed_value_to_string(PropertyDeclarationId::Custom(name));
+        },
+    }
+    .to_physical(style.writing_mode);
+
+    let computed_style = |fragment: Option<&Fragment>| match longhand_id {
+        LonghandId::MinWidth
+            if style.clone_min_width() == Size::Auto &&
+                !should_honor_min_size_auto(fragment, style) =>
+        {
+            String::from("0px")
+        },
+        LonghandId::MinHeight
+            if style.clone_min_height() == Size::Auto &&
+                !should_honor_min_size_auto(fragment, style) =>
+        {
+            String::from("0px")
+        },
+        _ => style.computed_value_to_string(PropertyDeclarationId::Longhand(longhand_id)),
+    };
+
+    // https://drafts.csswg.org/cssom/#dom-window-getcomputedstyle
+    // Here we are trying to conform to the specification that says that getComputedStyle
+    // should return the used values in certain circumstances. For size and positional
+    // properties we might need to walk the Fragment tree to figure those out. We always
+    // fall back to returning the computed value.
+
+    // For line height, the resolved value is the computed value if it
+    // is "normal" and the used value otherwise.
+    if longhand_id == LonghandId::LineHeight {
+        let font = style.get_font();
+        let font_size = font.font_size.computed_size();
+        return match font.line_height {
+            // There could be a fragment, but it's only interesting for `min-width` and `min-height`,
+            // so just pass None.
+            LineHeight::Normal => computed_style(None),
+            LineHeight::Number(value) => (font_size * value.0).to_css_string(),
+            LineHeight::Length(value) => value.0.to_css_string(),
+        };
+    }
+
+    // https://drafts.csswg.org/cssom/#dom-window-getcomputedstyle
+    // The properties that we calculate below all resolve to the computed value
+    // when the element is display:none or display:contents.
+    let display = style.get_box().display;
+    if display.is_none() || display.is_contents() {
+        return computed_style(None);
+    }
+
+    let resolve_for_fragment = |fragment: &Fragment| {
+        let (content_rect, margins, padding, specific_layout_info) = match fragment {
+            Fragment::Box(box_fragment) | Fragment::Float(box_fragment) => {
+                let box_fragment = box_fragment.borrow();
+                if style.get_box().position != Position::Static {
+                    let resolved_insets = || box_fragment.calculate_resolved_insets_if_positioned();
+                    match longhand_id {
+                        LonghandId::Top => return resolved_insets().top.to_css_string(),
+                        LonghandId::Right => {
+                            return resolved_insets().right.to_css_string();
+                        },
+                        LonghandId::Bottom => {
+                            return resolved_insets().bottom.to_css_string();
+                        },
+                        LonghandId::Left => {
+                            return resolved_insets().left.to_css_string();
+                        },
+                        _ => {},
+                    }
+                }
+                let content_rect = box_fragment.content_rect;
+                let margins = box_fragment.margin;
+                let padding = box_fragment.padding;
+                let specific_layout_info = box_fragment.specific_layout_info.clone();
+                (content_rect, margins, padding, specific_layout_info)
+            },
+            Fragment::Positioning(positioning_fragment) => {
+                let content_rect = positioning_fragment.borrow().rect;
+                (
+                    content_rect,
+                    SideOffsets2D::zero(),
+                    SideOffsets2D::zero(),
+                    None,
+                )
+            },
+            _ => return computed_style(Some(fragment)),
+        };
+
+        // https://drafts.csswg.org/css-grid/#resolved-track-list
+        // > The grid-template-rows and grid-template-columns properties are
+        // > resolved value special case properties.
+        //
+        // > When an element generates a grid container box...
+        if display.inside() == DisplayInside::Grid {
+            if let Some(SpecificLayoutInfo::Grid(info)) = specific_layout_info {
+                if let Some(value) = resolve_grid_template(&info, style, longhand_id) {
+                    return value;
+                }
+            }
+        }
+
+        // https://drafts.csswg.org/cssom/#resolved-value-special-case-property-like-height
+        // > If the property applies to the element or pseudo-element and the resolved value of the
+        // > display property is not none or contents, then the resolved value is the used value.
+        // > Otherwise the resolved value is the computed value.
+        //
+        // However, all browsers ignore that for margin and padding properties, and resolve to a length
+        // even if the property doesn't apply: https://github.com/w3c/csswg-drafts/issues/10391
+        match longhand_id {
+            LonghandId::Width if resolved_size_should_be_used_value(fragment) => {
+                content_rect.size.width
+            },
+            LonghandId::Height if resolved_size_should_be_used_value(fragment) => {
+                content_rect.size.height
+            },
+            LonghandId::MarginBottom => margins.bottom,
+            LonghandId::MarginTop => margins.top,
+            LonghandId::MarginLeft => margins.left,
+            LonghandId::MarginRight => margins.right,
+            LonghandId::PaddingBottom => padding.bottom,
+            LonghandId::PaddingTop => padding.top,
+            LonghandId::PaddingLeft => padding.left,
+            LonghandId::PaddingRight => padding.right,
+            _ => return computed_style(Some(fragment)),
+        }
+        .to_css_string()
+    };
+
+    node.fragments_for_pseudo(*pseudo)
+        .first()
+        .map(resolve_for_fragment)
+        .unwrap_or_else(|| computed_style(None))
+}
+
+fn resolved_size_should_be_used_value(fragment: &Fragment) -> bool {
+    // https://drafts.csswg.org/css-sizing-3/#preferred-size-properties
+    // > Applies to: all elements except non-replaced inlines
+    match fragment {
+        Fragment::Box(box_fragment) => !box_fragment.borrow().is_inline_box(),
+        Fragment::Float(_) |
+        Fragment::Positioning(_) |
+        Fragment::AbsoluteOrFixedPositioned(_) |
+        Fragment::Image(_) |
+        Fragment::IFrame(_) => true,
+        Fragment::Text(_) => false,
+    }
+}
+
+fn should_honor_min_size_auto(fragment: Option<&Fragment>, style: &ComputedValues) -> bool {
+    // <https://drafts.csswg.org/css-sizing-3/#automatic-minimum-size>
+    // For backwards-compatibility, the resolved value of an automatic minimum size is zero
+    // for boxes of all CSS2 display types: block and inline boxes, inline blocks, and all
+    // the table layout boxes. It also resolves to zero when no box is generated.
+    //
+    // <https://github.com/w3c/csswg-drafts/issues/11716>
+    // However, when a box is generated and `aspect-ratio` isn't `auto`, we need to preserve
+    // the automatic minimum size as `auto`.
+    let Some(Fragment::Box(box_fragment)) = fragment else {
+        return false;
+    };
+    let flags = box_fragment.borrow().base.flags;
+    flags.contains(FragmentFlags::IS_FLEX_OR_GRID_ITEM) ||
+        style.clone_aspect_ratio() != AspectRatio::auto()
+}
+
+fn resolve_grid_template(
+    grid_info: &SpecificTaffyGridInfo,
+    style: &ComputedValues,
+    longhand_id: LonghandId,
+) -> Option<String> {
+    // https://drafts.csswg.org/css-grid/#resolved-track-list-standalone
+    fn serialize_standalone_non_subgrid_track_list(track_sizes: &[Au]) -> Option<String> {
+        match track_sizes.is_empty() {
+            // Standalone non subgrid grids with empty track lists should compute to `none`.
+            // As of current standard, this behaviour should only invoked by `none` computed value,
+            // therefore we can fallback into computed value resolving.
+            true => None,
+            // <https://drafts.csswg.org/css-grid/#resolved-track-list-standalone>
+            // > - Every track listed individually, whether implicitly or explicitly created,
+            //     without using the repeat() notation.
+            // > - Every track size given as a length in pixels, regardless of sizing function.
+            // > - Adjacent line names collapsed into a single bracketed set.
+            // TODO: implement line names
+            false => Some(
+                track_sizes
+                    .iter()
+                    .map(|size| size.to_css_string())
+                    .join(" "),
+            ),
+        }
+    }
+
+    let (track_info, computed_value) = match longhand_id {
+        LonghandId::GridTemplateRows => (&grid_info.rows, &style.get_position().grid_template_rows),
+        LonghandId::GridTemplateColumns => (
+            &grid_info.columns,
+            &style.get_position().grid_template_columns,
+        ),
+        _ => return None,
+    };
+
+    match computed_value {
+        // <https://drafts.csswg.org/css-grid/#resolved-track-list-standalone>
+        // > When an element generates a grid container box, the resolved value of its grid-template-rows or
+        // > grid-template-columns property in a standalone axis is the used value, serialized with:
+        GenericGridTemplateComponent::None |
+        GenericGridTemplateComponent::TrackList(_) |
+        GenericGridTemplateComponent::Masonry => {
+            serialize_standalone_non_subgrid_track_list(&track_info.sizes)
+        },
+
+        // <https://drafts.csswg.org/css-grid/#resolved-track-list-subgrid>
+        // > When an element generates a grid container box that is a subgrid, the resolved value of the
+        // > grid-template-rows and grid-template-columns properties represents the used number of columns,
+        // > serialized as the subgrid keyword followed by a list representing each of its lines as a
+        // > line name set of all the line’s names explicitly defined on the subgrid (not including those
+        // > adopted from the parent grid), without using the repeat() notation.
+        // TODO: implement subgrid
+        GenericGridTemplateComponent::Subgrid(_) => None,
+    }
+}
+
+pub fn process_resolved_style_request_for_unstyled_node(
+    context: &SharedStyleContext,
+    node: ServoLayoutNode<'_>,
+    pseudo: &Option<PseudoElement>,
+    property: &PropertyId,
+) -> String {
+    // In a display: none subtree. No pseudo-element exists.
+    if pseudo.is_some() {
+        return String::new();
+    }
+
+    let mut tlc = ThreadLocalStyleContext::new();
+    let mut context = StyleContext {
+        shared: context,
+        thread_local: &mut tlc,
+    };
+
+    let element = node.as_element().unwrap();
+    let styles = resolve_style(
+        &mut context,
+        element,
+        RuleInclusion::All,
+        pseudo.as_ref(),
+        None,
+    );
+    let style = styles.primary();
+    let longhand_id = match *property {
+        PropertyId::NonCustom(id) => match id.longhand_or_shorthand() {
+            Ok(longhand_id) => longhand_id,
+            Err(shorthand_id) => return shorthand_to_css_string(shorthand_id, style),
+        },
+        PropertyId::Custom(ref name) => {
+            return style.computed_value_to_string(PropertyDeclarationId::Custom(name));
+        },
+    };
+
+    match longhand_id {
+        // <https://drafts.csswg.org/css-sizing-3/#automatic-minimum-size>
+        // The resolved value of an automatic minimum size is zero when no box is generated.
+        LonghandId::MinWidth if style.clone_min_width() == Size::Auto => String::from("0px"),
+        LonghandId::MinHeight if style.clone_min_height() == Size::Auto => String::from("0px"),
+
+        // No need to care about used values here, since we're on a display: none
+        // subtree, use the computed value.
+        _ => style.computed_value_to_string(PropertyDeclarationId::Longhand(longhand_id)),
+    }
+}
+
+fn shorthand_to_css_string(
+    id: style::properties::ShorthandId,
+    style: &style::properties::ComputedValues,
+) -> String {
+    use style::values::resolved::Context;
+    let mut block = PropertyDeclarationBlock::new();
+    let mut dest = String::new();
+    for longhand in id.longhands() {
+        block.push(
+            style.computed_or_resolved_declaration(longhand, Some(&Context { style })),
+            Importance::Normal,
+        );
+    }
+    match block.shorthand_to_css(id, &mut dest) {
+        Ok(_) => dest.to_owned(),
+        Err(_) => String::new(),
+    }
+}
+
+struct OffsetParentFragments {
+    parent: ArcRefCell<BoxFragment>,
+    grandparent: Option<Fragment>,
+}
+
+/// <https://www.w3.org/TR/2016/WD-cssom-view-1-20160317/#dom-htmlelement-offsetparent>
+fn offset_parent_fragments(node: ServoLayoutNode<'_>) -> Option<OffsetParentFragments> {
+    // 1. If any of the following holds true return null and terminate this algorithm:
+    //  * The element does not have an associated CSS layout box.
+    //  * The element is the root element.
+    //  * The element is the HTML body element.
+    //  * The element’s computed value of the position property is fixed.
+    let fragment = node.fragments_for_pseudo(None).first().cloned()?;
+    let flags = fragment.base()?.flags;
+    if flags.intersects(
+        FragmentFlags::IS_ROOT_ELEMENT | FragmentFlags::IS_BODY_ELEMENT_OF_HTML_ELEMENT_ROOT,
+    ) {
+        return None;
+    }
+    if matches!(
+        fragment, Fragment::Box(fragment) if fragment.borrow().style.get_box().position == Position::Fixed
+    ) {
+        return None;
+    }
+
+    // 2.  Return the nearest ancestor element of the element for which at least one of
+    //     the following is true and terminate this algorithm if such an ancestor is found:
+    //  * The computed value of the position property is not static.
+    //  * It is the HTML body element.
+    //  * The computed value of the position property of the element is static and the
+    //    ancestor is one of the following HTML elements: td, th, or table.
+    let mut maybe_parent_node = node.parent_node();
+    while let Some(parent_node) = maybe_parent_node {
+        maybe_parent_node = parent_node.parent_node();
+
+        if let Some(parent_fragment) = parent_node.fragments_for_pseudo(None).first() {
+            let parent_fragment = match parent_fragment {
+                Fragment::Box(box_fragment) | Fragment::Float(box_fragment) => box_fragment,
+                _ => continue,
+            };
+
+            let grandparent_fragment =
+                maybe_parent_node.and_then(|node| node.fragments_for_pseudo(None).first().cloned());
+
+            if parent_fragment.borrow().style.get_box().position != Position::Static {
+                return Some(OffsetParentFragments {
+                    parent: parent_fragment.clone(),
+                    grandparent: grandparent_fragment,
+                });
+            }
+
+            let flags = parent_fragment.borrow().base.flags;
+            if flags.intersects(
+                FragmentFlags::IS_BODY_ELEMENT_OF_HTML_ELEMENT_ROOT |
+                    FragmentFlags::IS_TABLE_TH_OR_TD_ELEMENT,
+            ) {
+                return Some(OffsetParentFragments {
+                    parent: parent_fragment.clone(),
+                    grandparent: grandparent_fragment,
+                });
+            }
+        }
+    }
+
+    None
+}
+
+#[inline]
+pub fn process_offset_parent_query(node: ServoLayoutNode<'_>) -> Option<OffsetParentResponse> {
+    // Only consider the first fragment of the node found as per a
+    // possible interpretation of the specification: "[...] return the
+    // y-coordinate of the top border edge of the first CSS layout box
+    // associated with the element [...]"
+    //
+    // FIXME: Browsers implement this all differently (e.g., [1]) -
+    // Firefox does returns the union of all layout elements of some
+    // sort. Chrome returns the first fragment for a block element (the
+    // same as ours) or the union of all associated fragments in the
+    // first containing block fragment for an inline element. We could
+    // implement Chrome's behavior, but our fragment tree currently
+    // provides insufficient information.
+    //
+    // [1]: https://github.com/w3c/csswg-drafts/issues/4541
+    // > 1. If the element is the HTML body element or does not have any associated CSS
+    //      layout box return zero and terminate this algorithm.
+    let fragment = node.fragments_for_pseudo(None).first().cloned()?;
+    let mut border_box = fragment.cumulative_border_box_rect()?;
+
+    // 2.  If the offsetParent of the element is null return the x-coordinate of the left
+    //     border edge of the first CSS layout box associated with the element, relative to
+    //     the initial containing block origin, ignoring any transforms that apply to the
+    //     element and its ancestors, and terminate this algorithm.
+    let Some(offset_parent_fragment) = offset_parent_fragments(node) else {
+        return Some(OffsetParentResponse {
+            node_address: None,
+            rect: border_box.to_untyped(),
+        });
+    };
+
+    let parent_fragment = offset_parent_fragment.parent.borrow();
+    let parent_is_static_body_element = parent_fragment
+        .base
+        .flags
+        .contains(FragmentFlags::IS_BODY_ELEMENT_OF_HTML_ELEMENT_ROOT) &&
+        parent_fragment.style.get_box().position == Position::Static;
+
+    // For `offsetLeft`:
+    // 3. Return the result of subtracting the y-coordinate of the top padding edge of the
+    //    first CSS layout box associated with the offsetParent of the element from the
+    //    y-coordinate of the top border edge of the first CSS layout box associated with the
+    //    element, relative to the initial containing block origin, ignoring any transforms
+    //    that apply to the element and its ancestors.
+    //
+    // We generalize this for `offsetRight` as described in the specification.
+    let grandparent_box_fragment = || match offset_parent_fragment.grandparent {
+        Some(Fragment::Box(box_fragment)) | Some(Fragment::Float(box_fragment)) => {
+            Some(box_fragment)
+        },
+        _ => None,
+    };
+
+    // The spec (https://www.w3.org/TR/cssom-view-1/#extensions-to-the-htmlelement-interface)
+    // says that offsetTop/offsetLeft are always relative to the padding box of the offsetParent.
+    // However, in practice this is not true in major browsers in the case that the offsetParent is the body
+    // element and the body element is position:static. In that case offsetLeft/offsetTop are computed
+    // relative to the root node's border box.
+    //
+    // See <https://github.com/w3c/csswg-drafts/issues/10549>.
+    let parent_offset_rect = if parent_is_static_body_element {
+        if let Some(grandparent_fragment) = grandparent_box_fragment() {
+            let grandparent_fragment = grandparent_fragment.borrow();
+            grandparent_fragment.offset_by_containing_block(&grandparent_fragment.border_rect())
+        } else {
+            parent_fragment.offset_by_containing_block(&parent_fragment.padding_rect())
+        }
+    } else {
+        parent_fragment.offset_by_containing_block(&parent_fragment.padding_rect())
+    };
+
+    border_box = border_box.translate(-parent_offset_rect.origin.to_vector());
+
+    Some(OffsetParentResponse {
+        node_address: parent_fragment.base.tag.map(|tag| tag.node.into()),
+        rect: border_box.to_untyped(),
+    })
+}
+
+/// <https://html.spec.whatwg.org/multipage/#get-the-text-steps>
+pub fn get_the_text_steps(node: ServoLayoutNode<'_>) -> String {
+    // Step 1: If element is not being rendered or if the user agent is a non-CSS user agent, then
+    // return element's descendant text content.
+    // This is taken care of in HTMLElemnent code
+
+    // Step 2: Let results be a new empty list.
+    let mut results = Vec::new();
+    let mut max_req_line_break_count = 0;
+
+    // Step 3: For each child node node of element:
+    let mut state = Default::default();
+    for child in node.dom_children() {
+        // Step 1: Let current be the list resulting in running the rendered text collection steps with node.
+        let mut current = rendered_text_collection_steps(child, &mut state);
+        // Step 2: For each item item in current, append item to results.
+        results.append(&mut current);
+    }
+
+    let mut output = Vec::new();
+    for item in results {
+        match item {
+            InnerOrOuterTextItem::Text(s) => {
+                // Step 3.
+                if !s.is_empty() {
+                    if max_req_line_break_count > 0 {
+                        // Step 5.
+                        output.push("\u{000A}".repeat(max_req_line_break_count));
+                        max_req_line_break_count = 0;
+                    }
+                    output.push(s);
+                }
+            },
+            InnerOrOuterTextItem::RequiredLineBreakCount(count) => {
+                // Step 4.
+                if output.is_empty() {
+                    // Remove required line break count at the start.
+                    continue;
+                }
+                // Store the count if it's the max of this run, but it may be ignored if no text
+                // item is found afterwards, which means that these are consecutive line breaks at
+                // the end.
+                if count > max_req_line_break_count {
+                    max_req_line_break_count = count;
+                }
+            },
+        }
+    }
+    output.into_iter().collect()
+}
+
+enum InnerOrOuterTextItem {
+    Text(String),
+    RequiredLineBreakCount(usize),
+}
+
+#[derive(Clone)]
+struct RenderedTextCollectionState {
+    /// Used to make sure we don't add a `\n` before the first row
+    first_table_row: bool,
+    /// Used to make sure we don't add a `\t` before the first column
+    first_table_cell: bool,
+    /// Keeps track of whether we're inside a table, since there are special rules like ommiting everything that's not
+    /// inside a TableCell/TableCaption
+    within_table: bool,
+    /// Determines whether we truncate leading whitespaces for normal nodes or not
+    may_start_with_whitespace: bool,
+    /// Is set whenever we truncated a white space char, used to prepend a single space before the next element,
+    /// that way we truncate trailing white space without having to look ahead
+    did_truncate_trailing_white_space: bool,
+    /// Is set to true when we're rendering the children of TableCell/TableCaption elements, that way we render
+    /// everything inside those as normal, while omitting everything that's in a Table but NOT in a Cell/Caption
+    within_table_content: bool,
+}
+
+impl Default for RenderedTextCollectionState {
+    fn default() -> Self {
+        RenderedTextCollectionState {
+            first_table_row: true,
+            first_table_cell: true,
+            may_start_with_whitespace: true,
+            did_truncate_trailing_white_space: false,
+            within_table: false,
+            within_table_content: false,
+        }
+    }
+}
+
+/// <https://html.spec.whatwg.org/multipage/#rendered-text-collection-steps>
+fn rendered_text_collection_steps(
+    node: ServoLayoutNode<'_>,
+    state: &mut RenderedTextCollectionState,
+) -> Vec<InnerOrOuterTextItem> {
+    // Step 1. Let items be the result of running the rendered text collection
+    // steps with each child node of node in tree order,
+    // and then concatenating the results to a single list.
+    let mut items = vec![];
+    if !node.is_connected() || !(node.is_element() || node.is_text_node()) {
+        return items;
+    }
+
+    match node.type_id() {
+        LayoutNodeType::Text => {
+            if let Some(element) = node.parent_node() {
+                match element.type_id() {
+                    // Any text contained in these elements must be ignored.
+                    LayoutNodeType::Element(LayoutElementType::HTMLCanvasElement) |
+                    LayoutNodeType::Element(LayoutElementType::HTMLImageElement) |
+                    LayoutNodeType::Element(LayoutElementType::HTMLIFrameElement) |
+                    LayoutNodeType::Element(LayoutElementType::HTMLObjectElement) |
+                    LayoutNodeType::Element(LayoutElementType::HTMLInputElement) |
+                    LayoutNodeType::Element(LayoutElementType::HTMLTextAreaElement) |
+                    LayoutNodeType::Element(LayoutElementType::HTMLMediaElement) => {
+                        return items;
+                    },
+                    // Select/Option/OptGroup elements are handled a bit differently.
+                    // Basically: a Select can only contain Options or OptGroups, while
+                    // OptGroups may also contain Options. Everything else gets ignored.
+                    LayoutNodeType::Element(LayoutElementType::HTMLOptGroupElement) => {
+                        if let Some(element) = element.parent_node() {
+                            if !matches!(
+                                element.type_id(),
+                                LayoutNodeType::Element(LayoutElementType::HTMLSelectElement)
+                            ) {
+                                return items;
+                            }
+                        } else {
+                            return items;
+                        }
+                    },
+                    LayoutNodeType::Element(LayoutElementType::HTMLSelectElement) => return items,
+                    _ => {},
+                }
+
+                // Tables are also a bit special, mainly by only allowing
+                // content within TableCell or TableCaption elements once
+                // we're inside a Table.
+                if state.within_table && !state.within_table_content {
+                    return items;
+                }
+
+                let Some(style_data) = element.style_data() else {
+                    return items;
+                };
+
+                let element_data = style_data.element_data.borrow();
+                let Some(style) = element_data.styles.get_primary() else {
+                    return items;
+                };
+
+                // Step 2: If node's computed value of 'visibility' is not 'visible', then return items.
+                //
+                // We need to do this check here on the Text fragment, if we did it on the element and
+                // just skipped rendering all child nodes then there'd be no way to override the
+                // visibility in a child node.
+                if style.get_inherited_box().visibility != Visibility::Visible {
+                    return items;
+                }
+
+                // Step 3: If node is not being rendered, then return items. For the purpose of this step,
+                // the following elements must act as described if the computed value of the 'display'
+                // property is not 'none':
+                let display = style.get_box().display;
+                if display == Display::None {
+                    match element.type_id() {
+                        // Even if set to Display::None, Option/OptGroup elements need to
+                        // be rendered.
+                        LayoutNodeType::Element(LayoutElementType::HTMLOptGroupElement) |
+                        LayoutNodeType::Element(LayoutElementType::HTMLOptionElement) => {},
+                        _ => {
+                            return items;
+                        },
+                    }
+                }
+
+                let text_content = node.to_threadsafe().node_text_content();
+
+                let white_space_collapse = style.clone_white_space_collapse();
+                let preserve_whitespace = white_space_collapse == WhiteSpaceCollapseValue::Preserve;
+                let is_inline = matches!(
+                    display,
+                    Display::InlineBlock | Display::InlineFlex | Display::InlineGrid
+                );
+                // Now we need to decide on whether to remove beginning white space or not, this
+                // is mainly decided by the elements we rendered before, but may be overwritten by the white-space
+                // property.
+                let trim_beginning_white_space =
+                    !preserve_whitespace && (state.may_start_with_whitespace || is_inline);
+                let with_white_space_rules_applied = WhitespaceCollapse::new(
+                    text_content.chars(),
+                    white_space_collapse,
+                    trim_beginning_white_space,
+                );
+
+                // Step 4: If node is a Text node, then for each CSS text box produced by node, in
+                // content order, compute the text of the box after application of the CSS
+                // 'white-space' processing rules and 'text-transform' rules, set items to the list
+                // of the resulting strings, and return items. The CSS 'white-space' processing
+                // rules are slightly modified: collapsible spaces at the end of lines are always
+                // collapsed, but they are only removed if the line is the last line of the block,
+                // or it ends with a br element. Soft hyphens should be preserved.
+                let mut transformed_text: String = TextTransformation::new(
+                    with_white_space_rules_applied,
+                    style.clone_text_transform().case(),
+                )
+                .collect();
+
+                let is_preformatted_element =
+                    white_space_collapse == WhiteSpaceCollapseValue::Preserve;
+
+                let is_final_character_whitespace = transformed_text
+                    .chars()
+                    .next_back()
+                    .filter(char::is_ascii_whitespace)
+                    .is_some();
+
+                let is_first_character_whitespace = transformed_text
+                    .chars()
+                    .next()
+                    .filter(char::is_ascii_whitespace)
+                    .is_some();
+
+                // By truncating trailing white space and then adding it back in once we
+                // encounter another text node we can ensure no trailing white space for
+                // normal text without having to look ahead
+                if state.did_truncate_trailing_white_space && !is_first_character_whitespace {
+                    items.push(InnerOrOuterTextItem::Text(String::from(" ")));
+                };
+
+                if !transformed_text.is_empty() {
+                    // Here we decide whether to keep or truncate the final white
+                    // space character, if there is one.
+                    if is_final_character_whitespace && !is_preformatted_element {
+                        state.may_start_with_whitespace = false;
+                        state.did_truncate_trailing_white_space = true;
+                        transformed_text.pop();
+                    } else {
+                        state.may_start_with_whitespace = is_final_character_whitespace;
+                        state.did_truncate_trailing_white_space = false;
+                    }
+                    items.push(InnerOrOuterTextItem::Text(transformed_text));
+                }
+            } else {
+                // If we don't have a parent element then there's no style data available,
+                // in this (pretty unlikely) case we just return the Text fragment as is.
+                items.push(InnerOrOuterTextItem::Text(
+                    node.to_threadsafe().node_text_content().into(),
+                ));
+            }
+        },
+        LayoutNodeType::Element(LayoutElementType::HTMLBRElement) => {
+            // Step 5: If node is a br element, then append a string containing a single U+000A
+            // LF code point to items.
+            state.did_truncate_trailing_white_space = false;
+            state.may_start_with_whitespace = true;
+            items.push(InnerOrOuterTextItem::Text(String::from("\u{000A}")));
+        },
+        _ => {
+            // First we need to gather some infos to setup the various flags
+            // before rendering the child nodes
+            let Some(style_data) = node.style_data() else {
+                return items;
+            };
+
+            let element_data = style_data.element_data.borrow();
+            let Some(style) = element_data.styles.get_primary() else {
+                return items;
+            };
+            let inherited_box = style.get_inherited_box();
+
+            if inherited_box.visibility != Visibility::Visible {
+                // If the element is not visible then we'll immediatly render all children,
+                // skipping all other processing.
+                // We can't just stop here since a child can override a parents visibility.
+                for child in node.dom_children() {
+                    items.append(&mut rendered_text_collection_steps(child, state));
+                }
+                return items;
+            }
+
+            let style_box = style.get_box();
+            let display = style_box.display;
+            let mut surrounding_line_breaks = 0;
+
+            // Treat absolutely positioned or floated elements like Block elements
+            if style_box.position == Position::Absolute || style_box.float != Float::None {
+                surrounding_line_breaks = 1;
+            }
+
+            // Depending on the display property we have to do various things
+            // before we can render the child nodes.
+            match display {
+                Display::Table => {
+                    surrounding_line_breaks = 1;
+                    state.within_table = true;
+                },
+                // Step 6: If node's computed value of 'display' is 'table-cell',
+                // and node's CSS box is not the last 'table-cell' box of its
+                // enclosing 'table-row' box, then append a string containing
+                // a single U+0009 TAB code point to items.
+                Display::TableCell => {
+                    if !state.first_table_cell {
+                        items.push(InnerOrOuterTextItem::Text(String::from(
+                            "\u{0009}", /* tab */
+                        )));
+                        // Make sure we don't add a white-space we removed from the previous node
+                        state.did_truncate_trailing_white_space = false;
+                    }
+                    state.first_table_cell = false;
+                    state.within_table_content = true;
+                },
+                // Step 7: If node's computed value of 'display' is 'table-row',
+                // and node's CSS box is not the last 'table-row' box of the nearest
+                // ancestor 'table' box, then append a string containing a single U+000A
+                // LF code point to items.
+                Display::TableRow => {
+                    if !state.first_table_row {
+                        items.push(InnerOrOuterTextItem::Text(String::from(
+                            "\u{000A}", /* Line Feed */
+                        )));
+                        // Make sure we don't add a white-space we removed from the previous node
+                        state.did_truncate_trailing_white_space = false;
+                    }
+                    state.first_table_row = false;
+                    state.first_table_cell = true;
+                },
+                // Step 9: If node's used value of 'display' is block-level or 'table-caption',
+                // then append 1 (a required line break count) at the beginning and end of items.
+                Display::Block => {
+                    surrounding_line_breaks = 1;
+                },
+                Display::TableCaption => {
+                    surrounding_line_breaks = 1;
+                    state.within_table_content = true;
+                },
+                Display::InlineFlex | Display::InlineGrid | Display::InlineBlock => {
+                    // InlineBlock's are a bit strange, in that they don't produce a Linebreak, yet
+                    // disable white space truncation before and after it, making it one of the few
+                    // cases where one can have multiple white space characters following one another.
+                    if state.did_truncate_trailing_white_space {
+                        items.push(InnerOrOuterTextItem::Text(String::from(" ")));
+                        state.did_truncate_trailing_white_space = false;
+                        state.may_start_with_whitespace = true;
+                    }
+                },
+                _ => {},
+            }
+
+            match node.type_id() {
+                // Step 8: If node is a p element, then append 2 (a required line break count) at
+                // the beginning and end of items.
+                LayoutNodeType::Element(LayoutElementType::HTMLParagraphElement) => {
+                    surrounding_line_breaks = 2;
+                },
+                // Option/OptGroup elements should go on separate lines, by treating them like
+                // Block elements we can achieve that.
+                LayoutNodeType::Element(LayoutElementType::HTMLOptionElement) |
+                LayoutNodeType::Element(LayoutElementType::HTMLOptGroupElement) => {
+                    surrounding_line_breaks = 1;
+                },
+                _ => {},
+            }
+
+            if surrounding_line_breaks > 0 {
+                items.push(InnerOrOuterTextItem::RequiredLineBreakCount(
+                    surrounding_line_breaks,
+                ));
+                state.did_truncate_trailing_white_space = false;
+                state.may_start_with_whitespace = true;
+            }
+
+            match node.type_id() {
+                // Any text/content contained in these elements is ignored.
+                // However we still need to check whether we have to prepend a
+                // space, since for example <span>asd <input> qwe</span> must
+                // product "asd  qwe" (note the 2 spaces)
+                LayoutNodeType::Element(LayoutElementType::HTMLCanvasElement) |
+                LayoutNodeType::Element(LayoutElementType::HTMLImageElement) |
+                LayoutNodeType::Element(LayoutElementType::HTMLIFrameElement) |
+                LayoutNodeType::Element(LayoutElementType::HTMLObjectElement) |
+                LayoutNodeType::Element(LayoutElementType::HTMLInputElement) |
+                LayoutNodeType::Element(LayoutElementType::HTMLTextAreaElement) |
+                LayoutNodeType::Element(LayoutElementType::HTMLMediaElement) => {
+                    if display != Display::Block && state.did_truncate_trailing_white_space {
+                        items.push(InnerOrOuterTextItem::Text(String::from(" ")));
+                        state.did_truncate_trailing_white_space = false;
+                    };
+                    state.may_start_with_whitespace = false;
+                },
+                _ => {
+                    // Now we can finally iterate over all children, appending whatever
+                    // they produce to items.
+                    for child in node.dom_children() {
+                        items.append(&mut rendered_text_collection_steps(child, state));
+                    }
+                },
+            }
+
+            // Depending on the display property we still need to do some
+            // cleanup after rendering all child nodes
+            match display {
+                Display::InlineFlex | Display::InlineGrid | Display::InlineBlock => {
+                    state.did_truncate_trailing_white_space = false;
+                    state.may_start_with_whitespace = false;
+                },
+                Display::Table => {
+                    state.within_table = false;
+                },
+                Display::TableCell | Display::TableCaption => {
+                    state.within_table_content = false;
+                },
+                _ => {},
+            }
+
+            if surrounding_line_breaks > 0 {
+                items.push(InnerOrOuterTextItem::RequiredLineBreakCount(
+                    surrounding_line_breaks,
+                ));
+                state.did_truncate_trailing_white_space = false;
+                state.may_start_with_whitespace = true;
+            }
+        },
+    };
+    items
+}
+
+pub fn process_text_index_request(_node: OpaqueNode, _point: Point2D<Au>) -> Option<usize> {
+    None
+}
+
+pub fn process_resolved_font_style_query<'dom, E>(
+    context: &SharedStyleContext,
+    node: E,
+    value: &str,
+    url_data: ServoUrl,
+    shared_lock: &SharedRwLock,
+) -> Option<ServoArc<Font>>
+where
+    E: LayoutNode<'dom>,
+{
+    fn create_font_declaration(
+        value: &str,
+        url_data: &ServoUrl,
+        quirks_mode: QuirksMode,
+    ) -> Option<PropertyDeclarationBlock> {
+        let mut declarations = SourcePropertyDeclaration::default();
+        let result = parse_one_declaration_into(
+            &mut declarations,
+            PropertyId::NonCustom(ShorthandId::Font.into()),
+            value,
+            Origin::Author,
+            &UrlExtraData(url_data.get_arc()),
+            None,
+            ParsingMode::DEFAULT,
+            quirks_mode,
+            CssRuleType::Style,
+        );
+        let declarations = match result {
+            Ok(()) => {
+                let mut block = PropertyDeclarationBlock::new();
+                block.extend(declarations.drain(), Importance::Normal);
+                block
+            },
+            Err(_) => return None,
+        };
+        // TODO: Force to set line-height property to 'normal' font property.
+        Some(declarations)
+    }
+    fn resolve_for_declarations<'dom, E>(
+        context: &SharedStyleContext,
+        parent_style: Option<&ComputedValues>,
+        declarations: PropertyDeclarationBlock,
+        shared_lock: &SharedRwLock,
+    ) -> ServoArc<ComputedValues>
+    where
+        E: LayoutNode<'dom>,
+    {
+        let parent_style = match parent_style {
+            Some(parent) => parent,
+            None => context.stylist.device().default_computed_values(),
+        };
+        context
+            .stylist
+            .compute_for_declarations::<E::ConcreteElement>(
+                &context.guards,
+                parent_style,
+                ServoArc::new(shared_lock.wrap(declarations)),
+            )
+    }
+
+    // https://html.spec.whatwg.org/multipage/#dom-context-2d-font
+    // 1. Parse the given font property value
+    let quirks_mode = context.quirks_mode();
+    let declarations = create_font_declaration(value, &url_data, quirks_mode)?;
+
+    // TODO: Reject 'inherit' and 'initial' values for the font property.
+
+    // 2. Get resolved styles for the parent element
+    let element = node.as_element().unwrap();
+    let parent_style = if node.is_connected() {
+        if element.has_data() {
+            node.to_threadsafe().as_element().unwrap().style(context)
+        } else {
+            let mut tlc = ThreadLocalStyleContext::new();
+            let mut context = StyleContext {
+                shared: context,
+                thread_local: &mut tlc,
+            };
+            let styles = resolve_style(&mut context, element, RuleInclusion::All, None, None);
+            styles.primary().clone()
+        }
+    } else {
+        let default_declarations =
+            create_font_declaration("10px sans-serif", &url_data, quirks_mode).unwrap();
+        resolve_for_declarations::<E>(context, None, default_declarations, shared_lock)
+    };
+
+    // 3. Resolve the parsed value with resolved styles of the parent element
+    let computed_values =
+        resolve_for_declarations::<E>(context, Some(&*parent_style), declarations, shared_lock);
+
+    Some(computed_values.clone_font())
+}
diff --git a/components/layout_2020/quotes.rs b/components/layout/quotes.rs
similarity index 100%
rename from components/layout_2020/quotes.rs
rename to components/layout/quotes.rs
diff --git a/components/layout_2020/replaced.rs b/components/layout/replaced.rs
similarity index 93%
rename from components/layout_2020/replaced.rs
rename to components/layout/replaced.rs
index f387b47731e..0cc95c1a87d 100644
--- a/components/layout_2020/replaced.rs
+++ b/components/layout/replaced.rs
@@ -3,19 +3,22 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use std::cell::LazyCell;
-use std::fmt;
 use std::sync::Arc;
 
 use app_units::Au;
 use base::id::{BrowsingContextId, PipelineId};
 use data_url::DataUrl;
-use euclid::Size2D;
+use embedder_traits::ViewportDetails;
+use euclid::{Scale, Size2D};
+use malloc_size_of_derive::MallocSizeOf;
 use net_traits::image_cache::{ImageOrMetadataAvailable, UsePlaceholder};
 use pixels::Image;
+use script::layout_dom::ServoLayoutNode;
 use script_layout_interface::IFrameSize;
 use servo_arc::Arc as ServoArc;
 use style::Zero;
 use style::computed_values::object_fit::T as ObjectFit;
+use style::dom::TNode;
 use style::logical_geometry::{Direction, WritingMode};
 use style::properties::ComputedValues;
 use style::servo::url::ComputedUrl;
@@ -36,7 +39,7 @@ use crate::sizing::{ComputeInlineContentSizes, ContentSizes, InlineContentSizesR
 use crate::style_ext::{AspectRatio, Clamp, ComputedValuesExt, ContentBoxSizesAndPBM, LayoutStyle};
 use crate::{ConstraintSpace, ContainingBlock, SizeConstraint};
 
-#[derive(Debug)]
+#[derive(Debug, MallocSizeOf)]
 pub(crate) struct ReplacedContents {
     pub kind: ReplacedContentKind,
     natural_size: NaturalSizes,
@@ -60,7 +63,7 @@ pub(crate) struct ReplacedContents {
 ///
 /// * IFrames do not have natural width and height or natural ratio according
 ///   to <https://drafts.csswg.org/css-images/#intrinsic-dimensions>.
-#[derive(Debug)]
+#[derive(Debug, MallocSizeOf)]
 pub(crate) struct NaturalSizes {
     pub width: Option<Au>,
     pub height: Option<Au>,
@@ -94,55 +97,32 @@ impl NaturalSizes {
     }
 }
 
-pub(crate) enum CanvasSource {
-    WebGL(ImageKey),
-    Image(ImageKey),
-    WebGPU(ImageKey),
-    /// transparent black
-    Empty,
-}
-
-impl fmt::Debug for CanvasSource {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "{}",
-            match *self {
-                CanvasSource::WebGL(_) => "WebGL",
-                CanvasSource::Image(_) => "Image",
-                CanvasSource::WebGPU(_) => "WebGPU",
-                CanvasSource::Empty => "Empty",
-            }
-        )
-    }
-}
-
-#[derive(Debug)]
+#[derive(Debug, MallocSizeOf)]
 pub(crate) struct CanvasInfo {
-    pub source: CanvasSource,
+    pub source: Option<ImageKey>,
 }
 
-#[derive(Debug)]
+#[derive(Debug, MallocSizeOf)]
 pub(crate) struct IFrameInfo {
     pub pipeline_id: PipelineId,
     pub browsing_context_id: BrowsingContextId,
 }
 
-#[derive(Debug)]
+#[derive(Debug, MallocSizeOf)]
 pub(crate) struct VideoInfo {
     pub image_key: webrender_api::ImageKey,
 }
 
-#[derive(Debug)]
+#[derive(Debug, MallocSizeOf)]
 pub(crate) enum ReplacedContentKind {
-    Image(Option<Arc<Image>>),
+    Image(#[conditional_malloc_size_of] Option<Arc<Image>>),
     IFrame(IFrameInfo),
     Canvas(CanvasInfo),
     Video(Option<VideoInfo>),
 }
 
 impl ReplacedContents {
-    pub fn for_element<'dom>(element: impl NodeExt<'dom>, context: &LayoutContext) -> Option<Self> {
+    pub fn for_element(element: ServoLayoutNode<'_>, context: &LayoutContext) -> Option<Self> {
         if let Some(ref data_attribute_string) = element.as_typeless_object_with_data_attribute() {
             if let Some(url) = try_to_parse_image_data_url(data_attribute_string) {
                 return Self::from_image_url(
@@ -182,6 +162,10 @@ impl ReplacedContents {
             }
         };
 
+        if let ReplacedContentKind::Image(Some(ref image)) = kind {
+            context.handle_animated_image(element.opaque(), image.clone());
+        }
+
         let natural_size = if let Some(naturalc_size_in_dots) = natural_size_in_dots {
             // FIXME: should 'image-resolution' (when implemented) be used *instead* of
             // `script::dom::htmlimageelement::ImageRequest::current_pixel_density`?
@@ -202,8 +186,8 @@ impl ReplacedContents {
         })
     }
 
-    pub fn from_image_url<'dom>(
-        element: impl NodeExt<'dom>,
+    pub fn from_image_url(
+        element: ServoLayoutNode<'_>,
         context: &LayoutContext,
         image_url: &ComputedUrl,
     ) -> Option<Self> {
@@ -213,13 +197,13 @@ impl ReplacedContents {
                 image_url.clone().into(),
                 UsePlaceholder::No,
             ) {
-                Some(ImageOrMetadataAvailable::ImageAvailable { image, .. }) => {
+                Ok(ImageOrMetadataAvailable::ImageAvailable { image, .. }) => {
                     (Some(image.clone()), image.width as f32, image.height as f32)
                 },
-                Some(ImageOrMetadataAvailable::MetadataAvailable(metadata, _id)) => {
+                Ok(ImageOrMetadataAvailable::MetadataAvailable(metadata, _id)) => {
                     (None, metadata.width as f32, metadata.height as f32)
                 },
-                None => return None,
+                Err(_) => return None,
             };
 
             return Some(Self {
@@ -231,8 +215,8 @@ impl ReplacedContents {
         None
     }
 
-    pub fn from_image<'dom>(
-        element: impl NodeExt<'dom>,
+    pub fn from_image(
+        element: ServoLayoutNode<'_>,
         context: &LayoutContext,
         image: &ComputedImage,
     ) -> Option<Self> {
@@ -354,12 +338,17 @@ impl ReplacedContents {
             },
             ReplacedContentKind::IFrame(iframe) => {
                 let size = Size2D::new(rect.size.width.to_f32_px(), rect.size.height.to_f32_px());
+                let hidpi_scale_factor = layout_context.shared_context().device_pixel_ratio();
+
                 layout_context.iframe_sizes.lock().insert(
                     iframe.browsing_context_id,
                     IFrameSize {
                         browsing_context_id: iframe.browsing_context_id,
                         pipeline_id: iframe.pipeline_id,
-                        size,
+                        viewport_details: ViewportDetails {
+                            size,
+                            hidpi_scale_factor: Scale::new(hidpi_scale_factor.0),
+                        },
                     },
                 );
                 vec![Fragment::IFrame(ArcRefCell::new(IFrameFragment {
@@ -376,12 +365,10 @@ impl ReplacedContents {
                     return vec![];
                 }
 
-                let image_key = match canvas_info.source {
-                    CanvasSource::WebGL(image_key) => image_key,
-                    CanvasSource::WebGPU(image_key) => image_key,
-                    CanvasSource::Image(image_key) => image_key,
-                    CanvasSource::Empty => return vec![],
+                let Some(image_key) = canvas_info.source else {
+                    return vec![];
                 };
+
                 vec![Fragment::Image(ArcRefCell::new(ImageFragment {
                     base: self.base_fragment_info.into(),
                     style: style.clone(),
diff --git a/components/layout_2020/sizing.rs b/components/layout/sizing.rs
similarity index 92%
rename from components/layout_2020/sizing.rs
rename to components/layout/sizing.rs
index 125a832fe6c..c6e4b7f9498 100644
--- a/components/layout_2020/sizing.rs
+++ b/components/layout/sizing.rs
@@ -8,6 +8,7 @@ use std::cell::LazyCell;
 use std::ops::{Add, AddAssign};
 
 use app_units::Au;
+use malloc_size_of_derive::MallocSizeOf;
 use style::Zero;
 use style::values::computed::LengthPercentage;
 
@@ -32,7 +33,7 @@ pub(crate) enum IntrinsicSizingMode {
     Size,
 }
 
-#[derive(Clone, Copy, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default, MallocSizeOf)]
 pub(crate) struct ContentSizes {
     pub min_content: Au,
     pub max_content: Au,
@@ -130,6 +131,7 @@ pub(crate) fn outer_inline(
         content_box_sizes,
         pbm,
         mut depends_on_block_constraints,
+        preferred_size_computes_to_auto,
     } = layout_style.content_box_sizes_and_padding_border_margin(containing_block);
     let margin = pbm.margin.map(|v| v.auto_is(Au::zero));
     let pbm_sums = LogicalVec2 {
@@ -143,7 +145,7 @@ pub(crate) fn outer_inline(
                 .size
                 .block
                 .map(|v| Au::zero().max(v - pbm_sums.block));
-            let automatic_size = if content_box_sizes.block.preferred.is_initial() &&
+            let automatic_size = if preferred_size_computes_to_auto.block &&
                 auto_block_size_stretches_to_containing_block
             {
                 depends_on_block_constraints = true;
@@ -266,7 +268,7 @@ pub(crate) fn outer_inline(
     }
 }
 
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, MallocSizeOf)]
 pub(crate) struct InlineContentSizesResult {
     pub sizes: ContentSizes,
     pub depends_on_block_constraints: bool,
@@ -278,4 +280,18 @@ pub(crate) trait ComputeInlineContentSizes {
         layout_context: &LayoutContext,
         constraint_space: &ConstraintSpace,
     ) -> InlineContentSizesResult;
+
+    /// Returns the same result as [`Self::compute_inline_content_sizes()`], but adjusted
+    /// to floor the max-content size by the min-content size.
+    /// This is being discussed in <https://github.com/w3c/csswg-drafts/issues/12076>.
+    fn compute_inline_content_sizes_with_fixup(
+        &self,
+        layout_context: &LayoutContext,
+        constraint_space: &ConstraintSpace,
+    ) -> InlineContentSizesResult {
+        let mut result = self.compute_inline_content_sizes(layout_context, constraint_space);
+        let sizes = &mut result.sizes;
+        sizes.max_content.max_assign(sizes.min_content);
+        result
+    }
 }
diff --git a/components/layout_2020/style_ext.rs b/components/layout/style_ext.rs
similarity index 90%
rename from components/layout_2020/style_ext.rs
rename to components/layout/style_ext.rs
index 4a8d15b9fd3..354da54d39b 100644
--- a/components/layout_2020/style_ext.rs
+++ b/components/layout/style_ext.rs
@@ -3,6 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use app_units::Au;
+use malloc_size_of_derive::MallocSizeOf;
 use style::Zero;
 use style::color::AbsoluteColor;
 use style::computed_values::direction::T as Direction;
@@ -11,7 +12,7 @@ use style::computed_values::mix_blend_mode::T as ComputedMixBlendMode;
 use style::computed_values::position::T as ComputedPosition;
 use style::computed_values::transform_style::T as ComputedTransformStyle;
 use style::computed_values::unicode_bidi::T as UnicodeBidi;
-use style::logical_geometry::{Direction as AxisDirection, WritingMode};
+use style::logical_geometry::{Direction as AxisDirection, PhysicalSide, WritingMode};
 use style::properties::ComputedValues;
 use style::properties::longhands::backface_visibility::computed_value::T as BackfaceVisiblity;
 use style::properties::longhands::box_sizing::computed_value::T as BoxSizing;
@@ -235,9 +236,10 @@ pub(crate) struct ContentBoxSizesAndPBM {
     pub content_box_sizes: LogicalVec2<Sizes>,
     pub pbm: PaddingBorderMargin,
     pub depends_on_block_constraints: bool,
+    pub preferred_size_computes_to_auto: LogicalVec2<bool>,
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, MallocSizeOf, PartialEq)]
 pub(crate) struct BorderStyleColor {
     pub style: BorderStyle,
     pub color: AbsoluteColor,
@@ -278,6 +280,16 @@ impl Default for BorderStyleColor {
     }
 }
 
+/// <https://drafts.csswg.org/cssom-view/#overflow-directions>
+/// > A scrolling box of a viewport or element has two overflow directions,
+/// > which are the block-end and inline-end directions for that viewport or element.
+pub(crate) struct OverflowDirection {
+    /// Whether block-end or inline-end direction is [PhysicalSide::Right].
+    pub rightward: bool,
+    /// Whether block-end or inline-end direction is [PhysicalSide::Bottom].
+    pub downward: bool,
+}
+
 pub(crate) trait ComputedValuesExt {
     fn physical_box_offsets(&self) -> PhysicalSides<LengthPercentageOrAuto<'_>>;
     fn box_offsets(&self, writing_mode: WritingMode) -> LogicalSides<LengthPercentageOrAuto<'_>>;
@@ -318,7 +330,8 @@ pub(crate) trait ComputedValuesExt {
         containing_block_writing_mode: WritingMode,
     ) -> LogicalSides<LengthPercentageOrAuto<'_>>;
     fn is_transformable(&self, fragment_flags: FragmentFlags) -> bool;
-    fn has_transform_or_perspective(&self, fragment_flags: FragmentFlags) -> bool;
+    fn has_transform_or_perspective_style(&self) -> bool;
+    fn has_effective_transform_or_perspective(&self, fragment_flags: FragmentFlags) -> bool;
     fn z_index_applies(&self, fragment_flags: FragmentFlags) -> bool;
     fn effective_z_index(&self, fragment_flags: FragmentFlags) -> i32;
     fn effective_overflow(&self, fragment_flags: FragmentFlags) -> AxesOverflow;
@@ -351,6 +364,7 @@ pub(crate) trait ComputedValuesExt {
         writing_mode: WritingMode,
     ) -> bool;
     fn is_inline_box(&self, fragment_flags: FragmentFlags) -> bool;
+    fn overflow_direction(&self) -> OverflowDirection;
 }
 
 impl ComputedValuesExt for ComputedValues {
@@ -361,6 +375,9 @@ impl ComputedValuesExt for ComputedValues {
                 Inset::Auto => LengthPercentageOrAuto::Auto,
                 Inset::AnchorFunction(_) => unreachable!("anchor() should be disabled"),
                 Inset::AnchorSizeFunction(_) => unreachable!("anchor-size() should be disabled"),
+                Inset::AnchorContainingCalcFunction(_) => {
+                    unreachable!("anchor() and anchor-size() should be disabled")
+                },
             }
         }
         let position = self.get_position();
@@ -481,7 +498,9 @@ impl ComputedValuesExt for ComputedValues {
             match inset {
                 Margin::LengthPercentage(v) => LengthPercentageOrAuto::LengthPercentage(v),
                 Margin::Auto => LengthPercentageOrAuto::Auto,
-                Margin::AnchorSizeFunction(_) => unreachable!("anchor-size() should be disabled"),
+                Margin::AnchorSizeFunction(_) | Margin::AnchorContainingCalcFunction(_) => {
+                    unreachable!("anchor-size() should be disabled")
+                },
             }
         }
         let margin = self.get_margin();
@@ -520,15 +539,20 @@ impl ComputedValuesExt for ComputedValues {
         !self.is_inline_box(fragment_flags)
     }
 
-    /// Returns true if this style has a transform, or perspective property set and
+    /// Returns true if this style has a transform or perspective property set.
+    fn has_transform_or_perspective_style(&self) -> bool {
+        !self.get_box().transform.0.is_empty() ||
+            self.get_box().scale != GenericScale::None ||
+            self.get_box().rotate != GenericRotate::None ||
+            self.get_box().translate != GenericTranslate::None ||
+            self.get_box().perspective != Perspective::None
+    }
+
+    /// Returns true if this style has a transform or perspective property set, and
     /// it applies to this element.
-    fn has_transform_or_perspective(&self, fragment_flags: FragmentFlags) -> bool {
-        self.is_transformable(fragment_flags) &&
-            (!self.get_box().transform.0.is_empty() ||
-                self.get_box().scale != GenericScale::None ||
-                self.get_box().rotate != GenericRotate::None ||
-                self.get_box().translate != GenericTranslate::None ||
-                self.get_box().perspective != Perspective::None)
+    #[inline]
+    fn has_effective_transform_or_perspective(&self, fragment_flags: FragmentFlags) -> bool {
+        self.is_transformable(fragment_flags) && self.has_transform_or_perspective_style()
     }
 
     /// Whether the `z-index` property applies to this fragment.
@@ -693,17 +717,20 @@ impl ComputedValuesExt for ComputedValues {
         // From <https://www.w3.org/TR/css-transforms-1/#transform-rendering>
         // > For elements whose layout is governed by the CSS box model, any value other than
         // > `none` for the `transform` property results in the creation of a stacking context.
+        //
+        // From <https://www.w3.org/TR/css-transforms-2/#individual-transforms>
+        // > all other values […] create a stacking context and containing block for all
+        // > descendants, per usual for transforms.
+        //
+        // From <https://www.w3.org/TR/css-transforms-2/#perspective-property>
+        // > any value other than none establishes a stacking context.
+        //
         // From <https://www.w3.org/TR/css-transforms-2/#transform-style-property>
         // > A computed value of `preserve-3d` for `transform-style` on a transformable element
         // > establishes both a stacking context and a containing block for all descendants.
-        // From <https://www.w3.org/TR/css-transforms-2/#perspective-property>
-        // > any value other than none establishes a stacking context.
-        // TODO: handle individual transform properties (`translate`, `scale` and `rotate`).
-        // <https://www.w3.org/TR/css-transforms-2/#individual-transforms>
         if self.is_transformable(fragment_flags) &&
-            (!self.get_box().transform.0.is_empty() ||
+            (self.has_transform_or_perspective_style() ||
                 self.get_box().transform_style == ComputedTransformStyle::Preserve3d ||
-                self.get_box().perspective != Perspective::None ||
                 will_change_bits
                     .intersects(WillChangeBits::TRANSFORM | WillChangeBits::PERSPECTIVE))
         {
@@ -746,6 +773,12 @@ impl ComputedValuesExt for ComputedValues {
             return true;
         }
 
+        // From https://www.w3.org/TR/CSS22/visuren.html#z-index:
+        // > The root element forms the root stacking context.
+        if fragment_flags.contains(FragmentFlags::IS_ROOT_ELEMENT) {
+            return true;
+        }
+
         // TODO: We need to handle CSS Contain here.
         false
     }
@@ -787,29 +820,43 @@ impl ComputedValuesExt for ComputedValues {
         &self,
         fragment_flags: FragmentFlags,
     ) -> bool {
-        if self.has_transform_or_perspective(fragment_flags) {
-            return true;
-        }
-
-        if !self.get_effects().filter.0.is_empty() {
-            return true;
-        }
-
-        // See <https://drafts.csswg.org/css-transforms-2/#transform-style-property>.
-        if self.is_transformable(fragment_flags) &&
-            self.get_box().transform_style == ComputedTransformStyle::Preserve3d
-        {
-            return true;
-        }
         // From <https://www.w3.org/TR/css-will-change/#valdef-will-change-custom-ident>:
         // > If any non-initial value of a property would cause the element to generate a
         // > containing block for fixed positioned elements, specifying that property in will-change
         // > must cause the element to generate a containing block for fixed positioned elements.
         let will_change_bits = self.clone_will_change().bits;
-        if will_change_bits.intersects(WillChangeBits::FIXPOS_CB_NON_SVG) ||
-            (will_change_bits
-                .intersects(WillChangeBits::TRANSFORM | WillChangeBits::PERSPECTIVE) &&
-                self.is_transformable(fragment_flags))
+
+        // From <https://drafts.csswg.org/css-transforms-1/#transform-rendering>:
+        // > any value other than `none` for the `transform` property also causes the element
+        // > to establish a containing block for all descendants.
+        //
+        // From <https://www.w3.org/TR/css-transforms-2/#individual-transforms>
+        // > all other values […] create a stacking context and containing block for all
+        // > descendants, per usual for transforms.
+        //
+        // From <https://drafts.csswg.org/css-transforms-2/#perspective-property>:
+        // > The use of this property with any value other than `none` […] establishes a
+        // > containing block for all descendants, just like the `transform` property does.
+        //
+        // From <https://drafts.csswg.org/css-transforms-2/#transform-style-property>:
+        // > A computed value of `preserve-3d` for `transform-style` on a transformable element
+        // > establishes both a stacking context and a containing block for all descendants.
+        if self.is_transformable(fragment_flags) &&
+            (self.has_transform_or_perspective_style() ||
+                self.get_box().transform_style == ComputedTransformStyle::Preserve3d ||
+                will_change_bits
+                    .intersects(WillChangeBits::TRANSFORM | WillChangeBits::PERSPECTIVE))
+        {
+            return true;
+        }
+
+        // From <https://www.w3.org/TR/filter-effects-1/#propdef-filter>:
+        // > A value other than none for the filter property results in the creation of a containing
+        // > block for absolute and fixed positioned descendants unless the element it applies to is
+        // > a document root element in the current browsing context.
+        if !fragment_flags.contains(FragmentFlags::IS_ROOT_ELEMENT) &&
+            (!self.get_effects().filter.0.is_empty() ||
+                will_change_bits.intersects(WillChangeBits::FIXPOS_CB_NON_SVG))
         {
             return true;
         }
@@ -953,6 +1000,23 @@ impl ComputedValuesExt for ComputedValues {
         };
         has_percentage(box_offsets.block_start) || has_percentage(box_offsets.block_end)
     }
+
+    // <https://drafts.csswg.org/cssom-view/#overflow-directions>
+    fn overflow_direction(&self) -> OverflowDirection {
+        let inline_end_direction = self.writing_mode.inline_end_physical_side();
+        let block_end_direction = self.writing_mode.block_end_physical_side();
+
+        let rightward = inline_end_direction == PhysicalSide::Right ||
+            block_end_direction == PhysicalSide::Right;
+        let downward = inline_end_direction == PhysicalSide::Bottom ||
+            block_end_direction == PhysicalSide::Bottom;
+
+        // TODO(stevennovaryo): We should consider the flex-container's CSS (e.g. flow-direction: column-reverse).
+        OverflowDirection {
+            rightward,
+            downward,
+        }
+    }
 }
 
 pub(crate) enum LayoutStyle<'a> {
@@ -994,6 +1058,8 @@ impl LayoutStyle<'_> {
         let box_size = style.box_size(writing_mode);
         let min_size = style.min_box_size(writing_mode);
         let max_size = style.max_box_size(writing_mode);
+        let preferred_size_computes_to_auto = box_size.map(|size| size.is_initial());
+
         let depends_on_block_constraints = |size: &Size<LengthPercentage>| {
             match size {
                 // fit-content is like clamp(min-content, stretch, max-content), but currently
@@ -1008,7 +1074,6 @@ impl LayoutStyle<'_> {
                 _ => false,
             }
         };
-
         let depends_on_block_constraints = depends_on_block_constraints(&box_size.block) ||
             depends_on_block_constraints(&min_size.block) ||
             depends_on_block_constraints(&max_size.block) ||
@@ -1039,6 +1104,7 @@ impl LayoutStyle<'_> {
             },
             pbm,
             depends_on_block_constraints,
+            preferred_size_computes_to_auto,
         }
     }
 
diff --git a/resources/presentational-hints.css b/components/layout/stylesheets/presentational-hints.css
similarity index 100%
rename from resources/presentational-hints.css
rename to components/layout/stylesheets/presentational-hints.css
diff --git a/resources/quirks-mode.css b/components/layout/stylesheets/quirks-mode.css
similarity index 100%
rename from resources/quirks-mode.css
rename to components/layout/stylesheets/quirks-mode.css
diff --git a/components/layout/stylesheets/servo.css b/components/layout/stylesheets/servo.css
new file mode 100644
index 00000000000..bc72f01cc56
--- /dev/null
+++ b/components/layout/stylesheets/servo.css
@@ -0,0 +1,259 @@
+button {
+    cursor: default;
+}
+
+button,
+input {
+  background: white;
+  border: solid lightgrey 1px;
+  color: black;
+  font-family: sans-serif;
+  font-size: 0.8333em;
+}
+
+textarea {
+  background: white;
+  border: solid lightgrey 1px;
+  color: black;
+  font-family: sans-serif;
+  font-size: 0.8333em;
+}
+
+input::selection,
+textarea::selection {
+  background: rgba(176, 214, 255, 1.0);
+  color: black;
+}
+
+button,
+input[type="button"],
+input[type="submit"],
+input[type="reset"] {
+  background: lightgrey;
+  border-top: solid 1px #EEEEEE;
+  border-left: solid 1px #CCCCCC;
+  border-right: solid 1px #999999;
+  border-bottom: solid 1px #999999;
+  color: black;
+}
+
+input[type="hidden"] { display: none !important }
+
+input[type="checkbox"],
+input[type="radio"] {
+  font-family: monospace !important;
+  border: none !important;
+  background: transparent;
+}
+
+input[type="checkbox"]::before {
+  display: inline-block;
+  border: solid currentcolor 1px;
+  content: "";
+  padding: 0;
+  width: 1em;
+  height: 1em;
+  text-align: center;
+}
+
+input[type="checkbox"]:checked::before { content: "✓"; }
+input[type="checkbox"]:indeterminate::before { content: "-"; }
+
+input[type="radio"]::before {
+  display: inline-block;
+  border: solid currentcolor 1px;
+  content: "";
+  padding: 0;
+  width: 1em;
+  height: 1em;
+  border-radius: 50%;
+  text-align: center;
+}
+
+input[type="radio"]:checked::before { content: "●"; line-height: 1em; }
+
+input[type="file"]::before {
+  content: "Choose File";
+  background: lightgrey;
+  border-top: solid 1px #EEEEEE;
+  border-left: solid 1px #CCCCCC;
+  border-right: solid 1px #999999;
+  border-bottom: solid 1px #999999;
+}
+
+input[type="file"] {
+  text-align: center;
+  color: black;
+  border-style: none;
+}
+
+td[align="left"]    { text-align: left; }
+td[align="center"]  { text-align: center; }
+td[align="right"]   { text-align: right; }
+
+center { text-align: -moz-center; }
+
+label { cursor: default; }
+
+img {
+  overflow: clip !important;
+  overflow-clip-margin: 0 !important;
+}
+
+input:not([type=radio i]):not([type=checkbox i]):not([type=reset i]):not([type=button i]):not([type=submit i]) {
+  cursor: text;
+  overflow: hidden !important;
+  white-space: pre;
+}
+
+textarea {
+  cursor: text;
+  overflow: auto;
+}
+
+/* https://html.spec.whatwg.org/multipage/rendering.html#the-details-and-summary-elements */
+details {
+  display: block;
+}
+
+details::-servo-details-summary {
+  margin-left: 40px;
+  display: list-item;
+  list-style: disclosure-closed;
+}
+
+details[open]::-servo-details-summary {
+  list-style: disclosure-open;
+}
+
+*|*::-servo-details-content {
+  margin-left: 40px;
+  overflow: hidden;
+  display: block;
+}
+
+/*
+ * Until servo supports svg properly, make sure to at least prevent svg
+ * children from being layed out and rendered like usual html.
+ * https://github.com/servo/servo/issues/10646
+ */
+svg > * {
+  display: none;
+}
+
+*|*::-servo-anonymous-box {
+  unicode-bidi: inherit;
+  direction: inherit;
+  writing-mode: inherit;
+}
+
+*|*::-servo-anonymous-table {
+    display: table;
+}
+
+*|*::-servo-anonymous-table-row {
+    display: table-row;
+}
+
+*|*::-servo-anonymous-table-cell {
+    display: table-cell;
+}
+
+*|*::-servo-table-grid {
+  all: inherit;
+  margin: unset;
+  float: unset;
+  clear: unset;
+  position: unset;
+  z-index: unset;
+  page-break-before: unset;
+  page-break-after: unset;
+  page-break-inside: unset;
+  vertical-align: unset;
+  line-height: unset;
+  transform: unset;
+  transform-origin: unset;
+  backface-visibility: unset;
+  clip: unset;
+  transform-style: unset;
+  rotate: unset;
+  scale: unset;
+  translate: unset;
+  align-self: unset;
+  justify-self: unset;
+  grid-column-start: unset;
+  grid-column-end: unset;
+  grid-row-start: unset;
+  grid-row-end: unset;
+  order: unset;
+  outline: unset;
+  outline-offset: unset;
+  column-span: unset;
+  contain: unset;
+  container: unset;
+  scroll-margin: unset;
+
+  /* The grid needs to be block-level, so avoid inheriting `display: inline-table`. */
+  display: table;
+}
+
+meter {
+  display: inline-block;
+  width: 100px;
+  height: 12px;
+  border-radius: 6px;
+  background: linear-gradient(#e6e6e6, #e6e6e6, #eeeeee 20%, #cccccc 45%, #cccccc 55%);
+  overflow: clip;
+}
+
+/* FIXME: These should use the ::-moz-meter-bar pseudo element */
+meter div {
+  height: 100%;
+}
+
+meter:-moz-meter-optimum div {
+  background: linear-gradient(#ad7, #ad7, #cea 20%, #7a3 45%, #7a3 55%);
+}
+meter:-moz-meter-sub-optimum div {
+  background: linear-gradient(#fe7, #fe7, #ffc 20%, #db3 45%, #db3 55%);
+}
+meter:-moz-meter-sub-sub-optimum div {
+  background: linear-gradient(#f77, #f77, #fcc 20%, #d44 45%, #d44 55%);
+}
+
+/* https://html.spec.whatwg.org/#the-details-and-summary-elements */
+details, summary {
+  display: block;
+}
+details > summary:first-of-type {
+  display: list-item;
+  counter-increment: list-item 0;
+  list-style: disclosure-closed inside;
+}
+details[open] > summary:first-of-type {
+  list-style-type: disclosure-open;
+}
+
+/* Styles for the <progress> element */
+progress {
+  display: inline-block;
+  width: 200px;
+  height: 6px;
+  border-radius: 3px;
+  border: 1px solid rgba(0, 0, 0, 0.5);
+}
+/* FIXME: This should use ::-moz-progress-bar */
+progress #-servo-progress-bar {
+  display: block;
+  height: 100%;
+  background-color: #7a3;
+}
+
+select {
+  background-color: lightgrey;
+  border-radius: 5px;
+  border: 1px solid gray;
+  padding: 0 0.25em;
+  /* Don't show a text cursor when hovering selected option */
+  cursor: default;
+}
\ No newline at end of file
diff --git a/resources/user-agent.css b/components/layout/stylesheets/user-agent.css
similarity index 98%
rename from resources/user-agent.css
rename to components/layout/stylesheets/user-agent.css
index 94fe903824d..cea14741d30 100644
--- a/resources/user-agent.css
+++ b/components/layout/stylesheets/user-agent.css
@@ -422,3 +422,12 @@ iframe:fullscreen {
   border:none !important;
   padding:0 !important;
 }
+
+/* https://drafts.csswg.org/css-lists-3/#ua-stylesheet */
+*::marker {
+  text-align: end;
+  text-transform: none;
+  unicode-bidi: isolate;
+  font-variant-numeric: tabular-nums;
+  white-space: pre;
+}
diff --git a/components/layout/table/construct.rs b/components/layout/table/construct.rs
new file mode 100644
index 00000000000..0c238073df2
--- /dev/null
+++ b/components/layout/table/construct.rs
@@ -0,0 +1,1146 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::borrow::Cow;
+use std::convert::{TryFrom, TryInto};
+use std::iter::repeat;
+
+use atomic_refcell::AtomicRef;
+use log::warn;
+use script_layout_interface::wrapper_traits::{LayoutNode, ThreadSafeLayoutNode};
+use servo_arc::Arc;
+use style::properties::ComputedValues;
+use style::properties::style_structs::Font;
+use style::selector_parser::PseudoElement;
+use style::str::char_is_whitespace;
+
+use super::{
+    Table, TableCaption, TableLevelBox, TableSlot, TableSlotCell, TableSlotCoordinates,
+    TableSlotOffset, TableTrack, TableTrackGroup, TableTrackGroupType,
+};
+use crate::cell::ArcRefCell;
+use crate::context::LayoutContext;
+use crate::dom::{BoxSlot, LayoutBox};
+use crate::dom_traversal::{Contents, NodeAndStyleInfo, NonReplacedContents, TraversalHandler};
+use crate::flow::{BlockContainerBuilder, BlockFormattingContext};
+use crate::formatting_contexts::{
+    IndependentFormattingContext, IndependentFormattingContextContents,
+    IndependentNonReplacedContents,
+};
+use crate::fragment_tree::BaseFragmentInfo;
+use crate::layout_box_base::LayoutBoxBase;
+use crate::style_ext::{DisplayGeneratingBox, DisplayLayoutInternal};
+use crate::{PropagatedBoxTreeData, SharedStyle};
+
+/// A reference to a slot and its coordinates in the table
+#[derive(Debug)]
+pub(super) struct ResolvedSlotAndLocation<'a> {
+    pub cell: AtomicRef<'a, TableSlotCell>,
+    pub coords: TableSlotCoordinates,
+}
+
+impl ResolvedSlotAndLocation<'_> {
+    fn covers_cell_at(&self, coords: TableSlotCoordinates) -> bool {
+        let covered_in_x =
+            coords.x >= self.coords.x && coords.x < self.coords.x + self.cell.colspan;
+        let covered_in_y = coords.y >= self.coords.y &&
+            (self.cell.rowspan == 0 || coords.y < self.coords.y + self.cell.rowspan);
+        covered_in_x && covered_in_y
+    }
+}
+
+pub(crate) enum AnonymousTableContent<'dom> {
+    Text(NodeAndStyleInfo<'dom>, Cow<'dom, str>),
+    Element {
+        info: NodeAndStyleInfo<'dom>,
+        display: DisplayGeneratingBox,
+        contents: Contents,
+        box_slot: BoxSlot<'dom>,
+    },
+}
+
+impl AnonymousTableContent<'_> {
+    fn is_whitespace_only(&self) -> bool {
+        match self {
+            Self::Element { .. } => false,
+            Self::Text(_, text) => text.chars().all(char_is_whitespace),
+        }
+    }
+
+    fn contents_are_whitespace_only(contents: &[Self]) -> bool {
+        contents.iter().all(|content| content.is_whitespace_only())
+    }
+}
+
+impl Table {
+    pub(crate) fn construct(
+        context: &LayoutContext,
+        info: &NodeAndStyleInfo,
+        grid_style: Arc<ComputedValues>,
+        contents: NonReplacedContents,
+        propagated_data: PropagatedBoxTreeData,
+    ) -> Self {
+        let mut traversal = TableBuilderTraversal::new(
+            context,
+            info,
+            grid_style,
+            propagated_data.union(&info.style),
+        );
+        contents.traverse(context, info, &mut traversal);
+        traversal.finish()
+    }
+
+    pub(crate) fn construct_anonymous<'dom>(
+        context: &LayoutContext,
+        parent_info: &NodeAndStyleInfo<'dom>,
+        contents: Vec<AnonymousTableContent<'dom>>,
+        propagated_data: PropagatedBoxTreeData,
+    ) -> (NodeAndStyleInfo<'dom>, IndependentFormattingContext) {
+        let table_info = parent_info
+            .pseudo(context, PseudoElement::ServoAnonymousTable)
+            .expect("Should never fail to create anonymous table info.");
+        let table_style = table_info.style.clone();
+        let mut table_builder =
+            TableBuilderTraversal::new(context, &table_info, table_style.clone(), propagated_data);
+
+        for content in contents {
+            match content {
+                AnonymousTableContent::Element {
+                    info,
+                    display,
+                    contents,
+                    box_slot,
+                } => {
+                    table_builder.handle_element(&info, display, contents, box_slot);
+                },
+                AnonymousTableContent::Text(..) => {
+                    // This only happens if there was whitespace between our internal table elements.
+                    // We only collect that whitespace in case we need to re-emit trailing whitespace
+                    // after we've added our anonymous table.
+                },
+            }
+        }
+
+        let mut table = table_builder.finish();
+        table.anonymous = true;
+
+        let ifc = IndependentFormattingContext {
+            base: LayoutBoxBase::new((&table_info).into(), table_style),
+            contents: IndependentFormattingContextContents::NonReplaced(
+                IndependentNonReplacedContents::Table(table),
+            ),
+        };
+
+        (table_info, ifc)
+    }
+
+    /// Push a new slot into the last row of this table.
+    fn push_new_slot_to_last_row(&mut self, slot: TableSlot) {
+        let last_row = match self.slots.last_mut() {
+            Some(row) => row,
+            None => {
+                unreachable!("Should have some rows before calling `push_new_slot_to_last_row`")
+            },
+        };
+
+        self.size.width = self.size.width.max(last_row.len() + 1);
+        last_row.push(slot);
+    }
+
+    /// Find [`ResolvedSlotAndLocation`] of all the slots that cover the slot at the given
+    /// coordinates. This recursively resolves all of the [`TableSlotCell`]s that cover
+    /// the target and returns a [`ResolvedSlotAndLocation`] for each of them. If there is
+    /// no slot at the given coordinates or that slot is an empty space, an empty vector
+    /// is returned.
+    pub(super) fn resolve_slot_at(
+        &self,
+        coords: TableSlotCoordinates,
+    ) -> Vec<ResolvedSlotAndLocation<'_>> {
+        let slot = self.get_slot(coords);
+        match slot {
+            Some(TableSlot::Cell(cell)) => vec![ResolvedSlotAndLocation {
+                cell: cell.borrow(),
+                coords,
+            }],
+            Some(TableSlot::Spanned(offsets)) => offsets
+                .iter()
+                .flat_map(|offset| self.resolve_slot_at(coords - *offset))
+                .collect(),
+            Some(TableSlot::Empty) | None => {
+                warn!("Tried to resolve an empty or nonexistant slot!");
+                vec![]
+            },
+        }
+    }
+}
+
+impl TableSlot {
+    /// Merge a TableSlot::Spanned(x, y) with this (only for model errors)
+    pub fn push_spanned(&mut self, new_offset: TableSlotOffset) {
+        match *self {
+            TableSlot::Cell { .. } => {
+                panic!(
+                    "Should never have a table model error with an originating cell slot overlapping a spanned slot"
+                )
+            },
+            TableSlot::Spanned(ref mut vec) => vec.insert(0, new_offset),
+            TableSlot::Empty => {
+                panic!("Should never have a table model error with an empty slot");
+            },
+        }
+    }
+}
+
+pub struct TableBuilder {
+    /// The table that we are building.
+    table: Table,
+
+    /// An incoming rowspan is a value indicating that a cell in a row above the current row,
+    /// had a rowspan value other than 1. The values in this array indicate how many more
+    /// rows the cell should span. For example, a value of 0 at an index before `current_x()`
+    /// indicates that the cell on that column will not span into the next row, and at an index
+    /// after `current_x()` it indicates that the cell will not span into the current row.
+    /// A negative value means that the cell will span all remaining rows in the row group.
+    ///
+    /// As each column in a row is processed, the values in this vector are updated for the
+    /// next row.
+    pub incoming_rowspans: Vec<isize>,
+}
+
+impl TableBuilder {
+    pub(super) fn new(
+        style: Arc<ComputedValues>,
+        grid_style: Arc<ComputedValues>,
+        base_fragment_info: BaseFragmentInfo,
+        percentage_columns_allowed_for_inline_content_sizes: bool,
+    ) -> Self {
+        Self {
+            table: Table::new(
+                style,
+                grid_style,
+                base_fragment_info,
+                percentage_columns_allowed_for_inline_content_sizes,
+            ),
+            incoming_rowspans: Vec::new(),
+        }
+    }
+
+    pub fn new_for_tests() -> Self {
+        let testing_style =
+            ComputedValues::initial_values_with_font_override(Font::initial_values());
+        Self::new(
+            testing_style.clone(),
+            testing_style.clone(),
+            BaseFragmentInfo::anonymous(),
+            true, /* percentage_columns_allowed_for_inline_content_sizes */
+        )
+    }
+
+    pub fn last_row_index_in_row_group_at_row_n(&self, n: usize) -> usize {
+        // TODO: This is just a linear search, because the idea is that there are
+        // generally less than or equal to three row groups, but if we notice a lot
+        // of web content with more, we can consider a binary search here.
+        for row_group in self.table.row_groups.iter() {
+            let row_group = row_group.borrow();
+            if row_group.track_range.start > n {
+                return row_group.track_range.start - 1;
+            }
+        }
+        self.table.size.height - 1
+    }
+
+    pub fn finish(mut self) -> Table {
+        self.adjust_table_geometry_for_columns_and_colgroups();
+        self.do_missing_cells_fixup();
+        self.reorder_first_thead_and_tfoot();
+        self.do_final_rowspan_calculation();
+        self.table
+    }
+
+    /// Do <https://drafts.csswg.org/css-tables/#missing-cells-fixup> which ensures
+    /// that every row has the same number of cells.
+    fn do_missing_cells_fixup(&mut self) {
+        for row in self.table.slots.iter_mut() {
+            row.resize_with(self.table.size.width, || TableSlot::Empty);
+        }
+    }
+
+    /// It's possible to define more table columns via `<colgroup>` and `<col>` elements
+    /// than actually exist in the table. In that case, increase the size of the table.
+    ///
+    /// However, if the table has no row nor row group, remove the extra columns instead.
+    /// This matches WebKit, and some tests require it, but Gecko and Blink don't do it.
+    fn adjust_table_geometry_for_columns_and_colgroups(&mut self) {
+        if self.table.rows.is_empty() && self.table.row_groups.is_empty() {
+            self.table.columns.truncate(0);
+            self.table.column_groups.truncate(0);
+        } else {
+            self.table.size.width = self.table.size.width.max(self.table.columns.len());
+        }
+    }
+
+    /// Reorder the first `<thead>` and `<tbody>` to be the first and last row groups respectively.
+    /// This requires fixing up all row group indices.
+    /// See <https://drafts.csswg.org/css-tables/#table-header-group> and
+    /// <https://drafts.csswg.org/css-tables/#table-footer-group>.
+    fn reorder_first_thead_and_tfoot(&mut self) {
+        let mut thead_index = None;
+        let mut tfoot_index = None;
+        for (row_group_index, row_group) in self.table.row_groups.iter().enumerate() {
+            let row_group = row_group.borrow();
+            if thead_index.is_none() && row_group.group_type == TableTrackGroupType::HeaderGroup {
+                thead_index = Some(row_group_index);
+            }
+            if tfoot_index.is_none() && row_group.group_type == TableTrackGroupType::FooterGroup {
+                tfoot_index = Some(row_group_index);
+            }
+            if thead_index.is_some() && tfoot_index.is_some() {
+                break;
+            }
+        }
+
+        if let Some(thead_index) = thead_index {
+            self.move_row_group_to_front(thead_index)
+        }
+
+        if let Some(mut tfoot_index) = tfoot_index {
+            // We may have moved a `<thead>` which means the original index we
+            // we found for this this <tfoot>` also needs to be updated!
+            if thead_index.unwrap_or(0) > tfoot_index {
+                tfoot_index += 1;
+            }
+            self.move_row_group_to_end(tfoot_index)
+        }
+    }
+
+    fn regenerate_track_ranges(&mut self) {
+        // Now update all track group ranges.
+        let mut current_row_group_index = None;
+        for (row_index, row) in self.table.rows.iter().enumerate() {
+            let row = row.borrow();
+            if current_row_group_index == row.group_index {
+                continue;
+            }
+
+            // Finish any row group that is currently being processed.
+            if let Some(current_group_index) = current_row_group_index {
+                self.table.row_groups[current_group_index]
+                    .borrow_mut()
+                    .track_range
+                    .end = row_index;
+            }
+
+            // Start processing this new row group and update its starting index.
+            current_row_group_index = row.group_index;
+            if let Some(current_group_index) = current_row_group_index {
+                self.table.row_groups[current_group_index]
+                    .borrow_mut()
+                    .track_range
+                    .start = row_index;
+            }
+        }
+
+        // Finish the last row group.
+        if let Some(current_group_index) = current_row_group_index {
+            self.table.row_groups[current_group_index]
+                .borrow_mut()
+                .track_range
+                .end = self.table.rows.len();
+        }
+    }
+
+    fn move_row_group_to_front(&mut self, index_to_move: usize) {
+        // Move the group itself.
+        if index_to_move > 0 {
+            let removed_row_group = self.table.row_groups.remove(index_to_move);
+            self.table.row_groups.insert(0, removed_row_group);
+
+            for row in self.table.rows.iter_mut() {
+                let mut row = row.borrow_mut();
+                match row.group_index.as_mut() {
+                    Some(group_index) if *group_index < index_to_move => *group_index += 1,
+                    Some(group_index) if *group_index == index_to_move => *group_index = 0,
+                    _ => {},
+                }
+            }
+        }
+
+        let row_range = self.table.row_groups[0].borrow().track_range.clone();
+        if row_range.start > 0 {
+            // Move the slots associated with the moved group.
+            let removed_slots: Vec<Vec<TableSlot>> = self
+                .table
+                .slots
+                .splice(row_range.clone(), std::iter::empty())
+                .collect();
+            self.table.slots.splice(0..0, removed_slots);
+
+            // Move the rows associated with the moved group.
+            let removed_rows: Vec<_> = self
+                .table
+                .rows
+                .splice(row_range, std::iter::empty())
+                .collect();
+            self.table.rows.splice(0..0, removed_rows);
+
+            // Do this now, rather than after possibly moving a `<tfoot>` row group to the end,
+            // because moving row groups depends on an accurate `track_range` in every group.
+            self.regenerate_track_ranges();
+        }
+    }
+
+    fn move_row_group_to_end(&mut self, index_to_move: usize) {
+        let last_row_group_index = self.table.row_groups.len() - 1;
+
+        // Move the group itself.
+        if index_to_move < last_row_group_index {
+            let removed_row_group = self.table.row_groups.remove(index_to_move);
+            self.table.row_groups.push(removed_row_group);
+
+            for row in self.table.rows.iter_mut() {
+                let mut row = row.borrow_mut();
+                match row.group_index.as_mut() {
+                    Some(group_index) if *group_index > index_to_move => *group_index -= 1,
+                    Some(group_index) if *group_index == index_to_move => {
+                        *group_index = last_row_group_index
+                    },
+                    _ => {},
+                }
+            }
+        }
+
+        let row_range = self.table.row_groups[last_row_group_index]
+            .borrow()
+            .track_range
+            .clone();
+        if row_range.end < self.table.rows.len() {
+            // Move the slots associated with the moved group.
+            let removed_slots: Vec<Vec<TableSlot>> = self
+                .table
+                .slots
+                .splice(row_range.clone(), std::iter::empty())
+                .collect();
+            self.table.slots.extend(removed_slots);
+
+            // Move the rows associated with the moved group.
+            let removed_rows: Vec<_> = self
+                .table
+                .rows
+                .splice(row_range, std::iter::empty())
+                .collect();
+            self.table.rows.extend(removed_rows);
+
+            self.regenerate_track_ranges();
+        }
+    }
+
+    /// Turn all rowspan=0 rows into the real value to avoid having to make the calculation
+    /// continually during layout. In addition, make sure that there are no rowspans that extend
+    /// past the end of their row group.
+    fn do_final_rowspan_calculation(&mut self) {
+        for row_index in 0..self.table.size.height {
+            let last_row_index_in_group = self.last_row_index_in_row_group_at_row_n(row_index);
+            for cell in self.table.slots[row_index].iter_mut() {
+                if let TableSlot::Cell(cell) = cell {
+                    let mut cell = cell.borrow_mut();
+                    if cell.rowspan == 1 {
+                        continue;
+                    }
+                    let rowspan_to_end_of_group = last_row_index_in_group - row_index + 1;
+                    if cell.rowspan == 0 {
+                        cell.rowspan = rowspan_to_end_of_group;
+                    } else {
+                        cell.rowspan = cell.rowspan.min(rowspan_to_end_of_group);
+                    }
+                }
+            }
+        }
+    }
+
+    fn current_y(&self) -> Option<usize> {
+        self.table.slots.len().checked_sub(1)
+    }
+
+    fn current_x(&self) -> Option<usize> {
+        Some(self.table.slots[self.current_y()?].len())
+    }
+
+    fn current_coords(&self) -> Option<TableSlotCoordinates> {
+        Some(TableSlotCoordinates::new(
+            self.current_x()?,
+            self.current_y()?,
+        ))
+    }
+
+    pub fn start_row(&mut self) {
+        self.table.slots.push(Vec::new());
+        self.table.size.height += 1;
+        self.create_slots_for_cells_above_with_rowspan(true);
+    }
+
+    pub fn end_row(&mut self) {
+        // TODO: We need to insert a cell for any leftover non-table-like
+        // content in the TableRowBuilder.
+
+        // Truncate entries that are zero at the end of [`Self::incoming_rowspans`]. This
+        // prevents padding the table with empty cells when it isn't necessary.
+        let current_x = self
+            .current_x()
+            .expect("Should have rows before calling `end_row`");
+        for i in (current_x..self.incoming_rowspans.len()).rev() {
+            if self.incoming_rowspans[i] == 0 {
+                self.incoming_rowspans.pop();
+            } else {
+                break;
+            }
+        }
+
+        self.create_slots_for_cells_above_with_rowspan(false);
+    }
+
+    /// Create a [`TableSlot::Spanned`] for the target cell at the given coordinates. If
+    /// no slots cover the target, then this returns [`None`]. Note: This does not handle
+    /// slots that cover the target using `colspan`, but instead only considers slots that
+    /// cover this slot via `rowspan`. `colspan` should be handled by appending to the
+    /// return value of this function.
+    fn create_spanned_slot_based_on_cell_above(
+        &self,
+        target_coords: TableSlotCoordinates,
+    ) -> Option<TableSlot> {
+        let y_above = self.current_y()?.checked_sub(1)?;
+        let coords_for_slot_above = TableSlotCoordinates::new(target_coords.x, y_above);
+        let slots_covering_slot_above = self.table.resolve_slot_at(coords_for_slot_above);
+
+        let coords_of_slots_that_cover_target: Vec<_> = slots_covering_slot_above
+            .into_iter()
+            .filter(|slot| slot.covers_cell_at(target_coords))
+            .map(|slot| target_coords - slot.coords)
+            .collect();
+
+        if coords_of_slots_that_cover_target.is_empty() {
+            None
+        } else {
+            Some(TableSlot::Spanned(coords_of_slots_that_cover_target))
+        }
+    }
+
+    /// When not in the process of filling a cell, make sure any incoming rowspans are
+    /// filled so that the next specified cell comes after them. Should have been called before
+    /// [`Self::add_cell`]
+    ///
+    /// if `stop_at_cell_opportunity` is set, this will stop at the first slot with
+    /// `incoming_rowspans` equal to zero. If not, it will insert [`TableSlot::Empty`] and
+    /// continue to look for more incoming rowspans (which should only be done once we're
+    /// finished processing the cells in a row, and after calling truncating cells with
+    /// remaining rowspan from the end of `incoming_rowspans`.
+    fn create_slots_for_cells_above_with_rowspan(&mut self, stop_at_cell_opportunity: bool) {
+        let mut current_coords = self
+            .current_coords()
+            .expect("Should have rows before calling `create_slots_for_cells_above_with_rowspan`");
+        while let Some(span) = self.incoming_rowspans.get_mut(current_coords.x) {
+            // This column has no incoming rowspanned cells and `stop_at_zero` is true, so
+            // we should stop to process new cells defined in the current row.
+            if *span == 0 && stop_at_cell_opportunity {
+                break;
+            }
+
+            let new_cell = if *span != 0 {
+                *span -= 1;
+                self.create_spanned_slot_based_on_cell_above(current_coords)
+                    .expect(
+                        "Nonzero incoming rowspan cannot occur without a cell spanning this slot",
+                    )
+            } else {
+                TableSlot::Empty
+            };
+
+            self.table.push_new_slot_to_last_row(new_cell);
+            current_coords.x += 1;
+        }
+        debug_assert_eq!(Some(current_coords), self.current_coords());
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#algorithm-for-processing-rows>
+    /// Push a single cell onto the slot map, handling any colspans it may have, and
+    /// setting up the outgoing rowspans.
+    pub fn add_cell(&mut self, cell: ArcRefCell<TableSlotCell>) {
+        // Make sure the incoming_rowspans table is large enough
+        // because we will be writing to it.
+        let current_coords = self
+            .current_coords()
+            .expect("Should have rows before calling `add_cell`");
+
+        let (colspan, rowspan) = {
+            let cell = cell.borrow();
+            (cell.colspan, cell.rowspan)
+        };
+
+        if self.incoming_rowspans.len() < current_coords.x + colspan {
+            self.incoming_rowspans
+                .resize(current_coords.x + colspan, 0isize);
+        }
+
+        debug_assert_eq!(
+            self.incoming_rowspans[current_coords.x], 0,
+            "Added a cell in a position that also had an incoming rowspan!"
+        );
+
+        // If `rowspan` is zero, this is automatically negative and will stay negative.
+        let outgoing_rowspan = rowspan as isize - 1;
+        self.table.push_new_slot_to_last_row(TableSlot::Cell(cell));
+        self.incoming_rowspans[current_coords.x] = outgoing_rowspan;
+
+        // Draw colspanned cells
+        for colspan_offset in 1..colspan {
+            let current_x_plus_colspan_offset = current_coords.x + colspan_offset;
+            let new_offset = TableSlotOffset::new(colspan_offset, 0);
+            let incoming_rowspan = &mut self.incoming_rowspans[current_x_plus_colspan_offset];
+            let new_slot = if *incoming_rowspan == 0 {
+                *incoming_rowspan = outgoing_rowspan;
+                TableSlot::new_spanned(new_offset)
+            } else {
+                // This means we have a table model error.
+
+                // if `incoming_rowspan` is greater than zero, a cell from above is spanning
+                // into our row, colliding with the cells we are creating via colspan. In
+                // that case, set the incoming rowspan to the highest of two possible
+                // outgoing rowspan values (the incoming rowspan minus one, OR this cell's
+                // outgoing rowspan).  `spanned_slot()`` will handle filtering out
+                // inapplicable spans when it needs to.
+                //
+                // If the `incoming_rowspan` is negative we are in `rowspan=0` mode, (i.e.
+                // rowspan=infinity), so we don't have to worry about the current cell
+                // making it larger. In that case, don't change the rowspan.
+                if *incoming_rowspan > 0 {
+                    *incoming_rowspan = std::cmp::max(*incoming_rowspan - 1, outgoing_rowspan);
+                }
+
+                // This code creates a new slot in the case that there is a table model error.
+                let coords_of_spanned_cell =
+                    TableSlotCoordinates::new(current_x_plus_colspan_offset, current_coords.y);
+                let mut incoming_slot = self
+                    .create_spanned_slot_based_on_cell_above(coords_of_spanned_cell)
+                    .expect(
+                        "Nonzero incoming rowspan cannot occur without a cell spanning this slot",
+                    );
+                incoming_slot.push_spanned(new_offset);
+                incoming_slot
+            };
+            self.table.push_new_slot_to_last_row(new_slot);
+        }
+
+        debug_assert_eq!(
+            Some(TableSlotCoordinates::new(
+                current_coords.x + colspan,
+                current_coords.y
+            )),
+            self.current_coords(),
+            "Must have produced `colspan` slot entries!"
+        );
+        self.create_slots_for_cells_above_with_rowspan(true);
+    }
+}
+
+pub(crate) struct TableBuilderTraversal<'style, 'dom> {
+    context: &'style LayoutContext<'style>,
+    info: &'style NodeAndStyleInfo<'dom>,
+
+    /// The value of the [`PropagatedBoxTreeData`] to use, either for the row group
+    /// if processing one or for the table itself if outside a row group.
+    current_propagated_data: PropagatedBoxTreeData,
+
+    /// The [`TableBuilder`] for this [`TableBuilderTraversal`]. This is separated
+    /// into another struct so that we can write unit tests against the builder.
+    builder: TableBuilder,
+
+    current_anonymous_row_content: Vec<AnonymousTableContent<'dom>>,
+
+    /// The index of the current row group, if there is one.
+    current_row_group_index: Option<usize>,
+}
+
+impl<'style, 'dom> TableBuilderTraversal<'style, 'dom> {
+    pub(crate) fn new(
+        context: &'style LayoutContext<'style>,
+        info: &'style NodeAndStyleInfo<'dom>,
+        grid_style: Arc<ComputedValues>,
+        propagated_data: PropagatedBoxTreeData,
+    ) -> Self {
+        TableBuilderTraversal {
+            context,
+            info,
+            current_propagated_data: propagated_data,
+            builder: TableBuilder::new(
+                info.style.clone(),
+                grid_style,
+                info.into(),
+                propagated_data.allow_percentage_column_in_tables,
+            ),
+            current_anonymous_row_content: Vec::new(),
+            current_row_group_index: None,
+        }
+    }
+
+    pub(crate) fn finish(mut self) -> Table {
+        self.finish_anonymous_row_if_needed();
+        self.builder.finish()
+    }
+
+    fn finish_anonymous_row_if_needed(&mut self) {
+        if AnonymousTableContent::contents_are_whitespace_only(&self.current_anonymous_row_content)
+        {
+            self.current_anonymous_row_content.clear();
+            return;
+        }
+
+        let row_content = std::mem::take(&mut self.current_anonymous_row_content);
+        let anonymous_info = self
+            .info
+            .pseudo(self.context, PseudoElement::ServoAnonymousTableRow)
+            .expect("Should never fail to create anonymous row info.");
+        let mut row_builder =
+            TableRowBuilder::new(self, &anonymous_info, self.current_propagated_data);
+
+        for cell_content in row_content {
+            match cell_content {
+                AnonymousTableContent::Element {
+                    info,
+                    display,
+                    contents,
+                    box_slot,
+                } => {
+                    row_builder.handle_element(&info, display, contents, box_slot);
+                },
+                AnonymousTableContent::Text(info, text) => {
+                    row_builder.handle_text(&info, text);
+                },
+            }
+        }
+
+        row_builder.finish();
+
+        let style = anonymous_info.style.clone();
+        self.push_table_row(ArcRefCell::new(TableTrack {
+            base: LayoutBoxBase::new((&anonymous_info).into(), style.clone()),
+            group_index: self.current_row_group_index,
+            is_anonymous: true,
+            shared_background_style: SharedStyle::new(style),
+        }));
+    }
+
+    fn push_table_row(&mut self, table_track: ArcRefCell<TableTrack>) {
+        self.builder.table.rows.push(table_track);
+
+        let last_row = self.builder.table.rows.len();
+        if let Some(index) = self.current_row_group_index {
+            let row_group = &mut self.builder.table.row_groups[index];
+            row_group.borrow_mut().track_range.end = last_row;
+        }
+    }
+}
+
+impl<'dom> TraversalHandler<'dom> for TableBuilderTraversal<'_, 'dom> {
+    fn handle_text(&mut self, info: &NodeAndStyleInfo<'dom>, text: Cow<'dom, str>) {
+        self.current_anonymous_row_content
+            .push(AnonymousTableContent::Text(info.clone(), text));
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#forming-a-table>
+    fn handle_element(
+        &mut self,
+        info: &NodeAndStyleInfo<'dom>,
+        display: DisplayGeneratingBox,
+        contents: Contents,
+        box_slot: BoxSlot<'dom>,
+    ) {
+        match display {
+            DisplayGeneratingBox::LayoutInternal(internal) => match internal {
+                DisplayLayoutInternal::TableRowGroup |
+                DisplayLayoutInternal::TableFooterGroup |
+                DisplayLayoutInternal::TableHeaderGroup => {
+                    self.finish_anonymous_row_if_needed();
+                    self.builder.incoming_rowspans.clear();
+
+                    let next_row_index = self.builder.table.rows.len();
+                    let row_group = ArcRefCell::new(TableTrackGroup {
+                        base: LayoutBoxBase::new(info.into(), info.style.clone()),
+                        group_type: internal.into(),
+                        track_range: next_row_index..next_row_index,
+                        shared_background_style: SharedStyle::new(info.style.clone()),
+                    });
+                    self.builder.table.row_groups.push(row_group.clone());
+
+                    let previous_propagated_data = self.current_propagated_data;
+                    self.current_propagated_data = self.current_propagated_data.union(&info.style);
+
+                    let new_row_group_index = self.builder.table.row_groups.len() - 1;
+                    self.current_row_group_index = Some(new_row_group_index);
+
+                    NonReplacedContents::try_from(contents).unwrap().traverse(
+                        self.context,
+                        info,
+                        self,
+                    );
+                    self.finish_anonymous_row_if_needed();
+
+                    self.current_row_group_index = None;
+                    self.current_propagated_data = previous_propagated_data;
+                    self.builder.incoming_rowspans.clear();
+
+                    box_slot.set(LayoutBox::TableLevelBox(TableLevelBox::TrackGroup(
+                        row_group,
+                    )));
+                },
+                DisplayLayoutInternal::TableRow => {
+                    self.finish_anonymous_row_if_needed();
+
+                    let context = self.context;
+
+                    let mut row_builder =
+                        TableRowBuilder::new(self, info, self.current_propagated_data);
+                    NonReplacedContents::try_from(contents).unwrap().traverse(
+                        context,
+                        info,
+                        &mut row_builder,
+                    );
+                    row_builder.finish();
+
+                    let row = ArcRefCell::new(TableTrack {
+                        base: LayoutBoxBase::new(info.into(), info.style.clone()),
+                        group_index: self.current_row_group_index,
+                        is_anonymous: false,
+                        shared_background_style: SharedStyle::new(info.style.clone()),
+                    });
+                    self.push_table_row(row.clone());
+                    box_slot.set(LayoutBox::TableLevelBox(TableLevelBox::Track(row)));
+                },
+                DisplayLayoutInternal::TableColumn => {
+                    let column = add_column(
+                        &mut self.builder.table.columns,
+                        info,
+                        None,  /* group_index */
+                        false, /* is_anonymous */
+                    );
+                    box_slot.set(LayoutBox::TableLevelBox(TableLevelBox::Track(column)));
+                },
+                DisplayLayoutInternal::TableColumnGroup => {
+                    let column_group_index = self.builder.table.column_groups.len();
+                    let mut column_group_builder = TableColumnGroupBuilder {
+                        column_group_index,
+                        columns: Vec::new(),
+                    };
+
+                    NonReplacedContents::try_from(contents).unwrap().traverse(
+                        self.context,
+                        info,
+                        &mut column_group_builder,
+                    );
+
+                    let first_column = self.builder.table.columns.len();
+                    if column_group_builder.columns.is_empty() {
+                        add_column(
+                            &mut self.builder.table.columns,
+                            info,
+                            Some(column_group_index),
+                            true, /* is_anonymous */
+                        );
+                    } else {
+                        self.builder
+                            .table
+                            .columns
+                            .extend(column_group_builder.columns);
+                    }
+
+                    let column_group = ArcRefCell::new(TableTrackGroup {
+                        base: LayoutBoxBase::new(info.into(), info.style.clone()),
+                        group_type: internal.into(),
+                        track_range: first_column..self.builder.table.columns.len(),
+                        shared_background_style: SharedStyle::new(info.style.clone()),
+                    });
+                    self.builder.table.column_groups.push(column_group.clone());
+                    box_slot.set(LayoutBox::TableLevelBox(TableLevelBox::TrackGroup(
+                        column_group,
+                    )));
+                },
+                DisplayLayoutInternal::TableCaption => {
+                    let contents = match contents.try_into() {
+                        Ok(non_replaced_contents) => {
+                            IndependentNonReplacedContents::Flow(BlockFormattingContext::construct(
+                                self.context,
+                                info,
+                                non_replaced_contents,
+                                self.current_propagated_data,
+                                false, /* is_list_item */
+                            ))
+                        },
+                        Err(_replaced) => {
+                            unreachable!("Replaced should not have a LayoutInternal display type.");
+                        },
+                    };
+
+                    let caption = ArcRefCell::new(TableCaption {
+                        context: IndependentFormattingContext {
+                            base: LayoutBoxBase::new(info.into(), info.style.clone()),
+                            contents: IndependentFormattingContextContents::NonReplaced(contents),
+                        },
+                    });
+                    self.builder.table.captions.push(caption.clone());
+                    box_slot.set(LayoutBox::TableLevelBox(TableLevelBox::Caption(caption)));
+                },
+                DisplayLayoutInternal::TableCell => {
+                    self.current_anonymous_row_content
+                        .push(AnonymousTableContent::Element {
+                            info: info.clone(),
+                            display,
+                            contents,
+                            box_slot,
+                        });
+                },
+            },
+            _ => {
+                self.current_anonymous_row_content
+                    .push(AnonymousTableContent::Element {
+                        info: info.clone(),
+                        display,
+                        contents,
+                        box_slot,
+                    });
+            },
+        }
+    }
+}
+
+struct TableRowBuilder<'style, 'builder, 'dom, 'a> {
+    table_traversal: &'builder mut TableBuilderTraversal<'style, 'dom>,
+
+    /// The [`NodeAndStyleInfo`] of this table row, which we use to
+    /// construct anonymous table cells.
+    info: &'a NodeAndStyleInfo<'dom>,
+
+    current_anonymous_cell_content: Vec<AnonymousTableContent<'dom>>,
+
+    /// The [`PropagatedBoxTreeData`] to use for all children of this row.
+    propagated_data: PropagatedBoxTreeData,
+}
+
+impl<'style, 'builder, 'dom, 'a> TableRowBuilder<'style, 'builder, 'dom, 'a> {
+    fn new(
+        table_traversal: &'builder mut TableBuilderTraversal<'style, 'dom>,
+        info: &'a NodeAndStyleInfo<'dom>,
+        propagated_data: PropagatedBoxTreeData,
+    ) -> Self {
+        table_traversal.builder.start_row();
+
+        TableRowBuilder {
+            table_traversal,
+            info,
+            current_anonymous_cell_content: Vec::new(),
+            propagated_data: propagated_data.union(&info.style),
+        }
+    }
+
+    fn finish(mut self) {
+        self.finish_current_anonymous_cell_if_needed();
+        self.table_traversal.builder.end_row();
+    }
+
+    fn finish_current_anonymous_cell_if_needed(&mut self) {
+        if AnonymousTableContent::contents_are_whitespace_only(&self.current_anonymous_cell_content)
+        {
+            self.current_anonymous_cell_content.clear();
+            return;
+        }
+
+        let context = self.table_traversal.context;
+        let anonymous_info = self
+            .info
+            .pseudo(context, PseudoElement::ServoAnonymousTableCell)
+            .expect("Should never fail to create anonymous table cell info");
+        let propagated_data = self.propagated_data.disallowing_percentage_table_columns();
+        let mut builder = BlockContainerBuilder::new(context, &anonymous_info, propagated_data);
+
+        for cell_content in self.current_anonymous_cell_content.drain(..) {
+            match cell_content {
+                AnonymousTableContent::Element {
+                    info,
+                    display,
+                    contents,
+                    box_slot,
+                } => {
+                    builder.handle_element(&info, display, contents, box_slot);
+                },
+                AnonymousTableContent::Text(info, text) => {
+                    builder.handle_text(&info, text);
+                },
+            }
+        }
+
+        let block_container = builder.finish();
+        self.table_traversal
+            .builder
+            .add_cell(ArcRefCell::new(TableSlotCell {
+                base: LayoutBoxBase::new(BaseFragmentInfo::anonymous(), anonymous_info.style),
+                contents: BlockFormattingContext::from_block_container(block_container),
+                colspan: 1,
+                rowspan: 1,
+            }));
+    }
+}
+
+impl<'dom> TraversalHandler<'dom> for TableRowBuilder<'_, '_, 'dom, '_> {
+    fn handle_text(&mut self, info: &NodeAndStyleInfo<'dom>, text: Cow<'dom, str>) {
+        self.current_anonymous_cell_content
+            .push(AnonymousTableContent::Text(info.clone(), text));
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#algorithm-for-processing-rows>
+    fn handle_element(
+        &mut self,
+        info: &NodeAndStyleInfo<'dom>,
+        display: DisplayGeneratingBox,
+        contents: Contents,
+        box_slot: BoxSlot<'dom>,
+    ) {
+        #[allow(clippy::collapsible_match)] //// TODO: Remove once the other cases are handled
+        match display {
+            DisplayGeneratingBox::LayoutInternal(internal) => match internal {
+                DisplayLayoutInternal::TableCell => {
+                    // This value will already have filtered out rowspan=0
+                    // in quirks mode, so we don't have to worry about that.
+                    let (rowspan, colspan) = if info.pseudo_element_type.is_none() {
+                        let node = info.node.to_threadsafe();
+                        let rowspan = node.get_rowspan().unwrap_or(1) as usize;
+                        let colspan = node.get_colspan().unwrap_or(1) as usize;
+
+                        // The HTML specification clamps value of `rowspan` to [0, 65534] and
+                        // `colspan` to [1, 1000].
+                        assert!((1..=1000).contains(&colspan));
+                        assert!((0..=65534).contains(&rowspan));
+
+                        (rowspan, colspan)
+                    } else {
+                        (1, 1)
+                    };
+
+                    let propagated_data =
+                        self.propagated_data.disallowing_percentage_table_columns();
+                    let contents = match contents.try_into() {
+                        Ok(non_replaced_contents) => {
+                            BlockFormattingContext::construct(
+                                self.table_traversal.context,
+                                info,
+                                non_replaced_contents,
+                                propagated_data,
+                                false, /* is_list_item */
+                            )
+                        },
+                        Err(_replaced) => {
+                            unreachable!("Replaced should not have a LayoutInternal display type.");
+                        },
+                    };
+
+                    self.finish_current_anonymous_cell_if_needed();
+
+                    let cell = ArcRefCell::new(TableSlotCell {
+                        base: LayoutBoxBase::new(info.into(), info.style.clone()),
+                        contents,
+                        colspan,
+                        rowspan,
+                    });
+                    self.table_traversal.builder.add_cell(cell.clone());
+                    box_slot.set(LayoutBox::TableLevelBox(TableLevelBox::Cell(cell)));
+                },
+                _ => {
+                    //// TODO: Properly handle other table-like elements in the middle of a row.
+                    self.current_anonymous_cell_content
+                        .push(AnonymousTableContent::Element {
+                            info: info.clone(),
+                            display,
+                            contents,
+                            box_slot,
+                        });
+                },
+            },
+            _ => {
+                self.current_anonymous_cell_content
+                    .push(AnonymousTableContent::Element {
+                        info: info.clone(),
+                        display,
+                        contents,
+                        box_slot,
+                    });
+            },
+        }
+    }
+}
+
+struct TableColumnGroupBuilder {
+    column_group_index: usize,
+    columns: Vec<ArcRefCell<TableTrack>>,
+}
+
+impl<'dom> TraversalHandler<'dom> for TableColumnGroupBuilder {
+    fn handle_text(&mut self, _info: &NodeAndStyleInfo<'dom>, _text: Cow<'dom, str>) {}
+    fn handle_element(
+        &mut self,
+        info: &NodeAndStyleInfo<'dom>,
+        display: DisplayGeneratingBox,
+        _contents: Contents,
+        box_slot: BoxSlot<'dom>,
+    ) {
+        if !matches!(
+            display,
+            DisplayGeneratingBox::LayoutInternal(DisplayLayoutInternal::TableColumn)
+        ) {
+            // The BoxSlot destructor will check to ensure that it isn't empty but in this case, the
+            // DOM node doesn't produce any box, so explicitly skip the destructor here.
+            ::std::mem::forget(box_slot);
+            return;
+        }
+        let column = add_column(
+            &mut self.columns,
+            info,
+            Some(self.column_group_index),
+            false, /* is_anonymous */
+        );
+        box_slot.set(LayoutBox::TableLevelBox(TableLevelBox::Track(column)));
+    }
+}
+
+impl From<DisplayLayoutInternal> for TableTrackGroupType {
+    fn from(value: DisplayLayoutInternal) -> Self {
+        match value {
+            DisplayLayoutInternal::TableColumnGroup => TableTrackGroupType::ColumnGroup,
+            DisplayLayoutInternal::TableFooterGroup => TableTrackGroupType::FooterGroup,
+            DisplayLayoutInternal::TableHeaderGroup => TableTrackGroupType::HeaderGroup,
+            DisplayLayoutInternal::TableRowGroup => TableTrackGroupType::RowGroup,
+            _ => unreachable!(),
+        }
+    }
+}
+
+fn add_column(
+    collection: &mut Vec<ArcRefCell<TableTrack>>,
+    column_info: &NodeAndStyleInfo,
+    group_index: Option<usize>,
+    is_anonymous: bool,
+) -> ArcRefCell<TableTrack> {
+    let span = if column_info.pseudo_element_type.is_none() {
+        column_info.node.to_threadsafe().get_span().unwrap_or(1)
+    } else {
+        1
+    };
+
+    // The HTML specification clamps value of `span` for `<col>` to [1, 1000].
+    assert!((1..=1000).contains(&span));
+
+    let column = ArcRefCell::new(TableTrack {
+        base: LayoutBoxBase::new(column_info.into(), column_info.style.clone()),
+        group_index,
+        is_anonymous,
+        shared_background_style: SharedStyle::new(column_info.style.clone()),
+    });
+    collection.extend(repeat(column.clone()).take(span as usize));
+    column
+}
diff --git a/components/layout/table/layout.rs b/components/layout/table/layout.rs
new file mode 100644
index 00000000000..5b7e79d7fb0
--- /dev/null
+++ b/components/layout/table/layout.rs
@@ -0,0 +1,3037 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use core::cmp::Ordering;
+use std::mem;
+use std::ops::Range;
+
+use app_units::Au;
+use atomic_refcell::AtomicRef;
+use log::warn;
+use rayon::iter::{IndexedParallelIterator, IntoParallelRefIterator, ParallelIterator};
+use servo_arc::Arc;
+use style::Zero;
+use style::computed_values::border_collapse::T as BorderCollapse;
+use style::computed_values::box_sizing::T as BoxSizing;
+use style::computed_values::caption_side::T as CaptionSide;
+use style::computed_values::empty_cells::T as EmptyCells;
+use style::computed_values::position::T as Position;
+use style::computed_values::table_layout::T as TableLayoutMode;
+use style::computed_values::visibility::T as Visibility;
+use style::properties::ComputedValues;
+use style::values::computed::{
+    BorderStyle, LengthPercentage as ComputedLengthPercentage, Percentage,
+};
+use style::values::generics::box_::{GenericVerticalAlign as VerticalAlign, VerticalAlignKeyword};
+
+use super::{
+    ArcRefCell, CollapsedBorder, CollapsedBorderLine, SpecificTableGridInfo, Table, TableCaption,
+    TableLayoutStyle, TableSlot, TableSlotCell, TableSlotCoordinates, TableTrack, TableTrackGroup,
+};
+use crate::context::LayoutContext;
+use crate::formatting_contexts::Baselines;
+use crate::fragment_tree::{
+    BoxFragment, CollapsedBlockMargins, ExtraBackground, Fragment, FragmentFlags,
+    PositioningFragment, SpecificLayoutInfo,
+};
+use crate::geom::{
+    LogicalRect, LogicalSides, LogicalSides1D, LogicalVec2, PhysicalPoint, PhysicalRect,
+    PhysicalSides, PhysicalVec, Size, SizeConstraint, ToLogical, ToLogicalWithContainingBlock,
+};
+use crate::layout_box_base::CacheableLayoutResult;
+use crate::positioned::{PositioningContext, PositioningContextLength, relative_adjustement};
+use crate::sizing::{ComputeInlineContentSizes, ContentSizes, InlineContentSizesResult};
+use crate::style_ext::{
+    BorderStyleColor, Clamp, ComputedValuesExt, LayoutStyle, PaddingBorderMargin,
+};
+use crate::{
+    ConstraintSpace, ContainingBlock, ContainingBlockSize, IndefiniteContainingBlock, WritingMode,
+};
+
+/// A result of a final or speculative layout of a single cell in
+/// the table. Note that this is only done for slots that are not
+/// covered by spans or empty.
+struct CellLayout {
+    layout: CacheableLayoutResult,
+    padding: LogicalSides<Au>,
+    border: LogicalSides<Au>,
+    positioning_context: PositioningContext,
+}
+
+impl CellLayout {
+    fn ascent(&self) -> Au {
+        self.layout
+            .baselines
+            .first
+            .unwrap_or(self.layout.content_block_size)
+    }
+
+    /// The block size of this laid out cell including its border and padding.
+    fn outer_block_size(&self) -> Au {
+        self.layout.content_block_size + self.border.block_sum() + self.padding.block_sum()
+    }
+
+    /// Whether the cell has no in-flow or out-of-flow contents, other than collapsed whitespace.
+    /// Note this logic differs from 'empty-cells', which counts abspos contents as empty.
+    fn is_empty(&self) -> bool {
+        self.layout.fragments.is_empty()
+    }
+
+    /// Whether the cell is considered empty for the purpose of the 'empty-cells' property.
+    fn is_empty_for_empty_cells(&self) -> bool {
+        self.layout
+            .fragments
+            .iter()
+            .all(|fragment| matches!(fragment, Fragment::AbsoluteOrFixedPositioned(_)))
+    }
+}
+
+/// Information stored during the layout of rows.
+#[derive(Clone, Debug, Default)]
+struct RowLayout {
+    constrained: bool,
+    has_cell_with_span_greater_than_one: bool,
+    percent: Percentage,
+}
+
+/// Information stored during the layout of columns.
+#[derive(Clone, Debug, Default)]
+struct ColumnLayout {
+    constrained: bool,
+    has_originating_cells: bool,
+    content_sizes: ContentSizes,
+    percentage: Option<Percentage>,
+}
+
+fn max_two_optional_percentages(
+    a: Option<Percentage>,
+    b: Option<Percentage>,
+) -> Option<Percentage> {
+    match (a, b) {
+        (Some(a), Some(b)) => Some(Percentage(a.0.max(b.0))),
+        _ => a.or(b),
+    }
+}
+
+impl ColumnLayout {
+    fn incorporate_cell_measure(&mut self, cell_measure: &CellOrTrackMeasure) {
+        self.content_sizes.max_assign(cell_measure.content_sizes);
+        self.percentage = max_two_optional_percentages(self.percentage, cell_measure.percentage);
+    }
+}
+
+impl CollapsedBorder {
+    fn new(style_color: BorderStyleColor, width: Au) -> Self {
+        Self { style_color, width }
+    }
+
+    fn from_layout_style(
+        layout_style: &LayoutStyle,
+        writing_mode: WritingMode,
+    ) -> LogicalSides<Self> {
+        let border_style_color = layout_style.style().border_style_color(writing_mode);
+        let border_width = layout_style.border_width(writing_mode);
+        LogicalSides {
+            inline_start: Self::new(border_style_color.inline_start, border_width.inline_start),
+            inline_end: Self::new(border_style_color.inline_end, border_width.inline_end),
+            block_start: Self::new(border_style_color.block_start, border_width.block_start),
+            block_end: Self::new(border_style_color.block_end, border_width.block_end),
+        }
+    }
+
+    fn max_assign(&mut self, other: &Self) {
+        if *self < *other {
+            *self = other.clone();
+        }
+    }
+
+    fn max_assign_to_slice(&self, slice: &mut [CollapsedBorder]) {
+        for collapsed_border in slice {
+            collapsed_border.max_assign(self)
+        }
+    }
+
+    fn hide(&mut self) {
+        self.style_color = BorderStyleColor::hidden();
+        self.width = Au::zero();
+    }
+}
+
+/// <https://drafts.csswg.org/css-tables/#border-specificity>
+/// > Given two borders styles, the border style having the most specificity is the border style which…
+/// > 1. … has the value "hidden" as border-style, if only one does
+/// > 2. … has the biggest border-width, once converted into css pixels
+/// > 3. … has the border-style which comes first in the following list:
+/// >    double, solid, dashed, dotted, ridge, outset, groove, inset, none
+impl PartialOrd for CollapsedBorder {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        let is_hidden = |border: &Self| border.style_color.style == BorderStyle::Hidden;
+        let style_specificity = |border: &Self| match border.style_color.style {
+            BorderStyle::None => 0,
+            BorderStyle::Inset => 1,
+            BorderStyle::Groove => 2,
+            BorderStyle::Outset => 3,
+            BorderStyle::Ridge => 4,
+            BorderStyle::Dotted => 5,
+            BorderStyle::Dashed => 6,
+            BorderStyle::Solid => 7,
+            BorderStyle::Double => 8,
+            BorderStyle::Hidden => 9,
+        };
+        let candidate = (is_hidden(self).cmp(&is_hidden(other)))
+            .then_with(|| self.width.cmp(&other.width))
+            .then_with(|| style_specificity(self).cmp(&style_specificity(other)));
+        if !candidate.is_eq() || self.style_color.color == other.style_color.color {
+            Some(candidate)
+        } else {
+            None
+        }
+    }
+}
+
+impl Eq for CollapsedBorder {}
+
+type CollapsedBorders = LogicalVec2<Vec<CollapsedBorderLine>>;
+
+/// A helper struct that performs the layout of the box tree version
+/// of a table into the fragment tree version. This implements
+/// <https://drafts.csswg.org/css-tables/#table-layout-algorithm>
+pub(crate) struct TableLayout<'a> {
+    table: &'a Table,
+    pbm: PaddingBorderMargin,
+    rows: Vec<RowLayout>,
+    columns: Vec<ColumnLayout>,
+    cell_measures: Vec<Vec<LogicalVec2<CellOrTrackMeasure>>>,
+    /// The calculated width of the table, including space for the grid and also for any
+    /// captions.
+    table_width: Au,
+    /// The table width minus the total horizontal border spacing (if any). This is the
+    /// width that we will be able to allocate to the columns.
+    assignable_width: Au,
+    final_table_height: Au,
+    distributed_column_widths: Vec<Au>,
+    row_sizes: Vec<Au>,
+    /// The accumulated baseline of each row, relative to the top of the row.
+    row_baselines: Vec<Au>,
+    cells_laid_out: Vec<Vec<Option<CellLayout>>>,
+    basis_for_cell_padding_percentage: Au,
+    /// Information about collapsed borders.
+    collapsed_borders: Option<CollapsedBorders>,
+    is_in_fixed_mode: bool,
+}
+
+#[derive(Clone, Debug)]
+struct CellOrTrackMeasure {
+    content_sizes: ContentSizes,
+    percentage: Option<Percentage>,
+}
+
+impl Zero for CellOrTrackMeasure {
+    fn zero() -> Self {
+        Self {
+            content_sizes: ContentSizes::zero(),
+            percentage: None,
+        }
+    }
+
+    fn is_zero(&self) -> bool {
+        self.content_sizes.is_zero() && self.percentage.is_none()
+    }
+}
+
+impl<'a> TableLayout<'a> {
+    fn new(table: &'a Table) -> TableLayout<'a> {
+        // The CSSWG resolved that only `inline-size: auto` can prevent fixed table mode.
+        // <https://github.com/w3c/csswg-drafts/issues/10937#issuecomment-2669150397>
+        let style = &table.style;
+        let is_in_fixed_mode = style.get_table().table_layout == TableLayoutMode::Fixed &&
+            !style.box_size(style.writing_mode).inline.is_initial();
+        Self {
+            table,
+            pbm: PaddingBorderMargin::zero(),
+            rows: Vec::new(),
+            columns: Vec::new(),
+            cell_measures: Vec::new(),
+            table_width: Au::zero(),
+            assignable_width: Au::zero(),
+            final_table_height: Au::zero(),
+            distributed_column_widths: Vec::new(),
+            row_sizes: Vec::new(),
+            row_baselines: Vec::new(),
+            cells_laid_out: Vec::new(),
+            basis_for_cell_padding_percentage: Au::zero(),
+            collapsed_borders: None,
+            is_in_fixed_mode,
+        }
+    }
+
+    /// This is an implementation of *Computing Cell Measures* from
+    /// <https://drafts.csswg.org/css-tables/#computing-cell-measures>.
+    pub(crate) fn compute_cell_measures(
+        &mut self,
+        layout_context: &LayoutContext,
+        writing_mode: WritingMode,
+    ) {
+        let row_measures = vec![LogicalVec2::zero(); self.table.size.width];
+        self.cell_measures = vec![row_measures; self.table.size.height];
+
+        for row_index in 0..self.table.size.height {
+            for column_index in 0..self.table.size.width {
+                let cell = match self.table.slots[row_index][column_index] {
+                    TableSlot::Cell(ref cell) => cell,
+                    _ => continue,
+                }
+                .borrow();
+
+                let layout_style = cell.layout_style();
+                let padding = layout_style
+                    .padding(writing_mode)
+                    .percentages_relative_to(Au::zero());
+                let border = self
+                    .get_collapsed_border_widths_for_area(LogicalSides {
+                        inline_start: column_index,
+                        inline_end: column_index + cell.colspan,
+                        block_start: row_index,
+                        block_end: row_index + cell.rowspan,
+                    })
+                    .unwrap_or_else(|| layout_style.border_width(writing_mode));
+
+                let padding_border_sums = LogicalVec2 {
+                    inline: padding.inline_sum() + border.inline_sum(),
+                    block: padding.block_sum() + border.block_sum(),
+                };
+
+                let CellOrColumnOuterSizes {
+                    preferred: preferred_size,
+                    min: min_size,
+                    max: max_size,
+                    percentage: percentage_size,
+                } = CellOrColumnOuterSizes::new(
+                    &cell.base.style,
+                    writing_mode,
+                    &padding_border_sums,
+                    self.is_in_fixed_mode,
+                );
+
+                // <https://drafts.csswg.org/css-tables/#in-fixed-mode>
+                // > When a table-root is laid out in fixed mode, the content of its table-cells is ignored
+                // > for the purpose of width computation, the aggregation algorithm for column sizing considers
+                // > only table-cells belonging to the first row track
+                let inline_measure = if self.is_in_fixed_mode {
+                    if row_index > 0 {
+                        CellOrTrackMeasure::zero()
+                    } else {
+                        CellOrTrackMeasure {
+                            content_sizes: preferred_size.inline.into(),
+                            percentage: percentage_size.inline,
+                        }
+                    }
+                } else {
+                    let inline_content_sizes = cell.inline_content_sizes(layout_context) +
+                        padding_border_sums.inline.into();
+                    assert!(
+                        inline_content_sizes.max_content >= inline_content_sizes.min_content,
+                        "the max-content size should never be smaller than the min-content size"
+                    );
+
+                    // These formulas differ from the spec, but seem to match Gecko and Blink.
+                    let outer_min_content_width = inline_content_sizes
+                        .min_content
+                        .clamp_between_extremums(min_size.inline, max_size.inline);
+                    let outer_max_content_width = if self.columns[column_index].constrained {
+                        inline_content_sizes
+                            .min_content
+                            .max(preferred_size.inline)
+                            .clamp_between_extremums(min_size.inline, max_size.inline)
+                    } else {
+                        inline_content_sizes
+                            .max_content
+                            .max(preferred_size.inline)
+                            .clamp_between_extremums(min_size.inline, max_size.inline)
+                    };
+                    assert!(outer_min_content_width <= outer_max_content_width);
+
+                    CellOrTrackMeasure {
+                        content_sizes: ContentSizes {
+                            min_content: outer_min_content_width,
+                            max_content: outer_max_content_width,
+                        },
+                        percentage: percentage_size.inline,
+                    }
+                };
+
+                // This measure doesn't take into account the `min-content` and `max-content` sizes.
+                // These sizes are incorporated after the first row layout pass, when the block size
+                // of the layout is known.
+                let block_measure = CellOrTrackMeasure {
+                    content_sizes: preferred_size.block.into(),
+                    percentage: percentage_size.block,
+                };
+
+                self.cell_measures[row_index][column_index] = LogicalVec2 {
+                    inline: inline_measure,
+                    block: block_measure,
+                };
+            }
+        }
+    }
+
+    /// Compute the constrainedness of every column in the table.
+    ///
+    /// > A column is constrained if its corresponding table-column-group (if any), its
+    /// > corresponding table-column (if any), or any of the cells spanning only that
+    /// > column has a computed width that is not "auto", and is not a percentage.
+    fn compute_track_constrainedness_and_has_originating_cells(
+        &mut self,
+        writing_mode: WritingMode,
+    ) {
+        self.rows = vec![RowLayout::default(); self.table.size.height];
+        self.columns = vec![ColumnLayout::default(); self.table.size.width];
+
+        let is_length = |size: &Size<ComputedLengthPercentage>| {
+            size.to_numeric().is_some_and(|size| !size.has_percentage())
+        };
+
+        for column_index in 0..self.table.size.width {
+            if let Some(column) = self.table.columns.get(column_index) {
+                let column = column.borrow();
+                if is_length(&column.base.style.box_size(writing_mode).inline) {
+                    self.columns[column_index].constrained = true;
+                    continue;
+                }
+                if let Some(column_group_index) = column.group_index {
+                    let column_group = self.table.column_groups[column_group_index].borrow();
+                    if is_length(&column_group.base.style.box_size(writing_mode).inline) {
+                        self.columns[column_index].constrained = true;
+                        continue;
+                    }
+                }
+            }
+        }
+
+        for row_index in 0..self.table.size.height {
+            if let Some(row) = self.table.rows.get(row_index) {
+                let row = row.borrow();
+                if is_length(&row.base.style.box_size(writing_mode).block) {
+                    self.rows[row_index].constrained = true;
+                    continue;
+                }
+                if let Some(row_group_index) = row.group_index {
+                    let row_group = self.table.row_groups[row_group_index].borrow();
+                    if is_length(&row_group.base.style.box_size(writing_mode).block) {
+                        self.rows[row_index].constrained = true;
+                        continue;
+                    }
+                }
+            }
+        }
+
+        for column_index in 0..self.table.size.width {
+            for row_index in 0..self.table.size.height {
+                let coords = TableSlotCoordinates::new(column_index, row_index);
+                let cell_constrained = match self.table.resolve_first_cell(coords) {
+                    Some(cell) if cell.colspan == 1 => {
+                        cell.base.style.box_size(writing_mode).map(is_length)
+                    },
+                    _ => LogicalVec2::default(),
+                };
+
+                let rowspan_greater_than_1 = match self.table.slots[row_index][column_index] {
+                    TableSlot::Cell(ref cell) => cell.borrow().rowspan > 1,
+                    _ => false,
+                };
+
+                self.rows[row_index].has_cell_with_span_greater_than_one |= rowspan_greater_than_1;
+                self.rows[row_index].constrained |= cell_constrained.block;
+
+                let has_originating_cell =
+                    matches!(self.table.get_slot(coords), Some(TableSlot::Cell(_)));
+                self.columns[column_index].has_originating_cells |= has_originating_cell;
+                self.columns[column_index].constrained |= cell_constrained.inline;
+            }
+        }
+    }
+
+    /// This is an implementation of *Computing Column Measures* from
+    /// <https://drafts.csswg.org/css-tables/#computing-column-measures>.
+    fn compute_column_measures(&mut self, writing_mode: WritingMode) {
+        // Compute the column measures only taking into account cells with colspan == 1.
+        // This is the base case that will be used to iteratively account for cells with
+        // larger colspans afterward.
+        //
+        // > min-content width of a column based on cells of span up to 1
+        // >     The largest of:
+        // >         - the width specified for the column:
+        // >               - the outer min-content width of its corresponding table-column,
+        // >                 if any (and not auto)
+        // >               - the outer min-content width of its corresponding table-column-group, if any
+        // >               - or 0, if there is none
+        // >         - the outer min-content width of each cell that spans the column whose colSpan
+        // >           is 1 (or just the one in the first row in fixed mode) or 0 if there is none
+        // >
+        // > max-content width of a column based on cells of span up to 1
+        // >     The largest of:
+        // >         - the outer max-content width of its corresponding
+        // >           table-column-group, if any
+        // >         - the outer max-content width of its corresponding table-column, if any
+        // >         - the outer max-content width of each cell that spans the column
+        // >           whose colSpan is 1 (or just the one in the first row if in fixed mode) or 0
+        // >           if there is no such cell
+        // >
+        // > intrinsic percentage width of a column based on cells of span up to 1
+        // >     The largest of the percentage contributions of each cell that spans the column whose colSpan is
+        // >     1, of its corresponding table-column (if any), and of its corresponding table-column-group (if
+        // >     any)
+        //
+        // TODO: Take into account `table-column` and `table-column-group` lengths.
+        // TODO: Take into account changes to this computation for fixed table layout.
+        let mut colspan_cell_constraints = Vec::new();
+        for column_index in 0..self.table.size.width {
+            let column = &mut self.columns[column_index];
+
+            let column_measure = self.table.get_column_measure_for_column_at_index(
+                writing_mode,
+                column_index,
+                self.is_in_fixed_mode,
+            );
+            column.content_sizes = column_measure.content_sizes;
+            column.percentage = column_measure.percentage;
+
+            for row_index in 0..self.table.size.height {
+                let coords = TableSlotCoordinates::new(column_index, row_index);
+                let cell_measure = &self.cell_measures[row_index][column_index].inline;
+
+                let cell = match self.table.get_slot(coords) {
+                    Some(TableSlot::Cell(cell)) => cell,
+                    _ => continue,
+                }
+                .borrow();
+
+                if cell.colspan != 1 {
+                    colspan_cell_constraints.push(ColspanToDistribute {
+                        starting_column: column_index,
+                        span: cell.colspan,
+                        content_sizes: cell_measure.content_sizes,
+                        percentage: cell_measure.percentage,
+                    });
+                    continue;
+                }
+
+                // This takes the max of `min_content`, `max_content`, and
+                // intrinsic percentage width as described above.
+                column.incorporate_cell_measure(cell_measure);
+            }
+        }
+
+        // Sort the colspanned cell constraints by their span and starting column.
+        colspan_cell_constraints.sort_by(ColspanToDistribute::comparison_for_sort);
+
+        // Distribute constraints from cells with colspan != 1 to their component columns.
+        self.distribute_colspanned_cells_to_columns(colspan_cell_constraints);
+
+        // > intrinsic percentage width of a column:
+        // > the smaller of:
+        // >   * the intrinsic percentage width of the column based on cells of span up to N,
+        // >     where N is the number of columns in the table
+        // >   * 100% minus the sum of the intrinsic percentage width of all prior columns in
+        // >     the table (further left when direction is "ltr" (right for "rtl"))
+        let mut total_intrinsic_percentage_width = 0.;
+        for column in self.columns.iter_mut() {
+            if let Some(ref mut percentage) = column.percentage {
+                let final_intrinsic_percentage_width =
+                    percentage.0.min(1. - total_intrinsic_percentage_width);
+                total_intrinsic_percentage_width += final_intrinsic_percentage_width;
+                *percentage = Percentage(final_intrinsic_percentage_width);
+            }
+        }
+    }
+
+    fn distribute_colspanned_cells_to_columns(
+        &mut self,
+        colspan_cell_constraints: Vec<ColspanToDistribute>,
+    ) {
+        for colspan_cell_constraints in colspan_cell_constraints {
+            self.distribute_colspanned_cell_to_columns(colspan_cell_constraints);
+        }
+    }
+
+    /// Distribute the inline size from a cell with colspan != 1 to the columns that it spans.
+    /// This is heavily inspired by the approach that Chromium takes in redistributing colspan
+    /// cells' inline size to columns (`DistributeColspanCellToColumnsAuto` in
+    /// `blink/renderer/core/layout/table/table_layout_utils.cc`).
+    fn distribute_colspanned_cell_to_columns(
+        &mut self,
+        colspan_cell_constraints: ColspanToDistribute,
+    ) {
+        let border_spacing = self.table.border_spacing().inline;
+        let column_range = colspan_cell_constraints.range();
+        let column_count = column_range.len();
+        let total_border_spacing =
+            border_spacing.scale_by((colspan_cell_constraints.span - 1) as f32);
+
+        let mut percent_columns_count = 0;
+        let mut columns_percent_sum = 0.;
+        let mut columns_non_percent_max_inline_size_sum = Au::zero();
+        for column in self.columns[column_range.clone()].iter() {
+            if let Some(percentage) = column.percentage {
+                percent_columns_count += 1;
+                columns_percent_sum += percentage.0;
+            } else {
+                columns_non_percent_max_inline_size_sum += column.content_sizes.max_content;
+            }
+        }
+
+        let colspan_percentage = colspan_cell_constraints.percentage.unwrap_or_default();
+        let surplus_percent = colspan_percentage.0 - columns_percent_sum;
+        if surplus_percent > 0. && column_count > percent_columns_count {
+            for column in self.columns[column_range.clone()].iter_mut() {
+                if column.percentage.is_some() {
+                    continue;
+                }
+
+                let ratio = if columns_non_percent_max_inline_size_sum.is_zero() {
+                    1. / ((column_count - percent_columns_count) as f32)
+                } else {
+                    column.content_sizes.max_content.to_f32_px() /
+                        columns_non_percent_max_inline_size_sum.to_f32_px()
+                };
+                column.percentage = Some(Percentage(surplus_percent * ratio));
+            }
+        }
+
+        let colspan_cell_min_size = (colspan_cell_constraints.content_sizes.min_content -
+            total_border_spacing)
+            .max(Au::zero());
+        let distributed_minimum = Self::distribute_width_to_columns(
+            colspan_cell_min_size,
+            &self.columns[column_range.clone()],
+        );
+        {
+            let column_span = &mut self.columns[colspan_cell_constraints.range()];
+            for (column, minimum_size) in column_span.iter_mut().zip(distributed_minimum) {
+                column.content_sizes.min_content.max_assign(minimum_size);
+            }
+        }
+
+        let colspan_cell_max_size = (colspan_cell_constraints.content_sizes.max_content -
+            total_border_spacing)
+            .max(Au::zero());
+        let distributed_maximum = Self::distribute_width_to_columns(
+            colspan_cell_max_size,
+            &self.columns[colspan_cell_constraints.range()],
+        );
+        {
+            let column_span = &mut self.columns[colspan_cell_constraints.range()];
+            for (column, maximum_size) in column_span.iter_mut().zip(distributed_maximum) {
+                column
+                    .content_sizes
+                    .max_content
+                    .max_assign(maximum_size.max(column.content_sizes.min_content));
+            }
+        }
+    }
+
+    fn compute_measures(&mut self, layout_context: &LayoutContext, writing_mode: WritingMode) {
+        self.compute_track_constrainedness_and_has_originating_cells(writing_mode);
+        self.compute_cell_measures(layout_context, writing_mode);
+        self.compute_column_measures(writing_mode);
+    }
+
+    /// Compute the GRIDMIN and GRIDMAX.
+    fn compute_grid_min_max(&self) -> ContentSizes {
+        // https://drafts.csswg.org/css-tables/#gridmin:
+        // > The row/column-grid width minimum (GRIDMIN) width is the sum of the min-content width of
+        // > all the columns plus cell spacing or borders.
+        // https://drafts.csswg.org/css-tables/#gridmax:
+        // > The row/column-grid width maximum (GRIDMAX) width is the sum of the max-content width of
+        // > all the columns plus cell spacing or borders.
+        //
+        // The specification doesn't say what to do with columns with percentages, so we follow the
+        // approach that LayoutNG takes here. We try to figure out the size contribution
+        // of the percentage columns, by working backward to find the calculated
+        // percentage of non-percent columns and using that to calculate the size of the
+        // percent columns.
+        let mut largest_percentage_column_max_size = Au::zero();
+        let mut percent_sum = 0.;
+        let mut non_percent_columns_max_sum = Au::zero();
+        let mut grid_min_max = ContentSizes::zero();
+        for column in self.columns.iter() {
+            match column.percentage {
+                Some(percentage) if !percentage.is_zero() => {
+                    largest_percentage_column_max_size.max_assign(
+                        column
+                            .content_sizes
+                            .max_content
+                            .scale_by(1.0 / percentage.0),
+                    );
+                    percent_sum += percentage.0;
+                },
+                _ => {
+                    non_percent_columns_max_sum += column.content_sizes.max_content;
+                },
+            }
+
+            grid_min_max += column.content_sizes;
+        }
+
+        grid_min_max
+            .max_content
+            .max_assign(largest_percentage_column_max_size);
+
+        // Do not take into account percentage of columns when this table is a descendant
+        // of a flex, grid, or table container. These modes with percentage columns can
+        // cause inline width to become infinitely wide.
+        if !percent_sum.is_zero() &&
+            self.table
+                .percentage_columns_allowed_for_inline_content_sizes
+        {
+            let total_inline_size =
+                non_percent_columns_max_sum.scale_by(1.0 / (1.0 - percent_sum.min(1.0)));
+            grid_min_max.max_content.max_assign(total_inline_size);
+        }
+
+        assert!(
+            grid_min_max.min_content <= grid_min_max.max_content,
+            "GRIDMAX should never be smaller than GRIDMIN {:?}",
+            grid_min_max
+        );
+
+        let inline_border_spacing = self.table.total_border_spacing().inline;
+        grid_min_max.min_content += inline_border_spacing;
+        grid_min_max.max_content += inline_border_spacing;
+        grid_min_max
+    }
+
+    /// Compute CAPMIN: <https://drafts.csswg.org/css-tables/#capmin>
+    fn compute_caption_minimum_inline_size(&self, layout_context: &LayoutContext) -> Au {
+        let containing_block = IndefiniteContainingBlock {
+            size: LogicalVec2::default(),
+            writing_mode: self.table.style.writing_mode,
+        };
+        self.table
+            .captions
+            .iter()
+            .map(|caption| {
+                caption
+                    .borrow()
+                    .context
+                    .outer_inline_content_sizes(
+                        layout_context,
+                        &containing_block,
+                        &LogicalVec2::zero(),
+                        false, /* auto_block_size_stretches_to_containing_block */
+                    )
+                    .sizes
+                    .min_content
+            })
+            .max()
+            .unwrap_or_default()
+    }
+
+    fn compute_table_width(&mut self, containing_block_for_children: &ContainingBlock) {
+        // This assumes that the parent formatting context computed the correct inline size
+        // of the table, by enforcing its min-content size as a minimum.
+        // This should be roughly equivalent to what the spec calls "used width of a table".
+        // https://drafts.csswg.org/css-tables/#used-width-of-table
+        self.table_width = containing_block_for_children.size.inline;
+
+        // > The assignable table width is the used width of the table minus the total horizontal
+        // > border spacing (if any). This is the width that we will be able to allocate to the
+        // > columns.
+        self.assignable_width = self.table_width - self.table.total_border_spacing().inline;
+
+        // This is the amount that we will use to resolve percentages in the padding of cells.
+        // It matches what Gecko and Blink do, though they disagree when there is a big caption.
+        self.basis_for_cell_padding_percentage =
+            self.table_width - self.table.border_spacing().inline * 2;
+    }
+
+    /// Distribute width to columns, performing step 2.4 of table layout from
+    /// <https://drafts.csswg.org/css-tables/#table-layout-algorithm>.
+    fn distribute_width_to_columns(target_inline_size: Au, columns: &[ColumnLayout]) -> Vec<Au> {
+        // No need to do anything if there is no column.
+        // Note that tables without rows may still have columns.
+        if columns.is_empty() {
+            return Vec::new();
+        }
+
+        // > First, each column of the table is assigned a sizing type:
+        // >  * percent-column: a column whose any constraint is defined to use a percentage only
+        // >                    (with a value different from 0%)
+        // >  * pixel-column: column whose any constraint is defined to use a defined length only
+        // >                  (and is not a percent-column)
+        // >  * auto-column: any other column
+        // >
+        // > Then, valid sizing methods are to be assigned to the columns by sizing type, yielding
+        // > the following sizing-guesses:
+        // >
+        // > * The min-content sizing-guess is the set of column width assignments where
+        // >   each column is assigned its min-content width.
+        // > * The min-content-percentage sizing-guess is the set of column width assignments where:
+        // >       * each percent-column is assigned the larger of:
+        // >           * its intrinsic percentage width times the assignable width and
+        // >           * its min-content width.
+        // >       * all other columns are assigned their min-content width.
+        // > * The min-content-specified sizing-guess is the set of column width assignments where:
+        // >       * each percent-column is assigned the larger of:
+        // >           * its intrinsic percentage width times the assignable width and
+        // >           * its min-content width
+        // >       * any other column that is constrained is assigned its max-content width
+        // >       * all other columns are assigned their min-content width.
+        // > * The max-content sizing-guess is the set of column width assignments where:
+        // >       * each percent-column is assigned the larger of:
+        // >           * its intrinsic percentage width times the assignable width and
+        // >           * its min-content width
+        // >       * all other columns are assigned their max-content width.
+        let mut min_content_sizing_guesses = Vec::new();
+        let mut min_content_percentage_sizing_guesses = Vec::new();
+        let mut min_content_specified_sizing_guesses = Vec::new();
+        let mut max_content_sizing_guesses = Vec::new();
+
+        for column in columns {
+            let min_content_width = column.content_sizes.min_content;
+            let max_content_width = column.content_sizes.max_content;
+            let constrained = column.constrained;
+
+            let (
+                min_content_percentage_sizing_guess,
+                min_content_specified_sizing_guess,
+                max_content_sizing_guess,
+            ) = if let Some(percentage) = column.percentage {
+                let resolved = target_inline_size.scale_by(percentage.0);
+                let percent_guess = min_content_width.max(resolved);
+                (percent_guess, percent_guess, percent_guess)
+            } else if constrained {
+                (min_content_width, max_content_width, max_content_width)
+            } else {
+                (min_content_width, min_content_width, max_content_width)
+            };
+
+            min_content_sizing_guesses.push(min_content_width);
+            min_content_percentage_sizing_guesses.push(min_content_percentage_sizing_guess);
+            min_content_specified_sizing_guesses.push(min_content_specified_sizing_guess);
+            max_content_sizing_guesses.push(max_content_sizing_guess);
+        }
+
+        // > If the assignable table width is less than or equal to the max-content sizing-guess, the
+        // > used widths of the columns must be the linear combination (with weights adding to 1) of
+        // > the two consecutive sizing-guesses whose width sums bound the available width.
+        //
+        // > Otherwise, the used widths of the columns are the result of starting from the max-content
+        // > sizing-guess and distributing the excess width to the columns of the table according to
+        // > the rules for distributing excess width to columns (for used width).
+        fn sum(guesses: &[Au]) -> Au {
+            guesses.iter().fold(Au::zero(), |sum, guess| sum + *guess)
+        }
+
+        let max_content_sizing_sum = sum(&max_content_sizing_guesses);
+        if target_inline_size >= max_content_sizing_sum {
+            Self::distribute_extra_width_to_columns(
+                columns,
+                &mut max_content_sizing_guesses,
+                max_content_sizing_sum,
+                target_inline_size,
+            );
+            return max_content_sizing_guesses;
+        }
+        let min_content_specified_sizing_sum = sum(&min_content_specified_sizing_guesses);
+        if target_inline_size == min_content_specified_sizing_sum {
+            return min_content_specified_sizing_guesses;
+        }
+        let min_content_percentage_sizing_sum = sum(&min_content_percentage_sizing_guesses);
+        if target_inline_size == min_content_percentage_sizing_sum {
+            return min_content_percentage_sizing_guesses;
+        }
+        let min_content_sizes_sum = sum(&min_content_sizing_guesses);
+        if target_inline_size <= min_content_sizes_sum {
+            return min_content_sizing_guesses;
+        }
+
+        let bounds = |sum_a, sum_b| target_inline_size > sum_a && target_inline_size < sum_b;
+
+        let blend = |a: &[Au], sum_a: Au, b: &[Au], sum_b: Au| {
+            // First convert the Au units to f32 in order to do floating point division.
+            let weight_a = (target_inline_size - sum_b).to_f32_px() / (sum_a - sum_b).to_f32_px();
+            let weight_b = 1.0 - weight_a;
+
+            let mut remaining_assignable_width = target_inline_size;
+            let mut widths: Vec<Au> = a
+                .iter()
+                .zip(b.iter())
+                .map(|(guess_a, guess_b)| {
+                    let column_width = guess_a.scale_by(weight_a) + guess_b.scale_by(weight_b);
+                    // Clamp to avoid exceeding the assignable width. This could otherwise
+                    // happen when dealing with huge values whose sum is clamped to MAX_AU.
+                    let column_width = column_width.min(remaining_assignable_width);
+                    remaining_assignable_width -= column_width;
+                    column_width
+                })
+                .collect();
+
+            if !remaining_assignable_width.is_zero() {
+                // The computations above can introduce floating-point imprecisions.
+                // Since these errors are very small (1Au), it's fine to simply adjust
+                // the first column such that the total width matches the assignable width
+                debug_assert!(
+                    remaining_assignable_width >= Au::zero(),
+                    "Sum of columns shouldn't exceed the assignable table width"
+                );
+                debug_assert!(
+                    remaining_assignable_width <= Au::new(widths.len() as i32),
+                    "A deviation of more than one Au per column is unlikely to be caused by float imprecision"
+                );
+
+                // We checked if the table had columns at the top of the function, so there
+                // always is a first column
+                widths[0] += remaining_assignable_width;
+            }
+
+            debug_assert!(widths.iter().sum::<Au>() == target_inline_size);
+
+            widths
+        };
+
+        if bounds(min_content_sizes_sum, min_content_percentage_sizing_sum) {
+            return blend(
+                &min_content_sizing_guesses,
+                min_content_sizes_sum,
+                &min_content_percentage_sizing_guesses,
+                min_content_percentage_sizing_sum,
+            );
+        }
+
+        if bounds(
+            min_content_percentage_sizing_sum,
+            min_content_specified_sizing_sum,
+        ) {
+            return blend(
+                &min_content_percentage_sizing_guesses,
+                min_content_percentage_sizing_sum,
+                &min_content_specified_sizing_guesses,
+                min_content_specified_sizing_sum,
+            );
+        }
+
+        assert!(bounds(
+            min_content_specified_sizing_sum,
+            max_content_sizing_sum
+        ));
+        blend(
+            &min_content_specified_sizing_guesses,
+            min_content_specified_sizing_sum,
+            &max_content_sizing_guesses,
+            max_content_sizing_sum,
+        )
+    }
+
+    /// This is an implementation of *Distributing excess width to columns* from
+    /// <https://drafts.csswg.org/css-tables/#distributing-width-to-columns>.
+    fn distribute_extra_width_to_columns(
+        columns: &[ColumnLayout],
+        column_sizes: &mut [Au],
+        column_sizes_sum: Au,
+        assignable_width: Au,
+    ) {
+        let all_columns = 0..columns.len();
+        let extra_inline_size = assignable_width - column_sizes_sum;
+
+        let has_originating_cells =
+            |column_index: &usize| columns[*column_index].has_originating_cells;
+        let is_constrained = |column_index: &usize| columns[*column_index].constrained;
+        let is_unconstrained = |column_index: &usize| !is_constrained(column_index);
+        let has_percent_greater_than_zero = |column_index: &usize| {
+            columns[*column_index]
+                .percentage
+                .is_some_and(|percentage| percentage.0 > 0.)
+        };
+        let has_percent_zero = |column_index: &usize| !has_percent_greater_than_zero(column_index);
+        let has_max_content =
+            |column_index: &usize| !columns[*column_index].content_sizes.max_content.is_zero();
+
+        let max_content_sum = |column_index: usize| columns[column_index].content_sizes.max_content;
+
+        // > If there are non-constrained columns that have originating cells with intrinsic
+        // > percentage width of 0% and with nonzero max-content width (aka the columns allowed to
+        // > grow by this rule), the distributed widths of the columns allowed to grow by this rule
+        // > are increased in proportion to max-content width so the total increase adds to the
+        // > excess width.
+        let unconstrained_max_content_columns = all_columns
+            .clone()
+            .filter(is_unconstrained)
+            .filter(has_originating_cells)
+            .filter(has_percent_zero)
+            .filter(has_max_content);
+        let total_max_content_width = unconstrained_max_content_columns
+            .clone()
+            .map(max_content_sum)
+            .fold(Au::zero(), |a, b| a + b);
+        if !total_max_content_width.is_zero() {
+            for column_index in unconstrained_max_content_columns {
+                column_sizes[column_index] += extra_inline_size.scale_by(
+                    columns[column_index].content_sizes.max_content.to_f32_px() /
+                        total_max_content_width.to_f32_px(),
+                );
+            }
+            return;
+        }
+
+        // > Otherwise, if there are non-constrained columns that have originating cells with intrinsic
+        // > percentage width of 0% (aka the columns allowed to grow by this rule, which thanks to the
+        // > previous rule must have zero max-content width), the distributed widths of the columns
+        // > allowed to grow by this rule are increased by equal amounts so the total increase adds to
+        // > the excess width.V
+        let unconstrained_no_percent_columns = all_columns
+            .clone()
+            .filter(is_unconstrained)
+            .filter(has_originating_cells)
+            .filter(has_percent_zero);
+        let total_unconstrained_no_percent = unconstrained_no_percent_columns.clone().count();
+        if total_unconstrained_no_percent > 0 {
+            let extra_space_per_column =
+                extra_inline_size.scale_by(1.0 / total_unconstrained_no_percent as f32);
+            for column_index in unconstrained_no_percent_columns {
+                column_sizes[column_index] += extra_space_per_column;
+            }
+            return;
+        }
+
+        // > Otherwise, if there are constrained columns with intrinsic percentage width of 0% and
+        // > with nonzero max-content width (aka the columns allowed to grow by this rule, which, due
+        // > to other rules, must have originating cells), the distributed widths of the columns
+        // > allowed to grow by this rule are increased in proportion to max-content width so the
+        // > total increase adds to the excess width.
+        let constrained_max_content_columns = all_columns
+            .clone()
+            .filter(is_constrained)
+            .filter(has_originating_cells)
+            .filter(has_percent_zero)
+            .filter(has_max_content);
+        let total_max_content_width = constrained_max_content_columns
+            .clone()
+            .map(max_content_sum)
+            .fold(Au::zero(), |a, b| a + b);
+        if !total_max_content_width.is_zero() {
+            for column_index in constrained_max_content_columns {
+                column_sizes[column_index] += extra_inline_size.scale_by(
+                    columns[column_index].content_sizes.max_content.to_f32_px() /
+                        total_max_content_width.to_f32_px(),
+                );
+            }
+            return;
+        }
+
+        // > Otherwise, if there are columns with intrinsic percentage width greater than 0% (aka the
+        // > columns allowed to grow by this rule, which, due to other rules, must have originating
+        // > cells), the distributed widths of the columns allowed to grow by this rule are increased
+        // > in proportion to intrinsic percentage width so the total increase adds to the excess
+        // > width.
+        let columns_with_percentage = all_columns.clone().filter(has_percent_greater_than_zero);
+        let total_percent = columns_with_percentage
+            .clone()
+            .map(|column_index| columns[column_index].percentage.unwrap_or_default().0)
+            .sum::<f32>();
+        if total_percent > 0. {
+            for column_index in columns_with_percentage {
+                let column_percentage = columns[column_index].percentage.unwrap_or_default();
+                column_sizes[column_index] +=
+                    extra_inline_size.scale_by(column_percentage.0 / total_percent);
+            }
+            return;
+        }
+
+        // > Otherwise, if there is any such column, the distributed widths of all columns that have
+        // > originating cells are increased by equal amounts so the total increase adds to the excess
+        // > width.
+        let has_originating_cells_columns = all_columns.clone().filter(has_originating_cells);
+        let total_has_originating_cells = has_originating_cells_columns.clone().count();
+        if total_has_originating_cells > 0 {
+            let extra_space_per_column =
+                extra_inline_size.scale_by(1.0 / total_has_originating_cells as f32);
+            for column_index in has_originating_cells_columns {
+                column_sizes[column_index] += extra_space_per_column;
+            }
+            return;
+        }
+
+        // > Otherwise, the distributed widths of all columns are increased by equal amounts so the
+        // total increase adds to the excess width.
+        let extra_space_for_all_columns = extra_inline_size.scale_by(1.0 / columns.len() as f32);
+        for guess in column_sizes.iter_mut() {
+            *guess += extra_space_for_all_columns;
+        }
+    }
+
+    /// This is an implementation of *Row layout (first pass)* from
+    /// <https://drafts.csswg.org/css-tables/#row-layout>.
+    fn layout_cells_in_row(
+        &mut self,
+        layout_context: &LayoutContext,
+        containing_block_for_table: &ContainingBlock,
+    ) {
+        self.cells_laid_out = self
+            .table
+            .slots
+            .par_iter()
+            .enumerate()
+            .map(|(row_index, row_slots)| {
+                row_slots
+                    .par_iter()
+                    .enumerate()
+                    .map(|(column_index, slot)| {
+                        let TableSlot::Cell(cell) = slot else {
+                            return None;
+                        };
+
+                        let cell = cell.borrow();
+                        let area = LogicalSides {
+                            inline_start: column_index,
+                            inline_end: column_index + cell.colspan,
+                            block_start: row_index,
+                            block_end: row_index + cell.rowspan,
+                        };
+                        let layout_style = cell.layout_style();
+                        let border = self
+                            .get_collapsed_border_widths_for_area(area)
+                            .unwrap_or_else(|| {
+                                layout_style
+                                    .border_width(containing_block_for_table.style.writing_mode)
+                            });
+                        let padding: LogicalSides<Au> = layout_style
+                            .padding(containing_block_for_table.style.writing_mode)
+                            .percentages_relative_to(self.basis_for_cell_padding_percentage);
+                        let inline_border_padding_sum = border.inline_sum() + padding.inline_sum();
+
+                        let mut total_cell_width: Au = (column_index..column_index + cell.colspan)
+                            .map(|column_index| self.distributed_column_widths[column_index])
+                            .sum::<Au>() -
+                            inline_border_padding_sum;
+                        total_cell_width = total_cell_width.max(Au::zero());
+
+                        let containing_block_for_children = ContainingBlock {
+                            size: ContainingBlockSize {
+                                inline: total_cell_width,
+                                block: SizeConstraint::default(),
+                            },
+                            style: &cell.base.style,
+                        };
+
+                        let mut positioning_context = PositioningContext::default();
+                        let layout = cell.contents.layout(
+                            layout_context,
+                            &mut positioning_context,
+                            &containing_block_for_children,
+                            false, /* depends_on_block_constraints */
+                        );
+
+                        Some(CellLayout {
+                            layout,
+                            padding,
+                            border,
+                            positioning_context,
+                        })
+                    })
+                    .collect()
+            })
+            .collect();
+
+        // Now go through all cells laid out and update the cell measure based on the size
+        // determined during layout.
+        for row_index in 0..self.table.size.height {
+            for column_index in 0..self.table.size.width {
+                let Some(layout) = &self.cells_laid_out[row_index][column_index] else {
+                    continue;
+                };
+
+                self.cell_measures[row_index][column_index]
+                    .block
+                    .content_sizes
+                    .max_assign(layout.outer_block_size().into());
+            }
+        }
+    }
+
+    /// Do the first layout of a table row, after laying out the cells themselves. This is
+    /// more or less and implementation of <https://drafts.csswg.org/css-tables/#row-layout>.
+    fn do_first_row_layout(&mut self, writing_mode: WritingMode) -> Vec<Au> {
+        let mut row_sizes = (0..self.table.size.height)
+            .map(|row_index| {
+                let (mut max_ascent, mut max_descent, mut max_row_height) =
+                    (Au::zero(), Au::zero(), Au::zero());
+
+                for column_index in 0..self.table.size.width {
+                    let cell = match self.table.slots[row_index][column_index] {
+                        TableSlot::Cell(ref cell) => cell,
+                        _ => continue,
+                    };
+
+                    let layout = match self.cells_laid_out[row_index][column_index] {
+                        Some(ref layout) => layout,
+                        None => {
+                            warn!(
+                                "Did not find a layout at a slot index with an originating cell."
+                            );
+                            continue;
+                        },
+                    };
+
+                    let cell = cell.borrow();
+                    let outer_block_size = layout.outer_block_size();
+                    if cell.rowspan == 1 {
+                        max_row_height.max_assign(outer_block_size);
+                    }
+
+                    if cell.effective_vertical_align() == VerticalAlignKeyword::Baseline {
+                        let ascent = layout.ascent();
+                        let border_padding_start =
+                            layout.border.block_start + layout.padding.block_start;
+                        let border_padding_end = layout.border.block_end + layout.padding.block_end;
+                        max_ascent.max_assign(ascent + border_padding_start);
+
+                        // Only take into account the descent of this cell if doesn't span
+                        // rows. The descent portion of the cell in cells that do span rows
+                        // may extend into other rows.
+                        if cell.rowspan == 1 {
+                            max_descent.max_assign(
+                                layout.layout.content_block_size - ascent + border_padding_end,
+                            );
+                        }
+                    }
+                }
+                self.row_baselines.push(max_ascent);
+                max_row_height.max(max_ascent + max_descent)
+            })
+            .collect();
+        self.calculate_row_sizes_after_first_layout(&mut row_sizes, writing_mode);
+        row_sizes
+    }
+
+    #[allow(clippy::ptr_arg)] // Needs to be a vec because of the function above
+    /// After doing layout of table rows, calculate final row size and distribute space across
+    /// rowspanned cells. This follows the implementation of LayoutNG and the priority
+    /// agorithm described at <https://github.com/w3c/csswg-drafts/issues/4418>.
+    fn calculate_row_sizes_after_first_layout(
+        &mut self,
+        row_sizes: &mut Vec<Au>,
+        writing_mode: WritingMode,
+    ) {
+        let mut cells_to_distribute = Vec::new();
+        let mut total_percentage = 0.;
+        #[allow(clippy::needless_range_loop)] // It makes sense to use it here
+        for row_index in 0..self.table.size.height {
+            let row_measure = self
+                .table
+                .get_row_measure_for_row_at_index(writing_mode, row_index);
+            row_sizes[row_index].max_assign(row_measure.content_sizes.min_content);
+
+            let mut percentage = row_measure.percentage.unwrap_or_default().0;
+            for column_index in 0..self.table.size.width {
+                let cell_percentage = self.cell_measures[row_index][column_index]
+                    .block
+                    .percentage
+                    .unwrap_or_default()
+                    .0;
+                percentage = percentage.max(cell_percentage);
+
+                let cell_measure = &self.cell_measures[row_index][column_index].block;
+                let cell = match self.table.slots[row_index][column_index] {
+                    TableSlot::Cell(ref cell) if cell.borrow().rowspan > 1 => cell,
+                    TableSlot::Cell(_) => {
+                        // If this is an originating cell, that isn't spanning, then we make sure the row is
+                        // at least big enough to hold the cell.
+                        row_sizes[row_index].max_assign(cell_measure.content_sizes.max_content);
+                        continue;
+                    },
+                    _ => continue,
+                };
+
+                cells_to_distribute.push(RowspanToDistribute {
+                    coordinates: TableSlotCoordinates::new(column_index, row_index),
+                    cell: cell.borrow(),
+                    measure: cell_measure,
+                });
+            }
+
+            self.rows[row_index].percent = Percentage(percentage.min(1. - total_percentage));
+            total_percentage += self.rows[row_index].percent.0;
+        }
+
+        cells_to_distribute.sort_by(|a, b| {
+            if a.range() == b.range() {
+                return a
+                    .measure
+                    .content_sizes
+                    .min_content
+                    .cmp(&b.measure.content_sizes.min_content);
+            }
+            if a.fully_encloses(b) {
+                return std::cmp::Ordering::Greater;
+            }
+            if b.fully_encloses(a) {
+                return std::cmp::Ordering::Less;
+            }
+            a.coordinates.y.cmp(&b.coordinates.y)
+        });
+
+        for rowspan_to_distribute in cells_to_distribute {
+            let rows_spanned = rowspan_to_distribute.range();
+            let current_rows_size: Au = rows_spanned.clone().map(|index| row_sizes[index]).sum();
+            let border_spacing_spanned =
+                self.table.border_spacing().block * (rows_spanned.len() - 1) as i32;
+            let excess_size = (rowspan_to_distribute.measure.content_sizes.min_content -
+                current_rows_size -
+                border_spacing_spanned)
+                .max(Au::zero());
+
+            self.distribute_extra_size_to_rows(
+                excess_size,
+                rows_spanned,
+                row_sizes,
+                None,
+                true, /* rowspan_distribution */
+            );
+        }
+    }
+
+    /// An implementation of the same extra block size distribution algorithm used in
+    /// LayoutNG and described at <https://github.com/w3c/csswg-drafts/issues/4418>.
+    fn distribute_extra_size_to_rows(
+        &self,
+        mut excess_size: Au,
+        track_range: Range<usize>,
+        track_sizes: &mut [Au],
+        percentage_resolution_size: Option<Au>,
+        rowspan_distribution: bool,
+    ) {
+        if excess_size.is_zero() {
+            return;
+        }
+
+        let is_constrained = |track_index: &usize| self.rows[*track_index].constrained;
+        let is_unconstrained = |track_index: &usize| !is_constrained(track_index);
+        let is_empty: Vec<bool> = track_sizes.iter().map(|size| size.is_zero()).collect();
+        let is_not_empty = |track_index: &usize| !is_empty[*track_index];
+        let other_row_that_starts_a_rowspan = |track_index: &usize| {
+            *track_index != track_range.start &&
+                self.rows[*track_index].has_cell_with_span_greater_than_one
+        };
+
+        // If we have a table height (not during rowspan distribution), first distribute to rows
+        // that have percentage sizes proportionally to the size missing to reach the percentage
+        // of table height required.
+        if let Some(percentage_resolution_size) = percentage_resolution_size {
+            let get_percent_block_size_deficit = |row_index: usize, track_size: Au| {
+                let size_needed_for_percent =
+                    percentage_resolution_size.scale_by(self.rows[row_index].percent.0);
+                (size_needed_for_percent - track_size).max(Au::zero())
+            };
+            let percent_block_size_deficit: Au = track_range
+                .clone()
+                .map(|index| get_percent_block_size_deficit(index, track_sizes[index]))
+                .sum();
+            let percent_distributable_block_size = percent_block_size_deficit.min(excess_size);
+            if percent_distributable_block_size > Au::zero() {
+                for track_index in track_range.clone() {
+                    let row_deficit =
+                        get_percent_block_size_deficit(track_index, track_sizes[track_index]);
+                    if row_deficit > Au::zero() {
+                        let ratio =
+                            row_deficit.to_f32_px() / percent_block_size_deficit.to_f32_px();
+                        let size = percent_distributable_block_size.scale_by(ratio);
+                        track_sizes[track_index] += size;
+                        excess_size -= size;
+                    }
+                }
+            }
+        }
+
+        // If this is rowspan distribution and there are rows other than the first row that have a
+        // cell with rowspan > 1, distribute the extra space equally to those rows.
+        if rowspan_distribution {
+            let rows_that_start_rowspan: Vec<usize> = track_range
+                .clone()
+                .filter(other_row_that_starts_a_rowspan)
+                .collect();
+            if !rows_that_start_rowspan.is_empty() {
+                let scale = 1.0 / rows_that_start_rowspan.len() as f32;
+                for track_index in rows_that_start_rowspan.iter() {
+                    track_sizes[*track_index] += excess_size.scale_by(scale);
+                }
+                return;
+            }
+        }
+
+        // If there are unconstrained non-empty rows, grow them all proportionally to their current size.
+        let unconstrained_non_empty_rows: Vec<usize> = track_range
+            .clone()
+            .filter(is_unconstrained)
+            .filter(is_not_empty)
+            .collect();
+        if !unconstrained_non_empty_rows.is_empty() {
+            let total_size: Au = unconstrained_non_empty_rows
+                .iter()
+                .map(|index| track_sizes[*index])
+                .sum();
+            for track_index in unconstrained_non_empty_rows.iter() {
+                let scale = track_sizes[*track_index].to_f32_px() / total_size.to_f32_px();
+                track_sizes[*track_index] += excess_size.scale_by(scale);
+            }
+            return;
+        }
+
+        let (non_empty_rows, empty_rows): (Vec<usize>, Vec<usize>) =
+            track_range.clone().partition(is_not_empty);
+        let only_have_empty_rows = empty_rows.len() == track_range.len();
+        if !empty_rows.is_empty() {
+            // If this is rowspan distribution and there are only empty rows, just grow the
+            // last one.
+            if rowspan_distribution && only_have_empty_rows {
+                track_sizes[*empty_rows.last().unwrap()] += excess_size;
+                return;
+            }
+
+            // Otherwise, if we only have empty rows or if all the non-empty rows are constrained,
+            // then grow the empty rows.
+            let non_empty_rows_all_constrained = !non_empty_rows.iter().any(is_unconstrained);
+            if only_have_empty_rows || non_empty_rows_all_constrained {
+                // If there are both unconstrained and constrained empty rows, only increase the
+                // size of the unconstrained ones, otherwise increase the size of all empty rows.
+                let mut rows_to_grow = &empty_rows;
+                let unconstrained_empty_rows: Vec<usize> = rows_to_grow
+                    .iter()
+                    .copied()
+                    .filter(is_unconstrained)
+                    .collect();
+                if !unconstrained_empty_rows.is_empty() {
+                    rows_to_grow = &unconstrained_empty_rows;
+                }
+
+                // All empty rows that will grow equally.
+                let scale = 1.0 / rows_to_grow.len() as f32;
+                for track_index in rows_to_grow.iter() {
+                    track_sizes[*track_index] += excess_size.scale_by(scale);
+                }
+                return;
+            }
+        }
+
+        // If there are non-empty rows, they all grow in proportion to their current size,
+        // whether or not they are constrained.
+        if !non_empty_rows.is_empty() {
+            let total_size: Au = non_empty_rows.iter().map(|index| track_sizes[*index]).sum();
+            for track_index in non_empty_rows.iter() {
+                let scale = track_sizes[*track_index].to_f32_px() / total_size.to_f32_px();
+                track_sizes[*track_index] += excess_size.scale_by(scale);
+            }
+        }
+    }
+
+    /// Given computed row sizes, compute the final block size of the table and distribute extra
+    /// block size to table rows.
+    fn compute_table_height_and_final_row_heights(
+        &mut self,
+        mut row_sizes: Vec<Au>,
+        containing_block_for_children: &ContainingBlock,
+    ) {
+        // The table content height is the maximum of the computed table height from style and the
+        // sum of computed row heights from row layout plus size from borders and spacing.
+        // TODO: for `height: stretch`, the block size of the containing block is the available
+        // space for the entire table wrapper, but here we are using that amount for the table grid.
+        // Therefore, if there is a caption, this will cause overflow. Gecko and WebKit have the
+        // same problem, but not Blink.
+        let table_height_from_style = match containing_block_for_children.size.block {
+            SizeConstraint::Definite(size) => size,
+            SizeConstraint::MinMax(min, _) => min,
+        };
+
+        let block_border_spacing = self.table.total_border_spacing().block;
+        let table_height_from_rows = row_sizes.iter().sum::<Au>() + block_border_spacing;
+        self.final_table_height = table_height_from_rows.max(table_height_from_style);
+
+        // If the table height is defined by the rows sizes, there is no extra space to distribute
+        // to rows.
+        if self.final_table_height == table_height_from_rows {
+            self.row_sizes = row_sizes;
+            return;
+        }
+
+        // There was extra block size added to the table from the table style, so distribute this
+        // extra space to rows using the same distribution algorithm used for distributing rowspan
+        // space.
+        // TODO: This should first distribute space to row groups and then to rows.
+        self.distribute_extra_size_to_rows(
+            self.final_table_height - table_height_from_rows,
+            0..self.table.size.height,
+            &mut row_sizes,
+            Some(self.final_table_height),
+            false, /* rowspan_distribution */
+        );
+        self.row_sizes = row_sizes;
+    }
+
+    fn layout_caption(
+        &self,
+        caption: &TableCaption,
+        layout_context: &LayoutContext,
+        parent_positioning_context: &mut PositioningContext,
+    ) -> BoxFragment {
+        let containing_block = &ContainingBlock {
+            size: ContainingBlockSize {
+                inline: self.table_width + self.pbm.padding_border_sums.inline,
+                block: SizeConstraint::default(),
+            },
+            style: &self.table.style,
+        };
+
+        // The parent of a caption is the table wrapper, which establishes an independent
+        // formatting context. Therefore, we don't ignore block margins when resolving a
+        // stretch block size. https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing
+        let ignore_block_margins_for_stretch = LogicalSides1D::new(false, false);
+
+        let mut positioning_context =
+            PositioningContext::new_for_layout_box_base(&caption.context.base);
+        let mut box_fragment = caption.context.layout_in_flow_block_level(
+            layout_context,
+            positioning_context
+                .as_mut()
+                .unwrap_or(parent_positioning_context),
+            containing_block,
+            None, /* sequential_layout_state */
+            ignore_block_margins_for_stretch,
+        );
+
+        if let Some(mut positioning_context) = positioning_context.take() {
+            positioning_context.layout_collected_children(layout_context, &mut box_fragment);
+            parent_positioning_context.append(positioning_context);
+        }
+
+        box_fragment
+    }
+
+    /// Lay out the table (grid and captions) of this [`TableLayout`] into fragments. This should
+    /// only be be called after calling [`TableLayout.compute_measures`].
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(
+            name = "Table::layout",
+            skip_all,
+            fields(servo_profiling = true),
+            level = "trace",
+        )
+    )]
+    fn layout(
+        mut self,
+        layout_context: &LayoutContext,
+        positioning_context: &mut PositioningContext,
+        containing_block_for_children: &ContainingBlock,
+        containing_block_for_table: &ContainingBlock,
+        depends_on_block_constraints: bool,
+    ) -> CacheableLayoutResult {
+        let table_writing_mode = containing_block_for_children.style.writing_mode;
+        self.compute_border_collapse(table_writing_mode);
+        let layout_style = self.table.layout_style(Some(&self));
+        let depends_on_block_constraints = depends_on_block_constraints ||
+            layout_style
+                .content_box_sizes_and_padding_border_margin(&containing_block_for_table.into())
+                .depends_on_block_constraints;
+
+        self.pbm = layout_style
+            .padding_border_margin_with_writing_mode_and_containing_block_inline_size(
+                table_writing_mode,
+                containing_block_for_table.size.inline,
+            );
+        self.compute_measures(layout_context, table_writing_mode);
+        self.compute_table_width(containing_block_for_children);
+
+        // The table wrapper is the one that has the CSS properties for the grid's border and padding. This
+        // weirdness is difficult to express in Servo's layout system. We have the wrapper size itself as if
+        // those properties applied to it and then just account for the discrepency in sizing here. In reality,
+        // the wrapper does not draw borders / backgrounds and all of its content (grid and captions) are
+        // placed with a negative offset in the table wrapper's content box so that they overlap the undrawn
+        // border / padding area.
+        //
+        // TODO: This is a pretty large hack. It would be nicer to actually have the grid sized properly,
+        // but it works for now.
+        //
+        // Get the padding, border, and margin of the table using the inline size of the table's containing
+        // block but in the writing of the table itself.
+        // TODO: This is broken for orthoganol flows, because the inline size of the parent isn't necessarily
+        // the inline size of the table.
+        let containing_block_for_logical_conversion = ContainingBlock {
+            size: ContainingBlockSize {
+                inline: self.table_width,
+                block: containing_block_for_table.size.block,
+            },
+            style: containing_block_for_children.style,
+        };
+        let offset_from_wrapper = -self.pbm.padding - self.pbm.border;
+        let mut current_block_offset = offset_from_wrapper.block_start;
+
+        let mut table_layout = CacheableLayoutResult {
+            fragments: Vec::new(),
+            content_block_size: Zero::zero(),
+            content_inline_size_for_table: None,
+            baselines: Baselines::default(),
+            depends_on_block_constraints,
+            specific_layout_info: Some(SpecificLayoutInfo::TableWrapper),
+            collapsible_margins_in_children: CollapsedBlockMargins::zero(),
+        };
+
+        table_layout
+            .fragments
+            .extend(self.table.captions.iter().filter_map(|caption| {
+                let caption = caption.borrow();
+                if caption.context.style().clone_caption_side() != CaptionSide::Top {
+                    return None;
+                }
+
+                let original_positioning_context_length = positioning_context.len();
+                let mut caption_fragment =
+                    self.layout_caption(&caption, layout_context, positioning_context);
+
+                // The caption is not placed yet. Construct a rectangle for it in the adjusted containing block
+                // for the table children and only then convert the result to physical geometry.
+                let caption_pbm = caption_fragment
+                    .padding_border_margin()
+                    .to_logical(table_writing_mode);
+
+                let caption_relative_offset = match caption_fragment.style.clone_position() {
+                    Position::Relative => {
+                        relative_adjustement(&caption_fragment.style, containing_block_for_children)
+                    },
+                    _ => LogicalVec2::zero(),
+                };
+
+                caption_fragment.content_rect = LogicalRect {
+                    start_corner: LogicalVec2 {
+                        inline: offset_from_wrapper.inline_start + caption_pbm.inline_start,
+                        block: current_block_offset + caption_pbm.block_start,
+                    } + caption_relative_offset,
+                    size: caption_fragment
+                        .content_rect
+                        .size
+                        .to_logical(table_writing_mode),
+                }
+                .as_physical(Some(&containing_block_for_logical_conversion));
+
+                current_block_offset += caption_fragment
+                    .margin_rect()
+                    .size
+                    .to_logical(table_writing_mode)
+                    .block;
+
+                let caption_fragment = Fragment::Box(ArcRefCell::new(caption_fragment));
+                positioning_context.adjust_static_position_of_hoisted_fragments(
+                    &caption_fragment,
+                    original_positioning_context_length,
+                );
+
+                caption.context.base.set_fragment(caption_fragment.clone());
+                Some(caption_fragment)
+            }));
+
+        let original_positioning_context_length = positioning_context.len();
+        let mut grid_fragment = self.layout_grid(
+            layout_context,
+            positioning_context,
+            &containing_block_for_logical_conversion,
+            containing_block_for_children,
+        );
+
+        // Take the baseline of the grid fragment, after adjusting it to be in the coordinate system
+        // of the table wrapper.
+        let logical_grid_content_rect = grid_fragment
+            .content_rect
+            .to_logical(&containing_block_for_logical_conversion);
+        let grid_pbm = grid_fragment
+            .padding_border_margin()
+            .to_logical(table_writing_mode);
+        table_layout.baselines = grid_fragment.baselines(table_writing_mode).offset(
+            current_block_offset +
+                logical_grid_content_rect.start_corner.block +
+                grid_pbm.block_start,
+        );
+
+        grid_fragment.content_rect = LogicalRect {
+            start_corner: LogicalVec2 {
+                inline: offset_from_wrapper.inline_start + grid_pbm.inline_start,
+                block: current_block_offset + grid_pbm.block_start,
+            },
+            size: grid_fragment
+                .content_rect
+                .size
+                .to_logical(table_writing_mode),
+        }
+        .as_physical(Some(&containing_block_for_logical_conversion));
+
+        current_block_offset += grid_fragment
+            .border_rect()
+            .size
+            .to_logical(table_writing_mode)
+            .block;
+        if logical_grid_content_rect.size.inline < self.table_width {
+            // This can happen when collapsing columns
+            table_layout.content_inline_size_for_table =
+                Some(logical_grid_content_rect.size.inline);
+        }
+
+        let grid_fragment = Fragment::Box(ArcRefCell::new(grid_fragment));
+        positioning_context.adjust_static_position_of_hoisted_fragments(
+            &grid_fragment,
+            original_positioning_context_length,
+        );
+        table_layout.fragments.push(grid_fragment);
+
+        table_layout
+            .fragments
+            .extend(self.table.captions.iter().filter_map(|caption| {
+                let caption = caption.borrow();
+                if caption.context.style().clone_caption_side() != CaptionSide::Bottom {
+                    return None;
+                }
+
+                let original_positioning_context_length = positioning_context.len();
+                let mut caption_fragment =
+                    self.layout_caption(&caption, layout_context, positioning_context);
+
+                // The caption is not placed yet. Construct a rectangle for it in the adjusted containing block
+                // for the table children and only then convert the result to physical geometry.
+                let caption_pbm = caption_fragment
+                    .padding_border_margin()
+                    .to_logical(table_writing_mode);
+                caption_fragment.content_rect = LogicalRect {
+                    start_corner: LogicalVec2 {
+                        inline: offset_from_wrapper.inline_start + caption_pbm.inline_start,
+                        block: current_block_offset + caption_pbm.block_start,
+                    },
+                    size: caption_fragment
+                        .content_rect
+                        .size
+                        .to_logical(table_writing_mode),
+                }
+                .as_physical(Some(&containing_block_for_logical_conversion));
+
+                current_block_offset += caption_fragment
+                    .margin_rect()
+                    .size
+                    .to_logical(table_writing_mode)
+                    .block;
+
+                let caption_fragment = Fragment::Box(ArcRefCell::new(caption_fragment));
+                positioning_context.adjust_static_position_of_hoisted_fragments(
+                    &caption_fragment,
+                    original_positioning_context_length,
+                );
+
+                caption.context.base.set_fragment(caption_fragment.clone());
+                Some(caption_fragment)
+            }));
+
+        table_layout.content_block_size = current_block_offset + offset_from_wrapper.block_end;
+        table_layout
+    }
+
+    /// Lay out the grid portion of this [`TableLayout`] into fragments. This should only be be
+    /// called after calling [`TableLayout.compute_measures`].
+    fn layout_grid(
+        &mut self,
+        layout_context: &LayoutContext,
+        positioning_context: &mut PositioningContext,
+        containing_block_for_logical_conversion: &ContainingBlock,
+        containing_block_for_children: &ContainingBlock,
+    ) -> BoxFragment {
+        self.distributed_column_widths =
+            Self::distribute_width_to_columns(self.assignable_width, &self.columns);
+        self.layout_cells_in_row(layout_context, containing_block_for_children);
+        let table_writing_mode = containing_block_for_children.style.writing_mode;
+        let first_layout_row_heights = self.do_first_row_layout(table_writing_mode);
+        self.compute_table_height_and_final_row_heights(
+            first_layout_row_heights,
+            containing_block_for_children,
+        );
+
+        assert_eq!(self.table.size.height, self.row_sizes.len());
+        assert_eq!(self.table.size.width, self.distributed_column_widths.len());
+
+        if self.table.size.width == 0 && self.table.size.height == 0 {
+            let content_rect = LogicalRect {
+                start_corner: LogicalVec2::zero(),
+                size: LogicalVec2 {
+                    inline: self.table_width,
+                    block: self.final_table_height,
+                },
+            }
+            .as_physical(Some(containing_block_for_logical_conversion));
+            return BoxFragment::new(
+                self.table.grid_base_fragment_info,
+                self.table.grid_style.clone(),
+                Vec::new(),
+                content_rect,
+                self.pbm.padding.to_physical(table_writing_mode),
+                self.pbm.border.to_physical(table_writing_mode),
+                PhysicalSides::zero(),
+                None, /* clearance */
+            )
+            .with_specific_layout_info(self.specific_layout_info_for_grid());
+        }
+
+        let mut table_fragments = Vec::new();
+        let table_and_track_dimensions = TableAndTrackDimensions::new(self);
+        self.make_fragments_for_columns_and_column_groups(
+            &table_and_track_dimensions,
+            &mut table_fragments,
+        );
+
+        let mut baselines = Baselines::default();
+        let mut row_group_fragment_layout = None;
+        for row_index in 0..self.table.size.height {
+            // From <https://drafts.csswg.org/css-align-3/#baseline-export>
+            // > If any cells in the row participate in first baseline/last baseline alignment along
+            // > the inline axis, the first/last baseline set of the row is generated from their
+            // > shared alignment baseline and the row’s first available font, after alignment has
+            // > been performed. Otherwise, the first/last baseline set of the row is synthesized from
+            // > the lowest and highest content edges of the cells in the row. [CSS2]
+            //
+            // If any cell below has baseline alignment, these values will be overwritten,
+            // but they are initialized to the content edge of the first row.
+            if row_index == 0 {
+                let row_end = table_and_track_dimensions
+                    .get_row_rect(0)
+                    .max_block_position();
+                baselines.first = Some(row_end);
+                baselines.last = Some(row_end);
+            }
+
+            if self.is_row_collapsed(row_index) {
+                continue;
+            }
+
+            let table_row = self.table.rows[row_index].borrow();
+            let mut row_fragment_layout = RowFragmentLayout::new(
+                &table_row,
+                row_index,
+                &table_and_track_dimensions,
+                &self.table.style,
+            );
+
+            let old_row_group_index = row_group_fragment_layout
+                .as_ref()
+                .map(|layout: &RowGroupFragmentLayout| layout.index);
+            if table_row.group_index != old_row_group_index {
+                // First create the Fragment for any existing RowGroupFragmentLayout.
+                if let Some(old_row_group_layout) = row_group_fragment_layout.take() {
+                    table_fragments.push(old_row_group_layout.finish(
+                        layout_context,
+                        positioning_context,
+                        containing_block_for_logical_conversion,
+                        containing_block_for_children,
+                    ));
+                }
+
+                // Then, create a new RowGroupFragmentLayout for the current and potentially subsequent rows.
+                if let Some(new_group_index) = table_row.group_index {
+                    row_group_fragment_layout = Some(RowGroupFragmentLayout::new(
+                        self.table.row_groups[new_group_index].clone(),
+                        new_group_index,
+                        &table_and_track_dimensions,
+                    ));
+                }
+            }
+
+            let column_indices = 0..self.table.size.width;
+            row_fragment_layout.fragments.reserve(self.table.size.width);
+            for column_index in column_indices {
+                if self.is_column_collapsed(column_index) {
+                    continue;
+                }
+
+                self.do_final_cell_layout(
+                    row_index,
+                    column_index,
+                    &table_and_track_dimensions,
+                    &mut baselines,
+                    &mut row_fragment_layout,
+                    row_group_fragment_layout.as_mut(),
+                    positioning_context,
+                );
+            }
+
+            let row_fragment = row_fragment_layout.finish(
+                layout_context,
+                positioning_context,
+                containing_block_for_logical_conversion,
+                containing_block_for_children,
+                &mut row_group_fragment_layout,
+            );
+
+            match row_group_fragment_layout.as_mut() {
+                Some(layout) => layout.fragments.push(row_fragment),
+                None => table_fragments.push(row_fragment),
+            }
+        }
+
+        if let Some(row_group_layout) = row_group_fragment_layout.take() {
+            table_fragments.push(row_group_layout.finish(
+                layout_context,
+                positioning_context,
+                containing_block_for_logical_conversion,
+                containing_block_for_children,
+            ));
+        }
+
+        let content_rect = LogicalRect {
+            start_corner: LogicalVec2::zero(),
+            size: LogicalVec2 {
+                inline: table_and_track_dimensions.table_rect.max_inline_position(),
+                block: table_and_track_dimensions.table_rect.max_block_position(),
+            },
+        }
+        .as_physical(Some(containing_block_for_logical_conversion));
+        BoxFragment::new(
+            self.table.grid_base_fragment_info,
+            self.table.grid_style.clone(),
+            table_fragments,
+            content_rect,
+            self.pbm.padding.to_physical(table_writing_mode),
+            self.pbm.border.to_physical(table_writing_mode),
+            PhysicalSides::zero(),
+            None, /* clearance */
+        )
+        .with_baselines(baselines)
+        .with_specific_layout_info(self.specific_layout_info_for_grid())
+    }
+
+    fn specific_layout_info_for_grid(&mut self) -> Option<SpecificLayoutInfo> {
+        mem::take(&mut self.collapsed_borders).map(|mut collapsed_borders| {
+            // TODO: It would probably be better to use `TableAndTrackDimensions`, since that
+            // has already taken care of collapsed tracks and knows the final track positions.
+            let mut track_sizes = LogicalVec2 {
+                inline: mem::take(&mut self.distributed_column_widths),
+                block: mem::take(&mut self.row_sizes),
+            };
+            for (column_index, column_size) in track_sizes.inline.iter_mut().enumerate() {
+                if self.is_column_collapsed(column_index) {
+                    mem::take(column_size);
+                }
+            }
+            for (row_index, row_size) in track_sizes.block.iter_mut().enumerate() {
+                if self.is_row_collapsed(row_index) {
+                    mem::take(row_size);
+                }
+            }
+            let writing_mode = self.table.style.writing_mode;
+            if !writing_mode.is_bidi_ltr() {
+                track_sizes.inline.reverse();
+                collapsed_borders.inline.reverse();
+                for border_line in &mut collapsed_borders.block {
+                    border_line.reverse();
+                }
+            }
+            SpecificLayoutInfo::TableGridWithCollapsedBorders(Box::new(SpecificTableGridInfo {
+                collapsed_borders: if writing_mode.is_horizontal() {
+                    PhysicalVec::new(collapsed_borders.inline, collapsed_borders.block)
+                } else {
+                    PhysicalVec::new(collapsed_borders.block, collapsed_borders.inline)
+                },
+                track_sizes: if writing_mode.is_horizontal() {
+                    PhysicalVec::new(track_sizes.inline, track_sizes.block)
+                } else {
+                    PhysicalVec::new(track_sizes.block, track_sizes.inline)
+                },
+            }))
+        })
+    }
+
+    fn is_row_collapsed(&self, row_index: usize) -> bool {
+        let Some(row) = &self.table.rows.get(row_index) else {
+            return false;
+        };
+
+        let row = row.borrow();
+        if row.base.style.get_inherited_box().visibility == Visibility::Collapse {
+            return true;
+        }
+        let row_group = match row.group_index {
+            Some(group_index) => self.table.row_groups[group_index].borrow(),
+            None => return false,
+        };
+        row_group.base.style.get_inherited_box().visibility == Visibility::Collapse
+    }
+
+    fn is_column_collapsed(&self, column_index: usize) -> bool {
+        let Some(column) = &self.table.columns.get(column_index) else {
+            return false;
+        };
+        let column = column.borrow();
+        if column.base.style.get_inherited_box().visibility == Visibility::Collapse {
+            return true;
+        }
+        let col_group = match column.group_index {
+            Some(group_index) => self.table.column_groups[group_index].borrow(),
+            None => return false,
+        };
+        col_group.base.style.get_inherited_box().visibility == Visibility::Collapse
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn do_final_cell_layout(
+        &mut self,
+        row_index: usize,
+        column_index: usize,
+        dimensions: &TableAndTrackDimensions,
+        baselines: &mut Baselines,
+        row_fragment_layout: &mut RowFragmentLayout,
+        row_group_fragment_layout: Option<&mut RowGroupFragmentLayout>,
+        positioning_context_for_table: &mut PositioningContext,
+    ) {
+        // The PositioningContext for cells is, in order or preference, the PositioningContext of the row,
+        // the PositioningContext of the row group, or the PositioningContext of the table.
+        let row_group_positioning_context =
+            row_group_fragment_layout.and_then(|layout| layout.positioning_context.as_mut());
+        let positioning_context = row_fragment_layout
+            .positioning_context
+            .as_mut()
+            .or(row_group_positioning_context)
+            .unwrap_or(positioning_context_for_table);
+
+        let layout = match self.cells_laid_out[row_index][column_index].take() {
+            Some(layout) => layout,
+            None => {
+                return;
+            },
+        };
+        let cell = match self.table.slots[row_index][column_index] {
+            TableSlot::Cell(ref cell) => cell,
+            _ => {
+                warn!("Did not find a non-spanned cell at index with layout.");
+                return;
+            },
+        }
+        .borrow();
+
+        // If this cell has baseline alignment, it can adjust the table's overall baseline.
+        let row_block_offset = row_fragment_layout.rect.start_corner.block;
+        let row_baseline = self.row_baselines[row_index];
+        if cell.effective_vertical_align() == VerticalAlignKeyword::Baseline && !layout.is_empty() {
+            let baseline = row_block_offset + row_baseline;
+            if row_index == 0 {
+                baselines.first = Some(baseline);
+            }
+            baselines.last = Some(baseline);
+        }
+        let mut row_relative_cell_rect = dimensions.get_cell_rect(
+            TableSlotCoordinates::new(column_index, row_index),
+            cell.rowspan,
+            cell.colspan,
+        );
+        row_relative_cell_rect.start_corner -= row_fragment_layout.rect.start_corner;
+        let mut fragment = cell.create_fragment(
+            layout,
+            row_relative_cell_rect,
+            row_baseline,
+            positioning_context,
+            &self.table.style,
+            &row_fragment_layout.containing_block,
+        );
+
+        // Make a table part rectangle relative to the row fragment for the purposes of
+        // drawing extra backgrounds.
+        //
+        // This rectangle is an offset between the row fragment and the other table
+        // part rectangle (row group, column, column group). Everything between them
+        // is laid out in a left-to-right fashion, but respecting the verticality of
+        // the writing mode. This is why below, only the axes are flipped, but the
+        // rectangle is not flipped for RTL.
+        let make_relative_to_row_start = |mut rect: LogicalRect<Au>| {
+            rect.start_corner -= row_fragment_layout.rect.start_corner;
+            let writing_mode = self.table.style.writing_mode;
+            PhysicalRect::new(
+                if writing_mode.is_horizontal() {
+                    PhysicalPoint::new(rect.start_corner.inline, rect.start_corner.block)
+                } else {
+                    PhysicalPoint::new(rect.start_corner.block, rect.start_corner.inline)
+                },
+                rect.size.to_physical_size(writing_mode),
+            )
+        };
+
+        let column = self.table.columns.get(column_index);
+        let column_group = column
+            .and_then(|column| column.borrow().group_index)
+            .and_then(|index| self.table.column_groups.get(index));
+        if let Some(column_group) = column_group {
+            let column_group = column_group.borrow();
+            let rect = make_relative_to_row_start(dimensions.get_column_group_rect(&column_group));
+            fragment.add_extra_background(ExtraBackground {
+                style: column_group.shared_background_style.clone(),
+                rect,
+            })
+        }
+        if let Some(column) = column {
+            let column = column.borrow();
+            if !column.is_anonymous {
+                let rect = make_relative_to_row_start(dimensions.get_column_rect(column_index));
+                fragment.add_extra_background(ExtraBackground {
+                    style: column.shared_background_style.clone(),
+                    rect,
+                })
+            }
+        }
+        let row = self.table.rows.get(row_index);
+        let row_group = row
+            .and_then(|row| row.borrow().group_index)
+            .and_then(|index| self.table.row_groups.get(index));
+        if let Some(row_group) = row_group {
+            let rect =
+                make_relative_to_row_start(dimensions.get_row_group_rect(&row_group.borrow()));
+            fragment.add_extra_background(ExtraBackground {
+                style: row_group.borrow().shared_background_style.clone(),
+                rect,
+            })
+        }
+        if let Some(row) = row {
+            let row = row.borrow();
+            let rect = make_relative_to_row_start(row_fragment_layout.rect);
+            fragment.add_extra_background(ExtraBackground {
+                style: row.shared_background_style.clone(),
+                rect,
+            })
+        }
+
+        let fragment = Fragment::Box(ArcRefCell::new(fragment));
+        cell.base.set_fragment(fragment.clone());
+        row_fragment_layout.fragments.push(fragment);
+    }
+
+    fn make_fragments_for_columns_and_column_groups(
+        &self,
+        dimensions: &TableAndTrackDimensions,
+        fragments: &mut Vec<Fragment>,
+    ) {
+        for column_group in self.table.column_groups.iter() {
+            let column_group = column_group.borrow();
+            if !column_group.is_empty() {
+                let fragment = Fragment::Positioning(PositioningFragment::new_empty(
+                    column_group.base.base_fragment_info,
+                    dimensions
+                        .get_column_group_rect(&column_group)
+                        .as_physical(None),
+                    column_group.base.style.clone(),
+                ));
+                column_group.base.set_fragment(fragment.clone());
+                fragments.push(fragment);
+            }
+        }
+
+        for (column_index, column) in self.table.columns.iter().enumerate() {
+            let column = column.borrow();
+            let fragment = Fragment::Positioning(PositioningFragment::new_empty(
+                column.base.base_fragment_info,
+                dimensions.get_column_rect(column_index).as_physical(None),
+                column.base.style.clone(),
+            ));
+            column.base.set_fragment(fragment.clone());
+            fragments.push(fragment);
+        }
+    }
+
+    fn compute_border_collapse(&mut self, writing_mode: WritingMode) {
+        if self.table.style.get_inherited_table().border_collapse != BorderCollapse::Collapse {
+            self.collapsed_borders = None;
+            return;
+        }
+
+        let mut collapsed_borders = LogicalVec2 {
+            block: vec![
+                vec![Default::default(); self.table.size.width];
+                self.table.size.height + 1
+            ],
+            inline: vec![
+                vec![Default::default(); self.table.size.height];
+                self.table.size.width + 1
+            ],
+        };
+
+        let apply_border = |collapsed_borders: &mut CollapsedBorders,
+                            layout_style: &LayoutStyle,
+                            block: &Range<usize>,
+                            inline: &Range<usize>| {
+            let border = CollapsedBorder::from_layout_style(layout_style, writing_mode);
+            border
+                .block_start
+                .max_assign_to_slice(&mut collapsed_borders.block[block.start][inline.clone()]);
+            border
+                .block_end
+                .max_assign_to_slice(&mut collapsed_borders.block[block.end][inline.clone()]);
+            border
+                .inline_start
+                .max_assign_to_slice(&mut collapsed_borders.inline[inline.start][block.clone()]);
+            border
+                .inline_end
+                .max_assign_to_slice(&mut collapsed_borders.inline[inline.end][block.clone()]);
+        };
+        let hide_inner_borders = |collapsed_borders: &mut CollapsedBorders,
+                                  block: &Range<usize>,
+                                  inline: &Range<usize>| {
+            for x in inline.clone() {
+                for y in block.clone() {
+                    if x != inline.start {
+                        collapsed_borders.inline[x][y].hide();
+                    }
+                    if y != block.start {
+                        collapsed_borders.block[y][x].hide();
+                    }
+                }
+            }
+        };
+        let all_rows = 0..self.table.size.height;
+        let all_columns = 0..self.table.size.width;
+        for row_index in all_rows.clone() {
+            for column_index in all_columns.clone() {
+                let cell = match self.table.slots[row_index][column_index] {
+                    TableSlot::Cell(ref cell) => cell,
+                    _ => continue,
+                }
+                .borrow();
+                let block_range = row_index..row_index + cell.rowspan;
+                let inline_range = column_index..column_index + cell.colspan;
+                hide_inner_borders(&mut collapsed_borders, &block_range, &inline_range);
+                apply_border(
+                    &mut collapsed_borders,
+                    &cell.layout_style(),
+                    &block_range,
+                    &inline_range,
+                );
+            }
+        }
+        for (row_index, row) in self.table.rows.iter().enumerate() {
+            let row = row.borrow();
+            apply_border(
+                &mut collapsed_borders,
+                &row.layout_style(),
+                &(row_index..row_index + 1),
+                &all_columns,
+            );
+        }
+        for row_group in &self.table.row_groups {
+            let row_group = row_group.borrow();
+            apply_border(
+                &mut collapsed_borders,
+                &row_group.layout_style(),
+                &row_group.track_range,
+                &all_columns,
+            );
+        }
+        for (column_index, column) in self.table.columns.iter().enumerate() {
+            let column = column.borrow();
+            apply_border(
+                &mut collapsed_borders,
+                &column.layout_style(),
+                &all_rows,
+                &(column_index..column_index + 1),
+            );
+        }
+        for column_group in &self.table.column_groups {
+            let column_group = column_group.borrow();
+            apply_border(
+                &mut collapsed_borders,
+                &column_group.layout_style(),
+                &all_rows,
+                &column_group.track_range,
+            );
+        }
+        apply_border(
+            &mut collapsed_borders,
+            &self.table.layout_style_for_grid(),
+            &all_rows,
+            &all_columns,
+        );
+
+        self.collapsed_borders = Some(collapsed_borders);
+    }
+
+    fn get_collapsed_border_widths_for_area(
+        &self,
+        area: LogicalSides<usize>,
+    ) -> Option<LogicalSides<Au>> {
+        let collapsed_borders = self.collapsed_borders.as_ref()?;
+        let columns = || area.inline_start..area.inline_end;
+        let rows = || area.block_start..area.block_end;
+        let max_width = |slice: &[CollapsedBorder]| {
+            let slice_widths = slice.iter().map(|collapsed_border| collapsed_border.width);
+            slice_widths.max().unwrap_or_default()
+        };
+        Some(area.map_inline_and_block_axes(
+            |column| max_width(&collapsed_borders.inline[*column][rows()]) / 2,
+            |row| max_width(&collapsed_borders.block[*row][columns()]) / 2,
+        ))
+    }
+}
+
+struct RowFragmentLayout<'a> {
+    row: &'a TableTrack,
+    rect: LogicalRect<Au>,
+    containing_block: ContainingBlock<'a>,
+    positioning_context: Option<PositioningContext>,
+    fragments: Vec<Fragment>,
+}
+
+impl<'a> RowFragmentLayout<'a> {
+    fn new(
+        table_row: &'a TableTrack,
+        index: usize,
+        dimensions: &TableAndTrackDimensions,
+        table_style: &'a ComputedValues,
+    ) -> Self {
+        let rect = dimensions.get_row_rect(index);
+        let containing_block = ContainingBlock {
+            size: ContainingBlockSize {
+                inline: rect.size.inline,
+                block: SizeConstraint::Definite(rect.size.block),
+            },
+            style: table_style,
+        };
+        Self {
+            row: table_row,
+            rect,
+            positioning_context: PositioningContext::new_for_layout_box_base(&table_row.base),
+            containing_block,
+            fragments: Vec::new(),
+        }
+    }
+    fn finish(
+        mut self,
+        layout_context: &LayoutContext,
+        table_positioning_context: &mut PositioningContext,
+        containing_block_for_logical_conversion: &ContainingBlock,
+        containing_block_for_children: &ContainingBlock,
+        row_group_fragment_layout: &mut Option<RowGroupFragmentLayout>,
+    ) -> Fragment {
+        if self.positioning_context.is_some() {
+            self.rect.start_corner +=
+                relative_adjustement(&self.row.base.style, containing_block_for_children);
+        }
+
+        let (inline_size, block_size) = if let Some(row_group_layout) = row_group_fragment_layout {
+            self.rect.start_corner -= row_group_layout.rect.start_corner;
+            (
+                row_group_layout.rect.size.inline,
+                SizeConstraint::Definite(row_group_layout.rect.size.block),
+            )
+        } else {
+            (
+                containing_block_for_logical_conversion.size.inline,
+                containing_block_for_logical_conversion.size.block,
+            )
+        };
+
+        let row_group_containing_block = ContainingBlock {
+            size: ContainingBlockSize {
+                inline: inline_size,
+                block: block_size,
+            },
+            style: containing_block_for_logical_conversion.style,
+        };
+
+        let mut row_fragment = BoxFragment::new(
+            self.row.base.base_fragment_info,
+            self.row.base.style.clone(),
+            self.fragments,
+            self.rect.as_physical(Some(&row_group_containing_block)),
+            PhysicalSides::zero(), /* padding */
+            PhysicalSides::zero(), /* border */
+            PhysicalSides::zero(), /* margin */
+            None,                  /* clearance */
+        );
+        row_fragment.set_does_not_paint_background();
+
+        if let Some(mut row_positioning_context) = self.positioning_context.take() {
+            row_positioning_context.layout_collected_children(layout_context, &mut row_fragment);
+
+            let parent_positioning_context = row_group_fragment_layout
+                .as_mut()
+                .and_then(|layout| layout.positioning_context.as_mut())
+                .unwrap_or(table_positioning_context);
+            parent_positioning_context.append(row_positioning_context);
+        }
+
+        let fragment = Fragment::Box(ArcRefCell::new(row_fragment));
+        self.row.base.set_fragment(fragment.clone());
+        fragment
+    }
+}
+
+struct RowGroupFragmentLayout {
+    row_group: ArcRefCell<TableTrackGroup>,
+    rect: LogicalRect<Au>,
+    positioning_context: Option<PositioningContext>,
+    index: usize,
+    fragments: Vec<Fragment>,
+}
+
+impl RowGroupFragmentLayout {
+    fn new(
+        row_group: ArcRefCell<TableTrackGroup>,
+        index: usize,
+        dimensions: &TableAndTrackDimensions,
+    ) -> Self {
+        let (rect, positioning_context) = {
+            let row_group = row_group.borrow();
+            (
+                dimensions.get_row_group_rect(&row_group),
+                PositioningContext::new_for_layout_box_base(&row_group.base),
+            )
+        };
+        Self {
+            row_group,
+            rect,
+            positioning_context,
+            index,
+            fragments: Vec::new(),
+        }
+    }
+
+    fn finish(
+        mut self,
+        layout_context: &LayoutContext,
+        table_positioning_context: &mut PositioningContext,
+        containing_block_for_logical_conversion: &ContainingBlock,
+        containing_block_for_children: &ContainingBlock,
+    ) -> Fragment {
+        let row_group = self.row_group.borrow();
+        if self.positioning_context.is_some() {
+            self.rect.start_corner +=
+                relative_adjustement(&row_group.base.style, containing_block_for_children);
+        }
+
+        let mut row_group_fragment = BoxFragment::new(
+            row_group.base.base_fragment_info,
+            row_group.base.style.clone(),
+            self.fragments,
+            self.rect
+                .as_physical(Some(containing_block_for_logical_conversion)),
+            PhysicalSides::zero(), /* padding */
+            PhysicalSides::zero(), /* border */
+            PhysicalSides::zero(), /* margin */
+            None,                  /* clearance */
+        );
+        row_group_fragment.set_does_not_paint_background();
+
+        if let Some(mut row_positioning_context) = self.positioning_context.take() {
+            row_positioning_context
+                .layout_collected_children(layout_context, &mut row_group_fragment);
+            table_positioning_context.append(row_positioning_context);
+        }
+
+        let fragment = Fragment::Box(ArcRefCell::new(row_group_fragment));
+        row_group.base.set_fragment(fragment.clone());
+        fragment
+    }
+}
+
+struct TableAndTrackDimensions {
+    /// The rect of the full table, not counting for borders, padding, and margin.
+    table_rect: LogicalRect<Au>,
+    /// The rect of the full table, not counting for borders, padding, and margin
+    /// and offset by any border spacing and caption.
+    table_cells_rect: LogicalRect<Au>,
+    /// The min and max block offsets of each table row.
+    row_dimensions: Vec<(Au, Au)>,
+    /// The min and max inline offsets of each table column
+    column_dimensions: Vec<(Au, Au)>,
+}
+
+impl TableAndTrackDimensions {
+    fn new(table_layout: &TableLayout) -> Self {
+        let border_spacing = table_layout.table.border_spacing();
+
+        // The sizes used for a dimension when that dimension has no table tracks.
+        let fallback_inline_size = table_layout.assignable_width;
+        let fallback_block_size = table_layout.final_table_height;
+
+        let mut column_dimensions = Vec::new();
+        let mut column_offset = Au::zero();
+        for column_index in 0..table_layout.table.size.width {
+            if table_layout.is_column_collapsed(column_index) {
+                column_dimensions.push((column_offset, column_offset));
+                continue;
+            }
+            let start_offset = column_offset + border_spacing.inline;
+            let end_offset = start_offset + table_layout.distributed_column_widths[column_index];
+            column_dimensions.push((start_offset, end_offset));
+            column_offset = end_offset;
+        }
+        column_offset += if table_layout.table.size.width == 0 {
+            fallback_inline_size
+        } else {
+            border_spacing.inline
+        };
+
+        let mut row_dimensions = Vec::new();
+        let mut row_offset = Au::zero();
+        for row_index in 0..table_layout.table.size.height {
+            if table_layout.is_row_collapsed(row_index) {
+                row_dimensions.push((row_offset, row_offset));
+                continue;
+            }
+            let start_offset = row_offset + border_spacing.block;
+            let end_offset = start_offset + table_layout.row_sizes[row_index];
+            row_dimensions.push((start_offset, end_offset));
+            row_offset = end_offset;
+        }
+        row_offset += if table_layout.table.size.height == 0 {
+            fallback_block_size
+        } else {
+            border_spacing.block
+        };
+
+        let table_start_corner = LogicalVec2 {
+            inline: column_dimensions.first().map_or_else(Au::zero, |v| v.0),
+            block: row_dimensions.first().map_or_else(Au::zero, |v| v.0),
+        };
+        let table_size = LogicalVec2 {
+            inline: column_dimensions
+                .last()
+                .map_or(fallback_inline_size, |v| v.1),
+            block: row_dimensions.last().map_or(fallback_block_size, |v| v.1),
+        } - table_start_corner;
+        let table_cells_rect = LogicalRect {
+            start_corner: table_start_corner,
+            size: table_size,
+        };
+
+        let table_rect = LogicalRect {
+            start_corner: LogicalVec2::zero(),
+            size: LogicalVec2 {
+                inline: column_offset,
+                block: row_offset,
+            },
+        };
+
+        Self {
+            table_rect,
+            table_cells_rect,
+            row_dimensions,
+            column_dimensions,
+        }
+    }
+
+    fn get_row_rect(&self, row_index: usize) -> LogicalRect<Au> {
+        let mut row_rect = self.table_cells_rect;
+        let row_dimensions = self.row_dimensions[row_index];
+        row_rect.start_corner.block = row_dimensions.0;
+        row_rect.size.block = row_dimensions.1 - row_dimensions.0;
+        row_rect
+    }
+
+    fn get_column_rect(&self, column_index: usize) -> LogicalRect<Au> {
+        let mut row_rect = self.table_cells_rect;
+        let column_dimensions = self.column_dimensions[column_index];
+        row_rect.start_corner.inline = column_dimensions.0;
+        row_rect.size.inline = column_dimensions.1 - column_dimensions.0;
+        row_rect
+    }
+
+    fn get_row_group_rect(&self, row_group: &TableTrackGroup) -> LogicalRect<Au> {
+        if row_group.is_empty() {
+            return LogicalRect::zero();
+        }
+
+        let mut row_group_rect = self.table_cells_rect;
+        let block_start = self.row_dimensions[row_group.track_range.start].0;
+        let block_end = self.row_dimensions[row_group.track_range.end - 1].1;
+        row_group_rect.start_corner.block = block_start;
+        row_group_rect.size.block = block_end - block_start;
+        row_group_rect
+    }
+
+    fn get_column_group_rect(&self, column_group: &TableTrackGroup) -> LogicalRect<Au> {
+        if column_group.is_empty() {
+            return LogicalRect::zero();
+        }
+
+        let mut column_group_rect = self.table_cells_rect;
+        let inline_start = self.column_dimensions[column_group.track_range.start].0;
+        let inline_end = self.column_dimensions[column_group.track_range.end - 1].1;
+        column_group_rect.start_corner.inline = inline_start;
+        column_group_rect.size.inline = inline_end - inline_start;
+        column_group_rect
+    }
+
+    fn get_cell_rect(
+        &self,
+        coordinates: TableSlotCoordinates,
+        rowspan: usize,
+        colspan: usize,
+    ) -> LogicalRect<Au> {
+        let start_corner = LogicalVec2 {
+            inline: self.column_dimensions[coordinates.x].0,
+            block: self.row_dimensions[coordinates.y].0,
+        };
+        let size = LogicalVec2 {
+            inline: self.column_dimensions[coordinates.x + colspan - 1].1,
+            block: self.row_dimensions[coordinates.y + rowspan - 1].1,
+        } - start_corner;
+        LogicalRect { start_corner, size }
+    }
+}
+
+impl Table {
+    fn border_spacing(&self) -> LogicalVec2<Au> {
+        if self.style.clone_border_collapse() == BorderCollapse::Collapse {
+            LogicalVec2::zero()
+        } else {
+            let border_spacing = self.style.clone_border_spacing();
+            LogicalVec2 {
+                inline: border_spacing.horizontal(),
+                block: border_spacing.vertical(),
+            }
+        }
+    }
+
+    fn total_border_spacing(&self) -> LogicalVec2<Au> {
+        let border_spacing = self.border_spacing();
+        LogicalVec2 {
+            inline: if self.size.width > 0 {
+                border_spacing.inline * (self.size.width as i32 + 1)
+            } else {
+                Au::zero()
+            },
+            block: if self.size.height > 0 {
+                border_spacing.block * (self.size.height as i32 + 1)
+            } else {
+                Au::zero()
+            },
+        }
+    }
+
+    fn get_column_measure_for_column_at_index(
+        &self,
+        writing_mode: WritingMode,
+        column_index: usize,
+        is_in_fixed_mode: bool,
+    ) -> CellOrTrackMeasure {
+        let column = match self.columns.get(column_index) {
+            Some(column) => column,
+            None => return CellOrTrackMeasure::zero(),
+        }
+        .borrow();
+
+        let CellOrColumnOuterSizes {
+            preferred: preferred_size,
+            min: min_size,
+            max: max_size,
+            percentage: percentage_size,
+        } = CellOrColumnOuterSizes::new(
+            &column.base.style,
+            writing_mode,
+            &Default::default(),
+            is_in_fixed_mode,
+        );
+
+        CellOrTrackMeasure {
+            content_sizes: ContentSizes {
+                // > The outer min-content width of a table-column or table-column-group is
+                // > max(min-width, width).
+                // But that's clearly wrong, since it would be equal to or greater than
+                // the outer max-content width. So we match other browsers instead.
+                min_content: min_size.inline,
+                // > The outer max-content width of a table-column or table-column-group is
+                // > max(min-width, min(max-width, width)).
+                // This matches Gecko, but Blink and WebKit ignore max_size.
+                max_content: preferred_size
+                    .inline
+                    .clamp_between_extremums(min_size.inline, max_size.inline),
+            },
+            percentage: percentage_size.inline,
+        }
+    }
+
+    fn get_row_measure_for_row_at_index(
+        &self,
+        writing_mode: WritingMode,
+        row_index: usize,
+    ) -> CellOrTrackMeasure {
+        let row = match self.rows.get(row_index) {
+            Some(row) => row,
+            None => return CellOrTrackMeasure::zero(),
+        };
+
+        // In the block axis, the min-content and max-content sizes are the same
+        // (except for new layout boxes like grid and flex containers). Note that
+        // other browsers don't seem to use the min and max sizing properties here.
+        let row = row.borrow();
+        let size = row.base.style.box_size(writing_mode);
+        let max_size = row.base.style.max_box_size(writing_mode);
+        let percentage_contribution = get_size_percentage_contribution(&size, &max_size);
+
+        CellOrTrackMeasure {
+            content_sizes: size
+                .block
+                .to_numeric()
+                .and_then(|size| size.to_length())
+                .map_or_else(Au::zero, Au::from)
+                .into(),
+            percentage: percentage_contribution.block,
+        }
+    }
+
+    pub(crate) fn layout(
+        &self,
+        layout_context: &LayoutContext,
+        positioning_context: &mut PositioningContext,
+        containing_block_for_children: &ContainingBlock,
+        containing_block_for_table: &ContainingBlock,
+        depends_on_block_constraints: bool,
+    ) -> CacheableLayoutResult {
+        TableLayout::new(self).layout(
+            layout_context,
+            positioning_context,
+            containing_block_for_children,
+            containing_block_for_table,
+            depends_on_block_constraints,
+        )
+    }
+}
+
+impl ComputeInlineContentSizes for Table {
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(
+            name = "Table::compute_inline_content_sizes",
+            skip_all,
+            fields(servo_profiling = true),
+            level = "trace",
+        )
+    )]
+    fn compute_inline_content_sizes(
+        &self,
+        layout_context: &LayoutContext,
+        constraint_space: &ConstraintSpace,
+    ) -> InlineContentSizesResult {
+        let writing_mode = constraint_space.writing_mode;
+        let mut layout = TableLayout::new(self);
+        layout.compute_border_collapse(writing_mode);
+        layout.pbm = self
+            .layout_style(Some(&layout))
+            .padding_border_margin_with_writing_mode_and_containing_block_inline_size(
+                writing_mode,
+                Au::zero(),
+            );
+        layout.compute_measures(layout_context, writing_mode);
+
+        let grid_content_sizes = layout.compute_grid_min_max();
+
+        // Padding and border should apply to the table grid, but they will be taken into
+        // account when computing the inline content sizes of the table wrapper (our parent), so
+        // this code removes their contribution from the inline content size of the caption.
+        let caption_content_sizes = ContentSizes::from(
+            layout.compute_caption_minimum_inline_size(layout_context) -
+                layout.pbm.padding_border_sums.inline,
+        );
+
+        InlineContentSizesResult {
+            sizes: grid_content_sizes.max(caption_content_sizes),
+            depends_on_block_constraints: false,
+        }
+    }
+}
+
+impl Table {
+    #[inline]
+    pub(crate) fn layout_style<'a>(
+        &'a self,
+        layout: Option<&'a TableLayout<'a>>,
+    ) -> LayoutStyle<'a> {
+        LayoutStyle::Table(TableLayoutStyle {
+            table: self,
+            layout,
+        })
+    }
+
+    #[inline]
+    pub(crate) fn layout_style_for_grid(&self) -> LayoutStyle {
+        LayoutStyle::Default(&self.grid_style)
+    }
+}
+
+impl TableTrack {
+    #[inline]
+    pub(crate) fn layout_style(&self) -> LayoutStyle {
+        LayoutStyle::Default(&self.base.style)
+    }
+}
+
+impl TableTrackGroup {
+    #[inline]
+    pub(crate) fn layout_style(&self) -> LayoutStyle {
+        LayoutStyle::Default(&self.base.style)
+    }
+}
+
+impl TableLayoutStyle<'_> {
+    #[inline]
+    pub(crate) fn style(&self) -> &ComputedValues {
+        &self.table.style
+    }
+
+    #[inline]
+    pub(crate) fn collapses_borders(&self) -> bool {
+        self.style().get_inherited_table().border_collapse == BorderCollapse::Collapse
+    }
+
+    pub(crate) fn halved_collapsed_border_widths(&self) -> LogicalSides<Au> {
+        debug_assert!(self.collapses_borders());
+        let area = LogicalSides {
+            inline_start: 0,
+            inline_end: self.table.size.width,
+            block_start: 0,
+            block_end: self.table.size.height,
+        };
+        if let Some(layout) = self.layout {
+            layout.get_collapsed_border_widths_for_area(area)
+        } else {
+            // TODO: this should be cached.
+            let mut layout = TableLayout::new(self.table);
+            layout.compute_border_collapse(self.style().writing_mode);
+            layout.get_collapsed_border_widths_for_area(area)
+        }
+        .expect("Collapsed borders should be computed")
+    }
+}
+
+impl TableSlotCell {
+    #[inline]
+    fn layout_style(&self) -> LayoutStyle {
+        self.contents.layout_style(&self.base)
+    }
+
+    fn effective_vertical_align(&self) -> VerticalAlignKeyword {
+        match self.base.style.clone_vertical_align() {
+            VerticalAlign::Keyword(VerticalAlignKeyword::Top) => VerticalAlignKeyword::Top,
+            VerticalAlign::Keyword(VerticalAlignKeyword::Bottom) => VerticalAlignKeyword::Bottom,
+            VerticalAlign::Keyword(VerticalAlignKeyword::Middle) => VerticalAlignKeyword::Middle,
+            _ => VerticalAlignKeyword::Baseline,
+        }
+    }
+
+    fn inline_content_sizes(&self, layout_context: &LayoutContext) -> ContentSizes {
+        let constraint_space = ConstraintSpace::new_for_style_and_ratio(
+            &self.base.style,
+            None, /* TODO: support preferred aspect ratios on non-replaced boxes */
+        );
+        self.base
+            .inline_content_sizes(layout_context, &constraint_space, &self.contents.contents)
+            .sizes
+    }
+
+    fn create_fragment(
+        &self,
+        mut layout: CellLayout,
+        cell_rect: LogicalRect<Au>,
+        cell_baseline: Au,
+        positioning_context: &mut PositioningContext,
+        table_style: &ComputedValues,
+        containing_block: &ContainingBlock,
+    ) -> BoxFragment {
+        // This must be scoped to this function because it conflicts with euclid's Zero.
+        use style::Zero as StyleZero;
+
+        let cell_content_rect = cell_rect.deflate(&(layout.padding + layout.border));
+        let content_block_size = layout.layout.content_block_size;
+        let vertical_align_offset = match self.effective_vertical_align() {
+            VerticalAlignKeyword::Top => Au::zero(),
+            VerticalAlignKeyword::Bottom => cell_content_rect.size.block - content_block_size,
+            VerticalAlignKeyword::Middle => {
+                (cell_content_rect.size.block - content_block_size).scale_by(0.5)
+            },
+            _ => {
+                cell_baseline -
+                    (layout.padding.block_start + layout.border.block_start) -
+                    layout.ascent()
+            },
+        };
+
+        let mut base_fragment_info = self.base.base_fragment_info;
+        if self.base.style.get_inherited_table().empty_cells == EmptyCells::Hide &&
+            table_style.get_inherited_table().border_collapse != BorderCollapse::Collapse &&
+            layout.is_empty_for_empty_cells()
+        {
+            base_fragment_info.flags.insert(FragmentFlags::DO_NOT_PAINT);
+        }
+
+        // Create an `AnonymousFragment` to move the cell contents to the cell baseline.
+        let mut vertical_align_fragment_rect = cell_content_rect;
+        vertical_align_fragment_rect.start_corner = LogicalVec2 {
+            inline: Au::zero(),
+            block: vertical_align_offset,
+        };
+        let vertical_align_fragment = PositioningFragment::new_anonymous(
+            self.base.style.clone(),
+            vertical_align_fragment_rect.as_physical(None),
+            layout.layout.fragments,
+        );
+
+        // Adjust the static position of all absolute children based on the
+        // final content rect of this fragment. Note that we are not shifting by the position of the
+        // Anonymous fragment we use to shift content to the baseline.
+        //
+        // TODO(mrobinson): This is correct for absolutes that are direct children of the table
+        // cell, but wrong for absolute fragments that are more deeply nested in the hierarchy of
+        // fragments.
+        let physical_cell_rect = cell_content_rect.as_physical(Some(containing_block));
+        layout
+            .positioning_context
+            .adjust_static_position_of_hoisted_fragments_with_offset(
+                &physical_cell_rect.origin.to_vector(),
+                PositioningContextLength::zero(),
+            );
+        positioning_context.append(layout.positioning_context);
+
+        let specific_layout_info = (table_style.get_inherited_table().border_collapse ==
+            BorderCollapse::Collapse)
+            .then_some(SpecificLayoutInfo::TableCellWithCollapsedBorders);
+
+        BoxFragment::new(
+            base_fragment_info,
+            self.base.style.clone(),
+            vec![Fragment::Positioning(vertical_align_fragment)],
+            physical_cell_rect,
+            layout.padding.to_physical(table_style.writing_mode),
+            layout.border.to_physical(table_style.writing_mode),
+            PhysicalSides::zero(), /* margin */
+            None,                  /* clearance */
+        )
+        .with_baselines(layout.layout.baselines)
+        .with_specific_layout_info(specific_layout_info)
+    }
+}
+
+fn get_size_percentage_contribution(
+    size: &LogicalVec2<Size<ComputedLengthPercentage>>,
+    max_size: &LogicalVec2<Size<ComputedLengthPercentage>>,
+) -> LogicalVec2<Option<Percentage>> {
+    // From <https://drafts.csswg.org/css-tables/#percentage-contribution>
+    // > The percentage contribution of a table cell, column, or column group is defined
+    // > in terms of the computed values of width and max-width that have computed values
+    // > that are percentages:
+    // >    min(percentage width, percentage max-width).
+    // > If the computed values are not percentages, then 0% is used for width, and an
+    // > infinite percentage is used for max-width.
+    LogicalVec2 {
+        inline: max_two_optional_percentages(
+            size.inline.to_percentage(),
+            max_size.inline.to_percentage(),
+        ),
+        block: max_two_optional_percentages(
+            size.block.to_percentage(),
+            max_size.block.to_percentage(),
+        ),
+    }
+}
+
+struct CellOrColumnOuterSizes {
+    min: LogicalVec2<Au>,
+    preferred: LogicalVec2<Au>,
+    max: LogicalVec2<Option<Au>>,
+    percentage: LogicalVec2<Option<Percentage>>,
+}
+
+impl CellOrColumnOuterSizes {
+    fn new(
+        style: &Arc<ComputedValues>,
+        writing_mode: WritingMode,
+        padding_border_sums: &LogicalVec2<Au>,
+        is_in_fixed_mode: bool,
+    ) -> Self {
+        let box_sizing = style.get_position().box_sizing;
+        let outer_size = |size: LogicalVec2<Au>| match box_sizing {
+            BoxSizing::ContentBox => size + *padding_border_sums,
+            BoxSizing::BorderBox => LogicalVec2 {
+                inline: size.inline.max(padding_border_sums.inline),
+                block: size.block.max(padding_border_sums.block),
+            },
+        };
+
+        let outer_option_size = |size: LogicalVec2<Option<Au>>| match box_sizing {
+            BoxSizing::ContentBox => size.map_inline_and_block_axes(
+                |inline| inline.map(|inline| inline + padding_border_sums.inline),
+                |block| block.map(|block| block + padding_border_sums.block),
+            ),
+            BoxSizing::BorderBox => size.map_inline_and_block_axes(
+                |inline| inline.map(|inline| inline.max(padding_border_sums.inline)),
+                |block| block.map(|block| block.max(padding_border_sums.block)),
+            ),
+        };
+
+        let get_size_for_axis = |size: &Size<ComputedLengthPercentage>| {
+            // Note that measures treat all size values other than <length>
+            // as the initial value of the property.
+            size.to_numeric()
+                .and_then(|length_percentage| length_percentage.to_length())
+                .map(Au::from)
+        };
+
+        let size = style.box_size(writing_mode);
+        if is_in_fixed_mode {
+            return Self {
+                percentage: size.map(|v| v.to_percentage()),
+                preferred: outer_option_size(size.map(get_size_for_axis))
+                    .map(|v| v.unwrap_or_default()),
+                min: LogicalVec2::default(),
+                max: LogicalVec2::default(),
+            };
+        }
+
+        let min_size = style.min_box_size(writing_mode);
+        let max_size = style.max_box_size(writing_mode);
+
+        Self {
+            min: outer_size(min_size.map(|v| get_size_for_axis(v).unwrap_or_default())),
+            preferred: outer_size(size.map(|v| get_size_for_axis(v).unwrap_or_default())),
+            max: outer_option_size(max_size.map(get_size_for_axis)),
+            percentage: get_size_percentage_contribution(&size, &max_size),
+        }
+    }
+}
+
+struct RowspanToDistribute<'a> {
+    coordinates: TableSlotCoordinates,
+    cell: AtomicRef<'a, TableSlotCell>,
+    measure: &'a CellOrTrackMeasure,
+}
+
+impl RowspanToDistribute<'_> {
+    fn range(&self) -> Range<usize> {
+        self.coordinates.y..self.coordinates.y + self.cell.rowspan
+    }
+
+    fn fully_encloses(&self, other: &RowspanToDistribute) -> bool {
+        other.coordinates.y > self.coordinates.y && other.range().end < self.range().end
+    }
+}
+
+/// The inline size constraints provided by a cell that span multiple columns (`colspan` > 1).
+/// These constraints are distributed to the individual columns that make up this cell's span.
+#[derive(Debug)]
+struct ColspanToDistribute {
+    starting_column: usize,
+    span: usize,
+    content_sizes: ContentSizes,
+    percentage: Option<Percentage>,
+}
+
+impl ColspanToDistribute {
+    /// A comparison function to sort the colspan cell constraints primarily by their span
+    /// width and secondarily by their starting column. This is not an implementation of
+    /// `PartialOrd` because we want to return [`Ordering::Equal`] even if `self != other`.
+    fn comparison_for_sort(a: &Self, b: &Self) -> Ordering {
+        a.span
+            .cmp(&b.span)
+            .then_with(|| b.starting_column.cmp(&b.starting_column))
+    }
+
+    fn range(&self) -> Range<usize> {
+        self.starting_column..self.starting_column + self.span
+    }
+}
diff --git a/components/layout/table/mod.rs b/components/layout/table/mod.rs
new file mode 100644
index 00000000000..72b67863e7d
--- /dev/null
+++ b/components/layout/table/mod.rs
@@ -0,0 +1,442 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+#![allow(rustdoc::private_intra_doc_links)]
+
+//! # HTML Tables (╯°□°)╯︵ ┻━┻
+//!
+//! This implementation is based on the [table section of the HTML 5 Specification][1],
+//! the draft [CSS Table Module Level! 3][2] and the [LayoutNG implementation of tables][3] in Blink.
+//! In general, the draft specification differs greatly from what other browsers do, so we
+//! generally follow LayoutNG when in question.
+//!
+//! [1]: https://html.spec.whatwg.org/multipage/#tables
+//! [2]: https://drafts.csswg.org/css-tables
+//! [3]: https://source.chromium.org/chromium/chromium/src/third_party/+/main:blink/renderer/core/layout/table
+//!
+//! Table layout is divided into two phases:
+//!
+//! 1. Box Tree Construction
+//! 2. Fragment Tree Construction
+//!
+//! ## Box Tree Construction
+//!
+//! During box tree construction, table layout (`construct.rs`) will traverse the DOM and construct
+//! the basic box tree representation of a table, using the structs defined in this file ([`Table`],
+//! [`TableTrackGroup`], [`TableTrack`], etc). When processing the DOM, elements are handled
+//! differently depending on their `display` value. For instance, an element with `display:
+//! table-cell` is treated as a table cell. HTML table elements like `<table>` and `<td>` are
+//! assigned the corresponding display value from the user agent stylesheet.
+//!
+//! Every [`Table`] holds an array of [`TableSlot`]. A [`TableSlot`] represents either a cell, a cell
+//! location occupied by a cell originating from another place in the table, or is empty. In
+//! addition, when there are table model errors, a slot may spanned by more than one cell.
+//!
+//! During processing, the box tree construction agorithm will also fix up table structure, for
+//! instance, creating anonymous rows for lone table cells and putting non-table content into
+//! anonymous cells. In addition, flow layout will collect table elements outside of tables and create
+//! anonymous tables for them.
+//!
+//! After processing, box tree construction does a fix up pass on tables, converting rowspan=0 into
+//! definite rowspan values and making sure that rowspan and celspan values are not larger than the
+//! table itself. Finally, row groups may be reordered to enforce the fact that the first `<thead>`
+//! comes before `<tbody>` which comes before the first `<tfoot>`.
+//!
+//! ## Fragment Tree Construction
+//!
+//! Fragment tree construction involves calculating the size and positioning of all table elements,
+//! given their style, content, and cell and row spans. This happens both during intrinsic inline
+//! size computation as well as layout into Fragments. In both of these cases, measurement and
+//! layout is done by [`layout::TableLayout`], though for intrinsic size computation only a partial
+//! layout is done.
+//!
+//! In general, we follow the following steps when laying out table content:
+//!
+//! 1. Compute track constrainedness and has originating cells
+//! 2. Compute cell measures
+//! 3. Compute column measures
+//! 4. Compute intrinsic inline sizes for columns and the table
+//! 5. Compute the final table inline size
+//! 6. Distribute size to columns
+//! 7. Do first pass cell layout
+//! 8. Do row layout
+//! 9. Compute table height and final row sizes
+//! 10. Create fragments for table elements (columns, column groups, rows, row groups, cells)
+//!
+//! For intrinsic size computation this process stops at step 4.
+
+mod construct;
+mod layout;
+
+use std::ops::Range;
+
+use app_units::Au;
+use atomic_refcell::AtomicRef;
+pub(crate) use construct::AnonymousTableContent;
+pub use construct::TableBuilder;
+use euclid::{Point2D, Size2D, UnknownUnit, Vector2D};
+use malloc_size_of_derive::MallocSizeOf;
+use script::layout_dom::ServoLayoutElement;
+use servo_arc::Arc;
+use style::context::SharedStyleContext;
+use style::properties::ComputedValues;
+use style::properties::style_structs::Font;
+use style::selector_parser::PseudoElement;
+use style_traits::dom::OpaqueNode;
+
+use super::flow::BlockFormattingContext;
+use crate::SharedStyle;
+use crate::cell::ArcRefCell;
+use crate::flow::BlockContainer;
+use crate::formatting_contexts::IndependentFormattingContext;
+use crate::fragment_tree::{BaseFragmentInfo, Fragment};
+use crate::geom::PhysicalVec;
+use crate::layout_box_base::LayoutBoxBase;
+use crate::style_ext::BorderStyleColor;
+use crate::table::layout::TableLayout;
+
+pub type TableSize = Size2D<usize, UnknownUnit>;
+
+#[derive(Debug, MallocSizeOf)]
+pub struct Table {
+    /// The style of this table. These are the properties that apply to the "wrapper" ie the element
+    /// that contains both the grid and the captions. Not all properties are actually used on the
+    /// wrapper though, such as background and borders, which apply to the grid.
+    style: Arc<ComputedValues>,
+
+    /// The style of this table's grid. This is an anonymous style based on the table's style, but
+    /// eliminating all the properties handled by the "wrapper."
+    grid_style: Arc<ComputedValues>,
+
+    /// The [`BaseFragmentInfo`] for this table's grid. This is necessary so that when the
+    /// grid has a background image, it can be associated with the table's node.
+    grid_base_fragment_info: BaseFragmentInfo,
+
+    /// The captions for this table.
+    pub captions: Vec<ArcRefCell<TableCaption>>,
+
+    /// The column groups for this table.
+    pub column_groups: Vec<ArcRefCell<TableTrackGroup>>,
+
+    /// The columns of this table defined by `<colgroup> | display: table-column-group`
+    /// and `<col> | display: table-column` elements as well as `display: table-column`.
+    pub columns: Vec<ArcRefCell<TableTrack>>,
+
+    /// The rows groups for this table defined by `<tbody>`, `<thead>`, and `<tfoot>`.
+    pub row_groups: Vec<ArcRefCell<TableTrackGroup>>,
+
+    /// The rows of this table defined by `<tr>` or `display: table-row` elements.
+    pub rows: Vec<ArcRefCell<TableTrack>>,
+
+    /// The content of the slots of this table.
+    pub slots: Vec<Vec<TableSlot>>,
+
+    /// The size of this table.
+    pub size: TableSize,
+
+    /// Whether or not this Table is anonymous.
+    anonymous: bool,
+
+    /// Whether percentage columns are taken into account during inline content sizes calculation.
+    percentage_columns_allowed_for_inline_content_sizes: bool,
+}
+
+impl Table {
+    pub(crate) fn new(
+        style: Arc<ComputedValues>,
+        grid_style: Arc<ComputedValues>,
+        base_fragment_info: BaseFragmentInfo,
+        percentage_columns_allowed_for_inline_content_sizes: bool,
+    ) -> Self {
+        Self {
+            style,
+            grid_style,
+            grid_base_fragment_info: base_fragment_info,
+            captions: Vec::new(),
+            column_groups: Vec::new(),
+            columns: Vec::new(),
+            row_groups: Vec::new(),
+            rows: Vec::new(),
+            slots: Vec::new(),
+            size: TableSize::zero(),
+            anonymous: false,
+            percentage_columns_allowed_for_inline_content_sizes,
+        }
+    }
+
+    /// Return the slot at the given coordinates, if it exists in the table, otherwise
+    /// return None.
+    fn get_slot(&self, coords: TableSlotCoordinates) -> Option<&TableSlot> {
+        self.slots.get(coords.y)?.get(coords.x)
+    }
+
+    fn resolve_first_cell_coords(
+        &self,
+        coords: TableSlotCoordinates,
+    ) -> Option<TableSlotCoordinates> {
+        match self.get_slot(coords) {
+            Some(&TableSlot::Cell(_)) => Some(coords),
+            Some(TableSlot::Spanned(offsets)) => Some(coords - offsets[0]),
+            _ => None,
+        }
+    }
+
+    fn resolve_first_cell(
+        &self,
+        coords: TableSlotCoordinates,
+    ) -> Option<AtomicRef<'_, TableSlotCell>> {
+        let resolved_coords = self.resolve_first_cell_coords(coords)?;
+        let slot = self.get_slot(resolved_coords);
+        match slot {
+            Some(TableSlot::Cell(cell)) => Some(cell.borrow()),
+            _ => unreachable!(
+                "Spanned slot should not point to an empty cell or another spanned slot."
+            ),
+        }
+    }
+
+    pub(crate) fn repair_style(
+        &mut self,
+        context: &SharedStyleContext,
+        new_style: &Arc<ComputedValues>,
+    ) {
+        self.style = new_style.clone();
+        self.grid_style = context.stylist.style_for_anonymous::<ServoLayoutElement>(
+            &context.guards,
+            &PseudoElement::ServoTableGrid,
+            new_style,
+        );
+    }
+}
+
+type TableSlotCoordinates = Point2D<usize, UnknownUnit>;
+pub type TableSlotOffset = Vector2D<usize, UnknownUnit>;
+
+#[derive(Debug, MallocSizeOf)]
+pub struct TableSlotCell {
+    /// The [`LayoutBoxBase`] of this table cell.
+    base: LayoutBoxBase,
+
+    /// The contents of this cell, with its own layout.
+    contents: BlockFormattingContext,
+
+    /// Number of columns that the cell is to span. Must be greater than zero.
+    colspan: usize,
+
+    /// Number of rows that the cell is to span. Zero means that the cell is to span all
+    /// the remaining rows in the row group.
+    rowspan: usize,
+}
+
+impl TableSlotCell {
+    pub fn mock_for_testing(id: usize, colspan: usize, rowspan: usize) -> Self {
+        Self {
+            base: LayoutBoxBase::new(
+                BaseFragmentInfo::new_for_node(OpaqueNode(id)),
+                ComputedValues::initial_values_with_font_override(Font::initial_values()).to_arc(),
+            ),
+            contents: BlockFormattingContext {
+                contents: BlockContainer::BlockLevelBoxes(Vec::new()),
+                contains_floats: false,
+            },
+            colspan,
+            rowspan,
+        }
+    }
+
+    /// Get the node id of this cell's [`BaseFragmentInfo`]. This is used for unit tests.
+    pub fn node_id(&self) -> usize {
+        self.base.base_fragment_info.tag.map_or(0, |tag| tag.node.0)
+    }
+
+    fn repair_style(&mut self, new_style: &Arc<ComputedValues>) {
+        self.base.repair_style(new_style);
+    }
+}
+
+/// A single table slot. It may be an actual cell, or a reference
+/// to a previous cell that is spanned here
+///
+/// In case of table model errors, it may be multiple references
+#[derive(MallocSizeOf)]
+pub enum TableSlot {
+    /// A table cell, with a colspan and a rowspan.
+    Cell(ArcRefCell<TableSlotCell>),
+
+    /// This slot is spanned by one or more multiple cells earlier in the table, which are
+    /// found at the given negative coordinate offsets. The vector is in the order of most
+    /// recent to earliest cell.
+    ///
+    /// If there is more than one cell that spans a slot, this is a table model error, but
+    /// we still keep track of it. See
+    /// <https://html.spec.whatwg.org/multipage/#table-model-error>
+    Spanned(Vec<TableSlotOffset>),
+
+    /// An empty spot in the table. This can happen when there is a gap in columns between
+    /// cells that are defined and one which should exist because of cell with a rowspan
+    /// from a previous row.
+    Empty,
+}
+
+impl std::fmt::Debug for TableSlot {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Cell(_) => f.debug_tuple("Cell").finish(),
+            Self::Spanned(spanned) => f.debug_tuple("Spanned").field(spanned).finish(),
+            Self::Empty => write!(f, "Empty"),
+        }
+    }
+}
+
+impl TableSlot {
+    fn new_spanned(offset: TableSlotOffset) -> Self {
+        Self::Spanned(vec![offset])
+    }
+}
+
+/// A row or column of a table.
+#[derive(Debug, MallocSizeOf)]
+pub struct TableTrack {
+    /// The [`LayoutBoxBase`] of this [`TableTrack`].
+    base: LayoutBoxBase,
+
+    /// The index of the table row or column group parent in the table's list of row or column
+    /// groups.
+    group_index: Option<usize>,
+
+    /// Whether or not this [`TableTrack`] was anonymous, for instance created due to
+    /// a `span` attribute set on a parent `<colgroup>`.
+    is_anonymous: bool,
+
+    /// A shared container for this track's style, used to share the style for the purposes
+    /// of drawing backgrounds in individual cells. This allows updating the style in a
+    /// single place and having it affect all cell `Fragment`s.
+    shared_background_style: SharedStyle,
+}
+
+impl TableTrack {
+    fn repair_style(&mut self, new_style: &Arc<ComputedValues>) {
+        self.base.repair_style(new_style);
+        self.shared_background_style = SharedStyle::new(new_style.clone());
+    }
+}
+
+#[derive(Debug, MallocSizeOf, PartialEq)]
+pub enum TableTrackGroupType {
+    HeaderGroup,
+    FooterGroup,
+    RowGroup,
+    ColumnGroup,
+}
+
+#[derive(Debug, MallocSizeOf)]
+pub struct TableTrackGroup {
+    /// The [`LayoutBoxBase`] of this [`TableTrackGroup`].
+    base: LayoutBoxBase,
+
+    /// The type of this [`TableTrackGroup`].
+    group_type: TableTrackGroupType,
+
+    /// The range of tracks in this [`TableTrackGroup`].
+    track_range: Range<usize>,
+
+    /// A shared container for this track's style, used to share the style for the purposes
+    /// of drawing backgrounds in individual cells. This allows updating the style in a
+    /// single place and having it affect all cell `Fragment`s.
+    shared_background_style: SharedStyle,
+}
+
+impl TableTrackGroup {
+    pub(super) fn is_empty(&self) -> bool {
+        self.track_range.is_empty()
+    }
+
+    fn repair_style(&mut self, new_style: &Arc<ComputedValues>) {
+        self.base.repair_style(new_style);
+        self.shared_background_style = SharedStyle::new(new_style.clone());
+    }
+}
+
+#[derive(Debug, MallocSizeOf)]
+pub struct TableCaption {
+    /// The contents of this cell, with its own layout.
+    context: IndependentFormattingContext,
+}
+
+/// A calculated collapsed border.
+#[derive(Clone, Debug, Default, MallocSizeOf, PartialEq)]
+pub(crate) struct CollapsedBorder {
+    pub style_color: BorderStyleColor,
+    pub width: Au,
+}
+
+/// Represents a piecewise sequence of collapsed borders along a line.
+pub(crate) type CollapsedBorderLine = Vec<CollapsedBorder>;
+
+#[derive(Clone, Debug, MallocSizeOf)]
+pub(crate) struct SpecificTableGridInfo {
+    pub collapsed_borders: PhysicalVec<Vec<CollapsedBorderLine>>,
+    pub track_sizes: PhysicalVec<Vec<Au>>,
+}
+
+pub(crate) struct TableLayoutStyle<'a> {
+    table: &'a Table,
+    layout: Option<&'a TableLayout<'a>>,
+}
+
+/// Table parts that are stored in the DOM. This is used in order to map from
+/// the DOM to the box tree and will eventually be important for incremental
+/// layout.
+#[derive(MallocSizeOf)]
+pub(crate) enum TableLevelBox {
+    Caption(ArcRefCell<TableCaption>),
+    Cell(ArcRefCell<TableSlotCell>),
+    #[allow(dead_code)]
+    TrackGroup(ArcRefCell<TableTrackGroup>),
+    #[allow(dead_code)]
+    Track(ArcRefCell<TableTrack>),
+}
+
+impl TableLevelBox {
+    pub(crate) fn invalidate_cached_fragment(&self) {
+        match self {
+            TableLevelBox::Caption(caption) => {
+                caption.borrow().context.base.invalidate_cached_fragment();
+            },
+            TableLevelBox::Cell(cell) => {
+                cell.borrow().base.invalidate_cached_fragment();
+            },
+            TableLevelBox::TrackGroup(track_group) => {
+                track_group.borrow().base.invalidate_cached_fragment()
+            },
+            TableLevelBox::Track(track) => track.borrow().base.invalidate_cached_fragment(),
+        }
+    }
+
+    pub(crate) fn fragments(&self) -> Vec<Fragment> {
+        match self {
+            TableLevelBox::Caption(caption) => caption.borrow().context.base.fragments(),
+            TableLevelBox::Cell(cell) => cell.borrow().base.fragments(),
+            TableLevelBox::TrackGroup(track_group) => track_group.borrow().base.fragments(),
+            TableLevelBox::Track(track) => track.borrow().base.fragments(),
+        }
+    }
+
+    pub(crate) fn repair_style(
+        &self,
+        context: &SharedStyleContext<'_>,
+        new_style: &Arc<ComputedValues>,
+    ) {
+        match self {
+            TableLevelBox::Caption(caption) => caption
+                .borrow_mut()
+                .context
+                .repair_style(context, new_style),
+            TableLevelBox::Cell(cell) => cell.borrow_mut().repair_style(new_style),
+            TableLevelBox::TrackGroup(track_group) => {
+                track_group.borrow_mut().repair_style(new_style);
+            },
+            TableLevelBox::Track(track) => track.borrow_mut().repair_style(new_style),
+        }
+    }
+}
diff --git a/components/layout/taffy/layout.rs b/components/layout/taffy/layout.rs
new file mode 100644
index 00000000000..a5838c1bd65
--- /dev/null
+++ b/components/layout/taffy/layout.rs
@@ -0,0 +1,630 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use app_units::Au;
+use atomic_refcell::{AtomicRef, AtomicRefCell};
+use style::Zero;
+use style::properties::ComputedValues;
+use style::values::specified::align::AlignFlags;
+use style::values::specified::box_::DisplayInside;
+use taffy::style_helpers::{TaffyMaxContent, TaffyMinContent};
+use taffy::{AvailableSpace, MaybeMath, RequestedAxis, RunMode};
+
+use super::{
+    SpecificTaffyGridInfo, TaffyContainer, TaffyItemBox, TaffyItemBoxInner, TaffyStyloStyle,
+};
+use crate::cell::ArcRefCell;
+use crate::context::LayoutContext;
+use crate::formatting_contexts::{
+    Baselines, IndependentFormattingContext, IndependentFormattingContextContents,
+};
+use crate::fragment_tree::{
+    BoxFragment, CollapsedBlockMargins, Fragment, FragmentFlags, SpecificLayoutInfo,
+};
+use crate::geom::{
+    LogicalVec2, PhysicalPoint, PhysicalRect, PhysicalSides, PhysicalSize, Size, SizeConstraint,
+    Sizes,
+};
+use crate::layout_box_base::CacheableLayoutResult;
+use crate::positioned::{AbsolutelyPositionedBox, PositioningContext, PositioningContextLength};
+use crate::sizing::{ComputeInlineContentSizes, ContentSizes, InlineContentSizesResult};
+use crate::style_ext::LayoutStyle;
+use crate::{ConstraintSpace, ContainingBlock, ContainingBlockSize};
+
+const DUMMY_NODE_ID: taffy::NodeId = taffy::NodeId::new(u64::MAX);
+
+fn resolve_content_size(constraint: AvailableSpace, content_sizes: ContentSizes) -> f32 {
+    match constraint {
+        AvailableSpace::Definite(limit) => {
+            let min = content_sizes.min_content.to_f32_px();
+            let max = content_sizes.max_content.to_f32_px();
+            limit.min(max).max(min)
+        },
+        AvailableSpace::MinContent => content_sizes.min_content.to_f32_px(),
+        AvailableSpace::MaxContent => content_sizes.max_content.to_f32_px(),
+    }
+}
+
+#[inline(always)]
+fn with_independant_formatting_context<T>(
+    item: &mut TaffyItemBoxInner,
+    cb: impl FnOnce(&IndependentFormattingContext) -> T,
+) -> T {
+    match item {
+        TaffyItemBoxInner::InFlowBox(context) => cb(context),
+        TaffyItemBoxInner::OutOfFlowAbsolutelyPositionedBox(abspos_box) => {
+            cb(&AtomicRefCell::borrow(abspos_box).context)
+        },
+    }
+}
+
+/// Layout parameters and intermediate results about a taffy container,
+/// grouped to avoid passing around many parameters
+struct TaffyContainerContext<'a> {
+    source_child_nodes: &'a [ArcRefCell<TaffyItemBox>],
+    layout_context: &'a LayoutContext<'a>,
+    positioning_context: &'a mut PositioningContext,
+    content_box_size_override: &'a ContainingBlock<'a>,
+    style: &'a ComputedValues,
+    specific_layout_info: Option<SpecificLayoutInfo>,
+
+    /// Temporary location for children specific info, which will be moved into child fragments
+    child_specific_layout_infos: Vec<Option<SpecificLayoutInfo>>,
+}
+
+struct ChildIter(std::ops::Range<usize>);
+impl Iterator for ChildIter {
+    type Item = taffy::NodeId;
+    fn next(&mut self) -> Option<Self::Item> {
+        self.0.next().map(taffy::NodeId::from)
+    }
+}
+
+impl taffy::TraversePartialTree for TaffyContainerContext<'_> {
+    type ChildIter<'a>
+        = ChildIter
+    where
+        Self: 'a;
+
+    fn child_ids(&self, _node_id: taffy::NodeId) -> Self::ChildIter<'_> {
+        ChildIter(0..self.source_child_nodes.len())
+    }
+
+    fn child_count(&self, _node_id: taffy::NodeId) -> usize {
+        self.source_child_nodes.len()
+    }
+
+    fn get_child_id(&self, _node_id: taffy::NodeId, index: usize) -> taffy::NodeId {
+        taffy::NodeId::from(index)
+    }
+}
+
+impl taffy::LayoutPartialTree for TaffyContainerContext<'_> {
+    type CoreContainerStyle<'a>
+        = TaffyStyloStyle<&'a ComputedValues>
+    where
+        Self: 'a;
+
+    fn get_core_container_style(&self, _node_id: taffy::NodeId) -> Self::CoreContainerStyle<'_> {
+        TaffyStyloStyle(self.style)
+    }
+
+    fn set_unrounded_layout(&mut self, node_id: taffy::NodeId, layout: &taffy::Layout) {
+        let id = usize::from(node_id);
+        (*self.source_child_nodes[id]).borrow_mut().taffy_layout = *layout;
+    }
+
+    fn compute_child_layout(
+        &mut self,
+        node_id: taffy::NodeId,
+        inputs: taffy::LayoutInput,
+    ) -> taffy::LayoutOutput {
+        let mut child = (*self.source_child_nodes[usize::from(node_id)]).borrow_mut();
+        let child = &mut *child;
+
+        fn option_f32_to_size(input: Option<f32>) -> Size<Au> {
+            match input {
+                None => Size::Initial,
+                Some(length) => Size::Numeric(Au::from_f32_px(length)),
+            }
+        }
+
+        with_independant_formatting_context(
+            &mut child.taffy_level_box,
+            |independent_context| -> taffy::LayoutOutput {
+                // TODO: re-evaluate sizing constraint conversions in light of recent layout changes
+                let containing_block = &self.content_box_size_override;
+                let style = independent_context.style();
+
+                // Adjust known_dimensions from border box to content box
+                let pbm = independent_context
+                    .layout_style()
+                    .padding_border_margin(containing_block);
+                let pb_sum = pbm.padding_border_sums.map(|v| v.to_f32_px());
+                let margin_sum = pbm.margin.auto_is(Au::zero).sum().map(|v| v.to_f32_px());
+                let content_box_inset = pb_sum + margin_sum;
+                let content_box_known_dimensions = taffy::Size {
+                    width: inputs
+                        .known_dimensions
+                        .width
+                        .map(|width| width - pb_sum.inline),
+                    height: inputs
+                        .known_dimensions
+                        .height
+                        .map(|height| height - pb_sum.block),
+                };
+
+                match &independent_context.contents {
+                    IndependentFormattingContextContents::Replaced(replaced) => {
+                        let content_box_size = replaced
+                            .used_size_as_if_inline_element_from_content_box_sizes(
+                                containing_block,
+                                style,
+                                independent_context
+                                    .preferred_aspect_ratio(&pbm.padding_border_sums),
+                                LogicalVec2 {
+                                    block: &Sizes::new(
+                                        option_f32_to_size(content_box_known_dimensions.height),
+                                        Size::Initial,
+                                        Size::Initial,
+                                    ),
+                                    inline: &Sizes::new(
+                                        option_f32_to_size(content_box_known_dimensions.width),
+                                        Size::Initial,
+                                        Size::Initial,
+                                    ),
+                                },
+                                Size::FitContent.into(),
+                                pbm.padding_border_sums + pbm.margin.auto_is(Au::zero).sum(),
+                            )
+                            .to_physical_size(self.style.writing_mode);
+
+                        // Create fragments if the RunMode if PerformLayout
+                        // If the RunMode is ComputeSize then only the returned size will be used
+                        if inputs.run_mode == RunMode::PerformLayout {
+                            child.child_fragments = replaced.make_fragments(
+                                self.layout_context,
+                                style,
+                                content_box_size,
+                            );
+                        }
+
+                        let computed_size = taffy::Size {
+                            width: inputs.known_dimensions.width.unwrap_or_else(|| {
+                                content_box_size.width.to_f32_px() + pb_sum.inline
+                            }),
+                            height: inputs.known_dimensions.height.unwrap_or_else(|| {
+                                content_box_size.height.to_f32_px() + pb_sum.block
+                            }),
+                        };
+                        let size = inputs.known_dimensions.unwrap_or(computed_size);
+                        taffy::LayoutOutput {
+                            size,
+                            ..taffy::LayoutOutput::DEFAULT
+                        }
+                    },
+
+                    IndependentFormattingContextContents::NonReplaced(non_replaced) => {
+                        // Compute inline size
+                        let inline_size = content_box_known_dimensions.width.unwrap_or_else(|| {
+                            let constraint_space = ConstraintSpace {
+                                // TODO: pass min- and max- size
+                                block_size: SizeConstraint::new(
+                                    inputs.parent_size.height.map(Au::from_f32_px),
+                                    Au::zero(),
+                                    None,
+                                ),
+                                writing_mode: self.style.writing_mode,
+                                preferred_aspect_ratio: non_replaced.preferred_aspect_ratio(),
+                            };
+
+                            let result = independent_context
+                                .inline_content_sizes(self.layout_context, &constraint_space);
+                            let adjusted_available_space = inputs
+                                .available_space
+                                .width
+                                .map_definite_value(|width| width - content_box_inset.inline);
+
+                            resolve_content_size(adjusted_available_space, result.sizes)
+                        });
+
+                        // Return early if only inline content sizes are requested
+                        if inputs.run_mode == RunMode::ComputeSize &&
+                            inputs.axis == RequestedAxis::Horizontal
+                        {
+                            return taffy::LayoutOutput::from_outer_size(taffy::Size {
+                                width: inline_size + pb_sum.inline,
+                                // If RequestedAxis is Horizontal then height will be ignored.
+                                height: 0.0,
+                            });
+                        }
+
+                        let content_box_size_override = ContainingBlock {
+                            size: ContainingBlockSize {
+                                inline: Au::from_f32_px(inline_size),
+                                block: content_box_known_dimensions
+                                    .height
+                                    .map(Au::from_f32_px)
+                                    .map_or_else(SizeConstraint::default, SizeConstraint::Definite),
+                            },
+                            style,
+                        };
+
+                        child.positioning_context = PositioningContext::default();
+                        let layout = non_replaced.layout_without_caching(
+                            self.layout_context,
+                            &mut child.positioning_context,
+                            &content_box_size_override,
+                            containing_block,
+                            false, /* depends_on_block_constraints */
+                        );
+
+                        child.child_fragments = layout.fragments;
+                        self.child_specific_layout_infos[usize::from(node_id)] =
+                            layout.specific_layout_info;
+
+                        let block_size = layout.content_block_size.to_f32_px();
+
+                        let computed_size = taffy::Size {
+                            width: inline_size + pb_sum.inline,
+                            height: block_size + pb_sum.block,
+                        };
+                        let size = inputs.known_dimensions.unwrap_or(computed_size);
+
+                        taffy::LayoutOutput {
+                            size,
+                            first_baselines: taffy::Point {
+                                x: None,
+                                y: layout.baselines.first.map(|au| au.to_f32_px()),
+                            },
+                            ..taffy::LayoutOutput::DEFAULT
+                        }
+                    },
+                }
+            },
+        )
+    }
+}
+
+impl taffy::LayoutGridContainer for TaffyContainerContext<'_> {
+    type GridContainerStyle<'a>
+        = TaffyStyloStyle<&'a ComputedValues>
+    where
+        Self: 'a;
+
+    type GridItemStyle<'a>
+        = TaffyStyloStyle<AtomicRef<'a, ComputedValues>>
+    where
+        Self: 'a;
+
+    fn get_grid_container_style(
+        &self,
+        _node_id: taffy::prelude::NodeId,
+    ) -> Self::GridContainerStyle<'_> {
+        TaffyStyloStyle(self.style)
+    }
+
+    fn get_grid_child_style(
+        &self,
+        child_node_id: taffy::prelude::NodeId,
+    ) -> Self::GridItemStyle<'_> {
+        let id = usize::from(child_node_id);
+        let child = (*self.source_child_nodes[id]).borrow();
+        TaffyStyloStyle(AtomicRef::map(child, |c| &*c.style))
+    }
+
+    fn set_detailed_grid_info(
+        &mut self,
+        _node_id: taffy::NodeId,
+        specific_layout_info: taffy::DetailedGridInfo,
+    ) {
+        self.specific_layout_info = Some(SpecificLayoutInfo::Grid(Box::new(
+            SpecificTaffyGridInfo::from_detailed_grid_layout(specific_layout_info),
+        )));
+    }
+}
+
+impl ComputeInlineContentSizes for TaffyContainer {
+    fn compute_inline_content_sizes(
+        &self,
+        layout_context: &LayoutContext,
+        _constraint_space: &ConstraintSpace,
+    ) -> InlineContentSizesResult {
+        let style = &self.style;
+
+        let max_content_inputs = taffy::LayoutInput {
+            run_mode: taffy::RunMode::ComputeSize,
+            sizing_mode: taffy::SizingMode::InherentSize,
+            axis: taffy::RequestedAxis::Horizontal,
+            vertical_margins_are_collapsible: taffy::Line::FALSE,
+
+            known_dimensions: taffy::Size::NONE,
+            parent_size: taffy::Size::NONE,
+            available_space: taffy::Size::MAX_CONTENT,
+        };
+
+        let min_content_inputs = taffy::LayoutInput {
+            available_space: taffy::Size::MIN_CONTENT,
+            ..max_content_inputs
+        };
+
+        let containing_block = &ContainingBlock {
+            size: ContainingBlockSize {
+                inline: Au::zero(),
+                block: SizeConstraint::default(),
+            },
+            style,
+        };
+
+        let mut grid_context = TaffyContainerContext {
+            layout_context,
+            positioning_context: &mut PositioningContext::default(),
+            content_box_size_override: containing_block,
+            style,
+            source_child_nodes: &self.children,
+            specific_layout_info: None,
+            child_specific_layout_infos: vec![None; self.children.len()],
+        };
+
+        let (max_content_output, min_content_output) = match style.clone_display().inside() {
+            DisplayInside::Grid => {
+                let max_content_output = taffy::compute_grid_layout(
+                    &mut grid_context,
+                    DUMMY_NODE_ID,
+                    max_content_inputs,
+                );
+                let min_content_output = taffy::compute_grid_layout(
+                    &mut grid_context,
+                    DUMMY_NODE_ID,
+                    min_content_inputs,
+                );
+                (max_content_output, min_content_output)
+            },
+            _ => panic!("Servo is only configured to use Taffy for CSS Grid layout"),
+        };
+
+        let pb_sums = self
+            .layout_style()
+            .padding_border_margin(containing_block)
+            .padding_border_sums;
+
+        InlineContentSizesResult {
+            sizes: ContentSizes {
+                max_content: Au::from_f32_px(max_content_output.size.width) - pb_sums.inline,
+                min_content: Au::from_f32_px(min_content_output.size.width) - pb_sums.inline,
+            },
+
+            // TODO: determine this accurately
+            //
+            // "true" is a safe default as it will prevent Servo from performing optimizations based
+            // on the assumption that the node's size does not depend on block constraints.
+            depends_on_block_constraints: true,
+        }
+    }
+}
+
+impl TaffyContainer {
+    /// <https://drafts.csswg.org/css-grid/#layout-algorithm>
+    pub(crate) fn layout(
+        &self,
+        layout_context: &LayoutContext,
+        positioning_context: &mut PositioningContext,
+        content_box_size_override: &ContainingBlock,
+        containing_block: &ContainingBlock,
+    ) -> CacheableLayoutResult {
+        let mut container_ctx = TaffyContainerContext {
+            layout_context,
+            positioning_context,
+            content_box_size_override,
+            style: content_box_size_override.style,
+            source_child_nodes: &self.children,
+            specific_layout_info: None,
+            child_specific_layout_infos: vec![None; self.children.len()],
+        };
+
+        let container_style = &content_box_size_override.style;
+        let align_items = container_style.clone_align_items();
+        let justify_items = container_style.clone_justify_items();
+        let pbm = self.layout_style().padding_border_margin(containing_block);
+
+        let known_dimensions = taffy::Size {
+            width: Some(
+                (content_box_size_override.size.inline + pbm.padding_border_sums.inline)
+                    .to_f32_px(),
+            ),
+            height: content_box_size_override
+                .size
+                .block
+                .to_definite()
+                .map(Au::to_f32_px)
+                .maybe_add(pbm.padding_border_sums.block.to_f32_px()),
+        };
+
+        let taffy_containing_block = taffy::Size {
+            width: Some(containing_block.size.inline.to_f32_px()),
+            height: containing_block.size.block.to_definite().map(Au::to_f32_px),
+        };
+
+        let layout_input = taffy::LayoutInput {
+            run_mode: taffy::RunMode::PerformLayout,
+            sizing_mode: taffy::SizingMode::InherentSize,
+            axis: taffy::RequestedAxis::Vertical,
+            vertical_margins_are_collapsible: taffy::Line::FALSE,
+
+            known_dimensions,
+            parent_size: taffy_containing_block,
+            available_space: taffy_containing_block.map(AvailableSpace::from),
+        };
+
+        let output = match container_ctx.style.clone_display().inside() {
+            DisplayInside::Grid => {
+                taffy::compute_grid_layout(&mut container_ctx, DUMMY_NODE_ID, layout_input)
+            },
+            _ => panic!("Servo is only configured to use Taffy for CSS Grid layout"),
+        };
+
+        // Convert `taffy::Layout` into Servo `Fragment`s
+        // with container_ctx.child_specific_layout_infos will also moved to the corresponding `Fragment`s
+        let fragments: Vec<Fragment> = self
+            .children
+            .iter()
+            .map(|child| (**child).borrow_mut())
+            .enumerate()
+            .map(|(child_id, mut child)| {
+                fn rect_to_physical_sides<T>(rect: taffy::Rect<T>) -> PhysicalSides<T> {
+                    PhysicalSides::new(rect.top, rect.right, rect.bottom, rect.left)
+                }
+
+                fn size_and_pos_to_logical_rect<T: Default>(
+                    position: taffy::Point<T>,
+                    size: taffy::Size<T>,
+                ) -> PhysicalRect<T> {
+                    PhysicalRect::new(
+                        PhysicalPoint::new(position.x, position.y),
+                        PhysicalSize::new(size.width, size.height),
+                    )
+                }
+
+                let layout = &child.taffy_layout;
+
+                let padding = rect_to_physical_sides(layout.padding.map(Au::from_f32_px));
+                let border = rect_to_physical_sides(layout.border.map(Au::from_f32_px));
+                let margin = rect_to_physical_sides(layout.margin.map(Au::from_f32_px));
+
+                // Compute content box size and position.
+                //
+                // For the x/y position we have to correct for the difference between the
+                // content box and the border box for both the parent and the child.
+                let content_size = size_and_pos_to_logical_rect(
+                    taffy::Point {
+                        x: Au::from_f32_px(
+                            layout.location.x + layout.padding.left + layout.border.left,
+                        ) - pbm.padding.inline_start -
+                            pbm.border.inline_start,
+                        y: Au::from_f32_px(
+                            layout.location.y + layout.padding.top + layout.border.top,
+                        ) - pbm.padding.block_start -
+                            pbm.border.block_start,
+                    },
+                    taffy::Size {
+                        width: layout.size.width -
+                            layout.padding.left -
+                            layout.padding.right -
+                            layout.border.left -
+                            layout.border.right,
+                        height: layout.size.height -
+                            layout.padding.top -
+                            layout.padding.bottom -
+                            layout.border.top -
+                            layout.border.bottom,
+                    }
+                    .map(Au::from_f32_px),
+                );
+
+                let child_specific_layout_info: Option<SpecificLayoutInfo> =
+                    std::mem::take(&mut container_ctx.child_specific_layout_infos[child_id]);
+
+                let fragment = match &mut child.taffy_level_box {
+                    TaffyItemBoxInner::InFlowBox(independent_box) => {
+                        let mut fragment_info = independent_box.base_fragment_info();
+                        fragment_info
+                            .flags
+                            .insert(FragmentFlags::IS_FLEX_OR_GRID_ITEM);
+                        let mut box_fragment = BoxFragment::new(
+                            fragment_info,
+                            independent_box.style().clone(),
+                            std::mem::take(&mut child.child_fragments),
+                            content_size,
+                            padding,
+                            border,
+                            margin,
+                            None, /* clearance */
+                        )
+                        .with_baselines(Baselines {
+                            first: output.first_baselines.y.map(Au::from_f32_px),
+                            last: None,
+                        })
+                        .with_specific_layout_info(child_specific_layout_info);
+
+                        child.positioning_context.layout_collected_children(
+                            container_ctx.layout_context,
+                            &mut box_fragment,
+                        );
+                        child
+                            .positioning_context
+                            .adjust_static_position_of_hoisted_fragments_with_offset(
+                                &box_fragment.content_rect.origin.to_vector(),
+                                PositioningContextLength::zero(),
+                            );
+                        container_ctx
+                            .positioning_context
+                            .append(std::mem::take(&mut child.positioning_context));
+
+                        Fragment::Box(ArcRefCell::new(box_fragment))
+                    },
+                    TaffyItemBoxInner::OutOfFlowAbsolutelyPositionedBox(abs_pos_box) => {
+                        fn resolve_alignment(value: AlignFlags, auto: AlignFlags) -> AlignFlags {
+                            match value {
+                                AlignFlags::AUTO => auto,
+                                AlignFlags::NORMAL => AlignFlags::STRETCH,
+                                value => value,
+                            }
+                        }
+
+                        let hoisted_box = AbsolutelyPositionedBox::to_hoisted(
+                            abs_pos_box.clone(),
+                            PhysicalRect::from_size(PhysicalSize::new(
+                                Au::from_f32_px(output.size.width),
+                                Au::from_f32_px(output.size.height),
+                            )),
+                            LogicalVec2 {
+                                inline: resolve_alignment(
+                                    child.style.clone_align_self().0.0,
+                                    align_items.0,
+                                ),
+                                block: resolve_alignment(
+                                    child.style.clone_justify_self().0.0,
+                                    justify_items.computed.0,
+                                ),
+                            },
+                            container_ctx.style.writing_mode,
+                        );
+                        let hoisted_fragment = hoisted_box.fragment.clone();
+                        container_ctx.positioning_context.push(hoisted_box);
+                        Fragment::AbsoluteOrFixedPositioned(hoisted_fragment)
+                    },
+                };
+
+                if let TaffyItemBoxInner::InFlowBox(independent_formatting_context) =
+                    &child.taffy_level_box
+                {
+                    independent_formatting_context
+                        .base
+                        .set_fragment(fragment.clone());
+                }
+                fragment
+            })
+            .collect();
+
+        CacheableLayoutResult {
+            fragments,
+            content_block_size: Au::from_f32_px(output.size.height) - pbm.padding_border_sums.block,
+            content_inline_size_for_table: None,
+            baselines: Baselines::default(),
+
+            // TODO: determine this accurately
+            //
+            // "true" is a safe default as it will prevent Servo from performing optimizations based
+            // on the assumption that the node's size does not depend on block constraints.
+            depends_on_block_constraints: true,
+            specific_layout_info: container_ctx.specific_layout_info,
+            collapsible_margins_in_children: CollapsedBlockMargins::zero(),
+        }
+    }
+
+    #[inline]
+    pub(crate) fn layout_style(&self) -> LayoutStyle {
+        LayoutStyle::Default(&self.style)
+    }
+}
diff --git a/components/layout/taffy/mod.rs b/components/layout/taffy/mod.rs
new file mode 100644
index 00000000000..ba80824fa99
--- /dev/null
+++ b/components/layout/taffy/mod.rs
@@ -0,0 +1,203 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+mod layout;
+mod stylo_taffy;
+use std::fmt;
+
+use app_units::Au;
+use malloc_size_of_derive::MallocSizeOf;
+use servo_arc::Arc;
+use style::context::SharedStyleContext;
+use style::properties::ComputedValues;
+use stylo_taffy::TaffyStyloStyle;
+
+use crate::PropagatedBoxTreeData;
+use crate::cell::ArcRefCell;
+use crate::construct_modern::{ModernContainerBuilder, ModernItemKind};
+use crate::context::LayoutContext;
+use crate::dom::LayoutBox;
+use crate::dom_traversal::{NodeAndStyleInfo, NonReplacedContents};
+use crate::formatting_contexts::IndependentFormattingContext;
+use crate::fragment_tree::Fragment;
+use crate::positioned::{AbsolutelyPositionedBox, PositioningContext};
+
+#[derive(Debug, MallocSizeOf)]
+pub(crate) struct TaffyContainer {
+    children: Vec<ArcRefCell<TaffyItemBox>>,
+    style: Arc<ComputedValues>,
+}
+
+impl TaffyContainer {
+    pub fn construct(
+        context: &LayoutContext,
+        info: &NodeAndStyleInfo,
+        contents: NonReplacedContents,
+        propagated_data: PropagatedBoxTreeData,
+    ) -> Self {
+        let mut builder =
+            ModernContainerBuilder::new(context, info, propagated_data.union(&info.style));
+        contents.traverse(context, info, &mut builder);
+        let items = builder.finish();
+
+        let children = items
+            .into_iter()
+            .map(|item| {
+                let box_ = match item.kind {
+                    ModernItemKind::InFlow => ArcRefCell::new(TaffyItemBox::new(
+                        TaffyItemBoxInner::InFlowBox(item.formatting_context),
+                    )),
+                    ModernItemKind::OutOfFlow => {
+                        let abs_pos_box =
+                            ArcRefCell::new(AbsolutelyPositionedBox::new(item.formatting_context));
+                        ArcRefCell::new(TaffyItemBox::new(
+                            TaffyItemBoxInner::OutOfFlowAbsolutelyPositionedBox(abs_pos_box),
+                        ))
+                    },
+                };
+
+                if let Some(box_slot) = item.box_slot {
+                    box_slot.set(LayoutBox::TaffyItemBox(box_.clone()));
+                }
+
+                box_
+            })
+            .collect();
+
+        Self {
+            children,
+            style: info.style.clone(),
+        }
+    }
+
+    pub(crate) fn repair_style(&mut self, new_style: &Arc<ComputedValues>) {
+        self.style = new_style.clone();
+    }
+}
+
+#[derive(MallocSizeOf)]
+pub(crate) struct TaffyItemBox {
+    pub(crate) taffy_layout: taffy::Layout,
+    pub(crate) child_fragments: Vec<Fragment>,
+    pub(crate) positioning_context: PositioningContext,
+    pub(crate) style: Arc<ComputedValues>,
+    pub(crate) taffy_level_box: TaffyItemBoxInner,
+}
+
+#[derive(Debug, MallocSizeOf)]
+pub(crate) enum TaffyItemBoxInner {
+    InFlowBox(IndependentFormattingContext),
+    OutOfFlowAbsolutelyPositionedBox(ArcRefCell<AbsolutelyPositionedBox>),
+}
+
+impl fmt::Debug for TaffyItemBox {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("TaffyItemBox")
+            .field("taffy_layout", &self.taffy_layout)
+            .field("child_fragments", &self.child_fragments.len())
+            .field("style", &self.style)
+            .field("taffy_level_box", &self.taffy_level_box)
+            .finish()
+    }
+}
+
+impl TaffyItemBox {
+    fn new(inner: TaffyItemBoxInner) -> Self {
+        let style: Arc<ComputedValues> = match &inner {
+            TaffyItemBoxInner::InFlowBox(item) => item.style().clone(),
+            TaffyItemBoxInner::OutOfFlowAbsolutelyPositionedBox(absbox) => {
+                (*absbox).borrow().context.style().clone()
+            },
+        };
+
+        Self {
+            taffy_layout: Default::default(),
+            child_fragments: Vec::new(),
+            positioning_context: PositioningContext::default(),
+            style,
+            taffy_level_box: inner,
+        }
+    }
+
+    pub(crate) fn invalidate_cached_fragment(&mut self) {
+        self.taffy_layout = Default::default();
+        self.positioning_context = PositioningContext::default();
+        match self.taffy_level_box {
+            TaffyItemBoxInner::InFlowBox(ref independent_formatting_context) => {
+                independent_formatting_context
+                    .base
+                    .invalidate_cached_fragment()
+            },
+            TaffyItemBoxInner::OutOfFlowAbsolutelyPositionedBox(ref positioned_box) => {
+                positioned_box
+                    .borrow()
+                    .context
+                    .base
+                    .invalidate_cached_fragment()
+            },
+        }
+    }
+
+    pub(crate) fn fragments(&self) -> Vec<Fragment> {
+        match self.taffy_level_box {
+            TaffyItemBoxInner::InFlowBox(ref independent_formatting_context) => {
+                independent_formatting_context.base.fragments()
+            },
+            TaffyItemBoxInner::OutOfFlowAbsolutelyPositionedBox(ref positioned_box) => {
+                positioned_box.borrow().context.base.fragments()
+            },
+        }
+    }
+
+    pub(crate) fn repair_style(
+        &mut self,
+        context: &SharedStyleContext,
+        new_style: &Arc<ComputedValues>,
+    ) {
+        self.style = new_style.clone();
+        match &mut self.taffy_level_box {
+            TaffyItemBoxInner::InFlowBox(independent_formatting_context) => {
+                independent_formatting_context.repair_style(context, new_style)
+            },
+            TaffyItemBoxInner::OutOfFlowAbsolutelyPositionedBox(positioned_box) => positioned_box
+                .borrow_mut()
+                .context
+                .repair_style(context, new_style),
+        }
+    }
+}
+
+/// Details from Taffy grid layout that will be stored
+#[derive(Clone, Debug, MallocSizeOf)]
+pub(crate) struct SpecificTaffyGridInfo {
+    pub rows: SpecificTaffyGridTrackInfo,
+    pub columns: SpecificTaffyGridTrackInfo,
+}
+
+impl SpecificTaffyGridInfo {
+    fn from_detailed_grid_layout(grid_info: taffy::DetailedGridInfo) -> Self {
+        Self {
+            rows: SpecificTaffyGridTrackInfo {
+                sizes: grid_info
+                    .rows
+                    .sizes
+                    .iter()
+                    .map(|size| Au::from_f32_px(*size))
+                    .collect(),
+            },
+            columns: SpecificTaffyGridTrackInfo {
+                sizes: grid_info
+                    .columns
+                    .sizes
+                    .iter()
+                    .map(|size| Au::from_f32_px(*size))
+                    .collect(),
+            },
+        }
+    }
+}
+
+#[derive(Clone, Debug, MallocSizeOf)]
+pub(crate) struct SpecificTaffyGridTrackInfo {
+    pub sizes: Box<[Au]>,
+}
diff --git a/components/layout_2020/taffy/stylo_taffy/convert.rs b/components/layout/taffy/stylo_taffy/convert.rs
similarity index 94%
rename from components/layout_2020/taffy/stylo_taffy/convert.rs
rename to components/layout/taffy/stylo_taffy/convert.rs
index 29e76b516ad..5780be17c82 100644
--- a/components/layout_2020/taffy/stylo_taffy/convert.rs
+++ b/components/layout/taffy/stylo_taffy/convert.rs
@@ -59,6 +59,7 @@ pub fn dimension(val: &stylo::Size) -> taffy::Dimension {
 
         // Anchor positioning will be flagged off for time being
         stylo::Size::AnchorSizeFunction(_) => unreachable!(),
+        stylo::Size::AnchorContainingCalcFunction(_) => unreachable!(),
     }
 }
 
@@ -77,6 +78,7 @@ pub fn max_size_dimension(val: &stylo::MaxSize) -> taffy::Dimension {
 
         // Anchor positioning will be flagged off for time being
         stylo::MaxSize::AnchorSizeFunction(_) => unreachable!(),
+        stylo::MaxSize::AnchorContainingCalcFunction(_) => unreachable!(),
     }
 }
 
@@ -88,6 +90,7 @@ pub fn margin(val: &stylo::MarginVal) -> taffy::LengthPercentageAuto {
 
         // Anchor positioning will be flagged off for time being
         stylo::MarginVal::AnchorSizeFunction(_) => unreachable!(),
+        stylo::MarginVal::AnchorContainingCalcFunction(_) => unreachable!(),
     }
 }
 
@@ -100,6 +103,7 @@ pub fn inset(val: &stylo::InsetVal) -> taffy::LengthPercentageAuto {
         // Anchor positioning will be flagged off for time being
         stylo::InsetVal::AnchorSizeFunction(_) => unreachable!(),
         stylo::InsetVal::AnchorFunction(_) => unreachable!(),
+        stylo::InsetVal::AnchorContainingCalcFunction(_) => unreachable!(),
     }
 }
 
@@ -138,7 +142,7 @@ pub fn position(input: stylo::Position) -> taffy::Position {
         // TODO: support position:fixed and sticky
         stylo::Position::Absolute => taffy::Position::Absolute,
         stylo::Position::Fixed => taffy::Position::Absolute,
-        stylo::Position::Sticky => taffy::Position::Absolute,
+        stylo::Position::Sticky => taffy::Position::Relative,
     }
 }
 
@@ -170,6 +174,8 @@ pub fn content_alignment(input: stylo::ContentDistribution) -> Option<taffy::Ali
         stylo::AlignFlags::AUTO => None,
         stylo::AlignFlags::START => Some(taffy::AlignContent::Start),
         stylo::AlignFlags::END => Some(taffy::AlignContent::End),
+        stylo::AlignFlags::LEFT => Some(taffy::AlignContent::Start),
+        stylo::AlignFlags::RIGHT => Some(taffy::AlignContent::End),
         stylo::AlignFlags::FLEX_START => Some(taffy::AlignContent::FlexStart),
         stylo::AlignFlags::STRETCH => Some(taffy::AlignContent::Stretch),
         stylo::AlignFlags::FLEX_END => Some(taffy::AlignContent::FlexEnd),
@@ -185,13 +191,17 @@ pub fn content_alignment(input: stylo::ContentDistribution) -> Option<taffy::Ali
 #[inline]
 pub fn item_alignment(input: stylo::AlignFlags) -> Option<taffy::AlignItems> {
     match input.value() {
-        stylo::AlignFlags::NORMAL => None,
         stylo::AlignFlags::AUTO => None,
+        stylo::AlignFlags::NORMAL => Some(taffy::AlignItems::Stretch),
         stylo::AlignFlags::STRETCH => Some(taffy::AlignItems::Stretch),
         stylo::AlignFlags::FLEX_START => Some(taffy::AlignItems::FlexStart),
         stylo::AlignFlags::FLEX_END => Some(taffy::AlignItems::FlexEnd),
+        stylo::AlignFlags::SELF_START => Some(taffy::AlignItems::Start),
+        stylo::AlignFlags::SELF_END => Some(taffy::AlignItems::End),
         stylo::AlignFlags::START => Some(taffy::AlignItems::Start),
         stylo::AlignFlags::END => Some(taffy::AlignItems::End),
+        stylo::AlignFlags::LEFT => Some(taffy::AlignItems::Start),
+        stylo::AlignFlags::RIGHT => Some(taffy::AlignItems::End),
         stylo::AlignFlags::CENTER => Some(taffy::AlignItems::Center),
         stylo::AlignFlags::BASELINE => Some(taffy::AlignItems::Baseline),
         // Should never be hit. But no real reason to panic here.
diff --git a/components/layout_2020/taffy/stylo_taffy/mod.rs b/components/layout/taffy/stylo_taffy/mod.rs
similarity index 100%
rename from components/layout_2020/taffy/stylo_taffy/mod.rs
rename to components/layout/taffy/stylo_taffy/mod.rs
diff --git a/components/layout_2020/taffy/stylo_taffy/wrapper.rs b/components/layout/taffy/stylo_taffy/wrapper.rs
similarity index 100%
rename from components/layout_2020/taffy/stylo_taffy/wrapper.rs
rename to components/layout/taffy/stylo_taffy/wrapper.rs
diff --git a/components/layout_2020/tests/floats.rs b/components/layout/tests/floats.rs
similarity index 99%
rename from components/layout_2020/tests/floats.rs
rename to components/layout/tests/floats.rs
index 8c5cd019a0c..018da593e90 100644
--- a/components/layout_2020/tests/floats.rs
+++ b/components/layout/tests/floats.rs
@@ -11,12 +11,12 @@ use std::sync::{Mutex, MutexGuard};
 use std::{thread, u32};
 
 use app_units::Au;
-use euclid::num::Zero;
-use layout_2020::flow::float::{
+use layout::flow::float::{
     Clear, ContainingBlockPositionInfo, FloatBand, FloatBandNode, FloatBandTree, FloatContext,
     FloatSide, PlacementInfo,
 };
-use layout_2020::geom::{LogicalRect, LogicalVec2};
+use layout::geom::{LogicalRect, LogicalVec2};
+use num_traits::identities::Zero;
 use quickcheck::{Arbitrary, Gen};
 
 static PANIC_HOOK_MUTEX: Mutex<()> = Mutex::new(());
@@ -559,7 +559,7 @@ fn check_floats_rule_3(placement: &FloatPlacement) {
             // Where the top of `b` should probably be 32px per Rule 3, but unless this distinction
             // is made the top of `b` could legally be 0px.
             if this_float.origin.block >= other_float.rect().max_block_position() ||
-                (this_float.info.size.block == Au::zero() &&
+                (this_float.info.size.block.is_zero() &&
                     this_float.rect().max_block_position() < other_float.origin.block) ||
                 (this_float.info.size.block > Au::zero() &&
                     this_float.rect().max_block_position() <= other_float.origin.block)
@@ -729,7 +729,7 @@ fn check_floats_rule_10(placement: &FloatPlacement) {
             // Where the top of `b` should probably be 32px per Rule 3, but unless this distinction
             // is made the top of `b` could legally be 0px.
             if this_float.origin.block >= other_float.rect().max_block_position() ||
-                (this_float.info.size.block == Au::zero() &&
+                (this_float.info.size.block.is_zero() &&
                     this_float.rect().max_block_position() < other_float.origin.block) ||
                 (this_float.info.size.block > Au::zero() &&
                     this_float.rect().max_block_position() <= other_float.origin.block)
diff --git a/components/layout/tests/tables.rs b/components/layout/tests/tables.rs
new file mode 100644
index 00000000000..0c4549c34ee
--- /dev/null
+++ b/components/layout/tests/tables.rs
@@ -0,0 +1,252 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! Tests for proper table box tree construction.
+
+mod tables {
+    use euclid::Vector2D;
+    use layout::ArcRefCell;
+    use layout::table::{Table, TableBuilder, TableSlot, TableSlotCell, TableSlotOffset};
+
+    fn row_lengths(table: &Table) -> Vec<usize> {
+        table.slots.iter().map(|row| row.len()).collect()
+    }
+
+    fn slot_is_cell_with_id(slot: &TableSlot, id: usize) -> bool {
+        match slot {
+            TableSlot::Cell(cell) if cell.borrow().node_id() == id => true,
+            _ => false,
+        }
+    }
+
+    fn slot_is_empty(slot: &TableSlot) -> bool {
+        match slot {
+            TableSlot::Empty => true,
+            _ => false,
+        }
+    }
+
+    fn slot_is_spanned_with_offsets(slot: &TableSlot, offsets: Vec<(usize, usize)>) -> bool {
+        match slot {
+            TableSlot::Spanned(slot_offsets) => {
+                let offsets: Vec<TableSlotOffset> = offsets
+                    .iter()
+                    .map(|offset| Vector2D::new(offset.0, offset.1))
+                    .collect();
+                offsets == *slot_offsets
+            },
+            _ => false,
+        }
+    }
+
+    #[test]
+    fn test_empty_table() {
+        let table_builder = TableBuilder::new_for_tests();
+        let table = table_builder.finish();
+        assert!(table.slots.is_empty())
+    }
+
+    #[test]
+    fn test_simple_table() {
+        let mut table_builder = TableBuilder::new_for_tests();
+
+        table_builder.start_row();
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(1, 1, 1)));
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(2, 1, 1)));
+        table_builder.end_row();
+
+        table_builder.start_row();
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(3, 1, 1)));
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(4, 1, 1)));
+        table_builder.end_row();
+
+        let table = table_builder.finish();
+        assert_eq!(row_lengths(&table), vec![2, 2]);
+
+        assert!(slot_is_cell_with_id(&table.slots[0][0], 1));
+        assert!(slot_is_cell_with_id(&table.slots[0][1], 2));
+        assert!(slot_is_cell_with_id(&table.slots[1][0], 3));
+        assert!(slot_is_cell_with_id(&table.slots[1][1], 4));
+    }
+
+    #[test]
+    fn test_simple_rowspan() {
+        let mut table_builder = TableBuilder::new_for_tests();
+
+        table_builder.start_row();
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(1, 1, 1)));
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(2, 1, 1)));
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(3, 1, 2)));
+        table_builder.end_row();
+
+        table_builder.start_row();
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(4, 1, 1)));
+        table_builder.end_row();
+
+        let table = table_builder.finish();
+        assert_eq!(row_lengths(&table), vec![3, 3]);
+
+        assert!(slot_is_cell_with_id(&table.slots[0][0], 1));
+        assert!(slot_is_cell_with_id(&table.slots[0][1], 2));
+        assert!(slot_is_cell_with_id(&table.slots[0][2], 3));
+
+        assert!(slot_is_cell_with_id(&table.slots[1][0], 4));
+        assert!(slot_is_empty(&table.slots[1][1]));
+        assert!(slot_is_spanned_with_offsets(
+            &table.slots[1][2],
+            vec![(0, 1)]
+        ));
+    }
+
+    #[test]
+    fn test_simple_colspan() {
+        let mut table_builder = TableBuilder::new_for_tests();
+
+        table_builder.start_row();
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(1, 3, 1)));
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(2, 1, 1)));
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(3, 1, 1)));
+        table_builder.end_row();
+
+        table_builder.start_row();
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(4, 1, 1)));
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(5, 3, 1)));
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(6, 1, 1)));
+        table_builder.end_row();
+
+        table_builder.start_row();
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(7, 1, 1)));
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(8, 1, 1)));
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(9, 3, 1)));
+        table_builder.end_row();
+
+        let table = table_builder.finish();
+        assert_eq!(row_lengths(&table), vec![5, 5, 5]);
+
+        assert!(slot_is_cell_with_id(&table.slots[0][0], 1));
+        assert!(slot_is_spanned_with_offsets(
+            &table.slots[0][1],
+            vec![(1, 0)]
+        ));
+        assert!(slot_is_spanned_with_offsets(
+            &table.slots[0][2],
+            vec![(2, 0)]
+        ));
+        assert!(slot_is_cell_with_id(&table.slots[0][3], 2));
+        assert!(slot_is_cell_with_id(&table.slots[0][4], 3));
+
+        assert!(slot_is_cell_with_id(&table.slots[1][0], 4));
+        assert!(slot_is_cell_with_id(&table.slots[1][1], 5));
+        assert!(slot_is_spanned_with_offsets(
+            &table.slots[1][2],
+            vec![(1, 0)]
+        ));
+        assert!(slot_is_spanned_with_offsets(
+            &table.slots[1][3],
+            vec![(2, 0)]
+        ));
+        assert!(slot_is_cell_with_id(&table.slots[1][4], 6));
+
+        assert!(slot_is_cell_with_id(&table.slots[2][0], 7));
+        assert!(slot_is_cell_with_id(&table.slots[2][1], 8));
+        assert!(slot_is_cell_with_id(&table.slots[2][2], 9));
+        assert!(slot_is_spanned_with_offsets(
+            &table.slots[2][3],
+            vec![(1, 0)]
+        ));
+        assert!(slot_is_spanned_with_offsets(
+            &table.slots[2][4],
+            vec![(2, 0)]
+        ));
+    }
+
+    #[test]
+    fn test_simple_table_model_error() {
+        let mut table_builder = TableBuilder::new_for_tests();
+
+        table_builder.start_row();
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(1, 1, 1)));
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(2, 1, 1)));
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(3, 1, 2)));
+        table_builder.end_row();
+
+        table_builder.start_row();
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(4, 3, 1)));
+        table_builder.end_row();
+
+        let table = table_builder.finish();
+        assert_eq!(row_lengths(&table), vec![3, 3]);
+
+        assert!(slot_is_cell_with_id(&table.slots[0][0], 1));
+        assert!(slot_is_cell_with_id(&table.slots[0][1], 2));
+        assert!(slot_is_cell_with_id(&table.slots[0][2], 3));
+
+        assert!(slot_is_cell_with_id(&table.slots[1][0], 4));
+        assert!(slot_is_spanned_with_offsets(
+            &table.slots[1][1],
+            vec![(1, 0)]
+        ));
+        assert!(slot_is_spanned_with_offsets(
+            &table.slots[1][2],
+            vec![(2, 0), (0, 1)]
+        ));
+    }
+
+    #[test]
+    fn test_simple_rowspan_0() {
+        let mut table_builder = TableBuilder::new_for_tests();
+
+        table_builder.start_row();
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(1, 1, 1)));
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(2, 1, 1)));
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(3, 1, 0)));
+        table_builder.end_row();
+
+        table_builder.start_row();
+        table_builder.end_row();
+
+        table_builder.start_row();
+        table_builder.end_row();
+
+        table_builder.start_row();
+        table_builder.end_row();
+
+        let table = table_builder.finish();
+        assert_eq!(row_lengths(&table), vec![3, 3, 3, 3]);
+
+        assert!(slot_is_empty(&table.slots[1][0]));
+        assert!(slot_is_empty(&table.slots[1][1]));
+        assert!(slot_is_spanned_with_offsets(
+            &table.slots[1][2],
+            vec![(0, 1)]
+        ));
+        assert!(slot_is_spanned_with_offsets(
+            &table.slots[2][2],
+            vec![(0, 2)]
+        ));
+        assert!(slot_is_spanned_with_offsets(
+            &table.slots[3][2],
+            vec![(0, 3)]
+        ));
+    }
+
+    #[test]
+    fn test_incoming_rowspans() {
+        let mut table_builder = TableBuilder::new_for_tests();
+
+        table_builder.start_row();
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(1, 1, 1)));
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(2, 1, 30)));
+        table_builder.end_row();
+
+        table_builder.start_row();
+        table_builder.add_cell(ArcRefCell::new(TableSlotCell::mock_for_testing(3, 2, 1)));
+        table_builder.end_row();
+
+        assert_eq!(table_builder.incoming_rowspans, vec![0, 28]);
+
+        let table = table_builder.finish();
+        assert_eq!(row_lengths(&table), vec![2, 2]);
+    }
+}
diff --git a/components/layout_2020/tests/text.rs b/components/layout/tests/text.rs
similarity index 97%
rename from components/layout_2020/tests/text.rs
rename to components/layout/tests/text.rs
index 74ed9c6d263..4d4407c9500 100644
--- a/components/layout_2020/tests/text.rs
+++ b/components/layout/tests/text.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 mod text {
-    use layout_2020::flow::inline::construct::WhitespaceCollapse;
+    use layout::flow::inline::construct::WhitespaceCollapse;
     use style::computed_values::white_space_collapse::T as WhiteSpaceCollapse;
 
     #[test]
diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs
new file mode 100644
index 00000000000..17c3d0b1c20
--- /dev/null
+++ b/components/layout/traversal.rs
@@ -0,0 +1,138 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use script::layout_dom::ServoLayoutNode;
+use script_layout_interface::wrapper_traits::LayoutNode;
+use style::context::{SharedStyleContext, StyleContext};
+use style::data::ElementData;
+use style::dom::{NodeInfo, TElement, TNode};
+use style::selector_parser::RestyleDamage;
+use style::traversal::{DomTraversal, PerLevelTraversalData, recalc_style_at};
+use style::values::computed::Display;
+
+use crate::context::LayoutContext;
+use crate::dom::{DOMLayoutData, NodeExt};
+use crate::dom_traversal::iter_child_nodes;
+
+pub struct RecalcStyle<'a> {
+    context: &'a LayoutContext<'a>,
+}
+
+impl<'a> RecalcStyle<'a> {
+    pub fn new(context: &'a LayoutContext<'a>) -> Self {
+        RecalcStyle { context }
+    }
+
+    pub fn context(&self) -> &LayoutContext<'a> {
+        self.context
+    }
+}
+
+#[allow(unsafe_code)]
+impl<'dom, E> DomTraversal<E> for RecalcStyle<'_>
+where
+    E: TElement,
+    E::ConcreteNode: 'dom + LayoutNode<'dom>,
+{
+    fn process_preorder<F>(
+        &self,
+        traversal_data: &PerLevelTraversalData,
+        context: &mut StyleContext<E>,
+        node: E::ConcreteNode,
+        note_child: F,
+    ) where
+        F: FnMut(E::ConcreteNode),
+    {
+        if node.is_text_node() {
+            return;
+        }
+
+        let had_style_data = node.style_data().is_some();
+        unsafe {
+            node.initialize_style_and_layout_data::<DOMLayoutData>();
+        }
+
+        let element = node.as_element().unwrap();
+        let mut element_data = element.mutate_data().unwrap();
+
+        if !had_style_data {
+            element_data.damage = RestyleDamage::reconstruct();
+        }
+
+        recalc_style_at(
+            self,
+            traversal_data,
+            context,
+            element,
+            &mut element_data,
+            note_child,
+        );
+
+        unsafe {
+            element.unset_dirty_descendants();
+        }
+    }
+
+    #[inline]
+    fn needs_postorder_traversal() -> bool {
+        false
+    }
+
+    fn process_postorder(&self, _style_context: &mut StyleContext<E>, _node: E::ConcreteNode) {
+        panic!("this should never be called")
+    }
+
+    fn text_node_needs_traversal(node: E::ConcreteNode, parent_data: &ElementData) -> bool {
+        node.layout_data().is_none() || !parent_data.damage.is_empty()
+    }
+
+    fn shared_context(&self) -> &SharedStyleContext {
+        &self.context.style_context
+    }
+}
+
+pub(crate) fn compute_damage_and_repair_style(
+    context: &SharedStyleContext,
+    node: ServoLayoutNode<'_>,
+) -> RestyleDamage {
+    compute_damage_and_repair_style_inner(context, node, RestyleDamage::empty())
+}
+
+pub(crate) fn compute_damage_and_repair_style_inner(
+    context: &SharedStyleContext,
+    node: ServoLayoutNode<'_>,
+    parent_restyle_damage: RestyleDamage,
+) -> RestyleDamage {
+    let original_damage;
+    let damage = {
+        let mut element_data = node
+            .style_data()
+            .expect("Should not run `compute_damage` before styling.")
+            .element_data
+            .borrow_mut();
+
+        if let Some(ref style) = element_data.styles.primary {
+            if style.get_box().display == Display::None {
+                return parent_restyle_damage;
+            }
+        }
+
+        original_damage = std::mem::take(&mut element_data.damage);
+        element_data.damage |= parent_restyle_damage;
+        element_data.damage
+    };
+
+    let mut propagated_damage = damage;
+    for child in iter_child_nodes(node) {
+        if child.is_element() {
+            propagated_damage |= compute_damage_and_repair_style_inner(context, child, damage);
+        }
+    }
+
+    if propagated_damage == RestyleDamage::REPAINT && original_damage == RestyleDamage::REPAINT {
+        node.repair_style(context);
+    }
+
+    propagated_damage
+}
diff --git a/components/layout_2020/Cargo.toml b/components/layout_2020/Cargo.toml
deleted file mode 100644
index b0cb2d05ba7..00000000000
--- a/components/layout_2020/Cargo.toml
+++ /dev/null
@@ -1,61 +0,0 @@
-[package]
-name = "layout_2020"
-version.workspace = true
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-publish.workspace = true
-rust-version.workspace = true
-
-[lib]
-name = "layout_2020"
-path = "lib.rs"
-test = true
-doctest = false
-
-[features]
-tracing = ["dep:tracing"]
-
-[dependencies]
-app_units = { workspace = true }
-atomic_refcell = { workspace = true }
-base = { workspace = true }
-bitflags = { workspace = true }
-canvas_traits = { workspace = true }
-data-url = { workspace = true }
-embedder_traits = { workspace = true }
-euclid = { workspace = true }
-fnv = { workspace = true }
-fonts = { path = "../fonts" }
-fonts_traits = { workspace = true }
-fxhash = { workspace = true }
-html5ever = { workspace = true }
-icu_locid = { workspace = true }
-icu_segmenter = { workspace = true }
-ipc-channel = { workspace = true }
-itertools = { workspace = true }
-log = { workspace = true }
-net_traits = { workspace = true }
-parking_lot = { workspace = true }
-pixels = { path = "../pixels" }
-range = { path = "../range" }
-rayon = { workspace = true }
-script_layout_interface = { workspace = true }
-selectors = { workspace = true }
-servo_arc = { workspace = true }
-servo_config = { path = "../config" }
-servo_geometry = { path = "../geometry" }
-servo_url = { path = "../url" }
-stylo = { workspace = true }
-stylo_traits = { workspace = true }
-taffy = { workspace = true }
-tracing = { workspace = true, optional = true }
-unicode-bidi = { workspace = true }
-unicode-script = { workspace = true }
-url = { workspace = true }
-webrender_api = { workspace = true }
-webrender_traits = { workspace = true }
-xi-unicode = { workspace = true }
-
-[dev-dependencies]
-quickcheck = "1"
diff --git a/components/layout_2020/context.rs b/components/layout_2020/context.rs
deleted file mode 100644
index 2dbfb7eabb8..00000000000
--- a/components/layout_2020/context.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::sync::Arc;
-
-use base::id::PipelineId;
-use fnv::FnvHashMap;
-use fonts::FontContext;
-use net_traits::image_cache::{
-    ImageCache, ImageCacheResult, ImageOrMetadataAvailable, UsePlaceholder,
-};
-use parking_lot::{Mutex, RwLock};
-use script_layout_interface::{IFrameSizes, PendingImage, PendingImageState};
-use servo_url::{ImmutableOrigin, ServoUrl};
-use style::context::SharedStyleContext;
-use style::dom::OpaqueNode;
-
-use crate::display_list::WebRenderImageInfo;
-
-pub struct LayoutContext<'a> {
-    pub id: PipelineId,
-    pub use_rayon: bool,
-    pub origin: ImmutableOrigin,
-
-    /// Bits shared by the layout and style system.
-    pub style_context: SharedStyleContext<'a>,
-
-    /// A FontContext to be used during layout.
-    pub font_context: Arc<FontContext>,
-
-    /// Reference to the script thread image cache.
-    pub image_cache: Arc<dyn ImageCache>,
-
-    /// A list of in-progress image loads to be shared with the script thread.
-    pub pending_images: Mutex<Vec<PendingImage>>,
-
-    /// A collection of `<iframe>` sizes to send back to script.
-    pub iframe_sizes: Mutex<IFrameSizes>,
-
-    pub webrender_image_cache:
-        Arc<RwLock<FnvHashMap<(ServoUrl, UsePlaceholder), WebRenderImageInfo>>>,
-}
-
-impl Drop for LayoutContext<'_> {
-    fn drop(&mut self) {
-        if !std::thread::panicking() {
-            assert!(self.pending_images.lock().is_empty());
-        }
-    }
-}
-
-impl LayoutContext<'_> {
-    #[inline(always)]
-    pub fn shared_context(&self) -> &SharedStyleContext {
-        &self.style_context
-    }
-
-    pub fn get_or_request_image_or_meta(
-        &self,
-        node: OpaqueNode,
-        url: ServoUrl,
-        use_placeholder: UsePlaceholder,
-    ) -> Option<ImageOrMetadataAvailable> {
-        // Check for available image or start tracking.
-        let cache_result = self.image_cache.get_cached_image_status(
-            url.clone(),
-            self.origin.clone(),
-            None,
-            use_placeholder,
-        );
-
-        match cache_result {
-            ImageCacheResult::Available(img_or_meta) => Some(img_or_meta),
-            // Image has been requested, is still pending. Return no image for this paint loop.
-            // When the image loads it will trigger a reflow and/or repaint.
-            ImageCacheResult::Pending(id) => {
-                let image = PendingImage {
-                    state: PendingImageState::PendingResponse,
-                    node: node.into(),
-                    id,
-                    origin: self.origin.clone(),
-                };
-                self.pending_images.lock().push(image);
-                None
-            },
-            // Not yet requested - request image or metadata from the cache
-            ImageCacheResult::ReadyForRequest(id) => {
-                let image = PendingImage {
-                    state: PendingImageState::Unrequested(url),
-                    node: node.into(),
-                    id,
-                    origin: self.origin.clone(),
-                };
-                self.pending_images.lock().push(image);
-                None
-            },
-            // Image failed to load, so just return nothing
-            ImageCacheResult::LoadError => None,
-        }
-    }
-
-    pub fn get_webrender_image_for_url(
-        &self,
-        node: OpaqueNode,
-        url: ServoUrl,
-        use_placeholder: UsePlaceholder,
-    ) -> Option<WebRenderImageInfo> {
-        if let Some(existing_webrender_image) = self
-            .webrender_image_cache
-            .read()
-            .get(&(url.clone(), use_placeholder))
-        {
-            return Some(*existing_webrender_image);
-        }
-
-        match self.get_or_request_image_or_meta(node, url.clone(), use_placeholder) {
-            Some(ImageOrMetadataAvailable::ImageAvailable { image, .. }) => {
-                let image_info = WebRenderImageInfo {
-                    width: image.width,
-                    height: image.height,
-                    key: image.id,
-                };
-                if image_info.key.is_none() {
-                    Some(image_info)
-                } else {
-                    let mut webrender_image_cache = self.webrender_image_cache.write();
-                    webrender_image_cache.insert((url, use_placeholder), image_info);
-                    Some(image_info)
-                }
-            },
-            None | Some(ImageOrMetadataAvailable::MetadataAvailable(..)) => None,
-        }
-    }
-}
diff --git a/components/layout_2020/display_list/mod.rs b/components/layout_2020/display_list/mod.rs
deleted file mode 100644
index bc5032148f3..00000000000
--- a/components/layout_2020/display_list/mod.rs
+++ /dev/null
@@ -1,1480 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::cell::{OnceCell, RefCell};
-use std::sync::Arc;
-
-use app_units::Au;
-use base::WebRenderEpochToU16;
-use base::id::ScrollTreeNodeId;
-use embedder_traits::Cursor;
-use euclid::{Point2D, SideOffsets2D, Size2D, UnknownUnit};
-use fonts::GlyphStore;
-use gradient::WebRenderGradient;
-use net_traits::image_cache::UsePlaceholder;
-use servo_geometry::MaxRect;
-use style::Zero;
-use style::color::{AbsoluteColor, ColorSpace};
-use style::computed_values::border_image_outset::T as BorderImageOutset;
-use style::computed_values::text_decoration_style::T as ComputedTextDecorationStyle;
-use style::dom::OpaqueNode;
-use style::properties::ComputedValues;
-use style::properties::longhands::visibility::computed_value::T as Visibility;
-use style::properties::style_structs::Border;
-use style::values::computed::image::Image;
-use style::values::computed::{
-    BorderImageSideWidth, BorderImageWidth, BorderStyle, LengthPercentage,
-    NonNegativeLengthOrNumber, NumberOrPercentage, OutlineStyle,
-};
-use style::values::generics::NonNegative;
-use style::values::generics::rect::Rect;
-use style::values::specified::text::TextDecorationLine;
-use style::values::specified::ui::CursorKind;
-use webrender_api::units::{DevicePixel, LayoutPixel, LayoutRect, LayoutSize};
-use webrender_api::{
-    self as wr, BorderDetails, BoxShadowClipMode, ClipChainId, CommonItemProperties,
-    ImageRendering, NinePatchBorder, NinePatchBorderSource, units,
-};
-use webrender_traits::display_list::{AxesScrollSensitivity, CompositorDisplayListInfo};
-use wr::units::LayoutVector2D;
-
-use crate::context::LayoutContext;
-use crate::display_list::conversions::ToWebRender;
-use crate::display_list::stacking_context::StackingContextSection;
-use crate::fragment_tree::{
-    BackgroundMode, BoxFragment, Fragment, FragmentFlags, FragmentTree, SpecificLayoutInfo, Tag,
-    TextFragment,
-};
-use crate::geom::{
-    LengthPercentageOrAuto, PhysicalPoint, PhysicalRect, PhysicalSides, PhysicalSize,
-};
-use crate::replaced::NaturalSizes;
-use crate::style_ext::{BorderStyleColor, ComputedValuesExt};
-
-mod background;
-mod clip_path;
-mod conversions;
-mod gradient;
-mod stacking_context;
-
-use background::BackgroundPainter;
-pub use stacking_context::*;
-
-#[derive(Clone, Copy)]
-pub struct WebRenderImageInfo {
-    pub width: u32,
-    pub height: u32,
-    pub key: Option<wr::ImageKey>,
-}
-
-// webrender's `ItemTag` is private.
-type ItemTag = (u64, u16);
-type HitInfo = Option<ItemTag>;
-
-/// Where the information that's used to build display lists is stored. This
-/// includes both a [wr::DisplayListBuilder] for building up WebRender-specific
-/// display list information and a [CompositorDisplayListInfo] used to store
-/// information used by the compositor, such as a compositor-side scroll tree.
-pub struct DisplayList {
-    /// The [wr::DisplayListBuilder] used to collect display list items.
-    pub wr: wr::DisplayListBuilder,
-
-    /// The information about the WebRender display list that the compositor
-    /// consumes. This curerntly contains the out-of-band hit testing information
-    /// data structure that the compositor uses to map hit tests to information
-    /// about the item hit.
-    pub compositor_info: CompositorDisplayListInfo,
-
-    /// A count of the number of SpatialTree nodes pushed to the WebRender display
-    /// list. This is merely to ensure that the currently-unused SpatialTreeItemKey
-    /// produced for every SpatialTree node is unique.
-    pub spatial_tree_count: u64,
-}
-
-impl DisplayList {
-    /// Create a new [DisplayList] given the dimensions of the layout and the WebRender
-    /// pipeline id.
-    pub fn new(
-        viewport_size: units::LayoutSize,
-        content_size: units::LayoutSize,
-        pipeline_id: wr::PipelineId,
-        epoch: wr::Epoch,
-        viewport_scroll_sensitivity: AxesScrollSensitivity,
-        first_reflow: bool,
-    ) -> Self {
-        Self {
-            wr: wr::DisplayListBuilder::new(pipeline_id),
-            compositor_info: CompositorDisplayListInfo::new(
-                viewport_size,
-                content_size,
-                pipeline_id,
-                epoch,
-                viewport_scroll_sensitivity,
-                first_reflow,
-            ),
-            spatial_tree_count: 0,
-        }
-    }
-
-    pub fn define_clip_chain<I>(&mut self, parent: ClipChainId, clips: I) -> ClipChainId
-    where
-        I: IntoIterator<Item = wr::ClipId>,
-        I::IntoIter: ExactSizeIterator + Clone,
-    {
-        // WebRender has two different ways of expressing "no clip." ClipChainId::INVALID should be
-        // used for primitives, but `None` is used for stacking contexts and clip chains. We convert
-        // to the `Option<ClipChainId>` representation here. Just passing Some(ClipChainId::INVALID)
-        // leads to a crash.
-        let parent = match parent {
-            ClipChainId::INVALID => None,
-            parent => Some(parent),
-        };
-        self.wr.define_clip_chain(parent, clips)
-    }
-}
-
-pub(crate) struct DisplayListBuilder<'a> {
-    /// The current [ScrollTreeNodeId] for this [DisplayListBuilder]. This
-    /// allows only passing the builder instead passing the containing
-    /// [stacking_context::StackingContextContent::Fragment] as an argument to display
-    /// list building functions.
-    current_scroll_node_id: ScrollTreeNodeId,
-
-    /// The current [ScrollTreeNodeId] for this [DisplayListBuilder]. This is necessary in addition
-    /// to the [Self::current_scroll_node_id], because some pieces of fragments as backgrounds with
-    /// `background-attachment: fixed` need to not scroll while the rest of the fragment does.
-    current_reference_frame_scroll_node_id: ScrollTreeNodeId,
-
-    /// The current [wr::ClipId] for this [DisplayListBuilder]. This allows
-    /// only passing the builder instead passing the containing
-    /// [stacking_context::StackingContextContent::Fragment] as an argument to display
-    /// list building functions.
-    current_clip_chain_id: ClipChainId,
-
-    /// The [OpaqueNode] handle to the node used to paint the page background
-    /// if the background was a canvas.
-    element_for_canvas_background: OpaqueNode,
-
-    /// A [LayoutContext] used to get information about the device pixel ratio
-    /// and get handles to WebRender images.
-    pub context: &'a LayoutContext<'a>,
-
-    /// The [DisplayList] used to collect display list items and metadata.
-    pub display_list: &'a mut DisplayList,
-}
-
-impl DisplayList {
-    /// Build the display list, returning true if it was contentful.
-    pub fn build(
-        &mut self,
-        context: &LayoutContext,
-        fragment_tree: &FragmentTree,
-        root_stacking_context: &StackingContext,
-    ) {
-        #[cfg(feature = "tracing")]
-        let _span = tracing::trace_span!("display_list::build", servo_profiling = true).entered();
-        let mut builder = DisplayListBuilder {
-            current_scroll_node_id: self.compositor_info.root_reference_frame_id,
-            current_reference_frame_scroll_node_id: self.compositor_info.root_reference_frame_id,
-            current_clip_chain_id: ClipChainId::INVALID,
-            element_for_canvas_background: fragment_tree.canvas_background.from_element,
-            context,
-            display_list: self,
-        };
-        fragment_tree.build_display_list(&mut builder, root_stacking_context);
-    }
-}
-
-impl DisplayListBuilder<'_> {
-    fn wr(&mut self) -> &mut wr::DisplayListBuilder {
-        &mut self.display_list.wr
-    }
-
-    fn mark_is_contentful(&mut self) {
-        self.display_list.compositor_info.is_contentful = true;
-    }
-
-    fn common_properties(
-        &self,
-        clip_rect: units::LayoutRect,
-        style: &ComputedValues,
-    ) -> wr::CommonItemProperties {
-        // TODO(mrobinson): We should take advantage of this field to pass hit testing
-        // information. This will allow us to avoid creating hit testing display items
-        // for fragments that paint their entire border rectangle.
-        wr::CommonItemProperties {
-            clip_rect,
-            spatial_id: self.current_scroll_node_id.spatial_id,
-            clip_chain_id: self.current_clip_chain_id,
-            flags: style.get_webrender_primitive_flags(),
-        }
-    }
-
-    fn hit_info(
-        &mut self,
-        style: &ComputedValues,
-        tag: Option<Tag>,
-        auto_cursor: Cursor,
-    ) -> HitInfo {
-        use style::computed_values::pointer_events::T as PointerEvents;
-
-        let inherited_ui = style.get_inherited_ui();
-        if inherited_ui.pointer_events == PointerEvents::None {
-            return None;
-        }
-
-        let hit_test_index = self.display_list.compositor_info.add_hit_test_info(
-            tag?.node.0 as u64,
-            Some(cursor(inherited_ui.cursor.keyword, auto_cursor)),
-            self.current_scroll_node_id,
-        );
-        Some((
-            hit_test_index as u64,
-            self.display_list.compositor_info.epoch.as_u16(),
-        ))
-    }
-}
-
-impl Fragment {
-    pub(crate) fn build_display_list(
-        &self,
-        builder: &mut DisplayListBuilder,
-        containing_block: &PhysicalRect<Au>,
-        section: StackingContextSection,
-        is_hit_test_for_scrollable_overflow: bool,
-        is_collapsed_table_borders: bool,
-    ) {
-        match self {
-            Fragment::Box(box_fragment) | Fragment::Float(box_fragment) => {
-                let box_fragment = &*box_fragment.borrow();
-                match box_fragment.style.get_inherited_box().visibility {
-                    Visibility::Visible => BuilderForBoxFragment::new(
-                        box_fragment,
-                        containing_block,
-                        is_hit_test_for_scrollable_overflow,
-                        is_collapsed_table_borders,
-                    )
-                    .build(builder, section),
-                    Visibility::Hidden => (),
-                    Visibility::Collapse => (),
-                }
-            },
-            Fragment::AbsoluteOrFixedPositioned(_) => {},
-            Fragment::Positioning(positioning_fragment) => {
-                let positioning_fragment = positioning_fragment.borrow();
-                if let Some(style) = positioning_fragment.style.as_ref() {
-                    let rect = positioning_fragment
-                        .rect
-                        .translate(containing_block.origin.to_vector());
-                    self.maybe_push_hit_test_for_style_and_tag(
-                        builder,
-                        style,
-                        positioning_fragment.base.tag,
-                        rect,
-                        Cursor::Default,
-                    );
-                }
-            },
-            Fragment::Image(image) => {
-                let image = image.borrow();
-                match image.style.get_inherited_box().visibility {
-                    Visibility::Visible => {
-                        builder.mark_is_contentful();
-
-                        let image_rendering = image
-                            .style
-                            .get_inherited_box()
-                            .image_rendering
-                            .to_webrender();
-                        let rect = image
-                            .rect
-                            .translate(containing_block.origin.to_vector())
-                            .to_webrender();
-                        let clip = image
-                            .clip
-                            .translate(containing_block.origin.to_vector())
-                            .to_webrender();
-                        let common = builder.common_properties(clip, &image.style);
-
-                        if let Some(image_key) = image.image_key {
-                            builder.wr().push_image(
-                                &common,
-                                rect,
-                                image_rendering,
-                                wr::AlphaType::PremultipliedAlpha,
-                                image_key,
-                                wr::ColorF::WHITE,
-                            );
-                        }
-                    },
-                    Visibility::Hidden => (),
-                    Visibility::Collapse => (),
-                }
-            },
-            Fragment::IFrame(iframe) => {
-                let iframe = iframe.borrow();
-                match iframe.style.get_inherited_box().visibility {
-                    Visibility::Visible => {
-                        builder.mark_is_contentful();
-                        let rect = iframe.rect.translate(containing_block.origin.to_vector());
-
-                        let common = builder.common_properties(rect.to_webrender(), &iframe.style);
-                        builder.wr().push_iframe(
-                            rect.to_webrender(),
-                            common.clip_rect,
-                            &wr::SpaceAndClipInfo {
-                                spatial_id: common.spatial_id,
-                                clip_chain_id: common.clip_chain_id,
-                            },
-                            iframe.pipeline_id.into(),
-                            true,
-                        );
-                    },
-                    Visibility::Hidden => (),
-                    Visibility::Collapse => (),
-                }
-            },
-            Fragment::Text(text) => {
-                let text = &*text.borrow();
-                match text.parent_style.get_inherited_box().visibility {
-                    Visibility::Visible => {
-                        self.build_display_list_for_text_fragment(text, builder, containing_block)
-                    },
-                    Visibility::Hidden => (),
-                    Visibility::Collapse => (),
-                }
-            },
-        }
-    }
-
-    fn maybe_push_hit_test_for_style_and_tag(
-        &self,
-        builder: &mut DisplayListBuilder,
-        style: &ComputedValues,
-        tag: Option<Tag>,
-        rect: PhysicalRect<Au>,
-        cursor: Cursor,
-    ) {
-        let hit_info = builder.hit_info(style, tag, cursor);
-        let hit_info = match hit_info {
-            Some(hit_info) => hit_info,
-            None => return,
-        };
-
-        let clip_chain_id = builder.current_clip_chain_id;
-        let spatial_id = builder.current_scroll_node_id.spatial_id;
-        builder.wr().push_hit_test(
-            rect.to_webrender(),
-            clip_chain_id,
-            spatial_id,
-            style.get_webrender_primitive_flags(),
-            hit_info,
-        );
-    }
-
-    fn build_display_list_for_text_fragment(
-        &self,
-        fragment: &TextFragment,
-        builder: &mut DisplayListBuilder,
-        containing_block: &PhysicalRect<Au>,
-    ) {
-        // NB: The order of painting text components (CSS Text Decoration Module Level 3) is:
-        // shadows, underline, overline, text, text-emphasis, and then line-through.
-
-        builder.mark_is_contentful();
-
-        let rect = fragment.rect.translate(containing_block.origin.to_vector());
-        let mut baseline_origin = rect.origin;
-        baseline_origin.y += fragment.font_metrics.ascent;
-        let glyphs = glyphs(
-            &fragment.glyphs,
-            baseline_origin,
-            fragment.justification_adjustment,
-        );
-        if glyphs.is_empty() {
-            return;
-        }
-
-        self.maybe_push_hit_test_for_style_and_tag(
-            builder,
-            &fragment.parent_style,
-            fragment.base.tag,
-            rect,
-            Cursor::Text,
-        );
-
-        let color = fragment.parent_style.clone_color();
-        let font_metrics = &fragment.font_metrics;
-        let dppx = builder.context.style_context.device_pixel_ratio().get();
-        let common = builder.common_properties(rect.to_webrender(), &fragment.parent_style);
-
-        // Shadows. According to CSS-BACKGROUNDS, text shadows render in *reverse* order (front to
-        // back).
-        let shadows = &fragment.parent_style.get_inherited_text().text_shadow;
-        for shadow in shadows.0.iter().rev() {
-            builder.wr().push_shadow(
-                &wr::SpaceAndClipInfo {
-                    spatial_id: common.spatial_id,
-                    clip_chain_id: common.clip_chain_id,
-                },
-                wr::Shadow {
-                    offset: LayoutVector2D::new(shadow.horizontal.px(), shadow.vertical.px()),
-                    color: rgba(shadow.color.resolve_to_absolute(&color)),
-                    blur_radius: shadow.blur.px(),
-                },
-                true, /* should_inflate */
-            );
-        }
-
-        // Underline.
-        if fragment
-            .text_decoration_line
-            .contains(TextDecorationLine::UNDERLINE)
-        {
-            let mut rect = rect;
-            rect.origin.y += font_metrics.ascent - font_metrics.underline_offset;
-            rect.size.height = Au::from_f32_px(font_metrics.underline_size.to_nearest_pixel(dppx));
-            self.build_display_list_for_text_decoration(fragment, builder, &rect, &color);
-        }
-
-        // Overline.
-        if fragment
-            .text_decoration_line
-            .contains(TextDecorationLine::OVERLINE)
-        {
-            let mut rect = rect;
-            rect.size.height = Au::from_f32_px(font_metrics.underline_size.to_nearest_pixel(dppx));
-            self.build_display_list_for_text_decoration(fragment, builder, &rect, &color);
-        }
-
-        // Text.
-        builder.wr().push_text(
-            &common,
-            rect.to_webrender(),
-            &glyphs,
-            fragment.font_key,
-            rgba(color),
-            None,
-        );
-
-        // Line-through.
-        if fragment
-            .text_decoration_line
-            .contains(TextDecorationLine::LINE_THROUGH)
-        {
-            let mut rect = rect;
-            rect.origin.y += font_metrics.ascent - font_metrics.strikeout_offset;
-            rect.size.height = Au::from_f32_px(font_metrics.strikeout_size.to_nearest_pixel(dppx));
-            self.build_display_list_for_text_decoration(fragment, builder, &rect, &color);
-        }
-
-        if !shadows.0.is_empty() {
-            builder.wr().pop_all_shadows();
-        }
-    }
-
-    fn build_display_list_for_text_decoration(
-        &self,
-        fragment: &TextFragment,
-        builder: &mut DisplayListBuilder,
-        rect: &PhysicalRect<Au>,
-        color: &AbsoluteColor,
-    ) {
-        let rect = rect.to_webrender();
-        let wavy_line_thickness = (0.33 * rect.size().height).ceil();
-        let text_decoration_color = fragment
-            .parent_style
-            .clone_text_decoration_color()
-            .resolve_to_absolute(color);
-        let text_decoration_style = fragment.parent_style.clone_text_decoration_style();
-        if text_decoration_style == ComputedTextDecorationStyle::MozNone {
-            return;
-        }
-        builder.display_list.wr.push_line(
-            &builder.common_properties(rect, &fragment.parent_style),
-            &rect,
-            wavy_line_thickness,
-            wr::LineOrientation::Horizontal,
-            &rgba(text_decoration_color),
-            text_decoration_style.to_webrender(),
-        );
-        // XXX(ferjm) support text-decoration-style: double
-    }
-}
-
-struct BuilderForBoxFragment<'a> {
-    fragment: &'a BoxFragment,
-    containing_block: &'a PhysicalRect<Au>,
-    border_rect: units::LayoutRect,
-    margin_rect: OnceCell<units::LayoutRect>,
-    padding_rect: OnceCell<units::LayoutRect>,
-    content_rect: OnceCell<units::LayoutRect>,
-    border_radius: wr::BorderRadius,
-    border_edge_clip_chain_id: RefCell<Option<ClipChainId>>,
-    padding_edge_clip_chain_id: RefCell<Option<ClipChainId>>,
-    content_edge_clip_chain_id: RefCell<Option<ClipChainId>>,
-    is_hit_test_for_scrollable_overflow: bool,
-    is_collapsed_table_borders: bool,
-}
-
-impl<'a> BuilderForBoxFragment<'a> {
-    fn new(
-        fragment: &'a BoxFragment,
-        containing_block: &'a PhysicalRect<Au>,
-        is_hit_test_for_scrollable_overflow: bool,
-        is_collapsed_table_borders: bool,
-    ) -> Self {
-        let border_rect = fragment
-            .border_rect()
-            .translate(containing_block.origin.to_vector());
-
-        let webrender_border_rect = border_rect.to_webrender();
-        let border_radius = {
-            let resolve = |radius: &LengthPercentage, box_size: Au| {
-                radius.to_used_value(box_size).to_f32_px()
-            };
-            let corner = |corner: &style::values::computed::BorderCornerRadius| {
-                Size2D::new(
-                    resolve(&corner.0.width.0, border_rect.size.width),
-                    resolve(&corner.0.height.0, border_rect.size.height),
-                )
-            };
-            let b = fragment.style.get_border();
-            let mut radius = wr::BorderRadius {
-                top_left: corner(&b.border_top_left_radius),
-                top_right: corner(&b.border_top_right_radius),
-                bottom_right: corner(&b.border_bottom_right_radius),
-                bottom_left: corner(&b.border_bottom_left_radius),
-            };
-
-            normalize_radii(&webrender_border_rect, &mut radius);
-            radius
-        };
-
-        Self {
-            fragment,
-            containing_block,
-            border_rect: webrender_border_rect,
-            border_radius,
-            margin_rect: OnceCell::new(),
-            padding_rect: OnceCell::new(),
-            content_rect: OnceCell::new(),
-            border_edge_clip_chain_id: RefCell::new(None),
-            padding_edge_clip_chain_id: RefCell::new(None),
-            content_edge_clip_chain_id: RefCell::new(None),
-            is_hit_test_for_scrollable_overflow,
-            is_collapsed_table_borders,
-        }
-    }
-
-    fn content_rect(&self) -> &units::LayoutRect {
-        self.content_rect.get_or_init(|| {
-            self.fragment
-                .content_rect
-                .translate(self.containing_block.origin.to_vector())
-                .to_webrender()
-        })
-    }
-
-    fn padding_rect(&self) -> &units::LayoutRect {
-        self.padding_rect.get_or_init(|| {
-            self.fragment
-                .padding_rect()
-                .translate(self.containing_block.origin.to_vector())
-                .to_webrender()
-        })
-    }
-
-    fn margin_rect(&self) -> &units::LayoutRect {
-        self.margin_rect.get_or_init(|| {
-            self.fragment
-                .margin_rect()
-                .translate(self.containing_block.origin.to_vector())
-                .to_webrender()
-        })
-    }
-
-    fn border_edge_clip(
-        &self,
-        builder: &mut DisplayListBuilder,
-        force_clip_creation: bool,
-    ) -> Option<ClipChainId> {
-        if let Some(clip) = *self.border_edge_clip_chain_id.borrow() {
-            return Some(clip);
-        }
-
-        let maybe_clip = create_clip_chain(
-            self.border_radius,
-            self.border_rect,
-            builder,
-            force_clip_creation,
-        );
-        *self.border_edge_clip_chain_id.borrow_mut() = maybe_clip;
-        maybe_clip
-    }
-
-    fn padding_edge_clip(
-        &self,
-        builder: &mut DisplayListBuilder,
-        force_clip_creation: bool,
-    ) -> Option<ClipChainId> {
-        if let Some(clip) = *self.padding_edge_clip_chain_id.borrow() {
-            return Some(clip);
-        }
-
-        let radii = inner_radii(self.border_radius, self.fragment.border.to_webrender());
-        let maybe_clip =
-            create_clip_chain(radii, *self.padding_rect(), builder, force_clip_creation);
-        *self.padding_edge_clip_chain_id.borrow_mut() = maybe_clip;
-        maybe_clip
-    }
-
-    fn content_edge_clip(
-        &self,
-        builder: &mut DisplayListBuilder,
-        force_clip_creation: bool,
-    ) -> Option<ClipChainId> {
-        if let Some(clip) = *self.content_edge_clip_chain_id.borrow() {
-            return Some(clip);
-        }
-
-        let radii = inner_radii(
-            self.border_radius,
-            (self.fragment.border + self.fragment.padding).to_webrender(),
-        );
-        let maybe_clip =
-            create_clip_chain(radii, *self.content_rect(), builder, force_clip_creation);
-        *self.content_edge_clip_chain_id.borrow_mut() = maybe_clip;
-        maybe_clip
-    }
-
-    fn build(&mut self, builder: &mut DisplayListBuilder, section: StackingContextSection) {
-        if self.is_hit_test_for_scrollable_overflow {
-            self.build_hit_test(builder, self.fragment.scrollable_overflow().to_webrender());
-            return;
-        }
-
-        if self.is_collapsed_table_borders {
-            self.build_collapsed_table_borders(builder);
-            return;
-        }
-
-        if section == StackingContextSection::Outline {
-            self.build_outline(builder);
-            return;
-        }
-
-        self.build_hit_test(builder, self.border_rect);
-        if self
-            .fragment
-            .base
-            .flags
-            .contains(FragmentFlags::DO_NOT_PAINT)
-        {
-            return;
-        }
-        self.build_background(builder);
-        self.build_box_shadow(builder);
-        self.build_border(builder);
-    }
-
-    fn build_hit_test(&self, builder: &mut DisplayListBuilder, rect: LayoutRect) {
-        let hit_info = builder.hit_info(
-            &self.fragment.style,
-            self.fragment.base.tag,
-            Cursor::Default,
-        );
-        let hit_info = match hit_info {
-            Some(hit_info) => hit_info,
-            None => return,
-        };
-
-        let mut common = builder.common_properties(rect, &self.fragment.style);
-        if let Some(clip_chain_id) = self.border_edge_clip(builder, false) {
-            common.clip_chain_id = clip_chain_id;
-        }
-        builder.wr().push_hit_test(
-            common.clip_rect,
-            common.clip_chain_id,
-            common.spatial_id,
-            common.flags,
-            hit_info,
-        );
-    }
-
-    fn build_background_for_painter(
-        &mut self,
-        builder: &mut DisplayListBuilder,
-        painter: &BackgroundPainter,
-    ) {
-        let b = painter.style.get_background();
-        let background_color = painter.style.resolve_color(&b.background_color);
-        if background_color.alpha > 0.0 {
-            // https://drafts.csswg.org/css-backgrounds/#background-color
-            // “The background color is clipped according to the background-clip
-            //  value associated with the bottom-most background image layer.”
-            let layer_index = b.background_image.0.len() - 1;
-            let bounds = painter.painting_area(self, builder, layer_index);
-            let common = painter.common_properties(self, builder, layer_index, bounds);
-            builder
-                .wr()
-                .push_rect(&common, bounds, rgba(background_color))
-        }
-
-        self.build_background_image(builder, painter);
-    }
-
-    fn build_background(&mut self, builder: &mut DisplayListBuilder) {
-        if self
-            .fragment
-            .base
-            .is_for_node(builder.element_for_canvas_background)
-        {
-            // This background is already painted for the canvas, don’t paint it again here.
-            return;
-        }
-
-        // If this BoxFragment does not paint a background, do nothing.
-        if let BackgroundMode::None = self.fragment.background_mode {
-            return;
-        }
-
-        // Paint all extra backgrounds for this BoxFragment. These are painted first, as that's
-        // the order that they are expected to be painted for table cells (where this feature
-        // is used).
-        if let BackgroundMode::Extra(ref extra_backgrounds) = self.fragment.background_mode {
-            for extra_background in extra_backgrounds {
-                let positioning_area = extra_background.rect;
-                let painter = BackgroundPainter {
-                    style: &extra_background.style,
-                    painting_area_override: None,
-                    positioning_area_override: Some(
-                        positioning_area
-                            .translate(self.containing_block.origin.to_vector())
-                            .to_webrender(),
-                    ),
-                };
-                self.build_background_for_painter(builder, &painter);
-            }
-        }
-
-        let painter = BackgroundPainter {
-            style: &self.fragment.style,
-            painting_area_override: None,
-            positioning_area_override: None,
-        };
-        self.build_background_for_painter(builder, &painter);
-    }
-
-    fn build_background_image(
-        &mut self,
-        builder: &mut DisplayListBuilder,
-        painter: &BackgroundPainter,
-    ) {
-        let style = painter.style;
-        let b = style.get_background();
-        // Reverse because the property is top layer first, we want to paint bottom layer first.
-        for (index, image) in b.background_image.0.iter().enumerate().rev() {
-            match image {
-                Image::None => {},
-                Image::Gradient(gradient) => {
-                    let intrinsic = NaturalSizes::empty();
-                    let Some(layer) =
-                        &background::layout_layer(self, painter, builder, index, intrinsic)
-                    else {
-                        continue;
-                    };
-
-                    match gradient::build(style, gradient, layer.tile_size, builder) {
-                        WebRenderGradient::Linear(linear_gradient) => builder.wr().push_gradient(
-                            &layer.common,
-                            layer.bounds,
-                            linear_gradient,
-                            layer.tile_size,
-                            layer.tile_spacing,
-                        ),
-                        WebRenderGradient::Radial(radial_gradient) => {
-                            builder.wr().push_radial_gradient(
-                                &layer.common,
-                                layer.bounds,
-                                radial_gradient,
-                                layer.tile_size,
-                                layer.tile_spacing,
-                            )
-                        },
-                        WebRenderGradient::Conic(conic_gradient) => {
-                            builder.wr().push_conic_gradient(
-                                &layer.common,
-                                layer.bounds,
-                                conic_gradient,
-                                layer.tile_size,
-                                layer.tile_spacing,
-                            )
-                        },
-                    }
-                },
-                Image::Url(image_url) => {
-                    // FIXME: images won’t always have in intrinsic width or
-                    // height when support for SVG is added, or a WebRender
-                    // `ImageKey`, for that matter.
-                    //
-                    // FIXME: It feels like this should take into account the pseudo
-                    // element and not just the node.
-                    let node = match self.fragment.base.tag {
-                        Some(tag) => tag.node,
-                        None => continue,
-                    };
-                    let image_url = match image_url.url() {
-                        Some(url) => url.clone(),
-                        None => continue,
-                    };
-                    let (width, height, key) = match builder.context.get_webrender_image_for_url(
-                        node,
-                        image_url.into(),
-                        UsePlaceholder::No,
-                    ) {
-                        Some(WebRenderImageInfo {
-                            width,
-                            height,
-                            key: Some(key),
-                        }) => (width, height, key),
-                        _ => continue,
-                    };
-
-                    // FIXME: https://drafts.csswg.org/css-images-4/#the-image-resolution
-                    let dppx = 1.0;
-                    let intrinsic = NaturalSizes::from_width_and_height(
-                        width as f32 / dppx,
-                        height as f32 / dppx,
-                    );
-
-                    if let Some(layer) =
-                        background::layout_layer(self, painter, builder, index, intrinsic)
-                    {
-                        if layer.repeat {
-                            builder.wr().push_repeating_image(
-                                &layer.common,
-                                layer.bounds,
-                                layer.tile_size,
-                                layer.tile_spacing,
-                                style.clone_image_rendering().to_webrender(),
-                                wr::AlphaType::PremultipliedAlpha,
-                                key,
-                                wr::ColorF::WHITE,
-                            )
-                        } else {
-                            builder.wr().push_image(
-                                &layer.common,
-                                layer.bounds,
-                                style.clone_image_rendering().to_webrender(),
-                                wr::AlphaType::PremultipliedAlpha,
-                                key,
-                                wr::ColorF::WHITE,
-                            )
-                        }
-                    }
-                },
-                Image::PaintWorklet(_) => {
-                    // TODO: Add support for PaintWorklet rendering.
-                },
-                Image::ImageSet(..) | Image::CrossFade(..) => {
-                    // TODO: Add support for ImageSet and CrossFade rendering.
-                },
-            }
-        }
-    }
-
-    fn build_border_side(&mut self, style_color: BorderStyleColor) -> wr::BorderSide {
-        wr::BorderSide {
-            color: rgba(style_color.color),
-            style: match style_color.style {
-                BorderStyle::None => wr::BorderStyle::None,
-                BorderStyle::Solid => wr::BorderStyle::Solid,
-                BorderStyle::Double => wr::BorderStyle::Double,
-                BorderStyle::Dotted => wr::BorderStyle::Dotted,
-                BorderStyle::Dashed => wr::BorderStyle::Dashed,
-                BorderStyle::Hidden => wr::BorderStyle::Hidden,
-                BorderStyle::Groove => wr::BorderStyle::Groove,
-                BorderStyle::Ridge => wr::BorderStyle::Ridge,
-                BorderStyle::Inset => wr::BorderStyle::Inset,
-                BorderStyle::Outset => wr::BorderStyle::Outset,
-            },
-        }
-    }
-
-    fn build_collapsed_table_borders(&mut self, builder: &mut DisplayListBuilder) {
-        let Some(SpecificLayoutInfo::TableGridWithCollapsedBorders(table_info)) =
-            &self.fragment.specific_layout_info
-        else {
-            return;
-        };
-        let mut common =
-            builder.common_properties(units::LayoutRect::default(), &self.fragment.style);
-        let radius = wr::BorderRadius::default();
-        let mut column_sum = Au::zero();
-        for (x, column_size) in table_info.track_sizes.x.iter().enumerate() {
-            let mut row_sum = Au::zero();
-            for (y, row_size) in table_info.track_sizes.y.iter().enumerate() {
-                let left_border = &table_info.collapsed_borders.x[x][y];
-                let right_border = &table_info.collapsed_borders.x[x + 1][y];
-                let top_border = &table_info.collapsed_borders.y[y][x];
-                let bottom_border = &table_info.collapsed_borders.y[y + 1][x];
-                let details = wr::BorderDetails::Normal(wr::NormalBorder {
-                    left: self.build_border_side(left_border.style_color.clone()),
-                    right: self.build_border_side(right_border.style_color.clone()),
-                    top: self.build_border_side(top_border.style_color.clone()),
-                    bottom: self.build_border_side(bottom_border.style_color.clone()),
-                    radius,
-                    do_aa: true,
-                });
-                let mut border_widths = PhysicalSides::new(
-                    top_border.width,
-                    right_border.width,
-                    bottom_border.width,
-                    left_border.width,
-                );
-                let left_adjustment = if x == 0 {
-                    -border_widths.left / 2
-                } else {
-                    std::mem::take(&mut border_widths.left) / 2
-                };
-                let top_adjustment = if y == 0 {
-                    -border_widths.top / 2
-                } else {
-                    std::mem::take(&mut border_widths.top) / 2
-                };
-                let origin =
-                    PhysicalPoint::new(column_sum + left_adjustment, row_sum + top_adjustment);
-                let size = PhysicalSize::new(
-                    *column_size - left_adjustment + border_widths.right / 2,
-                    *row_size - top_adjustment + border_widths.bottom / 2,
-                );
-                let border_rect = PhysicalRect::new(origin, size)
-                    .translate(self.fragment.content_rect.origin.to_vector())
-                    .translate(self.containing_block.origin.to_vector())
-                    .to_webrender();
-                common.clip_rect = border_rect;
-                builder.wr().push_border(
-                    &common,
-                    border_rect,
-                    border_widths.to_webrender(),
-                    details,
-                );
-                row_sum += *row_size;
-            }
-            column_sum += *column_size;
-        }
-    }
-
-    fn build_border(&mut self, builder: &mut DisplayListBuilder) {
-        if self.fragment.has_collapsed_borders() {
-            // Avoid painting borders for tables and table parts in collapsed-borders mode,
-            // since the resulting collapsed borders are painted on their own in a special way.
-            return;
-        }
-
-        let border = self.fragment.style.get_border();
-        let border_widths = self.fragment.border.to_webrender();
-
-        if border_widths == SideOffsets2D::zero() {
-            return;
-        }
-
-        // `border-image` replaces an element's border entirely.
-        let common = builder.common_properties(self.border_rect, &self.fragment.style);
-        if self.build_border_image(builder, &common, border, border_widths) {
-            return;
-        }
-
-        let current_color = self.fragment.style.get_inherited_text().clone_color();
-        let style_color = BorderStyleColor::from_border(border, &current_color);
-        let details = wr::BorderDetails::Normal(wr::NormalBorder {
-            top: self.build_border_side(style_color.top),
-            right: self.build_border_side(style_color.right),
-            bottom: self.build_border_side(style_color.bottom),
-            left: self.build_border_side(style_color.left),
-            radius: self.border_radius,
-            do_aa: true,
-        });
-        builder
-            .wr()
-            .push_border(&common, self.border_rect, border_widths, details)
-    }
-
-    /// Add a display item for image borders if necessary.
-    fn build_border_image(
-        &self,
-        builder: &mut DisplayListBuilder,
-        common: &CommonItemProperties,
-        border: &Border,
-        border_widths: SideOffsets2D<f32, LayoutPixel>,
-    ) -> bool {
-        let border_style_struct = self.fragment.style.get_border();
-        let border_image_outset =
-            resolve_border_image_outset(border_style_struct.border_image_outset, border_widths);
-        let border_image_area = self.border_rect.to_rect().outer_rect(border_image_outset);
-        let border_image_size = border_image_area.size;
-        let border_image_widths = resolve_border_image_width(
-            &border_style_struct.border_image_width,
-            border_widths,
-            border_image_size,
-        );
-        let border_image_repeat = &border_style_struct.border_image_repeat;
-        let border_image_fill = border_style_struct.border_image_slice.fill;
-        let border_image_slice = &border_style_struct.border_image_slice.offsets;
-
-        let stops = Vec::new();
-        let mut width = border_image_size.width;
-        let mut height = border_image_size.height;
-        let source = match border.border_image_source {
-            Image::Url(ref image_url) => {
-                // FIXME: images won’t always have in intrinsic width or
-                // height when support for SVG is added, or a WebRender
-                // `ImageKey`, for that matter.
-                //
-                // FIXME: It feels like this should take into account the pseudo
-                // element and not just the node.
-                let Some(tag) = self.fragment.base.tag else {
-                    return false;
-                };
-                let Some(image_url) = image_url.url() else {
-                    return false;
-                };
-
-                let Some(image_info) = builder.context.get_webrender_image_for_url(
-                    tag.node,
-                    image_url.clone().into(),
-                    UsePlaceholder::No,
-                ) else {
-                    return false;
-                };
-
-                let Some(key) = image_info.key else {
-                    return false;
-                };
-
-                width = image_info.width as f32;
-                height = image_info.height as f32;
-                NinePatchBorderSource::Image(key, ImageRendering::Auto)
-            },
-            Image::Gradient(ref gradient) => {
-                match gradient::build(&self.fragment.style, gradient, border_image_size, builder) {
-                    WebRenderGradient::Linear(gradient) => {
-                        NinePatchBorderSource::Gradient(gradient)
-                    },
-                    WebRenderGradient::Radial(gradient) => {
-                        NinePatchBorderSource::RadialGradient(gradient)
-                    },
-                    WebRenderGradient::Conic(gradient) => {
-                        NinePatchBorderSource::ConicGradient(gradient)
-                    },
-                }
-            },
-            Image::CrossFade(_) | Image::ImageSet(_) | Image::None | Image::PaintWorklet(_) => {
-                return false;
-            },
-        };
-
-        let size = euclid::Size2D::new(width as i32, height as i32);
-        let details = BorderDetails::NinePatch(NinePatchBorder {
-            source,
-            width: size.width,
-            height: size.height,
-            slice: resolve_border_image_slice(border_image_slice, size),
-            fill: border_image_fill,
-            repeat_horizontal: border_image_repeat.0.to_webrender(),
-            repeat_vertical: border_image_repeat.1.to_webrender(),
-        });
-        builder.wr().push_border(
-            common,
-            border_image_area.to_box2d(),
-            border_image_widths,
-            details,
-        );
-        builder.wr().push_stops(&stops);
-        true
-    }
-
-    fn build_outline(&mut self, builder: &mut DisplayListBuilder) {
-        let style = &self.fragment.style;
-        let outline = style.get_outline();
-        let width = outline.outline_width.to_f32_px();
-        if width == 0.0 {
-            return;
-        }
-        let offset = outline
-            .outline_offset
-            .px()
-            .max(-self.border_rect.width() / 2.0)
-            .max(-self.border_rect.height() / 2.0) +
-            width;
-        let outline_rect = self.border_rect.inflate(offset, offset);
-        let common = builder.common_properties(outline_rect, &self.fragment.style);
-        let widths = SideOffsets2D::new_all_same(width);
-        let border_style = match outline.outline_style {
-            // TODO: treating 'auto' as 'solid' is allowed by the spec,
-            // but we should do something better.
-            OutlineStyle::Auto => BorderStyle::Solid,
-            OutlineStyle::BorderStyle(s) => s,
-        };
-        let side = self.build_border_side(BorderStyleColor {
-            style: border_style,
-            color: style.resolve_color(&outline.outline_color),
-        });
-        let details = wr::BorderDetails::Normal(wr::NormalBorder {
-            top: side,
-            right: side,
-            bottom: side,
-            left: side,
-            radius: offset_radii(self.border_radius, offset),
-            do_aa: true,
-        });
-        builder
-            .wr()
-            .push_border(&common, outline_rect, widths, details)
-    }
-
-    fn build_box_shadow(&self, builder: &mut DisplayListBuilder<'_>) {
-        let box_shadows = &self.fragment.style.get_effects().box_shadow.0;
-        if box_shadows.is_empty() {
-            return;
-        }
-
-        // NB: According to CSS-BACKGROUNDS, box shadows render in *reverse* order (front to back).
-        let common = builder.common_properties(MaxRect::max_rect(), &self.fragment.style);
-        for box_shadow in box_shadows.iter().rev() {
-            let (rect, clip_mode) = if box_shadow.inset {
-                (*self.padding_rect(), BoxShadowClipMode::Inset)
-            } else {
-                (self.border_rect, BoxShadowClipMode::Outset)
-            };
-
-            builder.wr().push_box_shadow(
-                &common,
-                rect,
-                LayoutVector2D::new(
-                    box_shadow.base.horizontal.px(),
-                    box_shadow.base.vertical.px(),
-                ),
-                rgba(self.fragment.style.resolve_color(&box_shadow.base.color)),
-                box_shadow.base.blur.px(),
-                box_shadow.spread.px(),
-                self.border_radius,
-                clip_mode,
-            );
-        }
-    }
-}
-
-fn rgba(color: AbsoluteColor) -> wr::ColorF {
-    let rgba = color.to_color_space(ColorSpace::Srgb);
-    wr::ColorF::new(
-        rgba.components.0.clamp(0.0, 1.0),
-        rgba.components.1.clamp(0.0, 1.0),
-        rgba.components.2.clamp(0.0, 1.0),
-        rgba.alpha,
-    )
-}
-
-fn glyphs(
-    glyph_runs: &[Arc<GlyphStore>],
-    mut baseline_origin: PhysicalPoint<Au>,
-    justification_adjustment: Au,
-) -> Vec<wr::GlyphInstance> {
-    use fonts_traits::ByteIndex;
-    use range::Range;
-
-    let mut glyphs = vec![];
-    for run in glyph_runs {
-        for glyph in run.iter_glyphs_for_byte_range(&Range::new(ByteIndex(0), run.len())) {
-            if !run.is_whitespace() {
-                let glyph_offset = glyph.offset().unwrap_or(Point2D::zero());
-                let point = units::LayoutPoint::new(
-                    baseline_origin.x.to_f32_px() + glyph_offset.x.to_f32_px(),
-                    baseline_origin.y.to_f32_px() + glyph_offset.y.to_f32_px(),
-                );
-                let glyph = wr::GlyphInstance {
-                    index: glyph.id(),
-                    point,
-                };
-                glyphs.push(glyph);
-            }
-
-            if glyph.char_is_word_separator() {
-                baseline_origin.x += justification_adjustment;
-            }
-            baseline_origin.x += glyph.advance();
-        }
-    }
-    glyphs
-}
-
-fn cursor(kind: CursorKind, auto_cursor: Cursor) -> Cursor {
-    match kind {
-        CursorKind::Auto => auto_cursor,
-        CursorKind::None => Cursor::None,
-        CursorKind::Default => Cursor::Default,
-        CursorKind::Pointer => Cursor::Pointer,
-        CursorKind::ContextMenu => Cursor::ContextMenu,
-        CursorKind::Help => Cursor::Help,
-        CursorKind::Progress => Cursor::Progress,
-        CursorKind::Wait => Cursor::Wait,
-        CursorKind::Cell => Cursor::Cell,
-        CursorKind::Crosshair => Cursor::Crosshair,
-        CursorKind::Text => Cursor::Text,
-        CursorKind::VerticalText => Cursor::VerticalText,
-        CursorKind::Alias => Cursor::Alias,
-        CursorKind::Copy => Cursor::Copy,
-        CursorKind::Move => Cursor::Move,
-        CursorKind::NoDrop => Cursor::NoDrop,
-        CursorKind::NotAllowed => Cursor::NotAllowed,
-        CursorKind::Grab => Cursor::Grab,
-        CursorKind::Grabbing => Cursor::Grabbing,
-        CursorKind::EResize => Cursor::EResize,
-        CursorKind::NResize => Cursor::NResize,
-        CursorKind::NeResize => Cursor::NeResize,
-        CursorKind::NwResize => Cursor::NwResize,
-        CursorKind::SResize => Cursor::SResize,
-        CursorKind::SeResize => Cursor::SeResize,
-        CursorKind::SwResize => Cursor::SwResize,
-        CursorKind::WResize => Cursor::WResize,
-        CursorKind::EwResize => Cursor::EwResize,
-        CursorKind::NsResize => Cursor::NsResize,
-        CursorKind::NeswResize => Cursor::NeswResize,
-        CursorKind::NwseResize => Cursor::NwseResize,
-        CursorKind::ColResize => Cursor::ColResize,
-        CursorKind::RowResize => Cursor::RowResize,
-        CursorKind::AllScroll => Cursor::AllScroll,
-        CursorKind::ZoomIn => Cursor::ZoomIn,
-        CursorKind::ZoomOut => Cursor::ZoomOut,
-    }
-}
-
-/// Radii for the padding edge or content edge
-fn inner_radii(mut radii: wr::BorderRadius, insets: units::LayoutSideOffsets) -> wr::BorderRadius {
-    assert!(insets.left >= 0.0, "left inset must not be negative");
-    radii.top_left.width -= insets.left;
-    radii.bottom_left.width -= insets.left;
-
-    assert!(insets.right >= 0.0, "left inset must not be negative");
-    radii.top_right.width -= insets.right;
-    radii.bottom_right.width -= insets.right;
-
-    assert!(insets.top >= 0.0, "top inset must not be negative");
-    radii.top_left.height -= insets.top;
-    radii.top_right.height -= insets.top;
-
-    assert!(insets.bottom >= 0.0, "bottom inset must not be negative");
-    radii.bottom_left.height -= insets.bottom;
-    radii.bottom_right.height -= insets.bottom;
-    radii
-}
-
-fn offset_radii(mut radii: wr::BorderRadius, offset: f32) -> wr::BorderRadius {
-    if offset == 0.0 {
-        return radii;
-    }
-    if offset < 0.0 {
-        return inner_radii(radii, units::LayoutSideOffsets::new_all_same(-offset));
-    }
-    let expand = |radius: &mut f32| {
-        // Expand the radius by the specified amount, but keeping sharp corners.
-        // TODO: this behavior is not continuous, it's being discussed in the CSSWG:
-        // https://github.com/w3c/csswg-drafts/issues/7103
-        if *radius > 0.0 {
-            *radius += offset;
-        }
-    };
-    expand(&mut radii.top_left.width);
-    expand(&mut radii.top_left.height);
-    expand(&mut radii.top_right.width);
-    expand(&mut radii.top_right.height);
-    expand(&mut radii.bottom_right.width);
-    expand(&mut radii.bottom_right.height);
-    expand(&mut radii.bottom_left.width);
-    expand(&mut radii.bottom_left.height);
-    radii
-}
-
-fn create_clip_chain(
-    radii: wr::BorderRadius,
-    rect: units::LayoutRect,
-    builder: &mut DisplayListBuilder,
-    force_clip_creation: bool,
-) -> Option<ClipChainId> {
-    if radii.is_zero() && !force_clip_creation {
-        return None;
-    }
-
-    let spatial_id = builder.current_scroll_node_id.spatial_id;
-    let parent_clip_chain_id = builder.current_clip_chain_id;
-    let new_clip_id = if radii.is_zero() {
-        builder.wr().define_clip_rect(spatial_id, rect)
-    } else {
-        builder.wr().define_clip_rounded_rect(
-            spatial_id,
-            wr::ComplexClipRegion {
-                rect,
-                radii,
-                mode: wr::ClipMode::Clip,
-            },
-        )
-    };
-
-    Some(
-        builder
-            .display_list
-            .define_clip_chain(parent_clip_chain_id, [new_clip_id]),
-    )
-}
-
-/// Resolve the WebRender border-image outset area from the style values.
-fn resolve_border_image_outset(
-    outset: BorderImageOutset,
-    border: SideOffsets2D<f32, LayoutPixel>,
-) -> SideOffsets2D<f32, LayoutPixel> {
-    fn image_outset_for_side(outset: NonNegativeLengthOrNumber, border_width: f32) -> f32 {
-        match outset {
-            NonNegativeLengthOrNumber::Length(length) => length.px(),
-            NonNegativeLengthOrNumber::Number(factor) => border_width * factor.0,
-        }
-    }
-
-    SideOffsets2D::new(
-        image_outset_for_side(outset.0, border.top),
-        image_outset_for_side(outset.1, border.right),
-        image_outset_for_side(outset.2, border.bottom),
-        image_outset_for_side(outset.3, border.left),
-    )
-}
-
-/// Resolve the WebRender border-image width from the style values.
-fn resolve_border_image_width(
-    width: &BorderImageWidth,
-    border: SideOffsets2D<f32, LayoutPixel>,
-    border_area: Size2D<f32, LayoutPixel>,
-) -> SideOffsets2D<f32, LayoutPixel> {
-    fn image_width_for_side(
-        border_image_width: &BorderImageSideWidth,
-        border_width: f32,
-        total_length: f32,
-    ) -> f32 {
-        match border_image_width {
-            BorderImageSideWidth::LengthPercentage(v) => {
-                v.to_used_value(Au::from_f32_px(total_length)).to_f32_px()
-            },
-            BorderImageSideWidth::Number(x) => border_width * x.0,
-            BorderImageSideWidth::Auto => border_width,
-        }
-    }
-
-    SideOffsets2D::new(
-        image_width_for_side(&width.0, border.top, border_area.height),
-        image_width_for_side(&width.1, border.right, border_area.width),
-        image_width_for_side(&width.2, border.bottom, border_area.height),
-        image_width_for_side(&width.3, border.left, border_area.width),
-    )
-}
-
-/// Resolve the WebRender border-image slice from the style values.
-fn resolve_border_image_slice(
-    border_image_slice: &Rect<NonNegative<NumberOrPercentage>>,
-    size: Size2D<i32, UnknownUnit>,
-) -> SideOffsets2D<i32, DevicePixel> {
-    fn resolve_percentage(value: NonNegative<NumberOrPercentage>, length: i32) -> i32 {
-        match value.0 {
-            NumberOrPercentage::Percentage(p) => (p.0 * length as f32).round() as i32,
-            NumberOrPercentage::Number(n) => n.round() as i32,
-        }
-    }
-
-    SideOffsets2D::new(
-        resolve_percentage(border_image_slice.0, size.height),
-        resolve_percentage(border_image_slice.1, size.width),
-        resolve_percentage(border_image_slice.2, size.height),
-        resolve_percentage(border_image_slice.3, size.width),
-    )
-}
-
-pub(super) fn normalize_radii(rect: &units::LayoutRect, radius: &mut wr::BorderRadius) {
-    // Normalize radii that add up to > 100%.
-    // https://www.w3.org/TR/css-backgrounds-3/#corner-overlap
-    // > Let f = min(L_i/S_i), where i ∈ {top, right, bottom, left},
-    // > S_i is the sum of the two corresponding radii of the corners on side i,
-    // > and L_top = L_bottom = the width of the box,
-    // > and L_left = L_right = the height of the box.
-    // > If f < 1, then all corner radii are reduced by multiplying them by f.
-    let f = (rect.width() / (radius.top_left.width + radius.top_right.width))
-        .min(rect.width() / (radius.bottom_left.width + radius.bottom_right.width))
-        .min(rect.height() / (radius.top_left.height + radius.bottom_left.height))
-        .min(rect.height() / (radius.top_right.height + radius.bottom_right.height));
-    if f < 1.0 {
-        radius.top_left *= f;
-        radius.top_right *= f;
-        radius.bottom_right *= f;
-        radius.bottom_left *= f;
-    }
-}
-
-/// <https://drafts.csswg.org/css-shapes-1/#valdef-shape-box-margin-box>
-/// > The corner radii of this shape are determined by the corresponding
-/// > border-radius and margin values. If the ratio of border-radius/margin is 1 or more,
-/// > or margin is negative or zero, then the margin box corner radius is
-/// > max(border-radius + margin, 0). If the ratio of border-radius/margin is less than 1,
-/// > and margin is positive, then the margin box corner radius is
-/// > border-radius + margin * (1 + (ratio-1)^3).
-pub(super) fn compute_margin_box_radius(
-    radius: wr::BorderRadius,
-    layout_rect: LayoutSize,
-    fragment: &BoxFragment,
-) -> wr::BorderRadius {
-    let margin = fragment.style.physical_margin();
-    let adjust_radius = |radius: f32, margin: f32| -> f32 {
-        if margin <= 0. || (radius / margin) >= 1. {
-            (radius + margin).max(0.)
-        } else {
-            radius + (margin * (1. + (radius / margin - 1.).powf(3.)))
-        }
-    };
-    let compute_margin_radius = |radius: LayoutSize,
-                                 layout_rect: LayoutSize,
-                                 margin: Size2D<LengthPercentageOrAuto, UnknownUnit>|
-     -> LayoutSize {
-        let zero = LengthPercentage::zero();
-        let width = margin
-            .width
-            .auto_is(|| &zero)
-            .to_used_value(Au::from_f32_px(layout_rect.width));
-        let height = margin
-            .height
-            .auto_is(|| &zero)
-            .to_used_value(Au::from_f32_px(layout_rect.height));
-        LayoutSize::new(
-            adjust_radius(radius.width, width.to_f32_px()),
-            adjust_radius(radius.height, height.to_f32_px()),
-        )
-    };
-    wr::BorderRadius {
-        top_left: compute_margin_radius(
-            radius.top_left,
-            layout_rect,
-            Size2D::new(margin.left, margin.top),
-        ),
-        top_right: compute_margin_radius(
-            radius.top_right,
-            layout_rect,
-            Size2D::new(margin.right, margin.top),
-        ),
-        bottom_left: compute_margin_radius(
-            radius.bottom_left,
-            layout_rect,
-            Size2D::new(margin.left, margin.bottom),
-        ),
-        bottom_right: compute_margin_radius(
-            radius.bottom_right,
-            layout_rect,
-            Size2D::new(margin.right, margin.bottom),
-        ),
-    }
-}
diff --git a/components/layout_2020/dom.rs b/components/layout_2020/dom.rs
deleted file mode 100644
index b0323a4e56b..00000000000
--- a/components/layout_2020/dom.rs
+++ /dev/null
@@ -1,246 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::marker::PhantomData;
-use std::sync::Arc;
-
-use atomic_refcell::{AtomicRef, AtomicRefCell, AtomicRefMut};
-use base::id::{BrowsingContextId, PipelineId};
-use html5ever::{local_name, namespace_url, ns};
-use pixels::Image;
-use script_layout_interface::wrapper_traits::{
-    LayoutDataTrait, LayoutNode, ThreadSafeLayoutElement, ThreadSafeLayoutNode,
-};
-use script_layout_interface::{
-    HTMLCanvasDataSource, LayoutElementType, LayoutNodeType as ScriptLayoutNodeType,
-};
-use servo_arc::Arc as ServoArc;
-use style::properties::ComputedValues;
-
-use crate::cell::ArcRefCell;
-use crate::context::LayoutContext;
-use crate::dom_traversal::WhichPseudoElement;
-use crate::flexbox::FlexLevelBox;
-use crate::flow::BlockLevelBox;
-use crate::flow::inline::InlineItem;
-use crate::geom::PhysicalSize;
-use crate::replaced::{CanvasInfo, CanvasSource};
-use crate::taffy::TaffyItemBox;
-
-/// The data that is stored in each DOM node that is used by layout.
-#[derive(Default)]
-pub struct InnerDOMLayoutData {
-    pub(super) self_box: ArcRefCell<Option<LayoutBox>>,
-    pub(super) pseudo_before_box: ArcRefCell<Option<LayoutBox>>,
-    pub(super) pseudo_after_box: ArcRefCell<Option<LayoutBox>>,
-}
-
-/// A box that is stored in one of the `DOMLayoutData` slots.
-pub(super) enum LayoutBox {
-    DisplayContents,
-    BlockLevel(ArcRefCell<BlockLevelBox>),
-    InlineLevel(ArcRefCell<InlineItem>),
-    FlexLevel(ArcRefCell<FlexLevelBox>),
-    TaffyItemBox(ArcRefCell<TaffyItemBox>),
-}
-
-/// A wrapper for [`InnerDOMLayoutData`]. This is necessary to give the entire data
-/// structure interior mutability, as we will need to mutate the layout data of
-/// non-mutable DOM nodes.
-#[derive(Default)]
-pub struct DOMLayoutData(AtomicRefCell<InnerDOMLayoutData>);
-
-// The implementation of this trait allows the data to be stored in the DOM.
-impl LayoutDataTrait for DOMLayoutData {}
-
-pub struct BoxSlot<'dom> {
-    pub(crate) slot: Option<ArcRefCell<Option<LayoutBox>>>,
-    pub(crate) marker: PhantomData<&'dom ()>,
-}
-
-/// A mutable reference to a `LayoutBox` stored in a DOM element.
-impl BoxSlot<'_> {
-    pub(crate) fn new(slot: ArcRefCell<Option<LayoutBox>>) -> Self {
-        *slot.borrow_mut() = None;
-        let slot = Some(slot);
-        Self {
-            slot,
-            marker: PhantomData,
-        }
-    }
-
-    pub(crate) fn dummy() -> Self {
-        let slot = None;
-        Self {
-            slot,
-            marker: PhantomData,
-        }
-    }
-
-    pub(crate) fn set(mut self, box_: LayoutBox) {
-        if let Some(slot) = &mut self.slot {
-            *slot.borrow_mut() = Some(box_);
-        }
-    }
-}
-
-impl Drop for BoxSlot<'_> {
-    fn drop(&mut self) {
-        if !std::thread::panicking() {
-            if let Some(slot) = &mut self.slot {
-                assert!(slot.borrow().is_some(), "failed to set a layout box");
-            }
-        }
-    }
-}
-
-pub(crate) trait NodeExt<'dom>: 'dom + LayoutNode<'dom> {
-    /// Returns the image if it’s loaded, and its size in image pixels
-    /// adjusted for `image_density`.
-    fn as_image(self) -> Option<(Option<Arc<Image>>, PhysicalSize<f64>)>;
-    fn as_canvas(self) -> Option<(CanvasInfo, PhysicalSize<f64>)>;
-    fn as_iframe(self) -> Option<(PipelineId, BrowsingContextId)>;
-    fn as_video(self) -> Option<(Option<webrender_api::ImageKey>, Option<PhysicalSize<f64>>)>;
-    fn as_typeless_object_with_data_attribute(self) -> Option<String>;
-    fn style(self, context: &LayoutContext) -> ServoArc<ComputedValues>;
-
-    fn layout_data_mut(self) -> AtomicRefMut<'dom, InnerDOMLayoutData>;
-    fn layout_data(self) -> Option<AtomicRef<'dom, InnerDOMLayoutData>>;
-    fn element_box_slot(&self) -> BoxSlot<'dom>;
-    fn pseudo_element_box_slot(&self, which: WhichPseudoElement) -> BoxSlot<'dom>;
-    fn unset_pseudo_element_box(self, which: WhichPseudoElement);
-
-    /// Remove boxes for the element itself, and its `:before` and `:after` if any.
-    fn unset_all_boxes(self);
-}
-
-impl<'dom, LayoutNodeType> NodeExt<'dom> for LayoutNodeType
-where
-    LayoutNodeType: 'dom + LayoutNode<'dom>,
-{
-    fn as_image(self) -> Option<(Option<Arc<Image>>, PhysicalSize<f64>)> {
-        let node = self.to_threadsafe();
-        let (resource, metadata) = node.image_data()?;
-        let (width, height) = resource
-            .as_ref()
-            .map(|image| (image.width, image.height))
-            .or_else(|| metadata.map(|metadata| (metadata.width, metadata.height)))
-            .unwrap_or((0, 0));
-        let (mut width, mut height) = (width as f64, height as f64);
-        if let Some(density) = node.image_density().filter(|density| *density != 1.) {
-            width /= density;
-            height /= density;
-        }
-        Some((resource, PhysicalSize::new(width, height)))
-    }
-
-    fn as_video(self) -> Option<(Option<webrender_api::ImageKey>, Option<PhysicalSize<f64>>)> {
-        let node = self.to_threadsafe();
-        let data = node.media_data()?;
-        let natural_size = if let Some(frame) = data.current_frame {
-            Some(PhysicalSize::new(frame.width.into(), frame.height.into()))
-        } else {
-            data.metadata
-                .map(|meta| PhysicalSize::new(meta.width.into(), meta.height.into()))
-        };
-        Some((
-            data.current_frame.map(|frame| frame.image_key),
-            natural_size,
-        ))
-    }
-
-    fn as_canvas(self) -> Option<(CanvasInfo, PhysicalSize<f64>)> {
-        let node = self.to_threadsafe();
-        let canvas_data = node.canvas_data()?;
-        let source = match canvas_data.source {
-            HTMLCanvasDataSource::WebGL(texture_id) => CanvasSource::WebGL(texture_id),
-            HTMLCanvasDataSource::Image(image_key) => CanvasSource::Image(image_key),
-            HTMLCanvasDataSource::WebGPU(image_key) => CanvasSource::WebGPU(image_key),
-            HTMLCanvasDataSource::Empty => CanvasSource::Empty,
-        };
-        Some((
-            CanvasInfo { source },
-            PhysicalSize::new(canvas_data.width.into(), canvas_data.height.into()),
-        ))
-    }
-
-    fn as_iframe(self) -> Option<(PipelineId, BrowsingContextId)> {
-        let node = self.to_threadsafe();
-        match (node.iframe_pipeline_id(), node.iframe_browsing_context_id()) {
-            (Some(pipeline_id), Some(browsing_context_id)) => {
-                Some((pipeline_id, browsing_context_id))
-            },
-            _ => None,
-        }
-    }
-
-    fn as_typeless_object_with_data_attribute(self) -> Option<String> {
-        if self.type_id() != ScriptLayoutNodeType::Element(LayoutElementType::HTMLObjectElement) {
-            return None;
-        }
-
-        // TODO: This is the what the legacy layout system did, but really if Servo
-        // supports any `<object>` that's an image, it should support those with URLs
-        // and `type` attributes with image mime types.
-        let element = self.to_threadsafe().as_element()?;
-        if element.get_attr(&ns!(), &local_name!("type")).is_some() {
-            return None;
-        }
-        element
-            .get_attr(&ns!(), &local_name!("data"))
-            .map(|string| string.to_owned())
-    }
-
-    fn style(self, context: &LayoutContext) -> ServoArc<ComputedValues> {
-        self.to_threadsafe().style(context.shared_context())
-    }
-
-    fn layout_data_mut(self) -> AtomicRefMut<'dom, InnerDOMLayoutData> {
-        if LayoutNode::layout_data(&self).is_none() {
-            self.initialize_layout_data::<DOMLayoutData>();
-        }
-        LayoutNode::layout_data(&self)
-            .unwrap()
-            .downcast_ref::<DOMLayoutData>()
-            .unwrap()
-            .0
-            .borrow_mut()
-    }
-
-    fn layout_data(self) -> Option<AtomicRef<'dom, InnerDOMLayoutData>> {
-        LayoutNode::layout_data(&self)
-            .map(|data| data.downcast_ref::<DOMLayoutData>().unwrap().0.borrow())
-    }
-
-    fn element_box_slot(&self) -> BoxSlot<'dom> {
-        BoxSlot::new(self.layout_data_mut().self_box.clone())
-    }
-
-    fn pseudo_element_box_slot(&self, which: WhichPseudoElement) -> BoxSlot<'dom> {
-        let data = self.layout_data_mut();
-        let cell = match which {
-            WhichPseudoElement::Before => &data.pseudo_before_box,
-            WhichPseudoElement::After => &data.pseudo_after_box,
-        };
-        BoxSlot::new(cell.clone())
-    }
-
-    fn unset_pseudo_element_box(self, which: WhichPseudoElement) {
-        let data = self.layout_data_mut();
-        let cell = match which {
-            WhichPseudoElement::Before => &data.pseudo_before_box,
-            WhichPseudoElement::After => &data.pseudo_after_box,
-        };
-        *cell.borrow_mut() = None;
-    }
-
-    fn unset_all_boxes(self) {
-        let data = self.layout_data_mut();
-        *data.self_box.borrow_mut() = None;
-        *data.pseudo_before_box.borrow_mut() = None;
-        *data.pseudo_after_box.borrow_mut() = None;
-        // Stylo already takes care of removing all layout data
-        // for DOM descendants of elements with `display: none`.
-    }
-}
diff --git a/components/layout_2020/dom_traversal.rs b/components/layout_2020/dom_traversal.rs
deleted file mode 100644
index f7fed5c9154..00000000000
--- a/components/layout_2020/dom_traversal.rs
+++ /dev/null
@@ -1,570 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::borrow::Cow;
-use std::iter::FusedIterator;
-
-use html5ever::{LocalName, local_name};
-use log::warn;
-use script_layout_interface::wrapper_traits::{ThreadSafeLayoutElement, ThreadSafeLayoutNode};
-use script_layout_interface::{LayoutElementType, LayoutNodeType};
-use selectors::Element as SelectorsElement;
-use servo_arc::Arc as ServoArc;
-use style::dom::{TElement, TShadowRoot};
-use style::properties::ComputedValues;
-use style::selector_parser::PseudoElement;
-use style::values::generics::counters::{Content, ContentItem};
-use style::values::specified::Quotes;
-
-use crate::context::LayoutContext;
-use crate::dom::{BoxSlot, LayoutBox, NodeExt};
-use crate::fragment_tree::{BaseFragmentInfo, FragmentFlags, Tag};
-use crate::quotes::quotes_for_lang;
-use crate::replaced::ReplacedContents;
-use crate::style_ext::{Display, DisplayGeneratingBox, DisplayInside, DisplayOutside};
-
-#[derive(Clone, Copy, Debug)]
-pub(crate) enum WhichPseudoElement {
-    Before,
-    After,
-}
-
-/// A data structure used to pass and store related layout information together to
-/// avoid having to repeat the same arguments in argument lists.
-#[derive(Clone)]
-pub(crate) struct NodeAndStyleInfo<Node> {
-    pub node: Option<Node>,
-    pub pseudo_element_type: Option<WhichPseudoElement>,
-    pub style: ServoArc<ComputedValues>,
-}
-
-impl<'dom, Node: NodeExt<'dom>> NodeAndStyleInfo<Node> {
-    fn new_with_pseudo(
-        node: Node,
-        pseudo_element_type: WhichPseudoElement,
-        style: ServoArc<ComputedValues>,
-    ) -> Self {
-        Self {
-            node: Some(node),
-            pseudo_element_type: Some(pseudo_element_type),
-            style,
-        }
-    }
-
-    pub(crate) fn new(node: Node, style: ServoArc<ComputedValues>) -> Self {
-        Self {
-            node: Some(node),
-            pseudo_element_type: None,
-            style,
-        }
-    }
-
-    pub(crate) fn is_single_line_text_input(&self) -> bool {
-        self.node.is_some_and(|node| {
-            node.type_id() == LayoutNodeType::Element(LayoutElementType::HTMLInputElement)
-        })
-    }
-}
-
-impl<Node: Clone> NodeAndStyleInfo<Node> {
-    pub(crate) fn new_anonymous(&self, style: ServoArc<ComputedValues>) -> Self {
-        Self {
-            node: None,
-            pseudo_element_type: self.pseudo_element_type,
-            style,
-        }
-    }
-
-    pub(crate) fn new_replacing_style(&self, style: ServoArc<ComputedValues>) -> Self {
-        Self {
-            node: self.node.clone(),
-            pseudo_element_type: self.pseudo_element_type,
-            style,
-        }
-    }
-}
-
-impl<'dom, Node> From<&NodeAndStyleInfo<Node>> for BaseFragmentInfo
-where
-    Node: NodeExt<'dom>,
-{
-    fn from(info: &NodeAndStyleInfo<Node>) -> Self {
-        let node = match info.node {
-            Some(node) => node,
-            None => return Self::anonymous(),
-        };
-
-        let pseudo = info.pseudo_element_type.map(|pseudo| match pseudo {
-            WhichPseudoElement::Before => PseudoElement::Before,
-            WhichPseudoElement::After => PseudoElement::After,
-        });
-
-        let threadsafe_node = node.to_threadsafe();
-        let mut flags = FragmentFlags::empty();
-
-        if let Some(element) = threadsafe_node.as_html_element() {
-            if element.is_body_element_of_html_element_root() {
-                flags.insert(FragmentFlags::IS_BODY_ELEMENT_OF_HTML_ELEMENT_ROOT);
-            }
-            match element.get_local_name() {
-                &local_name!("br") => {
-                    flags.insert(FragmentFlags::IS_BR_ELEMENT);
-                },
-                &local_name!("table") | &local_name!("th") | &local_name!("td") => {
-                    flags.insert(FragmentFlags::IS_TABLE_TH_OR_TD_ELEMENT);
-                },
-                _ => {},
-            }
-
-            if matches!(
-                element.type_id(),
-                Some(LayoutNodeType::Element(
-                    LayoutElementType::HTMLInputElement | LayoutElementType::HTMLTextAreaElement
-                ))
-            ) {
-                flags.insert(FragmentFlags::IS_TEXT_CONTROL);
-            }
-        };
-
-        Self {
-            tag: Some(Tag::new_pseudo(threadsafe_node.opaque(), pseudo)),
-            flags,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub(super) enum Contents {
-    /// Any kind of content that is not replaced, including the contents of pseudo-elements.
-    NonReplaced(NonReplacedContents),
-    /// Example: an `<img src=…>` element.
-    /// <https://drafts.csswg.org/css2/conform.html#replaced-element>
-    Replaced(ReplacedContents),
-}
-
-#[derive(Debug)]
-#[allow(clippy::enum_variant_names)]
-pub(super) enum NonReplacedContents {
-    /// Refers to a DOM subtree, plus `::before` and `::after` pseudo-elements.
-    OfElement,
-    /// Content of a `::before` or `::after` pseudo-element that is being generated.
-    /// <https://drafts.csswg.org/css2/generate.html#content>
-    OfPseudoElement(Vec<PseudoElementContentItem>),
-    /// Workaround for input and textarea element until we properly implement `display-inside`.
-    OfTextControl,
-}
-
-#[derive(Debug)]
-pub(super) enum PseudoElementContentItem {
-    Text(String),
-    Replaced(ReplacedContents),
-}
-
-pub(super) trait TraversalHandler<'dom, Node>
-where
-    Node: 'dom,
-{
-    fn handle_text(&mut self, info: &NodeAndStyleInfo<Node>, text: Cow<'dom, str>);
-
-    /// Or pseudo-element
-    fn handle_element(
-        &mut self,
-        info: &NodeAndStyleInfo<Node>,
-        display: DisplayGeneratingBox,
-        contents: Contents,
-        box_slot: BoxSlot<'dom>,
-    );
-}
-
-fn traverse_children_of<'dom, Node>(
-    parent_element: Node,
-    context: &LayoutContext,
-    handler: &mut impl TraversalHandler<'dom, Node>,
-) where
-    Node: NodeExt<'dom>,
-{
-    traverse_pseudo_element(WhichPseudoElement::Before, parent_element, context, handler);
-
-    let is_text_input_element = matches!(
-        parent_element.type_id(),
-        LayoutNodeType::Element(LayoutElementType::HTMLInputElement)
-    );
-
-    let is_textarea_element = matches!(
-        parent_element.type_id(),
-        LayoutNodeType::Element(LayoutElementType::HTMLTextAreaElement)
-    );
-
-    if is_text_input_element || is_textarea_element {
-        let info = NodeAndStyleInfo::new(parent_element, parent_element.style(context));
-
-        if is_text_input_element {
-            // The addition of zero-width space here forces the text input to have an inline formatting
-            // context that might otherwise be trimmed if there's no text. This is important to ensure
-            // that the input element is at least as tall as the line gap of the caret:
-            // <https://drafts.csswg.org/css-ui/#element-with-default-preferred-size>.
-            //
-            // TODO: Is there a less hacky way to do this?
-            handler.handle_text(&info, "\u{200B}".into());
-        }
-
-        handler.handle_text(&info, parent_element.to_threadsafe().node_text_content());
-    }
-
-    if !is_text_input_element && !is_textarea_element {
-        for child in iter_child_nodes(parent_element) {
-            if child.is_text_node() {
-                let info = NodeAndStyleInfo::new(child, child.style(context));
-                handler.handle_text(&info, child.to_threadsafe().node_text_content());
-            } else if child.is_element() {
-                traverse_element(child, context, handler);
-            }
-        }
-    }
-
-    traverse_pseudo_element(WhichPseudoElement::After, parent_element, context, handler);
-}
-
-fn traverse_element<'dom, Node>(
-    element: Node,
-    context: &LayoutContext,
-    handler: &mut impl TraversalHandler<'dom, Node>,
-) where
-    Node: NodeExt<'dom>,
-{
-    let replaced = ReplacedContents::for_element(element, context);
-    let style = element.style(context);
-    match Display::from(style.get_box().display) {
-        Display::None => element.unset_all_boxes(),
-        Display::Contents => {
-            if replaced.is_some() {
-                // `display: content` on a replaced element computes to `display: none`
-                // <https://drafts.csswg.org/css-display-3/#valdef-display-contents>
-                element.unset_all_boxes()
-            } else {
-                element.element_box_slot().set(LayoutBox::DisplayContents);
-                traverse_children_of(element, context, handler)
-            }
-        },
-        Display::GeneratingBox(display) => {
-            let contents = if let Some(replaced) = replaced {
-                Contents::Replaced(replaced)
-            } else if matches!(
-                element.type_id(),
-                LayoutNodeType::Element(
-                    LayoutElementType::HTMLInputElement | LayoutElementType::HTMLTextAreaElement
-                )
-            ) {
-                NonReplacedContents::OfTextControl.into()
-            } else {
-                NonReplacedContents::OfElement.into()
-            };
-            let display = display.used_value_for_contents(&contents);
-            let box_slot = element.element_box_slot();
-            let info = NodeAndStyleInfo::new(element, style);
-            handler.handle_element(&info, display, contents, box_slot);
-        },
-    }
-}
-
-fn traverse_pseudo_element<'dom, Node>(
-    which: WhichPseudoElement,
-    element: Node,
-    context: &LayoutContext,
-    handler: &mut impl TraversalHandler<'dom, Node>,
-) where
-    Node: NodeExt<'dom>,
-{
-    if let Some(style) = pseudo_element_style(which, element, context) {
-        let info = NodeAndStyleInfo::new_with_pseudo(element, which, style);
-        match Display::from(info.style.get_box().display) {
-            Display::None => element.unset_pseudo_element_box(which),
-            Display::Contents => {
-                let items = generate_pseudo_element_content(&info.style, element, context);
-                let box_slot = element.pseudo_element_box_slot(which);
-                box_slot.set(LayoutBox::DisplayContents);
-                traverse_pseudo_element_contents(&info, context, handler, items);
-            },
-            Display::GeneratingBox(display) => {
-                let items = generate_pseudo_element_content(&info.style, element, context);
-                let box_slot = element.pseudo_element_box_slot(which);
-                let contents = NonReplacedContents::OfPseudoElement(items).into();
-                handler.handle_element(&info, display, contents, box_slot);
-            },
-        }
-    } else {
-        element.unset_pseudo_element_box(which)
-    }
-}
-
-fn traverse_pseudo_element_contents<'dom, Node>(
-    info: &NodeAndStyleInfo<Node>,
-    context: &LayoutContext,
-    handler: &mut impl TraversalHandler<'dom, Node>,
-    items: Vec<PseudoElementContentItem>,
-) where
-    Node: NodeExt<'dom>,
-{
-    let mut anonymous_style = None;
-    for item in items {
-        match item {
-            PseudoElementContentItem::Text(text) => handler.handle_text(info, text.into()),
-            PseudoElementContentItem::Replaced(contents) => {
-                let item_style = anonymous_style.get_or_insert_with(|| {
-                    context
-                        .shared_context()
-                        .stylist
-                        .style_for_anonymous::<Node::ConcreteElement>(
-                            &context.shared_context().guards,
-                            &PseudoElement::ServoAnonymousBox,
-                            &info.style,
-                        )
-                });
-                let display_inline = DisplayGeneratingBox::OutsideInside {
-                    outside: DisplayOutside::Inline,
-                    inside: DisplayInside::Flow {
-                        is_list_item: false,
-                    },
-                };
-                // `display` is not inherited, so we get the initial value
-                debug_assert!(
-                    Display::from(item_style.get_box().display) ==
-                        Display::GeneratingBox(display_inline)
-                );
-                let info = info.new_replacing_style(item_style.clone());
-                handler.handle_element(
-                    &info,
-                    display_inline,
-                    Contents::Replaced(contents),
-                    // We don’t keep pointers to boxes generated by contents of pseudo-elements
-                    BoxSlot::dummy(),
-                )
-            },
-        }
-    }
-}
-
-impl Contents {
-    /// Returns true iff the `try_from` impl below would return `Err(_)`
-    pub fn is_replaced(&self) -> bool {
-        matches!(self, Contents::Replaced(_))
-    }
-}
-
-impl From<NonReplacedContents> for Contents {
-    fn from(non_replaced_contents: NonReplacedContents) -> Self {
-        Contents::NonReplaced(non_replaced_contents)
-    }
-}
-
-impl std::convert::TryFrom<Contents> for NonReplacedContents {
-    type Error = &'static str;
-
-    fn try_from(contents: Contents) -> Result<Self, Self::Error> {
-        match contents {
-            Contents::NonReplaced(non_replaced_contents) => Ok(non_replaced_contents),
-            Contents::Replaced(_) => {
-                Err("Tried to covnert a `Contents::Replaced` into `NonReplacedContent`")
-            },
-        }
-    }
-}
-
-impl NonReplacedContents {
-    pub(crate) fn traverse<'dom, Node>(
-        self,
-        context: &LayoutContext,
-        info: &NodeAndStyleInfo<Node>,
-        handler: &mut impl TraversalHandler<'dom, Node>,
-    ) where
-        Node: NodeExt<'dom>,
-    {
-        let node = match info.node {
-            Some(node) => node,
-            None => {
-                warn!("Tried to traverse an anonymous node!");
-                return;
-            },
-        };
-        match self {
-            NonReplacedContents::OfElement | NonReplacedContents::OfTextControl => {
-                traverse_children_of(node, context, handler)
-            },
-            NonReplacedContents::OfPseudoElement(items) => {
-                traverse_pseudo_element_contents(info, context, handler, items)
-            },
-        }
-    }
-}
-
-fn pseudo_element_style<'dom, Node>(
-    which: WhichPseudoElement,
-    element: Node,
-    context: &LayoutContext,
-) -> Option<ServoArc<ComputedValues>>
-where
-    Node: NodeExt<'dom>,
-{
-    match which {
-        WhichPseudoElement::After => element.to_threadsafe().get_pseudo(PseudoElement::After),
-        WhichPseudoElement::Before => element.to_threadsafe().get_pseudo(PseudoElement::Before),
-    }
-    .and_then(|pseudo_element| {
-        let style = pseudo_element.style(context.shared_context());
-        if style.ineffective_content_property() {
-            None
-        } else {
-            Some(style)
-        }
-    })
-}
-
-fn get_quote_from_pair<I, S>(item: &ContentItem<I>, opening: &S, closing: &S) -> String
-where
-    S: ToString + ?Sized,
-{
-    match item {
-        ContentItem::OpenQuote => opening.to_string(),
-        ContentItem::CloseQuote => closing.to_string(),
-        _ => unreachable!("Got an unexpected ContentItem type when processing quotes."),
-    }
-}
-
-/// <https://www.w3.org/TR/CSS2/generate.html#propdef-content>
-fn generate_pseudo_element_content<'dom, Node>(
-    pseudo_element_style: &ComputedValues,
-    element: Node,
-    context: &LayoutContext,
-) -> Vec<PseudoElementContentItem>
-where
-    Node: NodeExt<'dom>,
-{
-    match &pseudo_element_style.get_counters().content {
-        Content::Items(items) => {
-            let mut vec = vec![];
-            for item in items.items.iter() {
-                match item {
-                    ContentItem::String(s) => {
-                        vec.push(PseudoElementContentItem::Text(s.to_string()));
-                    },
-                    ContentItem::Attr(attr) => {
-                        let element = element
-                            .to_threadsafe()
-                            .as_element()
-                            .expect("Expected an element");
-
-                        // From
-                        // <https://html.spec.whatwg.org/multipage/#case-sensitivity-of-the-css-%27attr%28%29%27-function>
-                        //
-                        // > CSS Values and Units leaves the case-sensitivity of attribute names for
-                        // > the purpose of the `attr()` function to be defined by the host language.
-                        // > [[CSSVALUES]].
-                        // >
-                        // > When comparing the attribute name part of a CSS `attr()`function to the
-                        // > names of namespace-less attributes on HTML elements in HTML documents,
-                        // > the name part of the CSS `attr()` function must first be converted to
-                        // > ASCII lowercase. The same function when compared to other attributes must
-                        // > be compared according to its original case. In both cases, to match the
-                        // > values must be identical to each other (and therefore the comparison is
-                        // > case sensitive).
-                        let attr_name = match element.is_html_element_in_html_document() {
-                            true => &*attr.attribute.to_ascii_lowercase(),
-                            false => &*attr.attribute,
-                        };
-
-                        let attr_val =
-                            element.get_attr(&attr.namespace_url, &LocalName::from(attr_name));
-                        vec.push(PseudoElementContentItem::Text(
-                            attr_val.map_or("".to_string(), |s| s.to_string()),
-                        ));
-                    },
-                    ContentItem::Image(image) => {
-                        if let Some(replaced_content) =
-                            ReplacedContents::from_image(element, context, image)
-                        {
-                            vec.push(PseudoElementContentItem::Replaced(replaced_content));
-                        }
-                    },
-                    ContentItem::OpenQuote | ContentItem::CloseQuote => {
-                        // TODO(xiaochengh): calculate quote depth
-                        let maybe_quote = match &pseudo_element_style.get_list().quotes {
-                            Quotes::QuoteList(quote_list) => {
-                                quote_list.0.first().map(|quote_pair| {
-                                    get_quote_from_pair(
-                                        item,
-                                        &*quote_pair.opening,
-                                        &*quote_pair.closing,
-                                    )
-                                })
-                            },
-                            Quotes::Auto => {
-                                let lang = &pseudo_element_style.get_font()._x_lang;
-                                let quotes = quotes_for_lang(lang.0.as_ref(), 0);
-                                Some(get_quote_from_pair(item, &quotes.opening, &quotes.closing))
-                            },
-                        };
-                        if let Some(quote) = maybe_quote {
-                            vec.push(PseudoElementContentItem::Text(quote));
-                        }
-                    },
-                    ContentItem::Counter(_, _) |
-                    ContentItem::Counters(_, _, _) |
-                    ContentItem::NoOpenQuote |
-                    ContentItem::NoCloseQuote => {
-                        // TODO: Add support for counters and quotes.
-                    },
-                }
-            }
-            vec
-        },
-        Content::Normal | Content::None => unreachable!(),
-    }
-}
-
-pub enum ChildNodeIterator<Node> {
-    /// Iterating over the children of a node
-    Node(Option<Node>),
-    /// Iterating over the assigned nodes of a `HTMLSlotElement`
-    Slottables(<Vec<Node> as IntoIterator>::IntoIter),
-}
-
-#[allow(clippy::unnecessary_to_owned)] // Clippy is wrong.
-pub(crate) fn iter_child_nodes<'dom, Node>(parent: Node) -> ChildNodeIterator<Node>
-where
-    Node: NodeExt<'dom>,
-{
-    if let Some(element) = parent.as_element() {
-        if let Some(shadow) = element.shadow_root() {
-            return iter_child_nodes(shadow.as_node());
-        };
-
-        let slotted_nodes = element.slotted_nodes();
-        if !slotted_nodes.is_empty() {
-            return ChildNodeIterator::Slottables(slotted_nodes.to_owned().into_iter());
-        }
-    }
-
-    let first = parent.first_child();
-    ChildNodeIterator::Node(first)
-}
-
-impl<'dom, Node> Iterator for ChildNodeIterator<Node>
-where
-    Node: NodeExt<'dom>,
-{
-    type Item = Node;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        match self {
-            Self::Node(node) => {
-                let old = *node;
-                *node = old?.next_sibling();
-                old
-            },
-            Self::Slottables(slots) => slots.next(),
-        }
-    }
-}
-
-impl<'dom, Node> FusedIterator for ChildNodeIterator<Node> where Node: NodeExt<'dom> {}
diff --git a/components/layout_2020/flexbox/geom.rs b/components/layout_2020/flexbox/geom.rs
deleted file mode 100644
index 6a302e27486..00000000000
--- a/components/layout_2020/flexbox/geom.rs
+++ /dev/null
@@ -1,271 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-//! <https://drafts.csswg.org/css-flexbox/#box-model>
-
-use style::properties::longhands::flex_direction::computed_value::T as FlexDirection;
-
-use crate::geom::{LogicalRect, LogicalSides, LogicalVec2};
-
-#[derive(Clone, Copy, Debug, Default)]
-pub(super) struct FlexRelativeVec2<T> {
-    pub main: T,
-    pub cross: T,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub(super) struct FlexRelativeSides<T> {
-    pub cross_start: T,
-    pub main_start: T,
-    pub cross_end: T,
-    pub main_end: T,
-}
-
-pub(super) struct FlexRelativeRect<T> {
-    pub start_corner: FlexRelativeVec2<T>,
-    pub size: FlexRelativeVec2<T>,
-}
-
-impl<T> std::ops::Add for FlexRelativeVec2<T>
-where
-    T: std::ops::Add,
-{
-    type Output = FlexRelativeVec2<T::Output>;
-    fn add(self, rhs: Self) -> Self::Output {
-        FlexRelativeVec2 {
-            main: self.main + rhs.main,
-            cross: self.cross + rhs.cross,
-        }
-    }
-}
-
-impl<T> std::ops::Sub for FlexRelativeVec2<T>
-where
-    T: std::ops::Sub,
-{
-    type Output = FlexRelativeVec2<T::Output>;
-    fn sub(self, rhs: Self) -> Self::Output {
-        FlexRelativeVec2 {
-            main: self.main - rhs.main,
-            cross: self.cross - rhs.cross,
-        }
-    }
-}
-
-impl<T> FlexRelativeSides<T> {
-    pub fn sum_by_axis(self) -> FlexRelativeVec2<T::Output>
-    where
-        T: std::ops::Add,
-    {
-        FlexRelativeVec2 {
-            main: self.main_start + self.main_end,
-            cross: self.cross_start + self.cross_end,
-        }
-    }
-}
-
-/// One of the two bits set by the `flex-direction` property
-/// (The other is "forward" v.s. reverse.)
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub(super) enum FlexAxis {
-    /// The main axis is the inline axis of the container (not necessarily of flex items!),
-    /// cross is block.
-    Row,
-    /// The main axis is the block axis, cross is inline.
-    Column,
-}
-
-/// Which flow-relative sides map to the main-start and cross-start sides, respectively.
-/// See <https://drafts.csswg.org/css-flexbox/#box-model>
-#[derive(Clone, Copy, Debug)]
-pub(super) enum MainStartCrossStart {
-    InlineStartBlockStart,
-    InlineStartBlockEnd,
-    BlockStartInlineStart,
-    BlockStartInlineEnd,
-    InlineEndBlockStart,
-    InlineEndBlockEnd,
-    BlockEndInlineStart,
-    BlockEndInlineEnd,
-}
-
-impl FlexAxis {
-    pub fn from(flex_direction: FlexDirection) -> Self {
-        match flex_direction {
-            FlexDirection::Row | FlexDirection::RowReverse => FlexAxis::Row,
-            FlexDirection::Column | FlexDirection::ColumnReverse => FlexAxis::Column,
-        }
-    }
-
-    pub fn vec2_to_flex_relative<T>(self, flow_relative: LogicalVec2<T>) -> FlexRelativeVec2<T> {
-        let LogicalVec2 { inline, block } = flow_relative;
-        match self {
-            FlexAxis::Row => FlexRelativeVec2 {
-                main: inline,
-                cross: block,
-            },
-            FlexAxis::Column => FlexRelativeVec2 {
-                main: block,
-                cross: inline,
-            },
-        }
-    }
-
-    pub fn vec2_to_flow_relative<T>(self, flex_relative: FlexRelativeVec2<T>) -> LogicalVec2<T> {
-        let FlexRelativeVec2 { main, cross } = flex_relative;
-        match self {
-            FlexAxis::Row => LogicalVec2 {
-                inline: main,
-                block: cross,
-            },
-            FlexAxis::Column => LogicalVec2 {
-                block: main,
-                inline: cross,
-            },
-        }
-    }
-}
-
-macro_rules! sides_mapping_methods {
-    (
-        $(
-            $variant: path => {
-                $( $flex_relative_side: ident <=> $flow_relative_side: ident, )+
-            },
-        )+
-    ) => {
-        pub fn sides_to_flex_relative<T>(self, flow_relative: LogicalSides<T>) -> FlexRelativeSides<T> {
-            match self {
-                $(
-                    $variant => FlexRelativeSides {
-                        $( $flex_relative_side: flow_relative.$flow_relative_side, )+
-                    },
-                )+
-            }
-        }
-
-        pub fn sides_to_flow_relative<T>(self, flex_relative: FlexRelativeSides<T>) -> LogicalSides<T> {
-            match self {
-                $(
-                    $variant => LogicalSides {
-                        $( $flow_relative_side: flex_relative.$flex_relative_side, )+
-                    },
-                )+
-            }
-        }
-    }
-}
-
-impl MainStartCrossStart {
-    pub fn from(flex_direction: FlexDirection, flex_wrap_reverse: bool) -> Self {
-        match (flex_direction, flex_wrap_reverse) {
-            // See definition of each keyword in
-            // https://drafts.csswg.org/css-flexbox/#flex-direction-property and
-            // https://drafts.csswg.org/css-flexbox/#flex-wrap-property,
-            // or the tables (though they map to physical rather than flow-relative) at
-            // https://drafts.csswg.org/css-flexbox/#axis-mapping
-            (FlexDirection::Row, true) => MainStartCrossStart::InlineStartBlockEnd,
-            (FlexDirection::Row, false) => MainStartCrossStart::InlineStartBlockStart,
-            (FlexDirection::Column, true) => MainStartCrossStart::BlockStartInlineEnd,
-            (FlexDirection::Column, false) => MainStartCrossStart::BlockStartInlineStart,
-            (FlexDirection::RowReverse, true) => MainStartCrossStart::InlineEndBlockEnd,
-            (FlexDirection::RowReverse, false) => MainStartCrossStart::InlineEndBlockStart,
-            (FlexDirection::ColumnReverse, true) => MainStartCrossStart::BlockEndInlineEnd,
-            (FlexDirection::ColumnReverse, false) => MainStartCrossStart::BlockEndInlineStart,
-        }
-    }
-
-    sides_mapping_methods! {
-        MainStartCrossStart::InlineStartBlockStart => {
-            main_start <=> inline_start,
-            cross_start <=> block_start,
-            main_end <=> inline_end,
-            cross_end <=> block_end,
-        },
-        MainStartCrossStart::InlineStartBlockEnd => {
-            main_start <=> inline_start,
-            cross_start <=> block_end,
-            main_end <=> inline_end,
-            cross_end <=> block_start,
-        },
-        MainStartCrossStart::BlockStartInlineStart => {
-            main_start <=> block_start,
-            cross_start <=> inline_start,
-            main_end <=> block_end,
-            cross_end <=> inline_end,
-        },
-        MainStartCrossStart::BlockStartInlineEnd => {
-            main_start <=> block_start,
-            cross_start <=> inline_end,
-            main_end <=> block_end,
-            cross_end <=> inline_start,
-        },
-        MainStartCrossStart::InlineEndBlockStart => {
-            main_start <=> inline_end,
-            cross_start <=> block_start,
-            main_end <=> inline_start,
-            cross_end <=> block_end,
-        },
-        MainStartCrossStart::InlineEndBlockEnd => {
-            main_start <=> inline_end,
-            cross_start <=> block_end,
-            main_end <=> inline_start,
-            cross_end <=> block_start,
-        },
-        MainStartCrossStart::BlockEndInlineStart => {
-            main_start <=> block_end,
-            cross_start <=> inline_start,
-            main_end <=> block_start,
-            cross_end <=> inline_end,
-        },
-        MainStartCrossStart::BlockEndInlineEnd => {
-            main_start <=> block_end,
-            cross_start <=> inline_end,
-            main_end <=> block_start,
-            cross_end <=> inline_start,
-        },
-    }
-}
-
-/// The start corner coordinates in both the input rectangle and output rectangle
-/// are relative to some “base rectangle” whose size is passed here.
-pub(super) fn rect_to_flow_relative<T>(
-    flex_axis: FlexAxis,
-    main_start_cross_start_sides_are: MainStartCrossStart,
-    base_rect_size: FlexRelativeVec2<T>,
-    rect: FlexRelativeRect<T>,
-) -> LogicalRect<T>
-where
-    T: Copy + std::ops::Add<Output = T> + std::ops::Sub<Output = T>,
-{
-    // First, convert from (start corner, size) to offsets from the edges of the base rectangle
-
-    let end_corner_position = rect.start_corner + rect.size;
-    let end_corner_offsets = base_rect_size - end_corner_position;
-    // No-ops, but hopefully clarifies to human readers:
-    let start_corner_position = rect.start_corner;
-    let start_corner_offsets = start_corner_position;
-
-    // Then, convert to flow-relative using methods above
-    let flow_relative_offsets =
-        main_start_cross_start_sides_are.sides_to_flow_relative(FlexRelativeSides {
-            main_start: start_corner_offsets.main,
-            cross_start: start_corner_offsets.cross,
-            main_end: end_corner_offsets.main,
-            cross_end: end_corner_offsets.cross,
-        });
-    let flow_relative_base_rect_size = flex_axis.vec2_to_flow_relative(base_rect_size);
-
-    // Finally, convert back to (start corner, size)
-    let start_corner = LogicalVec2 {
-        inline: flow_relative_offsets.inline_start,
-        block: flow_relative_offsets.block_start,
-    };
-    let end_corner_position = LogicalVec2 {
-        inline: flow_relative_base_rect_size.inline - flow_relative_offsets.inline_end,
-        block: flow_relative_base_rect_size.block - flow_relative_offsets.block_end,
-    };
-    let size = end_corner_position - start_corner;
-    LogicalRect { start_corner, size }
-}
diff --git a/components/layout_2020/flexbox/layout.rs b/components/layout_2020/flexbox/layout.rs
deleted file mode 100644
index f71f5da6915..00000000000
--- a/components/layout_2020/flexbox/layout.rs
+++ /dev/null
@@ -1,2734 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::cell::{Cell, LazyCell};
-use std::cmp::Ordering;
-
-use app_units::Au;
-use atomic_refcell::AtomicRef;
-use itertools::izip;
-use rayon::iter::{
-    IndexedParallelIterator, IntoParallelRefIterator, ParallelDrainRange, ParallelIterator,
-};
-use style::Zero;
-use style::computed_values::position::T as Position;
-use style::logical_geometry::Direction;
-use style::properties::ComputedValues;
-use style::properties::longhands::align_items::computed_value::T as AlignItems;
-use style::properties::longhands::box_sizing::computed_value::T as BoxSizing;
-use style::properties::longhands::flex_direction::computed_value::T as FlexDirection;
-use style::properties::longhands::flex_wrap::computed_value::T as FlexWrap;
-use style::values::computed::LengthPercentage;
-use style::values::generics::flex::GenericFlexBasis as FlexBasis;
-use style::values::generics::length::LengthPercentageOrNormal;
-use style::values::specified::align::AlignFlags;
-
-use super::geom::{FlexAxis, FlexRelativeRect, FlexRelativeSides, FlexRelativeVec2};
-use super::{FlexContainer, FlexContainerConfig, FlexItemBox, FlexLevelBox};
-use crate::cell::ArcRefCell;
-use crate::context::LayoutContext;
-use crate::formatting_contexts::{Baselines, IndependentFormattingContextContents};
-use crate::fragment_tree::{BoxFragment, CollapsedBlockMargins, Fragment, FragmentFlags};
-use crate::geom::{AuOrAuto, LogicalRect, LogicalSides, LogicalVec2, Size, Sizes};
-use crate::layout_box_base::CacheableLayoutResult;
-use crate::positioned::{
-    AbsolutelyPositionedBox, PositioningContext, PositioningContextLength, relative_adjustement,
-};
-use crate::sizing::{
-    ComputeInlineContentSizes, ContentSizes, InlineContentSizesResult, IntrinsicSizingMode,
-};
-use crate::style_ext::{AspectRatio, Clamp, ComputedValuesExt, ContentBoxSizesAndPBM, LayoutStyle};
-use crate::{
-    ConstraintSpace, ContainingBlock, ContainingBlockSize, IndefiniteContainingBlock,
-    SizeConstraint,
-};
-
-/// Layout parameters and intermediate results about a flex container,
-/// grouped to avoid passing around many parameters
-struct FlexContext<'a> {
-    config: FlexContainerConfig,
-    layout_context: &'a LayoutContext<'a>,
-    positioning_context: &'a mut PositioningContext,
-    containing_block: &'a ContainingBlock<'a>, // For items
-    container_inner_size_constraint: FlexRelativeVec2<SizeConstraint>,
-}
-
-/// A flex item with some intermediate results
-struct FlexItem<'a> {
-    box_: &'a FlexItemBox,
-    content_cross_sizes: Sizes,
-    padding: FlexRelativeSides<Au>,
-    border: FlexRelativeSides<Au>,
-    margin: FlexRelativeSides<AuOrAuto>,
-
-    /// Sum of padding, border, and margin (with `auto` assumed to be zero) in each axis.
-    /// This is the difference between an outer and inner size.
-    pbm_auto_is_zero: FlexRelativeVec2<Au>,
-
-    /// <https://drafts.csswg.org/css-flexbox/#algo-main-item>
-    flex_base_size: Au,
-
-    /// Whether the [`Self::flex_base_size`] comes from a definite `flex-basis`.
-    /// If false and the container main size is also indefinite, percentages in the item's
-    /// content that resolve against its main size should be indefinite.
-    flex_base_size_is_definite: bool,
-
-    /// <https://drafts.csswg.org/css-flexbox/#algo-main-item>
-    hypothetical_main_size: Au,
-
-    /// The used min main size of the flex item.
-    /// <https://drafts.csswg.org/css-flexbox/#min-main-size-property>
-    content_min_main_size: Au,
-
-    /// The used max main size of the flex item.
-    /// <https://drafts.csswg.org/css-flexbox/#max-main-size-property>
-    content_max_main_size: Option<Au>,
-
-    /// This is `align-self`, defaulting to `align-items` if `auto`
-    align_self: AlignItems,
-
-    /// Whether or not the size of this [`FlexItem`] depends on its block constraints.
-    depends_on_block_constraints: bool,
-
-    /// <https://drafts.csswg.org/css-sizing-4/#preferred-aspect-ratio>
-    preferred_aspect_ratio: Option<AspectRatio>,
-
-    /// Whether an [auto](Size::Initial) [preferred](Sizes::preferred)
-    /// [cross size](Self::content_cross_sizes) stretches the item
-    /// to fill the flex container.
-    auto_cross_size_stretches_to_container_size: bool,
-}
-
-/// Child of a FlexContainer. Can either be absolutely positioned, or not. If not,
-/// a placeholder is used and flex content is stored outside of this enum.
-enum FlexContent {
-    AbsolutelyPositionedBox(ArcRefCell<AbsolutelyPositionedBox>),
-    FlexItemPlaceholder,
-}
-
-/// Return type of `FlexItem::layout`
-struct FlexItemLayoutResult {
-    hypothetical_cross_size: Au,
-    fragments: Vec<Fragment>,
-    positioning_context: PositioningContext,
-
-    // Either the first or the last baseline, depending on ‘align-self’.
-    baseline_relative_to_margin_box: Option<Au>,
-
-    // The content size of this layout. For replaced elements this is known before layout,
-    // but for non-replaced it's only known after layout.
-    content_size: LogicalVec2<Au>,
-
-    // The containing block inline size used to generate this layout.
-    containing_block_inline_size: Au,
-
-    // The containing block block size used to generate this layout.
-    containing_block_block_size: SizeConstraint,
-
-    // Whether or not this layout depended on block constraints.
-    depends_on_block_constraints: bool,
-
-    // Whether or not this layout had a child that dependeded on block constraints.
-    has_child_which_depends_on_block_constraints: bool,
-}
-
-impl FlexItemLayoutResult {
-    fn compatible_with_containing_block_size(&self, containing_block: &ContainingBlock) -> bool {
-        if containing_block.size.inline == self.containing_block_inline_size &&
-            (containing_block.size.block == self.containing_block_block_size ||
-                (!self.depends_on_block_constraints &&
-                    !self.has_child_which_depends_on_block_constraints))
-        {
-            return true;
-        }
-
-        #[cfg(feature = "tracing")]
-        tracing::warn!(
-            name: "NonReplaced stretch cache miss",
-            cached_inline = ?self.containing_block_inline_size,
-            cached_block = ?self.containing_block_block_size,
-            required_inline = ?containing_block.size.inline,
-            required_block = ?containing_block.size.block,
-            depends_on_block_constraints = self.depends_on_block_constraints,
-            has_child_which_depends_on_block_constraints = self.has_child_which_depends_on_block_constraints,
-        );
-
-        false
-    }
-
-    fn compatible_with_containing_block_size_and_content_size(
-        &self,
-        containing_block: &ContainingBlock,
-        size: LogicalVec2<Au>,
-    ) -> bool {
-        size == self.content_size && self.compatible_with_containing_block_size(containing_block)
-    }
-}
-
-/// A data structure to hold all of the information about a flex item that has been placed
-/// into a flex line. This happens once the item is laid out and its line has been determined.
-struct FlexLineItem<'a> {
-    /// The items that are placed in this line.
-    item: FlexItem<'a>,
-
-    /// The layout results of the initial layout pass for a flex line. These may be replaced
-    /// if necessary due to the use of `align-content: stretch` or `align-self: stretch`.
-    layout_result: FlexItemLayoutResult,
-
-    /// The used main size of this item in its line.
-    used_main_size: Au,
-}
-
-impl FlexLineItem<'_> {
-    fn get_or_synthesize_baseline_with_cross_size(&self, cross_size: Au) -> Au {
-        self.layout_result
-            .baseline_relative_to_margin_box
-            .unwrap_or_else(|| {
-                self.item
-                    .synthesized_baseline_relative_to_margin_box(cross_size)
-            })
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    fn collect_fragment(
-        mut self,
-        initial_flex_layout: &InitialFlexLineLayout,
-        item_used_size: FlexRelativeVec2<Au>,
-        item_margin: FlexRelativeSides<Au>,
-        item_main_interval: Au,
-        final_line_cross_size: Au,
-        shared_alignment_baseline: &Option<Au>,
-        flex_context: &mut FlexContext,
-        all_baselines: &mut Baselines,
-        main_position_cursor: &mut Au,
-    ) -> (BoxFragment, PositioningContext) {
-        // https://drafts.csswg.org/css-flexbox/#algo-main-align
-        // “Align the items along the main-axis”
-        *main_position_cursor +=
-            item_margin.main_start + self.item.border.main_start + self.item.padding.main_start;
-        let item_content_main_start_position = *main_position_cursor;
-
-        *main_position_cursor += item_used_size.main +
-            self.item.padding.main_end +
-            self.item.border.main_end +
-            item_margin.main_end +
-            item_main_interval;
-
-        // https://drafts.csswg.org/css-flexbox/#algo-cross-align
-        let item_content_cross_start_position = self.item.align_along_cross_axis(
-            &item_margin,
-            &item_used_size.cross,
-            final_line_cross_size,
-            self.layout_result
-                .baseline_relative_to_margin_box
-                .unwrap_or_default(),
-            shared_alignment_baseline.unwrap_or_default(),
-            flex_context.config.flex_wrap_is_reversed,
-        );
-
-        let start_corner = FlexRelativeVec2 {
-            main: item_content_main_start_position,
-            cross: item_content_cross_start_position,
-        };
-
-        // Need to collect both baselines from baseline participation and other baselines.
-        let final_line_size = FlexRelativeVec2 {
-            main: initial_flex_layout.line_size.main,
-            cross: final_line_cross_size,
-        };
-        let content_rect = flex_context.rect_to_flow_relative(
-            final_line_size,
-            FlexRelativeRect {
-                start_corner,
-                size: item_used_size,
-            },
-        );
-        let margin = flex_context.sides_to_flow_relative(item_margin);
-        let collapsed_margin = CollapsedBlockMargins::from_margin(&margin);
-
-        if let Some(item_baseline) = self.layout_result.baseline_relative_to_margin_box.as_ref() {
-            let item_baseline = *item_baseline + item_content_cross_start_position -
-                self.item.border.cross_start -
-                self.item.padding.cross_start -
-                item_margin.cross_start;
-            all_baselines.first.get_or_insert(item_baseline);
-            all_baselines.last = Some(item_baseline);
-        }
-
-        let mut fragment_info = self.item.box_.base_fragment_info();
-        fragment_info
-            .flags
-            .insert(FragmentFlags::IS_FLEX_OR_GRID_ITEM);
-        if self.item.depends_on_block_constraints {
-            fragment_info.flags.insert(
-                FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM,
-            );
-        }
-        let flags = fragment_info.flags;
-
-        let containing_block = flex_context.containing_block;
-        let container_writing_mode = containing_block.style.writing_mode;
-        let style = self.item.box_.style();
-
-        let mut fragment = BoxFragment::new(
-            fragment_info,
-            style.clone(),
-            self.layout_result.fragments,
-            content_rect.as_physical(Some(flex_context.containing_block)),
-            flex_context
-                .sides_to_flow_relative(self.item.padding)
-                .to_physical(container_writing_mode),
-            flex_context
-                .sides_to_flow_relative(self.item.border)
-                .to_physical(container_writing_mode),
-            margin.to_physical(container_writing_mode),
-            None, /* clearance */
-            collapsed_margin,
-        );
-
-        // If this flex item establishes a containing block for absolutely-positioned
-        // descendants, then lay out any relevant absolutely-positioned children. This
-        // will remove those children from `self.positioning_context`.
-        if style.establishes_containing_block_for_absolute_descendants(flags) {
-            self.layout_result
-                .positioning_context
-                .layout_collected_children(flex_context.layout_context, &mut fragment);
-        }
-
-        if style.clone_position() == Position::Relative {
-            fragment.content_rect.origin += relative_adjustement(style, containing_block)
-                .to_physical_size(containing_block.style.writing_mode)
-        }
-
-        (fragment, self.layout_result.positioning_context)
-    }
-}
-
-/// Once the final cross size of a line is known, the line can go through their final
-/// layout and this the return value. See [`InitialFlexLineLayout::finish_with_final_cross_size`].
-struct FinalFlexLineLayout {
-    /// The final cross size of this flex line.
-    cross_size: Au,
-    /// The [`BoxFragment`]s and [`PositioningContext`]s of all flex items,
-    /// one per flex item in "order-modified document order."
-    item_fragments: Vec<(BoxFragment, PositioningContext)>,
-    /// The 'shared alignment baseline' of this flex line. This is the baseline used for
-    /// baseline-aligned items if there are any, otherwise `None`.
-    shared_alignment_baseline: Option<Au>,
-    /// This is the baseline of the first and last items with compatible writing mode, regardless of
-    /// whether they particpate in baseline alignement. This is used as a fallback baseline for the
-    /// container, if there are no items participating in baseline alignment in the first or last
-    /// flex lines.
-    all_baselines: Baselines,
-}
-
-impl FlexContainerConfig {
-    /// Whether an item with an `auto` preferred cross size needs to be stretched
-    /// to fill the flex container.
-    /// <https://drafts.csswg.org/css-flexbox/#stretched>
-    fn item_with_auto_cross_size_stretches_to_container_size(
-        &self,
-        item_style: &ComputedValues,
-        item_margin: &FlexRelativeSides<AuOrAuto>,
-    ) -> bool {
-        self.container_is_single_line &&
-            item_with_auto_cross_size_stretches_to_line_size(
-                AlignItems(self.resolve_align_self_for_child(item_style)),
-                item_margin,
-            )
-    }
-
-    fn resolve_reversable_flex_alignment(
-        &self,
-        align_flags: AlignFlags,
-        reversed: bool,
-    ) -> AlignFlags {
-        match (align_flags.value(), reversed) {
-            (AlignFlags::FLEX_START, false) => AlignFlags::START | align_flags.flags(),
-            (AlignFlags::FLEX_START, true) => AlignFlags::END | align_flags.flags(),
-            (AlignFlags::FLEX_END, false) => AlignFlags::END | align_flags.flags(),
-            (AlignFlags::FLEX_END, true) => AlignFlags::START | align_flags.flags(),
-            (_, _) => align_flags,
-        }
-    }
-
-    fn resolve_align_self_for_child(&self, child_style: &ComputedValues) -> AlignFlags {
-        self.resolve_reversable_flex_alignment(
-            child_style
-                .resolve_align_self(self.align_items, AlignItems(AlignFlags::STRETCH))
-                .0,
-            self.flex_wrap_is_reversed,
-        )
-    }
-
-    fn resolve_justify_content_for_child(&self) -> AlignFlags {
-        self.resolve_reversable_flex_alignment(
-            self.justify_content.0.primary(),
-            self.flex_direction_is_reversed,
-        )
-    }
-
-    fn sides_to_flex_relative<T>(&self, sides: LogicalSides<T>) -> FlexRelativeSides<T> {
-        self.main_start_cross_start_sides_are
-            .sides_to_flex_relative(sides)
-    }
-
-    fn sides_to_flow_relative<T>(&self, sides: FlexRelativeSides<T>) -> LogicalSides<T> {
-        self.main_start_cross_start_sides_are
-            .sides_to_flow_relative(sides)
-    }
-}
-
-impl FlexContext<'_> {
-    #[inline]
-    fn sides_to_flow_relative<T>(&self, x: FlexRelativeSides<T>) -> LogicalSides<T> {
-        self.config.sides_to_flow_relative(x)
-    }
-
-    #[inline]
-    fn rect_to_flow_relative(
-        &self,
-        base_rect_size: FlexRelativeVec2<Au>,
-        rect: FlexRelativeRect<Au>,
-    ) -> LogicalRect<Au> {
-        super::geom::rect_to_flow_relative(
-            self.config.flex_axis,
-            self.config.main_start_cross_start_sides_are,
-            base_rect_size,
-            rect,
-        )
-    }
-}
-
-#[derive(Debug, Default)]
-struct DesiredFlexFractionAndGrowOrShrinkFactor {
-    desired_flex_fraction: f32,
-    flex_grow_or_shrink_factor: f32,
-}
-
-#[derive(Default)]
-struct FlexItemBoxInlineContentSizesInfo {
-    outer_flex_base_size: Au,
-    content_min_main_size: Au,
-    content_max_main_size: Option<Au>,
-    pbm_auto_is_zero: FlexRelativeVec2<Au>,
-    min_flex_factors: DesiredFlexFractionAndGrowOrShrinkFactor,
-    max_flex_factors: DesiredFlexFractionAndGrowOrShrinkFactor,
-    min_content_main_size_for_multiline_container: Au,
-    depends_on_block_constraints: bool,
-}
-
-impl ComputeInlineContentSizes for FlexContainer {
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(
-            name = "FlexContainer::compute_inline_content_sizes",
-            skip_all,
-            fields(servo_profiling = true),
-            level = "trace",
-        )
-    )]
-    fn compute_inline_content_sizes(
-        &self,
-        layout_context: &LayoutContext,
-        constraint_space: &ConstraintSpace,
-    ) -> InlineContentSizesResult {
-        match self.config.flex_axis {
-            FlexAxis::Row => {
-                self.main_content_sizes(layout_context, &constraint_space.into(), || {
-                    unreachable!(
-                        "Unexpected FlexContext query during row flex intrinsic size calculation."
-                    )
-                })
-            },
-            FlexAxis::Column => self.cross_content_sizes(layout_context, &constraint_space.into()),
-        }
-    }
-}
-
-impl FlexContainer {
-    fn cross_content_sizes(
-        &self,
-        layout_context: &LayoutContext,
-        containing_block_for_children: &IndefiniteContainingBlock,
-    ) -> InlineContentSizesResult {
-        // <https://drafts.csswg.org/css-flexbox/#intrinsic-cross-sizes>
-        assert_eq!(
-            self.config.flex_axis,
-            FlexAxis::Column,
-            "The cross axis should be the inline one"
-        );
-        let mut sizes = ContentSizes::zero();
-        let mut depends_on_block_constraints = false;
-        for kid in self.children.iter() {
-            let kid = &*kid.borrow();
-            match kid {
-                FlexLevelBox::FlexItem(item) => {
-                    // TODO: For the max-content size we should distribute items into
-                    // columns, and sum the column sizes and gaps.
-                    // TODO: Use the proper automatic minimum size.
-                    let ifc = &item.independent_formatting_context;
-                    let result = ifc.outer_inline_content_sizes(
-                        layout_context,
-                        containing_block_for_children,
-                        &LogicalVec2::zero(),
-                        false, /* auto_block_size_stretches_to_containing_block */
-                    );
-                    sizes.max_assign(result.sizes);
-                    depends_on_block_constraints |= result.depends_on_block_constraints;
-                },
-                FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(_) => {},
-            }
-        }
-        InlineContentSizesResult {
-            sizes,
-            depends_on_block_constraints,
-        }
-    }
-
-    fn main_content_sizes<'a>(
-        &self,
-        layout_context: &LayoutContext,
-        containing_block_for_children: &IndefiniteContainingBlock,
-        flex_context_getter: impl Fn() -> &'a FlexContext<'a>,
-    ) -> InlineContentSizesResult {
-        // - TODO: calculate intrinsic cross sizes when container is a column
-        // (and check for ‘writing-mode’?)
-        // - TODO: Collapsed flex items need to be skipped for intrinsic size calculation.
-
-        // <https://drafts.csswg.org/css-flexbox-1/#intrinsic-main-sizes>
-        // > It is calculated, considering only non-collapsed flex items, by:
-        // > 1. For each flex item, subtract its outer flex base size from its max-content
-        // > contribution size.
-        let mut chosen_max_flex_fraction = f32::NEG_INFINITY;
-        let mut chosen_min_flex_fraction = f32::NEG_INFINITY;
-        let mut sum_of_flex_grow_factors = 0.0;
-        let mut sum_of_flex_shrink_factors = 0.0;
-        let mut item_infos = vec![];
-
-        for kid in self.children.iter() {
-            let kid = &*kid.borrow();
-            match kid {
-                FlexLevelBox::FlexItem(item) => {
-                    sum_of_flex_grow_factors += item.style().get_position().flex_grow.0;
-                    sum_of_flex_shrink_factors += item.style().get_position().flex_shrink.0;
-
-                    let info = item.main_content_size_info(
-                        layout_context,
-                        containing_block_for_children,
-                        &self.config,
-                        &flex_context_getter,
-                    );
-
-                    // > 2. Place all flex items into lines of infinite length. Within
-                    // > each line, find the greatest (most positive) desired flex
-                    // > fraction among all the flex items. This is the line’s chosen flex
-                    // > fraction.
-                    chosen_max_flex_fraction =
-                        chosen_max_flex_fraction.max(info.max_flex_factors.desired_flex_fraction);
-                    chosen_min_flex_fraction =
-                        chosen_min_flex_fraction.max(info.min_flex_factors.desired_flex_fraction);
-
-                    item_infos.push(info)
-                },
-                FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(_) => {},
-            }
-        }
-
-        let normalize_flex_fraction = |chosen_flex_fraction| {
-            if chosen_flex_fraction > 0.0 && sum_of_flex_grow_factors < 1.0 {
-                // > 3. If the chosen flex fraction is positive, and the sum of the line’s
-                // > flex grow factors is less than 1, > divide the chosen flex fraction by that
-                // > sum.
-                chosen_flex_fraction / sum_of_flex_grow_factors
-            } else if chosen_flex_fraction < 0.0 && sum_of_flex_shrink_factors < 1.0 {
-                // > If the chosen flex fraction is negative, and the sum of the line’s flex
-                // > shrink factors is less than 1, > multiply the chosen flex fraction by that
-                // > sum.
-                chosen_flex_fraction * sum_of_flex_shrink_factors
-            } else {
-                chosen_flex_fraction
-            }
-        };
-
-        let chosen_min_flex_fraction = normalize_flex_fraction(chosen_min_flex_fraction);
-        let chosen_max_flex_fraction = normalize_flex_fraction(chosen_max_flex_fraction);
-
-        let main_gap = match self.config.flex_axis {
-            FlexAxis::Row => self.style.clone_column_gap(),
-            FlexAxis::Column => self.style.clone_row_gap(),
-        };
-        let main_gap = match main_gap {
-            LengthPercentageOrNormal::LengthPercentage(length_percentage) => {
-                length_percentage.to_used_value(Au::zero())
-            },
-            LengthPercentageOrNormal::Normal => Au::zero(),
-        };
-        let extra_space_from_main_gap = main_gap * (item_infos.len() as i32 - 1);
-        let mut container_max_content_size = extra_space_from_main_gap;
-        let mut container_min_content_size = if self.config.flex_wrap == FlexWrap::Nowrap {
-            extra_space_from_main_gap
-        } else {
-            Au::zero()
-        };
-        let mut container_depends_on_block_constraints = false;
-
-        for FlexItemBoxInlineContentSizesInfo {
-            outer_flex_base_size,
-            content_min_main_size,
-            content_max_main_size,
-            pbm_auto_is_zero,
-            min_flex_factors,
-            max_flex_factors,
-            min_content_main_size_for_multiline_container,
-            depends_on_block_constraints,
-        } in item_infos.iter()
-        {
-            // > 4. Add each item’s flex base size to the product of its flex grow factor (scaled flex shrink
-            // > factor, if shrinking) and the chosen flex fraction, then clamp that result by the max main size
-            // > floored by the min main size.
-            let outer_min_main_size = *content_min_main_size + pbm_auto_is_zero.main;
-            let outer_max_main_size = content_max_main_size.map(|v| v + pbm_auto_is_zero.main);
-
-            // > 5. The flex container’s max-content size is the largest sum (among all the lines) of the
-            // > afore-calculated sizes of all items within a single line.
-            container_max_content_size += (*outer_flex_base_size +
-                Au::from_f32_px(
-                    max_flex_factors.flex_grow_or_shrink_factor * chosen_max_flex_fraction,
-                ))
-            .clamp_between_extremums(outer_min_main_size, outer_max_main_size);
-
-            // > The min-content main size of a single-line flex container is calculated
-            // > identically to the max-content main size, except that the flex items’
-            // > min-content contributions are used instead of their max-content contributions.
-            //
-            // > However, for a multi-line container, the min-content main size is simply the
-            // > largest min-content contribution of all the non-collapsed flex items in the
-            // > flex container. For this purpose, each item’s contribution is capped by the
-            // > item’s flex base size if the item is not growable, floored by the item’s flex
-            // > base size if the item is not shrinkable, and then further clamped by the item’s
-            // > min and max main sizes.
-            if self.config.flex_wrap == FlexWrap::Nowrap {
-                container_min_content_size += (*outer_flex_base_size +
-                    Au::from_f32_px(
-                        min_flex_factors.flex_grow_or_shrink_factor * chosen_min_flex_fraction,
-                    ))
-                .clamp_between_extremums(outer_min_main_size, outer_max_main_size);
-            } else {
-                container_min_content_size
-                    .max_assign(*min_content_main_size_for_multiline_container);
-            }
-
-            container_depends_on_block_constraints |= depends_on_block_constraints;
-        }
-
-        InlineContentSizesResult {
-            sizes: ContentSizes {
-                min_content: container_min_content_size,
-                max_content: container_max_content_size,
-            },
-            depends_on_block_constraints: container_depends_on_block_constraints,
-        }
-    }
-
-    /// <https://drafts.csswg.org/css-flexbox/#layout-algorithm>
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(
-            name = "FlexContainer::layout",
-            skip_all,
-            fields(servo_profiling = true, self_address = self as *const _ as usize),
-            level = "trace",
-        )
-    )]
-    pub(crate) fn layout(
-        &self,
-        layout_context: &LayoutContext,
-        positioning_context: &mut PositioningContext,
-        containing_block: &ContainingBlock,
-        depends_on_block_constraints: bool,
-    ) -> CacheableLayoutResult {
-        let depends_on_block_constraints =
-            depends_on_block_constraints || self.config.flex_direction == FlexDirection::Column;
-
-        let mut flex_context = FlexContext {
-            config: self.config.clone(),
-            layout_context,
-            positioning_context,
-            containing_block,
-            // https://drafts.csswg.org/css-flexbox/#definite-sizes
-            container_inner_size_constraint: self.config.flex_axis.vec2_to_flex_relative(
-                LogicalVec2 {
-                    inline: SizeConstraint::Definite(containing_block.size.inline),
-                    block: containing_block.size.block,
-                },
-            ),
-        };
-
-        // “Determine the main size of the flex container”
-        // https://drafts.csswg.org/css-flexbox/#algo-main-container
-        let container_main_size = match self.config.flex_axis {
-            FlexAxis::Row => containing_block.size.inline,
-            FlexAxis::Column => match containing_block.size.block {
-                SizeConstraint::Definite(size) => size,
-                SizeConstraint::MinMax(min, max) => self
-                    .main_content_sizes(layout_context, &containing_block.into(), || &flex_context)
-                    .sizes
-                    .max_content
-                    .clamp_between_extremums(min, max),
-            },
-        };
-
-        // Actual length may be less, but we guess that usually not by a lot
-        let mut flex_items = Vec::with_capacity(self.children.len());
-
-        // Absolutely-positioned children of the flex container may be interleaved
-        // with flex items. We need to preserve their relative order for correct painting order,
-        // which is the order of `Fragment`s in this function’s return value.
-        //
-        // Example:
-        // absolutely_positioned_items_with_original_order = [Some(item), Some(item), None, Some(item), None]
-        // flex_items                                      =                         [item,             item]
-        let absolutely_positioned_items_with_original_order = self
-            .children
-            .iter()
-            .map(|arcrefcell| {
-                let borrowed = arcrefcell.borrow();
-                match &*borrowed {
-                    FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(absolutely_positioned) => {
-                        FlexContent::AbsolutelyPositionedBox(absolutely_positioned.clone())
-                    },
-                    FlexLevelBox::FlexItem(_) => {
-                        let item = AtomicRef::map(borrowed, |child| match child {
-                            FlexLevelBox::FlexItem(item) => item,
-                            _ => unreachable!(),
-                        });
-                        flex_items.push(item);
-                        FlexContent::FlexItemPlaceholder
-                    },
-                }
-            })
-            .collect::<Vec<_>>();
-
-        let flex_item_boxes = flex_items.iter().map(|child| &**child);
-        let flex_items = flex_item_boxes
-            .map(|flex_item_box| FlexItem::new(&flex_context, flex_item_box))
-            .collect::<Vec<_>>();
-
-        let row_gap = self.style.clone_row_gap();
-        let column_gap = self.style.clone_column_gap();
-        let (cross_gap, main_gap) = match flex_context.config.flex_axis {
-            FlexAxis::Row => (row_gap, column_gap),
-            FlexAxis::Column => (column_gap, row_gap),
-        };
-        let cross_gap = match cross_gap {
-            LengthPercentageOrNormal::LengthPercentage(length_percent) => length_percent
-                .maybe_to_used_value(
-                    flex_context
-                        .container_inner_size_constraint
-                        .cross
-                        .to_definite(),
-                )
-                .unwrap_or_default(),
-            LengthPercentageOrNormal::Normal => Au::zero(),
-        };
-        let main_gap = match main_gap {
-            LengthPercentageOrNormal::LengthPercentage(length_percent) => length_percent
-                .maybe_to_used_value(
-                    flex_context
-                        .container_inner_size_constraint
-                        .main
-                        .to_definite(),
-                )
-                .unwrap_or_default(),
-            LengthPercentageOrNormal::Normal => Au::zero(),
-        };
-
-        // “Resolve the flexible lengths of all the flex items to find their *used main size*.”
-        // https://drafts.csswg.org/css-flexbox/#algo-flex
-        let initial_line_layouts = do_initial_flex_line_layout(
-            &mut flex_context,
-            container_main_size,
-            flex_items,
-            main_gap,
-        );
-
-        let line_count = initial_line_layouts.len();
-        let content_cross_size = initial_line_layouts
-            .iter()
-            .map(|layout| layout.line_size.cross)
-            .sum::<Au>() +
-            cross_gap * (line_count as i32 - 1);
-
-        // https://drafts.csswg.org/css-flexbox/#algo-cross-container
-        let container_cross_size = match flex_context.container_inner_size_constraint.cross {
-            SizeConstraint::Definite(cross_size) => cross_size,
-            SizeConstraint::MinMax(min, max) => {
-                content_cross_size.clamp_between_extremums(min, max)
-            },
-        };
-
-        let container_size = FlexRelativeVec2 {
-            main: container_main_size,
-            cross: container_cross_size,
-        };
-        let content_block_size = flex_context
-            .config
-            .flex_axis
-            .vec2_to_flow_relative(container_size)
-            .block;
-
-        let mut remaining_free_cross_space =
-            match flex_context.container_inner_size_constraint.cross {
-                SizeConstraint::Definite(cross_size) => cross_size - content_cross_size,
-                _ => Au::zero(),
-            };
-
-        // Implement fallback alignment.
-        //
-        // In addition to the spec at https://www.w3.org/TR/css-align-3/ this implementation follows
-        // the resolution of https://github.com/w3c/csswg-drafts/issues/10154
-        let num_lines = initial_line_layouts.len();
-        let resolved_align_content: AlignFlags = {
-            // Computed value from the style system
-            let align_content_style = flex_context.config.align_content.0.primary();
-            let mut is_safe = align_content_style.flags() == AlignFlags::SAFE;
-
-            // From https://drafts.csswg.org/css-align/#distribution-flex
-            // > `normal` behaves as `stretch`.
-            let mut resolved_align_content = match align_content_style.value() {
-                AlignFlags::NORMAL => AlignFlags::STRETCH,
-                align_content => align_content,
-            };
-
-            // From https://drafts.csswg.org/css-flexbox/#algo-line-align:
-            // > Some alignments can only be fulfilled in certain situations or are
-            // > limited in how much space they can consume; for example, space-between
-            // > can only operate when there is more than one alignment subject, and
-            // > baseline alignment, once fulfilled, might not be enough to absorb all
-            // > the excess space. In these cases a fallback alignment takes effect (as
-            // > defined below) to fully consume the excess space.
-            let fallback_is_needed = match resolved_align_content {
-                _ if remaining_free_cross_space <= Au::zero() => true,
-                AlignFlags::STRETCH => num_lines < 1,
-                AlignFlags::SPACE_BETWEEN | AlignFlags::SPACE_AROUND | AlignFlags::SPACE_EVENLY => {
-                    num_lines < 2
-                },
-                _ => false,
-            };
-
-            if fallback_is_needed {
-                (resolved_align_content, is_safe) = match resolved_align_content {
-                    AlignFlags::STRETCH => (AlignFlags::FLEX_START, true),
-                    AlignFlags::SPACE_BETWEEN => (AlignFlags::FLEX_START, true),
-                    AlignFlags::SPACE_AROUND => (AlignFlags::CENTER, true),
-                    AlignFlags::SPACE_EVENLY => (AlignFlags::CENTER, true),
-                    _ => (resolved_align_content, is_safe),
-                }
-            };
-
-            // 2. If free space is negative the "safe" alignment variants all fallback to Start alignment
-            if remaining_free_cross_space <= Au::zero() && is_safe {
-                resolved_align_content = AlignFlags::START;
-            }
-
-            resolved_align_content
-        };
-
-        // Implement "unsafe" alignment. "safe" alignment is handled by the fallback process above.
-        let flex_wrap_is_reversed = flex_context.config.flex_wrap_is_reversed;
-        let resolved_align_content = self
-            .config
-            .resolve_reversable_flex_alignment(resolved_align_content, flex_wrap_is_reversed);
-        let mut cross_start_position_cursor = match resolved_align_content {
-            AlignFlags::START if flex_wrap_is_reversed => remaining_free_cross_space,
-            AlignFlags::START => Au::zero(),
-            AlignFlags::END if flex_wrap_is_reversed => Au::zero(),
-            AlignFlags::END => remaining_free_cross_space,
-            AlignFlags::CENTER => remaining_free_cross_space / 2,
-            AlignFlags::STRETCH => Au::zero(),
-            AlignFlags::SPACE_BETWEEN => Au::zero(),
-            AlignFlags::SPACE_AROUND => remaining_free_cross_space / num_lines as i32 / 2,
-            AlignFlags::SPACE_EVENLY => remaining_free_cross_space / (num_lines as i32 + 1),
-
-            // TODO: Implement all alignments. Note: not all alignment values are valid for content distribution
-            _ => Au::zero(),
-        };
-
-        let inline_axis_is_main_axis = self.config.flex_axis == FlexAxis::Row;
-        let mut baseline_alignment_participating_baselines = Baselines::default();
-        let mut all_baselines = Baselines::default();
-        let flex_item_fragments: Vec<_> = initial_line_layouts
-            .into_iter()
-            .enumerate()
-            .flat_map(|(index, initial_line_layout)| {
-                // We call `allocate_free_cross_space_for_flex_line` for each line to avoid having
-                // leftover space when the number of lines doesn't evenly divide the total free space,
-                // considering the precision of app units.
-                let (space_to_add_to_line, space_to_add_after_line) =
-                    allocate_free_cross_space_for_flex_line(
-                        resolved_align_content,
-                        remaining_free_cross_space,
-                        (num_lines - index) as i32,
-                    );
-                remaining_free_cross_space -= space_to_add_to_line + space_to_add_after_line;
-
-                let final_line_cross_size =
-                    initial_line_layout.line_size.cross + space_to_add_to_line;
-                let mut final_line_layout = initial_line_layout.finish_with_final_cross_size(
-                    &mut flex_context,
-                    main_gap,
-                    final_line_cross_size,
-                );
-
-                let line_cross_start_position = cross_start_position_cursor;
-                cross_start_position_cursor = line_cross_start_position +
-                    final_line_cross_size +
-                    space_to_add_after_line +
-                    cross_gap;
-
-                let flow_relative_line_position =
-                    match (self.config.flex_axis, flex_wrap_is_reversed) {
-                        (FlexAxis::Row, false) => LogicalVec2 {
-                            block: line_cross_start_position,
-                            inline: Au::zero(),
-                        },
-                        (FlexAxis::Row, true) => LogicalVec2 {
-                            block: container_cross_size -
-                                line_cross_start_position -
-                                final_line_layout.cross_size,
-                            inline: Au::zero(),
-                        },
-                        (FlexAxis::Column, false) => LogicalVec2 {
-                            block: Au::zero(),
-                            inline: line_cross_start_position,
-                        },
-                        (FlexAxis::Column, true) => LogicalVec2 {
-                            block: Au::zero(),
-                            inline: container_cross_size -
-                                line_cross_start_position -
-                                final_line_cross_size,
-                        },
-                    };
-
-                if inline_axis_is_main_axis {
-                    let line_shared_alignment_baseline = final_line_layout
-                        .shared_alignment_baseline
-                        .map(|baseline| baseline + flow_relative_line_position.block);
-                    if index == 0 {
-                        baseline_alignment_participating_baselines.first =
-                            line_shared_alignment_baseline;
-                    }
-                    if index == num_lines - 1 {
-                        baseline_alignment_participating_baselines.last =
-                            line_shared_alignment_baseline;
-                    }
-                }
-
-                let line_all_baselines = final_line_layout
-                    .all_baselines
-                    .offset(flow_relative_line_position.block);
-                if index == 0 {
-                    all_baselines.first = line_all_baselines.first;
-                }
-                if index == num_lines - 1 {
-                    all_baselines.last = line_all_baselines.last;
-                }
-
-                let physical_line_position =
-                    flow_relative_line_position.to_physical_size(self.style.writing_mode);
-                for (fragment, _) in &mut final_line_layout.item_fragments {
-                    fragment.content_rect.origin += physical_line_position;
-                }
-                final_line_layout.item_fragments
-            })
-            .collect();
-
-        let mut flex_item_fragments = flex_item_fragments.into_iter();
-        let fragments = absolutely_positioned_items_with_original_order
-            .into_iter()
-            .map(|child_as_abspos| match child_as_abspos {
-                FlexContent::AbsolutelyPositionedBox(absolutely_positioned_box) => self
-                    .create_absolutely_positioned_flex_child_fragment(
-                        absolutely_positioned_box,
-                        containing_block,
-                        container_size,
-                        positioning_context,
-                    ),
-                FlexContent::FlexItemPlaceholder => {
-                    // The `flex_item_fragments` iterator yields one fragment
-                    // per flex item, in the original order.
-                    let (fragment, mut child_positioning_context) =
-                        flex_item_fragments.next().unwrap();
-                    let fragment = Fragment::Box(ArcRefCell::new(fragment));
-                    child_positioning_context.adjust_static_position_of_hoisted_fragments(
-                        &fragment,
-                        PositioningContextLength::zero(),
-                    );
-                    positioning_context.append(child_positioning_context);
-                    fragment
-                },
-            })
-            .collect::<Vec<_>>();
-
-        // There should be no more flex items
-        assert!(flex_item_fragments.next().is_none());
-
-        let baselines = Baselines {
-            first: baseline_alignment_participating_baselines
-                .first
-                .or(all_baselines.first),
-            last: baseline_alignment_participating_baselines
-                .last
-                .or(all_baselines.last),
-        };
-
-        CacheableLayoutResult {
-            fragments,
-            content_block_size,
-            content_inline_size_for_table: None,
-            baselines,
-            depends_on_block_constraints,
-            specific_layout_info: None,
-            collapsible_margins_in_children: CollapsedBlockMargins::zero(),
-        }
-    }
-
-    /// Create a absolutely positioned flex child fragment, using the rules the
-    /// specification dictates. This should take into account the alignment and
-    /// justification values of the container and the child to position it within a
-    /// "inset-modified containing block," which may be either the "static-position
-    /// rectangle" that's calculated below or a modified version of the absolute's
-    /// containing block adjusted by the insets specified in the item's style.
-    ///
-    /// From <https://drafts.csswg.org/css-flexbox/#abspos-items>:
-    /// > The cross-axis edges of the static-position rectangle of an
-    /// > absolutely-positioned child of a flex container are the content edges of the
-    /// > flex container The main-axis edges of the static-position rectangle are where
-    /// > the margin edges of the child would be positioned if it were the sole flex item
-    /// > in the flex container, assuming both the child and the flex container were
-    /// > fixed-size boxes of their used size. (For this purpose, auto margins are
-    /// > treated as zero.)
-    fn create_absolutely_positioned_flex_child_fragment(
-        &self,
-        absolutely_positioned_box: ArcRefCell<AbsolutelyPositionedBox>,
-        containing_block: &ContainingBlock,
-        container_size: FlexRelativeVec2<Au>,
-        positioning_context: &mut PositioningContext,
-    ) -> Fragment {
-        let alignment = {
-            let fragment = absolutely_positioned_box.borrow();
-            let make_flex_only_values_directional_for_absolutes =
-                |value: AlignFlags, reversed: bool| match (value.value(), reversed) {
-                    (AlignFlags::NORMAL | AlignFlags::AUTO | AlignFlags::STRETCH, true) => {
-                        AlignFlags::END | AlignFlags::SAFE
-                    },
-                    (AlignFlags::STRETCH, false) => AlignFlags::START | AlignFlags::SAFE,
-                    (AlignFlags::SPACE_BETWEEN, false) => AlignFlags::START | AlignFlags::SAFE,
-                    (AlignFlags::SPACE_BETWEEN, true) => AlignFlags::END | AlignFlags::SAFE,
-                    _ => value,
-                };
-            let cross = make_flex_only_values_directional_for_absolutes(
-                self.config
-                    .resolve_align_self_for_child(fragment.context.style()),
-                self.config.flex_wrap_is_reversed,
-            );
-            let main = make_flex_only_values_directional_for_absolutes(
-                self.config.resolve_justify_content_for_child(),
-                self.config.flex_direction_is_reversed,
-            );
-
-            FlexRelativeVec2 { cross, main }
-        };
-        let logical_alignment = self.config.flex_axis.vec2_to_flow_relative(alignment);
-
-        let static_position_rect = LogicalRect {
-            start_corner: LogicalVec2::zero(),
-            size: self.config.flex_axis.vec2_to_flow_relative(container_size),
-        }
-        .as_physical(Some(containing_block));
-
-        let hoisted_box = AbsolutelyPositionedBox::to_hoisted(
-            absolutely_positioned_box,
-            static_position_rect,
-            logical_alignment,
-            self.config.writing_mode,
-        );
-        let hoisted_fragment = hoisted_box.fragment.clone();
-        positioning_context.push(hoisted_box);
-        Fragment::AbsoluteOrFixedPositioned(hoisted_fragment)
-    }
-
-    #[inline]
-    pub(crate) fn layout_style(&self) -> LayoutStyle {
-        LayoutStyle::Default(&self.style)
-    }
-}
-
-/// Align all flex lines per `align-content` according to
-/// <https://drafts.csswg.org/css-flexbox/#algo-line-align>. Returns the space to add to
-/// each line or the space to add after each line.
-fn allocate_free_cross_space_for_flex_line(
-    resolved_align_content: AlignFlags,
-    remaining_free_cross_space: Au,
-    remaining_line_count: i32,
-) -> (Au, Au) {
-    if remaining_free_cross_space == Au::zero() {
-        return (Au::zero(), Au::zero());
-    }
-
-    match resolved_align_content {
-        AlignFlags::START => (Au::zero(), Au::zero()),
-        AlignFlags::FLEX_START => (Au::zero(), Au::zero()),
-        AlignFlags::END => (Au::zero(), Au::zero()),
-        AlignFlags::FLEX_END => (Au::zero(), Au::zero()),
-        AlignFlags::CENTER => (Au::zero(), Au::zero()),
-        AlignFlags::STRETCH => (
-            remaining_free_cross_space / remaining_line_count,
-            Au::zero(),
-        ),
-        AlignFlags::SPACE_BETWEEN => {
-            if remaining_line_count > 1 {
-                (
-                    Au::zero(),
-                    remaining_free_cross_space / (remaining_line_count - 1),
-                )
-            } else {
-                (Au::zero(), Au::zero())
-            }
-        },
-        AlignFlags::SPACE_AROUND => (
-            Au::zero(),
-            remaining_free_cross_space / remaining_line_count,
-        ),
-        AlignFlags::SPACE_EVENLY => (
-            Au::zero(),
-            remaining_free_cross_space / (remaining_line_count + 1),
-        ),
-
-        // TODO: Implement all alignments. Note: not all alignment values are valid for content distribution
-        _ => (Au::zero(), Au::zero()),
-    }
-}
-
-impl<'a> FlexItem<'a> {
-    fn new(flex_context: &FlexContext, box_: &'a FlexItemBox) -> Self {
-        let containing_block = IndefiniteContainingBlock::from(flex_context.containing_block);
-        let content_box_sizes_and_pbm = box_
-            .independent_formatting_context
-            .layout_style()
-            .content_box_sizes_and_padding_border_margin(&containing_block);
-        box_.to_flex_item(
-            flex_context.layout_context,
-            &containing_block,
-            &content_box_sizes_and_pbm,
-            &flex_context.config,
-            &|| flex_context,
-        )
-    }
-
-    fn stretches_to_line(&self) -> bool {
-        // Note this returns false for a `stretch` size, because that stretches to the
-        // containing block, not to the flex line.
-        // To be discussed in https://github.com/w3c/csswg-drafts/issues/11784.
-        self.content_cross_sizes.preferred.is_initial() &&
-            item_with_auto_cross_size_stretches_to_line_size(self.align_self, &self.margin)
-    }
-}
-
-fn cross_axis_is_item_block_axis(
-    container_is_horizontal: bool,
-    item_is_horizontal: bool,
-    flex_axis: FlexAxis,
-) -> bool {
-    let item_is_orthogonal = item_is_horizontal != container_is_horizontal;
-    let container_is_row = flex_axis == FlexAxis::Row;
-
-    container_is_row ^ item_is_orthogonal
-}
-
-/// Whether an item with an `auto` preferred cross size will stretched to fill the cross size of its flex line.
-/// <https://drafts.csswg.org/css-flexbox/#stretched>
-fn item_with_auto_cross_size_stretches_to_line_size(
-    align_self: AlignItems,
-    margin: &FlexRelativeSides<AuOrAuto>,
-) -> bool {
-    align_self.0.value() == AlignFlags::STRETCH &&
-        !margin.cross_start.is_auto() &&
-        !margin.cross_end.is_auto()
-}
-
-/// “Collect flex items into flex lines”
-/// <https://drafts.csswg.org/css-flexbox/#algo-line-break>
-fn do_initial_flex_line_layout<'items>(
-    flex_context: &mut FlexContext,
-    container_main_size: Au,
-    mut items: Vec<FlexItem<'items>>,
-    main_gap: Au,
-) -> Vec<InitialFlexLineLayout<'items>> {
-    let construct_line = |(items, outer_hypothetical_main_size)| {
-        InitialFlexLineLayout::new(
-            flex_context,
-            items,
-            outer_hypothetical_main_size,
-            container_main_size,
-            main_gap,
-        )
-    };
-
-    if flex_context.config.container_is_single_line {
-        let outer_hypothetical_main_sizes_sum = items
-            .iter()
-            .map(|item| item.hypothetical_main_size + item.pbm_auto_is_zero.main)
-            .sum();
-        return vec![construct_line((items, outer_hypothetical_main_sizes_sum))];
-    }
-
-    let mut lines = Vec::new();
-    let mut line_size_so_far = Au::zero();
-    let mut line_so_far_is_empty = true;
-    let mut index = 0;
-
-    while let Some(item) = items.get(index) {
-        let item_size = item.hypothetical_main_size + item.pbm_auto_is_zero.main;
-        let mut line_size_would_be = line_size_so_far + item_size;
-        if !line_so_far_is_empty {
-            line_size_would_be += main_gap;
-        }
-        let item_fits = line_size_would_be <= container_main_size;
-        if item_fits || line_so_far_is_empty {
-            line_size_so_far = line_size_would_be;
-            line_so_far_is_empty = false;
-            index += 1;
-            continue;
-        }
-
-        // We found something that doesn’t fit. This line ends *before* this item.
-        let remaining = items.split_off(index);
-        lines.push((items, line_size_so_far));
-        items = remaining;
-
-        // The next line has this item.
-        line_size_so_far = item_size;
-        index = 1;
-    }
-
-    // We didn't reach the end of the last line, so add all remaining items there.
-    lines.push((items, line_size_so_far));
-
-    lines.par_drain(..).map(construct_line).collect()
-}
-
-/// The result of splitting the flex items into lines using their intrinsic sizes and doing an
-/// initial layout of each item. A final layout still needs to happen after this is produced to
-/// handle stretching.
-struct InitialFlexLineLayout<'a> {
-    /// The items that are placed in this line.
-    items: Vec<FlexLineItem<'a>>,
-
-    /// The initial size of this flex line, not taking into account `align-content: stretch`.
-    line_size: FlexRelativeVec2<Au>,
-
-    /// The free space available to this line after the initial layout.
-    free_space_in_main_axis: Au,
-}
-
-impl InitialFlexLineLayout<'_> {
-    fn new<'items>(
-        flex_context: &FlexContext,
-        items: Vec<FlexItem<'items>>,
-        outer_hypothetical_main_sizes_sum: Au,
-        container_main_size: Au,
-        main_gap: Au,
-    ) -> InitialFlexLineLayout<'items> {
-        let item_count = items.len();
-        let (item_used_main_sizes, free_space_in_main_axis) = Self::resolve_flexible_lengths(
-            &items,
-            outer_hypothetical_main_sizes_sum,
-            container_main_size - main_gap * (item_count as i32 - 1),
-        );
-
-        // https://drafts.csswg.org/css-flexbox/#algo-cross-item
-        let layout_results = items
-            .par_iter()
-            .zip(&item_used_main_sizes)
-            .map(|(item, used_main_size)| {
-                item.layout(*used_main_size, flex_context, None, None)
-                    .unwrap()
-            })
-            .collect::<Vec<_>>();
-
-        let items: Vec<_> = izip!(
-            items.into_iter(),
-            layout_results.into_iter(),
-            item_used_main_sizes.into_iter()
-        )
-        .map(|(item, layout_result, used_main_size)| FlexLineItem {
-            item,
-            layout_result,
-            used_main_size,
-        })
-        .collect();
-
-        // https://drafts.csswg.org/css-flexbox/#algo-cross-line
-        let line_cross_size = Self::cross_size(&items, flex_context);
-        let line_size = FlexRelativeVec2 {
-            main: container_main_size,
-            cross: line_cross_size,
-        };
-
-        InitialFlexLineLayout {
-            items,
-            line_size,
-            free_space_in_main_axis,
-        }
-    }
-
-    /// Return the *main size* of each item, and the line’s remainaing free space
-    /// <https://drafts.csswg.org/css-flexbox/#resolve-flexible-lengths>
-    fn resolve_flexible_lengths<'items>(
-        items: &'items [FlexItem<'items>],
-        outer_hypothetical_main_sizes_sum: Au,
-        container_main_size: Au,
-    ) -> (Vec<Au>, Au) {
-        struct FlexibleLengthResolutionItem<'items> {
-            item: &'items FlexItem<'items>,
-            frozen: Cell<bool>,
-            target_main_size: Cell<Au>,
-            flex_factor: f32,
-        }
-
-        // > 1. Determine the used flex factor. Sum the outer hypothetical main sizes of all
-        // > items on the line. If the sum is less than the flex container’s inner main
-        // > size, use the flex grow factor for the rest of this algorithm; otherwise, use
-        // > the flex shrink factor.
-        let grow = outer_hypothetical_main_sizes_sum < container_main_size;
-
-        let mut frozen_count = 0;
-        let items: Vec<_> = items
-            .iter()
-            .map(|item| {
-                // > 2. Each item in the flex line has a target main size, initially set to its
-                // > flex base size. Each item is initially unfrozen and may become frozen.
-                let target_main_size = Cell::new(item.flex_base_size);
-
-                // > 3. Size inflexible items. Freeze, setting its target main size to its hypothetical main size…
-                // > - any item that has a flex factor of zero
-                // > - if using the flex grow factor: any item that has a flex base size
-                // >   greater than its hypothetical main size
-                // > - if using the flex shrink factor: any item that has a flex base size
-                // >   smaller than its hypothetical main size
-                let flex_factor = if grow {
-                    item.box_.style().get_position().flex_grow.0
-                } else {
-                    item.box_.style().get_position().flex_shrink.0
-                };
-
-                let is_inflexible = flex_factor == 0. ||
-                    if grow {
-                        item.flex_base_size > item.hypothetical_main_size
-                    } else {
-                        item.flex_base_size < item.hypothetical_main_size
-                    };
-
-                let frozen = Cell::new(false);
-                if is_inflexible {
-                    frozen_count += 1;
-                    frozen.set(true);
-                    target_main_size.set(item.hypothetical_main_size);
-                }
-
-                FlexibleLengthResolutionItem {
-                    item,
-                    frozen,
-                    target_main_size,
-                    flex_factor,
-                }
-            })
-            .collect();
-
-        let unfrozen_items = || items.iter().filter(|item| !item.frozen.get());
-        let main_sizes = |items: Vec<FlexibleLengthResolutionItem>| {
-            items
-                .into_iter()
-                .map(|item| item.target_main_size.get())
-                .collect()
-        };
-
-        // https://drafts.csswg.org/css-flexbox/#initial-free-space
-        // > 4. Calculate initial free space. Sum the outer sizes of all items on the line, and
-        // > subtract this from the flex container’s inner main size. For frozen items, use
-        // > their outer target main size; for other items, use their outer flex base size.
-        let free_space = |all_items_frozen| {
-            let items_size = items
-                .iter()
-                .map(|item| {
-                    item.item.pbm_auto_is_zero.main +
-                        if all_items_frozen || item.frozen.get() {
-                            item.target_main_size.get()
-                        } else {
-                            item.item.flex_base_size
-                        }
-                })
-                .sum();
-            container_main_size - items_size
-        };
-
-        let initial_free_space = free_space(false);
-        loop {
-            // https://drafts.csswg.org/css-flexbox/#remaining-free-space
-            let mut remaining_free_space = free_space(false);
-            // > 5. a. Check for flexible items. If all the flex items on the line are
-            // >       frozen, free space has been distributed; exit this loop.
-            if frozen_count >= items.len() {
-                return (main_sizes(items), remaining_free_space);
-            }
-
-            // > 5. b. Calculate the remaining free space as for initial free space, above. If the
-            // > sum of the unfrozen flex items’ flex factors is less than one, multiply the
-            // > initial free space by this sum. If the magnitude of this value is less than
-            // > the magnitude of the remaining free space, use this as the remaining free
-            // > space.
-            let unfrozen_items_flex_factor_sum =
-                unfrozen_items().map(|item| item.flex_factor).sum();
-            if unfrozen_items_flex_factor_sum < 1. {
-                let multiplied = initial_free_space.scale_by(unfrozen_items_flex_factor_sum);
-                if multiplied.abs() < remaining_free_space.abs() {
-                    remaining_free_space = multiplied
-                }
-            }
-
-            // > 5. c. If the remaining free space is non-zero, distribute it proportional
-            // to the flex factors:
-            //
-            // FIXME: is it a problem if floating point precision errors accumulate
-            // and we get not-quite-zero remaining free space when we should get zero here?
-            if remaining_free_space != Au::zero() {
-                // > If using the flex grow factor:
-                // > For every unfrozen item on the line, find the ratio of the item’s flex grow factor to
-                // > the sum of the flex grow factors of all unfrozen items on the line. Set the item’s
-                // > target main size to its flex base size plus a fraction of the remaining free space
-                // > proportional to the ratio.
-                if grow {
-                    for item in unfrozen_items() {
-                        let ratio = item.flex_factor / unfrozen_items_flex_factor_sum;
-                        item.target_main_size
-                            .set(item.item.flex_base_size + remaining_free_space.scale_by(ratio));
-                    }
-                // > If using the flex shrink factor
-                // > For every unfrozen item on the line, multiply its flex shrink factor by its inner flex
-                // > base size, and note this as its scaled flex shrink factor. Find the ratio of the
-                // > item’s scaled flex shrink factor to the sum of the scaled flex shrink factors of all
-                // > unfrozen items on the line. Set the item’s target main size to its flex base size
-                // > minus a fraction of the absolute value of the remaining free space proportional to the
-                // > ratio. Note this may result in a negative inner main size; it will be corrected in the
-                // > next step.
-                } else {
-                    // https://drafts.csswg.org/css-flexbox/#scaled-flex-shrink-factor
-                    let scaled_shrink_factor = |item: &FlexibleLengthResolutionItem| {
-                        item.item.flex_base_size.scale_by(item.flex_factor)
-                    };
-                    let scaled_shrink_factors_sum: Au =
-                        unfrozen_items().map(scaled_shrink_factor).sum();
-                    if scaled_shrink_factors_sum > Au::zero() {
-                        for item in unfrozen_items() {
-                            let ratio = scaled_shrink_factor(item).0 as f32 /
-                                scaled_shrink_factors_sum.0 as f32;
-                            item.target_main_size.set(
-                                item.item.flex_base_size -
-                                    remaining_free_space.abs().scale_by(ratio),
-                            );
-                        }
-                    }
-                }
-            }
-
-            // > 5. d. Fix min/max violations. Clamp each non-frozen item’s target main size
-            // > by its used min and max main sizes and floor its content-box size at zero.
-            // > If the item’s target main size was made smaller by this, it’s a max
-            // > violation. If the item’s target main size was made larger by this, it’s a
-            // > min violation.
-            let violation = |item: &FlexibleLengthResolutionItem| {
-                let size = item.target_main_size.get();
-                let clamped = size.clamp_between_extremums(
-                    item.item.content_min_main_size,
-                    item.item.content_max_main_size,
-                );
-                clamped - size
-            };
-
-            // > 5. e. Freeze over-flexed items. The total violation is the sum of the
-            // > adjustments from the previous step ∑(clamped size - unclamped size). If the
-            // > total violation is:
-            // > - Zero:  Freeze all items.
-            // > - Positive: Freeze all the items with min violations.
-            // > - Negative:  Freeze all the items with max violations.
-            let total_violation: Au = unfrozen_items().map(violation).sum();
-            match total_violation.cmp(&Au::zero()) {
-                Ordering::Equal => {
-                    // “Freeze all items.”
-                    // Return instead, as that’s what the next loop iteration would do.
-                    let remaining_free_space = free_space(true);
-                    return (main_sizes(items), remaining_free_space);
-                },
-                Ordering::Greater => {
-                    // “Freeze all the items with min violations.”
-                    // “If the item’s target main size was made larger by [clamping],
-                    //  it’s a min violation.”
-                    for item in items.iter() {
-                        if violation(item) > Au::zero() {
-                            item.target_main_size.set(item.item.content_min_main_size);
-                            item.frozen.set(true);
-                            frozen_count += 1;
-                        }
-                    }
-                },
-                Ordering::Less => {
-                    // Negative total violation
-                    // “Freeze all the items with max violations.”
-                    // “If the item’s target main size was made smaller by [clamping],
-                    //  it’s a max violation.”
-                    for item in items.iter() {
-                        if violation(item) < Au::zero() {
-                            let Some(max_size) = item.item.content_max_main_size else {
-                                unreachable!()
-                            };
-                            item.target_main_size.set(max_size);
-                            item.frozen.set(true);
-                            frozen_count += 1;
-                        }
-                    }
-                },
-            }
-        }
-    }
-
-    /// <https://drafts.csswg.org/css-flexbox/#algo-cross-line>
-    fn cross_size<'items>(items: &'items [FlexLineItem<'items>], flex_context: &FlexContext) -> Au {
-        if flex_context.config.container_is_single_line {
-            if let SizeConstraint::Definite(size) =
-                flex_context.container_inner_size_constraint.cross
-            {
-                return size;
-            }
-        }
-
-        let mut max_ascent = Au::zero();
-        let mut max_descent = Au::zero();
-        let mut max_outer_hypothetical_cross_size = Au::zero();
-        for item in items.iter() {
-            // TODO: check inline-axis is parallel to main axis, check no auto cross margins
-            if matches!(
-                item.item.align_self.0.value(),
-                AlignFlags::BASELINE | AlignFlags::LAST_BASELINE
-            ) {
-                let baseline = item.get_or_synthesize_baseline_with_cross_size(
-                    item.layout_result.hypothetical_cross_size,
-                );
-                let hypothetical_margin_box_cross_size =
-                    item.layout_result.hypothetical_cross_size + item.item.pbm_auto_is_zero.cross;
-                max_ascent = max_ascent.max(baseline);
-                max_descent = max_descent.max(hypothetical_margin_box_cross_size - baseline);
-            } else {
-                max_outer_hypothetical_cross_size = max_outer_hypothetical_cross_size.max(
-                    item.layout_result.hypothetical_cross_size + item.item.pbm_auto_is_zero.cross,
-                );
-            }
-        }
-
-        // https://drafts.csswg.org/css-flexbox/#baseline-participation
-        let largest = max_outer_hypothetical_cross_size.max(max_ascent + max_descent);
-        match flex_context.container_inner_size_constraint.cross {
-            SizeConstraint::MinMax(min, max) if flex_context.config.container_is_single_line => {
-                largest.clamp_between_extremums(min, max)
-            },
-            _ => largest,
-        }
-    }
-
-    fn finish_with_final_cross_size(
-        mut self,
-        flex_context: &mut FlexContext,
-        main_gap: Au,
-        final_line_cross_size: Au,
-    ) -> FinalFlexLineLayout {
-        // FIXME: Collapse `visibility: collapse` items
-        // This involves “restart layout from the beginning” with a modified second round,
-        // which will make structuring the code… interesting.
-        // https://drafts.csswg.org/css-flexbox/#algo-visibility
-
-        // Distribute any remaining main free space to auto margins according to
-        // https://drafts.csswg.org/css-flexbox/#algo-main-align.
-        let auto_margins_count = self
-            .items
-            .iter()
-            .map(|item| {
-                item.item.margin.main_start.is_auto() as u32 +
-                    item.item.margin.main_end.is_auto() as u32
-            })
-            .sum::<u32>();
-        let (space_distributed_to_auto_main_margins, free_space_in_main_axis) =
-            if self.free_space_in_main_axis > Au::zero() && auto_margins_count > 0 {
-                (
-                    self.free_space_in_main_axis / auto_margins_count as i32,
-                    Au::zero(),
-                )
-            } else {
-                (Au::zero(), self.free_space_in_main_axis)
-            };
-
-        // Determine the used cross size of each flex item
-        // https://drafts.csswg.org/css-flexbox/#algo-stretch
-        let item_count = self.items.len();
-        let mut shared_alignment_baseline = None;
-        let mut item_used_cross_sizes = Vec::with_capacity(item_count);
-        let mut item_margins = Vec::with_capacity(item_count);
-        for item in self.items.iter_mut() {
-            let stretches = item.item.stretches_to_line();
-            let used_cross_size = if stretches {
-                let (axis, content_size) = match flex_context.config.flex_axis {
-                    FlexAxis::Row => (Direction::Block, item.layout_result.content_size.block),
-                    FlexAxis::Column => (Direction::Inline, item.layout_result.content_size.inline),
-                };
-                item.item.content_cross_sizes.resolve(
-                    axis,
-                    Size::Stretch,
-                    Au::zero,
-                    Some(final_line_cross_size - item.item.pbm_auto_is_zero.cross),
-                    || content_size.into(),
-                    // Tables have a special sizing in the block axis in that handles collapsed rows,
-                    // but it would prevent stretching. So we only recognize tables in the inline axis.
-                    // The interaction of collapsed table tracks and the flexbox algorithms is unclear,
-                    // see https://github.com/w3c/csswg-drafts/issues/11408.
-                    item.item.is_table() && axis == Direction::Inline,
-                )
-            } else {
-                item.layout_result.hypothetical_cross_size
-            };
-            item_used_cross_sizes.push(used_cross_size);
-
-            // “If the flex item has `align-self: stretch`, redo layout for its contents,
-            // treating this used size as its definite cross size so that percentage-sized
-            // children can be resolved.”
-            if stretches {
-                let new_layout = item.item.layout(
-                    item.used_main_size,
-                    flex_context,
-                    Some(used_cross_size),
-                    Some(&mut item.layout_result),
-                );
-                if let Some(layout) = new_layout {
-                    item.layout_result = layout;
-                }
-            }
-
-            let baseline = item.get_or_synthesize_baseline_with_cross_size(used_cross_size);
-            if matches!(
-                item.item.align_self.0.value(),
-                AlignFlags::BASELINE | AlignFlags::LAST_BASELINE
-            ) {
-                shared_alignment_baseline =
-                    Some(shared_alignment_baseline.unwrap_or(baseline).max(baseline));
-            }
-            item.layout_result.baseline_relative_to_margin_box = Some(baseline);
-
-            item_margins.push(item.item.resolve_auto_margins(
-                flex_context,
-                final_line_cross_size,
-                used_cross_size,
-                space_distributed_to_auto_main_margins,
-            ));
-        }
-
-        // Align the items along the main-axis per justify-content.
-        // Implement fallback alignment.
-        //
-        // In addition to the spec at https://www.w3.org/TR/css-align-3/ this implementation follows
-        // the resolution of https://github.com/w3c/csswg-drafts/issues/10154
-        let resolved_justify_content: AlignFlags = {
-            let justify_content_style = flex_context.config.justify_content.0.primary();
-
-            // Inital values from the style system
-            let mut resolved_justify_content = justify_content_style.value();
-            let mut is_safe = justify_content_style.flags() == AlignFlags::SAFE;
-
-            // Fallback occurs in two cases:
-
-            // 1. If there is only a single item being aligned and alignment is a distributed alignment keyword
-            //    https://www.w3.org/TR/css-align-3/#distribution-values
-            if item_count <= 1 || free_space_in_main_axis <= Au::zero() {
-                (resolved_justify_content, is_safe) = match resolved_justify_content {
-                    AlignFlags::STRETCH => (AlignFlags::FLEX_START, true),
-                    AlignFlags::SPACE_BETWEEN => (AlignFlags::FLEX_START, true),
-                    AlignFlags::SPACE_AROUND => (AlignFlags::CENTER, true),
-                    AlignFlags::SPACE_EVENLY => (AlignFlags::CENTER, true),
-                    _ => (resolved_justify_content, is_safe),
-                }
-            };
-
-            // 2. If free space is negative the "safe" alignment variants all fallback to Start alignment
-            if free_space_in_main_axis <= Au::zero() && is_safe {
-                resolved_justify_content = AlignFlags::START;
-            }
-
-            resolved_justify_content
-        };
-
-        // Implement "unsafe" alignment. "safe" alignment is handled by the fallback process above.
-        let main_start_position = match resolved_justify_content {
-            AlignFlags::START => Au::zero(),
-            AlignFlags::FLEX_START => {
-                if flex_context.config.flex_direction_is_reversed {
-                    free_space_in_main_axis
-                } else {
-                    Au::zero()
-                }
-            },
-            AlignFlags::END => free_space_in_main_axis,
-            AlignFlags::FLEX_END => {
-                if flex_context.config.flex_direction_is_reversed {
-                    Au::zero()
-                } else {
-                    free_space_in_main_axis
-                }
-            },
-            AlignFlags::CENTER => free_space_in_main_axis / 2,
-            AlignFlags::STRETCH => Au::zero(),
-            AlignFlags::SPACE_BETWEEN => Au::zero(),
-            AlignFlags::SPACE_AROUND => (free_space_in_main_axis / item_count as i32) / 2,
-            AlignFlags::SPACE_EVENLY => free_space_in_main_axis / (item_count + 1) as i32,
-
-            // TODO: Implement all alignments. Note: not all alignment values are valid for content distribution
-            _ => Au::zero(),
-        };
-
-        let item_main_interval = match resolved_justify_content {
-            AlignFlags::START => Au::zero(),
-            AlignFlags::FLEX_START => Au::zero(),
-            AlignFlags::END => Au::zero(),
-            AlignFlags::FLEX_END => Au::zero(),
-            AlignFlags::CENTER => Au::zero(),
-            AlignFlags::STRETCH => Au::zero(),
-            AlignFlags::SPACE_BETWEEN => free_space_in_main_axis / (item_count - 1) as i32,
-            AlignFlags::SPACE_AROUND => free_space_in_main_axis / item_count as i32,
-            AlignFlags::SPACE_EVENLY => free_space_in_main_axis / (item_count + 1) as i32,
-
-            // TODO: Implement all alignments. Note: not all alignment values are valid for content distribution
-            _ => Au::zero(),
-        };
-        let item_main_interval = item_main_interval + main_gap;
-
-        let mut all_baselines = Baselines::default();
-        let mut main_position_cursor = main_start_position;
-
-        let items = std::mem::take(&mut self.items);
-        let item_fragments = izip!(items, item_margins, item_used_cross_sizes.iter())
-            .map(|(item, item_margin, item_used_cross_size)| {
-                let item_used_size = FlexRelativeVec2 {
-                    main: item.used_main_size,
-                    cross: *item_used_cross_size,
-                };
-                item.collect_fragment(
-                    &self,
-                    item_used_size,
-                    item_margin,
-                    item_main_interval,
-                    final_line_cross_size,
-                    &shared_alignment_baseline,
-                    flex_context,
-                    &mut all_baselines,
-                    &mut main_position_cursor,
-                )
-            })
-            .collect();
-
-        FinalFlexLineLayout {
-            cross_size: final_line_cross_size,
-            item_fragments,
-            all_baselines,
-            shared_alignment_baseline,
-        }
-    }
-}
-
-impl FlexItem<'_> {
-    /// Return the hypothetical cross size together with laid out contents of the fragment.
-    /// From <https://drafts.csswg.org/css-flexbox/#algo-cross-item>:
-    /// > performing layout as if it were an in-flow block-level box with the used main
-    /// > size and the given available space, treating `auto` as `fit-content`.
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(
-            name = "FlexItem::layout",
-            skip_all,
-            fields(
-                servo_profiling = true,
-                self_address = self as *const _ as usize,
-                box_address = self.box_ as *const _ as usize,
-                for_stretch = non_stretch_layout_result.is_some(),
-            ),
-            level = "trace",
-        )
-    )]
-    #[allow(clippy::too_many_arguments)]
-    fn layout(
-        &self,
-        used_main_size: Au,
-        flex_context: &FlexContext,
-        used_cross_size_override: Option<Au>,
-        non_stretch_layout_result: Option<&mut FlexItemLayoutResult>,
-    ) -> Option<FlexItemLayoutResult> {
-        let containing_block = flex_context.containing_block;
-        let mut positioning_context = PositioningContext::new_for_style(self.box_.style())
-            .unwrap_or_else(|| {
-                PositioningContext::new_for_subtree(
-                    flex_context
-                        .positioning_context
-                        .collects_for_nearest_positioned_ancestor(),
-                )
-            });
-
-        let independent_formatting_context = &self.box_.independent_formatting_context;
-        let item_writing_mode = independent_formatting_context.style().writing_mode;
-        let item_is_horizontal = item_writing_mode.is_horizontal();
-        let flex_axis = flex_context.config.flex_axis;
-        let cross_axis_is_item_block_axis = cross_axis_is_item_block_axis(
-            containing_block.style.writing_mode.is_horizontal(),
-            item_is_horizontal,
-            flex_axis,
-        );
-
-        let (inline_size, block_size) = if cross_axis_is_item_block_axis {
-            let cross_size = match used_cross_size_override {
-                Some(s) => SizeConstraint::Definite(s),
-                None => {
-                    // This means that an auto size with stretch alignment will behave different than
-                    // a stretch size. That's not what the spec says, but matches other browsers.
-                    // To be discussed in https://github.com/w3c/csswg-drafts/issues/11784.
-                    let stretch_size = containing_block
-                        .size
-                        .block
-                        .to_definite()
-                        .map(|size| Au::zero().max(size - self.pbm_auto_is_zero.cross));
-                    self.content_cross_sizes.resolve_extrinsic(
-                        Size::FitContent,
-                        Au::zero(),
-                        stretch_size,
-                    )
-                },
-            };
-            (used_main_size, cross_size)
-        } else {
-            let cross_size = used_cross_size_override.unwrap_or_else(|| {
-                let automatic_size = if self.auto_cross_size_stretches_to_container_size {
-                    Size::Stretch
-                } else {
-                    Size::FitContent
-                };
-                let stretch_size =
-                    Au::zero().max(containing_block.size.inline - self.pbm_auto_is_zero.cross);
-                let get_content_size = || {
-                    let constraint_space = ConstraintSpace::new(
-                        SizeConstraint::Definite(used_main_size),
-                        item_writing_mode,
-                        self.preferred_aspect_ratio,
-                    );
-                    independent_formatting_context
-                        .inline_content_sizes(flex_context.layout_context, &constraint_space)
-                        .sizes
-                };
-                self.content_cross_sizes.resolve(
-                    Direction::Inline,
-                    automatic_size,
-                    Au::zero,
-                    Some(stretch_size),
-                    get_content_size,
-                    self.is_table(),
-                )
-            });
-            // The main size of a flex item is considered to be definite if its flex basis is definite
-            // or the flex container has a definite main size.
-            // <https://drafts.csswg.org/css-flexbox-1/#definite-sizes>
-            let main_size = if self.flex_base_size_is_definite ||
-                flex_context
-                    .container_inner_size_constraint
-                    .main
-                    .is_definite()
-            {
-                SizeConstraint::Definite(used_main_size)
-            } else {
-                SizeConstraint::default()
-            };
-            (cross_size, main_size)
-        };
-
-        let container_writing_mode = containing_block.style.writing_mode;
-        let item_style = independent_formatting_context.style();
-        match &independent_formatting_context.contents {
-            IndependentFormattingContextContents::Replaced(replaced) => {
-                let min_size = flex_axis.vec2_to_flow_relative(FlexRelativeVec2 {
-                    main: Size::Numeric(self.content_min_main_size),
-                    cross: self.content_cross_sizes.min,
-                });
-                let max_size = flex_axis.vec2_to_flow_relative(FlexRelativeVec2 {
-                    main: self
-                        .content_max_main_size
-                        .map_or(Size::Initial, Size::Numeric),
-                    cross: self.content_cross_sizes.max,
-                });
-                let size = replaced.used_size_as_if_inline_element_from_content_box_sizes(
-                    containing_block,
-                    item_style,
-                    self.preferred_aspect_ratio,
-                    LogicalVec2 {
-                        block: &Sizes::new(
-                            block_size
-                                .to_definite()
-                                .map_or(Size::Initial, Size::Numeric),
-                            min_size.block,
-                            max_size.block,
-                        ),
-                        inline: &Sizes::new(
-                            Size::Numeric(inline_size),
-                            min_size.inline,
-                            max_size.inline,
-                        ),
-                    },
-                    Size::FitContent.into(),
-                    flex_axis.vec2_to_flow_relative(self.pbm_auto_is_zero),
-                );
-
-                if let Some(non_stretch_layout_result) = non_stretch_layout_result {
-                    if non_stretch_layout_result
-                        .compatible_with_containing_block_size_and_content_size(
-                            containing_block,
-                            size,
-                        )
-                    {
-                        return None;
-                    }
-                }
-
-                let hypothetical_cross_size = flex_axis.vec2_to_flex_relative(size).cross;
-                let fragments = replaced.make_fragments(
-                    flex_context.layout_context,
-                    item_style,
-                    size.to_physical_size(container_writing_mode),
-                );
-
-                Some(FlexItemLayoutResult {
-                    hypothetical_cross_size,
-                    fragments,
-                    positioning_context,
-                    content_size: size,
-                    containing_block_inline_size: containing_block.size.inline,
-                    containing_block_block_size: containing_block.size.block,
-                    depends_on_block_constraints: false,
-                    has_child_which_depends_on_block_constraints: false,
-
-                    // We will need to synthesize the baseline, but since the used cross
-                    // size can differ from the hypothetical cross size, we should defer
-                    // synthesizing until needed.
-                    baseline_relative_to_margin_box: None,
-                })
-            },
-            IndependentFormattingContextContents::NonReplaced(non_replaced) => {
-                let item_as_containing_block = ContainingBlock {
-                    size: ContainingBlockSize {
-                        inline: inline_size,
-                        block: block_size,
-                    },
-                    style: item_style,
-                };
-
-                if let Some(non_stretch_layout_result) = non_stretch_layout_result {
-                    if non_stretch_layout_result
-                        .compatible_with_containing_block_size(&item_as_containing_block)
-                    {
-                        return None;
-                    }
-                }
-
-                let layout = non_replaced.layout_with_caching(
-                    flex_context.layout_context,
-                    &mut positioning_context,
-                    &item_as_containing_block,
-                    containing_block,
-                    &independent_formatting_context.base,
-                    flex_axis == FlexAxis::Column ||
-                        self.stretches_to_line() ||
-                        self.depends_on_block_constraints,
-                );
-                let CacheableLayoutResult {
-                    fragments,
-                    content_block_size,
-                    baselines: content_box_baselines,
-                    depends_on_block_constraints,
-                    ..
-                } = layout;
-
-                let has_child_which_depends_on_block_constraints = fragments.iter().any(|fragment| {
-                        fragment.base().is_some_and(|base|
-                                base.flags.contains(
-                                    FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM))
-                });
-
-                let hypothetical_cross_size = if cross_axis_is_item_block_axis {
-                    // This means that an auto size with stretch alignment will behave different than
-                    // a stretch size. That's not what the spec says, but matches other browsers.
-                    // To be discussed in https://github.com/w3c/csswg-drafts/issues/11784.
-                    let stretch_size = containing_block
-                        .size
-                        .block
-                        .to_definite()
-                        .map(|size| Au::zero().max(size - self.pbm_auto_is_zero.cross));
-                    self.content_cross_sizes.resolve(
-                        Direction::Block,
-                        Size::FitContent,
-                        Au::zero,
-                        stretch_size,
-                        || content_block_size.into(),
-                        self.is_table(),
-                    )
-                } else {
-                    inline_size
-                };
-
-                let item_writing_mode_is_orthogonal_to_container_writing_mode =
-                    flex_context.config.writing_mode.is_horizontal() !=
-                        item_style.writing_mode.is_horizontal();
-                let has_compatible_baseline = match flex_axis {
-                    FlexAxis::Row => !item_writing_mode_is_orthogonal_to_container_writing_mode,
-                    FlexAxis::Column => item_writing_mode_is_orthogonal_to_container_writing_mode,
-                };
-
-                let baselines_relative_to_margin_box = if has_compatible_baseline {
-                    content_box_baselines.offset(
-                        self.margin.cross_start.auto_is(Au::zero) +
-                            self.padding.cross_start +
-                            self.border.cross_start,
-                    )
-                } else {
-                    Baselines::default()
-                };
-
-                let baseline_relative_to_margin_box = match self.align_self.0.value() {
-                    // ‘baseline’ computes to ‘first baseline’.
-                    AlignFlags::BASELINE => baselines_relative_to_margin_box.first,
-                    AlignFlags::LAST_BASELINE => baselines_relative_to_margin_box.last,
-                    _ => None,
-                };
-
-                Some(FlexItemLayoutResult {
-                    hypothetical_cross_size,
-                    fragments,
-                    positioning_context,
-                    baseline_relative_to_margin_box,
-                    content_size: LogicalVec2 {
-                        inline: item_as_containing_block.size.inline,
-                        block: content_block_size,
-                    },
-                    containing_block_inline_size: item_as_containing_block.size.inline,
-                    containing_block_block_size: item_as_containing_block.size.block,
-                    depends_on_block_constraints,
-                    has_child_which_depends_on_block_constraints,
-                })
-            },
-        }
-    }
-
-    fn synthesized_baseline_relative_to_margin_box(&self, content_size: Au) -> Au {
-        // If the item does not have a baseline in the necessary axis,
-        // then one is synthesized from the flex item’s border box.
-        // https://drafts.csswg.org/css-flexbox/#valdef-align-items-baseline
-        content_size +
-            self.margin.cross_start.auto_is(Au::zero) +
-            self.padding.cross_start +
-            self.border.cross_start +
-            self.border.cross_end +
-            self.padding.cross_end
-    }
-
-    /// Return the cross-start, cross-end, main-start, and main-end margins, with `auto` values resolved.
-    /// See:
-    ///
-    /// - <https://drafts.csswg.org/css-flexbox/#algo-cross-margins>
-    /// - <https://drafts.csswg.org/css-flexbox/#algo-main-align>
-    fn resolve_auto_margins(
-        &self,
-        flex_context: &FlexContext,
-        line_cross_size: Au,
-        item_cross_content_size: Au,
-        space_distributed_to_auto_main_margins: Au,
-    ) -> FlexRelativeSides<Au> {
-        let main_start = self
-            .margin
-            .main_start
-            .auto_is(|| space_distributed_to_auto_main_margins);
-        let main_end = self
-            .margin
-            .main_end
-            .auto_is(|| space_distributed_to_auto_main_margins);
-
-        let auto_count = match (self.margin.cross_start, self.margin.cross_end) {
-            (AuOrAuto::LengthPercentage(cross_start), AuOrAuto::LengthPercentage(cross_end)) => {
-                return FlexRelativeSides {
-                    cross_start,
-                    cross_end,
-                    main_start,
-                    main_end,
-                };
-            },
-            (AuOrAuto::Auto, AuOrAuto::Auto) => 2,
-            _ => 1,
-        };
-        let outer_cross_size = self.pbm_auto_is_zero.cross + item_cross_content_size;
-        let available = line_cross_size - outer_cross_size;
-        let cross_start;
-        let cross_end;
-        if available > Au::zero() {
-            let each_auto_margin = available / auto_count;
-            cross_start = self.margin.cross_start.auto_is(|| each_auto_margin);
-            cross_end = self.margin.cross_end.auto_is(|| each_auto_margin);
-        } else {
-            // “the block-start or inline-start margin (whichever is in the cross axis)”
-            // This margin is the cross-end on iff `flex-wrap` is `wrap-reverse`,
-            // cross-start otherwise.
-            // We know this because:
-            // https://drafts.csswg.org/css-flexbox/#flex-wrap-property
-            // “For the values that are not wrap-reverse,
-            //  the cross-start direction is equivalent to
-            //  either the inline-start or block-start direction of the current writing mode
-            //  (whichever is in the cross axis)
-            //  and the cross-end direction is the opposite direction of cross-start.
-            //  When flex-wrap is wrap-reverse,
-            //  the cross-start and cross-end directions are swapped.”
-            let flex_wrap = flex_context.containing_block.style.get_position().flex_wrap;
-            let flex_wrap_reverse = match flex_wrap {
-                FlexWrap::Nowrap | FlexWrap::Wrap => false,
-                FlexWrap::WrapReverse => true,
-            };
-            // “if the block-start or inline-start margin (whichever is in the cross axis) is auto,
-            //  set it to zero. Set the opposite margin so that the outer cross size of the item
-            //  equals the cross size of its flex line.”
-            if flex_wrap_reverse {
-                cross_start = self.margin.cross_start.auto_is(|| available);
-                cross_end = self.margin.cross_end.auto_is(Au::zero);
-            } else {
-                cross_start = self.margin.cross_start.auto_is(Au::zero);
-                cross_end = self.margin.cross_end.auto_is(|| available);
-            }
-        }
-
-        FlexRelativeSides {
-            cross_start,
-            cross_end,
-            main_start,
-            main_end,
-        }
-    }
-
-    /// Return the coordinate of the cross-start side of the content area
-    fn align_along_cross_axis(
-        &self,
-        margin: &FlexRelativeSides<Au>,
-        used_cross_size: &Au,
-        line_cross_size: Au,
-        propagated_baseline: Au,
-        max_propagated_baseline: Au,
-        wrap_reverse: bool,
-    ) -> Au {
-        let ending_alignment = line_cross_size - *used_cross_size - self.pbm_auto_is_zero.cross;
-        let outer_cross_start =
-            if self.margin.cross_start.is_auto() || self.margin.cross_end.is_auto() {
-                Au::zero()
-            } else {
-                match self.align_self.0.value() {
-                    AlignFlags::STRETCH => Au::zero(),
-                    AlignFlags::CENTER => ending_alignment / 2,
-                    AlignFlags::BASELINE | AlignFlags::LAST_BASELINE => {
-                        max_propagated_baseline - propagated_baseline
-                    },
-                    AlignFlags::START => {
-                        if !wrap_reverse {
-                            Au::zero()
-                        } else {
-                            ending_alignment
-                        }
-                    },
-                    AlignFlags::END => {
-                        if !wrap_reverse {
-                            ending_alignment
-                        } else {
-                            Au::zero()
-                        }
-                    },
-                    _ => Au::zero(),
-                }
-            };
-        outer_cross_start + margin.cross_start + self.border.cross_start + self.padding.cross_start
-    }
-
-    #[inline]
-    fn is_table(&self) -> bool {
-        match &self.box_.independent_formatting_context.contents {
-            IndependentFormattingContextContents::NonReplaced(content) => content.is_table(),
-            IndependentFormattingContextContents::Replaced(_) => false,
-        }
-    }
-}
-
-impl FlexItemBox {
-    fn to_flex_item<'a>(
-        &self,
-        layout_context: &LayoutContext,
-        containing_block: &IndefiniteContainingBlock,
-        content_box_sizes_and_pbm: &ContentBoxSizesAndPBM,
-        config: &FlexContainerConfig,
-        flex_context_getter: &impl Fn() -> &'a FlexContext<'a>,
-    ) -> FlexItem {
-        let flex_axis = config.flex_axis;
-        let style = self.style();
-        let cross_axis_is_item_block_axis = cross_axis_is_item_block_axis(
-            containing_block.writing_mode.is_horizontal(),
-            style.writing_mode.is_horizontal(),
-            flex_axis,
-        );
-        let main_axis = if cross_axis_is_item_block_axis {
-            Direction::Inline
-        } else {
-            Direction::Block
-        };
-
-        let ContentBoxSizesAndPBM {
-            content_box_sizes,
-            pbm,
-            depends_on_block_constraints,
-        } = content_box_sizes_and_pbm;
-
-        let preferred_aspect_ratio = self
-            .independent_formatting_context
-            .preferred_aspect_ratio(&pbm.padding_border_sums);
-        let padding = config.sides_to_flex_relative(pbm.padding);
-        let border = config.sides_to_flex_relative(pbm.border);
-        let margin = config.sides_to_flex_relative(pbm.margin);
-        let padding_border = padding.sum_by_axis() + border.sum_by_axis();
-        let margin_auto_is_zero = config.sides_to_flex_relative(pbm.margin.auto_is(Au::zero));
-        let pbm_auto_is_zero = FlexRelativeVec2 {
-            main: padding_border.main,
-            cross: padding_border.cross,
-        } + margin_auto_is_zero.sum_by_axis();
-        let auto_cross_size_stretches_to_container_size =
-            config.item_with_auto_cross_size_stretches_to_container_size(style, &margin);
-        let (content_main_sizes, content_cross_sizes) = match flex_axis {
-            FlexAxis::Row => (&content_box_sizes.inline, &content_box_sizes.block),
-            FlexAxis::Column => (&content_box_sizes.block, &content_box_sizes.inline),
-        };
-        let containing_block_size = flex_axis.vec2_to_flex_relative(containing_block.size);
-        let stretch_size = FlexRelativeVec2 {
-            main: containing_block_size
-                .main
-                .map(|v| Au::zero().max(v - pbm_auto_is_zero.main)),
-            cross: containing_block_size
-                .cross
-                .map(|v| Au::zero().max(v - pbm_auto_is_zero.cross)),
-        };
-
-        // <https://drafts.csswg.org/css-flexbox/#definite-sizes>
-        // > If a single-line flex container has a definite cross size, the automatic preferred
-        // > outer cross size of any stretched flex items is the flex container’s inner cross size
-        // > (clamped to the flex item’s min and max cross size) and is considered definite.
-        let (preferred_cross_size, min_cross_size, max_cross_size) = content_cross_sizes
-            .resolve_each_extrinsic(
-                if auto_cross_size_stretches_to_container_size {
-                    Size::Stretch
-                } else {
-                    Size::FitContent
-                },
-                Au::zero(),
-                stretch_size.cross,
-            );
-        let cross_size = SizeConstraint::new(preferred_cross_size, min_cross_size, max_cross_size);
-
-        // <https://drafts.csswg.org/css-flexbox/#transferred-size-suggestion>
-        // > If the item has a preferred aspect ratio and its preferred cross size is definite, then the
-        // > transferred size suggestion is that size (clamped by its minimum and maximum cross sizes if they
-        // > are definite), converted through the aspect ratio. It is otherwise undefined.
-        let transferred_size_suggestion =
-            LazyCell::new(|| match (preferred_aspect_ratio, cross_size) {
-                (Some(ratio), SizeConstraint::Definite(cross_size)) => {
-                    Some(ratio.compute_dependent_size(main_axis, cross_size))
-                },
-                _ => None,
-            });
-
-        // <https://drafts.csswg.org/css-flexbox/#algo-main-item>
-        let flex_base_size_is_definite = Cell::new(true);
-        let main_content_sizes = LazyCell::new(|| {
-            let flex_item = &self.independent_formatting_context;
-            // > B: If the flex item has ...
-            // >   - a preferred aspect ratio,
-            // >   - a used flex basis of content, and
-            // >   - a definite cross size,
-            // > then the flex base size is calculated from its used cross size and the flex item’s aspect ratio.
-            if let Some(transferred_size_suggestion) = *transferred_size_suggestion {
-                return transferred_size_suggestion.into();
-            }
-
-            flex_base_size_is_definite.set(false);
-
-            // FIXME: implement cases C, D.
-
-            // > E. Otherwise, size the item into the available space using its used flex basis in place of
-            // > its main size, treating a value of content as max-content. If a cross size is needed to
-            // > determine the main size (e.g. when the flex item’s main size is in its block axis, or when
-            // > it has a preferred aspect ratio) and the flex item’s cross size is auto and not definite,
-            // > in this calculation use fit-content as the flex item’s cross size. The flex base size is
-            // > the item’s resulting main size.
-            if cross_axis_is_item_block_axis {
-                // The main axis is the inline axis, so we can get the content size from the normal
-                // preferred widths calculation.
-                let constraint_space =
-                    ConstraintSpace::new(cross_size, style.writing_mode, preferred_aspect_ratio);
-                let content_sizes = flex_item
-                    .inline_content_sizes(layout_context, &constraint_space)
-                    .sizes;
-                if let Some(ratio) = preferred_aspect_ratio {
-                    let transferred_min = ratio.compute_dependent_size(main_axis, min_cross_size);
-                    let transferred_max =
-                        max_cross_size.map(|v| ratio.compute_dependent_size(main_axis, v));
-                    content_sizes
-                        .map(|size| size.clamp_between_extremums(transferred_min, transferred_max))
-                } else {
-                    content_sizes
-                }
-            } else {
-                self.layout_for_block_content_size(
-                    flex_context_getter(),
-                    &pbm_auto_is_zero,
-                    content_box_sizes,
-                    preferred_aspect_ratio,
-                    auto_cross_size_stretches_to_container_size,
-                    IntrinsicSizingMode::Size,
-                )
-                .into()
-            }
-        });
-
-        let flex_base_size = self
-            .flex_basis(
-                containing_block_size.main,
-                content_main_sizes.preferred,
-                padding_border.main,
-            )
-            .resolve_for_preferred(Size::MaxContent, stretch_size.main, &main_content_sizes);
-        let flex_base_size_is_definite = flex_base_size_is_definite.take();
-
-        let content_max_main_size = content_main_sizes
-            .max
-            .resolve_for_max(stretch_size.main, &main_content_sizes);
-
-        let get_automatic_minimum_size = || {
-            // This is an implementation of <https://drafts.csswg.org/css-flexbox/#min-size-auto>.
-            if style.establishes_scroll_container(self.base_fragment_info().flags) {
-                return Au::zero();
-            }
-
-            // > **specified size suggestion**
-            // > If the item’s preferred main size is definite and not automatic, then the specified
-            // > size suggestion is that size. It is otherwise undefined.
-            let specified_size_suggestion = content_main_sizes
-                .preferred
-                .maybe_resolve_extrinsic(stretch_size.main);
-
-            let is_replaced = self.independent_formatting_context.is_replaced();
-
-            // > **content size suggestion**
-            // > The content size suggestion is the min-content size in the main axis, clamped, if it has a
-            // > preferred aspect ratio, by any definite minimum and maximum cross sizes converted through the
-            // > aspect ratio.
-            let content_size_suggestion = match preferred_aspect_ratio {
-                Some(ratio) => main_content_sizes.min_content.clamp_between_extremums(
-                    ratio.compute_dependent_size(main_axis, min_cross_size),
-                    max_cross_size.map(|l| ratio.compute_dependent_size(main_axis, l)),
-                ),
-                None => main_content_sizes.min_content,
-            };
-
-            // > The content-based minimum size of a flex item is the smaller of its specified size
-            // > suggestion and its content size suggestion if its specified size suggestion exists;
-            // > otherwise, the smaller of its transferred size suggestion and its content size
-            // > suggestion if the element is replaced and its transferred size suggestion exists;
-            // > otherwise its content size suggestion. In all cases, the size is clamped by the maximum
-            // > main size if it’s definite.
-            match (specified_size_suggestion, *transferred_size_suggestion) {
-                (Some(specified), _) => specified.min(content_size_suggestion),
-                (_, Some(transferred)) if is_replaced => transferred.min(content_size_suggestion),
-                _ => content_size_suggestion,
-            }
-            .clamp_below_max(content_max_main_size)
-        };
-        let content_min_main_size = content_main_sizes.min.resolve_for_min(
-            get_automatic_minimum_size,
-            stretch_size.main,
-            &main_content_sizes,
-        );
-
-        FlexItem {
-            box_: self,
-            content_cross_sizes: content_cross_sizes.clone(),
-            padding,
-            border,
-            margin: config.sides_to_flex_relative(pbm.margin),
-            pbm_auto_is_zero,
-            flex_base_size,
-            flex_base_size_is_definite,
-            hypothetical_main_size: flex_base_size
-                .clamp_between_extremums(content_min_main_size, content_max_main_size),
-            content_min_main_size,
-            content_max_main_size,
-            align_self: AlignItems(config.resolve_align_self_for_child(style)),
-            depends_on_block_constraints: *depends_on_block_constraints,
-            preferred_aspect_ratio,
-            auto_cross_size_stretches_to_container_size,
-        }
-    }
-
-    fn main_content_size_info<'a>(
-        &self,
-        layout_context: &LayoutContext,
-        containing_block: &IndefiniteContainingBlock,
-        config: &FlexContainerConfig,
-        flex_context_getter: &impl Fn() -> &'a FlexContext<'a>,
-    ) -> FlexItemBoxInlineContentSizesInfo {
-        let content_box_sizes_and_pbm = self
-            .independent_formatting_context
-            .layout_style()
-            .content_box_sizes_and_padding_border_margin(containing_block);
-
-        // TODO: when laying out a column container with an indefinite main size,
-        // we compute the base sizes of the items twice. We should consider caching.
-        let FlexItem {
-            flex_base_size,
-            content_min_main_size,
-            content_max_main_size,
-            pbm_auto_is_zero,
-            preferred_aspect_ratio,
-            auto_cross_size_stretches_to_container_size,
-            ..
-        } = self.to_flex_item(
-            layout_context,
-            containing_block,
-            &content_box_sizes_and_pbm,
-            config,
-            flex_context_getter,
-        );
-
-        // Compute the min-content and max-content contributions of the item.
-        // <https://drafts.csswg.org/css-flexbox/#intrinsic-item-contributions>
-        let (content_contribution_sizes, depends_on_block_constraints) = match config.flex_axis {
-            FlexAxis::Row => {
-                let auto_minimum = LogicalVec2 {
-                    inline: content_min_main_size,
-                    block: Au::zero(),
-                };
-                let InlineContentSizesResult {
-                    sizes,
-                    depends_on_block_constraints,
-                } = self
-                    .independent_formatting_context
-                    .outer_inline_content_sizes(
-                        layout_context,
-                        containing_block,
-                        &auto_minimum,
-                        auto_cross_size_stretches_to_container_size,
-                    );
-                (sizes, depends_on_block_constraints)
-            },
-            FlexAxis::Column => {
-                let size = self.layout_for_block_content_size(
-                    flex_context_getter(),
-                    &pbm_auto_is_zero,
-                    &content_box_sizes_and_pbm.content_box_sizes,
-                    preferred_aspect_ratio,
-                    auto_cross_size_stretches_to_container_size,
-                    IntrinsicSizingMode::Contribution,
-                );
-                (size.into(), true)
-            },
-        };
-
-        let outer_flex_base_size = flex_base_size + pbm_auto_is_zero.main;
-        let max_flex_factors = self.desired_flex_factors_for_preferred_width(
-            content_contribution_sizes.max_content,
-            flex_base_size,
-            outer_flex_base_size,
-        );
-
-        // > The min-content main size of a single-line flex container is calculated
-        // > identically to the max-content main size, except that the flex items’
-        // > min-content contributions are used instead of their max-content contributions.
-        let min_flex_factors = self.desired_flex_factors_for_preferred_width(
-            content_contribution_sizes.min_content,
-            flex_base_size,
-            outer_flex_base_size,
-        );
-
-        // > However, for a multi-line container, the min-content main size is simply the
-        // > largest min-content contribution of all the non-collapsed flex items in the
-        // > flex container. For this purpose, each item’s contribution is capped by the
-        // > item’s flex base size if the item is not growable, floored by the item’s flex
-        // > base size if the item is not shrinkable, and then further clamped by the item’s
-        // > min and max main sizes.
-        let mut min_content_main_size_for_multiline_container =
-            content_contribution_sizes.min_content;
-        let style_position = &self.style().get_position();
-        if style_position.flex_grow.is_zero() {
-            min_content_main_size_for_multiline_container.min_assign(flex_base_size);
-        }
-        if style_position.flex_shrink.is_zero() {
-            min_content_main_size_for_multiline_container.max_assign(flex_base_size);
-        }
-        min_content_main_size_for_multiline_container =
-            min_content_main_size_for_multiline_container
-                .clamp_between_extremums(content_min_main_size, content_max_main_size);
-
-        FlexItemBoxInlineContentSizesInfo {
-            outer_flex_base_size,
-            content_min_main_size,
-            content_max_main_size,
-            pbm_auto_is_zero,
-            min_flex_factors,
-            max_flex_factors,
-            min_content_main_size_for_multiline_container,
-            depends_on_block_constraints,
-        }
-    }
-
-    fn desired_flex_factors_for_preferred_width(
-        &self,
-        preferred_width: Au,
-        flex_base_size: Au,
-        outer_flex_base_size: Au,
-    ) -> DesiredFlexFractionAndGrowOrShrinkFactor {
-        let difference = (preferred_width - outer_flex_base_size).to_f32_px();
-        let (flex_grow_or_scaled_flex_shrink_factor, desired_flex_fraction) = if difference > 0.0 {
-            // > If that result is positive, divide it by the item’s flex
-            // > grow factor if the flex grow > factor is ≥ 1, or multiply
-            // > it by the flex grow factor if the flex grow factor is < 1;
-            let flex_grow_factor = self.style().get_position().flex_grow.0;
-
-            (
-                flex_grow_factor,
-                if flex_grow_factor >= 1.0 {
-                    difference / flex_grow_factor
-                } else {
-                    difference * flex_grow_factor
-                },
-            )
-        } else if difference < 0.0 {
-            // > if the result is negative, divide it by the item’s scaled
-            // > flex shrink factor (if dividing > by zero, treat the result
-            // > as negative infinity).
-            let flex_shrink_factor = self.style().get_position().flex_shrink.0;
-            let scaled_flex_shrink_factor = flex_shrink_factor * flex_base_size.to_f32_px();
-
-            (
-                scaled_flex_shrink_factor,
-                if scaled_flex_shrink_factor != 0.0 {
-                    difference / scaled_flex_shrink_factor
-                } else {
-                    f32::NEG_INFINITY
-                },
-            )
-        } else {
-            (0.0, 0.0)
-        };
-
-        DesiredFlexFractionAndGrowOrShrinkFactor {
-            desired_flex_fraction,
-            flex_grow_or_shrink_factor: flex_grow_or_scaled_flex_shrink_factor,
-        }
-    }
-
-    /// <https://drafts.csswg.org/css-flexbox-1/#flex-basis-property>
-    /// Returns the used value of the `flex-basis` property, after resolving percentages,
-    /// resolving `auto`, and taking `box-sizing` into account.
-    /// Note that a return value of `Size::Initial` represents `flex-basis: content`,
-    /// not `flex-basis: auto`, since the latter always resolves to something else.
-    fn flex_basis(
-        &self,
-        container_definite_main_size: Option<Au>,
-        main_preferred_size: Size<Au>,
-        main_padding_border_sum: Au,
-    ) -> Size<Au> {
-        let style_position = &self.independent_formatting_context.style().get_position();
-        match &style_position.flex_basis {
-            // https://drafts.csswg.org/css-flexbox-1/#valdef-flex-basis-content
-            // > Indicates an automatic size based on the flex item’s content.
-            FlexBasis::Content => Size::Initial,
-
-            FlexBasis::Size(size) => match Size::<LengthPercentage>::from(size.clone()) {
-                // https://drafts.csswg.org/css-flexbox-1/#valdef-flex-basis-auto
-                // > When specified on a flex item, the `auto` keyword retrieves
-                // > the value of the main size property as the used `flex-basis`.
-                Size::Initial => main_preferred_size,
-
-                // https://drafts.csswg.org/css-flexbox-1/#flex-basis-property
-                // > For all values other than `auto` and `content` (defined above),
-                // > `flex-basis` is resolved the same way as `width` in horizontal
-                // > writing modes, except that if a value would resolve to `auto`
-                // > for `width`, it instead resolves to `content` for `flex-basis`.
-                // > For example, percentage values of `flex-basis` are resolved
-                // > against the flex item’s containing block (i.e. its flex container);
-                // > and if that containing block’s size is indefinite,
-                // > the used value for `flex-basis` is `content`.
-                size => {
-                    let apply_box_sizing = |length: Au| {
-                        match style_position.box_sizing {
-                            BoxSizing::ContentBox => length,
-                            // This may make `length` negative,
-                            // but it will be clamped in the hypothetical main size
-                            BoxSizing::BorderBox => length - main_padding_border_sum,
-                        }
-                    };
-                    size.resolve_percentages_for_preferred(container_definite_main_size)
-                        .map(apply_box_sizing)
-                },
-            },
-        }
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(
-            name = "FlexContainer::layout_for_block_content_size",
-            skip_all,
-            fields(servo_profiling = true),
-            level = "trace",
-        )
-    )]
-    fn layout_for_block_content_size(
-        &self,
-        flex_context: &FlexContext,
-        pbm_auto_is_zero: &FlexRelativeVec2<Au>,
-        content_box_sizes: &LogicalVec2<Sizes>,
-        preferred_aspect_ratio: Option<AspectRatio>,
-        auto_cross_size_stretches_to_container_size: bool,
-        intrinsic_sizing_mode: IntrinsicSizingMode,
-    ) -> Au {
-        let mut positioning_context = PositioningContext::new_for_style(self.style())
-            .unwrap_or_else(|| {
-                PositioningContext::new_for_subtree(
-                    flex_context
-                        .positioning_context
-                        .collects_for_nearest_positioned_ancestor(),
-                )
-            });
-
-        let style = self.independent_formatting_context.style();
-        match &self.independent_formatting_context.contents {
-            IndependentFormattingContextContents::Replaced(replaced) => {
-                let get_used_size = |block_sizes| {
-                    replaced.used_size_as_if_inline_element_from_content_box_sizes(
-                        flex_context.containing_block,
-                        style,
-                        preferred_aspect_ratio,
-                        LogicalVec2 {
-                            block: block_sizes,
-                            inline: &content_box_sizes.inline,
-                        },
-                        Size::FitContent.into(),
-                        LogicalVec2 {
-                            inline: pbm_auto_is_zero.cross,
-                            block: pbm_auto_is_zero.main,
-                        },
-                    )
-                };
-                if intrinsic_sizing_mode == IntrinsicSizingMode::Size {
-                    get_used_size(&Sizes::default()).block
-                } else {
-                    get_used_size(&content_box_sizes.block).block
-                }
-            },
-            IndependentFormattingContextContents::NonReplaced(non_replaced) => {
-                // TODO: This is wrong if the item writing mode is different from the flex
-                // container's writing mode.
-                let inline_size = {
-                    let initial_behavior = if auto_cross_size_stretches_to_container_size {
-                        Size::Stretch
-                    } else {
-                        Size::FitContent
-                    };
-                    let stretch_size =
-                        flex_context.containing_block.size.inline - pbm_auto_is_zero.cross;
-                    let get_content_size = || {
-                        let constraint_space = ConstraintSpace::new(
-                            SizeConstraint::default(),
-                            style.writing_mode,
-                            non_replaced.preferred_aspect_ratio(),
-                        );
-                        self.independent_formatting_context
-                            .inline_content_sizes(flex_context.layout_context, &constraint_space)
-                            .sizes
-                    };
-                    content_box_sizes.inline.resolve(
-                        Direction::Inline,
-                        initial_behavior,
-                        Au::zero,
-                        Some(stretch_size),
-                        get_content_size,
-                        false,
-                    )
-                };
-                let item_as_containing_block = ContainingBlock {
-                    size: ContainingBlockSize {
-                        inline: inline_size,
-                        block: SizeConstraint::default(),
-                    },
-                    style,
-                };
-                let mut content_block_size = || {
-                    non_replaced
-                        .layout_with_caching(
-                            flex_context.layout_context,
-                            &mut positioning_context,
-                            &item_as_containing_block,
-                            flex_context.containing_block,
-                            &self.independent_formatting_context.base,
-                            false, /* depends_on_block_constraints */
-                        )
-                        .content_block_size
-                };
-                match intrinsic_sizing_mode {
-                    IntrinsicSizingMode::Contribution => {
-                        let stretch_size = flex_context
-                            .containing_block
-                            .size
-                            .block
-                            .to_definite()
-                            .map(|block_size| block_size - pbm_auto_is_zero.main);
-                        let inner_block_size = content_box_sizes.block.resolve(
-                            Direction::Block,
-                            Size::FitContent,
-                            Au::zero,
-                            stretch_size,
-                            || ContentSizes::from(content_block_size()),
-                            // Tables have a special sizing in the block axis that handles collapsed rows
-                            // by ignoring the sizing properties and instead relying on the content block size,
-                            // which should indirectly take sizing properties into account.
-                            // However, above we laid out the table with a SizeConstraint::default() block size,
-                            // so the content block size doesn't take sizing properties into account.
-                            // Therefore, pretending that it's never a table tends to provide a better result.
-                            false, /* is_table */
-                        );
-                        inner_block_size + pbm_auto_is_zero.main
-                    },
-                    IntrinsicSizingMode::Size => content_block_size(),
-                }
-            },
-        }
-    }
-}
diff --git a/components/layout_2020/flexbox/mod.rs b/components/layout_2020/flexbox/mod.rs
deleted file mode 100644
index 46d7a2387a8..00000000000
--- a/components/layout_2020/flexbox/mod.rs
+++ /dev/null
@@ -1,170 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use geom::{FlexAxis, MainStartCrossStart};
-use servo_arc::Arc as ServoArc;
-use style::logical_geometry::WritingMode;
-use style::properties::ComputedValues;
-use style::properties::longhands::align_items::computed_value::T as AlignItems;
-use style::properties::longhands::flex_direction::computed_value::T as FlexDirection;
-use style::properties::longhands::flex_wrap::computed_value::T as FlexWrap;
-use style::values::computed::{AlignContent, JustifyContent};
-use style::values::specified::align::AlignFlags;
-
-use crate::PropagatedBoxTreeData;
-use crate::cell::ArcRefCell;
-use crate::construct_modern::{ModernContainerBuilder, ModernItemKind};
-use crate::context::LayoutContext;
-use crate::dom::{LayoutBox, NodeExt};
-use crate::dom_traversal::{NodeAndStyleInfo, NonReplacedContents};
-use crate::formatting_contexts::IndependentFormattingContext;
-use crate::fragment_tree::BaseFragmentInfo;
-use crate::positioned::AbsolutelyPositionedBox;
-
-mod geom;
-mod layout;
-
-/// A structure to hold the configuration of a flex container for use during layout
-/// and preferred width calculation.
-#[derive(Clone, Debug)]
-pub(crate) struct FlexContainerConfig {
-    container_is_single_line: bool,
-    writing_mode: WritingMode,
-    flex_axis: FlexAxis,
-    flex_direction: FlexDirection,
-    flex_direction_is_reversed: bool,
-    flex_wrap: FlexWrap,
-    flex_wrap_is_reversed: bool,
-    main_start_cross_start_sides_are: MainStartCrossStart,
-    align_content: AlignContent,
-    align_items: AlignItems,
-    justify_content: JustifyContent,
-}
-
-impl FlexContainerConfig {
-    fn new(container_style: &ComputedValues) -> FlexContainerConfig {
-        let flex_direction = container_style.clone_flex_direction();
-        let flex_axis = FlexAxis::from(flex_direction);
-        let flex_wrap = container_style.get_position().flex_wrap;
-        let container_is_single_line = match flex_wrap {
-            FlexWrap::Nowrap => true,
-            FlexWrap::Wrap | FlexWrap::WrapReverse => false,
-        };
-        let flex_direction_is_reversed = match flex_direction {
-            FlexDirection::Row | FlexDirection::Column => false,
-            FlexDirection::RowReverse | FlexDirection::ColumnReverse => true,
-        };
-        let flex_wrap_reverse = match flex_wrap {
-            FlexWrap::Nowrap | FlexWrap::Wrap => false,
-            FlexWrap::WrapReverse => true,
-        };
-
-        let align_content = container_style.clone_align_content();
-        let align_items = AlignItems(match container_style.clone_align_items().0 {
-            AlignFlags::AUTO | AlignFlags::NORMAL => AlignFlags::STRETCH,
-            align => align,
-        });
-        let justify_content = container_style.clone_justify_content();
-        let main_start_cross_start_sides_are =
-            MainStartCrossStart::from(flex_direction, flex_wrap_reverse);
-
-        FlexContainerConfig {
-            container_is_single_line,
-            writing_mode: container_style.writing_mode,
-            flex_axis,
-            flex_direction,
-            flex_direction_is_reversed,
-            flex_wrap,
-            flex_wrap_is_reversed: flex_wrap_reverse,
-            main_start_cross_start_sides_are,
-            align_content,
-            align_items,
-            justify_content,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct FlexContainer {
-    children: Vec<ArcRefCell<FlexLevelBox>>,
-
-    style: ServoArc<ComputedValues>,
-
-    /// The configuration of this [`FlexContainer`].
-    config: FlexContainerConfig,
-}
-
-impl FlexContainer {
-    pub fn construct<'dom>(
-        context: &LayoutContext,
-        info: &NodeAndStyleInfo<impl NodeExt<'dom>>,
-        contents: NonReplacedContents,
-        propagated_data: PropagatedBoxTreeData,
-    ) -> Self {
-        let mut builder =
-            ModernContainerBuilder::new(context, info, propagated_data.union(&info.style));
-        contents.traverse(context, info, &mut builder);
-        let items = builder.finish();
-
-        let children = items
-            .into_iter()
-            .map(|item| {
-                let box_ = match item.kind {
-                    ModernItemKind::InFlow => ArcRefCell::new(FlexLevelBox::FlexItem(
-                        FlexItemBox::new(item.formatting_context),
-                    )),
-                    ModernItemKind::OutOfFlow => {
-                        let abs_pos_box =
-                            ArcRefCell::new(AbsolutelyPositionedBox::new(item.formatting_context));
-                        ArcRefCell::new(FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(abs_pos_box))
-                    },
-                };
-
-                if let Some(box_slot) = item.box_slot {
-                    box_slot.set(LayoutBox::FlexLevel(box_.clone()));
-                }
-
-                box_
-            })
-            .collect();
-
-        Self {
-            children,
-            style: info.style.clone(),
-            config: FlexContainerConfig::new(&info.style),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub(crate) enum FlexLevelBox {
-    FlexItem(FlexItemBox),
-    OutOfFlowAbsolutelyPositionedBox(ArcRefCell<AbsolutelyPositionedBox>),
-}
-
-pub(crate) struct FlexItemBox {
-    independent_formatting_context: IndependentFormattingContext,
-}
-
-impl std::fmt::Debug for FlexItemBox {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str("FlexItemBox")
-    }
-}
-
-impl FlexItemBox {
-    fn new(independent_formatting_context: IndependentFormattingContext) -> Self {
-        Self {
-            independent_formatting_context,
-        }
-    }
-
-    fn style(&self) -> &ServoArc<ComputedValues> {
-        self.independent_formatting_context.style()
-    }
-
-    fn base_fragment_info(&self) -> BaseFragmentInfo {
-        self.independent_formatting_context.base_fragment_info()
-    }
-}
diff --git a/components/layout_2020/flow/construct.rs b/components/layout_2020/flow/construct.rs
deleted file mode 100644
index 0fcd1ce16f6..00000000000
--- a/components/layout_2020/flow/construct.rs
+++ /dev/null
@@ -1,748 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::borrow::Cow;
-use std::convert::TryFrom;
-
-use rayon::iter::{IntoParallelIterator, ParallelIterator};
-use servo_arc::Arc;
-use style::properties::ComputedValues;
-use style::properties::longhands::list_style_position::computed_value::T as ListStylePosition;
-use style::selector_parser::PseudoElement;
-use style::str::char_is_whitespace;
-
-use super::OutsideMarker;
-use super::inline::InlineFormattingContext;
-use super::inline::construct::InlineFormattingContextBuilder;
-use super::inline::inline_box::InlineBox;
-use crate::PropagatedBoxTreeData;
-use crate::cell::ArcRefCell;
-use crate::context::LayoutContext;
-use crate::dom::{BoxSlot, LayoutBox, NodeExt};
-use crate::dom_traversal::{
-    Contents, NodeAndStyleInfo, NonReplacedContents, PseudoElementContentItem, TraversalHandler,
-};
-use crate::flow::float::FloatBox;
-use crate::flow::{BlockContainer, BlockFormattingContext, BlockLevelBox};
-use crate::formatting_contexts::IndependentFormattingContext;
-use crate::fragment_tree::FragmentFlags;
-use crate::layout_box_base::LayoutBoxBase;
-use crate::positioned::AbsolutelyPositionedBox;
-use crate::style_ext::{ComputedValuesExt, DisplayGeneratingBox, DisplayInside, DisplayOutside};
-use crate::table::{AnonymousTableContent, Table};
-
-impl BlockFormattingContext {
-    pub(crate) fn construct<'dom, Node>(
-        context: &LayoutContext,
-        info: &NodeAndStyleInfo<Node>,
-        contents: NonReplacedContents,
-        propagated_data: PropagatedBoxTreeData,
-        is_list_item: bool,
-    ) -> Self
-    where
-        Node: NodeExt<'dom>,
-    {
-        Self::from_block_container(BlockContainer::construct(
-            context,
-            info,
-            contents,
-            propagated_data,
-            is_list_item,
-        ))
-    }
-
-    pub(crate) fn from_block_container(contents: BlockContainer) -> Self {
-        let contains_floats = contents.contains_floats();
-        Self {
-            contents,
-            contains_floats,
-        }
-    }
-}
-
-struct BlockLevelJob<'dom, Node> {
-    info: NodeAndStyleInfo<Node>,
-    box_slot: BoxSlot<'dom>,
-    propagated_data: PropagatedBoxTreeData,
-    kind: BlockLevelCreator,
-}
-
-enum BlockLevelCreator {
-    SameFormattingContextBlock(IntermediateBlockContainer),
-    Independent {
-        display_inside: DisplayInside,
-        contents: Contents,
-    },
-    OutOfFlowAbsolutelyPositionedBox {
-        display_inside: DisplayInside,
-        contents: Contents,
-    },
-    OutOfFlowFloatBox {
-        display_inside: DisplayInside,
-        contents: Contents,
-    },
-    OutsideMarker {
-        contents: Vec<PseudoElementContentItem>,
-    },
-    AnonymousTable {
-        table_block: ArcRefCell<BlockLevelBox>,
-    },
-}
-
-/// A block container that may still have to be constructed.
-///
-/// Represents either the inline formatting context of an anonymous block
-/// box or the yet-to-be-computed block container generated from the children
-/// of a given element.
-///
-/// Deferring allows using rayon’s `into_par_iter`.
-enum IntermediateBlockContainer {
-    InlineFormattingContext(BlockContainer),
-    Deferred {
-        contents: NonReplacedContents,
-        propagated_data: PropagatedBoxTreeData,
-        is_list_item: bool,
-    },
-}
-
-/// A builder for a block container.
-///
-/// This builder starts from the first child of a given DOM node
-/// and does a preorder traversal of all of its inclusive siblings.
-pub(crate) struct BlockContainerBuilder<'dom, 'style, Node> {
-    context: &'style LayoutContext<'style>,
-
-    /// This NodeAndStyleInfo contains the root node, the corresponding pseudo
-    /// content designator, and the block container style.
-    info: &'style NodeAndStyleInfo<Node>,
-
-    /// The list of block-level boxes to be built for the final block container.
-    ///
-    /// Contains all the block-level jobs we found traversing the tree
-    /// so far, if this is empty at the end of the traversal and the ongoing
-    /// inline formatting context is not empty, the block container establishes
-    /// an inline formatting context (see end of `build`).
-    ///
-    /// DOM nodes which represent block-level boxes are immediately pushed
-    /// to this list with their style without ever being traversed at this
-    /// point, instead we just move to their next sibling. If the DOM node
-    /// doesn't have a next sibling, we either reached the end of the container
-    /// root or there are ongoing inline-level boxes
-    /// (see `handle_block_level_element`).
-    block_level_boxes: Vec<BlockLevelJob<'dom, Node>>,
-
-    /// Whether or not this builder has yet produced a block which would be
-    /// be considered the first line for the purposes of `text-indent`.
-    have_already_seen_first_line_for_text_indent: bool,
-
-    /// The propagated data to use for BoxTree construction.
-    propagated_data: PropagatedBoxTreeData,
-
-    inline_formatting_context_builder: InlineFormattingContextBuilder,
-
-    /// The style of the anonymous block boxes pushed to the list of block-level
-    /// boxes, if any (see `end_ongoing_inline_formatting_context`).
-    anonymous_style: Option<Arc<ComputedValues>>,
-
-    /// A collection of content that is being added to an anonymous table. This is
-    /// composed of any sequence of internal table elements or table captions that
-    /// are found outside of a table.
-    anonymous_table_content: Vec<AnonymousTableContent<'dom, Node>>,
-}
-
-impl BlockContainer {
-    pub fn construct<'dom, Node>(
-        context: &LayoutContext,
-        info: &NodeAndStyleInfo<Node>,
-        contents: NonReplacedContents,
-        propagated_data: PropagatedBoxTreeData,
-        is_list_item: bool,
-    ) -> BlockContainer
-    where
-        Node: NodeExt<'dom>,
-    {
-        let mut builder = BlockContainerBuilder::new(context, info, propagated_data);
-
-        if is_list_item {
-            if let Some(marker_contents) = crate::lists::make_marker(context, info) {
-                match info.style.clone_list_style_position() {
-                    ListStylePosition::Inside => {
-                        builder.handle_list_item_marker_inside(info, marker_contents)
-                    },
-                    ListStylePosition::Outside => {
-                        builder.handle_list_item_marker_outside(info, marker_contents)
-                    },
-                }
-            }
-        }
-
-        contents.traverse(context, info, &mut builder);
-        builder.finish()
-    }
-}
-
-impl<'dom, 'style, Node> BlockContainerBuilder<'dom, 'style, Node>
-where
-    Node: NodeExt<'dom>,
-{
-    pub(crate) fn new(
-        context: &'style LayoutContext,
-        info: &'style NodeAndStyleInfo<Node>,
-        propagated_data: PropagatedBoxTreeData,
-    ) -> Self {
-        BlockContainerBuilder {
-            context,
-            info,
-            block_level_boxes: Vec::new(),
-            propagated_data: propagated_data.union(&info.style),
-            have_already_seen_first_line_for_text_indent: false,
-            anonymous_style: None,
-            anonymous_table_content: Vec::new(),
-            inline_formatting_context_builder: InlineFormattingContextBuilder::new(),
-        }
-    }
-
-    pub(crate) fn finish(mut self) -> BlockContainer {
-        debug_assert!(
-            !self
-                .inline_formatting_context_builder
-                .currently_processing_inline_box()
-        );
-
-        self.finish_anonymous_table_if_needed();
-
-        if let Some(inline_formatting_context) = self.inline_formatting_context_builder.finish(
-            self.context,
-            self.propagated_data,
-            !self.have_already_seen_first_line_for_text_indent,
-            self.info.is_single_line_text_input(),
-            self.info.style.writing_mode.to_bidi_level(),
-        ) {
-            // There are two options here. This block was composed of both one or more inline formatting contexts
-            // and child blocks OR this block was a single inline formatting context. In the latter case, we
-            // just return the inline formatting context as the block itself.
-            if self.block_level_boxes.is_empty() {
-                return BlockContainer::InlineFormattingContext(inline_formatting_context);
-            }
-            self.push_block_level_job_for_inline_formatting_context(inline_formatting_context);
-        }
-
-        let context = self.context;
-        let block_level_boxes = if self.context.use_rayon {
-            self.block_level_boxes
-                .into_par_iter()
-                .map(|block_level_job| block_level_job.finish(context))
-                .collect()
-        } else {
-            self.block_level_boxes
-                .into_iter()
-                .map(|block_level_job| block_level_job.finish(context))
-                .collect()
-        };
-
-        BlockContainer::BlockLevelBoxes(block_level_boxes)
-    }
-
-    fn finish_anonymous_table_if_needed(&mut self) {
-        if self.anonymous_table_content.is_empty() {
-            return;
-        }
-
-        // From https://drafts.csswg.org/css-tables/#fixup-algorithm:
-        //  > If the box’s parent is an inline, run-in, or ruby box (or any box that would perform
-        //  > inlinification of its children), then an inline-table box must be generated; otherwise
-        //  > it must be a table box.
-        //
-        // Note that text content in the inline formatting context isn't enough to force the
-        // creation of an inline table. It requires the parent to be an inline box.
-        let inline_table = self
-            .inline_formatting_context_builder
-            .currently_processing_inline_box();
-
-        // Text decorations are not propagated to atomic inline-level descendants.
-        // From https://drafts.csswg.org/css2/#lining-striking-props:
-        // >  Note that text decorations are not propagated to floating and absolutely
-        // > positioned descendants, nor to the contents of atomic inline-level descendants
-        // > such as inline blocks and inline tables.
-        let propagated_data = match inline_table {
-            true => self.propagated_data.without_text_decorations(),
-            false => self.propagated_data,
-        };
-
-        let contents: Vec<AnonymousTableContent<'dom, Node>> =
-            self.anonymous_table_content.drain(..).collect();
-        let last_text = match contents.last() {
-            Some(AnonymousTableContent::Text(info, text)) => Some((info.clone(), text.clone())),
-            _ => None,
-        };
-
-        let ifc = Table::construct_anonymous(self.context, self.info, contents, propagated_data);
-
-        if inline_table {
-            self.inline_formatting_context_builder.push_atomic(ifc);
-        } else {
-            let anonymous_info = self.info.new_anonymous(ifc.style().clone());
-            let table_block = ArcRefCell::new(BlockLevelBox::Independent(ifc));
-            self.end_ongoing_inline_formatting_context();
-            self.block_level_boxes.push(BlockLevelJob {
-                info: anonymous_info,
-                box_slot: BoxSlot::dummy(),
-                kind: BlockLevelCreator::AnonymousTable { table_block },
-                propagated_data,
-            });
-        }
-
-        // If the last element in the anonymous table content is whitespace, that
-        // whitespace doesn't actually belong to the table. It should be processed outside
-        // ie become a space between the anonymous table and the rest of the block
-        // content. Anonymous tables are really only constructed around internal table
-        // elements and the whitespace between them, so this trailing whitespace should
-        // not be included.
-        //
-        // See https://drafts.csswg.org/css-tables/#fixup-algorithm sections "Remove
-        // irrelevant boxes" and "Generate missing parents."
-        if let Some((info, text)) = last_text {
-            self.handle_text(&info, text);
-        }
-    }
-}
-
-impl<'dom, Node> TraversalHandler<'dom, Node> for BlockContainerBuilder<'dom, '_, Node>
-where
-    Node: NodeExt<'dom>,
-{
-    fn handle_element(
-        &mut self,
-        info: &NodeAndStyleInfo<Node>,
-        display: DisplayGeneratingBox,
-        contents: Contents,
-        box_slot: BoxSlot<'dom>,
-    ) {
-        match display {
-            DisplayGeneratingBox::OutsideInside { outside, inside } => {
-                self.finish_anonymous_table_if_needed();
-
-                match outside {
-                    DisplayOutside::Inline => {
-                        self.handle_inline_level_element(info, inside, contents, box_slot)
-                    },
-                    DisplayOutside::Block => {
-                        let box_style = info.style.get_box();
-                        // Floats and abspos cause blockification, so they only happen in this case.
-                        // https://drafts.csswg.org/css2/visuren.html#dis-pos-flo
-                        if box_style.position.is_absolutely_positioned() {
-                            self.handle_absolutely_positioned_element(
-                                info, inside, contents, box_slot,
-                            )
-                        } else if box_style.float.is_floating() {
-                            self.handle_float_element(info, inside, contents, box_slot)
-                        } else {
-                            self.handle_block_level_element(info, inside, contents, box_slot)
-                        }
-                    },
-                };
-            },
-            DisplayGeneratingBox::LayoutInternal(_) => {
-                self.anonymous_table_content
-                    .push(AnonymousTableContent::Element {
-                        info: info.clone(),
-                        display,
-                        contents,
-                        box_slot,
-                    });
-            },
-        }
-    }
-
-    fn handle_text(&mut self, info: &NodeAndStyleInfo<Node>, text: Cow<'dom, str>) {
-        if text.is_empty() {
-            return;
-        }
-
-        // If we are building an anonymous table ie this text directly followed internal
-        // table elements that did not have a `<table>` ancestor, then we forward all
-        // whitespace to the table builder.
-        if !self.anonymous_table_content.is_empty() && text.chars().all(char_is_whitespace) {
-            self.anonymous_table_content
-                .push(AnonymousTableContent::Text(info.clone(), text));
-            return;
-        } else {
-            self.finish_anonymous_table_if_needed();
-        }
-
-        self.inline_formatting_context_builder.push_text(text, info);
-    }
-}
-
-impl<'dom, Node> BlockContainerBuilder<'dom, '_, Node>
-where
-    Node: NodeExt<'dom>,
-{
-    fn handle_list_item_marker_inside(
-        &mut self,
-        info: &NodeAndStyleInfo<Node>,
-        contents: Vec<crate::dom_traversal::PseudoElementContentItem>,
-    ) {
-        let marker_style = self
-            .context
-            .shared_context()
-            .stylist
-            .style_for_anonymous::<Node::ConcreteElement>(
-                &self.context.shared_context().guards,
-                &PseudoElement::ServoLegacyText, // FIMXE: use `PseudoElement::Marker` when we add it
-                &info.style,
-            );
-        self.handle_inline_level_element(
-            &info.new_replacing_style(marker_style),
-            DisplayInside::Flow {
-                is_list_item: false,
-            },
-            NonReplacedContents::OfPseudoElement(contents).into(),
-            BoxSlot::dummy(),
-        );
-    }
-
-    fn handle_list_item_marker_outside(
-        &mut self,
-        info: &NodeAndStyleInfo<Node>,
-        contents: Vec<crate::dom_traversal::PseudoElementContentItem>,
-    ) {
-        self.block_level_boxes.push(BlockLevelJob {
-            info: info.clone(),
-            box_slot: BoxSlot::dummy(),
-            kind: BlockLevelCreator::OutsideMarker { contents },
-            propagated_data: self.propagated_data.without_text_decorations(),
-        });
-    }
-
-    fn handle_inline_level_element(
-        &mut self,
-        info: &NodeAndStyleInfo<Node>,
-        display_inside: DisplayInside,
-        contents: Contents,
-        box_slot: BoxSlot<'dom>,
-    ) {
-        let (DisplayInside::Flow { is_list_item }, false) =
-            (display_inside, contents.is_replaced())
-        else {
-            // If this inline element is an atomic, handle it and return.
-            let atomic = self.inline_formatting_context_builder.push_atomic(
-                IndependentFormattingContext::construct(
-                    self.context,
-                    info,
-                    display_inside,
-                    contents,
-                    // Text decorations are not propagated to atomic inline-level descendants.
-                    self.propagated_data.without_text_decorations(),
-                ),
-            );
-            box_slot.set(LayoutBox::InlineLevel(atomic));
-            return;
-        };
-
-        // Otherwise, this is just a normal inline box. Whatever happened before, all we need to do
-        // before recurring is to remember this ongoing inline level box.
-        let inline_item = self
-            .inline_formatting_context_builder
-            .start_inline_box(InlineBox::new(info));
-
-        if is_list_item {
-            if let Some(marker_contents) = crate::lists::make_marker(self.context, info) {
-                // Ignore `list-style-position` here:
-                // “If the list item is an inline box: this value is equivalent to `inside`.”
-                // https://drafts.csswg.org/css-lists/#list-style-position-outside
-                self.handle_list_item_marker_inside(info, marker_contents)
-            }
-        }
-
-        // `unwrap` doesn’t panic here because `is_replaced` returned `false`.
-        NonReplacedContents::try_from(contents)
-            .unwrap()
-            .traverse(self.context, info, self);
-
-        self.finish_anonymous_table_if_needed();
-
-        self.inline_formatting_context_builder.end_inline_box();
-        box_slot.set(LayoutBox::InlineLevel(inline_item));
-    }
-
-    fn handle_block_level_element(
-        &mut self,
-        info: &NodeAndStyleInfo<Node>,
-        display_inside: DisplayInside,
-        contents: Contents,
-        box_slot: BoxSlot<'dom>,
-    ) {
-        // We just found a block level element, all ongoing inline level boxes
-        // need to be split around it.
-        //
-        // After calling `split_around_block_and_finish`,
-        // `self.inline_formatting_context_builder` is set up with the state
-        // that we want to have after we push the block below.
-        if let Some(inline_formatting_context) = self
-            .inline_formatting_context_builder
-            .split_around_block_and_finish(
-                self.context,
-                self.propagated_data,
-                !self.have_already_seen_first_line_for_text_indent,
-                self.info.style.writing_mode.to_bidi_level(),
-            )
-        {
-            self.push_block_level_job_for_inline_formatting_context(inline_formatting_context);
-        }
-
-        let propagated_data = self.propagated_data;
-        let kind = match contents {
-            Contents::NonReplaced(contents) => match display_inside {
-                DisplayInside::Flow { is_list_item }
-                    // Fragment flags are just used to indicate that the element is not replaced, so empty
-                    // flags are okay here.
-                    if !info.style.establishes_block_formatting_context(
-                        FragmentFlags::empty()
-                    ) =>
-                {
-                    BlockLevelCreator::SameFormattingContextBlock(
-                        IntermediateBlockContainer::Deferred {
-                            contents,
-                            propagated_data,
-                            is_list_item,
-                        },
-                    )
-                },
-                _ => BlockLevelCreator::Independent {
-                    display_inside,
-                    contents: contents.into(),
-                },
-            },
-            Contents::Replaced(contents) => {
-                let contents = Contents::Replaced(contents);
-                BlockLevelCreator::Independent {
-                    display_inside,
-                    contents,
-                }
-            },
-        };
-        self.block_level_boxes.push(BlockLevelJob {
-            info: info.clone(),
-            box_slot,
-            kind,
-            propagated_data,
-        });
-
-        // Any block also counts as the first line for the purposes of text indent. Even if
-        // they don't actually indent.
-        self.have_already_seen_first_line_for_text_indent = true;
-    }
-
-    fn handle_absolutely_positioned_element(
-        &mut self,
-        info: &NodeAndStyleInfo<Node>,
-        display_inside: DisplayInside,
-        contents: Contents,
-        box_slot: BoxSlot<'dom>,
-    ) {
-        if !self.inline_formatting_context_builder.is_empty() {
-            let inline_level_box = self
-                .inline_formatting_context_builder
-                .push_absolutely_positioned_box(AbsolutelyPositionedBox::construct(
-                    self.context,
-                    info,
-                    display_inside,
-                    contents,
-                ));
-            box_slot.set(LayoutBox::InlineLevel(inline_level_box));
-            return;
-        }
-
-        let kind = BlockLevelCreator::OutOfFlowAbsolutelyPositionedBox {
-            contents,
-            display_inside,
-        };
-        self.block_level_boxes.push(BlockLevelJob {
-            info: info.clone(),
-            box_slot,
-            kind,
-            propagated_data: self.propagated_data.without_text_decorations(),
-        });
-    }
-
-    fn handle_float_element(
-        &mut self,
-        info: &NodeAndStyleInfo<Node>,
-        display_inside: DisplayInside,
-        contents: Contents,
-        box_slot: BoxSlot<'dom>,
-    ) {
-        if !self.inline_formatting_context_builder.is_empty() {
-            let inline_level_box =
-                self.inline_formatting_context_builder
-                    .push_float_box(FloatBox::construct(
-                        self.context,
-                        info,
-                        display_inside,
-                        contents,
-                        self.propagated_data,
-                    ));
-            box_slot.set(LayoutBox::InlineLevel(inline_level_box));
-            return;
-        }
-
-        let kind = BlockLevelCreator::OutOfFlowFloatBox {
-            contents,
-            display_inside,
-        };
-        self.block_level_boxes.push(BlockLevelJob {
-            info: info.clone(),
-            box_slot,
-            kind,
-            propagated_data: self.propagated_data.without_text_decorations(),
-        });
-    }
-
-    fn end_ongoing_inline_formatting_context(&mut self) {
-        if let Some(inline_formatting_context) = self.inline_formatting_context_builder.finish(
-            self.context,
-            self.propagated_data,
-            !self.have_already_seen_first_line_for_text_indent,
-            self.info.is_single_line_text_input(),
-            self.info.style.writing_mode.to_bidi_level(),
-        ) {
-            self.push_block_level_job_for_inline_formatting_context(inline_formatting_context);
-        }
-    }
-
-    fn push_block_level_job_for_inline_formatting_context(
-        &mut self,
-        inline_formatting_context: InlineFormattingContext,
-    ) {
-        let block_container_style = &self.info.style;
-        let layout_context = self.context;
-        let anonymous_style = self.anonymous_style.get_or_insert_with(|| {
-            layout_context
-                .shared_context()
-                .stylist
-                .style_for_anonymous::<Node::ConcreteElement>(
-                    &layout_context.shared_context().guards,
-                    &PseudoElement::ServoAnonymousBox,
-                    block_container_style,
-                )
-        });
-
-        let info = self.info.new_anonymous(anonymous_style.clone());
-        self.block_level_boxes.push(BlockLevelJob {
-            info,
-            // FIXME(nox): We should be storing this somewhere.
-            box_slot: BoxSlot::dummy(),
-            kind: BlockLevelCreator::SameFormattingContextBlock(
-                IntermediateBlockContainer::InlineFormattingContext(
-                    BlockContainer::InlineFormattingContext(inline_formatting_context),
-                ),
-            ),
-            propagated_data: self.propagated_data,
-        });
-
-        self.have_already_seen_first_line_for_text_indent = true;
-    }
-}
-
-impl<'dom, Node> BlockLevelJob<'dom, Node>
-where
-    Node: NodeExt<'dom>,
-{
-    fn finish(self, context: &LayoutContext) -> ArcRefCell<BlockLevelBox> {
-        let info = &self.info;
-        let block_level_box = match self.kind {
-            BlockLevelCreator::SameFormattingContextBlock(intermediate_block_container) => {
-                let contents = intermediate_block_container.finish(context, info);
-                let contains_floats = contents.contains_floats();
-                ArcRefCell::new(BlockLevelBox::SameFormattingContextBlock {
-                    base: LayoutBoxBase::new(info.into(), info.style.clone()),
-                    contents,
-                    contains_floats,
-                })
-            },
-            BlockLevelCreator::Independent {
-                display_inside,
-                contents,
-            } => {
-                let context = IndependentFormattingContext::construct(
-                    context,
-                    info,
-                    display_inside,
-                    contents,
-                    self.propagated_data,
-                );
-                ArcRefCell::new(BlockLevelBox::Independent(context))
-            },
-            BlockLevelCreator::OutOfFlowAbsolutelyPositionedBox {
-                display_inside,
-                contents,
-            } => ArcRefCell::new(BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(
-                ArcRefCell::new(AbsolutelyPositionedBox::construct(
-                    context,
-                    info,
-                    display_inside,
-                    contents,
-                )),
-            )),
-            BlockLevelCreator::OutOfFlowFloatBox {
-                display_inside,
-                contents,
-            } => ArcRefCell::new(BlockLevelBox::OutOfFlowFloatBox(FloatBox::construct(
-                context,
-                info,
-                display_inside,
-                contents,
-                self.propagated_data,
-            ))),
-            BlockLevelCreator::OutsideMarker { contents } => {
-                let marker_style = context
-                    .shared_context()
-                    .stylist
-                    .style_for_anonymous::<Node::ConcreteElement>(
-                        &context.shared_context().guards,
-                        &PseudoElement::ServoLegacyText, // FIMXE: use `PseudoElement::Marker` when we add it
-                        &info.style,
-                    );
-                let contents = NonReplacedContents::OfPseudoElement(contents);
-                let block_container = BlockContainer::construct(
-                    context,
-                    &info.new_replacing_style(marker_style.clone()),
-                    contents,
-                    self.propagated_data.without_text_decorations(),
-                    false, /* is_list_item */
-                );
-                ArcRefCell::new(BlockLevelBox::OutsideMarker(OutsideMarker {
-                    marker_style,
-                    base: LayoutBoxBase::new(info.into(), info.style.clone()),
-                    block_container,
-                }))
-            },
-            BlockLevelCreator::AnonymousTable { table_block } => table_block,
-        };
-        self.box_slot
-            .set(LayoutBox::BlockLevel(block_level_box.clone()));
-        block_level_box
-    }
-}
-
-impl IntermediateBlockContainer {
-    fn finish<'dom, Node>(
-        self,
-        context: &LayoutContext,
-        info: &NodeAndStyleInfo<Node>,
-    ) -> BlockContainer
-    where
-        Node: NodeExt<'dom>,
-    {
-        match self {
-            IntermediateBlockContainer::Deferred {
-                contents,
-                propagated_data,
-                is_list_item,
-            } => BlockContainer::construct(context, info, contents, propagated_data, is_list_item),
-            IntermediateBlockContainer::InlineFormattingContext(block_container) => block_container,
-        }
-    }
-}
diff --git a/components/layout_2020/flow/inline/construct.rs b/components/layout_2020/flow/inline/construct.rs
deleted file mode 100644
index 9452d3ffb33..00000000000
--- a/components/layout_2020/flow/inline/construct.rs
+++ /dev/null
@@ -1,625 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::borrow::Cow;
-use std::char::{ToLowercase, ToUppercase};
-
-use icu_segmenter::WordSegmenter;
-use servo_arc::Arc;
-use style::computed_values::white_space_collapse::T as WhiteSpaceCollapse;
-use style::values::specified::text::TextTransformCase;
-use unicode_bidi::Level;
-
-use super::text_run::TextRun;
-use super::{InlineBox, InlineBoxIdentifier, InlineBoxes, InlineFormattingContext, InlineItem};
-use crate::PropagatedBoxTreeData;
-use crate::cell::ArcRefCell;
-use crate::context::LayoutContext;
-use crate::dom::NodeExt;
-use crate::dom_traversal::NodeAndStyleInfo;
-use crate::flow::float::FloatBox;
-use crate::formatting_contexts::IndependentFormattingContext;
-use crate::positioned::AbsolutelyPositionedBox;
-use crate::style_ext::ComputedValuesExt;
-
-#[derive(Default)]
-pub(crate) struct InlineFormattingContextBuilder {
-    /// The collection of text strings that make up this [`InlineFormattingContext`] under
-    /// construction.
-    pub text_segments: Vec<String>,
-
-    /// The current offset in the final text string of this [`InlineFormattingContext`],
-    /// used to properly set the text range of new [`InlineItem::TextRun`]s.
-    current_text_offset: usize,
-
-    /// Whether the last processed node ended with whitespace. This is used to
-    /// implement rule 4 of <https://www.w3.org/TR/css-text-3/#collapse>:
-    ///
-    /// > Any collapsible space immediately following another collapsible space—even one
-    /// > outside the boundary of the inline containing that space, provided both spaces are
-    /// > within the same inline formatting context—is collapsed to have zero advance width.
-    /// > (It is invisible, but retains its soft wrap opportunity, if any.)
-    last_inline_box_ended_with_collapsible_white_space: bool,
-
-    /// Whether or not the current state of the inline formatting context is on a word boundary
-    /// for the purposes of `text-transform: capitalize`.
-    on_word_boundary: bool,
-
-    /// Whether or not this inline formatting context will contain floats.
-    pub contains_floats: bool,
-
-    /// The current list of [`InlineItem`]s in this [`InlineFormattingContext`] under
-    /// construction. This is stored in a flat list to make it easy to access the last
-    /// item.
-    pub inline_items: Vec<ArcRefCell<InlineItem>>,
-
-    /// The current [`InlineBox`] tree of this [`InlineFormattingContext`] under construction.
-    pub inline_boxes: InlineBoxes,
-
-    /// The ongoing stack of inline boxes stack of the builder.
-    ///
-    /// Contains all the currently ongoing inline boxes we entered so far.
-    /// The traversal is at all times as deep in the tree as this stack is,
-    /// which is why the code doesn't need to keep track of the actual
-    /// container root (see `handle_inline_level_element`).
-    ///
-    /// When an inline box ends, it's removed from this stack.
-    inline_box_stack: Vec<InlineBoxIdentifier>,
-
-    /// Whether or not the inline formatting context under construction has any
-    /// uncollapsible text content.
-    pub has_uncollapsible_text_content: bool,
-}
-
-impl InlineFormattingContextBuilder {
-    pub(crate) fn new() -> Self {
-        // For the purposes of `text-transform: capitalize` the start of the IFC is a word boundary.
-        Self {
-            on_word_boundary: true,
-            ..Default::default()
-        }
-    }
-
-    pub(crate) fn currently_processing_inline_box(&self) -> bool {
-        !self.inline_box_stack.is_empty()
-    }
-
-    fn push_control_character_string(&mut self, string_to_push: &str) {
-        self.text_segments.push(string_to_push.to_owned());
-        self.current_text_offset += string_to_push.len();
-    }
-
-    /// Return true if this [`InlineFormattingContextBuilder`] is empty for the purposes of ignoring
-    /// during box tree construction. An IFC is empty if it only contains TextRuns with
-    /// completely collapsible whitespace. When that happens it can be ignored completely.
-    pub(crate) fn is_empty(&self) -> bool {
-        if self.has_uncollapsible_text_content {
-            return false;
-        }
-
-        if !self.inline_box_stack.is_empty() {
-            return false;
-        }
-
-        fn inline_level_box_is_empty(inline_level_box: &InlineItem) -> bool {
-            match inline_level_box {
-                InlineItem::StartInlineBox(_) => false,
-                InlineItem::EndInlineBox => false,
-                // Text content is handled by `self.has_uncollapsible_text` content above in order
-                // to avoid having to iterate through the character once again.
-                InlineItem::TextRun(_) => true,
-                InlineItem::OutOfFlowAbsolutelyPositionedBox(..) => false,
-                InlineItem::OutOfFlowFloatBox(_) => false,
-                InlineItem::Atomic(..) => false,
-            }
-        }
-
-        self.inline_items
-            .iter()
-            .all(|inline_level_box| inline_level_box_is_empty(&inline_level_box.borrow()))
-    }
-
-    pub(crate) fn push_atomic(
-        &mut self,
-        independent_formatting_context: IndependentFormattingContext,
-    ) -> ArcRefCell<InlineItem> {
-        let inline_level_box = ArcRefCell::new(InlineItem::Atomic(
-            Arc::new(independent_formatting_context),
-            self.current_text_offset,
-            Level::ltr(), /* This will be assigned later if necessary. */
-        ));
-        self.inline_items.push(inline_level_box.clone());
-
-        // Push an object replacement character for this atomic, which will ensure that the line breaker
-        // inserts a line breaking opportunity here.
-        self.push_control_character_string("\u{fffc}");
-
-        self.last_inline_box_ended_with_collapsible_white_space = false;
-        self.on_word_boundary = true;
-
-        inline_level_box
-    }
-
-    pub(crate) fn push_absolutely_positioned_box(
-        &mut self,
-        absolutely_positioned_box: AbsolutelyPositionedBox,
-    ) -> ArcRefCell<InlineItem> {
-        let absolutely_positioned_box = ArcRefCell::new(absolutely_positioned_box);
-        let inline_level_box = ArcRefCell::new(InlineItem::OutOfFlowAbsolutelyPositionedBox(
-            absolutely_positioned_box,
-            self.current_text_offset,
-        ));
-
-        self.inline_items.push(inline_level_box.clone());
-        inline_level_box
-    }
-
-    pub(crate) fn push_float_box(&mut self, float_box: FloatBox) -> ArcRefCell<InlineItem> {
-        let inline_level_box = ArcRefCell::new(InlineItem::OutOfFlowFloatBox(Arc::new(float_box)));
-        self.inline_items.push(inline_level_box.clone());
-        self.contains_floats = true;
-        inline_level_box
-    }
-
-    pub(crate) fn start_inline_box(&mut self, inline_box: InlineBox) -> ArcRefCell<InlineItem> {
-        self.push_control_character_string(inline_box.style.bidi_control_chars().0);
-
-        let (identifier, inline_box) = self.inline_boxes.start_inline_box(inline_box);
-        let inline_level_box = ArcRefCell::new(InlineItem::StartInlineBox(inline_box));
-        self.inline_items.push(inline_level_box.clone());
-        self.inline_box_stack.push(identifier);
-        inline_level_box
-    }
-
-    pub(crate) fn end_inline_box(&mut self) -> ArcRefCell<InlineBox> {
-        let identifier = self.end_inline_box_internal();
-        let inline_level_box = self.inline_boxes.get(&identifier);
-        inline_level_box.borrow_mut().is_last_fragment = true;
-
-        self.push_control_character_string(inline_level_box.borrow().style.bidi_control_chars().1);
-
-        inline_level_box
-    }
-
-    fn end_inline_box_internal(&mut self) -> InlineBoxIdentifier {
-        let identifier = self
-            .inline_box_stack
-            .pop()
-            .expect("Ended non-existent inline box");
-        self.inline_items
-            .push(ArcRefCell::new(InlineItem::EndInlineBox));
-
-        self.inline_boxes.end_inline_box(identifier);
-        identifier
-    }
-
-    pub(crate) fn push_text<'dom, Node: NodeExt<'dom>>(
-        &mut self,
-        text: Cow<'dom, str>,
-        info: &NodeAndStyleInfo<Node>,
-    ) {
-        let white_space_collapse = info.style.clone_white_space_collapse();
-        let collapsed = WhitespaceCollapse::new(
-            text.chars(),
-            white_space_collapse,
-            self.last_inline_box_ended_with_collapsible_white_space,
-        );
-
-        // TODO: Not all text transforms are about case, this logic should stop ignoring
-        // TextTransform::FULL_WIDTH and TextTransform::FULL_SIZE_KANA.
-        let text_transform = info.style.clone_text_transform().case();
-        let capitalized_text: String;
-        let char_iterator: Box<dyn Iterator<Item = char>> = match text_transform {
-            TextTransformCase::None => Box::new(collapsed),
-            TextTransformCase::Capitalize => {
-                // `TextTransformation` doesn't support capitalization, so we must capitalize the whole
-                // string at once and make a copy. Here `on_word_boundary` indicates whether or not the
-                // inline formatting context as a whole is on a word boundary. This is different from
-                // `last_inline_box_ended_with_collapsible_white_space` because the word boundaries are
-                // between atomic inlines and at the start of the IFC, and because preserved spaces
-                // are a word boundary.
-                let collapsed_string: String = collapsed.collect();
-                capitalized_text = capitalize_string(&collapsed_string, self.on_word_boundary);
-                Box::new(capitalized_text.chars())
-            },
-            _ => {
-                // If `text-transform` is active, wrap the `WhitespaceCollapse` iterator in
-                // a `TextTransformation` iterator.
-                Box::new(TextTransformation::new(collapsed, text_transform))
-            },
-        };
-
-        let white_space_collapse = info.style.clone_white_space_collapse();
-        let new_text: String = char_iterator
-            .inspect(|&character| {
-                self.has_uncollapsible_text_content |= matches!(
-                    white_space_collapse,
-                    WhiteSpaceCollapse::Preserve | WhiteSpaceCollapse::BreakSpaces
-                ) || !character.is_ascii_whitespace() ||
-                    (character == '\n' && white_space_collapse != WhiteSpaceCollapse::Collapse);
-            })
-            .collect();
-
-        if new_text.is_empty() {
-            return;
-        }
-
-        if let Some(last_character) = new_text.chars().next_back() {
-            self.on_word_boundary = last_character.is_whitespace();
-            self.last_inline_box_ended_with_collapsible_white_space =
-                self.on_word_boundary && white_space_collapse != WhiteSpaceCollapse::Preserve;
-        }
-
-        let new_range = self.current_text_offset..self.current_text_offset + new_text.len();
-        self.current_text_offset = new_range.end;
-        self.text_segments.push(new_text);
-
-        if let Some(inline_item) = self.inline_items.last() {
-            if let InlineItem::TextRun(text_run) = &mut *inline_item.borrow_mut() {
-                text_run.borrow_mut().text_range.end = new_range.end;
-                return;
-            }
-        }
-
-        self.inline_items
-            .push(ArcRefCell::new(InlineItem::TextRun(ArcRefCell::new(
-                TextRun::new(info.into(), info.style.clone(), new_range),
-            ))));
-    }
-
-    pub(crate) fn split_around_block_and_finish(
-        &mut self,
-        layout_context: &LayoutContext,
-        propagated_data: PropagatedBoxTreeData,
-        has_first_formatted_line: bool,
-        default_bidi_level: Level,
-    ) -> Option<InlineFormattingContext> {
-        if self.is_empty() {
-            return None;
-        }
-
-        // Create a new inline builder which will be active after the block splits this inline formatting
-        // context. It has the same inline box structure as this builder, except the boxes are
-        // marked as not being the first fragment. No inline content is carried over to this new
-        // builder.
-        let mut new_builder = InlineFormattingContextBuilder::new();
-        for identifier in self.inline_box_stack.iter() {
-            new_builder.start_inline_box(
-                self.inline_boxes
-                    .get(identifier)
-                    .borrow()
-                    .split_around_block(),
-            );
-        }
-        let mut inline_builder_from_before_split = std::mem::replace(self, new_builder);
-
-        // End all ongoing inline boxes in the first builder, but ensure that they are not
-        // marked as the final fragments, so that they do not get inline end margin, borders,
-        // and padding.
-        while !inline_builder_from_before_split.inline_box_stack.is_empty() {
-            inline_builder_from_before_split.end_inline_box_internal();
-        }
-
-        inline_builder_from_before_split.finish(
-            layout_context,
-            propagated_data,
-            has_first_formatted_line,
-            /* is_single_line_text_input = */ false,
-            default_bidi_level,
-        )
-    }
-
-    /// Finish the current inline formatting context, returning [`None`] if the context was empty.
-    pub(crate) fn finish(
-        &mut self,
-        layout_context: &LayoutContext,
-        propagated_data: PropagatedBoxTreeData,
-        has_first_formatted_line: bool,
-        is_single_line_text_input: bool,
-        default_bidi_level: Level,
-    ) -> Option<InlineFormattingContext> {
-        if self.is_empty() {
-            return None;
-        }
-
-        let old_builder = std::mem::replace(self, InlineFormattingContextBuilder::new());
-        assert!(old_builder.inline_box_stack.is_empty());
-
-        Some(InlineFormattingContext::new_with_builder(
-            old_builder,
-            layout_context,
-            propagated_data,
-            has_first_formatted_line,
-            is_single_line_text_input,
-            default_bidi_level,
-        ))
-    }
-}
-
-fn preserve_segment_break() -> bool {
-    true
-}
-
-pub struct WhitespaceCollapse<InputIterator> {
-    char_iterator: InputIterator,
-    white_space_collapse: WhiteSpaceCollapse,
-
-    /// Whether or not we should collapse white space completely at the start of the string.
-    /// This is true when the last character handled in our owning [`super::InlineFormattingContext`]
-    /// was collapsible white space.
-    remove_collapsible_white_space_at_start: bool,
-
-    /// Whether or not the last character produced was newline. There is special behavior
-    /// we do after each newline.
-    following_newline: bool,
-
-    /// Whether or not we have seen any non-white space characters, indicating that we are not
-    /// in a collapsible white space section at the beginning of the string.
-    have_seen_non_white_space_characters: bool,
-
-    /// Whether the last character that we processed was a non-newline white space character. When
-    /// collapsing white space we need to wait until the next non-white space character or the end
-    /// of the string to push a single white space.
-    inside_white_space: bool,
-
-    /// When we enter a collapsible white space region, we may need to wait to produce a single
-    /// white space character as soon as we encounter a non-white space character. When that
-    /// happens we queue up the non-white space character for the next iterator call.
-    character_pending_to_return: Option<char>,
-}
-
-impl<InputIterator> WhitespaceCollapse<InputIterator> {
-    pub fn new(
-        char_iterator: InputIterator,
-        white_space_collapse: WhiteSpaceCollapse,
-        trim_beginning_white_space: bool,
-    ) -> Self {
-        Self {
-            char_iterator,
-            white_space_collapse,
-            remove_collapsible_white_space_at_start: trim_beginning_white_space,
-            inside_white_space: false,
-            following_newline: false,
-            have_seen_non_white_space_characters: false,
-            character_pending_to_return: None,
-        }
-    }
-
-    fn is_leading_trimmed_white_space(&self) -> bool {
-        !self.have_seen_non_white_space_characters && self.remove_collapsible_white_space_at_start
-    }
-
-    /// Whether or not we need to produce a space character if the next character is not a newline
-    /// and not white space. This happens when we are exiting a section of white space and we
-    /// waited to produce a single space character for the entire section of white space (but
-    /// not following or preceding a newline).
-    fn need_to_produce_space_character_after_white_space(&self) -> bool {
-        self.inside_white_space && !self.following_newline && !self.is_leading_trimmed_white_space()
-    }
-}
-
-impl<InputIterator> Iterator for WhitespaceCollapse<InputIterator>
-where
-    InputIterator: Iterator<Item = char>,
-{
-    type Item = char;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // Point 4.1.1 first bullet:
-        // > If white-space is set to normal, nowrap, or pre-line, whitespace
-        // > characters are considered collapsible
-        // If whitespace is not considered collapsible, it is preserved entirely, which
-        // means that we can simply return the input string exactly.
-        if self.white_space_collapse == WhiteSpaceCollapse::Preserve ||
-            self.white_space_collapse == WhiteSpaceCollapse::BreakSpaces
-        {
-            // From <https://drafts.csswg.org/css-text-3/#white-space-processing>:
-            // > Carriage returns (U+000D) are treated identically to spaces (U+0020) in all respects.
-            //
-            // In the non-preserved case these are converted to space below.
-            return match self.char_iterator.next() {
-                Some('\r') => Some(' '),
-                next => next,
-            };
-        }
-
-        if let Some(character) = self.character_pending_to_return.take() {
-            self.inside_white_space = false;
-            self.have_seen_non_white_space_characters = true;
-            self.following_newline = false;
-            return Some(character);
-        }
-
-        while let Some(character) = self.char_iterator.next() {
-            // Don't push non-newline whitespace immediately. Instead wait to push it until we
-            // know that it isn't followed by a newline. See `push_pending_whitespace_if_needed`
-            // above.
-            if character.is_ascii_whitespace() && character != '\n' {
-                self.inside_white_space = true;
-                continue;
-            }
-
-            // Point 4.1.1:
-            // > 2. Collapsible segment breaks are transformed for rendering according to the
-            // >    segment break transformation rules.
-            if character == '\n' {
-                // From <https://drafts.csswg.org/css-text-3/#line-break-transform>
-                // (4.1.3 -- the segment break transformation rules):
-                //
-                // > When white-space is pre, pre-wrap, or pre-line, segment breaks are not
-                // > collapsible and are instead transformed into a preserved line feed"
-                if self.white_space_collapse != WhiteSpaceCollapse::Collapse {
-                    self.inside_white_space = false;
-                    self.following_newline = true;
-                    return Some(character);
-
-                // Point 4.1.3:
-                // > 1. First, any collapsible segment break immediately following another
-                // >    collapsible segment break is removed.
-                // > 2. Then any remaining segment break is either transformed into a space (U+0020)
-                // >    or removed depending on the context before and after the break.
-                } else if !self.following_newline &&
-                    preserve_segment_break() &&
-                    !self.is_leading_trimmed_white_space()
-                {
-                    self.inside_white_space = false;
-                    self.following_newline = true;
-                    return Some(' ');
-                } else {
-                    self.following_newline = true;
-                    continue;
-                }
-            }
-
-            // Point 4.1.1:
-            // > 2. Any sequence of collapsible spaces and tabs immediately preceding or
-            // >    following a segment break is removed.
-            // > 3. Every collapsible tab is converted to a collapsible space (U+0020).
-            // > 4. Any collapsible space immediately following another collapsible space—even
-            // >    one outside the boundary of the inline containing that space, provided both
-            // >    spaces are within the same inline formatting context—is collapsed to have zero
-            // >    advance width.
-            if self.need_to_produce_space_character_after_white_space() {
-                self.inside_white_space = false;
-                self.character_pending_to_return = Some(character);
-                return Some(' ');
-            }
-
-            self.inside_white_space = false;
-            self.have_seen_non_white_space_characters = true;
-            self.following_newline = false;
-            return Some(character);
-        }
-
-        if self.need_to_produce_space_character_after_white_space() {
-            self.inside_white_space = false;
-            return Some(' ');
-        }
-
-        None
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.char_iterator.size_hint()
-    }
-
-    fn count(self) -> usize
-    where
-        Self: Sized,
-    {
-        self.char_iterator.count()
-    }
-}
-
-enum PendingCaseConversionResult {
-    Uppercase(ToUppercase),
-    Lowercase(ToLowercase),
-}
-
-impl PendingCaseConversionResult {
-    fn next(&mut self) -> Option<char> {
-        match self {
-            PendingCaseConversionResult::Uppercase(to_uppercase) => to_uppercase.next(),
-            PendingCaseConversionResult::Lowercase(to_lowercase) => to_lowercase.next(),
-        }
-    }
-}
-
-/// This is an interator that consumes a char iterator and produces character transformed
-/// by the given CSS `text-transform` value. It currently does not support
-/// `text-transform: capitalize` because Unicode segmentation libraries do not support
-/// streaming input one character at a time.
-pub struct TextTransformation<InputIterator> {
-    /// The input character iterator.
-    char_iterator: InputIterator,
-    /// The `text-transform` value to use.
-    text_transform: TextTransformCase,
-    /// If an uppercasing or lowercasing produces more than one character, this
-    /// caches them so that they can be returned in subsequent iterator calls.
-    pending_case_conversion_result: Option<PendingCaseConversionResult>,
-}
-
-impl<InputIterator> TextTransformation<InputIterator> {
-    pub fn new(char_iterator: InputIterator, text_transform: TextTransformCase) -> Self {
-        Self {
-            char_iterator,
-            text_transform,
-            pending_case_conversion_result: None,
-        }
-    }
-}
-
-impl<InputIterator> Iterator for TextTransformation<InputIterator>
-where
-    InputIterator: Iterator<Item = char>,
-{
-    type Item = char;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if let Some(character) = self
-            .pending_case_conversion_result
-            .as_mut()
-            .and_then(|result| result.next())
-        {
-            return Some(character);
-        }
-        self.pending_case_conversion_result = None;
-
-        for character in self.char_iterator.by_ref() {
-            match self.text_transform {
-                TextTransformCase::None => return Some(character),
-                TextTransformCase::Uppercase => {
-                    let mut pending_result =
-                        PendingCaseConversionResult::Uppercase(character.to_uppercase());
-                    if let Some(character) = pending_result.next() {
-                        self.pending_case_conversion_result = Some(pending_result);
-                        return Some(character);
-                    }
-                },
-                TextTransformCase::Lowercase => {
-                    let mut pending_result =
-                        PendingCaseConversionResult::Lowercase(character.to_lowercase());
-                    if let Some(character) = pending_result.next() {
-                        self.pending_case_conversion_result = Some(pending_result);
-                        return Some(character);
-                    }
-                },
-                // `text-transform: capitalize` currently cannot work on a per-character basis,
-                // so must be handled outside of this iterator.
-                TextTransformCase::Capitalize => return Some(character),
-            }
-        }
-        None
-    }
-}
-
-/// Given a string and whether the start of the string represents a word boundary, create a copy of
-/// the string with letters after word boundaries capitalized.
-fn capitalize_string(string: &str, allow_word_at_start: bool) -> String {
-    let mut output_string = String::new();
-    output_string.reserve(string.len());
-
-    let word_segmenter = WordSegmenter::new_auto();
-    let mut bounds = word_segmenter.segment_str(string).peekable();
-    let mut byte_index = 0;
-    for character in string.chars() {
-        let current_byte_index = byte_index;
-        byte_index += character.len_utf8();
-
-        if let Some(next_index) = bounds.peek() {
-            if *next_index == current_byte_index {
-                bounds.next();
-
-                if current_byte_index != 0 || allow_word_at_start {
-                    output_string.extend(character.to_uppercase());
-                    continue;
-                }
-            }
-        }
-
-        output_string.push(character);
-    }
-
-    output_string
-}
diff --git a/components/layout_2020/flow/inline/mod.rs b/components/layout_2020/flow/inline/mod.rs
deleted file mode 100644
index e9007ce2e45..00000000000
--- a/components/layout_2020/flow/inline/mod.rs
+++ /dev/null
@@ -1,2436 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-//! # Inline Formatting Context Layout
-//!
-//! Inline layout is divided into three phases:
-//!
-//! 1. Box Tree Construction
-//! 2. Box to Line Layout
-//! 3. Line to Fragment Layout
-//!
-//! The first phase happens during normal box tree constrution, while the second two phases happen
-//! during fragment tree construction (sometimes called just "layout").
-//!
-//! ## Box Tree Construction
-//!
-//! During box tree construction, DOM elements are transformed into a box tree. This phase collects
-//! all of the inline boxes, text, atomic inline elements (boxes with `display: inline-block` or
-//! `display: inline-table` as well as things like images and canvas), absolutely positioned blocks,
-//! and floated blocks.
-//!
-//! During the last part of this phase, whitespace is collapsed and text is segmented into
-//! [`TextRun`]s based on script, chosen font, and line breaking opportunities. In addition, default
-//! fonts are selected for every inline box. Each segment of text is shaped using HarfBuzz and
-//! turned into a series of glyphs, which all have a size and a position relative to the origin of
-//! the [`TextRun`] (calculated in later phases).
-//!
-//! The code for this phase is mainly in `construct.rs`, but text handling can also be found in
-//! `text_runs.rs.`
-//!
-//! ## Box to Line Layout
-//!
-//! During the first phase of fragment tree construction, box tree items are laid out into
-//! [`LineItem`]s and fragmented based on line boundaries. This is where line breaking happens. This
-//! part of layout fragments boxes and their contents across multiple lines while positioning floats
-//! and making sure non-floated contents flow around them. In addition, all atomic elements are laid
-//! out, which may descend into their respective trees and create fragments. Finally, absolutely
-//! positioned content is collected in order to later hoist it to the containing block for
-//! absolutes.
-//!
-//! Note that during this phase, layout does not know the final block position of content. Only
-//! during line to fragment layout, are the final block positions calculated based on the line's
-//! final content and its vertical alignment. Instead, positions and line heights are calculated
-//! relative to the line's final baseline which will be determined in the final phase.
-//!
-//! [`LineItem`]s represent a particular set of content on a line. Currently this is represented by
-//! a linear series of items that describe the line's hierarchy of inline boxes and content. The
-//! item types are:
-//!
-//!  - [`LineItem::InlineStartBoxPaddingBorderMargin`]
-//!  - [`LineItem::InlineEndBoxPaddingBorderMargin`]
-//!  - [`LineItem::TextRun`]
-//!  - [`LineItem::Atomic`]
-//!  - [`LineItem::AbsolutelyPositioned`]
-//!  - [`LineItem::Float`]
-//!
-//! The code for this can be found by looking for methods of the form `layout_into_line_item()`.
-//!
-//! ## Line to Fragment Layout
-//!
-//! During the second phase of fragment tree construction, the final block position of [`LineItem`]s
-//! is calculated and they are converted into [`Fragment`]s. After layout, the [`LineItem`]s are
-//! discarded and the new fragments are incorporated into the fragment tree. The final static
-//! position of absolutely positioned content is calculated and it is hoisted to its containing
-//! block via [`PositioningContext`].
-//!
-//! The code for this phase, can mainly be found in `line.rs`.
-//!
-
-pub mod construct;
-pub mod inline_box;
-pub mod line;
-mod line_breaker;
-pub mod text_run;
-
-use std::cell::{OnceCell, RefCell};
-use std::mem;
-use std::rc::Rc;
-
-use app_units::{Au, MAX_AU};
-use bitflags::bitflags;
-use construct::InlineFormattingContextBuilder;
-use fonts::{FontMetrics, GlyphStore};
-use inline_box::{InlineBox, InlineBoxContainerState, InlineBoxIdentifier, InlineBoxes};
-use line::{
-    AbsolutelyPositionedLineItem, AtomicLineItem, FloatLineItem, LineItem, LineItemLayout,
-    TextRunLineItem,
-};
-use line_breaker::LineBreaker;
-use servo_arc::Arc;
-use style::Zero;
-use style::computed_values::text_wrap_mode::T as TextWrapMode;
-use style::computed_values::vertical_align::T as VerticalAlign;
-use style::computed_values::white_space_collapse::T as WhiteSpaceCollapse;
-use style::context::QuirksMode;
-use style::properties::ComputedValues;
-use style::properties::style_structs::InheritedText;
-use style::values::generics::box_::VerticalAlignKeyword;
-use style::values::generics::font::LineHeight;
-use style::values::specified::box_::BaselineSource;
-use style::values::specified::text::{TextAlignKeyword, TextDecorationLine};
-use style::values::specified::{TextAlignLast, TextJustify};
-use text_run::{
-    TextRun, XI_LINE_BREAKING_CLASS_GL, XI_LINE_BREAKING_CLASS_WJ, XI_LINE_BREAKING_CLASS_ZWJ,
-    add_or_get_font, get_font_for_first_font_for_style,
-};
-use unicode_bidi::{BidiInfo, Level};
-use webrender_api::FontInstanceKey;
-use xi_unicode::linebreak_property;
-
-use super::float::{Clear, PlacementAmongFloats};
-use super::{
-    CacheableLayoutResult, IndependentFloatOrAtomicLayoutResult,
-    IndependentFormattingContextContents,
-};
-use crate::cell::ArcRefCell;
-use crate::context::LayoutContext;
-use crate::flow::CollapsibleWithParentStartMargin;
-use crate::flow::float::{FloatBox, SequentialLayoutState};
-use crate::formatting_contexts::{
-    Baselines, IndependentFormattingContext, IndependentNonReplacedContents,
-};
-use crate::fragment_tree::{
-    BoxFragment, CollapsedBlockMargins, CollapsedMargin, Fragment, FragmentFlags,
-    PositioningFragment,
-};
-use crate::geom::{LogicalRect, LogicalVec2, ToLogical};
-use crate::positioned::{AbsolutelyPositionedBox, PositioningContext};
-use crate::sizing::{ComputeInlineContentSizes, ContentSizes, InlineContentSizesResult};
-use crate::style_ext::{ComputedValuesExt, PaddingBorderMargin};
-use crate::{ConstraintSpace, ContainingBlock, PropagatedBoxTreeData};
-
-// From gfxFontConstants.h in Firefox.
-static FONT_SUBSCRIPT_OFFSET_RATIO: f32 = 0.20;
-static FONT_SUPERSCRIPT_OFFSET_RATIO: f32 = 0.34;
-
-#[derive(Debug)]
-pub(crate) struct InlineFormattingContext {
-    /// All [`InlineItem`]s in this [`InlineFormattingContext`] stored in a flat array.
-    /// [`InlineItem::StartInlineBox`] and [`InlineItem::EndInlineBox`] allow representing
-    /// the tree of inline boxes within the formatting context, but a flat array allows
-    /// easy iteration through all inline items.
-    pub(super) inline_items: Vec<ArcRefCell<InlineItem>>,
-
-    /// The tree of inline boxes in this [`InlineFormattingContext`]. These are stored in
-    /// a flat array with each being given a [`InlineBoxIdentifier`].
-    pub(super) inline_boxes: InlineBoxes,
-
-    /// The text content of this inline formatting context.
-    pub(super) text_content: String,
-
-    /// A store of font information for all the shaped segments in this formatting
-    /// context in order to avoid duplicating this information.
-    pub font_metrics: Vec<FontKeyAndMetrics>,
-
-    pub(super) text_decoration_line: TextDecorationLine,
-
-    /// Whether this IFC contains the 1st formatted line of an element:
-    /// <https://www.w3.org/TR/css-pseudo-4/#first-formatted-line>.
-    pub(super) has_first_formatted_line: bool,
-
-    /// Whether or not this [`InlineFormattingContext`] contains floats.
-    pub(super) contains_floats: bool,
-
-    /// Whether or not this is an [`InlineFormattingContext`] for a single line text input.
-    pub(super) is_single_line_text_input: bool,
-
-    /// Whether or not this is an [`InlineFormattingContext`] has right-to-left content, which
-    /// will require reordering during layout.
-    pub(super) has_right_to_left_content: bool,
-}
-
-/// A collection of data used to cache [`FontMetrics`] in the [`InlineFormattingContext`]
-#[derive(Debug)]
-pub(crate) struct FontKeyAndMetrics {
-    pub key: FontInstanceKey,
-    pub pt_size: Au,
-    pub metrics: FontMetrics,
-}
-
-#[derive(Debug)]
-pub(crate) enum InlineItem {
-    StartInlineBox(ArcRefCell<InlineBox>),
-    EndInlineBox,
-    TextRun(ArcRefCell<TextRun>),
-    OutOfFlowAbsolutelyPositionedBox(
-        ArcRefCell<AbsolutelyPositionedBox>,
-        usize, /* offset_in_text */
-    ),
-    OutOfFlowFloatBox(Arc<FloatBox>),
-    Atomic(
-        Arc<IndependentFormattingContext>,
-        usize, /* offset_in_text */
-        Level, /* bidi_level */
-    ),
-}
-
-/// Information about the current line under construction for a particular
-/// [`InlineFormattingContextLayout`]. This tracks position and size information while
-/// [`LineItem`]s are collected and is used as input when those [`LineItem`]s are
-/// converted into [`Fragment`]s during the final phase of line layout. Note that this
-/// does not store the [`LineItem`]s themselves, as they are stored as part of the
-/// nesting state in the [`InlineFormattingContextLayout`].
-struct LineUnderConstruction {
-    /// The position where this line will start once it is laid out. This includes any
-    /// offset from `text-indent`.
-    start_position: LogicalVec2<Au>,
-
-    /// The current inline position in the line being laid out into [`LineItem`]s in this
-    /// [`InlineFormattingContext`] independent of the depth in the nesting level.
-    inline_position: Au,
-
-    /// The maximum block size of all boxes that ended and are in progress in this line.
-    /// This uses [`LineBlockSizes`] instead of a simple value, because the final block size
-    /// depends on vertical alignment.
-    max_block_size: LineBlockSizes,
-
-    /// Whether any active linebox has added a glyph or atomic element to this line, which
-    /// indicates that the next run that exceeds the line length can cause a line break.
-    has_content: bool,
-
-    /// Whether or not there are floats that did not fit on the current line. Before
-    /// the [`LineItem`]s of this line are laid out, these floats will need to be
-    /// placed directly below this line, but still as children of this line's Fragments.
-    has_floats_waiting_to_be_placed: bool,
-
-    /// A rectangular area (relative to the containing block / inline formatting
-    /// context boundaries) where we can fit the line box without overlapping floats.
-    /// Note that when this is not empty, its start corner takes precedence over
-    /// [`LineUnderConstruction::start_position`].
-    placement_among_floats: OnceCell<LogicalRect<Au>>,
-
-    /// The LineItems for the current line under construction that have already
-    /// been committed to this line.
-    line_items: Vec<LineItem>,
-}
-
-impl LineUnderConstruction {
-    fn new(start_position: LogicalVec2<Au>) -> Self {
-        Self {
-            inline_position: start_position.inline,
-            start_position,
-            max_block_size: LineBlockSizes::zero(),
-            has_content: false,
-            has_floats_waiting_to_be_placed: false,
-            placement_among_floats: OnceCell::new(),
-            line_items: Vec::new(),
-        }
-    }
-
-    fn line_block_start_considering_placement_among_floats(&self) -> Au {
-        match self.placement_among_floats.get() {
-            Some(placement_among_floats) => placement_among_floats.start_corner.block,
-            None => self.start_position.block,
-        }
-    }
-
-    fn replace_placement_among_floats(&mut self, new_placement: LogicalRect<Au>) {
-        self.placement_among_floats.take();
-        let _ = self.placement_among_floats.set(new_placement);
-    }
-
-    /// Trim the trailing whitespace in this line and return the width of the whitespace trimmed.
-    fn trim_trailing_whitespace(&mut self) -> Au {
-        // From <https://www.w3.org/TR/css-text-3/#white-space-phase-2>:
-        // > 3. A sequence of collapsible spaces at the end of a line is removed,
-        // >    as well as any trailing U+1680   OGHAM SPACE MARK whose white-space
-        // >    property is normal, nowrap, or pre-line.
-        let mut whitespace_trimmed = Au::zero();
-        for item in self.line_items.iter_mut().rev() {
-            if !item.trim_whitespace_at_end(&mut whitespace_trimmed) {
-                break;
-            }
-        }
-
-        whitespace_trimmed
-    }
-
-    /// Count the number of justification opportunities in this line.
-    fn count_justification_opportunities(&self) -> usize {
-        self.line_items
-            .iter()
-            .filter_map(|item| match item {
-                LineItem::TextRun(_, text_run) => Some(
-                    text_run
-                        .text
-                        .iter()
-                        .map(|glyph_store| glyph_store.total_word_separators())
-                        .sum::<usize>(),
-                ),
-                _ => None,
-            })
-            .sum()
-    }
-}
-
-/// A block size relative to a line's final baseline. This is to track the size
-/// contribution of a particular element of a line above and below the baseline.
-/// These sizes can be combined with other baseline relative sizes before the
-/// final baseline position is known. The values here are relative to the
-/// overall line's baseline and *not* the nested baseline of an inline box.
-#[derive(Clone, Debug)]
-struct BaselineRelativeSize {
-    /// The ascent above the baseline, where a positive value means a larger
-    /// ascent. Thus, the top of this size contribution is `baseline_offset -
-    /// ascent`.
-    ascent: Au,
-
-    /// The descent below the baseline, where a positive value means a larger
-    /// descent. Thus, the bottom of this size contribution is `baseline_offset +
-    /// descent`.
-    descent: Au,
-}
-
-impl BaselineRelativeSize {
-    fn zero() -> Self {
-        Self {
-            ascent: Au::zero(),
-            descent: Au::zero(),
-        }
-    }
-
-    fn max(&self, other: &Self) -> Self {
-        BaselineRelativeSize {
-            ascent: self.ascent.max(other.ascent),
-            descent: self.descent.max(other.descent),
-        }
-    }
-
-    /// Given an offset from the line's root baseline, adjust this [`BaselineRelativeSize`]
-    /// by that offset. This is used to adjust a [`BaselineRelativeSize`] for different kinds
-    /// of baseline-relative `vertical-align`. This will "move" measured size of a particular
-    /// inline box's block size. For example, in the following HTML:
-    ///
-    /// ```html
-    ///     <div>
-    ///         <span style="vertical-align: 5px">child content</span>
-    ///     </div>
-    /// ````
-    ///
-    /// If this [`BaselineRelativeSize`] is for the `<span>` then the adjustment
-    /// passed here would be equivalent to -5px.
-    fn adjust_for_nested_baseline_offset(&mut self, baseline_offset: Au) {
-        self.ascent -= baseline_offset;
-        self.descent += baseline_offset;
-    }
-}
-
-#[derive(Clone, Debug)]
-struct LineBlockSizes {
-    line_height: Au,
-    baseline_relative_size_for_line_height: Option<BaselineRelativeSize>,
-    size_for_baseline_positioning: BaselineRelativeSize,
-}
-
-impl LineBlockSizes {
-    fn zero() -> Self {
-        LineBlockSizes {
-            line_height: Au::zero(),
-            baseline_relative_size_for_line_height: None,
-            size_for_baseline_positioning: BaselineRelativeSize::zero(),
-        }
-    }
-
-    fn resolve(&self) -> Au {
-        let height_from_ascent_and_descent = self
-            .baseline_relative_size_for_line_height
-            .as_ref()
-            .map(|size| (size.ascent + size.descent).abs())
-            .unwrap_or_else(Au::zero);
-        self.line_height.max(height_from_ascent_and_descent)
-    }
-
-    fn max(&self, other: &LineBlockSizes) -> LineBlockSizes {
-        let baseline_relative_size = match (
-            self.baseline_relative_size_for_line_height.as_ref(),
-            other.baseline_relative_size_for_line_height.as_ref(),
-        ) {
-            (Some(our_size), Some(other_size)) => Some(our_size.max(other_size)),
-            (our_size, other_size) => our_size.or(other_size).cloned(),
-        };
-        Self {
-            line_height: self.line_height.max(other.line_height),
-            baseline_relative_size_for_line_height: baseline_relative_size,
-            size_for_baseline_positioning: self
-                .size_for_baseline_positioning
-                .max(&other.size_for_baseline_positioning),
-        }
-    }
-
-    fn max_assign(&mut self, other: &LineBlockSizes) {
-        *self = self.max(other);
-    }
-
-    fn adjust_for_baseline_offset(&mut self, baseline_offset: Au) {
-        if let Some(size) = self.baseline_relative_size_for_line_height.as_mut() {
-            size.adjust_for_nested_baseline_offset(baseline_offset)
-        }
-        self.size_for_baseline_positioning
-            .adjust_for_nested_baseline_offset(baseline_offset);
-    }
-
-    /// From <https://drafts.csswg.org/css2/visudet.html#line-height>:
-    ///  > The inline-level boxes are aligned vertically according to their 'vertical-align'
-    ///  > property. In case they are aligned 'top' or 'bottom', they must be aligned so as
-    ///  > to minimize the line box height. If such boxes are tall enough, there are multiple
-    ///  > solutions and CSS 2 does not define the position of the line box's baseline (i.e.,
-    ///  > the position of the strut, see below).
-    fn find_baseline_offset(&self) -> Au {
-        match self.baseline_relative_size_for_line_height.as_ref() {
-            Some(size) => size.ascent,
-            None => {
-                // This is the case mentinoned above where there are multiple solutions.
-                // This code is putting the baseline roughly in the middle of the line.
-                let leading = self.resolve() -
-                    (self.size_for_baseline_positioning.ascent +
-                        self.size_for_baseline_positioning.descent);
-                leading.scale_by(0.5) + self.size_for_baseline_positioning.ascent
-            },
-        }
-    }
-}
-
-/// The current unbreakable segment under construction for an inline formatting context.
-/// Items accumulate here until we reach a soft line break opportunity during processing
-/// of inline content or we reach the end of the formatting context.
-struct UnbreakableSegmentUnderConstruction {
-    /// The size of this unbreakable segment in both dimension.
-    inline_size: Au,
-
-    /// The maximum block size that this segment has. This uses [`LineBlockSizes`] instead of a
-    /// simple value, because the final block size depends on vertical alignment.
-    max_block_size: LineBlockSizes,
-
-    /// The LineItems for the segment under construction
-    line_items: Vec<LineItem>,
-
-    /// The depth in the inline box hierarchy at the start of this segment. This is used
-    /// to prefix this segment when it is pushed to a new line.
-    inline_box_hierarchy_depth: Option<usize>,
-
-    /// Whether any active linebox has added a glyph or atomic element to this line
-    /// segment, which indicates that the next run that exceeds the line length can cause
-    /// a line break.
-    has_content: bool,
-
-    /// The inline size of any trailing whitespace in this segment.
-    trailing_whitespace_size: Au,
-}
-
-impl UnbreakableSegmentUnderConstruction {
-    fn new() -> Self {
-        Self {
-            inline_size: Au::zero(),
-            max_block_size: LineBlockSizes {
-                line_height: Au::zero(),
-                baseline_relative_size_for_line_height: None,
-                size_for_baseline_positioning: BaselineRelativeSize::zero(),
-            },
-            line_items: Vec::new(),
-            inline_box_hierarchy_depth: None,
-            has_content: false,
-            trailing_whitespace_size: Au::zero(),
-        }
-    }
-
-    /// Reset this segment after its contents have been committed to a line.
-    fn reset(&mut self) {
-        assert!(self.line_items.is_empty()); // Preserve allocated memory.
-        self.inline_size = Au::zero();
-        self.max_block_size = LineBlockSizes::zero();
-        self.inline_box_hierarchy_depth = None;
-        self.has_content = false;
-        self.trailing_whitespace_size = Au::zero();
-    }
-
-    /// Push a single line item to this segment. In addition, record the inline box
-    /// hierarchy depth if this is the first segment. The hierarchy depth is used to
-    /// duplicate the necessary `StartInlineBox` tokens if this segment is ultimately
-    /// placed on a new empty line.
-    fn push_line_item(&mut self, line_item: LineItem, inline_box_hierarchy_depth: usize) {
-        if self.line_items.is_empty() {
-            self.inline_box_hierarchy_depth = Some(inline_box_hierarchy_depth);
-        }
-        self.line_items.push(line_item);
-    }
-
-    /// Trim whitespace from the beginning of this UnbreakbleSegmentUnderConstruction.
-    ///
-    /// From <https://www.w3.org/TR/css-text-3/#white-space-phase-2>:
-    ///
-    /// > Then, the entire block is rendered. Inlines are laid out, taking bidi
-    /// > reordering into account, and wrapping as specified by the text-wrap
-    /// > property. As each line is laid out,
-    /// >  1. A sequence of collapsible spaces at the beginning of a line is removed.
-    ///
-    /// This prevents whitespace from being added to the beginning of a line.
-    fn trim_leading_whitespace(&mut self) {
-        let mut whitespace_trimmed = Au::zero();
-        for item in self.line_items.iter_mut() {
-            if !item.trim_whitespace_at_start(&mut whitespace_trimmed) {
-                break;
-            }
-        }
-        self.inline_size -= whitespace_trimmed;
-    }
-}
-
-bitflags! {
-    pub struct InlineContainerStateFlags: u8 {
-        const CREATE_STRUT = 0b0001;
-        const IS_SINGLE_LINE_TEXT_INPUT = 0b0010;
-    }
-}
-
-pub(super) struct InlineContainerState {
-    /// The style of this inline container.
-    style: Arc<ComputedValues>,
-
-    /// Flags which describe details of this [`InlineContainerState`].
-    flags: InlineContainerStateFlags,
-
-    /// Whether or not we have processed any content (an atomic element or text) for
-    /// this inline box on the current line OR any previous line.
-    has_content: RefCell<bool>,
-
-    /// Indicates whether this nesting level have text decorations in effect.
-    /// From <https://drafts.csswg.org/css-text-decor/#line-decoration>
-    // "When specified on or propagated to a block container that establishes
-    //  an IFC..."
-    text_decoration_line: TextDecorationLine,
-
-    /// The block size contribution of this container's default font ie the size of the
-    /// "strut." Whether this is integrated into the [`Self::nested_strut_block_sizes`]
-    /// depends on the line-height quirk described in
-    /// <https://quirks.spec.whatwg.org/#the-line-height-calculation-quirk>.
-    strut_block_sizes: LineBlockSizes,
-
-    /// The strut block size of this inline container maxed with the strut block
-    /// sizes of all inline container ancestors. In quirks mode, this will be
-    /// zero, until we know that an element has inline content.
-    nested_strut_block_sizes: LineBlockSizes,
-
-    /// The baseline offset of this container from the baseline of the line. The is the
-    /// cumulative offset of this container and all of its parents. In contrast to the
-    /// `vertical-align` property a positive value indicates an offset "below" the
-    /// baseline while a negative value indicates one "above" it (when the block direction
-    /// is vertical).
-    pub baseline_offset: Au,
-
-    /// The font metrics of the non-fallback font for this container.
-    font_metrics: FontMetrics,
-}
-
-pub(super) struct InlineFormattingContextLayout<'layout_data> {
-    positioning_context: &'layout_data mut PositioningContext,
-    containing_block: &'layout_data ContainingBlock<'layout_data>,
-    sequential_layout_state: Option<&'layout_data mut SequentialLayoutState>,
-    layout_context: &'layout_data LayoutContext<'layout_data>,
-
-    /// The [`InlineFormattingContext`] that we are laying out.
-    ifc: &'layout_data InlineFormattingContext,
-
-    /// The [`InlineContainerState`] for the container formed by the root of the
-    /// [`InlineFormattingContext`]. This is effectively the "root inline box" described
-    /// by <https://drafts.csswg.org/css-inline/#model>:
-    ///
-    /// > The block container also generates a root inline box, which is an anonymous
-    /// > inline box that holds all of its inline-level contents. (Thus, all text in an
-    /// > inline formatting context is directly contained by an inline box, whether the root
-    /// > inline box or one of its descendants.) The root inline box inherits from its
-    /// > parent block container, but is otherwise unstyleable.
-    root_nesting_level: InlineContainerState,
-
-    /// A stack of [`InlineBoxContainerState`] that is used to produce [`LineItem`]s either when we
-    /// reach the end of an inline box or when we reach the end of a line. Only at the end
-    /// of the inline box is the state popped from the stack.
-    inline_box_state_stack: Vec<Rc<InlineBoxContainerState>>,
-
-    /// A collection of [`InlineBoxContainerState`] of all the inlines that are present
-    /// in this inline formatting context. We keep this as well as the stack, so that we
-    /// can access them during line layout, which may happen after relevant [`InlineBoxContainerState`]s
-    /// have been popped of the the stack.
-    inline_box_states: Vec<Rc<InlineBoxContainerState>>,
-
-    /// A vector of fragment that are laid out. This includes one [`Fragment::Positioning`]
-    /// per line that is currently laid out plus fragments for all floats, which
-    /// are currently laid out at the top-level of each [`InlineFormattingContext`].
-    fragments: Vec<Fragment>,
-
-    /// Information about the line currently being laid out into [`LineItem`]s.
-    current_line: LineUnderConstruction,
-
-    /// Information about the unbreakable line segment currently being laid out into [`LineItem`]s.
-    current_line_segment: UnbreakableSegmentUnderConstruction,
-
-    /// After a forced line break (for instance from a `<br>` element) we wait to actually
-    /// break the line until seeing more content. This allows ongoing inline boxes to finish,
-    /// since in the case where they have no more content they should not be on the next
-    /// line.
-    ///
-    /// For instance:
-    ///
-    /// ``` html
-    ///    <span style="border-right: 30px solid blue;">
-    ///         first line<br>
-    ///    </span>
-    ///    second line
-    /// ```
-    ///
-    /// In this case, the `<span>` should not extend to the second line. If we linebreak
-    /// as soon as we encounter the `<br>` the `<span>`'s ending inline borders would be
-    /// placed on the second line, because we add those borders in
-    /// [`InlineFormattingContextLayout::finish_inline_box()`].
-    linebreak_before_new_content: bool,
-
-    /// When a `<br>` element has `clear`, this needs to be applied after the linebreak,
-    /// which will be processed *after* the `<br>` element is processed. This member
-    /// stores any deferred `clear` to apply after a linebreak.
-    deferred_br_clear: Clear,
-
-    /// Whether or not a soft wrap opportunity is queued. Soft wrap opportunities are
-    /// queued after replaced content and they are processed when the next text content
-    /// is encountered.
-    pub have_deferred_soft_wrap_opportunity: bool,
-
-    /// Whether or not this InlineFormattingContext has processed any in flow content at all.
-    had_inflow_content: bool,
-
-    /// Whether or not the layout of this InlineFormattingContext depends on the block size
-    /// of its container for the purposes of flexbox layout.
-    depends_on_block_constraints: bool,
-
-    /// The currently white-space-collapse setting of this line. This is stored on the
-    /// [`InlineFormattingContextLayout`] because when a soft wrap opportunity is defined
-    /// by the boundary between two characters, the white-space-collapse property of their
-    /// nearest common ancestor is used.
-    white_space_collapse: WhiteSpaceCollapse,
-
-    /// The currently text-wrap-mode setting of this line. This is stored on the
-    /// [`InlineFormattingContextLayout`] because when a soft wrap opportunity is defined
-    /// by the boundary between two characters, the text-wrap-mode property of their nearest
-    /// common ancestor is used.
-    text_wrap_mode: TextWrapMode,
-
-    /// The offset of the first and last baselines in the inline formatting context that we
-    /// are laying out. This is used to propagate baselines to the ancestors of
-    /// `display: inline-block` elements and table content.
-    baselines: Baselines,
-}
-
-impl InlineFormattingContextLayout<'_> {
-    fn current_inline_container_state(&self) -> &InlineContainerState {
-        match self.inline_box_state_stack.last() {
-            Some(inline_box_state) => &inline_box_state.base,
-            None => &self.root_nesting_level,
-        }
-    }
-
-    fn current_inline_box_identifier(&self) -> Option<InlineBoxIdentifier> {
-        self.inline_box_state_stack
-            .last()
-            .map(|state| state.identifier)
-    }
-
-    fn current_line_max_block_size_including_nested_containers(&self) -> LineBlockSizes {
-        self.current_inline_container_state()
-            .nested_strut_block_sizes
-            .max(&self.current_line.max_block_size)
-    }
-
-    fn propagate_current_nesting_level_white_space_style(&mut self) {
-        let style = match self.inline_box_state_stack.last() {
-            Some(inline_box_state) => &inline_box_state.base.style,
-            None => self.containing_block.style,
-        };
-        let style_text = style.get_inherited_text();
-        self.white_space_collapse = style_text.white_space_collapse;
-        self.text_wrap_mode = style_text.text_wrap_mode;
-    }
-
-    fn processing_br_element(&self) -> bool {
-        self.inline_box_state_stack
-            .last()
-            .map(|state| {
-                state
-                    .base_fragment_info
-                    .flags
-                    .contains(FragmentFlags::IS_BR_ELEMENT)
-            })
-            .unwrap_or(false)
-    }
-
-    /// Start laying out a particular [`InlineBox`] into line items. This will push
-    /// a new [`InlineBoxContainerState`] onto [`Self::inline_box_state_stack`].
-    fn start_inline_box(&mut self, inline_box: &InlineBox) {
-        let inline_box_state = InlineBoxContainerState::new(
-            inline_box,
-            self.containing_block,
-            self.layout_context,
-            self.current_inline_container_state(),
-            inline_box.is_last_fragment,
-            inline_box
-                .default_font_index
-                .map(|index| &self.ifc.font_metrics[index].metrics),
-        );
-
-        self.depends_on_block_constraints |= inline_box
-            .style
-            .depends_on_block_constraints_due_to_relative_positioning(
-                self.containing_block.style.writing_mode,
-            );
-
-        // If we are starting a `<br>` element prepare to clear after its deferred linebreak has been
-        // processed. Note that a `<br>` is composed of the element itself and the inner pseudo-element
-        // with the actual linebreak. Both will have this `FragmentFlag`; that's why this code only
-        // sets `deferred_br_clear` if it isn't set yet.
-        if inline_box_state
-            .base_fragment_info
-            .flags
-            .contains(FragmentFlags::IS_BR_ELEMENT) &&
-            self.deferred_br_clear == Clear::None
-        {
-            self.deferred_br_clear = Clear::from_style_and_container_writing_mode(
-                &inline_box_state.base.style,
-                self.containing_block.style.writing_mode,
-            );
-        }
-
-        if inline_box.is_first_fragment {
-            self.current_line_segment.inline_size += inline_box_state.pbm.padding.inline_start +
-                inline_box_state.pbm.border.inline_start +
-                inline_box_state.pbm.margin.inline_start.auto_is(Au::zero);
-            self.current_line_segment
-                .line_items
-                .push(LineItem::InlineStartBoxPaddingBorderMargin(
-                    inline_box.identifier,
-                ));
-        }
-
-        let inline_box_state = Rc::new(inline_box_state);
-
-        // Push the state onto the IFC-wide collection of states. Inline boxes are numbered in
-        // the order that they are encountered, so this should correspond to the order they
-        // are pushed onto `self.inline_box_states`.
-        assert_eq!(
-            self.inline_box_states.len(),
-            inline_box.identifier.index_in_inline_boxes as usize
-        );
-        self.inline_box_states.push(inline_box_state.clone());
-        self.inline_box_state_stack.push(inline_box_state);
-    }
-
-    /// Finish laying out a particular [`InlineBox`] into line items. This will
-    /// pop its state off of [`Self::inline_box_state_stack`].
-    fn finish_inline_box(&mut self) {
-        let inline_box_state = match self.inline_box_state_stack.pop() {
-            Some(inline_box_state) => inline_box_state,
-            None => return, // We are at the root.
-        };
-
-        self.current_line_segment
-            .max_block_size
-            .max_assign(&inline_box_state.base.nested_strut_block_sizes);
-
-        // If the inline box that we just finished had any content at all, we want to propagate
-        // the `white-space` property of its parent to future inline children. This is because
-        // when a soft wrap opportunity is defined by the boundary between two elements, the
-        // `white-space` used is that of their nearest common ancestor.
-        if *inline_box_state.base.has_content.borrow() {
-            self.propagate_current_nesting_level_white_space_style();
-        }
-
-        if inline_box_state.is_last_fragment {
-            let pbm_end = inline_box_state.pbm.padding.inline_end +
-                inline_box_state.pbm.border.inline_end +
-                inline_box_state.pbm.margin.inline_end.auto_is(Au::zero);
-            self.current_line_segment.inline_size += pbm_end;
-            self.current_line_segment
-                .line_items
-                .push(LineItem::InlineEndBoxPaddingBorderMargin(
-                    inline_box_state.identifier,
-                ))
-        }
-    }
-
-    fn finish_last_line(&mut self) {
-        // We are at the end of the IFC, and we need to do a few things to make sure that
-        // the current segment is committed and that the final line is finished.
-        //
-        // A soft wrap opportunity makes it so the current segment is placed on a new line
-        // if it doesn't fit on the current line under construction.
-        self.process_soft_wrap_opportunity();
-
-        // `process_soft_line_wrap_opportunity` does not commit the segment to a line if
-        // there is no line wrapping, so this forces the segment into the current line.
-        self.commit_current_segment_to_line();
-
-        // Finally we finish the line itself and convert all of the LineItems into
-        // fragments.
-        self.finish_current_line_and_reset(true /* last_line_or_forced_line_break */);
-    }
-
-    /// Finish layout of all inline boxes for the current line. This will gather all
-    /// [`LineItem`]s and turn them into [`Fragment`]s, then reset the
-    /// [`InlineFormattingContextLayout`] preparing it for laying out a new line.
-    fn finish_current_line_and_reset(&mut self, last_line_or_forced_line_break: bool) {
-        let whitespace_trimmed = self.current_line.trim_trailing_whitespace();
-        let (inline_start_position, justification_adjustment) = self
-            .calculate_current_line_inline_start_and_justification_adjustment(
-                whitespace_trimmed,
-                last_line_or_forced_line_break,
-            );
-
-        let block_start_position = self
-            .current_line
-            .line_block_start_considering_placement_among_floats();
-        let had_inline_advance =
-            self.current_line.inline_position != self.current_line.start_position.inline;
-
-        let effective_block_advance = if self.current_line.has_content ||
-            had_inline_advance ||
-            self.linebreak_before_new_content
-        {
-            self.current_line_max_block_size_including_nested_containers()
-        } else {
-            LineBlockSizes::zero()
-        };
-
-        let resolved_block_advance = effective_block_advance.resolve();
-        let mut block_end_position = block_start_position + resolved_block_advance;
-        if let Some(sequential_layout_state) = self.sequential_layout_state.as_mut() {
-            // This amount includes both the block size of the line and any extra space
-            // added to move the line down in order to avoid overlapping floats.
-            let increment = block_end_position - self.current_line.start_position.block;
-            sequential_layout_state.advance_block_position(increment);
-
-            // This newline may have been triggered by a `<br>` with clearance, in which case we
-            // want to make sure that we make space not only for the current line, but any clearance
-            // from floats.
-            if let Some(clearance) = sequential_layout_state
-                .calculate_clearance(self.deferred_br_clear, &CollapsedMargin::zero())
-            {
-                sequential_layout_state.advance_block_position(clearance);
-                block_end_position += clearance;
-            };
-            self.deferred_br_clear = Clear::None;
-        }
-
-        // Set up the new line now that we no longer need the old one.
-        let mut line_to_layout = std::mem::replace(
-            &mut self.current_line,
-            LineUnderConstruction::new(LogicalVec2 {
-                inline: Au::zero(),
-                block: block_end_position,
-            }),
-        );
-
-        if line_to_layout.has_floats_waiting_to_be_placed {
-            place_pending_floats(self, &mut line_to_layout.line_items);
-        }
-
-        let start_position = LogicalVec2 {
-            block: block_start_position,
-            inline: inline_start_position,
-        };
-
-        let baseline_offset = effective_block_advance.find_baseline_offset();
-        let start_positioning_context_length = self.positioning_context.len();
-        let fragments = LineItemLayout::layout_line_items(
-            self,
-            line_to_layout.line_items,
-            start_position,
-            &effective_block_advance,
-            justification_adjustment,
-        );
-
-        // If the line doesn't have any fragments, we don't need to add a containing fragment for it.
-        if fragments.is_empty() &&
-            self.positioning_context.len() == start_positioning_context_length
-        {
-            return;
-        }
-
-        let baseline = baseline_offset + block_start_position;
-        self.baselines.first.get_or_insert(baseline);
-        self.baselines.last = Some(baseline);
-
-        // The inline part of this start offset was taken into account when determining
-        // the inline start of the line in `calculate_inline_start_for_current_line` so
-        // we do not need to include it in the `start_corner` of the line's main Fragment.
-        let start_corner = LogicalVec2 {
-            inline: Au::zero(),
-            block: block_start_position,
-        };
-
-        let logical_origin_in_physical_coordinates =
-            start_corner.to_physical_vector(self.containing_block.style.writing_mode);
-        self.positioning_context
-            .adjust_static_position_of_hoisted_fragments_with_offset(
-                &logical_origin_in_physical_coordinates,
-                start_positioning_context_length,
-            );
-
-        let physical_line_rect = LogicalRect {
-            start_corner,
-            size: LogicalVec2 {
-                inline: self.containing_block.size.inline,
-                block: effective_block_advance.resolve(),
-            },
-        }
-        .as_physical(Some(self.containing_block));
-        self.fragments
-            .push(Fragment::Positioning(PositioningFragment::new_anonymous(
-                physical_line_rect,
-                fragments,
-            )));
-    }
-
-    /// Given the amount of whitespace trimmed from the line and taking into consideration
-    /// the `text-align` property, calculate where the line under construction starts in
-    /// the inline axis as well as the adjustment needed for every justification opportunity
-    /// to account for `text-align: justify`.
-    fn calculate_current_line_inline_start_and_justification_adjustment(
-        &self,
-        whitespace_trimmed: Au,
-        last_line_or_forced_line_break: bool,
-    ) -> (Au, Au) {
-        enum TextAlign {
-            Start,
-            Center,
-            End,
-        }
-        let style = self.containing_block.style;
-        let mut text_align_keyword = style.clone_text_align();
-
-        if last_line_or_forced_line_break {
-            text_align_keyword = match style.clone_text_align_last() {
-                TextAlignLast::Auto if text_align_keyword == TextAlignKeyword::Justify => {
-                    TextAlignKeyword::Start
-                },
-                TextAlignLast::Auto => text_align_keyword,
-                TextAlignLast::Start => TextAlignKeyword::Start,
-                TextAlignLast::End => TextAlignKeyword::End,
-                TextAlignLast::Left => TextAlignKeyword::Left,
-                TextAlignLast::Right => TextAlignKeyword::Right,
-                TextAlignLast::Center => TextAlignKeyword::Center,
-                TextAlignLast::Justify => TextAlignKeyword::Justify,
-            };
-        }
-
-        let text_align = match text_align_keyword {
-            TextAlignKeyword::Start => TextAlign::Start,
-            TextAlignKeyword::Center | TextAlignKeyword::MozCenter => TextAlign::Center,
-            TextAlignKeyword::End => TextAlign::End,
-            TextAlignKeyword::Left | TextAlignKeyword::MozLeft => {
-                if style.writing_mode.line_left_is_inline_start() {
-                    TextAlign::Start
-                } else {
-                    TextAlign::End
-                }
-            },
-            TextAlignKeyword::Right | TextAlignKeyword::MozRight => {
-                if style.writing_mode.line_left_is_inline_start() {
-                    TextAlign::End
-                } else {
-                    TextAlign::Start
-                }
-            },
-            TextAlignKeyword::Justify => TextAlign::Start,
-        };
-
-        let (line_start, available_space) = match self.current_line.placement_among_floats.get() {
-            Some(placement_among_floats) => (
-                placement_among_floats.start_corner.inline,
-                placement_among_floats.size.inline,
-            ),
-            None => (Au::zero(), self.containing_block.size.inline),
-        };
-
-        // Properly handling text-indent requires that we do not align the text
-        // into the text-indent.
-        // See <https://drafts.csswg.org/css-text/#text-indent-property>
-        // "This property specifies the indentation applied to lines of inline content in
-        // a block. The indent is treated as a margin applied to the start edge of the
-        // line box."
-        let text_indent = self.current_line.start_position.inline;
-        let line_length = self.current_line.inline_position - whitespace_trimmed - text_indent;
-        let adjusted_line_start = line_start +
-            match text_align {
-                TextAlign::Start => text_indent,
-                TextAlign::End => (available_space - line_length).max(text_indent),
-                TextAlign::Center => (available_space - line_length + text_indent)
-                    .scale_by(0.5)
-                    .max(text_indent),
-            };
-
-        // Calculate the justification adjustment. This is simply the remaining space on the line,
-        // dividided by the number of justficiation opportunities that we recorded when building
-        // the line.
-        let text_justify = self.containing_block.style.clone_text_justify();
-        let justification_adjustment = match (text_align_keyword, text_justify) {
-            // `text-justify: none` should disable text justification.
-            // TODO: Handle more `text-justify` values.
-            (TextAlignKeyword::Justify, TextJustify::None) => Au::zero(),
-            (TextAlignKeyword::Justify, _) => {
-                match self.current_line.count_justification_opportunities() {
-                    0 => Au::zero(),
-                    num_justification_opportunities => {
-                        (available_space - text_indent - line_length)
-                            .scale_by(1. / num_justification_opportunities as f32)
-                    },
-                }
-            },
-            _ => Au::zero(),
-        };
-
-        // If the content overflows the line, then justification adjustment will become negative. In
-        // that case, do not make any adjustment for justification.
-        let justification_adjustment = justification_adjustment.max(Au::zero());
-
-        (adjusted_line_start, justification_adjustment)
-    }
-
-    fn place_float_fragment(&mut self, fragment: &mut BoxFragment) {
-        let state = self
-            .sequential_layout_state
-            .as_mut()
-            .expect("Tried to lay out a float with no sequential placement state!");
-
-        let block_offset_from_containining_block_top = state
-            .current_block_position_including_margins() -
-            state.current_containing_block_offset();
-        state.place_float_fragment(
-            fragment,
-            self.containing_block,
-            CollapsedMargin::zero(),
-            block_offset_from_containining_block_top,
-        );
-    }
-
-    /// Place a FloatLineItem. This is done when an unbreakable segment is committed to
-    /// the current line. Placement of FloatLineItems might need to be deferred until the
-    /// line is complete in the case that floats stop fitting on the current line.
-    ///
-    /// When placing floats we do not want to take into account any trailing whitespace on
-    /// the line, because that whitespace will be trimmed in the case that the line is
-    /// broken. Thus this function takes as an argument the new size (without whitespace) of
-    /// the line that these floats are joining.
-    fn place_float_line_item_for_commit_to_line(
-        &mut self,
-        float_item: &mut FloatLineItem,
-        line_inline_size_without_trailing_whitespace: Au,
-    ) {
-        let logical_margin_rect_size = float_item
-            .fragment
-            .margin_rect()
-            .size
-            .to_logical(self.containing_block.style.writing_mode);
-        let inline_size = logical_margin_rect_size.inline.max(Au::zero());
-
-        let available_inline_size = match self.current_line.placement_among_floats.get() {
-            Some(placement_among_floats) => placement_among_floats.size.inline,
-            None => self.containing_block.size.inline,
-        } - line_inline_size_without_trailing_whitespace;
-
-        // If this float doesn't fit on the current line or a previous float didn't fit on
-        // the current line, we need to place it starting at the next line BUT still as
-        // children of this line's hierarchy of inline boxes (for the purposes of properly
-        // parenting in their stacking contexts). Once all the line content is gathered we
-        // will place them later.
-        let has_content = self.current_line.has_content || self.current_line_segment.has_content;
-        let fits_on_line = !has_content || inline_size <= available_inline_size;
-        let needs_placement_later =
-            self.current_line.has_floats_waiting_to_be_placed || !fits_on_line;
-
-        if needs_placement_later {
-            self.current_line.has_floats_waiting_to_be_placed = true;
-        } else {
-            self.place_float_fragment(&mut float_item.fragment);
-            float_item.needs_placement = false;
-        }
-
-        // We've added a new float to the IFC, but this may have actually changed the
-        // position of the current line. In order to determine that we regenerate the
-        // placement among floats for the current line, which may adjust its inline
-        // start position.
-        let new_placement = self.place_line_among_floats(&LogicalVec2 {
-            inline: line_inline_size_without_trailing_whitespace,
-            block: self.current_line.max_block_size.resolve(),
-        });
-        self.current_line
-            .replace_placement_among_floats(new_placement);
-    }
-
-    /// Given a new potential line size for the current line, create a "placement" for that line.
-    /// This tells us whether or not the new potential line will fit in the current block position
-    /// or need to be moved. In addition, the placement rect determines the inline start and end
-    /// of the line if it's used as the final placement among floats.
-    fn place_line_among_floats(&self, potential_line_size: &LogicalVec2<Au>) -> LogicalRect<Au> {
-        let sequential_layout_state = self
-            .sequential_layout_state
-            .as_ref()
-            .expect("Should not have called this function without having floats.");
-
-        let ifc_offset_in_float_container = LogicalVec2 {
-            inline: sequential_layout_state
-                .floats
-                .containing_block_info
-                .inline_start,
-            block: sequential_layout_state.current_containing_block_offset(),
-        };
-
-        let ceiling = self
-            .current_line
-            .line_block_start_considering_placement_among_floats();
-        let mut placement = PlacementAmongFloats::new(
-            &sequential_layout_state.floats,
-            ceiling + ifc_offset_in_float_container.block,
-            LogicalVec2 {
-                inline: potential_line_size.inline,
-                block: potential_line_size.block,
-            },
-            &PaddingBorderMargin::zero(),
-        );
-
-        let mut placement_rect = placement.place();
-        placement_rect.start_corner -= ifc_offset_in_float_container;
-        placement_rect
-    }
-
-    /// Returns true if a new potential line size for the current line would require a line
-    /// break. This takes into account floats and will also update the "placement among
-    /// floats" for this line if the potential line size would not cause a line break.
-    /// Thus, calling this method has side effects and should only be done while in the
-    /// process of laying out line content that is always going to be committed to this
-    /// line or the next.
-    fn new_potential_line_size_causes_line_break(
-        &mut self,
-        potential_line_size: &LogicalVec2<Au>,
-    ) -> bool {
-        let available_line_space = if self.sequential_layout_state.is_some() {
-            self.current_line
-                .placement_among_floats
-                .get_or_init(|| self.place_line_among_floats(potential_line_size))
-                .size
-        } else {
-            LogicalVec2 {
-                inline: self.containing_block.size.inline,
-                block: MAX_AU,
-            }
-        };
-
-        let inline_would_overflow = potential_line_size.inline > available_line_space.inline;
-        let block_would_overflow = potential_line_size.block > available_line_space.block;
-
-        // The first content that is added to a line cannot trigger a line break and
-        // the `white-space` propertly can also prevent all line breaking.
-        let can_break = self.current_line.has_content;
-
-        // If this is the first content on the line and we already have a float placement,
-        // that means that the placement was initialized by a leading float in the IFC.
-        // This placement needs to be updated, because the first line content might push
-        // the block start of the line downward. If there is no float placement, we want
-        // to make one to properly set the block position of the line.
-        if !can_break {
-            // Even if we cannot break, adding content to this line might change its position.
-            // In that case we need to redo our placement among floats.
-            if self.sequential_layout_state.is_some() &&
-                (inline_would_overflow || block_would_overflow)
-            {
-                let new_placement = self.place_line_among_floats(potential_line_size);
-                self.current_line
-                    .replace_placement_among_floats(new_placement);
-            }
-
-            return false;
-        }
-
-        // If the potential line is larger than the containing block we do not even need to consider
-        // floats. We definitely have to do a linebreak.
-        if potential_line_size.inline > self.containing_block.size.inline {
-            return true;
-        }
-
-        // Not fitting in the block space means that our block size has changed and we had a
-        // placement among floats that is no longer valid. This same placement might just
-        // need to be expanded or perhaps we need to line break.
-        if block_would_overflow {
-            // If we have a limited block size then we are wedging this line between floats.
-            assert!(self.sequential_layout_state.is_some());
-            let new_placement = self.place_line_among_floats(potential_line_size);
-            if new_placement.start_corner.block !=
-                self.current_line
-                    .line_block_start_considering_placement_among_floats()
-            {
-                return true;
-            } else {
-                self.current_line
-                    .replace_placement_among_floats(new_placement);
-                return false;
-            }
-        }
-
-        // Otherwise the new potential line size will require a newline if it fits in the
-        // inline space available for this line. This space may be smaller than the
-        // containing block if floats shrink the available inline space.
-        inline_would_overflow
-    }
-
-    pub(super) fn defer_forced_line_break(&mut self) {
-        // If the current portion of the unbreakable segment does not fit on the current line
-        // we need to put it on a new line *before* actually triggering the hard line break.
-        if !self.unbreakable_segment_fits_on_line() {
-            self.process_line_break(false /* forced_line_break */);
-        }
-
-        // Defer the actual line break until we've cleared all ending inline boxes.
-        self.linebreak_before_new_content = true;
-
-        // In quirks mode, the line-height isn't automatically added to the line. If we consider a
-        // forced line break a kind of preserved white space, quirks mode requires that we add the
-        // line-height of the current element to the line box height.
-        //
-        // The exception here is `<br>` elements. They are implemented with `pre-line` in Servo, but
-        // this is an implementation detail. The "magic" behavior of `<br>` elements is that they
-        // add line-height to the line conditionally: only when they are on an otherwise empty line.
-        let line_is_empty =
-            !self.current_line_segment.has_content && !self.current_line.has_content;
-        if !self.processing_br_element() || line_is_empty {
-            let strut_size = self
-                .current_inline_container_state()
-                .strut_block_sizes
-                .clone();
-            self.update_unbreakable_segment_for_new_content(
-                &strut_size,
-                Au::zero(),
-                SegmentContentFlags::empty(),
-            );
-        }
-
-        self.had_inflow_content = true;
-    }
-
-    pub(super) fn possibly_flush_deferred_forced_line_break(&mut self) {
-        if !self.linebreak_before_new_content {
-            return;
-        }
-
-        self.commit_current_segment_to_line();
-        self.process_line_break(true /* forced_line_break */);
-        self.linebreak_before_new_content = false;
-    }
-
-    fn push_line_item_to_unbreakable_segment(&mut self, line_item: LineItem) {
-        self.current_line_segment
-            .push_line_item(line_item, self.inline_box_state_stack.len());
-    }
-
-    pub(super) fn push_glyph_store_to_unbreakable_segment(
-        &mut self,
-        glyph_store: std::sync::Arc<GlyphStore>,
-        text_run: &TextRun,
-        font_index: usize,
-        bidi_level: Level,
-    ) {
-        let inline_advance = glyph_store.total_advance();
-        let flags = if glyph_store.is_whitespace() {
-            SegmentContentFlags::from(text_run.parent_style.get_inherited_text())
-        } else {
-            SegmentContentFlags::empty()
-        };
-
-        // If the metrics of this font don't match the default font, we are likely using a fallback
-        // font and need to adjust the line size to account for a potentially different font.
-        // If somehow the metrics match, the line size won't change.
-        let ifc_font_info = &self.ifc.font_metrics[font_index];
-        let font_metrics = ifc_font_info.metrics.clone();
-        let using_fallback_font =
-            self.current_inline_container_state().font_metrics != font_metrics;
-
-        let quirks_mode = self.layout_context.style_context.quirks_mode() != QuirksMode::NoQuirks;
-        let strut_size = if using_fallback_font {
-            // TODO(mrobinson): This value should probably be cached somewhere.
-            let container_state = self.current_inline_container_state();
-            let vertical_align = effective_vertical_align(
-                &container_state.style,
-                self.inline_box_state_stack.last().map(|c| &c.base),
-            );
-            let mut block_size = container_state.get_block_size_contribution(
-                vertical_align,
-                &font_metrics,
-                &container_state.font_metrics,
-            );
-            block_size.adjust_for_baseline_offset(container_state.baseline_offset);
-            block_size
-        } else if quirks_mode && !flags.is_collapsible_whitespace() {
-            // Normally, the strut is incorporated into the nested block size. In quirks mode though
-            // if we find any text that isn't collapsed whitespace, we need to incorporate the strut.
-            // TODO(mrobinson): This isn't quite right for situations where collapsible white space
-            // ultimately does not collapse because it is between two other pieces of content.
-            self.current_inline_container_state()
-                .strut_block_sizes
-                .clone()
-        } else {
-            LineBlockSizes::zero()
-        };
-        self.update_unbreakable_segment_for_new_content(&strut_size, inline_advance, flags);
-
-        let current_inline_box_identifier = self.current_inline_box_identifier();
-        match self.current_line_segment.line_items.last_mut() {
-            Some(LineItem::TextRun(inline_box_identifier, line_item))
-                if *inline_box_identifier == current_inline_box_identifier &&
-                    line_item.can_merge(ifc_font_info.key, bidi_level) =>
-            {
-                line_item.text.push(glyph_store);
-                return;
-            },
-            _ => {},
-        }
-
-        self.push_line_item_to_unbreakable_segment(LineItem::TextRun(
-            current_inline_box_identifier,
-            TextRunLineItem {
-                text: vec![glyph_store],
-                base_fragment_info: text_run.base_fragment_info,
-                parent_style: text_run.parent_style.clone(),
-                font_metrics,
-                font_key: ifc_font_info.key,
-                text_decoration_line: self.current_inline_container_state().text_decoration_line,
-                bidi_level,
-            },
-        ));
-    }
-
-    fn update_unbreakable_segment_for_new_content(
-        &mut self,
-        block_sizes_of_content: &LineBlockSizes,
-        inline_size: Au,
-        flags: SegmentContentFlags,
-    ) {
-        if flags.is_collapsible_whitespace() || flags.is_wrappable_and_hangable() {
-            self.current_line_segment.trailing_whitespace_size = inline_size;
-        } else {
-            self.current_line_segment.trailing_whitespace_size = Au::zero();
-        }
-        if !flags.is_collapsible_whitespace() {
-            self.current_line_segment.has_content = true;
-            self.had_inflow_content = true;
-        }
-
-        // This may or may not include the size of the strut depending on the quirks mode setting.
-        let container_max_block_size = &self
-            .current_inline_container_state()
-            .nested_strut_block_sizes
-            .clone();
-        self.current_line_segment
-            .max_block_size
-            .max_assign(container_max_block_size);
-        self.current_line_segment
-            .max_block_size
-            .max_assign(block_sizes_of_content);
-
-        self.current_line_segment.inline_size += inline_size;
-
-        // Propagate the whitespace setting to the current nesting level.
-        *self
-            .current_inline_container_state()
-            .has_content
-            .borrow_mut() = true;
-        self.propagate_current_nesting_level_white_space_style();
-    }
-
-    fn process_line_break(&mut self, forced_line_break: bool) {
-        self.current_line_segment.trim_leading_whitespace();
-        self.finish_current_line_and_reset(forced_line_break);
-    }
-
-    pub(super) fn unbreakable_segment_fits_on_line(&mut self) -> bool {
-        let potential_line_size = LogicalVec2 {
-            inline: self.current_line.inline_position + self.current_line_segment.inline_size -
-                self.current_line_segment.trailing_whitespace_size,
-            block: self
-                .current_line_max_block_size_including_nested_containers()
-                .max(&self.current_line_segment.max_block_size)
-                .resolve(),
-        };
-
-        !self.new_potential_line_size_causes_line_break(&potential_line_size)
-    }
-
-    /// Process a soft wrap opportunity. This will either commit the current unbreakble
-    /// segment to the current line, if it fits within the containing block and float
-    /// placement boundaries, or do a line break and then commit the segment.
-    pub(super) fn process_soft_wrap_opportunity(&mut self) {
-        if self.current_line_segment.line_items.is_empty() {
-            return;
-        }
-        if self.text_wrap_mode == TextWrapMode::Nowrap {
-            return;
-        }
-
-        let potential_line_size = LogicalVec2 {
-            inline: self.current_line.inline_position + self.current_line_segment.inline_size -
-                self.current_line_segment.trailing_whitespace_size,
-            block: self
-                .current_line_max_block_size_including_nested_containers()
-                .max(&self.current_line_segment.max_block_size)
-                .resolve(),
-        };
-
-        if self.new_potential_line_size_causes_line_break(&potential_line_size) {
-            self.process_line_break(false /* forced_line_break */);
-        }
-        self.commit_current_segment_to_line();
-    }
-
-    /// Commit the current unbrekable segment to the current line. In addition, this will
-    /// place all floats in the unbreakable segment and expand the line dimensions.
-    fn commit_current_segment_to_line(&mut self) {
-        // The line segments might have no items and have content after processing a forced
-        // linebreak on an empty line.
-        if self.current_line_segment.line_items.is_empty() && !self.current_line_segment.has_content
-        {
-            return;
-        }
-
-        if !self.current_line.has_content {
-            self.current_line_segment.trim_leading_whitespace();
-        }
-
-        self.current_line.inline_position += self.current_line_segment.inline_size;
-        self.current_line.max_block_size = self
-            .current_line_max_block_size_including_nested_containers()
-            .max(&self.current_line_segment.max_block_size);
-        let line_inline_size_without_trailing_whitespace =
-            self.current_line.inline_position - self.current_line_segment.trailing_whitespace_size;
-
-        // Place all floats in this unbreakable segment.
-        let mut segment_items = mem::take(&mut self.current_line_segment.line_items);
-        for item in segment_items.iter_mut() {
-            if let LineItem::Float(_, float_item) = item {
-                self.place_float_line_item_for_commit_to_line(
-                    float_item,
-                    line_inline_size_without_trailing_whitespace,
-                );
-            }
-        }
-
-        // If the current line was never placed among floats, we need to do that now based on the
-        // new size. Calling `new_potential_line_size_causes_line_break()` here triggers the
-        // new line to be positioned among floats. This should never ask for a line
-        // break because it is the first content on the line.
-        if self.current_line.line_items.is_empty() {
-            let will_break = self.new_potential_line_size_causes_line_break(&LogicalVec2 {
-                inline: line_inline_size_without_trailing_whitespace,
-                block: self.current_line_segment.max_block_size.resolve(),
-            });
-            assert!(!will_break);
-        }
-
-        self.current_line.line_items.extend(segment_items);
-        self.current_line.has_content |= self.current_line_segment.has_content;
-
-        self.current_line_segment.reset();
-    }
-}
-
-bitflags! {
-    pub struct SegmentContentFlags: u8 {
-        const COLLAPSIBLE_WHITESPACE = 0b00000001;
-        const WRAPPABLE_AND_HANGABLE_WHITESPACE = 0b00000010;
-    }
-}
-
-impl SegmentContentFlags {
-    fn is_collapsible_whitespace(&self) -> bool {
-        self.contains(Self::COLLAPSIBLE_WHITESPACE)
-    }
-
-    fn is_wrappable_and_hangable(&self) -> bool {
-        self.contains(Self::WRAPPABLE_AND_HANGABLE_WHITESPACE)
-    }
-}
-
-impl From<&InheritedText> for SegmentContentFlags {
-    fn from(style_text: &InheritedText) -> Self {
-        let mut flags = Self::empty();
-
-        // White-space with `white-space-collapse: break-spaces` or `white-space-collapse: preserve`
-        // never collapses.
-        if !matches!(
-            style_text.white_space_collapse,
-            WhiteSpaceCollapse::Preserve | WhiteSpaceCollapse::BreakSpaces
-        ) {
-            flags.insert(Self::COLLAPSIBLE_WHITESPACE);
-        }
-
-        // White-space with `white-space-collapse: break-spaces` never hangs and always takes up
-        // space.
-        if style_text.text_wrap_mode == TextWrapMode::Wrap &&
-            style_text.white_space_collapse != WhiteSpaceCollapse::BreakSpaces
-        {
-            flags.insert(Self::WRAPPABLE_AND_HANGABLE_WHITESPACE);
-        }
-        flags
-    }
-}
-
-impl InlineFormattingContext {
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(
-            name = "InlineFormattingContext::new_with_builder",
-            skip_all,
-            fields(servo_profiling = true),
-            level = "trace",
-        )
-    )]
-    pub(super) fn new_with_builder(
-        builder: InlineFormattingContextBuilder,
-        layout_context: &LayoutContext,
-        propagated_data: PropagatedBoxTreeData,
-        has_first_formatted_line: bool,
-        is_single_line_text_input: bool,
-        starting_bidi_level: Level,
-    ) -> Self {
-        // This is to prevent a double borrow.
-        let text_content: String = builder.text_segments.into_iter().collect();
-        let mut font_metrics = Vec::new();
-
-        let bidi_info = BidiInfo::new(&text_content, Some(starting_bidi_level));
-        let has_right_to_left_content = bidi_info.has_rtl();
-
-        let mut new_linebreaker = LineBreaker::new(text_content.as_str());
-        for item in builder.inline_items.iter() {
-            match &mut *item.borrow_mut() {
-                InlineItem::TextRun(text_run) => {
-                    text_run.borrow_mut().segment_and_shape(
-                        &text_content,
-                        &layout_context.font_context,
-                        &mut new_linebreaker,
-                        &mut font_metrics,
-                        &bidi_info,
-                    );
-                },
-                InlineItem::StartInlineBox(inline_box) => {
-                    let inline_box = &mut *inline_box.borrow_mut();
-                    if let Some(font) = get_font_for_first_font_for_style(
-                        &inline_box.style,
-                        &layout_context.font_context,
-                    ) {
-                        inline_box.default_font_index = Some(add_or_get_font(
-                            &font,
-                            &mut font_metrics,
-                            &layout_context.font_context,
-                        ));
-                    }
-                },
-                InlineItem::Atomic(_, index_in_text, bidi_level) => {
-                    *bidi_level = bidi_info.levels[*index_in_text];
-                },
-                InlineItem::OutOfFlowAbsolutelyPositionedBox(..) |
-                InlineItem::OutOfFlowFloatBox(_) |
-                InlineItem::EndInlineBox => {},
-            }
-        }
-
-        InlineFormattingContext {
-            text_content,
-            inline_items: builder.inline_items,
-            inline_boxes: builder.inline_boxes,
-            font_metrics,
-            text_decoration_line: propagated_data.text_decoration,
-            has_first_formatted_line,
-            contains_floats: builder.contains_floats,
-            is_single_line_text_input,
-            has_right_to_left_content,
-        }
-    }
-
-    pub(super) fn layout(
-        &self,
-        layout_context: &LayoutContext,
-        positioning_context: &mut PositioningContext,
-        containing_block: &ContainingBlock,
-        sequential_layout_state: Option<&mut SequentialLayoutState>,
-        collapsible_with_parent_start_margin: CollapsibleWithParentStartMargin,
-    ) -> CacheableLayoutResult {
-        let first_line_inline_start = if self.has_first_formatted_line {
-            containing_block
-                .style
-                .get_inherited_text()
-                .text_indent
-                .length
-                .to_used_value(containing_block.size.inline)
-        } else {
-            Au::zero()
-        };
-
-        let style = containing_block.style;
-
-        // It's unfortunate that it isn't possible to get this during IFC text processing, but in
-        // that situation the style of the containing block is unknown.
-        let default_font_metrics =
-            get_font_for_first_font_for_style(style, &layout_context.font_context)
-                .map(|font| font.metrics.clone());
-
-        let style_text = containing_block.style.get_inherited_text();
-        let mut inline_container_state_flags = InlineContainerStateFlags::empty();
-        if inline_container_needs_strut(style, layout_context, None) {
-            inline_container_state_flags.insert(InlineContainerStateFlags::CREATE_STRUT);
-        }
-        if self.is_single_line_text_input {
-            inline_container_state_flags
-                .insert(InlineContainerStateFlags::IS_SINGLE_LINE_TEXT_INPUT);
-        }
-
-        let mut layout = InlineFormattingContextLayout {
-            positioning_context,
-            containing_block,
-            sequential_layout_state,
-            layout_context,
-            ifc: self,
-            fragments: Vec::new(),
-            current_line: LineUnderConstruction::new(LogicalVec2 {
-                inline: first_line_inline_start,
-                block: Au::zero(),
-            }),
-            root_nesting_level: InlineContainerState::new(
-                style.to_arc(),
-                inline_container_state_flags,
-                None, /* parent_container */
-                self.text_decoration_line,
-                default_font_metrics.as_ref(),
-            ),
-            inline_box_state_stack: Vec::new(),
-            inline_box_states: Vec::with_capacity(self.inline_boxes.len()),
-            current_line_segment: UnbreakableSegmentUnderConstruction::new(),
-            linebreak_before_new_content: false,
-            deferred_br_clear: Clear::None,
-            have_deferred_soft_wrap_opportunity: false,
-            had_inflow_content: false,
-            depends_on_block_constraints: false,
-            white_space_collapse: style_text.white_space_collapse,
-            text_wrap_mode: style_text.text_wrap_mode,
-            baselines: Baselines::default(),
-        };
-
-        // FIXME(pcwalton): This assumes that margins never collapse through inline formatting
-        // contexts (i.e. that inline formatting contexts are never empty). Is that right?
-        // FIXME(mrobinson): This should not happen if the IFC collapses through.
-        if let Some(ref mut sequential_layout_state) = layout.sequential_layout_state {
-            sequential_layout_state.collapse_margins();
-            // FIXME(mrobinson): Collapse margins in the containing block offsets as well??
-        }
-
-        for item in self.inline_items.iter() {
-            let item = &*item.borrow();
-
-            // Any new box should flush a pending hard line break.
-            if !matches!(item, InlineItem::EndInlineBox) {
-                layout.possibly_flush_deferred_forced_line_break();
-            }
-
-            match item {
-                InlineItem::StartInlineBox(inline_box) => {
-                    layout.start_inline_box(&inline_box.borrow());
-                },
-                InlineItem::EndInlineBox => layout.finish_inline_box(),
-                InlineItem::TextRun(run) => run.borrow().layout_into_line_items(&mut layout),
-                InlineItem::Atomic(atomic_formatting_context, offset_in_text, bidi_level) => {
-                    atomic_formatting_context.layout_into_line_items(
-                        &mut layout,
-                        *offset_in_text,
-                        *bidi_level,
-                    );
-                },
-                InlineItem::OutOfFlowAbsolutelyPositionedBox(positioned_box, _) => {
-                    layout.push_line_item_to_unbreakable_segment(LineItem::AbsolutelyPositioned(
-                        layout.current_inline_box_identifier(),
-                        AbsolutelyPositionedLineItem {
-                            absolutely_positioned_box: positioned_box.clone(),
-                        },
-                    ));
-                },
-                InlineItem::OutOfFlowFloatBox(float_box) => {
-                    float_box.layout_into_line_items(&mut layout);
-                },
-            }
-        }
-
-        layout.finish_last_line();
-
-        let mut collapsible_margins_in_children = CollapsedBlockMargins::zero();
-        let content_block_size = layout.current_line.start_position.block;
-        collapsible_margins_in_children.collapsed_through = !layout.had_inflow_content &&
-            content_block_size == Au::zero() &&
-            collapsible_with_parent_start_margin.0;
-
-        CacheableLayoutResult {
-            fragments: layout.fragments,
-            content_block_size,
-            collapsible_margins_in_children,
-            baselines: layout.baselines,
-            depends_on_block_constraints: layout.depends_on_block_constraints,
-            content_inline_size_for_table: None,
-            specific_layout_info: None,
-        }
-    }
-
-    fn next_character_prevents_soft_wrap_opportunity(&self, index: usize) -> bool {
-        let Some(character) = self.text_content[index..].chars().nth(1) else {
-            return false;
-        };
-        char_prevents_soft_wrap_opportunity_when_before_or_after_atomic(character)
-    }
-
-    fn previous_character_prevents_soft_wrap_opportunity(&self, index: usize) -> bool {
-        let Some(character) = self.text_content[0..index].chars().next_back() else {
-            return false;
-        };
-        char_prevents_soft_wrap_opportunity_when_before_or_after_atomic(character)
-    }
-}
-
-impl InlineContainerState {
-    fn new(
-        style: Arc<ComputedValues>,
-        flags: InlineContainerStateFlags,
-        parent_container: Option<&InlineContainerState>,
-        parent_text_decoration_line: TextDecorationLine,
-        font_metrics: Option<&FontMetrics>,
-    ) -> Self {
-        let text_decoration_line = parent_text_decoration_line | style.clone_text_decoration_line();
-        let font_metrics = font_metrics.cloned().unwrap_or_else(FontMetrics::empty);
-        let line_height = line_height(
-            &style,
-            &font_metrics,
-            flags.contains(InlineContainerStateFlags::IS_SINGLE_LINE_TEXT_INPUT),
-        );
-
-        let mut baseline_offset = Au::zero();
-        let mut strut_block_sizes = Self::get_block_sizes_with_style(
-            effective_vertical_align(&style, parent_container),
-            &style,
-            &font_metrics,
-            &font_metrics,
-            line_height,
-        );
-        if let Some(parent_container) = parent_container {
-            // The baseline offset from `vertical-align` might adjust where our block size contribution is
-            // within the line.
-            baseline_offset = parent_container.get_cumulative_baseline_offset_for_child(
-                style.clone_vertical_align(),
-                &strut_block_sizes,
-            );
-            strut_block_sizes.adjust_for_baseline_offset(baseline_offset);
-        }
-
-        let mut nested_block_sizes = parent_container
-            .map(|container| container.nested_strut_block_sizes.clone())
-            .unwrap_or_else(LineBlockSizes::zero);
-        if flags.contains(InlineContainerStateFlags::CREATE_STRUT) {
-            nested_block_sizes.max_assign(&strut_block_sizes);
-        }
-
-        Self {
-            style,
-            flags,
-            has_content: RefCell::new(false),
-            text_decoration_line,
-            nested_strut_block_sizes: nested_block_sizes,
-            strut_block_sizes,
-            baseline_offset,
-            font_metrics,
-        }
-    }
-
-    fn get_block_sizes_with_style(
-        vertical_align: VerticalAlign,
-        style: &ComputedValues,
-        font_metrics: &FontMetrics,
-        font_metrics_of_first_font: &FontMetrics,
-        line_height: Au,
-    ) -> LineBlockSizes {
-        if !is_baseline_relative(vertical_align) {
-            return LineBlockSizes {
-                line_height,
-                baseline_relative_size_for_line_height: None,
-                size_for_baseline_positioning: BaselineRelativeSize::zero(),
-            };
-        }
-
-        // From https://drafts.csswg.org/css-inline/#inline-height
-        // > If line-height computes to `normal` and either `text-box-edge` is `leading` or this
-        // > is the root inline box, the font’s line gap metric may also be incorporated
-        // > into A and D by adding half to each side as half-leading.
-        //
-        // `text-box-edge` isn't implemented (and this is a draft specification), so it's
-        // always effectively `leading`, which means we always take into account the line gap
-        // when `line-height` is normal.
-        let mut ascent = font_metrics.ascent;
-        let mut descent = font_metrics.descent;
-        if style.get_font().line_height == LineHeight::Normal {
-            let half_leading_from_line_gap =
-                (font_metrics.line_gap - descent - ascent).scale_by(0.5);
-            ascent += half_leading_from_line_gap;
-            descent += half_leading_from_line_gap;
-        }
-
-        // The ascent and descent we use for computing the line's final line height isn't
-        // the same the ascent and descent we use for finding the baseline. For finding
-        // the baseline we want the content rect.
-        let size_for_baseline_positioning = BaselineRelativeSize { ascent, descent };
-
-        // From https://drafts.csswg.org/css-inline/#inline-height
-        // > When its computed line-height is not normal, its layout bounds are derived solely
-        // > from metrics of its first available font (ignoring glyphs from other fonts), and
-        // > leading is used to adjust the effective A and D to add up to the used line-height.
-        // > Calculate the leading L as L = line-height - (A + D). Half the leading (its
-        // > half-leading) is added above A of the first available font, and the other half
-        // > below D of the first available font, giving an effective ascent above the baseline
-        // > of A′ = A + L/2, and an effective descent of D′ = D + L/2.
-        //
-        // Note that leading might be negative here and the line-height might be zero. In
-        // the case where the height is zero, ascent and descent will move to the same
-        // point in the block axis.  Even though the contribution to the line height is
-        // zero in this case, the line may get some height when taking them into
-        // considering with other zero line height boxes that converge on other block axis
-        // locations when using the above formula.
-        if style.get_font().line_height != LineHeight::Normal {
-            ascent = font_metrics_of_first_font.ascent;
-            descent = font_metrics_of_first_font.descent;
-            let half_leading = (line_height - (ascent + descent)).scale_by(0.5);
-            // We want the sum of `ascent` and `descent` to equal `line_height`.
-            // If we just add `half_leading` to both, then we may not get `line_height`
-            // due to precision limitations of `Au`. Instead, we set `descent` to
-            // the value that will guarantee the correct sum.
-            ascent += half_leading;
-            descent = line_height - ascent;
-        }
-
-        LineBlockSizes {
-            line_height,
-            baseline_relative_size_for_line_height: Some(BaselineRelativeSize { ascent, descent }),
-            size_for_baseline_positioning,
-        }
-    }
-
-    fn get_block_size_contribution(
-        &self,
-        vertical_align: VerticalAlign,
-        font_metrics: &FontMetrics,
-        font_metrics_of_first_font: &FontMetrics,
-    ) -> LineBlockSizes {
-        Self::get_block_sizes_with_style(
-            vertical_align,
-            &self.style,
-            font_metrics,
-            font_metrics_of_first_font,
-            line_height(
-                &self.style,
-                font_metrics,
-                self.flags
-                    .contains(InlineContainerStateFlags::IS_SINGLE_LINE_TEXT_INPUT),
-            ),
-        )
-    }
-
-    fn get_cumulative_baseline_offset_for_child(
-        &self,
-        child_vertical_align: VerticalAlign,
-        child_block_size: &LineBlockSizes,
-    ) -> Au {
-        let block_size = self.get_block_size_contribution(
-            child_vertical_align.clone(),
-            &self.font_metrics,
-            &self.font_metrics,
-        );
-        self.baseline_offset +
-            match child_vertical_align {
-                // `top` and `bottom are not actually relative to the baseline, but this value is unused
-                // in those cases.
-                // TODO: We should distinguish these from `baseline` in order to implement "aligned subtrees" properly.
-                // See https://drafts.csswg.org/css2/#aligned-subtree.
-                VerticalAlign::Keyword(VerticalAlignKeyword::Baseline) |
-                VerticalAlign::Keyword(VerticalAlignKeyword::Top) |
-                VerticalAlign::Keyword(VerticalAlignKeyword::Bottom) => Au::zero(),
-                VerticalAlign::Keyword(VerticalAlignKeyword::Sub) => {
-                    block_size.resolve().scale_by(FONT_SUBSCRIPT_OFFSET_RATIO)
-                },
-                VerticalAlign::Keyword(VerticalAlignKeyword::Super) => {
-                    -block_size.resolve().scale_by(FONT_SUPERSCRIPT_OFFSET_RATIO)
-                },
-                VerticalAlign::Keyword(VerticalAlignKeyword::TextTop) => {
-                    child_block_size.size_for_baseline_positioning.ascent - self.font_metrics.ascent
-                },
-                VerticalAlign::Keyword(VerticalAlignKeyword::Middle) => {
-                    // "Align the vertical midpoint of the box with the baseline of the parent
-                    // box plus half the x-height of the parent."
-                    (child_block_size.size_for_baseline_positioning.ascent -
-                        child_block_size.size_for_baseline_positioning.descent -
-                        self.font_metrics.x_height)
-                        .scale_by(0.5)
-                },
-                VerticalAlign::Keyword(VerticalAlignKeyword::TextBottom) => {
-                    self.font_metrics.descent -
-                        child_block_size.size_for_baseline_positioning.descent
-                },
-                VerticalAlign::Length(length_percentage) => {
-                    -length_percentage.to_used_value(child_block_size.line_height)
-                },
-            }
-    }
-}
-
-impl IndependentFormattingContext {
-    fn layout_into_line_items(
-        &self,
-        layout: &mut InlineFormattingContextLayout,
-        offset_in_text: usize,
-        bidi_level: Level,
-    ) {
-        // We need to know the inline size of the atomic before deciding whether to do the line break.
-        let mut child_positioning_context = PositioningContext::new_for_style(self.style())
-            .unwrap_or_else(|| PositioningContext::new_for_subtree(true));
-        let IndependentFloatOrAtomicLayoutResult {
-            mut fragment,
-            baselines,
-            pbm_sums,
-        } = self.layout_float_or_atomic_inline(
-            layout.layout_context,
-            &mut child_positioning_context,
-            layout.containing_block,
-        );
-
-        // If this Fragment's layout depends on the block size of the containing block,
-        // then the entire layout of the inline formatting context does as well.
-        layout.depends_on_block_constraints |= fragment.base.flags.contains(
-            FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM,
-        );
-
-        // Offset the content rectangle by the physical offset of the padding, border, and margin.
-        let container_writing_mode = layout.containing_block.style.writing_mode;
-        let pbm_physical_offset = pbm_sums
-            .start_offset()
-            .to_physical_size(container_writing_mode);
-        fragment.content_rect = fragment
-            .content_rect
-            .translate(pbm_physical_offset.to_vector());
-
-        // Apply baselines if necessary.
-        let mut fragment = match baselines {
-            Some(baselines) => fragment.with_baselines(baselines),
-            None => fragment,
-        };
-
-        // Lay out absolutely positioned children if this new atomic establishes a containing block
-        // for absolutes.
-        let positioning_context = if self.is_replaced() {
-            None
-        } else {
-            if fragment
-                .style
-                .establishes_containing_block_for_absolute_descendants(fragment.base.flags)
-            {
-                child_positioning_context
-                    .layout_collected_children(layout.layout_context, &mut fragment);
-            }
-            Some(child_positioning_context)
-        };
-
-        if layout.text_wrap_mode == TextWrapMode::Wrap &&
-            !layout
-                .ifc
-                .previous_character_prevents_soft_wrap_opportunity(offset_in_text)
-        {
-            layout.process_soft_wrap_opportunity();
-        }
-
-        let size = pbm_sums.sum() +
-            fragment
-                .content_rect
-                .size
-                .to_logical(container_writing_mode);
-        let baseline_offset = self
-            .pick_baseline(&fragment.baselines(container_writing_mode))
-            .map(|baseline| pbm_sums.block_start + baseline)
-            .unwrap_or(size.block);
-
-        let (block_sizes, baseline_offset_in_parent) =
-            self.get_block_sizes_and_baseline_offset(layout, size.block, baseline_offset);
-        layout.update_unbreakable_segment_for_new_content(
-            &block_sizes,
-            size.inline,
-            SegmentContentFlags::empty(),
-        );
-        layout.push_line_item_to_unbreakable_segment(LineItem::Atomic(
-            layout.current_inline_box_identifier(),
-            AtomicLineItem {
-                fragment,
-                size,
-                positioning_context,
-                baseline_offset_in_parent,
-                baseline_offset_in_item: baseline_offset,
-                bidi_level,
-            },
-        ));
-
-        // If there's a soft wrap opportunity following this atomic, defer a soft wrap opportunity
-        // for when we next process text content.
-        if !layout
-            .ifc
-            .next_character_prevents_soft_wrap_opportunity(offset_in_text)
-        {
-            layout.have_deferred_soft_wrap_opportunity = true;
-        }
-    }
-
-    /// Picks either the first or the last baseline, depending on `baseline-source`.
-    /// TODO: clarify that this is not to be used for box alignment in flex/grid
-    /// <https://drafts.csswg.org/css-inline/#baseline-source>
-    fn pick_baseline(&self, baselines: &Baselines) -> Option<Au> {
-        match self.style().clone_baseline_source() {
-            BaselineSource::First => baselines.first,
-            BaselineSource::Last => baselines.last,
-            BaselineSource::Auto => match &self.contents {
-                IndependentFormattingContextContents::NonReplaced(
-                    IndependentNonReplacedContents::Flow(_),
-                ) => baselines.last,
-                _ => baselines.first,
-            },
-        }
-    }
-
-    fn get_block_sizes_and_baseline_offset(
-        &self,
-        ifc: &InlineFormattingContextLayout,
-        block_size: Au,
-        baseline_offset_in_content_area: Au,
-    ) -> (LineBlockSizes, Au) {
-        let mut contribution = if !is_baseline_relative(self.style().clone_vertical_align()) {
-            LineBlockSizes {
-                line_height: block_size,
-                baseline_relative_size_for_line_height: None,
-                size_for_baseline_positioning: BaselineRelativeSize::zero(),
-            }
-        } else {
-            let baseline_relative_size = BaselineRelativeSize {
-                ascent: baseline_offset_in_content_area,
-                descent: block_size - baseline_offset_in_content_area,
-            };
-            LineBlockSizes {
-                line_height: block_size,
-                baseline_relative_size_for_line_height: Some(baseline_relative_size.clone()),
-                size_for_baseline_positioning: baseline_relative_size,
-            }
-        };
-
-        let baseline_offset = ifc
-            .current_inline_container_state()
-            .get_cumulative_baseline_offset_for_child(
-                self.style().clone_vertical_align(),
-                &contribution,
-            );
-        contribution.adjust_for_baseline_offset(baseline_offset);
-
-        (contribution, baseline_offset)
-    }
-}
-
-impl FloatBox {
-    fn layout_into_line_items(&self, layout: &mut InlineFormattingContextLayout) {
-        let fragment = self.layout(
-            layout.layout_context,
-            layout.positioning_context,
-            layout.containing_block,
-        );
-        layout.push_line_item_to_unbreakable_segment(LineItem::Float(
-            layout.current_inline_box_identifier(),
-            FloatLineItem {
-                fragment,
-                needs_placement: true,
-            },
-        ));
-    }
-}
-
-fn place_pending_floats(ifc: &mut InlineFormattingContextLayout, line_items: &mut [LineItem]) {
-    for item in line_items.iter_mut() {
-        if let LineItem::Float(_, float_line_item) = item {
-            if float_line_item.needs_placement {
-                ifc.place_float_fragment(&mut float_line_item.fragment);
-            }
-        }
-    }
-}
-
-fn line_height(
-    parent_style: &ComputedValues,
-    font_metrics: &FontMetrics,
-    is_single_line_text_input: bool,
-) -> Au {
-    let font = parent_style.get_font();
-    let font_size = font.font_size.computed_size();
-    let mut line_height = match font.line_height {
-        LineHeight::Normal => font_metrics.line_gap,
-        LineHeight::Number(number) => (font_size * number.0).into(),
-        LineHeight::Length(length) => length.0.into(),
-    };
-
-    // Single line text inputs line height is clamped to the size of `normal`. See
-    // <https://github.com/whatwg/html/pull/5462>.
-    if is_single_line_text_input {
-        line_height.max_assign(font_metrics.line_gap);
-    }
-
-    line_height
-}
-
-fn effective_vertical_align(
-    style: &ComputedValues,
-    container: Option<&InlineContainerState>,
-) -> VerticalAlign {
-    if container.is_none() {
-        // If we are at the root of the inline formatting context, we shouldn't use the
-        // computed `vertical-align`, since it has no effect on the contents of this IFC
-        // (it can just affect how the block container is aligned within the parent IFC).
-        VerticalAlign::Keyword(VerticalAlignKeyword::Baseline)
-    } else {
-        style.clone_vertical_align()
-    }
-}
-
-fn is_baseline_relative(vertical_align: VerticalAlign) -> bool {
-    !matches!(
-        vertical_align,
-        VerticalAlign::Keyword(VerticalAlignKeyword::Top) |
-            VerticalAlign::Keyword(VerticalAlignKeyword::Bottom)
-    )
-}
-
-/// Whether or not a strut should be created for an inline container. Normally
-/// all inline containers get struts. In quirks mode this isn't always the case
-/// though.
-///
-/// From <https://quirks.spec.whatwg.org/#the-line-height-calculation-quirk>
-///
-/// > ### § 3.3. The line height calculation quirk
-/// > In quirks mode and limited-quirks mode, an inline box that matches the following
-/// > conditions, must, for the purpose of line height calculation, act as if the box had a
-/// > line-height of zero.
-/// >
-/// >  - The border-top-width, border-bottom-width, padding-top and padding-bottom
-/// >    properties have a used value of zero and the box has a vertical writing mode, or the
-/// >    border-right-width, border-left-width, padding-right and padding-left properties have
-/// >    a used value of zero and the box has a horizontal writing mode.
-/// >  - It either contains no text or it contains only collapsed whitespace.
-/// >
-/// > ### § 3.4. The blocks ignore line-height quirk
-/// > In quirks mode and limited-quirks mode, for a block container element whose content is
-/// > composed of inline-level elements, the element’s line-height must be ignored for the
-/// > purpose of calculating the minimal height of line boxes within the element.
-///
-/// Since we incorporate the size of the strut into the line-height calculation when
-/// adding text, we can simply not incorporate the strut at the start of inline box
-/// processing. This also works the same for the root of the IFC.
-fn inline_container_needs_strut(
-    style: &ComputedValues,
-    layout_context: &LayoutContext,
-    pbm: Option<&PaddingBorderMargin>,
-) -> bool {
-    if layout_context.style_context.quirks_mode() == QuirksMode::NoQuirks {
-        return true;
-    }
-
-    // This is not in a standard yet, but all browsers disable this quirk for list items.
-    // See https://github.com/whatwg/quirks/issues/38.
-    if style.get_box().display.is_list_item() {
-        return true;
-    }
-
-    pbm.map(|pbm| !pbm.padding_border_sums.inline.is_zero())
-        .unwrap_or(false)
-}
-
-impl ComputeInlineContentSizes for InlineFormattingContext {
-    // This works on an already-constructed `InlineFormattingContext`,
-    // Which would have to change if/when
-    // `BlockContainer::construct` parallelize their construction.
-    fn compute_inline_content_sizes(
-        &self,
-        layout_context: &LayoutContext,
-        constraint_space: &ConstraintSpace,
-    ) -> InlineContentSizesResult {
-        ContentSizesComputation::compute(self, layout_context, constraint_space)
-    }
-}
-
-/// A struct which takes care of computing [`ContentSizes`] for an [`InlineFormattingContext`].
-struct ContentSizesComputation<'layout_data> {
-    layout_context: &'layout_data LayoutContext<'layout_data>,
-    constraint_space: &'layout_data ConstraintSpace,
-    paragraph: ContentSizes,
-    current_line: ContentSizes,
-    /// Size for whitespace pending to be added to this line.
-    pending_whitespace: ContentSizes,
-    /// Whether or not the current line has seen any content (excluding collapsed whitespace),
-    /// when sizing under a min-content constraint.
-    had_content_yet_for_min_content: bool,
-    /// Whether or not the current line has seen any content (excluding collapsed whitespace),
-    /// when sizing under a max-content constraint.
-    had_content_yet_for_max_content: bool,
-    /// Stack of ending padding, margin, and border to add to the length
-    /// when an inline box finishes.
-    ending_inline_pbm_stack: Vec<Au>,
-    depends_on_block_constraints: bool,
-}
-
-impl<'layout_data> ContentSizesComputation<'layout_data> {
-    fn traverse(
-        mut self,
-        inline_formatting_context: &InlineFormattingContext,
-    ) -> InlineContentSizesResult {
-        for inline_item in inline_formatting_context.inline_items.iter() {
-            self.process_item(&inline_item.borrow(), inline_formatting_context);
-        }
-
-        self.forced_line_break();
-        InlineContentSizesResult {
-            sizes: self.paragraph,
-            depends_on_block_constraints: self.depends_on_block_constraints,
-        }
-    }
-
-    fn process_item(
-        &mut self,
-        inline_item: &InlineItem,
-        inline_formatting_context: &InlineFormattingContext,
-    ) {
-        match inline_item {
-            InlineItem::StartInlineBox(inline_box) => {
-                // For margins and paddings, a cyclic percentage is resolved against zero
-                // for determining intrinsic size contributions.
-                // https://drafts.csswg.org/css-sizing-3/#min-percentage-contribution
-                let inline_box = inline_box.borrow();
-                let zero = Au::zero();
-                let writing_mode = self.constraint_space.writing_mode;
-                let layout_style = inline_box.layout_style();
-                let padding = layout_style
-                    .padding(writing_mode)
-                    .percentages_relative_to(zero);
-                let border = layout_style.border_width(writing_mode);
-                let margin = inline_box
-                    .style
-                    .margin(writing_mode)
-                    .percentages_relative_to(zero)
-                    .auto_is(Au::zero);
-
-                let pbm = margin + padding + border;
-                if inline_box.is_first_fragment {
-                    self.add_inline_size(pbm.inline_start);
-                }
-                if inline_box.is_last_fragment {
-                    self.ending_inline_pbm_stack.push(pbm.inline_end);
-                } else {
-                    self.ending_inline_pbm_stack.push(Au::zero());
-                }
-            },
-            InlineItem::EndInlineBox => {
-                let length = self.ending_inline_pbm_stack.pop().unwrap_or_else(Au::zero);
-                self.add_inline_size(length);
-            },
-            InlineItem::TextRun(text_run) => {
-                let text_run = &*text_run.borrow();
-                for segment in text_run.shaped_text.iter() {
-                    let style_text = text_run.parent_style.get_inherited_text();
-                    let can_wrap = style_text.text_wrap_mode == TextWrapMode::Wrap;
-
-                    // TODO: This should take account whether or not the first and last character prevent
-                    // linebreaks after atomics as in layout.
-                    if can_wrap && segment.break_at_start {
-                        self.line_break_opportunity()
-                    }
-
-                    for run in segment.runs.iter() {
-                        let advance = run.glyph_store.total_advance();
-                        if run.glyph_store.is_whitespace() {
-                            // If this run is a forced line break, we *must* break the line
-                            // and start measuring from the inline origin once more.
-                            if run.is_single_preserved_newline() {
-                                self.forced_line_break();
-                                continue;
-                            }
-                            if !matches!(
-                                style_text.white_space_collapse,
-                                WhiteSpaceCollapse::Preserve | WhiteSpaceCollapse::BreakSpaces
-                            ) {
-                                if can_wrap {
-                                    self.line_break_opportunity();
-                                } else if self.had_content_yet_for_min_content {
-                                    self.pending_whitespace.min_content += advance;
-                                }
-                                if self.had_content_yet_for_max_content {
-                                    self.pending_whitespace.max_content += advance;
-                                }
-                                continue;
-                            }
-                            if can_wrap {
-                                self.pending_whitespace.max_content += advance;
-                                self.commit_pending_whitespace();
-                                self.line_break_opportunity();
-                                continue;
-                            }
-                        }
-
-                        self.commit_pending_whitespace();
-                        self.add_inline_size(advance);
-
-                        // Typically whitespace glyphs are placed in a separate store,
-                        // but for `white-space: break-spaces` we place the first whitespace
-                        // with the preceding text. That prevents a line break before that
-                        // first space, but we still need to allow a line break after it.
-                        if can_wrap && run.glyph_store.ends_with_whitespace() {
-                            self.line_break_opportunity();
-                        }
-                    }
-                }
-            },
-            InlineItem::Atomic(atomic, offset_in_text, _level) => {
-                // TODO: need to handle TextWrapMode::Nowrap.
-                if !inline_formatting_context
-                    .previous_character_prevents_soft_wrap_opportunity(*offset_in_text)
-                {
-                    self.line_break_opportunity();
-                }
-
-                let InlineContentSizesResult {
-                    sizes: outer,
-                    depends_on_block_constraints,
-                } = atomic.outer_inline_content_sizes(
-                    self.layout_context,
-                    &self.constraint_space.into(),
-                    &LogicalVec2::zero(),
-                    false, /* auto_block_size_stretches_to_containing_block */
-                );
-                self.depends_on_block_constraints |= depends_on_block_constraints;
-
-                if !inline_formatting_context
-                    .next_character_prevents_soft_wrap_opportunity(*offset_in_text)
-                {
-                    self.line_break_opportunity();
-                }
-
-                self.commit_pending_whitespace();
-                self.current_line += outer;
-            },
-            _ => {},
-        }
-    }
-
-    fn add_inline_size(&mut self, l: Au) {
-        self.current_line.min_content += l;
-        self.current_line.max_content += l;
-    }
-
-    fn line_break_opportunity(&mut self) {
-        // Clear the pending whitespace, assuming that at the end of the line
-        // it needs to either hang or be removed. If that isn't the case,
-        // `commit_pending_whitespace()` should be called first.
-        self.pending_whitespace.min_content = Au::zero();
-        let current_min_content = mem::take(&mut self.current_line.min_content);
-        self.paragraph.min_content.max_assign(current_min_content);
-        self.had_content_yet_for_min_content = false;
-    }
-
-    fn forced_line_break(&mut self) {
-        // Handle the line break for min-content sizes.
-        self.line_break_opportunity();
-
-        // Repeat the same logic, but now for max-content sizes.
-        self.pending_whitespace.max_content = Au::zero();
-        let current_max_content = mem::take(&mut self.current_line.max_content);
-        self.paragraph.max_content.max_assign(current_max_content);
-        self.had_content_yet_for_max_content = false;
-    }
-
-    fn commit_pending_whitespace(&mut self) {
-        self.current_line += mem::take(&mut self.pending_whitespace);
-        self.had_content_yet_for_min_content = true;
-        self.had_content_yet_for_max_content = true;
-    }
-
-    /// Compute the [`ContentSizes`] of the given [`InlineFormattingContext`].
-    fn compute(
-        inline_formatting_context: &InlineFormattingContext,
-        layout_context: &'layout_data LayoutContext,
-        constraint_space: &'layout_data ConstraintSpace,
-    ) -> InlineContentSizesResult {
-        Self {
-            layout_context,
-            constraint_space,
-            paragraph: ContentSizes::zero(),
-            current_line: ContentSizes::zero(),
-            pending_whitespace: ContentSizes::zero(),
-            had_content_yet_for_min_content: false,
-            had_content_yet_for_max_content: false,
-            ending_inline_pbm_stack: Vec::new(),
-            depends_on_block_constraints: false,
-        }
-        .traverse(inline_formatting_context)
-    }
-}
-
-/// Whether or not this character will rpevent a soft wrap opportunity when it
-/// comes before or after an atomic inline element.
-///
-/// From <https://www.w3.org/TR/css-text-3/#line-break-details>:
-///
-/// > For Web-compatibility there is a soft wrap opportunity before and after each
-/// > replaced element or other atomic inline, even when adjacent to a character that
-/// > would normally suppress them, including U+00A0 NO-BREAK SPACE. However, with
-/// > the exception of U+00A0 NO-BREAK SPACE, there must be no soft wrap opportunity
-/// > between atomic inlines and adjacent characters belonging to the Unicode GL, WJ,
-/// > or ZWJ line breaking classes.
-fn char_prevents_soft_wrap_opportunity_when_before_or_after_atomic(character: char) -> bool {
-    if character == '\u{00A0}' {
-        return false;
-    }
-    let class = linebreak_property(character);
-    class == XI_LINE_BREAKING_CLASS_GL ||
-        class == XI_LINE_BREAKING_CLASS_WJ ||
-        class == XI_LINE_BREAKING_CLASS_ZWJ
-}
diff --git a/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs
deleted file mode 100644
index 8f38e0d4b23..00000000000
--- a/components/layout_2020/flow/mod.rs
+++ /dev/null
@@ -1,2342 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-#![allow(rustdoc::private_intra_doc_links)]
-
-//! Flow layout, also known as block-and-inline layout.
-
-use app_units::{Au, MAX_AU};
-use inline::InlineFormattingContext;
-use rayon::iter::{IndexedParallelIterator, IntoParallelRefIterator, ParallelIterator};
-use servo_arc::Arc;
-use style::Zero;
-use style::computed_values::clear::T as StyleClear;
-use style::logical_geometry::Direction;
-use style::properties::ComputedValues;
-use style::servo::selector_parser::PseudoElement;
-use style::values::computed::Size as StyleSize;
-use style::values::specified::align::AlignFlags;
-use style::values::specified::{Display, TextAlignKeyword};
-
-use crate::cell::ArcRefCell;
-use crate::context::LayoutContext;
-use crate::flow::float::{
-    Clear, ContainingBlockPositionInfo, FloatBox, FloatSide, PlacementAmongFloats,
-    SequentialLayoutState,
-};
-use crate::formatting_contexts::{
-    Baselines, IndependentFormattingContext, IndependentFormattingContextContents,
-    IndependentNonReplacedContents,
-};
-use crate::fragment_tree::{
-    BaseFragmentInfo, BoxFragment, CollapsedBlockMargins, CollapsedMargin, Fragment, FragmentFlags,
-};
-use crate::geom::{
-    AuOrAuto, LogicalRect, LogicalSides, LogicalSides1D, LogicalVec2, PhysicalPoint, PhysicalRect,
-    PhysicalSides, Size, Sizes, ToLogical, ToLogicalWithContainingBlock,
-};
-use crate::layout_box_base::{CacheableLayoutResult, LayoutBoxBase};
-use crate::positioned::{AbsolutelyPositionedBox, PositioningContext, PositioningContextLength};
-use crate::replaced::ReplacedContents;
-use crate::sizing::{self, ComputeInlineContentSizes, ContentSizes, InlineContentSizesResult};
-use crate::style_ext::{ContentBoxSizesAndPBM, LayoutStyle, PaddingBorderMargin};
-use crate::{
-    ConstraintSpace, ContainingBlock, ContainingBlockSize, IndefiniteContainingBlock,
-    SizeConstraint,
-};
-
-mod construct;
-pub mod float;
-pub mod inline;
-mod root;
-
-pub(crate) use construct::BlockContainerBuilder;
-pub use root::{BoxTree, CanvasBackground};
-
-#[derive(Debug)]
-pub(crate) struct BlockFormattingContext {
-    pub contents: BlockContainer,
-    pub contains_floats: bool,
-}
-
-#[derive(Debug)]
-pub(crate) enum BlockContainer {
-    BlockLevelBoxes(Vec<ArcRefCell<BlockLevelBox>>),
-    InlineFormattingContext(InlineFormattingContext),
-}
-
-impl BlockContainer {
-    fn contains_floats(&self) -> bool {
-        match self {
-            BlockContainer::BlockLevelBoxes(boxes) => boxes
-                .iter()
-                .any(|block_level_box| block_level_box.borrow().contains_floats()),
-            BlockContainer::InlineFormattingContext(context) => context.contains_floats,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub(crate) enum BlockLevelBox {
-    Independent(IndependentFormattingContext),
-    OutOfFlowAbsolutelyPositionedBox(ArcRefCell<AbsolutelyPositionedBox>),
-    OutOfFlowFloatBox(FloatBox),
-    OutsideMarker(OutsideMarker),
-    SameFormattingContextBlock {
-        base: LayoutBoxBase,
-        contents: BlockContainer,
-        contains_floats: bool,
-    },
-}
-
-impl BlockLevelBox {
-    fn contains_floats(&self) -> bool {
-        match self {
-            BlockLevelBox::SameFormattingContextBlock {
-                contains_floats, ..
-            } => *contains_floats,
-            BlockLevelBox::OutOfFlowFloatBox { .. } => true,
-            _ => false,
-        }
-    }
-
-    fn find_block_margin_collapsing_with_parent(
-        &self,
-        layout_context: &LayoutContext,
-        collected_margin: &mut CollapsedMargin,
-        containing_block: &ContainingBlock,
-    ) -> bool {
-        let layout_style = match self {
-            BlockLevelBox::SameFormattingContextBlock { base, contents, .. } => {
-                contents.layout_style(base)
-            },
-            BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(_) |
-            BlockLevelBox::OutOfFlowFloatBox(_) => return true,
-            BlockLevelBox::OutsideMarker(_) => return false,
-            BlockLevelBox::Independent(context) => {
-                // FIXME: If the element doesn't fit next to floats, it will get clearance.
-                // In that case this should be returning false.
-                context.layout_style()
-            },
-        };
-
-        // FIXME: This should only return false when 'clear' causes clearance.
-        let style = layout_style.style();
-        if style.get_box().clear != StyleClear::None {
-            return false;
-        }
-
-        let ContentBoxSizesAndPBM {
-            content_box_sizes,
-            pbm,
-            ..
-        } = layout_style.content_box_sizes_and_padding_border_margin(&containing_block.into());
-        let margin = pbm.margin.auto_is(Au::zero);
-        collected_margin.adjoin_assign(&CollapsedMargin::new(margin.block_start));
-
-        let child_boxes = match self {
-            BlockLevelBox::SameFormattingContextBlock { contents, .. } => match contents {
-                BlockContainer::BlockLevelBoxes(boxes) => boxes,
-                BlockContainer::InlineFormattingContext(_) => return false,
-            },
-            _ => return false,
-        };
-
-        if pbm.padding.block_start != Au::zero() || pbm.border.block_start != Au::zero() {
-            return false;
-        }
-
-        let available_inline_size =
-            containing_block.size.inline - pbm.padding_border_sums.inline - margin.inline_sum();
-        let available_block_size = containing_block.size.block.to_definite().map(|block_size| {
-            Au::zero().max(block_size - pbm.padding_border_sums.block - margin.block_sum())
-        });
-
-        let tentative_block_size = content_box_sizes.block.resolve_extrinsic(
-            Size::FitContent,
-            Au::zero(),
-            available_block_size,
-        );
-
-        let get_inline_content_sizes = || {
-            let constraint_space = ConstraintSpace::new(
-                tentative_block_size,
-                style.writing_mode,
-                None, /* TODO: support preferred aspect ratios on non-replaced boxes */
-            );
-            self.inline_content_sizes(layout_context, &constraint_space)
-                .sizes
-        };
-        let inline_size = content_box_sizes.inline.resolve(
-            Direction::Inline,
-            Size::Stretch,
-            Au::zero,
-            Some(available_inline_size),
-            get_inline_content_sizes,
-            false, /* is_table */
-        );
-
-        let containing_block_for_children = ContainingBlock {
-            size: ContainingBlockSize {
-                inline: inline_size,
-                block: tentative_block_size,
-            },
-            style,
-        };
-
-        if !Self::find_block_margin_collapsing_with_parent_from_slice(
-            layout_context,
-            child_boxes,
-            collected_margin,
-            &containing_block_for_children,
-        ) {
-            return false;
-        }
-
-        if !block_size_is_zero_or_intrinsic(style.content_block_size(), containing_block) ||
-            !block_size_is_zero_or_intrinsic(style.min_block_size(), containing_block) ||
-            pbm.padding_border_sums.block != Au::zero()
-        {
-            return false;
-        }
-
-        collected_margin.adjoin_assign(&CollapsedMargin::new(margin.block_end));
-
-        true
-    }
-
-    fn find_block_margin_collapsing_with_parent_from_slice(
-        layout_context: &LayoutContext,
-        boxes: &[ArcRefCell<BlockLevelBox>],
-        margin: &mut CollapsedMargin,
-        containing_block: &ContainingBlock,
-    ) -> bool {
-        boxes.iter().all(|block_level_box| {
-            block_level_box
-                .borrow()
-                .find_block_margin_collapsing_with_parent(layout_context, margin, containing_block)
-        })
-    }
-}
-
-#[derive(Clone, Copy)]
-pub(crate) struct CollapsibleWithParentStartMargin(bool);
-
-/// The contentes of a BlockContainer created to render a list marker
-/// for a list that has `list-style-position: outside`.
-#[derive(Debug)]
-pub(crate) struct OutsideMarker {
-    pub marker_style: Arc<ComputedValues>,
-    pub base: LayoutBoxBase,
-    pub block_container: BlockContainer,
-}
-
-impl OutsideMarker {
-    fn list_item_style(&self) -> &ComputedValues {
-        &self.base.style
-    }
-
-    fn inline_content_sizes(
-        &self,
-        layout_context: &LayoutContext,
-        constraint_space: &ConstraintSpace,
-    ) -> InlineContentSizesResult {
-        self.base
-            .inline_content_sizes(layout_context, constraint_space, &self.block_container)
-    }
-
-    fn layout(
-        &self,
-        layout_context: &LayoutContext<'_>,
-        containing_block: &ContainingBlock<'_>,
-        positioning_context: &mut PositioningContext,
-        sequential_layout_state: Option<&mut SequentialLayoutState>,
-        collapsible_with_parent_start_margin: Option<CollapsibleWithParentStartMargin>,
-    ) -> Fragment {
-        let constraint_space = ConstraintSpace::new_for_style_and_ratio(
-            &self.marker_style,
-            None, /* TODO: support preferred aspect ratios on non-replaced boxes */
-        );
-        let content_sizes = self.inline_content_sizes(layout_context, &constraint_space);
-        let containing_block_for_children = ContainingBlock {
-            size: ContainingBlockSize {
-                inline: content_sizes.sizes.max_content,
-                block: SizeConstraint::default(),
-            },
-            style: &self.marker_style,
-        };
-
-        // A ::marker can't have a stretch size (must be auto), so this doesn't matter.
-        // https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing
-        let ignore_block_margins_for_stretch = LogicalSides1D::new(false, false);
-
-        let flow_layout = self.block_container.layout(
-            layout_context,
-            positioning_context,
-            &containing_block_for_children,
-            sequential_layout_state,
-            collapsible_with_parent_start_margin.unwrap_or(CollapsibleWithParentStartMargin(false)),
-            ignore_block_margins_for_stretch,
-        );
-
-        let max_inline_size =
-            flow_layout
-                .fragments
-                .iter()
-                .fold(Au::zero(), |current_max, fragment| {
-                    current_max.max(
-                        match fragment {
-                            Fragment::Text(text) => text.borrow().rect,
-                            Fragment::Image(image) => image.borrow().rect,
-                            Fragment::Positioning(positioning) => positioning.borrow().rect,
-                            Fragment::Box(_) |
-                            Fragment::Float(_) |
-                            Fragment::AbsoluteOrFixedPositioned(_) |
-                            Fragment::IFrame(_) => {
-                                unreachable!(
-                                    "Found unexpected fragment type in outside list marker!"
-                                );
-                            },
-                        }
-                        .to_logical(&containing_block_for_children)
-                        .max_inline_position(),
-                    )
-                });
-
-        // Position the marker beyond the inline start of the border box list item. This needs to
-        // take into account the border and padding of the item.
-        //
-        // TODO: This is the wrong containing block, as it should be the containing block of the
-        // parent of this list item. What this means in practice is that the writing mode could be
-        // wrong and padding defined as a percentage will be resolved incorrectly.
-        //
-        // TODO: This should use the LayoutStyle of the list item, not the default one. Currently
-        // they are the same, but this could change in the future.
-        let pbm_of_list_item =
-            LayoutStyle::Default(self.list_item_style()).padding_border_margin(containing_block);
-        let content_rect = LogicalRect {
-            start_corner: LogicalVec2 {
-                inline: -max_inline_size -
-                    (pbm_of_list_item.border.inline_start +
-                        pbm_of_list_item.padding.inline_start),
-                block: Zero::zero(),
-            },
-            size: LogicalVec2 {
-                inline: max_inline_size,
-                block: flow_layout.content_block_size,
-            },
-        };
-
-        let mut base_fragment_info = BaseFragmentInfo::anonymous();
-        base_fragment_info.flags |= FragmentFlags::IS_OUTSIDE_LIST_ITEM_MARKER;
-
-        Fragment::Box(ArcRefCell::new(BoxFragment::new(
-            base_fragment_info,
-            self.marker_style.clone(),
-            flow_layout.fragments,
-            content_rect.as_physical(Some(containing_block)),
-            PhysicalSides::zero(),
-            PhysicalSides::zero(),
-            PhysicalSides::zero(),
-            None,
-            CollapsedBlockMargins::zero(),
-        )))
-    }
-}
-
-impl BlockFormattingContext {
-    pub(super) fn layout(
-        &self,
-        layout_context: &LayoutContext,
-        positioning_context: &mut PositioningContext,
-        containing_block: &ContainingBlock,
-        depends_on_block_constraints: bool,
-    ) -> CacheableLayoutResult {
-        let mut sequential_layout_state = if self.contains_floats || !layout_context.use_rayon {
-            Some(SequentialLayoutState::new(containing_block.size.inline))
-        } else {
-            None
-        };
-
-        // Since this is an independent formatting context, we don't ignore block margins when
-        // resolving a stretch block size of the children.
-        // https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing
-        let ignore_block_margins_for_stretch = LogicalSides1D::new(false, false);
-
-        let flow_layout = self.contents.layout(
-            layout_context,
-            positioning_context,
-            containing_block,
-            sequential_layout_state.as_mut(),
-            CollapsibleWithParentStartMargin(false),
-            ignore_block_margins_for_stretch,
-        );
-        debug_assert!(
-            !flow_layout
-                .collapsible_margins_in_children
-                .collapsed_through
-        );
-
-        // The content height of a BFC root should include any float participating in that BFC
-        // (https://drafts.csswg.org/css2/#root-height), we implement this by imagining there is
-        // an element with `clear: both` after the actual contents.
-        let clearance = sequential_layout_state.and_then(|sequential_layout_state| {
-            sequential_layout_state.calculate_clearance(Clear::Both, &CollapsedMargin::zero())
-        });
-
-        CacheableLayoutResult {
-            fragments: flow_layout.fragments,
-            content_block_size: flow_layout.content_block_size +
-                flow_layout.collapsible_margins_in_children.end.solve() +
-                clearance.unwrap_or_default(),
-            content_inline_size_for_table: None,
-            baselines: flow_layout.baselines,
-            depends_on_block_constraints: depends_on_block_constraints ||
-                flow_layout.depends_on_block_constraints,
-            specific_layout_info: None,
-            collapsible_margins_in_children: CollapsedBlockMargins::zero(),
-        }
-    }
-
-    #[inline]
-    pub(crate) fn layout_style<'a>(&self, base: &'a LayoutBoxBase) -> LayoutStyle<'a> {
-        LayoutStyle::Default(&base.style)
-    }
-}
-
-/// Finds the min/max-content inline size of the block-level children of a block container.
-/// The in-flow boxes will stack vertically, so we only need to consider the maximum size.
-/// But floats can flow horizontally depending on 'clear', so we may need to sum their sizes.
-/// CSS 2 does not define the exact algorithm, this logic is based on the behavior observed
-/// on Gecko and Blink.
-fn compute_inline_content_sizes_for_block_level_boxes(
-    boxes: &[ArcRefCell<BlockLevelBox>],
-    layout_context: &LayoutContext,
-    containing_block: &IndefiniteContainingBlock,
-) -> InlineContentSizesResult {
-    let get_box_info = |box_: &ArcRefCell<BlockLevelBox>| {
-        match &*box_.borrow() {
-            BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(_) |
-            BlockLevelBox::OutsideMarker { .. } => None,
-            BlockLevelBox::OutOfFlowFloatBox(float_box) => {
-                let inline_content_sizes_result = float_box.contents.outer_inline_content_sizes(
-                    layout_context,
-                    containing_block,
-                    &LogicalVec2::zero(),
-                    false, /* auto_block_size_stretches_to_containing_block */
-                );
-                let style = &float_box.contents.style();
-                Some((
-                    inline_content_sizes_result,
-                    FloatSide::from_style_and_container_writing_mode(
-                        style,
-                        containing_block.writing_mode,
-                    ),
-                    Clear::from_style_and_container_writing_mode(
-                        style,
-                        containing_block.writing_mode,
-                    ),
-                ))
-            },
-            BlockLevelBox::SameFormattingContextBlock { base, contents, .. } => {
-                let inline_content_sizes_result = sizing::outer_inline(
-                    &contents.layout_style(base),
-                    containing_block,
-                    &LogicalVec2::zero(),
-                    false, /* auto_block_size_stretches_to_containing_block */
-                    false, /* is_replaced */
-                    !matches!(base.style.pseudo(), Some(PseudoElement::ServoAnonymousBox)),
-                    |_| None, /* TODO: support preferred aspect ratios on non-replaced boxes */
-                    |constraint_space| {
-                        base.inline_content_sizes(layout_context, constraint_space, contents)
-                    },
-                );
-                // A block in the same BFC can overlap floats, it's not moved next to them,
-                // so we shouldn't add its size to the size of the floats.
-                // Instead, we treat it like an independent block with 'clear: both'.
-                Some((inline_content_sizes_result, None, Clear::Both))
-            },
-            BlockLevelBox::Independent(independent) => {
-                let inline_content_sizes_result = independent.outer_inline_content_sizes(
-                    layout_context,
-                    containing_block,
-                    &LogicalVec2::zero(),
-                    false, /* auto_block_size_stretches_to_containing_block */
-                );
-                Some((
-                    inline_content_sizes_result,
-                    None,
-                    Clear::from_style_and_container_writing_mode(
-                        independent.style(),
-                        containing_block.writing_mode,
-                    ),
-                ))
-            },
-        }
-    };
-
-    /// When iterating the block-level boxes to compute the inline content sizes,
-    /// this struct contains the data accumulated up to the current box.
-    #[derive(Default)]
-    struct AccumulatedData {
-        /// Whether the inline size depends on the block one.
-        depends_on_block_constraints: bool,
-        /// The maximum size seen so far, not including trailing uncleared floats.
-        max_size: ContentSizes,
-        /// The size of the trailing uncleared floats on the inline-start side
-        /// of the containing block.
-        start_floats: ContentSizes,
-        /// The size of the trailing uncleared floats on the inline-end side
-        /// of the containing block.
-        end_floats: ContentSizes,
-    }
-
-    impl AccumulatedData {
-        fn max_size_including_uncleared_floats(&self) -> ContentSizes {
-            self.max_size.max(self.start_floats.union(&self.end_floats))
-        }
-        fn clear_floats(&mut self, clear: Clear) {
-            match clear {
-                Clear::InlineStart => {
-                    self.max_size = self.max_size_including_uncleared_floats();
-                    self.start_floats = ContentSizes::zero();
-                },
-                Clear::InlineEnd => {
-                    self.max_size = self.max_size_including_uncleared_floats();
-                    self.end_floats = ContentSizes::zero();
-                },
-                Clear::Both => {
-                    self.max_size = self.max_size_including_uncleared_floats();
-                    self.start_floats = ContentSizes::zero();
-                    self.end_floats = ContentSizes::zero();
-                },
-                Clear::None => {},
-            };
-        }
-    }
-
-    let accumulate =
-        |mut data: AccumulatedData,
-         (inline_content_sizes_result, float, clear): (InlineContentSizesResult, _, _)| {
-            let size = inline_content_sizes_result.sizes.max(ContentSizes::zero());
-            let depends_on_block_constraints =
-                inline_content_sizes_result.depends_on_block_constraints;
-            data.depends_on_block_constraints |= depends_on_block_constraints;
-            data.clear_floats(clear);
-            match float {
-                Some(FloatSide::InlineStart) => data.start_floats = data.start_floats.union(&size),
-                Some(FloatSide::InlineEnd) => data.end_floats = data.end_floats.union(&size),
-                None => {
-                    data.max_size = data
-                        .max_size
-                        .max(data.start_floats.union(&data.end_floats).union(&size));
-                    data.start_floats = ContentSizes::zero();
-                    data.end_floats = ContentSizes::zero();
-                },
-            }
-            data
-        };
-    let data = if layout_context.use_rayon {
-        boxes
-            .par_iter()
-            .filter_map(get_box_info)
-            .collect::<Vec<_>>()
-            .into_iter()
-            .fold(AccumulatedData::default(), accumulate)
-    } else {
-        boxes
-            .iter()
-            .filter_map(get_box_info)
-            .fold(AccumulatedData::default(), accumulate)
-    };
-    InlineContentSizesResult {
-        depends_on_block_constraints: data.depends_on_block_constraints,
-        sizes: data.max_size_including_uncleared_floats(),
-    }
-}
-
-impl BlockContainer {
-    fn layout(
-        &self,
-        layout_context: &LayoutContext,
-        positioning_context: &mut PositioningContext,
-        containing_block: &ContainingBlock,
-        sequential_layout_state: Option<&mut SequentialLayoutState>,
-        collapsible_with_parent_start_margin: CollapsibleWithParentStartMargin,
-        ignore_block_margins_for_stretch: LogicalSides1D<bool>,
-    ) -> CacheableLayoutResult {
-        match self {
-            BlockContainer::BlockLevelBoxes(child_boxes) => layout_block_level_children(
-                layout_context,
-                positioning_context,
-                child_boxes,
-                containing_block,
-                sequential_layout_state,
-                collapsible_with_parent_start_margin,
-                ignore_block_margins_for_stretch,
-            ),
-            BlockContainer::InlineFormattingContext(ifc) => ifc.layout(
-                layout_context,
-                positioning_context,
-                containing_block,
-                sequential_layout_state,
-                collapsible_with_parent_start_margin,
-            ),
-        }
-    }
-
-    #[inline]
-    pub(crate) fn layout_style<'a>(&self, base: &'a LayoutBoxBase) -> LayoutStyle<'a> {
-        LayoutStyle::Default(&base.style)
-    }
-}
-
-impl ComputeInlineContentSizes for BlockContainer {
-    fn compute_inline_content_sizes(
-        &self,
-        layout_context: &LayoutContext,
-        constraint_space: &ConstraintSpace,
-    ) -> InlineContentSizesResult {
-        match &self {
-            Self::BlockLevelBoxes(boxes) => compute_inline_content_sizes_for_block_level_boxes(
-                boxes,
-                layout_context,
-                &constraint_space.into(),
-            ),
-            Self::InlineFormattingContext(context) => {
-                context.compute_inline_content_sizes(layout_context, constraint_space)
-            },
-        }
-    }
-}
-
-fn layout_block_level_children(
-    layout_context: &LayoutContext,
-    positioning_context: &mut PositioningContext,
-    child_boxes: &[ArcRefCell<BlockLevelBox>],
-    containing_block: &ContainingBlock,
-    mut sequential_layout_state: Option<&mut SequentialLayoutState>,
-    collapsible_with_parent_start_margin: CollapsibleWithParentStartMargin,
-    ignore_block_margins_for_stretch: LogicalSides1D<bool>,
-) -> CacheableLayoutResult {
-    let mut placement_state =
-        PlacementState::new(collapsible_with_parent_start_margin, containing_block);
-
-    let fragments = match sequential_layout_state {
-        Some(ref mut sequential_layout_state) => layout_block_level_children_sequentially(
-            layout_context,
-            positioning_context,
-            child_boxes,
-            containing_block,
-            sequential_layout_state,
-            &mut placement_state,
-            ignore_block_margins_for_stretch,
-        ),
-        None => layout_block_level_children_in_parallel(
-            layout_context,
-            positioning_context,
-            child_boxes,
-            containing_block,
-            &mut placement_state,
-            ignore_block_margins_for_stretch,
-        ),
-    };
-
-    let depends_on_block_constraints = fragments.iter().any(|fragment| {
-        fragment.base().is_some_and(|base| {
-            base.flags.contains(
-                FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM,
-            )
-        })
-    });
-
-    let (content_block_size, collapsible_margins_in_children, baselines) = placement_state.finish();
-    CacheableLayoutResult {
-        fragments,
-        content_block_size,
-        collapsible_margins_in_children,
-        baselines,
-        depends_on_block_constraints,
-        content_inline_size_for_table: None,
-        specific_layout_info: None,
-    }
-}
-
-fn layout_block_level_children_in_parallel(
-    layout_context: &LayoutContext,
-    positioning_context: &mut PositioningContext,
-    child_boxes: &[ArcRefCell<BlockLevelBox>],
-    containing_block: &ContainingBlock,
-    placement_state: &mut PlacementState,
-    ignore_block_margins_for_stretch: LogicalSides1D<bool>,
-) -> Vec<Fragment> {
-    let collects_for_nearest_positioned_ancestor =
-        positioning_context.collects_for_nearest_positioned_ancestor();
-    let mut layout_results: Vec<(Fragment, PositioningContext)> =
-        Vec::with_capacity(child_boxes.len());
-
-    child_boxes
-        .par_iter()
-        .map(|child_box| {
-            let mut child_positioning_context =
-                PositioningContext::new_for_subtree(collects_for_nearest_positioned_ancestor);
-            let fragment = child_box.borrow().layout(
-                layout_context,
-                &mut child_positioning_context,
-                containing_block,
-                /* sequential_layout_state = */ None,
-                /* collapsible_with_parent_start_margin = */ None,
-                ignore_block_margins_for_stretch,
-            );
-            (fragment, child_positioning_context)
-        })
-        .collect_into_vec(&mut layout_results);
-
-    layout_results
-        .into_iter()
-        .map(|(mut fragment, mut child_positioning_context)| {
-            placement_state.place_fragment_and_update_baseline(&mut fragment, None);
-            child_positioning_context.adjust_static_position_of_hoisted_fragments(
-                &fragment,
-                PositioningContextLength::zero(),
-            );
-            positioning_context.append(child_positioning_context);
-            fragment
-        })
-        .collect()
-}
-
-fn layout_block_level_children_sequentially(
-    layout_context: &LayoutContext,
-    positioning_context: &mut PositioningContext,
-    child_boxes: &[ArcRefCell<BlockLevelBox>],
-    containing_block: &ContainingBlock,
-    sequential_layout_state: &mut SequentialLayoutState,
-    placement_state: &mut PlacementState,
-    ignore_block_margins_for_stretch: LogicalSides1D<bool>,
-) -> Vec<Fragment> {
-    // Because floats are involved, we do layout for this block formatting context in tree
-    // order without parallelism. This enables mutable access to a `SequentialLayoutState` that
-    // tracks every float encountered so far (again in tree order).
-    child_boxes
-        .iter()
-        .map(|child_box| {
-            let positioning_context_length_before_layout = positioning_context.len();
-            let mut fragment = child_box.borrow().layout(
-                layout_context,
-                positioning_context,
-                containing_block,
-                Some(&mut *sequential_layout_state),
-                Some(CollapsibleWithParentStartMargin(
-                    placement_state.next_in_flow_margin_collapses_with_parent_start_margin,
-                )),
-                ignore_block_margins_for_stretch,
-            );
-
-            placement_state
-                .place_fragment_and_update_baseline(&mut fragment, Some(sequential_layout_state));
-            positioning_context.adjust_static_position_of_hoisted_fragments(
-                &fragment,
-                positioning_context_length_before_layout,
-            );
-
-            fragment
-        })
-        .collect()
-}
-
-impl BlockLevelBox {
-    fn layout(
-        &self,
-        layout_context: &LayoutContext,
-        positioning_context: &mut PositioningContext,
-        containing_block: &ContainingBlock,
-        sequential_layout_state: Option<&mut SequentialLayoutState>,
-        collapsible_with_parent_start_margin: Option<CollapsibleWithParentStartMargin>,
-        ignore_block_margins_for_stretch: LogicalSides1D<bool>,
-    ) -> Fragment {
-        match self {
-            BlockLevelBox::SameFormattingContextBlock { base, contents, .. } => Fragment::Box(
-                ArcRefCell::new(positioning_context.layout_maybe_position_relative_fragment(
-                    layout_context,
-                    containing_block,
-                    &base.style,
-                    |positioning_context| {
-                        layout_in_flow_non_replaced_block_level_same_formatting_context(
-                            layout_context,
-                            positioning_context,
-                            containing_block,
-                            base,
-                            contents,
-                            sequential_layout_state,
-                            collapsible_with_parent_start_margin,
-                            ignore_block_margins_for_stretch,
-                        )
-                    },
-                )),
-            ),
-            BlockLevelBox::Independent(independent) => Fragment::Box(ArcRefCell::new(
-                positioning_context.layout_maybe_position_relative_fragment(
-                    layout_context,
-                    containing_block,
-                    independent.style(),
-                    |positioning_context| {
-                        independent.layout_in_flow_block_level(
-                            layout_context,
-                            positioning_context,
-                            containing_block,
-                            sequential_layout_state,
-                            ignore_block_margins_for_stretch,
-                        )
-                    },
-                ),
-            )),
-            BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(box_) => {
-                // The static position of zero here is incorrect, however we do not know
-                // the correct positioning until later, in place_block_level_fragment, and
-                // this value will be adjusted there.
-                let hoisted_box = AbsolutelyPositionedBox::to_hoisted(
-                    box_.clone(),
-                    // This is incorrect, however we do not know the correct positioning
-                    // until later, in PlacementState::place_fragment, and this value will be
-                    // adjusted there
-                    PhysicalRect::zero(),
-                    LogicalVec2 {
-                        inline: AlignFlags::START,
-                        block: AlignFlags::START,
-                    },
-                    containing_block.style.writing_mode,
-                );
-                let hoisted_fragment = hoisted_box.fragment.clone();
-                positioning_context.push(hoisted_box);
-                Fragment::AbsoluteOrFixedPositioned(hoisted_fragment)
-            },
-            BlockLevelBox::OutOfFlowFloatBox(float_box) => Fragment::Float(ArcRefCell::new(
-                float_box.layout(layout_context, positioning_context, containing_block),
-            )),
-            BlockLevelBox::OutsideMarker(outside_marker) => outside_marker.layout(
-                layout_context,
-                containing_block,
-                positioning_context,
-                sequential_layout_state,
-                collapsible_with_parent_start_margin,
-            ),
-        }
-    }
-
-    fn inline_content_sizes(
-        &self,
-        layout_context: &LayoutContext,
-        constraint_space: &ConstraintSpace,
-    ) -> InlineContentSizesResult {
-        let independent_formatting_context = match self {
-            BlockLevelBox::Independent(independent) => independent,
-            BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(box_) => &box_.borrow().context,
-            BlockLevelBox::OutOfFlowFloatBox(float_box) => &float_box.contents,
-            BlockLevelBox::OutsideMarker(outside_marker) => {
-                return outside_marker.inline_content_sizes(layout_context, constraint_space);
-            },
-            BlockLevelBox::SameFormattingContextBlock { base, contents, .. } => {
-                return base.inline_content_sizes(layout_context, constraint_space, contents);
-            },
-        };
-        independent_formatting_context.inline_content_sizes(layout_context, constraint_space)
-    }
-}
-
-/// Lay out a normal flow non-replaced block that does not establish a new formatting
-/// context.
-///
-/// - <https://drafts.csswg.org/css2/visudet.html#blockwidth>
-/// - <https://drafts.csswg.org/css2/visudet.html#normal-block>
-#[allow(clippy::too_many_arguments)]
-fn layout_in_flow_non_replaced_block_level_same_formatting_context(
-    layout_context: &LayoutContext,
-    positioning_context: &mut PositioningContext,
-    containing_block: &ContainingBlock,
-    base: &LayoutBoxBase,
-    contents: &BlockContainer,
-    mut sequential_layout_state: Option<&mut SequentialLayoutState>,
-    collapsible_with_parent_start_margin: Option<CollapsibleWithParentStartMargin>,
-    ignore_block_margins_for_stretch: LogicalSides1D<bool>,
-) -> BoxFragment {
-    let style = &base.style;
-    let layout_style = contents.layout_style(base);
-    let containing_block_writing_mode = containing_block.style.writing_mode;
-    let get_inline_content_sizes = |constraint_space: &ConstraintSpace| {
-        base.inline_content_sizes(layout_context, constraint_space, contents)
-            .sizes
-    };
-    let ContainingBlockPaddingAndBorder {
-        containing_block: containing_block_for_children,
-        pbm,
-        block_sizes,
-        depends_on_block_constraints,
-        available_block_size,
-    } = solve_containing_block_padding_and_border_for_in_flow_box(
-        containing_block,
-        &layout_style,
-        get_inline_content_sizes,
-        ignore_block_margins_for_stretch,
-    );
-    let ResolvedMargins {
-        margin,
-        effective_margin_inline_start,
-    } = solve_margins(
-        containing_block,
-        &pbm,
-        containing_block_for_children.size.inline,
-    );
-
-    let computed_block_size = style.content_block_size();
-    let start_margin_can_collapse_with_children =
-        pbm.padding.block_start == Au::zero() && pbm.border.block_start == Au::zero();
-
-    let mut clearance = None;
-    let parent_containing_block_position_info;
-    match sequential_layout_state {
-        None => parent_containing_block_position_info = None,
-        Some(ref mut sequential_layout_state) => {
-            let clear =
-                Clear::from_style_and_container_writing_mode(style, containing_block_writing_mode);
-            let mut block_start_margin = CollapsedMargin::new(margin.block_start);
-
-            // The block start margin may collapse with content margins,
-            // compute the resulting one in order to place floats correctly.
-            // Only need to do this if the element isn't also collapsing with its parent,
-            // otherwise we should have already included the margin in an ancestor.
-            // Note this lookahead stops when finding a descendant whose `clear` isn't `none`
-            // (since clearance prevents collapsing margins with the parent).
-            // But then we have to decide whether to actually add clearance or not,
-            // so look forward again regardless of `collapsible_with_parent_start_margin`.
-            // TODO: This isn't completely right: if we don't add actual clearance,
-            // the margin should have been included in the parent (or some ancestor).
-            // The lookahead should stop for actual clearance, not just for `clear`.
-            let collapsible_with_parent_start_margin = collapsible_with_parent_start_margin.expect(
-                "We should know whether we are collapsing the block start margin with the parent \
-                when laying out sequentially",
-            ).0 && clear == Clear::None;
-            if !collapsible_with_parent_start_margin && start_margin_can_collapse_with_children {
-                if let BlockContainer::BlockLevelBoxes(child_boxes) = contents {
-                    BlockLevelBox::find_block_margin_collapsing_with_parent_from_slice(
-                        layout_context,
-                        child_boxes,
-                        &mut block_start_margin,
-                        &containing_block_for_children,
-                    );
-                }
-            }
-
-            // Introduce clearance if necessary.
-            clearance = sequential_layout_state.calculate_clearance(clear, &block_start_margin);
-            if clearance.is_some() {
-                sequential_layout_state.collapse_margins();
-            }
-            sequential_layout_state.adjoin_assign(&block_start_margin);
-            if !start_margin_can_collapse_with_children {
-                sequential_layout_state.collapse_margins();
-            }
-
-            // NB: This will be a no-op if we're collapsing margins with our children since that
-            // can only happen if we have no block-start padding and border.
-            sequential_layout_state.advance_block_position(
-                pbm.padding.block_start +
-                    pbm.border.block_start +
-                    clearance.unwrap_or_else(Au::zero),
-            );
-
-            // We are about to lay out children. Update the offset between the block formatting
-            // context and the containing block that we create for them. This offset is used to
-            // ajust BFC relative coordinates to coordinates that are relative to our content box.
-            // Our content box establishes the containing block for non-abspos children, including
-            // floats.
-            let inline_start = sequential_layout_state
-                .floats
-                .containing_block_info
-                .inline_start +
-                pbm.padding.inline_start +
-                pbm.border.inline_start +
-                effective_margin_inline_start;
-            let new_cb_offsets = ContainingBlockPositionInfo {
-                block_start: sequential_layout_state.bfc_relative_block_position,
-                block_start_margins_not_collapsed: sequential_layout_state.current_margin,
-                inline_start,
-                inline_end: inline_start + containing_block_for_children.size.inline,
-            };
-            parent_containing_block_position_info = Some(
-                sequential_layout_state.replace_containing_block_position_info(new_cb_offsets),
-            );
-        },
-    };
-
-    // https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing
-    // > If this is a block axis size, and the element is in a Block Layout formatting context,
-    // > and the parent element does not have a block-start border or padding and is not an
-    // > independent formatting context, treat the element’s block-start margin as zero
-    // > for the purpose of calculating this size. Do the same for the block-end margin.
-    let ignore_block_margins_for_stretch = LogicalSides1D::new(
-        pbm.border.block_start.is_zero() && pbm.padding.block_start.is_zero(),
-        pbm.border.block_end.is_zero() && pbm.padding.block_end.is_zero(),
-    );
-
-    let flow_layout = contents.layout(
-        layout_context,
-        positioning_context,
-        &containing_block_for_children,
-        sequential_layout_state.as_deref_mut(),
-        CollapsibleWithParentStartMargin(start_margin_can_collapse_with_children),
-        ignore_block_margins_for_stretch,
-    );
-    let mut content_block_size: Au = flow_layout.content_block_size;
-
-    // Update margins.
-    let mut block_margins_collapsed_with_children = CollapsedBlockMargins::from_margin(&margin);
-    let mut collapsible_margins_in_children = flow_layout.collapsible_margins_in_children;
-    if start_margin_can_collapse_with_children {
-        block_margins_collapsed_with_children
-            .start
-            .adjoin_assign(&collapsible_margins_in_children.start);
-        if collapsible_margins_in_children.collapsed_through {
-            block_margins_collapsed_with_children
-                .start
-                .adjoin_assign(&std::mem::replace(
-                    &mut collapsible_margins_in_children.end,
-                    CollapsedMargin::zero(),
-                ));
-        }
-    }
-
-    let collapsed_through = collapsible_margins_in_children.collapsed_through &&
-        pbm.padding_border_sums.block == Au::zero() &&
-        block_size_is_zero_or_intrinsic(computed_block_size, containing_block) &&
-        block_size_is_zero_or_intrinsic(style.min_block_size(), containing_block);
-    block_margins_collapsed_with_children.collapsed_through = collapsed_through;
-
-    let end_margin_can_collapse_with_children = collapsed_through ||
-        (pbm.padding.block_end == Au::zero() &&
-            pbm.border.block_end == Au::zero() &&
-            computed_block_size.is_auto());
-    if end_margin_can_collapse_with_children {
-        block_margins_collapsed_with_children
-            .end
-            .adjoin_assign(&collapsible_margins_in_children.end);
-    } else {
-        content_block_size += collapsible_margins_in_children.end.solve();
-    }
-
-    let block_size = block_sizes.resolve(
-        Direction::Block,
-        Size::FitContent,
-        Au::zero,
-        available_block_size,
-        || content_block_size.into(),
-        false, /* is_table */
-    );
-
-    if let Some(ref mut sequential_layout_state) = sequential_layout_state {
-        // Now that we're done laying out our children, we can restore the
-        // parent's containing block position information.
-        sequential_layout_state
-            .replace_containing_block_position_info(parent_containing_block_position_info.unwrap());
-
-        // Account for padding and border. We also might have to readjust the
-        // `bfc_relative_block_position` if it was different from the content size (i.e. was
-        // non-`auto` and/or was affected by min/max block size).
-        //
-        // If this adjustment is positive, that means that a block size was specified, but
-        // the content inside had a smaller block size. If this adjustment is negative, a
-        // block size was specified, but the content inside overflowed this container in
-        // the block direction. In that case, the ceiling for floats is effectively raised
-        // as long as no floats in the overflowing content lowered it.
-        sequential_layout_state.advance_block_position(
-            block_size - content_block_size + pbm.padding.block_end + pbm.border.block_end,
-        );
-
-        if !end_margin_can_collapse_with_children {
-            sequential_layout_state.collapse_margins();
-        }
-        sequential_layout_state.adjoin_assign(&CollapsedMargin::new(margin.block_end));
-    }
-
-    let content_rect = LogicalRect {
-        start_corner: LogicalVec2 {
-            block: (pbm.padding.block_start +
-                pbm.border.block_start +
-                clearance.unwrap_or_else(Au::zero)),
-            inline: pbm.padding.inline_start +
-                pbm.border.inline_start +
-                effective_margin_inline_start,
-        },
-        size: LogicalVec2 {
-            block: block_size,
-            inline: containing_block_for_children.size.inline,
-        },
-    };
-
-    let mut base_fragment_info = base.base_fragment_info;
-    if depends_on_block_constraints {
-        base_fragment_info
-            .flags
-            .insert(FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM);
-    }
-
-    BoxFragment::new(
-        base_fragment_info,
-        style.clone(),
-        flow_layout.fragments,
-        content_rect.as_physical(Some(containing_block)),
-        pbm.padding.to_physical(containing_block_writing_mode),
-        pbm.border.to_physical(containing_block_writing_mode),
-        margin.to_physical(containing_block_writing_mode),
-        clearance,
-        block_margins_collapsed_with_children,
-    )
-    .with_baselines(flow_layout.baselines)
-}
-
-impl IndependentNonReplacedContents {
-    /// Lay out a normal in flow non-replaced block that establishes an independent
-    /// formatting context in its containing formatting context.
-    ///
-    /// - <https://drafts.csswg.org/css2/visudet.html#blockwidth>
-    /// - <https://drafts.csswg.org/css2/visudet.html#normal-block>
-    pub(crate) fn layout_in_flow_block_level(
-        &self,
-        base: &LayoutBoxBase,
-        layout_context: &LayoutContext,
-        positioning_context: &mut PositioningContext,
-        containing_block: &ContainingBlock,
-        sequential_layout_state: Option<&mut SequentialLayoutState>,
-        ignore_block_margins_for_stretch: LogicalSides1D<bool>,
-    ) -> BoxFragment {
-        if let Some(sequential_layout_state) = sequential_layout_state {
-            return self.layout_in_flow_block_level_sequentially(
-                base,
-                layout_context,
-                positioning_context,
-                containing_block,
-                sequential_layout_state,
-                ignore_block_margins_for_stretch,
-            );
-        }
-
-        let get_inline_content_sizes = |constraint_space: &ConstraintSpace| {
-            base.inline_content_sizes(layout_context, constraint_space, self)
-                .sizes
-        };
-        let layout_style = self.layout_style(base);
-        let ContainingBlockPaddingAndBorder {
-            containing_block: containing_block_for_children,
-            pbm,
-            block_sizes,
-            depends_on_block_constraints,
-            available_block_size,
-        } = solve_containing_block_padding_and_border_for_in_flow_box(
-            containing_block,
-            &layout_style,
-            get_inline_content_sizes,
-            ignore_block_margins_for_stretch,
-        );
-
-        let layout = self.layout(
-            layout_context,
-            positioning_context,
-            &containing_block_for_children,
-            containing_block,
-            false, /* depends_on_block_constraints */
-        );
-
-        let inline_size = layout
-            .content_inline_size_for_table
-            .unwrap_or(containing_block_for_children.size.inline);
-        let block_size = block_sizes.resolve(
-            Direction::Block,
-            Size::FitContent,
-            Au::zero,
-            available_block_size,
-            || layout.content_block_size.into(),
-            layout_style.is_table(),
-        );
-
-        let ResolvedMargins {
-            margin,
-            effective_margin_inline_start,
-        } = solve_margins(containing_block, &pbm, inline_size);
-
-        let content_rect = LogicalRect {
-            start_corner: LogicalVec2 {
-                block: pbm.padding.block_start + pbm.border.block_start,
-                inline: pbm.padding.inline_start +
-                    pbm.border.inline_start +
-                    effective_margin_inline_start,
-            },
-            size: LogicalVec2 {
-                block: block_size,
-                inline: inline_size,
-            },
-        };
-
-        let block_margins_collapsed_with_children = CollapsedBlockMargins::from_margin(&margin);
-        let containing_block_writing_mode = containing_block.style.writing_mode;
-
-        let mut base_fragment_info = base.base_fragment_info;
-        if depends_on_block_constraints {
-            base_fragment_info.flags.insert(
-                FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM,
-            );
-        }
-        BoxFragment::new(
-            base_fragment_info,
-            base.style.clone(),
-            layout.fragments,
-            content_rect.as_physical(Some(containing_block)),
-            pbm.padding.to_physical(containing_block_writing_mode),
-            pbm.border.to_physical(containing_block_writing_mode),
-            margin.to_physical(containing_block_writing_mode),
-            None, /* clearance */
-            block_margins_collapsed_with_children,
-        )
-        .with_baselines(layout.baselines)
-        .with_specific_layout_info(layout.specific_layout_info)
-    }
-
-    /// Lay out a normal in flow non-replaced block that establishes an independent
-    /// formatting context in its containing formatting context but handling sequential
-    /// layout concerns, such clearing and placing the content next to floats.
-    fn layout_in_flow_block_level_sequentially(
-        &self,
-        base: &LayoutBoxBase,
-        layout_context: &LayoutContext<'_>,
-        positioning_context: &mut PositioningContext,
-        containing_block: &ContainingBlock<'_>,
-        sequential_layout_state: &mut SequentialLayoutState,
-        ignore_block_margins_for_stretch: LogicalSides1D<bool>,
-    ) -> BoxFragment {
-        let style = &base.style;
-        let containing_block_writing_mode = containing_block.style.writing_mode;
-        let ContentBoxSizesAndPBM {
-            content_box_sizes,
-            pbm,
-            depends_on_block_constraints,
-        } = self
-            .layout_style(base)
-            .content_box_sizes_and_padding_border_margin(&containing_block.into());
-
-        let (margin_block_start, margin_block_end) =
-            solve_block_margins_for_in_flow_block_level(&pbm);
-        let collapsed_margin_block_start = CollapsedMargin::new(margin_block_start);
-
-        // From https://drafts.csswg.org/css2/#floats:
-        // "The border box of a table, a block-level replaced element, or an element in
-        //  the normal flow that establishes a new block formatting context (such as an
-        //  element with overflow other than visible) must not overlap the margin box of
-        //  any floats in the same block formatting context as the element itself. If
-        //  necessary, implementations should clear the said element by placing it below
-        //  any preceding floats, but may place it adjacent to such floats if there is
-        //  sufficient space. They may even make the border box of said element narrower
-        //  than defined by section 10.3.3. CSS 2 does not define when a UA may put said
-        //  element next to the float or by how much said element may become narrower."
-        let mut content_size;
-        let mut layout;
-        let mut placement_rect;
-
-        // First compute the clear position required by the 'clear' property.
-        // The code below may then add extra clearance when the element can't fit
-        // next to floats not covered by 'clear'.
-        let clear_position = sequential_layout_state.calculate_clear_position(
-            Clear::from_style_and_container_writing_mode(style, containing_block_writing_mode),
-            &collapsed_margin_block_start,
-        );
-        let ceiling = clear_position.unwrap_or_else(|| {
-            sequential_layout_state.position_without_clearance(&collapsed_margin_block_start)
-        });
-
-        // Then compute a tentative block size, only taking extrinsic values into account.
-        let pbm_sums = pbm.sums_auto_is_zero(ignore_block_margins_for_stretch);
-        let available_block_size = containing_block
-            .size
-            .block
-            .to_definite()
-            .map(|block_size| Au::zero().max(block_size - pbm_sums.block));
-        let (preferred_block_size, min_block_size, max_block_size) = content_box_sizes
-            .block
-            .resolve_each_extrinsic(Size::FitContent, Au::zero(), available_block_size);
-        let tentative_block_size =
-            SizeConstraint::new(preferred_block_size, min_block_size, max_block_size);
-
-        // With the tentative block size we can compute the inline min/max-content sizes.
-        let get_inline_content_sizes = || {
-            let constraint_space = ConstraintSpace::new(
-                tentative_block_size,
-                style.writing_mode,
-                self.preferred_aspect_ratio(),
-            );
-            base.inline_content_sizes(layout_context, &constraint_space, self)
-                .sizes
-        };
-
-        // TODO: the automatic inline size should take `justify-self` into account.
-        let is_table = self.is_table();
-        let automatic_inline_size = if is_table {
-            Size::FitContent
-        } else {
-            Size::Stretch
-        };
-        let compute_inline_size = |stretch_size| {
-            content_box_sizes.inline.resolve(
-                Direction::Inline,
-                automatic_inline_size,
-                Au::zero,
-                Some(stretch_size),
-                get_inline_content_sizes,
-                is_table,
-            )
-        };
-
-        let compute_block_size = |layout: &CacheableLayoutResult| {
-            content_box_sizes.block.resolve(
-                Direction::Block,
-                Size::FitContent,
-                Au::zero,
-                available_block_size,
-                || layout.content_block_size.into(),
-                is_table,
-            )
-        };
-
-        // The final inline size can depend on the available space, which depends on where
-        // we are placing the box, since floats reduce the available space.
-        // Here we assume that `compute_inline_size()` is a monotonically increasing function
-        // with respect to the available space. Therefore, if we get the same result for 0
-        // and for MAX_AU, it means that the function is constant.
-        // TODO: `compute_inline_size()` may not be monotonic with `calc-size()`. For example,
-        // `calc-size(stretch, (1px / (size + 1px) + sign(size)) * 1px)` would result in 1px
-        // both when the available space is zero and infinity, but it's not constant.
-        let inline_size_with_no_available_space = compute_inline_size(Au::zero());
-        if inline_size_with_no_available_space == compute_inline_size(MAX_AU) {
-            // If the inline size doesn't depend on the available inline space, we can just
-            // compute it with an available inline space of zero. Then, after layout we can
-            // compute the block size, and finally place among floats.
-            let inline_size = inline_size_with_no_available_space;
-            layout = self.layout(
-                layout_context,
-                positioning_context,
-                &ContainingBlock {
-                    size: ContainingBlockSize {
-                        inline: inline_size,
-                        block: tentative_block_size,
-                    },
-                    style,
-                },
-                containing_block,
-                false, /* depends_on_block_constraints */
-            );
-
-            content_size = LogicalVec2 {
-                block: compute_block_size(&layout),
-                inline: layout.content_inline_size_for_table.unwrap_or(inline_size),
-            };
-
-            let mut placement = PlacementAmongFloats::new(
-                &sequential_layout_state.floats,
-                ceiling,
-                content_size + pbm.padding_border_sums,
-                &pbm,
-            );
-            placement_rect = placement.place();
-        } else {
-            // If the inline size depends on the available space, then we need to iterate
-            // the various placement candidates, resolve both the inline and block sizes
-            // on each one placement area, and then check if the box actually fits it.
-            // As an optimization, we first compute a lower bound of the final box size,
-            // and skip placement candidates where not even the lower bound would fit.
-            let minimum_size_of_block = LogicalVec2 {
-                // For the lower bound of the inline size, simply assume no available space.
-                // TODO: this won't work for things like `calc-size(stretch, 100px - size)`,
-                // which should result in a bigger size when the available space gets smaller.
-                inline: inline_size_with_no_available_space,
-                block: match tentative_block_size {
-                    // If we were able to resolve the preferred and maximum block sizes,
-                    // use the tentative block size (it takes the 3 sizes into account).
-                    SizeConstraint::Definite(size) if max_block_size.is_some() => size,
-                    // Oherwise the preferred or maximum block size might end up being zero,
-                    // so can only rely on the minimum block size.
-                    _ => min_block_size,
-                },
-            } + pbm.padding_border_sums;
-            let mut placement = PlacementAmongFloats::new(
-                &sequential_layout_state.floats,
-                ceiling,
-                minimum_size_of_block,
-                &pbm,
-            );
-
-            loop {
-                // First try to place the block using the minimum size as the object size.
-                placement_rect = placement.place();
-                let available_inline_size =
-                    placement_rect.size.inline - pbm.padding_border_sums.inline;
-                let proposed_inline_size = compute_inline_size(available_inline_size);
-
-                // Now lay out the block using the inline size we calculated from the placement.
-                // Later we'll check to see if the resulting block size is compatible with the
-                // placement.
-                let positioning_context_length = positioning_context.len();
-                layout = self.layout(
-                    layout_context,
-                    positioning_context,
-                    &ContainingBlock {
-                        size: ContainingBlockSize {
-                            inline: proposed_inline_size,
-                            block: tentative_block_size,
-                        },
-                        style,
-                    },
-                    containing_block,
-                    false, /* depends_on_block_constraints */
-                );
-
-                let inline_size = if let Some(inline_size) = layout.content_inline_size_for_table {
-                    // This is a table that ended up being smaller than predicted because of
-                    // collapsed columns. Note we don't backtrack to consider areas that we
-                    // previously thought weren't big enough.
-                    // TODO: Should `minimum_size_of_block.inline` be zero for tables?
-                    debug_assert!(inline_size < proposed_inline_size);
-                    inline_size
-                } else {
-                    proposed_inline_size
-                };
-                content_size = LogicalVec2 {
-                    block: compute_block_size(&layout),
-                    inline: inline_size,
-                };
-
-                // Now we know the block size of this attempted layout of a box with block
-                // size of auto. Try to fit it into our precalculated placement among the
-                // floats. If it fits, then we can stop trying layout candidates.
-                if placement.try_to_expand_for_auto_block_size(
-                    content_size.block + pbm.padding_border_sums.block,
-                    &placement_rect.size,
-                ) {
-                    break;
-                }
-
-                // The previous attempt to lay out this independent formatting context
-                // among the floats did not work, so we must unhoist any boxes from that
-                // attempt.
-                positioning_context.truncate(&positioning_context_length);
-            }
-        }
-
-        // Only set clearance if we would have cleared or the placement among floats moves
-        // the block further in the block direction. These two situations are the ones that
-        // prevent margin collapse.
-        let has_clearance = clear_position.is_some() || placement_rect.start_corner.block > ceiling;
-        let clearance = has_clearance.then(|| {
-            placement_rect.start_corner.block -
-                sequential_layout_state
-                    .position_with_zero_clearance(&collapsed_margin_block_start)
-        });
-
-        let ((margin_inline_start, margin_inline_end), effective_margin_inline_start) =
-            solve_inline_margins_avoiding_floats(
-                sequential_layout_state,
-                containing_block,
-                &pbm,
-                content_size.inline + pbm.padding_border_sums.inline,
-                placement_rect,
-            );
-
-        let margin = LogicalSides {
-            inline_start: margin_inline_start,
-            inline_end: margin_inline_end,
-            block_start: margin_block_start,
-            block_end: margin_block_end,
-        };
-
-        // Clearance prevents margin collapse between this block and previous ones,
-        // so in that case collapse margins before adjoining them below.
-        if clearance.is_some() {
-            sequential_layout_state.collapse_margins();
-        }
-        sequential_layout_state.adjoin_assign(&collapsed_margin_block_start);
-
-        // Margins can never collapse into independent formatting contexts.
-        sequential_layout_state.collapse_margins();
-        sequential_layout_state.advance_block_position(
-            pbm.padding_border_sums.block + content_size.block + clearance.unwrap_or_else(Au::zero),
-        );
-        sequential_layout_state.adjoin_assign(&CollapsedMargin::new(margin.block_end));
-
-        let content_rect = LogicalRect {
-            start_corner: LogicalVec2 {
-                block: pbm.padding.block_start +
-                    pbm.border.block_start +
-                    clearance.unwrap_or_else(Au::zero),
-                inline: pbm.padding.inline_start +
-                    pbm.border.inline_start +
-                    effective_margin_inline_start,
-            },
-            size: content_size,
-        };
-
-        let mut base_fragment_info = base.base_fragment_info;
-        if depends_on_block_constraints {
-            base_fragment_info.flags.insert(
-                FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM,
-            );
-        }
-
-        BoxFragment::new(
-            base_fragment_info,
-            style.clone(),
-            layout.fragments,
-            content_rect.as_physical(Some(containing_block)),
-            pbm.padding.to_physical(containing_block_writing_mode),
-            pbm.border.to_physical(containing_block_writing_mode),
-            margin.to_physical(containing_block_writing_mode),
-            clearance,
-            CollapsedBlockMargins::from_margin(&margin),
-        )
-        .with_baselines(layout.baselines)
-        .with_specific_layout_info(layout.specific_layout_info)
-    }
-}
-
-impl ReplacedContents {
-    /// <https://drafts.csswg.org/css2/visudet.html#block-replaced-width>
-    /// <https://drafts.csswg.org/css2/visudet.html#inline-replaced-width>
-    /// <https://drafts.csswg.org/css2/visudet.html#inline-replaced-height>
-    fn layout_in_flow_block_level(
-        &self,
-        base: &LayoutBoxBase,
-        layout_context: &LayoutContext,
-        containing_block: &ContainingBlock,
-        mut sequential_layout_state: Option<&mut SequentialLayoutState>,
-        ignore_block_margins_for_stretch: LogicalSides1D<bool>,
-    ) -> BoxFragment {
-        let content_box_sizes_and_pbm = self
-            .layout_style(base)
-            .content_box_sizes_and_padding_border_margin(&containing_block.into());
-        let pbm = &content_box_sizes_and_pbm.pbm;
-        let content_size = self.used_size_as_if_inline_element(
-            containing_block,
-            &base.style,
-            &content_box_sizes_and_pbm,
-            ignore_block_margins_for_stretch,
-        );
-
-        let margin_inline_start;
-        let margin_inline_end;
-        let effective_margin_inline_start;
-        let (margin_block_start, margin_block_end) =
-            solve_block_margins_for_in_flow_block_level(pbm);
-
-        let containing_block_writing_mode = containing_block.style.writing_mode;
-        let physical_content_size = content_size.to_physical_size(containing_block_writing_mode);
-        let fragments = self.make_fragments(layout_context, &base.style, physical_content_size);
-
-        let clearance;
-        if let Some(ref mut sequential_layout_state) = sequential_layout_state {
-            // From https://drafts.csswg.org/css2/#floats:
-            // "The border box of a table, a block-level replaced element, or an element in
-            //  the normal flow that establishes a new block formatting context (such as an
-            //  element with overflow other than visible) must not overlap the margin box of
-            //  any floats in the same block formatting context as the element itself. If
-            //  necessary, implementations should clear the said element by placing it below
-            //  any preceding floats, but may place it adjacent to such floats if there is
-            //  sufficient space. They may even make the border box of said element narrower
-            //  than defined by section 10.3.3. CSS 2 does not define when a UA may put said
-            //  element next to the float or by how much said element may become narrower."
-            let collapsed_margin_block_start = CollapsedMargin::new(margin_block_start);
-            let size = content_size + pbm.padding_border_sums;
-            let placement_rect;
-            (clearance, placement_rect) = sequential_layout_state
-                .calculate_clearance_and_inline_adjustment(
-                    Clear::from_style_and_container_writing_mode(
-                        &base.style,
-                        containing_block.style.writing_mode,
-                    ),
-                    &collapsed_margin_block_start,
-                    pbm,
-                    size,
-                );
-            (
-                (margin_inline_start, margin_inline_end),
-                effective_margin_inline_start,
-            ) = solve_inline_margins_avoiding_floats(
-                sequential_layout_state,
-                containing_block,
-                pbm,
-                size.inline,
-                placement_rect,
-            );
-
-            // Clearance prevents margin collapse between this block and previous ones,
-            // so in that case collapse margins before adjoining them below.
-            if clearance.is_some() {
-                sequential_layout_state.collapse_margins();
-            }
-            sequential_layout_state.adjoin_assign(&collapsed_margin_block_start);
-
-            // Margins can never collapse into replaced elements.
-            sequential_layout_state.collapse_margins();
-            sequential_layout_state
-                .advance_block_position(size.block + clearance.unwrap_or_else(Au::zero));
-            sequential_layout_state.adjoin_assign(&CollapsedMargin::new(margin_block_end));
-        } else {
-            clearance = None;
-            (
-                (margin_inline_start, margin_inline_end),
-                effective_margin_inline_start,
-            ) = solve_inline_margins_for_in_flow_block_level(
-                containing_block,
-                pbm,
-                content_size.inline,
-            );
-        };
-
-        let margin = LogicalSides {
-            inline_start: margin_inline_start,
-            inline_end: margin_inline_end,
-            block_start: margin_block_start,
-            block_end: margin_block_end,
-        };
-
-        let start_corner = LogicalVec2 {
-            block: pbm.padding.block_start +
-                pbm.border.block_start +
-                clearance.unwrap_or_else(Au::zero),
-            inline: pbm.padding.inline_start +
-                pbm.border.inline_start +
-                effective_margin_inline_start,
-        };
-        let content_rect = LogicalRect {
-            start_corner,
-            size: content_size,
-        }
-        .as_physical(Some(containing_block));
-
-        let mut base_fragment_info = base.base_fragment_info;
-        if content_box_sizes_and_pbm.depends_on_block_constraints {
-            base_fragment_info.flags.insert(
-                FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM,
-            );
-        }
-
-        BoxFragment::new(
-            base_fragment_info,
-            base.style.clone(),
-            fragments,
-            content_rect,
-            pbm.padding.to_physical(containing_block_writing_mode),
-            pbm.border.to_physical(containing_block_writing_mode),
-            margin.to_physical(containing_block_writing_mode),
-            clearance,
-            CollapsedBlockMargins::from_margin(&margin),
-        )
-    }
-}
-
-struct ContainingBlockPaddingAndBorder<'a> {
-    containing_block: ContainingBlock<'a>,
-    pbm: PaddingBorderMargin,
-    block_sizes: Sizes,
-    depends_on_block_constraints: bool,
-    available_block_size: Option<Au>,
-}
-
-struct ResolvedMargins {
-    /// Used value for the margin properties, as exposed in getComputedStyle().
-    pub margin: LogicalSides<Au>,
-
-    /// Distance between the border box and the containing block on the inline-start side.
-    /// This is typically the same as the inline-start margin, but can be greater when
-    /// the box is justified within the free space in the containing block.
-    /// The reason we aren't just adjusting the used margin-inline-start is that
-    /// this shouldn't be observable via getComputedStyle().
-    /// <https://drafts.csswg.org/css-align/#justify-self-property>
-    pub effective_margin_inline_start: Au,
-}
-
-/// Given the style for an in-flow box and its containing block, determine the containing
-/// block for its children.
-/// Note that in the presence of floats, this shouldn't be used for a block-level box
-/// that establishes an independent formatting context (or is replaced), since the
-/// inline size could then be incorrect.
-fn solve_containing_block_padding_and_border_for_in_flow_box<'a>(
-    containing_block: &ContainingBlock<'_>,
-    layout_style: &'a LayoutStyle,
-    get_inline_content_sizes: impl FnOnce(&ConstraintSpace) -> ContentSizes,
-    ignore_block_margins_for_stretch: LogicalSides1D<bool>,
-) -> ContainingBlockPaddingAndBorder<'a> {
-    let style = layout_style.style();
-    if matches!(style.pseudo(), Some(PseudoElement::ServoAnonymousBox)) {
-        // <https://drafts.csswg.org/css2/#anonymous-block-level>
-        // > Anonymous block boxes are ignored when resolving percentage values that would
-        // > refer to it: the closest non-anonymous ancestor box is used instead.
-        let containing_block_for_children = ContainingBlock {
-            size: ContainingBlockSize {
-                inline: containing_block.size.inline,
-                block: containing_block.size.block,
-            },
-            style,
-        };
-        // <https://drafts.csswg.org/css2/#anonymous-block-level>
-        // > Non-inherited properties have their initial value.
-        return ContainingBlockPaddingAndBorder {
-            containing_block: containing_block_for_children,
-            pbm: PaddingBorderMargin::zero(),
-            block_sizes: Sizes::default(),
-            depends_on_block_constraints: false,
-            // The available block size may actually be definite, but it should be irrelevant
-            // since the sizing properties are set to their initial value.
-            available_block_size: None,
-        };
-    }
-
-    let ContentBoxSizesAndPBM {
-        content_box_sizes,
-        pbm,
-        depends_on_block_constraints,
-    } = layout_style.content_box_sizes_and_padding_border_margin(&containing_block.into());
-
-    let pbm_sums = pbm.sums_auto_is_zero(ignore_block_margins_for_stretch);
-    let writing_mode = style.writing_mode;
-    let available_inline_size = Au::zero().max(containing_block.size.inline - pbm_sums.inline);
-    let available_block_size = containing_block
-        .size
-        .block
-        .to_definite()
-        .map(|block_size| Au::zero().max(block_size - pbm_sums.block));
-
-    // https://drafts.csswg.org/css2/#the-height-property
-    // https://drafts.csswg.org/css2/visudet.html#min-max-heights
-    let tentative_block_size = content_box_sizes.block.resolve_extrinsic(
-        Size::FitContent,
-        Au::zero(),
-        available_block_size,
-    );
-
-    // https://drafts.csswg.org/css2/#the-width-property
-    // https://drafts.csswg.org/css2/visudet.html#min-max-widths
-    let get_inline_content_sizes = || {
-        get_inline_content_sizes(&ConstraintSpace::new(
-            tentative_block_size,
-            writing_mode,
-            None, /* TODO: support preferred aspect ratios on non-replaced boxes */
-        ))
-    };
-    // TODO: the automatic inline size should take `justify-self` into account.
-    let is_table = layout_style.is_table();
-    let automatic_inline_size = if is_table {
-        Size::FitContent
-    } else {
-        Size::Stretch
-    };
-    let inline_size = content_box_sizes.inline.resolve(
-        Direction::Inline,
-        automatic_inline_size,
-        Au::zero,
-        Some(available_inline_size),
-        get_inline_content_sizes,
-        is_table,
-    );
-
-    let containing_block_for_children = ContainingBlock {
-        size: ContainingBlockSize {
-            inline: inline_size,
-            block: tentative_block_size,
-        },
-        style,
-    };
-    // https://drafts.csswg.org/css-writing-modes/#orthogonal-flows
-    assert_eq!(
-        containing_block.style.writing_mode.is_horizontal(),
-        containing_block_for_children
-            .style
-            .writing_mode
-            .is_horizontal(),
-        "Vertical writing modes are not supported yet"
-    );
-    ContainingBlockPaddingAndBorder {
-        containing_block: containing_block_for_children,
-        pbm,
-        block_sizes: content_box_sizes.block,
-        depends_on_block_constraints,
-        available_block_size,
-    }
-}
-
-/// Given the containing block and size of an in-flow box, determine the margins.
-/// Note that in the presence of floats, this shouldn't be used for a block-level box
-/// that establishes an independent formatting context (or is replaced), since the
-/// margins could then be incorrect.
-fn solve_margins(
-    containing_block: &ContainingBlock<'_>,
-    pbm: &PaddingBorderMargin,
-    inline_size: Au,
-) -> ResolvedMargins {
-    let (inline_margins, effective_margin_inline_start) =
-        solve_inline_margins_for_in_flow_block_level(containing_block, pbm, inline_size);
-    let block_margins = solve_block_margins_for_in_flow_block_level(pbm);
-    ResolvedMargins {
-        margin: LogicalSides {
-            inline_start: inline_margins.0,
-            inline_end: inline_margins.1,
-            block_start: block_margins.0,
-            block_end: block_margins.1,
-        },
-        effective_margin_inline_start,
-    }
-}
-
-/// Resolves 'auto' margins of an in-flow block-level box in the block axis.
-/// <https://drafts.csswg.org/css2/#normal-block>
-/// <https://drafts.csswg.org/css2/#block-root-margin>
-fn solve_block_margins_for_in_flow_block_level(pbm: &PaddingBorderMargin) -> (Au, Au) {
-    (
-        pbm.margin.block_start.auto_is(Au::zero),
-        pbm.margin.block_end.auto_is(Au::zero),
-    )
-}
-
-/// This is supposed to handle 'justify-self', but no browser supports it on block boxes.
-/// Instead, `<center>` and `<div align>` are implemented via internal 'text-align' values.
-/// The provided free space should already take margins into account. In particular,
-/// it should be zero if there is an auto margin.
-/// <https://drafts.csswg.org/css-align/#justify-block>
-fn justify_self_alignment(containing_block: &ContainingBlock, free_space: Au) -> Au {
-    let style = containing_block.style;
-    debug_assert!(free_space >= Au::zero());
-    match style.clone_text_align() {
-        TextAlignKeyword::MozCenter => free_space / 2,
-        TextAlignKeyword::MozLeft if !style.writing_mode.line_left_is_inline_start() => free_space,
-        TextAlignKeyword::MozRight if style.writing_mode.line_left_is_inline_start() => free_space,
-        _ => Au::zero(),
-    }
-}
-
-/// Resolves 'auto' margins of an in-flow block-level box in the inline axis,
-/// distributing the free space in the containing block.
-///
-/// This is based on CSS2.1 § 10.3.3 <https://drafts.csswg.org/css2/#blockwidth>
-/// but without adjusting the margins in "over-contrained" cases, as mandated by
-/// <https://drafts.csswg.org/css-align/#justify-block>.
-///
-/// Note that in the presence of floats, this shouldn't be used for a block-level box
-/// that establishes an independent formatting context (or is replaced).
-///
-/// In addition to the used margins, it also returns the effective margin-inline-start
-/// (see ContainingBlockPaddingAndBorder).
-fn solve_inline_margins_for_in_flow_block_level(
-    containing_block: &ContainingBlock,
-    pbm: &PaddingBorderMargin,
-    inline_size: Au,
-) -> ((Au, Au), Au) {
-    let free_space = containing_block.size.inline - pbm.padding_border_sums.inline - inline_size;
-    let mut justification = Au::zero();
-    let inline_margins = match (pbm.margin.inline_start, pbm.margin.inline_end) {
-        (AuOrAuto::Auto, AuOrAuto::Auto) => {
-            let start = Au::zero().max(free_space / 2);
-            (start, free_space - start)
-        },
-        (AuOrAuto::Auto, AuOrAuto::LengthPercentage(end)) => {
-            (Au::zero().max(free_space - end), end)
-        },
-        (AuOrAuto::LengthPercentage(start), AuOrAuto::Auto) => (start, free_space - start),
-        (AuOrAuto::LengthPercentage(start), AuOrAuto::LengthPercentage(end)) => {
-            // In the cases above, the free space is zero after taking 'auto' margins into account.
-            // But here we may still have some free space to perform 'justify-self' alignment.
-            // This aligns the margin box within the containing block, or in other words,
-            // aligns the border box within the margin-shrunken containing block.
-            let free_space = Au::zero().max(free_space - start - end);
-            justification = justify_self_alignment(containing_block, free_space);
-            (start, end)
-        },
-    };
-    let effective_margin_inline_start = inline_margins.0 + justification;
-    (inline_margins, effective_margin_inline_start)
-}
-
-/// Resolves 'auto' margins of an in-flow block-level box in the inline axis
-/// similarly to |solve_inline_margins_for_in_flow_block_level|. However,
-/// they align within the provided rect (instead of the containing block),
-/// to avoid overlapping floats.
-/// In addition to the used margins, it also returns the effective
-/// margin-inline-start (see ContainingBlockPaddingAndBorder).
-/// It may differ from the used inline-start margin if the computed value
-/// wasn't 'auto' and there are floats to avoid or the box is justified.
-/// See <https://github.com/w3c/csswg-drafts/issues/9174>
-fn solve_inline_margins_avoiding_floats(
-    sequential_layout_state: &SequentialLayoutState,
-    containing_block: &ContainingBlock,
-    pbm: &PaddingBorderMargin,
-    inline_size: Au,
-    placement_rect: LogicalRect<Au>,
-) -> ((Au, Au), Au) {
-    let free_space = placement_rect.size.inline - inline_size;
-    debug_assert!(free_space >= Au::zero());
-    let cb_info = &sequential_layout_state.floats.containing_block_info;
-    let start_adjustment = placement_rect.start_corner.inline - cb_info.inline_start;
-    let end_adjustment = cb_info.inline_end - placement_rect.max_inline_position();
-    let mut justification = Au::zero();
-    let inline_margins = match (pbm.margin.inline_start, pbm.margin.inline_end) {
-        (AuOrAuto::Auto, AuOrAuto::Auto) => {
-            let half = free_space / 2;
-            (start_adjustment + half, end_adjustment + free_space - half)
-        },
-        (AuOrAuto::Auto, AuOrAuto::LengthPercentage(end)) => (start_adjustment + free_space, end),
-        (AuOrAuto::LengthPercentage(start), AuOrAuto::Auto) => (start, end_adjustment + free_space),
-        (AuOrAuto::LengthPercentage(start), AuOrAuto::LengthPercentage(end)) => {
-            // The spec says 'justify-self' aligns the margin box within the float-shrunken
-            // containing block. That's wrong (https://github.com/w3c/csswg-drafts/issues/9963),
-            // and Blink and WebKit are broken anyways. So we match Gecko instead: this aligns
-            // the border box within the instersection of the float-shrunken containing-block
-            // and the margin-shrunken containing-block.
-            justification = justify_self_alignment(containing_block, free_space);
-            (start, end)
-        },
-    };
-    let effective_margin_inline_start = inline_margins.0.max(start_adjustment) + justification;
-    (inline_margins, effective_margin_inline_start)
-}
-
-/// State that we maintain when placing blocks.
-///
-/// In parallel mode, this placement is done after all child blocks are laid out. In
-/// sequential mode, this is done right after each block is laid out.
-struct PlacementState<'container> {
-    next_in_flow_margin_collapses_with_parent_start_margin: bool,
-    last_in_flow_margin_collapses_with_parent_end_margin: bool,
-    start_margin: CollapsedMargin,
-    current_margin: CollapsedMargin,
-    current_block_direction_position: Au,
-    inflow_baselines: Baselines,
-    is_inline_block_context: bool,
-
-    /// If this [`PlacementState`] is laying out a list item with an outside marker. Record the
-    /// block size of that marker, because the content block size of the list item needs to be at
-    /// least as tall as the marker size -- even though the marker doesn't advance the block
-    /// position of the placement.
-    marker_block_size: Option<Au>,
-
-    /// The [`ContainingBlock`] of the container into which this [`PlacementState`] is laying out
-    /// fragments. This is used to convert between physical and logical geometry.
-    containing_block: &'container ContainingBlock<'container>,
-}
-
-impl<'container> PlacementState<'container> {
-    fn new(
-        collapsible_with_parent_start_margin: CollapsibleWithParentStartMargin,
-        containing_block: &'container ContainingBlock<'container>,
-    ) -> PlacementState<'container> {
-        let is_inline_block_context =
-            containing_block.style.get_box().clone_display() == Display::InlineBlock;
-        PlacementState {
-            next_in_flow_margin_collapses_with_parent_start_margin:
-                collapsible_with_parent_start_margin.0,
-            last_in_flow_margin_collapses_with_parent_end_margin: true,
-            start_margin: CollapsedMargin::zero(),
-            current_margin: CollapsedMargin::zero(),
-            current_block_direction_position: Au::zero(),
-            inflow_baselines: Baselines::default(),
-            is_inline_block_context,
-            marker_block_size: None,
-            containing_block,
-        }
-    }
-
-    fn place_fragment_and_update_baseline(
-        &mut self,
-        fragment: &mut Fragment,
-        sequential_layout_state: Option<&mut SequentialLayoutState>,
-    ) {
-        self.place_fragment(fragment, sequential_layout_state);
-
-        let box_fragment = match fragment {
-            Fragment::Box(box_fragment) => box_fragment,
-            _ => return,
-        };
-        let box_fragment = box_fragment.borrow();
-
-        // From <https://drafts.csswg.org/css-align-3/#baseline-export>:
-        // > When finding the first/last baseline set of an inline-block, any baselines
-        // > contributed by table boxes must be skipped. (This quirk is a legacy behavior from
-        // > [CSS2].)
-        if self.is_inline_block_context && box_fragment.is_table_wrapper() {
-            return;
-        }
-
-        let box_block_offset = box_fragment
-            .content_rect
-            .origin
-            .to_logical(self.containing_block)
-            .block;
-        let box_fragment_baselines =
-            box_fragment.baselines(self.containing_block.style.writing_mode);
-        if let (None, Some(first)) = (self.inflow_baselines.first, box_fragment_baselines.first) {
-            self.inflow_baselines.first = Some(first + box_block_offset);
-        }
-        if let Some(last) = box_fragment_baselines.last {
-            self.inflow_baselines.last = Some(last + box_block_offset);
-        }
-    }
-
-    /// Place a single [Fragment] in a block level context using the state so far and
-    /// information gathered from the [Fragment] itself.
-    fn place_fragment(
-        &mut self,
-        fragment: &mut Fragment,
-        sequential_layout_state: Option<&mut SequentialLayoutState>,
-    ) {
-        match fragment {
-            Fragment::Box(fragment) => {
-                // If this child is a marker positioned outside of a list item, then record its
-                // size, but also ensure that it doesn't advance the block position of the placment.
-                // This ensures item content is placed next to the marker.
-                //
-                // This is a pretty big hack because it doesn't properly handle all interactions
-                // between the marker and the item. For instance the marker should be positioned at
-                // the baseline of list item content and the first line of the item content should
-                // be at least as tall as the marker -- not the entire list item itself.
-                let fragment = &mut *fragment.borrow_mut();
-                let is_outside_marker = fragment
-                    .base
-                    .flags
-                    .contains(FragmentFlags::IS_OUTSIDE_LIST_ITEM_MARKER);
-                if is_outside_marker {
-                    assert!(self.marker_block_size.is_none());
-                    self.marker_block_size = Some(
-                        fragment
-                            .content_rect
-                            .size
-                            .to_logical(self.containing_block.style.writing_mode)
-                            .block,
-                    );
-                    return;
-                }
-
-                let fragment_block_margins = &fragment.block_margins_collapsed_with_children;
-                let mut fragment_block_size = fragment
-                    .border_rect()
-                    .size
-                    .to_logical(self.containing_block.style.writing_mode)
-                    .block;
-
-                // We use `last_in_flow_margin_collapses_with_parent_end_margin` to implement
-                // this quote from https://drafts.csswg.org/css2/#collapsing-margins
-                // > If the top and bottom margins of an element with clearance are adjoining,
-                // > its margins collapse with the adjoining margins of following siblings but that
-                // > resulting margin does not collapse with the bottom margin of the parent block.
-                if let Some(clearance) = fragment.clearance {
-                    fragment_block_size += clearance;
-                    // Margins can't be adjoining if they are separated by clearance.
-                    // Setting `next_in_flow_margin_collapses_with_parent_start_margin` to false
-                    // prevents collapsing with the start margin of the parent, and will set
-                    // `collapsed_through` to false, preventing the parent from collapsing through.
-                    self.current_block_direction_position += self.current_margin.solve();
-                    self.current_margin = CollapsedMargin::zero();
-                    self.next_in_flow_margin_collapses_with_parent_start_margin = false;
-                    if fragment_block_margins.collapsed_through {
-                        self.last_in_flow_margin_collapses_with_parent_end_margin = false;
-                    }
-                } else if !fragment_block_margins.collapsed_through {
-                    self.last_in_flow_margin_collapses_with_parent_end_margin = true;
-                }
-
-                if self.next_in_flow_margin_collapses_with_parent_start_margin {
-                    debug_assert!(self.current_margin.solve().is_zero());
-                    self.start_margin
-                        .adjoin_assign(&fragment_block_margins.start);
-                    if fragment_block_margins.collapsed_through {
-                        self.start_margin.adjoin_assign(&fragment_block_margins.end);
-                        return;
-                    }
-                    self.next_in_flow_margin_collapses_with_parent_start_margin = false;
-                } else {
-                    self.current_margin
-                        .adjoin_assign(&fragment_block_margins.start);
-                }
-
-                fragment.content_rect.origin += LogicalVec2 {
-                    inline: Au::zero(),
-                    block: self.current_margin.solve() + self.current_block_direction_position,
-                }
-                .to_physical_size(self.containing_block.style.writing_mode);
-
-                if fragment_block_margins.collapsed_through {
-                    // `fragment_block_size` is typically zero when collapsing through,
-                    // but we still need to consider it in case there is clearance.
-                    self.current_block_direction_position += fragment_block_size;
-                    self.current_margin
-                        .adjoin_assign(&fragment_block_margins.end);
-                } else {
-                    self.current_block_direction_position +=
-                        self.current_margin.solve() + fragment_block_size;
-                    self.current_margin = fragment_block_margins.end;
-                }
-            },
-            Fragment::AbsoluteOrFixedPositioned(fragment) => {
-                // The alignment of absolutes in block flow layout is always "start", so the size of
-                // the static position rectangle does not matter.
-                fragment.borrow_mut().static_position_rect = LogicalRect {
-                    start_corner: LogicalVec2 {
-                        block: (self.current_margin.solve() +
-                            self.current_block_direction_position),
-                        inline: Au::zero(),
-                    },
-                    size: LogicalVec2::zero(),
-                }
-                .as_physical(Some(self.containing_block));
-            },
-            Fragment::Float(box_fragment) => {
-                let sequential_layout_state = sequential_layout_state
-                    .expect("Found float fragment without SequentialLayoutState");
-                let block_offset_from_containing_block_top =
-                    self.current_block_direction_position + self.current_margin.solve();
-                let box_fragment = &mut *box_fragment.borrow_mut();
-                sequential_layout_state.place_float_fragment(
-                    box_fragment,
-                    self.containing_block,
-                    self.start_margin,
-                    block_offset_from_containing_block_top,
-                );
-            },
-            Fragment::Positioning(_) => {},
-            _ => unreachable!(),
-        }
-    }
-
-    fn finish(mut self) -> (Au, CollapsedBlockMargins, Baselines) {
-        if !self.last_in_flow_margin_collapses_with_parent_end_margin {
-            self.current_block_direction_position += self.current_margin.solve();
-            self.current_margin = CollapsedMargin::zero();
-        }
-        let (total_block_size, collapsed_through) = match self.marker_block_size {
-            Some(marker_block_size) => (
-                self.current_block_direction_position.max(marker_block_size),
-                // If this is a list item (even empty) with an outside marker, then it
-                // should not collapse through.
-                false,
-            ),
-            None => (
-                self.current_block_direction_position,
-                self.next_in_flow_margin_collapses_with_parent_start_margin,
-            ),
-        };
-
-        (
-            total_block_size,
-            CollapsedBlockMargins {
-                collapsed_through,
-                start: self.start_margin,
-                end: self.current_margin,
-            },
-            self.inflow_baselines,
-        )
-    }
-}
-
-fn block_size_is_zero_or_intrinsic(size: &StyleSize, containing_block: &ContainingBlock) -> bool {
-    match size {
-        StyleSize::Auto |
-        StyleSize::MinContent |
-        StyleSize::MaxContent |
-        StyleSize::FitContent |
-        StyleSize::FitContentFunction(_) => true,
-        StyleSize::Stretch => {
-            // TODO: Should this return true when the containing block has a definite size of 0px?
-            !containing_block.size.block.is_definite()
-        },
-        StyleSize::LengthPercentage(lp) => {
-            // TODO: Should this resolve definite percentages? Blink does it, Gecko and WebKit don't.
-            lp.is_definitely_zero() ||
-                (lp.0.has_percentage() && !containing_block.size.block.is_definite())
-        },
-        StyleSize::AnchorSizeFunction(_) => unreachable!("anchor-size() should be disabled"),
-    }
-}
-
-pub(crate) struct IndependentFloatOrAtomicLayoutResult {
-    pub fragment: BoxFragment,
-    pub baselines: Option<Baselines>,
-    pub pbm_sums: LogicalSides<Au>,
-}
-
-impl IndependentFormattingContext {
-    pub(crate) fn layout_in_flow_block_level(
-        &self,
-        layout_context: &LayoutContext,
-        positioning_context: &mut PositioningContext,
-        containing_block: &ContainingBlock,
-        sequential_layout_state: Option<&mut SequentialLayoutState>,
-        ignore_block_margins_for_stretch: LogicalSides1D<bool>,
-    ) -> BoxFragment {
-        match &self.contents {
-            IndependentFormattingContextContents::NonReplaced(contents) => contents
-                .layout_in_flow_block_level(
-                    &self.base,
-                    layout_context,
-                    positioning_context,
-                    containing_block,
-                    sequential_layout_state,
-                    ignore_block_margins_for_stretch,
-                ),
-            IndependentFormattingContextContents::Replaced(contents) => contents
-                .layout_in_flow_block_level(
-                    &self.base,
-                    layout_context,
-                    containing_block,
-                    sequential_layout_state,
-                    ignore_block_margins_for_stretch,
-                ),
-        }
-    }
-    pub(crate) fn layout_float_or_atomic_inline(
-        &self,
-        layout_context: &LayoutContext,
-        child_positioning_context: &mut PositioningContext,
-        containing_block: &ContainingBlock,
-    ) -> IndependentFloatOrAtomicLayoutResult {
-        let style = self.style();
-        let container_writing_mode = containing_block.style.writing_mode;
-        let layout_style = self.layout_style();
-        let content_box_sizes_and_pbm =
-            layout_style.content_box_sizes_and_padding_border_margin(&containing_block.into());
-        let pbm = &content_box_sizes_and_pbm.pbm;
-        let margin = pbm.margin.auto_is(Au::zero);
-        let pbm_sums = pbm.padding + pbm.border + margin;
-
-        let (fragments, content_rect, baselines) = match &self.contents {
-            IndependentFormattingContextContents::Replaced(replaced) => {
-                // Floats and atomic inlines can't collapse margins with their parent,
-                // so don't ignore block margins when resolving a stretch block size.
-                // https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing
-                let ignore_block_margins_for_stretch = LogicalSides1D::new(false, false);
-
-                // https://drafts.csswg.org/css2/visudet.html#float-replaced-width
-                // https://drafts.csswg.org/css2/visudet.html#inline-replaced-height
-                let content_size = replaced
-                    .used_size_as_if_inline_element(
-                        containing_block,
-                        style,
-                        &content_box_sizes_and_pbm,
-                        ignore_block_margins_for_stretch,
-                    )
-                    .to_physical_size(container_writing_mode);
-                let fragments = replaced.make_fragments(layout_context, style, content_size);
-
-                let content_rect = PhysicalRect::new(PhysicalPoint::zero(), content_size);
-                (fragments, content_rect, None)
-            },
-            IndependentFormattingContextContents::NonReplaced(non_replaced) => {
-                let writing_mode = self.style().writing_mode;
-                let available_inline_size =
-                    Au::zero().max(containing_block.size.inline - pbm_sums.inline_sum());
-                let available_block_size = containing_block
-                    .size
-                    .block
-                    .to_definite()
-                    .map(|block_size| Au::zero().max(block_size - pbm_sums.block_sum()));
-                let tentative_block_size = content_box_sizes_and_pbm
-                    .content_box_sizes
-                    .block
-                    .resolve_extrinsic(Size::FitContent, Au::zero(), available_block_size);
-
-                let get_content_size = || {
-                    let constraint_space = ConstraintSpace::new(
-                        tentative_block_size,
-                        writing_mode,
-                        non_replaced.preferred_aspect_ratio(),
-                    );
-                    self.inline_content_sizes(layout_context, &constraint_space)
-                        .sizes
-                };
-
-                let is_table = layout_style.is_table();
-                let inline_size = content_box_sizes_and_pbm.content_box_sizes.inline.resolve(
-                    Direction::Inline,
-                    Size::FitContent,
-                    Au::zero,
-                    Some(available_inline_size),
-                    get_content_size,
-                    is_table,
-                );
-
-                let containing_block_for_children = ContainingBlock {
-                    size: ContainingBlockSize {
-                        inline: inline_size,
-                        block: tentative_block_size,
-                    },
-                    style: self.style(),
-                };
-                assert_eq!(
-                    container_writing_mode.is_horizontal(),
-                    writing_mode.is_horizontal(),
-                    "Mixed horizontal and vertical writing modes are not supported yet"
-                );
-
-                let independent_layout = non_replaced.layout(
-                    layout_context,
-                    child_positioning_context,
-                    &containing_block_for_children,
-                    containing_block,
-                    false, /* depends_on_block_constraints */
-                );
-                let inline_size = independent_layout
-                    .content_inline_size_for_table
-                    .unwrap_or(inline_size);
-                let block_size = content_box_sizes_and_pbm.content_box_sizes.block.resolve(
-                    Direction::Block,
-                    Size::FitContent,
-                    Au::zero,
-                    available_block_size,
-                    || independent_layout.content_block_size.into(),
-                    is_table,
-                );
-
-                let content_size = LogicalVec2 {
-                    block: block_size,
-                    inline: inline_size,
-                }
-                .to_physical_size(container_writing_mode);
-                let content_rect = PhysicalRect::new(PhysicalPoint::zero(), content_size);
-
-                (
-                    independent_layout.fragments,
-                    content_rect,
-                    Some(independent_layout.baselines),
-                )
-            },
-        };
-
-        let mut base_fragment_info = self.base_fragment_info();
-        if content_box_sizes_and_pbm.depends_on_block_constraints {
-            base_fragment_info.flags.insert(
-                FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM,
-            );
-        }
-
-        let fragment = BoxFragment::new(
-            base_fragment_info,
-            self.style().clone(),
-            fragments,
-            content_rect,
-            pbm.padding.to_physical(container_writing_mode),
-            pbm.border.to_physical(container_writing_mode),
-            margin.to_physical(container_writing_mode),
-            // Floats can have clearance, but it's handled internally by the float placement logic,
-            // so there's no need to store it explicitly in the fragment.
-            // And atomic inlines don't have clearance.
-            None, /* clearance */
-            CollapsedBlockMargins::zero(),
-        );
-
-        IndependentFloatOrAtomicLayoutResult {
-            fragment,
-            baselines,
-            pbm_sums,
-        }
-    }
-}
diff --git a/components/layout_2020/flow/root.rs b/components/layout_2020/flow/root.rs
deleted file mode 100644
index 4fb33bf71d4..00000000000
--- a/components/layout_2020/flow/root.rs
+++ /dev/null
@@ -1,474 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use app_units::Au;
-use atomic_refcell::AtomicRef;
-use script_layout_interface::wrapper_traits::{
-    LayoutNode, ThreadSafeLayoutElement, ThreadSafeLayoutNode,
-};
-use script_layout_interface::{LayoutElementType, LayoutNodeType};
-use servo_arc::Arc;
-use style::dom::OpaqueNode;
-use style::properties::ComputedValues;
-use style::values::computed::Overflow;
-use style_traits::CSSPixel;
-use webrender_traits::display_list::AxesScrollSensitivity;
-
-use crate::cell::ArcRefCell;
-use crate::context::LayoutContext;
-use crate::dom::{LayoutBox, NodeExt};
-use crate::dom_traversal::{Contents, NodeAndStyleInfo, NonReplacedContents, iter_child_nodes};
-use crate::flexbox::FlexLevelBox;
-use crate::flow::float::FloatBox;
-use crate::flow::inline::InlineItem;
-use crate::flow::{BlockContainer, BlockFormattingContext, BlockLevelBox};
-use crate::formatting_contexts::IndependentFormattingContext;
-use crate::fragment_tree::FragmentTree;
-use crate::geom::{LogicalVec2, PhysicalPoint, PhysicalRect, PhysicalSize};
-use crate::positioned::{AbsolutelyPositionedBox, PositioningContext};
-use crate::replaced::ReplacedContents;
-use crate::style_ext::{ComputedValuesExt, Display, DisplayGeneratingBox, DisplayInside};
-use crate::taffy::{TaffyItemBox, TaffyItemBoxInner};
-use crate::{DefiniteContainingBlock, PropagatedBoxTreeData};
-
-pub struct BoxTree {
-    /// Contains typically exactly one block-level box, which was generated by the root element.
-    /// There may be zero if that element has `display: none`.
-    root: BlockFormattingContext,
-
-    /// <https://drafts.csswg.org/css-backgrounds/#special-backgrounds>
-    canvas_background: CanvasBackground,
-
-    /// Whether or not the viewport should be sensitive to scrolling input events in two axes
-    viewport_scroll_sensitivity: AxesScrollSensitivity,
-}
-
-impl BoxTree {
-    pub fn construct<'dom, Node>(context: &LayoutContext, root_element: Node) -> Self
-    where
-        Node: 'dom + Copy + LayoutNode<'dom> + Send + Sync,
-    {
-        let boxes = construct_for_root_element(context, root_element);
-
-        // Zero box for `:root { display: none }`, one for the root element otherwise.
-        assert!(boxes.len() <= 1);
-
-        // From https://www.w3.org/TR/css-overflow-3/#overflow-propagation:
-        // > UAs must apply the overflow-* values set on the root element to the viewport when the
-        // > root element’s display value is not none. However, when the root element is an [HTML]
-        // > html element (including XML syntax for HTML) whose overflow value is visible (in both
-        // > axes), and that element has as a child a body element whose display value is also not
-        // > none, user agents must instead apply the overflow-* values of the first such child
-        // > element to the viewport. The element from which the value is propagated must then have a
-        // > used overflow value of visible.
-        let root_style = root_element.style(context);
-
-        let mut viewport_overflow_x = root_style.clone_overflow_x();
-        let mut viewport_overflow_y = root_style.clone_overflow_y();
-        if viewport_overflow_x == Overflow::Visible &&
-            viewport_overflow_y == Overflow::Visible &&
-            !root_style.get_box().display.is_none()
-        {
-            for child in iter_child_nodes(root_element) {
-                if !child
-                    .to_threadsafe()
-                    .as_element()
-                    .is_some_and(|element| element.is_body_element_of_html_element_root())
-                {
-                    continue;
-                }
-
-                let style = child.style(context);
-                if !style.get_box().display.is_none() {
-                    viewport_overflow_x = style.clone_overflow_x();
-                    viewport_overflow_y = style.clone_overflow_y();
-
-                    break;
-                }
-            }
-        }
-
-        let contents = BlockContainer::BlockLevelBoxes(boxes);
-        let contains_floats = contents.contains_floats();
-        Self {
-            root: BlockFormattingContext {
-                contents,
-                contains_floats,
-            },
-            canvas_background: CanvasBackground::for_root_element(context, root_element),
-            // From https://www.w3.org/TR/css-overflow-3/#overflow-propagation:
-            // > If visible is applied to the viewport, it must be interpreted as auto.
-            // > If clip is applied to the viewport, it must be interpreted as hidden.
-            viewport_scroll_sensitivity: AxesScrollSensitivity {
-                x: viewport_overflow_x.to_scrollable().into(),
-                y: viewport_overflow_y.to_scrollable().into(),
-            },
-        }
-    }
-
-    /// This method attempts to incrementally update the box tree from an
-    /// arbitrary node that is not necessarily the document's root element.
-    ///
-    /// If the node is not a valid candidate for incremental update, the method
-    /// loops over its parent. The only valid candidates for now are absolutely
-    /// positioned boxes which don't change their outside display mode (i.e. it
-    /// will not attempt to update from an absolutely positioned inline element
-    /// which became an absolutely positioned block element). The value `true`
-    /// is returned if an incremental update could be done, and `false`
-    /// otherwise.
-    ///
-    /// There are various pain points that need to be taken care of to extend
-    /// the set of valid candidates:
-    /// * it is not obvious how to incrementally check whether a block
-    ///   formatting context still contains floats or not;
-    /// * the propagation of text decorations towards node descendants is
-    ///   hard to do incrementally with our current representation of boxes
-    /// * how intrinsic content sizes are computed eagerly makes it hard
-    ///   to update those sizes for ancestors of the node from which we
-    ///   made an incremental update.
-    pub fn update<'dom, Node>(context: &LayoutContext, mut dirty_node: Node) -> bool
-    where
-        Node: 'dom + Copy + LayoutNode<'dom> + Send + Sync,
-    {
-        #[allow(clippy::enum_variant_names)]
-        enum UpdatePoint {
-            AbsolutelyPositionedBlockLevelBox(ArcRefCell<BlockLevelBox>),
-            AbsolutelyPositionedInlineLevelBox(ArcRefCell<InlineItem>, usize),
-            AbsolutelyPositionedFlexLevelBox(ArcRefCell<FlexLevelBox>),
-            AbsolutelyPositionedTaffyLevelBox(ArcRefCell<TaffyItemBox>),
-        }
-
-        fn update_point<'dom, Node>(
-            node: Node,
-        ) -> Option<(Arc<ComputedValues>, DisplayInside, UpdatePoint)>
-        where
-            Node: NodeExt<'dom>,
-        {
-            if !node.is_element() {
-                return None;
-            }
-
-            if node.type_id() == LayoutNodeType::Element(LayoutElementType::HTMLBodyElement) {
-                // This can require changes to the canvas background.
-                return None;
-            }
-
-            // Don't update unstyled nodes or nodes that have pseudo-elements.
-            let element_data = node.style_data()?.element_data.borrow();
-            if !element_data.styles.pseudos.is_empty() {
-                return None;
-            }
-
-            let layout_data = node.layout_data()?;
-            if layout_data.pseudo_before_box.borrow().is_some() {
-                return None;
-            }
-            if layout_data.pseudo_after_box.borrow().is_some() {
-                return None;
-            }
-
-            let primary_style = element_data.styles.primary();
-            let box_style = primary_style.get_box();
-
-            if !box_style.position.is_absolutely_positioned() {
-                return None;
-            }
-
-            let display_inside = match Display::from(box_style.display) {
-                Display::GeneratingBox(DisplayGeneratingBox::OutsideInside { inside, .. }) => {
-                    inside
-                },
-                _ => return None,
-            };
-
-            let update_point =
-                match &*AtomicRef::filter_map(layout_data.self_box.borrow(), Option::as_ref)? {
-                    LayoutBox::DisplayContents => return None,
-                    LayoutBox::BlockLevel(block_level_box) => match &*block_level_box.borrow() {
-                        BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(_)
-                            if box_style.position.is_absolutely_positioned() =>
-                        {
-                            UpdatePoint::AbsolutelyPositionedBlockLevelBox(block_level_box.clone())
-                        },
-                        _ => return None,
-                    },
-                    LayoutBox::InlineLevel(inline_level_box) => match &*inline_level_box.borrow() {
-                        InlineItem::OutOfFlowAbsolutelyPositionedBox(_, text_offset_index)
-                            if box_style.position.is_absolutely_positioned() =>
-                        {
-                            UpdatePoint::AbsolutelyPositionedInlineLevelBox(
-                                inline_level_box.clone(),
-                                *text_offset_index,
-                            )
-                        },
-                        _ => return None,
-                    },
-                    LayoutBox::FlexLevel(flex_level_box) => match &*flex_level_box.borrow() {
-                        FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(_)
-                            if box_style.position.is_absolutely_positioned() =>
-                        {
-                            UpdatePoint::AbsolutelyPositionedFlexLevelBox(flex_level_box.clone())
-                        },
-                        _ => return None,
-                    },
-                    LayoutBox::TaffyItemBox(taffy_level_box) => match &taffy_level_box
-                        .borrow()
-                        .taffy_level_box
-                    {
-                        TaffyItemBoxInner::OutOfFlowAbsolutelyPositionedBox(_)
-                            if box_style.position.is_absolutely_positioned() =>
-                        {
-                            UpdatePoint::AbsolutelyPositionedTaffyLevelBox(taffy_level_box.clone())
-                        },
-                        _ => return None,
-                    },
-                };
-            Some((primary_style.clone(), display_inside, update_point))
-        }
-
-        loop {
-            if let Some((primary_style, display_inside, update_point)) = update_point(dirty_node) {
-                let contents = ReplacedContents::for_element(dirty_node, context)
-                    .map_or_else(|| NonReplacedContents::OfElement.into(), Contents::Replaced);
-                let info = NodeAndStyleInfo::new(dirty_node, Arc::clone(&primary_style));
-                let out_of_flow_absolutely_positioned_box = ArcRefCell::new(
-                    AbsolutelyPositionedBox::construct(context, &info, display_inside, contents),
-                );
-                match update_point {
-                    UpdatePoint::AbsolutelyPositionedBlockLevelBox(block_level_box) => {
-                        *block_level_box.borrow_mut() =
-                            BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(
-                                out_of_flow_absolutely_positioned_box,
-                            );
-                    },
-                    UpdatePoint::AbsolutelyPositionedInlineLevelBox(
-                        inline_level_box,
-                        text_offset_index,
-                    ) => {
-                        *inline_level_box.borrow_mut() =
-                            InlineItem::OutOfFlowAbsolutelyPositionedBox(
-                                out_of_flow_absolutely_positioned_box,
-                                text_offset_index,
-                            );
-                    },
-                    UpdatePoint::AbsolutelyPositionedFlexLevelBox(flex_level_box) => {
-                        *flex_level_box.borrow_mut() =
-                            FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(
-                                out_of_flow_absolutely_positioned_box,
-                            );
-                    },
-                    UpdatePoint::AbsolutelyPositionedTaffyLevelBox(taffy_level_box) => {
-                        taffy_level_box.borrow_mut().taffy_level_box =
-                            TaffyItemBoxInner::OutOfFlowAbsolutelyPositionedBox(
-                                out_of_flow_absolutely_positioned_box,
-                            );
-                    },
-                }
-                return true;
-            }
-            dirty_node = match dirty_node.parent_node() {
-                Some(parent) => parent,
-                None => return false,
-            };
-        }
-    }
-}
-
-fn construct_for_root_element<'dom>(
-    context: &LayoutContext,
-    root_element: impl NodeExt<'dom>,
-) -> Vec<ArcRefCell<BlockLevelBox>> {
-    let info = NodeAndStyleInfo::new(root_element, root_element.style(context));
-    let box_style = info.style.get_box();
-
-    let display_inside = match Display::from(box_style.display) {
-        Display::None => {
-            root_element.unset_all_boxes();
-            return Vec::new();
-        },
-        Display::Contents => {
-            // Unreachable because the style crate adjusts the computed values:
-            // https://drafts.csswg.org/css-display-3/#transformations
-            // “'display' of 'contents' computes to 'block' on the root element”
-            unreachable!()
-        },
-        // The root element is blockified, ignore DisplayOutside
-        Display::GeneratingBox(display_generating_box) => display_generating_box.display_inside(),
-    };
-
-    let contents = ReplacedContents::for_element(root_element, context)
-        .map_or_else(|| NonReplacedContents::OfElement.into(), Contents::Replaced);
-
-    let propagated_data = PropagatedBoxTreeData::default().union(&info.style);
-    let root_box = if box_style.position.is_absolutely_positioned() {
-        BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(ArcRefCell::new(
-            AbsolutelyPositionedBox::construct(context, &info, display_inside, contents),
-        ))
-    } else if box_style.float.is_floating() {
-        BlockLevelBox::OutOfFlowFloatBox(FloatBox::construct(
-            context,
-            &info,
-            display_inside,
-            contents,
-            propagated_data,
-        ))
-    } else {
-        BlockLevelBox::Independent(IndependentFormattingContext::construct(
-            context,
-            &info,
-            display_inside,
-            contents,
-            propagated_data,
-        ))
-    };
-
-    let root_box = ArcRefCell::new(root_box);
-    root_element
-        .element_box_slot()
-        .set(LayoutBox::BlockLevel(root_box.clone()));
-    vec![root_box]
-}
-
-impl BoxTree {
-    pub fn layout(
-        &self,
-        layout_context: &LayoutContext,
-        viewport: euclid::Size2D<f32, CSSPixel>,
-    ) -> FragmentTree {
-        let style = layout_context
-            .style_context
-            .stylist
-            .device()
-            .default_computed_values();
-
-        // FIXME: use the document’s mode:
-        // https://drafts.csswg.org/css-writing-modes/#principal-flow
-        let physical_containing_block = PhysicalRect::new(
-            PhysicalPoint::zero(),
-            PhysicalSize::new(
-                Au::from_f32_px(viewport.width),
-                Au::from_f32_px(viewport.height),
-            ),
-        );
-        let initial_containing_block = DefiniteContainingBlock {
-            size: LogicalVec2 {
-                inline: physical_containing_block.size.width,
-                block: physical_containing_block.size.height,
-            },
-            style,
-        };
-
-        let mut positioning_context =
-            PositioningContext::new_for_containing_block_for_all_descendants();
-        let independent_layout = self.root.layout(
-            layout_context,
-            &mut positioning_context,
-            &(&initial_containing_block).into(),
-            false, /* depends_on_block_constraints */
-        );
-
-        let mut root_fragments = independent_layout.fragments.into_iter().collect::<Vec<_>>();
-
-        // Zero box for `:root { display: none }`, one for the root element otherwise.
-        assert!(root_fragments.len() <= 1);
-
-        // There may be more fragments at the top-level
-        // (for positioned boxes whose containing is the initial containing block)
-        // but only if there was one fragment for the root element.
-        positioning_context.layout_initial_containing_block_children(
-            layout_context,
-            &initial_containing_block,
-            &mut root_fragments,
-        );
-
-        let scrollable_overflow = root_fragments
-            .iter()
-            .fold(PhysicalRect::zero(), |acc, child| {
-                let child_overflow = child.scrollable_overflow();
-
-                // https://drafts.csswg.org/css-overflow/#scrolling-direction
-                // We want to clip scrollable overflow on box-start and inline-start
-                // sides of the scroll container.
-                //
-                // FIXME(mrobinson, bug 25564): This should take into account writing
-                // mode.
-                let child_overflow = PhysicalRect::new(
-                    euclid::Point2D::zero(),
-                    euclid::Size2D::new(
-                        child_overflow.size.width + child_overflow.origin.x,
-                        child_overflow.size.height + child_overflow.origin.y,
-                    ),
-                );
-                acc.union(&child_overflow)
-            });
-
-        FragmentTree {
-            root_fragments,
-            scrollable_overflow,
-            initial_containing_block: physical_containing_block,
-            canvas_background: self.canvas_background.clone(),
-            viewport_scroll_sensitivity: self.viewport_scroll_sensitivity,
-        }
-    }
-}
-
-/// <https://drafts.csswg.org/css-backgrounds/#root-background>
-#[derive(Clone)]
-pub struct CanvasBackground {
-    /// DOM node for the root element
-    pub root_element: OpaqueNode,
-
-    /// The element whose style the canvas takes background properties from (see next field).
-    /// This can be the root element (same as the previous field), or the HTML `<body>` element.
-    /// See <https://drafts.csswg.org/css-backgrounds/#body-background>
-    pub from_element: OpaqueNode,
-
-    /// The computed styles to take background properties from.
-    pub style: Option<Arc<ComputedValues>>,
-}
-
-impl CanvasBackground {
-    fn for_root_element<'dom>(context: &LayoutContext, root_element: impl NodeExt<'dom>) -> Self {
-        let root_style = root_element.style(context);
-
-        let mut style = root_style;
-        let mut from_element = root_element;
-
-        // https://drafts.csswg.org/css-backgrounds/#body-background
-        // “if the computed value of background-image on the root element is none
-        //  and its background-color is transparent”
-        if style.background_is_transparent() &&
-            // “For documents whose root element is an HTML `HTML` element
-            //  or an XHTML `html` element”
-            root_element.type_id() == LayoutNodeType::Element(LayoutElementType::HTMLHtmlElement) &&
-            // Don’t try to access styles for an unstyled subtree
-            !matches!(style.clone_display().into(), Display::None)
-        {
-            // “that element’s first HTML `BODY` or XHTML `body` child element”
-            if let Some(body) = iter_child_nodes(root_element).find(|child| {
-                child.is_element() &&
-                    child.type_id() ==
-                        LayoutNodeType::Element(LayoutElementType::HTMLBodyElement)
-            }) {
-                style = body.style(context);
-                from_element = body;
-            }
-        }
-
-        Self {
-            root_element: root_element.opaque(),
-            from_element: from_element.opaque(),
-
-            // “However, if no boxes are generated for the element
-            //  whose background would be used for the canvas
-            //  (for example, if the root element has display: none),
-            //  then the canvas background is transparent.”
-            style: if let Display::GeneratingBox(_) = style.clone_display().into() {
-                Some(style)
-            } else {
-                None
-            },
-        }
-    }
-}
diff --git a/components/layout_2020/fragment_tree/box_fragment.rs b/components/layout_2020/fragment_tree/box_fragment.rs
deleted file mode 100644
index f8f0e233a2f..00000000000
--- a/components/layout_2020/fragment_tree/box_fragment.rs
+++ /dev/null
@@ -1,370 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use app_units::Au;
-use atomic_refcell::AtomicRefCell;
-use base::print_tree::PrintTree;
-use servo_arc::Arc as ServoArc;
-use style::Zero;
-use style::computed_values::border_collapse::T as BorderCollapse;
-use style::computed_values::overflow_x::T as ComputedOverflow;
-use style::computed_values::position::T as ComputedPosition;
-use style::logical_geometry::WritingMode;
-use style::properties::ComputedValues;
-
-use super::{BaseFragment, BaseFragmentInfo, CollapsedBlockMargins, Fragment};
-use crate::formatting_contexts::Baselines;
-use crate::geom::{
-    AuOrAuto, LengthPercentageOrAuto, PhysicalPoint, PhysicalRect, PhysicalSides, ToLogical,
-};
-use crate::style_ext::ComputedValuesExt;
-use crate::table::SpecificTableGridInfo;
-use crate::taffy::SpecificTaffyGridInfo;
-
-/// Describes how a [`BoxFragment`] paints its background.
-pub(crate) enum BackgroundMode {
-    /// Draw the normal [`BoxFragment`] background as well as the extra backgrounds
-    /// based on the style and positioning rectangles in this data structure.
-    Extra(Vec<ExtraBackground>),
-    /// Do not draw a background for this Fragment. This is used for elements like
-    /// table tracks and table track groups, which rely on cells to paint their
-    /// backgrounds.
-    None,
-    /// Draw the background normally, getting information from the Fragment style.
-    Normal,
-}
-
-pub(crate) struct ExtraBackground {
-    pub style: ServoArc<ComputedValues>,
-    pub rect: PhysicalRect<Au>,
-}
-
-#[derive(Clone, Debug)]
-pub(crate) enum SpecificLayoutInfo {
-    Grid(Box<SpecificTaffyGridInfo>),
-    TableCellWithCollapsedBorders,
-    TableGridWithCollapsedBorders(Box<SpecificTableGridInfo>),
-    TableWrapper,
-}
-
-pub(crate) struct BoxFragment {
-    pub base: BaseFragment,
-
-    pub style: ServoArc<ComputedValues>,
-    pub children: Vec<Fragment>,
-
-    /// The content rect of this fragment in the parent fragment's content rectangle. This
-    /// does not include padding, border, or margin -- it only includes content.
-    pub content_rect: PhysicalRect<Au>,
-
-    pub padding: PhysicalSides<Au>,
-    pub border: PhysicalSides<Au>,
-    pub margin: PhysicalSides<Au>,
-
-    /// When the `clear` property is not set to `none`, it may introduce clearance.
-    /// Clearance is some extra spacing that is added above the top margin,
-    /// so that the element doesn't overlap earlier floats in the same BFC.
-    /// The presence of clearance prevents the top margin from collapsing with
-    /// earlier margins or with the bottom margin of the parent block.
-    /// <https://drafts.csswg.org/css2/#clearance>
-    pub clearance: Option<Au>,
-
-    /// When this [`BoxFragment`] is for content that has a baseline, this tracks
-    /// the first and last baselines of that content. This is used to propagate baselines
-    /// to things such as tables and inline formatting contexts.
-    baselines: Baselines,
-
-    pub block_margins_collapsed_with_children: CollapsedBlockMargins,
-
-    /// The scrollable overflow of this box fragment.
-    pub scrollable_overflow_from_children: PhysicalRect<Au>,
-
-    /// The resolved box insets if this box is `position: sticky`. These are calculated
-    /// during stacking context tree construction because they rely on the size of the
-    /// scroll container.
-    pub(crate) resolved_sticky_insets: AtomicRefCell<Option<PhysicalSides<AuOrAuto>>>,
-
-    pub background_mode: BackgroundMode,
-
-    /// Additional information of from layout that could be used by Javascripts and devtools.
-    pub specific_layout_info: Option<SpecificLayoutInfo>,
-}
-
-impl BoxFragment {
-    #[allow(clippy::too_many_arguments)]
-    pub fn new(
-        base_fragment_info: BaseFragmentInfo,
-        style: ServoArc<ComputedValues>,
-        children: Vec<Fragment>,
-        content_rect: PhysicalRect<Au>,
-        padding: PhysicalSides<Au>,
-        border: PhysicalSides<Au>,
-        margin: PhysicalSides<Au>,
-        clearance: Option<Au>,
-        block_margins_collapsed_with_children: CollapsedBlockMargins,
-    ) -> BoxFragment {
-        let scrollable_overflow_from_children =
-            children.iter().fold(PhysicalRect::zero(), |acc, child| {
-                acc.union(&child.scrollable_overflow())
-            });
-
-        BoxFragment {
-            base: base_fragment_info.into(),
-            style,
-            children,
-            content_rect,
-            padding,
-            border,
-            margin,
-            clearance,
-            baselines: Baselines::default(),
-            block_margins_collapsed_with_children,
-            scrollable_overflow_from_children,
-            resolved_sticky_insets: AtomicRefCell::default(),
-            background_mode: BackgroundMode::Normal,
-            specific_layout_info: None,
-        }
-    }
-
-    pub fn with_baselines(mut self, baselines: Baselines) -> Self {
-        self.baselines = baselines;
-        self
-    }
-
-    /// Get the baselines for this [`BoxFragment`] if they are compatible with the given [`WritingMode`].
-    /// If they are not compatible, [`Baselines::default()`] is returned.
-    pub fn baselines(&self, writing_mode: WritingMode) -> Baselines {
-        let mut baselines =
-            if writing_mode.is_horizontal() == self.style.writing_mode.is_horizontal() {
-                self.baselines
-            } else {
-                // If the writing mode of the container requesting baselines is not
-                // compatible, ensure that the baselines established by this fragment are
-                // not used.
-                Baselines::default()
-            };
-
-        // From the https://drafts.csswg.org/css-align-3/#baseline-export section on "block containers":
-        // > However, for legacy reasons if its baseline-source is auto (the initial
-        // > value) a block-level or inline-level block container that is a scroll container
-        // > always has a last baseline set, whose baselines all correspond to its block-end
-        // > margin edge.
-        //
-        // This applies even if there is no baseline set, so we unconditionally set the value here
-        // and ignore anything that is set via [`Self::with_baselines`].
-        if self.style.establishes_scroll_container(self.base.flags) {
-            let content_rect_size = self.content_rect.size.to_logical(writing_mode);
-            let padding = self.padding.to_logical(writing_mode);
-            let border = self.border.to_logical(writing_mode);
-            let margin = self.margin.to_logical(writing_mode);
-            baselines.last = Some(
-                content_rect_size.block + padding.block_end + border.block_end + margin.block_end,
-            )
-        }
-        baselines
-    }
-
-    pub fn add_extra_background(&mut self, extra_background: ExtraBackground) {
-        match self.background_mode {
-            BackgroundMode::Extra(ref mut backgrounds) => backgrounds.push(extra_background),
-            _ => self.background_mode = BackgroundMode::Extra(vec![extra_background]),
-        }
-    }
-
-    pub fn set_does_not_paint_background(&mut self) {
-        self.background_mode = BackgroundMode::None;
-    }
-
-    pub fn with_specific_layout_info(mut self, info: Option<SpecificLayoutInfo>) -> Self {
-        self.specific_layout_info = info;
-        self
-    }
-
-    pub fn scrollable_overflow(&self) -> PhysicalRect<Au> {
-        let physical_padding_rect = self.padding_rect();
-        let content_origin = self.content_rect.origin.to_vector();
-        physical_padding_rect.union(
-            &self
-                .scrollable_overflow_from_children
-                .translate(content_origin),
-        )
-    }
-
-    pub(crate) fn padding_rect(&self) -> PhysicalRect<Au> {
-        self.content_rect.outer_rect(self.padding)
-    }
-
-    pub(crate) fn border_rect(&self) -> PhysicalRect<Au> {
-        self.padding_rect().outer_rect(self.border)
-    }
-
-    pub(crate) fn margin_rect(&self) -> PhysicalRect<Au> {
-        self.border_rect().outer_rect(self.margin)
-    }
-
-    pub(crate) fn padding_border_margin(&self) -> PhysicalSides<Au> {
-        self.margin + self.border + self.padding
-    }
-
-    pub fn print(&self, tree: &mut PrintTree) {
-        tree.new_level(format!(
-            "Box\
-                \nbase={:?}\
-                \ncontent={:?}\
-                \npadding rect={:?}\
-                \nborder rect={:?}\
-                \nmargin={:?}\
-                \nclearance={:?}\
-                \nscrollable_overflow={:?}\
-                \nbaselines={:?}\
-                \noverflow={:?}",
-            self.base,
-            self.content_rect,
-            self.padding_rect(),
-            self.border_rect(),
-            self.margin,
-            self.clearance,
-            self.scrollable_overflow(),
-            self.baselines,
-            self.style.effective_overflow(self.base.flags),
-        ));
-
-        for child in &self.children {
-            child.print(tree);
-        }
-        tree.end_level();
-    }
-
-    pub fn scrollable_overflow_for_parent(&self) -> PhysicalRect<Au> {
-        let mut overflow = self.border_rect();
-        if self.style.establishes_scroll_container(self.base.flags) {
-            return overflow;
-        }
-
-        // https://www.w3.org/TR/css-overflow-3/#scrollable
-        // Only include the scrollable overflow of a child box if it has overflow: visible.
-        let scrollable_overflow = self.scrollable_overflow();
-        let bottom_right = PhysicalPoint::new(
-            overflow.max_x().max(scrollable_overflow.max_x()),
-            overflow.max_y().max(scrollable_overflow.max_y()),
-        );
-
-        let overflow_style = self.style.effective_overflow(self.base.flags);
-        if overflow_style.y == ComputedOverflow::Visible {
-            overflow.origin.y = overflow.origin.y.min(scrollable_overflow.origin.y);
-            overflow.size.height = bottom_right.y - overflow.origin.y;
-        }
-
-        if overflow_style.x == ComputedOverflow::Visible {
-            overflow.origin.x = overflow.origin.x.min(scrollable_overflow.origin.x);
-            overflow.size.width = bottom_right.x - overflow.origin.x;
-        }
-
-        overflow
-    }
-
-    pub(crate) fn calculate_resolved_insets_if_positioned(
-        &self,
-        containing_block: &PhysicalRect<Au>,
-    ) -> PhysicalSides<AuOrAuto> {
-        let position = self.style.get_box().position;
-        debug_assert_ne!(
-            position,
-            ComputedPosition::Static,
-            "Should not call this method on statically positioned box."
-        );
-
-        if let Some(resolved_sticky_insets) = *self.resolved_sticky_insets.borrow() {
-            return resolved_sticky_insets;
-        }
-
-        let convert_to_au_or_auto = |sides: PhysicalSides<Au>| {
-            PhysicalSides::new(
-                AuOrAuto::LengthPercentage(sides.top),
-                AuOrAuto::LengthPercentage(sides.right),
-                AuOrAuto::LengthPercentage(sides.bottom),
-                AuOrAuto::LengthPercentage(sides.left),
-            )
-        };
-
-        // "A resolved value special case property like top defined in another
-        // specification If the property applies to a positioned element and the
-        // resolved value of the display property is not none or contents, and
-        // the property is not over-constrained, then the resolved value is the
-        // used value. Otherwise the resolved value is the computed value."
-        // https://drafts.csswg.org/cssom/#resolved-values
-        let insets = self.style.physical_box_offsets();
-        let (cb_width, cb_height) = (containing_block.width(), containing_block.height());
-        if position == ComputedPosition::Relative {
-            let get_resolved_axis = |start: &LengthPercentageOrAuto,
-                                     end: &LengthPercentageOrAuto,
-                                     container_length: Au| {
-                let start = start.map(|value| value.to_used_value(container_length));
-                let end = end.map(|value| value.to_used_value(container_length));
-                match (start.non_auto(), end.non_auto()) {
-                    (None, None) => (Au::zero(), Au::zero()),
-                    (None, Some(end)) => (-end, end),
-                    (Some(start), None) => (start, -start),
-                    // This is the overconstrained case, for which the resolved insets will
-                    // simply be the computed insets.
-                    (Some(start), Some(end)) => (start, end),
-                }
-            };
-            let (left, right) = get_resolved_axis(&insets.left, &insets.right, cb_width);
-            let (top, bottom) = get_resolved_axis(&insets.top, &insets.bottom, cb_height);
-            return convert_to_au_or_auto(PhysicalSides::new(top, right, bottom, left));
-        }
-
-        debug_assert!(
-            position == ComputedPosition::Fixed || position == ComputedPosition::Absolute
-        );
-
-        let margin_rect = self.margin_rect();
-        let (top, bottom) = match (&insets.top, &insets.bottom) {
-            (
-                LengthPercentageOrAuto::LengthPercentage(top),
-                LengthPercentageOrAuto::LengthPercentage(bottom),
-            ) => (
-                top.to_used_value(cb_height),
-                bottom.to_used_value(cb_height),
-            ),
-            _ => (margin_rect.origin.y, cb_height - margin_rect.max_y()),
-        };
-        let (left, right) = match (&insets.left, &insets.right) {
-            (
-                LengthPercentageOrAuto::LengthPercentage(left),
-                LengthPercentageOrAuto::LengthPercentage(right),
-            ) => (left.to_used_value(cb_width), right.to_used_value(cb_width)),
-            _ => (margin_rect.origin.x, cb_width - margin_rect.max_x()),
-        };
-
-        convert_to_au_or_auto(PhysicalSides::new(top, right, bottom, left))
-    }
-
-    /// Whether this is a non-replaced inline-level box whose inner display type is `flow`.
-    /// <https://drafts.csswg.org/css-display-3/#inline-box>
-    pub(crate) fn is_inline_box(&self) -> bool {
-        self.style.is_inline_box(self.base.flags)
-    }
-
-    /// Whether this is a table wrapper box.
-    /// <https://www.w3.org/TR/css-tables-3/#table-wrapper-box>
-    pub(crate) fn is_table_wrapper(&self) -> bool {
-        matches!(
-            self.specific_layout_info,
-            Some(SpecificLayoutInfo::TableWrapper)
-        )
-    }
-
-    pub(crate) fn has_collapsed_borders(&self) -> bool {
-        match &self.specific_layout_info {
-            Some(SpecificLayoutInfo::TableCellWithCollapsedBorders) => true,
-            Some(SpecificLayoutInfo::TableGridWithCollapsedBorders(_)) => true,
-            Some(SpecificLayoutInfo::TableWrapper) => {
-                self.style.get_inherited_table().border_collapse == BorderCollapse::Collapse
-            },
-            _ => false,
-        }
-    }
-}
diff --git a/components/layout_2020/fragment_tree/fragment.rs b/components/layout_2020/fragment_tree/fragment.rs
deleted file mode 100644
index fbc95ce3d5a..00000000000
--- a/components/layout_2020/fragment_tree/fragment.rs
+++ /dev/null
@@ -1,293 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::sync::Arc;
-
-use app_units::Au;
-use base::id::PipelineId;
-use base::print_tree::PrintTree;
-use fonts::{FontMetrics, GlyphStore};
-use servo_arc::Arc as ServoArc;
-use style::Zero;
-use style::properties::ComputedValues;
-use style::values::specified::text::TextDecorationLine;
-use webrender_api::{FontInstanceKey, ImageKey};
-
-use super::{
-    BaseFragment, BoxFragment, ContainingBlockManager, HoistedSharedFragment, PositioningFragment,
-    Tag,
-};
-use crate::cell::ArcRefCell;
-use crate::geom::{LogicalSides, PhysicalRect};
-use crate::style_ext::ComputedValuesExt;
-
-#[derive(Clone)]
-pub(crate) enum Fragment {
-    Box(ArcRefCell<BoxFragment>),
-    /// Floating content. A floated fragment is very similar to a normal
-    /// [BoxFragment] but it isn't positioned using normal in block flow
-    /// positioning rules (margin collapse, etc). Instead, they are laid
-    /// out by the [crate::flow::float::SequentialLayoutState] of their
-    /// float containing block formatting context.
-    Float(ArcRefCell<BoxFragment>),
-    Positioning(ArcRefCell<PositioningFragment>),
-    /// Absolute and fixed position fragments are hoisted up so that they
-    /// are children of the BoxFragment that establishes their containing
-    /// blocks, so that they can be laid out properly. When this happens
-    /// an `AbsoluteOrFixedPositioned` fragment is left at the original tree
-    /// position. This allows these hoisted fragments to be painted with
-    /// regard to their original tree order during stacking context tree /
-    /// display list construction.
-    AbsoluteOrFixedPositioned(ArcRefCell<HoistedSharedFragment>),
-    Text(ArcRefCell<TextFragment>),
-    Image(ArcRefCell<ImageFragment>),
-    IFrame(ArcRefCell<IFrameFragment>),
-}
-
-#[derive(Clone)]
-pub(crate) struct CollapsedBlockMargins {
-    pub collapsed_through: bool,
-    pub start: CollapsedMargin,
-    pub end: CollapsedMargin,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub(crate) struct CollapsedMargin {
-    max_positive: Au,
-    min_negative: Au,
-}
-
-pub(crate) struct TextFragment {
-    pub base: BaseFragment,
-    pub parent_style: ServoArc<ComputedValues>,
-    pub rect: PhysicalRect<Au>,
-    pub font_metrics: FontMetrics,
-    pub font_key: FontInstanceKey,
-    pub glyphs: Vec<Arc<GlyphStore>>,
-
-    /// A flag that represents the _used_ value of the text-decoration property.
-    pub text_decoration_line: TextDecorationLine,
-
-    /// Extra space to add for each justification opportunity.
-    pub justification_adjustment: Au,
-}
-
-pub(crate) struct ImageFragment {
-    pub base: BaseFragment,
-    pub style: ServoArc<ComputedValues>,
-    pub rect: PhysicalRect<Au>,
-    pub clip: PhysicalRect<Au>,
-    pub image_key: Option<ImageKey>,
-}
-
-pub(crate) struct IFrameFragment {
-    pub base: BaseFragment,
-    pub pipeline_id: PipelineId,
-    pub rect: PhysicalRect<Au>,
-    pub style: ServoArc<ComputedValues>,
-}
-
-impl Fragment {
-    pub fn base(&self) -> Option<BaseFragment> {
-        Some(match self {
-            Fragment::Box(fragment) => fragment.borrow().base.clone(),
-            Fragment::Text(fragment) => fragment.borrow().base.clone(),
-            Fragment::AbsoluteOrFixedPositioned(_) => return None,
-            Fragment::Positioning(fragment) => fragment.borrow().base.clone(),
-            Fragment::Image(fragment) => fragment.borrow().base.clone(),
-            Fragment::IFrame(fragment) => fragment.borrow().base.clone(),
-            Fragment::Float(fragment) => fragment.borrow().base.clone(),
-        })
-    }
-    pub(crate) fn mutate_content_rect(&mut self, callback: impl FnOnce(&mut PhysicalRect<Au>)) {
-        match self {
-            Fragment::Box(box_fragment) | Fragment::Float(box_fragment) => {
-                callback(&mut box_fragment.borrow_mut().content_rect)
-            },
-            Fragment::Positioning(_) | Fragment::AbsoluteOrFixedPositioned(_) => {},
-            Fragment::Text(text_fragment) => callback(&mut text_fragment.borrow_mut().rect),
-            Fragment::Image(image_fragment) => callback(&mut image_fragment.borrow_mut().rect),
-            Fragment::IFrame(iframe_fragment) => callback(&mut iframe_fragment.borrow_mut().rect),
-        }
-    }
-
-    pub fn tag(&self) -> Option<Tag> {
-        self.base().and_then(|base| base.tag)
-    }
-
-    pub fn print(&self, tree: &mut PrintTree) {
-        match self {
-            Fragment::Box(fragment) => fragment.borrow().print(tree),
-            Fragment::Float(fragment) => {
-                tree.new_level("Float".to_string());
-                fragment.borrow().print(tree);
-                tree.end_level();
-            },
-            Fragment::AbsoluteOrFixedPositioned(_) => {
-                tree.add_item("AbsoluteOrFixedPositioned".to_string());
-            },
-            Fragment::Positioning(fragment) => fragment.borrow().print(tree),
-            Fragment::Text(fragment) => fragment.borrow().print(tree),
-            Fragment::Image(fragment) => fragment.borrow().print(tree),
-            Fragment::IFrame(fragment) => fragment.borrow().print(tree),
-        }
-    }
-
-    pub fn scrolling_area(&self, containing_block: &PhysicalRect<Au>) -> PhysicalRect<Au> {
-        match self {
-            Fragment::Box(fragment) | Fragment::Float(fragment) => fragment
-                .borrow()
-                .scrollable_overflow()
-                .translate(containing_block.origin.to_vector()),
-            _ => self.scrollable_overflow(),
-        }
-    }
-
-    pub fn scrollable_overflow(&self) -> PhysicalRect<Au> {
-        match self {
-            Fragment::Box(fragment) | Fragment::Float(fragment) => {
-                fragment.borrow().scrollable_overflow_for_parent()
-            },
-            Fragment::AbsoluteOrFixedPositioned(_) => PhysicalRect::zero(),
-            Fragment::Positioning(fragment) => fragment.borrow().scrollable_overflow,
-            Fragment::Text(fragment) => fragment.borrow().rect,
-            Fragment::Image(fragment) => fragment.borrow().rect,
-            Fragment::IFrame(fragment) => fragment.borrow().rect,
-        }
-    }
-
-    pub(crate) fn find<T>(
-        &self,
-        manager: &ContainingBlockManager<PhysicalRect<Au>>,
-        level: usize,
-        process_func: &mut impl FnMut(&Fragment, usize, &PhysicalRect<Au>) -> Option<T>,
-    ) -> Option<T> {
-        let containing_block = manager.get_containing_block_for_fragment(self);
-        if let Some(result) = process_func(self, level, containing_block) {
-            return Some(result);
-        }
-
-        match self {
-            Fragment::Box(fragment) | Fragment::Float(fragment) => {
-                let fragment = fragment.borrow();
-                let content_rect = fragment
-                    .content_rect
-                    .translate(containing_block.origin.to_vector());
-                let padding_rect = fragment
-                    .padding_rect()
-                    .translate(containing_block.origin.to_vector());
-                let new_manager = if fragment
-                    .style
-                    .establishes_containing_block_for_all_descendants(fragment.base.flags)
-                {
-                    manager.new_for_absolute_and_fixed_descendants(&content_rect, &padding_rect)
-                } else if fragment
-                    .style
-                    .establishes_containing_block_for_absolute_descendants(fragment.base.flags)
-                {
-                    manager.new_for_absolute_descendants(&content_rect, &padding_rect)
-                } else {
-                    manager.new_for_non_absolute_descendants(&content_rect)
-                };
-
-                fragment
-                    .children
-                    .iter()
-                    .find_map(|child| child.find(&new_manager, level + 1, process_func))
-            },
-            Fragment::Positioning(fragment) => {
-                let fragment = fragment.borrow();
-                let content_rect = fragment.rect.translate(containing_block.origin.to_vector());
-                let new_manager = manager.new_for_non_absolute_descendants(&content_rect);
-                fragment
-                    .children
-                    .iter()
-                    .find_map(|child| child.find(&new_manager, level + 1, process_func))
-            },
-            _ => None,
-        }
-    }
-}
-
-impl TextFragment {
-    pub fn print(&self, tree: &mut PrintTree) {
-        tree.add_item(format!(
-            "Text num_glyphs={} box={:?}",
-            self.glyphs
-                .iter()
-                .map(|glyph_store| glyph_store.len().0)
-                .sum::<isize>(),
-            self.rect,
-        ));
-    }
-}
-
-impl ImageFragment {
-    pub fn print(&self, tree: &mut PrintTree) {
-        tree.add_item(format!(
-            "Image\
-                \nrect={:?}",
-            self.rect
-        ));
-    }
-}
-
-impl IFrameFragment {
-    pub fn print(&self, tree: &mut PrintTree) {
-        tree.add_item(format!(
-            "IFrame\
-                \npipeline={:?} rect={:?}",
-            self.pipeline_id, self.rect
-        ));
-    }
-}
-
-impl CollapsedBlockMargins {
-    pub fn from_margin(margin: &LogicalSides<Au>) -> Self {
-        Self {
-            collapsed_through: false,
-            start: CollapsedMargin::new(margin.block_start),
-            end: CollapsedMargin::new(margin.block_end),
-        }
-    }
-
-    pub fn zero() -> Self {
-        Self {
-            collapsed_through: false,
-            start: CollapsedMargin::zero(),
-            end: CollapsedMargin::zero(),
-        }
-    }
-}
-
-impl CollapsedMargin {
-    pub fn zero() -> Self {
-        Self {
-            max_positive: Au::zero(),
-            min_negative: Au::zero(),
-        }
-    }
-
-    pub fn new(margin: Au) -> Self {
-        Self {
-            max_positive: margin.max(Au::zero()),
-            min_negative: margin.min(Au::zero()),
-        }
-    }
-
-    pub fn adjoin(&self, other: &Self) -> Self {
-        Self {
-            max_positive: self.max_positive.max(other.max_positive),
-            min_negative: self.min_negative.min(other.min_negative),
-        }
-    }
-
-    pub fn adjoin_assign(&mut self, other: &Self) {
-        *self = self.adjoin(other);
-    }
-
-    pub fn solve(&self) -> Au {
-        self.max_positive + self.min_negative
-    }
-}
diff --git a/components/layout_2020/fragment_tree/fragment_tree.rs b/components/layout_2020/fragment_tree/fragment_tree.rs
deleted file mode 100644
index cc9c6abba18..00000000000
--- a/components/layout_2020/fragment_tree/fragment_tree.rs
+++ /dev/null
@@ -1,192 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use app_units::Au;
-use base::print_tree::PrintTree;
-use euclid::default::{Point2D, Rect, Size2D};
-use fxhash::FxHashSet;
-use style::animation::AnimationSetKey;
-use style::dom::OpaqueNode;
-use webrender_api::units;
-use webrender_traits::display_list::AxesScrollSensitivity;
-
-use super::{ContainingBlockManager, Fragment, Tag};
-use crate::display_list::StackingContext;
-use crate::flow::CanvasBackground;
-use crate::geom::{PhysicalPoint, PhysicalRect};
-
-pub struct FragmentTree {
-    /// Fragments at the top-level of the tree.
-    ///
-    /// If the root element has `display: none`, there are zero fragments.
-    /// Otherwise, there is at least one:
-    ///
-    /// * The first fragment is generated by the root element.
-    /// * There may be additional fragments generated by positioned boxes
-    ///   that have the initial containing block.
-    pub(crate) root_fragments: Vec<Fragment>,
-
-    /// The scrollable overflow rectangle for the entire tree
-    /// <https://drafts.csswg.org/css-overflow/#scrollable>
-    pub(crate) scrollable_overflow: PhysicalRect<Au>,
-
-    /// The containing block used in the layout of this fragment tree.
-    pub(crate) initial_containing_block: PhysicalRect<Au>,
-
-    /// <https://drafts.csswg.org/css-backgrounds/#special-backgrounds>
-    pub(crate) canvas_background: CanvasBackground,
-
-    /// Whether or not the viewport is sensitive to scroll input events.
-    pub viewport_scroll_sensitivity: AxesScrollSensitivity,
-}
-
-impl FragmentTree {
-    pub(crate) fn build_display_list(
-        &self,
-        builder: &mut crate::display_list::DisplayListBuilder,
-        root_stacking_context: &StackingContext,
-    ) {
-        // Paint the canvas’ background (if any) before/under everything else
-        root_stacking_context.build_canvas_background_display_list(
-            builder,
-            self,
-            &self.initial_containing_block,
-        );
-        root_stacking_context.build_display_list(builder);
-    }
-
-    pub fn print(&self) {
-        let mut print_tree = PrintTree::new("Fragment Tree".to_string());
-        for fragment in &self.root_fragments {
-            fragment.print(&mut print_tree);
-        }
-    }
-
-    pub fn scrollable_overflow(&self) -> units::LayoutSize {
-        units::LayoutSize::from_untyped(Size2D::new(
-            self.scrollable_overflow.size.width.to_f32_px(),
-            self.scrollable_overflow.size.height.to_f32_px(),
-        ))
-    }
-
-    pub(crate) fn find<T>(
-        &self,
-        mut process_func: impl FnMut(&Fragment, usize, &PhysicalRect<Au>) -> Option<T>,
-    ) -> Option<T> {
-        let info = ContainingBlockManager {
-            for_non_absolute_descendants: &self.initial_containing_block,
-            for_absolute_descendants: None,
-            for_absolute_and_fixed_descendants: &self.initial_containing_block,
-        };
-        self.root_fragments
-            .iter()
-            .find_map(|child| child.find(&info, 0, &mut process_func))
-    }
-
-    pub fn remove_nodes_in_fragment_tree_from_set(&self, set: &mut FxHashSet<AnimationSetKey>) {
-        self.find(|fragment, _, _| {
-            let tag = fragment.tag()?;
-            set.remove(&AnimationSetKey::new(tag.node, tag.pseudo));
-            None::<()>
-        });
-    }
-
-    /// Get the vector of rectangles that surrounds the fragments of the node with the given address.
-    /// This function answers the `getClientRects()` query and the union of the rectangles answers
-    /// the `getBoundingClientRect()` query.
-    ///
-    /// TODO: This function is supposed to handle scroll offsets, but that isn't happening at all.
-    pub fn get_content_boxes_for_node(&self, requested_node: OpaqueNode) -> Vec<Rect<Au>> {
-        let mut content_boxes = Vec::new();
-        let tag_to_find = Tag::new(requested_node);
-        self.find(|fragment, _, containing_block| {
-            if fragment.tag() != Some(tag_to_find) {
-                return None::<()>;
-            }
-
-            let fragment_relative_rect = match fragment {
-                Fragment::Box(fragment) | Fragment::Float(fragment) => {
-                    fragment.borrow().border_rect()
-                },
-                Fragment::Positioning(fragment) => fragment.borrow().rect,
-                Fragment::Text(fragment) => fragment.borrow().rect,
-                Fragment::AbsoluteOrFixedPositioned(_) |
-                Fragment::Image(_) |
-                Fragment::IFrame(_) => return None,
-            };
-
-            let rect = fragment_relative_rect.translate(containing_block.origin.to_vector());
-
-            content_boxes.push(rect.to_untyped());
-            None::<()>
-        });
-        content_boxes
-    }
-
-    pub fn get_border_dimensions_for_node(&self, requested_node: OpaqueNode) -> Rect<i32> {
-        let tag_to_find = Tag::new(requested_node);
-        self.find(|fragment, _, _containing_block| {
-            if fragment.tag() != Some(tag_to_find) {
-                return None;
-            }
-
-            let rect = match fragment {
-                Fragment::Box(fragment) | Fragment::Float(fragment) => {
-                    // https://drafts.csswg.org/cssom-view/#dom-element-clienttop
-                    // " If the element has no associated CSS layout box or if the
-                    //   CSS layout box is inline, return zero." For this check we
-                    // also explicitly ignore the list item portion of the display
-                    // style.
-                    let fragment = fragment.borrow();
-                    if fragment.is_inline_box() {
-                        return Some(Rect::zero());
-                    }
-                    if fragment.is_table_wrapper() {
-                        // For tables the border actually belongs to the table grid box,
-                        // so we need to include it in the dimension of the table wrapper box.
-                        let mut rect = fragment.border_rect();
-                        rect.origin = PhysicalPoint::zero();
-                        rect
-                    } else {
-                        let mut rect = fragment.padding_rect();
-                        rect.origin = PhysicalPoint::new(fragment.border.left, fragment.border.top);
-                        rect
-                    }
-                },
-                Fragment::Positioning(fragment) => fragment.borrow().rect.cast_unit(),
-                Fragment::Text(text_fragment) => text_fragment.borrow().rect,
-                _ => return None,
-            };
-
-            let rect = Rect::new(
-                Point2D::new(rect.origin.x.to_f32_px(), rect.origin.y.to_f32_px()),
-                Size2D::new(rect.size.width.to_f32_px(), rect.size.height.to_f32_px()),
-            );
-            Some(rect.round().to_i32().to_untyped())
-        })
-        .unwrap_or_else(Rect::zero)
-    }
-
-    pub fn get_scrolling_area_for_viewport(&self) -> PhysicalRect<Au> {
-        let mut scroll_area = self.initial_containing_block;
-        for fragment in self.root_fragments.iter() {
-            scroll_area = fragment
-                .scrolling_area(&self.initial_containing_block)
-                .union(&scroll_area);
-        }
-        scroll_area
-    }
-
-    pub fn get_scrolling_area_for_node(&self, requested_node: OpaqueNode) -> PhysicalRect<Au> {
-        let tag_to_find = Tag::new(requested_node);
-        let scroll_area = self.find(|fragment, _, containing_block| {
-            if fragment.tag() == Some(tag_to_find) {
-                Some(fragment.scrolling_area(containing_block))
-            } else {
-                None
-            }
-        });
-        scroll_area.unwrap_or_else(PhysicalRect::<Au>::zero)
-    }
-}
diff --git a/components/layout_2020/fragment_tree/positioning_fragment.rs b/components/layout_2020/fragment_tree/positioning_fragment.rs
deleted file mode 100644
index b2e6c0ebfd3..00000000000
--- a/components/layout_2020/fragment_tree/positioning_fragment.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use app_units::Au;
-use base::print_tree::PrintTree;
-use servo_arc::Arc as ServoArc;
-use style::properties::ComputedValues;
-
-use super::{BaseFragment, BaseFragmentInfo, Fragment};
-use crate::cell::ArcRefCell;
-use crate::geom::PhysicalRect;
-
-/// Can contain child fragments with relative coordinates, but does not contribute to painting
-/// itself. [`PositioningFragment`]s may be completely anonymous, or just non-painting Fragments
-/// generated by boxes.
-pub(crate) struct PositioningFragment {
-    pub base: BaseFragment,
-    pub rect: PhysicalRect<Au>,
-    pub children: Vec<Fragment>,
-    /// The scrollable overflow of this anonymous fragment's children.
-    pub scrollable_overflow: PhysicalRect<Au>,
-
-    /// If this fragment was created with a style, the style of the fragment.
-    pub style: Option<ServoArc<ComputedValues>>,
-}
-
-impl PositioningFragment {
-    pub fn new_anonymous(rect: PhysicalRect<Au>, children: Vec<Fragment>) -> ArcRefCell<Self> {
-        Self::new_with_base_fragment(BaseFragment::anonymous(), None, rect, children)
-    }
-
-    pub fn new_empty(
-        base_fragment_info: BaseFragmentInfo,
-        rect: PhysicalRect<Au>,
-        style: ServoArc<ComputedValues>,
-    ) -> ArcRefCell<Self> {
-        Self::new_with_base_fragment(base_fragment_info.into(), Some(style), rect, Vec::new())
-    }
-
-    fn new_with_base_fragment(
-        base: BaseFragment,
-        style: Option<ServoArc<ComputedValues>>,
-        rect: PhysicalRect<Au>,
-        children: Vec<Fragment>,
-    ) -> ArcRefCell<Self> {
-        let content_origin = rect.origin;
-        let scrollable_overflow = children.iter().fold(PhysicalRect::zero(), |acc, child| {
-            acc.union(
-                &child
-                    .scrollable_overflow()
-                    .translate(content_origin.to_vector()),
-            )
-        });
-        ArcRefCell::new(PositioningFragment {
-            base,
-            style,
-            rect,
-            children,
-            scrollable_overflow,
-        })
-    }
-
-    pub fn print(&self, tree: &mut PrintTree) {
-        tree.new_level(format!(
-            "PositioningFragment\
-                \nbase={:?}\
-                \nrect={:?}\
-                \nscrollable_overflow={:?}",
-            self.base, self.rect, self.scrollable_overflow
-        ));
-
-        for child in &self.children {
-            child.print(tree);
-        }
-        tree.end_level();
-    }
-}
diff --git a/components/layout_2020/geom.rs b/components/layout_2020/geom.rs
deleted file mode 100644
index 56da1c5d7f5..00000000000
--- a/components/layout_2020/geom.rs
+++ /dev/null
@@ -1,1090 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::cell::LazyCell;
-use std::convert::From;
-use std::fmt;
-use std::ops::{Add, AddAssign, Neg, Sub, SubAssign};
-
-use app_units::{Au, MAX_AU};
-use style::Zero;
-use style::logical_geometry::{BlockFlowDirection, Direction, InlineBaseDirection, WritingMode};
-use style::values::computed::{
-    CSSPixelLength, LengthPercentage, MaxSize as StyleMaxSize, Percentage, Size as StyleSize,
-};
-use style::values::generics::length::GenericLengthPercentageOrAuto as AutoOr;
-use style_traits::CSSPixel;
-
-use crate::ContainingBlock;
-use crate::sizing::ContentSizes;
-use crate::style_ext::Clamp;
-
-pub type PhysicalPoint<U> = euclid::Point2D<U, CSSPixel>;
-pub type PhysicalSize<U> = euclid::Size2D<U, CSSPixel>;
-pub type PhysicalVec<U> = euclid::Vector2D<U, CSSPixel>;
-pub type PhysicalRect<U> = euclid::Rect<U, CSSPixel>;
-pub type PhysicalSides<U> = euclid::SideOffsets2D<U, CSSPixel>;
-pub type AuOrAuto = AutoOr<Au>;
-pub type LengthPercentageOrAuto<'a> = AutoOr<&'a LengthPercentage>;
-
-#[derive(Clone, Copy, PartialEq)]
-pub struct LogicalVec2<T> {
-    pub inline: T,
-    pub block: T,
-}
-
-#[derive(Clone, Copy)]
-pub struct LogicalRect<T> {
-    pub start_corner: LogicalVec2<T>,
-    pub size: LogicalVec2<T>,
-}
-
-#[derive(Clone, Copy, Debug, Default)]
-pub struct LogicalSides<T> {
-    pub inline_start: T,
-    pub inline_end: T,
-    pub block_start: T,
-    pub block_end: T,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub(crate) struct LogicalSides1D<T> {
-    pub start: T,
-    pub end: T,
-}
-
-impl<T: fmt::Debug> fmt::Debug for LogicalVec2<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        // Not using f.debug_struct on purpose here, to keep {:?} output somewhat compact
-        f.write_str("Vec2 { i: ")?;
-        self.inline.fmt(f)?;
-        f.write_str(", b: ")?;
-        self.block.fmt(f)?;
-        f.write_str(" }")
-    }
-}
-
-impl<T: Default> Default for LogicalVec2<T> {
-    fn default() -> Self {
-        Self {
-            inline: T::default(),
-            block: T::default(),
-        }
-    }
-}
-
-impl<T: Copy> From<T> for LogicalVec2<T> {
-    fn from(value: T) -> Self {
-        Self {
-            inline: value,
-            block: value,
-        }
-    }
-}
-
-impl<T> LogicalVec2<T> {
-    pub(crate) fn as_ref(&self) -> LogicalVec2<&T> {
-        LogicalVec2 {
-            inline: &self.inline,
-            block: &self.block,
-        }
-    }
-
-    pub fn map_inline_and_block_axes<U>(
-        &self,
-        inline_f: impl FnOnce(&T) -> U,
-        block_f: impl FnOnce(&T) -> U,
-    ) -> LogicalVec2<U> {
-        LogicalVec2 {
-            inline: inline_f(&self.inline),
-            block: block_f(&self.block),
-        }
-    }
-}
-
-impl<T: Clone> LogicalVec2<Size<T>> {
-    pub fn map_inline_and_block_sizes<U>(
-        &self,
-        inline_f: impl FnOnce(T) -> U,
-        block_f: impl FnOnce(T) -> U,
-    ) -> LogicalVec2<Size<U>> {
-        self.map_inline_and_block_axes(|size| size.map(inline_f), |size| size.map(block_f))
-    }
-}
-
-impl<T: Clone> LogicalVec2<T> {
-    pub fn from_physical_size(physical_size: &PhysicalSize<T>, mode: WritingMode) -> Self {
-        // https://drafts.csswg.org/css-writing-modes/#logical-to-physical
-        let (i, b) = if mode.is_horizontal() {
-            (&physical_size.width, &physical_size.height)
-        } else {
-            (&physical_size.height, &physical_size.width)
-        };
-        LogicalVec2 {
-            inline: i.clone(),
-            block: b.clone(),
-        }
-    }
-
-    pub fn map<U>(&self, f: impl Fn(&T) -> U) -> LogicalVec2<U> {
-        LogicalVec2 {
-            inline: f(&self.inline),
-            block: f(&self.block),
-        }
-    }
-
-    pub(crate) fn map_with<U, V>(
-        &self,
-        other: &LogicalVec2<U>,
-        f: impl Fn(&T, &U) -> V,
-    ) -> LogicalVec2<V> {
-        LogicalVec2 {
-            inline: f(&self.inline, &other.inline),
-            block: f(&self.block, &other.block),
-        }
-    }
-}
-
-impl<T: Add<Output = T> + Copy> Add<LogicalVec2<T>> for LogicalVec2<T> {
-    type Output = LogicalVec2<T>;
-    fn add(self, other: Self) -> Self::Output {
-        LogicalVec2 {
-            inline: self.inline + other.inline,
-            block: self.block + other.block,
-        }
-    }
-}
-
-impl<T: Sub<Output = T> + Copy> Sub<LogicalVec2<T>> for LogicalVec2<T> {
-    type Output = LogicalVec2<T>;
-    fn sub(self, other: Self) -> Self::Output {
-        LogicalVec2 {
-            inline: self.inline - other.inline,
-            block: self.block - other.block,
-        }
-    }
-}
-
-impl<T: AddAssign<T> + Copy> AddAssign<LogicalVec2<T>> for LogicalVec2<T> {
-    fn add_assign(&mut self, other: LogicalVec2<T>) {
-        self.inline += other.inline;
-        self.block += other.block;
-    }
-}
-
-impl<T: SubAssign<T> + Copy> SubAssign<LogicalVec2<T>> for LogicalVec2<T> {
-    fn sub_assign(&mut self, other: LogicalVec2<T>) {
-        self.inline -= other.inline;
-        self.block -= other.block;
-    }
-}
-
-impl<T: Neg<Output = T> + Copy> Neg for LogicalVec2<T> {
-    type Output = LogicalVec2<T>;
-    fn neg(self) -> Self::Output {
-        Self {
-            inline: -self.inline,
-            block: -self.block,
-        }
-    }
-}
-
-impl<T: Zero> LogicalVec2<T> {
-    pub fn zero() -> Self {
-        Self {
-            inline: T::zero(),
-            block: T::zero(),
-        }
-    }
-}
-
-impl<T: Clone> LogicalVec2<AutoOr<T>> {
-    pub fn auto_is(&self, f: impl Fn() -> T) -> LogicalVec2<T> {
-        self.map(|t| t.auto_is(&f))
-    }
-}
-
-impl<T: Zero> LogicalRect<T> {
-    pub fn zero() -> Self {
-        Self {
-            start_corner: LogicalVec2::zero(),
-            size: LogicalVec2::zero(),
-        }
-    }
-}
-
-impl fmt::Debug for LogicalRect<Au> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "Rect(i{}×b{} @ (i{},b{}))",
-            self.size.inline.to_f32_px(),
-            self.size.block.to_f32_px(),
-            self.start_corner.inline.to_f32_px(),
-            self.start_corner.block.to_f32_px(),
-        )
-    }
-}
-
-impl<T: Clone> LogicalVec2<T> {
-    pub fn to_physical_size(&self, mode: WritingMode) -> PhysicalSize<T> {
-        // https://drafts.csswg.org/css-writing-modes/#logical-to-physical
-        let (x, y) = if mode.is_horizontal() {
-            (&self.inline, &self.block)
-        } else {
-            (&self.block, &self.inline)
-        };
-        PhysicalSize::new(x.clone(), y.clone())
-    }
-}
-
-impl<T: Copy + Neg<Output = T>> LogicalVec2<T> {
-    pub fn to_physical_vector(&self, mode: WritingMode) -> PhysicalVec<T> {
-        if mode.is_horizontal() {
-            if mode.is_bidi_ltr() {
-                PhysicalVec::new(self.inline, self.block)
-            } else {
-                PhysicalVec::new(-self.inline, self.block)
-            }
-        } else if mode.is_inline_tb() {
-            PhysicalVec::new(self.block, self.inline)
-        } else {
-            PhysicalVec::new(-self.block, self.inline)
-        }
-    }
-}
-
-impl<T: Clone> LogicalSides<T> {
-    pub fn from_physical(sides: &PhysicalSides<T>, mode: WritingMode) -> Self {
-        // https://drafts.csswg.org/css-writing-modes/#logical-to-physical
-        let block_flow = mode.block_flow_direction();
-        let (bs, be) = match mode.block_flow_direction() {
-            BlockFlowDirection::TopToBottom => (&sides.top, &sides.bottom),
-            BlockFlowDirection::RightToLeft => (&sides.right, &sides.left),
-            BlockFlowDirection::LeftToRight => (&sides.left, &sides.right),
-        };
-        use BlockFlowDirection::TopToBottom;
-        let (is, ie) = match (block_flow, mode.inline_base_direction()) {
-            (TopToBottom, InlineBaseDirection::LeftToRight) => (&sides.left, &sides.right),
-            (TopToBottom, InlineBaseDirection::RightToLeft) => (&sides.right, &sides.left),
-            (_, InlineBaseDirection::LeftToRight) => (&sides.top, &sides.bottom),
-            (_, InlineBaseDirection::RightToLeft) => (&sides.bottom, &sides.top),
-        };
-        LogicalSides {
-            inline_start: is.clone(),
-            inline_end: ie.clone(),
-            block_start: bs.clone(),
-            block_end: be.clone(),
-        }
-    }
-}
-
-impl<T> LogicalSides<T> {
-    pub fn map<U>(&self, f: impl Fn(&T) -> U) -> LogicalSides<U> {
-        LogicalSides {
-            inline_start: f(&self.inline_start),
-            inline_end: f(&self.inline_end),
-            block_start: f(&self.block_start),
-            block_end: f(&self.block_end),
-        }
-    }
-
-    pub fn map_inline_and_block_axes<U>(
-        &self,
-        inline_f: impl Fn(&T) -> U,
-        block_f: impl Fn(&T) -> U,
-    ) -> LogicalSides<U> {
-        LogicalSides {
-            inline_start: inline_f(&self.inline_start),
-            inline_end: inline_f(&self.inline_end),
-            block_start: block_f(&self.block_start),
-            block_end: block_f(&self.block_end),
-        }
-    }
-
-    pub fn inline_sum(&self) -> T::Output
-    where
-        T: Add + Copy,
-    {
-        self.inline_start + self.inline_end
-    }
-
-    pub fn block_sum(&self) -> T::Output
-    where
-        T: Add + Copy,
-    {
-        self.block_start + self.block_end
-    }
-
-    pub fn sum(&self) -> LogicalVec2<T::Output>
-    where
-        T: Add + Copy,
-    {
-        LogicalVec2 {
-            inline: self.inline_sum(),
-            block: self.block_sum(),
-        }
-    }
-
-    pub fn to_physical(&self, mode: WritingMode) -> PhysicalSides<T>
-    where
-        T: Clone,
-    {
-        let top;
-        let right;
-        let bottom;
-        let left;
-        if mode.is_vertical() {
-            if mode.is_vertical_lr() {
-                left = self.block_start.clone();
-                right = self.block_end.clone();
-            } else {
-                right = self.block_start.clone();
-                left = self.block_end.clone();
-            }
-
-            if mode.is_inline_tb() {
-                top = self.inline_start.clone();
-                bottom = self.inline_end.clone();
-            } else {
-                bottom = self.inline_start.clone();
-                top = self.inline_end.clone();
-            }
-        } else {
-            top = self.block_start.clone();
-            bottom = self.block_end.clone();
-            if mode.is_bidi_ltr() {
-                left = self.inline_start.clone();
-                right = self.inline_end.clone();
-            } else {
-                right = self.inline_start.clone();
-                left = self.inline_end.clone();
-            }
-        }
-        PhysicalSides::new(top, right, bottom, left)
-    }
-}
-
-impl<T: Copy> LogicalSides<T> {
-    pub fn start_offset(&self) -> LogicalVec2<T> {
-        LogicalVec2 {
-            inline: self.inline_start,
-            block: self.block_start,
-        }
-    }
-
-    #[inline]
-    pub(crate) fn inline_sides(&self) -> LogicalSides1D<T> {
-        LogicalSides1D::new(self.inline_start, self.inline_end)
-    }
-
-    #[inline]
-    pub(crate) fn block_sides(&self) -> LogicalSides1D<T> {
-        LogicalSides1D::new(self.block_start, self.block_end)
-    }
-}
-
-impl LogicalSides<LengthPercentage> {
-    pub fn percentages_relative_to(&self, basis: Au) -> LogicalSides<Au> {
-        self.map(|value| value.to_used_value(basis))
-    }
-}
-
-impl LogicalSides<LengthPercentageOrAuto<'_>> {
-    pub fn percentages_relative_to(&self, basis: Au) -> LogicalSides<AuOrAuto> {
-        self.map(|value| value.map(|value| value.to_used_value(basis)))
-    }
-}
-
-impl<T: Clone> LogicalSides<AutoOr<T>> {
-    pub fn auto_is(&self, f: impl Fn() -> T) -> LogicalSides<T> {
-        self.map(|s| s.auto_is(&f))
-    }
-}
-
-impl<T: Add<Output = T> + Copy> Add<LogicalSides<T>> for LogicalSides<T> {
-    type Output = LogicalSides<T>;
-
-    fn add(self, other: Self) -> Self::Output {
-        LogicalSides {
-            inline_start: self.inline_start + other.inline_start,
-            inline_end: self.inline_end + other.inline_end,
-            block_start: self.block_start + other.block_start,
-            block_end: self.block_end + other.block_end,
-        }
-    }
-}
-
-impl<T: Sub<Output = T> + Copy> Sub<LogicalSides<T>> for LogicalSides<T> {
-    type Output = LogicalSides<T>;
-
-    fn sub(self, other: Self) -> Self::Output {
-        LogicalSides {
-            inline_start: self.inline_start - other.inline_start,
-            inline_end: self.inline_end - other.inline_end,
-            block_start: self.block_start - other.block_start,
-            block_end: self.block_end - other.block_end,
-        }
-    }
-}
-
-impl<T: Neg<Output = T> + Copy> Neg for LogicalSides<T> {
-    type Output = LogicalSides<T>;
-    fn neg(self) -> Self::Output {
-        Self {
-            inline_start: -self.inline_start,
-            inline_end: -self.inline_end,
-            block_start: -self.block_start,
-            block_end: -self.block_end,
-        }
-    }
-}
-
-impl<T: Zero> LogicalSides<T> {
-    pub(crate) fn zero() -> LogicalSides<T> {
-        Self {
-            inline_start: T::zero(),
-            inline_end: T::zero(),
-            block_start: T::zero(),
-            block_end: T::zero(),
-        }
-    }
-}
-
-impl From<LogicalSides<CSSPixelLength>> for LogicalSides<Au> {
-    fn from(value: LogicalSides<CSSPixelLength>) -> Self {
-        Self {
-            inline_start: value.inline_start.into(),
-            inline_end: value.inline_end.into(),
-            block_start: value.block_start.into(),
-            block_end: value.block_end.into(),
-        }
-    }
-}
-
-impl From<LogicalSides<Au>> for LogicalSides<CSSPixelLength> {
-    fn from(value: LogicalSides<Au>) -> Self {
-        Self {
-            inline_start: value.inline_start.into(),
-            inline_end: value.inline_end.into(),
-            block_start: value.block_start.into(),
-            block_end: value.block_end.into(),
-        }
-    }
-}
-
-impl<T> LogicalSides1D<T> {
-    #[inline]
-    pub(crate) fn new(start: T, end: T) -> Self {
-        Self { start, end }
-    }
-}
-
-impl<T> LogicalSides1D<AutoOr<T>> {
-    #[inline]
-    pub(crate) fn either_specified(&self) -> bool {
-        !self.start.is_auto() || !self.end.is_auto()
-    }
-
-    #[inline]
-    pub(crate) fn either_auto(&self) -> bool {
-        self.start.is_auto() || self.end.is_auto()
-    }
-}
-
-impl<T: Add + Copy> LogicalSides1D<T> {
-    #[inline]
-    pub(crate) fn sum(&self) -> T::Output {
-        self.start + self.end
-    }
-}
-
-impl<T> LogicalRect<T> {
-    pub fn max_inline_position(&self) -> T
-    where
-        T: Add<Output = T> + Copy,
-    {
-        self.start_corner.inline + self.size.inline
-    }
-
-    pub fn max_block_position(&self) -> T
-    where
-        T: Add<Output = T> + Copy,
-    {
-        self.start_corner.block + self.size.block
-    }
-
-    pub fn inflate(&self, sides: &LogicalSides<T>) -> Self
-    where
-        T: Add<Output = T> + Copy,
-        T: Sub<Output = T> + Copy,
-    {
-        Self {
-            start_corner: LogicalVec2 {
-                inline: self.start_corner.inline - sides.inline_start,
-                block: self.start_corner.block - sides.block_start,
-            },
-            size: LogicalVec2 {
-                inline: self.size.inline + sides.inline_sum(),
-                block: self.size.block + sides.block_sum(),
-            },
-        }
-    }
-
-    pub fn deflate(&self, sides: &LogicalSides<T>) -> Self
-    where
-        T: Add<Output = T> + Copy,
-        T: Sub<Output = T> + Copy,
-    {
-        LogicalRect {
-            start_corner: LogicalVec2 {
-                inline: self.start_corner.inline + sides.inline_start,
-                block: self.start_corner.block + sides.block_start,
-            },
-            size: LogicalVec2 {
-                inline: self.size.inline - sides.inline_sum(),
-                block: self.size.block - sides.block_sum(),
-            },
-        }
-    }
-}
-
-impl LogicalRect<Au> {
-    pub(crate) fn as_physical(
-        &self,
-        containing_block: Option<&ContainingBlock<'_>>,
-    ) -> PhysicalRect<Au> {
-        let mode = containing_block.map_or_else(WritingMode::horizontal_tb, |containing_block| {
-            containing_block.style.writing_mode
-        });
-        let (x, y, width, height) = if mode.is_vertical() {
-            // TODO: Bottom-to-top writing modes are not supported.
-            (
-                self.start_corner.block,
-                self.start_corner.inline,
-                self.size.block,
-                self.size.inline,
-            )
-        } else {
-            let y = self.start_corner.block;
-            let x = match containing_block {
-                Some(containing_block) if !mode.is_bidi_ltr() => {
-                    containing_block.size.inline - self.max_inline_position()
-                },
-                _ => self.start_corner.inline,
-            };
-            (x, y, self.size.inline, self.size.block)
-        };
-
-        PhysicalRect::new(PhysicalPoint::new(x, y), PhysicalSize::new(width, height))
-    }
-}
-
-impl From<LogicalVec2<CSSPixelLength>> for LogicalVec2<Au> {
-    fn from(value: LogicalVec2<CSSPixelLength>) -> Self {
-        LogicalVec2 {
-            inline: value.inline.into(),
-            block: value.block.into(),
-        }
-    }
-}
-
-impl From<LogicalVec2<Au>> for LogicalVec2<CSSPixelLength> {
-    fn from(value: LogicalVec2<Au>) -> Self {
-        LogicalVec2 {
-            inline: value.inline.into(),
-            block: value.block.into(),
-        }
-    }
-}
-
-impl From<LogicalRect<Au>> for LogicalRect<CSSPixelLength> {
-    fn from(value: LogicalRect<Au>) -> Self {
-        LogicalRect {
-            start_corner: value.start_corner.into(),
-            size: value.size.into(),
-        }
-    }
-}
-
-impl From<LogicalRect<CSSPixelLength>> for LogicalRect<Au> {
-    fn from(value: LogicalRect<CSSPixelLength>) -> Self {
-        LogicalRect {
-            start_corner: value.start_corner.into(),
-            size: value.size.into(),
-        }
-    }
-}
-
-pub(crate) trait ToLogical<Unit, LogicalType> {
-    fn to_logical(&self, writing_mode: WritingMode) -> LogicalType;
-}
-
-impl<Unit: Copy> ToLogical<Unit, LogicalVec2<Unit>> for PhysicalSize<Unit> {
-    fn to_logical(&self, writing_mode: WritingMode) -> LogicalVec2<Unit> {
-        LogicalVec2::from_physical_size(self, writing_mode)
-    }
-}
-
-impl<Unit: Copy> ToLogical<Unit, LogicalSides<Unit>> for PhysicalSides<Unit> {
-    fn to_logical(&self, writing_mode: WritingMode) -> LogicalSides<Unit> {
-        LogicalSides::from_physical(self, writing_mode)
-    }
-}
-
-pub(crate) trait ToLogicalWithContainingBlock<LogicalType> {
-    fn to_logical(&self, containing_block: &ContainingBlock) -> LogicalType;
-}
-
-impl ToLogicalWithContainingBlock<LogicalVec2<Au>> for PhysicalPoint<Au> {
-    fn to_logical(&self, containing_block: &ContainingBlock) -> LogicalVec2<Au> {
-        let writing_mode = containing_block.style.writing_mode;
-        // TODO: Bottom-to-top and right-to-left vertical writing modes are not supported yet.
-        if writing_mode.is_vertical() {
-            LogicalVec2 {
-                inline: self.y,
-                block: self.x,
-            }
-        } else {
-            LogicalVec2 {
-                inline: if writing_mode.is_bidi_ltr() {
-                    self.x
-                } else {
-                    containing_block.size.inline - self.x
-                },
-                block: self.y,
-            }
-        }
-    }
-}
-
-impl ToLogicalWithContainingBlock<LogicalRect<Au>> for PhysicalRect<Au> {
-    fn to_logical(&self, containing_block: &ContainingBlock) -> LogicalRect<Au> {
-        let inline_start;
-        let block_start;
-        let inline;
-        let block;
-
-        let writing_mode = containing_block.style.writing_mode;
-        if writing_mode.is_vertical() {
-            // TODO: Bottom-to-top and right-to-left vertical writing modes are not supported yet.
-            inline = self.size.height;
-            block = self.size.width;
-            block_start = self.origin.x;
-            inline_start = self.origin.y;
-        } else {
-            inline = self.size.width;
-            block = self.size.height;
-            block_start = self.origin.y;
-            if writing_mode.is_bidi_ltr() {
-                inline_start = self.origin.x;
-            } else {
-                inline_start = containing_block.size.inline - (self.origin.x + self.size.width);
-            }
-        }
-        LogicalRect {
-            start_corner: LogicalVec2 {
-                inline: inline_start,
-                block: block_start,
-            },
-            size: LogicalVec2 { inline, block },
-        }
-    }
-}
-
-/// The possible values accepted by the sizing properties.
-/// <https://drafts.csswg.org/css-sizing/#sizing-properties>
-#[derive(Clone, Debug, PartialEq)]
-pub(crate) enum Size<T> {
-    /// Represents an `auto` value for the preferred and minimum size properties,
-    /// or `none` for the maximum size properties.
-    /// <https://drafts.csswg.org/css-sizing/#valdef-width-auto>
-    /// <https://drafts.csswg.org/css-sizing/#valdef-max-width-none>
-    Initial,
-    /// <https://drafts.csswg.org/css-sizing/#valdef-width-min-content>
-    MinContent,
-    /// <https://drafts.csswg.org/css-sizing/#valdef-width-max-content>
-    MaxContent,
-    /// <https://drafts.csswg.org/css-sizing-4/#valdef-width-fit-content>
-    FitContent,
-    /// <https://drafts.csswg.org/css-sizing-3/#funcdef-width-fit-content>
-    FitContentFunction(T),
-    /// <https://drafts.csswg.org/css-sizing-4/#valdef-width-stretch>
-    Stretch,
-    /// Represents a numeric `<length-percentage>`, but resolved as a `T`.
-    /// <https://drafts.csswg.org/css-sizing/#valdef-width-length-percentage-0>
-    Numeric(T),
-}
-
-impl<T: Copy> Copy for Size<T> {}
-
-impl<T> Default for Size<T> {
-    #[inline]
-    fn default() -> Self {
-        Self::Initial
-    }
-}
-
-impl<T> Size<T> {
-    #[inline]
-    pub(crate) fn is_initial(&self) -> bool {
-        matches!(self, Self::Initial)
-    }
-}
-
-impl<T: Clone> Size<T> {
-    #[inline]
-    pub(crate) fn to_numeric(&self) -> Option<T> {
-        match self {
-            Self::Numeric(numeric) => Some(numeric).cloned(),
-            _ => None,
-        }
-    }
-
-    #[inline]
-    pub(crate) fn map<U>(&self, f: impl FnOnce(T) -> U) -> Size<U> {
-        match self {
-            Size::Initial => Size::Initial,
-            Size::MinContent => Size::MinContent,
-            Size::MaxContent => Size::MaxContent,
-            Size::FitContent => Size::FitContent,
-            Size::FitContentFunction(size) => Size::FitContentFunction(f(size.clone())),
-            Size::Stretch => Size::Stretch,
-            Size::Numeric(numeric) => Size::Numeric(f(numeric.clone())),
-        }
-    }
-}
-
-impl From<StyleSize> for Size<LengthPercentage> {
-    fn from(size: StyleSize) -> Self {
-        match size {
-            StyleSize::LengthPercentage(lp) => Size::Numeric(lp.0),
-            StyleSize::Auto => Size::Initial,
-            StyleSize::MinContent => Size::MinContent,
-            StyleSize::MaxContent => Size::MaxContent,
-            StyleSize::FitContent => Size::FitContent,
-            StyleSize::FitContentFunction(lp) => Size::FitContentFunction(lp.0),
-            StyleSize::Stretch => Size::Stretch,
-            StyleSize::AnchorSizeFunction(_) => unreachable!("anchor-size() should be disabled"),
-        }
-    }
-}
-
-impl From<StyleMaxSize> for Size<LengthPercentage> {
-    fn from(max_size: StyleMaxSize) -> Self {
-        match max_size {
-            StyleMaxSize::LengthPercentage(lp) => Size::Numeric(lp.0),
-            StyleMaxSize::None => Size::Initial,
-            StyleMaxSize::MinContent => Size::MinContent,
-            StyleMaxSize::MaxContent => Size::MaxContent,
-            StyleMaxSize::FitContent => Size::FitContent,
-            StyleMaxSize::FitContentFunction(lp) => Size::FitContentFunction(lp.0),
-            StyleMaxSize::Stretch => Size::Stretch,
-            StyleMaxSize::AnchorSizeFunction(_) => unreachable!("anchor-size() should be disabled"),
-        }
-    }
-}
-
-impl Size<LengthPercentage> {
-    #[inline]
-    pub(crate) fn to_percentage(&self) -> Option<Percentage> {
-        self.to_numeric()
-            .and_then(|length_percentage| length_percentage.to_percentage())
-    }
-
-    /// Resolves percentages in a preferred size, against the provided basis.
-    /// If the basis is missing, percentages are considered cyclic.
-    /// <https://www.w3.org/TR/css-sizing-3/#preferred-size-properties>
-    /// <https://www.w3.org/TR/css-sizing-3/#cyclic-percentage-size>
-    #[inline]
-    pub(crate) fn resolve_percentages_for_preferred(&self, basis: Option<Au>) -> Size<Au> {
-        match self {
-            Size::Numeric(numeric) => numeric
-                .maybe_to_used_value(basis)
-                .map_or(Size::Initial, Size::Numeric),
-            Size::FitContentFunction(numeric) => {
-                // Under discussion in https://github.com/w3c/csswg-drafts/issues/11805
-                numeric
-                    .maybe_to_used_value(basis)
-                    .map_or(Size::FitContent, Size::FitContentFunction)
-            },
-            _ => self.map(|_| unreachable!("This shouldn't be called for keywords")),
-        }
-    }
-
-    /// Resolves percentages in a maximum size, against the provided basis.
-    /// If the basis is missing, percentages are considered cyclic.
-    /// <https://www.w3.org/TR/css-sizing-3/#preferred-size-properties>
-    /// <https://www.w3.org/TR/css-sizing-3/#cyclic-percentage-size>
-    #[inline]
-    pub(crate) fn resolve_percentages_for_max(&self, basis: Option<Au>) -> Size<Au> {
-        match self {
-            Size::Numeric(numeric) => numeric
-                .maybe_to_used_value(basis)
-                .map_or(Size::Initial, Size::Numeric),
-            Size::FitContentFunction(numeric) => {
-                // Under discussion in https://github.com/w3c/csswg-drafts/issues/11805
-                numeric
-                    .maybe_to_used_value(basis)
-                    .map_or(Size::MaxContent, Size::FitContentFunction)
-            },
-            _ => self.map(|_| unreachable!("This shouldn't be called for keywords")),
-        }
-    }
-}
-
-impl LogicalVec2<Size<LengthPercentage>> {
-    pub(crate) fn percentages_relative_to_basis(
-        &self,
-        basis: &LogicalVec2<Au>,
-    ) -> LogicalVec2<Size<Au>> {
-        LogicalVec2 {
-            inline: self.inline.map(|value| value.to_used_value(basis.inline)),
-            block: self.block.map(|value| value.to_used_value(basis.block)),
-        }
-    }
-}
-
-impl Size<Au> {
-    /// Resolves a preferred size into a numerical value.
-    /// <https://www.w3.org/TR/css-sizing-3/#preferred-size-properties>
-    #[inline]
-    pub(crate) fn resolve_for_preferred<F: FnOnce() -> ContentSizes>(
-        &self,
-        automatic_size: Size<Au>,
-        stretch_size: Option<Au>,
-        content_size: &LazyCell<ContentSizes, F>,
-    ) -> Au {
-        match self {
-            Self::Initial => {
-                assert!(!automatic_size.is_initial());
-                automatic_size.resolve_for_preferred(automatic_size, stretch_size, content_size)
-            },
-            Self::MinContent => content_size.min_content,
-            Self::MaxContent => content_size.max_content,
-            Self::FitContentFunction(size) => content_size.shrink_to_fit(*size),
-            Self::FitContent => {
-                content_size.shrink_to_fit(stretch_size.unwrap_or_else(|| content_size.max_content))
-            },
-            Self::Stretch => stretch_size.unwrap_or_else(|| content_size.max_content),
-            Self::Numeric(numeric) => *numeric,
-        }
-    }
-
-    /// Resolves a minimum size into a numerical value.
-    /// <https://www.w3.org/TR/css-sizing-3/#min-size-properties>
-    #[inline]
-    pub(crate) fn resolve_for_min<F: FnOnce() -> ContentSizes>(
-        &self,
-        get_automatic_minimum_size: impl FnOnce() -> Au,
-        stretch_size: Option<Au>,
-        content_size: &LazyCell<ContentSizes, F>,
-    ) -> Au {
-        match self {
-            Self::Initial => get_automatic_minimum_size(),
-            Self::MinContent => content_size.min_content,
-            Self::MaxContent => content_size.max_content,
-            Self::FitContentFunction(size) => content_size.shrink_to_fit(*size),
-            Self::FitContent => content_size.shrink_to_fit(stretch_size.unwrap_or_default()),
-            Self::Stretch => stretch_size.unwrap_or_default(),
-            Self::Numeric(numeric) => *numeric,
-        }
-    }
-
-    /// Resolves a maximum size into a numerical value.
-    /// <https://www.w3.org/TR/css-sizing-3/#max-size-properties>
-    #[inline]
-    pub(crate) fn resolve_for_max<F: FnOnce() -> ContentSizes>(
-        &self,
-        stretch_size: Option<Au>,
-        content_size: &LazyCell<ContentSizes, F>,
-    ) -> Option<Au> {
-        Some(match self {
-            Self::Initial => return None,
-            Self::MinContent => content_size.min_content,
-            Self::MaxContent => content_size.max_content,
-            Self::FitContentFunction(size) => content_size.shrink_to_fit(*size),
-            Self::FitContent => content_size.shrink_to_fit(stretch_size.unwrap_or(MAX_AU)),
-            Self::Stretch => return stretch_size,
-            Self::Numeric(numeric) => *numeric,
-        })
-    }
-
-    /// Tries to resolve an extrinsic size into a numerical value.
-    /// Extrinsic sizes are those based on the context of an element, without regard for its contents.
-    /// <https://drafts.csswg.org/css-sizing-3/#extrinsic>
-    ///
-    /// Returns `None` if either:
-    /// - The size is intrinsic.
-    /// - The size is the initial one.
-    ///   TODO: should we allow it to behave as `stretch` instead of assuming it's intrinsic?
-    /// - The provided `stretch_size` is `None` but we need its value.
-    #[inline]
-    pub(crate) fn maybe_resolve_extrinsic(&self, stretch_size: Option<Au>) -> Option<Au> {
-        match self {
-            Self::Initial |
-            Self::MinContent |
-            Self::MaxContent |
-            Self::FitContent |
-            Self::FitContentFunction(_) => None,
-            Self::Stretch => stretch_size,
-            Self::Numeric(numeric) => Some(*numeric),
-        }
-    }
-}
-
-/// Represents the sizing constraint that the preferred, min and max sizing properties
-/// impose on one axis.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub(crate) enum SizeConstraint {
-    /// Represents a definite preferred size, clamped by minimum and maximum sizes (if any).
-    Definite(Au),
-    /// Represents an indefinite preferred size that allows a range of values between
-    /// the first argument (minimum size) and the second one (maximum size).
-    MinMax(Au, Option<Au>),
-}
-
-impl Default for SizeConstraint {
-    #[inline]
-    fn default() -> Self {
-        Self::MinMax(Au::default(), None)
-    }
-}
-
-impl SizeConstraint {
-    #[inline]
-    pub(crate) fn new(preferred_size: Option<Au>, min_size: Au, max_size: Option<Au>) -> Self {
-        preferred_size.map_or_else(
-            || Self::MinMax(min_size, max_size),
-            |size| Self::Definite(size.clamp_between_extremums(min_size, max_size)),
-        )
-    }
-
-    #[inline]
-    pub(crate) fn is_definite(self) -> bool {
-        matches!(self, Self::Definite(_))
-    }
-
-    #[inline]
-    pub(crate) fn to_definite(self) -> Option<Au> {
-        match self {
-            Self::Definite(size) => Some(size),
-            _ => None,
-        }
-    }
-}
-
-impl From<Option<Au>> for SizeConstraint {
-    fn from(size: Option<Au>) -> Self {
-        size.map(SizeConstraint::Definite).unwrap_or_default()
-    }
-}
-
-#[derive(Clone, Default)]
-pub(crate) struct Sizes {
-    /// <https://drafts.csswg.org/css-sizing-3/#preferred-size-properties>
-    pub preferred: Size<Au>,
-    /// <https://drafts.csswg.org/css-sizing-3/#min-size-properties>
-    pub min: Size<Au>,
-    /// <https://drafts.csswg.org/css-sizing-3/#max-size-properties>
-    pub max: Size<Au>,
-}
-
-impl Sizes {
-    #[inline]
-    pub(crate) fn new(preferred: Size<Au>, min: Size<Au>, max: Size<Au>) -> Self {
-        Self {
-            preferred,
-            min,
-            max,
-        }
-    }
-
-    /// Resolves the three sizes into a single numerical value.
-    #[inline]
-    pub(crate) fn resolve(
-        &self,
-        axis: Direction,
-        automatic_size: Size<Au>,
-        get_automatic_minimum_size: impl FnOnce() -> Au,
-        stretch_size: Option<Au>,
-        get_content_size: impl FnOnce() -> ContentSizes,
-        is_table: bool,
-    ) -> Au {
-        // The provided `get_content_size` is a FnOnce but we may need its result multiple times.
-        // A LazyCell will only invoke it once if needed, and then reuse the result.
-        let content_size = LazyCell::new(get_content_size);
-
-        if is_table && axis == Direction::Block {
-            // The intrinsic block size of a table already takes sizing properties into account,
-            // but it can be a smaller amount if there are collapsed rows.
-            // Therefore, disregard sizing properties and just defer to the intrinsic size.
-            // This is being discussed in https://github.com/w3c/csswg-drafts/issues/11408
-            return content_size.max_content;
-        }
-
-        let preferred =
-            self.preferred
-                .resolve_for_preferred(automatic_size, stretch_size, &content_size);
-        let mut min =
-            self.min
-                .resolve_for_min(get_automatic_minimum_size, stretch_size, &content_size);
-        if is_table {
-            // In addition to the specified minimum, the inline size of a table is forced to be
-            // at least as big as its min-content size.
-            // Note that if there are collapsed columns, only the inline size of the table grid will
-            // shrink, while the size of the table wrapper (being computed here) won't be affected.
-            // This is being discussed in https://github.com/w3c/csswg-drafts/issues/11408
-            min.max_assign(content_size.min_content);
-        }
-        let max = self.max.resolve_for_max(stretch_size, &content_size);
-        preferred.clamp_between_extremums(min, max)
-    }
-
-    /// Tries to extrinsically resolve the three sizes into a single [`SizeConstraint`].
-    /// Values that are intrinsic or need `stretch_size` when it's `None` are handled as such:
-    /// - On the preferred size, they make the returned value be an indefinite [`SizeConstraint::MinMax`].
-    /// - On the min size, they are treated as `auto`, enforcing the automatic minimum size.
-    /// - On the max size, they are treated as `none`, enforcing no maximum.
-    #[inline]
-    pub(crate) fn resolve_extrinsic(
-        &self,
-        automatic_size: Size<Au>,
-        automatic_minimum_size: Au,
-        stretch_size: Option<Au>,
-    ) -> SizeConstraint {
-        let (preferred, min, max) =
-            self.resolve_each_extrinsic(automatic_size, automatic_minimum_size, stretch_size);
-        SizeConstraint::new(preferred, min, max)
-    }
-
-    /// Tries to extrinsically resolve each of the three sizes into a numerical value, separately.
-    /// This can't resolve values that are intrinsic or need `stretch_size` but it's `None`.
-    /// - The 1st returned value is the resolved preferred size. If it can't be resolved then
-    ///   the returned value is `None`. Note that this is different than treating it as `auto`.
-    ///   TODO: This needs to be discussed in <https://github.com/w3c/csswg-drafts/issues/11387>.
-    /// - The 2nd returned value is the resolved minimum size. If it can't be resolved then we
-    ///   treat it as the initial `auto`, returning the automatic minimum size.
-    /// - The 3rd returned value is the resolved maximum size. If it can't be resolved then we
-    ///   treat it as the initial `none`, returning `None`.
-    #[inline]
-    pub(crate) fn resolve_each_extrinsic(
-        &self,
-        automatic_size: Size<Au>,
-        automatic_minimum_size: Au,
-        stretch_size: Option<Au>,
-    ) -> (Option<Au>, Au, Option<Au>) {
-        (
-            if self.preferred.is_initial() {
-                automatic_size.maybe_resolve_extrinsic(stretch_size)
-            } else {
-                self.preferred.maybe_resolve_extrinsic(stretch_size)
-            },
-            self.min
-                .maybe_resolve_extrinsic(stretch_size)
-                .unwrap_or(automatic_minimum_size),
-            self.max.maybe_resolve_extrinsic(stretch_size),
-        )
-    }
-}
diff --git a/components/layout_2020/layout_box_base.rs b/components/layout_2020/layout_box_base.rs
deleted file mode 100644
index bb2d37698f1..00000000000
--- a/components/layout_2020/layout_box_base.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::fmt::{Debug, Formatter};
-
-use app_units::Au;
-use atomic_refcell::AtomicRefCell;
-use servo_arc::Arc;
-use style::properties::ComputedValues;
-
-use crate::context::LayoutContext;
-use crate::formatting_contexts::Baselines;
-use crate::fragment_tree::{BaseFragmentInfo, CollapsedBlockMargins, Fragment, SpecificLayoutInfo};
-use crate::geom::SizeConstraint;
-use crate::positioned::PositioningContext;
-use crate::sizing::{ComputeInlineContentSizes, InlineContentSizesResult};
-use crate::{ConstraintSpace, ContainingBlockSize};
-
-/// A box tree node that handles containing information about style and the original DOM
-/// node or pseudo-element that it is based on. This also handles caching of layout values
-/// such as the inline content sizes to avoid recalculating these values during layout
-/// passes.
-///
-/// In the future, this will hold layout results to support incremental layout.
-pub(crate) struct LayoutBoxBase {
-    pub base_fragment_info: BaseFragmentInfo,
-    pub style: Arc<ComputedValues>,
-    pub cached_inline_content_size:
-        AtomicRefCell<Option<(SizeConstraint, InlineContentSizesResult)>>,
-    pub cached_layout_result: AtomicRefCell<Option<CacheableLayoutResultAndInputs>>,
-}
-
-impl LayoutBoxBase {
-    pub(crate) fn new(base_fragment_info: BaseFragmentInfo, style: Arc<ComputedValues>) -> Self {
-        Self {
-            base_fragment_info,
-            style,
-            cached_inline_content_size: AtomicRefCell::default(),
-            cached_layout_result: AtomicRefCell::default(),
-        }
-    }
-
-    /// Get the inline content sizes of a box tree node that extends this [`LayoutBoxBase`], fetch
-    /// the result from a cache when possible.
-    pub(crate) fn inline_content_sizes(
-        &self,
-        layout_context: &LayoutContext,
-        constraint_space: &ConstraintSpace,
-        layout_box: &impl ComputeInlineContentSizes,
-    ) -> InlineContentSizesResult {
-        let mut cache = self.cached_inline_content_size.borrow_mut();
-        if let Some((previous_cb_block_size, result)) = *cache {
-            if !result.depends_on_block_constraints ||
-                previous_cb_block_size == constraint_space.block_size
-            {
-                return result;
-            }
-            // TODO: Should we keep multiple caches for various block sizes?
-        }
-
-        let result = layout_box.compute_inline_content_sizes(layout_context, constraint_space);
-        *cache = Some((constraint_space.block_size, result));
-        result
-    }
-}
-
-impl Debug for LayoutBoxBase {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
-        f.debug_struct("LayoutBoxBase").finish()
-    }
-}
-
-#[derive(Clone)]
-pub(crate) struct CacheableLayoutResult {
-    pub fragments: Vec<Fragment>,
-
-    /// <https://drafts.csswg.org/css2/visudet.html#root-height>
-    pub content_block_size: Au,
-
-    /// If this layout is for a block container, this tracks the collapsable size
-    /// of start and end margins and whether or not the block container collapsed through.
-    pub collapsible_margins_in_children: CollapsedBlockMargins,
-
-    /// The contents of a table may force it to become wider than what we would expect
-    /// from 'width' and 'min-width'. This is the resulting inline content size,
-    /// or None for non-table layouts.
-    pub content_inline_size_for_table: Option<Au>,
-
-    /// The offset of the last inflow baseline of this layout in the content area, if
-    /// there was one. This is used to propagate baselines to the ancestors of `display:
-    /// inline-block`.
-    pub baselines: Baselines,
-
-    /// Whether or not this layout depends on the containing block size.
-    pub depends_on_block_constraints: bool,
-
-    /// Additional information of this layout that could be used by Javascripts and devtools.
-    pub specific_layout_info: Option<SpecificLayoutInfo>,
-}
-
-pub(crate) struct CacheableLayoutResultAndInputs {
-    pub result: CacheableLayoutResult,
-
-    pub containing_block_for_children_size: ContainingBlockSize,
-
-    pub positioning_context: PositioningContext,
-}
diff --git a/components/layout_2020/lib.rs b/components/layout_2020/lib.rs
deleted file mode 100644
index 640f9ff938b..00000000000
--- a/components/layout_2020/lib.rs
+++ /dev/null
@@ -1,184 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-#![deny(unsafe_code)]
-
-mod cell;
-pub mod context;
-pub mod display_list;
-pub mod dom;
-mod dom_traversal;
-mod flexbox;
-pub mod flow;
-mod formatting_contexts;
-mod fragment_tree;
-pub mod geom;
-mod layout_box_base;
-mod taffy;
-#[macro_use]
-mod construct_modern;
-mod lists;
-mod positioned;
-pub mod query;
-mod quotes;
-mod replaced;
-mod sizing;
-mod style_ext;
-pub mod table;
-pub mod traversal;
-
-use app_units::Au;
-pub use flow::BoxTree;
-pub use fragment_tree::FragmentTree;
-use style::logical_geometry::WritingMode;
-use style::properties::ComputedValues;
-use style::values::computed::TextDecorationLine;
-
-use crate::geom::{LogicalVec2, SizeConstraint};
-use crate::style_ext::AspectRatio;
-
-/// Represents the set of constraints that we use when computing the min-content
-/// and max-content inline sizes of an element.
-pub(crate) struct ConstraintSpace {
-    pub block_size: SizeConstraint,
-    pub writing_mode: WritingMode,
-    pub preferred_aspect_ratio: Option<AspectRatio>,
-}
-
-impl ConstraintSpace {
-    fn new(
-        block_size: SizeConstraint,
-        writing_mode: WritingMode,
-        preferred_aspect_ratio: Option<AspectRatio>,
-    ) -> Self {
-        Self {
-            block_size,
-            writing_mode,
-            preferred_aspect_ratio,
-        }
-    }
-
-    fn new_for_style_and_ratio(
-        style: &ComputedValues,
-        preferred_aspect_ratio: Option<AspectRatio>,
-    ) -> Self {
-        Self::new(
-            SizeConstraint::default(),
-            style.writing_mode,
-            preferred_aspect_ratio,
-        )
-    }
-}
-
-/// A variant of [`ContainingBlock`] that allows an indefinite inline size.
-/// Useful for code that is shared for both layout (where we know the inline size
-/// of the containing block) and intrinsic sizing (where we don't know it).
-pub(crate) struct IndefiniteContainingBlock {
-    pub size: LogicalVec2<Option<Au>>,
-    pub writing_mode: WritingMode,
-}
-
-impl From<&ConstraintSpace> for IndefiniteContainingBlock {
-    fn from(constraint_space: &ConstraintSpace) -> Self {
-        Self {
-            size: LogicalVec2 {
-                inline: None,
-                block: constraint_space.block_size.to_definite(),
-            },
-            writing_mode: constraint_space.writing_mode,
-        }
-    }
-}
-
-impl<'a> From<&'_ ContainingBlock<'a>> for IndefiniteContainingBlock {
-    fn from(containing_block: &ContainingBlock<'a>) -> Self {
-        Self {
-            size: LogicalVec2 {
-                inline: Some(containing_block.size.inline),
-                block: containing_block.size.block.to_definite(),
-            },
-            writing_mode: containing_block.style.writing_mode,
-        }
-    }
-}
-
-impl<'a> From<&'_ DefiniteContainingBlock<'a>> for IndefiniteContainingBlock {
-    fn from(containing_block: &DefiniteContainingBlock<'a>) -> Self {
-        Self {
-            size: containing_block.size.map(|v| Some(*v)),
-            writing_mode: containing_block.style.writing_mode,
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub(crate) struct ContainingBlockSize {
-    inline: Au,
-    block: SizeConstraint,
-}
-
-pub(crate) struct ContainingBlock<'a> {
-    size: ContainingBlockSize,
-    style: &'a ComputedValues,
-}
-
-struct DefiniteContainingBlock<'a> {
-    size: LogicalVec2<Au>,
-    style: &'a ComputedValues,
-}
-
-impl<'a> From<&'_ DefiniteContainingBlock<'a>> for ContainingBlock<'a> {
-    fn from(definite: &DefiniteContainingBlock<'a>) -> Self {
-        ContainingBlock {
-            size: ContainingBlockSize {
-                inline: definite.size.inline,
-                block: SizeConstraint::Definite(definite.size.block),
-            },
-            style: definite.style,
-        }
-    }
-}
-
-/// Data that is propagated from ancestors to descendants during [`crate::flow::BoxTree`]
-/// construction.  This allows data to flow in the reverse direction of the typical layout
-/// propoagation, but only during `BoxTree` construction.
-#[derive(Clone, Copy, Debug)]
-struct PropagatedBoxTreeData {
-    text_decoration: TextDecorationLine,
-    allow_percentage_column_in_tables: bool,
-}
-
-impl Default for PropagatedBoxTreeData {
-    fn default() -> Self {
-        Self {
-            text_decoration: Default::default(),
-            allow_percentage_column_in_tables: true,
-        }
-    }
-}
-
-impl PropagatedBoxTreeData {
-    pub(crate) fn union(&self, style: &ComputedValues) -> Self {
-        Self {
-            // FIXME(#31736): This is only taking into account the line style and not the decoration
-            // color. This should collect information about both so that they can be rendered properly.
-            text_decoration: self.text_decoration | style.clone_text_decoration_line(),
-            allow_percentage_column_in_tables: self.allow_percentage_column_in_tables,
-        }
-    }
-
-    pub(crate) fn without_text_decorations(&self) -> Self {
-        Self {
-            text_decoration: TextDecorationLine::NONE,
-            allow_percentage_column_in_tables: self.allow_percentage_column_in_tables,
-        }
-    }
-
-    fn disallowing_percentage_table_columns(&self) -> PropagatedBoxTreeData {
-        Self {
-            text_decoration: self.text_decoration,
-            allow_percentage_column_in_tables: false,
-        }
-    }
-}
diff --git a/components/layout_2020/positioned.rs b/components/layout_2020/positioned.rs
deleted file mode 100644
index 238eb1e3b2a..00000000000
--- a/components/layout_2020/positioned.rs
+++ /dev/null
@@ -1,1059 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::mem;
-
-use app_units::Au;
-use rayon::iter::IntoParallelRefMutIterator;
-use rayon::prelude::{IndexedParallelIterator, ParallelIterator};
-use style::Zero;
-use style::computed_values::position::T as Position;
-use style::logical_geometry::{Direction, WritingMode};
-use style::properties::ComputedValues;
-use style::values::specified::align::AlignFlags;
-
-use crate::cell::ArcRefCell;
-use crate::context::LayoutContext;
-use crate::dom::NodeExt;
-use crate::dom_traversal::{Contents, NodeAndStyleInfo};
-use crate::formatting_contexts::{
-    IndependentFormattingContext, IndependentFormattingContextContents,
-};
-use crate::fragment_tree::{
-    BoxFragment, CollapsedBlockMargins, Fragment, FragmentFlags, HoistedSharedFragment,
-    SpecificLayoutInfo,
-};
-use crate::geom::{
-    AuOrAuto, LengthPercentageOrAuto, LogicalRect, LogicalSides, LogicalSides1D, LogicalVec2,
-    PhysicalPoint, PhysicalRect, PhysicalSides, PhysicalSize, PhysicalVec, Size, Sizes, ToLogical,
-    ToLogicalWithContainingBlock,
-};
-use crate::sizing::ContentSizes;
-use crate::style_ext::{Clamp, ComputedValuesExt, ContentBoxSizesAndPBM, DisplayInside};
-use crate::{
-    ConstraintSpace, ContainingBlock, ContainingBlockSize, DefiniteContainingBlock,
-    PropagatedBoxTreeData, SizeConstraint,
-};
-
-#[derive(Debug)]
-pub(crate) struct AbsolutelyPositionedBox {
-    pub context: IndependentFormattingContext,
-}
-
-#[derive(Clone)]
-pub(crate) struct PositioningContext {
-    for_nearest_positioned_ancestor: Option<Vec<HoistedAbsolutelyPositionedBox>>,
-
-    // For nearest `containing block for all descendants` as defined by the CSS transforms
-    // spec.
-    // https://www.w3.org/TR/css-transforms-1/#containing-block-for-all-descendants
-    for_nearest_containing_block_for_all_descendants: Vec<HoistedAbsolutelyPositionedBox>,
-}
-
-#[derive(Clone)]
-pub(crate) struct HoistedAbsolutelyPositionedBox {
-    absolutely_positioned_box: ArcRefCell<AbsolutelyPositionedBox>,
-
-    /// A reference to a Fragment which is shared between this `HoistedAbsolutelyPositionedBox`
-    /// and its placeholder `AbsoluteOrFixedPositionedFragment` in the original tree position.
-    /// This will be used later in order to paint this hoisted box in tree order.
-    pub fragment: ArcRefCell<HoistedSharedFragment>,
-}
-
-impl AbsolutelyPositionedBox {
-    pub fn new(context: IndependentFormattingContext) -> Self {
-        Self { context }
-    }
-
-    pub fn construct<'dom>(
-        context: &LayoutContext,
-        node_info: &NodeAndStyleInfo<impl NodeExt<'dom>>,
-        display_inside: DisplayInside,
-        contents: Contents,
-    ) -> Self {
-        Self {
-            context: IndependentFormattingContext::construct(
-                context,
-                node_info,
-                display_inside,
-                contents,
-                // Text decorations are not propagated to any out-of-flow descendants. In addition,
-                // absolutes don't affect the size of ancestors so it is fine to allow descendent
-                // tables to resolve percentage columns.
-                PropagatedBoxTreeData::default(),
-            ),
-        }
-    }
-
-    pub(crate) fn to_hoisted(
-        absolutely_positioned_box: ArcRefCell<Self>,
-        static_position_rectangle: PhysicalRect<Au>,
-        resolved_alignment: LogicalVec2<AlignFlags>,
-        original_parent_writing_mode: WritingMode,
-    ) -> HoistedAbsolutelyPositionedBox {
-        HoistedAbsolutelyPositionedBox {
-            fragment: ArcRefCell::new(HoistedSharedFragment::new(
-                static_position_rectangle,
-                resolved_alignment,
-                original_parent_writing_mode,
-            )),
-            absolutely_positioned_box,
-        }
-    }
-}
-
-impl PositioningContext {
-    pub(crate) fn new_for_containing_block_for_all_descendants() -> Self {
-        Self {
-            for_nearest_positioned_ancestor: None,
-            for_nearest_containing_block_for_all_descendants: Vec::new(),
-        }
-    }
-
-    /// Create a [PositioningContext] to use for laying out a subtree. The idea is that
-    /// when subtree layout is finished, the newly hoisted boxes can be processed
-    /// (normally adjusting their static insets) and then appended to the parent
-    /// [PositioningContext].
-    pub(crate) fn new_for_subtree(collects_for_nearest_positioned_ancestor: bool) -> Self {
-        Self {
-            for_nearest_positioned_ancestor: if collects_for_nearest_positioned_ancestor {
-                Some(Vec::new())
-            } else {
-                None
-            },
-            for_nearest_containing_block_for_all_descendants: Vec::new(),
-        }
-    }
-
-    pub(crate) fn collects_for_nearest_positioned_ancestor(&self) -> bool {
-        self.for_nearest_positioned_ancestor.is_some()
-    }
-
-    pub(crate) fn new_for_style(style: &ComputedValues) -> Option<Self> {
-        // NB: We never make PositioningContexts for replaced elements, which is why we always
-        // pass false here.
-        if style.establishes_containing_block_for_all_descendants(FragmentFlags::empty()) {
-            Some(Self::new_for_containing_block_for_all_descendants())
-        } else if style
-            .establishes_containing_block_for_absolute_descendants(FragmentFlags::empty())
-        {
-            Some(Self {
-                for_nearest_positioned_ancestor: Some(Vec::new()),
-                for_nearest_containing_block_for_all_descendants: Vec::new(),
-            })
-        } else {
-            None
-        }
-    }
-
-    /// Absolute and fixed position fragments are hoisted up to their containing blocks
-    /// from their tree position. When these fragments have static inset start positions,
-    /// that position (relative to the ancestor containing block) needs to be included
-    /// with the hoisted fragment so that it can be laid out properly at the containing
-    /// block.
-    ///
-    /// This function is used to update the static position of hoisted boxes added after
-    /// the given index at every level of the fragment tree as the hoisted fragments move
-    /// up to their containing blocks. Once an ancestor fragment is laid out, this
-    /// function can be used to aggregate its offset to any descendent boxes that are
-    /// being hoisted. In this case, the appropriate index to use is the result of
-    /// [`PositioningContext::len()`] cached before laying out the [`Fragment`].
-    pub(crate) fn adjust_static_position_of_hoisted_fragments(
-        &mut self,
-        parent_fragment: &Fragment,
-        index: PositioningContextLength,
-    ) {
-        let start_offset = match &parent_fragment {
-            Fragment::Box(fragment) | Fragment::Float(fragment) => {
-                fragment.borrow().content_rect.origin
-            },
-            Fragment::AbsoluteOrFixedPositioned(_) => return,
-            Fragment::Positioning(fragment) => fragment.borrow().rect.origin,
-            _ => unreachable!(),
-        };
-        self.adjust_static_position_of_hoisted_fragments_with_offset(
-            &start_offset.to_vector(),
-            index,
-        );
-    }
-
-    /// See documentation for [PositioningContext::adjust_static_position_of_hoisted_fragments].
-    pub(crate) fn adjust_static_position_of_hoisted_fragments_with_offset(
-        &mut self,
-        offset: &PhysicalVec<Au>,
-        index: PositioningContextLength,
-    ) {
-        if let Some(hoisted_boxes) = self.for_nearest_positioned_ancestor.as_mut() {
-            hoisted_boxes
-                .iter_mut()
-                .skip(index.for_nearest_positioned_ancestor)
-                .for_each(|hoisted_fragment| {
-                    hoisted_fragment
-                        .fragment
-                        .borrow_mut()
-                        .adjust_offsets(offset)
-                })
-        }
-        self.for_nearest_containing_block_for_all_descendants
-            .iter_mut()
-            .skip(index.for_nearest_containing_block_for_all_descendants)
-            .for_each(|hoisted_fragment| {
-                hoisted_fragment
-                    .fragment
-                    .borrow_mut()
-                    .adjust_offsets(offset)
-            })
-    }
-
-    /// Given `fragment_layout_fn`, a closure which lays out a fragment in a provided
-    /// `PositioningContext`, create a new positioning context if necessary for the fragment and
-    /// lay out the fragment and all its children. Returns the newly created `BoxFragment`.
-    pub(crate) fn layout_maybe_position_relative_fragment(
-        &mut self,
-        layout_context: &LayoutContext,
-        containing_block: &ContainingBlock,
-        style: &ComputedValues,
-        fragment_layout_fn: impl FnOnce(&mut Self) -> BoxFragment,
-    ) -> BoxFragment {
-        // Try to create a context, but if one isn't necessary, simply create the fragment
-        // using the given closure and the current `PositioningContext`.
-        let mut new_context = match Self::new_for_style(style) {
-            Some(new_context) => new_context,
-            None => return fragment_layout_fn(self),
-        };
-
-        let mut new_fragment = fragment_layout_fn(&mut new_context);
-        new_context.layout_collected_children(layout_context, &mut new_fragment);
-
-        // If the new context has any hoisted boxes for the nearest containing block for
-        // pass them up the tree.
-        self.append(new_context);
-
-        if style.clone_position() == Position::Relative {
-            new_fragment.content_rect.origin += relative_adjustement(style, containing_block)
-                .to_physical_vector(containing_block.style.writing_mode)
-        }
-
-        new_fragment
-    }
-
-    // Lay out the hoisted boxes collected into this `PositioningContext` and add them
-    // to the given `BoxFragment`.
-    pub fn layout_collected_children(
-        &mut self,
-        layout_context: &LayoutContext,
-        new_fragment: &mut BoxFragment,
-    ) {
-        let padding_rect = PhysicalRect::new(
-            // Ignore the content rect’s position in its own containing block:
-            PhysicalPoint::origin(),
-            new_fragment.content_rect.size,
-        )
-        .outer_rect(new_fragment.padding);
-        let containing_block = DefiniteContainingBlock {
-            size: padding_rect
-                .size
-                .to_logical(new_fragment.style.writing_mode),
-            style: &new_fragment.style,
-        };
-
-        let take_hoisted_boxes_pending_layout =
-            |context: &mut Self| match context.for_nearest_positioned_ancestor.as_mut() {
-                Some(fragments) => mem::take(fragments),
-                None => mem::take(&mut context.for_nearest_containing_block_for_all_descendants),
-            };
-
-        // Loop because it’s possible that we discover (the static position of)
-        // more absolutely-positioned boxes while doing layout for others.
-        let mut hoisted_boxes = take_hoisted_boxes_pending_layout(self);
-        let mut laid_out_child_fragments = Vec::new();
-        while !hoisted_boxes.is_empty() {
-            HoistedAbsolutelyPositionedBox::layout_many(
-                layout_context,
-                &mut hoisted_boxes,
-                &mut laid_out_child_fragments,
-                &mut self.for_nearest_containing_block_for_all_descendants,
-                &containing_block,
-                new_fragment.padding,
-            );
-            hoisted_boxes = take_hoisted_boxes_pending_layout(self);
-        }
-
-        new_fragment.children.extend(laid_out_child_fragments);
-    }
-
-    pub(crate) fn push(&mut self, box_: HoistedAbsolutelyPositionedBox) {
-        if let Some(nearest) = &mut self.for_nearest_positioned_ancestor {
-            let position = box_
-                .absolutely_positioned_box
-                .borrow()
-                .context
-                .style()
-                .clone_position();
-            match position {
-                Position::Fixed => {}, // fall through
-                Position::Absolute => return nearest.push(box_),
-                Position::Static | Position::Relative | Position::Sticky => unreachable!(),
-            }
-        }
-        self.for_nearest_containing_block_for_all_descendants
-            .push(box_)
-    }
-
-    pub(crate) fn is_empty(&self) -> bool {
-        self.for_nearest_containing_block_for_all_descendants
-            .is_empty() &&
-            self.for_nearest_positioned_ancestor
-                .as_ref()
-                .is_none_or(|vector| vector.is_empty())
-    }
-
-    pub(crate) fn append(&mut self, other: Self) {
-        if other.is_empty() {
-            return;
-        }
-
-        vec_append_owned(
-            &mut self.for_nearest_containing_block_for_all_descendants,
-            other.for_nearest_containing_block_for_all_descendants,
-        );
-
-        match (
-            self.for_nearest_positioned_ancestor.as_mut(),
-            other.for_nearest_positioned_ancestor,
-        ) {
-            (Some(us), Some(them)) => vec_append_owned(us, them),
-            (None, Some(them)) => {
-                // This is the case where we have laid out the absolute children in a containing
-                // block for absolutes and we then are passing up the fixed-position descendants
-                // to the containing block for all descendants.
-                vec_append_owned(
-                    &mut self.for_nearest_containing_block_for_all_descendants,
-                    them,
-                );
-            },
-            (None, None) => {},
-            _ => unreachable!(),
-        }
-    }
-
-    pub(crate) fn layout_initial_containing_block_children(
-        &mut self,
-        layout_context: &LayoutContext,
-        initial_containing_block: &DefiniteContainingBlock,
-        fragments: &mut Vec<Fragment>,
-    ) {
-        debug_assert!(self.for_nearest_positioned_ancestor.is_none());
-
-        // Loop because it’s possible that we discover (the static position of)
-        // more absolutely-positioned boxes while doing layout for others.
-        while !self
-            .for_nearest_containing_block_for_all_descendants
-            .is_empty()
-        {
-            HoistedAbsolutelyPositionedBox::layout_many(
-                layout_context,
-                &mut mem::take(&mut self.for_nearest_containing_block_for_all_descendants),
-                fragments,
-                &mut self.for_nearest_containing_block_for_all_descendants,
-                initial_containing_block,
-                Default::default(),
-            )
-        }
-    }
-
-    /// Get the length of this [PositioningContext].
-    pub(crate) fn len(&self) -> PositioningContextLength {
-        PositioningContextLength {
-            for_nearest_positioned_ancestor: self
-                .for_nearest_positioned_ancestor
-                .as_ref()
-                .map_or(0, |vec| vec.len()),
-            for_nearest_containing_block_for_all_descendants: self
-                .for_nearest_containing_block_for_all_descendants
-                .len(),
-        }
-    }
-
-    /// Truncate this [PositioningContext] to the given [PositioningContextLength].  This
-    /// is useful for "unhoisting" boxes in this context and returning it to the state at
-    /// the time that [`PositioningContext::len()`] was called.
-    pub(crate) fn truncate(&mut self, length: &PositioningContextLength) {
-        if let Some(vec) = self.for_nearest_positioned_ancestor.as_mut() {
-            vec.truncate(length.for_nearest_positioned_ancestor);
-        }
-        self.for_nearest_containing_block_for_all_descendants
-            .truncate(length.for_nearest_containing_block_for_all_descendants);
-    }
-}
-
-/// A data structure which stores the size of a positioning context.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub(crate) struct PositioningContextLength {
-    /// The number of boxes that will be hoisted the the nearest positioned ancestor for
-    /// layout.
-    for_nearest_positioned_ancestor: usize,
-    /// The number of boxes that will be hoisted the the nearest ancestor which
-    /// establishes a containing block for all descendants for layout.
-    for_nearest_containing_block_for_all_descendants: usize,
-}
-
-impl Zero for PositioningContextLength {
-    fn zero() -> Self {
-        PositioningContextLength {
-            for_nearest_positioned_ancestor: 0,
-            for_nearest_containing_block_for_all_descendants: 0,
-        }
-    }
-
-    fn is_zero(&self) -> bool {
-        self.for_nearest_positioned_ancestor == 0 &&
-            self.for_nearest_containing_block_for_all_descendants == 0
-    }
-}
-
-impl HoistedAbsolutelyPositionedBox {
-    pub(crate) fn layout_many(
-        layout_context: &LayoutContext,
-        boxes: &mut [Self],
-        fragments: &mut Vec<Fragment>,
-        for_nearest_containing_block_for_all_descendants: &mut Vec<HoistedAbsolutelyPositionedBox>,
-        containing_block: &DefiniteContainingBlock,
-        containing_block_padding: PhysicalSides<Au>,
-    ) {
-        if layout_context.use_rayon {
-            let mut new_fragments = Vec::new();
-            let mut new_hoisted_boxes = Vec::new();
-
-            boxes
-                .par_iter_mut()
-                .map(|hoisted_box| {
-                    let mut new_hoisted_boxes: Vec<HoistedAbsolutelyPositionedBox> = Vec::new();
-                    let new_fragment = hoisted_box.layout(
-                        layout_context,
-                        &mut new_hoisted_boxes,
-                        containing_block,
-                        containing_block_padding,
-                    );
-
-                    hoisted_box.fragment.borrow_mut().fragment =
-                        Some(Fragment::Box(new_fragment.clone()));
-                    (Fragment::Box(new_fragment), new_hoisted_boxes)
-                })
-                .unzip_into_vecs(&mut new_fragments, &mut new_hoisted_boxes);
-
-            fragments.extend(new_fragments);
-            for_nearest_containing_block_for_all_descendants
-                .extend(new_hoisted_boxes.into_iter().flatten());
-        } else {
-            fragments.extend(boxes.iter_mut().map(|box_| {
-                let new_fragment = box_.layout(
-                    layout_context,
-                    for_nearest_containing_block_for_all_descendants,
-                    containing_block,
-                    containing_block_padding,
-                );
-
-                box_.fragment.borrow_mut().fragment = Some(Fragment::Box(new_fragment.clone()));
-                Fragment::Box(new_fragment)
-            }))
-        }
-    }
-
-    pub(crate) fn layout(
-        &mut self,
-        layout_context: &LayoutContext,
-        for_nearest_containing_block_for_all_descendants: &mut Vec<HoistedAbsolutelyPositionedBox>,
-        containing_block: &DefiniteContainingBlock,
-        containing_block_padding: PhysicalSides<Au>,
-    ) -> ArcRefCell<BoxFragment> {
-        let cbis = containing_block.size.inline;
-        let cbbs = containing_block.size.block;
-        let containing_block_writing_mode = containing_block.style.writing_mode;
-        let absolutely_positioned_box = self.absolutely_positioned_box.borrow();
-        let context = &absolutely_positioned_box.context;
-        let style = context.style().clone();
-        let layout_style = context.layout_style();
-        let ContentBoxSizesAndPBM {
-            content_box_sizes,
-            pbm,
-            ..
-        } = layout_style.content_box_sizes_and_padding_border_margin(&containing_block.into());
-        let containing_block = &containing_block.into();
-        let is_table = layout_style.is_table();
-        let shared_fragment = self.fragment.borrow();
-
-        // The static position rect was calculated assuming that the containing block would be
-        // established by the content box of some ancestor, but the actual containing block is
-        // established by the padding box. So we need to add the padding of that ancestor.
-        let mut static_position_rect = shared_fragment
-            .static_position_rect
-            .outer_rect(-containing_block_padding);
-        static_position_rect.size = static_position_rect.size.max(PhysicalSize::zero());
-        let static_position_rect = static_position_rect.to_logical(containing_block);
-
-        let box_offset = style.box_offsets(containing_block.style.writing_mode);
-
-        // When the "static-position rect" doesn't come into play, we do not do any alignment
-        // in the inline axis.
-        let inline_box_offsets = box_offset.inline_sides();
-        let inline_alignment = match inline_box_offsets.either_specified() {
-            true => style.clone_justify_self().0.0,
-            false => shared_fragment.resolved_alignment.inline,
-        };
-
-        let mut inline_axis_solver = AbsoluteAxisSolver {
-            axis: Direction::Inline,
-            containing_size: cbis,
-            padding_border_sum: pbm.padding_border_sums.inline,
-            computed_margin_start: pbm.margin.inline_start,
-            computed_margin_end: pbm.margin.inline_end,
-            computed_sizes: content_box_sizes.inline,
-            avoid_negative_margin_start: true,
-            box_offsets: inline_box_offsets,
-            static_position_rect_axis: static_position_rect.get_axis(Direction::Inline),
-            alignment: inline_alignment,
-            flip_anchor: shared_fragment.original_parent_writing_mode.is_bidi_ltr() !=
-                containing_block_writing_mode.is_bidi_ltr(),
-            is_table,
-        };
-
-        // When the "static-position rect" doesn't come into play, we re-resolve "align-self"
-        // against this containing block.
-        let block_box_offsets = box_offset.block_sides();
-        let block_alignment = match block_box_offsets.either_specified() {
-            true => style.clone_align_self().0.0,
-            false => shared_fragment.resolved_alignment.block,
-        };
-        let mut block_axis_solver = AbsoluteAxisSolver {
-            axis: Direction::Block,
-            containing_size: cbbs,
-            padding_border_sum: pbm.padding_border_sums.block,
-            computed_margin_start: pbm.margin.block_start,
-            computed_margin_end: pbm.margin.block_end,
-            computed_sizes: content_box_sizes.block,
-            avoid_negative_margin_start: false,
-            box_offsets: block_box_offsets,
-            static_position_rect_axis: static_position_rect.get_axis(Direction::Block),
-            alignment: block_alignment,
-            flip_anchor: false,
-            is_table,
-        };
-
-        if let IndependentFormattingContextContents::Replaced(replaced) = &context.contents {
-            // https://drafts.csswg.org/css2/visudet.html#abs-replaced-width
-            // https://drafts.csswg.org/css2/visudet.html#abs-replaced-height
-            let inset_sums = LogicalVec2 {
-                inline: inline_axis_solver.inset_sum(),
-                block: block_axis_solver.inset_sum(),
-            };
-            let automatic_size = |alignment: AlignFlags, offsets: &LogicalSides1D<_>| {
-                if alignment.value() == AlignFlags::STRETCH && !offsets.either_auto() {
-                    Size::Stretch
-                } else {
-                    Size::FitContent
-                }
-            };
-            let used_size = replaced.used_size_as_if_inline_element_from_content_box_sizes(
-                containing_block,
-                &style,
-                context.preferred_aspect_ratio(&pbm.padding_border_sums),
-                LogicalVec2 {
-                    inline: &inline_axis_solver.computed_sizes,
-                    block: &block_axis_solver.computed_sizes,
-                },
-                LogicalVec2 {
-                    inline: automatic_size(inline_alignment, &inline_axis_solver.box_offsets),
-                    block: automatic_size(block_alignment, &block_axis_solver.box_offsets),
-                },
-                pbm.padding_border_sums + pbm.margin.auto_is(Au::zero).sum() + inset_sums,
-            );
-            inline_axis_solver.override_size(used_size.inline);
-            block_axis_solver.override_size(used_size.block);
-        }
-
-        // The block axis can depend on layout results, so we only solve it tentatively,
-        // we may have to resolve it properly later on.
-        let mut block_axis = block_axis_solver.solve_tentatively();
-
-        // The inline axis can be fully resolved, computing intrinsic sizes using the
-        // tentative block size.
-        let mut inline_axis = inline_axis_solver.solve(Some(|| {
-            let ratio = context.preferred_aspect_ratio(&pbm.padding_border_sums);
-            let constraint_space = ConstraintSpace::new(block_axis.size, style.writing_mode, ratio);
-            context
-                .inline_content_sizes(layout_context, &constraint_space)
-                .sizes
-        }));
-
-        let mut positioning_context = PositioningContext::new_for_style(&style).unwrap();
-        let mut new_fragment = {
-            let content_size: LogicalVec2<Au>;
-            let fragments;
-            let mut specific_layout_info: Option<SpecificLayoutInfo> = None;
-            match &context.contents {
-                IndependentFormattingContextContents::Replaced(replaced) => {
-                    // https://drafts.csswg.org/css2/visudet.html#abs-replaced-width
-                    // https://drafts.csswg.org/css2/visudet.html#abs-replaced-height
-                    content_size = LogicalVec2 {
-                        inline: inline_axis.size.to_definite().unwrap(),
-                        block: block_axis.size.to_definite().unwrap(),
-                    };
-                    fragments = replaced.make_fragments(
-                        layout_context,
-                        &style,
-                        content_size.to_physical_size(containing_block_writing_mode),
-                    );
-                },
-                IndependentFormattingContextContents::NonReplaced(non_replaced) => {
-                    // https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width
-                    // https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-height
-                    let inline_size = inline_axis.size.to_definite().unwrap();
-                    let containing_block_for_children = ContainingBlock {
-                        size: ContainingBlockSize {
-                            inline: inline_size,
-                            block: block_axis.size,
-                        },
-                        style: &style,
-                    };
-                    // https://drafts.csswg.org/css-writing-modes/#orthogonal-flows
-                    assert_eq!(
-                        containing_block_writing_mode.is_horizontal(),
-                        style.writing_mode.is_horizontal(),
-                        "Mixed horizontal and vertical writing modes are not supported yet"
-                    );
-
-                    let independent_layout = non_replaced.layout(
-                        layout_context,
-                        &mut positioning_context,
-                        &containing_block_for_children,
-                        containing_block,
-                        false, /* depends_on_block_constraints */
-                    );
-
-                    let inline_size = if let Some(inline_size) =
-                        independent_layout.content_inline_size_for_table
-                    {
-                        // Tables can become narrower than predicted due to collapsed columns,
-                        // so we need to solve again to update margins.
-                        inline_axis_solver.override_size(inline_size);
-                        inline_axis = inline_axis_solver.solve_tentatively();
-                        inline_size
-                    } else {
-                        inline_size
-                    };
-
-                    // Now we can properly solve the block size.
-                    block_axis = block_axis_solver
-                        .solve(Some(|| independent_layout.content_block_size.into()));
-                    let block_size = block_axis.size.to_definite().unwrap();
-
-                    content_size = LogicalVec2 {
-                        inline: inline_size,
-                        block: block_size,
-                    };
-                    fragments = independent_layout.fragments;
-                    specific_layout_info = independent_layout.specific_layout_info;
-                },
-            };
-
-            let margin = LogicalSides {
-                inline_start: inline_axis.margin_start,
-                inline_end: inline_axis.margin_end,
-                block_start: block_axis.margin_start,
-                block_end: block_axis.margin_end,
-            };
-
-            let pb = pbm.padding + pbm.border;
-            let margin_rect_size = content_size + pbm.padding_border_sums + margin.sum();
-            let inline_origin = inline_axis_solver.origin_for_margin_box(
-                margin_rect_size.inline,
-                style.writing_mode,
-                shared_fragment.original_parent_writing_mode,
-                containing_block_writing_mode,
-            );
-            let block_origin = block_axis_solver.origin_for_margin_box(
-                margin_rect_size.block,
-                style.writing_mode,
-                shared_fragment.original_parent_writing_mode,
-                containing_block_writing_mode,
-            );
-
-            let content_rect = LogicalRect {
-                start_corner: LogicalVec2 {
-                    inline: inline_origin + margin.inline_start + pb.inline_start,
-                    block: block_origin + margin.block_start + pb.block_start,
-                },
-                size: content_size,
-            };
-            BoxFragment::new(
-                context.base_fragment_info(),
-                style,
-                fragments,
-                content_rect.as_physical(Some(containing_block)),
-                pbm.padding.to_physical(containing_block_writing_mode),
-                pbm.border.to_physical(containing_block_writing_mode),
-                margin.to_physical(containing_block_writing_mode),
-                None, /* clearance */
-                // We do not set the baseline offset, because absolutely positioned
-                // elements are not inflow.
-                CollapsedBlockMargins::zero(),
-            )
-            .with_specific_layout_info(specific_layout_info)
-        };
-        positioning_context.layout_collected_children(layout_context, &mut new_fragment);
-
-        // Any hoisted boxes that remain in this positioning context are going to be hoisted
-        // up above this absolutely positioned box. These will necessarily be fixed position
-        // elements, because absolutely positioned elements form containing blocks for all
-        // other elements. If any of them have a static start position though, we need to
-        // adjust it to account for the start corner of this absolute.
-        positioning_context.adjust_static_position_of_hoisted_fragments_with_offset(
-            &new_fragment.content_rect.origin.to_vector(),
-            PositioningContextLength::zero(),
-        );
-
-        for_nearest_containing_block_for_all_descendants
-            .extend(positioning_context.for_nearest_containing_block_for_all_descendants);
-
-        ArcRefCell::new(new_fragment)
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-struct RectAxis {
-    origin: Au,
-    length: Au,
-}
-
-impl LogicalRect<Au> {
-    fn get_axis(&self, axis: Direction) -> RectAxis {
-        match axis {
-            Direction::Block => RectAxis {
-                origin: self.start_corner.block,
-                length: self.size.block,
-            },
-            Direction::Inline => RectAxis {
-                origin: self.start_corner.inline,
-                length: self.size.inline,
-            },
-        }
-    }
-}
-
-struct AxisResult {
-    size: SizeConstraint,
-    margin_start: Au,
-    margin_end: Au,
-}
-
-struct AbsoluteAxisSolver<'a> {
-    axis: Direction,
-    containing_size: Au,
-    padding_border_sum: Au,
-    computed_margin_start: AuOrAuto,
-    computed_margin_end: AuOrAuto,
-    computed_sizes: Sizes,
-    avoid_negative_margin_start: bool,
-    box_offsets: LogicalSides1D<LengthPercentageOrAuto<'a>>,
-    static_position_rect_axis: RectAxis,
-    alignment: AlignFlags,
-    flip_anchor: bool,
-    is_table: bool,
-}
-
-impl AbsoluteAxisSolver<'_> {
-    /// Returns the amount that we need to subtract from the containing block size in order to
-    /// obtain the inset-modified containing block that we will use for sizing purposes.
-    /// (Note that for alignment purposes, we may re-resolve auto insets to a different value.)
-    /// <https://drafts.csswg.org/css-position/#resolving-insets>
-    fn inset_sum(&self) -> Au {
-        match (
-            self.box_offsets.start.non_auto(),
-            self.box_offsets.end.non_auto(),
-        ) {
-            (None, None) => {
-                if self.flip_anchor {
-                    self.containing_size -
-                        self.static_position_rect_axis.origin -
-                        self.static_position_rect_axis.length
-                } else {
-                    self.static_position_rect_axis.origin
-                }
-            },
-            (Some(start), None) => start.to_used_value(self.containing_size),
-            (None, Some(end)) => end.to_used_value(self.containing_size),
-            (Some(start), Some(end)) => {
-                start.to_used_value(self.containing_size) + end.to_used_value(self.containing_size)
-            },
-        }
-    }
-
-    /// This unifies some of the parts in common in:
-    ///
-    /// * <https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width>
-    /// * <https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-height>
-    ///
-    /// … and:
-    ///
-    /// * <https://drafts.csswg.org/css2/visudet.html#abs-replaced-width>
-    /// * <https://drafts.csswg.org/css2/visudet.html#abs-replaced-height>
-    ///
-    /// In the replaced case, `size` is never `Auto`.
-    fn solve(&self, get_content_size: Option<impl FnOnce() -> ContentSizes>) -> AxisResult {
-        let solve_size = |initial_behavior, stretch_size: Au| -> SizeConstraint {
-            let stretch_size = stretch_size.max(Au::zero());
-            if let Some(get_content_size) = get_content_size {
-                SizeConstraint::Definite(self.computed_sizes.resolve(
-                    self.axis,
-                    initial_behavior,
-                    Au::zero,
-                    Some(stretch_size),
-                    get_content_size,
-                    self.is_table,
-                ))
-            } else {
-                self.computed_sizes.resolve_extrinsic(
-                    initial_behavior,
-                    Au::zero(),
-                    Some(stretch_size),
-                )
-            }
-        };
-        if self.box_offsets.either_auto() {
-            let margin_start = self.computed_margin_start.auto_is(Au::zero);
-            let margin_end = self.computed_margin_end.auto_is(Au::zero);
-            let stretch_size = self.containing_size -
-                self.inset_sum() -
-                self.padding_border_sum -
-                margin_start -
-                margin_end;
-            let size = solve_size(Size::FitContent, stretch_size);
-            AxisResult {
-                size,
-                margin_start,
-                margin_end,
-            }
-        } else {
-            let mut free_space = self.containing_size - self.inset_sum() - self.padding_border_sum;
-            let stretch_size = free_space -
-                self.computed_margin_start.auto_is(Au::zero) -
-                self.computed_margin_end.auto_is(Au::zero);
-            let initial_behavior = match self.alignment.value() {
-                AlignFlags::NORMAL | AlignFlags::AUTO if !self.is_table => Size::Stretch,
-                AlignFlags::STRETCH => Size::Stretch,
-                _ => Size::FitContent,
-            };
-            let size = solve_size(initial_behavior, stretch_size);
-            if let Some(used_size) = size.to_definite() {
-                free_space -= used_size;
-            } else {
-                free_space = Au::zero();
-            }
-            let (margin_start, margin_end) =
-                match (self.computed_margin_start, self.computed_margin_end) {
-                    (AuOrAuto::Auto, AuOrAuto::Auto) => {
-                        if self.avoid_negative_margin_start && free_space < Au::zero() {
-                            (Au::zero(), free_space)
-                        } else {
-                            let margin_start = free_space / 2;
-                            (margin_start, free_space - margin_start)
-                        }
-                    },
-                    (AuOrAuto::Auto, AuOrAuto::LengthPercentage(end)) => (free_space - end, end),
-                    (AuOrAuto::LengthPercentage(start), AuOrAuto::Auto) => {
-                        (start, free_space - start)
-                    },
-                    (AuOrAuto::LengthPercentage(start), AuOrAuto::LengthPercentage(end)) => {
-                        (start, end)
-                    },
-                };
-            AxisResult {
-                size,
-                margin_start,
-                margin_end,
-            }
-        }
-    }
-
-    fn solve_tentatively(&mut self) -> AxisResult {
-        self.solve(None::<fn() -> ContentSizes>)
-    }
-
-    fn override_size(&mut self, size: Au) {
-        self.computed_sizes.preferred = Size::Numeric(size);
-        self.computed_sizes.min = Size::default();
-        self.computed_sizes.max = Size::default();
-    }
-
-    fn origin_for_margin_box(
-        &self,
-        size: Au,
-        self_writing_mode: WritingMode,
-        original_parent_writing_mode: WritingMode,
-        containing_block_writing_mode: WritingMode,
-    ) -> Au {
-        let (alignment_container, alignment_container_writing_mode, flip_anchor, offsets) = match (
-            self.box_offsets.start.non_auto(),
-            self.box_offsets.end.non_auto(),
-        ) {
-            (None, None) => (
-                self.static_position_rect_axis,
-                original_parent_writing_mode,
-                self.flip_anchor,
-                None,
-            ),
-            (Some(start), Some(end)) => {
-                let offsets = LogicalSides1D {
-                    start: start.to_used_value(self.containing_size),
-                    end: end.to_used_value(self.containing_size),
-                };
-                let alignment_container = RectAxis {
-                    origin: offsets.start,
-                    length: self.containing_size - offsets.sum(),
-                };
-                (
-                    alignment_container,
-                    containing_block_writing_mode,
-                    false,
-                    Some(offsets),
-                )
-            },
-            // If a single offset is auto, for alignment purposes it resolves to the amount
-            // that makes the inset-modified containing block be exactly as big as the abspos.
-            // Therefore the free space is zero and the alignment value is irrelevant.
-            (Some(start), None) => return start.to_used_value(self.containing_size),
-            (None, Some(end)) => {
-                return self.containing_size - size - end.to_used_value(self.containing_size);
-            },
-        };
-
-        assert_eq!(
-            self_writing_mode.is_horizontal(),
-            original_parent_writing_mode.is_horizontal(),
-            "Mixed horizontal and vertical writing modes are not supported yet"
-        );
-        assert_eq!(
-            self_writing_mode.is_horizontal(),
-            containing_block_writing_mode.is_horizontal(),
-            "Mixed horizontal and vertical writing modes are not supported yet"
-        );
-        let self_value_matches_container = || {
-            self.axis == Direction::Block ||
-                self_writing_mode.is_bidi_ltr() == alignment_container_writing_mode.is_bidi_ltr()
-        };
-
-        // Here we resolve the alignment to either start, center, or end.
-        // Note we need to handle both self-alignment values (when some inset isn't auto)
-        // and distributed alignment values (when both insets are auto).
-        // The latter are treated as their fallback alignment.
-        let alignment = match self.alignment.value() {
-            // https://drafts.csswg.org/css-align/#valdef-self-position-center
-            // https://drafts.csswg.org/css-align/#valdef-align-content-space-around
-            // https://drafts.csswg.org/css-align/#valdef-align-content-space-evenly
-            AlignFlags::CENTER | AlignFlags::SPACE_AROUND | AlignFlags::SPACE_EVENLY => {
-                AlignFlags::CENTER
-            },
-            // https://drafts.csswg.org/css-align/#valdef-self-position-self-start
-            AlignFlags::SELF_START if self_value_matches_container() => AlignFlags::START,
-            AlignFlags::SELF_START => AlignFlags::END,
-            // https://drafts.csswg.org/css-align/#valdef-self-position-self-end
-            AlignFlags::SELF_END if self_value_matches_container() => AlignFlags::END,
-            AlignFlags::SELF_END => AlignFlags::START,
-            // https://drafts.csswg.org/css-align/#valdef-justify-content-left
-            AlignFlags::LEFT if alignment_container_writing_mode.is_bidi_ltr() => AlignFlags::START,
-            AlignFlags::LEFT => AlignFlags::END,
-            // https://drafts.csswg.org/css-align/#valdef-justify-content-right
-            AlignFlags::RIGHT if alignment_container_writing_mode.is_bidi_ltr() => AlignFlags::END,
-            AlignFlags::RIGHT => AlignFlags::START,
-            // https://drafts.csswg.org/css-align/#valdef-self-position-end
-            // https://drafts.csswg.org/css-align/#valdef-self-position-flex-end
-            AlignFlags::END | AlignFlags::FLEX_END => AlignFlags::END,
-            // https://drafts.csswg.org/css-align/#valdef-self-position-start
-            // https://drafts.csswg.org/css-align/#valdef-self-position-flex-start
-            _ => AlignFlags::START,
-        };
-
-        let alignment = match alignment {
-            AlignFlags::START if flip_anchor => AlignFlags::END,
-            AlignFlags::END if flip_anchor => AlignFlags::START,
-            alignment => alignment,
-        };
-
-        let free_space = alignment_container.length - size;
-        let flags = self.alignment.flags();
-        let alignment = if flags == AlignFlags::SAFE && free_space < Au::zero() {
-            AlignFlags::START
-        } else {
-            alignment
-        };
-
-        let origin = match alignment {
-            AlignFlags::START => alignment_container.origin,
-            AlignFlags::CENTER => alignment_container.origin + free_space / 2,
-            AlignFlags::END => alignment_container.origin + free_space,
-            _ => unreachable!(),
-        };
-        if matches!(flags, AlignFlags::SAFE | AlignFlags::UNSAFE) ||
-            matches!(
-                self.alignment,
-                AlignFlags::NORMAL | AlignFlags::AUTO | AlignFlags::STRETCH
-            )
-        {
-            return origin;
-        }
-        let Some(offsets) = offsets else {
-            return origin;
-        };
-
-        // Handle default overflow alignment.
-        // https://drafts.csswg.org/css-align/#auto-safety-position
-        let min = Au::zero().min(offsets.start);
-        let max = self.containing_size - Au::zero().min(offsets.end) - size;
-        origin.clamp_between_extremums(min, Some(max))
-    }
-}
-
-fn vec_append_owned<T>(a: &mut Vec<T>, mut b: Vec<T>) {
-    if a.is_empty() {
-        *a = b
-    } else {
-        a.append(&mut b)
-    }
-}
-
-/// <https://drafts.csswg.org/css2/visuren.html#relative-positioning>
-pub(crate) fn relative_adjustement(
-    style: &ComputedValues,
-    containing_block: &ContainingBlock,
-) -> LogicalVec2<Au> {
-    // It's not completely clear what to do with indefinite percentages
-    // (https://github.com/w3c/csswg-drafts/issues/9353), so we match
-    // other browsers and treat them as 'auto' offsets.
-    let cbis = containing_block.size.inline;
-    let cbbs = containing_block.size.block;
-    let box_offsets = style
-        .box_offsets(containing_block.style.writing_mode)
-        .map_inline_and_block_axes(
-            |value| value.map(|value| value.to_used_value(cbis)),
-            |value| match cbbs {
-                SizeConstraint::Definite(cbbs) => value.map(|value| value.to_used_value(cbbs)),
-                _ => match value.non_auto().and_then(|value| value.to_length()) {
-                    Some(value) => AuOrAuto::LengthPercentage(value.into()),
-                    None => AuOrAuto::Auto,
-                },
-            },
-        );
-    fn adjust(start: AuOrAuto, end: AuOrAuto) -> Au {
-        match (start, end) {
-            (AuOrAuto::Auto, AuOrAuto::Auto) => Au::zero(),
-            (AuOrAuto::Auto, AuOrAuto::LengthPercentage(end)) => -end,
-            (AuOrAuto::LengthPercentage(start), _) => start,
-        }
-    }
-    LogicalVec2 {
-        inline: adjust(box_offsets.inline_start, box_offsets.inline_end),
-        block: adjust(box_offsets.block_start, box_offsets.block_end),
-    }
-}
diff --git a/components/layout_2020/query.rs b/components/layout_2020/query.rs
deleted file mode 100644
index 7c67641792e..00000000000
--- a/components/layout_2020/query.rs
+++ /dev/null
@@ -1,1146 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-//! Utilities for querying the layout, as needed by layout.
-use std::sync::Arc;
-
-use app_units::Au;
-use euclid::default::{Point2D, Rect};
-use euclid::{SideOffsets2D, Size2D, Vector2D};
-use itertools::Itertools;
-use script_layout_interface::wrapper_traits::{
-    LayoutNode, ThreadSafeLayoutElement, ThreadSafeLayoutNode,
-};
-use script_layout_interface::{LayoutElementType, LayoutNodeType, OffsetParentResponse};
-use servo_arc::Arc as ServoArc;
-use servo_url::ServoUrl;
-use style::computed_values::display::T as Display;
-use style::computed_values::position::T as Position;
-use style::computed_values::visibility::T as Visibility;
-use style::computed_values::white_space_collapse::T as WhiteSpaceCollapseValue;
-use style::context::{QuirksMode, SharedStyleContext, StyleContext, ThreadLocalStyleContext};
-use style::dom::{OpaqueNode, TElement};
-use style::properties::style_structs::Font;
-use style::properties::{
-    ComputedValues, Importance, LonghandId, PropertyDeclarationBlock, PropertyDeclarationId,
-    PropertyId, ShorthandId, SourcePropertyDeclaration, parse_one_declaration_into,
-};
-use style::selector_parser::PseudoElement;
-use style::shared_lock::SharedRwLock;
-use style::stylesheets::{CssRuleType, Origin, UrlExtraData};
-use style::stylist::RuleInclusion;
-use style::traversal::resolve_style;
-use style::values::computed::Float;
-use style::values::generics::font::LineHeight;
-use style::values::specified::GenericGridTemplateComponent;
-use style::values::specified::box_::DisplayInside;
-use style_traits::{ParsingMode, ToCss};
-
-use crate::flow::inline::construct::{TextTransformation, WhitespaceCollapse};
-use crate::fragment_tree::{
-    BoxFragment, Fragment, FragmentFlags, FragmentTree, SpecificLayoutInfo, Tag,
-};
-use crate::geom::{PhysicalRect, PhysicalVec};
-use crate::taffy::SpecificTaffyGridInfo;
-
-pub fn process_content_box_request(
-    requested_node: OpaqueNode,
-    fragment_tree: Option<Arc<FragmentTree>>,
-) -> Option<Rect<Au>> {
-    let rects = fragment_tree?.get_content_boxes_for_node(requested_node);
-    if rects.is_empty() {
-        return None;
-    }
-
-    Some(
-        rects
-            .iter()
-            .fold(Rect::zero(), |unioned_rect, rect| rect.union(&unioned_rect)),
-    )
-}
-
-pub fn process_content_boxes_request(
-    requested_node: OpaqueNode,
-    fragment_tree: Option<Arc<FragmentTree>>,
-) -> Vec<Rect<Au>> {
-    fragment_tree
-        .map(|tree| tree.get_content_boxes_for_node(requested_node))
-        .unwrap_or_default()
-}
-
-pub fn process_node_geometry_request(
-    requested_node: OpaqueNode,
-    fragment_tree: Option<Arc<FragmentTree>>,
-) -> Rect<i32> {
-    if let Some(fragment_tree) = fragment_tree {
-        fragment_tree.get_border_dimensions_for_node(requested_node)
-    } else {
-        Rect::zero()
-    }
-}
-
-/// <https://drafts.csswg.org/cssom-view/#scrolling-area>
-pub fn process_node_scroll_area_request(
-    requested_node: Option<OpaqueNode>,
-    fragment_tree: Option<Arc<FragmentTree>>,
-) -> Rect<i32> {
-    let rect = match (fragment_tree, requested_node) {
-        (Some(tree), Some(node)) => tree.get_scrolling_area_for_node(node),
-        (Some(tree), None) => tree.get_scrolling_area_for_viewport(),
-        _ => return Rect::zero(),
-    };
-
-    Rect::new(
-        Point2D::new(rect.origin.x.to_f32_px(), rect.origin.y.to_f32_px()),
-        Size2D::new(rect.size.width.to_f32_px(), rect.size.height.to_f32_px()),
-    )
-    .round()
-    .to_i32()
-    .to_untyped()
-}
-
-/// Return the resolved value of property for a given (pseudo)element.
-/// <https://drafts.csswg.org/cssom/#resolved-value>
-pub fn process_resolved_style_request<'dom>(
-    context: &SharedStyleContext,
-    node: impl LayoutNode<'dom>,
-    pseudo: &Option<PseudoElement>,
-    property: &PropertyId,
-    fragment_tree: Option<Arc<FragmentTree>>,
-) -> String {
-    if !node.as_element().unwrap().has_data() {
-        return process_resolved_style_request_for_unstyled_node(context, node, pseudo, property);
-    }
-
-    // We call process_resolved_style_request after performing a whole-document
-    // traversal, so in the common case, the element is styled.
-    let layout_element = node.to_threadsafe().as_element().unwrap();
-    let layout_element = pseudo.map_or_else(
-        || Some(layout_element),
-        |pseudo_element| layout_element.get_pseudo(pseudo_element),
-    );
-
-    let layout_element = match layout_element {
-        None => {
-            // The pseudo doesn't exist, return nothing.  Chrome seems to query
-            // the element itself in this case, Firefox uses the resolved value.
-            // https://www.w3.org/Bugs/Public/show_bug.cgi?id=29006
-            return String::new();
-        },
-        Some(layout_element) => layout_element,
-    };
-
-    let style = &*layout_element.resolved_style();
-    let longhand_id = match *property {
-        PropertyId::NonCustom(id) => match id.longhand_or_shorthand() {
-            Ok(longhand_id) => longhand_id,
-            Err(shorthand_id) => return shorthand_to_css_string(shorthand_id, style),
-        },
-        PropertyId::Custom(ref name) => {
-            return style.computed_value_to_string(PropertyDeclarationId::Custom(name));
-        },
-    }
-    .to_physical(style.writing_mode);
-
-    let computed_style =
-        || style.computed_value_to_string(PropertyDeclarationId::Longhand(longhand_id));
-
-    let tag_to_find = Tag::new_pseudo(node.opaque(), *pseudo);
-
-    // https://drafts.csswg.org/cssom/#dom-window-getcomputedstyle
-    // Here we are trying to conform to the specification that says that getComputedStyle
-    // should return the used values in certain circumstances. For size and positional
-    // properties we might need to walk the Fragment tree to figure those out. We always
-    // fall back to returning the computed value.
-
-    // For line height, the resolved value is the computed value if it
-    // is "normal" and the used value otherwise.
-    if longhand_id == LonghandId::LineHeight {
-        let font = style.get_font();
-        let font_size = font.font_size.computed_size();
-        return match font.line_height {
-            LineHeight::Normal => computed_style(),
-            LineHeight::Number(value) => (font_size * value.0).to_css_string(),
-            LineHeight::Length(value) => value.0.to_css_string(),
-        };
-    }
-
-    // https://drafts.csswg.org/cssom/#dom-window-getcomputedstyle
-    // The properties that we calculate below all resolve to the computed value
-    // when the element is display:none or display:contents.
-    let display = style.get_box().display;
-    if display.is_none() || display.is_contents() {
-        return computed_style();
-    }
-
-    let fragment_tree = match fragment_tree {
-        Some(fragment_tree) => fragment_tree,
-        None => return computed_style(),
-    };
-    fragment_tree
-        .find(|fragment, _, containing_block| {
-            if Some(tag_to_find) != fragment.tag() {
-                return None;
-            }
-
-            let (content_rect, margins, padding, specific_layout_info) = match fragment {
-                Fragment::Box(box_fragment) | Fragment::Float(box_fragment) => {
-                    let box_fragment = box_fragment.borrow();
-                    if style.get_box().position != Position::Static {
-                        let resolved_insets = || {
-                            box_fragment.calculate_resolved_insets_if_positioned(containing_block)
-                        };
-                        match longhand_id {
-                            LonghandId::Top => return Some(resolved_insets().top.to_css_string()),
-                            LonghandId::Right => {
-                                return Some(resolved_insets().right.to_css_string());
-                            },
-                            LonghandId::Bottom => {
-                                return Some(resolved_insets().bottom.to_css_string());
-                            },
-                            LonghandId::Left => {
-                                return Some(resolved_insets().left.to_css_string());
-                            },
-                            _ => {},
-                        }
-                    }
-                    let content_rect = box_fragment.content_rect;
-                    let margins = box_fragment.margin;
-                    let padding = box_fragment.padding;
-                    let specific_layout_info = box_fragment.specific_layout_info.clone();
-                    (content_rect, margins, padding, specific_layout_info)
-                },
-                Fragment::Positioning(positioning_fragment) => {
-                    let content_rect = positioning_fragment.borrow().rect;
-                    (
-                        content_rect,
-                        SideOffsets2D::zero(),
-                        SideOffsets2D::zero(),
-                        None,
-                    )
-                },
-                _ => return None,
-            };
-
-            // https://drafts.csswg.org/css-grid/#resolved-track-list
-            // > The grid-template-rows and grid-template-columns properties are
-            // > resolved value special case properties.
-            //
-            // > When an element generates a grid container box...
-            if display.inside() == DisplayInside::Grid {
-                if let Some(SpecificLayoutInfo::Grid(info)) = specific_layout_info {
-                    if let Some(value) = resolve_grid_template(&info, style, longhand_id) {
-                        return Some(value);
-                    }
-                }
-            }
-
-            // https://drafts.csswg.org/cssom/#resolved-value-special-case-property-like-height
-            // > If the property applies to the element or pseudo-element and the resolved value of the
-            // > display property is not none or contents, then the resolved value is the used value.
-            // > Otherwise the resolved value is the computed value.
-            //
-            // However, all browsers ignore that for margin and padding properties, and resolve to a length
-            // even if the property doesn't apply: https://github.com/w3c/csswg-drafts/issues/10391
-            match longhand_id {
-                LonghandId::Width if resolved_size_should_be_used_value(fragment) => {
-                    Some(content_rect.size.width)
-                },
-                LonghandId::Height if resolved_size_should_be_used_value(fragment) => {
-                    Some(content_rect.size.height)
-                },
-                LonghandId::MarginBottom => Some(margins.bottom),
-                LonghandId::MarginTop => Some(margins.top),
-                LonghandId::MarginLeft => Some(margins.left),
-                LonghandId::MarginRight => Some(margins.right),
-                LonghandId::PaddingBottom => Some(padding.bottom),
-                LonghandId::PaddingTop => Some(padding.top),
-                LonghandId::PaddingLeft => Some(padding.left),
-                LonghandId::PaddingRight => Some(padding.right),
-                _ => None,
-            }
-            .map(|value| value.to_css_string())
-        })
-        .unwrap_or_else(computed_style)
-}
-
-fn resolved_size_should_be_used_value(fragment: &Fragment) -> bool {
-    // https://drafts.csswg.org/css-sizing-3/#preferred-size-properties
-    // > Applies to: all elements except non-replaced inlines
-    match fragment {
-        Fragment::Box(box_fragment) => !box_fragment.borrow().is_inline_box(),
-        Fragment::Float(_) |
-        Fragment::Positioning(_) |
-        Fragment::AbsoluteOrFixedPositioned(_) |
-        Fragment::Image(_) |
-        Fragment::IFrame(_) => true,
-        Fragment::Text(_) => false,
-    }
-}
-
-fn resolve_grid_template(
-    grid_info: &SpecificTaffyGridInfo,
-    style: &ComputedValues,
-    longhand_id: LonghandId,
-) -> Option<String> {
-    // https://drafts.csswg.org/css-grid/#resolved-track-list-standalone
-    fn serialize_standalone_non_subgrid_track_list(track_sizes: &[Au]) -> Option<String> {
-        match track_sizes.is_empty() {
-            // Standalone non subgrid grids with empty track lists should compute to `none`.
-            // As of current standard, this behaviour should only invoked by `none` computed value,
-            // therefore we can fallback into computed value resolving.
-            true => None,
-            // <https://drafts.csswg.org/css-grid/#resolved-track-list-standalone>
-            // > - Every track listed individually, whether implicitly or explicitly created,
-            //     without using the repeat() notation.
-            // > - Every track size given as a length in pixels, regardless of sizing function.
-            // > - Adjacent line names collapsed into a single bracketed set.
-            // TODO: implement line names
-            false => Some(
-                track_sizes
-                    .iter()
-                    .map(|size| size.to_css_string())
-                    .join(" "),
-            ),
-        }
-    }
-
-    let (track_info, computed_value) = match longhand_id {
-        LonghandId::GridTemplateRows => (&grid_info.rows, &style.get_position().grid_template_rows),
-        LonghandId::GridTemplateColumns => (
-            &grid_info.columns,
-            &style.get_position().grid_template_columns,
-        ),
-        _ => return None,
-    };
-
-    match computed_value {
-        // <https://drafts.csswg.org/css-grid/#resolved-track-list-standalone>
-        // > When an element generates a grid container box, the resolved value of its grid-template-rows or
-        // > grid-template-columns property in a standalone axis is the used value, serialized with:
-        GenericGridTemplateComponent::None |
-        GenericGridTemplateComponent::TrackList(_) |
-        GenericGridTemplateComponent::Masonry => {
-            serialize_standalone_non_subgrid_track_list(&track_info.sizes)
-        },
-
-        // <https://drafts.csswg.org/css-grid/#resolved-track-list-subgrid>
-        // > When an element generates a grid container box that is a subgrid, the resolved value of the
-        // > grid-template-rows and grid-template-columns properties represents the used number of columns,
-        // > serialized as the subgrid keyword followed by a list representing each of its lines as a
-        // > line name set of all the line’s names explicitly defined on the subgrid (not including those
-        // > adopted from the parent grid), without using the repeat() notation.
-        // TODO: implement subgrid
-        GenericGridTemplateComponent::Subgrid(_) => None,
-    }
-}
-
-pub fn process_resolved_style_request_for_unstyled_node<'dom>(
-    context: &SharedStyleContext,
-    node: impl LayoutNode<'dom>,
-    pseudo: &Option<PseudoElement>,
-    property: &PropertyId,
-) -> String {
-    // In a display: none subtree. No pseudo-element exists.
-    if pseudo.is_some() {
-        return String::new();
-    }
-
-    let mut tlc = ThreadLocalStyleContext::new();
-    let mut context = StyleContext {
-        shared: context,
-        thread_local: &mut tlc,
-    };
-
-    let element = node.as_element().unwrap();
-    let styles = resolve_style(
-        &mut context,
-        element,
-        RuleInclusion::All,
-        pseudo.as_ref(),
-        None,
-    );
-    let style = styles.primary();
-    let longhand_id = match *property {
-        PropertyId::NonCustom(id) => match id.longhand_or_shorthand() {
-            Ok(longhand_id) => longhand_id,
-            Err(shorthand_id) => return shorthand_to_css_string(shorthand_id, style),
-        },
-        PropertyId::Custom(ref name) => {
-            return style.computed_value_to_string(PropertyDeclarationId::Custom(name));
-        },
-    };
-
-    // No need to care about used values here, since we're on a display: none
-    // subtree, use the resolved value.
-    style.computed_value_to_string(PropertyDeclarationId::Longhand(longhand_id))
-}
-
-fn shorthand_to_css_string(
-    id: style::properties::ShorthandId,
-    style: &style::properties::ComputedValues,
-) -> String {
-    use style::values::resolved::Context;
-    let mut block = PropertyDeclarationBlock::new();
-    let mut dest = String::new();
-    for longhand in id.longhands() {
-        block.push(
-            style.computed_or_resolved_declaration(longhand, Some(&Context { style })),
-            Importance::Normal,
-        );
-    }
-    match block.shorthand_to_css(id, &mut dest) {
-        Ok(_) => dest.to_owned(),
-        Err(_) => String::new(),
-    }
-}
-
-pub fn process_offset_parent_query(
-    node: OpaqueNode,
-    fragment_tree: Option<Arc<FragmentTree>>,
-) -> OffsetParentResponse {
-    process_offset_parent_query_inner(node, fragment_tree).unwrap_or_default()
-}
-
-#[inline]
-fn process_offset_parent_query_inner(
-    node: OpaqueNode,
-    fragment_tree: Option<Arc<FragmentTree>>,
-) -> Option<OffsetParentResponse> {
-    let fragment_tree = fragment_tree?;
-
-    struct NodeOffsetBoxInfo {
-        border_box: Rect<Au>,
-        offset_parent_node_address: Option<OpaqueNode>,
-        is_static_body_element: bool,
-    }
-
-    // https://www.w3.org/TR/2016/WD-cssom-view-1-20160317/#extensions-to-the-htmlelement-interface
-    let mut parent_node_addresses: Vec<Option<(OpaqueNode, bool)>> = Vec::new();
-    let tag_to_find = Tag::new(node);
-    let node_offset_box = fragment_tree.find(|fragment, level, containing_block| {
-        let base = fragment.base()?;
-        let is_body_element = base
-            .flags
-            .contains(FragmentFlags::IS_BODY_ELEMENT_OF_HTML_ELEMENT_ROOT);
-
-        if fragment.tag() == Some(tag_to_find) {
-            // Only consider the first fragment of the node found as per a
-            // possible interpretation of the specification: "[...] return the
-            // y-coordinate of the top border edge of the first CSS layout box
-            // associated with the element [...]"
-            //
-            // FIXME: Browsers implement this all differently (e.g., [1]) -
-            // Firefox does returns the union of all layout elements of some
-            // sort. Chrome returns the first fragment for a block element (the
-            // same as ours) or the union of all associated fragments in the
-            // first containing block fragment for an inline element. We could
-            // implement Chrome's behavior, but our fragment tree currently
-            // provides insufficient information.
-            //
-            // [1]: https://github.com/w3c/csswg-drafts/issues/4541
-            let fragment_relative_rect = match fragment {
-                Fragment::Box(fragment) | Fragment::Float(fragment) => fragment.borrow().border_rect(),
-                Fragment::Text(fragment) => fragment.borrow().rect,
-                Fragment::Positioning(fragment) => fragment.borrow().rect,
-                Fragment::AbsoluteOrFixedPositioned(_) |
-                Fragment::Image(_) |
-                Fragment::IFrame(_) => unreachable!(),
-            };
-
-            let mut border_box = fragment_relative_rect.translate(containing_block.origin.to_vector()).to_untyped();
-
-            // "If any of the following holds true return null and terminate
-            // this algorithm: [...] The element’s computed value of the
-            // `position` property is `fixed`."
-            let is_fixed = matches!(
-                fragment, Fragment::Box(fragment) if fragment.borrow().style.get_box().position == Position::Fixed
-            );
-
-            if is_body_element {
-                // "If the element is the HTML body element or [...] return zero
-                // and terminate this algorithm."
-                border_box.origin = Point2D::zero();
-            }
-
-            let offset_parent_node = if is_fixed {
-                None
-            } else {
-                // Find the nearest ancestor element eligible as `offsetParent`.
-                parent_node_addresses[..level]
-                    .iter()
-                    .rev()
-                    .cloned()
-                    .find_map(std::convert::identity)
-            };
-
-            Some(NodeOffsetBoxInfo {
-                border_box,
-                offset_parent_node_address: offset_parent_node.map(|node| node.0),
-                is_static_body_element: offset_parent_node.is_some_and(|node| node.1),
-            })
-        } else {
-            // Record the paths of the nodes being traversed.
-            let parent_node_address = match fragment {
-                Fragment::Box(fragment) | Fragment::Float(fragment) => {
-                    let fragment = &*fragment.borrow();
-                    let is_eligible_parent = is_eligible_parent(fragment);
-                    let is_static_body_element = is_body_element &&
-                        fragment.style.get_box().position == Position::Static;
-                    match base.tag {
-                        Some(tag) if is_eligible_parent && !tag.is_pseudo() => {
-                            Some((tag.node, is_static_body_element))
-                        },
-                        _ => None,
-                    }
-                },
-                Fragment::AbsoluteOrFixedPositioned(_) |
-                Fragment::IFrame(_) |
-                Fragment::Image(_) |
-                Fragment::Positioning(_) |
-                Fragment::Text(_) => None,
-            };
-
-            while parent_node_addresses.len() <= level {
-                parent_node_addresses.push(None);
-            }
-            parent_node_addresses[level] = parent_node_address;
-            None
-        }
-    });
-
-    // Bail out if the element doesn't have an associated fragment.
-    // "If any of the following holds true return null and terminate this
-    // algorithm: [...] The element does not have an associated CSS layout box."
-    // (`offsetParent`) "If the element is the HTML body element [...] return
-    // zero and terminate this algorithm." (others)
-    let node_offset_box = node_offset_box?;
-
-    let offset_parent_padding_box_corner = if let Some(offset_parent_node_address) =
-        node_offset_box.offset_parent_node_address
-    {
-        // The spec (https://www.w3.org/TR/cssom-view-1/#extensions-to-the-htmlelement-interface)
-        // says that offsetTop/offsetLeft are always relative to the padding box of the offsetParent.
-        // However, in practice this is not true in major browsers in the case that the offsetParent is the body
-        // element and the body element is position:static. In that case offsetLeft/offsetTop are computed
-        // relative to the root node's border box.
-        if node_offset_box.is_static_body_element {
-            fn extract_box_fragment(
-                fragment: &Fragment,
-                containing_block: &PhysicalRect<Au>,
-            ) -> PhysicalVec<Au> {
-                let (Fragment::Box(fragment) | Fragment::Float(fragment)) = fragment else {
-                    unreachable!();
-                };
-                // Again, take the *first* associated CSS layout box.
-                fragment.borrow().border_rect().origin.to_vector() +
-                    containing_block.origin.to_vector()
-            }
-
-            let containing_block = &fragment_tree.initial_containing_block;
-            let fragment = &fragment_tree.root_fragments[0];
-            if let Fragment::AbsoluteOrFixedPositioned(shared_fragment) = fragment {
-                let shared_fragment = &*shared_fragment.borrow();
-                let fragment = shared_fragment.fragment.as_ref().unwrap();
-                extract_box_fragment(fragment, containing_block)
-            } else {
-                extract_box_fragment(fragment, containing_block)
-            }
-        } else {
-            // Find the top and left padding edges of "the first CSS layout box
-            // associated with the `offsetParent` of the element".
-            //
-            // Since we saw `offset_parent_node_address` once, we should be able
-            // to find it again.
-            let offset_parent_node_tag = Tag::new(offset_parent_node_address);
-            fragment_tree
-                .find(|fragment, _, containing_block| {
-                    match fragment {
-                        Fragment::Box(fragment) | Fragment::Float(fragment) => {
-                            let fragment = fragment.borrow();
-                            if fragment.base.tag == Some(offset_parent_node_tag) {
-                                // Again, take the *first* associated CSS layout box.
-                                let padding_box_corner = fragment.padding_rect().origin.to_vector()
-                                    + containing_block.origin.to_vector();
-                                Some(padding_box_corner)
-                            } else {
-                                None
-                            }
-                        },
-                        Fragment::AbsoluteOrFixedPositioned(_)
-                        | Fragment::Text(_)
-                        | Fragment::Image(_)
-                        | Fragment::IFrame(_)
-                        | Fragment::Positioning(_) => None,
-                    }
-                })
-                .unwrap()
-        }
-    } else {
-        // "If the offsetParent of the element is null," subtract zero in the
-        // following step.
-        Vector2D::zero()
-    };
-
-    Some(OffsetParentResponse {
-        node_address: node_offset_box.offset_parent_node_address.map(Into::into),
-        // "Return the result of subtracting the x-coordinate of the left
-        // padding edge of the first CSS layout box associated with the
-        // `offsetParent` of the element from the x-coordinate of the left
-        // border edge of the first CSS layout box associated with the element,
-        // relative to the initial containing block origin, ignoring any
-        // transforms that apply to the element and its ancestors." (and vice
-        // versa for the top border edge)
-        rect: node_offset_box
-            .border_box
-            .translate(-offset_parent_padding_box_corner.to_untyped()),
-    })
-}
-
-/// Returns whether or not the element with the given style and body element determination
-/// is eligible to be a parent element for offset* queries.
-///
-/// From <https://www.w3.org/TR/cssom-view-1/#dom-htmlelement-offsetparent>:
-///
-/// > Return the nearest ancestor element of the element for which at least one of the following is
-/// > true and terminate this algorithm if such an ancestor is found:
-/// >   1. The computed value of the position property is not static.
-/// >   2. It is the HTML body element.
-/// >   3. The computed value of the position property of the element is static and the ancestor is
-/// >      one of the following HTML elements: td, th, or table.
-fn is_eligible_parent(fragment: &BoxFragment) -> bool {
-    fragment
-        .base
-        .flags
-        .contains(FragmentFlags::IS_BODY_ELEMENT_OF_HTML_ELEMENT_ROOT) ||
-        fragment.style.get_box().position != Position::Static ||
-        fragment
-            .base
-            .flags
-            .contains(FragmentFlags::IS_TABLE_TH_OR_TD_ELEMENT)
-}
-
-/// <https://html.spec.whatwg.org/multipage/#get-the-text-steps>
-pub fn get_the_text_steps<'dom>(node: impl LayoutNode<'dom>) -> String {
-    // Step 1: If element is not being rendered or if the user agent is a non-CSS user agent, then
-    // return element's descendant text content.
-    // This is taken care of in HTMLElemnent code
-
-    // Step 2: Let results be a new empty list.
-    let mut results = Vec::new();
-    let mut max_req_line_break_count = 0;
-
-    // Step 3: For each child node node of element:
-    let mut state = Default::default();
-    for child in node.dom_children() {
-        // Step 1: Let current be the list resulting in running the rendered text collection steps with node.
-        let mut current = rendered_text_collection_steps(child, &mut state);
-        // Step 2: For each item item in current, append item to results.
-        results.append(&mut current);
-    }
-
-    let mut output = Vec::new();
-    for item in results {
-        match item {
-            InnerOrOuterTextItem::Text(s) => {
-                // Step 3.
-                if !s.is_empty() {
-                    if max_req_line_break_count > 0 {
-                        // Step 5.
-                        output.push("\u{000A}".repeat(max_req_line_break_count));
-                        max_req_line_break_count = 0;
-                    }
-                    output.push(s);
-                }
-            },
-            InnerOrOuterTextItem::RequiredLineBreakCount(count) => {
-                // Step 4.
-                if output.is_empty() {
-                    // Remove required line break count at the start.
-                    continue;
-                }
-                // Store the count if it's the max of this run, but it may be ignored if no text
-                // item is found afterwards, which means that these are consecutive line breaks at
-                // the end.
-                if count > max_req_line_break_count {
-                    max_req_line_break_count = count;
-                }
-            },
-        }
-    }
-    output.into_iter().collect()
-}
-
-enum InnerOrOuterTextItem {
-    Text(String),
-    RequiredLineBreakCount(usize),
-}
-
-#[derive(Clone)]
-struct RenderedTextCollectionState {
-    /// Used to make sure we don't add a `\n` before the first row
-    first_table_row: bool,
-    /// Used to make sure we don't add a `\t` before the first column
-    first_table_cell: bool,
-    /// Keeps track of whether we're inside a table, since there are special rules like ommiting everything that's not
-    /// inside a TableCell/TableCaption
-    within_table: bool,
-    /// Determines whether we truncate leading whitespaces for normal nodes or not
-    may_start_with_whitespace: bool,
-    /// Is set whenever we truncated a white space char, used to prepend a single space before the next element,
-    /// that way we truncate trailing white space without having to look ahead
-    did_truncate_trailing_white_space: bool,
-    /// Is set to true when we're rendering the children of TableCell/TableCaption elements, that way we render
-    /// everything inside those as normal, while omitting everything that's in a Table but NOT in a Cell/Caption
-    within_table_content: bool,
-}
-
-impl Default for RenderedTextCollectionState {
-    fn default() -> Self {
-        RenderedTextCollectionState {
-            first_table_row: true,
-            first_table_cell: true,
-            may_start_with_whitespace: true,
-            did_truncate_trailing_white_space: false,
-            within_table: false,
-            within_table_content: false,
-        }
-    }
-}
-
-/// <https://html.spec.whatwg.org/multipage/#rendered-text-collection-steps>
-fn rendered_text_collection_steps<'dom>(
-    node: impl LayoutNode<'dom>,
-    state: &mut RenderedTextCollectionState,
-) -> Vec<InnerOrOuterTextItem> {
-    // Step 1. Let items be the result of running the rendered text collection
-    // steps with each child node of node in tree order,
-    // and then concatenating the results to a single list.
-    let mut items = vec![];
-    if !node.is_connected() || !(node.is_element() || node.is_text_node()) {
-        return items;
-    }
-
-    match node.type_id() {
-        LayoutNodeType::Text => {
-            if let Some(element) = node.parent_node() {
-                match element.type_id() {
-                    // Any text contained in these elements must be ignored.
-                    LayoutNodeType::Element(LayoutElementType::HTMLCanvasElement) |
-                    LayoutNodeType::Element(LayoutElementType::HTMLImageElement) |
-                    LayoutNodeType::Element(LayoutElementType::HTMLIFrameElement) |
-                    LayoutNodeType::Element(LayoutElementType::HTMLObjectElement) |
-                    LayoutNodeType::Element(LayoutElementType::HTMLInputElement) |
-                    LayoutNodeType::Element(LayoutElementType::HTMLTextAreaElement) |
-                    LayoutNodeType::Element(LayoutElementType::HTMLMediaElement) => {
-                        return items;
-                    },
-                    // Select/Option/OptGroup elements are handled a bit differently.
-                    // Basically: a Select can only contain Options or OptGroups, while
-                    // OptGroups may also contain Options. Everything else gets ignored.
-                    LayoutNodeType::Element(LayoutElementType::HTMLOptGroupElement) => {
-                        if let Some(element) = element.parent_node() {
-                            if !matches!(
-                                element.type_id(),
-                                LayoutNodeType::Element(LayoutElementType::HTMLSelectElement)
-                            ) {
-                                return items;
-                            }
-                        } else {
-                            return items;
-                        }
-                    },
-                    LayoutNodeType::Element(LayoutElementType::HTMLSelectElement) => return items,
-                    _ => {},
-                }
-
-                // Tables are also a bit special, mainly by only allowing
-                // content within TableCell or TableCaption elements once
-                // we're inside a Table.
-                if state.within_table && !state.within_table_content {
-                    return items;
-                }
-
-                let Some(style_data) = element.style_data() else {
-                    return items;
-                };
-
-                let element_data = style_data.element_data.borrow();
-                let Some(style) = element_data.styles.get_primary() else {
-                    return items;
-                };
-
-                // Step 2: If node's computed value of 'visibility' is not 'visible', then return items.
-                //
-                // We need to do this check here on the Text fragment, if we did it on the element and
-                // just skipped rendering all child nodes then there'd be no way to override the
-                // visibility in a child node.
-                if style.get_inherited_box().visibility != Visibility::Visible {
-                    return items;
-                }
-
-                // Step 3: If node is not being rendered, then return items. For the purpose of this step,
-                // the following elements must act as described if the computed value of the 'display'
-                // property is not 'none':
-                let display = style.get_box().display;
-                if display == Display::None {
-                    match element.type_id() {
-                        // Even if set to Display::None, Option/OptGroup elements need to
-                        // be rendered.
-                        LayoutNodeType::Element(LayoutElementType::HTMLOptGroupElement) |
-                        LayoutNodeType::Element(LayoutElementType::HTMLOptionElement) => {},
-                        _ => {
-                            return items;
-                        },
-                    }
-                }
-
-                let text_content = node.to_threadsafe().node_text_content();
-
-                let white_space_collapse = style.clone_white_space_collapse();
-                let preserve_whitespace = white_space_collapse == WhiteSpaceCollapseValue::Preserve;
-                let is_inline = matches!(
-                    display,
-                    Display::InlineBlock | Display::InlineFlex | Display::InlineGrid
-                );
-                // Now we need to decide on whether to remove beginning white space or not, this
-                // is mainly decided by the elements we rendered before, but may be overwritten by the white-space
-                // property.
-                let trim_beginning_white_space =
-                    !preserve_whitespace && (state.may_start_with_whitespace || is_inline);
-                let with_white_space_rules_applied = WhitespaceCollapse::new(
-                    text_content.chars(),
-                    white_space_collapse,
-                    trim_beginning_white_space,
-                );
-
-                // Step 4: If node is a Text node, then for each CSS text box produced by node, in
-                // content order, compute the text of the box after application of the CSS
-                // 'white-space' processing rules and 'text-transform' rules, set items to the list
-                // of the resulting strings, and return items. The CSS 'white-space' processing
-                // rules are slightly modified: collapsible spaces at the end of lines are always
-                // collapsed, but they are only removed if the line is the last line of the block,
-                // or it ends with a br element. Soft hyphens should be preserved.
-                let mut transformed_text: String = TextTransformation::new(
-                    with_white_space_rules_applied,
-                    style.clone_text_transform().case(),
-                )
-                .collect();
-
-                let is_preformatted_element =
-                    white_space_collapse == WhiteSpaceCollapseValue::Preserve;
-
-                let is_final_character_whitespace = transformed_text
-                    .chars()
-                    .next_back()
-                    .filter(char::is_ascii_whitespace)
-                    .is_some();
-
-                let is_first_character_whitespace = transformed_text
-                    .chars()
-                    .next()
-                    .filter(char::is_ascii_whitespace)
-                    .is_some();
-
-                // By truncating trailing white space and then adding it back in once we
-                // encounter another text node we can ensure no trailing white space for
-                // normal text without having to look ahead
-                if state.did_truncate_trailing_white_space && !is_first_character_whitespace {
-                    items.push(InnerOrOuterTextItem::Text(String::from(" ")));
-                };
-
-                if !transformed_text.is_empty() {
-                    // Here we decide whether to keep or truncate the final white
-                    // space character, if there is one.
-                    if is_final_character_whitespace && !is_preformatted_element {
-                        state.may_start_with_whitespace = false;
-                        state.did_truncate_trailing_white_space = true;
-                        transformed_text.pop();
-                    } else {
-                        state.may_start_with_whitespace = is_final_character_whitespace;
-                        state.did_truncate_trailing_white_space = false;
-                    }
-                    items.push(InnerOrOuterTextItem::Text(transformed_text));
-                }
-            } else {
-                // If we don't have a parent element then there's no style data available,
-                // in this (pretty unlikely) case we just return the Text fragment as is.
-                items.push(InnerOrOuterTextItem::Text(
-                    node.to_threadsafe().node_text_content().into(),
-                ));
-            }
-        },
-        LayoutNodeType::Element(LayoutElementType::HTMLBRElement) => {
-            // Step 5: If node is a br element, then append a string containing a single U+000A
-            // LF code point to items.
-            state.did_truncate_trailing_white_space = false;
-            state.may_start_with_whitespace = true;
-            items.push(InnerOrOuterTextItem::Text(String::from("\u{000A}")));
-        },
-        _ => {
-            // First we need to gather some infos to setup the various flags
-            // before rendering the child nodes
-            let Some(style_data) = node.style_data() else {
-                return items;
-            };
-
-            let element_data = style_data.element_data.borrow();
-            let Some(style) = element_data.styles.get_primary() else {
-                return items;
-            };
-            let inherited_box = style.get_inherited_box();
-
-            if inherited_box.visibility != Visibility::Visible {
-                // If the element is not visible then we'll immediatly render all children,
-                // skipping all other processing.
-                // We can't just stop here since a child can override a parents visibility.
-                for child in node.dom_children() {
-                    items.append(&mut rendered_text_collection_steps(child, state));
-                }
-                return items;
-            }
-
-            let style_box = style.get_box();
-            let display = style_box.display;
-            let mut surrounding_line_breaks = 0;
-
-            // Treat absolutely positioned or floated elements like Block elements
-            if style_box.position == Position::Absolute || style_box.float != Float::None {
-                surrounding_line_breaks = 1;
-            }
-
-            // Depending on the display property we have to do various things
-            // before we can render the child nodes.
-            match display {
-                Display::Table => {
-                    surrounding_line_breaks = 1;
-                    state.within_table = true;
-                },
-                // Step 6: If node's computed value of 'display' is 'table-cell',
-                // and node's CSS box is not the last 'table-cell' box of its
-                // enclosing 'table-row' box, then append a string containing
-                // a single U+0009 TAB code point to items.
-                Display::TableCell => {
-                    if !state.first_table_cell {
-                        items.push(InnerOrOuterTextItem::Text(String::from(
-                            "\u{0009}", /* tab */
-                        )));
-                        // Make sure we don't add a white-space we removed from the previous node
-                        state.did_truncate_trailing_white_space = false;
-                    }
-                    state.first_table_cell = false;
-                    state.within_table_content = true;
-                },
-                // Step 7: If node's computed value of 'display' is 'table-row',
-                // and node's CSS box is not the last 'table-row' box of the nearest
-                // ancestor 'table' box, then append a string containing a single U+000A
-                // LF code point to items.
-                Display::TableRow => {
-                    if !state.first_table_row {
-                        items.push(InnerOrOuterTextItem::Text(String::from(
-                            "\u{000A}", /* Line Feed */
-                        )));
-                        // Make sure we don't add a white-space we removed from the previous node
-                        state.did_truncate_trailing_white_space = false;
-                    }
-                    state.first_table_row = false;
-                    state.first_table_cell = true;
-                },
-                // Step 9: If node's used value of 'display' is block-level or 'table-caption',
-                // then append 1 (a required line break count) at the beginning and end of items.
-                Display::Block => {
-                    surrounding_line_breaks = 1;
-                },
-                Display::TableCaption => {
-                    surrounding_line_breaks = 1;
-                    state.within_table_content = true;
-                },
-                Display::InlineFlex | Display::InlineGrid | Display::InlineBlock => {
-                    // InlineBlock's are a bit strange, in that they don't produce a Linebreak, yet
-                    // disable white space truncation before and after it, making it one of the few
-                    // cases where one can have multiple white space characters following one another.
-                    if state.did_truncate_trailing_white_space {
-                        items.push(InnerOrOuterTextItem::Text(String::from(" ")));
-                        state.did_truncate_trailing_white_space = false;
-                        state.may_start_with_whitespace = true;
-                    }
-                },
-                _ => {},
-            }
-
-            match node.type_id() {
-                // Step 8: If node is a p element, then append 2 (a required line break count) at
-                // the beginning and end of items.
-                LayoutNodeType::Element(LayoutElementType::HTMLParagraphElement) => {
-                    surrounding_line_breaks = 2;
-                },
-                // Option/OptGroup elements should go on separate lines, by treating them like
-                // Block elements we can achieve that.
-                LayoutNodeType::Element(LayoutElementType::HTMLOptionElement) |
-                LayoutNodeType::Element(LayoutElementType::HTMLOptGroupElement) => {
-                    surrounding_line_breaks = 1;
-                },
-                _ => {},
-            }
-
-            if surrounding_line_breaks > 0 {
-                items.push(InnerOrOuterTextItem::RequiredLineBreakCount(
-                    surrounding_line_breaks,
-                ));
-                state.did_truncate_trailing_white_space = false;
-                state.may_start_with_whitespace = true;
-            }
-
-            match node.type_id() {
-                // Any text/content contained in these elements is ignored.
-                // However we still need to check whether we have to prepend a
-                // space, since for example <span>asd <input> qwe</span> must
-                // product "asd  qwe" (note the 2 spaces)
-                LayoutNodeType::Element(LayoutElementType::HTMLCanvasElement) |
-                LayoutNodeType::Element(LayoutElementType::HTMLImageElement) |
-                LayoutNodeType::Element(LayoutElementType::HTMLIFrameElement) |
-                LayoutNodeType::Element(LayoutElementType::HTMLObjectElement) |
-                LayoutNodeType::Element(LayoutElementType::HTMLInputElement) |
-                LayoutNodeType::Element(LayoutElementType::HTMLTextAreaElement) |
-                LayoutNodeType::Element(LayoutElementType::HTMLMediaElement) => {
-                    if display != Display::Block && state.did_truncate_trailing_white_space {
-                        items.push(InnerOrOuterTextItem::Text(String::from(" ")));
-                        state.did_truncate_trailing_white_space = false;
-                    };
-                    state.may_start_with_whitespace = false;
-                },
-                _ => {
-                    // Now we can finally iterate over all children, appending whatever
-                    // they produce to items.
-                    for child in node.dom_children() {
-                        items.append(&mut rendered_text_collection_steps(child, state));
-                    }
-                },
-            }
-
-            // Depending on the display property we still need to do some
-            // cleanup after rendering all child nodes
-            match display {
-                Display::InlineFlex | Display::InlineGrid | Display::InlineBlock => {
-                    state.did_truncate_trailing_white_space = false;
-                    state.may_start_with_whitespace = false;
-                },
-                Display::Table => {
-                    state.within_table = false;
-                },
-                Display::TableCell | Display::TableCaption => {
-                    state.within_table_content = false;
-                },
-                _ => {},
-            }
-
-            if surrounding_line_breaks > 0 {
-                items.push(InnerOrOuterTextItem::RequiredLineBreakCount(
-                    surrounding_line_breaks,
-                ));
-                state.did_truncate_trailing_white_space = false;
-                state.may_start_with_whitespace = true;
-            }
-        },
-    };
-    items
-}
-
-pub fn process_text_index_request(_node: OpaqueNode, _point: Point2D<Au>) -> Option<usize> {
-    None
-}
-
-pub fn process_resolved_font_style_query<'dom, E>(
-    context: &SharedStyleContext,
-    node: E,
-    value: &str,
-    url_data: ServoUrl,
-    shared_lock: &SharedRwLock,
-) -> Option<ServoArc<Font>>
-where
-    E: LayoutNode<'dom>,
-{
-    fn create_font_declaration(
-        value: &str,
-        url_data: &ServoUrl,
-        quirks_mode: QuirksMode,
-    ) -> Option<PropertyDeclarationBlock> {
-        let mut declarations = SourcePropertyDeclaration::default();
-        let result = parse_one_declaration_into(
-            &mut declarations,
-            PropertyId::NonCustom(ShorthandId::Font.into()),
-            value,
-            Origin::Author,
-            &UrlExtraData(url_data.get_arc()),
-            None,
-            ParsingMode::DEFAULT,
-            quirks_mode,
-            CssRuleType::Style,
-        );
-        let declarations = match result {
-            Ok(()) => {
-                let mut block = PropertyDeclarationBlock::new();
-                block.extend(declarations.drain(), Importance::Normal);
-                block
-            },
-            Err(_) => return None,
-        };
-        // TODO: Force to set line-height property to 'normal' font property.
-        Some(declarations)
-    }
-    fn resolve_for_declarations<'dom, E>(
-        context: &SharedStyleContext,
-        parent_style: Option<&ComputedValues>,
-        declarations: PropertyDeclarationBlock,
-        shared_lock: &SharedRwLock,
-    ) -> ServoArc<ComputedValues>
-    where
-        E: LayoutNode<'dom>,
-    {
-        let parent_style = match parent_style {
-            Some(parent) => parent,
-            None => context.stylist.device().default_computed_values(),
-        };
-        context
-            .stylist
-            .compute_for_declarations::<E::ConcreteElement>(
-                &context.guards,
-                parent_style,
-                ServoArc::new(shared_lock.wrap(declarations)),
-            )
-    }
-
-    // https://html.spec.whatwg.org/multipage/#dom-context-2d-font
-    // 1. Parse the given font property value
-    let quirks_mode = context.quirks_mode();
-    let declarations = create_font_declaration(value, &url_data, quirks_mode)?;
-
-    // TODO: Reject 'inherit' and 'initial' values for the font property.
-
-    // 2. Get resolved styles for the parent element
-    let element = node.as_element().unwrap();
-    let parent_style = if node.is_connected() {
-        if element.has_data() {
-            node.to_threadsafe().as_element().unwrap().resolved_style()
-        } else {
-            let mut tlc = ThreadLocalStyleContext::new();
-            let mut context = StyleContext {
-                shared: context,
-                thread_local: &mut tlc,
-            };
-            let styles = resolve_style(&mut context, element, RuleInclusion::All, None, None);
-            styles.primary().clone()
-        }
-    } else {
-        let default_declarations =
-            create_font_declaration("10px sans-serif", &url_data, quirks_mode).unwrap();
-        resolve_for_declarations::<E>(context, None, default_declarations, shared_lock)
-    };
-
-    // 3. Resolve the parsed value with resolved styles of the parent element
-    let computed_values =
-        resolve_for_declarations::<E>(context, Some(&*parent_style), declarations, shared_lock);
-
-    Some(computed_values.clone_font())
-}
diff --git a/components/layout_2020/table/construct.rs b/components/layout_2020/table/construct.rs
deleted file mode 100644
index 9e18aef04d2..00000000000
--- a/components/layout_2020/table/construct.rs
+++ /dev/null
@@ -1,1156 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::borrow::Cow;
-use std::convert::{TryFrom, TryInto};
-use std::iter::repeat;
-
-use log::warn;
-use script_layout_interface::wrapper_traits::ThreadSafeLayoutNode;
-use servo_arc::Arc;
-use style::properties::ComputedValues;
-use style::properties::style_structs::Font;
-use style::selector_parser::PseudoElement;
-use style::str::char_is_whitespace;
-
-use super::{
-    Table, TableCaption, TableSlot, TableSlotCell, TableSlotCoordinates, TableSlotOffset,
-    TableTrack, TableTrackGroup, TableTrackGroupType,
-};
-use crate::PropagatedBoxTreeData;
-use crate::cell::ArcRefCell;
-use crate::context::LayoutContext;
-use crate::dom::{BoxSlot, NodeExt};
-use crate::dom_traversal::{Contents, NodeAndStyleInfo, NonReplacedContents, TraversalHandler};
-use crate::flow::{BlockContainerBuilder, BlockFormattingContext};
-use crate::formatting_contexts::{
-    IndependentFormattingContext, IndependentFormattingContextContents,
-    IndependentNonReplacedContents,
-};
-use crate::fragment_tree::BaseFragmentInfo;
-use crate::layout_box_base::LayoutBoxBase;
-use crate::style_ext::{DisplayGeneratingBox, DisplayLayoutInternal};
-
-/// A reference to a slot and its coordinates in the table
-#[derive(Clone, Copy, Debug)]
-pub(super) struct ResolvedSlotAndLocation<'a> {
-    pub cell: &'a TableSlotCell,
-    pub coords: TableSlotCoordinates,
-}
-
-impl ResolvedSlotAndLocation<'_> {
-    fn covers_cell_at(&self, coords: TableSlotCoordinates) -> bool {
-        let covered_in_x =
-            coords.x >= self.coords.x && coords.x < self.coords.x + self.cell.colspan;
-        let covered_in_y = coords.y >= self.coords.y &&
-            (self.cell.rowspan == 0 || coords.y < self.coords.y + self.cell.rowspan);
-        covered_in_x && covered_in_y
-    }
-}
-
-pub(crate) enum AnonymousTableContent<'dom, Node> {
-    Text(NodeAndStyleInfo<Node>, Cow<'dom, str>),
-    Element {
-        info: NodeAndStyleInfo<Node>,
-        display: DisplayGeneratingBox,
-        contents: Contents,
-        box_slot: BoxSlot<'dom>,
-    },
-}
-
-impl<Node> AnonymousTableContent<'_, Node> {
-    fn is_whitespace_only(&self) -> bool {
-        match self {
-            Self::Element { .. } => false,
-            Self::Text(_, text) => text.chars().all(char_is_whitespace),
-        }
-    }
-
-    fn contents_are_whitespace_only(contents: &[Self]) -> bool {
-        contents.iter().all(|content| content.is_whitespace_only())
-    }
-}
-
-impl Table {
-    pub(crate) fn construct<'dom>(
-        context: &LayoutContext,
-        info: &NodeAndStyleInfo<impl NodeExt<'dom>>,
-        grid_style: Arc<ComputedValues>,
-        contents: NonReplacedContents,
-        propagated_data: PropagatedBoxTreeData,
-    ) -> Self {
-        let mut traversal = TableBuilderTraversal::new(
-            context,
-            info,
-            grid_style,
-            propagated_data.union(&info.style),
-        );
-        contents.traverse(context, info, &mut traversal);
-        traversal.finish()
-    }
-
-    pub(crate) fn construct_anonymous<'dom, Node>(
-        context: &LayoutContext,
-        parent_info: &NodeAndStyleInfo<Node>,
-        contents: Vec<AnonymousTableContent<'dom, Node>>,
-        propagated_data: PropagatedBoxTreeData,
-    ) -> IndependentFormattingContext
-    where
-        Node: crate::dom::NodeExt<'dom>,
-    {
-        let grid_and_wrapper_style = context
-            .shared_context()
-            .stylist
-            .style_for_anonymous::<Node::ConcreteElement>(
-                &context.shared_context().guards,
-                &PseudoElement::ServoAnonymousTable,
-                &parent_info.style,
-            );
-        let anonymous_info = parent_info.new_anonymous(grid_and_wrapper_style.clone());
-
-        let mut table_builder = TableBuilderTraversal::new(
-            context,
-            &anonymous_info,
-            grid_and_wrapper_style.clone(),
-            propagated_data,
-        );
-
-        for content in contents {
-            match content {
-                AnonymousTableContent::Element {
-                    info,
-                    display,
-                    contents,
-                    box_slot,
-                } => {
-                    table_builder.handle_element(&info, display, contents, box_slot);
-                },
-                AnonymousTableContent::Text(..) => {
-                    // This only happens if there was whitespace between our internal table elements.
-                    // We only collect that whitespace in case we need to re-emit trailing whitespace
-                    // after we've added our anonymous table.
-                },
-            }
-        }
-
-        let mut table = table_builder.finish();
-        table.anonymous = true;
-
-        IndependentFormattingContext {
-            base: LayoutBoxBase::new((&anonymous_info).into(), grid_and_wrapper_style),
-            contents: IndependentFormattingContextContents::NonReplaced(
-                IndependentNonReplacedContents::Table(table),
-            ),
-        }
-    }
-
-    /// Push a new slot into the last row of this table.
-    fn push_new_slot_to_last_row(&mut self, slot: TableSlot) {
-        let last_row = match self.slots.last_mut() {
-            Some(row) => row,
-            None => {
-                unreachable!("Should have some rows before calling `push_new_slot_to_last_row`")
-            },
-        };
-
-        self.size.width = self.size.width.max(last_row.len() + 1);
-        last_row.push(slot);
-    }
-
-    /// Find [`ResolvedSlotAndLocation`] of all the slots that cover the slot at the given
-    /// coordinates. This recursively resolves all of the [`TableSlotCell`]s that cover
-    /// the target and returns a [`ResolvedSlotAndLocation`] for each of them. If there is
-    /// no slot at the given coordinates or that slot is an empty space, an empty vector
-    /// is returned.
-    pub(super) fn resolve_slot_at(
-        &self,
-        coords: TableSlotCoordinates,
-    ) -> Vec<ResolvedSlotAndLocation<'_>> {
-        let slot = self.get_slot(coords);
-        match slot {
-            Some(TableSlot::Cell(cell)) => vec![ResolvedSlotAndLocation { cell, coords }],
-            Some(TableSlot::Spanned(offsets)) => offsets
-                .iter()
-                .flat_map(|offset| self.resolve_slot_at(coords - *offset))
-                .collect(),
-            Some(TableSlot::Empty) | None => {
-                warn!("Tried to resolve an empty or nonexistant slot!");
-                vec![]
-            },
-        }
-    }
-}
-
-impl TableSlot {
-    /// Merge a TableSlot::Spanned(x, y) with this (only for model errors)
-    pub fn push_spanned(&mut self, new_offset: TableSlotOffset) {
-        match *self {
-            TableSlot::Cell { .. } => {
-                panic!(
-                    "Should never have a table model error with an originating cell slot overlapping a spanned slot"
-                )
-            },
-            TableSlot::Spanned(ref mut vec) => vec.insert(0, new_offset),
-            TableSlot::Empty => {
-                panic!("Should never have a table model error with an empty slot");
-            },
-        }
-    }
-}
-
-pub struct TableBuilder {
-    /// The table that we are building.
-    table: Table,
-
-    /// An incoming rowspan is a value indicating that a cell in a row above the current row,
-    /// had a rowspan value other than 1. The values in this array indicate how many more
-    /// rows the cell should span. For example, a value of 0 at an index before `current_x()`
-    /// indicates that the cell on that column will not span into the next row, and at an index
-    /// after `current_x()` it indicates that the cell will not span into the current row.
-    /// A negative value means that the cell will span all remaining rows in the row group.
-    ///
-    /// As each column in a row is processed, the values in this vector are updated for the
-    /// next row.
-    pub incoming_rowspans: Vec<isize>,
-}
-
-impl TableBuilder {
-    pub(super) fn new(
-        style: Arc<ComputedValues>,
-        grid_style: Arc<ComputedValues>,
-        base_fragment_info: BaseFragmentInfo,
-        percentage_columns_allowed_for_inline_content_sizes: bool,
-    ) -> Self {
-        Self {
-            table: Table::new(
-                style,
-                grid_style,
-                base_fragment_info,
-                percentage_columns_allowed_for_inline_content_sizes,
-            ),
-            incoming_rowspans: Vec::new(),
-        }
-    }
-
-    pub fn new_for_tests() -> Self {
-        let testing_style =
-            ComputedValues::initial_values_with_font_override(Font::initial_values());
-        Self::new(
-            testing_style.clone(),
-            testing_style.clone(),
-            BaseFragmentInfo::anonymous(),
-            true, /* percentage_columns_allowed_for_inline_content_sizes */
-        )
-    }
-
-    pub fn last_row_index_in_row_group_at_row_n(&self, n: usize) -> usize {
-        // TODO: This is just a linear search, because the idea is that there are
-        // generally less than or equal to three row groups, but if we notice a lot
-        // of web content with more, we can consider a binary search here.
-        for row_group in self.table.row_groups.iter() {
-            if row_group.track_range.start > n {
-                return row_group.track_range.start - 1;
-            }
-        }
-        self.table.size.height - 1
-    }
-
-    pub fn finish(mut self) -> Table {
-        self.adjust_table_geometry_for_columns_and_colgroups();
-        self.do_missing_cells_fixup();
-        self.reorder_first_thead_and_tfoot();
-        self.do_final_rowspan_calculation();
-        self.table
-    }
-
-    /// Do <https://drafts.csswg.org/css-tables/#missing-cells-fixup> which ensures
-    /// that every row has the same number of cells.
-    fn do_missing_cells_fixup(&mut self) {
-        for row in self.table.slots.iter_mut() {
-            row.resize_with(self.table.size.width, || TableSlot::Empty);
-        }
-    }
-
-    /// It's possible to define more table columns via `<colgroup>` and `<col>` elements
-    /// than actually exist in the table. In that case, increase the size of the table.
-    ///
-    /// However, if the table has no row nor row group, remove the extra columns instead.
-    /// This matches WebKit, and some tests require it, but Gecko and Blink don't do it.
-    fn adjust_table_geometry_for_columns_and_colgroups(&mut self) {
-        if self.table.rows.is_empty() && self.table.row_groups.is_empty() {
-            self.table.columns.truncate(0);
-            self.table.column_groups.truncate(0);
-        } else {
-            self.table.size.width = self.table.size.width.max(self.table.columns.len());
-        }
-    }
-
-    /// Reorder the first `<thead>` and `<tbody>` to be the first and last row groups respectively.
-    /// This requires fixing up all row group indices.
-    /// See <https://drafts.csswg.org/css-tables/#table-header-group> and
-    /// <https://drafts.csswg.org/css-tables/#table-footer-group>.
-    fn reorder_first_thead_and_tfoot(&mut self) {
-        let mut thead_index = None;
-        let mut tfoot_index = None;
-        for (row_group_index, row_group) in self.table.row_groups.iter().enumerate() {
-            if thead_index.is_none() && row_group.group_type == TableTrackGroupType::HeaderGroup {
-                thead_index = Some(row_group_index);
-            }
-            if tfoot_index.is_none() && row_group.group_type == TableTrackGroupType::FooterGroup {
-                tfoot_index = Some(row_group_index);
-            }
-            if thead_index.is_some() && tfoot_index.is_some() {
-                break;
-            }
-        }
-
-        if let Some(thead_index) = thead_index {
-            self.move_row_group_to_front(thead_index)
-        }
-
-        if let Some(mut tfoot_index) = tfoot_index {
-            // We may have moved a `<thead>` which means the original index we
-            // we found for this this <tfoot>` also needs to be updated!
-            if thead_index.unwrap_or(0) > tfoot_index {
-                tfoot_index += 1;
-            }
-            self.move_row_group_to_end(tfoot_index)
-        }
-    }
-
-    fn regenerate_track_ranges(&mut self) {
-        // Now update all track group ranges.
-        let mut current_row_group_index = None;
-        for (row_index, row) in self.table.rows.iter().enumerate() {
-            if current_row_group_index == row.group_index {
-                continue;
-            }
-
-            // Finish any row group that is currently being processed.
-            if let Some(current_group_index) = current_row_group_index {
-                self.table.row_groups[current_group_index].track_range.end = row_index;
-            }
-
-            // Start processing this new row group and update its starting index.
-            current_row_group_index = row.group_index;
-            if let Some(current_group_index) = current_row_group_index {
-                self.table.row_groups[current_group_index].track_range.start = row_index;
-            }
-        }
-
-        // Finish the last row group.
-        if let Some(current_group_index) = current_row_group_index {
-            self.table.row_groups[current_group_index].track_range.end = self.table.rows.len();
-        }
-    }
-
-    fn move_row_group_to_front(&mut self, index_to_move: usize) {
-        // Move the group itself.
-        if index_to_move > 0 {
-            let removed_row_group = self.table.row_groups.remove(index_to_move);
-            self.table.row_groups.insert(0, removed_row_group);
-
-            for row in self.table.rows.iter_mut() {
-                match row.group_index.as_mut() {
-                    Some(group_index) if *group_index < index_to_move => *group_index += 1,
-                    Some(group_index) if *group_index == index_to_move => *group_index = 0,
-                    _ => {},
-                }
-            }
-        }
-
-        let row_range = self.table.row_groups[0].track_range.clone();
-        if row_range.start > 0 {
-            // Move the slots associated with the moved group.
-            let removed_slots: Vec<Vec<TableSlot>> = self
-                .table
-                .slots
-                .splice(row_range.clone(), std::iter::empty())
-                .collect();
-            self.table.slots.splice(0..0, removed_slots);
-
-            // Move the rows associated with the moved group.
-            let removed_rows: Vec<TableTrack> = self
-                .table
-                .rows
-                .splice(row_range, std::iter::empty())
-                .collect();
-            self.table.rows.splice(0..0, removed_rows);
-
-            // Do this now, rather than after possibly moving a `<tfoot>` row group to the end,
-            // because moving row groups depends on an accurate `track_range` in every group.
-            self.regenerate_track_ranges();
-        }
-    }
-
-    fn move_row_group_to_end(&mut self, index_to_move: usize) {
-        let last_row_group_index = self.table.row_groups.len() - 1;
-
-        // Move the group itself.
-        if index_to_move < last_row_group_index {
-            let removed_row_group = self.table.row_groups.remove(index_to_move);
-            self.table.row_groups.push(removed_row_group);
-
-            for row in self.table.rows.iter_mut() {
-                match row.group_index.as_mut() {
-                    Some(group_index) if *group_index > index_to_move => *group_index -= 1,
-                    Some(group_index) if *group_index == index_to_move => {
-                        *group_index = last_row_group_index
-                    },
-                    _ => {},
-                }
-            }
-        }
-
-        let row_range = self.table.row_groups[last_row_group_index]
-            .track_range
-            .clone();
-        if row_range.end < self.table.rows.len() {
-            // Move the slots associated with the moved group.
-            let removed_slots: Vec<Vec<TableSlot>> = self
-                .table
-                .slots
-                .splice(row_range.clone(), std::iter::empty())
-                .collect();
-            self.table.slots.extend(removed_slots);
-
-            // Move the rows associated with the moved group.
-            let removed_rows: Vec<TableTrack> = self
-                .table
-                .rows
-                .splice(row_range, std::iter::empty())
-                .collect();
-            self.table.rows.extend(removed_rows);
-
-            self.regenerate_track_ranges();
-        }
-    }
-
-    /// Turn all rowspan=0 rows into the real value to avoid having to make the calculation
-    /// continually during layout. In addition, make sure that there are no rowspans that extend
-    /// past the end of their row group.
-    fn do_final_rowspan_calculation(&mut self) {
-        for row_index in 0..self.table.size.height {
-            let last_row_index_in_group = self.last_row_index_in_row_group_at_row_n(row_index);
-            for cell in self.table.slots[row_index].iter_mut() {
-                if let TableSlot::Cell(cell) = cell {
-                    if cell.rowspan == 1 {
-                        continue;
-                    }
-                    let rowspan_to_end_of_group = last_row_index_in_group - row_index + 1;
-                    if cell.rowspan == 0 {
-                        cell.rowspan = rowspan_to_end_of_group;
-                    } else {
-                        cell.rowspan = cell.rowspan.min(rowspan_to_end_of_group);
-                    }
-                }
-            }
-        }
-    }
-
-    fn current_y(&self) -> Option<usize> {
-        self.table.slots.len().checked_sub(1)
-    }
-
-    fn current_x(&self) -> Option<usize> {
-        Some(self.table.slots[self.current_y()?].len())
-    }
-
-    fn current_coords(&self) -> Option<TableSlotCoordinates> {
-        Some(TableSlotCoordinates::new(
-            self.current_x()?,
-            self.current_y()?,
-        ))
-    }
-
-    pub fn start_row(&mut self) {
-        self.table.slots.push(Vec::new());
-        self.table.size.height += 1;
-        self.create_slots_for_cells_above_with_rowspan(true);
-    }
-
-    pub fn end_row(&mut self) {
-        // TODO: We need to insert a cell for any leftover non-table-like
-        // content in the TableRowBuilder.
-
-        // Truncate entries that are zero at the end of [`Self::incoming_rowspans`]. This
-        // prevents padding the table with empty cells when it isn't necessary.
-        let current_x = self
-            .current_x()
-            .expect("Should have rows before calling `end_row`");
-        for i in (current_x..self.incoming_rowspans.len()).rev() {
-            if self.incoming_rowspans[i] == 0 {
-                self.incoming_rowspans.pop();
-            } else {
-                break;
-            }
-        }
-
-        self.create_slots_for_cells_above_with_rowspan(false);
-    }
-
-    /// Create a [`TableSlot::Spanned`] for the target cell at the given coordinates. If
-    /// no slots cover the target, then this returns [`None`]. Note: This does not handle
-    /// slots that cover the target using `colspan`, but instead only considers slots that
-    /// cover this slot via `rowspan`. `colspan` should be handled by appending to the
-    /// return value of this function.
-    fn create_spanned_slot_based_on_cell_above(
-        &self,
-        target_coords: TableSlotCoordinates,
-    ) -> Option<TableSlot> {
-        let y_above = self.current_y()?.checked_sub(1)?;
-        let coords_for_slot_above = TableSlotCoordinates::new(target_coords.x, y_above);
-        let slots_covering_slot_above = self.table.resolve_slot_at(coords_for_slot_above);
-
-        let coords_of_slots_that_cover_target: Vec<_> = slots_covering_slot_above
-            .into_iter()
-            .filter(|slot| slot.covers_cell_at(target_coords))
-            .map(|slot| target_coords - slot.coords)
-            .collect();
-
-        if coords_of_slots_that_cover_target.is_empty() {
-            None
-        } else {
-            Some(TableSlot::Spanned(coords_of_slots_that_cover_target))
-        }
-    }
-
-    /// When not in the process of filling a cell, make sure any incoming rowspans are
-    /// filled so that the next specified cell comes after them. Should have been called before
-    /// [`Self::add_cell`]
-    ///
-    /// if `stop_at_cell_opportunity` is set, this will stop at the first slot with
-    /// `incoming_rowspans` equal to zero. If not, it will insert [`TableSlot::Empty`] and
-    /// continue to look for more incoming rowspans (which should only be done once we're
-    /// finished processing the cells in a row, and after calling truncating cells with
-    /// remaining rowspan from the end of `incoming_rowspans`.
-    fn create_slots_for_cells_above_with_rowspan(&mut self, stop_at_cell_opportunity: bool) {
-        let mut current_coords = self
-            .current_coords()
-            .expect("Should have rows before calling `create_slots_for_cells_above_with_rowspan`");
-        while let Some(span) = self.incoming_rowspans.get_mut(current_coords.x) {
-            // This column has no incoming rowspanned cells and `stop_at_zero` is true, so
-            // we should stop to process new cells defined in the current row.
-            if *span == 0 && stop_at_cell_opportunity {
-                break;
-            }
-
-            let new_cell = if *span != 0 {
-                *span -= 1;
-                self.create_spanned_slot_based_on_cell_above(current_coords)
-                    .expect(
-                        "Nonzero incoming rowspan cannot occur without a cell spanning this slot",
-                    )
-            } else {
-                TableSlot::Empty
-            };
-
-            self.table.push_new_slot_to_last_row(new_cell);
-            current_coords.x += 1;
-        }
-        debug_assert_eq!(Some(current_coords), self.current_coords());
-    }
-
-    /// <https://html.spec.whatwg.org/multipage/#algorithm-for-processing-rows>
-    /// Push a single cell onto the slot map, handling any colspans it may have, and
-    /// setting up the outgoing rowspans.
-    pub fn add_cell(&mut self, cell: TableSlotCell) {
-        // Make sure the incoming_rowspans table is large enough
-        // because we will be writing to it.
-        let current_coords = self
-            .current_coords()
-            .expect("Should have rows before calling `add_cell`");
-        let colspan = cell.colspan;
-        let rowspan = cell.rowspan;
-
-        if self.incoming_rowspans.len() < current_coords.x + colspan {
-            self.incoming_rowspans
-                .resize(current_coords.x + colspan, 0isize);
-        }
-
-        debug_assert_eq!(
-            self.incoming_rowspans[current_coords.x], 0,
-            "Added a cell in a position that also had an incoming rowspan!"
-        );
-
-        // If `rowspan` is zero, this is automatically negative and will stay negative.
-        let outgoing_rowspan = rowspan as isize - 1;
-        self.table.push_new_slot_to_last_row(TableSlot::Cell(cell));
-        self.incoming_rowspans[current_coords.x] = outgoing_rowspan;
-
-        // Draw colspanned cells
-        for colspan_offset in 1..colspan {
-            let current_x_plus_colspan_offset = current_coords.x + colspan_offset;
-            let new_offset = TableSlotOffset::new(colspan_offset, 0);
-            let incoming_rowspan = &mut self.incoming_rowspans[current_x_plus_colspan_offset];
-            let new_slot = if *incoming_rowspan == 0 {
-                *incoming_rowspan = outgoing_rowspan;
-                TableSlot::new_spanned(new_offset)
-            } else {
-                // This means we have a table model error.
-
-                // if `incoming_rowspan` is greater than zero, a cell from above is spanning
-                // into our row, colliding with the cells we are creating via colspan. In
-                // that case, set the incoming rowspan to the highest of two possible
-                // outgoing rowspan values (the incoming rowspan minus one, OR this cell's
-                // outgoing rowspan).  `spanned_slot()`` will handle filtering out
-                // inapplicable spans when it needs to.
-                //
-                // If the `incoming_rowspan` is negative we are in `rowspan=0` mode, (i.e.
-                // rowspan=infinity), so we don't have to worry about the current cell
-                // making it larger. In that case, don't change the rowspan.
-                if *incoming_rowspan > 0 {
-                    *incoming_rowspan = std::cmp::max(*incoming_rowspan - 1, outgoing_rowspan);
-                }
-
-                // This code creates a new slot in the case that there is a table model error.
-                let coords_of_spanned_cell =
-                    TableSlotCoordinates::new(current_x_plus_colspan_offset, current_coords.y);
-                let mut incoming_slot = self
-                    .create_spanned_slot_based_on_cell_above(coords_of_spanned_cell)
-                    .expect(
-                        "Nonzero incoming rowspan cannot occur without a cell spanning this slot",
-                    );
-                incoming_slot.push_spanned(new_offset);
-                incoming_slot
-            };
-            self.table.push_new_slot_to_last_row(new_slot);
-        }
-
-        debug_assert_eq!(
-            Some(TableSlotCoordinates::new(
-                current_coords.x + colspan,
-                current_coords.y
-            )),
-            self.current_coords(),
-            "Must have produced `colspan` slot entries!"
-        );
-        self.create_slots_for_cells_above_with_rowspan(true);
-    }
-}
-
-pub(crate) struct TableBuilderTraversal<'style, 'dom, Node> {
-    context: &'style LayoutContext<'style>,
-    info: &'style NodeAndStyleInfo<Node>,
-
-    /// The value of the [`PropagatedBoxTreeData`] to use, either for the row group
-    /// if processing one or for the table itself if outside a row group.
-    current_propagated_data: PropagatedBoxTreeData,
-
-    /// The [`TableBuilder`] for this [`TableBuilderTraversal`]. This is separated
-    /// into another struct so that we can write unit tests against the builder.
-    builder: TableBuilder,
-
-    current_anonymous_row_content: Vec<AnonymousTableContent<'dom, Node>>,
-
-    /// The index of the current row group, if there is one.
-    current_row_group_index: Option<usize>,
-}
-
-impl<'style, 'dom, Node> TableBuilderTraversal<'style, 'dom, Node>
-where
-    Node: NodeExt<'dom>,
-{
-    pub(crate) fn new(
-        context: &'style LayoutContext<'style>,
-        info: &'style NodeAndStyleInfo<Node>,
-        grid_style: Arc<ComputedValues>,
-        propagated_data: PropagatedBoxTreeData,
-    ) -> Self {
-        TableBuilderTraversal {
-            context,
-            info,
-            current_propagated_data: propagated_data,
-            builder: TableBuilder::new(
-                info.style.clone(),
-                grid_style,
-                info.into(),
-                propagated_data.allow_percentage_column_in_tables,
-            ),
-            current_anonymous_row_content: Vec::new(),
-            current_row_group_index: None,
-        }
-    }
-
-    pub(crate) fn finish(mut self) -> Table {
-        self.finish_anonymous_row_if_needed();
-        self.builder.finish()
-    }
-
-    fn finish_anonymous_row_if_needed(&mut self) {
-        if AnonymousTableContent::contents_are_whitespace_only(&self.current_anonymous_row_content)
-        {
-            self.current_anonymous_row_content.clear();
-            return;
-        }
-
-        let row_content = std::mem::take(&mut self.current_anonymous_row_content);
-        let context = self.context;
-        let anonymous_style = self
-            .context
-            .shared_context()
-            .stylist
-            .style_for_anonymous::<Node::ConcreteElement>(
-                &context.shared_context().guards,
-                &PseudoElement::ServoAnonymousTableRow,
-                &self.info.style,
-            );
-        let anonymous_info = self.info.new_anonymous(anonymous_style.clone());
-        let mut row_builder =
-            TableRowBuilder::new(self, &anonymous_info, self.current_propagated_data);
-
-        for cell_content in row_content {
-            match cell_content {
-                AnonymousTableContent::Element {
-                    info,
-                    display,
-                    contents,
-                    box_slot,
-                } => {
-                    row_builder.handle_element(&info, display, contents, box_slot);
-                },
-                AnonymousTableContent::Text(info, text) => {
-                    row_builder.handle_text(&info, text);
-                },
-            }
-        }
-
-        row_builder.finish();
-
-        self.push_table_row(TableTrack {
-            base_fragment_info: (&anonymous_info).into(),
-            style: anonymous_style,
-            group_index: self.current_row_group_index,
-            is_anonymous: true,
-        });
-    }
-
-    fn push_table_row(&mut self, table_track: TableTrack) {
-        self.builder.table.rows.push(table_track);
-
-        let last_row = self.builder.table.rows.len();
-        if let Some(index) = self.current_row_group_index {
-            let row_group = &mut self.builder.table.row_groups[index];
-            row_group.track_range.end = last_row;
-        }
-    }
-}
-
-impl<'dom, Node: 'dom> TraversalHandler<'dom, Node> for TableBuilderTraversal<'_, 'dom, Node>
-where
-    Node: NodeExt<'dom>,
-{
-    fn handle_text(&mut self, info: &NodeAndStyleInfo<Node>, text: Cow<'dom, str>) {
-        self.current_anonymous_row_content
-            .push(AnonymousTableContent::Text(info.clone(), text));
-    }
-
-    /// <https://html.spec.whatwg.org/multipage/#forming-a-table>
-    fn handle_element(
-        &mut self,
-        info: &NodeAndStyleInfo<Node>,
-        display: DisplayGeneratingBox,
-        contents: Contents,
-        box_slot: BoxSlot<'dom>,
-    ) {
-        match display {
-            DisplayGeneratingBox::LayoutInternal(internal) => match internal {
-                DisplayLayoutInternal::TableRowGroup |
-                DisplayLayoutInternal::TableFooterGroup |
-                DisplayLayoutInternal::TableHeaderGroup => {
-                    self.finish_anonymous_row_if_needed();
-                    self.builder.incoming_rowspans.clear();
-
-                    let next_row_index = self.builder.table.rows.len();
-                    self.builder.table.row_groups.push(TableTrackGroup {
-                        base_fragment_info: info.into(),
-                        style: info.style.clone(),
-                        group_type: internal.into(),
-                        track_range: next_row_index..next_row_index,
-                    });
-
-                    let previous_propagated_data = self.current_propagated_data;
-                    self.current_propagated_data = self.current_propagated_data.union(&info.style);
-
-                    let new_row_group_index = self.builder.table.row_groups.len() - 1;
-                    self.current_row_group_index = Some(new_row_group_index);
-
-                    NonReplacedContents::try_from(contents).unwrap().traverse(
-                        self.context,
-                        info,
-                        self,
-                    );
-                    self.finish_anonymous_row_if_needed();
-
-                    self.current_row_group_index = None;
-                    self.current_propagated_data = previous_propagated_data;
-                    self.builder.incoming_rowspans.clear();
-
-                    // We are doing this until we have actually set a Box for this `BoxSlot`.
-                    ::std::mem::forget(box_slot)
-                },
-                DisplayLayoutInternal::TableRow => {
-                    self.finish_anonymous_row_if_needed();
-
-                    let context = self.context;
-
-                    let mut row_builder =
-                        TableRowBuilder::new(self, info, self.current_propagated_data);
-                    NonReplacedContents::try_from(contents).unwrap().traverse(
-                        context,
-                        info,
-                        &mut row_builder,
-                    );
-                    row_builder.finish();
-
-                    self.push_table_row(TableTrack {
-                        base_fragment_info: info.into(),
-                        style: info.style.clone(),
-                        group_index: self.current_row_group_index,
-                        is_anonymous: false,
-                    });
-
-                    // We are doing this until we have actually set a Box for this `BoxSlot`.
-                    ::std::mem::forget(box_slot)
-                },
-                DisplayLayoutInternal::TableColumn => {
-                    add_column(
-                        &mut self.builder.table.columns,
-                        info,
-                        None,  /* group_index */
-                        false, /* is_anonymous */
-                    );
-
-                    // We are doing this until we have actually set a Box for this `BoxSlot`.
-                    ::std::mem::forget(box_slot)
-                },
-                DisplayLayoutInternal::TableColumnGroup => {
-                    let column_group_index = self.builder.table.column_groups.len();
-                    let mut column_group_builder = TableColumnGroupBuilder {
-                        column_group_index,
-                        columns: Vec::new(),
-                    };
-
-                    NonReplacedContents::try_from(contents).unwrap().traverse(
-                        self.context,
-                        info,
-                        &mut column_group_builder,
-                    );
-
-                    let first_column = self.builder.table.columns.len();
-                    if column_group_builder.columns.is_empty() {
-                        add_column(
-                            &mut self.builder.table.columns,
-                            info,
-                            Some(column_group_index),
-                            true, /* is_anonymous */
-                        );
-                    } else {
-                        self.builder
-                            .table
-                            .columns
-                            .extend(column_group_builder.columns);
-                    }
-
-                    self.builder.table.column_groups.push(TableTrackGroup {
-                        base_fragment_info: info.into(),
-                        style: info.style.clone(),
-                        group_type: internal.into(),
-                        track_range: first_column..self.builder.table.columns.len(),
-                    });
-
-                    ::std::mem::forget(box_slot);
-                },
-                DisplayLayoutInternal::TableCaption => {
-                    let contents = match contents.try_into() {
-                        Ok(non_replaced_contents) => {
-                            IndependentNonReplacedContents::Flow(BlockFormattingContext::construct(
-                                self.context,
-                                info,
-                                non_replaced_contents,
-                                self.current_propagated_data,
-                                false, /* is_list_item */
-                            ))
-                        },
-                        Err(_replaced) => {
-                            unreachable!("Replaced should not have a LayoutInternal display type.");
-                        },
-                    };
-
-                    let caption = TableCaption {
-                        context: ArcRefCell::new(IndependentFormattingContext {
-                            base: LayoutBoxBase::new(info.into(), info.style.clone()),
-                            contents: IndependentFormattingContextContents::NonReplaced(contents),
-                        }),
-                    };
-
-                    self.builder.table.captions.push(caption);
-
-                    // We are doing this until we have actually set a Box for this `BoxSlot`.
-                    ::std::mem::forget(box_slot)
-                },
-                DisplayLayoutInternal::TableCell => {
-                    self.current_anonymous_row_content
-                        .push(AnonymousTableContent::Element {
-                            info: info.clone(),
-                            display,
-                            contents,
-                            box_slot,
-                        });
-                },
-            },
-            _ => {
-                self.current_anonymous_row_content
-                    .push(AnonymousTableContent::Element {
-                        info: info.clone(),
-                        display,
-                        contents,
-                        box_slot,
-                    });
-            },
-        }
-    }
-}
-
-struct TableRowBuilder<'style, 'builder, 'dom, 'a, Node> {
-    table_traversal: &'builder mut TableBuilderTraversal<'style, 'dom, Node>,
-
-    /// The [`NodeAndStyleInfo`] of this table row, which we use to
-    /// construct anonymous table cells.
-    info: &'a NodeAndStyleInfo<Node>,
-
-    current_anonymous_cell_content: Vec<AnonymousTableContent<'dom, Node>>,
-
-    /// The [`PropagatedBoxTreeData`] to use for all children of this row.
-    propagated_data: PropagatedBoxTreeData,
-}
-
-impl<'style, 'builder, 'dom, 'a, Node: 'dom> TableRowBuilder<'style, 'builder, 'dom, 'a, Node>
-where
-    Node: NodeExt<'dom>,
-{
-    fn new(
-        table_traversal: &'builder mut TableBuilderTraversal<'style, 'dom, Node>,
-        info: &'a NodeAndStyleInfo<Node>,
-        propagated_data: PropagatedBoxTreeData,
-    ) -> Self {
-        table_traversal.builder.start_row();
-
-        TableRowBuilder {
-            table_traversal,
-            info,
-            current_anonymous_cell_content: Vec::new(),
-            propagated_data: propagated_data.union(&info.style),
-        }
-    }
-
-    fn finish(mut self) {
-        self.finish_current_anonymous_cell_if_needed();
-        self.table_traversal.builder.end_row();
-    }
-
-    fn finish_current_anonymous_cell_if_needed(&mut self) {
-        if AnonymousTableContent::contents_are_whitespace_only(&self.current_anonymous_cell_content)
-        {
-            self.current_anonymous_cell_content.clear();
-            return;
-        }
-
-        let context = self.table_traversal.context;
-        let anonymous_style = context
-            .shared_context()
-            .stylist
-            .style_for_anonymous::<Node::ConcreteElement>(
-                &context.shared_context().guards,
-                &PseudoElement::ServoAnonymousTableCell,
-                &self.info.style,
-            );
-        let anonymous_info = self.info.new_anonymous(anonymous_style);
-
-        let propagated_data = self.propagated_data.disallowing_percentage_table_columns();
-        let mut builder = BlockContainerBuilder::new(context, &anonymous_info, propagated_data);
-
-        for cell_content in self.current_anonymous_cell_content.drain(..) {
-            match cell_content {
-                AnonymousTableContent::Element {
-                    info,
-                    display,
-                    contents,
-                    box_slot,
-                } => {
-                    builder.handle_element(&info, display, contents, box_slot);
-                },
-                AnonymousTableContent::Text(info, text) => {
-                    builder.handle_text(&info, text);
-                },
-            }
-        }
-
-        let block_container = builder.finish();
-        self.table_traversal.builder.add_cell(TableSlotCell {
-            base: LayoutBoxBase::new(BaseFragmentInfo::anonymous(), anonymous_info.style),
-            contents: BlockFormattingContext::from_block_container(block_container),
-            colspan: 1,
-            rowspan: 1,
-        });
-    }
-}
-
-impl<'dom, Node: 'dom> TraversalHandler<'dom, Node> for TableRowBuilder<'_, '_, 'dom, '_, Node>
-where
-    Node: NodeExt<'dom>,
-{
-    fn handle_text(&mut self, info: &NodeAndStyleInfo<Node>, text: Cow<'dom, str>) {
-        self.current_anonymous_cell_content
-            .push(AnonymousTableContent::Text(info.clone(), text));
-    }
-
-    /// <https://html.spec.whatwg.org/multipage/#algorithm-for-processing-rows>
-    fn handle_element(
-        &mut self,
-        info: &NodeAndStyleInfo<Node>,
-        display: DisplayGeneratingBox,
-        contents: Contents,
-        box_slot: BoxSlot<'dom>,
-    ) {
-        #[allow(clippy::collapsible_match)] //// TODO: Remove once the other cases are handled
-        match display {
-            DisplayGeneratingBox::LayoutInternal(internal) => match internal {
-                DisplayLayoutInternal::TableCell => {
-                    // This value will already have filtered out rowspan=0
-                    // in quirks mode, so we don't have to worry about that.
-                    //
-                    // The HTML specification limits the parsed value of `rowspan` to
-                    // 65534 and `colspan` to 1000, so we also enforce the same limits
-                    // when dealing with arbitrary DOM elements (perhaps created via
-                    // script).
-                    let (rowspan, colspan) = info.node.map_or((1, 1), |node| {
-                        let node = node.to_threadsafe();
-                        let rowspan = node.get_rowspan().unwrap_or(1).min(65534) as usize;
-                        let colspan = node.get_colspan().unwrap_or(1).min(1000) as usize;
-                        (rowspan, colspan)
-                    });
-
-                    let propagated_data =
-                        self.propagated_data.disallowing_percentage_table_columns();
-                    let contents = match contents.try_into() {
-                        Ok(non_replaced_contents) => {
-                            BlockFormattingContext::construct(
-                                self.table_traversal.context,
-                                info,
-                                non_replaced_contents,
-                                propagated_data,
-                                false, /* is_list_item */
-                            )
-                        },
-                        Err(_replaced) => {
-                            unreachable!("Replaced should not have a LayoutInternal display type.");
-                        },
-                    };
-
-                    self.finish_current_anonymous_cell_if_needed();
-                    self.table_traversal.builder.add_cell(TableSlotCell {
-                        base: LayoutBoxBase::new(info.into(), info.style.clone()),
-                        contents,
-                        colspan,
-                        rowspan,
-                    });
-
-                    // We are doing this until we have actually set a Box for this `BoxSlot`.
-                    ::std::mem::forget(box_slot)
-                },
-                _ => {
-                    //// TODO: Properly handle other table-like elements in the middle of a row.
-                    self.current_anonymous_cell_content
-                        .push(AnonymousTableContent::Element {
-                            info: info.clone(),
-                            display,
-                            contents,
-                            box_slot,
-                        });
-                },
-            },
-            _ => {
-                self.current_anonymous_cell_content
-                    .push(AnonymousTableContent::Element {
-                        info: info.clone(),
-                        display,
-                        contents,
-                        box_slot,
-                    });
-            },
-        }
-    }
-}
-
-struct TableColumnGroupBuilder {
-    column_group_index: usize,
-    columns: Vec<TableTrack>,
-}
-
-impl<'dom, Node: 'dom> TraversalHandler<'dom, Node> for TableColumnGroupBuilder
-where
-    Node: NodeExt<'dom>,
-{
-    fn handle_text(&mut self, _info: &NodeAndStyleInfo<Node>, _text: Cow<'dom, str>) {}
-    fn handle_element(
-        &mut self,
-        info: &NodeAndStyleInfo<Node>,
-        display: DisplayGeneratingBox,
-        _contents: Contents,
-        box_slot: BoxSlot<'dom>,
-    ) {
-        // We are doing this until we have actually set a Box for this `BoxSlot`.
-        ::std::mem::forget(box_slot);
-
-        if !matches!(
-            display,
-            DisplayGeneratingBox::LayoutInternal(DisplayLayoutInternal::TableColumn)
-        ) {
-            return;
-        }
-        add_column(
-            &mut self.columns,
-            info,
-            Some(self.column_group_index),
-            false, /* is_anonymous */
-        );
-    }
-}
-
-impl From<DisplayLayoutInternal> for TableTrackGroupType {
-    fn from(value: DisplayLayoutInternal) -> Self {
-        match value {
-            DisplayLayoutInternal::TableColumnGroup => TableTrackGroupType::ColumnGroup,
-            DisplayLayoutInternal::TableFooterGroup => TableTrackGroupType::FooterGroup,
-            DisplayLayoutInternal::TableHeaderGroup => TableTrackGroupType::HeaderGroup,
-            DisplayLayoutInternal::TableRowGroup => TableTrackGroupType::RowGroup,
-            _ => unreachable!(),
-        }
-    }
-}
-
-fn add_column<'dom, Node>(
-    collection: &mut Vec<TableTrack>,
-    column_info: &NodeAndStyleInfo<Node>,
-    group_index: Option<usize>,
-    is_anonymous: bool,
-) where
-    Node: NodeExt<'dom>,
-{
-    let span = column_info
-        .node
-        .and_then(|node| node.to_threadsafe().get_span())
-        .map_or(1, |span| span.min(1000) as usize);
-
-    collection.extend(
-        repeat(TableTrack {
-            base_fragment_info: column_info.into(),
-            style: column_info.style.clone(),
-            group_index,
-            is_anonymous,
-        })
-        .take(span),
-    );
-}
diff --git a/components/layout_2020/table/layout.rs b/components/layout_2020/table/layout.rs
deleted file mode 100644
index ed35cff6049..00000000000
--- a/components/layout_2020/table/layout.rs
+++ /dev/null
@@ -1,3024 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use core::cmp::Ordering;
-use std::mem;
-use std::ops::Range;
-
-use app_units::Au;
-use log::warn;
-use rayon::iter::{IndexedParallelIterator, IntoParallelRefIterator, ParallelIterator};
-use servo_arc::Arc;
-use style::Zero;
-use style::computed_values::border_collapse::T as BorderCollapse;
-use style::computed_values::box_sizing::T as BoxSizing;
-use style::computed_values::caption_side::T as CaptionSide;
-use style::computed_values::empty_cells::T as EmptyCells;
-use style::computed_values::position::T as Position;
-use style::computed_values::table_layout::T as TableLayoutMode;
-use style::computed_values::visibility::T as Visibility;
-use style::properties::ComputedValues;
-use style::values::computed::{
-    BorderStyle, LengthPercentage as ComputedLengthPercentage, Percentage,
-};
-use style::values::generics::box_::{GenericVerticalAlign as VerticalAlign, VerticalAlignKeyword};
-
-use super::{
-    ArcRefCell, CollapsedBorder, CollapsedBorderLine, SpecificTableGridInfo, Table, TableCaption,
-    TableLayoutStyle, TableSlot, TableSlotCell, TableSlotCoordinates, TableTrack, TableTrackGroup,
-};
-use crate::context::LayoutContext;
-use crate::formatting_contexts::Baselines;
-use crate::fragment_tree::{
-    BaseFragmentInfo, BoxFragment, CollapsedBlockMargins, ExtraBackground, Fragment, FragmentFlags,
-    PositioningFragment, SpecificLayoutInfo,
-};
-use crate::geom::{
-    LogicalRect, LogicalSides, LogicalSides1D, LogicalVec2, PhysicalPoint, PhysicalRect,
-    PhysicalSides, PhysicalVec, Size, SizeConstraint, ToLogical, ToLogicalWithContainingBlock,
-};
-use crate::layout_box_base::CacheableLayoutResult;
-use crate::positioned::{PositioningContext, PositioningContextLength, relative_adjustement};
-use crate::sizing::{ComputeInlineContentSizes, ContentSizes, InlineContentSizesResult};
-use crate::style_ext::{
-    BorderStyleColor, Clamp, ComputedValuesExt, LayoutStyle, PaddingBorderMargin,
-};
-use crate::{
-    ConstraintSpace, ContainingBlock, ContainingBlockSize, IndefiniteContainingBlock, WritingMode,
-};
-
-/// A result of a final or speculative layout of a single cell in
-/// the table. Note that this is only done for slots that are not
-/// covered by spans or empty.
-struct CellLayout {
-    layout: CacheableLayoutResult,
-    padding: LogicalSides<Au>,
-    border: LogicalSides<Au>,
-    positioning_context: PositioningContext,
-}
-
-impl CellLayout {
-    fn ascent(&self) -> Au {
-        self.layout
-            .baselines
-            .first
-            .unwrap_or(self.layout.content_block_size)
-    }
-
-    /// The block size of this laid out cell including its border and padding.
-    fn outer_block_size(&self) -> Au {
-        self.layout.content_block_size + self.border.block_sum() + self.padding.block_sum()
-    }
-
-    /// Whether the cell has no in-flow or out-of-flow contents, other than collapsed whitespace.
-    /// Note this logic differs from 'empty-cells', which counts abspos contents as empty.
-    fn is_empty(&self) -> bool {
-        self.layout.fragments.is_empty()
-    }
-
-    /// Whether the cell is considered empty for the purpose of the 'empty-cells' property.
-    fn is_empty_for_empty_cells(&self) -> bool {
-        self.layout
-            .fragments
-            .iter()
-            .all(|fragment| matches!(fragment, Fragment::AbsoluteOrFixedPositioned(_)))
-    }
-}
-
-/// Information stored during the layout of rows.
-#[derive(Clone, Debug, Default)]
-struct RowLayout {
-    constrained: bool,
-    has_cell_with_span_greater_than_one: bool,
-    percent: Percentage,
-}
-
-/// Information stored during the layout of columns.
-#[derive(Clone, Debug, Default)]
-struct ColumnLayout {
-    constrained: bool,
-    has_originating_cells: bool,
-    content_sizes: ContentSizes,
-    percentage: Option<Percentage>,
-}
-
-fn max_two_optional_percentages(
-    a: Option<Percentage>,
-    b: Option<Percentage>,
-) -> Option<Percentage> {
-    match (a, b) {
-        (Some(a), Some(b)) => Some(Percentage(a.0.max(b.0))),
-        _ => a.or(b),
-    }
-}
-
-impl ColumnLayout {
-    fn incorporate_cell_measure(&mut self, cell_measure: &CellOrTrackMeasure) {
-        self.content_sizes.max_assign(cell_measure.content_sizes);
-        self.percentage = max_two_optional_percentages(self.percentage, cell_measure.percentage);
-    }
-}
-
-impl CollapsedBorder {
-    fn new(style_color: BorderStyleColor, width: Au) -> Self {
-        Self { style_color, width }
-    }
-
-    fn from_layout_style(
-        layout_style: &LayoutStyle,
-        writing_mode: WritingMode,
-    ) -> LogicalSides<Self> {
-        let border_style_color = layout_style.style().border_style_color(writing_mode);
-        let border_width = layout_style.border_width(writing_mode);
-        LogicalSides {
-            inline_start: Self::new(border_style_color.inline_start, border_width.inline_start),
-            inline_end: Self::new(border_style_color.inline_end, border_width.inline_end),
-            block_start: Self::new(border_style_color.block_start, border_width.block_start),
-            block_end: Self::new(border_style_color.block_end, border_width.block_end),
-        }
-    }
-
-    fn max_assign(&mut self, other: &Self) {
-        if *self < *other {
-            *self = other.clone();
-        }
-    }
-
-    fn max_assign_to_slice(&self, slice: &mut [CollapsedBorder]) {
-        for collapsed_border in slice {
-            collapsed_border.max_assign(self)
-        }
-    }
-
-    fn hide(&mut self) {
-        self.style_color = BorderStyleColor::hidden();
-        self.width = Au::zero();
-    }
-}
-
-/// <https://drafts.csswg.org/css-tables/#border-specificity>
-/// > Given two borders styles, the border style having the most specificity is the border style which…
-/// > 1. … has the value "hidden" as border-style, if only one does
-/// > 2. … has the biggest border-width, once converted into css pixels
-/// > 3. … has the border-style which comes first in the following list:
-/// >    double, solid, dashed, dotted, ridge, outset, groove, inset, none
-impl PartialOrd for CollapsedBorder {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        let is_hidden = |border: &Self| border.style_color.style == BorderStyle::Hidden;
-        let style_specificity = |border: &Self| match border.style_color.style {
-            BorderStyle::None => 0,
-            BorderStyle::Inset => 1,
-            BorderStyle::Groove => 2,
-            BorderStyle::Outset => 3,
-            BorderStyle::Ridge => 4,
-            BorderStyle::Dotted => 5,
-            BorderStyle::Dashed => 6,
-            BorderStyle::Solid => 7,
-            BorderStyle::Double => 8,
-            BorderStyle::Hidden => 9,
-        };
-        let candidate = (is_hidden(self).cmp(&is_hidden(other)))
-            .then_with(|| self.width.cmp(&other.width))
-            .then_with(|| style_specificity(self).cmp(&style_specificity(other)));
-        if !candidate.is_eq() || self.style_color.color == other.style_color.color {
-            Some(candidate)
-        } else {
-            None
-        }
-    }
-}
-
-impl Eq for CollapsedBorder {}
-
-type CollapsedBorders = LogicalVec2<Vec<CollapsedBorderLine>>;
-
-/// A helper struct that performs the layout of the box tree version
-/// of a table into the fragment tree version. This implements
-/// <https://drafts.csswg.org/css-tables/#table-layout-algorithm>
-pub(crate) struct TableLayout<'a> {
-    table: &'a Table,
-    pbm: PaddingBorderMargin,
-    rows: Vec<RowLayout>,
-    columns: Vec<ColumnLayout>,
-    cell_measures: Vec<Vec<LogicalVec2<CellOrTrackMeasure>>>,
-    /// The calculated width of the table, including space for the grid and also for any
-    /// captions.
-    table_width: Au,
-    /// The table width minus the total horizontal border spacing (if any). This is the
-    /// width that we will be able to allocate to the columns.
-    assignable_width: Au,
-    final_table_height: Au,
-    distributed_column_widths: Vec<Au>,
-    row_sizes: Vec<Au>,
-    /// The accumulated baseline of each row, relative to the top of the row.
-    row_baselines: Vec<Au>,
-    cells_laid_out: Vec<Vec<Option<CellLayout>>>,
-    basis_for_cell_padding_percentage: Au,
-    /// Information about collapsed borders.
-    collapsed_borders: Option<CollapsedBorders>,
-    is_in_fixed_mode: bool,
-}
-
-#[derive(Clone, Debug)]
-struct CellOrTrackMeasure {
-    content_sizes: ContentSizes,
-    percentage: Option<Percentage>,
-}
-
-impl Zero for CellOrTrackMeasure {
-    fn zero() -> Self {
-        Self {
-            content_sizes: ContentSizes::zero(),
-            percentage: None,
-        }
-    }
-
-    fn is_zero(&self) -> bool {
-        self.content_sizes.is_zero() && self.percentage.is_none()
-    }
-}
-
-impl<'a> TableLayout<'a> {
-    fn new(table: &'a Table) -> TableLayout<'a> {
-        // The CSSWG resolved that only `inline-size: auto` can prevent fixed table mode.
-        // <https://github.com/w3c/csswg-drafts/issues/10937#issuecomment-2669150397>
-        let style = &table.style;
-        let is_in_fixed_mode = style.get_table().table_layout == TableLayoutMode::Fixed &&
-            !style.box_size(style.writing_mode).inline.is_initial();
-        Self {
-            table,
-            pbm: PaddingBorderMargin::zero(),
-            rows: Vec::new(),
-            columns: Vec::new(),
-            cell_measures: Vec::new(),
-            table_width: Au::zero(),
-            assignable_width: Au::zero(),
-            final_table_height: Au::zero(),
-            distributed_column_widths: Vec::new(),
-            row_sizes: Vec::new(),
-            row_baselines: Vec::new(),
-            cells_laid_out: Vec::new(),
-            basis_for_cell_padding_percentage: Au::zero(),
-            collapsed_borders: None,
-            is_in_fixed_mode,
-        }
-    }
-
-    /// This is an implementation of *Computing Cell Measures* from
-    /// <https://drafts.csswg.org/css-tables/#computing-cell-measures>.
-    pub(crate) fn compute_cell_measures(
-        &mut self,
-        layout_context: &LayoutContext,
-        writing_mode: WritingMode,
-    ) {
-        let row_measures = vec![LogicalVec2::zero(); self.table.size.width];
-        self.cell_measures = vec![row_measures; self.table.size.height];
-
-        for row_index in 0..self.table.size.height {
-            for column_index in 0..self.table.size.width {
-                let cell = match self.table.slots[row_index][column_index] {
-                    TableSlot::Cell(ref cell) => cell,
-                    _ => continue,
-                };
-
-                let layout_style = cell.layout_style();
-                let padding = layout_style
-                    .padding(writing_mode)
-                    .percentages_relative_to(Au::zero());
-                let border = self
-                    .get_collapsed_border_widths_for_area(LogicalSides {
-                        inline_start: column_index,
-                        inline_end: column_index + cell.colspan,
-                        block_start: row_index,
-                        block_end: row_index + cell.rowspan,
-                    })
-                    .unwrap_or_else(|| layout_style.border_width(writing_mode));
-
-                let padding_border_sums = LogicalVec2 {
-                    inline: padding.inline_sum() + border.inline_sum(),
-                    block: padding.block_sum() + border.block_sum(),
-                };
-
-                let CellOrColumnOuterSizes {
-                    preferred: preferred_size,
-                    min: min_size,
-                    max: max_size,
-                    percentage: percentage_size,
-                } = CellOrColumnOuterSizes::new(
-                    &cell.base.style,
-                    writing_mode,
-                    &padding_border_sums,
-                    self.is_in_fixed_mode,
-                );
-
-                // <https://drafts.csswg.org/css-tables/#in-fixed-mode>
-                // > When a table-root is laid out in fixed mode, the content of its table-cells is ignored
-                // > for the purpose of width computation, the aggregation algorithm for column sizing considers
-                // > only table-cells belonging to the first row track
-                let inline_measure = if self.is_in_fixed_mode {
-                    if row_index > 0 {
-                        CellOrTrackMeasure::zero()
-                    } else {
-                        CellOrTrackMeasure {
-                            content_sizes: preferred_size.inline.into(),
-                            percentage: percentage_size.inline,
-                        }
-                    }
-                } else {
-                    let inline_content_sizes = cell.inline_content_sizes(layout_context) +
-                        padding_border_sums.inline.into();
-                    assert!(
-                        inline_content_sizes.max_content >= inline_content_sizes.min_content,
-                        "the max-content size should never be smaller than the min-content size"
-                    );
-
-                    // These formulas differ from the spec, but seem to match Gecko and Blink.
-                    let outer_min_content_width = inline_content_sizes
-                        .min_content
-                        .clamp_between_extremums(min_size.inline, max_size.inline);
-                    let outer_max_content_width = if self.columns[column_index].constrained {
-                        inline_content_sizes
-                            .min_content
-                            .max(preferred_size.inline)
-                            .clamp_between_extremums(min_size.inline, max_size.inline)
-                    } else {
-                        inline_content_sizes
-                            .max_content
-                            .max(preferred_size.inline)
-                            .clamp_between_extremums(min_size.inline, max_size.inline)
-                    };
-                    assert!(outer_min_content_width <= outer_max_content_width);
-
-                    CellOrTrackMeasure {
-                        content_sizes: ContentSizes {
-                            min_content: outer_min_content_width,
-                            max_content: outer_max_content_width,
-                        },
-                        percentage: percentage_size.inline,
-                    }
-                };
-
-                // This measure doesn't take into account the `min-content` and `max-content` sizes.
-                // These sizes are incorporated after the first row layout pass, when the block size
-                // of the layout is known.
-                let block_measure = CellOrTrackMeasure {
-                    content_sizes: preferred_size.block.into(),
-                    percentage: percentage_size.block,
-                };
-
-                self.cell_measures[row_index][column_index] = LogicalVec2 {
-                    inline: inline_measure,
-                    block: block_measure,
-                };
-            }
-        }
-    }
-
-    /// Compute the constrainedness of every column in the table.
-    ///
-    /// > A column is constrained if its corresponding table-column-group (if any), its
-    /// > corresponding table-column (if any), or any of the cells spanning only that
-    /// > column has a computed width that is not "auto", and is not a percentage.
-    fn compute_track_constrainedness_and_has_originating_cells(
-        &mut self,
-        writing_mode: WritingMode,
-    ) {
-        self.rows = vec![RowLayout::default(); self.table.size.height];
-        self.columns = vec![ColumnLayout::default(); self.table.size.width];
-
-        let is_length = |size: &Size<ComputedLengthPercentage>| {
-            size.to_numeric().is_some_and(|size| !size.has_percentage())
-        };
-
-        for column_index in 0..self.table.size.width {
-            if let Some(column) = self.table.columns.get(column_index) {
-                if is_length(&column.style.box_size(writing_mode).inline) {
-                    self.columns[column_index].constrained = true;
-                    continue;
-                }
-                if let Some(column_group_index) = column.group_index {
-                    let column_group = &self.table.column_groups[column_group_index];
-                    if is_length(&column_group.style.box_size(writing_mode).inline) {
-                        self.columns[column_index].constrained = true;
-                        continue;
-                    }
-                }
-            }
-        }
-
-        for row_index in 0..self.table.size.height {
-            if let Some(row) = self.table.rows.get(row_index) {
-                if is_length(&row.style.box_size(writing_mode).block) {
-                    self.rows[row_index].constrained = true;
-                    continue;
-                }
-                if let Some(row_group_index) = row.group_index {
-                    let row_group = &self.table.row_groups[row_group_index];
-                    if is_length(&row_group.style.box_size(writing_mode).block) {
-                        self.rows[row_index].constrained = true;
-                        continue;
-                    }
-                }
-            }
-        }
-
-        for column_index in 0..self.table.size.width {
-            for row_index in 0..self.table.size.height {
-                let coords = TableSlotCoordinates::new(column_index, row_index);
-                let cell_constrained = match self.table.resolve_first_cell(coords) {
-                    Some(cell) if cell.colspan == 1 => {
-                        cell.base.style.box_size(writing_mode).map(is_length)
-                    },
-                    _ => LogicalVec2::default(),
-                };
-
-                let rowspan_greater_than_1 = match self.table.slots[row_index][column_index] {
-                    TableSlot::Cell(ref cell) => cell.rowspan > 1,
-                    _ => false,
-                };
-
-                self.rows[row_index].has_cell_with_span_greater_than_one |= rowspan_greater_than_1;
-                self.rows[row_index].constrained |= cell_constrained.block;
-
-                let has_originating_cell =
-                    matches!(self.table.get_slot(coords), Some(TableSlot::Cell(_)));
-                self.columns[column_index].has_originating_cells |= has_originating_cell;
-                self.columns[column_index].constrained |= cell_constrained.inline;
-            }
-        }
-    }
-
-    /// This is an implementation of *Computing Column Measures* from
-    /// <https://drafts.csswg.org/css-tables/#computing-column-measures>.
-    fn compute_column_measures(&mut self, writing_mode: WritingMode) {
-        // Compute the column measures only taking into account cells with colspan == 1.
-        // This is the base case that will be used to iteratively account for cells with
-        // larger colspans afterward.
-        //
-        // > min-content width of a column based on cells of span up to 1
-        // >     The largest of:
-        // >         - the width specified for the column:
-        // >               - the outer min-content width of its corresponding table-column,
-        // >                 if any (and not auto)
-        // >               - the outer min-content width of its corresponding table-column-group, if any
-        // >               - or 0, if there is none
-        // >         - the outer min-content width of each cell that spans the column whose colSpan
-        // >           is 1 (or just the one in the first row in fixed mode) or 0 if there is none
-        // >
-        // > max-content width of a column based on cells of span up to 1
-        // >     The largest of:
-        // >         - the outer max-content width of its corresponding
-        // >           table-column-group, if any
-        // >         - the outer max-content width of its corresponding table-column, if any
-        // >         - the outer max-content width of each cell that spans the column
-        // >           whose colSpan is 1 (or just the one in the first row if in fixed mode) or 0
-        // >           if there is no such cell
-        // >
-        // > intrinsic percentage width of a column based on cells of span up to 1
-        // >     The largest of the percentage contributions of each cell that spans the column whose colSpan is
-        // >     1, of its corresponding table-column (if any), and of its corresponding table-column-group (if
-        // >     any)
-        //
-        // TODO: Take into account `table-column` and `table-column-group` lengths.
-        // TODO: Take into account changes to this computation for fixed table layout.
-        let mut colspan_cell_constraints = Vec::new();
-        for column_index in 0..self.table.size.width {
-            let column = &mut self.columns[column_index];
-
-            let column_measure = self.table.get_column_measure_for_column_at_index(
-                writing_mode,
-                column_index,
-                self.is_in_fixed_mode,
-            );
-            column.content_sizes = column_measure.content_sizes;
-            column.percentage = column_measure.percentage;
-
-            for row_index in 0..self.table.size.height {
-                let coords = TableSlotCoordinates::new(column_index, row_index);
-                let cell_measure = &self.cell_measures[row_index][column_index].inline;
-
-                let cell = match self.table.get_slot(coords) {
-                    Some(TableSlot::Cell(cell)) => cell,
-                    _ => continue,
-                };
-
-                if cell.colspan != 1 {
-                    colspan_cell_constraints.push(ColspanToDistribute {
-                        starting_column: column_index,
-                        span: cell.colspan,
-                        content_sizes: cell_measure.content_sizes,
-                        percentage: cell_measure.percentage,
-                    });
-                    continue;
-                }
-
-                // This takes the max of `min_content`, `max_content`, and
-                // intrinsic percentage width as described above.
-                column.incorporate_cell_measure(cell_measure);
-            }
-        }
-
-        // Sort the colspanned cell constraints by their span and starting column.
-        colspan_cell_constraints.sort_by(ColspanToDistribute::comparison_for_sort);
-
-        // Distribute constraints from cells with colspan != 1 to their component columns.
-        self.distribute_colspanned_cells_to_columns(colspan_cell_constraints);
-
-        // > intrinsic percentage width of a column:
-        // > the smaller of:
-        // >   * the intrinsic percentage width of the column based on cells of span up to N,
-        // >     where N is the number of columns in the table
-        // >   * 100% minus the sum of the intrinsic percentage width of all prior columns in
-        // >     the table (further left when direction is "ltr" (right for "rtl"))
-        let mut total_intrinsic_percentage_width = 0.;
-        for column in self.columns.iter_mut() {
-            if let Some(ref mut percentage) = column.percentage {
-                let final_intrinsic_percentage_width =
-                    percentage.0.min(1. - total_intrinsic_percentage_width);
-                total_intrinsic_percentage_width += final_intrinsic_percentage_width;
-                *percentage = Percentage(final_intrinsic_percentage_width);
-            }
-        }
-    }
-
-    fn distribute_colspanned_cells_to_columns(
-        &mut self,
-        colspan_cell_constraints: Vec<ColspanToDistribute>,
-    ) {
-        for colspan_cell_constraints in colspan_cell_constraints {
-            self.distribute_colspanned_cell_to_columns(colspan_cell_constraints);
-        }
-    }
-
-    /// Distribute the inline size from a cell with colspan != 1 to the columns that it spans.
-    /// This is heavily inspired by the approach that Chromium takes in redistributing colspan
-    /// cells' inline size to columns (`DistributeColspanCellToColumnsAuto` in
-    /// `blink/renderer/core/layout/table/table_layout_utils.cc`).
-    fn distribute_colspanned_cell_to_columns(
-        &mut self,
-        colspan_cell_constraints: ColspanToDistribute,
-    ) {
-        let border_spacing = self.table.border_spacing().inline;
-        let column_range = colspan_cell_constraints.range();
-        let column_count = column_range.len();
-        let total_border_spacing =
-            border_spacing.scale_by((colspan_cell_constraints.span - 1) as f32);
-
-        let mut percent_columns_count = 0;
-        let mut columns_percent_sum = 0.;
-        let mut columns_non_percent_max_inline_size_sum = Au::zero();
-        for column in self.columns[column_range.clone()].iter() {
-            if let Some(percentage) = column.percentage {
-                percent_columns_count += 1;
-                columns_percent_sum += percentage.0;
-            } else {
-                columns_non_percent_max_inline_size_sum += column.content_sizes.max_content;
-            }
-        }
-
-        let colspan_percentage = colspan_cell_constraints.percentage.unwrap_or_default();
-        let surplus_percent = colspan_percentage.0 - columns_percent_sum;
-        if surplus_percent > 0. && column_count > percent_columns_count {
-            for column in self.columns[column_range.clone()].iter_mut() {
-                if column.percentage.is_some() {
-                    continue;
-                }
-
-                let ratio = if columns_non_percent_max_inline_size_sum.is_zero() {
-                    1. / ((column_count - percent_columns_count) as f32)
-                } else {
-                    column.content_sizes.max_content.to_f32_px() /
-                        columns_non_percent_max_inline_size_sum.to_f32_px()
-                };
-                column.percentage = Some(Percentage(surplus_percent * ratio));
-            }
-        }
-
-        let colspan_cell_min_size = (colspan_cell_constraints.content_sizes.min_content -
-            total_border_spacing)
-            .max(Au::zero());
-        let distributed_minimum = Self::distribute_width_to_columns(
-            colspan_cell_min_size,
-            &self.columns[column_range.clone()],
-        );
-        {
-            let column_span = &mut self.columns[colspan_cell_constraints.range()];
-            for (column, minimum_size) in column_span.iter_mut().zip(distributed_minimum) {
-                column.content_sizes.min_content.max_assign(minimum_size);
-            }
-        }
-
-        let colspan_cell_max_size = (colspan_cell_constraints.content_sizes.max_content -
-            total_border_spacing)
-            .max(Au::zero());
-        let distributed_maximum = Self::distribute_width_to_columns(
-            colspan_cell_max_size,
-            &self.columns[colspan_cell_constraints.range()],
-        );
-        {
-            let column_span = &mut self.columns[colspan_cell_constraints.range()];
-            for (column, maximum_size) in column_span.iter_mut().zip(distributed_maximum) {
-                column
-                    .content_sizes
-                    .max_content
-                    .max_assign(maximum_size.max(column.content_sizes.min_content));
-            }
-        }
-    }
-
-    fn compute_measures(&mut self, layout_context: &LayoutContext, writing_mode: WritingMode) {
-        self.compute_track_constrainedness_and_has_originating_cells(writing_mode);
-        self.compute_cell_measures(layout_context, writing_mode);
-        self.compute_column_measures(writing_mode);
-    }
-
-    /// Compute the GRIDMIN and GRIDMAX.
-    fn compute_grid_min_max(&self) -> ContentSizes {
-        // https://drafts.csswg.org/css-tables/#gridmin:
-        // > The row/column-grid width minimum (GRIDMIN) width is the sum of the min-content width of
-        // > all the columns plus cell spacing or borders.
-        // https://drafts.csswg.org/css-tables/#gridmax:
-        // > The row/column-grid width maximum (GRIDMAX) width is the sum of the max-content width of
-        // > all the columns plus cell spacing or borders.
-        //
-        // The specification doesn't say what to do with columns with percentages, so we follow the
-        // approach that LayoutNG takes here. We try to figure out the size contribution
-        // of the percentage columns, by working backward to find the calculated
-        // percentage of non-percent columns and using that to calculate the size of the
-        // percent columns.
-        let mut largest_percentage_column_max_size = Au::zero();
-        let mut percent_sum = 0.;
-        let mut non_percent_columns_max_sum = Au::zero();
-        let mut grid_min_max = ContentSizes::zero();
-        for column in self.columns.iter() {
-            match column.percentage {
-                Some(percentage) if !percentage.is_zero() => {
-                    largest_percentage_column_max_size.max_assign(
-                        column
-                            .content_sizes
-                            .max_content
-                            .scale_by(1.0 / percentage.0),
-                    );
-                    percent_sum += percentage.0;
-                },
-                _ => {
-                    non_percent_columns_max_sum += column.content_sizes.max_content;
-                },
-            }
-
-            grid_min_max += column.content_sizes;
-        }
-
-        grid_min_max
-            .max_content
-            .max_assign(largest_percentage_column_max_size);
-
-        // Do not take into account percentage of columns when this table is a descendant
-        // of a flex, grid, or table container. These modes with percentage columns can
-        // cause inline width to become infinitely wide.
-        if !percent_sum.is_zero() &&
-            self.table
-                .percentage_columns_allowed_for_inline_content_sizes
-        {
-            let total_inline_size =
-                non_percent_columns_max_sum.scale_by(1.0 / (1.0 - percent_sum.min(1.0)));
-            grid_min_max.max_content.max_assign(total_inline_size);
-        }
-
-        assert!(
-            grid_min_max.min_content <= grid_min_max.max_content,
-            "GRIDMAX should never be smaller than GRIDMIN {:?}",
-            grid_min_max
-        );
-
-        let inline_border_spacing = self.table.total_border_spacing().inline;
-        grid_min_max.min_content += inline_border_spacing;
-        grid_min_max.max_content += inline_border_spacing;
-        grid_min_max
-    }
-
-    /// Compute CAPMIN: <https://drafts.csswg.org/css-tables/#capmin>
-    fn compute_caption_minimum_inline_size(&self, layout_context: &LayoutContext) -> Au {
-        let containing_block = IndefiniteContainingBlock {
-            size: LogicalVec2::default(),
-            writing_mode: self.table.style.writing_mode,
-        };
-        self.table
-            .captions
-            .iter()
-            .map(|caption| {
-                let context = caption.context.borrow();
-                context
-                    .outer_inline_content_sizes(
-                        layout_context,
-                        &containing_block,
-                        &LogicalVec2::zero(),
-                        false, /* auto_block_size_stretches_to_containing_block */
-                    )
-                    .sizes
-                    .min_content
-            })
-            .max()
-            .unwrap_or_default()
-    }
-
-    fn compute_table_width(&mut self, containing_block_for_children: &ContainingBlock) {
-        // This assumes that the parent formatting context computed the correct inline size
-        // of the table, by enforcing its min-content size as a minimum.
-        // This should be roughly equivalent to what the spec calls "used width of a table".
-        // https://drafts.csswg.org/css-tables/#used-width-of-table
-        self.table_width = containing_block_for_children.size.inline;
-
-        // > The assignable table width is the used width of the table minus the total horizontal
-        // > border spacing (if any). This is the width that we will be able to allocate to the
-        // > columns.
-        self.assignable_width = self.table_width - self.table.total_border_spacing().inline;
-
-        // This is the amount that we will use to resolve percentages in the padding of cells.
-        // It matches what Gecko and Blink do, though they disagree when there is a big caption.
-        self.basis_for_cell_padding_percentage =
-            self.table_width - self.table.border_spacing().inline * 2;
-    }
-
-    /// Distribute width to columns, performing step 2.4 of table layout from
-    /// <https://drafts.csswg.org/css-tables/#table-layout-algorithm>.
-    fn distribute_width_to_columns(target_inline_size: Au, columns: &[ColumnLayout]) -> Vec<Au> {
-        // No need to do anything if there is no column.
-        // Note that tables without rows may still have columns.
-        if columns.is_empty() {
-            return Vec::new();
-        }
-
-        // > First, each column of the table is assigned a sizing type:
-        // >  * percent-column: a column whose any constraint is defined to use a percentage only
-        // >                    (with a value different from 0%)
-        // >  * pixel-column: column whose any constraint is defined to use a defined length only
-        // >                  (and is not a percent-column)
-        // >  * auto-column: any other column
-        // >
-        // > Then, valid sizing methods are to be assigned to the columns by sizing type, yielding
-        // > the following sizing-guesses:
-        // >
-        // > * The min-content sizing-guess is the set of column width assignments where
-        // >   each column is assigned its min-content width.
-        // > * The min-content-percentage sizing-guess is the set of column width assignments where:
-        // >       * each percent-column is assigned the larger of:
-        // >           * its intrinsic percentage width times the assignable width and
-        // >           * its min-content width.
-        // >       * all other columns are assigned their min-content width.
-        // > * The min-content-specified sizing-guess is the set of column width assignments where:
-        // >       * each percent-column is assigned the larger of:
-        // >           * its intrinsic percentage width times the assignable width and
-        // >           * its min-content width
-        // >       * any other column that is constrained is assigned its max-content width
-        // >       * all other columns are assigned their min-content width.
-        // > * The max-content sizing-guess is the set of column width assignments where:
-        // >       * each percent-column is assigned the larger of:
-        // >           * its intrinsic percentage width times the assignable width and
-        // >           * its min-content width
-        // >       * all other columns are assigned their max-content width.
-        let mut min_content_sizing_guesses = Vec::new();
-        let mut min_content_percentage_sizing_guesses = Vec::new();
-        let mut min_content_specified_sizing_guesses = Vec::new();
-        let mut max_content_sizing_guesses = Vec::new();
-
-        for column in columns {
-            let min_content_width = column.content_sizes.min_content;
-            let max_content_width = column.content_sizes.max_content;
-            let constrained = column.constrained;
-
-            let (
-                min_content_percentage_sizing_guess,
-                min_content_specified_sizing_guess,
-                max_content_sizing_guess,
-            ) = if let Some(percentage) = column.percentage {
-                let resolved = target_inline_size.scale_by(percentage.0);
-                let percent_guess = min_content_width.max(resolved);
-                (percent_guess, percent_guess, percent_guess)
-            } else if constrained {
-                (min_content_width, max_content_width, max_content_width)
-            } else {
-                (min_content_width, min_content_width, max_content_width)
-            };
-
-            min_content_sizing_guesses.push(min_content_width);
-            min_content_percentage_sizing_guesses.push(min_content_percentage_sizing_guess);
-            min_content_specified_sizing_guesses.push(min_content_specified_sizing_guess);
-            max_content_sizing_guesses.push(max_content_sizing_guess);
-        }
-
-        // > If the assignable table width is less than or equal to the max-content sizing-guess, the
-        // > used widths of the columns must be the linear combination (with weights adding to 1) of
-        // > the two consecutive sizing-guesses whose width sums bound the available width.
-        //
-        // > Otherwise, the used widths of the columns are the result of starting from the max-content
-        // > sizing-guess and distributing the excess width to the columns of the table according to
-        // > the rules for distributing excess width to columns (for used width).
-        fn sum(guesses: &[Au]) -> Au {
-            guesses.iter().fold(Au::zero(), |sum, guess| sum + *guess)
-        }
-
-        let max_content_sizing_sum = sum(&max_content_sizing_guesses);
-        if target_inline_size >= max_content_sizing_sum {
-            Self::distribute_extra_width_to_columns(
-                columns,
-                &mut max_content_sizing_guesses,
-                max_content_sizing_sum,
-                target_inline_size,
-            );
-            return max_content_sizing_guesses;
-        }
-        let min_content_specified_sizing_sum = sum(&min_content_specified_sizing_guesses);
-        if target_inline_size == min_content_specified_sizing_sum {
-            return min_content_specified_sizing_guesses;
-        }
-        let min_content_percentage_sizing_sum = sum(&min_content_percentage_sizing_guesses);
-        if target_inline_size == min_content_percentage_sizing_sum {
-            return min_content_percentage_sizing_guesses;
-        }
-        let min_content_sizes_sum = sum(&min_content_sizing_guesses);
-        if target_inline_size <= min_content_sizes_sum {
-            return min_content_sizing_guesses;
-        }
-
-        let bounds = |sum_a, sum_b| target_inline_size > sum_a && target_inline_size < sum_b;
-
-        let blend = |a: &[Au], sum_a: Au, b: &[Au], sum_b: Au| {
-            // First convert the Au units to f32 in order to do floating point division.
-            let weight_a = (target_inline_size - sum_b).to_f32_px() / (sum_a - sum_b).to_f32_px();
-            let weight_b = 1.0 - weight_a;
-
-            let mut remaining_assignable_width = target_inline_size;
-            let mut widths: Vec<Au> = a
-                .iter()
-                .zip(b.iter())
-                .map(|(guess_a, guess_b)| {
-                    let column_width = guess_a.scale_by(weight_a) + guess_b.scale_by(weight_b);
-                    // Clamp to avoid exceeding the assignable width. This could otherwise
-                    // happen when dealing with huge values whose sum is clamped to MAX_AU.
-                    let column_width = column_width.min(remaining_assignable_width);
-                    remaining_assignable_width -= column_width;
-                    column_width
-                })
-                .collect();
-
-            if !remaining_assignable_width.is_zero() {
-                // The computations above can introduce floating-point imprecisions.
-                // Since these errors are very small (1Au), it's fine to simply adjust
-                // the first column such that the total width matches the assignable width
-                debug_assert!(
-                    remaining_assignable_width >= Au::zero(),
-                    "Sum of columns shouldn't exceed the assignable table width"
-                );
-                debug_assert!(
-                    remaining_assignable_width <= Au::new(widths.len() as i32),
-                    "A deviation of more than one Au per column is unlikely to be caused by float imprecision"
-                );
-
-                // We checked if the table had columns at the top of the function, so there
-                // always is a first column
-                widths[0] += remaining_assignable_width;
-            }
-
-            debug_assert!(widths.iter().sum::<Au>() == target_inline_size);
-
-            widths
-        };
-
-        if bounds(min_content_sizes_sum, min_content_percentage_sizing_sum) {
-            return blend(
-                &min_content_sizing_guesses,
-                min_content_sizes_sum,
-                &min_content_percentage_sizing_guesses,
-                min_content_percentage_sizing_sum,
-            );
-        }
-
-        if bounds(
-            min_content_percentage_sizing_sum,
-            min_content_specified_sizing_sum,
-        ) {
-            return blend(
-                &min_content_percentage_sizing_guesses,
-                min_content_percentage_sizing_sum,
-                &min_content_specified_sizing_guesses,
-                min_content_specified_sizing_sum,
-            );
-        }
-
-        assert!(bounds(
-            min_content_specified_sizing_sum,
-            max_content_sizing_sum
-        ));
-        blend(
-            &min_content_specified_sizing_guesses,
-            min_content_specified_sizing_sum,
-            &max_content_sizing_guesses,
-            max_content_sizing_sum,
-        )
-    }
-
-    /// This is an implementation of *Distributing excess width to columns* from
-    /// <https://drafts.csswg.org/css-tables/#distributing-width-to-columns>.
-    fn distribute_extra_width_to_columns(
-        columns: &[ColumnLayout],
-        column_sizes: &mut [Au],
-        column_sizes_sum: Au,
-        assignable_width: Au,
-    ) {
-        let all_columns = 0..columns.len();
-        let extra_inline_size = assignable_width - column_sizes_sum;
-
-        let has_originating_cells =
-            |column_index: &usize| columns[*column_index].has_originating_cells;
-        let is_constrained = |column_index: &usize| columns[*column_index].constrained;
-        let is_unconstrained = |column_index: &usize| !is_constrained(column_index);
-        let has_percent_greater_than_zero = |column_index: &usize| {
-            columns[*column_index]
-                .percentage
-                .is_some_and(|percentage| percentage.0 > 0.)
-        };
-        let has_percent_zero = |column_index: &usize| !has_percent_greater_than_zero(column_index);
-        let has_max_content =
-            |column_index: &usize| !columns[*column_index].content_sizes.max_content.is_zero();
-
-        let max_content_sum = |column_index: usize| columns[column_index].content_sizes.max_content;
-
-        // > If there are non-constrained columns that have originating cells with intrinsic
-        // > percentage width of 0% and with nonzero max-content width (aka the columns allowed to
-        // > grow by this rule), the distributed widths of the columns allowed to grow by this rule
-        // > are increased in proportion to max-content width so the total increase adds to the
-        // > excess width.
-        let unconstrained_max_content_columns = all_columns
-            .clone()
-            .filter(is_unconstrained)
-            .filter(has_originating_cells)
-            .filter(has_percent_zero)
-            .filter(has_max_content);
-        let total_max_content_width = unconstrained_max_content_columns
-            .clone()
-            .map(max_content_sum)
-            .fold(Au::zero(), |a, b| a + b);
-        if total_max_content_width != Au::zero() {
-            for column_index in unconstrained_max_content_columns {
-                column_sizes[column_index] += extra_inline_size.scale_by(
-                    columns[column_index].content_sizes.max_content.to_f32_px() /
-                        total_max_content_width.to_f32_px(),
-                );
-            }
-            return;
-        }
-
-        // > Otherwise, if there are non-constrained columns that have originating cells with intrinsic
-        // > percentage width of 0% (aka the columns allowed to grow by this rule, which thanks to the
-        // > previous rule must have zero max-content width), the distributed widths of the columns
-        // > allowed to grow by this rule are increased by equal amounts so the total increase adds to
-        // > the excess width.V
-        let unconstrained_no_percent_columns = all_columns
-            .clone()
-            .filter(is_unconstrained)
-            .filter(has_originating_cells)
-            .filter(has_percent_zero);
-        let total_unconstrained_no_percent = unconstrained_no_percent_columns.clone().count();
-        if total_unconstrained_no_percent > 0 {
-            let extra_space_per_column =
-                extra_inline_size.scale_by(1.0 / total_unconstrained_no_percent as f32);
-            for column_index in unconstrained_no_percent_columns {
-                column_sizes[column_index] += extra_space_per_column;
-            }
-            return;
-        }
-
-        // > Otherwise, if there are constrained columns with intrinsic percentage width of 0% and
-        // > with nonzero max-content width (aka the columns allowed to grow by this rule, which, due
-        // > to other rules, must have originating cells), the distributed widths of the columns
-        // > allowed to grow by this rule are increased in proportion to max-content width so the
-        // > total increase adds to the excess width.
-        let constrained_max_content_columns = all_columns
-            .clone()
-            .filter(is_constrained)
-            .filter(has_originating_cells)
-            .filter(has_percent_zero)
-            .filter(has_max_content);
-        let total_max_content_width = constrained_max_content_columns
-            .clone()
-            .map(max_content_sum)
-            .fold(Au::zero(), |a, b| a + b);
-        if total_max_content_width != Au::zero() {
-            for column_index in constrained_max_content_columns {
-                column_sizes[column_index] += extra_inline_size.scale_by(
-                    columns[column_index].content_sizes.max_content.to_f32_px() /
-                        total_max_content_width.to_f32_px(),
-                );
-            }
-            return;
-        }
-
-        // > Otherwise, if there are columns with intrinsic percentage width greater than 0% (aka the
-        // > columns allowed to grow by this rule, which, due to other rules, must have originating
-        // > cells), the distributed widths of the columns allowed to grow by this rule are increased
-        // > in proportion to intrinsic percentage width so the total increase adds to the excess
-        // > width.
-        let columns_with_percentage = all_columns.clone().filter(has_percent_greater_than_zero);
-        let total_percent = columns_with_percentage
-            .clone()
-            .map(|column_index| columns[column_index].percentage.unwrap_or_default().0)
-            .sum::<f32>();
-        if total_percent > 0. {
-            for column_index in columns_with_percentage {
-                let column_percentage = columns[column_index].percentage.unwrap_or_default();
-                column_sizes[column_index] +=
-                    extra_inline_size.scale_by(column_percentage.0 / total_percent);
-            }
-            return;
-        }
-
-        // > Otherwise, if there is any such column, the distributed widths of all columns that have
-        // > originating cells are increased by equal amounts so the total increase adds to the excess
-        // > width.
-        let has_originating_cells_columns = all_columns.clone().filter(has_originating_cells);
-        let total_has_originating_cells = has_originating_cells_columns.clone().count();
-        if total_has_originating_cells > 0 {
-            let extra_space_per_column =
-                extra_inline_size.scale_by(1.0 / total_has_originating_cells as f32);
-            for column_index in has_originating_cells_columns {
-                column_sizes[column_index] += extra_space_per_column;
-            }
-            return;
-        }
-
-        // > Otherwise, the distributed widths of all columns are increased by equal amounts so the
-        // total increase adds to the excess width.
-        let extra_space_for_all_columns = extra_inline_size.scale_by(1.0 / columns.len() as f32);
-        for guess in column_sizes.iter_mut() {
-            *guess += extra_space_for_all_columns;
-        }
-    }
-
-    /// This is an implementation of *Row layout (first pass)* from
-    /// <https://drafts.csswg.org/css-tables/#row-layout>.
-    fn layout_cells_in_row(
-        &mut self,
-        layout_context: &LayoutContext,
-        containing_block_for_table: &ContainingBlock,
-        parent_positioning_context: &mut PositioningContext,
-    ) {
-        self.cells_laid_out = self
-            .table
-            .slots
-            .par_iter()
-            .enumerate()
-            .map(|(row_index, row_slots)| {
-                // When building the PositioningContext for this cell, we want it to have the same
-                // configuration for whatever PositioningContext the contents are ultimately added to.
-                let collect_for_nearest_positioned_ancestor = parent_positioning_context
-                    .collects_for_nearest_positioned_ancestor() ||
-                    self.table.rows.get(row_index).is_some_and(|row| {
-                        let row_group_collects_for_nearest_positioned_ancestor =
-                            row.group_index.is_some_and(|group_index| {
-                                self.table.row_groups[group_index]
-                                    .style
-                                    .establishes_containing_block_for_absolute_descendants(
-                                        FragmentFlags::empty(),
-                                    )
-                            });
-                        row_group_collects_for_nearest_positioned_ancestor ||
-                            row.style
-                                .establishes_containing_block_for_absolute_descendants(
-                                    FragmentFlags::empty(),
-                                )
-                    });
-
-                row_slots
-                    .par_iter()
-                    .enumerate()
-                    .map(|(column_index, slot)| {
-                        let TableSlot::Cell(cell) = slot else {
-                            return None;
-                        };
-
-                        let area = LogicalSides {
-                            inline_start: column_index,
-                            inline_end: column_index + cell.colspan,
-                            block_start: row_index,
-                            block_end: row_index + cell.rowspan,
-                        };
-                        let layout_style = cell.layout_style();
-                        let border = self
-                            .get_collapsed_border_widths_for_area(area)
-                            .unwrap_or_else(|| {
-                                layout_style
-                                    .border_width(containing_block_for_table.style.writing_mode)
-                            });
-                        let padding: LogicalSides<Au> = layout_style
-                            .padding(containing_block_for_table.style.writing_mode)
-                            .percentages_relative_to(self.basis_for_cell_padding_percentage);
-                        let inline_border_padding_sum = border.inline_sum() + padding.inline_sum();
-
-                        let mut total_cell_width: Au = (column_index..column_index + cell.colspan)
-                            .map(|column_index| self.distributed_column_widths[column_index])
-                            .sum::<Au>() -
-                            inline_border_padding_sum;
-                        total_cell_width = total_cell_width.max(Au::zero());
-
-                        let containing_block_for_children = ContainingBlock {
-                            size: ContainingBlockSize {
-                                inline: total_cell_width,
-                                block: SizeConstraint::default(),
-                            },
-                            style: &cell.base.style,
-                        };
-
-                        let mut positioning_context = PositioningContext::new_for_subtree(
-                            collect_for_nearest_positioned_ancestor,
-                        );
-
-                        let layout = cell.contents.layout(
-                            layout_context,
-                            &mut positioning_context,
-                            &containing_block_for_children,
-                            false, /* depends_on_block_constraints */
-                        );
-
-                        Some(CellLayout {
-                            layout,
-                            padding,
-                            border,
-                            positioning_context,
-                        })
-                    })
-                    .collect()
-            })
-            .collect();
-
-        // Now go through all cells laid out and update the cell measure based on the size
-        // determined during layout.
-        for row_index in 0..self.table.size.height {
-            for column_index in 0..self.table.size.width {
-                let Some(layout) = &self.cells_laid_out[row_index][column_index] else {
-                    continue;
-                };
-
-                self.cell_measures[row_index][column_index]
-                    .block
-                    .content_sizes
-                    .max_assign(layout.outer_block_size().into());
-            }
-        }
-    }
-
-    /// Do the first layout of a table row, after laying out the cells themselves. This is
-    /// more or less and implementation of <https://drafts.csswg.org/css-tables/#row-layout>.
-    fn do_first_row_layout(&mut self, writing_mode: WritingMode) -> Vec<Au> {
-        let mut row_sizes = (0..self.table.size.height)
-            .map(|row_index| {
-                let (mut max_ascent, mut max_descent, mut max_row_height) =
-                    (Au::zero(), Au::zero(), Au::zero());
-
-                for column_index in 0..self.table.size.width {
-                    let cell = match self.table.slots[row_index][column_index] {
-                        TableSlot::Cell(ref cell) => cell,
-                        _ => continue,
-                    };
-
-                    let layout = match self.cells_laid_out[row_index][column_index] {
-                        Some(ref layout) => layout,
-                        None => {
-                            warn!(
-                                "Did not find a layout at a slot index with an originating cell."
-                            );
-                            continue;
-                        },
-                    };
-
-                    let outer_block_size = layout.outer_block_size();
-                    if cell.rowspan == 1 {
-                        max_row_height.max_assign(outer_block_size);
-                    }
-
-                    if cell.effective_vertical_align() == VerticalAlignKeyword::Baseline {
-                        let ascent = layout.ascent();
-                        let border_padding_start =
-                            layout.border.block_start + layout.padding.block_start;
-                        let border_padding_end = layout.border.block_end + layout.padding.block_end;
-                        max_ascent.max_assign(ascent + border_padding_start);
-
-                        // Only take into account the descent of this cell if doesn't span
-                        // rows. The descent portion of the cell in cells that do span rows
-                        // may extend into other rows.
-                        if cell.rowspan == 1 {
-                            max_descent.max_assign(
-                                layout.layout.content_block_size - ascent + border_padding_end,
-                            );
-                        }
-                    }
-                }
-                self.row_baselines.push(max_ascent);
-                max_row_height.max(max_ascent + max_descent)
-            })
-            .collect();
-        self.calculate_row_sizes_after_first_layout(&mut row_sizes, writing_mode);
-        row_sizes
-    }
-
-    #[allow(clippy::ptr_arg)] // Needs to be a vec because of the function above
-    /// After doing layout of table rows, calculate final row size and distribute space across
-    /// rowspanned cells. This follows the implementation of LayoutNG and the priority
-    /// agorithm described at <https://github.com/w3c/csswg-drafts/issues/4418>.
-    fn calculate_row_sizes_after_first_layout(
-        &mut self,
-        row_sizes: &mut Vec<Au>,
-        writing_mode: WritingMode,
-    ) {
-        let mut cells_to_distribute = Vec::new();
-        let mut total_percentage = 0.;
-        #[allow(clippy::needless_range_loop)] // It makes sense to use it here
-        for row_index in 0..self.table.size.height {
-            let row_measure = self
-                .table
-                .get_row_measure_for_row_at_index(writing_mode, row_index);
-            row_sizes[row_index].max_assign(row_measure.content_sizes.min_content);
-
-            let mut percentage = row_measure.percentage.unwrap_or_default().0;
-            for column_index in 0..self.table.size.width {
-                let cell_percentage = self.cell_measures[row_index][column_index]
-                    .block
-                    .percentage
-                    .unwrap_or_default()
-                    .0;
-                percentage = percentage.max(cell_percentage);
-
-                let cell_measure = &self.cell_measures[row_index][column_index].block;
-                let cell = match self.table.slots[row_index][column_index] {
-                    TableSlot::Cell(ref cell) if cell.rowspan > 1 => cell,
-                    TableSlot::Cell(_) => {
-                        // If this is an originating cell, that isn't spanning, then we make sure the row is
-                        // at least big enough to hold the cell.
-                        row_sizes[row_index].max_assign(cell_measure.content_sizes.max_content);
-                        continue;
-                    },
-                    _ => continue,
-                };
-
-                cells_to_distribute.push(RowspanToDistribute {
-                    coordinates: TableSlotCoordinates::new(column_index, row_index),
-                    cell,
-                    measure: cell_measure,
-                });
-            }
-
-            self.rows[row_index].percent = Percentage(percentage.min(1. - total_percentage));
-            total_percentage += self.rows[row_index].percent.0;
-        }
-
-        cells_to_distribute.sort_by(|a, b| {
-            if a.range() == b.range() {
-                return a
-                    .measure
-                    .content_sizes
-                    .min_content
-                    .cmp(&b.measure.content_sizes.min_content);
-            }
-            if a.fully_encloses(b) {
-                return std::cmp::Ordering::Greater;
-            }
-            if b.fully_encloses(a) {
-                return std::cmp::Ordering::Less;
-            }
-            a.coordinates.y.cmp(&b.coordinates.y)
-        });
-
-        for rowspan_to_distribute in cells_to_distribute {
-            let rows_spanned = rowspan_to_distribute.range();
-            let current_rows_size: Au = rows_spanned.clone().map(|index| row_sizes[index]).sum();
-            let border_spacing_spanned =
-                self.table.border_spacing().block * (rows_spanned.len() - 1) as i32;
-            let excess_size = (rowspan_to_distribute.measure.content_sizes.min_content -
-                current_rows_size -
-                border_spacing_spanned)
-                .max(Au::zero());
-
-            self.distribute_extra_size_to_rows(
-                excess_size,
-                rows_spanned,
-                row_sizes,
-                None,
-                true, /* rowspan_distribution */
-            );
-        }
-    }
-
-    /// An implementation of the same extra block size distribution algorithm used in
-    /// LayoutNG and described at <https://github.com/w3c/csswg-drafts/issues/4418>.
-    fn distribute_extra_size_to_rows(
-        &self,
-        mut excess_size: Au,
-        track_range: Range<usize>,
-        track_sizes: &mut [Au],
-        percentage_resolution_size: Option<Au>,
-        rowspan_distribution: bool,
-    ) {
-        if excess_size.is_zero() {
-            return;
-        }
-
-        let is_constrained = |track_index: &usize| self.rows[*track_index].constrained;
-        let is_unconstrained = |track_index: &usize| !is_constrained(track_index);
-        let is_empty: Vec<bool> = track_sizes.iter().map(|size| size.is_zero()).collect();
-        let is_not_empty = |track_index: &usize| !is_empty[*track_index];
-        let other_row_that_starts_a_rowspan = |track_index: &usize| {
-            *track_index != track_range.start &&
-                self.rows[*track_index].has_cell_with_span_greater_than_one
-        };
-
-        // If we have a table height (not during rowspan distribution), first distribute to rows
-        // that have percentage sizes proportionally to the size missing to reach the percentage
-        // of table height required.
-        if let Some(percentage_resolution_size) = percentage_resolution_size {
-            let get_percent_block_size_deficit = |row_index: usize, track_size: Au| {
-                let size_needed_for_percent =
-                    percentage_resolution_size.scale_by(self.rows[row_index].percent.0);
-                (size_needed_for_percent - track_size).max(Au::zero())
-            };
-            let percent_block_size_deficit: Au = track_range
-                .clone()
-                .map(|index| get_percent_block_size_deficit(index, track_sizes[index]))
-                .sum();
-            let percent_distributable_block_size = percent_block_size_deficit.min(excess_size);
-            if percent_distributable_block_size > Au::zero() {
-                for track_index in track_range.clone() {
-                    let row_deficit =
-                        get_percent_block_size_deficit(track_index, track_sizes[track_index]);
-                    if row_deficit > Au::zero() {
-                        let ratio =
-                            row_deficit.to_f32_px() / percent_block_size_deficit.to_f32_px();
-                        let size = percent_distributable_block_size.scale_by(ratio);
-                        track_sizes[track_index] += size;
-                        excess_size -= size;
-                    }
-                }
-            }
-        }
-
-        // If this is rowspan distribution and there are rows other than the first row that have a
-        // cell with rowspan > 1, distribute the extra space equally to those rows.
-        if rowspan_distribution {
-            let rows_that_start_rowspan: Vec<usize> = track_range
-                .clone()
-                .filter(other_row_that_starts_a_rowspan)
-                .collect();
-            if !rows_that_start_rowspan.is_empty() {
-                let scale = 1.0 / rows_that_start_rowspan.len() as f32;
-                for track_index in rows_that_start_rowspan.iter() {
-                    track_sizes[*track_index] += excess_size.scale_by(scale);
-                }
-                return;
-            }
-        }
-
-        // If there are unconstrained non-empty rows, grow them all proportionally to their current size.
-        let unconstrained_non_empty_rows: Vec<usize> = track_range
-            .clone()
-            .filter(is_unconstrained)
-            .filter(is_not_empty)
-            .collect();
-        if !unconstrained_non_empty_rows.is_empty() {
-            let total_size: Au = unconstrained_non_empty_rows
-                .iter()
-                .map(|index| track_sizes[*index])
-                .sum();
-            for track_index in unconstrained_non_empty_rows.iter() {
-                let scale = track_sizes[*track_index].to_f32_px() / total_size.to_f32_px();
-                track_sizes[*track_index] += excess_size.scale_by(scale);
-            }
-            return;
-        }
-
-        let (non_empty_rows, empty_rows): (Vec<usize>, Vec<usize>) =
-            track_range.clone().partition(is_not_empty);
-        let only_have_empty_rows = empty_rows.len() == track_range.len();
-        if !empty_rows.is_empty() {
-            // If this is rowspan distribution and there are only empty rows, just grow the
-            // last one.
-            if rowspan_distribution && only_have_empty_rows {
-                track_sizes[*empty_rows.last().unwrap()] += excess_size;
-                return;
-            }
-
-            // Otherwise, if we only have empty rows or if all the non-empty rows are constrained,
-            // then grow the empty rows.
-            let non_empty_rows_all_constrained = !non_empty_rows.iter().any(is_unconstrained);
-            if only_have_empty_rows || non_empty_rows_all_constrained {
-                // If there are both unconstrained and constrained empty rows, only increase the
-                // size of the unconstrained ones, otherwise increase the size of all empty rows.
-                let mut rows_to_grow = &empty_rows;
-                let unconstrained_empty_rows: Vec<usize> = rows_to_grow
-                    .iter()
-                    .copied()
-                    .filter(is_unconstrained)
-                    .collect();
-                if !unconstrained_empty_rows.is_empty() {
-                    rows_to_grow = &unconstrained_empty_rows;
-                }
-
-                // All empty rows that will grow equally.
-                let scale = 1.0 / rows_to_grow.len() as f32;
-                for track_index in rows_to_grow.iter() {
-                    track_sizes[*track_index] += excess_size.scale_by(scale);
-                }
-                return;
-            }
-        }
-
-        // If there are non-empty rows, they all grow in proportion to their current size,
-        // whether or not they are constrained.
-        if !non_empty_rows.is_empty() {
-            let total_size: Au = non_empty_rows.iter().map(|index| track_sizes[*index]).sum();
-            for track_index in non_empty_rows.iter() {
-                let scale = track_sizes[*track_index].to_f32_px() / total_size.to_f32_px();
-                track_sizes[*track_index] += excess_size.scale_by(scale);
-            }
-        }
-    }
-
-    /// Given computed row sizes, compute the final block size of the table and distribute extra
-    /// block size to table rows.
-    fn compute_table_height_and_final_row_heights(
-        &mut self,
-        mut row_sizes: Vec<Au>,
-        containing_block_for_children: &ContainingBlock,
-    ) {
-        // The table content height is the maximum of the computed table height from style and the
-        // sum of computed row heights from row layout plus size from borders and spacing.
-        // TODO: for `height: stretch`, the block size of the containing block is the available
-        // space for the entire table wrapper, but here we are using that amount for the table grid.
-        // Therefore, if there is a caption, this will cause overflow. Gecko and WebKit have the
-        // same problem, but not Blink.
-        let table_height_from_style = match containing_block_for_children.size.block {
-            SizeConstraint::Definite(size) => size,
-            SizeConstraint::MinMax(min, _) => min,
-        };
-
-        let block_border_spacing = self.table.total_border_spacing().block;
-        let table_height_from_rows = row_sizes.iter().sum::<Au>() + block_border_spacing;
-        self.final_table_height = table_height_from_rows.max(table_height_from_style);
-
-        // If the table height is defined by the rows sizes, there is no extra space to distribute
-        // to rows.
-        if self.final_table_height == table_height_from_rows {
-            self.row_sizes = row_sizes;
-            return;
-        }
-
-        // There was extra block size added to the table from the table style, so distribute this
-        // extra space to rows using the same distribution algorithm used for distributing rowspan
-        // space.
-        // TODO: This should first distribute space to row groups and then to rows.
-        self.distribute_extra_size_to_rows(
-            self.final_table_height - table_height_from_rows,
-            0..self.table.size.height,
-            &mut row_sizes,
-            Some(self.final_table_height),
-            false, /* rowspan_distribution */
-        );
-        self.row_sizes = row_sizes;
-    }
-
-    fn layout_caption(
-        &self,
-        caption: &TableCaption,
-        layout_context: &LayoutContext,
-        parent_positioning_context: &mut PositioningContext,
-    ) -> BoxFragment {
-        let context = caption.context.borrow();
-        let mut positioning_context = PositioningContext::new_for_style(context.style());
-        let containing_block = &ContainingBlock {
-            size: ContainingBlockSize {
-                inline: self.table_width + self.pbm.padding_border_sums.inline,
-                block: SizeConstraint::default(),
-            },
-            style: &self.table.style,
-        };
-
-        // The parent of a caption is the table wrapper, which establishes an independent
-        // formatting context. Therefore, we don't ignore block margins when resolving a
-        // stretch block size. https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing
-        let ignore_block_margins_for_stretch = LogicalSides1D::new(false, false);
-
-        let mut box_fragment = context.layout_in_flow_block_level(
-            layout_context,
-            positioning_context
-                .as_mut()
-                .unwrap_or(parent_positioning_context),
-            containing_block,
-            None, /* sequential_layout_state */
-            ignore_block_margins_for_stretch,
-        );
-
-        if let Some(mut positioning_context) = positioning_context.take() {
-            positioning_context.layout_collected_children(layout_context, &mut box_fragment);
-            parent_positioning_context.append(positioning_context);
-        }
-
-        box_fragment
-    }
-
-    /// Lay out the table (grid and captions) of this [`TableLayout`] into fragments. This should
-    /// only be be called after calling [`TableLayout.compute_measures`].
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(
-            name = "Table::layout",
-            skip_all,
-            fields(servo_profiling = true),
-            level = "trace",
-        )
-    )]
-    fn layout(
-        mut self,
-        layout_context: &LayoutContext,
-        positioning_context: &mut PositioningContext,
-        containing_block_for_children: &ContainingBlock,
-        containing_block_for_table: &ContainingBlock,
-        depends_on_block_constraints: bool,
-    ) -> CacheableLayoutResult {
-        let table_writing_mode = containing_block_for_children.style.writing_mode;
-        self.compute_border_collapse(table_writing_mode);
-        let layout_style = self.table.layout_style(Some(&self));
-        let depends_on_block_constraints = depends_on_block_constraints ||
-            layout_style
-                .content_box_sizes_and_padding_border_margin(&containing_block_for_table.into())
-                .depends_on_block_constraints;
-
-        self.pbm = layout_style
-            .padding_border_margin_with_writing_mode_and_containing_block_inline_size(
-                table_writing_mode,
-                containing_block_for_table.size.inline,
-            );
-        self.compute_measures(layout_context, table_writing_mode);
-        self.compute_table_width(containing_block_for_children);
-
-        // The table wrapper is the one that has the CSS properties for the grid's border and padding. This
-        // weirdness is difficult to express in Servo's layout system. We have the wrapper size itself as if
-        // those properties applied to it and then just account for the discrepency in sizing here. In reality,
-        // the wrapper does not draw borders / backgrounds and all of its content (grid and captions) are
-        // placed with a negative offset in the table wrapper's content box so that they overlap the undrawn
-        // border / padding area.
-        //
-        // TODO: This is a pretty large hack. It would be nicer to actually have the grid sized properly,
-        // but it works for now.
-        //
-        // Get the padding, border, and margin of the table using the inline size of the table's containing
-        // block but in the writing of the table itself.
-        // TODO: This is broken for orthoganol flows, because the inline size of the parent isn't necessarily
-        // the inline size of the table.
-        let containing_block_for_logical_conversion = ContainingBlock {
-            size: ContainingBlockSize {
-                inline: self.table_width,
-                block: containing_block_for_table.size.block,
-            },
-            style: containing_block_for_children.style,
-        };
-        let offset_from_wrapper = -self.pbm.padding - self.pbm.border;
-        let mut current_block_offset = offset_from_wrapper.block_start;
-
-        let mut table_layout = CacheableLayoutResult {
-            fragments: Vec::new(),
-            content_block_size: Zero::zero(),
-            content_inline_size_for_table: None,
-            baselines: Baselines::default(),
-            depends_on_block_constraints,
-            specific_layout_info: Some(SpecificLayoutInfo::TableWrapper),
-            collapsible_margins_in_children: CollapsedBlockMargins::zero(),
-        };
-
-        table_layout
-            .fragments
-            .extend(self.table.captions.iter().filter_map(|caption| {
-                if caption.context.borrow().style().clone_caption_side() != CaptionSide::Top {
-                    return None;
-                }
-
-                let original_positioning_context_length = positioning_context.len();
-                let mut caption_fragment =
-                    self.layout_caption(caption, layout_context, positioning_context);
-
-                // The caption is not placed yet. Construct a rectangle for it in the adjusted containing block
-                // for the table children and only then convert the result to physical geometry.
-                let caption_pbm = caption_fragment
-                    .padding_border_margin()
-                    .to_logical(table_writing_mode);
-
-                let caption_relative_offset = match caption_fragment.style.clone_position() {
-                    Position::Relative => {
-                        relative_adjustement(&caption_fragment.style, containing_block_for_children)
-                    },
-                    _ => LogicalVec2::zero(),
-                };
-
-                caption_fragment.content_rect = LogicalRect {
-                    start_corner: LogicalVec2 {
-                        inline: offset_from_wrapper.inline_start + caption_pbm.inline_start,
-                        block: current_block_offset + caption_pbm.block_start,
-                    } + caption_relative_offset,
-                    size: caption_fragment
-                        .content_rect
-                        .size
-                        .to_logical(table_writing_mode),
-                }
-                .as_physical(Some(&containing_block_for_logical_conversion));
-
-                current_block_offset += caption_fragment
-                    .margin_rect()
-                    .size
-                    .to_logical(table_writing_mode)
-                    .block;
-
-                let caption_fragment = Fragment::Box(ArcRefCell::new(caption_fragment));
-                positioning_context.adjust_static_position_of_hoisted_fragments(
-                    &caption_fragment,
-                    original_positioning_context_length,
-                );
-                Some(caption_fragment)
-            }));
-
-        let original_positioning_context_length = positioning_context.len();
-        let mut grid_fragment = self.layout_grid(
-            layout_context,
-            positioning_context,
-            &containing_block_for_logical_conversion,
-            containing_block_for_children,
-        );
-
-        // Take the baseline of the grid fragment, after adjusting it to be in the coordinate system
-        // of the table wrapper.
-        let logical_grid_content_rect = grid_fragment
-            .content_rect
-            .to_logical(&containing_block_for_logical_conversion);
-        let grid_pbm = grid_fragment
-            .padding_border_margin()
-            .to_logical(table_writing_mode);
-        table_layout.baselines = grid_fragment.baselines(table_writing_mode).offset(
-            current_block_offset +
-                logical_grid_content_rect.start_corner.block +
-                grid_pbm.block_start,
-        );
-
-        grid_fragment.content_rect = LogicalRect {
-            start_corner: LogicalVec2 {
-                inline: offset_from_wrapper.inline_start + grid_pbm.inline_start,
-                block: current_block_offset + grid_pbm.block_start,
-            },
-            size: grid_fragment
-                .content_rect
-                .size
-                .to_logical(table_writing_mode),
-        }
-        .as_physical(Some(&containing_block_for_logical_conversion));
-
-        current_block_offset += grid_fragment
-            .border_rect()
-            .size
-            .to_logical(table_writing_mode)
-            .block;
-        if logical_grid_content_rect.size.inline < self.table_width {
-            // This can happen when collapsing columns
-            table_layout.content_inline_size_for_table =
-                Some(logical_grid_content_rect.size.inline);
-        }
-
-        let grid_fragment = Fragment::Box(ArcRefCell::new(grid_fragment));
-        positioning_context.adjust_static_position_of_hoisted_fragments(
-            &grid_fragment,
-            original_positioning_context_length,
-        );
-        table_layout.fragments.push(grid_fragment);
-
-        table_layout
-            .fragments
-            .extend(self.table.captions.iter().filter_map(|caption| {
-                if caption.context.borrow().style().clone_caption_side() != CaptionSide::Bottom {
-                    return None;
-                }
-
-                let original_positioning_context_length = positioning_context.len();
-                let mut caption_fragment =
-                    self.layout_caption(caption, layout_context, positioning_context);
-
-                // The caption is not placed yet. Construct a rectangle for it in the adjusted containing block
-                // for the table children and only then convert the result to physical geometry.
-                let caption_pbm = caption_fragment
-                    .padding_border_margin()
-                    .to_logical(table_writing_mode);
-                caption_fragment.content_rect = LogicalRect {
-                    start_corner: LogicalVec2 {
-                        inline: offset_from_wrapper.inline_start + caption_pbm.inline_start,
-                        block: current_block_offset + caption_pbm.block_start,
-                    },
-                    size: caption_fragment
-                        .content_rect
-                        .size
-                        .to_logical(table_writing_mode),
-                }
-                .as_physical(Some(&containing_block_for_logical_conversion));
-
-                current_block_offset += caption_fragment
-                    .margin_rect()
-                    .size
-                    .to_logical(table_writing_mode)
-                    .block;
-
-                let caption_fragment = Fragment::Box(ArcRefCell::new(caption_fragment));
-                positioning_context.adjust_static_position_of_hoisted_fragments(
-                    &caption_fragment,
-                    original_positioning_context_length,
-                );
-                Some(caption_fragment)
-            }));
-
-        table_layout.content_block_size = current_block_offset + offset_from_wrapper.block_end;
-        table_layout
-    }
-
-    /// Lay out the grid portion of this [`TableLayout`] into fragments. This should only be be
-    /// called after calling [`TableLayout.compute_measures`].
-    fn layout_grid(
-        &mut self,
-        layout_context: &LayoutContext,
-        positioning_context: &mut PositioningContext,
-        containing_block_for_logical_conversion: &ContainingBlock,
-        containing_block_for_children: &ContainingBlock,
-    ) -> BoxFragment {
-        self.distributed_column_widths =
-            Self::distribute_width_to_columns(self.assignable_width, &self.columns);
-        self.layout_cells_in_row(
-            layout_context,
-            containing_block_for_children,
-            positioning_context,
-        );
-        let table_writing_mode = containing_block_for_children.style.writing_mode;
-        let first_layout_row_heights = self.do_first_row_layout(table_writing_mode);
-        self.compute_table_height_and_final_row_heights(
-            first_layout_row_heights,
-            containing_block_for_children,
-        );
-
-        assert_eq!(self.table.size.height, self.row_sizes.len());
-        assert_eq!(self.table.size.width, self.distributed_column_widths.len());
-
-        if self.table.size.width == 0 && self.table.size.height == 0 {
-            let content_rect = LogicalRect {
-                start_corner: LogicalVec2::zero(),
-                size: LogicalVec2 {
-                    inline: self.table_width,
-                    block: self.final_table_height,
-                },
-            }
-            .as_physical(Some(containing_block_for_logical_conversion));
-            return BoxFragment::new(
-                self.table.grid_base_fragment_info,
-                self.table.grid_style.clone(),
-                Vec::new(),
-                content_rect,
-                self.pbm.padding.to_physical(table_writing_mode),
-                self.pbm.border.to_physical(table_writing_mode),
-                PhysicalSides::zero(),
-                None, /* clearance */
-                CollapsedBlockMargins::zero(),
-            )
-            .with_specific_layout_info(self.specific_layout_info_for_grid());
-        }
-
-        let mut table_fragments = Vec::new();
-        let table_and_track_dimensions = TableAndTrackDimensions::new(self);
-        self.make_fragments_for_columns_and_column_groups(
-            &table_and_track_dimensions,
-            &mut table_fragments,
-        );
-
-        let mut baselines = Baselines::default();
-        let mut row_group_fragment_layout = None;
-        for row_index in 0..self.table.size.height {
-            // From <https://drafts.csswg.org/css-align-3/#baseline-export>
-            // > If any cells in the row participate in first baseline/last baseline alignment along
-            // > the inline axis, the first/last baseline set of the row is generated from their
-            // > shared alignment baseline and the row’s first available font, after alignment has
-            // > been performed. Otherwise, the first/last baseline set of the row is synthesized from
-            // > the lowest and highest content edges of the cells in the row. [CSS2]
-            //
-            // If any cell below has baseline alignment, these values will be overwritten,
-            // but they are initialized to the content edge of the first row.
-            if row_index == 0 {
-                let row_end = table_and_track_dimensions
-                    .get_row_rect(0)
-                    .max_block_position();
-                baselines.first = Some(row_end);
-                baselines.last = Some(row_end);
-            }
-
-            if self.is_row_collapsed(row_index) {
-                continue;
-            }
-
-            let table_row = &self.table.rows[row_index];
-            let mut row_fragment_layout = RowFragmentLayout::new(
-                table_row,
-                row_index,
-                &table_and_track_dimensions,
-                &self.table.style,
-            );
-
-            let old_row_group_index = row_group_fragment_layout
-                .as_ref()
-                .map(|layout: &RowGroupFragmentLayout| layout.index);
-            if table_row.group_index != old_row_group_index {
-                // First create the Fragment for any existing RowGroupFragmentLayout.
-                if let Some(old_row_group_layout) = row_group_fragment_layout.take() {
-                    table_fragments.push(Fragment::Box(old_row_group_layout.finish(
-                        layout_context,
-                        positioning_context,
-                        containing_block_for_logical_conversion,
-                        containing_block_for_children,
-                    )));
-                }
-
-                // Then, create a new RowGroupFragmentLayout for the current and potentially subsequent rows.
-                if let Some(new_group_index) = table_row.group_index {
-                    row_group_fragment_layout = Some(RowGroupFragmentLayout::new(
-                        &self.table.row_groups[new_group_index],
-                        new_group_index,
-                        &table_and_track_dimensions,
-                    ));
-                }
-            }
-
-            let column_indices = 0..self.table.size.width;
-            row_fragment_layout.fragments.reserve(self.table.size.width);
-            for column_index in column_indices {
-                if self.is_column_collapsed(column_index) {
-                    continue;
-                }
-
-                self.do_final_cell_layout(
-                    row_index,
-                    column_index,
-                    &table_and_track_dimensions,
-                    &mut baselines,
-                    &mut row_fragment_layout,
-                    row_group_fragment_layout.as_mut(),
-                    positioning_context,
-                );
-            }
-
-            let row_fragment = Fragment::Box(row_fragment_layout.finish(
-                layout_context,
-                positioning_context,
-                containing_block_for_logical_conversion,
-                containing_block_for_children,
-                &mut row_group_fragment_layout,
-            ));
-
-            match row_group_fragment_layout.as_mut() {
-                Some(layout) => layout.fragments.push(row_fragment),
-                None => table_fragments.push(row_fragment),
-            }
-        }
-
-        if let Some(row_group_layout) = row_group_fragment_layout.take() {
-            table_fragments.push(Fragment::Box(row_group_layout.finish(
-                layout_context,
-                positioning_context,
-                containing_block_for_logical_conversion,
-                containing_block_for_children,
-            )));
-        }
-
-        let content_rect = LogicalRect {
-            start_corner: LogicalVec2::zero(),
-            size: LogicalVec2 {
-                inline: table_and_track_dimensions.table_rect.max_inline_position(),
-                block: table_and_track_dimensions.table_rect.max_block_position(),
-            },
-        }
-        .as_physical(Some(containing_block_for_logical_conversion));
-        BoxFragment::new(
-            self.table.grid_base_fragment_info,
-            self.table.grid_style.clone(),
-            table_fragments,
-            content_rect,
-            self.pbm.padding.to_physical(table_writing_mode),
-            self.pbm.border.to_physical(table_writing_mode),
-            PhysicalSides::zero(),
-            None, /* clearance */
-            CollapsedBlockMargins::zero(),
-        )
-        .with_baselines(baselines)
-        .with_specific_layout_info(self.specific_layout_info_for_grid())
-    }
-
-    fn specific_layout_info_for_grid(&mut self) -> Option<SpecificLayoutInfo> {
-        mem::take(&mut self.collapsed_borders).map(|mut collapsed_borders| {
-            // TODO: It would probably be better to use `TableAndTrackDimensions`, since that
-            // has already taken care of collapsed tracks and knows the final track positions.
-            let mut track_sizes = LogicalVec2 {
-                inline: mem::take(&mut self.distributed_column_widths),
-                block: mem::take(&mut self.row_sizes),
-            };
-            for (column_index, column_size) in track_sizes.inline.iter_mut().enumerate() {
-                if self.is_column_collapsed(column_index) {
-                    mem::take(column_size);
-                }
-            }
-            for (row_index, row_size) in track_sizes.block.iter_mut().enumerate() {
-                if self.is_row_collapsed(row_index) {
-                    mem::take(row_size);
-                }
-            }
-            let writing_mode = self.table.style.writing_mode;
-            if !writing_mode.is_bidi_ltr() {
-                track_sizes.inline.reverse();
-                collapsed_borders.inline.reverse();
-                for border_line in &mut collapsed_borders.block {
-                    border_line.reverse();
-                }
-            }
-            SpecificLayoutInfo::TableGridWithCollapsedBorders(Box::new(SpecificTableGridInfo {
-                collapsed_borders: if writing_mode.is_horizontal() {
-                    PhysicalVec::new(collapsed_borders.inline, collapsed_borders.block)
-                } else {
-                    PhysicalVec::new(collapsed_borders.block, collapsed_borders.inline)
-                },
-                track_sizes: if writing_mode.is_horizontal() {
-                    PhysicalVec::new(track_sizes.inline, track_sizes.block)
-                } else {
-                    PhysicalVec::new(track_sizes.block, track_sizes.inline)
-                },
-            }))
-        })
-    }
-
-    fn is_row_collapsed(&self, row_index: usize) -> bool {
-        let Some(row) = &self.table.rows.get(row_index) else {
-            return false;
-        };
-        if row.style.get_inherited_box().visibility == Visibility::Collapse {
-            return true;
-        }
-        let row_group = match row.group_index {
-            Some(group_index) => &self.table.row_groups[group_index],
-            None => return false,
-        };
-        row_group.style.get_inherited_box().visibility == Visibility::Collapse
-    }
-
-    fn is_column_collapsed(&self, column_index: usize) -> bool {
-        let Some(col) = &self.table.columns.get(column_index) else {
-            return false;
-        };
-        if col.style.get_inherited_box().visibility == Visibility::Collapse {
-            return true;
-        }
-        let col_group = match col.group_index {
-            Some(group_index) => &self.table.column_groups[group_index],
-            None => return false,
-        };
-        col_group.style.get_inherited_box().visibility == Visibility::Collapse
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    fn do_final_cell_layout(
-        &mut self,
-        row_index: usize,
-        column_index: usize,
-        dimensions: &TableAndTrackDimensions,
-        baselines: &mut Baselines,
-        row_fragment_layout: &mut RowFragmentLayout,
-        row_group_fragment_layout: Option<&mut RowGroupFragmentLayout>,
-        positioning_context_for_table: &mut PositioningContext,
-    ) {
-        // The PositioningContext for cells is, in order or preference, the PositioningContext of the row,
-        // the PositioningContext of the row group, or the PositioningContext of the table.
-        let row_group_positioning_context =
-            row_group_fragment_layout.and_then(|layout| layout.positioning_context.as_mut());
-        let positioning_context = row_fragment_layout
-            .positioning_context
-            .as_mut()
-            .or(row_group_positioning_context)
-            .unwrap_or(positioning_context_for_table);
-
-        let layout = match self.cells_laid_out[row_index][column_index].take() {
-            Some(layout) => layout,
-            None => {
-                return;
-            },
-        };
-        let cell = match self.table.slots[row_index][column_index] {
-            TableSlot::Cell(ref cell) => cell,
-            _ => {
-                warn!("Did not find a non-spanned cell at index with layout.");
-                return;
-            },
-        };
-
-        // If this cell has baseline alignment, it can adjust the table's overall baseline.
-        let row_block_offset = row_fragment_layout.rect.start_corner.block;
-        let row_baseline = self.row_baselines[row_index];
-        if cell.effective_vertical_align() == VerticalAlignKeyword::Baseline && !layout.is_empty() {
-            let baseline = row_block_offset + row_baseline;
-            if row_index == 0 {
-                baselines.first = Some(baseline);
-            }
-            baselines.last = Some(baseline);
-        }
-        let mut row_relative_cell_rect = dimensions.get_cell_rect(
-            TableSlotCoordinates::new(column_index, row_index),
-            cell.rowspan,
-            cell.colspan,
-        );
-        row_relative_cell_rect.start_corner -= row_fragment_layout.rect.start_corner;
-        let mut fragment = cell.create_fragment(
-            layout,
-            row_relative_cell_rect,
-            row_baseline,
-            positioning_context,
-            &self.table.style,
-            &row_fragment_layout.containing_block,
-        );
-
-        // Make a table part rectangle relative to the row fragment for the purposes of
-        // drawing extra backgrounds.
-        //
-        // This rectangle is an offset between the row fragment and the other table
-        // part rectangle (row group, column, column group). Everything between them
-        // is laid out in a left-to-right fashion, but respecting the verticality of
-        // the writing mode. This is why below, only the axes are flipped, but the
-        // rectangle is not flipped for RTL.
-        let make_relative_to_row_start = |mut rect: LogicalRect<Au>| {
-            rect.start_corner -= row_fragment_layout.rect.start_corner;
-            let writing_mode = self.table.style.writing_mode;
-            PhysicalRect::new(
-                if writing_mode.is_horizontal() {
-                    PhysicalPoint::new(rect.start_corner.inline, rect.start_corner.block)
-                } else {
-                    PhysicalPoint::new(rect.start_corner.block, rect.start_corner.inline)
-                },
-                rect.size.to_physical_size(writing_mode),
-            )
-        };
-
-        let column = self.table.columns.get(column_index);
-        let column_group = column
-            .and_then(|column| column.group_index)
-            .and_then(|index| self.table.column_groups.get(index));
-        if let Some(column_group) = column_group {
-            let rect = make_relative_to_row_start(dimensions.get_column_group_rect(column_group));
-            fragment.add_extra_background(ExtraBackground {
-                style: column_group.style.clone(),
-                rect,
-            })
-        }
-        if let Some(column) = column {
-            if !column.is_anonymous {
-                let rect = make_relative_to_row_start(dimensions.get_column_rect(column_index));
-                fragment.add_extra_background(ExtraBackground {
-                    style: column.style.clone(),
-                    rect,
-                })
-            }
-        }
-        let row = self.table.rows.get(row_index);
-        let row_group = row
-            .and_then(|row| row.group_index)
-            .and_then(|index| self.table.row_groups.get(index));
-        if let Some(row_group) = row_group {
-            let rect = make_relative_to_row_start(dimensions.get_row_group_rect(row_group));
-            fragment.add_extra_background(ExtraBackground {
-                style: row_group.style.clone(),
-                rect,
-            })
-        }
-        if let Some(row) = row {
-            let rect = make_relative_to_row_start(row_fragment_layout.rect);
-            fragment.add_extra_background(ExtraBackground {
-                style: row.style.clone(),
-                rect,
-            })
-        }
-        row_fragment_layout
-            .fragments
-            .push(Fragment::Box(ArcRefCell::new(fragment)));
-    }
-
-    fn make_fragments_for_columns_and_column_groups(
-        &self,
-        dimensions: &TableAndTrackDimensions,
-        fragments: &mut Vec<Fragment>,
-    ) {
-        for column_group in self.table.column_groups.iter() {
-            if !column_group.is_empty() {
-                fragments.push(Fragment::Positioning(PositioningFragment::new_empty(
-                    column_group.base_fragment_info,
-                    dimensions
-                        .get_column_group_rect(column_group)
-                        .as_physical(None),
-                    column_group.style.clone(),
-                )));
-            }
-        }
-
-        for (column_index, column) in self.table.columns.iter().enumerate() {
-            fragments.push(Fragment::Positioning(PositioningFragment::new_empty(
-                column.base_fragment_info,
-                dimensions.get_column_rect(column_index).as_physical(None),
-                column.style.clone(),
-            )));
-        }
-    }
-
-    fn compute_border_collapse(&mut self, writing_mode: WritingMode) {
-        if self.table.style.get_inherited_table().border_collapse != BorderCollapse::Collapse {
-            self.collapsed_borders = None;
-            return;
-        }
-
-        let mut collapsed_borders = LogicalVec2 {
-            block: vec![
-                vec![Default::default(); self.table.size.width];
-                self.table.size.height + 1
-            ],
-            inline: vec![
-                vec![Default::default(); self.table.size.height];
-                self.table.size.width + 1
-            ],
-        };
-
-        let apply_border = |collapsed_borders: &mut CollapsedBorders,
-                            layout_style: &LayoutStyle,
-                            block: &Range<usize>,
-                            inline: &Range<usize>| {
-            let border = CollapsedBorder::from_layout_style(layout_style, writing_mode);
-            border
-                .block_start
-                .max_assign_to_slice(&mut collapsed_borders.block[block.start][inline.clone()]);
-            border
-                .block_end
-                .max_assign_to_slice(&mut collapsed_borders.block[block.end][inline.clone()]);
-            border
-                .inline_start
-                .max_assign_to_slice(&mut collapsed_borders.inline[inline.start][block.clone()]);
-            border
-                .inline_end
-                .max_assign_to_slice(&mut collapsed_borders.inline[inline.end][block.clone()]);
-        };
-        let hide_inner_borders = |collapsed_borders: &mut CollapsedBorders,
-                                  block: &Range<usize>,
-                                  inline: &Range<usize>| {
-            for x in inline.clone() {
-                for y in block.clone() {
-                    if x != inline.start {
-                        collapsed_borders.inline[x][y].hide();
-                    }
-                    if y != block.start {
-                        collapsed_borders.block[y][x].hide();
-                    }
-                }
-            }
-        };
-        let all_rows = 0..self.table.size.height;
-        let all_columns = 0..self.table.size.width;
-        for row_index in all_rows.clone() {
-            for column_index in all_columns.clone() {
-                let cell = match self.table.slots[row_index][column_index] {
-                    TableSlot::Cell(ref cell) => cell,
-                    _ => continue,
-                };
-                let block_range = row_index..row_index + cell.rowspan;
-                let inline_range = column_index..column_index + cell.colspan;
-                hide_inner_borders(&mut collapsed_borders, &block_range, &inline_range);
-                apply_border(
-                    &mut collapsed_borders,
-                    &cell.layout_style(),
-                    &block_range,
-                    &inline_range,
-                );
-            }
-        }
-        for (row_index, row) in self.table.rows.iter().enumerate() {
-            apply_border(
-                &mut collapsed_borders,
-                &row.layout_style(),
-                &(row_index..row_index + 1),
-                &all_columns,
-            );
-        }
-        for row_group in &self.table.row_groups {
-            apply_border(
-                &mut collapsed_borders,
-                &row_group.layout_style(),
-                &row_group.track_range,
-                &all_columns,
-            );
-        }
-        for (column_index, column) in self.table.columns.iter().enumerate() {
-            apply_border(
-                &mut collapsed_borders,
-                &column.layout_style(),
-                &all_rows,
-                &(column_index..column_index + 1),
-            );
-        }
-        for column_group in &self.table.column_groups {
-            apply_border(
-                &mut collapsed_borders,
-                &column_group.layout_style(),
-                &all_rows,
-                &column_group.track_range,
-            );
-        }
-        apply_border(
-            &mut collapsed_borders,
-            &self.table.layout_style_for_grid(),
-            &all_rows,
-            &all_columns,
-        );
-
-        self.collapsed_borders = Some(collapsed_borders);
-    }
-
-    fn get_collapsed_border_widths_for_area(
-        &self,
-        area: LogicalSides<usize>,
-    ) -> Option<LogicalSides<Au>> {
-        let collapsed_borders = self.collapsed_borders.as_ref()?;
-        let columns = || area.inline_start..area.inline_end;
-        let rows = || area.block_start..area.block_end;
-        let max_width = |slice: &[CollapsedBorder]| {
-            let slice_widths = slice.iter().map(|collapsed_border| collapsed_border.width);
-            slice_widths.max().unwrap_or_default()
-        };
-        Some(area.map_inline_and_block_axes(
-            |column| max_width(&collapsed_borders.inline[*column][rows()]) / 2,
-            |row| max_width(&collapsed_borders.block[*row][columns()]) / 2,
-        ))
-    }
-}
-
-struct RowFragmentLayout<'a> {
-    row: &'a TableTrack,
-    rect: LogicalRect<Au>,
-    containing_block: ContainingBlock<'a>,
-    positioning_context: Option<PositioningContext>,
-    fragments: Vec<Fragment>,
-}
-
-impl<'a> RowFragmentLayout<'a> {
-    fn new(
-        table_row: &'a TableTrack,
-        index: usize,
-        dimensions: &TableAndTrackDimensions,
-        table_style: &'a ComputedValues,
-    ) -> Self {
-        let rect = dimensions.get_row_rect(index);
-        let containing_block = ContainingBlock {
-            size: ContainingBlockSize {
-                inline: rect.size.inline,
-                block: SizeConstraint::Definite(rect.size.block),
-            },
-            style: table_style,
-        };
-        Self {
-            row: table_row,
-            rect,
-            positioning_context: PositioningContext::new_for_style(&table_row.style),
-            containing_block,
-            fragments: Vec::new(),
-        }
-    }
-    fn finish(
-        mut self,
-        layout_context: &LayoutContext,
-        table_positioning_context: &mut PositioningContext,
-        containing_block_for_logical_conversion: &ContainingBlock,
-        containing_block_for_children: &ContainingBlock,
-        row_group_fragment_layout: &mut Option<RowGroupFragmentLayout>,
-    ) -> ArcRefCell<BoxFragment> {
-        if self.positioning_context.is_some() {
-            self.rect.start_corner +=
-                relative_adjustement(&self.row.style, containing_block_for_children);
-        }
-
-        let (inline_size, block_size) = if let Some(row_group_layout) = row_group_fragment_layout {
-            self.rect.start_corner -= row_group_layout.rect.start_corner;
-            (
-                row_group_layout.rect.size.inline,
-                SizeConstraint::Definite(row_group_layout.rect.size.block),
-            )
-        } else {
-            (
-                containing_block_for_logical_conversion.size.inline,
-                containing_block_for_logical_conversion.size.block,
-            )
-        };
-
-        let row_group_containing_block = ContainingBlock {
-            size: ContainingBlockSize {
-                inline: inline_size,
-                block: block_size,
-            },
-            style: containing_block_for_logical_conversion.style,
-        };
-
-        let mut row_fragment = BoxFragment::new(
-            self.row.base_fragment_info,
-            self.row.style.clone(),
-            self.fragments,
-            self.rect.as_physical(Some(&row_group_containing_block)),
-            PhysicalSides::zero(), /* padding */
-            PhysicalSides::zero(), /* border */
-            PhysicalSides::zero(), /* margin */
-            None,                  /* clearance */
-            CollapsedBlockMargins::zero(),
-        );
-        row_fragment.set_does_not_paint_background();
-
-        if let Some(mut row_positioning_context) = self.positioning_context.take() {
-            row_positioning_context.layout_collected_children(layout_context, &mut row_fragment);
-
-            let positioning_context = row_group_fragment_layout
-                .as_mut()
-                .and_then(|layout| layout.positioning_context.as_mut())
-                .unwrap_or(table_positioning_context);
-            positioning_context.append(row_positioning_context);
-        }
-
-        ArcRefCell::new(row_fragment)
-    }
-}
-
-struct RowGroupFragmentLayout {
-    base_fragment_info: BaseFragmentInfo,
-    style: Arc<ComputedValues>,
-    rect: LogicalRect<Au>,
-    positioning_context: Option<PositioningContext>,
-    index: usize,
-    fragments: Vec<Fragment>,
-}
-
-impl RowGroupFragmentLayout {
-    fn new(
-        row_group: &TableTrackGroup,
-        index: usize,
-        dimensions: &TableAndTrackDimensions,
-    ) -> Self {
-        let rect = dimensions.get_row_group_rect(row_group);
-        Self {
-            base_fragment_info: row_group.base_fragment_info,
-            style: row_group.style.clone(),
-            rect,
-            positioning_context: PositioningContext::new_for_style(&row_group.style),
-            index,
-            fragments: Vec::new(),
-        }
-    }
-
-    fn finish(
-        mut self,
-        layout_context: &LayoutContext,
-        table_positioning_context: &mut PositioningContext,
-        containing_block_for_logical_conversion: &ContainingBlock,
-        containing_block_for_children: &ContainingBlock,
-    ) -> ArcRefCell<BoxFragment> {
-        if self.positioning_context.is_some() {
-            self.rect.start_corner +=
-                relative_adjustement(&self.style, containing_block_for_children);
-        }
-
-        let mut row_group_fragment = BoxFragment::new(
-            self.base_fragment_info,
-            self.style,
-            self.fragments,
-            self.rect
-                .as_physical(Some(containing_block_for_logical_conversion)),
-            PhysicalSides::zero(), /* padding */
-            PhysicalSides::zero(), /* border */
-            PhysicalSides::zero(), /* margin */
-            None,                  /* clearance */
-            CollapsedBlockMargins::zero(),
-        );
-        row_group_fragment.set_does_not_paint_background();
-
-        if let Some(mut row_positioning_context) = self.positioning_context.take() {
-            row_positioning_context
-                .layout_collected_children(layout_context, &mut row_group_fragment);
-            table_positioning_context.append(row_positioning_context);
-        }
-
-        ArcRefCell::new(row_group_fragment)
-    }
-}
-
-struct TableAndTrackDimensions {
-    /// The rect of the full table, not counting for borders, padding, and margin.
-    table_rect: LogicalRect<Au>,
-    /// The rect of the full table, not counting for borders, padding, and margin
-    /// and offset by any border spacing and caption.
-    table_cells_rect: LogicalRect<Au>,
-    /// The min and max block offsets of each table row.
-    row_dimensions: Vec<(Au, Au)>,
-    /// The min and max inline offsets of each table column
-    column_dimensions: Vec<(Au, Au)>,
-}
-
-impl TableAndTrackDimensions {
-    fn new(table_layout: &TableLayout) -> Self {
-        let border_spacing = table_layout.table.border_spacing();
-
-        // The sizes used for a dimension when that dimension has no table tracks.
-        let fallback_inline_size = table_layout.assignable_width;
-        let fallback_block_size = table_layout.final_table_height;
-
-        let mut column_dimensions = Vec::new();
-        let mut column_offset = Au::zero();
-        for column_index in 0..table_layout.table.size.width {
-            if table_layout.is_column_collapsed(column_index) {
-                column_dimensions.push((column_offset, column_offset));
-                continue;
-            }
-            let start_offset = column_offset + border_spacing.inline;
-            let end_offset = start_offset + table_layout.distributed_column_widths[column_index];
-            column_dimensions.push((start_offset, end_offset));
-            column_offset = end_offset;
-        }
-        column_offset += if table_layout.table.size.width == 0 {
-            fallback_inline_size
-        } else {
-            border_spacing.inline
-        };
-
-        let mut row_dimensions = Vec::new();
-        let mut row_offset = Au::zero();
-        for row_index in 0..table_layout.table.size.height {
-            if table_layout.is_row_collapsed(row_index) {
-                row_dimensions.push((row_offset, row_offset));
-                continue;
-            }
-            let start_offset = row_offset + border_spacing.block;
-            let end_offset = start_offset + table_layout.row_sizes[row_index];
-            row_dimensions.push((start_offset, end_offset));
-            row_offset = end_offset;
-        }
-        row_offset += if table_layout.table.size.height == 0 {
-            fallback_block_size
-        } else {
-            border_spacing.block
-        };
-
-        let table_start_corner = LogicalVec2 {
-            inline: column_dimensions.first().map_or_else(Au::zero, |v| v.0),
-            block: row_dimensions.first().map_or_else(Au::zero, |v| v.0),
-        };
-        let table_size = LogicalVec2 {
-            inline: column_dimensions
-                .last()
-                .map_or(fallback_inline_size, |v| v.1),
-            block: row_dimensions.last().map_or(fallback_block_size, |v| v.1),
-        } - table_start_corner;
-        let table_cells_rect = LogicalRect {
-            start_corner: table_start_corner,
-            size: table_size,
-        };
-
-        let table_rect = LogicalRect {
-            start_corner: LogicalVec2::zero(),
-            size: LogicalVec2 {
-                inline: column_offset,
-                block: row_offset,
-            },
-        };
-
-        Self {
-            table_rect,
-            table_cells_rect,
-            row_dimensions,
-            column_dimensions,
-        }
-    }
-
-    fn get_row_rect(&self, row_index: usize) -> LogicalRect<Au> {
-        let mut row_rect = self.table_cells_rect;
-        let row_dimensions = self.row_dimensions[row_index];
-        row_rect.start_corner.block = row_dimensions.0;
-        row_rect.size.block = row_dimensions.1 - row_dimensions.0;
-        row_rect
-    }
-
-    fn get_column_rect(&self, column_index: usize) -> LogicalRect<Au> {
-        let mut row_rect = self.table_cells_rect;
-        let column_dimensions = self.column_dimensions[column_index];
-        row_rect.start_corner.inline = column_dimensions.0;
-        row_rect.size.inline = column_dimensions.1 - column_dimensions.0;
-        row_rect
-    }
-
-    fn get_row_group_rect(&self, row_group: &TableTrackGroup) -> LogicalRect<Au> {
-        if row_group.is_empty() {
-            return LogicalRect::zero();
-        }
-
-        let mut row_group_rect = self.table_cells_rect;
-        let block_start = self.row_dimensions[row_group.track_range.start].0;
-        let block_end = self.row_dimensions[row_group.track_range.end - 1].1;
-        row_group_rect.start_corner.block = block_start;
-        row_group_rect.size.block = block_end - block_start;
-        row_group_rect
-    }
-
-    fn get_column_group_rect(&self, column_group: &TableTrackGroup) -> LogicalRect<Au> {
-        if column_group.is_empty() {
-            return LogicalRect::zero();
-        }
-
-        let mut column_group_rect = self.table_cells_rect;
-        let inline_start = self.column_dimensions[column_group.track_range.start].0;
-        let inline_end = self.column_dimensions[column_group.track_range.end - 1].1;
-        column_group_rect.start_corner.inline = inline_start;
-        column_group_rect.size.inline = inline_end - inline_start;
-        column_group_rect
-    }
-
-    fn get_cell_rect(
-        &self,
-        coordinates: TableSlotCoordinates,
-        rowspan: usize,
-        colspan: usize,
-    ) -> LogicalRect<Au> {
-        let start_corner = LogicalVec2 {
-            inline: self.column_dimensions[coordinates.x].0,
-            block: self.row_dimensions[coordinates.y].0,
-        };
-        let size = LogicalVec2 {
-            inline: self.column_dimensions[coordinates.x + colspan - 1].1,
-            block: self.row_dimensions[coordinates.y + rowspan - 1].1,
-        } - start_corner;
-        LogicalRect { start_corner, size }
-    }
-}
-
-impl Table {
-    fn border_spacing(&self) -> LogicalVec2<Au> {
-        if self.style.clone_border_collapse() == BorderCollapse::Collapse {
-            LogicalVec2::zero()
-        } else {
-            let border_spacing = self.style.clone_border_spacing();
-            LogicalVec2 {
-                inline: border_spacing.horizontal(),
-                block: border_spacing.vertical(),
-            }
-        }
-    }
-
-    fn total_border_spacing(&self) -> LogicalVec2<Au> {
-        let border_spacing = self.border_spacing();
-        LogicalVec2 {
-            inline: if self.size.width > 0 {
-                border_spacing.inline * (self.size.width as i32 + 1)
-            } else {
-                Au::zero()
-            },
-            block: if self.size.height > 0 {
-                border_spacing.block * (self.size.height as i32 + 1)
-            } else {
-                Au::zero()
-            },
-        }
-    }
-
-    fn get_column_measure_for_column_at_index(
-        &self,
-        writing_mode: WritingMode,
-        column_index: usize,
-        is_in_fixed_mode: bool,
-    ) -> CellOrTrackMeasure {
-        let column = match self.columns.get(column_index) {
-            Some(column) => column,
-            None => return CellOrTrackMeasure::zero(),
-        };
-
-        let CellOrColumnOuterSizes {
-            preferred: preferred_size,
-            min: min_size,
-            max: max_size,
-            percentage: percentage_size,
-        } = CellOrColumnOuterSizes::new(
-            &column.style,
-            writing_mode,
-            &Default::default(),
-            is_in_fixed_mode,
-        );
-
-        CellOrTrackMeasure {
-            content_sizes: ContentSizes {
-                // > The outer min-content width of a table-column or table-column-group is
-                // > max(min-width, width).
-                // But that's clearly wrong, since it would be equal to or greater than
-                // the outer max-content width. So we match other browsers instead.
-                min_content: min_size.inline,
-                // > The outer max-content width of a table-column or table-column-group is
-                // > max(min-width, min(max-width, width)).
-                // This matches Gecko, but Blink and WebKit ignore max_size.
-                max_content: preferred_size
-                    .inline
-                    .clamp_between_extremums(min_size.inline, max_size.inline),
-            },
-            percentage: percentage_size.inline,
-        }
-    }
-
-    fn get_row_measure_for_row_at_index(
-        &self,
-        writing_mode: WritingMode,
-        row_index: usize,
-    ) -> CellOrTrackMeasure {
-        let row = match self.rows.get(row_index) {
-            Some(row) => row,
-            None => return CellOrTrackMeasure::zero(),
-        };
-
-        // In the block axis, the min-content and max-content sizes are the same
-        // (except for new layout boxes like grid and flex containers). Note that
-        // other browsers don't seem to use the min and max sizing properties here.
-        let size = row.style.box_size(writing_mode);
-        let max_size = row.style.max_box_size(writing_mode);
-        let percentage_contribution = get_size_percentage_contribution(&size, &max_size);
-
-        CellOrTrackMeasure {
-            content_sizes: size
-                .block
-                .to_numeric()
-                .and_then(|size| size.to_length())
-                .map_or_else(Au::zero, Au::from)
-                .into(),
-            percentage: percentage_contribution.block,
-        }
-    }
-
-    pub(crate) fn layout(
-        &self,
-        layout_context: &LayoutContext,
-        positioning_context: &mut PositioningContext,
-        containing_block_for_children: &ContainingBlock,
-        containing_block_for_table: &ContainingBlock,
-        depends_on_block_constraints: bool,
-    ) -> CacheableLayoutResult {
-        TableLayout::new(self).layout(
-            layout_context,
-            positioning_context,
-            containing_block_for_children,
-            containing_block_for_table,
-            depends_on_block_constraints,
-        )
-    }
-}
-
-impl ComputeInlineContentSizes for Table {
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(
-            name = "Table::compute_inline_content_sizes",
-            skip_all,
-            fields(servo_profiling = true),
-            level = "trace",
-        )
-    )]
-    fn compute_inline_content_sizes(
-        &self,
-        layout_context: &LayoutContext,
-        constraint_space: &ConstraintSpace,
-    ) -> InlineContentSizesResult {
-        let writing_mode = constraint_space.writing_mode;
-        let mut layout = TableLayout::new(self);
-        layout.compute_border_collapse(writing_mode);
-        layout.pbm = self
-            .layout_style(Some(&layout))
-            .padding_border_margin_with_writing_mode_and_containing_block_inline_size(
-                writing_mode,
-                Au::zero(),
-            );
-        layout.compute_measures(layout_context, writing_mode);
-
-        let grid_content_sizes = layout.compute_grid_min_max();
-
-        // Padding and border should apply to the table grid, but they will be taken into
-        // account when computing the inline content sizes of the table wrapper (our parent), so
-        // this code removes their contribution from the inline content size of the caption.
-        let caption_content_sizes = ContentSizes::from(
-            layout.compute_caption_minimum_inline_size(layout_context) -
-                layout.pbm.padding_border_sums.inline,
-        );
-
-        InlineContentSizesResult {
-            sizes: grid_content_sizes.max(caption_content_sizes),
-            depends_on_block_constraints: false,
-        }
-    }
-}
-
-impl Table {
-    #[inline]
-    pub(crate) fn layout_style<'a>(
-        &'a self,
-        layout: Option<&'a TableLayout<'a>>,
-    ) -> LayoutStyle<'a> {
-        LayoutStyle::Table(TableLayoutStyle {
-            table: self,
-            layout,
-        })
-    }
-
-    #[inline]
-    pub(crate) fn layout_style_for_grid(&self) -> LayoutStyle {
-        LayoutStyle::Default(&self.grid_style)
-    }
-}
-
-impl TableTrack {
-    #[inline]
-    pub(crate) fn layout_style(&self) -> LayoutStyle {
-        LayoutStyle::Default(&self.style)
-    }
-}
-
-impl TableTrackGroup {
-    #[inline]
-    pub(crate) fn layout_style(&self) -> LayoutStyle {
-        LayoutStyle::Default(&self.style)
-    }
-}
-
-impl TableLayoutStyle<'_> {
-    #[inline]
-    pub(crate) fn style(&self) -> &ComputedValues {
-        &self.table.style
-    }
-
-    #[inline]
-    pub(crate) fn collapses_borders(&self) -> bool {
-        self.style().get_inherited_table().border_collapse == BorderCollapse::Collapse
-    }
-
-    pub(crate) fn halved_collapsed_border_widths(&self) -> LogicalSides<Au> {
-        debug_assert!(self.collapses_borders());
-        let area = LogicalSides {
-            inline_start: 0,
-            inline_end: self.table.size.width,
-            block_start: 0,
-            block_end: self.table.size.height,
-        };
-        if let Some(layout) = self.layout {
-            layout.get_collapsed_border_widths_for_area(area)
-        } else {
-            // TODO: this should be cached.
-            let mut layout = TableLayout::new(self.table);
-            layout.compute_border_collapse(self.style().writing_mode);
-            layout.get_collapsed_border_widths_for_area(area)
-        }
-        .expect("Collapsed borders should be computed")
-    }
-}
-
-impl TableSlotCell {
-    #[inline]
-    fn layout_style(&self) -> LayoutStyle {
-        self.contents.layout_style(&self.base)
-    }
-
-    fn effective_vertical_align(&self) -> VerticalAlignKeyword {
-        match self.base.style.clone_vertical_align() {
-            VerticalAlign::Keyword(VerticalAlignKeyword::Top) => VerticalAlignKeyword::Top,
-            VerticalAlign::Keyword(VerticalAlignKeyword::Bottom) => VerticalAlignKeyword::Bottom,
-            VerticalAlign::Keyword(VerticalAlignKeyword::Middle) => VerticalAlignKeyword::Middle,
-            _ => VerticalAlignKeyword::Baseline,
-        }
-    }
-
-    fn inline_content_sizes(&self, layout_context: &LayoutContext) -> ContentSizes {
-        let constraint_space = ConstraintSpace::new_for_style_and_ratio(
-            &self.base.style,
-            None, /* TODO: support preferred aspect ratios on non-replaced boxes */
-        );
-        self.base
-            .inline_content_sizes(layout_context, &constraint_space, &self.contents.contents)
-            .sizes
-    }
-
-    fn create_fragment(
-        &self,
-        mut layout: CellLayout,
-        cell_rect: LogicalRect<Au>,
-        cell_baseline: Au,
-        positioning_context: &mut PositioningContext,
-        table_style: &ComputedValues,
-        containing_block: &ContainingBlock,
-    ) -> BoxFragment {
-        // This must be scoped to this function because it conflicts with euclid's Zero.
-        use style::Zero as StyleZero;
-
-        let cell_content_rect = cell_rect.deflate(&(layout.padding + layout.border));
-        let content_block_size = layout.layout.content_block_size;
-        let vertical_align_offset = match self.effective_vertical_align() {
-            VerticalAlignKeyword::Top => Au::zero(),
-            VerticalAlignKeyword::Bottom => cell_content_rect.size.block - content_block_size,
-            VerticalAlignKeyword::Middle => {
-                (cell_content_rect.size.block - content_block_size).scale_by(0.5)
-            },
-            _ => {
-                cell_baseline -
-                    (layout.padding.block_start + layout.border.block_start) -
-                    layout.ascent()
-            },
-        };
-
-        let mut base_fragment_info = self.base.base_fragment_info;
-        if self.base.style.get_inherited_table().empty_cells == EmptyCells::Hide &&
-            table_style.get_inherited_table().border_collapse != BorderCollapse::Collapse &&
-            layout.is_empty_for_empty_cells()
-        {
-            base_fragment_info.flags.insert(FragmentFlags::DO_NOT_PAINT);
-        }
-
-        // Create an `AnonymousFragment` to move the cell contents to the cell baseline.
-        let mut vertical_align_fragment_rect = cell_content_rect;
-        vertical_align_fragment_rect.start_corner = LogicalVec2 {
-            inline: Au::zero(),
-            block: vertical_align_offset,
-        };
-        let vertical_align_fragment = PositioningFragment::new_anonymous(
-            vertical_align_fragment_rect.as_physical(None),
-            layout.layout.fragments,
-        );
-
-        // Adjust the static position of all absolute children based on the
-        // final content rect of this fragment. Note that we are not shifting by the position of the
-        // Anonymous fragment we use to shift content to the baseline.
-        //
-        // TODO(mrobinson): This is correct for absolutes that are direct children of the table
-        // cell, but wrong for absolute fragments that are more deeply nested in the hierarchy of
-        // fragments.
-        let physical_cell_rect = cell_content_rect.as_physical(Some(containing_block));
-        layout
-            .positioning_context
-            .adjust_static_position_of_hoisted_fragments_with_offset(
-                &physical_cell_rect.origin.to_vector(),
-                PositioningContextLength::zero(),
-            );
-        positioning_context.append(layout.positioning_context);
-
-        let specific_layout_info = (table_style.get_inherited_table().border_collapse ==
-            BorderCollapse::Collapse)
-            .then_some(SpecificLayoutInfo::TableCellWithCollapsedBorders);
-
-        BoxFragment::new(
-            base_fragment_info,
-            self.base.style.clone(),
-            vec![Fragment::Positioning(vertical_align_fragment)],
-            physical_cell_rect,
-            layout.padding.to_physical(table_style.writing_mode),
-            layout.border.to_physical(table_style.writing_mode),
-            PhysicalSides::zero(), /* margin */
-            None,                  /* clearance */
-            CollapsedBlockMargins::zero(),
-        )
-        .with_baselines(layout.layout.baselines)
-        .with_specific_layout_info(specific_layout_info)
-    }
-}
-
-fn get_size_percentage_contribution(
-    size: &LogicalVec2<Size<ComputedLengthPercentage>>,
-    max_size: &LogicalVec2<Size<ComputedLengthPercentage>>,
-) -> LogicalVec2<Option<Percentage>> {
-    // From <https://drafts.csswg.org/css-tables/#percentage-contribution>
-    // > The percentage contribution of a table cell, column, or column group is defined
-    // > in terms of the computed values of width and max-width that have computed values
-    // > that are percentages:
-    // >    min(percentage width, percentage max-width).
-    // > If the computed values are not percentages, then 0% is used for width, and an
-    // > infinite percentage is used for max-width.
-    LogicalVec2 {
-        inline: max_two_optional_percentages(
-            size.inline.to_percentage(),
-            max_size.inline.to_percentage(),
-        ),
-        block: max_two_optional_percentages(
-            size.block.to_percentage(),
-            max_size.block.to_percentage(),
-        ),
-    }
-}
-
-struct CellOrColumnOuterSizes {
-    min: LogicalVec2<Au>,
-    preferred: LogicalVec2<Au>,
-    max: LogicalVec2<Option<Au>>,
-    percentage: LogicalVec2<Option<Percentage>>,
-}
-
-impl CellOrColumnOuterSizes {
-    fn new(
-        style: &Arc<ComputedValues>,
-        writing_mode: WritingMode,
-        padding_border_sums: &LogicalVec2<Au>,
-        is_in_fixed_mode: bool,
-    ) -> Self {
-        let box_sizing = style.get_position().box_sizing;
-        let outer_size = |size: LogicalVec2<Au>| match box_sizing {
-            BoxSizing::ContentBox => size + *padding_border_sums,
-            BoxSizing::BorderBox => LogicalVec2 {
-                inline: size.inline.max(padding_border_sums.inline),
-                block: size.block.max(padding_border_sums.block),
-            },
-        };
-
-        let outer_option_size = |size: LogicalVec2<Option<Au>>| match box_sizing {
-            BoxSizing::ContentBox => size.map_inline_and_block_axes(
-                |inline| inline.map(|inline| inline + padding_border_sums.inline),
-                |block| block.map(|block| block + padding_border_sums.block),
-            ),
-            BoxSizing::BorderBox => size.map_inline_and_block_axes(
-                |inline| inline.map(|inline| inline.max(padding_border_sums.inline)),
-                |block| block.map(|block| block.max(padding_border_sums.block)),
-            ),
-        };
-
-        let get_size_for_axis = |size: &Size<ComputedLengthPercentage>| {
-            // Note that measures treat all size values other than <length>
-            // as the initial value of the property.
-            size.to_numeric()
-                .and_then(|length_percentage| length_percentage.to_length())
-                .map(Au::from)
-        };
-
-        let size = style.box_size(writing_mode);
-        if is_in_fixed_mode {
-            return Self {
-                percentage: size.map(|v| v.to_percentage()),
-                preferred: outer_option_size(size.map(get_size_for_axis))
-                    .map(|v| v.unwrap_or_default()),
-                min: LogicalVec2::default(),
-                max: LogicalVec2::default(),
-            };
-        }
-
-        let min_size = style.min_box_size(writing_mode);
-        let max_size = style.max_box_size(writing_mode);
-
-        Self {
-            min: outer_size(min_size.map(|v| get_size_for_axis(v).unwrap_or_default())),
-            preferred: outer_size(size.map(|v| get_size_for_axis(v).unwrap_or_default())),
-            max: outer_option_size(max_size.map(get_size_for_axis)),
-            percentage: get_size_percentage_contribution(&size, &max_size),
-        }
-    }
-}
-
-struct RowspanToDistribute<'a> {
-    coordinates: TableSlotCoordinates,
-    cell: &'a TableSlotCell,
-    measure: &'a CellOrTrackMeasure,
-}
-
-impl RowspanToDistribute<'_> {
-    fn range(&self) -> Range<usize> {
-        self.coordinates.y..self.coordinates.y + self.cell.rowspan
-    }
-
-    fn fully_encloses(&self, other: &RowspanToDistribute) -> bool {
-        other.coordinates.y > self.coordinates.y && other.range().end < self.range().end
-    }
-}
-
-/// The inline size constraints provided by a cell that span multiple columns (`colspan` > 1).
-/// These constraints are distributed to the individual columns that make up this cell's span.
-#[derive(Debug)]
-struct ColspanToDistribute {
-    starting_column: usize,
-    span: usize,
-    content_sizes: ContentSizes,
-    percentage: Option<Percentage>,
-}
-
-impl ColspanToDistribute {
-    /// A comparison function to sort the colspan cell constraints primarily by their span
-    /// width and secondarily by their starting column. This is not an implementation of
-    /// `PartialOrd` because we want to return [`Ordering::Equal`] even if `self != other`.
-    fn comparison_for_sort(a: &Self, b: &Self) -> Ordering {
-        a.span
-            .cmp(&b.span)
-            .then_with(|| b.starting_column.cmp(&b.starting_column))
-    }
-
-    fn range(&self) -> Range<usize> {
-        self.starting_column..self.starting_column + self.span
-    }
-}
diff --git a/components/layout_2020/table/mod.rs b/components/layout_2020/table/mod.rs
deleted file mode 100644
index 81bc9285b5a..00000000000
--- a/components/layout_2020/table/mod.rs
+++ /dev/null
@@ -1,342 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-#![allow(rustdoc::private_intra_doc_links)]
-
-//! # HTML Tables (╯°□°)╯︵ ┻━┻
-//!
-//! This implementation is based on the [table section of the HTML 5 Specification][1],
-//! the draft [CSS Table Module Level! 3][2] and the [LayoutNG implementation of tables][3] in Blink.
-//! In general, the draft specification differs greatly from what other browsers do, so we
-//! generally follow LayoutNG when in question.
-//!
-//! [1]: https://html.spec.whatwg.org/multipage/#tables
-//! [2]: https://drafts.csswg.org/css-tables
-//! [3]: https://source.chromium.org/chromium/chromium/src/third_party/+/main:blink/renderer/core/layout/table
-//!
-//! Table layout is divided into two phases:
-//!
-//! 1. Box Tree Construction
-//! 2. Fragment Tree Construction
-//!
-//! ## Box Tree Construction
-//!
-//! During box tree construction, table layout (`construct.rs`) will traverse the DOM and construct
-//! the basic box tree representation of a table, using the structs defined in this file ([`Table`],
-//! [`TableTrackGroup`], [`TableTrack`], etc). When processing the DOM, elements are handled
-//! differently depending on their `display` value. For instance, an element with `display:
-//! table-cell` is treated as a table cell. HTML table elements like `<table>` and `<td>` are
-//! assigned the corresponding display value from the user agent stylesheet.
-//!
-//! Every [`Table`] holds an array of [`TableSlot`]. A [`TableSlot`] represents either a cell, a cell
-//! location occupied by a cell originating from another place in the table, or is empty. In
-//! addition, when there are table model errors, a slot may spanned by more than one cell.
-//!
-//! During processing, the box tree construction agorithm will also fix up table structure, for
-//! instance, creating anonymous rows for lone table cells and putting non-table content into
-//! anonymous cells. In addition, flow layout will collect table elements outside of tables and create
-//! anonymous tables for them.
-//!
-//! After processing, box tree construction does a fix up pass on tables, converting rowspan=0 into
-//! definite rowspan values and making sure that rowspan and celspan values are not larger than the
-//! table itself. Finally, row groups may be reordered to enforce the fact that the first `<thead>`
-//! comes before `<tbody>` which comes before the first `<tfoot>`.
-//!
-//! ## Fragment Tree Construction
-//!
-//! Fragment tree construction involves calculating the size and positioning of all table elements,
-//! given their style, content, and cell and row spans. This happens both during intrinsic inline
-//! size computation as well as layout into Fragments. In both of these cases, measurement and
-//! layout is done by [`layout::TableLayout`], though for intrinsic size computation only a partial
-//! layout is done.
-//!
-//! In general, we follow the following steps when laying out table content:
-//!
-//! 1. Compute track constrainedness and has originating cells
-//! 2. Compute cell measures
-//! 3. Compute column measures
-//! 4. Compute intrinsic inline sizes for columns and the table
-//! 5. Compute the final table inline size
-//! 6. Distribute size to columns
-//! 7. Do first pass cell layout
-//! 8. Do row layout
-//! 9. Compute table height and final row sizes
-//! 10. Create fragments for table elements (columns, column groups, rows, row groups, cells)
-//!
-//! For intrinsic size computation this process stops at step 4.
-
-mod construct;
-mod layout;
-
-use std::ops::Range;
-
-use app_units::Au;
-pub(crate) use construct::AnonymousTableContent;
-pub use construct::TableBuilder;
-use euclid::{Point2D, Size2D, UnknownUnit, Vector2D};
-use servo_arc::Arc;
-use style::properties::ComputedValues;
-use style::properties::style_structs::Font;
-use style_traits::dom::OpaqueNode;
-
-use super::flow::BlockFormattingContext;
-use crate::cell::ArcRefCell;
-use crate::flow::BlockContainer;
-use crate::formatting_contexts::IndependentFormattingContext;
-use crate::fragment_tree::BaseFragmentInfo;
-use crate::geom::PhysicalVec;
-use crate::layout_box_base::LayoutBoxBase;
-use crate::style_ext::BorderStyleColor;
-use crate::table::layout::TableLayout;
-
-pub type TableSize = Size2D<usize, UnknownUnit>;
-
-#[derive(Debug)]
-pub struct Table {
-    /// The style of this table. These are the properties that apply to the "wrapper" ie the element
-    /// that contains both the grid and the captions. Not all properties are actually used on the
-    /// wrapper though, such as background and borders, which apply to the grid.
-    style: Arc<ComputedValues>,
-
-    /// The style of this table's grid. This is an anonymous style based on the table's style, but
-    /// eliminating all the properties handled by the "wrapper."
-    grid_style: Arc<ComputedValues>,
-
-    /// The [`BaseFragmentInfo`] for this table's grid. This is necessary so that when the
-    /// grid has a background image, it can be associated with the table's node.
-    grid_base_fragment_info: BaseFragmentInfo,
-
-    /// The captions for this table.
-    pub captions: Vec<TableCaption>,
-
-    /// The column groups for this table.
-    pub column_groups: Vec<TableTrackGroup>,
-
-    /// The columns of this table defined by `<colgroup> | display: table-column-group`
-    /// and `<col> | display: table-column` elements as well as `display: table-column`.
-    pub columns: Vec<TableTrack>,
-
-    /// The rows groups for this table defined by `<tbody>`, `<thead>`, and `<tfoot>`.
-    pub row_groups: Vec<TableTrackGroup>,
-
-    /// The rows of this table defined by `<tr>` or `display: table-row` elements.
-    pub rows: Vec<TableTrack>,
-
-    /// The content of the slots of this table.
-    pub slots: Vec<Vec<TableSlot>>,
-
-    /// The size of this table.
-    pub size: TableSize,
-
-    /// Whether or not this Table is anonymous.
-    anonymous: bool,
-
-    /// Whether percentage columns are taken into account during inline content sizes calculation.
-    percentage_columns_allowed_for_inline_content_sizes: bool,
-}
-
-impl Table {
-    pub(crate) fn new(
-        style: Arc<ComputedValues>,
-        grid_style: Arc<ComputedValues>,
-        base_fragment_info: BaseFragmentInfo,
-        percentage_columns_allowed_for_inline_content_sizes: bool,
-    ) -> Self {
-        Self {
-            style,
-            grid_style,
-            grid_base_fragment_info: base_fragment_info,
-            captions: Vec::new(),
-            column_groups: Vec::new(),
-            columns: Vec::new(),
-            row_groups: Vec::new(),
-            rows: Vec::new(),
-            slots: Vec::new(),
-            size: TableSize::zero(),
-            anonymous: false,
-            percentage_columns_allowed_for_inline_content_sizes,
-        }
-    }
-
-    /// Return the slot at the given coordinates, if it exists in the table, otherwise
-    /// return None.
-    fn get_slot(&self, coords: TableSlotCoordinates) -> Option<&TableSlot> {
-        self.slots.get(coords.y)?.get(coords.x)
-    }
-
-    fn resolve_first_cell_coords(
-        &self,
-        coords: TableSlotCoordinates,
-    ) -> Option<TableSlotCoordinates> {
-        match self.get_slot(coords) {
-            Some(&TableSlot::Cell(_)) => Some(coords),
-            Some(TableSlot::Spanned(offsets)) => Some(coords - offsets[0]),
-            _ => None,
-        }
-    }
-
-    fn resolve_first_cell(&self, coords: TableSlotCoordinates) -> Option<&TableSlotCell> {
-        let resolved_coords = self.resolve_first_cell_coords(coords)?;
-        let slot = self.get_slot(resolved_coords);
-        match slot {
-            Some(TableSlot::Cell(cell)) => Some(cell),
-            _ => unreachable!(
-                "Spanned slot should not point to an empty cell or another spanned slot."
-            ),
-        }
-    }
-}
-
-type TableSlotCoordinates = Point2D<usize, UnknownUnit>;
-pub type TableSlotOffset = Vector2D<usize, UnknownUnit>;
-
-#[derive(Debug)]
-pub struct TableSlotCell {
-    /// The [`LayoutBoxBase`] of this table cell.
-    base: LayoutBoxBase,
-
-    /// The contents of this cell, with its own layout.
-    contents: BlockFormattingContext,
-
-    /// Number of columns that the cell is to span. Must be greater than zero.
-    colspan: usize,
-
-    /// Number of rows that the cell is to span. Zero means that the cell is to span all
-    /// the remaining rows in the row group.
-    rowspan: usize,
-}
-
-impl TableSlotCell {
-    pub fn mock_for_testing(id: usize, colspan: usize, rowspan: usize) -> Self {
-        Self {
-            base: LayoutBoxBase::new(
-                BaseFragmentInfo::new_for_node(OpaqueNode(id)),
-                ComputedValues::initial_values_with_font_override(Font::initial_values()).to_arc(),
-            ),
-            contents: BlockFormattingContext {
-                contents: BlockContainer::BlockLevelBoxes(Vec::new()),
-                contains_floats: false,
-            },
-            colspan,
-            rowspan,
-        }
-    }
-
-    /// Get the node id of this cell's [`BaseFragmentInfo`]. This is used for unit tests.
-    pub fn node_id(&self) -> usize {
-        self.base.base_fragment_info.tag.map_or(0, |tag| tag.node.0)
-    }
-}
-
-/// A single table slot. It may be an actual cell, or a reference
-/// to a previous cell that is spanned here
-///
-/// In case of table model errors, it may be multiple references
-pub enum TableSlot {
-    /// A table cell, with a colspan and a rowspan.
-    Cell(TableSlotCell),
-
-    /// This slot is spanned by one or more multiple cells earlier in the table, which are
-    /// found at the given negative coordinate offsets. The vector is in the order of most
-    /// recent to earliest cell.
-    ///
-    /// If there is more than one cell that spans a slot, this is a table model error, but
-    /// we still keep track of it. See
-    /// <https://html.spec.whatwg.org/multipage/#table-model-error>
-    Spanned(Vec<TableSlotOffset>),
-
-    /// An empty spot in the table. This can happen when there is a gap in columns between
-    /// cells that are defined and one which should exist because of cell with a rowspan
-    /// from a previous row.
-    Empty,
-}
-
-impl std::fmt::Debug for TableSlot {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Cell(_) => f.debug_tuple("Cell").finish(),
-            Self::Spanned(spanned) => f.debug_tuple("Spanned").field(spanned).finish(),
-            Self::Empty => write!(f, "Empty"),
-        }
-    }
-}
-
-impl TableSlot {
-    fn new_spanned(offset: TableSlotOffset) -> Self {
-        Self::Spanned(vec![offset])
-    }
-}
-
-/// A row or column of a table.
-#[derive(Clone, Debug)]
-pub struct TableTrack {
-    /// The [`BaseFragmentInfo`] of this cell.
-    base_fragment_info: BaseFragmentInfo,
-
-    /// The style of this table column.
-    style: Arc<ComputedValues>,
-
-    /// The index of the table row or column group parent in the table's list of row or column
-    /// groups.
-    group_index: Option<usize>,
-
-    /// Whether or not this [`TableTrack`] was anonymous, for instance created due to
-    /// a `span` attribute set on a parent `<colgroup>`.
-    is_anonymous: bool,
-}
-
-#[derive(Debug, PartialEq)]
-pub enum TableTrackGroupType {
-    HeaderGroup,
-    FooterGroup,
-    RowGroup,
-    ColumnGroup,
-}
-
-#[derive(Debug)]
-pub struct TableTrackGroup {
-    /// The [`BaseFragmentInfo`] of this [`TableTrackGroup`].
-    base_fragment_info: BaseFragmentInfo,
-
-    /// The style of this [`TableTrackGroup`].
-    style: Arc<ComputedValues>,
-
-    /// The type of this [`TableTrackGroup`].
-    group_type: TableTrackGroupType,
-
-    /// The range of tracks in this [`TableTrackGroup`].
-    track_range: Range<usize>,
-}
-
-impl TableTrackGroup {
-    pub(super) fn is_empty(&self) -> bool {
-        self.track_range.is_empty()
-    }
-}
-
-#[derive(Debug)]
-pub struct TableCaption {
-    /// The contents of this cell, with its own layout.
-    context: ArcRefCell<IndependentFormattingContext>,
-}
-
-/// A calculated collapsed border.
-#[derive(Clone, Debug, Default, PartialEq)]
-pub(crate) struct CollapsedBorder {
-    pub style_color: BorderStyleColor,
-    pub width: Au,
-}
-
-/// Represents a piecewise sequence of collapsed borders along a line.
-pub(crate) type CollapsedBorderLine = Vec<CollapsedBorder>;
-
-#[derive(Clone, Debug)]
-pub(crate) struct SpecificTableGridInfo {
-    pub collapsed_borders: PhysicalVec<Vec<CollapsedBorderLine>>,
-    pub track_sizes: PhysicalVec<Vec<Au>>,
-}
-
-pub(crate) struct TableLayoutStyle<'a> {
-    table: &'a Table,
-    layout: Option<&'a TableLayout<'a>>,
-}
diff --git a/components/layout_2020/taffy/layout.rs b/components/layout_2020/taffy/layout.rs
deleted file mode 100644
index 6c1b931599c..00000000000
--- a/components/layout_2020/taffy/layout.rs
+++ /dev/null
@@ -1,667 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use app_units::Au;
-use atomic_refcell::{AtomicRef, AtomicRefCell};
-use style::Zero;
-use style::properties::ComputedValues;
-use style::values::specified::align::AlignFlags;
-use style::values::specified::box_::DisplayInside;
-use taffy::style_helpers::{TaffyMaxContent, TaffyMinContent};
-use taffy::{AvailableSpace, MaybeMath, RequestedAxis, RunMode};
-
-use super::{
-    SpecificTaffyGridInfo, TaffyContainer, TaffyItemBox, TaffyItemBoxInner, TaffyStyloStyle,
-};
-use crate::cell::ArcRefCell;
-use crate::context::LayoutContext;
-use crate::formatting_contexts::{
-    Baselines, IndependentFormattingContext, IndependentFormattingContextContents,
-};
-use crate::fragment_tree::{
-    BoxFragment, CollapsedBlockMargins, Fragment, FragmentFlags, SpecificLayoutInfo,
-};
-use crate::geom::{
-    LogicalSides, LogicalVec2, PhysicalPoint, PhysicalRect, PhysicalSides, PhysicalSize, Size,
-    SizeConstraint, Sizes,
-};
-use crate::layout_box_base::CacheableLayoutResult;
-use crate::positioned::{AbsolutelyPositionedBox, PositioningContext, PositioningContextLength};
-use crate::sizing::{ComputeInlineContentSizes, ContentSizes, InlineContentSizesResult};
-use crate::style_ext::{ComputedValuesExt, LayoutStyle};
-use crate::{ConstraintSpace, ContainingBlock, ContainingBlockSize};
-
-const DUMMY_NODE_ID: taffy::NodeId = taffy::NodeId::new(u64::MAX);
-
-fn resolve_content_size(constraint: AvailableSpace, content_sizes: ContentSizes) -> f32 {
-    match constraint {
-        AvailableSpace::Definite(limit) => {
-            let min = content_sizes.min_content.to_f32_px();
-            let max = content_sizes.max_content.to_f32_px();
-            limit.min(max).max(min)
-        },
-        AvailableSpace::MinContent => content_sizes.min_content.to_f32_px(),
-        AvailableSpace::MaxContent => content_sizes.max_content.to_f32_px(),
-    }
-}
-
-#[inline(always)]
-fn with_independant_formatting_context<T>(
-    item: &mut TaffyItemBoxInner,
-    cb: impl FnOnce(&IndependentFormattingContext) -> T,
-) -> T {
-    match item {
-        TaffyItemBoxInner::InFlowBox(context) => cb(context),
-        TaffyItemBoxInner::OutOfFlowAbsolutelyPositionedBox(abspos_box) => {
-            cb(&AtomicRefCell::borrow(abspos_box).context)
-        },
-    }
-}
-
-/// Layout parameters and intermediate results about a taffy container,
-/// grouped to avoid passing around many parameters
-struct TaffyContainerContext<'a> {
-    source_child_nodes: &'a [ArcRefCell<TaffyItemBox>],
-    layout_context: &'a LayoutContext<'a>,
-    positioning_context: &'a mut PositioningContext,
-    content_box_size_override: &'a ContainingBlock<'a>,
-    style: &'a ComputedValues,
-    specific_layout_info: Option<SpecificLayoutInfo>,
-
-    /// Temporary location for children specific info, which will be moved into child fragments
-    child_specific_layout_infos: Vec<Option<SpecificLayoutInfo>>,
-}
-
-struct ChildIter(std::ops::Range<usize>);
-impl Iterator for ChildIter {
-    type Item = taffy::NodeId;
-    fn next(&mut self) -> Option<Self::Item> {
-        self.0.next().map(taffy::NodeId::from)
-    }
-}
-
-impl taffy::TraversePartialTree for TaffyContainerContext<'_> {
-    type ChildIter<'a>
-        = ChildIter
-    where
-        Self: 'a;
-
-    fn child_ids(&self, _node_id: taffy::NodeId) -> Self::ChildIter<'_> {
-        ChildIter(0..self.source_child_nodes.len())
-    }
-
-    fn child_count(&self, _node_id: taffy::NodeId) -> usize {
-        self.source_child_nodes.len()
-    }
-
-    fn get_child_id(&self, _node_id: taffy::NodeId, index: usize) -> taffy::NodeId {
-        taffy::NodeId::from(index)
-    }
-}
-
-impl taffy::LayoutPartialTree for TaffyContainerContext<'_> {
-    type CoreContainerStyle<'a>
-        = TaffyStyloStyle<&'a ComputedValues>
-    where
-        Self: 'a;
-
-    fn get_core_container_style(&self, _node_id: taffy::NodeId) -> Self::CoreContainerStyle<'_> {
-        TaffyStyloStyle(self.style)
-    }
-
-    fn set_unrounded_layout(&mut self, node_id: taffy::NodeId, layout: &taffy::Layout) {
-        let id = usize::from(node_id);
-        (*self.source_child_nodes[id]).borrow_mut().taffy_layout = *layout;
-    }
-
-    fn compute_child_layout(
-        &mut self,
-        node_id: taffy::NodeId,
-        inputs: taffy::LayoutInput,
-    ) -> taffy::LayoutOutput {
-        let mut child = (*self.source_child_nodes[usize::from(node_id)]).borrow_mut();
-        let child = &mut *child;
-
-        fn option_f32_to_size(input: Option<f32>) -> Size<Au> {
-            match input {
-                None => Size::Initial,
-                Some(length) => Size::Numeric(Au::from_f32_px(length)),
-            }
-        }
-
-        with_independant_formatting_context(
-            &mut child.taffy_level_box,
-            |independent_context| -> taffy::LayoutOutput {
-                // TODO: re-evaluate sizing constraint conversions in light of recent layout_2020 changes
-                let containing_block = &self.content_box_size_override;
-                let style = independent_context.style();
-
-                // Adjust known_dimensions from border box to content box
-                let pbm = independent_context
-                    .layout_style()
-                    .padding_border_margin(containing_block);
-                let pb_sum = pbm.padding_border_sums.map(|v| v.to_f32_px());
-                let margin_sum = pbm.margin.auto_is(Au::zero).sum().map(|v| v.to_f32_px());
-                let content_box_inset = pb_sum + margin_sum;
-                let content_box_known_dimensions = taffy::Size {
-                    width: inputs
-                        .known_dimensions
-                        .width
-                        .map(|width| width - pb_sum.inline),
-                    height: inputs
-                        .known_dimensions
-                        .height
-                        .map(|height| height - pb_sum.block),
-                };
-
-                match &independent_context.contents {
-                    IndependentFormattingContextContents::Replaced(replaced) => {
-                        let content_box_size = replaced
-                            .used_size_as_if_inline_element_from_content_box_sizes(
-                                containing_block,
-                                style,
-                                independent_context
-                                    .preferred_aspect_ratio(&pbm.padding_border_sums),
-                                LogicalVec2 {
-                                    block: &Sizes::new(
-                                        option_f32_to_size(content_box_known_dimensions.height),
-                                        Size::Initial,
-                                        Size::Initial,
-                                    ),
-                                    inline: &Sizes::new(
-                                        option_f32_to_size(content_box_known_dimensions.width),
-                                        Size::Initial,
-                                        Size::Initial,
-                                    ),
-                                },
-                                Size::FitContent.into(),
-                                pbm.padding_border_sums + pbm.margin.auto_is(Au::zero).sum(),
-                            )
-                            .to_physical_size(self.style.writing_mode);
-
-                        // Create fragments if the RunMode if PerformLayout
-                        // If the RunMode is ComputeSize then only the returned size will be used
-                        if inputs.run_mode == RunMode::PerformLayout {
-                            child.child_fragments = replaced.make_fragments(
-                                self.layout_context,
-                                style,
-                                content_box_size,
-                            );
-                        }
-
-                        let computed_size = taffy::Size {
-                            width: inputs.known_dimensions.width.unwrap_or_else(|| {
-                                content_box_size.width.to_f32_px() + pb_sum.inline
-                            }),
-                            height: inputs.known_dimensions.height.unwrap_or_else(|| {
-                                content_box_size.height.to_f32_px() + pb_sum.block
-                            }),
-                        };
-                        let size = inputs.known_dimensions.unwrap_or(computed_size);
-                        taffy::LayoutOutput {
-                            size,
-                            ..taffy::LayoutOutput::DEFAULT
-                        }
-                    },
-
-                    IndependentFormattingContextContents::NonReplaced(non_replaced) => {
-                        // Compute inline size
-                        let inline_size = content_box_known_dimensions.width.unwrap_or_else(|| {
-                            let constraint_space = ConstraintSpace {
-                                // TODO: pass min- and max- size
-                                block_size: SizeConstraint::new(
-                                    inputs.parent_size.height.map(Au::from_f32_px),
-                                    Au::zero(),
-                                    None,
-                                ),
-                                writing_mode: self.style.writing_mode,
-                                preferred_aspect_ratio: non_replaced.preferred_aspect_ratio(),
-                            };
-
-                            let result = independent_context
-                                .inline_content_sizes(self.layout_context, &constraint_space);
-                            let adjusted_available_space = inputs
-                                .available_space
-                                .width
-                                .map_definite_value(|width| width - content_box_inset.inline);
-
-                            resolve_content_size(adjusted_available_space, result.sizes)
-                        });
-
-                        // Return early if only inline content sizes are requested
-                        if inputs.run_mode == RunMode::ComputeSize &&
-                            inputs.axis == RequestedAxis::Horizontal
-                        {
-                            return taffy::LayoutOutput::from_outer_size(taffy::Size {
-                                width: inline_size + pb_sum.inline,
-                                // If RequestedAxis is Horizontal then height will be ignored.
-                                height: 0.0,
-                            });
-                        }
-
-                        let content_box_size_override = ContainingBlock {
-                            size: ContainingBlockSize {
-                                inline: Au::from_f32_px(inline_size),
-                                block: content_box_known_dimensions
-                                    .height
-                                    .map(Au::from_f32_px)
-                                    .map_or_else(SizeConstraint::default, SizeConstraint::Definite),
-                            },
-                            style,
-                        };
-                        let layout = {
-                            let mut child_positioning_context =
-                                PositioningContext::new_for_style(style).unwrap_or_else(|| {
-                                    PositioningContext::new_for_subtree(
-                                        self.positioning_context
-                                            .collects_for_nearest_positioned_ancestor(),
-                                    )
-                                });
-
-                            let layout = non_replaced.layout(
-                                self.layout_context,
-                                &mut child_positioning_context,
-                                &content_box_size_override,
-                                containing_block,
-                                false, /* depends_on_block_constraints */
-                            );
-
-                            // Store layout data on child for later access
-                            child.positioning_context = child_positioning_context;
-
-                            layout
-                        };
-
-                        child.child_fragments = layout.fragments;
-                        self.child_specific_layout_infos[usize::from(node_id)] =
-                            layout.specific_layout_info;
-
-                        let block_size = layout.content_block_size.to_f32_px();
-
-                        let computed_size = taffy::Size {
-                            width: inline_size + pb_sum.inline,
-                            height: block_size + pb_sum.block,
-                        };
-                        let size = inputs.known_dimensions.unwrap_or(computed_size);
-
-                        taffy::LayoutOutput {
-                            size,
-                            first_baselines: taffy::Point {
-                                x: None,
-                                y: layout.baselines.first.map(|au| au.to_f32_px()),
-                            },
-                            ..taffy::LayoutOutput::DEFAULT
-                        }
-                    },
-                }
-            },
-        )
-    }
-}
-
-impl taffy::LayoutGridContainer for TaffyContainerContext<'_> {
-    type GridContainerStyle<'a>
-        = TaffyStyloStyle<&'a ComputedValues>
-    where
-        Self: 'a;
-
-    type GridItemStyle<'a>
-        = TaffyStyloStyle<AtomicRef<'a, ComputedValues>>
-    where
-        Self: 'a;
-
-    fn get_grid_container_style(
-        &self,
-        _node_id: taffy::prelude::NodeId,
-    ) -> Self::GridContainerStyle<'_> {
-        TaffyStyloStyle(self.style)
-    }
-
-    fn get_grid_child_style(
-        &self,
-        child_node_id: taffy::prelude::NodeId,
-    ) -> Self::GridItemStyle<'_> {
-        let id = usize::from(child_node_id);
-        let child = (*self.source_child_nodes[id]).borrow();
-        TaffyStyloStyle(AtomicRef::map(child, |c| &*c.style))
-    }
-
-    fn set_detailed_grid_info(
-        &mut self,
-        _node_id: taffy::NodeId,
-        specific_layout_info: taffy::DetailedGridInfo,
-    ) {
-        self.specific_layout_info = Some(SpecificLayoutInfo::Grid(Box::new(
-            SpecificTaffyGridInfo::from_detailed_grid_layout(specific_layout_info),
-        )));
-    }
-}
-
-impl ComputeInlineContentSizes for TaffyContainer {
-    fn compute_inline_content_sizes(
-        &self,
-        layout_context: &LayoutContext,
-        _constraint_space: &ConstraintSpace,
-    ) -> InlineContentSizesResult {
-        let style = &self.style;
-
-        let max_content_inputs = taffy::LayoutInput {
-            run_mode: taffy::RunMode::ComputeSize,
-            sizing_mode: taffy::SizingMode::InherentSize,
-            axis: taffy::RequestedAxis::Horizontal,
-            vertical_margins_are_collapsible: taffy::Line::FALSE,
-
-            known_dimensions: taffy::Size::NONE,
-            parent_size: taffy::Size::NONE,
-            available_space: taffy::Size::MAX_CONTENT,
-        };
-
-        let min_content_inputs = taffy::LayoutInput {
-            available_space: taffy::Size::MIN_CONTENT,
-            ..max_content_inputs
-        };
-
-        let containing_block = &ContainingBlock {
-            size: ContainingBlockSize {
-                inline: Au::zero(),
-                block: SizeConstraint::default(),
-            },
-            style,
-        };
-
-        let mut grid_context = TaffyContainerContext {
-            layout_context,
-            positioning_context:
-                &mut PositioningContext::new_for_containing_block_for_all_descendants(),
-            content_box_size_override: containing_block,
-            style,
-            source_child_nodes: &self.children,
-            specific_layout_info: None,
-            child_specific_layout_infos: vec![None; self.children.len()],
-        };
-
-        let (max_content_output, min_content_output) = match style.clone_display().inside() {
-            DisplayInside::Grid => {
-                let max_content_output = taffy::compute_grid_layout(
-                    &mut grid_context,
-                    DUMMY_NODE_ID,
-                    max_content_inputs,
-                );
-                let min_content_output = taffy::compute_grid_layout(
-                    &mut grid_context,
-                    DUMMY_NODE_ID,
-                    min_content_inputs,
-                );
-                (max_content_output, min_content_output)
-            },
-            _ => panic!("Servo is only configured to use Taffy for CSS Grid layout"),
-        };
-
-        let pb_sums = self
-            .layout_style()
-            .padding_border_margin(containing_block)
-            .padding_border_sums;
-
-        InlineContentSizesResult {
-            sizes: ContentSizes {
-                max_content: Au::from_f32_px(max_content_output.size.width) - pb_sums.inline,
-                min_content: Au::from_f32_px(min_content_output.size.width) - pb_sums.inline,
-            },
-
-            // TODO: determine this accurately
-            //
-            // "true" is a safe default as it will prevent Servo from performing optimizations based
-            // on the assumption that the node's size does not depend on block constraints.
-            depends_on_block_constraints: true,
-        }
-    }
-}
-
-impl TaffyContainer {
-    /// <https://drafts.csswg.org/css-grid/#layout-algorithm>
-    pub(crate) fn layout(
-        &self,
-        layout_context: &LayoutContext,
-        positioning_context: &mut PositioningContext,
-        content_box_size_override: &ContainingBlock,
-        containing_block: &ContainingBlock,
-    ) -> CacheableLayoutResult {
-        let mut container_ctx = TaffyContainerContext {
-            layout_context,
-            positioning_context,
-            content_box_size_override,
-            style: content_box_size_override.style,
-            source_child_nodes: &self.children,
-            specific_layout_info: None,
-            child_specific_layout_infos: vec![None; self.children.len()],
-        };
-
-        let container_style = &content_box_size_override.style;
-        let align_items = container_style.clone_align_items();
-        let justify_items = container_style.clone_justify_items();
-        let pbm = self.layout_style().padding_border_margin(containing_block);
-
-        let known_dimensions = taffy::Size {
-            width: Some(
-                (content_box_size_override.size.inline + pbm.padding_border_sums.inline)
-                    .to_f32_px(),
-            ),
-            height: content_box_size_override
-                .size
-                .block
-                .to_definite()
-                .map(Au::to_f32_px)
-                .maybe_add(pbm.padding_border_sums.block.to_f32_px()),
-        };
-
-        let taffy_containing_block = taffy::Size {
-            width: Some(containing_block.size.inline.to_f32_px()),
-            height: containing_block.size.block.to_definite().map(Au::to_f32_px),
-        };
-
-        let layout_input = taffy::LayoutInput {
-            run_mode: taffy::RunMode::PerformLayout,
-            sizing_mode: taffy::SizingMode::InherentSize,
-            axis: taffy::RequestedAxis::Vertical,
-            vertical_margins_are_collapsible: taffy::Line::FALSE,
-
-            known_dimensions,
-            parent_size: taffy_containing_block,
-            available_space: taffy_containing_block.map(AvailableSpace::from),
-        };
-
-        let output = match container_ctx.style.clone_display().inside() {
-            DisplayInside::Grid => {
-                taffy::compute_grid_layout(&mut container_ctx, DUMMY_NODE_ID, layout_input)
-            },
-            _ => panic!("Servo is only configured to use Taffy for CSS Grid layout"),
-        };
-
-        // Convert `taffy::Layout` into Servo `Fragment`s
-        // with container_ctx.child_specific_layout_infos will also moved to the corresponding `Fragment`s
-        let fragments: Vec<Fragment> = self
-            .children
-            .iter()
-            .map(|child| (**child).borrow_mut())
-            .enumerate()
-            .map(|(child_id, mut child)| {
-                fn rect_to_logical_sides<T>(rect: taffy::Rect<T>) -> LogicalSides<T> {
-                    LogicalSides {
-                        inline_start: rect.left,
-                        inline_end: rect.right,
-                        block_start: rect.top,
-                        block_end: rect.bottom,
-                    }
-                }
-
-                fn rect_to_physical_sides<T>(rect: taffy::Rect<T>) -> PhysicalSides<T> {
-                    PhysicalSides::new(rect.top, rect.right, rect.bottom, rect.left)
-                }
-
-                fn size_and_pos_to_logical_rect<T: Default>(
-                    position: taffy::Point<T>,
-                    size: taffy::Size<T>,
-                ) -> PhysicalRect<T> {
-                    PhysicalRect::new(
-                        PhysicalPoint::new(position.x, position.y),
-                        PhysicalSize::new(size.width, size.height),
-                    )
-                }
-
-                let layout = &child.taffy_layout;
-
-                let padding = rect_to_physical_sides(layout.padding.map(Au::from_f32_px));
-                let border = rect_to_physical_sides(layout.border.map(Au::from_f32_px));
-                let margin = rect_to_physical_sides(layout.margin.map(Au::from_f32_px));
-                let logical_margin = rect_to_logical_sides(layout.margin.map(Au::from_f32_px));
-                let collapsed_margin = CollapsedBlockMargins::from_margin(&logical_margin);
-
-                // Compute content box size and position.
-                //
-                // For the x/y position we have to correct for the difference between the
-                // content box and the border box for both the parent and the child.
-                let content_size = size_and_pos_to_logical_rect(
-                    taffy::Point {
-                        x: Au::from_f32_px(
-                            layout.location.x + layout.padding.left + layout.border.left,
-                        ) - pbm.padding.inline_start -
-                            pbm.border.inline_start,
-                        y: Au::from_f32_px(
-                            layout.location.y + layout.padding.top + layout.border.top,
-                        ) - pbm.padding.block_start -
-                            pbm.border.block_start,
-                    },
-                    taffy::Size {
-                        width: layout.size.width -
-                            layout.padding.left -
-                            layout.padding.right -
-                            layout.border.left -
-                            layout.border.right,
-                        height: layout.size.height -
-                            layout.padding.top -
-                            layout.padding.bottom -
-                            layout.border.top -
-                            layout.border.bottom,
-                    }
-                    .map(Au::from_f32_px),
-                );
-
-                let child_specific_layout_info: Option<SpecificLayoutInfo> =
-                    std::mem::take(&mut container_ctx.child_specific_layout_infos[child_id]);
-
-                let establishes_containing_block_for_absolute_descendants =
-                    if let TaffyItemBoxInner::InFlowBox(independent_box) = &child.taffy_level_box {
-                        child
-                            .style
-                            .establishes_containing_block_for_absolute_descendants(
-                                independent_box.base_fragment_info().flags,
-                            )
-                    } else {
-                        false
-                    };
-
-                match &mut child.taffy_level_box {
-                    TaffyItemBoxInner::InFlowBox(independent_box) => {
-                        let mut fragment_info = independent_box.base_fragment_info();
-                        fragment_info
-                            .flags
-                            .insert(FragmentFlags::IS_FLEX_OR_GRID_ITEM);
-                        let mut box_fragment = BoxFragment::new(
-                            fragment_info,
-                            independent_box.style().clone(),
-                            std::mem::take(&mut child.child_fragments),
-                            content_size,
-                            padding,
-                            border,
-                            margin,
-                            None, /* clearance */
-                            collapsed_margin,
-                        )
-                        .with_baselines(Baselines {
-                            first: output.first_baselines.y.map(Au::from_f32_px),
-                            last: None,
-                        })
-                        .with_specific_layout_info(child_specific_layout_info);
-
-                        if establishes_containing_block_for_absolute_descendants {
-                            child.positioning_context.layout_collected_children(
-                                container_ctx.layout_context,
-                                &mut box_fragment,
-                            );
-                        }
-
-                        let fragment = Fragment::Box(ArcRefCell::new(box_fragment));
-
-                        child
-                            .positioning_context
-                            .adjust_static_position_of_hoisted_fragments(
-                                &fragment,
-                                PositioningContextLength::zero(),
-                            );
-                        let child_positioning_context = std::mem::replace(
-                            &mut child.positioning_context,
-                            PositioningContext::new_for_containing_block_for_all_descendants(),
-                        );
-                        container_ctx
-                            .positioning_context
-                            .append(child_positioning_context);
-
-                        fragment
-                    },
-                    TaffyItemBoxInner::OutOfFlowAbsolutelyPositionedBox(abs_pos_box) => {
-                        fn resolve_alignment(value: AlignFlags, auto: AlignFlags) -> AlignFlags {
-                            match value {
-                                AlignFlags::AUTO => auto,
-                                AlignFlags::NORMAL => AlignFlags::STRETCH,
-                                value => value,
-                            }
-                        }
-
-                        let hoisted_box = AbsolutelyPositionedBox::to_hoisted(
-                            abs_pos_box.clone(),
-                            PhysicalRect::from_size(PhysicalSize::new(
-                                Au::from_f32_px(output.size.width),
-                                Au::from_f32_px(output.size.height),
-                            )),
-                            LogicalVec2 {
-                                inline: resolve_alignment(
-                                    child.style.clone_align_self().0.0,
-                                    align_items.0,
-                                ),
-                                block: resolve_alignment(
-                                    child.style.clone_justify_self().0.0,
-                                    justify_items.computed.0,
-                                ),
-                            },
-                            container_ctx.style.writing_mode,
-                        );
-                        let hoisted_fragment = hoisted_box.fragment.clone();
-                        container_ctx.positioning_context.push(hoisted_box);
-                        Fragment::AbsoluteOrFixedPositioned(hoisted_fragment)
-                    },
-                }
-            })
-            .collect();
-
-        CacheableLayoutResult {
-            fragments,
-            content_block_size: Au::from_f32_px(output.size.height) - pbm.padding_border_sums.block,
-            content_inline_size_for_table: None,
-            baselines: Baselines::default(),
-
-            // TODO: determine this accurately
-            //
-            // "true" is a safe default as it will prevent Servo from performing optimizations based
-            // on the assumption that the node's size does not depend on block constraints.
-            depends_on_block_constraints: true,
-            specific_layout_info: container_ctx.specific_layout_info,
-            collapsible_margins_in_children: CollapsedBlockMargins::zero(),
-        }
-    }
-
-    #[inline]
-    pub(crate) fn layout_style(&self) -> LayoutStyle {
-        LayoutStyle::Default(&self.style)
-    }
-}
diff --git a/components/layout_2020/taffy/mod.rs b/components/layout_2020/taffy/mod.rs
deleted file mode 100644
index 626704874d2..00000000000
--- a/components/layout_2020/taffy/mod.rs
+++ /dev/null
@@ -1,149 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-mod layout;
-mod stylo_taffy;
-use std::fmt;
-
-use app_units::Au;
-use servo_arc::Arc;
-use style::properties::ComputedValues;
-use stylo_taffy::TaffyStyloStyle;
-
-use crate::PropagatedBoxTreeData;
-use crate::cell::ArcRefCell;
-use crate::construct_modern::{ModernContainerBuilder, ModernItemKind};
-use crate::context::LayoutContext;
-use crate::dom::{LayoutBox, NodeExt};
-use crate::dom_traversal::{NodeAndStyleInfo, NonReplacedContents};
-use crate::formatting_contexts::IndependentFormattingContext;
-use crate::fragment_tree::Fragment;
-use crate::positioned::{AbsolutelyPositionedBox, PositioningContext};
-
-#[derive(Debug)]
-pub(crate) struct TaffyContainer {
-    children: Vec<ArcRefCell<TaffyItemBox>>,
-    style: Arc<ComputedValues>,
-}
-
-impl TaffyContainer {
-    pub fn construct<'dom>(
-        context: &LayoutContext,
-        info: &NodeAndStyleInfo<impl NodeExt<'dom>>,
-        contents: NonReplacedContents,
-        propagated_data: PropagatedBoxTreeData,
-    ) -> Self {
-        let mut builder =
-            ModernContainerBuilder::new(context, info, propagated_data.union(&info.style));
-        contents.traverse(context, info, &mut builder);
-        let items = builder.finish();
-
-        let children = items
-            .into_iter()
-            .map(|item| {
-                let box_ = match item.kind {
-                    ModernItemKind::InFlow => ArcRefCell::new(TaffyItemBox::new(
-                        TaffyItemBoxInner::InFlowBox(item.formatting_context),
-                    )),
-                    ModernItemKind::OutOfFlow => {
-                        let abs_pos_box =
-                            ArcRefCell::new(AbsolutelyPositionedBox::new(item.formatting_context));
-                        ArcRefCell::new(TaffyItemBox::new(
-                            TaffyItemBoxInner::OutOfFlowAbsolutelyPositionedBox(abs_pos_box),
-                        ))
-                    },
-                };
-
-                if let Some(box_slot) = item.box_slot {
-                    box_slot.set(LayoutBox::TaffyItemBox(box_.clone()));
-                }
-
-                box_
-            })
-            .collect();
-
-        Self {
-            children,
-            style: info.style.clone(),
-        }
-    }
-}
-
-pub(crate) struct TaffyItemBox {
-    pub(crate) taffy_layout: taffy::Layout,
-    pub(crate) child_fragments: Vec<Fragment>,
-    pub(crate) positioning_context: PositioningContext,
-    pub(crate) style: Arc<ComputedValues>,
-    pub(crate) taffy_level_box: TaffyItemBoxInner,
-}
-
-#[derive(Debug)]
-pub(crate) enum TaffyItemBoxInner {
-    InFlowBox(IndependentFormattingContext),
-    OutOfFlowAbsolutelyPositionedBox(ArcRefCell<AbsolutelyPositionedBox>),
-}
-
-impl fmt::Debug for TaffyItemBox {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("TaffyItemBox")
-            .field("taffy_layout", &self.taffy_layout)
-            .field("child_fragments", &self.child_fragments.len())
-            .field("style", &self.style)
-            .field("taffy_level_box", &self.taffy_level_box)
-            .finish()
-    }
-}
-
-impl TaffyItemBox {
-    fn new(inner: TaffyItemBoxInner) -> Self {
-        let style: Arc<ComputedValues> = match &inner {
-            TaffyItemBoxInner::InFlowBox(item) => item.style().clone(),
-            TaffyItemBoxInner::OutOfFlowAbsolutelyPositionedBox(absbox) => {
-                (*absbox).borrow().context.style().clone()
-            },
-        };
-
-        Self {
-            taffy_layout: Default::default(),
-            child_fragments: Vec::new(),
-            positioning_context: PositioningContext::new_for_containing_block_for_all_descendants(),
-            style,
-            taffy_level_box: inner,
-        }
-    }
-}
-
-/// Details from Taffy grid layout that will be stored
-#[derive(Clone, Debug)]
-pub(crate) struct SpecificTaffyGridInfo {
-    pub rows: SpecificTaffyGridTrackInfo,
-    pub columns: SpecificTaffyGridTrackInfo,
-}
-
-impl SpecificTaffyGridInfo {
-    fn from_detailed_grid_layout(grid_info: taffy::DetailedGridInfo) -> Self {
-        Self {
-            rows: SpecificTaffyGridTrackInfo {
-                sizes: grid_info
-                    .rows
-                    .sizes
-                    .iter()
-                    .map(|size| Au::from_f32_px(*size))
-                    .collect(),
-            },
-            columns: SpecificTaffyGridTrackInfo {
-                sizes: grid_info
-                    .columns
-                    .sizes
-                    .iter()
-                    .map(|size| Au::from_f32_px(*size))
-                    .collect(),
-            },
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub(crate) struct SpecificTaffyGridTrackInfo {
-    pub sizes: Box<[Au]>,
-}
diff --git a/components/layout_2020/tests/tables.rs b/components/layout_2020/tests/tables.rs
deleted file mode 100644
index 5b1129bf999..00000000000
--- a/components/layout_2020/tests/tables.rs
+++ /dev/null
@@ -1,251 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-//! Tests for proper table box tree construction.
-
-mod tables {
-    use euclid::Vector2D;
-    use layout_2020::table::{Table, TableBuilder, TableSlot, TableSlotCell, TableSlotOffset};
-
-    fn row_lengths(table: &Table) -> Vec<usize> {
-        table.slots.iter().map(|row| row.len()).collect()
-    }
-
-    fn slot_is_cell_with_id(slot: &TableSlot, id: usize) -> bool {
-        match slot {
-            TableSlot::Cell(cell) if cell.node_id() == id => true,
-            _ => false,
-        }
-    }
-
-    fn slot_is_empty(slot: &TableSlot) -> bool {
-        match slot {
-            TableSlot::Empty => true,
-            _ => false,
-        }
-    }
-
-    fn slot_is_spanned_with_offsets(slot: &TableSlot, offsets: Vec<(usize, usize)>) -> bool {
-        match slot {
-            TableSlot::Spanned(slot_offsets) => {
-                let offsets: Vec<TableSlotOffset> = offsets
-                    .iter()
-                    .map(|offset| Vector2D::new(offset.0, offset.1))
-                    .collect();
-                offsets == *slot_offsets
-            },
-            _ => false,
-        }
-    }
-
-    #[test]
-    fn test_empty_table() {
-        let table_builder = TableBuilder::new_for_tests();
-        let table = table_builder.finish();
-        assert!(table.slots.is_empty())
-    }
-
-    #[test]
-    fn test_simple_table() {
-        let mut table_builder = TableBuilder::new_for_tests();
-
-        table_builder.start_row();
-        table_builder.add_cell(TableSlotCell::mock_for_testing(1, 1, 1));
-        table_builder.add_cell(TableSlotCell::mock_for_testing(2, 1, 1));
-        table_builder.end_row();
-
-        table_builder.start_row();
-        table_builder.add_cell(TableSlotCell::mock_for_testing(3, 1, 1));
-        table_builder.add_cell(TableSlotCell::mock_for_testing(4, 1, 1));
-        table_builder.end_row();
-
-        let table = table_builder.finish();
-        assert_eq!(row_lengths(&table), vec![2, 2]);
-
-        assert!(slot_is_cell_with_id(&table.slots[0][0], 1));
-        assert!(slot_is_cell_with_id(&table.slots[0][1], 2));
-        assert!(slot_is_cell_with_id(&table.slots[1][0], 3));
-        assert!(slot_is_cell_with_id(&table.slots[1][1], 4));
-    }
-
-    #[test]
-    fn test_simple_rowspan() {
-        let mut table_builder = TableBuilder::new_for_tests();
-
-        table_builder.start_row();
-        table_builder.add_cell(TableSlotCell::mock_for_testing(1, 1, 1));
-        table_builder.add_cell(TableSlotCell::mock_for_testing(2, 1, 1));
-        table_builder.add_cell(TableSlotCell::mock_for_testing(3, 1, 2));
-        table_builder.end_row();
-
-        table_builder.start_row();
-        table_builder.add_cell(TableSlotCell::mock_for_testing(4, 1, 1));
-        table_builder.end_row();
-
-        let table = table_builder.finish();
-        assert_eq!(row_lengths(&table), vec![3, 3]);
-
-        assert!(slot_is_cell_with_id(&table.slots[0][0], 1));
-        assert!(slot_is_cell_with_id(&table.slots[0][1], 2));
-        assert!(slot_is_cell_with_id(&table.slots[0][2], 3));
-
-        assert!(slot_is_cell_with_id(&table.slots[1][0], 4));
-        assert!(slot_is_empty(&table.slots[1][1]));
-        assert!(slot_is_spanned_with_offsets(
-            &table.slots[1][2],
-            vec![(0, 1)]
-        ));
-    }
-
-    #[test]
-    fn test_simple_colspan() {
-        let mut table_builder = TableBuilder::new_for_tests();
-
-        table_builder.start_row();
-        table_builder.add_cell(TableSlotCell::mock_for_testing(1, 3, 1));
-        table_builder.add_cell(TableSlotCell::mock_for_testing(2, 1, 1));
-        table_builder.add_cell(TableSlotCell::mock_for_testing(3, 1, 1));
-        table_builder.end_row();
-
-        table_builder.start_row();
-        table_builder.add_cell(TableSlotCell::mock_for_testing(4, 1, 1));
-        table_builder.add_cell(TableSlotCell::mock_for_testing(5, 3, 1));
-        table_builder.add_cell(TableSlotCell::mock_for_testing(6, 1, 1));
-        table_builder.end_row();
-
-        table_builder.start_row();
-        table_builder.add_cell(TableSlotCell::mock_for_testing(7, 1, 1));
-        table_builder.add_cell(TableSlotCell::mock_for_testing(8, 1, 1));
-        table_builder.add_cell(TableSlotCell::mock_for_testing(9, 3, 1));
-        table_builder.end_row();
-
-        let table = table_builder.finish();
-        assert_eq!(row_lengths(&table), vec![5, 5, 5]);
-
-        assert!(slot_is_cell_with_id(&table.slots[0][0], 1));
-        assert!(slot_is_spanned_with_offsets(
-            &table.slots[0][1],
-            vec![(1, 0)]
-        ));
-        assert!(slot_is_spanned_with_offsets(
-            &table.slots[0][2],
-            vec![(2, 0)]
-        ));
-        assert!(slot_is_cell_with_id(&table.slots[0][3], 2));
-        assert!(slot_is_cell_with_id(&table.slots[0][4], 3));
-
-        assert!(slot_is_cell_with_id(&table.slots[1][0], 4));
-        assert!(slot_is_cell_with_id(&table.slots[1][1], 5));
-        assert!(slot_is_spanned_with_offsets(
-            &table.slots[1][2],
-            vec![(1, 0)]
-        ));
-        assert!(slot_is_spanned_with_offsets(
-            &table.slots[1][3],
-            vec![(2, 0)]
-        ));
-        assert!(slot_is_cell_with_id(&table.slots[1][4], 6));
-
-        assert!(slot_is_cell_with_id(&table.slots[2][0], 7));
-        assert!(slot_is_cell_with_id(&table.slots[2][1], 8));
-        assert!(slot_is_cell_with_id(&table.slots[2][2], 9));
-        assert!(slot_is_spanned_with_offsets(
-            &table.slots[2][3],
-            vec![(1, 0)]
-        ));
-        assert!(slot_is_spanned_with_offsets(
-            &table.slots[2][4],
-            vec![(2, 0)]
-        ));
-    }
-
-    #[test]
-    fn test_simple_table_model_error() {
-        let mut table_builder = TableBuilder::new_for_tests();
-
-        table_builder.start_row();
-        table_builder.add_cell(TableSlotCell::mock_for_testing(1, 1, 1));
-        table_builder.add_cell(TableSlotCell::mock_for_testing(2, 1, 1));
-        table_builder.add_cell(TableSlotCell::mock_for_testing(3, 1, 2));
-        table_builder.end_row();
-
-        table_builder.start_row();
-        table_builder.add_cell(TableSlotCell::mock_for_testing(4, 3, 1));
-        table_builder.end_row();
-
-        let table = table_builder.finish();
-        assert_eq!(row_lengths(&table), vec![3, 3]);
-
-        assert!(slot_is_cell_with_id(&table.slots[0][0], 1));
-        assert!(slot_is_cell_with_id(&table.slots[0][1], 2));
-        assert!(slot_is_cell_with_id(&table.slots[0][2], 3));
-
-        assert!(slot_is_cell_with_id(&table.slots[1][0], 4));
-        assert!(slot_is_spanned_with_offsets(
-            &table.slots[1][1],
-            vec![(1, 0)]
-        ));
-        assert!(slot_is_spanned_with_offsets(
-            &table.slots[1][2],
-            vec![(2, 0), (0, 1)]
-        ));
-    }
-
-    #[test]
-    fn test_simple_rowspan_0() {
-        let mut table_builder = TableBuilder::new_for_tests();
-
-        table_builder.start_row();
-        table_builder.add_cell(TableSlotCell::mock_for_testing(1, 1, 1));
-        table_builder.add_cell(TableSlotCell::mock_for_testing(2, 1, 1));
-        table_builder.add_cell(TableSlotCell::mock_for_testing(3, 1, 0));
-        table_builder.end_row();
-
-        table_builder.start_row();
-        table_builder.end_row();
-
-        table_builder.start_row();
-        table_builder.end_row();
-
-        table_builder.start_row();
-        table_builder.end_row();
-
-        let table = table_builder.finish();
-        assert_eq!(row_lengths(&table), vec![3, 3, 3, 3]);
-
-        assert!(slot_is_empty(&table.slots[1][0]));
-        assert!(slot_is_empty(&table.slots[1][1]));
-        assert!(slot_is_spanned_with_offsets(
-            &table.slots[1][2],
-            vec![(0, 1)]
-        ));
-        assert!(slot_is_spanned_with_offsets(
-            &table.slots[2][2],
-            vec![(0, 2)]
-        ));
-        assert!(slot_is_spanned_with_offsets(
-            &table.slots[3][2],
-            vec![(0, 3)]
-        ));
-    }
-
-    #[test]
-    fn test_incoming_rowspans() {
-        let mut table_builder = TableBuilder::new_for_tests();
-
-        table_builder.start_row();
-        table_builder.add_cell(TableSlotCell::mock_for_testing(1, 1, 1));
-        table_builder.add_cell(TableSlotCell::mock_for_testing(2, 1, 30));
-        table_builder.end_row();
-
-        table_builder.start_row();
-        table_builder.add_cell(TableSlotCell::mock_for_testing(3, 2, 1));
-        table_builder.end_row();
-
-        assert_eq!(table_builder.incoming_rowspans, vec![0, 28]);
-
-        let table = table_builder.finish();
-        assert_eq!(row_lengths(&table), vec![2, 2]);
-    }
-}
diff --git a/components/layout_2020/traversal.rs b/components/layout_2020/traversal.rs
deleted file mode 100644
index 40281b640c9..00000000000
--- a/components/layout_2020/traversal.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use script_layout_interface::wrapper_traits::LayoutNode;
-use style::context::{SharedStyleContext, StyleContext};
-use style::data::ElementData;
-use style::dom::{NodeInfo, TElement, TNode};
-use style::traversal::{DomTraversal, PerLevelTraversalData, recalc_style_at};
-
-use crate::context::LayoutContext;
-use crate::dom::DOMLayoutData;
-
-pub struct RecalcStyle<'a> {
-    context: LayoutContext<'a>,
-}
-
-impl<'a> RecalcStyle<'a> {
-    pub fn new(context: LayoutContext<'a>) -> Self {
-        RecalcStyle { context }
-    }
-
-    pub fn context(&self) -> &LayoutContext<'a> {
-        &self.context
-    }
-
-    pub fn destroy(self) -> LayoutContext<'a> {
-        self.context
-    }
-}
-
-#[allow(unsafe_code)]
-impl<'dom, E> DomTraversal<E> for RecalcStyle<'_>
-where
-    E: TElement,
-    E::ConcreteNode: 'dom + LayoutNode<'dom>,
-{
-    fn process_preorder<F>(
-        &self,
-        traversal_data: &PerLevelTraversalData,
-        context: &mut StyleContext<E>,
-        node: E::ConcreteNode,
-        note_child: F,
-    ) where
-        F: FnMut(E::ConcreteNode),
-    {
-        unsafe {
-            node.initialize_style_and_layout_data::<DOMLayoutData>();
-            if !node.is_text_node() {
-                let el = node.as_element().unwrap();
-                let mut data = el.mutate_data().unwrap();
-                recalc_style_at(self, traversal_data, context, el, &mut data, note_child);
-                el.unset_dirty_descendants();
-            }
-        }
-    }
-
-    #[inline]
-    fn needs_postorder_traversal() -> bool {
-        false
-    }
-
-    fn process_postorder(&self, _style_context: &mut StyleContext<E>, _node: E::ConcreteNode) {
-        panic!("this should never be called")
-    }
-
-    fn text_node_needs_traversal(node: E::ConcreteNode, parent_data: &ElementData) -> bool {
-        node.layout_data().is_none() || !parent_data.damage.is_empty()
-    }
-
-    fn shared_context(&self) -> &SharedStyleContext {
-        &self.context.style_context
-    }
-}
diff --git a/components/layout_thread_2020/Cargo.toml b/components/layout_thread_2020/Cargo.toml
deleted file mode 100644
index c3f09d4bfd0..00000000000
--- a/components/layout_thread_2020/Cargo.toml
+++ /dev/null
@@ -1,48 +0,0 @@
-[package]
-name = "layout_thread_2020"
-version.workspace = true
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-publish.workspace = true
-rust-version.workspace = true
-
-[lib]
-name = "layout_thread_2020"
-path = "lib.rs"
-
-[features]
-tracing = ["dep:tracing", "layout/tracing"]
-
-[dependencies]
-app_units = { workspace = true }
-base = { workspace = true }
-constellation_traits = { workspace = true }
-embedder_traits = { workspace = true }
-euclid = { workspace = true }
-fnv = { workspace = true }
-fxhash = { workspace = true }
-fonts = { path = "../fonts" }
-fonts_traits = { workspace = true }
-ipc-channel = { workspace = true }
-layout = { path = "../layout_2020", package = "layout_2020" }
-log = { workspace = true }
-malloc_size_of = { workspace = true }
-metrics = { path = "../metrics" }
-net_traits = { workspace = true }
-parking_lot = { workspace = true }
-profile_traits = { workspace = true }
-script = { path = "../script" }
-script_layout_interface = { workspace = true }
-script_traits = { workspace = true }
-servo_allocator = { path = "../allocator" }
-servo_arc = { workspace = true }
-stylo_atoms = { workspace = true }
-servo_config = { path = "../config" }
-servo_url = { path = "../url" }
-stylo = { workspace = true }
-stylo_traits = { workspace = true }
-tracing = { workspace = true, optional = true }
-url = { workspace = true }
-webrender_api = { workspace = true }
-webrender_traits = { workspace = true }
diff --git a/components/layout_thread_2020/lib.rs b/components/layout_thread_2020/lib.rs
deleted file mode 100644
index 35c9de28fad..00000000000
--- a/components/layout_thread_2020/lib.rs
+++ /dev/null
@@ -1,1180 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-// Work around https://github.com/rust-lang/rust/issues/62132
-#![recursion_limit = "128"]
-
-//! Layout. Performs layout on the DOM, builds display lists and sends them to be
-//! painted.
-
-use std::cell::{Cell, RefCell};
-use std::collections::HashMap;
-use std::fmt::Debug;
-use std::process;
-use std::sync::{Arc, LazyLock};
-
-use app_units::Au;
-use base::Epoch;
-use base::id::{PipelineId, WebViewId};
-use constellation_traits::{ScrollState, UntrustedNodeAddress, WindowSizeData};
-use embedder_traits::resources::{self, Resource};
-use euclid::default::{Point2D as UntypedPoint2D, Rect as UntypedRect, Size2D as UntypedSize2D};
-use euclid::{Point2D, Scale, Size2D, Vector2D};
-use fnv::FnvHashMap;
-use fonts::{FontContext, FontContextWebFontMethods};
-use fonts_traits::StylesheetWebFontLoadFinishedCallback;
-use fxhash::FxHashMap;
-use ipc_channel::ipc::IpcSender;
-use layout::context::LayoutContext;
-use layout::display_list::{DisplayList, WebRenderImageInfo};
-use layout::query::{
-    get_the_text_steps, process_content_box_request, process_content_boxes_request,
-    process_node_geometry_request, process_node_scroll_area_request, process_offset_parent_query,
-    process_resolved_font_style_query, process_resolved_style_request, process_text_index_request,
-};
-use layout::traversal::RecalcStyle;
-use layout::{BoxTree, FragmentTree};
-use log::{debug, error};
-use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
-use net_traits::image_cache::{ImageCache, UsePlaceholder};
-use parking_lot::{Mutex, RwLock};
-use profile_traits::mem::{Report, ReportKind};
-use profile_traits::time::{
-    self as profile_time, TimerMetadata, TimerMetadataFrameType, TimerMetadataReflowType,
-};
-use profile_traits::{path, time_profile};
-use script::layout_dom::{ServoLayoutElement, ServoLayoutNode};
-use script_layout_interface::{
-    Layout, LayoutConfig, LayoutFactory, NodesFromPointQueryType, OffsetParentResponse, ReflowGoal,
-    ReflowRequest, ReflowResult, TrustedNodeAddress,
-};
-use script_traits::{DrawAPaintImageResult, PaintWorkletError, Painter, ScriptThreadMessage};
-use servo_arc::Arc as ServoArc;
-use servo_config::opts::{self, DebugOptions};
-use servo_config::pref;
-use servo_url::ServoUrl;
-use style::animation::DocumentAnimationSet;
-use style::context::{
-    QuirksMode, RegisteredSpeculativePainter, RegisteredSpeculativePainters, SharedStyleContext,
-};
-use style::dom::{OpaqueNode, TElement, TNode};
-use style::error_reporting::RustLogReporter;
-use style::font_metrics::FontMetrics;
-use style::global_style_data::GLOBAL_STYLE_DATA;
-use style::invalidation::element::restyle_hints::RestyleHint;
-use style::media_queries::{Device, MediaList, MediaType};
-use style::properties::style_structs::Font;
-use style::properties::{ComputedValues, PropertyId};
-use style::queries::values::PrefersColorScheme;
-use style::selector_parser::{PseudoElement, SnapshotMap};
-use style::servo::media_queries::FontMetricsProvider;
-use style::shared_lock::{SharedRwLock, SharedRwLockReadGuard, StylesheetGuards};
-use style::stylesheets::{
-    DocumentStyleSheet, Origin, Stylesheet, StylesheetInDocument, UrlExtraData,
-    UserAgentStylesheets,
-};
-use style::stylist::Stylist;
-use style::traversal::DomTraversal;
-use style::traversal_flags::TraversalFlags;
-use style::values::computed::font::GenericFontFamily;
-use style::values::computed::{CSSPixelLength, FontSize, Length, NonNegativeLength};
-use style::values::specified::font::KeywordInfo;
-use style::{Zero, driver};
-use style_traits::{CSSPixel, SpeculativePainter};
-use stylo_atoms::Atom;
-use url::Url;
-use webrender_api::units::{DevicePixel, LayoutPixel};
-use webrender_api::{ExternalScrollId, HitTestFlags, units};
-use webrender_traits::CrossProcessCompositorApi;
-
-// This mutex is necessary due to syncronisation issues between two different types of thread-local storage
-// which manifest themselves when the layout thread tries to layout iframes in parallel with the main page
-//
-// See: https://github.com/servo/servo/pull/29792
-// And: https://gist.github.com/mukilan/ed57eb61b83237a05fbf6360ec5e33b0
-static STYLE_THREAD_POOL: Mutex<&style::global_style_data::STYLE_THREAD_POOL> =
-    Mutex::new(&style::global_style_data::STYLE_THREAD_POOL);
-
-/// Information needed by layout.
-pub struct LayoutThread {
-    /// The ID of the pipeline that we belong to.
-    id: PipelineId,
-
-    /// The webview that contains the pipeline we belong to.
-    webview_id: WebViewId,
-
-    /// The URL of the pipeline that we belong to.
-    url: ServoUrl,
-
-    /// Performs CSS selector matching and style resolution.
-    stylist: Stylist,
-
-    /// Is the current reflow of an iframe, as opposed to a root window?
-    is_iframe: bool,
-
-    /// The channel on which messages can be sent to the script thread.
-    script_chan: IpcSender<ScriptThreadMessage>,
-
-    /// The channel on which messages can be sent to the time profiler.
-    time_profiler_chan: profile_time::ProfilerChan,
-
-    /// Reference to the script thread image cache.
-    image_cache: Arc<dyn ImageCache>,
-
-    /// A FontContext to be used during layout.
-    font_context: Arc<FontContext>,
-
-    /// Is this the first reflow in this LayoutThread?
-    first_reflow: Cell<bool>,
-
-    /// The box tree.
-    box_tree: RefCell<Option<Arc<BoxTree>>>,
-
-    /// The fragment tree.
-    fragment_tree: RefCell<Option<Arc<FragmentTree>>>,
-
-    /// A counter for epoch messages
-    epoch: Cell<Epoch>,
-
-    /// The size of the viewport. This may be different from the size of the screen due to viewport
-    /// constraints.
-    viewport_size: UntypedSize2D<Au>,
-
-    /// Scroll offsets of nodes that scroll.
-    scroll_offsets: RefCell<HashMap<ExternalScrollId, Vector2D<f32, LayoutPixel>>>,
-
-    webrender_image_cache: Arc<RwLock<FnvHashMap<(ServoUrl, UsePlaceholder), WebRenderImageInfo>>>,
-
-    /// The executors for paint worklets.
-    registered_painters: RegisteredPaintersImpl,
-
-    /// Cross-process access to the Compositor API.
-    compositor_api: CrossProcessCompositorApi,
-
-    /// Debug options, copied from configuration to this `LayoutThread` in order
-    /// to avoid having to constantly access the thread-safe global options.
-    debug: DebugOptions,
-}
-
-pub struct LayoutFactoryImpl();
-
-impl LayoutFactory for LayoutFactoryImpl {
-    fn create(&self, config: LayoutConfig) -> Box<dyn Layout> {
-        Box::new(LayoutThread::new(config))
-    }
-}
-
-impl Drop for LayoutThread {
-    fn drop(&mut self) {
-        let (keys, instance_keys) = self
-            .font_context
-            .collect_unused_webrender_resources(true /* all */);
-        self.compositor_api
-            .remove_unused_font_resources(keys, instance_keys)
-    }
-}
-
-impl Layout for LayoutThread {
-    fn device(&self) -> &Device {
-        self.stylist.device()
-    }
-
-    fn current_epoch(&self) -> Epoch {
-        self.epoch.get()
-    }
-
-    fn load_web_fonts_from_stylesheet(&self, stylesheet: ServoArc<Stylesheet>) {
-        let guard = stylesheet.shared_lock.read();
-        self.load_all_web_fonts_from_stylesheet_with_guard(
-            &DocumentStyleSheet(stylesheet.clone()),
-            &guard,
-        );
-    }
-
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn add_stylesheet(
-        &mut self,
-        stylesheet: ServoArc<Stylesheet>,
-        before_stylesheet: Option<ServoArc<Stylesheet>>,
-    ) {
-        let guard = stylesheet.shared_lock.read();
-        let stylesheet = DocumentStyleSheet(stylesheet.clone());
-        self.load_all_web_fonts_from_stylesheet_with_guard(&stylesheet, &guard);
-
-        match before_stylesheet {
-            Some(insertion_point) => self.stylist.insert_stylesheet_before(
-                stylesheet,
-                DocumentStyleSheet(insertion_point),
-                &guard,
-            ),
-            None => self.stylist.append_stylesheet(stylesheet, &guard),
-        }
-    }
-
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn remove_stylesheet(&mut self, stylesheet: ServoArc<Stylesheet>) {
-        let guard = stylesheet.shared_lock.read();
-        let stylesheet = DocumentStyleSheet(stylesheet.clone());
-        self.stylist.remove_stylesheet(stylesheet.clone(), &guard);
-        self.font_context
-            .remove_all_web_fonts_from_stylesheet(&stylesheet);
-    }
-
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn query_content_box(&self, node: OpaqueNode) -> Option<UntypedRect<Au>> {
-        process_content_box_request(node, self.fragment_tree.borrow().clone())
-    }
-
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn query_content_boxes(&self, node: OpaqueNode) -> Vec<UntypedRect<Au>> {
-        process_content_boxes_request(node, self.fragment_tree.borrow().clone())
-    }
-
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn query_client_rect(&self, node: OpaqueNode) -> UntypedRect<i32> {
-        process_node_geometry_request(node, self.fragment_tree.borrow().clone())
-    }
-
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn query_element_inner_outer_text(
-        &self,
-        node: script_layout_interface::TrustedNodeAddress,
-    ) -> String {
-        let node = unsafe { ServoLayoutNode::new(&node) };
-        get_the_text_steps(node)
-    }
-
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn query_nodes_from_point(
-        &self,
-        point: UntypedPoint2D<f32>,
-        query_type: NodesFromPointQueryType,
-    ) -> Vec<UntrustedNodeAddress> {
-        let mut flags = match query_type {
-            NodesFromPointQueryType::Topmost => HitTestFlags::empty(),
-            NodesFromPointQueryType::All => HitTestFlags::FIND_ALL,
-        };
-
-        // The point we get is not relative to the entire WebRender scene, but to this
-        // particular pipeline, so we need to tell WebRender about that.
-        flags.insert(HitTestFlags::POINT_RELATIVE_TO_PIPELINE_VIEWPORT);
-
-        let client_point = units::DevicePoint::from_untyped(point);
-        let results = self
-            .compositor_api
-            .hit_test(Some(self.id.into()), client_point, flags);
-
-        results.iter().map(|result| result.node).collect()
-    }
-
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn query_offset_parent(&self, node: OpaqueNode) -> OffsetParentResponse {
-        process_offset_parent_query(node, self.fragment_tree.borrow().clone())
-    }
-
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn query_resolved_style(
-        &self,
-        node: TrustedNodeAddress,
-        pseudo: Option<PseudoElement>,
-        property_id: PropertyId,
-        animations: DocumentAnimationSet,
-        animation_timeline_value: f64,
-    ) -> String {
-        let node = unsafe { ServoLayoutNode::new(&node) };
-        let document = node.owner_doc();
-        let document_shared_lock = document.style_shared_lock();
-        let guards = StylesheetGuards {
-            author: &document_shared_lock.read(),
-            ua_or_user: &UA_STYLESHEETS.shared_lock.read(),
-        };
-        let snapshot_map = SnapshotMap::new();
-
-        let shared_style_context = self.build_shared_style_context(
-            guards,
-            &snapshot_map,
-            animation_timeline_value,
-            &animations,
-            TraversalFlags::empty(),
-        );
-
-        let fragment_tree = self.fragment_tree.borrow().clone();
-        process_resolved_style_request(
-            &shared_style_context,
-            node,
-            &pseudo,
-            &property_id,
-            fragment_tree,
-        )
-    }
-
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn query_resolved_font_style(
-        &self,
-        node: TrustedNodeAddress,
-        value: &str,
-        animations: DocumentAnimationSet,
-        animation_timeline_value: f64,
-    ) -> Option<ServoArc<Font>> {
-        let node = unsafe { ServoLayoutNode::new(&node) };
-        let document = node.owner_doc();
-        let document_shared_lock = document.style_shared_lock();
-        let guards = StylesheetGuards {
-            author: &document_shared_lock.read(),
-            ua_or_user: &UA_STYLESHEETS.shared_lock.read(),
-        };
-        let snapshot_map = SnapshotMap::new();
-        let shared_style_context = self.build_shared_style_context(
-            guards,
-            &snapshot_map,
-            animation_timeline_value,
-            &animations,
-            TraversalFlags::empty(),
-        );
-
-        process_resolved_font_style_query(
-            &shared_style_context,
-            node,
-            value,
-            self.url.clone(),
-            document_shared_lock,
-        )
-    }
-
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn query_scrolling_area(&self, node: Option<OpaqueNode>) -> UntypedRect<i32> {
-        process_node_scroll_area_request(node, self.fragment_tree.borrow().clone())
-    }
-
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn query_text_indext(
-        &self,
-        node: OpaqueNode,
-        point_in_node: UntypedPoint2D<f32>,
-    ) -> Option<usize> {
-        let point_in_node = Point2D::new(
-            Au::from_f32_px(point_in_node.x),
-            Au::from_f32_px(point_in_node.y),
-        );
-        process_text_index_request(node, point_in_node)
-    }
-
-    fn exit_now(&mut self) {}
-
-    fn collect_reports(&self, reports: &mut Vec<Report>) {
-        // Servo uses vanilla jemalloc, which doesn't have a
-        // malloc_enclosing_size_of function.
-        let mut ops = MallocSizeOfOps::new(servo_allocator::usable_size, None, None);
-
-        // TODO: Measure more than just display list, stylist, and font context.
-        let formatted_url = &format!("url({})", self.url);
-        reports.push(Report {
-            path: path![formatted_url, "layout-thread", "display-list"],
-            kind: ReportKind::ExplicitJemallocHeapSize,
-            size: 0,
-        });
-
-        reports.push(Report {
-            path: path![formatted_url, "layout-thread", "stylist"],
-            kind: ReportKind::ExplicitJemallocHeapSize,
-            size: self.stylist.size_of(&mut ops),
-        });
-
-        reports.push(Report {
-            path: path![formatted_url, "layout-thread", "font-context"],
-            kind: ReportKind::ExplicitJemallocHeapSize,
-            size: self.font_context.size_of(&mut ops),
-        });
-    }
-
-    fn set_quirks_mode(&mut self, quirks_mode: QuirksMode) {
-        self.stylist.set_quirks_mode(quirks_mode);
-    }
-
-    fn reflow(&mut self, reflow_request: ReflowRequest) -> Option<ReflowResult> {
-        time_profile!(
-            profile_time::ProfilerCategory::LayoutPerform,
-            self.profiler_metadata(),
-            self.time_profiler_chan.clone(),
-            || self.handle_reflow(reflow_request),
-        )
-    }
-
-    fn register_paint_worklet_modules(
-        &mut self,
-        _name: Atom,
-        _properties: Vec<Atom>,
-        _painter: Box<dyn Painter>,
-    ) {
-    }
-
-    fn set_scroll_offsets(&mut self, scroll_states: &[ScrollState]) {
-        *self.scroll_offsets.borrow_mut() = scroll_states
-            .iter()
-            .map(|scroll_state| (scroll_state.scroll_id, scroll_state.scroll_offset))
-            .collect();
-    }
-}
-
-impl LayoutThread {
-    fn new(config: LayoutConfig) -> LayoutThread {
-        // Let webrender know about this pipeline by sending an empty display list.
-        config
-            .compositor_api
-            .send_initial_transaction(config.id.into());
-
-        let mut font = Font::initial_values();
-        let default_font_size = pref!(fonts_default_size);
-        font.font_size = FontSize {
-            computed_size: NonNegativeLength::new(default_font_size as f32),
-            used_size: NonNegativeLength::new(default_font_size as f32),
-            keyword_info: KeywordInfo::medium(),
-        };
-
-        // The device pixel ratio is incorrect (it does not have the hidpi value),
-        // but it will be set correctly when the initial reflow takes place.
-        let device = Device::new(
-            MediaType::screen(),
-            QuirksMode::NoQuirks,
-            config.window_size.initial_viewport,
-            Scale::new(config.window_size.device_pixel_ratio.get()),
-            Box::new(LayoutFontMetricsProvider(config.font_context.clone())),
-            ComputedValues::initial_values_with_font_override(font),
-            // TODO: obtain preferred color scheme from embedder
-            PrefersColorScheme::Light,
-        );
-
-        LayoutThread {
-            id: config.id,
-            webview_id: config.webview_id,
-            url: config.url,
-            is_iframe: config.is_iframe,
-            script_chan: config.script_chan.clone(),
-            time_profiler_chan: config.time_profiler_chan,
-            registered_painters: RegisteredPaintersImpl(Default::default()),
-            image_cache: config.image_cache,
-            font_context: config.font_context,
-            first_reflow: Cell::new(true),
-            box_tree: Default::default(),
-            fragment_tree: Default::default(),
-            // Epoch starts at 1 because of the initial display list for epoch 0 that we send to WR
-            epoch: Cell::new(Epoch(1)),
-            viewport_size: Size2D::new(
-                Au::from_f32_px(config.window_size.initial_viewport.width),
-                Au::from_f32_px(config.window_size.initial_viewport.height),
-            ),
-            compositor_api: config.compositor_api,
-            scroll_offsets: Default::default(),
-            stylist: Stylist::new(device, QuirksMode::NoQuirks),
-            webrender_image_cache: Default::default(),
-            debug: opts::get().debug.clone(),
-        }
-    }
-
-    fn build_shared_style_context<'a>(
-        &'a self,
-        guards: StylesheetGuards<'a>,
-        snapshot_map: &'a SnapshotMap,
-        animation_timeline_value: f64,
-        animations: &DocumentAnimationSet,
-        traversal_flags: TraversalFlags,
-    ) -> SharedStyleContext<'a> {
-        SharedStyleContext {
-            stylist: &self.stylist,
-            options: GLOBAL_STYLE_DATA.options.clone(),
-            guards,
-            visited_styles_enabled: false,
-            animations: animations.clone(),
-            registered_speculative_painters: &self.registered_painters,
-            current_time_for_animations: animation_timeline_value,
-            traversal_flags,
-            snapshot_map,
-        }
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    // Create a layout context for use in building display lists, hit testing, &c.
-    #[allow(clippy::too_many_arguments)]
-    fn build_layout_context<'a>(
-        &'a self,
-        guards: StylesheetGuards<'a>,
-        snapshot_map: &'a SnapshotMap,
-        reflow_request: &ReflowRequest,
-        use_rayon: bool,
-    ) -> LayoutContext<'a> {
-        let traversal_flags = match reflow_request.stylesheets_changed {
-            true => TraversalFlags::ForCSSRuleChanges,
-            false => TraversalFlags::empty(),
-        };
-
-        LayoutContext {
-            id: self.id,
-            origin: reflow_request.origin.clone(),
-            style_context: self.build_shared_style_context(
-                guards,
-                snapshot_map,
-                reflow_request.animation_timeline_value,
-                &reflow_request.animations,
-                traversal_flags,
-            ),
-            image_cache: self.image_cache.clone(),
-            font_context: self.font_context.clone(),
-            webrender_image_cache: self.webrender_image_cache.clone(),
-            pending_images: Mutex::default(),
-            iframe_sizes: Mutex::default(),
-            use_rayon,
-        }
-    }
-
-    fn load_all_web_fonts_from_stylesheet_with_guard(
-        &self,
-        stylesheet: &DocumentStyleSheet,
-        guard: &SharedRwLockReadGuard,
-    ) {
-        if !stylesheet.is_effective_for_device(self.stylist.device(), guard) {
-            return;
-        }
-
-        let locked_script_channel = Mutex::new(self.script_chan.clone());
-        let pipeline_id = self.id;
-        let web_font_finished_loading_callback = move |succeeded: bool| {
-            let _ = locked_script_channel
-                .lock()
-                .send(ScriptThreadMessage::WebFontLoaded(pipeline_id, succeeded));
-        };
-
-        self.font_context.add_all_web_fonts_from_stylesheet(
-            self.webview_id,
-            stylesheet,
-            guard,
-            self.stylist.device(),
-            Arc::new(web_font_finished_loading_callback) as StylesheetWebFontLoadFinishedCallback,
-        );
-    }
-
-    /// The high-level routine that performs layout.
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(skip_all, fields(servo_profiling = true), level = "trace")
-    )]
-    fn handle_reflow(&mut self, mut reflow_request: ReflowRequest) -> Option<ReflowResult> {
-        let document = unsafe { ServoLayoutNode::new(&reflow_request.document) };
-        let document = document.as_document().unwrap();
-        let Some(root_element) = document.root_element() else {
-            debug!("layout: No root node: bailing");
-            return None;
-        };
-
-        // Calculate the actual viewport as per DEVICE-ADAPT § 6
-        // If the entire flow tree is invalid, then it will be reflowed anyhow.
-        let document_shared_lock = document.style_shared_lock();
-        let author_guard = document_shared_lock.read();
-
-        let ua_stylesheets = &*UA_STYLESHEETS;
-        let ua_or_user_guard = ua_stylesheets.shared_lock.read();
-        let guards = StylesheetGuards {
-            author: &author_guard,
-            ua_or_user: &ua_or_user_guard,
-        };
-
-        let had_used_viewport_units = self.stylist.device().used_viewport_units();
-        let viewport_size_changed = self.viewport_did_change(reflow_request.window_size);
-        let theme_changed = self.theme_did_change(reflow_request.theme);
-
-        if viewport_size_changed || theme_changed {
-            self.update_device(reflow_request.window_size, reflow_request.theme, &guards);
-        }
-
-        if viewport_size_changed && had_used_viewport_units {
-            if let Some(mut data) = root_element.mutate_data() {
-                data.hint.insert(RestyleHint::recascade_subtree());
-            }
-        }
-
-        if self.first_reflow.get() {
-            for stylesheet in &ua_stylesheets.user_or_user_agent_stylesheets {
-                self.stylist
-                    .append_stylesheet(stylesheet.clone(), &ua_or_user_guard);
-                self.load_all_web_fonts_from_stylesheet_with_guard(stylesheet, &ua_or_user_guard);
-            }
-
-            if self.stylist.quirks_mode() != QuirksMode::NoQuirks {
-                self.stylist.append_stylesheet(
-                    ua_stylesheets.quirks_mode_stylesheet.clone(),
-                    &ua_or_user_guard,
-                );
-                self.load_all_web_fonts_from_stylesheet_with_guard(
-                    &ua_stylesheets.quirks_mode_stylesheet,
-                    &ua_or_user_guard,
-                );
-            }
-        }
-
-        if reflow_request.stylesheets_changed {
-            self.stylist
-                .force_stylesheet_origins_dirty(Origin::Author.into());
-        }
-
-        // Flush shadow roots stylesheets if dirty.
-        document.flush_shadow_roots_stylesheets(&mut self.stylist, guards.author);
-
-        let restyles = std::mem::take(&mut reflow_request.pending_restyles);
-        debug!("Draining restyles: {}", restyles.len());
-
-        let mut map = SnapshotMap::new();
-        let elements_with_snapshot: Vec<_> = restyles
-            .iter()
-            .filter(|r| r.1.snapshot.is_some())
-            .map(|r| unsafe { ServoLayoutNode::new(&r.0).as_element().unwrap() })
-            .collect();
-
-        for (el, restyle) in restyles {
-            let el = unsafe { ServoLayoutNode::new(&el).as_element().unwrap() };
-
-            // If we haven't styled this node yet, we don't need to track a
-            // restyle.
-            let mut style_data = match el.mutate_data() {
-                Some(d) => d,
-                None => {
-                    unsafe { el.unset_snapshot_flags() };
-                    continue;
-                },
-            };
-
-            if let Some(s) = restyle.snapshot {
-                unsafe { el.set_has_snapshot() };
-                map.insert(el.as_node().opaque(), s);
-            }
-
-            // Stash the data on the element for processing by the style system.
-            style_data.hint.insert(restyle.hint);
-            style_data.damage = restyle.damage;
-            debug!("Noting restyle for {:?}: {:?}", el, style_data);
-        }
-
-        self.stylist.flush(&guards, Some(root_element), Some(&map));
-
-        let rayon_pool = STYLE_THREAD_POOL.lock();
-        let rayon_pool = rayon_pool.pool();
-        let rayon_pool = rayon_pool.as_ref();
-
-        // Create a layout context for use throughout the following passes.
-        let mut layout_context =
-            self.build_layout_context(guards.clone(), &map, &reflow_request, rayon_pool.is_some());
-
-        let dirty_root = unsafe {
-            ServoLayoutNode::new(&reflow_request.dirty_root.unwrap())
-                .as_element()
-                .unwrap()
-        };
-
-        let traversal = RecalcStyle::new(layout_context);
-        let token = {
-            let shared = DomTraversal::<ServoLayoutElement>::shared_context(&traversal);
-            RecalcStyle::pre_traverse(dirty_root, shared)
-        };
-
-        if token.should_traverse() {
-            #[cfg(feature = "tracing")]
-            let _span =
-                tracing::trace_span!("driver::traverse_dom", servo_profiling = true).entered();
-            let dirty_root: ServoLayoutNode =
-                driver::traverse_dom(&traversal, token, rayon_pool).as_node();
-
-            let root_node = root_element.as_node();
-            let mut box_tree = self.box_tree.borrow_mut();
-            let box_tree = &mut *box_tree;
-            let mut build_box_tree = || {
-                if !BoxTree::update(traversal.context(), dirty_root) {
-                    *box_tree = Some(Arc::new(BoxTree::construct(traversal.context(), root_node)));
-                }
-            };
-            if let Some(pool) = rayon_pool {
-                pool.install(build_box_tree)
-            } else {
-                build_box_tree()
-            };
-
-            let viewport_size = Size2D::new(
-                self.viewport_size.width.to_f32_px(),
-                self.viewport_size.height.to_f32_px(),
-            );
-            let run_layout = || {
-                box_tree
-                    .as_ref()
-                    .unwrap()
-                    .layout(traversal.context(), viewport_size)
-            };
-            let fragment_tree = Arc::new(if let Some(pool) = rayon_pool {
-                pool.install(run_layout)
-            } else {
-                run_layout()
-            });
-            *self.fragment_tree.borrow_mut() = Some(fragment_tree);
-        }
-
-        layout_context = traversal.destroy();
-
-        for element in elements_with_snapshot {
-            unsafe { element.unset_snapshot_flags() }
-        }
-
-        if self.debug.dump_style_tree {
-            println!(
-                "{:?}",
-                style::dom::ShowSubtreeDataAndPrimaryValues(root_element.as_node())
-            );
-        }
-
-        if self.debug.dump_rule_tree {
-            layout_context
-                .style_context
-                .stylist
-                .rule_tree()
-                .dump_stdout(&guards);
-        }
-
-        // GC the rule tree if some heuristics are met.
-        layout_context.style_context.stylist.rule_tree().maybe_gc();
-
-        // Perform post-style recalculation layout passes.
-        if let Some(root) = &*self.fragment_tree.borrow() {
-            self.perform_post_style_recalc_layout_passes(
-                root.clone(),
-                &reflow_request.reflow_goal,
-                &mut layout_context,
-            );
-        }
-
-        self.first_reflow.set(false);
-
-        if let ReflowGoal::UpdateScrollNode(scroll_state) = reflow_request.reflow_goal {
-            self.update_scroll_node_state(&scroll_state);
-        }
-
-        let pending_images = std::mem::take(&mut *layout_context.pending_images.lock());
-        let iframe_sizes = std::mem::take(&mut *layout_context.iframe_sizes.lock());
-        Some(ReflowResult {
-            pending_images,
-            iframe_sizes,
-        })
-    }
-
-    fn update_scroll_node_state(&self, state: &ScrollState) {
-        self.scroll_offsets
-            .borrow_mut()
-            .insert(state.scroll_id, state.scroll_offset);
-        let point = Point2D::new(-state.scroll_offset.x, -state.scroll_offset.y);
-        self.compositor_api.send_scroll_node(
-            self.webview_id,
-            self.id.into(),
-            units::LayoutPoint::from_untyped(point),
-            state.scroll_id,
-        );
-    }
-
-    fn perform_post_style_recalc_layout_passes(
-        &self,
-        fragment_tree: Arc<FragmentTree>,
-        reflow_goal: &ReflowGoal,
-        context: &mut LayoutContext,
-    ) {
-        Self::cancel_animations_for_nodes_not_in_fragment_tree(
-            &context.style_context.animations,
-            &fragment_tree,
-        );
-
-        if !reflow_goal.needs_display_list() {
-            return;
-        }
-
-        let mut epoch = self.epoch.get();
-        epoch.next();
-        self.epoch.set(epoch);
-
-        let viewport_size = units::LayoutSize::from_untyped(Size2D::new(
-            self.viewport_size.width.to_f32_px(),
-            self.viewport_size.height.to_f32_px(),
-        ));
-        let mut display_list = DisplayList::new(
-            viewport_size,
-            fragment_tree.scrollable_overflow(),
-            self.id.into(),
-            epoch.into(),
-            fragment_tree.viewport_scroll_sensitivity,
-            self.first_reflow.get(),
-        );
-        display_list.wr.begin();
-
-        // `dump_serialized_display_list` doesn't actually print anything. It sets up
-        // the display list for printing the serialized version when `finalize()` is called.
-        // We need to call this before adding any display items so that they are printed
-        // during `finalize()`.
-        if self.debug.dump_display_list {
-            display_list.wr.dump_serialized_display_list();
-        }
-
-        // Build the root stacking context. This turns the `FragmentTree` into a
-        // tree of fragments in CSS painting order and also creates all
-        // applicable spatial and clip nodes.
-        let root_stacking_context =
-            display_list.build_stacking_context_tree(&fragment_tree, &self.debug);
-
-        // Build the rest of the display list which inclues all of the WebRender primitives.
-        display_list.build(context, &fragment_tree, &root_stacking_context);
-
-        if self.debug.dump_flow_tree {
-            fragment_tree.print();
-        }
-        if self.debug.dump_stacking_context_tree {
-            root_stacking_context.debug_print();
-        }
-        debug!("Layout done!");
-
-        if reflow_goal.needs_display() {
-            self.compositor_api.send_display_list(
-                self.webview_id,
-                display_list.compositor_info,
-                display_list.wr.end().1,
-            );
-
-            let (keys, instance_keys) = self
-                .font_context
-                .collect_unused_webrender_resources(false /* all */);
-            self.compositor_api
-                .remove_unused_font_resources(keys, instance_keys)
-        }
-    }
-
-    /// Returns profiling information which is passed to the time profiler.
-    fn profiler_metadata(&self) -> Option<TimerMetadata> {
-        Some(TimerMetadata {
-            url: self.url.to_string(),
-            iframe: if self.is_iframe {
-                TimerMetadataFrameType::IFrame
-            } else {
-                TimerMetadataFrameType::RootWindow
-            },
-            incremental: if self.first_reflow.get() {
-                TimerMetadataReflowType::FirstReflow
-            } else {
-                TimerMetadataReflowType::Incremental
-            },
-        })
-    }
-
-    /// Cancel animations for any nodes which have been removed from fragment tree.
-    /// TODO(mrobinson): We should look into a way of doing this during flow tree construction.
-    /// This also doesn't yet handles nodes that have been reparented.
-    fn cancel_animations_for_nodes_not_in_fragment_tree(
-        animations: &DocumentAnimationSet,
-        root: &FragmentTree,
-    ) {
-        // Assume all nodes have been removed until proven otherwise.
-        let mut animations = animations.sets.write();
-        let mut invalid_nodes = animations.keys().cloned().collect();
-        root.remove_nodes_in_fragment_tree_from_set(&mut invalid_nodes);
-
-        // Cancel animations for any nodes that are no longer in the fragment tree.
-        for node in &invalid_nodes {
-            if let Some(state) = animations.get_mut(node) {
-                state.cancel_all_animations();
-            }
-        }
-    }
-
-    fn viewport_did_change(&mut self, window_size_data: WindowSizeData) -> bool {
-        let new_pixel_ratio = window_size_data.device_pixel_ratio.get();
-        let new_viewport_size = Size2D::new(
-            Au::from_f32_px(window_size_data.initial_viewport.width),
-            Au::from_f32_px(window_size_data.initial_viewport.height),
-        );
-
-        // TODO: eliminate self.viewport_size in favour of using self.device.au_viewport_size()
-        self.viewport_size = new_viewport_size;
-
-        let device = self.stylist.device();
-        let size_did_change = device.au_viewport_size() != new_viewport_size;
-        let pixel_ratio_did_change = device.device_pixel_ratio().get() != new_pixel_ratio;
-
-        size_did_change || pixel_ratio_did_change
-    }
-
-    fn theme_did_change(&self, theme: PrefersColorScheme) -> bool {
-        theme != self.device().color_scheme()
-    }
-
-    /// Update layout given a new viewport. Returns true if the viewport changed or false if it didn't.
-    fn update_device(
-        &mut self,
-        window_size_data: WindowSizeData,
-        theme: PrefersColorScheme,
-        guards: &StylesheetGuards,
-    ) {
-        let device = Device::new(
-            MediaType::screen(),
-            self.stylist.quirks_mode(),
-            window_size_data.initial_viewport,
-            Scale::new(window_size_data.device_pixel_ratio.get()),
-            Box::new(LayoutFontMetricsProvider(self.font_context.clone())),
-            self.stylist.device().default_computed_values().to_arc(),
-            theme,
-        );
-
-        // Preserve any previously computed root font size.
-        device.set_root_font_size(self.stylist.device().root_font_size().px());
-
-        let sheet_origins_affected_by_device_change = self.stylist.set_device(device, guards);
-        self.stylist
-            .force_stylesheet_origins_dirty(sheet_origins_affected_by_device_change);
-    }
-}
-
-fn get_ua_stylesheets() -> Result<UserAgentStylesheets, &'static str> {
-    fn parse_ua_stylesheet(
-        shared_lock: &SharedRwLock,
-        filename: &str,
-        content: &[u8],
-    ) -> Result<DocumentStyleSheet, &'static str> {
-        let url = Url::parse(&format!("chrome://resources/{:?}", filename))
-            .ok()
-            .unwrap();
-        Ok(DocumentStyleSheet(ServoArc::new(Stylesheet::from_bytes(
-            content,
-            url.into(),
-            None,
-            None,
-            Origin::UserAgent,
-            MediaList::empty(),
-            shared_lock.clone(),
-            None,
-            None,
-            QuirksMode::NoQuirks,
-        ))))
-    }
-
-    let shared_lock = &GLOBAL_STYLE_DATA.shared_lock;
-
-    // FIXME: presentational-hints.css should be at author origin with zero specificity.
-    //        (Does it make a difference?)
-    let mut user_or_user_agent_stylesheets = vec![
-        parse_ua_stylesheet(
-            shared_lock,
-            "user-agent.css",
-            &resources::read_bytes(Resource::UserAgentCSS),
-        )?,
-        parse_ua_stylesheet(
-            shared_lock,
-            "servo.css",
-            &resources::read_bytes(Resource::ServoCSS),
-        )?,
-        parse_ua_stylesheet(
-            shared_lock,
-            "presentational-hints.css",
-            &resources::read_bytes(Resource::PresentationalHintsCSS),
-        )?,
-    ];
-
-    for (contents, url) in &opts::get().user_stylesheets {
-        user_or_user_agent_stylesheets.push(DocumentStyleSheet(ServoArc::new(
-            Stylesheet::from_bytes(
-                contents,
-                UrlExtraData(url.get_arc()),
-                None,
-                None,
-                Origin::User,
-                MediaList::empty(),
-                shared_lock.clone(),
-                None,
-                Some(&RustLogReporter),
-                QuirksMode::NoQuirks,
-            ),
-        )));
-    }
-
-    let quirks_mode_stylesheet = parse_ua_stylesheet(
-        shared_lock,
-        "quirks-mode.css",
-        &resources::read_bytes(Resource::QuirksModeCSS),
-    )?;
-
-    Ok(UserAgentStylesheets {
-        shared_lock: shared_lock.clone(),
-        user_or_user_agent_stylesheets,
-        quirks_mode_stylesheet,
-    })
-}
-
-static UA_STYLESHEETS: LazyLock<UserAgentStylesheets> =
-    LazyLock::new(|| match get_ua_stylesheets() {
-        Ok(stylesheets) => stylesheets,
-        Err(filename) => {
-            error!("Failed to load UA stylesheet {}!", filename);
-            process::exit(1);
-        },
-    });
-
-struct RegisteredPainterImpl {
-    painter: Box<dyn Painter>,
-    name: Atom,
-    // FIXME: Should be a PrecomputedHashMap.
-    properties: FxHashMap<Atom, PropertyId>,
-}
-
-impl SpeculativePainter for RegisteredPainterImpl {
-    fn speculatively_draw_a_paint_image(
-        &self,
-        properties: Vec<(Atom, String)>,
-        arguments: Vec<String>,
-    ) {
-        self.painter
-            .speculatively_draw_a_paint_image(properties, arguments);
-    }
-}
-
-impl RegisteredSpeculativePainter for RegisteredPainterImpl {
-    fn properties(&self) -> &FxHashMap<Atom, PropertyId> {
-        &self.properties
-    }
-    fn name(&self) -> Atom {
-        self.name.clone()
-    }
-}
-
-impl Painter for RegisteredPainterImpl {
-    fn draw_a_paint_image(
-        &self,
-        size: Size2D<f32, CSSPixel>,
-        device_pixel_ratio: Scale<f32, CSSPixel, DevicePixel>,
-        properties: Vec<(Atom, String)>,
-        arguments: Vec<String>,
-    ) -> Result<DrawAPaintImageResult, PaintWorkletError> {
-        self.painter
-            .draw_a_paint_image(size, device_pixel_ratio, properties, arguments)
-    }
-}
-
-struct RegisteredPaintersImpl(FnvHashMap<Atom, RegisteredPainterImpl>);
-
-impl RegisteredSpeculativePainters for RegisteredPaintersImpl {
-    fn get(&self, name: &Atom) -> Option<&dyn RegisteredSpeculativePainter> {
-        self.0
-            .get(name)
-            .map(|painter| painter as &dyn RegisteredSpeculativePainter)
-    }
-}
-
-struct LayoutFontMetricsProvider(Arc<FontContext>);
-
-impl FontMetricsProvider for LayoutFontMetricsProvider {
-    fn query_font_metrics(
-        &self,
-        _vertical: bool,
-        font: &Font,
-        base_size: CSSPixelLength,
-        _in_media_query: bool,
-        _retrieve_math_scales: bool,
-    ) -> FontMetrics {
-        let font_context = &self.0;
-        let font_group = self
-            .0
-            .font_group_with_size(ServoArc::new(font.clone()), base_size.into());
-
-        let Some(first_font_metrics) = font_group
-            .write()
-            .first(font_context)
-            .map(|font| font.metrics.clone())
-        else {
-            return Default::default();
-        };
-
-        // Only use the x-height of this font if it is non-zero. Some fonts return
-        // inaccurate metrics, which shouldn't be used.
-        let x_height = Some(first_font_metrics.x_height)
-            .filter(|x_height| !x_height.is_zero())
-            .map(CSSPixelLength::from);
-
-        let zero_advance_measure = first_font_metrics
-            .zero_horizontal_advance
-            .or_else(|| {
-                font_group
-                    .write()
-                    .find_by_codepoint(font_context, '0', None, None)?
-                    .metrics
-                    .zero_horizontal_advance
-            })
-            .map(CSSPixelLength::from);
-
-        let ic_width = first_font_metrics
-            .ic_horizontal_advance
-            .or_else(|| {
-                font_group
-                    .write()
-                    .find_by_codepoint(font_context, '\u{6C34}', None, None)?
-                    .metrics
-                    .ic_horizontal_advance
-            })
-            .map(CSSPixelLength::from);
-
-        FontMetrics {
-            x_height,
-            zero_advance_measure,
-            cap_height: None,
-            ic_width,
-            ascent: first_font_metrics.ascent.into(),
-            script_percent_scale_down: None,
-            script_script_percent_scale_down: None,
-        }
-    }
-
-    fn base_size_for_generic(&self, generic: GenericFontFamily) -> Length {
-        Length::new(match generic {
-            GenericFontFamily::Monospace => pref!(fonts_default_monospace_size),
-            _ => pref!(fonts_default_size),
-        } as f32)
-        .max(Length::new(0.0))
-    }
-}
-
-impl Debug for LayoutFontMetricsProvider {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_tuple("LayoutFontMetricsProvider").finish()
-    }
-}
diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml
index 88c86239d50..a24bc70a211 100644
--- a/components/malloc_size_of/Cargo.toml
+++ b/components/malloc_size_of/Cargo.toml
@@ -13,6 +13,7 @@ path = "lib.rs"
 [dependencies]
 accountable-refcell = { workspace = true }
 app_units = { workspace = true }
+atomic_refcell = { workspace = true }
 content-security-policy = { workspace = true }
 crossbeam-channel = { workspace = true }
 euclid = { workspace = true }
@@ -28,9 +29,13 @@ string_cache = { workspace = true }
 stylo = { workspace = true }
 stylo_dom = { workspace = true }
 stylo_malloc_size_of = { workspace = true }
+taffy = { workspace = true }
 thin-vec = { workspace = true }
 tokio = { workspace = true, features = ["sync"] }
+unicode-bidi = { workspace = true }
+unicode-script = { workspace = true }
 url = { workspace = true }
+urlpattern = { workspace = true }
 uuid = { workspace = true }
 webrender_api = { workspace = true }
 wr_malloc_size_of = { workspace = true }
diff --git a/components/malloc_size_of/lib.rs b/components/malloc_size_of/lib.rs
index f2da13883b9..ae951da97e5 100644
--- a/components/malloc_size_of/lib.rs
+++ b/components/malloc_size_of/lib.rs
@@ -50,8 +50,11 @@ use std::cell::OnceCell;
 use std::collections::BinaryHeap;
 use std::hash::{BuildHasher, Hash};
 use std::ops::Range;
+use std::rc::Rc;
 use std::sync::Arc;
 
+use style::properties::ComputedValues;
+use style::values::generics::length::GenericLengthPercentageOrAuto;
 pub use stylo_malloc_size_of::MallocSizeOfOps;
 use uuid::Uuid;
 
@@ -219,6 +222,26 @@ where
     }
 }
 
+impl<T: MallocConditionalSizeOf> MallocConditionalSizeOf for Option<T> {
+    fn conditional_size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
+        if let Some(val) = self.as_ref() {
+            val.conditional_size_of(ops)
+        } else {
+            0
+        }
+    }
+}
+
+impl<T: MallocConditionalSizeOf> MallocConditionalSizeOf for Vec<T> {
+    fn conditional_size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
+        let mut n = self.shallow_size_of(ops);
+        for elem in self.iter() {
+            n += elem.conditional_size_of(ops);
+        }
+        n
+    }
+}
+
 impl<T: MallocSizeOf> MallocSizeOf for Option<T> {
     fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
         if let Some(val) = self.as_ref() {
@@ -556,6 +579,28 @@ impl<T: MallocSizeOf> MallocConditionalSizeOf for Arc<T> {
     }
 }
 
+impl<T> MallocUnconditionalShallowSizeOf for Rc<T> {
+    fn unconditional_shallow_size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
+        unsafe { ops.malloc_size_of(Rc::as_ptr(self)) }
+    }
+}
+
+impl<T: MallocSizeOf> MallocUnconditionalSizeOf for Rc<T> {
+    fn unconditional_size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
+        self.unconditional_shallow_size_of(ops) + (**self).size_of(ops)
+    }
+}
+
+impl<T: MallocSizeOf> MallocConditionalSizeOf for Rc<T> {
+    fn conditional_size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
+        if ops.have_seen_ptr(Rc::as_ptr(self)) {
+            0
+        } else {
+            self.unconditional_size_of(ops)
+        }
+    }
+}
+
 /// If a mutex is stored directly as a member of a data type that is being measured,
 /// it is the unique owner of its contents and deserves to be measured.
 ///
@@ -688,12 +733,30 @@ impl<T> MallocSizeOf for ipc_channel::ipc::IpcSender<T> {
     }
 }
 
+impl<T> MallocSizeOf for ipc_channel::ipc::IpcReceiver<T> {
+    fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
+        0
+    }
+}
+
+impl MallocSizeOf for ipc_channel::ipc::IpcSharedMemory {
+    fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
+        self.len()
+    }
+}
+
 impl<T: MallocSizeOf> MallocSizeOf for accountable_refcell::RefCell<T> {
     fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
         self.borrow().size_of(ops)
     }
 }
 
+impl MallocSizeOf for servo_arc::Arc<ComputedValues> {
+    fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
+        self.conditional_size_of(ops)
+    }
+}
+
 malloc_size_of_hash_map!(indexmap::IndexMap<K, V, S>);
 malloc_size_of_hash_set!(indexmap::IndexSet<T, S>);
 
@@ -719,8 +782,17 @@ malloc_size_of_is_0!(std::sync::atomic::AtomicUsize);
 malloc_size_of_is_0!(std::time::Duration);
 malloc_size_of_is_0!(std::time::Instant);
 malloc_size_of_is_0!(std::time::SystemTime);
+malloc_size_of_is_0!(style::data::ElementData);
 malloc_size_of_is_0!(style::font_face::SourceList);
+malloc_size_of_is_0!(style::properties::ComputedValues);
+malloc_size_of_is_0!(style::properties::declaration_block::PropertyDeclarationBlock);
 malloc_size_of_is_0!(style::queries::values::PrefersColorScheme);
+malloc_size_of_is_0!(style::stylesheets::Stylesheet);
+malloc_size_of_is_0!(style::values::specified::source_size_list::SourceSizeList);
+malloc_size_of_is_0!(taffy::Layout);
+malloc_size_of_is_0!(unicode_bidi::Level);
+malloc_size_of_is_0!(unicode_script::Script);
+malloc_size_of_is_0!(urlpattern::UrlPattern);
 
 macro_rules! malloc_size_of_is_webrender_malloc_size_of(
     ($($ty:ty),+) => (
@@ -740,6 +812,7 @@ malloc_size_of_is_webrender_malloc_size_of!(webrender_api::BorderStyle);
 malloc_size_of_is_webrender_malloc_size_of!(webrender_api::BoxShadowClipMode);
 malloc_size_of_is_webrender_malloc_size_of!(webrender_api::ColorF);
 malloc_size_of_is_webrender_malloc_size_of!(webrender_api::ExtendMode);
+malloc_size_of_is_webrender_malloc_size_of!(webrender_api::FontKey);
 malloc_size_of_is_webrender_malloc_size_of!(webrender_api::FontInstanceKey);
 malloc_size_of_is_webrender_malloc_size_of!(webrender_api::GlyphInstance);
 malloc_size_of_is_webrender_malloc_size_of!(webrender_api::GradientStop);
@@ -784,6 +857,20 @@ where
     }
 }
 
+impl<T> MallocSizeOf for style::shared_lock::Locked<T> {
+    fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
+        // TODO: fix this implementation when Locked derives MallocSizeOf.
+        0
+        //<style::shared_lock::Locked<T> as stylo_malloc_size_of::MallocSizeOf>::size_of(self, ops)
+    }
+}
+
+impl<T: MallocSizeOf> MallocSizeOf for atomic_refcell::AtomicRefCell<T> {
+    fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
+        self.borrow().size_of(ops)
+    }
+}
+
 malloc_size_of_is_stylo_malloc_size_of!(style::animation::DocumentAnimationSet);
 malloc_size_of_is_stylo_malloc_size_of!(style::attr::AttrIdentifier);
 malloc_size_of_is_stylo_malloc_size_of!(style::attr::AttrValue);
@@ -791,7 +878,15 @@ malloc_size_of_is_stylo_malloc_size_of!(style::color::AbsoluteColor);
 malloc_size_of_is_stylo_malloc_size_of!(style::computed_values::font_variant_caps::T);
 malloc_size_of_is_stylo_malloc_size_of!(style::dom::OpaqueNode);
 malloc_size_of_is_stylo_malloc_size_of!(style::invalidation::element::restyle_hints::RestyleHint);
+malloc_size_of_is_stylo_malloc_size_of!(style::logical_geometry::WritingMode);
 malloc_size_of_is_stylo_malloc_size_of!(style::media_queries::MediaList);
+malloc_size_of_is_stylo_malloc_size_of!(
+    style::properties::longhands::align_items::computed_value::T
+);
+malloc_size_of_is_stylo_malloc_size_of!(
+    style::properties::longhands::flex_direction::computed_value::T
+);
+malloc_size_of_is_stylo_malloc_size_of!(style::properties::longhands::flex_wrap::computed_value::T);
 malloc_size_of_is_stylo_malloc_size_of!(style::properties::style_structs::Font);
 malloc_size_of_is_stylo_malloc_size_of!(style::selector_parser::PseudoElement);
 malloc_size_of_is_stylo_malloc_size_of!(style::selector_parser::RestyleDamage);
@@ -799,8 +894,22 @@ malloc_size_of_is_stylo_malloc_size_of!(style::selector_parser::Snapshot);
 malloc_size_of_is_stylo_malloc_size_of!(style::shared_lock::SharedRwLock);
 malloc_size_of_is_stylo_malloc_size_of!(style::stylesheets::DocumentStyleSheet);
 malloc_size_of_is_stylo_malloc_size_of!(style::stylist::Stylist);
+malloc_size_of_is_stylo_malloc_size_of!(style::values::computed::AlignContent);
+malloc_size_of_is_stylo_malloc_size_of!(style::values::computed::BorderStyle);
 malloc_size_of_is_stylo_malloc_size_of!(style::values::computed::FontStretch);
 malloc_size_of_is_stylo_malloc_size_of!(style::values::computed::FontStyle);
 malloc_size_of_is_stylo_malloc_size_of!(style::values::computed::FontWeight);
 malloc_size_of_is_stylo_malloc_size_of!(style::values::computed::font::SingleFontFamily);
+malloc_size_of_is_stylo_malloc_size_of!(style::values::computed::JustifyContent);
+malloc_size_of_is_stylo_malloc_size_of!(style::values::specified::align::AlignFlags);
+malloc_size_of_is_stylo_malloc_size_of!(style::values::specified::TextDecorationLine);
 malloc_size_of_is_stylo_malloc_size_of!(stylo_dom::ElementState);
+
+impl<T> MallocSizeOf for GenericLengthPercentageOrAuto<T>
+where
+    T: stylo_malloc_size_of::MallocSizeOf,
+{
+    fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
+        <GenericLengthPercentageOrAuto<T> as stylo_malloc_size_of::MallocSizeOf>::size_of(self, ops)
+    }
+}
diff --git a/components/media/Cargo.toml b/components/media/Cargo.toml
index 7fabf427d90..cf51080ec7a 100644
--- a/components/media/Cargo.toml
+++ b/components/media/Cargo.toml
@@ -12,12 +12,12 @@ name = "media"
 path = "lib.rs"
 
 [dependencies]
-servo_config = { path = "../config" }
+compositing_traits = { workspace = true }
 euclid = { workspace = true }
 fnv = { workspace = true }
 ipc-channel = { workspace = true }
 log = { workspace = true }
 serde = { workspace = true }
 servo-media = { workspace = true }
+servo_config = { path = "../config" }
 webrender_api = { workspace = true }
-webrender_traits = { workspace = true }
diff --git a/components/media/lib.rs b/components/media/lib.rs
index 69b60b62275..2d45d38b8ca 100644
--- a/components/media/lib.rs
+++ b/components/media/lib.rs
@@ -9,16 +9,16 @@ mod media_thread;
 
 use std::sync::{Arc, Mutex};
 
+use compositing_traits::{
+    WebrenderExternalImageApi, WebrenderExternalImageHandlers, WebrenderExternalImageRegistry,
+    WebrenderImageHandlerType, WebrenderImageSource,
+};
 use euclid::default::Size2D;
 use ipc_channel::ipc::{IpcReceiver, IpcSender, channel};
 use log::warn;
 use serde::{Deserialize, Serialize};
 use servo_config::pref;
 pub use servo_media::player::context::{GlApi, GlContext, NativeDisplay, PlayerGLContext};
-use webrender_traits::{
-    WebrenderExternalImageApi, WebrenderExternalImageHandlers, WebrenderExternalImageRegistry,
-    WebrenderImageHandlerType, WebrenderImageSource,
-};
 
 use crate::media_thread::GLPlayerThread;
 
diff --git a/components/media/media_thread.rs b/components/media/media_thread.rs
index 7972ac9e70c..44551fd488d 100644
--- a/components/media/media_thread.rs
+++ b/components/media/media_thread.rs
@@ -5,11 +5,11 @@
 use std::sync::{Arc, Mutex};
 use std::thread;
 
+use compositing_traits::{WebrenderExternalImageRegistry, WebrenderImageHandlerType};
 use fnv::FnvHashMap;
 use ipc_channel::ipc::{IpcSender, channel};
 use log::{trace, warn};
 use webrender_api::ExternalImageId;
-use webrender_traits::{WebrenderExternalImageRegistry, WebrenderImageHandlerType};
 
 /// GL player threading API entry point that lives in the
 /// constellation.
diff --git a/components/metrics/Cargo.toml b/components/metrics/Cargo.toml
index a62ff8c98dc..3888b41bb29 100644
--- a/components/metrics/Cargo.toml
+++ b/components/metrics/Cargo.toml
@@ -13,6 +13,7 @@ path = "lib.rs"
 
 [dependencies]
 base = { workspace = true }
+constellation_traits = { workspace = true }
 ipc-channel = { workspace = true }
 log = { workspace = true }
 malloc_size_of = { workspace = true }
diff --git a/components/metrics/lib.rs b/components/metrics/lib.rs
index 4f42c2f7bbe..ea1b182b457 100644
--- a/components/metrics/lib.rs
+++ b/components/metrics/lib.rs
@@ -18,7 +18,7 @@ use servo_url::ServoUrl;
 
 /// TODO make this configurable
 /// maximum task time is 50ms (in ns)
-pub const MAX_TASK_NS: u64 = 50000000;
+pub const MAX_TASK_NS: u128 = 50000000;
 /// 10 second window
 const INTERACTIVE_WINDOW_SECONDS: Duration = Duration::from_secs(10);
 
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index 35ec06632e5..9af310f32bc 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -21,6 +21,8 @@ async-tungstenite = { workspace = true }
 base = { workspace = true }
 base64 = { workspace = true }
 bytes = "1"
+chrono = { workspace = true }
+compositing_traits = { workspace = true }
 content-security-policy = { workspace = true }
 cookie = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -36,10 +38,11 @@ http = { workspace = true }
 http-body-util = { workspace = true }
 hyper = { workspace = true, features = ["client", "http1", "http2"] }
 hyper-rustls = { workspace = true }
-hyper_serde = { workspace = true }
 hyper-util = { workspace = true }
+hyper_serde = { workspace = true }
 imsz = { workspace = true }
 ipc-channel = { workspace = true }
+itertools = { workspace = true }
 log = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
@@ -59,26 +62,25 @@ servo_arc = { workspace = true }
 servo_config = { path = "../config" }
 servo_url = { path = "../url" }
 sha2 = "0.10"
-chrono = { workspace = true }
 time = { workspace = true }
 tokio = { workspace = true, features = ["sync", "macros", "rt-multi-thread"] }
-tokio-util = { version = "0.7.12", default-features = false, features = ["codec", "io"] }
 tokio-rustls = { workspace = true }
 tokio-stream = "0.1"
+tokio-util = { version = "0.7.12", default-features = false, features = ["codec", "io"] }
 tower-service = { workspace = true }
 tungstenite = { workspace = true }
 url = { workspace = true }
 uuid = { workspace = true }
-webrender_api = { workspace = true }
-webrender_traits = { workspace = true }
 webpki-roots = { workspace = true }
+webrender_api = { workspace = true }
 
 [dev-dependencies]
+embedder_traits = { workspace = true, features = ["baked-default-resources"] }
 flate2 = "1"
 futures = { version = "0.3", features = ["compat"] }
 hyper = { workspace = true, features = ["full"] }
 hyper-util = { workspace = true, features = ["server-graceful"] }
-rustls = { workspace = true }
+rustls = { workspace = true, features = ["aws-lc-rs"] }
 
 [[test]]
 name = "main"
diff --git a/components/net/async_runtime.rs b/components/net/async_runtime.rs
index c99068b1076..909bdef8fb0 100644
--- a/components/net/async_runtime.rs
+++ b/components/net/async_runtime.rs
@@ -2,31 +2,27 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 use std::cmp::Ord;
+use std::sync::LazyLock;
 use std::sync::atomic::{AtomicUsize, Ordering};
-use std::sync::{LazyLock, Mutex};
 use std::thread;
 
 use tokio::runtime::{Builder, Runtime};
 
-pub static HANDLE: LazyLock<Mutex<Option<Runtime>>> = LazyLock::new(|| {
-    Mutex::new(Some(
-        Builder::new_multi_thread()
-            .thread_name_fn(|| {
-                static ATOMIC_ID: AtomicUsize = AtomicUsize::new(0);
-                let id = ATOMIC_ID.fetch_add(1, Ordering::Relaxed);
-                format!("tokio-runtime-{}", id)
-            })
-            .worker_threads(
-                thread::available_parallelism()
-                    .map(|i| i.get())
-                    .unwrap_or(servo_config::pref!(threadpools_fallback_worker_num) as usize)
-                    .min(
-                        servo_config::pref!(threadpools_async_runtime_workers_max).max(1) as usize,
-                    ),
-            )
-            .enable_io()
-            .enable_time()
-            .build()
-            .unwrap(),
-    ))
+pub static HANDLE: LazyLock<Runtime> = LazyLock::new(|| {
+    Builder::new_multi_thread()
+        .thread_name_fn(|| {
+            static ATOMIC_ID: AtomicUsize = AtomicUsize::new(0);
+            let id = ATOMIC_ID.fetch_add(1, Ordering::Relaxed);
+            format!("tokio-runtime-{}", id)
+        })
+        .worker_threads(
+            thread::available_parallelism()
+                .map(|i| i.get())
+                .unwrap_or(servo_config::pref!(threadpools_fallback_worker_num) as usize)
+                .min(servo_config::pref!(threadpools_async_runtime_workers_max).max(1) as usize),
+        )
+        .enable_io()
+        .enable_time()
+        .build()
+        .expect("Unable to build tokio-runtime runtime")
 });
diff --git a/components/net/connector.rs b/components/net/connector.rs
index 12d0638d84d..e02ff8971e3 100644
--- a/components/net/connector.rs
+++ b/components/net/connector.rs
@@ -165,7 +165,7 @@ where
     F: Future<Output = ()> + 'static + std::marker::Send,
 {
     fn execute(&self, fut: F) {
-        HANDLE.lock().unwrap().as_ref().unwrap().spawn(fut);
+        HANDLE.spawn(fut);
     }
 }
 
diff --git a/components/net/cookie_storage.rs b/components/net/cookie_storage.rs
index 6a9c88b0756..f158fd035e7 100644
--- a/components/net/cookie_storage.rs
+++ b/components/net/cookie_storage.rs
@@ -94,6 +94,7 @@ impl CookieStorage {
             Ok(None)
         }
     }
+
     pub fn clear_storage(&mut self, url: &ServoUrl) {
         let domain = reg_host(url.host_str().unwrap_or(""));
         let cookies = self.cookies_map.entry(domain).or_default();
@@ -102,6 +103,16 @@ impl CookieStorage {
         }
     }
 
+    pub fn delete_cookie_with_name(&mut self, url: &ServoUrl, name: String) {
+        let domain = reg_host(url.host_str().unwrap_or(""));
+        let cookies = self.cookies_map.entry(domain).or_default();
+        for cookie in cookies.iter_mut() {
+            if cookie.cookie.name() == name {
+                cookie.set_expiry_time_in_past();
+            }
+        }
+    }
+
     // http://tools.ietf.org/html/rfc6265#section-5.3
     pub fn push(&mut self, mut cookie: ServoCookie, url: &ServoUrl, source: CookieSource) {
         // https://www.ietf.org/id/draft-ietf-httpbis-cookie-alone-01.txt Step 1
diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs
index 76f640ebb82..65c173fce3b 100644
--- a/components/net/fetch/methods.rs
+++ b/components/net/fetch/methods.rs
@@ -2,7 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use std::borrow::Cow;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};
 use std::{io, mem, str};
@@ -14,7 +13,7 @@ use crossbeam_channel::Sender;
 use devtools_traits::DevtoolsControlMsg;
 use embedder_traits::resources::{self, Resource};
 use headers::{AccessControlExposeHeaders, ContentType, HeaderMapExt};
-use http::header::{self, HeaderMap, HeaderName};
+use http::header::{self, HeaderMap, HeaderName, RANGE};
 use http::{HeaderValue, Method, StatusCode};
 use ipc_channel::ipc;
 use log::{debug, trace, warn};
@@ -24,8 +23,8 @@ use net_traits::http_status::HttpStatus;
 use net_traits::policy_container::{PolicyContainer, RequestPolicyContainer};
 use net_traits::request::{
     BodyChunkRequest, BodyChunkResponse, CredentialsMode, Destination, Initiator,
-    InsecureRequestsPolicy, Origin, RedirectMode, Referrer, Request, RequestMode, ResponseTainting,
-    Window, is_cors_safelisted_method, is_cors_safelisted_request_header,
+    InsecureRequestsPolicy, Origin, ParserMetadata, RedirectMode, Referrer, Request, RequestMode,
+    ResponseTainting, Window, is_cors_safelisted_method, is_cors_safelisted_request_header,
 };
 use net_traits::response::{Response, ResponseBody, ResponseType};
 use net_traits::{
@@ -35,7 +34,7 @@ use net_traits::{
 use rustls_pki_types::CertificateDer;
 use serde::{Deserialize, Serialize};
 use servo_arc::Arc as ServoArc;
-use servo_url::{Host, ServoUrl};
+use servo_url::{Host, ImmutableOrigin, ServoUrl};
 use tokio::sync::mpsc::{UnboundedReceiver as TokioReceiver, UnboundedSender as TokioSender};
 
 use super::fetch_params::FetchParams;
@@ -43,10 +42,13 @@ use crate::fetch::cors_cache::CorsCache;
 use crate::fetch::headers::determine_nosniff;
 use crate::filemanager_thread::FileManager;
 use crate::http_loader::{HttpState, determine_requests_referrer, http_fetch, set_default_accept};
-use crate::protocols::ProtocolRegistry;
+use crate::protocols::{ProtocolRegistry, is_url_potentially_trustworthy};
 use crate::request_interceptor::RequestInterceptor;
 use crate::subresource_integrity::is_response_integrity_valid;
 
+const PARTIAL_RESPONSE_TO_NON_RANGE_REQUEST_ERROR: &str = "Refusing to provide partial response\
+from earlier ranged request to API that did not make a range request";
+
 pub type Target<'a> = &'a mut (dyn FetchTaskTarget + Send);
 
 #[derive(Clone, Deserialize, Serialize)]
@@ -58,7 +60,7 @@ pub enum Data {
 
 pub struct FetchContext {
     pub state: Arc<HttpState>,
-    pub user_agent: Cow<'static, str>,
+    pub user_agent: String,
     pub devtools_chan: Option<Arc<Mutex<Sender<DevtoolsControlMsg>>>>,
     pub filemanager: Arc<Mutex<FileManager>>,
     pub file_token: FileTokenCheck,
@@ -167,33 +169,63 @@ pub async fn fetch_with_cors_cache(
     // TODO: We don't implement fetchParams as defined in the spec
 }
 
-/// <https://www.w3.org/TR/CSP/#should-block-request>
-pub fn should_request_be_blocked_by_csp(
-    request: &Request,
-    policy_container: &PolicyContainer,
-) -> csp::CheckResult {
-    let origin = match &request.origin {
-        Origin::Client => return csp::CheckResult::Allowed,
-        Origin::Origin(origin) => origin,
-    };
-
-    let csp_request = csp::Request {
+fn convert_request_to_csp_request(request: &Request, origin: &ImmutableOrigin) -> csp::Request {
+    csp::Request {
         url: request.url().into_url(),
         origin: origin.clone().into_url_origin(),
         redirect_count: request.redirect_count,
         destination: request.destination,
-        initiator: csp::Initiator::None,
+        initiator: match request.initiator {
+            Initiator::Download => csp::Initiator::Download,
+            Initiator::ImageSet => csp::Initiator::ImageSet,
+            Initiator::Manifest => csp::Initiator::Manifest,
+            Initiator::Prefetch => csp::Initiator::Prefetch,
+            _ => csp::Initiator::None,
+        },
         nonce: request.cryptographic_nonce_metadata.clone(),
         integrity_metadata: request.integrity_metadata.clone(),
-        parser_metadata: csp::ParserMetadata::None,
-    };
+        parser_metadata: match request.parser_metadata {
+            ParserMetadata::ParserInserted => csp::ParserMetadata::ParserInserted,
+            ParserMetadata::NotParserInserted => csp::ParserMetadata::NotParserInserted,
+            ParserMetadata::Default => csp::ParserMetadata::None,
+        },
+    }
+}
+
+/// <https://www.w3.org/TR/CSP/#should-block-request>
+pub fn should_request_be_blocked_by_csp(
+    request: &Request,
+    policy_container: &PolicyContainer,
+) -> (csp::CheckResult, Vec<csp::Violation>) {
+    let origin = match &request.origin {
+        Origin::Client => return (csp::CheckResult::Allowed, Vec::new()),
+        Origin::Origin(origin) => origin,
+    };
+    let csp_request = convert_request_to_csp_request(request, origin);
 
-    // TODO: Instead of ignoring violations, report them.
     policy_container
         .csp_list
         .as_ref()
-        .map(|c| c.should_request_be_blocked(&csp_request).0)
-        .unwrap_or(csp::CheckResult::Allowed)
+        .map(|c| c.should_request_be_blocked(&csp_request))
+        .unwrap_or((csp::CheckResult::Allowed, Vec::new()))
+}
+
+/// <https://www.w3.org/TR/CSP/#report-for-request>
+pub fn report_violations_for_request_by_csp(
+    request: &Request,
+    policy_container: &PolicyContainer,
+) -> Vec<csp::Violation> {
+    let origin = match &request.origin {
+        Origin::Client => return Vec::new(),
+        Origin::Origin(origin) => origin,
+    };
+    let csp_request = convert_request_to_csp_request(request, origin);
+
+    policy_container
+        .csp_list
+        .as_ref()
+        .map(|c| c.report_violations_for_request(&csp_request))
+        .unwrap_or_default()
 }
 
 /// [Main fetch](https://fetch.spec.whatwg.org/#concept-main-fetch)
@@ -231,9 +263,6 @@ pub async fn main_fetch(
         )));
     }
 
-    // Step 2.2.
-    // TODO: Report violations.
-
     // The request should have a valid policy_container associated with it.
     // TODO: This should not be `Client` here
     let policy_container = match &request.policy_container {
@@ -241,12 +270,19 @@ pub async fn main_fetch(
         RequestPolicyContainer::PolicyContainer(container) => container.to_owned(),
     };
 
+    // Step 2.2.
+    let violations = report_violations_for_request_by_csp(request, &policy_container);
+
+    if !violations.is_empty() {
+        target.process_csp_violations(request, violations);
+    }
+
     // Step 3.
     // TODO: handle request abort.
 
     // Step 4. Upgrade request to a potentially trustworthy URL, if appropriate.
     if should_upgrade_request_to_potentially_trustworty(request, context) ||
-        should_upgrade_mixed_content_request(request)
+        should_upgrade_mixed_content_request(request, &context.protocols)
     {
         trace!(
             "upgrading {} targeting {:?}",
@@ -276,8 +312,13 @@ pub async fn main_fetch(
     // Step 7. If should request be blocked due to a bad port, should fetching request be blocked
     // as mixed content, or should request be blocked by Content Security Policy returns blocked,
     // then set response to a network error.
-    // TODO: check "should fetching request be blocked as mixed content"
-    if should_request_be_blocked_by_csp(request, &policy_container) == csp::CheckResult::Blocked {
+    let (check_result, violations) = should_request_be_blocked_by_csp(request, &policy_container);
+
+    if !violations.is_empty() {
+        target.process_csp_violations(request, violations);
+    }
+
+    if check_result == csp::CheckResult::Blocked {
         warn!("Request blocked by CSP");
         response = Some(Response::network_error(NetworkError::Internal(
             "Blocked by Content-Security-Policy".into(),
@@ -288,6 +329,11 @@ pub async fn main_fetch(
             "Request attempted on bad port".into(),
         )));
     }
+    if should_request_be_blocked_as_mixed_content(request, &context.protocols) {
+        response = Some(Response::network_error(NetworkError::Internal(
+            "Blocked as mixed content".into(),
+        )));
+    }
 
     // Step 8: If request’s referrer policy is the empty string, then set request’s referrer policy
     // to request’s policy container’s referrer policy.
@@ -348,13 +394,16 @@ pub async fn main_fetch(
             if (same_origin && request.response_tainting == ResponseTainting::Basic) ||
                 // request's current URL's scheme is "data"
                 current_scheme == "data" ||
+                // Note: Although it is not part of the specification, we make an exception here
+                // for custom protocols that are explicitly marked as active for fetch.
+                context.protocols.is_fetchable(current_scheme) ||
                 // request's mode is "navigate" or "websocket"
                 matches!(
                     request.mode,
                     RequestMode::Navigate | RequestMode::WebSocket { .. }
                 )
             {
-                // Substep 1. Set request’s response tainting to "basic".
+                // Substep 1. Set request's response tainting to "basic".
                 request.response_tainting = ResponseTainting::Basic;
 
                 // Substep 2. Return the result of running scheme fetch given fetchParams.
@@ -362,13 +411,13 @@ pub async fn main_fetch(
             } else if request.mode == RequestMode::SameOrigin {
                 Response::network_error(NetworkError::Internal("Cross-origin response".into()))
             } else if request.mode == RequestMode::NoCors {
-                // Substep 1. If request’s redirect mode is not "follow", then return a network error.
+                // Substep 1. If request's redirect mode is not "follow", then return a network error.
                 if request.redirect_mode != RedirectMode::Follow {
                     Response::network_error(NetworkError::Internal(
                         "NoCors requests must follow redirects".into(),
                     ))
                 } else {
-                    // Substep 2. Set request’s response tainting to "opaque".
+                    // Substep 2. Set request's response tainting to "opaque".
                     request.response_tainting = ResponseTainting::Opaque;
 
                     // Substep 3. Return the result of running scheme fetch given fetchParams.
@@ -478,27 +527,36 @@ pub async fn main_fetch(
             should_be_blocked_due_to_nosniff(request.destination, &response.headers);
         let should_replace_with_mime_type_error = !response_is_network_error &&
             should_be_blocked_due_to_mime_type(request.destination, &response.headers);
+        let should_replace_with_mixed_content = !response_is_network_error &&
+            should_response_be_blocked_as_mixed_content(request, &response, &context.protocols);
 
         // Step 15.
         let mut network_error_response = response
             .get_network_error()
             .cloned()
             .map(Response::network_error);
+
+        // Step 15. Let internalResponse be response, if response is a network error;
+        // otherwise response’s internal response.
+        let response_type = response.response_type.clone(); // Needed later after the mutable borrow
         let internal_response = if let Some(error_response) = network_error_response.as_mut() {
             error_response
         } else {
             response.actual_response_mut()
         };
 
-        // Step 16.
+        // Step 16. If internalResponse’s URL list is empty, then set it to a clone of request’s URL list.
         if internal_response.url_list.is_empty() {
             internal_response.url_list.clone_from(&request.url_list)
         }
 
-        // Step 17.
-        // TODO: handle blocking as mixed content.
-        // TODO: handle blocking by content security policy.
-        let blocked_error_response;
+        // Step 19. If response is not a network error and any of the following returns blocked
+        // * should internalResponse to request be blocked as mixed content
+        // TODO: * should internalResponse to request be blocked by Content Security Policy
+        // * should internalResponse to request be blocked due to its MIME type
+        // * should internalResponse to request be blocked due to nosniff
+        let mut blocked_error_response;
+
         let internal_response = if should_replace_with_nosniff_error {
             // Defer rebinding result
             blocked_error_response =
@@ -509,13 +567,38 @@ pub async fn main_fetch(
             blocked_error_response =
                 Response::network_error(NetworkError::Internal("Blocked by mime type".into()));
             &blocked_error_response
+        } else if should_replace_with_mixed_content {
+            blocked_error_response =
+                Response::network_error(NetworkError::Internal("Blocked as mixed content".into()));
+            &blocked_error_response
         } else {
             internal_response
         };
 
-        // Step 18.
-        // We check `internal_response` since we did not mutate `response`
-        // in the previous step.
+        // Step 20. If response’s type is "opaque", internalResponse’s status is 206, internalResponse’s
+        // range-requested flag is set, and request’s header list does not contain `Range`, then set
+        // response and internalResponse to a network error.
+        // Also checking if internal response is a network error to prevent crash from attemtping to
+        // read status of a network error if we blocked the request above.
+        let internal_response = if !internal_response.is_network_error() &&
+            response_type == ResponseType::Opaque &&
+            internal_response.status.code() == StatusCode::PARTIAL_CONTENT &&
+            internal_response.range_requested &&
+            !request.headers.contains_key(RANGE)
+        {
+            // Defer rebinding result
+            blocked_error_response = Response::network_error(NetworkError::Internal(
+                PARTIAL_RESPONSE_TO_NON_RANGE_REQUEST_ERROR.into(),
+            ));
+            &blocked_error_response
+        } else {
+            internal_response
+        };
+
+        // Step 21. If response is not a network error and either request’s method is `HEAD` or `CONNECT`,
+        // or internalResponse’s status is a null body status, set internalResponse’s body to null and
+        // disregard any enqueuing toward it (if any).
+        // NOTE: We check `internal_response` since we did not mutate `response` in the previous steps.
         let not_network_error = !response_is_network_error && !internal_response.is_network_error();
         if not_network_error &&
             (is_null_body_status(&internal_response.status) ||
@@ -654,7 +737,7 @@ impl RangeRequestBounds {
             RangeRequestBounds::Final(pos) => {
                 if let Some(len) = len {
                     if pos.start <= len as i64 {
-                        return Ok(pos.clone());
+                        return Ok(*pos);
                     }
                 }
                 Err("Tried to process RangeRequestBounds::Final without len")
@@ -887,6 +970,73 @@ pub fn should_request_be_blocked_due_to_a_bad_port(url: &ServoUrl) -> bool {
     false
 }
 
+/// <https://w3c.github.io/webappsec-mixed-content/#should-block-fetch>
+pub fn should_request_be_blocked_as_mixed_content(
+    request: &Request,
+    protocol_registry: &ProtocolRegistry,
+) -> bool {
+    // Step 1. Return allowed if one or more of the following conditions are met:
+    // 1.1. Does settings prohibit mixed security contexts?
+    // returns "Does Not Restrict Mixed Security Contexts" when applied to request’s client.
+    if do_settings_prohibit_mixed_security_contexts(request) ==
+        MixedSecurityProhibited::NotProhibited
+    {
+        return false;
+    }
+
+    // 1.2. request’s URL is a potentially trustworthy URL.
+    if is_url_potentially_trustworthy(protocol_registry, &request.url()) {
+        return false;
+    }
+
+    // 1.3. The user agent has been instructed to allow mixed content.
+
+    // 1.4. request’s destination is "document", and request’s target browsing context has
+    // no parent browsing context.
+    if request.destination == Destination::Document {
+        // TODO: request's target browsing context has no parent browsing context
+        return false;
+    }
+
+    true
+}
+
+/// <https://w3c.github.io/webappsec-mixed-content/#should-block-response>
+pub fn should_response_be_blocked_as_mixed_content(
+    request: &Request,
+    response: &Response,
+    protocol_registry: &ProtocolRegistry,
+) -> bool {
+    // Step 1. Return allowed if one or more of the following conditions are met:
+    // 1.1. Does settings prohibit mixed security contexts? returns Does Not Restrict Mixed Content
+    // when applied to request’s client.
+    if do_settings_prohibit_mixed_security_contexts(request) ==
+        MixedSecurityProhibited::NotProhibited
+    {
+        return false;
+    }
+
+    // 1.2. response’s url is a potentially trustworthy URL.
+    if response
+        .actual_response()
+        .url()
+        .is_some_and(|response_url| is_url_potentially_trustworthy(protocol_registry, response_url))
+    {
+        return false;
+    }
+
+    // 1.3. TODO: The user agent has been instructed to allow mixed content.
+
+    // 1.4. request’s destination is "document", and request’s target browsing context
+    // has no parent browsing context.
+    if request.destination == Destination::Document {
+        // TODO: if requests target browsing context has no parent browsing context
+        return false;
+    }
+
+    true
+}
+
 /// <https://fetch.spec.whatwg.org/#bad-port>
 fn is_bad_port(port: u16) -> bool {
     static BAD_PORTS: [u16; 78] = [
@@ -936,7 +1086,7 @@ fn should_upgrade_request_to_potentially_trustworty(
         // request’s header list if any of the following criteria are met:
         // * request’s URL is not a potentially trustworthy URL
         // * request’s URL's host is not a preloadable HSTS host
-        if !request.current_url().is_potentially_trustworthy() ||
+        if !is_url_potentially_trustworthy(&context.protocols, &request.current_url()) ||
             !request.current_url().host_str().is_some_and(|host| {
                 !context.state.hsts_list.read().unwrap().is_host_secure(host)
             })
@@ -956,21 +1106,46 @@ fn should_upgrade_request_to_potentially_trustworty(
     request.insecure_requests_policy == InsecureRequestsPolicy::Upgrade
 }
 
-// TODO : Needs to revisit
+#[derive(Debug, PartialEq)]
+pub enum MixedSecurityProhibited {
+    Prohibited,
+    NotProhibited,
+}
+
 /// <https://w3c.github.io/webappsec-mixed-content/#categorize-settings-object>
-fn does_settings_prohibit_mixed_security_contexts(url: &ServoUrl) -> bool {
-    if url.is_origin_trustworthy() {
-        return true;
+fn do_settings_prohibit_mixed_security_contexts(request: &Request) -> MixedSecurityProhibited {
+    if let Origin::Origin(ref origin) = request.origin {
+        // Workers created from a data: url are secure if they were created from secure contexts
+        let is_origin_data_url_worker = matches!(
+            *origin,
+            ImmutableOrigin::Opaque(servo_url::OpaqueOrigin::SecureWorkerFromDataUrl(_))
+        );
+
+        // Step 1. If settings’ origin is a potentially trustworthy origin,
+        // then return "Prohibits Mixed Security Contexts".
+        if origin.is_potentially_trustworthy() || is_origin_data_url_worker {
+            return MixedSecurityProhibited::Prohibited;
+        }
     }
 
-    false
+    // Step 2.2. For each navigable navigable in document’s ancestor navigables:
+    // Step 2.2.1. If navigable’s active document's origin is a potentially trustworthy origin,
+    // then return "Prohibits Mixed Security Contexts".
+    if request.has_trustworthy_ancestor_origin {
+        return MixedSecurityProhibited::Prohibited;
+    }
+
+    MixedSecurityProhibited::NotProhibited
 }
 
 /// <https://w3c.github.io/webappsec-mixed-content/#upgrade-algorithm>
-fn should_upgrade_mixed_content_request(request: &Request) -> bool {
+fn should_upgrade_mixed_content_request(
+    request: &Request,
+    protocol_registry: &ProtocolRegistry,
+) -> bool {
     let url = request.url();
     // Step 1.1 : request’s URL is a potentially trustworthy URL.
-    if url.is_potentially_trustworthy() {
+    if is_url_potentially_trustworthy(protocol_registry, &url) {
         return false;
     }
 
@@ -981,12 +1156,14 @@ fn should_upgrade_mixed_content_request(request: &Request) -> bool {
     }
 
     // Step 1.3
-    if !does_settings_prohibit_mixed_security_contexts(&url) {
+    if do_settings_prohibit_mixed_security_contexts(request) ==
+        MixedSecurityProhibited::NotProhibited
+    {
         return false;
     }
 
     // Step 1.4 : request’s destination is not "image", "audio", or "video".
-    if matches!(
+    if !matches!(
         request.destination,
         Destination::Audio | Destination::Image | Destination::Video
     ) {
diff --git a/components/net/hsts.rs b/components/net/hsts.rs
index 04282be2340..d74794ce60a 100644
--- a/components/net/hsts.rs
+++ b/components/net/hsts.rs
@@ -11,13 +11,14 @@ use embedder_traits::resources::{self, Resource};
 use headers::{HeaderMapExt, StrictTransportSecurity};
 use http::HeaderMap;
 use log::{error, info};
+use malloc_size_of_derive::MallocSizeOf;
 use net_traits::IncludeSubdomains;
 use net_traits::pub_domains::reg_suffix;
 use serde::{Deserialize, Serialize};
 use servo_config::pref;
 use servo_url::{Host, ServoUrl};
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
 pub struct HstsEntry {
     pub host: String,
     pub include_subdomains: bool,
@@ -60,7 +61,7 @@ impl HstsEntry {
     }
 }
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, MallocSizeOf, Serialize)]
 pub struct HstsList {
     pub entries_map: HashMap<String, Vec<HstsEntry>>,
 }
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index d92bec2bb5c..704901f6940 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -20,13 +20,13 @@ use futures::{TryFutureExt, TryStreamExt, future};
 use headers::authorization::Basic;
 use headers::{
     AccessControlAllowCredentials, AccessControlAllowHeaders, AccessControlAllowMethods,
-    AccessControlAllowOrigin, AccessControlMaxAge, AccessControlRequestHeaders,
-    AccessControlRequestMethod, Authorization, CacheControl, ContentLength, HeaderMapExt,
-    IfModifiedSince, LastModified, Pragma, Referer, UserAgent,
+    AccessControlAllowOrigin, AccessControlMaxAge, AccessControlRequestMethod, Authorization,
+    CacheControl, ContentLength, HeaderMapExt, IfModifiedSince, LastModified, Pragma, Referer,
+    UserAgent,
 };
 use http::header::{
-    self, ACCEPT, AUTHORIZATION, CONTENT_ENCODING, CONTENT_LANGUAGE, CONTENT_LOCATION,
-    CONTENT_TYPE, HeaderValue,
+    self, ACCEPT, ACCESS_CONTROL_REQUEST_HEADERS, AUTHORIZATION, CONTENT_ENCODING,
+    CONTENT_LANGUAGE, CONTENT_LOCATION, CONTENT_TYPE, HeaderValue, RANGE,
 };
 use http::{HeaderMap, Method, Request as HyperRequest, StatusCode};
 use http_body_util::combinators::BoxBody;
@@ -37,9 +37,10 @@ use hyper::ext::ReasonPhrase;
 use hyper::header::{HeaderName, TRANSFER_ENCODING};
 use hyper_serde::Serde;
 use hyper_util::client::legacy::Client;
-use ipc_channel::ipc::{self, IpcSender};
+use ipc_channel::ipc::{self, IpcSender, IpcSharedMemory};
 use ipc_channel::router::ROUTER;
 use log::{debug, error, info, log_enabled, warn};
+use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
 use net_traits::http_status::HttpStatus;
 use net_traits::pub_domains::reg_suffix;
 use net_traits::request::Origin::Origin as SpecificOrigin;
@@ -55,6 +56,8 @@ use net_traits::{
     CookieSource, DOCUMENT_ACCEPT_HEADER_VALUE, FetchMetadata, NetworkError, RedirectEndValue,
     RedirectStartValue, ReferrerPolicy, ResourceAttribute, ResourceFetchTiming, ResourceTimeValue,
 };
+use profile_traits::mem::{Report, ReportKind};
+use profile_traits::path;
 use servo_arc::Arc;
 use servo_url::{ImmutableOrigin, ServoUrl};
 use tokio::sync::mpsc::{
@@ -105,6 +108,21 @@ pub struct HttpState {
 }
 
 impl HttpState {
+    pub(crate) fn memory_reports(&self, suffix: &str, ops: &mut MallocSizeOfOps) -> Vec<Report> {
+        vec![
+            Report {
+                path: path!["memory-cache", suffix],
+                kind: ReportKind::ExplicitJemallocHeapSize,
+                size: self.http_cache.read().unwrap().size_of(ops),
+            },
+            Report {
+                path: path!["hsts-list", suffix],
+                kind: ReportKind::ExplicitJemallocHeapSize,
+                size: self.hsts_list.read().unwrap().size_of(ops),
+            },
+        ]
+    }
+
     fn request_authentication(
         &self,
         request: &Request,
@@ -444,7 +462,7 @@ fn auth_from_cache(
 /// used to fill the body with bytes coming-in over IPC.
 enum BodyChunk {
     /// A chunk of bytes.
-    Chunk(Vec<u8>),
+    Chunk(IpcSharedMemory),
     /// Body is done.
     Done,
 }
@@ -471,12 +489,14 @@ enum BodySink {
 }
 
 impl BodySink {
-    fn transmit_bytes(&self, bytes: Vec<u8>) {
+    fn transmit_bytes(&self, bytes: IpcSharedMemory) {
         match self {
             BodySink::Chunked(sender) => {
                 let sender = sender.clone();
-                HANDLE.lock().unwrap().as_mut().unwrap().spawn(async move {
-                    let _ = sender.send(Ok(Frame::data(bytes.into()))).await;
+                HANDLE.spawn(async move {
+                    let _ = sender
+                        .send(Ok(Frame::data(Bytes::copy_from_slice(&bytes))))
+                        .await;
                 });
             },
             BodySink::Buffered(sender) => {
@@ -559,7 +579,7 @@ async fn obtain_response(
                 body_port,
                 Box::new(move |message| {
                     info!("Received message");
-                    let bytes: Vec<u8> = match message.unwrap() {
+                    let bytes = match message.unwrap() {
                         BodyChunkResponse::Chunk(bytes) => bytes,
                         BodyChunkResponse::Done => {
                             // Step 3, abort these parallel steps.
@@ -604,8 +624,8 @@ async fn obtain_response(
                     let mut body = vec![];
                     loop {
                         match receiver.recv().await {
-                            Some(BodyChunk::Chunk(mut bytes)) => {
-                                body.append(&mut bytes);
+                            Some(BodyChunk::Chunk(bytes)) => {
+                                body.extend_from_slice(&bytes);
                             },
                             Some(BodyChunk::Done) => break,
                             None => warn!("Failed to read all chunks from request body."),
@@ -1010,7 +1030,7 @@ pub async fn http_redirect_fetch(
     // Step 8: Increase request’s redirect count by 1.
     request.redirect_count += 1;
 
-    // Step 7
+    // Step 9
     let same_origin = match request.origin {
         Origin::Origin(ref origin) => *origin == location_url.origin(),
         Origin::Client => panic!(
@@ -1123,7 +1143,7 @@ pub async fn http_redirect_fetch(
     fetch_response
 }
 
-/// [HTTP network or cache fetch](https://fetch.spec.whatwg.org#http-network-or-cache-fetch)
+/// [HTTP network or cache fetch](https://fetch.spec.whatwg.org/#concept-http-network-or-cache-fetch)
 #[async_recursion]
 async fn http_network_or_cache_fetch(
     fetch_params: &mut FetchParams,
@@ -1255,10 +1275,9 @@ async fn http_network_or_cache_fetch(
     // Step 8.15: If httpRequest’s header list does not contain `User-Agent`, then user agents
     // should append (`User-Agent`, default `User-Agent` value) to httpRequest’s header list.
     if !http_request.headers.contains_key(header::USER_AGENT) {
-        let user_agent = context.user_agent.clone().into_owned();
         http_request
             .headers
-            .typed_insert::<UserAgent>(user_agent.parse().unwrap());
+            .typed_insert::<UserAgent>(context.user_agent.parse().unwrap());
     }
 
     // Steps 8.16 to 8.18
@@ -1598,8 +1617,12 @@ async fn http_network_or_cache_fetch(
     }
 
     // TODO(#33616): Step 11. Set response’s URL list to a clone of httpRequest’s URL list.
-    // TODO(#33616): Step 12. If httpRequest’s header list contains `Range`,
-    // then set response’s range-requested flag.
+
+    // Step 12. If httpRequest’s header list contains `Range`, then set response’s range-requested flag.
+    if http_request.headers.contains_key(RANGE) {
+        response.range_requested = true;
+    }
+
     // TODO(#33616): Step 13 Set response’s request-includes-credentials to includeCredentials.
 
     // Step 14. If response’s status is 401, httpRequest’s response tainting is not "cors",
@@ -1995,7 +2018,7 @@ async fn http_network_fetch(
     let url1 = request.url();
     let url2 = url1.clone();
 
-    HANDLE.lock().unwrap().as_ref().unwrap().spawn(
+    HANDLE.spawn(
         res.into_body()
             .map_err(|e| {
                 warn!("Error streaming response body: {:?}", e);
@@ -2136,11 +2159,15 @@ async fn cors_preflight_fetch(
     // Step 4
     let headers = get_cors_unsafe_header_names(&request.headers);
 
-    // Step 5
+    // Step 5 If headers is not empty, then:
     if !headers.is_empty() {
-        preflight
-            .headers
-            .typed_insert(AccessControlRequestHeaders::from_iter(headers));
+        // 5.1 Let value be the items in headers separated from each other by `,`
+        // TODO(36451): replace this with typed_insert when headers fixes headers#207
+        preflight.headers.insert(
+            ACCESS_CONTROL_REQUEST_HEADERS,
+            HeaderValue::from_bytes(itertools::join(headers.iter(), ",").as_bytes())
+                .unwrap_or(HeaderValue::from_static("")),
+        );
     }
 
     // Step 6
diff --git a/components/net/image_cache.rs b/components/net/image_cache.rs
index dea123054ad..46a2a4ea111 100644
--- a/components/net/image_cache.rs
+++ b/components/net/image_cache.rs
@@ -7,9 +7,12 @@ use std::collections::hash_map::Entry::{Occupied, Vacant};
 use std::sync::{Arc, Mutex};
 use std::{mem, thread};
 
+use compositing_traits::{CrossProcessCompositorApi, ImageUpdate, SerializableImageData};
 use imsz::imsz_from_reader;
 use ipc_channel::ipc::IpcSharedMemory;
 use log::{debug, warn};
+use malloc_size_of::{MallocSizeOf as MallocSizeOfTrait, MallocSizeOfOps};
+use malloc_size_of_derive::MallocSizeOf;
 use net_traits::image_cache::{
     ImageCache, ImageCacheResult, ImageOrMetadataAvailable, ImageResponder, ImageResponse,
     PendingImageId, UsePlaceholder,
@@ -17,14 +20,20 @@ use net_traits::image_cache::{
 use net_traits::request::CorsSettings;
 use net_traits::{FetchMetadata, FetchResponseMsg, FilteredMetadata, NetworkError};
 use pixels::{CorsStatus, Image, ImageMetadata, PixelFormat, load_from_memory};
+use profile_traits::mem::{Report, ReportKind};
+use profile_traits::path;
 use servo_config::pref;
 use servo_url::{ImmutableOrigin, ServoUrl};
 use webrender_api::units::DeviceIntSize;
 use webrender_api::{ImageDescriptor, ImageDescriptorFlags, ImageFormat};
-use webrender_traits::{CrossProcessCompositorApi, SerializableImageData};
 
 use crate::resource_thread::CoreResourceThreadPool;
 
+// We bake in rippy.png as a fallback, in case the embedder does not provide
+// a rippy resource. this version is 253 bytes large, don't exchange it against
+// something in higher resolution.
+const FALLBACK_RIPPY: &[u8] = include_bytes!("../../resources/rippy.png");
+
 //
 // TODO(gw): Remaining work on image cache:
 //     * Make use of the prefetch support in various parts of the code.
@@ -45,7 +54,9 @@ fn decode_bytes_sync(key: LoadKey, bytes: &[u8], cors: CorsStatus) -> DecoderMsg
 }
 
 fn get_placeholder_image(compositor_api: &CrossProcessCompositorApi, data: &[u8]) -> Arc<Image> {
-    let mut image = load_from_memory(data, CorsStatus::Unsafe).unwrap();
+    let mut image = load_from_memory(data, CorsStatus::Unsafe)
+        .or_else(|| load_from_memory(FALLBACK_RIPPY, CorsStatus::Unsafe))
+        .expect("load fallback image failed");
     set_webrender_image_key(compositor_api, &mut image);
     Arc::new(image)
 }
@@ -98,6 +109,7 @@ type ImageKey = (ServoUrl, ImmutableOrigin, Option<CorsSettings>);
 
 // Represents all the currently pending loads/decodings. For
 // performance reasons, loads are indexed by a dedicated load key.
+#[derive(MallocSizeOf)]
 struct AllPendingLoads {
     // The loads, indexed by a load key. Used during most operations,
     // for performance reasons.
@@ -180,6 +192,7 @@ enum CacheResult<'a> {
 /// Images that fail to load (due to network or decode
 /// failure) are still stored here, so that they aren't
 /// fetched again.
+#[derive(MallocSizeOf)]
 struct CompletedLoad {
     image_response: ImageResponse,
     id: PendingImageId,
@@ -197,9 +210,10 @@ struct DecoderMsg {
     image: Option<Image>,
 }
 
+#[derive(MallocSizeOf)]
 enum ImageBytes {
     InProgress(Vec<u8>),
-    Complete(Arc<Vec<u8>>),
+    Complete(#[conditional_malloc_size_of] Arc<Vec<u8>>),
 }
 
 impl ImageBytes {
@@ -234,6 +248,7 @@ impl ImageBytes {
 // A key used to communicate during loading.
 type LoadKey = PendingImageId;
 
+#[derive(MallocSizeOf)]
 struct LoadKeyGenerator {
     counter: u64,
 }
@@ -257,6 +272,7 @@ enum LoadResult {
 
 /// Represents an image that is either being loaded
 /// by the resource thread, or decoded by a worker thread.
+#[derive(MallocSizeOf)]
 struct PendingLoad {
     /// The bytes loaded so far. Reset to an empty vector once loading
     /// is complete and the buffer has been transmitted to the decoder.
@@ -315,6 +331,7 @@ impl PendingLoad {
 // ======================================================================
 // Image cache implementation.
 // ======================================================================
+#[derive(MallocSizeOf)]
 struct ImageCacheStore {
     // Images that are loading over network, or decoding.
     pending_loads: AllPendingLoads,
@@ -323,12 +340,14 @@ struct ImageCacheStore {
     completed_loads: HashMap<ImageKey, CompletedLoad>,
 
     // The placeholder image used when an image fails to load
+    #[conditional_malloc_size_of]
     placeholder_image: Arc<Image>,
 
     // The URL used for the placeholder image
     placeholder_url: ServoUrl,
 
     // Cross-process compositor API instance.
+    #[ignore_malloc_size_of = "Channel from another crate"]
     compositor_api: CrossProcessCompositorApi,
 }
 
@@ -412,7 +431,7 @@ pub struct ImageCacheImpl {
     store: Arc<Mutex<ImageCacheStore>>,
 
     /// Thread pool for image decoding
-    thread_pool: CoreResourceThreadPool,
+    thread_pool: Arc<CoreResourceThreadPool>,
 }
 
 impl ImageCache for ImageCacheImpl {
@@ -435,7 +454,19 @@ impl ImageCache for ImageCacheImpl {
                 placeholder_url: ServoUrl::parse("chrome://resources/rippy.png").unwrap(),
                 compositor_api,
             })),
-            thread_pool: CoreResourceThreadPool::new(thread_count, "ImageCache".to_string()),
+            thread_pool: Arc::new(CoreResourceThreadPool::new(
+                thread_count,
+                "ImageCache".to_string(),
+            )),
+        }
+    }
+
+    fn memory_report(&self, prefix: &str, ops: &mut MallocSizeOfOps) -> Report {
+        let size = self.store.lock().unwrap().size_of(ops);
+        Report {
+            path: path![prefix, "image-cache"],
+            kind: ReportKind::ExplicitSystemHeapSize,
+            size,
         }
     }
 
@@ -546,7 +577,8 @@ impl ImageCache for ImageCacheImpl {
     fn notify_pending_response(&self, id: PendingImageId, action: FetchResponseMsg) {
         match (action, id) {
             (FetchResponseMsg::ProcessRequestBody(..), _) |
-            (FetchResponseMsg::ProcessRequestEOF(..), _) => (),
+            (FetchResponseMsg::ProcessRequestEOF(..), _) |
+            (FetchResponseMsg::ProcessCspViolations(..), _) => (),
             (FetchResponseMsg::ProcessResponse(_, response), _) => {
                 debug!("Received {:?} for {:?}", response.as_ref().map(|_| ()), id);
                 let mut store = self.store.lock().unwrap();
@@ -579,16 +611,18 @@ impl ImageCache for ImageCacheImpl {
                 pending_load.bytes.extend_from_slice(&data);
 
                 //jmr0 TODO: possibly move to another task?
-                let mut reader = std::io::Cursor::new(pending_load.bytes.as_slice());
-                if let Ok(info) = imsz_from_reader(&mut reader) {
-                    let img_metadata = ImageMetadata {
-                        width: info.width as u32,
-                        height: info.height as u32,
-                    };
-                    for listener in &pending_load.listeners {
-                        listener.respond(ImageResponse::MetadataLoaded(img_metadata.clone()));
+                if pending_load.metadata.is_none() {
+                    let mut reader = std::io::Cursor::new(pending_load.bytes.as_slice());
+                    if let Ok(info) = imsz_from_reader(&mut reader) {
+                        let img_metadata = ImageMetadata {
+                            width: info.width as u32,
+                            height: info.height as u32,
+                        };
+                        for listener in &pending_load.listeners {
+                            listener.respond(ImageResponse::MetadataLoaded(img_metadata.clone()));
+                        }
+                        pending_load.metadata = Some(img_metadata);
                     }
-                    pending_load.metadata = Some(img_metadata);
                 }
             },
             (FetchResponseMsg::ProcessResponseEOF(_, result), key) => {
@@ -620,6 +654,39 @@ impl ImageCache for ImageCacheImpl {
             },
         }
     }
+
+    fn create_new_image_cache(
+        &self,
+        compositor_api: CrossProcessCompositorApi,
+    ) -> Arc<dyn ImageCache> {
+        let store = self.store.lock().unwrap();
+        let placeholder_image = store.placeholder_image.clone();
+        let placeholder_url = store.placeholder_url.clone();
+        Arc::new(ImageCacheImpl {
+            store: Arc::new(Mutex::new(ImageCacheStore {
+                pending_loads: AllPendingLoads::new(),
+                completed_loads: HashMap::new(),
+                placeholder_image,
+                placeholder_url,
+                compositor_api,
+            })),
+            thread_pool: self.thread_pool.clone(),
+        })
+    }
+}
+
+impl Drop for ImageCacheStore {
+    fn drop(&mut self) {
+        let image_updates = self
+            .completed_loads
+            .values()
+            .filter_map(|load| match &load.image_response {
+                ImageResponse::Loaded(image, _) => image.id.map(ImageUpdate::DeleteImage),
+                _ => None,
+            })
+            .collect();
+        self.compositor_api.update_images(image_updates);
+    }
 }
 
 impl ImageCacheImpl {
diff --git a/components/net/protocols/blob.rs b/components/net/protocols/blob.rs
index 991cc2a6453..53c609c91a7 100644
--- a/components/net/protocols/blob.rs
+++ b/components/net/protocols/blob.rs
@@ -54,6 +54,7 @@ impl ProtocolHandler for BlobProtocolHander {
         response.status = HttpStatus::default();
 
         if is_range_request {
+            response.range_requested = true;
             partial_content(&mut response);
         }
 
diff --git a/components/net/protocols/mod.rs b/components/net/protocols/mod.rs
index f8b989b9623..6dc58ceab64 100644
--- a/components/net/protocols/mod.rs
+++ b/components/net/protocols/mod.rs
@@ -14,6 +14,7 @@ use log::error;
 use net_traits::filemanager_thread::RelativePos;
 use net_traits::request::Request;
 use net_traits::response::Response;
+use servo_url::ServoUrl;
 
 use crate::fetch::methods::{DoneChannel, FetchContext, RangeRequestBounds};
 
@@ -47,6 +48,15 @@ pub trait ProtocolHandler: Send + Sync {
     fn is_fetchable(&self) -> bool {
         false
     }
+
+    /// Specify if this custom protocol can be used in a [secure context]
+    ///
+    /// Note: this only works for bypassing mixed content checks right now
+    ///
+    /// [secure context]: https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts
+    fn is_secure(&self) -> bool {
+        false
+    }
 }
 
 #[derive(Default)]
@@ -54,27 +64,45 @@ pub struct ProtocolRegistry {
     pub(crate) handlers: HashMap<String, Box<dyn ProtocolHandler>>, // Maps scheme -> handler
 }
 
+#[derive(Clone, Copy, Debug)]
+pub enum ProtocolRegisterError {
+    ForbiddenScheme,
+    SchemeAlreadyRegistered,
+}
+
 impl ProtocolRegistry {
     pub fn with_internal_protocols() -> Self {
         let mut registry = Self::default();
-        registry.register("data", DataProtocolHander::default());
-        registry.register("blob", BlobProtocolHander::default());
-        registry.register("file", FileProtocolHander::default());
+        // We just created a new registry, and know that we aren't using
+        // any forbidden schemes, so this should never panic.
+        registry
+            .register("data", DataProtocolHander::default())
+            .expect("Infallible");
+        registry
+            .register("blob", BlobProtocolHander::default())
+            .expect("Infallible");
+        registry
+            .register("file", FileProtocolHander::default())
+            .expect("Infallible");
         registry
     }
 
-    pub fn register(&mut self, scheme: &str, handler: impl ProtocolHandler + 'static) -> bool {
+    pub fn register(
+        &mut self,
+        scheme: &str,
+        handler: impl ProtocolHandler + 'static,
+    ) -> Result<(), ProtocolRegisterError> {
         if FORBIDDEN_SCHEMES.contains(&scheme) {
             error!("Protocol handler for '{scheme}' is not allowed to be registered.");
-            return false;
+            return Err(ProtocolRegisterError::ForbiddenScheme);
         }
 
         if let Entry::Vacant(entry) = self.handlers.entry(scheme.into()) {
             entry.insert(Box::new(handler));
-            true
+            Ok(())
         } else {
             error!("Protocol handler for '{scheme}' is already registered.");
-            false
+            Err(ProtocolRegisterError::SchemeAlreadyRegistered)
         }
     }
 
@@ -96,9 +124,22 @@ impl ProtocolRegistry {
     pub fn is_fetchable(&self, scheme: &str) -> bool {
         self.handlers
             .get(scheme)
-            .map(|handler| handler.is_fetchable())
-            .unwrap_or(false)
+            .is_some_and(|handler| handler.is_fetchable())
     }
+
+    pub fn is_secure(&self, scheme: &str) -> bool {
+        self.handlers
+            .get(scheme)
+            .is_some_and(|handler| handler.is_secure())
+    }
+}
+
+/// Test if the URL is potentially trustworthy or the custom protocol is registered as secure
+pub fn is_url_potentially_trustworthy(
+    protocol_registry: &ProtocolRegistry,
+    url: &ServoUrl,
+) -> bool {
+    url.is_potentially_trustworthy() || protocol_registry.is_secure(url.scheme())
 }
 
 pub fn range_not_satisfiable_error(response: &mut Response) {
diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs
index e26ba346b2e..5d1ede28c32 100644
--- a/components/net/resource_thread.rs
+++ b/components/net/resource_thread.rs
@@ -4,7 +4,7 @@
 
 //! A thread that takes a URL and streams back the binary data.
 
-use std::borrow::{Cow, ToOwned};
+use std::borrow::ToOwned;
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::prelude::*;
@@ -21,7 +21,6 @@ use embedder_traits::EmbedderProxy;
 use hyper_serde::Serde;
 use ipc_channel::ipc::{self, IpcReceiver, IpcReceiverSet, IpcSender};
 use log::{debug, trace, warn};
-use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
 use net_traits::blob_url_store::parse_blob_url;
 use net_traits::filemanager_thread::FileTokenCheck;
 use net_traits::request::{Destination, RequestBuilder, RequestId};
@@ -32,8 +31,9 @@ use net_traits::{
     FetchChannels, FetchTaskTarget, ResourceFetchTiming, ResourceThreads, ResourceTimingType,
     WebSocketDomAction, WebSocketNetworkEvent,
 };
-use profile_traits::mem::{ProfilerChan as MemProfilerChan, Report, ReportKind, ReportsChan};
-use profile_traits::path;
+use profile_traits::mem::{
+    ProcessReports, ProfilerChan as MemProfilerChan, ReportsChan, perform_memory_report,
+};
 use profile_traits::time::ProfilerChan;
 use rustls::RootCertStore;
 use serde::{Deserialize, Serialize};
@@ -71,7 +71,6 @@ fn load_root_cert_store_from_file(file_path: String) -> io::Result<RootCertStore
 /// Returns a tuple of (public, private) senders to the new threads.
 #[allow(clippy::too_many_arguments)]
 pub fn new_resource_threads(
-    user_agent: Cow<'static, str>,
     devtools_sender: Option<Sender<DevtoolsControlMsg>>,
     time_profiler_chan: ProfilerChan,
     mem_profiler_chan: MemProfilerChan,
@@ -93,7 +92,6 @@ pub fn new_resource_threads(
     };
 
     let (public_core, private_core) = new_core_resource_thread(
-        user_agent,
         devtools_sender,
         time_profiler_chan,
         mem_profiler_chan,
@@ -113,7 +111,6 @@ pub fn new_resource_threads(
 /// Create a CoreResourceThread
 #[allow(clippy::too_many_arguments)]
 pub fn new_core_resource_thread(
-    user_agent: Cow<'static, str>,
     devtools_sender: Option<Sender<DevtoolsControlMsg>>,
     time_profiler_chan: ProfilerChan,
     mem_profiler_chan: MemProfilerChan,
@@ -131,7 +128,6 @@ pub fn new_core_resource_thread(
         .name("ResourceManager".to_owned())
         .spawn(move || {
             let resource_manager = CoreResourceManager::new(
-                user_agent,
                 devtools_sender,
                 time_profiler_chan,
                 embedder_proxy.clone(),
@@ -259,7 +255,7 @@ impl ResourceChannelManager {
                 // If message is memory report, get the size_of of public and private http caches
                 if id == reporter_id {
                     if let Ok(msg) = data.to() {
-                        self.process_report(msg, &private_http_state, &public_http_state);
+                        self.process_report(msg, &public_http_state, &private_http_state);
                         continue;
                     }
                 } else {
@@ -285,23 +281,11 @@ impl ResourceChannelManager {
         public_http_state: &Arc<HttpState>,
         private_http_state: &Arc<HttpState>,
     ) {
-        let mut ops = MallocSizeOfOps::new(servo_allocator::usable_size, None, None);
-        let public_cache = public_http_state.http_cache.read().unwrap();
-        let private_cache = private_http_state.http_cache.read().unwrap();
-
-        let public_report = Report {
-            path: path!["memory-cache", "public"],
-            kind: ReportKind::ExplicitJemallocHeapSize,
-            size: public_cache.size_of(&mut ops),
-        };
-
-        let private_report = Report {
-            path: path!["memory-cache", "private"],
-            kind: ReportKind::ExplicitJemallocHeapSize,
-            size: private_cache.size_of(&mut ops),
-        };
-
-        msg.send(vec![public_report, private_report]);
+        perform_memory_report(|ops| {
+            let mut reports = public_http_state.memory_reports("public", ops);
+            reports.extend(private_http_state.memory_reports("private", ops));
+            msg.send(ProcessReports::new(reports));
+        })
     }
 
     fn cancellation_listener(&self, request_id: RequestId) -> Option<Arc<CancellationListener>> {
@@ -383,6 +367,14 @@ impl ResourceChannelManager {
                     .clear_storage(&request);
                 return true;
             },
+            CoreResourceMsg::DeleteCookie(request, name) => {
+                http_state
+                    .cookie_jar
+                    .write()
+                    .unwrap()
+                    .delete_cookie_with_name(&request, name);
+                return true;
+            },
             CoreResourceMsg::FetchRedirect(request_builder, res_init, sender) => {
                 let cancellation_listener =
                     self.get_or_create_cancellation_listener(request_builder.id);
@@ -549,7 +541,6 @@ pub struct AuthCache {
 }
 
 pub struct CoreResourceManager {
-    user_agent: Cow<'static, str>,
     devtools_sender: Option<Sender<DevtoolsControlMsg>>,
     sw_managers: HashMap<ImmutableOrigin, IpcSender<CustomResponseMediator>>,
     filemanager: FileManager,
@@ -691,7 +682,6 @@ impl CoreResourceThreadPool {
 
 impl CoreResourceManager {
     pub fn new(
-        user_agent: Cow<'static, str>,
         devtools_sender: Option<Sender<DevtoolsControlMsg>>,
         _profiler_chan: ProfilerChan,
         embedder_proxy: EmbedderProxy,
@@ -705,7 +695,6 @@ impl CoreResourceManager {
         let pool = CoreResourceThreadPool::new(num_threads, "CoreResourceThreadPool".to_string());
         let pool_handle = Arc::new(pool);
         CoreResourceManager {
-            user_agent,
             devtools_sender,
             sw_managers: Default::default(),
             filemanager: FileManager::new(embedder_proxy.clone(), Arc::downgrade(&pool_handle)),
@@ -749,7 +738,6 @@ impl CoreResourceManager {
         protocols: Arc<ProtocolRegistry>,
     ) {
         let http_state = http_state.clone();
-        let ua = self.user_agent.clone();
         let dc = self.devtools_sender.clone();
         let filemanager = self.filemanager.clone();
         let request_interceptor = self.request_interceptor.clone();
@@ -783,14 +771,14 @@ impl CoreResourceManager {
             _ => (FileTokenCheck::NotRequired, None),
         };
 
-        HANDLE.lock().unwrap().as_ref().unwrap().spawn(async move {
+        HANDLE.spawn(async move {
             // XXXManishearth: Check origin against pipeline id (also ensure that the mode is allowed)
             // todo load context / mimesniff in fetch
             // todo referrer policy?
             // todo service worker stuff
             let context = FetchContext {
                 state: http_state,
-                user_agent: ua,
+                user_agent: servo_config::pref!(user_agent),
                 devtools_chan: dc.map(|dc| Arc::new(Mutex::new(dc))),
                 filemanager: Arc::new(Mutex::new(filemanager)),
                 file_token,
diff --git a/components/net/tests/fetch.rs b/components/net/tests/fetch.rs
index 55d2241fb02..e8c5077f12a 100644
--- a/components/net/tests/fetch.rs
+++ b/components/net/tests/fetch.rs
@@ -12,6 +12,7 @@ use std::sync::{Arc, Mutex, Weak};
 use std::time::{Duration, SystemTime};
 
 use base::id::TEST_PIPELINE_ID;
+use content_security_policy as csp;
 use crossbeam_channel::{Sender, unbounded};
 use devtools_traits::{HttpRequest as DevtoolsHttpRequest, HttpResponse as DevtoolsHttpResponse};
 use headers::{
@@ -163,6 +164,7 @@ fn test_fetch_blob() {
             assert_eq!(self.buffer, self.expected);
             let _ = self.sender.send(response.clone());
         }
+        fn process_csp_violations(&mut self, _: &Request, _: Vec<csp::Violation>) {}
     }
 
     let context = new_fetch_context(None, None, None);
@@ -223,7 +225,7 @@ fn test_fetch_blob() {
 
 #[test]
 fn test_file() {
-    let path = Path::new("../../resources/servo.css")
+    let path = Path::new("../../resources/ahem.css")
         .canonicalize()
         .unwrap();
     let url = ServoUrl::from_file_path(path.clone()).unwrap();
diff --git a/components/net/tests/http_loader.rs b/components/net/tests/http_loader.rs
index b3afe11852c..b1e90276472 100644
--- a/components/net/tests/http_loader.rs
+++ b/components/net/tests/http_loader.rs
@@ -11,6 +11,7 @@ use std::sync::{Arc, Mutex, RwLock};
 use std::time::Duration;
 
 use base::id::{TEST_PIPELINE_ID, TEST_WEBVIEW_ID};
+use content_security_policy as csp;
 use cookie::Cookie as CookiePair;
 use crossbeam_channel::{Receiver, unbounded};
 use devtools_traits::{
@@ -30,7 +31,7 @@ use http::{HeaderName, Method, StatusCode};
 use http_body_util::combinators::BoxBody;
 use hyper::body::{Body, Bytes, Incoming};
 use hyper::{Request as HyperRequest, Response as HyperResponse};
-use ipc_channel::ipc;
+use ipc_channel::ipc::{self, IpcSharedMemory};
 use ipc_channel::router::ROUTER;
 use net::cookie::ServoCookie;
 use net::cookie_storage::CookieStorage;
@@ -99,7 +100,7 @@ pub fn expect_devtools_http_response(
     }
 }
 
-fn create_request_body_with_content(content: Vec<u8>) -> RequestBody {
+fn create_request_body_with_content(content: IpcSharedMemory) -> RequestBody {
     let content_len = content.len();
 
     let (chunk_request_sender, chunk_request_receiver) = ipc::channel().unwrap();
@@ -591,7 +592,7 @@ fn test_load_doesnt_send_request_body_on_any_redirect() {
     let (pre_server, pre_url) = make_server(pre_handler);
 
     let content = b"Body on POST!";
-    let request_body = create_request_body_with_content(content.to_vec());
+    let request_body = create_request_body_with_content(IpcSharedMemory::from_bytes(content));
 
     let request = RequestBuilder::new(None, pre_url.clone(), Referrer::NoReferrer)
         .body(Some(request_body))
@@ -903,7 +904,7 @@ fn test_load_sets_content_length_to_length_of_request_body() {
         };
     let (server, url) = make_server(handler);
 
-    let request_body = create_request_body_with_content(content.to_vec());
+    let request_body = create_request_body_with_content(IpcSharedMemory::from_bytes(content));
 
     let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
         .method(Method::POST)
@@ -1537,6 +1538,7 @@ fn test_fetch_compressed_response_update_count() {
         fn process_response_eof(&mut self, _: &Request, _: &Response) {
             let _ = self.sender.take().unwrap().send(self.update_count);
         }
+        fn process_csp_violations(&mut self, _: &Request, _: Vec<csp::Violation>) {}
     }
 
     let (sender, receiver) = tokio::sync::oneshot::channel();
diff --git a/components/net/tests/main.rs b/components/net/tests/main.rs
index 504fea09777..ba58c4a4c1d 100644
--- a/components/net/tests/main.rs
+++ b/components/net/tests/main.rs
@@ -26,6 +26,7 @@ use std::net::TcpListener as StdTcpListener;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, LazyLock, Mutex, RwLock, Weak};
 
+use content_security_policy as csp;
 use crossbeam_channel::{Receiver, Sender, unbounded};
 use devtools_traits::DevtoolsControlMsg;
 use embedder_traits::{AuthenticationResponse, EmbedderMsg, EmbedderProxy, EventLoopWaker};
@@ -196,6 +197,7 @@ impl FetchTaskTarget for FetchResponseCollector {
     fn process_response_eof(&mut self, _: &Request, response: &Response) {
         let _ = self.sender.take().unwrap().send(response.clone());
     }
+    fn process_csp_violations(&mut self, _: &Request, _: Vec<csp::Violation>) {}
 }
 
 fn fetch(request: Request, dc: Option<Sender<DevtoolsControlMsg>>) -> Response {
diff --git a/components/net/tests/resource_thread.rs b/components/net/tests/resource_thread.rs
index 0de76fd5dd1..05b8bbad640 100644
--- a/components/net/tests/resource_thread.rs
+++ b/components/net/tests/resource_thread.rs
@@ -25,7 +25,6 @@ fn test_exit() {
     let (mtx, _mrx) = ipc::channel().unwrap();
     let (sender, receiver) = ipc::channel().unwrap();
     let (resource_thread, _private_resource_thread) = new_core_resource_thread(
-        "".into(),
         None,
         ProfilerChan(tx),
         MemProfilerChan(mtx),
diff --git a/components/net/websocket_loader.rs b/components/net/websocket_loader.rs
index 63f3da1cef3..128436ac47c 100644
--- a/components/net/websocket_loader.rs
+++ b/components/net/websocket_loader.rs
@@ -11,19 +11,22 @@
 //! over events from the network and events from the DOM, using async/await to avoid
 //! the need for a dedicated thread per websocket.
 
+use std::mem;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
 
 use async_tungstenite::WebSocketStream;
 use async_tungstenite::tokio::{ConnectStream, client_async_tls_with_connector_and_config};
 use base64::Engine;
+use content_security_policy as csp;
 use futures::future::TryFutureExt;
 use futures::stream::StreamExt;
 use http::header::{self, HeaderName, HeaderValue};
 use ipc_channel::ipc::{IpcReceiver, IpcSender};
 use ipc_channel::router::ROUTER;
 use log::{debug, trace, warn};
-use net_traits::request::{RequestBuilder, RequestMode};
+use net_traits::policy_container::{PolicyContainer, RequestPolicyContainer};
+use net_traits::request::{Origin, RequestBuilder, RequestMode};
 use net_traits::{CookieSource, MessageData, WebSocketDomAction, WebSocketNetworkEvent};
 use servo_url::ServoUrl;
 use tokio::net::TcpStream;
@@ -39,7 +42,9 @@ use url::Url;
 use crate::async_runtime::HANDLE;
 use crate::connector::{CACertificates, TlsConfig, create_tls_config};
 use crate::cookie::ServoCookie;
-use crate::fetch::methods::should_request_be_blocked_due_to_a_bad_port;
+use crate::fetch::methods::{
+    should_request_be_blocked_by_csp, should_request_be_blocked_due_to_a_bad_port,
+};
 use crate::hosts::replace_host;
 use crate::http_loader::HttpState;
 /// Create a tungstenite Request object for the initial HTTP request.
@@ -353,7 +358,7 @@ fn connect(
     ignore_certificate_errors: bool,
 ) -> Result<(), String> {
     let protocols = match req_builder.mode {
-        RequestMode::WebSocket { protocols } => protocols,
+        RequestMode::WebSocket { ref mut protocols } => mem::take(protocols),
         _ => {
             return Err(
                 "Received a RequestBuilder with a non-websocket mode in websocket_loader"
@@ -368,16 +373,36 @@ fn connect(
         .read()
         .unwrap()
         .apply_hsts_rules(&mut req_builder.url);
+    let request = req_builder.build();
 
-    let req_url = req_builder.url.clone();
+    let req_url = request.url();
+    let req_origin = match request.origin {
+        Origin::Client => unreachable!(),
+        Origin::Origin(ref origin) => origin,
+    };
 
     if should_request_be_blocked_due_to_a_bad_port(&req_url) {
         return Err("Port blocked".to_string());
     }
 
+    let policy_container = match &request.policy_container {
+        RequestPolicyContainer::Client => PolicyContainer::default(),
+        RequestPolicyContainer::PolicyContainer(container) => container.to_owned(),
+    };
+
+    let (check_result, violations) = should_request_be_blocked_by_csp(&request, &policy_container);
+
+    if !violations.is_empty() {
+        let _ = resource_event_sender.send(WebSocketNetworkEvent::ReportCSPViolations(violations));
+    }
+
+    if check_result == csp::CheckResult::Blocked {
+        return Err("Blocked by Content-Security-Policy".to_string());
+    }
+
     let client = match create_request(
         &req_url,
-        &req_builder.origin.ascii_serialization(),
+        &req_origin.ascii_serialization(),
         &protocols,
         &http_state,
     ) {
@@ -393,24 +418,21 @@ fn connect(
     tls_config.alpn_protocols = vec!["http/1.1".to_string().into()];
 
     let resource_event_sender2 = resource_event_sender.clone();
-    match HANDLE.lock().unwrap().as_mut() {
-        Some(handle) => handle.spawn(
-            start_websocket(
-                http_state,
-                req_builder.url.clone(),
-                resource_event_sender,
-                protocols,
-                client,
-                tls_config,
-                dom_action_receiver,
-            )
-            .map_err(move |e| {
-                warn!("Failed to establish a WebSocket connection: {:?}", e);
-                let _ = resource_event_sender2.send(WebSocketNetworkEvent::Fail);
-            }),
-        ),
-        None => return Err("No runtime available".to_string()),
-    };
+    HANDLE.spawn(
+        start_websocket(
+            http_state,
+            req_url.clone(),
+            resource_event_sender,
+            protocols,
+            client,
+            tls_config,
+            dom_action_receiver,
+        )
+        .map_err(move |e| {
+            warn!("Failed to establish a WebSocket connection: {:?}", e);
+            let _ = resource_event_sender2.send(WebSocketNetworkEvent::Fail);
+        }),
+    );
     Ok(())
 }
 
diff --git a/components/pixels/Cargo.toml b/components/pixels/Cargo.toml
index 4d5b16ab9a4..9ba20db80c0 100644
--- a/components/pixels/Cargo.toml
+++ b/components/pixels/Cargo.toml
@@ -13,11 +13,11 @@ path = "lib.rs"
 
 [dependencies]
 euclid = { workspace = true }
-ipc-channel = { workspace = true }
 image = { workspace = true }
+ipc-channel = { workspace = true }
+log = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
-log = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 webrender_api = { workspace = true }
 
diff --git a/components/pixels/lib.rs b/components/pixels/lib.rs
index b327d401262..c1f57875c6d 100644
--- a/components/pixels/lib.rs
+++ b/components/pixels/lib.rs
@@ -84,6 +84,7 @@ pub fn rgba8_premultiply_inplace(pixels: &mut [u8]) -> bool {
     is_opaque
 }
 
+#[inline(always)]
 pub fn multiply_u8_color(a: u8, b: u8) -> u8 {
     (a as u32 * b as u32 / 255) as u8
 }
@@ -123,7 +124,6 @@ pub struct Image {
     pub width: u32,
     pub height: u32,
     pub format: PixelFormat,
-    #[ignore_malloc_size_of = "Defined in webrender_api"]
     pub id: Option<ImageKey>,
     pub cors_status: CorsStatus,
     pub frames: Vec<ImageFrame>,
@@ -132,7 +132,6 @@ pub struct Image {
 #[derive(Clone, Deserialize, MallocSizeOf, Serialize)]
 pub struct ImageFrame {
     pub delay: Option<Duration>,
-    #[ignore_malloc_size_of = "Defined in ipc-channel"]
     pub bytes: IpcSharedMemory,
     pub width: u32,
     pub height: u32,
@@ -256,6 +255,70 @@ pub fn unmultiply_inplace<const SWAP_RB: bool>(pixels: &mut [u8]) {
     }
 }
 
+#[repr(u8)]
+pub enum Multiply {
+    None = 0,
+    PreMultiply = 1,
+    UnMultiply = 2,
+}
+
+pub fn transform_inplace(pixels: &mut [u8], multiply: Multiply, swap_rb: bool, clear_alpha: bool) {
+    match (multiply, swap_rb, clear_alpha) {
+        (Multiply::None, true, true) => generic_transform_inplace::<0, true, true>(pixels),
+        (Multiply::None, true, false) => generic_transform_inplace::<0, true, false>(pixels),
+        (Multiply::None, false, true) => generic_transform_inplace::<0, false, true>(pixels),
+        (Multiply::None, false, false) => generic_transform_inplace::<0, false, false>(pixels),
+        (Multiply::PreMultiply, true, true) => generic_transform_inplace::<1, true, true>(pixels),
+        (Multiply::PreMultiply, true, false) => generic_transform_inplace::<1, true, false>(pixels),
+        (Multiply::PreMultiply, false, true) => generic_transform_inplace::<1, false, true>(pixels),
+        (Multiply::PreMultiply, false, false) => {
+            generic_transform_inplace::<1, false, false>(pixels)
+        },
+        (Multiply::UnMultiply, true, true) => generic_transform_inplace::<2, true, true>(pixels),
+        (Multiply::UnMultiply, true, false) => generic_transform_inplace::<2, true, false>(pixels),
+        (Multiply::UnMultiply, false, true) => generic_transform_inplace::<2, false, true>(pixels),
+        (Multiply::UnMultiply, false, false) => {
+            generic_transform_inplace::<2, false, false>(pixels)
+        },
+    }
+}
+
+pub fn generic_transform_inplace<
+    const MULTIPLY: u8, // 1 premultiply, 2 unmultiply
+    const SWAP_RB: bool,
+    const CLEAR_ALPHA: bool,
+>(
+    pixels: &mut [u8],
+) {
+    for rgba in pixels.chunks_mut(4) {
+        match MULTIPLY {
+            1 => {
+                let a = rgba[3];
+
+                rgba[0] = multiply_u8_color(rgba[0], a);
+                rgba[1] = multiply_u8_color(rgba[1], a);
+                rgba[2] = multiply_u8_color(rgba[2], a);
+            },
+            2 => {
+                let a = rgba[3] as u32;
+
+                if a > 0 {
+                    rgba[0] = (rgba[0] as u32 * 255 / a) as u8;
+                    rgba[1] = (rgba[1] as u32 * 255 / a) as u8;
+                    rgba[2] = (rgba[2] as u32 * 255 / a) as u8;
+                }
+            },
+            _ => {},
+        }
+        if SWAP_RB {
+            rgba.swap(0, 2);
+        }
+        if CLEAR_ALPHA {
+            rgba[3] = u8::MAX;
+        }
+    }
+}
+
 fn is_gif(buffer: &[u8]) -> bool {
     buffer.starts_with(b"GIF87a") || buffer.starts_with(b"GIF89a")
 }
diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml
index 546ba273f4a..8a8d0775711 100644
--- a/components/profile/Cargo.toml
+++ b/components/profile/Cargo.toml
@@ -14,6 +14,7 @@ path = "lib.rs"
 [dependencies]
 base = { workspace = true }
 ipc-channel = { workspace = true }
+log = { workspace = true }
 parking_lot = { workspace = true }
 profile_traits = { workspace = true }
 serde = { workspace = true }
@@ -29,5 +30,6 @@ regex = { workspace = true }
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
 libc = { workspace = true }
+
 [target.'cfg(not(any(target_os = "windows", target_env = "ohos")))'.dependencies]
 tikv-jemalloc-sys = { workspace = true }
diff --git a/components/profile/lib.rs b/components/profile/lib.rs
index 6321decd9c0..733bcce1278 100644
--- a/components/profile/lib.rs
+++ b/components/profile/lib.rs
@@ -4,7 +4,8 @@
 
 #![deny(unsafe_code)]
 
-#[allow(unsafe_code)]
 pub mod mem;
+#[allow(unsafe_code)]
+pub mod system_reporter;
 pub mod time;
 pub mod trace_dump;
diff --git a/components/profile/mem.rs b/components/profile/mem.rs
index 34930eb17ca..258099b9685 100644
--- a/components/profile/mem.rs
+++ b/components/profile/mem.rs
@@ -10,9 +10,13 @@ use std::thread;
 
 use ipc_channel::ipc::{self, IpcReceiver};
 use ipc_channel::router::ROUTER;
+use log::debug;
 use profile_traits::mem::{
     MemoryReportResult, ProfilerChan, ProfilerMsg, Report, Reporter, ReporterRequest, ReportsChan,
 };
+use serde::Serialize;
+
+use crate::system_reporter;
 
 pub struct Profiler {
     /// The port through which messages are received.
@@ -22,9 +26,6 @@ pub struct Profiler {
     reporters: HashMap<String, Reporter>,
 }
 
-const JEMALLOC_HEAP_ALLOCATED_STR: &str = "jemalloc-heap-allocated";
-const SYSTEM_HEAP_ALLOCATED_STR: &str = "system-heap-allocated";
-
 impl Profiler {
     pub fn create() -> ProfilerChan {
         let (chan, port) = ipc::channel().unwrap();
@@ -53,7 +54,7 @@ impl Profiler {
             }),
         );
         mem_profiler_chan.send(ProfilerMsg::RegisterReporter(
-            "system".to_owned(),
+            "system-main".to_owned(),
             Reporter(system_reporter_sender),
         ));
 
@@ -78,6 +79,7 @@ impl Profiler {
     fn handle_msg(&mut self, msg: ProfilerMsg) -> bool {
         match msg {
             ProfilerMsg::RegisterReporter(name, reporter) => {
+                debug!("Registering memory reporter: {}", name);
                 // Panic if it has already been registered.
                 let name_clone = name.clone();
                 match self.reporters.insert(name, reporter) {
@@ -87,6 +89,7 @@ impl Profiler {
             },
 
             ProfilerMsg::UnregisterReporter(name) => {
+                debug!("Unregistering memory reporter: {}", name);
                 // Panic if it hasn't previously been registered.
                 match self.reporters.remove(&name) {
                     Some(_) => true,
@@ -95,8 +98,28 @@ impl Profiler {
             },
 
             ProfilerMsg::Report(sender) => {
+                let main_pid = std::process::id();
+
+                #[derive(Serialize)]
+                struct JsonReport {
+                    pid: u32,
+                    #[serde(rename = "isMainProcess")]
+                    is_main_process: bool,
+                    reports: Vec<Report>,
+                }
+
                 let reports = self.collect_reports();
-                let content = serde_json::to_string(&reports)
+                // Turn the pid -> reports map into a vector and add the
+                // hint to find the main process.
+                let json_reports: Vec<JsonReport> = reports
+                    .into_iter()
+                    .map(|(pid, reports)| JsonReport {
+                        pid,
+                        reports,
+                        is_main_process: pid == main_pid,
+                    })
+                    .collect();
+                let content = serde_json::to_string(&json_reports)
                     .unwrap_or_else(|_| "{ error: \"failed to create memory report\"}".to_owned());
                 let _ = sender.send(MemoryReportResult { content });
                 true
@@ -106,347 +129,20 @@ impl Profiler {
         }
     }
 
-    fn collect_reports(&self) -> Vec<Report> {
-        let mut result = vec![];
+    /// Returns a map of pid -> reports
+    fn collect_reports(&self) -> HashMap<u32, Vec<Report>> {
+        let mut result = HashMap::new();
+
         for reporter in self.reporters.values() {
             let (chan, port) = ipc::channel().unwrap();
             reporter.collect_reports(ReportsChan(chan));
             if let Ok(mut reports) = port.recv() {
-                result.append(&mut reports);
+                result
+                    .entry(reports.pid)
+                    .or_insert(vec![])
+                    .append(&mut reports.reports);
             }
         }
         result
     }
 }
-
-//---------------------------------------------------------------------------
-
-mod system_reporter {
-    #[cfg(not(any(target_os = "windows", target_env = "ohos")))]
-    use std::ffi::CString;
-    #[cfg(not(any(target_os = "windows", target_env = "ohos")))]
-    use std::mem::size_of;
-    #[cfg(not(any(target_os = "windows", target_env = "ohos")))]
-    use std::ptr::null_mut;
-
-    #[cfg(all(target_os = "linux", target_env = "gnu"))]
-    use libc::c_int;
-    #[cfg(not(any(target_os = "windows", target_env = "ohos")))]
-    use libc::{c_void, size_t};
-    use profile_traits::mem::{Report, ReportKind, ReporterRequest};
-    use profile_traits::path;
-    #[cfg(target_os = "macos")]
-    use task_info::task_basic_info::{resident_size, virtual_size};
-
-    use super::{JEMALLOC_HEAP_ALLOCATED_STR, SYSTEM_HEAP_ALLOCATED_STR};
-
-    /// Collects global measurements from the OS and heap allocators.
-    pub fn collect_reports(request: ReporterRequest) {
-        let mut reports = vec![];
-        {
-            let mut report = |path, size| {
-                if let Some(size) = size {
-                    reports.push(Report {
-                        path,
-                        kind: ReportKind::NonExplicitSize,
-                        size,
-                    });
-                }
-            };
-
-            // Virtual and physical memory usage, as reported by the OS.
-            report(path!["vsize"], vsize());
-            report(path!["resident"], resident());
-
-            // Memory segments, as reported by the OS.
-            for seg in resident_segments() {
-                report(path!["resident-according-to-smaps", seg.0], Some(seg.1));
-            }
-
-            // Total number of bytes allocated by the application on the system
-            // heap.
-            report(path![SYSTEM_HEAP_ALLOCATED_STR], system_heap_allocated());
-
-            // The descriptions of the following jemalloc measurements are taken
-            // directly from the jemalloc documentation.
-
-            // "Total number of bytes allocated by the application."
-            report(
-                path![JEMALLOC_HEAP_ALLOCATED_STR],
-                jemalloc_stat("stats.allocated"),
-            );
-
-            // "Total number of bytes in active pages allocated by the application.
-            // This is a multiple of the page size, and greater than or equal to
-            // |stats.allocated|."
-            report(path!["jemalloc-heap-active"], jemalloc_stat("stats.active"));
-
-            // "Total number of bytes in chunks mapped on behalf of the application.
-            // This is a multiple of the chunk size, and is at least as large as
-            // |stats.active|. This does not include inactive chunks."
-            report(path!["jemalloc-heap-mapped"], jemalloc_stat("stats.mapped"));
-        }
-
-        request.reports_channel.send(reports);
-    }
-
-    #[cfg(all(target_os = "linux", target_env = "gnu"))]
-    unsafe extern "C" {
-        fn mallinfo() -> struct_mallinfo;
-    }
-
-    #[cfg(all(target_os = "linux", target_env = "gnu"))]
-    #[repr(C)]
-    pub struct struct_mallinfo {
-        arena: c_int,
-        ordblks: c_int,
-        smblks: c_int,
-        hblks: c_int,
-        hblkhd: c_int,
-        usmblks: c_int,
-        fsmblks: c_int,
-        uordblks: c_int,
-        fordblks: c_int,
-        keepcost: c_int,
-    }
-
-    #[cfg(all(target_os = "linux", target_env = "gnu"))]
-    fn system_heap_allocated() -> Option<usize> {
-        let info: struct_mallinfo = unsafe { mallinfo() };
-
-        // The documentation in the glibc man page makes it sound like |uordblks| would suffice,
-        // but that only gets the small allocations that are put in the brk heap. We need |hblkhd|
-        // as well to get the larger allocations that are mmapped.
-        //
-        // These fields are unfortunately |int| and so can overflow (becoming negative) if memory
-        // usage gets high enough. So don't report anything in that case. In the non-overflow case
-        // we cast the two values to usize before adding them to make sure the sum also doesn't
-        // overflow.
-        if info.hblkhd < 0 || info.uordblks < 0 {
-            None
-        } else {
-            Some(info.hblkhd as usize + info.uordblks as usize)
-        }
-    }
-
-    #[cfg(not(all(target_os = "linux", target_env = "gnu")))]
-    fn system_heap_allocated() -> Option<usize> {
-        None
-    }
-
-    #[cfg(not(any(target_os = "windows", target_env = "ohos")))]
-    use tikv_jemalloc_sys::mallctl;
-
-    #[cfg(not(any(target_os = "windows", target_env = "ohos")))]
-    fn jemalloc_stat(value_name: &str) -> Option<usize> {
-        // Before we request the measurement of interest, we first send an "epoch"
-        // request. Without that jemalloc gives cached statistics(!) which can be
-        // highly inaccurate.
-        let epoch_name = "epoch";
-        let epoch_c_name = CString::new(epoch_name).unwrap();
-        let mut epoch: u64 = 0;
-        let epoch_ptr = &mut epoch as *mut _ as *mut c_void;
-        let mut epoch_len = size_of::<u64>() as size_t;
-
-        let value_c_name = CString::new(value_name).unwrap();
-        let mut value: size_t = 0;
-        let value_ptr = &mut value as *mut _ as *mut c_void;
-        let mut value_len = size_of::<size_t>() as size_t;
-
-        // Using the same values for the `old` and `new` parameters is enough
-        // to get the statistics updated.
-        let rv = unsafe {
-            mallctl(
-                epoch_c_name.as_ptr(),
-                epoch_ptr,
-                &mut epoch_len,
-                epoch_ptr,
-                epoch_len,
-            )
-        };
-        if rv != 0 {
-            return None;
-        }
-
-        let rv = unsafe {
-            mallctl(
-                value_c_name.as_ptr(),
-                value_ptr,
-                &mut value_len,
-                null_mut(),
-                0,
-            )
-        };
-        if rv != 0 {
-            return None;
-        }
-
-        Some(value as usize)
-    }
-
-    #[cfg(any(target_os = "windows", target_env = "ohos"))]
-    fn jemalloc_stat(_value_name: &str) -> Option<usize> {
-        None
-    }
-
-    #[cfg(target_os = "linux")]
-    fn page_size() -> usize {
-        unsafe { ::libc::sysconf(::libc::_SC_PAGESIZE) as usize }
-    }
-
-    #[cfg(target_os = "linux")]
-    fn proc_self_statm_field(field: usize) -> Option<usize> {
-        use std::fs::File;
-        use std::io::Read;
-
-        let mut f = File::open("/proc/self/statm").ok()?;
-        let mut contents = String::new();
-        f.read_to_string(&mut contents).ok()?;
-        let s = contents.split_whitespace().nth(field)?;
-        let npages = s.parse::<usize>().ok()?;
-        Some(npages * page_size())
-    }
-
-    #[cfg(target_os = "linux")]
-    fn vsize() -> Option<usize> {
-        proc_self_statm_field(0)
-    }
-
-    #[cfg(target_os = "linux")]
-    fn resident() -> Option<usize> {
-        proc_self_statm_field(1)
-    }
-
-    #[cfg(target_os = "macos")]
-    fn vsize() -> Option<usize> {
-        virtual_size()
-    }
-
-    #[cfg(target_os = "macos")]
-    fn resident() -> Option<usize> {
-        resident_size()
-    }
-
-    #[cfg(not(any(target_os = "linux", target_os = "macos")))]
-    fn vsize() -> Option<usize> {
-        None
-    }
-
-    #[cfg(not(any(target_os = "linux", target_os = "macos")))]
-    fn resident() -> Option<usize> {
-        None
-    }
-
-    #[cfg(target_os = "linux")]
-    fn resident_segments() -> Vec<(String, usize)> {
-        use std::collections::HashMap;
-        use std::collections::hash_map::Entry;
-        use std::fs::File;
-        use std::io::{BufRead, BufReader};
-
-        use regex::Regex;
-
-        // The first line of an entry in /proc/<pid>/smaps looks just like an entry
-        // in /proc/<pid>/maps:
-        //
-        //   address           perms offset  dev   inode  pathname
-        //   02366000-025d8000 rw-p 00000000 00:00 0      [heap]
-        //
-        // Each of the following lines contains a key and a value, separated
-        // by ": ", where the key does not contain either of those characters.
-        // For example:
-        //
-        //   Rss:           132 kB
-
-        let f = match File::open("/proc/self/smaps") {
-            Ok(f) => BufReader::new(f),
-            Err(_) => return vec![],
-        };
-
-        let seg_re = Regex::new(
-            r"^[:xdigit:]+-[:xdigit:]+ (....) [:xdigit:]+ [:xdigit:]+:[:xdigit:]+ \d+ +(.*)",
-        )
-        .unwrap();
-        let rss_re = Regex::new(r"^Rss: +(\d+) kB").unwrap();
-
-        // We record each segment's resident size.
-        let mut seg_map: HashMap<String, usize> = HashMap::new();
-
-        #[derive(PartialEq)]
-        enum LookingFor {
-            Segment,
-            Rss,
-        }
-        let mut looking_for = LookingFor::Segment;
-
-        let mut curr_seg_name = String::new();
-
-        // Parse the file.
-        for line in f.lines() {
-            let line = match line {
-                Ok(line) => line,
-                Err(_) => continue,
-            };
-            if looking_for == LookingFor::Segment {
-                // Look for a segment info line.
-                let cap = match seg_re.captures(&line) {
-                    Some(cap) => cap,
-                    None => continue,
-                };
-                let perms = cap.get(1).unwrap().as_str();
-                let pathname = cap.get(2).unwrap().as_str();
-
-                // Construct the segment name from its pathname and permissions.
-                curr_seg_name.clear();
-                if pathname.is_empty() || pathname.starts_with("[stack:") {
-                    // Anonymous memory. Entries marked with "[stack:nnn]"
-                    // look like thread stacks but they may include other
-                    // anonymous mappings, so we can't trust them and just
-                    // treat them as entirely anonymous.
-                    curr_seg_name.push_str("anonymous");
-                } else {
-                    curr_seg_name.push_str(pathname);
-                }
-                curr_seg_name.push_str(" (");
-                curr_seg_name.push_str(perms);
-                curr_seg_name.push(')');
-
-                looking_for = LookingFor::Rss;
-            } else {
-                // Look for an "Rss:" line.
-                let cap = match rss_re.captures(&line) {
-                    Some(cap) => cap,
-                    None => continue,
-                };
-                let rss = cap.get(1).unwrap().as_str().parse::<usize>().unwrap() * 1024;
-
-                if rss > 0 {
-                    // Aggregate small segments into "other".
-                    let seg_name = if rss < 512 * 1024 {
-                        "other".to_owned()
-                    } else {
-                        curr_seg_name.clone()
-                    };
-                    match seg_map.entry(seg_name) {
-                        Entry::Vacant(entry) => {
-                            entry.insert(rss);
-                        },
-                        Entry::Occupied(mut entry) => *entry.get_mut() += rss,
-                    }
-                }
-
-                looking_for = LookingFor::Segment;
-            }
-        }
-
-        // Note that the sum of all these segments' RSS values differs from the "resident"
-        // measurement obtained via /proc/<pid>/statm in resident(). It's unclear why this
-        // difference occurs; for some processes the measurements match, but for Servo they do not.
-        seg_map.into_iter().collect()
-    }
-
-    #[cfg(not(target_os = "linux"))]
-    fn resident_segments() -> Vec<(String, usize)> {
-        vec![]
-    }
-}
diff --git a/components/profile/system_reporter.rs b/components/profile/system_reporter.rs
new file mode 100644
index 00000000000..f41b837666f
--- /dev/null
+++ b/components/profile/system_reporter.rs
@@ -0,0 +1,332 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#[cfg(not(any(target_os = "windows", target_env = "ohos")))]
+use std::ffi::CString;
+#[cfg(not(any(target_os = "windows", target_env = "ohos")))]
+use std::mem::size_of;
+#[cfg(not(any(target_os = "windows", target_env = "ohos")))]
+use std::ptr::null_mut;
+
+#[cfg(all(target_os = "linux", target_env = "gnu"))]
+use libc::c_int;
+#[cfg(not(any(target_os = "windows", target_env = "ohos")))]
+use libc::{c_void, size_t};
+use profile_traits::mem::{ProcessReports, Report, ReportKind, ReporterRequest};
+use profile_traits::path;
+#[cfg(target_os = "macos")]
+use task_info::task_basic_info::{resident_size, virtual_size};
+
+const JEMALLOC_HEAP_ALLOCATED_STR: &str = "jemalloc-heap-allocated";
+const SYSTEM_HEAP_ALLOCATED_STR: &str = "system-heap-allocated";
+
+/// Collects global measurements from the OS and heap allocators.
+pub fn collect_reports(request: ReporterRequest) {
+    let mut reports = vec![];
+    {
+        let mut report = |path, size| {
+            if let Some(size) = size {
+                reports.push(Report {
+                    path,
+                    kind: ReportKind::NonExplicitSize,
+                    size,
+                });
+            }
+        };
+
+        // Virtual and physical memory usage, as reported by the OS.
+        report(path!["vsize"], vsize());
+        report(path!["resident"], resident());
+
+        // Memory segments, as reported by the OS.
+        for seg in resident_segments() {
+            report(path!["resident-according-to-smaps", seg.0], Some(seg.1));
+        }
+
+        // Total number of bytes allocated by the application on the system
+        // heap.
+        report(path![SYSTEM_HEAP_ALLOCATED_STR], system_heap_allocated());
+
+        // The descriptions of the following jemalloc measurements are taken
+        // directly from the jemalloc documentation.
+
+        // "Total number of bytes allocated by the application."
+        report(
+            path![JEMALLOC_HEAP_ALLOCATED_STR],
+            jemalloc_stat("stats.allocated"),
+        );
+
+        // "Total number of bytes in active pages allocated by the application.
+        // This is a multiple of the page size, and greater than or equal to
+        // |stats.allocated|."
+        report(path!["jemalloc-heap-active"], jemalloc_stat("stats.active"));
+
+        // "Total number of bytes in chunks mapped on behalf of the application.
+        // This is a multiple of the chunk size, and is at least as large as
+        // |stats.active|. This does not include inactive chunks."
+        report(path!["jemalloc-heap-mapped"], jemalloc_stat("stats.mapped"));
+    }
+
+    request.reports_channel.send(ProcessReports::new(reports));
+}
+
+#[cfg(all(target_os = "linux", target_env = "gnu"))]
+unsafe extern "C" {
+    fn mallinfo() -> struct_mallinfo;
+}
+
+#[cfg(all(target_os = "linux", target_env = "gnu"))]
+#[repr(C)]
+pub struct struct_mallinfo {
+    arena: c_int,
+    ordblks: c_int,
+    smblks: c_int,
+    hblks: c_int,
+    hblkhd: c_int,
+    usmblks: c_int,
+    fsmblks: c_int,
+    uordblks: c_int,
+    fordblks: c_int,
+    keepcost: c_int,
+}
+
+#[cfg(all(target_os = "linux", target_env = "gnu"))]
+fn system_heap_allocated() -> Option<usize> {
+    let info: struct_mallinfo = unsafe { mallinfo() };
+
+    // The documentation in the glibc man page makes it sound like |uordblks| would suffice,
+    // but that only gets the small allocations that are put in the brk heap. We need |hblkhd|
+    // as well to get the larger allocations that are mmapped.
+    //
+    // These fields are unfortunately |int| and so can overflow (becoming negative) if memory
+    // usage gets high enough. So don't report anything in that case. In the non-overflow case
+    // we cast the two values to usize before adding them to make sure the sum also doesn't
+    // overflow.
+    if info.hblkhd < 0 || info.uordblks < 0 {
+        None
+    } else {
+        Some(info.hblkhd as usize + info.uordblks as usize)
+    }
+}
+
+#[cfg(not(all(target_os = "linux", target_env = "gnu")))]
+fn system_heap_allocated() -> Option<usize> {
+    None
+}
+
+#[cfg(not(any(target_os = "windows", target_env = "ohos")))]
+use tikv_jemalloc_sys::mallctl;
+
+#[cfg(not(any(target_os = "windows", target_env = "ohos")))]
+fn jemalloc_stat(value_name: &str) -> Option<usize> {
+    // Before we request the measurement of interest, we first send an "epoch"
+    // request. Without that jemalloc gives cached statistics(!) which can be
+    // highly inaccurate.
+    let epoch_name = "epoch";
+    let epoch_c_name = CString::new(epoch_name).unwrap();
+    let mut epoch: u64 = 0;
+    let epoch_ptr = &mut epoch as *mut _ as *mut c_void;
+    let mut epoch_len = size_of::<u64>() as size_t;
+
+    let value_c_name = CString::new(value_name).unwrap();
+    let mut value: size_t = 0;
+    let value_ptr = &mut value as *mut _ as *mut c_void;
+    let mut value_len = size_of::<size_t>() as size_t;
+
+    // Using the same values for the `old` and `new` parameters is enough
+    // to get the statistics updated.
+    let rv = unsafe {
+        mallctl(
+            epoch_c_name.as_ptr(),
+            epoch_ptr,
+            &mut epoch_len,
+            epoch_ptr,
+            epoch_len,
+        )
+    };
+    if rv != 0 {
+        return None;
+    }
+
+    let rv = unsafe {
+        mallctl(
+            value_c_name.as_ptr(),
+            value_ptr,
+            &mut value_len,
+            null_mut(),
+            0,
+        )
+    };
+    if rv != 0 {
+        return None;
+    }
+
+    Some(value as usize)
+}
+
+#[cfg(any(target_os = "windows", target_env = "ohos"))]
+fn jemalloc_stat(_value_name: &str) -> Option<usize> {
+    None
+}
+
+#[cfg(target_os = "linux")]
+fn page_size() -> usize {
+    unsafe { ::libc::sysconf(::libc::_SC_PAGESIZE) as usize }
+}
+
+#[cfg(target_os = "linux")]
+fn proc_self_statm_field(field: usize) -> Option<usize> {
+    use std::fs::File;
+    use std::io::Read;
+
+    let mut f = File::open("/proc/self/statm").ok()?;
+    let mut contents = String::new();
+    f.read_to_string(&mut contents).ok()?;
+    let s = contents.split_whitespace().nth(field)?;
+    let npages = s.parse::<usize>().ok()?;
+    Some(npages * page_size())
+}
+
+#[cfg(target_os = "linux")]
+fn vsize() -> Option<usize> {
+    proc_self_statm_field(0)
+}
+
+#[cfg(target_os = "linux")]
+fn resident() -> Option<usize> {
+    proc_self_statm_field(1)
+}
+
+#[cfg(target_os = "macos")]
+fn vsize() -> Option<usize> {
+    virtual_size()
+}
+
+#[cfg(target_os = "macos")]
+fn resident() -> Option<usize> {
+    resident_size()
+}
+
+#[cfg(not(any(target_os = "linux", target_os = "macos")))]
+fn vsize() -> Option<usize> {
+    None
+}
+
+#[cfg(not(any(target_os = "linux", target_os = "macos")))]
+fn resident() -> Option<usize> {
+    None
+}
+
+#[cfg(target_os = "linux")]
+fn resident_segments() -> Vec<(String, usize)> {
+    use std::collections::HashMap;
+    use std::collections::hash_map::Entry;
+    use std::fs::File;
+    use std::io::{BufRead, BufReader};
+
+    use regex::Regex;
+
+    // The first line of an entry in /proc/<pid>/smaps looks just like an entry
+    // in /proc/<pid>/maps:
+    //
+    //   address           perms offset  dev   inode  pathname
+    //   02366000-025d8000 rw-p 00000000 00:00 0      [heap]
+    //
+    // Each of the following lines contains a key and a value, separated
+    // by ": ", where the key does not contain either of those characters.
+    // For example:
+    //
+    //   Rss:           132 kB
+
+    let f = match File::open("/proc/self/smaps") {
+        Ok(f) => BufReader::new(f),
+        Err(_) => return vec![],
+    };
+
+    let seg_re = Regex::new(
+        r"^[:xdigit:]+-[:xdigit:]+ (....) [:xdigit:]+ [:xdigit:]+:[:xdigit:]+ \d+ +(.*)",
+    )
+    .unwrap();
+    let rss_re = Regex::new(r"^Rss: +(\d+) kB").unwrap();
+
+    // We record each segment's resident size.
+    let mut seg_map: HashMap<String, usize> = HashMap::new();
+
+    #[derive(PartialEq)]
+    enum LookingFor {
+        Segment,
+        Rss,
+    }
+    let mut looking_for = LookingFor::Segment;
+
+    let mut curr_seg_name = String::new();
+
+    // Parse the file.
+    for line in f.lines() {
+        let line = match line {
+            Ok(line) => line,
+            Err(_) => continue,
+        };
+        if looking_for == LookingFor::Segment {
+            // Look for a segment info line.
+            let cap = match seg_re.captures(&line) {
+                Some(cap) => cap,
+                None => continue,
+            };
+            let perms = cap.get(1).unwrap().as_str();
+            let pathname = cap.get(2).unwrap().as_str();
+
+            // Construct the segment name from its pathname and permissions.
+            curr_seg_name.clear();
+            if pathname.is_empty() || pathname.starts_with("[stack:") {
+                // Anonymous memory. Entries marked with "[stack:nnn]"
+                // look like thread stacks but they may include other
+                // anonymous mappings, so we can't trust them and just
+                // treat them as entirely anonymous.
+                curr_seg_name.push_str("anonymous");
+            } else {
+                curr_seg_name.push_str(pathname);
+            }
+            curr_seg_name.push_str(" (");
+            curr_seg_name.push_str(perms);
+            curr_seg_name.push(')');
+
+            looking_for = LookingFor::Rss;
+        } else {
+            // Look for an "Rss:" line.
+            let cap = match rss_re.captures(&line) {
+                Some(cap) => cap,
+                None => continue,
+            };
+            let rss = cap.get(1).unwrap().as_str().parse::<usize>().unwrap() * 1024;
+
+            if rss > 0 {
+                // Aggregate small segments into "other".
+                let seg_name = if rss < 512 * 1024 {
+                    "other".to_owned()
+                } else {
+                    curr_seg_name.clone()
+                };
+                match seg_map.entry(seg_name) {
+                    Entry::Vacant(entry) => {
+                        entry.insert(rss);
+                    },
+                    Entry::Occupied(mut entry) => *entry.get_mut() += rss,
+                }
+            }
+
+            looking_for = LookingFor::Segment;
+        }
+    }
+
+    // Note that the sum of all these segments' RSS values differs from the "resident"
+    // measurement obtained via /proc/<pid>/statm in resident(). It's unclear why this
+    // difference occurs; for some processes the measurements match, but for Servo they do not.
+    seg_map.into_iter().collect()
+}
+
+#[cfg(not(target_os = "linux"))]
+fn resident_segments() -> Vec<(String, usize)> {
+    vec![]
+}
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 1aeb3e95567..ea1ec52f911 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -18,7 +18,7 @@ crown = ['js/crown']
 debugmozjs = ['js/debugmozjs']
 jitspew = ['js/jitspew']
 profilemozjs = ['js/profilemozjs']
-tracing = ["dep:tracing"]
+tracing = ["dep:tracing", "script_bindings/tracing"]
 webgl_backtrace = ["canvas_traits/webgl_backtrace"]
 js_backtrace = []
 refcell_backtrace = ["accountable-refcell"]
@@ -30,13 +30,14 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(crown)'] }
 unsafe_op_in_unsafe_fn = { level = "allow" }
 
 [dependencies]
-aes = { workspace = true }
-aes-kw = { workspace = true }
-aes-gcm = { workspace = true }
 accountable-refcell = { workspace = true, optional = true }
+aes = { workspace = true }
+aes-gcm = { workspace = true }
+aes-kw = { workspace = true }
 app_units = { workspace = true }
 arrayvec = { workspace = true }
 atomic_refcell = { workspace = true }
+aws-lc-rs = { workspace = true }
 background_hang_monitor_api = { workspace = true }
 backtrace = { workspace = true }
 base = { workspace = true }
@@ -45,10 +46,11 @@ bincode = { workspace = true }
 bitflags = { workspace = true }
 bluetooth_traits = { workspace = true, optional = true }
 canvas_traits = { workspace = true }
-constellation_traits = { workspace = true }
 cbc = { workspace = true }
-cipher = { workspace = true }
 chrono = { workspace = true }
+cipher = { workspace = true }
+compositing_traits = { workspace = true }
+constellation_traits = { workspace = true }
 content-security-policy = { workspace = true }
 cookie = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -63,9 +65,10 @@ embedder_traits = { workspace = true }
 encoding_rs = { workspace = true }
 euclid = { workspace = true }
 fnv = { workspace = true }
-fxhash = { workspace = true }
-fonts_traits = { workspace = true }
 fonts = { path = "../fonts" }
+fonts_traits = { workspace = true }
+fxhash = { workspace = true }
+glow = { workspace = true }
 headers = { workspace = true }
 html5ever = { workspace = true }
 http = { workspace = true }
@@ -81,13 +84,15 @@ libc = { workspace = true }
 log = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
+markup5ever = { workspace = true }
 media = { path = "../media" }
 metrics = { path = "../metrics" }
 mime = { workspace = true }
 mime_guess = { workspace = true }
 net_traits = { workspace = true }
-num_cpus = { workspace = true }
+nom = "7.1.3"
 num-traits = { workspace = true }
+num_cpus = { workspace = true }
 parking_lot = { workspace = true }
 percent-encoding = { workspace = true }
 phf = "0.11"
@@ -96,7 +101,6 @@ profile_traits = { workspace = true }
 range = { path = "../range" }
 ref_filter_map = "1.0.1"
 regex = { workspace = true }
-aws-lc-rs = { workspace = true }
 script_bindings = { path = "../script_bindings" }
 script_layout_interface = { workspace = true }
 script_traits = { workspace = true }
@@ -106,18 +110,18 @@ serde_json = { workspace = true }
 servo-media = { workspace = true }
 servo_allocator = { path = "../allocator" }
 servo_arc = { workspace = true }
-stylo_atoms = { workspace = true }
 servo_config = { path = "../config" }
 servo_geometry = { path = "../geometry" }
 servo_rand = { path = "../rand" }
 servo_url = { path = "../url" }
+snapshot = { workspace = true }
 smallvec = { workspace = true, features = ["union"] }
-stylo_malloc_size_of = { workspace = true }
-glow = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
 stylo = { workspace = true }
+stylo_atoms = { workspace = true }
 stylo_dom = { workspace = true }
+stylo_malloc_size_of = { workspace = true }
 stylo_traits = { workspace = true }
 swapper = "0.1"
 tempfile = "3"
@@ -128,15 +132,16 @@ tracing = { workspace = true, optional = true }
 unicode-bidi = { workspace = true }
 unicode-segmentation = { workspace = true }
 url = { workspace = true }
+urlpattern = { workspace = true }
 utf-8 = "0.7"
 uuid = { workspace = true, features = ["serde"] }
 webdriver = { workspace = true }
-webgpu = { path = "../webgpu" }
+webgpu_traits = { workspace = true }
 webrender_api = { workspace = true }
-webrender_traits = { workspace = true }
 webxr-api = { workspace = true, features = ["ipc"], optional = true }
+wgpu-core = { workspace = true }
+wgpu-types = { workspace = true }
 xml5ever = { workspace = true }
-nom = "7.1.3"
 
 [target.'cfg(not(target_os = "ios"))'.dependencies]
 mozangle = { workspace = true }
diff --git a/components/script/animations.rs b/components/script/animations.rs
index e62986a70b6..693c3ae978f 100644
--- a/components/script/animations.rs
+++ b/components/script/animations.rs
@@ -7,11 +7,11 @@
 use std::cell::Cell;
 
 use base::id::PipelineId;
-use constellation_traits::UntrustedNodeAddress;
+use constellation_traits::ScriptToConstellationMessage;
 use cssparser::ToCss;
+use embedder_traits::{AnimationState as AnimationsPresentState, UntrustedNodeAddress};
 use fxhash::{FxHashMap, FxHashSet};
 use libc::c_void;
-use script_traits::{AnimationState as AnimationsPresentState, ScriptMsg};
 use serde::{Deserialize, Serialize};
 use style::animation::{
     Animation, AnimationSetKey, AnimationState, DocumentAnimationSet, ElementAnimationSet,
@@ -186,7 +186,9 @@ impl Animations {
             true => AnimationsPresentState::AnimationsPresent,
             false => AnimationsPresentState::NoAnimationsPresent,
         };
-        window.send_to_constellation(ScriptMsg::ChangeRunningAnimationsState(state));
+        window.send_to_constellation(ScriptToConstellationMessage::ChangeRunningAnimationsState(
+            state,
+        ));
     }
 
     pub(crate) fn running_animation_count(&self) -> usize {
diff --git a/components/script/body.rs b/components/script/body.rs
index 20c6e1052a3..cc7870a0845 100644
--- a/components/script/body.rs
+++ b/components/script/body.rs
@@ -5,8 +5,9 @@
 use std::rc::Rc;
 use std::{ptr, slice, str};
 
+use constellation_traits::BlobImpl;
 use encoding_rs::{Encoding, UTF_8};
-use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
+use ipc_channel::ipc::{self, IpcReceiver, IpcSender, IpcSharedMemory};
 use ipc_channel::router::ROUTER;
 use js::jsapi::{Heap, JS_ClearPendingException, JSObject, Value as JSValue};
 use js::jsval::{JSVal, UndefinedValue};
@@ -17,7 +18,6 @@ use mime::{self, Mime};
 use net_traits::request::{
     BodyChunkRequest, BodyChunkResponse, BodySource as NetBodySource, RequestBody,
 };
-use script_traits::serializable::BlobImpl;
 use url::form_urlencoded;
 
 use crate::dom::bindings::buffer_source::create_buffer_source;
@@ -73,7 +73,7 @@ struct TransmitBodyConnectHandler {
     task_source: SendableTaskSource,
     bytes_sender: Option<IpcSender<BodyChunkResponse>>,
     control_sender: IpcSender<BodyChunkRequest>,
-    in_memory: Option<Vec<u8>>,
+    in_memory: Option<IpcSharedMemory>,
     in_memory_done: bool,
     source: BodySource,
 }
@@ -83,7 +83,7 @@ impl TransmitBodyConnectHandler {
         stream: Trusted<ReadableStream>,
         task_source: SendableTaskSource,
         control_sender: IpcSender<BodyChunkRequest>,
-        in_memory: Option<Vec<u8>>,
+        in_memory: Option<IpcSharedMemory>,
         source: BodySource,
     ) -> TransmitBodyConnectHandler {
         TransmitBodyConnectHandler {
@@ -160,7 +160,7 @@ impl TransmitBodyConnectHandler {
                 .bytes_sender
                 .as_ref()
                 .expect("No bytes sender to transmit source.")
-                .send(BodyChunkResponse::Chunk(bytes.clone()));
+                .send(BodyChunkResponse::Chunk(bytes));
             return;
         }
         warn!("Re-directs for file-based Blobs not supported yet.");
@@ -310,7 +310,11 @@ impl Callback for TransmitBodyPromiseHandler {
         // Step 5.1 and 5.2, transmit chunk.
         // Send the chunk to the body transmitter in net::http_loader::obtain_response.
         // TODO: queue a fetch task on request to process request body for request.
-        let _ = self.bytes_sender.send(BodyChunkResponse::Chunk(chunk));
+        let _ = self
+            .bytes_sender
+            .send(BodyChunkResponse::Chunk(IpcSharedMemory::from_bytes(
+                &chunk,
+            )));
     }
 }
 
@@ -539,7 +543,7 @@ impl Extractable for FormData {
         let bytes = encode_multipart_form_data(&mut self.datums(), boundary.clone(), UTF_8);
         let total_bytes = bytes.len();
         let content_type = Some(DOMString::from(format!(
-            "multipart/form-data;boundary={}",
+            "multipart/form-data; boundary={}",
             boundary
         )));
         let stream = ReadableStream::new_from_bytes(global, bytes, can_gc)?;
@@ -737,8 +741,15 @@ fn run_package_data_algorithm(
 
 /// <https://fetch.spec.whatwg.org/#ref-for-concept-body-consume-body%E2%91%A4>
 fn run_text_data_algorithm(bytes: Vec<u8>) -> Fallible<FetchedData> {
+    // This implements the Encoding standard's "decode UTF-8", which removes the
+    // BOM if present.
+    let no_bom_bytes = if bytes.starts_with(b"\xEF\xBB\xBF") {
+        &bytes[3..]
+    } else {
+        &bytes
+    };
     Ok(FetchedData::Text(
-        String::from_utf8_lossy(&bytes).into_owned(),
+        String::from_utf8_lossy(no_bom_bytes).into_owned(),
     ))
 }
 
diff --git a/components/script/build.rs b/components/script/build.rs
index d8780ec56c0..0a72a2ae064 100644
--- a/components/script/build.rs
+++ b/components/script/build.rs
@@ -3,10 +3,54 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use std::env;
+use std::path::{Path, PathBuf};
 
 fn main() {
+    // copy include! files from script_bindings's OUT_DIR, to script's OUT_DIR
+    // this is done to bypass limitation of Rust Analyzer: https://github.com/rust-lang/rust-analyzer/issues/17040
+    let script_bindings_out_dir =
+        PathBuf::from(env::var_os("DEP_SCRIPT_BINDINGS_CRATE_OUT_DIR").unwrap());
+    let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
+    // copy concrete files
+    [
+        "InterfaceTypes.rs",
+        "DomTypeHolder.rs",
+        "InterfaceObjectMap.rs",
+        "ConcreteInheritTypes.rs",
+        "UnionTypes.rs",
+        "InterfaceObjectMapPhf.rs",
+    ]
+    .iter()
+    .map(Path::new)
+    .for_each(|file| {
+        println!(
+            "cargo::rerun-if-changed={}",
+            script_bindings_out_dir.join(file).display()
+        );
+        std::fs::copy(
+            script_bindings_out_dir.join(file),
+            out_dir.join(file.file_name().unwrap()),
+        )
+        .unwrap();
+    });
+    // copy ConcreteBindings folder
+    let _ = std::fs::create_dir(out_dir.join("ConcreteBindings"));
+    let script_concrete_bindings_out_dir = script_bindings_out_dir.join("ConcreteBindings");
     println!(
-        "cargo:rustc-env=BINDINGS_OUT_DIR={}",
-        env::var("DEP_SCRIPT_BINDINGS_CRATE_OUT_DIR").unwrap(),
+        "cargo::rerun-if-changed={}",
+        script_concrete_bindings_out_dir.display()
     );
+    std::fs::read_dir(script_concrete_bindings_out_dir)
+        .unwrap()
+        .filter_map(|res| res.map(|e| e.path()).ok())
+        .filter(|path| path.is_file())
+        .for_each(|file| {
+            std::fs::copy(
+                &file,
+                out_dir
+                    .join("ConcreteBindings")
+                    .join(file.file_name().unwrap()),
+            )
+            .unwrap();
+        });
 }
diff --git a/components/script/canvas_context.rs b/components/script/canvas_context.rs
index 8bf188a5aa9..ec388e039f1 100644
--- a/components/script/canvas_context.rs
+++ b/components/script/canvas_context.rs
@@ -5,16 +5,25 @@
 //! Common interfaces for Canvas Contexts
 
 use euclid::default::Size2D;
-use ipc_channel::ipc::IpcSharedMemory;
-use script_layout_interface::{HTMLCanvasData, HTMLCanvasDataSource};
+use script_bindings::root::Dom;
+use script_layout_interface::HTMLCanvasData;
+use snapshot::Snapshot;
+use webrender_api::ImageKey;
 
 use crate::dom::bindings::codegen::UnionTypes::HTMLCanvasElementOrOffscreenCanvas;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::htmlcanvaselement::HTMLCanvasElement;
 use crate::dom::node::{Node, NodeDamage};
+#[cfg(feature = "webgpu")]
+use crate::dom::types::GPUCanvasContext;
+use crate::dom::types::{
+    CanvasRenderingContext2D, OffscreenCanvas, OffscreenCanvasRenderingContext2D,
+    WebGL2RenderingContext, WebGLRenderingContext,
+};
 
 pub(crate) trait LayoutCanvasRenderingContextHelpers {
-    fn canvas_data_source(self) -> HTMLCanvasDataSource;
+    /// `None` is rendered as transparent black (cleared canvas)
+    fn canvas_data_source(self) -> Option<ImageKey>;
 }
 
 pub(crate) trait LayoutHTMLCanvasElementHelpers {
@@ -30,11 +39,10 @@ pub(crate) trait CanvasContext {
 
     fn resize(&self);
 
-    fn get_image_data_as_shared_memory(&self) -> Option<IpcSharedMemory>;
-
-    fn get_image_data(&self) -> Option<Vec<u8>> {
-        self.get_image_data_as_shared_memory().map(|sm| sm.to_vec())
-    }
+    /// Returns none if area of canvas is zero.
+    ///
+    /// In case of other errors it returns cleared snapshot
+    fn get_image_data(&self) -> Option<Snapshot>;
 
     fn origin_is_clean(&self) -> bool {
         true
@@ -86,3 +94,184 @@ impl CanvasHelpers for HTMLCanvasElementOrOffscreenCanvas {
         }
     }
 }
+
+/// Non rooted variant of [`crate::dom::bindings::codegen::Bindings::HTMLCanvasElementBinding::RenderingContext`]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+#[derive(Clone, JSTraceable, MallocSizeOf)]
+pub(crate) enum RenderingContext {
+    Placeholder(Dom<OffscreenCanvas>),
+    Context2d(Dom<CanvasRenderingContext2D>),
+    WebGL(Dom<WebGLRenderingContext>),
+    WebGL2(Dom<WebGL2RenderingContext>),
+    #[cfg(feature = "webgpu")]
+    WebGPU(Dom<GPUCanvasContext>),
+}
+
+impl CanvasContext for RenderingContext {
+    type ID = ();
+
+    fn context_id(&self) -> Self::ID {}
+
+    fn canvas(&self) -> HTMLCanvasElementOrOffscreenCanvas {
+        match self {
+            RenderingContext::Placeholder(context) => (*context.context().unwrap()).canvas(),
+            RenderingContext::Context2d(context) => context.canvas(),
+            RenderingContext::WebGL(context) => context.canvas(),
+            RenderingContext::WebGL2(context) => context.canvas(),
+            #[cfg(feature = "webgpu")]
+            RenderingContext::WebGPU(context) => context.canvas(),
+        }
+    }
+
+    fn resize(&self) {
+        match self {
+            RenderingContext::Placeholder(offscreen_canvas) => {
+                if let Some(context) = offscreen_canvas.context() {
+                    context.resize()
+                }
+            },
+            RenderingContext::Context2d(context) => context.resize(),
+            RenderingContext::WebGL(context) => context.resize(),
+            RenderingContext::WebGL2(context) => context.resize(),
+            #[cfg(feature = "webgpu")]
+            RenderingContext::WebGPU(context) => context.resize(),
+        }
+    }
+
+    fn get_image_data(&self) -> Option<Snapshot> {
+        match self {
+            RenderingContext::Placeholder(context) => {
+                (*context.context().unwrap()).get_image_data()
+            },
+            RenderingContext::Context2d(context) => context.get_image_data(),
+            RenderingContext::WebGL(context) => context.get_image_data(),
+            RenderingContext::WebGL2(context) => context.get_image_data(),
+            #[cfg(feature = "webgpu")]
+            RenderingContext::WebGPU(context) => context.get_image_data(),
+        }
+    }
+
+    fn origin_is_clean(&self) -> bool {
+        match self {
+            RenderingContext::Placeholder(context) => {
+                (*context.context().unwrap()).origin_is_clean()
+            },
+            RenderingContext::Context2d(context) => context.origin_is_clean(),
+            RenderingContext::WebGL(context) => context.origin_is_clean(),
+            RenderingContext::WebGL2(context) => context.origin_is_clean(),
+            #[cfg(feature = "webgpu")]
+            RenderingContext::WebGPU(context) => context.origin_is_clean(),
+        }
+    }
+
+    fn size(&self) -> Size2D<u64> {
+        match self {
+            RenderingContext::Placeholder(context) => (*context.context().unwrap()).size(),
+            RenderingContext::Context2d(context) => context.size(),
+            RenderingContext::WebGL(context) => context.size(),
+            RenderingContext::WebGL2(context) => context.size(),
+            #[cfg(feature = "webgpu")]
+            RenderingContext::WebGPU(context) => context.size(),
+        }
+    }
+
+    fn mark_as_dirty(&self) {
+        match self {
+            RenderingContext::Placeholder(context) => (*context.context().unwrap()).mark_as_dirty(),
+            RenderingContext::Context2d(context) => context.mark_as_dirty(),
+            RenderingContext::WebGL(context) => context.mark_as_dirty(),
+            RenderingContext::WebGL2(context) => context.mark_as_dirty(),
+            #[cfg(feature = "webgpu")]
+            RenderingContext::WebGPU(context) => context.mark_as_dirty(),
+        }
+    }
+
+    fn update_rendering(&self) {
+        match self {
+            RenderingContext::Placeholder(context) => {
+                (*context.context().unwrap()).update_rendering()
+            },
+            RenderingContext::Context2d(context) => context.update_rendering(),
+            RenderingContext::WebGL(context) => context.update_rendering(),
+            RenderingContext::WebGL2(context) => context.update_rendering(),
+            #[cfg(feature = "webgpu")]
+            RenderingContext::WebGPU(context) => context.update_rendering(),
+        }
+    }
+
+    fn onscreen(&self) -> bool {
+        match self {
+            RenderingContext::Placeholder(context) => (*context.context().unwrap()).onscreen(),
+            RenderingContext::Context2d(context) => context.onscreen(),
+            RenderingContext::WebGL(context) => context.onscreen(),
+            RenderingContext::WebGL2(context) => context.onscreen(),
+            #[cfg(feature = "webgpu")]
+            RenderingContext::WebGPU(context) => context.onscreen(),
+        }
+    }
+}
+
+/// Non rooted variant of [`crate::dom::bindings::codegen::Bindings::OffscreenCanvasBinding::OffscreenRenderingContext`]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+#[derive(Clone, JSTraceable, MallocSizeOf)]
+pub(crate) enum OffscreenRenderingContext {
+    Context2d(Dom<OffscreenCanvasRenderingContext2D>),
+    //WebGL(Dom<WebGLRenderingContext>),
+    //WebGL2(Dom<WebGL2RenderingContext>),
+    //#[cfg(feature = "webgpu")]
+    //WebGPU(Dom<GPUCanvasContext>),
+}
+
+impl CanvasContext for OffscreenRenderingContext {
+    type ID = ();
+
+    fn context_id(&self) -> Self::ID {}
+
+    fn canvas(&self) -> HTMLCanvasElementOrOffscreenCanvas {
+        match self {
+            OffscreenRenderingContext::Context2d(context) => context.canvas(),
+        }
+    }
+
+    fn resize(&self) {
+        match self {
+            OffscreenRenderingContext::Context2d(context) => context.resize(),
+        }
+    }
+
+    fn get_image_data(&self) -> Option<Snapshot> {
+        match self {
+            OffscreenRenderingContext::Context2d(context) => context.get_image_data(),
+        }
+    }
+
+    fn origin_is_clean(&self) -> bool {
+        match self {
+            OffscreenRenderingContext::Context2d(context) => context.origin_is_clean(),
+        }
+    }
+
+    fn size(&self) -> Size2D<u64> {
+        match self {
+            OffscreenRenderingContext::Context2d(context) => context.size(),
+        }
+    }
+
+    fn mark_as_dirty(&self) {
+        match self {
+            OffscreenRenderingContext::Context2d(context) => context.mark_as_dirty(),
+        }
+    }
+
+    fn update_rendering(&self) {
+        match self {
+            OffscreenRenderingContext::Context2d(context) => context.update_rendering(),
+        }
+    }
+
+    fn onscreen(&self) -> bool {
+        match self {
+            OffscreenRenderingContext::Context2d(context) => context.onscreen(),
+        }
+    }
+}
diff --git a/components/script/canvas_state.rs b/components/script/canvas_state.rs
index b82f682b29f..dabe6a5728b 100644
--- a/components/script/canvas_state.rs
+++ b/components/script/canvas_state.rs
@@ -12,16 +12,16 @@ use canvas_traits::canvas::{
     FillRule, LineCapStyle, LineJoinStyle, LinearGradientStyle, PathSegment, RadialGradientStyle,
     RepetitionStyle, TextAlign, TextBaseline, TextMetrics as CanvasTextMetrics,
 };
+use constellation_traits::ScriptToConstellationMessage;
 use cssparser::color::clamp_unit_f32;
 use cssparser::{Parser, ParserInput};
 use euclid::default::{Point2D, Rect, Size2D, Transform2D};
 use euclid::vec2;
-use ipc_channel::ipc::{self, IpcSender, IpcSharedMemory};
+use ipc_channel::ipc::{self, IpcSender};
 use net_traits::image_cache::{ImageCache, ImageResponse};
 use net_traits::request::CorsSettings;
 use pixels::PixelFormat;
 use profile_traits::ipc as profiled_ipc;
-use script_traits::ScriptMsg;
 use servo_url::{ImmutableOrigin, ServoUrl};
 use style::color::{AbsoluteColor, ColorFlags, ColorSpace};
 use style::context::QuirksMode;
@@ -36,6 +36,7 @@ use style_traits::{CssWriter, ParsingMode};
 use url::Url;
 use webrender_api::ImageKey;
 
+use crate::canvas_context::{OffscreenRenderingContext, RenderingContext};
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::{
     CanvasDirection, CanvasFillRule, CanvasImageSource, CanvasLineCap, CanvasLineJoin,
@@ -52,10 +53,10 @@ use crate::dom::canvaspattern::CanvasPattern;
 use crate::dom::dommatrix::DOMMatrix;
 use crate::dom::element::{Element, cors_setting_for_element};
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlcanvaselement::{CanvasContext, HTMLCanvasElement};
+use crate::dom::htmlcanvaselement::HTMLCanvasElement;
 use crate::dom::imagedata::ImageData;
 use crate::dom::node::{Node, NodeTraits};
-use crate::dom::offscreencanvas::{OffscreenCanvas, OffscreenCanvasContext};
+use crate::dom::offscreencanvas::OffscreenCanvas;
 use crate::dom::paintworkletglobalscope::PaintWorkletGlobalScope;
 use crate::dom::textmetrics::TextMetrics;
 use crate::script_runtime::CanGc;
@@ -94,6 +95,8 @@ pub(crate) struct CanvasContextState {
     #[no_trace]
     line_join: LineJoinStyle,
     miter_limit: f64,
+    line_dash: Vec<f64>,
+    line_dash_offset: f64,
     #[no_trace]
     transform: Transform2D<f32>,
     shadow_offset_x: f64,
@@ -134,6 +137,8 @@ impl CanvasContextState {
             text_align: Default::default(),
             text_baseline: Default::default(),
             direction: Default::default(),
+            line_dash: Vec::new(),
+            line_dash_offset: 0.0,
         }
     }
 }
@@ -148,6 +153,8 @@ pub(crate) struct CanvasState {
     canvas_id: CanvasId,
     #[no_trace]
     image_key: ImageKey,
+    #[no_trace]
+    size: Cell<Size2D<u64>>,
     state: DomRefCell<CanvasContextState>,
     origin_clean: Cell<bool>,
     #[ignore_malloc_size_of = "Arc"]
@@ -172,8 +179,11 @@ impl CanvasState {
             profiled_ipc::channel(global.time_profiler_chan().clone()).unwrap();
         let script_to_constellation_chan = global.script_to_constellation_chan();
         debug!("Asking constellation to create new canvas thread.");
+        let size = adjust_canvas_size(size);
         script_to_constellation_chan
-            .send(ScriptMsg::CreateCanvasPaintThread(size, sender))
+            .send(ScriptToConstellationMessage::CreateCanvasPaintThread(
+                size, sender,
+            ))
             .unwrap();
         let (ipc_renderer, canvas_id, image_key) = receiver.recv().unwrap();
         debug!("Done.");
@@ -188,6 +198,7 @@ impl CanvasState {
         CanvasState {
             ipc_renderer,
             canvas_id,
+            size: Cell::new(size),
             state: DomRefCell::new(CanvasContextState::new()),
             origin_clean: Cell::new(true),
             image_cache: global.image_cache(),
@@ -215,7 +226,15 @@ impl CanvasState {
         self.canvas_id
     }
 
+    pub(crate) fn is_paintable(&self) -> bool {
+        !self.size.get().is_empty()
+    }
+
     pub(crate) fn send_canvas_2d_msg(&self, msg: Canvas2dMsg) {
+        if !self.is_paintable() {
+            return;
+        }
+
         self.ipc_renderer
             .send(CanvasMsg::Canvas2d(msg, self.get_canvas_id()))
             .unwrap()
@@ -223,6 +242,10 @@ impl CanvasState {
 
     /// Updates WR image and blocks on completion
     pub(crate) fn update_rendering(&self) {
+        if !self.is_paintable() {
+            return;
+        }
+
         let (sender, receiver) = ipc::channel().unwrap();
         self.ipc_renderer
             .send(CanvasMsg::Canvas2d(
@@ -233,16 +256,27 @@ impl CanvasState {
         receiver.recv().unwrap();
     }
 
-    // https://html.spec.whatwg.org/multipage/#concept-canvas-set-bitmap-dimensions
+    /// <https://html.spec.whatwg.org/multipage/#concept-canvas-set-bitmap-dimensions>
     pub(crate) fn set_bitmap_dimensions(&self, size: Size2D<u64>) {
         self.reset_to_initial_state();
+
+        self.size.replace(adjust_canvas_size(size));
+
         self.ipc_renderer
-            .send(CanvasMsg::Recreate(Some(size), self.get_canvas_id()))
+            .send(CanvasMsg::Recreate(
+                Some(self.size.get()),
+                self.get_canvas_id(),
+            ))
             .unwrap();
     }
 
     pub(crate) fn reset(&self) {
         self.reset_to_initial_state();
+
+        if !self.is_paintable() {
+            return;
+        }
+
         self.ipc_renderer
             .send(CanvasMsg::Recreate(None, self.get_canvas_id()))
             .unwrap();
@@ -292,7 +326,7 @@ impl CanvasState {
         &self,
         url: ServoUrl,
         cors_setting: Option<CorsSettings>,
-    ) -> Option<(IpcSharedMemory, Size2D<u32>)> {
+    ) -> Option<snapshot::Snapshot> {
         let img = match self.request_image_from_cache(url, cors_setting) {
             ImageResponse::Loaded(img, _) => img,
             ImageResponse::PlaceholderLoaded(_, _) |
@@ -302,13 +336,22 @@ impl CanvasState {
             },
         };
 
-        let image_size = Size2D::new(img.width, img.height);
-        let image_data = match img.format {
-            PixelFormat::BGRA8 => img.bytes(),
+        let size = Size2D::new(img.width, img.height);
+        let format = match img.format {
+            PixelFormat::BGRA8 => snapshot::PixelFormat::BGRA,
+            PixelFormat::RGBA8 => snapshot::PixelFormat::RGBA,
             pixel_format => unimplemented!("unsupported pixel format ({:?})", pixel_format),
         };
+        let alpha_mode = snapshot::AlphaMode::Transparent {
+            premultiplied: false,
+        };
 
-        Some((image_data, image_size))
+        Some(snapshot::Snapshot::from_shared_memory(
+            size.cast(),
+            format,
+            alpha_mode,
+            img.bytes(),
+        ))
     }
 
     fn request_image_from_cache(
@@ -332,16 +375,18 @@ impl CanvasState {
 
     pub(crate) fn get_rect(&self, canvas_size: Size2D<u64>, rect: Rect<u64>) -> Vec<u8> {
         assert!(self.origin_is_clean());
-
         assert!(Rect::from_size(canvas_size).contains_rect(&rect));
 
-        let (sender, receiver) = ipc::bytes_channel().unwrap();
+        let (sender, receiver) = ipc::channel().unwrap();
         self.send_canvas_2d_msg(Canvas2dMsg::GetImageData(rect, canvas_size, sender));
-        let mut pixels = receiver.recv().unwrap().to_vec();
-
-        pixels::unmultiply_inplace::<true>(&mut pixels);
-
-        pixels
+        let mut snapshot = receiver.recv().unwrap().to_owned();
+        snapshot.transform(
+            snapshot::AlphaMode::Transparent {
+                premultiplied: false,
+            },
+            snapshot::PixelFormat::RGBA,
+        );
+        snapshot.to_vec()
     }
 
     ///
@@ -380,18 +425,22 @@ impl CanvasState {
         dw: Option<f64>,
         dh: Option<f64>,
     ) -> ErrorResult {
+        if !self.is_paintable() {
+            return Ok(());
+        }
+
         let result = match image {
             CanvasImageSource::HTMLCanvasElement(ref canvas) => {
-                // https://html.spec.whatwg.org/multipage/#check-the-usability-of-the-image-argument
-                if !canvas.is_valid() {
+                // <https://html.spec.whatwg.org/multipage/#check-the-usability-of-the-image-argument>
+                if canvas.get_size().is_empty() {
                     return Err(Error::InvalidState);
                 }
 
                 self.draw_html_canvas_element(canvas, htmlcanvas, sx, sy, sw, sh, dx, dy, dw, dh)
             },
             CanvasImageSource::OffscreenCanvas(ref canvas) => {
-                // https://html.spec.whatwg.org/multipage/#check-the-usability-of-the-image-argument
-                if !canvas.is_valid() {
+                // <https://html.spec.whatwg.org/multipage/#check-the-usability-of-the-image-argument>
+                if canvas.get_size().is_empty() {
                     return Err(Error::InvalidState);
                 }
 
@@ -474,7 +523,7 @@ impl CanvasState {
 
         if let Some(context) = canvas.context() {
             match *context {
-                OffscreenCanvasContext::OffscreenContext2d(ref context) => {
+                OffscreenRenderingContext::Context2d(ref context) => {
                     context.send_canvas_2d_msg(Canvas2dMsg::DrawImageInOther(
                         self.get_canvas_id(),
                         image_size,
@@ -510,11 +559,6 @@ impl CanvasState {
         dw: Option<f64>,
         dh: Option<f64>,
     ) -> ErrorResult {
-        // 1. Check the usability of the image argument
-        if !canvas.is_valid() {
-            return Err(Error::InvalidState);
-        }
-
         let canvas_size = canvas.get_size();
         let dw = dw.unwrap_or(canvas_size.width as f64);
         let dh = dh.unwrap_or(canvas_size.height as f64);
@@ -534,7 +578,7 @@ impl CanvasState {
 
         if let Some(context) = canvas.context() {
             match *context {
-                CanvasContext::Context2d(ref context) => {
+                RenderingContext::Context2d(ref context) => {
                     context.send_canvas_2d_msg(Canvas2dMsg::DrawImageInOther(
                         self.get_canvas_id(),
                         image_size,
@@ -543,12 +587,12 @@ impl CanvasState {
                         smoothing_enabled,
                     ));
                 },
-                CanvasContext::Placeholder(ref context) => {
+                RenderingContext::Placeholder(ref context) => {
                     let Some(context) = context.context() else {
                         return Err(Error::InvalidState);
                     };
                     match *context {
-                        OffscreenCanvasContext::OffscreenContext2d(ref context) => context
+                        OffscreenRenderingContext::Context2d(ref context) => context
                             .send_canvas_2d_msg(Canvas2dMsg::DrawImageInOther(
                                 self.get_canvas_id(),
                                 image_size,
@@ -588,10 +632,10 @@ impl CanvasState {
         dh: Option<f64>,
     ) -> ErrorResult {
         debug!("Fetching image {}.", url);
-        let (image_data, image_size) = self
+        let snapshot = self
             .fetch_image_data(url, cors_setting)
             .ok_or(Error::InvalidState)?;
-        let image_size = image_size.to_f64();
+        let image_size = snapshot.size().to_f64();
 
         let dw = dw.unwrap_or(image_size.width);
         let dh = dh.unwrap_or(image_size.height);
@@ -608,8 +652,7 @@ impl CanvasState {
 
         let smoothing_enabled = self.state.borrow().image_smoothing_enabled;
         self.send_canvas_2d_msg(Canvas2dMsg::DrawImage(
-            image_data,
-            image_size,
+            snapshot.as_ipc(),
             dest_rect,
             source_rect,
             smoothing_enabled,
@@ -923,7 +966,7 @@ impl CanvasState {
         mut repetition: DOMString,
         can_gc: CanGc,
     ) -> Fallible<Option<DomRoot<CanvasPattern>>> {
-        let (image_data, image_size) = match image {
+        let snapshot = match image {
             CanvasImageSource::HTMLImageElement(ref image) => {
                 // https://html.spec.whatwg.org/multipage/#check-the-usability-of-the-image-argument
                 if !image.is_usable()? {
@@ -935,27 +978,17 @@ impl CanvasState {
                     .and_then(|url| {
                         self.fetch_image_data(url, cors_setting_for_element(image.upcast()))
                     })
-                    .map(|data| (data.0.to_vec(), data.1))
                     .ok_or(Error::InvalidState)?
             },
             CanvasImageSource::HTMLCanvasElement(ref canvas) => {
-                let (data, size) = canvas.fetch_all_data().ok_or(Error::InvalidState)?;
-                let data = data
-                    .map(|data| data.to_vec())
-                    .unwrap_or_else(|| vec![0; size.area() as usize * 4]);
-                (data, size)
+                canvas.get_image_data().ok_or(Error::InvalidState)?
             },
             CanvasImageSource::OffscreenCanvas(ref canvas) => {
-                let (data, size) = canvas.fetch_all_data().ok_or(Error::InvalidState)?;
-                let data = data
-                    .map(|data| data.to_vec())
-                    .unwrap_or_else(|| vec![0; size.area() as usize * 4]);
-                (data, size)
+                canvas.get_image_data().ok_or(Error::InvalidState)?
             },
             CanvasImageSource::CSSStyleValue(ref value) => value
                 .get_url(self.base_url.clone())
                 .and_then(|url| self.fetch_image_data(url, None))
-                .map(|data| (data.0.to_vec(), data.1))
                 .ok_or(Error::InvalidState)?,
         };
 
@@ -964,10 +997,11 @@ impl CanvasState {
         }
 
         if let Ok(rep) = RepetitionStyle::from_str(&repetition) {
+            let size = snapshot.size();
             Ok(Some(CanvasPattern::new(
                 global,
-                image_data,
-                image_size,
+                snapshot.to_vec(),
+                size.cast(),
                 rep,
                 self.is_origin_clean(image),
                 can_gc,
@@ -1286,6 +1320,59 @@ impl CanvasState {
         self.send_canvas_2d_msg(Canvas2dMsg::SetMiterLimit(limit as f32))
     }
 
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-getlinedash>
+    pub(crate) fn line_dash(&self) -> Vec<f64> {
+        // > return a sequence whose values are the values of
+        // > the object's dash list, in the same order.
+        self.state.borrow().line_dash.clone()
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-setlinedash>
+    pub(crate) fn set_line_dash(&self, segments: Vec<f64>) {
+        // > If any value in segments is not finite (e.g. an Infinity or a NaN value),
+        // > or if any value is negative (less than zero), then return (without throwing
+        // > an exception; user agents could show a message on a developer console,
+        // > though, as that would be helpful for debugging).
+        if segments
+            .iter()
+            .any(|segment| !segment.is_finite() || *segment < 0.0)
+        {
+            return;
+        }
+
+        // > If the number of elements in segments is odd, then let segments
+        // > be the concatenation of two copies of segments.
+        let mut line_dash: Vec<_> = segments.clone();
+        if segments.len() & 1 == 1 {
+            line_dash.extend(line_dash.clone());
+        }
+
+        // > Let the object's dash list be segments.
+        self.state.borrow_mut().line_dash = line_dash.clone();
+        self.send_canvas_2d_msg(Canvas2dMsg::SetLineDash(
+            line_dash.into_iter().map(|dash| dash as f32).collect(),
+        ))
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-linedashoffset>
+    pub(crate) fn line_dash_offset(&self) -> f64 {
+        // > On getting, it must return the current value.
+        self.state.borrow().line_dash_offset
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-linedashoffset?
+    pub(crate) fn set_line_dash_offset(&self, offset: f64) {
+        // > On setting, infinite and NaN values must be ignored,
+        // > leaving the value unchanged;
+        if !offset.is_finite() {
+            return;
+        }
+
+        // > other values must change the current value to the new value.
+        self.state.borrow_mut().line_dash_offset = offset;
+        self.send_canvas_2d_msg(Canvas2dMsg::SetLineDashOffset(offset as f32));
+    }
+
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata
     pub(crate) fn create_image_data(
         &self,
@@ -1342,13 +1429,13 @@ impl CanvasState {
             },
         };
 
-        ImageData::new(
-            global,
-            size.width,
-            size.height,
-            Some(self.get_rect(canvas_size, read_rect)),
-            can_gc,
-        )
+        let data = if self.is_paintable() {
+            Some(self.get_rect(canvas_size, read_rect))
+        } else {
+            None
+        };
+
+        ImageData::new(global, size.width, size.height, data, can_gc)
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata
@@ -1384,6 +1471,10 @@ impl CanvasState {
         dirty_width: i32,
         dirty_height: i32,
     ) {
+        if !self.is_paintable() {
+            return;
+        }
+
         // FIXME(nox): There are many arithmetic operations here that can
         // overflow or underflow, this should probably be audited.
 
@@ -1952,3 +2043,23 @@ where
         style.font_family.to_css_string()
     )
 }
+
+fn adjust_canvas_size(size: Size2D<u64>) -> Size2D<u64> {
+    // Firefox limits width/height to 32767 pixels and Chromium to 65535 pixels,
+    // but slows down dramatically before it reaches that limit.
+    // We limit by area instead, giving us larger maximum dimensions,
+    // in exchange for a smaller maximum canvas size.
+    const MAX_CANVAS_AREA: u64 = 32768 * 8192;
+    // Max width/height to 65535 in CSS pixels.
+    const MAX_CANVAS_SIZE: u64 = 65535;
+
+    if !size.is_empty() &&
+        size.greater_than(Size2D::new(MAX_CANVAS_SIZE, MAX_CANVAS_SIZE))
+            .none() &&
+        size.area() < MAX_CANVAS_AREA
+    {
+        size
+    } else {
+        Size2D::zero()
+    }
+}
diff --git a/components/script/clipboard_provider.rs b/components/script/clipboard_provider.rs
index c734d5addba..4c0f5467be6 100644
--- a/components/script/clipboard_provider.rs
+++ b/components/script/clipboard_provider.rs
@@ -3,9 +3,9 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use base::id::WebViewId;
+use constellation_traits::{ScriptToConstellationChan, ScriptToConstellationMessage};
 use embedder_traits::EmbedderMsg;
 use ipc_channel::ipc::channel;
-use script_traits::{ScriptMsg, ScriptToConstellationChan};
 
 /// A trait which abstracts access to the embedder's clipboard in order to allow unit
 /// testing clipboard-dependent parts of `script`.
@@ -25,19 +25,17 @@ impl ClipboardProvider for EmbedderClipboardProvider {
     fn get_text(&mut self) -> Result<String, String> {
         let (tx, rx) = channel().unwrap();
         self.constellation_sender
-            .send(ScriptMsg::ForwardToEmbedder(EmbedderMsg::GetClipboardText(
-                self.webview_id,
-                tx,
-            )))
+            .send(ScriptToConstellationMessage::ForwardToEmbedder(
+                EmbedderMsg::GetClipboardText(self.webview_id, tx),
+            ))
             .unwrap();
         rx.recv().unwrap()
     }
     fn set_text(&mut self, s: String) {
         self.constellation_sender
-            .send(ScriptMsg::ForwardToEmbedder(EmbedderMsg::SetClipboardText(
-                self.webview_id,
-                s,
-            )))
+            .send(ScriptToConstellationMessage::ForwardToEmbedder(
+                EmbedderMsg::SetClipboardText(self.webview_id, s),
+            ))
             .unwrap();
     }
 }
diff --git a/components/script/devtools.rs b/components/script/devtools.rs
index d0d2a183f03..93212887dc8 100644
--- a/components/script/devtools.rs
+++ b/components/script/devtools.rs
@@ -102,10 +102,11 @@ pub(crate) fn handle_get_root_node(
     documents: &DocumentCollection,
     pipeline: PipelineId,
     reply: IpcSender<Option<NodeInfo>>,
+    can_gc: CanGc,
 ) {
     let info = documents
         .find_document(pipeline)
-        .map(|document| document.upcast::<Node>().summarize());
+        .map(|document| document.upcast::<Node>().summarize(can_gc));
     reply.send(info).unwrap();
 }
 
@@ -113,11 +114,12 @@ pub(crate) fn handle_get_document_element(
     documents: &DocumentCollection,
     pipeline: PipelineId,
     reply: IpcSender<Option<NodeInfo>>,
+    can_gc: CanGc,
 ) {
     let info = documents
         .find_document(pipeline)
         .and_then(|document| document.GetDocumentElement())
-        .map(|element| element.upcast::<Node>().summarize());
+        .map(|element| element.upcast::<Node>().summarize(can_gc));
     reply.send(info).unwrap();
 }
 
@@ -139,6 +141,7 @@ pub(crate) fn handle_get_children(
     pipeline: PipelineId,
     node_id: String,
     reply: IpcSender<Option<Vec<NodeInfo>>>,
+    can_gc: CanGc,
 ) {
     match find_node_by_unique_id(documents, pipeline, &node_id) {
         None => reply.send(None).unwrap(),
@@ -166,7 +169,7 @@ pub(crate) fn handle_get_children(
                 if !shadow_root.is_user_agent_widget() ||
                     pref!(inspector_show_servo_internal_shadow_roots)
                 {
-                    children.push(shadow_root.upcast::<Node>().summarize());
+                    children.push(shadow_root.upcast::<Node>().summarize(can_gc));
                 }
             }
             let children_iter = parent.children().enumerate().filter_map(|(i, child)| {
@@ -175,7 +178,7 @@ pub(crate) fn handle_get_children(
                 let prev_inline = i > 0 && inline[i - 1];
                 let next_inline = i < inline.len() - 1 && inline[i + 1];
 
-                let info = child.summarize();
+                let info = child.summarize(can_gc);
                 if !is_whitespace(&info) {
                     return Some(info);
                 }
@@ -206,7 +209,7 @@ pub(crate) fn handle_get_attribute_style(
         reply.send(None).unwrap();
         return;
     };
-    let style = elem.Style();
+    let style = elem.Style(can_gc);
 
     let msg = (0..style.Length())
         .map(|i| {
@@ -240,7 +243,7 @@ pub(crate) fn handle_get_stylesheet_style(
         let owner = node.stylesheet_list_owner();
 
         let stylesheet = owner.stylesheet_at(stylesheet)?;
-        let list = stylesheet.GetCssRules().ok()?;
+        let list = stylesheet.GetCssRules(can_gc).ok()?;
 
         let styles = (0..list.Length())
             .filter_map(move |i| {
@@ -249,7 +252,7 @@ pub(crate) fn handle_get_stylesheet_style(
                 if *selector != *style.SelectorText() {
                     return None;
                 };
-                Some(style.Style())
+                Some(style.Style(can_gc))
             })
             .flat_map(|style| {
                 (0..style.Length()).map(move |i| {
@@ -287,7 +290,7 @@ pub(crate) fn handle_get_selectors(
         let rules = (0..owner.stylesheet_count())
             .filter_map(|i| {
                 let stylesheet = owner.stylesheet_at(i)?;
-                let list = stylesheet.GetCssRules().ok()?;
+                let list = stylesheet.GetCssRules(can_gc).ok()?;
                 let elem = node.downcast::<Element>()?;
 
                 Some((0..list.Length()).filter_map(move |j| {
@@ -437,7 +440,7 @@ pub(crate) fn handle_modify_attribute(
                     can_gc,
                 );
             },
-            None => elem.RemoveAttribute(DOMString::from(modification.attribute_name)),
+            None => elem.RemoveAttribute(DOMString::from(modification.attribute_name), can_gc),
         }
     }
 }
@@ -464,7 +467,7 @@ pub(crate) fn handle_modify_rule(
     let elem = node
         .downcast::<HTMLElement>()
         .expect("This should be an HTMLElement");
-    let style = elem.Style();
+    let style = elem.Style(can_gc);
 
     for modification in modifications {
         let _ = style.SetProperty(
@@ -535,3 +538,21 @@ pub(crate) fn handle_get_css_database(reply: IpcSender<HashMap<String, CssDataba
         .collect();
     let _ = reply.send(database);
 }
+
+pub(crate) fn handle_highlight_dom_node(
+    documents: &DocumentCollection,
+    id: PipelineId,
+    node_id: Option<String>,
+) {
+    let node = node_id.and_then(|node_id| {
+        let node = find_node_by_unique_id(documents, id, &node_id);
+        if node.is_none() {
+            log::warn!("Node id {node_id} for pipeline id {id} is not found",);
+        }
+        node
+    });
+
+    if let Some(window) = documents.find_window(id) {
+        window.Document().highlight_dom_node(node.as_deref());
+    }
+}
diff --git a/components/script/docs/JS-Servos-only-GC.md b/components/script/docs/JS-Servos-only-GC.md
index 9e2a8ea6d09..0666df14f45 100644
--- a/components/script/docs/JS-Servos-only-GC.md
+++ b/components/script/docs/JS-Servos-only-GC.md
@@ -334,7 +334,7 @@ the usual [warnings infrastructure][warnings], we can use the `allow` attribute
 in places where it's okay to use `Dom<T>`, like DOM struct definitions and the
 implementation of `Dom<T>` itself.
 
-[js-lint]: https://doc.servo.org/script_plugins/struct.UnrootedPass.html
+[js-lint]: https://github.com/servo/servo/blob/main/support/crown/src/unrooted_must_root.rs
 [stack]: https://en.wikipedia.org/wiki/Stack-based_memory_allocation
 [warnings]: https://doc.rust-lang.org/book/compiler-plugins.html#lint-plugins
 
diff --git a/components/script/document_loader.rs b/components/script/document_loader.rs
index 422652272b6..33f51cd8517 100644
--- a/components/script/document_loader.rs
+++ b/components/script/document_loader.rs
@@ -50,10 +50,18 @@ impl LoadBlocker {
 
     /// Remove this load from the associated document's list of blocking loads.
     pub(crate) fn terminate(blocker: &DomRefCell<Option<LoadBlocker>>, can_gc: CanGc) {
-        if let Some(this) = blocker.borrow().as_ref() {
-            let load_data = this.load.clone().unwrap();
-            this.doc.finish_load(load_data, can_gc);
+        let Some(load) = blocker
+            .borrow_mut()
+            .as_mut()
+            .and_then(|blocker| blocker.load.take())
+        else {
+            return;
+        };
+
+        if let Some(blocker) = blocker.borrow().as_ref() {
+            blocker.doc.finish_load(load, can_gc);
         }
+
         *blocker.borrow_mut() = None;
     }
 }
diff --git a/components/script/dom/abstractworker.rs b/components/script/dom/abstractworker.rs
index 5f7131eb0a0..8a353531145 100644
--- a/components/script/dom/abstractworker.rs
+++ b/components/script/dom/abstractworker.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use script_traits::StructuredSerializedData;
+use constellation_traits::StructuredSerializedData;
 use servo_url::ImmutableOrigin;
 
 use crate::dom::bindings::refcounted::Trusted;
diff --git a/components/script/dom/activation.rs b/components/script/dom/activation.rs
index 25f67397cc9..5d9a63f45ef 100644
--- a/components/script/dom/activation.rs
+++ b/components/script/dom/activation.rs
@@ -16,12 +16,17 @@ pub(crate) trait Activatable {
     fn is_instance_activatable(&self) -> bool;
 
     // https://dom.spec.whatwg.org/#eventtarget-legacy-pre-activation-behavior
-    fn legacy_pre_activation_behavior(&self) -> Option<InputActivationState> {
+    fn legacy_pre_activation_behavior(&self, _can_gc: CanGc) -> Option<InputActivationState> {
         None
     }
 
     // https://dom.spec.whatwg.org/#eventtarget-legacy-canceled-activation-behavior
-    fn legacy_canceled_activation_behavior(&self, _state_before: Option<InputActivationState>) {}
+    fn legacy_canceled_activation_behavior(
+        &self,
+        _state_before: Option<InputActivationState>,
+        _can_gc: CanGc,
+    ) {
+    }
 
     // https://dom.spec.whatwg.org/#eventtarget-activation-behavior
     // event and target are used only by HTMLAnchorElement, in the case
diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs
index 428f02cece3..9f1520bd085 100644
--- a/components/script/dom/attr.rs
+++ b/components/script/dom/attr.rs
@@ -8,7 +8,7 @@ use std::mem;
 
 use devtools_traits::AttrInfo;
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Namespace, Prefix, namespace_url, ns};
+use html5ever::{LocalName, Namespace, Prefix, local_name, ns};
 use style::attr::{AttrIdentifier, AttrValue};
 use style::values::GenericAtomIdent;
 use stylo_atoms::Atom;
@@ -112,10 +112,10 @@ impl AttrMethods<crate::DomTypeHolder> for Attr {
     }
 
     // https://dom.spec.whatwg.org/#dom-attr-value
-    fn SetValue(&self, value: DOMString) {
+    fn SetValue(&self, value: DOMString, can_gc: CanGc) {
         if let Some(owner) = self.owner() {
             let value = owner.parse_attribute(self.namespace(), self.local_name(), value);
-            self.set_value(value, &owner);
+            self.set_value(value, &owner, can_gc);
         } else {
             *self.value.borrow_mut() = AttrValue::String(value.into());
         }
@@ -153,7 +153,7 @@ impl AttrMethods<crate::DomTypeHolder> for Attr {
 }
 
 impl Attr {
-    pub(crate) fn set_value(&self, mut value: AttrValue, owner: &Element) {
+    pub(crate) fn set_value(&self, mut value: AttrValue, owner: &Element, can_gc: CanGc) {
         let name = self.local_name().clone();
         let namespace = self.namespace().clone();
         let old_value = DOMString::from(&**self.value());
@@ -179,9 +179,12 @@ impl Attr {
         assert_eq!(Some(owner), self.owner().as_deref());
         owner.will_mutate_attr(self);
         self.swap_value(&mut value);
-        if *self.namespace() == ns!() {
-            vtable_for(owner.upcast())
-                .attribute_mutated(self, AttributeMutation::Set(Some(&value)));
+        if is_relevant_attribute(self.namespace(), self.local_name()) {
+            vtable_for(owner.upcast()).attribute_mutated(
+                self,
+                AttributeMutation::Set(Some(&value)),
+                can_gc,
+            );
         }
     }
 
@@ -280,3 +283,9 @@ impl<'dom> AttrHelpersForLayout<'dom> for LayoutDom<'dom, Attr> {
         &self.unsafe_get().identifier.namespace.0
     }
 }
+
+/// A helper function to check if attribute is relevant.
+pub(crate) fn is_relevant_attribute(namespace: &Namespace, local_name: &LocalName) -> bool {
+    // <https://svgwg.org/svg2-draft/linking.html#XLinkHrefAttribute>
+    namespace == &ns!() || (namespace == &ns!(xlink) && local_name == &local_name!("href"))
+}
diff --git a/components/script/dom/audionode.rs b/components/script/dom/audionode.rs
index 422b517bc94..4e572dda437 100644
--- a/components/script/dom/audionode.rs
+++ b/components/script/dom/audionode.rs
@@ -5,6 +5,9 @@
 use std::cell::Cell;
 
 use dom_struct::dom_struct;
+use script_bindings::codegen::InheritTypes::{
+    AudioNodeTypeId, AudioScheduledSourceNodeTypeId, EventTargetTypeId,
+};
 use servo_media::audio::graph::NodeId;
 use servo_media::audio::node::{
     AudioNodeInit, AudioNodeMessage, ChannelCountMode as ServoMediaChannelCountMode, ChannelInfo,
@@ -17,9 +20,6 @@ use crate::dom::baseaudiocontext::BaseAudioContext;
 use crate::dom::bindings::codegen::Bindings::AudioNodeBinding::{
     AudioNodeMethods, AudioNodeOptions, ChannelCountMode, ChannelInterpretation,
 };
-use crate::dom::bindings::codegen::InheritTypes::{
-    AudioNodeTypeId, AudioScheduledSourceNodeTypeId, EventTargetTypeId,
-};
 use crate::dom::bindings::error::{Error, ErrorResult, Fallible};
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::{Dom, DomRoot};
diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs
index 41633683824..2ef7bce981b 100644
--- a/components/script/dom/baseaudiocontext.rs
+++ b/components/script/dom/baseaudiocontext.rs
@@ -574,7 +574,7 @@ impl BaseAudioContextMethods<crate::DomTypeHolder> for BaseAudioContext {
                 .decode_audio_data(audio_data, callbacks);
         } else {
             // Step 3.
-            promise.reject_error(Error::DataClone, can_gc);
+            promise.reject_error(Error::DataClone(None), can_gc);
             return promise;
         }
 
diff --git a/components/script/dom/bindings/buffer_source.rs b/components/script/dom/bindings/buffer_source.rs
index 054711ef874..14a71532e9d 100644
--- a/components/script/dom/bindings/buffer_source.rs
+++ b/components/script/dom/bindings/buffer_source.rs
@@ -34,9 +34,11 @@ use js::rust::{
     CustomAutoRooterGuard, Handle, MutableHandleObject,
     MutableHandleValue as SafeMutableHandleValue,
 };
+#[cfg(feature = "webgpu")]
+use js::typedarray::{ArrayBuffer, HeapArrayBuffer};
 use js::typedarray::{
-    ArrayBuffer, ArrayBufferU8, ArrayBufferView, ArrayBufferViewU8, CreateWith, HeapArrayBuffer,
-    TypedArray, TypedArrayElement, TypedArrayElementCreator,
+    ArrayBufferU8, ArrayBufferViewU8, CreateWith, TypedArray, TypedArrayElement,
+    TypedArrayElementCreator,
 };
 
 use crate::dom::bindings::error::{Error, Fallible};
@@ -61,36 +63,25 @@ pub(crate) enum BufferSource {
     ArrayBuffer(Box<Heap<*mut JSObject>>),
 }
 
-pub(crate) fn new_initialized_heap_buffer_source<T>(
-    init: HeapTypedArrayInit,
+pub(crate) fn create_heap_buffer_source_with_length<T>(
+    cx: JSContext,
+    len: u32,
     can_gc: CanGc,
-) -> Result<HeapBufferSource<T>, ()>
+) -> Fallible<HeapBufferSource<T>>
 where
     T: TypedArrayElement + TypedArrayElementCreator,
     T::Element: Clone + Copy,
 {
-    let heap_buffer_source = match init {
-        HeapTypedArrayInit::Buffer(buffer_source) => HeapBufferSource {
-            buffer_source,
-            phantom: PhantomData,
-        },
-        HeapTypedArrayInit::Info { len, cx } => {
-            rooted!(in (*cx) let mut array = ptr::null_mut::<JSObject>());
-            let typed_array_result =
-                create_buffer_source_with_length::<T>(cx, len as usize, array.handle_mut(), can_gc);
-            if typed_array_result.is_err() {
-                return Err(());
-            }
+    rooted!(in (*cx) let mut array = ptr::null_mut::<JSObject>());
+    let typed_array_result =
+        create_buffer_source_with_length::<T>(cx, len as usize, array.handle_mut(), can_gc);
+    if typed_array_result.is_err() {
+        return Err(Error::JSFailed);
+    }
 
-            HeapBufferSource::<T>::new(BufferSource::ArrayBufferView(Heap::boxed(*array.handle())))
-        },
-    };
-    Ok(heap_buffer_source)
-}
-
-pub(crate) enum HeapTypedArrayInit {
-    Buffer(BufferSource),
-    Info { len: u32, cx: JSContext },
+    Ok(HeapBufferSource::<T>::new(BufferSource::ArrayBufferView(
+        Heap::boxed(*array.handle()),
+    )))
 }
 
 pub(crate) struct HeapBufferSource<T> {
@@ -129,11 +120,11 @@ where
     }
 
     pub(crate) fn from_view(
-        chunk: CustomAutoRooterGuard<ArrayBufferView>,
-    ) -> HeapBufferSource<ArrayBufferViewU8> {
-        HeapBufferSource::<ArrayBufferViewU8>::new(BufferSource::ArrayBufferView(Heap::boxed(
-            unsafe { *chunk.underlying_object() },
-        )))
+        chunk: CustomAutoRooterGuard<TypedArray<T, *mut JSObject>>,
+    ) -> HeapBufferSource<T> {
+        HeapBufferSource::<T>::new(BufferSource::ArrayBufferView(Heap::boxed(unsafe {
+            *chunk.underlying_object()
+        })))
     }
 
     pub(crate) fn default() -> Self {
diff --git a/components/script/dom/bindings/callback.rs b/components/script/dom/bindings/callback.rs
deleted file mode 100644
index b5e32dc97a5..00000000000
--- a/components/script/dom/bindings/callback.rs
+++ /dev/null
@@ -1,289 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-//! Base classes to work with IDL callbacks.
-
-use std::default::Default;
-use std::ffi::CString;
-use std::mem::drop;
-use std::rc::Rc;
-
-use js::jsapi::{
-    AddRawValueRoot, EnterRealm, Heap, IsCallable, JSObject, LeaveRealm, Realm, RemoveRawValueRoot,
-};
-use js::jsval::{JSVal, ObjectValue, UndefinedValue};
-use js::rust::wrappers::{JS_GetProperty, JS_WrapObject};
-use js::rust::{MutableHandleValue, Runtime};
-
-use crate::DomTypes;
-use crate::dom::bindings::codegen::Bindings::WindowBinding::Window_Binding::WindowMethods;
-use crate::dom::bindings::error::{Error, Fallible, report_pending_exception};
-use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::root::{Dom, DomRoot};
-use crate::dom::bindings::settings_stack::{GenericAutoEntryScript, GenericAutoIncumbentScript};
-use crate::dom::bindings::utils::AsCCharPtrPtr;
-use crate::dom::document::DocumentHelpers;
-use crate::dom::globalscope::GlobalScopeHelpers;
-use crate::realms::{InRealm, enter_realm};
-use crate::script_runtime::{CanGc, JSContext};
-
-/// The exception handling used for a call.
-#[derive(Clone, Copy, PartialEq)]
-pub(crate) enum ExceptionHandling {
-    /// Report any exception and don't throw it to the caller code.
-    Report,
-    /// Throw any exception to the caller code.
-    Rethrow,
-}
-
-/// A common base class for representing IDL callback function and
-/// callback interface types.
-#[derive(JSTraceable)]
-#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
-pub(crate) struct CallbackObject<D: DomTypes> {
-    /// The underlying `JSObject`.
-    callback: Heap<*mut JSObject>,
-    permanent_js_root: Heap<JSVal>,
-
-    /// The ["callback context"], that is, the global to use as incumbent
-    /// global when calling the callback.
-    ///
-    /// Looking at the WebIDL standard, it appears as though there would always
-    /// be a value here, but [sometimes] callback functions are created by
-    /// hand-waving without defining the value of the callback context, and
-    /// without any JavaScript code on the stack to grab an incumbent global
-    /// from.
-    ///
-    /// ["callback context"]: https://heycam.github.io/webidl/#dfn-callback-context
-    /// [sometimes]: https://github.com/whatwg/html/issues/2248
-    incumbent: Option<Dom<D::GlobalScope>>,
-}
-
-impl<D: DomTypes> CallbackObject<D> {
-    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
-    // These are used by the bindings and do not need `default()` functions.
-    #[allow(clippy::new_without_default)]
-    fn new() -> Self {
-        Self {
-            callback: Heap::default(),
-            permanent_js_root: Heap::default(),
-            incumbent: D::GlobalScope::incumbent().map(|i| Dom::from_ref(&*i)),
-        }
-    }
-
-    pub(crate) fn get(&self) -> *mut JSObject {
-        self.callback.get()
-    }
-
-    #[allow(unsafe_code)]
-    unsafe fn init(&mut self, cx: JSContext, callback: *mut JSObject) {
-        self.callback.set(callback);
-        self.permanent_js_root.set(ObjectValue(callback));
-        assert!(AddRawValueRoot(
-            *cx,
-            self.permanent_js_root.get_unsafe(),
-            b"CallbackObject::root\n".as_c_char_ptr()
-        ));
-    }
-}
-
-impl<D: DomTypes> Drop for CallbackObject<D> {
-    #[allow(unsafe_code)]
-    fn drop(&mut self) {
-        unsafe {
-            if let Some(cx) = Runtime::get() {
-                RemoveRawValueRoot(cx.as_ptr(), self.permanent_js_root.get_unsafe());
-            }
-        }
-    }
-}
-
-impl<D: DomTypes> PartialEq for CallbackObject<D> {
-    fn eq(&self, other: &CallbackObject<D>) -> bool {
-        self.callback.get() == other.callback.get()
-    }
-}
-
-/// A trait to be implemented by concrete IDL callback function and
-/// callback interface types.
-pub(crate) trait CallbackContainer<D: DomTypes> {
-    /// Create a new CallbackContainer object for the given `JSObject`.
-    unsafe fn new(cx: JSContext, callback: *mut JSObject) -> Rc<Self>;
-    /// Returns the underlying `CallbackObject`.
-    fn callback_holder(&self) -> &CallbackObject<D>;
-    /// Returns the underlying `JSObject`.
-    fn callback(&self) -> *mut JSObject {
-        self.callback_holder().get()
-    }
-    /// Returns the ["callback context"], that is, the global to use as
-    /// incumbent global when calling the callback.
-    ///
-    /// ["callback context"]: https://heycam.github.io/webidl/#dfn-callback-context
-    fn incumbent(&self) -> Option<&D::GlobalScope> {
-        self.callback_holder().incumbent.as_deref()
-    }
-}
-
-/// A common base class for representing IDL callback function types.
-#[derive(JSTraceable, PartialEq)]
-#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
-pub(crate) struct CallbackFunction<D: DomTypes> {
-    object: CallbackObject<D>,
-}
-
-impl<D: DomTypes> CallbackFunction<D> {
-    /// Create a new `CallbackFunction` for this object.
-    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
-    // These are used by the bindings and do not need `default()` functions.
-    #[allow(clippy::new_without_default)]
-    pub(crate) fn new() -> Self {
-        Self {
-            object: CallbackObject::new(),
-        }
-    }
-
-    /// Returns the underlying `CallbackObject`.
-    pub(crate) fn callback_holder(&self) -> &CallbackObject<D> {
-        &self.object
-    }
-
-    /// Initialize the callback function with a value.
-    /// Should be called once this object is done moving.
-    pub(crate) unsafe fn init(&mut self, cx: JSContext, callback: *mut JSObject) {
-        self.object.init(cx, callback);
-    }
-}
-
-/// A common base class for representing IDL callback interface types.
-#[derive(JSTraceable, PartialEq)]
-#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
-pub(crate) struct CallbackInterface<D: DomTypes> {
-    object: CallbackObject<D>,
-}
-
-impl<D: DomTypes> CallbackInterface<D> {
-    /// Create a new CallbackInterface object for the given `JSObject`.
-    // These are used by the bindings and do not need `default()` functions.
-    #[allow(clippy::new_without_default)]
-    pub(crate) fn new() -> Self {
-        Self {
-            object: CallbackObject::new(),
-        }
-    }
-
-    /// Returns the underlying `CallbackObject`.
-    pub(crate) fn callback_holder(&self) -> &CallbackObject<D> {
-        &self.object
-    }
-
-    /// Initialize the callback function with a value.
-    /// Should be called once this object is done moving.
-    pub(crate) unsafe fn init(&mut self, cx: JSContext, callback: *mut JSObject) {
-        self.object.init(cx, callback);
-    }
-
-    /// Returns the property with the given `name`, if it is a callable object,
-    /// or an error otherwise.
-    pub(crate) fn get_callable_property(&self, cx: JSContext, name: &str) -> Fallible<JSVal> {
-        rooted!(in(*cx) let mut callable = UndefinedValue());
-        rooted!(in(*cx) let obj = self.callback_holder().get());
-        unsafe {
-            let c_name = CString::new(name).unwrap();
-            if !JS_GetProperty(*cx, obj.handle(), c_name.as_ptr(), callable.handle_mut()) {
-                return Err(Error::JSFailed);
-            }
-
-            if !callable.is_object() || !IsCallable(callable.to_object()) {
-                return Err(Error::Type(format!(
-                    "The value of the {} property is not callable",
-                    name
-                )));
-            }
-        }
-        Ok(callable.get())
-    }
-}
-
-pub(crate) use script_bindings::callback::ThisReflector;
-
-/// Wraps the reflector for `p` into the realm of `cx`.
-pub(crate) fn wrap_call_this_value<T: ThisReflector>(
-    cx: JSContext,
-    p: &T,
-    mut rval: MutableHandleValue,
-) -> bool {
-    rooted!(in(*cx) let mut obj = p.jsobject());
-    assert!(!obj.is_null());
-
-    unsafe {
-        if !JS_WrapObject(*cx, obj.handle_mut()) {
-            return false;
-        }
-    }
-
-    rval.set(ObjectValue(*obj));
-    true
-}
-
-/// A class that performs whatever setup we need to safely make a call while
-/// this class is on the stack. After `new` returns, the call is safe to make.
-pub(crate) struct CallSetup<D: DomTypes> {
-    /// The global for reporting exceptions. This is the global object of the
-    /// (possibly wrapped) callback object.
-    exception_global: DomRoot<D::GlobalScope>,
-    /// The `JSContext` used for the call.
-    cx: JSContext,
-    /// The realm we were in before the call.
-    old_realm: *mut Realm,
-    /// The exception handling used for the call.
-    handling: ExceptionHandling,
-    /// <https://heycam.github.io/webidl/#es-invoking-callback-functions>
-    /// steps 8 and 18.2.
-    entry_script: Option<GenericAutoEntryScript<D>>,
-    /// <https://heycam.github.io/webidl/#es-invoking-callback-functions>
-    /// steps 9 and 18.1.
-    incumbent_script: Option<GenericAutoIncumbentScript<D>>,
-}
-
-impl<D: DomTypes> CallSetup<D> {
-    /// Performs the setup needed to make a call.
-    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
-    pub(crate) fn new<T: CallbackContainer<D>>(callback: &T, handling: ExceptionHandling) -> Self {
-        let global = unsafe { D::GlobalScope::from_object(callback.callback()) };
-        if let Some(window) = global.downcast::<D::Window>() {
-            window.Document().ensure_safe_to_run_script_or_layout();
-        }
-        let cx = D::GlobalScope::get_cx();
-
-        let aes = GenericAutoEntryScript::<D>::new(&global);
-        let ais = callback.incumbent().map(GenericAutoIncumbentScript::new);
-        CallSetup {
-            exception_global: global,
-            cx,
-            old_realm: unsafe { EnterRealm(*cx, callback.callback()) },
-            handling,
-            entry_script: Some(aes),
-            incumbent_script: ais,
-        }
-    }
-
-    /// Returns the `JSContext` used for the call.
-    pub(crate) fn get_context(&self) -> JSContext {
-        self.cx
-    }
-}
-
-impl<D: DomTypes> Drop for CallSetup<D> {
-    fn drop(&mut self) {
-        unsafe {
-            LeaveRealm(*self.cx, self.old_realm);
-        }
-        if self.handling == ExceptionHandling::Report {
-            let ar = enter_realm(&*self.exception_global);
-            report_pending_exception(self.cx, true, InRealm::Entered(&ar), CanGc::note());
-        }
-        drop(self.incumbent_script.take());
-        drop(self.entry_script.take().unwrap());
-    }
-}
diff --git a/components/script/dom/bindings/cell.rs b/components/script/dom/bindings/cell.rs
index 6c987270911..7e7e752bc0c 100644
--- a/components/script/dom/bindings/cell.rs
+++ b/components/script/dom/bindings/cell.rs
@@ -10,6 +10,7 @@ pub(crate) use std::cell::{Ref, RefCell, RefMut};
 
 #[cfg(feature = "refcell_backtrace")]
 pub(crate) use accountable_refcell::{Ref, RefCell, RefMut, ref_filter_map};
+use malloc_size_of::{MallocConditionalSizeOf, MallocSizeOfOps};
 #[cfg(not(feature = "refcell_backtrace"))]
 pub(crate) use ref_filter_map::ref_filter_map;
 
@@ -24,6 +25,12 @@ pub(crate) struct DomRefCell<T> {
     value: RefCell<T>,
 }
 
+impl<T: MallocConditionalSizeOf> MallocConditionalSizeOf for DomRefCell<T> {
+    fn conditional_size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
+        self.value.borrow().conditional_size_of(ops)
+    }
+}
+
 // Functionality specific to Servo's `DomRefCell` type
 // ===================================================
 
diff --git a/components/script/dom/bindings/constructor.rs b/components/script/dom/bindings/constructor.rs
index ae9305f0767..141fb8c1391 100644
--- a/components/script/dom/bindings/constructor.rs
+++ b/components/script/dom/bindings/constructor.rs
@@ -5,12 +5,13 @@
 use std::ptr;
 
 use html5ever::interface::QualName;
-use html5ever::{LocalName, local_name, namespace_url, ns};
+use html5ever::{LocalName, local_name, ns};
 use js::conversions::ToJSValConvertible;
 use js::glue::{UnwrapObjectDynamic, UnwrapObjectStatic};
 use js::jsapi::{CallArgs, CurrentGlobalOrNull, JSAutoRealm, JSObject};
 use js::rust::wrappers::{JS_SetPrototype, JS_WrapObject};
 use js::rust::{HandleObject, MutableHandleObject, MutableHandleValue};
+use script_bindings::interface::get_desired_proto;
 
 use super::utils::ProtoOrIfaceArray;
 use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
@@ -40,9 +41,8 @@ use crate::dom::bindings::codegen::Bindings::{
 };
 use crate::dom::bindings::codegen::PrototypeList;
 use crate::dom::bindings::conversions::DerivedFrom;
-use crate::dom::bindings::error::{Error, throw_constructor_without_new, throw_dom_exception};
+use crate::dom::bindings::error::{Error, throw_dom_exception};
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::interface::get_desired_proto;
 use crate::dom::bindings::reflector::DomObject;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::create::create_native_html_element;
@@ -55,7 +55,7 @@ use crate::script_runtime::{CanGc, JSContext, JSContext as SafeJSContext};
 use crate::script_thread::ScriptThread;
 
 /// <https://html.spec.whatwg.org/multipage/#htmlconstructor>
-unsafe fn html_constructor(
+fn html_constructor(
     cx: JSContext,
     global: &GlobalScope,
     call_args: &CallArgs,
@@ -75,7 +75,9 @@ unsafe fn html_constructor(
 
     // The new_target might be a cross-compartment wrapper. Get the underlying object
     // so we can do the spec's object-identity checks.
-    rooted!(in(*cx) let new_target_unwrapped = UnwrapObjectDynamic(call_args.new_target().to_object(), *cx, true));
+    rooted!(in(*cx) let new_target_unwrapped = unsafe {
+        UnwrapObjectDynamic(call_args.new_target().to_object(), *cx, true)
+    });
     if new_target_unwrapped.is_null() {
         throw_dom_exception(
             cx,
@@ -114,7 +116,7 @@ unsafe fn html_constructor(
     // Step 4. Let isValue be null.
     let mut is_value = None;
 
-    rooted!(in(*cx) let callee = UnwrapObjectStatic(call_args.callee()));
+    rooted!(in(*cx) let callee = unsafe { UnwrapObjectStatic(call_args.callee()) });
     if callee.is_null() {
         throw_dom_exception(cx, global, Error::Security, can_gc);
         return Err(());
@@ -123,7 +125,7 @@ unsafe fn html_constructor(
     {
         let _ac = JSAutoRealm::new(*cx, callee.get());
         rooted!(in(*cx) let mut constructor = ptr::null_mut::<JSObject>());
-        rooted!(in(*cx) let global_object = CurrentGlobalOrNull(*cx));
+        rooted!(in(*cx) let global_object = unsafe { CurrentGlobalOrNull(*cx) });
 
         // Step 5. If definition's local name is equal to definition's name
         // (i.e., definition is for an autonomous custom element):
@@ -233,13 +235,15 @@ unsafe fn html_constructor(
     };
 
     rooted!(in(*cx) let mut element = result.reflector().get_jsobject().get());
-    if !JS_WrapObject(*cx, element.handle_mut()) {
-        return Err(());
+    unsafe {
+        if !JS_WrapObject(*cx, element.handle_mut()) {
+            return Err(());
+        }
+
+        JS_SetPrototype(*cx, element.handle(), prototype.handle());
+
+        result.to_jsval(*cx, MutableHandleValue::from_raw(call_args.rval()));
     }
-
-    JS_SetPrototype(*cx, element.handle(), prototype.handle());
-
-    result.to_jsval(*cx, MutableHandleValue::from_raw(call_args.rval()));
     Ok(())
 }
 
@@ -395,7 +399,7 @@ pub(crate) fn push_new_element_queue() {
     ScriptThread::push_new_element_queue();
 }
 
-pub(crate) unsafe fn call_html_constructor<T: DerivedFrom<Element> + DomObject>(
+pub(crate) fn call_html_constructor<T: DerivedFrom<Element> + DomObject>(
     cx: JSContext,
     args: &CallArgs,
     global: &GlobalScope,
@@ -418,26 +422,3 @@ pub(crate) unsafe fn call_html_constructor<T: DerivedFrom<Element> + DomObject>(
     )
     .is_ok()
 }
-
-pub(crate) unsafe fn call_default_constructor<D: crate::DomTypes>(
-    cx: JSContext,
-    args: &CallArgs,
-    global: &D::GlobalScope,
-    proto_id: PrototypeList::ID,
-    ctor_name: &str,
-    creator: unsafe fn(JSContext, HandleObject, *mut ProtoOrIfaceArray),
-    constructor: impl FnOnce(JSContext, &CallArgs, &D::GlobalScope, HandleObject) -> bool,
-) -> bool {
-    if !args.is_constructing() {
-        throw_constructor_without_new(cx, ctor_name);
-        return false;
-    }
-
-    rooted!(in(*cx) let mut desired_proto = ptr::null_mut::<JSObject>());
-    let proto_result = get_desired_proto(cx, args, proto_id, creator, desired_proto.handle_mut());
-    if proto_result.is_err() {
-        return false;
-    }
-
-    constructor(cx, args, global, desired_proto.handle())
-}
diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs
index 0df5a82c3b0..f01357fda55 100644
--- a/components/script/dom/bindings/conversions.rs
+++ b/components/script/dom/bindings/conversions.rs
@@ -37,120 +37,15 @@ use std::ffi;
 pub(crate) use js::conversions::{
     ConversionBehavior, ConversionResult, FromJSValConvertible, ToJSValConvertible,
 };
-use js::error::throw_type_error;
-use js::glue::GetProxyReservedSlot;
-use js::jsapi::{Heap, IsWindowProxy, JS_IsExceptionPending, JSContext, JSObject};
+use js::jsapi::{JS_IsExceptionPending, JSContext, JSObject};
 use js::jsval::UndefinedValue;
-use js::rust::wrappers::{IsArrayObject, JS_GetProperty, JS_HasProperty};
-use js::rust::{HandleObject, HandleValue, MutableHandleValue};
-use num_traits::Float;
-pub(crate) use script_bindings::conversions::*;
+use js::rust::wrappers::{JS_GetProperty, JS_HasProperty};
+use js::rust::{HandleObject, MutableHandleValue};
+pub(crate) use script_bindings::conversions::{is_dom_proxy, *};
 
 use crate::dom::bindings::error::{Error, Fallible};
-use crate::dom::bindings::num::Finite;
 use crate::dom::bindings::reflector::DomObject;
 use crate::dom::bindings::root::DomRoot;
-use crate::dom::bindings::trace::{JSTraceable, RootedTraceableBox};
-use crate::dom::bindings::utils::DOMClass;
-use crate::dom::filelist::FileList;
-use crate::dom::htmlcollection::HTMLCollection;
-use crate::dom::htmlformcontrolscollection::HTMLFormControlsCollection;
-use crate::dom::htmloptionscollection::HTMLOptionsCollection;
-use crate::dom::nodelist::NodeList;
-
-impl<T: Float + ToJSValConvertible> ToJSValConvertible for Finite<T> {
-    #[inline]
-    unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) {
-        let value = **self;
-        value.to_jsval(cx, rval);
-    }
-}
-
-impl<T: Float + FromJSValConvertible<Config = ()>> FromJSValConvertible for Finite<T> {
-    type Config = ();
-
-    unsafe fn from_jsval(
-        cx: *mut JSContext,
-        value: HandleValue,
-        option: (),
-    ) -> Result<ConversionResult<Finite<T>>, ()> {
-        let result = match FromJSValConvertible::from_jsval(cx, value, option)? {
-            ConversionResult::Success(v) => v,
-            ConversionResult::Failure(error) => {
-                // FIXME(emilio): Why throwing instead of propagating the error?
-                throw_type_error(cx, &error);
-                return Err(());
-            },
-        };
-        match Finite::new(result) {
-            Some(v) => Ok(ConversionResult::Success(v)),
-            None => {
-                throw_type_error(cx, "this argument is not a finite floating-point value");
-                Err(())
-            },
-        }
-    }
-}
-
-impl<T: ToJSValConvertible + JSTraceable> ToJSValConvertible for RootedTraceableBox<T> {
-    #[inline]
-    unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) {
-        let value = &**self;
-        value.to_jsval(cx, rval);
-    }
-}
-
-impl<T> FromJSValConvertible for RootedTraceableBox<Heap<T>>
-where
-    T: FromJSValConvertible + js::rust::GCMethods + Copy,
-    Heap<T>: JSTraceable + Default,
-{
-    type Config = T::Config;
-
-    unsafe fn from_jsval(
-        cx: *mut JSContext,
-        value: HandleValue,
-        config: Self::Config,
-    ) -> Result<ConversionResult<Self>, ()> {
-        T::from_jsval(cx, value, config).map(|result| match result {
-            ConversionResult::Success(inner) => {
-                ConversionResult::Success(RootedTraceableBox::from_box(Heap::boxed(inner)))
-            },
-            ConversionResult::Failure(msg) => ConversionResult::Failure(msg),
-        })
-    }
-}
-
-pub(crate) use script_bindings::conversions::is_dom_proxy;
-
-/// Get a `*const libc::c_void` for the given DOM object, unless it is a DOM
-/// wrapper, and checking if the object is of the correct type.
-///
-/// Returns Err(()) if `obj` is a wrapper or if the object is not an object
-/// for a DOM object of the given type (as defined by the proto_id and proto_depth).
-#[inline]
-unsafe fn private_from_proto_check_static(
-    obj: *mut JSObject,
-    proto_check: fn(&'static DOMClass) -> bool,
-) -> Result<*const libc::c_void, ()> {
-    let dom_class = get_dom_class(obj).map_err(|_| ())?;
-    if proto_check(dom_class) {
-        trace!("good prototype");
-        Ok(private_from_object(obj))
-    } else {
-        trace!("bad prototype");
-        Err(())
-    }
-}
-
-/// Get a `*const T` for a DOM object accessible from a `JSObject`, where the DOM object
-/// is guaranteed not to be a wrapper.
-pub(crate) fn native_from_object_static<T>(obj: *mut JSObject) -> Result<*const T, ()>
-where
-    T: DomObject + IDLInterface,
-{
-    unsafe { private_from_proto_check_static(obj, T::derives).map(|ptr| ptr as *const T) }
-}
 
 /// Get a `DomRoot<T>` for the given DOM object, unwrapping any wrapper
 /// around it first, and checking if the object is of the correct type.
@@ -162,19 +57,7 @@ pub(crate) fn root_from_object_static<T>(obj: *mut JSObject) -> Result<DomRoot<T
 where
     T: DomObject + IDLInterface,
 {
-    native_from_object_static(obj).map(|ptr| unsafe { DomRoot::from_ref(&*ptr) })
-}
-
-/// Get a `*const T` for a DOM object accessible from a `HandleValue`.
-/// Caller is responsible for throwing a JS exception if needed in case of error.
-pub(crate) fn native_from_handlevalue<T>(v: HandleValue, cx: *mut JSContext) -> Result<*const T, ()>
-where
-    T: DomObject + IDLInterface,
-{
-    if !v.get().is_object() {
-        return Err(());
-    }
-    unsafe { native_from_object(v.get().to_object(), cx) }
+    unsafe { native_from_object_static(obj).map(|ptr| DomRoot::from_ref(&*ptr)) }
 }
 
 /// Get a `DomRoot<T>` for a DOM object accessible from a `HandleObject`.
@@ -188,40 +71,6 @@ where
     unsafe { root_from_object(obj.get(), cx) }
 }
 
-/// Returns whether `value` is an array-like object (Array, FileList,
-/// HTMLCollection, HTMLFormControlsCollection, HTMLOptionsCollection,
-/// NodeList).
-pub(crate) unsafe fn is_array_like(cx: *mut JSContext, value: HandleValue) -> bool {
-    let mut is_array = false;
-    assert!(IsArrayObject(cx, value, &mut is_array));
-    if is_array {
-        return true;
-    }
-
-    let object: *mut JSObject = match FromJSValConvertible::from_jsval(cx, value, ()).unwrap() {
-        ConversionResult::Success(object) => object,
-        _ => return false,
-    };
-
-    if root_from_object::<FileList>(object, cx).is_ok() {
-        return true;
-    }
-    if root_from_object::<HTMLCollection>(object, cx).is_ok() {
-        return true;
-    }
-    if root_from_object::<HTMLFormControlsCollection>(object, cx).is_ok() {
-        return true;
-    }
-    if root_from_object::<HTMLOptionsCollection>(object, cx).is_ok() {
-        return true;
-    }
-    if root_from_object::<NodeList>(object, cx).is_ok() {
-        return true;
-    }
-
-    false
-}
-
 /// Get a property from a JS object.
 pub(crate) unsafe fn get_property_jsval(
     cx: *mut JSContext,
@@ -272,22 +121,3 @@ where
         Err(()) => Err(Error::JSFailed),
     }
 }
-
-/// Get a `DomRoot<T>` for a WindowProxy accessible from a `HandleValue`.
-/// Caller is responsible for throwing a JS exception if needed in case of error.
-pub(crate) unsafe fn windowproxy_from_handlevalue<D: crate::DomTypes>(
-    v: HandleValue,
-    _cx: *mut JSContext,
-) -> Result<DomRoot<D::WindowProxy>, ()> {
-    if !v.get().is_object() {
-        return Err(());
-    }
-    let object = v.get().to_object();
-    if !IsWindowProxy(object) {
-        return Err(());
-    }
-    let mut value = UndefinedValue();
-    GetProxyReservedSlot(object, 0, &mut value);
-    let ptr = value.to_private() as *const D::WindowProxy;
-    Ok(DomRoot::from_ref(&*ptr))
-}
diff --git a/components/script/dom/bindings/error.rs b/components/script/dom/bindings/error.rs
index 13bdd97cad1..f5bd03cd8d7 100644
--- a/components/script/dom/bindings/error.rs
+++ b/components/script/dom/bindings/error.rs
@@ -20,7 +20,6 @@ pub(crate) use script_bindings::error::*;
 
 #[cfg(feature = "js_backtrace")]
 use crate::dom::bindings::cell::DomRefCell;
-use crate::dom::bindings::codegen::PrototypeList::proto_id_to_name;
 use crate::dom::bindings::conversions::{
     ConversionResult, FromJSValConvertible, ToJSValConvertible, root_from_object,
 };
@@ -71,7 +70,22 @@ pub(crate) fn throw_dom_exception(
         Error::Abort => DOMErrorName::AbortError,
         Error::Timeout => DOMErrorName::TimeoutError,
         Error::InvalidNodeType => DOMErrorName::InvalidNodeTypeError,
-        Error::DataClone => DOMErrorName::DataCloneError,
+        Error::DataClone(message) => match message {
+            Some(custom_message) => unsafe {
+                assert!(!JS_IsExceptionPending(*cx));
+                let exception = DOMException::new_with_custom_message(
+                    global,
+                    DOMErrorName::DataCloneError,
+                    custom_message,
+                    can_gc,
+                );
+                rooted!(in(*cx) let mut thrown = UndefinedValue());
+                exception.to_jsval(*cx, thrown.handle_mut());
+                JS_SetPendingException(*cx, thrown.handle(), ExceptionStackBehavior::Capture);
+                return;
+            },
+            None => DOMErrorName::DataCloneError,
+        },
         Error::NoModificationAllowed => DOMErrorName::NoModificationAllowedError,
         Error::QuotaExceeded => DOMErrorName::QuotaExceededError,
         Error::TypeMismatch => DOMErrorName::TypeMismatchError,
@@ -79,6 +93,7 @@ pub(crate) fn throw_dom_exception(
         Error::NotReadable => DOMErrorName::NotReadableError,
         Error::Data => DOMErrorName::DataError,
         Error::Operation => DOMErrorName::OperationError,
+        Error::NotAllowed => DOMErrorName::NotAllowedError,
         Error::Type(message) => unsafe {
             assert!(!JS_IsExceptionPending(*cx));
             throw_type_error(*cx, &message);
@@ -257,23 +272,6 @@ pub(crate) fn report_pending_exception(
     }
 }
 
-/// Throw an exception to signal that a `JSObject` can not be converted to a
-/// given DOM type.
-pub(crate) fn throw_invalid_this(cx: SafeJSContext, proto_id: u16) {
-    debug_assert!(unsafe { !JS_IsExceptionPending(*cx) });
-    let error = format!(
-        "\"this\" object does not implement interface {}.",
-        proto_id_to_name(proto_id)
-    );
-    unsafe { throw_type_error(*cx, &error) };
-}
-
-pub(crate) fn throw_constructor_without_new(cx: SafeJSContext, name: &str) {
-    debug_assert!(unsafe { !JS_IsExceptionPending(*cx) });
-    let error = format!("{} constructor: 'new' is required", name);
-    unsafe { throw_type_error(*cx, &error) };
-}
-
 pub(crate) trait ErrorToJsval {
     fn to_jsval(
         self,
diff --git a/components/script/dom/bindings/finalize.rs b/components/script/dom/bindings/finalize.rs
deleted file mode 100644
index 03d4950e1c7..00000000000
--- a/components/script/dom/bindings/finalize.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-//! Generic finalizer implementations for DOM binding implementations.
-
-use std::any::type_name;
-use std::mem;
-
-use js::glue::JS_GetReservedSlot;
-use js::jsapi::JSObject;
-use js::jsval::UndefinedValue;
-
-use crate::dom::bindings::utils::finalize_global as do_finalize_global;
-use crate::dom::bindings::weakref::{DOM_WEAK_SLOT, WeakBox, WeakReferenceable};
-
-pub(crate) unsafe fn finalize_common<T>(this: *const T) {
-    if !this.is_null() {
-        // The pointer can be null if the object is the unforgeable holder of that interface.
-        let _ = Box::from_raw(this as *mut T);
-    }
-    debug!("{} finalize: {:p}", type_name::<T>(), this);
-}
-
-pub(crate) unsafe fn finalize_global<T>(obj: *mut JSObject, this: *const T) {
-    do_finalize_global(obj);
-    finalize_common::<T>(this);
-}
-
-pub(crate) unsafe fn finalize_weak_referenceable<T: WeakReferenceable>(
-    obj: *mut JSObject,
-    this: *const T,
-) {
-    let mut slot = UndefinedValue();
-    JS_GetReservedSlot(obj, DOM_WEAK_SLOT, &mut slot);
-    let weak_box_ptr = slot.to_private() as *mut WeakBox<T>;
-    if !weak_box_ptr.is_null() {
-        let count = {
-            let weak_box = &*weak_box_ptr;
-            assert!(weak_box.value.get().is_some());
-            assert!(weak_box.count.get() > 0);
-            weak_box.value.set(None);
-            let count = weak_box.count.get() - 1;
-            weak_box.count.set(count);
-            count
-        };
-        if count == 0 {
-            mem::drop(Box::from_raw(weak_box_ptr));
-        }
-    }
-    finalize_common::<T>(this);
-}
diff --git a/components/script/dom/bindings/import.rs b/components/script/dom/bindings/import.rs
index 33511666d17..5042eba1c05 100644
--- a/components/script/dom/bindings/import.rs
+++ b/components/script/dom/bindings/import.rs
@@ -2,165 +2,24 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-#[allow(unused_imports)]
 pub(crate) mod base {
     pub(crate) use std::ptr;
-    pub(crate) use std::rc::Rc;
 
-    pub(crate) use js::error::throw_type_error;
-    pub(crate) use js::jsapi::{
-        CurrentGlobalOrNull, HandleValue as RawHandleValue, HandleValueArray, Heap, IsCallable,
-        JS_NewObject, JSContext, JSObject,
-    };
-    pub(crate) use js::jsval::{JSVal, NullValue, ObjectOrNullValue, ObjectValue, UndefinedValue};
-    pub(crate) use js::panic::maybe_resume_unwind;
-    pub(crate) use js::rust::wrappers::{Call, JS_WrapValue};
-    pub(crate) use js::rust::{HandleObject, HandleValue, MutableHandleObject, MutableHandleValue};
+    pub(crate) use js::rust::{HandleObject, MutableHandleObject};
 
-    pub(crate) use crate::dom::bindings::callback::{
-        CallSetup, CallbackContainer, CallbackFunction, CallbackInterface, CallbackObject,
-        ExceptionHandling, ThisReflector, wrap_call_this_value,
-    };
-    pub(crate) use crate::dom::bindings::codegen::Bindings::AudioNodeBinding::{
-        ChannelCountMode, ChannelCountModeValues, ChannelInterpretation,
-        ChannelInterpretationValues,
-    };
-    pub(crate) use crate::dom::bindings::codegen::DomTypes::DomTypes;
-    pub(crate) use crate::dom::bindings::codegen::{GenericUnionTypes, UnionTypes};
-    pub(crate) use crate::dom::bindings::conversions::{
-        ConversionBehavior, ConversionResult, FromJSValConvertible, StringificationBehavior,
-        ToJSValConvertible, root_from_handlevalue,
-    };
-    pub(crate) use crate::dom::bindings::error::Error::JSFailed;
-    pub(crate) use crate::dom::bindings::error::{Fallible, throw_dom_exception};
-    pub(crate) use crate::dom::bindings::num::Finite;
-    pub(crate) use crate::dom::bindings::proxyhandler::CrossOriginProperties;
-    pub(crate) use crate::dom::bindings::reflector::{DomGlobalGeneric, DomObject};
-    pub(crate) use crate::dom::bindings::root::DomRoot;
-    pub(crate) use crate::dom::bindings::str::{ByteString, DOMString, USVString};
-    pub(crate) use crate::dom::bindings::trace::RootedTraceableBox;
-    pub(crate) use crate::dom::bindings::utils::{
-        DomHelpers, ThreadUnsafeOnceLock, get_dictionary_property, set_dictionary_property,
-    };
-    pub(crate) use crate::dom::globalscope::{GlobalScope, GlobalScopeHelpers};
-    pub(crate) use crate::dom::promise::PromiseHelpers;
-    pub(crate) use crate::realms::{AlreadyInRealm, InRealm};
     pub(crate) use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
 }
 
-#[allow(unused_imports)]
 pub(crate) mod module {
-    pub(crate) use std::cmp;
-    pub(crate) use std::ffi::CString;
-    pub(crate) use std::ptr::NonNull;
-
-    pub(crate) use js::glue::{
-        CreateProxyHandler, GetProxyReservedSlot, JS_GetReservedSlot, ProxyTraps,
-        SetProxyReservedSlot,
-    };
-    pub(crate) use js::jsapi::{
-        __BindgenBitfieldUnit, CallArgs, GCContext, GetRealmErrorPrototype,
-        GetRealmFunctionPrototype, GetRealmIteratorPrototype, GetRealmObjectPrototype,
-        GetWellKnownSymbol, Handle as RawHandle, HandleId as RawHandleId,
-        HandleObject as RawHandleObject, JS_AtomizeAndPinString, JS_ForwardGetPropertyTo,
-        JS_GetPropertyDescriptorById, JS_HasPropertyById, JS_NewPlainObject, JS_SetReservedSlot,
-        JSAutoRealm, JSCLASS_FOREGROUND_FINALIZE, JSCLASS_RESERVED_SLOTS_SHIFT, JSClass,
-        JSClassOps, JSFunctionSpec, JSITER_HIDDEN, JSITER_OWNONLY, JSITER_SYMBOLS,
-        JSJitGetterCallArgs, JSJitInfo, JSJitInfo__bindgen_ty_1, JSJitInfo__bindgen_ty_2,
-        JSJitInfo__bindgen_ty_3, JSJitInfo_AliasSet, JSJitInfo_ArgType, JSJitInfo_OpType,
-        JSJitMethodCallArgs, JSJitSetterCallArgs, JSNativeWrapper, JSPROP_ENUMERATE,
-        JSPROP_PERMANENT, JSPROP_READONLY, JSPropertySpec, JSPropertySpec_Accessor,
-        JSPropertySpec_AccessorsOrValue, JSPropertySpec_AccessorsOrValue_Accessors,
-        JSPropertySpec_Kind, JSPropertySpec_Name, JSPropertySpec_ValueWrapper,
-        JSPropertySpec_ValueWrapper__bindgen_ty_1, JSPropertySpec_ValueWrapper_Type, JSTracer,
-        JSTypedMethodJitInfo, JSValueType, MutableHandle as RawMutableHandle,
-        MutableHandleIdVector as RawMutableHandleIdVector,
-        MutableHandleObject as RawMutableHandleObject, MutableHandleValue as RawMutableHandleValue,
-        ObjectOpResult, PropertyDescriptor, SymbolCode, UndefinedHandleValue, jsid,
-    };
-    pub(crate) use js::jsval::PrivateValue;
-    pub(crate) use js::panic::wrap_panic;
-    pub(crate) use js::rust::wrappers::{
-        AppendToIdVector, Call, GetPropertyKeys, JS_CopyOwnPropertiesAndPrivateFields,
-        JS_DefineProperty, JS_DefinePropertyById2, JS_GetProperty,
-        JS_InitializePropertiesFromCompatibleNativeObject, JS_NewObjectWithGivenProto,
-        JS_NewObjectWithoutMetadata, JS_SetImmutablePrototype, JS_SetProperty, JS_SetPrototype,
-        JS_WrapObject, NewProxyObject, RUST_INTERNED_STRING_TO_JSID, RUST_SYMBOL_TO_JSID,
-        int_to_jsid,
-    };
-    pub(crate) use js::rust::{
-        CustomAutoRooterGuard, GCMethods, Handle, MutableHandle, get_context_realm,
-        get_object_class, get_object_realm,
-    };
-    pub(crate) use js::typedarray::{
-        ArrayBuffer, ArrayBufferView, Float32Array, Float64Array, Uint8Array, Uint8ClampedArray,
-    };
-    pub(crate) use js::{
-        JS_CALLEE, JSCLASS_GLOBAL_SLOT_COUNT, JSCLASS_IS_DOMJSCLASS, JSCLASS_IS_GLOBAL,
-        JSCLASS_RESERVED_SLOTS_MASK, jsapi, typedarray,
-    };
-    pub(crate) use script_bindings::constant::{ConstantSpec, ConstantVal};
-    pub(crate) use script_bindings::record::Record;
-    pub(crate) use servo_config::pref;
+    pub(crate) use script_bindings::codegen::PrototypeList;
+    pub(crate) use script_bindings::conversions::IDLInterface;
+    pub(crate) use script_bindings::utils::DOMClass;
 
     pub(crate) use super::base::*;
-    pub(crate) use crate::dom::bindings::codegen::Bindings::AnalyserNodeBinding::AnalyserOptions;
-    pub(crate) use crate::dom::bindings::codegen::Bindings::AudioNodeBinding::{
-        AudioNode_Binding, ChannelCountMode, ChannelCountModeValues, ChannelInterpretation,
-        ChannelInterpretationValues,
-    };
-    pub(crate) use crate::dom::bindings::codegen::Bindings::EventTargetBinding::EventTarget_Binding;
-    pub(crate) use crate::dom::bindings::codegen::{
-        InterfaceObjectMap, PrototypeList, RegisterBindings,
-    };
-    pub(crate) use crate::dom::bindings::constructor::{
-        call_default_constructor, call_html_constructor, pop_current_element_queue,
-        push_new_element_queue,
-    };
-    pub(crate) use crate::dom::bindings::conversions::{
-        DOM_OBJECT_SLOT, IDLInterface, StringificationBehavior, ToJSValConvertible, is_array_like,
-        jsid_to_string, native_from_handlevalue, native_from_object_static,
-    };
-    pub(crate) use crate::dom::bindings::error::{
-        Error, ErrorResult, throw_constructor_without_new,
-    };
-    pub(crate) use crate::dom::bindings::finalize::{
-        finalize_common, finalize_global, finalize_weak_referenceable,
-    };
-    pub(crate) use crate::dom::bindings::guard::{Condition, Guard};
-    pub(crate) use crate::dom::bindings::inheritance::Castable;
-    pub(crate) use crate::dom::bindings::interface::{
-        ConstructorClassHook, InterfaceConstructorBehavior, NonCallbackInterfaceObjectClass,
-        ProtoOrIfaceIndex, create_callback_interface_object, create_global_object,
-        create_interface_prototype_object, create_named_constructors,
-        create_noncallback_interface_object, define_dom_interface, define_guarded_methods,
-        define_guarded_properties, get_desired_proto, get_per_interface_object_handle,
-        is_exposed_in,
-    };
-    pub(crate) use crate::dom::bindings::iterable::{Iterable, IteratorType};
-    pub(crate) use crate::dom::bindings::like::{Maplike, Setlike};
-    pub(crate) use crate::dom::bindings::namespace::{
-        NamespaceObjectClass, create_namespace_object,
-    };
-    pub(crate) use crate::dom::bindings::proxyhandler;
-    pub(crate) use crate::dom::bindings::proxyhandler::{
-        ensure_expando_object, get_expando_object, set_property_descriptor,
-    };
+    pub(crate) use crate::dom::bindings::iterable::IterableIterator;
     pub(crate) use crate::dom::bindings::reflector::{
         DomObjectIteratorWrap, DomObjectWrap, Reflector,
     };
-    pub(crate) use crate::dom::bindings::root::{Dom, DomSlice, MaybeUnreflectedDom, Root};
-    pub(crate) use crate::dom::bindings::trace::JSTraceable;
-    pub(crate) use crate::dom::bindings::utils::{
-        AsVoidPtr, DOM_PROTO_UNFORGEABLE_HOLDER_SLOT, DOMClass, DOMJSClass, JSCLASS_DOM_GLOBAL,
-        ProtoOrIfaceArray, enumerate_global, exception_to_promise, generic_getter,
-        generic_lenient_getter, generic_lenient_setter, generic_method, generic_setter,
-        generic_static_promise_method, get_array_index_from_id, get_property_on_prototype,
-        has_property_on_prototype, resolve_global, trace_global,
-    };
-    pub(crate) use crate::dom::bindings::weakref::{DOM_WEAK_SLOT, WeakReferenceable};
-    pub(crate) use crate::dom::types::{AnalyserNode, AudioNode, BaseAudioContext, EventTarget};
-    pub(crate) use crate::mem::malloc_size_of_including_raw_self;
-    pub(crate) use crate::realms::{AlreadyInRealm, InRealm};
-    pub(crate) use crate::script_runtime::CanGc;
+    pub(crate) use crate::dom::bindings::root::{Dom, Root};
+    pub(crate) use crate::dom::bindings::weakref::WeakReferenceable;
 }
diff --git a/components/script/dom/bindings/inheritance.rs b/components/script/dom/bindings/inheritance.rs
index ef60378d55b..bb68b4b08f1 100644
--- a/components/script/dom/bindings/inheritance.rs
+++ b/components/script/dom/bindings/inheritance.rs
@@ -3,11 +3,4 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 pub(crate) use script_bindings::codegen::InheritTypes::*;
-pub(crate) use script_bindings::inheritance::Castable;
-
-#[allow(missing_docs)]
-pub(crate) trait HasParent {
-    #[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
-    type Parent;
-    fn as_parent(&self) -> &Self::Parent;
-}
+pub(crate) use script_bindings::inheritance::{Castable, HasParent};
diff --git a/components/script/dom/bindings/iterable.rs b/components/script/dom/bindings/iterable.rs
deleted file mode 100644
index d97dfeeddbe..00000000000
--- a/components/script/dom/bindings/iterable.rs
+++ /dev/null
@@ -1,179 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-#![allow(unsafe_code)]
-
-//! Implementation of `iterable<...>` and `iterable<..., ...>` WebIDL declarations.
-
-use std::cell::Cell;
-use std::marker::PhantomData;
-use std::ptr;
-use std::ptr::NonNull;
-
-use dom_struct::dom_struct;
-use js::conversions::ToJSValConvertible;
-use js::jsapi::{Heap, JSObject};
-use js::jsval::UndefinedValue;
-use js::rust::{HandleObject, HandleValue, MutableHandleObject};
-use script_bindings::conversions::IDLInterface;
-pub(crate) use script_bindings::iterable::*;
-use script_bindings::utils::DOMClass;
-
-use crate::DomTypes;
-use crate::dom::bindings::codegen::Bindings::IterableIteratorBinding::{
-    IterableKeyAndValueResult, IterableKeyOrValueResult,
-};
-use crate::dom::bindings::error::Fallible;
-use crate::dom::bindings::reflector::{
-    DomGlobalGeneric, DomObjectIteratorWrap, DomObjectWrap, Reflector, reflect_dom_object,
-};
-use crate::dom::bindings::root::{Dom, DomRoot, Root};
-use crate::dom::bindings::trace::{JSTraceable, NoTrace, RootedTraceableBox};
-use crate::realms::InRealm;
-use crate::script_runtime::{CanGc, JSContext};
-
-/// An iterator over the iterable entries of a given DOM interface.
-#[dom_struct]
-pub(crate) struct IterableIterator<
-    D: DomTypes,
-    T: DomObjectIteratorWrap<D> + JSTraceable + Iterable + DomGlobalGeneric<D>,
-> {
-    reflector: Reflector,
-    iterable: Dom<T>,
-    type_: IteratorType,
-    index: Cell<u32>,
-    _marker: NoTrace<PhantomData<D>>,
-}
-
-impl<D: DomTypes, T: DomObjectIteratorWrap<D> + JSTraceable + Iterable> IterableIterator<D, T> {
-    pub fn global_(&self, realm: InRealm) -> DomRoot<D::GlobalScope> {
-        <Self as DomGlobalGeneric<D>>::global_(self, realm)
-    }
-}
-
-impl<
-    D: DomTypes,
-    T: DomObjectIteratorWrap<D>
-        + JSTraceable
-        + Iterable
-        + DomGlobalGeneric<D>
-        + IDLInterface
-        + IteratorDerives,
-> IDLInterface for IterableIterator<D, T>
-{
-    fn derives(class: &'static DOMClass) -> bool {
-        <T as IteratorDerives>::derives(class)
-    }
-}
-
-impl<D: DomTypes, T: DomObjectIteratorWrap<D> + JSTraceable + Iterable + DomGlobalGeneric<D>>
-    IterableIterator<D, T>
-{
-    /// Create a new iterator instance for the provided iterable DOM interface.
-    pub(crate) fn new(iterable: &T, type_: IteratorType, realm: InRealm) -> DomRoot<Self> {
-        let iterator = Box::new(IterableIterator {
-            reflector: Reflector::new(),
-            type_,
-            iterable: Dom::from_ref(iterable),
-            index: Cell::new(0),
-            _marker: NoTrace(PhantomData),
-        });
-        reflect_dom_object(iterator, &*iterable.global_(realm), CanGc::note())
-    }
-
-    /// Return the next value from the iterable object.
-    #[allow(non_snake_case)]
-    pub(crate) fn Next(&self, cx: JSContext) -> Fallible<NonNull<JSObject>> {
-        let index = self.index.get();
-        rooted!(in(*cx) let mut value = UndefinedValue());
-        rooted!(in(*cx) let mut rval = ptr::null_mut::<JSObject>());
-        let result = if index >= self.iterable.get_iterable_length() {
-            dict_return(cx, rval.handle_mut(), true, value.handle())
-        } else {
-            match self.type_ {
-                IteratorType::Keys => {
-                    unsafe {
-                        self.iterable
-                            .get_key_at_index(index)
-                            .to_jsval(*cx, value.handle_mut());
-                    }
-                    dict_return(cx, rval.handle_mut(), false, value.handle())
-                },
-                IteratorType::Values => {
-                    unsafe {
-                        self.iterable
-                            .get_value_at_index(index)
-                            .to_jsval(*cx, value.handle_mut());
-                    }
-                    dict_return(cx, rval.handle_mut(), false, value.handle())
-                },
-                IteratorType::Entries => {
-                    rooted!(in(*cx) let mut key = UndefinedValue());
-                    unsafe {
-                        self.iterable
-                            .get_key_at_index(index)
-                            .to_jsval(*cx, key.handle_mut());
-                        self.iterable
-                            .get_value_at_index(index)
-                            .to_jsval(*cx, value.handle_mut());
-                    }
-                    key_and_value_return(cx, rval.handle_mut(), key.handle(), value.handle())
-                },
-            }
-        };
-        self.index.set(index + 1);
-        result.map(|_| NonNull::new(rval.get()).expect("got a null pointer"))
-    }
-}
-
-impl<D: DomTypes, T: DomObjectIteratorWrap<D> + JSTraceable + Iterable + DomGlobalGeneric<D>>
-    DomObjectWrap<D> for IterableIterator<D, T>
-{
-    const WRAP: unsafe fn(
-        JSContext,
-        &D::GlobalScope,
-        Option<HandleObject>,
-        Box<Self>,
-        CanGc,
-    ) -> Root<Dom<Self>> = T::ITER_WRAP;
-}
-
-fn dict_return(
-    cx: JSContext,
-    mut result: MutableHandleObject,
-    done: bool,
-    value: HandleValue,
-) -> Fallible<()> {
-    let mut dict = IterableKeyOrValueResult::empty();
-    dict.done = done;
-    dict.value.set(value.get());
-    rooted!(in(*cx) let mut dict_value = UndefinedValue());
-    unsafe {
-        dict.to_jsval(*cx, dict_value.handle_mut());
-    }
-    result.set(dict_value.to_object());
-    Ok(())
-}
-
-fn key_and_value_return(
-    cx: JSContext,
-    mut result: MutableHandleObject,
-    key: HandleValue,
-    value: HandleValue,
-) -> Fallible<()> {
-    let mut dict = IterableKeyAndValueResult::empty();
-    dict.done = false;
-    dict.value = Some(
-        vec![key, value]
-            .into_iter()
-            .map(|handle| RootedTraceableBox::from_box(Heap::boxed(handle.get())))
-            .collect(),
-    );
-    rooted!(in(*cx) let mut dict_value = UndefinedValue());
-    unsafe {
-        dict.to_jsval(*cx, dict_value.handle_mut());
-    }
-    result.set(dict_value.to_object());
-    Ok(())
-}
diff --git a/components/script/dom/bindings/mod.rs b/components/script/dom/bindings/mod.rs
index 9385df640c8..f9a5137c48a 100644
--- a/components/script/dom/bindings/mod.rs
+++ b/components/script/dom/bindings/mod.rs
@@ -135,23 +135,16 @@
 #![deny(non_snake_case)]
 
 pub(crate) mod buffer_source;
-pub(crate) mod callback;
 #[allow(dead_code)]
 pub(crate) mod cell;
 pub(crate) mod constructor;
 pub(crate) mod conversions;
 pub(crate) mod error;
-pub(crate) mod finalize;
 pub(crate) mod frozenarray;
 pub(crate) mod function;
-pub(crate) mod guard;
 pub(crate) mod import;
 pub(crate) mod inheritance;
-pub(crate) mod interface;
-pub(crate) mod iterable;
 pub(crate) mod like;
-pub(crate) mod namespace;
-pub(crate) mod num;
 pub(crate) mod principals;
 pub(crate) mod proxyhandler;
 pub(crate) mod refcounted;
@@ -167,55 +160,28 @@ pub(crate) mod utils;
 pub(crate) mod weakref;
 pub(crate) mod xmlname;
 
+pub(crate) use script_bindings::{callback, iterable, num};
+
 /// Generated JS-Rust bindings.
 #[allow(missing_docs, non_snake_case)]
 pub(crate) mod codegen {
     pub(crate) mod DomTypeHolder {
-        include!(concat!(env!("BINDINGS_OUT_DIR"), "/DomTypeHolder.rs"));
-    }
-    pub(crate) mod DomTypes {
-        include!(concat!(env!("BINDINGS_OUT_DIR"), "/DomTypes.rs"));
-    }
-    #[allow(dead_code)]
-    pub(crate) mod GenericBindings {
-        include!(concat!(env!("BINDINGS_OUT_DIR"), "/Bindings/mod.rs"));
+        include!(concat!(env!("OUT_DIR"), "/DomTypeHolder.rs"));
     }
+    pub(crate) use script_bindings::codegen::GenericBindings;
     #[allow(dead_code)]
     pub(crate) mod Bindings {
-        include!(concat!(
-            env!("BINDINGS_OUT_DIR"),
-            "/ConcreteBindings/mod.rs"
-        ));
+        include!(concat!(env!("OUT_DIR"), "/ConcreteBindings/mod.rs"));
     }
     pub(crate) mod InterfaceObjectMap {
-        include!(concat!(env!("BINDINGS_OUT_DIR"), "/InterfaceObjectMap.rs"));
-        pub(crate) use script_bindings::codegen::Globals::Globals;
+        include!(concat!(env!("OUT_DIR"), "/InterfaceObjectMap.rs"));
     }
-    pub(crate) use script_bindings::codegen::InheritTypes;
-    #[allow(dead_code)]
     pub(crate) mod ConcreteInheritTypes {
-        include!(concat!(
-            env!("BINDINGS_OUT_DIR"),
-            "/ConcreteInheritTypes.rs"
-        ));
-    }
-    pub(crate) use script_bindings::codegen::PrototypeList;
-    pub(crate) mod RegisterBindings {
-        include!(concat!(env!("BINDINGS_OUT_DIR"), "/RegisterBindings.rs"));
-    }
-    #[allow(
-        non_camel_case_types,
-        unused_imports,
-        unused_variables,
-        clippy::large_enum_variant,
-        clippy::upper_case_acronyms,
-        clippy::enum_variant_names
-    )]
-    pub(crate) mod GenericUnionTypes {
-        include!(concat!(env!("BINDINGS_OUT_DIR"), "/GenericUnionTypes.rs"));
+        include!(concat!(env!("OUT_DIR"), "/ConcreteInheritTypes.rs"));
     }
+    pub(crate) use script_bindings::codegen::{PrototypeList, RegisterBindings};
     #[allow(dead_code)]
     pub(crate) mod UnionTypes {
-        include!(concat!(env!("BINDINGS_OUT_DIR"), "/UnionTypes.rs"));
+        include!(concat!(env!("OUT_DIR"), "/UnionTypes.rs"));
     }
 }
diff --git a/components/script/dom/bindings/principals.rs b/components/script/dom/bindings/principals.rs
index b037fcb0709..0594b77022c 100644
--- a/components/script/dom/bindings/principals.rs
+++ b/components/script/dom/bindings/principals.rs
@@ -2,127 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use std::marker::PhantomData;
-use std::mem::ManuallyDrop;
-use std::ops::Deref;
 use std::ptr::NonNull;
 
-use js::glue::{
-    CreateRustJSPrincipals, DestroyRustJSPrincipals, GetRustJSPrincipalsPrivate,
-    JSPrincipalsCallbacks,
-};
+use js::glue::{DestroyRustJSPrincipals, GetRustJSPrincipalsPrivate, JSPrincipalsCallbacks};
 use js::jsapi::{
-    JS_DropPrincipals, JS_HoldPrincipals, JS_ReadUint32Pair, JSContext, JSPrincipals,
-    JSStructuredCloneReader, JSStructuredCloneWriter,
+    JS_ReadUint32Pair, JSContext, JSPrincipals, JSStructuredCloneReader, JSStructuredCloneWriter,
 };
-use js::rust::Runtime;
+use script_bindings::principals::{ServoJSPrincipals, ServoJSPrincipalsRef};
 use servo_url::MutableOrigin;
 
 use super::structuredclone::StructuredCloneTags;
-
-/// An owned reference to Servo's `JSPrincipals` instance.
-#[repr(transparent)]
-pub(crate) struct ServoJSPrincipals(NonNull<JSPrincipals>);
-
-impl ServoJSPrincipals {
-    pub(crate) fn new(origin: &MutableOrigin) -> Self {
-        unsafe {
-            let private: Box<MutableOrigin> = Box::new(origin.clone());
-            let raw = CreateRustJSPrincipals(&PRINCIPALS_CALLBACKS, Box::into_raw(private) as _);
-            // The created `JSPrincipals` object has an initial reference
-            // count of zero, so the following code will set it to one
-            Self::from_raw_nonnull(NonNull::new_unchecked(raw))
-        }
-    }
-
-    /// Construct `Self` from a raw `*mut JSPrincipals`, incrementing its
-    /// reference count.
-    #[inline]
-    pub(crate) unsafe fn from_raw_nonnull(raw: NonNull<JSPrincipals>) -> Self {
-        JS_HoldPrincipals(raw.as_ptr());
-        Self(raw)
-    }
-
-    #[inline]
-    pub(crate) unsafe fn origin(&self) -> MutableOrigin {
-        let origin = GetRustJSPrincipalsPrivate(self.0.as_ptr()) as *mut MutableOrigin;
-        (*origin).clone()
-    }
-
-    #[inline]
-    pub(crate) fn as_raw_nonnull(&self) -> NonNull<JSPrincipals> {
-        self.0
-    }
-
-    #[inline]
-    pub(crate) fn as_raw(&self) -> *mut JSPrincipals {
-        self.0.as_ptr()
-    }
-}
-
-impl Clone for ServoJSPrincipals {
-    #[inline]
-    fn clone(&self) -> Self {
-        unsafe { Self::from_raw_nonnull(self.as_raw_nonnull()) }
-    }
-}
-
-impl Drop for ServoJSPrincipals {
-    #[inline]
-    fn drop(&mut self) {
-        if let Some(cx) = Runtime::get() {
-            unsafe { JS_DropPrincipals(cx.as_ptr(), self.as_raw()) };
-        }
-    }
-}
-
-/// A borrowed reference to Servo's `JSPrincipals` instance. Does not update the
-/// reference count on creation and deletion.
-pub(crate) struct ServoJSPrincipalsRef<'a>(ManuallyDrop<ServoJSPrincipals>, PhantomData<&'a ()>);
-
-impl ServoJSPrincipalsRef<'_> {
-    /// Construct `Self` from a raw `NonNull<JSPrincipals>`.
-    ///
-    /// # Safety
-    ///
-    /// `ServoJSPrincipalsRef` does not update the reference count of the
-    /// wrapped `JSPrincipals` object. It's up to the caller to ensure the
-    /// returned `ServoJSPrincipalsRef` object or any clones are not used past
-    /// the lifetime of the wrapped object.
-    #[inline]
-    pub(crate) unsafe fn from_raw_nonnull(raw: NonNull<JSPrincipals>) -> Self {
-        // Don't use `ServoJSPrincipals::from_raw_nonnull`; we don't want to
-        // update the reference count
-        Self(ManuallyDrop::new(ServoJSPrincipals(raw)), PhantomData)
-    }
-
-    /// Construct `Self` from a raw `*mut JSPrincipals`.
-    ///
-    /// # Safety
-    ///
-    /// The behavior is undefined if `raw` is null. See also
-    /// [`Self::from_raw_nonnull`].
-    #[inline]
-    pub(crate) unsafe fn from_raw_unchecked(raw: *mut JSPrincipals) -> Self {
-        Self::from_raw_nonnull(NonNull::new_unchecked(raw))
-    }
-}
-
-impl Clone for ServoJSPrincipalsRef<'_> {
-    #[inline]
-    fn clone(&self) -> Self {
-        Self(ManuallyDrop::new(ServoJSPrincipals(self.0.0)), PhantomData)
-    }
-}
-
-impl Deref for ServoJSPrincipalsRef<'_> {
-    type Target = ServoJSPrincipals;
-
-    #[inline]
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
+use crate::DomTypeHolder;
 
 #[allow(unused)]
 pub(crate) unsafe extern "C" fn destroy_servo_jsprincipal(principals: *mut JSPrincipals) {
@@ -175,14 +65,14 @@ pub(crate) unsafe extern "C" fn read_jsprincipal(
     let Ok(origin) = bincode::deserialize(&bytes[..]) else {
         return false;
     };
-    let principal = ServoJSPrincipals::new(&origin);
+    let principal = ServoJSPrincipals::new::<DomTypeHolder>(&origin);
     *principals = principal.as_raw();
     // we transferred ownership of principal to the caller
     std::mem::forget(principal);
     true
 }
 
-const PRINCIPALS_CALLBACKS: JSPrincipalsCallbacks = JSPrincipalsCallbacks {
+pub(crate) const PRINCIPALS_CALLBACKS: JSPrincipalsCallbacks = JSPrincipalsCallbacks {
     write: Some(write_jsprincipal),
     isSystemOrAddonPrincipal: Some(principals_is_system_or_addon_principal),
 };
diff --git a/components/script/dom/bindings/proxyhandler.rs b/components/script/dom/bindings/proxyhandler.rs
index 1ef83119e53..2e203a81fa9 100644
--- a/components/script/dom/bindings/proxyhandler.rs
+++ b/components/script/dom/bindings/proxyhandler.rs
@@ -6,198 +6,12 @@
 
 #![deny(missing_docs)]
 
-use std::ffi::CStr;
-use std::os::raw::c_char;
-use std::ptr;
+use js::jsapi::{GetObjectRealmOrNull, GetRealmPrincipals, HandleObject as RawHandleObject};
+use js::rust::get_context_realm;
+use script_bindings::principals::ServoJSPrincipalsRef;
+pub(crate) use script_bindings::proxyhandler::*;
 
-use js::conversions::ToJSValConvertible;
-use js::glue::{
-    GetProxyHandler, GetProxyHandlerFamily, GetProxyPrivate, InvokeGetOwnPropertyDescriptor,
-    SetProxyPrivate,
-};
-use js::jsapi;
-use js::jsapi::{
-    DOMProxyShadowsResult, GetObjectRealmOrNull, GetRealmPrincipals, GetStaticPrototype,
-    GetWellKnownSymbol, Handle as RawHandle, HandleId as RawHandleId,
-    HandleObject as RawHandleObject, HandleValue as RawHandleValue, JS_AtomizeAndPinString,
-    JS_DefinePropertyById, JS_GetOwnPropertyDescriptorById, JS_IsExceptionPending, JSAutoRealm,
-    JSContext, JSErrNum, JSFunctionSpec, JSObject, JSPropertySpec,
-    MutableHandle as RawMutableHandle, MutableHandleIdVector as RawMutableHandleIdVector,
-    MutableHandleObject as RawMutableHandleObject, MutableHandleValue as RawMutableHandleValue,
-    ObjectOpResult, PropertyDescriptor, SetDOMProxyInformation, SymbolCode, jsid,
-};
-use js::jsid::SymbolId;
-use js::jsval::{ObjectValue, UndefinedValue};
-use js::rust::wrappers::{
-    AppendToIdVector, JS_AlreadyHasOwnPropertyById, JS_NewObjectWithGivenProto,
-    RUST_INTERNED_STRING_TO_JSID, SetDataPropertyDescriptor,
-};
-use js::rust::{
-    Handle, HandleObject, HandleValue, MutableHandle, MutableHandleObject, get_context_realm,
-};
-
-use crate::dom::bindings::conversions::{is_dom_proxy, jsid_to_string, jsstring_to_str};
-use crate::dom::bindings::error::{Error, throw_dom_exception};
-use crate::dom::bindings::principals::ServoJSPrincipalsRef;
-use crate::dom::bindings::reflector::DomObject;
-use crate::dom::bindings::str::DOMString;
-use crate::dom::bindings::utils::delete_property_by_id;
-use crate::dom::globalscope::{GlobalScope, GlobalScopeHelpers};
-use crate::realms::{AlreadyInRealm, InRealm};
-use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
-
-/// Determine if this id shadows any existing properties for this proxy.
-pub(crate) unsafe extern "C" fn shadow_check_callback(
-    cx: *mut JSContext,
-    object: RawHandleObject,
-    id: RawHandleId,
-) -> DOMProxyShadowsResult {
-    // TODO: support OverrideBuiltins when #12978 is fixed.
-
-    rooted!(in(cx) let mut expando = ptr::null_mut::<JSObject>());
-    get_expando_object(object, expando.handle_mut());
-    if !expando.get().is_null() {
-        let mut has_own = false;
-        let raw_id = Handle::from_raw(id);
-
-        if !JS_AlreadyHasOwnPropertyById(cx, expando.handle(), raw_id, &mut has_own) {
-            return DOMProxyShadowsResult::ShadowCheckFailed;
-        }
-
-        if has_own {
-            return DOMProxyShadowsResult::ShadowsViaDirectExpando;
-        }
-    }
-
-    // Our expando, if any, didn't shadow, so we're not shadowing at all.
-    DOMProxyShadowsResult::DoesntShadow
-}
-
-/// Initialize the infrastructure for DOM proxy objects.
-pub(crate) unsafe fn init() {
-    SetDOMProxyInformation(
-        GetProxyHandlerFamily(),
-        Some(shadow_check_callback),
-        ptr::null(),
-    );
-}
-
-/// Defines an expando on the given `proxy`.
-pub(crate) unsafe extern "C" fn define_property(
-    cx: *mut JSContext,
-    proxy: RawHandleObject,
-    id: RawHandleId,
-    desc: RawHandle<PropertyDescriptor>,
-    result: *mut ObjectOpResult,
-) -> bool {
-    rooted!(in(cx) let mut expando = ptr::null_mut::<JSObject>());
-    ensure_expando_object(cx, proxy, expando.handle_mut());
-    JS_DefinePropertyById(cx, expando.handle().into(), id, desc, result)
-}
-
-/// Deletes an expando off the given `proxy`.
-pub(crate) unsafe extern "C" fn delete(
-    cx: *mut JSContext,
-    proxy: RawHandleObject,
-    id: RawHandleId,
-    bp: *mut ObjectOpResult,
-) -> bool {
-    rooted!(in(cx) let mut expando = ptr::null_mut::<JSObject>());
-    get_expando_object(proxy, expando.handle_mut());
-    if expando.is_null() {
-        (*bp).code_ = 0 /* OkCode */;
-        return true;
-    }
-
-    delete_property_by_id(cx, expando.handle(), Handle::from_raw(id), bp)
-}
-
-/// Controls whether the Extensible bit can be changed
-pub(crate) unsafe extern "C" fn prevent_extensions(
-    _cx: *mut JSContext,
-    _proxy: RawHandleObject,
-    result: *mut ObjectOpResult,
-) -> bool {
-    (*result).code_ = JSErrNum::JSMSG_CANT_PREVENT_EXTENSIONS as ::libc::uintptr_t;
-    true
-}
-
-/// Reports whether the object is Extensible
-pub(crate) unsafe extern "C" fn is_extensible(
-    _cx: *mut JSContext,
-    _proxy: RawHandleObject,
-    succeeded: *mut bool,
-) -> bool {
-    *succeeded = true;
-    true
-}
-
-/// If `proxy` (underneath any functionally-transparent wrapper proxies) has as
-/// its `[[GetPrototypeOf]]` trap the ordinary `[[GetPrototypeOf]]` behavior
-/// defined for ordinary objects, set `*is_ordinary` to true and store `obj`'s
-/// prototype in `proto`.  Otherwise set `*isOrdinary` to false. In case of
-/// error, both outparams have unspecified value.
-///
-/// This implementation always handles the case of the ordinary
-/// `[[GetPrototypeOf]]` behavior. An alternative implementation will be
-/// necessary for maybe-cross-origin objects.
-pub(crate) unsafe extern "C" fn get_prototype_if_ordinary(
-    _: *mut JSContext,
-    proxy: RawHandleObject,
-    is_ordinary: *mut bool,
-    proto: RawMutableHandleObject,
-) -> bool {
-    *is_ordinary = true;
-    proto.set(GetStaticPrototype(proxy.get()));
-    true
-}
-
-/// Get the expando object, or null if there is none.
-pub(crate) unsafe fn get_expando_object(obj: RawHandleObject, mut expando: MutableHandleObject) {
-    assert!(is_dom_proxy(obj.get()));
-    let val = &mut UndefinedValue();
-    GetProxyPrivate(obj.get(), val);
-    expando.set(if val.is_undefined() {
-        ptr::null_mut()
-    } else {
-        val.to_object()
-    });
-}
-
-/// Get the expando object, or create it if it doesn't exist yet.
-/// Fails on JSAPI failure.
-pub(crate) unsafe fn ensure_expando_object(
-    cx: *mut JSContext,
-    obj: RawHandleObject,
-    mut expando: MutableHandleObject,
-) {
-    assert!(is_dom_proxy(obj.get()));
-    get_expando_object(obj, expando.reborrow());
-    if expando.is_null() {
-        expando.set(JS_NewObjectWithGivenProto(
-            cx,
-            ptr::null_mut(),
-            HandleObject::null(),
-        ));
-        assert!(!expando.is_null());
-
-        SetProxyPrivate(obj.get(), &ObjectValue(expando.get()));
-    }
-}
-
-/// Set the property descriptor's object to `obj` and set it to enumerable,
-/// and writable if `readonly` is true.
-pub(crate) fn set_property_descriptor(
-    desc: MutableHandle<PropertyDescriptor>,
-    value: HandleValue,
-    attrs: u32,
-    is_none: &mut bool,
-) {
-    unsafe {
-        SetDataPropertyDescriptor(desc, value, attrs);
-    }
-    *is_none = false;
-}
+use crate::script_runtime::JSContext as SafeJSContext;
 
 /// <https://html.spec.whatwg.org/multipage/#isplatformobjectsameorigin-(-o-)>
 pub(crate) unsafe fn is_platform_object_same_origin(
@@ -232,535 +46,3 @@ pub(crate) unsafe fn is_platform_object_same_origin(
 
     result
 }
-
-/// Report a cross-origin denial for a property, Always returns `false`, so it
-/// can be used as `return report_cross_origin_denial(...);`.
-///
-/// What this function does corresponds to the operations in
-/// <https://html.spec.whatwg.org/multipage/#the-location-interface> denoted as
-/// "Throw a `SecurityError` DOMException".
-pub(crate) unsafe fn report_cross_origin_denial(
-    cx: SafeJSContext,
-    id: RawHandleId,
-    access: &str,
-) -> bool {
-    debug!(
-        "permission denied to {} property {} on cross-origin object",
-        access,
-        id_to_source(cx, id).as_deref().unwrap_or("< error >"),
-    );
-    let in_realm_proof = AlreadyInRealm::assert_for_cx(cx);
-    if !JS_IsExceptionPending(*cx) {
-        let global = GlobalScope::from_context(*cx, InRealm::Already(&in_realm_proof));
-        // TODO: include `id` and `access` in the exception message
-        throw_dom_exception(cx, &global, Error::Security, CanGc::note());
-    }
-    false
-}
-
-unsafe fn id_to_source(cx: SafeJSContext, id: RawHandleId) -> Option<DOMString> {
-    rooted!(in(*cx) let mut value = UndefinedValue());
-    rooted!(in(*cx) let mut jsstr = ptr::null_mut::<jsapi::JSString>());
-    jsapi::JS_IdToValue(*cx, id.get(), value.handle_mut().into())
-        .then(|| {
-            jsstr.set(jsapi::JS_ValueToSource(*cx, value.handle().into()));
-            jsstr.get()
-        })
-        .and_then(ptr::NonNull::new)
-        .map(|jsstr| jsstring_to_str(*cx, jsstr))
-}
-
-/// Property and method specs that correspond to the elements of
-/// [`CrossOriginProperties(O)`].
-///
-/// [`CrossOriginProperties(O)`]: https://html.spec.whatwg.org/multipage/#crossoriginproperties-(-o-)
-pub(crate) struct CrossOriginProperties {
-    pub(crate) attributes: &'static [JSPropertySpec],
-    pub(crate) methods: &'static [JSFunctionSpec],
-}
-
-impl CrossOriginProperties {
-    /// Enumerate the property keys defined by `self`.
-    fn keys(&self) -> impl Iterator<Item = *const c_char> + '_ {
-        // Safety: All cross-origin property keys are strings, not symbols
-        self.attributes
-            .iter()
-            .map(|spec| unsafe { spec.name.string_ })
-            .chain(self.methods.iter().map(|spec| unsafe { spec.name.string_ }))
-            .filter(|ptr| !ptr.is_null())
-    }
-}
-
-/// Implementation of [`CrossOriginOwnPropertyKeys`].
-///
-/// [`CrossOriginOwnPropertyKeys`]: https://html.spec.whatwg.org/multipage/#crossoriginownpropertykeys-(-o-)
-pub(crate) unsafe fn cross_origin_own_property_keys(
-    cx: SafeJSContext,
-    _proxy: RawHandleObject,
-    cross_origin_properties: &'static CrossOriginProperties,
-    props: RawMutableHandleIdVector,
-) -> bool {
-    // > 2. For each `e` of `! CrossOriginProperties(O)`, append
-    // >    `e.[[Property]]` to `keys`.
-    for key in cross_origin_properties.keys() {
-        rooted!(in(*cx) let rooted = JS_AtomizeAndPinString(*cx, key));
-        rooted!(in(*cx) let mut rooted_jsid: jsid);
-        RUST_INTERNED_STRING_TO_JSID(*cx, rooted.handle().get(), rooted_jsid.handle_mut());
-        AppendToIdVector(props, rooted_jsid.handle());
-    }
-
-    // > 3. Return the concatenation of `keys` and `« "then", @@toStringTag,
-    // > @@hasInstance, @@isConcatSpreadable »`.
-    append_cross_origin_allowlisted_prop_keys(cx, props);
-
-    true
-}
-
-/// Implementation of `[[Set]]` for [`Location`].
-///
-/// [`Location`]: https://html.spec.whatwg.org/multipage/#location-set
-pub(crate) unsafe extern "C" fn maybe_cross_origin_set_rawcx(
-    cx: *mut JSContext,
-    proxy: RawHandleObject,
-    id: RawHandleId,
-    v: RawHandleValue,
-    receiver: RawHandleValue,
-    result: *mut ObjectOpResult,
-) -> bool {
-    let cx = SafeJSContext::from_ptr(cx);
-
-    if !is_platform_object_same_origin(cx, proxy) {
-        return cross_origin_set(cx, proxy, id, v, receiver, result);
-    }
-
-    // Safe to enter the Realm of proxy now.
-    let _ac = JSAutoRealm::new(*cx, proxy.get());
-
-    // OrdinarySet
-    // <https://tc39.es/ecma262/#sec-ordinaryset>
-    rooted!(in(*cx) let mut own_desc = PropertyDescriptor::default());
-    let mut is_none = false;
-    if !InvokeGetOwnPropertyDescriptor(
-        GetProxyHandler(*proxy),
-        *cx,
-        proxy,
-        id,
-        own_desc.handle_mut().into(),
-        &mut is_none,
-    ) {
-        return false;
-    }
-
-    js::jsapi::SetPropertyIgnoringNamedGetter(
-        *cx,
-        proxy,
-        id,
-        v,
-        receiver,
-        own_desc.handle().into(),
-        result,
-    )
-}
-
-pub(crate) unsafe extern "C" fn maybe_cross_origin_get_prototype_if_ordinary_rawcx(
-    _: *mut JSContext,
-    _proxy: RawHandleObject,
-    is_ordinary: *mut bool,
-    _proto: RawMutableHandleObject,
-) -> bool {
-    // We have a custom `[[GetPrototypeOf]]`, so return `false`
-    *is_ordinary = false;
-    true
-}
-
-/// Implementation of `[[GetPrototypeOf]]` for [`Location`].
-///
-/// [`Location`]: https://html.spec.whatwg.org/multipage/#location-getprototypeof
-pub(crate) unsafe fn maybe_cross_origin_get_prototype<D: crate::DomTypes>(
-    cx: SafeJSContext,
-    proxy: RawHandleObject,
-    get_proto_object: unsafe fn(cx: SafeJSContext, global: HandleObject, rval: MutableHandleObject),
-    proto: RawMutableHandleObject,
-) -> bool {
-    // > 1. If ! IsPlatformObjectSameOrigin(this) is true, then return ! OrdinaryGetPrototypeOf(this).
-    if is_platform_object_same_origin(cx, proxy) {
-        let ac = JSAutoRealm::new(*cx, proxy.get());
-        let global = D::GlobalScope::from_context(*cx, InRealm::Entered(&ac));
-        get_proto_object(
-            cx,
-            global.reflector().get_jsobject(),
-            MutableHandleObject::from_raw(proto),
-        );
-        return !proto.is_null();
-    }
-
-    // > 2. Return null.
-    proto.set(ptr::null_mut());
-    true
-}
-
-/// Implementation of `[[SetPrototypeOf]]` for [`Location`] and [`WindowProxy`].
-///
-/// [`Location`]: https://html.spec.whatwg.org/multipage/#location-setprototypeof
-/// [`WindowProxy`]: https://html.spec.whatwg.org/multipage/#windowproxy-setprototypeof
-pub(crate) unsafe extern "C" fn maybe_cross_origin_set_prototype_rawcx(
-    cx: *mut JSContext,
-    proxy: RawHandleObject,
-    proto: RawHandleObject,
-    result: *mut ObjectOpResult,
-) -> bool {
-    // > 1. Return `! SetImmutablePrototype(this, V)`.
-    //
-    // <https://tc39.es/ecma262/#sec-set-immutable-prototype>:
-    //
-    // > 1. Assert: Either `Type(V)` is Object or `Type(V)` is Null.
-    //
-    // > 2. Let current be `? O.[[GetPrototypeOf]]()`.
-    rooted!(in(cx) let mut current = ptr::null_mut::<JSObject>());
-    if !jsapi::GetObjectProto(cx, proxy, current.handle_mut().into()) {
-        return false;
-    }
-
-    // > 3. If `SameValue(V, current)` is true, return true.
-    if proto.get() == current.get() {
-        (*result).code_ = 0 /* OkCode */;
-        return true;
-    }
-
-    // > 4. Return false.
-    (*result).code_ = JSErrNum::JSMSG_CANT_SET_PROTO as usize;
-    true
-}
-
-/// Implementation of [`CrossOriginGet`].
-///
-/// `cx` and `proxy` are expected to be different-Realm here. `proxy` is a proxy
-/// for a maybe-cross-origin object.
-///
-/// [`CrossOriginGet`]: https://html.spec.whatwg.org/multipage/#crossoriginget-(-o,-p,-receiver-)
-pub(crate) unsafe fn cross_origin_get(
-    cx: SafeJSContext,
-    proxy: RawHandleObject,
-    receiver: RawHandleValue,
-    id: RawHandleId,
-    vp: RawMutableHandleValue,
-) -> bool {
-    // > 1. Let `desc` be `? O.[[GetOwnProperty]](P)`.
-    rooted!(in(*cx) let mut descriptor = PropertyDescriptor::default());
-    let mut is_none = false;
-    if !InvokeGetOwnPropertyDescriptor(
-        GetProxyHandler(*proxy),
-        *cx,
-        proxy,
-        id,
-        descriptor.handle_mut().into(),
-        &mut is_none,
-    ) {
-        return false;
-    }
-
-    // > 2. Assert: `desc` is not undefined.
-    assert!(
-        !is_none,
-        "Callees should throw in all cases when they are not finding \
-        a property decriptor"
-    );
-
-    // > 3. If `! IsDataDescriptor(desc)` is true, then return `desc.[[Value]]`.
-    if is_data_descriptor(&descriptor) {
-        vp.set(descriptor.value_);
-        return true;
-    }
-
-    // > 4. Assert: `IsAccessorDescriptor(desc)` is `true`.
-    assert!(is_accessor_descriptor(&descriptor));
-
-    // > 5. Let `getter` be `desc.[[Get]]`.
-    // >
-    // > 6. If `getter` is `undefined`, then throw a `SecurityError`
-    // >    `DOMException`.
-    rooted!(in(*cx) let mut getter = ptr::null_mut::<JSObject>());
-    get_getter_object(&descriptor, getter.handle_mut().into());
-    if getter.get().is_null() {
-        return report_cross_origin_denial(cx, id, "get");
-    }
-
-    rooted!(in(*cx) let mut getter_jsval = UndefinedValue());
-    getter.get().to_jsval(*cx, getter_jsval.handle_mut());
-
-    // > 7. Return `? Call(getter, Receiver)`.
-    jsapi::Call(
-        *cx,
-        receiver,
-        getter_jsval.handle().into(),
-        &jsapi::HandleValueArray::empty(),
-        vp,
-    )
-}
-
-/// Implementation of [`CrossOriginSet`].
-///
-/// `cx` and `proxy` are expected to be different-Realm here. `proxy` is a proxy
-/// for a maybe-cross-origin object.
-///
-/// [`CrossOriginSet`]: https://html.spec.whatwg.org/multipage/#crossoriginset-(-o,-p,-v,-receiver-)
-pub(crate) unsafe fn cross_origin_set(
-    cx: SafeJSContext,
-    proxy: RawHandleObject,
-    id: RawHandleId,
-    v: RawHandleValue,
-    receiver: RawHandleValue,
-    result: *mut ObjectOpResult,
-) -> bool {
-    // > 1. Let desc be ? O.[[GetOwnProperty]](P).
-    rooted!(in(*cx) let mut descriptor = PropertyDescriptor::default());
-    let mut is_none = false;
-    if !InvokeGetOwnPropertyDescriptor(
-        GetProxyHandler(*proxy),
-        *cx,
-        proxy,
-        id,
-        descriptor.handle_mut().into(),
-        &mut is_none,
-    ) {
-        return false;
-    }
-
-    // > 2. Assert: desc is not undefined.
-    assert!(
-        !is_none,
-        "Callees should throw in all cases when they are not finding \
-        a property decriptor"
-    );
-
-    // > 3. If desc.[[Set]] is present and its value is not undefined,
-    // >    then: [...]
-    rooted!(in(*cx) let mut setter = ptr::null_mut::<JSObject>());
-    get_setter_object(&descriptor, setter.handle_mut().into());
-    if setter.get().is_null() {
-        // > 4. Throw a "SecurityError" DOMException.
-        return report_cross_origin_denial(cx, id, "set");
-    }
-
-    rooted!(in(*cx) let mut setter_jsval = UndefinedValue());
-    setter.get().to_jsval(*cx, setter_jsval.handle_mut());
-
-    // > 3.1. Perform ? Call(setter, Receiver, «V»).
-    // >
-    // > 3.2. Return true.
-    rooted!(in(*cx) let mut ignored = UndefinedValue());
-    if !jsapi::Call(
-        *cx,
-        receiver,
-        setter_jsval.handle().into(),
-        // FIXME: Our binding lacks `HandleValueArray(Handle<Value>)`
-        // <https://searchfox.org/mozilla-central/rev/072710086ddfe25aa2962c8399fefb2304e8193b/js/public/ValueArray.h#54-55>
-        &jsapi::HandleValueArray {
-            length_: 1,
-            elements_: v.ptr,
-        },
-        ignored.handle_mut().into(),
-    ) {
-        return false;
-    }
-
-    (*result).code_ = 0 /* OkCode */;
-    true
-}
-
-unsafe fn get_getter_object(d: &PropertyDescriptor, out: RawMutableHandleObject) {
-    if d.hasGetter_() {
-        out.set(d.getter_);
-    }
-}
-
-unsafe fn get_setter_object(d: &PropertyDescriptor, out: RawMutableHandleObject) {
-    if d.hasSetter_() {
-        out.set(d.setter_);
-    }
-}
-
-/// <https://tc39.es/ecma262/#sec-isaccessordescriptor>
-fn is_accessor_descriptor(d: &PropertyDescriptor) -> bool {
-    d.hasSetter_() || d.hasGetter_()
-}
-
-/// <https://tc39.es/ecma262/#sec-isdatadescriptor>
-fn is_data_descriptor(d: &PropertyDescriptor) -> bool {
-    d.hasWritable_() || d.hasValue_()
-}
-
-/// Evaluate `CrossOriginGetOwnPropertyHelper(proxy, id) != null`.
-/// SpiderMonkey-specific.
-///
-/// `cx` and `proxy` are expected to be different-Realm here. `proxy` is a proxy
-/// for a maybe-cross-origin object.
-pub(crate) unsafe fn cross_origin_has_own(
-    cx: SafeJSContext,
-    _proxy: RawHandleObject,
-    cross_origin_properties: &'static CrossOriginProperties,
-    id: RawHandleId,
-    bp: *mut bool,
-) -> bool {
-    // TODO: Once we have the slot for the holder, it'd be more efficient to
-    //       use `ensure_cross_origin_property_holder`. We'll need `_proxy` to
-    //       do that.
-    *bp = jsid_to_string(*cx, Handle::from_raw(id)).is_some_and(|key| {
-        cross_origin_properties.keys().any(|defined_key| {
-            let defined_key = CStr::from_ptr(defined_key);
-            defined_key.to_bytes() == key.as_bytes()
-        })
-    });
-
-    true
-}
-
-/// Implementation of [`CrossOriginGetOwnPropertyHelper`].
-///
-/// `cx` and `proxy` are expected to be different-Realm here. `proxy` is a proxy
-/// for a maybe-cross-origin object.
-///
-/// [`CrossOriginGetOwnPropertyHelper`]: https://html.spec.whatwg.org/multipage/#crossorigingetownpropertyhelper-(-o,-p-)
-pub(crate) unsafe fn cross_origin_get_own_property_helper(
-    cx: SafeJSContext,
-    proxy: RawHandleObject,
-    cross_origin_properties: &'static CrossOriginProperties,
-    id: RawHandleId,
-    desc: RawMutableHandle<PropertyDescriptor>,
-    is_none: &mut bool,
-) -> bool {
-    rooted!(in(*cx) let mut holder = ptr::null_mut::<JSObject>());
-
-    ensure_cross_origin_property_holder(
-        cx,
-        proxy,
-        cross_origin_properties,
-        holder.handle_mut().into(),
-    );
-
-    JS_GetOwnPropertyDescriptorById(*cx, holder.handle().into(), id, desc, is_none)
-}
-
-/// Implementation of [`CrossOriginPropertyFallback`].
-///
-/// `cx` and `proxy` are expected to be different-Realm here. `proxy` is a proxy
-/// for a maybe-cross-origin object.
-///
-/// [`CrossOriginPropertyFallback`]: https://html.spec.whatwg.org/multipage/#crossoriginpropertyfallback-(-p-)
-pub(crate) unsafe fn cross_origin_property_fallback(
-    cx: SafeJSContext,
-    _proxy: RawHandleObject,
-    id: RawHandleId,
-    desc: RawMutableHandle<PropertyDescriptor>,
-    is_none: &mut bool,
-) -> bool {
-    assert!(*is_none, "why are we being called?");
-
-    // > 1. If P is `then`, `@@toStringTag`, `@@hasInstance`, or
-    // >    `@@isConcatSpreadable`, then return `PropertyDescriptor{ [[Value]]:
-    // >    undefined, [[Writable]]: false, [[Enumerable]]: false,
-    // >    [[Configurable]]: true }`.
-    if is_cross_origin_allowlisted_prop(cx, id) {
-        set_property_descriptor(
-            MutableHandle::from_raw(desc),
-            HandleValue::undefined(),
-            jsapi::JSPROP_READONLY as u32,
-            is_none,
-        );
-        return true;
-    }
-
-    // > 2. Throw a `SecurityError` `DOMException`.
-    report_cross_origin_denial(cx, id, "access")
-}
-
-const ALLOWLISTED_SYMBOL_CODES: &[SymbolCode] = &[
-    SymbolCode::toStringTag,
-    SymbolCode::hasInstance,
-    SymbolCode::isConcatSpreadable,
-];
-
-unsafe fn is_cross_origin_allowlisted_prop(cx: SafeJSContext, id: RawHandleId) -> bool {
-    if jsid_to_string(*cx, Handle::from_raw(id)).is_some_and(|st| st == "then") {
-        return true;
-    }
-
-    rooted!(in(*cx) let mut allowed_id: jsid);
-    ALLOWLISTED_SYMBOL_CODES.iter().any(|&allowed_code| {
-        allowed_id.set(SymbolId(GetWellKnownSymbol(*cx, allowed_code)));
-        // `jsid`s containing `JS::Symbol *` can be compared by
-        // referential equality
-        allowed_id.get().asBits_ == id.asBits_
-    })
-}
-
-/// Append `« "then", @@toStringTag, @@hasInstance, @@isConcatSpreadable »` to
-/// `props`. This is used to implement [`CrossOriginOwnPropertyKeys`].
-///
-/// [`CrossOriginOwnPropertyKeys`]: https://html.spec.whatwg.org/multipage/#crossoriginownpropertykeys-(-o-)
-unsafe fn append_cross_origin_allowlisted_prop_keys(
-    cx: SafeJSContext,
-    props: RawMutableHandleIdVector,
-) {
-    rooted!(in(*cx) let mut id: jsid);
-
-    let jsstring = JS_AtomizeAndPinString(*cx, c"then".as_ptr());
-    rooted!(in(*cx) let rooted = jsstring);
-    RUST_INTERNED_STRING_TO_JSID(*cx, rooted.handle().get(), id.handle_mut());
-    AppendToIdVector(props, id.handle());
-
-    for &allowed_code in ALLOWLISTED_SYMBOL_CODES.iter() {
-        id.set(SymbolId(GetWellKnownSymbol(*cx, allowed_code)));
-        AppendToIdVector(props, id.handle());
-    }
-}
-
-/// Get the holder for cross-origin properties for the current global of the
-/// `JSContext`, creating one and storing it in a slot of the proxy object if it
-/// doesn't exist yet.
-///
-/// This essentially creates a cache of [`CrossOriginGetOwnPropertyHelper`]'s
-/// results for all property keys.
-///
-/// `cx` and `proxy` are expected to be different-Realm here. `proxy` is a proxy
-/// for a maybe-cross-origin object. The `out_holder` return value will always
-/// be in the Realm of `cx`.
-///
-/// [`CrossOriginGetOwnPropertyHelper`]: https://html.spec.whatwg.org/multipage/#crossorigingetownpropertyhelper-(-o,-p-)
-unsafe fn ensure_cross_origin_property_holder(
-    cx: SafeJSContext,
-    _proxy: RawHandleObject,
-    cross_origin_properties: &'static CrossOriginProperties,
-    out_holder: RawMutableHandleObject,
-) -> bool {
-    // TODO: We don't have the slot to store the holder yet. For now,
-    //       the holder is constructed every time this function is called,
-    //       which is not only inefficient but also deviates from the
-    //       specification in a subtle yet observable way.
-
-    // Create a holder for the current Realm
-    out_holder.set(jsapi::JS_NewObjectWithGivenProto(
-        *cx,
-        ptr::null_mut(),
-        RawHandleObject::null(),
-    ));
-
-    if out_holder.get().is_null() ||
-        !jsapi::JS_DefineProperties(
-            *cx,
-            out_holder.handle(),
-            cross_origin_properties.attributes.as_ptr(),
-        ) ||
-        !jsapi::JS_DefineFunctions(
-            *cx,
-            out_holder.handle(),
-            cross_origin_properties.methods.as_ptr(),
-        )
-    {
-        return false;
-    }
-
-    // TODO: Store the holder in the slot that we don't have yet.
-
-    true
-}
diff --git a/components/script/dom/bindings/reflector.rs b/components/script/dom/bindings/reflector.rs
index 3593578a66f..0a5afbce487 100644
--- a/components/script/dom/bindings/reflector.rs
+++ b/components/script/dom/bindings/reflector.rs
@@ -5,15 +5,14 @@
 //! The `Reflector` struct.
 
 use js::rust::HandleObject;
+use script_bindings::interfaces::GlobalScopeHelpers;
 
 use crate::DomTypes;
 use crate::dom::bindings::conversions::DerivedFrom;
-use crate::dom::bindings::iterable::{Iterable, IterableIterator};
-use crate::dom::bindings::root::{Dom, DomRoot, Root};
-use crate::dom::bindings::trace::JSTraceable;
-use crate::dom::globalscope::{GlobalScope, GlobalScopeHelpers};
-use crate::realms::{AlreadyInRealm, InRealm};
-use crate::script_runtime::{CanGc, JSContext};
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::globalscope::GlobalScope;
+use crate::realms::InRealm;
+use crate::script_runtime::CanGc;
 
 /// Create the reflector for a new DOM object and yield ownership to the
 /// reflector.
@@ -42,31 +41,6 @@ where
     unsafe { T::WRAP(D::GlobalScope::get_cx(), global_scope, proto, obj, can_gc) }
 }
 
-pub(crate) trait DomGlobalGeneric<D: DomTypes>: DomObject {
-    /// Returns the [`GlobalScope`] of the realm that the [`DomObject`] was created in.  If this
-    /// object is a `Node`, this will be different from it's owning `Document` if adopted by. For
-    /// `Node`s it's almost always better to use `NodeTraits::owning_global`.
-    fn global_(&self, realm: InRealm) -> DomRoot<D::GlobalScope>
-    where
-        Self: Sized,
-    {
-        D::GlobalScope::from_reflector(self, realm)
-    }
-
-    /// Returns the [`GlobalScope`] of the realm that the [`DomObject`] was created in.  If this
-    /// object is a `Node`, this will be different from it's owning `Document` if adopted by. For
-    /// `Node`s it's almost always better to use `NodeTraits::owning_global`.
-    fn global(&self) -> DomRoot<D::GlobalScope>
-    where
-        Self: Sized,
-    {
-        let realm = AlreadyInRealm::assert_for_cx(D::GlobalScope::get_cx());
-        D::GlobalScope::from_reflector(self, InRealm::already(&realm))
-    }
-}
-
-impl<D: DomTypes, T: DomObject> DomGlobalGeneric<D> for T {}
-
 pub(crate) trait DomGlobal {
     fn global_(&self, realm: InRealm) -> DomRoot<GlobalScope>;
     fn global(&self) -> DomRoot<GlobalScope>;
@@ -81,35 +55,4 @@ impl<T: DomGlobalGeneric<crate::DomTypeHolder>> DomGlobal for T {
     }
 }
 
-pub(crate) use script_bindings::reflector::{DomObject, MutDomObject, Reflector};
-
-/// A trait to provide a function pointer to wrap function for DOM objects.
-pub(crate) trait DomObjectWrap<D: DomTypes>:
-    Sized + DomObject + DomGlobalGeneric<D>
-{
-    /// Function pointer to the general wrap function type
-    #[allow(clippy::type_complexity)]
-    const WRAP: unsafe fn(
-        JSContext,
-        &D::GlobalScope,
-        Option<HandleObject>,
-        Box<Self>,
-        CanGc,
-    ) -> Root<Dom<Self>>;
-}
-
-/// A trait to provide a function pointer to wrap function for
-/// DOM iterator interfaces.
-pub(crate) trait DomObjectIteratorWrap<D: DomTypes>:
-    DomObjectWrap<D> + JSTraceable + Iterable
-{
-    /// Function pointer to the wrap function for `IterableIterator<T>`
-    #[allow(clippy::type_complexity)]
-    const ITER_WRAP: unsafe fn(
-        JSContext,
-        &D::GlobalScope,
-        Option<HandleObject>,
-        Box<IterableIterator<D, Self>>,
-        CanGc,
-    ) -> Root<Dom<IterableIterator<D, Self>>>;
-}
+pub(crate) use script_bindings::reflector::*;
diff --git a/components/script/dom/bindings/root.rs b/components/script/dom/bindings/root.rs
index 4e8cbf21882..923aa51351d 100644
--- a/components/script/dom/bindings/root.rs
+++ b/components/script/dom/bindings/root.rs
@@ -57,26 +57,6 @@ impl Drop for ThreadLocalStackRoots<'_> {
     }
 }
 
-/// Get a slice of references to DOM objects.
-pub(crate) trait DomSlice<T>
-where
-    T: JSTraceable + DomObject,
-{
-    /// Returns the slice of `T` references.
-    fn r(&self) -> &[&T];
-}
-
-impl<T> DomSlice<T> for [Dom<T>]
-where
-    T: JSTraceable + DomObject,
-{
-    #[inline]
-    fn r(&self) -> &[&T] {
-        let _ = mem::transmute::<Dom<T>, &T>;
-        unsafe { &*(self as *const [Dom<T>] as *const [&T]) }
-    }
-}
-
 pub(crate) trait ToLayout<T> {
     /// Returns `LayoutDom<T>` containing the same pointer.
     ///
diff --git a/components/script/dom/bindings/serializable.rs b/components/script/dom/bindings/serializable.rs
index b791b0ebc1a..d0e851b4799 100644
--- a/components/script/dom/bindings/serializable.rs
+++ b/components/script/dom/bindings/serializable.rs
@@ -6,13 +6,12 @@
 //! (<https://html.spec.whatwg.org/multipage/#serializable-objects>).
 
 use std::collections::HashMap;
-use std::num::NonZeroU32;
 
-use base::id::PipelineNamespaceId;
+use base::id::{Index, NamespaceIndex, PipelineNamespaceId};
 
 use crate::dom::bindings::reflector::DomObject;
 use crate::dom::bindings::root::DomRoot;
-use crate::dom::bindings::structuredclone::{StructuredData, StructuredDataReader};
+use crate::dom::bindings::structuredclone::StructuredData;
 use crate::dom::globalscope::GlobalScope;
 use crate::script_runtime::CanGc;
 
@@ -25,9 +24,9 @@ pub(crate) struct StorageKey {
 }
 
 impl StorageKey {
-    pub(crate) fn new(name_space: PipelineNamespaceId, index: NonZeroU32) -> StorageKey {
-        let name_space = name_space.0.to_ne_bytes();
-        let index = index.get().to_ne_bytes();
+    pub(crate) fn new<T>(index: NamespaceIndex<T>) -> StorageKey {
+        let name_space = index.namespace_id.0.to_ne_bytes();
+        let index = index.index.0.get().to_ne_bytes();
         StorageKey {
             index: u32::from_ne_bytes(index),
             name_space: u32::from_ne_bytes(name_space),
@@ -35,11 +34,13 @@ impl StorageKey {
     }
 }
 
-pub(crate) trait IntoStorageKey
-where
-    Self: Sized,
-{
-    fn into_storage_key(self) -> StorageKey;
+impl<T> From<StorageKey> for NamespaceIndex<T> {
+    fn from(key: StorageKey) -> NamespaceIndex<T> {
+        NamespaceIndex {
+            namespace_id: PipelineNamespaceId(key.name_space),
+            index: Index::new(key.index).expect("Index must not be zero"),
+        }
+    }
 }
 
 /// Interface for serializable platform objects.
@@ -48,11 +49,11 @@ pub(crate) trait Serializable: DomObject
 where
     Self: Sized,
 {
-    type Id: Copy + Eq + std::hash::Hash + IntoStorageKey + From<StorageKey>;
+    type Index: Copy + Eq + std::hash::Hash;
     type Data;
 
     /// <https://html.spec.whatwg.org/multipage/#serialization-steps>
-    fn serialize(&self) -> Result<(Self::Id, Self::Data), ()>;
+    fn serialize(&self) -> Result<(NamespaceIndex<Self::Index>, Self::Data), ()>;
     /// <https://html.spec.whatwg.org/multipage/#deserialization-steps>
     fn deserialize(
         owner: &GlobalScope,
@@ -64,11 +65,7 @@ where
 
     /// Returns the field of [StructuredDataReader]/[StructuredDataWriter] that
     /// should be used to read/store serialized instances of this type.
-    fn serialized_storage(data: StructuredData<'_>) -> &mut Option<HashMap<Self::Id, Self::Data>>;
-
-    /// Returns the field of [StructuredDataReader] that should be used to store
-    /// deserialized instances of this type.
-    fn deserialized_storage(
-        reader: &mut StructuredDataReader,
-    ) -> &mut Option<HashMap<StorageKey, DomRoot<Self>>>;
+    fn serialized_storage<'a>(
+        data: StructuredData<'a, '_>,
+    ) -> &'a mut Option<HashMap<NamespaceIndex<Self::Index>, Self::Data>>;
 }
diff --git a/components/script/dom/bindings/settings_stack.rs b/components/script/dom/bindings/settings_stack.rs
index 1284931c349..8e00d03a953 100644
--- a/components/script/dom/bindings/settings_stack.rs
+++ b/components/script/dom/bindings/settings_stack.rs
@@ -3,36 +3,20 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use std::cell::RefCell;
-use std::marker::PhantomData;
-use std::thread;
 
-use js::jsapi::{GetScriptedCallerGlobal, HideScriptedCaller, JSTracer, UnhideScriptedCaller};
+use js::jsapi::{GetScriptedCallerGlobal, JSTracer};
 use js::rust::Runtime;
+use script_bindings::settings_stack::*;
 
-use crate::DomTypes;
-use crate::dom::bindings::root::{Dom, DomRoot};
+//use script_bindings::interfaces::{DomHelpers, GlobalScopeHelpers};
+use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::trace::JSTraceable;
-use crate::dom::bindings::utils::DomHelpers;
-use crate::dom::globalscope::{GlobalScope, GlobalScopeHelpers};
-use crate::script_runtime::CanGc;
+use crate::dom::globalscope::GlobalScope;
 
 thread_local!(pub(super) static STACK: RefCell<Vec<StackEntry<crate::DomTypeHolder>>> = const {
     RefCell::new(Vec::new())
 });
 
-#[derive(Debug, Eq, JSTraceable, PartialEq)]
-enum StackEntryKind {
-    Incumbent,
-    Entry,
-}
-
-#[cfg_attr(crown, allow(crown::unrooted_must_root))]
-#[derive(JSTraceable)]
-pub(crate) struct StackEntry<D: DomTypes> {
-    global: Dom<D::GlobalScope>,
-    kind: StackEntryKind,
-}
-
 /// Traces the script settings stack.
 pub(crate) unsafe fn trace(tracer: *mut JSTracer) {
     STACK.with(|stack| {
@@ -46,61 +30,6 @@ pub(crate) fn is_execution_stack_empty() -> bool {
 
 pub(crate) type AutoEntryScript = GenericAutoEntryScript<crate::DomTypeHolder>;
 
-/// RAII struct that pushes and pops entries from the script settings stack.
-pub(crate) struct GenericAutoEntryScript<D: DomTypes> {
-    global: DomRoot<D::GlobalScope>,
-    #[cfg(feature = "tracing")]
-    #[allow(dead_code)]
-    span: tracing::span::EnteredSpan,
-}
-
-impl<D: DomTypes> GenericAutoEntryScript<D> {
-    /// <https://html.spec.whatwg.org/multipage/#prepare-to-run-script>
-    pub(crate) fn new(global: &D::GlobalScope) -> Self {
-        let settings_stack = <D as DomHelpers<D>>::settings_stack();
-        settings_stack.with(|stack| {
-            trace!("Prepare to run script with {:p}", global);
-            let mut stack = stack.borrow_mut();
-            stack.push(StackEntry {
-                global: Dom::from_ref(global),
-                kind: StackEntryKind::Entry,
-            });
-            Self {
-                global: DomRoot::from_ref(global),
-                #[cfg(feature = "tracing")]
-                span: tracing::info_span!(
-                    "ScriptEvaluate",
-                    servo_profiling = true,
-                    url = global.get_url().to_string(),
-                )
-                .entered(),
-            }
-        })
-    }
-}
-
-impl<D: DomTypes> Drop for GenericAutoEntryScript<D> {
-    /// <https://html.spec.whatwg.org/multipage/#clean-up-after-running-script>
-    fn drop(&mut self) {
-        let settings_stack = <D as DomHelpers<D>>::settings_stack();
-        settings_stack.with(|stack| {
-            let mut stack = stack.borrow_mut();
-            let entry = stack.pop().unwrap();
-            assert_eq!(
-                &*entry.global as *const D::GlobalScope, &*self.global as *const D::GlobalScope,
-                "Dropped AutoEntryScript out of order."
-            );
-            assert_eq!(entry.kind, StackEntryKind::Entry);
-            trace!("Clean up after running script with {:p}", &*entry.global);
-        });
-
-        // Step 5
-        if !thread::panicking() && incumbent_global().is_none() {
-            self.global.perform_a_microtask_checkpoint(CanGc::note());
-        }
-    }
-}
-
 /// Returns the ["entry"] global object.
 ///
 /// ["entry"]: https://html.spec.whatwg.org/multipage/#entry
@@ -117,67 +46,7 @@ pub(crate) fn entry_global() -> DomRoot<GlobalScope> {
         .unwrap()
 }
 
-/// RAII struct that pushes and pops entries from the script settings stack.
-pub(crate) struct GenericAutoIncumbentScript<D: DomTypes> {
-    global: usize,
-    _marker: PhantomData<D>,
-}
-
-pub(crate) type AutoIncumbentScript = GenericAutoIncumbentScript<crate::DomTypeHolder>;
-
-impl<D: DomTypes> GenericAutoIncumbentScript<D> {
-    /// <https://html.spec.whatwg.org/multipage/#prepare-to-run-a-callback>
-    pub(crate) fn new(global: &D::GlobalScope) -> Self {
-        // Step 2-3.
-        unsafe {
-            let cx =
-                Runtime::get().expect("Creating a new incumbent script after runtime shutdown");
-            HideScriptedCaller(cx.as_ptr());
-        }
-        let settings_stack = <D as DomHelpers<D>>::settings_stack();
-        settings_stack.with(|stack| {
-            trace!("Prepare to run a callback with {:p}", global);
-            // Step 1.
-            let mut stack = stack.borrow_mut();
-            stack.push(StackEntry {
-                global: Dom::from_ref(global),
-                kind: StackEntryKind::Incumbent,
-            });
-            Self {
-                global: global as *const _ as usize,
-                _marker: PhantomData,
-            }
-        })
-    }
-}
-
-impl<D: DomTypes> Drop for GenericAutoIncumbentScript<D> {
-    /// <https://html.spec.whatwg.org/multipage/#clean-up-after-running-a-callback>
-    fn drop(&mut self) {
-        let settings_stack = <D as DomHelpers<D>>::settings_stack();
-        settings_stack.with(|stack| {
-            // Step 4.
-            let mut stack = stack.borrow_mut();
-            let entry = stack.pop().unwrap();
-            // Step 3.
-            assert_eq!(
-                &*entry.global as *const D::GlobalScope as usize, self.global,
-                "Dropped AutoIncumbentScript out of order."
-            );
-            assert_eq!(entry.kind, StackEntryKind::Incumbent);
-            trace!(
-                "Clean up after running a callback with {:p}",
-                &*entry.global
-            );
-        });
-        unsafe {
-            // Step 1-2.
-            if let Some(cx) = Runtime::get() {
-                UnhideScriptedCaller(cx.as_ptr());
-            }
-        }
-    }
-}
+pub type AutoIncumbentScript = GenericAutoIncumbentScript<crate::DomTypeHolder>;
 
 /// Returns the ["incumbent"] global object.
 ///
diff --git a/components/script/dom/bindings/structuredclone.rs b/components/script/dom/bindings/structuredclone.rs
index ee3f50315f4..70638238123 100644
--- a/components/script/dom/bindings/structuredclone.rs
+++ b/components/script/dom/bindings/structuredclone.rs
@@ -5,18 +5,25 @@
 //! This module implements structured cloning, as defined by [HTML](https://html.spec.whatwg.org/multipage/#safe-passing-of-structured-data).
 
 use std::collections::HashMap;
-use std::num::NonZeroU32;
+use std::ffi::CStr;
 use std::os::raw;
 use std::ptr;
 
-use base::id::{BlobId, DomPointId, MessagePortId, PipelineNamespaceId};
+use base::id::{
+    BlobId, DomExceptionId, DomPointId, Index, MessagePortId, NamespaceIndex, PipelineNamespaceId,
+};
+use constellation_traits::{
+    BlobImpl, DomException, DomPoint, MessagePortImpl, Serializable as SerializableInterface,
+    StructuredSerializedData, Transferrable as TransferrableInterface,
+};
+use js::gc::RootedVec;
 use js::glue::{
     CopyJSStructuredCloneData, DeleteJSAutoStructuredCloneBuffer, GetLengthOfJSStructuredCloneData,
     NewJSAutoStructuredCloneBuffer, WriteBytesToJSStructuredCloneData,
 };
 use js::jsapi::{
-    CloneDataPolicy, HandleObject as RawHandleObject, JS_ClearPendingException, JS_ReadUint32Pair,
-    JS_STRUCTURED_CLONE_VERSION, JS_WriteUint32Pair, JSContext, JSObject,
+    CloneDataPolicy, HandleObject as RawHandleObject, Heap, JS_ClearPendingException,
+    JS_ReadUint32Pair, JS_STRUCTURED_CLONE_VERSION, JS_WriteUint32Pair, JSContext, JSObject,
     JSStructuredCloneCallbacks, JSStructuredCloneReader, JSStructuredCloneWriter,
     MutableHandleObject as RawMutableHandleObject, StructuredCloneScope, TransferableOwnership,
 };
@@ -24,24 +31,21 @@ use js::jsval::UndefinedValue;
 use js::rust::wrappers::{JS_ReadStructuredClone, JS_WriteStructuredClone};
 use js::rust::{CustomAutoRooterGuard, HandleValue, MutableHandleValue};
 use script_bindings::conversions::IDLInterface;
-use script_traits::serializable::{BlobImpl, DomPoint};
-use script_traits::transferable::MessagePortImpl;
-use script_traits::{
-    Serializable as SerializableInterface, StructuredSerializedData,
-    Transferrable as TransferrableInterface,
-};
 use strum::IntoEnumIterator;
 
 use crate::dom::bindings::conversions::{ToJSValConvertible, root_from_object};
 use crate::dom::bindings::error::{Error, Fallible};
 use crate::dom::bindings::root::DomRoot;
-use crate::dom::bindings::serializable::{IntoStorageKey, Serializable, StorageKey};
-use crate::dom::bindings::transferable::{ExtractComponents, IdFromComponents, Transferable};
+use crate::dom::bindings::serializable::{Serializable, StorageKey};
+use crate::dom::bindings::transferable::Transferable;
 use crate::dom::blob::Blob;
 use crate::dom::dompoint::DOMPoint;
 use crate::dom::dompointreadonly::DOMPointReadOnly;
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::messageport::MessagePort;
+use crate::dom::readablestream::ReadableStream;
+use crate::dom::types::{DOMException, TransformStream};
+use crate::dom::writablestream::WritableStream;
 use crate::realms::{AlreadyInRealm, InRealm, enter_realm};
 use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
 
@@ -58,6 +62,10 @@ pub(super) enum StructuredCloneTags {
     Principals = 0xFFFF8003,
     DomPointReadOnly = 0xFFFF8004,
     DomPoint = 0xFFFF8005,
+    ReadableStream = 0xFFFF8006,
+    DomException = 0xFFFF8007,
+    WritableStream = 0xFFFF8008,
+    TransformStream = 0xFFFF8009,
     Max = 0xFFFFFFFF,
 }
 
@@ -67,6 +75,7 @@ impl From<SerializableInterface> for StructuredCloneTags {
             SerializableInterface::Blob => StructuredCloneTags::DomBlob,
             SerializableInterface::DomPointReadOnly => StructuredCloneTags::DomPointReadOnly,
             SerializableInterface::DomPoint => StructuredCloneTags::DomPoint,
+            SerializableInterface::DomException => StructuredCloneTags::DomException,
         }
     }
 }
@@ -75,6 +84,9 @@ impl From<TransferrableInterface> for StructuredCloneTags {
     fn from(v: TransferrableInterface) -> Self {
         match v {
             TransferrableInterface::MessagePort => StructuredCloneTags::MessagePort,
+            TransferrableInterface::ReadableStream => StructuredCloneTags::ReadableStream,
+            TransferrableInterface::WritableStream => StructuredCloneTags::WritableStream,
+            TransferrableInterface::TransformStream => StructuredCloneTags::TransformStream,
         }
     }
 }
@@ -84,20 +96,21 @@ fn reader_for_type(
 ) -> unsafe fn(
     &GlobalScope,
     *mut JSStructuredCloneReader,
-    &mut StructuredDataReader,
+    &mut StructuredDataReader<'_>,
     CanGc,
 ) -> *mut JSObject {
     match val {
         SerializableInterface::Blob => read_object::<Blob>,
         SerializableInterface::DomPointReadOnly => read_object::<DOMPointReadOnly>,
         SerializableInterface::DomPoint => read_object::<DOMPoint>,
+        SerializableInterface::DomException => read_object::<DOMException>,
     }
 }
 
 unsafe fn read_object<T: Serializable>(
     owner: &GlobalScope,
     r: *mut JSStructuredCloneReader,
-    sc_reader: &mut StructuredDataReader,
+    sc_reader: &mut StructuredDataReader<'_>,
     can_gc: CanGc,
 ) -> *mut JSObject {
     let mut name_space: u32 = 0;
@@ -111,7 +124,7 @@ unsafe fn read_object<T: Serializable>(
 
     // 1. Re-build the key for the storage location
     // of the serialized object.
-    let id = T::Id::from(storage_key);
+    let id: NamespaceIndex<T::Index> = storage_key.into();
 
     // 2. Get the transferred object from its storage, using the key.
     let objects = T::serialized_storage(StructuredData::Reader(sc_reader));
@@ -126,9 +139,8 @@ unsafe fn read_object<T: Serializable>(
     }
 
     if let Ok(obj) = T::deserialize(owner, serialized, can_gc) {
-        let destination = T::deserialized_storage(sc_reader).get_or_insert_with(HashMap::new);
         let reflector = obj.reflector().get_jsobject().get();
-        destination.insert(storage_key, obj);
+        sc_reader.roots.push(Heap::boxed(reflector));
         return reflector;
     }
     warn!("Reading structured data failed in {:?}.", owner.get_url());
@@ -146,7 +158,7 @@ unsafe fn write_object<T: Serializable>(
         let objects = T::serialized_storage(StructuredData::Writer(sc_writer))
             .get_or_insert_with(HashMap::new);
         objects.insert(new_id, serialized);
-        let storage_key = new_id.into_storage_key();
+        let storage_key = StorageKey::new(new_id);
 
         assert!(JS_WriteUint32Pair(
             w,
@@ -181,7 +193,7 @@ unsafe extern "C" fn read_callback(
         "tag should be higher than StructuredCloneTags::Min"
     );
 
-    let sc_reader = &mut *(closure as *mut StructuredDataReader);
+    let sc_reader = &mut *(closure as *mut StructuredDataReader<'_>);
     let in_realm_proof = AlreadyInRealm::assert_for_cx(SafeJSContext::from_ptr(cx));
     let global = GlobalScope::from_context(cx, InRealm::Already(&in_realm_proof));
     for serializable in SerializableInterface::iter() {
@@ -224,6 +236,7 @@ fn serialize_for_type(val: SerializableInterface) -> SerializeOperation {
         SerializableInterface::Blob => try_serialize::<Blob>,
         SerializableInterface::DomPointReadOnly => try_serialize::<DOMPointReadOnly>,
         SerializableInterface::DomPoint => try_serialize::<DOMPoint>,
+        SerializableInterface::DomException => try_serialize::<DOMException>,
     }
 }
 
@@ -248,15 +261,19 @@ unsafe extern "C" fn write_callback(
 
 fn receiver_for_type(
     val: TransferrableInterface,
-) -> fn(&GlobalScope, &mut StructuredDataReader, u64, RawMutableHandleObject) -> Result<(), ()> {
+) -> fn(&GlobalScope, &mut StructuredDataReader<'_>, u64, RawMutableHandleObject) -> Result<(), ()>
+{
     match val {
         TransferrableInterface::MessagePort => receive_object::<MessagePort>,
+        TransferrableInterface::ReadableStream => receive_object::<ReadableStream>,
+        TransferrableInterface::WritableStream => receive_object::<WritableStream>,
+        TransferrableInterface::TransformStream => receive_object::<TransformStream>,
     }
 }
 
 fn receive_object<T: Transferable>(
     owner: &GlobalScope,
-    sc_reader: &mut StructuredDataReader,
+    sc_reader: &mut StructuredDataReader<'_>,
     extra_data: u64,
     return_object: RawMutableHandleObject,
 ) -> Result<(), ()> {
@@ -270,13 +287,13 @@ fn receive_object<T: Transferable>(
             .try_into()
             .expect("name_space to be a slice of four."),
     ));
-    let id = <T::Id as IdFromComponents>::from(
+    let id: NamespaceIndex<T::Index> = NamespaceIndex {
         namespace_id,
-        NonZeroU32::new(u32::from_ne_bytes(
+        index: Index::new(u32::from_ne_bytes(
             index.try_into().expect("index to be a slice of four."),
         ))
         .expect("Index to be non-zero"),
-    );
+    };
 
     // 2. Get the transferred object from its storage, using the key.
     let storage = T::serialized_storage(StructuredData::Reader(sc_reader));
@@ -292,13 +309,12 @@ fn receive_object<T: Transferable>(
         );
     };
 
-    if let Ok(received) = T::transfer_receive(owner, id, serialized) {
-        return_object.set(received.reflector().rootable().get());
-        let storage = T::deserialized_storage(sc_reader).get_or_insert_with(Vec::new);
-        storage.push(received);
-        return Ok(());
-    }
-    Err(())
+    let Ok(received) = T::transfer_receive(owner, id, serialized) else {
+        return Err(());
+    };
+    return_object.set(received.reflector().rootable().get());
+    sc_reader.roots.push(Heap::boxed(return_object.get()));
+    Ok(())
 }
 
 unsafe extern "C" fn read_transfer_callback(
@@ -311,9 +327,10 @@ unsafe extern "C" fn read_transfer_callback(
     closure: *mut raw::c_void,
     return_object: RawMutableHandleObject,
 ) -> bool {
-    let sc_reader = &mut *(closure as *mut StructuredDataReader);
+    let sc_reader = &mut *(closure as *mut StructuredDataReader<'_>);
     let in_realm_proof = AlreadyInRealm::assert_for_cx(SafeJSContext::from_ptr(cx));
     let owner = GlobalScope::from_context(cx, InRealm::Already(&in_realm_proof));
+
     for transferrable in TransferrableInterface::iter() {
         if tag == StructuredCloneTags::from(transferrable) as u32 {
             let transfer_receiver = receiver_for_type(transferrable);
@@ -343,11 +360,10 @@ unsafe fn try_transfer<T: Transferable + IDLInterface>(
                 .get_or_insert_with(HashMap::new);
             objects.insert(id, object);
 
-            let (PipelineNamespaceId(name_space), index) = id.components();
-            let index = index.get();
+            let index = id.index.0.get();
 
             let mut big: [u8; 8] = [0; 8];
-            let name_space = name_space.to_ne_bytes();
+            let name_space = id.namespace_id.0.to_ne_bytes();
             let index = index.to_ne_bytes();
 
             let (left, right) = big.split_at_mut(4);
@@ -375,6 +391,9 @@ type TransferOperation = unsafe fn(
 fn transfer_for_type(val: TransferrableInterface) -> TransferOperation {
     match val {
         TransferrableInterface::MessagePort => try_transfer::<MessagePort>,
+        TransferrableInterface::ReadableStream => try_transfer::<ReadableStream>,
+        TransferrableInterface::WritableStream => try_transfer::<WritableStream>,
+        TransferrableInterface::TransformStream => try_transfer::<TransformStream>,
     }
 }
 
@@ -421,6 +440,9 @@ unsafe fn can_transfer_for_type(
     }
     match transferable {
         TransferrableInterface::MessagePort => can_transfer::<MessagePort>(obj, cx),
+        TransferrableInterface::ReadableStream => can_transfer::<ReadableStream>(obj, cx),
+        TransferrableInterface::WritableStream => can_transfer::<WritableStream>(obj, cx),
+        TransferrableInterface::TransformStream => can_transfer::<TransformStream>(obj, cx),
     }
 }
 
@@ -441,9 +463,16 @@ unsafe extern "C" fn can_transfer_callback(
 unsafe extern "C" fn report_error_callback(
     _cx: *mut JSContext,
     _errorid: u32,
-    _closure: *mut ::std::os::raw::c_void,
-    _error_message: *const ::std::os::raw::c_char,
+    closure: *mut raw::c_void,
+    error_message: *const ::std::os::raw::c_char,
 ) {
+    let msg_result = unsafe { CStr::from_ptr(error_message).to_str().map(str::to_string) };
+
+    if let Ok(msg) = msg_result {
+        let dom_error_record = &mut *(closure as *mut DOMErrorRecord);
+
+        dom_error_record.message = Some(msg)
+    }
 }
 
 unsafe extern "C" fn sab_cloned_callback(
@@ -465,22 +494,25 @@ static STRUCTURED_CLONE_CALLBACKS: JSStructuredCloneCallbacks = JSStructuredClon
     sabCloned: Some(sab_cloned_callback),
 };
 
-pub(crate) enum StructuredData<'a> {
-    Reader(&'a mut StructuredDataReader),
+pub(crate) enum StructuredData<'a, 'b> {
+    Reader(&'a mut StructuredDataReader<'b>),
     Writer(&'a mut StructuredDataWriter),
 }
 
+#[derive(Default)]
+#[repr(C)]
+pub(crate) struct DOMErrorRecord {
+    pub(crate) message: Option<String>,
+}
+
 /// Reader and writer structs for results from, and inputs to, structured-data read/write operations.
 /// <https://html.spec.whatwg.org/multipage/#safe-passing-of-structured-data>
-pub(crate) struct StructuredDataReader {
-    /// A map of deserialized blobs, stored temporarily here to keep them rooted.
-    pub(crate) blobs: Option<HashMap<StorageKey, DomRoot<Blob>>>,
-    /// A map of deserialized points, stored temporarily here to keep them rooted.
-    pub(crate) points_read_only: Option<HashMap<StorageKey, DomRoot<DOMPointReadOnly>>>,
-    pub(crate) dom_points: Option<HashMap<StorageKey, DomRoot<DOMPoint>>>,
-    /// A vec of transfer-received DOM ports,
-    /// to be made available to script through a message event.
-    pub(crate) message_ports: Option<Vec<DomRoot<MessagePort>>>,
+#[repr(C)]
+pub(crate) struct StructuredDataReader<'a> {
+    /// A struct of error message.
+    errors: DOMErrorRecord,
+    /// Rooted copies of every deserialized object to ensure they are not garbage collected.
+    roots: RootedVec<'a, Box<Heap<*mut JSObject>>>,
     /// A map of port implementations,
     /// used as part of the "transfer-receiving" steps of ports,
     /// to produce the DOM ports stored in `message_ports` above.
@@ -491,15 +523,22 @@ pub(crate) struct StructuredDataReader {
     pub(crate) blob_impls: Option<HashMap<BlobId, BlobImpl>>,
     /// A map of serialized points.
     pub(crate) points: Option<HashMap<DomPointId, DomPoint>>,
+    /// A map of serialized exceptions.
+    pub(crate) exceptions: Option<HashMap<DomExceptionId, DomException>>,
 }
 
 /// A data holder for transferred and serialized objects.
 #[derive(Default)]
+#[repr(C)]
 pub(crate) struct StructuredDataWriter {
+    /// Error message.
+    pub(crate) errors: DOMErrorRecord,
     /// Transferred ports.
     pub(crate) ports: Option<HashMap<MessagePortId, MessagePortImpl>>,
     /// Serialized points.
     pub(crate) points: Option<HashMap<DomPointId, DomPoint>>,
+    /// Serialized exceptions.
+    pub(crate) exceptions: Option<HashMap<DomExceptionId, DomException>>,
     /// Serialized blobs.
     pub(crate) blobs: Option<HashMap<BlobId, BlobImpl>>,
 }
@@ -539,7 +578,7 @@ pub(crate) fn write(
         );
         if !result {
             JS_ClearPendingException(*cx);
-            return Err(Error::DataClone);
+            return Err(Error::DataClone(sc_writer.errors.message));
         }
 
         let nbytes = GetLengthOfJSStructuredCloneData(scdata);
@@ -553,6 +592,7 @@ pub(crate) fn write(
             serialized: data,
             ports: sc_writer.ports.take(),
             points: sc_writer.points.take(),
+            exceptions: sc_writer.exceptions.take(),
             blobs: sc_writer.blobs.take(),
         };
 
@@ -566,17 +606,17 @@ pub(crate) fn read(
     global: &GlobalScope,
     mut data: StructuredSerializedData,
     rval: MutableHandleValue,
-) -> Result<Vec<DomRoot<MessagePort>>, ()> {
+) -> Fallible<Vec<DomRoot<MessagePort>>> {
     let cx = GlobalScope::get_cx();
     let _ac = enter_realm(global);
+    rooted_vec!(let mut roots);
     let mut sc_reader = StructuredDataReader {
-        blobs: None,
-        message_ports: None,
-        points_read_only: None,
-        dom_points: None,
+        roots,
         port_impls: data.ports.take(),
         blob_impls: data.blobs.take(),
         points: data.points.take(),
+        exceptions: data.exceptions.take(),
+        errors: DOMErrorRecord { message: None },
     };
     let sc_reader_ptr = &mut sc_reader as *mut _;
     unsafe {
@@ -605,18 +645,22 @@ pub(crate) fn read(
             &STRUCTURED_CLONE_CALLBACKS,
             sc_reader_ptr as *mut raw::c_void,
         );
+        if !result {
+            JS_ClearPendingException(*cx);
+            return Err(Error::DataClone(sc_reader.errors.message));
+        }
 
         DeleteJSAutoStructuredCloneBuffer(scbuf);
 
-        if result {
-            // Any transfer-received port-impls should have been taken out.
-            assert!(sc_reader.port_impls.is_none());
-
-            match sc_reader.message_ports.take() {
-                Some(ports) => return Ok(ports),
-                None => return Ok(Vec::with_capacity(0)),
-            }
+        let mut message_ports = vec![];
+        for reflector in sc_reader.roots.iter() {
+            let Ok(message_port) = root_from_object::<MessagePort>(reflector.get(), *cx) else {
+                continue;
+            };
+            message_ports.push(message_port);
         }
-        Err(())
+        // Any transfer-received port-impls should have been taken out.
+        assert!(sc_reader.port_impls.is_none());
+        Ok(message_ports)
     }
 }
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs
index 3e1e3cfdaec..5d48e4c4e0f 100644
--- a/components/script/dom/bindings/trace.rs
+++ b/components/script/dom/bindings/trace.rs
@@ -33,16 +33,12 @@ use std::collections::HashMap;
 use std::collections::hash_map::RandomState;
 use std::fmt::Display;
 use std::hash::{BuildHasher, Hash};
-use std::mem;
-use std::ops::{Deref, DerefMut};
 
 /// A trait to allow tracing (only) DOM objects.
 pub(crate) use js::gc::Traceable as JSTraceable;
-pub(crate) use js::gc::{RootableVec, RootedVec};
 use js::glue::{CallScriptTracer, CallStringTracer, CallValueTracer};
 use js::jsapi::{GCTraceKindToAscii, Heap, JSScript, JSString, JSTracer, TraceKind};
 use js::jsval::JSVal;
-use js::rust::{GCMethods, Handle};
 use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
 pub(crate) use script_bindings::trace::*;
 
@@ -268,70 +264,3 @@ unsafe impl<T: DomObject> JSTraceable for Trusted<T> {
         // Do nothing
     }
 }
-
-/// Roots any JSTraceable thing
-///
-/// If you have a valid DomObject, use DomRoot.
-/// If you have GC things like *mut JSObject or JSVal, use rooted!.
-/// If you have an arbitrary number of DomObjects to root, use rooted_vec!.
-/// If you know what you're doing, use this.
-#[cfg_attr(crown, crown::unrooted_must_root_lint::allow_unrooted_interior)]
-pub(crate) struct RootedTraceableBox<T: JSTraceable + 'static>(js::gc::RootedTraceableBox<T>);
-
-unsafe impl<T: JSTraceable + 'static> JSTraceable for RootedTraceableBox<T> {
-    unsafe fn trace(&self, tracer: *mut JSTracer) {
-        self.0.trace(tracer);
-    }
-}
-
-impl<T: JSTraceable + 'static> RootedTraceableBox<T> {
-    /// DomRoot a JSTraceable thing for the life of this RootedTraceableBox
-    pub(crate) fn new(traceable: T) -> RootedTraceableBox<T> {
-        Self(js::gc::RootedTraceableBox::new(traceable))
-    }
-
-    /// Consumes a boxed JSTraceable and roots it for the life of this RootedTraceableBox.
-    pub(crate) fn from_box(boxed_traceable: Box<T>) -> RootedTraceableBox<T> {
-        Self(js::gc::RootedTraceableBox::from_box(boxed_traceable))
-    }
-}
-
-impl<T> RootedTraceableBox<Heap<T>>
-where
-    Heap<T>: JSTraceable + 'static,
-    T: GCMethods + Copy,
-{
-    pub(crate) fn handle(&self) -> Handle<T> {
-        self.0.handle()
-    }
-}
-
-impl<T: JSTraceable + MallocSizeOf> MallocSizeOf for RootedTraceableBox<T> {
-    fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
-        // Briefly resurrect the real Box value so we can rely on the existing calculations.
-        // Then immediately forget about it again to avoid dropping the box.
-        let inner = unsafe { Box::from_raw(self.0.ptr()) };
-        let size = inner.size_of(ops);
-        mem::forget(inner);
-        size
-    }
-}
-
-impl<T: JSTraceable + Default> Default for RootedTraceableBox<T> {
-    fn default() -> RootedTraceableBox<T> {
-        RootedTraceableBox::new(T::default())
-    }
-}
-
-impl<T: JSTraceable> Deref for RootedTraceableBox<T> {
-    type Target = T;
-    fn deref(&self) -> &T {
-        self.0.deref()
-    }
-}
-
-impl<T: JSTraceable> DerefMut for RootedTraceableBox<T> {
-    fn deref_mut(&mut self) -> &mut T {
-        self.0.deref_mut()
-    }
-}
diff --git a/components/script/dom/bindings/transferable.rs b/components/script/dom/bindings/transferable.rs
index 7c052e41294..e6b2f000f3a 100644
--- a/components/script/dom/bindings/transferable.rs
+++ b/components/script/dom/bindings/transferable.rs
@@ -6,44 +6,33 @@
 //! (<https://html.spec.whatwg.org/multipage/#transferable-objects>).
 
 use std::collections::HashMap;
-use std::num::NonZeroU32;
+use std::hash::Hash;
 
-use base::id::PipelineNamespaceId;
+use base::id::NamespaceIndex;
 
 use crate::dom::bindings::reflector::DomObject;
 use crate::dom::bindings::root::DomRoot;
-use crate::dom::bindings::structuredclone::{StructuredData, StructuredDataReader};
+use crate::dom::bindings::structuredclone::StructuredData;
 use crate::dom::globalscope::GlobalScope;
-
-pub(crate) trait IdFromComponents
-where
-    Self: Sized,
-{
-    fn from(namespace_id: PipelineNamespaceId, index: NonZeroU32) -> Self;
-}
-
-pub(crate) trait ExtractComponents {
-    fn components(&self) -> (PipelineNamespaceId, NonZeroU32);
-}
-
 pub(crate) trait Transferable: DomObject
 where
     Self: Sized,
 {
-    type Id: Eq + std::hash::Hash + Copy + IdFromComponents + ExtractComponents;
+    type Index: Copy + Eq + Hash;
     type Data;
 
     fn can_transfer(&self) -> bool {
         true
     }
 
-    fn transfer(&self) -> Result<(Self::Id, Self::Data), ()>;
+    fn transfer(&self) -> Result<(NamespaceIndex<Self::Index>, Self::Data), ()>;
     fn transfer_receive(
         owner: &GlobalScope,
-        id: Self::Id,
+        id: NamespaceIndex<Self::Index>,
         serialized: Self::Data,
     ) -> Result<DomRoot<Self>, ()>;
 
-    fn serialized_storage(data: StructuredData<'_>) -> &mut Option<HashMap<Self::Id, Self::Data>>;
-    fn deserialized_storage(reader: &mut StructuredDataReader) -> &mut Option<Vec<DomRoot<Self>>>;
+    fn serialized_storage<'a>(
+        data: StructuredData<'a, '_>,
+    ) -> &'a mut Option<HashMap<NamespaceIndex<Self::Index>, Self::Data>>;
 }
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index cf89f8379cd..ba7db745832 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -5,86 +5,34 @@
 //! Various utilities to glue JavaScript and the DOM implementation together.
 
 use std::cell::RefCell;
-use std::ffi::CString;
-use std::os::raw::c_char;
-use std::ptr::NonNull;
-use std::sync::OnceLock;
 use std::thread::LocalKey;
-use std::{ptr, slice, str};
 
-use js::JS_CALLEE;
 use js::conversions::ToJSValConvertible;
-use js::glue::{
-    CallJitGetterOp, CallJitMethodOp, CallJitSetterOp, IsWrapper, JS_GetReservedSlot,
-    RUST_FUNCTION_VALUE_TO_JITINFO, UnwrapObjectDynamic, UnwrapObjectStatic,
-};
+use js::glue::{IsWrapper, JSPrincipalsCallbacks, UnwrapObjectDynamic, UnwrapObjectStatic};
 use js::jsapi::{
-    AtomToLinearString, CallArgs, DOMCallbacks, ExceptionStackBehavior, GetLinearStringCharAt,
-    GetLinearStringLength, GetNonCCWObjectGlobal, HandleId as RawHandleId,
-    HandleObject as RawHandleObject, Heap, JS_ClearPendingException,
-    JS_DeprecatedStringHasLatin1Chars, JS_EnumerateStandardClasses, JS_FreezeObject,
-    JS_GetLatin1StringCharsAndLength, JS_IsExceptionPending, JS_IsGlobalObject,
-    JS_ResolveStandardClass, JSAtom, JSContext, JSJitInfo, JSObject, JSTracer,
-    MutableHandleIdVector as RawMutableHandleIdVector, MutableHandleValue as RawMutableHandleValue,
-    ObjectOpResult, StringIsArrayIndex,
-};
-use js::jsval::{JSVal, UndefinedValue};
-use js::rust::wrappers::{
-    CallOriginalPromiseReject, JS_DeletePropertyById, JS_ForwardGetPropertyTo,
-    JS_GetPendingException, JS_GetProperty, JS_GetPrototype, JS_HasProperty, JS_HasPropertyById,
-    JS_SetPendingException, JS_SetProperty,
-};
-use js::rust::{
-    GCMethods, Handle, HandleId, HandleObject, HandleValue, MutableHandleValue, ToString,
-    get_object_class, is_dom_class,
+    CallArgs, DOMCallbacks, HandleObject as RawHandleObject, JS_FreezeObject, JSContext, JSObject,
 };
+use js::rust::{HandleObject, MutableHandleValue, get_object_class, is_dom_class};
+use script_bindings::interfaces::{DomHelpers, Interface};
+use script_bindings::settings_stack::StackEntry;
 
 use crate::DomTypes;
-use crate::dom::bindings::codegen::InterfaceObjectMap;
-use crate::dom::bindings::codegen::PrototypeList::{self, PROTO_OR_IFACE_LENGTH};
-use crate::dom::bindings::constructor::call_html_constructor;
-use crate::dom::bindings::conversions::{
-    DerivedFrom, PrototypeCheck, jsstring_to_str, private_from_proto_check,
+use crate::dom::bindings::codegen::{InterfaceObjectMap, PrototypeList};
+use crate::dom::bindings::constructor::{
+    call_html_constructor, pop_current_element_queue, push_new_element_queue,
 };
-use crate::dom::bindings::error::{Error, throw_dom_exception, throw_invalid_this};
-use crate::dom::bindings::reflector::DomObject;
-use crate::dom::bindings::settings_stack::{self, StackEntry};
-use crate::dom::bindings::str::DOMString;
-use crate::dom::bindings::trace::trace_object;
+use crate::dom::bindings::conversions::DerivedFrom;
+use crate::dom::bindings::error::{Error, report_pending_exception, throw_dom_exception};
+use crate::dom::bindings::principals::PRINCIPALS_CALLBACKS;
+use crate::dom::bindings::proxyhandler::is_platform_object_same_origin;
+use crate::dom::bindings::reflector::{DomObject, DomObjectWrap, reflect_dom_object};
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::settings_stack;
+use crate::dom::globalscope::GlobalScope;
 use crate::dom::windowproxy::WindowProxyHandler;
+use crate::realms::InRealm;
 use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
 
-/// A OnceLock wrapping a type that is not considered threadsafe by the Rust compiler, but
-/// will be used in a threadsafe manner (it will not be mutated, after being initialized).
-///
-/// This is needed to allow using JS API types (which usually involve raw pointers) in static initializers,
-/// when Servo guarantees through the use of OnceLock that only one thread will ever initialize
-/// the value.
-pub(crate) struct ThreadUnsafeOnceLock<T>(OnceLock<T>);
-
-impl<T> ThreadUnsafeOnceLock<T> {
-    pub(crate) const fn new() -> Self {
-        Self(OnceLock::new())
-    }
-
-    /// Initialize the value inside this lock. Panics if the lock has been previously initialized.
-    pub(crate) fn set(&self, val: T) {
-        assert!(self.0.set(val).is_ok());
-    }
-
-    /// Get a reference to the value inside this lock. Panics if the lock has not been initialized.
-    ///
-    /// SAFETY:
-    ///   The caller must ensure that it does not mutate value contained inside this lock
-    ///   (using interior mutability).
-    pub(crate) unsafe fn get(&self) -> &T {
-        self.0.get().unwrap()
-    }
-}
-
-unsafe impl<T> Sync for ThreadUnsafeOnceLock<T> {}
-unsafe impl<T> Send for ThreadUnsafeOnceLock<T> {}
-
 #[derive(JSTraceable, MallocSizeOf)]
 /// Static data associated with a global object.
 pub(crate) struct GlobalStaticData {
@@ -102,21 +50,7 @@ impl GlobalStaticData {
     }
 }
 
-/// The index of the slot where the object holder of that interface's
-/// unforgeable members are defined.
-pub(crate) const DOM_PROTO_UNFORGEABLE_HOLDER_SLOT: u32 = 0;
-
-/// The index of the slot that contains a reference to the ProtoOrIfaceArray.
-// All DOM globals must have a slot at DOM_PROTOTYPE_SLOT.
-pub(crate) const DOM_PROTOTYPE_SLOT: u32 = js::JSCLASS_GLOBAL_SLOT_COUNT;
-
-/// The flag set on the `JSClass`es for DOM global objects.
-// NOTE: This is baked into the Ion JIT as 0 in codegen for LGetDOMProperty and
-// LSetDOMProperty. Those constants need to be changed accordingly if this value
-// changes.
-pub(crate) const JSCLASS_DOM_GLOBAL: u32 = js::JSCLASS_USERBIT1;
-
-pub(crate) use script_bindings::utils::{DOMClass, DOMJSClass};
+pub(crate) use script_bindings::utils::*;
 
 /// Returns a JSVal representing the frozen JavaScript array
 pub(crate) fn to_frozen_array<T: ToJSValConvertible>(
@@ -131,132 +65,6 @@ pub(crate) fn to_frozen_array<T: ToJSValConvertible>(
     unsafe { JS_FreezeObject(*cx, RawHandleObject::from(obj.handle())) };
 }
 
-/// Returns the ProtoOrIfaceArray for the given global object.
-/// Fails if `global` is not a DOM global object.
-pub(crate) fn get_proto_or_iface_array(global: *mut JSObject) -> *mut ProtoOrIfaceArray {
-    unsafe {
-        assert_ne!(((*get_object_class(global)).flags & JSCLASS_DOM_GLOBAL), 0);
-        let mut slot = UndefinedValue();
-        JS_GetReservedSlot(global, DOM_PROTOTYPE_SLOT, &mut slot);
-        slot.to_private() as *mut ProtoOrIfaceArray
-    }
-}
-
-/// An array of *mut JSObject of size PROTO_OR_IFACE_LENGTH.
-pub(crate) type ProtoOrIfaceArray = [*mut JSObject; PROTO_OR_IFACE_LENGTH];
-
-/// Gets the property `id` on  `proxy`'s prototype. If it exists, `*found` is
-/// set to true and `*vp` to the value, otherwise `*found` is set to false.
-///
-/// Returns false on JSAPI failure.
-pub(crate) unsafe fn get_property_on_prototype(
-    cx: *mut JSContext,
-    proxy: HandleObject,
-    receiver: HandleValue,
-    id: HandleId,
-    found: *mut bool,
-    vp: MutableHandleValue,
-) -> bool {
-    rooted!(in(cx) let mut proto = ptr::null_mut::<JSObject>());
-    if !JS_GetPrototype(cx, proxy, proto.handle_mut()) || proto.is_null() {
-        *found = false;
-        return true;
-    }
-    let mut has_property = false;
-    if !JS_HasPropertyById(cx, proto.handle(), id, &mut has_property) {
-        return false;
-    }
-    *found = has_property;
-    if !has_property {
-        return true;
-    }
-
-    JS_ForwardGetPropertyTo(cx, proto.handle(), id, receiver, vp)
-}
-
-/// Get an array index from the given `jsid`. Returns `None` if the given
-/// `jsid` is not an integer.
-pub(crate) unsafe fn get_array_index_from_id(_cx: *mut JSContext, id: HandleId) -> Option<u32> {
-    let raw_id = *id;
-    if raw_id.is_int() {
-        return Some(raw_id.to_int() as u32);
-    }
-
-    if raw_id.is_void() || !raw_id.is_string() {
-        return None;
-    }
-
-    let atom = raw_id.to_string() as *mut JSAtom;
-    let s = AtomToLinearString(atom);
-    if GetLinearStringLength(s) == 0 {
-        return None;
-    }
-
-    let chars = [GetLinearStringCharAt(s, 0)];
-    let first_char = char::decode_utf16(chars.iter().cloned())
-        .next()
-        .map_or('\0', |r| r.unwrap_or('\0'));
-    if first_char.is_ascii_lowercase() {
-        return None;
-    }
-
-    let mut i = 0;
-    if StringIsArrayIndex(s, &mut i) {
-        Some(i)
-    } else {
-        None
-    }
-
-    /*let s = jsstr_to_string(cx, RUST_JSID_TO_STRING(raw_id));
-    if s.len() == 0 {
-        return None;
-    }
-
-    let first = s.chars().next().unwrap();
-    if first.is_ascii_lowercase() {
-        return None;
-    }
-
-    let mut i: u32 = 0;
-    let is_array = if s.is_ascii() {
-        let chars = s.as_bytes();
-        StringIsArrayIndex1(chars.as_ptr() as *const _, chars.len() as u32, &mut i)
-    } else {
-        let chars = s.encode_utf16().collect::<Vec<u16>>();
-        let slice = chars.as_slice();
-        StringIsArrayIndex2(slice.as_ptr(), chars.len() as u32, &mut i)
-    };
-
-    if is_array {
-        Some(i)
-    } else {
-        None
-    }*/
-}
-
-/// Find the enum equivelent of a string given by `v` in `pairs`.
-/// Returns `Err(())` on JSAPI failure (there is a pending exception), and
-/// `Ok((None, value))` if there was no matching string.
-pub(crate) unsafe fn find_enum_value<'a, T>(
-    cx: *mut JSContext,
-    v: HandleValue,
-    pairs: &'a [(&'static str, T)],
-) -> Result<(Option<&'a T>, DOMString), ()> {
-    match ptr::NonNull::new(ToString(cx, v)) {
-        Some(jsstr) => {
-            let search = jsstring_to_str(cx, jsstr);
-            Ok((
-                pairs
-                    .iter()
-                    .find(|&&(key, _)| search == *key)
-                    .map(|(_, ev)| ev),
-                search,
-            ))
-        },
-        None => Err(()),
-    }
-}
-
 /// Returns wether `obj` is a platform object using dynamic unwrap
 /// <https://heycam.github.io/webidl/#dfn-platform-object>
 #[allow(dead_code)]
@@ -295,308 +103,6 @@ fn is_platform_object(
     }
 }
 
-/// Get the property with name `property` from `object`.
-/// Returns `Err(())` on JSAPI failure (there is a pending exception), and
-/// `Ok(false)` if there was no property with the given name.
-pub(crate) fn get_dictionary_property(
-    cx: *mut JSContext,
-    object: HandleObject,
-    property: &str,
-    rval: MutableHandleValue,
-    _can_gc: CanGc,
-) -> Result<bool, ()> {
-    fn has_property(
-        cx: *mut JSContext,
-        object: HandleObject,
-        property: &CString,
-        found: &mut bool,
-    ) -> bool {
-        unsafe { JS_HasProperty(cx, object, property.as_ptr(), found) }
-    }
-    fn get_property(
-        cx: *mut JSContext,
-        object: HandleObject,
-        property: &CString,
-        value: MutableHandleValue,
-    ) -> bool {
-        unsafe { JS_GetProperty(cx, object, property.as_ptr(), value) }
-    }
-
-    let property = CString::new(property).unwrap();
-    if object.get().is_null() {
-        return Ok(false);
-    }
-
-    let mut found = false;
-    if !has_property(cx, object, &property, &mut found) {
-        return Err(());
-    }
-
-    if !found {
-        return Ok(false);
-    }
-
-    if !get_property(cx, object, &property, rval) {
-        return Err(());
-    }
-
-    Ok(true)
-}
-
-/// Set the property with name `property` from `object`.
-/// Returns `Err(())` on JSAPI failure, or null object,
-/// and Ok(()) otherwise
-pub(crate) fn set_dictionary_property(
-    cx: *mut JSContext,
-    object: HandleObject,
-    property: &str,
-    value: HandleValue,
-) -> Result<(), ()> {
-    if object.get().is_null() {
-        return Err(());
-    }
-
-    let property = CString::new(property).unwrap();
-    unsafe {
-        if !JS_SetProperty(cx, object, property.as_ptr(), value) {
-            return Err(());
-        }
-    }
-
-    Ok(())
-}
-
-/// Returns whether `proxy` has a property `id` on its prototype.
-pub(crate) unsafe fn has_property_on_prototype(
-    cx: *mut JSContext,
-    proxy: HandleObject,
-    id: HandleId,
-    found: &mut bool,
-) -> bool {
-    rooted!(in(cx) let mut proto = ptr::null_mut::<JSObject>());
-    if !JS_GetPrototype(cx, proxy, proto.handle_mut()) {
-        return false;
-    }
-    assert!(!proto.is_null());
-    JS_HasPropertyById(cx, proto.handle(), id, found)
-}
-
-/// Drop the resources held by reserved slots of a global object
-pub(crate) unsafe fn finalize_global(obj: *mut JSObject) {
-    let protolist = get_proto_or_iface_array(obj);
-    let list = (*protolist).as_mut_ptr();
-    for idx in 0..PROTO_OR_IFACE_LENGTH as isize {
-        let entry = list.offset(idx);
-        let value = *entry;
-        <*mut JSObject>::post_barrier(entry, value, ptr::null_mut());
-    }
-    let _: Box<ProtoOrIfaceArray> = Box::from_raw(protolist);
-}
-
-/// Trace the resources held by reserved slots of a global object
-pub(crate) unsafe fn trace_global(tracer: *mut JSTracer, obj: *mut JSObject) {
-    let array = get_proto_or_iface_array(obj);
-    for proto in (*array).iter() {
-        if !proto.is_null() {
-            trace_object(
-                tracer,
-                "prototype",
-                &*(proto as *const *mut JSObject as *const Heap<*mut JSObject>),
-            );
-        }
-    }
-}
-
-/// Enumerate lazy properties of a global object.
-pub(crate) unsafe extern "C" fn enumerate_global(
-    cx: *mut JSContext,
-    obj: RawHandleObject,
-    _props: RawMutableHandleIdVector,
-    _enumerable_only: bool,
-) -> bool {
-    assert!(JS_IsGlobalObject(obj.get()));
-    if !JS_EnumerateStandardClasses(cx, obj) {
-        return false;
-    }
-    for init_fun in InterfaceObjectMap::MAP.values() {
-        init_fun(SafeJSContext::from_ptr(cx), Handle::from_raw(obj));
-    }
-    true
-}
-
-/// Resolve a lazy global property, for interface objects and named constructors.
-pub(crate) unsafe extern "C" fn resolve_global(
-    cx: *mut JSContext,
-    obj: RawHandleObject,
-    id: RawHandleId,
-    rval: *mut bool,
-) -> bool {
-    assert!(JS_IsGlobalObject(obj.get()));
-    if !JS_ResolveStandardClass(cx, obj, id, rval) {
-        return false;
-    }
-    if *rval {
-        return true;
-    }
-    if !id.is_string() {
-        *rval = false;
-        return true;
-    }
-
-    let string = id.to_string();
-    if !JS_DeprecatedStringHasLatin1Chars(string) {
-        *rval = false;
-        return true;
-    }
-    let mut length = 0;
-    let ptr = JS_GetLatin1StringCharsAndLength(cx, ptr::null(), string, &mut length);
-    assert!(!ptr.is_null());
-    let bytes = slice::from_raw_parts(ptr, length);
-
-    if let Some(init_fun) = InterfaceObjectMap::MAP.get(bytes) {
-        init_fun(SafeJSContext::from_ptr(cx), Handle::from_raw(obj));
-        *rval = true;
-    } else {
-        *rval = false;
-    }
-    true
-}
-
-/// Deletes the property `id` from `object`.
-pub(crate) unsafe fn delete_property_by_id(
-    cx: *mut JSContext,
-    object: HandleObject,
-    id: HandleId,
-    bp: *mut ObjectOpResult,
-) -> bool {
-    JS_DeletePropertyById(cx, object, id, bp)
-}
-
-unsafe fn generic_call<const EXCEPTION_TO_REJECTION: bool>(
-    cx: *mut JSContext,
-    argc: libc::c_uint,
-    vp: *mut JSVal,
-    is_lenient: bool,
-    call: unsafe extern "C" fn(
-        *const JSJitInfo,
-        *mut JSContext,
-        RawHandleObject,
-        *mut libc::c_void,
-        u32,
-        *mut JSVal,
-    ) -> bool,
-    can_gc: CanGc,
-) -> bool {
-    let args = CallArgs::from_vp(vp, argc);
-
-    let info = RUST_FUNCTION_VALUE_TO_JITINFO(JS_CALLEE(cx, vp));
-    let proto_id = (*info).__bindgen_anon_2.protoID;
-    let cx = SafeJSContext::from_ptr(cx);
-
-    let thisobj = args.thisv();
-    if !thisobj.get().is_null_or_undefined() && !thisobj.get().is_object() {
-        throw_invalid_this(cx, proto_id);
-        return if EXCEPTION_TO_REJECTION {
-            exception_to_promise(*cx, args.rval(), can_gc)
-        } else {
-            false
-        };
-    }
-
-    rooted!(in(*cx) let obj = if thisobj.get().is_object() {
-        thisobj.get().to_object()
-    } else {
-        GetNonCCWObjectGlobal(JS_CALLEE(*cx, vp).to_object_or_null())
-    });
-    let depth = (*info).__bindgen_anon_3.depth as usize;
-    let proto_check = PrototypeCheck::Depth { depth, proto_id };
-    let this = match private_from_proto_check(obj.get(), *cx, proto_check) {
-        Ok(val) => val,
-        Err(()) => {
-            if is_lenient {
-                debug_assert!(!JS_IsExceptionPending(*cx));
-                *vp = UndefinedValue();
-                return true;
-            } else {
-                throw_invalid_this(cx, proto_id);
-                return if EXCEPTION_TO_REJECTION {
-                    exception_to_promise(*cx, args.rval(), can_gc)
-                } else {
-                    false
-                };
-            }
-        },
-    };
-    call(
-        info,
-        *cx,
-        obj.handle().into(),
-        this as *mut libc::c_void,
-        argc,
-        vp,
-    )
-}
-
-/// Generic method of IDL interface.
-pub(crate) unsafe extern "C" fn generic_method<const EXCEPTION_TO_REJECTION: bool>(
-    cx: *mut JSContext,
-    argc: libc::c_uint,
-    vp: *mut JSVal,
-) -> bool {
-    generic_call::<EXCEPTION_TO_REJECTION>(cx, argc, vp, false, CallJitMethodOp, CanGc::note())
-}
-
-/// Generic getter of IDL interface.
-pub(crate) unsafe extern "C" fn generic_getter<const EXCEPTION_TO_REJECTION: bool>(
-    cx: *mut JSContext,
-    argc: libc::c_uint,
-    vp: *mut JSVal,
-) -> bool {
-    generic_call::<EXCEPTION_TO_REJECTION>(cx, argc, vp, false, CallJitGetterOp, CanGc::note())
-}
-
-/// Generic lenient getter of IDL interface.
-pub(crate) unsafe extern "C" fn generic_lenient_getter<const EXCEPTION_TO_REJECTION: bool>(
-    cx: *mut JSContext,
-    argc: libc::c_uint,
-    vp: *mut JSVal,
-) -> bool {
-    generic_call::<EXCEPTION_TO_REJECTION>(cx, argc, vp, true, CallJitGetterOp, CanGc::note())
-}
-
-unsafe extern "C" fn call_setter(
-    info: *const JSJitInfo,
-    cx: *mut JSContext,
-    handle: RawHandleObject,
-    this: *mut libc::c_void,
-    argc: u32,
-    vp: *mut JSVal,
-) -> bool {
-    if !CallJitSetterOp(info, cx, handle, this, argc, vp) {
-        return false;
-    }
-    *vp = UndefinedValue();
-    true
-}
-
-/// Generic setter of IDL interface.
-pub(crate) unsafe extern "C" fn generic_setter(
-    cx: *mut JSContext,
-    argc: libc::c_uint,
-    vp: *mut JSVal,
-) -> bool {
-    generic_call::<false>(cx, argc, vp, false, call_setter, CanGc::note())
-}
-
-/// Generic lenient setter of IDL interface.
-pub(crate) unsafe extern "C" fn generic_lenient_setter(
-    cx: *mut JSContext,
-    argc: libc::c_uint,
-    vp: *mut JSVal,
-) -> bool {
-    generic_call::<false>(cx, argc, vp, true, call_setter, CanGc::note())
-}
-
 unsafe extern "C" fn instance_class_has_proto_at_depth(
     clasp: *const js::jsapi::JSClass,
     proto_id: u32,
@@ -612,83 +118,17 @@ pub(crate) const DOM_CALLBACKS: DOMCallbacks = DOMCallbacks {
     instanceClassMatchesProto: Some(instance_class_has_proto_at_depth),
 };
 
-// Generic method for returning libc::c_void from caller
-pub(crate) trait AsVoidPtr {
-    fn as_void_ptr(&self) -> *const libc::c_void;
-}
-impl<T> AsVoidPtr for T {
-    fn as_void_ptr(&self) -> *const libc::c_void {
-        self as *const T as *const libc::c_void
-    }
-}
-
-// Generic method for returning c_char from caller
-pub(crate) trait AsCCharPtrPtr {
-    fn as_c_char_ptr(&self) -> *const c_char;
-}
-
-impl AsCCharPtrPtr for [u8] {
-    fn as_c_char_ptr(&self) -> *const c_char {
-        self as *const [u8] as *const c_char
-    }
-}
-
-/// <https://searchfox.org/mozilla-central/rev/7279a1df13a819be254fd4649e07c4ff93e4bd45/dom/bindings/BindingUtils.cpp#3300>
-pub(crate) unsafe extern "C" fn generic_static_promise_method(
-    cx: *mut JSContext,
-    argc: libc::c_uint,
-    vp: *mut JSVal,
-) -> bool {
-    let args = CallArgs::from_vp(vp, argc);
-
-    let info = RUST_FUNCTION_VALUE_TO_JITINFO(JS_CALLEE(cx, vp));
-    assert!(!info.is_null());
-    // TODO: we need safe wrappers for this in mozjs!
-    //assert_eq!((*info)._bitfield_1, JSJitInfo_OpType::StaticMethod as u8)
-    let static_fn = (*info).__bindgen_anon_1.staticMethod.unwrap();
-    if static_fn(cx, argc, vp) {
-        return true;
-    }
-    exception_to_promise(cx, args.rval(), CanGc::note())
-}
-
-/// Coverts exception to promise rejection
-///
-/// <https://searchfox.org/mozilla-central/rev/b220e40ff2ee3d10ce68e07d8a8a577d5558e2a2/dom/bindings/BindingUtils.cpp#3315>
-pub(crate) unsafe fn exception_to_promise(
-    cx: *mut JSContext,
-    rval: RawMutableHandleValue,
+/// Eagerly define all relevant WebIDL interface constructors on the
+/// provided global object.
+pub(crate) fn define_all_exposed_interfaces(
+    global: &GlobalScope,
+    _in_realm: InRealm,
     _can_gc: CanGc,
-) -> bool {
-    rooted!(in(cx) let mut exception = UndefinedValue());
-    if !JS_GetPendingException(cx, exception.handle_mut()) {
-        return false;
+) {
+    let cx = GlobalScope::get_cx();
+    for (_, interface) in &InterfaceObjectMap::MAP {
+        (interface.define)(cx, global.reflector().get_jsobject());
     }
-    JS_ClearPendingException(cx);
-    if let Some(promise) = NonNull::new(CallOriginalPromiseReject(cx, exception.handle())) {
-        promise.to_jsval(cx, MutableHandleValue::from_raw(rval));
-        true
-    } else {
-        // We just give up.  Put the exception back.
-        JS_SetPendingException(cx, exception.handle(), ExceptionStackBehavior::Capture);
-        false
-    }
-}
-
-/// Operations that must be invoked from the generated bindings.
-pub(crate) trait DomHelpers<D: DomTypes> {
-    fn throw_dom_exception(cx: SafeJSContext, global: &D::GlobalScope, result: Error);
-
-    unsafe fn call_html_constructor<T: DerivedFrom<D::Element> + DomObject>(
-        cx: SafeJSContext,
-        args: &CallArgs,
-        global: &D::GlobalScope,
-        proto_id: crate::dom::bindings::codegen::PrototypeList::ID,
-        creator: unsafe fn(SafeJSContext, HandleObject, *mut ProtoOrIfaceArray),
-        can_gc: CanGc,
-    ) -> bool;
-
-    fn settings_stack() -> &'static LocalKey<RefCell<Vec<StackEntry<D>>>>;
 }
 
 impl DomHelpers<crate::DomTypeHolder> for crate::DomTypeHolder {
@@ -696,11 +136,12 @@ impl DomHelpers<crate::DomTypeHolder> for crate::DomTypeHolder {
         cx: SafeJSContext,
         global: &<crate::DomTypeHolder as DomTypes>::GlobalScope,
         result: Error,
+        can_gc: CanGc,
     ) {
-        throw_dom_exception(cx, global, result, CanGc::note())
+        throw_dom_exception(cx, global, result, can_gc)
     }
 
-    unsafe fn call_html_constructor<
+    fn call_html_constructor<
         T: DerivedFrom<<crate::DomTypeHolder as DomTypes>::Element> + DomObject,
     >(
         cx: SafeJSContext,
@@ -716,4 +157,40 @@ impl DomHelpers<crate::DomTypeHolder> for crate::DomTypeHolder {
     fn settings_stack() -> &'static LocalKey<RefCell<Vec<StackEntry<crate::DomTypeHolder>>>> {
         &settings_stack::STACK
     }
+
+    fn principals_callbacks() -> &'static JSPrincipalsCallbacks {
+        &PRINCIPALS_CALLBACKS
+    }
+
+    fn is_platform_object_same_origin(cx: SafeJSContext, obj: RawHandleObject) -> bool {
+        unsafe { is_platform_object_same_origin(cx, obj) }
+    }
+
+    fn interface_map() -> &'static phf::Map<&'static [u8], Interface> {
+        &InterfaceObjectMap::MAP
+    }
+
+    fn push_new_element_queue() {
+        push_new_element_queue()
+    }
+    fn pop_current_element_queue(can_gc: CanGc) {
+        pop_current_element_queue(can_gc)
+    }
+
+    fn reflect_dom_object<T, U>(obj: Box<T>, global: &U, can_gc: CanGc) -> DomRoot<T>
+    where
+        T: DomObject + DomObjectWrap<crate::DomTypeHolder>,
+        U: DerivedFrom<GlobalScope>,
+    {
+        reflect_dom_object(obj, global, can_gc)
+    }
+
+    fn report_pending_exception(
+        cx: SafeJSContext,
+        dispatch_event: bool,
+        realm: InRealm,
+        can_gc: CanGc,
+    ) {
+        report_pending_exception(cx, dispatch_event, realm, can_gc)
+    }
 }
diff --git a/components/script/dom/bindings/weakref.rs b/components/script/dom/bindings/weakref.rs
index 1c86b68c706..c1cb012b7c2 100644
--- a/components/script/dom/bindings/weakref.rs
+++ b/components/script/dom/bindings/weakref.rs
@@ -8,7 +8,7 @@ use std::ops::{Deref, DerefMut, Drop};
 
 use js::jsapi::JSTracer;
 use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
-pub use script_bindings::weakref::*;
+pub(crate) use script_bindings::weakref::*;
 
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::root::DomRoot;
diff --git a/components/script/dom/bindings/xmlname.rs b/components/script/dom/bindings/xmlname.rs
index 31436278c12..af02569d9c4 100644
--- a/components/script/dom/bindings/xmlname.rs
+++ b/components/script/dom/bindings/xmlname.rs
@@ -4,7 +4,7 @@
 
 //! Functions for validating and extracting qualified XML names.
 
-use html5ever::{LocalName, Namespace, Prefix, namespace_url, ns};
+use html5ever::{LocalName, Namespace, Prefix, ns};
 
 use crate::dom::bindings::error::{Error, Fallible};
 use crate::dom::bindings::str::DOMString;
diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs
index 75fa65deff0..c5c5c480707 100644
--- a/components/script/dom/blob.rs
+++ b/components/script/dom/blob.rs
@@ -3,18 +3,17 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use std::collections::HashMap;
-use std::num::NonZeroU32;
 use std::ptr;
 use std::rc::Rc;
 
-use base::id::{BlobId, BlobIndex, PipelineNamespaceId};
+use base::id::{BlobId, BlobIndex};
+use constellation_traits::{BlobData, BlobImpl};
 use dom_struct::dom_struct;
 use encoding_rs::UTF_8;
 use js::jsapi::JSObject;
 use js::rust::HandleObject;
 use js::typedarray::Uint8;
 use net_traits::filemanager_thread::RelativePos;
-use script_traits::serializable::BlobImpl;
 use uuid::Uuid;
 
 use crate::body::{FetchedData, run_array_buffer_data_algorithm};
@@ -25,16 +24,16 @@ use crate::dom::bindings::codegen::UnionTypes::ArrayBufferOrArrayBufferViewOrBlo
 use crate::dom::bindings::error::{Error, Fallible};
 use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object_with_proto};
 use crate::dom::bindings::root::DomRoot;
-use crate::dom::bindings::serializable::{IntoStorageKey, Serializable, StorageKey};
+use crate::dom::bindings::serializable::Serializable;
 use crate::dom::bindings::str::DOMString;
-use crate::dom::bindings::structuredclone::{StructuredData, StructuredDataReader};
+use crate::dom::bindings::structuredclone::StructuredData;
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::promise::Promise;
 use crate::dom::readablestream::ReadableStream;
 use crate::realms::{AlreadyInRealm, InRealm};
 use crate::script_runtime::CanGc;
 
-// https://w3c.github.io/FileAPI/#blob
+/// <https://w3c.github.io/FileAPI/#dfn-Blob>
 #[dom_struct]
 pub(crate) struct Blob {
     reflector_: Reflector,
@@ -94,7 +93,7 @@ impl Blob {
 }
 
 impl Serializable for Blob {
-    type Id = BlobId;
+    type Index = BlobIndex;
     type Data = BlobImpl;
 
     /// <https://w3c.github.io/FileAPI/#ref-for-serialization-steps>
@@ -120,40 +119,14 @@ impl Serializable for Blob {
         Ok(deserialized_blob)
     }
 
-    fn serialized_storage(
-        reader: StructuredData<'_>,
-    ) -> &mut Option<HashMap<Self::Id, Self::Data>> {
+    fn serialized_storage<'a>(
+        reader: StructuredData<'a, '_>,
+    ) -> &'a mut Option<HashMap<BlobId, Self::Data>> {
         match reader {
             StructuredData::Reader(r) => &mut r.blob_impls,
             StructuredData::Writer(w) => &mut w.blobs,
         }
     }
-
-    fn deserialized_storage(
-        data: &mut StructuredDataReader,
-    ) -> &mut Option<HashMap<StorageKey, DomRoot<Self>>> {
-        &mut data.blobs
-    }
-}
-
-impl From<StorageKey> for BlobId {
-    fn from(storage_key: StorageKey) -> BlobId {
-        let namespace_id = PipelineNamespaceId(storage_key.name_space);
-        let index =
-            BlobIndex(NonZeroU32::new(storage_key.index).expect("Deserialized blob index is zero"));
-
-        BlobId {
-            namespace_id,
-            index,
-        }
-    }
-}
-
-impl IntoStorageKey for BlobId {
-    fn into_storage_key(self) -> StorageKey {
-        let BlobIndex(index) = self.index;
-        StorageKey::new(self.namespace_id, index)
-    }
 }
 
 /// Extract bytes from BlobParts, used by Blob and File constructor
@@ -225,7 +198,7 @@ impl BlobMethods<crate::DomTypeHolder> for Blob {
         self.get_stream(can_gc)
     }
 
-    // https://w3c.github.io/FileAPI/#slice-method-algo
+    /// <https://w3c.github.io/FileAPI/#slice-method-algo>
     fn Slice(
         &self,
         start: Option<i64>,
@@ -233,17 +206,30 @@ impl BlobMethods<crate::DomTypeHolder> for Blob {
         content_type: Option<DOMString>,
         can_gc: CanGc,
     ) -> DomRoot<Blob> {
-        let type_string =
-            normalize_type_string(content_type.unwrap_or(DOMString::from("")).as_ref());
-        let rel_pos = RelativePos::from_opts(start, end);
-        let blob_impl = BlobImpl::new_sliced(rel_pos, self.blob_id, type_string);
-        Blob::new(&self.global(), blob_impl, can_gc)
+        let global = self.global();
+        let type_string = normalize_type_string(&content_type.unwrap_or_default());
+
+        // If our parent is already a sliced blob then we reference the data from the grandparent instead,
+        // to keep the blob ancestry chain short.
+        let (parent, range) = match *global.get_blob_data(&self.blob_id) {
+            BlobData::Sliced(grandparent, parent_range) => {
+                let range = RelativePos {
+                    start: parent_range.start + start.unwrap_or_default(),
+                    end: end.map(|end| end + parent_range.start).or(parent_range.end),
+                };
+                (grandparent, range)
+            },
+            _ => (self.blob_id, RelativePos::from_opts(start, end)),
+        };
+
+        let blob_impl = BlobImpl::new_sliced(range, parent, type_string);
+        Blob::new(&global, blob_impl, can_gc)
     }
 
     // https://w3c.github.io/FileAPI/#text-method-algo
     fn Text(&self, can_gc: CanGc) -> Rc<Promise> {
         let global = self.global();
-        let in_realm_proof = AlreadyInRealm::assert();
+        let in_realm_proof = AlreadyInRealm::assert::<crate::DomTypeHolder>();
         let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof), can_gc);
         let id = self.get_blob_url_id();
         global.read_file_async(
@@ -266,7 +252,7 @@ impl BlobMethods<crate::DomTypeHolder> for Blob {
     // https://w3c.github.io/FileAPI/#arraybuffer-method-algo
     fn ArrayBuffer(&self, can_gc: CanGc) -> Rc<Promise> {
         let global = self.global();
-        let in_realm_proof = AlreadyInRealm::assert();
+        let in_realm_proof = AlreadyInRealm::assert::<crate::DomTypeHolder>();
         let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof), can_gc);
 
         let id = self.get_blob_url_id();
diff --git a/components/script/dom/bluetooth/bluetooth.rs b/components/script/dom/bluetooth/bluetooth.rs
index c2732f2e9fb..91b07732630 100644
--- a/components/script/dom/bluetooth/bluetooth.rs
+++ b/components/script/dom/bluetooth/bluetooth.rs
@@ -300,7 +300,7 @@ where
     T: AsyncBluetoothListener + DomObject + 'static,
     F: FnOnce(StringOrUnsignedLong) -> Fallible<UUID>,
 {
-    let in_realm_proof = AlreadyInRealm::assert();
+    let in_realm_proof = AlreadyInRealm::assert::<crate::DomTypeHolder>();
     let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof), can_gc);
 
     let result_uuid = if let Some(u) = uuid {
diff --git a/components/script/dom/broadcastchannel.rs b/components/script/dom/broadcastchannel.rs
index 2d7d6740589..aae748262f2 100644
--- a/components/script/dom/broadcastchannel.rs
+++ b/components/script/dom/broadcastchannel.rs
@@ -4,9 +4,9 @@
 
 use std::cell::Cell;
 
+use constellation_traits::BroadcastMsg;
 use dom_struct::dom_struct;
 use js::rust::{HandleObject, HandleValue};
-use script_traits::BroadcastMsg;
 use uuid::Uuid;
 
 use crate::dom::bindings::codegen::Bindings::BroadcastChannelBinding::BroadcastChannelMethods;
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
index cc8215fd335..046d478e49d 100644
--- a/components/script/dom/canvasrenderingcontext2d.rs
+++ b/components/script/dom/canvasrenderingcontext2d.rs
@@ -4,12 +4,12 @@
 
 use canvas_traits::canvas::{Canvas2dMsg, CanvasId, CanvasMsg, FromScriptMsg};
 use dom_struct::dom_struct;
-use euclid::default::{Point2D, Rect, Size2D};
-use ipc_channel::ipc::IpcSharedMemory;
+use euclid::default::Size2D;
 use profile_traits::ipc;
 use script_bindings::inheritance::Castable;
-use script_layout_interface::HTMLCanvasDataSource;
 use servo_url::ServoUrl;
+use snapshot::Snapshot;
+use webrender_api::ImageKey;
 
 use crate::canvas_context::{CanvasContext, CanvasHelpers, LayoutCanvasRenderingContextHelpers};
 use crate::canvas_state::CanvasState;
@@ -74,23 +74,12 @@ impl CanvasRenderingContext2D {
         reflect_dom_object(boxed, global, can_gc)
     }
 
-    // https://html.spec.whatwg.org/multipage/#concept-canvas-set-bitmap-dimensions
-    pub(crate) fn set_bitmap_dimensions(&self, size: Size2D<u32>) {
-        self.reset_to_initial_state();
-        self.canvas_state
-            .get_ipc_renderer()
-            .send(CanvasMsg::Recreate(
-                Some(size.to_u64()),
-                self.canvas_state.get_canvas_id(),
-            ))
-            .unwrap();
-    }
-
     // https://html.spec.whatwg.org/multipage/#reset-the-rendering-context-to-its-default-state
     fn reset_to_initial_state(&self) {
         self.canvas_state.reset_to_initial_state();
     }
 
+    /// <https://html.spec.whatwg.org/multipage/#concept-canvas-set-bitmap-dimensions>
     pub(crate) fn set_canvas_bitmap_dimensions(&self, size: Size2D<u64>) {
         self.canvas_state.set_bitmap_dimensions(size);
     }
@@ -106,20 +95,17 @@ impl CanvasRenderingContext2D {
     pub(crate) fn send_canvas_2d_msg(&self, msg: Canvas2dMsg) {
         self.canvas_state.send_canvas_2d_msg(msg)
     }
-
-    pub(crate) fn get_rect(&self, rect: Rect<u32>) -> Vec<u8> {
-        let rect = Rect::new(
-            Point2D::new(rect.origin.x as u64, rect.origin.y as u64),
-            Size2D::new(rect.size.width as u64, rect.size.height as u64),
-        );
-        self.canvas_state.get_rect(self.canvas.size(), rect)
-    }
 }
 
 impl LayoutCanvasRenderingContextHelpers for LayoutDom<'_, CanvasRenderingContext2D> {
-    fn canvas_data_source(self) -> HTMLCanvasDataSource {
+    fn canvas_data_source(self) -> Option<ImageKey> {
         let canvas_state = &self.unsafe_get().canvas_state;
-        HTMLCanvasDataSource::Image(canvas_state.image_key())
+
+        if canvas_state.is_paintable() {
+            Some(canvas_state.image_key())
+        } else {
+            None
+        }
     }
 }
 
@@ -139,19 +125,19 @@ impl CanvasContext for CanvasRenderingContext2D {
     }
 
     fn resize(&self) {
-        self.set_bitmap_dimensions(self.size().cast())
+        self.set_canvas_bitmap_dimensions(self.size().cast())
     }
 
-    fn get_image_data_as_shared_memory(&self) -> Option<IpcSharedMemory> {
+    fn get_image_data(&self) -> Option<Snapshot> {
+        if !self.canvas_state.is_paintable() {
+            return None;
+        }
+
         let (sender, receiver) = ipc::channel(self.global().time_profiler_chan().clone()).unwrap();
         let msg = CanvasMsg::FromScript(FromScriptMsg::SendPixels(sender), self.get_canvas_id());
         self.canvas_state.get_ipc_renderer().send(msg).unwrap();
 
-        Some(receiver.recv().unwrap())
-    }
-
-    fn get_image_data(&self) -> Option<Vec<u8>> {
-        Some(self.get_rect(Rect::from_size(self.size().cast())))
+        Some(receiver.recv().unwrap().to_owned())
     }
 
     fn origin_is_clean(&self) -> bool {
@@ -642,6 +628,26 @@ impl CanvasRenderingContext2DMethods<crate::DomTypeHolder> for CanvasRenderingCo
         self.canvas_state.set_miter_limit(limit)
     }
 
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-setlinedash>
+    fn SetLineDash(&self, segments: Vec<f64>) {
+        self.canvas_state.set_line_dash(segments);
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-getlinedash>
+    fn GetLineDash(&self) -> Vec<f64> {
+        self.canvas_state.line_dash()
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-linedashoffset>
+    fn LineDashOffset(&self) -> f64 {
+        self.canvas_state.line_dash_offset()
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-linedashoffset>
+    fn SetLineDashOffset(&self, offset: f64) {
+        self.canvas_state.set_line_dash_offset(offset);
+    }
+
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsetx
     fn ShadowOffsetX(&self) -> f64 {
         self.canvas_state.shadow_offset_x()
diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs
index f61deba4044..d5d36442ede 100644
--- a/components/script/dom/characterdata.rs
+++ b/components/script/dom/characterdata.rs
@@ -6,12 +6,12 @@
 use std::cell::LazyCell;
 
 use dom_struct::dom_struct;
+use script_bindings::codegen::InheritTypes::{CharacterDataTypeId, NodeTypeId, TextTypeId};
 
 use crate::dom::bindings::cell::{DomRefCell, Ref};
 use crate::dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterDataMethods;
 use crate::dom::bindings::codegen::Bindings::NodeBinding::Node_Binding::NodeMethods;
 use crate::dom::bindings::codegen::Bindings::ProcessingInstructionBinding::ProcessingInstructionMethods;
-use crate::dom::bindings::codegen::InheritTypes::{CharacterDataTypeId, NodeTypeId, TextTypeId};
 use crate::dom::bindings::codegen::UnionTypes::NodeOrString;
 use crate::dom::bindings::error::{Error, ErrorResult, Fallible};
 use crate::dom::bindings::inheritance::Castable;
@@ -260,9 +260,9 @@ impl CharacterDataMethods<crate::DomTypeHolder> for CharacterData {
     }
 
     // https://dom.spec.whatwg.org/#dom-childnode-remove
-    fn Remove(&self) {
+    fn Remove(&self, can_gc: CanGc) {
         let node = self.upcast::<Node>();
-        node.remove_self();
+        node.remove_self(can_gc);
     }
 
     // https://dom.spec.whatwg.org/#dom-nondocumenttypechildnode-previouselementsibling
diff --git a/components/script/dom/clipboard.rs b/components/script/dom/clipboard.rs
new file mode 100644
index 00000000000..25878a1b29b
--- /dev/null
+++ b/components/script/dom/clipboard.rs
@@ -0,0 +1,282 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::rc::Rc;
+use std::str::FromStr;
+
+use constellation_traits::BlobImpl;
+use data_url::mime::Mime;
+use dom_struct::dom_struct;
+use embedder_traits::EmbedderMsg;
+use js::rust::HandleValue as SafeHandleValue;
+
+use crate::dom::bindings::codegen::Bindings::ClipboardBinding::{
+    ClipboardMethods, PresentationStyle,
+};
+use crate::dom::bindings::error::Error;
+use crate::dom::bindings::refcounted::TrustedPromise;
+use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object};
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::blob::Blob;
+use crate::dom::clipboarditem::Representation;
+use crate::dom::eventtarget::EventTarget;
+use crate::dom::globalscope::GlobalScope;
+use crate::dom::promise::Promise;
+use crate::dom::promisenativehandler::{Callback, PromiseNativeHandler};
+use crate::dom::window::Window;
+use crate::realms::{InRealm, enter_realm};
+use crate::routed_promise::{RoutedPromiseListener, route_promise};
+use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
+
+/// The fulfillment handler for the reacting to representationDataPromise part of
+/// <https://w3c.github.io/clipboard-apis/#dom-clipboard-readtext>.
+#[derive(Clone, JSTraceable, MallocSizeOf)]
+struct RepresentationDataPromiseFulfillmentHandler {
+    #[ignore_malloc_size_of = "Rc are hard"]
+    promise: Rc<Promise>,
+}
+
+impl Callback for RepresentationDataPromiseFulfillmentHandler {
+    /// The fulfillment case of Step 3.4.1.1.4.3 of
+    /// <https://w3c.github.io/clipboard-apis/#dom-clipboard-readtext>.
+    fn callback(&self, cx: SafeJSContext, v: SafeHandleValue, _realm: InRealm, can_gc: CanGc) {
+        // If v is a DOMString, then follow the below steps:
+        // Resolve p with v.
+        // Return p.
+        self.promise.resolve(cx, v, can_gc);
+
+        // NOTE: Since we ask text from arboard, v can't be a Blob
+        // If v is a Blob, then follow the below steps:
+        // Let string be the result of UTF-8 decoding v’s underlying byte sequence.
+        // Resolve p with string.
+        // Return p.
+    }
+}
+
+/// The rejection handler for the reacting to representationDataPromise part of
+/// <https://w3c.github.io/clipboard-apis/#dom-clipboard-readtext>.
+#[derive(Clone, JSTraceable, MallocSizeOf)]
+struct RepresentationDataPromiseRejectionHandler {
+    #[ignore_malloc_size_of = "Rc are hard"]
+    promise: Rc<Promise>,
+}
+
+impl Callback for RepresentationDataPromiseRejectionHandler {
+    /// The rejection case of Step 3.4.1.1.4.3 of
+    /// <https://w3c.github.io/clipboard-apis/#dom-clipboard-readtext>.
+    fn callback(&self, _cx: SafeJSContext, _v: SafeHandleValue, _realm: InRealm, can_gc: CanGc) {
+        // Reject p with "NotFoundError" DOMException in realm.
+        // Return p.
+        self.promise.reject_error(Error::NotFound, can_gc);
+    }
+}
+
+#[dom_struct]
+pub(crate) struct Clipboard {
+    event_target: EventTarget,
+}
+
+impl Clipboard {
+    fn new_inherited() -> Clipboard {
+        Clipboard {
+            event_target: EventTarget::new_inherited(),
+        }
+    }
+
+    pub(crate) fn new(global: &GlobalScope, can_gc: CanGc) -> DomRoot<Clipboard> {
+        reflect_dom_object(Box::new(Clipboard::new_inherited()), global, can_gc)
+    }
+}
+
+impl ClipboardMethods<crate::DomTypeHolder> for Clipboard {
+    /// <https://w3c.github.io/clipboard-apis/#dom-clipboard-readtext>
+    fn ReadText(&self, can_gc: CanGc) -> Rc<Promise> {
+        // Step 1 Let realm be this's relevant realm.
+        let global = self.global();
+
+        // Step 2 Let p be a new promise in realm.
+        let p = Promise::new(&global, can_gc);
+
+        // Step 3 Run the following steps in parallel:
+
+        // TODO Step 3.1 Let r be the result of running check clipboard read permission.
+        // Step 3.2 If r is false, then:
+        // Step 3.2.1 Queue a global task on the permission task source, given realm’s global object,
+        // to reject p with "NotAllowedError" DOMException in realm.
+        // Step 3.2.2 Abort these steps.
+
+        // Step 3.3 Let data be a copy of the system clipboard data.
+        let window = global.as_window();
+        let sender = route_promise(&p, self, global.task_manager().clipboard_task_source());
+        window.send_to_embedder(EmbedderMsg::GetClipboardText(window.webview_id(), sender));
+
+        // Step 3.4 Queue a global task on the clipboard task source,
+        // given realm’s global object, to perform the below steps:
+        // NOTE: We queue the task inside route_promise and perform the steps inside handle_response
+
+        p
+    }
+
+    /// <https://w3c.github.io/clipboard-apis/#dom-clipboard-writetext>
+    fn WriteText(&self, data: DOMString, can_gc: CanGc) -> Rc<Promise> {
+        // Step 1 Let realm be this's relevant realm.
+        // Step 2 Let p be a new promise in realm.
+        let p = Promise::new(&self.global(), can_gc);
+
+        // Step 3 Run the following steps in parallel:
+
+        // TODO write permission could be removed from spec
+        // Step 3.1 Let r be the result of running check clipboard write permission.
+        // Step 3.2 If r is false, then:
+        // Step 3.2.1 Queue a global task on the permission task source, given realm’s global object,
+        // to reject p with "NotAllowedError" DOMException in realm.
+        // Step 3.2.2 Abort these steps.
+
+        let trusted_promise = TrustedPromise::new(p.clone());
+        let bytes = Vec::from(data);
+
+        // Step 3.3 Queue a global task on the clipboard task source,
+        // given realm’s global object, to perform the below steps:
+        self.global().task_manager().clipboard_task_source().queue(
+            task!(write_to_system_clipboard: move || {
+                let promise = trusted_promise.root();
+                let global = promise.global();
+
+                // Step 3.3.1 Let itemList be an empty sequence<Blob>.
+                let mut item_list = Vec::new();
+
+                // Step 3.3.2 Let textBlob be a new Blob created with: type attribute set to "text/plain;charset=utf-8",
+                // and its underlying byte sequence set to the UTF-8 encoding of data.
+                let text_blob = Blob::new(
+                    &global,
+                    BlobImpl::new_from_bytes(bytes, "text/plain;charset=utf-8".into()),
+                    CanGc::note(),
+                );
+
+                // Step 3.3.3 Add textBlob to itemList.
+                item_list.push(text_blob);
+
+                // Step 3.3.4 Let option be set to "unspecified".
+                let option = PresentationStyle::Unspecified;
+
+                // Step 3.3.5 Write blobs and option to the clipboard with itemList and option.
+                write_blobs_and_option_to_the_clipboard(global.as_window(), item_list, option);
+
+                // Step 3.3.6 Resolve p.
+                promise.resolve_native(&(), CanGc::note());
+            }),
+        );
+
+        // Step 3.4 Return p.
+        p
+    }
+}
+
+impl RoutedPromiseListener<Result<String, String>> for Clipboard {
+    fn handle_response(
+        &self,
+        response: Result<String, String>,
+        promise: &Rc<Promise>,
+        can_gc: CanGc,
+    ) {
+        let global = self.global();
+        let text = response.unwrap_or_default();
+
+        // Step 3.4.1 For each systemClipboardItem in data:
+        // Step 3.4.1.1 For each systemClipboardRepresentation in systemClipboardItem:
+        // TODO: Arboard provide the first item that has a String representation
+
+        // Step 3.4.1.1.1 Let mimeType be the result of running the
+        // well-known mime type from os specific format algorithm given systemClipboardRepresentation’s name.
+        // Note: This is done by arboard, so we just convert the format to a MIME
+        let mime_type = Mime::from_str("text/plain").unwrap();
+
+        // Step 3.4.1.1.2 If mimeType is null, continue this loop.
+        // Note: Since the previous step is infallible, we don't need to handle this case
+
+        // Step 3.4.1.1.3 Let representation be a new representation.
+        let representation = Representation {
+            mime_type,
+            is_custom: false,
+            data: Promise::new_resolved(
+                &global,
+                GlobalScope::get_cx(),
+                DOMString::from(text),
+                can_gc,
+            ),
+        };
+
+        // Step 3.4.1.1.4 If representation’s MIME type essence is "text/plain", then:
+
+        // Step 3.4.1.1.4.1 Set representation’s MIME type to mimeType.
+        // Note: Done when creating a new representation
+
+        // Step 3.4.1.1.4.2 Let representationDataPromise be the representation’s data.
+        // Step 3.4.1.1.4.3 React to representationDataPromise:
+        let fulfillment_handler = Box::new(RepresentationDataPromiseFulfillmentHandler {
+            promise: promise.clone(),
+        });
+        let rejection_handler = Box::new(RepresentationDataPromiseRejectionHandler {
+            promise: promise.clone(),
+        });
+        let handler = PromiseNativeHandler::new(
+            &global,
+            Some(fulfillment_handler),
+            Some(rejection_handler),
+            can_gc,
+        );
+        let realm = enter_realm(&*global);
+        let comp = InRealm::Entered(&realm);
+        representation
+            .data
+            .append_native_handler(&handler, comp, can_gc);
+
+        // Step 3.4.2 Reject p with "NotFoundError" DOMException in realm.
+        // Step 3.4.3 Return p.
+        // NOTE: We follow the same behaviour of Gecko by doing nothing if no text is available instead of rejecting p
+    }
+}
+
+/// <https://w3c.github.io/clipboard-apis/#write-blobs-and-option-to-the-clipboard>
+fn write_blobs_and_option_to_the_clipboard(
+    window: &Window,
+    items: Vec<DomRoot<Blob>>,
+    _presentation_style: PresentationStyle,
+) {
+    // TODO Step 1 Let webCustomFormats be a sequence<Blob>.
+
+    // Step 2 For each item in items:
+    for item in items {
+        // TODO support more formats than just text/plain
+        // Step 2.1 Let formatString be the result of running os specific well-known format given item’s type.
+
+        // Step 2.2 If formatString is empty then follow the below steps:
+
+        // Step 2.2.1 Let webCustomFormatString be the item’s type.
+        // Step 2.2.2 Let webCustomFormat be an empty type.
+        // Step 2.2.3 If webCustomFormatString starts with "web " prefix,
+        // then remove the "web " prefix and store the remaining string in webMimeTypeString.
+        // Step 2.2.4 Let webMimeType be the result of parsing a MIME type given webMimeTypeString.
+        // Step 2.2.5 If webMimeType is failure, then abort all steps.
+        // Step 2.2.6 Let webCustomFormat’s type's essence equal to webMimeType.
+        // Step 2.2.7 Set item’s type to webCustomFormat.
+        // Step 2.2.8 Append webCustomFormat to webCustomFormats.
+
+        // Step 2.3 Let payload be the result of UTF-8 decoding item’s underlying byte sequence.
+        // Step 2.4 Insert payload and presentationStyle into the system clipboard
+        // using formatString as the native clipboard format.
+        window.send_to_embedder(EmbedderMsg::SetClipboardText(
+            window.webview_id(),
+            String::from_utf8(
+                item.get_bytes()
+                    .expect("No bytes found for Blob created by caller"),
+            )
+            .expect("DOMString contained invalid bytes"),
+        ));
+    }
+
+    // TODO Step 3 Write web custom formats given webCustomFormats.
+    // Needs support to arbitrary formats inside arboard
+}
diff --git a/components/script/dom/clipboardevent.rs b/components/script/dom/clipboardevent.rs
index eccf590e792..3cacb18a28a 100644
--- a/components/script/dom/clipboardevent.rs
+++ b/components/script/dom/clipboardevent.rs
@@ -41,7 +41,7 @@ impl ClipboardEventType {
 }
 
 #[dom_struct]
-pub struct ClipboardEvent {
+pub(crate) struct ClipboardEvent {
     event: Event,
     clipboard_data: MutNullableDom<DataTransfer>,
 }
diff --git a/components/script/dom/clipboarditem.rs b/components/script/dom/clipboarditem.rs
new file mode 100644
index 00000000000..129beb686c1
--- /dev/null
+++ b/components/script/dom/clipboarditem.rs
@@ -0,0 +1,181 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::ops::Deref;
+use std::rc::Rc;
+use std::str::FromStr;
+
+use data_url::mime::Mime;
+use dom_struct::dom_struct;
+use js::rust::{HandleObject, MutableHandleValue};
+use script_bindings::record::Record;
+
+use crate::dom::bindings::cell::DomRefCell;
+use crate::dom::bindings::codegen::Bindings::ClipboardBinding::{
+    ClipboardItemMethods, ClipboardItemOptions, PresentationStyle,
+};
+use crate::dom::bindings::error::{Error, Fallible};
+use crate::dom::bindings::frozenarray::CachedFrozenArray;
+use crate::dom::bindings::reflector::{Reflector, reflect_dom_object_with_proto};
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::promise::Promise;
+use crate::dom::window::Window;
+use crate::script_runtime::{CanGc, JSContext};
+
+/// <https://w3c.github.io/clipboard-apis/#web-custom-format>
+const CUSTOM_FORMAT_PREFIX: &str = "web ";
+
+/// <https://w3c.github.io/clipboard-apis/#representation>
+#[derive(JSTraceable, MallocSizeOf)]
+pub(super) struct Representation {
+    #[no_trace]
+    #[ignore_malloc_size_of = "Extern type"]
+    pub mime_type: Mime,
+    pub is_custom: bool,
+    #[ignore_malloc_size_of = "Rc is hard"]
+    pub data: Rc<Promise>,
+}
+
+#[dom_struct]
+pub(crate) struct ClipboardItem {
+    reflector_: Reflector,
+    representations: DomRefCell<Vec<Representation>>,
+    presentation_style: DomRefCell<PresentationStyle>,
+    #[ignore_malloc_size_of = "mozjs"]
+    frozen_types: CachedFrozenArray,
+}
+
+impl ClipboardItem {
+    fn new_inherited() -> ClipboardItem {
+        ClipboardItem {
+            reflector_: Reflector::new(),
+            representations: Default::default(),
+            presentation_style: Default::default(),
+            frozen_types: CachedFrozenArray::new(),
+        }
+    }
+
+    fn new(window: &Window, proto: Option<HandleObject>, can_gc: CanGc) -> DomRoot<ClipboardItem> {
+        reflect_dom_object_with_proto(
+            Box::new(ClipboardItem::new_inherited()),
+            window,
+            proto,
+            can_gc,
+        )
+    }
+}
+
+impl ClipboardItemMethods<crate::DomTypeHolder> for ClipboardItem {
+    /// <https://w3c.github.io/clipboard-apis/#dom-clipboarditem-clipboarditem>
+    fn Constructor(
+        global: &Window,
+        proto: Option<HandleObject>,
+        can_gc: CanGc,
+        items: Record<DOMString, Rc<Promise>>,
+        options: &ClipboardItemOptions,
+    ) -> Fallible<DomRoot<ClipboardItem>> {
+        // Step 1 If items is empty, then throw a TypeError.
+        if items.is_empty() {
+            return Err(Error::Type(String::from("No item provided")));
+        }
+
+        // Step 2 If options is empty, then set options["presentationStyle"] = "unspecified".
+        // NOTE: This is done inside bindings
+
+        // Step 3 Set this's clipboard item to a new clipboard item.
+        let clipboard_item = ClipboardItem::new(global, proto, can_gc);
+
+        // Step 4 Set this's clipboard item's presentation style to options["presentationStyle"].
+        *clipboard_item.presentation_style.borrow_mut() = options.presentationStyle;
+
+        // Step 6 For each (key, value) in items:
+        for (key, value) in items.deref() {
+            // Step 6.2 Let isCustom be false.
+
+            // Step 6.3 If key starts with `"web "` prefix, then
+            // Step 6.3.1 Remove `"web "` prefix and assign the remaining string to key.
+            let (key, is_custom) = match key.strip_prefix(CUSTOM_FORMAT_PREFIX) {
+                None => (key.str(), false),
+                // Step 6.3.2 Set isCustom true
+                Some(stripped) => (stripped, true),
+            };
+
+            // Step 6.5 Let mimeType be the result of parsing a MIME type given key.
+            // Step 6.6 If mimeType is failure, then throw a TypeError.
+            let mime_type =
+                Mime::from_str(key).map_err(|_| Error::Type(String::from("Invalid mime type")))?;
+
+            // Step 6.7 If this's clipboard item's list of representations contains a representation
+            // whose MIME type is mimeType and whose [representation/isCustom] is isCustom, then throw a TypeError.
+            if clipboard_item
+                .representations
+                .borrow()
+                .iter()
+                .any(|representation| {
+                    representation.mime_type == mime_type && representation.is_custom == is_custom
+                })
+            {
+                return Err(Error::Type(String::from("Tried to add a duplicate mime")));
+            }
+
+            // Step 6.1 Let representation be a new representation.
+            // Step 6.4 Set representation’s isCustom flag to isCustom.
+            // Step 6.8 Set representation’s MIME type to mimeType.
+            // Step 6.9 Set representation’s data to value.
+            let representation = Representation {
+                mime_type,
+                is_custom,
+                data: value.clone(),
+            };
+
+            // Step 6.10 Append representation to this's clipboard item's list of representations.
+            clipboard_item
+                .representations
+                .borrow_mut()
+                .push(representation);
+        }
+
+        // NOTE: The steps for creating a frozen array from the list of mimeType are done in the Types() method
+
+        Ok(clipboard_item)
+    }
+
+    /// <https://w3c.github.io/clipboard-apis/#dom-clipboarditem-presentationstyle>
+    fn PresentationStyle(&self) -> PresentationStyle {
+        *self.presentation_style.borrow()
+    }
+
+    /// <https://w3c.github.io/clipboard-apis/#dom-clipboarditem-types>
+    fn Types(&self, cx: JSContext, can_gc: CanGc, retval: MutableHandleValue) {
+        self.frozen_types.get_or_init(
+            || {
+                // Step 5 Let types be a list of DOMString.
+                let mut types = Vec::new();
+
+                self.representations
+                    .borrow()
+                    .iter()
+                    .for_each(|representation| {
+                        // Step 6.11 Let mimeTypeString be the result of serializing a MIME type with mimeType.
+                        let mime_type_string = representation.mime_type.to_string();
+
+                        // Step 6.12 If isCustom is true, prefix mimeTypeString with `"web "`.
+                        let mime_type_string = if representation.is_custom {
+                            format!("{}{}", CUSTOM_FORMAT_PREFIX, mime_type_string)
+                        } else {
+                            mime_type_string
+                        };
+
+                        // Step 6.13 Add mimeTypeString to types.
+                        types.push(DOMString::from(mime_type_string));
+                    });
+                types
+            },
+            cx,
+            retval,
+            can_gc,
+        );
+    }
+}
diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs
index c2e038eb66b..2e7c4cf8def 100644
--- a/components/script/dom/create.rs
+++ b/components/script/dom/create.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use html5ever::{LocalName, Prefix, QualName, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, QualName, local_name, ns};
 use js::rust::HandleObject;
 use servo_config::pref;
 
@@ -85,6 +85,7 @@ use crate::dom::htmlulistelement::HTMLUListElement;
 use crate::dom::htmlunknownelement::HTMLUnknownElement;
 use crate::dom::htmlvideoelement::HTMLVideoElement;
 use crate::dom::svgelement::SVGElement;
+use crate::dom::svgimageelement::SVGImageElement;
 use crate::dom::svgsvgelement::SVGSVGElement;
 use crate::realms::{InRealm, enter_realm};
 use crate::script_runtime::CanGc;
@@ -114,6 +115,7 @@ fn create_svg_element(
     }
 
     match name.local {
+        local_name!("image") => make!(SVGImageElement),
         local_name!("svg") => make!(SVGSVGElement),
         _ => make!(SVGElement),
     }
diff --git a/components/script/dom/cssconditionrule.rs b/components/script/dom/cssconditionrule.rs
index ce1e652aa1a..2d64a220a7e 100644
--- a/components/script/dom/cssconditionrule.rs
+++ b/components/script/dom/cssconditionrule.rs
@@ -18,6 +18,9 @@ use crate::dom::csssupportsrule::CSSSupportsRule;
 #[dom_struct]
 pub(crate) struct CSSConditionRule {
     cssgroupingrule: CSSGroupingRule,
+    #[ignore_malloc_size_of = "Arc"]
+    #[no_trace]
+    rules: Arc<Locked<StyleCssRules>>,
 }
 
 impl CSSConditionRule {
@@ -26,7 +29,8 @@ impl CSSConditionRule {
         rules: Arc<Locked<StyleCssRules>>,
     ) -> CSSConditionRule {
         CSSConditionRule {
-            cssgroupingrule: CSSGroupingRule::new_inherited(parent_stylesheet, rules),
+            cssgroupingrule: CSSGroupingRule::new_inherited(parent_stylesheet),
+            rules,
         }
     }
 
@@ -37,6 +41,10 @@ impl CSSConditionRule {
     pub(crate) fn shared_lock(&self) -> &SharedRwLock {
         self.cssgroupingrule.shared_lock()
     }
+
+    pub(crate) fn clone_rules(&self) -> Arc<Locked<StyleCssRules>> {
+        self.rules.clone()
+    }
 }
 
 impl CSSConditionRuleMethods<crate::DomTypeHolder> for CSSConditionRule {
diff --git a/components/script/dom/cssgroupingrule.rs b/components/script/dom/cssgroupingrule.rs
index 7006b7d03b5..54b8171eba6 100644
--- a/components/script/dom/cssgroupingrule.rs
+++ b/components/script/dom/cssgroupingrule.rs
@@ -3,9 +3,8 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use servo_arc::Arc;
-use style::shared_lock::{Locked, SharedRwLock};
-use style::stylesheets::{CssRuleType, CssRuleTypes, CssRules as StyleCssRules};
+use style::shared_lock::SharedRwLock;
+use style::stylesheets::{CssRuleType, CssRuleTypes};
 
 use crate::dom::bindings::codegen::Bindings::CSSGroupingRuleBinding::CSSGroupingRuleMethods;
 use crate::dom::bindings::error::{ErrorResult, Fallible};
@@ -13,28 +12,24 @@ use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::reflector::DomGlobal;
 use crate::dom::bindings::root::{DomRoot, MutNullableDom};
 use crate::dom::bindings::str::DOMString;
+use crate::dom::cssconditionrule::CSSConditionRule;
+use crate::dom::csslayerblockrule::CSSLayerBlockRule;
 use crate::dom::cssrule::CSSRule;
 use crate::dom::cssrulelist::{CSSRuleList, RulesSource};
+use crate::dom::cssstylerule::CSSStyleRule;
 use crate::dom::cssstylesheet::CSSStyleSheet;
 use crate::script_runtime::CanGc;
 
 #[dom_struct]
 pub(crate) struct CSSGroupingRule {
     cssrule: CSSRule,
-    #[ignore_malloc_size_of = "Arc"]
-    #[no_trace]
-    rules: Arc<Locked<StyleCssRules>>,
     rulelist: MutNullableDom<CSSRuleList>,
 }
 
 impl CSSGroupingRule {
-    pub(crate) fn new_inherited(
-        parent_stylesheet: &CSSStyleSheet,
-        rules: Arc<Locked<StyleCssRules>>,
-    ) -> CSSGroupingRule {
+    pub(crate) fn new_inherited(parent_stylesheet: &CSSStyleSheet) -> CSSGroupingRule {
         CSSGroupingRule {
             cssrule: CSSRule::new_inherited(parent_stylesheet),
-            rules,
             rulelist: MutNullableDom::new(None),
         }
     }
@@ -42,10 +37,19 @@ impl CSSGroupingRule {
     fn rulelist(&self, can_gc: CanGc) -> DomRoot<CSSRuleList> {
         let parent_stylesheet = self.upcast::<CSSRule>().parent_stylesheet();
         self.rulelist.or_init(|| {
+            let rules = if let Some(rule) = self.downcast::<CSSConditionRule>() {
+                rule.clone_rules()
+            } else if let Some(rule) = self.downcast::<CSSLayerBlockRule>() {
+                rule.clone_rules()
+            } else if let Some(rule) = self.downcast::<CSSStyleRule>() {
+                rule.ensure_rules()
+            } else {
+                unreachable!()
+            };
             CSSRuleList::new(
                 self.global().as_window(),
                 parent_stylesheet,
-                RulesSource::Rules(self.rules.clone()),
+                RulesSource::Rules(rules),
                 can_gc,
             )
         })
diff --git a/components/script/dom/csslayerblockrule.rs b/components/script/dom/csslayerblockrule.rs
index b0c29343366..c04eea68482 100644
--- a/components/script/dom/csslayerblockrule.rs
+++ b/components/script/dom/csslayerblockrule.rs
@@ -4,8 +4,8 @@
 
 use dom_struct::dom_struct;
 use servo_arc::Arc;
-use style::shared_lock::ToCssWithGuard;
-use style::stylesheets::{CssRuleType, LayerBlockRule};
+use style::shared_lock::{Locked, ToCssWithGuard};
+use style::stylesheets::{CssRuleType, CssRules, LayerBlockRule};
 use style_traits::ToCss;
 
 use crate::dom::bindings::codegen::Bindings::CSSLayerBlockRuleBinding::CSSLayerBlockRuleMethods;
@@ -32,10 +32,7 @@ impl CSSLayerBlockRule {
         layerblockrule: Arc<LayerBlockRule>,
     ) -> CSSLayerBlockRule {
         CSSLayerBlockRule {
-            cssgroupingrule: CSSGroupingRule::new_inherited(
-                parent_stylesheet,
-                layerblockrule.rules.clone(),
-            ),
+            cssgroupingrule: CSSGroupingRule::new_inherited(parent_stylesheet),
             layerblockrule,
         }
     }
@@ -56,6 +53,10 @@ impl CSSLayerBlockRule {
             can_gc,
         )
     }
+
+    pub(crate) fn clone_rules(&self) -> Arc<Locked<CssRules>> {
+        self.layerblockrule.rules.clone()
+    }
 }
 
 impl SpecificCSSRule for CSSLayerBlockRule {
diff --git a/components/script/dom/cssnesteddeclarations.rs b/components/script/dom/cssnesteddeclarations.rs
new file mode 100644
index 00000000000..2f2585631e1
--- /dev/null
+++ b/components/script/dom/cssnesteddeclarations.rs
@@ -0,0 +1,91 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use dom_struct::dom_struct;
+use servo_arc::Arc;
+use style::shared_lock::{Locked, ToCssWithGuard};
+use style::stylesheets::{CssRuleType, NestedDeclarationsRule};
+
+use crate::dom::bindings::codegen::Bindings::CSSNestedDeclarationsBinding::CSSNestedDeclarationsMethods;
+use crate::dom::bindings::inheritance::Castable;
+use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object};
+use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
+use crate::dom::bindings::str::DOMString;
+use crate::dom::cssrule::{CSSRule, SpecificCSSRule};
+use crate::dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration, CSSStyleOwner};
+use crate::dom::cssstylesheet::CSSStyleSheet;
+use crate::dom::window::Window;
+use crate::script_runtime::CanGc;
+
+#[dom_struct]
+pub(crate) struct CSSNestedDeclarations {
+    cssrule: CSSRule,
+    #[ignore_malloc_size_of = "Arc"]
+    #[no_trace]
+    nesteddeclarationsrule: Arc<Locked<NestedDeclarationsRule>>,
+    style_decl: MutNullableDom<CSSStyleDeclaration>,
+}
+
+impl CSSNestedDeclarations {
+    pub(crate) fn new_inherited(
+        parent_stylesheet: &CSSStyleSheet,
+        nesteddeclarationsrule: Arc<Locked<NestedDeclarationsRule>>,
+    ) -> Self {
+        Self {
+            cssrule: CSSRule::new_inherited(parent_stylesheet),
+            nesteddeclarationsrule,
+            style_decl: Default::default(),
+        }
+    }
+
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    pub(crate) fn new(
+        window: &Window,
+        parent_stylesheet: &CSSStyleSheet,
+        nesteddeclarationsrule: Arc<Locked<NestedDeclarationsRule>>,
+        can_gc: CanGc,
+    ) -> DomRoot<Self> {
+        reflect_dom_object(
+            Box::new(Self::new_inherited(
+                parent_stylesheet,
+                nesteddeclarationsrule,
+            )),
+            window,
+            can_gc,
+        )
+    }
+}
+
+impl SpecificCSSRule for CSSNestedDeclarations {
+    fn ty(&self) -> CssRuleType {
+        CssRuleType::NestedDeclarations
+    }
+
+    fn get_css(&self) -> DOMString {
+        let guard = self.cssrule.shared_lock().read();
+        self.nesteddeclarationsrule
+            .read_with(&guard)
+            .to_css_string(&guard)
+            .into()
+    }
+}
+
+impl CSSNestedDeclarationsMethods<crate::DomTypeHolder> for CSSNestedDeclarations {
+    /// <https://drafts.csswg.org/css-nesting/#dom-cssnesteddeclarations-style>
+    fn Style(&self, can_gc: CanGc) -> DomRoot<CSSStyleDeclaration> {
+        self.style_decl.or_init(|| {
+            let guard = self.cssrule.shared_lock().read();
+            CSSStyleDeclaration::new(
+                self.global().as_window(),
+                CSSStyleOwner::CSSRule(
+                    Dom::from_ref(self.upcast()),
+                    self.nesteddeclarationsrule.read_with(&guard).block.clone(),
+                ),
+                None,
+                CSSModificationAccess::ReadWrite,
+                can_gc,
+            )
+        })
+    }
+}
diff --git a/components/script/dom/cssrule.rs b/components/script/dom/cssrule.rs
index 9990be38148..172d29c26c9 100644
--- a/components/script/dom/cssrule.rs
+++ b/components/script/dom/cssrule.rs
@@ -21,6 +21,7 @@ use crate::dom::csslayerblockrule::CSSLayerBlockRule;
 use crate::dom::csslayerstatementrule::CSSLayerStatementRule;
 use crate::dom::cssmediarule::CSSMediaRule;
 use crate::dom::cssnamespacerule::CSSNamespaceRule;
+use crate::dom::cssnesteddeclarations::CSSNestedDeclarations;
 use crate::dom::cssstylerule::CSSStyleRule;
 use crate::dom::cssstylesheet::CSSStyleSheet;
 use crate::dom::csssupportsrule::CSSSupportsRule;
@@ -69,6 +70,8 @@ impl CSSRule {
             rule as &dyn SpecificCSSRule
         } else if let Some(rule) = self.downcast::<CSSLayerStatementRule>() {
             rule as &dyn SpecificCSSRule
+        } else if let Some(rule) = self.downcast::<CSSNestedDeclarations>() {
+            rule as &dyn SpecificCSSRule
         } else {
             unreachable!()
         }
@@ -125,7 +128,12 @@ impl CSSRule {
             StyleCssRule::Scope(_) => unimplemented!(),             // TODO
             StyleCssRule::StartingStyle(_) => unimplemented!(),     // TODO
             StyleCssRule::PositionTry(_) => unimplemented!(),       // TODO
-            StyleCssRule::NestedDeclarations(_) => unimplemented!(), // TODO
+            StyleCssRule::NestedDeclarations(s) => DomRoot::upcast(CSSNestedDeclarations::new(
+                window,
+                parent_stylesheet,
+                s,
+                can_gc,
+            )),
         }
     }
 
diff --git a/components/script/dom/cssrulelist.rs b/components/script/dom/cssrulelist.rs
index 802f3518fe4..08f194d5521 100644
--- a/components/script/dom/cssrulelist.rs
+++ b/components/script/dom/cssrulelist.rs
@@ -125,6 +125,11 @@ impl CSSRuleList {
         let loader = owner
             .as_ref()
             .map(|element| StylesheetLoader::for_element(element));
+        let allow_import_rules = if self.parent_stylesheet.is_constructed() {
+            AllowImportRules::No
+        } else {
+            AllowImportRules::Yes
+        };
         let new_rule = css_rules
             .insert_rule(
                 &parent_stylesheet.shared_lock,
@@ -134,7 +139,7 @@ impl CSSRuleList {
                 containing_rule_types,
                 parse_relative_rule_type,
                 loader.as_ref().map(|l| l as &dyn StyleStylesheetLoader),
-                AllowImportRules::Yes,
+                allow_import_rules,
             )
             .map_err(Convert::convert)?;
 
@@ -190,20 +195,32 @@ impl CSSRuleList {
         self.dom_rules.borrow().get(idx as usize).map(|rule| {
             rule.or_init(|| {
                 let parent_stylesheet = &self.parent_stylesheet;
-                let guard = parent_stylesheet.shared_lock().read();
+                let lock = parent_stylesheet.shared_lock();
                 match self.rules {
-                    RulesSource::Rules(ref rules) => CSSRule::new_specific(
-                        self.global().as_window(),
-                        parent_stylesheet,
-                        rules.read_with(&guard).0[idx as usize].clone(),
-                        can_gc,
-                    ),
-                    RulesSource::Keyframes(ref rules) => DomRoot::upcast(CSSKeyframeRule::new(
-                        self.global().as_window(),
-                        parent_stylesheet,
-                        rules.read_with(&guard).keyframes[idx as usize].clone(),
-                        can_gc,
-                    )),
+                    RulesSource::Rules(ref rules) => {
+                        let rule = {
+                            let guard = lock.read();
+                            rules.read_with(&guard).0[idx as usize].clone()
+                        };
+                        CSSRule::new_specific(
+                            self.global().as_window(),
+                            parent_stylesheet,
+                            rule,
+                            can_gc,
+                        )
+                    },
+                    RulesSource::Keyframes(ref rules) => {
+                        let rule = {
+                            let guard = lock.read();
+                            rules.read_with(&guard).keyframes[idx as usize].clone()
+                        };
+                        DomRoot::upcast(CSSKeyframeRule::new(
+                            self.global().as_window(),
+                            parent_stylesheet,
+                            rule,
+                            can_gc,
+                        ))
+                    },
                 }
             })
         })
diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs
index 2909ebe077e..8060636f17f 100644
--- a/components/script/dom/cssstyledeclaration.rs
+++ b/components/script/dom/cssstyledeclaration.rs
@@ -45,6 +45,9 @@ pub(crate) struct CSSStyleDeclaration {
 #[derive(JSTraceable, MallocSizeOf)]
 #[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
 pub(crate) enum CSSStyleOwner {
+    /// Used when calling `getComputedStyle()` with an invalid pseudo-element selector.
+    /// See <https://drafts.csswg.org/cssom/#dom-window-getcomputedstyle>
+    Null,
     Element(Dom<Element>),
     CSSRule(
         Dom<CSSRule>,
@@ -66,6 +69,9 @@ impl CSSStyleOwner {
         // This is somewhat complex but the complexity is encapsulated.
         let mut changed = true;
         match *self {
+            CSSStyleOwner::Null => unreachable!(
+                "CSSStyleDeclaration should always be read-only when CSSStyleOwner is Null"
+            ),
             CSSStyleOwner::Element(ref el) => {
                 let document = el.owner_document();
                 let shared_lock = document.style_shared_lock();
@@ -135,6 +141,9 @@ impl CSSStyleOwner {
         F: FnOnce(&PropertyDeclarationBlock) -> R,
     {
         match *self {
+            CSSStyleOwner::Null => {
+                unreachable!("Should never call with_block for CSStyleOwner::Null")
+            },
             CSSStyleOwner::Element(ref el) => match *el.style_attribute().borrow() {
                 Some(ref pdb) => {
                     let document = el.owner_document();
@@ -155,6 +164,9 @@ impl CSSStyleOwner {
 
     fn window(&self) -> DomRoot<Window> {
         match *self {
+            CSSStyleOwner::Null => {
+                unreachable!("Should never try to access window of CSStyleOwner::Null")
+            },
             CSSStyleOwner::Element(ref el) => el.owner_window(),
             CSSStyleOwner::CSSRule(ref rule, _) => DomRoot::from_ref(rule.global().as_window()),
         }
@@ -162,6 +174,9 @@ impl CSSStyleOwner {
 
     fn base_url(&self) -> ServoUrl {
         match *self {
+            CSSStyleOwner::Null => {
+                unreachable!("Should never try to access base URL of CSStyleOwner::Null")
+            },
             CSSStyleOwner::Element(ref el) => el.owner_document().base_url(),
             CSSStyleOwner::CSSRule(ref rule, _) => ServoUrl::from(
                 rule.parent_stylesheet()
@@ -221,6 +236,13 @@ impl CSSStyleDeclaration {
         pseudo: Option<PseudoElement>,
         modification_access: CSSModificationAccess,
     ) -> CSSStyleDeclaration {
+        // If creating a CSSStyleDeclaration with CSSSStyleOwner::Null, this should always
+        // be in read-only mode.
+        assert!(
+            !matches!(owner, CSSStyleOwner::Null) ||
+                modification_access == CSSModificationAccess::Readonly
+        );
+
         CSSStyleDeclaration {
             reflector_: Reflector::new(),
             owner,
@@ -262,10 +284,15 @@ impl CSSStyleDeclaration {
                 node.owner_window()
                     .resolved_style_query(addr, self.pseudo, property, can_gc)
             },
+            CSSStyleOwner::Null => DOMString::new(),
         }
     }
 
     fn get_property_value(&self, id: PropertyId, can_gc: CanGc) -> DOMString {
+        if matches!(self.owner, CSSStyleOwner::Null) {
+            return DOMString::new();
+        }
+
         if self.readonly {
             // Readonly style declarations are used for getComputedStyle.
             return self.get_computed_style(id, can_gc);
@@ -388,6 +415,10 @@ pub(crate) static ENABLED_LONGHAND_PROPERTIES: LazyLock<Vec<LonghandId>> = LazyL
 impl CSSStyleDeclarationMethods<crate::DomTypeHolder> for CSSStyleDeclaration {
     // https://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-length
     fn Length(&self) -> u32 {
+        if matches!(self.owner, CSSStyleOwner::Null) {
+            return 0;
+        }
+
         if self.readonly {
             // Readonly style declarations are used for getComputedStyle.
             // TODO: include custom properties whose computed value is not the guaranteed-invalid value.
@@ -489,6 +520,9 @@ impl CSSStyleDeclarationMethods<crate::DomTypeHolder> for CSSStyleDeclaration {
 
     // https://dev.w3.org/csswg/cssom/#the-cssstyledeclaration-interface
     fn IndexedGetter(&self, index: u32) -> Option<DOMString> {
+        if matches!(self.owner, CSSStyleOwner::Null) {
+            return None;
+        }
         if self.readonly {
             // Readonly style declarations are used for getComputedStyle.
             // TODO: include custom properties whose computed value is not the guaranteed-invalid value.
diff --git a/components/script/dom/cssstylerule.rs b/components/script/dom/cssstylerule.rs
index 14d23079d36..2e655fb59cd 100644
--- a/components/script/dom/cssstylerule.rs
+++ b/components/script/dom/cssstylerule.rs
@@ -10,14 +10,15 @@ use selectors::parser::{ParseRelative, SelectorList};
 use servo_arc::Arc;
 use style::selector_parser::SelectorParser;
 use style::shared_lock::{Locked, ToCssWithGuard};
-use style::stylesheets::{CssRuleType, Origin, StyleRule};
+use style::stylesheets::{CssRuleType, CssRules, Origin, StyleRule};
 
 use crate::dom::bindings::codegen::Bindings::CSSStyleRuleBinding::CSSStyleRuleMethods;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
 use crate::dom::bindings::str::DOMString;
-use crate::dom::cssrule::{CSSRule, SpecificCSSRule};
+use crate::dom::cssgroupingrule::CSSGroupingRule;
+use crate::dom::cssrule::SpecificCSSRule;
 use crate::dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration, CSSStyleOwner};
 use crate::dom::cssstylesheet::CSSStyleSheet;
 use crate::dom::node::NodeTraits;
@@ -26,7 +27,7 @@ use crate::script_runtime::CanGc;
 
 #[dom_struct]
 pub(crate) struct CSSStyleRule {
-    cssrule: CSSRule,
+    cssgroupingrule: CSSGroupingRule,
     #[ignore_malloc_size_of = "Arc"]
     #[no_trace]
     stylerule: Arc<Locked<StyleRule>>,
@@ -39,7 +40,7 @@ impl CSSStyleRule {
         stylerule: Arc<Locked<StyleRule>>,
     ) -> CSSStyleRule {
         CSSStyleRule {
-            cssrule: CSSRule::new_inherited(parent_stylesheet),
+            cssgroupingrule: CSSGroupingRule::new_inherited(parent_stylesheet),
             stylerule,
             style_decl: Default::default(),
         }
@@ -58,6 +59,16 @@ impl CSSStyleRule {
             can_gc,
         )
     }
+
+    pub(crate) fn ensure_rules(&self) -> Arc<Locked<CssRules>> {
+        let lock = self.cssgroupingrule.shared_lock();
+        let mut guard = lock.write();
+        self.stylerule
+            .write_with(&mut guard)
+            .rules
+            .get_or_insert_with(|| CssRules::new(vec![], lock))
+            .clone()
+    }
 }
 
 impl SpecificCSSRule for CSSStyleRule {
@@ -66,7 +77,7 @@ impl SpecificCSSRule for CSSStyleRule {
     }
 
     fn get_css(&self) -> DOMString {
-        let guard = self.cssrule.shared_lock().read();
+        let guard = self.cssgroupingrule.shared_lock().read();
         self.stylerule
             .read_with(&guard)
             .to_css_string(&guard)
@@ -76,9 +87,9 @@ impl SpecificCSSRule for CSSStyleRule {
 
 impl CSSStyleRuleMethods<crate::DomTypeHolder> for CSSStyleRule {
     // https://drafts.csswg.org/cssom/#dom-cssstylerule-style
-    fn Style(&self) -> DomRoot<CSSStyleDeclaration> {
+    fn Style(&self, can_gc: CanGc) -> DomRoot<CSSStyleDeclaration> {
         self.style_decl.or_init(|| {
-            let guard = self.cssrule.shared_lock().read();
+            let guard = self.cssgroupingrule.shared_lock().read();
             CSSStyleDeclaration::new(
                 self.global().as_window(),
                 CSSStyleOwner::CSSRule(
@@ -87,21 +98,25 @@ impl CSSStyleRuleMethods<crate::DomTypeHolder> for CSSStyleRule {
                 ),
                 None,
                 CSSModificationAccess::ReadWrite,
-                CanGc::note(),
+                can_gc,
             )
         })
     }
 
     // https://drafts.csswg.org/cssom/#dom-cssstylerule-selectortext
     fn SelectorText(&self) -> DOMString {
-        let guard = self.cssrule.shared_lock().read();
+        let guard = self.cssgroupingrule.shared_lock().read();
         let stylerule = self.stylerule.read_with(&guard);
         DOMString::from_string(stylerule.selectors.to_css_string())
     }
 
     // https://drafts.csswg.org/cssom/#dom-cssstylerule-selectortext
     fn SetSelectorText(&self, value: DOMString) {
-        let contents = &self.cssrule.parent_stylesheet().style_stylesheet().contents;
+        let contents = &self
+            .cssgroupingrule
+            .parent_stylesheet()
+            .style_stylesheet()
+            .contents;
         // It's not clear from the spec if we should use the stylesheet's namespaces.
         // https://github.com/w3c/csswg-drafts/issues/1511
         let namespaces = contents.namespaces.read();
@@ -118,10 +133,10 @@ impl CSSStyleRuleMethods<crate::DomTypeHolder> for CSSStyleRule {
         // rule?
         if let Ok(mut s) = SelectorList::parse(&parser, &mut css_parser, ParseRelative::No) {
             // This mirrors what we do in CSSStyleOwner::mutate_associated_block.
-            let mut guard = self.cssrule.shared_lock().write();
+            let mut guard = self.cssgroupingrule.shared_lock().write();
             let stylerule = self.stylerule.write_with(&mut guard);
             mem::swap(&mut stylerule.selectors, &mut s);
-            if let Some(owner) = self.cssrule.parent_stylesheet().get_owner() {
+            if let Some(owner) = self.cssgroupingrule.parent_stylesheet().get_owner() {
                 owner.stylesheet_list_owner().invalidate_stylesheets();
             }
         }
diff --git a/components/script/dom/cssstylesheet.rs b/components/script/dom/cssstylesheet.rs
index e5d802eb532..a367c9943de 100644
--- a/components/script/dom/cssstylesheet.rs
+++ b/components/script/dom/cssstylesheet.rs
@@ -5,15 +5,26 @@
 use std::cell::Cell;
 
 use dom_struct::dom_struct;
+use js::rust::HandleObject;
 use servo_arc::Arc;
+use style::media_queries::MediaList as StyleMediaList;
 use style::shared_lock::SharedRwLock;
-use style::stylesheets::{CssRuleTypes, Stylesheet as StyleStyleSheet};
+use style::stylesheets::{
+    AllowImportRules, CssRuleTypes, Origin, Stylesheet as StyleStyleSheet, UrlExtraData,
+};
 
-use crate::dom::bindings::codegen::Bindings::CSSStyleSheetBinding::CSSStyleSheetMethods;
+use crate::dom::bindings::codegen::Bindings::CSSStyleSheetBinding::{
+    CSSStyleSheetInit, CSSStyleSheetMethods,
+};
+use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
+use crate::dom::bindings::codegen::GenericBindings::CSSRuleListBinding::CSSRuleList_Binding::CSSRuleListMethods;
+use crate::dom::bindings::codegen::UnionTypes::MediaListOrString;
 use crate::dom::bindings::error::{Error, ErrorResult, Fallible};
-use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object};
+use crate::dom::bindings::reflector::{
+    DomGlobal, reflect_dom_object, reflect_dom_object_with_proto,
+};
 use crate::dom::bindings::root::{DomRoot, MutNullableDom};
-use crate::dom::bindings::str::DOMString;
+use crate::dom::bindings::str::{DOMString, USVString};
 use crate::dom::cssrulelist::{CSSRuleList, RulesSource};
 use crate::dom::element::Element;
 use crate::dom::medialist::MediaList;
@@ -31,52 +42,90 @@ pub(crate) struct CSSStyleSheet {
     #[no_trace]
     style_stylesheet: Arc<StyleStyleSheet>,
     origin_clean: Cell<bool>,
+    is_constructed: bool,
 }
 
 impl CSSStyleSheet {
     fn new_inherited(
-        owner: &Element,
+        owner: Option<&Element>,
         type_: DOMString,
         href: Option<DOMString>,
         title: Option<DOMString>,
         stylesheet: Arc<StyleStyleSheet>,
+        is_constructed: bool,
     ) -> CSSStyleSheet {
         CSSStyleSheet {
             stylesheet: StyleSheet::new_inherited(type_, href, title),
-            owner: MutNullableDom::new(Some(owner)),
+            owner: MutNullableDom::new(owner),
             rulelist: MutNullableDom::new(None),
             style_stylesheet: stylesheet,
             origin_clean: Cell::new(true),
+            is_constructed,
         }
     }
 
     #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    #[allow(clippy::too_many_arguments)]
     pub(crate) fn new(
         window: &Window,
-        owner: &Element,
+        owner: Option<&Element>,
         type_: DOMString,
         href: Option<DOMString>,
         title: Option<DOMString>,
         stylesheet: Arc<StyleStyleSheet>,
+        is_constructed: bool,
         can_gc: CanGc,
     ) -> DomRoot<CSSStyleSheet> {
         reflect_dom_object(
             Box::new(CSSStyleSheet::new_inherited(
-                owner, type_, href, title, stylesheet,
+                owner,
+                type_,
+                href,
+                title,
+                stylesheet,
+                is_constructed,
             )),
             window,
             can_gc,
         )
     }
 
-    fn rulelist(&self) -> DomRoot<CSSRuleList> {
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    #[allow(clippy::too_many_arguments)]
+    fn new_with_proto(
+        window: &Window,
+        proto: Option<HandleObject>,
+        owner: Option<&Element>,
+        type_: DOMString,
+        href: Option<DOMString>,
+        title: Option<DOMString>,
+        stylesheet: Arc<StyleStyleSheet>,
+        is_constructed: bool,
+        can_gc: CanGc,
+    ) -> DomRoot<CSSStyleSheet> {
+        reflect_dom_object_with_proto(
+            Box::new(CSSStyleSheet::new_inherited(
+                owner,
+                type_,
+                href,
+                title,
+                stylesheet,
+                is_constructed,
+            )),
+            window,
+            proto,
+            can_gc,
+        )
+    }
+
+    fn rulelist(&self, can_gc: CanGc) -> DomRoot<CSSRuleList> {
         self.rulelist.or_init(|| {
             let rules = self.style_stylesheet.contents.rules.clone();
             CSSRuleList::new(
                 self.global().as_window(),
                 self,
                 RulesSource::Rules(rules),
-                CanGc::note(),
+                can_gc,
             )
         })
     }
@@ -122,31 +171,151 @@ impl CSSStyleSheet {
             can_gc,
         )
     }
+
+    /// <https://drafts.csswg.org/cssom/#concept-css-style-sheet-constructed-flag>
+    #[inline]
+    pub(crate) fn is_constructed(&self) -> bool {
+        self.is_constructed
+    }
 }
 
 impl CSSStyleSheetMethods<crate::DomTypeHolder> for CSSStyleSheet {
-    // https://drafts.csswg.org/cssom/#dom-cssstylesheet-cssrules
-    fn GetCssRules(&self) -> Fallible<DomRoot<CSSRuleList>> {
-        if !self.origin_clean.get() {
-            return Err(Error::Security);
+    /// <https://drafts.csswg.org/cssom/#dom-cssstylesheet-cssstylesheet>
+    fn Constructor(
+        window: &Window,
+        proto: Option<HandleObject>,
+        can_gc: CanGc,
+        options: &CSSStyleSheetInit,
+    ) -> DomRoot<Self> {
+        let doc = window.Document();
+        let shared_lock = doc.style_shared_lock().clone();
+        let media = Arc::new(shared_lock.wrap(match &options.media {
+            Some(media) => match media {
+                MediaListOrString::MediaList(media_list) => media_list.clone_media_list(),
+                MediaListOrString::String(str) => MediaList::parse_media_list(str, window),
+            },
+            None => StyleMediaList::empty(),
+        }));
+        let stylesheet = Arc::new(StyleStyleSheet::from_str(
+            "",
+            UrlExtraData(window.get_url().get_arc()),
+            Origin::Author,
+            media,
+            shared_lock,
+            None,
+            window.css_error_reporter(),
+            doc.quirks_mode(),
+            AllowImportRules::No,
+        ));
+        if options.disabled {
+            stylesheet.set_disabled(true);
         }
-        Ok(self.rulelist())
+        Self::new_with_proto(
+            window,
+            proto,
+            None, // owner
+            "text/css".into(),
+            None, // href
+            None, // title
+            stylesheet,
+            true, // is_constructed
+            can_gc,
+        )
     }
 
-    // https://drafts.csswg.org/cssom/#dom-cssstylesheet-insertrule
-    fn InsertRule(&self, rule: DOMString, index: u32) -> Fallible<u32> {
+    /// <https://drafts.csswg.org/cssom/#dom-cssstylesheet-cssrules>
+    fn GetCssRules(&self, can_gc: CanGc) -> Fallible<DomRoot<CSSRuleList>> {
         if !self.origin_clean.get() {
             return Err(Error::Security);
         }
-        self.rulelist()
-            .insert_rule(&rule, index, CssRuleTypes::default(), None, CanGc::note())
+        Ok(self.rulelist(can_gc))
     }
 
-    // https://drafts.csswg.org/cssom/#dom-cssstylesheet-deleterule
-    fn DeleteRule(&self, index: u32) -> ErrorResult {
+    /// <https://drafts.csswg.org/cssom/#dom-cssstylesheet-insertrule>
+    fn InsertRule(&self, rule: DOMString, index: u32, can_gc: CanGc) -> Fallible<u32> {
         if !self.origin_clean.get() {
             return Err(Error::Security);
         }
-        self.rulelist().remove_rule(index)
+        self.rulelist(can_gc)
+            .insert_rule(&rule, index, CssRuleTypes::default(), None, can_gc)
+    }
+
+    /// <https://drafts.csswg.org/cssom/#dom-cssstylesheet-deleterule>
+    fn DeleteRule(&self, index: u32, can_gc: CanGc) -> ErrorResult {
+        if !self.origin_clean.get() {
+            return Err(Error::Security);
+        }
+        self.rulelist(can_gc).remove_rule(index)
+    }
+
+    /// <https://drafts.csswg.org/cssom/#dom-cssstylesheet-rules>
+    fn GetRules(&self, can_gc: CanGc) -> Fallible<DomRoot<CSSRuleList>> {
+        self.GetCssRules(can_gc)
+    }
+
+    /// <https://drafts.csswg.org/cssom/#dom-cssstylesheet-removerule>
+    fn RemoveRule(&self, index: u32, can_gc: CanGc) -> ErrorResult {
+        self.DeleteRule(index, can_gc)
+    }
+
+    /// <https://drafts.csswg.org/cssom/#dom-cssstylesheet-addrule>
+    fn AddRule(
+        &self,
+        selector: DOMString,
+        block: DOMString,
+        optional_index: Option<u32>,
+        can_gc: CanGc,
+    ) -> Fallible<i32> {
+        // > 1. Let *rule* be an empty string.
+        // > 2. Append *selector* to *rule*.
+        let mut rule = selector;
+
+        // > 3. Append " { " to *rule*.
+        // > 4. If *block* is not empty, append *block*, followed by a space, to *rule*.
+        // > 5. Append "}" to *rule*.
+        if block.is_empty() {
+            rule.push_str(" { }");
+        } else {
+            rule.push_str(" { ");
+            rule.push_str(block.str());
+            rule.push_str(" }");
+        };
+
+        // > 6. Let *index* be *optionalIndex* if provided, or the number of CSS rules in the stylesheet otherwise.
+        let index = optional_index.unwrap_or_else(|| self.rulelist(can_gc).Length());
+
+        // > 7. Call `insertRule()`, with *rule* and *index* as arguments.
+        self.InsertRule(rule, index, can_gc)?;
+
+        // > 8. Return -1.
+        Ok(-1)
+    }
+
+    /// <https://drafts.csswg.org/cssom/#synchronously-replace-the-rules-of-a-cssstylesheet>
+    fn ReplaceSync(&self, text: USVString) -> Result<(), Error> {
+        // Step 1. If the constructed flag is not set throw a NotAllowedError
+        if !self.is_constructed {
+            return Err(Error::NotAllowed);
+        }
+
+        // Step 2. Let rules be the result of running parse a stylesheet’s contents from text.
+        let global = self.global();
+        let window = global.as_window();
+
+        StyleStyleSheet::update_from_str(
+            &self.style_stylesheet,
+            &text,
+            UrlExtraData(window.get_url().get_arc()),
+            None,
+            window.css_error_reporter(),
+            AllowImportRules::No, // Step 3.If rules contains one or more @import rules, remove those rules from rules.
+        );
+
+        // Step 4. Set sheet’s CSS rules to rules.
+        // We reset our rule list, which will be initialized properly
+        // at the next getter access.
+        self.rulelist.set(None);
+
+        Ok(())
     }
 }
diff --git a/components/script/dom/customelementregistry.rs b/components/script/dom/customelementregistry.rs
index 8738ce883d2..be672585529 100644
--- a/components/script/dom/customelementregistry.rs
+++ b/components/script/dom/customelementregistry.rs
@@ -9,7 +9,7 @@ use std::rc::Rc;
 use std::{mem, ptr};
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Namespace, Prefix, namespace_url, ns};
+use html5ever::{LocalName, Namespace, Prefix, ns};
 use js::conversions::ToJSValConvertible;
 use js::glue::UnwrapObjectStatic;
 use js::jsapi::{HandleValueArray, Heap, IsCallable, IsConstructor, JSAutoRealm, JSObject};
@@ -878,7 +878,7 @@ pub(crate) fn upgrade_element(
             // We know this element is is form-associated, so we can use the implementation of
             // `FormControl` for HTMLElement, which makes that assumption.
             // Step 9.1: Reset the form owner of element
-            html_element.reset_form_owner();
+            html_element.reset_form_owner(can_gc);
             if let Some(form) = html_element.form_owner() {
                 // Even though the tree hasn't structurally mutated,
                 // HTMLCollections need to be invalidated.
diff --git a/components/script/dom/customevent.rs b/components/script/dom/customevent.rs
index e1d4e4e6e46..c461fae126e 100644
--- a/components/script/dom/customevent.rs
+++ b/components/script/dom/customevent.rs
@@ -93,7 +93,7 @@ impl CustomEventMethods<crate::DomTypeHolder> for CustomEvent {
         type_: DOMString,
         init: RootedTraceableBox<CustomEventBinding::CustomEventInit>,
     ) -> DomRoot<CustomEvent> {
-        CustomEvent::new(
+        let event = CustomEvent::new(
             global,
             proto,
             Atom::from(type_),
@@ -101,7 +101,9 @@ impl CustomEventMethods<crate::DomTypeHolder> for CustomEvent {
             init.parent.cancelable,
             init.detail.handle(),
             can_gc,
-        )
+        );
+        event.upcast::<Event>().set_composed(init.parent.composed);
+        event
     }
 
     // https://dom.spec.whatwg.org/#dom-customevent-detail
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs
index cc426494171..972a9d90948 100644
--- a/components/script/dom/dedicatedworkerglobalscope.rs
+++ b/components/script/dom/dedicatedworkerglobalscope.rs
@@ -7,6 +7,7 @@ use std::sync::atomic::AtomicBool;
 use std::thread::{self, JoinHandle};
 
 use base::id::{BrowsingContextId, PipelineId, WebViewId};
+use constellation_traits::{WorkerGlobalScopeInit, WorkerScriptLoadOrigin};
 use crossbeam_channel::{Receiver, Sender, unbounded};
 use devtools_traits::DevtoolScriptControlMsg;
 use dom_struct::dom_struct;
@@ -17,11 +18,11 @@ use js::jsval::UndefinedValue;
 use js::rust::{CustomAutoRooter, CustomAutoRooterGuard, HandleValue};
 use net_traits::IpcSend;
 use net_traits::image_cache::ImageCache;
+use net_traits::policy_container::PolicyContainer;
 use net_traits::request::{
     CredentialsMode, Destination, InsecureRequestsPolicy, ParserMetadata, Referrer, RequestBuilder,
     RequestMode,
 };
-use script_traits::{WorkerGlobalScopeInit, WorkerScriptLoadOrigin};
 use servo_rand::random;
 use servo_url::{ImmutableOrigin, ServoUrl};
 use style::thread_state::{self, ThreadState};
@@ -41,6 +42,7 @@ use crate::dom::bindings::root::{DomRoot, RootCollection, ThreadLocalStackRoots}
 use crate::dom::bindings::str::DOMString;
 use crate::dom::bindings::structuredclone;
 use crate::dom::bindings::trace::{CustomTraceable, RootedTraceableBox};
+use crate::dom::bindings::utils::define_all_exposed_interfaces;
 use crate::dom::errorevent::ErrorEvent;
 use crate::dom::event::{Event, EventBubbles, EventCancelable, EventStatus};
 use crate::dom::eventtarget::EventTarget;
@@ -347,6 +349,7 @@ impl DedicatedWorkerGlobalScope {
         control_receiver: Receiver<DedicatedWorkerControlMsg>,
         context_sender: Sender<ThreadSafeJSContext>,
         insecure_requests_policy: InsecureRequestsPolicy,
+        policy_container: PolicyContainer,
     ) -> JoinHandle<()> {
         let serialized_worker_url = worker_url.to_string();
         let webview_id = WebViewId::installed();
@@ -355,6 +358,8 @@ impl DedicatedWorkerGlobalScope {
         let referrer = current_global.get_referrer();
         let parent = current_global.runtime_handle();
         let current_global_https_state = current_global.get_https_state();
+        let current_global_ancestor_trustworthy = current_global.has_trustworthy_ancestor_origin();
+        let is_secure_context = current_global.is_secure_context();
 
         thread::Builder::new()
             .name(format!("WW:{}", worker_url.debug_compact()))
@@ -384,8 +389,9 @@ impl DedicatedWorkerGlobalScope {
                     .use_url_credentials(true)
                     .pipeline_id(Some(pipeline_id))
                     .referrer_policy(referrer_policy)
-                    .referrer_policy(referrer_policy)
                     .insecure_requests_policy(insecure_requests_policy)
+                    .has_trustworthy_ancestor_origin(current_global_ancestor_trustworthy)
+                    .policy_container(policy_container)
                     .origin(origin);
 
                 let runtime = unsafe {
@@ -418,7 +424,12 @@ impl DedicatedWorkerGlobalScope {
                 // > scope`'s url's scheme is "data", and `inherited origin`
                 // > otherwise.
                 if worker_url.scheme() == "data" {
-                    init.origin = ImmutableOrigin::new_opaque();
+                    // Workers created from a data: url are secure if they were created from secure contexts
+                    if is_secure_context {
+                        init.origin = ImmutableOrigin::new_opaque_data_url_worker();
+                    } else {
+                        init.origin = ImmutableOrigin::new_opaque();
+                    }
                 }
 
                 let global = DedicatedWorkerGlobalScope::new(
@@ -468,6 +479,7 @@ impl DedicatedWorkerGlobalScope {
                     Ok((metadata, bytes)) => (metadata, bytes),
                 };
                 scope.set_url(metadata.final_url);
+                scope.set_csp_list(GlobalScope::parse_csp_list_from_metadata(&metadata.headers));
                 global_scope.set_https_state(metadata.https_state);
                 let source = String::from_utf8_lossy(&bytes);
 
@@ -483,7 +495,12 @@ impl DedicatedWorkerGlobalScope {
 
                 {
                     let _ar = AutoWorkerReset::new(&global, worker.clone());
-                    let _ac = enter_realm(scope);
+                    let realm = enter_realm(scope);
+                    define_all_exposed_interfaces(
+                        global.upcast(),
+                        InRealm::entered(&realm),
+                        CanGc::note(),
+                    );
                     scope.execute_script(DOMString::from(source), CanGc::note());
                 }
 
diff --git a/components/script/dom/defaultteereadrequest.rs b/components/script/dom/defaultteereadrequest.rs
index debc084e068..94e285da72b 100644
--- a/components/script/dom/defaultteereadrequest.rs
+++ b/components/script/dom/defaultteereadrequest.rs
@@ -21,7 +21,7 @@ use crate::dom::globalscope::GlobalScope;
 use crate::dom::promise::Promise;
 use crate::dom::readablestream::ReadableStream;
 use crate::microtask::Microtask;
-use crate::script_runtime::CanGc;
+use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
 
 #[derive(JSTraceable, MallocSizeOf)]
 #[cfg_attr(crown, allow(crown::unrooted_must_root))]
@@ -32,8 +32,8 @@ pub(crate) struct DefaultTeeReadRequestMicrotask {
 }
 
 impl DefaultTeeReadRequestMicrotask {
-    pub(crate) fn microtask_chunk_steps(&self, can_gc: CanGc) {
-        self.tee_read_request.chunk_steps(&self.chunk, can_gc)
+    pub(crate) fn microtask_chunk_steps(&self, cx: SafeJSContext, can_gc: CanGc) {
+        self.tee_read_request.chunk_steps(cx, &self.chunk, can_gc)
     }
 }
 
@@ -94,8 +94,14 @@ impl DefaultTeeReadRequest {
     }
     /// Call into cancel of the stream,
     /// <https://streams.spec.whatwg.org/#readable-stream-cancel>
-    pub(crate) fn stream_cancel(&self, reason: SafeHandleValue, can_gc: CanGc) {
-        self.stream.cancel(reason, can_gc);
+    pub(crate) fn stream_cancel(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        reason: SafeHandleValue,
+        can_gc: CanGc,
+    ) {
+        self.stream.cancel(cx, global, reason, can_gc);
     }
     /// Enqueue a microtask to perform the chunk steps
     /// <https://streams.spec.whatwg.org/#ref-for-read-request-chunk-steps%E2%91%A2>
@@ -115,13 +121,13 @@ impl DefaultTeeReadRequest {
     }
     /// <https://streams.spec.whatwg.org/#ref-for-read-request-chunk-steps%E2%91%A2>
     #[allow(clippy::borrowed_box)]
-    pub(crate) fn chunk_steps(&self, chunk: &Box<Heap<JSVal>>, can_gc: CanGc) {
+    pub(crate) fn chunk_steps(&self, cx: SafeJSContext, chunk: &Box<Heap<JSVal>>, can_gc: CanGc) {
+        let global = &self.stream.global();
         // Set readAgain to false.
         self.read_again.set(false);
         // Let chunk1 and chunk2 be chunk.
         let chunk1 = chunk;
         let chunk2 = chunk;
-        let cx = GlobalScope::get_cx();
 
         rooted!(in(*cx) let chunk1_value = chunk1.get());
         rooted!(in(*cx) let chunk2_value = chunk2.get());
@@ -131,9 +137,7 @@ impl DefaultTeeReadRequest {
             rooted!(in(*cx) let mut clone_result = UndefinedValue());
             let data = structuredclone::write(cx, chunk2_value.handle(), None).unwrap();
             // If cloneResult is an abrupt completion,
-            if structuredclone::read(&self.stream.global(), data, clone_result.handle_mut())
-                .is_err()
-            {
+            if structuredclone::read(global, data, clone_result.handle_mut()).is_err() {
                 // Perform ! ReadableStreamDefaultControllerError(branch_1.[[controller]], cloneResult.[[Value]]).
                 self.readable_stream_default_controller_error(
                     &self.branch_1,
@@ -148,7 +152,7 @@ impl DefaultTeeReadRequest {
                     can_gc,
                 );
                 // Resolve cancelPromise with ! ReadableStreamCancel(stream, cloneResult.[[Value]]).
-                self.stream_cancel(clone_result.handle(), can_gc);
+                self.stream_cancel(cx, global, clone_result.handle(), can_gc);
                 // Return.
                 return;
             } else {
diff --git a/components/script/dom/defaultteeunderlyingsource.rs b/components/script/dom/defaultteeunderlyingsource.rs
index 5895297d982..7935c388842 100644
--- a/components/script/dom/defaultteeunderlyingsource.rs
+++ b/components/script/dom/defaultteeunderlyingsource.rs
@@ -19,7 +19,7 @@ use crate::dom::defaultteereadrequest::DefaultTeeReadRequest;
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::promise::Promise;
 use crate::dom::readablestreamdefaultreader::ReadRequest;
-use crate::script_runtime::CanGc;
+use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
 
 #[derive(JSTraceable, MallocSizeOf)]
 pub(crate) enum TeeCancelAlgorithm {
@@ -156,6 +156,8 @@ impl DefaultTeeUnderlyingSource {
     #[allow(unsafe_code)]
     pub(crate) fn cancel_algorithm(
         &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
         reason: SafeHandleValue,
         can_gc: CanGc,
     ) -> Option<Result<Rc<Promise>, Error>> {
@@ -169,7 +171,7 @@ impl DefaultTeeUnderlyingSource {
 
                 // If canceled_2 is true,
                 if self.canceled_2.get() {
-                    self.resolve_cancel_promise(can_gc);
+                    self.resolve_cancel_promise(cx, global, can_gc);
                 }
                 // Return cancelPromise.
                 Some(Ok(self.cancel_promise.clone()))
@@ -183,7 +185,7 @@ impl DefaultTeeUnderlyingSource {
 
                 // If canceled_1 is true,
                 if self.canceled_1.get() {
-                    self.resolve_cancel_promise(can_gc);
+                    self.resolve_cancel_promise(cx, global, can_gc);
                 }
                 // Return cancelPromise.
                 Some(Ok(self.cancel_promise.clone()))
@@ -192,9 +194,8 @@ impl DefaultTeeUnderlyingSource {
     }
 
     #[allow(unsafe_code)]
-    fn resolve_cancel_promise(&self, can_gc: CanGc) {
+    fn resolve_cancel_promise(&self, cx: SafeJSContext, global: &GlobalScope, can_gc: CanGc) {
         // Let compositeReason be ! CreateArrayFromList(« reason_1, reason_2 »).
-        let cx = GlobalScope::get_cx();
         rooted_vec!(let mut reasons_values);
         reasons_values.push(self.reason_1.get());
         reasons_values.push(self.reason_2.get());
@@ -204,7 +205,9 @@ impl DefaultTeeUnderlyingSource {
         rooted!(in(*cx) let reasons_value = ObjectValue(reasons.get()));
 
         // Let cancelResult be ! ReadableStreamCancel(stream, compositeReason).
-        let cancel_result = self.stream.cancel(reasons_value.handle(), can_gc);
+        let cancel_result = self
+            .stream
+            .cancel(cx, global, reasons_value.handle(), can_gc);
 
         // Resolve cancelPromise with cancelResult.
         self.cancel_promise.resolve_native(&cancel_result, can_gc);
diff --git a/components/script/dom/dissimilaroriginwindow.rs b/components/script/dom/dissimilaroriginwindow.rs
index 98d1631c728..70c384db822 100644
--- a/components/script/dom/dissimilaroriginwindow.rs
+++ b/components/script/dom/dissimilaroriginwindow.rs
@@ -3,11 +3,11 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use base::id::PipelineId;
+use constellation_traits::{ScriptToConstellationMessage, StructuredSerializedData};
 use dom_struct::dom_struct;
 use js::jsapi::{Heap, JSObject};
 use js::jsval::UndefinedValue;
 use js::rust::{CustomAutoRooter, CustomAutoRooterGuard, HandleValue, MutableHandleValue};
-use script_traits::{ScriptMsg, StructuredSerializedData};
 use servo_url::ServoUrl;
 
 use crate::dom::bindings::codegen::Bindings::DissimilarOriginWindowBinding;
@@ -64,7 +64,6 @@ impl DissimilarOriginWindow {
                 // FIXME(nox): The microtask queue is probably not important
                 // here, but this whole DOM interface is a hack anyway.
                 global_to_clone_from.microtask_queue().clone(),
-                global_to_clone_from.get_user_agent(),
                 #[cfg(feature = "webgpu")]
                 global_to_clone_from.wgpu_id_hub(),
                 Some(global_to_clone_from.is_secure_context()),
@@ -182,18 +181,19 @@ impl DissimilarOriginWindowMethods<crate::DomTypeHolder> for DissimilarOriginWin
 
     // https://html.spec.whatwg.org/multipage/#dom-window-blur
     fn Blur(&self) {
-        // TODO: Implement x-origin blur
+        // > User agents are encouraged to ignore calls to this `blur()` method
+        // > entirely.
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-focus
+    // https://html.spec.whatwg.org/multipage/#dom-window-focus
     fn Focus(&self) {
-        // TODO: Implement x-origin focus
+        self.window_proxy().focus();
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-location
-    fn Location(&self) -> DomRoot<DissimilarOriginLocation> {
+    fn Location(&self, can_gc: CanGc) -> DomRoot<DissimilarOriginLocation> {
         self.location
-            .or_init(|| DissimilarOriginLocation::new(self, CanGc::note()))
+            .or_init(|| DissimilarOriginLocation::new(self, can_gc))
     }
 }
 
@@ -237,7 +237,7 @@ impl DissimilarOriginWindow {
                 Err(_) => return Err(Error::Syntax),
             },
         };
-        let msg = ScriptMsg::PostMessage {
+        let msg = ScriptToConstellationMessage::PostMessage {
             target,
             source: incumbent.pipeline_id(),
             source_origin,
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 44ffded1100..d9969664c7f 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -12,6 +12,7 @@ use std::f64::consts::PI;
 use std::mem;
 use std::rc::Rc;
 use std::slice::from_ref;
+use std::str::FromStr;
 use std::sync::{LazyLock, Mutex};
 use std::time::{Duration, Instant};
 
@@ -20,26 +21,26 @@ use base::id::WebViewId;
 use canvas_traits::canvas::CanvasId;
 use canvas_traits::webgl::{self, WebGLContextId, WebGLMsg};
 use chrono::Local;
-use constellation_traits::{AnimationTickType, CompositorHitTestResult};
+use constellation_traits::{NavigationHistoryBehavior, ScriptToConstellationMessage};
 use content_security_policy::{self as csp, CspList, PolicyDisposition};
 use cookie::Cookie;
 use cssparser::match_ignore_ascii_case;
+use data_url::mime::Mime;
 use devtools_traits::ScriptToDevtoolsControlMsg;
 use dom_struct::dom_struct;
 use embedder_traits::{
-    AllowOrDeny, ContextMenuResult, EditingActionEvent, EmbedderMsg, ImeEvent, InputEvent,
-    LoadStatus, MouseButton, MouseButtonAction, MouseButtonEvent, TouchEvent, TouchEventType,
-    TouchId, WheelEvent,
+    AllowOrDeny, AnimationState, CompositorHitTestResult, ContextMenuResult, EditingActionEvent,
+    EmbedderMsg, FocusSequenceNumber, ImeEvent, InputEvent, LoadStatus, MouseButton,
+    MouseButtonAction, MouseButtonEvent, TouchEvent, TouchEventType, TouchId, WheelEvent,
 };
 use encoding_rs::{Encoding, UTF_8};
 use euclid::default::{Point2D, Rect, Size2D};
-use html5ever::{LocalName, Namespace, QualName, local_name, namespace_url, ns};
+use html5ever::{LocalName, Namespace, QualName, local_name, ns};
 use hyper_serde::Serde;
 use ipc_channel::ipc;
 use js::rust::{HandleObject, HandleValue};
 use keyboard_types::{Code, Key, KeyState, Modifiers};
 use metrics::{InteractiveFlag, InteractiveWindow, ProgressiveWebMetrics};
-use mime::{self, Mime};
 use net_traits::CookieSource::NonHTTP;
 use net_traits::CoreResourceMsg::{GetCookiesForUrl, SetCookiesForUrl};
 use net_traits::policy_container::PolicyContainer;
@@ -51,10 +52,10 @@ use num_traits::ToPrimitive;
 use percent_encoding::percent_decode;
 use profile_traits::ipc as profile_ipc;
 use profile_traits::time::TimerMetadataFrameType;
+use regex::bytes::Regex;
+use script_bindings::interfaces::DocumentHelpers;
 use script_layout_interface::{PendingRestyle, TrustedNodeAddress};
-use script_traits::{
-    AnimationState, ConstellationInputEvent, DocumentActivity, ProgressiveWebMetricType, ScriptMsg,
-};
+use script_traits::{ConstellationInputEvent, DocumentActivity, ProgressiveWebMetricType};
 use servo_arc::Arc;
 use servo_config::pref;
 use servo_media::{ClientContextId, ServoMedia};
@@ -71,14 +72,9 @@ use stylo_atoms::Atom;
 use url::Host;
 use uuid::Uuid;
 #[cfg(feature = "webgpu")]
-use webgpu::swapchain::WebGPUContextId;
+use webgpu_traits::WebGPUContextId;
 use webrender_api::units::DeviceIntRect;
 
-use super::bindings::codegen::Bindings::XPathEvaluatorBinding::XPathEvaluatorMethods;
-use super::canvasrenderingcontext2d::CanvasRenderingContext2D;
-use super::clipboardevent::ClipboardEventType;
-use super::performancepainttiming::PerformancePaintTiming;
-use crate::DomTypes;
 use crate::animation_timeline::AnimationTimeline;
 use crate::animations::Animations;
 use crate::canvas_context::CanvasContext as _;
@@ -105,8 +101,11 @@ use crate::dom::bindings::codegen::Bindings::TouchBinding::TouchMethods;
 use crate::dom::bindings::codegen::Bindings::WindowBinding::{
     FrameRequestCallback, ScrollBehavior, WindowMethods,
 };
+use crate::dom::bindings::codegen::Bindings::XPathEvaluatorBinding::XPathEvaluatorMethods;
 use crate::dom::bindings::codegen::Bindings::XPathNSResolverBinding::XPathNSResolver;
-use crate::dom::bindings::codegen::UnionTypes::{NodeOrString, StringOrElementCreationOptions};
+use crate::dom::bindings::codegen::UnionTypes::{
+    NodeOrString, StringOrElementCreationOptions, TrustedHTMLOrString,
+};
 use crate::dom::bindings::error::{Error, ErrorInfo, ErrorResult, Fallible};
 use crate::dom::bindings::inheritance::{Castable, ElementTypeId, HTMLElementTypeId, NodeTypeId};
 use crate::dom::bindings::num::Finite;
@@ -120,8 +119,9 @@ use crate::dom::bindings::weakref::WeakRef;
 use crate::dom::bindings::xmlname::{
     matches_name_production, namespace_from_domstring, validate_and_extract,
 };
+use crate::dom::canvasrenderingcontext2d::CanvasRenderingContext2D;
 use crate::dom::cdatasection::CDATASection;
-use crate::dom::clipboardevent::ClipboardEvent;
+use crate::dom::clipboardevent::{ClipboardEvent, ClipboardEventType};
 use crate::dom::comment::Comment;
 use crate::dom::compositionevent::CompositionEvent;
 use crate::dom::cssstylesheet::CSSStyleSheet;
@@ -155,13 +155,12 @@ use crate::dom::htmlhtmlelement::HTMLHtmlElement;
 use crate::dom::htmliframeelement::HTMLIFrameElement;
 use crate::dom::htmlimageelement::HTMLImageElement;
 use crate::dom::htmlinputelement::HTMLInputElement;
-use crate::dom::htmlmetaelement::RefreshRedirectDue;
 use crate::dom::htmlscriptelement::{HTMLScriptElement, ScriptResult};
 use crate::dom::htmltextareaelement::HTMLTextAreaElement;
 use crate::dom::htmltitleelement::HTMLTitleElement;
 use crate::dom::intersectionobserver::IntersectionObserver;
 use crate::dom::keyboardevent::KeyboardEvent;
-use crate::dom::location::Location;
+use crate::dom::location::{Location, NavigationType};
 use crate::dom::messageevent::MessageEvent;
 use crate::dom::mouseevent::MouseEvent;
 use crate::dom::node::{
@@ -171,7 +170,8 @@ use crate::dom::nodeiterator::NodeIterator;
 use crate::dom::nodelist::NodeList;
 use crate::dom::pagetransitionevent::PageTransitionEvent;
 use crate::dom::performanceentry::PerformanceEntry;
-use crate::dom::pointerevent::PointerEvent;
+use crate::dom::performancepainttiming::PerformancePaintTiming;
+use crate::dom::pointerevent::{PointerEvent, PointerId};
 use crate::dom::processinginstruction::ProcessingInstruction;
 use crate::dom::promise::Promise;
 use crate::dom::range::Range;
@@ -186,6 +186,7 @@ use crate::dom::touch::Touch;
 use crate::dom::touchevent::TouchEvent as DomTouchEvent;
 use crate::dom::touchlist::TouchList;
 use crate::dom::treewalker::TreeWalker;
+use crate::dom::trustedhtml::TrustedHTML;
 use crate::dom::types::VisibilityStateEntry;
 use crate::dom::uievent::UIEvent;
 use crate::dom::virtualmethods::vtable_for;
@@ -199,7 +200,9 @@ use crate::dom::xpathevaluator::XPathEvaluator;
 use crate::drag_data_store::{DragDataStore, Kind, Mode};
 use crate::fetch::FetchCanceller;
 use crate::iframe_collection::IFrameCollection;
+use crate::image_animation::ImageAnimationManager;
 use crate::messaging::{CommonScriptMsg, MainThreadScriptMsg};
+use crate::mime::{APPLICATION, CHARSET, MimeExt};
 use crate::network_listener::{NetworkListener, PreInvoke};
 use crate::realms::{AlreadyInRealm, InRealm, enter_realm};
 use crate::script_runtime::{CanGc, ScriptThreadEventCategory};
@@ -244,6 +247,24 @@ impl FireMouseEventType {
     }
 }
 
+#[derive(JSTraceable, MallocSizeOf)]
+pub(crate) struct RefreshRedirectDue {
+    #[no_trace]
+    pub(crate) url: ServoUrl,
+    #[ignore_malloc_size_of = "non-owning"]
+    pub(crate) window: DomRoot<Window>,
+}
+impl RefreshRedirectDue {
+    pub(crate) fn invoke(self, can_gc: CanGc) {
+        self.window.Location().navigate(
+            self.url.clone(),
+            NavigationHistoryBehavior::Replace,
+            NavigationType::DeclarativeRefresh,
+            can_gc,
+        );
+    }
+}
+
 #[derive(Clone, Copy, Debug, JSTraceable, MallocSizeOf, PartialEq)]
 pub(crate) enum IsHTMLDocument {
     HTMLDocument,
@@ -252,12 +273,11 @@ pub(crate) enum IsHTMLDocument {
 
 #[derive(JSTraceable, MallocSizeOf)]
 #[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
-enum FocusTransaction {
-    /// No focus operation is in effect.
-    NotInTransaction,
-    /// A focus operation is in effect.
-    /// Contains the element that has most recently requested focus for itself.
-    InTransaction(Option<Dom<Element>>),
+struct FocusTransaction {
+    /// The focused element of this document.
+    element: Option<Dom<Element>>,
+    /// See [`Document::has_focus`].
+    has_focus: bool,
 }
 
 /// Information about a declarative refresh
@@ -323,9 +343,16 @@ pub(crate) struct Document {
     /// Whether the DOMContentLoaded event has already been dispatched.
     domcontentloaded_dispatched: Cell<bool>,
     /// The state of this document's focus transaction.
-    focus_transaction: DomRefCell<FocusTransaction>,
+    focus_transaction: DomRefCell<Option<FocusTransaction>>,
     /// The element that currently has the document focus context.
     focused: MutNullableDom<Element>,
+    /// The last sequence number sent to the constellation.
+    #[no_trace]
+    focus_sequence: Cell<FocusSequenceNumber>,
+    /// Indicates whether the container is included in the top-level browsing
+    /// context's focus chain (not considering system focus). Permanently `true`
+    /// for a top-level document.
+    has_focus: Cell<bool>,
     /// The script element that is currently executing.
     current_script: MutNullableDom<HTMLScriptElement>,
     /// <https://html.spec.whatwg.org/multipage/#pending-parsing-blocking-script>
@@ -484,6 +511,8 @@ pub(crate) struct Document {
     animation_timeline: DomRefCell<AnimationTimeline>,
     /// Animations for this Document
     animations: DomRefCell<Animations>,
+    /// Image Animation Manager for this Document
+    image_animation_manager: DomRefCell<ImageAnimationManager>,
     /// The nearest inclusive ancestors to all the nodes that require a restyle.
     dirty_root: MutNullableDom<Element>,
     /// <https://html.spec.whatwg.org/multipage/#will-declaratively-refresh>
@@ -494,10 +523,6 @@ pub(crate) struct Document {
     pending_input_events: DomRefCell<Vec<ConstellationInputEvent>>,
     /// The index of the last mouse move event in the pending compositor events queue.
     mouse_move_event_index: DomRefCell<Option<usize>>,
-    /// Pending animation ticks, to be handled at the next rendering opportunity.
-    #[no_trace]
-    #[ignore_malloc_size_of = "AnimationTickType contains data from an outside crate"]
-    pending_animation_ticks: DomRefCell<AnimationTickType>,
     /// <https://drafts.csswg.org/resize-observer/#dom-document-resizeobservers-slot>
     ///
     /// Note: we are storing, but never removing, resize observers.
@@ -521,6 +546,8 @@ pub(crate) struct Document {
     /// <https://w3c.github.io/webappsec-upgrade-insecure-requests/#insecure-requests-policy>
     #[no_trace]
     inherited_insecure_requests_policy: Cell<Option<InsecureRequestsPolicy>>,
+    //// <https://w3c.github.io/webappsec-mixed-content/#categorize-settings-object>
+    has_trustworthy_ancestor_origin: Cell<bool>,
     /// <https://w3c.github.io/IntersectionObserver/#document-intersectionobservertaskqueued>
     intersection_observer_task_queued: Cell<bool>,
     /// Active intersection observers that should be processed by this document in
@@ -538,6 +565,8 @@ pub(crate) struct Document {
     /// The active keyboard modifiers for the WebView. This is updated when receiving any input event.
     #[no_trace]
     active_keyboard_modifiers: Cell<Modifiers>,
+    /// The node that is currently highlighted by the devtools
+    highlighted_dom_node: MutNullableDom<Node>,
 }
 
 #[allow(non_snake_case)]
@@ -694,9 +723,7 @@ impl Document {
     }
 
     pub(crate) fn is_xhtml_document(&self) -> bool {
-        self.content_type.type_() == mime::APPLICATION &&
-            self.content_type.subtype().as_str() == "xhtml" &&
-            self.content_type.suffix() == Some(mime::XML)
+        self.content_type.matches(APPLICATION, "xhtml+xml")
     }
 
     pub(crate) fn set_https_state(&self, https_state: HttpsState) {
@@ -917,14 +944,14 @@ impl Document {
     }
 
     /// Remove any existing association between the provided id and any elements in this document.
-    pub(crate) fn unregister_element_id(&self, to_unregister: &Element, id: Atom) {
+    pub(crate) fn unregister_element_id(&self, to_unregister: &Element, id: Atom, can_gc: CanGc) {
         self.document_or_shadow_root
             .unregister_named_element(&self.id_map, to_unregister, &id);
-        self.reset_form_owner_for_listeners(&id);
+        self.reset_form_owner_for_listeners(&id, can_gc);
     }
 
     /// Associate an element present in this document with the provided id.
-    pub(crate) fn register_element_id(&self, element: &Element, id: Atom) {
+    pub(crate) fn register_element_id(&self, element: &Element, id: Atom, can_gc: CanGc) {
         let root = self.GetDocumentElement().expect(
             "The element is in the document, so there must be a document \
              element.",
@@ -935,7 +962,7 @@ impl Document {
             &id,
             DomRoot::from_ref(root.upcast::<Node>()),
         );
-        self.reset_form_owner_for_listeners(&id);
+        self.reset_form_owner_for_listeners(&id, can_gc);
     }
 
     /// Remove any existing association between the provided name and any elements in this document.
@@ -1102,127 +1129,330 @@ impl Document {
         self.scripting_enabled
     }
 
+    /// Return whether scripting is enabled or not
+    /// <https://html.spec.whatwg.org/multipage/#concept-n-noscript>
+    pub(crate) fn scripting_enabled(&self) -> bool {
+        self.has_browsing_context()
+    }
+
     /// Return the element that currently has focus.
     // https://w3c.github.io/uievents/#events-focusevent-doc-focus
     pub(crate) fn get_focused_element(&self) -> Option<DomRoot<Element>> {
         self.focused.get()
     }
 
+    /// Get the last sequence number sent to the constellation.
+    ///
+    /// Received focus-related messages with sequence numbers less than the one
+    /// returned by this method must be discarded.
+    pub fn get_focus_sequence(&self) -> FocusSequenceNumber {
+        self.focus_sequence.get()
+    }
+
+    /// Generate the next sequence number for focus-related messages.
+    fn increment_fetch_focus_sequence(&self) -> FocusSequenceNumber {
+        self.focus_sequence.set(FocusSequenceNumber(
+            self.focus_sequence
+                .get()
+                .0
+                .checked_add(1)
+                .expect("too many focus messages have been sent"),
+        ));
+        self.focus_sequence.get()
+    }
+
     /// Initiate a new round of checking for elements requesting focus. The last element to call
     /// `request_focus` before `commit_focus_transaction` is called will receive focus.
     fn begin_focus_transaction(&self) {
-        *self.focus_transaction.borrow_mut() = FocusTransaction::InTransaction(Default::default());
+        // Initialize it with the current state
+        *self.focus_transaction.borrow_mut() = Some(FocusTransaction {
+            element: self.focused.get().as_deref().map(Dom::from_ref),
+            has_focus: self.has_focus.get(),
+        });
     }
 
     /// <https://html.spec.whatwg.org/multipage/#focus-fixup-rule>
     pub(crate) fn perform_focus_fixup_rule(&self, not_focusable: &Element, can_gc: CanGc) {
+        // Return if `not_focusable` is not the designated focused area of the
+        // `Document`.
         if Some(not_focusable) != self.focused.get().as_deref() {
             return;
         }
-        self.request_focus(
-            self.GetBody().as_ref().map(|e| e.upcast()),
-            FocusType::Element,
-            can_gc,
-        )
-    }
 
-    /// Request that the given element receive focus once the current transaction is complete.
-    /// If None is passed, then whatever element is currently focused will no longer be focused
-    /// once the transaction is complete.
-    pub(crate) fn request_focus(
-        &self,
-        elem: Option<&Element>,
-        focus_type: FocusType,
-        can_gc: CanGc,
-    ) {
-        let implicit_transaction = matches!(
-            *self.focus_transaction.borrow(),
-            FocusTransaction::NotInTransaction
-        );
+        let implicit_transaction = self.focus_transaction.borrow().is_none();
+
         if implicit_transaction {
             self.begin_focus_transaction();
         }
-        if elem.is_none_or(|e| e.is_focusable_area()) {
-            *self.focus_transaction.borrow_mut() =
-                FocusTransaction::InTransaction(elem.map(Dom::from_ref));
+
+        // Designate the viewport as the new focused area of the `Document`, but
+        // do not run the focusing steps.
+        {
+            let mut focus_transaction = self.focus_transaction.borrow_mut();
+            focus_transaction.as_mut().unwrap().element = None;
         }
+
         if implicit_transaction {
-            self.commit_focus_transaction(focus_type, can_gc);
+            self.commit_focus_transaction(FocusInitiator::Local, can_gc);
         }
     }
 
-    /// Reassign the focus context to the element that last requested focus during this
-    /// transaction, or none if no elements requested it.
-    fn commit_focus_transaction(&self, focus_type: FocusType, can_gc: CanGc) {
-        let possibly_focused = match *self.focus_transaction.borrow() {
-            FocusTransaction::NotInTransaction => unreachable!(),
-            FocusTransaction::InTransaction(ref elem) => {
-                elem.as_ref().map(|e| DomRoot::from_ref(&**e))
-            },
-        };
-        *self.focus_transaction.borrow_mut() = FocusTransaction::NotInTransaction;
-        if self.focused == possibly_focused.as_deref() {
+    /// Request that the given element receive focus once the current
+    /// transaction is complete. `None` specifies to focus the document.
+    ///
+    /// If there's no ongoing transaction, this method automatically starts and
+    /// commits an implicit transaction.
+    pub(crate) fn request_focus(
+        &self,
+        elem: Option<&Element>,
+        focus_initiator: FocusInitiator,
+        can_gc: CanGc,
+    ) {
+        // If an element is specified, and it's non-focusable, ignore the
+        // request.
+        if elem.is_some_and(|e| !e.is_focusable_area()) {
             return;
         }
-        if let Some(ref elem) = self.focused.get() {
-            let node = elem.upcast::<Node>();
-            elem.set_focus_state(false);
-            // FIXME: pass appropriate relatedTarget
-            self.fire_focus_event(FocusEventType::Blur, node, None, can_gc);
 
-            // Notify the embedder to hide the input method.
-            if elem.input_method_type().is_some() {
-                self.send_to_embedder(EmbedderMsg::HideIME(self.webview_id()));
+        let implicit_transaction = self.focus_transaction.borrow().is_none();
+
+        if implicit_transaction {
+            self.begin_focus_transaction();
+        }
+
+        {
+            let mut focus_transaction = self.focus_transaction.borrow_mut();
+            let focus_transaction = focus_transaction.as_mut().unwrap();
+            focus_transaction.element = elem.map(Dom::from_ref);
+            focus_transaction.has_focus = true;
+        }
+
+        if implicit_transaction {
+            self.commit_focus_transaction(focus_initiator, can_gc);
+        }
+    }
+
+    /// Update the local focus state accordingly after being notified that the
+    /// document's container is removed from the top-level browsing context's
+    /// focus chain (not considering system focus).
+    pub(crate) fn handle_container_unfocus(&self, can_gc: CanGc) {
+        assert!(
+            self.window().parent_info().is_some(),
+            "top-level document cannot be unfocused",
+        );
+
+        // Since this method is called from an event loop, there mustn't be
+        // an in-progress focus transaction
+        assert!(
+            self.focus_transaction.borrow().is_none(),
+            "there mustn't be an in-progress focus transaction at this point"
+        );
+
+        // Start an implicit focus transaction
+        self.begin_focus_transaction();
+
+        // Update the transaction
+        {
+            let mut focus_transaction = self.focus_transaction.borrow_mut();
+            focus_transaction.as_mut().unwrap().has_focus = false;
+        }
+
+        // Commit the implicit focus transaction
+        self.commit_focus_transaction(FocusInitiator::Remote, can_gc);
+    }
+
+    /// Reassign the focus context to the element that last requested focus during this
+    /// transaction, or the document if no elements requested it.
+    fn commit_focus_transaction(&self, focus_initiator: FocusInitiator, can_gc: CanGc) {
+        let (mut new_focused, new_focus_state) = {
+            let focus_transaction = self.focus_transaction.borrow();
+            let focus_transaction = focus_transaction
+                .as_ref()
+                .expect("no focus transaction in progress");
+            (
+                focus_transaction
+                    .element
+                    .as_ref()
+                    .map(|e| DomRoot::from_ref(&**e)),
+                focus_transaction.has_focus,
+            )
+        };
+        *self.focus_transaction.borrow_mut() = None;
+
+        if !new_focus_state {
+            // In many browsers, a document forgets its focused area when the
+            // document is removed from the top-level BC's focus chain
+            if new_focused.take().is_some() {
+                trace!(
+                    "Forgetting the document's focused area because the \
+                    document's container was removed from the top-level BC's \
+                    focus chain"
+                );
             }
         }
 
-        self.focused.set(possibly_focused.as_deref());
+        let old_focused = self.focused.get();
+        let old_focus_state = self.has_focus.get();
 
-        if let Some(ref elem) = self.focused.get() {
-            elem.set_focus_state(true);
-            let node = elem.upcast::<Node>();
-            // FIXME: pass appropriate relatedTarget
-            self.fire_focus_event(FocusEventType::Focus, node, None, can_gc);
-            // Update the focus state for all elements in the focus chain.
-            // https://html.spec.whatwg.org/multipage/#focus-chain
-            if focus_type == FocusType::Element {
-                self.window().send_to_constellation(ScriptMsg::Focus);
+        debug!(
+            "Committing focus transaction: {:?} → {:?}",
+            (&old_focused, old_focus_state),
+            (&new_focused, new_focus_state),
+        );
+
+        // `*_focused_filtered` indicates the local element (if any) included in
+        // the top-level BC's focus chain.
+        let old_focused_filtered = old_focused.as_ref().filter(|_| old_focus_state);
+        let new_focused_filtered = new_focused.as_ref().filter(|_| new_focus_state);
+
+        let trace_focus_chain = |name, element, doc| {
+            trace!(
+                "{} local focus chain: {}",
+                name,
+                match (element, doc) {
+                    (Some(e), _) => format!("[{:?}, document]", e),
+                    (None, true) => "[document]".to_owned(),
+                    (None, false) => "[]".to_owned(),
+                }
+            );
+        };
+
+        trace_focus_chain("Old", old_focused_filtered, old_focus_state);
+        trace_focus_chain("New", new_focused_filtered, new_focus_state);
+
+        if old_focused_filtered != new_focused_filtered {
+            if let Some(elem) = &old_focused_filtered {
+                let node = elem.upcast::<Node>();
+                elem.set_focus_state(false);
+                // FIXME: pass appropriate relatedTarget
+                if node.is_connected() {
+                    self.fire_focus_event(FocusEventType::Blur, node.upcast(), None, can_gc);
+                }
+
+                // Notify the embedder to hide the input method.
+                if elem.input_method_type().is_some() {
+                    self.send_to_embedder(EmbedderMsg::HideIME(self.webview_id()));
+                }
             }
+        }
 
-            // Notify the embedder to display an input method.
-            if let Some(kind) = elem.input_method_type() {
-                let rect = elem.upcast::<Node>().bounding_content_box_or_zero(can_gc);
-                let rect = Rect::new(
-                    Point2D::new(rect.origin.x.to_px(), rect.origin.y.to_px()),
-                    Size2D::new(rect.size.width.to_px(), rect.size.height.to_px()),
+        if old_focus_state != new_focus_state && !new_focus_state {
+            self.fire_focus_event(FocusEventType::Blur, self.global().upcast(), None, can_gc);
+        }
+
+        self.focused.set(new_focused.as_deref());
+        self.has_focus.set(new_focus_state);
+
+        if old_focus_state != new_focus_state && new_focus_state {
+            self.fire_focus_event(FocusEventType::Focus, self.global().upcast(), None, can_gc);
+        }
+
+        if old_focused_filtered != new_focused_filtered {
+            if let Some(elem) = &new_focused_filtered {
+                elem.set_focus_state(true);
+                let node = elem.upcast::<Node>();
+                // FIXME: pass appropriate relatedTarget
+                self.fire_focus_event(FocusEventType::Focus, node.upcast(), None, can_gc);
+
+                // Notify the embedder to display an input method.
+                if let Some(kind) = elem.input_method_type() {
+                    let rect = elem.upcast::<Node>().bounding_content_box_or_zero(can_gc);
+                    let rect = Rect::new(
+                        Point2D::new(rect.origin.x.to_px(), rect.origin.y.to_px()),
+                        Size2D::new(rect.size.width.to_px(), rect.size.height.to_px()),
+                    );
+                    let (text, multiline) = if let Some(input) = elem.downcast::<HTMLInputElement>()
+                    {
+                        (
+                            Some((
+                                (input.Value()).to_string(),
+                                input.GetSelectionEnd().unwrap_or(0) as i32,
+                            )),
+                            false,
+                        )
+                    } else if let Some(textarea) = elem.downcast::<HTMLTextAreaElement>() {
+                        (
+                            Some((
+                                (textarea.Value()).to_string(),
+                                textarea.GetSelectionEnd().unwrap_or(0) as i32,
+                            )),
+                            true,
+                        )
+                    } else {
+                        (None, false)
+                    };
+                    self.send_to_embedder(EmbedderMsg::ShowIME(
+                        self.webview_id(),
+                        kind,
+                        text,
+                        multiline,
+                        DeviceIntRect::from_untyped(&rect.to_box2d()),
+                    ));
+                }
+            }
+        }
+
+        if focus_initiator != FocusInitiator::Local {
+            return;
+        }
+
+        // We are the initiator of the focus operation, so we must broadcast
+        // the change we intend to make.
+        match (old_focus_state, new_focus_state) {
+            (_, true) => {
+                // Advertise the change in the focus chain.
+                // <https://html.spec.whatwg.org/multipage/#focus-chain>
+                // <https://html.spec.whatwg.org/multipage/#focusing-steps>
+                //
+                // If the top-level BC doesn't have system focus, this won't
+                // have an immediate effect, but it will when we gain system
+                // focus again. Therefore we still have to send `ScriptMsg::
+                // Focus`.
+                //
+                // When a container with a non-null nested browsing context is
+                // focused, its active document becomes the focused area of the
+                // top-level browsing context instead. Therefore we need to let
+                // the constellation know if such a container is focused.
+                //
+                // > The focusing steps for an object `new focus target` [...]
+                // >
+                // >  3. If `new focus target` is a browsing context container
+                // >     with non-null nested browsing context, then set
+                // >     `new focus target` to the nested browsing context's
+                // >     active document.
+                let child_browsing_context_id = new_focused
+                    .as_ref()
+                    .and_then(|elem| elem.downcast::<HTMLIFrameElement>())
+                    .and_then(|iframe| iframe.browsing_context_id());
+
+                let sequence = self.increment_fetch_focus_sequence();
+
+                debug!(
+                    "Advertising the focus request to the constellation \
+                        with sequence number {} and child BC ID {}",
+                    sequence,
+                    child_browsing_context_id
+                        .as_ref()
+                        .map(|id| id as &dyn std::fmt::Display)
+                        .unwrap_or(&"(none)"),
                 );
-                let (text, multiline) = if let Some(input) = elem.downcast::<HTMLInputElement>() {
-                    (
-                        Some((
-                            input.Value().to_string(),
-                            input.GetSelectionEnd().unwrap_or(0) as i32,
-                        )),
-                        false,
-                    )
-                } else if let Some(textarea) = elem.downcast::<HTMLTextAreaElement>() {
-                    (
-                        Some((
-                            textarea.Value().to_string(),
-                            textarea.GetSelectionEnd().unwrap_or(0) as i32,
-                        )),
-                        true,
-                    )
-                } else {
-                    (None, false)
-                };
-                self.send_to_embedder(EmbedderMsg::ShowIME(
-                    self.webview_id(),
-                    kind,
-                    text,
-                    multiline,
-                    DeviceIntRect::from_untyped(&rect.to_box2d()),
-                ));
-            }
+
+                self.window()
+                    .send_to_constellation(ScriptToConstellationMessage::Focus(
+                        child_browsing_context_id,
+                        sequence,
+                    ));
+            },
+            (false, false) => {
+                // Our `Document` doesn't have focus, and we intend to keep it
+                // this way.
+            },
+            (true, false) => {
+                unreachable!(
+                    "Can't lose the document's focus without specifying \
+                    another one to focus"
+                );
+            },
         }
     }
 
@@ -1231,10 +1461,11 @@ impl Document {
         if self.browsing_context().is_some() {
             self.send_title_to_embedder();
             let title = String::from(self.Title());
-            self.window.send_to_constellation(ScriptMsg::TitleChanged(
-                self.window.pipeline_id(),
-                title.clone(),
-            ));
+            self.window
+                .send_to_constellation(ScriptToConstellationMessage::TitleChanged(
+                    self.window.pipeline_id(),
+                    title.clone(),
+                ));
             if let Some(chan) = self.window.as_global_scope().devtools_chan() {
                 let _ = chan.send(ScriptToDevtoolsControlMsg::TitleChanged(
                     self.window.pipeline_id(),
@@ -1281,7 +1512,7 @@ impl Document {
         }
     }
 
-    fn send_to_embedder(&self, msg: EmbedderMsg) {
+    pub(crate) fn send_to_embedder(&self, msg: EmbedderMsg) {
         let window = self.window();
         window.send_to_embedder(msg);
     }
@@ -1317,9 +1548,9 @@ impl Document {
             event.action, hit_test_result.point_in_viewport
         );
 
-        let node = unsafe { node::from_untrusted_compositor_node_address(hit_test_result.node) };
+        let node = unsafe { node::from_untrusted_node_address(hit_test_result.node) };
         let Some(el) = node
-            .inclusive_ancestors(ShadowIncluding::No)
+            .inclusive_ancestors(ShadowIncluding::Yes)
             .filter_map(DomRoot::downcast::<Element>)
             .next()
         else {
@@ -1336,7 +1567,10 @@ impl Document {
             }
 
             self.begin_focus_transaction();
-            self.request_focus(Some(&*el), FocusType::Element, can_gc);
+            // Try to focus `el`. If it's not focusable, focus the document
+            // instead.
+            self.request_focus(None, FocusInitiator::Local, can_gc);
+            self.request_focus(Some(&*el), FocusInitiator::Local, can_gc);
         }
 
         let dom_event = DomRoot::upcast::<Event>(MouseEvent::for_platform_mouse_event(
@@ -1374,7 +1608,9 @@ impl Document {
         }
 
         if let MouseButtonAction::Click = event.action {
-            self.commit_focus_transaction(FocusType::Element, can_gc);
+            if self.focus_transaction.borrow().is_some() {
+                self.commit_focus_transaction(FocusInitiator::Local, can_gc);
+            }
             self.maybe_fire_dblclick(
                 hit_test_result.point_in_viewport,
                 node,
@@ -1409,7 +1645,6 @@ impl Document {
         // <https://w3c.github.io/uievents/#contextmenu>
         let menu_event = PointerEvent::new(
             &self.window,                   // window
-            None,                           // proto
             DOMString::from("contextmenu"), // type
             EventBubbles::Bubbles,          // can_bubble
             EventCancelable::Cancelable,    // cancelable
@@ -1427,22 +1662,20 @@ impl Document {
             pressed_mouse_buttons,          // buttons
             None,                           // related_target
             None,                           // point_in_target
-            // TODO: decide generic pointer id
-            // <https://www.w3.org/TR/pointerevents3/#dom-pointerevent-pointerid>
-            0,                        // pointer_id
-            1,                        // width
-            1,                        // height
-            0.5,                      // pressure
-            0.0,                      // tangential_pressure
-            0,                        // tilt_x
-            0,                        // tilt_y
-            0,                        // twist
-            PI / 2.0,                 // altitude_angle
-            0.0,                      // azimuth_angle
-            DOMString::from("mouse"), // pointer_type
-            true,                     // is_primary
-            vec![],                   // coalesced_events
-            vec![],                   // predicted_events
+            PointerId::Mouse as i32,        // pointer_id
+            1,                              // width
+            1,                              // height
+            0.5,                            // pressure
+            0.0,                            // tangential_pressure
+            0,                              // tilt_x
+            0,                              // tilt_y
+            0,                              // twist
+            PI / 2.0,                       // altitude_angle
+            0.0,                            // azimuth_angle
+            DOMString::from("mouse"),       // pointer_type
+            true,                           // is_primary
+            vec![],                         // coalesced_events
+            vec![],                         // predicted_events
             can_gc,
         );
         let event = menu_event.upcast::<Event>();
@@ -1676,7 +1909,7 @@ impl Document {
             ClipboardEventType::Paste => {
                 let (sender, receiver) = ipc::channel().unwrap();
                 self.window
-                    .send_to_constellation(ScriptMsg::ForwardToEmbedder(
+                    .send_to_constellation(ScriptToConstellationMessage::ForwardToEmbedder(
                         EmbedderMsg::GetClipboardText(self.window.webview_id(), sender),
                     ));
                 let text_contents = receiver
@@ -1785,7 +2018,7 @@ impl Document {
             return;
         };
 
-        let node = unsafe { node::from_untrusted_compositor_node_address(hit_test_result.node) };
+        let node = unsafe { node::from_untrusted_node_address(hit_test_result.node) };
         let Some(new_target) = node
             .inclusive_ancestors(ShadowIncluding::No)
             .filter_map(DomRoot::downcast::<Element>)
@@ -1963,7 +2196,7 @@ impl Document {
             return;
         };
 
-        let node = unsafe { node::from_untrusted_compositor_node_address(hit_test_result.node) };
+        let node = unsafe { node::from_untrusted_node_address(hit_test_result.node) };
         let Some(el) = node
             .inclusive_ancestors(ShadowIncluding::No)
             .filter_map(DomRoot::downcast::<Element>)
@@ -2023,7 +2256,7 @@ impl Document {
             TouchEventType::Cancel => "touchcancel",
         };
 
-        let node = unsafe { node::from_untrusted_compositor_node_address(hit_test_result.node) };
+        let node = unsafe { node::from_untrusted_node_address(hit_test_result.node) };
         let Some(el) = node
             .inclusive_ancestors(ShadowIncluding::No)
             .filter_map(DomRoot::downcast::<Element>)
@@ -2193,7 +2426,7 @@ impl Document {
             {
                 if let Some(elem) = target.downcast::<Element>() {
                     elem.upcast::<Node>()
-                        .fire_synthetic_mouse_event_not_trusted(DOMString::from("click"), can_gc);
+                        .fire_synthetic_pointer_event_not_trusted(DOMString::from("click"), can_gc);
                 }
             }
         }
@@ -2204,7 +2437,7 @@ impl Document {
             ImeEvent::Dismissed => {
                 self.request_focus(
                     self.GetBody().as_ref().map(|e| e.upcast()),
-                    FocusType::Element,
+                    FocusInitiator::Local,
                     can_gc,
                 );
                 return;
@@ -2258,13 +2491,13 @@ impl Document {
             for node in nodes {
                 match node {
                     NodeOrString::Node(node) => {
-                        fragment.AppendChild(&node)?;
+                        fragment.AppendChild(&node, can_gc)?;
                     },
                     NodeOrString::String(string) => {
                         let node = DomRoot::upcast::<Node>(self.CreateTextNode(string, can_gc));
                         // No try!() here because appending a text node
                         // should not fail.
-                        fragment.AppendChild(&node).unwrap();
+                        fragment.AppendChild(&node, can_gc).unwrap();
                     },
                 }
             }
@@ -2354,8 +2587,9 @@ impl Document {
             // This reduces CPU usage by avoiding needless thread wakeups in the common case of
             // repeated rAF.
 
-            let event =
-                ScriptMsg::ChangeRunningAnimationsState(AnimationState::AnimationCallbacksPresent);
+            let event = ScriptToConstellationMessage::ChangeRunningAnimationsState(
+                AnimationState::AnimationCallbacksPresent,
+            );
             self.window().send_to_constellation(event);
         }
 
@@ -2385,10 +2619,6 @@ impl Document {
     pub(crate) fn run_the_animation_frame_callbacks(&self, can_gc: CanGc) {
         let _realm = enter_realm(self);
 
-        self.pending_animation_ticks
-            .borrow_mut()
-            .remove(AnimationTickType::REQUEST_ANIMATION_FRAME);
-
         self.running_animation_callbacks.set(true);
         let was_faking_animation_frames = self.is_faking_animation_frames();
         let timing = self.global().performance().Now();
@@ -2450,7 +2680,7 @@ impl Document {
                 // to expliclty trigger a OneshotTimerCallback for these queued callbacks.
                 self.schedule_fake_animation_frame();
             }
-            let event = ScriptMsg::ChangeRunningAnimationsState(
+            let event = ScriptToConstellationMessage::ChangeRunningAnimationsState(
                 AnimationState::NoAnimationCallbacksPresent,
             );
             self.window().send_to_constellation(event);
@@ -2459,10 +2689,11 @@ impl Document {
         // If we were previously faking animation frames, we need to re-enable video refresh
         // callbacks when we stop seeing spurious animation frames.
         if was_faking_animation_frames && !self.is_faking_animation_frames() && !is_empty {
-            self.window()
-                .send_to_constellation(ScriptMsg::ChangeRunningAnimationsState(
+            self.window().send_to_constellation(
+                ScriptToConstellationMessage::ChangeRunningAnimationsState(
                     AnimationState::AnimationCallbacksPresent,
-                ));
+                ),
+            );
         }
     }
 
@@ -2485,7 +2716,9 @@ impl Document {
         mut request: RequestBuilder,
         listener: Listener,
     ) {
-        request = request.insecure_requests_policy(self.insecure_requests_policy());
+        request = request
+            .insecure_requests_policy(self.insecure_requests_policy())
+            .has_trustworthy_ancestor_origin(self.has_trustworthy_ancestor_or_current_origin());
         let callback = NetworkListener {
             context: std::sync::Arc::new(Mutex::new(listener)),
             task_source: self
@@ -2504,7 +2737,9 @@ impl Document {
         mut request: RequestBuilder,
         listener: Listener,
     ) {
-        request = request.insecure_requests_policy(self.insecure_requests_policy());
+        request = request
+            .insecure_requests_policy(self.insecure_requests_policy())
+            .has_trustworthy_ancestor_origin(self.has_trustworthy_ancestor_or_current_origin());
         let callback = NetworkListener {
             context: std::sync::Arc::new(Mutex::new(listener)),
             task_source: self
@@ -2701,7 +2936,7 @@ impl Document {
         if !self.salvageable.get() {
             // Step 1 of clean-up steps.
             global_scope.close_event_sources();
-            let msg = ScriptMsg::DiscardDocument;
+            let msg = ScriptToConstellationMessage::DiscardDocument;
             let _ = global_scope.script_to_constellation_chan().send(msg);
         }
         // https://w3c.github.io/FileAPI/#lifeTime
@@ -2975,9 +3210,14 @@ impl Document {
 
     /// <https://html.spec.whatwg.org/multipage/#the-end> step 3.
     /// <https://html.spec.whatwg.org/multipage/#prepare-a-script> step 22.d.
-    pub(crate) fn deferred_script_loaded(&self, element: &HTMLScriptElement, result: ScriptResult) {
+    pub(crate) fn deferred_script_loaded(
+        &self,
+        element: &HTMLScriptElement,
+        result: ScriptResult,
+        can_gc: CanGc,
+    ) {
         self.deferred_scripts.loaded(element, result);
-        self.process_deferred_scripts(CanGc::note());
+        self.process_deferred_scripts(can_gc);
     }
 
     /// <https://html.spec.whatwg.org/multipage/#the-end> step 3.
@@ -3088,7 +3328,8 @@ impl Document {
     }
 
     pub(crate) fn notify_constellation_load(&self) {
-        self.window().send_to_constellation(ScriptMsg::LoadComplete);
+        self.window()
+            .send_to_constellation(ScriptToConstellationMessage::LoadComplete);
     }
 
     pub(crate) fn set_current_parser(&self, script: Option<&ServoParser>) {
@@ -3188,7 +3429,7 @@ impl Document {
     fn fire_focus_event(
         &self,
         focus_event_type: FocusEventType,
-        node: &Node,
+        event_target: &EventTarget,
         related_target: Option<&EventTarget>,
         can_gc: CanGc,
     ) {
@@ -3208,8 +3449,7 @@ impl Document {
         );
         let event = event.upcast::<Event>();
         event.set_trusted(true);
-        let target = node.upcast();
-        event.fire(target, can_gc);
+        event.fire(event_target, can_gc);
     }
 
     /// <https://html.spec.whatwg.org/multipage/#cookie-averse-document-object>
@@ -3285,10 +3525,10 @@ impl Document {
         id
     }
 
-    pub(crate) fn unregister_media_controls(&self, id: &str) {
+    pub(crate) fn unregister_media_controls(&self, id: &str, can_gc: CanGc) {
         if let Some(ref media_controls) = self.media_controls.borrow_mut().remove(id) {
             let media_controls = DomRoot::from_ref(&**media_controls);
-            media_controls.Host().detach_shadow();
+            media_controls.Host().detach_shadow(can_gc);
         } else {
             debug_assert!(false, "Trying to unregister unknown media controls");
         }
@@ -3606,6 +3846,90 @@ impl Document {
             .Performance()
             .queue_entry(entry.upcast::<PerformanceEntry>(), can_gc);
     }
+
+    /// <https://html.spec.whatwg.org/multipage/#document-write-steps>
+    fn write(
+        &self,
+        text: Vec<TrustedHTMLOrString>,
+        line_feed: bool,
+        containing_class: &str,
+        field: &str,
+        can_gc: CanGc,
+    ) -> ErrorResult {
+        // Step 1: Let string be the empty string.
+        let mut strings: Vec<String> = Vec::with_capacity(text.len());
+        // Step 2: Let isTrusted be false if text contains a string; otherwise true.
+        let mut is_trusted = true;
+        // Step 3: For each value of text:
+        for value in text {
+            match value {
+                // Step 3.1: If value is a TrustedHTML object, then append value's associated data to string.
+                TrustedHTMLOrString::TrustedHTML(trusted_html) => {
+                    strings.push(trusted_html.to_string().to_owned());
+                },
+                TrustedHTMLOrString::String(str_) => {
+                    // Step 2: Let isTrusted be false if text contains a string; otherwise true.
+                    is_trusted = false;
+                    // Step 3.2: Otherwise, append value to string.
+                    strings.push(str_.into());
+                },
+            };
+        }
+        let mut string = itertools::join(strings, "");
+        // Step 4: If isTrusted is false, set string to the result of invoking the
+        // Get Trusted Type compliant string algorithm with TrustedHTML,
+        // this's relevant global object, string, sink, and "script".
+        if !is_trusted {
+            string = TrustedHTML::get_trusted_script_compliant_string(
+                &self.global(),
+                TrustedHTMLOrString::String(string.into()),
+                containing_class,
+                field,
+                can_gc,
+            )?;
+        }
+        // Step 5: If lineFeed is true, append U+000A LINE FEED to string.
+        if line_feed {
+            string.push('\n');
+        }
+        // Step 6: If document is an XML document, then throw an "InvalidStateError" DOMException.
+        if !self.is_html_document() {
+            return Err(Error::InvalidState);
+        }
+
+        // Step 7: If document's throw-on-dynamic-markup-insertion counter is greater than 0,
+        // then throw an "InvalidStateError" DOMException.
+        if self.throw_on_dynamic_markup_insertion_counter.get() > 0 {
+            return Err(Error::InvalidState);
+        }
+
+        // Step 8: If document's active parser was aborted is true, then return.
+        if !self.is_active() || self.active_parser_was_aborted.get() {
+            return Ok(());
+        }
+
+        let parser = match self.get_current_parser() {
+            Some(ref parser) if parser.can_write() => DomRoot::from_ref(&**parser),
+            // Step 9: If the insertion point is undefined, then:
+            _ => {
+                // Step 9.1: If document's unload counter is greater than 0 or
+                // document's ignore-destructive-writes counter is greater than 0, then return.
+                if self.is_prompting_or_unloading() ||
+                    self.ignore_destructive_writes_counter.get() > 0
+                {
+                    return Ok(());
+                }
+                // Step 9.2: Run the document open steps with document.
+                self.Open(None, None, can_gc)?;
+                self.get_current_parser().unwrap()
+            },
+        };
+
+        // Steps 10-11.
+        parser.write(string.into(), can_gc);
+
+        Ok(())
+    }
 }
 
 fn is_character_value_key(key: &Key) -> bool {
@@ -3753,6 +4077,7 @@ impl Document {
         is_initial_about_blank: bool,
         allow_declarative_shadow_roots: bool,
         inherited_insecure_requests_policy: Option<InsecureRequestsPolicy>,
+        has_trustworthy_ancestor_origin: bool,
     ) -> Document {
         let url = url.unwrap_or_else(|| ServoUrl::parse("about:blank").unwrap());
 
@@ -3775,17 +4100,21 @@ impl Document {
         let content_type = content_type.unwrap_or_else(|| {
             match is_html_document {
                 // https://dom.spec.whatwg.org/#dom-domimplementation-createhtmldocument
-                IsHTMLDocument::HTMLDocument => mime::TEXT_HTML,
+                IsHTMLDocument::HTMLDocument => "text/html",
                 // https://dom.spec.whatwg.org/#concept-document-content-type
-                IsHTMLDocument::NonHTMLDocument => "application/xml".parse().unwrap(),
+                IsHTMLDocument::NonHTMLDocument => "application/xml",
             }
+            .parse()
+            .unwrap()
         });
 
         let encoding = content_type
-            .get_param(mime::CHARSET)
-            .and_then(|charset| Encoding::for_label(charset.as_str().as_bytes()))
+            .get_parameter(CHARSET)
+            .and_then(|charset| Encoding::for_label(charset.as_bytes()))
             .unwrap_or(UTF_8);
 
+        let has_focus = window.parent_info().is_none();
+
         let has_browsing_context = has_browsing_context == HasBrowsingContext::Yes;
 
         Document {
@@ -3833,8 +4162,10 @@ impl Document {
             stylesheet_list: MutNullableDom::new(None),
             ready_state: Cell::new(ready_state),
             domcontentloaded_dispatched: Cell::new(domcontentloaded_dispatched),
-            focus_transaction: DomRefCell::new(FocusTransaction::NotInTransaction),
+            focus_transaction: DomRefCell::new(None),
             focused: Default::default(),
+            focus_sequence: Cell::new(FocusSequenceNumber::default()),
+            has_focus: Cell::new(has_focus),
             current_script: Default::default(),
             pending_parsing_blocking_script: Default::default(),
             script_blocking_stylesheets_count: Cell::new(0u32),
@@ -3900,9 +4231,9 @@ impl Document {
                 DomRefCell::new(AnimationTimeline::new())
             },
             animations: DomRefCell::new(Animations::new()),
+            image_animation_manager: DomRefCell::new(ImageAnimationManager::new()),
             dirty_root: Default::default(),
             declarative_refresh: Default::default(),
-            pending_animation_ticks: Default::default(),
             pending_input_events: Default::default(),
             mouse_move_event_index: Default::default(),
             resize_observers: Default::default(),
@@ -3912,9 +4243,11 @@ impl Document {
             is_initial_about_blank: Cell::new(is_initial_about_blank),
             allow_declarative_shadow_roots: Cell::new(allow_declarative_shadow_roots),
             inherited_insecure_requests_policy: Cell::new(inherited_insecure_requests_policy),
+            has_trustworthy_ancestor_origin: Cell::new(has_trustworthy_ancestor_origin),
             intersection_observer_task_queued: Cell::new(false),
             intersection_observers: Default::default(),
             active_keyboard_modifiers: Cell::new(Modifiers::empty()),
+            highlighted_dom_node: Default::default(),
         }
     }
 
@@ -3997,18 +4330,21 @@ impl Document {
         type_: csp::InlineCheckType,
         source: &str,
     ) -> csp::CheckResult {
-        let element = csp::Element {
-            nonce: el
-                .get_attribute(&ns!(), &local_name!("nonce"))
-                .map(|attr| Cow::Owned(attr.value().to_string())),
+        let (result, violations) = match self.get_csp_list() {
+            None => {
+                return csp::CheckResult::Allowed;
+            },
+            Some(csp_list) => {
+                let element = csp::Element {
+                    nonce: el.nonce_value_if_nonceable().map(Cow::Owned),
+                };
+                csp_list.should_elements_inline_type_behavior_be_blocked(&element, type_, source)
+            },
         };
-        // TODO: Instead of ignoring violations, report them.
-        self.get_csp_list()
-            .map(|c| {
-                c.should_elements_inline_type_behavior_be_blocked(&element, type_, source)
-                    .0
-            })
-            .unwrap_or(csp::CheckResult::Allowed)
+
+        self.global().report_csp_violations(violations, Some(el));
+
+        result
     }
 
     /// Prevent any JS or layout from running until the corresponding call to
@@ -4069,6 +4405,7 @@ impl Document {
         is_initial_about_blank: bool,
         allow_declarative_shadow_roots: bool,
         inherited_insecure_requests_policy: Option<InsecureRequestsPolicy>,
+        has_trustworthy_ancestor_origin: bool,
         can_gc: CanGc,
     ) -> DomRoot<Document> {
         Self::new_with_proto(
@@ -4089,6 +4426,7 @@ impl Document {
             is_initial_about_blank,
             allow_declarative_shadow_roots,
             inherited_insecure_requests_policy,
+            has_trustworthy_ancestor_origin,
             can_gc,
         )
     }
@@ -4112,6 +4450,7 @@ impl Document {
         is_initial_about_blank: bool,
         allow_declarative_shadow_roots: bool,
         inherited_insecure_requests_policy: Option<InsecureRequestsPolicy>,
+        has_trustworthy_ancestor_origin: bool,
         can_gc: CanGc,
     ) -> DomRoot<Document> {
         let document = reflect_dom_object_with_proto(
@@ -4132,6 +4471,7 @@ impl Document {
                 is_initial_about_blank,
                 allow_declarative_shadow_roots,
                 inherited_insecure_requests_policy,
+                has_trustworthy_ancestor_origin,
             )),
             window,
             proto,
@@ -4265,6 +4605,7 @@ impl Document {
                     false,
                     self.allow_declarative_shadow_roots(),
                     Some(self.insecure_requests_policy()),
+                    self.has_trustworthy_ancestor_or_current_origin(),
                     can_gc,
                 );
                 new_doc
@@ -4403,7 +4744,7 @@ impl Document {
     // https://fullscreen.spec.whatwg.org/#dom-element-requestfullscreen
     pub(crate) fn enter_fullscreen(&self, pending: &Element, can_gc: CanGc) -> Rc<Promise> {
         // Step 1
-        let in_realm_proof = AlreadyInRealm::assert();
+        let in_realm_proof = AlreadyInRealm::assert::<crate::DomTypeHolder>();
         let promise = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof), can_gc);
         let mut error = false;
 
@@ -4471,7 +4812,7 @@ impl Document {
     pub(crate) fn exit_fullscreen(&self, can_gc: CanGc) -> Rc<Promise> {
         let global = self.global();
         // Step 1
-        let in_realm_proof = AlreadyInRealm::assert();
+        let in_realm_proof = AlreadyInRealm::assert::<crate::DomTypeHolder>();
         let promise = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof), can_gc);
         // Step 2
         if self.fullscreen_element.get().is_none() {
@@ -4531,14 +4872,14 @@ impl Document {
         }
     }
 
-    fn reset_form_owner_for_listeners(&self, id: &Atom) {
+    fn reset_form_owner_for_listeners(&self, id: &Atom, can_gc: CanGc) {
         let map = self.form_id_listener_map.borrow();
         if let Some(listeners) = map.get(id) {
             for listener in listeners {
                 listener
                     .as_maybe_form_control()
                     .expect("Element must be a form control")
-                    .reset_form_owner();
+                    .reset_form_owner(can_gc);
             }
         }
     }
@@ -4664,18 +5005,6 @@ impl Document {
             .collect()
     }
 
-    /// Note a pending animation tick, to be processed at the next `update_the_rendering` task.
-    pub(crate) fn note_pending_animation_tick(&self, tick_type: AnimationTickType) {
-        self.pending_animation_ticks.borrow_mut().extend(tick_type);
-    }
-
-    /// Whether this document has received an animation tick for rafs.
-    pub(crate) fn has_received_raf_tick(&self) -> bool {
-        self.pending_animation_ticks
-            .borrow()
-            .contains(AnimationTickType::REQUEST_ANIMATION_FRAME)
-    }
-
     pub(crate) fn advance_animation_timeline_for_testing(&self, delta: f64) {
         self.animation_timeline.borrow_mut().advance_specific(delta);
         let current_timeline_value = self.current_animation_timeline_value();
@@ -4738,6 +5067,100 @@ impl Document {
         self.animations().send_pending_events(self.window(), can_gc);
     }
 
+    pub(crate) fn image_animation_manager(&self) -> Ref<ImageAnimationManager> {
+        self.image_animation_manager.borrow()
+    }
+    pub(crate) fn image_animation_manager_mut(&self) -> RefMut<ImageAnimationManager> {
+        self.image_animation_manager.borrow_mut()
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#shared-declarative-refresh-steps>
+    pub(crate) fn shared_declarative_refresh_steps(&self, content: &[u8]) {
+        // 1. If document's will declaratively refresh is true, then return.
+        if self.will_declaratively_refresh() {
+            return;
+        }
+
+        // 2-11 Parsing
+        static REFRESH_REGEX: LazyLock<Regex> = LazyLock::new(|| {
+            // s flag is used to match . on newlines since the only places we use . in the
+            // regex is to go "to end of the string"
+            // (?s-u:.) is used to consume invalid unicode bytes
+            Regex::new(
+                r#"(?xs)
+                    ^
+                    \s* # 3
+                    ((?<time>[0-9]+)|\.) # 5-6
+                    [0-9.]* # 8
+                    (
+                        (
+                            (\s*;|\s*,|\s) # 10.3
+                            \s* # 10.4
+                        )
+                        (
+                            (
+                                (U|u)(R|r)(L|l) # 11.2-11.4
+                                \s*=\s* # 11.5-11.7
+                            )?
+                        ('(?<url1>[^']*)'(?s-u:.)*|"(?<url2>[^"]*)"(?s-u:.)*|['"]?(?<url3>(?s-u:.)*)) # 11.8 - 11.10
+                        |
+                        (?<url4>(?s-u:.)*)
+                    )
+                )?
+                $
+            "#,
+            )
+            .unwrap()
+        });
+
+        // 9. Let urlRecord be document's URL.
+        let mut url_record = self.url();
+        let captures = if let Some(captures) = REFRESH_REGEX.captures(content) {
+            captures
+        } else {
+            return;
+        };
+        let time = if let Some(time_string) = captures.name("time") {
+            u64::from_str(&String::from_utf8_lossy(time_string.as_bytes())).unwrap_or(0)
+        } else {
+            0
+        };
+        let captured_url = captures.name("url1").or(captures
+            .name("url2")
+            .or(captures.name("url3").or(captures.name("url4"))));
+
+        // 11.11 Parse: Set urlRecord to the result of encoding-parsing a URL given urlString, relative to document.
+        if let Some(url_match) = captured_url {
+            url_record = if let Ok(url) = ServoUrl::parse_with_base(
+                Some(&url_record),
+                &String::from_utf8_lossy(url_match.as_bytes()),
+            ) {
+                info!("Refresh to {}", url.debug_compact());
+                url
+            } else {
+                // 11.12 If urlRecord is failure, then return.
+                return;
+            }
+        }
+        // 12. Set document's will declaratively refresh to true.
+        if self.completely_loaded() {
+            // TODO: handle active sandboxing flag
+            self.window.as_global_scope().schedule_callback(
+                OneshotTimerCallback::RefreshRedirectDue(RefreshRedirectDue {
+                    window: DomRoot::from_ref(self.window()),
+                    url: url_record,
+                }),
+                Duration::from_secs(time),
+            );
+            self.set_declarative_refresh(DeclarativeRefresh::CreatedAfterLoad);
+        } else {
+            self.set_declarative_refresh(DeclarativeRefresh::PendingLoad {
+                url: url_record,
+                time,
+            });
+        }
+    }
+
     pub(crate) fn will_declaratively_refresh(&self) -> bool {
         self.declarative_refresh.borrow().is_some()
     }
@@ -4805,6 +5228,23 @@ impl Document {
     pub fn set_allow_declarative_shadow_roots(&self, value: bool) {
         self.allow_declarative_shadow_roots.set(value)
     }
+
+    pub fn has_trustworthy_ancestor_origin(&self) -> bool {
+        self.has_trustworthy_ancestor_origin.get()
+    }
+
+    pub fn has_trustworthy_ancestor_or_current_origin(&self) -> bool {
+        self.has_trustworthy_ancestor_origin.get() ||
+            self.origin().immutable().is_potentially_trustworthy()
+    }
+    pub(crate) fn highlight_dom_node(&self, node: Option<&Node>) {
+        self.highlighted_dom_node.set(node);
+        self.set_needs_paint(true);
+    }
+
+    pub(crate) fn highlighted_dom_node(&self) -> Option<DomRoot<Node>> {
+        self.highlighted_dom_node.get()
+    }
 }
 
 #[allow(non_snake_case)]
@@ -4835,6 +5275,7 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
             false,
             doc.allow_declarative_shadow_roots(),
             Some(doc.insecure_requests_policy()),
+            doc.has_trustworthy_ancestor_or_current_origin(),
             can_gc,
         ))
     }
@@ -4845,20 +5286,20 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
     }
 
     // https://drafts.csswg.org/cssom/#dom-document-stylesheets
-    fn StyleSheets(&self) -> DomRoot<StyleSheetList> {
+    fn StyleSheets(&self, can_gc: CanGc) -> DomRoot<StyleSheetList> {
         self.stylesheet_list.or_init(|| {
             StyleSheetList::new(
                 &self.window,
                 StyleSheetListOwner::Document(Dom::from_ref(self)),
-                CanGc::note(),
+                can_gc,
             )
         })
     }
 
     // https://dom.spec.whatwg.org/#dom-document-implementation
-    fn Implementation(&self) -> DomRoot<DOMImplementation> {
+    fn Implementation(&self, can_gc: CanGc) -> DomRoot<DOMImplementation> {
         self.implementation
-            .or_init(|| DOMImplementation::new(self, CanGc::note()))
+            .or_init(|| DOMImplementation::new(self, can_gc))
     }
 
     // https://dom.spec.whatwg.org/#dom-document-url
@@ -4877,12 +5318,34 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
 
     // https://html.spec.whatwg.org/multipage/#dom-document-hasfocus
     fn HasFocus(&self) -> bool {
-        // Step 1-2.
-        if self.window().parent_info().is_none() && self.is_fully_active() {
-            return true;
+        // <https://html.spec.whatwg.org/multipage/#has-focus-steps>
+        //
+        // > The has focus steps, given a `Document` object `target`, are as
+        // > follows:
+        // >
+        // > 1. If `target`'s browsing context's top-level browsing context does
+        // >    not have system focus, then return false.
+
+        // > 2. Let `candidate` be `target`'s browsing context's top-level
+        // >    browsing context's active document.
+        // >
+        // > 3. While true:
+        // >
+        // >    3.1. If `candidate` is target, then return true.
+        // >
+        // >    3.2. If the focused area of `candidate` is a browsing context
+        // >         container with a non-null nested browsing context, then set
+        // >         `candidate` to the active document of that browsing context
+        // >         container's nested browsing context.
+        // >
+        // >    3.3. Otherwise, return false.
+        if self.window().parent_info().is_none() {
+            // 2 → 3 → (3.1 || ⋯ → 3.3)
+            self.is_fully_active()
+        } else {
+            // 2 → 3 → 3.2 → (⋯ → 3.1 || ⋯ → 3.3)
+            self.is_fully_active() && self.has_focus.get()
         }
-        // TODO Step 3.
-        false
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-domain
@@ -4986,13 +5449,21 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
     }
 
     // https://dom.spec.whatwg.org/#dom-document-getelementsbytagname
-    fn GetElementsByTagName(&self, qualified_name: DOMString) -> DomRoot<HTMLCollection> {
+    fn GetElementsByTagName(
+        &self,
+        qualified_name: DOMString,
+        can_gc: CanGc,
+    ) -> DomRoot<HTMLCollection> {
         let qualified_name = LocalName::from(&*qualified_name);
         if let Some(entry) = self.tag_map.borrow_mut().get(&qualified_name) {
             return DomRoot::from_ref(entry);
         }
-        let result =
-            HTMLCollection::by_qualified_name(&self.window, self.upcast(), qualified_name.clone());
+        let result = HTMLCollection::by_qualified_name(
+            &self.window,
+            self.upcast(),
+            qualified_name.clone(),
+            can_gc,
+        );
         self.tag_map
             .borrow_mut()
             .insert(qualified_name, Dom::from_ref(&*result));
@@ -5004,6 +5475,7 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
         &self,
         maybe_ns: Option<DOMString>,
         tag_name: DOMString,
+        can_gc: CanGc,
     ) -> DomRoot<HTMLCollection> {
         let ns = namespace_from_domstring(maybe_ns);
         let local = LocalName::from(tag_name);
@@ -5011,7 +5483,8 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
         if let Some(collection) = self.tagns_map.borrow().get(&qname) {
             return DomRoot::from_ref(collection);
         }
-        let result = HTMLCollection::by_qual_tag_name(&self.window, self.upcast(), qname.clone());
+        let result =
+            HTMLCollection::by_qual_tag_name(&self.window, self.upcast(), qname.clone(), can_gc);
         self.tagns_map
             .borrow_mut()
             .insert(qname, Dom::from_ref(&*result));
@@ -5019,13 +5492,17 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
     }
 
     // https://dom.spec.whatwg.org/#dom-document-getelementsbyclassname
-    fn GetElementsByClassName(&self, classes: DOMString) -> DomRoot<HTMLCollection> {
+    fn GetElementsByClassName(&self, classes: DOMString, can_gc: CanGc) -> DomRoot<HTMLCollection> {
         let class_atoms: Vec<Atom> = split_html_space_chars(&classes).map(Atom::from).collect();
         if let Some(collection) = self.classes_map.borrow().get(&class_atoms) {
             return DomRoot::from_ref(collection);
         }
-        let result =
-            HTMLCollection::by_atomic_class_name(&self.window, self.upcast(), class_atoms.clone());
+        let result = HTMLCollection::by_atomic_class_name(
+            &self.window,
+            self.upcast(),
+            class_atoms.clone(),
+            can_gc,
+        );
         self.classes_map
             .borrow_mut()
             .insert(class_atoms, Dom::from_ref(&*result));
@@ -5234,7 +5711,7 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
     }
 
     // https://dom.spec.whatwg.org/#dom-document-adoptnode
-    fn AdoptNode(&self, node: &Node) -> Fallible<DomRoot<Node>> {
+    fn AdoptNode(&self, node: &Node, can_gc: CanGc) -> Fallible<DomRoot<Node>> {
         // Step 1.
         if node.is::<Document>() {
             return Err(Error::NotSupported);
@@ -5246,7 +5723,7 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
         }
 
         // Step 3.
-        Node::adopt(node, self);
+        Node::adopt(node, self, can_gc);
 
         // Step 4.
         Ok(DomRoot::from_ref(node))
@@ -5335,8 +5812,9 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
         root: &Node,
         what_to_show: u32,
         filter: Option<Rc<NodeFilter>>,
+        can_gc: CanGc,
     ) -> DomRoot<NodeIterator> {
-        NodeIterator::new(self, root, what_to_show, filter, CanGc::note())
+        NodeIterator::new(self, root, what_to_show, filter, can_gc)
     }
 
     // https://dom.spec.whatwg.org/#dom-document-createtreewalker
@@ -5381,7 +5859,7 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
                     let parent = root.upcast::<Node>();
                     let child = elem.upcast::<Node>();
                     parent
-                        .InsertBefore(child, parent.GetFirstChild().as_deref())
+                        .InsertBefore(child, parent.GetFirstChild().as_deref(), can_gc)
                         .unwrap()
                 },
             }
@@ -5404,7 +5882,9 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
                             None,
                             can_gc,
                         );
-                        head.upcast::<Node>().AppendChild(elem.upcast()).unwrap()
+                        head.upcast::<Node>()
+                            .AppendChild(elem.upcast(), can_gc)
+                            .unwrap()
                     },
                     None => return,
                 },
@@ -5451,7 +5931,7 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-body
-    fn SetBody(&self, new_body: Option<&HTMLElement>) -> ErrorResult {
+    fn SetBody(&self, new_body: Option<&HTMLElement>, can_gc: CanGc) -> ErrorResult {
         // Step 1.
         let new_body = match new_body {
             Some(new_body) => new_body,
@@ -5477,7 +5957,7 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
             // Step 3.
             (Some(ref root), Some(child)) => {
                 let root = root.upcast::<Node>();
-                root.ReplaceChild(new_body.upcast(), child.upcast())
+                root.ReplaceChild(new_body.upcast(), child.upcast(), can_gc)
                     .unwrap();
             },
 
@@ -5487,81 +5967,103 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
             // Step 5.
             (Some(ref root), &None) => {
                 let root = root.upcast::<Node>();
-                root.AppendChild(new_body.upcast()).unwrap();
+                root.AppendChild(new_body.upcast(), can_gc).unwrap();
             },
         }
         Ok(())
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-getelementsbyname
-    fn GetElementsByName(&self, name: DOMString) -> DomRoot<NodeList> {
-        NodeList::new_elements_by_name_list(self.window(), self, name, CanGc::note())
+    fn GetElementsByName(&self, name: DOMString, can_gc: CanGc) -> DomRoot<NodeList> {
+        NodeList::new_elements_by_name_list(self.window(), self, name, can_gc)
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-images
-    fn Images(&self) -> DomRoot<HTMLCollection> {
+    fn Images(&self, can_gc: CanGc) -> DomRoot<HTMLCollection> {
         self.images.or_init(|| {
-            HTMLCollection::new_with_filter_fn(&self.window, self.upcast(), |element, _| {
-                element.is::<HTMLImageElement>()
-            })
+            HTMLCollection::new_with_filter_fn(
+                &self.window,
+                self.upcast(),
+                |element, _| element.is::<HTMLImageElement>(),
+                can_gc,
+            )
         })
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-embeds
-    fn Embeds(&self) -> DomRoot<HTMLCollection> {
+    fn Embeds(&self, can_gc: CanGc) -> DomRoot<HTMLCollection> {
         self.embeds.or_init(|| {
-            HTMLCollection::new_with_filter_fn(&self.window, self.upcast(), |element, _| {
-                element.is::<HTMLEmbedElement>()
-            })
+            HTMLCollection::new_with_filter_fn(
+                &self.window,
+                self.upcast(),
+                |element, _| element.is::<HTMLEmbedElement>(),
+                can_gc,
+            )
         })
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-plugins
-    fn Plugins(&self) -> DomRoot<HTMLCollection> {
-        self.Embeds()
+    fn Plugins(&self, can_gc: CanGc) -> DomRoot<HTMLCollection> {
+        self.Embeds(can_gc)
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-links
-    fn Links(&self) -> DomRoot<HTMLCollection> {
+    fn Links(&self, can_gc: CanGc) -> DomRoot<HTMLCollection> {
         self.links.or_init(|| {
-            HTMLCollection::new_with_filter_fn(&self.window, self.upcast(), |element, _| {
-                (element.is::<HTMLAnchorElement>() || element.is::<HTMLAreaElement>()) &&
-                    element.has_attribute(&local_name!("href"))
-            })
+            HTMLCollection::new_with_filter_fn(
+                &self.window,
+                self.upcast(),
+                |element, _| {
+                    (element.is::<HTMLAnchorElement>() || element.is::<HTMLAreaElement>()) &&
+                        element.has_attribute(&local_name!("href"))
+                },
+                can_gc,
+            )
         })
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-forms
-    fn Forms(&self) -> DomRoot<HTMLCollection> {
+    fn Forms(&self, can_gc: CanGc) -> DomRoot<HTMLCollection> {
         self.forms.or_init(|| {
-            HTMLCollection::new_with_filter_fn(&self.window, self.upcast(), |element, _| {
-                element.is::<HTMLFormElement>()
-            })
+            HTMLCollection::new_with_filter_fn(
+                &self.window,
+                self.upcast(),
+                |element, _| element.is::<HTMLFormElement>(),
+                can_gc,
+            )
         })
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-scripts
-    fn Scripts(&self) -> DomRoot<HTMLCollection> {
+    fn Scripts(&self, can_gc: CanGc) -> DomRoot<HTMLCollection> {
         self.scripts.or_init(|| {
-            HTMLCollection::new_with_filter_fn(&self.window, self.upcast(), |element, _| {
-                element.is::<HTMLScriptElement>()
-            })
+            HTMLCollection::new_with_filter_fn(
+                &self.window,
+                self.upcast(),
+                |element, _| element.is::<HTMLScriptElement>(),
+                can_gc,
+            )
         })
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-anchors
-    fn Anchors(&self) -> DomRoot<HTMLCollection> {
+    fn Anchors(&self, can_gc: CanGc) -> DomRoot<HTMLCollection> {
         self.anchors.or_init(|| {
-            HTMLCollection::new_with_filter_fn(&self.window, self.upcast(), |element, _| {
-                element.is::<HTMLAnchorElement>() && element.has_attribute(&local_name!("href"))
-            })
+            HTMLCollection::new_with_filter_fn(
+                &self.window,
+                self.upcast(),
+                |element, _| {
+                    element.is::<HTMLAnchorElement>() && element.has_attribute(&local_name!("href"))
+                },
+                can_gc,
+            )
         })
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-applets
-    fn Applets(&self) -> DomRoot<HTMLCollection> {
+    fn Applets(&self, can_gc: CanGc) -> DomRoot<HTMLCollection> {
         self.applets
-            .or_init(|| HTMLCollection::always_empty(&self.window, self.upcast()))
+            .or_init(|| HTMLCollection::always_empty(&self.window, self.upcast(), can_gc))
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-location
@@ -5574,8 +6076,8 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
     }
 
     // https://dom.spec.whatwg.org/#dom-parentnode-children
-    fn Children(&self) -> DomRoot<HTMLCollection> {
-        HTMLCollection::children(&self.window, self.upcast())
+    fn Children(&self, can_gc: CanGc) -> DomRoot<HTMLCollection> {
+        HTMLCollection::children(&self.window, self.upcast(), can_gc)
     }
 
     // https://dom.spec.whatwg.org/#dom-parentnode-firstelementchild
@@ -5767,6 +6269,7 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
             self.window(),
             self.upcast(),
             Box::new(DocumentNamedGetter { name }),
+            CanGc::note(),
         );
         Some(NamedPropertyValue::HTMLCollection(collection))
     }
@@ -5887,6 +6390,30 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
         )
     }
 
+    /// <https://drafts.csswg.org/cssom-view/#dom-document-scrollingelement>
+    fn GetScrollingElement(&self, can_gc: CanGc) -> Option<DomRoot<Element>> {
+        // Step 1. If the Document is in quirks mode, follow these steps:
+        if self.quirks_mode() == QuirksMode::Quirks {
+            // Step 1.1. If the body element exists,
+            if let Some(ref body) = self.GetBody() {
+                let e = body.upcast::<Element>();
+                // and it is not potentially scrollable, return the body element and abort these steps.
+                // For this purpose, a value of overflow:clip on the the body element’s parent element
+                // must be treated as overflow:hidden.
+                if !e.is_potentially_scrollable_body_for_scrolling_element(can_gc) {
+                    return Some(DomRoot::from_ref(e));
+                }
+            }
+
+            // Step 1.2. Return null and abort these steps.
+            return None;
+        }
+
+        // Step 2. If there is a root element, return the root element and abort these steps.
+        // Step 3. Return null.
+        self.GetDocumentElement()
+    }
+
     // https://html.spec.whatwg.org/multipage/#dom-document-open
     fn Open(
         &self,
@@ -5957,7 +6484,7 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
         }
 
         // Step 11. Replace all with null within document.
-        Node::replace_all(None, self.upcast::<Node>());
+        Node::replace_all(None, self.upcast::<Node>(), can_gc);
 
         // Specs and tests are in a state of flux about whether
         // we want to clear the selection when we remove the contents;
@@ -6024,54 +6551,17 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-write
-    fn Write(&self, text: Vec<DOMString>, can_gc: CanGc) -> ErrorResult {
-        if !self.is_html_document() {
-            // Step 1.
-            return Err(Error::InvalidState);
-        }
-
-        // Step 2.
-        if self.throw_on_dynamic_markup_insertion_counter.get() > 0 {
-            return Err(Error::InvalidState);
-        }
-
-        // Step 3 - what specifies the is_active() part here?
-        if !self.is_active() || self.active_parser_was_aborted.get() {
-            return Ok(());
-        }
-
-        let parser = match self.get_current_parser() {
-            Some(ref parser) if parser.can_write() => DomRoot::from_ref(&**parser),
-            _ => {
-                // Either there is no parser, which means the parsing ended;
-                // or script nesting level is 0, which means the method was
-                // called from outside a parser-executed script.
-                if self.is_prompting_or_unloading() ||
-                    self.ignore_destructive_writes_counter.get() > 0
-                {
-                    // Step 4.
-                    return Ok(());
-                }
-                // Step 5.
-                self.Open(None, None, can_gc)?;
-                self.get_current_parser().unwrap()
-            },
-        };
-
-        // Step 7.
-        // TODO: handle reload override buffer.
-
-        // Steps 6-8.
-        parser.write(text, can_gc);
-
-        // Step 9.
-        Ok(())
+    fn Write(&self, text: Vec<TrustedHTMLOrString>, can_gc: CanGc) -> ErrorResult {
+        // The document.write(...text) method steps are to run the document write steps
+        // with this, text, false, and "Document write".
+        self.write(text, false, "Document", "write", can_gc)
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-writeln
-    fn Writeln(&self, mut text: Vec<DOMString>, can_gc: CanGc) -> ErrorResult {
-        text.push("\n".into());
-        self.Write(text, can_gc)
+    fn Writeln(&self, text: Vec<TrustedHTMLOrString>, can_gc: CanGc) -> ErrorResult {
+        // The document.writeln(...text) method steps are to run the document write steps
+        // with this, text, true, and "Document writeln".
+        self.write(text, true, "Document", "writeln", can_gc)
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-close
@@ -6100,9 +6590,6 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
         Ok(())
     }
 
-    // https://html.spec.whatwg.org/multipage/#documentandelementeventhandlers
-    document_and_element_event_handlers!();
-
     // https://fullscreen.spec.whatwg.org/#handler-document-onfullscreenerror
     event_handler!(fullscreenerror, GetOnfullscreenerror, SetOnfullscreenerror);
 
@@ -6145,12 +6632,9 @@ impl DocumentMethods<crate::DomTypeHolder> for Document {
     }
 
     // https://w3c.github.io/selection-api/#dom-document-getselection
-    fn GetSelection(&self) -> Option<DomRoot<Selection>> {
+    fn GetSelection(&self, can_gc: CanGc) -> Option<DomRoot<Selection>> {
         if self.has_browsing_context {
-            Some(
-                self.selection
-                    .or_init(|| Selection::new(self, CanGc::note())),
-            )
+            Some(self.selection.or_init(|| Selection::new(self, can_gc)))
         } else {
             None
         }
@@ -6248,6 +6732,17 @@ pub(crate) enum FocusType {
     Parent,  // Focusing a parent element (an iframe)
 }
 
+/// Specifies the initiator of a focus operation.
+#[derive(Clone, Copy, PartialEq)]
+pub enum FocusInitiator {
+    /// The operation is initiated by this document and to be broadcasted
+    /// through the constellation.
+    Local,
+    /// The operation is initiated somewhere else, and we are updating our
+    /// internal state accordingly.
+    Remote,
+}
+
 /// Focus events
 pub(crate) enum FocusEventType {
     Focus, // Element gained focus. Doesn't bubble.
@@ -6271,10 +6766,7 @@ impl FakeRequestAnimationFrameCallback {
     pub(crate) fn invoke(self, can_gc: CanGc) {
         // TODO: Once there is a more generic mechanism to trigger `update_the_rendering` when
         // not driven by the compositor, it should be used here.
-        self.document
-            .root()
-            .note_pending_animation_tick(AnimationTickType::REQUEST_ANIMATION_FRAME);
-        with_script_thread(|script_thread| script_thread.update_the_rendering(false, can_gc))
+        with_script_thread(|script_thread| script_thread.update_the_rendering(true, can_gc))
     }
 }
 
@@ -6410,11 +6902,7 @@ fn is_named_element_with_id_attribute(elem: &Element) -> bool {
     elem.is::<HTMLImageElement>() && elem.get_name().is_some_and(|name| !name.is_empty())
 }
 
-pub(crate) trait DocumentHelpers<D: DomTypes> {
-    fn ensure_safe_to_run_script_or_layout(&self);
-}
-
-impl DocumentHelpers<crate::DomTypeHolder> for Document {
+impl DocumentHelpers for Document {
     fn ensure_safe_to_run_script_or_layout(&self) {
         Document::ensure_safe_to_run_script_or_layout(self)
     }
diff --git a/components/script/dom/documentfragment.rs b/components/script/dom/documentfragment.rs
index 6a68ac4a36c..1be80d16f39 100644
--- a/components/script/dom/documentfragment.rs
+++ b/components/script/dom/documentfragment.rs
@@ -76,9 +76,9 @@ impl DocumentFragmentMethods<crate::DomTypeHolder> for DocumentFragment {
     }
 
     // https://dom.spec.whatwg.org/#dom-parentnode-children
-    fn Children(&self) -> DomRoot<HTMLCollection> {
+    fn Children(&self, can_gc: CanGc) -> DomRoot<HTMLCollection> {
         let window = self.owner_window();
-        HTMLCollection::children(&window, self.upcast())
+        HTMLCollection::children(&window, self.upcast(), can_gc)
     }
 
     // https://dom.spec.whatwg.org/#dom-nonelementparentnode-getelementbyid
diff --git a/components/script/dom/documentorshadowroot.rs b/components/script/dom/documentorshadowroot.rs
index ac9140e65c4..e3b09924689 100644
--- a/components/script/dom/documentorshadowroot.rs
+++ b/components/script/dom/documentorshadowroot.rs
@@ -4,7 +4,7 @@
 
 use std::fmt;
 
-use constellation_traits::UntrustedNodeAddress;
+use embedder_traits::UntrustedNodeAddress;
 use euclid::default::Point2D;
 use script_layout_interface::{NodesFromPointQueryType, QueryMsg};
 use servo_arc::Arc;
@@ -128,7 +128,7 @@ impl DocumentOrShadowRoot {
         let x = *x as f32;
         let y = *y as f32;
         let point = &Point2D::new(x, y);
-        let viewport = self.window.window_size().initial_viewport;
+        let viewport = self.window.viewport_details().size;
 
         if !has_browsing_context {
             return None;
@@ -176,7 +176,7 @@ impl DocumentOrShadowRoot {
         let x = *x as f32;
         let y = *y as f32;
         let point = &Point2D::new(x, y);
-        let viewport = self.window.window_size().initial_viewport;
+        let viewport = self.window.viewport_details().size;
 
         if !has_browsing_context {
             return vec![];
diff --git a/components/script/dom/documenttype.rs b/components/script/dom/documenttype.rs
index a2382e4faa7..e10a214814a 100644
--- a/components/script/dom/documenttype.rs
+++ b/components/script/dom/documenttype.rs
@@ -103,7 +103,7 @@ impl DocumentTypeMethods<crate::DomTypeHolder> for DocumentType {
     }
 
     // https://dom.spec.whatwg.org/#dom-childnode-remove
-    fn Remove(&self) {
-        self.upcast::<Node>().remove_self();
+    fn Remove(&self, can_gc: CanGc) {
+        self.upcast::<Node>().remove_self(can_gc);
     }
 }
diff --git a/components/script/dom/domexception.rs b/components/script/dom/domexception.rs
index 6a2ec644e5d..fbb807b7a95 100644
--- a/components/script/dom/domexception.rs
+++ b/components/script/dom/domexception.rs
@@ -2,6 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use std::collections::HashMap;
+
+use base::id::{DomExceptionId, DomExceptionIndex};
+use constellation_traits::DomException;
 use dom_struct::dom_struct;
 use js::rust::HandleObject;
 
@@ -13,7 +17,9 @@ use crate::dom::bindings::reflector::{
     Reflector, reflect_dom_object, reflect_dom_object_with_proto,
 };
 use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::serializable::Serializable;
 use crate::dom::bindings::str::DOMString;
+use crate::dom::bindings::structuredclone::StructuredData;
 use crate::dom::globalscope::GlobalScope;
 use crate::script_runtime::CanGc;
 
@@ -47,6 +53,7 @@ pub(crate) enum DOMErrorName {
     NotReadableError,
     DataError,
     OperationError,
+    NotAllowedError,
 }
 
 impl DOMErrorName {
@@ -78,6 +85,7 @@ impl DOMErrorName {
             "NotReadableError" => Some(DOMErrorName::NotReadableError),
             "DataError" => Some(DOMErrorName::DataError),
             "OperationError" => Some(DOMErrorName::OperationError),
+            "NotAllowedError" => Some(DOMErrorName::NotAllowedError),
             _ => None,
         }
     }
@@ -129,6 +137,10 @@ impl DOMException {
             DOMErrorName::OperationError => {
                 "The operation failed for an operation-specific reason."
             },
+            DOMErrorName::NotAllowedError => {
+                r#"The request is not allowed by the user agent or the platform in the current context,
+                possibly because the user denied permission."#
+            },
         };
 
         (
@@ -159,6 +171,21 @@ impl DOMException {
         )
     }
 
+    pub(crate) fn new_with_custom_message(
+        global: &GlobalScope,
+        code: DOMErrorName,
+        message: String,
+        can_gc: CanGc,
+    ) -> DomRoot<DOMException> {
+        let (_, name) = DOMException::get_error_data_by_code(code);
+
+        reflect_dom_object(
+            Box::new(DOMException::new_inherited(DOMString::from(message), name)),
+            global,
+            can_gc,
+        )
+    }
+
     // not an IDL stringifier, used internally
     pub(crate) fn stringifier(&self) -> DOMString {
         DOMString::from(format!("{}: {}", self.name, self.message))
@@ -200,3 +227,43 @@ impl DOMExceptionMethods<crate::DomTypeHolder> for DOMException {
         self.message.clone()
     }
 }
+
+impl Serializable for DOMException {
+    type Index = DomExceptionIndex;
+    type Data = DomException;
+
+    // https://webidl.spec.whatwg.org/#idl-DOMException
+    fn serialize(&self) -> Result<(DomExceptionId, Self::Data), ()> {
+        let serialized = DomException {
+            message: self.message.to_string(),
+            name: self.name.to_string(),
+        };
+        Ok((DomExceptionId::new(), serialized))
+    }
+
+    // https://webidl.spec.whatwg.org/#idl-DOMException
+    fn deserialize(
+        owner: &GlobalScope,
+        serialized: Self::Data,
+        can_gc: CanGc,
+    ) -> Result<DomRoot<Self>, ()>
+    where
+        Self: Sized,
+    {
+        Ok(Self::new_with_custom_message(
+            owner,
+            DOMErrorName::from(&DOMString::from_string(serialized.name)).ok_or(())?,
+            serialized.message,
+            can_gc,
+        ))
+    }
+
+    fn serialized_storage<'a>(
+        data: StructuredData<'a, '_>,
+    ) -> &'a mut Option<HashMap<DomExceptionId, Self::Data>> {
+        match data {
+            StructuredData::Reader(reader) => &mut reader.exceptions,
+            StructuredData::Writer(writer) => &mut writer.exceptions,
+        }
+    }
+}
diff --git a/components/script/dom/domimplementation.rs b/components/script/dom/domimplementation.rs
index 09916e9a4dc..a6c95fad820 100644
--- a/components/script/dom/domimplementation.rs
+++ b/components/script/dom/domimplementation.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use html5ever::{local_name, namespace_url, ns};
+use html5ever::{local_name, ns};
 use script_traits::DocumentActivity;
 
 use crate::document_loader::DocumentLoader;
@@ -92,10 +92,12 @@ impl DOMImplementationMethods<crate::DomTypeHolder> for DOMImplementation {
         let namespace = namespace_from_domstring(maybe_namespace.to_owned());
 
         let content_type = match namespace {
-            ns!(html) => "application/xhtml+xml".parse().unwrap(),
-            ns!(svg) => mime::IMAGE_SVG,
-            _ => "application/xml".parse().unwrap(),
-        };
+            ns!(html) => "application/xhtml+xml",
+            ns!(svg) => "image/svg+xml",
+            _ => "application/xml",
+        }
+        .parse()
+        .unwrap();
 
         // Step 1.
         let doc = XMLDocument::new(
@@ -110,6 +112,7 @@ impl DOMImplementationMethods<crate::DomTypeHolder> for DOMImplementation {
             DocumentSource::NotFromParser,
             loader,
             Some(self.document.insecure_requests_policy()),
+            self.document.has_trustworthy_ancestor_or_current_origin(),
             can_gc,
         );
 
@@ -137,12 +140,12 @@ impl DOMImplementationMethods<crate::DomTypeHolder> for DOMImplementation {
 
             // Step 4.
             if let Some(doc_type) = maybe_doctype {
-                doc_node.AppendChild(doc_type.upcast()).unwrap();
+                doc_node.AppendChild(doc_type.upcast(), can_gc).unwrap();
             }
 
             // Step 5.
             if let Some(ref elem) = maybe_elem {
-                doc_node.AppendChild(elem.upcast()).unwrap();
+                doc_node.AppendChild(elem.upcast(), can_gc).unwrap();
             }
         }
 
@@ -176,6 +179,7 @@ impl DOMImplementationMethods<crate::DomTypeHolder> for DOMImplementation {
             false,
             self.document.allow_declarative_shadow_roots(),
             Some(self.document.insecure_requests_policy()),
+            self.document.has_trustworthy_ancestor_or_current_origin(),
             can_gc,
         );
 
@@ -183,7 +187,7 @@ impl DOMImplementationMethods<crate::DomTypeHolder> for DOMImplementation {
             // Step 3.
             let doc_node = doc.upcast::<Node>();
             let doc_type = DocumentType::new(DOMString::from("html"), None, None, &doc, can_gc);
-            doc_node.AppendChild(doc_type.upcast()).unwrap();
+            doc_node.AppendChild(doc_type.upcast(), can_gc).unwrap();
         }
 
         {
@@ -196,7 +200,9 @@ impl DOMImplementationMethods<crate::DomTypeHolder> for DOMImplementation {
                 None,
                 can_gc,
             ));
-            doc_node.AppendChild(&doc_html).expect("Appending failed");
+            doc_node
+                .AppendChild(&doc_html, can_gc)
+                .expect("Appending failed");
 
             {
                 // Step 5.
@@ -207,7 +213,7 @@ impl DOMImplementationMethods<crate::DomTypeHolder> for DOMImplementation {
                     None,
                     can_gc,
                 ));
-                doc_html.AppendChild(&doc_head).unwrap();
+                doc_html.AppendChild(&doc_head, can_gc).unwrap();
 
                 // Step 6.
                 if let Some(title_str) = title {
@@ -219,17 +225,17 @@ impl DOMImplementationMethods<crate::DomTypeHolder> for DOMImplementation {
                         None,
                         can_gc,
                     ));
-                    doc_head.AppendChild(&doc_title).unwrap();
+                    doc_head.AppendChild(&doc_title, can_gc).unwrap();
 
                     // Step 6.2.
                     let title_text = Text::new(title_str, &doc, can_gc);
-                    doc_title.AppendChild(title_text.upcast()).unwrap();
+                    doc_title.AppendChild(title_text.upcast(), can_gc).unwrap();
                 }
             }
 
             // Step 7.
             let doc_body = HTMLBodyElement::new(local_name!("body"), None, &doc, None, can_gc);
-            doc_html.AppendChild(doc_body.upcast()).unwrap();
+            doc_html.AppendChild(doc_body.upcast(), can_gc).unwrap();
         }
 
         // Step 8.
diff --git a/components/script/dom/domparser.rs b/components/script/dom/domparser.rs
index 42782420bda..85d7cd0870f 100644
--- a/components/script/dom/domparser.rs
+++ b/components/script/dom/domparser.rs
@@ -90,6 +90,7 @@ impl DOMParserMethods<crate::DomTypeHolder> for DOMParser {
                     false,
                     false,
                     Some(doc.insecure_requests_policy()),
+                    doc.has_trustworthy_ancestor_or_current_origin(),
                     can_gc,
                 );
                 ServoParser::parse_html_document(&document, Some(s), url, can_gc);
@@ -114,6 +115,7 @@ impl DOMParserMethods<crate::DomTypeHolder> for DOMParser {
                     false,
                     false,
                     Some(doc.insecure_requests_policy()),
+                    doc.has_trustworthy_ancestor_or_current_origin(),
                     can_gc,
                 );
                 ServoParser::parse_xml_document(&document, Some(s), url, can_gc);
diff --git a/components/script/dom/dompoint.rs b/components/script/dom/dompoint.rs
index 84b02e6f4c4..5e848c43c47 100644
--- a/components/script/dom/dompoint.rs
+++ b/components/script/dom/dompoint.rs
@@ -4,18 +4,18 @@
 
 use std::collections::HashMap;
 
-use base::id::DomPointId;
+use base::id::{DomPointId, DomPointIndex};
+use constellation_traits::DomPoint;
 use dom_struct::dom_struct;
 use js::rust::HandleObject;
-use script_traits::serializable::DomPoint;
 
 use crate::dom::bindings::codegen::Bindings::DOMPointBinding::{DOMPointInit, DOMPointMethods};
 use crate::dom::bindings::codegen::Bindings::DOMPointReadOnlyBinding::DOMPointReadOnlyMethods;
 use crate::dom::bindings::error::Fallible;
 use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::DomRoot;
-use crate::dom::bindings::serializable::{Serializable, StorageKey};
-use crate::dom::bindings::structuredclone::{StructuredData, StructuredDataReader};
+use crate::dom::bindings::serializable::Serializable;
+use crate::dom::bindings::structuredclone::StructuredData;
 use crate::dom::dompointreadonly::{DOMPointReadOnly, DOMPointWriteMethods};
 use crate::dom::globalscope::GlobalScope;
 use crate::script_runtime::CanGc;
@@ -132,10 +132,10 @@ impl DOMPointMethods<crate::DomTypeHolder> for DOMPoint {
 }
 
 impl Serializable for DOMPoint {
-    type Id = DomPointId;
+    type Index = DomPointIndex;
     type Data = DomPoint;
 
-    fn serialize(&self) -> Result<(Self::Id, Self::Data), ()> {
+    fn serialize(&self) -> Result<(DomPointId, Self::Data), ()> {
         let serialized = DomPoint {
             x: self.X(),
             y: self.Y(),
@@ -163,16 +163,12 @@ impl Serializable for DOMPoint {
         ))
     }
 
-    fn serialized_storage(data: StructuredData<'_>) -> &mut Option<HashMap<Self::Id, Self::Data>> {
+    fn serialized_storage<'a>(
+        data: StructuredData<'a, '_>,
+    ) -> &'a mut Option<HashMap<DomPointId, Self::Data>> {
         match data {
             StructuredData::Reader(reader) => &mut reader.points,
             StructuredData::Writer(writer) => &mut writer.points,
         }
     }
-
-    fn deserialized_storage(
-        reader: &mut StructuredDataReader,
-    ) -> &mut Option<HashMap<StorageKey, DomRoot<Self>>> {
-        &mut reader.dom_points
-    }
 }
diff --git a/components/script/dom/dompointreadonly.rs b/components/script/dom/dompointreadonly.rs
index fed82bd9055..eb6bc9b93a9 100644
--- a/components/script/dom/dompointreadonly.rs
+++ b/components/script/dom/dompointreadonly.rs
@@ -4,20 +4,19 @@
 
 use std::cell::Cell;
 use std::collections::HashMap;
-use std::num::NonZeroU32;
 
-use base::id::{DomPointId, DomPointIndex, PipelineNamespaceId};
+use base::id::{DomPointId, DomPointIndex};
+use constellation_traits::DomPoint;
 use dom_struct::dom_struct;
 use js::rust::HandleObject;
-use script_traits::serializable::DomPoint;
 
 use crate::dom::bindings::codegen::Bindings::DOMPointBinding::DOMPointInit;
 use crate::dom::bindings::codegen::Bindings::DOMPointReadOnlyBinding::DOMPointReadOnlyMethods;
 use crate::dom::bindings::error::Fallible;
 use crate::dom::bindings::reflector::{Reflector, reflect_dom_object_with_proto};
 use crate::dom::bindings::root::DomRoot;
-use crate::dom::bindings::serializable::{IntoStorageKey, Serializable, StorageKey};
-use crate::dom::bindings::structuredclone::{StructuredData, StructuredDataReader};
+use crate::dom::bindings::serializable::Serializable;
+use crate::dom::bindings::structuredclone::StructuredData;
 use crate::dom::globalscope::GlobalScope;
 use crate::script_runtime::CanGc;
 
@@ -142,10 +141,10 @@ impl DOMPointWriteMethods for DOMPointReadOnly {
 }
 
 impl Serializable for DOMPointReadOnly {
-    type Id = DomPointId;
+    type Index = DomPointIndex;
     type Data = DomPoint;
 
-    fn serialize(&self) -> Result<(Self::Id, Self::Data), ()> {
+    fn serialize(&self) -> Result<(DomPointId, Self::Data), ()> {
         let serialized = DomPoint {
             x: self.x.get(),
             y: self.y.get(),
@@ -173,37 +172,12 @@ impl Serializable for DOMPointReadOnly {
         ))
     }
 
-    fn serialized_storage(data: StructuredData<'_>) -> &mut Option<HashMap<Self::Id, Self::Data>> {
+    fn serialized_storage<'a>(
+        data: StructuredData<'a, '_>,
+    ) -> &'a mut Option<HashMap<DomPointId, Self::Data>> {
         match data {
             StructuredData::Reader(r) => &mut r.points,
             StructuredData::Writer(w) => &mut w.points,
         }
     }
-
-    fn deserialized_storage(
-        reader: &mut StructuredDataReader,
-    ) -> &mut Option<HashMap<StorageKey, DomRoot<Self>>> {
-        &mut reader.points_read_only
-    }
-}
-
-impl From<StorageKey> for DomPointId {
-    fn from(storage_key: StorageKey) -> DomPointId {
-        let namespace_id = PipelineNamespaceId(storage_key.name_space);
-        let index = DomPointIndex(
-            NonZeroU32::new(storage_key.index).expect("Deserialized point index is zero"),
-        );
-
-        DomPointId {
-            namespace_id,
-            index,
-        }
-    }
-}
-
-impl IntoStorageKey for DomPointId {
-    fn into_storage_key(self) -> StorageKey {
-        let DomPointIndex(index) = self.index;
-        StorageKey::new(self.namespace_id, index)
-    }
 }
diff --git a/components/script/dom/domrect.rs b/components/script/dom/domrect.rs
index e595065d3c0..632d2846e1c 100644
--- a/components/script/dom/domrect.rs
+++ b/components/script/dom/domrect.rs
@@ -75,10 +75,10 @@ impl DOMRectMethods<crate::DomTypeHolder> for DOMRect {
 
     // https://drafts.fxtf.org/geometry/#dom-domrect-fromrect
     #[cfg_attr(crown, allow(crown::unrooted_must_root))]
-    fn FromRect(global: &GlobalScope, other: &DOMRectInit) -> DomRoot<DOMRect> {
+    fn FromRect(global: &GlobalScope, other: &DOMRectInit, can_gc: CanGc) -> DomRoot<DOMRect> {
         let rect = create_a_domrectreadonly_from_the_dictionary(other);
 
-        reflect_dom_object(Box::new(Self { rect }), global, CanGc::note())
+        reflect_dom_object(Box::new(Self { rect }), global, can_gc)
     }
 
     // https://drafts.fxtf.org/geometry/#dom-domrect-x
diff --git a/components/script/dom/domrectlist.rs b/components/script/dom/domrectlist.rs
index de130e0c972..d3911951899 100644
--- a/components/script/dom/domrectlist.rs
+++ b/components/script/dom/domrectlist.rs
@@ -5,7 +5,7 @@ use dom_struct::dom_struct;
 
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::DOMRectListBinding::DOMRectListMethods;
-use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::{Reflector, reflect_dom_object_with_proto};
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::domrect::DOMRect;
 use crate::dom::window::Window;
@@ -37,7 +37,7 @@ impl DOMRectList {
     ) -> DomRoot<DOMRectList> {
         reflect_dom_object_with_proto(
             Box::new(DOMRectList::new_inherited(rects)),
-            &*window.global(),
+            window,
             None,
             can_gc,
         )
diff --git a/components/script/dom/domrectreadonly.rs b/components/script/dom/domrectreadonly.rs
index 1034c049df7..a7efa5725bb 100644
--- a/components/script/dom/domrectreadonly.rs
+++ b/components/script/dom/domrectreadonly.rs
@@ -104,10 +104,14 @@ impl DOMRectReadOnlyMethods<crate::DomTypeHolder> for DOMRectReadOnly {
 
     // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-fromrect
     #[cfg_attr(crown, allow(crown::unrooted_must_root))]
-    fn FromRect(global: &GlobalScope, other: &DOMRectInit) -> DomRoot<DOMRectReadOnly> {
+    fn FromRect(
+        global: &GlobalScope,
+        other: &DOMRectInit,
+        can_gc: CanGc,
+    ) -> DomRoot<DOMRectReadOnly> {
         let dom_rect = create_a_domrectreadonly_from_the_dictionary(other);
 
-        reflect_dom_object(Box::new(dom_rect), global, CanGc::note())
+        reflect_dom_object(Box::new(dom_rect), global, can_gc)
     }
 
     // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-x
diff --git a/components/script/dom/domstringmap.rs b/components/script/dom/domstringmap.rs
index 710a77305d4..5c89bc7c1a9 100644
--- a/components/script/dom/domstringmap.rs
+++ b/components/script/dom/domstringmap.rs
@@ -39,8 +39,8 @@ impl DOMStringMap {
 // https://html.spec.whatwg.org/multipage/#domstringmap
 impl DOMStringMapMethods<crate::DomTypeHolder> for DOMStringMap {
     // https://html.spec.whatwg.org/multipage/#dom-domstringmap-removeitem
-    fn NamedDeleter(&self, name: DOMString) {
-        self.element.delete_custom_attr(name)
+    fn NamedDeleter(&self, name: DOMString, can_gc: CanGc) {
+        self.element.delete_custom_attr(name, can_gc)
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-domstringmap-setitem
diff --git a/components/script/dom/domtokenlist.rs b/components/script/dom/domtokenlist.rs
index 8d479aba80d..83c3d09be23 100644
--- a/components/script/dom/domtokenlist.rs
+++ b/components/script/dom/domtokenlist.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, namespace_url, ns};
+use html5ever::{LocalName, ns};
 use style::str::HTML_SPACE_CHARACTERS;
 use stylo_atoms::Atom;
 
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index 99e686eaaa1..ed58548a3e5 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -12,6 +12,7 @@ use std::rc::Rc;
 use std::str::FromStr;
 use std::{fmt, mem};
 
+use content_security_policy as csp;
 use cssparser::match_ignore_ascii_case;
 use devtools_traits::AttrInfo;
 use dom_struct::dom_struct;
@@ -19,9 +20,7 @@ use embedder_traits::InputMethodType;
 use euclid::default::{Rect, Size2D};
 use html5ever::serialize::TraversalScope;
 use html5ever::serialize::TraversalScope::{ChildrenOnly, IncludeNode};
-use html5ever::{
-    LocalName, Namespace, Prefix, QualName, local_name, namespace_prefix, namespace_url, ns,
-};
+use html5ever::{LocalName, Namespace, Prefix, QualName, local_name, namespace_prefix, ns};
 use js::jsapi::Heap;
 use js::jsval::JSVal;
 use js::rust::HandleObject;
@@ -52,6 +51,7 @@ use style::selector_parser::{
 use style::shared_lock::{Locked, SharedRwLock};
 use style::stylesheets::layer_rule::LayerOrder;
 use style::stylesheets::{CssRuleType, UrlExtraData};
+use style::values::computed::Overflow;
 use style::values::generics::NonNegative;
 use style::values::generics::position::PreferredRatio;
 use style::values::generics::ratio::Ratio;
@@ -63,8 +63,9 @@ use xml5ever::serialize::TraversalScope::{
     ChildrenOnly as XmlChildrenOnly, IncludeNode as XmlIncludeNode,
 };
 
+use crate::conversions::Convert;
 use crate::dom::activation::Activatable;
-use crate::dom::attr::{Attr, AttrHelpersForLayout};
+use crate::dom::attr::{Attr, AttrHelpersForLayout, is_relevant_attribute};
 use crate::dom::bindings::cell::{DomRefCell, Ref, RefMut, ref_filter_map};
 use crate::dom::bindings::codegen::Bindings::AttrBinding::AttrMethods;
 use crate::dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
@@ -80,7 +81,9 @@ use crate::dom::bindings::codegen::Bindings::ShadowRootBinding::{
 use crate::dom::bindings::codegen::Bindings::WindowBinding::{
     ScrollBehavior, ScrollToOptions, WindowMethods,
 };
-use crate::dom::bindings::codegen::UnionTypes::NodeOrString;
+use crate::dom::bindings::codegen::UnionTypes::{
+    NodeOrString, TrustedHTMLOrNullIsEmptyString, TrustedHTMLOrString, TrustedScriptURLOrUSVString,
+};
 use crate::dom::bindings::conversions::DerivedFrom;
 use crate::dom::bindings::error::{Error, ErrorResult, Fallible};
 use crate::dom::bindings::inheritance::{Castable, ElementTypeId, HTMLElementTypeId, NodeTypeId};
@@ -125,6 +128,7 @@ use crate::dom::htmllinkelement::HTMLLinkElement;
 use crate::dom::htmlobjectelement::HTMLObjectElement;
 use crate::dom::htmloptgroupelement::HTMLOptGroupElement;
 use crate::dom::htmloutputelement::HTMLOutputElement;
+use crate::dom::htmlscriptelement::HTMLScriptElement;
 use crate::dom::htmlselectelement::HTMLSelectElement;
 use crate::dom::htmlslotelement::{HTMLSlotElement, Slottable};
 use crate::dom::htmlstyleelement::HTMLStyleElement;
@@ -142,8 +146,8 @@ use crate::dom::intersectionobserver::{IntersectionObserver, IntersectionObserve
 use crate::dom::mutationobserver::{Mutation, MutationObserver};
 use crate::dom::namednodemap::NamedNodeMap;
 use crate::dom::node::{
-    BindContext, ChildrenMutation, LayoutNodeHelpers, Node, NodeDamage, NodeFlags, NodeTraits,
-    ShadowIncluding, UnbindContext,
+    BindContext, ChildrenMutation, CloneChildrenFlag, LayoutNodeHelpers, Node, NodeDamage,
+    NodeFlags, NodeTraits, ShadowIncluding, UnbindContext,
 };
 use crate::dom::nodelist::NodeList;
 use crate::dom::promise::Promise;
@@ -151,6 +155,7 @@ use crate::dom::raredata::ElementRareData;
 use crate::dom::servoparser::ServoParser;
 use crate::dom::shadowroot::{IsUserAgentWidget, ShadowRoot};
 use crate::dom::text::Text;
+use crate::dom::trustedhtml::TrustedHTML;
 use crate::dom::validation::Validatable;
 use crate::dom::validitystate::ValidationFlags;
 use crate::dom::virtualmethods::{VirtualMethods, vtable_for};
@@ -180,7 +185,7 @@ pub struct Element {
     /// <https://dom.spec.whatwg.org/#concept-element-is-value>
     #[no_trace]
     is: DomRefCell<Option<LocalName>>,
-    #[ignore_malloc_size_of = "Arc"]
+    #[conditional_malloc_size_of]
     #[no_trace]
     style_attribute: DomRefCell<Option<Arc<Locked<PropertyDeclarationBlock>>>>,
     attr_list: MutNullableDom<NamedNodeMap>,
@@ -328,7 +333,21 @@ impl Element {
         )
     }
 
-    impl_rare_data!(ElementRareData);
+    fn rare_data(&self) -> Ref<Option<Box<ElementRareData>>> {
+        self.rare_data.borrow()
+    }
+
+    fn rare_data_mut(&self) -> RefMut<Option<Box<ElementRareData>>> {
+        self.rare_data.borrow_mut()
+    }
+
+    fn ensure_rare_data(&self) -> RefMut<Box<ElementRareData>> {
+        let mut rare_data = self.rare_data.borrow_mut();
+        if rare_data.is_none() {
+            *rare_data = Some(Default::default());
+        }
+        RefMut::map(rare_data, |rare_data| rare_data.as_mut().unwrap())
+    }
 
     pub(crate) fn restyle(&self, damage: NodeDamage) {
         let doc = self.node.owner_doc();
@@ -340,7 +359,7 @@ impl Element {
 
         if damage == NodeDamage::OtherNodeDamage {
             doc.note_node_with_dirty_descendants(self.upcast());
-            restyle.damage = RestyleDamage::rebuild_and_reflow();
+            restyle.damage = RestyleDamage::reconstruct();
         }
     }
 
@@ -443,8 +462,25 @@ impl Element {
             .is_some_and(|s| !s.get_box().clone_display().is_none())
     }
 
-    // https://drafts.csswg.org/cssom-view/#potentially-scrollable
-    fn is_potentially_scrollable_body(&self, can_gc: CanGc) -> bool {
+    /// <https://drafts.csswg.org/cssom-view/#potentially-scrollable>
+    pub(crate) fn is_potentially_scrollable_body(&self, can_gc: CanGc) -> bool {
+        self.is_potentially_scrollable_body_shared_logic(false, can_gc)
+    }
+
+    /// <https://drafts.csswg.org/cssom-view/#potentially-scrollable>
+    pub(crate) fn is_potentially_scrollable_body_for_scrolling_element(
+        &self,
+        can_gc: CanGc,
+    ) -> bool {
+        self.is_potentially_scrollable_body_shared_logic(true, can_gc)
+    }
+
+    /// <https://drafts.csswg.org/cssom-view/#potentially-scrollable>
+    fn is_potentially_scrollable_body_shared_logic(
+        &self,
+        treat_overflow_clip_on_parent_as_hidden: bool,
+        can_gc: CanGc,
+    ) -> bool {
         let node = self.upcast::<Node>();
         debug_assert!(
             node.owner_doc().GetBody().as_deref() == self.downcast::<HTMLElement>(),
@@ -462,9 +498,21 @@ impl Element {
         //     overflow-y properties is neither visible nor clip."
         if let Some(parent) = node.GetParentElement() {
             if let Some(style) = parent.style(can_gc) {
-                if !style.get_box().clone_overflow_x().is_scrollable() &&
-                    !style.get_box().clone_overflow_y().is_scrollable()
-                {
+                let mut overflow_x = style.get_box().clone_overflow_x();
+                let mut overflow_y = style.get_box().clone_overflow_y();
+
+                // This fulfills the 'treat parent element overflow:clip as overflow:hidden' stipulation
+                // from the document.scrollingElement specification.
+                if treat_overflow_clip_on_parent_as_hidden {
+                    if overflow_x == Overflow::Clip {
+                        overflow_x = Overflow::Hidden;
+                    }
+                    if overflow_y == Overflow::Clip {
+                        overflow_y = Overflow::Hidden;
+                    }
+                }
+
+                if !overflow_x.is_scrollable() && !overflow_y.is_scrollable() {
                     return false;
                 }
             };
@@ -514,7 +562,6 @@ impl Element {
     #[allow(clippy::too_many_arguments)]
     pub(crate) fn attach_shadow(
         &self,
-        // TODO: remove is_ua_widget argument
         is_ua_widget: IsUserAgentWidget,
         mode: ShadowRootMode,
         clonable: bool,
@@ -566,7 +613,7 @@ impl Element {
 
             // Step 4.3.1. Remove all of currentShadowRoot’s children, in tree order.
             for child in current_shadow_root.upcast::<Node>().children() {
-                child.remove_self();
+                child.remove_self(can_gc);
             }
 
             // Step 4.3.2. Set currentShadowRoot’s declarative to false.
@@ -621,7 +668,7 @@ impl Element {
             tree_is_in_a_document_tree: self.upcast::<Node>().is_in_a_document_tree(),
             tree_is_in_a_shadow_tree: true,
         };
-        shadow_root.bind_to_tree(&bind_context);
+        shadow_root.bind_to_tree(&bind_context, can_gc);
 
         let node = self.upcast::<Node>();
         node.dirty(NodeDamage::OtherNodeDamage);
@@ -630,7 +677,7 @@ impl Element {
         Ok(shadow_root)
     }
 
-    pub(crate) fn detach_shadow(&self) {
+    pub(crate) fn detach_shadow(&self, can_gc: CanGc) {
         let Some(ref shadow_root) = self.shadow_root() else {
             unreachable!("Trying to detach a non-attached shadow root");
         };
@@ -639,7 +686,7 @@ impl Element {
         node.note_dirty_descendants();
         node.rev_version();
 
-        shadow_root.detach();
+        shadow_root.detach(can_gc);
         self.ensure_rare_data().shadow_root = None;
     }
 
@@ -1635,10 +1682,10 @@ impl Element {
             Some(self),
             can_gc,
         );
-        self.push_attribute(&attr);
+        self.push_attribute(&attr, can_gc);
     }
 
-    pub(crate) fn push_attribute(&self, attr: &Attr) {
+    pub(crate) fn push_attribute(&self, attr: &Attr, can_gc: CanGc) {
         let name = attr.local_name().clone();
         let namespace = attr.namespace().clone();
         let mutation = LazyCell::new(|| Mutation::Attribute {
@@ -1658,8 +1705,8 @@ impl Element {
         assert!(attr.GetOwnerElement().as_deref() == Some(self));
         self.will_mutate_attr(attr);
         self.attrs.borrow_mut().push(Dom::from_ref(attr));
-        if attr.namespace() == &ns!() {
-            vtable_for(self.upcast()).attribute_mutated(attr, AttributeMutation::Set(None));
+        if is_relevant_attribute(attr.namespace(), attr.local_name()) {
+            vtable_for(self.upcast()).attribute_mutated(attr, AttributeMutation::Set(None), can_gc);
         }
     }
 
@@ -1788,7 +1835,7 @@ impl Element {
             .find(|attr| find(attr))
             .map(|js| DomRoot::from_ref(&**js));
         if let Some(attr) = attr {
-            attr.set_value(value, self);
+            attr.set_value(value, self, can_gc);
         } else {
             self.push_new_attribute(local_name, value, name, namespace, prefix, can_gc);
         };
@@ -1800,7 +1847,7 @@ impl Element {
         local_name: &LocalName,
         value: DOMString,
     ) -> AttrValue {
-        if *namespace == ns!() {
+        if is_relevant_attribute(namespace, local_name) {
             vtable_for(self.upcast()).parse_plain_attribute(local_name, value)
         } else {
             AttrValue::String(value.into())
@@ -1811,17 +1858,23 @@ impl Element {
         &self,
         namespace: &Namespace,
         local_name: &LocalName,
+        can_gc: CanGc,
     ) -> Option<DomRoot<Attr>> {
-        self.remove_first_matching_attribute(|attr| {
-            attr.namespace() == namespace && attr.local_name() == local_name
-        })
+        self.remove_first_matching_attribute(
+            |attr| attr.namespace() == namespace && attr.local_name() == local_name,
+            can_gc,
+        )
     }
 
-    pub(crate) fn remove_attribute_by_name(&self, name: &LocalName) -> Option<DomRoot<Attr>> {
-        self.remove_first_matching_attribute(|attr| attr.name() == name)
+    pub(crate) fn remove_attribute_by_name(
+        &self,
+        name: &LocalName,
+        can_gc: CanGc,
+    ) -> Option<DomRoot<Attr>> {
+        self.remove_first_matching_attribute(|attr| attr.name() == name, can_gc)
     }
 
-    fn remove_first_matching_attribute<F>(&self, find: F) -> Option<DomRoot<Attr>>
+    fn remove_first_matching_attribute<F>(&self, find: F, can_gc: CanGc) -> Option<DomRoot<Attr>>
     where
         F: Fn(&Attr) -> bool,
     {
@@ -1849,8 +1902,12 @@ impl Element {
 
             self.attrs.borrow_mut().remove(idx);
             attr.set_owner(None);
-            if attr.namespace() == &ns!() {
-                vtable_for(self.upcast()).attribute_mutated(&attr, AttributeMutation::Removed);
+            if is_relevant_attribute(attr.namespace(), attr.local_name()) {
+                vtable_for(self.upcast()).attribute_mutated(
+                    &attr,
+                    AttributeMutation::Removed,
+                    can_gc,
+                );
             }
             attr
         })
@@ -1892,7 +1949,7 @@ impl Element {
         if value {
             self.set_string_attribute(local_name, DOMString::new(), can_gc);
         } else {
-            self.remove_attribute(&ns!(), local_name);
+            self.remove_attribute(&ns!(), local_name, can_gc);
         }
     }
 
@@ -1921,6 +1978,33 @@ impl Element {
         self.set_attribute(local_name, AttrValue::String(value.to_string()), can_gc);
     }
 
+    pub(crate) fn get_trusted_type_url_attribute(
+        &self,
+        local_name: &LocalName,
+    ) -> TrustedScriptURLOrUSVString {
+        assert_eq!(*local_name, local_name.to_ascii_lowercase());
+        let attr = match self.get_attribute(&ns!(), local_name) {
+            Some(attr) => attr,
+            None => return TrustedScriptURLOrUSVString::USVString(USVString::default()),
+        };
+        let value = &**attr.value();
+        // XXXManishearth this doesn't handle `javascript:` urls properly
+        self.owner_document()
+            .base_url()
+            .join(value)
+            .map(|parsed| TrustedScriptURLOrUSVString::USVString(USVString(parsed.into_string())))
+            .unwrap_or_else(|_| TrustedScriptURLOrUSVString::USVString(USVString(value.to_owned())))
+    }
+
+    pub(crate) fn get_trusted_html_attribute(&self, local_name: &LocalName) -> TrustedHTMLOrString {
+        assert_eq!(*local_name, local_name.to_ascii_lowercase());
+        let value = match self.get_attribute(&ns!(), local_name) {
+            Some(attr) => (&**attr.value()).into(),
+            None => "".into(),
+        };
+        TrustedHTMLOrString::String(value)
+    }
+
     pub(crate) fn get_string_attribute(&self, local_name: &LocalName) -> DOMString {
         match self.get_attribute(&ns!(), local_name) {
             Some(x) => x.Value(),
@@ -1961,7 +2045,7 @@ impl Element {
                 self.set_string_attribute(local_name, val, can_gc);
             },
             None => {
-                self.remove_attribute(&ns!(), local_name);
+                self.remove_attribute(&ns!(), local_name, can_gc);
             },
         }
     }
@@ -2051,28 +2135,160 @@ impl Element {
         node.owner_doc().element_attr_will_change(self, attr);
     }
 
+    /// <https://html.spec.whatwg.org/multipage/#the-style-attribute>
+    fn update_style_attribute(&self, attr: &Attr, mutation: AttributeMutation) {
+        let doc = self.upcast::<Node>().owner_doc();
+        // Modifying the `style` attribute might change style.
+        *self.style_attribute.borrow_mut() = match mutation {
+            AttributeMutation::Set(..) => {
+                // This is the fast path we use from
+                // CSSStyleDeclaration.
+                //
+                // Juggle a bit to keep the borrow checker happy
+                // while avoiding the extra clone.
+                let is_declaration = matches!(*attr.value(), AttrValue::Declaration(..));
+
+                let block = if is_declaration {
+                    let mut value = AttrValue::String(String::new());
+                    attr.swap_value(&mut value);
+                    let (serialization, block) = match value {
+                        AttrValue::Declaration(s, b) => (s, b),
+                        _ => unreachable!(),
+                    };
+                    let mut value = AttrValue::String(serialization);
+                    attr.swap_value(&mut value);
+                    block
+                } else {
+                    let win = self.owner_window();
+                    let source = &**attr.value();
+                    // However, if the Should element's inline behavior be blocked by
+                    // Content Security Policy? algorithm returns "Blocked" when executed
+                    // upon the attribute's element, "style attribute", and the attribute's value,
+                    // then the style rules defined in the attribute's value must not be applied to the element. [CSP]
+                    if doc.should_elements_inline_type_behavior_be_blocked(
+                        self,
+                        csp::InlineCheckType::StyleAttribute,
+                        source,
+                    ) == csp::CheckResult::Blocked
+                    {
+                        return;
+                    }
+                    Arc::new(doc.style_shared_lock().wrap(parse_style_attribute(
+                        source,
+                        &UrlExtraData(doc.base_url().get_arc()),
+                        win.css_error_reporter(),
+                        doc.quirks_mode(),
+                        CssRuleType::Style,
+                    )))
+                };
+
+                Some(block)
+            },
+            AttributeMutation::Removed => None,
+        };
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#nonce-attributes>
+    pub(crate) fn update_nonce_internal_slot(&self, nonce: String) {
+        self.ensure_rare_data().cryptographic_nonce = nonce;
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#nonce-attributes>
+    pub(crate) fn nonce_value(&self) -> String {
+        match self.rare_data().as_ref() {
+            None => String::new(),
+            Some(rare_data) => rare_data.cryptographic_nonce.clone(),
+        }
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#nonce-attributes>
+    pub(crate) fn update_nonce_post_connection(&self) {
+        // Whenever an element including HTMLOrSVGElement becomes browsing-context connected,
+        // the user agent must execute the following steps on the element:
+        if !self.upcast::<Node>().is_connected_with_browsing_context() {
+            return;
+        }
+        let global = self.owner_global();
+        // Step 1: Let CSP list be element's shadow-including root's policy container's CSP list.
+        let csp_list = match global.get_csp_list() {
+            None => return,
+            Some(csp_list) => csp_list,
+        };
+        // Step 2: If CSP list contains a header-delivered Content Security Policy,
+        // and element has a nonce content attribute whose value is not the empty string, then:
+        if !csp_list.contains_a_header_delivered_content_security_policy() ||
+            self.get_string_attribute(&local_name!("nonce")).is_empty()
+        {
+            return;
+        }
+        // Step 2.1: Let nonce be element's [[CryptographicNonce]].
+        let nonce = self.nonce_value();
+        // Step 2.2: Set an attribute value for element using "nonce" and the empty string.
+        self.set_string_attribute(&local_name!("nonce"), "".into(), CanGc::note());
+        // Step 2.3: Set element's [[CryptographicNonce]] to nonce.
+        self.update_nonce_internal_slot(nonce);
+    }
+
+    /// <https://www.w3.org/TR/CSP/#is-element-nonceable>
+    pub(crate) fn nonce_value_if_nonceable(&self) -> Option<String> {
+        // Step 1: If element does not have an attribute named "nonce", return "Not Nonceable".
+        if !self.has_attribute(&local_name!("nonce")) {
+            return None;
+        }
+        // Step 2: If element is a script element, then for each attribute of element’s attribute list:
+        if self.downcast::<HTMLScriptElement>().is_some() {
+            for attr in self.attrs().iter() {
+                // Step 2.1: If attribute’s name contains an ASCII case-insensitive match
+                // for "<script" or "<style", return "Not Nonceable".
+                let attr_name = attr.name().to_ascii_lowercase();
+                if attr_name.contains("<script") || attr_name.contains("<style") {
+                    return None;
+                }
+                // Step 2.2: If attribute’s value contains an ASCII case-insensitive match
+                // for "<script" or "<style", return "Not Nonceable".
+                let attr_value = attr.value().to_ascii_lowercase();
+                if attr_value.contains("<script") || attr_value.contains("<style") {
+                    return None;
+                }
+            }
+        }
+        // Step 3: If element had a duplicate-attribute parse error during tokenization, return "Not Nonceable".
+        // TODO(https://github.com/servo/servo/issues/4577 and https://github.com/whatwg/html/issues/3257):
+        // Figure out how to retrieve this information from the parser
+        // Step 4: Return "Nonceable".
+        Some(self.nonce_value().trim().to_owned())
+    }
+
     // https://dom.spec.whatwg.org/#insert-adjacent
     pub(crate) fn insert_adjacent(
         &self,
         where_: AdjacentPosition,
         node: &Node,
+        can_gc: CanGc,
     ) -> Fallible<Option<DomRoot<Node>>> {
         let self_node = self.upcast::<Node>();
         match where_ {
             AdjacentPosition::BeforeBegin => {
                 if let Some(parent) = self_node.GetParentNode() {
-                    Node::pre_insert(node, &parent, Some(self_node)).map(Some)
+                    Node::pre_insert(node, &parent, Some(self_node), can_gc).map(Some)
                 } else {
                     Ok(None)
                 }
             },
-            AdjacentPosition::AfterBegin => {
-                Node::pre_insert(node, self_node, self_node.GetFirstChild().as_deref()).map(Some)
+            AdjacentPosition::AfterBegin => Node::pre_insert(
+                node,
+                self_node,
+                self_node.GetFirstChild().as_deref(),
+                can_gc,
+            )
+            .map(Some),
+            AdjacentPosition::BeforeEnd => {
+                Node::pre_insert(node, self_node, None, can_gc).map(Some)
             },
-            AdjacentPosition::BeforeEnd => Node::pre_insert(node, self_node, None).map(Some),
             AdjacentPosition::AfterEnd => {
                 if let Some(parent) = self_node.GetParentNode() {
-                    Node::pre_insert(node, &parent, self_node.GetNextSibling().as_deref()).map(Some)
+                    Node::pre_insert(node, &parent, self_node.GetNextSibling().as_deref(), can_gc)
+                        .map(Some)
                 } else {
                     Ok(None)
                 }
@@ -2153,24 +2369,34 @@ impl Element {
         let fragment = DocumentFragment::new(&context_document, can_gc);
         // Step 4.
         for child in new_children {
-            fragment.upcast::<Node>().AppendChild(&child).unwrap();
+            fragment
+                .upcast::<Node>()
+                .AppendChild(&child, can_gc)
+                .unwrap();
         }
         // Step 5.
         Ok(fragment)
     }
 
+    /// Step 4 of <https://html.spec.whatwg.org/multipage/#dom-element-insertadjacenthtml>
     pub(crate) fn fragment_parsing_context(
         owner_doc: &Document,
         element: Option<&Self>,
         can_gc: CanGc,
     ) -> DomRoot<Self> {
+        // If context is not an Element or all of the following are true:
         match element {
             Some(elem)
+                // context's node document is an HTML document;
+                // context's local name is "html"; and
+                // context's namespace is the HTML namespace,
                 if elem.local_name() != &local_name!("html") ||
                     !elem.html_element_in_html_document() =>
             {
                 DomRoot::from_ref(elem)
             },
+            // set context to the result of creating an element
+            // given this's node document, "body", and the HTML namespace.
             _ => DomRoot::upcast(HTMLBodyElement::new(
                 local_name!("body"),
                 None,
@@ -2274,15 +2500,22 @@ impl Element {
             .map(|sr| DomRoot::from_ref(&**sr))
     }
 
-    pub(crate) fn ensure_element_internals(&self) -> DomRoot<ElementInternals> {
+    pub(crate) fn ensure_element_internals(&self, can_gc: CanGc) -> DomRoot<ElementInternals> {
         let mut rare_data = self.ensure_rare_data();
         DomRoot::from_ref(rare_data.element_internals.get_or_insert_with(|| {
             let elem = self
                 .downcast::<HTMLElement>()
                 .expect("ensure_element_internals should only be called for an HTMLElement");
-            Dom::from_ref(&*ElementInternals::new(elem, CanGc::note()))
+            Dom::from_ref(&*ElementInternals::new(elem, can_gc))
         }))
     }
+
+    pub(crate) fn outer_html(&self, can_gc: CanGc) -> Fallible<DOMString> {
+        match self.GetOuterHTML(can_gc)? {
+            TrustedHTMLOrNullIsEmptyString::NullIsEmptyString(str) => Ok(str),
+            TrustedHTMLOrNullIsEmptyString::TrustedHTML(_) => unreachable!(),
+        }
+    }
 }
 
 impl ElementMethods<crate::DomTypeHolder> for Element {
@@ -2341,9 +2574,9 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
     }
 
     // https://dom.spec.whatwg.org/#dom-element-classlist
-    fn ClassList(&self) -> DomRoot<DOMTokenList> {
+    fn ClassList(&self, can_gc: CanGc) -> DomRoot<DOMTokenList> {
         self.class_list
-            .or_init(|| DOMTokenList::new(self, &local_name!("class"), None, CanGc::note()))
+            .or_init(|| DOMTokenList::new(self, &local_name!("class"), None, can_gc))
     }
 
     // https://dom.spec.whatwg.org/#dom-element-slot
@@ -2353,9 +2586,9 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
     make_setter!(SetSlot, "slot");
 
     // https://dom.spec.whatwg.org/#dom-element-attributes
-    fn Attributes(&self) -> DomRoot<NamedNodeMap> {
+    fn Attributes(&self, can_gc: CanGc) -> DomRoot<NamedNodeMap> {
         self.attr_list
-            .or_init(|| NamedNodeMap::new(&self.owner_window(), self, CanGc::note()))
+            .or_init(|| NamedNodeMap::new(&self.owner_window(), self, can_gc))
     }
 
     // https://dom.spec.whatwg.org/#dom-element-hasattributes
@@ -2437,7 +2670,7 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
             Some(_index) => match force {
                 // Step 5.
                 None | Some(false) => {
-                    self.remove_attribute_by_name(&name);
+                    self.remove_attribute_by_name(&name, can_gc);
                     Ok(false)
                 },
                 // Step 6.
@@ -2495,7 +2728,7 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
     }
 
     // https://dom.spec.whatwg.org/#dom-element-setattributenode
-    fn SetAttributeNode(&self, attr: &Attr) -> Fallible<Option<DomRoot<Attr>>> {
+    fn SetAttributeNode(&self, attr: &Attr, can_gc: CanGc) -> Fallible<Option<DomRoot<Attr>>> {
         // Step 1.
         if let Some(owner) = attr.GetOwnerElement() {
             if &*owner != self {
@@ -2541,8 +2774,12 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
             attr.set_owner(Some(self));
             self.attrs.borrow_mut()[position] = Dom::from_ref(attr);
             old_attr.set_owner(None);
-            if attr.namespace() == &ns!() {
-                vtable.attribute_mutated(attr, AttributeMutation::Set(Some(&old_attr.value())));
+            if is_relevant_attribute(attr.namespace(), attr.local_name()) {
+                vtable.attribute_mutated(
+                    attr,
+                    AttributeMutation::Set(Some(&old_attr.value())),
+                    can_gc,
+                );
             }
 
             // Step 6.
@@ -2550,7 +2787,7 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
         } else {
             // Step 5.
             attr.set_owner(Some(self));
-            self.push_attribute(attr);
+            self.push_attribute(attr, can_gc);
 
             // Step 6.
             Ok(None)
@@ -2558,26 +2795,31 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
     }
 
     // https://dom.spec.whatwg.org/#dom-element-setattributenodens
-    fn SetAttributeNodeNS(&self, attr: &Attr) -> Fallible<Option<DomRoot<Attr>>> {
-        self.SetAttributeNode(attr)
+    fn SetAttributeNodeNS(&self, attr: &Attr, can_gc: CanGc) -> Fallible<Option<DomRoot<Attr>>> {
+        self.SetAttributeNode(attr, can_gc)
     }
 
     // https://dom.spec.whatwg.org/#dom-element-removeattribute
-    fn RemoveAttribute(&self, name: DOMString) {
+    fn RemoveAttribute(&self, name: DOMString, can_gc: CanGc) {
         let name = self.parsed_name(name);
-        self.remove_attribute_by_name(&name);
+        self.remove_attribute_by_name(&name, can_gc);
     }
 
     // https://dom.spec.whatwg.org/#dom-element-removeattributens
-    fn RemoveAttributeNS(&self, namespace: Option<DOMString>, local_name: DOMString) {
+    fn RemoveAttributeNS(
+        &self,
+        namespace: Option<DOMString>,
+        local_name: DOMString,
+        can_gc: CanGc,
+    ) {
         let namespace = namespace_from_domstring(namespace);
         let local_name = LocalName::from(local_name);
-        self.remove_attribute(&namespace, &local_name);
+        self.remove_attribute(&namespace, &local_name, can_gc);
     }
 
     // https://dom.spec.whatwg.org/#dom-element-removeattributenode
-    fn RemoveAttributeNode(&self, attr: &Attr) -> Fallible<DomRoot<Attr>> {
-        self.remove_first_matching_attribute(|a| a == attr)
+    fn RemoveAttributeNode(&self, attr: &Attr, can_gc: CanGc) -> Fallible<DomRoot<Attr>> {
+        self.remove_first_matching_attribute(|a| a == attr, can_gc)
             .ok_or(Error::NotFound)
     }
 
@@ -2592,9 +2834,14 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
     }
 
     // https://dom.spec.whatwg.org/#dom-element-getelementsbytagname
-    fn GetElementsByTagName(&self, localname: DOMString) -> DomRoot<HTMLCollection> {
+    fn GetElementsByTagName(&self, localname: DOMString, can_gc: CanGc) -> DomRoot<HTMLCollection> {
         let window = self.owner_window();
-        HTMLCollection::by_qualified_name(&window, self.upcast(), LocalName::from(&*localname))
+        HTMLCollection::by_qualified_name(
+            &window,
+            self.upcast(),
+            LocalName::from(&*localname),
+            can_gc,
+        )
     }
 
     // https://dom.spec.whatwg.org/#dom-element-getelementsbytagnamens
@@ -2602,15 +2849,16 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
         &self,
         maybe_ns: Option<DOMString>,
         localname: DOMString,
+        can_gc: CanGc,
     ) -> DomRoot<HTMLCollection> {
         let window = self.owner_window();
-        HTMLCollection::by_tag_name_ns(&window, self.upcast(), localname, maybe_ns)
+        HTMLCollection::by_tag_name_ns(&window, self.upcast(), localname, maybe_ns, can_gc)
     }
 
     // https://dom.spec.whatwg.org/#dom-element-getelementsbyclassname
-    fn GetElementsByClassName(&self, classes: DOMString) -> DomRoot<HTMLCollection> {
+    fn GetElementsByClassName(&self, classes: DOMString, can_gc: CanGc) -> DomRoot<HTMLCollection> {
         let window = self.owner_window();
-        HTMLCollection::by_class_name(&window, self.upcast(), classes)
+        HTMLCollection::by_class_name(&window, self.upcast(), classes, can_gc)
     }
 
     // https://drafts.csswg.org/cssom-view/#dom-element-getclientrects
@@ -2661,13 +2909,13 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
     }
 
     // https://drafts.csswg.org/cssom-view/#dom-element-scrollto
-    fn ScrollTo(&self, options: &ScrollToOptions) {
-        self.Scroll(options, CanGc::note());
+    fn ScrollTo(&self, options: &ScrollToOptions, can_gc: CanGc) {
+        self.Scroll(options, can_gc);
     }
 
     // https://drafts.csswg.org/cssom-view/#dom-element-scrollto
-    fn ScrollTo_(&self, x: f64, y: f64) {
-        self.Scroll_(x, y, CanGc::note());
+    fn ScrollTo_(&self, x: f64, y: f64, can_gc: CanGc) {
+        self.Scroll_(x, y, can_gc);
     }
 
     // https://drafts.csswg.org/cssom-view/#dom-element-scrollby
@@ -2922,7 +3170,17 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-element-sethtmlunsafe>
-    fn SetHTMLUnsafe(&self, html: DOMString, can_gc: CanGc) {
+    fn SetHTMLUnsafe(&self, html: TrustedHTMLOrString, can_gc: CanGc) -> ErrorResult {
+        // Step 1. Let compliantHTML be the result of invoking the
+        // Get Trusted Type compliant string algorithm with TrustedHTML,
+        // this's relevant global object, html, "Element setHTMLUnsafe", and "script".
+        let html = DOMString::from(TrustedHTML::get_trusted_script_compliant_string(
+            &self.owner_global(),
+            html,
+            "Element",
+            "setHTMLUnsafe",
+            can_gc,
+        )?);
         // Step 2. Let target be this's template contents if this is a template element; otherwise this.
         let target = if let Some(template) = self.downcast::<HTMLTemplateElement>() {
             DomRoot::upcast(template.Content(can_gc))
@@ -2930,28 +3188,9 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
             DomRoot::from_ref(self.upcast())
         };
 
-        // Step 3. Unsafely set HTML given target, this, and compliantHTML.
-        // Let newChildren be the result of the HTML fragment parsing algorithm.
-        let new_children = ServoParser::parse_html_fragment(self, html, true, can_gc);
-
-        let context_document = {
-            if let Some(template) = self.downcast::<HTMLTemplateElement>() {
-                template.Content(can_gc).upcast::<Node>().owner_doc()
-            } else {
-                self.owner_document()
-            }
-        };
-
-        // Let fragment be a new DocumentFragment whose node document is contextElement's node document.
-        let frag = DocumentFragment::new(&context_document, can_gc);
-
-        // For each node in newChildren, append node to fragment.
-        for child in new_children {
-            frag.upcast::<Node>().AppendChild(&child).unwrap();
-        }
-
-        // Replace all with fragment within target.
-        Node::replace_all(Some(frag.upcast()), &target);
+        // Step 3. Unsafely set HTML given target, this, and compliantHTML
+        Node::unsafely_set_html(&target, self, html, can_gc);
+        Ok(())
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-element-gethtml>
@@ -2967,7 +3206,7 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-element-innerhtml>
-    fn GetInnerHTML(&self, can_gc: CanGc) -> Fallible<DOMString> {
+    fn GetInnerHTML(&self, can_gc: CanGc) -> Fallible<TrustedHTMLOrNullIsEmptyString> {
         let qname = QualName::new(
             self.prefix().clone(),
             self.namespace().clone(),
@@ -2984,16 +3223,28 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
                 .xml_serialize(XmlChildrenOnly(Some(qname)))
         };
 
-        Ok(result)
+        Ok(TrustedHTMLOrNullIsEmptyString::NullIsEmptyString(result))
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-element-innerhtml>
-    fn SetInnerHTML(&self, value: DOMString, can_gc: CanGc) -> ErrorResult {
-        // Step 2.
+    fn SetInnerHTML(&self, value: TrustedHTMLOrNullIsEmptyString, can_gc: CanGc) -> ErrorResult {
+        // Step 1: Let compliantString be the result of invoking the
+        // Get Trusted Type compliant string algorithm with TrustedHTML,
+        // this's relevant global object, the given value, "Element innerHTML", and "script".
+        let value = DOMString::from(TrustedHTML::get_trusted_script_compliant_string(
+            &self.owner_global(),
+            value.convert(),
+            "Element",
+            "innerHTML",
+            can_gc,
+        )?);
         // https://github.com/w3c/DOM-Parsing/issues/1
         let target = if let Some(template) = self.downcast::<HTMLTemplateElement>() {
+            // Step 4: If context is a template element, then set context to
+            // the template element's template contents (a DocumentFragment).
             DomRoot::upcast(template.Content(can_gc))
         } else {
+            // Step 2: Let context be this.
             DomRoot::from_ref(self.upcast())
         };
 
@@ -3010,15 +3261,17 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
             return Ok(());
         }
 
-        // Step 1.
+        // Step 3: Let fragment be the result of invoking the fragment parsing algorithm steps
+        // with context and compliantString.
         let frag = self.parse_fragment(value, can_gc)?;
 
-        Node::replace_all(Some(frag.upcast()), &target);
+        // Step 5: Replace all with fragment within context.
+        Node::replace_all(Some(frag.upcast()), &target, can_gc);
         Ok(())
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-element-outerhtml>
-    fn GetOuterHTML(&self, can_gc: CanGc) -> Fallible<DOMString> {
+    fn GetOuterHTML(&self, can_gc: CanGc) -> Fallible<TrustedHTMLOrNullIsEmptyString> {
         // FIXME: This should use the fragment serialization algorithm, which takes
         // care of distinguishing between html/xml documents
         let result = if self.owner_document().is_html_document() {
@@ -3028,27 +3281,39 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
             self.upcast::<Node>().xml_serialize(XmlIncludeNode)
         };
 
-        Ok(result)
+        Ok(TrustedHTMLOrNullIsEmptyString::NullIsEmptyString(result))
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-element-outerhtml>
-    fn SetOuterHTML(&self, value: DOMString, can_gc: CanGc) -> ErrorResult {
+    fn SetOuterHTML(&self, value: TrustedHTMLOrNullIsEmptyString, can_gc: CanGc) -> ErrorResult {
+        // Step 1: Let compliantString be the result of invoking the
+        // Get Trusted Type compliant string algorithm with TrustedHTML,
+        // this's relevant global object, the given value, "Element outerHTML", and "script".
+        let value = DOMString::from(TrustedHTML::get_trusted_script_compliant_string(
+            &self.owner_global(),
+            value.convert(),
+            "Element",
+            "outerHTML",
+            can_gc,
+        )?);
         let context_document = self.owner_document();
         let context_node = self.upcast::<Node>();
-        // Step 1.
+        // Step 2: Let parent be this's parent.
         let context_parent = match context_node.GetParentNode() {
             None => {
-                // Step 2.
+                // Step 3: If parent is null, return. There would be no way to
+                // obtain a reference to the nodes created even if the remaining steps were run.
                 return Ok(());
             },
             Some(parent) => parent,
         };
 
         let parent = match context_parent.type_id() {
-            // Step 3.
+            // Step 4: If parent is a Document, throw a "NoModificationAllowedError" DOMException.
             NodeTypeId::Document(_) => return Err(Error::NoModificationAllowed),
 
-            // Step 4.
+            // Step 5: If parent is a DocumentFragment, set parent to the result of
+            // creating an element given this's node document, "body", and the HTML namespace.
             NodeTypeId::DocumentFragment(_) => {
                 let body_elem = Element::create(
                     QualName::new(None, ns!(html), local_name!("body")),
@@ -3064,10 +3329,11 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
             _ => context_node.GetParentElement().unwrap(),
         };
 
-        // Step 5.
+        // Step 6: Let fragment be the result of invoking the
+        // fragment parsing algorithm steps given parent and compliantString.
         let frag = parent.parse_fragment(value, can_gc)?;
-        // Step 6.
-        context_parent.ReplaceChild(frag.upcast(), context_node)?;
+        // Step 7: Replace this with fragment within this's parent.
+        context_parent.ReplaceChild(frag.upcast(), context_node, can_gc)?;
         Ok(())
     }
 
@@ -3088,9 +3354,9 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
     }
 
     // https://dom.spec.whatwg.org/#dom-parentnode-children
-    fn Children(&self) -> DomRoot<HTMLCollection> {
+    fn Children(&self, can_gc: CanGc) -> DomRoot<HTMLCollection> {
         let window = self.owner_window();
-        HTMLCollection::children(&window, self.upcast())
+        HTMLCollection::children(&window, self.upcast(), can_gc)
     }
 
     // https://dom.spec.whatwg.org/#dom-parentnode-firstelementchild
@@ -3154,8 +3420,8 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
     }
 
     // https://dom.spec.whatwg.org/#dom-childnode-remove
-    fn Remove(&self) {
-        self.upcast::<Node>().remove_self();
+    fn Remove(&self, can_gc: CanGc) {
+        self.upcast::<Node>().remove_self(can_gc);
     }
 
     // https://dom.spec.whatwg.org/#dom-element-matches
@@ -3211,9 +3477,10 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
         &self,
         where_: DOMString,
         element: &Element,
+        can_gc: CanGc,
     ) -> Fallible<Option<DomRoot<Element>>> {
         let where_ = where_.parse::<AdjacentPosition>()?;
-        let inserted_node = self.insert_adjacent(where_, element.upcast())?;
+        let inserted_node = self.insert_adjacent(where_, element.upcast(), can_gc)?;
         Ok(inserted_node.map(|node| DomRoot::downcast(node).unwrap()))
     }
 
@@ -3224,46 +3491,66 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
 
         // Step 2.
         let where_ = where_.parse::<AdjacentPosition>()?;
-        self.insert_adjacent(where_, text.upcast()).map(|_| ())
+        self.insert_adjacent(where_, text.upcast(), can_gc)
+            .map(|_| ())
     }
 
     // https://w3c.github.io/DOM-Parsing/#dom-element-insertadjacenthtml
     fn InsertAdjacentHTML(
         &self,
         position: DOMString,
-        text: DOMString,
+        text: TrustedHTMLOrString,
         can_gc: CanGc,
     ) -> ErrorResult {
-        // Step 1.
+        // Step 1: Let compliantString be the result of invoking the
+        // Get Trusted Type compliant string algorithm with TrustedHTML,
+        // this's relevant global object, string, "Element insertAdjacentHTML", and "script".
+        let text = DOMString::from(TrustedHTML::get_trusted_script_compliant_string(
+            &self.owner_global(),
+            text,
+            "Element",
+            "insertAdjacentHTML",
+            can_gc,
+        )?);
         let position = position.parse::<AdjacentPosition>()?;
 
+        // Step 2: Let context be null.
+        // Step 3: Use the first matching item from this list:
         let context = match position {
+            // If position is an ASCII case-insensitive match for the string "beforebegin"
+            // If position is an ASCII case-insensitive match for the string "afterend"
             AdjacentPosition::BeforeBegin | AdjacentPosition::AfterEnd => {
                 match self.upcast::<Node>().GetParentNode() {
+                    // Step 3.2: If context is null or a Document, throw a "NoModificationAllowedError" DOMException.
                     Some(ref node) if node.is::<Document>() => {
                         return Err(Error::NoModificationAllowed);
                     },
                     None => return Err(Error::NoModificationAllowed),
+                    // Step 3.1: Set context to this's parent.
                     Some(node) => node,
                 }
             },
+            // If position is an ASCII case-insensitive match for the string "afterbegin"
+            // If position is an ASCII case-insensitive match for the string "beforeend"
             AdjacentPosition::AfterBegin | AdjacentPosition::BeforeEnd => {
+                // Set context to this.
                 DomRoot::from_ref(self.upcast::<Node>())
             },
         };
 
-        // Step 2.
+        // Step 4.
         let context = Element::fragment_parsing_context(
             &context.owner_doc(),
             context.downcast::<Element>(),
             can_gc,
         );
 
-        // Step 3.
+        // Step 5: Let fragment be the result of invoking the
+        // fragment parsing algorithm steps with context and compliantString.
         let fragment = context.parse_fragment(text, can_gc)?;
 
-        // Step 4.
-        self.insert_adjacent(position, fragment.upcast())
+        // Step 6.
+        self.insert_adjacent(position, fragment.upcast(), can_gc)
             .map(|_| ())
     }
 
@@ -3295,7 +3582,7 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
     }
 
     // https://dom.spec.whatwg.org/#dom-element-attachshadow
-    fn AttachShadow(&self, init: &ShadowRootInit) -> Fallible<DomRoot<ShadowRoot>> {
+    fn AttachShadow(&self, init: &ShadowRootInit, can_gc: CanGc) -> Fallible<DomRoot<ShadowRoot>> {
         // Step 1. Run attach a shadow root with this, init["mode"], init["clonable"], init["serializable"],
         // init["delegatesFocus"], and init["slotAssignment"].
         let shadow_root = self.attach_shadow(
@@ -3305,7 +3592,7 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
             init.serializable,
             init.delegatesFocus,
             init.slotAssignment,
-            CanGc::note(),
+            can_gc,
         )?;
 
         // Step 2. Return this’s shadow root.
@@ -3713,51 +4000,17 @@ impl VirtualMethods for Element {
             .attribute_affects_presentational_hints(attr)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         let node = self.upcast::<Node>();
         let doc = node.owner_doc();
         match attr.local_name() {
             &local_name!("tabindex") | &local_name!("draggable") | &local_name!("hidden") => {
-                self.update_sequentially_focusable_status(CanGc::note())
-            },
-            &local_name!("style") => {
-                // Modifying the `style` attribute might change style.
-                *self.style_attribute.borrow_mut() = match mutation {
-                    AttributeMutation::Set(..) => {
-                        // This is the fast path we use from
-                        // CSSStyleDeclaration.
-                        //
-                        // Juggle a bit to keep the borrow checker happy
-                        // while avoiding the extra clone.
-                        let is_declaration = matches!(*attr.value(), AttrValue::Declaration(..));
-
-                        let block = if is_declaration {
-                            let mut value = AttrValue::String(String::new());
-                            attr.swap_value(&mut value);
-                            let (serialization, block) = match value {
-                                AttrValue::Declaration(s, b) => (s, b),
-                                _ => unreachable!(),
-                            };
-                            let mut value = AttrValue::String(serialization);
-                            attr.swap_value(&mut value);
-                            block
-                        } else {
-                            let win = self.owner_window();
-                            Arc::new(doc.style_shared_lock().wrap(parse_style_attribute(
-                                &attr.value(),
-                                &UrlExtraData(doc.base_url().get_arc()),
-                                win.css_error_reporter(),
-                                doc.quirks_mode(),
-                                CssRuleType::Style,
-                            )))
-                        };
-
-                        Some(block)
-                    },
-                    AttributeMutation::Removed => None,
-                };
+                self.update_sequentially_focusable_status(can_gc)
             },
+            &local_name!("style") => self.update_style_attribute(attr, mutation),
             &local_name!("id") => {
                 *self.id_attribute.borrow_mut() = mutation.new_value(attr).and_then(|value| {
                     let value = value.as_atom();
@@ -3776,25 +4029,25 @@ impl VirtualMethods for Element {
                             if let Some(old_value) = old_value {
                                 let old_value = old_value.as_atom().clone();
                                 if let Some(ref shadow_root) = containing_shadow_root {
-                                    shadow_root.unregister_element_id(self, old_value);
+                                    shadow_root.unregister_element_id(self, old_value, can_gc);
                                 } else {
-                                    doc.unregister_element_id(self, old_value);
+                                    doc.unregister_element_id(self, old_value, can_gc);
                                 }
                             }
                             if value != atom!("") {
                                 if let Some(ref shadow_root) = containing_shadow_root {
-                                    shadow_root.register_element_id(self, value);
+                                    shadow_root.register_element_id(self, value, can_gc);
                                 } else {
-                                    doc.register_element_id(self, value);
+                                    doc.register_element_id(self, value, can_gc);
                                 }
                             }
                         },
                         AttributeMutation::Removed => {
                             if value != atom!("") {
                                 if let Some(ref shadow_root) = containing_shadow_root {
-                                    shadow_root.unregister_element_id(self, value);
+                                    shadow_root.unregister_element_id(self, value, can_gc);
                                 } else {
-                                    doc.unregister_element_id(self, value);
+                                    doc.unregister_element_id(self, value, can_gc);
                                 }
                             }
                         },
@@ -3873,32 +4126,32 @@ impl VirtualMethods for Element {
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
 
         if let Some(f) = self.as_maybe_form_control() {
-            f.bind_form_control_to_tree();
+            f.bind_form_control_to_tree(can_gc);
         }
 
         let doc = self.owner_document();
 
         if let Some(ref shadow_root) = self.shadow_root() {
-            shadow_root.bind_to_tree(context);
+            shadow_root.bind_to_tree(context, can_gc);
         }
 
         if !context.is_in_tree() {
             return;
         }
 
-        self.update_sequentially_focusable_status(CanGc::note());
+        self.update_sequentially_focusable_status(can_gc);
 
         if let Some(ref id) = *self.id_attribute.borrow() {
             if let Some(shadow_root) = self.containing_shadow_root() {
-                shadow_root.register_element_id(self, id.clone());
+                shadow_root.register_element_id(self, id.clone(), can_gc);
             } else {
-                doc.register_element_id(self, id.clone());
+                doc.register_element_id(self, id.clone(), can_gc);
             }
         }
         if let Some(ref name) = self.name_attribute() {
@@ -3911,37 +4164,37 @@ impl VirtualMethods for Element {
         doc.increment_dom_count();
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
-        self.super_type().unwrap().unbind_from_tree(context);
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
+        self.super_type().unwrap().unbind_from_tree(context, can_gc);
 
         if let Some(f) = self.as_maybe_form_control() {
             // TODO: The valid state of ancestors might be wrong if the form control element
             // has a fieldset ancestor, for instance: `<form><fieldset><input>`,
             // if `<input>` is unbound, `<form><fieldset>` should trigger a call to `update_validity()`.
-            f.unbind_form_control_from_tree();
+            f.unbind_form_control_from_tree(can_gc);
         }
 
         if !context.tree_is_in_a_document_tree && !context.tree_is_in_a_shadow_tree {
             return;
         }
 
-        self.update_sequentially_focusable_status(CanGc::note());
+        self.update_sequentially_focusable_status(can_gc);
 
         let doc = self.owner_document();
 
         let fullscreen = doc.GetFullscreenElement();
         if fullscreen.as_deref() == Some(self) {
-            doc.exit_fullscreen(CanGc::note());
+            doc.exit_fullscreen(can_gc);
         }
         if let Some(ref value) = *self.id_attribute.borrow() {
             if let Some(ref shadow_root) = self.containing_shadow_root() {
                 // Only unregister the element id if the node was disconnected from it's shadow root
                 // (as opposed to the whole shadow tree being disconnected as a whole)
                 if !self.upcast::<Node>().is_in_a_shadow_tree() {
-                    shadow_root.unregister_element_id(self, value.clone());
+                    shadow_root.unregister_element_id(self, value.clone(), can_gc);
                 }
             } else {
-                doc.unregister_element_id(self, value.clone());
+                doc.unregister_element_id(self, value.clone(), can_gc);
             }
         }
         if let Some(ref value) = self.name_attribute() {
@@ -3980,13 +4233,38 @@ impl VirtualMethods for Element {
         }
     }
 
-    fn adopting_steps(&self, old_doc: &Document) {
-        self.super_type().unwrap().adopting_steps(old_doc);
+    fn adopting_steps(&self, old_doc: &Document, can_gc: CanGc) {
+        self.super_type().unwrap().adopting_steps(old_doc, can_gc);
 
         if self.owner_document().is_html_document() != old_doc.is_html_document() {
             self.tag_name.clear();
         }
     }
+
+    fn post_connection_steps(&self) {
+        if let Some(s) = self.super_type() {
+            s.post_connection_steps();
+        }
+
+        self.update_nonce_post_connection();
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#nonce-attributes%3Aconcept-node-clone-ext>
+    fn cloning_steps(
+        &self,
+        copy: &Node,
+        maybe_doc: Option<&Document>,
+        clone_children: CloneChildrenFlag,
+        can_gc: CanGc,
+    ) {
+        if let Some(s) = self.super_type() {
+            s.cloning_steps(copy, maybe_doc, clone_children, can_gc);
+        }
+        let elem = copy.downcast::<Element>().unwrap();
+        if let Some(rare_data) = self.rare_data().as_ref() {
+            elem.update_nonce_internal_slot(rare_data.cryptographic_nonce.clone());
+        }
+    }
 }
 
 #[derive(Clone, PartialEq)]
@@ -4315,7 +4593,7 @@ impl Element {
         if (in_quirks_mode && doc.GetBody().as_deref() == self.downcast::<HTMLElement>()) ||
             (!in_quirks_mode && *self.root_element() == *self)
         {
-            let viewport_dimensions = doc.window().window_size().initial_viewport.round().to_i32();
+            let viewport_dimensions = doc.window().viewport_details().size.round().to_i32();
             rect.size = Size2D::<i32>::new(viewport_dimensions.width, viewport_dimensions.height);
         }
 
@@ -4349,6 +4627,12 @@ impl Element {
                 let element = self.downcast::<HTMLLabelElement>().unwrap();
                 Some(element as &dyn Activatable)
             },
+            NodeTypeId::Element(ElementTypeId::HTMLElement(
+                HTMLElementTypeId::HTMLSelectElement,
+            )) => {
+                let element = self.downcast::<HTMLSelectElement>().unwrap();
+                Some(element as &dyn Activatable)
+            },
             NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLElement)) => {
                 let element = self.downcast::<HTMLElement>().unwrap();
                 Some(element as &dyn Activatable)
@@ -4426,12 +4710,12 @@ impl Element {
         element
     }
 
-    pub(crate) fn is_invalid(&self, needs_update: bool) -> bool {
+    pub(crate) fn is_invalid(&self, needs_update: bool, can_gc: CanGc) -> bool {
         if let Some(validatable) = self.as_maybe_validatable() {
             if needs_update {
                 validatable
                     .validity_state()
-                    .perform_validation_and_update(ValidationFlags::all());
+                    .perform_validation_and_update(ValidationFlags::all(), can_gc);
             }
             return validatable.is_instance_validatable() && !validatable.satisfies_constraints();
         }
@@ -4844,7 +5128,7 @@ pub(crate) fn set_cross_origin_attribute(
     match value {
         Some(val) => element.set_string_attribute(&local_name!("crossorigin"), val, can_gc),
         None => {
-            element.remove_attribute(&ns!(), &local_name!("crossorigin"));
+            element.remove_attribute(&ns!(), &local_name!("crossorigin"), can_gc);
         },
     }
 }
diff --git a/components/script/dom/elementinternals.rs b/components/script/dom/elementinternals.rs
index 966a4dc1e3e..d2f019b4001 100644
--- a/components/script/dom/elementinternals.rs
+++ b/components/script/dom/elementinternals.rs
@@ -234,6 +234,7 @@ impl ElementInternalsMethods<crate::DomTypeHolder> for ElementInternals {
         flags: &ValidityStateFlags,
         message: Option<DOMString>,
         anchor: Option<&HTMLElement>,
+        can_gc: CanGc,
     ) -> ErrorResult {
         // Steps 1-2: Check form-associated custom element
         if !self.is_target_form_associated() {
@@ -253,7 +254,7 @@ impl ElementInternalsMethods<crate::DomTypeHolder> for ElementInternals {
         // Step 4: For each entry `flag` → `value` of `flags`, set element's validity flag with the name
         // `flag` to `value`.
         self.validity_state().update_invalid_flags(bits);
-        self.validity_state().update_pseudo_classes();
+        self.validity_state().update_pseudo_classes(can_gc);
 
         // Step 5: Set element's validation message to the empty string if message is not given
         // or all of element's validity flags are false, or to message otherwise.
@@ -309,7 +310,7 @@ impl ElementInternalsMethods<crate::DomTypeHolder> for ElementInternals {
     }
 
     /// <https://html.spec.whatwg.org/multipage#dom-elementinternals-labels>
-    fn GetLabels(&self) -> Fallible<DomRoot<NodeList>> {
+    fn GetLabels(&self, can_gc: CanGc) -> Fallible<DomRoot<NodeList>> {
         if !self.is_target_form_associated() {
             return Err(Error::NotSupported);
         }
@@ -317,7 +318,7 @@ impl ElementInternalsMethods<crate::DomTypeHolder> for ElementInternals {
             NodeList::new_labels_list(
                 self.target_element.upcast::<Node>().owner_doc().window(),
                 &self.target_element,
-                CanGc::note(),
+                can_gc,
             )
         }))
     }
diff --git a/components/script/dom/errorevent.rs b/components/script/dom/errorevent.rs
index 758d4f108e9..31191ec6577 100644
--- a/components/script/dom/errorevent.rs
+++ b/components/script/dom/errorevent.rs
@@ -142,6 +142,7 @@ impl ErrorEventMethods<crate::DomTypeHolder> for ErrorEvent {
             init.error.handle(),
             can_gc,
         );
+        event.upcast::<Event>().set_composed(init.parent.composed);
         Ok(event)
     }
 
diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs
index a9dd421b7e0..743ced42a4b 100644
--- a/components/script/dom/event.rs
+++ b/components/script/dom/event.rs
@@ -29,7 +29,7 @@ use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object_w
 use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::element::Element;
-use crate::dom::eventtarget::{CompiledEventListener, EventTarget, ListenerPhase};
+use crate::dom::eventtarget::{EventListeners, EventTarget, ListenerPhase};
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::htmlinputelement::InputActivationState;
 use crate::dom::htmlslotelement::HTMLSlotElement;
@@ -507,7 +507,7 @@ impl Event {
                 // corresponding pre-activation behavior.
                 pre_activation_result = activation_target
                     .as_maybe_activatable()
-                    .and_then(|activatable| activatable.legacy_pre_activation_behavior());
+                    .and_then(|activatable| activatable.legacy_pre_activation_behavior(can_gc));
             }
 
             let timeline_window = DomRoot::downcast::<Window>(target.global())
@@ -584,7 +584,7 @@ impl Event {
             if let Some(target) = self.GetTarget() {
                 if let Some(node) = target.downcast::<Node>() {
                     let vtable = vtable_for(node);
-                    vtable.handle_event(self);
+                    vtable.handle_event(self, can_gc);
                 }
             }
         }
@@ -623,7 +623,7 @@ impl Event {
                 // Step 11.2 Otherwise, if activationTarget has legacy-canceled-activation behavior, then run
                 // activationTarget’s legacy-canceled-activation behavior.
                 else {
-                    activatable.legacy_canceled_activation_behavior(pre_activation_result);
+                    activatable.legacy_canceled_activation_behavior(pre_activation_result, can_gc);
                 }
             }
         }
@@ -1040,14 +1040,39 @@ impl From<bool> for EventCancelable {
 }
 
 impl From<EventCancelable> for bool {
-    fn from(bubbles: EventCancelable) -> Self {
-        match bubbles {
+    fn from(cancelable: EventCancelable) -> Self {
+        match cancelable {
             EventCancelable::Cancelable => true,
             EventCancelable::NotCancelable => false,
         }
     }
 }
 
+#[derive(Clone, Copy, MallocSizeOf, PartialEq)]
+pub(crate) enum EventComposed {
+    Composed,
+    NotComposed,
+}
+
+impl From<bool> for EventComposed {
+    fn from(boolean: bool) -> Self {
+        if boolean {
+            EventComposed::Composed
+        } else {
+            EventComposed::NotComposed
+        }
+    }
+}
+
+impl From<EventComposed> for bool {
+    fn from(composed: EventComposed) -> Self {
+        match composed {
+            EventComposed::Composed => true,
+            EventComposed::NotComposed => false,
+        }
+    }
+}
+
 #[derive(Clone, Copy, Debug, Eq, JSTraceable, PartialEq)]
 #[repr(u16)]
 #[derive(MallocSizeOf)]
@@ -1151,10 +1176,7 @@ fn invoke(
     event.current_target.set(Some(&segment.invocation_target));
 
     // Step 6. Let listeners be a clone of event’s currentTarget attribute value’s event listener list.
-    let listeners =
-        segment
-            .invocation_target
-            .get_listeners_for(&event.type_(), Some(phase), can_gc);
+    let listeners = segment.invocation_target.get_listeners_for(&event.type_());
 
     // Step 7. Let invocationTargetInShadowTree be struct’s invocation-target-in-shadow-tree.
     let invocation_target_in_shadow_tree = segment.invocation_target_in_shadow_tree;
@@ -1207,8 +1229,8 @@ fn invoke(
 /// <https://dom.spec.whatwg.org/#concept-event-listener-inner-invoke>
 fn inner_invoke(
     event: &Event,
-    listeners: &[CompiledEventListener],
-    _phase: ListenerPhase,
+    listeners: &EventListeners,
+    phase: ListenerPhase,
     invocation_target_in_shadow_tree: bool,
     timeline_window: Option<&Window>,
     can_gc: CanGc,
@@ -1217,25 +1239,21 @@ fn inner_invoke(
     let mut found = false;
 
     // Step 2. For each listener in listeners, whose removed is false:
-    for listener in listeners {
-        // FIXME(#25479): We need an "if !listener.removed()" here,
-        // but there's a subtlety. Where Servo is currently using the
-        // CompiledEventListener, we really need something that maps to
-        // https://dom.spec.whatwg.org/#concept-event-listener
-        // which is not the same thing as the EventListener interface.
-        // script::dom::eventtarget::EventListenerEntry is the closest
-        // match we have, and is already holding the "once" flag,
-        // but it's not a drop-in replacement.
+    for listener in listeners.iter() {
+        if listener.borrow().removed() {
+            continue;
+        }
 
-        // Steps 2.1 and 2.3-2.4 are not done because `listeners` contain only the
-        // relevant ones for this invoke call during the dispatch algorithm.
-        // TODO: Step 2.1 If event’s type attribute value is not listener’s type, then continue.
+        // Step 2.1 If event’s type attribute value is not listener’s type, then continue.
 
         // Step 2.2. Set found to true.
         found = true;
 
-        // TODO Step 2.3 If phase is "capturing" and listener’s capture is false, then continue.
-        // TODO Step 2.4 If phase is "bubbling" and listener’s capture is true, then continue.
+        // Step 2.3 If phase is "capturing" and listener’s capture is false, then continue.
+        // Step 2.4 If phase is "bubbling" and listener’s capture is true, then continue.
+        if listener.borrow().phase() != phase {
+            continue;
+        }
 
         let event_target = event
             .GetCurrentTarget()
@@ -1243,12 +1261,20 @@ fn inner_invoke(
 
         // Step 2.5 If listener’s once is true, then remove an event listener given event’s currentTarget
         // attribute value and listener.
-        if let CompiledEventListener::Listener(event_listener) = listener {
-            event_target.remove_listener_if_once(&event.type_(), event_listener);
+        if listener.borrow().once() {
+            event_target.remove_listener(&event.type_(), listener);
         }
 
+        let Some(compiled_listener) =
+            listener
+                .borrow()
+                .get_compiled_listener(&event_target, &event.type_(), can_gc)
+        else {
+            continue;
+        };
+
         // Step 2.6 Let global be listener callback’s associated realm’s global object.
-        let global = listener.associated_global();
+        let global = compiled_listener.associated_global();
 
         // Step 2.7 Let currentEvent be undefined.
         let mut current_event = None;
@@ -1264,18 +1290,22 @@ fn inner_invoke(
         }
 
         // Step 2.9 If listener’s passive is true, then set event's in passive listener flag.
-        if let CompiledEventListener::Listener(event_listener) = listener {
-            event.set_in_passive_listener(event_target.is_passive(&event.type_(), event_listener));
-        }
+        event.set_in_passive_listener(event_target.is_passive(&event.type_(), listener));
 
-        // Step 2.10 If global is a Window object, then record timing info for event listener given event and listener.
+        // Step 2.10 If global is a Window object, then record timing info for event listener
+        // given event and listener.
         // Step 2.11 Call a user object’s operation with listener’s callback, "handleEvent", « event »,
         // and event’s currentTarget attribute value. If this throws an exception exception:
         //     Step 2.10.1 Report exception for listener’s callback’s corresponding JavaScript object’s
         //     associated realm’s global object.
         //     TODO Step 2.10.2 Set legacyOutputDidListenersThrowFlag if given.
         let marker = TimelineMarker::start("DOMEvent".to_owned());
-        listener.call_or_handle_event(&event_target, event, ExceptionHandling::Report, can_gc);
+        compiled_listener.call_or_handle_event(
+            &event_target,
+            event,
+            ExceptionHandling::Report,
+            can_gc,
+        );
         if let Some(window) = timeline_window {
             window.emit_timeline_marker(marker.end());
         }
diff --git a/components/script/dom/eventsource.rs b/components/script/dom/eventsource.rs
index 8b3dc4d5113..7cf7bd6106f 100644
--- a/components/script/dom/eventsource.rs
+++ b/components/script/dom/eventsource.rs
@@ -8,8 +8,10 @@ use std::str::{Chars, FromStr};
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
+use content_security_policy as csp;
 use dom_struct::dom_struct;
 use headers::ContentType;
+use http::StatusCode;
 use http::header::{self, HeaderName, HeaderValue};
 use ipc_channel::ipc;
 use ipc_channel::router::ROUTER;
@@ -182,7 +184,9 @@ impl EventSourceContext {
                 self.data.push_str(&self.value);
                 self.data.push('\n');
             },
-            "id" => mem::swap(&mut self.last_event_id, &mut self.value),
+            "id" if !self.value.contains('\0') => {
+                mem::swap(&mut self.last_event_id, &mut self.value);
+            },
             "retry" => {
                 if let Ok(time) = u64::from_str(&self.value) {
                     self.event_source
@@ -348,6 +352,11 @@ impl FetchResponseListener for EventSourceContext {
                         _ => unsafe_,
                     },
                 };
+                // Step 15.3 if res's status is not 200, or if res's `Content-Type` is not
+                // `text/event-stream`, then fail the connection.
+                if meta.status.code() != StatusCode::OK {
+                    return self.fail_the_connection();
+                }
                 let mime = match meta.content_type {
                     None => return self.fail_the_connection(),
                     Some(ct) => <ContentType as Into<Mime>>::into(ct.into_inner()),
@@ -356,12 +365,15 @@ impl FetchResponseListener for EventSourceContext {
                     return self.fail_the_connection();
                 }
                 self.origin = meta.final_url.origin().ascii_serialization();
+                // Step 15.4 announce the connection and interpret res's body line by line.
                 self.announce_the_connection();
             },
             Err(_) => {
-                // The spec advises failing here if reconnecting would be
-                // "futile", with no more specific advice; WPT tests
-                // consider a non-http(s) scheme to be futile.
+                // Step 15.2 if res is a network error, then reestablish the connection, unless
+                // the user agent knows that to be futile, in which case the user agent may
+                // fail the connection.
+
+                // WPT tests consider a non-http(s) scheme to be futile.
                 match self.event_source.root().url.scheme() {
                     "http" | "https" => self.reestablish_the_connection(),
                     _ => self.fail_the_connection(),
@@ -412,12 +424,14 @@ impl FetchResponseListener for EventSourceContext {
     fn process_response_eof(
         &mut self,
         _: RequestId,
-        _response: Result<ResourceFetchTiming, NetworkError>,
+        response: Result<ResourceFetchTiming, NetworkError>,
     ) {
         if self.incomplete_utf8.take().is_some() {
             self.parse("\u{FFFD}".chars(), CanGc::note());
         }
-        self.reestablish_the_connection();
+        if response.is_ok() {
+            self.reestablish_the_connection();
+        }
     }
 
     fn resource_timing_mut(&mut self) -> &mut ResourceFetchTiming {
@@ -431,6 +445,11 @@ impl FetchResponseListener for EventSourceContext {
     fn submit_resource_timing(&mut self) {
         network_listener::submit_timing(self, CanGc::note())
     }
+
+    fn process_csp_violations(&mut self, _request_id: RequestId, violations: Vec<csp::Violation>) {
+        let global = &self.resource_timing_global();
+        global.report_csp_violations(violations, None);
+    }
 }
 
 impl ResourceTimingListener for EventSourceContext {
@@ -529,29 +548,35 @@ impl EventSourceMethods<crate::DomTypeHolder> for EventSource {
         event_source_init: &EventSourceInit,
     ) -> Fallible<DomRoot<EventSource>> {
         // TODO: Step 2 relevant settings object
-        // Step 3
+        // Step 3 Let urlRecord be the result of encoding-parsing a URL given url,
+        // relative to settings.
         let base_url = global.api_base_url();
         let url_record = match base_url.join(&url) {
             Ok(u) => u,
-            //  Step 4
+            // Step 4 If urlRecord is failure, then throw a "SyntaxError" DOMException.
             Err(_) => return Err(Error::Syntax),
         };
-        // Step 1, 5
+        // Step 1 Let ev be a new EventSource object.
         let ev = EventSource::new(
             global,
             proto,
+            // Step 5 Set ev's url to urlRecord.
             url_record.clone(),
             event_source_init.withCredentials,
             can_gc,
         );
         global.track_event_source(&ev);
-        // Steps 6-7
         let cors_attribute_state = if event_source_init.withCredentials {
+            // Step 7 If the value of eventSourceInitDict's withCredentials member is true,
+            // then set corsAttributeState to Use Credentials and set ev's withCredentials
+            // attribute to true.
             CorsSettings::UseCredentials
         } else {
+            // Step 6 Let corsAttributeState be Anonymous.
             CorsSettings::Anonymous
         };
-        // Step 8
+        // Step 8 Let request be the result of creating a potential-CORS request
+        // given urlRecord, the empty string, and corsAttributeState.
         // TODO: Step 9 set request's client settings
         let mut request = create_a_potential_cors_request(
             global.webview_id(),
@@ -561,21 +586,24 @@ impl EventSourceMethods<crate::DomTypeHolder> for EventSource {
             Some(true),
             global.get_referrer(),
             global.insecure_requests_policy(),
+            global.has_trustworthy_ancestor_or_current_origin(),
+            global.policy_container(),
         )
         .origin(global.origin().immutable().clone())
         .pipeline_id(Some(global.pipeline_id()));
 
-        // Step 10
+        // Step 10 User agents may set (`Accept`, `text/event-stream`) in request's header list.
         // TODO(eijebong): Replace once typed headers allow it
         request.headers.insert(
             header::ACCEPT,
             HeaderValue::from_static("text/event-stream"),
         );
-        // Step 11
+        // Step 11 Set request's cache mode to "no-store".
         request.cache_mode = CacheMode::NoStore;
-        // Step 12
+        // Step 13 Set ev's request to request.
         *ev.request.borrow_mut() = Some(request.clone());
-        // Step 14
+        // Step 14 Let processEventSourceEndOfBody given response res be the following step:
+        // if res is not a network error, then reestablish the connection.
         let (action_sender, action_receiver) = ipc::channel().unwrap();
         let context = EventSourceContext {
             incomplete_utf8: None,
@@ -612,7 +640,7 @@ impl EventSourceMethods<crate::DomTypeHolder> for EventSource {
                 FetchChannels::ResponseMsg(action_sender),
             ))
             .unwrap();
-        // Step 13
+        // Step 16 Return ev.
         Ok(ev)
     }
 
diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs
index 43e62b528d8..1a5aafb0ae7 100644
--- a/components/script/dom/eventtarget.rs
+++ b/components/script/dom/eventtarget.rs
@@ -11,6 +11,7 @@ use std::mem;
 use std::ops::{Deref, DerefMut};
 use std::rc::Rc;
 
+use content_security_policy as csp;
 use deny_public_fields::DenyPublicFields;
 use dom_struct::dom_struct;
 use fnv::FnvHasher;
@@ -307,11 +308,36 @@ impl CompiledEventListener {
 // (as distinct from https://dom.spec.whatwg.org/#callbackdef-eventlistener)
 #[derive(Clone, DenyPublicFields, JSTraceable, MallocSizeOf)]
 /// A listener in a collection of event listeners.
-struct EventListenerEntry {
+pub(crate) struct EventListenerEntry {
     phase: ListenerPhase,
     listener: EventListenerType,
     once: bool,
     passive: Option<bool>,
+    removed: bool,
+}
+
+impl EventListenerEntry {
+    pub(crate) fn phase(&self) -> ListenerPhase {
+        self.phase
+    }
+
+    pub(crate) fn once(&self) -> bool {
+        self.once
+    }
+
+    pub(crate) fn removed(&self) -> bool {
+        self.removed
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#getting-the-current-value-of-the-event-handler>
+    pub(crate) fn get_compiled_listener(
+        &self,
+        owner: &EventTarget,
+        ty: &Atom,
+        can_gc: CanGc,
+    ) -> Option<CompiledEventListener> {
+        self.listener.get_compiled_listener(owner, ty, can_gc)
+    }
 }
 
 impl std::cmp::PartialEq for EventListenerEntry {
@@ -320,19 +346,21 @@ impl std::cmp::PartialEq for EventListenerEntry {
     }
 }
 
-#[derive(JSTraceable, MallocSizeOf)]
+#[derive(Clone, JSTraceable, MallocSizeOf)]
 /// A mix of potentially uncompiled and compiled event listeners of the same type.
-struct EventListeners(Vec<EventListenerEntry>);
+pub(crate) struct EventListeners(
+    #[ignore_malloc_size_of = "Rc"] Vec<Rc<RefCell<EventListenerEntry>>>,
+);
 
 impl Deref for EventListeners {
-    type Target = Vec<EventListenerEntry>;
-    fn deref(&self) -> &Vec<EventListenerEntry> {
+    type Target = Vec<Rc<RefCell<EventListenerEntry>>>;
+    fn deref(&self) -> &Vec<Rc<RefCell<EventListenerEntry>>> {
         &self.0
     }
 }
 
 impl DerefMut for EventListeners {
-    fn deref_mut(&mut self) -> &mut Vec<EventListenerEntry> {
+    fn deref_mut(&mut self) -> &mut Vec<Rc<RefCell<EventListenerEntry>>> {
         &mut self.0
     }
 }
@@ -346,7 +374,7 @@ impl EventListeners {
         can_gc: CanGc,
     ) -> Option<CommonEventHandler> {
         for entry in &self.0 {
-            if let EventListenerType::Inline(ref inline) = entry.listener {
+            if let EventListenerType::Inline(ref inline) = entry.borrow().listener {
                 // Step 1.1-1.8 and Step 2
                 return get_compiled_handler(inline, owner, ty, can_gc);
             }
@@ -356,30 +384,7 @@ impl EventListeners {
         None
     }
 
-    // https://html.spec.whatwg.org/multipage/#getting-the-current-value-of-the-event-handler
-    fn get_listeners(
-        &self,
-        phase: Option<ListenerPhase>,
-        owner: &EventTarget,
-        ty: &Atom,
-        can_gc: CanGc,
-    ) -> Vec<CompiledEventListener> {
-        self.0
-            .iter()
-            .filter_map(|entry| {
-                if phase.is_none() || Some(entry.phase) == phase {
-                    // Step 1.1-1.8, 2
-                    entry.listener.get_compiled_listener(owner, ty, can_gc)
-                } else {
-                    None
-                }
-            })
-            .collect()
-    }
-
     fn has_listeners(&self) -> bool {
-        // TODO: add, and take into account, a 'removed' field?
-        // https://dom.spec.whatwg.org/#event-listener-removed
         !self.0.is_empty()
     }
 }
@@ -420,18 +425,11 @@ impl EventTarget {
         }
     }
 
-    pub(crate) fn get_listeners_for(
-        &self,
-        type_: &Atom,
-        specific_phase: Option<ListenerPhase>,
-        can_gc: CanGc,
-    ) -> Vec<CompiledEventListener> {
+    pub(crate) fn get_listeners_for(&self, type_: &Atom) -> EventListeners {
         self.handlers
             .borrow()
             .get(type_)
-            .map_or(vec![], |listeners| {
-                listeners.get_listeners(specific_phase, self, type_, can_gc)
-            })
+            .map_or(EventListeners(vec![]), |listeners| listeners.clone())
     }
 
     pub(crate) fn dispatch_event(&self, event: &Event, can_gc: CanGc) -> EventStatus {
@@ -439,7 +437,14 @@ impl EventTarget {
     }
 
     pub(crate) fn remove_all_listeners(&self) {
-        *self.handlers.borrow_mut() = Default::default();
+        let mut handlers = self.handlers.borrow_mut();
+        for (_, entries) in handlers.iter() {
+            entries
+                .iter()
+                .for_each(|entry| entry.borrow_mut().removed = true);
+        }
+
+        *handlers = Default::default();
     }
 
     /// <https://dom.spec.whatwg.org/#default-passive-value>
@@ -488,50 +493,49 @@ impl EventTarget {
 
         let idx = entries
             .iter()
-            .position(|entry| matches!(entry.listener, EventListenerType::Inline(_)));
+            .position(|entry| matches!(entry.borrow().listener, EventListenerType::Inline(_)));
 
         match idx {
             Some(idx) => match listener {
                 // Replace if there's something to replace with,
                 // but remove entirely if there isn't.
                 Some(listener) => {
-                    entries[idx].listener = EventListenerType::Inline(listener.into());
+                    entries[idx].borrow_mut().listener = EventListenerType::Inline(listener.into());
                 },
                 None => {
-                    entries.remove(idx);
+                    entries.remove(idx).borrow_mut().removed = true;
                 },
             },
             None => {
                 if let Some(listener) = listener {
-                    entries.push(EventListenerEntry {
+                    entries.push(Rc::new(RefCell::new(EventListenerEntry {
                         phase: ListenerPhase::Bubbling,
                         listener: EventListenerType::Inline(listener.into()),
                         once: false,
                         passive: None,
-                    });
+                        removed: false,
+                    })));
                 }
             },
         }
     }
 
-    pub(crate) fn remove_listener_if_once(&self, ty: &Atom, listener: &Rc<EventListener>) {
+    pub(crate) fn remove_listener(&self, ty: &Atom, entry: &Rc<RefCell<EventListenerEntry>>) {
         let mut handlers = self.handlers.borrow_mut();
 
-        let listener = EventListenerType::Additive(listener.clone());
         if let Some(entries) = handlers.get_mut(ty) {
-            entries.retain(|e| e.listener != listener || !e.once)
+            if let Some(position) = entries.iter().position(|e| *e == *entry) {
+                entries.remove(position).borrow_mut().removed = true;
+            }
         }
     }
 
     /// Determines the `passive` attribute of an associated event listener
-    pub(crate) fn is_passive(&self, ty: &Atom, listener: &Rc<EventListener>) -> bool {
-        let handlers = self.handlers.borrow();
-        let listener_instance = EventListenerType::Additive(listener.clone());
-
-        handlers
-            .get(ty)
-            .and_then(|entries| entries.iter().find(|e| e.listener == listener_instance))
-            .is_some_and(|entry| entry.passive.unwrap_or(self.default_passive_value(ty)))
+    pub(crate) fn is_passive(&self, ty: &Atom, listener: &Rc<RefCell<EventListenerEntry>>) -> bool {
+        listener
+            .borrow()
+            .passive
+            .unwrap_or(self.default_passive_value(ty))
     }
 
     fn get_inline_event_listener(&self, ty: &Atom, can_gc: CanGc) -> Option<CommonEventHandler> {
@@ -548,9 +552,25 @@ impl EventTarget {
         url: ServoUrl,
         line: usize,
         ty: &str,
-        source: DOMString,
+        source: &str,
     ) {
-        let handler = InternalRawUncompiledHandler { source, line, url };
+        if let Some(element) = self.downcast::<Element>() {
+            let doc = element.owner_document();
+            if doc.should_elements_inline_type_behavior_be_blocked(
+                element.upcast(),
+                csp::InlineCheckType::ScriptAttribute,
+                source,
+            ) == csp::CheckResult::Blocked
+            {
+                return;
+            }
+        };
+
+        let handler = InternalRawUncompiledHandler {
+            source: DOMString::from(source),
+            line,
+            url,
+        };
         self.set_inline_event_listener(
             Atom::from(ty),
             Some(InlineEventListener::Uncompiled(handler)),
@@ -810,7 +830,7 @@ impl EventTarget {
             None => return,
         };
         let mut handlers = self.handlers.borrow_mut();
-        let entry = match handlers.entry(Atom::from(ty)) {
+        let entries = match handlers.entry(Atom::from(ty)) {
             Occupied(entry) => entry.into_mut(),
             Vacant(entry) => entry.insert(EventListeners(vec![])),
         };
@@ -820,14 +840,16 @@ impl EventTarget {
         } else {
             ListenerPhase::Bubbling
         };
-        let new_entry = EventListenerEntry {
+        let new_entry = Rc::new(RefCell::new(EventListenerEntry {
             phase,
             listener: EventListenerType::Additive(listener),
             once: options.once,
             passive: options.passive,
-        };
-        if !entry.contains(&new_entry) {
-            entry.push(new_entry);
+            removed: false,
+        }));
+
+        if !entries.contains(&new_entry) {
+            entries.push(new_entry);
         }
     }
 
@@ -842,21 +864,21 @@ impl EventTarget {
             return;
         };
         let mut handlers = self.handlers.borrow_mut();
-        let entry = handlers.get_mut(&Atom::from(ty));
-        if let Some(entry) = entry {
+        if let Some(entries) = handlers.get_mut(&Atom::from(ty)) {
             let phase = if options.capture {
                 ListenerPhase::Capturing
             } else {
                 ListenerPhase::Bubbling
             };
-            let old_entry = EventListenerEntry {
+            let old_entry = Rc::new(RefCell::new(EventListenerEntry {
                 phase,
                 listener: EventListenerType::Additive(listener.clone()),
                 once: false,
                 passive: None,
-            };
-            if let Some(position) = entry.iter().position(|e| *e == old_entry) {
-                entry.remove(position);
+                removed: false,
+            }));
+            if let Some(position) = entries.iter().position(|e| *e == old_entry) {
+                entries.remove(position).borrow_mut().removed = true;
             }
         }
     }
diff --git a/components/script/dom/file.rs b/components/script/dom/file.rs
index 06671794c13..b80b02b0d0e 100644
--- a/components/script/dom/file.rs
+++ b/components/script/dom/file.rs
@@ -4,10 +4,10 @@
 
 use std::time::SystemTime;
 
+use constellation_traits::BlobImpl;
 use dom_struct::dom_struct;
 use js::rust::HandleObject;
 use net_traits::filemanager_thread::SelectedFile;
-use script_traits::serializable::BlobImpl;
 use time::{Duration, OffsetDateTime};
 
 use crate::dom::bindings::codegen::Bindings::FileBinding;
@@ -108,6 +108,10 @@ impl File {
     pub(crate) fn file_type(&self) -> String {
         self.blob.type_string()
     }
+
+    pub(crate) fn get_modified(&self) -> SystemTime {
+        self.modified
+    }
 }
 
 impl FileMethods<crate::DomTypeHolder> for File {
@@ -132,15 +136,12 @@ impl FileMethods<crate::DomTypeHolder> for File {
             .map(|modified| OffsetDateTime::UNIX_EPOCH + Duration::milliseconds(modified))
             .map(Into::into);
 
-        // NOTE: Following behaviour might be removed in future,
-        // see https://github.com/w3c/FileAPI/issues/41
-        let replaced_filename = DOMString::from_string(filename.replace('/', ":"));
         let type_string = normalize_type_string(blobPropertyBag.type_.as_ref());
         Ok(File::new_with_proto(
             global,
             proto,
             BlobImpl::new_from_bytes(bytes, type_string),
-            replaced_filename,
+            filename,
             modified,
             can_gc,
         ))
diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs
index e3d0e1fd513..fdbef3739c8 100644
--- a/components/script/dom/filereader.rs
+++ b/components/script/dom/filereader.rs
@@ -14,6 +14,7 @@ use js::jsval::{self, JSVal};
 use js::rust::HandleObject;
 use js::typedarray::{ArrayBuffer, CreateWith};
 use mime::{self, Mime};
+use script_bindings::num::Finite;
 use stylo_atoms::Atom;
 
 use crate::dom::bindings::cell::DomRefCell;
@@ -463,8 +464,8 @@ impl FileReader {
             EventBubbles::DoesNotBubble,
             EventCancelable::NotCancelable,
             total.is_some(),
-            loaded,
-            total.unwrap_or(0),
+            Finite::wrap(loaded as f64),
+            Finite::wrap(total.unwrap_or(0) as f64),
             can_gc,
         );
         progressevent.upcast::<Event>().fire(self.upcast(), can_gc);
diff --git a/components/script/dom/focusevent.rs b/components/script/dom/focusevent.rs
index a90756918ac..f59ca5927af 100644
--- a/components/script/dom/focusevent.rs
+++ b/components/script/dom/focusevent.rs
@@ -15,7 +15,7 @@ use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::{DomRoot, MutNullableDom};
 use crate::dom::bindings::str::DOMString;
-use crate::dom::event::{EventBubbles, EventCancelable};
+use crate::dom::event::{Event, EventBubbles, EventCancelable};
 use crate::dom::eventtarget::EventTarget;
 use crate::dom::uievent::UIEvent;
 use crate::dom::window::Window;
@@ -118,6 +118,9 @@ impl FocusEventMethods<crate::DomTypeHolder> for FocusEvent {
             init.relatedTarget.as_deref(),
             can_gc,
         );
+        event
+            .upcast::<Event>()
+            .set_composed(init.parent.parent.composed);
         Ok(event)
     }
 
diff --git a/components/script/dom/formdata.rs b/components/script/dom/formdata.rs
index 6c8c7e057a9..7703ecb0e76 100644
--- a/components/script/dom/formdata.rs
+++ b/components/script/dom/formdata.rs
@@ -2,10 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use constellation_traits::BlobImpl;
 use dom_struct::dom_struct;
 use html5ever::LocalName;
 use js::rust::HandleObject;
-use script_traits::serializable::BlobImpl;
 
 use super::bindings::trace::NoTrace;
 use crate::dom::bindings::cell::DomRefCell;
@@ -275,12 +275,13 @@ impl FormData {
         };
 
         let bytes = blob.get_bytes().unwrap_or_default();
+        let last_modified = blob.downcast::<File>().map(|file| file.get_modified());
 
         File::new(
             &self.global(),
             BlobImpl::new_from_bytes(bytes, blob.type_string()),
             name,
-            None,
+            last_modified,
             can_gc,
         )
     }
diff --git a/components/script/dom/formdataevent.rs b/components/script/dom/formdataevent.rs
index bb089a36c39..189c9b25182 100644
--- a/components/script/dom/formdataevent.rs
+++ b/components/script/dom/formdataevent.rs
@@ -11,12 +11,11 @@ use crate::dom::bindings::codegen::Bindings::FormDataEventBinding;
 use crate::dom::bindings::codegen::Bindings::FormDataEventBinding::FormDataEventMethods;
 use crate::dom::bindings::error::Fallible;
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::event::{Event, EventBubbles, EventCancelable};
 use crate::dom::formdata::FormData;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
 
@@ -28,7 +27,7 @@ pub(crate) struct FormDataEvent {
 
 impl FormDataEvent {
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         type_: Atom,
         can_bubble: EventBubbles,
         cancelable: EventCancelable,
@@ -36,12 +35,12 @@ impl FormDataEvent {
         can_gc: CanGc,
     ) -> DomRoot<FormDataEvent> {
         Self::new_with_proto(
-            global, None, type_, can_bubble, cancelable, form_data, can_gc,
+            window, None, type_, can_bubble, cancelable, form_data, can_gc,
         )
     }
 
     fn new_with_proto(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         type_: Atom,
         can_bubble: EventBubbles,
@@ -54,7 +53,7 @@ impl FormDataEvent {
                 event: Event::new_inherited(),
                 form_data: Dom::from_ref(form_data),
             }),
-            global,
+            window,
             proto,
             can_gc,
         );
@@ -80,7 +79,7 @@ impl FormDataEventMethods<crate::DomTypeHolder> for FormDataEvent {
         let cancelable = EventCancelable::from(init.parent.cancelable);
 
         let event = FormDataEvent::new_with_proto(
-            &window.global(),
+            window,
             proto,
             Atom::from(type_),
             bubbles,
diff --git a/components/script/dom/gamepad.rs b/components/script/dom/gamepad.rs
index 6087b2b4ff2..baf3af7466f 100644
--- a/components/script/dom/gamepad.rs
+++ b/components/script/dom/gamepad.rs
@@ -13,7 +13,7 @@ use crate::dom::bindings::codegen::Bindings::GamepadBinding::{GamepadHand, Gamep
 use crate::dom::bindings::codegen::Bindings::GamepadButtonListBinding::GamepadButtonListMethods;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::num::Finite;
-use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::event::Event;
@@ -23,6 +23,7 @@ use crate::dom::gamepadevent::{GamepadEvent, GamepadEventType};
 use crate::dom::gamepadhapticactuator::GamepadHapticActuator;
 use crate::dom::gamepadpose::GamepadPose;
 use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use crate::script_runtime::{CanGc, JSContext};
 
 // This value is for determining when to consider a gamepad as having a user gesture
@@ -88,39 +89,14 @@ impl Gamepad {
         }
     }
 
-    #[allow(clippy::too_many_arguments)]
-    pub(crate) fn new(
-        global: &GlobalScope,
-        gamepad_id: u32,
-        id: String,
-        mapping_type: String,
-        axis_bounds: (f64, f64),
-        button_bounds: (f64, f64),
-        supported_haptic_effects: GamepadSupportedHapticEffects,
-        xr: bool,
-        can_gc: CanGc,
-    ) -> DomRoot<Gamepad> {
-        Self::new_with_proto(
-            global,
-            gamepad_id,
-            id,
-            mapping_type,
-            axis_bounds,
-            button_bounds,
-            supported_haptic_effects,
-            xr,
-            can_gc,
-        )
-    }
-
     /// When we construct a new gamepad, we initialize the number of buttons and
     /// axes corresponding to the "standard" gamepad mapping.
     /// The spec says UAs *may* do this for fingerprint mitigation, and it also
     /// happens to simplify implementation
     /// <https://www.w3.org/TR/gamepad/#fingerprinting-mitigation>
     #[allow(clippy::too_many_arguments)]
-    fn new_with_proto(
-        global: &GlobalScope,
+    pub(crate) fn new(
+        window: &Window,
         gamepad_id: u32,
         id: String,
         mapping_type: String,
@@ -130,11 +106,11 @@ impl Gamepad {
         xr: bool,
         can_gc: CanGc,
     ) -> DomRoot<Gamepad> {
-        let button_list = GamepadButtonList::init_buttons(global, can_gc);
+        let button_list = GamepadButtonList::init_buttons(window, can_gc);
         let vibration_actuator =
-            GamepadHapticActuator::new(global, gamepad_id, supported_haptic_effects, can_gc);
+            GamepadHapticActuator::new(window, gamepad_id, supported_haptic_effects, can_gc);
         let index = if xr { -1 } else { 0 };
-        let gamepad = reflect_dom_object_with_proto(
+        let gamepad = reflect_dom_object(
             Box::new(Gamepad::new_inherited(
                 gamepad_id,
                 id,
@@ -149,8 +125,7 @@ impl Gamepad {
                 button_bounds,
                 &vibration_actuator,
             )),
-            global,
-            None,
+            window,
             can_gc,
         );
         gamepad.init_axes(can_gc);
@@ -248,7 +223,8 @@ impl Gamepad {
     }
 
     pub(crate) fn notify_event(&self, event_type: GamepadEventType, can_gc: CanGc) {
-        let event = GamepadEvent::new_with_type(&self.global(), event_type, self, can_gc);
+        let event =
+            GamepadEvent::new_with_type(self.global().as_window(), event_type, self, can_gc);
         event
             .upcast::<Event>()
             .fire(self.global().as_window().upcast::<EventTarget>(), can_gc);
diff --git a/components/script/dom/gamepadbutton.rs b/components/script/dom/gamepadbutton.rs
index fead990ccd3..3588ba775ca 100644
--- a/components/script/dom/gamepadbutton.rs
+++ b/components/script/dom/gamepadbutton.rs
@@ -10,7 +10,7 @@ use crate::dom::bindings::codegen::Bindings::GamepadButtonBinding::GamepadButton
 use crate::dom::bindings::num::Finite;
 use crate::dom::bindings::reflector::{Reflector, reflect_dom_object};
 use crate::dom::bindings::root::DomRoot;
-use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
 
 #[dom_struct]
@@ -32,14 +32,14 @@ impl GamepadButton {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         pressed: bool,
         touched: bool,
         can_gc: CanGc,
     ) -> DomRoot<GamepadButton> {
         reflect_dom_object(
             Box::new(GamepadButton::new_inherited(pressed, touched)),
-            global,
+            window,
             can_gc,
         )
     }
diff --git a/components/script/dom/gamepadbuttonlist.rs b/components/script/dom/gamepadbuttonlist.rs
index 50d9c8172bc..7e540ab56bb 100644
--- a/components/script/dom/gamepadbuttonlist.rs
+++ b/components/script/dom/gamepadbuttonlist.rs
@@ -8,7 +8,7 @@ use crate::dom::bindings::codegen::Bindings::GamepadButtonListBinding::GamepadBu
 use crate::dom::bindings::reflector::{Reflector, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot, DomSlice};
 use crate::dom::gamepadbutton::GamepadButton;
-use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
 
 // https://w3c.github.io/gamepad/#gamepadbutton-interface
@@ -28,13 +28,13 @@ impl GamepadButtonList {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         list: &[&GamepadButton],
         can_gc: CanGc,
     ) -> DomRoot<GamepadButtonList> {
         reflect_dom_object(
             Box::new(GamepadButtonList::new_inherited(list)),
-            global,
+            window,
             can_gc,
         )
     }
@@ -62,27 +62,27 @@ impl GamepadButtonListMethods<crate::DomTypeHolder> for GamepadButtonList {
 impl GamepadButtonList {
     /// Initialize the number of buttons in the "standard" gamepad mapping.
     /// <https://www.w3.org/TR/gamepad/#dfn-initializing-buttons>
-    pub(crate) fn init_buttons(global: &GlobalScope, can_gc: CanGc) -> DomRoot<GamepadButtonList> {
+    pub(crate) fn init_buttons(window: &Window, can_gc: CanGc) -> DomRoot<GamepadButtonList> {
         let standard_buttons = &[
-            GamepadButton::new(global, false, false, can_gc), // Bottom button in right cluster
-            GamepadButton::new(global, false, false, can_gc), // Right button in right cluster
-            GamepadButton::new(global, false, false, can_gc), // Left button in right cluster
-            GamepadButton::new(global, false, false, can_gc), // Top button in right cluster
-            GamepadButton::new(global, false, false, can_gc), // Top left front button
-            GamepadButton::new(global, false, false, can_gc), // Top right front button
-            GamepadButton::new(global, false, false, can_gc), // Bottom left front button
-            GamepadButton::new(global, false, false, can_gc), // Bottom right front button
-            GamepadButton::new(global, false, false, can_gc), // Left button in center cluster
-            GamepadButton::new(global, false, false, can_gc), // Right button in center cluster
-            GamepadButton::new(global, false, false, can_gc), // Left stick pressed button
-            GamepadButton::new(global, false, false, can_gc), // Right stick pressed button
-            GamepadButton::new(global, false, false, can_gc), // Top button in left cluster
-            GamepadButton::new(global, false, false, can_gc), // Bottom button in left cluster
-            GamepadButton::new(global, false, false, can_gc), // Left button in left cluster
-            GamepadButton::new(global, false, false, can_gc), // Right button in left cluster
-            GamepadButton::new(global, false, false, can_gc), // Center button in center cluster
+            GamepadButton::new(window, false, false, can_gc), // Bottom button in right cluster
+            GamepadButton::new(window, false, false, can_gc), // Right button in right cluster
+            GamepadButton::new(window, false, false, can_gc), // Left button in right cluster
+            GamepadButton::new(window, false, false, can_gc), // Top button in right cluster
+            GamepadButton::new(window, false, false, can_gc), // Top left front button
+            GamepadButton::new(window, false, false, can_gc), // Top right front button
+            GamepadButton::new(window, false, false, can_gc), // Bottom left front button
+            GamepadButton::new(window, false, false, can_gc), // Bottom right front button
+            GamepadButton::new(window, false, false, can_gc), // Left button in center cluster
+            GamepadButton::new(window, false, false, can_gc), // Right button in center cluster
+            GamepadButton::new(window, false, false, can_gc), // Left stick pressed button
+            GamepadButton::new(window, false, false, can_gc), // Right stick pressed button
+            GamepadButton::new(window, false, false, can_gc), // Top button in left cluster
+            GamepadButton::new(window, false, false, can_gc), // Bottom button in left cluster
+            GamepadButton::new(window, false, false, can_gc), // Left button in left cluster
+            GamepadButton::new(window, false, false, can_gc), // Right button in left cluster
+            GamepadButton::new(window, false, false, can_gc), // Center button in center cluster
         ];
         rooted_vec!(let buttons <- standard_buttons.iter().map(DomRoot::as_traced));
-        Self::new(global, buttons.r(), can_gc)
+        Self::new(window, buttons.r(), can_gc)
     }
 }
diff --git a/components/script/dom/gamepadevent.rs b/components/script/dom/gamepadevent.rs
index 4479b5516c0..5eabfd6111a 100644
--- a/components/script/dom/gamepadevent.rs
+++ b/components/script/dom/gamepadevent.rs
@@ -11,12 +11,11 @@ use crate::dom::bindings::codegen::Bindings::GamepadEventBinding;
 use crate::dom::bindings::codegen::Bindings::GamepadEventBinding::GamepadEventMethods;
 use crate::dom::bindings::error::Fallible;
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::event::Event;
 use crate::dom::gamepad::Gamepad;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
 
@@ -40,18 +39,18 @@ impl GamepadEvent {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         type_: Atom,
         bubbles: bool,
         cancelable: bool,
         gamepad: &Gamepad,
         can_gc: CanGc,
     ) -> DomRoot<GamepadEvent> {
-        Self::new_with_proto(global, None, type_, bubbles, cancelable, gamepad, can_gc)
+        Self::new_with_proto(window, None, type_, bubbles, cancelable, gamepad, can_gc)
     }
 
     fn new_with_proto(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         type_: Atom,
         bubbles: bool,
@@ -61,7 +60,7 @@ impl GamepadEvent {
     ) -> DomRoot<GamepadEvent> {
         let ev = reflect_dom_object_with_proto(
             Box::new(GamepadEvent::new_inherited(gamepad)),
-            global,
+            window,
             proto,
             can_gc,
         );
@@ -73,7 +72,7 @@ impl GamepadEvent {
     }
 
     pub(crate) fn new_with_type(
-        global: &GlobalScope,
+        window: &Window,
         event_type: GamepadEventType,
         gamepad: &Gamepad,
         can_gc: CanGc,
@@ -83,7 +82,7 @@ impl GamepadEvent {
             GamepadEventType::Disconnected => "gamepaddisconnected",
         };
 
-        GamepadEvent::new(global, name.into(), false, false, gamepad, can_gc)
+        GamepadEvent::new(window, name.into(), false, false, gamepad, can_gc)
     }
 }
 
@@ -97,7 +96,7 @@ impl GamepadEventMethods<crate::DomTypeHolder> for GamepadEvent {
         init: &GamepadEventBinding::GamepadEventInit,
     ) -> Fallible<DomRoot<GamepadEvent>> {
         Ok(GamepadEvent::new_with_proto(
-            &window.global(),
+            window,
             proto,
             Atom::from(type_),
             init.parent.bubbles,
diff --git a/components/script/dom/gamepadhapticactuator.rs b/components/script/dom/gamepadhapticactuator.rs
index d19db6d1279..ddea21b97ee 100644
--- a/components/script/dom/gamepadhapticactuator.rs
+++ b/components/script/dom/gamepadhapticactuator.rs
@@ -18,12 +18,12 @@ use crate::dom::bindings::codegen::Bindings::GamepadHapticActuatorBinding::{
 use crate::dom::bindings::codegen::Bindings::WindowBinding::Window_Binding::WindowMethods;
 use crate::dom::bindings::error::Error;
 use crate::dom::bindings::refcounted::{Trusted, TrustedPromise};
-use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object};
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
 use crate::dom::bindings::utils::to_frozen_array;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::promise::Promise;
+use crate::dom::window::Window;
 use crate::realms::InRealm;
 use crate::script_runtime::{CanGc, JSContext};
 use crate::task_source::SendableTaskSource;
@@ -98,27 +98,17 @@ impl GamepadHapticActuator {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         gamepad_index: u32,
         supported_haptic_effects: GamepadSupportedHapticEffects,
         can_gc: CanGc,
     ) -> DomRoot<GamepadHapticActuator> {
-        Self::new_with_proto(global, gamepad_index, supported_haptic_effects, can_gc)
-    }
-
-    fn new_with_proto(
-        global: &GlobalScope,
-        gamepad_index: u32,
-        supported_haptic_effects: GamepadSupportedHapticEffects,
-        can_gc: CanGc,
-    ) -> DomRoot<GamepadHapticActuator> {
-        reflect_dom_object_with_proto(
+        reflect_dom_object(
             Box::new(GamepadHapticActuator::new_inherited(
                 gamepad_index,
                 supported_haptic_effects,
             )),
-            global,
-            None,
+            window,
             can_gc,
         )
     }
diff --git a/components/script/dom/globalscope.rs b/components/script/dom/globalscope.rs
index c4625895f3a..55db2e4d248 100644
--- a/components/script/dom/globalscope.rs
+++ b/components/script/dom/globalscope.rs
@@ -2,8 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use std::borrow::Cow;
-use std::cell::{Cell, OnceCell};
+use std::cell::{Cell, OnceCell, Ref};
 use std::collections::hash_map::Entry;
 use std::collections::{HashMap, VecDeque};
 use std::ops::Index;
@@ -18,20 +17,26 @@ use base::id::{
     BlobId, BroadcastChannelRouterId, MessagePortId, MessagePortRouterId, PipelineId,
     ServiceWorkerId, ServiceWorkerRegistrationId, WebViewId,
 };
-use content_security_policy::{CheckResult, CspList, PolicyDisposition};
+use constellation_traits::{
+    BlobData, BlobImpl, BroadcastMsg, FileBlob, LoadData, LoadOrigin, MessagePortImpl,
+    MessagePortMsg, PortMessageTask, ScriptToConstellationChan, ScriptToConstellationMessage,
+};
+use content_security_policy::{
+    CheckResult, CspList, Destination, Initiator, NavigationCheckType, ParserMetadata,
+    PolicyDisposition, PolicySource, Request, Violation, ViolationResource,
+};
 use crossbeam_channel::Sender;
 use devtools_traits::{PageError, ScriptToDevtoolsControlMsg};
 use dom_struct::dom_struct;
-use embedder_traits::{
-    EmbedderMsg, GamepadEvent, GamepadSupportedHapticEffects, GamepadUpdateType,
-};
+use embedder_traits::EmbedderMsg;
+use http::HeaderMap;
+use hyper_serde::Serde;
 use ipc_channel::ipc::{self, IpcSender};
 use ipc_channel::router::ROUTER;
 use js::glue::{IsWrapper, UnwrapObjectDynamic};
 use js::jsapi::{
     Compile1, CurrentGlobalOrNull, GetNonCCWObjectGlobal, HandleObject, Heap,
-    InstantiateGlobalStencil, InstantiateOptions, JSContext, JSObject, JSScript, RuntimeCode,
-    SetScriptPrivate,
+    InstantiateGlobalStencil, InstantiateOptions, JSContext, JSObject, JSScript, SetScriptPrivate,
 };
 use js::jsval::{PrivateValue, UndefinedValue};
 use js::panic::maybe_resume_unwind;
@@ -55,16 +60,13 @@ use net_traits::{
     ResourceThreads, fetch_async,
 };
 use profile_traits::{ipc as profile_ipc, mem as profile_mem, time as profile_time};
-use script_traits::serializable::{BlobData, BlobImpl, FileBlob};
-use script_traits::transferable::MessagePortImpl;
-use script_traits::{
-    BroadcastMsg, MessagePortMsg, PortMessageTask, ScriptMsg, ScriptToConstellationChan,
-};
+use script_bindings::interfaces::GlobalScopeHelpers;
 use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl};
 use timers::{TimerEventId, TimerEventRequest, TimerSource};
+use url::Origin;
 use uuid::Uuid;
 #[cfg(feature = "webgpu")]
-use webgpu::{DeviceLostReason, WebGPUDevice};
+use webgpu_traits::{DeviceLostReason, WebGPUDevice};
 
 use super::bindings::codegen::Bindings::MessagePortBinding::StructuredSerializeOptions;
 #[cfg(feature = "webgpu")]
@@ -79,9 +81,7 @@ use crate::dom::bindings::codegen::Bindings::FunctionBinding::Function;
 use crate::dom::bindings::codegen::Bindings::ImageBitmapBinding::{
     ImageBitmapOptions, ImageBitmapSource,
 };
-use crate::dom::bindings::codegen::Bindings::NavigatorBinding::NavigatorMethods;
 use crate::dom::bindings::codegen::Bindings::NotificationBinding::NotificationPermissionCallback;
-use crate::dom::bindings::codegen::Bindings::PerformanceBinding::Performance_Binding::PerformanceMethods;
 use crate::dom::bindings::codegen::Bindings::PermissionStatusBinding::{
     PermissionName, PermissionState,
 };
@@ -106,24 +106,25 @@ use crate::dom::crypto::Crypto;
 use crate::dom::dedicatedworkerglobalscope::{
     DedicatedWorkerControlMsg, DedicatedWorkerGlobalScope,
 };
+use crate::dom::element::Element;
 use crate::dom::errorevent::ErrorEvent;
 use crate::dom::event::{Event, EventBubbles, EventCancelable, EventStatus};
 use crate::dom::eventsource::EventSource;
 use crate::dom::eventtarget::EventTarget;
 use crate::dom::file::File;
-use crate::dom::gamepad::{Gamepad, contains_user_gesture};
-use crate::dom::gamepadevent::GamepadEventType;
 use crate::dom::htmlscriptelement::{ScriptId, SourceCode};
 use crate::dom::imagebitmap::ImageBitmap;
 use crate::dom::messageevent::MessageEvent;
 use crate::dom::messageport::MessagePort;
+use crate::dom::node::Node;
 use crate::dom::paintworkletglobalscope::PaintWorkletGlobalScope;
 use crate::dom::performance::Performance;
 use crate::dom::performanceobserver::VALID_ENTRY_TYPES;
 use crate::dom::promise::Promise;
-use crate::dom::readablestream::ReadableStream;
+use crate::dom::readablestream::{CrossRealmTransformReadable, ReadableStream};
 use crate::dom::serviceworker::ServiceWorker;
 use crate::dom::serviceworkerregistration::ServiceWorkerRegistration;
+use crate::dom::trustedtypepolicyfactory::TrustedTypePolicyFactory;
 use crate::dom::underlyingsourcecontainer::UnderlyingSourceType;
 #[cfg(feature = "webgpu")]
 use crate::dom::webgpu::gpudevice::GPUDevice;
@@ -132,6 +133,7 @@ use crate::dom::webgpu::identityhub::IdentityHub;
 use crate::dom::window::Window;
 use crate::dom::workerglobalscope::WorkerGlobalScope;
 use crate::dom::workletglobalscope::WorkletGlobalScope;
+use crate::dom::writablestream::CrossRealmTransformWritable;
 use crate::messaging::{CommonScriptMsg, ScriptEventLoopReceiver, ScriptEventLoopSender};
 use crate::microtask::{Microtask, MicrotaskQueue, UserMicrotask};
 use crate::network_listener::{NetworkListener, PreInvoke};
@@ -139,7 +141,7 @@ use crate::realms::{AlreadyInRealm, InRealm, enter_realm};
 use crate::script_module::{DynamicModuleList, ModuleScript, ModuleTree, ScriptFetchOptions};
 use crate::script_runtime::{CanGc, JSContext as SafeJSContext, ThreadSafeJSContext};
 use crate::script_thread::{ScriptThread, with_script_thread};
-use crate::security_manager::CSPViolationReporter;
+use crate::security_manager::{CSPViolationReportBuilder, CSPViolationReportTask};
 use crate::task_manager::TaskManager;
 use crate::task_source::SendableTaskSource;
 use crate::timers::{
@@ -319,9 +321,6 @@ pub(crate) struct GlobalScope {
     #[allow(clippy::vec_box)]
     consumed_rejections: DomRefCell<Vec<Box<Heap<*mut JSObject>>>>,
 
-    /// An optional string allowing the user agent to be set for testing.
-    user_agent: Cow<'static, str>,
-
     /// Identity Manager for WebGPU resources
     #[ignore_malloc_size_of = "defined in wgpu"]
     #[no_trace]
@@ -456,8 +455,16 @@ pub(crate) struct ManagedMessagePort {
     /// and only add them, and ask the constellation to complete the transfer,
     /// in a subsequent task if the port hasn't been re-transfered.
     pending: bool,
-    /// Has the port been closed? If closed, it can be dropped and later GC'ed.
-    closed: bool,
+    /// Whether the port has been closed by script in this global,
+    /// so it can be removed.
+    explicitly_closed: bool,
+    /// Note: it may seem strange to use a pair of options, versus for example an enum.
+    /// But it looks like tranform streams will require both of those in their transfer.
+    /// This will be resolved when we reach that point of the implementation.
+    /// <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformreadable>
+    cross_realm_transform_readable: Option<CrossRealmTransformReadable>,
+    /// <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformwritable>
+    cross_realm_transform_writable: Option<CrossRealmTransformWritable>,
 }
 
 /// State representing whether this global is currently managing broadcast channels.
@@ -529,7 +536,7 @@ impl MessageListener {
                                 // If not managing any ports, no transfer can succeed,
                                 // so just send back everything.
                                 let _ = global.script_to_constellation_chan().send(
-                                    ScriptMsg::MessagePortTransferResult(None, vec![], ports),
+                                    ScriptToConstellationMessage::MessagePortTransferResult(None, vec![], ports),
                                 );
                                 return;
                             }
@@ -538,27 +545,40 @@ impl MessageListener {
                         let mut succeeded = vec![];
                         let mut failed = HashMap::new();
 
-                        for (id, buffer) in ports.into_iter() {
+                        for (id, info) in ports.into_iter() {
                             if global.is_managing_port(&id) {
                                 succeeded.push(id);
-                                global.complete_port_transfer(id, buffer);
+                                global.complete_port_transfer(
+                                    id,
+                                    info.port_message_queue,
+                                    info.disentangled,
+                                    CanGc::note()
+                                );
                             } else {
-                                failed.insert(id, buffer);
+                                failed.insert(id, info);
                             }
                         }
                         let _ = global.script_to_constellation_chan().send(
-                            ScriptMsg::MessagePortTransferResult(Some(router_id), succeeded, failed),
+                            ScriptToConstellationMessage::MessagePortTransferResult(Some(router_id), succeeded, failed),
                         );
                     })
                 );
             },
-            MessagePortMsg::CompletePendingTransfer(port_id, buffer) => {
+            MessagePortMsg::CompletePendingTransfer(port_id, info) => {
                 let context = self.context.clone();
                 self.task_source.queue(task!(complete_pending: move || {
                     let global = context.root();
-                    global.complete_port_transfer(port_id, buffer);
+                    global.complete_port_transfer(port_id, info.port_message_queue, info.disentangled, CanGc::note());
                 }));
             },
+            MessagePortMsg::CompleteDisentanglement(port_id) => {
+                let context = self.context.clone();
+                self.task_source
+                    .queue(task!(try_complete_disentanglement: move || {
+                        let global = context.root();
+                        global.try_complete_disentanglement(port_id, CanGc::note());
+                    }));
+            },
             MessagePortMsg::NewTask(port_id, task) => {
                 let context = self.context.clone();
                 self.task_source.queue(task!(process_new_task: move || {
@@ -566,14 +586,6 @@ impl MessageListener {
                     global.route_task_to_port(port_id, task, CanGc::note());
                 }));
             },
-            MessagePortMsg::RemoveMessagePort(port_id) => {
-                let context = self.context.clone();
-                self.task_source
-                    .queue(task!(process_remove_message_port: move || {
-                        let global = context.root();
-                        global.note_entangled_port_removed(&port_id);
-                    }));
-            },
         }
     }
 }
@@ -720,7 +732,6 @@ impl GlobalScope {
         origin: MutableOrigin,
         creation_url: Option<ServoUrl>,
         microtask_queue: Rc<MicrotaskQueue>,
-        user_agent: Cow<'static, str>,
         #[cfg(feature = "webgpu")] gpu_id_hub: Arc<IdentityHub>,
         inherited_secure_context: Option<bool>,
         unminify_js: bool,
@@ -754,7 +765,6 @@ impl GlobalScope {
             event_source_tracker: DOMTracker::new(),
             uncaught_rejections: Default::default(),
             consumed_rejections: Default::default(),
-            user_agent,
             #[cfg(feature = "webgpu")]
             gpu_id_hub,
             #[cfg(feature = "webgpu")]
@@ -865,7 +875,13 @@ impl GlobalScope {
     }
 
     /// Complete the transfer of a message-port.
-    fn complete_port_transfer(&self, port_id: MessagePortId, tasks: VecDeque<PortMessageTask>) {
+    fn complete_port_transfer(
+        &self,
+        port_id: MessagePortId,
+        tasks: VecDeque<PortMessageTask>,
+        disentangled: bool,
+        can_gc: CanGc,
+    ) {
         let should_start = if let MessagePortState::Managed(_id, message_ports) =
             &mut *self.message_port_state.borrow_mut()
         {
@@ -879,6 +895,10 @@ impl GlobalScope {
                     }
                     if let Some(port_impl) = managed_port.port_impl.as_mut() {
                         port_impl.complete_transfer(tasks);
+                        if disentangled {
+                            port_impl.disentangle();
+                            managed_port.dom_port.disentangle();
+                        }
                         port_impl.enabled()
                     } else {
                         panic!("managed-port has no port-impl.");
@@ -889,7 +909,45 @@ impl GlobalScope {
             panic!("complete_port_transfer called for an unknown port.");
         };
         if should_start {
-            self.start_message_port(&port_id);
+            self.start_message_port(&port_id, can_gc);
+        }
+    }
+
+    /// The closing of `otherPort`, if it is in a different global.
+    /// <https://html.spec.whatwg.org/multipage/#disentangle>
+    fn try_complete_disentanglement(&self, port_id: MessagePortId, can_gc: CanGc) {
+        let dom_port = if let MessagePortState::Managed(_id, message_ports) =
+            &mut *self.message_port_state.borrow_mut()
+        {
+            let dom_port = if let Some(managed_port) = message_ports.get_mut(&port_id) {
+                if managed_port.pending {
+                    unreachable!("CompleteDisentanglement msg received for a pending port.");
+                }
+                let port_impl = managed_port
+                    .port_impl
+                    .as_mut()
+                    .expect("managed-port has no port-impl.");
+                port_impl.disentangle();
+                managed_port.dom_port.as_rooted()
+            } else {
+                // Note: this, and the other return below,
+                // can happen if the port has already been transferred out of this global,
+                // in which case the disentanglement will complete along with the transfer.
+                return;
+            };
+            dom_port
+        } else {
+            return;
+        };
+
+        // Fire an event named close at otherPort.
+        dom_port.upcast().fire_event(atom!("close"), can_gc);
+
+        let res = self.script_to_constellation_chan().send(
+            ScriptToConstellationMessage::DisentanglePorts(port_id, None),
+        );
+        if res.is_err() {
+            warn!("Sending DisentanglePorts failed");
         }
     }
 
@@ -921,9 +979,9 @@ impl GlobalScope {
         if let MessagePortState::Managed(router_id, _message_ports) =
             &*self.message_port_state.borrow()
         {
-            let _ = self
-                .script_to_constellation_chan()
-                .send(ScriptMsg::RemoveMessagePortRouter(*router_id));
+            let _ = self.script_to_constellation_chan().send(
+                ScriptToConstellationMessage::RemoveMessagePortRouter(*router_id),
+            );
         }
         *self.message_port_state.borrow_mut() = MessagePortState::UnManaged;
     }
@@ -934,16 +992,77 @@ impl GlobalScope {
         if let BroadcastChannelState::Managed(router_id, _channels) =
             &*self.broadcast_channel_state.borrow()
         {
-            let _ =
-                self.script_to_constellation_chan()
-                    .send(ScriptMsg::RemoveBroadcastChannelRouter(
-                        *router_id,
-                        self.origin().immutable().clone(),
-                    ));
+            let _ = self.script_to_constellation_chan().send(
+                ScriptToConstellationMessage::RemoveBroadcastChannelRouter(
+                    *router_id,
+                    self.origin().immutable().clone(),
+                ),
+            );
         }
         *self.broadcast_channel_state.borrow_mut() = BroadcastChannelState::UnManaged;
     }
 
+    /// <https://html.spec.whatwg.org/multipage/#disentangle>
+    pub(crate) fn disentangle_port(&self, port: &MessagePort, can_gc: CanGc) {
+        let initiator_port = port.message_port_id();
+        // Let otherPort be the MessagePort which initiatorPort was entangled with.
+        let Some(other_port) = port.disentangle() else {
+            // Assert: otherPort exists.
+            // Note: ignoring the assert,
+            // because the streams spec seems to disentangle ports that are disentangled already.
+            return;
+        };
+
+        // Disentangle initiatorPort and otherPort, so that they are no longer entangled or associated with each other.
+        // Note: this is done in part here, and in part at the constellation(if otherPort is in another global).
+        let dom_port = if let MessagePortState::Managed(_id, message_ports) =
+            &mut *self.message_port_state.borrow_mut()
+        {
+            let mut dom_port = None;
+            for port_id in &[initiator_port, &other_port] {
+                match message_ports.get_mut(port_id) {
+                    None => {
+                        continue;
+                    },
+                    Some(managed_port) => {
+                        let port_impl = managed_port
+                            .port_impl
+                            .as_mut()
+                            .expect("managed-port has no port-impl.");
+                        managed_port.dom_port.disentangle();
+                        port_impl.disentangle();
+
+                        if **port_id == other_port {
+                            dom_port = Some(managed_port.dom_port.as_rooted())
+                        }
+                    },
+                }
+            }
+            dom_port
+        } else {
+            panic!("disentangle_port called on a global not managing any ports.");
+        };
+
+        // Fire an event named close at `otherPort`.
+        // Note: done here if the port is managed by the same global as `initialPort`.
+        if let Some(dom_port) = dom_port {
+            dom_port.upcast().fire_event(atom!("close"), can_gc);
+        }
+
+        let chan = self.script_to_constellation_chan().clone();
+        let initiator_port = *initiator_port;
+        self.task_manager()
+            .port_message_queue()
+            .queue(task!(post_message: move || {
+                // Note: we do this in a task to ensure it doesn't affect messages that are still to be routed,
+                // see the task queueing in `post_messageport_msg`.
+                let res = chan.send(ScriptToConstellationMessage::DisentanglePorts(initiator_port, Some(other_port)));
+                if res.is_err() {
+                    warn!("Sending DisentanglePorts failed");
+                }
+            }));
+    }
+
     /// <https://html.spec.whatwg.org/multipage/#entangle>
     pub(crate) fn entangle_ports(&self, port1: MessagePortId, port2: MessagePortId) {
         if let MessagePortState::Managed(_id, message_ports) =
@@ -970,19 +1089,7 @@ impl GlobalScope {
 
         let _ = self
             .script_to_constellation_chan()
-            .send(ScriptMsg::EntanglePorts(port1, port2));
-    }
-
-    /// Note that the entangled port of `port_id` has been removed in another global.
-    pub(crate) fn note_entangled_port_removed(&self, port_id: &MessagePortId) {
-        // Note: currently this is a no-op,
-        // as we only use the `close` method to manage the local lifecyle of a port.
-        // This could be used as part of lifecyle management to determine a port can be GC'ed.
-        // See https://github.com/servo/servo/issues/25772
-        warn!(
-            "Entangled port of {:?} has been removed in another global",
-            port_id
-        );
+            .send(ScriptToConstellationMessage::EntanglePorts(port1, port2));
     }
 
     /// Handle the transfer of a port in the current task.
@@ -1002,7 +1109,7 @@ impl GlobalScope {
             port_impl.set_has_been_shipped();
             let _ = self
                 .script_to_constellation_chan()
-                .send(ScriptMsg::MessagePortShipped(*port_id));
+                .send(ScriptToConstellationMessage::MessagePortShipped(*port_id));
             port_impl
         } else {
             panic!("mark_port_as_transferred called on a global not managing any ports.");
@@ -1010,34 +1117,40 @@ impl GlobalScope {
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-messageport-start>
-    pub(crate) fn start_message_port(&self, port_id: &MessagePortId) {
-        if let MessagePortState::Managed(_id, message_ports) =
+    pub(crate) fn start_message_port(&self, port_id: &MessagePortId, can_gc: CanGc) {
+        let (message_buffer, dom_port) = if let MessagePortState::Managed(_id, message_ports) =
             &mut *self.message_port_state.borrow_mut()
         {
-            let message_buffer = match message_ports.get_mut(port_id) {
+            let (message_buffer, dom_port) = match message_ports.get_mut(port_id) {
                 None => panic!("start_message_port called on a unknown port."),
                 Some(managed_port) => {
                     if let Some(port_impl) = managed_port.port_impl.as_mut() {
-                        port_impl.start()
+                        (port_impl.start(), managed_port.dom_port.as_rooted())
                     } else {
                         panic!("managed-port has no port-impl.");
                     }
                 },
             };
-            if let Some(message_buffer) = message_buffer {
-                for task in message_buffer {
-                    let port_id = *port_id;
-                    let this = Trusted::new(self);
-                    self.task_manager().port_message_queue().queue(
-                        task!(process_pending_port_messages: move || {
-                            let target_global = this.root();
-                            target_global.route_task_to_port(port_id, task, CanGc::note());
-                        }),
-                    );
+            (message_buffer, dom_port)
+        } else {
+            return warn!("start_message_port called on a global not managing any ports.");
+        };
+        if let Some(message_buffer) = message_buffer {
+            for task in message_buffer {
+                self.route_task_to_port(*port_id, task, CanGc::note());
+            }
+            if dom_port.disentangled() {
+                // <https://html.spec.whatwg.org/multipage/#disentangle>
+                // Fire an event named close at otherPort.
+                dom_port.upcast().fire_event(atom!("close"), can_gc);
+
+                let res = self.script_to_constellation_chan().send(
+                    ScriptToConstellationMessage::DisentanglePorts(*port_id, None),
+                );
+                if res.is_err() {
+                    warn!("Sending DisentanglePorts failed");
                 }
             }
-        } else {
-            warn!("start_message_port called on a global not managing any ports.")
         }
     }
 
@@ -1051,7 +1164,7 @@ impl GlobalScope {
                 Some(managed_port) => {
                     if let Some(port_impl) = managed_port.port_impl.as_mut() {
                         port_impl.close();
-                        managed_port.closed = true;
+                        managed_port.explicitly_closed = true;
                     } else {
                         panic!("managed-port has no port-impl.");
                     }
@@ -1098,9 +1211,9 @@ impl GlobalScope {
     /// If we don't know about the port,
     /// send the message to the constellation for routing.
     fn re_route_port_task(&self, port_id: MessagePortId, task: PortMessageTask) {
-        let _ = self
-            .script_to_constellation_chan()
-            .send(ScriptMsg::RerouteMessagePort(port_id, task));
+        let _ = self.script_to_constellation_chan().send(
+            ScriptToConstellationMessage::RerouteMessagePort(port_id, task),
+        );
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-broadcastchannel-postmessage>
@@ -1116,9 +1229,9 @@ impl GlobalScope {
             //
             // Note: for globals in the same script-thread,
             // we could skip the hop to the constellation.
-            let _ = self
-                .script_to_constellation_chan()
-                .send(ScriptMsg::ScheduleBroadcast(*router_id, msg));
+            let _ = self.script_to_constellation_chan().send(
+                ScriptToConstellationMessage::ScheduleBroadcast(*router_id, msg),
+            );
         } else {
             panic!("Attemps to broadcast a message via global not managing any channels.");
         }
@@ -1212,13 +1325,64 @@ impl GlobalScope {
         }
     }
 
-    /// Route the task to be handled by the relevant port.
+    /// <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformreadable>
+    /// The "Add a handler for port’s message event with the following steps:"
+    /// and "Add a handler for port’s messageerror event with the following steps:" part.
+    pub(crate) fn note_cross_realm_transform_readable(
+        &self,
+        cross_realm_transform_readable: &CrossRealmTransformReadable,
+        port_id: &MessagePortId,
+    ) {
+        let MessagePortState::Managed(_id, message_ports) =
+            &mut *self.message_port_state.borrow_mut()
+        else {
+            unreachable!(
+                "Cross realm transform readable must be called on a global managing ports"
+            );
+        };
+
+        let Some(managed_port) = message_ports.get_mut(port_id) else {
+            unreachable!("Cross realm transform readable must match a managed port");
+        };
+
+        managed_port.cross_realm_transform_readable = Some(cross_realm_transform_readable.clone());
+    }
+
+    /// <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformwritable>
+    /// The "Add a handler for port’s message event with the following steps:"
+    /// and "Add a handler for port’s messageerror event with the following steps:" part.
+    pub(crate) fn note_cross_realm_transform_writable(
+        &self,
+        cross_realm_transform_writable: &CrossRealmTransformWritable,
+        port_id: &MessagePortId,
+    ) {
+        let MessagePortState::Managed(_id, message_ports) =
+            &mut *self.message_port_state.borrow_mut()
+        else {
+            unreachable!(
+                "Cross realm transform writable must be called on a global managing ports"
+            );
+        };
+
+        let Some(managed_port) = message_ports.get_mut(port_id) else {
+            unreachable!("Cross realm transform writable must match a managed port");
+        };
+
+        managed_port.cross_realm_transform_writable = Some(cross_realm_transform_writable.clone());
+    }
+
+    /// Custom routing logic, followed by the task steps of
+    /// <https://html.spec.whatwg.org/multipage/#message-port-post-message-steps>
     pub(crate) fn route_task_to_port(
         &self,
         port_id: MessagePortId,
         task: PortMessageTask,
         can_gc: CanGc,
     ) {
+        let cx = GlobalScope::get_cx();
+        rooted!(in(*cx) let mut cross_realm_transform_readable = None);
+        rooted!(in(*cx) let mut cross_realm_transform_writable = None);
+
         let should_dispatch = if let MessagePortState::Managed(_id, message_ports) =
             &mut *self.message_port_state.borrow_mut()
         {
@@ -1232,9 +1396,14 @@ impl GlobalScope {
                     // If the port is not enabled yet, or if is awaiting the completion of it's transfer,
                     // the task will be buffered and dispatched upon enablement or completion of the transfer.
                     if let Some(port_impl) = managed_port.port_impl.as_mut() {
-                        port_impl.handle_incoming(task).map(|to_dispatch| {
+                        let to_dispatch = port_impl.handle_incoming(task).map(|to_dispatch| {
                             (DomRoot::from_ref(&*managed_port.dom_port), to_dispatch)
-                        })
+                        });
+                        cross_realm_transform_readable
+                            .set(managed_port.cross_realm_transform_readable.clone());
+                        cross_realm_transform_writable
+                            .set(managed_port.cross_realm_transform_writable.clone());
+                        to_dispatch
                     } else {
                         panic!("managed-port has no port-impl.");
                     }
@@ -1244,24 +1413,93 @@ impl GlobalScope {
             self.re_route_port_task(port_id, task);
             return;
         };
+
+        // Add a task that runs the following steps to the port message queue of targetPort:
+        // Note: we are in the task, and running the relevant steps.
+
+        // Let finalTargetPort be the MessagePort in whose port message queue the task now finds itself.
         if let Some((dom_port, PortMessageTask { origin, data })) = should_dispatch {
-            // Substep 3-4
-            rooted!(in(*GlobalScope::get_cx()) let mut message_clone = UndefinedValue());
+            // Let messageEventTarget be finalTargetPort's message event target.
+            let message_event_target = dom_port.upcast();
+
+            // Let targetRealm be finalTargetPort's relevant realm.
+            // Done via the routing logic here and in the constellation: `self` is the target realm.
+
+            // Let messageClone be deserializeRecord.[[Deserialized]].
+            // Re-ordered because we need to pass it to `structuredclone::read`.
+            rooted!(in(*cx) let mut message_clone = UndefinedValue());
+
+            // Note: if this port is used to transfer a stream, we handle the events in Rust.
+            let has_cross_realm_tansform = cross_realm_transform_readable.is_some() ||
+                cross_realm_transform_writable.is_some();
+
+            let realm = enter_realm(self);
+            let comp = InRealm::Entered(&realm);
+
+            // Note: this is necessary, on top of entering the realm above,
+            // for the call to `GlobalScope::incumbent`,
+            // in `MessagePort::post_message_impl` to succeed.
+            let _aes = AutoEntryScript::new(self);
+
+            // Let deserializeRecord be StructuredDeserializeWithTransfer(serializeWithTransferResult, targetRealm).
+            // Let newPorts be a new frozen array
+            // consisting of all MessagePort objects in deserializeRecord.[[TransferredValues]],
+            // if any, maintaining their relative order.
+            // Note: both done in `structuredclone::read`.
             if let Ok(ports) = structuredclone::read(self, data, message_clone.handle_mut()) {
-                // Substep 6
-                // Dispatch the event, using the dom message-port.
-                MessageEvent::dispatch_jsval(
-                    dom_port.upcast(),
-                    self,
-                    message_clone.handle(),
-                    Some(&origin.ascii_serialization()),
-                    None,
-                    ports,
-                    can_gc,
-                );
+                // Add a handler for port’s message event with the following steps:
+                // from <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformreadable>
+                if let Some(transform) = cross_realm_transform_readable.as_ref() {
+                    transform.handle_message(
+                        cx,
+                        self,
+                        &dom_port,
+                        message_clone.handle(),
+                        comp,
+                        can_gc,
+                    );
+                }
+
+                // Add a handler for port’s message event with the following steps:
+                // from <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformwritable>
+                if let Some(transform) = cross_realm_transform_writable.as_ref() {
+                    transform.handle_message(cx, self, message_clone.handle(), comp, can_gc);
+                }
+
+                if !has_cross_realm_tansform {
+                    // Fire an event named message at messageEventTarget,
+                    // using MessageEvent,
+                    // with the data attribute initialized to messageClone
+                    // and the ports attribute initialized to newPorts.
+                    MessageEvent::dispatch_jsval(
+                        message_event_target,
+                        self,
+                        message_clone.handle(),
+                        Some(&origin.ascii_serialization()),
+                        None,
+                        ports,
+                        can_gc,
+                    );
+                }
             } else {
-                // Step 4, fire messageerror event.
-                MessageEvent::dispatch_error(dom_port.upcast(), self, can_gc);
+                // Add a handler for port’s messageerror event with the following steps:
+                // from <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformreadable>
+                if let Some(transform) = cross_realm_transform_readable.as_ref() {
+                    transform.handle_error(cx, self, &dom_port, comp, can_gc);
+                }
+
+                // Add a handler for port’s messageerror event with the following steps:
+                // from <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformwritable>
+                if let Some(transform) = cross_realm_transform_writable.as_ref() {
+                    transform.handle_error(cx, self, &dom_port, comp, can_gc);
+                }
+
+                if !has_cross_realm_tansform {
+                    // If this throws an exception, catch it,
+                    // fire an event named messageerror at messageEventTarget,
+                    // using MessageEvent, and then return.
+                    MessageEvent::dispatch_error(message_event_target, self, can_gc);
+                }
             }
         }
     }
@@ -1291,12 +1529,9 @@ impl GlobalScope {
                 }
                 managed_port.pending = false;
             }
-            let _ =
-                self.script_to_constellation_chan()
-                    .send(ScriptMsg::CompleteMessagePortTransfer(
-                        *router_id,
-                        to_be_added,
-                    ));
+            let _ = self.script_to_constellation_chan().send(
+                ScriptToConstellationMessage::CompleteMessagePortTransfer(*router_id, to_be_added),
+            );
         } else {
             warn!("maybe_add_pending_ports called on a global not managing any ports.");
         }
@@ -1310,12 +1545,7 @@ impl GlobalScope {
             let to_be_removed: Vec<MessagePortId> = message_ports
                 .iter()
                 .filter_map(|(id, managed_port)| {
-                    if managed_port.closed {
-                        // Let the constellation know to drop this port and the one it is entangled with,
-                        // and to forward this message to the script-process where the entangled is found.
-                        let _ = self
-                            .script_to_constellation_chan()
-                            .send(ScriptMsg::RemoveMessagePort(*id));
+                    if managed_port.explicitly_closed {
                         Some(*id)
                     } else {
                         None
@@ -1325,6 +1555,9 @@ impl GlobalScope {
             for id in to_be_removed {
                 message_ports.remove(&id);
             }
+            // Note: ports are only removed throught explicit closure by script in this global.
+            // TODO: #25772
+            // TODO: remove ports when we can be sure their port message queue is empty(via the constellation).
             message_ports.is_empty()
         } else {
             false
@@ -1345,7 +1578,7 @@ impl GlobalScope {
                 channels.retain(|chan| !chan.closed());
                 if channels.is_empty() {
                     let _ = self.script_to_constellation_chan().send(
-                        ScriptMsg::RemoveBroadcastChannelNameInRouter(
+                        ScriptToConstellationMessage::RemoveBroadcastChannelNameInRouter(
                             *router_id,
                             name.to_string(),
                             self.origin().immutable().clone(),
@@ -1387,19 +1620,19 @@ impl GlobalScope {
             );
             let router_id = BroadcastChannelRouterId::new();
             *current_state = BroadcastChannelState::Managed(router_id, HashMap::new());
-            let _ = self
-                .script_to_constellation_chan()
-                .send(ScriptMsg::NewBroadcastChannelRouter(
+            let _ = self.script_to_constellation_chan().send(
+                ScriptToConstellationMessage::NewBroadcastChannelRouter(
                     router_id,
                     broadcast_control_sender,
                     self.origin().immutable().clone(),
-                ));
+                ),
+            );
         }
 
         if let BroadcastChannelState::Managed(router_id, channels) = &mut *current_state {
             let entry = channels.entry(dom_channel.Name()).or_insert_with(|| {
                 let _ = self.script_to_constellation_chan().send(
-                    ScriptMsg::NewBroadcastChannelNameInRouter(
+                    ScriptToConstellationMessage::NewBroadcastChannelNameInRouter(
                         *router_id,
                         dom_channel.Name().to_string(),
                         self.origin().immutable().clone(),
@@ -1439,12 +1672,9 @@ impl GlobalScope {
             );
             let router_id = MessagePortRouterId::new();
             *current_state = MessagePortState::Managed(router_id, HashMapTracedValues::new());
-            let _ = self
-                .script_to_constellation_chan()
-                .send(ScriptMsg::NewMessagePortRouter(
-                    router_id,
-                    port_control_sender,
-                ));
+            let _ = self.script_to_constellation_chan().send(
+                ScriptToConstellationMessage::NewMessagePortRouter(router_id, port_control_sender),
+            );
         }
 
         if let MessagePortState::Managed(router_id, message_ports) = &mut *current_state {
@@ -1458,7 +1688,9 @@ impl GlobalScope {
                         port_impl: Some(port_impl),
                         dom_port: Dom::from_ref(dom_port),
                         pending: true,
-                        closed: false,
+                        explicitly_closed: false,
+                        cross_realm_transform_readable: None,
+                        cross_realm_transform_writable: None,
                     },
                 );
 
@@ -1480,15 +1712,17 @@ impl GlobalScope {
                         port_impl: Some(port_impl),
                         dom_port: Dom::from_ref(dom_port),
                         pending: false,
-                        closed: false,
+                        explicitly_closed: false,
+                        cross_realm_transform_readable: None,
+                        cross_realm_transform_writable: None,
                     },
                 );
-                let _ = self
-                    .script_to_constellation_chan()
-                    .send(ScriptMsg::NewMessagePort(
+                let _ = self.script_to_constellation_chan().send(
+                    ScriptToConstellationMessage::NewMessagePort(
                         *router_id,
                         *dom_port.message_port_id(),
-                    ));
+                    ),
+                );
             };
         } else {
             panic!("track_message_port should have first switched the state to managed.");
@@ -1589,12 +1823,8 @@ impl GlobalScope {
     /// In the case of a File-backed blob, this might incur synchronous read and caching.
     pub(crate) fn get_blob_bytes(&self, blob_id: &BlobId) -> Result<Vec<u8>, ()> {
         let parent = {
-            let blob_state = self.blob_state.borrow();
-            let blob_info = blob_state
-                .get(blob_id)
-                .expect("get_blob_bytes for an unknown blob.");
-            match blob_info.blob_impl.blob_data() {
-                BlobData::Sliced(parent, rel_pos) => Some((*parent, rel_pos.clone())),
+            match *self.get_blob_data(blob_id) {
+                BlobData::Sliced(parent, rel_pos) => Some((parent, rel_pos)),
                 _ => None,
             }
         };
@@ -1608,14 +1838,24 @@ impl GlobalScope {
         }
     }
 
+    /// Retrieve information about a specific blob from the blob store
+    ///
+    /// # Panics
+    /// This function panics if there is no blob with the given ID.
+    pub(crate) fn get_blob_data<'a>(&'a self, blob_id: &BlobId) -> Ref<'a, BlobData> {
+        Ref::map(self.blob_state.borrow(), |blob_state| {
+            blob_state
+                .get(blob_id)
+                .expect("get_blob_impl called for a unknown blob")
+                .blob_impl
+                .blob_data()
+        })
+    }
+
     /// Get bytes from a non-sliced blob
     fn get_blob_bytes_non_sliced(&self, blob_id: &BlobId) -> Result<Vec<u8>, ()> {
-        let blob_state = self.blob_state.borrow();
-        let blob_info = blob_state
-            .get(blob_id)
-            .expect("get_blob_bytes_non_sliced called for a unknown blob.");
-        match blob_info.blob_impl.blob_data() {
-            BlobData::File(f) => {
+        match *self.get_blob_data(blob_id) {
+            BlobData::File(ref f) => {
                 let (buffer, is_new_buffer) = match f.get_cache() {
                     Some(bytes) => (bytes, false),
                     None => {
@@ -1631,7 +1871,7 @@ impl GlobalScope {
 
                 Ok(buffer)
             },
-            BlobData::Memory(s) => Ok(s.clone()),
+            BlobData::Memory(ref s) => Ok(s.clone()),
             BlobData::Sliced(_, _) => panic!("This blob doesn't have a parent."),
         }
     }
@@ -1644,12 +1884,8 @@ impl GlobalScope {
     /// TODO: merge with `get_blob_bytes` by way of broader integration with blob streams.
     fn get_blob_bytes_or_file_id(&self, blob_id: &BlobId) -> BlobResult {
         let parent = {
-            let blob_state = self.blob_state.borrow();
-            let blob_info = blob_state
-                .get(blob_id)
-                .expect("get_blob_bytes_or_file_id for an unknown blob.");
-            match blob_info.blob_impl.blob_data() {
-                BlobData::Sliced(parent, rel_pos) => Some((*parent, rel_pos.clone())),
+            match *self.get_blob_data(blob_id) {
+                BlobData::Sliced(parent, rel_pos) => Some((parent, rel_pos)),
                 _ => None,
             }
         };
@@ -1674,16 +1910,12 @@ impl GlobalScope {
     /// tweaked for integration with streams.
     /// TODO: merge with `get_blob_bytes` by way of broader integration with blob streams.
     fn get_blob_bytes_non_sliced_or_file_id(&self, blob_id: &BlobId) -> BlobResult {
-        let blob_state = self.blob_state.borrow();
-        let blob_info = blob_state
-            .get(blob_id)
-            .expect("get_blob_bytes_non_sliced_or_file_id called for a unknown blob.");
-        match blob_info.blob_impl.blob_data() {
-            BlobData::File(f) => match f.get_cache() {
+        match *self.get_blob_data(blob_id) {
+            BlobData::File(ref f) => match f.get_cache() {
                 Some(bytes) => BlobResult::Bytes(bytes.clone()),
                 None => BlobResult::File(f.get_id(), f.get_size() as usize),
             },
-            BlobData::Memory(s) => BlobResult::Bytes(s.clone()),
+            BlobData::Memory(ref s) => BlobResult::Bytes(s.clone()),
             BlobData::Sliced(_, _) => panic!("This blob doesn't have a parent."),
         }
     }
@@ -1699,39 +1931,27 @@ impl GlobalScope {
 
     /// <https://w3c.github.io/FileAPI/#dfn-size>
     pub(crate) fn get_blob_size(&self, blob_id: &BlobId) -> u64 {
-        let blob_state = self.blob_state.borrow();
         let parent = {
-            let blob_info = blob_state
-                .get(blob_id)
-                .expect("get_blob_size called for a unknown blob.");
-            match blob_info.blob_impl.blob_data() {
-                BlobData::Sliced(parent, rel_pos) => Some((*parent, rel_pos.clone())),
+            match *self.get_blob_data(blob_id) {
+                BlobData::Sliced(parent, rel_pos) => Some((parent, rel_pos)),
                 _ => None,
             }
         };
         match parent {
             Some((parent_id, rel_pos)) => {
-                let parent_info = blob_state
-                    .get(&parent_id)
-                    .expect("Parent of blob whose size is unknown.");
-                let parent_size = match parent_info.blob_impl.blob_data() {
-                    BlobData::File(f) => f.get_size(),
-                    BlobData::Memory(v) => v.len() as u64,
+                let parent_size = match *self.get_blob_data(&parent_id) {
+                    BlobData::File(ref f) => f.get_size(),
+                    BlobData::Memory(ref v) => v.len() as u64,
                     BlobData::Sliced(_, _) => panic!("Blob ancestry should be only one level."),
                 };
                 rel_pos.to_abs_range(parent_size as usize).len() as u64
             },
-            None => {
-                let blob_info = blob_state
-                    .get(blob_id)
-                    .expect("Blob whose size is unknown.");
-                match blob_info.blob_impl.blob_data() {
-                    BlobData::File(f) => f.get_size(),
-                    BlobData::Memory(v) => v.len() as u64,
-                    BlobData::Sliced(_, _) => {
-                        panic!("It was previously checked that this blob does not have a parent.")
-                    },
-                }
+            None => match *self.get_blob_data(blob_id) {
+                BlobData::File(ref f) => f.get_size(),
+                BlobData::Memory(ref v) => v.len() as u64,
+                BlobData::Sliced(_, _) => {
+                    panic!("It was previously checked that this blob does not have a parent.")
+                },
             },
         }
     }
@@ -1747,7 +1967,7 @@ impl GlobalScope {
             blob_info.has_url = true;
 
             match blob_info.blob_impl.blob_data() {
-                BlobData::Sliced(parent, rel_pos) => Some((*parent, rel_pos.clone())),
+                BlobData::Sliced(parent, rel_pos) => Some((*parent, *rel_pos)),
                 _ => None,
             }
         };
@@ -1788,12 +2008,8 @@ impl GlobalScope {
         let origin = get_blob_origin(&self.get_url());
 
         let (tx, rx) = profile_ipc::channel(self.time_profiler_chan().clone()).unwrap();
-        let msg = FileManagerThreadMsg::AddSlicedURLEntry(
-            *parent_file_id,
-            rel_pos.clone(),
-            tx,
-            origin.clone(),
-        );
+        let msg =
+            FileManagerThreadMsg::AddSlicedURLEntry(*parent_file_id, *rel_pos, tx, origin.clone());
         self.send_to_file_manager(msg);
         match rx.recv().expect("File manager thread is down.") {
             Ok(new_id) => {
@@ -2137,8 +2353,8 @@ impl GlobalScope {
         unsafe { SafeJSContext::from_ptr(cx) }
     }
 
-    pub(crate) fn crypto(&self) -> DomRoot<Crypto> {
-        self.crypto.or_init(|| Crypto::new(self, CanGc::note()))
+    pub(crate) fn crypto(&self, can_gc: CanGc) -> DomRoot<Crypto> {
+        self.crypto.or_init(|| Crypto::new(self, can_gc))
     }
 
     pub(crate) fn live_devtools_updates(&self) -> bool {
@@ -2234,10 +2450,10 @@ impl GlobalScope {
     }
 
     pub(crate) fn send_to_embedder(&self, msg: EmbedderMsg) {
-        self.send_to_constellation(ScriptMsg::ForwardToEmbedder(msg));
+        self.send_to_constellation(ScriptToConstellationMessage::ForwardToEmbedder(msg));
     }
 
-    pub(crate) fn send_to_constellation(&self, msg: ScriptMsg) {
+    pub(crate) fn send_to_constellation(&self, msg: ScriptToConstellationMessage) {
         self.script_to_constellation_chan().send(msg).unwrap();
     }
 
@@ -2290,6 +2506,41 @@ impl GlobalScope {
         unreachable!();
     }
 
+    /// <https://www.w3.org/TR/CSP/#initialize-document-csp>
+    pub(crate) fn parse_csp_list_from_metadata(
+        headers: &Option<Serde<HeaderMap>>,
+    ) -> Option<CspList> {
+        // TODO: Implement step 1 (local scheme special case)
+        let headers = headers.as_ref()?;
+        let mut csp = headers.get_all("content-security-policy").iter();
+        // This silently ignores the CSP if it contains invalid Unicode.
+        // We should probably report an error somewhere.
+        let c = csp.next().and_then(|c| c.to_str().ok())?;
+        let mut csp_list = CspList::parse(c, PolicySource::Header, PolicyDisposition::Enforce);
+        for c in csp {
+            let c = c.to_str().ok()?;
+            csp_list.append(CspList::parse(
+                c,
+                PolicySource::Header,
+                PolicyDisposition::Enforce,
+            ));
+        }
+        let csp_report = headers
+            .get_all("content-security-policy-report-only")
+            .iter();
+        // This silently ignores the CSP if it contains invalid Unicode.
+        // We should probably report an error somewhere.
+        for c in csp_report {
+            let c = c.to_str().ok()?;
+            csp_list.append(CspList::parse(
+                c,
+                PolicySource::Header,
+                PolicyDisposition::Report,
+            ));
+        }
+        Some(csp_list)
+    }
+
     /// Get the [base url](https://html.spec.whatwg.org/multipage/#api-base-url)
     /// for this global scope.
     pub(crate) fn api_base_url(&self) -> ServoUrl {
@@ -2396,6 +2647,21 @@ impl GlobalScope {
         InsecureRequestsPolicy::DoNotUpgrade
     }
 
+    /// Whether this document has ancestor navigables that are trustworthy
+    pub(crate) fn has_trustworthy_ancestor_origin(&self) -> bool {
+        self.downcast::<Window>()
+            .is_some_and(|window| window.Document().has_trustworthy_ancestor_origin())
+    }
+
+    // Whether this document has a trustworthy origin or has trustowrthy ancestor navigables
+    pub(crate) fn has_trustworthy_ancestor_or_current_origin(&self) -> bool {
+        self.downcast::<Window>().is_some_and(|window| {
+            window
+                .Document()
+                .has_trustworthy_ancestor_or_current_origin()
+        })
+    }
+
     /// <https://html.spec.whatwg.org/multipage/#report-the-error>
     pub(crate) fn report_an_error(&self, error_info: ErrorInfo, value: HandleValue, can_gc: CanGc) {
         // Step 1.
@@ -2659,35 +2925,43 @@ impl GlobalScope {
         }))
     }
 
-    #[allow(unsafe_code)]
-    pub(crate) fn is_js_evaluation_allowed(&self, cx: SafeJSContext) -> bool {
+    pub(crate) fn is_js_evaluation_allowed(&self, source: &str) -> bool {
         let Some(csp_list) = self.get_csp_list() else {
             return true;
         };
 
-        let scripted_caller = unsafe { describe_scripted_caller(*cx) }.unwrap_or_default();
-        let is_js_evaluation_allowed = csp_list.is_js_evaluation_allowed() == CheckResult::Allowed;
+        let (is_js_evaluation_allowed, violations) = csp_list.is_js_evaluation_allowed(source);
 
-        if !is_js_evaluation_allowed {
-            // FIXME: Don't fire event if `script-src` and `default-src`
-            // were not passed.
-            for policy in csp_list.0 {
-                let task = CSPViolationReporter::new(
-                    self,
-                    None,
-                    policy.disposition == PolicyDisposition::Report,
-                    RuntimeCode::JS,
-                    scripted_caller.filename.clone(),
-                    scripted_caller.line,
-                    scripted_caller.col,
-                );
-                self.task_manager()
-                    .dom_manipulation_task_source()
-                    .queue(task);
-            }
-        }
+        self.report_csp_violations(violations, None);
 
-        is_js_evaluation_allowed
+        is_js_evaluation_allowed == CheckResult::Allowed
+    }
+
+    pub(crate) fn should_navigation_request_be_blocked(&self, load_data: &LoadData) -> bool {
+        let Some(csp_list) = self.get_csp_list() else {
+            return false;
+        };
+        let request = Request {
+            url: load_data.url.clone().into_url(),
+            origin: match &load_data.load_origin {
+                LoadOrigin::Script(immutable_origin) => immutable_origin.clone().into_url_origin(),
+                _ => Origin::new_opaque(),
+            },
+            // TODO: populate this field correctly
+            redirect_count: 0,
+            destination: Destination::None,
+            initiator: Initiator::None,
+            nonce: "".to_owned(),
+            integrity_metadata: "".to_owned(),
+            parser_metadata: ParserMetadata::None,
+        };
+        // TODO: set correct navigation check type for form submission if applicable
+        let (result, violations) =
+            csp_list.should_navigation_request_be_blocked(&request, NavigationCheckType::Other);
+
+        self.report_csp_violations(violations, None);
+
+        result == CheckResult::Blocked
     }
 
     pub(crate) fn create_image_bitmap(
@@ -2696,7 +2970,7 @@ impl GlobalScope {
         options: &ImageBitmapOptions,
         can_gc: CanGc,
     ) -> Rc<Promise> {
-        let in_realm_proof = AlreadyInRealm::assert();
+        let in_realm_proof = AlreadyInRealm::assert::<crate::DomTypeHolder>();
         let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof), can_gc);
         if options.resizeWidth.is_some_and(|w| w == 0) {
             p.reject_error(Error::InvalidState, can_gc);
@@ -2716,15 +2990,11 @@ impl GlobalScope {
                     return p;
                 }
 
-                if let Some((data, size)) = canvas.fetch_all_data() {
-                    let data = data
-                        .map(|data| data.to_vec())
-                        .unwrap_or_else(|| vec![0; size.area() as usize * 4]);
-
+                if let Some(snapshot) = canvas.get_image_data() {
+                    let size = snapshot.size().cast();
                     let image_bitmap =
                         ImageBitmap::new(self, size.width, size.height, can_gc).unwrap();
-
-                    image_bitmap.set_bitmap_data(data);
+                    image_bitmap.set_bitmap_data(snapshot.to_vec());
                     image_bitmap.set_origin_clean(canvas.origin_is_clean());
                     p.resolve_native(&(image_bitmap), can_gc);
                 }
@@ -2737,14 +3007,11 @@ impl GlobalScope {
                     return p;
                 }
 
-                if let Some((data, size)) = canvas.fetch_all_data() {
-                    let data = data
-                        .map(|data| data.to_vec())
-                        .unwrap_or_else(|| vec![0; size.area() as usize * 4]);
-
+                if let Some(snapshot) = canvas.get_image_data() {
+                    let size = snapshot.size().cast();
                     let image_bitmap =
                         ImageBitmap::new(self, size.width, size.height, can_gc).unwrap();
-                    image_bitmap.set_bitmap_data(data);
+                    image_bitmap.set_bitmap_data(snapshot.to_vec());
                     image_bitmap.set_origin_clean(canvas.origin_is_clean());
                     p.resolve_native(&(image_bitmap), can_gc);
                 }
@@ -2920,10 +3187,6 @@ impl GlobalScope {
         );
     }
 
-    pub(crate) fn get_user_agent(&self) -> Cow<'static, str> {
-        self.user_agent.clone()
-    }
-
     pub(crate) fn get_https_state(&self) -> HttpsState {
         self.https_state.get()
     }
@@ -2952,10 +3215,10 @@ impl GlobalScope {
 
     /// <https://www.w3.org/TR/CSP/#get-csp-of-object>
     pub(crate) fn get_csp_list(&self) -> Option<CspList> {
-        if self.downcast::<Window>().is_some() {
+        if self.downcast::<Window>().is_some() || self.downcast::<WorkerGlobalScope>().is_some() {
             return self.policy_container().csp_list;
         }
-        // TODO: Worker and Worklet global scopes.
+        // TODO: Worklet global scopes.
         None
     }
 
@@ -2994,6 +3257,7 @@ impl GlobalScope {
         device: WebGPUDevice,
         reason: DeviceLostReason,
         msg: String,
+        can_gc: CanGc,
     ) {
         let reason = match reason {
             DeviceLostReason::Unknown => GPUDeviceLostReason::Unknown,
@@ -3007,7 +3271,7 @@ impl GlobalScope {
             .expect("GPUDevice should still be in devices hashmap")
             .root()
         {
-            device.lose(reason, msg, CanGc::note());
+            device.lose(reason, msg, can_gc);
         }
     }
 
@@ -3015,7 +3279,7 @@ impl GlobalScope {
     pub(crate) fn handle_uncaptured_gpu_error(
         &self,
         device: WebGPUDevice,
-        error: webgpu::Error,
+        error: webgpu_traits::Error,
         can_gc: CanGc,
     ) {
         if let Some(gpu_device) = self
@@ -3030,134 +3294,6 @@ impl GlobalScope {
         }
     }
 
-    pub(crate) fn handle_gamepad_event(&self, gamepad_event: GamepadEvent) {
-        match gamepad_event {
-            GamepadEvent::Connected(index, name, bounds, supported_haptic_effects) => {
-                self.handle_gamepad_connect(
-                    index.0,
-                    name,
-                    bounds.axis_bounds,
-                    bounds.button_bounds,
-                    supported_haptic_effects,
-                );
-            },
-            GamepadEvent::Disconnected(index) => {
-                self.handle_gamepad_disconnect(index.0);
-            },
-            GamepadEvent::Updated(index, update_type) => {
-                self.receive_new_gamepad_button_or_axis(index.0, update_type);
-            },
-        };
-    }
-
-    /// <https://www.w3.org/TR/gamepad/#dfn-gamepadconnected>
-    fn handle_gamepad_connect(
-        &self,
-        // As the spec actually defines how to set the gamepad index, the GilRs index
-        // is currently unused, though in practice it will almost always be the same.
-        // More infra is currently needed to track gamepads across windows.
-        _index: usize,
-        name: String,
-        axis_bounds: (f64, f64),
-        button_bounds: (f64, f64),
-        supported_haptic_effects: GamepadSupportedHapticEffects,
-    ) {
-        // TODO: 2. If document is not null and is not allowed to use the "gamepad" permission,
-        //          then abort these steps.
-        let this = Trusted::new(self);
-        self.task_manager()
-            .gamepad_task_source()
-            .queue(task!(gamepad_connected: move || {
-                let global = this.root();
-
-                if let Some(window) = global.downcast::<Window>() {
-                    let navigator = window.Navigator();
-                    let selected_index = navigator.select_gamepad_index();
-                    let gamepad = Gamepad::new(
-                        &global,
-                        selected_index,
-                        name,
-                        "standard".into(),
-                        axis_bounds,
-                        button_bounds,
-                        supported_haptic_effects,
-                        false,
-                        CanGc::note(),
-                    );
-                    navigator.set_gamepad(selected_index as usize, &gamepad, CanGc::note());
-                }
-            }));
-    }
-
-    /// <https://www.w3.org/TR/gamepad/#dfn-gamepaddisconnected>
-    pub(crate) fn handle_gamepad_disconnect(&self, index: usize) {
-        let this = Trusted::new(self);
-        self.task_manager()
-            .gamepad_task_source()
-            .queue(task!(gamepad_disconnected: move || {
-                let global = this.root();
-                if let Some(window) = global.downcast::<Window>() {
-                    let navigator = window.Navigator();
-                    if let Some(gamepad) = navigator.get_gamepad(index) {
-                        if window.Document().is_fully_active() {
-                            gamepad.update_connected(false, gamepad.exposed(), CanGc::note());
-                            navigator.remove_gamepad(index);
-                        }
-                    }
-                }
-            }));
-    }
-
-    /// <https://www.w3.org/TR/gamepad/#receiving-inputs>
-    pub(crate) fn receive_new_gamepad_button_or_axis(
-        &self,
-        index: usize,
-        update_type: GamepadUpdateType,
-    ) {
-        let this = Trusted::new(self);
-
-        // <https://w3c.github.io/gamepad/#dfn-update-gamepad-state>
-        self.task_manager().gamepad_task_source().queue(
-                task!(update_gamepad_state: move || {
-                    let global = this.root();
-                    if let Some(window) = global.downcast::<Window>() {
-                        let navigator = window.Navigator();
-                        if let Some(gamepad) = navigator.get_gamepad(index) {
-                            let current_time = global.performance().Now();
-                            gamepad.update_timestamp(*current_time);
-                            match update_type {
-                                GamepadUpdateType::Axis(index, value) => {
-                                    gamepad.map_and_normalize_axes(index, value);
-                                },
-                                GamepadUpdateType::Button(index, value) => {
-                                    gamepad.map_and_normalize_buttons(index, value);
-                                }
-                            };
-                            if !navigator.has_gamepad_gesture() && contains_user_gesture(update_type) {
-                                navigator.set_has_gamepad_gesture(true);
-                                navigator.GetGamepads()
-                                    .iter()
-                                    .filter_map(|g| g.as_ref())
-                                    .for_each(|gamepad| {
-                                        gamepad.set_exposed(true);
-                                        gamepad.update_timestamp(*current_time);
-                                        let new_gamepad = Trusted::new(&**gamepad);
-                                        if window.Document().is_fully_active() {
-                                            global.task_manager().gamepad_task_source().queue(
-                                                task!(update_gamepad_connect: move || {
-                                                    let gamepad = new_gamepad.root();
-                                                    gamepad.notify_event(GamepadEventType::Connected, CanGc::note());
-                                                })
-                                            );
-                                        }
-                                });
-                            }
-                        }
-                    }
-                })
-            );
-    }
-
     pub(crate) fn current_group_label(&self) -> Option<DOMString> {
         self.console_group_stack
             .borrow()
@@ -3214,7 +3350,7 @@ impl GlobalScope {
 
         let data = structuredclone::write(cx, value, Some(guard))?;
 
-        structuredclone::read(self, data, retval).map_err(|_| Error::DataClone)?;
+        structuredclone::read(self, data, retval)?;
 
         Ok(())
     }
@@ -3299,6 +3435,86 @@ impl GlobalScope {
             .borrow_mut()
             .remove(&callback_id)
     }
+
+    pub(crate) fn trusted_types(&self, can_gc: CanGc) -> DomRoot<TrustedTypePolicyFactory> {
+        if let Some(window) = self.downcast::<Window>() {
+            return window.TrustedTypes(can_gc);
+        }
+        if let Some(worker) = self.downcast::<WorkerGlobalScope>() {
+            return worker.TrustedTypes(can_gc);
+        }
+        unreachable!();
+    }
+
+    /// <https://www.w3.org/TR/CSP/#report-violation>
+    #[allow(unsafe_code)]
+    pub(crate) fn report_csp_violations(
+        &self,
+        violations: Vec<Violation>,
+        element: Option<&Element>,
+    ) {
+        let scripted_caller =
+            unsafe { describe_scripted_caller(*GlobalScope::get_cx()) }.unwrap_or_default();
+        for violation in violations {
+            let (sample, resource) = match violation.resource {
+                ViolationResource::Inline { sample } => (sample, "inline".to_owned()),
+                ViolationResource::Url(url) => (None, url.into()),
+                ViolationResource::TrustedTypePolicy { sample } => {
+                    (Some(sample), "trusted-types-policy".to_owned())
+                },
+                ViolationResource::TrustedTypeSink { sample } => {
+                    (Some(sample), "trusted-types-sink".to_owned())
+                },
+                ViolationResource::Eval { sample } => (sample, "eval".to_owned()),
+                ViolationResource::WasmEval => (None, "wasm-eval".to_owned()),
+            };
+            let report = CSPViolationReportBuilder::default()
+                .resource(resource)
+                .sample(sample)
+                .effective_directive(violation.directive.name)
+                .original_policy(violation.policy.to_string())
+                .report_only(violation.policy.disposition == PolicyDisposition::Report)
+                .source_file(scripted_caller.filename.clone())
+                .line_number(scripted_caller.line)
+                .column_number(scripted_caller.col + 1)
+                .build(self);
+            // Step 1: Let global be violation’s global object.
+            // We use `self` as `global`;
+            // Step 2: Let target be violation’s element.
+            let target = element.and_then(|event_target| {
+                // Step 3.1: If target is not null, and global is a Window,
+                // and target’s shadow-including root is not global’s associated Document, set target to null.
+                if let Some(window) = self.downcast::<Window>() {
+                    if !window
+                        .Document()
+                        .upcast::<Node>()
+                        .is_shadow_including_inclusive_ancestor_of(event_target.upcast())
+                    {
+                        return None;
+                    }
+                }
+                Some(event_target)
+            });
+            let target = match target {
+                // Step 3.2: If target is null:
+                None => {
+                    // Step 3.2.2: If target is a Window, set target to target’s associated Document.
+                    if let Some(window) = self.downcast::<Window>() {
+                        Trusted::new(window.Document().upcast())
+                    } else {
+                        // Step 3.2.1: Set target to violation’s global object.
+                        Trusted::new(self.upcast())
+                    }
+                },
+                Some(event_target) => Trusted::new(event_target.upcast()),
+            };
+            // Step 3: Queue a task to run the following steps:
+            let task = CSPViolationReportTask::new(Trusted::new(self), target, report);
+            self.task_manager()
+                .dom_manipulation_task_source()
+                .queue(task);
+        }
+    }
 }
 
 /// Returns the Rust global scope from a JS global object.
@@ -3328,28 +3544,6 @@ unsafe fn global_scope_from_global_static(global: *mut JSObject) -> DomRoot<Glob
     root_from_object_static(global).unwrap()
 }
 
-/// Operations that must be invoked from the generated bindings.
-#[allow(unsafe_code)]
-pub(crate) trait GlobalScopeHelpers<D: crate::DomTypes> {
-    unsafe fn from_context(cx: *mut JSContext, realm: InRealm) -> DomRoot<D::GlobalScope>;
-    fn get_cx() -> SafeJSContext;
-    unsafe fn from_object(obj: *mut JSObject) -> DomRoot<D::GlobalScope>;
-    fn from_reflector(reflector: &impl DomObject, realm: InRealm) -> DomRoot<D::GlobalScope>;
-
-    unsafe fn from_object_maybe_wrapped(
-        obj: *mut JSObject,
-        cx: *mut JSContext,
-    ) -> DomRoot<D::GlobalScope>;
-
-    fn origin(&self) -> &MutableOrigin;
-
-    fn incumbent() -> Option<DomRoot<D::GlobalScope>>;
-
-    fn perform_a_microtask_checkpoint(&self, can_gc: CanGc);
-
-    fn get_url(&self) -> ServoUrl;
-}
-
 #[allow(unsafe_code)]
 impl GlobalScopeHelpers<crate::DomTypeHolder> for GlobalScope {
     unsafe fn from_context(cx: *mut JSContext, realm: InRealm) -> DomRoot<Self> {
@@ -3368,10 +3562,6 @@ impl GlobalScopeHelpers<crate::DomTypeHolder> for GlobalScope {
         GlobalScope::from_reflector(reflector, realm)
     }
 
-    unsafe fn from_object_maybe_wrapped(obj: *mut JSObject, cx: *mut JSContext) -> DomRoot<Self> {
-        GlobalScope::from_object_maybe_wrapped(obj, cx)
-    }
-
     fn origin(&self) -> &MutableOrigin {
         GlobalScope::origin(self)
     }
@@ -3387,4 +3577,8 @@ impl GlobalScopeHelpers<crate::DomTypeHolder> for GlobalScope {
     fn get_url(&self) -> ServoUrl {
         self.get_url()
     }
+
+    fn is_secure_context(&self) -> bool {
+        self.is_secure_context()
+    }
 }
diff --git a/components/script/dom/gpucanvascontext.rs b/components/script/dom/gpucanvascontext.rs
index 5304d0f5d3b..f47e1dfddd1 100644
--- a/components/script/dom/gpucanvascontext.rs
+++ b/components/script/dom/gpucanvascontext.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use script_layout_interface::HTMLCanvasDataSource;
+use webrender_api::ImageKey;
 
 use crate::dom::bindings::codegen::Bindings::GPUCanvasContextBinding::GPUCanvasContextMethods;
 use crate::dom::bindings::codegen::UnionTypes;
@@ -31,7 +31,7 @@ impl GPUCanvasContextMethods<crate::DomTypeHolder> for GPUCanvasContext {
 }
 
 impl LayoutCanvasRenderingContextHelpers for LayoutDom<'_, GPUCanvasContext> {
-    fn canvas_data_source(self) -> HTMLCanvasDataSource {
+    fn canvas_data_source(self) -> Option<ImageKey> {
         unimplemented!()
     }
 }
diff --git a/components/script/dom/history.rs b/components/script/dom/history.rs
index b4b6e44890f..4b51f3e62d2 100644
--- a/components/script/dom/history.rs
+++ b/components/script/dom/history.rs
@@ -6,7 +6,9 @@ use std::cell::Cell;
 use std::cmp::Ordering;
 
 use base::id::HistoryStateId;
-use constellation_traits::TraversalDirection;
+use constellation_traits::{
+    ScriptToConstellationMessage, StructuredSerializedData, TraversalDirection,
+};
 use dom_struct::dom_struct;
 use js::jsapi::Heap;
 use js::jsval::{JSVal, NullValue, UndefinedValue};
@@ -14,7 +16,6 @@ use js::rust::{HandleValue, MutableHandleValue};
 use net_traits::{CoreResourceMsg, IpcSend};
 use profile_traits::ipc;
 use profile_traits::ipc::channel;
-use script_traits::{ScriptMsg, StructuredSerializedData};
 use servo_url::ServoUrl;
 
 use crate::dom::bindings::codegen::Bindings::HistoryBinding::HistoryMethods;
@@ -72,7 +73,7 @@ impl History {
         if !self.window.Document().is_fully_active() {
             return Err(Error::Security);
         }
-        let msg = ScriptMsg::TraverseHistory(direction);
+        let msg = ScriptToConstellationMessage::TraverseHistory(direction);
         let _ = self
             .window
             .as_global_scope()
@@ -227,7 +228,7 @@ impl History {
             PushOrReplace::Push => {
                 let state_id = HistoryStateId::new();
                 self.state_id.set(Some(state_id));
-                let msg = ScriptMsg::PushHistoryState(state_id, new_url.clone());
+                let msg = ScriptToConstellationMessage::PushHistoryState(state_id, new_url.clone());
                 let _ = self
                     .window
                     .as_global_scope()
@@ -244,7 +245,8 @@ impl History {
                         state_id
                     },
                 };
-                let msg = ScriptMsg::ReplaceHistoryState(state_id, new_url.clone());
+                let msg =
+                    ScriptToConstellationMessage::ReplaceHistoryState(state_id, new_url.clone());
                 let _ = self
                     .window
                     .as_global_scope()
@@ -339,7 +341,7 @@ impl HistoryMethods<crate::DomTypeHolder> for History {
         }
         let (sender, recv) = channel(self.global().time_profiler_chan().clone())
             .expect("Failed to create channel to send jsh length.");
-        let msg = ScriptMsg::JointSessionHistoryLength(sender);
+        let msg = ScriptToConstellationMessage::JointSessionHistoryLength(sender);
         let _ = self
             .window
             .as_global_scope()
diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs
index 2dc968ce049..5a59c9254a0 100644
--- a/components/script/dom/htmlanchorelement.rs
+++ b/components/script/dom/htmlanchorelement.rs
@@ -100,8 +100,10 @@ impl VirtualMethods for HTMLAnchorElement {
         }
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
 
         match *attr.local_name() {
             local_name!("rel") | local_name!("rev") => {
@@ -112,9 +114,9 @@ impl VirtualMethods for HTMLAnchorElement {
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
 
         self.relations
@@ -143,7 +145,7 @@ impl HTMLAnchorElementMethods<crate::DomTypeHolder> for HTMLAnchorElement {
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-a-rellist
-    fn RelList(&self) -> DomRoot<DOMTokenList> {
+    fn RelList(&self, can_gc: CanGc) -> DomRoot<DOMTokenList> {
         self.rel_list.or_init(|| {
             DOMTokenList::new(
                 self.upcast(),
@@ -153,7 +155,7 @@ impl HTMLAnchorElementMethods<crate::DomTypeHolder> for HTMLAnchorElement {
                     Atom::from("noreferrer"),
                     Atom::from("opener"),
                 ]),
-                CanGc::note(),
+                can_gc,
             )
         })
     }
diff --git a/components/script/dom/htmlareaelement.rs b/components/script/dom/htmlareaelement.rs
index 95254650174..a9d94cbd7b2 100644
--- a/components/script/dom/htmlareaelement.rs
+++ b/components/script/dom/htmlareaelement.rs
@@ -321,8 +321,10 @@ impl VirtualMethods for HTMLAreaElement {
         }
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
 
         match *attr.local_name() {
             local_name!("rel") | local_name!("rev") => {
@@ -333,9 +335,9 @@ impl VirtualMethods for HTMLAreaElement {
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
 
         self.relations
@@ -360,7 +362,7 @@ impl HTMLAreaElementMethods<crate::DomTypeHolder> for HTMLAreaElement {
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-area-rellist>
-    fn RelList(&self) -> DomRoot<DOMTokenList> {
+    fn RelList(&self, can_gc: CanGc) -> DomRoot<DOMTokenList> {
         self.rel_list.or_init(|| {
             DOMTokenList::new(
                 self.upcast(),
@@ -370,7 +372,7 @@ impl HTMLAreaElementMethods<crate::DomTypeHolder> for HTMLAreaElement {
                     Atom::from("noreferrer"),
                     Atom::from("opener"),
                 ]),
-                CanGc::note(),
+                can_gc,
             )
         })
     }
diff --git a/components/script/dom/htmlaudioelement.rs b/components/script/dom/htmlaudioelement.rs
index dbf0a88eb2a..938c2e7ccd6 100644
--- a/components/script/dom/htmlaudioelement.rs
+++ b/components/script/dom/htmlaudioelement.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, QualName, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, QualName, local_name, ns};
 use js::rust::HandleObject;
 
 use crate::dom::bindings::codegen::Bindings::ElementBinding::Element_Binding::ElementMethods;
diff --git a/components/script/dom/htmlbaseelement.rs b/components/script/dom/htmlbaseelement.rs
index abe45ee7110..9f263e1056c 100644
--- a/components/script/dom/htmlbaseelement.rs
+++ b/components/script/dom/htmlbaseelement.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use servo_url::ServoUrl;
 
@@ -117,20 +117,22 @@ impl VirtualMethods for HTMLBaseElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         if *attr.local_name() == local_name!("href") {
             self.owner_document().refresh_base_element();
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
-        self.super_type().unwrap().bind_to_tree(context);
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
+        self.super_type().unwrap().bind_to_tree(context, can_gc);
         self.bind_unbind(context.tree_is_in_a_document_tree);
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
-        self.super_type().unwrap().unbind_from_tree(context);
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
+        self.super_type().unwrap().unbind_from_tree(context, can_gc);
         self.bind_unbind(context.tree_is_in_a_document_tree);
     }
 }
diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs
index 8ff01d220f2..19b0ab4efce 100644
--- a/components/script/dom/htmlbodyelement.rs
+++ b/components/script/dom/htmlbodyelement.rs
@@ -4,7 +4,7 @@
 
 use dom_struct::dom_struct;
 use embedder_traits::{EmbedderMsg, LoadStatus};
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use servo_url::ServoUrl;
 use style::attr::AttrValue;
@@ -141,9 +141,9 @@ impl VirtualMethods for HTMLBodyElement {
             .attribute_affects_presentational_hints(attr)
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
 
         if !context.tree_is_in_a_document_tree {
@@ -176,38 +176,44 @@ impl VirtualMethods for HTMLBodyElement {
         }
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
         let do_super_mutate = match (attr.local_name(), mutation) {
             (name, AttributeMutation::Set(_)) if name.starts_with("on") => {
                 let window = self.owner_window();
                 // https://html.spec.whatwg.org/multipage/
-                // #event-handlers-on-elements,-document-objects,-and-window-objects:event-handlers-3
+                // #event-handlers-on-elements,-document-objects,-and-window-objects:event-handlers-6
                 match name {
-                    &local_name!("onfocus") |
-                    &local_name!("onload") |
-                    &local_name!("onscroll") |
                     &local_name!("onafterprint") |
                     &local_name!("onbeforeprint") |
                     &local_name!("onbeforeunload") |
+                    &local_name!("onerror") |
+                    &local_name!("onfocus") |
                     &local_name!("onhashchange") |
+                    &local_name!("onload") |
                     &local_name!("onlanguagechange") |
                     &local_name!("onmessage") |
+                    &local_name!("onmessageerror") |
                     &local_name!("onoffline") |
                     &local_name!("ononline") |
                     &local_name!("onpagehide") |
+                    &local_name!("onpagereveal") |
                     &local_name!("onpageshow") |
+                    &local_name!("onpageswap") |
                     &local_name!("onpopstate") |
-                    &local_name!("onstorage") |
+                    &local_name!("onrejectionhandled") |
                     &local_name!("onresize") |
-                    &local_name!("onunload") |
-                    &local_name!("onerror") => {
+                    &local_name!("onscroll") |
+                    &local_name!("onstorage") |
+                    &local_name!("onunhandledrejection") |
+                    &local_name!("onunload") => {
+                        let source = &**attr.value();
                         let evtarget = window.upcast::<EventTarget>(); // forwarded event
                         let source_line = 1; //TODO(#9604) obtain current JS execution line
                         evtarget.set_event_handler_uncompiled(
                             window.get_url(),
                             source_line,
                             &name[2..],
-                            DOMString::from((**attr.value()).to_owned()),
+                            source,
                         );
                         false
                     },
@@ -218,7 +224,9 @@ impl VirtualMethods for HTMLBodyElement {
         };
 
         if do_super_mutate {
-            self.super_type().unwrap().attribute_mutated(attr, mutation);
+            self.super_type()
+                .unwrap()
+                .attribute_mutated(attr, mutation, can_gc);
         }
     }
 }
diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs
index 24af541f554..6f83360e187 100644
--- a/components/script/dom/htmlbuttonelement.rs
+++ b/components/script/dom/htmlbuttonelement.rs
@@ -6,7 +6,7 @@ use std::cell::Cell;
 use std::default::Default;
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url};
+use html5ever::{LocalName, Prefix, local_name};
 use js::rust::HandleObject;
 use stylo_dom::ElementState;
 
@@ -242,8 +242,10 @@ impl VirtualMethods for HTMLButtonElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         match *attr.local_name() {
             local_name!("disabled") => {
                 let el = self.upcast::<Element>();
@@ -259,9 +261,9 @@ impl VirtualMethods for HTMLButtonElement {
                         el.check_ancestors_disabled_state_for_form_control();
                     },
                 }
-                el.update_sequentially_focusable_status(CanGc::note());
+                el.update_sequentially_focusable_status(can_gc);
                 self.validity_state()
-                    .perform_validation_and_update(ValidationFlags::all());
+                    .perform_validation_and_update(ValidationFlags::all(), can_gc);
             },
             local_name!("type") => match mutation {
                 AttributeMutation::Set(_) => {
@@ -272,32 +274,32 @@ impl VirtualMethods for HTMLButtonElement {
                     };
                     self.button_type.set(value);
                     self.validity_state()
-                        .perform_validation_and_update(ValidationFlags::all());
+                        .perform_validation_and_update(ValidationFlags::all(), can_gc);
                 },
                 AttributeMutation::Removed => {
                     self.button_type.set(ButtonType::Submit);
                 },
             },
             local_name!("form") => {
-                self.form_attribute_mutated(mutation);
+                self.form_attribute_mutated(mutation, can_gc);
                 self.validity_state()
-                    .perform_validation_and_update(ValidationFlags::empty());
+                    .perform_validation_and_update(ValidationFlags::empty(), can_gc);
             },
             _ => {},
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
 
         self.upcast::<Element>()
             .check_ancestors_disabled_state_for_form_control();
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
-        self.super_type().unwrap().unbind_from_tree(context);
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
+        self.super_type().unwrap().unbind_from_tree(context, can_gc);
 
         let node = self.upcast::<Node>();
         let el = self.upcast::<Element>();
diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs
index 37d7aa91f90..c2bfc9c2d7f 100644
--- a/components/script/dom/htmlcanvaselement.rs
+++ b/components/script/dom/htmlcanvaselement.rs
@@ -7,34 +7,33 @@ use std::collections::HashMap;
 use std::rc::Rc;
 
 use canvas_traits::webgl::{GLContextAttributes, WebGLVersion};
+use constellation_traits::BlobImpl;
+#[cfg(feature = "webgpu")]
+use constellation_traits::ScriptToConstellationMessage;
 use dom_struct::dom_struct;
 use euclid::default::Size2D;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use image::codecs::jpeg::JpegEncoder;
 use image::codecs::png::PngEncoder;
 use image::codecs::webp::WebPEncoder;
 use image::{ColorType, ImageEncoder};
-use ipc_channel::ipc::IpcSharedMemory;
 #[cfg(feature = "webgpu")]
 use ipc_channel::ipc::{self as ipcchan};
 use js::error::throw_type_error;
 use js::rust::{HandleObject, HandleValue};
-use script_layout_interface::{HTMLCanvasData, HTMLCanvasDataSource};
-#[cfg(feature = "webgpu")]
-use script_traits::ScriptMsg;
-use script_traits::serializable::BlobImpl;
+use script_layout_interface::HTMLCanvasData;
 use servo_media::streams::MediaStreamType;
 use servo_media::streams::registry::MediaStreamId;
+use snapshot::Snapshot;
 use style::attr::AttrValue;
 
-use crate::canvas_context::CanvasContext as _;
 pub(crate) use crate::canvas_context::*;
 use crate::conversions::Convert;
 use crate::dom::attr::Attr;
 use crate::dom::bindings::callback::ExceptionHandling;
 use crate::dom::bindings::cell::{DomRefCell, Ref, ref_filter_map};
 use crate::dom::bindings::codegen::Bindings::HTMLCanvasElementBinding::{
-    BlobCallback, HTMLCanvasElementMethods, RenderingContext,
+    BlobCallback, HTMLCanvasElementMethods, RenderingContext as RootedRenderingContext,
 };
 use crate::dom::bindings::codegen::Bindings::MediaStreamBinding::MediaStreamMethods;
 use crate::dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLContextAttributes;
@@ -69,6 +68,7 @@ use crate::script_runtime::{CanGc, JSContext};
 const DEFAULT_WIDTH: u32 = 300;
 const DEFAULT_HEIGHT: u32 = 150;
 
+#[derive(PartialEq)]
 enum EncodedImageType {
     Png,
     Jpeg,
@@ -103,21 +103,14 @@ impl EncodedImageType {
     }
 }
 
-#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
-#[derive(Clone, JSTraceable, MallocSizeOf)]
-pub(crate) enum CanvasContext {
-    Placeholder(Dom<OffscreenCanvas>),
-    Context2d(Dom<CanvasRenderingContext2D>),
-    WebGL(Dom<WebGLRenderingContext>),
-    WebGL2(Dom<WebGL2RenderingContext>),
-    #[cfg(feature = "webgpu")]
-    WebGPU(Dom<GPUCanvasContext>),
-}
-
+/// <https://html.spec.whatwg.org/multipage/#htmlcanvaselement>
 #[dom_struct]
 pub(crate) struct HTMLCanvasElement {
     htmlelement: HTMLElement,
-    context: DomRefCell<Option<CanvasContext>>,
+
+    /// <https://html.spec.whatwg.org/multipage/#concept-canvas-context-mode>
+    context_mode: DomRefCell<Option<RenderingContext>>,
+
     // This id and hashmap are used to keep track of ongoing toBlob() calls.
     callback_id: Cell<u32>,
     #[ignore_malloc_size_of = "not implemented for webidl callbacks"]
@@ -132,7 +125,7 @@ impl HTMLCanvasElement {
     ) -> HTMLCanvasElement {
         HTMLCanvasElement {
             htmlelement: HTMLElement::new_inherited(local_name, prefix, document),
-            context: DomRefCell::new(None),
+            context_mode: DomRefCell::new(None),
             callback_id: Cell::new(0),
             blob_callbacks: RefCell::new(HashMap::new()),
         }
@@ -157,15 +150,8 @@ impl HTMLCanvasElement {
     }
 
     fn recreate_contexts_after_resize(&self) {
-        if let Some(ref context) = *self.context.borrow() {
-            match *context {
-                CanvasContext::Context2d(ref context) => context.resize(),
-                CanvasContext::WebGL(ref context) => context.resize(),
-                CanvasContext::WebGL2(ref context) => context.resize(),
-                #[cfg(feature = "webgpu")]
-                CanvasContext::WebGPU(ref context) => context.resize(),
-                CanvasContext::Placeholder(ref context) => context.resize(self.get_size().cast()),
-            }
+        if let Some(ref context) = *self.context_mode.borrow() {
+            context.resize()
         }
     }
 
@@ -174,24 +160,15 @@ impl HTMLCanvasElement {
     }
 
     pub(crate) fn origin_is_clean(&self) -> bool {
-        match *self.context.borrow() {
-            Some(CanvasContext::Context2d(ref context)) => context.origin_is_clean(),
+        match *self.context_mode.borrow() {
+            Some(ref context) => context.origin_is_clean(),
             _ => true,
         }
     }
 
     pub(crate) fn mark_as_dirty(&self) {
-        if let Some(ref context) = *self.context.borrow() {
-            match *context {
-                CanvasContext::Context2d(ref context) => context.mark_as_dirty(),
-                CanvasContext::WebGL(ref context) => context.mark_as_dirty(),
-                CanvasContext::WebGL2(ref context) => context.mark_as_dirty(),
-                #[cfg(feature = "webgpu")]
-                CanvasContext::WebGPU(ref context) => context.mark_as_dirty(),
-                CanvasContext::Placeholder(ref _context) => {
-                    // TODO: Should this be marked as dirty?
-                },
-            }
+        if let Some(ref context) = *self.context_mode.borrow() {
+            context.mark_as_dirty()
         }
     }
 
@@ -220,13 +197,15 @@ impl LayoutHTMLCanvasElementHelpers for LayoutDom<'_, HTMLCanvasElement> {
     #[allow(unsafe_code)]
     fn data(self) -> HTMLCanvasData {
         let source = unsafe {
-            match self.unsafe_get().context.borrow_for_layout().as_ref() {
-                Some(CanvasContext::Context2d(context)) => context.to_layout().canvas_data_source(),
-                Some(CanvasContext::WebGL(context)) => context.to_layout().canvas_data_source(),
-                Some(CanvasContext::WebGL2(context)) => context.to_layout().canvas_data_source(),
+            match self.unsafe_get().context_mode.borrow_for_layout().as_ref() {
+                Some(RenderingContext::Context2d(context)) => {
+                    context.to_layout().canvas_data_source()
+                },
+                Some(RenderingContext::WebGL(context)) => context.to_layout().canvas_data_source(),
+                Some(RenderingContext::WebGL2(context)) => context.to_layout().canvas_data_source(),
                 #[cfg(feature = "webgpu")]
-                Some(CanvasContext::WebGPU(context)) => context.to_layout().canvas_data_source(),
-                Some(CanvasContext::Placeholder(_)) | None => HTMLCanvasDataSource::Empty,
+                Some(RenderingContext::WebGPU(context)) => context.to_layout().canvas_data_source(),
+                Some(RenderingContext::Placeholder(_)) | None => None,
             }
         };
 
@@ -245,14 +224,14 @@ impl LayoutHTMLCanvasElementHelpers for LayoutDom<'_, HTMLCanvasElement> {
 }
 
 impl HTMLCanvasElement {
-    pub(crate) fn context(&self) -> Option<Ref<CanvasContext>> {
-        ref_filter_map(self.context.borrow(), |ctx| ctx.as_ref())
+    pub(crate) fn context(&self) -> Option<Ref<RenderingContext>> {
+        ref_filter_map(self.context_mode.borrow(), |ctx| ctx.as_ref())
     }
 
     fn get_or_init_2d_context(&self, can_gc: CanGc) -> Option<DomRoot<CanvasRenderingContext2D>> {
         if let Some(ctx) = self.context() {
             return match *ctx {
-                CanvasContext::Context2d(ref ctx) => Some(DomRoot::from_ref(ctx)),
+                RenderingContext::Context2d(ref ctx) => Some(DomRoot::from_ref(ctx)),
                 _ => None,
             };
         }
@@ -260,7 +239,8 @@ impl HTMLCanvasElement {
         let window = self.owner_window();
         let size = self.get_size();
         let context = CanvasRenderingContext2D::new(window.as_global_scope(), self, size, can_gc);
-        *self.context.borrow_mut() = Some(CanvasContext::Context2d(Dom::from_ref(&*context)));
+        *self.context_mode.borrow_mut() =
+            Some(RenderingContext::Context2d(Dom::from_ref(&*context)));
         Some(context)
     }
 
@@ -272,7 +252,7 @@ impl HTMLCanvasElement {
     ) -> Option<DomRoot<WebGLRenderingContext>> {
         if let Some(ctx) = self.context() {
             return match *ctx {
-                CanvasContext::WebGL(ref ctx) => Some(DomRoot::from_ref(ctx)),
+                RenderingContext::WebGL(ref ctx) => Some(DomRoot::from_ref(ctx)),
                 _ => None,
             };
         }
@@ -288,7 +268,7 @@ impl HTMLCanvasElement {
             attrs,
             can_gc,
         )?;
-        *self.context.borrow_mut() = Some(CanvasContext::WebGL(Dom::from_ref(&*context)));
+        *self.context_mode.borrow_mut() = Some(RenderingContext::WebGL(Dom::from_ref(&*context)));
         Some(context)
     }
 
@@ -304,7 +284,7 @@ impl HTMLCanvasElement {
         }
         if let Some(ctx) = self.context() {
             return match *ctx {
-                CanvasContext::WebGL2(ref ctx) => Some(DomRoot::from_ref(ctx)),
+                RenderingContext::WebGL2(ref ctx) => Some(DomRoot::from_ref(ctx)),
                 _ => None,
             };
         }
@@ -313,7 +293,7 @@ impl HTMLCanvasElement {
         let attrs = Self::get_gl_attributes(cx, options)?;
         let canvas = HTMLCanvasElementOrOffscreenCanvas::HTMLCanvasElement(DomRoot::from_ref(self));
         let context = WebGL2RenderingContext::new(&window, &canvas, size, attrs, can_gc)?;
-        *self.context.borrow_mut() = Some(CanvasContext::WebGL2(Dom::from_ref(&*context)));
+        *self.context_mode.borrow_mut() = Some(RenderingContext::WebGL2(Dom::from_ref(&*context)));
         Some(context)
     }
 
@@ -323,10 +303,10 @@ impl HTMLCanvasElement {
     }
 
     #[cfg(feature = "webgpu")]
-    fn get_or_init_webgpu_context(&self) -> Option<DomRoot<GPUCanvasContext>> {
+    fn get_or_init_webgpu_context(&self, can_gc: CanGc) -> Option<DomRoot<GPUCanvasContext>> {
         if let Some(ctx) = self.context() {
             return match *ctx {
-                CanvasContext::WebGPU(ref ctx) => Some(DomRoot::from_ref(ctx)),
+                RenderingContext::WebGPU(ref ctx) => Some(DomRoot::from_ref(ctx)),
                 _ => None,
             };
         }
@@ -334,22 +314,23 @@ impl HTMLCanvasElement {
         let global_scope = self.owner_global();
         let _ = global_scope
             .script_to_constellation_chan()
-            .send(ScriptMsg::GetWebGPUChan(sender));
+            .send(ScriptToConstellationMessage::GetWebGPUChan(sender));
         receiver
             .recv()
             .expect("Failed to get WebGPU channel")
             .map(|channel| {
-                let context = GPUCanvasContext::new(&global_scope, self, channel, CanGc::note());
-                *self.context.borrow_mut() = Some(CanvasContext::WebGPU(Dom::from_ref(&*context)));
+                let context = GPUCanvasContext::new(&global_scope, self, channel, can_gc);
+                *self.context_mode.borrow_mut() =
+                    Some(RenderingContext::WebGPU(Dom::from_ref(&*context)));
                 context
             })
     }
 
     /// Gets the base WebGLRenderingContext for WebGL or WebGL 2, if exists.
     pub(crate) fn get_base_webgl_context(&self) -> Option<DomRoot<WebGLRenderingContext>> {
-        match *self.context.borrow() {
-            Some(CanvasContext::WebGL(ref context)) => Some(DomRoot::from_ref(context)),
-            Some(CanvasContext::WebGL2(ref context)) => Some(context.base_context()),
+        match *self.context_mode.borrow() {
+            Some(RenderingContext::WebGL(ref context)) => Some(DomRoot::from_ref(context)),
+            Some(RenderingContext::WebGL2(ref context)) => Some(context.base_context()),
             _ => None,
         }
     }
@@ -375,42 +356,16 @@ impl HTMLCanvasElement {
         self.Height() != 0 && self.Width() != 0
     }
 
-    pub(crate) fn fetch_all_data(&self) -> Option<(Option<IpcSharedMemory>, Size2D<u32>)> {
-        let size = self.get_size();
-
-        if size.width == 0 || size.height == 0 {
-            return None;
-        }
-
-        let data = match self.context.borrow().as_ref() {
-            Some(CanvasContext::Context2d(context)) => context.get_image_data_as_shared_memory(),
-            Some(CanvasContext::WebGL(_context)) => {
-                // TODO: add a method in WebGLRenderingContext to get the pixels.
-                return None;
-            },
-            Some(CanvasContext::WebGL2(_context)) => {
-                // TODO: add a method in WebGL2RenderingContext to get the pixels.
-                return None;
-            },
-            #[cfg(feature = "webgpu")]
-            Some(CanvasContext::WebGPU(context)) => context.get_image_data_as_shared_memory(),
-            Some(CanvasContext::Placeholder(context)) => return context.fetch_all_data(),
-            None => None,
-        };
-
-        Some((data, size))
-    }
-
-    fn get_content(&self) -> Option<Vec<u8>> {
-        match *self.context.borrow() {
-            Some(CanvasContext::Context2d(ref context)) => context.get_image_data(),
-            Some(CanvasContext::WebGL(ref context)) => context.get_image_data(),
-            Some(CanvasContext::WebGL2(ref context)) => context.get_image_data(),
-            #[cfg(feature = "webgpu")]
-            Some(CanvasContext::WebGPU(ref context)) => context.get_image_data(),
-            Some(CanvasContext::Placeholder(_)) | None => {
-                // Each pixel is fully-transparent black.
-                Some(vec![0; (self.Width() * self.Height() * 4) as usize])
+    pub(crate) fn get_image_data(&self) -> Option<Snapshot> {
+        match self.context_mode.borrow().as_ref() {
+            Some(context) => context.get_image_data(),
+            None => {
+                let size = self.get_size();
+                if size.width == 0 || size.height == 0 {
+                    None
+                } else {
+                    Some(Snapshot::cleared(size.cast()))
+                }
             },
         }
     }
@@ -427,15 +382,23 @@ impl HTMLCanvasElement {
         &self,
         image_type: &EncodedImageType,
         quality: Option<f64>,
-        bytes: &[u8],
+        snapshot: &Snapshot,
         encoder: &mut W,
     ) {
+        // We can't use self.Width() or self.Height() here, since the size of the canvas
+        // may have changed since the snapshot was created. Truncating the dimensions to a
+        // u32 can't panic, since the data comes from a canvas which is always smaller than
+        // u32::MAX.
+        let canvas_data = snapshot.data();
+        let width = snapshot.size().width as u32;
+        let height = snapshot.size().height as u32;
+
         match image_type {
             EncodedImageType::Png => {
                 // FIXME(nox): https://github.com/image-rs/image-png/issues/86
                 // FIXME(nox): https://github.com/image-rs/image-png/issues/87
                 PngEncoder::new(encoder)
-                    .write_image(bytes, self.Width(), self.Height(), ColorType::Rgba8)
+                    .write_image(canvas_data, width, height, ColorType::Rgba8)
                     .unwrap();
             },
             EncodedImageType::Jpeg => {
@@ -455,14 +418,14 @@ impl HTMLCanvasElement {
                 };
 
                 jpeg_encoder
-                    .write_image(bytes, self.Width(), self.Height(), ColorType::Rgba8)
+                    .write_image(canvas_data, width, height, ColorType::Rgba8)
                     .unwrap();
             },
 
             EncodedImageType::Webp => {
                 // No quality support because of https://github.com/image-rs/image/issues/1984
                 WebPEncoder::new_lossless(encoder)
-                    .write_image(bytes, self.Width(), self.Height(), ColorType::Rgba8)
+                    .write_image(canvas_data, width, height, ColorType::Rgba8)
                     .unwrap();
             },
         }
@@ -473,12 +436,12 @@ impl HTMLCanvasElementMethods<crate::DomTypeHolder> for HTMLCanvasElement {
     // https://html.spec.whatwg.org/multipage/#dom-canvas-width
     make_uint_getter!(Width, "width", DEFAULT_WIDTH);
 
-    // https://html.spec.whatwg.org/multipage/#dom-canvas-width
-    // When setting the value of the width or height attribute, if the context mode of the canvas element
-    // is set to placeholder, the user agent must throw an "InvalidStateError" DOMException and leave the
-    // attribute's value unchanged.
-    fn SetWidth(&self, value: u32) -> Fallible<()> {
-        if let Some(CanvasContext::Placeholder(_)) = *self.context.borrow() {
+    /// <https://html.spec.whatwg.org/multipage/#dom-canvas-width>
+    fn SetWidth(&self, value: u32, can_gc: CanGc) -> Fallible<()> {
+        // > When setting the value of the width or height attribute, if the context mode of the canvas element
+        // > is set to placeholder, the user agent must throw an "InvalidStateError" DOMException and leave the
+        // > attribute's value unchanged.
+        if let Some(RenderingContext::Placeholder(_)) = *self.context_mode.borrow() {
             return Err(Error::InvalidState);
         }
 
@@ -488,16 +451,19 @@ impl HTMLCanvasElementMethods<crate::DomTypeHolder> for HTMLCanvasElement {
             value
         };
         let element = self.upcast::<Element>();
-        element.set_uint_attribute(&html5ever::local_name!("width"), value, CanGc::note());
+        element.set_uint_attribute(&html5ever::local_name!("width"), value, can_gc);
         Ok(())
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-canvas-height
     make_uint_getter!(Height, "height", DEFAULT_HEIGHT);
 
-    // https://html.spec.whatwg.org/multipage/#dom-canvas-height
-    fn SetHeight(&self, value: u32) -> Fallible<()> {
-        if let Some(CanvasContext::Placeholder(_)) = *self.context.borrow() {
+    /// <https://html.spec.whatwg.org/multipage/#dom-canvas-height>
+    fn SetHeight(&self, value: u32, can_gc: CanGc) -> Fallible<()> {
+        // > When setting the value of the width or height attribute, if the context mode of the canvas element
+        // > is set to placeholder, the user agent must throw an "InvalidStateError" DOMException and leave the
+        // > attribute's value unchanged.
+        if let Some(RenderingContext::Placeholder(_)) = *self.context_mode.borrow() {
             return Err(Error::InvalidState);
         }
 
@@ -507,7 +473,7 @@ impl HTMLCanvasElementMethods<crate::DomTypeHolder> for HTMLCanvasElement {
             value
         };
         let element = self.upcast::<Element>();
-        element.set_uint_attribute(&html5ever::local_name!("height"), value, CanGc::note());
+        element.set_uint_attribute(&html5ever::local_name!("height"), value, can_gc);
         Ok(())
     }
 
@@ -518,26 +484,26 @@ impl HTMLCanvasElementMethods<crate::DomTypeHolder> for HTMLCanvasElement {
         id: DOMString,
         options: HandleValue,
         can_gc: CanGc,
-    ) -> Fallible<Option<RenderingContext>> {
+    ) -> Fallible<Option<RootedRenderingContext>> {
         // Always throw an InvalidState exception when the canvas is in Placeholder mode (See table in the spec).
-        if let Some(CanvasContext::Placeholder(_)) = *self.context.borrow() {
+        if let Some(RenderingContext::Placeholder(_)) = *self.context_mode.borrow() {
             return Err(Error::InvalidState);
         }
 
         Ok(match &*id {
             "2d" => self
                 .get_or_init_2d_context(can_gc)
-                .map(RenderingContext::CanvasRenderingContext2D),
+                .map(RootedRenderingContext::CanvasRenderingContext2D),
             "webgl" | "experimental-webgl" => self
                 .get_or_init_webgl_context(cx, options, can_gc)
-                .map(RenderingContext::WebGLRenderingContext),
+                .map(RootedRenderingContext::WebGLRenderingContext),
             "webgl2" | "experimental-webgl2" => self
                 .get_or_init_webgl2_context(cx, options, can_gc)
-                .map(RenderingContext::WebGL2RenderingContext),
+                .map(RootedRenderingContext::WebGL2RenderingContext),
             #[cfg(feature = "webgpu")]
             "webgpu" => self
-                .get_or_init_webgpu_context()
-                .map(RenderingContext::GPUCanvasContext),
+                .get_or_init_webgpu_context(can_gc)
+                .map(RootedRenderingContext::GPUCanvasContext),
             _ => None,
         })
     }
@@ -560,11 +526,23 @@ impl HTMLCanvasElementMethods<crate::DomTypeHolder> for HTMLCanvasElement {
         }
 
         // Step 3.
-        let Some(file) = self.get_content() else {
+        let Some(mut snapshot) = self.get_image_data() else {
             return Ok(USVString("data:,".into()));
         };
 
         let image_type = EncodedImageType::from(mime_type);
+        snapshot.transform(
+            if image_type == EncodedImageType::Jpeg {
+                snapshot::AlphaMode::AsOpaque {
+                    premultiplied: true,
+                }
+            } else {
+                snapshot::AlphaMode::Transparent {
+                    premultiplied: false,
+                }
+            },
+            snapshot::PixelFormat::RGBA,
+        );
         let mut url = format!("data:{};base64,", image_type.as_mime_type());
 
         let mut encoder = base64::write::EncoderStringWriter::from_consumer(
@@ -575,7 +553,7 @@ impl HTMLCanvasElementMethods<crate::DomTypeHolder> for HTMLCanvasElement {
         self.encode_for_mime_type(
             &image_type,
             Self::maybe_quality(quality),
-            &file,
+            &snapshot,
             &mut encoder,
         );
         encoder.into_inner();
@@ -597,14 +575,14 @@ impl HTMLCanvasElementMethods<crate::DomTypeHolder> for HTMLCanvasElement {
             return Err(Error::Security);
         }
 
-        // Step 2. and 3.
-        // If this canvas element's bitmap has pixels (i.e., neither its horizontal dimension
+        // Step 2. Let result be null.
+        // Step 3. If this canvas element's bitmap has pixels (i.e., neither its horizontal dimension
         // nor its vertical dimension is zero),
         // then set result to a copy of this canvas element's bitmap.
         let result = if self.Width() == 0 || self.Height() == 0 {
             None
         } else {
-            self.get_content()
+            self.get_image_data()
         };
 
         let this = Trusted::new(self);
@@ -625,18 +603,22 @@ impl HTMLCanvasElementMethods<crate::DomTypeHolder> for HTMLCanvasElement {
                     return error!("Expected blob callback, but found none!");
                 };
 
-                if let Some(bytes) = result {
+                if let Some(mut snapshot) = result {
+                    snapshot.transform(
+                        snapshot::AlphaMode::Transparent{ premultiplied: false },
+                        snapshot::PixelFormat::RGBA
+                    );
                     // Step 4.1
                     // If result is non-null, then set result to a serialization of result as a file with
                     // type and quality if given.
                     let mut encoded: Vec<u8> = vec![];
 
-                    this.encode_for_mime_type(&image_type, quality, &bytes, &mut encoded);
+                    this.encode_for_mime_type(&image_type, quality, &snapshot, &mut encoded);
                     let blob_impl = BlobImpl::new_from_bytes(encoded, image_type.as_mime_type());
-                    // Step 4.2.1 & 4.2.2
-                    // Set result to a new Blob object, created in the relevant realm of this canvas element
-                    // Invoke callback with « result » and "report".
+                    // Step 4.2.1  Set result to a new Blob object, created in the relevant realm of this canvas element
                     let blob = Blob::new(&this.global(), blob_impl, CanGc::note());
+
+                    // Step 4.2.2 Invoke callback with « result » and "report".
                     let _ = callback.Call__(Some(&blob), ExceptionHandling::Report, CanGc::note());
                 } else {
                     let _ = callback.Call__(None, ExceptionHandling::Report, CanGc::note());
@@ -647,8 +629,8 @@ impl HTMLCanvasElementMethods<crate::DomTypeHolder> for HTMLCanvasElement {
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-canvas-transfercontroltooffscreen>
-    fn TransferControlToOffscreen(&self) -> Fallible<DomRoot<OffscreenCanvas>> {
-        if self.context.borrow().is_some() {
+    fn TransferControlToOffscreen(&self, can_gc: CanGc) -> Fallible<DomRoot<OffscreenCanvas>> {
+        if self.context_mode.borrow().is_some() {
             // Step 1.
             // If this canvas element's context mode is not set to none, throw an "InvalidStateError" DOMException.
             return Err(Error::InvalidState);
@@ -665,10 +647,12 @@ impl HTMLCanvasElementMethods<crate::DomTypeHolder> for HTMLCanvasElement {
             self.Width().into(),
             self.Height().into(),
             Some(&Dom::from_ref(self)),
-            CanGc::note(),
+            can_gc,
         );
+
         // Step 4. Set this canvas element's context mode to placeholder.
-        *self.context.borrow_mut() = Some(CanvasContext::Placeholder(offscreen_canvas.as_traced()));
+        *self.context_mode.borrow_mut() =
+            Some(RenderingContext::Placeholder(offscreen_canvas.as_traced()));
 
         // Step 5. Return offscreenCanvas.
         Ok(offscreen_canvas)
@@ -698,8 +682,10 @@ impl VirtualMethods for HTMLCanvasElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         match attr.local_name() {
             &local_name!("width") | &local_name!("height") => self.recreate_contexts_after_resize(),
             _ => (),
diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs
index 5558e2a2001..4db3dc514ba 100644
--- a/components/script/dom/htmlcollection.rs
+++ b/components/script/dom/htmlcollection.rs
@@ -87,7 +87,7 @@ impl HTMLCollection {
     }
 
     /// Returns a collection which is always empty.
-    pub(crate) fn always_empty(window: &Window, root: &Node) -> DomRoot<Self> {
+    pub(crate) fn always_empty(window: &Window, root: &Node, can_gc: CanGc) -> DomRoot<Self> {
         #[derive(JSTraceable)]
         struct NoFilter;
         impl CollectionFilter for NoFilter {
@@ -96,7 +96,7 @@ impl HTMLCollection {
             }
         }
 
-        Self::new(window, root, Box::new(NoFilter), CanGc::note())
+        Self::new(window, root, Box::new(NoFilter), can_gc)
     }
 
     #[cfg_attr(crown, allow(crown::unrooted_must_root))]
@@ -114,6 +114,7 @@ impl HTMLCollection {
         window: &Window,
         root: &Node,
         filter_function: fn(&Element, &Node) -> bool,
+        can_gc: CanGc,
     ) -> DomRoot<Self> {
         #[derive(JSTraceable, MallocSizeOf)]
         pub(crate) struct StaticFunctionFilter(
@@ -132,7 +133,7 @@ impl HTMLCollection {
             window,
             root,
             Box::new(StaticFunctionFilter(filter_function)),
-            CanGc::note(),
+            can_gc,
         )
     }
 
@@ -140,8 +141,9 @@ impl HTMLCollection {
         window: &Window,
         root: &Node,
         filter: Box<dyn CollectionFilter + 'static>,
+        can_gc: CanGc,
     ) -> DomRoot<Self> {
-        Self::new(window, root, filter, CanGc::note())
+        Self::new(window, root, filter, can_gc)
     }
 
     fn validate_cache(&self) {
@@ -176,6 +178,7 @@ impl HTMLCollection {
         window: &Window,
         root: &Node,
         qualified_name: LocalName,
+        can_gc: CanGc,
     ) -> DomRoot<HTMLCollection> {
         // case 1
         if qualified_name == local_name!("*") {
@@ -186,7 +189,7 @@ impl HTMLCollection {
                     true
                 }
             }
-            return HTMLCollection::create(window, root, Box::new(AllFilter));
+            return HTMLCollection::create(window, root, Box::new(AllFilter), can_gc);
         }
 
         #[derive(JSTraceable, MallocSizeOf)]
@@ -212,7 +215,7 @@ impl HTMLCollection {
             ascii_lower_qualified_name: qualified_name.to_ascii_lowercase(),
             qualified_name,
         };
-        HTMLCollection::create(window, root, Box::new(filter))
+        HTMLCollection::create(window, root, Box::new(filter), can_gc)
     }
 
     fn match_element(elem: &Element, qualified_name: &LocalName) -> bool {
@@ -231,17 +234,19 @@ impl HTMLCollection {
         root: &Node,
         tag: DOMString,
         maybe_ns: Option<DOMString>,
+        can_gc: CanGc,
     ) -> DomRoot<HTMLCollection> {
         let local = LocalName::from(tag);
         let ns = namespace_from_domstring(maybe_ns);
         let qname = QualName::new(None, ns, local);
-        HTMLCollection::by_qual_tag_name(window, root, qname)
+        HTMLCollection::by_qual_tag_name(window, root, qname, can_gc)
     }
 
     pub(crate) fn by_qual_tag_name(
         window: &Window,
         root: &Node,
         qname: QualName,
+        can_gc: CanGc,
     ) -> DomRoot<HTMLCollection> {
         #[derive(JSTraceable, MallocSizeOf)]
         struct TagNameNSFilter {
@@ -256,22 +261,24 @@ impl HTMLCollection {
             }
         }
         let filter = TagNameNSFilter { qname };
-        HTMLCollection::create(window, root, Box::new(filter))
+        HTMLCollection::create(window, root, Box::new(filter), can_gc)
     }
 
     pub(crate) fn by_class_name(
         window: &Window,
         root: &Node,
         classes: DOMString,
+        can_gc: CanGc,
     ) -> DomRoot<HTMLCollection> {
         let class_atoms = split_html_space_chars(&classes).map(Atom::from).collect();
-        HTMLCollection::by_atomic_class_name(window, root, class_atoms)
+        HTMLCollection::by_atomic_class_name(window, root, class_atoms, can_gc)
     }
 
     pub(crate) fn by_atomic_class_name(
         window: &Window,
         root: &Node,
         classes: Vec<Atom>,
+        can_gc: CanGc,
     ) -> DomRoot<HTMLCollection> {
         #[derive(JSTraceable, MallocSizeOf)]
         struct ClassNameFilter {
@@ -292,17 +299,20 @@ impl HTMLCollection {
         }
 
         if classes.is_empty() {
-            return HTMLCollection::always_empty(window, root);
+            return HTMLCollection::always_empty(window, root, can_gc);
         }
 
         let filter = ClassNameFilter { classes };
-        HTMLCollection::create(window, root, Box::new(filter))
+        HTMLCollection::create(window, root, Box::new(filter), can_gc)
     }
 
-    pub(crate) fn children(window: &Window, root: &Node) -> DomRoot<HTMLCollection> {
-        HTMLCollection::new_with_filter_fn(window, root, |element, root| {
-            root.is_parent_of(element.upcast())
-        })
+    pub(crate) fn children(window: &Window, root: &Node, can_gc: CanGc) -> DomRoot<HTMLCollection> {
+        HTMLCollection::new_with_filter_fn(
+            window,
+            root,
+            |element, root| root.is_parent_of(element.upcast()),
+            can_gc,
+        )
     }
 
     pub(crate) fn elements_iter_after<'a>(
diff --git a/components/script/dom/htmldatalistelement.rs b/components/script/dom/htmldatalistelement.rs
index 51fc9280ad8..9530ab90be9 100644
--- a/components/script/dom/htmldatalistelement.rs
+++ b/components/script/dom/htmldatalistelement.rs
@@ -53,9 +53,12 @@ impl HTMLDataListElement {
 
 impl HTMLDataListElementMethods<crate::DomTypeHolder> for HTMLDataListElement {
     // https://html.spec.whatwg.org/multipage/#dom-datalist-options
-    fn Options(&self) -> DomRoot<HTMLCollection> {
-        HTMLCollection::new_with_filter_fn(&self.owner_window(), self.upcast(), |element, _| {
-            element.is::<HTMLOptionElement>()
-        })
+    fn Options(&self, can_gc: CanGc) -> DomRoot<HTMLCollection> {
+        HTMLCollection::new_with_filter_fn(
+            &self.owner_window(),
+            self.upcast(),
+            |element, _| element.is::<HTMLOptionElement>(),
+            can_gc,
+        )
     }
 }
diff --git a/components/script/dom/htmldetailselement.rs b/components/script/dom/htmldetailselement.rs
index 2a0f5b9d0dc..1d48b8e7a97 100644
--- a/components/script/dom/htmldetailselement.rs
+++ b/components/script/dom/htmldetailselement.rs
@@ -118,7 +118,7 @@ impl HTMLDetailsElement {
 
         let summary = HTMLSlotElement::new(local_name!("slot"), None, &document, None, can_gc);
         root.upcast::<Node>()
-            .AppendChild(summary.upcast::<Node>())
+            .AppendChild(summary.upcast::<Node>(), can_gc)
             .unwrap();
 
         let fallback_summary =
@@ -128,12 +128,12 @@ impl HTMLDetailsElement {
             .SetTextContent(Some(DEFAULT_SUMMARY.into()), can_gc);
         summary
             .upcast::<Node>()
-            .AppendChild(fallback_summary.upcast::<Node>())
+            .AppendChild(fallback_summary.upcast::<Node>(), can_gc)
             .unwrap();
 
         let descendants = HTMLSlotElement::new(local_name!("slot"), None, &document, None, can_gc);
         root.upcast::<Node>()
-            .AppendChild(descendants.upcast::<Node>())
+            .AppendChild(descendants.upcast::<Node>(), can_gc)
             .unwrap();
 
         let _ = self.shadow_tree.borrow_mut().insert(ShadowTree {
@@ -178,8 +178,6 @@ impl HTMLDetailsElement {
             }
         }
         shadow_tree.descendants.Assign(slottable_children);
-
-        self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
     }
 
     fn update_shadow_tree_styles(&self, can_gc: CanGc) {
@@ -214,8 +212,6 @@ impl HTMLDetailsElement {
             .implicit_summary
             .upcast::<Element>()
             .set_string_attribute(&local_name!("style"), implicit_summary_style.into(), can_gc);
-
-        self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
     }
 }
 
@@ -232,11 +228,13 @@ impl VirtualMethods for HTMLDetailsElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
 
         if attr.local_name() == &local_name!("open") {
-            self.update_shadow_tree_styles(CanGc::note());
+            self.update_shadow_tree_styles(can_gc);
 
             let counter = self.toggle_counter.get() + 1;
             self.toggle_counter.set(counter);
@@ -261,8 +259,8 @@ impl VirtualMethods for HTMLDetailsElement {
         self.update_shadow_tree_contents(CanGc::note());
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
-        self.super_type().unwrap().bind_to_tree(context);
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
+        self.super_type().unwrap().bind_to_tree(context, can_gc);
 
         self.update_shadow_tree_contents(CanGc::note());
         self.update_shadow_tree_styles(CanGc::note());
diff --git a/components/script/dom/htmldialogelement.rs b/components/script/dom/htmldialogelement.rs
index 949dfef0a53..fbd84e4efd3 100644
--- a/components/script/dom/htmldialogelement.rs
+++ b/components/script/dom/htmldialogelement.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 
 use crate::dom::bindings::cell::DomRefCell;
@@ -99,13 +99,13 @@ impl HTMLDialogElementMethods<crate::DomTypeHolder> for HTMLDialogElement {
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-dialog-close
-    fn Close(&self, return_value: Option<DOMString>) {
+    fn Close(&self, return_value: Option<DOMString>, can_gc: CanGc) {
         let element = self.upcast::<Element>();
         let target = self.upcast::<EventTarget>();
 
         // Step 1 & 2
         if element
-            .remove_attribute(&ns!(), &local_name!("open"))
+            .remove_attribute(&ns!(), &local_name!("open"), can_gc)
             .is_none()
         {
             return;
diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs
index aa72b536683..f41370386e9 100644
--- a/components/script/dom/htmlelement.rs
+++ b/components/script/dom/htmlelement.rs
@@ -7,7 +7,7 @@ use std::default::Default;
 use std::rc::Rc;
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use script_layout_interface::QueryMsg;
 use style::attr::AttrValue;
@@ -32,7 +32,7 @@ use crate::dom::bindings::str::DOMString;
 use crate::dom::characterdata::CharacterData;
 use crate::dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration, CSSStyleOwner};
 use crate::dom::customelementregistry::CallbackReaction;
-use crate::dom::document::{Document, FocusType};
+use crate::dom::document::{Document, FocusInitiator};
 use crate::dom::documentfragment::DocumentFragment;
 use crate::dom::domstringmap::DOMStringMap;
 use crate::dom::element::{AttributeMutation, Element};
@@ -116,7 +116,7 @@ impl HTMLElement {
     /// `.outerText` in JavaScript.`
     ///
     /// <https://html.spec.whatwg.org/multipage/#get-the-text-steps>
-    fn get_inner_outer_text(&self, can_gc: CanGc) -> DOMString {
+    pub(crate) fn get_inner_outer_text(&self, can_gc: CanGc) -> DOMString {
         let node = self.upcast::<Node>();
         let window = node.owner_window();
         let element = self.as_element();
@@ -134,11 +134,21 @@ impl HTMLElement {
 
         DOMString::from(text)
     }
+
+    /// <https://html.spec.whatwg.org/multipage/#set-the-inner-text-steps>
+    pub(crate) fn set_inner_text(&self, input: DOMString, can_gc: CanGc) {
+        // Step 1: Let fragment be the rendered text fragment for value given element's node
+        // document.
+        let fragment = self.rendered_text_fragment(input, can_gc);
+
+        // Step 2: Replace all with fragment within element.
+        Node::replace_all(Some(fragment.upcast()), self.upcast::<Node>(), can_gc);
+    }
 }
 
 impl HTMLElementMethods<crate::DomTypeHolder> for HTMLElement {
     // https://html.spec.whatwg.org/multipage/#the-style-attribute
-    fn Style(&self) -> DomRoot<CSSStyleDeclaration> {
+    fn Style(&self, can_gc: CanGc) -> DomRoot<CSSStyleDeclaration> {
         self.style_decl.or_init(|| {
             let global = self.owner_window();
             CSSStyleDeclaration::new(
@@ -146,7 +156,7 @@ impl HTMLElementMethods<crate::DomTypeHolder> for HTMLElement {
                 CSSStyleOwner::Element(Dom::from_ref(self.upcast())),
                 None,
                 CSSModificationAccess::ReadWrite,
-                CanGc::note(),
+                can_gc,
             )
         })
     }
@@ -181,13 +191,9 @@ impl HTMLElementMethods<crate::DomTypeHolder> for HTMLElement {
     // https://html.spec.whatwg.org/multipage/#globaleventhandlers
     global_event_handlers!(NoOnload);
 
-    // https://html.spec.whatwg.org/multipage/#documentandelementeventhandlers
-    document_and_element_event_handlers!();
-
     // https://html.spec.whatwg.org/multipage/#dom-dataset
-    fn Dataset(&self) -> DomRoot<DOMStringMap> {
-        self.dataset
-            .or_init(|| DOMStringMap::new(self, CanGc::note()))
+    fn Dataset(&self, can_gc: CanGc) -> DomRoot<DOMStringMap> {
+        self.dataset.or_init(|| DOMStringMap::new(self, can_gc))
     }
 
     // https://html.spec.whatwg.org/multipage/#handler-onerror
@@ -395,7 +401,7 @@ impl HTMLElementMethods<crate::DomTypeHolder> for HTMLElement {
         Some(item_attr_values.into_iter().collect())
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-click
+    /// <https://html.spec.whatwg.org/multipage/#dom-click>
     fn Click(&self, can_gc: CanGc) {
         let element = self.as_element();
         if element.disabled_state() {
@@ -407,7 +413,7 @@ impl HTMLElementMethods<crate::DomTypeHolder> for HTMLElement {
         element.set_click_in_progress(true);
 
         self.upcast::<Node>()
-            .fire_synthetic_mouse_event_not_trusted(DOMString::from("click"), can_gc);
+            .fire_synthetic_pointer_event_not_trusted(DOMString::from("click"), can_gc);
         element.set_click_in_progress(false);
     }
 
@@ -416,18 +422,19 @@ impl HTMLElementMethods<crate::DomTypeHolder> for HTMLElement {
         // TODO: Mark the element as locked for focus and run the focusing steps.
         // https://html.spec.whatwg.org/multipage/#focusing-steps
         let document = self.owner_document();
-        document.request_focus(Some(self.upcast()), FocusType::Element, can_gc);
+        document.request_focus(Some(self.upcast()), FocusInitiator::Local, can_gc);
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-blur
     fn Blur(&self, can_gc: CanGc) {
-        // TODO: Run the unfocusing steps.
+        // TODO: Run the unfocusing steps. Focus the top-level document, not
+        //       the current document.
         if !self.as_element().focus_state() {
             return;
         }
         // https://html.spec.whatwg.org/multipage/#unfocusing-steps
         let document = self.owner_document();
-        document.request_focus(None, FocusType::Element, can_gc);
+        document.request_focus(None, FocusInitiator::Local, can_gc);
     }
 
     // https://drafts.csswg.org/cssom-view/#dom-htmlelement-offsetparent
@@ -494,12 +501,7 @@ impl HTMLElementMethods<crate::DomTypeHolder> for HTMLElement {
 
     /// <https://html.spec.whatwg.org/multipage/#set-the-inner-text-steps>
     fn SetInnerText(&self, input: DOMString, can_gc: CanGc) {
-        // Step 1: Let fragment be the rendered text fragment for value given element's node
-        // document.
-        let fragment = self.rendered_text_fragment(input, can_gc);
-
-        // Step 2: Replace all with fragment within element.
-        Node::replace_all(Some(fragment.upcast()), self.upcast::<Node>());
+        self.set_inner_text(input, can_gc)
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-outertext>
@@ -532,23 +534,25 @@ impl HTMLElementMethods<crate::DomTypeHolder> for HTMLElement {
         if fragment.upcast::<Node>().children_count() == 0 {
             let text_node = Text::new(DOMString::from("".to_owned()), &document, can_gc);
 
-            fragment.upcast::<Node>().AppendChild(text_node.upcast())?;
+            fragment
+                .upcast::<Node>()
+                .AppendChild(text_node.upcast(), can_gc)?;
         }
 
         // Step 6: Replace this with fragment within this's parent.
-        parent.ReplaceChild(fragment.upcast(), node)?;
+        parent.ReplaceChild(fragment.upcast(), node, can_gc)?;
 
         // Step 7: If next is non-null and next's previous sibling is a Text node, then merge with
         // the next text node given next's previous sibling.
         if let Some(next_sibling) = next {
             if let Some(node) = next_sibling.GetPreviousSibling() {
-                Self::merge_with_the_next_text_node(node);
+                Self::merge_with_the_next_text_node(node, can_gc);
             }
         }
 
         // Step 8: If previous is a Text node, then merge with the next text node given previous.
         if let Some(previous) = previous {
-            Self::merge_with_the_next_text_node(previous)
+            Self::merge_with_the_next_text_node(previous, can_gc)
         }
 
         Ok(())
@@ -592,7 +596,7 @@ impl HTMLElementMethods<crate::DomTypeHolder> for HTMLElement {
         false
     }
     /// <https://html.spec.whatwg.org/multipage#dom-attachinternals>
-    fn AttachInternals(&self) -> Fallible<DomRoot<ElementInternals>> {
+    fn AttachInternals(&self, can_gc: CanGc) -> Fallible<DomRoot<ElementInternals>> {
         let element = self.as_element();
         // Step 1: If this's is value is not null, then throw a "NotSupportedError" DOMException
         if element.get_is().is_some() {
@@ -618,7 +622,7 @@ impl HTMLElementMethods<crate::DomTypeHolder> for HTMLElement {
         }
 
         // Step 5: If this's attached internals is non-null, then throw an "NotSupportedError" DOMException
-        let internals = element.ensure_element_internals();
+        let internals = element.ensure_element_internals(can_gc);
         if internals.attached() {
             return Err(Error::NotSupported);
         }
@@ -641,13 +645,16 @@ impl HTMLElementMethods<crate::DomTypeHolder> for HTMLElement {
         Ok(internals)
     }
 
-    // FIXME: The nonce should be stored in an internal slot instead of an
-    // attribute (https://html.spec.whatwg.org/multipage/#cryptographicnonce)
     // https://html.spec.whatwg.org/multipage/#dom-noncedelement-nonce
-    make_getter!(Nonce, "nonce");
+    fn Nonce(&self) -> DOMString {
+        self.as_element().nonce_value().into()
+    }
 
     // https://html.spec.whatwg.org/multipage/#dom-noncedelement-nonce
-    make_setter!(SetNonce, "nonce");
+    fn SetNonce(&self, value: DOMString) {
+        self.as_element()
+            .update_nonce_internal_slot(value.to_string())
+    }
 
     // https://html.spec.whatwg.org/multipage/#dom-fe-autofocus
     fn Autofocus(&self) -> bool {
@@ -670,7 +677,7 @@ fn append_text_node_to_fragment(
     let text = Text::new(DOMString::from(text), document, can_gc);
     fragment
         .upcast::<Node>()
-        .AppendChild(text.upcast())
+        .AppendChild(text.upcast(), can_gc)
         .unwrap();
 }
 
@@ -758,10 +765,11 @@ impl HTMLElement {
             })
     }
 
-    pub(crate) fn delete_custom_attr(&self, local_name: DOMString) {
+    pub(crate) fn delete_custom_attr(&self, local_name: DOMString, can_gc: CanGc) {
         // FIXME(ajeffrey): Convert directly from DOMString to LocalName
         let local_name = LocalName::from(to_snake_case(local_name));
-        self.as_element().remove_attribute(&ns!(), &local_name);
+        self.as_element()
+            .remove_attribute(&ns!(), &local_name, can_gc);
     }
 
     /// <https://html.spec.whatwg.org/multipage/#category-label>
@@ -1015,7 +1023,10 @@ impl HTMLElement {
                     }
 
                     let br = HTMLBRElement::new(local_name!("br"), None, &document, None, can_gc);
-                    fragment.upcast::<Node>().AppendChild(br.upcast()).unwrap();
+                    fragment
+                        .upcast::<Node>()
+                        .AppendChild(br.upcast(), can_gc)
+                        .unwrap();
                 },
                 _ => {
                     // Collect a sequence of code points that are not U+000A LF or U+000D CR from
@@ -1039,7 +1050,7 @@ impl HTMLElement {
     /// node.
     ///
     /// <https://html.spec.whatwg.org/multipage/#merge-with-the-next-text-node>
-    fn merge_with_the_next_text_node(node: DomRoot<Node>) {
+    fn merge_with_the_next_text_node(node: DomRoot<Node>, can_gc: CanGc) {
         // Make sure node is a Text node
         if !node.is::<Text>() {
             return;
@@ -1063,7 +1074,7 @@ impl HTMLElement {
             .expect("Got chars from Text");
 
         // Step 4:Remove next.
-        next.remove_self();
+        next.remove_self(can_gc);
     }
 }
 
@@ -1072,23 +1083,25 @@ impl VirtualMethods for HTMLElement {
         Some(self.as_element() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         let element = self.as_element();
         match (attr.local_name(), mutation) {
             (name, AttributeMutation::Set(_)) if name.starts_with("on") => {
+                let source = &**attr.value();
                 let evtarget = self.upcast::<EventTarget>();
                 let source_line = 1; //TODO(#9604) get current JS execution line
                 evtarget.set_event_handler_uncompiled(
                     self.owner_window().get_url(),
                     source_line,
                     &name[2..],
-                    // FIXME(ajeffrey): Convert directly from AttrValue to DOMString
-                    DOMString::from(&**attr.value()),
+                    source,
                 );
             },
             (&local_name!("form"), mutation) if self.is_form_associated_custom_element() => {
-                self.form_attribute_mutated(mutation);
+                self.form_attribute_mutated(mutation, can_gc);
             },
             // Adding a "disabled" attribute disables an enabled form element.
             (&local_name!("disabled"), AttributeMutation::Set(_))
@@ -1128,16 +1141,25 @@ impl VirtualMethods for HTMLElement {
                     },
                 }
             },
+            (&local_name!("nonce"), mutation) => match mutation {
+                AttributeMutation::Set(_) => {
+                    let nonce = &**attr.value();
+                    element.update_nonce_internal_slot(nonce.to_owned());
+                },
+                AttributeMutation::Removed => {
+                    element.update_nonce_internal_slot("".to_owned());
+                },
+            },
             _ => {},
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(super_type) = self.super_type() {
-            super_type.bind_to_tree(context);
+            super_type.bind_to_tree(context, can_gc);
         }
         let element = self.as_element();
-        element.update_sequentially_focusable_status(CanGc::note());
+        element.update_sequentially_focusable_status(can_gc);
 
         // Binding to a tree can disable a form control if one of the new
         // ancestors is a fieldset.
@@ -1153,9 +1175,9 @@ impl VirtualMethods for HTMLElement {
         }
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
         if let Some(super_type) = self.super_type() {
-            super_type.unbind_from_tree(context);
+            super_type.unbind_from_tree(context, can_gc);
         }
 
         // Unbinding from a tree might enable a form control, if a
@@ -1219,7 +1241,7 @@ impl FormControl for HTMLElement {
     fn set_form_owner(&self, form: Option<&HTMLFormElement>) {
         debug_assert!(self.is_form_associated_custom_element());
         self.as_element()
-            .ensure_element_internals()
+            .ensure_element_internals(CanGc::note())
             .set_form_owner(form);
     }
 
diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs
index 13e09c4125e..d5ad5fb08f6 100644
--- a/components/script/dom/htmlfieldsetelement.rs
+++ b/components/script/dom/htmlfieldsetelement.rs
@@ -71,12 +71,12 @@ impl HTMLFieldSetElement {
         )
     }
 
-    pub(crate) fn update_validity(&self) {
+    pub(crate) fn update_validity(&self, can_gc: CanGc) {
         let has_invalid_child = self
             .upcast::<Node>()
             .traverse_preorder(ShadowIncluding::No)
             .flat_map(DomRoot::downcast::<Element>)
-            .any(|element| element.is_invalid(false));
+            .any(|element| element.is_invalid(false, can_gc));
 
         self.upcast::<Element>()
             .set_state(ElementState::VALID, !has_invalid_child);
@@ -87,12 +87,17 @@ impl HTMLFieldSetElement {
 
 impl HTMLFieldSetElementMethods<crate::DomTypeHolder> for HTMLFieldSetElement {
     // https://html.spec.whatwg.org/multipage/#dom-fieldset-elements
-    fn Elements(&self) -> DomRoot<HTMLCollection> {
-        HTMLCollection::new_with_filter_fn(&self.owner_window(), self.upcast(), |element, _| {
-            element
-                .downcast::<HTMLElement>()
-                .is_some_and(HTMLElement::is_listed_element)
-        })
+    fn Elements(&self, can_gc: CanGc) -> DomRoot<HTMLCollection> {
+        HTMLCollection::new_with_filter_fn(
+            &self.owner_window(),
+            self.upcast(),
+            |element, _| {
+                element
+                    .downcast::<HTMLElement>()
+                    .is_some_and(HTMLElement::is_listed_element)
+            },
+            can_gc,
+        )
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-fieldset-disabled
@@ -153,8 +158,10 @@ impl VirtualMethods for HTMLFieldSetElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         match *attr.local_name() {
             local_name!("disabled") => {
                 let disabled_state = match mutation {
@@ -216,7 +223,7 @@ impl VirtualMethods for HTMLFieldSetElement {
                                 );
                             }
                         }
-                        element.update_sequentially_focusable_status(CanGc::note());
+                        element.update_sequentially_focusable_status(can_gc);
                     }
                 } else {
                     for field in fields {
@@ -237,13 +244,13 @@ impl VirtualMethods for HTMLFieldSetElement {
                                 );
                             }
                         }
-                        element.update_sequentially_focusable_status(CanGc::note());
+                        element.update_sequentially_focusable_status(can_gc);
                     }
                 }
-                element.update_sequentially_focusable_status(CanGc::note());
+                element.update_sequentially_focusable_status(can_gc);
             },
             local_name!("form") => {
-                self.form_attribute_mutated(mutation);
+                self.form_attribute_mutated(mutation, can_gc);
             },
             _ => {},
         }
diff --git a/components/script/dom/htmlfontelement.rs b/components/script/dom/htmlfontelement.rs
index ee7015fb66d..fb02a10a4e4 100644
--- a/components/script/dom/htmlfontelement.rs
+++ b/components/script/dom/htmlfontelement.rs
@@ -4,7 +4,7 @@
 
 use cssparser::match_ignore_ascii_case;
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use style::attr::AttrValue;
 use style::color::AbsoluteColor;
diff --git a/components/script/dom/htmlformcontrolscollection.rs b/components/script/dom/htmlformcontrolscollection.rs
index 90610b2384b..c5745d60f70 100644
--- a/components/script/dom/htmlformcontrolscollection.rs
+++ b/components/script/dom/htmlformcontrolscollection.rs
@@ -64,7 +64,7 @@ impl HTMLFormControlsCollectionMethods<crate::DomTypeHolder> for HTMLFormControl
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-htmlformcontrolscollection-nameditem
-    fn NamedItem(&self, name: DOMString) -> Option<RadioNodeListOrElement> {
+    fn NamedItem(&self, name: DOMString, can_gc: CanGc) -> Option<RadioNodeListOrElement> {
         // Step 1
         if name.is_empty() {
             return None;
@@ -96,10 +96,7 @@ impl HTMLFormControlsCollectionMethods<crate::DomTypeHolder> for HTMLFormControl
                 // and the collection filter excludes image inputs.
                 Some(RadioNodeListOrElement::RadioNodeList(
                     RadioNodeList::new_controls_except_image_inputs(
-                        window,
-                        &self.form,
-                        &name,
-                        CanGc::note(),
+                        window, &self.form, &name, can_gc,
                     ),
                 ))
             }
@@ -110,8 +107,8 @@ impl HTMLFormControlsCollectionMethods<crate::DomTypeHolder> for HTMLFormControl
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-htmlformcontrolscollection-nameditem
-    fn NamedGetter(&self, name: DOMString) -> Option<RadioNodeListOrElement> {
-        self.NamedItem(name)
+    fn NamedGetter(&self, name: DOMString, can_gc: CanGc) -> Option<RadioNodeListOrElement> {
+        self.NamedItem(name, can_gc)
     }
 
     // https://html.spec.whatwg.org/multipage/#the-htmlformcontrolscollection-interface:supported-property-names
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index c8431fdf365..2421b683bf7 100644
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -5,16 +5,16 @@
 use std::borrow::ToOwned;
 use std::cell::Cell;
 
+use constellation_traits::{LoadData, LoadOrigin, NavigationHistoryBehavior};
 use dom_struct::dom_struct;
 use encoding_rs::{Encoding, UTF_8};
 use headers::{ContentType, HeaderMapExt};
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use http::Method;
 use js::rust::HandleObject;
 use mime::{self, Mime};
 use net_traits::http_percent_encode;
 use net_traits::request::Referrer;
-use script_traits::{LoadData, LoadOrigin, NavigationHistoryBehavior};
 use servo_rand::random;
 use style::attr::AttrValue;
 use style::str::split_html_space_chars;
@@ -359,7 +359,7 @@ impl HTMLFormElementMethods<crate::DomTypeHolder> for HTMLFormElement {
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-form-elements
-    fn Elements(&self) -> DomRoot<HTMLFormControlsCollection> {
+    fn Elements(&self, can_gc: CanGc) -> DomRoot<HTMLFormControlsCollection> {
         #[derive(JSTraceable, MallocSizeOf)]
         struct ElementsFilter {
             form: DomRoot<HTMLFormElement>,
@@ -422,35 +422,35 @@ impl HTMLFormElementMethods<crate::DomTypeHolder> for HTMLFormElement {
                 form: DomRoot::from_ref(self),
             });
             let window = self.owner_window();
-            HTMLFormControlsCollection::new(&window, self, filter, CanGc::note())
+            HTMLFormControlsCollection::new(&window, self, filter, can_gc)
         }))
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-form-length
     fn Length(&self) -> u32 {
-        self.Elements().Length()
+        self.Elements(CanGc::note()).Length()
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-form-item
-    fn IndexedGetter(&self, index: u32) -> Option<DomRoot<Element>> {
-        let elements = self.Elements();
+    fn IndexedGetter(&self, index: u32, can_gc: CanGc) -> Option<DomRoot<Element>> {
+        let elements = self.Elements(can_gc);
         elements.IndexedGetter(index)
     }
 
     // https://html.spec.whatwg.org/multipage/#the-form-element%3Adetermine-the-value-of-a-named-property
-    fn NamedGetter(&self, name: DOMString) -> Option<RadioNodeListOrElement> {
+    fn NamedGetter(&self, name: DOMString, can_gc: CanGc) -> Option<RadioNodeListOrElement> {
         let window = self.owner_window();
 
         let name = Atom::from(name);
 
         // Step 1
         let mut candidates =
-            RadioNodeList::new_controls_except_image_inputs(&window, self, &name, CanGc::note());
+            RadioNodeList::new_controls_except_image_inputs(&window, self, &name, can_gc);
         let mut candidates_length = candidates.Length();
 
         // Step 2
         if candidates_length == 0 {
-            candidates = RadioNodeList::new_images(&window, self, &name, CanGc::note());
+            candidates = RadioNodeList::new_images(&window, self, &name, can_gc);
             candidates_length = candidates.Length();
         }
 
@@ -497,7 +497,7 @@ impl HTMLFormElementMethods<crate::DomTypeHolder> for HTMLFormElement {
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-a-rellist
-    fn RelList(&self) -> DomRoot<DOMTokenList> {
+    fn RelList(&self, can_gc: CanGc) -> DomRoot<DOMTokenList> {
         self.rel_list.or_init(|| {
             DOMTokenList::new(
                 self.upcast(),
@@ -507,7 +507,7 @@ impl HTMLFormElementMethods<crate::DomTypeHolder> for HTMLFormElement {
                     Atom::from("noreferrer"),
                     Atom::from("opener"),
                 ]),
-                CanGc::note(),
+                can_gc,
             )
         })
     }
@@ -712,9 +712,11 @@ impl HTMLFormElement {
         result
     }
 
-    pub(crate) fn update_validity(&self) {
+    pub(crate) fn update_validity(&self, can_gc: CanGc) {
         let controls = self.controls.borrow();
-        let is_any_invalid = controls.iter().any(|control| control.is_invalid(false));
+        let is_any_invalid = controls
+            .iter()
+            .any(|control| control.is_invalid(false, can_gc));
 
         self.upcast::<Element>()
             .set_state(ElementState::VALID, !is_any_invalid);
@@ -772,7 +774,7 @@ impl HTMLFormElement {
 
             // Step 6.5
             let event = SubmitEvent::new(
-                &self.global(),
+                self.global().as_window(),
                 atom!("submit"),
                 true,
                 true,
@@ -865,6 +867,7 @@ impl HTMLFormElement {
             target_document.get_referrer_policy(),
             Some(target_window.as_global_scope().is_secure_context()),
             Some(target_document.insecure_requests_policy()),
+            target_document.has_trustworthy_ancestor_origin(),
         );
 
         // Step 22
@@ -1087,7 +1090,7 @@ impl HTMLFormElement {
             .iter()
             .filter_map(|field| {
                 if let Some(element) = field.downcast::<Element>() {
-                    if element.is_invalid(true) {
+                    if element.is_invalid(true, can_gc) {
                         Some(DomRoot::from_ref(element))
                     } else {
                         None
@@ -1126,6 +1129,7 @@ impl HTMLFormElement {
         &self,
         submitter: Option<FormSubmitterElement>,
         encoding: Option<&'static Encoding>,
+        can_gc: CanGc,
     ) -> Vec<FormDatum> {
         let controls = self.controls.borrow();
         let mut data_set = Vec::new();
@@ -1174,7 +1178,8 @@ impl HTMLFormElement {
                         let custom = child.downcast::<HTMLElement>().unwrap();
                         if custom.is_form_associated_custom_element() {
                             // https://html.spec.whatwg.org/multipage/#face-entry-construction
-                            let internals = custom.upcast::<Element>().ensure_element_internals();
+                            let internals =
+                                custom.upcast::<Element>().ensure_element_internals(can_gc);
                             internals.perform_entry_construction(&mut data_set);
                             // Otherwise no form value has been set so there is nothing to do.
                         }
@@ -1222,7 +1227,7 @@ impl HTMLFormElement {
         self.constructing_entry_list.set(true);
 
         // Step 3-6
-        let ret = self.get_unclean_dataset(submitter, encoding);
+        let ret = self.get_unclean_dataset(submitter, encoding, can_gc);
 
         let window = self.owner_window();
 
@@ -1231,7 +1236,7 @@ impl HTMLFormElement {
 
         // Step 7
         let event = FormDataEvent::new(
-            &window.global(),
+            &window,
             atom!("formdata"),
             EventBubbles::Bubbles,
             EventCancelable::NotCancelable,
@@ -1265,15 +1270,21 @@ impl HTMLFormElement {
             return;
         }
 
-        let controls = self.controls.borrow();
-        for child in controls.iter() {
+        let controls: Vec<_> = self
+            .controls
+            .borrow()
+            .iter()
+            .map(|c| c.as_rooted())
+            .collect();
+
+        for child in controls {
             let child = child.upcast::<Node>();
 
             match child.type_id() {
                 NodeTypeId::Element(ElementTypeId::HTMLElement(
                     HTMLElementTypeId::HTMLInputElement,
                 )) => {
-                    child.downcast::<HTMLInputElement>().unwrap().reset();
+                    child.downcast::<HTMLInputElement>().unwrap().reset(can_gc);
                 },
                 NodeTypeId::Element(ElementTypeId::HTMLElement(
                     HTMLElementTypeId::HTMLSelectElement,
@@ -1306,17 +1317,17 @@ impl HTMLFormElement {
         self.marked_for_reset.set(false);
     }
 
-    fn add_control<T: ?Sized + FormControl>(&self, control: &T) {
+    fn add_control<T: ?Sized + FormControl>(&self, control: &T, can_gc: CanGc) {
         {
             let root = self.upcast::<Element>().root_element();
             let root = root.upcast::<Node>();
             let mut controls = self.controls.borrow_mut();
             controls.insert_pre_order(control.to_element(), root);
         }
-        self.update_validity();
+        self.update_validity(can_gc);
     }
 
-    fn remove_control<T: ?Sized + FormControl>(&self, control: &T) {
+    fn remove_control<T: ?Sized + FormControl>(&self, control: &T, can_gc: CanGc) {
         {
             let control = control.to_element();
             let mut controls = self.controls.borrow_mut();
@@ -1332,7 +1343,7 @@ impl HTMLFormElement {
             let mut past_names_map = self.past_names_map.borrow_mut();
             past_names_map.0.retain(|_k, v| v.0 != control);
         }
-        self.update_validity();
+        self.update_validity(can_gc);
     }
 }
 
@@ -1518,16 +1529,16 @@ pub(crate) trait FormControl: DomObject {
     // Part of step 12.
     // '..suppress the running of the reset the form owner algorithm
     // when the parser subsequently attempts to insert the element..'
-    fn set_form_owner_from_parser(&self, form: &HTMLFormElement) {
+    fn set_form_owner_from_parser(&self, form: &HTMLFormElement, can_gc: CanGc) {
         let elem = self.to_element();
         let node = elem.upcast::<Node>();
         node.set_flag(NodeFlags::PARSER_ASSOCIATED_FORM_OWNER, true);
-        form.add_control(self);
+        form.add_control(self, can_gc);
         self.set_form_owner(Some(form));
     }
 
     // https://html.spec.whatwg.org/multipage/#reset-the-form-owner
-    fn reset_form_owner(&self) {
+    fn reset_form_owner(&self, can_gc: CanGc) {
         let elem = self.to_element();
         let node = elem.upcast::<Node>();
         let old_owner = self.form_owner();
@@ -1558,10 +1569,10 @@ pub(crate) trait FormControl: DomObject {
 
         if old_owner != new_owner {
             if let Some(o) = old_owner {
-                o.remove_control(self);
+                o.remove_control(self, can_gc);
             }
             if let Some(ref new_owner) = new_owner {
-                new_owner.add_control(self);
+                new_owner.add_control(self, can_gc);
             }
             // https://html.spec.whatwg.org/multipage/#custom-element-reactions:reset-the-form-owner
             if let Some(html_elem) = elem.downcast::<HTMLElement>() {
@@ -1580,7 +1591,7 @@ pub(crate) trait FormControl: DomObject {
     }
 
     // https://html.spec.whatwg.org/multipage/#association-of-controls-and-forms
-    fn form_attribute_mutated(&self, mutation: AttributeMutation) {
+    fn form_attribute_mutated(&self, mutation: AttributeMutation, can_gc: CanGc) {
         match mutation {
             AttributeMutation::Set(_) => {
                 self.register_if_necessary();
@@ -1590,7 +1601,7 @@ pub(crate) trait FormControl: DomObject {
             },
         }
 
-        self.reset_form_owner();
+        self.reset_form_owner(can_gc);
     }
 
     // https://html.spec.whatwg.org/multipage/#association-of-controls-and-forms
@@ -1616,7 +1627,7 @@ pub(crate) trait FormControl: DomObject {
     }
 
     // https://html.spec.whatwg.org/multipage/#association-of-controls-and-forms
-    fn bind_form_control_to_tree(&self) {
+    fn bind_form_control_to_tree(&self, can_gc: CanGc) {
         let elem = self.to_element();
         let node = elem.upcast::<Node>();
 
@@ -1628,12 +1639,12 @@ pub(crate) trait FormControl: DomObject {
         node.set_flag(NodeFlags::PARSER_ASSOCIATED_FORM_OWNER, false);
 
         if !must_skip_reset {
-            self.form_attribute_mutated(AttributeMutation::Set(None));
+            self.form_attribute_mutated(AttributeMutation::Set(None), can_gc);
         }
     }
 
     // https://html.spec.whatwg.org/multipage/#association-of-controls-and-forms
-    fn unbind_form_control_from_tree(&self) {
+    fn unbind_form_control_from_tree(&self, can_gc: CanGc) {
         let elem = self.to_element();
         let has_form_attr = elem.has_attribute(&local_name!("form"));
         let same_subtree = self
@@ -1648,7 +1659,7 @@ pub(crate) trait FormControl: DomObject {
         // subtree) if it appears later in the tree order. Hence invoke
         // reset from here if this control has the form attribute set.
         if !same_subtree || (self.is_listed() && has_form_attr) {
-            self.reset_form_owner();
+            self.reset_form_owner(can_gc);
         }
     }
 
@@ -1698,8 +1709,8 @@ impl VirtualMethods for HTMLFormElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
-        self.super_type().unwrap().unbind_from_tree(context);
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
+        self.super_type().unwrap().unbind_from_tree(context, can_gc);
 
         // Collect the controls to reset because reset_form_owner
         // will mutably borrow self.controls
@@ -1716,7 +1727,7 @@ impl VirtualMethods for HTMLFormElement {
             control
                 .as_maybe_form_control()
                 .expect("Element must be a form control")
-                .reset_form_owner();
+                .reset_form_owner(can_gc);
         }
     }
 
@@ -1730,8 +1741,10 @@ impl VirtualMethods for HTMLFormElement {
         }
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
 
         match *attr.local_name() {
             local_name!("rel") | local_name!("rev") => {
@@ -1742,9 +1755,9 @@ impl VirtualMethods for HTMLFormElement {
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
 
         self.relations
diff --git a/components/script/dom/htmlheadelement.rs b/components/script/dom/htmlheadelement.rs
index bfd092c894f..7b2d715318f 100644
--- a/components/script/dom/htmlheadelement.rs
+++ b/components/script/dom/htmlheadelement.rs
@@ -4,13 +4,13 @@
 
 use content_security_policy::{CspList, PolicyDisposition, PolicySource};
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 
 use crate::dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::DomRoot;
-use crate::dom::document::{Document, determine_policy_for_token};
+use crate::dom::document::Document;
 use crate::dom::element::Element;
 use crate::dom::htmlelement::HTMLElement;
 use crate::dom::htmlmetaelement::HTMLMetaElement;
@@ -54,37 +54,6 @@ impl HTMLHeadElement {
         n
     }
 
-    /// <https://html.spec.whatwg.org/multipage/#meta-referrer>
-    pub(crate) fn set_document_referrer(&self) {
-        let doc = self.owner_document();
-
-        if doc.GetHead().as_deref() != Some(self) {
-            return;
-        }
-
-        let node = self.upcast::<Node>();
-        let candidates = node
-            .traverse_preorder(ShadowIncluding::No)
-            .filter_map(DomRoot::downcast::<Element>)
-            .filter(|elem| elem.is::<HTMLMetaElement>())
-            .filter(|elem| elem.get_name() == Some(atom!("referrer")))
-            .filter(|elem| {
-                elem.get_attribute(&ns!(), &local_name!("content"))
-                    .is_some()
-            });
-
-        for meta in candidates {
-            if let Some(ref content) = meta.get_attribute(&ns!(), &local_name!("content")) {
-                let content = content.value();
-                let content_val = content.trim();
-                if !content_val.is_empty() {
-                    doc.set_referrer_policy(determine_policy_for_token(content_val));
-                    return;
-                }
-            }
-        }
-    }
-
     /// <https://html.spec.whatwg.org/multipage/#attr-meta-http-equiv-content-security-policy>
     pub(crate) fn set_content_security_policy(&self) {
         let doc = self.owner_document();
@@ -132,9 +101,9 @@ impl VirtualMethods for HTMLHeadElement {
     fn super_type(&self) -> Option<&dyn VirtualMethods> {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
         load_script(self);
     }
diff --git a/components/script/dom/htmlhrelement.rs b/components/script/dom/htmlhrelement.rs
index 5754b2f3dd3..c88a0fcf184 100644
--- a/components/script/dom/htmlhrelement.rs
+++ b/components/script/dom/htmlhrelement.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use style::attr::{AttrValue, LengthOrPercentageOrAuto};
 use style::color::AbsoluteColor;
diff --git a/components/script/dom/htmlhyperlinkelementutils.rs b/components/script/dom/htmlhyperlinkelementutils.rs
index 52b16f796e5..699db4d62f4 100644
--- a/components/script/dom/htmlhyperlinkelementutils.rs
+++ b/components/script/dom/htmlhyperlinkelementutils.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use html5ever::{local_name, namespace_url, ns};
+use html5ever::{local_name, ns};
 use servo_url::ServoUrl;
 
 use crate::dom::bindings::cell::DomRefCell;
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index 2c0041124cf..18116eee8ae 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -6,17 +6,18 @@ use std::cell::Cell;
 
 use base::id::{BrowsingContextId, PipelineId, WebViewId};
 use bitflags::bitflags;
-use constellation_traits::WindowSizeData;
+use constellation_traits::IFrameSandboxState::{IFrameSandboxed, IFrameUnsandboxed};
+use constellation_traits::{
+    IFrameLoadInfo, IFrameLoadInfoWithData, JsEvalResult, LoadData, LoadOrigin,
+    NavigationHistoryBehavior, ScriptToConstellationMessage,
+};
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use embedder_traits::ViewportDetails;
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use net_traits::ReferrerPolicy;
 use profile_traits::ipc as ProfiledIpc;
-use script_traits::IFrameSandboxState::{IFrameSandboxed, IFrameUnsandboxed};
-use script_traits::{
-    IFrameLoadInfo, IFrameLoadInfoWithData, JsEvalResult, LoadData, LoadOrigin,
-    NavigationHistoryBehavior, NewLayoutInfo, ScriptMsg, UpdatePipelineIdReason,
-};
+use script_traits::{NewLayoutInfo, UpdatePipelineIdReason};
 use servo_url::ServoUrl;
 use style::attr::{AttrValue, LengthOrPercentageOrAuto};
 use stylo_atoms::Atom;
@@ -26,6 +27,8 @@ use crate::dom::attr::Attr;
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::HTMLIFrameElementBinding::HTMLIFrameElementMethods;
 use crate::dom::bindings::codegen::Bindings::WindowBinding::Window_Binding::WindowMethods;
+use crate::dom::bindings::codegen::UnionTypes::TrustedHTMLOrString;
+use crate::dom::bindings::error::Fallible;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::reflector::DomGlobal;
 use crate::dom::bindings::root::{DomRoot, LayoutDom, MutNullableDom};
@@ -39,6 +42,7 @@ use crate::dom::eventtarget::EventTarget;
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::htmlelement::HTMLElement;
 use crate::dom::node::{Node, NodeDamage, NodeTraits, UnbindContext};
+use crate::dom::trustedhtml::TrustedHTML;
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::dom::windowproxy::WindowProxy;
 use crate::script_runtime::CanGc;
@@ -161,8 +165,13 @@ impl HTMLIFrameElement {
         if load_data.url.scheme() == "javascript" {
             let window_proxy = self.GetContentWindow();
             if let Some(window_proxy) = window_proxy {
+                if document
+                    .global()
+                    .should_navigation_request_be_blocked(&load_data)
+                {
+                    return;
+                }
                 // Important re security. See https://github.com/servo/servo/issues/23373
-                // TODO: check according to https://w3c.github.io/webappsec-csp/#should-block-navigation-request
                 if ScriptThread::check_load_origin(&load_data.load_origin, &document.url().origin())
                 {
                     ScriptThread::eval_js_url(&window_proxy.global(), &mut load_data, can_gc);
@@ -196,12 +205,12 @@ impl HTMLIFrameElement {
             history_handling,
         };
 
-        let window_size = WindowSizeData {
-            initial_viewport: window
-                .get_iframe_size_if_known(browsing_context_id, can_gc)
-                .unwrap_or_default(),
-            device_pixel_ratio: window.device_pixel_ratio(),
-        };
+        let viewport_details = window
+            .get_iframe_viewport_details_if_known(browsing_context_id, can_gc)
+            .unwrap_or_else(|| ViewportDetails {
+                hidpi_scale_factor: window.device_pixel_ratio(),
+                ..Default::default()
+            });
 
         match pipeline_type {
             PipelineType::InitialAboutBlank => {
@@ -212,12 +221,12 @@ impl HTMLIFrameElement {
                     load_data: load_data.clone(),
                     old_pipeline_id,
                     sandbox: sandboxed,
-                    window_size,
+                    viewport_details,
                 };
                 window
                     .as_global_scope()
                     .script_to_constellation_chan()
-                    .send(ScriptMsg::ScriptNewIFrame(load_info))
+                    .send(ScriptToConstellationMessage::ScriptNewIFrame(load_info))
                     .unwrap();
 
                 let new_layout_info = NewLayoutInfo {
@@ -227,7 +236,7 @@ impl HTMLIFrameElement {
                     webview_id,
                     opener: None,
                     load_data,
-                    window_size,
+                    viewport_details,
                 };
 
                 self.pipeline_id.set(Some(new_pipeline_id));
@@ -239,12 +248,14 @@ impl HTMLIFrameElement {
                     load_data,
                     old_pipeline_id,
                     sandbox: sandboxed,
-                    window_size,
+                    viewport_details,
                 };
                 window
                     .as_global_scope()
                     .script_to_constellation_chan()
-                    .send(ScriptMsg::ScriptLoadedURLInIFrame(load_info))
+                    .send(ScriptToConstellationMessage::ScriptLoadedURLInIFrame(
+                        load_info,
+                    ))
                     .unwrap();
             },
         }
@@ -269,7 +280,9 @@ impl HTMLIFrameElement {
                 document.get_referrer_policy(),
                 Some(window.as_global_scope().is_secure_context()),
                 Some(document.insecure_requests_policy()),
+                document.has_trustworthy_ancestor_or_current_origin(),
             );
+            load_data.policy_container = Some(window.as_global_scope().policy_container());
             let element = self.upcast::<Element>();
             load_data.srcdoc = String::from(element.get_string_attribute(&local_name!("srcdoc")));
             self.navigate_or_reload_child_browsing_context(
@@ -352,7 +365,7 @@ impl HTMLIFrameElement {
             None
         };
 
-        let load_data = LoadData::new(
+        let mut load_data = LoadData::new(
             LoadOrigin::Script(document.origin().immutable().clone()),
             url,
             creator_pipeline_id,
@@ -360,6 +373,7 @@ impl HTMLIFrameElement {
             referrer_policy,
             Some(window.as_global_scope().is_secure_context()),
             Some(document.insecure_requests_policy()),
+            document.has_trustworthy_ancestor_or_current_origin(),
         );
 
         let pipeline_id = self.pipeline_id();
@@ -368,6 +382,10 @@ impl HTMLIFrameElement {
         let is_about_blank =
             pipeline_id.is_some() && pipeline_id == self.about_blank_pipeline_id.get();
 
+        if is_about_blank {
+            load_data.policy_container = Some(window.as_global_scope().policy_container());
+        }
+
         let history_handling = if is_about_blank {
             NavigationHistoryBehavior::Replace
         } else {
@@ -397,7 +415,7 @@ impl HTMLIFrameElement {
         let document = self.owner_document();
         let window = self.owner_window();
         let pipeline_id = Some(window.pipeline_id());
-        let load_data = LoadData::new(
+        let mut load_data = LoadData::new(
             LoadOrigin::Script(document.origin().immutable().clone()),
             url,
             pipeline_id,
@@ -405,7 +423,9 @@ impl HTMLIFrameElement {
             document.get_referrer_policy(),
             Some(window.as_global_scope().is_secure_context()),
             Some(document.insecure_requests_policy()),
+            document.has_trustworthy_ancestor_or_current_origin(),
         );
+        load_data.policy_container = Some(window.as_global_scope().policy_container());
         let browsing_context_id = BrowsingContextId::new();
         let webview_id = window.window_proxy().webview_id();
         self.pipeline_id.set(None);
@@ -578,13 +598,32 @@ impl HTMLIFrameElementMethods<crate::DomTypeHolder> for HTMLIFrameElement {
     make_url_setter!(SetSrc, "src");
 
     // https://html.spec.whatwg.org/multipage/#dom-iframe-srcdoc
-    make_getter!(Srcdoc, "srcdoc");
+    fn Srcdoc(&self) -> TrustedHTMLOrString {
+        let element = self.upcast::<Element>();
+        element.get_trusted_html_attribute(&local_name!("srcdoc"))
+    }
 
     // https://html.spec.whatwg.org/multipage/#dom-iframe-srcdoc
-    make_setter!(SetSrcdoc, "srcdoc");
+    fn SetSrcdoc(&self, value: TrustedHTMLOrString, can_gc: CanGc) -> Fallible<()> {
+        // Step 1: Let compliantString be the result of invoking the
+        // Get Trusted Type compliant string algorithm with TrustedHTML,
+        // this's relevant global object, the given value, "HTMLIFrameElement srcdoc", and "script".
+        let element = self.upcast::<Element>();
+        let local_name = &local_name!("srcdoc");
+        let value = TrustedHTML::get_trusted_script_compliant_string(
+            &element.owner_global(),
+            value,
+            "HTMLIFrameElement",
+            local_name,
+            can_gc,
+        )?;
+        // Step 2: Set an attribute value given this, srcdoc's local name, and compliantString.
+        element.set_attribute(local_name, AttrValue::String(value), can_gc);
+        Ok(())
+    }
 
     // https://html.spec.whatwg.org/multipage/#dom-iframe-sandbox
-    fn Sandbox(&self) -> DomRoot<DOMTokenList> {
+    fn Sandbox(&self, can_gc: CanGc) -> DomRoot<DOMTokenList> {
         self.sandbox.or_init(|| {
             DOMTokenList::new(
                 self.upcast::<Element>(),
@@ -597,7 +636,7 @@ impl HTMLIFrameElementMethods<crate::DomTypeHolder> for HTMLIFrameElement {
                     Atom::from("allow-scripts"),
                     Atom::from("allow-top-navigation"),
                 ]),
-                CanGc::note(),
+                can_gc,
             )
         })
     }
@@ -676,8 +715,10 @@ impl VirtualMethods for HTMLIFrameElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         match *attr.local_name() {
             local_name!("sandbox") => {
                 self.sandbox_allowance
@@ -710,7 +751,7 @@ impl VirtualMethods for HTMLIFrameElement {
                 // trigger the processing of iframe attributes whenever "srcdoc" attribute is set, changed or removed
                 if self.upcast::<Node>().is_connected_with_browsing_context() {
                     debug!("iframe srcdoc modified while in browsing context.");
-                    self.process_the_iframe_attributes(ProcessingMode::NotFirstTime, CanGc::note());
+                    self.process_the_iframe_attributes(ProcessingMode::NotFirstTime, can_gc);
                 }
             },
             local_name!("src") => {
@@ -724,7 +765,7 @@ impl VirtualMethods for HTMLIFrameElement {
                 // the child browsing context to be created.
                 if self.upcast::<Node>().is_connected_with_browsing_context() {
                     debug!("iframe src set while in browsing context.");
-                    self.process_the_iframe_attributes(ProcessingMode::NotFirstTime, CanGc::note());
+                    self.process_the_iframe_attributes(ProcessingMode::NotFirstTime, can_gc);
                 }
             },
             _ => {},
@@ -761,8 +802,8 @@ impl VirtualMethods for HTMLIFrameElement {
         }
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
-        self.super_type().unwrap().unbind_from_tree(context);
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
+        self.super_type().unwrap().unbind_from_tree(context, can_gc);
 
         let blocker = &self.load_blocker;
         LoadBlocker::terminate(blocker, CanGc::note());
@@ -780,7 +821,7 @@ impl VirtualMethods for HTMLIFrameElement {
         };
         debug!("Unbinding frame {}.", browsing_context_id);
 
-        let msg = ScriptMsg::RemoveIFrame(browsing_context_id, sender);
+        let msg = ScriptToConstellationMessage::RemoveIFrame(browsing_context_id, sender);
         window
             .as_global_scope()
             .script_to_constellation_chan()
diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs
index 382b3e439cd..a79c7f6e463 100644
--- a/components/script/dom/htmlimageelement.rs
+++ b/components/script/dom/htmlimageelement.rs
@@ -10,10 +10,11 @@ use std::sync::Arc;
 use std::{char, mem};
 
 use app_units::{AU_PER_PX, Au};
+use content_security_policy as csp;
 use cssparser::{Parser, ParserInput};
 use dom_struct::dom_struct;
 use euclid::Point2D;
-use html5ever::{LocalName, Prefix, QualName, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, QualName, local_name, ns};
 use js::jsapi::JSAutoRealm;
 use js::rust::HandleObject;
 use mime::{self, Mime};
@@ -96,6 +97,7 @@ enum ParseState {
     AfterDescriptor,
 }
 
+#[derive(MallocSizeOf)]
 pub(crate) struct SourceSet {
     image_sources: Vec<ImageSource>,
     source_size: SourceSizeList,
@@ -110,13 +112,13 @@ impl SourceSet {
     }
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, MallocSizeOf, PartialEq)]
 pub struct ImageSource {
     pub url: String,
     pub descriptor: Descriptor,
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, MallocSizeOf, PartialEq)]
 pub struct Descriptor {
     pub width: Option<u32>,
     pub density: Option<f64>,
@@ -144,7 +146,7 @@ struct ImageRequest {
     parsed_url: Option<ServoUrl>,
     source_url: Option<USVString>,
     blocker: DomRefCell<Option<LoadBlocker>>,
-    #[ignore_malloc_size_of = "Arc"]
+    #[conditional_malloc_size_of]
     #[no_trace]
     image: Option<Arc<Image>>,
     #[no_trace]
@@ -161,7 +163,6 @@ pub(crate) struct HTMLImageElement {
     pending_request: DomRefCell<ImageRequest>,
     form_owner: MutNullableDom<HTMLFormElement>,
     generation: Cell<u32>,
-    #[ignore_malloc_size_of = "SourceSet"]
     source_set: DomRefCell<SourceSet>,
     last_selected_source: DomRefCell<Option<USVString>>,
     #[ignore_malloc_size_of = "promises are hard"]
@@ -294,6 +295,11 @@ impl FetchResponseListener for ImageContext {
     fn submit_resource_timing(&mut self) {
         network_listener::submit_timing(self, CanGc::note())
     }
+
+    fn process_csp_violations(&mut self, _request_id: RequestId, violations: Vec<csp::Violation>) {
+        let global = &self.resource_timing_global();
+        global.report_csp_violations(violations, None);
+    }
 }
 
 impl ResourceTimingListener for ImageContext {
@@ -416,14 +422,17 @@ impl HTMLImageElement {
 
         // https://html.spec.whatwg.org/multipage/#update-the-image-data steps 17-20
         // This function is also used to prefetch an image in `script::dom::servoparser::prefetch`.
+        let global = document.global();
         let mut request = create_a_potential_cors_request(
             Some(window.webview_id()),
             img_url.clone(),
             Destination::Image,
             cors_setting_for_element(self.upcast()),
             None,
-            document.global().get_referrer(),
+            global.get_referrer(),
             document.insecure_requests_policy(),
+            document.has_trustworthy_ancestor_or_current_origin(),
+            global.policy_container(),
         )
         .origin(document.origin().immutable().clone())
         .pipeline_id(Some(document.global().pipeline_id()))
@@ -808,8 +817,8 @@ impl HTMLImageElement {
         let device_pixel_ratio = self
             .owner_document()
             .window()
-            .window_size()
-            .device_pixel_ratio
+            .viewport_details()
+            .hidpi_scale_factor
             .get() as f64;
         for (index, image_source) in img_sources.iter().enumerate() {
             let current_den = image_source.descriptor.density.unwrap();
@@ -1743,20 +1752,22 @@ impl VirtualMethods for HTMLImageElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn adopting_steps(&self, old_doc: &Document) {
-        self.super_type().unwrap().adopting_steps(old_doc);
-        self.update_the_image_data(CanGc::note());
+    fn adopting_steps(&self, old_doc: &Document, can_gc: CanGc) {
+        self.super_type().unwrap().adopting_steps(old_doc, can_gc);
+        self.update_the_image_data(can_gc);
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         match attr.local_name() {
             &local_name!("src") |
             &local_name!("srcset") |
             &local_name!("width") |
             &local_name!("crossorigin") |
             &local_name!("sizes") |
-            &local_name!("referrerpolicy") => self.update_the_image_data(CanGc::note()),
+            &local_name!("referrerpolicy") => self.update_the_image_data(can_gc),
             _ => {},
         }
     }
@@ -1774,7 +1785,7 @@ impl VirtualMethods for HTMLImageElement {
         }
     }
 
-    fn handle_event(&self, event: &Event) {
+    fn handle_event(&self, event: &Event, can_gc: CanGc) {
         if event.type_() != atom!("click") {
             return;
         }
@@ -1795,9 +1806,7 @@ impl VirtualMethods for HTMLImageElement {
             mouse_event.ClientX().to_f32().unwrap(),
             mouse_event.ClientY().to_f32().unwrap(),
         );
-        let bcr = self
-            .upcast::<Element>()
-            .GetBoundingClientRect(CanGc::note());
+        let bcr = self.upcast::<Element>().GetBoundingClientRect(can_gc);
         let bcr_p = Point2D::new(bcr.X() as f32, bcr.Y() as f32);
 
         // Walk HTMLAreaElements
@@ -1808,15 +1817,15 @@ impl VirtualMethods for HTMLImageElement {
                 None => return,
             };
             if shp.hit_test(&point) {
-                element.activation_behavior(event, self.upcast(), CanGc::note());
+                element.activation_behavior(event, self.upcast(), can_gc);
                 return;
             }
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
         let document = self.owner_document();
         if context.tree_connected {
@@ -1827,20 +1836,20 @@ impl VirtualMethods for HTMLImageElement {
         // https://html.spec.whatwg.org/multipage/#relevant-mutations
         if let Some(parent) = self.upcast::<Node>().GetParentElement() {
             if parent.is::<HTMLPictureElement>() {
-                self.update_the_image_data(CanGc::note());
+                self.update_the_image_data(can_gc);
             }
         }
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
-        self.super_type().unwrap().unbind_from_tree(context);
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
+        self.super_type().unwrap().unbind_from_tree(context, can_gc);
         let document = self.owner_document();
         document.unregister_responsive_image(self);
 
         // The element is removed from a picture parent element
         // https://html.spec.whatwg.org/multipage/#relevant-mutations
         if context.parent.is::<HTMLPictureElement>() {
-            self.update_the_image_data(CanGc::note());
+            self.update_the_image_data(can_gc);
         }
     }
 }
diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
index e647f19a47d..aff8168b8fe 100644
--- a/components/script/dom/htmlinputelement.rs
+++ b/components/script/dom/htmlinputelement.rs
@@ -14,10 +14,10 @@ use std::{f64, ptr};
 use dom_struct::dom_struct;
 use embedder_traits::{FilterPattern, InputMethodType};
 use encoding_rs::Encoding;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::jsapi::{
     ClippedTime, DateGetMsecSinceEpoch, Handle, JS_ClearPendingException, JSObject, NewDateObject,
-    NewUCRegExpObject, ObjectIsDate, RegExpFlag_Unicode, RegExpFlags,
+    NewUCRegExpObject, ObjectIsDate, RegExpFlag_UnicodeSets, RegExpFlags,
 };
 use js::jsval::UndefinedValue;
 use js::rust::wrappers::{CheckRegExpSyntax, ExecuteRegExpNoStatics, ObjectIsRegExp};
@@ -810,9 +810,21 @@ impl HTMLInputElement {
             InputType::Checkbox => self.Required() && !self.Checked(),
             // https://html.spec.whatwg.org/multipage/#radio-button-state-(type%3Dradio)%3Asuffering-from-being-missing
             InputType::Radio => {
+                if self.radio_group_name().is_none() {
+                    return false;
+                }
                 let mut is_required = self.Required();
                 let mut is_checked = self.Checked();
-                for other in radio_group_iter(self, self.radio_group_name().as_ref()) {
+                let root = self
+                    .upcast::<Node>()
+                    .GetRootNode(&GetRootNodeOptions::empty());
+                let form = self.form_owner();
+                for other in radio_group_iter(
+                    self,
+                    self.radio_group_name().as_ref(),
+                    form.as_deref(),
+                    &root,
+                ) {
                     is_required = is_required || other.Required();
                     is_checked = is_checked || other.Checked();
                 }
@@ -1245,6 +1257,7 @@ impl HTMLInputElementMethods<crate::DomTypeHolder> for HTMLInputElement {
     // https://html.spec.whatwg.org/multipage/#dom-input-checked
     fn SetChecked(&self, checked: bool) {
         self.update_checked_state(checked, true);
+        update_related_validity_states(self, CanGc::note())
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-input-readonly
@@ -1336,8 +1349,7 @@ impl HTMLInputElementMethods<crate::DomTypeHolder> for HTMLInputElement {
             },
         }
 
-        self.validity_state()
-            .perform_validation_and_update(ValidationFlags::all());
+        update_related_validity_states(self, can_gc);
         self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
         Ok(())
     }
@@ -1555,7 +1567,7 @@ impl HTMLInputElementMethods<crate::DomTypeHolder> for HTMLInputElement {
     // https://html.spec.whatwg.org/multipage/#dom-lfe-labels
     // Different from make_labels_getter because this one
     // conditionally returns null.
-    fn GetLabels(&self) -> Option<DomRoot<NodeList>> {
+    fn GetLabels(&self, can_gc: CanGc) -> Option<DomRoot<NodeList>> {
         if self.input_type() == InputType::Hidden {
             None
         } else {
@@ -1563,7 +1575,7 @@ impl HTMLInputElementMethods<crate::DomTypeHolder> for HTMLInputElement {
                 NodeList::new_labels_list(
                     self.upcast::<Node>().owner_doc().window(),
                     self.upcast::<HTMLElement>(),
-                    CanGc::note(),
+                    can_gc,
                 )
             }))
         }
@@ -1681,26 +1693,49 @@ impl HTMLInputElementMethods<crate::DomTypeHolder> for HTMLInputElement {
 fn radio_group_iter<'a>(
     elem: &'a HTMLInputElement,
     group: Option<&'a Atom>,
+    form: Option<&'a HTMLFormElement>,
+    root: &'a Node,
 ) -> impl Iterator<Item = DomRoot<HTMLInputElement>> + 'a {
-    let owner = elem.form_owner();
-    let root = elem
-        .upcast::<Node>()
-        .GetRootNode(&GetRootNodeOptions::empty());
-
-    // If group is None, in_same_group always fails, but we need to always return elem.
     root.traverse_preorder(ShadowIncluding::No)
         .filter_map(DomRoot::downcast::<HTMLInputElement>)
-        .filter(move |r| &**r == elem || in_same_group(r, owner.as_deref(), group, None))
+        .filter(move |r| &**r == elem || in_same_group(r, form, group, Some(root)))
 }
 
 fn broadcast_radio_checked(broadcaster: &HTMLInputElement, group: Option<&Atom>) {
-    for r in radio_group_iter(broadcaster, group) {
+    let root = broadcaster
+        .upcast::<Node>()
+        .GetRootNode(&GetRootNodeOptions::empty());
+    let form = broadcaster.form_owner();
+    for r in radio_group_iter(broadcaster, group, form.as_deref(), &root) {
         if broadcaster != &*r && r.Checked() {
             r.SetChecked(false);
         }
     }
 }
 
+fn perform_radio_group_validation(elem: &HTMLInputElement, group: Option<&Atom>, can_gc: CanGc) {
+    let root = elem
+        .upcast::<Node>()
+        .GetRootNode(&GetRootNodeOptions::empty());
+    let form = elem.form_owner();
+    for r in radio_group_iter(elem, group, form.as_deref(), &root) {
+        r.validity_state()
+            .perform_validation_and_update(ValidationFlags::all(), can_gc);
+    }
+}
+
+fn update_related_validity_states(elem: &HTMLInputElement, can_gc: CanGc) {
+    match elem.input_type() {
+        InputType::Radio => {
+            perform_radio_group_validation(elem, elem.radio_group_name().as_ref(), can_gc)
+        },
+        _ => {
+            elem.validity_state()
+                .perform_validation_and_update(ValidationFlags::all(), can_gc);
+        },
+    }
+}
+
 // https://html.spec.whatwg.org/multipage/#radio-button-group
 fn in_same_group(
     other: &HTMLInputElement,
@@ -1865,11 +1900,12 @@ impl HTMLInputElement {
     }
 
     // https://html.spec.whatwg.org/multipage/#the-input-element:concept-form-reset-control
-    pub(crate) fn reset(&self) {
+    pub(crate) fn reset(&self, can_gc: CanGc) {
         match self.input_type() {
             InputType::Radio | InputType::Checkbox => {
                 self.update_checked_state(self.DefaultChecked(), false);
                 self.checked_changed.set(false);
+                update_related_validity_states(self, can_gc);
             },
             InputType::Image => (),
             _ => (),
@@ -2146,7 +2182,7 @@ impl HTMLInputElement {
                     // but we can get here from synthetic keydown events
                     button
                         .upcast::<Node>()
-                        .fire_synthetic_mouse_event_not_trusted(DOMString::from("click"), can_gc);
+                        .fire_synthetic_pointer_event_not_trusted(DOMString::from("click"), can_gc);
                 }
             },
             None => {
@@ -2319,8 +2355,10 @@ impl VirtualMethods for HTMLInputElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         match *attr.local_name() {
             local_name!("disabled") => {
                 let disabled_state = match mutation {
@@ -2341,7 +2379,7 @@ impl VirtualMethods for HTMLInputElement {
                     el.set_read_write_state(read_write);
                 }
 
-                el.update_sequentially_focusable_status(CanGc::note());
+                el.update_sequentially_focusable_status(can_gc);
             },
             local_name!("checked") if !self.checked_changed.get() => {
                 let checked_state = match mutation {
@@ -2379,7 +2417,7 @@ impl VirtualMethods for HTMLInputElement {
 
                         if new_type == InputType::File {
                             let window = self.owner_window();
-                            let filelist = FileList::new(&window, vec![], CanGc::note());
+                            let filelist = FileList::new(&window, vec![], can_gc);
                             self.filelist.set(Some(&filelist));
                         }
 
@@ -2388,7 +2426,7 @@ impl VirtualMethods for HTMLInputElement {
                             // Step 1
                             (&ValueMode::Value, false, ValueMode::Default) |
                             (&ValueMode::Value, false, ValueMode::DefaultOn) => {
-                                self.SetValue(old_idl_value, CanGc::note())
+                                self.SetValue(old_idl_value, can_gc)
                                     .expect("Failed to set input value on type change to a default ValueMode.");
                             },
 
@@ -2400,7 +2438,7 @@ impl VirtualMethods for HTMLInputElement {
                                         .map_or(DOMString::from(""), |a| {
                                             DOMString::from(a.summarize().value)
                                         }),
-                                    CanGc::note(),
+                                    can_gc,
                                 )
                                 .expect(
                                     "Failed to set input value on type change to ValueMode::Value.",
@@ -2412,7 +2450,7 @@ impl VirtualMethods for HTMLInputElement {
                             (_, _, ValueMode::Filename)
                                 if old_value_mode != ValueMode::Filename =>
                             {
-                                self.SetValue(DOMString::from(""), CanGc::note())
+                                self.SetValue(DOMString::from(""), can_gc)
                                     .expect("Failed to set input value on type change to ValueMode::Filename.");
                             },
                             _ => {},
@@ -2510,13 +2548,12 @@ impl VirtualMethods for HTMLInputElement {
                 }
             },
             local_name!("form") => {
-                self.form_attribute_mutated(mutation);
+                self.form_attribute_mutated(mutation, can_gc);
             },
             _ => {},
         }
 
-        self.validity_state()
-            .perform_validation_and_update(ValidationFlags::all());
+        update_related_validity_states(self, can_gc);
     }
 
     fn parse_plain_attribute(&self, name: &LocalName, value: DOMString) -> AttrValue {
@@ -2537,21 +2574,23 @@ impl VirtualMethods for HTMLInputElement {
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
         self.upcast::<Element>()
             .check_ancestors_disabled_state_for_form_control();
 
-        for r in radio_group_iter(self, self.radio_group_name().as_ref()) {
-            r.validity_state()
-                .perform_validation_and_update(ValidationFlags::all());
+        if self.input_type() == InputType::Radio {
+            self.radio_group_updated(self.radio_group_name().as_ref());
         }
+        update_related_validity_states(self, can_gc);
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
-        self.super_type().unwrap().unbind_from_tree(context);
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
+        let form_owner = self.form_owner();
+
+        self.super_type().unwrap().unbind_from_tree(context, can_gc);
 
         let node = self.upcast::<Node>();
         let el = self.upcast::<Element>();
@@ -2564,8 +2603,21 @@ impl VirtualMethods for HTMLInputElement {
             el.check_disabled_attribute();
         }
 
+        if self.input_type() == InputType::Radio {
+            let root = context.parent.GetRootNode(&GetRootNodeOptions::empty());
+            for r in radio_group_iter(
+                self,
+                self.radio_group_name().as_ref(),
+                form_owner.as_deref(),
+                &root,
+            ) {
+                r.validity_state()
+                    .perform_validation_and_update(ValidationFlags::all(), can_gc);
+            }
+        }
+
         self.validity_state()
-            .perform_validation_and_update(ValidationFlags::all());
+            .perform_validation_and_update(ValidationFlags::all(), can_gc);
     }
 
     // This represents behavior for which the UIEvents spec and the
@@ -2573,9 +2625,9 @@ impl VirtualMethods for HTMLInputElement {
     // Compare:
     // https://w3c.github.io/uievents/#default-action
     // https://dom.spec.whatwg.org/#action-versus-occurance
-    fn handle_event(&self, event: &Event) {
+    fn handle_event(&self, event: &Event, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.handle_event(event);
+            s.handle_event(event, can_gc);
         }
 
         if event.type_() == atom!("click") && !event.DefaultPrevented() {
@@ -2594,17 +2646,20 @@ impl VirtualMethods for HTMLInputElement {
                     // now.
                     if let Some(point_in_target) = mouse_event.point_in_target() {
                         let window = self.owner_window();
-                        let index = window.text_index_query(
-                            self.upcast::<Node>(),
-                            point_in_target,
-                            CanGc::note(),
-                        );
-                        if let Some(i) = index {
-                            self.textinput.borrow_mut().set_edit_point_index(i);
-                            // trigger redraw
-                            self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
-                            event.PreventDefault();
-                        }
+                        let index =
+                            window.text_index_query(self.upcast::<Node>(), point_in_target, can_gc);
+                        // Position the caret at the click position or at the end of the current
+                        // value.
+                        let edit_point_index = match index {
+                            Some(i) => i,
+                            None => self.textinput.borrow().char_count(),
+                        };
+                        self.textinput
+                            .borrow_mut()
+                            .set_edit_point_index(edit_point_index);
+                        // trigger redraw
+                        self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
+                        event.PreventDefault();
                     }
                 }
             }
@@ -2618,7 +2673,7 @@ impl VirtualMethods for HTMLInputElement {
                 let action = self.textinput.borrow_mut().handle_keydown(keyevent);
                 match action {
                     TriggerDefaultAction => {
-                        self.implicit_submission(CanGc::note());
+                        self.implicit_submission(can_gc);
                     },
                     DispatchInput => {
                         self.value_dirty.set(true);
@@ -2671,12 +2726,11 @@ impl VirtualMethods for HTMLInputElement {
             }
         } else if let Some(clipboard_event) = event.downcast::<ClipboardEvent>() {
             if !event.DefaultPrevented() {
-                handle_text_clipboard_action(self, &self.textinput, clipboard_event, CanGc::note());
+                handle_text_clipboard_action(self, &self.textinput, clipboard_event, can_gc);
             }
         }
 
-        self.validity_state()
-            .perform_validation_and_update(ValidationFlags::all());
+        update_related_validity_states(self, can_gc);
     }
 
     // https://html.spec.whatwg.org/multipage/#the-input-element%3Aconcept-node-clone-ext
@@ -2685,9 +2739,10 @@ impl VirtualMethods for HTMLInputElement {
         copy: &Node,
         maybe_doc: Option<&Document>,
         clone_children: CloneChildrenFlag,
+        can_gc: CanGc,
     ) {
         if let Some(s) = self.super_type() {
-            s.cloning_steps(copy, maybe_doc, clone_children);
+            s.cloning_steps(copy, maybe_doc, clone_children, can_gc);
         }
         let elem = copy.downcast::<HTMLInputElement>().unwrap();
         elem.value_dirty.set(self.value_dirty.get());
@@ -2697,8 +2752,7 @@ impl VirtualMethods for HTMLInputElement {
         elem.textinput
             .borrow_mut()
             .set_content(self.textinput.borrow().get_content());
-        elem.validity_state()
-            .perform_validation_and_update(ValidationFlags::all());
+        update_related_validity_states(self, can_gc);
     }
 }
 
@@ -2743,7 +2797,11 @@ impl Validatable for HTMLInputElement {
         }
     }
 
-    fn perform_validation(&self, validate_flags: ValidationFlags) -> ValidationFlags {
+    fn perform_validation(
+        &self,
+        validate_flags: ValidationFlags,
+        _can_gc: CanGc,
+    ) -> ValidationFlags {
         let mut failed_flags = ValidationFlags::empty();
         let value = self.Value();
 
@@ -2809,40 +2867,58 @@ impl Activatable for HTMLInputElement {
     }
 
     // https://dom.spec.whatwg.org/#eventtarget-legacy-pre-activation-behavior
-    fn legacy_pre_activation_behavior(&self) -> Option<InputActivationState> {
+    fn legacy_pre_activation_behavior(&self, can_gc: CanGc) -> Option<InputActivationState> {
         let ty = self.input_type();
-        match ty {
+        let activation_state = match ty {
             InputType::Checkbox => {
                 let was_checked = self.Checked();
                 let was_indeterminate = self.Indeterminate();
                 self.SetIndeterminate(false);
                 self.SetChecked(!was_checked);
-                return Some(InputActivationState {
+                Some(InputActivationState {
                     checked: was_checked,
                     indeterminate: was_indeterminate,
                     checked_radio: None,
                     old_type: InputType::Checkbox,
-                });
+                })
             },
             InputType::Radio => {
-                let checked_member =
-                    radio_group_iter(self, self.radio_group_name().as_ref()).find(|r| r.Checked());
+                let root = self
+                    .upcast::<Node>()
+                    .GetRootNode(&GetRootNodeOptions::empty());
+                let form_owner = self.form_owner();
+                let checked_member = radio_group_iter(
+                    self,
+                    self.radio_group_name().as_ref(),
+                    form_owner.as_deref(),
+                    &root,
+                )
+                .find(|r| r.Checked());
                 let was_checked = self.Checked();
                 self.SetChecked(true);
-                return Some(InputActivationState {
+                Some(InputActivationState {
                     checked: was_checked,
                     indeterminate: false,
                     checked_radio: checked_member.as_deref().map(DomRoot::from_ref),
                     old_type: InputType::Radio,
-                });
+                })
             },
-            _ => (),
+            _ => None,
+        };
+
+        if activation_state.is_some() {
+            update_related_validity_states(self, can_gc);
         }
-        None
+
+        activation_state
     }
 
     // https://dom.spec.whatwg.org/#eventtarget-legacy-canceled-activation-behavior
-    fn legacy_canceled_activation_behavior(&self, cache: Option<InputActivationState>) {
+    fn legacy_canceled_activation_behavior(
+        &self,
+        cache: Option<InputActivationState>,
+        can_gc: CanGc,
+    ) {
         // Step 1
         let ty = self.input_type();
         let cache = match cache {
@@ -2889,6 +2965,8 @@ impl Activatable for HTMLInputElement {
             },
             _ => (),
         }
+
+        update_related_validity_states(self, can_gc);
     }
 
     /// <https://html.spec.whatwg.org/multipage/#input-activation-behavior>
@@ -2911,7 +2989,7 @@ impl Activatable for HTMLInputElement {
                     form_owner.submit(
                         SubmittedFrom::NotFromForm,
                         FormSubmitterElement::Input(self),
-                        CanGc::note(),
+                        can_gc,
                     )
                 }
             },
@@ -2991,7 +3069,10 @@ fn compile_pattern(cx: SafeJSContext, pattern_str: &str, out_regex: MutableHandl
     if check_js_regex_syntax(cx, pattern_str) {
         // ...and if it does make pattern that matches only the entirety of string
         let pattern_str = format!("^(?:{})$", pattern_str);
-        new_js_regex(cx, &pattern_str, out_regex)
+        let flags = RegExpFlags {
+            flags_: RegExpFlag_UnicodeSets,
+        };
+        new_js_regex(cx, &pattern_str, flags, out_regex)
     } else {
         false
     }
@@ -3010,7 +3091,7 @@ fn check_js_regex_syntax(cx: SafeJSContext, pattern: &str) -> bool {
             pattern.as_ptr(),
             pattern.len(),
             RegExpFlags {
-                flags_: RegExpFlag_Unicode,
+                flags_: RegExpFlag_UnicodeSets,
             },
             exception.handle_mut(),
         );
@@ -3026,17 +3107,22 @@ fn check_js_regex_syntax(cx: SafeJSContext, pattern: &str) -> bool {
     }
 }
 
+// TODO: This is also used in the URLPattern implementation. Consider moving it into mozjs or some other
+// shared module
 #[allow(unsafe_code)]
-fn new_js_regex(cx: SafeJSContext, pattern: &str, mut out_regex: MutableHandleObject) -> bool {
+pub(crate) fn new_js_regex(
+    cx: SafeJSContext,
+    pattern: &str,
+    flags: RegExpFlags,
+    mut out_regex: MutableHandleObject,
+) -> bool {
     let pattern: Vec<u16> = pattern.encode_utf16().collect();
     unsafe {
         out_regex.set(NewUCRegExpObject(
             *cx,
             pattern.as_ptr(),
             pattern.len(),
-            RegExpFlags {
-                flags_: RegExpFlag_Unicode,
-            },
+            flags,
         ));
         if out_regex.is_null() {
             JS_ClearPendingException(*cx);
diff --git a/components/script/dom/htmllabelelement.rs b/components/script/dom/htmllabelelement.rs
index e9865ea274d..9733c3b7c6e 100644
--- a/components/script/dom/htmllabelelement.rs
+++ b/components/script/dom/htmllabelelement.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use style::attr::AttrValue;
 
@@ -157,10 +157,12 @@ impl VirtualMethods for HTMLLabelElement {
         }
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         if *attr.local_name() == local_name!("form") {
-            self.form_attribute_mutated(mutation);
+            self.form_attribute_mutated(mutation, can_gc);
         }
     }
 }
diff --git a/components/script/dom/htmllegendelement.rs b/components/script/dom/htmllegendelement.rs
index 62ce3efebe4..35e983a9512 100644
--- a/components/script/dom/htmllegendelement.rs
+++ b/components/script/dom/htmllegendelement.rs
@@ -61,17 +61,17 @@ impl VirtualMethods for HTMLLegendElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
 
         self.upcast::<Element>()
             .check_ancestors_disabled_state_for_form_control();
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
-        self.super_type().unwrap().unbind_from_tree(context);
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
+        self.super_type().unwrap().unbind_from_tree(context, can_gc);
 
         let node = self.upcast::<Node>();
         let el = self.upcast::<Element>();
diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs
index af5bcd5f6d9..f4e7683cf2a 100644
--- a/components/script/dom/htmllinkelement.rs
+++ b/components/script/dom/htmllinkelement.rs
@@ -7,10 +7,10 @@ use std::cell::Cell;
 use std::default::Default;
 
 use base::id::WebViewId;
-use cssparser::{Parser as CssParser, ParserInput};
+use content_security_policy as csp;
 use dom_struct::dom_struct;
 use embedder_traits::EmbedderMsg;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use net_traits::policy_container::PolicyContainer;
 use net_traits::request::{
@@ -24,17 +24,13 @@ use net_traits::{
 use servo_arc::Arc;
 use servo_url::ServoUrl;
 use style::attr::AttrValue;
-use style::media_queries::MediaList;
-use style::parser::ParserContext as CssParserContext;
-use style::stylesheets::{CssRuleType, Origin, Stylesheet, UrlExtraData};
-use style_traits::ParsingMode;
+use style::stylesheets::Stylesheet;
 use stylo_atoms::Atom;
 
 use crate::dom::attr::Attr;
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::DOMTokenListBinding::DOMTokenList_Binding::DOMTokenListMethods;
 use crate::dom::bindings::codegen::Bindings::HTMLLinkElementBinding::HTMLLinkElementMethods;
-use crate::dom::bindings::codegen::GenericBindings::HTMLElementBinding::HTMLElement_Binding::HTMLElementMethods;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::refcounted::Trusted;
 use crate::dom::bindings::reflector::DomGlobal;
@@ -49,6 +45,7 @@ use crate::dom::element::{
     set_cross_origin_attribute,
 };
 use crate::dom::htmlelement::HTMLElement;
+use crate::dom::medialist::MediaList;
 use crate::dom::node::{BindContext, Node, NodeTraits, UnbindContext};
 use crate::dom::performanceresourcetiming::InitiatorType;
 use crate::dom::stylesheet::StyleSheet as DOMStyleSheet;
@@ -82,6 +79,7 @@ struct LinkProcessingOptions {
     source_set: Option<()>,
     base_url: ServoUrl,
     insecure_requests_policy: InsecureRequestsPolicy,
+    has_trustworthy_ancestor_origin: bool,
     // Some fields that we don't need yet are missing
 }
 
@@ -99,7 +97,7 @@ pub(crate) struct HTMLLinkElement {
     #[no_trace]
     relations: Cell<LinkRelations>,
 
-    #[ignore_malloc_size_of = "Arc"]
+    #[conditional_malloc_size_of]
     #[no_trace]
     stylesheet: DomRefCell<Option<Arc<Stylesheet>>>,
     cssom_stylesheet: MutNullableDom<CSSStyleSheet>,
@@ -113,6 +111,8 @@ pub(crate) struct HTMLLinkElement {
     any_failed_load: Cell<bool>,
     /// A monotonically increasing counter that keeps track of which stylesheet to apply.
     request_generation_id: Cell<RequestGenerationId>,
+    /// <https://html.spec.whatwg.org/multipage/#explicitly-enabled>
+    is_explicitly_enabled: Cell<bool>,
 }
 
 impl HTMLLinkElement {
@@ -132,6 +132,7 @@ impl HTMLLinkElement {
             pending_loads: Cell::new(0),
             any_failed_load: Cell::new(false),
             request_generation_id: Cell::new(RequestGenerationId(0)),
+            is_explicitly_enabled: Cell::new(false),
         }
     }
 
@@ -175,17 +176,18 @@ impl HTMLLinkElement {
         self.stylesheet.borrow().clone()
     }
 
-    pub(crate) fn get_cssom_stylesheet(&self) -> Option<DomRoot<CSSStyleSheet>> {
+    pub(crate) fn get_cssom_stylesheet(&self, can_gc: CanGc) -> Option<DomRoot<CSSStyleSheet>> {
         self.get_stylesheet().map(|sheet| {
             self.cssom_stylesheet.or_init(|| {
                 CSSStyleSheet::new(
                     &self.owner_window(),
-                    self.upcast::<Element>(),
+                    Some(self.upcast::<Element>()),
                     "text/css".into(),
                     None, // todo handle location
                     None, // todo handle title
                     sheet,
-                    CanGc::note(),
+                    false, // is_constructed
+                    can_gc,
                 )
             })
         })
@@ -195,6 +197,12 @@ impl HTMLLinkElement {
         self.relations.get().contains(LinkRelations::ALTERNATE)
     }
 
+    pub(crate) fn is_effectively_disabled(&self) -> bool {
+        (self.is_alternate() && !self.is_explicitly_enabled.get()) ||
+            self.upcast::<Element>()
+                .has_attribute(&local_name!("disabled"))
+    }
+
     fn clean_stylesheet_ownership(&self) {
         if let Some(cssom_stylesheet) = self.cssom_stylesheet.get() {
             cssom_stylesheet.set_owner(None);
@@ -216,13 +224,22 @@ impl VirtualMethods for HTMLLinkElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
-        if !self.upcast::<Node>().is_connected() || mutation.is_removal() {
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
+
+        let local_name = attr.local_name();
+        let is_removal = mutation.is_removal();
+        if *local_name == local_name!("disabled") {
+            self.handle_disabled_attribute_change(!is_removal);
             return;
         }
 
-        match *attr.local_name() {
+        if !self.upcast::<Node>().is_connected() || is_removal {
+            return;
+        }
+        match *local_name {
             local_name!("rel") | local_name!("rev") => {
                 self.relations
                     .set(LinkRelations::for_element(self.upcast()));
@@ -265,9 +282,9 @@ impl VirtualMethods for HTMLLinkElement {
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
 
         self.relations
@@ -294,9 +311,9 @@ impl VirtualMethods for HTMLLinkElement {
         }
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.unbind_from_tree(context);
+            s.unbind_from_tree(context, can_gc);
         }
 
         if let Some(s) = self.stylesheet.borrow_mut().take() {
@@ -326,13 +343,14 @@ impl HTMLLinkElement {
             destination: Some(destination),
             integrity: String::new(),
             link_type: String::new(),
-            cryptographic_nonce_metadata: self.upcast::<HTMLElement>().Nonce().into(),
+            cryptographic_nonce_metadata: self.upcast::<Element>().nonce_value(),
             cross_origin: cors_setting_for_element(element),
             referrer_policy: referrer_policy_for_element(element),
             policy_container: document.policy_container().to_owned(),
             source_set: None, // FIXME
             base_url: document.borrow().base_url(),
             insecure_requests_policy: document.insecure_requests_policy(),
+            has_trustworthy_ancestor_origin: document.has_trustworthy_ancestor_or_current_origin(),
         };
 
         // Step 3. If el has an href attribute, then set options's href to the value of el's href attribute.
@@ -428,24 +446,7 @@ impl HTMLLinkElement {
             None => "",
         };
 
-        let mut input = ParserInput::new(mq_str);
-        let mut css_parser = CssParser::new(&mut input);
-        let document_url_data = &UrlExtraData(document.url().get_arc());
-        let window = document.window();
-        // FIXME(emilio): This looks somewhat fishy, since we use the context
-        // only to parse the media query list, CssRuleType::Media doesn't make
-        // much sense.
-        let context = CssParserContext::new(
-            Origin::Author,
-            document_url_data,
-            Some(CssRuleType::Media),
-            ParsingMode::DEFAULT,
-            document.quirks_mode(),
-            /* namespaces = */ Default::default(),
-            window.css_error_reporter(),
-            None,
-        );
-        let media = MediaList::parse(&context, &mut css_parser);
+        let media = MediaList::parse_media_list(mq_str, document.window());
 
         let im_attribute = element.get_attribute(&ns!(), &local_name!("integrity"));
         let integrity_val = im_attribute.as_ref().map(|a| a.value());
@@ -468,6 +469,18 @@ impl HTMLLinkElement {
         );
     }
 
+    /// <https://html.spec.whatwg.org/multipage/#attr-link-disabled>
+    fn handle_disabled_attribute_change(&self, disabled: bool) {
+        if !disabled {
+            self.is_explicitly_enabled.set(true);
+        }
+        if let Some(stylesheet) = self.get_stylesheet() {
+            if stylesheet.set_disabled(disabled) {
+                self.stylesheet_list_owner().invalidate_stylesheets();
+            }
+        }
+    }
+
     fn handle_favicon_url(&self, href: &str, _sizes: &Option<String>) {
         let document = self.owner_document();
         match document.base_url().join(href) {
@@ -509,7 +522,7 @@ impl StylesheetOwner for HTMLLinkElement {
     }
 
     fn referrer_policy(&self) -> ReferrerPolicy {
-        if self.RelList().Contains("noreferrer".into()) {
+        if self.RelList(CanGc::note()).Contains("noreferrer".into()) {
             return ReferrerPolicy::NoReferrer;
         }
 
@@ -517,7 +530,7 @@ impl StylesheetOwner for HTMLLinkElement {
     }
 
     fn set_origin_clean(&self, origin_clean: bool) {
-        if let Some(stylesheet) = self.get_cssom_stylesheet() {
+        if let Some(stylesheet) = self.get_cssom_stylesheet(CanGc::note()) {
             stylesheet.set_origin_clean(origin_clean);
         }
     }
@@ -563,8 +576,14 @@ impl HTMLLinkElementMethods<crate::DomTypeHolder> for HTMLLinkElement {
     // https://html.spec.whatwg.org/multipage/#dom-link-type
     make_setter!(SetType, "type");
 
+    // https://html.spec.whatwg.org/multipage/#dom-link-disabled
+    make_bool_getter!(Disabled, "disabled");
+
+    // https://html.spec.whatwg.org/multipage/#dom-link-disabled
+    make_bool_setter!(SetDisabled, "disabled");
+
     // https://html.spec.whatwg.org/multipage/#dom-link-rellist
-    fn RelList(&self) -> DomRoot<DOMTokenList> {
+    fn RelList(&self, can_gc: CanGc) -> DomRoot<DOMTokenList> {
         self.rel_list.or_init(|| {
             DOMTokenList::new(
                 self.upcast(),
@@ -586,7 +605,7 @@ impl HTMLLinkElementMethods<crate::DomTypeHolder> for HTMLLinkElement {
                     Atom::from("prerender"),
                     Atom::from("stylesheet"),
                 ]),
-                CanGc::note(),
+                can_gc,
             )
         })
     }
@@ -628,8 +647,8 @@ impl HTMLLinkElementMethods<crate::DomTypeHolder> for HTMLLinkElement {
     make_setter!(SetReferrerPolicy, "referrerpolicy");
 
     // https://drafts.csswg.org/cssom/#dom-linkstyle-sheet
-    fn GetSheet(&self) -> Option<DomRoot<DOMStyleSheet>> {
-        self.get_cssom_stylesheet().map(DomRoot::upcast)
+    fn GetSheet(&self, can_gc: CanGc) -> Option<DomRoot<DOMStyleSheet>> {
+        self.get_cssom_stylesheet(can_gc).map(DomRoot::upcast)
     }
 }
 
@@ -667,9 +686,10 @@ impl LinkProcessingOptions {
             None,
             Referrer::NoReferrer,
             self.insecure_requests_policy,
+            self.has_trustworthy_ancestor_origin,
+            self.policy_container,
         )
         .integrity_metadata(self.integrity)
-        .policy_container(self.policy_container)
         .cryptographic_nonce_metadata(self.cryptographic_nonce_metadata)
         .referrer_policy(self.referrer_policy);
 
@@ -749,6 +769,11 @@ impl FetchResponseListener for PrefetchContext {
     fn submit_resource_timing(&mut self) {
         submit_timing(self, CanGc::note())
     }
+
+    fn process_csp_violations(&mut self, _request_id: RequestId, violations: Vec<csp::Violation>) {
+        let global = &self.resource_timing_global();
+        global.report_csp_violations(violations, None);
+    }
 }
 
 impl ResourceTimingListener for PrefetchContext {
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index 49de8a3cc68..391da272ef3 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -9,12 +9,13 @@ use std::sync::{Arc, Mutex};
 use std::time::{Duration, Instant};
 use std::{f64, mem};
 
+use compositing_traits::{CrossProcessCompositorApi, ImageUpdate, SerializableImageData};
+use content_security_policy as csp;
 use dom_struct::dom_struct;
-use embedder_traits::resources::{self, Resource as EmbedderResource};
 use embedder_traits::{MediaPositionState, MediaSessionEvent, MediaSessionPlaybackState};
 use euclid::default::Size2D;
 use headers::{ContentLength, ContentRange, HeaderMapExt};
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use http::StatusCode;
 use http::header::{self, HeaderMap, HeaderValue};
 use ipc_channel::ipc::{self, IpcSharedMemory, channel};
@@ -27,6 +28,10 @@ use net_traits::{
     ResourceTimingType,
 };
 use pixels::Image;
+use script_bindings::codegen::GenericBindings::TimeRangesBinding::TimeRangesMethods;
+use script_bindings::codegen::InheritTypes::{
+    ElementTypeId, HTMLElementTypeId, HTMLMediaElementTypeId, NodeTypeId,
+};
 use script_layout_interface::MediaFrame;
 use servo_config::pref;
 use servo_media::player::audio::AudioRenderer;
@@ -38,7 +43,6 @@ use webrender_api::{
     ExternalImageData, ExternalImageId, ExternalImageType, ImageBufferKind, ImageDescriptor,
     ImageDescriptorFlags, ImageFormat, ImageKey,
 };
-use webrender_traits::{CrossProcessCompositorApi, ImageUpdate, SerializableImageData};
 
 use crate::document_loader::{LoadBlocker, LoadType};
 use crate::dom::attr::Attr;
@@ -49,7 +53,6 @@ use crate::dom::bindings::codegen::Bindings::AttrBinding::AttrMethods;
 use crate::dom::bindings::codegen::Bindings::HTMLMediaElementBinding::{
     CanPlayTypeResult, HTMLMediaElementConstants, HTMLMediaElementMethods,
 };
-use crate::dom::bindings::codegen::Bindings::HTMLSourceElementBinding::HTMLSourceElementMethods;
 use crate::dom::bindings::codegen::Bindings::MediaErrorBinding::MediaErrorConstants::*;
 use crate::dom::bindings::codegen::Bindings::MediaErrorBinding::MediaErrorMethods;
 use crate::dom::bindings::codegen::Bindings::NavigatorBinding::Navigator_Binding::NavigatorMethods;
@@ -60,9 +63,6 @@ use crate::dom::bindings::codegen::Bindings::ShadowRootBinding::{
 use crate::dom::bindings::codegen::Bindings::TextTrackBinding::{TextTrackKind, TextTrackMode};
 use crate::dom::bindings::codegen::Bindings::URLBinding::URLMethods;
 use crate::dom::bindings::codegen::Bindings::WindowBinding::Window_Binding::WindowMethods;
-use crate::dom::bindings::codegen::InheritTypes::{
-    ElementTypeId, HTMLElementTypeId, HTMLMediaElementTypeId, NodeTypeId,
-};
 use crate::dom::bindings::codegen::UnionTypes::{
     MediaStreamOrBlob, VideoTrackOrAudioTrackOrTextTrack,
 };
@@ -109,6 +109,12 @@ use crate::realms::{InRealm, enter_realm};
 use crate::script_runtime::CanGc;
 use crate::script_thread::ScriptThread;
 
+/// A CSS file to style the media controls.
+static MEDIA_CONTROL_CSS: &str = include_str!("../resources/media-controls.css");
+
+/// A JS file to control the media controls.
+static MEDIA_CONTROL_JS: &str = include_str!("../resources/media-controls.js");
+
 #[derive(PartialEq)]
 enum FrameStatus {
     Locked,
@@ -836,15 +842,20 @@ impl HTMLMediaElement {
             Mode::Children(source) => {
                 // This is only a partial implementation
                 // FIXME: https://github.com/servo/servo/issues/21481
-                let src = source.Src();
+                let src = source
+                    .upcast::<Element>()
+                    .get_attribute(&ns!(), &local_name!("src"));
                 // Step 9.attr.2.
-                if src.is_empty() {
-                    source
-                        .upcast::<EventTarget>()
-                        .fire_event(atom!("error"), can_gc);
-                    self.queue_dedicated_media_source_failure_steps();
-                    return;
-                }
+                let src: String = match src {
+                    Some(src) if !src.Value().is_empty() => src.Value().into(),
+                    _ => {
+                        source
+                            .upcast::<EventTarget>()
+                            .fire_event(atom!("error"), can_gc);
+                        self.queue_dedicated_media_source_failure_steps();
+                        return;
+                    },
+                };
                 // Step 9.attr.3.
                 let url_record = match base_url.join(&src) {
                     Ok(url) => url,
@@ -856,6 +867,8 @@ impl HTMLMediaElement {
                         return;
                     },
                 };
+                // Step 9.attr.7
+                *self.current_src.borrow_mut() = url_record.as_str().into();
                 // Step 9.attr.8.
                 self.resource_fetch_algorithm(Resource::Url(url_record));
             },
@@ -886,14 +899,17 @@ impl HTMLMediaElement {
         };
 
         let cors_setting = cors_setting_for_element(self.upcast());
+        let global = self.global();
         let request = create_a_potential_cors_request(
             Some(document.webview_id()),
             url.clone(),
             destination,
             cors_setting,
             None,
-            self.global().get_referrer(),
+            global.get_referrer(),
             document.insecure_requests_policy(),
+            document.has_trustworthy_ancestor_or_current_origin(),
+            global.policy_container(),
         )
         .headers(headers)
         .origin(document.origin().immutable().clone())
@@ -1267,15 +1283,40 @@ impl HTMLMediaElement {
         let time = f64::max(time, 0.);
 
         // Step 8.
-        // XXX(ferjm) seekable attribute: we need to get the information about
-        //            what's been decoded and buffered so far from servo-media
-        //            and add the seekable attribute as a TimeRange.
-        if let Some(ref current_fetch_context) = *self.current_fetch_context.borrow() {
-            if !current_fetch_context.is_seekable() {
-                self.seeking.set(false);
-                return;
+        let seekable = self.Seekable();
+        if seekable.Length() == 0 {
+            self.seeking.set(false);
+            return;
+        }
+        let mut nearest_seekable_position = 0.0;
+        let mut in_seekable_range = false;
+        let mut nearest_seekable_distance = f64::MAX;
+        for i in 0..seekable.Length() {
+            let start = seekable.Start(i).unwrap().abs();
+            let end = seekable.End(i).unwrap().abs();
+            if time >= start && time <= end {
+                nearest_seekable_position = time;
+                in_seekable_range = true;
+                break;
+            } else if time < start {
+                let distance = start - time;
+                if distance < nearest_seekable_distance {
+                    nearest_seekable_distance = distance;
+                    nearest_seekable_position = start;
+                }
+            } else {
+                let distance = time - end;
+                if distance < nearest_seekable_distance {
+                    nearest_seekable_distance = distance;
+                    nearest_seekable_position = end;
+                }
             }
         }
+        let time = if in_seekable_range {
+            time
+        } else {
+            nearest_seekable_position
+        };
 
         // Step 9.
         // servo-media with gstreamer does not support inaccurate seeking for now.
@@ -1631,7 +1672,7 @@ impl HTMLMediaElement {
 
                         // Steps 7.
                         let event = TrackEvent::new(
-                            &self.global(),
+                            self.global().as_window(),
                             atom!("addtrack"),
                             false,
                             false,
@@ -1689,7 +1730,7 @@ impl HTMLMediaElement {
 
                         // Steps 7.
                         let event = TrackEvent::new(
-                            &self.global(),
+                            self.global().as_window(),
                             atom!("addtrack"),
                             false,
                             false,
@@ -1913,27 +1954,25 @@ impl HTMLMediaElement {
             ElementCreator::ScriptCreated,
             can_gc,
         );
-        let mut media_controls_script = resources::read_string(EmbedderResource::MediaControlsJS);
         // This is our hacky way to temporarily workaround the lack of a privileged
         // JS context.
         // The media controls UI accesses the document.servoGetMediaControls(id) API
         // to get an instance to the media controls ShadowRoot.
         // `id` needs to match the internally generated UUID assigned to a media element.
         let id = document.register_media_controls(&shadow_root);
-        let media_controls_script = media_controls_script.as_mut_str().replace("@@@id@@@", &id);
+        let media_controls_script = MEDIA_CONTROL_JS.replace("@@@id@@@", &id);
         *self.media_controls_id.borrow_mut() = Some(id);
         script
             .upcast::<Node>()
             .SetTextContent(Some(DOMString::from(media_controls_script)), can_gc);
         if let Err(e) = shadow_root
             .upcast::<Node>()
-            .AppendChild(script.upcast::<Node>())
+            .AppendChild(script.upcast::<Node>(), can_gc)
         {
             warn!("Could not render media controls {:?}", e);
             return;
         }
 
-        let media_controls_style = resources::read_string(EmbedderResource::MediaControlsCSS);
         let style = HTMLStyleElement::new(
             local_name!("script"),
             None,
@@ -1944,11 +1983,11 @@ impl HTMLMediaElement {
         );
         style
             .upcast::<Node>()
-            .SetTextContent(Some(DOMString::from(media_controls_style)), can_gc);
+            .SetTextContent(Some(DOMString::from(MEDIA_CONTROL_CSS)), can_gc);
 
         if let Err(e) = shadow_root
             .upcast::<Node>()
-            .AppendChild(style.upcast::<Node>())
+            .AppendChild(style.upcast::<Node>(), can_gc)
         {
             warn!("Could not render media controls {:?}", e);
         }
@@ -1956,9 +1995,9 @@ impl HTMLMediaElement {
         self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
     }
 
-    fn remove_controls(&self) {
+    fn remove_controls(&self, can_gc: CanGc) {
         if let Some(id) = self.media_controls_id.borrow_mut().take() {
-            self.owner_document().unregister_media_controls(&id);
+            self.owner_document().unregister_media_controls(&id, can_gc);
         }
     }
 
@@ -2392,6 +2431,19 @@ impl HTMLMediaElementMethods<crate::DomTypeHolder> for HTMLMediaElement {
         )
     }
 
+    // https://html.spec.whatwg.org/multipage/#dom-media-seekable
+    fn Seekable(&self) -> DomRoot<TimeRanges> {
+        let mut seekable = TimeRangesContainer::default();
+        if let Some(ref player) = *self.player.borrow() {
+            if let Ok(ranges) = player.lock().unwrap().seekable() {
+                for range in ranges {
+                    let _ = seekable.add(range.start, range.end);
+                }
+            }
+        }
+        TimeRanges::new(self.global().as_window(), seekable, CanGc::note())
+    }
+
     // https://html.spec.whatwg.org/multipage/#dom-media-buffered
     fn Buffered(&self) -> DomRoot<TimeRanges> {
         let mut buffered = TimeRangesContainer::default();
@@ -2486,8 +2538,10 @@ impl VirtualMethods for HTMLMediaElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
 
         match *attr.local_name() {
             local_name!("muted") => {
@@ -2502,9 +2556,9 @@ impl VirtualMethods for HTMLMediaElement {
             },
             local_name!("controls") => {
                 if mutation.new_value(attr).is_some() {
-                    self.render_controls(CanGc::note());
+                    self.render_controls(can_gc);
                 } else {
-                    self.remove_controls();
+                    self.remove_controls(can_gc);
                 }
             },
             _ => (),
@@ -2512,10 +2566,10 @@ impl VirtualMethods for HTMLMediaElement {
     }
 
     // https://html.spec.whatwg.org/multipage/#playing-the-media-resource:remove-an-element-from-a-document
-    fn unbind_from_tree(&self, context: &UnbindContext) {
-        self.super_type().unwrap().unbind_from_tree(context);
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
+        self.super_type().unwrap().unbind_from_tree(context, can_gc);
 
-        self.remove_controls();
+        self.remove_controls(can_gc);
 
         if context.tree_connected {
             let task = MediaElementMicrotask::PauseIfNotInDocument {
@@ -2894,6 +2948,11 @@ impl FetchResponseListener for HTMLMediaElementFetchListener {
     fn submit_resource_timing(&mut self) {
         network_listener::submit_timing(self, CanGc::note())
     }
+
+    fn process_csp_violations(&mut self, _request_id: RequestId, violations: Vec<csp::Violation>) {
+        let global = &self.resource_timing_global();
+        global.report_csp_violations(violations, None);
+    }
 }
 
 impl ResourceTimingListener for HTMLMediaElementFetchListener {
diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs
index 2b71e907f79..e94a5e1ff33 100644
--- a/components/script/dom/htmlmetaelement.rs
+++ b/components/script/dom/htmlmetaelement.rs
@@ -2,59 +2,30 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use std::str::FromStr;
-use std::sync::LazyLock;
-use std::time::Duration;
-
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
-use regex::bytes::Regex;
-use script_traits::NavigationHistoryBehavior;
-use servo_url::ServoUrl;
 use style::str::HTML_SPACE_CHARACTERS;
 
 use crate::dom::attr::Attr;
 use crate::dom::bindings::codegen::Bindings::HTMLMetaElementBinding::HTMLMetaElementMethods;
 use crate::dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
-use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
-use crate::dom::document::{DeclarativeRefresh, Document};
+use crate::dom::document::{Document, determine_policy_for_token};
 use crate::dom::element::{AttributeMutation, Element};
 use crate::dom::htmlelement::HTMLElement;
 use crate::dom::htmlheadelement::HTMLHeadElement;
-use crate::dom::location::NavigationType;
 use crate::dom::node::{BindContext, Node, NodeTraits, UnbindContext};
 use crate::dom::virtualmethods::VirtualMethods;
-use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
-use crate::timers::OneshotTimerCallback;
 
 #[dom_struct]
 pub(crate) struct HTMLMetaElement {
     htmlelement: HTMLElement,
 }
 
-#[derive(JSTraceable, MallocSizeOf)]
-pub(crate) struct RefreshRedirectDue {
-    #[no_trace]
-    pub(crate) url: ServoUrl,
-    #[ignore_malloc_size_of = "non-owning"]
-    pub(crate) window: DomRoot<Window>,
-}
-impl RefreshRedirectDue {
-    pub(crate) fn invoke(self, can_gc: CanGc) {
-        self.window.Location().navigate(
-            self.url.clone(),
-            NavigationHistoryBehavior::Replace,
-            NavigationType::DeclarativeRefresh,
-            can_gc,
-        );
-    }
-}
-
 impl HTMLMetaElement {
     fn new_inherited(
         local_name: LocalName,
@@ -115,9 +86,31 @@ impl HTMLMetaElement {
 
     /// <https://html.spec.whatwg.org/multipage/#meta-referrer>
     fn apply_referrer(&self) {
-        if let Some(parent) = self.upcast::<Node>().GetParentElement() {
-            if let Some(head) = parent.downcast::<HTMLHeadElement>() {
-                head.set_document_referrer();
+        let doc = self.owner_document();
+        // From spec: For historical reasons, unlike other standard metadata names, the processing model for referrer
+        // is not responsive to element removals, and does not use tree order. Only the most-recently-inserted or
+        // most-recently-modified meta element in this state has an effect.
+        // 1. If element is not in a document tree, then return.
+        let meta_node = self.upcast::<Node>();
+        if !meta_node.is_in_a_document_tree() {
+            return;
+        }
+
+        // 2. If element does not have a name attribute whose value is an ASCII case-insensitive match for "referrer",
+        // then return.
+        if self.upcast::<Element>().get_name() != Some(atom!("referrer")) {
+            return;
+        }
+
+        // 3. If element does not have a content attribute, or that attribute's value is the empty string, then return.
+        let content = self
+            .upcast::<Element>()
+            .get_attribute(&ns!(), &local_name!("content"));
+        if let Some(attr) = content {
+            let attr = attr.value();
+            let attr_val = attr.trim();
+            if !attr_val.is_empty() {
+                doc.set_referrer_policy(determine_policy_for_token(attr_val));
             }
         }
     }
@@ -133,92 +126,17 @@ impl HTMLMetaElement {
 
     /// <https://html.spec.whatwg.org/multipage/#shared-declarative-refresh-steps>
     fn declarative_refresh(&self) {
+        if !self.upcast::<Node>().is_in_a_document_tree() {
+            return;
+        }
+
         // 2
         let content = self.Content();
         // 1
         if !content.is_empty() {
             // 3
-            self.shared_declarative_refresh_steps(content);
-        }
-    }
-
-    /// <https://html.spec.whatwg.org/multipage/#shared-declarative-refresh-steps>
-    fn shared_declarative_refresh_steps(&self, content: DOMString) {
-        // 1
-        let document = self.owner_document();
-        if document.will_declaratively_refresh() {
-            return;
-        }
-
-        // 2-11
-        static REFRESH_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-            Regex::new(
-                r#"(?x)
-                ^
-                \s* # 3
-                ((?<time>\d+)\.?|\.) # 5-6
-                [0-9.]* # 8
-                (
-                    (;|,| ) # 10.1
-                    \s* # 10.2
-                    (;|,)? # 10.3
-                    \s* # 10.4
-                    (
-                        (U|u)(R|r)(L|l) # 11.2-11.4
-                        \s*=\s* # 11.5-11.7
-                        ('(?<url1>.*?)'?|"(?<url2>.*?)"?|(?<url3>[^'"].*)) # 11.8 - 11.10
-                        |
-                        (?<url4>.*)
-                    )?
-                )?
-                $
-            "#,
-            )
-            .unwrap()
-        });
-
-        let mut url_record = document.url();
-        let captures = if let Some(captures) = REFRESH_REGEX.captures(content.as_bytes()) {
-            captures
-        } else {
-            return;
-        };
-        let time = if let Some(time_string) = captures.name("time") {
-            u64::from_str(&String::from_utf8_lossy(time_string.as_bytes())).unwrap_or(0)
-        } else {
-            0
-        };
-        let captured_url = captures.name("url1").or(captures
-            .name("url2")
-            .or(captures.name("url3").or(captures.name("url4"))));
-
-        if let Some(url_match) = captured_url {
-            url_record = if let Ok(url) = ServoUrl::parse_with_base(
-                Some(&url_record),
-                &String::from_utf8_lossy(url_match.as_bytes()),
-            ) {
-                url
-            } else {
-                return;
-            }
-        }
-        // 12-13
-        if document.completely_loaded() {
-            // TODO: handle active sandboxing flag
-            let window = self.owner_window();
-            window.as_global_scope().schedule_callback(
-                OneshotTimerCallback::RefreshRedirectDue(RefreshRedirectDue {
-                    window: window.clone(),
-                    url: url_record,
-                }),
-                Duration::from_secs(time),
-            );
-            document.set_declarative_refresh(DeclarativeRefresh::CreatedAfterLoad);
-        } else {
-            document.set_declarative_refresh(DeclarativeRefresh::PendingLoad {
-                url: url_record,
-                time,
-            });
+            self.owner_document()
+                .shared_declarative_refresh_steps(content.as_bytes());
         }
     }
 }
@@ -252,9 +170,9 @@ impl VirtualMethods for HTMLMetaElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
 
         if context.tree_connected {
@@ -262,17 +180,17 @@ impl VirtualMethods for HTMLMetaElement {
         }
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.attribute_mutated(attr, mutation);
+            s.attribute_mutated(attr, mutation, can_gc);
         }
 
         self.process_referrer_attribute();
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.unbind_from_tree(context);
+            s.unbind_from_tree(context, can_gc);
         }
 
         if context.tree_connected {
diff --git a/components/script/dom/htmlmeterelement.rs b/components/script/dom/htmlmeterelement.rs
index 2a72972a5b3..24470d82de9 100644
--- a/components/script/dom/htmlmeterelement.rs
+++ b/components/script/dom/htmlmeterelement.rs
@@ -94,7 +94,7 @@ impl HTMLMeterElement {
 
         let meter_value = HTMLDivElement::new(local_name!("div"), None, &document, None, can_gc);
         root.upcast::<Node>()
-            .AppendChild(meter_value.upcast::<Node>())
+            .AppendChild(meter_value.upcast::<Node>(), can_gc)
             .unwrap();
 
         let _ = self.shadow_tree.borrow_mut().insert(ShadowTree {
@@ -331,8 +331,10 @@ impl VirtualMethods for HTMLMeterElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
 
         let is_important_attribute = matches!(
             attr.local_name(),
@@ -354,8 +356,8 @@ impl VirtualMethods for HTMLMeterElement {
         self.update_state(CanGc::note());
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
-        self.super_type().unwrap().bind_to_tree(context);
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
+        self.super_type().unwrap().bind_to_tree(context, can_gc);
 
         self.update_state(CanGc::note());
     }
diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs
index e50669a3ad9..276bddca986 100644
--- a/components/script/dom/htmlobjectelement.rs
+++ b/components/script/dom/htmlobjectelement.rs
@@ -5,7 +5,7 @@
 use std::default::Default;
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use pixels::Image;
 use servo_arc::Arc;
@@ -153,8 +153,10 @@ impl VirtualMethods for HTMLObjectElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         match *attr.local_name() {
             local_name!("data") => {
                 if let AttributeMutation::Set(_) = mutation {
@@ -162,7 +164,7 @@ impl VirtualMethods for HTMLObjectElement {
                 }
             },
             local_name!("form") => {
-                self.form_attribute_mutated(mutation);
+                self.form_attribute_mutated(mutation, can_gc);
             },
             _ => {},
         }
diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs
index 67abe7a49e4..f5256e71b70 100644
--- a/components/script/dom/htmloptgroupelement.rs
+++ b/components/script/dom/htmloptgroupelement.rs
@@ -64,11 +64,11 @@ impl HTMLOptGroupElement {
         )
     }
 
-    fn update_select_validity(&self) {
+    fn update_select_validity(&self, can_gc: CanGc) {
         if let Some(select) = self.owner_select_element() {
             select
                 .validity_state()
-                .perform_validation_and_update(ValidationFlags::all());
+                .perform_validation_and_update(ValidationFlags::all(), can_gc);
         }
     }
 
@@ -98,8 +98,10 @@ impl VirtualMethods for HTMLOptGroupElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         if attr.local_name() == &local_name!("disabled") {
             let disabled_state = match mutation {
                 AttributeMutation::Set(None) => true,
@@ -132,21 +134,21 @@ impl VirtualMethods for HTMLOptGroupElement {
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
-        if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
+        if let Some(super_type) = self.super_type() {
+            super_type.bind_to_tree(context, can_gc);
         }
 
-        self.update_select_validity();
+        self.update_select_validity(can_gc);
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
-        self.super_type().unwrap().unbind_from_tree(context);
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
+        self.super_type().unwrap().unbind_from_tree(context, can_gc);
 
         if let Some(select) = context.parent.downcast::<HTMLSelectElement>() {
             select
                 .validity_state()
-                .perform_validation_and_update(ValidationFlags::all());
+                .perform_validation_and_update(ValidationFlags::all(), can_gc);
         }
     }
 }
diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs
index d6428532f00..800e88f0758 100644
--- a/components/script/dom/htmloptionelement.rs
+++ b/components/script/dom/htmloptionelement.rs
@@ -6,7 +6,7 @@ use std::cell::Cell;
 use std::convert::TryInto;
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, QualName, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, QualName, local_name, ns};
 use js::rust::HandleObject;
 use style::str::{split_html_space_chars, str_join};
 use stylo_dom::ElementState;
@@ -29,7 +29,7 @@ use crate::dom::htmlformelement::HTMLFormElement;
 use crate::dom::htmloptgroupelement::HTMLOptGroupElement;
 use crate::dom::htmlscriptelement::HTMLScriptElement;
 use crate::dom::htmlselectelement::HTMLSelectElement;
-use crate::dom::node::{BindContext, Node, ShadowIncluding, UnbindContext};
+use crate::dom::node::{BindContext, ChildrenMutation, Node, ShadowIncluding, UnbindContext};
 use crate::dom::text::Text;
 use crate::dom::validation::Validatable;
 use crate::dom::validitystate::ValidationFlags;
@@ -93,12 +93,7 @@ impl HTMLOptionElement {
     }
 
     fn pick_if_selected_and_reset(&self) {
-        if let Some(select) = self
-            .upcast::<Node>()
-            .ancestors()
-            .filter_map(DomRoot::downcast::<HTMLSelectElement>)
-            .next()
-        {
+        if let Some(select) = self.owner_select_element() {
             if self.Selected() {
                 select.pick_option(self);
             }
@@ -108,51 +103,53 @@ impl HTMLOptionElement {
 
     // https://html.spec.whatwg.org/multipage/#concept-option-index
     fn index(&self) -> i32 {
-        if let Some(parent) = self.upcast::<Node>().GetParentNode() {
-            if let Some(select_parent) = parent.downcast::<HTMLSelectElement>() {
-                // return index in parent select's list of options
-                return self.index_in_select(select_parent);
-            } else if parent.is::<HTMLOptGroupElement>() {
-                if let Some(grandparent) = parent.GetParentNode() {
-                    if let Some(select_grandparent) = grandparent.downcast::<HTMLSelectElement>() {
-                        // return index in grandparent select's list of options
-                        return self.index_in_select(select_grandparent);
-                    }
-                }
-            }
-        }
-        // "If the option element is not in a list of options,
-        // then the option element's index is zero."
-        // self is neither a child of a select, nor a grandchild of a select
-        // via an optgroup, so it is not in a list of options
-        0
+        let Some(owner_select) = self.owner_select_element() else {
+            return 0;
+        };
+
+        let Some(position) = owner_select.list_of_options().position(|n| &*n == self) else {
+            // An option should always be in it's owner's list of options, but it's not worth a browser panic
+            warn!("HTMLOptionElement called index_in_select at a select that did not contain it");
+            return 0;
+        };
+
+        position.try_into().unwrap_or(0)
     }
 
-    fn index_in_select(&self, select: &HTMLSelectElement) -> i32 {
-        match select.list_of_options().position(|n| &*n == self) {
-            Some(index) => index.try_into().unwrap_or(0),
-            None => {
-                // shouldn't happen but not worth a browser panic
-                warn!(
-                    "HTMLOptionElement called index_in_select at a select that did not contain it"
-                );
-                0
-            },
+    fn owner_select_element(&self) -> Option<DomRoot<HTMLSelectElement>> {
+        let parent = self.upcast::<Node>().GetParentNode()?;
+
+        if parent.is::<HTMLOptGroupElement>() {
+            DomRoot::downcast::<HTMLSelectElement>(parent.GetParentNode()?)
+        } else {
+            DomRoot::downcast::<HTMLSelectElement>(parent)
         }
     }
 
-    fn update_select_validity(&self) {
-        if let Some(select) = self
-            .upcast::<Node>()
-            .ancestors()
-            .filter_map(DomRoot::downcast::<HTMLSelectElement>)
-            .next()
-        {
+    fn update_select_validity(&self, can_gc: CanGc) {
+        if let Some(select) = self.owner_select_element() {
             select
                 .validity_state()
-                .perform_validation_and_update(ValidationFlags::all());
+                .perform_validation_and_update(ValidationFlags::all(), can_gc);
         }
     }
+
+    /// <https://html.spec.whatwg.org/multipage/#concept-option-label>
+    ///
+    /// Note that this is not equivalent to <https://html.spec.whatwg.org/multipage/#dom-option-label>.
+    pub(crate) fn displayed_label(&self) -> DOMString {
+        // > The label of an option element is the value of the label content attribute, if there is one
+        // > and its value is not the empty string, or, otherwise, the value of the element's text IDL attribute.
+        let label = self
+            .upcast::<Element>()
+            .get_string_attribute(&local_name!("label"));
+
+        if label.is_empty() {
+            return self.Text();
+        }
+
+        label
+    }
 }
 
 // FIXME(ajeffrey): Provide a way of buffering DOMStrings other than using Strings
@@ -175,7 +172,7 @@ fn collect_text(element: &Element, value: &mut String) {
 }
 
 impl HTMLOptionElementMethods<crate::DomTypeHolder> for HTMLOptionElement {
-    // https://html.spec.whatwg.org/multipage/#dom-option
+    /// <https://html.spec.whatwg.org/multipage/#dom-option>
     fn Option(
         window: &Window,
         proto: Option<HandleObject>,
@@ -207,7 +204,7 @@ impl HTMLOptionElementMethods<crate::DomTypeHolder> for HTMLOptionElement {
 
         option.SetDefaultSelected(default_selected);
         option.set_selectedness(selected);
-        option.update_select_validity();
+        option.update_select_validity(can_gc);
         Ok(option)
     }
 
@@ -217,19 +214,19 @@ impl HTMLOptionElementMethods<crate::DomTypeHolder> for HTMLOptionElement {
     // https://html.spec.whatwg.org/multipage/#dom-option-disabled
     make_bool_setter!(SetDisabled, "disabled");
 
-    // https://html.spec.whatwg.org/multipage/#dom-option-text
+    /// <https://html.spec.whatwg.org/multipage/#dom-option-text>
     fn Text(&self) -> DOMString {
         let mut content = String::new();
         collect_text(self.upcast(), &mut content);
         DOMString::from(str_join(split_html_space_chars(&content), " "))
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-option-text
+    /// <https://html.spec.whatwg.org/multipage/#dom-option-text>
     fn SetText(&self, value: DOMString, can_gc: CanGc) {
         self.upcast::<Node>().SetTextContent(Some(value), can_gc)
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-option-form
+    /// <https://html.spec.whatwg.org/multipage/#dom-option-form>
     fn GetForm(&self) -> Option<DomRoot<HTMLFormElement>> {
         let parent = self.upcast::<Node>().GetParentNode().and_then(|p| {
             if p.is::<HTMLOptGroupElement>() {
@@ -242,7 +239,7 @@ impl HTMLOptionElementMethods<crate::DomTypeHolder> for HTMLOptionElement {
         parent.and_then(|p| p.downcast::<HTMLSelectElement>().and_then(|s| s.GetForm()))
     }
 
-    // https://html.spec.whatwg.org/multipage/#attr-option-value
+    /// <https://html.spec.whatwg.org/multipage/#attr-option-value>
     fn Value(&self) -> DOMString {
         let element = self.upcast::<Element>();
         let attr = &local_name!("value");
@@ -256,7 +253,7 @@ impl HTMLOptionElementMethods<crate::DomTypeHolder> for HTMLOptionElement {
     // https://html.spec.whatwg.org/multipage/#attr-option-value
     make_setter!(SetValue, "value");
 
-    // https://html.spec.whatwg.org/multipage/#attr-option-label
+    /// <https://html.spec.whatwg.org/multipage/#attr-option-label>
     fn Label(&self) -> DOMString {
         let element = self.upcast::<Element>();
         let attr = &local_name!("label");
@@ -276,20 +273,20 @@ impl HTMLOptionElementMethods<crate::DomTypeHolder> for HTMLOptionElement {
     // https://html.spec.whatwg.org/multipage/#dom-option-defaultselected
     make_bool_setter!(SetDefaultSelected, "selected");
 
-    // https://html.spec.whatwg.org/multipage/#dom-option-selected
+    /// <https://html.spec.whatwg.org/multipage/#dom-option-selected>
     fn Selected(&self) -> bool {
         self.selectedness.get()
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-option-selected
+    /// <https://html.spec.whatwg.org/multipage/#dom-option-selected>
     fn SetSelected(&self, selected: bool) {
         self.dirtiness.set(true);
         self.selectedness.set(selected);
         self.pick_if_selected_and_reset();
-        self.update_select_validity();
+        self.update_select_validity(CanGc::note());
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-option-index
+    /// <https://html.spec.whatwg.org/multipage/#dom-option-index>
     fn Index(&self) -> i32 {
         self.index()
     }
@@ -300,8 +297,10 @@ impl VirtualMethods for HTMLOptionElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         match *attr.local_name() {
             local_name!("disabled") => {
                 let el = self.upcast::<Element>();
@@ -316,7 +315,7 @@ impl VirtualMethods for HTMLOptionElement {
                         el.check_parent_disabled_state_for_option();
                     },
                 }
-                self.update_select_validity();
+                self.update_select_validity(can_gc);
             },
             local_name!("selected") => {
                 match mutation {
@@ -333,26 +332,33 @@ impl VirtualMethods for HTMLOptionElement {
                         }
                     },
                 }
-                self.update_select_validity();
+                self.update_select_validity(can_gc);
+            },
+            local_name!("label") => {
+                // The label of the selected option is displayed inside the select element, so we need to repaint
+                // when it changes
+                if let Some(select_element) = self.owner_select_element() {
+                    select_element.update_shadow_tree(CanGc::note());
+                }
             },
             _ => {},
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
 
         self.upcast::<Element>()
             .check_parent_disabled_state_for_option();
 
         self.pick_if_selected_and_reset();
-        self.update_select_validity();
+        self.update_select_validity(can_gc);
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
-        self.super_type().unwrap().unbind_from_tree(context);
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
+        self.super_type().unwrap().unbind_from_tree(context, can_gc);
 
         if let Some(select) = context
             .parent
@@ -362,7 +368,7 @@ impl VirtualMethods for HTMLOptionElement {
         {
             select
                 .validity_state()
-                .perform_validation_and_update(ValidationFlags::all());
+                .perform_validation_and_update(ValidationFlags::all(), can_gc);
             select.ask_for_reset();
         }
 
@@ -374,4 +380,26 @@ impl VirtualMethods for HTMLOptionElement {
             el.check_disabled_attribute();
         }
     }
+
+    fn children_changed(&self, mutation: &ChildrenMutation) {
+        if let Some(super_type) = self.super_type() {
+            super_type.children_changed(mutation);
+        }
+
+        // Changing the descendants of a selected option can change it's displayed label
+        // if it does not have a label attribute
+        if !self
+            .upcast::<Element>()
+            .has_attribute(&local_name!("label"))
+        {
+            if let Some(owner_select) = self.owner_select_element() {
+                if owner_select
+                    .selected_option()
+                    .is_some_and(|selected_option| self == &*selected_option)
+                {
+                    owner_select.update_shadow_tree(CanGc::note());
+                }
+            }
+        }
+    }
 }
diff --git a/components/script/dom/htmloptionscollection.rs b/components/script/dom/htmloptionscollection.rs
index 8f1d95d43d4..c16d1656b06 100644
--- a/components/script/dom/htmloptionscollection.rs
+++ b/components/script/dom/htmloptionscollection.rs
@@ -64,7 +64,7 @@ impl HTMLOptionsCollection {
             let element =
                 HTMLOptionElement::new(local_name!("option"), None, &document, None, can_gc);
             let node = element.upcast::<Node>();
-            root.AppendChild(node)?;
+            root.AppendChild(node, can_gc)?;
         }
         Ok(())
     }
@@ -117,12 +117,12 @@ impl HTMLOptionsCollectionMethods<crate::DomTypeHolder> for HTMLOptionsCollectio
             let node = value.upcast::<Node>();
             let root = self.upcast().root_node();
             if n >= 0 {
-                Node::pre_insert(node, &root, None).map(|_| ())
+                Node::pre_insert(node, &root, None, can_gc).map(|_| ())
             } else {
                 let child = self.upcast().IndexedGetter(index).unwrap();
                 let child_node = child.upcast::<Node>();
 
-                root.ReplaceChild(node, child_node).map(|_| ())
+                root.ReplaceChild(node, child_node, can_gc).map(|_| ())
             }
         } else {
             // Step 1
@@ -220,13 +220,13 @@ impl HTMLOptionsCollectionMethods<crate::DomTypeHolder> for HTMLOptionsCollectio
         };
 
         // Step 6
-        Node::pre_insert(node, &parent, reference_node.as_deref()).map(|_| ())
+        Node::pre_insert(node, &parent, reference_node.as_deref(), CanGc::note()).map(|_| ())
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-htmloptionscollection-remove>
     fn Remove(&self, index: i32) {
         if let Some(element) = self.upcast().IndexedGetter(index as u32) {
-            element.Remove();
+            element.Remove(CanGc::note());
         }
     }
 
@@ -240,11 +240,11 @@ impl HTMLOptionsCollectionMethods<crate::DomTypeHolder> for HTMLOptionsCollectio
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-htmloptionscollection-selectedindex>
-    fn SetSelectedIndex(&self, index: i32) {
+    fn SetSelectedIndex(&self, index: i32, can_gc: CanGc) {
         self.upcast()
             .root_node()
             .downcast::<HTMLSelectElement>()
             .expect("HTMLOptionsCollection not rooted on a HTMLSelectElement")
-            .SetSelectedIndex(index)
+            .SetSelectedIndex(index, can_gc)
     }
 }
diff --git a/components/script/dom/htmloutputelement.rs b/components/script/dom/htmloutputelement.rs
index f26de72ba9c..9e702d1eb6e 100644
--- a/components/script/dom/htmloutputelement.rs
+++ b/components/script/dom/htmloutputelement.rs
@@ -159,10 +159,12 @@ impl VirtualMethods for HTMLOutputElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         if attr.local_name() == &local_name!("form") {
-            self.form_attribute_mutated(mutation);
+            self.form_attribute_mutated(mutation, can_gc);
         }
     }
 }
diff --git a/components/script/dom/htmlprogresselement.rs b/components/script/dom/htmlprogresselement.rs
index 1dfd1111ce6..25e4ff15c2b 100644
--- a/components/script/dom/htmlprogresselement.rs
+++ b/components/script/dom/htmlprogresselement.rs
@@ -96,7 +96,7 @@ impl HTMLProgressElement {
             .upcast::<Element>()
             .SetId("-servo-progress-bar".into(), can_gc);
         root.upcast::<Node>()
-            .AppendChild(progress_bar.upcast::<Node>())
+            .AppendChild(progress_bar.upcast::<Node>(), can_gc)
             .unwrap();
 
         let _ = self.shadow_tree.borrow_mut().insert(ShadowTree {
@@ -227,8 +227,10 @@ impl VirtualMethods for HTMLProgressElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
 
         let is_important_attribute = matches!(
             attr.local_name(),
@@ -239,8 +241,8 @@ impl VirtualMethods for HTMLProgressElement {
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
-        self.super_type().unwrap().bind_to_tree(context);
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
+        self.super_type().unwrap().bind_to_tree(context, can_gc);
 
         self.update_state(CanGc::note());
     }
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index 17c601d3706..d1b3cfd3467 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -13,6 +13,7 @@ use std::sync::{Arc, Mutex};
 
 use base::id::{PipelineId, WebViewId};
 use content_security_policy as csp;
+use devtools_traits::{ScriptToDevtoolsControlMsg, SourceInfo};
 use dom_struct::dom_struct;
 use encoding_rs::Encoding;
 use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
@@ -20,6 +21,7 @@ use ipc_channel::ipc;
 use js::jsval::UndefinedValue;
 use js::rust::{CompileOptionsWrapper, HandleObject, Stencil, transform_str_to_source_text};
 use net_traits::http_status::HttpStatus;
+use net_traits::policy_container::PolicyContainer;
 use net_traits::request::{
     CorsSettings, CredentialsMode, Destination, InsecureRequestsPolicy, ParserMetadata,
     RequestBuilder, RequestId,
@@ -30,6 +32,7 @@ use net_traits::{
 };
 use servo_config::pref;
 use servo_url::{ImmutableOrigin, ServoUrl};
+use style::attr::AttrValue;
 use style::str::{HTML_SPACE_CHARACTERS, StaticStringVec};
 use stylo_atoms::Atom;
 use uuid::Uuid;
@@ -42,6 +45,10 @@ use crate::dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
 use crate::dom::bindings::codegen::Bindings::HTMLScriptElementBinding::HTMLScriptElementMethods;
 use crate::dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
 use crate::dom::bindings::codegen::GenericBindings::HTMLElementBinding::HTMLElement_Binding::HTMLElementMethods;
+use crate::dom::bindings::codegen::UnionTypes::{
+    TrustedScriptOrString, TrustedScriptURLOrUSVString,
+};
+use crate::dom::bindings::error::Fallible;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::refcounted::Trusted;
 use crate::dom::bindings::reflector::DomGlobal;
@@ -60,6 +67,8 @@ use crate::dom::globalscope::GlobalScope;
 use crate::dom::htmlelement::HTMLElement;
 use crate::dom::node::{ChildrenMutation, CloneChildrenFlag, Node, NodeTraits};
 use crate::dom::performanceresourcetiming::InitiatorType;
+use crate::dom::trustedscript::TrustedScript;
+use crate::dom::trustedscripturl::TrustedScriptURL;
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::fetch::create_a_potential_cors_request;
 use crate::network_listener::{self, NetworkListener, PreInvoke, ResourceTimingListener};
@@ -272,19 +281,18 @@ pub(crate) enum ScriptType {
 pub(crate) struct CompiledSourceCode {
     #[ignore_malloc_size_of = "SM handles JS values"]
     pub(crate) source_code: Stencil,
-    #[ignore_malloc_size_of = "Rc is hard"]
+    #[conditional_malloc_size_of = "Rc is hard"]
     pub(crate) original_text: Rc<DOMString>,
 }
 
-#[derive(JSTraceable)]
+#[derive(JSTraceable, MallocSizeOf)]
 pub(crate) enum SourceCode {
-    Text(Rc<DOMString>),
+    Text(#[conditional_malloc_size_of] Rc<DOMString>),
     Compiled(CompiledSourceCode),
 }
 
 #[derive(JSTraceable, MallocSizeOf)]
 pub(crate) struct ScriptOrigin {
-    #[ignore_malloc_size_of = "Rc is hard"]
     code: SourceCode,
     #[no_trace]
     url: ServoUrl,
@@ -360,7 +368,7 @@ fn finish_fetching_a_classic_script(
         },
         ExternalScriptKind::Deferred => {
             document = elem.parser_document.as_rooted();
-            document.deferred_script_loaded(elem, load);
+            document.deferred_script_loaded(elem, load, can_gc);
         },
         ExternalScriptKind::ParsingBlocking => {
             document = elem.parser_document.as_rooted();
@@ -535,6 +543,12 @@ impl FetchResponseListener for ClassicContext {
     fn submit_resource_timing(&mut self) {
         network_listener::submit_timing(self, CanGc::note())
     }
+
+    fn process_csp_violations(&mut self, _request_id: RequestId, violations: Vec<csp::Violation>) {
+        let global = &self.resource_timing_global();
+        let elem = self.elem.root();
+        global.report_csp_violations(violations, Some(elem.upcast::<Element>()));
+    }
 }
 
 impl ResourceTimingListener for ClassicContext {
@@ -558,6 +572,7 @@ impl PreInvoke for ClassicContext {}
 
 /// Steps 1-2 of <https://html.spec.whatwg.org/multipage/#fetch-a-classic-script>
 // This function is also used to prefetch a script in `script::dom::servoparser::prefetch`.
+#[allow(clippy::too_many_arguments)]
 pub(crate) fn script_fetch_request(
     webview_id: WebViewId,
     url: ServoUrl,
@@ -566,6 +581,8 @@ pub(crate) fn script_fetch_request(
     pipeline_id: PipelineId,
     options: ScriptFetchOptions,
     insecure_requests_policy: InsecureRequestsPolicy,
+    has_trustworthy_ancestor_origin: bool,
+    policy_container: PolicyContainer,
 ) -> RequestBuilder {
     // We intentionally ignore options' credentials_mode member for classic scripts.
     // The mode is initialized by create_a_potential_cors_request.
@@ -577,6 +594,8 @@ pub(crate) fn script_fetch_request(
         None,
         options.referrer,
         insecure_requests_policy,
+        has_trustworthy_ancestor_origin,
+        policy_container,
     )
     .origin(origin)
     .pipeline_id(Some(pipeline_id))
@@ -597,14 +616,17 @@ fn fetch_a_classic_script(
 ) {
     // Step 1, 2.
     let doc = script.owner_document();
+    let global = script.global();
     let request = script_fetch_request(
         doc.webview_id(),
         url.clone(),
         cors_setting,
         doc.origin().immutable().clone(),
-        script.global().pipeline_id(),
+        global.pipeline_id(),
         options.clone(),
         doc.insecure_requests_policy(),
+        doc.has_trustworthy_ancestor_origin(),
+        global.policy_container(),
     );
     let request = doc.prepare_request(request);
 
@@ -650,7 +672,7 @@ impl HTMLScriptElement {
 
         // Step 5. Let source text be el's child text content.
         // Step 6. If el has no src attribute, and source text is the empty string, then return.
-        let text = self.Text();
+        let text = self.text();
         if text.is_empty() && !element.has_attribute(&local_name!("src")) {
             return;
         }
@@ -733,7 +755,10 @@ impl HTMLScriptElement {
             }
         }
 
-        // Step 21. Charset.
+        // Step 21. If el has a charset attribute, then let encoding be the result of getting
+        // an encoding from the value of the charset attribute.
+        // If el does not have a charset attribute, or if getting an encoding failed,
+        // then let encoding be el's node document's the encoding.
         let encoding = element
             .get_attribute(&ns!(), &local_name!("charset"))
             .and_then(|charset| Encoding::for_label(charset.value().as_bytes()))
@@ -755,9 +780,11 @@ impl HTMLScriptElement {
             ),
         };
 
-        // TODO: Step 24. Nonce.
+        // Step 24. Let cryptographic nonce be el's [[CryptographicNonce]] internal slot's value.
+        let cryptographic_nonce = self.upcast::<Element>().nonce_value();
 
-        // Step 25. Integrity metadata.
+        // Step 25. If el has an integrity attribute, then let integrity metadata be that attribute's value.
+        // Otherwise, let integrity metadata be the empty string.
         let im_attribute = element.get_attribute(&ns!(), &local_name!("integrity"));
         let integrity_val = im_attribute.as_ref().map(|a| a.value());
         let integrity_metadata = match integrity_val {
@@ -765,11 +792,13 @@ impl HTMLScriptElement {
             None => "",
         };
 
-        // TODO: Step 26. Referrer policy
+        // Step 26. Let referrer policy be the current state of el's referrerpolicy content attribute.
+        let referrer_policy = referrer_policy_for_element(self.upcast::<Element>());
 
         // TODO: Step 27. Fetch priority.
 
-        // Step 28. Parser metadata.
+        // Step 28. Let parser metadata be "parser-inserted" if el is parser-inserted,
+        // and "not-parser-inserted" otherwise.
         let parser_metadata = if self.parser_inserted.get() {
             ParserMetadata::ParserInserted
         } else {
@@ -778,11 +807,11 @@ impl HTMLScriptElement {
 
         // Step 29. Fetch options.
         let options = ScriptFetchOptions {
-            cryptographic_nonce: self.upcast::<HTMLElement>().Nonce().into(),
+            cryptographic_nonce,
             integrity_metadata: integrity_metadata.to_owned(),
             parser_metadata,
             referrer: self.global().get_referrer(),
-            referrer_policy: referrer_policy_for_element(self.upcast::<Element>()),
+            referrer_policy,
             credentials_mode: module_credentials_mode,
         };
 
@@ -984,6 +1013,19 @@ impl HTMLScriptElement {
             Ok(script) => script,
         };
 
+        if let Some(chan) = self.global().devtools_chan() {
+            let pipeline_id = self.global().pipeline_id();
+            let source_info = SourceInfo {
+                url: script.url.clone(),
+                external: script.external,
+                worker_id: None,
+            };
+            let _ = chan.send(ScriptToDevtoolsControlMsg::ScriptSourceLoaded(
+                pipeline_id,
+                source_info,
+            ));
+        }
+
         if script.type_ == ScriptType::Classic {
             unminify_js(&mut script);
             self.substitute_with_local_script(&mut script);
@@ -1235,6 +1277,15 @@ impl HTMLScriptElement {
         let event = Event::new(window.upcast(), type_, bubbles, cancelable, can_gc);
         event.fire(self.upcast(), can_gc)
     }
+
+    fn text(&self) -> DOMString {
+        match self.Text() {
+            TrustedScriptOrString::String(value) => value,
+            TrustedScriptOrString::TrustedScript(trusted_script) => {
+                DOMString::from(trusted_script.to_string())
+            },
+        }
+    }
 }
 
 impl VirtualMethods for HTMLScriptElement {
@@ -1242,12 +1293,14 @@ impl VirtualMethods for HTMLScriptElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         if *attr.local_name() == local_name!("src") {
             if let AttributeMutation::Set(_) = mutation {
                 if !self.parser_inserted.get() && self.upcast::<Node>().is_connected() {
-                    self.prepare(CanGc::note());
+                    self.prepare(can_gc);
                 }
             }
         }
@@ -1288,9 +1341,10 @@ impl VirtualMethods for HTMLScriptElement {
         copy: &Node,
         maybe_doc: Option<&Document>,
         clone_children: CloneChildrenFlag,
+        can_gc: CanGc,
     ) {
         if let Some(s) = self.super_type() {
-            s.cloning_steps(copy, maybe_doc, clone_children);
+            s.cloning_steps(copy, maybe_doc, clone_children, can_gc);
         }
 
         // https://html.spec.whatwg.org/multipage/#already-started
@@ -1304,10 +1358,25 @@ impl VirtualMethods for HTMLScriptElement {
 
 impl HTMLScriptElementMethods<crate::DomTypeHolder> for HTMLScriptElement {
     // https://html.spec.whatwg.org/multipage/#dom-script-src
-    make_url_getter!(Src, "src");
+    fn Src(&self) -> TrustedScriptURLOrUSVString {
+        let element = self.upcast::<Element>();
+        element.get_trusted_type_url_attribute(&local_name!("src"))
+    }
 
-    // https://html.spec.whatwg.org/multipage/#dom-script-src
-    make_url_setter!(SetSrc, "src");
+    /// <https://w3c.github.io/trusted-types/dist/spec/#the-src-idl-attribute>
+    fn SetSrc(&self, value: TrustedScriptURLOrUSVString, can_gc: CanGc) -> Fallible<()> {
+        let element = self.upcast::<Element>();
+        let local_name = &local_name!("src");
+        let value = TrustedScriptURL::get_trusted_script_url_compliant_string(
+            &element.owner_global(),
+            value,
+            "HTMLScriptElement",
+            local_name,
+            can_gc,
+        )?;
+        element.set_attribute(local_name, AttrValue::String(value), can_gc);
+        Ok(())
+    }
 
     // https://html.spec.whatwg.org/multipage/#dom-script-type
     make_getter!(Type, "type");
@@ -1376,14 +1445,77 @@ impl HTMLScriptElementMethods<crate::DomTypeHolder> for HTMLScriptElement {
     // https://html.spec.whatwg.org/multipage/#dom-script-referrerpolicy
     make_setter!(SetReferrerPolicy, "referrerpolicy");
 
-    // https://html.spec.whatwg.org/multipage/#dom-script-text
-    fn Text(&self) -> DOMString {
-        self.upcast::<Node>().child_text_content()
+    /// <https://w3c.github.io/trusted-types/dist/spec/#dom-htmlscriptelement-innertext>
+    fn InnerText(&self, can_gc: CanGc) -> TrustedScriptOrString {
+        // Step 1: Return the result of running get the text steps with this.
+        TrustedScriptOrString::String(self.upcast::<HTMLElement>().get_inner_outer_text(can_gc))
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-script-text
-    fn SetText(&self, value: DOMString, can_gc: CanGc) {
-        self.upcast::<Node>().SetTextContent(Some(value), can_gc)
+    /// <https://w3c.github.io/trusted-types/dist/spec/#the-innerText-idl-attribute>
+    fn SetInnerText(&self, input: TrustedScriptOrString, can_gc: CanGc) -> Fallible<()> {
+        // Step 1: Let value be the result of calling Get Trusted Type compliant string with TrustedScript,
+        // this's relevant global object, the given value, HTMLScriptElement innerText, and script.
+        let value = TrustedScript::get_trusted_script_compliant_string(
+            &self.owner_global(),
+            input,
+            "HTMLScriptElement",
+            "innerText",
+            can_gc,
+        )?;
+        // Step 3: Run set the inner text steps with this and value.
+        self.upcast::<HTMLElement>()
+            .set_inner_text(DOMString::from(value), can_gc);
+        Ok(())
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#dom-script-text>
+    fn Text(&self) -> TrustedScriptOrString {
+        TrustedScriptOrString::String(self.upcast::<Node>().child_text_content())
+    }
+
+    /// <https://w3c.github.io/trusted-types/dist/spec/#the-text-idl-attribute>
+    fn SetText(&self, value: TrustedScriptOrString, can_gc: CanGc) -> Fallible<()> {
+        // Step 1: Let value be the result of calling Get Trusted Type compliant string with TrustedScript,
+        // this's relevant global object, the given value, HTMLScriptElement text, and script.
+        let value = TrustedScript::get_trusted_script_compliant_string(
+            &self.owner_global(),
+            value,
+            "HTMLScriptElement",
+            "text",
+            can_gc,
+        )?;
+        // Step 2: Set this's script text value to the given value.
+        // TODO: Implement for https://w3c.github.io/trusted-types/dist/spec/#prepare-script-text
+        // Step 3: String replace all with the given value within this.
+        Node::string_replace_all(DOMString::from(value), self.upcast::<Node>(), can_gc);
+        Ok(())
+    }
+
+    /// <https://w3c.github.io/trusted-types/dist/spec/#the-textContent-idl-attribute>
+    fn GetTextContent(&self) -> Option<TrustedScriptOrString> {
+        // Step 1: Return the result of running get text content with this.
+        Some(TrustedScriptOrString::String(
+            self.upcast::<Node>().GetTextContent()?,
+        ))
+    }
+
+    /// <https://w3c.github.io/trusted-types/dist/spec/#the-textContent-idl-attribute>
+    fn SetTextContent(&self, value: Option<TrustedScriptOrString>, can_gc: CanGc) -> Fallible<()> {
+        // Step 1: Let value be the result of calling Get Trusted Type compliant string with TrustedScript,
+        // this's relevant global object, the given value, HTMLScriptElement textContent, and script.
+        let value = TrustedScript::get_trusted_script_compliant_string(
+            &self.owner_global(),
+            value.unwrap_or(TrustedScriptOrString::String(DOMString::from(""))),
+            "HTMLScriptElement",
+            "textContent",
+            can_gc,
+        )?;
+        // Step 2: Set this's script text value to value.
+        // TODO: Implement for https://w3c.github.io/trusted-types/dist/spec/#prepare-script-text
+        // Step 3: Run set text content with this and value.
+        self.upcast::<Node>()
+            .SetTextContent(Some(DOMString::from(value)), can_gc);
+        Ok(())
     }
 }
 
diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs
index 445b1058018..56fac20e841 100644
--- a/components/script/dom/htmlselectelement.rs
+++ b/components/script/dom/htmlselectelement.rs
@@ -5,42 +5,75 @@
 use std::default::Default;
 use std::iter;
 
+use webrender_api::units::DeviceIntRect;
+use ipc_channel::ipc;
 use dom_struct::dom_struct;
 use html5ever::{LocalName, Prefix, local_name};
 use js::rust::HandleObject;
 use style::attr::AttrValue;
 use stylo_dom::ElementState;
+use embedder_traits::{SelectElementOptionOrOptgroup, SelectElementOption};
+use euclid::{Size2D, Point2D, Rect};
+use embedder_traits::EmbedderMsg;
 
+use crate::dom::bindings::codegen::GenericBindings::HTMLOptGroupElementBinding::HTMLOptGroupElement_Binding::HTMLOptGroupElementMethods;
+use crate::dom::activation::Activatable;
 use crate::dom::attr::Attr;
+use crate::dom::bindings::cell::{DomRefCell, Ref};
 use crate::dom::bindings::codegen::Bindings::ElementBinding::ElementMethods;
 use crate::dom::bindings::codegen::Bindings::HTMLCollectionBinding::HTMLCollectionMethods;
 use crate::dom::bindings::codegen::Bindings::HTMLOptionElementBinding::HTMLOptionElementMethods;
 use crate::dom::bindings::codegen::Bindings::HTMLOptionsCollectionBinding::HTMLOptionsCollectionMethods;
 use crate::dom::bindings::codegen::Bindings::HTMLSelectElementBinding::HTMLSelectElementMethods;
 use crate::dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
+use crate::dom::bindings::codegen::Bindings::ShadowRootBinding::{
+    ShadowRootMode, SlotAssignmentMode,
+};
+use crate::dom::bindings::codegen::GenericBindings::CharacterDataBinding::CharacterData_Binding::CharacterDataMethods;
 use crate::dom::bindings::codegen::UnionTypes::{
     HTMLElementOrLong, HTMLOptionElementOrHTMLOptGroupElement,
 };
 use crate::dom::bindings::error::ErrorResult;
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::root::{DomRoot, MutNullableDom};
+use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
 use crate::dom::bindings::str::DOMString;
+use crate::dom::characterdata::CharacterData;
 use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element};
+use crate::dom::event::Event;
+use crate::dom::eventtarget::EventTarget;
 use crate::dom::htmlcollection::CollectionFilter;
+use crate::dom::htmldivelement::HTMLDivElement;
 use crate::dom::htmlelement::HTMLElement;
 use crate::dom::htmlfieldsetelement::HTMLFieldSetElement;
 use crate::dom::htmlformelement::{FormControl, FormDatum, FormDatumValue, HTMLFormElement};
 use crate::dom::htmloptgroupelement::HTMLOptGroupElement;
 use crate::dom::htmloptionelement::HTMLOptionElement;
 use crate::dom::htmloptionscollection::HTMLOptionsCollection;
-use crate::dom::node::{BindContext, Node, NodeTraits, UnbindContext};
+use crate::dom::node::{BindContext, ChildrenMutation, Node, NodeTraits, UnbindContext};
 use crate::dom::nodelist::NodeList;
+use crate::dom::shadowroot::IsUserAgentWidget;
+use crate::dom::text::Text;
 use crate::dom::validation::{Validatable, is_barred_by_datalist_ancestor};
 use crate::dom::validitystate::{ValidationFlags, ValidityState};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;
 
+const DEFAULT_SELECT_SIZE: u32 = 0;
+
+const SELECT_BOX_STYLE: &str = "
+    display: flex;
+    align-items: center;
+    height: 100%;
+";
+
+const TEXT_CONTAINER_STYLE: &str = "flex: 1;";
+
+const CHEVRON_CONTAINER_STYLE: &str = "
+    font-size: 16px;
+    margin: 4px;
+";
+
 #[derive(JSTraceable, MallocSizeOf)]
 struct OptionsFilter;
 impl CollectionFilter for OptionsFilter {
@@ -68,9 +101,15 @@ pub(crate) struct HTMLSelectElement {
     form_owner: MutNullableDom<HTMLFormElement>,
     labels_node_list: MutNullableDom<NodeList>,
     validity_state: MutNullableDom<ValidityState>,
+    shadow_tree: DomRefCell<Option<ShadowTree>>,
 }
 
-static DEFAULT_SELECT_SIZE: u32 = 0;
+/// Holds handles to all elements in the UA shadow tree
+#[derive(Clone, JSTraceable, MallocSizeOf)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+struct ShadowTree {
+    selected_option: Dom<Text>,
+}
 
 impl HTMLSelectElement {
     fn new_inherited(
@@ -89,6 +128,7 @@ impl HTMLSelectElement {
             form_owner: Default::default(),
             labels_node_list: Default::default(),
             validity_state: Default::default(),
+            shadow_tree: Default::default(),
         }
     }
 
@@ -113,7 +153,7 @@ impl HTMLSelectElement {
         n
     }
 
-    // https://html.spec.whatwg.org/multipage/#concept-select-option-list
+    /// <https://html.spec.whatwg.org/multipage/#concept-select-option-list>
     pub(crate) fn list_of_options(
         &self,
     ) -> impl Iterator<Item = DomRoot<HTMLOptionElement>> + use<'_> {
@@ -215,10 +255,180 @@ impl HTMLSelectElement {
             self.Size()
         }
     }
+
+    fn create_shadow_tree(&self, can_gc: CanGc) {
+        let document = self.owner_document();
+        let root = self
+            .upcast::<Element>()
+            .attach_shadow(
+                IsUserAgentWidget::Yes,
+                ShadowRootMode::Closed,
+                false,
+                false,
+                false,
+                SlotAssignmentMode::Manual,
+                can_gc,
+            )
+            .expect("Attaching UA shadow root failed");
+
+        let select_box = HTMLDivElement::new(local_name!("div"), None, &document, None, can_gc);
+        select_box.upcast::<Element>().set_string_attribute(
+            &local_name!("style"),
+            SELECT_BOX_STYLE.into(),
+            can_gc,
+        );
+
+        let text_container = HTMLDivElement::new(local_name!("div"), None, &document, None, can_gc);
+        text_container.upcast::<Element>().set_string_attribute(
+            &local_name!("style"),
+            TEXT_CONTAINER_STYLE.into(),
+            can_gc,
+        );
+        select_box
+            .upcast::<Node>()
+            .AppendChild(text_container.upcast::<Node>(), can_gc)
+            .unwrap();
+
+        let text = Text::new(DOMString::new(), &document, can_gc);
+        let _ = self.shadow_tree.borrow_mut().insert(ShadowTree {
+            selected_option: text.as_traced(),
+        });
+        text_container
+            .upcast::<Node>()
+            .AppendChild(text.upcast::<Node>(), can_gc)
+            .unwrap();
+
+        let chevron_container =
+            HTMLDivElement::new(local_name!("div"), None, &document, None, can_gc);
+        chevron_container.upcast::<Element>().set_string_attribute(
+            &local_name!("style"),
+            CHEVRON_CONTAINER_STYLE.into(),
+            can_gc,
+        );
+        chevron_container
+            .upcast::<Node>()
+            .SetTextContent(Some("▾".into()), can_gc);
+        select_box
+            .upcast::<Node>()
+            .AppendChild(chevron_container.upcast::<Node>(), can_gc)
+            .unwrap();
+
+        root.upcast::<Node>()
+            .AppendChild(select_box.upcast::<Node>(), can_gc)
+            .unwrap();
+    }
+
+    fn shadow_tree(&self, can_gc: CanGc) -> Ref<'_, ShadowTree> {
+        if !self.upcast::<Element>().is_shadow_host() {
+            self.create_shadow_tree(can_gc);
+        }
+
+        Ref::filter_map(self.shadow_tree.borrow(), Option::as_ref)
+            .ok()
+            .expect("UA shadow tree was not created")
+    }
+
+    pub(crate) fn update_shadow_tree(&self, can_gc: CanGc) {
+        let shadow_tree = self.shadow_tree(can_gc);
+
+        let selected_option_text = self
+            .selected_option()
+            .or_else(|| self.list_of_options().next())
+            .map(|option| option.displayed_label())
+            .unwrap_or_default();
+
+        // Replace newlines with whitespace, then collapse and trim whitespace
+        let displayed_text = itertools::join(selected_option_text.split_whitespace(), " ");
+
+        shadow_tree
+            .selected_option
+            .upcast::<CharacterData>()
+            .SetData(displayed_text.trim().into());
+    }
+
+    pub(crate) fn selection_changed(&self, can_gc: CanGc) {
+        self.update_shadow_tree(can_gc);
+
+        self.upcast::<EventTarget>()
+            .fire_bubbling_event(atom!("change"), can_gc);
+    }
+
+    pub(crate) fn selected_option(&self) -> Option<DomRoot<HTMLOptionElement>> {
+        self.list_of_options()
+            .find(|opt_elem| opt_elem.Selected())
+            .or_else(|| self.list_of_options().next())
+    }
+
+    pub(crate) fn show_menu(&self, can_gc: CanGc) -> Option<usize> {
+        let (ipc_sender, ipc_receiver) = ipc::channel().expect("Failed to create IPC channel!");
+
+        // Collect list of optgroups and options
+        let mut index = 0;
+        let mut embedder_option_from_option = |option: &HTMLOptionElement| {
+            let embedder_option = SelectElementOption {
+                id: index,
+                label: option.displayed_label().into(),
+                is_disabled: option.Disabled(),
+            };
+            index += 1;
+            embedder_option
+        };
+        let options = self
+            .upcast::<Node>()
+            .children()
+            .flat_map(|child| {
+                if let Some(option) = child.downcast::<HTMLOptionElement>() {
+                    return Some(embedder_option_from_option(option).into());
+                }
+
+                if let Some(optgroup) = child.downcast::<HTMLOptGroupElement>() {
+                    let options = optgroup
+                        .upcast::<Node>()
+                        .children()
+                        .flat_map(DomRoot::downcast::<HTMLOptionElement>)
+                        .map(|option| embedder_option_from_option(&option))
+                        .collect();
+                    let label = optgroup.Label().into();
+
+                    return Some(SelectElementOptionOrOptgroup::Optgroup { label, options });
+                }
+
+                None
+            })
+            .collect();
+
+        let rect = self.upcast::<Node>().bounding_content_box_or_zero(can_gc);
+        let rect = Rect::new(
+            Point2D::new(rect.origin.x.to_px(), rect.origin.y.to_px()),
+            Size2D::new(rect.size.width.to_px(), rect.size.height.to_px()),
+        );
+
+        let selected_index = self.list_of_options().position(|option| option.Selected());
+
+        let document = self.owner_document();
+        document.send_to_embedder(EmbedderMsg::ShowSelectElementMenu(
+            document.webview_id(),
+            options,
+            selected_index,
+            DeviceIntRect::from_untyped(&rect.to_box2d()),
+            ipc_sender,
+        ));
+
+        let Ok(response) = ipc_receiver.recv() else {
+            log::error!("Failed to receive response");
+            return None;
+        };
+
+        if response.is_some() && response != selected_index {
+            self.selection_changed(can_gc);
+        }
+
+        response
+    }
 }
 
 impl HTMLSelectElementMethods<crate::DomTypeHolder> for HTMLSelectElement {
-    // https://html.spec.whatwg.org/multipage/#dom-select-add
+    /// <https://html.spec.whatwg.org/multipage/#dom-select-add>
     fn Add(
         &self,
         element: HTMLOptionElementOrHTMLOptGroupElement,
@@ -233,7 +443,7 @@ impl HTMLSelectElementMethods<crate::DomTypeHolder> for HTMLSelectElement {
     // https://html.spec.whatwg.org/multipage/#dom-fe-disabled
     make_bool_setter!(SetDisabled, "disabled");
 
-    // https://html.spec.whatwg.org/multipage/#dom-fae-form
+    /// <https://html.spec.whatwg.org/multipage/#dom-fae-form>
     fn GetForm(&self) -> Option<DomRoot<HTMLFormElement>> {
         self.form_owner()
     }
@@ -262,7 +472,7 @@ impl HTMLSelectElementMethods<crate::DomTypeHolder> for HTMLSelectElement {
     // https://html.spec.whatwg.org/multipage/#dom-select-size
     make_uint_setter!(SetSize, "size", DEFAULT_SELECT_SIZE);
 
-    // https://html.spec.whatwg.org/multipage/#dom-select-type
+    /// <https://html.spec.whatwg.org/multipage/#dom-select-type>
     fn Type(&self) -> DOMString {
         DOMString::from(if self.Multiple() {
             "select-multiple"
@@ -274,7 +484,7 @@ impl HTMLSelectElementMethods<crate::DomTypeHolder> for HTMLSelectElement {
     // https://html.spec.whatwg.org/multipage/#dom-lfe-labels
     make_labels_getter!(Labels, labels_node_list);
 
-    // https://html.spec.whatwg.org/multipage/#dom-select-options
+    /// <https://html.spec.whatwg.org/multipage/#dom-select-options>
     fn Options(&self) -> DomRoot<HTMLOptionsCollection> {
         self.options.or_init(|| {
             let window = self.owner_window();
@@ -282,27 +492,27 @@ impl HTMLSelectElementMethods<crate::DomTypeHolder> for HTMLSelectElement {
         })
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-select-length
+    /// <https://html.spec.whatwg.org/multipage/#dom-select-length>
     fn Length(&self) -> u32 {
         self.Options().Length()
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-select-length
+    /// <https://html.spec.whatwg.org/multipage/#dom-select-length>
     fn SetLength(&self, length: u32, can_gc: CanGc) {
         self.Options().SetLength(length, can_gc)
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-select-item
+    /// <https://html.spec.whatwg.org/multipage/#dom-select-item>
     fn Item(&self, index: u32) -> Option<DomRoot<Element>> {
         self.Options().upcast().Item(index)
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-select-item
+    /// <https://html.spec.whatwg.org/multipage/#dom-select-item>
     fn IndexedGetter(&self, index: u32) -> Option<DomRoot<Element>> {
         self.Options().IndexedGetter(index)
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-select-setter
+    /// <https://html.spec.whatwg.org/multipage/#dom-select-setter>
     fn IndexedSetter(
         &self,
         index: u32,
@@ -312,33 +522,32 @@ impl HTMLSelectElementMethods<crate::DomTypeHolder> for HTMLSelectElement {
         self.Options().IndexedSetter(index, value, can_gc)
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-select-nameditem
+    /// <https://html.spec.whatwg.org/multipage/#dom-select-nameditem>
     fn NamedItem(&self, name: DOMString) -> Option<DomRoot<HTMLOptionElement>> {
         self.Options()
             .NamedGetter(name)
             .and_then(DomRoot::downcast::<HTMLOptionElement>)
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-select-remove
+    /// <https://html.spec.whatwg.org/multipage/#dom-select-remove>
     fn Remove_(&self, index: i32) {
         self.Options().Remove(index)
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-select-remove
+    /// <https://html.spec.whatwg.org/multipage/#dom-select-remove>
     fn Remove(&self) {
-        self.upcast::<Element>().Remove()
+        self.upcast::<Element>().Remove(CanGc::note())
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-select-value
+    /// <https://html.spec.whatwg.org/multipage/#dom-select-value>
     fn Value(&self) -> DOMString {
         self.list_of_options()
-            .filter(|opt_elem| opt_elem.Selected())
+            .find(|opt_elem| opt_elem.Selected())
             .map(|opt_elem| opt_elem.Value())
-            .next()
             .unwrap_or_default()
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-select-value
+    /// <https://html.spec.whatwg.org/multipage/#dom-select-value>
     fn SetValue(&self, value: DOMString) {
         let mut opt_iter = self.list_of_options();
         // Reset until we find an <option> with a matching value
@@ -356,10 +565,10 @@ impl HTMLSelectElementMethods<crate::DomTypeHolder> for HTMLSelectElement {
         }
 
         self.validity_state()
-            .perform_validation_and_update(ValidationFlags::VALUE_MISSING);
+            .perform_validation_and_update(ValidationFlags::VALUE_MISSING, CanGc::note());
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-select-selectedindex
+    /// <https://html.spec.whatwg.org/multipage/#dom-select-selectedindex>
     fn SelectedIndex(&self) -> i32 {
         self.list_of_options()
             .enumerate()
@@ -369,8 +578,8 @@ impl HTMLSelectElementMethods<crate::DomTypeHolder> for HTMLSelectElement {
             .unwrap_or(-1)
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-select-selectedindex
-    fn SetSelectedIndex(&self, index: i32) {
+    /// <https://html.spec.whatwg.org/multipage/#dom-select-selectedindex>
+    fn SetSelectedIndex(&self, index: i32, can_gc: CanGc) {
         let mut opt_iter = self.list_of_options();
         for opt in opt_iter.by_ref().take(index as usize) {
             opt.set_selectedness(false);
@@ -383,34 +592,37 @@ impl HTMLSelectElementMethods<crate::DomTypeHolder> for HTMLSelectElement {
                 opt.set_selectedness(false);
             }
         }
+
+        // TODO: Track whether the selected element actually changed
+        self.update_shadow_tree(can_gc);
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-cva-willvalidate
+    /// <https://html.spec.whatwg.org/multipage/#dom-cva-willvalidate>
     fn WillValidate(&self) -> bool {
         self.is_instance_validatable()
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-cva-validity
+    /// <https://html.spec.whatwg.org/multipage/#dom-cva-validity>
     fn Validity(&self) -> DomRoot<ValidityState> {
         self.validity_state()
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-cva-checkvalidity
+    /// <https://html.spec.whatwg.org/multipage/#dom-cva-checkvalidity>
     fn CheckValidity(&self, can_gc: CanGc) -> bool {
         self.check_validity(can_gc)
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-cva-reportvalidity
+    /// <https://html.spec.whatwg.org/multipage/#dom-cva-reportvalidity>
     fn ReportValidity(&self, can_gc: CanGc) -> bool {
         self.report_validity(can_gc)
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-cva-validationmessage
+    /// <https://html.spec.whatwg.org/multipage/#dom-cva-validationmessage>
     fn ValidationMessage(&self) -> DOMString {
         self.validation_message()
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-cva-setcustomvalidity
+    /// <https://html.spec.whatwg.org/multipage/#dom-cva-setcustomvalidity>
     fn SetCustomValidity(&self, error: DOMString) {
         self.validity_state().set_custom_error_message(error);
     }
@@ -421,12 +633,14 @@ impl VirtualMethods for HTMLSelectElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         match *attr.local_name() {
             local_name!("required") => {
                 self.validity_state()
-                    .perform_validation_and_update(ValidationFlags::VALUE_MISSING);
+                    .perform_validation_and_update(ValidationFlags::VALUE_MISSING, can_gc);
             },
             local_name!("disabled") => {
                 let el = self.upcast::<Element>();
@@ -443,26 +657,26 @@ impl VirtualMethods for HTMLSelectElement {
                 }
 
                 self.validity_state()
-                    .perform_validation_and_update(ValidationFlags::VALUE_MISSING);
+                    .perform_validation_and_update(ValidationFlags::VALUE_MISSING, can_gc);
             },
             local_name!("form") => {
-                self.form_attribute_mutated(mutation);
+                self.form_attribute_mutated(mutation, can_gc);
             },
             _ => {},
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
 
         self.upcast::<Element>()
             .check_ancestors_disabled_state_for_form_control();
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
-        self.super_type().unwrap().unbind_from_tree(context);
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
+        self.super_type().unwrap().unbind_from_tree(context, can_gc);
 
         let node = self.upcast::<Node>();
         let el = self.upcast::<Element>();
@@ -476,6 +690,14 @@ impl VirtualMethods for HTMLSelectElement {
         }
     }
 
+    fn children_changed(&self, mutation: &ChildrenMutation) {
+        if let Some(s) = self.super_type() {
+            s.children_changed(mutation);
+        }
+
+        self.update_shadow_tree(CanGc::note());
+    }
+
     fn parse_plain_attribute(&self, local_name: &LocalName, value: DOMString) -> AttrValue {
         match *local_name {
             local_name!("size") => AttrValue::from_u32(value.into(), DEFAULT_SELECT_SIZE),
@@ -517,7 +739,11 @@ impl Validatable for HTMLSelectElement {
         !self.upcast::<Element>().disabled_state() && !is_barred_by_datalist_ancestor(self.upcast())
     }
 
-    fn perform_validation(&self, validate_flags: ValidationFlags) -> ValidationFlags {
+    fn perform_validation(
+        &self,
+        validate_flags: ValidationFlags,
+        _can_gc: CanGc,
+    ) -> ValidationFlags {
         let mut failed_flags = ValidationFlags::empty();
 
         // https://html.spec.whatwg.org/multipage/#suffering-from-being-missing
@@ -534,6 +760,26 @@ impl Validatable for HTMLSelectElement {
     }
 }
 
+impl Activatable for HTMLSelectElement {
+    fn as_element(&self) -> &Element {
+        self.upcast()
+    }
+
+    fn is_instance_activatable(&self) -> bool {
+        true
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#input-activation-behavior>
+    fn activation_behavior(&self, _event: &Event, _target: &EventTarget, can_gc: CanGc) {
+        let Some(selected_value) = self.show_menu(can_gc) else {
+            // The user did not select a value
+            return;
+        };
+
+        self.SetSelectedIndex(selected_value as i32, can_gc);
+    }
+}
+
 enum Choice3<I, J, K> {
     First(I),
     Second(J),
diff --git a/components/script/dom/htmlslotelement.rs b/components/script/dom/htmlslotelement.rs
index 6d4d03f518a..68fa105e64d 100644
--- a/components/script/dom/htmlslotelement.rs
+++ b/components/script/dom/htmlslotelement.rs
@@ -5,9 +5,10 @@
 use std::cell::{Cell, Ref, RefCell};
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::gc::RootedVec;
 use js::rust::HandleObject;
+use script_bindings::codegen::InheritTypes::{CharacterDataTypeId, NodeTypeId};
 
 use crate::ScriptThread;
 use crate::dom::attr::Attr;
@@ -19,7 +20,6 @@ use crate::dom::bindings::codegen::Bindings::ShadowRootBinding::ShadowRoot_Bindi
 use crate::dom::bindings::codegen::Bindings::ShadowRootBinding::{
     ShadowRootMode, SlotAssignmentMode,
 };
-use crate::dom::bindings::codegen::InheritTypes::{CharacterDataTypeId, NodeTypeId};
 use crate::dom::bindings::codegen::UnionTypes::ElementOrText;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::{Dom, DomRoot};
@@ -35,7 +35,7 @@ use crate::script_runtime::CanGc;
 
 /// <https://html.spec.whatwg.org/multipage/#the-slot-element>
 #[dom_struct]
-pub struct HTMLSlotElement {
+pub(crate) struct HTMLSlotElement {
     htmlelement: HTMLElement,
 
     /// <https://dom.spec.whatwg.org/#slot-assigned-nodes>
@@ -461,8 +461,10 @@ impl VirtualMethods for HTMLSlotElement {
     }
 
     /// <https://dom.spec.whatwg.org/#shadow-tree-slots>
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
 
         if attr.local_name() == &local_name!("name") && attr.namespace() == &ns!() {
             if let Some(shadow_root) = self.containing_shadow_root() {
@@ -486,9 +488,9 @@ impl VirtualMethods for HTMLSlotElement {
         }
     }
 
-    fn bind_to_tree(&self, context: &super::node::BindContext) {
+    fn bind_to_tree(&self, context: &super::node::BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
 
         if !context.tree_is_in_a_shadow_tree {
@@ -500,9 +502,9 @@ impl VirtualMethods for HTMLSlotElement {
             .register_slot(self);
     }
 
-    fn unbind_from_tree(&self, context: &super::node::UnbindContext) {
+    fn unbind_from_tree(&self, context: &super::node::UnbindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.unbind_from_tree(context);
+            s.unbind_from_tree(context, can_gc);
         }
 
         if let Some(shadow_root) = self.containing_shadow_root() {
diff --git a/components/script/dom/htmlsourceelement.rs b/components/script/dom/htmlsourceelement.rs
index 147a0a696a7..e4b115e78a2 100644
--- a/components/script/dom/htmlsourceelement.rs
+++ b/components/script/dom/htmlsourceelement.rs
@@ -11,7 +11,7 @@ use crate::dom::bindings::codegen::Bindings::HTMLSourceElementBinding::HTMLSourc
 use crate::dom::bindings::codegen::Bindings::NodeBinding::Node_Binding::NodeMethods;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::{Dom, DomRoot, Root};
-use crate::dom::bindings::str::DOMString;
+use crate::dom::bindings::str::{DOMString, USVString};
 use crate::dom::document::Document;
 use crate::dom::element::AttributeMutation;
 use crate::dom::htmlelement::HTMLElement;
@@ -72,8 +72,10 @@ impl VirtualMethods for HTMLSourceElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         match attr.local_name() {
             &local_name!("srcset") |
             &local_name!("sizes") |
@@ -90,8 +92,8 @@ impl VirtualMethods for HTMLSourceElement {
     }
 
     /// <https://html.spec.whatwg.org/multipage/#the-source-element:nodes-are-inserted>
-    fn bind_to_tree(&self, context: &BindContext) {
-        self.super_type().unwrap().bind_to_tree(context);
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
+        self.super_type().unwrap().bind_to_tree(context, can_gc);
         let parent = self.upcast::<Node>().GetParentNode().unwrap();
         if let Some(media) = parent.downcast::<HTMLMediaElement>() {
             media.handle_source_child_insertion(CanGc::note());
@@ -103,8 +105,8 @@ impl VirtualMethods for HTMLSourceElement {
         );
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
-        self.super_type().unwrap().unbind_from_tree(context);
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
+        self.super_type().unwrap().unbind_from_tree(context, can_gc);
         if let Some(next_sibling) = context.next_sibling {
             let next_sibling_iterator = next_sibling.inclusively_following_siblings();
             HTMLSourceElement::iterate_next_html_image_element_siblings(
@@ -117,10 +119,10 @@ impl VirtualMethods for HTMLSourceElement {
 
 impl HTMLSourceElementMethods<crate::DomTypeHolder> for HTMLSourceElement {
     // https://html.spec.whatwg.org/multipage/#dom-source-src
-    make_getter!(Src, "src");
+    make_url_getter!(Src, "src");
 
     // https://html.spec.whatwg.org/multipage/#dom-source-src
-    make_setter!(SetSrc, "src");
+    make_url_setter!(SetSrc, "src");
 
     // https://html.spec.whatwg.org/multipage/#dom-source-type
     make_getter!(Type, "type");
@@ -129,10 +131,10 @@ impl HTMLSourceElementMethods<crate::DomTypeHolder> for HTMLSourceElement {
     make_setter!(SetType, "type");
 
     // https://html.spec.whatwg.org/multipage/#dom-source-srcset
-    make_getter!(Srcset, "srcset");
+    make_url_getter!(Srcset, "srcset");
 
     // https://html.spec.whatwg.org/multipage/#dom-source-srcset
-    make_setter!(SetSrcset, "srcset");
+    make_url_setter!(SetSrcset, "srcset");
 
     // https://html.spec.whatwg.org/multipage/#dom-source-sizes
     make_getter!(Sizes, "sizes");
diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs
index 0fbd8d10066..aed08b7bcf6 100644
--- a/components/script/dom/htmlstyleelement.rs
+++ b/components/script/dom/htmlstyleelement.rs
@@ -4,16 +4,14 @@
 
 use std::cell::Cell;
 
-use cssparser::{Parser as CssParser, ParserInput};
+use content_security_policy as csp;
 use dom_struct::dom_struct;
 use html5ever::{LocalName, Prefix};
 use js::rust::HandleObject;
 use net_traits::ReferrerPolicy;
 use servo_arc::Arc;
-use style::media_queries::MediaList;
-use style::parser::ParserContext as CssParserContext;
-use style::stylesheets::{AllowImportRules, CssRuleType, Origin, Stylesheet, UrlExtraData};
-use style_traits::ParsingMode;
+use style::media_queries::MediaList as StyleMediaList;
+use style::stylesheets::{AllowImportRules, Origin, Stylesheet, UrlExtraData};
 
 use crate::dom::attr::Attr;
 use crate::dom::bindings::cell::DomRefCell;
@@ -26,6 +24,7 @@ use crate::dom::cssstylesheet::CSSStyleSheet;
 use crate::dom::document::Document;
 use crate::dom::element::{AttributeMutation, Element, ElementCreator};
 use crate::dom::htmlelement::HTMLElement;
+use crate::dom::medialist::MediaList;
 use crate::dom::node::{BindContext, ChildrenMutation, Node, NodeTraits, UnbindContext};
 use crate::dom::stylesheet::StyleSheet as DOMStyleSheet;
 use crate::dom::virtualmethods::VirtualMethods;
@@ -35,7 +34,7 @@ use crate::stylesheet_loader::{StylesheetLoader, StylesheetOwner};
 #[dom_struct]
 pub(crate) struct HTMLStyleElement {
     htmlelement: HTMLElement,
-    #[ignore_malloc_size_of = "Arc"]
+    #[conditional_malloc_size_of]
     #[no_trace]
     stylesheet: DomRefCell<Option<Arc<Stylesheet>>>,
     cssom_stylesheet: MutNullableDom<CSSStyleSheet>,
@@ -44,7 +43,6 @@ pub(crate) struct HTMLStyleElement {
     in_stack_of_open_elements: Cell<bool>,
     pending_loads: Cell<u32>,
     any_failed_load: Cell<bool>,
-    line_number: u64,
 }
 
 impl HTMLStyleElement {
@@ -62,7 +60,6 @@ impl HTMLStyleElement {
             in_stack_of_open_elements: Cell::new(creator.is_parser_created()),
             pending_loads: Cell::new(0),
             any_failed_load: Cell::new(false),
-            line_number: creator.return_line_number(),
         }
     }
 
@@ -85,26 +82,9 @@ impl HTMLStyleElement {
         )
     }
 
-    fn create_media_list(&self, mq_str: &str) -> MediaList {
-        if mq_str.is_empty() {
-            return MediaList::empty();
-        }
-
-        let window = self.owner_window();
-        let doc = self.owner_document();
-        let url_data = UrlExtraData(window.get_url().get_arc());
-        let context = CssParserContext::new(
-            Origin::Author,
-            &url_data,
-            Some(CssRuleType::Media),
-            ParsingMode::DEFAULT,
-            doc.quirks_mode(),
-            /* namespaces = */ Default::default(),
-            window.css_error_reporter(),
-            None,
-        );
-        let mut input = ParserInput::new(mq_str);
-        MediaList::parse(&context, &mut CssParser::new(&mut input))
+    #[inline]
+    fn create_media_list(&self, mq_str: &str) -> StyleMediaList {
+        MediaList::parse_media_list(mq_str, &self.owner_window())
     }
 
     pub(crate) fn parse_own_css(&self) {
@@ -118,8 +98,21 @@ impl HTMLStyleElement {
             return;
         }
 
-        let window = node.owner_window();
         let doc = self.owner_document();
+
+        // Step 5: If the Should element's inline behavior be blocked by Content Security Policy? algorithm
+        // returns "Blocked" when executed upon the style element, "style",
+        // and the style element's child text content, then return. [CSP]
+        if doc.should_elements_inline_type_behavior_be_blocked(
+            self.upcast(),
+            csp::InlineCheckType::Style,
+            &node.child_text_content(),
+        ) == csp::CheckResult::Blocked
+        {
+            return;
+        }
+
+        let window = node.owner_window();
         let data = node
             .GetTextContent()
             .expect("Element.textContent must be a string");
@@ -172,11 +165,12 @@ impl HTMLStyleElement {
             self.cssom_stylesheet.or_init(|| {
                 CSSStyleSheet::new(
                     &self.owner_window(),
-                    self.upcast::<Element>(),
+                    Some(self.upcast::<Element>()),
                     "text/css".into(),
                     None, // todo handle location
                     None, // todo handle title
                     sheet,
+                    false, // is_constructed
                     CanGc::note(),
                 )
             })
@@ -220,8 +214,8 @@ impl VirtualMethods for HTMLStyleElement {
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
-        self.super_type().unwrap().bind_to_tree(context);
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
+        self.super_type().unwrap().bind_to_tree(context, can_gc);
 
         // https://html.spec.whatwg.org/multipage/#update-a-style-block
         // Handles the case when:
@@ -244,9 +238,9 @@ impl VirtualMethods for HTMLStyleElement {
         }
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.unbind_from_tree(context);
+            s.unbind_from_tree(context, can_gc);
         }
 
         if context.tree_connected {
@@ -254,9 +248,9 @@ impl VirtualMethods for HTMLStyleElement {
         }
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.attribute_mutated(attr, mutation);
+            s.attribute_mutated(attr, mutation, can_gc);
         }
 
         let node = self.upcast::<Node>();
@@ -281,7 +275,7 @@ impl VirtualMethods for HTMLStyleElement {
                 let media = stylesheet.media.write_with(&mut guard);
                 match mutation {
                     AttributeMutation::Set(_) => *media = self.create_media_list(&attr.value()),
-                    AttributeMutation::Removed => *media = MediaList::empty(),
+                    AttributeMutation::Removed => *media = StyleMediaList::empty(),
                 };
                 self.owner_document().invalidate_stylesheets();
             }
diff --git a/components/script/dom/htmltablecellelement.rs b/components/script/dom/htmltablecellelement.rs
index 623dfdea54b..8b553923230 100644
--- a/components/script/dom/htmltablecellelement.rs
+++ b/components/script/dom/htmltablecellelement.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use style::attr::{AttrValue, LengthOrPercentageOrAuto};
 use style::color::AbsoluteColor;
@@ -70,13 +70,17 @@ impl HTMLTableCellElementMethods<crate::DomTypeHolder> for HTMLTableCellElement
     make_uint_getter!(ColSpan, "colspan", DEFAULT_COLSPAN);
 
     // https://html.spec.whatwg.org/multipage/#dom-tdth-colspan
-    make_uint_setter!(SetColSpan, "colspan", DEFAULT_COLSPAN);
+    // > The colSpan IDL attribute must reflect the colspan content attribute. It is clamped to
+    // > the range [1, 1000], and its default value is 1.
+    make_clamped_uint_setter!(SetColSpan, "colspan", 1, 1000, 1);
 
     // https://html.spec.whatwg.org/multipage/#dom-tdth-rowspan
     make_uint_getter!(RowSpan, "rowspan", DEFAULT_ROWSPAN);
 
     // https://html.spec.whatwg.org/multipage/#dom-tdth-rowspan
-    make_uint_setter!(SetRowSpan, "rowspan", DEFAULT_ROWSPAN);
+    // > The rowSpan IDL attribute must reflect the rowspan content attribute. It is clamped to
+    // > the range [0, 65534], and its default value is 1.
+    make_clamped_uint_setter!(SetRowSpan, "rowspan", 0, 65534, 1);
 
     // https://html.spec.whatwg.org/multipage/#dom-tdth-bgcolor
     make_getter!(BgColor, "bgcolor");
@@ -174,23 +178,26 @@ impl VirtualMethods for HTMLTableCellElement {
         match *local_name {
             local_name!("colspan") => {
                 let mut attr = AttrValue::from_u32(value.into(), DEFAULT_COLSPAN);
-                if let AttrValue::UInt(_, ref mut val) = attr {
-                    if *val == 0 {
-                        *val = 1;
-                    }
+                if let AttrValue::UInt(_, ref mut value) = attr {
+                    // From <https://html.spec.whatwg.org/multipage/#dom-tdth-colspan>:
+                    // > The colSpan IDL attribute must reflect the colspan content attribute. It is clamped to
+                    // > the range [1, 1000], and its default value is 1.
+                    *value = (*value).clamp(1, 1000);
                 }
                 attr
             },
             local_name!("rowspan") => {
                 let mut attr = AttrValue::from_u32(value.into(), DEFAULT_ROWSPAN);
-                if let AttrValue::UInt(_, ref mut val) = attr {
-                    if *val == 0 {
-                        let node = self.upcast::<Node>();
-                        let doc = node.owner_doc();
-                        // rowspan = 0 is not supported in quirks mode
-                        if doc.quirks_mode() != QuirksMode::NoQuirks {
-                            *val = 1;
-                        }
+                if let AttrValue::UInt(_, ref mut value) = attr {
+                    // From <https://html.spec.whatwg.org/multipage/#dom-tdth-rowspan>:
+                    // > The rowSpan IDL attribute must reflect the rowspan content attribute. It is clamped to
+                    // > the range [0, 65534], and its default value is 1.
+                    // Note that rowspan = 0 is not supported in quirks mode.
+                    let document = self.upcast::<Node>().owner_doc();
+                    if document.quirks_mode() != QuirksMode::NoQuirks {
+                        *value = (*value).clamp(1, 65534);
+                    } else {
+                        *value = (*value).clamp(0, 65534);
                     }
                 }
                 attr
diff --git a/components/script/dom/htmltablecolelement.rs b/components/script/dom/htmltablecolelement.rs
index b2821fd38e2..9e8eecf1147 100644
--- a/components/script/dom/htmltablecolelement.rs
+++ b/components/script/dom/htmltablecolelement.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use style::attr::{AttrValue, LengthOrPercentageOrAuto};
 
@@ -20,8 +20,6 @@ use crate::dom::node::Node;
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;
 
-const DEFAULT_SPAN: u32 = 1;
-
 #[dom_struct]
 pub(crate) struct HTMLTableColElement {
     htmlelement: HTMLElement,
@@ -62,9 +60,11 @@ impl HTMLTableColElement {
 
 impl HTMLTableColElementMethods<crate::DomTypeHolder> for HTMLTableColElement {
     // <https://html.spec.whatwg.org/multipage/#attr-col-span>
-    make_uint_getter!(Span, "span", DEFAULT_SPAN);
+    make_uint_getter!(Span, "span", 1);
     // <https://html.spec.whatwg.org/multipage/#attr-col-span>
-    make_uint_setter!(SetSpan, "span", DEFAULT_SPAN);
+    // > The span IDL attribute must reflect the content attribute of the same name. It is clamped
+    // > to the range [1, 1000], and its default value is 1.
+    make_clamped_uint_setter!(SetSpan, "span", 1, 1000, 1);
 }
 
 pub(crate) trait HTMLTableColElementLayoutHelpers<'dom> {
@@ -96,11 +96,12 @@ impl VirtualMethods for HTMLTableColElement {
     fn parse_plain_attribute(&self, local_name: &LocalName, value: DOMString) -> AttrValue {
         match *local_name {
             local_name!("span") => {
-                let mut attr = AttrValue::from_u32(value.into(), DEFAULT_SPAN);
+                let mut attr = AttrValue::from_u32(value.into(), 1);
                 if let AttrValue::UInt(_, ref mut val) = attr {
-                    if *val == 0 {
-                        *val = 1;
-                    }
+                    // From <https://html.spec.whatwg.org/multipage/#attr-col-span>:
+                    // > The span IDL attribute must reflect the content attribute of the same name.
+                    // > It is clamped to the range [1, 1000], and its default value is 1.
+                    *val = (*val).clamp(1, 1000);
                 }
                 attr
             },
diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs
index b0e6adeb8d3..c24ec5490c5 100644
--- a/components/script/dom/htmltableelement.rs
+++ b/components/script/dom/htmltableelement.rs
@@ -5,7 +5,7 @@
 use std::cell::Cell;
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use style::attr::{AttrValue, LengthOrPercentageOrAuto, parse_unsigned_integer};
 use style::color::AbsoluteColor;
@@ -114,6 +114,7 @@ impl HTMLTableElement {
         atom: &LocalName,
         section: Option<&HTMLTableSectionElement>,
         reference_predicate: P,
+        can_gc: CanGc,
     ) -> ErrorResult
     where
         P: FnMut(&DomRoot<Element>) -> bool,
@@ -124,7 +125,7 @@ impl HTMLTableElement {
             }
         }
 
-        self.delete_first_section_of_type(atom);
+        self.delete_first_section_of_type(atom, can_gc);
 
         let node = self.upcast::<Node>();
 
@@ -132,7 +133,7 @@ impl HTMLTableElement {
             let reference_element = node.child_elements().find(reference_predicate);
             let reference_node = reference_element.as_ref().map(|e| e.upcast());
 
-            node.InsertBefore(section.upcast(), reference_node)?;
+            node.InsertBefore(section.upcast(), reference_node, can_gc)?;
         }
 
         Ok(())
@@ -163,9 +164,9 @@ impl HTMLTableElement {
 
     // https://html.spec.whatwg.org/multipage/#dom-table-deletethead
     // https://html.spec.whatwg.org/multipage/#dom-table-deletetfoot
-    fn delete_first_section_of_type(&self, atom: &LocalName) {
+    fn delete_first_section_of_type(&self, atom: &LocalName, can_gc: CanGc) {
         if let Some(thead) = self.get_first_section_of_type(atom) {
-            thead.upcast::<Node>().remove_self();
+            thead.upcast::<Node>().remove_self(can_gc);
         }
     }
 
@@ -206,12 +207,16 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
     // https://html.spec.whatwg.org/multipage/#dom-table-caption
     fn SetCaption(&self, new_caption: Option<&HTMLTableCaptionElement>) -> Fallible<()> {
         if let Some(ref caption) = self.GetCaption() {
-            caption.upcast::<Node>().remove_self();
+            caption.upcast::<Node>().remove_self(CanGc::note());
         }
 
         if let Some(caption) = new_caption {
             let node = self.upcast::<Node>();
-            node.InsertBefore(caption.upcast(), node.GetFirstChild().as_deref())?;
+            node.InsertBefore(
+                caption.upcast(),
+                node.GetFirstChild().as_deref(),
+                CanGc::note(),
+            )?;
         }
 
         Ok(())
@@ -239,7 +244,7 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
     // https://html.spec.whatwg.org/multipage/#dom-table-deletecaption
     fn DeleteCaption(&self) {
         if let Some(caption) = self.GetCaption() {
-            caption.upcast::<Node>().remove_self();
+            caption.upcast::<Node>().remove_self(CanGc::note());
         }
     }
 
@@ -250,9 +255,12 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
 
     // https://html.spec.whatwg.org/multipage/#dom-table-thead
     fn SetTHead(&self, thead: Option<&HTMLTableSectionElement>) -> ErrorResult {
-        self.set_first_section_of_type(&local_name!("thead"), thead, |n| {
-            !n.is::<HTMLTableCaptionElement>() && !n.is::<HTMLTableColElement>()
-        })
+        self.set_first_section_of_type(
+            &local_name!("thead"),
+            thead,
+            |n| !n.is::<HTMLTableCaptionElement>() && !n.is::<HTMLTableColElement>(),
+            CanGc::note(),
+        )
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-table-createthead
@@ -262,7 +270,7 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
 
     // https://html.spec.whatwg.org/multipage/#dom-table-deletethead
     fn DeleteTHead(&self) {
-        self.delete_first_section_of_type(&local_name!("thead"))
+        self.delete_first_section_of_type(&local_name!("thead"), CanGc::note())
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-table-tfoot
@@ -272,20 +280,25 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
 
     // https://html.spec.whatwg.org/multipage/#dom-table-tfoot
     fn SetTFoot(&self, tfoot: Option<&HTMLTableSectionElement>) -> ErrorResult {
-        self.set_first_section_of_type(&local_name!("tfoot"), tfoot, |n| {
-            if n.is::<HTMLTableCaptionElement>() || n.is::<HTMLTableColElement>() {
-                return false;
-            }
-
-            if n.is::<HTMLTableSectionElement>() {
-                let name = n.local_name();
-                if name == &local_name!("thead") || name == &local_name!("tbody") {
+        self.set_first_section_of_type(
+            &local_name!("tfoot"),
+            tfoot,
+            |n| {
+                if n.is::<HTMLTableCaptionElement>() || n.is::<HTMLTableColElement>() {
                     return false;
                 }
-            }
 
-            true
-        })
+                if n.is::<HTMLTableSectionElement>() {
+                    let name = n.local_name();
+                    if name == &local_name!("thead") || name == &local_name!("tbody") {
+                        return false;
+                    }
+                }
+
+                true
+            },
+            CanGc::note(),
+        )
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-table-createtfoot
@@ -295,7 +308,7 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
 
     // https://html.spec.whatwg.org/multipage/#dom-table-deletetfoot
     fn DeleteTFoot(&self) {
-        self.delete_first_section_of_type(&local_name!("tfoot"))
+        self.delete_first_section_of_type(&local_name!("tfoot"), CanGc::note())
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-table-tbodies
@@ -309,6 +322,7 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
                         element.local_name() == &local_name!("tbody") &&
                         element.upcast::<Node>().GetParentNode().as_deref() == Some(root)
                 },
+                CanGc::note(),
             )
         })
     }
@@ -329,7 +343,7 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
             .find(|n| n.is::<HTMLTableSectionElement>() && n.local_name() == &local_name!("tbody"));
         let reference_element = last_tbody.and_then(|t| t.upcast::<Node>().GetNextSibling());
 
-        node.InsertBefore(tbody.upcast(), reference_element.as_deref())
+        node.InsertBefore(tbody.upcast(), reference_element.as_deref(), can_gc)
             .expect("Insertion failed");
         tbody
     }
@@ -363,16 +377,16 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
             {
                 last_tbody
                     .upcast::<Node>()
-                    .AppendChild(new_row.upcast::<Node>())
+                    .AppendChild(new_row.upcast::<Node>(), can_gc)
                     .expect("InsertRow failed to append first row.");
             } else {
                 let tbody = self.CreateTBody(can_gc);
-                node.AppendChild(tbody.upcast())
+                node.AppendChild(tbody.upcast(), can_gc)
                     .expect("InsertRow failed to append new tbody.");
 
                 tbody
                     .upcast::<Node>()
-                    .AppendChild(new_row.upcast::<Node>())
+                    .AppendChild(new_row.upcast::<Node>(), can_gc)
                     .expect("InsertRow failed to append first row.");
             }
         } else if index == number_of_row_elements as i32 || index == -1 {
@@ -388,7 +402,7 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
 
             last_row_parent
                 .upcast::<Node>()
-                .AppendChild(new_row.upcast::<Node>())
+                .AppendChild(new_row.upcast::<Node>(), can_gc)
                 .expect("InsertRow failed to append last row.");
         } else {
             // insert new row before the index-th row in rows using the same parent
@@ -403,7 +417,11 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
 
             ith_row_parent
                 .upcast::<Node>()
-                .InsertBefore(new_row.upcast::<Node>(), Some(ith_row.upcast::<Node>()))
+                .InsertBefore(
+                    new_row.upcast::<Node>(),
+                    Some(ith_row.upcast::<Node>()),
+                    can_gc,
+                )
                 .expect("InsertRow failed to append row");
         }
 
@@ -434,7 +452,7 @@ impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement {
         }
 
         // Step 3: Otherwise, remove the indexth element in the rows collection from its parent.
-        DomRoot::upcast::<Node>(rows.Item(index as u32).unwrap()).remove_self();
+        DomRoot::upcast::<Node>(rows.Item(index as u32).unwrap()).remove_self(CanGc::note());
 
         Ok(())
     }
@@ -503,8 +521,10 @@ impl VirtualMethods for HTMLTableElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         match *attr.local_name() {
             local_name!("border") => {
                 // According to HTML5 § 14.3.9, invalid values map to 1px.
diff --git a/components/script/dom/htmltablerowelement.rs b/components/script/dom/htmltablerowelement.rs
index 326c8867df0..6c2d502ce88 100644
--- a/components/script/dom/htmltablerowelement.rs
+++ b/components/script/dom/htmltablerowelement.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use style::attr::{AttrValue, LengthOrPercentageOrAuto};
 use style::color::AbsoluteColor;
@@ -93,6 +93,7 @@ impl HTMLTableRowElementMethods<crate::DomTypeHolder> for HTMLTableRowElement {
                     (element.is::<HTMLTableCellElement>()) &&
                         element.upcast::<Node>().GetParentNode().as_deref() == Some(root)
                 },
+                CanGc::note(),
             )
         })
     }
@@ -104,13 +105,19 @@ impl HTMLTableRowElementMethods<crate::DomTypeHolder> for HTMLTableRowElement {
             index,
             || self.Cells(),
             || HTMLTableCellElement::new(local_name!("td"), None, &node.owner_doc(), None, can_gc),
+            can_gc,
         )
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-tr-deletecell
     fn DeleteCell(&self, index: i32) -> ErrorResult {
         let node = self.upcast::<Node>();
-        node.delete_cell_or_row(index, || self.Cells(), |n| n.is::<HTMLTableCellElement>())
+        node.delete_cell_or_row(
+            index,
+            || self.Cells(),
+            |n| n.is::<HTMLTableCellElement>(),
+            CanGc::note(),
+        )
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-tr-rowindex
diff --git a/components/script/dom/htmltablesectionelement.rs b/components/script/dom/htmltablesectionelement.rs
index 4c17e86fa75..60978c64fc1 100644
--- a/components/script/dom/htmltablesectionelement.rs
+++ b/components/script/dom/htmltablesectionelement.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use style::attr::{AttrValue, LengthOrPercentageOrAuto};
 use style::color::AbsoluteColor;
@@ -64,10 +64,15 @@ impl HTMLTableSectionElement {
 impl HTMLTableSectionElementMethods<crate::DomTypeHolder> for HTMLTableSectionElement {
     // https://html.spec.whatwg.org/multipage/#dom-tbody-rows
     fn Rows(&self) -> DomRoot<HTMLCollection> {
-        HTMLCollection::new_with_filter_fn(&self.owner_window(), self.upcast(), |element, root| {
-            element.is::<HTMLTableRowElement>() &&
-                element.upcast::<Node>().GetParentNode().as_deref() == Some(root)
-        })
+        HTMLCollection::new_with_filter_fn(
+            &self.owner_window(),
+            self.upcast(),
+            |element, root| {
+                element.is::<HTMLTableRowElement>() &&
+                    element.upcast::<Node>().GetParentNode().as_deref() == Some(root)
+            },
+            CanGc::note(),
+        )
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-tbody-insertrow
@@ -77,13 +82,19 @@ impl HTMLTableSectionElementMethods<crate::DomTypeHolder> for HTMLTableSectionEl
             index,
             || self.Rows(),
             || HTMLTableRowElement::new(local_name!("tr"), None, &node.owner_doc(), None, can_gc),
+            can_gc,
         )
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-tbody-deleterow
     fn DeleteRow(&self, index: i32) -> ErrorResult {
         let node = self.upcast::<Node>();
-        node.delete_cell_or_row(index, || self.Rows(), |n| n.is::<HTMLTableRowElement>())
+        node.delete_cell_or_row(
+            index,
+            || self.Rows(),
+            |n| n.is::<HTMLTableRowElement>(),
+            CanGc::note(),
+        )
     }
 }
 
diff --git a/components/script/dom/htmltemplateelement.rs b/components/script/dom/htmltemplateelement.rs
index ef577504090..128309b816b 100644
--- a/components/script/dom/htmltemplateelement.rs
+++ b/components/script/dom/htmltemplateelement.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, namespace_url};
+use html5ever::{LocalName, Prefix};
 use js::rust::HandleObject;
 
 use crate::dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
@@ -113,14 +113,14 @@ impl VirtualMethods for HTMLTemplateElement {
     }
 
     /// <https://html.spec.whatwg.org/multipage/#template-adopting-steps>
-    fn adopting_steps(&self, old_doc: &Document) {
-        self.super_type().unwrap().adopting_steps(old_doc);
+    fn adopting_steps(&self, old_doc: &Document, can_gc: CanGc) {
+        self.super_type().unwrap().adopting_steps(old_doc, can_gc);
         // Step 1.
         let doc = self
             .owner_document()
             .appropriate_template_contents_owner_document(CanGc::note());
         // Step 2.
-        Node::adopt(self.Content(CanGc::note()).upcast(), &doc);
+        Node::adopt(self.Content(CanGc::note()).upcast(), &doc, can_gc);
     }
 
     /// <https://html.spec.whatwg.org/multipage/#the-template-element:concept-node-clone-ext>
@@ -129,10 +129,11 @@ impl VirtualMethods for HTMLTemplateElement {
         copy: &Node,
         maybe_doc: Option<&Document>,
         clone_children: CloneChildrenFlag,
+        can_gc: CanGc,
     ) {
         self.super_type()
             .unwrap()
-            .cloning_steps(copy, maybe_doc, clone_children);
+            .cloning_steps(copy, maybe_doc, clone_children, can_gc);
         if clone_children == CloneChildrenFlag::DoNotCloneChildren {
             // Step 1.
             return;
@@ -148,7 +149,7 @@ impl VirtualMethods for HTMLTemplateElement {
                 CloneChildrenFlag::CloneChildren,
                 CanGc::note(),
             );
-            copy_contents.AppendChild(&copy_child).unwrap();
+            copy_contents.AppendChild(&copy_child, can_gc).unwrap();
         }
     }
 }
diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs
index 315ac01ef9a..a7435b40fdd 100644
--- a/components/script/dom/htmltextareaelement.rs
+++ b/components/script/dom/htmltextareaelement.rs
@@ -7,7 +7,7 @@ use std::default::Default;
 use std::ops::Range;
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use style::attr::AttrValue;
 use stylo_dom::ElementState;
@@ -347,7 +347,7 @@ impl HTMLTextAreaElementMethods<crate::DomTypeHolder> for HTMLTextAreaElement {
         }
 
         self.validity_state()
-            .perform_validation_and_update(ValidationFlags::all());
+            .perform_validation_and_update(ValidationFlags::all(), CanGc::note());
         self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
     }
 
@@ -468,8 +468,10 @@ impl VirtualMethods for HTMLTextAreaElement {
         Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
         match *attr.local_name() {
             local_name!("disabled") => {
                 let el = self.upcast::<Element>();
@@ -538,25 +540,25 @@ impl VirtualMethods for HTMLTextAreaElement {
                 }
             },
             local_name!("form") => {
-                self.form_attribute_mutated(mutation);
+                self.form_attribute_mutated(mutation, can_gc);
             },
             _ => {},
         }
 
         self.validity_state()
-            .perform_validation_and_update(ValidationFlags::all());
+            .perform_validation_and_update(ValidationFlags::all(), can_gc);
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
 
         self.upcast::<Element>()
             .check_ancestors_disabled_state_for_form_control();
 
         self.validity_state()
-            .perform_validation_and_update(ValidationFlags::all());
+            .perform_validation_and_update(ValidationFlags::all(), can_gc);
     }
 
     fn parse_plain_attribute(&self, name: &LocalName, value: DOMString) -> AttrValue {
@@ -576,8 +578,8 @@ impl VirtualMethods for HTMLTextAreaElement {
         }
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
-        self.super_type().unwrap().unbind_from_tree(context);
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
+        self.super_type().unwrap().unbind_from_tree(context, can_gc);
 
         let node = self.upcast::<Node>();
         let el = self.upcast::<Element>();
@@ -591,7 +593,7 @@ impl VirtualMethods for HTMLTextAreaElement {
         }
 
         self.validity_state()
-            .perform_validation_and_update(ValidationFlags::all());
+            .perform_validation_and_update(ValidationFlags::all(), can_gc);
     }
 
     // The cloning steps for textarea elements must propagate the raw value
@@ -601,9 +603,10 @@ impl VirtualMethods for HTMLTextAreaElement {
         copy: &Node,
         maybe_doc: Option<&Document>,
         clone_children: CloneChildrenFlag,
+        can_gc: CanGc,
     ) {
         if let Some(s) = self.super_type() {
-            s.cloning_steps(copy, maybe_doc, clone_children);
+            s.cloning_steps(copy, maybe_doc, clone_children, can_gc);
         }
         let el = copy.downcast::<HTMLTextAreaElement>().unwrap();
         el.value_dirty.set(self.value_dirty.get());
@@ -612,7 +615,7 @@ impl VirtualMethods for HTMLTextAreaElement {
             textinput.set_content(self.textinput.borrow().get_content());
         }
         el.validity_state()
-            .perform_validation_and_update(ValidationFlags::all());
+            .perform_validation_and_update(ValidationFlags::all(), can_gc);
     }
 
     fn children_changed(&self, mutation: &ChildrenMutation) {
@@ -625,9 +628,9 @@ impl VirtualMethods for HTMLTextAreaElement {
     }
 
     // copied and modified from htmlinputelement.rs
-    fn handle_event(&self, event: &Event) {
+    fn handle_event(&self, event: &Event, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.handle_event(event);
+            s.handle_event(event, can_gc);
         }
 
         if event.type_() == atom!("click") && !event.DefaultPrevented() {
@@ -691,7 +694,7 @@ impl VirtualMethods for HTMLTextAreaElement {
         }
 
         self.validity_state()
-            .perform_validation_and_update(ValidationFlags::all());
+            .perform_validation_and_update(ValidationFlags::all(), can_gc);
     }
 
     fn pop(&self) {
@@ -735,7 +738,11 @@ impl Validatable for HTMLTextAreaElement {
             !is_barred_by_datalist_ancestor(self.upcast())
     }
 
-    fn perform_validation(&self, validate_flags: ValidationFlags) -> ValidationFlags {
+    fn perform_validation(
+        &self,
+        validate_flags: ValidationFlags,
+        _can_gc: CanGc,
+    ) -> ValidationFlags {
         let mut failed_flags = ValidationFlags::empty();
 
         let textinput = self.textinput.borrow();
diff --git a/components/script/dom/htmltitleelement.rs b/components/script/dom/htmltitleelement.rs
index 6b6b3504e13..33ce749ab6d 100644
--- a/components/script/dom/htmltitleelement.rs
+++ b/components/script/dom/htmltitleelement.rs
@@ -92,9 +92,9 @@ impl VirtualMethods for HTMLTitleElement {
         }
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
         let node = self.upcast::<Node>();
         if context.tree_is_in_a_document_tree {
diff --git a/components/script/dom/htmlvideoelement.rs b/components/script/dom/htmlvideoelement.rs
index 21a2a11888b..c5d21c19d9b 100644
--- a/components/script/dom/htmlvideoelement.rs
+++ b/components/script/dom/htmlvideoelement.rs
@@ -5,9 +5,10 @@
 use std::cell::Cell;
 use std::sync::Arc;
 
+use content_security_policy as csp;
 use dom_struct::dom_struct;
 use euclid::default::Size2D;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use ipc_channel::ipc;
 use js::rust::HandleObject;
 use net_traits::image_cache::{
@@ -232,8 +233,10 @@ impl HTMLVideoElement {
         .credentials_mode(CredentialsMode::Include)
         .use_url_credentials(true)
         .origin(document.origin().immutable().clone())
-        .pipeline_id(Some(document.global().pipeline_id()));
-
+        .pipeline_id(Some(document.global().pipeline_id()))
+        .insecure_requests_policy(document.insecure_requests_policy())
+        .has_trustworthy_ancestor_origin(document.has_trustworthy_ancestor_origin())
+        .policy_container(document.policy_container().to_owned());
         // Step 5.
         // This delay must be independent from the ones created by HTMLMediaElement during
         // its media load algorithm, otherwise a code like
@@ -305,8 +308,10 @@ impl VirtualMethods for HTMLVideoElement {
         Some(self.upcast::<HTMLMediaElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
 
         if attr.local_name() == &local_name!("poster") {
             if let Some(new_value) = mutation.new_value(attr) {
@@ -414,6 +419,11 @@ impl FetchResponseListener for PosterFrameFetchContext {
     fn submit_resource_timing(&mut self) {
         network_listener::submit_timing(self, CanGc::note())
     }
+
+    fn process_csp_violations(&mut self, _request_id: RequestId, violations: Vec<csp::Violation>) {
+        let global = &self.resource_timing_global();
+        global.report_csp_violations(violations, None);
+    }
 }
 
 impl ResourceTimingListener for PosterFrameFetchContext {
diff --git a/components/script/dom/imagedata.rs b/components/script/dom/imagedata.rs
index d49d17d3bf9..a891064952a 100644
--- a/components/script/dom/imagedata.rs
+++ b/components/script/dom/imagedata.rs
@@ -9,13 +9,13 @@ use std::vec::Vec;
 use dom_struct::dom_struct;
 use euclid::default::{Rect, Size2D};
 use ipc_channel::ipc::IpcSharedMemory;
-use js::jsapi::{Heap, JSObject};
+use js::gc::CustomAutoRooterGuard;
+use js::jsapi::JSObject;
 use js::rust::HandleObject;
 use js::typedarray::{ClampedU8, CreateWith, Uint8ClampedArray};
 
-use super::bindings::buffer_source::{
-    BufferSource, HeapBufferSource, HeapTypedArrayInit, new_initialized_heap_buffer_source,
-};
+use super::bindings::buffer_source::{HeapBufferSource, create_heap_buffer_source_with_length};
+use crate::dom::bindings::buffer_source::create_buffer_source;
 use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::ImageDataMethods;
 use crate::dom::bindings::error::{Error, Fallible};
 use crate::dom::bindings::reflector::{Reflector, reflect_dom_object_with_proto};
@@ -41,37 +41,45 @@ impl ImageData {
         mut data: Option<Vec<u8>>,
         can_gc: CanGc,
     ) -> Fallible<DomRoot<ImageData>> {
-        let len = width * height * 4;
+        // The color components of each pixel must be stored in four sequential
+        // elements in the order of red, green, blue, and then alpha.
+        let len = 4u32
+            .checked_mul(width)
+            .and_then(|v| v.checked_mul(height))
+            .ok_or(Error::Range(
+                "The requested image size exceeds the supported range".to_owned(),
+            ))?;
+
         unsafe {
             let cx = GlobalScope::get_cx();
             rooted!(in (*cx) let mut js_object = ptr::null_mut::<JSObject>());
             if let Some(ref mut d) = data {
                 d.resize(len as usize, 0);
+
+                let typed_array =
+                    create_buffer_source::<ClampedU8>(cx, &d[..], js_object.handle_mut(), can_gc)
+                        .map_err(|_| Error::JSFailed)?;
+
                 let data = CreateWith::Slice(&d[..]);
                 Uint8ClampedArray::create(*cx, data, js_object.handle_mut()).unwrap();
-                Self::new_with_jsobject(global, None, width, Some(height), js_object.get(), can_gc)
+                auto_root!(in(*cx) let data = typed_array);
+                Self::new_with_data(global, None, width, Some(height), data, can_gc)
             } else {
-                Self::new_without_jsobject(global, None, width, height, can_gc)
+                Self::new_without_data(global, None, width, height, can_gc)
             }
         }
     }
 
     #[allow(unsafe_code)]
-    fn new_with_jsobject(
+    fn new_with_data(
         global: &GlobalScope,
         proto: Option<HandleObject>,
         width: u32,
         opt_height: Option<u32>,
-        jsobject: *mut JSObject,
+        data: CustomAutoRooterGuard<Uint8ClampedArray>,
         can_gc: CanGc,
     ) -> Fallible<DomRoot<ImageData>> {
-        let heap_typed_array = match new_initialized_heap_buffer_source::<ClampedU8>(
-            HeapTypedArrayInit::Buffer(BufferSource::ArrayBufferView(Heap::boxed(jsobject))),
-            can_gc,
-        ) {
-            Ok(heap_typed_array) => heap_typed_array,
-            Err(_) => return Err(Error::JSFailed),
-        };
+        let heap_typed_array = HeapBufferSource::<ClampedU8>::from_view(data);
 
         let typed_array = match heap_typed_array.get_typed_array() {
             Ok(array) => array,
@@ -109,26 +117,31 @@ impl ImageData {
         ))
     }
 
-    fn new_without_jsobject(
+    fn new_without_data(
         global: &GlobalScope,
         proto: Option<HandleObject>,
         width: u32,
         height: u32,
         can_gc: CanGc,
     ) -> Fallible<DomRoot<ImageData>> {
+        // If one or both of sw and sh are zero, then throw an "IndexSizeError" DOMException.
         if width == 0 || height == 0 {
             return Err(Error::IndexSize);
         }
-        let cx = GlobalScope::get_cx();
-        let len = width * height * 4;
 
-        let heap_typed_array = match new_initialized_heap_buffer_source::<ClampedU8>(
-            HeapTypedArrayInit::Info { len, cx },
-            can_gc,
-        ) {
-            Ok(heap_typed_array) => heap_typed_array,
-            Err(_) => return Err(Error::JSFailed),
-        };
+        // The color components of each pixel must be stored in four sequential
+        // elements in the order of red, green, blue, and then alpha.
+        // Please note when a too-large ImageData is created using a constructor
+        // historically throwns an IndexSizeError, instead of RangeError.
+        let len = 4u32
+            .checked_mul(width)
+            .and_then(|v| v.checked_mul(height))
+            .ok_or(Error::IndexSize)?;
+
+        let cx = GlobalScope::get_cx();
+
+        let heap_typed_array = create_heap_buffer_source_with_length::<ClampedU8>(cx, len, can_gc)?;
+
         let imagedata = Box::new(ImageData {
             reflector_: Reflector::new(),
             width,
@@ -173,7 +186,7 @@ impl ImageData {
 }
 
 impl ImageDataMethods<crate::DomTypeHolder> for ImageData {
-    /// <https://html.spec.whatwg.org/multipage/#pixel-manipulation:dom-imagedata-3>
+    /// <https://html.spec.whatwg.org/multipage/#dom-imagedata>
     fn Constructor(
         global: &GlobalScope,
         proto: Option<HandleObject>,
@@ -181,20 +194,19 @@ impl ImageDataMethods<crate::DomTypeHolder> for ImageData {
         width: u32,
         height: u32,
     ) -> Fallible<DomRoot<Self>> {
-        Self::new_without_jsobject(global, proto, width, height, can_gc)
+        Self::new_without_data(global, proto, width, height, can_gc)
     }
 
-    /// <https://html.spec.whatwg.org/multipage/#pixel-manipulation:dom-imagedata-4>
+    /// <https://html.spec.whatwg.org/multipage/#dom-imagedata-with-data>
     fn Constructor_(
-        _cx: JSContext,
         global: &GlobalScope,
         proto: Option<HandleObject>,
         can_gc: CanGc,
-        jsobject: *mut JSObject,
+        data: CustomAutoRooterGuard<Uint8ClampedArray>,
         width: u32,
         opt_height: Option<u32>,
     ) -> Fallible<DomRoot<Self>> {
-        Self::new_with_jsobject(global, proto, width, opt_height, jsobject, can_gc)
+        Self::new_with_data(global, proto, width, opt_height, data, can_gc)
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-imagedata-width>
diff --git a/components/script/dom/intersectionobserver.rs b/components/script/dom/intersectionobserver.rs
index 81ac8a1337d..6a6f9ce45eb 100644
--- a/components/script/dom/intersectionobserver.rs
+++ b/components/script/dom/intersectionobserver.rs
@@ -444,7 +444,7 @@ impl IntersectionObserver {
                 // > (note that this processing step can only be reached if the document is fully active).
                 // TODO: viewport should consider native scrollbar if exist. Recheck Servo's scrollbar approach.
                 document.map(|document| {
-                    let viewport = document.window().window_size().initial_viewport;
+                    let viewport = document.window().viewport_details().size;
                     Rect::from_size(Size2D::new(
                         Au::from_f32_px(viewport.width),
                         Au::from_f32_px(viewport.height),
@@ -524,11 +524,10 @@ impl IntersectionObserver {
 
         // Step 9
         // > Let targetArea be targetRect’s area.
-        let target_area = target_rect.size.width.0 * target_rect.size.height.0;
-
         // Step 10
         // > Let intersectionArea be intersectionRect’s area.
-        let intersection_area = intersection_rect.size.width.0 * intersection_rect.size.height.0;
+        // These steps are folded in Step 12, rewriting (w1 * h1) / (w2 * h2) as (w1 / w2) * (h1 / h2)
+        // to avoid multiplication overflows.
 
         // Step 11
         // > Let isIntersecting be true if targetRect and rootBounds intersect or are edge-adjacent,
@@ -545,9 +544,12 @@ impl IntersectionObserver {
         // Step 12
         // > If targetArea is non-zero, let intersectionRatio be intersectionArea divided by targetArea.
         // > Otherwise, let intersectionRatio be 1 if isIntersecting is true, or 0 if isIntersecting is false.
-        let intersection_ratio = match target_area {
-            0 => is_intersecting.into(),
-            _ => (intersection_area as f64) / (target_area as f64),
+        let intersection_ratio = if target_rect.size.width.0 == 0 || target_rect.size.height.0 == 0
+        {
+            is_intersecting.into()
+        } else {
+            (intersection_rect.size.width.0 as f64 / target_rect.size.width.0 as f64) *
+                (intersection_rect.size.height.0 as f64 / target_rect.size.height.0 as f64)
         };
 
         // Step 13
diff --git a/components/script/dom/location.rs b/components/script/dom/location.rs
index 3241717fdf8..cbc0566a2e5 100644
--- a/components/script/dom/location.rs
+++ b/components/script/dom/location.rs
@@ -2,9 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use constellation_traits::{LoadData, LoadOrigin, NavigationHistoryBehavior};
 use dom_struct::dom_struct;
 use net_traits::request::Referrer;
-use script_traits::{LoadData, LoadOrigin, NavigationHistoryBehavior};
 use servo_url::{MutableOrigin, ServoUrl};
 
 use crate::dom::bindings::codegen::Bindings::LocationBinding::LocationMethods;
@@ -126,6 +126,7 @@ impl Location {
             referrer_policy,
             None, // Top navigation doesn't inherit secure context
             Some(source_document.insecure_requests_policy()),
+            source_document.has_trustworthy_ancestor_origin(),
         );
         self.window
             .load_url(history_handling, reload_triggered, load_data, can_gc);
diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs
index 7448207ebab..564fe810db0 100644
--- a/components/script/dom/macros.rs
+++ b/components/script/dom/macros.rs
@@ -291,6 +291,26 @@ macro_rules! make_uint_setter(
     };
 );
 
+#[macro_export]
+macro_rules! make_clamped_uint_setter(
+    ($attr:ident, $htmlname:tt, $min:expr, $max:expr, $default:expr) => (
+        fn $attr(&self, value: u32) {
+            use $crate::dom::bindings::inheritance::Castable;
+            use $crate::dom::element::Element;
+            use $crate::dom::values::UNSIGNED_LONG_MAX;
+            use $crate::script_runtime::CanGc;
+            let value = if value > UNSIGNED_LONG_MAX {
+                $default
+            } else {
+                value.clamp($min, $max)
+            };
+
+            let element = self.upcast::<Element>();
+            element.set_uint_attribute(&html5ever::local_name!($htmlname), value, CanGc::note())
+        }
+    );
+);
+
 #[macro_export]
 macro_rules! make_limited_uint_setter(
     ($attr:ident, $htmlname:tt, $default:expr) => (
@@ -503,21 +523,29 @@ macro_rules! global_event_handlers(
     );
     (NoOnload) => (
         event_handler!(abort, GetOnabort, SetOnabort);
+        event_handler!(auxclick, GetOnauxclick, SetOnauxclick);
         event_handler!(animationend, GetOnanimationend, SetOnanimationend);
         event_handler!(animationiteration, GetOnanimationiteration, SetOnanimationiteration);
+        event_handler!(beforeinput, GetOnbeforeinput, SetOnbeforeinput);
+        event_handler!(beforematch, GetOnbeforematch, SetOnbeforematch);
+        event_handler!(beforetoggle, GetOnbeforetoggle, SetOnbeforetoggle);
         event_handler!(cancel, GetOncancel, SetOncancel);
         event_handler!(canplay, GetOncanplay, SetOncanplay);
         event_handler!(canplaythrough, GetOncanplaythrough, SetOncanplaythrough);
         event_handler!(change, GetOnchange, SetOnchange);
         event_handler!(click, GetOnclick, SetOnclick);
         event_handler!(close, GetOnclose, SetOnclose);
+        event_handler!(command, GetOncommand, SetOncommand);
+        event_handler!(contextlost, GetOncontextlost, SetOncontextlost);
         event_handler!(contextmenu, GetOncontextmenu, SetOncontextmenu);
+        event_handler!(contextrestored, GetOncontextrestored, SetOncontextrestored);
+        event_handler!(copy, GetOncopy, SetOncopy);
         event_handler!(cuechange, GetOncuechange, SetOncuechange);
+        event_handler!(cut, GetOncut, SetOncut);
         event_handler!(dblclick, GetOndblclick, SetOndblclick);
         event_handler!(drag, GetOndrag, SetOndrag);
         event_handler!(dragend, GetOndragend, SetOndragend);
         event_handler!(dragenter, GetOndragenter, SetOndragenter);
-        event_handler!(dragexit, GetOndragexit, SetOndragexit);
         event_handler!(dragleave, GetOndragleave, SetOndragleave);
         event_handler!(dragover, GetOndragover, SetOndragover);
         event_handler!(dragstart, GetOndragstart, SetOndragstart);
@@ -541,20 +569,21 @@ macro_rules! global_event_handlers(
         event_handler!(mouseout, GetOnmouseout, SetOnmouseout);
         event_handler!(mouseover, GetOnmouseover, SetOnmouseover);
         event_handler!(mouseup, GetOnmouseup, SetOnmouseup);
-        event_handler!(wheel, GetOnwheel, SetOnwheel);
+        event_handler!(paste, GetOnpaste, SetOnpaste);
         event_handler!(pause, GetOnpause, SetOnpause);
         event_handler!(play, GetOnplay, SetOnplay);
         event_handler!(playing, GetOnplaying, SetOnplaying);
         event_handler!(progress, GetOnprogress, SetOnprogress);
         event_handler!(ratechange, GetOnratechange, SetOnratechange);
         event_handler!(reset, GetOnreset, SetOnreset);
+        event_handler!(scrollend, GetOnscrollend, SetOnscrollend);
         event_handler!(securitypolicyviolation, GetOnsecuritypolicyviolation, SetOnsecuritypolicyviolation);
         event_handler!(seeked, GetOnseeked, SetOnseeked);
         event_handler!(seeking, GetOnseeking, SetOnseeking);
         event_handler!(select, GetOnselect, SetOnselect);
         event_handler!(selectionchange, GetOnselectionchange, SetOnselectionchange);
         event_handler!(selectstart, GetOnselectstart, SetOnselectstart);
-        event_handler!(show, GetOnshow, SetOnshow);
+        event_handler!(slotchange, GetOnslotchange, SetOnslotchange);
         event_handler!(stalled, GetOnstalled, SetOnstalled);
         event_handler!(submit, GetOnsubmit, SetOnsubmit);
         event_handler!(suspend, GetOnsuspend, SetOnsuspend);
@@ -565,6 +594,11 @@ macro_rules! global_event_handlers(
         event_handler!(transitionrun, GetOntransitionrun, SetOntransitionrun);
         event_handler!(volumechange, GetOnvolumechange, SetOnvolumechange);
         event_handler!(waiting, GetOnwaiting, SetOnwaiting);
+        event_handler!(webkitanimationend, GetOnwebkitanimationend, SetOnwebkitanimationend);
+        event_handler!(webkitanimationiteration, GetOnwebkitanimationiteration, SetOnwebkitanimationiteration);
+        event_handler!(webkitanimationstart, GetOnwebkitanimationstart, SetOnwebkitanimationstart);
+        event_handler!(webkittransitionend, GetOnwebkittransitionend, SetOnwebkittransitionend);
+        event_handler!(wheel, GetOnwheel, SetOnwheel);
     )
 );
 
@@ -585,7 +619,9 @@ macro_rules! window_event_handlers(
         event_handler!(offline, GetOnoffline, SetOnoffline);
         event_handler!(online, GetOnonline, SetOnonline);
         event_handler!(pagehide, GetOnpagehide, SetOnpagehide);
+        event_handler!(pagereveal, GetOnpagereveal, SetOnpagereveal);
         event_handler!(pageshow, GetOnpageshow, SetOnpageshow);
+        event_handler!(pageswap, GetOnpageswap, SetOnpageswap);
         event_handler!(popstate, GetOnpopstate, SetOnpopstate);
         event_handler!(rejectionhandled, GetOnrejectionhandled,
                        SetOnrejectionhandled);
@@ -613,7 +649,9 @@ macro_rules! window_event_handlers(
         window_owned_event_handler!(offline, GetOnoffline, SetOnoffline);
         window_owned_event_handler!(online, GetOnonline, SetOnonline);
         window_owned_event_handler!(pagehide, GetOnpagehide, SetOnpagehide);
+        window_owned_event_handler!(pagereveal, GetOnpagereveal, SetOnpagereveal);
         window_owned_event_handler!(pageshow, GetOnpageshow, SetOnpageshow);
+        window_owned_event_handler!(pageswap, GetOnpageswap, SetOnpageswap);
         window_owned_event_handler!(popstate, GetOnpopstate, SetOnpopstate);
         window_owned_event_handler!(rejectionhandled, GetOnrejectionhandled,
                                     SetOnrejectionhandled);
@@ -626,33 +664,6 @@ macro_rules! window_event_handlers(
     );
 );
 
-// https://html.spec.whatwg.org/multipage/#documentandelementeventhandlers
-// see webidls/EventHandler.webidl
-// As more methods get added, just update them here.
-macro_rules! document_and_element_event_handlers(
-    () => (
-        event_handler!(cut, GetOncut, SetOncut);
-        event_handler!(copy, GetOncopy, SetOncopy);
-        event_handler!(paste, GetOnpaste, SetOnpaste);
-    )
-);
-
-#[macro_export]
-macro_rules! rooted_vec {
-    (let mut $name:ident) => {
-        let mut root = $crate::dom::bindings::trace::RootableVec::new_unrooted();
-        let mut $name = $crate::dom::bindings::trace::RootedVec::new(&mut root);
-    };
-    (let $name:ident <- $iter:expr) => {
-        let mut root = $crate::dom::bindings::trace::RootableVec::new_unrooted();
-        let $name = $crate::dom::bindings::trace::RootedVec::from_iter(&mut root, $iter);
-    };
-    (let mut $name:ident <- $iter:expr) => {
-        let mut root = $crate::dom::bindings::trace::RootableVec::new_unrooted();
-        let mut $name = $crate::dom::bindings::trace::RootedVec::from_iter(&mut root, $iter);
-    };
-}
-
 /// DOM struct implementation for simple interfaces inheriting from PerformanceEntry.
 macro_rules! impl_performance_entry_struct(
     ($binding:ident, $struct:ident, $type:expr) => (
@@ -709,26 +720,3 @@ macro_rules! handle_potential_webgl_error {
         handle_potential_webgl_error!($context, $call, ())
     };
 }
-
-macro_rules! impl_rare_data (
-    ($type:ty) => (
-        fn rare_data(&self) -> Ref<Option<Box<$type>>> {
-            self.rare_data.borrow()
-        }
-
-        #[allow(dead_code)]
-        fn rare_data_mut(&self) -> RefMut<Option<Box<$type>>> {
-            self.rare_data.borrow_mut()
-        }
-
-        fn ensure_rare_data(&self) -> RefMut<Box<$type>> {
-            let mut rare_data = self.rare_data.borrow_mut();
-            if rare_data.is_none() {
-                *rare_data = Some(Default::default());
-            }
-            RefMut::map(rare_data, |rare_data| {
-                rare_data.as_mut().unwrap()
-            })
-        }
-    );
-);
diff --git a/components/script/dom/mediadevices.rs b/components/script/dom/mediadevices.rs
index f2f5a45d09c..78d145103a5 100644
--- a/components/script/dom/mediadevices.rs
+++ b/components/script/dom/mediadevices.rs
@@ -79,7 +79,7 @@ impl MediaDevicesMethods<crate::DomTypeHolder> for MediaDevices {
     /// <https://w3c.github.io/mediacapture-main/#dom-mediadevices-enumeratedevices>
     fn EnumerateDevices(&self, can_gc: CanGc) -> Rc<Promise> {
         // Step 1.
-        let in_realm_proof = AlreadyInRealm::assert();
+        let in_realm_proof = AlreadyInRealm::assert::<crate::DomTypeHolder>();
         let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof), can_gc);
 
         // Step 2.
diff --git a/components/script/dom/medialist.rs b/components/script/dom/medialist.rs
index 45e1fce3a66..2e9395fde97 100644
--- a/components/script/dom/medialist.rs
+++ b/components/script/dom/medialist.rs
@@ -9,7 +9,7 @@ use style::media_queries::{MediaList as StyleMediaList, MediaQuery};
 use style::parser::ParserContext;
 use style::shared_lock::{Locked, SharedRwLock};
 use style::stylesheets::{CssRuleType, Origin, UrlExtraData};
-use style_traits::{ParsingMode, ToCss};
+use style_traits::{ParseError, ParsingMode, ToCss};
 
 use crate::dom::bindings::codegen::Bindings::MediaListBinding::MediaListMethods;
 use crate::dom::bindings::codegen::Bindings::WindowBinding::Window_Binding::WindowMethods;
@@ -59,30 +59,39 @@ impl MediaList {
     fn shared_lock(&self) -> &SharedRwLock {
         &self.parent_stylesheet.style_stylesheet().shared_lock
     }
-}
 
-impl MediaListMethods<crate::DomTypeHolder> for MediaList {
-    /// <https://drafts.csswg.org/cssom/#dom-medialist-mediatext>
-    fn MediaText(&self) -> DOMString {
-        let guard = self.shared_lock().read();
-        DOMString::from(self.media_queries.read_with(&guard).to_css_string())
+    /// <https://drafts.csswg.org/cssom/#parse-a-media-query-list>
+    pub(crate) fn parse_media_list(value: &str, window: &Window) -> StyleMediaList {
+        if value.is_empty() {
+            return StyleMediaList::empty();
+        }
+        let mut input = ParserInput::new(value);
+        let mut parser = Parser::new(&mut input);
+        let url_data = UrlExtraData(window.get_url().get_arc());
+        let quirks_mode = window.Document().quirks_mode();
+        // FIXME(emilio): This looks somewhat fishy, since we use the context
+        // only to parse the media query list, CssRuleType::Media doesn't make
+        // much sense.
+        let context = ParserContext::new(
+            Origin::Author,
+            &url_data,
+            Some(CssRuleType::Media),
+            ParsingMode::DEFAULT,
+            quirks_mode,
+            /* namespaces = */ Default::default(),
+            window.css_error_reporter(),
+            None,
+        );
+        StyleMediaList::parse(&context, &mut parser)
     }
 
-    /// <https://drafts.csswg.org/cssom/#dom-medialist-mediatext>
-    fn SetMediaText(&self, value: DOMString) {
-        let mut guard = self.shared_lock().write();
-        let media_queries = self.media_queries.write_with(&mut guard);
-        // Step 2
-        if value.is_empty() {
-            // Step 1
-            *media_queries = StyleMediaList::empty();
-            return;
-        }
-        // Step 3
-        let mut input = ParserInput::new(&value);
+    /// <https://drafts.csswg.org/cssom/#parse-a-media-query>
+    pub(crate) fn parse_media_query<'i>(
+        value: &'i str,
+        window: &Window,
+    ) -> Result<MediaQuery, ParseError<'i>> {
+        let mut input = ParserInput::new(value);
         let mut parser = Parser::new(&mut input);
-        let global = self.global();
-        let window = global.as_window();
         let url_data = UrlExtraData(window.get_url().get_arc());
         let quirks_mode = window.Document().quirks_mode();
         let context = ParserContext::new(
@@ -95,7 +104,28 @@ impl MediaListMethods<crate::DomTypeHolder> for MediaList {
             window.css_error_reporter(),
             None,
         );
-        *media_queries = StyleMediaList::parse(&context, &mut parser);
+        MediaQuery::parse(&context, &mut parser)
+    }
+
+    pub(crate) fn clone_media_list(&self) -> StyleMediaList {
+        let guard = self.shared_lock().read();
+        self.media_queries.read_with(&guard).clone()
+    }
+}
+
+impl MediaListMethods<crate::DomTypeHolder> for MediaList {
+    /// <https://drafts.csswg.org/cssom/#dom-medialist-mediatext>
+    fn MediaText(&self) -> DOMString {
+        let guard = self.shared_lock().read();
+        DOMString::from(self.media_queries.read_with(&guard).to_css_string())
+    }
+
+    /// <https://drafts.csswg.org/cssom/#dom-medialist-mediatext>
+    fn SetMediaText(&self, value: DOMString) {
+        let global = self.global();
+        let mut guard = self.shared_lock().write();
+        let media_queries = self.media_queries.write_with(&mut guard);
+        *media_queries = Self::parse_media_list(&value, global.as_window());
     }
 
     // https://drafts.csswg.org/cssom/#dom-medialist-length
@@ -122,23 +152,8 @@ impl MediaListMethods<crate::DomTypeHolder> for MediaList {
     /// <https://drafts.csswg.org/cssom/#dom-medialist-appendmedium>
     fn AppendMedium(&self, medium: DOMString) {
         // Step 1
-        let mut input = ParserInput::new(&medium);
-        let mut parser = Parser::new(&mut input);
         let global = self.global();
-        let win = global.as_window();
-        let url_data = UrlExtraData(win.get_url().get_arc());
-        let quirks_mode = win.Document().quirks_mode();
-        let context = ParserContext::new(
-            Origin::Author,
-            &url_data,
-            Some(CssRuleType::Media),
-            ParsingMode::DEFAULT,
-            quirks_mode,
-            /* namespaces = */ Default::default(),
-            win.css_error_reporter(),
-            None,
-        );
-        let m = MediaQuery::parse(&context, &mut parser);
+        let m = Self::parse_media_query(&medium, global.as_window());
         // Step 2
         if m.is_err() {
             return;
@@ -161,23 +176,8 @@ impl MediaListMethods<crate::DomTypeHolder> for MediaList {
     /// <https://drafts.csswg.org/cssom/#dom-medialist-deletemedium>
     fn DeleteMedium(&self, medium: DOMString) {
         // Step 1
-        let mut input = ParserInput::new(&medium);
-        let mut parser = Parser::new(&mut input);
         let global = self.global();
-        let win = global.as_window();
-        let url_data = UrlExtraData(win.get_url().get_arc());
-        let quirks_mode = win.Document().quirks_mode();
-        let context = ParserContext::new(
-            Origin::Author,
-            &url_data,
-            Some(CssRuleType::Media),
-            ParsingMode::DEFAULT,
-            quirks_mode,
-            /* namespaces = */ Default::default(),
-            win.css_error_reporter(),
-            None,
-        );
-        let m = MediaQuery::parse(&context, &mut parser);
+        let m = Self::parse_media_query(&medium, global.as_window());
         // Step 2
         if m.is_err() {
             return;
diff --git a/components/script/dom/mediasession.rs b/components/script/dom/mediasession.rs
index fe5604daf85..2d3b44dec7e 100644
--- a/components/script/dom/mediasession.rs
+++ b/components/script/dom/mediasession.rs
@@ -4,11 +4,11 @@
 
 use std::rc::Rc;
 
+use constellation_traits::ScriptToConstellationMessage;
 use dom_struct::dom_struct;
 use embedder_traits::{
     MediaMetadata as EmbedderMediaMetadata, MediaSessionActionType, MediaSessionEvent,
 };
-use script_traits::ScriptMsg;
 
 use super::bindings::trace::HashMapTracedValues;
 use crate::conversions::Convert;
@@ -106,7 +106,10 @@ impl MediaSession {
         let global = self.global();
         let window = global.as_window();
         let pipeline_id = window.pipeline_id();
-        window.send_to_constellation(ScriptMsg::MediaSessionEvent(pipeline_id, event));
+        window.send_to_constellation(ScriptToConstellationMessage::MediaSessionEvent(
+            pipeline_id,
+            event,
+        ));
     }
 
     pub(crate) fn update_title(&self, title: String) {
diff --git a/components/script/dom/messageport.rs b/components/script/dom/messageport.rs
index f10ba10383e..d9cd6c50768 100644
--- a/components/script/dom/messageport.rs
+++ b/components/script/dom/messageport.rs
@@ -4,30 +4,32 @@
 
 use std::cell::{Cell, RefCell};
 use std::collections::HashMap;
-use std::num::NonZeroU32;
+use std::ptr;
 use std::rc::Rc;
 
-use base::id::{MessagePortId, MessagePortIndex, PipelineNamespaceId};
+use base::id::{MessagePortId, MessagePortIndex};
+use constellation_traits::{MessagePortImpl, PortMessageTask};
 use dom_struct::dom_struct;
-use js::jsapi::{Heap, JSObject};
+use js::jsapi::{Heap, JS_NewObject, JSObject};
+use js::jsval::UndefinedValue;
 use js::rust::{CustomAutoRooter, CustomAutoRooterGuard, HandleValue};
-use script_traits::PortMessageTask;
-use script_traits::transferable::MessagePortImpl;
 
 use crate::dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
 use crate::dom::bindings::codegen::Bindings::MessagePortBinding::{
     MessagePortMethods, StructuredSerializeOptions,
 };
 use crate::dom::bindings::conversions::root_from_object;
-use crate::dom::bindings::error::{Error, ErrorResult};
+use crate::dom::bindings::error::{Error, ErrorResult, ErrorToJsval};
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object};
 use crate::dom::bindings::root::DomRoot;
-use crate::dom::bindings::structuredclone::{self, StructuredData, StructuredDataReader};
+use crate::dom::bindings::structuredclone::{self, StructuredData};
 use crate::dom::bindings::trace::RootedTraceableBox;
-use crate::dom::bindings::transferable::{ExtractComponents, IdFromComponents, Transferable};
+use crate::dom::bindings::transferable::Transferable;
+use crate::dom::bindings::utils::set_dictionary_property;
 use crate::dom::eventtarget::EventTarget;
 use crate::dom::globalscope::GlobalScope;
+use crate::js::conversions::ToJSValConvertible;
 use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
 
 #[dom_struct]
@@ -58,7 +60,7 @@ impl MessagePort {
     }
 
     /// Create a new port for an incoming transfer-received one.
-    fn new_transferred(
+    pub(crate) fn new_transferred(
         owner: &GlobalScope,
         transferred_port: MessagePortId,
         entangled_port: Option<MessagePortId>,
@@ -81,6 +83,20 @@ impl MessagePort {
         *self.entangled_port.borrow_mut() = Some(other_id);
     }
 
+    /// <https://html.spec.whatwg.org/multipage/#disentangle>
+    pub(crate) fn disentangle(&self) -> Option<MessagePortId> {
+        // Disentangle initiatorPort and otherPort, so that they are no longer entangled or associated with each other.
+        // Note: called from `disentangle_port` in the global, where the rest happens.
+        self.entangled_port.borrow_mut().take()
+    }
+
+    /// Has the port been disentangled?
+    /// Used when starting the port to fire the `close` event,
+    /// to cover the case of a disentanglement while in transfer.
+    pub(crate) fn disentangled(&self) -> bool {
+        self.entangled_port.borrow().is_none()
+    }
+
     pub(crate) fn message_port_id(&self) -> &MessagePortId {
         &self.message_port_id
     }
@@ -120,7 +136,7 @@ impl MessagePort {
         for port in ports {
             // Step 2
             if port.message_port_id() == self.message_port_id() {
-                return Err(Error::DataClone);
+                return Err(Error::DataClone(None));
             }
 
             // Step 4
@@ -157,10 +173,86 @@ impl MessagePort {
             .post_messageport_msg(*self.message_port_id(), task);
         Ok(())
     }
+
+    /// <https://streams.spec.whatwg.org/#abstract-opdef-crossrealmtransformsenderror>
+    pub(crate) fn cross_realm_transform_send_error(&self, error: HandleValue, can_gc: CanGc) {
+        // Perform PackAndPostMessage(port, "error", error),
+        // discarding the result.
+        let _ = self.pack_and_post_message("error", error, can_gc);
+    }
+
+    /// <https://streams.spec.whatwg.org/#abstract-opdef-packandpostmessagehandlingerror>
+    #[allow(unsafe_code)]
+    pub(crate) fn pack_and_post_message_handling_error(
+        &self,
+        type_: &str,
+        value: HandleValue,
+        can_gc: CanGc,
+    ) -> ErrorResult {
+        // Let result be PackAndPostMessage(port, type, value).
+        let result = self.pack_and_post_message(type_, value, can_gc);
+
+        // If result is an abrupt completion,
+        if let Err(error) = result.as_ref() {
+            // Perform ! CrossRealmTransformSendError(port, result.[[Value]]).
+            let cx = GlobalScope::get_cx();
+            rooted!(in(*cx) let mut rooted_error = UndefinedValue());
+            error
+                .clone()
+                .to_jsval(cx, &self.global(), rooted_error.handle_mut(), can_gc);
+            self.cross_realm_transform_send_error(rooted_error.handle(), can_gc);
+        }
+
+        result
+    }
+
+    /// <https://streams.spec.whatwg.org/#abstract-opdef-packandpostmessage>
+    #[allow(unsafe_code)]
+    pub(crate) fn pack_and_post_message(
+        &self,
+        type_: &str,
+        value: HandleValue,
+        _can_gc: CanGc,
+    ) -> ErrorResult {
+        let cx = GlobalScope::get_cx();
+
+        // Let message be OrdinaryObjectCreate(null).
+        rooted!(in(*cx) let mut message = unsafe { JS_NewObject(*cx, ptr::null()) });
+        rooted!(in(*cx) let mut type_string = UndefinedValue());
+        unsafe {
+            type_.to_jsval(*cx, type_string.handle_mut());
+        }
+
+        // Perform ! CreateDataProperty(message, "type", type).
+        unsafe {
+            set_dictionary_property(*cx, message.handle(), "type", type_string.handle())
+                .expect("Setting the message type should not fail.");
+        }
+
+        // Perform ! CreateDataProperty(message, "value", value).
+        unsafe {
+            set_dictionary_property(*cx, message.handle(), "value", value)
+                .expect("Setting the message value should not fail.");
+        }
+
+        // Let targetPort be the port with which port is entangled, if any; otherwise let it be null.
+        // Done in `global.post_messageport_msg`.
+
+        // Let options be «[ "transfer" → « » ]».
+        let mut rooted = CustomAutoRooter::new(vec![]);
+        let transfer = CustomAutoRooterGuard::new(*cx, &mut rooted);
+
+        // Run the message port post message steps providing targetPort, message, and options.
+        rooted!(in(*cx) let mut message_val = UndefinedValue());
+        unsafe {
+            message.to_jsval(*cx, message_val.handle_mut());
+        }
+        self.post_message_impl(cx, message_val.handle(), transfer)
+    }
 }
 
 impl Transferable for MessagePort {
-    type Id = MessagePortId;
+    type Index = MessagePortIndex;
     type Data = MessagePortImpl;
 
     /// <https://html.spec.whatwg.org/multipage/#message-ports:transfer-steps>
@@ -190,31 +282,14 @@ impl Transferable for MessagePort {
         Ok(transferred_port)
     }
 
-    fn serialized_storage(data: StructuredData<'_>) -> &mut Option<HashMap<Self::Id, Self::Data>> {
+    fn serialized_storage<'a>(
+        data: StructuredData<'a, '_>,
+    ) -> &'a mut Option<HashMap<MessagePortId, Self::Data>> {
         match data {
             StructuredData::Reader(r) => &mut r.port_impls,
             StructuredData::Writer(w) => &mut w.ports,
         }
     }
-
-    fn deserialized_storage(reader: &mut StructuredDataReader) -> &mut Option<Vec<DomRoot<Self>>> {
-        &mut reader.message_ports
-    }
-}
-
-impl IdFromComponents for MessagePortId {
-    fn from(namespace_id: PipelineNamespaceId, index: NonZeroU32) -> MessagePortId {
-        MessagePortId {
-            namespace_id,
-            index: MessagePortIndex(index),
-        }
-    }
-}
-
-impl ExtractComponents for MessagePortId {
-    fn components(&self) -> (PipelineNamespaceId, NonZeroU32) {
-        (self.namespace_id, self.index.0)
-    }
 }
 
 impl MessagePortMethods<crate::DomTypeHolder> for MessagePort {
@@ -253,20 +328,24 @@ impl MessagePortMethods<crate::DomTypeHolder> for MessagePort {
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-messageport-start>
-    fn Start(&self) {
+    fn Start(&self, can_gc: CanGc) {
         if self.detached.get() {
             return;
         }
-        self.global().start_message_port(self.message_port_id());
+        self.global()
+            .start_message_port(self.message_port_id(), can_gc);
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-messageport-close>
-    fn Close(&self) {
-        if self.detached.get() {
-            return;
-        }
+    fn Close(&self, can_gc: CanGc) {
+        // Set this's [[Detached]] internal slot value to true.
         self.detached.set(true);
-        self.global().close_message_port(self.message_port_id());
+
+        let global = self.global();
+        global.close_message_port(self.message_port_id());
+
+        // If this is entangled, disentangle it.
+        global.disentangle_port(self, can_gc);
     }
 
     /// <https://html.spec.whatwg.org/multipage/#handler-messageport-onmessage>
@@ -279,15 +358,19 @@ impl MessagePortMethods<crate::DomTypeHolder> for MessagePort {
     }
 
     /// <https://html.spec.whatwg.org/multipage/#handler-messageport-onmessage>
-    fn SetOnmessage(&self, listener: Option<Rc<EventHandlerNonNull>>) {
+    fn SetOnmessage(&self, listener: Option<Rc<EventHandlerNonNull>>, can_gc: CanGc) {
         if self.detached.get() {
             return;
         }
         self.set_onmessage(listener);
         // Note: we cannot use the event_handler macro, due to the need to start the port.
-        self.global().start_message_port(self.message_port_id());
+        self.global()
+            .start_message_port(self.message_port_id(), can_gc);
     }
 
     // <https://html.spec.whatwg.org/multipage/#handler-messageport-onmessageerror>
     event_handler!(messageerror, GetOnmessageerror, SetOnmessageerror);
+
+    // <https://html.spec.whatwg.org/multipage/#handler-messageport-onclose>
+    event_handler!(close, GetOnclose, SetOnclose);
 }
diff --git a/components/script/dom/mod.rs b/components/script/dom/mod.rs
index fbf35b28479..3189416de4c 100644
--- a/components/script/dom/mod.rs
+++ b/components/script/dom/mod.rs
@@ -205,8 +205,9 @@
 #[macro_use]
 pub(crate) mod macros;
 
+#[allow(unused_imports)]
 pub(crate) mod types {
-    include!(concat!(env!("BINDINGS_OUT_DIR"), "/InterfaceTypes.rs"));
+    include!(concat!(env!("OUT_DIR"), "/InterfaceTypes.rs"));
 }
 
 pub(crate) mod abortcontroller;
@@ -249,7 +250,9 @@ pub(crate) mod channelmergernode;
 pub(crate) mod channelsplitternode;
 pub(crate) mod characterdata;
 pub(crate) mod client;
+pub(crate) mod clipboard;
 pub(crate) mod clipboardevent;
+pub(crate) mod clipboarditem;
 pub(crate) mod closeevent;
 pub(crate) mod comment;
 pub(crate) mod compositionevent;
@@ -270,6 +273,7 @@ pub(crate) mod csslayerblockrule;
 pub(crate) mod csslayerstatementrule;
 pub(crate) mod cssmediarule;
 pub(crate) mod cssnamespacerule;
+pub(crate) mod cssnesteddeclarations;
 pub(crate) mod cssrule;
 pub(crate) mod cssrulelist;
 pub(crate) mod cssstyledeclaration;
@@ -544,6 +548,7 @@ pub(crate) mod submitevent;
 pub(crate) mod subtlecrypto;
 pub(crate) mod svgelement;
 pub(crate) mod svggraphicselement;
+pub(crate) mod svgimageelement;
 pub(crate) mod svgsvgelement;
 pub(crate) mod testbinding;
 pub(crate) mod testbindingiterable;
@@ -554,6 +559,7 @@ pub(crate) mod testbindingproxy;
 pub(crate) mod testbindingsetlikewithinterface;
 pub(crate) mod testbindingsetlikewithprimitive;
 pub(crate) mod testns;
+pub(crate) mod testutils;
 pub(crate) mod testworklet;
 pub(crate) mod testworkletglobalscope;
 pub(crate) mod text;
@@ -573,10 +579,16 @@ pub(crate) mod touchlist;
 pub(crate) mod trackevent;
 pub(crate) mod transitionevent;
 pub(crate) mod treewalker;
+pub(crate) mod trustedhtml;
+pub(crate) mod trustedscript;
+pub(crate) mod trustedscripturl;
+pub(crate) mod trustedtypepolicy;
+pub(crate) mod trustedtypepolicyfactory;
 pub(crate) mod uievent;
 pub(crate) mod underlyingsourcecontainer;
 pub(crate) mod url;
 pub(crate) mod urlhelper;
+pub(crate) mod urlpattern;
 pub(crate) mod urlsearchparams;
 pub(crate) mod userscripts;
 pub(crate) mod validation;
@@ -621,6 +633,8 @@ pub(crate) mod webgpu;
 pub(crate) use self::webgpu::*;
 #[cfg(not(feature = "webgpu"))]
 pub(crate) mod gpucanvascontext;
+pub(crate) mod transformstream;
+pub(crate) mod transformstreamdefaultcontroller;
 pub(crate) mod wheelevent;
 #[allow(dead_code)]
 pub(crate) mod window;
diff --git a/components/script/dom/mouseevent.rs b/components/script/dom/mouseevent.rs
index 00304a6f565..63752e6eb0a 100644
--- a/components/script/dom/mouseevent.rs
+++ b/components/script/dom/mouseevent.rs
@@ -5,8 +5,8 @@
 use std::cell::Cell;
 use std::default::Default;
 
-use constellation_traits::CompositorHitTestResult;
 use dom_struct::dom_struct;
+use embedder_traits::CompositorHitTestResult;
 use euclid::default::Point2D;
 use js::rust::HandleObject;
 use servo_config::pref;
@@ -342,6 +342,9 @@ impl MouseEventMethods<crate::DomTypeHolder> for MouseEvent {
             None,
             can_gc,
         );
+        event
+            .upcast::<Event>()
+            .set_composed(init.parent.parent.parent.composed);
         Ok(event)
     }
 
diff --git a/components/script/dom/mutationobserver.rs b/components/script/dom/mutationobserver.rs
index 558453f9235..473698d5df1 100644
--- a/components/script/dom/mutationobserver.rs
+++ b/components/script/dom/mutationobserver.rs
@@ -6,7 +6,7 @@ use std::cell::LazyCell;
 use std::rc::Rc;
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Namespace, namespace_url, ns};
+use html5ever::{LocalName, Namespace, ns};
 use js::rust::HandleObject;
 
 use crate::dom::bindings::callback::ExceptionHandling;
diff --git a/components/script/dom/namednodemap.rs b/components/script/dom/namednodemap.rs
index 354f598226f..45b7708bd4c 100644
--- a/components/script/dom/namednodemap.rs
+++ b/components/script/dom/namednodemap.rs
@@ -67,7 +67,7 @@ impl NamedNodeMapMethods<crate::DomTypeHolder> for NamedNodeMap {
 
     // https://dom.spec.whatwg.org/#dom-namednodemap-setnameditem
     fn SetNamedItem(&self, attr: &Attr) -> Fallible<Option<DomRoot<Attr>>> {
-        self.owner.SetAttributeNode(attr)
+        self.owner.SetAttributeNode(attr, CanGc::note())
     }
 
     // https://dom.spec.whatwg.org/#dom-namednodemap-setnameditemns
@@ -79,7 +79,7 @@ impl NamedNodeMapMethods<crate::DomTypeHolder> for NamedNodeMap {
     fn RemoveNamedItem(&self, name: DOMString) -> Fallible<DomRoot<Attr>> {
         let name = self.owner.parsed_name(name);
         self.owner
-            .remove_attribute_by_name(&name)
+            .remove_attribute_by_name(&name, CanGc::note())
             .ok_or(Error::NotFound)
     }
 
@@ -91,7 +91,7 @@ impl NamedNodeMapMethods<crate::DomTypeHolder> for NamedNodeMap {
     ) -> Fallible<DomRoot<Attr>> {
         let ns = namespace_from_domstring(namespace);
         self.owner
-            .remove_attribute(&ns, &LocalName::from(local_name))
+            .remove_attribute(&ns, &LocalName::from(local_name), CanGc::note())
             .ok_or(Error::NotFound)
     }
 
diff --git a/components/script/dom/navigator.rs b/components/script/dom/navigator.rs
index 371ab0b1b9f..ee67359f859 100644
--- a/components/script/dom/navigator.rs
+++ b/components/script/dom/navigator.rs
@@ -8,6 +8,7 @@ use std::sync::LazyLock;
 
 use dom_struct::dom_struct;
 use js::rust::MutableHandleValue;
+use servo_config::pref;
 
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::NavigatorBinding::NavigatorMethods;
@@ -18,6 +19,7 @@ use crate::dom::bindings::str::DOMString;
 use crate::dom::bindings::utils::to_frozen_array;
 #[cfg(feature = "bluetooth")]
 use crate::dom::bluetooth::Bluetooth;
+use crate::dom::clipboard::Clipboard;
 use crate::dom::gamepad::Gamepad;
 use crate::dom::gamepadevent::GamepadEventType;
 use crate::dom::mediadevices::MediaDevices;
@@ -56,6 +58,7 @@ pub(crate) struct Navigator {
     gamepads: DomRefCell<Vec<MutNullableDom<Gamepad>>>,
     permissions: MutNullableDom<Permissions>,
     mediasession: MutNullableDom<MediaSession>,
+    clipboard: MutNullableDom<Clipboard>,
     #[cfg(feature = "webgpu")]
     gpu: MutNullableDom<GPU>,
     /// <https://www.w3.org/TR/gamepad/#dfn-hasgamepadgesture>
@@ -78,6 +81,7 @@ impl Navigator {
             gamepads: Default::default(),
             permissions: Default::default(),
             mediasession: Default::default(),
+            clipboard: Default::default(),
             #[cfg(feature = "webgpu")]
             gpu: Default::default(),
             has_gamepad_gesture: Cell::new(false),
@@ -192,7 +196,7 @@ impl NavigatorMethods<crate::DomTypeHolder> for Navigator {
 
     // https://html.spec.whatwg.org/multipage/#dom-navigator-useragent
     fn UserAgent(&self) -> DOMString {
-        navigatorinfo::UserAgent(self.global().get_user_agent())
+        navigatorinfo::UserAgent(&pref!(user_agent))
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-navigator-appversion
@@ -218,6 +222,11 @@ impl NavigatorMethods<crate::DomTypeHolder> for Navigator {
         to_frozen_array(&[self.Language()], cx, retval, can_gc)
     }
 
+    /// <https://html.spec.whatwg.org/multipage/#dom-navigator-online>
+    fn OnLine(&self) -> bool {
+        true
+    }
+
     // https://html.spec.whatwg.org/multipage/#dom-navigator-plugins
     fn Plugins(&self) -> DomRoot<PluginArray> {
         self.plugins
@@ -305,6 +314,12 @@ impl NavigatorMethods<crate::DomTypeHolder> for Navigator {
         hardware_concurrency()
     }
 
+    /// <https://w3c.github.io/clipboard-apis/#h-navigator-clipboard>
+    fn Clipboard(&self) -> DomRoot<Clipboard> {
+        self.clipboard
+            .or_init(|| Clipboard::new(&self.global(), CanGc::note()))
+    }
+
     /// <https://servo.org/internal-no-spec>
     fn Servo(&self) -> DomRoot<ServoInternals> {
         self.servo_internals
diff --git a/components/script/dom/navigatorinfo.rs b/components/script/dom/navigatorinfo.rs
index 66c2f3658fe..f3e6ddc109b 100644
--- a/components/script/dom/navigatorinfo.rs
+++ b/components/script/dom/navigatorinfo.rs
@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use std::borrow::Cow;
-
 use crate::dom::bindings::str::DOMString;
 
 #[allow(non_snake_case)]
@@ -66,8 +64,8 @@ pub(crate) fn Platform() -> DOMString {
 }
 
 #[allow(non_snake_case)]
-pub(crate) fn UserAgent(user_agent: Cow<'static, str>) -> DOMString {
-    DOMString::from(&*user_agent)
+pub(crate) fn UserAgent(user_agent: &str) -> DOMString {
+    DOMString::from(user_agent)
 }
 
 #[allow(non_snake_case)]
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index ee76fdf3b08..5f08abce354 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -7,6 +7,7 @@
 use std::borrow::Cow;
 use std::cell::{Cell, LazyCell, UnsafeCell};
 use std::default::Default;
+use std::f64::consts::PI;
 use std::ops::Range;
 use std::slice::from_ref;
 use std::sync::Arc as StdArc;
@@ -15,19 +16,18 @@ use std::{cmp, fmt, iter};
 use app_units::Au;
 use base::id::{BrowsingContextId, PipelineId};
 use bitflags::bitflags;
-use constellation_traits::{
-    UntrustedNodeAddress, UntrustedNodeAddress as CompositorUntrustedNodeAddress,
-};
 use devtools_traits::NodeInfo;
 use dom_struct::dom_struct;
+use embedder_traits::UntrustedNodeAddress;
 use euclid::default::{Rect, Size2D, Vector2D};
 use html5ever::serialize::HtmlSerializer;
-use html5ever::{Namespace, Prefix, QualName, namespace_url, ns, serialize as html_serialize};
+use html5ever::{Namespace, Prefix, QualName, ns, serialize as html_serialize};
 use js::jsapi::JSObject;
 use js::rust::HandleObject;
 use libc::{self, c_void, uintptr_t};
 use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
 use pixels::{Image, ImageMetadata};
+use script_bindings::codegen::InheritTypes::DocumentFragmentTypeId;
 use script_layout_interface::{
     GenericLayoutData, HTMLCanvasData, HTMLMediaData, LayoutElementType, LayoutNodeType, QueryMsg,
     SVGSVGData, StyleData, TrustedNodeAddress,
@@ -71,7 +71,6 @@ use crate::dom::bindings::codegen::Bindings::ShadowRootBinding::{
     ShadowRootMode, SlotAssignmentMode,
 };
 use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
-use crate::dom::bindings::codegen::InheritTypes::DocumentFragmentTypeId;
 use crate::dom::bindings::codegen::UnionTypes::NodeOrString;
 use crate::dom::bindings::conversions::{self, DerivedFrom};
 use crate::dom::bindings::error::{Error, ErrorResult, Fallible};
@@ -105,13 +104,13 @@ use crate::dom::htmlslotelement::{HTMLSlotElement, Slottable};
 use crate::dom::htmlstyleelement::HTMLStyleElement;
 use crate::dom::htmltextareaelement::{HTMLTextAreaElement, LayoutHTMLTextAreaElementHelpers};
 use crate::dom::htmlvideoelement::{HTMLVideoElement, LayoutHTMLVideoElementHelpers};
-use crate::dom::mouseevent::MouseEvent;
 use crate::dom::mutationobserver::{Mutation, MutationObserver, RegisteredObserver};
 use crate::dom::nodelist::NodeList;
+use crate::dom::pointerevent::{PointerEvent, PointerId};
 use crate::dom::processinginstruction::ProcessingInstruction;
 use crate::dom::range::WeakRangeVec;
 use crate::dom::raredata::NodeRareData;
-use crate::dom::servoparser::serialize_html_fragment;
+use crate::dom::servoparser::{ServoParser, serialize_html_fragment};
 use crate::dom::shadowroot::{IsUserAgentWidget, LayoutShadowRootHelpers, ShadowRoot};
 use crate::dom::stylesheetlist::StyleSheetListOwner;
 use crate::dom::svgsvgelement::{LayoutSVGSVGElementHelpers, SVGSVGElement};
@@ -168,7 +167,6 @@ pub struct Node {
 
     /// Layout data for this node. This is populated during layout and can
     /// be used for incremental relayout and script queries.
-    #[ignore_malloc_size_of = "trait object"]
     #[no_trace]
     layout_data: DomRefCell<Option<Box<GenericLayoutData>>>,
 }
@@ -248,7 +246,7 @@ impl Node {
     /// Adds a new child to the end of this node's list of children.
     ///
     /// Fails unless `new_child` is disconnected from the tree.
-    fn add_child(&self, new_child: &Node, before: Option<&Node>) {
+    fn add_child(&self, new_child: &Node, before: Option<&Node>, can_gc: CanGc) {
         assert!(new_child.parent_node.get().is_none());
         assert!(new_child.prev_sibling.get().is_none());
         assert!(new_child.next_sibling.get().is_none());
@@ -307,14 +305,45 @@ impl Node {
 
             // Out-of-document elements never have the descendants flag set.
             debug_assert!(!node.get_flag(NodeFlags::HAS_DIRTY_DESCENDANTS));
-            vtable_for(&node).bind_to_tree(&BindContext {
-                tree_connected: parent_is_connected,
-                tree_is_in_a_document_tree: parent_is_in_a_document_tree,
-                tree_is_in_a_shadow_tree: parent_in_shadow_tree,
-            });
+            vtable_for(&node).bind_to_tree(
+                &BindContext {
+                    tree_connected: parent_is_connected,
+                    tree_is_in_a_document_tree: parent_is_in_a_document_tree,
+                    tree_is_in_a_shadow_tree: parent_in_shadow_tree,
+                },
+                can_gc,
+            );
         }
     }
 
+    /// Implements the "unsafely set HTML" algorithm as specified in:
+    /// <https://html.spec.whatwg.org/multipage/#concept-unsafely-set-html>
+    pub fn unsafely_set_html(
+        target: &Node,
+        context_element: &Element,
+        html: DOMString,
+        can_gc: CanGc,
+    ) {
+        // Step 1. Let newChildren be the result of the HTML fragment parsing algorithm.
+        let new_children = ServoParser::parse_html_fragment(context_element, html, true, can_gc);
+
+        // Step 2. Let fragment be a new DocumentFragment whose node document is contextElement's node document.
+
+        let context_document = context_element.owner_document();
+        let fragment = DocumentFragment::new(&context_document, can_gc);
+
+        // Step 3. For each node in newChildren, append node to fragment.
+        for child in new_children {
+            fragment
+                .upcast::<Node>()
+                .AppendChild(&child, can_gc)
+                .unwrap();
+        }
+
+        // Step 4. Replace all with fragment within target.
+        Node::replace_all(Some(fragment.upcast()), target, can_gc);
+    }
+
     pub(crate) fn clean_up_style_and_layout_data(&self) {
         self.owner_doc().cancel_animations_for_node(self);
         self.style_data.borrow_mut().take();
@@ -323,7 +352,7 @@ impl Node {
 
     /// Clean up flags and runs steps 11-14 of remove a node.
     /// <https://dom.spec.whatwg.org/#concept-node-remove>
-    pub(crate) fn complete_remove_subtree(root: &Node, context: &UnbindContext) {
+    pub(crate) fn complete_remove_subtree(root: &Node, context: &UnbindContext, can_gc: CanGc) {
         // Flags that reset when a node is disconnected
         const RESET_FLAGS: NodeFlags = NodeFlags::IS_IN_A_DOCUMENT_TREE
             .union(NodeFlags::IS_CONNECTED)
@@ -356,7 +385,7 @@ impl Node {
             // This needs to be in its own loop, because unbind_from_tree may
             // rely on the state of IS_IN_DOC of the context node's descendants,
             // e.g. when removing a <form>.
-            vtable_for(&node).unbind_from_tree(context);
+            vtable_for(&node).unbind_from_tree(context, can_gc);
 
             // Step 12 & 14.2. Enqueue disconnected custom element reactions.
             if is_parent_connected {
@@ -374,7 +403,7 @@ impl Node {
     /// Removes the given child from this node's list of children.
     ///
     /// Fails unless `child` is a child of this node.
-    fn remove_child(&self, child: &Node, cached_index: Option<u32>) {
+    fn remove_child(&self, child: &Node, cached_index: Option<u32>, can_gc: CanGc) {
         assert!(child.parent_node.get().as_deref() == Some(self));
         self.note_dirty_descendants();
 
@@ -413,7 +442,7 @@ impl Node {
         child.parent_node.set(None);
         self.children_count.set(self.children_count.get() - 1);
 
-        Self::complete_remove_subtree(child, &context);
+        Self::complete_remove_subtree(child, &context, can_gc);
     }
 
     pub(crate) fn to_untrusted_node_address(&self) -> UntrustedNodeAddress {
@@ -435,43 +464,59 @@ impl Node {
         })
     }
 
-    /// <https://html.spec.whatg.org/#fire_a_synthetic_mouse_event>
-    pub(crate) fn fire_synthetic_mouse_event_not_trusted(&self, name: DOMString, can_gc: CanGc) {
-        // Spec says the choice of which global to create
-        // the mouse event on is not well-defined,
+    /// <https://html.spec.whatwg.org/multipage/#fire-a-synthetic-pointer-event>
+    pub(crate) fn fire_synthetic_pointer_event_not_trusted(&self, name: DOMString, can_gc: CanGc) {
+        // Spec says the choice of which global to create the pointer event
+        // on is not well-defined,
         // and refers to heycam/webidl#135
-        let win = self.owner_window();
+        let window = self.owner_window();
 
-        let mouse_event = MouseEvent::new(
-            &win, // ambiguous in spec
+        // <https://w3c.github.io/pointerevents/#the-click-auxclick-and-contextmenu-events>
+        let pointer_event = PointerEvent::new(
+            &window, // ambiguous in spec
             name,
-            EventBubbles::Bubbles,       // Step 3: bubbles
-            EventCancelable::Cancelable, // Step 3: cancelable,
-            Some(&win),                  // Step 7: view (this is unambiguous in spec)
-            0,                           // detail uninitialized
-            0,                           // coordinates uninitialized
-            0,                           // coordinates uninitialized
-            0,                           // coordinates uninitialized
-            0,                           // coordinates uninitialized
-            false,
-            false,
-            false,
-            false, // Step 6 modifier keys TODO compositor hook needed
-            0,     // button uninitialized (and therefore left)
-            0,     // buttons uninitialized (and therefore none)
-            None,  // related_target uninitialized,
-            None,  // point_in_target uninitialized,
+            EventBubbles::Bubbles,              // Step 3: bubbles
+            EventCancelable::Cancelable,        // Step 3: cancelable
+            Some(&window),                      // Step 7: view
+            0,                                  // detail uninitialized
+            0,                                  // coordinates uninitialized
+            0,                                  // coordinates uninitialized
+            0,                                  // coordinates uninitialized
+            0,                                  // coordinates uninitialized
+            false,                              // ctrl_key
+            false,                              // alt_key
+            false,                              // shift_key
+            false,                              // meta_key
+            0,                                  // button, left mouse button
+            0,                                  // buttons
+            None,                               // related_target
+            None,                               // point_in_target
+            PointerId::NonPointerDevice as i32, // pointer_id
+            1,                                  // width
+            1,                                  // height
+            0.5,                                // pressure
+            0.0,                                // tangential_pressure
+            0,                                  // tilt_x
+            0,                                  // tilt_y
+            0,                                  // twist
+            PI / 2.0,                           // altitude_angle
+            0.0,                                // azimuth_angle
+            DOMString::from(""),                // pointer_type
+            false,                              // is_primary
+            vec![],                             // coalesced_events
+            vec![],                             // predicted_events
             can_gc,
         );
 
-        // Step 4: TODO composed flag for shadow root
+        // Step 4. Set event's composed flag.
+        pointer_event.upcast::<Event>().set_composed(true);
 
-        // Step 5
-        mouse_event.upcast::<Event>().set_trusted(false);
+        // Step 5. If the not trusted flag is set, initialize event's isTrusted attribute to false.
+        pointer_event.upcast::<Event>().set_trusted(false);
 
-        // Step 8: TODO keyboard modifiers
+        // Step 6,8. TODO keyboard modifiers
 
-        mouse_event
+        pointer_event
             .upcast::<Event>()
             .dispatch(self.upcast::<EventTarget>(), false, can_gc);
     }
@@ -547,7 +592,17 @@ impl Iterator for QuerySelectorIterator {
 }
 
 impl Node {
-    impl_rare_data!(NodeRareData);
+    fn rare_data(&self) -> Ref<Option<Box<NodeRareData>>> {
+        self.rare_data.borrow()
+    }
+
+    fn ensure_rare_data(&self) -> RefMut<Box<NodeRareData>> {
+        let mut rare_data = self.rare_data.borrow_mut();
+        if rare_data.is_none() {
+            *rare_data = Some(Default::default());
+        }
+        RefMut::map(rare_data, |rare_data| rare_data.as_mut().unwrap())
+    }
 
     /// Returns true if this node is before `other` in the same connected DOM
     /// tree.
@@ -958,7 +1013,7 @@ impl Node {
         };
 
         // Step 6.
-        Node::pre_insert(&node, &parent, viable_previous_sibling.as_deref())?;
+        Node::pre_insert(&node, &parent, viable_previous_sibling.as_deref(), can_gc)?;
 
         Ok(())
     }
@@ -983,32 +1038,33 @@ impl Node {
             .node_from_nodes_and_strings(nodes, can_gc)?;
 
         // Step 5.
-        Node::pre_insert(&node, &parent, viable_next_sibling.as_deref())?;
+        Node::pre_insert(&node, &parent, viable_next_sibling.as_deref(), can_gc)?;
 
         Ok(())
     }
 
     /// <https://dom.spec.whatwg.org/#dom-childnode-replacewith>
     pub(crate) fn replace_with(&self, nodes: Vec<NodeOrString>, can_gc: CanGc) -> ErrorResult {
-        // Step 1.
-        let parent = if let Some(parent) = self.GetParentNode() {
-            parent
-        } else {
-            // Step 2.
+        // Step 1. Let parent be this’s parent.
+        let Some(parent) = self.GetParentNode() else {
+            // Step 2. If parent is null, then return.
             return Ok(());
         };
-        // Step 3.
+
+        // Step 3. Let viableNextSibling be this’s first following sibling not in nodes; otherwise null.
         let viable_next_sibling = first_node_not_in(self.following_siblings(), &nodes);
-        // Step 4.
+
+        // Step 4. Let node be the result of converting nodes into a node, given nodes and this’s node document.
         let node = self
             .owner_doc()
             .node_from_nodes_and_strings(nodes, can_gc)?;
+
         if self.parent_node == Some(&*parent) {
-            // Step 5.
-            parent.ReplaceChild(&node, self)?;
+            // Step 5. If this’s parent is parent, replace this with node within parent.
+            parent.ReplaceChild(&node, self, can_gc)?;
         } else {
-            // Step 6.
-            Node::pre_insert(&node, &parent, viable_next_sibling.as_deref())?;
+            // Step 6. Otherwise, pre-insert node into parent before viableNextSibling.
+            Node::pre_insert(&node, &parent, viable_next_sibling.as_deref(), can_gc)?;
         }
         Ok(())
     }
@@ -1020,7 +1076,7 @@ impl Node {
         let node = doc.node_from_nodes_and_strings(nodes, can_gc)?;
         // Step 2.
         let first_child = self.first_child.get();
-        Node::pre_insert(&node, self, first_child.as_deref()).map(|_| ())
+        Node::pre_insert(&node, self, first_child.as_deref(), can_gc).map(|_| ())
     }
 
     /// <https://dom.spec.whatwg.org/#dom-parentnode-append>
@@ -1029,7 +1085,7 @@ impl Node {
         let doc = self.owner_doc();
         let node = doc.node_from_nodes_and_strings(nodes, can_gc)?;
         // Step 2.
-        self.AppendChild(&node).map(|_| ())
+        self.AppendChild(&node, can_gc).map(|_| ())
     }
 
     /// <https://dom.spec.whatwg.org/#dom-parentnode-replacechildren>
@@ -1040,7 +1096,7 @@ impl Node {
         // Step 2.
         Node::ensure_pre_insertion_validity(&node, self, None)?;
         // Step 3.
-        Node::replace_all(Some(&node), self);
+        Node::replace_all(Some(&node), self, can_gc);
         Ok(())
     }
 
@@ -1185,9 +1241,9 @@ impl Node {
             .peekable()
     }
 
-    pub(crate) fn remove_self(&self) {
+    pub(crate) fn remove_self(&self, can_gc: CanGc) {
         if let Some(ref parent) = self.GetParentNode() {
-            Node::remove(self, parent, SuppressObserver::Unsuppressed);
+            Node::remove(self, parent, SuppressObserver::Unsuppressed, can_gc);
         }
     }
 
@@ -1208,7 +1264,7 @@ impl Node {
             .to_string()
     }
 
-    pub(crate) fn summarize(&self) -> NodeInfo {
+    pub(crate) fn summarize(&self, can_gc: CanGc) -> NodeInfo {
         let USVString(base_uri) = self.BaseURI();
         let node_type = self.NodeType();
 
@@ -1228,9 +1284,9 @@ impl Node {
 
         let num_children = if is_shadow_host {
             // Shadow roots count as children
-            self.ChildNodes().Length() as usize + 1
+            self.ChildNodes(can_gc).Length() as usize + 1
         } else {
-            self.ChildNodes().Length() as usize
+            self.ChildNodes(can_gc).Length() as usize
         };
 
         let window = self.owner_window();
@@ -1255,6 +1311,21 @@ impl Node {
             is_shadow_host,
             shadow_root_mode,
             display,
+            doctype_name: self
+                .downcast::<DocumentType>()
+                .map(DocumentType::name)
+                .cloned()
+                .map(String::from),
+            doctype_public_identifier: self
+                .downcast::<DocumentType>()
+                .map(DocumentType::public_id)
+                .cloned()
+                .map(String::from),
+            doctype_system_identifier: self
+                .downcast::<DocumentType>()
+                .map(DocumentType::system_id)
+                .cloned()
+                .map(String::from),
         }
     }
 
@@ -1264,6 +1335,7 @@ impl Node {
         index: i32,
         get_items: F,
         new_child: G,
+        can_gc: CanGc,
     ) -> Fallible<DomRoot<HTMLElement>>
     where
         F: Fn() -> DomRoot<HTMLCollection>,
@@ -1279,7 +1351,7 @@ impl Node {
         {
             let tr_node = tr.upcast::<Node>();
             if index == -1 {
-                self.InsertBefore(tr_node, None)?;
+                self.InsertBefore(tr_node, None, can_gc)?;
             } else {
                 let items = get_items();
                 let node = match items
@@ -1292,7 +1364,7 @@ impl Node {
                     None => return Err(Error::IndexSize),
                     Some(node) => node,
                 };
-                self.InsertBefore(tr_node, node.as_deref())?;
+                self.InsertBefore(tr_node, node.as_deref(), can_gc)?;
             }
         }
 
@@ -1305,6 +1377,7 @@ impl Node {
         index: i32,
         get_items: F,
         is_delete_type: G,
+        can_gc: CanGc,
     ) -> ErrorResult
     where
         F: Fn() -> DomRoot<HTMLCollection>,
@@ -1329,7 +1402,7 @@ impl Node {
             },
         };
 
-        element.upcast::<Node>().remove_self();
+        element.upcast::<Node>().remove_self(can_gc);
         Ok(())
     }
 
@@ -1347,7 +1420,7 @@ impl Node {
         if let Some(node) = self.downcast::<HTMLStyleElement>() {
             node.get_cssom_stylesheet()
         } else if let Some(node) = self.downcast::<HTMLLinkElement>() {
-            node.get_cssom_stylesheet()
+            node.get_cssom_stylesheet(CanGc::note())
         } else {
             None
         }
@@ -1491,15 +1564,6 @@ pub(crate) unsafe fn from_untrusted_node_address(candidate: UntrustedNodeAddress
     DomRoot::from_ref(Node::from_untrusted_node_address(candidate))
 }
 
-/// If the given untrusted node address represents a valid DOM node in the given runtime,
-/// returns it.
-#[allow(unsafe_code)]
-pub(crate) unsafe fn from_untrusted_compositor_node_address(
-    candidate: CompositorUntrustedNodeAddress,
-) -> DomRoot<Node> {
-    DomRoot::from_ref(Node::from_untrusted_compositor_node_address(candidate))
-}
-
 #[allow(unsafe_code)]
 pub(crate) trait LayoutNodeHelpers<'dom> {
     fn type_id_for_layout(self) -> NodeTypeId;
@@ -2046,7 +2110,7 @@ impl Node {
     }
 
     /// <https://dom.spec.whatwg.org/#concept-node-adopt>
-    pub(crate) fn adopt(node: &Node, document: &Document) {
+    pub(crate) fn adopt(node: &Node, document: &Document, can_gc: CanGc) {
         document.add_script_and_layout_blocker();
 
         // Step 1. Let oldDocument be node’s node document.
@@ -2054,7 +2118,7 @@ impl Node {
         old_doc.add_script_and_layout_blocker();
 
         // Step 2. If node’s parent is non-null, then remove node.
-        node.remove_self();
+        node.remove_self(can_gc);
 
         // Step 3. If document is not oldDocument:
         if &*old_doc != document {
@@ -2089,7 +2153,7 @@ impl Node {
             // Step 3.3 For each inclusiveDescendant in node’s shadow-including inclusive descendants,
             // in shadow-including tree order, run the adopting steps with inclusiveDescendant and oldDocument.
             for descendant in node.traverse_preorder(ShadowIncluding::Yes) {
-                vtable_for(&descendant).adopting_steps(&old_doc);
+                vtable_for(&descendant).adopting_steps(&old_doc, can_gc);
             }
         }
 
@@ -2220,6 +2284,7 @@ impl Node {
         node: &Node,
         parent: &Node,
         child: Option<&Node>,
+        can_gc: CanGc,
     ) -> Fallible<DomRoot<Node>> {
         // Step 1.
         Node::ensure_pre_insertion_validity(node, parent, child)?;
@@ -2235,17 +2300,15 @@ impl Node {
         };
 
         // Step 4.
-        Node::adopt(node, &parent.owner_document());
-
-        // Step 5.
         Node::insert(
             node,
             parent,
             reference_child,
             SuppressObserver::Unsuppressed,
+            can_gc,
         );
 
-        // Step 6.
+        // Step 5.
         Ok(DomRoot::from_ref(node))
     }
 
@@ -2255,50 +2318,66 @@ impl Node {
         parent: &Node,
         child: Option<&Node>,
         suppress_observers: SuppressObserver,
+        can_gc: CanGc,
     ) {
-        node.owner_doc().add_script_and_layout_blocker();
-        debug_assert!(*node.owner_doc() == *parent.owner_doc());
         debug_assert!(child.is_none_or(|child| Some(parent) == child.GetParentNode().as_deref()));
 
-        // Step 1.
-        let count = if node.is::<DocumentFragment>() {
-            node.children_count()
-        } else {
-            1
-        };
-        // Step 2.
-        if let Some(child) = child {
-            if !parent.ranges_is_empty() {
-                let index = child.index();
-                // Steps 2.1-2.
-                parent.ranges().increase_above(parent, index, count);
-            }
-        }
+        // Step 1. Let nodes be node’s children, if node is a DocumentFragment node; otherwise « node ».
         rooted_vec!(let mut new_nodes);
         let new_nodes = if let NodeTypeId::DocumentFragment(_) = node.type_id() {
-            // Step 3.
-            new_nodes.extend(node.children().map(|kid| Dom::from_ref(&*kid)));
-            // Step 4.
-            for kid in &*new_nodes {
-                Node::remove(kid, node, SuppressObserver::Suppressed);
-            }
-            // Step 5.
-            vtable_for(node).children_changed(&ChildrenMutation::replace_all(new_nodes.r(), &[]));
+            new_nodes.extend(node.children().map(|node| Dom::from_ref(&*node)));
+            new_nodes.r()
+        } else {
+            from_ref(&node)
+        };
 
+        // Step 2. Let count be nodes’s size.
+        let count = new_nodes.len();
+
+        // Step 3. If count is 0, then return.
+        if count == 0 {
+            return;
+        }
+
+        // Script and layout blockers must be added after any early return.
+        // `node.owner_doc()` may change during the algorithm.
+        let parent_document = parent.owner_doc();
+        let from_document = node.owner_doc();
+        from_document.add_script_and_layout_blocker();
+        parent_document.add_script_and_layout_blocker();
+
+        // Step 4. If node is a DocumentFragment node:
+        if let NodeTypeId::DocumentFragment(_) = node.type_id() {
+            // Step 4.1. Remove its children with the suppress observers flag set.
+            for kid in new_nodes {
+                Node::remove(kid, node, SuppressObserver::Suppressed, can_gc);
+            }
+            vtable_for(node).children_changed(&ChildrenMutation::replace_all(new_nodes, &[]));
+
+            // Step 4.2. Queue a tree mutation record for node with « », nodes, null, and null.
             let mutation = LazyCell::new(|| Mutation::ChildList {
                 added: None,
-                removed: Some(new_nodes.r()),
+                removed: Some(new_nodes),
                 prev: None,
                 next: None,
             });
             MutationObserver::queue_a_mutation_record(node, mutation);
+        }
 
-            new_nodes.r()
-        } else {
-            // Step 3.
-            from_ref(&node)
-        };
-        // Step 6.
+        // Step 5. If child is non-null:
+        //     1. For each live range whose start node is parent and start offset is
+        //        greater than child’s index, increase its start offset by count.
+        //     2. For each live range whose end node is parent and end offset is
+        //        greater than child’s index, increase its end offset by count.
+        if let Some(child) = child {
+            if !parent.ranges_is_empty() {
+                parent
+                    .ranges()
+                    .increase_above(parent, child.index(), count.try_into().unwrap());
+            }
+        }
+
+        // Step 6. Let previousSibling be child’s previous sibling or parent’s last child if child is null.
         let previous_sibling = match suppress_observers {
             SuppressObserver::Unsuppressed => match child {
                 Some(child) => child.GetPreviousSibling(),
@@ -2306,10 +2385,15 @@ impl Node {
             },
             SuppressObserver::Suppressed => None,
         };
-        // Step 7.
+
+        // Step 7. For each node in nodes, in tree order:
         for kid in new_nodes {
-            // Step 7.1.
-            parent.add_child(kid, child);
+            // Step 7.1. Adopt node into parent’s node document.
+            Node::adopt(kid, &parent.owner_document(), can_gc);
+
+            // Step 7.2. If child is null, then append node to parent’s children.
+            // Step 7.3. Otherwise, insert node into parent’s children before child’s index.
+            parent.add_child(kid, child, can_gc);
 
             // Step 7.4 If parent is a shadow host whose shadow root’s slot assignment is "named"
             // and node is a slottable, then assign a slot for node.
@@ -2337,12 +2421,17 @@ impl Node {
             kid.GetRootNode(&GetRootNodeOptions::empty())
                 .assign_slottables_for_a_tree();
 
-            // Step 7.7.
+            // Step 7.7. For each shadow-including inclusive descendant inclusiveDescendant of node,
+            // in shadow-including tree order:
             for descendant in kid
                 .traverse_preorder(ShadowIncluding::Yes)
                 .filter_map(DomRoot::downcast::<Element>)
             {
+                // Step 7.7.1. Run the insertion steps with inclusiveDescendant.
+                // This is done in `parent.add_child()`.
+
                 // Step 7.7.2, whatwg/dom#833
+                // Enqueue connected reactions for custom elements or try upgrade.
                 if descendant.is_custom() {
                     if descendant.is_connected() {
                         ScriptThread::enqueue_callback_reaction(
@@ -2356,13 +2445,18 @@ impl Node {
                 }
             }
         }
+
         if let SuppressObserver::Unsuppressed = suppress_observers {
+            // Step 9. Run the children changed steps for parent.
+            // TODO(xiaochengh): If we follow the spec and move it out of the if block, some WPT fail. Investigate.
             vtable_for(parent).children_changed(&ChildrenMutation::insert(
                 previous_sibling.as_deref(),
                 new_nodes,
                 child,
             ));
 
+            // Step 8. If suppress observers flag is unset, then queue a tree mutation record for parent
+            // with nodes, « », previousSibling, and child.
             let mutation = LazyCell::new(|| Mutation::ChildList {
                 added: Some(new_nodes),
                 removed: None,
@@ -2395,7 +2489,7 @@ impl Node {
         // 2) post_connection_steps from Node::insert,
         // we use a delayed task that will run as soon as Node::insert removes its
         // script/layout blocker.
-        node.owner_doc().add_delayed_task(task!(PostConnectionSteps: move || {
+        parent_document.add_delayed_task(task!(PostConnectionSteps: move || {
             // Step 12. For each node of staticNodeList, if node is connected, then run the
             //          post-connection steps with node.
             for node in static_node_list.iter().map(Trusted::root).filter(|n| n.is_connected()) {
@@ -2403,15 +2497,16 @@ impl Node {
             }
         }));
 
-        node.owner_doc().remove_script_and_layout_blocker();
+        parent_document.remove_script_and_layout_blocker();
+        from_document.remove_script_and_layout_blocker();
     }
 
     /// <https://dom.spec.whatwg.org/#concept-node-replace-all>
-    pub(crate) fn replace_all(node: Option<&Node>, parent: &Node) {
+    pub(crate) fn replace_all(node: Option<&Node>, parent: &Node, can_gc: CanGc) {
         parent.owner_doc().add_script_and_layout_blocker();
         // Step 1.
         if let Some(node) = node {
-            Node::adopt(node, &parent.owner_doc());
+            Node::adopt(node, &parent.owner_doc(), can_gc);
         }
         // Step 2.
         rooted_vec!(let removed_nodes <- parent.children().map(|c| DomRoot::as_traced(&c)));
@@ -2429,11 +2524,11 @@ impl Node {
         };
         // Step 4.
         for child in &*removed_nodes {
-            Node::remove(child, parent, SuppressObserver::Suppressed);
+            Node::remove(child, parent, SuppressObserver::Suppressed, can_gc);
         }
         // Step 5.
         if let Some(node) = node {
-            Node::insert(node, parent, None, SuppressObserver::Suppressed);
+            Node::insert(node, parent, None, SuppressObserver::Suppressed, can_gc);
         }
         // Step 6.
         vtable_for(parent).children_changed(&ChildrenMutation::replace_all(
@@ -2456,15 +2551,15 @@ impl Node {
     /// <https://dom.spec.whatwg.org/multipage/#string-replace-all>
     pub(crate) fn string_replace_all(string: DOMString, parent: &Node, can_gc: CanGc) {
         if string.len() == 0 {
-            Node::replace_all(None, parent);
+            Node::replace_all(None, parent, can_gc);
         } else {
             let text = Text::new(string, &parent.owner_document(), can_gc);
-            Node::replace_all(Some(text.upcast::<Node>()), parent);
+            Node::replace_all(Some(text.upcast::<Node>()), parent, can_gc);
         };
     }
 
     /// <https://dom.spec.whatwg.org/#concept-node-pre-remove>
-    fn pre_remove(child: &Node, parent: &Node) -> Fallible<DomRoot<Node>> {
+    fn pre_remove(child: &Node, parent: &Node, can_gc: CanGc) -> Fallible<DomRoot<Node>> {
         // Step 1.
         match child.GetParentNode() {
             Some(ref node) if &**node != parent => return Err(Error::NotFound),
@@ -2473,14 +2568,14 @@ impl Node {
         }
 
         // Step 2.
-        Node::remove(child, parent, SuppressObserver::Unsuppressed);
+        Node::remove(child, parent, SuppressObserver::Unsuppressed, can_gc);
 
         // Step 3.
         Ok(DomRoot::from_ref(child))
     }
 
     /// <https://dom.spec.whatwg.org/#concept-node-remove>
-    fn remove(node: &Node, parent: &Node, suppress_observers: SuppressObserver) {
+    fn remove(node: &Node, parent: &Node, suppress_observers: SuppressObserver, can_gc: CanGc) {
         parent.owner_doc().add_script_and_layout_blocker();
 
         // Step 2.
@@ -2517,7 +2612,7 @@ impl Node {
 
         // Step 7. Remove node from its parent's children.
         // Step 11-14. Run removing steps and enqueue disconnected custom element reactions for the subtree.
-        parent.remove_child(node, cached_index);
+        parent.remove_child(node, cached_index, can_gc);
 
         // Step 8. If node is assigned, then run assign slottables for node’s assigned slot.
         if let Some(slot) = node.assigned_slot() {
@@ -2647,6 +2742,7 @@ impl Node {
                     false,
                     document.allow_declarative_shadow_roots(),
                     Some(document.insecure_requests_policy()),
+                    document.has_trustworthy_ancestor_or_current_origin(),
                     can_gc,
                 );
                 DomRoot::upcast::<Node>(document)
@@ -2707,14 +2803,14 @@ impl Node {
 
         // Step 5: Run any cloning steps defined for node in other applicable specifications and pass copy,
         // node, document, and the clone children flag if set, as parameters.
-        vtable_for(node).cloning_steps(&copy, maybe_doc, clone_children);
+        vtable_for(node).cloning_steps(&copy, maybe_doc, clone_children, can_gc);
 
         // Step 6. If the clone children flag is set, then for each child child of node, in tree order: append the
         // result of cloning child with document and the clone children flag set, to copy.
         if clone_children == CloneChildrenFlag::CloneChildren {
             for child in node.children() {
                 let child_copy = Node::clone(&child, Some(&document), clone_children, can_gc);
-                let _inserted_node = Node::pre_insert(&child_copy, &copy, None);
+                let _inserted_node = Node::pre_insert(&child_copy, &copy, None, can_gc);
             }
         }
 
@@ -2757,8 +2853,12 @@ impl Node {
                     );
 
                     // TODO: Should we handle the error case here and in step 6?
-                    let _inserted_node =
-                        Node::pre_insert(&child_copy, copy_shadow_root.upcast::<Node>(), None);
+                    let _inserted_node = Node::pre_insert(
+                        &child_copy,
+                        copy_shadow_root.upcast::<Node>(),
+                        None,
+                        can_gc,
+                    );
                 }
             }
         }
@@ -2841,26 +2941,6 @@ impl Node {
         &*(conversions::private_from_object(object) as *const Self)
     }
 
-    /// If the given untrusted node address represents a valid DOM node in the given runtime,
-    /// returns it.
-    ///
-    /// # Safety
-    ///
-    /// Callers should ensure they pass a [`CompositorUntrustedNodeAddress`] that points
-    /// to a valid [`JSObject`] in memory that represents a [`Node`].
-    #[allow(unsafe_code)]
-    pub(crate) unsafe fn from_untrusted_compositor_node_address(
-        candidate: CompositorUntrustedNodeAddress,
-    ) -> &'static Self {
-        // https://github.com/servo/servo/issues/6383
-        let candidate = candidate.0 as usize;
-        let object = candidate as *mut JSObject;
-        if object.is_null() {
-            panic!("Attempted to create a `Node` from an invalid pointer!")
-        }
-        &*(conversions::private_from_object(object) as *const Self)
-    }
-
     pub(crate) fn html_serialize(
         &self,
         traversal_scope: html_serialize::TraversalScope,
@@ -3029,12 +3109,16 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
     }
 
     /// <https://dom.spec.whatwg.org/#dom-node-childnodes>
-    fn ChildNodes(&self) -> DomRoot<NodeList> {
-        self.ensure_rare_data().child_list.or_init(|| {
-            let doc = self.owner_doc();
-            let window = doc.window();
-            NodeList::new_child_list(window, self, CanGc::note())
-        })
+    fn ChildNodes(&self, can_gc: CanGc) -> DomRoot<NodeList> {
+        if let Some(list) = self.ensure_rare_data().child_list.get() {
+            return list;
+        }
+
+        let doc = self.owner_doc();
+        let window = doc.window();
+        let list = NodeList::new_child_list(window, self, can_gc);
+        self.ensure_rare_data().child_list.set(Some(&list));
+        list
     }
 
     /// <https://dom.spec.whatwg.org/#dom-node-firstchild>
@@ -3069,11 +3153,11 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
     }
 
     /// <https://dom.spec.whatwg.org/#dom-node-nodevalue>
-    fn SetNodeValue(&self, val: Option<DOMString>) {
+    fn SetNodeValue(&self, val: Option<DOMString>, can_gc: CanGc) {
         match self.type_id() {
             NodeTypeId::Attr => {
                 let attr = self.downcast::<Attr>().unwrap();
-                attr.SetValue(val.unwrap_or_default());
+                attr.SetValue(val.unwrap_or_default(), can_gc);
             },
             NodeTypeId::CharacterData(_) => {
                 let character_data = self.downcast::<CharacterData>().unwrap();
@@ -3115,11 +3199,11 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
                 };
 
                 // Step 3.
-                Node::replace_all(node.as_deref(), self);
+                Node::replace_all(node.as_deref(), self, can_gc);
             },
             NodeTypeId::Attr => {
                 let attr = self.downcast::<Attr>().unwrap();
-                attr.SetValue(value);
+                attr.SetValue(value, can_gc);
             },
             NodeTypeId::CharacterData(..) => {
                 let characterdata = self.downcast::<CharacterData>().unwrap();
@@ -3130,35 +3214,45 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
     }
 
     /// <https://dom.spec.whatwg.org/#dom-node-insertbefore>
-    fn InsertBefore(&self, node: &Node, child: Option<&Node>) -> Fallible<DomRoot<Node>> {
-        Node::pre_insert(node, self, child)
+    fn InsertBefore(
+        &self,
+        node: &Node,
+        child: Option<&Node>,
+        can_gc: CanGc,
+    ) -> Fallible<DomRoot<Node>> {
+        Node::pre_insert(node, self, child, can_gc)
     }
 
     /// <https://dom.spec.whatwg.org/#dom-node-appendchild>
-    fn AppendChild(&self, node: &Node) -> Fallible<DomRoot<Node>> {
-        Node::pre_insert(node, self, None)
+    fn AppendChild(&self, node: &Node, can_gc: CanGc) -> Fallible<DomRoot<Node>> {
+        Node::pre_insert(node, self, None, can_gc)
     }
 
     /// <https://dom.spec.whatwg.org/#concept-node-replace>
-    fn ReplaceChild(&self, node: &Node, child: &Node) -> Fallible<DomRoot<Node>> {
-        // Step 1.
+    fn ReplaceChild(&self, node: &Node, child: &Node, can_gc: CanGc) -> Fallible<DomRoot<Node>> {
+        // Step 1. If parent is not a Document, DocumentFragment, or Element node,
+        // then throw a "HierarchyRequestError" DOMException.
         match self.type_id() {
             NodeTypeId::Document(_) | NodeTypeId::DocumentFragment(_) | NodeTypeId::Element(..) => {
             },
             _ => return Err(Error::HierarchyRequest),
         }
 
-        // Step 2.
+        // Step 2. If node is a host-including inclusive ancestor of parent,
+        // then throw a "HierarchyRequestError" DOMException.
         if node.is_inclusive_ancestor_of(self) {
             return Err(Error::HierarchyRequest);
         }
 
-        // Step 3.
+        // Step 3. If child’s parent is not parent, then throw a "NotFoundError" DOMException.
         if !self.is_parent_of(child) {
             return Err(Error::NotFound);
         }
 
-        // Step 4-5.
+        // Step 4. If node is not a DocumentFragment, DocumentType, Element, or CharacterData node,
+        // then throw a "HierarchyRequestError" DOMException.
+        // Step 5. If either node is a Text node and parent is a document,
+        // or node is a doctype and parent is not a document, then throw a "HierarchyRequestError" DOMException.
         match node.type_id() {
             NodeTypeId::CharacterData(CharacterDataTypeId::Text(_)) if self.is::<Document>() => {
                 return Err(Error::HierarchyRequest);
@@ -3170,7 +3264,8 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
             _ => (),
         }
 
-        // Step 6.
+        // Step 6. If parent is a document, and any of the statements below, switched on the interface node implements,
+        // are true, then throw a "HierarchyRequestError" DOMException.
         if self.is::<Document>() {
             match node.type_id() {
                 // Step 6.1
@@ -3224,7 +3319,8 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
             }
         }
 
-        // Step 7-8.
+        // Step 7. Let referenceChild be child’s next sibling.
+        // Step 8. If referenceChild is node, then set referenceChild to node’s next sibling.
         let child_next_sibling = child.GetNextSibling();
         let node_next_sibling = node.GetNextSibling();
         let reference_child = if child_next_sibling.as_deref() == Some(node) {
@@ -3233,22 +3329,28 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
             child_next_sibling.as_deref()
         };
 
-        // Step 9.
+        // Step 9. Let previousSibling be child’s previous sibling.
         let previous_sibling = child.GetPreviousSibling();
 
-        // Step 10.
+        // NOTE: All existing browsers assume that adoption is performed here, which does not follow the DOM spec.
+        // However, if we follow the spec and delay adoption to inside `Node::insert()`, then the mutation records will
+        // be different, and we will fail WPT dom/nodes/MutationObserver-childList.html.
         let document = self.owner_document();
-        Node::adopt(node, &document);
+        Node::adopt(node, &document, can_gc);
 
+        // Step 10. Let removedNodes be the empty set.
+        // Step 11. If child’s parent is non-null:
+        //     1. Set removedNodes to « child ».
+        //     2. Remove child with the suppress observers flag set.
         let removed_child = if node != child {
             // Step 11.
-            Node::remove(child, self, SuppressObserver::Suppressed);
+            Node::remove(child, self, SuppressObserver::Suppressed, can_gc);
             Some(child)
         } else {
             None
         };
 
-        // Step 12.
+        // Step 12. Let nodes be node’s children if node is a DocumentFragment node; otherwise « node ».
         rooted_vec!(let mut nodes);
         let nodes = if node.type_id() ==
             NodeTypeId::DocumentFragment(DocumentFragmentTypeId::DocumentFragment) ||
@@ -3260,16 +3362,24 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
             from_ref(&node)
         };
 
-        // Step 13.
-        Node::insert(node, self, reference_child, SuppressObserver::Suppressed);
+        // Step 13. Insert node into parent before referenceChild with the suppress observers flag set.
+        Node::insert(
+            node,
+            self,
+            reference_child,
+            SuppressObserver::Suppressed,
+            can_gc,
+        );
 
-        // Step 14.
         vtable_for(self).children_changed(&ChildrenMutation::replace(
             previous_sibling.as_deref(),
             &removed_child,
             nodes,
             reference_child,
         ));
+
+        // Step 14. Queue a tree mutation record for parent with nodes, removedNodes,
+        // previousSibling, and referenceChild.
         let removed = removed_child.map(|r| [r]);
         let mutation = LazyCell::new(|| Mutation::ChildList {
             added: Some(nodes),
@@ -3280,24 +3390,24 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
 
         MutationObserver::queue_a_mutation_record(self, mutation);
 
-        // Step 15.
+        // Step 15. Return child.
         Ok(DomRoot::from_ref(child))
     }
 
     /// <https://dom.spec.whatwg.org/#dom-node-removechild>
-    fn RemoveChild(&self, node: &Node) -> Fallible<DomRoot<Node>> {
-        Node::pre_remove(node, self)
+    fn RemoveChild(&self, node: &Node, can_gc: CanGc) -> Fallible<DomRoot<Node>> {
+        Node::pre_remove(node, self, can_gc)
     }
 
     /// <https://dom.spec.whatwg.org/#dom-node-normalize>
-    fn Normalize(&self) {
+    fn Normalize(&self, can_gc: CanGc) {
         let mut children = self.children().enumerate().peekable();
         while let Some((_, node)) = children.next() {
             if let Some(text) = node.downcast::<Text>() {
                 let cdata = text.upcast::<CharacterData>();
                 let mut length = cdata.Length();
                 if length == 0 {
-                    Node::remove(&node, self, SuppressObserver::Unsuppressed);
+                    Node::remove(&node, self, SuppressObserver::Unsuppressed, can_gc);
                     continue;
                 }
                 while children
@@ -3313,10 +3423,10 @@ impl NodeMethods<crate::DomTypeHolder> for Node {
                     let sibling_cdata = sibling.downcast::<CharacterData>().unwrap();
                     length += sibling_cdata.Length();
                     cdata.append_data(&sibling_cdata.data());
-                    Node::remove(&sibling, self, SuppressObserver::Unsuppressed);
+                    Node::remove(&sibling, self, SuppressObserver::Unsuppressed, can_gc);
                 }
             } else {
-                node.Normalize();
+                node.Normalize(can_gc);
             }
         }
     }
@@ -3726,8 +3836,8 @@ impl VirtualMethods for Node {
 
     // This handles the ranges mentioned in steps 2-3 when removing a node.
     /// <https://dom.spec.whatwg.org/#concept-node-remove>
-    fn unbind_from_tree(&self, context: &UnbindContext) {
-        self.super_type().unwrap().unbind_from_tree(context);
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
+        self.super_type().unwrap().unbind_from_tree(context, can_gc);
         if !self.ranges_is_empty() {
             self.ranges().drain_to_parent(context, self);
         }
@@ -4096,6 +4206,9 @@ impl From<ElementTypeIdWrapper> for LayoutElementType {
             ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTextAreaElement) => {
                 LayoutElementType::HTMLTextAreaElement
             },
+            ElementTypeId::SVGElement(SVGElementTypeId::SVGGraphicsElement(
+                SVGGraphicsElementTypeId::SVGImageElement,
+            )) => LayoutElementType::SVGImageElement,
             ElementTypeId::SVGElement(SVGElementTypeId::SVGGraphicsElement(
                 SVGGraphicsElementTypeId::SVGSVGElement,
             )) => LayoutElementType::SVGSVGElement,
diff --git a/components/script/dom/nodelist.rs b/components/script/dom/nodelist.rs
index b349f16a986..1ec2dc3f78b 100644
--- a/components/script/dom/nodelist.rs
+++ b/components/script/dom/nodelist.rs
@@ -175,7 +175,6 @@ impl NodeList {
 #[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
 pub(crate) struct ChildrenList {
     node: Dom<Node>,
-    #[ignore_malloc_size_of = "Defined in rust-mozjs"]
     last_visited: MutNullableDom<Node>,
     last_index: Cell<u32>,
 }
diff --git a/components/script/dom/notification.rs b/components/script/dom/notification.rs
index 0cdf0a74d69..1aecb785475 100644
--- a/components/script/dom/notification.rs
+++ b/components/script/dom/notification.rs
@@ -7,6 +7,7 @@ use std::rc::Rc;
 use std::sync::{Arc, Mutex};
 use std::time::{SystemTime, UNIX_EPOCH};
 
+use content_security_policy as csp;
 use content_security_policy::Destination;
 use dom_struct::dom_struct;
 use embedder_traits::{
@@ -791,6 +792,11 @@ impl FetchResponseListener for ResourceFetchListener {
     fn submit_resource_timing(&mut self) {
         network_listener::submit_timing(self, CanGc::note())
     }
+
+    fn process_csp_violations(&mut self, _request_id: RequestId, violations: Vec<csp::Violation>) {
+        let global = &self.resource_timing_global();
+        global.report_csp_violations(violations, None);
+    }
 }
 
 impl ResourceTimingListener for ResourceFetchListener {
@@ -820,6 +826,8 @@ impl Notification {
             None,
             global.get_referrer(),
             global.insecure_requests_policy(),
+            global.has_trustworthy_ancestor_or_current_origin(),
+            global.policy_container(),
         )
         .origin(global.origin().immutable().clone())
         .pipeline_id(Some(global.pipeline_id()))
diff --git a/components/script/dom/offscreencanvas.rs b/components/script/dom/offscreencanvas.rs
index 0587fbad12b..bceed49ac7d 100644
--- a/components/script/dom/offscreencanvas.rs
+++ b/components/script/dom/offscreencanvas.rs
@@ -6,12 +6,13 @@ use std::cell::Cell;
 
 use dom_struct::dom_struct;
 use euclid::default::Size2D;
-use ipc_channel::ipc::IpcSharedMemory;
 use js::rust::{HandleObject, HandleValue};
+use snapshot::Snapshot;
 
+use crate::canvas_context::{CanvasContext, OffscreenRenderingContext};
 use crate::dom::bindings::cell::{DomRefCell, Ref, ref_filter_map};
 use crate::dom::bindings::codegen::Bindings::OffscreenCanvasBinding::{
-    OffscreenCanvasMethods, OffscreenRenderingContext,
+    OffscreenCanvasMethods, OffscreenRenderingContext as RootedOffscreenRenderingContext,
 };
 use crate::dom::bindings::error::{Error, Fallible};
 use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
@@ -23,20 +24,20 @@ use crate::dom::htmlcanvaselement::HTMLCanvasElement;
 use crate::dom::offscreencanvasrenderingcontext2d::OffscreenCanvasRenderingContext2D;
 use crate::script_runtime::{CanGc, JSContext};
 
-#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
-#[derive(Clone, JSTraceable, MallocSizeOf)]
-pub(crate) enum OffscreenCanvasContext {
-    OffscreenContext2d(Dom<OffscreenCanvasRenderingContext2D>),
-    //WebGL(Dom<WebGLRenderingContext>),
-    //WebGL2(Dom<WebGL2RenderingContext>),
-}
-
+/// <https://html.spec.whatwg.org/multipage/#offscreencanvas>
 #[dom_struct]
 pub(crate) struct OffscreenCanvas {
     eventtarget: EventTarget,
     width: Cell<u64>,
     height: Cell<u64>,
-    context: DomRefCell<Option<OffscreenCanvasContext>>,
+
+    /// Represents both the [bitmap] and the [context mode] of the canvas.
+    ///
+    /// [bitmap]: https://html.spec.whatwg.org/multipage/#offscreencanvas-bitmap
+    /// [context mode]: https://html.spec.whatwg.org/multipage/#offscreencanvas-context-mode
+    context: DomRefCell<Option<OffscreenRenderingContext>>,
+
+    /// <https://html.spec.whatwg.org/multipage/#offscreencanvas-placeholder>
     placeholder: Option<Dom<HTMLCanvasElement>>,
 }
 
@@ -77,32 +78,27 @@ impl OffscreenCanvas {
 
     pub(crate) fn origin_is_clean(&self) -> bool {
         match *self.context.borrow() {
-            Some(OffscreenCanvasContext::OffscreenContext2d(ref context)) => {
-                context.origin_is_clean()
-            },
+            Some(ref context) => context.origin_is_clean(),
             _ => true,
         }
     }
 
-    pub(crate) fn context(&self) -> Option<Ref<OffscreenCanvasContext>> {
+    pub(crate) fn context(&self) -> Option<Ref<OffscreenRenderingContext>> {
         ref_filter_map(self.context.borrow(), |ctx| ctx.as_ref())
     }
 
-    pub(crate) fn fetch_all_data(&self) -> Option<(Option<IpcSharedMemory>, Size2D<u32>)> {
-        let size = self.get_size();
-
-        if size.width == 0 || size.height == 0 {
-            return None;
-        }
-
-        let data = match self.context.borrow().as_ref() {
-            Some(OffscreenCanvasContext::OffscreenContext2d(context)) => {
-                context.get_image_data_as_shared_memory()
+    pub(crate) fn get_image_data(&self) -> Option<Snapshot> {
+        match self.context.borrow().as_ref() {
+            Some(context) => context.get_image_data(),
+            None => {
+                let size = self.get_size();
+                if size.width == 0 || size.height == 0 {
+                    None
+                } else {
+                    Some(Snapshot::cleared(size))
+                }
             },
-            None => None,
-        };
-
-        Some((data, size.to_u32()))
+        }
     }
 
     pub(crate) fn get_or_init_2d_context(
@@ -111,13 +107,13 @@ impl OffscreenCanvas {
     ) -> Option<DomRoot<OffscreenCanvasRenderingContext2D>> {
         if let Some(ctx) = self.context() {
             return match *ctx {
-                OffscreenCanvasContext::OffscreenContext2d(ref ctx) => Some(DomRoot::from_ref(ctx)),
+                OffscreenRenderingContext::Context2d(ref ctx) => Some(DomRoot::from_ref(ctx)),
             };
         }
         let context = OffscreenCanvasRenderingContext2D::new(&self.global(), self, can_gc);
-        *self.context.borrow_mut() = Some(OffscreenCanvasContext::OffscreenContext2d(
-            Dom::from_ref(&*context),
-        ));
+        *self.context.borrow_mut() = Some(OffscreenRenderingContext::Context2d(Dom::from_ref(
+            &*context,
+        )));
         Some(context)
     }
 
@@ -128,23 +124,10 @@ impl OffscreenCanvas {
     pub(crate) fn placeholder(&self) -> Option<&HTMLCanvasElement> {
         self.placeholder.as_deref()
     }
-
-    pub(crate) fn resize(&self, size: Size2D<u64>) {
-        self.width.set(size.width);
-        self.height.set(size.height);
-
-        if let Some(canvas_context) = self.context() {
-            match &*canvas_context {
-                OffscreenCanvasContext::OffscreenContext2d(rendering_context) => {
-                    rendering_context.set_canvas_bitmap_dimensions(self.get_size());
-                },
-            }
-        }
-    }
 }
 
 impl OffscreenCanvasMethods<crate::DomTypeHolder> for OffscreenCanvas {
-    // https://html.spec.whatwg.org/multipage/#dom-offscreencanvas
+    /// <https://html.spec.whatwg.org/multipage/#dom-offscreencanvas>
     fn Constructor(
         global: &GlobalScope,
         proto: Option<HandleObject>,
@@ -156,18 +139,18 @@ impl OffscreenCanvasMethods<crate::DomTypeHolder> for OffscreenCanvas {
         Ok(offscreencanvas)
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-offscreencanvas-getcontext
+    /// <https://html.spec.whatwg.org/multipage/#dom-offscreencanvas-getcontext>
     fn GetContext(
         &self,
         _cx: JSContext,
         id: DOMString,
         _options: HandleValue,
         can_gc: CanGc,
-    ) -> Fallible<Option<OffscreenRenderingContext>> {
+    ) -> Fallible<Option<RootedOffscreenRenderingContext>> {
         match &*id {
             "2d" => Ok(self
                 .get_or_init_2d_context(can_gc)
-                .map(OffscreenRenderingContext::OffscreenCanvasRenderingContext2D)),
+                .map(RootedOffscreenRenderingContext::OffscreenCanvasRenderingContext2D)),
             /*"webgl" | "experimental-webgl" => self
                 .get_or_init_webgl_context(cx, options)
                 .map(OffscreenRenderingContext::WebGLRenderingContext),
@@ -180,21 +163,17 @@ impl OffscreenCanvasMethods<crate::DomTypeHolder> for OffscreenCanvas {
         }
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-offscreencanvas-width
+    /// <https://html.spec.whatwg.org/multipage/#dom-offscreencanvas-width>
     fn Width(&self) -> u64 {
         self.width.get()
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-offscreencanvas-width
+    /// <https://html.spec.whatwg.org/multipage/#dom-offscreencanvas-width>
     fn SetWidth(&self, value: u64, can_gc: CanGc) {
         self.width.set(value);
 
         if let Some(canvas_context) = self.context() {
-            match &*canvas_context {
-                OffscreenCanvasContext::OffscreenContext2d(rendering_context) => {
-                    rendering_context.set_canvas_bitmap_dimensions(self.get_size());
-                },
-            }
+            canvas_context.resize();
         }
 
         if let Some(canvas) = &self.placeholder {
@@ -202,21 +181,17 @@ impl OffscreenCanvasMethods<crate::DomTypeHolder> for OffscreenCanvas {
         }
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-offscreencanvas-height
+    /// <https://html.spec.whatwg.org/multipage/#dom-offscreencanvas-height>
     fn Height(&self) -> u64 {
         self.height.get()
     }
 
-    // https://html.spec.whatwg.org/multipage/#dom-offscreencanvas-height
+    /// <https://html.spec.whatwg.org/multipage/#dom-offscreencanvas-height>
     fn SetHeight(&self, value: u64, can_gc: CanGc) {
         self.height.set(value);
 
         if let Some(canvas_context) = self.context() {
-            match &*canvas_context {
-                OffscreenCanvasContext::OffscreenContext2d(rendering_context) => {
-                    rendering_context.set_canvas_bitmap_dimensions(self.get_size());
-                },
-            }
+            canvas_context.resize();
         }
 
         if let Some(canvas) = &self.placeholder {
diff --git a/components/script/dom/offscreencanvasrenderingcontext2d.rs b/components/script/dom/offscreencanvasrenderingcontext2d.rs
index 731ef6d008a..d7ca0e9dc4d 100644
--- a/components/script/dom/offscreencanvasrenderingcontext2d.rs
+++ b/components/script/dom/offscreencanvasrenderingcontext2d.rs
@@ -3,12 +3,11 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use crate::dom::bindings::codegen::GenericBindings::CanvasRenderingContext2DBinding::CanvasRenderingContext2D_Binding::CanvasRenderingContext2DMethods;
-use crate::canvas_context::CanvasContext as _;
+use crate::canvas_context::CanvasContext;
 use crate::dom::bindings::codegen::UnionTypes::HTMLCanvasElementOrOffscreenCanvas;
 use canvas_traits::canvas::Canvas2dMsg;
 use dom_struct::dom_struct;
-use euclid::default::Size2D;
-use ipc_channel::ipc::IpcSharedMemory;
+use snapshot::Snapshot;
 
 use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::{
     CanvasDirection, CanvasFillRule, CanvasImageSource, CanvasLineCap, CanvasLineJoin,
@@ -64,20 +63,32 @@ impl OffscreenCanvasRenderingContext2D {
         reflect_dom_object(boxed, global, can_gc)
     }
 
-    pub(crate) fn set_canvas_bitmap_dimensions(&self, size: Size2D<u64>) {
-        self.context.set_bitmap_dimensions(size.cast());
-    }
-
     pub(crate) fn send_canvas_2d_msg(&self, msg: Canvas2dMsg) {
         self.context.send_canvas_2d_msg(msg)
     }
+}
 
-    pub(crate) fn origin_is_clean(&self) -> bool {
-        self.context.origin_is_clean()
+impl CanvasContext for OffscreenCanvasRenderingContext2D {
+    type ID = <CanvasRenderingContext2D as CanvasContext>::ID;
+
+    fn context_id(&self) -> Self::ID {
+        self.context.context_id()
     }
 
-    pub(crate) fn get_image_data_as_shared_memory(&self) -> Option<IpcSharedMemory> {
-        self.context.get_image_data_as_shared_memory()
+    fn canvas(&self) -> HTMLCanvasElementOrOffscreenCanvas {
+        self.context.canvas()
+    }
+
+    fn resize(&self) {
+        self.context.resize()
+    }
+
+    fn get_image_data(&self) -> Option<Snapshot> {
+        self.context.get_image_data()
+    }
+
+    fn origin_is_clean(&self) -> bool {
+        self.context.origin_is_clean()
     }
 }
 
@@ -340,6 +351,26 @@ impl OffscreenCanvasRenderingContext2DMethods<crate::DomTypeHolder>
         self.context.SetMiterLimit(limit)
     }
 
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-setlinedash>
+    fn SetLineDash(&self, segments: Vec<f64>) {
+        self.context.SetLineDash(segments)
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-getlinedash>
+    fn GetLineDash(&self) -> Vec<f64> {
+        self.context.GetLineDash()
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-linedashoffset>
+    fn LineDashOffset(&self) -> f64 {
+        self.context.LineDashOffset()
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-linedashoffset>
+    fn SetLineDashOffset(&self, offset: f64) {
+        self.context.SetLineDashOffset(offset)
+    }
+
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata
     fn CreateImageData(&self, sw: i32, sh: i32, can_gc: CanGc) -> Fallible<DomRoot<ImageData>> {
         self.context.CreateImageData(sw, sh, can_gc)
diff --git a/components/script/dom/paintrenderingcontext2d.rs b/components/script/dom/paintrenderingcontext2d.rs
index 0babe77da97..04660e56a6b 100644
--- a/components/script/dom/paintrenderingcontext2d.rs
+++ b/components/script/dom/paintrenderingcontext2d.rs
@@ -430,6 +430,26 @@ impl PaintRenderingContext2DMethods<crate::DomTypeHolder> for PaintRenderingCont
         self.canvas_state.set_miter_limit(limit)
     }
 
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-setlinedash>
+    fn SetLineDash(&self, segments: Vec<f64>) {
+        self.canvas_state.set_line_dash(segments);
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-getlinedash>
+    fn GetLineDash(&self) -> Vec<f64> {
+        self.canvas_state.line_dash()
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-linedashoffset>
+    fn LineDashOffset(&self) -> f64 {
+        self.canvas_state.line_dash_offset()
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-linedashoffset>
+    fn SetLineDashOffset(&self, offset: f64) {
+        self.canvas_state.set_line_dash_offset(offset);
+    }
+
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsetx
     fn ShadowOffsetX(&self) -> f64 {
         self.canvas_state.shadow_offset_x()
diff --git a/components/script/dom/path2d.rs b/components/script/dom/path2d.rs
index c5b6c34a79d..476889cfbbc 100644
--- a/components/script/dom/path2d.rs
+++ b/components/script/dom/path2d.rs
@@ -65,8 +65,14 @@ impl Path2DMethods<crate::DomTypeHolder> for Path2D {
     /// <https://html.spec.whatwg.org/multipage/#dom-path2d-addpath>
     fn AddPath(&self, other: &Path2D) {
         // Step 7. Add all the subpaths in c to a.
-        let mut dest = self.path.borrow_mut();
-        dest.extend(other.path.borrow().iter().copied());
+        if std::ptr::eq(&self.path, &other.path) {
+            // Note: this is not part of the spec, but it is a workaround to
+            // avoids borrow conflict when path is same as other.path
+            self.path.borrow_mut().extend_from_within(..);
+        } else {
+            let mut dest = self.path.borrow_mut();
+            dest.extend(other.path.borrow().iter().copied());
+        }
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-closepath>
diff --git a/components/script/dom/permissions.rs b/components/script/dom/permissions.rs
index 0be136b8aff..ed611db79a8 100644
--- a/components/script/dom/permissions.rs
+++ b/components/script/dom/permissions.rs
@@ -95,7 +95,7 @@ impl Permissions {
         let p = match promise {
             Some(promise) => promise,
             None => {
-                let in_realm_proof = AlreadyInRealm::assert();
+                let in_realm_proof = AlreadyInRealm::assert::<crate::DomTypeHolder>();
                 Promise::new_in_current_realm(InRealm::Already(&in_realm_proof), can_gc)
             },
         };
diff --git a/components/script/dom/pointerevent.rs b/components/script/dom/pointerevent.rs
index 719518c64b2..d3cd9434e7d 100644
--- a/components/script/dom/pointerevent.rs
+++ b/components/script/dom/pointerevent.rs
@@ -23,6 +23,13 @@ use crate::dom::mouseevent::MouseEvent;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
 
+/// <https://w3c.github.io/pointerevents/#dom-pointerevent-pointerid>
+#[derive(Clone, Copy, MallocSizeOf, PartialEq)]
+pub(crate) enum PointerId {
+    NonPointerDevice = -1,
+    Mouse,
+}
+
 #[dom_struct]
 pub(crate) struct PointerEvent {
     mouseevent: MouseEvent,
@@ -83,7 +90,6 @@ impl PointerEvent {
     #[allow(clippy::too_many_arguments)]
     pub(crate) fn new(
         window: &Window,
-        proto: Option<HandleObject>,
         type_: DOMString,
         can_bubble: EventBubbles,
         cancelable: EventCancelable,
@@ -119,7 +125,7 @@ impl PointerEvent {
     ) -> DomRoot<PointerEvent> {
         Self::new_with_proto(
             window,
-            proto,
+            None,
             type_,
             can_bubble,
             cancelable,
diff --git a/components/script/dom/progressevent.rs b/components/script/dom/progressevent.rs
index e0a8ee2992f..5e70bcf1642 100644
--- a/components/script/dom/progressevent.rs
+++ b/components/script/dom/progressevent.rs
@@ -4,6 +4,7 @@
 
 use dom_struct::dom_struct;
 use js::rust::HandleObject;
+use script_bindings::num::Finite;
 use stylo_atoms::Atom;
 
 use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
@@ -22,12 +23,16 @@ use crate::script_runtime::CanGc;
 pub(crate) struct ProgressEvent {
     event: Event,
     length_computable: bool,
-    loaded: u64,
-    total: u64,
+    loaded: Finite<f64>,
+    total: Finite<f64>,
 }
 
 impl ProgressEvent {
-    fn new_inherited(length_computable: bool, loaded: u64, total: u64) -> ProgressEvent {
+    fn new_inherited(
+        length_computable: bool,
+        loaded: Finite<f64>,
+        total: Finite<f64>,
+    ) -> ProgressEvent {
         ProgressEvent {
             event: Event::new_inherited(),
             length_computable,
@@ -43,8 +48,8 @@ impl ProgressEvent {
         can_bubble: EventBubbles,
         cancelable: EventCancelable,
         length_computable: bool,
-        loaded: u64,
-        total: u64,
+        loaded: Finite<f64>,
+        total: Finite<f64>,
         can_gc: CanGc,
     ) -> DomRoot<ProgressEvent> {
         Self::new_with_proto(
@@ -68,8 +73,8 @@ impl ProgressEvent {
         can_bubble: EventBubbles,
         cancelable: EventCancelable,
         length_computable: bool,
-        loaded: u64,
-        total: u64,
+        loaded: Finite<f64>,
+        total: Finite<f64>,
         can_gc: CanGc,
     ) -> DomRoot<ProgressEvent> {
         let ev = reflect_dom_object_with_proto(
@@ -121,12 +126,12 @@ impl ProgressEventMethods<crate::DomTypeHolder> for ProgressEvent {
     }
 
     // https://xhr.spec.whatwg.org/#dom-progressevent-loaded
-    fn Loaded(&self) -> u64 {
+    fn Loaded(&self) -> Finite<f64> {
         self.loaded
     }
 
     // https://xhr.spec.whatwg.org/#dom-progressevent-total
-    fn Total(&self) -> u64 {
+    fn Total(&self) -> Finite<f64> {
         self.total
     }
 
diff --git a/components/script/dom/promise.rs b/components/script/dom/promise.rs
index b970e7f3342..0efffbe6fe2 100644
--- a/components/script/dom/promise.rs
+++ b/components/script/dom/promise.rs
@@ -387,25 +387,6 @@ fn create_native_handler_function(
     }
 }
 
-/// Operations that must be invoked from the generated bindings.
-pub(crate) trait PromiseHelpers<D: crate::DomTypes> {
-    fn new_resolved(
-        global: &D::GlobalScope,
-        cx: SafeJSContext,
-        value: impl ToJSValConvertible,
-    ) -> Rc<D::Promise>;
-}
-
-impl PromiseHelpers<crate::DomTypeHolder> for Promise {
-    fn new_resolved(
-        global: &GlobalScope,
-        cx: SafeJSContext,
-        value: impl ToJSValConvertible,
-    ) -> Rc<Promise> {
-        Promise::new_resolved(global, cx, value, CanGc::note())
-    }
-}
-
 impl FromJSValConvertibleRc for Promise {
     #[allow(unsafe_code)]
     unsafe fn from_jsval(
@@ -415,14 +396,12 @@ impl FromJSValConvertibleRc for Promise {
         if value.get().is_null() {
             return Ok(ConversionResult::Failure("null not allowed".into()));
         }
-        if !value.get().is_object() {
-            return Ok(ConversionResult::Failure("not an object".into()));
-        }
-        rooted!(in(cx) let obj = value.get().to_object());
-        if !IsPromiseObject(obj.handle()) {
-            return Ok(ConversionResult::Failure("not a promise".into()));
-        }
-        let promise = Promise::new_with_js_promise(obj.handle(), SafeJSContext::from_ptr(cx));
+
+        let cx = SafeJSContext::from_ptr(cx);
+        let in_realm_proof = AlreadyInRealm::assert_for_cx(cx);
+        let global_scope = GlobalScope::from_context(*cx, InRealm::Already(&in_realm_proof));
+
+        let promise = Promise::new_resolved(&global_scope, cx, value, CanGc::note());
         Ok(ConversionResult::Success(promise))
     }
 }
diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs
index 7eb022635fb..4bf3b7fb72a 100644
--- a/components/script/dom/range.rs
+++ b/components/script/dom/range.rs
@@ -596,7 +596,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
                     .unwrap();
                 let clone = cdata.clone_with_data(data, &start_node.owner_doc(), can_gc);
                 // Step 4.3.
-                fragment.upcast::<Node>().AppendChild(&clone)?;
+                fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
                 // Step 4.4
                 return Ok(fragment);
             }
@@ -619,12 +619,12 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
                     .unwrap();
                 let clone = cdata.clone_with_data(data, &start_node.owner_doc(), can_gc);
                 // Step 13.3.
-                fragment.upcast::<Node>().AppendChild(&clone)?;
+                fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
             } else {
                 // Step 14.1.
                 let clone = child.CloneNode(/* deep */ false, can_gc)?;
                 // Step 14.2.
-                fragment.upcast::<Node>().AppendChild(&clone)?;
+                fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
                 // Step 14.3.
                 let subrange = Range::new(
                     &clone.owner_doc(),
@@ -637,7 +637,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
                 // Step 14.4.
                 let subfragment = subrange.CloneContents(can_gc)?;
                 // Step 14.5.
-                clone.AppendChild(subfragment.upcast())?;
+                clone.AppendChild(subfragment.upcast(), can_gc)?;
             }
         }
 
@@ -646,7 +646,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
             // Step 15.1.
             let clone = child.CloneNode(/* deep */ true, can_gc)?;
             // Step 15.2.
-            fragment.upcast::<Node>().AppendChild(&clone)?;
+            fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
         }
 
         if let Some(child) = last_partially_contained_child {
@@ -657,19 +657,19 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
                 let data = cdata.SubstringData(0, end_offset).unwrap();
                 let clone = cdata.clone_with_data(data, &start_node.owner_doc(), can_gc);
                 // Step 16.3.
-                fragment.upcast::<Node>().AppendChild(&clone)?;
+                fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
             } else {
                 // Step 17.1.
                 let clone = child.CloneNode(/* deep */ false, can_gc)?;
                 // Step 17.2.
-                fragment.upcast::<Node>().AppendChild(&clone)?;
+                fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
                 // Step 17.3.
                 let subrange =
                     Range::new(&clone.owner_doc(), &child, 0, &end_node, end_offset, can_gc);
                 // Step 17.4.
                 let subfragment = subrange.CloneContents(can_gc)?;
                 // Step 17.5.
-                clone.AppendChild(subfragment.upcast())?;
+                clone.AppendChild(subfragment.upcast(), can_gc)?;
             }
         }
 
@@ -705,7 +705,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
                     .unwrap()
                     .SetData(text.unwrap());
                 // Step 4.3.
-                fragment.upcast::<Node>().AppendChild(&clone)?;
+                fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
                 // Step 4.4.
                 end_data.ReplaceData(start_offset, end_offset - start_offset, DOMString::new())?;
                 // Step 4.5.
@@ -749,7 +749,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
                     .unwrap()
                     .SetData(text.unwrap());
                 // Step 15.3.
-                fragment.upcast::<Node>().AppendChild(&clone)?;
+                fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
                 // Step 15.4.
                 start_data.ReplaceData(
                     start_offset,
@@ -760,7 +760,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
                 // Step 16.1.
                 let clone = child.CloneNode(/* deep */ false, can_gc)?;
                 // Step 16.2.
-                fragment.upcast::<Node>().AppendChild(&clone)?;
+                fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
                 // Step 16.3.
                 let subrange = Range::new(
                     &clone.owner_doc(),
@@ -773,13 +773,13 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
                 // Step 16.4.
                 let subfragment = subrange.ExtractContents(can_gc)?;
                 // Step 16.5.
-                clone.AppendChild(subfragment.upcast())?;
+                clone.AppendChild(subfragment.upcast(), can_gc)?;
             }
         }
 
         // Step 17.
         for child in contained_children {
-            fragment.upcast::<Node>().AppendChild(&child)?;
+            fragment.upcast::<Node>().AppendChild(&child, can_gc)?;
         }
 
         if let Some(child) = last_partially_contained_child {
@@ -794,21 +794,21 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
                     .unwrap()
                     .SetData(text.unwrap());
                 // Step 18.3.
-                fragment.upcast::<Node>().AppendChild(&clone)?;
+                fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
                 // Step 18.4.
                 end_data.ReplaceData(0, end_offset, DOMString::new())?;
             } else {
                 // Step 19.1.
                 let clone = child.CloneNode(/* deep */ false, can_gc)?;
                 // Step 19.2.
-                fragment.upcast::<Node>().AppendChild(&clone)?;
+                fragment.upcast::<Node>().AppendChild(&clone, can_gc)?;
                 // Step 19.3.
                 let subrange =
                     Range::new(&clone.owner_doc(), &child, 0, &end_node, end_offset, can_gc);
                 // Step 19.4.
                 let subfragment = subrange.ExtractContents(can_gc)?;
                 // Step 19.5.
-                clone.AppendChild(subfragment.upcast())?;
+                clone.AppendChild(subfragment.upcast(), can_gc)?;
             }
         }
 
@@ -856,7 +856,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
             },
             _ => {
                 // Steps 4-5.
-                let child = start_node.ChildNodes().Item(start_offset);
+                let child = start_node.ChildNodes(can_gc).Item(start_offset);
                 (child, DomRoot::from_ref(&*start_node))
             },
         };
@@ -884,7 +884,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
         };
 
         // Step 9.
-        node.remove_self();
+        node.remove_self(can_gc);
 
         // Step 10.
         let new_offset = reference_node
@@ -900,7 +900,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
             };
 
         // Step 12.
-        Node::pre_insert(node, &parent, reference_node.as_deref())?;
+        Node::pre_insert(node, &parent, reference_node.as_deref(), can_gc)?;
 
         // Step 13.
         if self.collapsed() {
@@ -980,7 +980,7 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
 
         // Step 8.
         for child in &*contained_children {
-            child.remove_self();
+            child.remove_self(CanGc::note());
         }
 
         // Step 9.
@@ -1023,13 +1023,13 @@ impl RangeMethods<crate::DomTypeHolder> for Range {
         let fragment = self.ExtractContents(can_gc)?;
 
         // Step 4.
-        Node::replace_all(None, new_parent);
+        Node::replace_all(None, new_parent, can_gc);
 
         // Step 5.
         self.InsertNode(new_parent, can_gc)?;
 
         // Step 6.
-        new_parent.AppendChild(fragment.upcast())?;
+        new_parent.AppendChild(fragment.upcast(), can_gc)?;
 
         // Step 7.
         self.SelectNode(new_parent)
diff --git a/components/script/dom/raredata.rs b/components/script/dom/raredata.rs
index 3afa000511e..0c048956217 100644
--- a/components/script/dom/raredata.rs
+++ b/components/script/dom/raredata.rs
@@ -75,4 +75,5 @@ pub(crate) struct ElementRareData {
     /// > Element objects have an internal [[RegisteredIntersectionObservers]] slot,
     /// > which is initialized to an empty list. This list holds IntersectionObserverRegistration records, which have:
     pub(crate) registered_intersection_observers: Vec<IntersectionObserverRegistration>,
+    pub(crate) cryptographic_nonce: String,
 }
diff --git a/components/script/dom/readablebytestreamcontroller.rs b/components/script/dom/readablebytestreamcontroller.rs
index 340e6d04eab..8f28a9a1215 100644
--- a/components/script/dom/readablebytestreamcontroller.rs
+++ b/components/script/dom/readablebytestreamcontroller.rs
@@ -1612,7 +1612,7 @@ impl ReadableByteStreamController {
             let realm = enter_realm(&*global);
             let comp = InRealm::Entered(&realm);
             let result = underlying_source
-                .call_pull_algorithm(controller, can_gc)
+                .call_pull_algorithm(controller, &global, can_gc)
                 .unwrap_or_else(|| {
                     let promise = Promise::new(&global, can_gc);
                     promise.resolve_native(&(), can_gc);
@@ -1781,6 +1781,8 @@ impl ReadableByteStreamController {
     /// <https://streams.spec.whatwg.org/#rbs-controller-private-cancel>
     pub(crate) fn perform_cancel_steps(
         &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
         reason: SafeHandleValue,
         can_gc: CanGc,
     ) -> Rc<Promise> {
@@ -1794,13 +1796,12 @@ impl ReadableByteStreamController {
             .underlying_source
             .get()
             .expect("Controller should have a source when the cancel steps are called into.");
-        let global = self.global();
 
         // Let result be the result of performing this.[[cancelAlgorithm]], passing in reason.
         let result = underlying_source
-            .call_cancel_algorithm(reason, can_gc)
+            .call_cancel_algorithm(cx, global, reason, can_gc)
             .unwrap_or_else(|| {
-                let promise = Promise::new(&global, can_gc);
+                let promise = Promise::new(global, can_gc);
                 promise.resolve_native(&(), can_gc);
                 Ok(promise)
             });
@@ -1808,11 +1809,10 @@ impl ReadableByteStreamController {
         let promise = result.unwrap_or_else(|error| {
             let cx = GlobalScope::get_cx();
             rooted!(in(*cx) let mut rval = UndefinedValue());
-            // TODO: check if `self.global()` is the right globalscope.
             error
                 .clone()
-                .to_jsval(cx, &self.global(), rval.handle_mut(), can_gc);
-            let promise = Promise::new(&global, can_gc);
+                .to_jsval(cx, global, rval.handle_mut(), can_gc);
+            let promise = Promise::new(global, can_gc);
             promise.reject_native(&rval.handle(), can_gc);
             promise
         });
diff --git a/components/script/dom/readablestream.rs b/components/script/dom/readablestream.rs
index f8b23072e66..d631a01e1e7 100644
--- a/components/script/dom/readablestream.rs
+++ b/components/script/dom/readablestream.rs
@@ -3,11 +3,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use std::cell::{Cell, RefCell};
+use std::collections::HashMap;
 use std::collections::VecDeque;
 use std::ptr::{self};
 use std::rc::Rc;
 
+use base::id::{MessagePortId, MessagePortIndex};
+use constellation_traits::MessagePortImpl;
 use dom_struct::dom_struct;
+use ipc_channel::ipc::IpcSharedMemory;
 use js::conversions::ToJSValConvertible;
 use js::jsapi::{Heap, JSObject};
 use js::jsval::{JSVal, NullValue, ObjectValue, UndefinedValue};
@@ -19,8 +23,14 @@ use js::typedarray::ArrayBufferViewU8;
 
 use crate::dom::bindings::codegen::Bindings::QueuingStrategyBinding::QueuingStrategy;
 use crate::dom::bindings::codegen::Bindings::ReadableStreamBinding::{
-    ReadableStreamGetReaderOptions, ReadableStreamMethods, ReadableStreamReaderMode, StreamPipeOptions
+    ReadableStreamGetReaderOptions, ReadableStreamMethods, ReadableStreamReaderMode,
+    StreamPipeOptions,
 };
+use script_bindings::str::DOMString;
+
+use crate::dom::domexception::{DOMErrorName, DOMException};
+use script_bindings::conversions::StringificationBehavior;
+use super::bindings::codegen::Bindings::QueuingStrategyBinding::QueuingStrategySize;
 use crate::dom::bindings::codegen::Bindings::ReadableStreamDefaultReaderBinding::ReadableStreamDefaultReaderMethods;
 use crate::dom::bindings::codegen::Bindings::ReadableStreamDefaultControllerBinding::ReadableStreamDefaultController_Binding::ReadableStreamDefaultControllerMethods;
 use crate::dom::bindings::codegen::Bindings::UnderlyingSourceBinding::UnderlyingSource as JsUnderlyingSource;
@@ -45,10 +55,14 @@ use crate::dom::defaultteeunderlyingsource::TeeCancelAlgorithm;
 use crate::dom::types::DefaultTeeUnderlyingSource;
 use crate::dom::underlyingsourcecontainer::UnderlyingSourceType;
 use crate::dom::writablestreamdefaultwriter::WritableStreamDefaultWriter;
+use script_bindings::codegen::GenericBindings::MessagePortBinding::MessagePortMethods;
+use crate::dom::messageport::MessagePort;
 use crate::js::conversions::FromJSValConvertible;
 use crate::realms::{enter_realm, InRealm};
 use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
 use crate::dom::promisenativehandler::{Callback, PromiseNativeHandler};
+use crate::dom::bindings::transferable::Transferable;
+use crate::dom::bindings::structuredclone::StructuredData;
 
 use super::bindings::buffer_source::HeapBufferSource;
 use super::bindings::codegen::Bindings::ReadableStreamBYOBReaderBinding::ReadableStreamBYOBReaderReadOptions;
@@ -155,6 +169,7 @@ impl Callback for PipeTo {
     /// - the current state.
     /// - the type of `result`.
     /// - the state of a stored promise(in some cases).
+    #[allow(unsafe_code)]
     fn callback(&self, cx: SafeJSContext, result: SafeHandleValue, realm: InRealm, can_gc: CanGc) {
         let global = self.reader.global();
 
@@ -197,14 +212,16 @@ impl Callback for PipeTo {
                         } else {
                             rooted!(in(*cx) let object = result.to_object());
                             rooted!(in(*cx) let mut done = UndefinedValue());
-                            get_dictionary_property(
-                                *cx,
-                                object.handle(),
-                                "done",
-                                done.handle_mut(),
-                                can_gc,
-                            )
-                            .unwrap()
+                            unsafe {
+                                get_dictionary_property(
+                                    *cx,
+                                    object.handle(),
+                                    "done",
+                                    done.handle_mut(),
+                                    can_gc,
+                                )
+                                .unwrap()
+                            }
                         }
                     };
                     // If any chunks have been read but not yet written, write them to dest.
@@ -342,6 +359,7 @@ impl PipeTo {
 
     /// Try to write a chunk using the jsval, and returns wether it succeeded
     // It will fail if it is the last `done` chunk, or if it is not a chunk at all.
+    #[allow(unsafe_code)]
     fn write_chunk(
         &self,
         cx: SafeJSContext,
@@ -352,9 +370,10 @@ impl PipeTo {
         if chunk.is_object() {
             rooted!(in(*cx) let object = chunk.to_object());
             rooted!(in(*cx) let mut bytes = UndefinedValue());
-            let has_value =
+            let has_value = unsafe {
                 get_dictionary_property(*cx, object.handle(), "value", bytes.handle_mut(), can_gc)
-                    .expect("Chunk should have a value.");
+                    .expect("Chunk should have a value.")
+            };
             if !bytes.is_undefined() && has_value {
                 // Write the chunk.
                 let write_promise = self.writer.write(cx, global, bytes.handle(), can_gc);
@@ -624,7 +643,7 @@ impl PipeTo {
                     .reader
                     .get_stream()
                     .expect("Reader should have a stream.");
-                source.cancel(error.handle(), can_gc)
+                source.cancel(cx, global, error.handle(), can_gc)
             },
             ShutdownAction::WritableStreamDefaultWriterCloseWithErrorPropagation => {
                 self.writer.close_with_error_propagation(cx, global, can_gc)
@@ -750,19 +769,19 @@ impl PartialEq for ReaderType {
 
 /// <https://streams.spec.whatwg.org/#create-readable-stream>
 #[cfg_attr(crown, allow(crown::unrooted_must_root))]
-fn create_readable_stream(
+pub(crate) fn create_readable_stream(
     global: &GlobalScope,
     underlying_source_type: UnderlyingSourceType,
-    queuing_strategy: QueuingStrategy,
+    queuing_strategy: Option<Rc<QueuingStrategySize>>,
+    high_water_mark: Option<f64>,
     can_gc: CanGc,
 ) -> DomRoot<ReadableStream> {
     // If highWaterMark was not passed, set it to 1.
-    let high_water_mark = queuing_strategy.highWaterMark.unwrap_or(1.0);
+    let high_water_mark = high_water_mark.unwrap_or(1.0);
 
     // If sizeAlgorithm was not passed, set it to an algorithm that returns 1.
-    let size_algorithm = queuing_strategy
-        .size
-        .unwrap_or(extract_size_algorithm(&QueuingStrategy::empty(), can_gc));
+    let size_algorithm =
+        queuing_strategy.unwrap_or(extract_size_algorithm(&QueuingStrategy::empty(), can_gc));
 
     // Assert: ! IsNonNegativeNumber(highWaterMark) is true.
     assert!(high_water_mark >= 0.0);
@@ -829,7 +848,7 @@ impl ReadableStream {
     }
 
     #[cfg_attr(crown, allow(crown::unrooted_must_root))]
-    fn new_with_proto(
+    pub(crate) fn new_with_proto(
         global: &GlobalScope,
         proto: Option<SafeHandleObject>,
         can_gc: CanGc,
@@ -1113,12 +1132,14 @@ impl ReadableStream {
 
     /// Return bytes for synchronous use, if the stream has all data in memory.
     /// Useful for native source integration only.
-    pub(crate) fn get_in_memory_bytes(&self) -> Option<Vec<u8>> {
+    pub(crate) fn get_in_memory_bytes(&self) -> Option<IpcSharedMemory> {
         match self.controller.borrow().as_ref() {
             Some(ControllerType::Default(controller)) => controller
                 .get()
                 .expect("Stream should have controller.")
-                .get_in_memory_bytes(),
+                .get_in_memory_bytes()
+                .as_deref()
+                .map(IpcSharedMemory::from_bytes),
             _ => {
                 unreachable!("Getting in-memory bytes for a stream with a non-default controller")
             },
@@ -1421,19 +1442,24 @@ impl ReadableStream {
 
     /// <https://streams.spec.whatwg.org/#readable-stream-cancel>
     #[allow(unsafe_code)]
-    pub(crate) fn cancel(&self, reason: SafeHandleValue, can_gc: CanGc) -> Rc<Promise> {
+    pub(crate) fn cancel(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        reason: SafeHandleValue,
+        can_gc: CanGc,
+    ) -> Rc<Promise> {
         // Set stream.[[disturbed]] to true.
         self.disturbed.set(true);
 
         // If stream.[[state]] is "closed", return a promise resolved with undefined.
         if self.is_closed() {
-            return Promise::new_resolved(&self.global(), GlobalScope::get_cx(), (), can_gc);
+            return Promise::new_resolved(global, cx, (), can_gc);
         }
         // If stream.[[state]] is "errored", return a promise rejected with stream.[[storedError]].
         if self.is_errored() {
-            let promise = Promise::new(&self.global(), can_gc);
+            let promise = Promise::new(global, can_gc);
             unsafe {
-                let cx = GlobalScope::get_cx();
                 rooted!(in(*cx) let mut rval = UndefinedValue());
                 self.stored_error.to_jsval(*cx, rval.handle_mut());
                 promise.reject_native(&rval.handle(), can_gc);
@@ -1457,11 +1483,11 @@ impl ReadableStream {
             Some(ControllerType::Default(controller)) => controller
                 .get()
                 .expect("Stream should have controller.")
-                .perform_cancel_steps(reason, can_gc),
+                .perform_cancel_steps(cx, global, reason, can_gc),
             Some(ControllerType::Byte(controller)) => controller
                 .get()
                 .expect("Stream should have controller.")
-                .perform_cancel_steps(reason, can_gc),
+                .perform_cancel_steps(cx, global, reason, can_gc),
             None => {
                 panic!("Stream does not have a controller.");
             },
@@ -1571,7 +1597,8 @@ impl ReadableStream {
         let branch_1 = create_readable_stream(
             &self.global(),
             underlying_source_type_branch_1,
-            QueuingStrategy::empty(),
+            None,
+            None,
             can_gc,
         );
         tee_source_1.set_branch_1(&branch_1);
@@ -1581,7 +1608,8 @@ impl ReadableStream {
         let branch_2 = create_readable_stream(
             &self.global(),
             underlying_source_type_branch_2,
-            QueuingStrategy::empty(),
+            None,
+            None,
             can_gc,
         );
         tee_source_1.set_branch_2(&branch_2);
@@ -1603,7 +1631,7 @@ impl ReadableStream {
 
     /// <https://streams.spec.whatwg.org/#readable-stream-pipe-to>
     #[allow(clippy::too_many_arguments)]
-    fn pipe_to(
+    pub(crate) fn pipe_to(
         &self,
         cx: SafeJSContext,
         global: &GlobalScope,
@@ -1764,6 +1792,49 @@ impl ReadableStream {
         // pullAlgorithm, cancelAlgorithm, highWaterMark, autoAllocateChunkSize).
         controller.setup(global, stream, can_gc)
     }
+
+    /// <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformreadable>
+    pub(crate) fn setup_cross_realm_transform_readable(
+        &self,
+        cx: SafeJSContext,
+        port: &MessagePort,
+        can_gc: CanGc,
+    ) {
+        let port_id = port.message_port_id();
+        let global = self.global();
+
+        // Perform ! InitializeReadableStream(stream).
+        // Done in `new_inherited`.
+
+        // Let sizeAlgorithm be an algorithm that returns 1.
+        let size_algorithm = extract_size_algorithm(&QueuingStrategy::default(), can_gc);
+
+        // Note: other algorithms defined in the underlying source container.
+
+        // Let controller be a new ReadableStreamDefaultController.
+        let controller = ReadableStreamDefaultController::new(
+            &self.global(),
+            UnderlyingSourceType::Transfer(Dom::from_ref(port)),
+            0.,
+            size_algorithm,
+            can_gc,
+        );
+
+        // Add a handler for port’s message event with the following steps:
+        // Add a handler for port’s messageerror event with the following steps:
+        rooted!(in(*cx) let cross_realm_transform_readable = CrossRealmTransformReadable {
+            controller: Dom::from_ref(&controller),
+        });
+        global.note_cross_realm_transform_readable(&cross_realm_transform_readable, port_id);
+
+        // Enable port’s port message queue.
+        port.Start(can_gc);
+
+        // Perform ! SetUpReadableStreamDefaultController
+        controller
+            .setup(DomRoot::from_ref(self), can_gc)
+            .expect("Setting up controller for transfer cannot fail.");
+    }
 }
 
 impl ReadableStreamMethods<crate::DomTypeHolder> for ReadableStream {
@@ -1849,16 +1920,17 @@ impl ReadableStreamMethods<crate::DomTypeHolder> for ReadableStream {
     }
 
     /// <https://streams.spec.whatwg.org/#rs-cancel>
-    fn Cancel(&self, _cx: SafeJSContext, reason: SafeHandleValue, can_gc: CanGc) -> Rc<Promise> {
+    fn Cancel(&self, cx: SafeJSContext, reason: SafeHandleValue, can_gc: CanGc) -> Rc<Promise> {
+        let global = self.global();
         if self.is_locked() {
             // If ! IsReadableStreamLocked(this) is true,
             // return a promise rejected with a TypeError exception.
-            let promise = Promise::new(&self.global(), can_gc);
+            let promise = Promise::new(&global, can_gc);
             promise.reject_error(Error::Type("stream is not locked".to_owned()), can_gc);
             promise
         } else {
             // Return ! ReadableStreamCancel(this, reason).
-            self.cancel(reason, can_gc)
+            self.cancel(cx, &global, reason, can_gc)
         }
     }
 
@@ -1936,6 +2008,134 @@ impl ReadableStreamMethods<crate::DomTypeHolder> for ReadableStream {
     }
 }
 
+#[allow(unsafe_code)]
+/// The initial steps for the message handler for both readable and writable cross realm transforms.
+/// <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformreadable>
+/// <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformwritable>
+pub(crate) unsafe fn get_type_and_value_from_message(
+    cx: SafeJSContext,
+    data: SafeHandleValue,
+    value: SafeMutableHandleValue,
+    can_gc: CanGc,
+) -> DOMString {
+    // Let data be the data of the message.
+    // Note: we are passed the data as argument,
+    // which originates in the return value of `structuredclone::read`.
+
+    // Assert: data is an Object.
+    assert!(data.is_object());
+    rooted!(in(*cx) let data_object = data.to_object());
+
+    // Let type be ! Get(data, "type").
+    rooted!(in(*cx) let mut type_ = UndefinedValue());
+    get_dictionary_property(
+        *cx,
+        data_object.handle(),
+        "type",
+        type_.handle_mut(),
+        can_gc,
+    )
+    .expect("Getting the type should not fail.");
+
+    // Let value be ! Get(data, "value").
+    get_dictionary_property(*cx, data_object.handle(), "value", value, can_gc)
+        .expect("Getting the value should not fail.");
+
+    // Assert: type is a String.
+    let result = unsafe {
+        DOMString::from_jsval(*cx, type_.handle(), StringificationBehavior::Empty)
+            .expect("The type of the message should be a string")
+    };
+    let ConversionResult::Success(type_string) = result else {
+        unreachable!("The type of the message should be a string");
+    };
+
+    type_string
+}
+
+impl js::gc::Rootable for CrossRealmTransformReadable {}
+
+/// <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformreadable>
+/// A wrapper to handle `message` and `messageerror` events
+/// for the port used by the transfered stream.
+#[derive(Clone, JSTraceable, MallocSizeOf)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+pub(crate) struct CrossRealmTransformReadable {
+    /// The controller used in the algorithm.
+    controller: Dom<ReadableStreamDefaultController>,
+}
+
+impl CrossRealmTransformReadable {
+    /// <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformreadable>
+    /// Add a handler for port’s message event with the following steps:
+    #[allow(unsafe_code)]
+    pub(crate) fn handle_message(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        port: &MessagePort,
+        message: SafeHandleValue,
+        _realm: InRealm,
+        can_gc: CanGc,
+    ) {
+        rooted!(in(*cx) let mut value = UndefinedValue());
+        let type_string =
+            unsafe { get_type_and_value_from_message(cx, message, value.handle_mut(), can_gc) };
+
+        // If type is "chunk",
+        if type_string == "chunk" {
+            // Perform ! ReadableStreamDefaultControllerEnqueue(controller, value).
+            self.controller
+                .enqueue(cx, value.handle(), can_gc)
+                .expect("Enqueing a chunk should not fail.");
+        }
+
+        // Otherwise, if type is "close",
+        if type_string == "close" {
+            // Perform ! ReadableStreamDefaultControllerClose(controller).
+            self.controller.close(can_gc);
+
+            // Disentangle port.
+            global.disentangle_port(port, can_gc);
+        }
+
+        // Otherwise, if type is "error",
+        if type_string == "error" {
+            // Perform ! ReadableStreamDefaultControllerError(controller, value).
+            self.controller.error(value.handle(), can_gc);
+
+            // Disentangle port.
+            global.disentangle_port(port, can_gc);
+        }
+    }
+
+    /// <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformwritable>
+    /// Add a handler for port’s messageerror event with the following steps:
+    #[allow(unsafe_code)]
+    pub(crate) fn handle_error(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        port: &MessagePort,
+        _realm: InRealm,
+        can_gc: CanGc,
+    ) {
+        // Let error be a new "DataCloneError" DOMException.
+        let error = DOMException::new(global, DOMErrorName::DataCloneError, can_gc);
+        rooted!(in(*cx) let mut rooted_error = UndefinedValue());
+        unsafe { error.to_jsval(*cx, rooted_error.handle_mut()) };
+
+        // Perform ! CrossRealmTransformSendError(port, error).
+        port.cross_realm_transform_send_error(rooted_error.handle(), can_gc);
+
+        // Perform ! ReadableStreamDefaultControllerError(controller, error).
+        self.controller.error(rooted_error.handle(), can_gc);
+
+        // Disentangle port.
+        global.disentangle_port(port, can_gc);
+    }
+}
+
 #[allow(unsafe_code)]
 /// Get the `done` property of an object that a read promise resolved to.
 pub(crate) fn get_read_promise_done(
@@ -1989,3 +2189,83 @@ pub(crate) fn get_read_promise_bytes(
         }
     }
 }
+
+/// <https://streams.spec.whatwg.org/#rs-transfer>
+impl Transferable for ReadableStream {
+    type Index = MessagePortIndex;
+    type Data = MessagePortImpl;
+
+    /// <https://streams.spec.whatwg.org/#ref-for-readablestream%E2%91%A1%E2%91%A0>
+    fn transfer(&self) -> Result<(MessagePortId, MessagePortImpl), ()> {
+        // If ! IsReadableStreamLocked(value) is true, throw a "DataCloneError" DOMException.
+        if self.is_locked() {
+            return Err(());
+        }
+
+        let global = self.global();
+        let realm = enter_realm(&*global);
+        let comp = InRealm::Entered(&realm);
+        let cx = GlobalScope::get_cx();
+        let can_gc = CanGc::note();
+
+        // Let port1 be a new MessagePort in the current Realm.
+        let port_1 = MessagePort::new(&global, can_gc);
+        global.track_message_port(&port_1, None);
+
+        // Let port2 be a new MessagePort in the current Realm.
+        let port_2 = MessagePort::new(&global, can_gc);
+        global.track_message_port(&port_2, None);
+
+        // Entangle port1 and port2.
+        global.entangle_ports(*port_1.message_port_id(), *port_2.message_port_id());
+
+        // Let writable be a new WritableStream in the current Realm.
+        let writable = WritableStream::new_with_proto(&global, None, can_gc);
+
+        // Perform ! SetUpCrossRealmTransformWritable(writable, port1).
+        writable.setup_cross_realm_transform_writable(cx, &port_1, can_gc);
+
+        // Let promise be ! ReadableStreamPipeTo(value, writable, false, false, false).
+        let promise = self.pipe_to(cx, &global, &writable, false, false, false, comp, can_gc);
+
+        // Set promise.[[PromiseIsHandled]] to true.
+        promise.set_promise_is_handled();
+
+        // Set dataHolder.[[port]] to ! StructuredSerializeWithTransfer(port2, « port2 »).
+        port_2.transfer()
+    }
+
+    /// <https://streams.spec.whatwg.org/#ref-for-readablestream%E2%91%A1%E2%91%A0>
+    fn transfer_receive(
+        owner: &GlobalScope,
+        id: MessagePortId,
+        port_impl: MessagePortImpl,
+    ) -> Result<DomRoot<Self>, ()> {
+        let cx = GlobalScope::get_cx();
+        let can_gc = CanGc::note();
+
+        // Their transfer-receiving steps, given dataHolder and value, are:
+        // Note: dataHolder is used in `structuredclone.rs`, and value is created here.
+        let value = ReadableStream::new_with_proto(owner, None, can_gc);
+
+        // Let deserializedRecord be ! StructuredDeserializeWithTransfer(dataHolder.[[port]], the current Realm).
+        // Done with the `Deserialize` derive of `MessagePortImpl`.
+
+        // Let port be deserializedRecord.[[Deserialized]].
+        let transferred_port = MessagePort::transfer_receive(owner, id, port_impl)?;
+
+        // Perform ! SetUpCrossRealmTransformReadable(value, port).
+        value.setup_cross_realm_transform_readable(cx, &transferred_port, can_gc);
+        Ok(value)
+    }
+
+    /// Note: we are relying on the port transfer, so the data returned here are related to the port.
+    fn serialized_storage<'a>(
+        data: StructuredData<'a, '_>,
+    ) -> &'a mut Option<HashMap<MessagePortId, Self::Data>> {
+        match data {
+            StructuredData::Reader(r) => &mut r.port_impls,
+            StructuredData::Writer(w) => &mut w.ports,
+        }
+    }
+}
diff --git a/components/script/dom/readablestreambyobreader.rs b/components/script/dom/readablestreambyobreader.rs
index 16827c1add6..3ccfb255009 100644
--- a/components/script/dom/readablestreambyobreader.rs
+++ b/components/script/dom/readablestreambyobreader.rs
@@ -401,8 +401,8 @@ impl ReadableStreamBYOBReaderMethods<crate::DomTypeHolder> for ReadableStreamBYO
     }
 
     /// <https://streams.spec.whatwg.org/#generic-reader-cancel>
-    fn Cancel(&self, _cx: SafeJSContext, reason: SafeHandleValue, can_gc: CanGc) -> Rc<Promise> {
-        self.generic_cancel(&self.global(), reason, can_gc)
+    fn Cancel(&self, cx: SafeJSContext, reason: SafeHandleValue, can_gc: CanGc) -> Rc<Promise> {
+        self.generic_cancel(cx, &self.global(), reason, can_gc)
     }
 }
 
diff --git a/components/script/dom/readablestreamdefaultcontroller.rs b/components/script/dom/readablestreamdefaultcontroller.rs
index 66ba3d209c7..80c800d1bbe 100644
--- a/components/script/dom/readablestreamdefaultcontroller.rs
+++ b/components/script/dom/readablestreamdefaultcontroller.rs
@@ -383,7 +383,6 @@ impl ReadableStreamDefaultController {
     }
 
     /// <https://streams.spec.whatwg.org/#set-up-readable-stream-default-controller>
-    #[allow(unsafe_code)]
     pub(crate) fn setup(
         &self,
         stream: DomRoot<ReadableStream>,
@@ -540,7 +539,7 @@ impl ReadableStreamDefaultController {
         let realm = enter_realm(&*global);
         let comp = InRealm::Entered(&realm);
         let result = underlying_source
-            .call_pull_algorithm(controller, can_gc)
+            .call_pull_algorithm(controller, &global, can_gc)
             .unwrap_or_else(|| {
                 let promise = Promise::new(&global, can_gc);
                 promise.resolve_native(&(), can_gc);
@@ -563,6 +562,8 @@ impl ReadableStreamDefaultController {
     /// <https://streams.spec.whatwg.org/#rs-default-controller-private-cancel>
     pub(crate) fn perform_cancel_steps(
         &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
         reason: SafeHandleValue,
         can_gc: CanGc,
     ) -> Rc<Promise> {
@@ -573,24 +574,21 @@ impl ReadableStreamDefaultController {
             .underlying_source
             .get()
             .expect("Controller should have a source when the cancel steps are called into.");
-        let global = self.global();
-
         // Let result be the result of performing this.[[cancelAlgorithm]], passing reason.
         let result = underlying_source
-            .call_cancel_algorithm(reason, can_gc)
+            .call_cancel_algorithm(cx, global, reason, can_gc)
             .unwrap_or_else(|| {
-                let promise = Promise::new(&global, can_gc);
+                let promise = Promise::new(global, can_gc);
                 promise.resolve_native(&(), can_gc);
                 Ok(promise)
             });
         let promise = result.unwrap_or_else(|error| {
-            let cx = GlobalScope::get_cx();
             rooted!(in(*cx) let mut rval = UndefinedValue());
-            // TODO: check if `self.global()` is the right globalscope.
+
             error
                 .clone()
-                .to_jsval(cx, &self.global(), rval.handle_mut(), can_gc);
-            let promise = Promise::new(&global, can_gc);
+                .to_jsval(cx, global, rval.handle_mut(), can_gc);
+            let promise = Promise::new(global, can_gc);
             promise.reject_native(&rval.handle(), can_gc);
             promise
         });
@@ -812,7 +810,7 @@ impl ReadableStreamDefaultController {
     }
 
     /// <https://streams.spec.whatwg.org/#readable-stream-default-controller-get-desired-size>
-    fn get_desired_size(&self) -> Option<f64> {
+    pub(crate) fn get_desired_size(&self) -> Option<f64> {
         let stream = self.stream.get()?;
 
         // If state is "errored", return null.
@@ -832,7 +830,7 @@ impl ReadableStreamDefaultController {
     }
 
     /// <https://streams.spec.whatwg.org/#readable-stream-default-controller-can-close-or-enqueue>
-    fn can_close_or_enqueue(&self) -> bool {
+    pub(crate) fn can_close_or_enqueue(&self) -> bool {
         let Some(stream) = self.stream.get() else {
             return false;
         };
@@ -865,6 +863,13 @@ impl ReadableStreamDefaultController {
 
         stream.error(e, can_gc);
     }
+
+    /// <https://streams.spec.whatwg.org/#rs-default-controller-has-backpressure>
+    pub(crate) fn has_backpressure(&self) -> bool {
+        // If ! ReadableStreamDefaultControllerShouldCallPull(controller) is true, return false.
+        // Otherwise, return true.
+        !self.should_call_pull()
+    }
 }
 
 impl ReadableStreamDefaultControllerMethods<crate::DomTypeHolder>
diff --git a/components/script/dom/readablestreamdefaultreader.rs b/components/script/dom/readablestreamdefaultreader.rs
index 65a63626287..7fd243b0b56 100644
--- a/components/script/dom/readablestreamdefaultreader.rs
+++ b/components/script/dom/readablestreamdefaultreader.rs
@@ -8,6 +8,7 @@ use std::mem;
 use std::rc::Rc;
 
 use dom_struct::dom_struct;
+use js::gc::MutableHandle;
 use js::jsapi::Heap;
 use js::jsval::{JSVal, UndefinedValue};
 use js::rust::{HandleObject as SafeHandleObject, HandleValue as SafeHandleValue};
@@ -97,13 +98,13 @@ impl Callback for ReadLoopFulFillmentHandler {
             };
 
             // Append the bytes represented by chunk to bytes.
-            let mut bytes = self.bytes.borrow_mut();
-            bytes.extend_from_slice(&chunk);
+            self.bytes.borrow_mut().extend_from_slice(&chunk);
 
             // Read-loop given reader, bytes, successSteps, and failureSteps.
+            rooted!(in(*cx) let mut this = Some(self.clone()));
             read_loop(
                 &global,
-                &mut Some(self.clone()),
+                this.handle_mut(),
                 Box::new(ReadLoopRejectionHandler {
                     failure_steps: self.failure_steps.clone(),
                 }),
@@ -133,7 +134,7 @@ impl Callback for ReadLoopRejectionHandler {
 /// <https://streams.spec.whatwg.org/#read-loop>
 fn read_loop(
     global: &GlobalScope,
-    fulfillment_handler: &mut Option<ReadLoopFulFillmentHandler>,
+    mut fulfillment_handler: MutableHandle<Option<ReadLoopFulFillmentHandler>>,
     rejection_handler: Box<ReadLoopRejectionHandler>,
     realm: InRealm,
     can_gc: CanGc,
@@ -500,7 +501,7 @@ impl ReadableStreamDefaultReader {
         let rejection_handler = Box::new(ReadLoopRejectionHandler { failure_steps });
         read_loop(
             global,
-            &mut fulfillment_handler,
+            fulfillment_handler.handle_mut(),
             rejection_handler,
             realm,
             can_gc,
@@ -604,8 +605,8 @@ impl ReadableStreamDefaultReaderMethods<crate::DomTypeHolder> for ReadableStream
     }
 
     /// <https://streams.spec.whatwg.org/#generic-reader-cancel>
-    fn Cancel(&self, _cx: SafeJSContext, reason: SafeHandleValue, can_gc: CanGc) -> Rc<Promise> {
-        self.generic_cancel(&self.global(), reason, can_gc)
+    fn Cancel(&self, cx: SafeJSContext, reason: SafeHandleValue, can_gc: CanGc) -> Rc<Promise> {
+        self.generic_cancel(cx, &self.global(), reason, can_gc)
     }
 }
 
diff --git a/components/script/dom/readablestreamgenericreader.rs b/components/script/dom/readablestreamgenericreader.rs
index b437605953b..d2a109ee692 100644
--- a/components/script/dom/readablestreamgenericreader.rs
+++ b/components/script/dom/readablestreamgenericreader.rs
@@ -16,7 +16,7 @@ use crate::dom::globalscope::GlobalScope;
 use crate::dom::promise::Promise;
 use crate::dom::readablestreambyobreader::ReadableStreamBYOBReader;
 use crate::dom::readablestreamdefaultreader::ReadableStreamDefaultReader;
-use crate::script_runtime::CanGc;
+use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
 
 /// <https://streams.spec.whatwg.org/#readablestreamgenericreader>
 pub(crate) trait ReadableStreamGenericReader {
@@ -61,7 +61,13 @@ pub(crate) trait ReadableStreamGenericReader {
     }
 
     /// <https://streams.spec.whatwg.org/#readable-stream-reader-generic-cancel>
-    fn reader_generic_cancel(&self, reason: SafeHandleValue, can_gc: CanGc) -> Rc<Promise> {
+    fn reader_generic_cancel(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        reason: SafeHandleValue,
+        can_gc: CanGc,
+    ) -> Rc<Promise> {
         // Let stream be reader.[[stream]].
         let stream = self.get_stream();
 
@@ -70,11 +76,10 @@ pub(crate) trait ReadableStreamGenericReader {
             stream.expect("Reader should have a stream when generic cancel is called into.");
 
         // Return ! ReadableStreamCancel(stream, reason).
-        stream.cancel(reason, can_gc)
+        stream.cancel(cx, global, reason, can_gc)
     }
 
     /// <https://streams.spec.whatwg.org/#readable-stream-reader-generic-release>
-    #[allow(unsafe_code)]
     fn generic_release(&self, can_gc: CanGc) -> Fallible<()> {
         // Let stream be reader.[[stream]].
 
@@ -135,6 +140,7 @@ pub(crate) trait ReadableStreamGenericReader {
     // <https://streams.spec.whatwg.org/#generic-reader-cancel>
     fn generic_cancel(
         &self,
+        cx: SafeJSContext,
         global: &GlobalScope,
         reason: SafeHandleValue,
         can_gc: CanGc,
@@ -147,7 +153,7 @@ pub(crate) trait ReadableStreamGenericReader {
             promise
         } else {
             // Return ! ReadableStreamReaderGenericCancel(this, reason).
-            self.reader_generic_cancel(reason, can_gc)
+            self.reader_generic_cancel(cx, global, reason, can_gc)
         }
     }
 
diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs
index 406b6b4222d..f7d73e6a2b4 100644
--- a/components/script/dom/request.rs
+++ b/components/script/dom/request.rs
@@ -113,6 +113,7 @@ fn net_request_from_global(global: &GlobalScope, url: ServoUrl) -> NetTraitsRequ
         .pipeline_id(Some(global.pipeline_id()))
         .https_state(global.get_https_state())
         .insecure_requests_policy(global.insecure_requests_policy())
+        .has_trustworthy_ancestor_origin(global.has_trustworthy_ancestor_or_current_origin())
         .build()
 }
 
diff --git a/components/script/dom/resizeobserver.rs b/components/script/dom/resizeobserver.rs
index ae883524fd3..b685151c153 100644
--- a/components/script/dom/resizeobserver.rs
+++ b/components/script/dom/resizeobserver.rs
@@ -2,7 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use std::cell::RefCell;
 use std::rc::Rc;
 
 use app_units::Au;
@@ -42,10 +41,17 @@ impl ResizeObservationDepth {
 #[dom_struct]
 pub(crate) struct ResizeObserver {
     reflector_: Reflector,
+
     /// <https://drafts.csswg.org/resize-observer/#dom-resizeobserver-callback-slot>
     #[ignore_malloc_size_of = "Rc are hard"]
     callback: Rc<ResizeObserverCallback>,
+
     /// <https://drafts.csswg.org/resize-observer/#dom-resizeobserver-observationtargets-slot>
+    ///
+    /// This list simultaneously also represents the
+    /// [`[[activeTargets]]`](https://drafts.csswg.org/resize-observer/#dom-resizeobserver-activetargets-slot)
+    /// and [`[[skippedTargets]]`](https://drafts.csswg.org/resize-observer/#dom-resizeobserver-skippedtargets-slot)
+    /// internal slots.
     observation_targets: DomRefCell<Vec<(ResizeObservation, Dom<Element>)>>,
 }
 
@@ -68,7 +74,8 @@ impl ResizeObserver {
         reflect_dom_object_with_proto(observer, window, proto, can_gc)
     }
 
-    /// <https://drafts.csswg.org/resize-observer/#gather-active-observations-h>
+    /// Step 2 of <https://drafts.csswg.org/resize-observer/#gather-active-observations-h>
+    ///
     /// <https://drafts.csswg.org/resize-observer/#has-active-resize-observations>
     pub(crate) fn gather_active_resize_observations_at_depth(
         &self,
@@ -76,34 +83,55 @@ impl ResizeObserver {
         has_active: &mut bool,
         can_gc: CanGc,
     ) {
+        // Step 2.1 Clear observer’s [[activeTargets]], and [[skippedTargets]].
+        // NOTE: This happens as part of Step 2.2
+
+        // Step 2.2 For each observation in observer.[[observationTargets]] run this step:
         for (observation, target) in self.observation_targets.borrow_mut().iter_mut() {
             observation.state = Default::default();
+
+            // Step 2.2.1 If observation.isActive() is true
             if let Some(size) = observation.is_active(target, can_gc) {
+                // Step 2.2.1.1 Let targetDepth be result of calculate depth for node for observation.target.
                 let target_depth = calculate_depth_for_node(target);
+
+                // Step 2.2.1.2 If targetDepth is greater than depth then add observation to [[activeTargets]].
                 if target_depth > *depth {
-                    observation.state = ObservationState::Active(size).into();
+                    observation.state = ObservationState::Active(size);
                     *has_active = true;
-                } else {
-                    observation.state = ObservationState::Skipped.into();
+                }
+                // Step 2.2.1.3 Else add observation to [[skippedTargets]].
+                else {
+                    observation.state = ObservationState::Skipped;
                 }
             }
         }
     }
 
-    /// <https://drafts.csswg.org/resize-observer/#broadcast-active-resize-observations>
+    /// Step 2 of <https://drafts.csswg.org/resize-observer/#broadcast-active-resize-observations>
     pub(crate) fn broadcast_active_resize_observations(
         &self,
         shallowest_target_depth: &mut ResizeObservationDepth,
         can_gc: CanGc,
     ) {
+        // Step 2.1 If observer.[[activeTargets]] slot is empty, continue.
+        // NOTE: Due to the way we implement the activeTarges internal slot we can't easily
+        // know if it's empty. Instead we remember whether there were any active observation
+        // targets during the following traversal and return if there were none.
+        let mut has_active_observation_targets = false;
+
+        // Step 2.2 Let entries be an empty list of ResizeObserverEntryies.
         let mut entries: Vec<DomRoot<ResizeObserverEntry>> = Default::default();
-        for (observation, target) in self.observation_targets.borrow().iter() {
+
+        // Step 2.3 For each observation in [[activeTargets]] perform these steps:
+        for (observation, target) in self.observation_targets.borrow_mut().iter_mut() {
             let box_size = {
-                let ObservationState::Active(box_size) = &*observation.state.borrow() else {
+                let ObservationState::Active(box_size) = observation.state else {
                     continue;
                 };
-                *box_size
+                box_size
             };
+            has_active_observation_targets = true;
 
             // #create-and-populate-a-resizeobserverentry
 
@@ -139,16 +167,25 @@ impl ResizeObserver {
             // initialized with one reported size (zero).
             // The spec plans to store multiple reported sizes,
             // but for now there can be only one.
-            observation.last_reported_sizes.borrow_mut()[0] = size_impl;
-            *observation.state.borrow_mut() = ObservationState::Done;
+            observation.last_reported_sizes[0] = size_impl;
+            observation.state = ObservationState::Done;
             let target_depth = calculate_depth_for_node(target);
             if target_depth < *shallowest_target_depth {
                 *shallowest_target_depth = target_depth;
             }
         }
+
+        if !has_active_observation_targets {
+            return;
+        }
+
+        // Step 2.4 Invoke observer.[[callback]] with entries.
         let _ = self
             .callback
             .Call_(self, entries, self, ExceptionHandling::Report, can_gc);
+
+        // Step 2.5 Clear observer.[[activeTargets]].
+        // NOTE: The observation state was modified in Step 2.2
     }
 
     /// <https://drafts.csswg.org/resize-observer/#has-skipped-observations-h>
@@ -156,7 +193,7 @@ impl ResizeObserver {
         self.observation_targets
             .borrow()
             .iter()
-            .any(|(observation, _)| *observation.state.borrow() == ObservationState::Skipped)
+            .any(|(observation, _)| observation.state == ObservationState::Skipped)
     }
 }
 
@@ -225,12 +262,12 @@ enum ObservationState {
 #[derive(JSTraceable, MallocSizeOf)]
 struct ResizeObservation {
     /// <https://drafts.csswg.org/resize-observer/#dom-resizeobservation-observedbox>
-    observed_box: RefCell<ResizeObserverBoxOptions>,
+    observed_box: ResizeObserverBoxOptions,
     /// <https://drafts.csswg.org/resize-observer/#dom-resizeobservation-lastreportedsizes>
-    last_reported_sizes: RefCell<Vec<ResizeObserverSizeImpl>>,
+    last_reported_sizes: Vec<ResizeObserverSizeImpl>,
     /// State machine mimicking the "active" and "skipped" targets slots of the observer.
     #[no_trace]
-    state: RefCell<ObservationState>,
+    state: ObservationState,
 }
 
 impl ResizeObservation {
@@ -238,9 +275,9 @@ impl ResizeObservation {
     pub(crate) fn new(observed_box: ResizeObserverBoxOptions) -> ResizeObservation {
         let size_impl = ResizeObserverSizeImpl::new(0.0, 0.0);
         ResizeObservation {
-            observed_box: RefCell::new(observed_box),
-            last_reported_sizes: RefCell::new(vec![size_impl]),
-            state: RefCell::new(Default::default()),
+            observed_box,
+            last_reported_sizes: vec![size_impl],
+            state: Default::default(),
         }
     }
 
@@ -248,8 +285,8 @@ impl ResizeObservation {
     /// Returning an optional calculated size, instead of a boolean,
     /// to avoid recalculating the size in the subsequent broadcast.
     fn is_active(&self, target: &Element, can_gc: CanGc) -> Option<Rect<Au>> {
-        let last_reported_size = self.last_reported_sizes.borrow()[0];
-        let box_size = calculate_box_size(target, &self.observed_box.borrow(), can_gc);
+        let last_reported_size = self.last_reported_sizes[0];
+        let box_size = calculate_box_size(target, &self.observed_box, can_gc);
         let is_active = box_size.width().to_f64_px() != last_reported_size.inline_size() ||
             box_size.height().to_f64_px() != last_reported_size.block_size();
         if is_active { Some(box_size) } else { None }
@@ -259,7 +296,7 @@ impl ResizeObservation {
 /// <https://drafts.csswg.org/resize-observer/#calculate-depth-for-node>
 fn calculate_depth_for_node(target: &Element) -> ResizeObservationDepth {
     let node = target.upcast::<Node>();
-    let depth = node.ancestors().count();
+    let depth = node.inclusive_ancestors_in_flat_tree().count() - 1;
     ResizeObservationDepth(depth)
 }
 
diff --git a/components/script/dom/response.rs b/components/script/dom/response.rs
index 283b7d615aa..cbdfbe94603 100644
--- a/components/script/dom/response.rs
+++ b/components/script/dom/response.rs
@@ -8,7 +8,7 @@ use std::str::FromStr;
 use dom_struct::dom_struct;
 use http::header::HeaderMap as HyperHeaders;
 use hyper_serde::Serde;
-use js::rust::HandleObject;
+use js::rust::{HandleObject, HandleValue};
 use net_traits::http_status::HttpStatus;
 use servo_url::ServoUrl;
 use url::Position;
@@ -24,13 +24,13 @@ use crate::dom::bindings::codegen::Bindings::XMLHttpRequestBinding::BodyInit;
 use crate::dom::bindings::error::{Error, Fallible};
 use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object_with_proto};
 use crate::dom::bindings::root::{DomRoot, MutNullableDom};
-use crate::dom::bindings::str::{ByteString, USVString};
+use crate::dom::bindings::str::{ByteString, USVString, serialize_jsval_to_json_utf8};
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::headers::{Guard, Headers, is_obs_text, is_vchar};
 use crate::dom::promise::Promise;
 use crate::dom::readablestream::ReadableStream;
 use crate::dom::underlyingsourcecontainer::UnderlyingSourceType;
-use crate::script_runtime::{CanGc, StreamConsumer};
+use crate::script_runtime::{CanGc, JSContext, StreamConsumer};
 
 #[dom_struct]
 pub(crate) struct Response {
@@ -72,7 +72,7 @@ impl Response {
         }
     }
 
-    // https://fetch.spec.whatwg.org/#dom-response
+    /// <https://fetch.spec.whatwg.org/#dom-response>
     pub(crate) fn new(global: &GlobalScope, can_gc: CanGc) -> DomRoot<Response> {
         Self::new_with_proto(global, None, can_gc)
     }
@@ -142,92 +142,43 @@ fn is_null_body_status(status: u16) -> bool {
 }
 
 impl ResponseMethods<crate::DomTypeHolder> for Response {
-    // https://fetch.spec.whatwg.org/#initialize-a-response
+    /// <https://fetch.spec.whatwg.org/#dom-response>
     fn Constructor(
         global: &GlobalScope,
         proto: Option<HandleObject>,
         can_gc: CanGc,
-        body: Option<BodyInit>,
+        body_init: Option<BodyInit>,
         init: &ResponseBinding::ResponseInit,
     ) -> Fallible<DomRoot<Response>> {
-        // Step 1
-        if init.status < 200 || init.status > 599 {
-            return Err(Error::Range(format!(
-                "init's status member should be in the range 200 to 599, inclusive, but is {}",
-                init.status
-            )));
-        }
+        // 1. Set this’s response to a new response.
+        // Our Response/Body types don't actually hold onto an internal fetch Response.
+        let response = Response::new_with_proto(global, proto, can_gc);
 
-        // Step 2
-        if !is_valid_status_text(&init.statusText) {
-            return Err(Error::Type(
-                "init's statusText member does not match the reason-phrase token production"
-                    .to_string(),
-            ));
-        }
+        // 2. Set this’s headers to a new Headers object with this’s relevant realm,
+        // whose header list is this’s response’s header list and guard is "response".
+        response.Headers(can_gc).set_guard(Guard::Response);
 
-        let r = Response::new_with_proto(global, proto, can_gc);
+        // 3. Let bodyWithType be null.
+        // 4. If body is non-null, then set bodyWithType to the result of extracting body.
+        let body_with_type = match body_init {
+            Some(body) => Some(body.extract(global, can_gc)?),
+            None => None,
+        };
 
-        // Step 3 & 4
-        *r.status.borrow_mut() = HttpStatus::new_raw(init.status, init.statusText.clone().into());
-
-        // Step 5
-        if let Some(ref headers_member) = init.headers {
-            r.Headers(can_gc).fill(Some(headers_member.clone()))?;
-        }
-
-        // Step 6
-        if let Some(ref body) = body {
-            // Step 6.1
-            if is_null_body_status(init.status) {
-                return Err(Error::Type(
-                    "Body is non-null but init's status member is a null body status".to_string(),
-                ));
-            };
-
-            // Step 6.2
-            let ExtractedBody {
-                stream,
-                total_bytes: _,
-                content_type,
-                source: _,
-            } = body.extract(global, can_gc)?;
-
-            r.body_stream.set(Some(&*stream));
-
-            // Step 6.3
-            if let Some(content_type_contents) = content_type {
-                if !r
-                    .Headers(can_gc)
-                    .Has(ByteString::new(b"Content-Type".to_vec()))
-                    .unwrap()
-                {
-                    r.Headers(can_gc).Append(
-                        ByteString::new(b"Content-Type".to_vec()),
-                        ByteString::new(content_type_contents.as_bytes().to_vec()),
-                    )?;
-                }
-            };
-        } else {
-            // Reset FetchResponse to an in-memory stream with empty byte sequence here for
-            // no-init-body case
-            let stream = ReadableStream::new_from_bytes(global, Vec::with_capacity(0), can_gc)?;
-            r.body_stream.set(Some(&*stream));
-        }
-
-        Ok(r)
+        // 5. Perform *initialize a response* given this, init, and bodyWithType.
+        initialize_response(global, can_gc, body_with_type, init, response)
     }
 
-    // https://fetch.spec.whatwg.org/#dom-response-error
+    /// <https://fetch.spec.whatwg.org/#dom-response-error>
     fn Error(global: &GlobalScope, can_gc: CanGc) -> DomRoot<Response> {
-        let r = Response::new(global, can_gc);
-        *r.response_type.borrow_mut() = DOMResponseType::Error;
-        r.Headers(can_gc).set_guard(Guard::Immutable);
-        *r.status.borrow_mut() = HttpStatus::new_error();
-        r
+        let response = Response::new(global, can_gc);
+        *response.response_type.borrow_mut() = DOMResponseType::Error;
+        response.Headers(can_gc).set_guard(Guard::Immutable);
+        *response.status.borrow_mut() = HttpStatus::new_error();
+        response
     }
 
-    // https://fetch.spec.whatwg.org/#dom-response-redirect
+    /// <https://fetch.spec.whatwg.org/#dom-response-redirect>
     fn Redirect(
         global: &GlobalScope,
         url: USVString,
@@ -251,31 +202,60 @@ impl ResponseMethods<crate::DomTypeHolder> for Response {
 
         // Step 4
         // see Step 4 continued
-        let r = Response::new(global, can_gc);
+        let response = Response::new(global, can_gc);
 
         // Step 5
-        *r.status.borrow_mut() = HttpStatus::new_raw(status, vec![]);
+        *response.status.borrow_mut() = HttpStatus::new_raw(status, vec![]);
 
         // Step 6
         let url_bytestring =
             ByteString::from_str(url.as_str()).unwrap_or(ByteString::new(b"".to_vec()));
-        r.Headers(can_gc)
+        response
+            .Headers(can_gc)
             .Set(ByteString::new(b"Location".to_vec()), url_bytestring)?;
 
         // Step 4 continued
         // Headers Guard is set to Immutable here to prevent error in Step 6
-        r.Headers(can_gc).set_guard(Guard::Immutable);
+        response.Headers(can_gc).set_guard(Guard::Immutable);
 
         // Step 7
-        Ok(r)
+        Ok(response)
     }
 
-    // https://fetch.spec.whatwg.org/#dom-response-type
+    /// <https://fetch.spec.whatwg.org/#dom-response-json>
+    #[allow(unsafe_code)]
+    fn CreateFromJson(
+        cx: JSContext,
+        global: &GlobalScope,
+        data: HandleValue,
+        init: &ResponseBinding::ResponseInit,
+        can_gc: CanGc,
+    ) -> Fallible<DomRoot<Response>> {
+        // 1. Let bytes the result of running serialize a JavaScript value to JSON bytes on data.
+        let json_str = serialize_jsval_to_json_utf8(cx, data)?;
+
+        // 2. Let body be the result of extracting bytes
+        // The spec's definition of JSON bytes is a UTF-8 encoding so using a DOMString here handles
+        // the encoding part.
+        let body_init = BodyInit::String(json_str);
+        let mut body = body_init.extract(global, can_gc)?;
+
+        // 3. Let responseObject be the result of creating a Response object, given a new response,
+        // "response", and the current realm.
+        let response = Response::new(global, can_gc);
+        response.Headers(can_gc).set_guard(Guard::Response);
+
+        // 4. Perform initialize a response given responseObject, init, and (body, "application/json").
+        body.content_type = Some("application/json".into());
+        initialize_response(global, can_gc, Some(body), init, response)
+    }
+
+    /// <https://fetch.spec.whatwg.org/#dom-response-type>
     fn Type(&self) -> DOMResponseType {
         *self.response_type.borrow() //into()
     }
 
-    // https://fetch.spec.whatwg.org/#dom-response-url
+    /// <https://fetch.spec.whatwg.org/#dom-response-url>
     fn Url(&self) -> USVString {
         USVString(String::from(
             (*self.url.borrow())
@@ -285,33 +265,33 @@ impl ResponseMethods<crate::DomTypeHolder> for Response {
         ))
     }
 
-    // https://fetch.spec.whatwg.org/#dom-response-redirected
+    /// <https://fetch.spec.whatwg.org/#dom-response-redirected>
     fn Redirected(&self) -> bool {
         return *self.redirected.borrow();
     }
 
-    // https://fetch.spec.whatwg.org/#dom-response-status
+    /// <https://fetch.spec.whatwg.org/#dom-response-status>
     fn Status(&self) -> u16 {
         self.status.borrow().raw_code()
     }
 
-    // https://fetch.spec.whatwg.org/#dom-response-ok
+    /// <https://fetch.spec.whatwg.org/#dom-response-ok>
     fn Ok(&self) -> bool {
         self.status.borrow().is_success()
     }
 
-    // https://fetch.spec.whatwg.org/#dom-response-statustext
+    /// <https://fetch.spec.whatwg.org/#dom-response-statustext>
     fn StatusText(&self) -> ByteString {
         ByteString::new(self.status.borrow().message().to_vec())
     }
 
-    // https://fetch.spec.whatwg.org/#dom-response-headers
+    /// <https://fetch.spec.whatwg.org/#dom-response-headers>
     fn Headers(&self, can_gc: CanGc) -> DomRoot<Headers> {
         self.headers_reflector
             .or_init(|| Headers::for_response(&self.global(), can_gc))
     }
 
-    // https://fetch.spec.whatwg.org/#dom-response-clone
+    /// <https://fetch.spec.whatwg.org/#dom-response-clone>
     fn Clone(&self, can_gc: CanGc) -> Fallible<DomRoot<Response>> {
         // Step 1
         if self.is_locked() || self.is_disturbed() {
@@ -352,7 +332,7 @@ impl ResponseMethods<crate::DomTypeHolder> for Response {
         Ok(new_response)
     }
 
-    // https://fetch.spec.whatwg.org/#dom-body-bodyused
+    /// <https://fetch.spec.whatwg.org/#dom-body-bodyused>
     fn BodyUsed(&self) -> bool {
         self.is_disturbed()
     }
@@ -362,27 +342,27 @@ impl ResponseMethods<crate::DomTypeHolder> for Response {
         self.body()
     }
 
-    // https://fetch.spec.whatwg.org/#dom-body-text
+    /// <https://fetch.spec.whatwg.org/#dom-body-text>
     fn Text(&self, can_gc: CanGc) -> Rc<Promise> {
         consume_body(self, BodyType::Text, can_gc)
     }
 
-    // https://fetch.spec.whatwg.org/#dom-body-blob
+    /// <https://fetch.spec.whatwg.org/#dom-body-blob>
     fn Blob(&self, can_gc: CanGc) -> Rc<Promise> {
         consume_body(self, BodyType::Blob, can_gc)
     }
 
-    // https://fetch.spec.whatwg.org/#dom-body-formdata
+    /// <https://fetch.spec.whatwg.org/#dom-body-formdata>
     fn FormData(&self, can_gc: CanGc) -> Rc<Promise> {
         consume_body(self, BodyType::FormData, can_gc)
     }
 
-    // https://fetch.spec.whatwg.org/#dom-body-json
+    /// <https://fetch.spec.whatwg.org/#dom-body-json>
     fn Json(&self, can_gc: CanGc) -> Rc<Promise> {
         consume_body(self, BodyType::Json, can_gc)
     }
 
-    // https://fetch.spec.whatwg.org/#dom-body-arraybuffer
+    /// <https://fetch.spec.whatwg.org/#dom-body-arraybuffer>
     fn ArrayBuffer(&self, can_gc: CanGc) -> Rc<Promise> {
         consume_body(self, BodyType::ArrayBuffer, can_gc)
     }
@@ -393,6 +373,80 @@ impl ResponseMethods<crate::DomTypeHolder> for Response {
     }
 }
 
+/// <https://fetch.spec.whatwg.org/#initialize-a-response>
+fn initialize_response(
+    global: &GlobalScope,
+    can_gc: CanGc,
+    body: Option<ExtractedBody>,
+    init: &ResponseBinding::ResponseInit,
+    response: DomRoot<Response>,
+) -> Result<DomRoot<Response>, Error> {
+    // 1. If init["status"] is not in the range 200 to 599, inclusive, then throw a RangeError.
+    if init.status < 200 || init.status > 599 {
+        return Err(Error::Range(format!(
+            "init's status member should be in the range 200 to 599, inclusive, but is {}",
+            init.status
+        )));
+    }
+
+    // 2. If init["statusText"] is not the empty string and does not match the reason-phrase token production,
+    // then throw a TypeError.
+    if !is_valid_status_text(&init.statusText) {
+        return Err(Error::Type(
+            "init's statusText member does not match the reason-phrase token production"
+                .to_string(),
+        ));
+    }
+
+    // 3. Set response’s response’s status to init["status"].
+    // 4. Set response’s response’s status message to init["statusText"].
+    *response.status.borrow_mut() =
+        HttpStatus::new_raw(init.status, init.statusText.clone().into());
+
+    // 5. If init["headers"] exists, then fill response’s headers with init["headers"].
+    if let Some(ref headers_member) = init.headers {
+        response
+            .Headers(can_gc)
+            .fill(Some(headers_member.clone()))?;
+    }
+
+    // 6. If body is non-null, then:
+    if let Some(ref body) = body {
+        // 6.1 If response’s status is a null body status, then throw a TypeError.
+        if is_null_body_status(init.status) {
+            return Err(Error::Type(
+                "Body is non-null but init's status member is a null body status".to_string(),
+            ));
+        };
+
+        // 6.2 Set response’s body to body’s body.
+        response.body_stream.set(Some(&*body.stream));
+
+        // 6.3 If body’s type is non-null and response’s header list does not contain `Content-Type`,
+        // then append (`Content-Type`, body’s type) to response’s header list.
+        if let Some(content_type_contents) = &body.content_type {
+            if !response
+                .Headers(can_gc)
+                .Has(ByteString::new(b"Content-Type".to_vec()))
+                .unwrap()
+            {
+                response.Headers(can_gc).Append(
+                    ByteString::new(b"Content-Type".to_vec()),
+                    ByteString::new(content_type_contents.as_bytes().to_vec()),
+                )?;
+            }
+        };
+    } else {
+        // Reset FetchResponse to an in-memory stream with empty byte sequence here for
+        // no-init-body case. This is because the Response/Body types here do not hold onto a
+        // fetch Response object.
+        let stream = ReadableStream::new_from_bytes(global, Vec::with_capacity(0), can_gc)?;
+        response.body_stream.set(Some(&*stream));
+    }
+
+    Ok(response)
+}
+
 fn serialize_without_fragment(url: &ServoUrl) -> &str {
     &url[..Position::AfterQuery]
 }
diff --git a/components/script/dom/rtcdatachannel.rs b/components/script/dom/rtcdatachannel.rs
index 2f85d14f6dc..1aad3ef6794 100644
--- a/components/script/dom/rtcdatachannel.rs
+++ b/components/script/dom/rtcdatachannel.rs
@@ -5,13 +5,13 @@
 use std::cell::Cell;
 use std::ptr;
 
+use constellation_traits::BlobImpl;
 use dom_struct::dom_struct;
 use js::conversions::ToJSValConvertible;
 use js::jsapi::{JSAutoRealm, JSObject};
 use js::jsval::UndefinedValue;
 use js::rust::CustomAutoRooterGuard;
 use js::typedarray::{ArrayBuffer, ArrayBufferView, CreateWith};
-use script_traits::serializable::BlobImpl;
 use servo_media::webrtc::{
     DataChannelId, DataChannelInit, DataChannelMessage, DataChannelState, WebRtcError,
 };
@@ -141,6 +141,7 @@ impl RTCDataChannel {
 
     pub(crate) fn on_error(&self, error: WebRtcError, can_gc: CanGc) {
         let global = self.global();
+        let window = global.as_window();
         let cx = GlobalScope::get_cx();
         let _ac = JSAutoRealm::new(*cx, self.reflector().get_jsobject().get());
         let init = RTCErrorInit {
@@ -154,8 +155,8 @@ impl RTCDataChannel {
         let message = match error {
             WebRtcError::Backend(message) => DOMString::from(message),
         };
-        let error = RTCError::new(&global, &init, message, can_gc);
-        let event = RTCErrorEvent::new(&global, atom!("error"), false, false, &error, can_gc);
+        let error = RTCError::new(window, &init, message, can_gc);
+        let event = RTCErrorEvent::new(window, atom!("error"), false, false, &error, can_gc);
         event.upcast::<Event>().fire(self.upcast(), can_gc);
     }
 
diff --git a/components/script/dom/rtcdatachannelevent.rs b/components/script/dom/rtcdatachannelevent.rs
index d8139c3f16c..b8426d7a49f 100644
--- a/components/script/dom/rtcdatachannelevent.rs
+++ b/components/script/dom/rtcdatachannelevent.rs
@@ -11,11 +11,10 @@ use crate::dom::bindings::codegen::Bindings::RTCDataChannelEventBinding::{
     RTCDataChannelEventInit, RTCDataChannelEventMethods,
 };
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::event::Event;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::rtcdatachannel::RTCDataChannel;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
@@ -35,18 +34,18 @@ impl RTCDataChannelEvent {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         type_: Atom,
         bubbles: bool,
         cancelable: bool,
         channel: &RTCDataChannel,
         can_gc: CanGc,
     ) -> DomRoot<RTCDataChannelEvent> {
-        Self::new_with_proto(global, None, type_, bubbles, cancelable, channel, can_gc)
+        Self::new_with_proto(window, None, type_, bubbles, cancelable, channel, can_gc)
     }
 
     fn new_with_proto(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         type_: Atom,
         bubbles: bool,
@@ -56,7 +55,7 @@ impl RTCDataChannelEvent {
     ) -> DomRoot<RTCDataChannelEvent> {
         let event = reflect_dom_object_with_proto(
             Box::new(RTCDataChannelEvent::new_inherited(channel)),
-            global,
+            window,
             proto,
             can_gc,
         );
@@ -78,7 +77,7 @@ impl RTCDataChannelEventMethods<crate::DomTypeHolder> for RTCDataChannelEvent {
         init: &RTCDataChannelEventInit,
     ) -> DomRoot<RTCDataChannelEvent> {
         RTCDataChannelEvent::new_with_proto(
-            &window.global(),
+            window,
             proto,
             Atom::from(type_),
             init.parent.bubbles,
diff --git a/components/script/dom/rtcerror.rs b/components/script/dom/rtcerror.rs
index 61299c49cbe..f8ee517537b 100644
--- a/components/script/dom/rtcerror.rs
+++ b/components/script/dom/rtcerror.rs
@@ -8,11 +8,10 @@ use js::rust::HandleObject;
 use crate::dom::bindings::codegen::Bindings::RTCErrorBinding::{
     RTCErrorDetailType, RTCErrorInit, RTCErrorMethods,
 };
-use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
 use crate::dom::domexception::DOMException;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
 
@@ -41,16 +40,16 @@ impl RTCError {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         init: &RTCErrorInit,
         message: DOMString,
         can_gc: CanGc,
     ) -> DomRoot<RTCError> {
-        Self::new_with_proto(global, None, init, message, can_gc)
+        Self::new_with_proto(window, None, init, message, can_gc)
     }
 
     fn new_with_proto(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         init: &RTCErrorInit,
         message: DOMString,
@@ -58,7 +57,7 @@ impl RTCError {
     ) -> DomRoot<RTCError> {
         reflect_dom_object_with_proto(
             Box::new(RTCError::new_inherited(init, message)),
-            global,
+            window,
             proto,
             can_gc,
         )
@@ -74,7 +73,7 @@ impl RTCErrorMethods<crate::DomTypeHolder> for RTCError {
         init: &RTCErrorInit,
         message: DOMString,
     ) -> DomRoot<RTCError> {
-        RTCError::new_with_proto(&window.global(), proto, init, message, can_gc)
+        RTCError::new_with_proto(window, proto, init, message, can_gc)
     }
 
     // https://www.w3.org/TR/webrtc/#dom-rtcerror-errordetail
diff --git a/components/script/dom/rtcerrorevent.rs b/components/script/dom/rtcerrorevent.rs
index 04c07429c0d..a8ec4d67668 100644
--- a/components/script/dom/rtcerrorevent.rs
+++ b/components/script/dom/rtcerrorevent.rs
@@ -11,11 +11,10 @@ use crate::dom::bindings::codegen::Bindings::RTCErrorEventBinding::{
     RTCErrorEventInit, RTCErrorEventMethods,
 };
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::event::Event;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::rtcerror::RTCError;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
@@ -35,18 +34,18 @@ impl RTCErrorEvent {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         type_: Atom,
         bubbles: bool,
         cancelable: bool,
         error: &RTCError,
         can_gc: CanGc,
     ) -> DomRoot<RTCErrorEvent> {
-        Self::new_with_proto(global, None, type_, bubbles, cancelable, error, can_gc)
+        Self::new_with_proto(window, None, type_, bubbles, cancelable, error, can_gc)
     }
 
     fn new_with_proto(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         type_: Atom,
         bubbles: bool,
@@ -56,7 +55,7 @@ impl RTCErrorEvent {
     ) -> DomRoot<RTCErrorEvent> {
         let event = reflect_dom_object_with_proto(
             Box::new(RTCErrorEvent::new_inherited(error)),
-            global,
+            window,
             proto,
             can_gc,
         );
@@ -78,7 +77,7 @@ impl RTCErrorEventMethods<crate::DomTypeHolder> for RTCErrorEvent {
         init: &RTCErrorEventInit,
     ) -> DomRoot<RTCErrorEvent> {
         RTCErrorEvent::new_with_proto(
-            &window.global(),
+            window,
             proto,
             Atom::from(type_),
             init.parent.bubbles,
diff --git a/components/script/dom/rtcicecandidate.rs b/components/script/dom/rtcicecandidate.rs
index a2090aecdf5..09d70704920 100644
--- a/components/script/dom/rtcicecandidate.rs
+++ b/components/script/dom/rtcicecandidate.rs
@@ -9,10 +9,9 @@ use crate::dom::bindings::codegen::Bindings::RTCIceCandidateBinding::{
     RTCIceCandidateInit, RTCIceCandidateMethods,
 };
 use crate::dom::bindings::error::{Error, Fallible};
-use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::{Reflector, reflect_dom_object_with_proto};
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
 
@@ -42,7 +41,7 @@ impl RTCIceCandidate {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         candidate: DOMString,
         sdp_m_id: Option<DOMString>,
         sdp_m_line_index: Option<u16>,
@@ -50,7 +49,7 @@ impl RTCIceCandidate {
         can_gc: CanGc,
     ) -> DomRoot<RTCIceCandidate> {
         Self::new_with_proto(
-            global,
+            window,
             None,
             candidate,
             sdp_m_id,
@@ -61,7 +60,7 @@ impl RTCIceCandidate {
     }
 
     fn new_with_proto(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         candidate: DOMString,
         sdp_m_id: Option<DOMString>,
@@ -76,7 +75,7 @@ impl RTCIceCandidate {
                 sdp_m_line_index,
                 username_fragment,
             )),
-            global,
+            window,
             proto,
             can_gc,
         )
@@ -97,7 +96,7 @@ impl RTCIceCandidateMethods<crate::DomTypeHolder> for RTCIceCandidate {
             ));
         }
         Ok(RTCIceCandidate::new_with_proto(
-            &window.global(),
+            window,
             proto,
             config.candidate.clone(),
             config.sdpMid.clone(),
diff --git a/components/script/dom/rtcpeerconnection.rs b/components/script/dom/rtcpeerconnection.rs
index d16a69d47f9..b96634ac95e 100644
--- a/components/script/dom/rtcpeerconnection.rs
+++ b/components/script/dom/rtcpeerconnection.rs
@@ -38,7 +38,6 @@ use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
 use crate::dom::bindings::str::USVString;
 use crate::dom::event::{Event, EventBubbles, EventCancelable};
 use crate::dom::eventtarget::EventTarget;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::mediastream::MediaStream;
 use crate::dom::mediastreamtrack::MediaStreamTrack;
 use crate::dom::promise::Promise;
@@ -177,14 +176,14 @@ impl RTCPeerConnection {
     }
 
     fn new(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         config: &RTCConfiguration,
         can_gc: CanGc,
     ) -> DomRoot<RTCPeerConnection> {
         let this = reflect_dom_object_with_proto(
             Box::new(RTCPeerConnection::new_inherited()),
-            global,
+            window,
             proto,
             can_gc,
         );
@@ -230,7 +229,7 @@ impl RTCPeerConnection {
             return;
         }
         let candidate = RTCIceCandidate::new(
-            &self.global(),
+            self.global().as_window(),
             candidate.candidate.into(),
             None,
             Some(candidate.sdp_mline_index as u16),
@@ -238,7 +237,7 @@ impl RTCPeerConnection {
             can_gc,
         );
         let event = RTCPeerConnectionIceEvent::new(
-            &self.global(),
+            self.global().as_window(),
             atom!("icecandidate"),
             Some(&candidate),
             None,
@@ -267,8 +266,14 @@ impl RTCPeerConnection {
             return;
         }
         let track = MediaStreamTrack::new(&self.global(), id, ty, can_gc);
-        let event =
-            RTCTrackEvent::new(&self.global(), atom!("track"), false, false, &track, can_gc);
+        let event = RTCTrackEvent::new(
+            self.global().as_window(),
+            atom!("track"),
+            false,
+            false,
+            &track,
+            can_gc,
+        );
         event.upcast::<Event>().fire(self.upcast(), can_gc);
     }
 
@@ -294,7 +299,7 @@ impl RTCPeerConnection {
                 );
 
                 let event = RTCDataChannelEvent::new(
-                    &self.global(),
+                    self.global().as_window(),
                     atom!("datachannel"),
                     false,
                     false,
@@ -372,7 +377,7 @@ impl RTCPeerConnection {
         // step 6
         if state == RTCIceGatheringState::Complete {
             let event = RTCPeerConnectionIceEvent::new(
-                &self.global(),
+                self.global().as_window(),
                 atom!("icecandidate"),
                 None,
                 None,
@@ -502,12 +507,7 @@ impl RTCPeerConnectionMethods<crate::DomTypeHolder> for RTCPeerConnection {
         can_gc: CanGc,
         config: &RTCConfiguration,
     ) -> Fallible<DomRoot<RTCPeerConnection>> {
-        Ok(RTCPeerConnection::new(
-            &window.global(),
-            proto,
-            config,
-            can_gc,
-        ))
+        Ok(RTCPeerConnection::new(window, proto, config, can_gc))
     }
 
     // https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-icecandidate
diff --git a/components/script/dom/rtcpeerconnectioniceevent.rs b/components/script/dom/rtcpeerconnectioniceevent.rs
index b3e1eb97c33..fa779d48505 100644
--- a/components/script/dom/rtcpeerconnectioniceevent.rs
+++ b/components/script/dom/rtcpeerconnectioniceevent.rs
@@ -12,11 +12,10 @@ use crate::dom::bindings::codegen::Bindings::RTCPeerConnectionIceEventBinding::{
 };
 use crate::dom::bindings::error::Fallible;
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::event::Event;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::rtcicecandidate::RTCIceCandidate;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
@@ -41,18 +40,18 @@ impl RTCPeerConnectionIceEvent {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         ty: Atom,
         candidate: Option<&RTCIceCandidate>,
         url: Option<DOMString>,
         trusted: bool,
         can_gc: CanGc,
     ) -> DomRoot<RTCPeerConnectionIceEvent> {
-        Self::new_with_proto(global, None, ty, candidate, url, trusted, can_gc)
+        Self::new_with_proto(window, None, ty, candidate, url, trusted, can_gc)
     }
 
     fn new_with_proto(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         ty: Atom,
         candidate: Option<&RTCIceCandidate>,
@@ -62,7 +61,7 @@ impl RTCPeerConnectionIceEvent {
     ) -> DomRoot<RTCPeerConnectionIceEvent> {
         let e = reflect_dom_object_with_proto(
             Box::new(RTCPeerConnectionIceEvent::new_inherited(candidate, url)),
-            global,
+            window,
             proto,
             can_gc,
         );
@@ -83,7 +82,7 @@ impl RTCPeerConnectionIceEventMethods<crate::DomTypeHolder> for RTCPeerConnectio
         init: &RTCPeerConnectionIceEventInit,
     ) -> Fallible<DomRoot<RTCPeerConnectionIceEvent>> {
         Ok(RTCPeerConnectionIceEvent::new_with_proto(
-            &window.global(),
+            window,
             proto,
             ty.into(),
             init.candidate
diff --git a/components/script/dom/rtcsessiondescription.rs b/components/script/dom/rtcsessiondescription.rs
index 6dfec4186fc..84399afeb0b 100644
--- a/components/script/dom/rtcsessiondescription.rs
+++ b/components/script/dom/rtcsessiondescription.rs
@@ -9,10 +9,9 @@ use crate::dom::bindings::codegen::Bindings::RTCSessionDescriptionBinding::{
     RTCSdpType, RTCSessionDescriptionInit, RTCSessionDescriptionMethods,
 };
 use crate::dom::bindings::error::Fallible;
-use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::{Reflector, reflect_dom_object_with_proto};
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
 
@@ -33,7 +32,7 @@ impl RTCSessionDescription {
     }
 
     fn new(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         ty: RTCSdpType,
         sdp: DOMString,
@@ -41,7 +40,7 @@ impl RTCSessionDescription {
     ) -> DomRoot<RTCSessionDescription> {
         reflect_dom_object_with_proto(
             Box::new(RTCSessionDescription::new_inherited(ty, sdp)),
-            global,
+            window,
             proto,
             can_gc,
         )
@@ -57,7 +56,7 @@ impl RTCSessionDescriptionMethods<crate::DomTypeHolder> for RTCSessionDescriptio
         config: &RTCSessionDescriptionInit,
     ) -> Fallible<DomRoot<RTCSessionDescription>> {
         Ok(RTCSessionDescription::new(
-            &window.global(),
+            window,
             proto,
             config.type_,
             config.sdp.clone(),
diff --git a/components/script/dom/rtctrackevent.rs b/components/script/dom/rtctrackevent.rs
index dbb76928c49..a378c7250d2 100644
--- a/components/script/dom/rtctrackevent.rs
+++ b/components/script/dom/rtctrackevent.rs
@@ -10,11 +10,10 @@ use crate::dom::bindings::codegen::Bindings::EventBinding::Event_Binding::EventM
 use crate::dom::bindings::codegen::Bindings::RTCTrackEventBinding::{self, RTCTrackEventMethods};
 use crate::dom::bindings::error::Fallible;
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::event::Event;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::mediastreamtrack::MediaStreamTrack;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
@@ -35,18 +34,18 @@ impl RTCTrackEvent {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         type_: Atom,
         bubbles: bool,
         cancelable: bool,
         track: &MediaStreamTrack,
         can_gc: CanGc,
     ) -> DomRoot<RTCTrackEvent> {
-        Self::new_with_proto(global, None, type_, bubbles, cancelable, track, can_gc)
+        Self::new_with_proto(window, None, type_, bubbles, cancelable, track, can_gc)
     }
 
     fn new_with_proto(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         type_: Atom,
         bubbles: bool,
@@ -56,7 +55,7 @@ impl RTCTrackEvent {
     ) -> DomRoot<RTCTrackEvent> {
         let trackevent = reflect_dom_object_with_proto(
             Box::new(RTCTrackEvent::new_inherited(track)),
-            global,
+            window,
             proto,
             can_gc,
         );
@@ -78,7 +77,7 @@ impl RTCTrackEventMethods<crate::DomTypeHolder> for RTCTrackEvent {
         init: &RTCTrackEventBinding::RTCTrackEventInit,
     ) -> Fallible<DomRoot<RTCTrackEvent>> {
         Ok(RTCTrackEvent::new_with_proto(
-            &window.global(),
+            window,
             proto,
             Atom::from(type_),
             init.parent.bubbles,
diff --git a/components/script/dom/screen.rs b/components/script/dom/screen.rs
index ff35b2e60f5..061b2da3eca 100644
--- a/components/script/dom/screen.rs
+++ b/components/script/dom/screen.rs
@@ -2,12 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use compositing_traits::CompositorMsg;
 use dom_struct::dom_struct;
 use euclid::Size2D;
 use profile_traits::ipc;
 use servo_geometry::DeviceIndependentIntSize;
 use style_traits::CSSPixel;
-use webrender_traits::CrossProcessCompositorMessage;
 
 use crate::dom::bindings::codegen::Bindings::ScreenBinding::ScreenMethods;
 use crate::dom::bindings::num::Finite;
@@ -35,28 +35,34 @@ impl Screen {
     }
 
     fn screen_size(&self) -> Size2D<u32, CSSPixel> {
-        let (send, recv) =
+        let (sender, receiver) =
             ipc::channel::<DeviceIndependentIntSize>(self.global().time_profiler_chan().clone())
                 .unwrap();
         self.window
             .compositor_api()
             .sender()
-            .send(CrossProcessCompositorMessage::GetScreenSize(send))
+            .send(CompositorMsg::GetScreenSize(
+                self.window.webview_id(),
+                sender,
+            ))
             .unwrap();
-        let size = recv.recv().unwrap_or(Size2D::zero()).to_u32();
+        let size = receiver.recv().unwrap_or(Size2D::zero()).to_u32();
         Size2D::new(size.width, size.height)
     }
 
     fn screen_avail_size(&self) -> Size2D<u32, CSSPixel> {
-        let (send, recv) =
+        let (sender, receiver) =
             ipc::channel::<DeviceIndependentIntSize>(self.global().time_profiler_chan().clone())
                 .unwrap();
         self.window
             .compositor_api()
             .sender()
-            .send(CrossProcessCompositorMessage::GetAvailableScreenSize(send))
+            .send(CompositorMsg::GetAvailableScreenSize(
+                self.window.webview_id(),
+                sender,
+            ))
             .unwrap();
-        let size = recv.recv().unwrap_or(Size2D::zero()).to_u32();
+        let size = receiver.recv().unwrap_or(Size2D::zero()).to_u32();
         Size2D::new(size.width, size.height)
     }
 }
diff --git a/components/script/dom/securitypolicyviolationevent.rs b/components/script/dom/securitypolicyviolationevent.rs
index 3580e525e55..3c528cc5814 100644
--- a/components/script/dom/securitypolicyviolationevent.rs
+++ b/components/script/dom/securitypolicyviolationevent.rs
@@ -15,7 +15,7 @@ use crate::dom::bindings::codegen::Bindings::SecurityPolicyViolationEventBinding
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::{DOMString, USVString};
-use crate::dom::event::{Event, EventBubbles, EventCancelable};
+use crate::dom::event::{Event, EventBubbles, EventCancelable, EventComposed};
 use crate::dom::globalscope::GlobalScope;
 use crate::script_runtime::CanGc;
 
@@ -70,12 +70,14 @@ impl SecurityPolicyViolationEvent {
         )
     }
 
+    #[allow(clippy::too_many_arguments)]
     fn new_with_proto(
         global: &GlobalScope,
         proto: Option<HandleObject>,
         type_: Atom,
         bubbles: EventBubbles,
         cancelable: EventCancelable,
+        composed: EventComposed,
         init: &SecurityPolicyViolationEventInit,
         can_gc: CanGc,
     ) -> DomRoot<Self> {
@@ -83,6 +85,7 @@ impl SecurityPolicyViolationEvent {
         {
             let event = ev.upcast::<Event>();
             event.init_event(type_, bool::from(bubbles), bool::from(cancelable));
+            event.set_composed(bool::from(composed));
         }
         ev
     }
@@ -92,10 +95,13 @@ impl SecurityPolicyViolationEvent {
         type_: Atom,
         bubbles: EventBubbles,
         cancelable: EventCancelable,
+        composed: EventComposed,
         init: &SecurityPolicyViolationEventInit,
         can_gc: CanGc,
     ) -> DomRoot<Self> {
-        Self::new_with_proto(global, None, type_, bubbles, cancelable, init, can_gc)
+        Self::new_with_proto(
+            global, None, type_, bubbles, cancelable, composed, init, can_gc,
+        )
     }
 }
 
@@ -115,6 +121,7 @@ impl SecurityPolicyViolationEventMethods<crate::DomTypeHolder> for SecurityPolic
             Atom::from(type_),
             EventBubbles::from(init.parent.bubbles),
             EventCancelable::from(init.parent.cancelable),
+            EventComposed::from(init.parent.composed),
             init,
             can_gc,
         )
diff --git a/components/script/dom/serviceworker.rs b/components/script/dom/serviceworker.rs
index c3d677c5111..694c54e7455 100644
--- a/components/script/dom/serviceworker.rs
+++ b/components/script/dom/serviceworker.rs
@@ -5,10 +5,10 @@
 use std::cell::Cell;
 
 use base::id::ServiceWorkerId;
+use constellation_traits::{DOMMessage, ScriptToConstellationMessage};
 use dom_struct::dom_struct;
 use js::jsapi::{Heap, JSObject};
 use js::rust::{CustomAutoRooter, CustomAutoRooterGuard, HandleValue};
-use script_traits::{DOMMessage, ScriptMsg};
 use servo_url::ServoUrl;
 
 use crate::dom::abstractworker::SimpleWorkerErrorHandler;
@@ -109,13 +109,9 @@ impl ServiceWorker {
             origin: incumbent.origin().immutable().clone(),
             data,
         };
-        let _ = self
-            .global()
-            .script_to_constellation_chan()
-            .send(ScriptMsg::ForwardDOMMessage(
-                msg_vec,
-                self.scope_url.clone(),
-            ));
+        let _ = self.global().script_to_constellation_chan().send(
+            ScriptToConstellationMessage::ForwardDOMMessage(msg_vec, self.scope_url.clone()),
+        );
         Ok(())
     }
 }
diff --git a/components/script/dom/serviceworkercontainer.rs b/components/script/dom/serviceworkercontainer.rs
index a1ef784bbad..b0781941f51 100644
--- a/components/script/dom/serviceworkercontainer.rs
+++ b/components/script/dom/serviceworkercontainer.rs
@@ -5,10 +5,12 @@
 use std::default::Default;
 use std::rc::Rc;
 
+use constellation_traits::{
+    Job, JobError, JobResult, JobResultValue, JobType, ScriptToConstellationMessage,
+};
 use dom_struct::dom_struct;
 use ipc_channel::ipc;
 use ipc_channel::router::ROUTER;
-use script_traits::{Job, JobError, JobResult, JobResultValue, JobType, ScriptMsg};
 
 use crate::dom::bindings::codegen::Bindings::ServiceWorkerContainerBinding::{
     RegistrationOptions, ServiceWorkerContainerMethods,
@@ -179,7 +181,7 @@ impl ServiceWorkerContainerMethods<crate::DomTypeHolder> for ServiceWorkerContai
         // B: Step 14: schedule job.
         let _ = global
             .script_to_constellation_chan()
-            .send(ScriptMsg::ScheduleJob(job));
+            .send(ScriptToConstellationMessage::ScheduleJob(job));
 
         // A: Step 7
         promise
diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs
index f52582b99ee..9b431da9c0e 100644
--- a/components/script/dom/serviceworkerglobalscope.rs
+++ b/components/script/dom/serviceworkerglobalscope.rs
@@ -8,6 +8,9 @@ use std::thread::{self, JoinHandle};
 use std::time::{Duration, Instant};
 
 use base::id::PipelineId;
+use constellation_traits::{
+    ScopeThings, ServiceWorkerMsg, WorkerGlobalScopeInit, WorkerScriptLoadOrigin,
+};
 use crossbeam_channel::{Receiver, Sender, after, unbounded};
 use devtools_traits::DevtoolScriptControlMsg;
 use dom_struct::dom_struct;
@@ -19,7 +22,6 @@ use net_traits::request::{
     CredentialsMode, Destination, InsecureRequestsPolicy, ParserMetadata, Referrer, RequestBuilder,
 };
 use net_traits::{CustomResponseMediator, IpcSend};
-use script_traits::{ScopeThings, ServiceWorkerMsg, WorkerGlobalScopeInit, WorkerScriptLoadOrigin};
 use servo_config::pref;
 use servo_rand::random;
 use servo_url::ServoUrl;
@@ -36,6 +38,7 @@ use crate::dom::bindings::root::{DomRoot, RootCollection, ThreadLocalStackRoots}
 use crate::dom::bindings::str::DOMString;
 use crate::dom::bindings::structuredclone;
 use crate::dom::bindings::trace::CustomTraceable;
+use crate::dom::bindings::utils::define_all_exposed_interfaces;
 use crate::dom::dedicatedworkerglobalscope::AutoWorkerReset;
 use crate::dom::event::Event;
 use crate::dom::eventtarget::EventTarget;
@@ -376,11 +379,16 @@ impl ServiceWorkerGlobalScope {
 
                 {
                     // TODO: use AutoWorkerReset as in dedicated worker?
-                    let _ac = enter_realm(scope);
+                    let realm = enter_realm(scope);
+                    define_all_exposed_interfaces(
+                        scope.upcast(),
+                        InRealm::entered(&realm),
+                        CanGc::note(),
+                    );
                     scope.execute_script(DOMString::from(source), CanGc::note());
+                    global.dispatch_activate(CanGc::note(), InRealm::entered(&realm));
                 }
 
-                global.dispatch_activate(CanGc::note());
                 let reporter_name = format!("service-worker-reporter-{}", random::<u64>());
                 scope
                     .upcast::<GlobalScope>()
@@ -476,7 +484,7 @@ impl ServiceWorkerGlobalScope {
         ScriptEventLoopSender::ServiceWorker(self.own_sender.clone())
     }
 
-    fn dispatch_activate(&self, can_gc: CanGc) {
+    fn dispatch_activate(&self, can_gc: CanGc, _realm: InRealm) {
         let event = ExtendableEvent::new(self, atom!("activate"), false, false, can_gc);
         let event = (*event).upcast::<Event>();
         self.upcast::<EventTarget>().dispatch_event(event, can_gc);
diff --git a/components/script/dom/serviceworkerregistration.rs b/components/script/dom/serviceworkerregistration.rs
index bbd3840e695..fc29a4b7afe 100644
--- a/components/script/dom/serviceworkerregistration.rs
+++ b/components/script/dom/serviceworkerregistration.rs
@@ -5,10 +5,10 @@
 use std::cell::Cell;
 
 use base::id::ServiceWorkerRegistrationId;
+use constellation_traits::{ScopeThings, WorkerScriptLoadOrigin};
 use devtools_traits::WorkerId;
 use dom_struct::dom_struct;
 use net_traits::request::Referrer;
-use script_traits::{ScopeThings, WorkerScriptLoadOrigin};
 use servo_url::ServoUrl;
 use uuid::Uuid;
 
diff --git a/components/script/dom/servointernals.rs b/components/script/dom/servointernals.rs
index 295bd838443..eb7260b61be 100644
--- a/components/script/dom/servointernals.rs
+++ b/components/script/dom/servointernals.rs
@@ -4,9 +4,12 @@
 
 use std::rc::Rc;
 
+use constellation_traits::ScriptToConstellationMessage;
 use dom_struct::dom_struct;
+use js::rust::HandleObject;
 use profile_traits::mem::MemoryReportResult;
-use script_traits::ScriptMsg;
+use script_bindings::interfaces::ServoInternalsHelpers;
+use script_bindings::script_runtime::JSContext;
 
 use crate::dom::bindings::codegen::Bindings::ServoInternalsBinding::ServoInternalsMethods;
 use crate::dom::bindings::error::Error;
@@ -14,7 +17,7 @@ use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object};
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::promise::Promise;
-use crate::realms::InRealm;
+use crate::realms::{AlreadyInRealm, InRealm};
 use crate::routed_promise::{RoutedPromiseListener, route_promise};
 use crate::script_runtime::CanGc;
 
@@ -40,10 +43,12 @@ impl ServoInternalsMethods<crate::DomTypeHolder> for ServoInternals {
     fn ReportMemory(&self, comp: InRealm, can_gc: CanGc) -> Rc<Promise> {
         let global = &self.global();
         let promise = Promise::new_in_current_realm(comp, can_gc);
-        let sender = route_promise(&promise, self);
+        let task_source = global.task_manager().dom_manipulation_task_source();
+        let sender = route_promise(&promise, self, task_source);
+
         let script_to_constellation_chan = global.script_to_constellation_chan();
         if script_to_constellation_chan
-            .send(ScriptMsg::ReportMemory(sender))
+            .send(ScriptToConstellationMessage::ReportMemory(sender))
             .is_err()
         {
             promise.reject_error(Error::Operation, can_gc);
@@ -57,3 +62,16 @@ impl RoutedPromiseListener<MemoryReportResult> for ServoInternals {
         promise.resolve_native(&response.content, can_gc);
     }
 }
+
+impl ServoInternalsHelpers for ServoInternals {
+    /// The navigator.servo api is only exposed to about: pages except about:blank
+    #[allow(unsafe_code)]
+    fn is_servo_internal(cx: JSContext, _global: HandleObject) -> bool {
+        unsafe {
+            let in_realm_proof = AlreadyInRealm::assert_for_cx(cx);
+            let global_scope = GlobalScope::from_context(*cx, InRealm::Already(&in_realm_proof));
+            let url = global_scope.get_url();
+            url.scheme() == "about" && url.as_str() != "about:blank"
+        }
+    }
+}
diff --git a/components/script/dom/servoparser/async_html.rs b/components/script/dom/servoparser/async_html.rs
index 83d3dddfc54..1d6f4af0b01 100644
--- a/components/script/dom/servoparser/async_html.rs
+++ b/components/script/dom/servoparser/async_html.rs
@@ -14,14 +14,12 @@ use crossbeam_channel::{Receiver, Sender, unbounded};
 use html5ever::buffer_queue::BufferQueue;
 use html5ever::tendril::fmt::UTF8;
 use html5ever::tendril::{SendTendril, StrTendril, Tendril};
-use html5ever::tokenizer::{Tokenizer as HtmlTokenizer, TokenizerOpts, TokenizerResult};
+use html5ever::tokenizer::{Tokenizer as HtmlTokenizer, TokenizerOpts};
 use html5ever::tree_builder::{
-    ElementFlags, NextParserState, NodeOrText as HtmlNodeOrText, QuirksMode, TreeBuilder,
-    TreeBuilderOpts, TreeSink,
-};
-use html5ever::{
-    Attribute as HtmlAttribute, ExpandedName, QualName, local_name, namespace_url, ns,
+    ElementFlags, NodeOrText as HtmlNodeOrText, QuirksMode, TreeBuilder, TreeBuilderOpts, TreeSink,
 };
+use html5ever::{Attribute as HtmlAttribute, ExpandedName, QualName, local_name, ns};
+use markup5ever::TokenizerResult;
 use servo_url::ServoUrl;
 use style::context::QuirksMode as ServoQuirksMode;
 
@@ -484,7 +482,7 @@ impl Tokenizer {
 
                 document
                     .upcast::<Node>()
-                    .AppendChild(doctype.upcast())
+                    .AppendChild(doctype.upcast(), can_gc)
                     .expect("Appending failed");
             },
             ParseOperation::AddAttrsIfMissing { target, attrs } => {
@@ -503,7 +501,7 @@ impl Tokenizer {
             },
             ParseOperation::RemoveFromParent { target } => {
                 if let Some(ref parent) = self.get_node(&target).GetParentNode() {
-                    parent.RemoveChild(&self.get_node(&target)).unwrap();
+                    parent.RemoveChild(&self.get_node(&target), can_gc).unwrap();
                 }
             },
             ParseOperation::MarkScriptAlreadyStarted { node } => {
@@ -517,7 +515,7 @@ impl Tokenizer {
                 let parent = self.get_node(&parent);
                 let new_parent = self.get_node(&new_parent);
                 while let Some(child) = parent.GetFirstChild() {
-                    new_parent.AppendChild(&child).unwrap();
+                    new_parent.AppendChild(&child, can_gc).unwrap();
                 }
             },
             ParseOperation::AssociateWithForm {
@@ -546,7 +544,7 @@ impl Tokenizer {
                 let control = elem.and_then(|e| e.as_maybe_form_control());
 
                 if let Some(control) = control {
-                    control.set_form_owner_from_parser(&form);
+                    control.set_form_owner_from_parser(&form, can_gc);
                 }
             },
             ParseOperation::Pop { node } => {
@@ -901,10 +899,6 @@ impl TreeSink for Sink {
         self.send_op(ParseOperation::MarkScriptAlreadyStarted { node: node.id });
     }
 
-    fn complete_script(&self, _: &Self::Handle) -> NextParserState {
-        panic!("complete_script should not be called here!");
-    }
-
     fn reparent_children(&self, parent: &Self::Handle, new_parent: &Self::Handle) {
         self.send_op(ParseOperation::ReparentChildren {
             parent: parent.id,
diff --git a/components/script/dom/servoparser/html.rs b/components/script/dom/servoparser/html.rs
index 14d75a355d4..9dfbeda4030 100644
--- a/components/script/dom/servoparser/html.rs
+++ b/components/script/dom/servoparser/html.rs
@@ -10,11 +10,14 @@ use std::io;
 use html5ever::buffer_queue::BufferQueue;
 use html5ever::serialize::TraversalScope::IncludeNode;
 use html5ever::serialize::{AttrRef, Serialize, Serializer, TraversalScope};
-use html5ever::tokenizer::{Tokenizer as HtmlTokenizer, TokenizerOpts, TokenizerResult};
-use html5ever::tree_builder::{TreeBuilder, TreeBuilderOpts};
-use html5ever::{QualName, local_name, namespace_url, ns};
+use html5ever::tokenizer::{Tokenizer as HtmlTokenizer, TokenizerOpts};
+use html5ever::tree_builder::{QuirksMode as HTML5EverQuirksMode, TreeBuilder, TreeBuilderOpts};
+use html5ever::{QualName, local_name, ns};
+use markup5ever::TokenizerResult;
 use script_bindings::trace::CustomTraceable;
 use servo_url::ServoUrl;
+use style::attr::AttrValue;
+use style::context::QuirksMode as StyleContextQuirksMode;
 use xml5ever::LocalName;
 
 use crate::dom::bindings::codegen::Bindings::HTMLTemplateElementBinding::HTMLTemplateElementMethods;
@@ -57,9 +60,17 @@ impl Tokenizer {
             parsing_algorithm,
         };
 
+        let quirks_mode = match document.quirks_mode() {
+            StyleContextQuirksMode::Quirks => HTML5EverQuirksMode::Quirks,
+            StyleContextQuirksMode::LimitedQuirks => HTML5EverQuirksMode::LimitedQuirks,
+            StyleContextQuirksMode::NoQuirks => HTML5EverQuirksMode::NoQuirks,
+        };
+
         let options = TreeBuilderOpts {
             ignore_missing_rules: true,
-            scripting_enabled: document.has_browsing_context(),
+            scripting_enabled: document.scripting_enabled(),
+            iframe_srcdoc: document.url().as_str() == "about:srcdoc",
+            quirks_mode,
             ..Default::default()
         };
 
@@ -106,18 +117,34 @@ impl Tokenizer {
     }
 }
 
-fn start_element<S: Serializer>(node: &Element, serializer: &mut S) -> io::Result<()> {
-    let name = QualName::new(None, node.namespace().clone(), node.local_name().clone());
-    let attrs = node
-        .attrs()
-        .iter()
-        .map(|attr| {
-            let qname = QualName::new(None, attr.namespace().clone(), attr.local_name().clone());
-            let value = attr.value().clone();
-            (qname, value)
-        })
-        .collect::<Vec<_>>();
-    let attr_refs = attrs.iter().map(|(qname, value)| {
+/// <https://html.spec.whatwg.org/multipage/#html-fragment-serialisation-algorithm>
+fn start_element<S: Serializer>(element: &Element, serializer: &mut S) -> io::Result<()> {
+    let name = QualName::new(
+        None,
+        element.namespace().clone(),
+        element.local_name().clone(),
+    );
+
+    let mut attributes = vec![];
+
+    // The "is" value of an element is treated as if it was an attribute and it is serialized before all
+    // other attributes. If the element already has an "is" attribute then the "is" value is ignored.
+    if !element.has_attribute(&LocalName::from("is")) {
+        if let Some(is_value) = element.get_is() {
+            let qualified_name = QualName::new(None, ns!(), LocalName::from("is"));
+
+            attributes.push((qualified_name, AttrValue::String(is_value.to_string())));
+        }
+    }
+
+    // Collect all the "normal" attributes
+    attributes.extend(element.attrs().iter().map(|attr| {
+        let qname = QualName::new(None, attr.namespace().clone(), attr.local_name().clone());
+        let value = attr.value().clone();
+        (qname, value)
+    }));
+
+    let attr_refs = attributes.iter().map(|(qname, value)| {
         let ar: AttrRef = (qname, &**value);
         ar
     });
@@ -292,11 +319,10 @@ pub(crate) fn serialize_html_fragment<S: Serializer>(
                     serializer.write_processing_instruction(pi.target(), &data)?;
                 },
 
-                NodeTypeId::DocumentFragment(_) => {},
+                NodeTypeId::DocumentFragment(_) | NodeTypeId::Attr => {},
 
                 NodeTypeId::Document(_) => panic!("Can't serialize Document node itself"),
                 NodeTypeId::Element(_) => panic!("Element shouldn't appear here"),
-                NodeTypeId::Attr => panic!("Attr shouldn't appear here"),
             },
             SerializationCommand::SerializeShadowRoot(shadow_root) => {
                 // Shadow roots are serialized as template elements with a fixed set of
diff --git a/components/script/dom/servoparser/mod.rs b/components/script/dom/servoparser/mod.rs
index 2d6b117822a..9e45124522a 100644
--- a/components/script/dom/servoparser/mod.rs
+++ b/components/script/dom/servoparser/mod.rs
@@ -9,18 +9,19 @@ use base::cross_process_instant::CrossProcessInstant;
 use base::id::PipelineId;
 use base64::Engine as _;
 use base64::engine::general_purpose;
-use content_security_policy::{self as csp, CspList};
+use content_security_policy as csp;
 use dom_struct::dom_struct;
 use embedder_traits::resources::{self, Resource};
 use encoding_rs::Encoding;
 use html5ever::buffer_queue::BufferQueue;
 use html5ever::tendril::fmt::UTF8;
 use html5ever::tendril::{ByteTendril, StrTendril, TendrilSink};
-use html5ever::tokenizer::TokenizerResult;
-use html5ever::tree_builder::{ElementFlags, NextParserState, NodeOrText, QuirksMode, TreeSink};
-use html5ever::{Attribute, ExpandedName, LocalName, QualName, local_name, namespace_url, ns};
+use html5ever::tree_builder::{ElementFlags, NodeOrText, QuirksMode, TreeSink};
+use html5ever::{Attribute, ExpandedName, LocalName, QualName, local_name, ns};
 use hyper_serde::Serde;
+use markup5ever::TokenizerResult;
 use mime::{self, Mime};
+use net_traits::policy_container::PolicyContainer;
 use net_traits::request::RequestId;
 use net_traits::{
     FetchMetadata, FetchResponseListener, Metadata, NetworkError, ResourceFetchTiming,
@@ -59,6 +60,7 @@ use crate::dom::document::{Document, DocumentSource, HasBrowsingContext, IsHTMLD
 use crate::dom::documentfragment::DocumentFragment;
 use crate::dom::documenttype::DocumentType;
 use crate::dom::element::{CustomElementCreationMode, Element, ElementCreator};
+use crate::dom::globalscope::GlobalScope;
 use crate::dom::htmlformelement::{FormControlElementHelpers, HTMLFormElement};
 use crate::dom::htmlimageelement::HTMLImageElement;
 use crate::dom::htmlinputelement::HTMLInputElement;
@@ -228,6 +230,7 @@ impl ServoParser {
             false,
             allow_declarative_shadow_roots,
             Some(context_document.insecure_requests_policy()),
+            context_document.has_trustworthy_ancestor_or_current_origin(),
             can_gc,
         );
 
@@ -354,16 +357,14 @@ impl ServoParser {
     }
 
     /// Steps 6-8 of <https://html.spec.whatwg.org/multipage/#document.write()>
-    pub(crate) fn write(&self, text: Vec<DOMString>, can_gc: CanGc) {
+    pub(crate) fn write(&self, text: DOMString, can_gc: CanGc) {
         assert!(self.can_write());
 
         if self.document.has_pending_parsing_blocking_script() {
             // There is already a pending parsing blocking script so the
             // parser is suspended, we just append everything to the
             // script input and abort these steps.
-            for chunk in text {
-                self.script_input.push_back(String::from(chunk).into());
-            }
+            self.script_input.push_back(String::from(text).into());
             return;
         }
 
@@ -373,9 +374,7 @@ impl ServoParser {
         assert!(self.script_input.is_empty());
 
         let input = BufferQueue::default();
-        for chunk in text {
-            input.push_back(String::from(chunk).into());
-        }
+        input.push_back(String::from(text).into());
 
         let profiler_chan = self
             .document
@@ -558,14 +557,6 @@ impl ServoParser {
     }
 
     fn parse_sync(&self, can_gc: CanGc) {
-        match self.tokenizer {
-            Tokenizer::Html(_) => self.do_parse_sync(can_gc),
-            Tokenizer::AsyncHtml(_) => self.do_parse_sync(can_gc),
-            Tokenizer::Xml(_) => self.do_parse_sync(can_gc),
-        }
-    }
-
-    fn do_parse_sync(&self, can_gc: CanGc) {
         assert!(self.script_input.is_empty());
 
         // This parser will continue to parse while there is either pending input or
@@ -713,7 +704,7 @@ where
 
     fn next(&mut self) -> Option<DomRoot<Node>> {
         let next = self.inner.next()?;
-        next.remove_self();
+        next.remove_self(CanGc::note());
         Some(next)
     }
 
@@ -819,6 +810,27 @@ impl ParserContext {
             pushed_entry_index: None,
         }
     }
+
+    pub(crate) fn append_parent_to_csp_list(&self, policy_container: Option<&PolicyContainer>) {
+        let Some(policy_container) = policy_container else {
+            return;
+        };
+        let Some(parent_csp_list) = &policy_container.csp_list else {
+            return;
+        };
+        let Some(parser) = self.parser.as_ref().map(|p| p.root()) else {
+            return;
+        };
+        let new_csp_list = match parser.document.get_csp_list() {
+            None => parent_csp_list.clone(),
+            Some(original_csp_list) => {
+                let mut appended_csp_list = original_csp_list.clone();
+                appended_csp_list.append(parent_csp_list.clone());
+                appended_csp_list.to_owned()
+            },
+        };
+        parser.document.set_csp_list(Some(new_csp_list));
+    }
 }
 
 impl FetchResponseListener for ParserContext {
@@ -857,29 +869,9 @@ impl FetchResponseListener for ParserContext {
             .map(Serde::into_inner)
             .map(Into::into);
 
-        // https://www.w3.org/TR/CSP/#initialize-document-csp
-        // TODO: Implement step 1 (local scheme special case)
-        let csp_list = metadata.as_ref().and_then(|m| {
-            let h = m.headers.as_ref()?;
-            let mut csp = h.get_all("content-security-policy").iter();
-            // This silently ignores the CSP if it contains invalid Unicode.
-            // We should probably report an error somewhere.
-            let c = csp.next().and_then(|c| c.to_str().ok())?;
-            let mut csp_list = CspList::parse(
-                c,
-                csp::PolicySource::Header,
-                csp::PolicyDisposition::Enforce,
-            );
-            for c in csp {
-                let c = c.to_str().ok()?;
-                csp_list.append(CspList::parse(
-                    c,
-                    csp::PolicySource::Header,
-                    csp::PolicyDisposition::Enforce,
-                ));
-            }
-            Some(csp_list)
-        });
+        let csp_list = metadata
+            .as_ref()
+            .and_then(|m| GlobalScope::parse_csp_list_from_metadata(&m.headers));
 
         let parser = match ScriptThread::page_headers_available(&self.id, metadata, CanGc::note()) {
             Some(parser) => parser,
@@ -920,7 +912,7 @@ impl FetchResponseListener for ParserContext {
                 let img = HTMLImageElement::new(local_name!("img"), None, doc, None, CanGc::note());
                 img.SetSrc(USVString(self.url.to_string()));
                 doc_body
-                    .AppendChild(&DomRoot::upcast::<Node>(img))
+                    .AppendChild(&DomRoot::upcast::<Node>(img), CanGc::note())
                     .expect("Appending failed");
             },
             (mime::TEXT, mime::PLAIN, _) => {
@@ -1075,6 +1067,17 @@ impl FetchResponseListener for ParserContext {
             CanGc::note(),
         );
     }
+
+    fn process_csp_violations(&mut self, _request_id: RequestId, violations: Vec<csp::Violation>) {
+        let parser = match self.parser.as_ref() {
+            Some(parser) => parser.root(),
+            None => return,
+        };
+        let document = &parser.document;
+        let global = &document.global();
+        // TODO(https://github.com/w3c/webappsec-csp/issues/687): Update after spec is resolved
+        global.report_csp_violations(violations, None);
+    }
 }
 
 impl PreInvoke for ParserContext {}
@@ -1102,7 +1105,7 @@ fn insert(
             if element_in_non_fragment {
                 ScriptThread::push_new_element_queue();
             }
-            parent.InsertBefore(&n, reference_child).unwrap();
+            parent.InsertBefore(&n, reference_child, can_gc).unwrap();
             if element_in_non_fragment {
                 ScriptThread::pop_current_element_queue(can_gc);
             }
@@ -1118,7 +1121,9 @@ fn insert(
                 text.upcast::<CharacterData>().append_data(&t);
             } else {
                 let text = Text::new(String::from(t).into(), &parent.owner_doc(), can_gc);
-                parent.InsertBefore(text.upcast(), reference_child).unwrap();
+                parent
+                    .InsertBefore(text.upcast(), reference_child, can_gc)
+                    .unwrap();
             }
         },
     }
@@ -1264,7 +1269,7 @@ impl TreeSink for Sink {
         let control = elem.and_then(|e| e.as_maybe_form_control());
 
         if let Some(control) = control {
-            control.set_form_owner_from_parser(&form);
+            control.set_form_owner_from_parser(&form, CanGc::note());
         }
     }
 
@@ -1330,7 +1335,7 @@ impl TreeSink for Sink {
             CanGc::note(),
         );
         doc.upcast::<Node>()
-            .AppendChild(doctype.upcast())
+            .AppendChild(doctype.upcast(), CanGc::note())
             .expect("Appending failed");
     }
 
@@ -1350,7 +1355,7 @@ impl TreeSink for Sink {
 
     fn remove_from_parent(&self, target: &Dom<Node>) {
         if let Some(ref parent) = target.GetParentNode() {
-            parent.RemoveChild(target).unwrap();
+            parent.RemoveChild(target, CanGc::note()).unwrap();
         }
     }
 
@@ -1361,18 +1366,9 @@ impl TreeSink for Sink {
         }
     }
 
-    fn complete_script(&self, node: &Dom<Node>) -> NextParserState {
-        if let Some(script) = node.downcast() {
-            self.script.set(Some(script));
-            NextParserState::Suspend
-        } else {
-            NextParserState::Continue
-        }
-    }
-
     fn reparent_children(&self, node: &Dom<Node>, new_parent: &Dom<Node>) {
         while let Some(ref child) = node.GetFirstChild() {
-            new_parent.AppendChild(child).unwrap();
+            new_parent.AppendChild(child, CanGc::note()).unwrap();
         }
     }
 
@@ -1466,7 +1462,7 @@ impl TreeSink for Sink {
             clonable,
             serializable,
             delegatesfocus,
-            SlotAssignmentMode::Manual,
+            SlotAssignmentMode::Named,
             CanGc::note(),
         ) {
             Ok(shadow_root) => {
@@ -1477,6 +1473,9 @@ impl TreeSink for Sink {
                 let shadow = shadow_root.upcast::<DocumentFragment>();
                 template_element.set_contents(Some(shadow));
 
+                // Step 8.5. Set shadow’s available to element internals to true.
+                shadow_root.set_available_to_element_internals(true);
+
                 Ok(())
             },
             Err(_) => Err(String::from("Attaching shadow fails")),
diff --git a/components/script/dom/servoparser/prefetch.rs b/components/script/dom/servoparser/prefetch.rs
index f2873406cd5..f0faec8df89 100644
--- a/components/script/dom/servoparser/prefetch.rs
+++ b/components/script/dom/servoparser/prefetch.rs
@@ -10,10 +10,12 @@ use content_security_policy::Destination;
 use html5ever::buffer_queue::BufferQueue;
 use html5ever::tokenizer::states::RawKind;
 use html5ever::tokenizer::{
-    Tag, TagKind, Token, TokenSink, TokenSinkResult, Tokenizer as HtmlTokenizer, TokenizerResult,
+    Tag, TagKind, Token, TokenSink, TokenSinkResult, Tokenizer as HtmlTokenizer,
 };
 use html5ever::{Attribute, LocalName, local_name};
 use js::jsapi::JSTracer;
+use markup5ever::TokenizerResult;
+use net_traits::policy_container::PolicyContainer;
 use net_traits::request::{
     CorsSettings, CredentialsMode, InsecureRequestsPolicy, ParserMetadata, Referrer,
 };
@@ -59,13 +61,14 @@ unsafe impl CustomTraceable for PrefetchSink {
 
 impl Tokenizer {
     pub(crate) fn new(document: &Document) -> Self {
+        let global = document.global();
         let sink = PrefetchSink {
             origin: document.origin().immutable().clone(),
-            pipeline_id: document.global().pipeline_id(),
+            pipeline_id: global.pipeline_id(),
             webview_id: document.webview_id(),
             base_url: RefCell::new(None),
             document_url: document.url(),
-            referrer: document.global().get_referrer(),
+            referrer: global.get_referrer(),
             referrer_policy: document.get_referrer_policy(),
             resource_threads: document.loader().resource_threads().clone(),
             // Initially we set prefetching to false, and only set it
@@ -73,6 +76,8 @@ impl Tokenizer {
             // block the main parser.
             prefetching: Cell::new(false),
             insecure_requests_policy: document.insecure_requests_policy(),
+            has_trustworthy_ancestor_origin: document.has_trustworthy_ancestor_or_current_origin(),
+            policy_container: global.policy_container(),
         };
         let options = Default::default();
         let inner = TraceableTokenizer(HtmlTokenizer::new(sink, options));
@@ -105,6 +110,9 @@ struct PrefetchSink {
     prefetching: Cell<bool>,
     #[no_trace]
     insecure_requests_policy: InsecureRequestsPolicy,
+    has_trustworthy_ancestor_origin: bool,
+    #[no_trace]
+    policy_container: PolicyContainer,
 }
 
 /// The prefetch tokenizer produces trivial results
@@ -146,6 +154,8 @@ impl TokenSink for PrefetchSink {
                             parser_metadata: ParserMetadata::ParserInserted,
                         },
                         self.insecure_requests_policy,
+                        self.has_trustworthy_ancestor_origin,
+                        self.policy_container.clone(),
                     );
                     let _ = self
                         .resource_threads
@@ -164,6 +174,8 @@ impl TokenSink for PrefetchSink {
                         None,
                         self.referrer.clone(),
                         self.insecure_requests_policy,
+                        self.has_trustworthy_ancestor_origin,
+                        self.policy_container.clone(),
                     )
                     .origin(self.origin.clone())
                     .pipeline_id(Some(self.pipeline_id))
@@ -198,6 +210,8 @@ impl TokenSink for PrefetchSink {
                                 None,
                                 self.referrer.clone(),
                                 self.insecure_requests_policy,
+                                self.has_trustworthy_ancestor_origin,
+                                self.policy_container.clone(),
                             )
                             .origin(self.origin.clone())
                             .pipeline_id(Some(self.pipeline_id))
diff --git a/components/script/dom/servoparser/xml.rs b/components/script/dom/servoparser/xml.rs
index 218fdfaece5..f132cbcb3fd 100644
--- a/components/script/dom/servoparser/xml.rs
+++ b/components/script/dom/servoparser/xml.rs
@@ -6,13 +6,14 @@
 
 use std::cell::Cell;
 
-use html5ever::tokenizer::TokenizerResult;
+use markup5ever::TokenizerResult;
 use script_bindings::trace::CustomTraceable;
 use servo_url::ServoUrl;
 use xml5ever::buffer_queue::BufferQueue;
 use xml5ever::tokenizer::XmlTokenizer;
 use xml5ever::tree_builder::XmlTreeBuilder;
 
+use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::document::Document;
 use crate::dom::htmlscriptelement::HTMLScriptElement;
@@ -43,10 +44,17 @@ impl Tokenizer {
     }
 
     pub(crate) fn feed(&self, input: &BufferQueue) -> TokenizerResult<DomRoot<HTMLScriptElement>> {
-        self.inner.run(input);
-        match self.inner.sink.sink.script.take() {
-            Some(script) => TokenizerResult::Script(script),
-            None => TokenizerResult::Done,
+        loop {
+            match self.inner.run(input) {
+                TokenizerResult::Done => return TokenizerResult::Done,
+                TokenizerResult::Script(handle) => {
+                    // Apparently the parser can sometimes create <script> elements without a namespace, resulting
+                    // in them not being HTMLScriptElements.
+                    if let Some(script) = handle.downcast::<HTMLScriptElement>() {
+                        return TokenizerResult::Script(DomRoot::from_ref(script));
+                    }
+                },
+            }
         }
     }
 
diff --git a/components/script/dom/shadowroot.rs b/components/script/dom/shadowroot.rs
index 57ec0303188..14d9c24b10e 100644
--- a/components/script/dom/shadowroot.rs
+++ b/components/script/dom/shadowroot.rs
@@ -153,11 +153,11 @@ impl ShadowRoot {
         )
     }
 
-    pub(crate) fn detach(&self) {
+    pub(crate) fn detach(&self, can_gc: CanGc) {
         self.document.unregister_shadow_root(self);
         let node = self.upcast::<Node>();
         node.set_containing_shadow_root(None);
-        Node::complete_remove_subtree(node, &UnbindContext::new(node, None, None, None));
+        Node::complete_remove_subtree(node, &UnbindContext::new(node, None, None, None), can_gc);
         self.host.set(None);
     }
 
@@ -221,7 +221,7 @@ impl ShadowRoot {
 
     /// Remove any existing association between the provided id and any elements
     /// in this shadow tree.
-    pub(crate) fn unregister_element_id(&self, to_unregister: &Element, id: Atom) {
+    pub(crate) fn unregister_element_id(&self, to_unregister: &Element, id: Atom, _can_gc: CanGc) {
         self.document_or_shadow_root.unregister_named_element(
             self.document_fragment.id_map(),
             to_unregister,
@@ -230,7 +230,7 @@ impl ShadowRoot {
     }
 
     /// Associate an element present in this shadow tree with the provided id.
-    pub(crate) fn register_element_id(&self, element: &Element, id: Atom) {
+    pub(crate) fn register_element_id(&self, element: &Element, id: Atom, _can_gc: CanGc) {
         let root = self
             .upcast::<Node>()
             .inclusive_ancestors(ShadowIncluding::No)
@@ -445,7 +445,7 @@ impl ShadowRootMethods<crate::DomTypeHolder> for ShadowRoot {
         };
 
         // Step 4. Replace all with fragment within this.
-        Node::replace_all(Some(frag.upcast()), self.upcast());
+        Node::replace_all(Some(frag.upcast()), self.upcast(), can_gc);
     }
 
     /// <https://dom.spec.whatwg.org/#dom-shadowroot-slotassignment>
@@ -453,6 +453,15 @@ impl ShadowRootMethods<crate::DomTypeHolder> for ShadowRoot {
         self.slot_assignment_mode
     }
 
+    /// <https://html.spec.whatwg.org/multipage/#dom-shadowroot-sethtmlunsafe>
+    fn SetHTMLUnsafe(&self, html: DOMString, can_gc: CanGc) {
+        // Step 2. Unsafely set HTMl given this, this's shadow host, and complaintHTML
+        let target = self.upcast::<Node>();
+        let context_element = self.Host();
+
+        Node::unsafely_set_html(target, &context_element, html, can_gc);
+    }
+
     // https://dom.spec.whatwg.org/#dom-shadowroot-onslotchange
     event_handler!(onslotchange, GetOnslotchange, SetOnslotchange);
 }
@@ -462,9 +471,9 @@ impl VirtualMethods for ShadowRoot {
         Some(self.upcast::<DocumentFragment>() as &dyn VirtualMethods)
     }
 
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
 
         if context.tree_connected {
@@ -482,17 +491,20 @@ impl VirtualMethods for ShadowRoot {
 
             // Out-of-document elements never have the descendants flag set
             debug_assert!(!node.get_flag(NodeFlags::HAS_DIRTY_DESCENDANTS));
-            vtable_for(&node).bind_to_tree(&BindContext {
-                tree_connected: context.tree_connected,
-                tree_is_in_a_document_tree: false,
-                tree_is_in_a_shadow_tree: true,
-            });
+            vtable_for(&node).bind_to_tree(
+                &BindContext {
+                    tree_connected: context.tree_connected,
+                    tree_is_in_a_document_tree: false,
+                    tree_is_in_a_shadow_tree: true,
+                },
+                can_gc,
+            );
         }
     }
 
-    fn unbind_from_tree(&self, context: &UnbindContext) {
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.unbind_from_tree(context);
+            s.unbind_from_tree(context, can_gc);
         }
 
         if context.tree_connected {
diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs
index 8b155a81dd2..054e4ab5ac3 100644
--- a/components/script/dom/storage.rs
+++ b/components/script/dom/storage.rs
@@ -2,12 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use constellation_traits::ScriptToConstellationMessage;
 use dom_struct::dom_struct;
 use ipc_channel::ipc::IpcSender;
 use net_traits::IpcSend;
 use net_traits::storage_thread::{StorageThreadMsg, StorageType};
 use profile_traits::ipc;
-use script_traits::ScriptMsg;
 use servo_url::ServoUrl;
 
 use crate::dom::bindings::codegen::Bindings::StorageBinding::StorageMethods;
@@ -195,7 +195,9 @@ impl Storage {
     ) {
         let storage = self.storage_type;
         let url = self.get_url();
-        let msg = ScriptMsg::BroadcastStorageEvent(storage, url, key, old_value, new_value);
+        let msg = ScriptToConstellationMessage::BroadcastStorageEvent(
+            storage, url, key, old_value, new_value,
+        );
         self.global()
             .script_to_constellation_chan()
             .send(msg)
diff --git a/components/script/dom/submitevent.rs b/components/script/dom/submitevent.rs
index a4a7f4375fd..c05a17856f6 100644
--- a/components/script/dom/submitevent.rs
+++ b/components/script/dom/submitevent.rs
@@ -10,11 +10,10 @@ use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
 use crate::dom::bindings::codegen::Bindings::SubmitEventBinding;
 use crate::dom::bindings::codegen::Bindings::SubmitEventBinding::SubmitEventMethods;
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
 use crate::dom::event::Event;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::htmlelement::HTMLElement;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
@@ -35,18 +34,18 @@ impl SubmitEvent {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         type_: Atom,
         bubbles: bool,
         cancelable: bool,
         submitter: Option<DomRoot<HTMLElement>>,
         can_gc: CanGc,
     ) -> DomRoot<SubmitEvent> {
-        Self::new_with_proto(global, None, type_, bubbles, cancelable, submitter, can_gc)
+        Self::new_with_proto(window, None, type_, bubbles, cancelable, submitter, can_gc)
     }
 
     fn new_with_proto(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         type_: Atom,
         bubbles: bool,
@@ -56,7 +55,7 @@ impl SubmitEvent {
     ) -> DomRoot<SubmitEvent> {
         let ev = reflect_dom_object_with_proto(
             Box::new(SubmitEvent::new_inherited(submitter)),
-            global,
+            window,
             proto,
             can_gc,
         );
@@ -78,7 +77,7 @@ impl SubmitEventMethods<crate::DomTypeHolder> for SubmitEvent {
         init: &SubmitEventBinding::SubmitEventInit,
     ) -> DomRoot<SubmitEvent> {
         SubmitEvent::new_with_proto(
-            &window.global(),
+            window,
             proto,
             Atom::from(type_),
             init.parent.bubbles,
diff --git a/components/script/dom/svgelement.rs b/components/script/dom/svgelement.rs
index 9a48653b768..a380dcff5ac 100644
--- a/components/script/dom/svgelement.rs
+++ b/components/script/dom/svgelement.rs
@@ -3,17 +3,18 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use script_bindings::str::DOMString;
 use stylo_dom::ElementState;
 
+use crate::dom::attr::Attr;
 use crate::dom::bindings::codegen::Bindings::SVGElementBinding::SVGElementMethods;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
 use crate::dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration, CSSStyleOwner};
 use crate::dom::document::Document;
-use crate::dom::element::Element;
+use crate::dom::element::{AttributeMutation, Element};
 use crate::dom::node::{Node, NodeTraits};
 use crate::dom::virtualmethods::VirtualMethods;
 use crate::script_runtime::CanGc;
@@ -59,11 +60,33 @@ impl SVGElement {
             can_gc,
         )
     }
+
+    fn as_element(&self) -> &Element {
+        self.upcast::<Element>()
+    }
 }
 
 impl VirtualMethods for SVGElement {
     fn super_type(&self) -> Option<&dyn VirtualMethods> {
-        Some(self.upcast::<Element>() as &dyn VirtualMethods)
+        Some(self.as_element() as &dyn VirtualMethods)
+    }
+
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
+        let element = self.as_element();
+        if let (&local_name!("nonce"), mutation) = (attr.local_name(), mutation) {
+            match mutation {
+                AttributeMutation::Set(_) => {
+                    let nonce = &**attr.value();
+                    element.update_nonce_internal_slot(nonce.to_owned());
+                },
+                AttributeMutation::Removed => {
+                    element.update_nonce_internal_slot(String::new());
+                },
+            }
+        }
     }
 }
 
@@ -82,13 +105,19 @@ impl SVGElementMethods<crate::DomTypeHolder> for SVGElement {
         })
     }
 
-    // FIXME: The nonce should be stored in an internal slot instead of an
-    // attribute (https://html.spec.whatwg.org/multipage/#cryptographicnonce)
-    // https://html.spec.whatwg.org/multipage/#dom-noncedelement-nonce
-    make_getter!(Nonce, "nonce");
+    // <https://html.spec.whatwg.org/multipage/#globaleventhandlers>
+    global_event_handlers!();
 
     // https://html.spec.whatwg.org/multipage/#dom-noncedelement-nonce
-    make_setter!(SetNonce, "nonce");
+    fn Nonce(&self) -> DOMString {
+        self.as_element().nonce_value().into()
+    }
+
+    // https://html.spec.whatwg.org/multipage/#dom-noncedelement-nonce
+    fn SetNonce(&self, value: DOMString) {
+        self.as_element()
+            .update_nonce_internal_slot(value.to_string())
+    }
 
     // https://html.spec.whatwg.org/multipage/#dom-fe-autofocus
     fn Autofocus(&self) -> bool {
diff --git a/components/script/dom/svgimageelement.rs b/components/script/dom/svgimageelement.rs
new file mode 100644
index 00000000000..17a5a9149d8
--- /dev/null
+++ b/components/script/dom/svgimageelement.rs
@@ -0,0 +1,96 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use dom_struct::dom_struct;
+use html5ever::{LocalName, Prefix, local_name, ns};
+use js::rust::HandleObject;
+use style::attr::AttrValue;
+
+use crate::dom::attr::Attr;
+use crate::dom::bindings::inheritance::Castable;
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::document::Document;
+use crate::dom::element::AttributeMutation;
+use crate::dom::node::{Node, NodeTraits};
+use crate::dom::svggraphicselement::SVGGraphicsElement;
+use crate::dom::virtualmethods::VirtualMethods;
+use crate::script_runtime::CanGc;
+
+/// <https://svgwg.org/svg2-draft/embedded.html#Placement>
+const DEFAULT_WIDTH: u32 = 300;
+const DEFAULT_HEIGHT: u32 = 150;
+
+#[dom_struct]
+pub(crate) struct SVGImageElement {
+    svggraphicselement: SVGGraphicsElement,
+}
+
+impl SVGImageElement {
+    fn new_inherited(
+        local_name: LocalName,
+        prefix: Option<Prefix>,
+        document: &Document,
+    ) -> SVGImageElement {
+        SVGImageElement {
+            svggraphicselement: SVGGraphicsElement::new_inherited(local_name, prefix, document),
+        }
+    }
+
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    pub(crate) fn new(
+        local_name: LocalName,
+        prefix: Option<Prefix>,
+        document: &Document,
+        proto: Option<HandleObject>,
+        can_gc: CanGc,
+    ) -> DomRoot<SVGImageElement> {
+        Node::reflect_node_with_proto(
+            Box::new(SVGImageElement::new_inherited(local_name, prefix, document)),
+            document,
+            proto,
+            can_gc,
+        )
+    }
+
+    /// <https://svgwg.org/svg2-draft/linking.html#processingURL>
+    fn fetch_image_resource(&self) {
+        // TODO: Process and fetch the image resource (as HTMLImageElement).
+        // Reject any resource fetching request immediately.
+        self.owner_global()
+            .task_manager()
+            .dom_manipulation_task_source()
+            .queue_simple_event(self.upcast(), atom!("error"));
+    }
+}
+
+impl VirtualMethods for SVGImageElement {
+    fn super_type(&self) -> Option<&dyn VirtualMethods> {
+        Some(self.upcast::<SVGGraphicsElement>() as &dyn VirtualMethods)
+    }
+
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
+        if attr.local_name() == &local_name!("href") &&
+            matches!(attr.namespace(), &ns!() | &ns!(xlink))
+        {
+            if let AttributeMutation::Set(_) = mutation {
+                self.fetch_image_resource();
+            }
+        }
+    }
+
+    fn parse_plain_attribute(&self, name: &LocalName, value: DOMString) -> AttrValue {
+        match *name {
+            local_name!("width") => AttrValue::from_u32(value.into(), DEFAULT_WIDTH),
+            local_name!("height") => AttrValue::from_u32(value.into(), DEFAULT_HEIGHT),
+            _ => self
+                .super_type()
+                .unwrap()
+                .parse_plain_attribute(name, value),
+        }
+    }
+}
diff --git a/components/script/dom/svgsvgelement.rs b/components/script/dom/svgsvgelement.rs
index 0a6e7605aad..12b7fa6bc71 100644
--- a/components/script/dom/svgsvgelement.rs
+++ b/components/script/dom/svgsvgelement.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
+use html5ever::{LocalName, Prefix, local_name, ns};
 use js::rust::HandleObject;
 use script_layout_interface::SVGSVGData;
 use style::attr::AttrValue;
@@ -79,8 +79,10 @@ impl VirtualMethods for SVGSVGElement {
         Some(self.upcast::<SVGGraphicsElement>() as &dyn VirtualMethods)
     }
 
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
-        self.super_type().unwrap().attribute_mutated(attr, mutation);
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
+        self.super_type()
+            .unwrap()
+            .attribute_mutated(attr, mutation, can_gc);
     }
 
     fn parse_plain_attribute(&self, name: &LocalName, value: DOMString) -> AttrValue {
diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs
index 4095ba1319a..8c1b9994284 100644
--- a/components/script/dom/testbinding.rs
+++ b/components/script/dom/testbinding.rs
@@ -9,13 +9,14 @@ use std::ptr::{self, NonNull};
 use std::rc::Rc;
 use std::time::Duration;
 
+use constellation_traits::BlobImpl;
 use dom_struct::dom_struct;
 use js::jsapi::{Heap, JS_NewPlainObject, JSObject};
 use js::jsval::JSVal;
 use js::rust::{CustomAutoRooterGuard, HandleObject, HandleValue, MutableHandleValue};
 use js::typedarray::{self, Uint8ClampedArray};
+use script_bindings::interfaces::TestBindingHelpers;
 use script_bindings::record::Record;
-use script_traits::serializable::BlobImpl;
 use servo_config::prefs;
 
 use crate::dom::bindings::buffer_source::create_buffer_source;
@@ -1171,3 +1172,12 @@ impl TestBindingCallback {
             .resolve_native(&self.value, CanGc::note());
     }
 }
+
+impl TestBindingHelpers for TestBinding {
+    fn condition_satisfied(cx: SafeJSContext, global: HandleObject) -> bool {
+        Self::condition_satisfied(cx, global)
+    }
+    fn condition_unsatisfied(cx: SafeJSContext, global: HandleObject) -> bool {
+        Self::condition_unsatisfied(cx, global)
+    }
+}
diff --git a/components/script/dom/testutils.rs b/components/script/dom/testutils.rs
new file mode 100644
index 00000000000..4aadac05da3
--- /dev/null
+++ b/components/script/dom/testutils.rs
@@ -0,0 +1,49 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::rc::Rc;
+
+use dom_struct::dom_struct;
+use js::jsapi::{GCReason, JS_GC};
+use script_bindings::reflector::Reflector;
+use script_bindings::script_runtime::CanGc;
+
+use super::globalscope::GlobalScope;
+use crate::dom::bindings::codegen::Bindings::TestUtilsBinding::TestUtilsMethods;
+use crate::dom::promise::Promise;
+use crate::test::TrustedPromise;
+
+#[dom_struct]
+pub(crate) struct TestUtils {
+    reflector_: Reflector,
+}
+
+impl TestUtilsMethods<crate::DomTypeHolder> for TestUtils {
+    /// <https://testutils.spec.whatwg.org/#dom-testutils-gc>
+    #[allow(unsafe_code)]
+    fn Gc(global: &GlobalScope) -> Rc<Promise> {
+        // 1. Let p be a new promise.
+        let promise = Promise::new(global, CanGc::note());
+        let trusted = TrustedPromise::new(promise.clone());
+        // 2. Run the following in parallel:
+        // 2.1 Run implementation-defined steps to perform a garbage collection covering at least the entry Realm.
+        // 2.2 Resolve p.
+        // We need to spin the event-loop in order get the GC to actually run.
+        // We do this by queuing a task that calls the GC and then resolves the promise.
+        let task = task!(testutils_gc: move || {
+            unsafe {
+                JS_GC(*GlobalScope::get_cx(), GCReason::DOM_TESTUTILS);
+            }
+            let promise = trusted.root();
+            promise.resolve_native(&(), CanGc::note());
+        });
+
+        global
+            .task_manager()
+            .dom_manipulation_task_source()
+            .queue(task);
+
+        promise
+    }
+}
diff --git a/components/script/dom/text.rs b/components/script/dom/text.rs
index d4b31ab3dcf..c5c8b2ce06b 100644
--- a/components/script/dom/text.rs
+++ b/components/script/dom/text.rs
@@ -89,7 +89,7 @@ impl TextMethods<crate::DomTypeHolder> for Text {
         if let Some(ref parent) = parent {
             // Step 7.1.
             parent
-                .InsertBefore(new_node.upcast(), node.GetNextSibling().as_deref())
+                .InsertBefore(new_node.upcast(), node.GetNextSibling().as_deref(), can_gc)
                 .unwrap();
             // Steps 7.2-3.
             node.ranges()
diff --git a/components/script/dom/texttracklist.rs b/components/script/dom/texttracklist.rs
index 7d1c869d0bf..5ec940d5348 100644
--- a/components/script/dom/texttracklist.rs
+++ b/components/script/dom/texttracklist.rs
@@ -79,7 +79,7 @@ impl TextTrackList {
 
                     if let Some(track) = this.item(idx) {
                         let event = TrackEvent::new(
-                            &this.global(),
+                            this.global().as_window(),
                             atom!("addtrack"),
                             false,
                             false,
diff --git a/components/script/dom/trackevent.rs b/components/script/dom/trackevent.rs
index 82be7581883..dc5cb0bbe24 100644
--- a/components/script/dom/trackevent.rs
+++ b/components/script/dom/trackevent.rs
@@ -13,11 +13,10 @@ use crate::dom::bindings::codegen::Bindings::TrackEventBinding::TrackEventMethod
 use crate::dom::bindings::codegen::UnionTypes::VideoTrackOrAudioTrackOrTextTrack;
 use crate::dom::bindings::error::Fallible;
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::event::Event;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::texttrack::TextTrack;
 use crate::dom::videotrack::VideoTrack;
 use crate::dom::window::Window;
@@ -61,18 +60,18 @@ impl TrackEvent {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         type_: Atom,
         bubbles: bool,
         cancelable: bool,
         track: &Option<VideoTrackOrAudioTrackOrTextTrack>,
         can_gc: CanGc,
     ) -> DomRoot<TrackEvent> {
-        Self::new_with_proto(global, None, type_, bubbles, cancelable, track, can_gc)
+        Self::new_with_proto(window, None, type_, bubbles, cancelable, track, can_gc)
     }
 
     fn new_with_proto(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         type_: Atom,
         bubbles: bool,
@@ -82,7 +81,7 @@ impl TrackEvent {
     ) -> DomRoot<TrackEvent> {
         let te = reflect_dom_object_with_proto(
             Box::new(TrackEvent::new_inherited(track)),
-            global,
+            window,
             proto,
             can_gc,
         );
@@ -104,7 +103,7 @@ impl TrackEventMethods<crate::DomTypeHolder> for TrackEvent {
         init: &TrackEventBinding::TrackEventInit,
     ) -> Fallible<DomRoot<TrackEvent>> {
         Ok(TrackEvent::new_with_proto(
-            &window.global(),
+            window,
             proto,
             Atom::from(type_),
             init.parent.bubbles,
diff --git a/components/script/dom/transformstream.rs b/components/script/dom/transformstream.rs
new file mode 100644
index 00000000000..0251498980d
--- /dev/null
+++ b/components/script/dom/transformstream.rs
@@ -0,0 +1,1105 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::cell::Cell;
+use std::collections::HashMap;
+use std::ptr::{self};
+use std::rc::Rc;
+
+use base::id::{MessagePortId, MessagePortIndex};
+use constellation_traits::MessagePortImpl;
+use dom_struct::dom_struct;
+use js::jsapi::{Heap, IsPromiseObject, JSObject};
+use js::jsval::{JSVal, ObjectValue, UndefinedValue};
+use js::rust::{HandleObject as SafeHandleObject, HandleValue as SafeHandleValue, IntoHandle};
+use script_bindings::callback::ExceptionHandling;
+use script_bindings::realms::InRealm;
+
+use super::bindings::codegen::Bindings::QueuingStrategyBinding::QueuingStrategySize;
+use super::bindings::structuredclone::StructuredData;
+use super::bindings::transferable::Transferable;
+use super::messageport::MessagePort;
+use super::promisenativehandler::Callback;
+use super::types::{TransformStreamDefaultController, WritableStream};
+use crate::dom::bindings::cell::DomRefCell;
+use crate::dom::bindings::codegen::Bindings::QueuingStrategyBinding::QueuingStrategy;
+use crate::dom::bindings::codegen::Bindings::TransformStreamBinding::TransformStreamMethods;
+use crate::dom::bindings::codegen::Bindings::TransformerBinding::Transformer;
+use crate::dom::bindings::conversions::ConversionResult;
+use crate::dom::bindings::error::{Error, Fallible};
+use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object_with_proto};
+use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
+use crate::dom::countqueuingstrategy::{extract_high_water_mark, extract_size_algorithm};
+use crate::dom::globalscope::GlobalScope;
+use crate::dom::promise::Promise;
+use crate::dom::readablestream::{ReadableStream, create_readable_stream};
+use crate::dom::types::PromiseNativeHandler;
+use crate::dom::underlyingsourcecontainer::UnderlyingSourceType;
+use crate::dom::writablestream::create_writable_stream;
+use crate::dom::writablestreamdefaultcontroller::UnderlyingSinkType;
+use crate::realms::enter_realm;
+use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
+
+impl js::gc::Rootable for TransformBackPressureChangePromiseFulfillment {}
+
+/// Reacting to backpressureChangePromise as part of
+/// <https://streams.spec.whatwg.org/#transform-stream-default-sink-write-algorithm>
+#[derive(JSTraceable, MallocSizeOf)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+struct TransformBackPressureChangePromiseFulfillment {
+    /// The result of reacting to backpressureChangePromise.
+    #[ignore_malloc_size_of = "Rc is hard"]
+    result_promise: Rc<Promise>,
+
+    #[ignore_malloc_size_of = "mozjs"]
+    chunk: Box<Heap<JSVal>>,
+
+    /// The writable used in the fulfillment steps
+    writable: Dom<WritableStream>,
+
+    controller: Dom<TransformStreamDefaultController>,
+}
+
+impl Callback for TransformBackPressureChangePromiseFulfillment {
+    /// Reacting to backpressureChangePromise with the following fulfillment steps:
+    fn callback(&self, cx: SafeJSContext, _v: SafeHandleValue, _realm: InRealm, can_gc: CanGc) {
+        // Let writable be stream.[[writable]].
+        // Let state be writable.[[state]].
+        // If state is "erroring", throw writable.[[storedError]].
+        if self.writable.is_erroring() {
+            rooted!(in(*cx) let mut error = UndefinedValue());
+            self.writable.get_stored_error(error.handle_mut());
+            self.result_promise.reject(cx, error.handle(), can_gc);
+            return;
+        }
+
+        // Assert: state is "writable".
+        assert!(self.writable.is_writable());
+
+        // Return ! TransformStreamDefaultControllerPerformTransform(controller, chunk).
+        rooted!(in(*cx) let mut chunk = UndefinedValue());
+        chunk.set(self.chunk.get());
+        let transform_result = self
+            .controller
+            .transform_stream_default_controller_perform_transform(
+                cx,
+                &self.writable.global(),
+                chunk.handle(),
+                can_gc,
+            )
+            .expect("perform transform failed");
+
+        // PerformTransformFulfillment and PerformTransformRejection do not need
+        // to be rooted because they only contain an Rc.
+        let handler = PromiseNativeHandler::new(
+            &self.writable.global(),
+            Some(Box::new(PerformTransformFulfillment {
+                result_promise: self.result_promise.clone(),
+            })),
+            Some(Box::new(PerformTransformRejection {
+                result_promise: self.result_promise.clone(),
+            })),
+            can_gc,
+        );
+
+        let realm = enter_realm(&*self.writable.global());
+        let comp = InRealm::Entered(&realm);
+        transform_result.append_native_handler(&handler, comp, can_gc);
+    }
+}
+
+#[derive(JSTraceable, MallocSizeOf)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+/// Reacting to fulfillment of performTransform as part of
+/// <https://streams.spec.whatwg.org/#transform-stream-default-sink-write-algorithm>
+struct PerformTransformFulfillment {
+    #[ignore_malloc_size_of = "Rc is hard"]
+    result_promise: Rc<Promise>,
+}
+
+impl Callback for PerformTransformFulfillment {
+    fn callback(&self, _cx: SafeJSContext, _v: SafeHandleValue, _realm: InRealm, can_gc: CanGc) {
+        // Fulfilled: resolve the outer promise
+        self.result_promise.resolve_native(&(), can_gc);
+    }
+}
+
+#[derive(JSTraceable, MallocSizeOf)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+/// Reacting to rejection of performTransform as part of
+/// <https://streams.spec.whatwg.org/#transform-stream-default-sink-write-algorithm>
+struct PerformTransformRejection {
+    #[ignore_malloc_size_of = "Rc is hard"]
+    result_promise: Rc<Promise>,
+}
+
+impl Callback for PerformTransformRejection {
+    fn callback(&self, cx: SafeJSContext, v: SafeHandleValue, _realm: InRealm, can_gc: CanGc) {
+        // Stream already errored in perform_transform, just reject result_promise
+        self.result_promise.reject(cx, v, can_gc);
+    }
+}
+
+#[derive(JSTraceable, MallocSizeOf)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+/// Reacting to rejection of backpressureChangePromise as part of
+/// <https://streams.spec.whatwg.org/#transform-stream-default-sink-write-algorithm>
+struct BackpressureChangeRejection {
+    #[ignore_malloc_size_of = "Rc is hard"]
+    result_promise: Rc<Promise>,
+}
+
+impl Callback for BackpressureChangeRejection {
+    fn callback(&self, cx: SafeJSContext, reason: SafeHandleValue, _realm: InRealm, can_gc: CanGc) {
+        self.result_promise.reject(cx, reason, can_gc);
+    }
+}
+
+impl js::gc::Rootable for CancelPromiseFulfillment {}
+
+/// Reacting to fulfillment of the cancelpromise as part of
+/// <https://streams.spec.whatwg.org/#transform-stream-default-sink-abort-algorithm>
+#[derive(JSTraceable, MallocSizeOf)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+struct CancelPromiseFulfillment {
+    readable: Dom<ReadableStream>,
+    controller: Dom<TransformStreamDefaultController>,
+    #[ignore_malloc_size_of = "mozjs"]
+    reason: Box<Heap<JSVal>>,
+}
+
+impl Callback for CancelPromiseFulfillment {
+    /// Reacting to backpressureChangePromise with the following fulfillment steps:
+    fn callback(&self, cx: SafeJSContext, _v: SafeHandleValue, _realm: InRealm, can_gc: CanGc) {
+        // If readable.[[state]] is "errored", reject controller.[[finishPromise]] with readable.[[storedError]].
+        if self.readable.is_errored() {
+            rooted!(in(*cx) let mut error = UndefinedValue());
+            self.readable.get_stored_error(error.handle_mut());
+            self.controller
+                .get_finish_promise()
+                .expect("finish promise is not set")
+                .reject_native(&error.handle(), can_gc);
+        } else {
+            // Otherwise:
+            // Perform ! ReadableStreamDefaultControllerError(readable.[[controller]], reason).
+            rooted!(in(*cx) let mut reason = UndefinedValue());
+            reason.set(self.reason.get());
+            self.readable
+                .get_default_controller()
+                .error(reason.handle(), can_gc);
+
+            // Resolve controller.[[finishPromise]] with undefined.
+            self.controller
+                .get_finish_promise()
+                .expect("finish promise is not set")
+                .resolve_native(&(), can_gc);
+        }
+    }
+}
+
+impl js::gc::Rootable for CancelPromiseRejection {}
+
+/// Reacting to rejection of cancelpromise as part of
+/// <https://streams.spec.whatwg.org/#transform-stream-default-sink-abort-algorithm>
+#[derive(JSTraceable, MallocSizeOf)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+struct CancelPromiseRejection {
+    readable: Dom<ReadableStream>,
+    controller: Dom<TransformStreamDefaultController>,
+}
+
+impl Callback for CancelPromiseRejection {
+    /// Reacting to backpressureChangePromise with the following fulfillment steps:
+    fn callback(&self, cx: SafeJSContext, v: SafeHandleValue, _realm: InRealm, can_gc: CanGc) {
+        // Perform ! ReadableStreamDefaultControllerError(readable.[[controller]], r).
+        self.readable.get_default_controller().error(v, can_gc);
+
+        // Reject controller.[[finishPromise]] with r.
+        self.controller
+            .get_finish_promise()
+            .expect("finish promise is not set")
+            .reject(cx, v, can_gc);
+    }
+}
+
+impl js::gc::Rootable for SourceCancelPromiseFulfillment {}
+
+/// Reacting to fulfillment of the cancelpromise as part of
+/// <https://streams.spec.whatwg.org/#transform-stream-default-source-cancel>
+#[derive(JSTraceable, MallocSizeOf)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+struct SourceCancelPromiseFulfillment {
+    writeable: Dom<WritableStream>,
+    controller: Dom<TransformStreamDefaultController>,
+    stream: Dom<TransformStream>,
+    #[ignore_malloc_size_of = "mozjs"]
+    reason: Box<Heap<JSVal>>,
+}
+
+impl Callback for SourceCancelPromiseFulfillment {
+    /// Reacting to backpressureChangePromise with the following fulfillment steps:
+    fn callback(&self, cx: SafeJSContext, _v: SafeHandleValue, _realm: InRealm, can_gc: CanGc) {
+        // If cancelPromise was fulfilled, then:
+        let finish_promise = self
+            .controller
+            .get_finish_promise()
+            .expect("finish promise is not set");
+
+        let global = &self.writeable.global();
+        // If writable.[[state]] is "errored", reject controller.[[finishPromise]] with writable.[[storedError]].
+        if self.writeable.is_errored() {
+            rooted!(in(*cx) let mut error = UndefinedValue());
+            self.writeable.get_stored_error(error.handle_mut());
+            finish_promise.reject(cx, error.handle(), can_gc);
+        } else {
+            // Otherwise:
+            // Perform ! WritableStreamDefaultControllerErrorIfNeeded(writable.[[controller]], reason).
+            rooted!(in(*cx) let mut reason = UndefinedValue());
+            reason.set(self.reason.get());
+            self.writeable.get_default_controller().error_if_needed(
+                cx,
+                reason.handle(),
+                global,
+                can_gc,
+            );
+
+            // Perform ! TransformStreamUnblockWrite(stream).
+            self.stream.unblock_write(global, can_gc);
+
+            // Resolve controller.[[finishPromise]] with undefined.
+            finish_promise.resolve_native(&(), can_gc);
+        }
+    }
+}
+
+impl js::gc::Rootable for SourceCancelPromiseRejection {}
+
+/// Reacting to rejection of cancelpromise as part of
+/// <https://streams.spec.whatwg.org/#transform-stream-default-source-cancel>
+#[derive(JSTraceable, MallocSizeOf)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+struct SourceCancelPromiseRejection {
+    writeable: Dom<WritableStream>,
+    controller: Dom<TransformStreamDefaultController>,
+    stream: Dom<TransformStream>,
+}
+
+impl Callback for SourceCancelPromiseRejection {
+    /// Reacting to backpressureChangePromise with the following fulfillment steps:
+    fn callback(&self, cx: SafeJSContext, v: SafeHandleValue, _realm: InRealm, can_gc: CanGc) {
+        // Perform ! WritableStreamDefaultControllerErrorIfNeeded(writable.[[controller]], r).
+        let global = &self.writeable.global();
+
+        self.writeable
+            .get_default_controller()
+            .error_if_needed(cx, v, global, can_gc);
+
+        // Perform ! TransformStreamUnblockWrite(stream).
+        self.stream.unblock_write(global, can_gc);
+
+        // Reject controller.[[finishPromise]] with r.
+        self.controller
+            .get_finish_promise()
+            .expect("finish promise is not set")
+            .reject(cx, v, can_gc);
+    }
+}
+
+impl js::gc::Rootable for FlushPromiseFulfillment {}
+
+/// Reacting to fulfillment of the flushpromise as part of
+/// <https://streams.spec.whatwg.org/#transform-stream-default-sink-close-algorithm>
+#[derive(JSTraceable, MallocSizeOf)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+struct FlushPromiseFulfillment {
+    readable: Dom<ReadableStream>,
+    controller: Dom<TransformStreamDefaultController>,
+}
+
+impl Callback for FlushPromiseFulfillment {
+    /// Reacting to flushpromise with the following fulfillment steps:
+    fn callback(&self, cx: SafeJSContext, _v: SafeHandleValue, _realm: InRealm, can_gc: CanGc) {
+        // If flushPromise was fulfilled, then:
+        let finish_promise = self
+            .controller
+            .get_finish_promise()
+            .expect("finish promise is not set");
+
+        // If readable.[[state]] is "errored", reject controller.[[finishPromise]] with readable.[[storedError]].
+        if self.readable.is_errored() {
+            rooted!(in(*cx) let mut error = UndefinedValue());
+            self.readable.get_stored_error(error.handle_mut());
+            finish_promise.reject(cx, error.handle(), can_gc);
+        } else {
+            // Otherwise:
+            // Perform ! ReadableStreamDefaultControllerClose(readable.[[controller]]).
+            self.readable.get_default_controller().close(can_gc);
+
+            // Resolve controller.[[finishPromise]] with undefined.
+            finish_promise.resolve_native(&(), can_gc);
+        }
+    }
+}
+
+impl js::gc::Rootable for FlushPromiseRejection {}
+/// Reacting to rejection of flushpromise as part of
+/// <https://streams.spec.whatwg.org/#transform-stream-default-sink-close-algorithm>
+
+#[derive(JSTraceable, MallocSizeOf)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+struct FlushPromiseRejection {
+    readable: Dom<ReadableStream>,
+    controller: Dom<TransformStreamDefaultController>,
+}
+
+impl Callback for FlushPromiseRejection {
+    /// Reacting to flushpromise with the following fulfillment steps:
+    fn callback(&self, cx: SafeJSContext, v: SafeHandleValue, _realm: InRealm, can_gc: CanGc) {
+        // If flushPromise was rejected with reason r, then:
+        // Perform ! ReadableStreamDefaultControllerError(readable.[[controller]], r).
+        self.readable.get_default_controller().error(v, can_gc);
+
+        // Reject controller.[[finishPromise]] with r.
+        self.controller
+            .get_finish_promise()
+            .expect("finish promise is not set")
+            .reject(cx, v, can_gc);
+    }
+}
+
+/// <https://streams.spec.whatwg.org/#ts-class>
+#[dom_struct]
+pub struct TransformStream {
+    reflector_: Reflector,
+
+    /// <https://streams.spec.whatwg.org/#transformstream-backpressure>
+    backpressure: Cell<bool>,
+
+    /// <https://streams.spec.whatwg.org/#transformstream-backpressurechangepromise>
+    #[ignore_malloc_size_of = "Rc is hard"]
+    backpressure_change_promise: DomRefCell<Option<Rc<Promise>>>,
+
+    /// <https://streams.spec.whatwg.org/#transformstream-controller>
+    controller: MutNullableDom<TransformStreamDefaultController>,
+
+    /// <https://streams.spec.whatwg.org/#transformstream-detached>
+    detached: Cell<bool>,
+
+    /// <https://streams.spec.whatwg.org/#transformstream-readable>
+    readable: MutNullableDom<ReadableStream>,
+
+    /// <https://streams.spec.whatwg.org/#transformstream-writable>
+    writable: MutNullableDom<WritableStream>,
+}
+
+impl TransformStream {
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    /// <https://streams.spec.whatwg.org/#initialize-transform-stream>
+    fn new_inherited() -> TransformStream {
+        TransformStream {
+            reflector_: Reflector::new(),
+            backpressure: Default::default(),
+            backpressure_change_promise: DomRefCell::new(None),
+            controller: MutNullableDom::new(None),
+            detached: Cell::new(false),
+            readable: MutNullableDom::new(None),
+            writable: MutNullableDom::new(None),
+        }
+    }
+
+    pub(crate) fn new_with_proto(
+        global: &GlobalScope,
+        proto: Option<SafeHandleObject>,
+        can_gc: CanGc,
+    ) -> DomRoot<TransformStream> {
+        reflect_dom_object_with_proto(
+            Box::new(TransformStream::new_inherited()),
+            global,
+            proto,
+            can_gc,
+        )
+    }
+
+    pub(crate) fn get_controller(&self) -> DomRoot<TransformStreamDefaultController> {
+        self.controller.get().expect("controller is not set")
+    }
+
+    pub(crate) fn get_writable(&self) -> DomRoot<WritableStream> {
+        self.writable.get().expect("writable stream is not set")
+    }
+
+    pub(crate) fn get_readable(&self) -> DomRoot<ReadableStream> {
+        self.readable.get().expect("readable stream is not set")
+    }
+
+    pub(crate) fn get_backpressure(&self) -> bool {
+        self.backpressure.get()
+    }
+
+    /// <https://streams.spec.whatwg.org/#initialize-transform-stream>
+    #[allow(clippy::too_many_arguments)]
+    fn initialize(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        start_promise: Rc<Promise>,
+        writable_high_water_mark: f64,
+        writable_size_algorithm: Rc<QueuingStrategySize>,
+        readable_high_water_mark: f64,
+        readable_size_algorithm: Rc<QueuingStrategySize>,
+        can_gc: CanGc,
+    ) -> Fallible<()> {
+        // Let startAlgorithm be an algorithm that returns startPromise.
+        // Let writeAlgorithm be the following steps, taking a chunk argument:
+        //  Return ! TransformStreamDefaultSinkWriteAlgorithm(stream, chunk).
+        // Let abortAlgorithm be the following steps, taking a reason argument:
+        //  Return ! TransformStreamDefaultSinkAbortAlgorithm(stream, reason).
+        // Let closeAlgorithm be the following steps:
+        //  Return ! TransformStreamDefaultSinkCloseAlgorithm(stream).
+        // Set stream.[[writable]] to ! CreateWritableStream(startAlgorithm, writeAlgorithm,
+        // closeAlgorithm, abortAlgorithm, writableHighWaterMark, writableSizeAlgorithm).
+        // Note: Those steps are implemented using UnderlyingSinkType::Transform.
+
+        let writable = create_writable_stream(
+            cx,
+            global,
+            writable_high_water_mark,
+            writable_size_algorithm,
+            UnderlyingSinkType::Transform(Dom::from_ref(self), start_promise.clone()),
+            can_gc,
+        )?;
+        self.writable.set(Some(&writable));
+
+        // Let pullAlgorithm be the following steps:
+
+        // Return ! TransformStreamDefaultSourcePullAlgorithm(stream).
+
+        // Let cancelAlgorithm be the following steps, taking a reason argument:
+
+        // Return ! TransformStreamDefaultSourceCancelAlgorithm(stream, reason).
+
+        // Set stream.[[readable]] to ! CreateReadableStream(startAlgorithm, pullAlgorithm,
+        // cancelAlgorithm, readableHighWaterMark, readableSizeAlgorithm).
+
+        let readable = create_readable_stream(
+            global,
+            UnderlyingSourceType::Transform(Dom::from_ref(self), start_promise.clone()),
+            Some(readable_size_algorithm),
+            Some(readable_high_water_mark),
+            can_gc,
+        );
+        self.readable.set(Some(&readable));
+
+        // Set stream.[[backpressure]] and stream.[[backpressureChangePromise]] to undefined.
+        // Note: This is done in the constructor.
+
+        // Perform ! TransformStreamSetBackpressure(stream, true).
+        self.set_backpressure(global, true, can_gc);
+
+        // Set stream.[[controller]] to undefined.
+        self.controller.set(None);
+
+        Ok(())
+    }
+
+    /// <https://streams.spec.whatwg.org/#transform-stream-set-backpressure>
+    pub(crate) fn set_backpressure(&self, global: &GlobalScope, backpressure: bool, can_gc: CanGc) {
+        // Assert: stream.[[backpressure]] is not backpressure.
+        assert!(self.backpressure.get() != backpressure);
+
+        // If stream.[[backpressureChangePromise]] is not undefined, resolve
+        // stream.[[backpressureChangePromise]] with undefined.
+        if let Some(promise) = self.backpressure_change_promise.borrow_mut().take() {
+            promise.resolve_native(&(), can_gc);
+        }
+
+        // Set stream.[[backpressureChangePromise]] to a new promise.;
+        *self.backpressure_change_promise.borrow_mut() = Some(Promise::new(global, can_gc));
+
+        // Set stream.[[backpressure]] to backpressure.
+        self.backpressure.set(backpressure);
+    }
+
+    /// <https://streams.spec.whatwg.org/#set-up-transform-stream-default-controller>
+    fn set_up_transform_stream_default_controller(
+        &self,
+        controller: &TransformStreamDefaultController,
+    ) {
+        // Assert: stream implements TransformStream.
+        // Note: this is checked with type.
+
+        // Assert: stream.[[controller]] is undefined.
+        assert!(self.controller.get().is_none());
+
+        // Set controller.[[stream]] to stream.
+        controller.set_stream(self);
+
+        // Set stream.[[controller]] to controller.
+        self.controller.set(Some(controller));
+
+        // Set controller.[[transformAlgorithm]] to transformAlgorithm.
+        // Set controller.[[flushAlgorithm]] to flushAlgorithm.
+        // Set controller.[[cancelAlgorithm]] to cancelAlgorithm.
+        // Note: These are set in the constructor.
+    }
+
+    /// <https://streams.spec.whatwg.org/#set-up-transform-stream-default-controller-from-transformer>
+    fn set_up_transform_stream_default_controller_from_transformer(
+        &self,
+        global: &GlobalScope,
+        transformer_obj: SafeHandleObject,
+        transformer: &Transformer,
+        can_gc: CanGc,
+    ) {
+        // Let controller be a new TransformStreamDefaultController.
+        let controller = TransformStreamDefaultController::new(global, transformer, can_gc);
+
+        // Let transformAlgorithm be the following steps, taking a chunk argument:
+        // Let result be TransformStreamDefaultControllerEnqueue(controller, chunk).
+        // If result is an abrupt completion, return a promise rejected with result.[[Value]].
+        // Otherwise, return a promise resolved with undefined.
+
+        // Let flushAlgorithm be an algorithm which returns a promise resolved with undefined.
+        // Let cancelAlgorithm be an algorithm which returns a promise resolved with undefined.
+
+        // If transformerDict["transform"] exists, set transformAlgorithm to an algorithm which
+        // takes an argument
+        // chunk and returns the result of invoking transformerDict["transform"] with argument
+        // list « chunk, controller »
+        // and callback this value transformer.
+
+        // If transformerDict["flush"] exists, set flushAlgorithm to an algorithm which returns
+        // the result
+        // of invoking transformerDict["flush"] with argument list « controller » and callback
+        // this value transformer.
+
+        // If transformerDict["cancel"] exists, set cancelAlgorithm to an algorithm which takes an argument
+        // reason and returns the result of invoking transformerDict["cancel"] with argument list « reason »
+        // and callback this value transformer.
+        controller.set_transform_obj(transformer_obj);
+
+        // Perform ! SetUpTransformStreamDefaultController(stream, controller,
+        // transformAlgorithm, flushAlgorithm, cancelAlgorithm).
+        self.set_up_transform_stream_default_controller(&controller);
+    }
+
+    /// <https://streams.spec.whatwg.org/#transform-stream-default-sink-write-algorithm>
+    pub(crate) fn transform_stream_default_sink_write_algorithm(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        chunk: SafeHandleValue,
+        can_gc: CanGc,
+    ) -> Fallible<Rc<Promise>> {
+        // Assert: stream.[[writable]].[[state]] is "writable".
+        assert!(self.writable.get().is_some());
+
+        // Let controller be stream.[[controller]].
+        let controller = self.controller.get().expect("controller is not set");
+
+        // If stream.[[backpressure]] is true,
+        if self.backpressure.get() {
+            // Let backpressureChangePromise be stream.[[backpressureChangePromise]].
+            let backpressure_change_promise = self.backpressure_change_promise.borrow();
+
+            // Assert: backpressureChangePromise is not undefined.
+            assert!(backpressure_change_promise.is_some());
+
+            // Return the result of reacting to backpressureChangePromise with the following fulfillment steps:
+            let result_promise = Promise::new(global, can_gc);
+            rooted!(in(*cx) let mut fulfillment_handler = Some(TransformBackPressureChangePromiseFulfillment {
+                controller: Dom::from_ref(&controller),
+                writable: Dom::from_ref(&self.writable.get().expect("writable stream")),
+                chunk: Heap::boxed(chunk.get()),
+                result_promise: result_promise.clone(),
+            }));
+
+            let handler = PromiseNativeHandler::new(
+                global,
+                fulfillment_handler.take().map(|h| Box::new(h) as Box<_>),
+                Some(Box::new(BackpressureChangeRejection {
+                    result_promise: result_promise.clone(),
+                })),
+                can_gc,
+            );
+            let realm = enter_realm(global);
+            let comp = InRealm::Entered(&realm);
+            backpressure_change_promise
+                .as_ref()
+                .expect("Promise must be some by now.")
+                .append_native_handler(&handler, comp, can_gc);
+
+            return Ok(result_promise);
+        }
+
+        // Return ! TransformStreamDefaultControllerPerformTransform(controller, chunk).
+        controller.transform_stream_default_controller_perform_transform(cx, global, chunk, can_gc)
+    }
+
+    /// <https://streams.spec.whatwg.org/#transform-stream-default-sink-abort-algorithm>
+    pub(crate) fn transform_stream_default_sink_abort_algorithm(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        reason: SafeHandleValue,
+        can_gc: CanGc,
+    ) -> Fallible<Rc<Promise>> {
+        // Let controller be stream.[[controller]].
+        let controller = self.controller.get().expect("controller is not set");
+
+        // If controller.[[finishPromise]] is not undefined, return controller.[[finishPromise]].
+        if let Some(finish_promise) = controller.get_finish_promise() {
+            return Ok(finish_promise);
+        }
+
+        // Let readable be stream.[[readable]].
+        let readable = self.readable.get().expect("readable stream is not set");
+
+        // Let controller.[[finishPromise]] be a new promise.
+        controller.set_finish_promise(Promise::new(global, can_gc));
+
+        // Let cancelPromise be the result of performing controller.[[cancelAlgorithm]], passing reason.
+        let cancel_promise = controller.perform_cancel(cx, global, reason, can_gc)?;
+
+        // Perform ! TransformStreamDefaultControllerClearAlgorithms(controller).
+        controller.clear_algorithms();
+
+        // React to cancelPromise:
+        let handler = PromiseNativeHandler::new(
+            global,
+            Some(Box::new(CancelPromiseFulfillment {
+                readable: Dom::from_ref(&readable),
+                controller: Dom::from_ref(&controller),
+                reason: Heap::boxed(reason.get()),
+            })),
+            Some(Box::new(CancelPromiseRejection {
+                readable: Dom::from_ref(&readable),
+                controller: Dom::from_ref(&controller),
+            })),
+            can_gc,
+        );
+        let realm = enter_realm(global);
+        let comp = InRealm::Entered(&realm);
+        cancel_promise.append_native_handler(&handler, comp, can_gc);
+
+        // Return controller.[[finishPromise]].
+        let finish_promise = controller
+            .get_finish_promise()
+            .expect("finish promise is not set");
+        Ok(finish_promise)
+    }
+
+    /// <https://streams.spec.whatwg.org/#transform-stream-default-sink-close-algorithm>
+    pub(crate) fn transform_stream_default_sink_close_algorithm(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        can_gc: CanGc,
+    ) -> Fallible<Rc<Promise>> {
+        // Let controller be stream.[[controller]].
+        let controller = self
+            .controller
+            .get()
+            .ok_or(Error::Type("controller is not set".to_string()))?;
+
+        // If controller.[[finishPromise]] is not undefined, return controller.[[finishPromise]].
+        if let Some(finish_promise) = controller.get_finish_promise() {
+            return Ok(finish_promise);
+        }
+
+        // Let readable be stream.[[readable]].
+        let readable = self
+            .readable
+            .get()
+            .ok_or(Error::Type("readable stream is not set".to_string()))?;
+
+        // Let controller.[[finishPromise]] be a new promise.
+        controller.set_finish_promise(Promise::new(global, can_gc));
+
+        // Let flushPromise be the result of performing controller.[[flushAlgorithm]].
+        let flush_promise = controller.perform_flush(cx, global, can_gc)?;
+
+        // Perform ! TransformStreamDefaultControllerClearAlgorithms(controller).
+        controller.clear_algorithms();
+
+        // React to flushPromise:
+        let handler = PromiseNativeHandler::new(
+            global,
+            Some(Box::new(FlushPromiseFulfillment {
+                readable: Dom::from_ref(&readable),
+                controller: Dom::from_ref(&controller),
+            })),
+            Some(Box::new(FlushPromiseRejection {
+                readable: Dom::from_ref(&readable),
+                controller: Dom::from_ref(&controller),
+            })),
+            can_gc,
+        );
+
+        let realm = enter_realm(global);
+        let comp = InRealm::Entered(&realm);
+        flush_promise.append_native_handler(&handler, comp, can_gc);
+        // Return controller.[[finishPromise]].
+        let finish_promise = controller
+            .get_finish_promise()
+            .expect("finish promise is not set");
+        Ok(finish_promise)
+    }
+
+    /// <https://streams.spec.whatwg.org/#transform-stream-default-source-cancel>
+    pub(crate) fn transform_stream_default_source_cancel(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        reason: SafeHandleValue,
+        can_gc: CanGc,
+    ) -> Fallible<Rc<Promise>> {
+        // Let controller be stream.[[controller]].
+        let controller = self
+            .controller
+            .get()
+            .ok_or(Error::Type("controller is not set".to_string()))?;
+
+        // If controller.[[finishPromise]] is not undefined, return controller.[[finishPromise]].
+        if let Some(finish_promise) = controller.get_finish_promise() {
+            return Ok(finish_promise);
+        }
+
+        // Let writable be stream.[[writable]].
+        let writable = self
+            .writable
+            .get()
+            .ok_or(Error::Type("writable stream is not set".to_string()))?;
+
+        // Let controller.[[finishPromise]] be a new promise.
+        controller.set_finish_promise(Promise::new(global, can_gc));
+
+        // Let cancelPromise be the result of performing controller.[[cancelAlgorithm]], passing reason.
+        let cancel_promise = controller.perform_cancel(cx, global, reason, can_gc)?;
+
+        // Perform ! TransformStreamDefaultControllerClearAlgorithms(controller).
+        controller.clear_algorithms();
+
+        // React to cancelPromise:
+        let handler = PromiseNativeHandler::new(
+            global,
+            Some(Box::new(SourceCancelPromiseFulfillment {
+                writeable: Dom::from_ref(&writable),
+                controller: Dom::from_ref(&controller),
+                stream: Dom::from_ref(self),
+                reason: Heap::boxed(reason.get()),
+            })),
+            Some(Box::new(SourceCancelPromiseRejection {
+                writeable: Dom::from_ref(&writable),
+                controller: Dom::from_ref(&controller),
+                stream: Dom::from_ref(self),
+            })),
+            can_gc,
+        );
+
+        // Return controller.[[finishPromise]].
+        let finish_promise = controller
+            .get_finish_promise()
+            .expect("finish promise is not set");
+        let realm = enter_realm(global);
+        let comp = InRealm::Entered(&realm);
+        cancel_promise.append_native_handler(&handler, comp, can_gc);
+        Ok(finish_promise)
+    }
+
+    /// <https://streams.spec.whatwg.org/#transform-stream-default-source-pull>
+    pub(crate) fn transform_stream_default_source_pull(
+        &self,
+        global: &GlobalScope,
+        can_gc: CanGc,
+    ) -> Fallible<Rc<Promise>> {
+        // Assert: stream.[[backpressure]] is true.
+        assert!(self.backpressure.get());
+
+        // Assert: stream.[[backpressureChangePromise]] is not undefined.
+        assert!(self.backpressure_change_promise.borrow().is_some());
+
+        // Perform ! TransformStreamSetBackpressure(stream, false).
+        self.set_backpressure(global, false, can_gc);
+
+        // Return stream.[[backpressureChangePromise]].
+        Ok(self
+            .backpressure_change_promise
+            .borrow()
+            .clone()
+            .expect("Promise must be some by now."))
+    }
+
+    /// <https://streams.spec.whatwg.org/#transform-stream-error-writable-and-unblock-write>
+    pub(crate) fn error_writable_and_unblock_write(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        error: SafeHandleValue,
+        can_gc: CanGc,
+    ) {
+        // Perform ! TransformStreamDefaultControllerClearAlgorithms(stream.[[controller]]).
+        self.get_controller().clear_algorithms();
+
+        // Perform ! WritableStreamDefaultControllerErrorIfNeeded(stream.[[writable]].[[controller]], e).
+        self.get_writable()
+            .get_default_controller()
+            .error_if_needed(cx, error, global, can_gc);
+
+        // Perform ! TransformStreamUnblockWrite(stream).
+        self.unblock_write(global, can_gc)
+    }
+
+    /// <https://streams.spec.whatwg.org/#transform-stream-unblock-write>
+    pub(crate) fn unblock_write(&self, global: &GlobalScope, can_gc: CanGc) {
+        // If stream.[[backpressure]] is true, perform ! TransformStreamSetBackpressure(stream, false).
+        if self.backpressure.get() {
+            self.set_backpressure(global, false, can_gc);
+        }
+    }
+
+    /// <https://streams.spec.whatwg.org/#transform-stream-error>
+    pub(crate) fn error(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        error: SafeHandleValue,
+        can_gc: CanGc,
+    ) {
+        // Perform ! ReadableStreamDefaultControllerError(stream.[[readable]].[[controller]], e).
+        self.get_readable()
+            .get_default_controller()
+            .error(error, can_gc);
+
+        // Perform ! TransformStreamErrorWritableAndUnblockWrite(stream, e).
+        self.error_writable_and_unblock_write(cx, global, error, can_gc);
+    }
+}
+
+impl TransformStreamMethods<crate::DomTypeHolder> for TransformStream {
+    /// <https://streams.spec.whatwg.org/#ts-constructor>
+    #[allow(unsafe_code)]
+    fn Constructor(
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        proto: Option<SafeHandleObject>,
+        can_gc: CanGc,
+        transformer: Option<*mut JSObject>,
+        writable_strategy: &QueuingStrategy,
+        readable_strategy: &QueuingStrategy,
+    ) -> Fallible<DomRoot<TransformStream>> {
+        // If transformer is missing, set it to null.
+        rooted!(in(*cx) let transformer_obj = transformer.unwrap_or(ptr::null_mut()));
+
+        // Let underlyingSinkDict be underlyingSink,
+        // converted to an IDL value of type UnderlyingSink.
+        let transformer_dict = if !transformer_obj.is_null() {
+            rooted!(in(*cx) let obj_val = ObjectValue(transformer_obj.get()));
+            match Transformer::new(cx, obj_val.handle()) {
+                Ok(ConversionResult::Success(val)) => val,
+                Ok(ConversionResult::Failure(error)) => return Err(Error::Type(error.to_string())),
+                _ => {
+                    return Err(Error::JSFailed);
+                },
+            }
+        } else {
+            Transformer::empty()
+        };
+
+        // If transformerDict["readableType"] exists, throw a RangeError exception.
+        if !transformer_dict.readableType.handle().is_undefined() {
+            return Err(Error::Range("readableType is set".to_string()));
+        }
+
+        // If transformerDict["writableType"] exists, throw a RangeError exception.
+        if !transformer_dict.writableType.handle().is_undefined() {
+            return Err(Error::Range("writableType is set".to_string()));
+        }
+
+        // Let readableHighWaterMark be ? ExtractHighWaterMark(readableStrategy, 0).
+        let readable_high_water_mark = extract_high_water_mark(readable_strategy, 0.0)?;
+
+        // Let readableSizeAlgorithm be ! ExtractSizeAlgorithm(readableStrategy).
+        let readable_size_algorithm = extract_size_algorithm(readable_strategy, can_gc);
+
+        // Let writableHighWaterMark be ? ExtractHighWaterMark(writableStrategy, 1).
+        let writable_high_water_mark = extract_high_water_mark(writable_strategy, 1.0)?;
+
+        // Let writableSizeAlgorithm be ! ExtractSizeAlgorithm(writableStrategy).
+        let writable_size_algorithm = extract_size_algorithm(writable_strategy, can_gc);
+
+        // Let startPromise be a new promise.
+        let start_promise = Promise::new(global, can_gc);
+
+        // Perform ! InitializeTransformStream(this, startPromise, writableHighWaterMark,
+        // writableSizeAlgorithm, readableHighWaterMark, readableSizeAlgorithm).
+        let stream = TransformStream::new_with_proto(global, proto, can_gc);
+        stream.initialize(
+            cx,
+            global,
+            start_promise.clone(),
+            writable_high_water_mark,
+            writable_size_algorithm,
+            readable_high_water_mark,
+            readable_size_algorithm,
+            can_gc,
+        )?;
+
+        // Perform ? SetUpTransformStreamDefaultControllerFromTransformer(this, transformer, transformerDict).
+        stream.set_up_transform_stream_default_controller_from_transformer(
+            global,
+            transformer_obj.handle(),
+            &transformer_dict,
+            can_gc,
+        );
+
+        // If transformerDict["start"] exists, then resolve startPromise with the
+        // result of invoking transformerDict["start"]
+        // with argument list « this.[[controller]] » and callback this value transformer.
+        if let Some(start) = &transformer_dict.start {
+            rooted!(in(*cx) let mut result_object = ptr::null_mut::<JSObject>());
+            rooted!(in(*cx) let mut result: JSVal);
+            rooted!(in(*cx) let this_object = transformer_obj.get());
+            start.Call_(
+                &this_object.handle(),
+                &stream.get_controller(),
+                result.handle_mut(),
+                ExceptionHandling::Rethrow,
+                can_gc,
+            )?;
+            let is_promise = unsafe {
+                if result.is_object() {
+                    result_object.set(result.to_object());
+                    IsPromiseObject(result_object.handle().into_handle())
+                } else {
+                    false
+                }
+            };
+            let promise = if is_promise {
+                let promise = Promise::new_with_js_promise(result_object.handle(), cx);
+                promise
+            } else {
+                Promise::new_resolved(global, cx, result.get(), can_gc)
+            };
+            start_promise.resolve_native(&promise, can_gc);
+        } else {
+            // Otherwise, resolve startPromise with undefined.
+            start_promise.resolve_native(&(), can_gc);
+        };
+
+        Ok(stream)
+    }
+
+    /// <https://streams.spec.whatwg.org/#ts-readable>
+    fn Readable(&self) -> DomRoot<ReadableStream> {
+        // Return this.[[readable]].
+        self.readable.get().expect("readable stream is not set")
+    }
+
+    /// <https://streams.spec.whatwg.org/#ts-writable>
+    fn Writable(&self) -> DomRoot<WritableStream> {
+        // Return this.[[writable]].
+        self.writable.get().expect("writable stream is not set")
+    }
+}
+
+/// <https://streams.spec.whatwg.org/#ts-transfer>
+impl Transferable for TransformStream {
+    type Index = MessagePortIndex;
+    type Data = MessagePortImpl;
+
+    fn transfer(&self) -> Result<(MessagePortId, MessagePortImpl), ()> {
+        let global = self.global();
+        let realm = enter_realm(&*global);
+        let comp = InRealm::Entered(&realm);
+        let cx = GlobalScope::get_cx();
+        let can_gc = CanGc::note();
+
+        // Let readable be value.[[readable]].
+        let readable = self.get_readable();
+
+        // Let writable be value.[[writable]].
+        let writable = self.get_writable();
+
+        // If ! IsReadableStreamLocked(readable) is true, throw a "DataCloneError" DOMException.
+        if readable.is_locked() {
+            return Err(());
+        }
+
+        // If ! IsWritableStreamLocked(writable) is true, throw a "DataCloneError" DOMException.
+        if writable.is_locked() {
+            return Err(());
+        }
+
+        // Create the shared port pair
+        let port_1 = MessagePort::new(&global, can_gc);
+        global.track_message_port(&port_1, None);
+        let port_2 = MessagePort::new(&global, can_gc);
+        global.track_message_port(&port_2, None);
+        global.entangle_ports(*port_1.message_port_id(), *port_2.message_port_id());
+
+        // Create a proxy WritableStream wired to port_1
+        let proxy_writable = WritableStream::new_with_proto(&global, None, can_gc);
+        proxy_writable.setup_cross_realm_transform_writable(cx, &port_1, can_gc);
+
+        // Pipe readable into the proxy writable (→ port_1)
+        let pipe1 = readable.pipe_to(
+            cx,
+            &global,
+            &proxy_writable,
+            false,
+            false,
+            false,
+            comp,
+            can_gc,
+        );
+        pipe1.set_promise_is_handled();
+
+        // Create a proxy ReadableStream wired to port_1
+        let proxy_readable = ReadableStream::new_with_proto(&global, None, can_gc);
+        proxy_readable.setup_cross_realm_transform_readable(cx, &port_1, can_gc);
+
+        // Pipe proxy readable (← port_1) into writable
+        let pipe2 =
+            proxy_readable.pipe_to(cx, &global, &writable, false, false, false, comp, can_gc);
+        pipe2.set_promise_is_handled();
+
+        // Set dataHolder.[[readable]] to ! StructuredSerializeWithTransfer(readable, « readable »).
+        // Set dataHolder.[[writable]] to ! StructuredSerializeWithTransfer(writable, « writable »).
+        port_2.transfer()
+    }
+
+    fn transfer_receive(
+        owner: &GlobalScope,
+        id: MessagePortId,
+        port_impl: MessagePortImpl,
+    ) -> Result<DomRoot<Self>, ()> {
+        let can_gc = CanGc::note();
+
+        // Let readableRecord be ! StructuredDeserializeWithTransfer(dataHolder.[[readable]], the current Realm).
+        // Set value.[[readable]] to readableRecord.[[Deserialized]].
+        let readable = ReadableStream::transfer_receive(owner, id, port_impl.clone())?;
+
+        // Let writableRecord be ! StructuredDeserializeWithTransfer(dataHolder.[[writable]], the current Realm).
+        let writable = WritableStream::transfer_receive(owner, id, port_impl)?;
+
+        // Set value.[[readable]] to readableRecord.[[Deserialized]].
+        // Set value.[[writable]] to writableRecord.[[Deserialized]].
+        // Set value.[[backpressure]], value.[[backpressureChangePromise]], and value.[[controller]] to undefined.
+        let stream = TransformStream::new_with_proto(owner, None, can_gc);
+        stream.readable.set(Some(&readable));
+        stream.writable.set(Some(&writable));
+
+        Ok(stream)
+    }
+
+    fn serialized_storage<'a>(
+        data: StructuredData<'a, '_>,
+    ) -> &'a mut Option<HashMap<MessagePortId, Self::Data>> {
+        match data {
+            StructuredData::Reader(r) => &mut r.port_impls,
+            StructuredData::Writer(w) => &mut w.ports,
+        }
+    }
+}
diff --git a/components/script/dom/transformstreamdefaultcontroller.rs b/components/script/dom/transformstreamdefaultcontroller.rs
new file mode 100644
index 00000000000..41813ef6f96
--- /dev/null
+++ b/components/script/dom/transformstreamdefaultcontroller.rs
@@ -0,0 +1,420 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use dom_struct::dom_struct;
+use js::jsapi::{
+    ExceptionStackBehavior, Heap, JS_IsExceptionPending, JS_SetPendingException, JSObject,
+};
+use js::jsval::UndefinedValue;
+use js::rust::{HandleObject as SafeHandleObject, HandleValue as SafeHandleValue};
+
+use super::bindings::cell::DomRefCell;
+use super::bindings::codegen::Bindings::TransformerBinding::{
+    Transformer, TransformerCancelCallback, TransformerFlushCallback, TransformerTransformCallback,
+};
+use super::types::TransformStream;
+use crate::dom::bindings::callback::ExceptionHandling;
+use crate::dom::bindings::codegen::Bindings::TransformStreamDefaultControllerBinding::TransformStreamDefaultControllerMethods;
+use crate::dom::bindings::error::{Error, ErrorToJsval, Fallible};
+use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object};
+use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
+use crate::dom::globalscope::GlobalScope;
+use crate::dom::promise::Promise;
+use crate::dom::promisenativehandler::{Callback, PromiseNativeHandler};
+use crate::realms::{InRealm, enter_realm};
+use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
+
+impl js::gc::Rootable for TransformTransformPromiseRejection {}
+
+/// Reacting to transformPromise as part of
+/// <https://streams.spec.whatwg.org/#transform-stream-default-controller-perform-transform>
+#[derive(JSTraceable, MallocSizeOf)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+struct TransformTransformPromiseRejection {
+    controller: Dom<TransformStreamDefaultController>,
+}
+
+impl Callback for TransformTransformPromiseRejection {
+    /// Reacting to transformPromise with the following fulfillment steps:
+    #[allow(unsafe_code)]
+    fn callback(&self, cx: SafeJSContext, v: SafeHandleValue, _realm: InRealm, can_gc: CanGc) {
+        // Perform ! TransformStreamError(controller.[[stream]], r).
+        self.controller
+            .error(cx, &self.controller.global(), v, can_gc);
+
+        // Throw r.
+        // Note: this is done part of perform_transform().
+    }
+}
+
+/// <https://streams.spec.whatwg.org/#transformstreamdefaultcontroller>
+#[dom_struct]
+pub struct TransformStreamDefaultController {
+    reflector_: Reflector,
+
+    /// <https://streams.spec.whatwg.org/#transformstreamdefaultcontroller-cancelalgorithm>
+    #[ignore_malloc_size_of = "Rc is hard"]
+    cancel: RefCell<Option<Rc<TransformerCancelCallback>>>,
+
+    /// <https://streams.spec.whatwg.org/#transformstreamdefaultcontroller-flushalgorithm>
+    #[ignore_malloc_size_of = "Rc is hard"]
+    flush: RefCell<Option<Rc<TransformerFlushCallback>>>,
+
+    /// <https://streams.spec.whatwg.org/#transformstreamdefaultcontroller-transformalgorithm>
+    #[ignore_malloc_size_of = "Rc is hard"]
+    transform: RefCell<Option<Rc<TransformerTransformCallback>>>,
+
+    /// The JS object used as `this` when invoking sink algorithms.
+    #[ignore_malloc_size_of = "mozjs"]
+    transform_obj: Heap<*mut JSObject>,
+
+    /// <https://streams.spec.whatwg.org/#TransformStreamDefaultController-stream>
+    stream: MutNullableDom<TransformStream>,
+
+    /// <https://streams.spec.whatwg.org/#transformstreamdefaultcontroller-finishpromise>
+    #[ignore_malloc_size_of = "Rc is hard"]
+    finish_promise: DomRefCell<Option<Rc<Promise>>>,
+}
+
+impl TransformStreamDefaultController {
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    fn new_inherited(transformer: &Transformer) -> TransformStreamDefaultController {
+        TransformStreamDefaultController {
+            reflector_: Reflector::new(),
+            cancel: RefCell::new(transformer.cancel.clone()),
+            flush: RefCell::new(transformer.flush.clone()),
+            transform: RefCell::new(transformer.transform.clone()),
+            finish_promise: DomRefCell::new(None),
+            stream: MutNullableDom::new(None),
+            transform_obj: Default::default(),
+        }
+    }
+
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    pub(crate) fn new(
+        global: &GlobalScope,
+        transformer: &Transformer,
+        can_gc: CanGc,
+    ) -> DomRoot<TransformStreamDefaultController> {
+        reflect_dom_object(
+            Box::new(TransformStreamDefaultController::new_inherited(transformer)),
+            global,
+            can_gc,
+        )
+    }
+
+    /// Setting the JS object after the heap has settled down.
+    pub(crate) fn set_transform_obj(&self, this_object: SafeHandleObject) {
+        self.transform_obj.set(*this_object);
+    }
+
+    pub(crate) fn set_stream(&self, stream: &TransformStream) {
+        self.stream.set(Some(stream));
+    }
+
+    pub(crate) fn get_finish_promise(&self) -> Option<Rc<Promise>> {
+        self.finish_promise.borrow().clone()
+    }
+
+    pub(crate) fn set_finish_promise(&self, promise: Rc<Promise>) {
+        *self.finish_promise.borrow_mut() = Some(promise);
+    }
+
+    /// <https://streams.spec.whatwg.org/#transform-stream-default-controller-perform-transform>
+    pub(crate) fn transform_stream_default_controller_perform_transform(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        chunk: SafeHandleValue,
+        can_gc: CanGc,
+    ) -> Fallible<Rc<Promise>> {
+        // Let transformPromise be the result of performing controller.[[transformAlgorithm]], passing chunk.
+        let transform_promise = self.perform_transform(cx, global, chunk, can_gc)?;
+
+        // Return the result of reacting to transformPromise with the following rejection steps given the argument r:
+        rooted!(in(*cx) let mut reject_handler = Some(TransformTransformPromiseRejection {
+            controller: Dom::from_ref(self),
+        }));
+
+        let handler = PromiseNativeHandler::new(
+            global,
+            None,
+            reject_handler.take().map(|h| Box::new(h) as Box<_>),
+            can_gc,
+        );
+        let realm = enter_realm(global);
+        let comp = InRealm::Entered(&realm);
+        transform_promise.append_native_handler(&handler, comp, can_gc);
+
+        Ok(transform_promise)
+    }
+
+    pub(crate) fn perform_transform(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        chunk: SafeHandleValue,
+        can_gc: CanGc,
+    ) -> Fallible<Rc<Promise>> {
+        // If transformerDict["transform"] exists, set transformAlgorithm to an algorithm which
+        // takes an argument chunk and returns the result of invoking transformerDict["transform"] with argument list
+        // « chunk, controller » and callback this value transformer.
+        let algo = self.transform.borrow().clone();
+        let result = if let Some(transform) = algo {
+            rooted!(in(*cx) let this_object = self.transform_obj.get());
+            let call_result = transform.Call_(
+                &this_object.handle(),
+                chunk,
+                self,
+                ExceptionHandling::Rethrow,
+                can_gc,
+            );
+            match call_result {
+                Ok(p) => p,
+                Err(e) => {
+                    let p = Promise::new(global, can_gc);
+                    p.reject_error(e, can_gc);
+                    p
+                },
+            }
+        } else {
+            // Let transformAlgorithm be the following steps, taking a chunk argument:
+            // Let result be TransformStreamDefaultControllerEnqueue(controller, chunk).
+            // If result is an abrupt completion, return a promise rejected with result.[[Value]].
+            let promise = if let Err(error) = self.enqueue(cx, global, chunk, can_gc) {
+                rooted!(in(*cx) let mut error_val = UndefinedValue());
+                error.to_jsval(cx, global, error_val.handle_mut(), can_gc);
+                Promise::new_rejected(global, cx, error_val.handle(), can_gc)
+            } else {
+                // Otherwise, return a promise resolved with undefined.
+                Promise::new_resolved(global, cx, (), can_gc)
+            };
+
+            promise
+        };
+
+        Ok(result)
+    }
+
+    pub(crate) fn perform_cancel(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        chunk: SafeHandleValue,
+        can_gc: CanGc,
+    ) -> Fallible<Rc<Promise>> {
+        // If transformerDict["cancel"] exists, set cancelAlgorithm to an algorithm which takes an argument
+        // reason and returns the result of invoking transformerDict["cancel"] with argument list « reason »
+        // and callback this value transformer.
+        let algo = self.cancel.borrow().clone();
+        let result = if let Some(cancel) = algo {
+            rooted!(in(*cx) let this_object = self.transform_obj.get());
+            let call_result = cancel.Call_(
+                &this_object.handle(),
+                chunk,
+                ExceptionHandling::Rethrow,
+                can_gc,
+            );
+            match call_result {
+                Ok(p) => p,
+                Err(e) => {
+                    let p = Promise::new(global, can_gc);
+                    p.reject_error(e, can_gc);
+                    p
+                },
+            }
+        } else {
+            // Let cancelAlgorithm be an algorithm which returns a promise resolved with undefined.
+            Promise::new_resolved(global, cx, (), can_gc)
+        };
+
+        Ok(result)
+    }
+
+    pub(crate) fn perform_flush(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        can_gc: CanGc,
+    ) -> Fallible<Rc<Promise>> {
+        // If transformerDict["flush"] exists, set flushAlgorithm to an algorithm which returns the result of
+        // invoking transformerDict["flush"] with argument list « controller » and callback this value transformer.
+        let algo = self.flush.borrow().clone();
+        let result = if let Some(flush) = algo {
+            rooted!(in(*cx) let this_object = self.transform_obj.get());
+            let call_result = flush.Call_(
+                &this_object.handle(),
+                self,
+                ExceptionHandling::Rethrow,
+                can_gc,
+            );
+            match call_result {
+                Ok(p) => p,
+                Err(e) => {
+                    let p = Promise::new(global, can_gc);
+                    p.reject_error(e, can_gc);
+                    p
+                },
+            }
+        } else {
+            // Let flushAlgorithm be an algorithm which returns a promise resolved with undefined.
+            Promise::new_resolved(global, cx, (), can_gc)
+        };
+
+        Ok(result)
+    }
+
+    /// <https://streams.spec.whatwg.org/#transform-stream-default-controller-enqueue>
+    #[allow(unsafe_code)]
+    pub(crate) fn enqueue(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        chunk: SafeHandleValue,
+        can_gc: CanGc,
+    ) -> Fallible<()> {
+        // Let stream be controller.[[stream]].
+        let stream = self.stream.get().expect("stream is null");
+
+        // Let readableController be stream.[[readable]].[[controller]].
+        let readable = stream.get_readable();
+        let readable_controller = readable.get_default_controller();
+
+        // If ! ReadableStreamDefaultControllerCanCloseOrEnqueue(readableController)
+        // is false, throw a TypeError exception.
+        if !readable_controller.can_close_or_enqueue() {
+            return Err(Error::Type(
+                "ReadableStreamDefaultControllerCanCloseOrEnqueue is false".to_owned(),
+            ));
+        }
+
+        // Let enqueueResult be ReadableStreamDefaultControllerEnqueue(readableController, chunk).
+        // If enqueueResult is an abrupt completion,
+        if let Err(error) = readable_controller.enqueue(cx, chunk, can_gc) {
+            // Perform ! TransformStreamErrorWritableAndUnblockWrite(stream, enqueueResult.[[Value]]).
+            rooted!(in(*cx) let mut rooted_error = UndefinedValue());
+            error
+                .clone()
+                .to_jsval(cx, global, rooted_error.handle_mut(), can_gc);
+            stream.error_writable_and_unblock_write(cx, global, rooted_error.handle(), can_gc);
+
+            // Throw stream.[[readable]].[[storedError]].
+            unsafe {
+                if !JS_IsExceptionPending(*cx) {
+                    rooted!(in(*cx) let mut stored_error = UndefinedValue());
+                    readable.get_stored_error(stored_error.handle_mut());
+
+                    JS_SetPendingException(
+                        *cx,
+                        stored_error.handle().into(),
+                        ExceptionStackBehavior::Capture,
+                    );
+                }
+            }
+            return Err(error);
+        }
+
+        // Let backpressure be ! ReadableStreamDefaultControllerHasBackpressure(readableController).
+        let backpressure = readable_controller.has_backpressure();
+
+        // If backpressure is not stream.[[backpressure]],
+        if backpressure != stream.get_backpressure() {
+            // Assert: backpressure is true.
+            assert!(backpressure);
+
+            // Perform ! TransformStreamSetBackpressure(stream, true).
+            stream.set_backpressure(global, true, can_gc);
+        }
+        Ok(())
+    }
+
+    /// <https://streams.spec.whatwg.org/#transform-stream-default-controller-error>
+    pub(crate) fn error(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        reason: SafeHandleValue,
+        can_gc: CanGc,
+    ) {
+        // Perform ! TransformStreamError(controller.[[stream]], e).
+        self.stream
+            .get()
+            .expect("stream is undefined")
+            .error(cx, global, reason, can_gc);
+    }
+
+    /// <https://streams.spec.whatwg.org/#transform-stream-default-controller-clear-algorithms>
+    pub(crate) fn clear_algorithms(&self) {
+        // Set controller.[[transformAlgorithm]] to undefined.
+        self.transform.replace(None);
+
+        // Set controller.[[flushAlgorithm]] to undefined.
+        self.flush.replace(None);
+
+        // Set controller.[[cancelAlgorithm]] to undefined.
+        self.cancel.replace(None);
+    }
+
+    /// <https://streams.spec.whatwg.org/#transform-stream-default-controller-terminate>
+    pub(crate) fn terminate(&self, cx: SafeJSContext, global: &GlobalScope, can_gc: CanGc) {
+        // Let stream be controller.[[stream]].
+        let stream = self.stream.get().expect("stream is null");
+
+        // Let readableController be stream.[[readable]].[[controller]].
+        let readable = stream.get_readable();
+        let readable_controller = readable.get_default_controller();
+
+        // Perform ! ReadableStreamDefaultControllerClose(readableController).
+        readable_controller.close(can_gc);
+
+        // Let error be a TypeError exception indicating that the stream has been terminated.
+        let error = Error::Type("stream has been terminated".to_owned());
+
+        // Perform ! TransformStreamErrorWritableAndUnblockWrite(stream, error).
+        rooted!(in(*cx) let mut rooted_error = UndefinedValue());
+        error.to_jsval(cx, global, rooted_error.handle_mut(), can_gc);
+        stream.error_writable_and_unblock_write(cx, global, rooted_error.handle(), can_gc);
+    }
+}
+
+impl TransformStreamDefaultControllerMethods<crate::DomTypeHolder>
+    for TransformStreamDefaultController
+{
+    /// <https://streams.spec.whatwg.org/#ts-default-controller-desired-size>
+    fn GetDesiredSize(&self) -> Option<f64> {
+        // Let readableController be this.[[stream]].[[readable]].[[controller]].
+        let readable_controller = self
+            .stream
+            .get()
+            .expect("stream is null")
+            .get_readable()
+            .get_default_controller();
+
+        // Return ! ReadableStreamDefaultControllerGetDesiredSize(readableController).
+        readable_controller.get_desired_size()
+    }
+
+    /// <https://streams.spec.whatwg.org/#ts-default-controller-enqueue>
+    fn Enqueue(&self, cx: SafeJSContext, chunk: SafeHandleValue, can_gc: CanGc) -> Fallible<()> {
+        // Perform ? TransformStreamDefaultControllerEnqueue(this, chunk).
+        self.enqueue(cx, &self.global(), chunk, can_gc)
+    }
+
+    /// <https://streams.spec.whatwg.org/#ts-default-controller-error>
+    fn Error(&self, cx: SafeJSContext, reason: SafeHandleValue, can_gc: CanGc) -> Fallible<()> {
+        // Perform ? TransformStreamDefaultControllerError(this, e).
+        self.error(cx, &self.global(), reason, can_gc);
+        Ok(())
+    }
+
+    /// <https://streams.spec.whatwg.org/#ts-default-controller-terminate>
+    fn Terminate(&self, can_gc: CanGc) -> Fallible<()> {
+        // Perform ? TransformStreamDefaultControllerTerminate(this).
+        self.terminate(GlobalScope::get_cx(), &self.global(), can_gc);
+        Ok(())
+    }
+}
diff --git a/components/script/dom/trustedhtml.rs b/components/script/dom/trustedhtml.rs
new file mode 100644
index 00000000000..d1ca3cd5e71
--- /dev/null
+++ b/components/script/dom/trustedhtml.rs
@@ -0,0 +1,98 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::fmt;
+
+use dom_struct::dom_struct;
+
+use crate::conversions::Convert;
+use crate::dom::bindings::codegen::Bindings::TrustedHTMLBinding::TrustedHTMLMethods;
+use crate::dom::bindings::codegen::UnionTypes::{
+    TrustedHTMLOrNullIsEmptyString, TrustedHTMLOrString,
+};
+use crate::dom::bindings::error::Fallible;
+use crate::dom::bindings::reflector::{Reflector, reflect_dom_object};
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::globalscope::GlobalScope;
+use crate::dom::trustedtypepolicy::TrustedType;
+use crate::dom::trustedtypepolicyfactory::TrustedTypePolicyFactory;
+use crate::script_runtime::CanGc;
+
+#[dom_struct]
+pub struct TrustedHTML {
+    reflector_: Reflector,
+
+    data: String,
+}
+
+impl TrustedHTML {
+    fn new_inherited(data: String) -> Self {
+        Self {
+            reflector_: Reflector::new(),
+            data,
+        }
+    }
+
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    pub(crate) fn new(data: String, global: &GlobalScope, can_gc: CanGc) -> DomRoot<Self> {
+        reflect_dom_object(Box::new(Self::new_inherited(data)), global, can_gc)
+    }
+
+    pub(crate) fn get_trusted_script_compliant_string(
+        global: &GlobalScope,
+        value: TrustedHTMLOrString,
+        containing_class: &str,
+        field: &str,
+        can_gc: CanGc,
+    ) -> Fallible<String> {
+        match value {
+            TrustedHTMLOrString::String(value) => {
+                let sink = format!("{} {}", containing_class, field);
+                TrustedTypePolicyFactory::get_trusted_type_compliant_string(
+                    TrustedType::TrustedHTML,
+                    global,
+                    value.as_ref().to_owned(),
+                    &sink,
+                    "'script'",
+                    can_gc,
+                )
+            },
+
+            TrustedHTMLOrString::TrustedHTML(trusted_html) => Ok(trusted_html.to_string()),
+        }
+    }
+}
+
+impl fmt::Display for TrustedHTML {
+    #[inline]
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.write_str(&self.data)
+    }
+}
+
+impl TrustedHTMLMethods<crate::DomTypeHolder> for TrustedHTML {
+    /// <https://www.w3.org/TR/trusted-types/#trustedhtml-stringification-behavior>
+    fn Stringifier(&self) -> DOMString {
+        DOMString::from(&*self.data)
+    }
+
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedhtml-tojson>
+    fn ToJSON(&self) -> DOMString {
+        DOMString::from(&*self.data)
+    }
+}
+
+impl Convert<TrustedHTMLOrString> for TrustedHTMLOrNullIsEmptyString {
+    fn convert(self) -> TrustedHTMLOrString {
+        match self {
+            TrustedHTMLOrNullIsEmptyString::TrustedHTML(trusted_html) => {
+                TrustedHTMLOrString::TrustedHTML(trusted_html)
+            },
+            TrustedHTMLOrNullIsEmptyString::NullIsEmptyString(str) => {
+                TrustedHTMLOrString::String(str)
+            },
+        }
+    }
+}
diff --git a/components/script/dom/trustedscript.rs b/components/script/dom/trustedscript.rs
new file mode 100644
index 00000000000..648fcc8c239
--- /dev/null
+++ b/components/script/dom/trustedscript.rs
@@ -0,0 +1,81 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+use std::fmt;
+
+use dom_struct::dom_struct;
+
+use crate::dom::bindings::codegen::Bindings::TrustedScriptBinding::TrustedScriptMethods;
+use crate::dom::bindings::codegen::UnionTypes::TrustedScriptOrString;
+use crate::dom::bindings::error::Fallible;
+use crate::dom::bindings::reflector::{Reflector, reflect_dom_object};
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::globalscope::GlobalScope;
+use crate::dom::trustedtypepolicy::TrustedType;
+use crate::dom::trustedtypepolicyfactory::TrustedTypePolicyFactory;
+use crate::script_runtime::CanGc;
+
+#[dom_struct]
+pub struct TrustedScript {
+    reflector_: Reflector,
+
+    data: String,
+}
+
+impl TrustedScript {
+    fn new_inherited(data: String) -> Self {
+        Self {
+            reflector_: Reflector::new(),
+            data,
+        }
+    }
+
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    pub(crate) fn new(data: String, global: &GlobalScope, can_gc: CanGc) -> DomRoot<Self> {
+        reflect_dom_object(Box::new(Self::new_inherited(data)), global, can_gc)
+    }
+
+    pub(crate) fn get_trusted_script_compliant_string(
+        global: &GlobalScope,
+        value: TrustedScriptOrString,
+        containing_class: &str,
+        field: &str,
+        can_gc: CanGc,
+    ) -> Fallible<String> {
+        match value {
+            TrustedScriptOrString::String(value) => {
+                let sink = format!("{} {}", containing_class, field);
+                TrustedTypePolicyFactory::get_trusted_type_compliant_string(
+                    TrustedType::TrustedScript,
+                    global,
+                    value.as_ref().to_owned(),
+                    &sink,
+                    "'script'",
+                    can_gc,
+                )
+            },
+
+            TrustedScriptOrString::TrustedScript(trusted_script) => Ok(trusted_script.to_string()),
+        }
+    }
+}
+
+impl fmt::Display for TrustedScript {
+    #[inline]
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.write_str(&self.data)
+    }
+}
+
+impl TrustedScriptMethods<crate::DomTypeHolder> for TrustedScript {
+    /// <https://www.w3.org/TR/trusted-types/#trustedscript-stringification-behavior>
+    fn Stringifier(&self) -> DOMString {
+        DOMString::from(&*self.data)
+    }
+
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedscript-tojson>
+    fn ToJSON(&self) -> DOMString {
+        DOMString::from(&*self.data)
+    }
+}
diff --git a/components/script/dom/trustedscripturl.rs b/components/script/dom/trustedscripturl.rs
new file mode 100644
index 00000000000..3f0aef248b3
--- /dev/null
+++ b/components/script/dom/trustedscripturl.rs
@@ -0,0 +1,83 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::fmt;
+
+use dom_struct::dom_struct;
+
+use crate::dom::bindings::codegen::Bindings::TrustedScriptURLBinding::TrustedScriptURLMethods;
+use crate::dom::bindings::codegen::UnionTypes::TrustedScriptURLOrUSVString;
+use crate::dom::bindings::error::Fallible;
+use crate::dom::bindings::reflector::{Reflector, reflect_dom_object};
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::globalscope::GlobalScope;
+use crate::dom::trustedtypepolicy::TrustedType;
+use crate::dom::trustedtypepolicyfactory::TrustedTypePolicyFactory;
+use crate::script_runtime::CanGc;
+
+#[dom_struct]
+pub struct TrustedScriptURL {
+    reflector_: Reflector,
+
+    data: String,
+}
+
+impl TrustedScriptURL {
+    fn new_inherited(data: String) -> Self {
+        Self {
+            reflector_: Reflector::new(),
+            data,
+        }
+    }
+
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    pub(crate) fn new(data: String, global: &GlobalScope, can_gc: CanGc) -> DomRoot<Self> {
+        reflect_dom_object(Box::new(Self::new_inherited(data)), global, can_gc)
+    }
+
+    pub(crate) fn get_trusted_script_url_compliant_string(
+        global: &GlobalScope,
+        value: TrustedScriptURLOrUSVString,
+        containing_class: &str,
+        field: &str,
+        can_gc: CanGc,
+    ) -> Fallible<String> {
+        match value {
+            TrustedScriptURLOrUSVString::USVString(value) => {
+                let sink = format!("{} {}", containing_class, field);
+                TrustedTypePolicyFactory::get_trusted_type_compliant_string(
+                    TrustedType::TrustedScriptURL,
+                    global,
+                    value.as_ref().to_owned(),
+                    &sink,
+                    "'script'",
+                    can_gc,
+                )
+            },
+            TrustedScriptURLOrUSVString::TrustedScriptURL(trusted_script_url) => {
+                Ok(trusted_script_url.to_string())
+            },
+        }
+    }
+}
+
+impl fmt::Display for TrustedScriptURL {
+    #[inline]
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.write_str(&self.data)
+    }
+}
+
+impl TrustedScriptURLMethods<crate::DomTypeHolder> for TrustedScriptURL {
+    /// <https://www.w3.org/TR/trusted-types/#trustedscripturl-stringification-behavior>
+    fn Stringifier(&self) -> DOMString {
+        DOMString::from(&*self.data)
+    }
+
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedscripturl-tojson>
+    fn ToJSON(&self) -> DOMString {
+        DOMString::from(&*self.data)
+    }
+}
diff --git a/components/script/dom/trustedtypepolicy.rs b/components/script/dom/trustedtypepolicy.rs
new file mode 100644
index 00000000000..d4def7269ed
--- /dev/null
+++ b/components/script/dom/trustedtypepolicy.rs
@@ -0,0 +1,256 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::rc::Rc;
+
+use dom_struct::dom_struct;
+use js::jsapi::JSObject;
+use js::rust::HandleValue;
+use strum_macros::IntoStaticStr;
+
+use crate::dom::bindings::callback::ExceptionHandling;
+use crate::dom::bindings::codegen::Bindings::TrustedTypePolicyBinding::TrustedTypePolicyMethods;
+use crate::dom::bindings::codegen::Bindings::TrustedTypePolicyFactoryBinding::{
+    CreateHTMLCallback, CreateScriptCallback, CreateScriptURLCallback, TrustedTypePolicyOptions,
+};
+use crate::dom::bindings::error::Error::Type;
+use crate::dom::bindings::error::Fallible;
+use crate::dom::bindings::reflector::{DomGlobal, DomObject, Reflector, reflect_dom_object};
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::globalscope::GlobalScope;
+use crate::dom::trustedhtml::TrustedHTML;
+use crate::dom::trustedscript::TrustedScript;
+use crate::dom::trustedscripturl::TrustedScriptURL;
+use crate::script_runtime::{CanGc, JSContext};
+
+#[dom_struct]
+pub struct TrustedTypePolicy {
+    reflector_: Reflector,
+
+    name: String,
+
+    #[ignore_malloc_size_of = "Rc has unclear ownership"]
+    create_html: Option<Rc<CreateHTMLCallback>>,
+    #[ignore_malloc_size_of = "Rc has unclear ownership"]
+    create_script: Option<Rc<CreateScriptCallback>>,
+    #[ignore_malloc_size_of = "Rc has unclear ownership"]
+    create_script_url: Option<Rc<CreateScriptURLCallback>>,
+}
+
+#[derive(Clone, IntoStaticStr)]
+pub(crate) enum TrustedType {
+    TrustedHTML,
+    TrustedScript,
+    TrustedScriptURL,
+}
+
+impl TrustedTypePolicy {
+    fn new_inherited(name: String, options: &TrustedTypePolicyOptions) -> Self {
+        Self {
+            reflector_: Reflector::new(),
+            name,
+            create_html: options.createHTML.clone(),
+            create_script: options.createScript.clone(),
+            create_script_url: options.createScriptURL.clone(),
+        }
+    }
+
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    pub(crate) fn new(
+        name: String,
+        options: &TrustedTypePolicyOptions,
+        global: &GlobalScope,
+        can_gc: CanGc,
+    ) -> DomRoot<Self> {
+        reflect_dom_object(Box::new(Self::new_inherited(name, options)), global, can_gc)
+    }
+
+    /// <https://w3c.github.io/trusted-types/dist/spec/#get-trusted-type-policy-value-algorithm>
+    fn check_callback_if_missing(throw_if_missing: bool) -> Fallible<Option<String>> {
+        // Step 3.1: If throwIfMissing throw a TypeError.
+        if throw_if_missing {
+            Err(Type("Cannot find type".to_owned()))
+        } else {
+            // Step 3.2: Else return null.
+            Ok(None)
+        }
+    }
+
+    /// <https://w3c.github.io/trusted-types/dist/spec/#get-trusted-type-policy-value-algorithm>
+    pub(crate) fn get_trusted_type_policy_value(
+        &self,
+        expected_type: TrustedType,
+        cx: JSContext,
+        input: DOMString,
+        arguments: Vec<HandleValue>,
+        throw_if_missing: bool,
+        can_gc: CanGc,
+    ) -> Fallible<Option<String>> {
+        rooted!(in(*cx) let this_object: *mut JSObject);
+        // Step 1: Let functionName be a function name for the given trustedTypeName, based on the following table:
+        match expected_type {
+            TrustedType::TrustedHTML => match &self.create_html {
+                // Step 3: If function is null, then:
+                None => TrustedTypePolicy::check_callback_if_missing(throw_if_missing),
+                // Step 2: Let function be policy’s options[functionName].
+                Some(callback) => {
+                    // Step 4: Let policyValue be the result of invoking function with value as a first argument,
+                    // items of arguments as subsequent arguments, and callback **this** value set to null,
+                    // rethrowing any exceptions.
+                    callback
+                        .Call_(
+                            &this_object.handle(),
+                            input,
+                            arguments,
+                            ExceptionHandling::Rethrow,
+                            can_gc,
+                        )
+                        .map(|result| result.map(|str| str.as_ref().to_owned()))
+                },
+            },
+            TrustedType::TrustedScript => match &self.create_script {
+                // Step 3: If function is null, then:
+                None => TrustedTypePolicy::check_callback_if_missing(throw_if_missing),
+                // Step 2: Let function be policy’s options[functionName].
+                Some(callback) => {
+                    // Step 4: Let policyValue be the result of invoking function with value as a first argument,
+                    // items of arguments as subsequent arguments, and callback **this** value set to null,
+                    // rethrowing any exceptions.
+                    callback
+                        .Call_(
+                            &this_object.handle(),
+                            input,
+                            arguments,
+                            ExceptionHandling::Rethrow,
+                            can_gc,
+                        )
+                        .map(|result| result.map(|str| str.as_ref().to_owned()))
+                },
+            },
+            TrustedType::TrustedScriptURL => match &self.create_script_url {
+                // Step 3: If function is null, then:
+                None => TrustedTypePolicy::check_callback_if_missing(throw_if_missing),
+                // Step 2: Let function be policy’s options[functionName].
+                Some(callback) => {
+                    // Step 4: Let policyValue be the result of invoking function with value as a first argument,
+                    // items of arguments as subsequent arguments, and callback **this** value set to null,
+                    // rethrowing any exceptions.
+                    callback
+                        .Call_(
+                            &this_object.handle(),
+                            input,
+                            arguments,
+                            ExceptionHandling::Rethrow,
+                            can_gc,
+                        )
+                        .map(|result| result.map(|str| str.as_ref().to_owned()))
+                },
+            },
+        }
+    }
+
+    /// This does not take all arguments as specified. That's because the return type of the
+    /// trusted type function and object are not the same. 2 of the 3 string callbacks return
+    /// a DOMString, while the other one returns an USVString. Additionally, all three callbacks
+    /// have a unique type signature in WebIDL.
+    ///
+    /// To circumvent these type problems, rather than implementing the full functionality here,
+    /// part of the algorithm is implemented on the caller side. There, we only call the callback
+    /// and create the object. The rest of the machinery is ensuring the right values pass through
+    /// to the relevant callbacks.
+    ///
+    /// <https://w3c.github.io/trusted-types/dist/spec/#create-a-trusted-type-algorithm>
+    pub(crate) fn create_trusted_type<R, TrustedTypeCallback>(
+        &self,
+        expected_type: TrustedType,
+        cx: JSContext,
+        input: DOMString,
+        arguments: Vec<HandleValue>,
+        trusted_type_creation_callback: TrustedTypeCallback,
+        can_gc: CanGc,
+    ) -> Fallible<DomRoot<R>>
+    where
+        R: DomObject,
+        TrustedTypeCallback: FnOnce(String) -> DomRoot<R>,
+    {
+        // Step 1: Let policyValue be the result of executing Get Trusted Type policy value
+        // with the same arguments as this algorithm and additionally true as throwIfMissing.
+        let policy_value =
+            self.get_trusted_type_policy_value(expected_type, cx, input, arguments, true, can_gc);
+        match policy_value {
+            // Step 2: If the algorithm threw an error, rethrow the error and abort the following steps.
+            Err(error) => Err(error),
+            Ok(policy_value) => {
+                // Step 3: Let dataString be the result of stringifying policyValue.
+                let data_string = match policy_value {
+                    Some(value) => value,
+                    // Step 4: If policyValue is null or undefined, set dataString to the empty string.
+                    None => "".to_owned(),
+                };
+                // Step 5: Return a new instance of an interface with a type name trustedTypeName,
+                // with its associated data value set to dataString.
+                Ok(trusted_type_creation_callback(data_string))
+            },
+        }
+    }
+}
+
+impl TrustedTypePolicyMethods<crate::DomTypeHolder> for TrustedTypePolicy {
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedtypepolicy-name>
+    fn Name(&self) -> DOMString {
+        DOMString::from(&*self.name)
+    }
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedtypepolicy-createhtml>
+    fn CreateHTML(
+        &self,
+        cx: JSContext,
+        input: DOMString,
+        arguments: Vec<HandleValue>,
+        can_gc: CanGc,
+    ) -> Fallible<DomRoot<TrustedHTML>> {
+        self.create_trusted_type(
+            TrustedType::TrustedHTML,
+            cx,
+            input,
+            arguments,
+            |data_string| TrustedHTML::new(data_string, &self.global(), can_gc),
+            can_gc,
+        )
+    }
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedtypepolicy-createscript>
+    fn CreateScript(
+        &self,
+        cx: JSContext,
+        input: DOMString,
+        arguments: Vec<HandleValue>,
+        can_gc: CanGc,
+    ) -> Fallible<DomRoot<TrustedScript>> {
+        self.create_trusted_type(
+            TrustedType::TrustedScript,
+            cx,
+            input,
+            arguments,
+            |data_string| TrustedScript::new(data_string, &self.global(), can_gc),
+            can_gc,
+        )
+    }
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedtypepolicy-createscripturl>
+    fn CreateScriptURL(
+        &self,
+        cx: JSContext,
+        input: DOMString,
+        arguments: Vec<HandleValue>,
+        can_gc: CanGc,
+    ) -> Fallible<DomRoot<TrustedScriptURL>> {
+        self.create_trusted_type(
+            TrustedType::TrustedScriptURL,
+            cx,
+            input,
+            arguments,
+            |data_string| TrustedScriptURL::new(data_string, &self.global(), can_gc),
+            can_gc,
+        )
+    }
+}
diff --git a/components/script/dom/trustedtypepolicyfactory.rs b/components/script/dom/trustedtypepolicyfactory.rs
new file mode 100644
index 00000000000..284fa7045eb
--- /dev/null
+++ b/components/script/dom/trustedtypepolicyfactory.rs
@@ -0,0 +1,398 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+use std::cell::RefCell;
+
+use content_security_policy::CheckResult;
+use dom_struct::dom_struct;
+use html5ever::{LocalName, Namespace, QualName, local_name, ns};
+use js::jsval::NullValue;
+use js::rust::HandleValue;
+
+use crate::dom::bindings::codegen::Bindings::TrustedTypePolicyFactoryBinding::{
+    TrustedTypePolicyFactoryMethods, TrustedTypePolicyOptions,
+};
+use crate::dom::bindings::conversions::root_from_object;
+use crate::dom::bindings::error::{Error, Fallible};
+use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object};
+use crate::dom::bindings::root::{DomRoot, MutNullableDom};
+use crate::dom::bindings::str::DOMString;
+use crate::dom::globalscope::GlobalScope;
+use crate::dom::trustedhtml::TrustedHTML;
+use crate::dom::trustedscript::TrustedScript;
+use crate::dom::trustedscripturl::TrustedScriptURL;
+use crate::dom::trustedtypepolicy::{TrustedType, TrustedTypePolicy};
+use crate::js::conversions::ToJSValConvertible;
+use crate::script_runtime::{CanGc, JSContext};
+
+#[dom_struct]
+pub struct TrustedTypePolicyFactory {
+    reflector_: Reflector,
+
+    default_policy: MutNullableDom<TrustedTypePolicy>,
+    policy_names: RefCell<Vec<String>>,
+}
+
+impl TrustedTypePolicyFactory {
+    fn new_inherited() -> Self {
+        Self {
+            reflector_: Reflector::new(),
+            default_policy: Default::default(),
+            policy_names: RefCell::new(vec![]),
+        }
+    }
+
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    pub(crate) fn new(global: &GlobalScope, can_gc: CanGc) -> DomRoot<Self> {
+        reflect_dom_object(Box::new(Self::new_inherited()), global, can_gc)
+    }
+
+    /// <https://www.w3.org/TR/trusted-types/#create-trusted-type-policy-algorithm>
+    fn create_trusted_type_policy(
+        &self,
+        policy_name: String,
+        options: &TrustedTypePolicyOptions,
+        global: &GlobalScope,
+        can_gc: CanGc,
+    ) -> Fallible<DomRoot<TrustedTypePolicy>> {
+        // Step 1: Let allowedByCSP be the result of executing Should Trusted Type policy creation be blocked by
+        // Content Security Policy? algorithm with global, policyName and factory’s created policy names value.
+        let (allowed_by_csp, violations) = if let Some(csp_list) = global.get_csp_list() {
+            csp_list.is_trusted_type_policy_creation_allowed(
+                policy_name.clone(),
+                self.policy_names.borrow().clone(),
+            )
+        } else {
+            (CheckResult::Allowed, Vec::new())
+        };
+
+        global.report_csp_violations(violations, None);
+
+        // Step 2: If allowedByCSP is "Blocked", throw a TypeError and abort further steps.
+        if allowed_by_csp == CheckResult::Blocked {
+            return Err(Error::Type("Not allowed by CSP".to_string()));
+        }
+
+        // Step 3: If policyName is default and the factory’s default policy value is not null, throw a TypeError
+        // and abort further steps.
+        if policy_name == "default" && self.default_policy.get().is_some() {
+            return Err(Error::Type(
+                "Already set default policy for factory".to_string(),
+            ));
+        }
+
+        // Step 4: Let policy be a new TrustedTypePolicy object.
+        // Step 5: Set policy’s name property value to policyName.
+        // Step 6: Set policy’s options value to «[ "createHTML" ->
+        // options["createHTML", "createScript" -> options["createScript",
+        // "createScriptURL" -> options["createScriptURL" ]».
+        let policy = TrustedTypePolicy::new(policy_name.clone(), options, global, can_gc);
+        // Step 7: If the policyName is default, set the factory’s default policy value to policy.
+        if policy_name == "default" {
+            self.default_policy.set(Some(&policy))
+        }
+        // Step 8: Append policyName to factory’s created policy names.
+        self.policy_names.borrow_mut().push(policy_name);
+        // Step 9: Return policy.
+        Ok(policy)
+    }
+
+    /// <https://w3c.github.io/trusted-types/dist/spec/#abstract-opdef-get-trusted-type-data-for-attribute>
+    #[allow(clippy::if_same_then_else)]
+    fn get_trusted_type_data_for_attribute(
+        element: QualName,
+        attribute: String,
+        attribute_namespace: Option<Namespace>,
+    ) -> Option<DOMString> {
+        // Step 1: Let data be null.
+        let mut data = None;
+        // Step 2: If attributeNs is null, and attribute is the name of an event handler content attribute, then:
+        // TODO(36258): look up event handlers
+        // Step 3: Find the row in the following table, where element is in the first column,
+        // attributeNs is in the second column, and attribute is in the third column.
+        // If a matching row is found, set data to that row.
+        if element.ns == ns!(html) &&
+            element.local == local_name!("iframe") &&
+            attribute_namespace.is_none() &&
+            attribute == "srcdoc"
+        {
+            data = Some(DOMString::from("TrustedHTML"))
+        } else if element.ns == ns!(html) &&
+            element.local == local_name!("script") &&
+            attribute_namespace.is_none() &&
+            attribute == "src"
+        {
+            data = Some(DOMString::from("TrustedScriptURL"))
+        } else if element.ns == ns!(svg) &&
+            element.local == local_name!("script") &&
+            attribute_namespace.is_none() &&
+            attribute == "href"
+        {
+            data = Some(DOMString::from("TrustedScriptURL"))
+        } else if element.ns == ns!(svg) &&
+            element.local == local_name!("script") &&
+            attribute_namespace == Some(ns!(xlink)) &&
+            attribute == "href"
+        {
+            data = Some(DOMString::from("TrustedScriptURL"))
+        }
+        // Step 4: Return data.
+        data
+    }
+    /// <https://w3c.github.io/trusted-types/dist/spec/#process-value-with-a-default-policy-algorithm>
+    #[allow(unsafe_code)]
+    pub(crate) fn process_value_with_default_policy(
+        expected_type: TrustedType,
+        global: &GlobalScope,
+        input: String,
+        sink: &str,
+        can_gc: CanGc,
+    ) -> Fallible<Option<String>> {
+        // Step 1: Let defaultPolicy be the value of global’s trusted type policy factory's default policy.
+        let global_policy_factory = global.trusted_types(can_gc);
+        let default_policy = match global_policy_factory.default_policy.get() {
+            None => return Ok(None),
+            Some(default_policy) => default_policy,
+        };
+        let cx = GlobalScope::get_cx();
+        // Step 2: Let policyValue be the result of executing Get Trusted Type policy value,
+        // with the following arguments:
+        rooted!(in(*cx) let mut trusted_type_name_value = NullValue());
+        unsafe {
+            let trusted_type_name: &'static str = expected_type.clone().into();
+            trusted_type_name.to_jsval(*cx, trusted_type_name_value.handle_mut());
+        }
+
+        rooted!(in(*cx) let mut sink_value = NullValue());
+        unsafe {
+            sink.to_jsval(*cx, sink_value.handle_mut());
+        }
+
+        let arguments = vec![trusted_type_name_value.handle(), sink_value.handle()];
+        let policy_value = default_policy.get_trusted_type_policy_value(
+            expected_type,
+            cx,
+            DOMString::from(input.to_owned()),
+            arguments,
+            false,
+            can_gc,
+        );
+        let data_string = match policy_value {
+            // Step 3: If the algorithm threw an error, rethrow the error and abort the following steps.
+            Err(error) => return Err(error),
+            Ok(policy_value) => match policy_value {
+                // Step 4: If policyValue is null or undefined, return policyValue.
+                None => return Ok(None),
+                // Step 5: Let dataString be the result of stringifying policyValue.
+                Some(policy_value) => policy_value,
+            },
+        };
+        Ok(Some(data_string))
+    }
+    /// Step 1 is implemented by the caller
+    /// <https://w3c.github.io/trusted-types/dist/spec/#get-trusted-type-compliant-string-algorithm>
+    pub(crate) fn get_trusted_type_compliant_string(
+        expected_type: TrustedType,
+        global: &GlobalScope,
+        input: String,
+        sink: &str,
+        sink_group: &str,
+        can_gc: CanGc,
+    ) -> Fallible<String> {
+        let csp_list = match global.get_csp_list() {
+            None => return Ok(input),
+            Some(csp_list) => csp_list,
+        };
+        // Step 2: Let requireTrustedTypes be the result of executing Does sink type require trusted types?
+        // algorithm, passing global, sinkGroup, and true.
+        let require_trusted_types = csp_list.does_sink_type_require_trusted_types(sink_group, true);
+        // Step 3: If requireTrustedTypes is false, return stringified input and abort these steps.
+        if !require_trusted_types {
+            return Ok(input);
+        }
+        // Step 4: Let convertedInput be the result of executing Process value with a default policy
+        // with the same arguments as this algorithm.
+        let converted_input = TrustedTypePolicyFactory::process_value_with_default_policy(
+            expected_type,
+            global,
+            input.clone(),
+            sink,
+            can_gc,
+        );
+        // Step 5: If the algorithm threw an error, rethrow the error and abort the following steps.
+        match converted_input? {
+            // Step 6: If convertedInput is null or undefined, execute the following steps:
+            None => {
+                // Step 6.1: Let disposition be the result of executing Should sink type mismatch violation
+                // be blocked by Content Security Policy? algorithm, passing global,
+                // stringified input as source, sinkGroup and sink.
+                let (disposition, violations) = csp_list
+                    .should_sink_type_mismatch_violation_be_blocked_by_csp(
+                        sink, sink_group, &input,
+                    );
+                global.report_csp_violations(violations, None);
+                // Step 6.2: If disposition is “Allowed”, return stringified input and abort further steps.
+                if disposition == CheckResult::Allowed {
+                    Ok(input)
+                } else {
+                    // Step 6.3: Throw a TypeError and abort further steps.
+                    Err(Error::Type(
+                        "Cannot set value, expected trusted type".to_owned(),
+                    ))
+                }
+            },
+            // Step 8: Return stringified convertedInput.
+            Some(converted_input) => Ok(converted_input),
+        }
+        // Step 7: Assert: convertedInput is an instance of expectedType.
+        // TODO(https://github.com/w3c/trusted-types/issues/566): Implement when spec is resolved
+    }
+}
+
+impl TrustedTypePolicyFactoryMethods<crate::DomTypeHolder> for TrustedTypePolicyFactory {
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedtypepolicyfactory-createpolicy>
+    fn CreatePolicy(
+        &self,
+        policy_name: DOMString,
+        options: &TrustedTypePolicyOptions,
+        can_gc: CanGc,
+    ) -> Fallible<DomRoot<TrustedTypePolicy>> {
+        self.create_trusted_type_policy(policy_name.to_string(), options, &self.global(), can_gc)
+    }
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedtypepolicyfactory-ishtml>
+    #[allow(unsafe_code)]
+    fn IsHTML(&self, cx: JSContext, value: HandleValue) -> bool {
+        if !value.get().is_object() {
+            return false;
+        }
+        rooted!(in(*cx) let object = value.to_object());
+        unsafe { root_from_object::<TrustedHTML>(object.get(), *cx).is_ok() }
+    }
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedtypepolicyfactory-isscript>
+    #[allow(unsafe_code)]
+    fn IsScript(&self, cx: JSContext, value: HandleValue) -> bool {
+        if !value.get().is_object() {
+            return false;
+        }
+        rooted!(in(*cx) let object = value.to_object());
+        unsafe { root_from_object::<TrustedScript>(object.get(), *cx).is_ok() }
+    }
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedtypepolicyfactory-isscripturl>
+    #[allow(unsafe_code)]
+    fn IsScriptURL(&self, cx: JSContext, value: HandleValue) -> bool {
+        if !value.get().is_object() {
+            return false;
+        }
+        rooted!(in(*cx) let object = value.to_object());
+        unsafe { root_from_object::<TrustedScriptURL>(object.get(), *cx).is_ok() }
+    }
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedtypepolicyfactory-emptyhtml>
+    fn EmptyHTML(&self, can_gc: CanGc) -> DomRoot<TrustedHTML> {
+        TrustedHTML::new("".to_string(), &self.global(), can_gc)
+    }
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedtypepolicyfactory-emptyscript>
+    fn EmptyScript(&self, can_gc: CanGc) -> DomRoot<TrustedScript> {
+        TrustedScript::new("".to_string(), &self.global(), can_gc)
+    }
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedtypepolicyfactory-getattributetype>
+    fn GetAttributeType(
+        &self,
+        tag_name: DOMString,
+        attribute: DOMString,
+        element_namespace: Option<DOMString>,
+        attribute_namespace: Option<DOMString>,
+    ) -> Option<DOMString> {
+        // Step 1: Set localName to tagName in ASCII lowercase.
+        let local_name = tag_name.to_ascii_lowercase();
+        // Step 2: Set attribute to attribute in ASCII lowercase.
+        let attribute = attribute.to_ascii_lowercase();
+        // Step 3: If elementNs is null or an empty string, set elementNs to HTML namespace.
+        let element_namespace = match element_namespace {
+            Some(namespace) if !namespace.is_empty() => Namespace::from(namespace),
+            Some(_) | None => ns!(html),
+        };
+        // Step 4: If attrNs is an empty string, set attrNs to null.
+        let attribute_namespace = match attribute_namespace {
+            Some(namespace) if !namespace.is_empty() => Some(Namespace::from(namespace)),
+            Some(_) | None => None,
+        };
+        // Step 5: Let interface be the element interface for localName and elementNs.
+        let interface = QualName::new(None, element_namespace, LocalName::from(local_name));
+        // Step 6: Let expectedType be null.
+        let mut expected_type = None;
+        // Step 7: Set attributeData to the result of Get Trusted Type data for attribute algorithm,
+        // with the following arguments: interface as element, attribute, attrNs
+        let attribute_data = TrustedTypePolicyFactory::get_trusted_type_data_for_attribute(
+            interface,
+            attribute,
+            attribute_namespace,
+        );
+        // Step 8: If attributeData is not null, then set expectedType to the interface’s name of
+        // the value of the fourth member of attributeData.
+        if let Some(trusted_type) = attribute_data {
+            expected_type = Some(trusted_type)
+        }
+        // Step 9: Return expectedType.
+        expected_type
+    }
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedtypepolicyfactory-getpropertytype>
+    #[allow(clippy::if_same_then_else)]
+    fn GetPropertyType(
+        &self,
+        tag_name: DOMString,
+        property: DOMString,
+        element_namespace: Option<DOMString>,
+    ) -> Option<DOMString> {
+        // Step 1: Set localName to tagName in ASCII lowercase.
+        let local_name = tag_name.to_ascii_lowercase();
+        // Step 2: If elementNs is null or an empty string, set elementNs to HTML namespace.
+        let element_namespace = match element_namespace {
+            Some(namespace) if !namespace.is_empty() => Namespace::from(namespace),
+            Some(_) | None => ns!(html),
+        };
+        // Step 3: Let interface be the element interface for localName and elementNs.
+        let interface = QualName::new(None, element_namespace, LocalName::from(local_name));
+        // Step 4: Let expectedType be null.
+        let mut expected_type = None;
+        // Step 5: Find the row in the following table, where the first column is "*" or interface’s name,
+        // and property is in the second column. If a matching row is found, set expectedType to
+        // the interface’s name of the value of the third column.
+        let property = property.str();
+        if interface.ns == ns!(html) &&
+            interface.local == local_name!("iframe") &&
+            property == "srcdoc"
+        {
+            expected_type = Some(DOMString::from("TrustedHTML"))
+        } else if interface.ns == ns!(html) &&
+            interface.local == local_name!("script") &&
+            property == "innerText"
+        {
+            expected_type = Some(DOMString::from("TrustedScript"))
+        } else if interface.ns == ns!(html) &&
+            interface.local == local_name!("script") &&
+            property == "src"
+        {
+            expected_type = Some(DOMString::from("TrustedScriptURL"))
+        } else if interface.ns == ns!(html) &&
+            interface.local == local_name!("script") &&
+            property == "text"
+        {
+            expected_type = Some(DOMString::from("TrustedScript"))
+        } else if interface.ns == ns!(html) &&
+            interface.local == local_name!("script") &&
+            property == "textContent"
+        {
+            expected_type = Some(DOMString::from("TrustedScript"))
+        } else if property == "innerHTML" {
+            expected_type = Some(DOMString::from("TrustedHTML"))
+        } else if property == "outerHTML" {
+            expected_type = Some(DOMString::from("TrustedHTML"))
+        }
+        // Step 6: Return expectedType.
+        expected_type
+    }
+    /// <https://www.w3.org/TR/trusted-types/#dom-trustedtypepolicyfactory-defaultpolicy>
+    fn GetDefaultPolicy(&self) -> Option<DomRoot<TrustedTypePolicy>> {
+        self.default_policy.get()
+    }
+}
diff --git a/components/script/dom/underlyingsourcecontainer.rs b/components/script/dom/underlyingsourcecontainer.rs
index e219bbb7b8a..dd4b867df45 100644
--- a/components/script/dom/underlyingsourcecontainer.rs
+++ b/components/script/dom/underlyingsourcecontainer.rs
@@ -7,7 +7,7 @@ use std::rc::Rc;
 
 use dom_struct::dom_struct;
 use js::jsapi::{Heap, IsPromiseObject, JSObject};
-use js::jsval::JSVal;
+use js::jsval::{JSVal, UndefinedValue};
 use js::rust::{Handle as SafeHandle, HandleObject, HandleValue as SafeHandleValue, IntoHandle};
 
 use crate::dom::bindings::callback::ExceptionHandling;
@@ -18,8 +18,10 @@ use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object_w
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::defaultteeunderlyingsource::DefaultTeeUnderlyingSource;
 use crate::dom::globalscope::GlobalScope;
+use crate::dom::messageport::MessagePort;
 use crate::dom::promise::Promise;
-use crate::script_runtime::CanGc;
+use crate::dom::transformstream::TransformStream;
+use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
 
 /// <https://streams.spec.whatwg.org/#underlying-source-api>
 /// The `Js` variant corresponds to
@@ -40,6 +42,12 @@ pub(crate) enum UnderlyingSourceType {
     Js(JsUnderlyingSource, Heap<*mut JSObject>),
     /// Tee
     Tee(Dom<DefaultTeeUnderlyingSource>),
+    /// Transfer, with the port used in some of the algorithms.
+    Transfer(Dom<MessagePort>),
+    /// A struct representing a JS object as underlying source,
+    /// and the actual JS object for use as `thisArg` in callbacks.
+    /// This is used for the `TransformStream` API.
+    Transform(Dom<TransformStream>, Rc<Promise>),
 }
 
 impl UnderlyingSourceType {
@@ -49,7 +57,8 @@ impl UnderlyingSourceType {
             self,
             UnderlyingSourceType::Memory(_) |
                 UnderlyingSourceType::Blob(_) |
-                UnderlyingSourceType::FetchResponse
+                UnderlyingSourceType::FetchResponse |
+                UnderlyingSourceType::Transfer(_)
         )
     }
 
@@ -106,6 +115,8 @@ impl UnderlyingSourceContainer {
     #[allow(unsafe_code)]
     pub(crate) fn call_cancel_algorithm(
         &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
         reason: SafeHandleValue,
         can_gc: CanGc,
     ) -> Option<Result<Rc<Promise>, Error>> {
@@ -124,9 +135,35 @@ impl UnderlyingSourceContainer {
                 }
                 None
             },
-            UnderlyingSourceType::Tee(tee_underlyin_source) => {
+            UnderlyingSourceType::Tee(tee_underlying_source) => {
                 // Call the cancel algorithm for the appropriate branch.
-                tee_underlyin_source.cancel_algorithm(reason, can_gc)
+                tee_underlying_source.cancel_algorithm(cx, global, reason, can_gc)
+            },
+            UnderlyingSourceType::Transform(stream, _) => {
+                // Return ! TransformStreamDefaultSourceCancelAlgorithm(stream, reason).
+                Some(stream.transform_stream_default_source_cancel(cx, global, reason, can_gc))
+            },
+            UnderlyingSourceType::Transfer(port) => {
+                // Let cancelAlgorithm be the following steps, taking a reason argument:
+                // from <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformreadable
+
+                // Let result be PackAndPostMessageHandlingError(port, "error", reason).
+                let result = port.pack_and_post_message_handling_error("error", reason, can_gc);
+
+                // Disentangle port.
+                self.global().disentangle_port(port, can_gc);
+
+                let promise = Promise::new(&self.global(), can_gc);
+
+                // If result is an abrupt completion,
+                if let Err(error) = result {
+                    // Return a promise rejected with result.[[Value]].
+                    promise.reject_error(error, can_gc);
+                } else {
+                    // Otherwise, return a promise resolved with undefined.
+                    promise.resolve_native(&(), can_gc);
+                }
+                Some(Ok(promise))
             },
             _ => None,
         }
@@ -137,6 +174,7 @@ impl UnderlyingSourceContainer {
     pub(crate) fn call_pull_algorithm(
         &self,
         controller: Controller,
+        _global: &GlobalScope,
         can_gc: CanGc,
     ) -> Option<Result<Rc<Promise>, Error>> {
         match &self.underlying_source_type {
@@ -154,11 +192,31 @@ impl UnderlyingSourceContainer {
                 }
                 None
             },
-            UnderlyingSourceType::Tee(tee_underlyin_source) => {
+            UnderlyingSourceType::Tee(tee_underlying_source) => {
                 // Call the pull algorithm for the appropriate branch.
-                Some(Ok(tee_underlyin_source.pull_algorithm(can_gc)))
+                Some(Ok(tee_underlying_source.pull_algorithm(can_gc)))
+            },
+            UnderlyingSourceType::Transfer(port) => {
+                // Let pullAlgorithm be the following steps:
+                // from <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformreadable
+
+                let cx = GlobalScope::get_cx();
+
+                // Perform ! PackAndPostMessage(port, "pull", undefined).
+                rooted!(in(*cx) let mut value = UndefinedValue());
+                port.pack_and_post_message("pull", value.handle(), can_gc)
+                    .expect("Sending pull should not fail.");
+
+                // Return a promise resolved with undefined.
+                let promise = Promise::new(&self.global(), can_gc);
+                promise.resolve_native(&(), can_gc);
+                Some(Ok(promise))
             },
             // Note: other source type have no pull steps for now.
+            UnderlyingSourceType::Transform(stream, _) => {
+                // Return ! TransformStreamDefaultSourcePullAlgorithm(stream).
+                Some(stream.transform_stream_default_source_pull(&self.global(), can_gc))
+            },
             _ => None,
         }
     }
@@ -217,6 +275,15 @@ impl UnderlyingSourceContainer {
                 // Let startAlgorithm be an algorithm that returns undefined.
                 None
             },
+            UnderlyingSourceType::Transfer(_) => {
+                // Let startAlgorithm be an algorithm that returns undefined.
+                // from <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformreadable
+                None
+            },
+            UnderlyingSourceType::Transform(_, start_promise) => {
+                // Let startAlgorithm be an algorithm that returns startPromise.
+                Some(Ok(start_promise.clone()))
+            },
             _ => None,
         }
     }
diff --git a/components/script/dom/urlpattern.rs b/components/script/dom/urlpattern.rs
new file mode 100644
index 00000000000..c811d3a9a70
--- /dev/null
+++ b/components/script/dom/urlpattern.rs
@@ -0,0 +1,204 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use dom_struct::dom_struct;
+use js::rust::HandleObject;
+use script_bindings::codegen::GenericUnionTypes::USVStringOrURLPatternInit;
+use script_bindings::error::{Error, Fallible};
+use script_bindings::reflector::Reflector;
+use script_bindings::root::DomRoot;
+use script_bindings::script_runtime::CanGc;
+use script_bindings::str::USVString;
+
+use crate::dom::bindings::codegen::Bindings::URLPatternBinding;
+use crate::dom::bindings::codegen::Bindings::URLPatternBinding::URLPatternMethods;
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
+use crate::dom::globalscope::GlobalScope;
+
+/// <https://urlpattern.spec.whatwg.org/#urlpattern>
+#[dom_struct]
+pub(crate) struct URLPattern {
+    reflector: Reflector,
+
+    /// <https://urlpattern.spec.whatwg.org/#urlpattern-associated-url-pattern>
+    #[no_trace]
+    associated_url_pattern: urlpattern::UrlPattern,
+}
+
+impl URLPattern {
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    fn new_inherited(associated_url_pattern: urlpattern::UrlPattern) -> URLPattern {
+        URLPattern {
+            reflector: Reflector::new(),
+            associated_url_pattern,
+        }
+    }
+
+    /// <https://urlpattern.spec.whatwg.org/#urlpattern-initialize>
+    pub(crate) fn initialize(
+        global: &GlobalScope,
+        proto: Option<HandleObject>,
+        input: USVStringOrURLPatternInit,
+        base_url: Option<USVString>,
+        options: &URLPatternBinding::URLPatternOptions,
+        can_gc: CanGc,
+    ) -> Fallible<DomRoot<URLPattern>> {
+        // The section below converts from servos types to the types used in the urlpattern crate
+        let base_url = base_url.map(|usv_string| usv_string.0);
+        let input = bindings_to_third_party::map_urlpattern_input(input, base_url.clone());
+        let options = urlpattern::UrlPatternOptions {
+            ignore_case: options.ignoreCase,
+        };
+
+        // Parse and initialize the URL pattern.
+        let pattern_init =
+            urlpattern::quirks::process_construct_pattern_input(input, base_url.as_deref())
+                .map_err(|error| Error::Type(format!("{error}")))?;
+
+        let pattern = urlpattern::UrlPattern::parse(pattern_init, options)
+            .map_err(|error| Error::Type(format!("{error}")))?;
+
+        let url_pattern = reflect_dom_object_with_proto(
+            Box::new(URLPattern::new_inherited(pattern)),
+            global,
+            proto,
+            can_gc,
+        );
+        Ok(url_pattern)
+    }
+}
+
+impl URLPatternMethods<crate::DomTypeHolder> for URLPattern {
+    // <https://urlpattern.spec.whatwg.org/#dom-urlpattern-urlpattern>
+    fn Constructor(
+        global: &GlobalScope,
+        proto: Option<HandleObject>,
+        can_gc: CanGc,
+        input: USVStringOrURLPatternInit,
+        base_url: USVString,
+        options: &URLPatternBinding::URLPatternOptions,
+    ) -> Fallible<DomRoot<URLPattern>> {
+        URLPattern::initialize(global, proto, input, Some(base_url), options, can_gc)
+    }
+
+    /// <https://urlpattern.spec.whatwg.org/#dom-urlpattern-urlpattern-input-options>
+    fn Constructor_(
+        global: &GlobalScope,
+        proto: Option<HandleObject>,
+        can_gc: CanGc,
+        input: USVStringOrURLPatternInit,
+        options: &URLPatternBinding::URLPatternOptions,
+    ) -> Fallible<DomRoot<URLPattern>> {
+        // Step 1. Run initialize given this, input, null, and options.
+        URLPattern::initialize(global, proto, input, None, options, can_gc)
+    }
+
+    /// <https://urlpattern.spec.whatwg.org/#dom-urlpattern-protocol>
+    fn Protocol(&self) -> USVString {
+        // Step 1. Return this’s associated URL pattern’s protocol component’s pattern string.
+        USVString(self.associated_url_pattern.protocol().to_owned())
+    }
+
+    /// <https://urlpattern.spec.whatwg.org/#dom-urlpattern-username>
+    fn Username(&self) -> USVString {
+        // Step 1. Return this’s associated URL pattern’s username component’s pattern string.
+        USVString(self.associated_url_pattern.username().to_owned())
+    }
+
+    /// <https://urlpattern.spec.whatwg.org/#dom-urlpattern-password>
+    fn Password(&self) -> USVString {
+        // Step 1. Return this’s associated URL pattern’s password component’s pattern string.
+        USVString(self.associated_url_pattern.password().to_owned())
+    }
+
+    /// <https://urlpattern.spec.whatwg.org/#dom-urlpattern-hostname>
+    fn Hostname(&self) -> USVString {
+        // Step 1. Return this’s associated URL pattern’s hostname component’s pattern string.
+        USVString(self.associated_url_pattern.hostname().to_owned())
+    }
+
+    /// <https://urlpattern.spec.whatwg.org/#dom-urlpattern-port>
+    fn Port(&self) -> USVString {
+        // Step 1. Return this’s associated URL pattern’s port component’s pattern string.
+        USVString(self.associated_url_pattern.port().to_owned())
+    }
+
+    /// <https://urlpattern.spec.whatwg.org/#dom-urlpattern-pathname>
+    fn Pathname(&self) -> USVString {
+        // Step 1. Return this’s associated URL pattern’s pathname component’s pattern string.
+        USVString(self.associated_url_pattern.pathname().to_owned())
+    }
+
+    /// <https://urlpattern.spec.whatwg.org/#dom-urlpattern-search>
+    fn Search(&self) -> USVString {
+        // Step 1. Return this’s associated URL pattern’s search component’s pattern string.
+        USVString(self.associated_url_pattern.search().to_owned())
+    }
+
+    /// <https://urlpattern.spec.whatwg.org/#dom-urlpattern-hash>
+    fn Hash(&self) -> USVString {
+        // Step 1. Return this’s associated URL pattern’s hash component’s pattern string.
+        USVString(self.associated_url_pattern.hash().to_owned())
+    }
+
+    /// <https://urlpattern.spec.whatwg.org/#dom-urlpattern-hasregexpgroups>
+    fn HasRegExpGroups(&self) -> bool {
+        // Step 1. If this’s associated URL pattern’s has regexp groups, then return true.
+        // Step 2. Return false.
+        self.associated_url_pattern.has_regexp_groups()
+    }
+}
+
+mod bindings_to_third_party {
+    use crate::dom::urlpattern::USVStringOrURLPatternInit;
+
+    pub(super) fn map_urlpattern_input(
+        input: USVStringOrURLPatternInit,
+        base_url: Option<String>,
+    ) -> urlpattern::quirks::StringOrInit {
+        match input {
+            USVStringOrURLPatternInit::USVString(usv_string) => {
+                urlpattern::quirks::StringOrInit::String(usv_string.0)
+            },
+            USVStringOrURLPatternInit::URLPatternInit(pattern_init) => {
+                let pattern_init = urlpattern::quirks::UrlPatternInit {
+                    protocol: pattern_init
+                        .protocol
+                        .as_ref()
+                        .map(|usv_string| usv_string.to_string()),
+                    username: pattern_init
+                        .username
+                        .as_ref()
+                        .map(|usv_string| usv_string.to_string()),
+                    password: pattern_init
+                        .password
+                        .as_ref()
+                        .map(|usv_string| usv_string.to_string()),
+                    hostname: pattern_init
+                        .hostname
+                        .as_ref()
+                        .map(|usv_string| usv_string.to_string()),
+                    port: pattern_init
+                        .port
+                        .as_ref()
+                        .map(|usv_string| usv_string.to_string()),
+                    pathname: pattern_init
+                        .pathname
+                        .as_ref()
+                        .map(|usv_string| usv_string.to_string()),
+                    search: pattern_init
+                        .search
+                        .as_ref()
+                        .map(|usv_string| usv_string.to_string()),
+                    hash: pattern_init
+                        .hash
+                        .as_ref()
+                        .map(|usv_string| usv_string.to_string()),
+                    base_url,
+                };
+                urlpattern::quirks::StringOrInit::Init(pattern_init)
+            },
+        }
+    }
+}
diff --git a/components/script/dom/validation.rs b/components/script/dom/validation.rs
index 666eac6dcee..6a0c88c56ce 100755
--- a/components/script/dom/validation.rs
+++ b/components/script/dom/validation.rs
@@ -25,7 +25,11 @@ pub(crate) trait Validatable {
     fn is_instance_validatable(&self) -> bool;
 
     // Check if element satisfies its constraints, excluding custom errors
-    fn perform_validation(&self, _validate_flags: ValidationFlags) -> ValidationFlags {
+    fn perform_validation(
+        &self,
+        _validate_flags: ValidationFlags,
+        _can_gc: CanGc,
+    ) -> ValidationFlags {
         ValidationFlags::empty()
     }
 
diff --git a/components/script/dom/validitystate.rs b/components/script/dom/validitystate.rs
index 0d3297f38d8..6ce9825947e 100755
--- a/components/script/dom/validitystate.rs
+++ b/components/script/dom/validitystate.rs
@@ -24,7 +24,7 @@ use crate::dom::node::Node;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
 
-// https://html.spec.whatwg.org/multipage/#validity-states
+/// <https://html.spec.whatwg.org/multipage/#validity-states>
 #[derive(Clone, Copy, JSTraceable, MallocSizeOf)]
 pub(crate) struct ValidationFlags(u32);
 
@@ -107,7 +107,7 @@ impl ValidityState {
     // https://html.spec.whatwg.org/multipage/#custom-validity-error-message
     pub(crate) fn set_custom_error_message(&self, error: DOMString) {
         *self.custom_error_message.borrow_mut() = error;
-        self.perform_validation_and_update(ValidationFlags::CUSTOM_ERROR);
+        self.perform_validation_and_update(ValidationFlags::CUSTOM_ERROR, CanGc::note());
     }
 
     /// Given a set of [ValidationFlags], recalculate their value by performing
@@ -115,12 +115,16 @@ impl ValidityState {
     /// if [ValidationFlags::CUSTOM_ERROR] is in `update_flags` and a custom
     /// error has been set on this [ValidityState], the state will be updated
     /// to reflect the existance of a custom error.
-    pub(crate) fn perform_validation_and_update(&self, update_flags: ValidationFlags) {
+    pub(crate) fn perform_validation_and_update(
+        &self,
+        update_flags: ValidationFlags,
+        can_gc: CanGc,
+    ) {
         let mut invalid_flags = self.invalid_flags.get();
         invalid_flags.remove(update_flags);
 
         if let Some(validatable) = self.element.as_maybe_validatable() {
-            let new_flags = validatable.perform_validation(update_flags);
+            let new_flags = validatable.perform_validation(update_flags, can_gc);
             invalid_flags.insert(new_flags);
         }
 
@@ -132,7 +136,7 @@ impl ValidityState {
         }
 
         self.invalid_flags.set(invalid_flags);
-        self.update_pseudo_classes();
+        self.update_pseudo_classes(can_gc);
     }
 
     pub(crate) fn update_invalid_flags(&self, update_flags: ValidationFlags) {
@@ -143,7 +147,7 @@ impl ValidityState {
         self.invalid_flags.get()
     }
 
-    pub(crate) fn update_pseudo_classes(&self) {
+    pub(crate) fn update_pseudo_classes(&self, can_gc: CanGc) {
         if self.element.is_instance_validatable() {
             let is_valid = self.invalid_flags.get().is_empty();
             self.element.set_state(ElementState::VALID, is_valid);
@@ -155,7 +159,7 @@ impl ValidityState {
 
         if let Some(form_control) = self.element.as_maybe_form_control() {
             if let Some(form_owner) = form_control.form_owner() {
-                form_owner.update_validity();
+                form_owner.update_validity(can_gc);
             }
         }
 
@@ -166,7 +170,7 @@ impl ValidityState {
             .filter_map(DomRoot::downcast::<HTMLFieldSetElement>)
             .next()
         {
-            fieldset.update_validity();
+            fieldset.update_validity(can_gc);
         }
     }
 }
diff --git a/components/script/dom/virtualmethods.rs b/components/script/dom/virtualmethods.rs
index 900ed5d0607..1d992b1f301 100644
--- a/components/script/dom/virtualmethods.rs
+++ b/components/script/dom/virtualmethods.rs
@@ -3,6 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use html5ever::LocalName;
+use script_bindings::script_runtime::CanGc;
 use style::attr::AttrValue;
 
 use crate::dom::attr::Attr;
@@ -60,6 +61,7 @@ use crate::dom::htmlvideoelement::HTMLVideoElement;
 use crate::dom::node::{BindContext, ChildrenMutation, CloneChildrenFlag, Node, UnbindContext};
 use crate::dom::shadowroot::ShadowRoot;
 use crate::dom::svgelement::SVGElement;
+use crate::dom::svgimageelement::SVGImageElement;
 use crate::dom::svgsvgelement::SVGSVGElement;
 
 /// Trait to allow DOM nodes to opt-in to overriding (or adding to) common
@@ -72,9 +74,9 @@ pub(crate) trait VirtualMethods {
     /// Called when attributes of a node are mutated.
     /// <https://dom.spec.whatwg.org/#attribute-is-set>
     /// <https://dom.spec.whatwg.org/#attribute-is-removed>
-    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.attribute_mutated(attr, mutation);
+            s.attribute_mutated(attr, mutation, can_gc);
         }
     }
 
@@ -107,9 +109,9 @@ pub(crate) trait VirtualMethods {
 
     /// Called when a Node is appended to a tree, where 'tree_connected' indicates
     /// whether the tree is part of a Document.
-    fn bind_to_tree(&self, context: &BindContext) {
+    fn bind_to_tree(&self, context: &BindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.bind_to_tree(context);
+            s.bind_to_tree(context, can_gc);
         }
     }
 
@@ -117,9 +119,9 @@ pub(crate) trait VirtualMethods {
     /// indicates whether the tree is part of a Document.
     /// Implements removing steps:
     /// <https://dom.spec.whatwg.org/#concept-node-remove-ext>
-    fn unbind_from_tree(&self, context: &UnbindContext) {
+    fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.unbind_from_tree(context);
+            s.unbind_from_tree(context, can_gc);
         }
     }
 
@@ -131,16 +133,16 @@ pub(crate) trait VirtualMethods {
     }
 
     /// Called during event dispatch after the bubbling phase completes.
-    fn handle_event(&self, event: &Event) {
+    fn handle_event(&self, event: &Event, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.handle_event(event);
+            s.handle_event(event, can_gc);
         }
     }
 
     /// <https://dom.spec.whatwg.org/#concept-node-adopt-ext>
-    fn adopting_steps(&self, old_doc: &Document) {
+    fn adopting_steps(&self, old_doc: &Document, can_gc: CanGc) {
         if let Some(s) = self.super_type() {
-            s.adopting_steps(old_doc);
+            s.adopting_steps(old_doc, can_gc);
         }
     }
 
@@ -150,9 +152,10 @@ pub(crate) trait VirtualMethods {
         copy: &Node,
         maybe_doc: Option<&Document>,
         clone_children: CloneChildrenFlag,
+        can_gc: CanGc,
     ) {
         if let Some(s) = self.super_type() {
-            s.cloning_steps(copy, maybe_doc, clone_children);
+            s.cloning_steps(copy, maybe_doc, clone_children, can_gc);
         }
     }
 
@@ -296,6 +299,9 @@ pub(crate) fn vtable_for(node: &Node) -> &dyn VirtualMethods {
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTitleElement)) => {
             node.downcast::<HTMLTitleElement>().unwrap() as &dyn VirtualMethods
         },
+        NodeTypeId::Element(ElementTypeId::SVGElement(SVGElementTypeId::SVGGraphicsElement(
+            SVGGraphicsElementTypeId::SVGImageElement,
+        ))) => node.downcast::<SVGImageElement>().unwrap() as &dyn VirtualMethods,
         NodeTypeId::Element(ElementTypeId::SVGElement(SVGElementTypeId::SVGGraphicsElement(
             SVGGraphicsElementTypeId::SVGSVGElement,
         ))) => node.downcast::<SVGSVGElement>().unwrap() as &dyn VirtualMethods,
diff --git a/components/script/dom/vttcue.rs b/components/script/dom/vttcue.rs
index 4d44245d26f..fad91d3b490 100644
--- a/components/script/dom/vttcue.rs
+++ b/components/script/dom/vttcue.rs
@@ -14,11 +14,10 @@ use crate::dom::bindings::codegen::Bindings::VTTCueBinding::{
 };
 use crate::dom::bindings::error::{Error, ErrorResult};
 use crate::dom::bindings::num::Finite;
-use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::documentfragment::DocumentFragment;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::texttrackcue::TextTrackCue;
 use crate::dom::vttregion::VTTRegion;
 use crate::dom::window::Window;
@@ -62,7 +61,7 @@ impl VTTCue {
     }
 
     fn new(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         start_time: f64,
         end_time: f64,
@@ -71,7 +70,7 @@ impl VTTCue {
     ) -> DomRoot<Self> {
         reflect_dom_object_with_proto(
             Box::new(Self::new_inherited(start_time, end_time, text)),
-            global,
+            window,
             proto,
             can_gc,
         )
@@ -88,14 +87,7 @@ impl VTTCueMethods<crate::DomTypeHolder> for VTTCue {
         end_time: Finite<f64>,
         text: DOMString,
     ) -> DomRoot<Self> {
-        VTTCue::new(
-            &window.global(),
-            proto,
-            *start_time,
-            *end_time,
-            text,
-            can_gc,
-        )
+        VTTCue::new(window, proto, *start_time, *end_time, text, can_gc)
     }
 
     // https://w3c.github.io/webvtt/#dom-vttcue-region
diff --git a/components/script/dom/vttregion.rs b/components/script/dom/vttregion.rs
index ee80210ee23..cb3ff0eb1f3 100644
--- a/components/script/dom/vttregion.rs
+++ b/components/script/dom/vttregion.rs
@@ -11,10 +11,9 @@ use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::VTTRegionBinding::{ScrollSetting, VTTRegionMethods};
 use crate::dom::bindings::error::{Error, ErrorResult, Fallible};
 use crate::dom::bindings::num::Finite;
-use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::{Reflector, reflect_dom_object_with_proto};
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::window::Window;
 use crate::script_runtime::CanGc;
 
@@ -46,8 +45,8 @@ impl VTTRegion {
         }
     }
 
-    fn new(global: &GlobalScope, proto: Option<HandleObject>, can_gc: CanGc) -> DomRoot<Self> {
-        reflect_dom_object_with_proto(Box::new(Self::new_inherited()), global, proto, can_gc)
+    fn new(window: &Window, proto: Option<HandleObject>, can_gc: CanGc) -> DomRoot<Self> {
+        reflect_dom_object_with_proto(Box::new(Self::new_inherited()), window, proto, can_gc)
     }
 }
 
@@ -58,7 +57,7 @@ impl VTTRegionMethods<crate::DomTypeHolder> for VTTRegion {
         proto: Option<HandleObject>,
         can_gc: CanGc,
     ) -> Fallible<DomRoot<Self>> {
-        Ok(VTTRegion::new(&window.global(), proto, can_gc))
+        Ok(VTTRegion::new(window, proto, can_gc))
     }
 
     // https://w3c.github.io/webvtt/#dom-vttregion-id
diff --git a/components/script/dom/webgl2renderingcontext.rs b/components/script/dom/webgl2renderingcontext.rs
index d64a7f70376..5e538b53b5f 100644
--- a/components/script/dom/webgl2renderingcontext.rs
+++ b/components/script/dom/webgl2renderingcontext.rs
@@ -21,9 +21,11 @@ use js::jsapi::{JSObject, Type};
 use js::jsval::{BooleanValue, DoubleValue, Int32Value, NullValue, ObjectValue, UInt32Value};
 use js::rust::{CustomAutoRooterGuard, HandleObject, MutableHandleValue};
 use js::typedarray::{ArrayBufferView, CreateWith, Float32, Int32Array, Uint32, Uint32Array};
-use script_layout_interface::HTMLCanvasDataSource;
+use script_bindings::interfaces::WebGL2RenderingContextHelpers;
 use servo_config::pref;
+use snapshot::Snapshot;
 use url::Host;
+use webrender_api::ImageKey;
 
 use crate::canvas_context::CanvasContext;
 use crate::dom::bindings::codegen::Bindings::WebGL2RenderingContextBinding::{
@@ -548,11 +550,11 @@ impl WebGL2RenderingContext {
             return
         );
 
-        let (sender, receiver) = ipc::bytes_channel().unwrap();
+        let (sender, receiver) = ipc::channel().unwrap();
         self.base.send_command(WebGLCommand::ReadPixels(
             src_rect, format, pixel_type, sender,
         ));
-        let src = receiver.recv().unwrap();
+        let (src, _) = receiver.recv().unwrap();
 
         for i in 0..src_rect.size.height as usize {
             let src_start = i * src_row_bytes as usize;
@@ -915,11 +917,7 @@ impl CanvasContext for WebGL2RenderingContext {
         self.base.resize();
     }
 
-    fn get_image_data_as_shared_memory(&self) -> Option<IpcSharedMemory> {
-        self.base.get_image_data_as_shared_memory()
-    }
-
-    fn get_image_data(&self) -> Option<Vec<u8>> {
+    fn get_image_data(&self) -> Option<Snapshot> {
         self.base.get_image_data()
     }
 
@@ -4704,8 +4702,14 @@ impl WebGL2RenderingContextMethods<crate::DomTypeHolder> for WebGL2RenderingCont
 
 impl LayoutCanvasRenderingContextHelpers for LayoutDom<'_, WebGL2RenderingContext> {
     #[allow(unsafe_code)]
-    fn canvas_data_source(self) -> HTMLCanvasDataSource {
+    fn canvas_data_source(self) -> Option<ImageKey> {
         let this = self.unsafe_get();
         unsafe { (*this.base.to_layout().unsafe_get()).layout_handle() }
     }
 }
+
+impl WebGL2RenderingContextHelpers for WebGL2RenderingContext {
+    fn is_webgl2_enabled(cx: JSContext, global: HandleObject) -> bool {
+        Self::is_webgl2_enabled(cx, global)
+    }
+}
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 1e51ac4baf9..98170f9655b 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -31,9 +31,9 @@ use js::typedarray::{
 };
 use net_traits::image_cache::ImageResponse;
 use pixels::{self, PixelFormat};
-use script_layout_interface::HTMLCanvasDataSource;
 use serde::{Deserialize, Serialize};
 use servo_config::pref;
+use snapshot::Snapshot;
 use webrender_api::ImageKey;
 
 use crate::canvas_context::CanvasContext;
@@ -628,11 +628,15 @@ impl WebGLRenderingContext {
                 if !canvas.origin_is_clean() {
                     return Err(Error::Security);
                 }
-                if let Some((data, size)) = canvas.fetch_all_data() {
-                    let data = data.unwrap_or_else(|| {
-                        IpcSharedMemory::from_bytes(&vec![0; size.area() as usize * 4])
-                    });
-                    TexPixels::new(data, size, PixelFormat::BGRA8, true)
+                if let Some(snapshot) = canvas.get_image_data() {
+                    let snapshot = snapshot.as_ipc();
+                    let size = snapshot.size().cast();
+                    let format = match snapshot.format() {
+                        snapshot::PixelFormat::RGBA => PixelFormat::RGBA8,
+                        snapshot::PixelFormat::BGRA => PixelFormat::BGRA8,
+                    };
+                    let premultiply = snapshot.alpha_mode().is_premultiplied();
+                    TexPixels::new(snapshot.to_ipc_shared_memory(), size, format, premultiply)
                 } else {
                     return Ok(None);
                 }
@@ -870,9 +874,8 @@ impl WebGLRenderingContext {
         receiver.recv().unwrap()
     }
 
-    pub(crate) fn layout_handle(&self) -> HTMLCanvasDataSource {
-        let image_key = self.webrender_image;
-        HTMLCanvasDataSource::WebGL(image_key)
+    pub(crate) fn layout_handle(&self) -> Option<ImageKey> {
+        Some(self.webrender_image)
     }
 
     // https://www.khronos.org/registry/webgl/extensions/ANGLE_instanced_arrays/
@@ -1922,18 +1925,13 @@ impl CanvasContext for WebGLRenderingContext {
         }
     }
 
-    fn get_image_data_as_shared_memory(&self) -> Option<IpcSharedMemory> {
-        // TODO: add a method in WebGLRenderingContext to get the pixels.
-        None
-    }
-
     // Used by HTMLCanvasElement.toDataURL
     //
     // This emits errors quite liberally, but the spec says that this operation
     // can fail and that it is UB what happens in that case.
     //
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#2.2
-    fn get_image_data(&self) -> Option<Vec<u8>> {
+    fn get_image_data(&self) -> Option<Snapshot> {
         handle_potential_webgl_error!(self, self.validate_framebuffer(), return None);
         let mut size = self.size().cast();
 
@@ -1945,14 +1943,20 @@ impl CanvasContext for WebGLRenderingContext {
         size.width = cmp::min(size.width, fb_width as u32);
         size.height = cmp::min(size.height, fb_height as u32);
 
-        let (sender, receiver) = ipc::bytes_channel().unwrap();
+        let (sender, receiver) = ipc::channel().unwrap();
         self.send_command(WebGLCommand::ReadPixels(
             Rect::from_size(size),
             constants::RGBA,
             constants::UNSIGNED_BYTE,
             sender,
         ));
-        Some(receiver.recv().unwrap())
+        let (data, alpha_mode) = receiver.recv().unwrap();
+        Some(Snapshot::from_vec(
+            size.cast(),
+            snapshot::PixelFormat::RGBA,
+            alpha_mode,
+            data.to_vec(),
+        ))
     }
 
     fn mark_as_dirty(&self) {
@@ -3826,11 +3830,11 @@ impl WebGLRenderingContextMethods<crate::DomTypeHolder> for WebGLRenderingContex
             dest_offset += -y * row_len;
         }
 
-        let (sender, receiver) = ipc::bytes_channel().unwrap();
+        let (sender, receiver) = ipc::channel().unwrap();
         self.send_command(WebGLCommand::ReadPixels(
             src_rect, format, pixel_type, sender,
         ));
-        let src = receiver.recv().unwrap();
+        let (src, _) = receiver.recv().unwrap();
 
         let src_row_len = src_rect.size.width as usize * bytes_per_pixel as usize;
         for i in 0..src_rect.size.height {
@@ -4823,7 +4827,7 @@ impl WebGLRenderingContextMethods<crate::DomTypeHolder> for WebGLRenderingContex
 }
 
 impl LayoutCanvasRenderingContextHelpers for LayoutDom<'_, WebGLRenderingContext> {
-    fn canvas_data_source(self) -> HTMLCanvasDataSource {
+    fn canvas_data_source(self) -> Option<ImageKey> {
         (*self.unsafe_get()).layout_handle()
     }
 }
diff --git a/components/script/dom/webgpu/gpu.rs b/components/script/dom/webgpu/gpu.rs
index ce5f3d1f5fd..20380e07bfb 100644
--- a/components/script/dom/webgpu/gpu.rs
+++ b/components/script/dom/webgpu/gpu.rs
@@ -4,11 +4,11 @@
 
 use std::rc::Rc;
 
+use constellation_traits::ScriptToConstellationMessage;
 use dom_struct::dom_struct;
 use js::jsapi::Heap;
-use script_traits::ScriptMsg;
-use webgpu::wgt::PowerPreference;
-use webgpu::{WebGPUAdapterResponse, wgc};
+use webgpu_traits::WebGPUAdapterResponse;
+use wgpu_types::PowerPreference;
 
 use super::wgsllanguagefeatures::WGSLLanguageFeatures;
 use crate::dom::bindings::codegen::Bindings::WebGPUBinding::{
@@ -56,7 +56,9 @@ impl GPUMethods<crate::DomTypeHolder> for GPU {
     ) -> Rc<Promise> {
         let global = &self.global();
         let promise = Promise::new_in_current_realm(comp, can_gc);
-        let sender = route_promise(&promise, self);
+        let task_source = global.task_manager().dom_manipulation_task_source();
+        let sender = route_promise(&promise, self, task_source);
+
         let power_preference = match options.powerPreference {
             Some(GPUPowerPreference::Low_power) => PowerPreference::LowPower,
             Some(GPUPowerPreference::High_performance) => PowerPreference::HighPerformance,
@@ -66,9 +68,9 @@ impl GPUMethods<crate::DomTypeHolder> for GPU {
 
         let script_to_constellation_chan = global.script_to_constellation_chan();
         if script_to_constellation_chan
-            .send(ScriptMsg::RequestAdapter(
+            .send(ScriptToConstellationMessage::RequestAdapter(
                 sender,
-                wgc::instance::RequestAdapterOptions {
+                wgpu_core::instance::RequestAdapterOptions {
                     power_preference,
                     compatible_surface: None,
                     force_fallback_adapter: options.forceFallbackAdapter,
diff --git a/components/script/dom/webgpu/gpuadapter.rs b/components/script/dom/webgpu/gpuadapter.rs
index 04a7b9e42ad..e22eca173ca 100644
--- a/components/script/dom/webgpu/gpuadapter.rs
+++ b/components/script/dom/webgpu/gpuadapter.rs
@@ -6,9 +6,10 @@ use std::rc::Rc;
 
 use dom_struct::dom_struct;
 use js::jsapi::{Heap, JSObject};
-use webgpu::wgc::instance::RequestDeviceError;
-use webgpu::wgt::MemoryHints;
-use webgpu::{WebGPU, WebGPUAdapter, WebGPUDeviceResponse, WebGPURequest, wgt};
+use webgpu_traits::{
+    RequestDeviceError, WebGPU, WebGPUAdapter, WebGPUDeviceResponse, WebGPURequest,
+};
+use wgpu_types::{self, MemoryHints};
 
 use super::gpusupportedfeatures::GPUSupportedFeatures;
 use super::gpusupportedlimits::set_limit;
@@ -72,9 +73,9 @@ impl GPUAdapter {
         channel: WebGPU,
         name: DOMString,
         extensions: Heap<*mut JSObject>,
-        features: wgt::Features,
-        limits: wgt::Limits,
-        info: wgt::AdapterInfo,
+        features: wgpu_types::Features,
+        limits: wgpu_types::Limits,
+        info: wgpu_types::AdapterInfo,
         adapter: WebGPUAdapter,
         can_gc: CanGc,
     ) -> DomRoot<Self> {
@@ -116,8 +117,12 @@ impl GPUAdapterMethods<crate::DomTypeHolder> for GPUAdapter {
     ) -> Rc<Promise> {
         // Step 2
         let promise = Promise::new_in_current_realm(comp, can_gc);
-        let sender = route_promise(&promise, self);
-        let mut required_features = wgt::Features::empty();
+        let sender = route_promise(
+            &promise,
+            self,
+            self.global().task_manager().dom_manipulation_task_source(),
+        );
+        let mut required_features = wgpu_types::Features::empty();
         for &ext in descriptor.requiredFeatures.iter() {
             if let Some(feature) = gpu_to_wgt_feature(ext) {
                 required_features.insert(feature);
@@ -130,7 +135,7 @@ impl GPUAdapterMethods<crate::DomTypeHolder> for GPUAdapter {
             }
         }
 
-        let mut required_limits = wgt::Limits::default();
+        let mut required_limits = wgpu_types::Limits::default();
         if let Some(limits) = &descriptor.requiredLimits {
             for (limit, value) in (*limits).iter() {
                 if !set_limit(&mut required_limits, limit.as_ref(), *value) {
@@ -141,11 +146,12 @@ impl GPUAdapterMethods<crate::DomTypeHolder> for GPUAdapter {
             }
         }
 
-        let desc = wgt::DeviceDescriptor {
+        let desc = wgpu_types::DeviceDescriptor {
             required_features,
             required_limits,
             label: Some(descriptor.parent.label.to_string()),
             memory_hints: MemoryHints::MemoryUsage,
+            trace: wgpu_types::Trace::Off,
         };
         let device_id = self.global().wgpu_id_hub().create_device_id();
         let queue_id = self.global().wgpu_id_hub().create_queue_id();
@@ -206,6 +212,7 @@ impl GPUAdapterMethods<crate::DomTypeHolder> for GPUAdapter {
 }
 
 impl RoutedPromiseListener<WebGPUDeviceResponse> for GPUAdapter {
+    /// <https://www.w3.org/TR/webgpu/#dom-gpuadapter-requestdevice>
     fn handle_response(
         &self,
         response: WebGPUDeviceResponse,
@@ -213,6 +220,7 @@ impl RoutedPromiseListener<WebGPUDeviceResponse> for GPUAdapter {
         can_gc: CanGc,
     ) {
         match response {
+            // 3.1 Let device be a new device with the capabilities described by descriptor.
             (device_id, queue_id, Ok(descriptor)) => {
                 let device = GPUDevice::new(
                     &self.global(),
@@ -229,27 +237,38 @@ impl RoutedPromiseListener<WebGPUDeviceResponse> for GPUAdapter {
                 self.global().add_gpu_device(&device);
                 promise.resolve_native(&device, can_gc);
             },
+            // 1. If features are not supported reject promise with a TypeError.
             (_, _, Err(RequestDeviceError::UnsupportedFeature(f))) => promise.reject_error(
-                Error::Type(RequestDeviceError::UnsupportedFeature(f).to_string()),
+                Error::Type(
+                    wgpu_core::instance::RequestDeviceError::UnsupportedFeature(f).to_string(),
+                ),
                 can_gc,
             ),
-            (_, _, Err(RequestDeviceError::LimitsExceeded(_))) => {
+            // 2. If limits are not supported reject promise with an OperationError.
+            (_, _, Err(RequestDeviceError::LimitsExceeded(l))) => {
+                warn!(
+                    "{}",
+                    wgpu_core::instance::RequestDeviceError::LimitsExceeded(l)
+                );
                 promise.reject_error(Error::Operation, can_gc)
             },
-            (device_id, queue_id, Err(e)) => {
+            // 3. user agent otherwise cannot fulfill the request
+            (device_id, queue_id, Err(RequestDeviceError::Other(e))) => {
+                // 1. Let device be a new device.
                 let device = GPUDevice::new(
                     &self.global(),
                     self.channel.clone(),
                     self,
                     Heap::default(),
-                    wgt::Features::default(),
-                    wgt::Limits::default(),
+                    wgpu_types::Features::default(),
+                    wgpu_types::Limits::default(),
                     device_id,
                     queue_id,
                     String::new(),
                     can_gc,
                 );
-                device.lose(GPUDeviceLostReason::Unknown, e.to_string(), can_gc);
+                // 2. Lose the device(device, "unknown").
+                device.lose(GPUDeviceLostReason::Unknown, e, can_gc);
                 promise.resolve_native(&device, can_gc);
             },
         }
diff --git a/components/script/dom/webgpu/gpuadapterinfo.rs b/components/script/dom/webgpu/gpuadapterinfo.rs
index 88b6f6a9a05..a0a9c510125 100644
--- a/components/script/dom/webgpu/gpuadapterinfo.rs
+++ b/components/script/dom/webgpu/gpuadapterinfo.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use webgpu::wgt::AdapterInfo;
+use wgpu_types::AdapterInfo;
 
 use crate::dom::bindings::codegen::Bindings::WebGPUBinding::GPUAdapterInfoMethods;
 use crate::dom::bindings::reflector::{Reflector, reflect_dom_object};
diff --git a/components/script/dom/webgpu/gpubindgroup.rs b/components/script/dom/webgpu/gpubindgroup.rs
index 0cc36c4cfcb..a70030782c3 100644
--- a/components/script/dom/webgpu/gpubindgroup.rs
+++ b/components/script/dom/webgpu/gpubindgroup.rs
@@ -5,8 +5,8 @@
 use std::borrow::Cow;
 
 use dom_struct::dom_struct;
-use webgpu::wgc::binding_model::BindGroupDescriptor;
-use webgpu::{WebGPU, WebGPUBindGroup, WebGPUDevice, WebGPURequest};
+use webgpu_traits::{WebGPU, WebGPUBindGroup, WebGPUDevice, WebGPURequest};
+use wgpu_core::binding_model::BindGroupDescriptor;
 
 use crate::conversions::Convert;
 use crate::dom::bindings::cell::DomRefCell;
diff --git a/components/script/dom/webgpu/gpubindgrouplayout.rs b/components/script/dom/webgpu/gpubindgrouplayout.rs
index 2f8ff161b50..f305791e2af 100644
--- a/components/script/dom/webgpu/gpubindgrouplayout.rs
+++ b/components/script/dom/webgpu/gpubindgrouplayout.rs
@@ -5,8 +5,8 @@
 use std::borrow::Cow;
 
 use dom_struct::dom_struct;
-use webgpu::wgc::binding_model::BindGroupLayoutDescriptor;
-use webgpu::{WebGPU, WebGPUBindGroupLayout, WebGPURequest};
+use webgpu_traits::{WebGPU, WebGPUBindGroupLayout, WebGPURequest};
+use wgpu_core::binding_model::BindGroupLayoutDescriptor;
 
 use crate::conversions::Convert;
 use crate::dom::bindings::cell::DomRefCell;
diff --git a/components/script/dom/webgpu/gpubuffer.rs b/components/script/dom/webgpu/gpubuffer.rs
index b6c5d6c4977..0b41d386b4a 100644
--- a/components/script/dom/webgpu/gpubuffer.rs
+++ b/components/script/dom/webgpu/gpubuffer.rs
@@ -9,9 +9,9 @@ use std::string::String;
 use dom_struct::dom_struct;
 use ipc_channel::ipc::IpcSharedMemory;
 use js::typedarray::ArrayBuffer;
-use webgpu::wgc::device::HostMap;
-use webgpu::{Mapping, WebGPU, WebGPUBuffer, WebGPURequest, wgc, wgt};
-use wgc::resource::BufferAccessError;
+use webgpu_traits::{Mapping, WebGPU, WebGPUBuffer, WebGPURequest};
+use wgpu_core::device::HostMap;
+use wgpu_core::resource::BufferAccessError;
 
 use crate::conversions::Convert;
 use crate::dom::bindings::buffer_source::DataBlock;
@@ -140,10 +140,10 @@ impl GPUBuffer {
         descriptor: &GPUBufferDescriptor,
         can_gc: CanGc,
     ) -> Fallible<DomRoot<GPUBuffer>> {
-        let desc = wgt::BufferDescriptor {
+        let desc = wgpu_types::BufferDescriptor {
             label: (&descriptor.parent).convert(),
-            size: descriptor.size as wgt::BufferAddress,
-            usage: wgt::BufferUsages::from_bits_retain(descriptor.usage),
+            size: descriptor.size as wgpu_types::BufferAddress,
+            usage: wgpu_types::BufferUsages::from_bits_retain(descriptor.usage),
             mapped_at_creation: descriptor.mappedAtCreation,
         };
         let id = device.global().wgpu_id_hub().create_buffer_id();
@@ -263,7 +263,7 @@ impl GPUBufferMethods<crate::DomTypeHolder> for GPUBuffer {
             GPUMapModeConstants::WRITE => HostMap::Write,
             _ => {
                 self.device
-                    .dispatch_error(webgpu::Error::Validation(String::from(
+                    .dispatch_error(webgpu_traits::Error::Validation(String::from(
                         "Invalid MapModeFlags",
                     )));
                 self.map_failure(&promise, can_gc);
@@ -271,7 +271,11 @@ impl GPUBufferMethods<crate::DomTypeHolder> for GPUBuffer {
             },
         };
 
-        let sender = route_promise(&promise, self);
+        let sender = route_promise(
+            &promise,
+            self,
+            self.global().task_manager().dom_manipulation_task_source(),
+        );
         if let Err(e) = self.channel.0.send(WebGPURequest::BufferMapAsync {
             sender,
             buffer_id: self.buffer.0,
@@ -309,8 +313,8 @@ impl GPUBufferMethods<crate::DomTypeHolder> for GPUBuffer {
         let mut mapping = self.mapping.borrow_mut();
         let mapping = mapping.as_mut().ok_or(Error::Operation)?;
 
-        let valid = offset % wgt::MAP_ALIGNMENT == 0 &&
-            range_size % wgt::COPY_BUFFER_ALIGNMENT == 0 &&
+        let valid = offset % wgpu_types::MAP_ALIGNMENT == 0 &&
+            range_size % wgpu_types::COPY_BUFFER_ALIGNMENT == 0 &&
             offset >= mapping.range.start &&
             offset + range_size <= mapping.range.end;
         if !valid {
diff --git a/components/script/dom/webgpu/gpucanvascontext.rs b/components/script/dom/webgpu/gpucanvascontext.rs
index 00bdcbec64c..359b1b14003 100644
--- a/components/script/dom/webgpu/gpucanvascontext.rs
+++ b/components/script/dom/webgpu/gpucanvascontext.rs
@@ -7,15 +7,15 @@ use std::cell::RefCell;
 
 use arrayvec::ArrayVec;
 use dom_struct::dom_struct;
-use ipc_channel::ipc::{self, IpcSharedMemory};
-use script_layout_interface::HTMLCanvasDataSource;
-use webgpu::swapchain::WebGPUContextId;
-use webgpu::wgc::id;
-use webgpu::{
-    ContextConfiguration, PRESENTATION_BUFFER_COUNT, WebGPU, WebGPURequest, WebGPUTexture,
+use ipc_channel::ipc::{self};
+use snapshot::Snapshot;
+use webgpu_traits::{
+    ContextConfiguration, PRESENTATION_BUFFER_COUNT, WebGPU, WebGPUContextId, WebGPURequest,
+    WebGPUTexture,
 };
 use webrender_api::ImageKey;
 use webrender_api::units::DeviceIntSize;
+use wgpu_core::id;
 
 use super::gpuconvert::convert_texture_descriptor;
 use super::gputexture::GPUTexture;
@@ -226,11 +226,11 @@ impl GPUCanvasContext {
 
 // Internal helper methods
 impl GPUCanvasContext {
-    fn layout_handle(&self) -> HTMLCanvasDataSource {
+    fn layout_handle(&self) -> Option<ImageKey> {
         if self.drawing_buffer.borrow().cleared {
-            HTMLCanvasDataSource::Empty
+            None
         } else {
-            HTMLCanvasDataSource::WebGPU(self.webrender_image)
+            Some(self.webrender_image)
         }
     }
 
@@ -277,10 +277,10 @@ impl CanvasContext for GPUCanvasContext {
     }
 
     /// <https://gpuweb.github.io/gpuweb/#ref-for-abstract-opdef-get-a-copy-of-the-image-contents-of-a-context%E2%91%A5>
-    fn get_image_data_as_shared_memory(&self) -> Option<IpcSharedMemory> {
+    fn get_image_data(&self) -> Option<Snapshot> {
         // 1. Return a copy of the image contents of context.
         Some(if self.drawing_buffer.borrow().cleared {
-            IpcSharedMemory::from_byte(0, self.size().area() as usize * 4)
+            Snapshot::cleared(self.size())
         } else {
             let (sender, receiver) = ipc::channel().unwrap();
             self.channel
@@ -290,7 +290,7 @@ impl CanvasContext for GPUCanvasContext {
                     sender,
                 })
                 .unwrap();
-            receiver.recv().unwrap()
+            receiver.recv().unwrap().to_owned()
         })
     }
 
@@ -300,7 +300,7 @@ impl CanvasContext for GPUCanvasContext {
 }
 
 impl LayoutCanvasRenderingContextHelpers for LayoutDom<'_, GPUCanvasContext> {
-    fn canvas_data_source(self) -> HTMLCanvasDataSource {
+    fn canvas_data_source(self) -> Option<ImageKey> {
         (*self.unsafe_get()).layout_handle()
     }
 }
diff --git a/components/script/dom/webgpu/gpucommandbuffer.rs b/components/script/dom/webgpu/gpucommandbuffer.rs
index e014599e34e..4c122e4b237 100644
--- a/components/script/dom/webgpu/gpucommandbuffer.rs
+++ b/components/script/dom/webgpu/gpucommandbuffer.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use webgpu::{WebGPU, WebGPUCommandBuffer, WebGPURequest};
+use webgpu_traits::{WebGPU, WebGPUCommandBuffer, WebGPURequest};
 
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::WebGPUBinding::GPUCommandBufferMethods;
diff --git a/components/script/dom/webgpu/gpucommandencoder.rs b/components/script/dom/webgpu/gpucommandencoder.rs
index 7d99c4f2bfb..2dc743373d4 100644
--- a/components/script/dom/webgpu/gpucommandencoder.rs
+++ b/components/script/dom/webgpu/gpucommandencoder.rs
@@ -3,11 +3,11 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use webgpu::wgc::command as wgpu_com;
-use webgpu::{
+use webgpu_traits::{
     WebGPU, WebGPUCommandBuffer, WebGPUCommandEncoder, WebGPUComputePass, WebGPUDevice,
-    WebGPURenderPass, WebGPURequest, wgt,
+    WebGPURenderPass, WebGPURequest,
 };
+use wgpu_core::command as wgpu_com;
 
 use crate::conversions::{Convert, TryConvert};
 use crate::dom::bindings::cell::DomRefCell;
@@ -97,7 +97,7 @@ impl GPUCommandEncoder {
             .send(WebGPURequest::CreateCommandEncoder {
                 device_id: device.id().0,
                 command_encoder_id,
-                desc: wgt::CommandEncoderDescriptor {
+                desc: wgpu_types::CommandEncoderDescriptor {
                     label: (&descriptor.parent).convert(),
                 },
             })
@@ -312,7 +312,7 @@ impl GPUCommandEncoderMethods<crate::DomTypeHolder> for GPUCommandEncoder {
             .send(WebGPURequest::CommandEncoderFinish {
                 command_encoder_id: self.encoder.0,
                 device_id: self.device.id().0,
-                desc: wgt::CommandBufferDescriptor {
+                desc: wgpu_types::CommandBufferDescriptor {
                     label: (&descriptor.parent).convert(),
                 },
             })
diff --git a/components/script/dom/webgpu/gpucompilationinfo.rs b/components/script/dom/webgpu/gpucompilationinfo.rs
index ae092479f2b..0969e06970f 100644
--- a/components/script/dom/webgpu/gpucompilationinfo.rs
+++ b/components/script/dom/webgpu/gpucompilationinfo.rs
@@ -4,7 +4,7 @@
 
 use dom_struct::dom_struct;
 use js::rust::MutableHandleValue;
-use webgpu::ShaderCompilationInfo;
+use webgpu_traits::ShaderCompilationInfo;
 
 use crate::dom::bindings::codegen::Bindings::WebGPUBinding::GPUCompilationInfoMethods;
 use crate::dom::bindings::reflector::{Reflector, reflect_dom_object_with_proto};
diff --git a/components/script/dom/webgpu/gpucompilationmessage.rs b/components/script/dom/webgpu/gpucompilationmessage.rs
index 74094030f2b..7ffbebd5cb0 100644
--- a/components/script/dom/webgpu/gpucompilationmessage.rs
+++ b/components/script/dom/webgpu/gpucompilationmessage.rs
@@ -5,7 +5,7 @@
 #![allow(dead_code)] // this file is stub as wgpu does not provide info
 
 use dom_struct::dom_struct;
-use webgpu::ShaderCompilationInfo;
+use webgpu_traits::ShaderCompilationInfo;
 
 use crate::dom::bindings::codegen::Bindings::WebGPUBinding::{
     GPUCompilationMessageMethods, GPUCompilationMessageType,
diff --git a/components/script/dom/webgpu/gpucomputepassencoder.rs b/components/script/dom/webgpu/gpucomputepassencoder.rs
index fba1af44a96..3534de74d74 100644
--- a/components/script/dom/webgpu/gpucomputepassencoder.rs
+++ b/components/script/dom/webgpu/gpucomputepassencoder.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use webgpu::{WebGPU, WebGPUComputePass, WebGPURequest};
+use webgpu_traits::{WebGPU, WebGPUComputePass, WebGPURequest};
 
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::WebGPUBinding::GPUComputePassEncoderMethods;
diff --git a/components/script/dom/webgpu/gpucomputepipeline.rs b/components/script/dom/webgpu/gpucomputepipeline.rs
index fb6ac7b01e7..312996d3909 100644
--- a/components/script/dom/webgpu/gpucomputepipeline.rs
+++ b/components/script/dom/webgpu/gpucomputepipeline.rs
@@ -4,11 +4,11 @@
 
 use dom_struct::dom_struct;
 use ipc_channel::ipc::IpcSender;
-use webgpu::wgc::pipeline::ComputePipelineDescriptor;
-use webgpu::{
+use webgpu_traits::{
     WebGPU, WebGPUBindGroupLayout, WebGPUComputePipeline, WebGPUComputePipelineResponse,
     WebGPURequest,
 };
+use wgpu_core::pipeline::ComputePipelineDescriptor;
 
 use crate::conversions::Convert;
 use crate::dom::bindings::cell::DomRefCell;
diff --git a/components/script/dom/webgpu/gpuconvert.rs b/components/script/dom/webgpu/gpuconvert.rs
index fbc507a45ee..8ed8c4d85be 100644
--- a/components/script/dom/webgpu/gpuconvert.rs
+++ b/components/script/dom/webgpu/gpuconvert.rs
@@ -5,11 +5,11 @@
 use std::borrow::Cow;
 use std::num::NonZeroU64;
 
-use webgpu::wgc::binding_model::{BindGroupEntry, BindingResource, BufferBinding};
-use webgpu::wgc::command as wgpu_com;
-use webgpu::wgc::pipeline::ProgrammableStageDescriptor;
-use webgpu::wgc::resource::TextureDescriptor;
-use webgpu::wgt::{self, AstcBlock, AstcChannel};
+use wgpu_core::binding_model::{BindGroupEntry, BindingResource, BufferBinding};
+use wgpu_core::command as wgpu_com;
+use wgpu_core::pipeline::ProgrammableStageDescriptor;
+use wgpu_core::resource::TextureDescriptor;
+use wgpu_types::{self, AstcBlock, AstcChannel};
 
 use crate::conversions::{Convert, TryConvert};
 use crate::dom::bindings::codegen::Bindings::WebGPUBinding::{
@@ -25,185 +25,191 @@ use crate::dom::bindings::codegen::Bindings::WebGPUBinding::{
 use crate::dom::bindings::error::{Error, Fallible};
 use crate::dom::types::GPUDevice;
 
-impl Convert<wgt::TextureFormat> for GPUTextureFormat {
-    fn convert(self) -> wgt::TextureFormat {
+impl Convert<wgpu_types::TextureFormat> for GPUTextureFormat {
+    fn convert(self) -> wgpu_types::TextureFormat {
         match self {
-            GPUTextureFormat::R8unorm => wgt::TextureFormat::R8Unorm,
-            GPUTextureFormat::R8snorm => wgt::TextureFormat::R8Snorm,
-            GPUTextureFormat::R8uint => wgt::TextureFormat::R8Uint,
-            GPUTextureFormat::R8sint => wgt::TextureFormat::R8Sint,
-            GPUTextureFormat::R16uint => wgt::TextureFormat::R16Uint,
-            GPUTextureFormat::R16sint => wgt::TextureFormat::R16Sint,
-            GPUTextureFormat::R16float => wgt::TextureFormat::R16Float,
-            GPUTextureFormat::Rg8unorm => wgt::TextureFormat::Rg8Unorm,
-            GPUTextureFormat::Rg8snorm => wgt::TextureFormat::Rg8Snorm,
-            GPUTextureFormat::Rg8uint => wgt::TextureFormat::Rg8Uint,
-            GPUTextureFormat::Rg8sint => wgt::TextureFormat::Rg8Sint,
-            GPUTextureFormat::R32uint => wgt::TextureFormat::R32Uint,
-            GPUTextureFormat::R32sint => wgt::TextureFormat::R32Sint,
-            GPUTextureFormat::R32float => wgt::TextureFormat::R32Float,
-            GPUTextureFormat::Rg16uint => wgt::TextureFormat::Rg16Uint,
-            GPUTextureFormat::Rg16sint => wgt::TextureFormat::Rg16Sint,
-            GPUTextureFormat::Rg16float => wgt::TextureFormat::Rg16Float,
-            GPUTextureFormat::Rgba8unorm => wgt::TextureFormat::Rgba8Unorm,
-            GPUTextureFormat::Rgba8unorm_srgb => wgt::TextureFormat::Rgba8UnormSrgb,
-            GPUTextureFormat::Rgba8snorm => wgt::TextureFormat::Rgba8Snorm,
-            GPUTextureFormat::Rgba8uint => wgt::TextureFormat::Rgba8Uint,
-            GPUTextureFormat::Rgba8sint => wgt::TextureFormat::Rgba8Sint,
-            GPUTextureFormat::Bgra8unorm => wgt::TextureFormat::Bgra8Unorm,
-            GPUTextureFormat::Bgra8unorm_srgb => wgt::TextureFormat::Bgra8UnormSrgb,
-            GPUTextureFormat::Rgb10a2unorm => wgt::TextureFormat::Rgb10a2Unorm,
-            GPUTextureFormat::Rg32uint => wgt::TextureFormat::Rg32Uint,
-            GPUTextureFormat::Rg32sint => wgt::TextureFormat::Rg32Sint,
-            GPUTextureFormat::Rg32float => wgt::TextureFormat::Rg32Float,
-            GPUTextureFormat::Rgba16uint => wgt::TextureFormat::Rgba16Uint,
-            GPUTextureFormat::Rgba16sint => wgt::TextureFormat::Rgba16Sint,
-            GPUTextureFormat::Rgba16float => wgt::TextureFormat::Rgba16Float,
-            GPUTextureFormat::Rgba32uint => wgt::TextureFormat::Rgba32Uint,
-            GPUTextureFormat::Rgba32sint => wgt::TextureFormat::Rgba32Sint,
-            GPUTextureFormat::Rgba32float => wgt::TextureFormat::Rgba32Float,
-            GPUTextureFormat::Depth32float => wgt::TextureFormat::Depth32Float,
-            GPUTextureFormat::Depth24plus => wgt::TextureFormat::Depth24Plus,
-            GPUTextureFormat::Depth24plus_stencil8 => wgt::TextureFormat::Depth24PlusStencil8,
-            GPUTextureFormat::Bc1_rgba_unorm => wgt::TextureFormat::Bc1RgbaUnorm,
-            GPUTextureFormat::Bc1_rgba_unorm_srgb => wgt::TextureFormat::Bc1RgbaUnormSrgb,
-            GPUTextureFormat::Bc2_rgba_unorm => wgt::TextureFormat::Bc2RgbaUnorm,
-            GPUTextureFormat::Bc2_rgba_unorm_srgb => wgt::TextureFormat::Bc2RgbaUnormSrgb,
-            GPUTextureFormat::Bc3_rgba_unorm => wgt::TextureFormat::Bc3RgbaUnorm,
-            GPUTextureFormat::Bc3_rgba_unorm_srgb => wgt::TextureFormat::Bc3RgbaUnormSrgb,
-            GPUTextureFormat::Bc4_r_unorm => wgt::TextureFormat::Bc4RUnorm,
-            GPUTextureFormat::Bc4_r_snorm => wgt::TextureFormat::Bc4RSnorm,
-            GPUTextureFormat::Bc5_rg_unorm => wgt::TextureFormat::Bc5RgUnorm,
-            GPUTextureFormat::Bc5_rg_snorm => wgt::TextureFormat::Bc5RgSnorm,
-            GPUTextureFormat::Bc6h_rgb_ufloat => wgt::TextureFormat::Bc6hRgbUfloat,
-            GPUTextureFormat::Bc7_rgba_unorm => wgt::TextureFormat::Bc7RgbaUnorm,
-            GPUTextureFormat::Bc7_rgba_unorm_srgb => wgt::TextureFormat::Bc7RgbaUnormSrgb,
-            GPUTextureFormat::Bc6h_rgb_float => wgt::TextureFormat::Bc6hRgbFloat,
-            GPUTextureFormat::Rgb9e5ufloat => wgt::TextureFormat::Rgb9e5Ufloat,
-            GPUTextureFormat::Rgb10a2uint => wgt::TextureFormat::Rgb10a2Uint,
-            GPUTextureFormat::Rg11b10ufloat => wgt::TextureFormat::Rg11b10Ufloat,
-            GPUTextureFormat::Stencil8 => wgt::TextureFormat::Stencil8,
-            GPUTextureFormat::Depth16unorm => wgt::TextureFormat::Depth16Unorm,
-            GPUTextureFormat::Depth32float_stencil8 => wgt::TextureFormat::Depth32FloatStencil8,
-            GPUTextureFormat::Etc2_rgb8unorm => wgt::TextureFormat::Etc2Rgb8Unorm,
-            GPUTextureFormat::Etc2_rgb8unorm_srgb => wgt::TextureFormat::Etc2Rgb8UnormSrgb,
-            GPUTextureFormat::Etc2_rgb8a1unorm => wgt::TextureFormat::Etc2Rgb8A1Unorm,
-            GPUTextureFormat::Etc2_rgb8a1unorm_srgb => wgt::TextureFormat::Etc2Rgb8A1UnormSrgb,
-            GPUTextureFormat::Etc2_rgba8unorm => wgt::TextureFormat::Etc2Rgba8Unorm,
-            GPUTextureFormat::Etc2_rgba8unorm_srgb => wgt::TextureFormat::Etc2Rgba8UnormSrgb,
-            GPUTextureFormat::Eac_r11unorm => wgt::TextureFormat::EacR11Unorm,
-            GPUTextureFormat::Eac_r11snorm => wgt::TextureFormat::EacR11Snorm,
-            GPUTextureFormat::Eac_rg11unorm => wgt::TextureFormat::EacRg11Unorm,
-            GPUTextureFormat::Eac_rg11snorm => wgt::TextureFormat::EacRg11Snorm,
-            GPUTextureFormat::Astc_4x4_unorm => wgt::TextureFormat::Astc {
+            GPUTextureFormat::R8unorm => wgpu_types::TextureFormat::R8Unorm,
+            GPUTextureFormat::R8snorm => wgpu_types::TextureFormat::R8Snorm,
+            GPUTextureFormat::R8uint => wgpu_types::TextureFormat::R8Uint,
+            GPUTextureFormat::R8sint => wgpu_types::TextureFormat::R8Sint,
+            GPUTextureFormat::R16uint => wgpu_types::TextureFormat::R16Uint,
+            GPUTextureFormat::R16sint => wgpu_types::TextureFormat::R16Sint,
+            GPUTextureFormat::R16float => wgpu_types::TextureFormat::R16Float,
+            GPUTextureFormat::Rg8unorm => wgpu_types::TextureFormat::Rg8Unorm,
+            GPUTextureFormat::Rg8snorm => wgpu_types::TextureFormat::Rg8Snorm,
+            GPUTextureFormat::Rg8uint => wgpu_types::TextureFormat::Rg8Uint,
+            GPUTextureFormat::Rg8sint => wgpu_types::TextureFormat::Rg8Sint,
+            GPUTextureFormat::R32uint => wgpu_types::TextureFormat::R32Uint,
+            GPUTextureFormat::R32sint => wgpu_types::TextureFormat::R32Sint,
+            GPUTextureFormat::R32float => wgpu_types::TextureFormat::R32Float,
+            GPUTextureFormat::Rg16uint => wgpu_types::TextureFormat::Rg16Uint,
+            GPUTextureFormat::Rg16sint => wgpu_types::TextureFormat::Rg16Sint,
+            GPUTextureFormat::Rg16float => wgpu_types::TextureFormat::Rg16Float,
+            GPUTextureFormat::Rgba8unorm => wgpu_types::TextureFormat::Rgba8Unorm,
+            GPUTextureFormat::Rgba8unorm_srgb => wgpu_types::TextureFormat::Rgba8UnormSrgb,
+            GPUTextureFormat::Rgba8snorm => wgpu_types::TextureFormat::Rgba8Snorm,
+            GPUTextureFormat::Rgba8uint => wgpu_types::TextureFormat::Rgba8Uint,
+            GPUTextureFormat::Rgba8sint => wgpu_types::TextureFormat::Rgba8Sint,
+            GPUTextureFormat::Bgra8unorm => wgpu_types::TextureFormat::Bgra8Unorm,
+            GPUTextureFormat::Bgra8unorm_srgb => wgpu_types::TextureFormat::Bgra8UnormSrgb,
+            GPUTextureFormat::Rgb10a2unorm => wgpu_types::TextureFormat::Rgb10a2Unorm,
+            GPUTextureFormat::Rg32uint => wgpu_types::TextureFormat::Rg32Uint,
+            GPUTextureFormat::Rg32sint => wgpu_types::TextureFormat::Rg32Sint,
+            GPUTextureFormat::Rg32float => wgpu_types::TextureFormat::Rg32Float,
+            GPUTextureFormat::Rgba16uint => wgpu_types::TextureFormat::Rgba16Uint,
+            GPUTextureFormat::Rgba16sint => wgpu_types::TextureFormat::Rgba16Sint,
+            GPUTextureFormat::Rgba16float => wgpu_types::TextureFormat::Rgba16Float,
+            GPUTextureFormat::Rgba32uint => wgpu_types::TextureFormat::Rgba32Uint,
+            GPUTextureFormat::Rgba32sint => wgpu_types::TextureFormat::Rgba32Sint,
+            GPUTextureFormat::Rgba32float => wgpu_types::TextureFormat::Rgba32Float,
+            GPUTextureFormat::Depth32float => wgpu_types::TextureFormat::Depth32Float,
+            GPUTextureFormat::Depth24plus => wgpu_types::TextureFormat::Depth24Plus,
+            GPUTextureFormat::Depth24plus_stencil8 => {
+                wgpu_types::TextureFormat::Depth24PlusStencil8
+            },
+            GPUTextureFormat::Bc1_rgba_unorm => wgpu_types::TextureFormat::Bc1RgbaUnorm,
+            GPUTextureFormat::Bc1_rgba_unorm_srgb => wgpu_types::TextureFormat::Bc1RgbaUnormSrgb,
+            GPUTextureFormat::Bc2_rgba_unorm => wgpu_types::TextureFormat::Bc2RgbaUnorm,
+            GPUTextureFormat::Bc2_rgba_unorm_srgb => wgpu_types::TextureFormat::Bc2RgbaUnormSrgb,
+            GPUTextureFormat::Bc3_rgba_unorm => wgpu_types::TextureFormat::Bc3RgbaUnorm,
+            GPUTextureFormat::Bc3_rgba_unorm_srgb => wgpu_types::TextureFormat::Bc3RgbaUnormSrgb,
+            GPUTextureFormat::Bc4_r_unorm => wgpu_types::TextureFormat::Bc4RUnorm,
+            GPUTextureFormat::Bc4_r_snorm => wgpu_types::TextureFormat::Bc4RSnorm,
+            GPUTextureFormat::Bc5_rg_unorm => wgpu_types::TextureFormat::Bc5RgUnorm,
+            GPUTextureFormat::Bc5_rg_snorm => wgpu_types::TextureFormat::Bc5RgSnorm,
+            GPUTextureFormat::Bc6h_rgb_ufloat => wgpu_types::TextureFormat::Bc6hRgbUfloat,
+            GPUTextureFormat::Bc7_rgba_unorm => wgpu_types::TextureFormat::Bc7RgbaUnorm,
+            GPUTextureFormat::Bc7_rgba_unorm_srgb => wgpu_types::TextureFormat::Bc7RgbaUnormSrgb,
+            GPUTextureFormat::Bc6h_rgb_float => wgpu_types::TextureFormat::Bc6hRgbFloat,
+            GPUTextureFormat::Rgb9e5ufloat => wgpu_types::TextureFormat::Rgb9e5Ufloat,
+            GPUTextureFormat::Rgb10a2uint => wgpu_types::TextureFormat::Rgb10a2Uint,
+            GPUTextureFormat::Rg11b10ufloat => wgpu_types::TextureFormat::Rg11b10Ufloat,
+            GPUTextureFormat::Stencil8 => wgpu_types::TextureFormat::Stencil8,
+            GPUTextureFormat::Depth16unorm => wgpu_types::TextureFormat::Depth16Unorm,
+            GPUTextureFormat::Depth32float_stencil8 => {
+                wgpu_types::TextureFormat::Depth32FloatStencil8
+            },
+            GPUTextureFormat::Etc2_rgb8unorm => wgpu_types::TextureFormat::Etc2Rgb8Unorm,
+            GPUTextureFormat::Etc2_rgb8unorm_srgb => wgpu_types::TextureFormat::Etc2Rgb8UnormSrgb,
+            GPUTextureFormat::Etc2_rgb8a1unorm => wgpu_types::TextureFormat::Etc2Rgb8A1Unorm,
+            GPUTextureFormat::Etc2_rgb8a1unorm_srgb => {
+                wgpu_types::TextureFormat::Etc2Rgb8A1UnormSrgb
+            },
+            GPUTextureFormat::Etc2_rgba8unorm => wgpu_types::TextureFormat::Etc2Rgba8Unorm,
+            GPUTextureFormat::Etc2_rgba8unorm_srgb => wgpu_types::TextureFormat::Etc2Rgba8UnormSrgb,
+            GPUTextureFormat::Eac_r11unorm => wgpu_types::TextureFormat::EacR11Unorm,
+            GPUTextureFormat::Eac_r11snorm => wgpu_types::TextureFormat::EacR11Snorm,
+            GPUTextureFormat::Eac_rg11unorm => wgpu_types::TextureFormat::EacRg11Unorm,
+            GPUTextureFormat::Eac_rg11snorm => wgpu_types::TextureFormat::EacRg11Snorm,
+            GPUTextureFormat::Astc_4x4_unorm => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B4x4,
                 channel: AstcChannel::Unorm,
             },
-            GPUTextureFormat::Astc_4x4_unorm_srgb => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_4x4_unorm_srgb => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B4x4,
                 channel: AstcChannel::UnormSrgb,
             },
-            GPUTextureFormat::Astc_5x4_unorm => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_5x4_unorm => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B5x4,
                 channel: AstcChannel::Unorm,
             },
-            GPUTextureFormat::Astc_5x4_unorm_srgb => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_5x4_unorm_srgb => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B5x4,
                 channel: AstcChannel::UnormSrgb,
             },
-            GPUTextureFormat::Astc_5x5_unorm => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_5x5_unorm => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B5x5,
                 channel: AstcChannel::Unorm,
             },
-            GPUTextureFormat::Astc_5x5_unorm_srgb => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_5x5_unorm_srgb => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B5x5,
                 channel: AstcChannel::UnormSrgb,
             },
-            GPUTextureFormat::Astc_6x5_unorm => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_6x5_unorm => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B6x5,
                 channel: AstcChannel::Unorm,
             },
-            GPUTextureFormat::Astc_6x5_unorm_srgb => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_6x5_unorm_srgb => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B6x5,
                 channel: AstcChannel::UnormSrgb,
             },
-            GPUTextureFormat::Astc_6x6_unorm => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_6x6_unorm => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B6x6,
                 channel: AstcChannel::Unorm,
             },
-            GPUTextureFormat::Astc_6x6_unorm_srgb => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_6x6_unorm_srgb => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B6x6,
                 channel: AstcChannel::UnormSrgb,
             },
-            GPUTextureFormat::Astc_8x5_unorm => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_8x5_unorm => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B8x5,
                 channel: AstcChannel::Unorm,
             },
-            GPUTextureFormat::Astc_8x5_unorm_srgb => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_8x5_unorm_srgb => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B8x5,
                 channel: AstcChannel::UnormSrgb,
             },
-            GPUTextureFormat::Astc_8x6_unorm => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_8x6_unorm => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B8x6,
                 channel: AstcChannel::Unorm,
             },
-            GPUTextureFormat::Astc_8x6_unorm_srgb => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_8x6_unorm_srgb => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B8x6,
                 channel: AstcChannel::UnormSrgb,
             },
-            GPUTextureFormat::Astc_8x8_unorm => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_8x8_unorm => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B8x8,
                 channel: AstcChannel::Unorm,
             },
-            GPUTextureFormat::Astc_8x8_unorm_srgb => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_8x8_unorm_srgb => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B8x8,
                 channel: AstcChannel::UnormSrgb,
             },
-            GPUTextureFormat::Astc_10x5_unorm => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_10x5_unorm => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B10x5,
                 channel: AstcChannel::Unorm,
             },
-            GPUTextureFormat::Astc_10x5_unorm_srgb => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_10x5_unorm_srgb => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B10x5,
                 channel: AstcChannel::UnormSrgb,
             },
-            GPUTextureFormat::Astc_10x6_unorm => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_10x6_unorm => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B10x6,
                 channel: AstcChannel::Unorm,
             },
-            GPUTextureFormat::Astc_10x6_unorm_srgb => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_10x6_unorm_srgb => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B10x6,
                 channel: AstcChannel::UnormSrgb,
             },
-            GPUTextureFormat::Astc_10x8_unorm => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_10x8_unorm => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B10x8,
                 channel: AstcChannel::Unorm,
             },
-            GPUTextureFormat::Astc_10x8_unorm_srgb => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_10x8_unorm_srgb => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B10x8,
                 channel: AstcChannel::UnormSrgb,
             },
-            GPUTextureFormat::Astc_10x10_unorm => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_10x10_unorm => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B10x10,
                 channel: AstcChannel::Unorm,
             },
-            GPUTextureFormat::Astc_10x10_unorm_srgb => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_10x10_unorm_srgb => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B10x10,
                 channel: AstcChannel::UnormSrgb,
             },
-            GPUTextureFormat::Astc_12x10_unorm => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_12x10_unorm => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B12x10,
                 channel: AstcChannel::Unorm,
             },
-            GPUTextureFormat::Astc_12x10_unorm_srgb => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_12x10_unorm_srgb => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B12x10,
                 channel: AstcChannel::UnormSrgb,
             },
-            GPUTextureFormat::Astc_12x12_unorm => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_12x12_unorm => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B12x12,
                 channel: AstcChannel::Unorm,
             },
-            GPUTextureFormat::Astc_12x12_unorm_srgb => wgt::TextureFormat::Astc {
+            GPUTextureFormat::Astc_12x12_unorm_srgb => wgpu_types::TextureFormat::Astc {
                 block: AstcBlock::B12x12,
                 channel: AstcChannel::UnormSrgb,
             },
@@ -211,12 +217,12 @@ impl Convert<wgt::TextureFormat> for GPUTextureFormat {
     }
 }
 
-impl TryConvert<wgt::Extent3d> for &GPUExtent3D {
+impl TryConvert<wgpu_types::Extent3d> for &GPUExtent3D {
     type Error = Error;
 
-    fn try_convert(self) -> Result<wgt::Extent3d, Self::Error> {
+    fn try_convert(self) -> Result<wgpu_types::Extent3d, Self::Error> {
         match *self {
-            GPUExtent3D::GPUExtent3DDict(ref dict) => Ok(wgt::Extent3d {
+            GPUExtent3D::GPUExtent3DDict(ref dict) => Ok(wgpu_types::Extent3d {
                 width: dict.width,
                 height: dict.height,
                 depth_or_array_layers: dict.depthOrArrayLayers,
@@ -228,7 +234,7 @@ impl TryConvert<wgt::Extent3d> for &GPUExtent3D {
                         "GPUExtent3D size must be between 1 and 3 (inclusive)".to_string(),
                     ))
                 } else {
-                    Ok(wgt::Extent3d {
+                    Ok(wgpu_types::Extent3d {
                         width: v[0],
                         height: v.get(1).copied().unwrap_or(1),
                         depth_or_array_layers: v.get(2).copied().unwrap_or(1),
@@ -239,71 +245,71 @@ impl TryConvert<wgt::Extent3d> for &GPUExtent3D {
     }
 }
 
-impl Convert<wgt::TexelCopyBufferLayout> for &GPUImageDataLayout {
-    fn convert(self) -> wgt::TexelCopyBufferLayout {
-        wgt::TexelCopyBufferLayout {
-            offset: self.offset as wgt::BufferAddress,
+impl Convert<wgpu_types::TexelCopyBufferLayout> for &GPUImageDataLayout {
+    fn convert(self) -> wgpu_types::TexelCopyBufferLayout {
+        wgpu_types::TexelCopyBufferLayout {
+            offset: self.offset as wgpu_types::BufferAddress,
             bytes_per_row: self.bytesPerRow,
             rows_per_image: self.rowsPerImage,
         }
     }
 }
 
-impl Convert<wgt::VertexFormat> for GPUVertexFormat {
-    fn convert(self) -> wgt::VertexFormat {
+impl Convert<wgpu_types::VertexFormat> for GPUVertexFormat {
+    fn convert(self) -> wgpu_types::VertexFormat {
         match self {
-            GPUVertexFormat::Uint8x2 => wgt::VertexFormat::Uint8x2,
-            GPUVertexFormat::Uint8x4 => wgt::VertexFormat::Uint8x4,
-            GPUVertexFormat::Sint8x2 => wgt::VertexFormat::Sint8x2,
-            GPUVertexFormat::Sint8x4 => wgt::VertexFormat::Sint8x4,
-            GPUVertexFormat::Unorm8x2 => wgt::VertexFormat::Unorm8x2,
-            GPUVertexFormat::Unorm8x4 => wgt::VertexFormat::Unorm8x4,
-            GPUVertexFormat::Snorm8x2 => wgt::VertexFormat::Unorm8x2,
-            GPUVertexFormat::Snorm8x4 => wgt::VertexFormat::Unorm8x4,
-            GPUVertexFormat::Uint16x2 => wgt::VertexFormat::Uint16x2,
-            GPUVertexFormat::Uint16x4 => wgt::VertexFormat::Uint16x4,
-            GPUVertexFormat::Sint16x2 => wgt::VertexFormat::Sint16x2,
-            GPUVertexFormat::Sint16x4 => wgt::VertexFormat::Sint16x4,
-            GPUVertexFormat::Unorm16x2 => wgt::VertexFormat::Unorm16x2,
-            GPUVertexFormat::Unorm16x4 => wgt::VertexFormat::Unorm16x4,
-            GPUVertexFormat::Snorm16x2 => wgt::VertexFormat::Snorm16x2,
-            GPUVertexFormat::Snorm16x4 => wgt::VertexFormat::Snorm16x4,
-            GPUVertexFormat::Float16x2 => wgt::VertexFormat::Float16x2,
-            GPUVertexFormat::Float16x4 => wgt::VertexFormat::Float16x4,
-            GPUVertexFormat::Float32 => wgt::VertexFormat::Float32,
-            GPUVertexFormat::Float32x2 => wgt::VertexFormat::Float32x2,
-            GPUVertexFormat::Float32x3 => wgt::VertexFormat::Float32x3,
-            GPUVertexFormat::Float32x4 => wgt::VertexFormat::Float32x4,
-            GPUVertexFormat::Uint32 => wgt::VertexFormat::Uint32,
-            GPUVertexFormat::Uint32x2 => wgt::VertexFormat::Uint32x2,
-            GPUVertexFormat::Uint32x3 => wgt::VertexFormat::Uint32x3,
-            GPUVertexFormat::Uint32x4 => wgt::VertexFormat::Uint32x4,
-            GPUVertexFormat::Sint32 => wgt::VertexFormat::Sint32,
-            GPUVertexFormat::Sint32x2 => wgt::VertexFormat::Sint32x2,
-            GPUVertexFormat::Sint32x3 => wgt::VertexFormat::Sint32x3,
-            GPUVertexFormat::Sint32x4 => wgt::VertexFormat::Sint32x4,
+            GPUVertexFormat::Uint8x2 => wgpu_types::VertexFormat::Uint8x2,
+            GPUVertexFormat::Uint8x4 => wgpu_types::VertexFormat::Uint8x4,
+            GPUVertexFormat::Sint8x2 => wgpu_types::VertexFormat::Sint8x2,
+            GPUVertexFormat::Sint8x4 => wgpu_types::VertexFormat::Sint8x4,
+            GPUVertexFormat::Unorm8x2 => wgpu_types::VertexFormat::Unorm8x2,
+            GPUVertexFormat::Unorm8x4 => wgpu_types::VertexFormat::Unorm8x4,
+            GPUVertexFormat::Snorm8x2 => wgpu_types::VertexFormat::Unorm8x2,
+            GPUVertexFormat::Snorm8x4 => wgpu_types::VertexFormat::Unorm8x4,
+            GPUVertexFormat::Uint16x2 => wgpu_types::VertexFormat::Uint16x2,
+            GPUVertexFormat::Uint16x4 => wgpu_types::VertexFormat::Uint16x4,
+            GPUVertexFormat::Sint16x2 => wgpu_types::VertexFormat::Sint16x2,
+            GPUVertexFormat::Sint16x4 => wgpu_types::VertexFormat::Sint16x4,
+            GPUVertexFormat::Unorm16x2 => wgpu_types::VertexFormat::Unorm16x2,
+            GPUVertexFormat::Unorm16x4 => wgpu_types::VertexFormat::Unorm16x4,
+            GPUVertexFormat::Snorm16x2 => wgpu_types::VertexFormat::Snorm16x2,
+            GPUVertexFormat::Snorm16x4 => wgpu_types::VertexFormat::Snorm16x4,
+            GPUVertexFormat::Float16x2 => wgpu_types::VertexFormat::Float16x2,
+            GPUVertexFormat::Float16x4 => wgpu_types::VertexFormat::Float16x4,
+            GPUVertexFormat::Float32 => wgpu_types::VertexFormat::Float32,
+            GPUVertexFormat::Float32x2 => wgpu_types::VertexFormat::Float32x2,
+            GPUVertexFormat::Float32x3 => wgpu_types::VertexFormat::Float32x3,
+            GPUVertexFormat::Float32x4 => wgpu_types::VertexFormat::Float32x4,
+            GPUVertexFormat::Uint32 => wgpu_types::VertexFormat::Uint32,
+            GPUVertexFormat::Uint32x2 => wgpu_types::VertexFormat::Uint32x2,
+            GPUVertexFormat::Uint32x3 => wgpu_types::VertexFormat::Uint32x3,
+            GPUVertexFormat::Uint32x4 => wgpu_types::VertexFormat::Uint32x4,
+            GPUVertexFormat::Sint32 => wgpu_types::VertexFormat::Sint32,
+            GPUVertexFormat::Sint32x2 => wgpu_types::VertexFormat::Sint32x2,
+            GPUVertexFormat::Sint32x3 => wgpu_types::VertexFormat::Sint32x3,
+            GPUVertexFormat::Sint32x4 => wgpu_types::VertexFormat::Sint32x4,
         }
     }
 }
 
-impl Convert<wgt::PrimitiveState> for &GPUPrimitiveState {
-    fn convert(self) -> wgt::PrimitiveState {
-        wgt::PrimitiveState {
+impl Convert<wgpu_types::PrimitiveState> for &GPUPrimitiveState {
+    fn convert(self) -> wgpu_types::PrimitiveState {
+        wgpu_types::PrimitiveState {
             topology: self.topology.convert(),
             strip_index_format: self
                 .stripIndexFormat
                 .map(|index_format| match index_format {
-                    GPUIndexFormat::Uint16 => wgt::IndexFormat::Uint16,
-                    GPUIndexFormat::Uint32 => wgt::IndexFormat::Uint32,
+                    GPUIndexFormat::Uint16 => wgpu_types::IndexFormat::Uint16,
+                    GPUIndexFormat::Uint32 => wgpu_types::IndexFormat::Uint32,
                 }),
             front_face: match self.frontFace {
-                GPUFrontFace::Ccw => wgt::FrontFace::Ccw,
-                GPUFrontFace::Cw => wgt::FrontFace::Cw,
+                GPUFrontFace::Ccw => wgpu_types::FrontFace::Ccw,
+                GPUFrontFace::Cw => wgpu_types::FrontFace::Cw,
             },
             cull_mode: match self.cullMode {
                 GPUCullMode::None => None,
-                GPUCullMode::Front => Some(wgt::Face::Front),
-                GPUCullMode::Back => Some(wgt::Face::Back),
+                GPUCullMode::Front => Some(wgpu_types::Face::Front),
+                GPUCullMode::Back => Some(wgpu_types::Face::Back),
             },
             unclipped_depth: self.clampDepth,
             ..Default::default()
@@ -311,96 +317,96 @@ impl Convert<wgt::PrimitiveState> for &GPUPrimitiveState {
     }
 }
 
-impl Convert<wgt::PrimitiveTopology> for &GPUPrimitiveTopology {
-    fn convert(self) -> wgt::PrimitiveTopology {
+impl Convert<wgpu_types::PrimitiveTopology> for &GPUPrimitiveTopology {
+    fn convert(self) -> wgpu_types::PrimitiveTopology {
         match self {
-            GPUPrimitiveTopology::Point_list => wgt::PrimitiveTopology::PointList,
-            GPUPrimitiveTopology::Line_list => wgt::PrimitiveTopology::LineList,
-            GPUPrimitiveTopology::Line_strip => wgt::PrimitiveTopology::LineStrip,
-            GPUPrimitiveTopology::Triangle_list => wgt::PrimitiveTopology::TriangleList,
-            GPUPrimitiveTopology::Triangle_strip => wgt::PrimitiveTopology::TriangleStrip,
+            GPUPrimitiveTopology::Point_list => wgpu_types::PrimitiveTopology::PointList,
+            GPUPrimitiveTopology::Line_list => wgpu_types::PrimitiveTopology::LineList,
+            GPUPrimitiveTopology::Line_strip => wgpu_types::PrimitiveTopology::LineStrip,
+            GPUPrimitiveTopology::Triangle_list => wgpu_types::PrimitiveTopology::TriangleList,
+            GPUPrimitiveTopology::Triangle_strip => wgpu_types::PrimitiveTopology::TriangleStrip,
         }
     }
 }
 
-impl Convert<wgt::AddressMode> for GPUAddressMode {
-    fn convert(self) -> wgt::AddressMode {
+impl Convert<wgpu_types::AddressMode> for GPUAddressMode {
+    fn convert(self) -> wgpu_types::AddressMode {
         match self {
-            GPUAddressMode::Clamp_to_edge => wgt::AddressMode::ClampToEdge,
-            GPUAddressMode::Repeat => wgt::AddressMode::Repeat,
-            GPUAddressMode::Mirror_repeat => wgt::AddressMode::MirrorRepeat,
+            GPUAddressMode::Clamp_to_edge => wgpu_types::AddressMode::ClampToEdge,
+            GPUAddressMode::Repeat => wgpu_types::AddressMode::Repeat,
+            GPUAddressMode::Mirror_repeat => wgpu_types::AddressMode::MirrorRepeat,
         }
     }
 }
 
-impl Convert<wgt::FilterMode> for GPUFilterMode {
-    fn convert(self) -> wgt::FilterMode {
+impl Convert<wgpu_types::FilterMode> for GPUFilterMode {
+    fn convert(self) -> wgpu_types::FilterMode {
         match self {
-            GPUFilterMode::Nearest => wgt::FilterMode::Nearest,
-            GPUFilterMode::Linear => wgt::FilterMode::Linear,
+            GPUFilterMode::Nearest => wgpu_types::FilterMode::Nearest,
+            GPUFilterMode::Linear => wgpu_types::FilterMode::Linear,
         }
     }
 }
 
-impl Convert<wgt::TextureViewDimension> for GPUTextureViewDimension {
-    fn convert(self) -> wgt::TextureViewDimension {
+impl Convert<wgpu_types::TextureViewDimension> for GPUTextureViewDimension {
+    fn convert(self) -> wgpu_types::TextureViewDimension {
         match self {
-            GPUTextureViewDimension::_1d => wgt::TextureViewDimension::D1,
-            GPUTextureViewDimension::_2d => wgt::TextureViewDimension::D2,
-            GPUTextureViewDimension::_2d_array => wgt::TextureViewDimension::D2Array,
-            GPUTextureViewDimension::Cube => wgt::TextureViewDimension::Cube,
-            GPUTextureViewDimension::Cube_array => wgt::TextureViewDimension::CubeArray,
-            GPUTextureViewDimension::_3d => wgt::TextureViewDimension::D3,
+            GPUTextureViewDimension::_1d => wgpu_types::TextureViewDimension::D1,
+            GPUTextureViewDimension::_2d => wgpu_types::TextureViewDimension::D2,
+            GPUTextureViewDimension::_2d_array => wgpu_types::TextureViewDimension::D2Array,
+            GPUTextureViewDimension::Cube => wgpu_types::TextureViewDimension::Cube,
+            GPUTextureViewDimension::Cube_array => wgpu_types::TextureViewDimension::CubeArray,
+            GPUTextureViewDimension::_3d => wgpu_types::TextureViewDimension::D3,
         }
     }
 }
 
-impl Convert<wgt::CompareFunction> for GPUCompareFunction {
-    fn convert(self) -> wgt::CompareFunction {
+impl Convert<wgpu_types::CompareFunction> for GPUCompareFunction {
+    fn convert(self) -> wgpu_types::CompareFunction {
         match self {
-            GPUCompareFunction::Never => wgt::CompareFunction::Never,
-            GPUCompareFunction::Less => wgt::CompareFunction::Less,
-            GPUCompareFunction::Equal => wgt::CompareFunction::Equal,
-            GPUCompareFunction::Less_equal => wgt::CompareFunction::LessEqual,
-            GPUCompareFunction::Greater => wgt::CompareFunction::Greater,
-            GPUCompareFunction::Not_equal => wgt::CompareFunction::NotEqual,
-            GPUCompareFunction::Greater_equal => wgt::CompareFunction::GreaterEqual,
-            GPUCompareFunction::Always => wgt::CompareFunction::Always,
+            GPUCompareFunction::Never => wgpu_types::CompareFunction::Never,
+            GPUCompareFunction::Less => wgpu_types::CompareFunction::Less,
+            GPUCompareFunction::Equal => wgpu_types::CompareFunction::Equal,
+            GPUCompareFunction::Less_equal => wgpu_types::CompareFunction::LessEqual,
+            GPUCompareFunction::Greater => wgpu_types::CompareFunction::Greater,
+            GPUCompareFunction::Not_equal => wgpu_types::CompareFunction::NotEqual,
+            GPUCompareFunction::Greater_equal => wgpu_types::CompareFunction::GreaterEqual,
+            GPUCompareFunction::Always => wgpu_types::CompareFunction::Always,
         }
     }
 }
 
-impl Convert<wgt::BlendFactor> for &GPUBlendFactor {
-    fn convert(self) -> wgt::BlendFactor {
+impl Convert<wgpu_types::BlendFactor> for &GPUBlendFactor {
+    fn convert(self) -> wgpu_types::BlendFactor {
         match self {
-            GPUBlendFactor::Zero => wgt::BlendFactor::Zero,
-            GPUBlendFactor::One => wgt::BlendFactor::One,
-            GPUBlendFactor::Src => wgt::BlendFactor::Src,
-            GPUBlendFactor::One_minus_src => wgt::BlendFactor::OneMinusSrc,
-            GPUBlendFactor::Src_alpha => wgt::BlendFactor::SrcAlpha,
-            GPUBlendFactor::One_minus_src_alpha => wgt::BlendFactor::OneMinusSrcAlpha,
-            GPUBlendFactor::Dst => wgt::BlendFactor::Dst,
-            GPUBlendFactor::One_minus_dst => wgt::BlendFactor::OneMinusDst,
-            GPUBlendFactor::Dst_alpha => wgt::BlendFactor::DstAlpha,
-            GPUBlendFactor::One_minus_dst_alpha => wgt::BlendFactor::OneMinusDstAlpha,
-            GPUBlendFactor::Src_alpha_saturated => wgt::BlendFactor::SrcAlphaSaturated,
-            GPUBlendFactor::Constant => wgt::BlendFactor::Constant,
-            GPUBlendFactor::One_minus_constant => wgt::BlendFactor::OneMinusConstant,
+            GPUBlendFactor::Zero => wgpu_types::BlendFactor::Zero,
+            GPUBlendFactor::One => wgpu_types::BlendFactor::One,
+            GPUBlendFactor::Src => wgpu_types::BlendFactor::Src,
+            GPUBlendFactor::One_minus_src => wgpu_types::BlendFactor::OneMinusSrc,
+            GPUBlendFactor::Src_alpha => wgpu_types::BlendFactor::SrcAlpha,
+            GPUBlendFactor::One_minus_src_alpha => wgpu_types::BlendFactor::OneMinusSrcAlpha,
+            GPUBlendFactor::Dst => wgpu_types::BlendFactor::Dst,
+            GPUBlendFactor::One_minus_dst => wgpu_types::BlendFactor::OneMinusDst,
+            GPUBlendFactor::Dst_alpha => wgpu_types::BlendFactor::DstAlpha,
+            GPUBlendFactor::One_minus_dst_alpha => wgpu_types::BlendFactor::OneMinusDstAlpha,
+            GPUBlendFactor::Src_alpha_saturated => wgpu_types::BlendFactor::SrcAlphaSaturated,
+            GPUBlendFactor::Constant => wgpu_types::BlendFactor::Constant,
+            GPUBlendFactor::One_minus_constant => wgpu_types::BlendFactor::OneMinusConstant,
         }
     }
 }
 
-impl Convert<wgt::BlendComponent> for &GPUBlendComponent {
-    fn convert(self) -> wgt::BlendComponent {
-        wgt::BlendComponent {
+impl Convert<wgpu_types::BlendComponent> for &GPUBlendComponent {
+    fn convert(self) -> wgpu_types::BlendComponent {
+        wgpu_types::BlendComponent {
             src_factor: self.srcFactor.convert(),
             dst_factor: self.dstFactor.convert(),
             operation: match self.operation {
-                GPUBlendOperation::Add => wgt::BlendOperation::Add,
-                GPUBlendOperation::Subtract => wgt::BlendOperation::Subtract,
-                GPUBlendOperation::Reverse_subtract => wgt::BlendOperation::ReverseSubtract,
-                GPUBlendOperation::Min => wgt::BlendOperation::Min,
-                GPUBlendOperation::Max => wgt::BlendOperation::Max,
+                GPUBlendOperation::Add => wgpu_types::BlendOperation::Add,
+                GPUBlendOperation::Subtract => wgpu_types::BlendOperation::Subtract,
+                GPUBlendOperation::Reverse_subtract => wgpu_types::BlendOperation::ReverseSubtract,
+                GPUBlendOperation::Min => wgpu_types::BlendOperation::Min,
+                GPUBlendOperation::Max => wgpu_types::BlendOperation::Max,
             },
         }
     }
@@ -422,17 +428,17 @@ impl Convert<wgpu_com::StoreOp> for &GPUStoreOp {
     }
 }
 
-impl Convert<wgt::StencilOperation> for GPUStencilOperation {
-    fn convert(self) -> wgt::StencilOperation {
+impl Convert<wgpu_types::StencilOperation> for GPUStencilOperation {
+    fn convert(self) -> wgpu_types::StencilOperation {
         match self {
-            GPUStencilOperation::Keep => wgt::StencilOperation::Keep,
-            GPUStencilOperation::Zero => wgt::StencilOperation::Zero,
-            GPUStencilOperation::Replace => wgt::StencilOperation::Replace,
-            GPUStencilOperation::Invert => wgt::StencilOperation::Invert,
-            GPUStencilOperation::Increment_clamp => wgt::StencilOperation::IncrementClamp,
-            GPUStencilOperation::Decrement_clamp => wgt::StencilOperation::DecrementClamp,
-            GPUStencilOperation::Increment_wrap => wgt::StencilOperation::IncrementWrap,
-            GPUStencilOperation::Decrement_wrap => wgt::StencilOperation::DecrementWrap,
+            GPUStencilOperation::Keep => wgpu_types::StencilOperation::Keep,
+            GPUStencilOperation::Zero => wgpu_types::StencilOperation::Zero,
+            GPUStencilOperation::Replace => wgpu_types::StencilOperation::Replace,
+            GPUStencilOperation::Invert => wgpu_types::StencilOperation::Invert,
+            GPUStencilOperation::Increment_clamp => wgpu_types::StencilOperation::IncrementClamp,
+            GPUStencilOperation::Decrement_clamp => wgpu_types::StencilOperation::DecrementClamp,
+            GPUStencilOperation::Increment_wrap => wgpu_types::StencilOperation::IncrementWrap,
+            GPUStencilOperation::Decrement_wrap => wgpu_types::StencilOperation::DecrementWrap,
         }
     }
 }
@@ -446,10 +452,10 @@ impl Convert<wgpu_com::TexelCopyBufferInfo> for &GPUImageCopyBuffer {
     }
 }
 
-impl TryConvert<wgt::Origin3d> for &GPUOrigin3D {
+impl TryConvert<wgpu_types::Origin3d> for &GPUOrigin3D {
     type Error = Error;
 
-    fn try_convert(self) -> Result<wgt::Origin3d, Self::Error> {
+    fn try_convert(self) -> Result<wgpu_types::Origin3d, Self::Error> {
         match self {
             GPUOrigin3D::RangeEnforcedUnsignedLongSequence(v) => {
                 // https://gpuweb.github.io/gpuweb/#abstract-opdef-validate-gpuorigin3d-shape
@@ -458,14 +464,14 @@ impl TryConvert<wgt::Origin3d> for &GPUOrigin3D {
                         "sequence is too long for GPUOrigin3D".to_string(),
                     ))
                 } else {
-                    Ok(wgt::Origin3d {
+                    Ok(wgpu_types::Origin3d {
                         x: v.first().copied().unwrap_or(0),
                         y: v.get(1).copied().unwrap_or(0),
                         z: v.get(2).copied().unwrap_or(0),
                     })
                 }
             },
-            GPUOrigin3D::GPUOrigin3DDict(d) => Ok(wgt::Origin3d {
+            GPUOrigin3D::GPUOrigin3DDict(d) => Ok(wgpu_types::Origin3d {
                 x: d.x,
                 y: d.y,
                 z: d.z,
@@ -484,13 +490,13 @@ impl TryConvert<wgpu_com::TexelCopyTextureInfo> for &GPUImageCopyTexture {
             origin: self
                 .origin
                 .as_ref()
-                .map(TryConvert::<wgt::Origin3d>::try_convert)
+                .map(TryConvert::<wgpu_types::Origin3d>::try_convert)
                 .transpose()?
                 .unwrap_or_default(),
             aspect: match self.aspect {
-                GPUTextureAspect::All => wgt::TextureAspect::All,
-                GPUTextureAspect::Stencil_only => wgt::TextureAspect::StencilOnly,
-                GPUTextureAspect::Depth_only => wgt::TextureAspect::DepthOnly,
+                GPUTextureAspect::All => wgpu_types::TextureAspect::All,
+                GPUTextureAspect::Stencil_only => wgpu_types::TextureAspect::StencilOnly,
+                GPUTextureAspect::Depth_only => wgpu_types::TextureAspect::DepthOnly,
             },
         })
     }
@@ -509,51 +515,53 @@ impl<'a> Convert<Option<Cow<'a, str>>> for &GPUObjectDescriptorBase {
 pub(crate) fn convert_bind_group_layout_entry(
     bgle: &GPUBindGroupLayoutEntry,
     device: &GPUDevice,
-) -> Fallible<Result<wgt::BindGroupLayoutEntry, webgpu::Error>> {
+) -> Fallible<Result<wgpu_types::BindGroupLayoutEntry, webgpu_traits::Error>> {
     let number_of_provided_bindings = bgle.buffer.is_some() as u8 +
         bgle.sampler.is_some() as u8 +
         bgle.storageTexture.is_some() as u8 +
         bgle.texture.is_some() as u8;
     let ty = if let Some(buffer) = &bgle.buffer {
-        Some(wgt::BindingType::Buffer {
+        Some(wgpu_types::BindingType::Buffer {
             ty: match buffer.type_ {
-                GPUBufferBindingType::Uniform => wgt::BufferBindingType::Uniform,
+                GPUBufferBindingType::Uniform => wgpu_types::BufferBindingType::Uniform,
                 GPUBufferBindingType::Storage => {
-                    wgt::BufferBindingType::Storage { read_only: false }
+                    wgpu_types::BufferBindingType::Storage { read_only: false }
                 },
                 GPUBufferBindingType::Read_only_storage => {
-                    wgt::BufferBindingType::Storage { read_only: true }
+                    wgpu_types::BufferBindingType::Storage { read_only: true }
                 },
             },
             has_dynamic_offset: buffer.hasDynamicOffset,
             min_binding_size: NonZeroU64::new(buffer.minBindingSize),
         })
     } else if let Some(sampler) = &bgle.sampler {
-        Some(wgt::BindingType::Sampler(match sampler.type_ {
-            GPUSamplerBindingType::Filtering => wgt::SamplerBindingType::Filtering,
-            GPUSamplerBindingType::Non_filtering => wgt::SamplerBindingType::NonFiltering,
-            GPUSamplerBindingType::Comparison => wgt::SamplerBindingType::Comparison,
+        Some(wgpu_types::BindingType::Sampler(match sampler.type_ {
+            GPUSamplerBindingType::Filtering => wgpu_types::SamplerBindingType::Filtering,
+            GPUSamplerBindingType::Non_filtering => wgpu_types::SamplerBindingType::NonFiltering,
+            GPUSamplerBindingType::Comparison => wgpu_types::SamplerBindingType::Comparison,
         }))
     } else if let Some(storage) = &bgle.storageTexture {
-        Some(wgt::BindingType::StorageTexture {
+        Some(wgpu_types::BindingType::StorageTexture {
             access: match storage.access {
-                GPUStorageTextureAccess::Write_only => wgt::StorageTextureAccess::WriteOnly,
-                GPUStorageTextureAccess::Read_only => wgt::StorageTextureAccess::ReadOnly,
-                GPUStorageTextureAccess::Read_write => wgt::StorageTextureAccess::ReadWrite,
+                GPUStorageTextureAccess::Write_only => wgpu_types::StorageTextureAccess::WriteOnly,
+                GPUStorageTextureAccess::Read_only => wgpu_types::StorageTextureAccess::ReadOnly,
+                GPUStorageTextureAccess::Read_write => wgpu_types::StorageTextureAccess::ReadWrite,
             },
             format: device.validate_texture_format_required_features(&storage.format)?,
             view_dimension: storage.viewDimension.convert(),
         })
     } else if let Some(texture) = &bgle.texture {
-        Some(wgt::BindingType::Texture {
+        Some(wgpu_types::BindingType::Texture {
             sample_type: match texture.sampleType {
-                GPUTextureSampleType::Float => wgt::TextureSampleType::Float { filterable: true },
-                GPUTextureSampleType::Unfilterable_float => {
-                    wgt::TextureSampleType::Float { filterable: false }
+                GPUTextureSampleType::Float => {
+                    wgpu_types::TextureSampleType::Float { filterable: true }
                 },
-                GPUTextureSampleType::Depth => wgt::TextureSampleType::Depth,
-                GPUTextureSampleType::Sint => wgt::TextureSampleType::Sint,
-                GPUTextureSampleType::Uint => wgt::TextureSampleType::Uint,
+                GPUTextureSampleType::Unfilterable_float => {
+                    wgpu_types::TextureSampleType::Float { filterable: false }
+                },
+                GPUTextureSampleType::Depth => wgpu_types::TextureSampleType::Depth,
+                GPUTextureSampleType::Sint => wgpu_types::TextureSampleType::Sint,
+                GPUTextureSampleType::Uint => wgpu_types::TextureSampleType::Uint,
             },
             view_dimension: texture.viewDimension.convert(),
             multisampled: texture.multisampled,
@@ -569,13 +577,13 @@ pub(crate) fn convert_bind_group_layout_entry(
     } else {
         ty
     }
-    .ok_or(webgpu::Error::Validation(
+    .ok_or(webgpu_traits::Error::Validation(
         "Exactly on entry type must be provided".to_string(),
     ));
 
-    Ok(ty.map(|ty| wgt::BindGroupLayoutEntry {
+    Ok(ty.map(|ty| wgpu_types::BindGroupLayoutEntry {
         binding: bgle.binding,
-        visibility: wgt::ShaderStages::from_bits_retain(bgle.visibility),
+        visibility: wgpu_types::ShaderStages::from_bits_retain(bgle.visibility),
         ty,
         count: None,
     }))
@@ -584,7 +592,7 @@ pub(crate) fn convert_bind_group_layout_entry(
 pub(crate) fn convert_texture_descriptor(
     descriptor: &GPUTextureDescriptor,
     device: &GPUDevice,
-) -> Fallible<(TextureDescriptor<'static>, wgt::Extent3d)> {
+) -> Fallible<(TextureDescriptor<'static>, wgpu_types::Extent3d)> {
     let size = (&descriptor.size).try_convert()?;
     let desc = TextureDescriptor {
         label: (&descriptor.parent).convert(),
@@ -593,7 +601,7 @@ pub(crate) fn convert_texture_descriptor(
         sample_count: descriptor.sampleCount,
         dimension: descriptor.dimension.convert(),
         format: device.validate_texture_format_required_features(&descriptor.format)?,
-        usage: wgt::TextureUsages::from_bits_retain(descriptor.usage),
+        usage: wgpu_types::TextureUsages::from_bits_retain(descriptor.usage),
         view_formats: descriptor
             .viewFormats
             .iter()
@@ -603,17 +611,17 @@ pub(crate) fn convert_texture_descriptor(
     Ok((desc, size))
 }
 
-impl TryConvert<wgt::Color> for &GPUColor {
+impl TryConvert<wgpu_types::Color> for &GPUColor {
     type Error = Error;
 
-    fn try_convert(self) -> Result<wgt::Color, Self::Error> {
+    fn try_convert(self) -> Result<wgpu_types::Color, Self::Error> {
         match self {
             GPUColor::DoubleSequence(s) => {
                 // https://gpuweb.github.io/gpuweb/#abstract-opdef-validate-gpucolor-shape
                 if s.len() != 4 {
                     Err(Error::Type("GPUColor sequence must be len 4".to_string()))
                 } else {
-                    Ok(wgt::Color {
+                    Ok(wgpu_types::Color {
                         r: *s[0],
                         g: *s[1],
                         b: *s[2],
@@ -621,7 +629,7 @@ impl TryConvert<wgt::Color> for &GPUColor {
                     })
                 }
             },
-            GPUColor::GPUColorDict(d) => Ok(wgt::Color {
+            GPUColor::GPUColorDict(d) => Ok(wgpu_types::Color {
                 r: *d.r,
                 g: *d.g,
                 b: *d.b,
@@ -660,7 +668,7 @@ impl<'a> Convert<BindGroupEntry<'a>> for &GPUBindGroupEntry {
                     BindingResource::Buffer(BufferBinding {
                         buffer: b.buffer.id().0,
                         offset: b.offset,
-                        size: b.size.and_then(wgt::BufferSize::new),
+                        size: b.size.and_then(wgpu_types::BufferSize::new),
                     })
                 },
             },
@@ -668,12 +676,12 @@ impl<'a> Convert<BindGroupEntry<'a>> for &GPUBindGroupEntry {
     }
 }
 
-impl Convert<wgt::TextureDimension> for GPUTextureDimension {
-    fn convert(self) -> wgt::TextureDimension {
+impl Convert<wgpu_types::TextureDimension> for GPUTextureDimension {
+    fn convert(self) -> wgpu_types::TextureDimension {
         match self {
-            GPUTextureDimension::_1d => wgt::TextureDimension::D1,
-            GPUTextureDimension::_2d => wgt::TextureDimension::D2,
-            GPUTextureDimension::_3d => wgt::TextureDimension::D3,
+            GPUTextureDimension::_1d => wgpu_types::TextureDimension::D1,
+            GPUTextureDimension::_2d => wgpu_types::TextureDimension::D2,
+            GPUTextureDimension::_3d => wgpu_types::TextureDimension::D3,
         }
     }
 }
diff --git a/components/script/dom/webgpu/gpudevice.rs b/components/script/dom/webgpu/gpudevice.rs
index f0e82ff9020..9fa9f044daa 100644
--- a/components/script/dom/webgpu/gpudevice.rs
+++ b/components/script/dom/webgpu/gpudevice.rs
@@ -10,15 +10,15 @@ use std::rc::Rc;
 
 use dom_struct::dom_struct;
 use js::jsapi::{Heap, JSObject};
-use webgpu::wgc::id::{BindGroupLayoutId, PipelineLayoutId};
-use webgpu::wgc::pipeline as wgpu_pipe;
-use webgpu::wgc::pipeline::RenderPipelineDescriptor;
-use webgpu::wgt::TextureFormat;
-use webgpu::{
-    PopError, WebGPU, WebGPUComputePipeline, WebGPUComputePipelineResponse,
-    WebGPUPoppedErrorScopeResponse, WebGPURenderPipeline, WebGPURenderPipelineResponse,
-    WebGPURequest, wgt,
+use webgpu_traits::{
+    PopError, WebGPU, WebGPUComputePipeline, WebGPUComputePipelineResponse, WebGPUDevice,
+    WebGPUPoppedErrorScopeResponse, WebGPUQueue, WebGPURenderPipeline,
+    WebGPURenderPipelineResponse, WebGPURequest,
 };
+use wgpu_core::id::{BindGroupLayoutId, PipelineLayoutId};
+use wgpu_core::pipeline as wgpu_pipe;
+use wgpu_core::pipeline::RenderPipelineDescriptor;
+use wgpu_types::{self, TextureFormat};
 
 use super::gpudevicelostinfo::GPUDeviceLostInfo;
 use super::gpuerror::AsWebGpu;
@@ -78,7 +78,7 @@ pub(crate) struct GPUDevice {
     limits: Dom<GPUSupportedLimits>,
     label: DomRefCell<USVString>,
     #[no_trace]
-    device: webgpu::WebGPUDevice,
+    device: WebGPUDevice,
     default_queue: Dom<GPUQueue>,
     /// <https://gpuweb.github.io/gpuweb/#dom-gpudevice-lost>
     #[ignore_malloc_size_of = "promises are hard"]
@@ -117,7 +117,7 @@ impl GPUDevice {
         extensions: Heap<*mut JSObject>,
         features: &GPUSupportedFeatures,
         limits: &GPUSupportedLimits,
-        device: webgpu::WebGPUDevice,
+        device: WebGPUDevice,
         queue: &GPUQueue,
         label: String,
         lost_promise: Rc<Promise>,
@@ -143,10 +143,10 @@ impl GPUDevice {
         channel: WebGPU,
         adapter: &GPUAdapter,
         extensions: Heap<*mut JSObject>,
-        features: wgt::Features,
-        limits: wgt::Limits,
-        device: webgpu::WebGPUDevice,
-        queue: webgpu::WebGPUQueue,
+        features: wgpu_types::Features,
+        limits: wgpu_types::Limits,
+        device: WebGPUDevice,
+        queue: WebGPUQueue,
         label: String,
         can_gc: CanGc,
     ) -> DomRoot<Self> {
@@ -175,11 +175,11 @@ impl GPUDevice {
 }
 
 impl GPUDevice {
-    pub(crate) fn id(&self) -> webgpu::WebGPUDevice {
+    pub(crate) fn id(&self) -> WebGPUDevice {
         self.device
     }
 
-    pub(crate) fn queue_id(&self) -> webgpu::WebGPUQueue {
+    pub(crate) fn queue_id(&self) -> WebGPUQueue {
         self.default_queue.id()
     }
 
@@ -187,7 +187,7 @@ impl GPUDevice {
         self.channel.clone()
     }
 
-    pub(crate) fn dispatch_error(&self, error: webgpu::Error) {
+    pub(crate) fn dispatch_error(&self, error: webgpu_traits::Error) {
         if let Err(e) = self.channel.0.send(WebGPURequest::DispatchError {
             device_id: self.device.0,
             error,
@@ -196,7 +196,7 @@ impl GPUDevice {
         }
     }
 
-    pub(crate) fn fire_uncaptured_error(&self, error: webgpu::Error, can_gc: CanGc) {
+    pub(crate) fn fire_uncaptured_error(&self, error: webgpu_traits::Error, can_gc: CanGc) {
         let error = GPUError::from_error(&self.global(), error, can_gc);
         let ev = GPUUncapturedErrorEvent::new(
             &self.global(),
@@ -274,14 +274,14 @@ impl GPUDevice {
                         .map(|buffer| wgpu_pipe::VertexBufferLayout {
                             array_stride: buffer.arrayStride,
                             step_mode: match buffer.stepMode {
-                                GPUVertexStepMode::Vertex => wgt::VertexStepMode::Vertex,
-                                GPUVertexStepMode::Instance => wgt::VertexStepMode::Instance,
+                                GPUVertexStepMode::Vertex => wgpu_types::VertexStepMode::Vertex,
+                                GPUVertexStepMode::Instance => wgpu_types::VertexStepMode::Instance,
                             },
                             attributes: Cow::Owned(
                                 buffer
                                     .attributes
                                     .iter()
-                                    .map(|att| wgt::VertexAttribute {
+                                    .map(|att| wgpu_types::VertexAttribute {
                                         format: att.format.convert(),
                                         offset: att.offset,
                                         shader_location: att.shaderLocation,
@@ -305,13 +305,14 @@ impl GPUDevice {
                                 .map(|state| {
                                     self.validate_texture_format_required_features(&state.format)
                                         .map(|format| {
-                                            Some(wgt::ColorTargetState {
+                                            Some(wgpu_types::ColorTargetState {
                                                 format,
-                                                write_mask: wgt::ColorWrites::from_bits_retain(
-                                                    state.writeMask,
-                                                ),
+                                                write_mask:
+                                                    wgpu_types::ColorWrites::from_bits_retain(
+                                                        state.writeMask,
+                                                    ),
                                                 blend: state.blend.as_ref().map(|blend| {
-                                                    wgt::BlendState {
+                                                    wgpu_types::BlendState {
                                                         color: (&blend.color).convert(),
                                                         alpha: (&blend.alpha).convert(),
                                                     }
@@ -330,19 +331,19 @@ impl GPUDevice {
                 .as_ref()
                 .map(|dss_desc| {
                     self.validate_texture_format_required_features(&dss_desc.format)
-                        .map(|format| wgt::DepthStencilState {
+                        .map(|format| wgpu_types::DepthStencilState {
                             format,
                             depth_write_enabled: dss_desc.depthWriteEnabled,
                             depth_compare: dss_desc.depthCompare.convert(),
-                            stencil: wgt::StencilState {
-                                front: wgt::StencilFaceState {
+                            stencil: wgpu_types::StencilState {
+                                front: wgpu_types::StencilFaceState {
                                     compare: dss_desc.stencilFront.compare.convert(),
 
                                     fail_op: dss_desc.stencilFront.failOp.convert(),
                                     depth_fail_op: dss_desc.stencilFront.depthFailOp.convert(),
                                     pass_op: dss_desc.stencilFront.passOp.convert(),
                                 },
-                                back: wgt::StencilFaceState {
+                                back: wgpu_types::StencilFaceState {
                                     compare: dss_desc.stencilBack.compare.convert(),
                                     fail_op: dss_desc.stencilBack.failOp.convert(),
                                     depth_fail_op: dss_desc.stencilBack.depthFailOp.convert(),
@@ -351,7 +352,7 @@ impl GPUDevice {
                                 read_mask: dss_desc.stencilReadMask,
                                 write_mask: dss_desc.stencilWriteMask,
                             },
-                            bias: wgt::DepthBiasState {
+                            bias: wgpu_types::DepthBiasState {
                                 constant: dss_desc.depthBias,
                                 slope_scale: *dss_desc.depthBiasSlopeScale,
                                 clamp: *dss_desc.depthBiasClamp,
@@ -359,7 +360,7 @@ impl GPUDevice {
                         })
                 })
                 .transpose()?,
-            multisample: wgt::MultisampleState {
+            multisample: wgpu_types::MultisampleState {
                 count: descriptor.multisample.count,
                 mask: descriptor.multisample.mask as u64,
                 alpha_to_coverage_enabled: descriptor.multisample.alphaToCoverageEnabled,
@@ -469,7 +470,11 @@ impl GPUDeviceMethods<crate::DomTypeHolder> for GPUDevice {
         can_gc: CanGc,
     ) -> Rc<Promise> {
         let promise = Promise::new_in_current_realm(comp, can_gc);
-        let sender = route_promise(&promise, self);
+        let sender = route_promise(
+            &promise,
+            self,
+            self.global().task_manager().dom_manipulation_task_source(),
+        );
         GPUComputePipeline::create(self, descriptor, Some(sender));
         promise
     }
@@ -517,7 +522,11 @@ impl GPUDeviceMethods<crate::DomTypeHolder> for GPUDevice {
     ) -> Fallible<Rc<Promise>> {
         let (implicit_ids, desc) = self.parse_render_pipeline(descriptor)?;
         let promise = Promise::new_in_current_realm(comp, can_gc);
-        let sender = route_promise(&promise, self);
+        let sender = route_promise(
+            &promise,
+            self,
+            self.global().task_manager().dom_manipulation_task_source(),
+        );
         GPURenderPipeline::create(self, implicit_ids, desc, Some(sender))?;
         Ok(promise)
     }
@@ -548,7 +557,11 @@ impl GPUDeviceMethods<crate::DomTypeHolder> for GPUDevice {
     /// <https://gpuweb.github.io/gpuweb/#dom-gpudevice-poperrorscope>
     fn PopErrorScope(&self, comp: InRealm, can_gc: CanGc) -> Rc<Promise> {
         let promise = Promise::new_in_current_realm(comp, can_gc);
-        let sender = route_promise(&promise, self);
+        let sender = route_promise(
+            &promise,
+            self,
+            self.global().task_manager().dom_manipulation_task_source(),
+        );
         if self
             .channel
             .0
@@ -620,7 +633,7 @@ impl RoutedPromiseListener<WebGPUComputePipelineResponse> for GPUDevice {
                 ),
                 can_gc,
             ),
-            Err(webgpu::Error::Validation(msg)) => promise.reject_native(
+            Err(webgpu_traits::Error::Validation(msg)) => promise.reject_native(
                 &GPUPipelineError::new(
                     &self.global(),
                     msg.into(),
@@ -629,8 +642,8 @@ impl RoutedPromiseListener<WebGPUComputePipelineResponse> for GPUDevice {
                 ),
                 can_gc,
             ),
-            Err(webgpu::Error::OutOfMemory(msg) | webgpu::Error::Internal(msg)) => promise
-                .reject_native(
+            Err(webgpu_traits::Error::OutOfMemory(msg) | webgpu_traits::Error::Internal(msg)) => {
+                promise.reject_native(
                     &GPUPipelineError::new(
                         &self.global(),
                         msg.into(),
@@ -638,7 +651,8 @@ impl RoutedPromiseListener<WebGPUComputePipelineResponse> for GPUDevice {
                         can_gc,
                     ),
                     can_gc,
-                ),
+                )
+            },
         }
     }
 }
@@ -661,7 +675,7 @@ impl RoutedPromiseListener<WebGPURenderPipelineResponse> for GPUDevice {
                 ),
                 can_gc,
             ),
-            Err(webgpu::Error::Validation(msg)) => promise.reject_native(
+            Err(webgpu_traits::Error::Validation(msg)) => promise.reject_native(
                 &GPUPipelineError::new(
                     &self.global(),
                     msg.into(),
@@ -670,8 +684,8 @@ impl RoutedPromiseListener<WebGPURenderPipelineResponse> for GPUDevice {
                 ),
                 can_gc,
             ),
-            Err(webgpu::Error::OutOfMemory(msg) | webgpu::Error::Internal(msg)) => promise
-                .reject_native(
+            Err(webgpu_traits::Error::OutOfMemory(msg) | webgpu_traits::Error::Internal(msg)) => {
+                promise.reject_native(
                     &GPUPipelineError::new(
                         &self.global(),
                         msg.into(),
@@ -679,7 +693,8 @@ impl RoutedPromiseListener<WebGPURenderPipelineResponse> for GPUDevice {
                         can_gc,
                     ),
                     can_gc,
-                ),
+                )
+            },
         }
     }
 }
diff --git a/components/script/dom/webgpu/gpuerror.rs b/components/script/dom/webgpu/gpuerror.rs
index 8b9d643d8b9..4c88f73e5de 100644
--- a/components/script/dom/webgpu/gpuerror.rs
+++ b/components/script/dom/webgpu/gpuerror.rs
@@ -4,7 +4,7 @@
 
 use dom_struct::dom_struct;
 use js::rust::HandleObject;
-use webgpu::{Error, ErrorFilter};
+use webgpu_traits::{Error, ErrorFilter};
 
 use crate::conversions::Convert;
 use crate::dom::bindings::codegen::Bindings::WebGPUBinding::{GPUErrorFilter, GPUErrorMethods};
diff --git a/components/script/dom/webgpu/gpupipelinelayout.rs b/components/script/dom/webgpu/gpupipelinelayout.rs
index 9f8923bbb0f..261f8df2b3d 100644
--- a/components/script/dom/webgpu/gpupipelinelayout.rs
+++ b/components/script/dom/webgpu/gpupipelinelayout.rs
@@ -5,8 +5,8 @@
 use std::borrow::Cow;
 
 use dom_struct::dom_struct;
-use webgpu::wgc::binding_model::PipelineLayoutDescriptor;
-use webgpu::{WebGPU, WebGPUBindGroupLayout, WebGPUPipelineLayout, WebGPURequest};
+use webgpu_traits::{WebGPU, WebGPUBindGroupLayout, WebGPUPipelineLayout, WebGPURequest};
+use wgpu_core::binding_model::PipelineLayoutDescriptor;
 
 use crate::conversions::Convert;
 use crate::dom::bindings::cell::DomRefCell;
diff --git a/components/script/dom/webgpu/gpuqueue.rs b/components/script/dom/webgpu/gpuqueue.rs
index 14a446604b2..535e315e8c0 100644
--- a/components/script/dom/webgpu/gpuqueue.rs
+++ b/components/script/dom/webgpu/gpuqueue.rs
@@ -6,7 +6,7 @@ use std::rc::Rc;
 
 use dom_struct::dom_struct;
 use ipc_channel::ipc::IpcSharedMemory;
-use webgpu::{WebGPU, WebGPUQueue, WebGPURequest, wgt};
+use webgpu_traits::{WebGPU, WebGPUQueue, WebGPURequest};
 
 use crate::conversions::{Convert, TryConvert};
 use crate::dom::bindings::cell::DomRefCell;
@@ -130,7 +130,7 @@ impl GPUQueueMethods<crate::DomTypeHolder> for GPUQueue {
 
         // Step 4
         let valid = data_offset + content_size <= data_size as u64 &&
-            content_size * sizeof_element as u64 % wgt::COPY_BUFFER_ALIGNMENT == 0;
+            content_size * sizeof_element as u64 % wgpu_types::COPY_BUFFER_ALIGNMENT == 0;
         if !valid {
             return Err(Error::Operation);
         }
@@ -200,7 +200,9 @@ impl GPUQueueMethods<crate::DomTypeHolder> for GPUQueue {
     fn OnSubmittedWorkDone(&self, can_gc: CanGc) -> Rc<Promise> {
         let global = self.global();
         let promise = Promise::new(&global, can_gc);
-        let sender = route_promise(&promise, self);
+        let task_source = global.task_manager().dom_manipulation_task_source();
+        let sender = route_promise(&promise, self, task_source);
+
         if let Err(e) = self
             .channel
             .0
diff --git a/components/script/dom/webgpu/gpurenderbundle.rs b/components/script/dom/webgpu/gpurenderbundle.rs
index 83b7cc43d75..83febb60b8c 100644
--- a/components/script/dom/webgpu/gpurenderbundle.rs
+++ b/components/script/dom/webgpu/gpurenderbundle.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use webgpu::{WebGPU, WebGPUDevice, WebGPURenderBundle, WebGPURequest};
+use webgpu_traits::{WebGPU, WebGPUDevice, WebGPURenderBundle, WebGPURequest};
 
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::WebGPUBinding::GPURenderBundleMethods;
diff --git a/components/script/dom/webgpu/gpurenderbundleencoder.rs b/components/script/dom/webgpu/gpurenderbundleencoder.rs
index 1353f46dd5b..1e359c72704 100644
--- a/components/script/dom/webgpu/gpurenderbundleencoder.rs
+++ b/components/script/dom/webgpu/gpurenderbundleencoder.rs
@@ -5,10 +5,10 @@
 use std::borrow::Cow;
 
 use dom_struct::dom_struct;
-use webgpu::wgc::command::{
+use webgpu_traits::{WebGPU, WebGPURenderBundle, WebGPURequest};
+use wgpu_core::command::{
     RenderBundleEncoder, RenderBundleEncoderDescriptor, bundle_ffi as wgpu_bundle,
 };
-use webgpu::{WebGPU, WebGPURenderBundle, WebGPURequest, wgt};
 
 use crate::conversions::Convert;
 use crate::dom::bindings::cell::DomRefCell;
@@ -105,7 +105,7 @@ impl GPURenderBundleEncoder {
                 .map(|dsf| {
                     device
                         .validate_texture_format_required_features(&dsf)
-                        .map(|format| wgt::RenderBundleDepthStencil {
+                        .map(|format| wgpu_types::RenderBundleDepthStencil {
                             format,
                             depth_read_only: descriptor.depthReadOnly,
                             stencil_read_only: descriptor.stencilReadOnly,
@@ -177,11 +177,11 @@ impl GPURenderBundleEncoderMethods<crate::DomTypeHolder> for GPURenderBundleEnco
                 encoder,
                 buffer.id().0,
                 match index_format {
-                    GPUIndexFormat::Uint16 => wgt::IndexFormat::Uint16,
-                    GPUIndexFormat::Uint32 => wgt::IndexFormat::Uint32,
+                    GPUIndexFormat::Uint16 => wgpu_types::IndexFormat::Uint16,
+                    GPUIndexFormat::Uint32 => wgpu_types::IndexFormat::Uint32,
                 },
                 offset,
-                wgt::BufferSize::new(size),
+                wgpu_types::BufferSize::new(size),
             );
         }
     }
@@ -194,7 +194,7 @@ impl GPURenderBundleEncoderMethods<crate::DomTypeHolder> for GPURenderBundleEnco
                 slot,
                 buffer.id().0,
                 offset,
-                wgt::BufferSize::new(size),
+                wgpu_types::BufferSize::new(size),
             );
         }
     }
@@ -257,7 +257,7 @@ impl GPURenderBundleEncoderMethods<crate::DomTypeHolder> for GPURenderBundleEnco
 
     /// <https://gpuweb.github.io/gpuweb/#dom-gpurenderbundleencoder-finish>
     fn Finish(&self, descriptor: &GPURenderBundleDescriptor) -> DomRoot<GPURenderBundle> {
-        let desc = wgt::RenderBundleDescriptor {
+        let desc = wgpu_types::RenderBundleDescriptor {
             label: (&descriptor.parent).convert(),
         };
         let encoder = self.render_bundle_encoder.borrow_mut().take().unwrap();
diff --git a/components/script/dom/webgpu/gpurenderpassencoder.rs b/components/script/dom/webgpu/gpurenderpassencoder.rs
index 5263c52138d..741dfd34567 100644
--- a/components/script/dom/webgpu/gpurenderpassencoder.rs
+++ b/components/script/dom/webgpu/gpurenderpassencoder.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use webgpu::{RenderCommand, WebGPU, WebGPURenderPass, WebGPURequest, wgt};
+use webgpu_traits::{RenderCommand, WebGPU, WebGPURenderPass, WebGPURequest};
 
 use crate::conversions::TryConvert;
 use crate::dom::bindings::cell::DomRefCell;
@@ -170,11 +170,11 @@ impl GPURenderPassEncoderMethods<crate::DomTypeHolder> for GPURenderPassEncoder
         self.send_render_command(RenderCommand::SetIndexBuffer {
             buffer_id: buffer.id().0,
             index_format: match index_format {
-                GPUIndexFormat::Uint16 => wgt::IndexFormat::Uint16,
-                GPUIndexFormat::Uint32 => wgt::IndexFormat::Uint32,
+                GPUIndexFormat::Uint16 => wgpu_types::IndexFormat::Uint16,
+                GPUIndexFormat::Uint32 => wgpu_types::IndexFormat::Uint32,
             },
             offset,
-            size: wgt::BufferSize::new(size),
+            size: wgpu_types::BufferSize::new(size),
         })
     }
 
@@ -184,7 +184,7 @@ impl GPURenderPassEncoderMethods<crate::DomTypeHolder> for GPURenderPassEncoder
             slot,
             buffer_id: buffer.id().0,
             offset,
-            size: wgt::BufferSize::new(size),
+            size: wgpu_types::BufferSize::new(size),
         })
     }
 
diff --git a/components/script/dom/webgpu/gpurenderpipeline.rs b/components/script/dom/webgpu/gpurenderpipeline.rs
index 4ac7acd2bce..d80e7bd6c75 100644
--- a/components/script/dom/webgpu/gpurenderpipeline.rs
+++ b/components/script/dom/webgpu/gpurenderpipeline.rs
@@ -4,11 +4,11 @@
 
 use dom_struct::dom_struct;
 use ipc_channel::ipc::IpcSender;
-use webgpu::wgc::pipeline::RenderPipelineDescriptor;
-use webgpu::{
+use webgpu_traits::{
     WebGPU, WebGPUBindGroupLayout, WebGPURenderPipeline, WebGPURenderPipelineResponse,
     WebGPURequest,
 };
+use wgpu_core::pipeline::RenderPipelineDescriptor;
 
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::WebGPUBinding::GPURenderPipelineMethods;
diff --git a/components/script/dom/webgpu/gpusampler.rs b/components/script/dom/webgpu/gpusampler.rs
index 56e63ca6a5a..ffcd1ccbded 100644
--- a/components/script/dom/webgpu/gpusampler.rs
+++ b/components/script/dom/webgpu/gpusampler.rs
@@ -3,8 +3,8 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use webgpu::wgc::resource::SamplerDescriptor;
-use webgpu::{WebGPU, WebGPUDevice, WebGPURequest, WebGPUSampler};
+use webgpu_traits::{WebGPU, WebGPUDevice, WebGPURequest, WebGPUSampler};
+use wgpu_core::resource::SamplerDescriptor;
 
 use crate::conversions::Convert;
 use crate::dom::bindings::cell::DomRefCell;
diff --git a/components/script/dom/webgpu/gpushadermodule.rs b/components/script/dom/webgpu/gpushadermodule.rs
index a970e6dbf10..79d1325cf0f 100644
--- a/components/script/dom/webgpu/gpushadermodule.rs
+++ b/components/script/dom/webgpu/gpushadermodule.rs
@@ -5,7 +5,7 @@
 use std::rc::Rc;
 
 use dom_struct::dom_struct;
-use webgpu::{ShaderCompilationInfo, WebGPU, WebGPURequest, WebGPUShaderModule};
+use webgpu_traits::{ShaderCompilationInfo, WebGPU, WebGPURequest, WebGPUShaderModule};
 
 use super::gpucompilationinfo::GPUCompilationInfo;
 use crate::dom::bindings::cell::DomRefCell;
@@ -95,7 +95,14 @@ impl GPUShaderModule {
             promise.clone(),
             can_gc,
         );
-        let sender = route_promise(&promise, &*shader_module);
+        let sender = route_promise(
+            &promise,
+            &*shader_module,
+            device
+                .global()
+                .task_manager()
+                .dom_manipulation_task_source(),
+        );
         device
             .channel()
             .0
diff --git a/components/script/dom/webgpu/gpusupportedfeatures.rs b/components/script/dom/webgpu/gpusupportedfeatures.rs
index f3941e90c7a..0e327b978b6 100644
--- a/components/script/dom/webgpu/gpusupportedfeatures.rs
+++ b/components/script/dom/webgpu/gpusupportedfeatures.rs
@@ -7,7 +7,7 @@
 use dom_struct::dom_struct;
 use indexmap::IndexSet;
 use js::rust::HandleObject;
-use webgpu::wgt::Features;
+use wgpu_types::Features;
 
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::WebGPUBinding::{
diff --git a/components/script/dom/webgpu/gpusupportedlimits.rs b/components/script/dom/webgpu/gpusupportedlimits.rs
index 0ada017660d..aa7a2c8f6cf 100644
--- a/components/script/dom/webgpu/gpusupportedlimits.rs
+++ b/components/script/dom/webgpu/gpusupportedlimits.rs
@@ -5,7 +5,7 @@
 use GPUSupportedLimits_Binding::GPUSupportedLimitsMethods;
 use dom_struct::dom_struct;
 use num_traits::bounds::UpperBounded;
-use webgpu::wgt::Limits;
+use wgpu_types::Limits;
 
 use crate::dom::bindings::codegen::Bindings::WebGPUBinding::GPUSupportedLimits_Binding;
 use crate::dom::bindings::reflector::{Reflector, reflect_dom_object};
diff --git a/components/script/dom/webgpu/gputexture.rs b/components/script/dom/webgpu/gputexture.rs
index e02bbedbdd5..64c89fb317f 100644
--- a/components/script/dom/webgpu/gputexture.rs
+++ b/components/script/dom/webgpu/gputexture.rs
@@ -5,8 +5,8 @@
 use std::string::String;
 
 use dom_struct::dom_struct;
-use webgpu::wgc::resource;
-use webgpu::{WebGPU, WebGPURequest, WebGPUTexture, WebGPUTextureView, wgt};
+use webgpu_traits::{WebGPU, WebGPURequest, WebGPUTexture, WebGPUTextureView};
+use wgpu_core::resource;
 
 use super::gpuconvert::convert_texture_descriptor;
 use crate::conversions::Convert;
@@ -36,7 +36,7 @@ pub(crate) struct GPUTexture {
     channel: WebGPU,
     #[ignore_malloc_size_of = "defined in wgpu"]
     #[no_trace]
-    texture_size: wgt::Extent3d,
+    texture_size: wgpu_types::Extent3d,
     mip_level_count: u32,
     sample_count: u32,
     dimension: GPUTextureDimension,
@@ -50,7 +50,7 @@ impl GPUTexture {
         texture: WebGPUTexture,
         device: &GPUDevice,
         channel: WebGPU,
-        texture_size: wgt::Extent3d,
+        texture_size: wgpu_types::Extent3d,
         mip_level_count: u32,
         sample_count: u32,
         dimension: GPUTextureDimension,
@@ -79,7 +79,7 @@ impl GPUTexture {
         texture: WebGPUTexture,
         device: &GPUDevice,
         channel: WebGPU,
-        texture_size: wgt::Extent3d,
+        texture_size: wgpu_types::Extent3d,
         mip_level_count: u32,
         sample_count: u32,
         dimension: GPUTextureDimension,
@@ -192,12 +192,14 @@ impl GPUTextureMethods<crate::DomTypeHolder> for GPUTexture {
                     .map(|f| self.device.validate_texture_format_required_features(&f))
                     .transpose()?,
                 dimension: descriptor.dimension.map(|dimension| dimension.convert()),
-                usage: Some(wgt::TextureUsages::from_bits_retain(descriptor.usage)),
-                range: wgt::ImageSubresourceRange {
+                usage: Some(wgpu_types::TextureUsages::from_bits_retain(
+                    descriptor.usage,
+                )),
+                range: wgpu_types::ImageSubresourceRange {
                     aspect: match descriptor.aspect {
-                        GPUTextureAspect::All => wgt::TextureAspect::All,
-                        GPUTextureAspect::Stencil_only => wgt::TextureAspect::StencilOnly,
-                        GPUTextureAspect::Depth_only => wgt::TextureAspect::DepthOnly,
+                        GPUTextureAspect::All => wgpu_types::TextureAspect::All,
+                        GPUTextureAspect::Stencil_only => wgpu_types::TextureAspect::StencilOnly,
+                        GPUTextureAspect::Depth_only => wgpu_types::TextureAspect::DepthOnly,
                     },
                     base_mip_level: descriptor.baseMipLevel,
                     mip_level_count: descriptor.mipLevelCount,
@@ -207,7 +209,7 @@ impl GPUTextureMethods<crate::DomTypeHolder> for GPUTexture {
             })
         } else {
             self.device
-                .dispatch_error(webgpu::Error::Validation(String::from(
+                .dispatch_error(webgpu_traits::Error::Validation(String::from(
                     "arrayLayerCount and mipLevelCount cannot be 0",
                 )));
             None
diff --git a/components/script/dom/webgpu/gputextureview.rs b/components/script/dom/webgpu/gputextureview.rs
index f51b644cc83..20a0e18c0db 100644
--- a/components/script/dom/webgpu/gputextureview.rs
+++ b/components/script/dom/webgpu/gputextureview.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use dom_struct::dom_struct;
-use webgpu::{WebGPU, WebGPURequest, WebGPUTextureView};
+use webgpu_traits::{WebGPU, WebGPURequest, WebGPUTextureView};
 
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::WebGPUBinding::GPUTextureViewMethods;
diff --git a/components/script/dom/webgpu/identityhub.rs b/components/script/dom/webgpu/identityhub.rs
index 102699c033e..74bc1f35859 100644
--- a/components/script/dom/webgpu/identityhub.rs
+++ b/components/script/dom/webgpu/identityhub.rs
@@ -2,18 +2,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use webgpu::identity::{ComputePass, ComputePassId, RenderPass, RenderPassId};
-use webgpu::wgc::id::markers::{
+use webgpu_traits::{ComputePass, ComputePassId, RenderPass, RenderPassId};
+use wgpu_core::id::markers::{
     Adapter, BindGroup, BindGroupLayout, Buffer, CommandEncoder, ComputePipeline, Device,
     PipelineLayout, Queue, RenderBundle, RenderPipeline, Sampler, ShaderModule, Texture,
     TextureView,
 };
-use webgpu::wgc::id::{
+use wgpu_core::id::{
     AdapterId, BindGroupId, BindGroupLayoutId, BufferId, CommandEncoderId, ComputePipelineId,
     DeviceId, PipelineLayoutId, QueueId, RenderBundleId, RenderPipelineId, SamplerId,
     ShaderModuleId, TextureId, TextureViewId,
 };
-use webgpu::wgc::identity::IdentityManager;
+use wgpu_core::identity::IdentityManager;
 
 #[derive(Debug)]
 pub(crate) struct IdentityHub {
diff --git a/components/script/dom/webgpu/wgsllanguagefeatures.rs b/components/script/dom/webgpu/wgsllanguagefeatures.rs
index dcaafdb6375..559fce5cc87 100644
--- a/components/script/dom/webgpu/wgsllanguagefeatures.rs
+++ b/components/script/dom/webgpu/wgsllanguagefeatures.rs
@@ -7,7 +7,7 @@
 use dom_struct::dom_struct;
 use indexmap::IndexSet;
 use js::rust::HandleObject;
-use webgpu::wgc::naga::front::wgsl::ImplementedLanguageExtension;
+use wgpu_core::naga::front::wgsl::ImplementedLanguageExtension;
 
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::WebGPUBinding::WGSLLanguageFeaturesMethods;
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index 760318771fa..bbb637dfe28 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -6,6 +6,8 @@ use std::borrow::ToOwned;
 use std::cell::Cell;
 use std::ptr;
 
+use constellation_traits::BlobImpl;
+use content_security_policy::Violation;
 use dom_struct::dom_struct;
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use ipc_channel::router::ROUTER;
@@ -21,7 +23,6 @@ use net_traits::{
     CoreResourceMsg, FetchChannels, MessageData, WebSocketDomAction, WebSocketNetworkEvent,
 };
 use profile_traits::ipc as ProfiledIpc;
-use script_traits::serializable::BlobImpl;
 use servo_url::{ImmutableOrigin, ServoUrl};
 
 use crate::dom::bindings::cell::DomRefCell;
@@ -261,10 +262,12 @@ impl WebSocketMethods<crate::DomTypeHolder> for WebSocket {
         let request = RequestBuilder::new(global.webview_id(), url_record, Referrer::NoReferrer)
             .origin(global.origin().immutable().clone())
             .insecure_requests_policy(global.insecure_requests_policy())
+            .has_trustworthy_ancestor_origin(global.has_trustworthy_ancestor_or_current_origin())
             .mode(RequestMode::WebSocket { protocols })
             .service_workers_mode(ServiceWorkersMode::None)
             .credentials_mode(CredentialsMode::Include)
             .cache_mode(CacheMode::NoCache)
+            .policy_container(global.policy_container())
             .redirect_mode(RedirectMode::Error);
 
         let channels = FetchChannels::WebSocket {
@@ -279,6 +282,13 @@ impl WebSocketMethods<crate::DomTypeHolder> for WebSocket {
         ROUTER.add_typed_route(
             dom_event_receiver.to_ipc_receiver(),
             Box::new(move |message| match message.unwrap() {
+                WebSocketNetworkEvent::ReportCSPViolations(violations) => {
+                    let task = ReportCSPViolationTask {
+                        websocket: address.clone(),
+                        violations,
+                    };
+                    task_source.queue(task);
+                },
                 WebSocketNetworkEvent::ConnectionEstablished { protocol_in_use } => {
                     let open_thread = ConnectionEstablishedTask {
                         address: address.clone(),
@@ -453,6 +463,18 @@ impl WebSocketMethods<crate::DomTypeHolder> for WebSocket {
     }
 }
 
+struct ReportCSPViolationTask {
+    websocket: Trusted<WebSocket>,
+    violations: Vec<Violation>,
+}
+
+impl TaskOnce for ReportCSPViolationTask {
+    fn run_once(self) {
+        let global = self.websocket.root().global();
+        global.report_csp_violations(self.violations, None);
+    }
+}
+
 /// Task queued when *the WebSocket connection is established*.
 /// <https://html.spec.whatwg.org/multipage/#feedback-from-the-protocol:concept-websocket-established>
 struct ConnectionEstablishedTask {
diff --git a/components/script/dom/webxr/xrboundedreferencespace.rs b/components/script/dom/webxr/xrboundedreferencespace.rs
index 46c48c2494e..3b211b40d30 100644
--- a/components/script/dom/webxr/xrboundedreferencespace.rs
+++ b/components/script/dom/webxr/xrboundedreferencespace.rs
@@ -12,6 +12,7 @@ use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::utils::to_frozen_array;
 use crate::dom::dompointreadonly::DOMPointReadOnly;
 use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use crate::dom::xrreferencespace::XRReferenceSpace;
 use crate::dom::xrrigidtransform::XRRigidTransform;
 use crate::dom::xrsession::XRSession;
@@ -40,12 +41,13 @@ impl XRBoundedReferenceSpace {
 
     #[allow(unused)]
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         session: &XRSession,
         can_gc: CanGc,
     ) -> DomRoot<XRBoundedReferenceSpace> {
-        let offset = XRRigidTransform::identity(global, can_gc);
-        Self::new_offset(global, session, &offset, can_gc)
+        let offset = XRRigidTransform::identity(window, can_gc);
+        let global = window.global();
+        Self::new_offset(&global, session, &offset, can_gc)
     }
 
     #[allow(unused)]
diff --git a/components/script/dom/webxr/xrframe.rs b/components/script/dom/webxr/xrframe.rs
index b969581da8b..1feb2f5e7e8 100644
--- a/components/script/dom/webxr/xrframe.rs
+++ b/components/script/dom/webxr/xrframe.rs
@@ -15,7 +15,7 @@ use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::num::Finite;
 use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot};
-use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use crate::dom::xrhittestresult::XRHitTestResult;
 use crate::dom::xrhittestsource::XRHitTestSource;
 use crate::dom::xrjointpose::XRJointPose;
@@ -50,14 +50,14 @@ impl XRFrame {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         session: &XRSession,
         data: Frame,
         can_gc: CanGc,
     ) -> DomRoot<XRFrame> {
         reflect_dom_object(
             Box::new(XRFrame::new_inherited(session, data)),
-            global,
+            window,
             can_gc,
         )
     }
@@ -123,7 +123,7 @@ impl XRFrameMethods<crate::DomTypeHolder> for XRFrame {
             return Ok(None);
         };
         Ok(Some(XRViewerPose::new(
-            &self.global(),
+            self.global().as_window(),
             &self.session,
             to_base,
             viewer_pose,
@@ -155,7 +155,7 @@ impl XRFrameMethods<crate::DomTypeHolder> for XRFrame {
             return Ok(None);
         };
         let pose = space.then(&base_space.inverse());
-        Ok(Some(XRPose::new(&self.global(), pose, can_gc)))
+        Ok(Some(XRPose::new(self.global().as_window(), pose, can_gc)))
     }
 
     /// <https://immersive-web.github.io/webxr/#dom-xrframe-getpose>
@@ -185,7 +185,7 @@ impl XRFrameMethods<crate::DomTypeHolder> for XRFrame {
         };
         let pose = joint_frame.pose.then(&base_space.inverse());
         Ok(Some(XRJointPose::new(
-            &self.global(),
+            self.global().as_window(),
             pose.cast_unit(),
             Some(joint_frame.radius),
             can_gc,
@@ -198,7 +198,7 @@ impl XRFrameMethods<crate::DomTypeHolder> for XRFrame {
             .hit_test_results
             .iter()
             .filter(|r| r.id == source.id())
-            .map(|r| XRHitTestResult::new(&self.global(), *r, self, CanGc::note()))
+            .map(|r| XRHitTestResult::new(self.global().as_window(), *r, self, CanGc::note()))
             .collect()
     }
 
diff --git a/components/script/dom/webxr/xrhittestresult.rs b/components/script/dom/webxr/xrhittestresult.rs
index 47faee97d5d..1f335b72305 100644
--- a/components/script/dom/webxr/xrhittestresult.rs
+++ b/components/script/dom/webxr/xrhittestresult.rs
@@ -8,7 +8,7 @@ use webxr_api::HitTestResult;
 use crate::dom::bindings::codegen::Bindings::XRHitTestResultBinding::XRHitTestResultMethods;
 use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot};
-use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use crate::dom::xrframe::XRFrame;
 use crate::dom::xrpose::XRPose;
 use crate::dom::xrspace::XRSpace;
@@ -33,14 +33,14 @@ impl XRHitTestResult {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         result: HitTestResult,
         frame: &XRFrame,
         can_gc: CanGc,
     ) -> DomRoot<XRHitTestResult> {
         reflect_dom_object(
             Box::new(XRHitTestResult::new_inherited(result, frame)),
-            global,
+            window,
             can_gc,
         )
     }
@@ -51,6 +51,10 @@ impl XRHitTestResultMethods<crate::DomTypeHolder> for XRHitTestResult {
     fn GetPose(&self, base: &XRSpace, can_gc: CanGc) -> Option<DomRoot<XRPose>> {
         let base = self.frame.get_pose(base)?;
         let pose = self.result.space.then(&base.inverse());
-        Some(XRPose::new(&self.global(), pose.cast_unit(), can_gc))
+        Some(XRPose::new(
+            self.global().as_window(),
+            pose.cast_unit(),
+            can_gc,
+        ))
     }
 }
diff --git a/components/script/dom/webxr/xrhittestsource.rs b/components/script/dom/webxr/xrhittestsource.rs
index 0ec9560db6e..f73f8f79655 100644
--- a/components/script/dom/webxr/xrhittestsource.rs
+++ b/components/script/dom/webxr/xrhittestsource.rs
@@ -8,7 +8,7 @@ use webxr_api::HitTestId;
 use crate::dom::bindings::codegen::Bindings::XRHitTestSourceBinding::XRHitTestSourceMethods;
 use crate::dom::bindings::reflector::{Reflector, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot};
-use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use crate::dom::xrsession::XRSession;
 use crate::script_runtime::CanGc;
 
@@ -31,14 +31,14 @@ impl XRHitTestSource {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         id: HitTestId,
         session: &XRSession,
         can_gc: CanGc,
     ) -> DomRoot<XRHitTestSource> {
         reflect_dom_object(
             Box::new(XRHitTestSource::new_inherited(id, session)),
-            global,
+            window,
             can_gc,
         )
     }
diff --git a/components/script/dom/webxr/xrinputsource.rs b/components/script/dom/webxr/xrinputsource.rs
index 009b210646a..e454e785424 100644
--- a/components/script/dom/webxr/xrinputsource.rs
+++ b/components/script/dom/webxr/xrinputsource.rs
@@ -17,6 +17,7 @@ use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
 use crate::dom::gamepad::Gamepad;
 use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use crate::dom::xrhand::XRHand;
 use crate::dom::xrsession::XRSession;
 use crate::dom::xrspace::XRSpace;
@@ -40,14 +41,14 @@ pub(crate) struct XRInputSource {
 
 impl XRInputSource {
     pub(crate) fn new_inherited(
-        global: &GlobalScope,
+        window: &Window,
         session: &XRSession,
         info: InputSource,
         can_gc: CanGc,
     ) -> XRInputSource {
         // <https://www.w3.org/TR/webxr-gamepads-module-1/#gamepad-differences>
         let gamepad = Gamepad::new(
-            global,
+            window,
             0,
             "".into(),
             "xr-standard".into(),
@@ -74,18 +75,18 @@ impl XRInputSource {
 
     #[allow(unsafe_code)]
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         session: &XRSession,
         info: InputSource,
         can_gc: CanGc,
     ) -> DomRoot<XRInputSource> {
         let source = reflect_dom_object(
-            Box::new(XRInputSource::new_inherited(global, session, info, can_gc)),
-            global,
+            Box::new(XRInputSource::new_inherited(window, session, info, can_gc)),
+            window,
             can_gc,
         );
 
-        let _ac = enter_realm(global);
+        let _ac = enter_realm(window);
         let cx = GlobalScope::get_cx();
         unsafe {
             rooted!(in(*cx) let mut profiles = UndefinedValue());
diff --git a/components/script/dom/webxr/xrinputsourcearray.rs b/components/script/dom/webxr/xrinputsourcearray.rs
index db09b164e8f..26a2c42f598 100644
--- a/components/script/dom/webxr/xrinputsourcearray.rs
+++ b/components/script/dom/webxr/xrinputsourcearray.rs
@@ -11,7 +11,7 @@ use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::event::Event;
-use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use crate::dom::xrinputsource::XRInputSource;
 use crate::dom::xrinputsourceschangeevent::XRInputSourcesChangeEvent;
 use crate::dom::xrsession::XRSession;
@@ -31,10 +31,10 @@ impl XRInputSourceArray {
         }
     }
 
-    pub(crate) fn new(global: &GlobalScope, can_gc: CanGc) -> DomRoot<XRInputSourceArray> {
+    pub(crate) fn new(window: &Window, can_gc: CanGc) -> DomRoot<XRInputSourceArray> {
         reflect_dom_object(
             Box::new(XRInputSourceArray::new_inherited()),
-            global,
+            window,
             can_gc,
         )
     }
@@ -46,6 +46,7 @@ impl XRInputSourceArray {
         can_gc: CanGc,
     ) {
         let global = self.global();
+        let window = global.as_window();
 
         let mut added = vec![];
         for info in inputs {
@@ -59,13 +60,13 @@ impl XRInputSourceArray {
                     .any(|i| i.id() == info.id),
                 "Should never add a duplicate input id!"
             );
-            let input = XRInputSource::new(&global, session, info.clone(), can_gc);
+            let input = XRInputSource::new(window, session, info.clone(), can_gc);
             self.input_sources.borrow_mut().push(Dom::from_ref(&input));
             added.push(input);
         }
 
         let event = XRInputSourcesChangeEvent::new(
-            &global,
+            window,
             atom!("inputsourceschange"),
             false,
             true,
@@ -79,6 +80,7 @@ impl XRInputSourceArray {
 
     pub(crate) fn remove_input_source(&self, session: &XRSession, id: InputId, can_gc: CanGc) {
         let global = self.global();
+        let window = global.as_window();
         let removed = if let Some(i) = self.input_sources.borrow().iter().find(|i| i.id() == id) {
             i.gamepad().update_connected(false, false, can_gc);
             [DomRoot::from_ref(&**i)]
@@ -87,7 +89,7 @@ impl XRInputSourceArray {
         };
 
         let event = XRInputSourcesChangeEvent::new(
-            &global,
+            window,
             atom!("inputsourceschange"),
             false,
             true,
@@ -108,6 +110,7 @@ impl XRInputSourceArray {
         can_gc: CanGc,
     ) {
         let global = self.global();
+        let window = global.as_window();
         let root;
         let removed = if let Some(i) = self.input_sources.borrow().iter().find(|i| i.id() == id) {
             i.gamepad().update_connected(false, false, can_gc);
@@ -118,13 +121,13 @@ impl XRInputSourceArray {
             &[]
         };
         self.input_sources.borrow_mut().retain(|i| i.id() != id);
-        let input = XRInputSource::new(&global, session, info, can_gc);
+        let input = XRInputSource::new(window, session, info, can_gc);
         self.input_sources.borrow_mut().push(Dom::from_ref(&input));
 
         let added = [input];
 
         let event = XRInputSourcesChangeEvent::new(
-            &global,
+            window,
             atom!("inputsourceschange"),
             false,
             true,
diff --git a/components/script/dom/webxr/xrinputsourceevent.rs b/components/script/dom/webxr/xrinputsourceevent.rs
index c0386319196..c62d0919264 100644
--- a/components/script/dom/webxr/xrinputsourceevent.rs
+++ b/components/script/dom/webxr/xrinputsourceevent.rs
@@ -12,11 +12,10 @@ use crate::dom::bindings::codegen::Bindings::XRInputSourceEventBinding::{
 };
 use crate::dom::bindings::error::Fallible;
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::event::Event;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::window::Window;
 use crate::dom::xrframe::XRFrame;
 use crate::dom::xrinputsource::XRInputSource;
@@ -40,7 +39,7 @@ impl XRInputSourceEvent {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         type_: Atom,
         bubbles: bool,
         cancelable: bool,
@@ -49,13 +48,13 @@ impl XRInputSourceEvent {
         can_gc: CanGc,
     ) -> DomRoot<XRInputSourceEvent> {
         Self::new_with_proto(
-            global, None, type_, bubbles, cancelable, frame, source, can_gc,
+            window, None, type_, bubbles, cancelable, frame, source, can_gc,
         )
     }
 
     #[allow(clippy::too_many_arguments)]
     fn new_with_proto(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         type_: Atom,
         bubbles: bool,
@@ -66,7 +65,7 @@ impl XRInputSourceEvent {
     ) -> DomRoot<XRInputSourceEvent> {
         let trackevent = reflect_dom_object_with_proto(
             Box::new(XRInputSourceEvent::new_inherited(frame, source)),
-            global,
+            window,
             proto,
             can_gc,
         );
@@ -88,7 +87,7 @@ impl XRInputSourceEventMethods<crate::DomTypeHolder> for XRInputSourceEvent {
         init: &XRInputSourceEventBinding::XRInputSourceEventInit,
     ) -> Fallible<DomRoot<XRInputSourceEvent>> {
         Ok(XRInputSourceEvent::new_with_proto(
-            &window.global(),
+            window,
             proto,
             Atom::from(type_),
             init.parent.bubbles,
diff --git a/components/script/dom/webxr/xrinputsourceschangeevent.rs b/components/script/dom/webxr/xrinputsourceschangeevent.rs
index 6893a5e80ea..802d5fccd51 100644
--- a/components/script/dom/webxr/xrinputsourceschangeevent.rs
+++ b/components/script/dom/webxr/xrinputsourceschangeevent.rs
@@ -13,7 +13,7 @@ use crate::dom::bindings::codegen::Bindings::XRInputSourcesChangeEventBinding::{
     self, XRInputSourcesChangeEventMethods,
 };
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::bindings::utils::to_frozen_array;
@@ -48,7 +48,7 @@ impl XRInputSourcesChangeEvent {
 
     #[allow(clippy::too_many_arguments)]
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         type_: Atom,
         bubbles: bool,
         cancelable: bool,
@@ -58,14 +58,14 @@ impl XRInputSourcesChangeEvent {
         can_gc: CanGc,
     ) -> DomRoot<XRInputSourcesChangeEvent> {
         Self::new_with_proto(
-            global, None, type_, bubbles, cancelable, session, added, removed, can_gc,
+            window, None, type_, bubbles, cancelable, session, added, removed, can_gc,
         )
     }
 
     #[allow(unsafe_code)]
     #[allow(clippy::too_many_arguments)]
     fn new_with_proto(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         type_: Atom,
         bubbles: bool,
@@ -77,7 +77,7 @@ impl XRInputSourcesChangeEvent {
     ) -> DomRoot<XRInputSourcesChangeEvent> {
         let changeevent = reflect_dom_object_with_proto(
             Box::new(XRInputSourcesChangeEvent::new_inherited(session)),
-            global,
+            window,
             proto,
             can_gc,
         );
@@ -85,7 +85,7 @@ impl XRInputSourcesChangeEvent {
             let event = changeevent.upcast::<Event>();
             event.init_event(type_, bubbles, cancelable);
         }
-        let _ac = enter_realm(global);
+        let _ac = enter_realm(window);
         let cx = GlobalScope::get_cx();
         rooted!(in(*cx) let mut frozen_val: JSVal);
         to_frozen_array(added, cx, frozen_val.handle_mut(), can_gc);
@@ -106,7 +106,7 @@ impl XRInputSourcesChangeEventMethods<crate::DomTypeHolder> for XRInputSourcesCh
         init: &XRInputSourcesChangeEventBinding::XRInputSourcesChangeEventInit,
     ) -> DomRoot<XRInputSourcesChangeEvent> {
         XRInputSourcesChangeEvent::new_with_proto(
-            &window.global(),
+            window,
             proto,
             Atom::from(type_),
             init.parent.bubbles,
diff --git a/components/script/dom/webxr/xrjointpose.rs b/components/script/dom/webxr/xrjointpose.rs
index df80b9a88d8..c587f8112f1 100644
--- a/components/script/dom/webxr/xrjointpose.rs
+++ b/components/script/dom/webxr/xrjointpose.rs
@@ -8,7 +8,7 @@ use crate::dom::bindings::codegen::Bindings::XRJointPoseBinding::XRJointPoseMeth
 use crate::dom::bindings::num::Finite;
 use crate::dom::bindings::reflector::reflect_dom_object;
 use crate::dom::bindings::root::DomRoot;
-use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use crate::dom::xrpose::XRPose;
 use crate::dom::xrrigidtransform::XRRigidTransform;
 use crate::dom::xrsession::ApiRigidTransform;
@@ -30,15 +30,15 @@ impl XRJointPose {
 
     #[allow(unsafe_code)]
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         pose: ApiRigidTransform,
         radius: Option<f32>,
         can_gc: CanGc,
     ) -> DomRoot<XRJointPose> {
-        let transform = XRRigidTransform::new(global, pose, can_gc);
+        let transform = XRRigidTransform::new(window, pose, can_gc);
         reflect_dom_object(
             Box::new(XRJointPose::new_inherited(&transform, radius)),
-            global,
+            window,
             can_gc,
         )
     }
diff --git a/components/script/dom/webxr/xrpose.rs b/components/script/dom/webxr/xrpose.rs
index bc1c0ffee00..021253eeb0d 100644
--- a/components/script/dom/webxr/xrpose.rs
+++ b/components/script/dom/webxr/xrpose.rs
@@ -8,7 +8,7 @@ use crate::dom::bindings::codegen::Bindings::XRPoseBinding::XRPoseMethods;
 use crate::dom::bindings::reflector::{Reflector, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::dompointreadonly::DOMPointReadOnly;
-use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use crate::dom::xrrigidtransform::XRRigidTransform;
 use crate::dom::xrsession::ApiRigidTransform;
 use crate::script_runtime::CanGc;
@@ -29,12 +29,12 @@ impl XRPose {
 
     #[allow(unused)]
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         transform: ApiRigidTransform,
         can_gc: CanGc,
     ) -> DomRoot<XRPose> {
-        let transform = XRRigidTransform::new(global, transform, can_gc);
-        reflect_dom_object(Box::new(XRPose::new_inherited(&transform)), global, can_gc)
+        let transform = XRRigidTransform::new(window, transform, can_gc);
+        reflect_dom_object(Box::new(XRPose::new_inherited(&transform)), window, can_gc)
     }
 }
 
diff --git a/components/script/dom/webxr/xrray.rs b/components/script/dom/webxr/xrray.rs
index e09df42e96d..f502f326eba 100644
--- a/components/script/dom/webxr/xrray.rs
+++ b/components/script/dom/webxr/xrray.rs
@@ -15,7 +15,6 @@ use crate::dom::bindings::error::{Error, Fallible};
 use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object_with_proto};
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::dompointreadonly::DOMPointReadOnly;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::window::Window;
 use crate::dom::xrrigidtransform::XRRigidTransform;
 use crate::script_runtime::{CanGc, JSContext};
@@ -40,12 +39,12 @@ impl XRRay {
     }
 
     fn new(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         ray: Ray<ApiSpace>,
         can_gc: CanGc,
     ) -> DomRoot<XRRay> {
-        reflect_dom_object_with_proto(Box::new(XRRay::new_inherited(ray)), global, proto, can_gc)
+        reflect_dom_object_with_proto(Box::new(XRRay::new_inherited(ray)), window, proto, can_gc)
     }
 
     pub(crate) fn ray(&self) -> Ray<ApiSpace> {
@@ -82,12 +81,7 @@ impl XRRayMethods<crate::DomTypeHolder> for XRRay {
         )
         .normalize();
 
-        Ok(Self::new(
-            &window.global(),
-            proto,
-            Ray { origin, direction },
-            can_gc,
-        ))
+        Ok(Self::new(window, proto, Ray { origin, direction }, can_gc))
     }
 
     /// <https://immersive-web.github.io/hit-test/#dom-xrray-xrray-transform>
@@ -103,12 +97,7 @@ impl XRRayMethods<crate::DomTypeHolder> for XRRay {
             .rotation
             .transform_vector3d(Vector3D::new(0., 0., -1.));
 
-        Ok(Self::new(
-            &window.global(),
-            proto,
-            Ray { origin, direction },
-            can_gc,
-        ))
+        Ok(Self::new(window, proto, Ray { origin, direction }, can_gc))
     }
 
     /// <https://immersive-web.github.io/hit-test/#dom-xrray-origin>
diff --git a/components/script/dom/webxr/xrreferencespace.rs b/components/script/dom/webxr/xrreferencespace.rs
index e8b171d42bc..39c19013750 100644
--- a/components/script/dom/webxr/xrreferencespace.rs
+++ b/components/script/dom/webxr/xrreferencespace.rs
@@ -13,6 +13,7 @@ use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use crate::dom::xrrigidtransform::XRRigidTransform;
 use crate::dom::xrsession::{ApiPose, BaseTransform, XRSession, cast_transform};
 use crate::dom::xrspace::XRSpace;
@@ -40,13 +41,13 @@ impl XRReferenceSpace {
 
     #[allow(unused)]
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         session: &XRSession,
         ty: XRReferenceSpaceType,
         can_gc: CanGc,
     ) -> DomRoot<XRReferenceSpace> {
-        let offset = XRRigidTransform::identity(global, can_gc);
-        Self::new_offset(global, session, ty, &offset, can_gc)
+        let offset = XRRigidTransform::identity(window, can_gc);
+        Self::new_offset(&window.global(), session, ty, &offset, can_gc)
     }
 
     #[allow(unused)]
@@ -85,7 +86,7 @@ impl XRReferenceSpaceMethods<crate::DomTypeHolder> for XRReferenceSpace {
     /// <https://immersive-web.github.io/webxr/#dom-xrreferencespace-getoffsetreferencespace>
     fn GetOffsetReferenceSpace(&self, new: &XRRigidTransform, can_gc: CanGc) -> DomRoot<Self> {
         let offset = new.transform().then(&self.offset.transform());
-        let offset = XRRigidTransform::new(&self.global(), offset, can_gc);
+        let offset = XRRigidTransform::new(self.global().as_window(), offset, can_gc);
         Self::new_offset(
             &self.global(),
             self.upcast::<XRSpace>().session(),
diff --git a/components/script/dom/webxr/xrreferencespaceevent.rs b/components/script/dom/webxr/xrreferencespaceevent.rs
index 77ea16fd773..44946102ab2 100644
--- a/components/script/dom/webxr/xrreferencespaceevent.rs
+++ b/components/script/dom/webxr/xrreferencespaceevent.rs
@@ -12,11 +12,10 @@ use crate::dom::bindings::codegen::Bindings::XRReferenceSpaceEventBinding::{
 };
 use crate::dom::bindings::error::Fallible;
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::event::Event;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::window::Window;
 use crate::dom::xrreferencespace::XRReferenceSpace;
 use crate::dom::xrrigidtransform::XRRigidTransform;
@@ -43,7 +42,7 @@ impl XRReferenceSpaceEvent {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         type_: Atom,
         bubbles: bool,
         cancelable: bool,
@@ -52,13 +51,13 @@ impl XRReferenceSpaceEvent {
         can_gc: CanGc,
     ) -> DomRoot<XRReferenceSpaceEvent> {
         Self::new_with_proto(
-            global, None, type_, bubbles, cancelable, space, transform, can_gc,
+            window, None, type_, bubbles, cancelable, space, transform, can_gc,
         )
     }
 
     #[allow(clippy::too_many_arguments)]
     fn new_with_proto(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         type_: Atom,
         bubbles: bool,
@@ -69,7 +68,7 @@ impl XRReferenceSpaceEvent {
     ) -> DomRoot<XRReferenceSpaceEvent> {
         let trackevent = reflect_dom_object_with_proto(
             Box::new(XRReferenceSpaceEvent::new_inherited(space, transform)),
-            global,
+            window,
             proto,
             can_gc,
         );
@@ -91,7 +90,7 @@ impl XRReferenceSpaceEventMethods<crate::DomTypeHolder> for XRReferenceSpaceEven
         init: &XRReferenceSpaceEventInit,
     ) -> Fallible<DomRoot<XRReferenceSpaceEvent>> {
         Ok(XRReferenceSpaceEvent::new_with_proto(
-            &window.global(),
+            window,
             proto,
             Atom::from(type_),
             init.parent.bubbles,
diff --git a/components/script/dom/webxr/xrrenderstate.rs b/components/script/dom/webxr/xrrenderstate.rs
index 3f546c2353d..d114020e16e 100644
--- a/components/script/dom/webxr/xrrenderstate.rs
+++ b/components/script/dom/webxr/xrrenderstate.rs
@@ -14,7 +14,7 @@ use crate::dom::bindings::num::Finite;
 use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
 use crate::dom::bindings::utils::to_frozen_array;
-use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use crate::dom::xrlayer::XRLayer;
 use crate::dom::xrwebgllayer::XRWebGLLayer;
 use crate::script_runtime::{CanGc, JSContext};
@@ -49,7 +49,7 @@ impl XRRenderState {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         depth_near: f64,
         depth_far: f64,
         inline_vertical_fov: Option<f64>,
@@ -65,14 +65,14 @@ impl XRRenderState {
                 layer,
                 layers,
             )),
-            global,
+            window,
             can_gc,
         )
     }
 
     pub(crate) fn clone_object(&self) -> DomRoot<Self> {
         XRRenderState::new(
-            &self.global(),
+            self.global().as_window(),
             self.depth_near.get(),
             self.depth_far.get(),
             self.inline_vertical_fov.get(),
diff --git a/components/script/dom/webxr/xrrigidtransform.rs b/components/script/dom/webxr/xrrigidtransform.rs
index ef08088876f..9329fc590ff 100644
--- a/components/script/dom/webxr/xrrigidtransform.rs
+++ b/components/script/dom/webxr/xrrigidtransform.rs
@@ -14,7 +14,6 @@ use crate::dom::bindings::error::{Error, Fallible};
 use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object_with_proto};
 use crate::dom::bindings::root::{DomRoot, MutNullableDom};
 use crate::dom::dompointreadonly::DOMPointReadOnly;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::window::Window;
 use crate::dom::xrsession::ApiRigidTransform;
 use crate::script_runtime::{CanGc, JSContext};
@@ -45,28 +44,28 @@ impl XRRigidTransform {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         transform: ApiRigidTransform,
         can_gc: CanGc,
     ) -> DomRoot<XRRigidTransform> {
-        Self::new_with_proto(global, None, transform, can_gc)
+        Self::new_with_proto(window, None, transform, can_gc)
     }
 
     fn new_with_proto(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         transform: ApiRigidTransform,
         can_gc: CanGc,
     ) -> DomRoot<XRRigidTransform> {
         reflect_dom_object_with_proto(
             Box::new(XRRigidTransform::new_inherited(transform)),
-            global,
+            window,
             proto,
             can_gc,
         )
     }
 
-    pub(crate) fn identity(window: &GlobalScope, can_gc: CanGc) -> DomRoot<XRRigidTransform> {
+    pub(crate) fn identity(window: &Window, can_gc: CanGc) -> DomRoot<XRRigidTransform> {
         let transform = RigidTransform3D::identity();
         XRRigidTransform::new(window, transform, can_gc)
     }
@@ -123,10 +122,7 @@ impl XRRigidTransformMethods<crate::DomTypeHolder> for XRRigidTransform {
         }
         let transform = RigidTransform3D::new(rotate, translate);
         Ok(XRRigidTransform::new_with_proto(
-            &window.global(),
-            proto,
-            transform,
-            can_gc,
+            window, proto, transform, can_gc,
         ))
     }
 
@@ -161,7 +157,8 @@ impl XRRigidTransformMethods<crate::DomTypeHolder> for XRRigidTransform {
     // https://immersive-web.github.io/webxr/#dom-xrrigidtransform-inverse
     fn Inverse(&self, can_gc: CanGc) -> DomRoot<XRRigidTransform> {
         self.inverse.or_init(|| {
-            let transform = XRRigidTransform::new(&self.global(), self.transform.inverse(), can_gc);
+            let transform =
+                XRRigidTransform::new(self.global().as_window(), self.transform.inverse(), can_gc);
             transform.inverse.set(Some(self));
             transform
         })
diff --git a/components/script/dom/webxr/xrsession.rs b/components/script/dom/webxr/xrsession.rs
index fb2a7f6c962..6ead8f65445 100644
--- a/components/script/dom/webxr/xrsession.rs
+++ b/components/script/dom/webxr/xrsession.rs
@@ -54,8 +54,8 @@ use crate::dom::bindings::root::{Dom, DomRoot, MutDom, MutNullableDom};
 use crate::dom::bindings::utils::to_frozen_array;
 use crate::dom::event::Event;
 use crate::dom::eventtarget::EventTarget;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::promise::Promise;
+use crate::dom::window::Window;
 use crate::dom::xrboundedreferencespace::XRBoundedReferenceSpace;
 use crate::dom::xrframe::XRFrame;
 use crate::dom::xrhittestsource::XRHitTestSource;
@@ -152,7 +152,7 @@ impl XRSession {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         session: Session,
         mode: XRSessionMode,
         frame_receiver: IpcReceiver<Frame>,
@@ -163,8 +163,8 @@ impl XRSession {
         } else {
             None
         };
-        let render_state = XRRenderState::new(global, 0.1, 1000.0, ivfov, None, Vec::new(), can_gc);
-        let input_sources = XRInputSourceArray::new(global, can_gc);
+        let render_state = XRRenderState::new(window, 0.1, 1000.0, ivfov, None, Vec::new(), can_gc);
+        let input_sources = XRInputSourceArray::new(window, can_gc);
         let ret = reflect_dom_object(
             Box::new(XRSession::new_inherited(
                 session,
@@ -172,7 +172,7 @@ impl XRSession {
                 &input_sources,
                 mode,
             )),
-            global,
+            window,
             can_gc,
         );
         ret.attach_event_handler();
@@ -289,8 +289,14 @@ impl XRSession {
                     promise.resolve_native(&(), can_gc);
                 }
                 // Step 7
-                let event =
-                    XRSessionEvent::new(&self.global(), atom!("end"), false, false, self, can_gc);
+                let event = XRSessionEvent::new(
+                    self.global().as_window(),
+                    atom!("end"),
+                    false,
+                    false,
+                    self,
+                    can_gc,
+                );
                 event.upcast::<Event>().fire(self.upcast(), can_gc);
             },
             XREvent::Select(input, kind, ty, frame) => {
@@ -303,11 +309,11 @@ impl XRSession {
                 let source = self.input_sources.find(input);
                 let atom_index = if kind == SelectKind::Squeeze { 1 } else { 0 };
                 if let Some(source) = source {
-                    let frame = XRFrame::new(&self.global(), self, frame, can_gc);
+                    let frame = XRFrame::new(self.global().as_window(), self, frame, can_gc);
                     frame.set_active(true);
                     if ty == SelectEvent::Start {
                         let event = XRInputSourceEvent::new(
-                            &self.global(),
+                            self.global().as_window(),
                             START_ATOMS[atom_index].clone(),
                             false,
                             false,
@@ -319,7 +325,7 @@ impl XRSession {
                     } else {
                         if ty == SelectEvent::Select {
                             let event = XRInputSourceEvent::new(
-                                &self.global(),
+                                self.global().as_window(),
                                 EVENT_ATOMS[atom_index].clone(),
                                 false,
                                 false,
@@ -330,7 +336,7 @@ impl XRSession {
                             event.upcast::<Event>().fire(self.upcast(), can_gc);
                         }
                         let event = XRInputSourceEvent::new(
-                            &self.global(),
+                            self.global().as_window(),
                             END_ATOMS[atom_index].clone(),
                             false,
                             false,
@@ -351,7 +357,7 @@ impl XRSession {
                 };
                 self.visibility_state.set(v);
                 let event = XRSessionEvent::new(
-                    &self.global(),
+                    self.global().as_window(),
                     atom!("visibilitychange"),
                     false,
                     false,
@@ -393,9 +399,10 @@ impl XRSession {
                         base == base_space
                     })
                     .for_each(|space| {
-                        let offset = XRRigidTransform::new(&self.global(), transform, can_gc);
+                        let offset =
+                            XRRigidTransform::new(self.global().as_window(), transform, can_gc);
                         let event = XRReferenceSpaceEvent::new(
-                            &self.global(),
+                            self.global().as_window(),
                             atom!("reset"),
                             false,
                             false,
@@ -462,7 +469,7 @@ impl XRSession {
         }
 
         let time = self.global().performance().to_dom_high_res_time_stamp(time);
-        let frame = XRFrame::new(&self.global(), self, frame, CanGc::note());
+        let frame = XRFrame::new(self.global().as_window(), self, frame, CanGc::note());
 
         // Step 8-9
         frame.set_active(true);
@@ -580,7 +587,7 @@ impl XRSession {
             FrameUpdateEvent::HitTestSourceAdded(id) => {
                 if let Some(promise) = self.pending_hit_test_promises.borrow_mut().remove(&id) {
                     promise.resolve_native(
-                        &XRHitTestSource::new(&self.global(), id, self, can_gc),
+                        &XRHitTestSource::new(self.global().as_window(), id, self, can_gc),
                         can_gc,
                     );
                 } else {
@@ -603,7 +610,7 @@ impl XRSession {
         self.framerate.set(rate);
 
         let event = XRSessionEvent::new(
-            &self.global(),
+            self.global().as_window(),
             Atom::from("frameratechange"),
             false,
             false,
@@ -862,13 +869,14 @@ impl XRSessionMethods<crate::DomTypeHolder> for XRSession {
                     }
                 }
                 if ty == XRReferenceSpaceType::Bounded_floor {
-                    let space = XRBoundedReferenceSpace::new(&self.global(), self, can_gc);
+                    let space =
+                        XRBoundedReferenceSpace::new(self.global().as_window(), self, can_gc);
                     self.reference_spaces
                         .borrow_mut()
                         .push(Dom::from_ref(space.reference_space()));
                     p.resolve_native(&space, can_gc);
                 } else {
-                    let space = XRReferenceSpace::new(&self.global(), self, ty, can_gc);
+                    let space = XRReferenceSpace::new(self.global().as_window(), self, ty, can_gc);
                     self.reference_spaces
                         .borrow_mut()
                         .push(Dom::from_ref(&*space));
diff --git a/components/script/dom/webxr/xrsessionevent.rs b/components/script/dom/webxr/xrsessionevent.rs
index 62cebb7b188..f26f7376677 100644
--- a/components/script/dom/webxr/xrsessionevent.rs
+++ b/components/script/dom/webxr/xrsessionevent.rs
@@ -10,11 +10,10 @@ use crate::dom::bindings::codegen::Bindings::EventBinding::Event_Binding::EventM
 use crate::dom::bindings::codegen::Bindings::XRSessionEventBinding::{self, XRSessionEventMethods};
 use crate::dom::bindings::error::Fallible;
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::event::Event;
-use crate::dom::globalscope::GlobalScope;
 use crate::dom::window::Window;
 use crate::dom::xrsession::XRSession;
 use crate::script_runtime::CanGc;
@@ -35,18 +34,18 @@ impl XRSessionEvent {
     }
 
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         type_: Atom,
         bubbles: bool,
         cancelable: bool,
         session: &XRSession,
         can_gc: CanGc,
     ) -> DomRoot<XRSessionEvent> {
-        Self::new_with_proto(global, None, type_, bubbles, cancelable, session, can_gc)
+        Self::new_with_proto(window, None, type_, bubbles, cancelable, session, can_gc)
     }
 
     fn new_with_proto(
-        global: &GlobalScope,
+        window: &Window,
         proto: Option<HandleObject>,
         type_: Atom,
         bubbles: bool,
@@ -56,7 +55,7 @@ impl XRSessionEvent {
     ) -> DomRoot<XRSessionEvent> {
         let trackevent = reflect_dom_object_with_proto(
             Box::new(XRSessionEvent::new_inherited(session)),
-            global,
+            window,
             proto,
             can_gc,
         );
@@ -78,7 +77,7 @@ impl XRSessionEventMethods<crate::DomTypeHolder> for XRSessionEvent {
         init: &XRSessionEventBinding::XRSessionEventInit,
     ) -> Fallible<DomRoot<XRSessionEvent>> {
         Ok(XRSessionEvent::new_with_proto(
-            &window.global(),
+            window,
             proto,
             Atom::from(type_),
             init.parent.bubbles,
diff --git a/components/script/dom/webxr/xrsystem.rs b/components/script/dom/webxr/xrsystem.rs
index eabe7a72119..9963d92fa59 100644
--- a/components/script/dom/webxr/xrsystem.rs
+++ b/components/script/dom/webxr/xrsystem.rs
@@ -297,7 +297,13 @@ impl XRSystem {
                 return;
             },
         };
-        let session = XRSession::new(&self.global(), session, mode, frame_receiver, CanGc::note());
+        let session = XRSession::new(
+            self.global().as_window(),
+            session,
+            mode,
+            frame_receiver,
+            CanGc::note(),
+        );
         if mode == XRSessionMode::Inline {
             self.active_inline_sessions
                 .borrow_mut()
diff --git a/components/script/dom/webxr/xrview.rs b/components/script/dom/webxr/xrview.rs
index 0c76a6bd892..078af6c1842 100644
--- a/components/script/dom/webxr/xrview.rs
+++ b/components/script/dom/webxr/xrview.rs
@@ -15,6 +15,7 @@ use crate::dom::bindings::num::Finite;
 use crate::dom::bindings::reflector::{Reflector, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use crate::dom::xrrigidtransform::XRRigidTransform;
 use crate::dom::xrsession::{BaseSpace, BaseTransform, XRSession, cast_transform};
 use crate::script_runtime::{CanGc, JSContext};
@@ -55,7 +56,7 @@ impl XRView {
     }
 
     pub(crate) fn new<V: Copy>(
-        global: &GlobalScope,
+        window: &Window,
         session: &XRSession,
         view: &View<V>,
         eye: XREye,
@@ -64,7 +65,7 @@ impl XRView {
         can_gc: CanGc,
     ) -> DomRoot<XRView> {
         let transform: RigidTransform3D<f32, V, BaseSpace> = view.transform.then(to_base);
-        let transform = XRRigidTransform::new(global, cast_transform(transform), can_gc);
+        let transform = XRRigidTransform::new(window, cast_transform(transform), can_gc);
 
         reflect_dom_object(
             Box::new(XRView::new_inherited(
@@ -74,7 +75,7 @@ impl XRView {
                 viewport_index,
                 view.cast_unit(),
             )),
-            global,
+            window,
             can_gc,
         )
     }
diff --git a/components/script/dom/webxr/xrviewerpose.rs b/components/script/dom/webxr/xrviewerpose.rs
index e70e726a7e7..880ed6fcdb4 100644
--- a/components/script/dom/webxr/xrviewerpose.rs
+++ b/components/script/dom/webxr/xrviewerpose.rs
@@ -15,6 +15,7 @@ use crate::dom::bindings::codegen::Bindings::XRViewerPoseBinding::XRViewerPoseMe
 use crate::dom::bindings::reflector::reflect_dom_object;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use crate::dom::xrpose::XRPose;
 use crate::dom::xrrigidtransform::XRRigidTransform;
 use crate::dom::xrsession::{BaseSpace, BaseTransform, XRSession, cast_transform};
@@ -39,17 +40,17 @@ impl XRViewerPose {
 
     #[allow(unsafe_code)]
     pub(crate) fn new(
-        global: &GlobalScope,
+        window: &Window,
         session: &XRSession,
         to_base: BaseTransform,
         viewer_pose: &ViewerPose,
         can_gc: CanGc,
     ) -> DomRoot<XRViewerPose> {
-        let _ac = enter_realm(global);
+        let _ac = enter_realm(window);
         rooted_vec!(let mut views);
         match &viewer_pose.views {
             Views::Inline => views.push(XRView::new(
-                global,
+                window,
                 session,
                 &session.inline_view(),
                 XREye::None,
@@ -58,7 +59,7 @@ impl XRViewerPose {
                 can_gc,
             )),
             Views::Mono(view) => views.push(XRView::new(
-                global,
+                window,
                 session,
                 view,
                 XREye::None,
@@ -68,7 +69,7 @@ impl XRViewerPose {
             )),
             Views::Stereo(left, right) => {
                 views.push(XRView::new(
-                    global,
+                    window,
                     session,
                     left,
                     XREye::Left,
@@ -77,7 +78,7 @@ impl XRViewerPose {
                     can_gc,
                 ));
                 views.push(XRView::new(
-                    global,
+                    window,
                     session,
                     right,
                     XREye::Right,
@@ -88,7 +89,7 @@ impl XRViewerPose {
             },
             Views::StereoCapture(left, right, third_eye) => {
                 views.push(XRView::new(
-                    global,
+                    window,
                     session,
                     left,
                     XREye::Left,
@@ -97,7 +98,7 @@ impl XRViewerPose {
                     can_gc,
                 ));
                 views.push(XRView::new(
-                    global,
+                    window,
                     session,
                     right,
                     XREye::Right,
@@ -106,7 +107,7 @@ impl XRViewerPose {
                     can_gc,
                 ));
                 views.push(XRView::new(
-                    global,
+                    window,
                     session,
                     third_eye,
                     XREye::None,
@@ -117,7 +118,7 @@ impl XRViewerPose {
             },
             Views::Cubemap(front, left, right, top, bottom, back) => {
                 views.push(XRView::new(
-                    global,
+                    window,
                     session,
                     front,
                     XREye::None,
@@ -126,7 +127,7 @@ impl XRViewerPose {
                     can_gc,
                 ));
                 views.push(XRView::new(
-                    global,
+                    window,
                     session,
                     left,
                     XREye::None,
@@ -135,7 +136,7 @@ impl XRViewerPose {
                     can_gc,
                 ));
                 views.push(XRView::new(
-                    global,
+                    window,
                     session,
                     right,
                     XREye::None,
@@ -144,7 +145,7 @@ impl XRViewerPose {
                     can_gc,
                 ));
                 views.push(XRView::new(
-                    global,
+                    window,
                     session,
                     top,
                     XREye::None,
@@ -153,7 +154,7 @@ impl XRViewerPose {
                     can_gc,
                 ));
                 views.push(XRView::new(
-                    global,
+                    window,
                     session,
                     bottom,
                     XREye::None,
@@ -162,7 +163,7 @@ impl XRViewerPose {
                     can_gc,
                 ));
                 views.push(XRView::new(
-                    global,
+                    window,
                     session,
                     back,
                     XREye::None,
@@ -174,10 +175,10 @@ impl XRViewerPose {
         };
         let transform: RigidTransform3D<f32, Viewer, BaseSpace> =
             viewer_pose.transform.then(&to_base);
-        let transform = XRRigidTransform::new(global, cast_transform(transform), can_gc);
+        let transform = XRRigidTransform::new(window, cast_transform(transform), can_gc);
         let pose = reflect_dom_object(
             Box::new(XRViewerPose::new_inherited(&transform)),
-            global,
+            window,
             can_gc,
         );
 
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index e8ba3e6b307..24e694b4f06 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use std::borrow::{Cow, ToOwned};
+use std::borrow::ToOwned;
 use std::cell::{Cell, RefCell, RefMut};
 use std::cmp;
 use std::collections::hash_map::Entry;
@@ -21,15 +21,20 @@ use base64::Engine;
 #[cfg(feature = "bluetooth")]
 use bluetooth_traits::BluetoothRequest;
 use canvas_traits::webgl::WebGLChan;
-use constellation_traits::{ScrollState, WindowSizeData, WindowSizeType};
+use compositing_traits::CrossProcessCompositorApi;
+use constellation_traits::{
+    DocumentState, LoadData, LoadOrigin, NavigationHistoryBehavior, ScriptToConstellationChan,
+    ScriptToConstellationMessage, ScrollState, StructuredSerializedData, WindowSizeType,
+};
 use crossbeam_channel::{Sender, unbounded};
-use cssparser::{Parser, ParserInput, SourceLocation};
+use cssparser::SourceLocation;
 use devtools_traits::{ScriptToDevtoolsControlMsg, TimelineMarker, TimelineMarkerType};
 use dom_struct::dom_struct;
 use embedder_traits::user_content_manager::{UserContentManager, UserScript};
 use embedder_traits::{
-    AlertResponse, ConfirmResponse, EmbedderMsg, PromptResponse, SimpleDialog, Theme,
-    WebDriverJSError, WebDriverJSResult,
+    AlertResponse, ConfirmResponse, EmbedderMsg, GamepadEvent, GamepadSupportedHapticEffects,
+    GamepadUpdateType, PromptResponse, SimpleDialog, Theme, ViewportDetails, WebDriverJSError,
+    WebDriverJSResult,
 };
 use euclid::default::{Point2D as UntypedPoint2D, Rect as UntypedRect};
 use euclid::{Point2D, Rect, Scale, Size2D, Vector2D};
@@ -57,14 +62,15 @@ use num_traits::ToPrimitive;
 use profile_traits::ipc as ProfiledIpc;
 use profile_traits::mem::ProfilerChan as MemProfilerChan;
 use profile_traits::time::ProfilerChan as TimeProfilerChan;
+use script_bindings::codegen::GenericBindings::NavigatorBinding::NavigatorMethods;
+use script_bindings::codegen::GenericBindings::PerformanceBinding::PerformanceMethods;
+use script_bindings::interfaces::WindowHelpers;
+use script_bindings::root::Root;
 use script_layout_interface::{
     FragmentType, Layout, PendingImageState, QueryMsg, Reflow, ReflowGoal, ReflowRequest,
     TrustedNodeAddress, combine_id_with_fragment_type,
 };
-use script_traits::{
-    DocumentState, LoadData, LoadOrigin, NavigationHistoryBehavior, ScriptMsg, ScriptThreadMessage,
-    ScriptToConstellationChan, StructuredSerializedData,
-};
+use script_traits::ScriptThreadMessage;
 use selectors::attr::CaseSensitivity;
 use servo_arc::Arc as ServoArc;
 use servo_config::{opts, pref};
@@ -72,20 +78,17 @@ use servo_geometry::{DeviceIndependentIntRect, MaxRect, f32_rect_to_au_rect};
 use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl};
 use style::dom::OpaqueNode;
 use style::error_reporting::{ContextualParseError, ParseErrorReporter};
-use style::media_queries;
-use style::parser::ParserContext as CssParserContext;
 use style::properties::PropertyId;
 use style::properties::style_structs::Font;
 use style::queries::values::PrefersColorScheme;
 use style::selector_parser::PseudoElement;
 use style::str::HTML_SPACE_CHARACTERS;
-use style::stylesheets::{CssRuleType, Origin, UrlExtraData};
-use style_traits::{CSSPixel, ParsingMode};
+use style::stylesheets::UrlExtraData;
+use style_traits::CSSPixel;
 use stylo_atoms::Atom;
 use url::Position;
+use webrender_api::ExternalScrollId;
 use webrender_api::units::{DevicePixel, LayoutPixel};
-use webrender_api::{DocumentId, ExternalScrollId};
-use webrender_traits::CrossProcessCompositorApi;
 
 use super::bindings::codegen::Bindings::MessagePortBinding::StructuredSerializeOptions;
 use super::bindings::trace::HashMapTracedValues;
@@ -126,12 +129,15 @@ use crate::dom::document::{AnimationFrameCallback, Document, ReflowTriggerCondit
 use crate::dom::element::Element;
 use crate::dom::event::{Event, EventBubbles, EventCancelable, EventStatus};
 use crate::dom::eventtarget::EventTarget;
+use crate::dom::gamepad::{Gamepad, contains_user_gesture};
+use crate::dom::gamepadevent::GamepadEventType;
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::hashchangeevent::HashChangeEvent;
 use crate::dom::history::History;
 use crate::dom::htmlcollection::{CollectionFilter, HTMLCollection};
 use crate::dom::htmliframeelement::HTMLIFrameElement;
 use crate::dom::location::Location;
+use crate::dom::medialist::MediaList;
 use crate::dom::mediaquerylist::{MediaQueryList, MediaQueryListMatchState};
 use crate::dom::mediaquerylistevent::MediaQueryListEvent;
 use crate::dom::messageevent::MessageEvent;
@@ -141,9 +147,11 @@ use crate::dom::performance::Performance;
 use crate::dom::promise::Promise;
 use crate::dom::screen::Screen;
 use crate::dom::selection::Selection;
+use crate::dom::shadowroot::ShadowRoot;
 use crate::dom::storage::Storage;
 #[cfg(feature = "bluetooth")]
 use crate::dom::testrunner::TestRunner;
+use crate::dom::trustedtypepolicyfactory::TrustedTypePolicyFactory;
 use crate::dom::types::UIEvent;
 use crate::dom::webglrenderingcontext::WebGLCommandSender;
 #[cfg(feature = "webgpu")]
@@ -159,7 +167,7 @@ use crate::script_runtime::{CanGc, JSContext, Runtime};
 use crate::script_thread::ScriptThread;
 use crate::timers::{IsInterval, TimerCallback};
 use crate::unminify::unminified_path;
-use crate::webdriver_handlers::jsval_to_webdriver;
+use crate::webdriver_handlers::{find_node_by_unique_id_in_document, jsval_to_webdriver};
 use crate::{fetch, window_named_properties};
 
 /// A callback to call when a response comes back from the `ImageCache`.
@@ -246,6 +254,7 @@ pub(crate) struct Window {
     session_storage: MutNullableDom<Storage>,
     local_storage: MutNullableDom<Storage>,
     status: DomRefCell<DOMString>,
+    trusted_types: MutNullableDom<TrustedTypePolicyFactory>,
 
     /// For sending timeline markers. Will be ignored if
     /// no devtools server
@@ -256,7 +265,7 @@ pub(crate) struct Window {
 
     /// Most recent unhandled resize event, if any.
     #[no_trace]
-    unhandled_resize_event: DomRefCell<Option<(WindowSizeData, WindowSizeType)>>,
+    unhandled_resize_event: DomRefCell<Option<(ViewportDetails, WindowSizeType)>>,
 
     /// Platform theme.
     #[no_trace]
@@ -273,9 +282,9 @@ pub(crate) struct Window {
     #[ignore_malloc_size_of = "Rc<T> is hard"]
     js_runtime: DomRefCell<Option<Rc<Runtime>>>,
 
-    /// The current size of the window, in pixels.
+    /// The [`ViewportDetails`] of this [`Window`]'s frame.
     #[no_trace]
-    window_size: Cell<WindowSizeData>,
+    viewport_details: Cell<ViewportDetails>,
 
     /// A handle for communicating messages to the bluetooth thread.
     #[no_trace]
@@ -351,10 +360,6 @@ pub(crate) struct Window {
     test_worklet: MutNullableDom<Worklet>,
     /// <https://drafts.css-houdini.org/css-paint-api-1/#paint-worklet>
     paint_worklet: MutNullableDom<Worklet>,
-    /// The Webrender Document id associated with this window.
-    #[ignore_malloc_size_of = "defined in webrender_api"]
-    #[no_trace]
-    webrender_document: DocumentId,
 
     /// Flag to identify whether mutation observers are present(true)/absent(false)
     exists_mut_observer: Cell<bool>,
@@ -644,6 +649,126 @@ impl Window {
     pub(crate) fn font_context(&self) -> &Arc<FontContext> {
         &self.font_context
     }
+
+    pub(crate) fn handle_gamepad_event(&self, gamepad_event: GamepadEvent) {
+        match gamepad_event {
+            GamepadEvent::Connected(index, name, bounds, supported_haptic_effects) => {
+                self.handle_gamepad_connect(
+                    index.0,
+                    name,
+                    bounds.axis_bounds,
+                    bounds.button_bounds,
+                    supported_haptic_effects,
+                );
+            },
+            GamepadEvent::Disconnected(index) => {
+                self.handle_gamepad_disconnect(index.0);
+            },
+            GamepadEvent::Updated(index, update_type) => {
+                self.receive_new_gamepad_button_or_axis(index.0, update_type);
+            },
+        };
+    }
+
+    /// <https://www.w3.org/TR/gamepad/#dfn-gamepadconnected>
+    fn handle_gamepad_connect(
+        &self,
+        // As the spec actually defines how to set the gamepad index, the GilRs index
+        // is currently unused, though in practice it will almost always be the same.
+        // More infra is currently needed to track gamepads across windows.
+        _index: usize,
+        name: String,
+        axis_bounds: (f64, f64),
+        button_bounds: (f64, f64),
+        supported_haptic_effects: GamepadSupportedHapticEffects,
+    ) {
+        // TODO: 2. If document is not null and is not allowed to use the "gamepad" permission,
+        //          then abort these steps.
+        let this = Trusted::new(self);
+        self.upcast::<GlobalScope>()
+            .task_manager()
+            .gamepad_task_source()
+            .queue(task!(gamepad_connected: move || {
+                let window = this.root();
+
+                let navigator = window.Navigator();
+                let selected_index = navigator.select_gamepad_index();
+                let gamepad = Gamepad::new(
+                    &window,
+                    selected_index,
+                    name,
+                    "standard".into(),
+                    axis_bounds,
+                    button_bounds,
+                    supported_haptic_effects,
+                    false,
+                    CanGc::note(),
+                );
+                navigator.set_gamepad(selected_index as usize, &gamepad, CanGc::note());
+            }));
+    }
+
+    /// <https://www.w3.org/TR/gamepad/#dfn-gamepaddisconnected>
+    fn handle_gamepad_disconnect(&self, index: usize) {
+        let this = Trusted::new(self);
+        self.upcast::<GlobalScope>()
+            .task_manager()
+            .gamepad_task_source()
+            .queue(task!(gamepad_disconnected: move || {
+                let window = this.root();
+                let navigator = window.Navigator();
+                if let Some(gamepad) = navigator.get_gamepad(index) {
+                    if window.Document().is_fully_active() {
+                        gamepad.update_connected(false, gamepad.exposed(), CanGc::note());
+                        navigator.remove_gamepad(index);
+                    }
+                }
+            }));
+    }
+
+    /// <https://www.w3.org/TR/gamepad/#receiving-inputs>
+    fn receive_new_gamepad_button_or_axis(&self, index: usize, update_type: GamepadUpdateType) {
+        let this = Trusted::new(self);
+
+        // <https://w3c.github.io/gamepad/#dfn-update-gamepad-state>
+        self.upcast::<GlobalScope>().task_manager().gamepad_task_source().queue(
+                task!(update_gamepad_state: move || {
+                    let window = this.root();
+                    let navigator = window.Navigator();
+                    if let Some(gamepad) = navigator.get_gamepad(index) {
+                        let current_time = window.Performance().Now();
+                        gamepad.update_timestamp(*current_time);
+                        match update_type {
+                            GamepadUpdateType::Axis(index, value) => {
+                                gamepad.map_and_normalize_axes(index, value);
+                            },
+                            GamepadUpdateType::Button(index, value) => {
+                                gamepad.map_and_normalize_buttons(index, value);
+                            }
+                        };
+                        if !navigator.has_gamepad_gesture() && contains_user_gesture(update_type) {
+                            navigator.set_has_gamepad_gesture(true);
+                            navigator.GetGamepads()
+                                .iter()
+                                .filter_map(|g| g.as_ref())
+                                .for_each(|gamepad| {
+                                    gamepad.set_exposed(true);
+                                    gamepad.update_timestamp(*current_time);
+                                    let new_gamepad = Trusted::new(&**gamepad);
+                                    if window.Document().is_fully_active() {
+                                        window.upcast::<GlobalScope>().task_manager().gamepad_task_source().queue(
+                                            task!(update_gamepad_connect: move || {
+                                                let gamepad = new_gamepad.root();
+                                                gamepad.notify_event(GamepadEventType::Connected, CanGc::note());
+                                            })
+                                        );
+                                    }
+                                });
+                        }
+                    }
+                })
+            );
+    }
 }
 
 // https://html.spec.whatwg.org/multipage/#atob
@@ -789,6 +914,32 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
         doc.abort(can_gc);
     }
 
+    /// <https://html.spec.whatwg.org/multipage/#dom-window-focus>
+    fn Focus(&self) {
+        // > 1. Let `current` be this `Window` object's browsing context.
+        // >
+        // > 2. If `current` is null, then return.
+        let current = match self.undiscarded_window_proxy() {
+            Some(proxy) => proxy,
+            None => return,
+        };
+
+        // > 3. Run the focusing steps with `current`.
+        current.focus();
+
+        // > 4. If current is a top-level browsing context, user agents are
+        // >    encouraged to trigger some sort of notification to indicate to
+        // >    the user that the page is attempting to gain focus.
+        //
+        // TODO: Step 4
+    }
+
+    // https://html.spec.whatwg.org/multipage/#dom-window-blur
+    fn Blur(&self) {
+        // > User agents are encouraged to ignore calls to this `blur()` method
+        // > entirely.
+    }
+
     // https://html.spec.whatwg.org/multipage/#dom-open
     fn Open(
         &self,
@@ -903,7 +1054,7 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
                         // which calls into https://html.spec.whatwg.org/multipage/#discard-a-document.
                         window.discard_browsing_context();
 
-                        window.send_to_constellation(ScriptMsg::DiscardTopLevelBrowsingContext);
+                        window.send_to_constellation(ScriptToConstellationMessage::DiscardTopLevelBrowsingContext);
                     }
                 });
                 self.as_global_scope()
@@ -951,7 +1102,7 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
 
     // https://dvcs.w3.org/hg/webcrypto-api/raw-file/tip/spec/Overview.html#dfn-GlobalCrypto
     fn Crypto(&self) -> DomRoot<Crypto> {
-        self.as_global_scope().crypto()
+        self.as_global_scope().crypto(CanGc::note())
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-frameelement
@@ -1218,29 +1369,70 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
         }
     }
 
-    #[allow(unsafe_code)]
-    fn WebdriverCallback(&self, cx: JSContext, val: HandleValue) {
-        let rv = unsafe { jsval_to_webdriver(*cx, &self.globalscope, val) };
+    fn WebdriverCallback(&self, cx: JSContext, val: HandleValue, realm: InRealm, can_gc: CanGc) {
+        let rv = jsval_to_webdriver(cx, &self.globalscope, val, realm, can_gc);
         let opt_chan = self.webdriver_script_chan.borrow_mut().take();
         if let Some(chan) = opt_chan {
-            chan.send(rv).unwrap();
+            let _ = chan.send(rv);
+        }
+    }
+
+    fn WebdriverException(&self, cx: JSContext, val: HandleValue, realm: InRealm, can_gc: CanGc) {
+        let rv = jsval_to_webdriver(cx, &self.globalscope, val, realm, can_gc);
+        let opt_chan = self.webdriver_script_chan.borrow_mut().take();
+        if let Some(chan) = opt_chan {
+            if let Ok(rv) = rv {
+                let _ = chan.send(Err(WebDriverJSError::JSException(rv)));
+            } else {
+                let _ = chan.send(rv);
+            }
         }
     }
 
     fn WebdriverTimeout(&self) {
         let opt_chan = self.webdriver_script_chan.borrow_mut().take();
         if let Some(chan) = opt_chan {
-            chan.send(Err(WebDriverJSError::Timeout)).unwrap();
+            let _ = chan.send(Err(WebDriverJSError::Timeout));
         }
     }
 
+    fn WebdriverElement(&self, id: DOMString) -> Option<DomRoot<Element>> {
+        find_node_by_unique_id_in_document(&self.Document(), id.into())
+            .ok()
+            .and_then(Root::downcast)
+    }
+
+    fn WebdriverFrame(&self, id: DOMString) -> Option<DomRoot<Element>> {
+        find_node_by_unique_id_in_document(&self.Document(), id.into())
+            .ok()
+            .and_then(Root::downcast::<HTMLIFrameElement>)
+            .map(Root::upcast::<Element>)
+    }
+
+    fn WebdriverWindow(&self, _id: DOMString) -> Option<DomRoot<Window>> {
+        warn!("Window references are not supported in webdriver yet");
+        None
+    }
+
+    fn WebdriverShadowRoot(&self, id: DOMString) -> Option<DomRoot<ShadowRoot>> {
+        find_node_by_unique_id_in_document(&self.Document(), id.into())
+            .ok()
+            .and_then(Root::downcast)
+    }
+
     // https://drafts.csswg.org/cssom/#dom-window-getcomputedstyle
     fn GetComputedStyle(
         &self,
         element: &Element,
         pseudo: Option<DOMString>,
     ) -> DomRoot<CSSStyleDeclaration> {
-        // Steps 1-4.
+        // Step 2: Let obj be elt.
+        // We don't store CSSStyleOwner directly because it stores a `Dom` which must be
+        // rooted. This avoids the rooting the value temporarily.
+        let mut is_null = false;
+
+        // Step 3: If pseudoElt is provided, is not the empty string, and starts with a colon, then:
+        // Step 3.1: Parse pseudoElt as a <pseudo-element-selector>, and let type be the result.
         let pseudo = pseudo.map(|mut s| {
             s.make_ascii_lowercase();
             s
@@ -1252,13 +1444,39 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
             Some(ref pseudo) if pseudo == ":after" || pseudo == "::after" => {
                 Some(PseudoElement::After)
             },
+            Some(ref pseudo) if pseudo == "::selection" => Some(PseudoElement::Selection),
+            Some(ref pseudo) if pseudo == "::marker" => Some(PseudoElement::Marker),
+            Some(ref pseudo) if pseudo.starts_with(':') => {
+                // Step 3.2: If type is failure, or is a ::slotted() or ::part()
+                // pseudo-element, let obj be null.
+                is_null = true;
+                None
+            },
             _ => None,
         };
 
-        // Step 5.
+        // Step 4. Let decls be an empty list of CSS declarations.
+        // Step 5: If obj is not null, and elt is connected, part of the flat tree, and
+        // its shadow-including root has a browsing context which either doesn’t have a
+        // browsing context container, or whose browsing context container is being
+        // rendered, set decls to a list of all longhand properties that are supported CSS
+        // properties, in lexicographical order, with the value being the resolved value
+        // computed for obj using the style rules associated with doc.  Additionally,
+        // append to decls all the custom properties whose computed value for obj is not
+        // the guaranteed-invalid value.
+        //
+        // Note: The specification says to generate the list of declarations beforehand, yet
+        // also says the list should be alive. This is why we do not do step 4 and 5 here.
+        // See: https://github.com/w3c/csswg-drafts/issues/6144
+        //
+        // Step 6:  Return a live CSSStyleProperties object with the following properties:
         CSSStyleDeclaration::new(
             self,
-            CSSStyleOwner::Element(Dom::from_ref(element)),
+            if is_null {
+                CSSStyleOwner::Null
+            } else {
+                CSSStyleOwner::Element(Dom::from_ref(element))
+            },
             pseudo,
             CSSModificationAccess::Readonly,
             CanGc::note(),
@@ -1268,9 +1486,9 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
     // https://drafts.csswg.org/cssom-view/#dom-window-innerheight
     //TODO Include Scrollbar
     fn InnerHeight(&self) -> i32 {
-        self.window_size
+        self.viewport_details
             .get()
-            .initial_viewport
+            .size
             .height
             .to_i32()
             .unwrap_or(0)
@@ -1279,12 +1497,7 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
     // https://drafts.csswg.org/cssom-view/#dom-window-innerwidth
     //TODO Include Scrollbar
     fn InnerWidth(&self) -> i32 {
-        self.window_size
-            .get()
-            .initial_viewport
-            .width
-            .to_i32()
-            .unwrap_or(0)
+        self.viewport_details.get().size.width.to_i32().unwrap_or(0)
     }
 
     // https://drafts.csswg.org/cssom-view/#dom-window-scrollx
@@ -1353,7 +1566,17 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
     // https://drafts.csswg.org/cssom-view/#dom-window-resizeto
     fn ResizeTo(&self, width: i32, height: i32) {
         // Step 1
-        //TODO determine if this operation is allowed
+        let window_proxy = match self.window_proxy.get() {
+            Some(proxy) => proxy,
+            None => return,
+        };
+
+        // If target is not an auxiliary browsing context that was created by a script
+        // (as opposed to by an action of the user), then return.
+        if !window_proxy.is_auxiliary() {
+            return;
+        }
+
         let dpr = self.device_pixel_ratio();
         let size = Size2D::new(width, height).to_f32() * dpr;
         self.send_to_embedder(EmbedderMsg::ResizeTo(self.webview_id(), size.to_i32()));
@@ -1427,21 +1650,7 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
 
     // https://drafts.csswg.org/cssom-view/#dom-window-matchmedia
     fn MatchMedia(&self, query: DOMString) -> DomRoot<MediaQueryList> {
-        let mut input = ParserInput::new(&query);
-        let mut parser = Parser::new(&mut input);
-        let url_data = UrlExtraData(self.get_url().get_arc());
-        let quirks_mode = self.Document().quirks_mode();
-        let context = CssParserContext::new(
-            Origin::Author,
-            &url_data,
-            Some(CssRuleType::Media),
-            ParsingMode::DEFAULT,
-            quirks_mode,
-            /* namespaces = */ Default::default(),
-            self.css_error_reporter(),
-            None,
-        );
-        let media_query_list = media_queries::MediaList::parse(&context, &mut parser);
+        let media_query_list = MediaList::parse_media_list(&query, self);
         let document = self.Document();
         let mql = MediaQueryList::new(&document, media_query_list, CanGc::note());
         self.media_query_lists.track(&*mql);
@@ -1493,7 +1702,9 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
 
     // https://w3c.github.io/selection-api/#dom-window-getselection
     fn GetSelection(&self) -> Option<DomRoot<Selection>> {
-        self.document.get().and_then(|d| d.GetSelection())
+        self.document
+            .get()
+            .and_then(|d| d.GetSelection(CanGc::note()))
     }
 
     // https://dom.spec.whatwg.org/#dom-window-event
@@ -1594,6 +1805,7 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
             self,
             document.upcast(),
             Box::new(WindowNamedGetter { name }),
+            CanGc::note(),
         );
         Some(NamedPropertyValue::HTMLCollection(collection))
     }
@@ -1669,6 +1881,11 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
         self.as_global_scope()
             .structured_clone(cx, value, options, retval)
     }
+
+    fn TrustedTypes(&self, can_gc: CanGc) -> DomRoot<TrustedTypePolicyFactory> {
+        self.trusted_types
+            .or_init(|| TrustedTypePolicyFactory::new(self.as_global_scope(), can_gc))
+    }
 }
 
 impl Window {
@@ -1790,7 +2007,7 @@ impl Window {
 
         // Step 5 & 6
         // TODO: Remove scrollbar dimensions.
-        let viewport = self.window_size.get().initial_viewport;
+        let viewport = self.viewport_details.get().size;
 
         // Step 7 & 8
         // TODO: Consider `block-end` and `inline-end` overflow direction.
@@ -1853,18 +2070,17 @@ impl Window {
     }
 
     pub(crate) fn device_pixel_ratio(&self) -> Scale<f32, CSSPixel, DevicePixel> {
-        self.window_size.get().device_pixel_ratio
+        self.viewport_details.get().hidpi_scale_factor
     }
 
     fn client_window(&self) -> (Size2D<u32, CSSPixel>, Point2D<i32, CSSPixel>) {
         let timer_profile_chan = self.global().time_profiler_chan().clone();
-        let (send, recv) =
+        let (sender, receiver) =
             ProfiledIpc::channel::<DeviceIndependentIntRect>(timer_profile_chan).unwrap();
-        let _ = self
-            .compositor_api
-            .sender()
-            .send(webrender_traits::CrossProcessCompositorMessage::GetClientWindowRect(send));
-        let rect = recv.recv().unwrap_or_default();
+        let _ = self.compositor_api.sender().send(
+            compositing_traits::CompositorMsg::GetClientWindowRect(self.webview_id(), sender),
+        );
+        let rect = receiver.recv().unwrap_or_default();
         (
             Size2D::new(rect.size().width as u32, rect.size().height as u32),
             Point2D::new(rect.min.x, rect.min.y),
@@ -1952,6 +2168,8 @@ impl Window {
             .or_else(|| document.GetDocumentElement())
             .map(|root| root.upcast::<Node>().to_trusted_node_address());
 
+        let highlighted_dom_node = document.highlighted_dom_node().map(|node| node.to_opaque());
+
         // Send new document and relevant styles to layout.
         let reflow = ReflowRequest {
             reflow_info: Reflow {
@@ -1960,14 +2178,18 @@ impl Window {
             document: document.upcast::<Node>().to_trusted_node_address(),
             dirty_root,
             stylesheets_changed,
-            window_size: self.window_size.get(),
+            viewport_details: self.viewport_details.get(),
             origin: self.origin().immutable().clone(),
             reflow_goal,
             dom_count: document.dom_count(),
             pending_restyles,
             animation_timeline_value: document.current_animation_timeline_value(),
             animations: document.animations().sets.clone(),
+            node_to_image_animation_map: document
+                .image_animation_manager_mut()
+                .take_image_animate_set(),
             theme: self.theme.get(),
+            highlighted_dom_node,
         };
 
         let Some(results) = self.layout.borrow_mut().reflow(reflow) else {
@@ -1994,8 +2216,7 @@ impl Window {
             }
 
             let mut images = self.pending_layout_images.borrow_mut();
-            let nodes = images.entry(id).or_default();
-            if !nodes.iter().any(|n| std::ptr::eq(&**n, &*node)) {
+            if !images.contains_key(&id) {
                 let trusted_node = Trusted::new(&*node);
                 let sender = self.register_image_cache_listener(id, move |response| {
                     trusted_node
@@ -2006,6 +2227,10 @@ impl Window {
 
                 self.image_cache
                     .add_listener(ImageResponder::new(sender, self.pipeline_id(), id));
+            }
+
+            let nodes = images.entry(id).or_default();
+            if !nodes.iter().any(|n| std::ptr::eq(&**n, &*node)) {
                 nodes.push(Dom::from_ref(&*node));
             }
         }
@@ -2013,11 +2238,13 @@ impl Window {
         let size_messages = self
             .Document()
             .iframes_mut()
-            .handle_new_iframe_sizes_after_layout(results.iframe_sizes, self.device_pixel_ratio());
+            .handle_new_iframe_sizes_after_layout(results.iframe_sizes);
         if !size_messages.is_empty() {
-            self.send_to_constellation(ScriptMsg::IFrameSizes(size_messages));
+            self.send_to_constellation(ScriptToConstellationMessage::IFrameSizes(size_messages));
         }
-
+        document
+            .image_animation_manager_mut()
+            .restore_image_animate_set(results.node_to_image_animation_map);
         document.update_animations_post_reflow();
         self.update_constellation_epoch();
 
@@ -2111,7 +2338,7 @@ impl Window {
                     "{:?}: Sending DocumentState::Idle to Constellation",
                     self.pipeline_id()
                 );
-                let event = ScriptMsg::SetDocumentState(DocumentState::Idle);
+                let event = ScriptToConstellationMessage::SetDocumentState(DocumentState::Idle);
                 self.send_to_constellation(event);
                 self.has_sent_idle_message.set(true);
             }
@@ -2193,7 +2420,7 @@ impl Window {
             self.pipeline_id()
         );
         let (sender, receiver) = ipc::channel().expect("Failed to create IPC channel!");
-        let event = ScriptMsg::SetLayoutEpoch(epoch, sender);
+        let event = ScriptToConstellationMessage::SetLayoutEpoch(epoch, sender);
         self.send_to_constellation(event);
         let _ = receiver.recv();
     }
@@ -2224,7 +2451,9 @@ impl Window {
 
     // Query content box without considering any reflow
     pub(crate) fn content_box_query_unchecked(&self, node: &Node) -> Option<UntypedRect<Au>> {
-        self.layout.borrow().query_content_box(node.to_opaque())
+        self.layout
+            .borrow()
+            .query_content_box(node.to_trusted_node_address())
     }
 
     pub(crate) fn content_box_query(&self, node: &Node, can_gc: CanGc) -> Option<UntypedRect<Au>> {
@@ -2238,14 +2467,18 @@ impl Window {
         if !self.layout_reflow(QueryMsg::ContentBoxes, can_gc) {
             return vec![];
         }
-        self.layout.borrow().query_content_boxes(node.to_opaque())
+        self.layout
+            .borrow()
+            .query_content_boxes(node.to_trusted_node_address())
     }
 
     pub(crate) fn client_rect_query(&self, node: &Node, can_gc: CanGc) -> UntypedRect<i32> {
         if !self.layout_reflow(QueryMsg::ClientRectQuery, can_gc) {
             return Rect::zero();
         }
-        self.layout.borrow().query_client_rect(node.to_opaque())
+        self.layout
+            .borrow()
+            .query_client_rect(node.to_trusted_node_address())
     }
 
     /// Find the scroll area of the given node, if it is not None. If the node
@@ -2255,11 +2488,12 @@ impl Window {
         node: Option<&Node>,
         can_gc: CanGc,
     ) -> UntypedRect<i32> {
-        let opaque = node.map(|node| node.to_opaque());
         if !self.layout_reflow(QueryMsg::ScrollingAreaQuery, can_gc) {
             return Rect::zero();
         }
-        self.layout.borrow().query_scrolling_area(opaque)
+        self.layout
+            .borrow()
+            .query_scrolling_area(node.map(Node::to_trusted_node_address))
     }
 
     pub(crate) fn scroll_offset_query(&self, node: &Node) -> Vector2D<f32, LayoutPixel> {
@@ -2325,11 +2559,11 @@ impl Window {
     /// If the given |browsing_context_id| refers to an `<iframe>` that is an element
     /// in this [`Window`] and that `<iframe>` has been laid out, return its size.
     /// Otherwise, return `None`.
-    pub(crate) fn get_iframe_size_if_known(
+    pub(crate) fn get_iframe_viewport_details_if_known(
         &self,
         browsing_context_id: BrowsingContextId,
         can_gc: CanGc,
-    ) -> Option<Size2D<f32, CSSPixel>> {
+    ) -> Option<ViewportDetails> {
         // Reflow might fail, but do a best effort to return the right size.
         self.layout_reflow(QueryMsg::InnerWindowDimensionsQuery, can_gc);
         self.Document()
@@ -2348,7 +2582,10 @@ impl Window {
             return (None, Rect::zero());
         }
 
-        let response = self.layout.borrow().query_offset_parent(node.to_opaque());
+        let response = self
+            .layout
+            .borrow()
+            .query_offset_parent(node.to_trusted_node_address());
         let element = response.node_address.and_then(|parent_node_address| {
             let node = unsafe { from_untrusted_node_address(parent_node_address) };
             DomRoot::downcast(node)
@@ -2411,7 +2648,7 @@ impl Window {
             // Step 6
             // TODO: Fragment handling appears to have moved to step 13
             if let Some(fragment) = load_data.url.fragment() {
-                self.send_to_constellation(ScriptMsg::NavigatedToFragment(
+                self.send_to_constellation(ScriptToConstellationMessage::NavigatedToFragment(
                     load_data.url.clone(),
                     history_handling,
                 ));
@@ -2494,12 +2731,12 @@ impl Window {
         };
     }
 
-    pub(crate) fn set_window_size(&self, size: WindowSizeData) {
-        self.window_size.set(size);
+    pub(crate) fn set_viewport_details(&self, size: ViewportDetails) {
+        self.viewport_details.set(size);
     }
 
-    pub(crate) fn window_size(&self) -> WindowSizeData {
-        self.window_size.get()
+    pub(crate) fn viewport_details(&self) -> ViewportDetails {
+        self.viewport_details.get()
     }
 
     /// Handle a theme change request, triggering a reflow is any actual change occured.
@@ -2524,13 +2761,13 @@ impl Window {
         self.dom_static.windowproxy_handler
     }
 
-    pub(crate) fn add_resize_event(&self, event: WindowSizeData, event_type: WindowSizeType) {
+    pub(crate) fn add_resize_event(&self, event: ViewportDetails, event_type: WindowSizeType) {
         // Whenever we receive a new resize event we forget about all the ones that came before
         // it, to avoid unnecessary relayouts
         *self.unhandled_resize_event.borrow_mut() = Some((event, event_type))
     }
 
-    pub(crate) fn take_unhandled_resize_event(&self) -> Option<(WindowSizeData, WindowSizeType)> {
+    pub(crate) fn take_unhandled_resize_event(&self) -> Option<(ViewportDetails, WindowSizeType)> {
         self.unhandled_resize_event.borrow_mut().take()
     }
 
@@ -2646,7 +2883,7 @@ impl Window {
             return false;
         };
 
-        if self.window_size() == new_size {
+        if self.viewport_details() == new_size {
             return false;
         }
 
@@ -2654,9 +2891,9 @@ impl Window {
         debug!(
             "Resizing Window for pipeline {:?} from {:?} to {new_size:?}",
             self.pipeline_id(),
-            self.window_size(),
+            self.viewport_details(),
         );
-        self.set_window_size(new_size);
+        self.set_viewport_details(new_size);
 
         // http://dev.w3.org/csswg/cssom-view/#resizing-viewports
         if size_type == WindowSizeType::Resize {
@@ -2735,20 +2972,16 @@ impl Window {
     }
 
     pub(crate) fn send_to_embedder(&self, msg: EmbedderMsg) {
-        self.send_to_constellation(ScriptMsg::ForwardToEmbedder(msg));
+        self.send_to_constellation(ScriptToConstellationMessage::ForwardToEmbedder(msg));
     }
 
-    pub(crate) fn send_to_constellation(&self, msg: ScriptMsg) {
+    pub(crate) fn send_to_constellation(&self, msg: ScriptToConstellationMessage) {
         self.as_global_scope()
             .script_to_constellation_chan()
             .send(msg)
             .unwrap();
     }
 
-    pub(crate) fn webrender_document(&self) -> DocumentId {
-        self.webrender_document
-    }
-
     #[cfg(feature = "webxr")]
     pub(crate) fn in_immersive_xr_session(&self) -> bool {
         self.navigator
@@ -2784,21 +3017,19 @@ impl Window {
         control_chan: IpcSender<ScriptThreadMessage>,
         pipeline_id: PipelineId,
         parent_info: Option<PipelineId>,
-        window_size: WindowSizeData,
+        viewport_details: ViewportDetails,
         origin: MutableOrigin,
         creator_url: ServoUrl,
         navigation_start: CrossProcessInstant,
         webgl_chan: Option<WebGLChan>,
         #[cfg(feature = "webxr")] webxr_registry: Option<webxr_api::Registry>,
         microtask_queue: Rc<MicrotaskQueue>,
-        webrender_document: DocumentId,
         compositor_api: CrossProcessCompositorApi,
         relayout_event: bool,
         unminify_js: bool,
         unminify_css: bool,
         local_script_source: Option<String>,
         user_content_manager: UserContentManager,
-        user_agent: Cow<'static, str>,
         player_context: WindowGLContext,
         #[cfg(feature = "webgpu")] gpu_id_hub: Arc<IdentityHub>,
         inherited_secure_context: Option<bool>,
@@ -2810,7 +3041,7 @@ impl Window {
 
         let initial_viewport = f32_rect_to_au_rect(UntypedRect::new(
             Point2D::zero(),
-            window_size.initial_viewport.to_untyped(),
+            viewport_details.size.to_untyped(),
         ));
 
         let win = Box::new(Self {
@@ -2825,7 +3056,6 @@ impl Window {
                 origin,
                 Some(creator_url),
                 microtask_queue,
-                user_agent,
                 #[cfg(feature = "webgpu")]
                 gpu_id_hub,
                 inherited_secure_context,
@@ -2857,7 +3087,7 @@ impl Window {
             bluetooth_extra_permission_data: BluetoothExtraPermissionData::new(),
             page_clip_rect: Cell::new(MaxRect::max_rect()),
             unhandled_resize_event: Default::default(),
-            window_size: Cell::new(window_size),
+            viewport_details: Cell::new(viewport_details),
             current_viewport: Cell::new(initial_viewport.to_untyped()),
             layout_blocker: Cell::new(LayoutBlocker::WaitingForParse),
             current_state: Cell::new(WindowState::Alive),
@@ -2878,7 +3108,6 @@ impl Window {
             local_script_source,
             test_worklet: Default::default(),
             paint_worklet: Default::default(),
-            webrender_document,
             exists_mut_observer: Cell::new(false),
             compositor_api,
             has_sent_idle_message: Cell::new(false),
@@ -2890,6 +3119,7 @@ impl Window {
             layout_marker: DomRefCell::new(Rc::new(Cell::new(true))),
             current_event: DomRefCell::new(None),
             theme: Cell::new(PrefersColorScheme::Light),
+            trusted_types: Default::default(),
         });
 
         unsafe {
@@ -3117,3 +3347,13 @@ unsafe extern "C" fn dump_js_stack(cx: *mut RawJSContext) {
         DumpJSStack(cx, true, false, false);
     }
 }
+
+impl WindowHelpers for Window {
+    fn create_named_properties_object(
+        cx: JSContext,
+        proto: HandleObject,
+        object: MutableHandleObject,
+    ) {
+        Self::create_named_properties_object(cx, proto, object)
+    }
+}
diff --git a/components/script/dom/windowproxy.rs b/components/script/dom/windowproxy.rs
index d008c76f905..770ec17a363 100644
--- a/components/script/dom/windowproxy.rs
+++ b/components/script/dom/windowproxy.rs
@@ -6,6 +6,10 @@ use std::cell::Cell;
 use std::ptr;
 
 use base::id::{BrowsingContextId, PipelineId, WebViewId};
+use constellation_traits::{
+    AuxiliaryWebViewCreationRequest, LoadData, LoadOrigin, NavigationHistoryBehavior,
+    ScriptToConstellationMessage,
+};
 use dom_struct::dom_struct;
 use html5ever::local_name;
 use indexmap::map::IndexMap;
@@ -29,10 +33,7 @@ use js::rust::wrappers::{JS_TransplantObject, NewWindowProxy, SetWindowProxy};
 use js::rust::{Handle, MutableHandle, MutableHandleValue, get_object_class};
 use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
 use net_traits::request::Referrer;
-use script_traits::{
-    AuxiliaryWebViewCreationRequest, LoadData, LoadOrigin, NavigationHistoryBehavior,
-    NewLayoutInfo, ScriptMsg,
-};
+use script_traits::NewLayoutInfo;
 use serde::{Deserialize, Serialize};
 use servo_url::{ImmutableOrigin, ServoUrl};
 use style::attr::parse_integer;
@@ -306,6 +307,7 @@ impl WindowProxy {
             document.get_referrer_policy(),
             None, // Doesn't inherit secure context
             None,
+            false,
         );
         let load_info = AuxiliaryWebViewCreationRequest {
             load_data: load_data.clone(),
@@ -313,7 +315,7 @@ impl WindowProxy {
             opener_pipeline_id: self.currently_active.get().unwrap(),
             response_sender,
         };
-        let constellation_msg = ScriptMsg::CreateAuxiliaryWebView(load_info);
+        let constellation_msg = ScriptToConstellationMessage::CreateAuxiliaryWebView(load_info);
         window.send_to_constellation(constellation_msg);
 
         let response = response_receiver.recv().unwrap()?;
@@ -325,7 +327,7 @@ impl WindowProxy {
             webview_id: response.new_webview_id,
             opener: Some(self.browsing_context_id),
             load_data,
-            window_size: window.window_size(),
+            viewport_details: window.viewport_details(),
         };
         ScriptThread::process_attach_layout(new_layout_info, document.origin().clone());
         // TODO: if noopener is false, copy the sessionStorage storage area of the creator origin.
@@ -484,6 +486,11 @@ impl WindowProxy {
             Some(target_document) => target_document,
             None => return Ok(None),
         };
+        let has_trustworthy_ancestor_origin = if new {
+            target_document.has_trustworthy_ancestor_or_current_origin()
+        } else {
+            false
+        };
         let target_window = target_document.window();
         // Step 13, and 14.4, will have happened elsewhere,
         // since we've created a new browsing context and loaded it with about:blank.
@@ -516,6 +523,7 @@ impl WindowProxy {
                 referrer_policy,
                 Some(secure),
                 Some(target_document.insecure_requests_policy()),
+                has_trustworthy_ancestor_origin,
             );
             let history_handling = if new {
                 NavigationHistoryBehavior::Replace
@@ -611,6 +619,23 @@ impl WindowProxy {
         result
     }
 
+    /// Run [the focusing steps] with this browsing context.
+    ///
+    /// [the focusing steps]: https://html.spec.whatwg.org/multipage/#focusing-steps
+    pub fn focus(&self) {
+        debug!(
+            "Requesting the constellation to initiate a focus operation for \
+            browsing context {}",
+            self.browsing_context_id()
+        );
+        self.global()
+            .script_to_constellation_chan()
+            .send(ScriptToConstellationMessage::FocusRemoteDocument(
+                self.browsing_context_id(),
+            ))
+            .unwrap();
+    }
+
     #[allow(unsafe_code)]
     /// Change the Window that this WindowProxy resolves to.
     // TODO: support setting the window proxy to a dummy value,
@@ -852,7 +877,7 @@ unsafe fn GetSubframeWindowProxy(
     proxy: RawHandleObject,
     id: RawHandleId,
 ) -> Option<(DomRoot<WindowProxy>, u32)> {
-    let index = get_array_index_from_id(cx, Handle::from_raw(id));
+    let index = get_array_index_from_id(Handle::from_raw(id));
     if let Some(index) = index {
         let mut slot = UndefinedValue();
         GetProxyPrivate(*proxy, &mut slot);
@@ -862,7 +887,7 @@ unsafe fn GetSubframeWindowProxy(
             let (result_sender, result_receiver) = ipc::channel().unwrap();
 
             let _ = win.as_global_scope().script_to_constellation_chan().send(
-                ScriptMsg::GetChildBrowsingContextId(
+                ScriptToConstellationMessage::GetChildBrowsingContextId(
                     browsing_context_id,
                     index as usize,
                     result_sender,
@@ -881,7 +906,7 @@ unsafe fn GetSubframeWindowProxy(
             let (result_sender, result_receiver) = ipc::channel().unwrap();
 
             let _ = win.global().script_to_constellation_chan().send(
-                ScriptMsg::GetChildBrowsingContextId(
+                ScriptToConstellationMessage::GetChildBrowsingContextId(
                     browsing_context_id,
                     index as usize,
                     result_sender,
@@ -934,7 +959,7 @@ unsafe extern "C" fn defineProperty(
     desc: RawHandle<PropertyDescriptor>,
     res: *mut ObjectOpResult,
 ) -> bool {
-    if get_array_index_from_id(cx, Handle::from_raw(id)).is_some() {
+    if get_array_index_from_id(Handle::from_raw(id)).is_some() {
         // Spec says to Reject whether this is a supported index or not,
         // since we have no indexed setter or indexed creator.  That means
         // throwing in strict mode (FIXME: Bug 828137), doing nothing in
@@ -1003,7 +1028,7 @@ unsafe extern "C" fn set(
     receiver: RawHandleValue,
     res: *mut ObjectOpResult,
 ) -> bool {
-    if get_array_index_from_id(cx, Handle::from_raw(id)).is_some() {
+    if get_array_index_from_id(Handle::from_raw(id)).is_some() {
         // Reject (which means throw if and only if strict) the set.
         (*res).code_ = JSErrNum::JSMSG_READ_ONLY as ::libc::uintptr_t;
         return true;
diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs
index 34fc30ce0e5..7a6b226cf07 100644
--- a/components/script/dom/worker.rs
+++ b/components/script/dom/worker.rs
@@ -6,27 +6,27 @@ use std::cell::Cell;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
 
+use constellation_traits::{StructuredSerializedData, WorkerScriptLoadOrigin};
 use crossbeam_channel::{Sender, unbounded};
-use devtools_traits::{DevtoolsPageInfo, ScriptToDevtoolsControlMsg, WorkerId};
+use devtools_traits::{DevtoolsPageInfo, ScriptToDevtoolsControlMsg, SourceInfo, WorkerId};
 use dom_struct::dom_struct;
 use ipc_channel::ipc;
 use js::jsapi::{Heap, JSObject};
 use js::jsval::UndefinedValue;
 use js::rust::{CustomAutoRooter, CustomAutoRooterGuard, HandleObject, HandleValue};
 use net_traits::request::Referrer;
-use script_traits::{StructuredSerializedData, WorkerScriptLoadOrigin};
 use uuid::Uuid;
 
 use crate::dom::abstractworker::{SimpleWorkerErrorHandler, WorkerScriptMsg};
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::MessagePortBinding::StructuredSerializeOptions;
 use crate::dom::bindings::codegen::Bindings::WorkerBinding::{WorkerMethods, WorkerOptions};
+use crate::dom::bindings::codegen::UnionTypes::TrustedScriptURLOrUSVString;
 use crate::dom::bindings::error::{Error, ErrorResult, Fallible};
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::refcounted::Trusted;
 use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto};
 use crate::dom::bindings::root::DomRoot;
-use crate::dom::bindings::str::USVString;
 use crate::dom::bindings::structuredclone;
 use crate::dom::bindings::trace::{CustomTraceable, RootedTraceableBox};
 use crate::dom::dedicatedworkerglobalscope::{
@@ -35,6 +35,7 @@ use crate::dom::dedicatedworkerglobalscope::{
 use crate::dom::eventtarget::EventTarget;
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::messageevent::MessageEvent;
+use crate::dom::trustedscripturl::TrustedScriptURL;
 use crate::dom::window::Window;
 use crate::dom::workerglobalscope::prepare_workerscope_init;
 use crate::realms::enter_realm;
@@ -162,11 +163,21 @@ impl WorkerMethods<crate::DomTypeHolder> for Worker {
         global: &GlobalScope,
         proto: Option<HandleObject>,
         can_gc: CanGc,
-        script_url: USVString,
+        script_url: TrustedScriptURLOrUSVString,
         worker_options: &WorkerOptions,
     ) -> Fallible<DomRoot<Worker>> {
+        // Step 1: Let compliantScriptURL be the result of invoking the
+        // Get Trusted Type compliant string algorithm with TrustedScriptURL,
+        // this's relevant global object, scriptURL, "Worker constructor", and "script".
+        let compliant_script_url = TrustedScriptURL::get_trusted_script_url_compliant_string(
+            global,
+            script_url,
+            "Worker",
+            "constructor",
+            can_gc,
+        )?;
         // Step 2-4.
-        let worker_url = match global.api_base_url().join(&script_url) {
+        let worker_url = match global.api_base_url().join(&compliant_script_url) {
             Ok(url) => url,
             Err(_) => return Err(Error::Syntax),
         };
@@ -213,6 +224,16 @@ impl WorkerMethods<crate::DomTypeHolder> for Worker {
                     devtools_sender.clone(),
                     page_info,
                 ));
+
+                let source_info = SourceInfo {
+                    url: worker_url.clone(),
+                    external: true, // Worker scripts are always external.
+                    worker_id: Some(worker_id),
+                };
+                let _ = chan.send(ScriptToDevtoolsControlMsg::ScriptSourceLoaded(
+                    pipeline_id,
+                    source_info,
+                ));
             }
         }
 
@@ -243,6 +264,7 @@ impl WorkerMethods<crate::DomTypeHolder> for Worker {
             control_receiver,
             context_sender,
             global.insecure_requests_policy(),
+            global.policy_container(),
         );
 
         let context = context_receiver
diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs
index 276b39657a6..fa94dcc1d04 100644
--- a/components/script/dom/workerglobalscope.rs
+++ b/components/script/dom/workerglobalscope.rs
@@ -11,6 +11,8 @@ use std::time::Duration;
 
 use base::cross_process_instant::CrossProcessInstant;
 use base::id::{PipelineId, PipelineNamespace};
+use constellation_traits::WorkerGlobalScopeInit;
+use content_security_policy::CspList;
 use crossbeam_channel::Receiver;
 use devtools_traits::{DevtoolScriptControlMsg, WorkerId};
 use dom_struct::dom_struct;
@@ -24,7 +26,7 @@ use net_traits::request::{
     CredentialsMode, Destination, InsecureRequestsPolicy, ParserMetadata,
     RequestBuilder as NetRequestInit,
 };
-use script_traits::WorkerGlobalScopeInit;
+use profile_traits::mem::{ProcessReports, perform_memory_report};
 use servo_url::{MutableOrigin, ServoUrl};
 use timers::TimerScheduler;
 use uuid::Uuid;
@@ -38,7 +40,9 @@ use crate::dom::bindings::codegen::Bindings::RequestBinding::RequestInit;
 use crate::dom::bindings::codegen::Bindings::VoidFunctionBinding::VoidFunction;
 use crate::dom::bindings::codegen::Bindings::WorkerBinding::WorkerType;
 use crate::dom::bindings::codegen::Bindings::WorkerGlobalScopeBinding::WorkerGlobalScopeMethods;
-use crate::dom::bindings::codegen::UnionTypes::{RequestOrUSVString, StringOrFunction};
+use crate::dom::bindings::codegen::UnionTypes::{
+    RequestOrUSVString, StringOrFunction, TrustedScriptURLOrUSVString,
+};
 use crate::dom::bindings::error::{Error, ErrorResult, Fallible, report_pending_exception};
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::reflector::DomObject;
@@ -51,6 +55,8 @@ use crate::dom::dedicatedworkerglobalscope::DedicatedWorkerGlobalScope;
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::performance::Performance;
 use crate::dom::promise::Promise;
+use crate::dom::trustedscripturl::TrustedScriptURL;
+use crate::dom::trustedtypepolicyfactory::TrustedTypePolicyFactory;
 #[cfg(feature = "webgpu")]
 use crate::dom::webgpu::identityhub::IdentityHub;
 use crate::dom::window::{base64_atob, base64_btoa};
@@ -79,7 +85,6 @@ pub(crate) fn prepare_workerscope_init(
         pipeline_id: global.pipeline_id(),
         origin: global.origin().immutable().clone(),
         creation_url: global.creation_url().clone(),
-        user_agent: global.get_user_agent(),
         inherited_secure_context: Some(global.is_secure_context()),
     };
 
@@ -122,6 +127,7 @@ pub(crate) struct WorkerGlobalScope {
     #[no_trace]
     navigation_start: CrossProcessInstant,
     performance: MutNullableDom<Performance>,
+    trusted_types: MutNullableDom<TrustedTypePolicyFactory>,
 
     /// A [`TimerScheduler`] used to schedule timers for this [`WorkerGlobalScope`].
     /// Timers are handled in the service worker event loop.
@@ -164,7 +170,6 @@ impl WorkerGlobalScope {
                 MutableOrigin::new(init.origin),
                 init.creation_url,
                 runtime.microtask_queue.clone(),
-                init.user_agent,
                 #[cfg(feature = "webgpu")]
                 gpu_id_hub,
                 init.inherited_secure_context,
@@ -185,6 +190,7 @@ impl WorkerGlobalScope {
             performance: Default::default(),
             timer_scheduler: RefCell::default(),
             insecure_requests_policy,
+            trusted_types: Default::default(),
         }
     }
 
@@ -244,6 +250,10 @@ impl WorkerGlobalScope {
         self.policy_container.borrow()
     }
 
+    pub(crate) fn set_csp_list(&self, csp_list: Option<CspList>) {
+        self.policy_container.borrow_mut().set_csp_list(csp_list);
+    }
+
     /// Get a mutable reference to the [`TimerScheduler`] for this [`ServiceWorkerGlobalScope`].
     pub(crate) fn timer_scheduler(&self) -> RefMut<TimerScheduler> {
         self.timer_scheduler.borrow_mut()
@@ -274,9 +284,25 @@ impl WorkerGlobalScopeMethods<crate::DomTypeHolder> for WorkerGlobalScope {
     error_event_handler!(error, GetOnerror, SetOnerror);
 
     // https://html.spec.whatwg.org/multipage/#dom-workerglobalscope-importscripts
-    fn ImportScripts(&self, url_strings: Vec<DOMString>, can_gc: CanGc) -> ErrorResult {
+    fn ImportScripts(
+        &self,
+        url_strings: Vec<TrustedScriptURLOrUSVString>,
+        can_gc: CanGc,
+    ) -> ErrorResult {
+        // Step 1: Let urlStrings be « ».
         let mut urls = Vec::with_capacity(url_strings.len());
+        // Step 2: For each url of urls:
         for url in url_strings {
+            // Step 3: Append the result of invoking the Get Trusted Type compliant string algorithm
+            // with TrustedScriptURL, this's relevant global object, url, "WorkerGlobalScope importScripts",
+            // and "script" to urlStrings.
+            let url = TrustedScriptURL::get_trusted_script_url_compliant_string(
+                self.upcast::<GlobalScope>(),
+                url,
+                "WorkerGlobalScope",
+                "importScripts",
+                can_gc,
+            )?;
             let url = self.worker_url.borrow().join(&url);
             match url {
                 Ok(url) => urls.push(url),
@@ -298,6 +324,10 @@ impl WorkerGlobalScopeMethods<crate::DomTypeHolder> for WorkerGlobalScope {
             .use_url_credentials(true)
             .origin(global_scope.origin().immutable().clone())
             .insecure_requests_policy(self.insecure_requests_policy())
+            .policy_container(global_scope.policy_container())
+            .has_trustworthy_ancestor_origin(
+                global_scope.has_trustworthy_ancestor_or_current_origin(),
+            )
             .pipeline_id(Some(self.upcast::<GlobalScope>().pipeline_id()));
 
             let (url, source) = match fetch::load_whole_resource(
@@ -346,7 +376,7 @@ impl WorkerGlobalScopeMethods<crate::DomTypeHolder> for WorkerGlobalScope {
 
     // https://html.spec.whatwg.org/multipage/#dfn-Crypto
     fn Crypto(&self) -> DomRoot<Crypto> {
-        self.upcast::<GlobalScope>().crypto()
+        self.upcast::<GlobalScope>().crypto(CanGc::note())
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-windowbase64-btoa
@@ -475,6 +505,14 @@ impl WorkerGlobalScopeMethods<crate::DomTypeHolder> for WorkerGlobalScope {
         self.upcast::<GlobalScope>()
             .structured_clone(cx, value, options, retval)
     }
+
+    /// <https://www.w3.org/TR/trusted-types/#dom-windoworworkerglobalscope-trustedtypes>
+    fn TrustedTypes(&self, can_gc: CanGc) -> DomRoot<TrustedTypePolicyFactory> {
+        self.trusted_types.or_init(|| {
+            let global_scope = self.upcast::<GlobalScope>();
+            TrustedTypePolicyFactory::new(global_scope, can_gc)
+        })
+    }
 }
 
 impl WorkerGlobalScope {
@@ -533,8 +571,10 @@ impl WorkerGlobalScope {
             CommonScriptMsg::Task(_, task, _, _) => task.run_box(),
             CommonScriptMsg::CollectReports(reports_chan) => {
                 let cx = self.get_cx();
-                let reports = cx.get_reports(format!("url({})", self.get_url()));
-                reports_chan.send(reports);
+                perform_memory_report(|ops| {
+                    let reports = cx.get_reports(format!("url({})", self.get_url()), ops);
+                    reports_chan.send(ProcessReports::new(reports));
+                });
             },
         }
         true
diff --git a/components/script/dom/workernavigator.rs b/components/script/dom/workernavigator.rs
index 1034381a287..0b0e90ffd0c 100644
--- a/components/script/dom/workernavigator.rs
+++ b/components/script/dom/workernavigator.rs
@@ -4,6 +4,7 @@
 
 use dom_struct::dom_struct;
 use js::rust::MutableHandleValue;
+use servo_config::pref;
 
 use crate::dom::bindings::codegen::Bindings::WorkerNavigatorBinding::WorkerNavigatorMethods;
 use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object};
@@ -85,7 +86,7 @@ impl WorkerNavigatorMethods<crate::DomTypeHolder> for WorkerNavigator {
 
     // https://html.spec.whatwg.org/multipage/#dom-navigator-useragent
     fn UserAgent(&self) -> DOMString {
-        navigatorinfo::UserAgent(self.global().get_user_agent())
+        navigatorinfo::UserAgent(&pref!(user_agent))
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-navigator-appversion
@@ -104,6 +105,11 @@ impl WorkerNavigatorMethods<crate::DomTypeHolder> for WorkerNavigator {
         to_frozen_array(&[self.Language()], cx, retval, can_gc)
     }
 
+    /// <https://html.spec.whatwg.org/multipage/#dom-navigator-online>
+    fn OnLine(&self) -> bool {
+        true
+    }
+
     // https://w3c.github.io/permissions/#navigator-and-workernavigator-extension
     fn Permissions(&self) -> DomRoot<Permissions> {
         self.permissions
diff --git a/components/script/dom/workletglobalscope.rs b/components/script/dom/workletglobalscope.rs
index 0055d39bec3..6e81220731c 100644
--- a/components/script/dom/workletglobalscope.rs
+++ b/components/script/dom/workletglobalscope.rs
@@ -2,10 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use std::borrow::Cow;
 use std::sync::Arc;
 
 use base::id::PipelineId;
+use constellation_traits::{ScriptToConstellationChan, ScriptToConstellationMessage};
 use crossbeam_channel::Sender;
 use devtools_traits::ScriptToDevtoolsControlMsg;
 use dom_struct::dom_struct;
@@ -15,13 +15,15 @@ use js::rust::Runtime;
 use net_traits::ResourceThreads;
 use net_traits::image_cache::ImageCache;
 use profile_traits::{mem, time};
-use script_traits::{Painter, ScriptMsg, ScriptToConstellationChan};
+use script_bindings::realms::InRealm;
+use script_traits::Painter;
 use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl};
 use stylo_atoms::Atom;
 
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::trace::CustomTraceable;
+use crate::dom::bindings::utils::define_all_exposed_interfaces;
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::paintworkletglobalscope::{PaintWorkletGlobalScope, PaintWorkletTask};
 use crate::dom::testworkletglobalscope::{TestWorkletGlobalScope, TestWorkletTask};
@@ -29,6 +31,7 @@ use crate::dom::testworkletglobalscope::{TestWorkletGlobalScope, TestWorkletTask
 use crate::dom::webgpu::identityhub::IdentityHub;
 use crate::dom::worklet::WorkletExecutor;
 use crate::messaging::MainThreadScriptMsg;
+use crate::realms::enter_realm;
 use crate::script_module::ScriptFetchOptions;
 use crate::script_runtime::{CanGc, JSContext};
 
@@ -56,7 +59,7 @@ impl WorkletGlobalScope {
         executor: WorkletExecutor,
         init: &WorkletGlobalScopeInit,
     ) -> DomRoot<WorkletGlobalScope> {
-        match scope_type {
+        let scope: DomRoot<WorkletGlobalScope> = match scope_type {
             WorkletGlobalScopeType::Test => DomRoot::upcast(TestWorkletGlobalScope::new(
                 runtime,
                 pipeline_id,
@@ -71,7 +74,12 @@ impl WorkletGlobalScope {
                 executor,
                 init,
             )),
-        }
+        };
+
+        let realm = enter_realm(&*scope);
+        define_all_exposed_interfaces(scope.upcast(), InRealm::entered(&realm), CanGc::note());
+
+        scope
     }
 
     /// Create a new stack-allocated `WorkletGlobalScope`.
@@ -96,7 +104,6 @@ impl WorkletGlobalScope {
                 MutableOrigin::new(ImmutableOrigin::new_opaque()),
                 None,
                 Default::default(),
-                init.user_agent.clone(),
                 #[cfg(feature = "webgpu")]
                 init.gpu_id_hub.clone(),
                 init.inherited_secure_context,
@@ -182,11 +189,9 @@ pub(crate) struct WorkletGlobalScopeInit {
     /// Channel to devtools
     pub(crate) devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>,
     /// Messages to send to constellation
-    pub(crate) to_constellation_sender: IpcSender<(PipelineId, ScriptMsg)>,
+    pub(crate) to_constellation_sender: IpcSender<(PipelineId, ScriptToConstellationMessage)>,
     /// The image cache
     pub(crate) image_cache: Arc<dyn ImageCache>,
-    /// An optional string allowing the user agent to be set for testing
-    pub(crate) user_agent: Cow<'static, str>,
     /// Identity manager for WebGPU resources
     #[cfg(feature = "webgpu")]
     pub(crate) gpu_id_hub: Arc<IdentityHub>,
diff --git a/components/script/dom/writablestream.rs b/components/script/dom/writablestream.rs
index 7de6b013169..f528f4fbde2 100644
--- a/components/script/dom/writablestream.rs
+++ b/components/script/dom/writablestream.rs
@@ -2,12 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use std::cell::Cell;
-use std::collections::VecDeque;
+use std::cell::{Cell, RefCell};
+use std::collections::{HashMap, VecDeque};
 use std::mem;
 use std::ptr::{self};
 use std::rc::Rc;
 
+use base::id::{MessagePortId, MessagePortIndex};
+use constellation_traits::MessagePortImpl;
 use dom_struct::dom_struct;
 use js::jsapi::{Heap, JSObject};
 use js::jsval::{JSVal, ObjectValue, UndefinedValue};
@@ -15,21 +17,31 @@ use js::rust::{
     HandleObject as SafeHandleObject, HandleValue as SafeHandleValue,
     MutableHandleValue as SafeMutableHandleValue,
 };
+use script_bindings::codegen::GenericBindings::MessagePortBinding::MessagePortMethods;
 
+use super::bindings::codegen::Bindings::QueuingStrategyBinding::QueuingStrategySize;
 use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::QueuingStrategyBinding::QueuingStrategy;
 use crate::dom::bindings::codegen::Bindings::UnderlyingSinkBinding::UnderlyingSink;
 use crate::dom::bindings::codegen::Bindings::WritableStreamBinding::WritableStreamMethods;
 use crate::dom::bindings::conversions::ConversionResult;
 use crate::dom::bindings::error::{Error, Fallible};
-use crate::dom::bindings::reflector::{Reflector, reflect_dom_object_with_proto};
+use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object_with_proto};
 use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
+use crate::dom::bindings::structuredclone::StructuredData;
+use crate::dom::bindings::transferable::Transferable;
 use crate::dom::countqueuingstrategy::{extract_high_water_mark, extract_size_algorithm};
+use crate::dom::domexception::{DOMErrorName, DOMException};
 use crate::dom::globalscope::GlobalScope;
+use crate::dom::messageport::MessagePort;
 use crate::dom::promise::Promise;
 use crate::dom::promisenativehandler::{Callback, PromiseNativeHandler};
-use crate::dom::writablestreamdefaultcontroller::WritableStreamDefaultController;
+use crate::dom::readablestream::{ReadableStream, get_type_and_value_from_message};
+use crate::dom::writablestreamdefaultcontroller::{
+    UnderlyingSinkType, WritableStreamDefaultController,
+};
 use crate::dom::writablestreamdefaultwriter::WritableStreamDefaultWriter;
+use crate::js::conversions::ToJSValConvertible;
 use crate::realms::{InRealm, enter_realm};
 use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
 
@@ -155,7 +167,7 @@ pub struct WritableStream {
 
 impl WritableStream {
     #[cfg_attr(crown, allow(crown::unrooted_must_root))]
-    /// <https://streams.spec.whatwg.org/#initialize-readable-stream>
+    /// <https://streams.spec.whatwg.org/#initialize-writable-stream>
     fn new_inherited() -> WritableStream {
         WritableStream {
             reflector_: Reflector::new(),
@@ -173,7 +185,7 @@ impl WritableStream {
         }
     }
 
-    fn new_with_proto(
+    pub(crate) fn new_with_proto(
         global: &GlobalScope,
         proto: Option<SafeHandleObject>,
         can_gc: CanGc,
@@ -198,6 +210,11 @@ impl WritableStream {
         self.controller.set(Some(controller));
     }
 
+    #[allow(unused)]
+    pub(crate) fn get_default_controller(&self) -> DomRoot<WritableStreamDefaultController> {
+        self.controller.get().expect("Controller should be set.")
+    }
+
     pub(crate) fn is_writable(&self) -> bool {
         matches!(self.state.get(), WritableStreamState::Writable)
     }
@@ -832,6 +849,149 @@ impl WritableStream {
         // Set stream.[[backpressure]] to backpressure.
         self.set_backpressure(backpressure);
     }
+
+    /// <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformwritable>
+    pub(crate) fn setup_cross_realm_transform_writable(
+        &self,
+        cx: SafeJSContext,
+        port: &MessagePort,
+        can_gc: CanGc,
+    ) {
+        let port_id = port.message_port_id();
+        let global = self.global();
+
+        // Perform ! InitializeWritableStream(stream).
+        // Done in `new_inherited`.
+
+        // Let sizeAlgorithm be an algorithm that returns 1.
+        // Re-ordered because of the need to pass it to `new`.
+        let size_algorithm = extract_size_algorithm(&QueuingStrategy::default(), can_gc);
+
+        // Note: other algorithms defined in the controller at call site.
+
+        // Let backpressurePromise be a new promise.
+        let backpressure_promise = Rc::new(RefCell::new(Some(Promise::new(&global, can_gc))));
+
+        // Let controller be a new WritableStreamDefaultController.
+        let controller = WritableStreamDefaultController::new(
+            &global,
+            UnderlyingSinkType::Transfer {
+                backpressure_promise: backpressure_promise.clone(),
+                port: Dom::from_ref(port),
+            },
+            1.0,
+            size_algorithm,
+            can_gc,
+        );
+
+        // Add a handler for port’s message event with the following steps:
+        // Add a handler for port’s messageerror event with the following steps:
+        rooted!(in(*cx) let cross_realm_transform_writable = CrossRealmTransformWritable {
+            controller: Dom::from_ref(&controller),
+            backpressure_promise: backpressure_promise.clone(),
+        });
+        global.note_cross_realm_transform_writable(&cross_realm_transform_writable, port_id);
+
+        // Enable port’s port message queue.
+        port.Start(can_gc);
+
+        // Perform ! SetUpWritableStreamDefaultController
+        controller
+            .setup(cx, &global, self, can_gc)
+            .expect("Setup for transfer cannot fail");
+    }
+    /// <https://streams.spec.whatwg.org/#set-up-writable-stream-default-controller-from-underlying-sink>
+    #[allow(clippy::too_many_arguments)]
+    pub(crate) fn setup_from_underlying_sink(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        stream: &WritableStream,
+        underlying_sink_obj: SafeHandleObject,
+        underlying_sink: &UnderlyingSink,
+        strategy_hwm: f64,
+        strategy_size: Rc<QueuingStrategySize>,
+        can_gc: CanGc,
+    ) -> Result<(), Error> {
+        // Let controller be a new WritableStreamDefaultController.
+
+        // Let startAlgorithm be an algorithm that returns undefined.
+
+        // Let writeAlgorithm be an algorithm that returns a promise resolved with undefined.
+
+        // Let closeAlgorithm be an algorithm that returns a promise resolved with undefined.
+
+        // Let abortAlgorithm be an algorithm that returns a promise resolved with undefined.
+
+        // If underlyingSinkDict["start"] exists, then set startAlgorithm to an algorithm which
+        // returns the result of invoking underlyingSinkDict["start"] with argument
+        // list « controller », exception behavior "rethrow", and callback this value underlyingSink.
+
+        // If underlyingSinkDict["write"] exists, then set writeAlgorithm to an algorithm which
+        // takes an argument chunk and returns the result of invoking underlyingSinkDict["write"]
+        // with argument list « chunk, controller » and callback this value underlyingSink.
+
+        // If underlyingSinkDict["close"] exists, then set closeAlgorithm to an algorithm which
+        // returns the result of invoking underlyingSinkDict["close"] with argument
+        // list «» and callback this value underlyingSink.
+
+        // If underlyingSinkDict["abort"] exists, then set abortAlgorithm to an algorithm which
+        // takes an argument reason and returns the result of invoking underlyingSinkDict["abort"]
+        // with argument list « reason » and callback this value underlyingSink.
+        let controller = WritableStreamDefaultController::new(
+            global,
+            UnderlyingSinkType::new_js(
+                underlying_sink.abort.clone(),
+                underlying_sink.start.clone(),
+                underlying_sink.close.clone(),
+                underlying_sink.write.clone(),
+            ),
+            strategy_hwm,
+            strategy_size,
+            can_gc,
+        );
+
+        // Note: this must be done before `setup`,
+        // otherwise `thisOb` is null in the start callback.
+        controller.set_underlying_sink_this_object(underlying_sink_obj);
+
+        // Perform ? SetUpWritableStreamDefaultController
+        controller.setup(cx, global, stream, can_gc)
+    }
+}
+
+/// <https://streams.spec.whatwg.org/#create-writable-stream>
+#[cfg_attr(crown, allow(crown::unrooted_must_root))]
+pub(crate) fn create_writable_stream(
+    cx: SafeJSContext,
+    global: &GlobalScope,
+    writable_high_water_mark: f64,
+    writable_size_algorithm: Rc<QueuingStrategySize>,
+    underlying_sink_type: UnderlyingSinkType,
+    can_gc: CanGc,
+) -> Fallible<DomRoot<WritableStream>> {
+    // Assert: ! IsNonNegativeNumber(highWaterMark) is true.
+    assert!(writable_high_water_mark >= 0.0);
+
+    // Let stream be a new WritableStream.
+    // Perform ! InitializeWritableStream(stream).
+    let stream = WritableStream::new_with_proto(global, None, can_gc);
+
+    // Let controller be a new WritableStreamDefaultController.
+    let controller = WritableStreamDefaultController::new(
+        global,
+        underlying_sink_type,
+        writable_high_water_mark,
+        writable_size_algorithm,
+        can_gc,
+    );
+
+    // Perform ? SetUpWritableStreamDefaultController(stream, controller, startAlgorithm, writeAlgorithm,
+    // closeAlgorithm, abortAlgorithm, highWaterMark, sizeAlgorithm).
+    controller.setup(cx, global, &stream, can_gc)?;
+
+    // Return stream.
+    Ok(stream)
 }
 
 impl WritableStreamMethods<crate::DomTypeHolder> for WritableStream {
@@ -876,21 +1036,18 @@ impl WritableStreamMethods<crate::DomTypeHolder> for WritableStream {
         // Let highWaterMark be ? ExtractHighWaterMark(strategy, 1).
         let high_water_mark = extract_high_water_mark(strategy, 1.0)?;
 
-        // Perform ? SetUpWritableStreamDefaultControllerFromUnderlyingSink
-        let controller = WritableStreamDefaultController::new(
+        // Perform ? SetUpWritableStreamDefaultControllerFromUnderlyingSink(this, underlyingSink,
+        // underlyingSinkDict, highWaterMark, sizeAlgorithm).
+        stream.setup_from_underlying_sink(
+            cx,
             global,
+            &stream,
+            underlying_sink_obj.handle(),
             &underlying_sink_dict,
             high_water_mark,
             size_algorithm,
             can_gc,
-        );
-
-        // Note: this must be done before `setup`,
-        // otherwise `thisOb` is null in the start callback.
-        controller.set_underlying_sink_this_object(underlying_sink_obj.handle());
-
-        // Perform ? SetUpWritableStreamDefaultController
-        controller.setup(cx, global, &stream, &underlying_sink_dict.start, can_gc)?;
+        )?;
 
         Ok(stream)
     }
@@ -964,3 +1121,166 @@ impl WritableStreamMethods<crate::DomTypeHolder> for WritableStream {
         self.aquire_default_writer(cx, &global, can_gc)
     }
 }
+
+impl js::gc::Rootable for CrossRealmTransformWritable {}
+
+/// <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformwritable>
+/// A wrapper to handle `message` and `messageerror` events
+/// for the port used by the transfered stream.
+#[derive(Clone, JSTraceable, MallocSizeOf)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+pub(crate) struct CrossRealmTransformWritable {
+    /// The controller used in the algorithm.
+    controller: Dom<WritableStreamDefaultController>,
+
+    /// The `backpressurePromise` used in the algorithm.
+    #[ignore_malloc_size_of = "Rc is hard"]
+    backpressure_promise: Rc<RefCell<Option<Rc<Promise>>>>,
+}
+
+impl CrossRealmTransformWritable {
+    /// <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformwritable>
+    /// Add a handler for port’s message event with the following steps:
+    #[allow(unsafe_code)]
+    pub(crate) fn handle_message(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        message: SafeHandleValue,
+        _realm: InRealm,
+        can_gc: CanGc,
+    ) {
+        rooted!(in(*cx) let mut value = UndefinedValue());
+        let type_string =
+            unsafe { get_type_and_value_from_message(cx, message, value.handle_mut(), can_gc) };
+
+        // If type is "pull",
+        // Done below as the steps are the same for both types.
+
+        // Otherwise, if type is "error",
+        if type_string == "error" {
+            // Perform ! WritableStreamDefaultControllerErrorIfNeeded(controller, value).
+            self.controller
+                .error_if_needed(cx, value.handle(), global, can_gc);
+        }
+
+        let backpressure_promise = self.backpressure_promise.borrow_mut().take();
+
+        // Note: the below steps are for both "pull" and "error" types.
+        // If backpressurePromise is not undefined,
+        if let Some(promise) = backpressure_promise {
+            // Resolve backpressurePromise with undefined.
+            promise.resolve_native(&(), can_gc);
+
+            // Set backpressurePromise to undefined.
+            // Done above with `take`.
+        }
+    }
+
+    /// <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformwritable>
+    /// Add a handler for port’s messageerror event with the following steps:
+    #[allow(unsafe_code)]
+    pub(crate) fn handle_error(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        port: &MessagePort,
+        _realm: InRealm,
+        can_gc: CanGc,
+    ) {
+        // Let error be a new "DataCloneError" DOMException.
+        let error = DOMException::new(global, DOMErrorName::DataCloneError, can_gc);
+        rooted!(in(*cx) let mut rooted_error = UndefinedValue());
+        unsafe { error.to_jsval(*cx, rooted_error.handle_mut()) };
+
+        // Perform ! CrossRealmTransformSendError(port, error).
+        port.cross_realm_transform_send_error(rooted_error.handle(), can_gc);
+
+        // Perform ! WritableStreamDefaultControllerErrorIfNeeded(controller, error).
+        self.controller
+            .error_if_needed(cx, rooted_error.handle(), global, can_gc);
+
+        // Disentangle port.
+        global.disentangle_port(port, can_gc);
+    }
+}
+
+/// <https://streams.spec.whatwg.org/#ws-transfer>
+impl Transferable for WritableStream {
+    type Index = MessagePortIndex;
+    type Data = MessagePortImpl;
+
+    /// <https://streams.spec.whatwg.org/#ref-for-writablestream%E2%91%A0%E2%91%A4>
+    fn transfer(&self) -> Result<(MessagePortId, MessagePortImpl), ()> {
+        // If ! IsWritableStreamLocked(value) is true, throw a "DataCloneError" DOMException.
+        if self.is_locked() {
+            return Err(());
+        }
+
+        let global = self.global();
+        let realm = enter_realm(&*global);
+        let comp = InRealm::Entered(&realm);
+        let cx = GlobalScope::get_cx();
+        let can_gc = CanGc::note();
+
+        // Let port1 be a new MessagePort in the current Realm.
+        let port_1 = MessagePort::new(&global, can_gc);
+        global.track_message_port(&port_1, None);
+
+        // Let port2 be a new MessagePort in the current Realm.
+        let port_2 = MessagePort::new(&global, can_gc);
+        global.track_message_port(&port_2, None);
+
+        // Entangle port1 and port2.
+        global.entangle_ports(*port_1.message_port_id(), *port_2.message_port_id());
+
+        // Let readable be a new ReadableStream in the current Realm.
+        let readable = ReadableStream::new_with_proto(&global, None, can_gc);
+
+        // Perform ! SetUpCrossRealmTransformReadable(readable, port1).
+        readable.setup_cross_realm_transform_readable(cx, &port_1, can_gc);
+
+        // Let promise be ! ReadableStreamPipeTo(readable, value, false, false, false).
+        let promise = readable.pipe_to(cx, &global, self, false, false, false, comp, can_gc);
+
+        // Set promise.[[PromiseIsHandled]] to true.
+        promise.set_promise_is_handled();
+
+        // Set dataHolder.[[port]] to ! StructuredSerializeWithTransfer(port2, « port2 »).
+        port_2.transfer()
+    }
+
+    /// <https://streams.spec.whatwg.org/#ref-for-writablestream%E2%91%A0%E2%91%A4>
+    fn transfer_receive(
+        owner: &GlobalScope,
+        id: MessagePortId,
+        port_impl: MessagePortImpl,
+    ) -> Result<DomRoot<Self>, ()> {
+        let cx = GlobalScope::get_cx();
+        let can_gc = CanGc::note();
+
+        // Their transfer-receiving steps, given dataHolder and value, are:
+        // Note: dataHolder is used in `structuredclone.rs`, and value is created here.
+        let value = WritableStream::new_with_proto(owner, None, can_gc);
+
+        // Let deserializedRecord be ! StructuredDeserializeWithTransfer(dataHolder.[[port]], the current Realm).
+        // Done with the `Deserialize` derive of `MessagePortImpl`.
+
+        // Let port be deserializedRecord.[[Deserialized]].
+        let transferred_port = MessagePort::transfer_receive(owner, id, port_impl)?;
+
+        // Perform ! SetUpCrossRealmTransformWritable(value, port).
+        value.setup_cross_realm_transform_writable(cx, &transferred_port, can_gc);
+        Ok(value)
+    }
+
+    /// Note: we are relying on the port transfer, so the data returned here are related to the port.
+    fn serialized_storage<'a>(
+        data: StructuredData<'a, '_>,
+    ) -> &'a mut Option<HashMap<MessagePortId, Self::Data>> {
+        match data {
+            StructuredData::Reader(r) => &mut r.port_impls,
+            StructuredData::Writer(w) => &mut w.ports,
+        }
+    }
+}
diff --git a/components/script/dom/writablestreamdefaultcontroller.rs b/components/script/dom/writablestreamdefaultcontroller.rs
index 53de61df506..135ee6faa59 100644
--- a/components/script/dom/writablestreamdefaultcontroller.rs
+++ b/components/script/dom/writablestreamdefaultcontroller.rs
@@ -12,16 +12,18 @@ use js::jsval::{JSVal, UndefinedValue};
 use js::rust::{HandleObject as SafeHandleObject, HandleValue as SafeHandleValue, IntoHandle};
 
 use super::bindings::codegen::Bindings::QueuingStrategyBinding::QueuingStrategySize;
+use super::types::TransformStream;
 use crate::dom::bindings::callback::ExceptionHandling;
 use crate::dom::bindings::codegen::Bindings::UnderlyingSinkBinding::{
-    UnderlyingSink, UnderlyingSinkAbortCallback, UnderlyingSinkCloseCallback,
-    UnderlyingSinkStartCallback, UnderlyingSinkWriteCallback,
+    UnderlyingSinkAbortCallback, UnderlyingSinkCloseCallback, UnderlyingSinkStartCallback,
+    UnderlyingSinkWriteCallback,
 };
 use crate::dom::bindings::codegen::Bindings::WritableStreamDefaultControllerBinding::WritableStreamDefaultControllerMethods;
-use crate::dom::bindings::error::{Error, ErrorToJsval};
-use crate::dom::bindings::reflector::{Reflector, reflect_dom_object};
+use crate::dom::bindings::error::{Error, ErrorToJsval, Fallible};
+use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object};
 use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
 use crate::dom::globalscope::GlobalScope;
+use crate::dom::messageport::MessagePort;
 use crate::dom::promise::Promise;
 use crate::dom::promisenativehandler::{Callback, PromiseNativeHandler};
 use crate::dom::readablestreamdefaultcontroller::{EnqueuedValue, QueueWithSizes, ValueWithSize};
@@ -135,6 +137,57 @@ impl Callback for StartAlgorithmRejectionHandler {
     }
 }
 
+impl js::gc::Rootable for TransferBackPressurePromiseReaction {}
+
+/// Reacting to backpressurePromise as part of the `writeAlgorithm` of
+/// <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformwritable>
+#[derive(JSTraceable, MallocSizeOf)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+struct TransferBackPressurePromiseReaction {
+    /// The result of reacting to backpressurePromise.
+    #[ignore_malloc_size_of = "Rc is hard"]
+    result_promise: Rc<Promise>,
+
+    /// The backpressurePromise.
+    #[ignore_malloc_size_of = "Rc is hard"]
+    backpressure_promise: Rc<RefCell<Option<Rc<Promise>>>>,
+
+    /// The chunk received by the `writeAlgorithm`.
+    #[ignore_malloc_size_of = "mozjs"]
+    chunk: Box<Heap<JSVal>>,
+
+    /// The port used in the algorithm.
+    port: Dom<MessagePort>,
+}
+
+impl Callback for TransferBackPressurePromiseReaction {
+    /// Reacting to backpressurePromise with the following fulfillment steps:
+    fn callback(&self, cx: SafeJSContext, _v: SafeHandleValue, _realm: InRealm, can_gc: CanGc) {
+        let global = self.result_promise.global();
+        // Set backpressurePromise to a new promise.
+        *self.backpressure_promise.borrow_mut() = Some(Promise::new(&global, can_gc));
+
+        // Let result be PackAndPostMessageHandlingError(port, "chunk", chunk).
+        rooted!(in(*cx) let mut chunk = UndefinedValue());
+        chunk.set(self.chunk.get());
+        let result =
+            self.port
+                .pack_and_post_message_handling_error("chunk", chunk.handle(), can_gc);
+
+        // If result is an abrupt completion,
+        if let Err(error) = result {
+            // Disentangle port.
+            global.disentangle_port(&self.port, can_gc);
+
+            // Return a promise rejected with result.[[Value]].
+            self.result_promise.reject_error(error, can_gc);
+        } else {
+            // Otherwise, return a promise resolved with undefined.
+            self.result_promise.resolve_native(&(), can_gc);
+        }
+    }
+}
+
 impl js::gc::Rootable for WriteAlgorithmFulfillmentHandler {}
 
 /// The fulfillment handler for
@@ -214,22 +267,58 @@ impl Callback for WriteAlgorithmRejectionHandler {
     }
 }
 
+/// The type of sink algorithms we are using.
+#[derive(JSTraceable, PartialEq)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+pub enum UnderlyingSinkType {
+    /// Algorithms are provided by Js callbacks.
+    Js {
+        /// <https://streams.spec.whatwg.org/#writablestreamdefaultcontroller-abortalgorithm>
+        abort: RefCell<Option<Rc<UnderlyingSinkAbortCallback>>>,
+
+        start: RefCell<Option<Rc<UnderlyingSinkStartCallback>>>,
+
+        /// <https://streams.spec.whatwg.org/#writablestreamdefaultcontroller-closealgorithm>
+        close: RefCell<Option<Rc<UnderlyingSinkCloseCallback>>>,
+
+        /// <https://streams.spec.whatwg.org/#writablestreamdefaultcontroller-writealgorithm>
+        write: RefCell<Option<Rc<UnderlyingSinkWriteCallback>>>,
+    },
+    /// Algorithms supporting streams transfer are implemented in Rust.
+    /// The promise and port used in those algorithms are stored here.
+    Transfer {
+        backpressure_promise: Rc<RefCell<Option<Rc<Promise>>>>,
+        port: Dom<MessagePort>,
+    },
+    /// Algorithms supporting transform streams are implemented in Rust.
+    Transform(Dom<TransformStream>, Rc<Promise>),
+}
+
+impl UnderlyingSinkType {
+    pub(crate) fn new_js(
+        abort: Option<Rc<UnderlyingSinkAbortCallback>>,
+        start: Option<Rc<UnderlyingSinkStartCallback>>,
+        close: Option<Rc<UnderlyingSinkCloseCallback>>,
+        write: Option<Rc<UnderlyingSinkWriteCallback>>,
+    ) -> Self {
+        UnderlyingSinkType::Js {
+            abort: RefCell::new(abort),
+            start: RefCell::new(start),
+            close: RefCell::new(close),
+            write: RefCell::new(write),
+        }
+    }
+}
+
 /// <https://streams.spec.whatwg.org/#ws-default-controller-class>
 #[dom_struct]
 pub struct WritableStreamDefaultController {
     reflector_: Reflector,
 
-    /// <https://streams.spec.whatwg.org/#writablestreamdefaultcontroller-abortalgorithm>
-    #[ignore_malloc_size_of = "Rc is hard"]
-    abort: RefCell<Option<Rc<UnderlyingSinkAbortCallback>>>,
-
-    /// <https://streams.spec.whatwg.org/#writablestreamdefaultcontroller-closealgorithm>
-    #[ignore_malloc_size_of = "Rc is hard"]
-    close: RefCell<Option<Rc<UnderlyingSinkCloseCallback>>>,
-
-    /// <https://streams.spec.whatwg.org/#writablestreamdefaultcontroller-writealgorithm>
-    #[ignore_malloc_size_of = "Rc is hard"]
-    write: RefCell<Option<Rc<UnderlyingSinkWriteCallback>>>,
+    /// The type of underlying sink used. Besides the default JS one,
+    /// there will be others for stream transfer, and for transform stream.
+    #[ignore_malloc_size_of = "underlying_sink_type"]
+    underlying_sink_type: UnderlyingSinkType,
 
     /// The JS object used as `this` when invoking sink algorithms.
     #[ignore_malloc_size_of = "mozjs"]
@@ -256,17 +345,15 @@ impl WritableStreamDefaultController {
     /// <https://streams.spec.whatwg.org/#set-up-writable-stream-default-controller-from-underlying-sink>
     #[cfg_attr(crown, allow(crown::unrooted_must_root))]
     fn new_inherited(
-        underlying_sink: &UnderlyingSink,
+        underlying_sink_type: UnderlyingSinkType,
         strategy_hwm: f64,
         strategy_size: Rc<QueuingStrategySize>,
     ) -> WritableStreamDefaultController {
         WritableStreamDefaultController {
             reflector_: Reflector::new(),
+            underlying_sink_type,
             queue: Default::default(),
             stream: Default::default(),
-            abort: RefCell::new(underlying_sink.abort.clone()),
-            close: RefCell::new(underlying_sink.close.clone()),
-            write: RefCell::new(underlying_sink.write.clone()),
             underlying_sink_obj: Default::default(),
             strategy_hwm,
             strategy_size: RefCell::new(Some(strategy_size)),
@@ -274,16 +361,17 @@ impl WritableStreamDefaultController {
         }
     }
 
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
     pub(crate) fn new(
         global: &GlobalScope,
-        underlying_sink: &UnderlyingSink,
+        underlying_sink_type: UnderlyingSinkType,
         strategy_hwm: f64,
         strategy_size: Rc<QueuingStrategySize>,
         can_gc: CanGc,
     ) -> DomRoot<WritableStreamDefaultController> {
         reflect_dom_object(
             Box::new(WritableStreamDefaultController::new_inherited(
-                underlying_sink,
+                underlying_sink_type,
                 strategy_hwm,
                 strategy_size,
             )),
@@ -303,27 +391,43 @@ impl WritableStreamDefaultController {
 
     /// <https://streams.spec.whatwg.org/#writable-stream-default-controller-clear-algorithms>
     fn clear_algorithms(&self) {
-        // Set controller.[[writeAlgorithm]] to undefined.
-        self.write.borrow_mut().take();
+        match &self.underlying_sink_type {
+            UnderlyingSinkType::Js {
+                abort,
+                start: _,
+                close,
+                write,
+            } => {
+                // Set controller.[[writeAlgorithm]] to undefined.
+                write.borrow_mut().take();
 
-        // Set controller.[[closeAlgorithm]] to undefined.
-        self.close.borrow_mut().take();
+                // Set controller.[[closeAlgorithm]] to undefined.
+                close.borrow_mut().take();
 
-        // Set controller.[[abortAlgorithm]] to undefined.
-        self.abort.borrow_mut().take();
+                // Set controller.[[abortAlgorithm]] to undefined.
+                abort.borrow_mut().take();
+            },
+            UnderlyingSinkType::Transfer {
+                backpressure_promise,
+                ..
+            } => {
+                backpressure_promise.borrow_mut().take();
+            },
+            UnderlyingSinkType::Transform(_, _) => {
+                return;
+            },
+        }
 
         // Set controller.[[strategySizeAlgorithm]] to undefined.
         self.strategy_size.borrow_mut().take();
     }
 
-    /// <https://streams.spec.whatwg.org/#set-up-writable-stream-default-controllerr>
-    #[allow(unsafe_code)]
+    /// <https://streams.spec.whatwg.org/#set-up-writable-stream-default-controller>
     pub(crate) fn setup(
         &self,
         cx: SafeJSContext,
         global: &GlobalScope,
         stream: &WritableStream,
-        start: &Option<Rc<UnderlyingSinkStartCallback>>,
         can_gc: CanGc,
     ) -> Result<(), Error> {
         // Assert: stream implements WritableStream.
@@ -364,34 +468,7 @@ impl WritableStreamDefaultController {
 
         // Let startResult be the result of performing startAlgorithm. (This may throw an exception.)
         // Let startPromise be a promise resolved with startResult.
-        let start_promise = if let Some(start) = start {
-            rooted!(in(*cx) let mut result_object = ptr::null_mut::<JSObject>());
-            rooted!(in(*cx) let mut result: JSVal);
-            rooted!(in(*cx) let this_object = self.underlying_sink_obj.get());
-            start.Call_(
-                &this_object.handle(),
-                self,
-                result.handle_mut(),
-                ExceptionHandling::Rethrow,
-                can_gc,
-            )?;
-            let is_promise = unsafe {
-                if result.is_object() {
-                    result_object.set(result.to_object());
-                    IsPromiseObject(result_object.handle().into_handle())
-                } else {
-                    false
-                }
-            };
-            if is_promise {
-                let promise = Promise::new_with_js_promise(result_object.handle(), cx);
-                promise
-            } else {
-                Promise::new_resolved(global, cx, result.get(), can_gc)
-            }
-        } else {
-            Promise::new_resolved(global, cx, (), can_gc)
-        };
+        let start_promise = self.start_algorithm(cx, global, can_gc)?;
 
         let rooted_default_controller = DomRoot::from_ref(self);
 
@@ -431,6 +508,64 @@ impl WritableStreamDefaultController {
         self.advance_queue_if_needed(cx, global, can_gc);
     }
 
+    #[allow(unsafe_code)]
+    fn start_algorithm(
+        &self,
+        cx: SafeJSContext,
+        global: &GlobalScope,
+        can_gc: CanGc,
+    ) -> Fallible<Rc<Promise>> {
+        match &self.underlying_sink_type {
+            UnderlyingSinkType::Js {
+                start,
+                abort: _,
+                close: _,
+                write: _,
+            } => {
+                let algo = start.borrow().clone();
+                let start_promise = if let Some(start) = algo {
+                    rooted!(in(*cx) let mut result_object = ptr::null_mut::<JSObject>());
+                    rooted!(in(*cx) let mut result: JSVal);
+                    rooted!(in(*cx) let this_object = self.underlying_sink_obj.get());
+                    start.Call_(
+                        &this_object.handle(),
+                        self,
+                        result.handle_mut(),
+                        ExceptionHandling::Rethrow,
+                        can_gc,
+                    )?;
+                    let is_promise = unsafe {
+                        if result.is_object() {
+                            result_object.set(result.to_object());
+                            IsPromiseObject(result_object.handle().into_handle())
+                        } else {
+                            false
+                        }
+                    };
+                    if is_promise {
+                        let promise = Promise::new_with_js_promise(result_object.handle(), cx);
+                        promise
+                    } else {
+                        Promise::new_resolved(global, cx, result.get(), can_gc)
+                    }
+                } else {
+                    // Let startAlgorithm be an algorithm that returns undefined.
+                    Promise::new_resolved(global, cx, (), can_gc)
+                };
+
+                Ok(start_promise)
+            },
+            UnderlyingSinkType::Transfer { .. } => {
+                // Let startAlgorithm be an algorithm that returns undefined.
+                Ok(Promise::new_resolved(global, cx, (), can_gc))
+            },
+            UnderlyingSinkType::Transform(_, start_promise) => {
+                // Let startAlgorithm be an algorithm that returns startPromise.
+                Ok(start_promise.clone())
+            },
+        }
+    }
+
     /// <https://streams.spec.whatwg.org/#ref-for-abstract-opdef-writablestreamcontroller-abortsteps>
     pub(crate) fn abort_steps(
         &self,
@@ -439,71 +574,199 @@ impl WritableStreamDefaultController {
         reason: SafeHandleValue,
         can_gc: CanGc,
     ) -> Rc<Promise> {
-        rooted!(in(*cx) let this_object = self.underlying_sink_obj.get());
-        let algo = self.abort.borrow().clone();
-        let result = if let Some(algo) = algo {
-            algo.Call_(
-                &this_object.handle(),
-                Some(reason),
-                ExceptionHandling::Rethrow,
-                can_gc,
-            )
-        } else {
-            Ok(Promise::new_resolved(global, cx, (), can_gc))
+        let result = match &self.underlying_sink_type {
+            UnderlyingSinkType::Js {
+                abort,
+                start: _,
+                close: _,
+                write: _,
+            } => {
+                rooted!(in(*cx) let this_object = self.underlying_sink_obj.get());
+                let algo = abort.borrow().clone();
+                // Let result be the result of performing this.[[abortAlgorithm]], passing reason.
+                let result = if let Some(algo) = algo {
+                    algo.Call_(
+                        &this_object.handle(),
+                        Some(reason),
+                        ExceptionHandling::Rethrow,
+                        can_gc,
+                    )
+                } else {
+                    Ok(Promise::new_resolved(global, cx, (), can_gc))
+                };
+                result.unwrap_or_else(|e| {
+                    let promise = Promise::new(global, can_gc);
+                    promise.reject_error(e, can_gc);
+                    promise
+                })
+            },
+            UnderlyingSinkType::Transfer { port, .. } => {
+                // The steps from the `abortAlgorithm` at
+                // <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformwritable>
+
+                // Let result be PackAndPostMessageHandlingError(port, "error", reason).
+                let result = port.pack_and_post_message_handling_error("error", reason, can_gc);
+
+                // Disentangle port.
+                global.disentangle_port(port, can_gc);
+
+                let promise = Promise::new(global, can_gc);
+
+                // If result is an abrupt completion, return a promise rejected with result.[[Value]]
+                if let Err(error) = result {
+                    promise.reject_error(error, can_gc);
+                } else {
+                    // Otherwise, return a promise resolved with undefined.
+                    promise.resolve_native(&(), can_gc);
+                }
+                promise
+            },
+            UnderlyingSinkType::Transform(stream, _) => {
+                // Return ! TransformStreamDefaultSinkAbortAlgorithm(stream, reason).
+                stream
+                    .transform_stream_default_sink_abort_algorithm(cx, global, reason, can_gc)
+                    .expect("Transform stream default sink abort algorithm should not fail.")
+            },
         };
-        result.unwrap_or_else(|e| {
-            let promise = Promise::new(global, can_gc);
-            promise.reject_error(e, can_gc);
-            promise
-        })
+
+        // Perform ! WritableStreamDefaultControllerClearAlgorithms(controller).
+        self.clear_algorithms();
+
+        result
     }
 
-    pub(crate) fn call_write_algorithm(
+    /// <https://streams.spec.whatwg.org/#writablestreamdefaultcontroller-writealgorithm>
+    fn call_write_algorithm(
         &self,
         cx: SafeJSContext,
         chunk: SafeHandleValue,
         global: &GlobalScope,
         can_gc: CanGc,
     ) -> Rc<Promise> {
-        rooted!(in(*cx) let this_object = self.underlying_sink_obj.get());
-        let algo = self.write.borrow().clone();
-        let result = if let Some(algo) = algo {
-            algo.Call_(
-                &this_object.handle(),
-                chunk,
-                self,
-                ExceptionHandling::Rethrow,
-                can_gc,
-            )
-        } else {
-            Ok(Promise::new_resolved(global, cx, (), can_gc))
-        };
-        result.unwrap_or_else(|e| {
-            let promise = Promise::new(global, can_gc);
-            promise.reject_error(e, can_gc);
-            promise
-        })
+        match &self.underlying_sink_type {
+            UnderlyingSinkType::Js {
+                abort: _,
+                start: _,
+                close: _,
+                write,
+            } => {
+                rooted!(in(*cx) let this_object = self.underlying_sink_obj.get());
+                let algo = write.borrow().clone();
+                let result = if let Some(algo) = algo {
+                    algo.Call_(
+                        &this_object.handle(),
+                        chunk,
+                        self,
+                        ExceptionHandling::Rethrow,
+                        can_gc,
+                    )
+                } else {
+                    Ok(Promise::new_resolved(global, cx, (), can_gc))
+                };
+                result.unwrap_or_else(|e| {
+                    let promise = Promise::new(global, can_gc);
+                    promise.reject_error(e, can_gc);
+                    promise
+                })
+            },
+            UnderlyingSinkType::Transfer {
+                backpressure_promise,
+                port,
+            } => {
+                // The steps from the `writeAlgorithm` at
+                // <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformwritable>
+
+                {
+                    // If backpressurePromise is undefined,
+                    // set backpressurePromise to a promise resolved with undefined.
+                    let mut backpressure_promise = backpressure_promise.borrow_mut();
+                    if backpressure_promise.is_none() {
+                        *backpressure_promise = Some(Promise::new_resolved(global, cx, (), can_gc));
+                    }
+                }
+
+                // Return the result of reacting to backpressurePromise with the following fulfillment steps:
+                let result_promise = Promise::new(global, can_gc);
+                rooted!(in(*cx) let mut fulfillment_handler = Some(TransferBackPressurePromiseReaction {
+                    port: port.clone(),
+                    backpressure_promise: backpressure_promise.clone(),
+                    chunk: Heap::boxed(chunk.get()),
+                    result_promise: result_promise.clone(),
+                }));
+                let handler = PromiseNativeHandler::new(
+                    global,
+                    fulfillment_handler.take().map(|h| Box::new(h) as Box<_>),
+                    None,
+                    can_gc,
+                );
+                let realm = enter_realm(global);
+                let comp = InRealm::Entered(&realm);
+                backpressure_promise
+                    .borrow()
+                    .as_ref()
+                    .expect("Promise must be some by now.")
+                    .append_native_handler(&handler, comp, can_gc);
+                result_promise
+            },
+            UnderlyingSinkType::Transform(stream, _) => {
+                // Return ! TransformStreamDefaultSinkWriteAlgorithm(stream, chunk).
+                stream
+                    .transform_stream_default_sink_write_algorithm(cx, global, chunk, can_gc)
+                    .expect("Transform stream default sink write algorithm should not fail.")
+            },
+        }
     }
 
+    /// <https://streams.spec.whatwg.org/#writablestreamdefaultcontroller-closealgorithm>
     fn call_close_algorithm(
         &self,
         cx: SafeJSContext,
         global: &GlobalScope,
         can_gc: CanGc,
     ) -> Rc<Promise> {
-        rooted!(in(*cx) let mut this_object = ptr::null_mut::<JSObject>());
-        this_object.set(self.underlying_sink_obj.get());
-        let algo = self.close.borrow().clone();
-        let result = if let Some(algo) = algo {
-            algo.Call_(&this_object.handle(), ExceptionHandling::Rethrow, can_gc)
-        } else {
-            Ok(Promise::new_resolved(global, cx, (), can_gc))
-        };
-        result.unwrap_or_else(|e| {
-            let promise = Promise::new(global, can_gc);
-            promise.reject_error(e, can_gc);
-            promise
-        })
+        match &self.underlying_sink_type {
+            UnderlyingSinkType::Js {
+                abort: _,
+                start: _,
+                close,
+                write: _,
+            } => {
+                rooted!(in(*cx) let mut this_object = ptr::null_mut::<JSObject>());
+                this_object.set(self.underlying_sink_obj.get());
+                let algo = close.borrow().clone();
+                let result = if let Some(algo) = algo {
+                    algo.Call_(&this_object.handle(), ExceptionHandling::Rethrow, can_gc)
+                } else {
+                    Ok(Promise::new_resolved(global, cx, (), can_gc))
+                };
+                result.unwrap_or_else(|e| {
+                    let promise = Promise::new(global, can_gc);
+                    promise.reject_error(e, can_gc);
+                    promise
+                })
+            },
+            UnderlyingSinkType::Transfer { port, .. } => {
+                // The steps from the `closeAlgorithm` at
+                // <https://streams.spec.whatwg.org/#abstract-opdef-setupcrossrealmtransformwritable>
+
+                // Perform ! PackAndPostMessage(port, "close", undefined).
+                rooted!(in(*cx) let mut value = UndefinedValue());
+                port.pack_and_post_message("close", value.handle(), can_gc)
+                    .expect("Sending close should not fail.");
+
+                // Disentangle port.
+                global.disentangle_port(port, can_gc);
+
+                // Return a promise resolved with undefined.
+                Promise::new_resolved(global, cx, (), can_gc)
+            },
+            UnderlyingSinkType::Transform(stream, _) => {
+                // Return ! TransformStreamDefaultSinkCloseAlgorithm(stream).
+                stream
+                    .transform_stream_default_sink_close_algorithm(cx, global, can_gc)
+                    .expect("Transform stream default sink close algorithm should not fail.")
+            },
+        }
     }
 
     /// <https://streams.spec.whatwg.org/#writable-stream-default-controller-process-close>
@@ -677,13 +940,13 @@ impl WritableStreamDefaultController {
         chunk: SafeHandleValue,
         can_gc: CanGc,
     ) -> f64 {
-        // If controller.[[strategySizeAlgorithm]] is undefined,
+        // If controller.[[strategySizeAlgorithm]] is undefined, then:
         let Some(strategy_size) = self.strategy_size.borrow().clone() else {
-            // Assert: controller.[[stream]].[[state]] is "erroring" or "errored".
+            // Assert: controller.[[stream]].[[state]] is not "writable".
             let Some(stream) = self.stream.get() else {
                 unreachable!("Controller should have a stream");
             };
-            assert!(stream.is_erroring() || stream.is_errored());
+            assert!(!stream.is_writable());
 
             // Return 1.
             return 1.0;
@@ -780,7 +1043,7 @@ impl WritableStreamDefaultController {
     }
 
     /// <https://streams.spec.whatwg.org/#writable-stream-default-controller-error>
-    fn error(
+    pub(crate) fn error(
         &self,
         stream: &WritableStream,
         cx: SafeJSContext,
diff --git a/components/script/dom/xmldocument.rs b/components/script/dom/xmldocument.rs
index e438c7780b8..67c20c7369f 100644
--- a/components/script/dom/xmldocument.rs
+++ b/components/script/dom/xmldocument.rs
@@ -2,8 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use data_url::mime::Mime;
 use dom_struct::dom_struct;
-use mime::Mime;
 use net_traits::request::InsecureRequestsPolicy;
 use script_traits::DocumentActivity;
 use servo_url::{MutableOrigin, ServoUrl};
@@ -43,6 +43,7 @@ impl XMLDocument {
         source: DocumentSource,
         doc_loader: DocumentLoader,
         inherited_insecure_requests_policy: Option<InsecureRequestsPolicy>,
+        has_trustworthy_ancestor_origin: bool,
     ) -> XMLDocument {
         XMLDocument {
             document: Document::new_inherited(
@@ -62,6 +63,7 @@ impl XMLDocument {
                 false,
                 false,
                 inherited_insecure_requests_policy,
+                has_trustworthy_ancestor_origin,
             ),
         }
     }
@@ -79,6 +81,7 @@ impl XMLDocument {
         source: DocumentSource,
         doc_loader: DocumentLoader,
         inherited_insecure_requests_policy: Option<InsecureRequestsPolicy>,
+        has_trustworthy_ancestor_origin: bool,
         can_gc: CanGc,
     ) -> DomRoot<XMLDocument> {
         let doc = reflect_dom_object(
@@ -94,6 +97,7 @@ impl XMLDocument {
                 source,
                 doc_loader,
                 inherited_insecure_requests_policy,
+                has_trustworthy_ancestor_origin,
             )),
             window,
             can_gc,
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index 10836cd12c9..ca5bb72a1dc 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -10,6 +10,9 @@ use std::str::{self, FromStr};
 use std::sync::{Arc, Mutex};
 use std::time::{Duration, Instant};
 
+use constellation_traits::BlobImpl;
+use content_security_policy as csp;
+use data_url::mime::Mime;
 use dom_struct::dom_struct;
 use encoding_rs::{Encoding, UTF_8};
 use headers::{ContentLength, ContentType, HeaderMapExt};
@@ -23,15 +26,14 @@ use js::jsval::{JSVal, NullValue};
 use js::rust::wrappers::JS_ParseJSON;
 use js::rust::{HandleObject, MutableHandleValue};
 use js::typedarray::{ArrayBuffer, ArrayBufferU8};
-use mime::{self, Mime, Name};
 use net_traits::http_status::HttpStatus;
 use net_traits::request::{CredentialsMode, Referrer, RequestBuilder, RequestId, RequestMode};
 use net_traits::{
     FetchMetadata, FetchResponseListener, FilteredMetadata, NetworkError, ReferrerPolicy,
     ResourceFetchTiming, ResourceTimingType, trim_http_whitespace,
 };
+use script_bindings::num::Finite;
 use script_traits::DocumentActivity;
-use script_traits::serializable::BlobImpl;
 use servo_url::ServoUrl;
 use stylo_atoms::Atom;
 use url::Position;
@@ -68,6 +70,7 @@ use crate::dom::workerglobalscope::WorkerGlobalScope;
 use crate::dom::xmlhttprequesteventtarget::XMLHttpRequestEventTarget;
 use crate::dom::xmlhttprequestupload::XMLHttpRequestUpload;
 use crate::fetch::FetchCanceller;
+use crate::mime::{APPLICATION, CHARSET, HTML, MimeExt, TEXT, XML};
 use crate::network_listener::{self, PreInvoke, ResourceTimingListener};
 use crate::script_runtime::{CanGc, JSContext};
 use crate::task_source::{SendableTaskSource, TaskSourceName};
@@ -142,6 +145,11 @@ impl FetchResponseListener for XHRContext {
     fn submit_resource_timing(&mut self) {
         network_listener::submit_timing(self, CanGc::note())
     }
+
+    fn process_csp_violations(&mut self, _request_id: RequestId, violations: Vec<csp::Violation>) {
+        let global = &self.resource_timing_global();
+        global.report_csp_violations(violations, None);
+    }
 }
 
 impl ResourceTimingListener for XHRContext {
@@ -670,8 +678,9 @@ impl XMLHttpRequestMethods<crate::DomTypeHolder> for XMLHttpRequest {
             None => None,
         };
 
+        let global = self.global();
         let mut request = RequestBuilder::new(
-            self.global().webview_id(),
+            global.webview_id(),
             self.request_url.borrow().clone().unwrap(),
             self.referrer.clone(),
         )
@@ -685,10 +694,12 @@ impl XMLHttpRequestMethods<crate::DomTypeHolder> for XMLHttpRequest {
         .use_cors_preflight(self.upload_listener.get())
         .credentials_mode(credentials_mode)
         .use_url_credentials(use_url_credentials)
-        .origin(self.global().origin().immutable().clone())
+        .origin(global.origin().immutable().clone())
         .referrer_policy(self.referrer_policy)
-        .insecure_requests_policy(self.global().insecure_requests_policy())
-        .pipeline_id(Some(self.global().pipeline_id()));
+        .insecure_requests_policy(global.insecure_requests_policy())
+        .has_trustworthy_ancestor_origin(global.has_trustworthy_ancestor_or_current_origin())
+        .policy_container(global.policy_container())
+        .pipeline_id(Some(global.pipeline_id()));
 
         // step 4 (second half)
         if let Some(content_type) = content_type {
@@ -717,21 +728,19 @@ impl XMLHttpRequestMethods<crate::DomTypeHolder> for XMLHttpRequest {
                 let ct = request.headers.typed_get::<ContentType>();
                 if let Some(ct) = ct {
                     if let Some(encoding) = encoding {
-                        let mime: Mime = ct.into();
-                        for param in mime.params() {
-                            if param.0 == mime::CHARSET &&
-                                !param.1.as_ref().eq_ignore_ascii_case(encoding)
-                            {
-                                let new_params: Vec<(Name, Name)> = mime
-                                    .params()
-                                    .filter(|p| p.0 != mime::CHARSET)
-                                    .map(|p| (p.0, p.1))
+                        let mime: Mime = ct.to_string().parse().unwrap();
+                        for param in mime.parameters.iter() {
+                            if param.0 == CHARSET && !param.1.eq_ignore_ascii_case(encoding) {
+                                let params_iter = mime.parameters.iter();
+                                let new_params: Vec<(String, String)> = params_iter
+                                    .filter(|p| p.0 != CHARSET)
+                                    .map(|p| (p.0.clone(), p.1.clone()))
                                     .collect();
 
                                 let new_mime = format!(
                                     "{}/{}; charset={}{}{}",
-                                    mime.type_().as_ref(),
-                                    mime.subtype().as_ref(),
+                                    mime.type_,
+                                    mime.subtype,
                                     encoding,
                                     if new_params.is_empty() { "" } else { "; " },
                                     new_params
@@ -740,8 +749,9 @@ impl XMLHttpRequestMethods<crate::DomTypeHolder> for XMLHttpRequest {
                                         .collect::<Vec<String>>()
                                         .join("; ")
                                 );
-                                let new_mime: Mime = new_mime.parse().unwrap();
-                                request.headers.typed_insert(ContentType::from(new_mime))
+                                request
+                                    .headers
+                                    .typed_insert(ContentType::from_str(&new_mime).unwrap())
                             }
                         }
                     }
@@ -1234,8 +1244,8 @@ impl XMLHttpRequest {
             EventBubbles::DoesNotBubble,
             EventCancelable::NotCancelable,
             length_computable,
-            loaded,
-            total_length,
+            Finite::wrap(loaded as f64),
+            Finite::wrap(total_length as f64),
             can_gc,
         );
         let target = if upload {
@@ -1317,7 +1327,7 @@ impl XMLHttpRequest {
         let mime = self
             .final_mime_type()
             .as_ref()
-            .map(|m| normalize_type_string(m.as_ref()))
+            .map(|m| normalize_type_string(&m.to_string()))
             .unwrap_or("".to_owned());
 
         // Step 3, 4
@@ -1367,7 +1377,7 @@ impl XMLHttpRequest {
         let charset = self.final_charset().unwrap_or(UTF_8);
         let temp_doc: DomRoot<Document>;
         match mime_type {
-            Some(ref mime) if mime.type_() == mime::TEXT && mime.subtype() == mime::HTML => {
+            Some(ref mime) if mime.matches(TEXT, HTML) => {
                 // Step 4
                 if self.response_type.get() == XMLHttpRequestResponseType::_empty {
                     return None;
@@ -1389,9 +1399,9 @@ impl XMLHttpRequest {
                 }
             },
             Some(ref mime)
-                if (mime.type_() == mime::TEXT && mime.subtype() == mime::XML) ||
-                    (mime.type_() == mime::APPLICATION && mime.subtype() == mime::XML) ||
-                    mime.suffix() == Some(mime::XML) =>
+                if mime.matches(TEXT, XML) ||
+                    mime.matches(APPLICATION, XML) ||
+                    mime.has_suffix(XML) =>
             {
                 temp_doc = self.handle_xml(can_gc);
                 // Not sure it the parser should throw an error for this case
@@ -1515,6 +1525,7 @@ impl XMLHttpRequest {
             false,
             false,
             Some(doc.insecure_requests_policy()),
+            doc.has_trustworthy_ancestor_origin(),
             can_gc,
         )
     }
@@ -1587,14 +1598,14 @@ impl XMLHttpRequest {
         // 3. If responseMIME’s parameters["charset"] exists, then set label to it.
         let response_charset = self
             .response_mime_type()
-            .and_then(|mime| mime.get_param(mime::CHARSET).map(|c| c.to_string()));
+            .and_then(|mime| mime.get_parameter(CHARSET).map(|c| c.to_string()));
 
         // 4. If xhr’s override MIME type’s parameters["charset"] exists, then set label to it.
         let override_charset = self
             .override_mime_type
             .borrow()
             .as_ref()
-            .and_then(|mime| mime.get_param(mime::CHARSET).map(|c| c.to_string()));
+            .and_then(|mime| mime.get_parameter(CHARSET).map(|c| c.to_string()));
 
         // 5. If label is null, then return null.
         // 6. Let encoding be the result of getting an encoding from label.
@@ -1614,15 +1625,14 @@ impl XMLHttpRequest {
                     .parse()
                     .ok()
             })
-            .or(Some(mime::TEXT_XML));
+            .or(Some(Mime::new(TEXT, XML)));
     }
 
     /// <https://xhr.spec.whatwg.org/#final-mime-type>
     fn final_mime_type(&self) -> Option<Mime> {
-        if self.override_mime_type.borrow().is_some() {
-            self.override_mime_type.borrow().clone()
-        } else {
-            self.response_mime_type()
+        match *self.override_mime_type.borrow() {
+            Some(ref override_mime) => Some(override_mime.clone()),
+            None => self.response_mime_type(),
         }
     }
 }
diff --git a/components/script/drag_data_store.rs b/components/script/drag_data_store.rs
index f0289f55e45..9eee9f25b63 100644
--- a/components/script/drag_data_store.rs
+++ b/components/script/drag_data_store.rs
@@ -4,9 +4,9 @@
 
 use std::sync::Arc;
 
+use constellation_traits::BlobImpl;
 use indexmap::IndexMap;
 use pixels::Image;
-use script_traits::serializable::BlobImpl;
 
 use crate::dom::bindings::error::{Error, Fallible};
 use crate::dom::bindings::root::DomRoot;
diff --git a/components/script/fetch.rs b/components/script/fetch.rs
index ca46eb6ae60..989cdba862a 100644
--- a/components/script/fetch.rs
+++ b/components/script/fetch.rs
@@ -6,8 +6,9 @@ use std::rc::Rc;
 use std::sync::{Arc, Mutex};
 
 use base::id::WebViewId;
+use content_security_policy as csp;
 use ipc_channel::ipc;
-use net_traits::policy_container::RequestPolicyContainer;
+use net_traits::policy_container::{PolicyContainer, RequestPolicyContainer};
 use net_traits::request::{
     CorsSettings, CredentialsMode, Destination, InsecureRequestsPolicy, Referrer,
     Request as NetTraitsRequest, RequestBuilder, RequestId, RequestMode, ServiceWorkersMode,
@@ -123,6 +124,7 @@ fn request_init_from_request(request: NetTraitsRequest) -> RequestBuilder {
         initiator: request.initiator,
         policy_container: request.policy_container,
         insecure_requests_policy: request.insecure_requests_policy,
+        has_trustworthy_ancestor_origin: request.has_trustworthy_ancestor_origin,
         https_state: request.https_state,
         response_tainting: request.response_tainting,
         crash: None,
@@ -308,6 +310,11 @@ impl FetchResponseListener for FetchContext {
             network_listener::submit_timing(self, CanGc::note())
         }
     }
+
+    fn process_csp_violations(&mut self, _request_id: RequestId, violations: Vec<csp::Violation>) {
+        let global = &self.resource_timing_global();
+        global.report_csp_violations(violations, None);
+    }
 }
 
 impl ResourceTimingListener for FetchContext {
@@ -351,8 +358,9 @@ pub(crate) fn load_whole_resource(
     let mut metadata = None;
     loop {
         match action_receiver.recv().unwrap() {
-            FetchResponseMsg::ProcessRequestBody(..) | FetchResponseMsg::ProcessRequestEOF(..) => {
-            },
+            FetchResponseMsg::ProcessRequestBody(..) |
+            FetchResponseMsg::ProcessRequestEOF(..) |
+            FetchResponseMsg::ProcessCspViolations(..) => {},
             FetchResponseMsg::ProcessResponse(_, Ok(m)) => {
                 metadata = Some(match m {
                     FetchMetadata::Unfiltered(m) => m,
@@ -374,6 +382,7 @@ pub(crate) fn load_whole_resource(
 }
 
 /// <https://html.spec.whatwg.org/multipage/#create-a-potential-cors-request>
+#[allow(clippy::too_many_arguments)]
 pub(crate) fn create_a_potential_cors_request(
     webview_id: Option<WebViewId>,
     url: ServoUrl,
@@ -382,6 +391,8 @@ pub(crate) fn create_a_potential_cors_request(
     same_origin_fallback: Option<bool>,
     referrer: Referrer,
     insecure_requests_policy: InsecureRequestsPolicy,
+    has_trustworthy_ancestor_origin: bool,
+    policy_container: PolicyContainer,
 ) -> RequestBuilder {
     RequestBuilder::new(webview_id, url, referrer)
         // https://html.spec.whatwg.org/multipage/#create-a-potential-cors-request
@@ -401,4 +412,6 @@ pub(crate) fn create_a_potential_cors_request(
         .destination(destination)
         .use_url_credentials(true)
         .insecure_requests_policy(insecure_requests_policy)
+        .has_trustworthy_ancestor_origin(has_trustworthy_ancestor_origin)
+        .policy_container(policy_container)
 }
diff --git a/components/script/iframe_collection.rs b/components/script/iframe_collection.rs
index caf40009fe3..be0fd22e4ac 100644
--- a/components/script/iframe_collection.rs
+++ b/components/script/iframe_collection.rs
@@ -6,13 +6,10 @@ use std::cell::Cell;
 use std::default::Default;
 
 use base::id::BrowsingContextId;
-use constellation_traits::{WindowSizeData, WindowSizeType};
-use euclid::{Scale, Size2D};
+use constellation_traits::{IFrameSizeMsg, WindowSizeType};
+use embedder_traits::ViewportDetails;
 use fnv::FnvHashMap;
 use script_layout_interface::IFrameSizes;
-use script_traits::IFrameSizeMsg;
-use style_traits::CSSPixel;
-use webrender_api::units::DevicePixel;
 
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::{Dom, DomRoot};
@@ -26,7 +23,7 @@ use crate::script_thread::with_script_thread;
 pub(crate) struct IFrame {
     pub(crate) element: Dom<HTMLIFrameElement>,
     #[no_trace]
-    pub(crate) size: Option<Size2D<f32, CSSPixel>>,
+    pub(crate) size: Option<ViewportDetails>,
 }
 
 #[derive(Default, JSTraceable, MallocSizeOf)]
@@ -98,11 +95,11 @@ impl IFrameCollection {
 
     /// Set the size of an `<iframe>` in the collection given its `BrowsingContextId` and
     /// the new size. Returns the old size.
-    pub(crate) fn set_size(
+    pub(crate) fn set_viewport_details(
         &mut self,
         browsing_context_id: BrowsingContextId,
-        new_size: Size2D<f32, CSSPixel>,
-    ) -> Option<Size2D<f32, CSSPixel>> {
+        new_size: ViewportDetails,
+    ) -> Option<ViewportDetails> {
         self.get_mut(browsing_context_id)
             .expect("Tried to set a size for an unknown <iframe>")
             .size
@@ -115,7 +112,6 @@ impl IFrameCollection {
     pub(crate) fn handle_new_iframe_sizes_after_layout(
         &mut self,
         new_iframe_sizes: IFrameSizes,
-        device_pixel_ratio: Scale<f32, CSSPixel, DevicePixel>,
     ) -> Vec<IFrameSizeMsg> {
         if new_iframe_sizes.is_empty() {
             return vec![];
@@ -123,37 +119,35 @@ impl IFrameCollection {
 
         new_iframe_sizes
             .into_iter()
-            .filter_map(|(browsing_context_id, size)| {
+            .filter_map(|(browsing_context_id, iframe_size)| {
                 // Batch resize message to any local `Pipeline`s now, rather than waiting for them
                 // to filter asynchronously through the `Constellation`. This allows the new value
                 // to be reflected immediately in layout.
-                let new_size = size.size;
+                let viewport_details = iframe_size.viewport_details;
                 with_script_thread(|script_thread| {
                     script_thread.handle_resize_message(
-                        size.pipeline_id,
-                        WindowSizeData {
-                            initial_viewport: new_size,
-                            device_pixel_ratio,
-                        },
+                        iframe_size.pipeline_id,
+                        viewport_details,
                         WindowSizeType::Resize,
                     );
                 });
 
-                let old_size = self.set_size(browsing_context_id, new_size);
+                let old_viewport_details =
+                    self.set_viewport_details(browsing_context_id, viewport_details);
                 // The `Constellation` should be up-to-date even when the in-ScriptThread pipelines
                 // might not be.
-                if old_size == Some(size.size) {
+                if old_viewport_details == Some(viewport_details) {
                     return None;
                 }
 
-                let size_type = match old_size {
+                let size_type = match old_viewport_details {
                     Some(_) => WindowSizeType::Resize,
                     None => WindowSizeType::Initial,
                 };
 
                 Some(IFrameSizeMsg {
                     browsing_context_id,
-                    size: new_size,
+                    size: viewport_details,
                     type_: size_type,
                 })
             })
diff --git a/components/script/image_animation.rs b/components/script/image_animation.rs
new file mode 100644
index 00000000000..89e4c93b828
--- /dev/null
+++ b/components/script/image_animation.rs
@@ -0,0 +1,29 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use fxhash::FxHashMap;
+use script_layout_interface::ImageAnimationState;
+use style::dom::OpaqueNode;
+
+#[derive(Clone, Debug, Default, JSTraceable, MallocSizeOf)]
+pub struct ImageAnimationManager {
+    #[no_trace]
+    pub node_to_image_map: FxHashMap<OpaqueNode, ImageAnimationState>,
+}
+
+impl ImageAnimationManager {
+    pub fn new() -> Self {
+        ImageAnimationManager {
+            node_to_image_map: Default::default(),
+        }
+    }
+
+    pub fn take_image_animate_set(&mut self) -> FxHashMap<OpaqueNode, ImageAnimationState> {
+        std::mem::take(&mut self.node_to_image_map)
+    }
+
+    pub fn restore_image_animate_set(&mut self, map: FxHashMap<OpaqueNode, ImageAnimationState>) {
+        let _ = std::mem::replace(&mut self.node_to_image_map, map);
+    }
+}
diff --git a/components/script/layout_dom/element.rs b/components/script/layout_dom/element.rs
index 7237ec68d37..9b50c9f3a2b 100644
--- a/components/script/layout_dom/element.rs
+++ b/components/script/layout_dom/element.rs
@@ -7,13 +7,14 @@ use std::sync::atomic::Ordering;
 use std::{fmt, slice};
 
 use atomic_refcell::{AtomicRef, AtomicRefMut};
-use constellation_traits::UntrustedNodeAddress;
-use html5ever::{LocalName, Namespace, local_name, namespace_url, ns};
+use embedder_traits::UntrustedNodeAddress;
+use html5ever::{LocalName, Namespace, local_name, ns};
 use js::jsapi::JSObject;
 use script_layout_interface::wrapper_traits::{
     LayoutNode, ThreadSafeLayoutElement, ThreadSafeLayoutNode,
 };
 use script_layout_interface::{LayoutNodeType, StyleData};
+use selectors::Element as _;
 use selectors::attr::{AttrSelectorOperation, CaseSensitivity, NamespaceConstraint};
 use selectors::bloom::{BLOOM_HASH_MASK, BloomFilter};
 use selectors::matching::{ElementSelectorFlags, MatchingContext, VisitedHandlingMode};
@@ -805,11 +806,35 @@ impl<'dom> ThreadSafeLayoutElement<'dom> for ServoThreadSafeLayoutElement<'dom>
         self.pseudo
     }
 
-    fn with_pseudo(&self, pseudo: PseudoElement) -> Self {
-        ServoThreadSafeLayoutElement {
-            element: self.element,
-            pseudo: Some(pseudo),
+    fn with_pseudo(&self, pseudo_element_type: PseudoElement) -> Option<Self> {
+        if pseudo_element_type.is_eager() &&
+            self.style_data()
+                .styles
+                .pseudos
+                .get(&pseudo_element_type)
+                .is_none()
+        {
+            return None;
         }
+
+        if pseudo_element_type == PseudoElement::DetailsSummary &&
+            (!self.has_local_name(&local_name!("details")) || !self.has_namespace(&ns!(html)))
+        {
+            return None;
+        }
+
+        if pseudo_element_type == PseudoElement::DetailsContent &&
+            (!self.has_local_name(&local_name!("details")) ||
+                !self.has_namespace(&ns!(html)) ||
+                self.get_attr(&ns!(), &local_name!("open")).is_none())
+        {
+            return None;
+        }
+
+        Some(ServoThreadSafeLayoutElement {
+            element: self.element,
+            pseudo: Some(pseudo_element_type),
+        })
     }
 
     fn type_id(&self) -> Option<LayoutNodeType> {
@@ -843,6 +868,10 @@ impl<'dom> ThreadSafeLayoutElement<'dom> for ServoThreadSafeLayoutElement<'dom>
     fn is_body_element_of_html_element_root(&self) -> bool {
         self.element.is_html_document_body_element()
     }
+
+    fn is_root(&self) -> bool {
+        self.element.is_root()
+    }
 }
 
 /// This implementation of `::selectors::Element` is used for implementing lazy
diff --git a/components/script/layout_dom/node.rs b/components/script/layout_dom/node.rs
index 83c1b8dd57a..9d36f73bbc0 100644
--- a/components/script/layout_dom/node.rs
+++ b/components/script/layout_dom/node.rs
@@ -10,7 +10,7 @@ use std::sync::Arc as StdArc;
 
 use base::id::{BrowsingContextId, PipelineId};
 use fonts_traits::ByteIndex;
-use html5ever::{local_name, namespace_url, ns};
+use html5ever::{local_name, ns};
 use pixels::{Image, ImageMetadata};
 use range::Range;
 use script_layout_interface::wrapper_traits::{LayoutDataTrait, LayoutNode, ThreadSafeLayoutNode};
@@ -436,8 +436,8 @@ impl<'dom> ServoThreadSafeLayoutNodeChildrenIterator<'dom> {
     pub fn new(parent: ServoThreadSafeLayoutNode<'dom>) -> Self {
         let first_child = match parent.pseudo_element() {
             None => parent
-                .get_pseudo(PseudoElement::Before)
-                .or_else(|| parent.get_details_summary_pseudo())
+                .with_pseudo(PseudoElement::Before)
+                .or_else(|| parent.with_pseudo(PseudoElement::DetailsSummary))
                 .or_else(|| unsafe { parent.dangerous_first_child() }),
             Some(PseudoElement::DetailsContent) | Some(PseudoElement::DetailsSummary) => unsafe {
                 parent.dangerous_first_child()
@@ -503,18 +503,18 @@ impl<'dom> Iterator for ServoThreadSafeLayoutNodeChildrenIterator<'dom> {
                     self.current_node = match node.pseudo_element() {
                         Some(PseudoElement::Before) => self
                             .parent_node
-                            .get_details_summary_pseudo()
+                            .with_pseudo(PseudoElement::DetailsSummary)
                             .or_else(|| unsafe { self.parent_node.dangerous_first_child() })
-                            .or_else(|| self.parent_node.get_pseudo(PseudoElement::After)),
+                            .or_else(|| self.parent_node.with_pseudo(PseudoElement::After)),
                         Some(PseudoElement::DetailsSummary) => {
-                            self.parent_node.get_details_content_pseudo()
+                            self.parent_node.with_pseudo(PseudoElement::DetailsContent)
                         },
                         Some(PseudoElement::DetailsContent) => {
-                            self.parent_node.get_pseudo(PseudoElement::After)
+                            self.parent_node.with_pseudo(PseudoElement::After)
                         },
                         Some(PseudoElement::After) => None,
                         None | Some(_) => unsafe { node.dangerous_next_sibling() }
-                            .or_else(|| self.parent_node.get_pseudo(PseudoElement::After)),
+                            .or_else(|| self.parent_node.with_pseudo(PseudoElement::After)),
                     };
                 }
                 node
diff --git a/components/script/layout_image.rs b/components/script/layout_image.rs
index 7f71216309d..546e758e38c 100644
--- a/components/script/layout_image.rs
+++ b/components/script/layout_image.rs
@@ -8,6 +8,7 @@
 
 use std::sync::Arc;
 
+use content_security_policy as csp;
 use net_traits::image_cache::{ImageCache, PendingImageId};
 use net_traits::request::{Destination, RequestBuilder as FetchRequestInit, RequestId};
 use net_traits::{
@@ -77,6 +78,11 @@ impl FetchResponseListener for LayoutImageContext {
     fn submit_resource_timing(&mut self) {
         network_listener::submit_timing(self, CanGc::note())
     }
+
+    fn process_csp_violations(&mut self, _request_id: RequestId, violations: Vec<csp::Violation>) {
+        let global = &self.resource_timing_global();
+        global.report_csp_violations(violations, None);
+    }
 }
 
 impl ResourceTimingListener for LayoutImageContext {
@@ -113,7 +119,10 @@ pub(crate) fn fetch_image_for_layout(
     )
     .origin(document.origin().immutable().clone())
     .destination(Destination::Image)
-    .pipeline_id(Some(document.global().pipeline_id()));
+    .pipeline_id(Some(document.global().pipeline_id()))
+    .insecure_requests_policy(document.insecure_requests_policy())
+    .has_trustworthy_ancestor_origin(document.has_trustworthy_ancestor_origin())
+    .policy_container(document.policy_container().to_owned());
 
     // Layout image loads do not delay the document load event.
     document.fetch_background(request, context);
diff --git a/components/script/lib.rs b/components/script/lib.rs
index d0afb2551b0..06fad98cb6d 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -43,14 +43,14 @@ mod layout_image;
 
 pub(crate) mod document_collection;
 pub(crate) mod iframe_collection;
+pub(crate) mod image_animation;
 pub mod layout_dom;
-mod mem;
 #[allow(unsafe_code)]
 pub(crate) mod messaging;
 mod microtask;
+pub(crate) mod mime;
 mod navigation;
 mod network_listener;
-#[allow(dead_code)]
 mod realms;
 mod routed_promise;
 #[allow(dead_code)]
@@ -81,12 +81,12 @@ mod xpath;
 mod svgpath;
 
 pub use init::init;
+pub(crate) use script_bindings::DomTypes;
 pub use script_runtime::JSEngineSetup;
 pub use script_thread::ScriptThread;
 pub use serviceworker_manager::ServiceWorkerManager;
 
 pub(crate) use crate::dom::bindings::codegen::DomTypeHolder::DomTypeHolder;
-pub(crate) use crate::dom::bindings::codegen::DomTypes::DomTypes;
 // These trait exports are public, because they are used in the DOM bindings.
 // Since they are used in derive macros,
 // it is useful that they are accessible at the root of the crate.
diff --git a/components/script/links.rs b/components/script/links.rs
index f997f50ebc2..f38ba6f7767 100644
--- a/components/script/links.rs
+++ b/components/script/links.rs
@@ -4,10 +4,10 @@
 
 //! Defines shared hyperlink behaviour for `<link>`, `<a>`, `<area>` and `<form>` elements.
 
-use html5ever::{local_name, namespace_url, ns};
+use constellation_traits::{LoadData, LoadOrigin, NavigationHistoryBehavior};
+use html5ever::{local_name, ns};
 use malloc_size_of::malloc_size_of_is_0;
 use net_traits::request::Referrer;
-use script_traits::{LoadData, LoadOrigin, NavigationHistoryBehavior};
 use style::str::HTML_SPACE_CHARACTERS;
 
 use crate::dom::bindings::codegen::Bindings::AttrBinding::Attr_Binding::AttrMethods;
@@ -440,6 +440,7 @@ pub(crate) fn follow_hyperlink(
             referrer_policy,
             Some(secure),
             Some(document.insecure_requests_policy()),
+            document.has_trustworthy_ancestor_origin(),
         );
         let target = Trusted::new(target_window);
         let task = task!(navigate_follow_hyperlink: move || {
diff --git a/components/script/messaging.rs b/components/script/messaging.rs
index ad643278ded..08d6fc841cf 100644
--- a/components/script/messaging.rs
+++ b/components/script/messaging.rs
@@ -11,6 +11,7 @@ use std::result::Result;
 use base::id::PipelineId;
 #[cfg(feature = "bluetooth")]
 use bluetooth_traits::BluetoothRequest;
+use constellation_traits::ScriptToConstellationMessage;
 use crossbeam_channel::{Receiver, SendError, Sender, select};
 use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg};
 use ipc_channel::ipc::IpcSender;
@@ -18,11 +19,11 @@ use net_traits::FetchResponseMsg;
 use net_traits::image_cache::PendingImageResponse;
 use profile_traits::mem::{self as profile_mem, OpaqueSender, ReportsChan};
 use profile_traits::time::{self as profile_time};
-use script_traits::{Painter, ScriptMsg, ScriptThreadMessage};
+use script_traits::{Painter, ScriptThreadMessage};
 use stylo_atoms::Atom;
 use timers::TimerScheduler;
 #[cfg(feature = "webgpu")]
-use webgpu::WebGPUMsg;
+use webgpu_traits::WebGPUMsg;
 
 use crate::dom::abstractworker::WorkerScriptMsg;
 use crate::dom::bindings::trace::CustomTraceable;
@@ -71,8 +72,10 @@ impl MixedMessage {
                 ScriptThreadMessage::UpdateHistoryState(id, ..) => Some(*id),
                 ScriptThreadMessage::RemoveHistoryStates(id, ..) => Some(*id),
                 ScriptThreadMessage::FocusIFrame(id, ..) => Some(*id),
+                ScriptThreadMessage::FocusDocument(id, ..) => Some(*id),
+                ScriptThreadMessage::Unfocus(id, ..) => Some(*id),
                 ScriptThreadMessage::WebDriverScriptCommand(id, ..) => Some(*id),
-                ScriptThreadMessage::TickAllAnimations(id, ..) => Some(*id),
+                ScriptThreadMessage::TickAllAnimations(..) => None,
                 ScriptThreadMessage::WebFontLoaded(id, ..) => Some(*id),
                 ScriptThreadMessage::DispatchIFrameLoadEvent {
                     target: _,
@@ -88,6 +91,7 @@ impl MixedMessage {
                 #[cfg(feature = "webgpu")]
                 ScriptThreadMessage::SetWebGPUPort(..) => None,
                 ScriptThreadMessage::SetScrollStates(id, ..) => Some(*id),
+                ScriptThreadMessage::EvaluateJavaScript(id, _, _) => Some(*id),
             },
             MixedMessage::FromScript(inner_msg) => match inner_msg {
                 MainThreadScriptMsg::Common(CommonScriptMsg::Task(_, _, pipeline_id, _)) => {
@@ -315,7 +319,8 @@ pub(crate) struct ScriptThreadSenders {
     /// A [`Sender`] that sends messages to the `Constellation` associated with
     /// particular pipelines.
     #[no_trace]
-    pub(crate) pipeline_to_constellation_sender: IpcSender<(PipelineId, ScriptMsg)>,
+    pub(crate) pipeline_to_constellation_sender:
+        IpcSender<(PipelineId, ScriptToConstellationMessage)>,
 
     /// The shared [`IpcSender`] which is sent to the `ImageCache` when requesting an image. The
     /// messages on this channel are routed to crossbeam [`Sender`] on the router thread, which
diff --git a/components/script/microtask.rs b/components/script/microtask.rs
index 57f558c1aac..453e587e892 100644
--- a/components/script/microtask.rs
+++ b/components/script/microtask.rs
@@ -147,7 +147,7 @@ impl MicrotaskQueue {
                         MutationObserver::notify_mutation_observers(can_gc);
                     },
                     Microtask::ReadableStreamTeeReadRequest(ref task) => {
-                        task.microtask_chunk_steps(can_gc)
+                        task.microtask_chunk_steps(cx, can_gc)
                     },
                 }
             }
diff --git a/components/script/mime.rs b/components/script/mime.rs
new file mode 100644
index 00000000000..8d45e84252a
--- /dev/null
+++ b/components/script/mime.rs
@@ -0,0 +1,62 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use data_url::mime::Mime;
+use headers::ContentType;
+
+pub(crate) static APPLICATION: &str = "application";
+pub(crate) static CHARSET: &str = "charset";
+pub(crate) static HTML: &str = "html";
+pub(crate) static TEXT: &str = "text";
+pub(crate) static XML: &str = "xml";
+
+/// Convenience methods to make the data_url Mime type more ergonomic.
+pub(crate) trait MimeExt {
+    /// Creates a new Mime from type and subtype, without any parameter.
+    fn new(type_: &str, subtype: &str) -> Self;
+
+    /// Checks that this Mime matches a given type and subtype, ignoring
+    /// parameters.
+    fn matches(&self, type_: &str, subtype: &str) -> bool;
+
+    /// Checks that the subtype has a given suffix.
+    /// Eg. image/svg+xml has the the xml suffix.
+    fn has_suffix(&self, suffix: &str) -> bool;
+
+    /// TODO: replace by a derive on data_url.
+    fn clone(&self) -> Self;
+
+    /// Build a Mime from the value of a Content-Type header.
+    fn from_ct(ct: ContentType) -> Self;
+}
+
+impl MimeExt for Mime {
+    fn new(type_: &str, subtype: &str) -> Self {
+        Mime {
+            type_: type_.into(),
+            subtype: subtype.into(),
+            parameters: vec![],
+        }
+    }
+
+    fn matches(&self, type_: &str, subtype: &str) -> bool {
+        self.type_ == type_ && self.subtype == subtype
+    }
+
+    fn has_suffix(&self, suffix: &str) -> bool {
+        self.subtype.ends_with(&format!("+{}", suffix))
+    }
+
+    fn clone(&self) -> Self {
+        Self {
+            type_: self.type_.clone(),
+            subtype: self.subtype.clone(),
+            parameters: self.parameters.clone(),
+        }
+    }
+
+    fn from_ct(ct: ContentType) -> Self {
+        ct.to_string().parse().unwrap()
+    }
+}
diff --git a/components/script/navigation.rs b/components/script/navigation.rs
index 761492b79bf..5aa71abb74a 100644
--- a/components/script/navigation.rs
+++ b/components/script/navigation.rs
@@ -10,9 +10,10 @@ use std::cell::Cell;
 
 use base::cross_process_instant::CrossProcessInstant;
 use base::id::{BrowsingContextId, PipelineId, WebViewId};
-use constellation_traits::WindowSizeData;
+use constellation_traits::LoadData;
 use content_security_policy::Destination;
 use crossbeam_channel::Sender;
+use embedder_traits::ViewportDetails;
 use http::header;
 use net_traits::request::{
     CredentialsMode, InsecureRequestsPolicy, RedirectMode, RequestBuilder, RequestMode,
@@ -22,7 +23,7 @@ use net_traits::{
     BoxedFetchCallback, CoreResourceThread, DOCUMENT_ACCEPT_HEADER_VALUE, FetchResponseMsg,
     Metadata, fetch_async, set_default_accept_language,
 };
-use script_traits::{DocumentActivity, LoadData};
+use script_traits::DocumentActivity;
 use servo_url::{MutableOrigin, ServoUrl};
 
 use crate::fetch::FetchCanceller;
@@ -138,7 +139,7 @@ pub(crate) struct InProgressLoad {
     pub(crate) opener: Option<BrowsingContextId>,
     /// The current window size associated with this pipeline.
     #[no_trace]
-    pub(crate) window_size: WindowSizeData,
+    pub(crate) viewport_details: ViewportDetails,
     /// The activity level of the document (inactive, active or fully active).
     #[no_trace]
     pub(crate) activity: DocumentActivity,
@@ -170,7 +171,7 @@ impl InProgressLoad {
         webview_id: WebViewId,
         parent_info: Option<PipelineId>,
         opener: Option<BrowsingContextId>,
-        window_size: WindowSizeData,
+        viewport_details: ViewportDetails,
         origin: MutableOrigin,
         load_data: LoadData,
     ) -> InProgressLoad {
@@ -181,7 +182,7 @@ impl InProgressLoad {
             webview_id,
             parent_info,
             opener,
-            window_size,
+            viewport_details,
             activity: DocumentActivity::FullyActive,
             throttled: false,
             origin,
@@ -212,6 +213,7 @@ impl InProgressLoad {
                 .inherited_insecure_requests_policy
                 .unwrap_or(InsecureRequestsPolicy::DoNotUpgrade),
         )
+        .has_trustworthy_ancestor_origin(self.load_data.has_trustworthy_ancestor_origin)
         .headers(self.load_data.headers.clone())
         .body(self.load_data.data.clone())
         .redirect_mode(RedirectMode::Manual)
diff --git a/components/script/realms.rs b/components/script/realms.rs
index 434aa93a0a2..9a392e7f6af 100644
--- a/components/script/realms.rs
+++ b/components/script/realms.rs
@@ -2,62 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use js::jsapi::{GetCurrentRealmOrNull, JSAutoRealm};
-
-use crate::dom::bindings::reflector::DomObject;
-use crate::dom::globalscope::GlobalScope;
-use crate::script_runtime::JSContext;
-
-pub(crate) struct AlreadyInRealm(());
-
-impl AlreadyInRealm {
-    #![allow(unsafe_code)]
-    pub(crate) fn assert() -> AlreadyInRealm {
-        unsafe {
-            assert!(!GetCurrentRealmOrNull(*GlobalScope::get_cx()).is_null());
-        }
-        AlreadyInRealm(())
-    }
-
-    pub(crate) fn assert_for_cx(cx: JSContext) -> AlreadyInRealm {
-        unsafe {
-            assert!(!GetCurrentRealmOrNull(*cx).is_null());
-        }
-        AlreadyInRealm(())
-    }
-}
-
-#[derive(Clone, Copy)]
-pub(crate) enum InRealm<'a> {
-    Already(&'a AlreadyInRealm),
-    Entered(&'a JSAutoRealm),
-}
-
-impl<'a> From<&'a AlreadyInRealm> for InRealm<'a> {
-    fn from(token: &'a AlreadyInRealm) -> InRealm<'a> {
-        InRealm::already(token)
-    }
-}
-
-impl<'a> From<&'a JSAutoRealm> for InRealm<'a> {
-    fn from(token: &'a JSAutoRealm) -> InRealm<'a> {
-        InRealm::entered(token)
-    }
-}
-
-impl InRealm<'_> {
-    pub(crate) fn already(token: &AlreadyInRealm) -> InRealm {
-        InRealm::Already(token)
-    }
-
-    pub(crate) fn entered(token: &JSAutoRealm) -> InRealm {
-        InRealm::Entered(token)
-    }
-}
+use js::jsapi::JSAutoRealm;
+pub(crate) use script_bindings::realms::{AlreadyInRealm, InRealm};
+use script_bindings::reflector::DomObject;
 
 pub(crate) fn enter_realm(object: &impl DomObject) -> JSAutoRealm {
-    JSAutoRealm::new(
-        *GlobalScope::get_cx(),
-        object.reflector().get_jsobject().get(),
-    )
+    script_bindings::realms::enter_realm::<crate::DomTypeHolder>(object)
 }
diff --git a/resources/media-controls.css b/components/script/resources/media-controls.css
similarity index 100%
rename from resources/media-controls.css
rename to components/script/resources/media-controls.css
diff --git a/resources/media-controls.js b/components/script/resources/media-controls.js
similarity index 100%
rename from resources/media-controls.js
rename to components/script/resources/media-controls.js
diff --git a/components/script/routed_promise.rs b/components/script/routed_promise.rs
index 67e5edd7370..c3eea88ed71 100644
--- a/components/script/routed_promise.rs
+++ b/components/script/routed_promise.rs
@@ -10,9 +10,10 @@ use serde::Serialize;
 use serde::de::DeserializeOwned;
 
 use crate::dom::bindings::refcounted::{Trusted, TrustedPromise};
-use crate::dom::bindings::reflector::{DomGlobal, DomObject};
+use crate::dom::bindings::reflector::DomObject;
 use crate::dom::promise::Promise;
 use crate::script_runtime::CanGc;
+use crate::task_source::TaskSource;
 
 pub(crate) trait RoutedPromiseListener<R: Serialize + DeserializeOwned + Send> {
     fn handle_response(&self, response: R, promise: &Rc<Promise>, can_gc: CanGc);
@@ -44,13 +45,10 @@ pub(crate) fn route_promise<
 >(
     promise: &Rc<Promise>,
     receiver: &T,
+    task_source: TaskSource,
 ) -> IpcSender<R> {
     let (action_sender, action_receiver) = ipc::channel().unwrap();
-    let task_source = receiver
-        .global()
-        .task_manager()
-        .dom_manipulation_task_source()
-        .to_sendable();
+    let task_source = task_source.to_sendable();
     let mut trusted: Option<TrustedPromise> = Some(TrustedPromise::new(promise.clone()));
     let trusted_receiver = Trusted::new(receiver);
     ROUTER.add_typed_route(
diff --git a/components/script/script_module.rs b/components/script/script_module.rs
index a3259b156ba..449f17901ed 100644
--- a/components/script/script_module.rs
+++ b/components/script/script_module.rs
@@ -11,6 +11,7 @@ use std::str::FromStr;
 use std::sync::{Arc, Mutex};
 use std::{mem, ptr};
 
+use content_security_policy as csp;
 use encoding_rs::UTF_8;
 use headers::{HeaderMapExt, ReferrerPolicy as ReferrerPolicyHeader};
 use html5ever::local_name;
@@ -992,7 +993,7 @@ impl ModuleOwner {
                     .has_attribute(&local_name!("async"));
 
                 if !asynch && (*script.root()).get_parser_inserted() {
-                    document.deferred_script_loaded(&script.root(), load);
+                    document.deferred_script_loaded(&script.root(), load, can_gc);
                 } else if !asynch && !(*script.root()).get_non_blocking() {
                     document.asap_in_order_script_loaded(&script.root(), load, can_gc);
                 } else {
@@ -1273,6 +1274,11 @@ impl FetchResponseListener for ModuleContext {
     fn submit_resource_timing(&mut self) {
         network_listener::submit_timing(self, CanGc::note())
     }
+
+    fn process_csp_violations(&mut self, _request_id: RequestId, violations: Vec<csp::Violation>) {
+        let global = &self.resource_timing_global();
+        global.report_csp_violations(violations, None);
+    }
 }
 
 impl ResourceTimingListener for ModuleContext {
@@ -1363,7 +1369,7 @@ pub(crate) unsafe extern "C" fn host_import_module_dynamically(
     true
 }
 
-#[derive(Clone, JSTraceable, MallocSizeOf)]
+#[derive(Clone, Debug, JSTraceable, MallocSizeOf)]
 /// <https://html.spec.whatwg.org/multipage/#script-fetch-options>
 pub(crate) struct ScriptFetchOptions {
     #[no_trace]
@@ -1754,7 +1760,11 @@ fn fetch_single_module_script(
         .integrity_metadata(options.integrity_metadata.clone())
         .credentials_mode(options.credentials_mode)
         .referrer_policy(options.referrer_policy)
-        .mode(mode);
+        .mode(mode)
+        .insecure_requests_policy(global.insecure_requests_policy())
+        .has_trustworthy_ancestor_origin(global.has_trustworthy_ancestor_origin())
+        .policy_container(global.policy_container().to_owned())
+        .cryptographic_nonce_metadata(options.cryptographic_nonce.clone());
 
     let context = Arc::new(Mutex::new(ModuleContext {
         owner,
diff --git a/components/script/script_runtime.rs b/components/script/script_runtime.rs
index 6ae5add2b96..c407f9cfc73 100644
--- a/components/script/script_runtime.rs
+++ b/components/script/script_runtime.rs
@@ -8,8 +8,7 @@
 #![allow(dead_code)]
 
 use core::ffi::c_char;
-use std::cell::{Cell, LazyCell, RefCell};
-use std::collections::HashSet;
+use std::cell::Cell;
 use std::ffi::CString;
 use std::io::{Write, stdout};
 use std::ops::Deref;
@@ -20,7 +19,7 @@ use std::time::{Duration, Instant};
 use std::{os, ptr, thread};
 
 use background_hang_monitor_api::ScriptHangAnnotation;
-use content_security_policy::{CheckResult, PolicyDisposition};
+use content_security_policy::CheckResult;
 use js::conversions::jsstr_to_string;
 use js::glue::{
     CollectServoSizes, CreateJobQueue, DeleteJobQueue, DispatchableRun, JobQueueTraps,
@@ -46,7 +45,7 @@ pub(crate) use js::rust::ThreadSafeJSContext;
 use js::rust::wrappers::{GetPromiseIsHandled, JS_GetPromiseResult};
 use js::rust::{
     Handle, HandleObject as RustHandleObject, IntoHandle, JSEngine, JSEngineHandle, ParentRuntime,
-    Runtime as RustRuntime, describe_scripted_caller,
+    Runtime as RustRuntime,
 };
 use malloc_size_of::MallocSizeOfOps;
 use malloc_size_of_derive::MallocSizeOf;
@@ -83,7 +82,6 @@ use crate::microtask::{EnqueuedPromiseCallback, Microtask, MicrotaskQueue};
 use crate::realms::{AlreadyInRealm, InRealm};
 use crate::script_module::EnsureModuleHooksInitialized;
 use crate::script_thread::trace_thread;
-use crate::security_manager::CSPViolationReporter;
 use crate::task_source::SendableTaskSource;
 
 static JOB_QUEUE_TRAPS: JobQueueTraps = JobQueueTraps {
@@ -374,10 +372,6 @@ unsafe extern "C" fn content_security_policy_allows(
     let cx = JSContext::from_ptr(cx);
     wrap_panic(&mut || {
         // SpiderMonkey provides null pointer when executing webassembly.
-        let sample = match sample {
-            sample if !sample.is_null() => Some(jsstr_to_string(*cx, *sample)),
-            _ => None,
-        };
         let in_realm_proof = AlreadyInRealm::assert_for_cx(cx);
         let global = GlobalScope::from_context(*cx, InRealm::Already(&in_realm_proof));
         let Some(csp_list) = global.get_csp_list() else {
@@ -385,36 +379,19 @@ unsafe extern "C" fn content_security_policy_allows(
             return;
         };
 
-        let is_js_evaluation_allowed = csp_list.is_js_evaluation_allowed() == CheckResult::Allowed;
-        let is_wasm_evaluation_allowed =
-            csp_list.is_wasm_evaluation_allowed() == CheckResult::Allowed;
-        let scripted_caller = describe_scripted_caller(*cx).unwrap_or_default();
-
-        allowed = match runtime_code {
-            RuntimeCode::JS if is_js_evaluation_allowed => true,
-            RuntimeCode::WASM if is_wasm_evaluation_allowed => true,
-            _ => false,
+        let (is_evaluation_allowed, violations) = match runtime_code {
+            RuntimeCode::JS => {
+                let source = match sample {
+                    sample if !sample.is_null() => &jsstr_to_string(*cx, *sample),
+                    _ => "",
+                };
+                csp_list.is_js_evaluation_allowed(source)
+            },
+            RuntimeCode::WASM => csp_list.is_wasm_evaluation_allowed(),
         };
 
-        if !allowed {
-            // FIXME: Don't fire event if `script-src` and `default-src`
-            // were not passed.
-            for policy in csp_list.0 {
-                let task = CSPViolationReporter::new(
-                    &global,
-                    sample.clone(),
-                    policy.disposition == PolicyDisposition::Report,
-                    runtime_code,
-                    scripted_caller.filename.clone(),
-                    scripted_caller.line,
-                    scripted_caller.col,
-                );
-                global
-                    .task_manager()
-                    .dom_manipulation_task_source()
-                    .queue(task);
-            }
-        }
+        global.report_csp_violations(violations, None);
+        allowed = is_evaluation_allowed == CheckResult::Allowed;
     });
     allowed
 }
@@ -811,9 +788,7 @@ fn in_range<T: PartialOrd + Copy>(val: T, min: T, max: T) -> Option<T> {
     }
 }
 
-thread_local!(static SEEN_POINTERS: LazyCell<RefCell<HashSet<*const c_void>>> = const {
-    LazyCell::new(|| RefCell::new(HashSet::new()))
-});
+thread_local!(static MALLOC_SIZE_OF_OPS: Cell<*mut MallocSizeOfOps> = const { Cell::new(ptr::null_mut()) });
 
 #[allow(unsafe_code)]
 unsafe extern "C" fn get_size(obj: *mut JSObject) -> usize {
@@ -824,14 +799,8 @@ unsafe extern "C" fn get_size(obj: *mut JSObject) -> usize {
             if dom_object.is_null() {
                 return 0;
             }
-            let seen_pointer =
-                move |ptr| SEEN_POINTERS.with(|pointers| !pointers.borrow_mut().insert(ptr));
-            let mut ops = MallocSizeOfOps::new(
-                servo_allocator::usable_size,
-                None,
-                Some(Box::new(seen_pointer)),
-            );
-            (v.malloc_size_of)(&mut ops, dom_object)
+            let ops = MALLOC_SIZE_OF_OPS.get();
+            (v.malloc_size_of)(&mut *ops, dom_object)
         },
         Err(_e) => 0,
     }
@@ -936,13 +905,13 @@ pub(crate) use script_bindings::script_runtime::JSContext;
 /// Extra methods for the JSContext type defined in script_bindings, when
 /// the methods are only called by code in the script crate.
 pub(crate) trait JSContextHelper {
-    fn get_reports(&self, path_seg: String) -> Vec<Report>;
+    fn get_reports(&self, path_seg: String, ops: &mut MallocSizeOfOps) -> Vec<Report>;
 }
 
 impl JSContextHelper for JSContext {
     #[allow(unsafe_code)]
-    fn get_reports(&self, path_seg: String) -> Vec<Report> {
-        SEEN_POINTERS.with(|pointers| pointers.borrow_mut().clear());
+    fn get_reports(&self, path_seg: String, ops: &mut MallocSizeOfOps) -> Vec<Report> {
+        MALLOC_SIZE_OF_OPS.with(|ops_tls| ops_tls.set(ops));
         let stats = unsafe {
             let mut stats = ::std::mem::zeroed();
             if !CollectServoSizes(**self, &mut stats, Some(get_size)) {
@@ -950,6 +919,7 @@ impl JSContextHelper for JSContext {
             }
             stats
         };
+        MALLOC_SIZE_OF_OPS.with(|ops| ops.set(ptr::null_mut()));
 
         let mut reports = vec![];
         let mut report = |mut path_suffix, kind, size| {
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 39cf325a079..4815e6feae1 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -17,7 +17,6 @@
 //! a page runs its course and the script thread returns to processing events in the main event
 //! loop.
 
-use std::borrow::Cow;
 use std::cell::{Cell, RefCell};
 use std::collections::{HashMap, HashSet};
 use std::default::Default;
@@ -37,20 +36,30 @@ use base::cross_process_instant::CrossProcessInstant;
 use base::id::{BrowsingContextId, HistoryStateId, PipelineId, PipelineNamespace, WebViewId};
 use canvas_traits::webgl::WebGLPipeline;
 use chrono::{DateTime, Local};
-use constellation_traits::{CompositorHitTestResult, ScrollState, WindowSizeData, WindowSizeType};
+use compositing_traits::CrossProcessCompositorApi;
+use constellation_traits::{
+    JsEvalResult, LoadData, LoadOrigin, NavigationHistoryBehavior, ScriptToConstellationChan,
+    ScriptToConstellationMessage, ScrollState, StructuredSerializedData, WindowSizeType,
+};
+use content_security_policy::{self as csp};
 use crossbeam_channel::unbounded;
+use data_url::mime::Mime;
 use devtools_traits::{
     CSSError, DevtoolScriptControlMsg, DevtoolsPageInfo, NavigationState,
     ScriptToDevtoolsControlMsg, WorkerId,
 };
 use embedder_traits::user_content_manager::UserContentManager;
 use embedder_traits::{
-    EmbedderMsg, InputEvent, MediaSessionActionType, Theme, WebDriverScriptCommand,
+    CompositorHitTestResult, EmbedderMsg, FocusSequenceNumber, InputEvent,
+    JavaScriptEvaluationError, JavaScriptEvaluationId, MediaSessionActionType, MouseButton,
+    MouseButtonAction, MouseButtonEvent, Theme, ViewportDetails, WebDriverScriptCommand,
 };
+use euclid::Point2D;
 use euclid::default::Rect;
 use fonts::{FontContext, SystemFontServiceProxy};
 use headers::{HeaderMapExt, LastModified, ReferrerPolicy as ReferrerPolicyHeader};
-use html5ever::{local_name, namespace_url, ns};
+use html5ever::{local_name, ns};
+use http::header::REFRESH;
 use hyper_serde::Serde;
 use ipc_channel::ipc;
 use ipc_channel::router::ROUTER;
@@ -62,7 +71,6 @@ use js::jsval::UndefinedValue;
 use js::rust::ParentRuntime;
 use media::WindowGLContext;
 use metrics::MAX_TASK_NS;
-use mime::{self, Mime};
 use net_traits::image_cache::{ImageCache, PendingImageResponse};
 use net_traits::request::{Referrer, RequestId};
 use net_traits::response::ResponseInit;
@@ -72,7 +80,7 @@ use net_traits::{
     ResourceFetchTiming, ResourceThreads, ResourceTimingType,
 };
 use percent_encoding::percent_decode;
-use profile_traits::mem::ReportsChan;
+use profile_traits::mem::{ProcessReports, ReportsChan, perform_memory_report};
 use profile_traits::time::ProfilerCategory;
 use profile_traits::time_profile;
 use script_layout_interface::{
@@ -80,9 +88,7 @@ use script_layout_interface::{
 };
 use script_traits::{
     ConstellationInputEvent, DiscardBrowsingContext, DocumentActivity, InitialScriptState,
-    JsEvalResult, LoadData, LoadOrigin, NavigationHistoryBehavior, NewLayoutInfo, Painter,
-    ProgressiveWebMetricType, ScriptMsg, ScriptThreadMessage, ScriptToConstellationChan,
-    StructuredSerializedData, UpdatePipelineIdReason,
+    NewLayoutInfo, Painter, ProgressiveWebMetricType, ScriptThreadMessage, UpdatePipelineIdReason,
 };
 use servo_config::opts;
 use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl};
@@ -92,9 +98,8 @@ use stylo_atoms::Atom;
 use timers::{TimerEventRequest, TimerScheduler};
 use url::Position;
 #[cfg(feature = "webgpu")]
-use webgpu::{WebGPUDevice, WebGPUMsg};
-use webrender_api::DocumentId;
-use webrender_traits::CrossProcessCompositorApi;
+use webgpu_traits::{WebGPUDevice, WebGPUMsg};
+use webrender_api::units::DevicePixel;
 
 use crate::document_collection::DocumentCollection;
 use crate::document_loader::DocumentLoader;
@@ -120,7 +125,7 @@ use crate::dom::customelementregistry::{
     CallbackReaction, CustomElementDefinition, CustomElementReactionStack,
 };
 use crate::dom::document::{
-    Document, DocumentSource, FocusType, HasBrowsingContext, IsHTMLDocument, TouchEventResult,
+    Document, DocumentSource, FocusInitiator, HasBrowsingContext, IsHTMLDocument, TouchEventResult,
 };
 use crate::dom::element::Element;
 use crate::dom::globalscope::GlobalScope;
@@ -142,6 +147,7 @@ use crate::messaging::{
     ScriptThreadReceivers, ScriptThreadSenders,
 };
 use crate::microtask::{Microtask, MicrotaskQueue};
+use crate::mime::{APPLICATION, MimeExt, TEXT, XML};
 use crate::navigation::{InProgressLoad, NavigationListener};
 use crate::realms::enter_realm;
 use crate::script_module::ScriptFetchOptions;
@@ -150,6 +156,7 @@ use crate::script_runtime::{
 };
 use crate::task_queue::TaskQueue;
 use crate::task_source::{SendableTaskSource, TaskSourceName};
+use crate::webdriver_handlers::jsval_to_webdriver;
 use crate::{devtools, webdriver_handlers};
 
 thread_local!(static SCRIPT_THREAD_ROOT: Cell<Option<*const ScriptThread>> = const { Cell::new(None) });
@@ -278,10 +285,6 @@ pub struct ScriptThread {
     /// <https://html.spec.whatwg.org/multipage/#custom-element-reactions-stack>
     custom_element_reaction_stack: CustomElementReactionStack,
 
-    /// The Webrender Document ID associated with this thread.
-    #[no_trace]
-    webrender_document: DocumentId,
-
     /// Cross-process access to the compositor's API.
     #[no_trace]
     compositor_api: CrossProcessCompositorApi,
@@ -308,9 +311,6 @@ pub struct ScriptThread {
     #[no_trace]
     user_content_manager: UserContentManager,
 
-    /// An optional string allowing the user agent to be set for testing.
-    user_agent: Cow<'static, str>,
-
     /// Application window's GL Context for Media player
     #[no_trace]
     player_context: WindowGLContext,
@@ -332,6 +332,10 @@ pub struct ScriptThread {
     /// A factory for making new layouts. This allows layout to depend on script.
     #[no_trace]
     layout_factory: Arc<dyn LayoutFactory>,
+
+    /// The screen coordinates where the primary mouse button was pressed.
+    #[no_trace]
+    relative_mouse_down_point: Cell<Point2D<f32, DevicePixel>>,
 }
 
 struct BHMExitSignal {
@@ -390,7 +394,6 @@ impl ScriptThreadFactory for ScriptThread {
         layout_factory: Arc<dyn LayoutFactory>,
         system_font_service: Arc<SystemFontServiceProxy>,
         load_data: LoadData,
-        user_agent: Cow<'static, str>,
     ) {
         thread::Builder::new()
             .name(format!("Script{:?}", state.id))
@@ -406,10 +409,9 @@ impl ScriptThreadFactory for ScriptThread {
                 let parent_info = state.parent_info;
                 let opener = state.opener;
                 let memory_profiler_sender = state.memory_profiler_sender.clone();
-                let window_size = state.window_size;
+                let viewport_details = state.viewport_details;
 
-                let script_thread =
-                    ScriptThread::new(state, layout_factory, system_font_service, user_agent);
+                let script_thread = ScriptThread::new(state, layout_factory, system_font_service);
 
                 SCRIPT_THREAD_ROOT.with(|root| {
                     root.set(Some(&script_thread as *const _));
@@ -424,7 +426,7 @@ impl ScriptThreadFactory for ScriptThread {
                     webview_id,
                     parent_info,
                     opener,
-                    window_size,
+                    viewport_details,
                     origin,
                     load_data,
                 ));
@@ -433,6 +435,7 @@ impl ScriptThreadFactory for ScriptThread {
                 memory_profiler_sender.run_with_memory_reporting(
                     || {
                         script_thread.start(CanGc::note());
+
                         let _ = script_thread
                             .senders
                             .content_process_shutdown_sender
@@ -596,7 +599,7 @@ impl ScriptThread {
         with_script_thread(|script_thread| {
             let is_javascript = load_data.url.scheme() == "javascript";
             // If resource is a request whose url's scheme is "javascript"
-            // https://html.spec.whatwg.org/multipage/#javascript-protocol
+            // https://html.spec.whatwg.org/multipage/#navigate-to-a-javascript:-url
             if is_javascript {
                 let window = match script_thread.documents.borrow().find_window(pipeline_id) {
                     None => return,
@@ -610,16 +613,21 @@ impl ScriptThread {
                     .clone();
                 let task = task!(navigate_javascript: move || {
                     // Important re security. See https://github.com/servo/servo/issues/23373
-                    // TODO: check according to https://w3c.github.io/webappsec-csp/#should-block-navigation-request
                     if let Some(window) = trusted_global.root().downcast::<Window>() {
+                        // Step 5: If the result of should navigation request of type be blocked by
+                        // Content Security Policy? given request and cspNavigationType is "Blocked", then return. [CSP]
+                        if trusted_global.root().should_navigation_request_be_blocked(&load_data) {
+                            return;
+                        }
                         if ScriptThread::check_load_origin(&load_data.load_origin, &window.get_url().origin()) {
                             ScriptThread::eval_js_url(&trusted_global.root(), &mut load_data, CanGc::note());
                             sender
-                                .send((pipeline_id, ScriptMsg::LoadUrl(load_data, history_handling)))
+                                .send((pipeline_id, ScriptToConstellationMessage::LoadUrl(load_data, history_handling)))
                                 .unwrap();
                         }
                     }
                 });
+                // Step 19 of <https://html.spec.whatwg.org/multipage/#navigate>
                 global
                     .task_manager()
                     .dom_manipulation_task_source()
@@ -635,7 +643,10 @@ impl ScriptThread {
                 script_thread
                     .senders
                     .pipeline_to_constellation_sender
-                    .send((pipeline_id, ScriptMsg::LoadUrl(load_data, history_handling)))
+                    .send((
+                        pipeline_id,
+                        ScriptToConstellationMessage::LoadUrl(load_data, history_handling),
+                    ))
                     .expect("Sending a LoadUrl message to the constellation failed");
             }
         });
@@ -735,8 +746,9 @@ impl ScriptThread {
                             .senders
                             .pipeline_to_constellation_sender
                             .clone(),
-                        image_cache: script_thread.image_cache.clone(),
-                        user_agent: script_thread.user_agent.clone(),
+                        image_cache: script_thread
+                            .image_cache
+                            .create_new_image_cache(script_thread.compositor_api.clone()),
                         #[cfg(feature = "webgpu")]
                         gpu_id_hub: script_thread.gpu_id_hub.clone(),
                         inherited_secure_context: script_thread.inherited_secure_context,
@@ -826,7 +838,6 @@ impl ScriptThread {
         state: InitialScriptState,
         layout_factory: Arc<dyn LayoutFactory>,
         system_font_service: Arc<SystemFontServiceProxy>,
-        user_agent: Cow<'static, str>,
     ) -> ScriptThread {
         let (self_sender, self_receiver) = unbounded();
         let runtime = Runtime::new(Some(SendableTaskSource {
@@ -930,7 +941,6 @@ impl ScriptThread {
             worklet_thread_pool: Default::default(),
             docs_with_no_blocking_loads: Default::default(),
             custom_element_reaction_stack: CustomElementReactionStack::new(),
-            webrender_document: state.webrender_document,
             compositor_api: state.compositor_api,
             profile_script_events: opts.debug.profile_script_events,
             print_pwm: opts.print_pwm,
@@ -938,7 +948,6 @@ impl ScriptThread {
             unminify_js: opts.unminify_js,
             local_script_source: opts.local_script_source.clone(),
             unminify_css: opts.unminify_css,
-            user_agent,
             user_content_manager: state.user_content_manager,
             player_context: state.player_context,
             node_ids: Default::default(),
@@ -947,6 +956,7 @@ impl ScriptThread {
             gpu_id_hub: Arc::new(IdentityHub::default()),
             inherited_secure_context: state.inherited_secure_context,
             layout_factory,
+            relative_mouse_down_point: Cell::new(Point2D::zero()),
         }
     }
 
@@ -1097,17 +1107,17 @@ impl ScriptThread {
                     {
                         let sequence_id = touch_event.expect_sequence_id();
                         let result = if handled {
-                            script_traits::TouchEventResult::DefaultAllowed(
+                            embedder_traits::TouchEventResult::DefaultAllowed(
                                 sequence_id,
                                 touch_event.event_type,
                             )
                         } else {
-                            script_traits::TouchEventResult::DefaultPrevented(
+                            embedder_traits::TouchEventResult::DefaultPrevented(
                                 sequence_id,
                                 touch_event.event_type,
                             )
                         };
-                        let message = ScriptMsg::TouchEventProcessed(result);
+                        let message = ScriptToConstellationMessage::TouchEventProcessed(result);
                         self.senders
                             .pipeline_to_constellation_sender
                             .send((pipeline_id, message))
@@ -1124,7 +1134,7 @@ impl ScriptThread {
                     document.dispatch_ime_event(ime_event, can_gc);
                 },
                 InputEvent::Gamepad(gamepad_event) => {
-                    window.as_global_scope().handle_gamepad_event(gamepad_event);
+                    window.handle_gamepad_event(gamepad_event);
                 },
                 InputEvent::EditingAction(editing_action_event) => {
                     document.handle_editing_action(editing_action_event, can_gc);
@@ -1145,14 +1155,6 @@ impl ScriptThread {
             return;
         }
 
-        // Run rafs for all pipeline, if a raf tick was received for any.
-        // This ensures relative ordering of rafs between parent doc and iframes.
-        let should_run_rafs = self
-            .documents
-            .borrow()
-            .iter()
-            .any(|(_, doc)| doc.is_fully_active() && doc.has_received_raf_tick());
-
         let any_animations_running = self.documents.borrow().iter().any(|(_, document)| {
             document.is_fully_active() && document.animations().running_animation_count() != 0
         });
@@ -1240,7 +1242,7 @@ impl ScriptThread {
             // > 14. For each doc of docs, run the animation frame callbacks for doc, passing
             // > in the relative high resolution time given frameTimestamp and doc's
             // > relevant global object as the timestamp.
-            if should_run_rafs {
+            if requested_by_compositor {
                 document.run_the_animation_frame_callbacks(can_gc);
             }
 
@@ -1419,18 +1421,9 @@ impl ScriptThread {
                         self.handle_viewport(id, rect);
                     }),
                 MixedMessage::FromConstellation(ScriptThreadMessage::TickAllAnimations(
-                    pipeline_id,
-                    tick_type,
+                    _webviews,
                 )) => {
-                    if let Some(document) = self.documents.borrow().find_document(pipeline_id) {
-                        document.note_pending_animation_tick(tick_type);
-                        compositor_requested_update_the_rendering = true;
-                    } else {
-                        warn!(
-                            "Trying to note pending animation tick for closed pipeline {}.",
-                            pipeline_id
-                        )
-                    }
+                    compositor_requested_update_the_rendering = true;
                 },
                 MixedMessage::FromConstellation(ScriptThreadMessage::SendInputEvent(id, event)) => {
                     self.handle_input_event(id, event)
@@ -1726,7 +1719,7 @@ impl ScriptThread {
         let task_duration = start.elapsed();
         for (doc_id, doc) in self.documents.borrow().iter() {
             if let Some(pipeline_id) = pipeline_id {
-                if pipeline_id == doc_id && task_duration.as_nanos() > MAX_TASK_NS.into() {
+                if pipeline_id == doc_id && task_duration.as_nanos() > MAX_TASK_NS {
                     if self.print_pwm {
                         println!(
                             "Task took longer than max allowed ({:?}) {:?}",
@@ -1819,8 +1812,14 @@ impl ScriptThread {
             ScriptThreadMessage::RemoveHistoryStates(pipeline_id, history_states) => {
                 self.handle_remove_history_states(pipeline_id, history_states)
             },
-            ScriptThreadMessage::FocusIFrame(parent_pipeline_id, frame_id) => {
-                self.handle_focus_iframe_msg(parent_pipeline_id, frame_id, can_gc)
+            ScriptThreadMessage::FocusIFrame(parent_pipeline_id, frame_id, sequence) => {
+                self.handle_focus_iframe_msg(parent_pipeline_id, frame_id, sequence, can_gc)
+            },
+            ScriptThreadMessage::FocusDocument(pipeline_id, sequence) => {
+                self.handle_focus_document_msg(pipeline_id, sequence, can_gc)
+            },
+            ScriptThreadMessage::Unfocus(pipeline_id, sequence) => {
+                self.handle_unfocus_msg(pipeline_id, sequence, can_gc)
             },
             ScriptThreadMessage::WebDriverScriptCommand(pipeline_id, msg) => {
                 self.handle_webdriver_msg(pipeline_id, msg, can_gc)
@@ -1880,6 +1879,9 @@ impl ScriptThread {
             ScriptThreadMessage::SetScrollStates(pipeline_id, scroll_states) => {
                 self.handle_set_scroll_states(pipeline_id, scroll_states)
             },
+            ScriptThreadMessage::EvaluateJavaScript(pipeline_id, evaluation_id, script) => {
+                self.handle_evaluate_javascript(pipeline_id, evaluation_id, script, can_gc);
+            },
         }
     }
 
@@ -1950,7 +1952,7 @@ impl ScriptThread {
                 msg,
             } => {
                 let global = self.documents.borrow().find_global(pipeline_id).unwrap();
-                global.gpu_device_lost(device, reason, msg);
+                global.gpu_device_lost(device, reason, msg, can_gc);
             },
             WebGPUMsg::UncapturedError {
                 device,
@@ -2009,13 +2011,13 @@ impl ScriptThread {
                 None => warn!("Message sent to closed pipeline {}.", id),
             },
             DevtoolScriptControlMsg::GetRootNode(id, reply) => {
-                devtools::handle_get_root_node(&documents, id, reply)
+                devtools::handle_get_root_node(&documents, id, reply, can_gc)
             },
             DevtoolScriptControlMsg::GetDocumentElement(id, reply) => {
-                devtools::handle_get_document_element(&documents, id, reply)
+                devtools::handle_get_document_element(&documents, id, reply, can_gc)
             },
             DevtoolScriptControlMsg::GetChildren(id, node_id, reply) => {
-                devtools::handle_get_children(&documents, id, node_id, reply)
+                devtools::handle_get_children(&documents, id, node_id, reply, can_gc)
             },
             DevtoolScriptControlMsg::GetAttributeStyle(id, node_id, reply) => {
                 devtools::handle_get_attribute_style(&documents, id, node_id, reply, can_gc)
@@ -2063,6 +2065,17 @@ impl ScriptThread {
             DevtoolScriptControlMsg::GetCssDatabase(reply) => {
                 devtools::handle_get_css_database(reply)
             },
+            DevtoolScriptControlMsg::SimulateColorScheme(id, theme) => {
+                match documents.find_window(id) {
+                    Some(window) => {
+                        window.handle_theme_change(theme);
+                    },
+                    None => warn!("Message sent to closed pipeline {}.", id),
+                }
+            },
+            DevtoolScriptControlMsg::HighlightDomNode(id, node_id) => {
+                devtools::handle_highlight_dom_node(&documents, id, node_id)
+            },
         }
     }
 
@@ -2105,6 +2118,9 @@ impl ScriptThread {
             WebDriverScriptCommand::DeleteCookies(reply) => {
                 webdriver_handlers::handle_delete_cookies(&documents, pipeline_id, reply)
             },
+            WebDriverScriptCommand::DeleteCookie(name, reply) => {
+                webdriver_handlers::handle_delete_cookie(&documents, pipeline_id, name, reply)
+            },
             WebDriverScriptCommand::FindElementCSS(selector, reply) => {
                 webdriver_handlers::handle_find_element_css(
                     &documents,
@@ -2128,6 +2144,7 @@ impl ScriptThread {
                     pipeline_id,
                     selector,
                     reply,
+                    can_gc,
                 )
             },
             WebDriverScriptCommand::FindElementsCSS(selector, reply) => {
@@ -2153,6 +2170,7 @@ impl ScriptThread {
                     pipeline_id,
                     selector,
                     reply,
+                    can_gc,
                 )
             },
             WebDriverScriptCommand::FindElementElementCSS(selector, element_id, reply) => {
@@ -2184,6 +2202,7 @@ impl ScriptThread {
                     element_id,
                     selector,
                     reply,
+                    can_gc,
                 )
             },
             WebDriverScriptCommand::FindElementElementsCSS(selector, element_id, reply) => {
@@ -2215,6 +2234,7 @@ impl ScriptThread {
                     element_id,
                     selector,
                     reply,
+                    can_gc,
                 )
             },
             WebDriverScriptCommand::FocusElement(element_id, reply) => {
@@ -2238,6 +2258,14 @@ impl ScriptThread {
             WebDriverScriptCommand::GetActiveElement(reply) => {
                 webdriver_handlers::handle_get_active_element(&documents, pipeline_id, reply)
             },
+            WebDriverScriptCommand::GetComputedRole(node_id, reply) => {
+                webdriver_handlers::handle_get_computed_role(
+                    &documents,
+                    pipeline_id,
+                    node_id,
+                    reply,
+                )
+            },
             WebDriverScriptCommand::GetPageSource(reply) => {
                 webdriver_handlers::handle_get_page_source(&documents, pipeline_id, reply, can_gc)
             },
@@ -2266,6 +2294,7 @@ impl ScriptThread {
                     node_id,
                     name,
                     reply,
+                    can_gc,
                 )
             },
             WebDriverScriptCommand::GetElementCSS(node_id, name, reply) => {
@@ -2311,7 +2340,7 @@ impl ScriptThread {
                 )
             },
             WebDriverScriptCommand::GetUrl(reply) => {
-                webdriver_handlers::handle_get_url(&documents, pipeline_id, reply)
+                webdriver_handlers::handle_get_url(&documents, pipeline_id, reply, can_gc)
             },
             WebDriverScriptCommand::IsEnabled(element_id, reply) => {
                 webdriver_handlers::handle_is_enabled(&documents, pipeline_id, element_id, reply)
@@ -2331,18 +2360,18 @@ impl ScriptThread {
     pub(crate) fn handle_resize_message(
         &self,
         id: PipelineId,
-        size: WindowSizeData,
+        viewport_details: ViewportDetails,
         size_type: WindowSizeType,
     ) {
         self.profile_event(ScriptThreadEventCategory::Resize, Some(id), || {
             let window = self.documents.borrow().find_window(id);
             if let Some(ref window) = window {
-                window.add_resize_event(size, size_type);
+                window.add_resize_event(viewport_details, size_type);
                 return;
             }
             let mut loads = self.incomplete_loads.borrow_mut();
             if let Some(ref mut load) = loads.iter_mut().find(|load| load.pipeline_id == id) {
-                load.window_size = size;
+                load.viewport_details = viewport_details;
             }
         })
     }
@@ -2384,7 +2413,7 @@ impl ScriptThread {
             webview_id,
             opener,
             load_data,
-            window_size,
+            viewport_details,
         } = new_layout_info;
 
         // Kick off the fetch for the new resource.
@@ -2395,7 +2424,7 @@ impl ScriptThread {
             webview_id,
             parent_info,
             opener,
-            window_size,
+            viewport_details,
             origin,
             load_data,
         );
@@ -2412,12 +2441,20 @@ impl ScriptThread {
         let documents = self.documents.borrow();
         let urls = itertools::join(documents.iter().map(|(_, d)| d.url().to_string()), ", ");
 
-        let mut reports = self.get_cx().get_reports(format!("url({})", urls));
-        for (_, document) in documents.iter() {
-            document.window().layout().collect_reports(&mut reports);
-        }
+        let mut reports = vec![];
+        perform_memory_report(|ops| {
+            for (_, document) in documents.iter() {
+                document
+                    .window()
+                    .layout()
+                    .collect_reports(&mut reports, ops);
+            }
 
-        reports_chan.send(reports);
+            let prefix = format!("url({urls})");
+            reports.extend(self.get_cx().get_reports(prefix.clone(), ops));
+        });
+
+        reports_chan.send(ProcessReports::new(reports));
     }
 
     /// Updates iframe element after a change in visibility
@@ -2441,7 +2478,10 @@ impl ScriptThread {
         // domain)
         self.senders
             .pipeline_to_constellation_sender
-            .send((id, ScriptMsg::SetThrottledComplete(throttled)))
+            .send((
+                id,
+                ScriptToConstellationMessage::SetThrottledComplete(throttled),
+            ))
             .unwrap();
 
         let window = self.documents.borrow().find_window(id);
@@ -2492,6 +2532,7 @@ impl ScriptThread {
         &self,
         parent_pipeline_id: PipelineId,
         browsing_context_id: BrowsingContextId,
+        sequence: FocusSequenceNumber,
         can_gc: CanGc,
     ) {
         let document = self
@@ -2511,7 +2552,65 @@ impl ScriptThread {
             return;
         };
 
-        document.request_focus(Some(&iframe_element_root), FocusType::Parent, can_gc);
+        if document.get_focus_sequence() > sequence {
+            debug!(
+                "Disregarding the FocusIFrame message because the contained sequence number is \
+                too old ({:?} < {:?})",
+                sequence,
+                document.get_focus_sequence()
+            );
+            return;
+        }
+
+        document.request_focus(Some(&iframe_element_root), FocusInitiator::Remote, can_gc);
+    }
+
+    fn handle_focus_document_msg(
+        &self,
+        pipeline_id: PipelineId,
+        sequence: FocusSequenceNumber,
+        can_gc: CanGc,
+    ) {
+        if let Some(doc) = self.documents.borrow().find_document(pipeline_id) {
+            if doc.get_focus_sequence() > sequence {
+                debug!(
+                    "Disregarding the FocusDocument message because the contained sequence number is \
+                    too old ({:?} < {:?})",
+                    sequence,
+                    doc.get_focus_sequence()
+                );
+                return;
+            }
+            doc.request_focus(None, FocusInitiator::Remote, can_gc);
+        } else {
+            warn!(
+                "Couldn't find document by pipleline_id:{pipeline_id:?} when handle_focus_document_msg."
+            );
+        }
+    }
+
+    fn handle_unfocus_msg(
+        &self,
+        pipeline_id: PipelineId,
+        sequence: FocusSequenceNumber,
+        can_gc: CanGc,
+    ) {
+        if let Some(doc) = self.documents.borrow().find_document(pipeline_id) {
+            if doc.get_focus_sequence() > sequence {
+                debug!(
+                    "Disregarding the Unfocus message because the contained sequence number is \
+                    too old ({:?} < {:?})",
+                    sequence,
+                    doc.get_focus_sequence()
+                );
+                return;
+            }
+            doc.handle_container_unfocus(can_gc);
+        } else {
+            warn!(
+                "Couldn't find document by pipleline_id:{pipeline_id:?} when handle_unfocus_msg."
+            );
+        }
     }
 
     fn handle_post_message_msg(
@@ -2641,10 +2740,10 @@ impl ScriptThread {
     }
 
     /// Window was resized, but this script was not active, so don't reflow yet
-    fn handle_resize_inactive_msg(&self, id: PipelineId, new_size: WindowSizeData) {
+    fn handle_resize_inactive_msg(&self, id: PipelineId, new_viewport_details: ViewportDetails) {
         let window = self.documents.borrow().find_window(id)
             .expect("ScriptThread: received a resize msg for a pipeline not in this script thread. This is a bug.");
-        window.set_window_size(new_size);
+        window.set_viewport_details(new_viewport_details);
     }
 
     /// We have received notification that the response associated with a load has completed.
@@ -2688,7 +2787,7 @@ impl ScriptThread {
                     }
                     self.senders
                         .pipeline_to_constellation_sender
-                        .send((*id, ScriptMsg::AbortLoadUrl))
+                        .send((*id, ScriptToConstellationMessage::AbortLoadUrl))
                         .unwrap();
                     return None;
                 };
@@ -2721,8 +2820,6 @@ impl ScriptThread {
     ) {
         debug!("{id}: Starting pipeline exit.");
 
-        self.closed_pipelines.borrow_mut().insert(id);
-
         // Abort the parser, if any,
         // to prevent any further incoming networking messages from being handled.
         let document = self.documents.borrow_mut().remove(id);
@@ -2743,12 +2840,6 @@ impl ScriptThread {
             debug!("{id}: Shutting down layout");
             document.window().layout_mut().exit_now();
 
-            debug!("{id}: Sending PipelineExited message to constellation");
-            self.senders
-                .pipeline_to_constellation_sender
-                .send((id, ScriptMsg::PipelineExited))
-                .ok();
-
             // Clear any active animations and unroot all of the associated DOM objects.
             debug!("{id}: Clearing animations");
             document.animations().clear();
@@ -2771,6 +2862,15 @@ impl ScriptThread {
             window.clear_js_runtime();
         }
 
+        // Prevent any further work for this Pipeline.
+        self.closed_pipelines.borrow_mut().insert(id);
+
+        debug!("{id}: Sending PipelineExited message to constellation");
+        self.senders
+            .pipeline_to_constellation_sender
+            .send((id, ScriptToConstellationMessage::PipelineExited))
+            .ok();
+
         debug!("{id}: Finished pipeline exit");
     }
 
@@ -2885,7 +2985,7 @@ impl ScriptThread {
         pipeline_id: PipelineId,
     ) -> Option<(BrowsingContextId, Option<PipelineId>)> {
         let (result_sender, result_receiver) = ipc::channel().unwrap();
-        let msg = ScriptMsg::GetBrowsingContextInfo(pipeline_id, result_sender);
+        let msg = ScriptToConstellationMessage::GetBrowsingContextInfo(pipeline_id, result_sender);
         self.senders
             .pipeline_to_constellation_sender
             .send((pipeline_id, msg))
@@ -2901,7 +3001,10 @@ impl ScriptThread {
         browsing_context_id: BrowsingContextId,
     ) -> Option<WebViewId> {
         let (result_sender, result_receiver) = ipc::channel().unwrap();
-        let msg = ScriptMsg::GetTopForBrowsingContext(browsing_context_id, result_sender);
+        let msg = ScriptToConstellationMessage::GetTopForBrowsingContext(
+            browsing_context_id,
+            result_sender,
+        );
         self.senders
             .pipeline_to_constellation_sender
             .send((sender_pipeline, msg))
@@ -3023,7 +3126,7 @@ impl ScriptThread {
                 .pipeline_to_constellation_sender
                 .send((
                     incomplete.pipeline_id,
-                    ScriptMsg::SetFinalUrl(final_url.clone()),
+                    ScriptToConstellationMessage::SetFinalUrl(final_url.clone()),
                 ))
                 .unwrap();
         }
@@ -3050,17 +3153,21 @@ impl ScriptThread {
             self.resource_threads.clone(),
         ));
 
+        let image_cache = self
+            .image_cache
+            .create_new_image_cache(self.compositor_api.clone());
+
         let layout_config = LayoutConfig {
             id: incomplete.pipeline_id,
             webview_id: incomplete.webview_id,
             url: final_url.clone(),
             is_iframe: incomplete.parent_info.is_some(),
             script_chan: self.senders.constellation_sender.clone(),
-            image_cache: self.image_cache.clone(),
+            image_cache: image_cache.clone(),
             font_context: font_context.clone(),
             time_profiler_chan: self.senders.time_profiler_sender.clone(),
             compositor_api: self.compositor_api.clone(),
-            window_size: incomplete.window_size,
+            viewport_details: incomplete.viewport_details,
         };
 
         // Create the window and document objects.
@@ -3071,7 +3178,7 @@ impl ScriptThread {
             self.layout_factory.create(layout_config),
             font_context,
             self.senders.image_cache_sender.clone(),
-            self.image_cache.clone(),
+            image_cache.clone(),
             self.resource_threads.clone(),
             #[cfg(feature = "bluetooth")]
             self.senders.bluetooth_sender.clone(),
@@ -3082,7 +3189,7 @@ impl ScriptThread {
             self.senders.constellation_sender.clone(),
             incomplete.pipeline_id,
             incomplete.parent_info,
-            incomplete.window_size,
+            incomplete.viewport_details,
             origin.clone(),
             final_url.clone(),
             incomplete.navigation_start,
@@ -3090,14 +3197,12 @@ impl ScriptThread {
             #[cfg(feature = "webxr")]
             self.webxr_registry.clone(),
             self.microtask_queue.clone(),
-            self.webrender_document,
             self.compositor_api.clone(),
             self.relayout_event,
             self.unminify_js,
             self.unminify_css,
             self.local_script_source.clone(),
             self.user_content_manager.clone(),
-            self.user_agent.clone(),
             self.player_context.clone(),
             #[cfg(feature = "webgpu")]
             self.gpu_id_hub.clone(),
@@ -3136,20 +3241,17 @@ impl ScriptThread {
             Some(final_url.clone()),
         );
 
-        let content_type: Option<Mime> =
-            metadata.content_type.map(Serde::into_inner).map(Into::into);
+        let content_type: Option<Mime> = metadata
+            .content_type
+            .map(Serde::into_inner)
+            .map(Mime::from_ct);
 
         let is_html_document = match content_type {
-            Some(ref mime)
-                if mime.type_() == mime::APPLICATION && mime.suffix() == Some(mime::XML) =>
-            {
+            Some(ref mime) if mime.type_ == APPLICATION && mime.has_suffix("xml") => {
                 IsHTMLDocument::NonHTMLDocument
             },
 
-            Some(ref mime)
-                if (mime.type_() == mime::TEXT && mime.subtype() == mime::XML) ||
-                    (mime.type_() == mime::APPLICATION && mime.subtype() == mime::XML) =>
-            {
+            Some(ref mime) if mime.matches(TEXT, XML) || mime.matches(APPLICATION, XML) => {
                 IsHTMLDocument::NonHTMLDocument
             },
             _ => IsHTMLDocument::HTMLDocument,
@@ -3179,6 +3281,7 @@ impl ScriptThread {
             is_initial_about_blank,
             true,
             incomplete.load_data.inherited_insecure_requests_policy,
+            incomplete.load_data.has_trustworthy_ancestor_origin,
             can_gc,
         );
 
@@ -3187,8 +3290,14 @@ impl ScriptThread {
             .as_deref()
             .and_then(|h| h.typed_get::<ReferrerPolicyHeader>())
             .into();
-
         document.set_referrer_policy(referrer_policy);
+
+        let refresh_header = metadata.headers.as_deref().and_then(|h| h.get(REFRESH));
+        if let Some(refresh_val) = refresh_header {
+            // There are tests that this header handles Unicode code points
+            document.shared_declarative_refresh_steps(refresh_val.as_bytes());
+        }
+
         document.set_ready_state(DocumentReadyState::Loading, can_gc);
 
         self.documents
@@ -3216,7 +3325,10 @@ impl ScriptThread {
 
         self.senders
             .pipeline_to_constellation_sender
-            .send((incomplete.pipeline_id, ScriptMsg::ActivateDocument))
+            .send((
+                incomplete.pipeline_id,
+                ScriptToConstellationMessage::ActivateDocument,
+            ))
             .unwrap();
 
         // Notify devtools that a new script global exists.
@@ -3295,6 +3407,50 @@ impl ScriptThread {
             warn!("Compositor event sent to closed pipeline {pipeline_id}.");
             return;
         };
+
+        // Also send a 'click' event with same hit-test result if this is release
+
+        // MAYBE? TODO: https://developer.mozilla.org/en-US/docs/Web/API/Element/click_event
+        // If the button is pressed on one element and the pointer is moved outside the element
+        // before the button is released, the event is fired on the most specific ancestor element
+        // that contained both elements.
+
+        // But spec doesn't specify this https://w3c.github.io/uievents/#event-type-click
+        // "The click event type MUST be dispatched on the topmost event target indicated by
+        // the pointer, when the user presses down and releases the primary pointer button"
+
+        // Servo-specific: Trigger if within 10px of the down point
+        if let InputEvent::MouseButton(mouse_button_event) = event.event {
+            if let MouseButton::Left = mouse_button_event.button {
+                match mouse_button_event.action {
+                    MouseButtonAction::Up => {
+                        let pixel_dist =
+                            self.relative_mouse_down_point.get() - mouse_button_event.point;
+                        let pixel_dist =
+                            (pixel_dist.x * pixel_dist.x + pixel_dist.y * pixel_dist.y).sqrt();
+                        if pixel_dist < 10.0 * document.window().device_pixel_ratio().get() {
+                            document.note_pending_input_event(event.clone());
+                            document.note_pending_input_event(ConstellationInputEvent {
+                                hit_test_result: event.hit_test_result,
+                                pressed_mouse_buttons: event.pressed_mouse_buttons,
+                                active_keyboard_modifiers: event.active_keyboard_modifiers,
+                                event: InputEvent::MouseButton(MouseButtonEvent {
+                                    action: MouseButtonAction::Click,
+                                    button: mouse_button_event.button,
+                                    point: mouse_button_event.point,
+                                }),
+                            });
+                            return;
+                        }
+                    },
+                    MouseButtonAction::Down => {
+                        self.relative_mouse_down_point.set(mouse_button_event.point)
+                    },
+                    MouseButtonAction::Click => {},
+                }
+            }
+        }
+
         document.note_pending_input_event(event);
     }
 
@@ -3392,8 +3548,11 @@ impl ScriptThread {
             FetchResponseMsg::ProcessResponseEOF(request_id, eof) => {
                 self.handle_fetch_eof(pipeline_id, request_id, eof)
             },
-            FetchResponseMsg::ProcessRequestBody(..) => {},
-            FetchResponseMsg::ProcessRequestEOF(..) => {},
+            FetchResponseMsg::ProcessCspViolations(request_id, violations) => {
+                self.handle_csp_violations(pipeline_id, request_id, violations)
+            },
+            FetchResponseMsg::ProcessRequestBody(..) | FetchResponseMsg::ProcessRequestEOF(..) => {
+            },
         }
     }
 
@@ -3449,6 +3608,13 @@ impl ScriptThread {
         }
     }
 
+    fn handle_csp_violations(&self, id: PipelineId, _: RequestId, violations: Vec<csp::Violation>) {
+        if let Some(global) = self.documents.borrow().find_global(id) {
+            // TODO(https://github.com/w3c/webappsec-csp/issues/687): Update after spec is resolved
+            global.report_csp_violations(violations, None);
+        }
+    }
+
     fn handle_navigation_redirect(&self, id: PipelineId, metadata: &Metadata) {
         // TODO(mrobinson): This tries to accomplish some steps from
         // <https://html.spec.whatwg.org/multipage/#process-a-navigate-fetch>, but it's
@@ -3521,10 +3687,12 @@ impl ScriptThread {
             None => vec![],
         };
 
+        let policy_container = incomplete.load_data.policy_container.clone();
         self.incomplete_loads.borrow_mut().push(incomplete);
 
         let dummy_request_id = RequestId::default();
         context.process_response(dummy_request_id, Ok(FetchMetadata::Unfiltered(meta)));
+        context.append_parent_to_csp_list(policy_container.as_ref());
         context.process_response_chunk(dummy_request_id, chunk);
         context.process_response_eof(
             dummy_request_id,
@@ -3544,12 +3712,14 @@ impl ScriptThread {
         let srcdoc = std::mem::take(&mut incomplete.load_data.srcdoc);
         let chunk = srcdoc.into_bytes();
 
+        let policy_container = incomplete.load_data.policy_container.clone();
         self.incomplete_loads.borrow_mut().push(incomplete);
 
         let mut context = ParserContext::new(id, url);
         let dummy_request_id = RequestId::default();
 
         context.process_response(dummy_request_id, Ok(FetchMetadata::Unfiltered(meta)));
+        context.append_parent_to_csp_list(policy_container.as_ref());
         context.process_response_chunk(dummy_request_id, chunk);
         context.process_response_eof(
             dummy_request_id,
@@ -3649,6 +3819,53 @@ impl ScriptThread {
             )
         }
     }
+
+    fn handle_evaluate_javascript(
+        &self,
+        pipeline_id: PipelineId,
+        evaluation_id: JavaScriptEvaluationId,
+        script: String,
+        can_gc: CanGc,
+    ) {
+        let Some(window) = self.documents.borrow().find_window(pipeline_id) else {
+            let _ = self.senders.pipeline_to_constellation_sender.send((
+                pipeline_id,
+                ScriptToConstellationMessage::FinishJavaScriptEvaluation(
+                    evaluation_id,
+                    Err(JavaScriptEvaluationError::WebViewNotReady),
+                ),
+            ));
+            return;
+        };
+
+        let global_scope = window.as_global_scope();
+        let realm = enter_realm(global_scope);
+        let context = window.get_cx();
+
+        rooted!(in(*context) let mut return_value = UndefinedValue());
+        global_scope.evaluate_js_on_global_with_result(
+            &script,
+            return_value.handle_mut(),
+            ScriptFetchOptions::default_classic_script(global_scope),
+            global_scope.api_base_url(),
+            can_gc,
+        );
+        let result = match jsval_to_webdriver(
+            context,
+            global_scope,
+            return_value.handle(),
+            (&realm).into(),
+            can_gc,
+        ) {
+            Ok(ref value) => Ok(value.into()),
+            Err(_) => Err(JavaScriptEvaluationError::SerializationError),
+        };
+
+        let _ = self.senders.pipeline_to_constellation_sender.send((
+            pipeline_id,
+            ScriptToConstellationMessage::FinishJavaScriptEvaluation(evaluation_id, result),
+        ));
+    }
 }
 
 impl Drop for ScriptThread {
diff --git a/components/script/security_manager.rs b/components/script/security_manager.rs
index 223fd5e005a..ee062594eb8 100644
--- a/components/script/security_manager.rs
+++ b/components/script/security_manager.rs
@@ -2,7 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use js::jsapi::RuntimeCode;
 use net_traits::request::Referrer;
 use serde::Serialize;
 use servo_url::ServoUrl;
@@ -15,22 +14,17 @@ use crate::dom::bindings::codegen::Bindings::SecurityPolicyViolationEventBinding
 };
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::refcounted::Trusted;
-use crate::dom::bindings::reflector::DomGlobal;
-use crate::dom::event::{Event, EventBubbles, EventCancelable};
+use crate::dom::event::{Event, EventBubbles, EventCancelable, EventComposed};
 use crate::dom::eventtarget::EventTarget;
 use crate::dom::securitypolicyviolationevent::SecurityPolicyViolationEvent;
 use crate::dom::types::GlobalScope;
 use crate::script_runtime::CanGc;
 use crate::task::TaskOnce;
 
-pub(crate) struct CSPViolationReporter {
-    sample: Option<String>,
-    filename: String,
-    report_only: bool,
-    runtime_code: RuntimeCode,
-    line_number: u32,
-    column_number: u32,
-    target: Trusted<EventTarget>,
+pub(crate) struct CSPViolationReportTask {
+    global: Trusted<GlobalScope>,
+    event_target: Trusted<EventTarget>,
+    violation_report: SecurityPolicyViolationReport,
 }
 
 #[derive(Debug, Serialize)]
@@ -53,71 +47,71 @@ pub(crate) struct SecurityPolicyViolationReport {
     disposition: SecurityPolicyViolationEventDisposition,
 }
 
-impl CSPViolationReporter {
-    pub(crate) fn new(
-        global: &GlobalScope,
-        sample: Option<String>,
-        report_only: bool,
-        runtime_code: RuntimeCode,
-        filename: String,
-        line_number: u32,
-        column_number: u32,
-    ) -> CSPViolationReporter {
-        CSPViolationReporter {
-            sample,
-            filename,
-            report_only,
-            runtime_code,
-            line_number,
-            column_number,
-            target: Trusted::new(global.upcast::<EventTarget>()),
-        }
+#[derive(Default)]
+pub(crate) struct CSPViolationReportBuilder {
+    pub report_only: bool,
+    /// <https://www.w3.org/TR/CSP3/#violation-sample>
+    pub sample: Option<String>,
+    /// <https://www.w3.org/TR/CSP3/#violation-resource>
+    pub resource: String,
+    /// <https://www.w3.org/TR/CSP3/#violation-line-number>
+    pub line_number: u32,
+    /// <https://www.w3.org/TR/CSP3/#violation-column-number>
+    pub column_number: u32,
+    /// <https://www.w3.org/TR/CSP3/#violation-source-file>
+    pub source_file: String,
+    /// <https://www.w3.org/TR/CSP3/#violation-effective-directive>
+    pub effective_directive: String,
+    /// <https://www.w3.org/TR/CSP3/#violation-policy>
+    pub original_policy: String,
+}
+
+impl CSPViolationReportBuilder {
+    pub fn report_only(mut self, report_only: bool) -> CSPViolationReportBuilder {
+        self.report_only = report_only;
+        self
     }
 
-    fn get_report(&self, global: &GlobalScope) -> SecurityPolicyViolationReport {
-        SecurityPolicyViolationReport {
-            sample: self.sample.clone(),
-            disposition: match self.report_only {
-                true => SecurityPolicyViolationEventDisposition::Report,
-                false => SecurityPolicyViolationEventDisposition::Enforce,
-            },
-            // https://w3c.github.io/webappsec-csp/#violation-resource
-            blocked_url: match self.runtime_code {
-                RuntimeCode::JS => "eval".to_owned(),
-                RuntimeCode::WASM => "wasm-eval".to_owned(),
-            },
-            // https://w3c.github.io/webappsec-csp/#violation-referrer
-            referrer: match global.get_referrer() {
-                Referrer::Client(url) => self.strip_url_for_reports(url),
-                Referrer::ReferrerUrl(url) => self.strip_url_for_reports(url),
-                _ => "".to_owned(),
-            },
-            status_code: global.status_code().unwrap_or(200),
-            document_url: self.strip_url_for_reports(global.get_url()),
-            source_file: self.filename.clone(),
-            violated_directive: "script-src".to_owned(),
-            effective_directive: "script-src".to_owned(),
-            line_number: self.line_number,
-            column_number: self.column_number,
-            original_policy: String::default(),
-        }
+    /// <https://www.w3.org/TR/CSP3/#violation-sample>
+    pub fn sample(mut self, sample: Option<String>) -> CSPViolationReportBuilder {
+        self.sample = sample;
+        self
     }
 
-    fn fire_violation_event(&self, can_gc: CanGc) {
-        let target = self.target.root();
-        let global = &target.global();
-        let report = self.get_report(global);
+    /// <https://www.w3.org/TR/CSP3/#violation-resource>
+    pub fn resource(mut self, resource: String) -> CSPViolationReportBuilder {
+        self.resource = resource;
+        self
+    }
 
-        let event = SecurityPolicyViolationEvent::new(
-            global,
-            Atom::from("securitypolicyviolation"),
-            EventBubbles::Bubbles,
-            EventCancelable::Cancelable,
-            &report.convert(),
-            can_gc,
-        );
+    /// <https://www.w3.org/TR/CSP3/#violation-line-number>
+    pub fn line_number(mut self, line_number: u32) -> CSPViolationReportBuilder {
+        self.line_number = line_number;
+        self
+    }
 
-        event.upcast::<Event>().fire(&target, can_gc);
+    /// <https://www.w3.org/TR/CSP3/#violation-column-number>
+    pub fn column_number(mut self, column_number: u32) -> CSPViolationReportBuilder {
+        self.column_number = column_number;
+        self
+    }
+
+    /// <https://www.w3.org/TR/CSP3/#violation-source-file>
+    pub fn source_file(mut self, source_file: String) -> CSPViolationReportBuilder {
+        self.source_file = source_file;
+        self
+    }
+
+    /// <https://www.w3.org/TR/CSP3/#violation-effective-directive>
+    pub fn effective_directive(mut self, effective_directive: String) -> CSPViolationReportBuilder {
+        self.effective_directive = effective_directive;
+        self
+    }
+
+    /// <https://www.w3.org/TR/CSP3/#violation-policy>
+    pub fn original_policy(mut self, original_policy: String) -> CSPViolationReportBuilder {
+        self.original_policy = original_policy;
+        self
     }
 
     /// <https://w3c.github.io/webappsec-csp/#strip-url-for-use-in-reports>
@@ -136,12 +130,67 @@ impl CSPViolationReporter {
         // > Step 5: Return the result of executing the URL serializer on url.
         url.into_string()
     }
+
+    pub fn build(self, global: &GlobalScope) -> SecurityPolicyViolationReport {
+        SecurityPolicyViolationReport {
+            violated_directive: self.effective_directive.clone(),
+            effective_directive: self.effective_directive.clone(),
+            document_url: self.strip_url_for_reports(global.get_url()),
+            disposition: match self.report_only {
+                true => SecurityPolicyViolationEventDisposition::Report,
+                false => SecurityPolicyViolationEventDisposition::Enforce,
+            },
+            // https://w3c.github.io/webappsec-csp/#violation-referrer
+            referrer: match global.get_referrer() {
+                Referrer::Client(url) => self.strip_url_for_reports(url),
+                Referrer::ReferrerUrl(url) => self.strip_url_for_reports(url),
+                _ => "".to_owned(),
+            },
+            sample: self.sample,
+            blocked_url: self.resource,
+            source_file: self.source_file,
+            original_policy: self.original_policy,
+            line_number: self.line_number,
+            column_number: self.column_number,
+            status_code: global.status_code().unwrap_or(0),
+        }
+    }
+}
+
+impl CSPViolationReportTask {
+    pub fn new(
+        global: Trusted<GlobalScope>,
+        event_target: Trusted<EventTarget>,
+        violation_report: SecurityPolicyViolationReport,
+    ) -> CSPViolationReportTask {
+        CSPViolationReportTask {
+            global,
+            event_target,
+            violation_report,
+        }
+    }
+
+    fn fire_violation_event(self, can_gc: CanGc) {
+        let event = SecurityPolicyViolationEvent::new(
+            &self.global.root(),
+            Atom::from("securitypolicyviolation"),
+            EventBubbles::Bubbles,
+            EventCancelable::Cancelable,
+            EventComposed::Composed,
+            &self.violation_report.convert(),
+            can_gc,
+        );
+
+        event
+            .upcast::<Event>()
+            .fire(&self.event_target.root(), can_gc);
+    }
 }
 
 /// Corresponds to the operation in 5.5 Report Violation
 /// <https://w3c.github.io/webappsec-csp/#report-violation>
 /// > Queue a task to run the following steps:
-impl TaskOnce for CSPViolationReporter {
+impl TaskOnce for CSPViolationReportTask {
     fn run_once(self) {
         // > If target implements EventTarget, fire an event named securitypolicyviolation
         // > that uses the SecurityPolicyViolationEvent interface
diff --git a/components/script/serviceworker_manager.rs b/components/script/serviceworker_manager.rs
index dba412d9a42..a2ac034f662 100644
--- a/components/script/serviceworker_manager.rs
+++ b/components/script/serviceworker_manager.rs
@@ -13,14 +13,14 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::thread::{self, JoinHandle};
 
 use base::id::{PipelineNamespace, ServiceWorkerId, ServiceWorkerRegistrationId};
+use constellation_traits::{
+    DOMMessage, Job, JobError, JobResult, JobResultValue, JobType, SWManagerMsg, SWManagerSenders,
+    ScopeThings, ServiceWorkerManagerFactory, ServiceWorkerMsg,
+};
 use crossbeam_channel::{Receiver, RecvError, Sender, select, unbounded};
 use ipc_channel::ipc::{self, IpcSender};
 use ipc_channel::router::ROUTER;
 use net_traits::{CoreResourceMsg, CustomResponseMediator};
-use script_traits::{
-    DOMMessage, Job, JobError, JobResult, JobResultValue, JobType, SWManagerMsg, SWManagerSenders,
-    ScopeThings, ServiceWorkerManagerFactory, ServiceWorkerMsg,
-};
 use servo_config::pref;
 use servo_url::{ImmutableOrigin, ServoUrl};
 
@@ -321,7 +321,7 @@ impl ServiceWorkerManager {
 
     /// <https://w3c.github.io/ServiceWorker/#register-algorithm>
     fn handle_register_job(&mut self, mut job: Job) {
-        if !job.script_url.is_origin_trustworthy() {
+        if !job.script_url.origin().is_potentially_trustworthy() {
             // Step 1.1
             let _ = job
                 .client
diff --git a/components/script/stylesheet_loader.rs b/components/script/stylesheet_loader.rs
index 6570c3df284..a18d63e323b 100644
--- a/components/script/stylesheet_loader.rs
+++ b/components/script/stylesheet_loader.rs
@@ -5,6 +5,7 @@
 use std::io::{Read, Seek, Write};
 use std::sync::atomic::AtomicBool;
 
+use content_security_policy as csp;
 use cssparser::SourceLocation;
 use encoding_rs::UTF_8;
 use mime::{self, Mime};
@@ -15,6 +16,7 @@ use net_traits::{
 };
 use servo_arc::Arc;
 use servo_url::ServoUrl;
+use style::context::QuirksMode;
 use style::media_queries::MediaList;
 use style::parser::ParserContext;
 use style::shared_lock::{Locked, SharedRwLock};
@@ -164,7 +166,16 @@ impl FetchResponseListener for StylesheetContext {
             let is_css = metadata.content_type.is_some_and(|ct| {
                 let mime: Mime = ct.into_inner().into();
                 mime.type_() == mime::TEXT && mime.subtype() == mime::CSS
-            });
+            }) || (
+                // Quirk: If the document has been set to quirks mode,
+                // has the same origin as the URL of the external resource,
+                // and the Content-Type metadata of the external resource
+                // is not a supported style sheet type, the user agent must
+                // instead assume it to be text/css.
+                // <https://html.spec.whatwg.org/multipage/#link-type-stylesheet>
+                document.quirks_mode() == QuirksMode::Quirks &&
+                    document.origin().immutable().clone() == metadata.final_url.origin()
+            );
 
             let data = if is_css {
                 let data = std::mem::take(&mut self.data);
@@ -204,7 +215,7 @@ impl FetchResponseListener for StylesheetContext {
                             document.quirks_mode(),
                         ));
 
-                        if link.is_alternate() {
+                        if link.is_effectively_disabled() {
                             sheet.set_disabled(true);
                         }
 
@@ -272,6 +283,11 @@ impl FetchResponseListener for StylesheetContext {
     fn submit_resource_timing(&mut self) {
         network_listener::submit_timing(self, CanGc::note())
     }
+
+    fn process_csp_violations(&mut self, _request_id: RequestId, violations: Vec<csp::Violation>) {
+        let global = &self.resource_timing_global();
+        global.report_csp_violations(violations, None);
+    }
 }
 
 impl ResourceTimingListener for StylesheetContext {
@@ -343,14 +359,17 @@ impl StylesheetLoader<'_> {
         }
 
         // https://html.spec.whatwg.org/multipage/#default-fetch-and-process-the-linked-resource
+        let global = self.elem.global();
         let request = create_a_potential_cors_request(
             Some(document.webview_id()),
             url.clone(),
             Destination::Style,
             cors_setting,
             None,
-            self.elem.global().get_referrer(),
+            global.get_referrer(),
             document.insecure_requests_policy(),
+            document.has_trustworthy_ancestor_or_current_origin(),
+            global.policy_container(),
         )
         .origin(document.origin().immutable().clone())
         .pipeline_id(Some(self.elem.global().pipeline_id()))
diff --git a/components/script/task_manager.rs b/components/script/task_manager.rs
index 2d4463e0c38..768d78bcb24 100644
--- a/components/script/task_manager.rs
+++ b/components/script/task_manager.rs
@@ -133,6 +133,7 @@ impl TaskManager {
     }
 
     task_source_functions!(self, canvas_blob_task_source, Canvas);
+    task_source_functions!(self, clipboard_task_source, Clipboard);
     task_source_functions!(self, dom_manipulation_task_source, DOMManipulation);
     task_source_functions!(self, file_reading_task_source, FileReading);
     task_source_functions!(self, font_loading_task_source, FontLoading);
diff --git a/components/script/task_source.rs b/components/script/task_source.rs
index 4bb6a5c110c..2aaa15609f1 100644
--- a/components/script/task_source.rs
+++ b/components/script/task_source.rs
@@ -23,6 +23,7 @@ use crate::task_manager::TaskManager;
 #[derive(Clone, Copy, Debug, Eq, Hash, JSTraceable, MallocSizeOf, PartialEq, VariantArray)]
 pub(crate) enum TaskSourceName {
     Canvas,
+    Clipboard,
     DOMManipulation,
     FileReading,
     /// <https://drafts.csswg.org/css-font-loading/#task-source>
@@ -48,6 +49,7 @@ impl From<TaskSourceName> for ScriptThreadEventCategory {
     fn from(value: TaskSourceName) -> Self {
         match value {
             TaskSourceName::Canvas => ScriptThreadEventCategory::ScriptEvent,
+            TaskSourceName::Clipboard => ScriptThreadEventCategory::ScriptEvent,
             TaskSourceName::DOMManipulation => ScriptThreadEventCategory::ScriptEvent,
             TaskSourceName::FileReading => ScriptThreadEventCategory::FileRead,
             TaskSourceName::FontLoading => ScriptThreadEventCategory::FontLoading,
diff --git a/components/script/timers.rs b/components/script/timers.rs
index 9d14b594e86..0afc3da164a 100644
--- a/components/script/timers.rs
+++ b/components/script/timers.rs
@@ -24,10 +24,9 @@ use crate::dom::bindings::refcounted::Trusted;
 use crate::dom::bindings::reflector::{DomGlobal, DomObject};
 use crate::dom::bindings::root::Dom;
 use crate::dom::bindings::str::DOMString;
-use crate::dom::document::FakeRequestAnimationFrameCallback;
+use crate::dom::document::{FakeRequestAnimationFrameCallback, RefreshRedirectDue};
 use crate::dom::eventsource::EventSourceTimeoutCallback;
 use crate::dom::globalscope::GlobalScope;
-use crate::dom::htmlmetaelement::RefreshRedirectDue;
 use crate::dom::testbinding::TestBindingCallback;
 use crate::dom::types::{Window, WorkerGlobalScope};
 use crate::dom::xmlhttprequest::XHRTimeoutCallback;
@@ -422,8 +421,7 @@ impl JsTimers {
     ) -> i32 {
         let callback = match callback {
             TimerCallback::StringTimerCallback(code_str) => {
-                let cx = GlobalScope::get_cx();
-                if global.is_js_evaluation_allowed(cx) {
+                if global.is_js_evaluation_allowed(code_str.as_ref()) {
                     InternalTimerCallback::StringTimerCallback(code_str)
                 } else {
                     return 0;
diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs
index a0ce6f1ca4a..6b4264d945e 100644
--- a/components/script/webdriver_handlers.rs
+++ b/components/script/webdriver_handlers.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use std::cmp;
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::ffi::CString;
 use std::ptr::NonNull;
 
@@ -23,8 +23,11 @@ use js::jsval::UndefinedValue;
 use js::rust::wrappers::{JS_CallFunctionName, JS_GetProperty, JS_HasOwnProperty, JS_TypeOfValue};
 use js::rust::{HandleObject, HandleValue, IdVector, ToString};
 use net_traits::CookieSource::{HTTP, NonHTTP};
-use net_traits::CoreResourceMsg::{DeleteCookies, GetCookiesDataForUrl, SetCookieForUrl};
+use net_traits::CoreResourceMsg::{
+    DeleteCookie, DeleteCookies, GetCookiesDataForUrl, SetCookieForUrl,
+};
 use net_traits::IpcSend;
+use script_bindings::conversions::is_array_like;
 use servo_url::ServoUrl;
 use webdriver::common::{WebElement, WebFrame, WebWindow};
 use webdriver::error::ErrorStatus;
@@ -43,14 +46,14 @@ use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
 use crate::dom::bindings::codegen::Bindings::XMLSerializerBinding::XMLSerializerMethods;
 use crate::dom::bindings::conversions::{
     ConversionBehavior, ConversionResult, FromJSValConvertible, StringificationBehavior,
-    get_property, get_property_jsval, is_array_like, jsid_to_string, jsstring_to_str,
-    root_from_object,
+    get_property, get_property_jsval, jsid_to_string, jsstring_to_str, root_from_object,
 };
-use crate::dom::bindings::error::{Error, throw_dom_exception};
+use crate::dom::bindings::error::{Error, report_pending_exception, throw_dom_exception};
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::reflector::{DomGlobal, DomObject};
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
+use crate::dom::document::Document;
 use crate::dom::element::Element;
 use crate::dom::eventtarget::EventTarget;
 use crate::dom::globalscope::GlobalScope;
@@ -58,13 +61,14 @@ use crate::dom::htmldatalistelement::HTMLDataListElement;
 use crate::dom::htmlelement::HTMLElement;
 use crate::dom::htmliframeelement::HTMLIFrameElement;
 use crate::dom::htmlinputelement::{HTMLInputElement, InputType};
+use crate::dom::htmloptgroupelement::HTMLOptGroupElement;
 use crate::dom::htmloptionelement::HTMLOptionElement;
 use crate::dom::htmlselectelement::HTMLSelectElement;
 use crate::dom::node::{Node, NodeTraits, ShadowIncluding};
 use crate::dom::nodelist::NodeList;
 use crate::dom::window::Window;
 use crate::dom::xmlserializer::XMLSerializer;
-use crate::realms::enter_realm;
+use crate::realms::{AlreadyInRealm, InRealm, enter_realm};
 use crate::script_module::ScriptFetchOptions;
 use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
 use crate::script_thread::ScriptThread;
@@ -74,12 +78,27 @@ fn find_node_by_unique_id(
     pipeline: PipelineId,
     node_id: String,
 ) -> Result<DomRoot<Node>, ErrorStatus> {
-    match documents.find_document(pipeline).and_then(|document| {
-        document
-            .upcast::<Node>()
-            .traverse_preorder(ShadowIncluding::Yes)
-            .find(|node| node.unique_id() == node_id)
-    }) {
+    match documents.find_document(pipeline) {
+        Some(doc) => find_node_by_unique_id_in_document(&doc, node_id),
+        None => {
+            if ScriptThread::has_node_id(&node_id) {
+                Err(ErrorStatus::StaleElementReference)
+            } else {
+                Err(ErrorStatus::NoSuchElement)
+            }
+        },
+    }
+}
+
+pub(crate) fn find_node_by_unique_id_in_document(
+    document: &Document,
+    node_id: String,
+) -> Result<DomRoot<Node>, ErrorStatus> {
+    match document
+        .upcast::<Node>()
+        .traverse_preorder(ShadowIncluding::Yes)
+        .find(|node| node.unique_id() == node_id)
+    {
         Some(node) => Ok(node),
         None => {
             if ScriptThread::has_node_id(&node_id) {
@@ -180,11 +199,38 @@ unsafe fn is_arguments_object(cx: *mut JSContext, value: HandleValue) -> bool {
     jsstring_to_str(cx, class_name) == "[object Arguments]"
 }
 
+#[derive(Clone, Eq, Hash, PartialEq)]
+struct HashableJSVal(u64);
+
+impl From<HandleValue<'_>> for HashableJSVal {
+    fn from(v: HandleValue<'_>) -> HashableJSVal {
+        HashableJSVal(v.get().asBits_)
+    }
+}
+
 #[allow(unsafe_code)]
-pub(crate) unsafe fn jsval_to_webdriver(
+/// <https://w3c.github.io/webdriver/#dfn-json-deserialize>
+pub(crate) fn jsval_to_webdriver(
+    cx: SafeJSContext,
+    global_scope: &GlobalScope,
+    val: HandleValue,
+    realm: InRealm,
+    can_gc: CanGc,
+) -> WebDriverJSResult {
+    let mut seen = HashSet::new();
+    let result = unsafe { jsval_to_webdriver_inner(*cx, global_scope, val, &mut seen) };
+    if result.is_err() {
+        report_pending_exception(cx, true, realm, can_gc);
+    }
+    result
+}
+
+#[allow(unsafe_code)]
+unsafe fn jsval_to_webdriver_inner(
     cx: *mut JSContext,
     global_scope: &GlobalScope,
     val: HandleValue,
+    seen: &mut HashSet<HashableJSVal>,
 ) -> WebDriverJSResult {
     let _ac = enter_realm(global_scope);
     if val.get().is_undefined() {
@@ -217,14 +263,26 @@ pub(crate) unsafe fn jsval_to_webdriver(
                 _ => unreachable!(),
             };
         Ok(WebDriverJSValue::String(String::from(string)))
-    } else if val.get().is_object() {
+    }
+    // https://w3c.github.io/webdriver/#dfn-clone-an-object
+    else if val.get().is_object() {
+        let hashable = val.into();
+        // Step 1. If value is in `seen`, return error with error code javascript error.
+        if seen.contains(&hashable) {
+            return Err(WebDriverJSError::JSError);
+        }
+        //Step 2. Append value to `seen`.
+        seen.insert(hashable.clone());
+
         rooted!(in(cx) let object = match FromJSValConvertible::from_jsval(cx, val, ()).unwrap() {
             ConversionResult::Success(object) => object,
             _ => unreachable!(),
         });
         let _ac = JSAutoRealm::new(cx, *object);
 
-        if is_array_like(cx, val) || is_arguments_object(cx, val) {
+        let return_val = if is_array_like::<crate::DomTypeHolder>(cx, val) ||
+            is_arguments_object(cx, val)
+        {
             let mut result: Vec<WebDriverJSValue> = Vec::new();
 
             let length = match get_property::<u32>(
@@ -247,13 +305,15 @@ pub(crate) unsafe fn jsval_to_webdriver(
                     return Err(WebDriverJSError::JSError);
                 },
             };
-
+            // Step 4. For each enumerable property in value, run the following substeps:
             for i in 0..length {
                 rooted!(in(cx) let mut item = UndefinedValue());
                 match get_property_jsval(cx, object.handle(), &i.to_string(), item.handle_mut()) {
-                    Ok(_) => match jsval_to_webdriver(cx, global_scope, item.handle()) {
-                        Ok(converted_item) => result.push(converted_item),
-                        err @ Err(_) => return err,
+                    Ok(_) => {
+                        match jsval_to_webdriver_inner(cx, global_scope, item.handle(), seen) {
+                            Ok(converted_item) => result.push(converted_item),
+                            err @ Err(_) => return err,
+                        }
                     },
                     Err(error) => {
                         throw_dom_exception(
@@ -266,7 +326,6 @@ pub(crate) unsafe fn jsval_to_webdriver(
                     },
                 }
             }
-
             Ok(WebDriverJSValue::ArrayLike(result))
         } else if let Ok(element) = root_from_object::<Element>(*object, cx) {
             Ok(WebDriverJSValue::Element(WebElement(
@@ -275,7 +334,7 @@ pub(crate) unsafe fn jsval_to_webdriver(
         } else if let Ok(window) = root_from_object::<Window>(*object, cx) {
             let window_proxy = window.window_proxy();
             if window_proxy.is_browsing_context_discarded() {
-                Err(WebDriverJSError::StaleElementReference)
+                return Err(WebDriverJSError::StaleElementReference);
             } else if window_proxy.browsing_context_id() == window_proxy.webview_id() {
                 Ok(WebDriverJSValue::Window(WebWindow(
                     window.Document().upcast::<Node>().unique_id(),
@@ -295,7 +354,12 @@ pub(crate) unsafe fn jsval_to_webdriver(
                 &HandleValueArray::empty(),
                 value.handle_mut(),
             ) {
-                jsval_to_webdriver(cx, global_scope, value.handle())
+                Ok(jsval_to_webdriver_inner(
+                    cx,
+                    global_scope,
+                    value.handle(),
+                    seen,
+                )?)
             } else {
                 throw_dom_exception(
                     SafeJSContext::from_ptr(cx),
@@ -303,7 +367,7 @@ pub(crate) unsafe fn jsval_to_webdriver(
                     Error::JSFailed,
                     CanGc::note(),
                 );
-                Err(WebDriverJSError::JSError)
+                return Err(WebDriverJSError::JSError);
             }
         } else {
             let mut result = HashMap::new();
@@ -346,16 +410,21 @@ pub(crate) unsafe fn jsval_to_webdriver(
                         return Err(WebDriverJSError::JSError);
                     };
 
-                    if let Ok(value) = jsval_to_webdriver(cx, global_scope, property.handle()) {
+                    if let Ok(value) =
+                        jsval_to_webdriver_inner(cx, global_scope, property.handle(), seen)
+                    {
                         result.insert(name.into(), value);
                     } else {
                         return Err(WebDriverJSError::JSError);
                     }
                 }
             }
-
             Ok(WebDriverJSValue::Object(result))
-        }
+        };
+        // Step 5. Remove the last element of `seen`.
+        seen.remove(&hashable);
+        // Step 6. Return success with data `result`.
+        return_val
     } else {
         Err(WebDriverJSError::UnknownType)
     }
@@ -370,18 +439,22 @@ pub(crate) fn handle_execute_script(
 ) {
     match window {
         Some(window) => {
-            let result = unsafe {
-                let cx = window.get_cx();
-                rooted!(in(*cx) let mut rval = UndefinedValue());
-                let global = window.as_global_scope();
-                global.evaluate_js_on_global_with_result(
-                    &eval,
-                    rval.handle_mut(),
-                    ScriptFetchOptions::default_classic_script(global),
-                    global.api_base_url(),
-                    can_gc,
-                );
-                jsval_to_webdriver(*cx, global, rval.handle())
+            let cx = window.get_cx();
+            let realm = AlreadyInRealm::assert_for_cx(cx);
+            let realm = InRealm::already(&realm);
+
+            rooted!(in(*cx) let mut rval = UndefinedValue());
+            let global = window.as_global_scope();
+            let result = if global.evaluate_js_on_global_with_result(
+                &eval,
+                rval.handle_mut(),
+                ScriptFetchOptions::default_classic_script(global),
+                global.api_base_url(),
+                can_gc,
+            ) {
+                jsval_to_webdriver(cx, global, rval.handle(), realm, can_gc)
+            } else {
+                Err(WebDriverJSError::JSError)
             };
 
             reply.send(result).unwrap();
@@ -403,17 +476,20 @@ pub(crate) fn handle_execute_async_script(
     match window {
         Some(window) => {
             let cx = window.get_cx();
+            let reply_sender = reply.clone();
             window.set_webdriver_script_chan(Some(reply));
             rooted!(in(*cx) let mut rval = UndefinedValue());
 
             let global_scope = window.as_global_scope();
-            global_scope.evaluate_js_on_global_with_result(
+            if !global_scope.evaluate_js_on_global_with_result(
                 &eval,
                 rval.handle_mut(),
                 ScriptFetchOptions::default_classic_script(global_scope),
                 global_scope.api_base_url(),
                 can_gc,
-            );
+            ) {
+                reply_sender.send(Err(WebDriverJSError::JSError)).unwrap();
+            }
         },
         None => {
             reply
@@ -551,6 +627,7 @@ pub(crate) fn handle_find_element_tag_name(
     pipeline: PipelineId,
     selector: String,
     reply: IpcSender<Result<Option<String>, ErrorStatus>>,
+    can_gc: CanGc,
 ) {
     reply
         .send(
@@ -559,7 +636,7 @@ pub(crate) fn handle_find_element_tag_name(
                 .ok_or(ErrorStatus::UnknownError)
                 .map(|document| {
                     document
-                        .GetElementsByTagName(DOMString::from(selector))
+                        .GetElementsByTagName(DOMString::from(selector), can_gc)
                         .elements_iter()
                         .next()
                 })
@@ -618,13 +695,14 @@ pub(crate) fn handle_find_elements_tag_name(
     pipeline: PipelineId,
     selector: String,
     reply: IpcSender<Result<Vec<String>, ErrorStatus>>,
+    can_gc: CanGc,
 ) {
     reply
         .send(
             documents
                 .find_document(pipeline)
                 .ok_or(ErrorStatus::UnknownError)
-                .map(|document| document.GetElementsByTagName(DOMString::from(selector)))
+                .map(|document| document.GetElementsByTagName(DOMString::from(selector), can_gc))
                 .map(|nodes| {
                     nodes
                         .elements_iter()
@@ -675,6 +753,7 @@ pub(crate) fn handle_find_element_element_tag_name(
     element_id: String,
     selector: String,
     reply: IpcSender<Result<Option<String>, ErrorStatus>>,
+    can_gc: CanGc,
 ) {
     reply
         .send(
@@ -682,7 +761,7 @@ pub(crate) fn handle_find_element_element_tag_name(
                 .downcast::<Element>(
             ) {
                 Some(element) => Ok(element
-                    .GetElementsByTagName(DOMString::from(selector))
+                    .GetElementsByTagName(DOMString::from(selector), can_gc)
                     .elements_iter()
                     .next()
                     .map(|x| x.upcast::<Node>().unique_id())),
@@ -737,6 +816,7 @@ pub(crate) fn handle_find_element_elements_tag_name(
     element_id: String,
     selector: String,
     reply: IpcSender<Result<Vec<String>, ErrorStatus>>,
+    can_gc: CanGc,
 ) {
     reply
         .send(
@@ -744,7 +824,7 @@ pub(crate) fn handle_find_element_elements_tag_name(
                 .downcast::<Element>(
             ) {
                 Some(element) => Ok(element
-                    .GetElementsByTagName(DOMString::from(selector))
+                    .GetElementsByTagName(DOMString::from(selector), can_gc)
                     .elements_iter()
                     .map(|x| x.upcast::<Node>().unique_id())
                     .collect::<Vec<String>>()),
@@ -792,6 +872,24 @@ pub(crate) fn handle_get_active_element(
         .unwrap();
 }
 
+pub(crate) fn handle_get_computed_role(
+    documents: &DocumentCollection,
+    pipeline: PipelineId,
+    node_id: String,
+    reply: IpcSender<Result<Option<String>, ErrorStatus>>,
+) {
+    reply
+        .send(
+            find_node_by_unique_id(documents, pipeline, node_id).and_then(|node| {
+                match node.downcast::<Element>() {
+                    Some(element) => Ok(element.GetRole().map(String::from)),
+                    None => Err(ErrorStatus::UnknownError),
+                }
+            }),
+        )
+        .unwrap();
+}
+
 pub(crate) fn handle_get_page_source(
     documents: &DocumentCollection,
     pipeline: PipelineId,
@@ -804,7 +902,7 @@ pub(crate) fn handle_get_page_source(
                 .find_document(pipeline)
                 .ok_or(ErrorStatus::UnknownError)
                 .and_then(|document| match document.GetDocumentElement() {
-                    Some(element) => match element.GetOuterHTML(can_gc) {
+                    Some(element) => match element.outer_html(can_gc) {
                         Ok(source) => Ok(source.to_string()),
                         Err(_) => {
                             match XMLSerializer::new(document.window(), None, can_gc)
@@ -925,6 +1023,7 @@ pub(crate) fn handle_add_cookie(
         .unwrap();
 }
 
+// https://w3c.github.io/webdriver/#delete-all-cookies
 pub(crate) fn handle_delete_cookies(
     documents: &DocumentCollection,
     pipeline: PipelineId,
@@ -946,6 +1045,29 @@ pub(crate) fn handle_delete_cookies(
     reply.send(Ok(())).unwrap();
 }
 
+// https://w3c.github.io/webdriver/#delete-cookie
+pub(crate) fn handle_delete_cookie(
+    documents: &DocumentCollection,
+    pipeline: PipelineId,
+    name: String,
+    reply: IpcSender<Result<(), ErrorStatus>>,
+) {
+    let document = match documents.find_document(pipeline) {
+        Some(document) => document,
+        None => {
+            return reply.send(Err(ErrorStatus::UnknownError)).unwrap();
+        },
+    };
+    let url = document.url();
+    document
+        .window()
+        .as_global_scope()
+        .resource_threads()
+        .send(DeleteCookie(url, name))
+        .unwrap();
+    reply.send(Ok(())).unwrap();
+}
+
 pub(crate) fn handle_get_title(
     documents: &DocumentCollection,
     pipeline: PipelineId,
@@ -1087,12 +1209,13 @@ pub(crate) fn handle_get_property(
     node_id: String,
     name: String,
     reply: IpcSender<Result<WebDriverJSValue, ErrorStatus>>,
+    can_gc: CanGc,
 ) {
     reply
         .send(
             find_node_by_unique_id(documents, pipeline, node_id).map(|node| {
                 let document = documents.find_document(pipeline).unwrap();
-                let _ac = enter_realm(&*document);
+                let realm = enter_realm(&*document);
                 let cx = document.window().get_cx();
 
                 rooted!(in(*cx) let mut property = UndefinedValue());
@@ -1105,14 +1228,19 @@ pub(crate) fn handle_get_property(
                     )
                 } {
                     Ok(_) => {
-                        match unsafe { jsval_to_webdriver(*cx, &node.global(), property.handle()) }
-                        {
+                        match jsval_to_webdriver(
+                            cx,
+                            &node.global(),
+                            property.handle(),
+                            InRealm::entered(&realm),
+                            can_gc,
+                        ) {
                             Ok(property) => property,
                             Err(_) => WebDriverJSValue::Undefined,
                         }
                     },
                     Err(error) => {
-                        throw_dom_exception(cx, &node.global(), error, CanGc::note());
+                        throw_dom_exception(cx, &node.global(), error, can_gc);
                         WebDriverJSValue::Undefined
                     },
                 }
@@ -1148,6 +1276,7 @@ pub(crate) fn handle_get_url(
     documents: &DocumentCollection,
     pipeline: PipelineId,
     reply: IpcSender<ServoUrl>,
+    _can_gc: CanGc,
 ) {
     reply
         .send(
@@ -1160,6 +1289,35 @@ pub(crate) fn handle_get_url(
         .unwrap();
 }
 
+fn get_option_parent(node: &Node) -> Option<DomRoot<Node>> {
+    // Get parent for `<option>` or `<optiongrp>` based on container spec:
+    // > 1. Let datalist parent be the first datalist element reached by traversing the tree
+    // >    in reverse order from element, or undefined if the root of the tree is reached.
+    // > 2. Let select parent be the first select element reached by traversing the tree in
+    // >    reverse order from element, or undefined if the root of the tree is reached.
+    // > 3. If datalist parent is undefined, the element context is select parent.
+    // >    Otherwise, the element context is datalist parent.
+    let root_node = node.GetRootNode(&GetRootNodeOptions::empty());
+    node.preceding_nodes(&root_node)
+        .find(|preceding| preceding.is::<HTMLDataListElement>())
+        .or_else(|| {
+            node.preceding_nodes(&root_node)
+                .find(|preceding| preceding.is::<HTMLSelectElement>())
+        })
+}
+
+// https://w3c.github.io/webdriver/#dfn-container
+fn get_container(node: &Node) -> Option<DomRoot<Node>> {
+    if node.is::<HTMLOptionElement>() {
+        return get_option_parent(node);
+    }
+    if node.is::<HTMLOptGroupElement>() {
+        let option_parent = get_option_parent(node);
+        return option_parent.or_else(|| Some(DomRoot::from_ref(node)));
+    }
+    Some(DomRoot::from_ref(node))
+}
+
 // https://w3c.github.io/webdriver/#element-click
 pub(crate) fn handle_element_click(
     documents: &DocumentCollection,
@@ -1179,6 +1337,10 @@ pub(crate) fn handle_element_click(
                     }
                 }
 
+                let Some(container) = get_container(&node) else {
+                    return Err(ErrorStatus::UnknownError);
+                };
+
                 // Step 5
                 // TODO: scroll into view
 
@@ -1191,32 +1353,14 @@ pub(crate) fn handle_element_click(
                 // Step 8
                 match node.downcast::<HTMLOptionElement>() {
                     Some(option_element) => {
-                        // https://w3c.github.io/webdriver/#dfn-container
-                        let root_node = node.GetRootNode(&GetRootNodeOptions::empty());
-                        let datalist_parent = node
-                            .preceding_nodes(&root_node)
-                            .find(|preceding| preceding.is::<HTMLDataListElement>());
-                        let select_parent = node
-                            .preceding_nodes(&root_node)
-                            .find(|preceding| preceding.is::<HTMLSelectElement>());
-
-                        // Step 8.1
-                        let parent_node = match datalist_parent {
-                            Some(datalist_parent) => datalist_parent,
-                            None => match select_parent {
-                                Some(select_parent) => select_parent,
-                                None => return Err(ErrorStatus::UnknownError),
-                            },
-                        };
-
                         // Steps 8.2 - 8.4
-                        let event_target = parent_node.upcast::<EventTarget>();
+                        let event_target = container.upcast::<EventTarget>();
                         event_target.fire_event(atom!("mouseover"), can_gc);
                         event_target.fire_event(atom!("mousemove"), can_gc);
                         event_target.fire_event(atom!("mousedown"), can_gc);
 
                         // Step 8.5
-                        match parent_node.downcast::<HTMLElement>() {
+                        match container.downcast::<HTMLElement>() {
                             Some(html_element) => html_element.Focus(can_gc),
                             None => return Err(ErrorStatus::UnknownError),
                         }
@@ -1230,7 +1374,7 @@ pub(crate) fn handle_element_click(
                             let previous_selectedness = option_element.Selected();
 
                             // Step 8.6.3
-                            match parent_node.downcast::<HTMLSelectElement>() {
+                            match container.downcast::<HTMLSelectElement>() {
                                 Some(select_element) => {
                                     if select_element.Multiple() {
                                         option_element.SetSelected(!option_element.Selected());
diff --git a/components/script/xpath/eval.rs b/components/script/xpath/eval.rs
index 9c95c3d8699..75d7ac5849c 100644
--- a/components/script/xpath/eval.rs
+++ b/components/script/xpath/eval.rs
@@ -4,7 +4,7 @@
 
 use std::fmt;
 
-use html5ever::{QualName, local_name, namespace_prefix, namespace_url, ns};
+use html5ever::{QualName, local_name, namespace_prefix, ns};
 
 use super::parser::{
     AdditiveOp, Axis, EqualityOp, Expr, FilterExpr, KindTest, Literal, MultiplicativeOp, NodeTest,
diff --git a/components/script_bindings/Cargo.toml b/components/script_bindings/Cargo.toml
index 891f6a7a026..7e4e751a2a8 100644
--- a/components/script_bindings/Cargo.toml
+++ b/components/script_bindings/Cargo.toml
@@ -15,15 +15,13 @@ links = "script_bindings_crate"
 name = "script_bindings"
 path = "lib.rs"
 
-[build-dependencies]
-phf_codegen = "0.11"
-phf_shared = "0.11"
-serde_json = { workspace = true }
-
 [dependencies]
 bitflags = { workspace = true }
 crossbeam-channel = { workspace = true }
 cssparser = { workspace = true }
+deny_public_fields = { path = "../deny_public_fields" }
+dom_struct = { path = "../dom_struct" }
+domobject_derive = { path = "../domobject_derive" }
 html5ever = { workspace = true }
 indexmap = { workspace = true }
 js = { workspace = true }
@@ -34,18 +32,27 @@ malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 num-traits = { workspace = true }
 parking_lot = { workspace = true }
+phf = "0.11"
 regex = { workspace = true }
 servo_arc = { workspace = true }
-smallvec = { workspace = true }
-stylo_atoms = { workspace = true }
 servo_config = { path = "../config" }
+servo_url = { path = "../url" }
+smallvec = { workspace = true }
 stylo = { workspace = true }
+stylo_atoms = { workspace = true }
 tendril = { version = "0.4.1", features = ["encoding_rs"] }
+tracing = { workspace = true, optional = true }
 webxr-api = { workspace = true, optional = true }
 xml5ever = { workspace = true }
 
+[build-dependencies]
+phf_codegen = "0.11"
+phf_shared = "0.11"
+serde_json = { workspace = true }
+
 [features]
 bluetooth = []
+tracing = ["dep:tracing"]
 webgpu = []
 webxr = ["webxr-api"]
 
diff --git a/components/script_bindings/build.rs b/components/script_bindings/build.rs
index 25b5e10a24d..b11e3d1cfdf 100644
--- a/components/script_bindings/build.rs
+++ b/components/script_bindings/build.rs
@@ -43,13 +43,21 @@ fn main() {
     let json: Value = serde_json::from_reader(File::open(json).unwrap()).unwrap();
     let mut map = phf_codegen::Map::new();
     for (key, value) in json.as_object().unwrap() {
-        map.entry(Bytes(key), value.as_str().unwrap());
+        let parts = value.as_array().unwrap();
+        map.entry(
+            Bytes(key),
+            &format!(
+                "Interface {{ define: {}, enabled: {} }}",
+                parts[0].as_str().unwrap(),
+                parts[1].as_str().unwrap()
+            ),
+        );
     }
     let phf = PathBuf::from(env::var_os("OUT_DIR").unwrap()).join("InterfaceObjectMapPhf.rs");
     let mut phf = File::create(phf).unwrap();
     writeln!(
         &mut phf,
-        "pub(crate) static MAP: phf::Map<&'static [u8], fn(JSContext, HandleObject)> = {};",
+        "pub(crate) static MAP: phf::Map<&'static [u8], Interface> = {};",
         map.build(),
     )
     .unwrap();
diff --git a/components/script_bindings/callback.rs b/components/script_bindings/callback.rs
index d891535e671..2c43653c825 100644
--- a/components/script_bindings/callback.rs
+++ b/components/script_bindings/callback.rs
@@ -2,10 +2,31 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use js::jsapi::JSObject;
-use js::rust::HandleObject;
+//! Base classes to work with IDL callbacks.
 
+use std::default::Default;
+use std::ffi::CString;
+use std::mem::drop;
+use std::rc::Rc;
+
+use js::jsapi::{
+    AddRawValueRoot, EnterRealm, Heap, IsCallable, JSObject, LeaveRealm, Realm, RemoveRawValueRoot,
+};
+use js::jsval::{JSVal, NullValue, ObjectValue, UndefinedValue};
+use js::rust::wrappers::{JS_GetProperty, JS_WrapObject};
+use js::rust::{HandleObject, MutableHandleValue, Runtime};
+
+use crate::DomTypes;
+use crate::codegen::GenericBindings::WindowBinding::Window_Binding::WindowMethods;
+use crate::error::{Error, Fallible};
+use crate::inheritance::Castable;
+use crate::interfaces::{DocumentHelpers, DomHelpers, GlobalScopeHelpers};
+use crate::realms::{InRealm, enter_realm};
 use crate::reflector::DomObject;
+use crate::root::{Dom, DomRoot};
+use crate::script_runtime::{CanGc, JSContext};
+use crate::settings_stack::{GenericAutoEntryScript, GenericAutoIncumbentScript};
+use crate::utils::AsCCharPtrPtr;
 
 pub trait ThisReflector {
     fn jsobject(&self) -> *mut JSObject;
@@ -22,3 +43,279 @@ impl ThisReflector for HandleObject<'_> {
         self.get()
     }
 }
+
+/// The exception handling used for a call.
+#[derive(Clone, Copy, PartialEq)]
+pub enum ExceptionHandling {
+    /// Report any exception and don't throw it to the caller code.
+    Report,
+    /// Throw any exception to the caller code.
+    Rethrow,
+}
+
+/// A common base class for representing IDL callback function and
+/// callback interface types.
+#[derive(JSTraceable)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+pub struct CallbackObject<D: DomTypes> {
+    /// The underlying `JSObject`.
+    callback: Heap<*mut JSObject>,
+    permanent_js_root: Heap<JSVal>,
+
+    /// The ["callback context"], that is, the global to use as incumbent
+    /// global when calling the callback.
+    ///
+    /// Looking at the WebIDL standard, it appears as though there would always
+    /// be a value here, but [sometimes] callback functions are created by
+    /// hand-waving without defining the value of the callback context, and
+    /// without any JavaScript code on the stack to grab an incumbent global
+    /// from.
+    ///
+    /// ["callback context"]: https://heycam.github.io/webidl/#dfn-callback-context
+    /// [sometimes]: https://github.com/whatwg/html/issues/2248
+    incumbent: Option<Dom<D::GlobalScope>>,
+}
+
+impl<D: DomTypes> CallbackObject<D> {
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    // These are used by the bindings and do not need `default()` functions.
+    #[allow(clippy::new_without_default)]
+    fn new() -> Self {
+        Self {
+            callback: Heap::default(),
+            permanent_js_root: Heap::default(),
+            incumbent: D::GlobalScope::incumbent().map(|i| Dom::from_ref(&*i)),
+        }
+    }
+
+    pub fn get(&self) -> *mut JSObject {
+        self.callback.get()
+    }
+
+    #[allow(unsafe_code)]
+    unsafe fn init(&mut self, cx: JSContext, callback: *mut JSObject) {
+        self.callback.set(callback);
+        self.permanent_js_root.set(ObjectValue(callback));
+        assert!(AddRawValueRoot(
+            *cx,
+            self.permanent_js_root.get_unsafe(),
+            b"CallbackObject::root\n".as_c_char_ptr()
+        ));
+    }
+}
+
+impl<D: DomTypes> Drop for CallbackObject<D> {
+    #[allow(unsafe_code)]
+    fn drop(&mut self) {
+        unsafe {
+            if let Some(cx) = Runtime::get() {
+                RemoveRawValueRoot(cx.as_ptr(), self.permanent_js_root.get_unsafe());
+            }
+        }
+    }
+}
+
+impl<D: DomTypes> PartialEq for CallbackObject<D> {
+    fn eq(&self, other: &CallbackObject<D>) -> bool {
+        self.callback.get() == other.callback.get()
+    }
+}
+
+/// A trait to be implemented by concrete IDL callback function and
+/// callback interface types.
+pub trait CallbackContainer<D: DomTypes> {
+    /// Create a new CallbackContainer object for the given `JSObject`.
+    ///
+    /// # Safety
+    /// `callback` must point to a valid, non-null JSObject.
+    unsafe fn new(cx: JSContext, callback: *mut JSObject) -> Rc<Self>;
+    /// Returns the underlying `CallbackObject`.
+    fn callback_holder(&self) -> &CallbackObject<D>;
+    /// Returns the underlying `JSObject`.
+    fn callback(&self) -> *mut JSObject {
+        self.callback_holder().get()
+    }
+    /// Returns the ["callback context"], that is, the global to use as
+    /// incumbent global when calling the callback.
+    ///
+    /// ["callback context"]: https://heycam.github.io/webidl/#dfn-callback-context
+    fn incumbent(&self) -> Option<&D::GlobalScope> {
+        self.callback_holder().incumbent.as_deref()
+    }
+}
+
+/// A common base class for representing IDL callback function types.
+#[derive(JSTraceable, PartialEq)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+pub struct CallbackFunction<D: DomTypes> {
+    object: CallbackObject<D>,
+}
+
+impl<D: DomTypes> CallbackFunction<D> {
+    /// Create a new `CallbackFunction` for this object.
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    // These are used by the bindings and do not need `default()` functions.
+    #[allow(clippy::new_without_default)]
+    pub fn new() -> Self {
+        Self {
+            object: CallbackObject::new(),
+        }
+    }
+
+    /// Returns the underlying `CallbackObject`.
+    pub fn callback_holder(&self) -> &CallbackObject<D> {
+        &self.object
+    }
+
+    /// Initialize the callback function with a value.
+    /// Should be called once this object is done moving.
+    ///
+    /// # Safety
+    /// `callback` must point to a valid, non-null JSObject.
+    pub unsafe fn init(&mut self, cx: JSContext, callback: *mut JSObject) {
+        self.object.init(cx, callback);
+    }
+}
+
+/// A common base class for representing IDL callback interface types.
+#[derive(JSTraceable, PartialEq)]
+#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+pub struct CallbackInterface<D: DomTypes> {
+    object: CallbackObject<D>,
+}
+
+impl<D: DomTypes> CallbackInterface<D> {
+    /// Create a new CallbackInterface object for the given `JSObject`.
+    // These are used by the bindings and do not need `default()` functions.
+    #[allow(clippy::new_without_default)]
+    pub fn new() -> Self {
+        Self {
+            object: CallbackObject::new(),
+        }
+    }
+
+    /// Returns the underlying `CallbackObject`.
+    pub fn callback_holder(&self) -> &CallbackObject<D> {
+        &self.object
+    }
+
+    /// Initialize the callback function with a value.
+    /// Should be called once this object is done moving.
+    ///
+    /// # Safety
+    /// `callback` must point to a valid, non-null JSObject.
+    pub unsafe fn init(&mut self, cx: JSContext, callback: *mut JSObject) {
+        self.object.init(cx, callback);
+    }
+
+    /// Returns the property with the given `name`, if it is a callable object,
+    /// or an error otherwise.
+    pub fn get_callable_property(&self, cx: JSContext, name: &str) -> Fallible<JSVal> {
+        rooted!(in(*cx) let mut callable = UndefinedValue());
+        rooted!(in(*cx) let obj = self.callback_holder().get());
+        unsafe {
+            let c_name = CString::new(name).unwrap();
+            if !JS_GetProperty(*cx, obj.handle(), c_name.as_ptr(), callable.handle_mut()) {
+                return Err(Error::JSFailed);
+            }
+
+            if !callable.is_object() || !IsCallable(callable.to_object()) {
+                return Err(Error::Type(format!(
+                    "The value of the {} property is not callable",
+                    name
+                )));
+            }
+        }
+        Ok(callable.get())
+    }
+}
+
+/// Wraps the reflector for `p` into the realm of `cx`.
+pub(crate) fn wrap_call_this_value<T: ThisReflector>(
+    cx: JSContext,
+    p: &T,
+    mut rval: MutableHandleValue,
+) -> bool {
+    rooted!(in(*cx) let mut obj = p.jsobject());
+
+    if obj.is_null() {
+        rval.set(NullValue());
+        return true;
+    }
+
+    unsafe {
+        if !JS_WrapObject(*cx, obj.handle_mut()) {
+            return false;
+        }
+    }
+
+    rval.set(ObjectValue(*obj));
+    true
+}
+
+/// A class that performs whatever setup we need to safely make a call while
+/// this class is on the stack. After `new` returns, the call is safe to make.
+pub struct CallSetup<D: DomTypes> {
+    /// The global for reporting exceptions. This is the global object of the
+    /// (possibly wrapped) callback object.
+    exception_global: DomRoot<D::GlobalScope>,
+    /// The `JSContext` used for the call.
+    cx: JSContext,
+    /// The realm we were in before the call.
+    old_realm: *mut Realm,
+    /// The exception handling used for the call.
+    handling: ExceptionHandling,
+    /// <https://heycam.github.io/webidl/#es-invoking-callback-functions>
+    /// steps 8 and 18.2.
+    entry_script: Option<GenericAutoEntryScript<D>>,
+    /// <https://heycam.github.io/webidl/#es-invoking-callback-functions>
+    /// steps 9 and 18.1.
+    incumbent_script: Option<GenericAutoIncumbentScript<D>>,
+}
+
+impl<D: DomTypes> CallSetup<D> {
+    /// Performs the setup needed to make a call.
+    #[cfg_attr(crown, allow(crown::unrooted_must_root))]
+    pub fn new<T: CallbackContainer<D>>(callback: &T, handling: ExceptionHandling) -> Self {
+        let global = unsafe { D::GlobalScope::from_object(callback.callback()) };
+        if let Some(window) = global.downcast::<D::Window>() {
+            window.Document().ensure_safe_to_run_script_or_layout();
+        }
+        let cx = D::GlobalScope::get_cx();
+
+        let aes = GenericAutoEntryScript::<D>::new(&global);
+        let ais = callback.incumbent().map(GenericAutoIncumbentScript::new);
+        CallSetup {
+            exception_global: global,
+            cx,
+            old_realm: unsafe { EnterRealm(*cx, callback.callback()) },
+            handling,
+            entry_script: Some(aes),
+            incumbent_script: ais,
+        }
+    }
+
+    /// Returns the `JSContext` used for the call.
+    pub fn get_context(&self) -> JSContext {
+        self.cx
+    }
+}
+
+impl<D: DomTypes> Drop for CallSetup<D> {
+    fn drop(&mut self) {
+        unsafe {
+            LeaveRealm(*self.cx, self.old_realm);
+        }
+        if self.handling == ExceptionHandling::Report {
+            let ar = enter_realm::<D>(&*self.exception_global);
+            <D as DomHelpers<D>>::report_pending_exception(
+                self.cx,
+                true,
+                InRealm::Entered(&ar),
+                CanGc::note(),
+            );
+        }
+        drop(self.incumbent_script.take());
+        drop(self.entry_script.take().unwrap());
+    }
+}
diff --git a/components/script_bindings/codegen/Bindings.conf b/components/script_bindings/codegen/Bindings.conf
index d5b1dc5c281..92871bc54aa 100644
--- a/components/script_bindings/codegen/Bindings.conf
+++ b/components/script_bindings/codegen/Bindings.conf
@@ -18,6 +18,10 @@ DOMInterfaces = {
     'weakReferenceable': True,
 },
 
+'Attr': {
+    'canGc':['SetValue'],
+},
+
 'AudioBuffer': {
     'canGc':['CopyToChannel', 'GetChannelData'],
 },
@@ -80,7 +84,15 @@ DOMInterfaces = {
 },
 
 'CharacterData': {
-    'canGc': ['Before', 'After', 'ReplaceWith']
+    'canGc': ['Before', 'After', 'Remove', 'ReplaceWith']
+},
+
+'Clipboard': {
+    'canGc': ['ReadText', 'WriteText']
+},
+
+'ClipboardItem': {
+    'canGc': ['Types']
 },
 
 'CountQueuingStrategy': {
@@ -107,10 +119,22 @@ DOMInterfaces = {
     'canGc': ['Media'],
 },
 
+'CSSNestedDeclarations': {
+    'canGc': ['Style'],
+},
+
 'CSSRuleList': {
     'canGc': ['Item', 'IndexedGetter'],
 },
 
+'CSSStyleRule': {
+    'canGc': ['Style'],
+},
+
+'CSSStyleSheet': {
+   'canGc': ['AddRule', 'DeleteRule', 'GetCssRules', 'GetRules', 'InsertRule', 'RemoveRule'],
+},
+
 'Crypto': {
     'canGc': ['Subtle'],
 },
@@ -137,16 +161,20 @@ DOMInterfaces = {
 },
 
 'Document': {
-    'additionalTraits': ["crate::dom::document::DocumentHelpers<Self>"],
-    'canGc': ['Close', 'CreateElement', 'CreateElementNS', 'ImportNode', 'SetTitle', 'Write', 'Writeln', 'CreateEvent', 'CreateRange', 'Open', 'Open_', 'CreateComment', 'CreateAttribute', 'CreateAttributeNS', 'CreateDocumentFragment', 'CreateTextNode', 'CreateCDATASection', 'CreateProcessingInstruction', 'Prepend', 'Append', 'ReplaceChildren', 'SetBgColor', 'SetFgColor', 'Fonts', 'ElementFromPoint', 'ElementsFromPoint', 'ExitFullscreen', 'CreateExpression', 'CreateNSResolver', 'Evaluate'],
+    'additionalTraits': ["crate::interfaces::DocumentHelpers"],
+    'canGc': ['Close', 'CreateElement', 'CreateElementNS', 'ImportNode', 'SetTitle', 'Write', 'Writeln', 'CreateEvent', 'CreateRange', 'Open', 'Open_', 'CreateComment', 'CreateAttribute', 'CreateAttributeNS', 'CreateDocumentFragment', 'CreateTextNode', 'CreateCDATASection', 'CreateProcessingInstruction', 'Prepend', 'Append', 'ReplaceChildren', 'SetBgColor', 'SetFgColor', 'Fonts', 'ElementFromPoint', 'ElementsFromPoint', 'GetScrollingElement', 'ExitFullscreen', 'CreateExpression', 'CreateNSResolver', 'Evaluate', 'StyleSheets', 'Implementation', 'GetElementsByTagName', 'GetElementsByTagNameNS', 'GetElementsByClassName', 'AdoptNode', 'CreateNodeIterator', 'SetBody', 'GetElementsByName', 'Images', 'Embeds', 'Plugins', 'Links', 'Forms', 'Scripts', 'Anchors', 'Applets', 'Children', 'GetSelection'],
+},
+
+'DissimilarOriginWindow': {
+    'canGc': ['Location']
 },
 
 'DocumentFragment': {
-    'canGc': ['Prepend', 'Append', 'ReplaceChildren']
+    'canGc': ['Prepend', 'Append', 'ReplaceChildren', 'Children']
 },
 
 'DocumentType': {
-    'canGc': ['Before', 'After', 'ReplaceWith']
+    'canGc': ['Before', 'After', 'Remove', 'ReplaceWith']
 },
 
 'DOMImplementation': {
@@ -177,8 +205,16 @@ DOMInterfaces = {
     'canGc': ['FromRect', 'FromQuad', 'GetBounds'],
 },
 
+'DOMRect': {
+    'canGc': ['FromRect'],
+},
+
+'DOMRectReadOnly': {
+    'canGc': ['FromRect'],
+},
+
 'DOMStringMap': {
-    'canGc': ['NamedSetter']
+    'canGc': ['NamedDeleter', 'NamedSetter']
 },
 
 "DOMTokenList": {
@@ -190,11 +226,11 @@ DOMInterfaces = {
 },
 
 'Element': {
-    'canGc': ['SetHTMLUnsafe', 'SetInnerHTML', 'SetOuterHTML', 'InsertAdjacentHTML', 'GetClientRects', 'GetBoundingClientRect', 'InsertAdjacentText', 'ToggleAttribute', 'SetAttribute', 'SetAttributeNS', 'SetId','SetClassName','Prepend','Append','ReplaceChildren','Before','After','ReplaceWith', 'SetRole', 'SetAriaAtomic', 'SetAriaAutoComplete', 'SetAriaBrailleLabel', 'SetAriaBrailleRoleDescription', 'SetAriaBusy', 'SetAriaChecked', 'SetAriaColCount', 'SetAriaColIndex', 'SetAriaColIndexText', 'SetAriaColSpan', 'SetAriaCurrent', 'SetAriaDescription', 'SetAriaDisabled', 'SetAriaExpanded', 'SetAriaHasPopup', 'SetAriaHidden', 'SetAriaInvalid', 'SetAriaKeyShortcuts', 'SetAriaLabel', 'SetAriaLevel', 'SetAriaLive', 'SetAriaModal', 'SetAriaMultiLine', 'SetAriaMultiSelectable', 'SetAriaOrientation', 'SetAriaPlaceholder', 'SetAriaPosInSet', 'SetAriaPressed','SetAriaReadOnly', 'SetAriaRelevant', 'SetAriaRequired', 'SetAriaRoleDescription', 'SetAriaRowCount', 'SetAriaRowIndex', 'SetAriaRowIndexText', 'SetAriaRowSpan', 'SetAriaSelected', 'SetAriaSetSize','SetAriaSort', 'SetAriaValueMax', 'SetAriaValueMin', 'SetAriaValueNow', 'SetAriaValueText', 'SetScrollTop', 'SetScrollLeft', 'Scroll', 'Scroll_', 'ScrollBy', 'ScrollBy_', 'ScrollWidth', 'ScrollHeight', 'ScrollTop', 'ScrollLeft', 'ClientTop', 'ClientLeft', 'ClientWidth', 'ClientHeight', 'RequestFullscreen', 'GetHTML', 'GetInnerHTML', 'GetOuterHTML'],
+    'canGc': ['SetHTMLUnsafe', 'SetInnerHTML', 'SetOuterHTML', 'InsertAdjacentHTML', 'GetClientRects', 'GetBoundingClientRect', 'InsertAdjacentText', 'ToggleAttribute', 'SetAttribute', 'SetAttributeNS', 'SetId','SetClassName','Prepend','Append','ReplaceChildren','Before','After','ReplaceWith', 'SetRole', 'SetAriaAtomic', 'SetAriaAutoComplete', 'SetAriaBrailleLabel', 'SetAriaBrailleRoleDescription', 'SetAriaBusy', 'SetAriaChecked', 'SetAriaColCount', 'SetAriaColIndex', 'SetAriaColIndexText', 'SetAriaColSpan', 'SetAriaCurrent', 'SetAriaDescription', 'SetAriaDisabled', 'SetAriaExpanded', 'SetAriaHasPopup', 'SetAriaHidden', 'SetAriaInvalid', 'SetAriaKeyShortcuts', 'SetAriaLabel', 'SetAriaLevel', 'SetAriaLive', 'SetAriaModal', 'SetAriaMultiLine', 'SetAriaMultiSelectable', 'SetAriaOrientation', 'SetAriaPlaceholder', 'SetAriaPosInSet', 'SetAriaPressed','SetAriaReadOnly', 'SetAriaRelevant', 'SetAriaRequired', 'SetAriaRoleDescription', 'SetAriaRowCount', 'SetAriaRowIndex', 'SetAriaRowIndexText', 'SetAriaRowSpan', 'SetAriaSelected', 'SetAriaSetSize','SetAriaSort', 'SetAriaValueMax', 'SetAriaValueMin', 'SetAriaValueNow', 'SetAriaValueText', 'SetScrollTop', 'SetScrollLeft', 'Scroll', 'Scroll_', 'ScrollBy', 'ScrollBy_', 'ScrollWidth', 'ScrollHeight', 'ScrollTop', 'ScrollLeft', 'ClientTop', 'ClientLeft', 'ClientWidth', 'ClientHeight', 'RequestFullscreen', 'GetHTML', 'GetInnerHTML', 'GetOuterHTML', 'ClassList', 'Attributes', 'SetAttributeNode', 'SetAttributeNodeNS', 'RemoveAttribute', 'RemoveAttributeNS', 'RemoveAttributeNode', 'GetElementsByTagName', 'GetElementsByTagNameNS', 'GetElementsByClassName', 'ScrollTo', 'ScrollTo_', 'Children', 'Remove', 'InsertAdjacentElement', 'AttachShadow'],
 },
 
 'ElementInternals': {
-    'canGc': ['CheckValidity', 'ReportValidity'],
+    'canGc': ['CheckValidity', 'GetLabels', 'SetValidity', 'ReportValidity'],
 },
 
 'EventSource': {
@@ -236,7 +272,7 @@ DOMInterfaces = {
 },
 
 'GlobalScope': {
-    'additionalTraits': ['crate::dom::globalscope::GlobalScopeHelpers<Self>'],
+    'additionalTraits': ['crate::interfaces::GlobalScopeHelpers<Self>'],
 },
 
 'GPU': {
@@ -287,11 +323,11 @@ DOMInterfaces = {
 },
 
 "HTMLAnchorElement": {
-    "canGc": ["SetText","SetRel","SetHref", 'SetHash', 'SetHost', 'SetHostname', 'SetPassword', 'SetPathname', 'SetPort', 'SetProtocol', 'SetSearch', 'SetUsername']
+    "canGc": ["SetText","SetRel","SetHref", 'SetHash', 'SetHost', 'SetHostname', 'SetPassword', 'SetPathname', 'SetPort', 'SetProtocol', 'SetSearch', 'SetUsername', 'RelList']
 },
 
 "HTMLAreaElement": {
-     "canGc": ['SetText', 'SetRel', 'SetHref', 'SetHash', 'SetHost', 'SetHostname', 'SetPassword', 'SetPathname', 'SetPort', 'SetProtocol', 'SetSearch', 'SetUsername']
+     "canGc": ['SetText', 'SetRel', 'SetHref', 'SetHash', 'SetHost', 'SetHostname', 'SetPassword', 'SetPathname', 'SetPort', 'SetProtocol', 'SetSearch', 'SetUsername', 'RelList']
 },
 
 "HTMLBodyElement": {
@@ -303,27 +339,39 @@ DOMInterfaces = {
 },
 
 'HTMLCanvasElement': {
-    'canGc': ['CaptureStream', 'GetContext'],
+    'canGc': ['CaptureStream', 'GetContext', 'SetHeight', 'SetWidth', 'TransferControlToOffscreen'],
+},
+
+'HTMLDataListElement': {
+    "canGc": ["Options"]
 },
 
 'HTMLDialogElement': {
-    'canGc': ['Show'],
+    'canGc': ['Close', 'Show'],
 },
 
 'HTMLElement': {
-    'canGc': ['Focus', 'Blur', 'Click', 'SetInnerText', 'SetOuterText', "SetTranslate", 'SetAutofocus', 'GetOffsetParent', 'OffsetTop', 'OffsetLeft', 'OffsetWidth', 'OffsetHeight', 'InnerText', 'GetOuterText', 'GetOnerror', 'GetOnload', 'GetOnblur', 'GetOnfocus', 'GetOnresize', 'GetOnscroll'],
+    'canGc': ['AttachInternals', 'Focus', 'Blur', 'Click', 'SetInnerText', 'SetOuterText', "SetTranslate", 'SetAutofocus', 'GetOffsetParent', 'OffsetTop', 'OffsetLeft', 'OffsetWidth', 'OffsetHeight', 'InnerText', 'GetOuterText', 'GetOnerror', 'GetOnload', 'GetOnblur', 'GetOnfocus', 'GetOnresize', 'GetOnscroll', 'Style', 'Dataset'],
 },
 
 'HTMLFieldSetElement': {
-    'canGc': ['CheckValidity', 'ReportValidity'],
+    'canGc': ['CheckValidity', 'Elements', 'ReportValidity'],
 },
 
 'HTMLFontElement': {
     'canGc': ['SetSize']
 },
 
+'HTMLFormControlsCollection': {
+    'canGc': ['NamedGetter', 'NamedItem'],
+},
+
 'HTMLFormElement': {
-    'canGc': ['CheckValidity', 'RequestSubmit', 'ReportValidity', 'Submit', 'Reset', 'SetRel'],
+    'canGc': ['CheckValidity', 'Elements', 'IndexedGetter', 'NamedGetter', 'RequestSubmit', 'ReportValidity', 'Submit', 'Reset', 'SetRel', 'RelList'],
+},
+
+'HTMLIFrameElement': {
+    'canGc': ['Sandbox', 'SetSrcdoc'],
 },
 
 'HTMLImageElement': {
@@ -331,11 +379,11 @@ DOMInterfaces = {
 },
 
 'HTMLInputElement': {
-    'canGc': ['ReportValidity', 'SetValue', 'SetValueAsNumber', 'SetValueAsDate', 'StepUp', 'StepDown', 'CheckValidity', 'ReportValidity', 'SelectFiles'],
+    'canGc': ['ReportValidity', 'SetValue', 'SetValueAsNumber', 'SetValueAsDate', 'StepUp', 'StepDown', 'CheckValidity', 'ReportValidity', 'SelectFiles', 'GetLabels'],
 },
 
 'HTMLLinkElement': {
-    'canGc': ['SetRel', 'SetCrossOrigin'],
+    'canGc': ['GetSheet', 'SetRel', 'SetCrossOrigin', 'RelList'],
 },
 
 'HTMLMediaElement': {
@@ -356,7 +404,7 @@ DOMInterfaces = {
 },
 
 'HTMLOptionsCollection': {
-    'canGc': ['IndexedSetter', 'SetLength']
+    'canGc': ['IndexedSetter', 'SetLength', 'SetSelectedIndex']
 },
 
 'HTMLOutputElement': {
@@ -368,11 +416,11 @@ DOMInterfaces = {
 },
 
 'HTMLScriptElement': {
-    'canGc': ['SetAsync', 'SetCrossOrigin', 'SetText']
+    'canGc': ['InnerText', 'SetAsync', 'SetCrossOrigin', 'SetInnerText', 'SetSrc', 'SetText', 'SetTextContent']
 },
 
 'HTMLSelectElement': {
-    'canGc': ['ReportValidity', 'SetLength', 'IndexedSetter', 'CheckValidity'],
+    'canGc': ['ReportValidity', 'SetLength', 'IndexedSetter', 'CheckValidity', 'SetSelectedIndex'],
 },
 
 'HTMLTableElement': {
@@ -426,7 +474,7 @@ DOMInterfaces = {
 
 'MessagePort': {
     'weakReferenceable': True,
-    'canGc': ['GetOnmessage'],
+    'canGc': ['Close', 'GetOnmessage', 'SetOnmessage', 'Start'],
 },
 
 'MessageEvent': {
@@ -448,7 +496,7 @@ DOMInterfaces = {
 },
 
 'Node': {
-    'canGc': ['CloneNode', 'SetTextContent'],
+    'canGc': ['AppendChild', 'ChildNodes', 'CloneNode', 'InsertBefore', 'Normalize', 'SetNodeValue', 'SetTextContent', 'RemoveChild', 'ReplaceChild'],
 },
 
 'NodeIterator': {
@@ -490,7 +538,7 @@ DOMInterfaces = {
 
 'Promise': {
     'spiderMonkeyInterface': True,
-    'additionalTraits': ["crate::dom::promise::PromiseHelpers<Self>", "js::conversions::FromJSValConvertibleRc"]
+    'additionalTraits': ["js::conversions::FromJSValConvertibleRc"]
 },
 
 'Range': {
@@ -503,7 +551,7 @@ DOMInterfaces = {
 },
 
 'Response': {
-    'canGc': ['Error', 'Redirect', 'Clone', 'Text', 'Blob', 'FormData', 'Json', 'ArrayBuffer', 'Headers', 'Bytes'],
+    'canGc': ['Error', 'Redirect', 'Clone', 'CreateFromJson', 'Text', 'Blob', 'FormData', 'Json', 'ArrayBuffer', 'Headers', 'Bytes'],
 },
 
 'RTCPeerConnection': {
@@ -527,10 +575,11 @@ DOMInterfaces = {
 'ServoInternals': {
     'inRealms': ['ReportMemory'],
     'canGc': ['ReportMemory'],
+    'additionalTraits': ['crate::interfaces::ServoInternalsHelpers'],
 },
 
 'ShadowRoot': {
-    'canGc': ['ElementFromPoint', 'ElementsFromPoint', 'SetInnerHTML', 'GetHTML', 'InnerHTML'],
+    'canGc': ['SetHTMLUnsafe', 'ElementFromPoint', 'ElementsFromPoint', 'SetInnerHTML', 'GetHTML', 'InnerHTML'],
 },
 
 'StaticRange': {
@@ -550,6 +599,7 @@ DOMInterfaces = {
 'TestBinding': {
     'inRealms': ['PromiseAttribute', 'PromiseNativeHandler'],
     'canGc': ['InterfaceAttribute', 'GetInterfaceAttributeNullable', 'ReceiveInterface', 'ReceiveInterfaceSequence', 'ReceiveNullableInterface', 'PromiseAttribute', 'PromiseNativeHandler', 'PromiseResolveNative', 'PromiseRejectNative', 'PromiseRejectWithTypeError'],
+    'additionalTraits': ['crate::interfaces::TestBindingHelpers'],
 },
 
 'TestWorklet': {
@@ -569,6 +619,14 @@ DOMInterfaces = {
     'canGc': ['ParentNode', 'PreviousNode', 'NextNode', 'FirstChild', 'LastChild', 'PreviousSibling', 'NextSibling']
 },
 
+'TrustedTypePolicy': {
+    'canGc': ['CreateHTML', 'CreateScript', 'CreateScriptURL']
+},
+
+'TrustedTypePolicyFactory': {
+    'canGc': ['CreatePolicy', 'EmptyHTML', 'EmptyScript']
+},
+
 'URL': {
     'weakReferenceable': True,
     'canGc': ['Parse', 'SearchParams'],
@@ -580,11 +638,13 @@ DOMInterfaces = {
 
 'WebGL2RenderingContext': {
     'canGc': ['MakeXRCompatible'],
+    'additionalTraits': ['crate::interfaces::WebGL2RenderingContextHelpers'],
 },
 
 'Window': {
-    'canGc': ['Stop', 'Fetch', 'Scroll', 'Scroll_','ScrollBy', 'ScrollBy_', 'Stop', 'Fetch', 'Open', 'CreateImageBitmap'],
-    'inRealms': ['Fetch', 'GetOpener'],
+    'canGc': ['Stop', 'Fetch', 'Scroll', 'Scroll_','ScrollBy', 'ScrollBy_', 'Stop', 'Fetch', 'Open', 'CreateImageBitmap', 'TrustedTypes', 'WebdriverCallback', 'WebdriverException'],
+    'inRealms': ['Fetch', 'GetOpener', 'WebdriverCallback', 'WebdriverException'],
+    'additionalTraits': ['crate::interfaces::WindowHelpers'],
 },
 
 'WindowProxy' : {
@@ -594,7 +654,7 @@ DOMInterfaces = {
 
 'WorkerGlobalScope': {
     'inRealms': ['Fetch'],
-    'canGc': ['Fetch', 'CreateImageBitmap', 'ImportScripts'],
+    'canGc': ['Fetch', 'CreateImageBitmap', 'ImportScripts', 'TrustedTypes'],
 },
 
 'Worklet': {
@@ -704,6 +764,10 @@ DOMInterfaces = {
     'inRealms': ['Abort', 'Close', 'Write'],
 },
 
+'TransformStreamDefaultController': {
+    'canGc': ['Enqueue', 'Error', 'Terminate'],
+},
+
 'WorkerNavigator': {
     'canGc': ['Languages'],
 },
@@ -759,6 +823,10 @@ Dictionaries = {
     'derives': ['Clone', 'Copy'],
 },
 
+'URLPatternInit': {
+    'derives': ['Clone'],
+},
+
 'XRWebGLLayerInit': {
     'derives': ['Clone', 'Copy'],
 },
diff --git a/components/script_bindings/codegen/CodegenRust.py b/components/script_bindings/codegen/CodegenRust.py
index ba26ff95d2c..458aa7508b0 100644
--- a/components/script_bindings/codegen/CodegenRust.py
+++ b/components/script_bindings/codegen/CodegenRust.py
@@ -498,7 +498,7 @@ class CGMethodCall(CGThing):
             # XXXbz Now we're supposed to check for distinguishingArg being
             # an array or a platform object that supports indexed
             # properties... skip that last for now.  It's a bit of a pain.
-            pickFirstSignature(f"{distinguishingArg}.get().is_object() && is_array_like(*cx, {distinguishingArg})",
+            pickFirstSignature(f"{distinguishingArg}.get().is_object() && is_array_like::<D>(*cx, {distinguishingArg})",
                                lambda s:
                                    (s[1][distinguishingIndex].type.isSequence()
                                     or s[1][distinguishingIndex].type.isObject()))
@@ -742,6 +742,19 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
                 "}")
         return templateBody
 
+    # A helper function for types that implement FromJSValConvertible trait
+    def fromJSValTemplate(config, errorHandler, exceptionCode):
+        return f"""match FromJSValConvertible::from_jsval(*cx, ${{val}}, {config}) {{
+    Ok(ConversionResult::Success(value)) => value,
+    Ok(ConversionResult::Failure(error)) => {{
+        {errorHandler}
+    }}
+    _ => {{
+        {exceptionCode}
+    }},
+}}
+"""
+
     assert not (isEnforceRange and isClamp)  # These are mutually exclusive
 
     if type.isSequence() or type.isRecord():
@@ -755,13 +768,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
         if type.nullable():
             declType = CGWrapper(declType, pre="Option<", post=" >")
 
-        templateBody = (f"match FromJSValConvertible::from_jsval(*cx, ${{val}}, {config}) {{\n"
-                        "    Ok(ConversionResult::Success(value)) => value,\n"
-                        "    Ok(ConversionResult::Failure(error)) => {\n"
-                        f"{indent(failOrPropagate, 8)}\n"
-                        "    }\n"
-                        f"    _ => {{ {exceptionCode} }},\n"
-                        "}")
+        templateBody = fromJSValTemplate(config, failOrPropagate, exceptionCode)
 
         return handleOptional(templateBody, declType, handleDefault("None"))
 
@@ -770,13 +777,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
         if type.nullable():
             declType = CGWrapper(declType, pre="Option<", post=" >")
 
-        templateBody = ("match FromJSValConvertible::from_jsval(*cx, ${val}, ()) {\n"
-                        "    Ok(ConversionResult::Success(value)) => value,\n"
-                        "    Ok(ConversionResult::Failure(error)) => {\n"
-                        f"{indent(failOrPropagate, 8)}\n"
-                        "    }\n"
-                        f"    _ => {{ {exceptionCode} }},\n"
-                        "}")
+        templateBody = fromJSValTemplate("()", failOrPropagate, exceptionCode)
 
         dictionaries = [
             memberType
@@ -836,21 +837,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
         #    once again be providing a Promise to signal completion of an
         #    operation, which would then not be exposed to anyone other than
         #    our own implementation code.
-        templateBody = fill(
-            """
-            { // Scope for our JSAutoRealm.
-
-                rooted!(in(*cx) let globalObj = CurrentGlobalOrNull(*cx));
-                let promiseGlobal = D::GlobalScope::from_object_maybe_wrapped(globalObj.handle().get(), *cx);
-
-                rooted!(in(*cx) let mut valueToResolve = $${val}.get());
-                if !JS_WrapValue(*cx, valueToResolve.handle_mut()) {
-                $*{exceptionCode}
-                }
-                D::Promise::new_resolved(&promiseGlobal, cx, valueToResolve.handle())
-            }
-            """,
-            exceptionCode=exceptionCode)
+        templateBody = fromJSValTemplate("()", failOrPropagate, exceptionCode)
 
         if isArgument:
             declType = CGGeneric("&D::Promise")
@@ -960,14 +947,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
     if type.isDOMString():
         nullBehavior = getConversionConfigForType(type, isEnforceRange, isClamp, treatNullAs)
 
-        conversionCode = (
-            f"match FromJSValConvertible::from_jsval(*cx, ${{val}}, {nullBehavior}) {{\n"
-            "    Ok(ConversionResult::Success(strval)) => strval,\n"
-            "    Ok(ConversionResult::Failure(error)) => {\n"
-            f"{indent(failOrPropagate, 8)}\n"
-            "    }\n"
-            f"    _ => {{ {exceptionCode} }},\n"
-            "}")
+        conversionCode = fromJSValTemplate(nullBehavior, failOrPropagate, exceptionCode)
 
         if defaultValue is None:
             default = None
@@ -989,14 +969,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
     if type.isUSVString():
         assert not isEnforceRange and not isClamp
 
-        conversionCode = (
-            "match FromJSValConvertible::from_jsval(*cx, ${val}, ()) {\n"
-            "    Ok(ConversionResult::Success(strval)) => strval,\n"
-            "    Ok(ConversionResult::Failure(error)) => {\n"
-            f"{indent(failOrPropagate, 8)}\n"
-            "    }\n"
-            f"    _ => {{ {exceptionCode} }},\n"
-            "}")
+        conversionCode = fromJSValTemplate("()", failOrPropagate, exceptionCode)
 
         if defaultValue is None:
             default = None
@@ -1018,14 +991,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
     if type.isByteString():
         assert not isEnforceRange and not isClamp
 
-        conversionCode = (
-            "match FromJSValConvertible::from_jsval(*cx, ${val}, ()) {\n"
-            "    Ok(ConversionResult::Success(strval)) => strval,\n"
-            "    Ok(ConversionResult::Failure(error)) => {\n"
-            f"{indent(failOrPropagate, 8)}\n"
-            "    }\n"
-            f"    _ => {{ {exceptionCode} }},\n"
-            "}")
+        conversionCode = fromJSValTemplate("()", failOrPropagate, exceptionCode)
 
         if defaultValue is None:
             default = None
@@ -1056,12 +1022,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
         else:
             handleInvalidEnumValueCode = "return true;"
 
-        template = (
-            "match FromJSValConvertible::from_jsval(*cx, ${val}, ()) {"
-            f"    Err(_) => {{ {exceptionCode} }},\n"
-            "    Ok(ConversionResult::Success(v)) => v,\n"
-            f"    Ok(ConversionResult::Failure(error)) => {{ {handleInvalidEnumValueCode} }},\n"
-            "}")
+        template = fromJSValTemplate("()", handleInvalidEnumValueCode, exceptionCode)
 
         if defaultValue is not None:
             assert defaultValue.type.tag() == IDLType.Tags.domstring
@@ -1192,14 +1153,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
         if type_needs_tracing(type):
             declType = CGTemplatedType("RootedTraceableBox", declType)
 
-        template = (
-            "match FromJSValConvertible::from_jsval(*cx, ${val}, ()) {\n"
-            "    Ok(ConversionResult::Success(dictionary)) => dictionary,\n"
-            "    Ok(ConversionResult::Failure(error)) => {\n"
-            f"{indent(failOrPropagate, 8)}\n"
-            "    }\n"
-            f"    _ => {{ {exceptionCode} }},\n"
-            "}")
+        template = fromJSValTemplate("()", failOrPropagate, exceptionCode)
 
         return handleOptional(template, declType, handleDefault(empty))
 
@@ -1220,14 +1174,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
     if type.nullable():
         declType = CGWrapper(declType, pre="Option<", post=">")
 
-    template = (
-        f"match FromJSValConvertible::from_jsval(*cx, ${{val}}, {conversionBehavior}) {{\n"
-        "    Ok(ConversionResult::Success(v)) => v,\n"
-        "    Ok(ConversionResult::Failure(error)) => {\n"
-        f"{indent(failOrPropagate, 8)}\n"
-        "    }\n"
-        f"    _ => {{ {exceptionCode} }}\n"
-        "}")
+    template = fromJSValTemplate(conversionBehavior, failOrPropagate, exceptionCode)
 
     if defaultValue is not None:
         if isinstance(defaultValue, IDLNullValue):
@@ -1565,10 +1512,10 @@ def MemberCondition(pref, func, exposed, secure):
     if pref:
         conditions.append(f'Condition::Pref("{pref}")')
     if func:
-        conditions.append(f'Condition::Func({func})')
+        conditions.append(f'Condition::Func(D::{func})')
     if exposed:
         conditions.extend([
-            f"Condition::Exposed(InterfaceObjectMap::Globals::{camel_to_upper_snake(i)})" for i in exposed
+            f"Condition::Exposed(Globals::{camel_to_upper_snake(i)})" for i in exposed
         ])
     if len(conditions) == 0:
         conditions.append("Condition::Satisfied")
@@ -1745,13 +1692,16 @@ class MethodDefiner(PropertyDefiner):
                        and (MemberIsLegacyUnforgeable(m, descriptor) == unforgeable or crossorigin)]
         else:
             methods = []
-        self.regular = [{"name": m.identifier.name,
-                         "methodInfo": not m.isStatic(),
-                         "length": methodLength(m),
-                         "flags": "JSPROP_READONLY" if crossorigin else "JSPROP_ENUMERATE",
-                         "condition": PropertyDefiner.getControllingCondition(m, descriptor),
-                         "returnsPromise": m.returnsPromise()}
-                        for m in methods]
+        self.regular = []
+        for m in methods:
+            method = self.methodData(m, descriptor, crossorigin)
+
+            if m.isStatic():
+                method["nativeName"] = CGDictionary.makeMemberName(
+                    descriptor.binaryNameFor(m.identifier.name, True)
+                )
+
+            self.regular.append(method)
 
         # TODO: Once iterable is implemented, use tiebreak rules instead of
         # failing. Also, may be more tiebreak rules to implement once spec bug
@@ -1841,6 +1791,17 @@ class MethodDefiner(PropertyDefiner):
         self.unforgeable = unforgeable
         self.crossorigin = crossorigin
 
+    @staticmethod
+    def methodData(m, descriptor, crossorigin):
+        return {
+            "name": m.identifier.name,
+            "methodInfo": not m.isStatic(),
+            "length": methodLength(m),
+            "flags": "JSPROP_READONLY" if crossorigin else "JSPROP_ENUMERATE",
+            "condition": PropertyDefiner.getControllingCondition(m, descriptor),
+            "returnsPromise": m.returnsPromise()
+        }
+
     def generateArray(self, array, name):
         if len(array) == 0:
             return ""
@@ -2279,17 +2240,15 @@ class CGImports(CGWrapper):
             if t.isInterface() or t.isNamespace():
                 name = getIdentifier(t).name
                 descriptor = descriptorProvider.getDescriptor(name)
-                if name != 'GlobalScope':
-                    extras += [descriptor.path]
                 parentName = descriptor.getParentName()
                 while parentName:
                     descriptor = descriptorProvider.getDescriptor(parentName)
-                    extras += [descriptor.path, descriptor.bindingPath]
+                    extras += [descriptor.bindingPath]
                     parentName = descriptor.getParentName()
             elif t.isType() and t.isRecord():
-                extras += ['script_bindings::record::Record']
+                extras += ['crate::record::Record']
             elif isinstance(t, IDLPromiseType):
-                extras += ['crate::dom::promise::Promise']
+                pass
             else:
                 if t.isEnum():
                     extras += [f'{getModuleFromObject(t)}::{getIdentifier(t).name}Values']
@@ -2318,7 +2277,7 @@ class CGTemplatedType(CGWrapper):
 
 class CGNamespace(CGWrapper):
     def __init__(self, namespace, child, public=False):
-        pub = "pub(crate) " if public else ""
+        pub = "pub " if public else ""
         pre = f"{pub}mod {namespace} {{\n"
         post = f"}} // mod {namespace}"
         CGWrapper.__init__(self, child, pre=pre, post=post)
@@ -2339,15 +2298,15 @@ def DOMClassTypeId(desc):
     inner = ""
     if desc.hasDescendants():
         if desc.interface.getExtendedAttribute("Abstract"):
-            return "crate::dom::bindings::codegen::InheritTypes::TopTypeId { abstract_: () }"
+            return "crate::codegen::InheritTypes::TopTypeId { abstract_: () }"
         name = desc.interface.identifier.name
-        inner = f"(crate::dom::bindings::codegen::InheritTypes::{name}TypeId::{name})"
+        inner = f"(crate::codegen::InheritTypes::{name}TypeId::{name})"
     elif len(protochain) == 1:
-        return "crate::dom::bindings::codegen::InheritTypes::TopTypeId { alone: () }"
+        return "crate::codegen::InheritTypes::TopTypeId { alone: () }"
     reversed_protochain = list(reversed(protochain))
     for (child, parent) in zip(reversed_protochain, reversed_protochain[1:]):
-        inner = f"(crate::dom::bindings::codegen::InheritTypes::{parent}TypeId::{child}{inner})"
-    return f"crate::dom::bindings::codegen::InheritTypes::TopTypeId {{ {protochain[0].lower()}: {inner} }}"
+        inner = f"(crate::codegen::InheritTypes::{parent}TypeId::{child}{inner})"
+    return f"crate::codegen::InheritTypes::TopTypeId {{ {protochain[0].lower()}: {inner} }}"
 
 
 def DOMClass(descriptor):
@@ -2369,7 +2328,7 @@ DOMClass {{
     depth: {descriptor.prototypeDepth},
     type_id: {DOMClassTypeId(descriptor)},
     malloc_size_of: {mallocSizeOf} as unsafe fn(&mut _, _) -> _,
-    global: InterfaceObjectMap::Globals::{globals_},
+    global: Globals::{globals_},
 }}"""
 
 
@@ -2393,15 +2352,22 @@ class CGDOMJSClass(CGThing):
             "flags": "JSCLASS_FOREGROUND_FINALIZE",
             "name": str_to_cstr_ptr(self.descriptor.interface.identifier.name),
             "resolveHook": "None",
+            "mayResolveHook": "None",
             "slots": "1",
             "traceHook": f"{TRACE_HOOK_NAME}::<D>",
         }
         if self.descriptor.isGlobal():
             assert not self.descriptor.weakReferenceable
-            args["enumerateHook"] = "Some(enumerate_global)"
             args["flags"] = "JSCLASS_IS_GLOBAL | JSCLASS_DOM_GLOBAL | JSCLASS_FOREGROUND_FINALIZE"
             args["slots"] = "JSCLASS_GLOBAL_SLOT_COUNT + 1"
-            args["resolveHook"] = "Some(resolve_global)"
+            if self.descriptor.interface.getExtendedAttribute("NeedResolve"):
+                args["enumerateHook"] = "Some(enumerate_window::<D>)"
+                args["resolveHook"] = "Some(resolve_window::<D>)"
+                args["mayResolveHook"] = "Some(may_resolve_window::<D>)"
+            else:
+                args["enumerateHook"] = "Some(enumerate_global)"
+                args["resolveHook"] = "Some(resolve_global)"
+                args["mayResolveHook"] = "Some(may_resolve_global)"
             args["traceHook"] = "js::jsapi::JS_GlobalObjectTraceHook"
         elif self.descriptor.weakReferenceable:
             args["slots"] = "2"
@@ -2415,7 +2381,7 @@ pub(crate) fn init_class_ops<D: DomTypes>() {{
         enumerate: None,
         newEnumerate: {args['enumerateHook']},
         resolve: {args['resolveHook']},
-        mayResolve: None,
+        mayResolve: {args['mayResolveHook']},
         finalize: Some({args['finalizeHook']}),
         call: None,
         construct: None,
@@ -2423,7 +2389,7 @@ pub(crate) fn init_class_ops<D: DomTypes>() {{
     }});
 }}
 
-static Class: ThreadUnsafeOnceLock<DOMJSClass> = ThreadUnsafeOnceLock::new();
+pub static Class: ThreadUnsafeOnceLock<DOMJSClass> = ThreadUnsafeOnceLock::new();
 
 pub(crate) fn init_domjs_class<D: DomTypes>() {{
     init_class_ops::<D>();
@@ -2639,13 +2605,10 @@ def UnionTypes(descriptors, dictionaries, callbacks, typedefs, config):
     """
 
     imports = [
-        'crate::dom',
-        'crate::dom::bindings::import::base::*',
-        'crate::dom::bindings::codegen::DomTypes::DomTypes',
-        'crate::dom::bindings::conversions::windowproxy_from_handlevalue',
-        'script_bindings::record::Record',
-        'crate::dom::types::*',
-        'crate::dom::windowproxy::WindowProxy',
+        'crate::import::base::*',
+        'crate::codegen::DomTypes::DomTypes',
+        'crate::conversions::windowproxy_from_handlevalue',
+        'crate::record::Record',
         'js::typedarray',
     ]
 
@@ -2681,13 +2644,13 @@ def UnionTypes(descriptors, dictionaries, callbacks, typedefs, config):
 
 def DomTypes(descriptors, descriptorProvider, dictionaries, callbacks, typedefs, config):
     traits = [
-        "crate::dom::bindings::utils::DomHelpers<Self>",
+        "crate::interfaces::DomHelpers<Self>",
         "js::rust::Trace",
         "malloc_size_of::MallocSizeOf",
         "Sized",
     ]
     joinedTraits = ' + '.join(traits)
-    elements = [CGGeneric(f"pub(crate) trait DomTypes: {joinedTraits} where Self: 'static {{\n")]
+    elements = [CGGeneric(f"pub trait DomTypes: {joinedTraits} where Self: 'static {{\n")]
 
     def fixupInterfaceTypeReferences(typename):
         return typename.replace("D::", "Self::")
@@ -2707,10 +2670,10 @@ def DomTypes(descriptors, descriptorProvider, dictionaries, callbacks, typedefs,
             chain = chain[:-1]
 
         if chain:
-            traits += ["crate::dom::bindings::inheritance::Castable"]
+            traits += ["crate::inheritance::Castable"]
 
         for parent in chain:
-            traits += [f"crate::dom::bindings::conversions::DerivedFrom<Self::{parent}>"]
+            traits += [f"crate::conversions::DerivedFrom<Self::{parent}>"]
 
         iterableDecl = descriptor.interface.maplikeOrSetlikeOrIterable
         if iterableDecl:
@@ -2721,27 +2684,27 @@ def DomTypes(descriptors, descriptorProvider, dictionaries, callbacks, typedefs,
                 valuetype = fixupInterfaceTypeReferences(
                     getRetvalDeclarationForType(iterableDecl.valueType, descriptor).define()
                 )
-                traits += [f"crate::dom::bindings::like::Maplike<Key={keytype}, Value={valuetype}>"]
+                traits += [f"crate::like::Maplike<Key={keytype}, Value={valuetype}>"]
             if iterableDecl.isSetlike():
                 keytype = fixupInterfaceTypeReferences(
                     getRetvalDeclarationForType(iterableDecl.keyType, descriptor).define()
                 )
-                traits += [f"crate::dom::bindings::like::Setlike<Key={keytype}>"]
+                traits += [f"crate::like::Setlike<Key={keytype}>"]
             if iterableDecl.hasKeyType():
                 traits += [
-                    "crate::dom::bindings::reflector::DomObjectIteratorWrap<Self>",
-                    "crate::dom::bindings::iterable::IteratorDerives",
+                    "crate::reflector::DomObjectIteratorWrap<Self>",
+                    "crate::iterable::IteratorDerives",
                 ]
 
         if descriptor.weakReferenceable:
-            traits += ["crate::dom::bindings::weakref::WeakReferenceable"]
+            traits += ["crate::weakref::WeakReferenceable"]
 
         if not descriptor.interface.isNamespace():
             traits += [
                 "js::conversions::ToJSValConvertible",
-                "crate::dom::bindings::reflector::MutDomObject",
-                "crate::dom::bindings::reflector::DomObject",
-                "crate::dom::bindings::reflector::DomGlobalGeneric<Self>",
+                "crate::reflector::MutDomObject",
+                "crate::reflector::DomObject",
+                "crate::reflector::DomGlobalGeneric<Self>",
                 "malloc_size_of::MallocSizeOf",
             ]
 
@@ -2752,12 +2715,12 @@ def DomTypes(descriptors, descriptorProvider, dictionaries, callbacks, typedefs,
                 and not descriptor.interface.isIteratorInterface()
             ):
                 traits += [
-                    "crate::dom::bindings::conversions::IDLInterface",
+                    "crate::conversions::IDLInterface",
                     "PartialEq",
                 ]
 
             if descriptor.concrete and not descriptor.isGlobal():
-                traits += ["crate::dom::bindings::reflector::DomObjectWrap<Self>"]
+                traits += ["crate::reflector::DomObjectWrap<Self>"]
 
         if not descriptor.interface.isCallback() and not descriptor.interface.isIteratorInterface():
             nonConstMembers = [m for m in descriptor.interface.members if not m.isConst()]
@@ -2768,7 +2731,7 @@ def DomTypes(descriptors, descriptorProvider, dictionaries, callbacks, typedefs,
                     or descriptor.interface.legacyFactoryFunctions
             ):
                 namespace = f"{toBindingPath(descriptor)}"
-                traits += [f"crate::dom::bindings::codegen::Bindings::{namespace}::{iface_name}Methods<Self>"]
+                traits += [f"crate::codegen::GenericBindings::{namespace}::{iface_name}Methods<Self>"]
             isPromise = firstCap(iface_name) == "Promise"
             elements += [
                 CGGeneric("    #[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]\n"),
@@ -2780,8 +2743,8 @@ def DomTypes(descriptors, descriptorProvider, dictionaries, callbacks, typedefs,
             ]
     elements += [CGGeneric("}\n")]
     imports = [
-        CGGeneric("use crate::dom::bindings::root::DomRoot;\n"),
-        CGGeneric("use crate::dom::bindings::str::DOMString;\n"),
+        CGGeneric("use crate::root::DomRoot;\n"),
+        CGGeneric("use crate::str::DOMString;\n"),
     ]
     return CGList(imports + elements)
 
@@ -2962,14 +2925,16 @@ class CGConstructorEnabled(CGAbstractMethod):
         CGAbstractMethod.__init__(self, descriptor,
                                   'ConstructorEnabled', 'bool',
                                   [Argument("SafeJSContext", "aCx"),
-                                   Argument("HandleObject", "aObj")])
+                                   Argument("HandleObject", "aObj")],
+                                  templateArgs=['D: DomTypes'],
+                                  pub=True)
 
     def definition_body(self):
         conditions = []
         iface = self.descriptor.interface
 
         bits = " | ".join(sorted(
-            f"InterfaceObjectMap::Globals::{camel_to_upper_snake(i)}" for i in iface.exposureSet
+            f"Globals::{camel_to_upper_snake(i)}" for i in iface.exposureSet
         ))
         conditions.append(f"is_exposed_in(aObj, {bits})")
 
@@ -2981,14 +2946,14 @@ class CGConstructorEnabled(CGAbstractMethod):
         func = iface.getExtendedAttribute("Func")
         if func:
             assert isinstance(func, list) and len(func) == 1
-            conditions.append(f"{func[0]}(aCx, aObj)")
+            conditions.append(f"D::{func[0]}(aCx, aObj)")
 
         secure = iface.getExtendedAttribute("SecureContext")
         if secure:
             conditions.append("""
 unsafe {
     let in_realm_proof = AlreadyInRealm::assert_for_cx(aCx);
-    GlobalScope::from_context(*aCx, InRealm::Already(&in_realm_proof)).is_secure_context()
+    D::GlobalScope::from_context(*aCx, InRealm::Already(&in_realm_proof)).is_secure_context()
 }
 """)
 
@@ -3004,8 +2969,8 @@ def InitLegacyUnforgeablePropertiesOnHolder(descriptor, properties):
     """
     unforgeables = []
 
-    defineLegacyUnforgeableAttrs = "define_guarded_properties(cx, unforgeable_holder.handle(), %s, global);"
-    defineLegacyUnforgeableMethods = "define_guarded_methods(cx, unforgeable_holder.handle(), %s, global);"
+    defineLegacyUnforgeableAttrs = "define_guarded_properties::<D>(cx, unforgeable_holder.handle(), %s, global);"
+    defineLegacyUnforgeableMethods = "define_guarded_methods::<D>(cx, unforgeable_holder.handle(), %s, global);"
 
     unforgeableMembers = [
         (defineLegacyUnforgeableAttrs, properties.unforgeable_attrs),
@@ -3107,12 +3072,12 @@ SetProxyReservedSlot(
             create = """
 rooted!(in(*cx) let mut proto = ptr::null_mut::<JSObject>());
 if let Some(given) = given_proto {
-    *proto = *given;
+    proto.set(*given);
     if get_context_realm(*cx) != get_object_realm(*given) {
         assert!(JS_WrapObject(*cx, proto.handle_mut()));
     }
 } else {
-    *proto = *canonical_proto;
+    proto.set(*canonical_proto);
 }
 rooted!(in(*cx) let obj = JS_NewObjectWithGivenProto(
     *cx,
@@ -3175,7 +3140,7 @@ class CGWrapGlobalMethod(CGAbstractMethod):
             ("define_guarded_methods", self.properties.methods),
             ("define_guarded_constants", self.properties.consts)
         ]
-        members = [f"{function}(cx, obj.handle(), {array.variableName()}.get(), obj.handle());"
+        members = [f"{function}::<D>(cx, obj.handle(), {array.variableName()}.get(), obj.handle());"
                    for (function, array) in pairs if array.length() > 0]
         membersStr = "\n".join(members)
 
@@ -3184,7 +3149,7 @@ let raw = Root::new(MaybeUnreflectedDom::from_box(object));
 let origin = (*raw.as_ptr()).upcast::<D::GlobalScope>().origin();
 
 rooted!(in(*cx) let mut obj = ptr::null_mut::<JSObject>());
-create_global_object(
+create_global_object::<D>(
     cx,
     &Class.get().base,
     raw.as_ptr() as *const libc::c_void,
@@ -3228,14 +3193,15 @@ class CGIDLInterface(CGThing):
     def define(self):
         interface = self.descriptor.interface
         name = interface.identifier.name
+        bindingModule = f"crate::dom::bindings::codegen::GenericBindings::{toBindingPath(self.descriptor)}"
         if (interface.getUserData("hasConcreteDescendant", False)
                 or interface.getUserData("hasProxyDescendant", False)):
             depth = self.descriptor.prototypeDepth
             check = f"class.interface_chain[{depth}] == PrototypeList::ID::{name}"
         elif self.descriptor.proxy:
-            check = "ptr::eq(class, unsafe { Class.get() })"
+            check = f"ptr::eq(class, unsafe {{ {bindingModule}::Class.get() }})"
         else:
-            check = "ptr::eq(class, unsafe { &Class.get().dom_class })"
+            check = f"ptr::eq(class, unsafe {{ &{bindingModule}::Class.get().dom_class }})"
         return f"""
 impl IDLInterface for {name} {{
     #[inline]
@@ -3278,6 +3244,7 @@ class CGDomObjectWrap(CGThing):
 
     def define(self):
         ifaceName = self.descriptor.interface.identifier.name
+        bindingModule = f"crate::dom::bindings::codegen::GenericBindings::{toBindingPath(self.descriptor)}"
         return f"""
 impl DomObjectWrap<crate::DomTypeHolder> for {firstCap(ifaceName)} {{
     const WRAP: unsafe fn(
@@ -3286,7 +3253,7 @@ impl DomObjectWrap<crate::DomTypeHolder> for {firstCap(ifaceName)} {{
         Option<HandleObject>,
         Box<Self>,
         CanGc,
-    ) -> Root<Dom<Self>> = Wrap::<crate::DomTypeHolder>;
+    ) -> Root<Dom<Self>> = {bindingModule}::Wrap::<crate::DomTypeHolder>;
 }}
 """
 
@@ -3302,6 +3269,7 @@ class CGDomObjectIteratorWrap(CGThing):
     def define(self):
         assert self.descriptor.interface.isIteratorInterface()
         name = self.descriptor.interface.iterableInterface.identifier.name
+        bindingModule = f"crate::dom::bindings::codegen::GenericBindings::{toBindingPath(self.descriptor)}"
         return f"""
 impl DomObjectIteratorWrap<crate::DomTypeHolder> for {name} {{
     const ITER_WRAP: unsafe fn(
@@ -3310,7 +3278,7 @@ impl DomObjectIteratorWrap<crate::DomTypeHolder> for {name} {{
         Option<HandleObject>,
         Box<IterableIterator<crate::DomTypeHolder, Self>>,
         CanGc,
-    ) -> Root<Dom<IterableIterator<crate::DomTypeHolder, Self>>> = Wrap::<crate::DomTypeHolder>;
+    ) -> Root<Dom<IterableIterator<crate::DomTypeHolder, Self>>> = {bindingModule}::Wrap::<crate::DomTypeHolder>;
 }}
 """
 
@@ -3401,7 +3369,7 @@ class CGCollectJSONAttributesMethod(CGAbstractMethod):
         self.toJSONMethod = toJSONMethod
 
     def definition_body(self):
-        ret = """let incumbent_global = GlobalScope::incumbent().expect("no incumbent global");
+        ret = """let incumbent_global = D::GlobalScope::incumbent().expect("no incumbent global");
 let global = incumbent_global.reflector().get_jsobject();\n"""
         interface = self.descriptor.interface
         for m in interface.members:
@@ -3413,7 +3381,7 @@ let global = incumbent_global.reflector().get_jsobject();\n"""
                     """
                     let conditions = ${conditions};
                     let is_satisfied = conditions.iter().any(|c|
-                         c.is_satisfied(
+                         c.is_satisfied::<D>(
                            SafeJSContext::from_ptr(cx),
                            HandleObject::from_raw(obj),
                            global));
@@ -3469,7 +3437,7 @@ class CGCreateInterfaceObjectsMethod(CGAbstractMethod):
 rooted!(in(*cx) let proto = {proto});
 assert!(!proto.is_null());
 rooted!(in(*cx) let mut namespace = ptr::null_mut::<JSObject>());
-create_namespace_object(cx, global, proto.handle(), &NAMESPACE_OBJECT_CLASS,
+create_namespace_object::<D>(cx, global, proto.handle(), &NAMESPACE_OBJECT_CLASS,
                         {methods}, {constants}, {str_to_cstr(name)}, namespace.handle_mut());
 assert!(!namespace.is_null());
 assert!((*cache)[PrototypeList::Constructor::{id} as usize].is_null());
@@ -3483,7 +3451,7 @@ assert!((*cache)[PrototypeList::Constructor::{id} as usize].is_null());
             cName = str_to_cstr(name)
             return CGGeneric(f"""
 rooted!(in(*cx) let mut interface = ptr::null_mut::<JSObject>());
-create_callback_interface_object(cx, global, sConstants.get(), {cName}, interface.handle_mut());
+create_callback_interface_object::<D>(cx, global, sConstants.get(), {cName}, interface.handle_mut());
 assert!(!interface.is_null());
 assert!((*cache)[PrototypeList::Constructor::{name} as usize].is_null());
 (*cache)[PrototypeList::Constructor::{name} as usize] = interface.get();
@@ -3515,7 +3483,7 @@ assert!(!prototype_proto.is_null());""")]
             assert not self.haveUnscopables
             code.append(CGGeneric(f"""
 rooted!(in(*cx) let mut prototype_proto_proto = prototype_proto.get());
-dom::types::{name}::create_named_properties_object(cx, prototype_proto_proto.handle(), prototype_proto.handle_mut());
+D::{name}::create_named_properties_object(cx, prototype_proto_proto.handle(), prototype_proto.handle_mut());
 assert!(!prototype_proto.is_null());"""))
 
         properties = {
@@ -3544,7 +3512,7 @@ assert!(!prototype_proto.is_null());"""))
 
         code.append(CGGeneric(f"""
 rooted!(in(*cx) let mut prototype = ptr::null_mut::<JSObject>());
-create_interface_prototype_object(cx,
+create_interface_prototype_object::<D>(cx,
                                   global,
                                   prototype_proto.handle(),
                                   &PrototypeClass,
@@ -3579,7 +3547,7 @@ assert!((*cache)[PrototypeList::ID::{proto_properties['id']} as usize].is_null()
 assert!(!interface_proto.is_null());
 
 rooted!(in(*cx) let mut interface = ptr::null_mut::<JSObject>());
-create_noncallback_interface_object(cx,
+create_noncallback_interface_object::<D>(cx,
                                     global,
                                     interface_proto.handle(),
                                     INTERFACE_OBJECT_CLASS.get(),
@@ -3796,7 +3764,7 @@ class CGDefineProxyHandler(CGAbstractMethod):
             # `[[Set]]` (https://heycam.github.io/webidl/#legacy-platform-object-set) (yet).
             assert not self.descriptor.operations['IndexedGetter']
             assert not self.descriptor.operations['NamedGetter']
-            customSet = 'Some(proxyhandler::maybe_cross_origin_set_rawcx)'
+            customSet = 'Some(proxyhandler::maybe_cross_origin_set_rawcx::<D>)'
 
         getOwnEnumerablePropertyKeys = "own_property_keys::<D>"
         if self.descriptor.interface.getExtendedAttribute("LegacyUnenumerableNamedProperties") or \
@@ -3870,7 +3838,7 @@ class CGDefineDOMInterfaceMethod(CGAbstractMethod):
         return CGGeneric(
             "define_dom_interface"
             f"(cx, global, ProtoOrIfaceIndex::{self.variant}({self.id}),"
-            "CreateInterfaceObjects::<D>, ConstructorEnabled)"
+            "CreateInterfaceObjects::<D>, ConstructorEnabled::<D>)"
         )
 
 
@@ -3943,7 +3911,7 @@ class CGCallGenerator(CGThing):
         call = CGList([call, CGWrapper(args, pre="(", post=")")])
 
         if hasCEReactions:
-            self.cgRoot.append(CGGeneric("push_new_element_queue();\n"))
+            self.cgRoot.append(CGGeneric("<D as DomHelpers<D>>::push_new_element_queue();\n"))
 
         self.cgRoot.append(CGList([
             CGGeneric("let result: "),
@@ -3954,7 +3922,7 @@ class CGCallGenerator(CGThing):
         ]))
 
         if hasCEReactions:
-            self.cgRoot.append(CGGeneric("pop_current_element_queue(CanGc::note());\n"))
+            self.cgRoot.append(CGGeneric("<D as DomHelpers<D>>::pop_current_element_queue(CanGc::note());\n"))
 
         if isFallible:
             if static:
@@ -3966,7 +3934,7 @@ class CGCallGenerator(CGThing):
                 "let result = match result {\n"
                 "    Ok(result) => result,\n"
                 "    Err(e) => {\n"
-                f"        <D as DomHelpers<D>>::throw_dom_exception(cx, {glob}, e);\n"
+                f"        <D as DomHelpers<D>>::throw_dom_exception(cx, {glob}, e, CanGc::note());\n"
                 f"        return{errorResult};\n"
                 "    },\n"
                 "};"))
@@ -4234,7 +4202,7 @@ class CGSpecializedMethod(CGAbstractExternMethod):
         if method.underlyingAttr:
             return CGSpecializedGetter.makeNativeName(descriptor, method.underlyingAttr)
         name = method.identifier.name
-        nativeName = descriptor.binaryNameFor(name)
+        nativeName = descriptor.binaryNameFor(name, method.isStatic())
         if nativeName == name:
             nativeName = descriptor.internalNameFor(name)
         return MakeNativeName(nativeName)
@@ -4320,7 +4288,7 @@ class CGDefaultToJSONMethod(CGSpecializedMethod):
 
     def definition_body(self):
         ret = dedent("""
-            use crate::dom::bindings::inheritance::HasParent;
+            use crate::inheritance::HasParent;
             rooted!(in(cx) let result = JS_NewPlainObject(cx));
             if result.is_null() {
               return false;
@@ -4358,7 +4326,7 @@ class CGStaticMethod(CGAbstractStaticBindingMethod):
     """
     def __init__(self, descriptor, method):
         self.method = method
-        name = method.identifier.name
+        name = descriptor.binaryNameFor(method.identifier.name, True)
         CGAbstractStaticBindingMethod.__init__(self, descriptor, name, templateArgs=["D: DomTypes"])
 
     def generate_code(self):
@@ -4396,7 +4364,7 @@ class CGSpecializedGetter(CGAbstractExternMethod):
     @staticmethod
     def makeNativeName(descriptor, attr):
         name = attr.identifier.name
-        nativeName = descriptor.binaryNameFor(name)
+        nativeName = descriptor.binaryNameFor(name, attr.isStatic())
         if nativeName == name:
             nativeName = descriptor.internalNameFor(name)
         nativeName = MakeNativeName(nativeName)
@@ -4453,7 +4421,7 @@ class CGSpecializedSetter(CGAbstractExternMethod):
     @staticmethod
     def makeNativeName(descriptor, attr):
         name = attr.identifier.name
-        nativeName = descriptor.binaryNameFor(name)
+        nativeName = descriptor.binaryNameFor(name, attr.isStatic())
         if nativeName == name:
             nativeName = descriptor.internalNameFor(name)
         return f"Set{MakeNativeName(nativeName)}"
@@ -4963,7 +4931,7 @@ class CGEnum(CGThing):
         decl = f"""
 #[repr(usize)]
 #[derive({derives})]
-pub(crate) enum {ident} {{
+pub enum {ident} {{
     {enums}
 }}
 """
@@ -4972,10 +4940,10 @@ pub(crate) enum {ident} {{
                                 for val in list(enum.values())])
 
         inner = f"""
-use crate::dom::bindings::conversions::ConversionResult;
-use crate::dom::bindings::conversions::FromJSValConvertible;
-use crate::dom::bindings::conversions::ToJSValConvertible;
-use crate::dom::bindings::utils::find_enum_value;
+use crate::utils::find_enum_value;
+use js::conversions::ConversionResult;
+use js::conversions::FromJSValConvertible;
+use js::conversions::ToJSValConvertible;
 use js::jsapi::JSContext;
 use js::rust::HandleValue;
 use js::rust::MutableHandleValue;
@@ -4986,7 +4954,7 @@ pub(crate) const pairs: &[(&str, super::{ident})] = &[
 ];
 
 impl super::{ident} {{
-    pub(crate) fn as_str(&self) -> &'static str {{
+    pub fn as_str(&self) -> &'static str {{
         pairs[*self as usize].0
     }}
 }}
@@ -5075,7 +5043,7 @@ class CGConstant(CGThing):
         elif tag == IDLType.Tags.double:
             const_type = "f64"
 
-        return f"pub(crate) const {name}: {const_type} = {value};\n"
+        return f"pub const {name}: {const_type} = {value};\n"
 
 
 def getUnionTypeTemplateVars(type, descriptorProvider):
@@ -5206,7 +5174,7 @@ impl{self.generic} Clone for {self.type}{self.genericSuffix} {{
         manualImpls = "\n".join(map(lambda t: self.manualImpl(t, templateVars), self.manualImpls))
         return f"""
 #[derive({", ".join(derives)})]
-pub(crate) enum {self.type}{self.generic} {{
+pub enum {self.type}{self.generic} {{
 {joinedEnumValues}
 }}
 
@@ -5587,7 +5555,7 @@ class ClassConstructor(ClassItem):
 
         name = cgClass.getNameString().replace(': DomTypes', '')
         return f"""
-pub(crate) unsafe fn {self.getDecorators(True)}new({args}) -> Rc<{name}>{body}
+pub unsafe fn {self.getDecorators(True)}new({args}) -> Rc<{name}>{body}
 """
 
     def define(self, cgClass):
@@ -5679,7 +5647,7 @@ class CGClass(CGThing):
         myself = ''
         if self.decorators != '':
             myself += f'{self.decorators}\n'
-        myself += f'{self.indent}pub(crate) struct {self.name}{specialization}'
+        myself += f'{self.indent}pub struct {self.name}{specialization}'
         result += myself
 
         assert len(self.bases) == 1  # XXjdm Can we support multiple inheritance?
@@ -5687,7 +5655,7 @@ class CGClass(CGThing):
         result += ' {\n'
 
         if self.bases:
-            self.members = [ClassMember("parent", self.bases[0].name, "pub(crate)")] + self.members
+            self.members = [ClassMember("parent", self.bases[0].name, "pub")] + self.members
 
         result += CGIndenter(CGGeneric(self.extradeclarations),
                              len(self.indent)).define()
@@ -5746,7 +5714,7 @@ class CGProxySpecialOperation(CGPerSignatureCall):
     (don't use this directly, use the derived classes below).
     """
     def __init__(self, descriptor, operation):
-        nativeName = MakeNativeName(descriptor.binaryNameFor(operation))
+        nativeName = MakeNativeName(descriptor.binaryNameFor(operation, False))
         operation = descriptor.operations[operation]
         assert len(operation.signatures()) == 1
         signature = operation.signatures()[0]
@@ -5910,14 +5878,14 @@ class CGDOMJSProxyHandler_getOwnPropertyDescriptor(CGAbstractExternMethod):
         if self.descriptor.isMaybeCrossOriginObject():
             get += dedent(
                 """
-                if !proxyhandler::is_platform_object_same_origin(cx, proxy) {
+                if !<D as DomHelpers<D>>::is_platform_object_same_origin(cx, proxy) {
                     if !proxyhandler::cross_origin_get_own_property_helper(
                         cx, proxy, CROSS_ORIGIN_PROPERTIES.get(), id, desc, &mut *is_none
                     ) {
                         return false;
                     }
                     if *is_none {
-                        return proxyhandler::cross_origin_property_fallback(cx, proxy, id, desc, &mut *is_none);
+                        return proxyhandler::cross_origin_property_fallback::<D>(cx, proxy, id, desc, &mut *is_none);
                     }
                     return true;
                 }
@@ -5927,7 +5895,7 @@ class CGDOMJSProxyHandler_getOwnPropertyDescriptor(CGAbstractExternMethod):
                 """)
 
         if indexedGetter:
-            get += "let index = get_array_index_from_id(*cx, Handle::from_raw(id));\n"
+            get += "let index = get_array_index_from_id(Handle::from_raw(id));\n"
 
             attrs = "JSPROP_ENUMERATE"
             if self.descriptor.operations['IndexedSetter'] is None:
@@ -6032,8 +6000,8 @@ class CGDOMJSProxyHandler_defineProperty(CGAbstractExternMethod):
         if self.descriptor.isMaybeCrossOriginObject():
             set += dedent(
                 """
-                if !proxyhandler::is_platform_object_same_origin(cx, proxy) {
-                    return proxyhandler::report_cross_origin_denial(cx, id, "define");
+                if !<D as DomHelpers<D>>::is_platform_object_same_origin(cx, proxy) {
+                    return proxyhandler::report_cross_origin_denial::<D>(cx, id, "define");
                 }
 
                 // Safe to enter the Realm of proxy now.
@@ -6042,7 +6010,7 @@ class CGDOMJSProxyHandler_defineProperty(CGAbstractExternMethod):
 
         indexedSetter = self.descriptor.operations['IndexedSetter']
         if indexedSetter:
-            set += ("let index = get_array_index_from_id(*cx, Handle::from_raw(id));\n"
+            set += ("let index = get_array_index_from_id(Handle::from_raw(id));\n"
                     "if let Some(index) = index {\n"
                     "    let this = UnwrapProxy::<D>(proxy);\n"
                     "    let this = &*this;\n"
@@ -6050,7 +6018,7 @@ class CGDOMJSProxyHandler_defineProperty(CGAbstractExternMethod):
                     "    return (*opresult).succeed();\n"
                     "}\n")
         elif self.descriptor.operations['IndexedGetter']:
-            set += ("if get_array_index_from_id(*cx, Handle::from_raw(id)).is_some() {\n"
+            set += ("if get_array_index_from_id(Handle::from_raw(id)).is_some() {\n"
                     "    return (*opresult).failNoIndexedSetter();\n"
                     "}\n")
 
@@ -6091,8 +6059,8 @@ class CGDOMJSProxyHandler_delete(CGAbstractExternMethod):
         if self.descriptor.isMaybeCrossOriginObject():
             set += dedent(
                 """
-                if !proxyhandler::is_platform_object_same_origin(cx, proxy) {
-                    return proxyhandler::report_cross_origin_denial(cx, id, "delete");
+                if !<D as DomHelpers<D>>::is_platform_object_same_origin(cx, proxy) {
+                    return proxyhandler::report_cross_origin_denial::<D>(cx, id, "delete");
                 }
 
                 // Safe to enter the Realm of proxy now.
@@ -6130,7 +6098,7 @@ class CGDOMJSProxyHandler_ownPropertyKeys(CGAbstractExternMethod):
         if self.descriptor.isMaybeCrossOriginObject():
             body += dedent(
                 """
-                if !proxyhandler::is_platform_object_same_origin(cx, proxy) {
+                if !<D as DomHelpers<D>>::is_platform_object_same_origin(cx, proxy) {
                     return proxyhandler::cross_origin_own_property_keys(
                         cx, proxy, CROSS_ORIGIN_PROPERTIES.get(), props
                     );
@@ -6203,7 +6171,7 @@ class CGDOMJSProxyHandler_getOwnEnumerablePropertyKeys(CGAbstractExternMethod):
         if self.descriptor.isMaybeCrossOriginObject():
             body += dedent(
                 """
-                if !proxyhandler::is_platform_object_same_origin(cx, proxy) {
+                if !<D as DomHelpers<D>>::is_platform_object_same_origin(cx, proxy) {
                     // There are no enumerable cross-origin props, so we're done.
                     return true;
                 }
@@ -6254,7 +6222,7 @@ class CGDOMJSProxyHandler_hasOwn(CGAbstractExternMethod):
         if self.descriptor.isMaybeCrossOriginObject():
             indexed += dedent(
                 """
-                if !proxyhandler::is_platform_object_same_origin(cx, proxy) {
+                if !<D as DomHelpers<D>>::is_platform_object_same_origin(cx, proxy) {
                     return proxyhandler::cross_origin_has_own(
                         cx, proxy, CROSS_ORIGIN_PROPERTIES.get(), id, bp
                     );
@@ -6265,7 +6233,7 @@ class CGDOMJSProxyHandler_hasOwn(CGAbstractExternMethod):
                 """)
 
         if indexedGetter:
-            indexed += ("let index = get_array_index_from_id(*cx, Handle::from_raw(id));\n"
+            indexed += ("let index = get_array_index_from_id(Handle::from_raw(id));\n"
                         "if let Some(index) = index {\n"
                         "    let this = UnwrapProxy::<D>(proxy);\n"
                         "    let this = &*this;\n"
@@ -6327,8 +6295,8 @@ class CGDOMJSProxyHandler_get(CGAbstractExternMethod):
         if self.descriptor.isMaybeCrossOriginObject():
             maybeCrossOriginGet = dedent(
                 """
-                if !proxyhandler::is_platform_object_same_origin(cx, proxy) {
-                    return proxyhandler::cross_origin_get(cx, proxy, receiver, id, vp);
+                if !<D as DomHelpers<D>>::is_platform_object_same_origin(cx, proxy) {
+                    return proxyhandler::cross_origin_get::<D>(cx, proxy, receiver, id, vp);
                 }
 
                 // Safe to enter the Realm of proxy now.
@@ -6357,7 +6325,7 @@ if !expando.is_null() {
 
         indexedGetter = self.descriptor.operations['IndexedGetter']
         if indexedGetter:
-            getIndexedOrExpando = ("let index = get_array_index_from_id(*cx, id_lt);\n"
+            getIndexedOrExpando = ("let index = get_array_index_from_id(id_lt);\n"
                                    "if let Some(index) = index {\n"
                                    "    let this = UnwrapProxy::<D>(proxy);\n"
                                    "    let this = &*this;\n"
@@ -6536,7 +6504,7 @@ let global = D::GlobalScope::from_object(JS_CALLEE(*cx, vp).to_object());
         else:
             ctorName = GetConstructorNameForReporting(self.descriptor, self.constructor)
             name = self.constructor.identifier.name
-            nativeName = MakeNativeName(self.descriptor.binaryNameFor(name))
+            nativeName = MakeNativeName(self.descriptor.binaryNameFor(name, True))
 
             if len(self.exposureSet) == 1:
                 args = [
@@ -6588,7 +6556,7 @@ class CGDOMJSProxyHandlerDOMClass(CGThing):
 
     def define(self):
         return f"""
-static Class: ThreadUnsafeOnceLock<DOMClass> = ThreadUnsafeOnceLock::new();
+pub static Class: ThreadUnsafeOnceLock<DOMClass> = ThreadUnsafeOnceLock::new();
 
 pub(crate) fn init_proxy_handler_dom_class<D: DomTypes>() {{
     Class.set({DOMClass(self.descriptor)});
@@ -6756,7 +6724,7 @@ class CGInterfaceTrait(CGThing):
 
         name = descriptor.interface.identifier.name
         self.cgRoot = CGWrapper(CGIndenter(CGList(methods, "")),
-                                pre=f"pub(crate) trait {name}Methods<D: DomTypes> {{\n",
+                                pre=f"pub trait {name}Methods<D: DomTypes> {{\n",
                                 post="}")
         self.empty = not methods
 
@@ -6791,7 +6759,7 @@ class CGInitStatics(CGThing):
         ] for name in nonempty]
         flat_specs = [x for xs in specs for x in xs]
         specs = '\n'.join(flat_specs)
-        module = f"crate::dom::bindings::codegen::Bindings::{toBindingPath(descriptor)}"
+        module = f"crate::codegen::GenericBindings::{toBindingPath(descriptor)}"
         relevantMethods = [
             m for m in descriptor.interface.members if m.isMethod()
         ] if not descriptor.interface.isCallback() else []
@@ -6989,18 +6957,11 @@ class CGDescriptor(CGThing):
                 pass
             else:
                 cgThings.append(CGDOMJSClass(descriptor))
-                if not descriptor.interface.isIteratorInterface():
-                    cgThings.append(CGAssertInheritance(descriptor))
-                pass
 
             if descriptor.isGlobal():
                 cgThings.append(CGWrapGlobalMethod(descriptor, properties))
             else:
                 cgThings.append(CGWrapMethod(descriptor))
-                if descriptor.interface.isIteratorInterface():
-                    cgThings.append(CGDomObjectIteratorWrap(descriptor))
-                else:
-                    cgThings.append(CGDomObjectWrap(descriptor))
             reexports.append('Wrap')
 
         haveUnscopables = False
@@ -7012,16 +6973,6 @@ class CGDescriptor(CGThing):
                             CGIndenter(CGList([CGGeneric(str_to_cstr(name)) for
                                                name in unscopableNames], ",\n")),
                             CGGeneric("];\n")], "\n"))
-            if (
-                (descriptor.concrete or descriptor.hasDescendants())
-                and not descriptor.interface.isIteratorInterface()
-            ):
-                cgThings.append(CGIDLInterface(descriptor))
-            if descriptor.interface.isIteratorInterface():
-                cgThings.append(CGIteratorDerives(descriptor))
-
-            if descriptor.weakReferenceable:
-                cgThings.append(CGWeakReferenceableTrait(descriptor))
 
         if not descriptor.interface.isCallback():
             interfaceTrait = CGInterfaceTrait(descriptor, config.getDescriptorProvider())
@@ -7070,8 +7021,7 @@ class CGDescriptor(CGThing):
         # These are inside the generated module
         cgThings = CGImports(cgThings, descriptors=[descriptor], callbacks=[],
                              dictionaries=[], enums=[], typedefs=[], imports=[
-            'crate::dom',
-            'crate::dom::bindings::import::module::*',
+            'crate::import::module::*',
         ], config=config)
 
         cgThings = CGWrapper(CGNamespace(toBindingNamespace(descriptor.name),
@@ -7081,7 +7031,7 @@ class CGDescriptor(CGThing):
         if reexports:
             reexports = ', '.join([reexportedName(name) for name in reexports])
             namespace = toBindingNamespace(descriptor.name)
-            cgThings = CGList([CGGeneric(f'pub(crate) use self::{namespace}::{{{reexports}}};'),
+            cgThings = CGList([CGGeneric(f'pub use self::{namespace}::{{{reexports}}};'),
                                cgThings], '\n')
 
         self.cgRoot = cgThings
@@ -7186,10 +7136,10 @@ impl{self.generic} Clone for {self.makeClassName(self.dictionary)}{self.genericS
             typeName += parentSuffix
             if type_needs_tracing(d.parent):
                 typeName = f"RootedTraceableBox<{typeName}>"
-            inheritance = f"    pub(crate) parent: {typeName},\n"
+            inheritance = f"    pub parent: {typeName},\n"
         else:
             inheritance = ""
-        memberDecls = [f"    pub(crate) {self.makeMemberName(m[0].identifier.name)}: {self.getMemberType(m)},"
+        memberDecls = [f"    pub {self.makeMemberName(m[0].identifier.name)}: {self.getMemberType(m)},"
                        for m in self.memberInfo]
 
         derive = ["JSTraceable"] + self.derives
@@ -7231,7 +7181,7 @@ impl{self.generic} Clone for {self.makeClassName(self.dictionary)}{self.genericS
         return (
             f"#[derive({', '.join(derive)})]\n"
             f"{mustRoot}"
-            f"pub(crate) struct {self.makeClassName(d)}{self.generic} {{\n"
+            f"pub struct {self.makeClassName(d)}{self.generic} {{\n"
             f"{inheritance}"
             f"{joinedMemberDecls}\n"
             "}\n"
@@ -7305,7 +7255,7 @@ impl{self.generic} Clone for {self.makeClassName(self.dictionary)}{self.genericS
         return (
             f"impl{self.generic} {selfName}{self.genericSuffix} {{\n"
             f"{CGIndenter(CGGeneric(self.makeEmpty()), indentLevel=4).define()}\n"
-            "    pub(crate) fn new(cx: SafeJSContext, val: HandleValue) \n"
+            "    pub fn new(cx: SafeJSContext, val: HandleValue) \n"
             f"                      -> Result<ConversionResult<{actualType}>, ()> {{\n"
             f"        {unsafe_if_necessary} {{\n"
             "            let object = if val.get().is_null_or_undefined() {\n"
@@ -7335,7 +7285,7 @@ impl{self.generic} Clone for {self.makeClassName(self.dictionary)}{self.genericS
             "\n"
             f"impl{self.generic} {selfName}{self.genericSuffix} {{\n"
             "    #[allow(clippy::wrong_self_convention)]\n"
-            "    pub(crate) unsafe fn to_jsobject(&self, cx: *mut JSContext, mut obj: MutableHandleObject) {\n"
+            "    pub unsafe fn to_jsobject(&self, cx: *mut JSContext, mut obj: MutableHandleObject) {\n"
             f"{CGIndenter(CGList(memberInserts), indentLevel=8).define()}    }}\n"
             "}\n"
             "\n"
@@ -7411,7 +7361,7 @@ impl{self.generic} Clone for {self.makeClassName(self.dictionary)}{self.genericS
         parentTemplate = "parent: %s::%s::empty(),\n"
         fieldTemplate = "%s: %s,\n"
         functionTemplate = (
-            "pub(crate) fn empty() -> Self {\n"
+            "pub fn empty() -> Self {\n"
             "    Self {\n"
             "%s"
             "    }\n"
@@ -7421,7 +7371,7 @@ impl{self.generic} Clone for {self.makeClassName(self.dictionary)}{self.genericS
             parentTemplate = "dictionary.parent = %s::%s::empty();\n"
             fieldTemplate = "dictionary.%s = %s;\n"
             functionTemplate = (
-                "pub(crate) fn empty() -> RootedTraceableBox<Self> {\n"
+                "pub fn empty() -> RootedTraceableBox<Self> {\n"
                 "    let mut dictionary = RootedTraceableBox::new(Self::default());\n"
                 "%s"
                 "    dictionary\n"
@@ -7478,7 +7428,7 @@ class CGInitAllStatics(CGAbstractMethod):
 
     def definition_body(self):
         return CGList([
-            CGGeneric(f"    Bindings::{toBindingModuleFileFromDescriptor(desc)}::{toBindingNamespace(desc.name)}"
+            CGGeneric(f"    GenericBindings::{toBindingModuleFileFromDescriptor(desc)}::{toBindingNamespace(desc.name)}"
                       "::init_statics::<D>();")
             for desc in self.descriptors
         ], "\n")
@@ -7488,18 +7438,21 @@ class CGRegisterProxyHandlersMethod(CGAbstractMethod):
     def __init__(self, descriptors):
         docs = "Create the global vtables used by the generated DOM bindings to implement JS proxies."
         CGAbstractMethod.__init__(self, None, 'RegisterProxyHandlers', 'void', [],
-                                  unsafe=True, pub=True, docs=docs, templateArgs=["D: DomTypes"])
+                                  pub=True, docs=docs, templateArgs=["D: DomTypes"])
         self.descriptors = descriptors
 
     def definition_body(self):
-        return CGList([
+        body = [CGGeneric("unsafe {")]
+        body += [
             CGGeneric(f"proxy_handlers::{desc.name}.store(\n"
-                      f"    Bindings::{toBindingModuleFile(desc.name)}::{toBindingNamespace(desc.name)}"
+                      f"    GenericBindings::{toBindingModuleFile(desc.name)}::{toBindingNamespace(desc.name)}"
                       "::DefineProxyHandler::<D>() as *mut _,\n"
                       "    std::sync::atomic::Ordering::Release,\n"
                       ");")
             for desc in self.descriptors
-        ], "\n")
+        ]
+        body += [CGGeneric("}")]
+        return CGList(body, "\n")
 
 
 class CGRegisterProxyHandlers(CGThing):
@@ -7589,6 +7542,27 @@ class CGConcreteBindingRoot(CGThing):
                     f"pub(crate) use {originalBinding}::{firstCap(ifaceName)}_Binding as {firstCap(ifaceName)}_Binding;"
                 ),
             ]
+
+            if d.concrete:
+                if not d.interface.isIteratorInterface():
+                    cgthings.append(CGAssertInheritance(d))
+                else:
+                    cgthings.append(CGIteratorDerives(d))
+
+            if (
+                (d.concrete or d.hasDescendants())
+                and not d.interface.isIteratorInterface()
+            ):
+                cgthings.append(CGIDLInterface(d))
+
+            if d.interface.isIteratorInterface():
+                cgthings.append(CGDomObjectIteratorWrap(d))
+            elif d.concrete and not d.isGlobal():
+                cgthings.append(CGDomObjectWrap(d))
+
+            if d.weakReferenceable:
+                cgthings.append(CGWeakReferenceableTrait(d))
+
             if not d.interface.isCallback():
                 traitName = f"{ifaceName}Methods"
                 cgthings += [
@@ -7624,7 +7598,7 @@ pub(crate) fn GetConstructorObject(
         curr = CGImports(curr, descriptors=[], callbacks=[],
                          dictionaries=[], enums=[], typedefs=[],
                          imports=[
-                             'crate::dom::bindings::import::base::*',
+                             'crate::dom::bindings::import::module::*',
                              'crate::dom::types::*'],
                          config=config)
 
@@ -7681,11 +7655,11 @@ class CGBindingRoot(CGThing):
 
             if t.innerType.isUnion() and not t.innerType.nullable():
                 # Allow using the typedef's name for accessing variants.
-                typeDefinition = f"pub(crate) use self::{type.replace('<D>', '')} as {name};"
+                typeDefinition = f"pub use self::{type.replace('<D>', '')} as {name};"
             else:
                 generic = "<D>" if containsDomInterface(t.innerType) else ""
                 replacedType = type.replace("D::", "<D as DomTypes>::")
-                typeDefinition = f"pub(crate) type {name}{generic} = {replacedType};"
+                typeDefinition = f"pub type {name}{generic} = {replacedType};"
 
             cgthings.append(CGGeneric(typeDefinition))
 
@@ -7713,7 +7687,7 @@ class CGBindingRoot(CGThing):
         # These are the global imports (outside of the generated module)
         curr = CGImports(curr, descriptors=callbackDescriptors, callbacks=mainCallbacks,
                          dictionaries=dictionaries, enums=enums, typedefs=typedefs,
-                         imports=['crate::dom::bindings::import::base::*'], config=config)
+                         imports=['crate::import::base::*'], config=config)
 
         # Add the auto-generated comment.
         curr = CGWrapper(curr, pre=f"{AUTOGENERATED_WARNING_COMMENT}{ALLOWED_WARNINGS}")
@@ -7983,11 +7957,11 @@ class CGCallback(CGClass):
 
 # We're always fallible
 def callbackGetterName(attr, descriptor):
-    return f"Get{MakeNativeName(descriptor.binaryNameFor(attr.identifier.name))}"
+    return f"Get{MakeNativeName(descriptor.binaryNameFor(attr.identifier.name, attr.isStatic()))}"
 
 
 def callbackSetterName(attr, descriptor):
-    return f"Set{MakeNativeName(descriptor.binaryNameFor(attr.identifier.name))}"
+    return f"Set{MakeNativeName(descriptor.binaryNameFor(attr.identifier.name, attr.isStatic()))}"
 
 
 class CGCallbackFunction(CGCallback):
@@ -8327,7 +8301,7 @@ class CallbackOperation(CallbackOperationBase):
         jsName = method.identifier.name
         CallbackOperationBase.__init__(self, signature,
                                        jsName,
-                                       MakeNativeName(descriptor.binaryNameFor(jsName)),
+                                       MakeNativeName(descriptor.binaryNameFor(jsName, False)),
                                        descriptor, descriptor.interface.isSingleOperationInterface())
 
 
@@ -8512,12 +8486,11 @@ class GlobalGenRoots():
     def InterfaceObjectMap(config):
         mods = [
             "crate::dom::bindings::codegen",
-            "crate::script_runtime::JSContext",
-            "js::rust::HandleObject",
+            "script_bindings::interfaces::Interface",
         ]
         imports = CGList([CGGeneric(f"use {mod};") for mod in mods], "\n")
 
-        phf = CGGeneric("include!(concat!(env!(\"BINDINGS_OUT_DIR\"), \"/InterfaceObjectMapPhf.rs\"));")
+        phf = CGGeneric("include!(concat!(env!(\"OUT_DIR\"), \"/InterfaceObjectMapPhf.rs\"));")
 
         return CGList([
             CGGeneric(AUTOGENERATED_WARNING_COMMENT),
@@ -8536,9 +8509,13 @@ class GlobalGenRoots():
             for ctor in d.interface.legacyFactoryFunctions:
                 pairs.append((ctor.identifier.name, binding_mod, binding_ns))
         pairs.sort(key=operator.itemgetter(0))
+
+        def bindingPath(pair):
+            return f'codegen::Bindings::{pair[1]}::{pair[2]}'
+
         mappings = [
-            CGGeneric(f'"{pair[0]}": "codegen::Bindings::{pair[1]}'
-                      f'::{pair[2]}::DefineDOMInterface::<crate::DomTypeHolder>"')
+            CGGeneric(f'"{pair[0]}": ["{bindingPath(pair)}::DefineDOMInterface::<crate::DomTypeHolder>", '
+                      f'"{bindingPath(pair)}::ConstructorEnabled::<crate::DomTypeHolder>"]')
             for pair in pairs
         ]
         return CGWrapper(
@@ -8583,7 +8560,7 @@ class GlobalGenRoots():
         ], "\n")
 
         return CGImports(code, descriptors=[], callbacks=[], dictionaries=[], enums=[], typedefs=[], imports=[
-            'crate::dom::bindings::codegen::Bindings',
+            'crate::codegen::GenericBindings',
             'crate::DomTypes',
         ], config=config)
 
@@ -8610,7 +8587,7 @@ class GlobalGenRoots():
                        | set(leafModule(d) for d in config.getDictionaries()))
         curr = CGList([CGGeneric(
             "#[allow(clippy::derivable_impls)]\n"
-            f"pub(crate) mod {name};\n"
+            f"pub mod {name};\n"
         ) for name in sorted(descriptors)])
         curr = CGWrapper(curr, pre=AUTOGENERATED_WARNING_COMMENT)
         return curr
@@ -8657,6 +8634,7 @@ class GlobalGenRoots():
             if base in topTypes:
                 typeIdCode.append(CGGeneric(f"""
 impl {base} {{
+    #[allow(dead_code)]
     pub(crate) fn type_id(&self) -> &'static {base}TypeId {{
         unsafe {{
             &get_dom_class(self.reflector().get_jsobject().get())
@@ -8746,7 +8724,7 @@ impl Clone for TopTypeId {
             unions.add(name)
             generic = "<crate::DomTypeHolder>" if containsDomInterface(t) else ""
             cgthings += [CGGeneric(f"pub(crate) type {name} = "
-                                   f"crate::dom::bindings::codegen::GenericUnionTypes::{name}{generic};\n")]
+                                   f"script_bindings::codegen::GenericUnionTypes::{name}{generic};\n")]
         curr = CGList(cgthings)
         curr = CGWrapper(curr, pre=AUTOGENERATED_WARNING_COMMENT)
         return curr
diff --git a/components/script_bindings/codegen/Configuration.py b/components/script_bindings/codegen/Configuration.py
index a4a6a538fdc..e540b0c3101 100644
--- a/components/script_bindings/codegen/Configuration.py
+++ b/components/script_bindings/codegen/Configuration.py
@@ -228,7 +228,7 @@ class Descriptor(DescriptorProvider):
             self.nativeType = typeName
             pathDefault = 'crate::dom::types::%s' % typeName
         elif self.interface.isCallback():
-            ty = 'crate::dom::bindings::codegen::GenericBindings::%sBinding::%s' % (ifaceName, ifaceName)
+            ty = 'crate::codegen::GenericBindings::%sBinding::%s' % (ifaceName, ifaceName)
             pathDefault = ty
             self.returnType = "Rc<%s<D>>" % ty
             self.argumentType = "???"
@@ -238,7 +238,7 @@ class Descriptor(DescriptorProvider):
             self.argumentType = "&%s%s" % (prefix, typeName)
             self.nativeType = "*const %s%s" % (prefix, typeName)
             if self.interface.isIteratorInterface():
-                pathDefault = 'crate::dom::bindings::iterable::IterableIterator'
+                pathDefault = 'crate::iterable::IterableIterator'
             else:
                 pathDefault = 'crate::dom::types::%s' % MakeNativeName(typeName)
 
@@ -353,8 +353,8 @@ class Descriptor(DescriptorProvider):
                     add('all', [config], attribute)
 
         self._binaryNames = desc.get('binaryNames', {})
-        self._binaryNames.setdefault('__legacycaller', 'LegacyCall')
-        self._binaryNames.setdefault('__stringifier', 'Stringifier')
+        self._binaryNames.setdefault(('__legacycaller', False), 'LegacyCall')
+        self._binaryNames.setdefault(('__stringifier', False), 'Stringifier')
 
         self._internalNames = desc.get('internalNames', {})
 
@@ -365,7 +365,7 @@ class Descriptor(DescriptorProvider):
             if binaryName:
                 assert isinstance(binaryName, list)
                 assert len(binaryName) == 1
-                self._binaryNames.setdefault(member.identifier.name,
+                self._binaryNames.setdefault((member.identifier.name, member.isStatic()),
                                              binaryName[0])
             self._internalNames.setdefault(member.identifier.name,
                                            member.identifier.name.replace('-', '_'))
@@ -391,8 +391,8 @@ class Descriptor(DescriptorProvider):
             return filename
         return None
 
-    def binaryNameFor(self, name):
-        return self._binaryNames.get(name, name)
+    def binaryNameFor(self, name, isStatic):
+        return self._binaryNames.get((name, isStatic), name)
 
     def internalNameFor(self, name):
         return self._internalNames.get(name, name)
@@ -491,7 +491,7 @@ def getIdlFileName(object):
 
 
 def getModuleFromObject(object):
-    return ('crate::dom::bindings::codegen::GenericBindings::' + getIdlFileName(object) + 'Binding')
+    return ('crate::codegen::GenericBindings::' + getIdlFileName(object) + 'Binding')
 
 
 def getTypesFromDescriptor(descriptor):
@@ -552,5 +552,5 @@ def iteratorNativeType(descriptor, infer=False):
     res = "IterableIterator%s" % ("" if infer else '<D, D::%s>' % descriptor.interface.identifier.name)
     # todo: this hack is telling us that something is still wrong in codegen
     if iterableDecl.isSetlike() or iterableDecl.isMaplike():
-        res = f"crate::dom::bindings::iterable::{res}"
+        res = f"crate::iterable::{res}"
     return res
diff --git a/components/script_bindings/constructor.rs b/components/script_bindings/constructor.rs
new file mode 100644
index 00000000000..0fbf1e5a45b
--- /dev/null
+++ b/components/script_bindings/constructor.rs
@@ -0,0 +1,37 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::ptr;
+
+use js::jsapi::{CallArgs, JSObject};
+use js::rust::HandleObject;
+
+use crate::codegen::PrototypeList;
+use crate::error::throw_constructor_without_new;
+use crate::interface::get_desired_proto;
+use crate::script_runtime::JSContext;
+use crate::utils::ProtoOrIfaceArray;
+
+pub(crate) unsafe fn call_default_constructor<D: crate::DomTypes>(
+    cx: JSContext,
+    args: &CallArgs,
+    global: &D::GlobalScope,
+    proto_id: PrototypeList::ID,
+    ctor_name: &str,
+    creator: unsafe fn(JSContext, HandleObject, *mut ProtoOrIfaceArray),
+    constructor: impl FnOnce(JSContext, &CallArgs, &D::GlobalScope, HandleObject) -> bool,
+) -> bool {
+    if !args.is_constructing() {
+        throw_constructor_without_new(cx, ctor_name);
+        return false;
+    }
+
+    rooted!(in(*cx) let mut desired_proto = ptr::null_mut::<JSObject>());
+    let proto_result = get_desired_proto(cx, args, proto_id, creator, desired_proto.handle_mut());
+    if proto_result.is_err() {
+        return false;
+    }
+
+    constructor(cx, args, global, desired_proto.handle())
+}
diff --git a/components/script_bindings/conversions.rs b/components/script_bindings/conversions.rs
index 6e0ce7adee0..953dca889a8 100644
--- a/components/script_bindings/conversions.rs
+++ b/components/script_bindings/conversions.rs
@@ -13,19 +13,24 @@ use js::glue::{
     JS_GetReservedSlot, UnwrapObjectDynamic,
 };
 use js::jsapi::{
-    JS_DeprecatedStringHasLatin1Chars, JS_GetLatin1StringCharsAndLength,
+    Heap, IsWindowProxy, JS_DeprecatedStringHasLatin1Chars, JS_GetLatin1StringCharsAndLength,
     JS_GetTwoByteStringCharsAndLength, JS_NewStringCopyN, JSContext, JSObject, JSString,
 };
 use js::jsval::{ObjectValue, StringValue, UndefinedValue};
+use js::rust::wrappers::IsArrayObject;
 use js::rust::{
     HandleId, HandleValue, MutableHandleValue, ToString, get_object_class, is_dom_class,
     is_dom_object, maybe_wrap_value,
 };
+use num_traits::Float;
 
+use crate::JSTraceable;
 use crate::inheritance::Castable;
+use crate::num::Finite;
 use crate::reflector::{DomObject, Reflector};
 use crate::root::DomRoot;
 use crate::str::{ByteString, DOMString, USVString};
+use crate::trace::RootedTraceableBox;
 use crate::utils::{DOMClass, DOMJSClass};
 
 /// A trait to check whether a given `JSObject` implements an IDL interface.
@@ -240,6 +245,9 @@ pub unsafe fn get_dom_class(obj: *mut JSObject) -> Result<&'static DOMClass, ()>
     if is_dom_proxy(obj) {
         trace!("proxy dom object");
         let dom_class: *const DOMClass = GetProxyHandlerExtra(obj) as *const DOMClass;
+        if dom_class.is_null() {
+            return Err(());
+        }
         return Ok(&*dom_class);
     }
     trace!("not a dom object");
@@ -408,3 +416,176 @@ pub unsafe fn jsid_to_string(cx: *mut JSContext, id: HandleId) -> Option<DOMStri
 
     None
 }
+
+impl<T: Float + ToJSValConvertible> ToJSValConvertible for Finite<T> {
+    #[inline]
+    unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) {
+        let value = **self;
+        value.to_jsval(cx, rval);
+    }
+}
+
+impl<T: Float + FromJSValConvertible<Config = ()>> FromJSValConvertible for Finite<T> {
+    type Config = ();
+
+    unsafe fn from_jsval(
+        cx: *mut JSContext,
+        value: HandleValue,
+        option: (),
+    ) -> Result<ConversionResult<Finite<T>>, ()> {
+        let result = match FromJSValConvertible::from_jsval(cx, value, option)? {
+            ConversionResult::Success(v) => v,
+            ConversionResult::Failure(error) => {
+                // FIXME(emilio): Why throwing instead of propagating the error?
+                throw_type_error(cx, &error);
+                return Err(());
+            },
+        };
+        match Finite::new(result) {
+            Some(v) => Ok(ConversionResult::Success(v)),
+            None => {
+                throw_type_error(cx, "this argument is not a finite floating-point value");
+                Err(())
+            },
+        }
+    }
+}
+
+/// Get a `*const libc::c_void` for the given DOM object, unless it is a DOM
+/// wrapper, and checking if the object is of the correct type.
+///
+/// Returns Err(()) if `obj` is a wrapper or if the object is not an object
+/// for a DOM object of the given type (as defined by the proto_id and proto_depth).
+#[inline]
+#[allow(clippy::result_unit_err)]
+unsafe fn private_from_proto_check_static(
+    obj: *mut JSObject,
+    proto_check: fn(&'static DOMClass) -> bool,
+) -> Result<*const libc::c_void, ()> {
+    let dom_class = get_dom_class(obj).map_err(|_| ())?;
+    if proto_check(dom_class) {
+        trace!("good prototype");
+        Ok(private_from_object(obj))
+    } else {
+        trace!("bad prototype");
+        Err(())
+    }
+}
+
+/// Get a `*const T` for a DOM object accessible from a `JSObject`, where the DOM object
+/// is guaranteed not to be a wrapper.
+///
+/// # Safety
+/// `obj` must point to a valid, non-null JSObject.
+#[allow(clippy::result_unit_err)]
+pub unsafe fn native_from_object_static<T>(obj: *mut JSObject) -> Result<*const T, ()>
+where
+    T: DomObject + IDLInterface,
+{
+    private_from_proto_check_static(obj, T::derives).map(|ptr| ptr as *const T)
+}
+
+/// Get a `*const T` for a DOM object accessible from a `HandleValue`.
+/// Caller is responsible for throwing a JS exception if needed in case of error.
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+#[allow(clippy::result_unit_err)]
+pub unsafe fn native_from_handlevalue<T>(v: HandleValue, cx: *mut JSContext) -> Result<*const T, ()>
+where
+    T: DomObject + IDLInterface,
+{
+    if !v.get().is_object() {
+        return Err(());
+    }
+    native_from_object(v.get().to_object(), cx)
+}
+
+impl<T: ToJSValConvertible + JSTraceable> ToJSValConvertible for RootedTraceableBox<T> {
+    #[inline]
+    unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) {
+        let value = &**self;
+        value.to_jsval(cx, rval);
+    }
+}
+
+impl<T> FromJSValConvertible for RootedTraceableBox<Heap<T>>
+where
+    T: FromJSValConvertible + js::rust::GCMethods + Copy,
+    Heap<T>: JSTraceable + Default,
+{
+    type Config = T::Config;
+
+    unsafe fn from_jsval(
+        cx: *mut JSContext,
+        value: HandleValue,
+        config: Self::Config,
+    ) -> Result<ConversionResult<Self>, ()> {
+        T::from_jsval(cx, value, config).map(|result| match result {
+            ConversionResult::Success(inner) => {
+                ConversionResult::Success(RootedTraceableBox::from_box(Heap::boxed(inner)))
+            },
+            ConversionResult::Failure(msg) => ConversionResult::Failure(msg),
+        })
+    }
+}
+
+/// Returns whether `value` is an array-like object (Array, FileList,
+/// HTMLCollection, HTMLFormControlsCollection, HTMLOptionsCollection,
+/// NodeList, DOMTokenList).
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+pub unsafe fn is_array_like<D: crate::DomTypes>(cx: *mut JSContext, value: HandleValue) -> bool {
+    let mut is_array = false;
+    assert!(IsArrayObject(cx, value, &mut is_array));
+    if is_array {
+        return true;
+    }
+
+    let object: *mut JSObject = match FromJSValConvertible::from_jsval(cx, value, ()).unwrap() {
+        ConversionResult::Success(object) => object,
+        _ => return false,
+    };
+
+    // TODO: HTMLAllCollection
+    if root_from_object::<D::DOMTokenList>(object, cx).is_ok() {
+        return true;
+    }
+    if root_from_object::<D::FileList>(object, cx).is_ok() {
+        return true;
+    }
+    if root_from_object::<D::HTMLCollection>(object, cx).is_ok() {
+        return true;
+    }
+    if root_from_object::<D::HTMLFormControlsCollection>(object, cx).is_ok() {
+        return true;
+    }
+    if root_from_object::<D::HTMLOptionsCollection>(object, cx).is_ok() {
+        return true;
+    }
+    if root_from_object::<D::NodeList>(object, cx).is_ok() {
+        return true;
+    }
+
+    false
+}
+
+/// Get a `DomRoot<T>` for a WindowProxy accessible from a `HandleValue`.
+/// Caller is responsible for throwing a JS exception if needed in case of error.
+pub(crate) unsafe fn windowproxy_from_handlevalue<D: crate::DomTypes>(
+    v: HandleValue,
+    _cx: *mut JSContext,
+) -> Result<DomRoot<D::WindowProxy>, ()> {
+    if !v.get().is_object() {
+        return Err(());
+    }
+    let object = v.get().to_object();
+    if !IsWindowProxy(object) {
+        return Err(());
+    }
+    let mut value = UndefinedValue();
+    GetProxyReservedSlot(object, 0, &mut value);
+    let ptr = value.to_private() as *const D::WindowProxy;
+    Ok(DomRoot::from_ref(&*ptr))
+}
diff --git a/components/script_bindings/error.rs b/components/script_bindings/error.rs
index bd8a5b0cb95..a95d0b0b78c 100644
--- a/components/script_bindings/error.rs
+++ b/components/script_bindings/error.rs
@@ -2,6 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use js::error::throw_type_error;
+use js::jsapi::JS_IsExceptionPending;
+
+use crate::codegen::PrototypeList::proto_id_to_name;
+use crate::script_runtime::JSContext as SafeJSContext;
+
 /// DOM exceptions that can be thrown by a native DOM method.
 #[derive(Clone, Debug, MallocSizeOf)]
 pub enum Error {
@@ -38,7 +44,7 @@ pub enum Error {
     /// InvalidNodeTypeError DOMException
     InvalidNodeType,
     /// DataCloneError DOMException
-    DataClone,
+    DataClone(Option<String>),
     /// NoModificationAllowedError DOMException
     NoModificationAllowed,
     /// QuotaExceededError DOMException
@@ -53,6 +59,8 @@ pub enum Error {
     Data,
     /// OperationError DOMException
     Operation,
+    /// NotAllowedError DOMException
+    NotAllowed,
 
     /// TypeError JavaScript Error
     Type(String),
@@ -69,3 +77,20 @@ pub type Fallible<T> = Result<T, Error>;
 /// The return type for IDL operations that can throw DOM exceptions and
 /// return `()`.
 pub type ErrorResult = Fallible<()>;
+
+/// Throw an exception to signal that a `JSObject` can not be converted to a
+/// given DOM type.
+pub fn throw_invalid_this(cx: SafeJSContext, proto_id: u16) {
+    debug_assert!(unsafe { !JS_IsExceptionPending(*cx) });
+    let error = format!(
+        "\"this\" object does not implement interface {}.",
+        proto_id_to_name(proto_id)
+    );
+    unsafe { throw_type_error(*cx, &error) };
+}
+
+pub fn throw_constructor_without_new(cx: SafeJSContext, name: &str) {
+    debug_assert!(unsafe { !JS_IsExceptionPending(*cx) });
+    let error = format!("{} constructor: 'new' is required", name);
+    unsafe { throw_type_error(*cx, &error) };
+}
diff --git a/components/script_bindings/finalize.rs b/components/script_bindings/finalize.rs
new file mode 100644
index 00000000000..46fbc83c965
--- /dev/null
+++ b/components/script_bindings/finalize.rs
@@ -0,0 +1,74 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! Generic finalizer implementations for DOM binding implementations.
+
+use std::any::type_name;
+use std::{mem, ptr};
+
+use js::glue::JS_GetReservedSlot;
+use js::jsapi::JSObject;
+use js::jsval::UndefinedValue;
+use js::rust::GCMethods;
+
+use crate::codegen::PrototypeList::PROTO_OR_IFACE_LENGTH;
+use crate::utils::{ProtoOrIfaceArray, get_proto_or_iface_array};
+use crate::weakref::{DOM_WEAK_SLOT, WeakBox, WeakReferenceable};
+
+/// Drop the resources held by reserved slots of a global object
+unsafe fn do_finalize_global(obj: *mut JSObject) {
+    let protolist = get_proto_or_iface_array(obj);
+    let list = (*protolist).as_mut_ptr();
+    for idx in 0..PROTO_OR_IFACE_LENGTH as isize {
+        let entry = list.offset(idx);
+        let value = *entry;
+        <*mut JSObject>::post_barrier(entry, value, ptr::null_mut());
+    }
+    let _: Box<ProtoOrIfaceArray> = Box::from_raw(protolist);
+}
+
+/// # Safety
+/// `this` must point to a valid, non-null instance of T.
+pub(crate) unsafe fn finalize_common<T>(this: *const T) {
+    if !this.is_null() {
+        // The pointer can be null if the object is the unforgeable holder of that interface.
+        let _ = Box::from_raw(this as *mut T);
+    }
+    debug!("{} finalize: {:p}", type_name::<T>(), this);
+}
+
+/// # Safety
+/// `obj` must point to a valid, non-null JS object.
+/// `this` must point to a valid, non-null instance of T.
+pub(crate) unsafe fn finalize_global<T>(obj: *mut JSObject, this: *const T) {
+    do_finalize_global(obj);
+    finalize_common::<T>(this);
+}
+
+/// # Safety
+/// `obj` must point to a valid, non-null JS object.
+/// `this` must point to a valid, non-null instance of T.
+pub(crate) unsafe fn finalize_weak_referenceable<T: WeakReferenceable>(
+    obj: *mut JSObject,
+    this: *const T,
+) {
+    let mut slot = UndefinedValue();
+    JS_GetReservedSlot(obj, DOM_WEAK_SLOT, &mut slot);
+    let weak_box_ptr = slot.to_private() as *mut WeakBox<T>;
+    if !weak_box_ptr.is_null() {
+        let count = {
+            let weak_box = &*weak_box_ptr;
+            assert!(weak_box.value.get().is_some());
+            assert!(weak_box.count.get() > 0);
+            weak_box.value.set(None);
+            let count = weak_box.count.get() - 1;
+            weak_box.count.set(count);
+            count
+        };
+        if count == 0 {
+            mem::drop(Box::from_raw(weak_box_ptr));
+        }
+    }
+    finalize_common::<T>(this);
+}
diff --git a/components/script/dom/bindings/guard.rs b/components/script_bindings/guard.rs
similarity index 83%
rename from components/script/dom/bindings/guard.rs
rename to components/script_bindings/guard.rs
index fb2b2ebc807..68286b48fec 100644
--- a/components/script/dom/bindings/guard.rs
+++ b/components/script_bindings/guard.rs
@@ -7,9 +7,10 @@
 use js::rust::HandleObject;
 use servo_config::prefs::get;
 
-use crate::dom::bindings::codegen::InterfaceObjectMap;
-use crate::dom::bindings::interface::is_exposed_in;
-use crate::dom::globalscope::GlobalScope;
+use crate::DomTypes;
+use crate::codegen::Globals::Globals;
+use crate::interface::is_exposed_in;
+use crate::interfaces::GlobalScopeHelpers;
 use crate::realms::{AlreadyInRealm, InRealm};
 use crate::script_runtime::JSContext;
 
@@ -28,7 +29,7 @@ impl<T: Clone + Copy> Guard<T> {
     /// Expose the value if the conditions are satisfied.
     ///
     /// The passed handle is the object on which the value may be exposed.
-    pub(crate) fn expose(
+    pub(crate) fn expose<D: DomTypes>(
         &self,
         cx: JSContext,
         obj: HandleObject,
@@ -45,7 +46,7 @@ impl<T: Clone + Copy> Guard<T> {
                 exposed_on_global |= is_exposed_in(global, *globals);
                 true
             },
-            _ => c.is_satisfied(cx, obj, global),
+            _ => c.is_satisfied::<D>(cx, obj, global),
         });
 
         if conditions_satisfied && exposed_on_global {
@@ -64,21 +65,21 @@ pub(crate) enum Condition {
     /// The condition is satisfied if the preference is set.
     Pref(&'static str),
     // The condition is satisfied if the interface is exposed in the global.
-    Exposed(InterfaceObjectMap::Globals),
+    Exposed(Globals),
     SecureContext(),
     /// The condition is always satisfied.
     Satisfied,
 }
 
-fn is_secure_context(cx: JSContext) -> bool {
+fn is_secure_context<D: DomTypes>(cx: JSContext) -> bool {
     unsafe {
         let in_realm_proof = AlreadyInRealm::assert_for_cx(JSContext::from_ptr(*cx));
-        GlobalScope::from_context(*cx, InRealm::Already(&in_realm_proof)).is_secure_context()
+        D::GlobalScope::from_context(*cx, InRealm::Already(&in_realm_proof)).is_secure_context()
     }
 }
 
 impl Condition {
-    pub(crate) fn is_satisfied(
+    pub(crate) fn is_satisfied<D: DomTypes>(
         &self,
         cx: JSContext,
         obj: HandleObject,
@@ -88,7 +89,7 @@ impl Condition {
             Condition::Pref(name) => get().get_value(name).try_into().unwrap_or(false),
             Condition::Func(f) => f(cx, obj),
             Condition::Exposed(globals) => is_exposed_in(global, globals),
-            Condition::SecureContext() => is_secure_context(cx),
+            Condition::SecureContext() => is_secure_context::<D>(cx),
             Condition::Satisfied => true,
         }
     }
diff --git a/components/script_bindings/import.rs b/components/script_bindings/import.rs
new file mode 100644
index 00000000000..25bd6c38669
--- /dev/null
+++ b/components/script_bindings/import.rs
@@ -0,0 +1,138 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+pub(crate) mod base {
+    pub(crate) use std::ptr;
+    pub(crate) use std::rc::Rc;
+
+    pub(crate) use js::conversions::{
+        ConversionBehavior, ConversionResult, FromJSValConvertible, ToJSValConvertible,
+    };
+    pub(crate) use js::error::throw_type_error;
+    pub(crate) use js::jsapi::{
+        HandleValue as RawHandleValue, HandleValueArray, Heap, IsCallable, JS_NewObject, JSContext,
+        JSObject,
+    };
+    pub(crate) use js::jsval::{JSVal, NullValue, ObjectOrNullValue, ObjectValue, UndefinedValue};
+    pub(crate) use js::panic::maybe_resume_unwind;
+    pub(crate) use js::rust::wrappers::Call;
+    pub(crate) use js::rust::{HandleObject, HandleValue, MutableHandleObject, MutableHandleValue};
+
+    pub(crate) use crate::callback::{
+        CallSetup, CallbackContainer, CallbackFunction, CallbackInterface, CallbackObject,
+        ExceptionHandling, ThisReflector, wrap_call_this_value,
+    };
+    pub(crate) use crate::codegen::DomTypes::DomTypes;
+    pub(crate) use crate::codegen::GenericUnionTypes;
+    pub(crate) use crate::conversions::{StringificationBehavior, root_from_handlevalue};
+    pub(crate) use crate::error::Error::JSFailed;
+    pub(crate) use crate::error::Fallible;
+    pub(crate) use crate::interfaces::*;
+    pub(crate) use crate::lock::ThreadUnsafeOnceLock;
+    pub(crate) use crate::num::Finite;
+    pub(crate) use crate::proxyhandler::CrossOriginProperties;
+    pub(crate) use crate::reflector::{DomGlobalGeneric, DomObject};
+    pub(crate) use crate::root::DomRoot;
+    pub(crate) use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
+    pub(crate) use crate::str::{ByteString, DOMString, USVString};
+    pub(crate) use crate::trace::RootedTraceableBox;
+    pub(crate) use crate::utils::{get_dictionary_property, set_dictionary_property};
+}
+
+pub(crate) mod module {
+    pub(crate) use std::cmp;
+    pub(crate) use std::ffi::CString;
+    pub(crate) use std::ptr::NonNull;
+
+    pub(crate) use js::conversions::ToJSValConvertible;
+    pub(crate) use js::glue::{
+        CreateProxyHandler, GetProxyReservedSlot, JS_GetReservedSlot, ProxyTraps,
+        SetProxyReservedSlot,
+    };
+    pub(crate) use js::jsapi::{
+        __BindgenBitfieldUnit, CallArgs, GCContext, GetRealmErrorPrototype,
+        GetRealmFunctionPrototype, GetRealmIteratorPrototype, GetRealmObjectPrototype,
+        GetWellKnownSymbol, Handle as RawHandle, HandleId as RawHandleId,
+        HandleObject as RawHandleObject, JS_AtomizeAndPinString, JS_ForwardGetPropertyTo,
+        JS_GetPropertyDescriptorById, JS_HasPropertyById, JS_NewPlainObject, JS_SetReservedSlot,
+        JSAutoRealm, JSCLASS_FOREGROUND_FINALIZE, JSCLASS_RESERVED_SLOTS_SHIFT, JSClass,
+        JSClassOps, JSFunctionSpec, JSITER_HIDDEN, JSITER_OWNONLY, JSITER_SYMBOLS,
+        JSJitGetterCallArgs, JSJitInfo, JSJitInfo__bindgen_ty_1, JSJitInfo__bindgen_ty_2,
+        JSJitInfo__bindgen_ty_3, JSJitInfo_AliasSet, JSJitInfo_ArgType, JSJitInfo_OpType,
+        JSJitMethodCallArgs, JSJitSetterCallArgs, JSNativeWrapper, JSPROP_ENUMERATE,
+        JSPROP_PERMANENT, JSPROP_READONLY, JSPropertySpec, JSPropertySpec_Accessor,
+        JSPropertySpec_AccessorsOrValue, JSPropertySpec_AccessorsOrValue_Accessors,
+        JSPropertySpec_Kind, JSPropertySpec_Name, JSPropertySpec_ValueWrapper,
+        JSPropertySpec_ValueWrapper__bindgen_ty_1, JSPropertySpec_ValueWrapper_Type, JSTracer,
+        JSTypedMethodJitInfo, JSValueType, MutableHandle as RawMutableHandle,
+        MutableHandleIdVector as RawMutableHandleIdVector,
+        MutableHandleObject as RawMutableHandleObject, MutableHandleValue as RawMutableHandleValue,
+        ObjectOpResult, PropertyDescriptor, SymbolCode, UndefinedHandleValue, jsid,
+    };
+    pub(crate) use js::jsval::PrivateValue;
+    pub(crate) use js::panic::wrap_panic;
+    pub(crate) use js::rust::wrappers::{
+        AppendToIdVector, Call, GetPropertyKeys, JS_CopyOwnPropertiesAndPrivateFields,
+        JS_DefineProperty, JS_DefinePropertyById2, JS_GetProperty,
+        JS_InitializePropertiesFromCompatibleNativeObject, JS_NewObjectWithGivenProto,
+        JS_NewObjectWithoutMetadata, JS_SetImmutablePrototype, JS_SetProperty, JS_SetPrototype,
+        JS_WrapObject, NewProxyObject, RUST_INTERNED_STRING_TO_JSID, RUST_SYMBOL_TO_JSID,
+        int_to_jsid,
+    };
+    pub(crate) use js::rust::{
+        CustomAutoRooterGuard, GCMethods, Handle, MutableHandle, get_context_realm,
+        get_object_class, get_object_realm,
+    };
+    pub(crate) use js::typedarray::{
+        ArrayBuffer, ArrayBufferView, Float32Array, Float64Array, Uint8Array, Uint8ClampedArray,
+    };
+    pub(crate) use js::{
+        JS_CALLEE, JSCLASS_GLOBAL_SLOT_COUNT, JSCLASS_IS_DOMJSCLASS, JSCLASS_IS_GLOBAL,
+        JSCLASS_RESERVED_SLOTS_MASK, typedarray,
+    };
+    pub(crate) use servo_config::pref;
+
+    pub(crate) use super::base::*;
+    pub(crate) use crate::codegen::Globals::Globals;
+    pub(crate) use crate::codegen::{PrototypeList, RegisterBindings};
+    pub(crate) use crate::constant::{ConstantSpec, ConstantVal};
+    pub(crate) use crate::constructor::call_default_constructor;
+    pub(crate) use crate::conversions::{
+        DOM_OBJECT_SLOT, StringificationBehavior, is_array_like, jsid_to_string,
+        native_from_handlevalue, native_from_object_static,
+    };
+    pub(crate) use crate::error::{Error, ErrorResult};
+    pub(crate) use crate::finalize::{
+        finalize_common, finalize_global, finalize_weak_referenceable,
+    };
+    pub(crate) use crate::guard::{Condition, Guard};
+    pub(crate) use crate::inheritance::Castable;
+    pub(crate) use crate::interface::{
+        ConstructorClassHook, InterfaceConstructorBehavior, NonCallbackInterfaceObjectClass,
+        ProtoOrIfaceIndex, create_callback_interface_object, create_global_object,
+        create_interface_prototype_object, create_named_constructors,
+        create_noncallback_interface_object, define_dom_interface, define_guarded_methods,
+        define_guarded_properties, get_per_interface_object_handle, is_exposed_in,
+    };
+    pub(crate) use crate::iterable::{Iterable, IterableIterator, IteratorType};
+    pub(crate) use crate::like::{Maplike, Setlike};
+    pub(crate) use crate::mem::malloc_size_of_including_raw_self;
+    pub(crate) use crate::namespace::{NamespaceObjectClass, create_namespace_object};
+    pub(crate) use crate::proxyhandler::{
+        ensure_expando_object, get_expando_object, set_property_descriptor,
+    };
+    pub(crate) use crate::realms::{AlreadyInRealm, InRealm};
+    pub(crate) use crate::root::{Dom, DomSlice, MaybeUnreflectedDom, Root};
+    pub(crate) use crate::script_runtime::CanGc;
+    pub(crate) use crate::utils::{
+        AsVoidPtr, DOM_PROTO_UNFORGEABLE_HOLDER_SLOT, DOMClass, DOMJSClass, JSCLASS_DOM_GLOBAL,
+        ProtoOrIfaceArray, enumerate_global, enumerate_window, exception_to_promise,
+        generic_getter, generic_lenient_getter, generic_lenient_setter, generic_method,
+        generic_setter, generic_static_promise_method, get_array_index_from_id,
+        get_property_on_prototype, has_property_on_prototype, may_resolve_global,
+        may_resolve_window, resolve_global, resolve_window, trace_global,
+    };
+    pub(crate) use crate::weakref::DOM_WEAK_SLOT;
+    pub(crate) use crate::{JSTraceable, proxyhandler};
+}
diff --git a/components/script_bindings/inheritance.rs b/components/script_bindings/inheritance.rs
index 5ddbf072215..baa70c81395 100644
--- a/components/script_bindings/inheritance.rs
+++ b/components/script_bindings/inheritance.rs
@@ -51,3 +51,10 @@ pub trait Castable: IDLInterface + DomObject + Sized {
         }
     }
 }
+
+#[allow(missing_docs)]
+pub trait HasParent {
+    #[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
+    type Parent;
+    fn as_parent(&self) -> &Self::Parent;
+}
diff --git a/components/script/dom/bindings/interface.rs b/components/script_bindings/interface.rs
similarity index 92%
rename from components/script/dom/bindings/interface.rs
rename to components/script_bindings/interface.rs
index 2b6cc27c1f9..08ee0a4f420 100644
--- a/components/script/dom/bindings/interface.rs
+++ b/components/script_bindings/interface.rs
@@ -32,20 +32,19 @@ use js::rust::{
     HandleObject, HandleValue, MutableHandleObject, RealmOptions, define_methods,
     define_properties, get_object_class, is_dom_class, maybe_wrap_object,
 };
-use script_bindings::constant::{ConstantSpec, define_constants};
 use servo_url::MutableOrigin;
 
-use crate::dom::bindings::codegen::InterfaceObjectMap::Globals;
-use crate::dom::bindings::codegen::PrototypeList;
-use crate::dom::bindings::conversions::{DOM_OBJECT_SLOT, get_dom_class};
-use crate::dom::bindings::guard::Guard;
-use crate::dom::bindings::principals::ServoJSPrincipals;
-use crate::dom::bindings::utils::{
+use crate::DomTypes;
+use crate::codegen::Globals::Globals;
+use crate::codegen::PrototypeList;
+use crate::constant::{ConstantSpec, define_constants};
+use crate::conversions::{DOM_OBJECT_SLOT, get_dom_class};
+use crate::guard::Guard;
+use crate::principals::ServoJSPrincipals;
+use crate::script_runtime::JSContext as SafeJSContext;
+use crate::utils::{
     DOM_PROTOTYPE_SLOT, DOMJSClass, JSCLASS_DOM_GLOBAL, ProtoOrIfaceArray, get_proto_or_iface_array,
 };
-use crate::dom::globalscope::GlobalScope;
-use crate::realms::{AlreadyInRealm, InRealm};
-use crate::script_runtime::JSContext as SafeJSContext;
 
 /// The class of a non-callback interface object.
 #[derive(Clone, Copy)]
@@ -136,7 +135,7 @@ impl InterfaceConstructorBehavior {
 pub(crate) type TraceHook = unsafe extern "C" fn(trc: *mut JSTracer, obj: *mut JSObject);
 
 /// Create a global object with the given class.
-pub(crate) unsafe fn create_global_object(
+pub(crate) unsafe fn create_global_object<D: DomTypes>(
     cx: SafeJSContext,
     class: &'static JSClass,
     private: *const libc::c_void,
@@ -151,7 +150,7 @@ pub(crate) unsafe fn create_global_object(
     options.creationOptions_.sharedMemoryAndAtomics_ = false;
     select_compartment(cx, &mut options);
 
-    let principal = ServoJSPrincipals::new(origin);
+    let principal = ServoJSPrincipals::new::<D>(origin);
 
     rval.set(JS_NewGlobalObject(
         *cx,
@@ -213,7 +212,7 @@ fn select_compartment(cx: SafeJSContext, options: &mut RealmOptions) {
 }
 
 /// Create and define the interface object of a callback interface.
-pub(crate) fn create_callback_interface_object(
+pub(crate) fn create_callback_interface_object<D: DomTypes>(
     cx: SafeJSContext,
     global: HandleObject,
     constants: &[Guard<&[ConstantSpec]>],
@@ -225,14 +224,14 @@ pub(crate) fn create_callback_interface_object(
         rval.set(JS_NewObject(*cx, ptr::null()));
     }
     assert!(!rval.is_null());
-    define_guarded_constants(cx, rval.handle(), constants, global);
+    define_guarded_constants::<D>(cx, rval.handle(), constants, global);
     define_name(cx, rval.handle(), name);
     define_on_global_object(cx, global, name, rval.handle());
 }
 
 /// Create the interface prototype object of a non-callback interface.
 #[allow(clippy::too_many_arguments)]
-pub(crate) fn create_interface_prototype_object(
+pub(crate) fn create_interface_prototype_object<D: DomTypes>(
     cx: SafeJSContext,
     global: HandleObject,
     proto: HandleObject,
@@ -243,7 +242,7 @@ pub(crate) fn create_interface_prototype_object(
     unscopable_names: &[&CStr],
     mut rval: MutableHandleObject,
 ) {
-    create_object(
+    create_object::<D>(
         cx,
         global,
         proto,
@@ -277,7 +276,7 @@ pub(crate) fn create_interface_prototype_object(
 
 /// Create and define the interface object of a non-callback interface.
 #[allow(clippy::too_many_arguments)]
-pub(crate) fn create_noncallback_interface_object(
+pub(crate) fn create_noncallback_interface_object<D: DomTypes>(
     cx: SafeJSContext,
     global: HandleObject,
     proto: HandleObject,
@@ -291,7 +290,7 @@ pub(crate) fn create_noncallback_interface_object(
     legacy_window_alias_names: &[&CStr],
     mut rval: MutableHandleObject,
 ) {
-    create_object(
+    create_object::<D>(
         cx,
         global,
         proto,
@@ -350,7 +349,7 @@ pub(crate) fn create_named_constructors(
 
 /// Create a new object with a unique type.
 #[allow(clippy::too_many_arguments)]
-pub(crate) fn create_object(
+pub(crate) fn create_object<D: DomTypes>(
     cx: SafeJSContext,
     global: HandleObject,
     proto: HandleObject,
@@ -364,34 +363,34 @@ pub(crate) fn create_object(
         rval.set(JS_NewObjectWithGivenProto(*cx, class, proto));
     }
     assert!(!rval.is_null());
-    define_guarded_methods(cx, rval.handle(), methods, global);
-    define_guarded_properties(cx, rval.handle(), properties, global);
-    define_guarded_constants(cx, rval.handle(), constants, global);
+    define_guarded_methods::<D>(cx, rval.handle(), methods, global);
+    define_guarded_properties::<D>(cx, rval.handle(), properties, global);
+    define_guarded_constants::<D>(cx, rval.handle(), constants, global);
 }
 
 /// Conditionally define constants on an object.
-pub(crate) fn define_guarded_constants(
+pub(crate) fn define_guarded_constants<D: DomTypes>(
     cx: SafeJSContext,
     obj: HandleObject,
     constants: &[Guard<&[ConstantSpec]>],
     global: HandleObject,
 ) {
     for guard in constants {
-        if let Some(specs) = guard.expose(cx, obj, global) {
+        if let Some(specs) = guard.expose::<D>(cx, obj, global) {
             define_constants(cx, obj, specs);
         }
     }
 }
 
 /// Conditionally define methods on an object.
-pub(crate) fn define_guarded_methods(
+pub(crate) fn define_guarded_methods<D: DomTypes>(
     cx: SafeJSContext,
     obj: HandleObject,
     methods: &[Guard<&'static [JSFunctionSpec]>],
     global: HandleObject,
 ) {
     for guard in methods {
-        if let Some(specs) = guard.expose(cx, obj, global) {
+        if let Some(specs) = guard.expose::<D>(cx, obj, global) {
             unsafe {
                 define_methods(*cx, obj, specs).unwrap();
             }
@@ -400,14 +399,14 @@ pub(crate) fn define_guarded_methods(
 }
 
 /// Conditionally define properties on an object.
-pub(crate) fn define_guarded_properties(
+pub(crate) fn define_guarded_properties<D: DomTypes>(
     cx: SafeJSContext,
     obj: HandleObject,
     properties: &[Guard<&'static [JSPropertySpec]>],
     global: HandleObject,
 ) {
     for guard in properties {
-        if let Some(specs) = guard.expose(cx, obj, global) {
+        if let Some(specs) = guard.expose::<D>(cx, obj, global) {
             unsafe {
                 define_properties(*cx, obj, specs).unwrap();
             }
@@ -425,16 +424,6 @@ pub(crate) fn is_exposed_in(object: HandleObject, globals: Globals) -> bool {
     }
 }
 
-/// The navigator.servo api is only exposed to about: pages except about:blank
-pub(crate) fn is_servo_internal(cx: SafeJSContext, _object: HandleObject) -> bool {
-    unsafe {
-        let in_realm_proof = AlreadyInRealm::assert_for_cx(cx);
-        let global_scope = GlobalScope::from_context(*cx, InRealm::Already(&in_realm_proof));
-        let url = global_scope.get_url();
-        url.scheme() == "about" && url.as_str() != "about:blank"
-    }
-}
-
 /// Define a property with a given name on the global object. Should be called
 /// through the resolve hook.
 pub(crate) fn define_on_global_object(
@@ -610,7 +599,8 @@ fn get_proto_id_for_new_target(new_target: HandleObject) -> Option<PrototypeList
     }
 }
 
-pub(crate) fn get_desired_proto(
+#[allow(clippy::result_unit_err)]
+pub fn get_desired_proto(
     cx: SafeJSContext,
     args: &CallArgs,
     proto_id: PrototypeList::ID,
@@ -641,7 +631,7 @@ pub(crate) fn get_desired_proto(
             // We might still have a cross-compartment wrapper for a known DOM
             // constructor.  CheckedUnwrapStatic is fine here, because we're looking for
             // DOM constructors and those can't be cross-origin objects.
-            *new_target = CheckedUnwrapStatic(*new_target);
+            new_target.set(CheckedUnwrapStatic(*new_target));
             if !new_target.is_null() && *new_target != *original_new_target {
                 get_proto_id_for_new_target(new_target.handle())
             } else {
diff --git a/components/script_bindings/interfaces.rs b/components/script_bindings/interfaces.rs
new file mode 100644
index 00000000000..58917283170
--- /dev/null
+++ b/components/script_bindings/interfaces.rs
@@ -0,0 +1,113 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::cell::RefCell;
+use std::thread::LocalKey;
+
+use js::glue::JSPrincipalsCallbacks;
+use js::jsapi::{CallArgs, HandleObject as RawHandleObject, JSContext as RawJSContext, JSObject};
+use js::rust::{HandleObject, MutableHandleObject};
+use servo_url::{MutableOrigin, ServoUrl};
+
+use crate::DomTypes;
+use crate::codegen::PrototypeList;
+use crate::conversions::DerivedFrom;
+use crate::error::Error;
+use crate::realms::InRealm;
+use crate::reflector::{DomObject, DomObjectWrap};
+use crate::root::DomRoot;
+use crate::script_runtime::{CanGc, JSContext};
+use crate::settings_stack::StackEntry;
+use crate::utils::ProtoOrIfaceArray;
+
+/// Operations that can be invoked for a WebIDL interface against
+/// a global object.
+///
+/// <https://github.com/mozilla/gecko-dev/blob/3fd619f47/dom/bindings/WebIDLGlobalNameHash.h#L24>
+pub struct Interface {
+    /// Define the JS object for this interface on the given global.
+    pub define: fn(JSContext, HandleObject),
+    /// Returns true if this interface's conditions are met for the given global.
+    pub enabled: fn(JSContext, HandleObject) -> bool,
+}
+
+/// Operations that must be invoked from the generated bindings.
+pub trait DomHelpers<D: DomTypes> {
+    fn throw_dom_exception(cx: JSContext, global: &D::GlobalScope, result: Error, can_gc: CanGc);
+
+    fn call_html_constructor<T: DerivedFrom<D::Element> + DomObject>(
+        cx: JSContext,
+        args: &CallArgs,
+        global: &D::GlobalScope,
+        proto_id: PrototypeList::ID,
+        creator: unsafe fn(JSContext, HandleObject, *mut ProtoOrIfaceArray),
+        can_gc: CanGc,
+    ) -> bool;
+
+    fn settings_stack() -> &'static LocalKey<RefCell<Vec<StackEntry<D>>>>;
+
+    fn principals_callbacks() -> &'static JSPrincipalsCallbacks;
+
+    fn is_platform_object_same_origin(cx: JSContext, obj: RawHandleObject) -> bool;
+
+    fn interface_map() -> &'static phf::Map<&'static [u8], Interface>;
+
+    fn push_new_element_queue();
+    fn pop_current_element_queue(can_gc: CanGc);
+
+    fn reflect_dom_object<T, U>(obj: Box<T>, global: &U, can_gc: CanGc) -> DomRoot<T>
+    where
+        T: DomObject + DomObjectWrap<D>,
+        U: DerivedFrom<D::GlobalScope>;
+
+    fn report_pending_exception(cx: JSContext, dispatch_event: bool, realm: InRealm, can_gc: CanGc);
+}
+
+/// Operations that must be invoked from the generated bindings.
+#[allow(unsafe_code)]
+pub trait GlobalScopeHelpers<D: DomTypes> {
+    /// # Safety
+    /// `cx` must point to a valid, non-null RawJSContext.
+    unsafe fn from_context(cx: *mut RawJSContext, realm: InRealm) -> DomRoot<D::GlobalScope>;
+    fn get_cx() -> JSContext;
+    /// # Safety
+    /// `obj` must point to a valid, non-null JSObject.
+    unsafe fn from_object(obj: *mut JSObject) -> DomRoot<D::GlobalScope>;
+    fn from_reflector(reflector: &impl DomObject, realm: InRealm) -> DomRoot<D::GlobalScope>;
+
+    fn origin(&self) -> &MutableOrigin;
+
+    fn incumbent() -> Option<DomRoot<D::GlobalScope>>;
+
+    fn perform_a_microtask_checkpoint(&self, can_gc: CanGc);
+
+    fn get_url(&self) -> ServoUrl;
+
+    fn is_secure_context(&self) -> bool;
+}
+
+pub trait DocumentHelpers {
+    fn ensure_safe_to_run_script_or_layout(&self);
+}
+
+pub trait ServoInternalsHelpers {
+    fn is_servo_internal(cx: JSContext, global: HandleObject) -> bool;
+}
+
+pub trait TestBindingHelpers {
+    fn condition_satisfied(cx: JSContext, global: HandleObject) -> bool;
+    fn condition_unsatisfied(cx: JSContext, global: HandleObject) -> bool;
+}
+
+pub trait WebGL2RenderingContextHelpers {
+    fn is_webgl2_enabled(cx: JSContext, global: HandleObject) -> bool;
+}
+
+pub trait WindowHelpers {
+    fn create_named_properties_object(
+        cx: JSContext,
+        proto: HandleObject,
+        object: MutableHandleObject,
+    );
+}
diff --git a/components/script_bindings/iterable.rs b/components/script_bindings/iterable.rs
index 61cd4540bae..03efd8a4856 100644
--- a/components/script_bindings/iterable.rs
+++ b/components/script_bindings/iterable.rs
@@ -2,13 +2,36 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use js::conversions::ToJSValConvertible;
+//! Implementation of `iterable<...>` and `iterable<..., ...>` WebIDL declarations.
 
+use std::cell::Cell;
+use std::marker::PhantomData;
+use std::ptr;
+use std::ptr::NonNull;
+
+use dom_struct::dom_struct;
+use js::conversions::ToJSValConvertible;
+use js::jsapi::{Heap, JSObject};
+use js::jsval::UndefinedValue;
+use js::rust::{HandleObject, HandleValue, MutableHandleObject};
+
+use crate::codegen::GenericBindings::IterableIteratorBinding::{
+    IterableKeyAndValueResult, IterableKeyOrValueResult,
+};
+use crate::conversions::IDLInterface;
+use crate::error::Fallible;
+use crate::interfaces::DomHelpers;
+use crate::realms::InRealm;
+use crate::reflector::{DomGlobalGeneric, DomObjectIteratorWrap, DomObjectWrap, Reflector};
+use crate::root::{Dom, DomRoot, Root};
+use crate::script_runtime::{CanGc, JSContext};
+use crate::trace::{NoTrace, RootedTraceableBox};
 use crate::utils::DOMClass;
+use crate::{DomTypes, JSTraceable};
 
 /// The values that an iterator will iterate over.
 #[derive(JSTraceable, MallocSizeOf)]
-pub enum IteratorType {
+pub(crate) enum IteratorType {
     /// The keys of the iterable object.
     Keys,
     /// The values of the iterable object.
@@ -38,3 +61,148 @@ pub trait Iterable {
 pub trait IteratorDerives {
     fn derives(class: &'static DOMClass) -> bool;
 }
+
+/// An iterator over the iterable entries of a given DOM interface.
+#[dom_struct]
+pub struct IterableIterator<
+    D: DomTypes,
+    T: DomObjectIteratorWrap<D> + JSTraceable + Iterable + DomGlobalGeneric<D>,
+> {
+    reflector: Reflector,
+    iterable: Dom<T>,
+    type_: IteratorType,
+    index: Cell<u32>,
+    _marker: NoTrace<PhantomData<D>>,
+}
+
+impl<D: DomTypes, T: DomObjectIteratorWrap<D> + JSTraceable + Iterable> IterableIterator<D, T> {
+    pub fn global_(&self, realm: InRealm) -> DomRoot<D::GlobalScope> {
+        <Self as DomGlobalGeneric<D>>::global_(self, realm)
+    }
+}
+
+impl<
+    D: DomTypes,
+    T: DomObjectIteratorWrap<D>
+        + JSTraceable
+        + Iterable
+        + DomGlobalGeneric<D>
+        + IDLInterface
+        + IteratorDerives,
+> IDLInterface for IterableIterator<D, T>
+{
+    fn derives(class: &'static DOMClass) -> bool {
+        <T as IteratorDerives>::derives(class)
+    }
+}
+
+impl<D: DomTypes, T: DomObjectIteratorWrap<D> + JSTraceable + Iterable + DomGlobalGeneric<D>>
+    IterableIterator<D, T>
+{
+    /// Create a new iterator instance for the provided iterable DOM interface.
+    pub(crate) fn new(iterable: &T, type_: IteratorType, realm: InRealm) -> DomRoot<Self> {
+        let iterator = Box::new(IterableIterator {
+            reflector: Reflector::new(),
+            type_,
+            iterable: Dom::from_ref(iterable),
+            index: Cell::new(0),
+            _marker: NoTrace(PhantomData),
+        });
+        <D as DomHelpers<D>>::reflect_dom_object(iterator, &*iterable.global_(realm), CanGc::note())
+    }
+
+    /// Return the next value from the iterable object.
+    #[allow(non_snake_case)]
+    pub fn Next(&self, cx: JSContext) -> Fallible<NonNull<JSObject>> {
+        let index = self.index.get();
+        rooted!(in(*cx) let mut value = UndefinedValue());
+        rooted!(in(*cx) let mut rval = ptr::null_mut::<JSObject>());
+        let result = if index >= self.iterable.get_iterable_length() {
+            dict_return(cx, rval.handle_mut(), true, value.handle())
+        } else {
+            match self.type_ {
+                IteratorType::Keys => {
+                    unsafe {
+                        self.iterable
+                            .get_key_at_index(index)
+                            .to_jsval(*cx, value.handle_mut());
+                    }
+                    dict_return(cx, rval.handle_mut(), false, value.handle())
+                },
+                IteratorType::Values => {
+                    unsafe {
+                        self.iterable
+                            .get_value_at_index(index)
+                            .to_jsval(*cx, value.handle_mut());
+                    }
+                    dict_return(cx, rval.handle_mut(), false, value.handle())
+                },
+                IteratorType::Entries => {
+                    rooted!(in(*cx) let mut key = UndefinedValue());
+                    unsafe {
+                        self.iterable
+                            .get_key_at_index(index)
+                            .to_jsval(*cx, key.handle_mut());
+                        self.iterable
+                            .get_value_at_index(index)
+                            .to_jsval(*cx, value.handle_mut());
+                    }
+                    key_and_value_return(cx, rval.handle_mut(), key.handle(), value.handle())
+                },
+            }
+        };
+        self.index.set(index + 1);
+        result.map(|_| NonNull::new(rval.get()).expect("got a null pointer"))
+    }
+}
+
+impl<D: DomTypes, T: DomObjectIteratorWrap<D> + JSTraceable + Iterable + DomGlobalGeneric<D>>
+    DomObjectWrap<D> for IterableIterator<D, T>
+{
+    const WRAP: unsafe fn(
+        JSContext,
+        &D::GlobalScope,
+        Option<HandleObject>,
+        Box<Self>,
+        CanGc,
+    ) -> Root<Dom<Self>> = T::ITER_WRAP;
+}
+
+fn dict_return(
+    cx: JSContext,
+    mut result: MutableHandleObject,
+    done: bool,
+    value: HandleValue,
+) -> Fallible<()> {
+    let mut dict = IterableKeyOrValueResult::empty();
+    dict.done = done;
+    dict.value.set(value.get());
+    rooted!(in(*cx) let mut dict_value = UndefinedValue());
+    unsafe {
+        dict.to_jsval(*cx, dict_value.handle_mut());
+    }
+    result.set(dict_value.to_object());
+    Ok(())
+}
+
+fn key_and_value_return(
+    cx: JSContext,
+    mut result: MutableHandleObject,
+    key: HandleValue,
+    value: HandleValue,
+) -> Fallible<()> {
+    let mut dict = IterableKeyAndValueResult::empty();
+    dict.done = false;
+    dict.value = Some(
+        vec![key, value]
+            .into_iter()
+            .map(|handle| RootedTraceableBox::from_box(Heap::boxed(handle.get())))
+            .collect(),
+    );
+    rooted!(in(*cx) let mut dict_value = UndefinedValue());
+    unsafe {
+        dict.to_jsval(*cx, dict_value.handle_mut());
+    }
+    result.set(dict_value.to_object());
+    Ok(())
+}
diff --git a/components/script_bindings/lib.rs b/components/script_bindings/lib.rs
index e857a2289f8..83dc9fbd1c8 100644
--- a/components/script_bindings/lib.rs
+++ b/components/script_bindings/lib.rs
@@ -10,6 +10,8 @@
 #![cfg_attr(any(doc, clippy), allow(unknown_lints))]
 #![deny(crown_is_not_used)]
 
+#[macro_use]
+extern crate js;
 #[macro_use]
 extern crate jstraceable_derive;
 #[macro_use]
@@ -18,16 +20,30 @@ extern crate log;
 extern crate malloc_size_of_derive;
 
 pub mod callback;
-pub mod constant;
+mod constant;
+mod constructor;
 pub mod conversions;
 pub mod error;
+mod finalize;
+mod guard;
+mod import;
 pub mod inheritance;
+pub mod interface;
+pub mod interfaces;
 pub mod iterable;
 pub mod like;
+mod lock;
+mod mem;
+mod namespace;
+pub mod num;
+pub mod principals;
+pub mod proxyhandler;
+pub mod realms;
 pub mod record;
 pub mod reflector;
 pub mod root;
 pub mod script_runtime;
+pub mod settings_stack;
 pub mod str;
 pub mod trace;
 pub mod utils;
@@ -46,6 +62,32 @@ pub mod codegen {
     pub mod PrototypeList {
         include!(concat!(env!("OUT_DIR"), "/PrototypeList.rs"));
     }
+    pub(crate) mod DomTypes {
+        include!(concat!(env!("OUT_DIR"), "/DomTypes.rs"));
+    }
+    #[allow(
+        dead_code,
+        clippy::extra_unused_type_parameters,
+        clippy::missing_safety_doc,
+        clippy::result_unit_err
+    )]
+    pub mod GenericBindings {
+        include!(concat!(env!("OUT_DIR"), "/Bindings/mod.rs"));
+    }
+    #[allow(
+        non_camel_case_types,
+        unused_imports,
+        unused_variables,
+        clippy::large_enum_variant,
+        clippy::upper_case_acronyms,
+        clippy::enum_variant_names
+    )]
+    pub mod GenericUnionTypes {
+        include!(concat!(env!("OUT_DIR"), "/GenericUnionTypes.rs"));
+    }
+    pub mod RegisterBindings {
+        include!(concat!(env!("OUT_DIR"), "/RegisterBindings.rs"));
+    }
 }
 
 // These trait exports are public, because they are used in the DOM bindings.
@@ -53,4 +95,6 @@ pub mod codegen {
 // it is useful that they are accessible at the root of the crate.
 pub(crate) use js::gc::Traceable as JSTraceable;
 
+pub use crate::codegen::DomTypes::DomTypes;
+pub(crate) use crate::reflector::{DomObject, MutDomObject, Reflector};
 pub(crate) use crate::trace::CustomTraceable;
diff --git a/components/script_bindings/lock.rs b/components/script_bindings/lock.rs
new file mode 100644
index 00000000000..e8cde2e4087
--- /dev/null
+++ b/components/script_bindings/lock.rs
@@ -0,0 +1,37 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::sync::OnceLock;
+
+/// A OnceLock wrapping a type that is not considered threadsafe by the Rust compiler, but
+/// will be used in a threadsafe manner (it will not be mutated, after being initialized).
+///
+/// This is needed to allow using JS API types (which usually involve raw pointers) in static initializers,
+/// when Servo guarantees through the use of OnceLock that only one thread will ever initialize
+/// the value.
+pub struct ThreadUnsafeOnceLock<T>(OnceLock<T>);
+
+impl<T> ThreadUnsafeOnceLock<T> {
+    #[allow(clippy::new_without_default)]
+    pub const fn new() -> Self {
+        Self(OnceLock::new())
+    }
+
+    /// Initialize the value inside this lock. Panics if the lock has been previously initialized.
+    pub fn set(&self, val: T) {
+        assert!(self.0.set(val).is_ok());
+    }
+
+    /// Get a reference to the value inside this lock. Panics if the lock has not been initialized.
+    ///
+    /// # Safety
+    ///   The caller must ensure that it does not mutate value contained inside this lock
+    ///   (using interior mutability).
+    pub unsafe fn get(&self) -> &T {
+        self.0.get().unwrap()
+    }
+}
+
+unsafe impl<T> Sync for ThreadUnsafeOnceLock<T> {}
+unsafe impl<T> Send for ThreadUnsafeOnceLock<T> {}
diff --git a/components/script/mem.rs b/components/script_bindings/mem.rs
similarity index 100%
rename from components/script/mem.rs
rename to components/script_bindings/mem.rs
diff --git a/components/script/dom/bindings/namespace.rs b/components/script_bindings/namespace.rs
similarity index 87%
rename from components/script/dom/bindings/namespace.rs
rename to components/script_bindings/namespace.rs
index 46079a787c9..1ed5e06915b 100644
--- a/components/script/dom/bindings/namespace.rs
+++ b/components/script_bindings/namespace.rs
@@ -9,10 +9,11 @@ use std::ptr;
 
 use js::jsapi::{JSClass, JSFunctionSpec};
 use js::rust::{HandleObject, MutableHandleObject};
-use script_bindings::constant::ConstantSpec;
 
-use crate::dom::bindings::guard::Guard;
-use crate::dom::bindings::interface::{create_object, define_on_global_object};
+use crate::DomTypes;
+use crate::constant::ConstantSpec;
+use crate::guard::Guard;
+use crate::interface::{create_object, define_on_global_object};
 use crate::script_runtime::JSContext;
 
 /// The class of a namespace object.
@@ -37,7 +38,7 @@ impl NamespaceObjectClass {
 
 /// Create a new namespace object.
 #[allow(clippy::too_many_arguments)]
-pub(crate) fn create_namespace_object(
+pub(crate) fn create_namespace_object<D: DomTypes>(
     cx: JSContext,
     global: HandleObject,
     proto: HandleObject,
@@ -47,7 +48,7 @@ pub(crate) fn create_namespace_object(
     name: &CStr,
     mut rval: MutableHandleObject,
 ) {
-    create_object(
+    create_object::<D>(
         cx,
         global,
         proto,
diff --git a/components/script/dom/bindings/num.rs b/components/script_bindings/num.rs
similarity index 90%
rename from components/script/dom/bindings/num.rs
rename to components/script_bindings/num.rs
index 59b89a29e3e..58b12f6cb7f 100644
--- a/components/script/dom/bindings/num.rs
+++ b/components/script_bindings/num.rs
@@ -12,11 +12,11 @@ use num_traits::Float;
 
 /// Encapsulates the IDL restricted float type.
 #[derive(Clone, Copy, Eq, JSTraceable, PartialEq)]
-pub(crate) struct Finite<T: Float>(T);
+pub struct Finite<T: Float>(T);
 
 impl<T: Float> Finite<T> {
     /// Create a new `Finite<T: Float>` safely.
-    pub(crate) fn new(value: T) -> Option<Finite<T>> {
+    pub fn new(value: T) -> Option<Finite<T>> {
         if value.is_finite() {
             Some(Finite(value))
         } else {
@@ -26,7 +26,7 @@ impl<T: Float> Finite<T> {
 
     /// Create a new `Finite<T: Float>`.
     #[inline]
-    pub(crate) fn wrap(value: T) -> Finite<T> {
+    pub fn wrap(value: T) -> Finite<T> {
         assert!(
             value.is_finite(),
             "Finite<T> doesn't encapsulate unrestricted value."
diff --git a/components/script_bindings/principals.rs b/components/script_bindings/principals.rs
new file mode 100644
index 00000000000..6b30f71fb7e
--- /dev/null
+++ b/components/script_bindings/principals.rs
@@ -0,0 +1,128 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::marker::PhantomData;
+use std::mem::ManuallyDrop;
+use std::ops::Deref;
+use std::ptr::NonNull;
+
+use js::glue::{CreateRustJSPrincipals, GetRustJSPrincipalsPrivate};
+use js::jsapi::{JS_DropPrincipals, JS_HoldPrincipals, JSPrincipals};
+use js::rust::Runtime;
+use servo_url::MutableOrigin;
+
+use crate::DomTypes;
+use crate::interfaces::DomHelpers;
+
+/// An owned reference to Servo's `JSPrincipals` instance.
+#[repr(transparent)]
+pub struct ServoJSPrincipals(NonNull<JSPrincipals>);
+
+impl ServoJSPrincipals {
+    pub fn new<D: DomTypes>(origin: &MutableOrigin) -> Self {
+        unsafe {
+            let private: Box<MutableOrigin> = Box::new(origin.clone());
+            let raw = CreateRustJSPrincipals(
+                <D as DomHelpers<D>>::principals_callbacks(),
+                Box::into_raw(private) as _,
+            );
+            // The created `JSPrincipals` object has an initial reference
+            // count of zero, so the following code will set it to one
+            Self::from_raw_nonnull(NonNull::new_unchecked(raw))
+        }
+    }
+
+    /// Construct `Self` from a raw `*mut JSPrincipals`, incrementing its
+    /// reference count.
+    ///
+    /// # Safety
+    /// `raw` must point to a valid JSPrincipals value.
+    #[inline]
+    pub unsafe fn from_raw_nonnull(raw: NonNull<JSPrincipals>) -> Self {
+        JS_HoldPrincipals(raw.as_ptr());
+        Self(raw)
+    }
+
+    #[inline]
+    pub fn origin(&self) -> MutableOrigin {
+        unsafe {
+            let origin = GetRustJSPrincipalsPrivate(self.0.as_ptr()) as *mut MutableOrigin;
+            (*origin).clone()
+        }
+    }
+
+    #[inline]
+    pub fn as_raw_nonnull(&self) -> NonNull<JSPrincipals> {
+        self.0
+    }
+
+    #[inline]
+    pub fn as_raw(&self) -> *mut JSPrincipals {
+        self.0.as_ptr()
+    }
+}
+
+impl Clone for ServoJSPrincipals {
+    #[inline]
+    fn clone(&self) -> Self {
+        unsafe { Self::from_raw_nonnull(self.as_raw_nonnull()) }
+    }
+}
+
+impl Drop for ServoJSPrincipals {
+    #[inline]
+    fn drop(&mut self) {
+        if let Some(cx) = Runtime::get() {
+            unsafe { JS_DropPrincipals(cx.as_ptr(), self.as_raw()) };
+        }
+    }
+}
+
+/// A borrowed reference to Servo's `JSPrincipals` instance. Does not update the
+/// reference count on creation and deletion.
+pub struct ServoJSPrincipalsRef<'a>(ManuallyDrop<ServoJSPrincipals>, PhantomData<&'a ()>);
+
+impl ServoJSPrincipalsRef<'_> {
+    /// Construct `Self` from a raw `NonNull<JSPrincipals>`.
+    ///
+    /// # Safety
+    ///
+    /// `ServoJSPrincipalsRef` does not update the reference count of the
+    /// wrapped `JSPrincipals` object. It's up to the caller to ensure the
+    /// returned `ServoJSPrincipalsRef` object or any clones are not used past
+    /// the lifetime of the wrapped object.
+    #[inline]
+    pub unsafe fn from_raw_nonnull(raw: NonNull<JSPrincipals>) -> Self {
+        // Don't use `ServoJSPrincipals::from_raw_nonnull`; we don't want to
+        // update the reference count
+        Self(ManuallyDrop::new(ServoJSPrincipals(raw)), PhantomData)
+    }
+
+    /// Construct `Self` from a raw `*mut JSPrincipals`.
+    ///
+    /// # Safety
+    ///
+    /// The behavior is undefined if `raw` is null. See also
+    /// [`Self::from_raw_nonnull`].
+    #[inline]
+    pub unsafe fn from_raw_unchecked(raw: *mut JSPrincipals) -> Self {
+        Self::from_raw_nonnull(NonNull::new_unchecked(raw))
+    }
+}
+
+impl Clone for ServoJSPrincipalsRef<'_> {
+    #[inline]
+    fn clone(&self) -> Self {
+        Self(ManuallyDrop::new(ServoJSPrincipals(self.0.0)), PhantomData)
+    }
+}
+
+impl Deref for ServoJSPrincipalsRef<'_> {
+    type Target = ServoJSPrincipals;
+
+    #[inline]
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
diff --git a/components/script_bindings/proxyhandler.rs b/components/script_bindings/proxyhandler.rs
new file mode 100644
index 00000000000..29da3e91a92
--- /dev/null
+++ b/components/script_bindings/proxyhandler.rs
@@ -0,0 +1,781 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! Utilities for the implementation of JSAPI proxy handlers.
+
+use std::ffi::CStr;
+use std::os::raw::c_char;
+use std::ptr;
+
+use js::conversions::ToJSValConvertible;
+use js::glue::{
+    GetProxyHandler, GetProxyHandlerFamily, GetProxyPrivate, InvokeGetOwnPropertyDescriptor,
+    SetProxyPrivate,
+};
+use js::jsapi::{
+    DOMProxyShadowsResult, GetStaticPrototype, GetWellKnownSymbol, Handle as RawHandle,
+    HandleId as RawHandleId, HandleObject as RawHandleObject, HandleValue as RawHandleValue,
+    JS_AtomizeAndPinString, JS_DefinePropertyById, JS_GetOwnPropertyDescriptorById,
+    JS_IsExceptionPending, JSAutoRealm, JSContext, JSErrNum, JSFunctionSpec, JSObject,
+    JSPropertySpec, MutableHandle as RawMutableHandle,
+    MutableHandleIdVector as RawMutableHandleIdVector,
+    MutableHandleObject as RawMutableHandleObject, MutableHandleValue as RawMutableHandleValue,
+    ObjectOpResult, PropertyDescriptor, SetDOMProxyInformation, SymbolCode, jsid,
+};
+use js::jsid::SymbolId;
+use js::jsval::{ObjectValue, UndefinedValue};
+use js::rust::wrappers::{
+    AppendToIdVector, JS_AlreadyHasOwnPropertyById, JS_NewObjectWithGivenProto,
+    RUST_INTERNED_STRING_TO_JSID, SetDataPropertyDescriptor,
+};
+use js::rust::{Handle, HandleObject, HandleValue, MutableHandle, MutableHandleObject};
+use js::{jsapi, rooted};
+
+use crate::DomTypes;
+use crate::conversions::{is_dom_proxy, jsid_to_string, jsstring_to_str};
+use crate::error::Error;
+use crate::interfaces::{DomHelpers, GlobalScopeHelpers};
+use crate::realms::{AlreadyInRealm, InRealm};
+use crate::reflector::DomObject;
+use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
+use crate::str::DOMString;
+use crate::utils::delete_property_by_id;
+
+/// Determine if this id shadows any existing properties for this proxy.
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+pub(crate) unsafe extern "C" fn shadow_check_callback(
+    cx: *mut JSContext,
+    object: RawHandleObject,
+    id: RawHandleId,
+) -> DOMProxyShadowsResult {
+    // TODO: support OverrideBuiltins when #12978 is fixed.
+
+    rooted!(in(cx) let mut expando = ptr::null_mut::<JSObject>());
+    get_expando_object(object, expando.handle_mut());
+    if !expando.get().is_null() {
+        let mut has_own = false;
+        let raw_id = Handle::from_raw(id);
+
+        if !JS_AlreadyHasOwnPropertyById(cx, expando.handle(), raw_id, &mut has_own) {
+            return DOMProxyShadowsResult::ShadowCheckFailed;
+        }
+
+        if has_own {
+            return DOMProxyShadowsResult::ShadowsViaDirectExpando;
+        }
+    }
+
+    // Our expando, if any, didn't shadow, so we're not shadowing at all.
+    DOMProxyShadowsResult::DoesntShadow
+}
+
+/// Initialize the infrastructure for DOM proxy objects.
+pub fn init() {
+    unsafe {
+        SetDOMProxyInformation(
+            GetProxyHandlerFamily(),
+            Some(shadow_check_callback),
+            ptr::null(),
+        );
+    }
+}
+
+/// Defines an expando on the given `proxy`.
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+/// `result` must point to a valid, non-null ObjectOpResult.
+pub(crate) unsafe extern "C" fn define_property(
+    cx: *mut JSContext,
+    proxy: RawHandleObject,
+    id: RawHandleId,
+    desc: RawHandle<PropertyDescriptor>,
+    result: *mut ObjectOpResult,
+) -> bool {
+    rooted!(in(cx) let mut expando = ptr::null_mut::<JSObject>());
+    ensure_expando_object(cx, proxy, expando.handle_mut());
+    JS_DefinePropertyById(cx, expando.handle().into(), id, desc, result)
+}
+
+/// Deletes an expando off the given `proxy`.
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+/// `bp` must point to a valid, non-null ObjectOpResult.
+pub(crate) unsafe extern "C" fn delete(
+    cx: *mut JSContext,
+    proxy: RawHandleObject,
+    id: RawHandleId,
+    bp: *mut ObjectOpResult,
+) -> bool {
+    rooted!(in(cx) let mut expando = ptr::null_mut::<JSObject>());
+    get_expando_object(proxy, expando.handle_mut());
+    if expando.is_null() {
+        (*bp).code_ = 0 /* OkCode */;
+        return true;
+    }
+
+    delete_property_by_id(cx, expando.handle(), Handle::from_raw(id), bp)
+}
+
+/// Controls whether the Extensible bit can be changed
+///
+/// # Safety
+/// `result` must point to a valid, non-null ObjectOpResult.
+pub(crate) unsafe extern "C" fn prevent_extensions(
+    _cx: *mut JSContext,
+    _proxy: RawHandleObject,
+    result: *mut ObjectOpResult,
+) -> bool {
+    (*result).code_ = JSErrNum::JSMSG_CANT_PREVENT_EXTENSIONS as ::libc::uintptr_t;
+    true
+}
+
+/// Reports whether the object is Extensible
+///
+/// # Safety
+/// `succeeded` must point to a valid, non-null bool.
+pub(crate) unsafe extern "C" fn is_extensible(
+    _cx: *mut JSContext,
+    _proxy: RawHandleObject,
+    succeeded: *mut bool,
+) -> bool {
+    *succeeded = true;
+    true
+}
+
+/// If `proxy` (underneath any functionally-transparent wrapper proxies) has as
+/// its `[[GetPrototypeOf]]` trap the ordinary `[[GetPrototypeOf]]` behavior
+/// defined for ordinary objects, set `*is_ordinary` to true and store `obj`'s
+/// prototype in `proto`.  Otherwise set `*isOrdinary` to false. In case of
+/// error, both outparams have unspecified value.
+///
+/// This implementation always handles the case of the ordinary
+/// `[[GetPrototypeOf]]` behavior. An alternative implementation will be
+/// necessary for maybe-cross-origin objects.
+///
+/// # Safety
+/// `is_ordinary` must point to a valid, non-null bool.
+pub(crate) unsafe extern "C" fn get_prototype_if_ordinary(
+    _: *mut JSContext,
+    proxy: RawHandleObject,
+    is_ordinary: *mut bool,
+    proto: RawMutableHandleObject,
+) -> bool {
+    *is_ordinary = true;
+    proto.set(GetStaticPrototype(proxy.get()));
+    true
+}
+
+/// Get the expando object, or null if there is none.
+pub(crate) fn get_expando_object(obj: RawHandleObject, mut expando: MutableHandleObject) {
+    unsafe {
+        assert!(is_dom_proxy(obj.get()));
+        let val = &mut UndefinedValue();
+        GetProxyPrivate(obj.get(), val);
+        expando.set(if val.is_undefined() {
+            ptr::null_mut()
+        } else {
+            val.to_object()
+        });
+    }
+}
+
+/// Get the expando object, or create it if it doesn't exist yet.
+/// Fails on JSAPI failure.
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+pub(crate) unsafe fn ensure_expando_object(
+    cx: *mut JSContext,
+    obj: RawHandleObject,
+    mut expando: MutableHandleObject,
+) {
+    assert!(is_dom_proxy(obj.get()));
+    get_expando_object(obj, expando.reborrow());
+    if expando.is_null() {
+        expando.set(JS_NewObjectWithGivenProto(
+            cx,
+            ptr::null_mut(),
+            HandleObject::null(),
+        ));
+        assert!(!expando.is_null());
+
+        SetProxyPrivate(obj.get(), &ObjectValue(expando.get()));
+    }
+}
+
+/// Set the property descriptor's object to `obj` and set it to enumerable,
+/// and writable if `readonly` is true.
+pub fn set_property_descriptor(
+    desc: MutableHandle<PropertyDescriptor>,
+    value: HandleValue,
+    attrs: u32,
+    is_none: &mut bool,
+) {
+    unsafe {
+        SetDataPropertyDescriptor(desc, value, attrs);
+    }
+    *is_none = false;
+}
+
+pub(crate) fn id_to_source(cx: SafeJSContext, id: RawHandleId) -> Option<DOMString> {
+    unsafe {
+        rooted!(in(*cx) let mut value = UndefinedValue());
+        rooted!(in(*cx) let mut jsstr = ptr::null_mut::<jsapi::JSString>());
+        jsapi::JS_IdToValue(*cx, id.get(), value.handle_mut().into())
+            .then(|| {
+                jsstr.set(jsapi::JS_ValueToSource(*cx, value.handle().into()));
+                jsstr.get()
+            })
+            .and_then(ptr::NonNull::new)
+            .map(|jsstr| jsstring_to_str(*cx, jsstr))
+    }
+}
+
+/// Property and method specs that correspond to the elements of
+/// [`CrossOriginProperties(O)`].
+///
+/// [`CrossOriginProperties(O)`]: https://html.spec.whatwg.org/multipage/#crossoriginproperties-(-o-)
+pub(crate) struct CrossOriginProperties {
+    pub(crate) attributes: &'static [JSPropertySpec],
+    pub(crate) methods: &'static [JSFunctionSpec],
+}
+
+impl CrossOriginProperties {
+    /// Enumerate the property keys defined by `self`.
+    fn keys(&self) -> impl Iterator<Item = *const c_char> + '_ {
+        // Safety: All cross-origin property keys are strings, not symbols
+        self.attributes
+            .iter()
+            .map(|spec| unsafe { spec.name.string_ })
+            .chain(self.methods.iter().map(|spec| unsafe { spec.name.string_ }))
+            .filter(|ptr| !ptr.is_null())
+    }
+}
+
+/// Implementation of [`CrossOriginOwnPropertyKeys`].
+///
+/// [`CrossOriginOwnPropertyKeys`]: https://html.spec.whatwg.org/multipage/#crossoriginownpropertykeys-(-o-)
+pub(crate) fn cross_origin_own_property_keys(
+    cx: SafeJSContext,
+    _proxy: RawHandleObject,
+    cross_origin_properties: &'static CrossOriginProperties,
+    props: RawMutableHandleIdVector,
+) -> bool {
+    // > 2. For each `e` of `! CrossOriginProperties(O)`, append
+    // >    `e.[[Property]]` to `keys`.
+    for key in cross_origin_properties.keys() {
+        unsafe {
+            rooted!(in(*cx) let rooted = JS_AtomizeAndPinString(*cx, key));
+            rooted!(in(*cx) let mut rooted_jsid: jsid);
+            RUST_INTERNED_STRING_TO_JSID(*cx, rooted.handle().get(), rooted_jsid.handle_mut());
+            AppendToIdVector(props, rooted_jsid.handle());
+        }
+    }
+
+    // > 3. Return the concatenation of `keys` and `« "then", @@toStringTag,
+    // > @@hasInstance, @@isConcatSpreadable »`.
+    append_cross_origin_allowlisted_prop_keys(cx, props);
+
+    true
+}
+
+/// # Safety
+/// `is_ordinary` must point to a valid, non-null bool.
+pub(crate) unsafe extern "C" fn maybe_cross_origin_get_prototype_if_ordinary_rawcx(
+    _: *mut JSContext,
+    _proxy: RawHandleObject,
+    is_ordinary: *mut bool,
+    _proto: RawMutableHandleObject,
+) -> bool {
+    // We have a custom `[[GetPrototypeOf]]`, so return `false`
+    *is_ordinary = false;
+    true
+}
+
+/// Implementation of `[[SetPrototypeOf]]` for [`Location`] and [`WindowProxy`].
+///
+/// [`Location`]: https://html.spec.whatwg.org/multipage/#location-setprototypeof
+/// [`WindowProxy`]: https://html.spec.whatwg.org/multipage/#windowproxy-setprototypeof
+///
+/// # Safety
+/// `result` must point to a valid, non-null ObjectOpResult.
+pub(crate) unsafe extern "C" fn maybe_cross_origin_set_prototype_rawcx(
+    cx: *mut JSContext,
+    proxy: RawHandleObject,
+    proto: RawHandleObject,
+    result: *mut ObjectOpResult,
+) -> bool {
+    // > 1. Return `! SetImmutablePrototype(this, V)`.
+    //
+    // <https://tc39.es/ecma262/#sec-set-immutable-prototype>:
+    //
+    // > 1. Assert: Either `Type(V)` is Object or `Type(V)` is Null.
+    //
+    // > 2. Let current be `? O.[[GetPrototypeOf]]()`.
+    rooted!(in(cx) let mut current = ptr::null_mut::<JSObject>());
+    if !jsapi::GetObjectProto(cx, proxy, current.handle_mut().into()) {
+        return false;
+    }
+
+    // > 3. If `SameValue(V, current)` is true, return true.
+    if proto.get() == current.get() {
+        (*result).code_ = 0 /* OkCode */;
+        return true;
+    }
+
+    // > 4. Return false.
+    (*result).code_ = JSErrNum::JSMSG_CANT_SET_PROTO as usize;
+    true
+}
+
+pub(crate) fn get_getter_object(d: &PropertyDescriptor, out: RawMutableHandleObject) {
+    if d.hasGetter_() {
+        out.set(d.getter_);
+    }
+}
+
+pub(crate) fn get_setter_object(d: &PropertyDescriptor, out: RawMutableHandleObject) {
+    if d.hasSetter_() {
+        out.set(d.setter_);
+    }
+}
+
+/// <https://tc39.es/ecma262/#sec-isaccessordescriptor>
+pub(crate) fn is_accessor_descriptor(d: &PropertyDescriptor) -> bool {
+    d.hasSetter_() || d.hasGetter_()
+}
+
+/// <https://tc39.es/ecma262/#sec-isdatadescriptor>
+pub(crate) fn is_data_descriptor(d: &PropertyDescriptor) -> bool {
+    d.hasWritable_() || d.hasValue_()
+}
+
+/// Evaluate `CrossOriginGetOwnPropertyHelper(proxy, id) != null`.
+/// SpiderMonkey-specific.
+///
+/// `cx` and `proxy` are expected to be different-Realm here. `proxy` is a proxy
+/// for a maybe-cross-origin object.
+///
+/// # Safety
+/// `bp` must point to a valid, non-null bool.
+pub(crate) unsafe fn cross_origin_has_own(
+    cx: SafeJSContext,
+    _proxy: RawHandleObject,
+    cross_origin_properties: &'static CrossOriginProperties,
+    id: RawHandleId,
+    bp: *mut bool,
+) -> bool {
+    // TODO: Once we have the slot for the holder, it'd be more efficient to
+    //       use `ensure_cross_origin_property_holder`. We'll need `_proxy` to
+    //       do that.
+    *bp = jsid_to_string(*cx, Handle::from_raw(id)).is_some_and(|key| {
+        cross_origin_properties.keys().any(|defined_key| {
+            let defined_key = CStr::from_ptr(defined_key);
+            defined_key.to_bytes() == key.as_bytes()
+        })
+    });
+
+    true
+}
+
+/// Implementation of [`CrossOriginGetOwnPropertyHelper`].
+///
+/// `cx` and `proxy` are expected to be different-Realm here. `proxy` is a proxy
+/// for a maybe-cross-origin object.
+///
+/// [`CrossOriginGetOwnPropertyHelper`]: https://html.spec.whatwg.org/multipage/#crossorigingetownpropertyhelper-(-o,-p-)
+pub(crate) fn cross_origin_get_own_property_helper(
+    cx: SafeJSContext,
+    proxy: RawHandleObject,
+    cross_origin_properties: &'static CrossOriginProperties,
+    id: RawHandleId,
+    desc: RawMutableHandle<PropertyDescriptor>,
+    is_none: &mut bool,
+) -> bool {
+    rooted!(in(*cx) let mut holder = ptr::null_mut::<JSObject>());
+
+    ensure_cross_origin_property_holder(
+        cx,
+        proxy,
+        cross_origin_properties,
+        holder.handle_mut().into(),
+    );
+
+    unsafe { JS_GetOwnPropertyDescriptorById(*cx, holder.handle().into(), id, desc, is_none) }
+}
+
+const ALLOWLISTED_SYMBOL_CODES: &[SymbolCode] = &[
+    SymbolCode::toStringTag,
+    SymbolCode::hasInstance,
+    SymbolCode::isConcatSpreadable,
+];
+
+pub(crate) fn is_cross_origin_allowlisted_prop(cx: SafeJSContext, id: RawHandleId) -> bool {
+    unsafe {
+        if jsid_to_string(*cx, Handle::from_raw(id)).is_some_and(|st| st == "then") {
+            return true;
+        }
+
+        rooted!(in(*cx) let mut allowed_id: jsid);
+        ALLOWLISTED_SYMBOL_CODES.iter().any(|&allowed_code| {
+            allowed_id.set(SymbolId(GetWellKnownSymbol(*cx, allowed_code)));
+            // `jsid`s containing `JS::Symbol *` can be compared by
+            // referential equality
+            allowed_id.get().asBits_ == id.asBits_
+        })
+    }
+}
+
+/// Append `« "then", @@toStringTag, @@hasInstance, @@isConcatSpreadable »` to
+/// `props`. This is used to implement [`CrossOriginOwnPropertyKeys`].
+///
+/// [`CrossOriginOwnPropertyKeys`]: https://html.spec.whatwg.org/multipage/#crossoriginownpropertykeys-(-o-)
+fn append_cross_origin_allowlisted_prop_keys(cx: SafeJSContext, props: RawMutableHandleIdVector) {
+    unsafe {
+        rooted!(in(*cx) let mut id: jsid);
+
+        let jsstring = JS_AtomizeAndPinString(*cx, c"then".as_ptr());
+        rooted!(in(*cx) let rooted = jsstring);
+        RUST_INTERNED_STRING_TO_JSID(*cx, rooted.handle().get(), id.handle_mut());
+        AppendToIdVector(props, id.handle());
+
+        for &allowed_code in ALLOWLISTED_SYMBOL_CODES.iter() {
+            id.set(SymbolId(GetWellKnownSymbol(*cx, allowed_code)));
+            AppendToIdVector(props, id.handle());
+        }
+    }
+}
+
+/// Get the holder for cross-origin properties for the current global of the
+/// `JSContext`, creating one and storing it in a slot of the proxy object if it
+/// doesn't exist yet.
+///
+/// This essentially creates a cache of [`CrossOriginGetOwnPropertyHelper`]'s
+/// results for all property keys.
+///
+/// `cx` and `proxy` are expected to be different-Realm here. `proxy` is a proxy
+/// for a maybe-cross-origin object. The `out_holder` return value will always
+/// be in the Realm of `cx`.
+///
+/// [`CrossOriginGetOwnPropertyHelper`]: https://html.spec.whatwg.org/multipage/#crossorigingetownpropertyhelper-(-o,-p-)
+fn ensure_cross_origin_property_holder(
+    cx: SafeJSContext,
+    _proxy: RawHandleObject,
+    cross_origin_properties: &'static CrossOriginProperties,
+    out_holder: RawMutableHandleObject,
+) -> bool {
+    // TODO: We don't have the slot to store the holder yet. For now,
+    //       the holder is constructed every time this function is called,
+    //       which is not only inefficient but also deviates from the
+    //       specification in a subtle yet observable way.
+
+    // Create a holder for the current Realm
+    unsafe {
+        out_holder.set(jsapi::JS_NewObjectWithGivenProto(
+            *cx,
+            ptr::null_mut(),
+            RawHandleObject::null(),
+        ));
+
+        if out_holder.get().is_null() ||
+            !jsapi::JS_DefineProperties(
+                *cx,
+                out_holder.handle(),
+                cross_origin_properties.attributes.as_ptr(),
+            ) ||
+            !jsapi::JS_DefineFunctions(
+                *cx,
+                out_holder.handle(),
+                cross_origin_properties.methods.as_ptr(),
+            )
+        {
+            return false;
+        }
+    }
+
+    // TODO: Store the holder in the slot that we don't have yet.
+
+    true
+}
+
+/// Report a cross-origin denial for a property, Always returns `false`, so it
+/// can be used as `return report_cross_origin_denial(...);`.
+///
+/// What this function does corresponds to the operations in
+/// <https://html.spec.whatwg.org/multipage/#the-location-interface> denoted as
+/// "Throw a `SecurityError` DOMException".
+pub(crate) fn report_cross_origin_denial<D: DomTypes>(
+    cx: SafeJSContext,
+    id: RawHandleId,
+    access: &str,
+) -> bool {
+    debug!(
+        "permission denied to {} property {} on cross-origin object",
+        access,
+        id_to_source(cx, id).as_deref().unwrap_or("< error >"),
+    );
+    let in_realm_proof = AlreadyInRealm::assert_for_cx(cx);
+    unsafe {
+        if !JS_IsExceptionPending(*cx) {
+            let global = D::GlobalScope::from_context(*cx, InRealm::Already(&in_realm_proof));
+            // TODO: include `id` and `access` in the exception message
+            <D as DomHelpers<D>>::throw_dom_exception(cx, &global, Error::Security, CanGc::note());
+        }
+    }
+    false
+}
+
+/// Implementation of `[[Set]]` for [`Location`].
+///
+/// [`Location`]: https://html.spec.whatwg.org/multipage/#location-set
+pub(crate) unsafe extern "C" fn maybe_cross_origin_set_rawcx<D: DomTypes>(
+    cx: *mut JSContext,
+    proxy: RawHandleObject,
+    id: RawHandleId,
+    v: RawHandleValue,
+    receiver: RawHandleValue,
+    result: *mut ObjectOpResult,
+) -> bool {
+    let cx = SafeJSContext::from_ptr(cx);
+
+    if !<D as DomHelpers<D>>::is_platform_object_same_origin(cx, proxy) {
+        return cross_origin_set::<D>(cx, proxy, id, v, receiver, result);
+    }
+
+    // Safe to enter the Realm of proxy now.
+    let _ac = JSAutoRealm::new(*cx, proxy.get());
+
+    // OrdinarySet
+    // <https://tc39.es/ecma262/#sec-ordinaryset>
+    rooted!(in(*cx) let mut own_desc = PropertyDescriptor::default());
+    let mut is_none = false;
+    if !InvokeGetOwnPropertyDescriptor(
+        GetProxyHandler(*proxy),
+        *cx,
+        proxy,
+        id,
+        own_desc.handle_mut().into(),
+        &mut is_none,
+    ) {
+        return false;
+    }
+
+    let own_desc_handle = own_desc.handle().into();
+    js::jsapi::SetPropertyIgnoringNamedGetter(
+        *cx,
+        proxy,
+        id,
+        v,
+        receiver,
+        if is_none {
+            ptr::null()
+        } else {
+            &own_desc_handle
+        },
+        result,
+    )
+}
+
+/// Implementation of `[[GetPrototypeOf]]` for [`Location`].
+///
+/// [`Location`]: https://html.spec.whatwg.org/multipage/#location-getprototypeof
+pub(crate) fn maybe_cross_origin_get_prototype<D: DomTypes>(
+    cx: SafeJSContext,
+    proxy: RawHandleObject,
+    get_proto_object: fn(cx: SafeJSContext, global: HandleObject, rval: MutableHandleObject),
+    proto: RawMutableHandleObject,
+) -> bool {
+    // > 1. If ! IsPlatformObjectSameOrigin(this) is true, then return ! OrdinaryGetPrototypeOf(this).
+    if <D as DomHelpers<D>>::is_platform_object_same_origin(cx, proxy) {
+        let ac = JSAutoRealm::new(*cx, proxy.get());
+        let global = unsafe { D::GlobalScope::from_context(*cx, InRealm::Entered(&ac)) };
+        get_proto_object(cx, global.reflector().get_jsobject(), unsafe {
+            MutableHandleObject::from_raw(proto)
+        });
+        return !proto.is_null();
+    }
+
+    // > 2. Return null.
+    proto.set(ptr::null_mut());
+    true
+}
+
+/// Implementation of [`CrossOriginGet`].
+///
+/// `cx` and `proxy` are expected to be different-Realm here. `proxy` is a proxy
+/// for a maybe-cross-origin object.
+///
+/// [`CrossOriginGet`]: https://html.spec.whatwg.org/multipage/#crossoriginget-(-o,-p,-receiver-)
+pub(crate) fn cross_origin_get<D: DomTypes>(
+    cx: SafeJSContext,
+    proxy: RawHandleObject,
+    receiver: RawHandleValue,
+    id: RawHandleId,
+    vp: RawMutableHandleValue,
+) -> bool {
+    // > 1. Let `desc` be `? O.[[GetOwnProperty]](P)`.
+    rooted!(in(*cx) let mut descriptor = PropertyDescriptor::default());
+    let mut is_none = false;
+    if !unsafe {
+        InvokeGetOwnPropertyDescriptor(
+            GetProxyHandler(*proxy),
+            *cx,
+            proxy,
+            id,
+            descriptor.handle_mut().into(),
+            &mut is_none,
+        )
+    } {
+        return false;
+    }
+
+    // > 2. Assert: `desc` is not undefined.
+    assert!(
+        !is_none,
+        "Callees should throw in all cases when they are not finding \
+        a property decriptor"
+    );
+
+    // > 3. If `! IsDataDescriptor(desc)` is true, then return `desc.[[Value]]`.
+    if is_data_descriptor(&descriptor) {
+        vp.set(descriptor.value_);
+        return true;
+    }
+
+    // > 4. Assert: `IsAccessorDescriptor(desc)` is `true`.
+    assert!(is_accessor_descriptor(&descriptor));
+
+    // > 5. Let `getter` be `desc.[[Get]]`.
+    // >
+    // > 6. If `getter` is `undefined`, then throw a `SecurityError`
+    // >    `DOMException`.
+    rooted!(in(*cx) let mut getter = ptr::null_mut::<JSObject>());
+    get_getter_object(&descriptor, getter.handle_mut().into());
+    if getter.get().is_null() {
+        return report_cross_origin_denial::<D>(cx, id, "get");
+    }
+
+    rooted!(in(*cx) let mut getter_jsval = UndefinedValue());
+    unsafe {
+        getter.get().to_jsval(*cx, getter_jsval.handle_mut());
+    }
+
+    // > 7. Return `? Call(getter, Receiver)`.
+    unsafe {
+        jsapi::Call(
+            *cx,
+            receiver,
+            getter_jsval.handle().into(),
+            &jsapi::HandleValueArray::empty(),
+            vp,
+        )
+    }
+}
+
+/// Implementation of [`CrossOriginSet`].
+///
+/// `cx` and `proxy` are expected to be different-Realm here. `proxy` is a proxy
+/// for a maybe-cross-origin object.
+///
+/// [`CrossOriginSet`]: https://html.spec.whatwg.org/multipage/#crossoriginset-(-o,-p,-v,-receiver-)
+pub(crate) unsafe fn cross_origin_set<D: DomTypes>(
+    cx: SafeJSContext,
+    proxy: RawHandleObject,
+    id: RawHandleId,
+    v: RawHandleValue,
+    receiver: RawHandleValue,
+    result: *mut ObjectOpResult,
+) -> bool {
+    // > 1. Let desc be ? O.[[GetOwnProperty]](P).
+    rooted!(in(*cx) let mut descriptor = PropertyDescriptor::default());
+    let mut is_none = false;
+    if !InvokeGetOwnPropertyDescriptor(
+        GetProxyHandler(*proxy),
+        *cx,
+        proxy,
+        id,
+        descriptor.handle_mut().into(),
+        &mut is_none,
+    ) {
+        return false;
+    }
+
+    // > 2. Assert: desc is not undefined.
+    assert!(
+        !is_none,
+        "Callees should throw in all cases when they are not finding \
+        a property decriptor"
+    );
+
+    // > 3. If desc.[[Set]] is present and its value is not undefined,
+    // >    then: [...]
+    rooted!(in(*cx) let mut setter = ptr::null_mut::<JSObject>());
+    get_setter_object(&descriptor, setter.handle_mut().into());
+    if setter.get().is_null() {
+        // > 4. Throw a "SecurityError" DOMException.
+        return report_cross_origin_denial::<D>(cx, id, "set");
+    }
+
+    rooted!(in(*cx) let mut setter_jsval = UndefinedValue());
+    setter.get().to_jsval(*cx, setter_jsval.handle_mut());
+
+    // > 3.1. Perform ? Call(setter, Receiver, «V»).
+    // >
+    // > 3.2. Return true.
+    rooted!(in(*cx) let mut ignored = UndefinedValue());
+    if !jsapi::Call(
+        *cx,
+        receiver,
+        setter_jsval.handle().into(),
+        // FIXME: Our binding lacks `HandleValueArray(Handle<Value>)`
+        // <https://searchfox.org/mozilla-central/rev/072710086ddfe25aa2962c8399fefb2304e8193b/js/public/ValueArray.h#54-55>
+        &jsapi::HandleValueArray {
+            length_: 1,
+            elements_: v.ptr,
+        },
+        ignored.handle_mut().into(),
+    ) {
+        return false;
+    }
+
+    (*result).code_ = 0 /* OkCode */;
+    true
+}
+
+/// Implementation of [`CrossOriginPropertyFallback`].
+///
+/// `cx` and `proxy` are expected to be different-Realm here. `proxy` is a proxy
+/// for a maybe-cross-origin object.
+///
+/// [`CrossOriginPropertyFallback`]: https://html.spec.whatwg.org/multipage/#crossoriginpropertyfallback-(-p-)
+pub(crate) fn cross_origin_property_fallback<D: DomTypes>(
+    cx: SafeJSContext,
+    _proxy: RawHandleObject,
+    id: RawHandleId,
+    desc: RawMutableHandle<PropertyDescriptor>,
+    is_none: &mut bool,
+) -> bool {
+    assert!(*is_none, "why are we being called?");
+
+    // > 1. If P is `then`, `@@toStringTag`, `@@hasInstance`, or
+    // >    `@@isConcatSpreadable`, then return `PropertyDescriptor{ [[Value]]:
+    // >    undefined, [[Writable]]: false, [[Enumerable]]: false,
+    // >    [[Configurable]]: true }`.
+    if is_cross_origin_allowlisted_prop(cx, id) {
+        set_property_descriptor(
+            unsafe { MutableHandle::from_raw(desc) },
+            HandleValue::undefined(),
+            jsapi::JSPROP_READONLY as u32,
+            is_none,
+        );
+        return true;
+    }
+
+    // > 2. Throw a `SecurityError` `DOMException`.
+    report_cross_origin_denial::<D>(cx, id, "access")
+}
diff --git a/components/script_bindings/realms.rs b/components/script_bindings/realms.rs
new file mode 100644
index 00000000000..3fe60d5ae5c
--- /dev/null
+++ b/components/script_bindings/realms.rs
@@ -0,0 +1,64 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use js::jsapi::{GetCurrentRealmOrNull, JSAutoRealm};
+
+use crate::DomTypes;
+use crate::interfaces::GlobalScopeHelpers;
+use crate::reflector::DomObject;
+use crate::script_runtime::JSContext;
+
+pub struct AlreadyInRealm(());
+
+impl AlreadyInRealm {
+    #![allow(unsafe_code)]
+    pub fn assert<D: DomTypes>() -> AlreadyInRealm {
+        unsafe {
+            assert!(!GetCurrentRealmOrNull(*D::GlobalScope::get_cx()).is_null());
+        }
+        AlreadyInRealm(())
+    }
+
+    pub fn assert_for_cx(cx: JSContext) -> AlreadyInRealm {
+        unsafe {
+            assert!(!GetCurrentRealmOrNull(*cx).is_null());
+        }
+        AlreadyInRealm(())
+    }
+}
+
+#[derive(Clone, Copy)]
+pub enum InRealm<'a> {
+    Already(&'a AlreadyInRealm),
+    Entered(&'a JSAutoRealm),
+}
+
+impl<'a> From<&'a AlreadyInRealm> for InRealm<'a> {
+    fn from(token: &'a AlreadyInRealm) -> InRealm<'a> {
+        InRealm::already(token)
+    }
+}
+
+impl<'a> From<&'a JSAutoRealm> for InRealm<'a> {
+    fn from(token: &'a JSAutoRealm) -> InRealm<'a> {
+        InRealm::entered(token)
+    }
+}
+
+impl InRealm<'_> {
+    pub fn already(token: &AlreadyInRealm) -> InRealm {
+        InRealm::Already(token)
+    }
+
+    pub fn entered(token: &JSAutoRealm) -> InRealm {
+        InRealm::Entered(token)
+    }
+}
+
+pub fn enter_realm<D: DomTypes>(object: &impl DomObject) -> JSAutoRealm {
+    JSAutoRealm::new(
+        *D::GlobalScope::get_cx(),
+        object.reflector().get_jsobject().get(),
+    )
+}
diff --git a/components/script_bindings/reflector.rs b/components/script_bindings/reflector.rs
index 2f9e77c6928..6b6ae03cb69 100644
--- a/components/script_bindings/reflector.rs
+++ b/components/script_bindings/reflector.rs
@@ -6,6 +6,13 @@ use js::jsapi::{Heap, JSObject};
 use js::rust::HandleObject;
 use malloc_size_of_derive::MallocSizeOf;
 
+use crate::interfaces::GlobalScopeHelpers;
+use crate::iterable::{Iterable, IterableIterator};
+use crate::realms::{AlreadyInRealm, InRealm};
+use crate::root::{Dom, DomRoot, Root};
+use crate::script_runtime::{CanGc, JSContext};
+use crate::{DomTypes, JSTraceable};
+
 /// A struct to store a reference to the reflector of a DOM object.
 #[cfg_attr(crown, allow(crown::unrooted_must_root))]
 #[derive(MallocSizeOf)]
@@ -90,3 +97,55 @@ impl MutDomObject for Reflector {
         self.set_jsobject(obj)
     }
 }
+
+pub trait DomGlobalGeneric<D: DomTypes>: DomObject {
+    /// Returns the [`GlobalScope`] of the realm that the [`DomObject`] was created in.  If this
+    /// object is a `Node`, this will be different from it's owning `Document` if adopted by. For
+    /// `Node`s it's almost always better to use `NodeTraits::owning_global`.
+    fn global_(&self, realm: InRealm) -> DomRoot<D::GlobalScope>
+    where
+        Self: Sized,
+    {
+        D::GlobalScope::from_reflector(self, realm)
+    }
+
+    /// Returns the [`GlobalScope`] of the realm that the [`DomObject`] was created in.  If this
+    /// object is a `Node`, this will be different from it's owning `Document` if adopted by. For
+    /// `Node`s it's almost always better to use `NodeTraits::owning_global`.
+    fn global(&self) -> DomRoot<D::GlobalScope>
+    where
+        Self: Sized,
+    {
+        let realm = AlreadyInRealm::assert_for_cx(D::GlobalScope::get_cx());
+        D::GlobalScope::from_reflector(self, InRealm::already(&realm))
+    }
+}
+
+impl<D: DomTypes, T: DomObject> DomGlobalGeneric<D> for T {}
+
+/// A trait to provide a function pointer to wrap function for DOM objects.
+pub trait DomObjectWrap<D: DomTypes>: Sized + DomObject + DomGlobalGeneric<D> {
+    /// Function pointer to the general wrap function type
+    #[allow(clippy::type_complexity)]
+    const WRAP: unsafe fn(
+        JSContext,
+        &D::GlobalScope,
+        Option<HandleObject>,
+        Box<Self>,
+        CanGc,
+    ) -> Root<Dom<Self>>;
+}
+
+/// A trait to provide a function pointer to wrap function for
+/// DOM iterator interfaces.
+pub trait DomObjectIteratorWrap<D: DomTypes>: DomObjectWrap<D> + JSTraceable + Iterable {
+    /// Function pointer to the wrap function for `IterableIterator<T>`
+    #[allow(clippy::type_complexity)]
+    const ITER_WRAP: unsafe fn(
+        JSContext,
+        &D::GlobalScope,
+        Option<HandleObject>,
+        Box<IterableIterator<D, Self>>,
+        CanGc,
+    ) -> Root<Dom<IterableIterator<D, Self>>>;
+}
diff --git a/components/script_bindings/root.rs b/components/script_bindings/root.rs
index cc3be843593..3d0378f0df1 100644
--- a/components/script_bindings/root.rs
+++ b/components/script_bindings/root.rs
@@ -412,7 +412,7 @@ impl RootCollection {
             .rposition(|r| std::ptr::addr_eq(*r as *const (), object as *const ()))
         {
             Some(idx) => {
-                roots.remove(idx);
+                roots.swap_remove(idx);
             },
             None => panic!("Can't remove a root that was never rooted!"),
         }
@@ -440,3 +440,23 @@ pub unsafe fn trace_roots(tracer: *mut JSTracer) {
 pub fn assert_in_script() {
     debug_assert!(thread_state::get().is_script());
 }
+
+/// Get a slice of references to DOM objects.
+pub trait DomSlice<T>
+where
+    T: JSTraceable + DomObject,
+{
+    /// Returns the slice of `T` references.
+    fn r(&self) -> &[&T];
+}
+
+impl<T> DomSlice<T> for [Dom<T>]
+where
+    T: JSTraceable + DomObject,
+{
+    #[inline]
+    fn r(&self) -> &[&T] {
+        let _ = mem::transmute::<Dom<T>, &T>;
+        unsafe { &*(self as *const [Dom<T>] as *const [&T]) }
+    }
+}
diff --git a/components/script_bindings/settings_stack.rs b/components/script_bindings/settings_stack.rs
new file mode 100644
index 00000000000..cdc8c2a029d
--- /dev/null
+++ b/components/script_bindings/settings_stack.rs
@@ -0,0 +1,142 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::marker::PhantomData;
+use std::thread;
+
+use js::jsapi::{HideScriptedCaller, UnhideScriptedCaller};
+use js::rust::Runtime;
+
+use crate::DomTypes;
+use crate::interfaces::{DomHelpers, GlobalScopeHelpers};
+use crate::root::{Dom, DomRoot};
+use crate::script_runtime::CanGc;
+
+#[derive(Debug, Eq, JSTraceable, PartialEq)]
+pub enum StackEntryKind {
+    Incumbent,
+    Entry,
+}
+
+#[cfg_attr(crown, allow(crown::unrooted_must_root))]
+#[derive(JSTraceable)]
+pub struct StackEntry<D: DomTypes> {
+    pub global: Dom<D::GlobalScope>,
+    pub kind: StackEntryKind,
+}
+
+/// RAII struct that pushes and pops entries from the script settings stack.
+pub struct GenericAutoEntryScript<D: DomTypes> {
+    global: DomRoot<D::GlobalScope>,
+    #[cfg(feature = "tracing")]
+    #[allow(dead_code)]
+    span: tracing::span::EnteredSpan,
+}
+
+impl<D: DomTypes> GenericAutoEntryScript<D> {
+    /// <https://html.spec.whatwg.org/multipage/#prepare-to-run-script>
+    pub fn new(global: &D::GlobalScope) -> Self {
+        let settings_stack = <D as DomHelpers<D>>::settings_stack();
+        settings_stack.with(|stack| {
+            trace!("Prepare to run script with {:p}", global);
+            let mut stack = stack.borrow_mut();
+            stack.push(StackEntry {
+                global: Dom::from_ref(global),
+                kind: StackEntryKind::Entry,
+            });
+            Self {
+                global: DomRoot::from_ref(global),
+                #[cfg(feature = "tracing")]
+                span: tracing::info_span!(
+                    "ScriptEvaluate",
+                    servo_profiling = true,
+                    url = global.get_url().to_string(),
+                )
+                .entered(),
+            }
+        })
+    }
+}
+
+impl<D: DomTypes> Drop for GenericAutoEntryScript<D> {
+    /// <https://html.spec.whatwg.org/multipage/#clean-up-after-running-script>
+    fn drop(&mut self) {
+        let settings_stack = <D as DomHelpers<D>>::settings_stack();
+        settings_stack.with(|stack| {
+            let mut stack = stack.borrow_mut();
+            let entry = stack.pop().unwrap();
+            assert_eq!(
+                &*entry.global as *const D::GlobalScope, &*self.global as *const D::GlobalScope,
+                "Dropped AutoEntryScript out of order."
+            );
+            assert_eq!(entry.kind, StackEntryKind::Entry);
+            trace!("Clean up after running script with {:p}", &*entry.global);
+        });
+
+        // Step 5
+        if !thread::panicking() && D::GlobalScope::incumbent().is_none() {
+            self.global.perform_a_microtask_checkpoint(CanGc::note());
+        }
+    }
+}
+
+/// RAII struct that pushes and pops entries from the script settings stack.
+pub struct GenericAutoIncumbentScript<D: DomTypes> {
+    global: usize,
+    _marker: PhantomData<D>,
+}
+
+impl<D: DomTypes> GenericAutoIncumbentScript<D> {
+    /// <https://html.spec.whatwg.org/multipage/#prepare-to-run-a-callback>
+    pub fn new(global: &D::GlobalScope) -> Self {
+        // Step 2-3.
+        unsafe {
+            let cx =
+                Runtime::get().expect("Creating a new incumbent script after runtime shutdown");
+            HideScriptedCaller(cx.as_ptr());
+        }
+        let settings_stack = <D as DomHelpers<D>>::settings_stack();
+        settings_stack.with(|stack| {
+            trace!("Prepare to run a callback with {:p}", global);
+            // Step 1.
+            let mut stack = stack.borrow_mut();
+            stack.push(StackEntry {
+                global: Dom::from_ref(global),
+                kind: StackEntryKind::Incumbent,
+            });
+            Self {
+                global: global as *const _ as usize,
+                _marker: PhantomData,
+            }
+        })
+    }
+}
+
+impl<D: DomTypes> Drop for GenericAutoIncumbentScript<D> {
+    /// <https://html.spec.whatwg.org/multipage/#clean-up-after-running-a-callback>
+    fn drop(&mut self) {
+        let settings_stack = <D as DomHelpers<D>>::settings_stack();
+        settings_stack.with(|stack| {
+            // Step 4.
+            let mut stack = stack.borrow_mut();
+            let entry = stack.pop().unwrap();
+            // Step 3.
+            assert_eq!(
+                &*entry.global as *const D::GlobalScope as usize, self.global,
+                "Dropped AutoIncumbentScript out of order."
+            );
+            assert_eq!(entry.kind, StackEntryKind::Incumbent);
+            trace!(
+                "Clean up after running a callback with {:p}",
+                &*entry.global
+            );
+        });
+        unsafe {
+            // Step 1-2.
+            if let Some(cx) = Runtime::get() {
+                UnhideScriptedCaller(cx.as_ptr());
+            }
+        }
+    }
+}
diff --git a/components/script_bindings/str.rs b/components/script_bindings/str.rs
index b1942c63d46..0ef6e0c528a 100644
--- a/components/script_bindings/str.rs
+++ b/components/script_bindings/str.rs
@@ -10,14 +10,19 @@ use std::marker::PhantomData;
 use std::ops::{Deref, DerefMut};
 use std::str::FromStr;
 use std::sync::LazyLock;
-use std::{fmt, ops, str};
+use std::{fmt, ops, slice, str};
 
 use cssparser::CowRcStr;
 use html5ever::{LocalName, Namespace};
+use js::rust::wrappers::ToJSON;
+use js::rust::{HandleObject, HandleValue};
 use num_traits::Zero;
 use regex::Regex;
 use stylo_atoms::Atom;
 
+use crate::error::Error;
+use crate::script_runtime::JSContext as SafeJSContext;
+
 /// Encapsulates the IDL `ByteString` type.
 #[derive(Clone, Debug, Default, Eq, JSTraceable, MallocSizeOf, PartialEq)]
 pub struct ByteString(Vec<u8>);
@@ -78,7 +83,7 @@ impl ops::Deref for ByteString {
 
 /// A string that is constructed from a UCS-2 buffer by replacing invalid code
 /// points with the replacement character.
-#[derive(Clone, Default, Eq, Hash, MallocSizeOf, Ord, PartialEq, PartialOrd)]
+#[derive(Clone, Debug, Default, Eq, Hash, MallocSizeOf, Ord, PartialEq, PartialOrd)]
 pub struct USVString(pub String);
 
 impl Borrow<str> for USVString {
@@ -293,6 +298,64 @@ impl DOMString {
     }
 }
 
+/// Because this converts to a DOMString it becomes UTF-8 encoded which is closer to
+/// the spec definition of <https://infra.spec.whatwg.org/#serialize-a-javascript-value-to-json-bytes>
+/// but we generally do not operate on anything that is truly a WTF-16 string.
+///
+/// <https://infra.spec.whatwg.org/#serialize-a-javascript-value-to-a-json-string>
+pub fn serialize_jsval_to_json_utf8(
+    cx: SafeJSContext,
+    data: HandleValue,
+) -> Result<DOMString, Error> {
+    #[repr(C)]
+    struct ToJSONCallbackData {
+        string: Option<String>,
+    }
+
+    let mut out_str = ToJSONCallbackData { string: None };
+
+    #[allow(unsafe_code)]
+    unsafe extern "C" fn write_callback(
+        string: *const u16,
+        len: u32,
+        data: *mut std::ffi::c_void,
+    ) -> bool {
+        let data = data as *mut ToJSONCallbackData;
+        let string_chars = slice::from_raw_parts(string, len as usize);
+        (*data)
+            .string
+            .get_or_insert_with(Default::default)
+            .push_str(&String::from_utf16_lossy(string_chars));
+        true
+    }
+
+    // 1. Let result be ? Call(%JSON.stringify%, undefined, « value »).
+    unsafe {
+        let stringify_result = ToJSON(
+            *cx,
+            data,
+            HandleObject::null(),
+            HandleValue::null(),
+            Some(write_callback),
+            &mut out_str as *mut ToJSONCallbackData as *mut _,
+        );
+        // Note: ToJSON returns false when a JS error is thrown, so we need to return
+        // JSFailed to propagate the raised exception
+        if !stringify_result {
+            return Err(Error::JSFailed);
+        }
+    }
+
+    // 2. If result is undefined, then throw a TypeError.
+    // Note: ToJSON will not call the callback if the data cannot be serialized.
+    // 3. Assert: result is a string.
+    // 4. Return result.
+    out_str
+        .string
+        .map(Into::into)
+        .ok_or_else(|| Error::Type("unable to serialize JSON".to_owned()))
+}
+
 impl Borrow<str> for DOMString {
     #[inline]
     fn borrow(&self) -> &str {
diff --git a/components/script_bindings/trace.rs b/components/script_bindings/trace.rs
index 3248fbfc67c..dbdf5be94df 100644
--- a/components/script_bindings/trace.rs
+++ b/components/script_bindings/trace.rs
@@ -3,16 +3,21 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use std::cell::OnceCell;
+use std::fmt::Display;
 use std::hash::{BuildHasher, Hash};
 use std::marker::PhantomData;
+use std::mem;
+use std::ops::{Deref, DerefMut};
 
 use crossbeam_channel::Sender;
 use html5ever::interface::{Tracer as HtmlTracer, TreeSink};
 use html5ever::tokenizer::{TokenSink, Tokenizer};
 use html5ever::tree_builder::TreeBuilder;
 use indexmap::IndexMap;
+use js::gc::{GCMethods, Handle};
 use js::glue::CallObjectTracer;
 use js::jsapi::{GCTraceKindToAscii, Heap, JSObject, JSTracer, TraceKind};
+use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
 use parking_lot::RwLock;
 use servo_arc::Arc as ServoArc;
 use smallvec::SmallVec;
@@ -46,7 +51,11 @@ pub unsafe fn trace_reflector(tracer: *mut JSTracer, description: &str, reflecto
 ///
 /// # Safety
 /// tracer must point to a valid, non-null JS tracer.
-pub unsafe fn trace_object(tracer: *mut JSTracer, description: &str, obj: &Heap<*mut JSObject>) {
+pub(crate) unsafe fn trace_object(
+    tracer: *mut JSTracer,
+    description: &str,
+    obj: &Heap<*mut JSObject>,
+) {
     unsafe {
         trace!("tracing {}", description);
         CallObjectTracer(
@@ -308,3 +317,101 @@ unsafe impl<Handle: JSTraceable + Clone, Sink: JSTraceable + XmlTreeSink<Handle
         tree_builder.sink.trace(trc);
     }
 }
+
+/// Roots any JSTraceable thing
+///
+/// If you have a valid DomObject, use DomRoot.
+/// If you have GC things like *mut JSObject or JSVal, use rooted!.
+/// If you have an arbitrary number of DomObjects to root, use rooted_vec!.
+/// If you know what you're doing, use this.
+#[cfg_attr(crown, crown::unrooted_must_root_lint::allow_unrooted_interior)]
+pub struct RootedTraceableBox<T: JSTraceable + 'static>(js::gc::RootedTraceableBox<T>);
+
+unsafe impl<T: JSTraceable + 'static> JSTraceable for RootedTraceableBox<T> {
+    unsafe fn trace(&self, tracer: *mut JSTracer) {
+        self.0.trace(tracer);
+    }
+}
+
+impl<T: JSTraceable + 'static> RootedTraceableBox<T> {
+    /// DomRoot a JSTraceable thing for the life of this RootedTraceableBox
+    pub fn new(traceable: T) -> RootedTraceableBox<T> {
+        Self(js::gc::RootedTraceableBox::new(traceable))
+    }
+
+    /// Consumes a boxed JSTraceable and roots it for the life of this RootedTraceableBox.
+    pub fn from_box(boxed_traceable: Box<T>) -> RootedTraceableBox<T> {
+        Self(js::gc::RootedTraceableBox::from_box(boxed_traceable))
+    }
+}
+
+impl<T> RootedTraceableBox<Heap<T>>
+where
+    Heap<T>: JSTraceable + 'static,
+    T: GCMethods + Copy,
+{
+    pub fn handle(&self) -> Handle<T> {
+        self.0.handle()
+    }
+}
+
+impl<T: JSTraceable + MallocSizeOf> MallocSizeOf for RootedTraceableBox<T> {
+    fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
+        // Briefly resurrect the real Box value so we can rely on the existing calculations.
+        // Then immediately forget about it again to avoid dropping the box.
+        let inner = unsafe { Box::from_raw(self.0.ptr()) };
+        let size = inner.size_of(ops);
+        mem::forget(inner);
+        size
+    }
+}
+
+impl<T: JSTraceable + Default> Default for RootedTraceableBox<T> {
+    fn default() -> RootedTraceableBox<T> {
+        RootedTraceableBox::new(T::default())
+    }
+}
+
+impl<T: JSTraceable> Deref for RootedTraceableBox<T> {
+    type Target = T;
+    fn deref(&self) -> &T {
+        self.0.deref()
+    }
+}
+
+impl<T: JSTraceable> DerefMut for RootedTraceableBox<T> {
+    fn deref_mut(&mut self) -> &mut T {
+        self.0.deref_mut()
+    }
+}
+
+/// Wrapper type for nop traceble
+///
+/// SAFETY: Inner type must not impl JSTraceable
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[cfg_attr(crown, crown::trace_in_no_trace_lint::must_not_have_traceable)]
+pub(crate) struct NoTrace<T>(pub(crate) T);
+
+impl<T: Display> Display for NoTrace<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl<T> From<T> for NoTrace<T> {
+    fn from(item: T) -> Self {
+        Self(item)
+    }
+}
+
+#[allow(unsafe_code)]
+unsafe impl<T> JSTraceable for NoTrace<T> {
+    #[inline]
+    unsafe fn trace(&self, _: *mut ::js::jsapi::JSTracer) {}
+}
+
+impl<T: MallocSizeOf> MallocSizeOf for NoTrace<T> {
+    fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
+        self.0.size_of(ops)
+    }
+}
diff --git a/components/script_bindings/utils.rs b/components/script_bindings/utils.rs
index fd307fd5ab3..fa4982b9904 100644
--- a/components/script_bindings/utils.rs
+++ b/components/script_bindings/utils.rs
@@ -2,13 +2,50 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use std::os::raw::c_void;
+use std::ffi::CString;
+use std::os::raw::{c_char, c_void};
+use std::ptr::{self, NonNull};
+use std::slice;
 
+use js::conversions::ToJSValConvertible;
+use js::gc::Handle;
+use js::glue::{
+    AppendToIdVector, CallJitGetterOp, CallJitMethodOp, CallJitSetterOp, JS_GetReservedSlot,
+    RUST_FUNCTION_VALUE_TO_JITINFO,
+};
+use js::jsapi::{
+    AtomToLinearString, CallArgs, ExceptionStackBehavior, GetLinearStringCharAt,
+    GetLinearStringLength, GetNonCCWObjectGlobal, HandleId as RawHandleId,
+    HandleObject as RawHandleObject, Heap, JS_AtomizeStringN, JS_ClearPendingException,
+    JS_DeprecatedStringHasLatin1Chars, JS_GetLatin1StringCharsAndLength, JS_IsExceptionPending,
+    JS_IsGlobalObject, JS_MayResolveStandardClass, JS_NewEnumerateStandardClasses,
+    JS_ResolveStandardClass, JSAtom, JSAtomState, JSContext, JSJitInfo, JSObject, JSTracer,
+    MutableHandleIdVector as RawMutableHandleIdVector, MutableHandleValue as RawMutableHandleValue,
+    ObjectOpResult, PropertyKey, StringIsArrayIndex, jsid,
+};
+use js::jsid::StringId;
+use js::jsval::{JSVal, UndefinedValue};
+use js::rust::wrappers::{
+    CallOriginalPromiseReject, JS_DeletePropertyById, JS_ForwardGetPropertyTo,
+    JS_GetPendingException, JS_GetProperty, JS_GetPrototype, JS_HasProperty, JS_HasPropertyById,
+    JS_SetPendingException, JS_SetProperty,
+};
+use js::rust::{
+    HandleId, HandleObject, HandleValue, MutableHandleValue, Runtime, ToString, get_object_class,
+};
+use js::{JS_CALLEE, rooted};
 use malloc_size_of::MallocSizeOfOps;
 
+use crate::DomTypes;
 use crate::codegen::Globals::Globals;
 use crate::codegen::InheritTypes::TopTypeId;
-use crate::codegen::PrototypeList::{self, MAX_PROTO_CHAIN_LENGTH};
+use crate::codegen::PrototypeList::{self, MAX_PROTO_CHAIN_LENGTH, PROTO_OR_IFACE_LENGTH};
+use crate::conversions::{PrototypeCheck, jsstring_to_str, private_from_proto_check};
+use crate::error::throw_invalid_this;
+use crate::interfaces::DomHelpers;
+use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
+use crate::str::DOMString;
+use crate::trace::trace_object;
 
 /// The struct that holds inheritance information for DOM object reflectors.
 #[derive(Clone, Copy)]
@@ -46,3 +83,631 @@ impl Clone for DOMJSClass {
     }
 }
 unsafe impl Sync for DOMJSClass {}
+
+/// The index of the slot where the object holder of that interface's
+/// unforgeable members are defined.
+pub(crate) const DOM_PROTO_UNFORGEABLE_HOLDER_SLOT: u32 = 0;
+
+/// The index of the slot that contains a reference to the ProtoOrIfaceArray.
+// All DOM globals must have a slot at DOM_PROTOTYPE_SLOT.
+pub(crate) const DOM_PROTOTYPE_SLOT: u32 = js::JSCLASS_GLOBAL_SLOT_COUNT;
+
+/// The flag set on the `JSClass`es for DOM global objects.
+// NOTE: This is baked into the Ion JIT as 0 in codegen for LGetDOMProperty and
+// LSetDOMProperty. Those constants need to be changed accordingly if this value
+// changes.
+pub(crate) const JSCLASS_DOM_GLOBAL: u32 = js::JSCLASS_USERBIT1;
+
+/// Returns the ProtoOrIfaceArray for the given global object.
+/// Fails if `global` is not a DOM global object.
+///
+/// # Safety
+/// `global` must point to a valid, non-null JS object.
+pub(crate) unsafe fn get_proto_or_iface_array(global: *mut JSObject) -> *mut ProtoOrIfaceArray {
+    assert_ne!(((*get_object_class(global)).flags & JSCLASS_DOM_GLOBAL), 0);
+    let mut slot = UndefinedValue();
+    JS_GetReservedSlot(global, DOM_PROTOTYPE_SLOT, &mut slot);
+    slot.to_private() as *mut ProtoOrIfaceArray
+}
+
+/// An array of *mut JSObject of size PROTO_OR_IFACE_LENGTH.
+pub type ProtoOrIfaceArray = [*mut JSObject; PROTO_OR_IFACE_LENGTH];
+
+/// Gets the property `id` on  `proxy`'s prototype. If it exists, `*found` is
+/// set to true and `*vp` to the value, otherwise `*found` is set to false.
+///
+/// Returns false on JSAPI failure.
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+/// `found` must point to a valid, non-null bool.
+pub(crate) unsafe fn get_property_on_prototype(
+    cx: *mut JSContext,
+    proxy: HandleObject,
+    receiver: HandleValue,
+    id: HandleId,
+    found: *mut bool,
+    vp: MutableHandleValue,
+) -> bool {
+    rooted!(in(cx) let mut proto = ptr::null_mut::<JSObject>());
+    if !JS_GetPrototype(cx, proxy, proto.handle_mut()) || proto.is_null() {
+        *found = false;
+        return true;
+    }
+    let mut has_property = false;
+    if !JS_HasPropertyById(cx, proto.handle(), id, &mut has_property) {
+        return false;
+    }
+    *found = has_property;
+    if !has_property {
+        return true;
+    }
+
+    JS_ForwardGetPropertyTo(cx, proto.handle(), id, receiver, vp)
+}
+
+/// Get an array index from the given `jsid`. Returns `None` if the given
+/// `jsid` is not an integer.
+pub fn get_array_index_from_id(id: HandleId) -> Option<u32> {
+    let raw_id = *id;
+    if raw_id.is_int() {
+        return Some(raw_id.to_int() as u32);
+    }
+
+    if raw_id.is_void() || !raw_id.is_string() {
+        return None;
+    }
+
+    unsafe {
+        let atom = raw_id.to_string() as *mut JSAtom;
+        let s = AtomToLinearString(atom);
+        if GetLinearStringLength(s) == 0 {
+            return None;
+        }
+
+        let chars = [GetLinearStringCharAt(s, 0)];
+        let first_char = char::decode_utf16(chars.iter().cloned())
+            .next()
+            .map_or('\0', |r| r.unwrap_or('\0'));
+        if first_char.is_ascii_lowercase() {
+            return None;
+        }
+
+        let mut i = 0;
+        if StringIsArrayIndex(s, &mut i) {
+            Some(i)
+        } else {
+            None
+        }
+    }
+
+    /*let s = jsstr_to_string(cx, RUST_JSID_TO_STRING(raw_id));
+    if s.len() == 0 {
+        return None;
+    }
+
+    let first = s.chars().next().unwrap();
+    if first.is_ascii_lowercase() {
+        return None;
+    }
+
+    let mut i: u32 = 0;
+    let is_array = if s.is_ascii() {
+        let chars = s.as_bytes();
+        StringIsArrayIndex1(chars.as_ptr() as *const _, chars.len() as u32, &mut i)
+    } else {
+        let chars = s.encode_utf16().collect::<Vec<u16>>();
+        let slice = chars.as_slice();
+        StringIsArrayIndex2(slice.as_ptr(), chars.len() as u32, &mut i)
+    };
+
+    if is_array {
+        Some(i)
+    } else {
+        None
+    }*/
+}
+
+/// Find the enum equivelent of a string given by `v` in `pairs`.
+/// Returns `Err(())` on JSAPI failure (there is a pending exception), and
+/// `Ok((None, value))` if there was no matching string.
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+#[allow(clippy::result_unit_err)]
+pub(crate) unsafe fn find_enum_value<'a, T>(
+    cx: *mut JSContext,
+    v: HandleValue,
+    pairs: &'a [(&'static str, T)],
+) -> Result<(Option<&'a T>, DOMString), ()> {
+    match ptr::NonNull::new(ToString(cx, v)) {
+        Some(jsstr) => {
+            let search = jsstring_to_str(cx, jsstr);
+            Ok((
+                pairs
+                    .iter()
+                    .find(|&&(key, _)| search == *key)
+                    .map(|(_, ev)| ev),
+                search,
+            ))
+        },
+        None => Err(()),
+    }
+}
+
+/// Get the property with name `property` from `object`.
+/// Returns `Err(())` on JSAPI failure (there is a pending exception), and
+/// `Ok(false)` if there was no property with the given name.
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+#[allow(clippy::result_unit_err)]
+pub unsafe fn get_dictionary_property(
+    cx: *mut JSContext,
+    object: HandleObject,
+    property: &str,
+    rval: MutableHandleValue,
+    _can_gc: CanGc,
+) -> Result<bool, ()> {
+    unsafe fn has_property(
+        cx: *mut JSContext,
+        object: HandleObject,
+        property: &CString,
+        found: &mut bool,
+    ) -> bool {
+        JS_HasProperty(cx, object, property.as_ptr(), found)
+    }
+    unsafe fn get_property(
+        cx: *mut JSContext,
+        object: HandleObject,
+        property: &CString,
+        value: MutableHandleValue,
+    ) -> bool {
+        JS_GetProperty(cx, object, property.as_ptr(), value)
+    }
+
+    let property = CString::new(property).unwrap();
+    if object.get().is_null() {
+        return Ok(false);
+    }
+
+    let mut found = false;
+    if !has_property(cx, object, &property, &mut found) {
+        return Err(());
+    }
+
+    if !found {
+        return Ok(false);
+    }
+
+    if !get_property(cx, object, &property, rval) {
+        return Err(());
+    }
+
+    Ok(true)
+}
+
+/// Set the property with name `property` from `object`.
+/// Returns `Err(())` on JSAPI failure, or null object,
+/// and Ok(()) otherwise
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+#[allow(clippy::result_unit_err)]
+pub unsafe fn set_dictionary_property(
+    cx: *mut JSContext,
+    object: HandleObject,
+    property: &str,
+    value: HandleValue,
+) -> Result<(), ()> {
+    if object.get().is_null() {
+        return Err(());
+    }
+
+    let property = CString::new(property).unwrap();
+    if !JS_SetProperty(cx, object, property.as_ptr(), value) {
+        return Err(());
+    }
+
+    Ok(())
+}
+
+/// Returns whether `proxy` has a property `id` on its prototype.
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+pub unsafe fn has_property_on_prototype(
+    cx: *mut JSContext,
+    proxy: HandleObject,
+    id: HandleId,
+    found: &mut bool,
+) -> bool {
+    rooted!(in(cx) let mut proto = ptr::null_mut::<JSObject>());
+    if !JS_GetPrototype(cx, proxy, proto.handle_mut()) {
+        return false;
+    }
+    assert!(!proto.is_null());
+    JS_HasPropertyById(cx, proto.handle(), id, found)
+}
+
+/// Deletes the property `id` from `object`.
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+pub(crate) unsafe fn delete_property_by_id(
+    cx: *mut JSContext,
+    object: HandleObject,
+    id: HandleId,
+    bp: *mut ObjectOpResult,
+) -> bool {
+    JS_DeletePropertyById(cx, object, id, bp)
+}
+
+unsafe fn generic_call<const EXCEPTION_TO_REJECTION: bool>(
+    cx: *mut JSContext,
+    argc: libc::c_uint,
+    vp: *mut JSVal,
+    is_lenient: bool,
+    call: unsafe extern "C" fn(
+        *const JSJitInfo,
+        *mut JSContext,
+        RawHandleObject,
+        *mut libc::c_void,
+        u32,
+        *mut JSVal,
+    ) -> bool,
+    can_gc: CanGc,
+) -> bool {
+    let args = CallArgs::from_vp(vp, argc);
+
+    let info = RUST_FUNCTION_VALUE_TO_JITINFO(JS_CALLEE(cx, vp));
+    let proto_id = (*info).__bindgen_anon_2.protoID;
+    let cx = SafeJSContext::from_ptr(cx);
+
+    let thisobj = args.thisv();
+    if !thisobj.get().is_null_or_undefined() && !thisobj.get().is_object() {
+        throw_invalid_this(cx, proto_id);
+        return if EXCEPTION_TO_REJECTION {
+            exception_to_promise(*cx, args.rval(), can_gc)
+        } else {
+            false
+        };
+    }
+
+    rooted!(in(*cx) let obj = if thisobj.get().is_object() {
+        thisobj.get().to_object()
+    } else {
+        GetNonCCWObjectGlobal(JS_CALLEE(*cx, vp).to_object_or_null())
+    });
+    let depth = (*info).__bindgen_anon_3.depth as usize;
+    let proto_check = PrototypeCheck::Depth { depth, proto_id };
+    let this = match private_from_proto_check(obj.get(), *cx, proto_check) {
+        Ok(val) => val,
+        Err(()) => {
+            if is_lenient {
+                debug_assert!(!JS_IsExceptionPending(*cx));
+                *vp = UndefinedValue();
+                return true;
+            } else {
+                throw_invalid_this(cx, proto_id);
+                return if EXCEPTION_TO_REJECTION {
+                    exception_to_promise(*cx, args.rval(), can_gc)
+                } else {
+                    false
+                };
+            }
+        },
+    };
+    call(
+        info,
+        *cx,
+        obj.handle().into(),
+        this as *mut libc::c_void,
+        argc,
+        vp,
+    )
+}
+
+/// Generic method of IDL interface.
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+/// `vp` must point to a VALID, non-null JSVal.
+pub(crate) unsafe extern "C" fn generic_method<const EXCEPTION_TO_REJECTION: bool>(
+    cx: *mut JSContext,
+    argc: libc::c_uint,
+    vp: *mut JSVal,
+) -> bool {
+    generic_call::<EXCEPTION_TO_REJECTION>(cx, argc, vp, false, CallJitMethodOp, CanGc::note())
+}
+
+/// Generic getter of IDL interface.
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+/// `vp` must point to a VALID, non-null JSVal.
+pub(crate) unsafe extern "C" fn generic_getter<const EXCEPTION_TO_REJECTION: bool>(
+    cx: *mut JSContext,
+    argc: libc::c_uint,
+    vp: *mut JSVal,
+) -> bool {
+    generic_call::<EXCEPTION_TO_REJECTION>(cx, argc, vp, false, CallJitGetterOp, CanGc::note())
+}
+
+/// Generic lenient getter of IDL interface.
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+/// `vp` must point to a VALID, non-null JSVal.
+pub(crate) unsafe extern "C" fn generic_lenient_getter<const EXCEPTION_TO_REJECTION: bool>(
+    cx: *mut JSContext,
+    argc: libc::c_uint,
+    vp: *mut JSVal,
+) -> bool {
+    generic_call::<EXCEPTION_TO_REJECTION>(cx, argc, vp, true, CallJitGetterOp, CanGc::note())
+}
+
+unsafe extern "C" fn call_setter(
+    info: *const JSJitInfo,
+    cx: *mut JSContext,
+    handle: RawHandleObject,
+    this: *mut libc::c_void,
+    argc: u32,
+    vp: *mut JSVal,
+) -> bool {
+    if !CallJitSetterOp(info, cx, handle, this, argc, vp) {
+        return false;
+    }
+    *vp = UndefinedValue();
+    true
+}
+
+/// Generic setter of IDL interface.
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+/// `vp` must point to a VALID, non-null JSVal.
+pub(crate) unsafe extern "C" fn generic_setter(
+    cx: *mut JSContext,
+    argc: libc::c_uint,
+    vp: *mut JSVal,
+) -> bool {
+    generic_call::<false>(cx, argc, vp, false, call_setter, CanGc::note())
+}
+
+/// Generic lenient setter of IDL interface.
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+/// `vp` must point to a VALID, non-null JSVal.
+pub(crate) unsafe extern "C" fn generic_lenient_setter(
+    cx: *mut JSContext,
+    argc: libc::c_uint,
+    vp: *mut JSVal,
+) -> bool {
+    generic_call::<false>(cx, argc, vp, true, call_setter, CanGc::note())
+}
+
+/// <https://searchfox.org/mozilla-central/rev/7279a1df13a819be254fd4649e07c4ff93e4bd45/dom/bindings/BindingUtils.cpp#3300>
+/// # Safety
+///
+/// `cx` must point to a valid, non-null JSContext.
+/// `vp` must point to a VALID, non-null JSVal.
+pub(crate) unsafe extern "C" fn generic_static_promise_method(
+    cx: *mut JSContext,
+    argc: libc::c_uint,
+    vp: *mut JSVal,
+) -> bool {
+    let args = CallArgs::from_vp(vp, argc);
+
+    let info = RUST_FUNCTION_VALUE_TO_JITINFO(JS_CALLEE(cx, vp));
+    assert!(!info.is_null());
+    // TODO: we need safe wrappers for this in mozjs!
+    //assert_eq!((*info)._bitfield_1, JSJitInfo_OpType::StaticMethod as u8)
+    let static_fn = (*info).__bindgen_anon_1.staticMethod.unwrap();
+    if static_fn(cx, argc, vp) {
+        return true;
+    }
+    exception_to_promise(cx, args.rval(), CanGc::note())
+}
+
+/// Coverts exception to promise rejection
+///
+/// <https://searchfox.org/mozilla-central/rev/b220e40ff2ee3d10ce68e07d8a8a577d5558e2a2/dom/bindings/BindingUtils.cpp#3315>
+///
+/// # Safety
+/// `cx` must point to a valid, non-null JSContext.
+pub(crate) unsafe fn exception_to_promise(
+    cx: *mut JSContext,
+    rval: RawMutableHandleValue,
+    _can_gc: CanGc,
+) -> bool {
+    rooted!(in(cx) let mut exception = UndefinedValue());
+    if !JS_GetPendingException(cx, exception.handle_mut()) {
+        return false;
+    }
+    JS_ClearPendingException(cx);
+    if let Some(promise) = NonNull::new(CallOriginalPromiseReject(cx, exception.handle())) {
+        promise.to_jsval(cx, MutableHandleValue::from_raw(rval));
+        true
+    } else {
+        // We just give up.  Put the exception back.
+        JS_SetPendingException(cx, exception.handle(), ExceptionStackBehavior::Capture);
+        false
+    }
+}
+
+/// Trace the resources held by reserved slots of a global object
+///
+/// # Safety
+/// `tracer` must point to a valid, non-null JSTracer.
+/// `obj` must point to a valid, non-null JSObject.
+pub(crate) unsafe fn trace_global(tracer: *mut JSTracer, obj: *mut JSObject) {
+    let array = get_proto_or_iface_array(obj);
+    for proto in (*array).iter() {
+        if !proto.is_null() {
+            trace_object(
+                tracer,
+                "prototype",
+                &*(proto as *const *mut JSObject as *const Heap<*mut JSObject>),
+            );
+        }
+    }
+}
+
+// Generic method for returning libc::c_void from caller
+pub trait AsVoidPtr {
+    fn as_void_ptr(&self) -> *const libc::c_void;
+}
+impl<T> AsVoidPtr for T {
+    fn as_void_ptr(&self) -> *const libc::c_void {
+        self as *const T as *const libc::c_void
+    }
+}
+
+// Generic method for returning c_char from caller
+pub(crate) trait AsCCharPtrPtr {
+    fn as_c_char_ptr(&self) -> *const c_char;
+}
+
+impl AsCCharPtrPtr for [u8] {
+    fn as_c_char_ptr(&self) -> *const c_char {
+        self as *const [u8] as *const c_char
+    }
+}
+
+/// Enumerate lazy properties of a global object.
+/// Modeled after <https://github.com/mozilla/gecko-dev/blob/3fd619f47/dom/bindings/BindingUtils.cpp#L2814>
+pub(crate) unsafe extern "C" fn enumerate_global(
+    cx: *mut JSContext,
+    obj: RawHandleObject,
+    props: RawMutableHandleIdVector,
+    enumerable_only: bool,
+) -> bool {
+    assert!(JS_IsGlobalObject(obj.get()));
+    JS_NewEnumerateStandardClasses(cx, obj, props, enumerable_only)
+}
+
+/// Enumerate lazy properties of a global object that is a Window.
+/// <https://github.com/mozilla/gecko-dev/blob/3fd619f47/dom/base/nsGlobalWindowInner.cpp#3297>
+pub(crate) unsafe extern "C" fn enumerate_window<D: DomTypes>(
+    cx: *mut JSContext,
+    obj: RawHandleObject,
+    props: RawMutableHandleIdVector,
+    enumerable_only: bool,
+) -> bool {
+    if !enumerate_global(cx, obj, props, enumerable_only) {
+        return false;
+    }
+
+    if enumerable_only {
+        // All WebIDL interface names are defined as non-enumerable, so there's
+        // no point in checking them if we're only returning enumerable names.
+        return true;
+    }
+
+    let cx = SafeJSContext::from_ptr(cx);
+    let obj = Handle::from_raw(obj);
+    for (name, interface) in <D as DomHelpers<D>>::interface_map() {
+        if !(interface.enabled)(cx, obj) {
+            continue;
+        }
+        let s = JS_AtomizeStringN(*cx, name.as_c_char_ptr(), name.len());
+        rooted!(in(*cx) let id = StringId(s));
+        if s.is_null() || !AppendToIdVector(props, id.handle().into()) {
+            return false;
+        }
+    }
+    true
+}
+
+/// Returns true if the resolve hook for this global may resolve the provided id.
+/// <https://searchfox.org/mozilla-central/rev/f3c8c63a097b61bb1f01e13629b9514e09395947/dom/bindings/BindingUtils.cpp#2809>
+/// <https://searchfox.org/mozilla-central/rev/f3c8c63a097b61bb1f01e13629b9514e09395947/js/public/Class.h#283-291>
+pub(crate) unsafe extern "C" fn may_resolve_global(
+    names: *const JSAtomState,
+    id: PropertyKey,
+    maybe_obj: *mut JSObject,
+) -> bool {
+    JS_MayResolveStandardClass(names, id, maybe_obj)
+}
+
+/// Returns true if the resolve hook for this window may resolve the provided id.
+/// <https://searchfox.org/mozilla-central/rev/f3c8c63a097b61bb1f01e13629b9514e09395947/dom/base/nsGlobalWindowInner.cpp#3275>
+/// <https://searchfox.org/mozilla-central/rev/f3c8c63a097b61bb1f01e13629b9514e09395947/js/public/Class.h#283-291>
+pub(crate) unsafe extern "C" fn may_resolve_window<D: DomTypes>(
+    names: *const JSAtomState,
+    id: PropertyKey,
+    maybe_obj: *mut JSObject,
+) -> bool {
+    if may_resolve_global(names, id, maybe_obj) {
+        return true;
+    }
+
+    let cx = Runtime::get()
+        .expect("There must be a JSContext active")
+        .as_ptr();
+    let Ok(bytes) = latin1_bytes_from_id(cx, id) else {
+        return false;
+    };
+
+    <D as DomHelpers<D>>::interface_map().contains_key(bytes)
+}
+
+/// Resolve a lazy global property, for interface objects and named constructors.
+pub(crate) unsafe extern "C" fn resolve_global(
+    cx: *mut JSContext,
+    obj: RawHandleObject,
+    id: RawHandleId,
+    rval: *mut bool,
+) -> bool {
+    assert!(JS_IsGlobalObject(obj.get()));
+    JS_ResolveStandardClass(cx, obj, id, rval)
+}
+
+/// Resolve a lazy global property for a Window global.
+pub(crate) unsafe extern "C" fn resolve_window<D: DomTypes>(
+    cx: *mut JSContext,
+    obj: RawHandleObject,
+    id: RawHandleId,
+    rval: *mut bool,
+) -> bool {
+    if !resolve_global(cx, obj, id, rval) {
+        return false;
+    }
+
+    if *rval {
+        return true;
+    }
+    let Ok(bytes) = latin1_bytes_from_id(cx, *id) else {
+        *rval = false;
+        return true;
+    };
+
+    if let Some(interface) = <D as DomHelpers<D>>::interface_map().get(bytes) {
+        (interface.define)(SafeJSContext::from_ptr(cx), Handle::from_raw(obj));
+        *rval = true;
+    } else {
+        *rval = false;
+    }
+    true
+}
+
+/// Returns a slice of bytes corresponding to the bytes in the provided string id.
+/// Returns an error if the id is not a string, or the string contains non-latin1 characters.
+/// # Safety
+/// The slice is only valid as long as the original id is not garbage collected.
+unsafe fn latin1_bytes_from_id(cx: *mut JSContext, id: jsid) -> Result<&'static [u8], ()> {
+    if !id.is_string() {
+        return Err(());
+    }
+
+    let string = id.to_string();
+    if !JS_DeprecatedStringHasLatin1Chars(string) {
+        return Err(());
+    }
+    let mut length = 0;
+    let ptr = JS_GetLatin1StringCharsAndLength(cx, ptr::null(), string, &mut length);
+    assert!(!ptr.is_null());
+    Ok(slice::from_raw_parts(ptr, length))
+}
diff --git a/components/script_bindings/weakref.rs b/components/script_bindings/weakref.rs
index 38f4f709997..2ec07e1f4af 100644
--- a/components/script_bindings/weakref.rs
+++ b/components/script_bindings/weakref.rs
@@ -29,7 +29,7 @@ use crate::root::DomRoot;
 /// stored for weak-referenceable bindings. We use slot 1 for holding it,
 /// this is unsafe for globals, we disallow weak-referenceable globals
 /// directly in codegen.
-pub const DOM_WEAK_SLOT: u32 = 1;
+pub(crate) const DOM_WEAK_SLOT: u32 = 1;
 
 /// A weak reference to a JS-managed DOM object.
 #[cfg_attr(crown, crown::unrooted_must_root_lint::allow_unrooted_interior)]
diff --git a/components/script_bindings/webidls/CSSNestedDeclarations.webidl b/components/script_bindings/webidls/CSSNestedDeclarations.webidl
new file mode 100644
index 00000000000..922cc61b03c
--- /dev/null
+++ b/components/script_bindings/webidls/CSSNestedDeclarations.webidl
@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * The origin of this IDL file is
+ * https://drafts.csswg.org/css-nesting-1/#the-cssnestrule
+ */
+
+[Exposed=Window]
+interface CSSNestedDeclarations : CSSRule {
+  // CSSStyleDeclaration instead of CSSStyleProperties for now, see #36260.
+  [SameObject, PutForwards=cssText] readonly attribute CSSStyleDeclaration style;
+};
diff --git a/components/script_bindings/webidls/CSSStyleRule.webidl b/components/script_bindings/webidls/CSSStyleRule.webidl
index 48bf819bb89..b9211c9f283 100644
--- a/components/script_bindings/webidls/CSSStyleRule.webidl
+++ b/components/script_bindings/webidls/CSSStyleRule.webidl
@@ -4,7 +4,7 @@
 
 // https://drafts.csswg.org/cssom/#the-cssstylerule-interface
 [Exposed=Window]
-interface CSSStyleRule : CSSRule {
+interface CSSStyleRule : CSSGroupingRule {
   attribute DOMString selectorText;
   [SameObject, PutForwards=cssText] readonly attribute CSSStyleDeclaration style;
 };
diff --git a/components/script_bindings/webidls/CSSStyleSheet.webidl b/components/script_bindings/webidls/CSSStyleSheet.webidl
index 0133eefd8a1..302e7433300 100644
--- a/components/script_bindings/webidls/CSSStyleSheet.webidl
+++ b/components/script_bindings/webidls/CSSStyleSheet.webidl
@@ -5,8 +5,28 @@
 // https://drafts.csswg.org/cssom/#the-cssstylesheet-interface
 [Exposed=Window]
 interface CSSStyleSheet : StyleSheet {
+  constructor(optional CSSStyleSheetInit options = {});
+
   // readonly attribute CSSRule? ownerRule;
   [Throws, SameObject] readonly attribute CSSRuleList cssRules;
   [Throws] unsigned long insertRule(DOMString rule, optional unsigned long index = 0);
   [Throws] undefined deleteRule(unsigned long index);
+  [Throws] undefined replaceSync(USVString text);
+};
+
+dictionary CSSStyleSheetInit {
+  // DOMString baseURL = null;
+  (MediaList or DOMString) media;
+  boolean disabled = false;
+};
+
+// https://drafts.csswg.org/cssom/#legacy-css-style-sheet-members
+partial interface CSSStyleSheet {
+  [Throws, SameObject] readonly attribute CSSRuleList rules;
+  [Throws] long addRule(
+      optional DOMString selector = "undefined",
+      optional DOMString style = "undefined",
+      optional unsigned long index
+  );
+  [Throws] undefined removeRule(optional unsigned long index = 0);
 };
diff --git a/components/script_bindings/webidls/CanvasRenderingContext2D.webidl b/components/script_bindings/webidls/CanvasRenderingContext2D.webidl
index 92f61126859..46d91683577 100644
--- a/components/script_bindings/webidls/CanvasRenderingContext2D.webidl
+++ b/components/script_bindings/webidls/CanvasRenderingContext2D.webidl
@@ -165,16 +165,16 @@ interface mixin CanvasDrawImage {
 interface mixin CanvasImageData {
   // pixel manipulation
   [Throws]
-  ImageData createImageData(long sw, long sh);
+  ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh);
   [Throws]
   ImageData createImageData(ImageData imagedata);
   [Throws]
-  ImageData getImageData(long sx, long sy, long sw, long sh);
-  undefined putImageData(ImageData imagedata, long dx, long dy);
-  undefined putImageData(ImageData imagedata,
-                    long dx, long dy,
-                    long dirtyX, long dirtyY,
-                    long dirtyWidth, long dirtyHeight);
+  ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy,
+                         [EnforceRange] long sw, [EnforceRange] long sh);
+  undefined putImageData(ImageData imagedata, [EnforceRange] long dx, [EnforceRange] long dy);
+  undefined putImageData(ImageData imagedata, [EnforceRange] long dx, [EnforceRange] long dy,
+                         [EnforceRange] long dirtyX, [EnforceRange] long dirtyY,
+                         [EnforceRange] long dirtyWidth, [EnforceRange] long dirtyHeight);
 };
 
 enum CanvasLineCap { "butt", "round", "square" };
@@ -191,9 +191,9 @@ interface mixin CanvasPathDrawingStyles {
   attribute unrestricted double miterLimit; // (default 10)
 
   // dashed lines
-  //void setLineDash(sequence<unrestricted double> segments); // default empty
-  //sequence<unrestricted double> getLineDash();
-  //attribute unrestricted double lineDashOffset;
+  undefined setLineDash(sequence<unrestricted double> segments); // default empty
+  sequence<unrestricted double> getLineDash();
+  attribute unrestricted double lineDashOffset;
 };
 
 interface mixin CanvasTextDrawingStyles {
@@ -254,7 +254,7 @@ interface CanvasPattern {
  Serializable]
 interface ImageData {
   [Throws] constructor(unsigned long sw, unsigned long sh/*, optional ImageDataSettings settings = {}*/);
-  [Throws] constructor(/* Uint8ClampedArray */ object data, unsigned long sw, optional unsigned long sh
+  [Throws] constructor(Uint8ClampedArray data, unsigned long sw, optional unsigned long sh
               /*, optional ImageDataSettings settings = {}*/);
 
   readonly attribute unsigned long width;
diff --git a/components/script_bindings/webidls/Clipboard.webidl b/components/script_bindings/webidls/Clipboard.webidl
new file mode 100644
index 00000000000..b77e975917e
--- /dev/null
+++ b/components/script_bindings/webidls/Clipboard.webidl
@@ -0,0 +1,36 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// https://w3c.github.io/clipboard-apis
+
+typedef sequence<ClipboardItem> ClipboardItems;
+
+[SecureContext, Exposed=Window, Pref="dom_async_clipboard_enabled"]
+interface Clipboard : EventTarget {
+  // Promise<ClipboardItems> read();
+  Promise<DOMString> readText();
+  // Promise<undefined> write(ClipboardItems data);
+  Promise<undefined> writeText(DOMString data);
+};
+
+typedef Promise<(DOMString or Blob)> ClipboardItemData;
+
+[SecureContext, Exposed=Window, Pref="dom_async_clipboard_enabled"]
+interface ClipboardItem {
+  [Throws] constructor(record<DOMString, ClipboardItemData> items,
+              optional ClipboardItemOptions options = {});
+
+  readonly attribute PresentationStyle presentationStyle;
+  readonly attribute /* FrozenArray<DOMString> */ any types;
+
+  // Promise<Blob> getType(DOMString type);
+
+  // static boolean supports(DOMString type);
+};
+
+enum PresentationStyle { "unspecified", "inline", "attachment" };
+
+dictionary ClipboardItemOptions {
+  PresentationStyle presentationStyle = "unspecified";
+};
diff --git a/components/script_bindings/webidls/Document.webidl b/components/script_bindings/webidls/Document.webidl
index 6131dbd15c7..e878b1642e4 100644
--- a/components/script_bindings/webidls/Document.webidl
+++ b/components/script_bindings/webidls/Document.webidl
@@ -129,9 +129,9 @@ partial /*sealed*/ interface Document {
   [CEReactions, Throws]
   undefined close();
   [CEReactions, Throws]
-  undefined write(DOMString... text);
+  undefined write((TrustedHTML or DOMString)... text);
   [CEReactions, Throws]
-  undefined writeln(DOMString... text);
+  undefined writeln((TrustedHTML or DOMString)... text);
 
   // user interaction
   readonly attribute Window?/*Proxy?*/ defaultView;
@@ -154,7 +154,6 @@ partial /*sealed*/ interface Document {
   // also has obsolete members
 };
 Document includes GlobalEventHandlers;
-Document includes DocumentAndElementEventHandlers;
 
 // https://html.spec.whatwg.org/multipage/#Document-partial
 partial interface Document {
@@ -204,6 +203,16 @@ partial interface Document {
 
 Document includes DocumentOrShadowRoot;
 
+// https://drafts.csswg.org/cssom-view/#extensions-to-the-document-interface
+partial interface Document {
+  // CaretPosition? caretPositionFromPoint(double x, double y, optional CaretPositionFromPointOptions options = {});
+  readonly attribute Element? scrollingElement;
+};
+
+// dictionary CaretPositionFromPointOptions {
+//   sequence<ShadowRoot> shadowRoots = [];
+// };
+
 // https://w3c.github.io/selection-api/#dom-document
 partial interface Document {
   Selection? getSelection();
diff --git a/components/script_bindings/webidls/Element.webidl b/components/script_bindings/webidls/Element.webidl
index 0d2e204ae52..42733b91929 100644
--- a/components/script_bindings/webidls/Element.webidl
+++ b/components/script_bindings/webidls/Element.webidl
@@ -82,7 +82,7 @@ interface Element : Node {
   [Throws]
   undefined insertAdjacentText(DOMString where_, DOMString data);
   [CEReactions, Throws]
-  undefined insertAdjacentHTML(DOMString position, DOMString html);
+  undefined insertAdjacentHTML(DOMString position, (TrustedHTML or DOMString) string);
 
   [Throws, Pref="dom_shadowdom_enabled"] ShadowRoot attachShadow(ShadowRootInit init);
   readonly attribute ShadowRoot? shadowRoot;
@@ -122,11 +122,11 @@ partial interface Element {
 
 // https://html.spec.whatwg.org/multipage/#dom-parsing-and-serialization
 partial interface Element {
-  [CEReactions] undefined setHTMLUnsafe(DOMString html);
+  [CEReactions, Throws] undefined setHTMLUnsafe((TrustedHTML or DOMString) html);
   DOMString getHTML(optional GetHTMLOptions options = {});
 
-  [CEReactions, Throws] attribute [LegacyNullToEmptyString] DOMString innerHTML;
-  [CEReactions, Throws] attribute [LegacyNullToEmptyString] DOMString outerHTML;
+  [CEReactions, Throws] attribute (TrustedHTML or [LegacyNullToEmptyString] DOMString) innerHTML;
+  [CEReactions, Throws] attribute (TrustedHTML or [LegacyNullToEmptyString] DOMString) outerHTML;
 };
 
 dictionary GetHTMLOptions {
diff --git a/components/script_bindings/webidls/EventHandler.webidl b/components/script_bindings/webidls/EventHandler.webidl
index f597ce237d3..d32302f4b37 100644
--- a/components/script_bindings/webidls/EventHandler.webidl
+++ b/components/script_bindings/webidls/EventHandler.webidl
@@ -28,6 +28,10 @@ typedef OnBeforeUnloadEventHandlerNonNull? OnBeforeUnloadEventHandler;
 [Exposed=Window]
 interface mixin GlobalEventHandlers {
            attribute EventHandler onabort;
+           attribute EventHandler onauxclick;
+           attribute EventHandler onbeforeinput;
+           attribute EventHandler onbeforematch;
+           attribute EventHandler onbeforetoggle;
            attribute EventHandler onblur;
            attribute EventHandler oncancel;
            attribute EventHandler oncanplay;
@@ -35,13 +39,17 @@ interface mixin GlobalEventHandlers {
            attribute EventHandler onchange;
            attribute EventHandler onclick;
            attribute EventHandler onclose;
+           attribute EventHandler oncommand;
+           attribute EventHandler oncontextlost;
            attribute EventHandler oncontextmenu;
+           attribute EventHandler oncontextrestored;
+           attribute EventHandler oncopy;
            attribute EventHandler oncuechange;
+           attribute EventHandler oncut;
            attribute EventHandler ondblclick;
            attribute EventHandler ondrag;
            attribute EventHandler ondragend;
            attribute EventHandler ondragenter;
-           attribute EventHandler ondragexit;
            attribute EventHandler ondragleave;
            attribute EventHandler ondragover;
            attribute EventHandler ondragstart;
@@ -68,7 +76,7 @@ interface mixin GlobalEventHandlers {
            attribute EventHandler onmouseout;
            attribute EventHandler onmouseover;
            attribute EventHandler onmouseup;
-           attribute EventHandler onwheel;
+           attribute EventHandler onpaste;
            attribute EventHandler onpause;
            attribute EventHandler onplay;
            attribute EventHandler onplaying;
@@ -77,11 +85,12 @@ interface mixin GlobalEventHandlers {
            attribute EventHandler onreset;
            attribute EventHandler onresize;
            attribute EventHandler onscroll;
+           attribute EventHandler onscrollend;
            attribute EventHandler onsecuritypolicyviolation;
            attribute EventHandler onseeked;
            attribute EventHandler onseeking;
            attribute EventHandler onselect;
-           attribute EventHandler onshow;
+           attribute EventHandler onslotchange;
            attribute EventHandler onstalled;
            attribute EventHandler onsubmit;
            attribute EventHandler onsuspend;
@@ -89,6 +98,11 @@ interface mixin GlobalEventHandlers {
            attribute EventHandler ontoggle;
            attribute EventHandler onvolumechange;
            attribute EventHandler onwaiting;
+           attribute EventHandler onwebkitanimationend;
+           attribute EventHandler onwebkitanimationiteration;
+           attribute EventHandler onwebkitanimationstart;
+           attribute EventHandler onwebkittransitionend;
+           attribute EventHandler onwheel;
 };
 
 // https://drafts.csswg.org/css-animations/#interface-globaleventhandlers-idl
@@ -123,18 +137,12 @@ interface mixin WindowEventHandlers {
            attribute EventHandler onoffline;
            attribute EventHandler ononline;
            attribute EventHandler onpagehide;
+           attribute EventHandler onpagereveal;
            attribute EventHandler onpageshow;
+           attribute EventHandler onpageswap;
            attribute EventHandler onpopstate;
            attribute EventHandler onrejectionhandled;
            attribute EventHandler onstorage;
            attribute EventHandler onunhandledrejection;
            attribute EventHandler onunload;
 };
-
-// https://html.spec.whatwg.org/multipage/#documentandelementeventhandlers
-[Exposed=Window]
-interface mixin DocumentAndElementEventHandlers {
-          attribute EventHandler oncopy;
-          attribute EventHandler oncut;
-          attribute EventHandler onpaste;
-};
diff --git a/components/script_bindings/webidls/HTMLElement.webidl b/components/script_bindings/webidls/HTMLElement.webidl
index 76bfada1b94..19a4b515d11 100644
--- a/components/script_bindings/webidls/HTMLElement.webidl
+++ b/components/script_bindings/webidls/HTMLElement.webidl
@@ -73,7 +73,6 @@ partial interface HTMLElement {
 };
 
 HTMLElement includes GlobalEventHandlers;
-HTMLElement includes DocumentAndElementEventHandlers;
 HTMLElement includes ElementContentEditable;
 HTMLElement includes ElementCSSInlineStyle;
 HTMLElement includes HTMLOrSVGElement;
diff --git a/components/script_bindings/webidls/HTMLIFrameElement.webidl b/components/script_bindings/webidls/HTMLIFrameElement.webidl
index 8ba58a20f33..b083f51c0f1 100644
--- a/components/script_bindings/webidls/HTMLIFrameElement.webidl
+++ b/components/script_bindings/webidls/HTMLIFrameElement.webidl
@@ -9,8 +9,8 @@ interface HTMLIFrameElement : HTMLElement {
 
   [CEReactions]
            attribute USVString src;
-  [CEReactions]
-           attribute DOMString srcdoc;
+  [CEReactions, SetterThrows]
+           attribute (TrustedHTML or DOMString) srcdoc;
 
   [CEReactions]
   attribute DOMString name;
diff --git a/components/script_bindings/webidls/HTMLLinkElement.webidl b/components/script_bindings/webidls/HTMLLinkElement.webidl
index 31590a8dc04..9182ef393f8 100644
--- a/components/script_bindings/webidls/HTMLLinkElement.webidl
+++ b/components/script_bindings/webidls/HTMLLinkElement.webidl
@@ -13,17 +13,24 @@ interface HTMLLinkElement : HTMLElement {
            attribute DOMString? crossOrigin;
   [CEReactions]
            attribute DOMString rel;
+  // [CEReactions] attribute DOMString as;
   [SameObject, PutForwards=value] readonly attribute DOMTokenList relList;
   [CEReactions]
            attribute DOMString media;
+  [CEReactions]
+           attribute DOMString integrity;
   [CEReactions]
            attribute DOMString hreflang;
   [CEReactions]
            attribute DOMString type;
-  [CEReactions]
-           attribute DOMString integrity;
+  // [SameObject, PutForwards=value] readonly attribute DOMTokenList sizes;
+  // [CEReactions] attribute USVString imageSrcset;
+  // [CEReactions] attribute DOMString imageSizes;
   [CEReactions]
            attribute DOMString referrerPolicy;
+  // [SameObject, PutForwards=value] readonly attribute DOMTokenList blocking;
+  [CEReactions] attribute boolean disabled;
+  // [CEReactions] attribute DOMString fetchPriority;
 
   // also has obsolete members
 };
diff --git a/components/script_bindings/webidls/HTMLMediaElement.webidl b/components/script_bindings/webidls/HTMLMediaElement.webidl
index a2c7866a3fe..7ceae06f151 100644
--- a/components/script_bindings/webidls/HTMLMediaElement.webidl
+++ b/components/script_bindings/webidls/HTMLMediaElement.webidl
@@ -45,7 +45,7 @@ interface HTMLMediaElement : HTMLElement {
   [Throws] attribute double defaultPlaybackRate;
   [Throws] attribute double playbackRate;
   readonly attribute TimeRanges played;
-  // readonly attribute TimeRanges seekable;
+  readonly attribute TimeRanges seekable;
   readonly attribute boolean ended;
   [CEReactions] attribute boolean autoplay;
   [CEReactions] attribute boolean loop;
diff --git a/components/script_bindings/webidls/HTMLScriptElement.webidl b/components/script_bindings/webidls/HTMLScriptElement.webidl
index b79382dbbb8..2c7b398b7e3 100644
--- a/components/script_bindings/webidls/HTMLScriptElement.webidl
+++ b/components/script_bindings/webidls/HTMLScriptElement.webidl
@@ -7,8 +7,8 @@
 interface HTMLScriptElement : HTMLElement {
   [HTMLConstructor] constructor();
 
-  [CEReactions]
-           attribute USVString src;
+  [CEReactions, SetterThrows]
+           attribute (TrustedScriptURL or USVString) src;
   [CEReactions]
            attribute DOMString type;
   [CEReactions]
@@ -21,8 +21,12 @@ interface HTMLScriptElement : HTMLElement {
            attribute boolean defer;
   [CEReactions]
            attribute DOMString? crossOrigin;
-  [CEReactions, Pure]
-           attribute DOMString text;
+  [CEReactions, SetterThrows]
+           attribute (TrustedScript or DOMString) innerText;
+  [CEReactions, Pure, SetterThrows]
+           attribute (TrustedScript or DOMString) text;
+  [CEReactions, SetterThrows]
+           attribute (TrustedScript or DOMString)? textContent;
   [CEReactions]
            attribute DOMString integrity;
   [CEReactions]
diff --git a/components/script_bindings/webidls/HTMLSourceElement.webidl b/components/script_bindings/webidls/HTMLSourceElement.webidl
index 92f75ff5995..542f4274741 100644
--- a/components/script_bindings/webidls/HTMLSourceElement.webidl
+++ b/components/script_bindings/webidls/HTMLSourceElement.webidl
@@ -8,11 +8,11 @@ interface HTMLSourceElement : HTMLElement {
   [HTMLConstructor] constructor();
 
   [CEReactions]
-           attribute DOMString src;
+           attribute USVString src;
   [CEReactions]
            attribute DOMString type;
   [CEReactions]
-            attribute DOMString srcset;
+            attribute USVString srcset;
   [CEReactions]
             attribute DOMString sizes;
   [CEReactions]
diff --git a/components/script_bindings/webidls/MessagePort.webidl b/components/script_bindings/webidls/MessagePort.webidl
index 6fc1f432b38..b7082fc7fc3 100644
--- a/components/script_bindings/webidls/MessagePort.webidl
+++ b/components/script_bindings/webidls/MessagePort.webidl
@@ -16,6 +16,7 @@ interface MessagePort : EventTarget {
   // event handlers
   attribute EventHandler onmessage;
   attribute EventHandler onmessageerror;
+  attribute EventHandler onclose;
 };
 
 dictionary StructuredSerializeOptions {
diff --git a/components/script_bindings/webidls/Navigator.webidl b/components/script_bindings/webidls/Navigator.webidl
index a612d42ae99..6ac6175f3ca 100644
--- a/components/script_bindings/webidls/Navigator.webidl
+++ b/components/script_bindings/webidls/Navigator.webidl
@@ -9,7 +9,7 @@ interface Navigator {
 };
 Navigator includes NavigatorID;
 Navigator includes NavigatorLanguage;
-//Navigator includes NavigatorOnLine;
+Navigator includes NavigatorOnLine;
 //Navigator includes NavigatorContentUtils;
 //Navigator includes NavigatorStorageUtils;
 Navigator includes NavigatorPlugins;
@@ -43,6 +43,12 @@ interface mixin NavigatorLanguage {
   readonly attribute any languages;
 };
 
+// https://html.spec.whatwg.org/multipage/#dom-navigator-online
+[Exposed=(Window,Worker)]
+interface mixin NavigatorOnLine {
+  readonly attribute boolean onLine;
+};
+
 // https://html.spec.whatwg.org/multipage/#navigatorplugins
 interface mixin NavigatorPlugins {
   [SameObject] readonly attribute PluginArray plugins;
@@ -70,3 +76,8 @@ partial interface Navigator {
 interface mixin NavigatorConcurrentHardware {
   readonly attribute unsigned long long hardwareConcurrency;
 };
+
+// https://w3c.github.io/clipboard-apis/#navigator-interface
+partial interface Navigator {
+  [SecureContext, SameObject, Pref="dom_async_clipboard_enabled"] readonly attribute Clipboard clipboard;
+};
diff --git a/components/script_bindings/webidls/ProgressEvent.webidl b/components/script_bindings/webidls/ProgressEvent.webidl
index 17d066ef187..e931a4b9066 100644
--- a/components/script_bindings/webidls/ProgressEvent.webidl
+++ b/components/script_bindings/webidls/ProgressEvent.webidl
@@ -16,12 +16,12 @@
 interface ProgressEvent : Event {
   [Throws] constructor(DOMString type, optional ProgressEventInit eventInitDict = {});
   readonly attribute boolean lengthComputable;
-  readonly attribute unsigned long long loaded;
-  readonly attribute unsigned long long total;
+  readonly attribute double loaded;
+  readonly attribute double total;
 };
 
 dictionary ProgressEventInit : EventInit {
   boolean lengthComputable = false;
-  unsigned long long loaded = 0;
-  unsigned long long total = 0;
+  double loaded = 0;
+  double total = 0;
 };
diff --git a/components/script_bindings/webidls/Response.webidl b/components/script_bindings/webidls/Response.webidl
index 0ced0c13794..d37538d4b6b 100644
--- a/components/script_bindings/webidls/Response.webidl
+++ b/components/script_bindings/webidls/Response.webidl
@@ -9,6 +9,7 @@ interface Response {
   [Throws] constructor(optional BodyInit? body = null, optional ResponseInit init = {});
   [NewObject] static Response error();
   [NewObject, Throws] static Response redirect(USVString url, optional unsigned short status = 302);
+  [NewObject, Throws, BinaryName="createFromJson"] static Response json(any data, optional ResponseInit init = {});
 
   readonly attribute ResponseType type;
 
diff --git a/components/script_bindings/webidls/SVGElement.webidl b/components/script_bindings/webidls/SVGElement.webidl
index e6bc468d5dc..08bcb4a8c99 100644
--- a/components/script_bindings/webidls/SVGElement.webidl
+++ b/components/script_bindings/webidls/SVGElement.webidl
@@ -18,7 +18,7 @@ interface SVGElement : Element {
   //void blur();
 };
 
-//SVGElement includes GlobalEventHandlers;
+SVGElement includes GlobalEventHandlers;
 //SVGElement includes SVGElementInstance;
 SVGElement includes ElementCSSInlineStyle;
 SVGElement includes HTMLOrSVGElement;
diff --git a/components/script_bindings/webidls/SVGImageElement.webidl b/components/script_bindings/webidls/SVGImageElement.webidl
new file mode 100644
index 00000000000..bced6277c5e
--- /dev/null
+++ b/components/script_bindings/webidls/SVGImageElement.webidl
@@ -0,0 +1,16 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+// https://svgwg.org/svg2-draft/embedded.html#InterfaceSVGImageElement
+[Exposed=Window, Pref="dom_svg_enabled"]
+interface SVGImageElement : SVGGraphicsElement {
+  //[SameObject] readonly attribute SVGAnimatedLength x;
+  //[SameObject] readonly attribute SVGAnimatedLength y;
+  //[SameObject] readonly attribute SVGAnimatedLength width;
+  //[SameObject] readonly attribute SVGAnimatedLength height;
+  //[SameObject] readonly attribute SVGAnimatedPreserveAspectRatio preserveAspectRatio;
+  //attribute DOMString? crossOrigin;
+};
+
+//SVGImageElement includes SVGURIReference;
diff --git a/components/script_bindings/webidls/ServoInternals.webidl b/components/script_bindings/webidls/ServoInternals.webidl
index af3dc7b35e6..609d49180e4 100644
--- a/components/script_bindings/webidls/ServoInternals.webidl
+++ b/components/script_bindings/webidls/ServoInternals.webidl
@@ -8,12 +8,12 @@
 // This interface is entirely internal to Servo, and should not be accessible to
 // web pages.
 [Exposed=Window,
-Func="dom::bindings::interface::is_servo_internal"]
+Func="ServoInternals::is_servo_internal"]
 interface ServoInternals {
     Promise<object> reportMemory();
 };
 
 partial interface Navigator {
-    [Func="dom::bindings::interface::is_servo_internal"]
+    [Func="ServoInternals::is_servo_internal"]
     readonly attribute ServoInternals servo;
 };
diff --git a/components/script_bindings/webidls/ShadowRoot.webidl b/components/script_bindings/webidls/ShadowRoot.webidl
index 6e3f2032294..cb0926afc10 100644
--- a/components/script_bindings/webidls/ShadowRoot.webidl
+++ b/components/script_bindings/webidls/ShadowRoot.webidl
@@ -25,7 +25,7 @@ ShadowRoot includes DocumentOrShadowRoot;
 
 // https://html.spec.whatwg.org/multipage/#dom-parsing-and-serialization
 partial interface ShadowRoot {
-  // [CEReactions] undefined setHTMLUnsafe((TrustedHTML or DOMString) html);
+  [CEReactions] undefined setHTMLUnsafe(DOMString html);
   DOMString getHTML(optional GetHTMLOptions options = {});
 
   // [CEReactions] attribute (TrustedHTML or [LegacyNullToEmptyString] DOMString) innerHTML;
diff --git a/components/script_bindings/webidls/TestUtils.webidl b/components/script_bindings/webidls/TestUtils.webidl
new file mode 100644
index 00000000000..290b2a22138
--- /dev/null
+++ b/components/script_bindings/webidls/TestUtils.webidl
@@ -0,0 +1,10 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+// https://testutils.spec.whatwg.org/
+
+[Exposed=(Window,Worker), Pref="dom_testutils_enabled"]
+namespace TestUtils {
+  [NewObject] Promise<undefined> gc();
+};
diff --git a/components/script_bindings/webidls/TransformStream.webidl b/components/script_bindings/webidls/TransformStream.webidl
new file mode 100644
index 00000000000..c36a49b114a
--- /dev/null
+++ b/components/script_bindings/webidls/TransformStream.webidl
@@ -0,0 +1,18 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * The origin of this IDL file is
+ * https://streams.spec.whatwg.org/#ts-class-definition
+ */
+
+[Exposed=*] // [Transferable] - See Bug 1562065
+interface TransformStream {
+  [Throws]
+  constructor(optional object transformer,
+              optional QueuingStrategy writableStrategy = {},
+              optional QueuingStrategy readableStrategy = {});
+
+  readonly attribute ReadableStream readable;
+  readonly attribute WritableStream writable;
+};
diff --git a/components/script_bindings/webidls/TransformStreamDefaultController.webidl b/components/script_bindings/webidls/TransformStreamDefaultController.webidl
new file mode 100644
index 00000000000..5f5511ed4b6
--- /dev/null
+++ b/components/script_bindings/webidls/TransformStreamDefaultController.webidl
@@ -0,0 +1,15 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * The origin of this IDL file is
+ * https://streams.spec.whatwg.org/#ts-default-controller-class-definition
+ */
+
+[Exposed=*]
+interface TransformStreamDefaultController {
+  readonly attribute unrestricted double? desiredSize;
+  [Throws] undefined enqueue(optional any chunk);
+  [Throws] undefined error(optional any reason);
+  [Throws] undefined terminate();
+};
diff --git a/components/script_bindings/webidls/Transformer.webidl b/components/script_bindings/webidls/Transformer.webidl
new file mode 100644
index 00000000000..652511450a4
--- /dev/null
+++ b/components/script_bindings/webidls/Transformer.webidl
@@ -0,0 +1,22 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * The origin of this IDL file is
+ * https://streams.spec.whatwg.org/#transformer-api
+ */
+
+[GenerateInit]
+dictionary Transformer {
+  TransformerStartCallback start;
+  TransformerTransformCallback transform;
+  TransformerFlushCallback flush;
+  TransformerCancelCallback cancel;
+  any readableType;
+  any writableType;
+};
+
+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);
diff --git a/components/script_bindings/webidls/TrustedHTML.webidl b/components/script_bindings/webidls/TrustedHTML.webidl
new file mode 100644
index 00000000000..37fb18bd5e1
--- /dev/null
+++ b/components/script_bindings/webidls/TrustedHTML.webidl
@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+/*
+ * The origin of this IDL file is
+ * https://www.w3.org/TR/trusted-types/#trusted-html
+ */
+
+[Exposed=(Window,Worker), Pref="dom_trusted_types_enabled"]
+interface TrustedHTML {
+  stringifier;
+  DOMString toJSON();
+};
diff --git a/components/script_bindings/webidls/TrustedScript.webidl b/components/script_bindings/webidls/TrustedScript.webidl
new file mode 100644
index 00000000000..3dbee643ddf
--- /dev/null
+++ b/components/script_bindings/webidls/TrustedScript.webidl
@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+/*
+ * The origin of this IDL file is
+ * https://www.w3.org/TR/trusted-types/#trusted-script
+ */
+
+[Exposed=(Window,Worker), Pref="dom_trusted_types_enabled"]
+interface TrustedScript {
+  stringifier;
+  DOMString toJSON();
+};
diff --git a/components/script_bindings/webidls/TrustedScriptURL.webidl b/components/script_bindings/webidls/TrustedScriptURL.webidl
new file mode 100644
index 00000000000..b5fd0249eba
--- /dev/null
+++ b/components/script_bindings/webidls/TrustedScriptURL.webidl
@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+/*
+ * The origin of this IDL file is
+ * https://www.w3.org/TR/trusted-types/#trused-script-url
+ */
+
+[Exposed=(Window,Worker), Pref="dom_trusted_types_enabled"]
+interface TrustedScriptURL {
+  stringifier;
+  DOMString toJSON();
+};
diff --git a/components/script_bindings/webidls/TrustedTypePolicy.webidl b/components/script_bindings/webidls/TrustedTypePolicy.webidl
new file mode 100644
index 00000000000..32b7520f400
--- /dev/null
+++ b/components/script_bindings/webidls/TrustedTypePolicy.webidl
@@ -0,0 +1,15 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+/*
+ * The origin of this IDL file is
+ * https://www.w3.org/TR/trusted-types/#trusted-type-policy
+ */
+
+[Exposed=(Window,Worker), Pref="dom_trusted_types_enabled"]
+interface TrustedTypePolicy {
+  readonly attribute DOMString name;
+  [Throws] TrustedHTML createHTML(DOMString input, any... arguments);
+  [Throws] TrustedScript createScript(DOMString input, any... arguments);
+  [Throws] TrustedScriptURL createScriptURL(DOMString input, any... arguments);
+};
diff --git a/components/script_bindings/webidls/TrustedTypePolicyFactory.webidl b/components/script_bindings/webidls/TrustedTypePolicyFactory.webidl
new file mode 100644
index 00000000000..a568ec437f4
--- /dev/null
+++ b/components/script_bindings/webidls/TrustedTypePolicyFactory.webidl
@@ -0,0 +1,38 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+/*
+ * The origin of this IDL file is
+ * https://www.w3.org/TR/trusted-types/#trusted-type-policy-factory
+ */
+
+[Exposed=(Window,Worker), Pref="dom_trusted_types_enabled"]
+interface TrustedTypePolicyFactory {
+    [Throws]
+    TrustedTypePolicy createPolicy(
+        DOMString policyName, optional TrustedTypePolicyOptions policyOptions = {});
+    boolean isHTML(any value);
+    boolean isScript(any value);
+    boolean isScriptURL(any value);
+    readonly attribute TrustedHTML emptyHTML;
+    readonly attribute TrustedScript emptyScript;
+    DOMString? getAttributeType(
+        DOMString tagName,
+        DOMString attribute,
+        optional DOMString? elementNs = "",
+        optional DOMString? attrNs = "");
+    DOMString? getPropertyType(
+        DOMString tagName,
+        DOMString property,
+        optional DOMString? elementNs = "");
+    readonly attribute TrustedTypePolicy? defaultPolicy;
+};
+
+dictionary TrustedTypePolicyOptions {
+   CreateHTMLCallback createHTML;
+   CreateScriptCallback createScript;
+   CreateScriptURLCallback createScriptURL;
+};
+callback CreateHTMLCallback = DOMString? (DOMString input, any... arguments);
+callback CreateScriptCallback = DOMString? (DOMString input, any... arguments);
+callback CreateScriptURLCallback = USVString? (DOMString input, any... arguments);
diff --git a/components/script_bindings/webidls/URLPattern.webidl b/components/script_bindings/webidls/URLPattern.webidl
new file mode 100644
index 00000000000..f61b65702bc
--- /dev/null
+++ b/components/script_bindings/webidls/URLPattern.webidl
@@ -0,0 +1,62 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+// https://urlpattern.spec.whatwg.org/#urlpattern
+
+typedef (USVString or URLPatternInit)    URLPatternInput;
+
+[Exposed=(Window,Worker), Pref="dom_urlpattern_enabled"]
+interface URLPattern {
+  [Throws] constructor(URLPatternInput input, USVString baseURL, optional URLPatternOptions options = {});
+  [Throws] constructor(optional URLPatternInput input = {}, optional URLPatternOptions options = {});
+
+  // [Throws] boolean test(optional URLPatternInput input = {}, optional USVString baseURL);
+
+  // [Throws] URLPatternResult? exec(optional URLPatternInput input = {}, optional USVString baseURL);
+
+  readonly attribute USVString protocol;
+  readonly attribute USVString username;
+  readonly attribute USVString password;
+  readonly attribute USVString hostname;
+  readonly attribute USVString port;
+  readonly attribute USVString pathname;
+  readonly attribute USVString search;
+  readonly attribute USVString hash;
+
+  readonly attribute boolean hasRegExpGroups;
+};
+
+dictionary URLPatternInit {
+  USVString protocol;
+  USVString username;
+  USVString password;
+  USVString hostname;
+  USVString port;
+  USVString pathname;
+  USVString search;
+  USVString hash;
+  USVString baseURL;
+};
+
+dictionary URLPatternOptions {
+  boolean ignoreCase = false;
+};
+
+// dictionary URLPatternResult {
+//   sequence<URLPatternInput> inputs;
+
+//   URLPatternComponentResult protocol;
+//   URLPatternComponentResult username;
+//   URLPatternComponentResult password;
+//   URLPatternComponentResult hostname;
+//   URLPatternComponentResult port;
+//   URLPatternComponentResult pathname;
+//   URLPatternComponentResult search;
+//   URLPatternComponentResult hash;
+// };
+
+// dictionary URLPatternComponentResult {
+//   USVString input;
+//   record<USVString, (USVString or undefined)> groups;
+// };
diff --git a/components/script_bindings/webidls/Window.webidl b/components/script_bindings/webidls/Window.webidl
index c7b6dde617d..929279f7951 100644
--- a/components/script_bindings/webidls/Window.webidl
+++ b/components/script_bindings/webidls/Window.webidl
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#window
-[Global=Window, Exposed=Window /*, LegacyUnenumerableNamedProperties */]
+[Global=Window, Exposed=Window, LegacyUnenumerableNamedProperties, NeedResolve]
 /*sealed*/ interface Window : GlobalScope {
   // the current browsing context
   [LegacyUnforgeable, CrossOriginReadable] readonly attribute WindowProxy window;
@@ -27,8 +27,8 @@
   [CrossOriginCallable] undefined close();
   [CrossOriginReadable] readonly attribute boolean closed;
   undefined stop();
-  //[CrossOriginCallable] void focus();
-  //[CrossOriginCallable] void blur();
+  [CrossOriginCallable] undefined focus();
+  [CrossOriginCallable] undefined blur();
 
   // other browsing contexts
   [Replaceable, CrossOriginReadable] readonly attribute WindowProxy frames;
@@ -148,7 +148,12 @@ partial interface Window {
 partial interface Window {
   // Shouldn't be public, but just to make things work for now
   undefined webdriverCallback(optional any result);
+  undefined webdriverException(optional any result);
   undefined webdriverTimeout();
+  Element? webdriverElement(DOMString id);
+  Element? webdriverFrame(DOMString id);
+  Window? webdriverWindow(DOMString id);
+  ShadowRoot? webdriverShadowRoot(DOMString id);
 };
 
 // https://html.spec.whatwg.org/multipage/#dom-sessionstorage
diff --git a/components/script_bindings/webidls/WindowOrWorkerGlobalScope.webidl b/components/script_bindings/webidls/WindowOrWorkerGlobalScope.webidl
index d9204c11774..deb3d5e2947 100644
--- a/components/script_bindings/webidls/WindowOrWorkerGlobalScope.webidl
+++ b/components/script_bindings/webidls/WindowOrWorkerGlobalScope.webidl
@@ -45,5 +45,11 @@ partial interface mixin WindowOrWorkerGlobalScope {
   readonly attribute boolean isSecureContext;
 };
 
+// https://www.w3.org/TR/trusted-types/#extensions-to-the-windoworworkerglobalscope-interface
+partial interface mixin WindowOrWorkerGlobalScope {
+  [Pref="dom_trusted_types_enabled"]
+  readonly attribute TrustedTypePolicyFactory trustedTypes;
+};
+
 Window includes WindowOrWorkerGlobalScope;
 WorkerGlobalScope includes WindowOrWorkerGlobalScope;
diff --git a/components/script_bindings/webidls/Worker.webidl b/components/script_bindings/webidls/Worker.webidl
index ef535126606..5faa7a5ea3e 100644
--- a/components/script_bindings/webidls/Worker.webidl
+++ b/components/script_bindings/webidls/Worker.webidl
@@ -11,7 +11,7 @@ interface mixin AbstractWorker {
 // https://html.spec.whatwg.org/multipage/#worker
 [Exposed=(Window,Worker)]
 interface Worker : EventTarget {
-  [Throws] constructor(USVString scriptURL, optional WorkerOptions options = {});
+  [Throws] constructor((TrustedScriptURL or USVString) scriptURL, optional WorkerOptions options = {});
   undefined terminate();
 
   [Throws] undefined postMessage(any message, sequence<object> transfer);
diff --git a/components/script_bindings/webidls/WorkerGlobalScope.webidl b/components/script_bindings/webidls/WorkerGlobalScope.webidl
index 05301fb28e6..db02773392d 100644
--- a/components/script_bindings/webidls/WorkerGlobalScope.webidl
+++ b/components/script_bindings/webidls/WorkerGlobalScope.webidl
@@ -19,6 +19,6 @@ interface WorkerGlobalScope : GlobalScope {
 [Exposed=Worker]
 partial interface WorkerGlobalScope { // not obsolete
   [Throws]
-  undefined importScripts(DOMString... urls);
+  undefined importScripts((TrustedScriptURL or USVString)... urls);
   readonly attribute WorkerNavigator navigator;
 };
diff --git a/components/script_bindings/webidls/WorkerNavigator.webidl b/components/script_bindings/webidls/WorkerNavigator.webidl
index 33ddfade93d..7e80fe9a009 100644
--- a/components/script_bindings/webidls/WorkerNavigator.webidl
+++ b/components/script_bindings/webidls/WorkerNavigator.webidl
@@ -7,7 +7,7 @@
 interface WorkerNavigator {};
 WorkerNavigator includes NavigatorID;
 WorkerNavigator includes NavigatorLanguage;
-//WorkerNavigator includes NavigatorOnLine;
+WorkerNavigator includes NavigatorOnLine;
 WorkerNavigator includes NavigatorConcurrentHardware;
 
 // https://w3c.github.io/permissions/#navigator-and-workernavigator-extension
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 080968b176c..fa64638fa4c 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -17,6 +17,7 @@ bluetooth = [
     "bluetooth_traits",
     "dep:bluetooth",
     "constellation/bluetooth",
+    "constellation_traits/bluetooth",
     "script/bluetooth",
     "script_traits/bluetooth",
 ]
@@ -28,30 +29,37 @@ background_hang_monitor = ["background_hang_monitor/sampler"]
 jitspew = ["script/jitspew"]
 js_backtrace = ["script/js_backtrace"]
 media-gstreamer = ["servo-media-gstreamer", "gstreamer"]
-multiview = ["compositing/multiview", "constellation/multiview"]
 native-bluetooth = ["bluetooth/native-bluetooth"]
-no-wgl = ["mozangle/egl", "mozangle/build_dlls", "surfman/sm-angle-default", "webrender_traits/no-wgl"]
+no-wgl = ["mozangle/egl", "mozangle/build_dlls", "surfman/sm-angle-default", "compositing_traits/no-wgl"]
 dynamic_freetype = ["webrender/dynamic_freetype"]
 profilemozjs = ["script/profilemozjs"]
 refcell_backtrace = ["script/refcell_backtrace"]
-tracing = ["dep:tracing", "compositing/tracing", "constellation/tracing", "fonts/tracing", "layout_thread_2020/tracing", "profile_traits/tracing", "script/tracing"]
+tracing = [
+    "dep:tracing",
+    "compositing/tracing",
+    "constellation/tracing",
+    "fonts/tracing",
+    "layout/tracing",
+    "profile_traits/tracing",
+    "script/tracing",
+]
 webdriver = ["webdriver_server"]
 webgl_backtrace = [
     "script/webgl_backtrace",
-    "canvas/webgl_backtrace",
+    "webgl/webgl_backtrace",
     "canvas_traits/webgl_backtrace",
 ]
 webxr = [
     "dep:webxr",
     "dep:webxr-api",
     "compositing/webxr",
-    "embedder_traits/webxr",
-    "canvas/webxr",
+    "webgl/webxr",
     "script/webxr",
 ]
 webgpu = [
     "script/webgpu",
     "constellation/webgpu",
+    "constellation_traits/webgpu",
 ]
 
 [dependencies]
@@ -60,7 +68,8 @@ base = { workspace = true }
 bincode = { workspace = true }
 bluetooth = { path = "../bluetooth", optional = true }
 bluetooth_traits = { workspace = true, optional = true }
-canvas = { path = "../canvas", default-features = false }
+canvas = { path = "../canvas" }
+webgl = { path = "../webgl", default-features = false }
 canvas_traits = { workspace = true }
 cfg-if = { workspace = true }
 compositing = { path = "../compositing" }
@@ -79,16 +88,16 @@ gleam = { workspace = true }
 gstreamer = { workspace = true, optional = true }
 ipc-channel = { workspace = true }
 keyboard-types = { workspace = true }
-layout_thread_2020 = { path = "../layout_thread_2020" }
+layout = { path = "../layout" }
 log = { workspace = true }
 media = { path = "../media" }
 mozangle = { workspace = true }
 net = { path = "../net" }
 net_traits = { workspace = true }
-rayon = { workspace = true }
 parking_lot = { workspace = true }
 profile = { path = "../profile" }
 profile_traits = { workspace = true }
+rayon = { workspace = true }
 script = { path = "../script" }
 script_layout_interface = { workspace = true }
 script_traits = { workspace = true }
@@ -96,6 +105,8 @@ serde = { workspace = true }
 servo-media = { workspace = true }
 servo-media-dummy = { workspace = true }
 servo-media-gstreamer = { workspace = true, optional = true }
+servo-tracing = { workspace = true }
+servo_allocator = { path = "../allocator" }
 servo_config = { path = "../config" }
 servo_geometry = { path = "../geometry" }
 servo_url = { path = "../url" }
@@ -108,7 +119,6 @@ webdriver_server = { path = "../webdriver_server", optional = true }
 webgpu = { path = "../webgpu" }
 webrender = { workspace = true }
 webrender_api = { workspace = true }
-webrender_traits = { workspace = true }
 webxr-api = { workspace = true, optional = true }
 
 [target.'cfg(any(target_os = "android", target_env = "ohos"))'.dependencies]
@@ -125,8 +135,18 @@ gaol = "0.2.1"
 webxr = { path = "../webxr", features = ["ipc", "glwindow", "headless", "openxr-api"] }
 
 [dev-dependencies]
+anyhow = "1.0.97"
 http = { workspace = true }
 libservo = { path = ".", features = ["tracing"] }
 rustls = { version = "0.23", default-features = false, features = ["aws-lc-rs"] }
 tracing = { workspace = true }
 winit = "0.30.8"
+
+
+[[test]]
+name = "webview"
+harness = false
+
+[[test]]
+name = "servo"
+harness = false
diff --git a/components/servo/examples/winit_minimal.rs b/components/servo/examples/winit_minimal.rs
index 49d0c96f806..91d3190e732 100644
--- a/components/servo/examples/winit_minimal.rs
+++ b/components/servo/examples/winit_minimal.rs
@@ -1,21 +1,21 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use std::cell::{Cell, RefCell};
+use std::cell::RefCell;
 use std::error::Error;
 use std::rc::Rc;
 
-use compositing::windowing::{AnimationState, EmbedderMethods, WindowMethods};
-use euclid::{Point2D, Scale, Size2D};
-use servo::{RenderingContext, Servo, TouchEventType, WebView, WindowRenderingContext};
-use servo_geometry::DeviceIndependentPixel;
+use euclid::{Scale, Size2D};
+use servo::{
+    RenderingContext, Servo, ServoBuilder, TouchEventType, WebView, WebViewBuilder,
+    WindowRenderingContext,
+};
 use tracing::warn;
 use url::Url;
 use webrender_api::ScrollLocation;
-use webrender_api::units::{DeviceIntPoint, DeviceIntRect, DevicePixel, LayoutVector2D};
+use webrender_api::units::{DeviceIntPoint, DevicePixel, LayoutVector2D};
 use winit::application::ApplicationHandler;
-use winit::dpi::{PhysicalPosition, PhysicalSize};
+use winit::dpi::PhysicalSize;
 use winit::event::{MouseScrollDelta, WindowEvent};
 use winit::event_loop::EventLoop;
 use winit::raw_window_handle::{HasDisplayHandle, HasWindowHandle};
@@ -42,7 +42,7 @@ fn main() -> Result<(), Box<dyn Error>> {
 }
 
 struct AppState {
-    window_delegate: Rc<WindowDelegate>,
+    window: Window,
     servo: Servo,
     rendering_context: Rc<WindowRenderingContext>,
     webviews: RefCell<Vec<WebView>>,
@@ -50,14 +50,17 @@ struct AppState {
 
 impl ::servo::WebViewDelegate for AppState {
     fn notify_new_frame_ready(&self, _: WebView) {
-        self.window_delegate.window.request_redraw();
+        self.window.request_redraw();
     }
 
     fn request_open_auxiliary_webview(&self, parent_webview: WebView) -> Option<WebView> {
-        let webview = self.servo.new_auxiliary_webview();
-        webview.set_delegate(parent_webview.delegate());
+        let webview = WebViewBuilder::new_auxiliary(&self.servo)
+            .hidpi_scale_factor(Scale::new(self.window.scale_factor() as f32))
+            .delegate(parent_webview.delegate())
+            .build();
         webview.focus();
         webview.raise_to_top(true);
+
         self.webviews.borrow_mut().push(webview.clone());
         Some(webview)
     }
@@ -89,25 +92,16 @@ impl ApplicationHandler<WakerEvent> for App {
                 WindowRenderingContext::new(display_handle, window_handle, window.inner_size())
                     .expect("Could not create RenderingContext for window."),
             );
-            let window_delegate = Rc::new(WindowDelegate::new(window));
 
             let _ = rendering_context.make_current();
 
-            let servo = Servo::new(
-                Default::default(),
-                Default::default(),
-                rendering_context.clone(),
-                Box::new(EmbedderDelegate {
-                    waker: waker.clone(),
-                }),
-                window_delegate.clone(),
-                Default::default(),
-                Default::default(),
-            );
+            let servo = ServoBuilder::new(rendering_context.clone())
+                .event_loop_waker(Box::new(waker.clone()))
+                .build();
             servo.setup_logging();
 
             let app_state = Rc::new(AppState {
-                window_delegate,
+                window,
                 servo,
                 rendering_context,
                 webviews: Default::default(),
@@ -117,8 +111,12 @@ impl ApplicationHandler<WakerEvent> for App {
             let url = Url::parse("https://demo.servo.org/experiments/twgl-tunnel/")
                 .expect("Guaranteed by argument");
 
-            let webview = app_state.servo.new_webview(url);
-            webview.set_delegate(app_state.clone());
+            let webview = WebViewBuilder::new(&app_state.servo)
+                .url(url)
+                .hidpi_scale_factor(Scale::new(app_state.window.scale_factor() as f32))
+                .delegate(app_state.clone())
+                .build();
+
             webview.focus();
             webview.raise_to_top(true);
 
@@ -200,19 +198,6 @@ impl ApplicationHandler<WakerEvent> for App {
     }
 }
 
-struct EmbedderDelegate {
-    waker: Waker,
-}
-
-impl EmbedderMethods for EmbedderDelegate {
-    // FIXME: rust-analyzer “Implement missing members” autocompletes this as
-    // webxr_api::MainThreadWaker, which is not available when building without
-    // libservo/webxr, and even if it was, it would fail to compile with E0053.
-    fn create_event_loop_waker(&mut self) -> Box<dyn embedder_traits::EventLoopWaker> {
-        Box::new(self.waker.clone())
-    }
-}
-
 #[derive(Clone)]
 struct Waker(winit::event_loop::EventLoopProxy<WakerEvent>);
 #[derive(Debug)]
@@ -236,52 +221,6 @@ impl embedder_traits::EventLoopWaker for Waker {
     }
 }
 
-struct WindowDelegate {
-    window: Window,
-    animation_state: Cell<AnimationState>,
-}
-
-impl WindowDelegate {
-    fn new(window: Window) -> Self {
-        Self {
-            window,
-            animation_state: Cell::new(AnimationState::Idle),
-        }
-    }
-}
-
-impl WindowMethods for WindowDelegate {
-    fn get_coordinates(&self) -> compositing::windowing::EmbedderCoordinates {
-        let monitor = self
-            .window
-            .current_monitor()
-            .or_else(|| self.window.available_monitors().nth(0))
-            .expect("Failed to get winit monitor");
-        let scale =
-            Scale::<f64, DeviceIndependentPixel, DevicePixel>::new(self.window.scale_factor());
-        let window_size = winit_size_to_euclid_size(self.window.outer_size()).to_i32();
-        let window_origin = self.window.outer_position().unwrap_or_default();
-        let window_origin = winit_position_to_euclid_point(window_origin).to_i32();
-        let window_rect = DeviceIntRect::from_origin_and_size(window_origin, window_size);
-
-        compositing::windowing::EmbedderCoordinates {
-            hidpi_factor: Scale::new(self.window.scale_factor() as f32),
-            screen_size: (winit_size_to_euclid_size(monitor.size()).to_f64() / scale).to_i32(),
-            available_screen_size: (winit_size_to_euclid_size(monitor.size()).to_f64() / scale)
-                .to_i32(),
-            window_rect: (window_rect.to_f64() / scale).to_i32(),
-        }
-    }
-
-    fn set_animation_state(&self, state: compositing::windowing::AnimationState) {
-        self.animation_state.set(state);
-    }
-}
-
 pub fn winit_size_to_euclid_size<T>(size: PhysicalSize<T>) -> Size2D<T, DevicePixel> {
     Size2D::new(size.width, size.height)
 }
-
-pub fn winit_position_to_euclid_point<T>(position: PhysicalPosition<T>) -> Point2D<T, DevicePixel> {
-    Point2D::new(position.x, position.y)
-}
diff --git a/components/servo/javascript_evaluator.rs b/components/servo/javascript_evaluator.rs
new file mode 100644
index 00000000000..41cb5539b05
--- /dev/null
+++ b/components/servo/javascript_evaluator.rs
@@ -0,0 +1,65 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::collections::HashMap;
+
+use base::id::WebViewId;
+use constellation_traits::EmbedderToConstellationMessage;
+use embedder_traits::{JSValue, JavaScriptEvaluationError, JavaScriptEvaluationId};
+
+use crate::ConstellationProxy;
+
+struct PendingEvaluation {
+    callback: Box<dyn FnOnce(Result<JSValue, JavaScriptEvaluationError>)>,
+}
+
+pub(crate) struct JavaScriptEvaluator {
+    current_id: JavaScriptEvaluationId,
+    constellation_proxy: ConstellationProxy,
+    pending_evaluations: HashMap<JavaScriptEvaluationId, PendingEvaluation>,
+}
+
+impl JavaScriptEvaluator {
+    pub(crate) fn new(constellation_proxy: ConstellationProxy) -> Self {
+        Self {
+            current_id: JavaScriptEvaluationId(0),
+            constellation_proxy,
+            pending_evaluations: Default::default(),
+        }
+    }
+
+    fn generate_id(&mut self) -> JavaScriptEvaluationId {
+        let next_id = JavaScriptEvaluationId(self.current_id.0 + 1);
+        std::mem::replace(&mut self.current_id, next_id)
+    }
+
+    pub(crate) fn evaluate(
+        &mut self,
+        webview_id: WebViewId,
+        script: String,
+        callback: Box<dyn FnOnce(Result<JSValue, JavaScriptEvaluationError>)>,
+    ) {
+        let evaluation_id = self.generate_id();
+        self.constellation_proxy
+            .send(EmbedderToConstellationMessage::EvaluateJavaScript(
+                webview_id,
+                evaluation_id,
+                script,
+            ));
+        self.pending_evaluations
+            .insert(evaluation_id, PendingEvaluation { callback });
+    }
+
+    pub(crate) fn finish_evaluation(
+        &mut self,
+        evaluation_id: JavaScriptEvaluationId,
+        result: Result<JSValue, JavaScriptEvaluationError>,
+    ) {
+        (self
+            .pending_evaluations
+            .remove(&evaluation_id)
+            .expect("Received request to finish unknown JavaScript evaluation.")
+            .callback)(result)
+    }
+}
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 7027fa77972..d2c65429ba9 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -18,13 +18,13 @@
 //! `WindowMethods` trait.
 
 mod clipboard_delegate;
+mod javascript_evaluator;
 mod proxies;
 mod responders;
 mod servo_delegate;
 mod webview;
 mod webview_delegate;
 
-use std::borrow::Cow;
 use std::cell::{Cell, RefCell};
 use std::cmp::max;
 use std::collections::HashMap;
@@ -39,13 +39,18 @@ use base::id::{PipelineNamespace, PipelineNamespaceId};
 use bluetooth::BluetoothThreadFactory;
 #[cfg(feature = "bluetooth")]
 use bluetooth_traits::BluetoothRequest;
-use canvas::WebGLComm;
 use canvas::canvas_paint_thread::CanvasPaintThread;
 use canvas_traits::webgl::{GlType, WebGLThreads};
 use clipboard_delegate::StringRequest;
-use compositing::windowing::{EmbedderMethods, WindowMethods};
+pub use compositing::WebRenderDebugOption;
 use compositing::{IOCompositor, InitialCompositorState};
-use compositing_traits::{CompositorMsg, CompositorProxy, CompositorReceiver};
+pub use compositing_traits::rendering_context::{
+    OffscreenRenderingContext, RenderingContext, SoftwareRenderingContext, WindowRenderingContext,
+};
+use compositing_traits::{
+    CompositorMsg, CompositorProxy, CrossProcessCompositorApi, WebrenderExternalImageHandlers,
+    WebrenderExternalImageRegistry, WebrenderImageHandlerType,
+};
 #[cfg(all(
     not(target_os = "windows"),
     not(target_os = "ios"),
@@ -56,15 +61,14 @@ use compositing_traits::{CompositorMsg, CompositorProxy, CompositorReceiver};
 ))]
 use constellation::content_process_sandbox_profile;
 use constellation::{
-    Constellation, FromCompositorLogger, FromScriptLogger, InitialConstellationState,
+    Constellation, FromEmbedderLogger, FromScriptLogger, InitialConstellationState,
     UnprivilegedContent,
 };
-use constellation_traits::{ConstellationMsg, WindowSizeData};
+use constellation_traits::{EmbedderToConstellationMessage, ScriptToConstellationChan};
 use crossbeam_channel::{Receiver, Sender, unbounded};
 use embedder_traits::user_content_manager::UserContentManager;
 pub use embedder_traits::*;
 use env_logger::Builder as EnvLoggerBuilder;
-use euclid::Scale;
 use fonts::SystemFontService;
 #[cfg(all(
     not(target_os = "windows"),
@@ -79,7 +83,9 @@ pub use gleam::gl;
 use gleam::gl::RENDERER;
 use ipc_channel::ipc::{self, IpcSender};
 use ipc_channel::router::ROUTER;
+use javascript_evaluator::JavaScriptEvaluator;
 pub use keyboard_types::*;
+use layout::LayoutFactoryImpl;
 use log::{Log, Metadata, Record, debug, warn};
 use media::{GlApi, NativeDisplay, WindowGLContext};
 use net::protocols::ProtocolRegistry;
@@ -87,7 +93,6 @@ use net::resource_thread::new_resource_threads;
 use profile::{mem as profile_mem, time as profile_time};
 use profile_traits::{mem, time};
 use script::{JSEngineSetup, ServiceWorkerManager};
-use script_traits::ScriptToConstellationChan;
 use servo_config::opts::Opts;
 use servo_config::prefs::Preferences;
 use servo_config::{opts, pref, prefs};
@@ -95,27 +100,21 @@ use servo_delegate::DefaultServoDelegate;
 use servo_media::ServoMedia;
 use servo_media::player::context::GlContext;
 use servo_url::ServoUrl;
+use webgl::WebGLComm;
 #[cfg(feature = "webgpu")]
 pub use webgpu;
 #[cfg(feature = "webgpu")]
 use webgpu::swapchain::WGPUImageMap;
 use webrender::{ONE_TIME_USAGE_HINT, RenderApiSender, ShaderPrecacheFlags, UploadMethod};
 use webrender_api::{ColorF, DocumentId, FramePublishId};
-pub use webrender_traits::rendering_context::{
-    OffscreenRenderingContext, RenderingContext, SoftwareRenderingContext, WindowRenderingContext,
-};
-use webrender_traits::{
-    CrossProcessCompositorApi, WebrenderExternalImageHandlers, WebrenderExternalImageRegistry,
-    WebrenderImageHandlerType,
-};
 use webview::WebViewInner;
 #[cfg(feature = "webxr")]
 pub use webxr;
 pub use {
-    background_hang_monitor, base, canvas, canvas_traits, compositing, devtools, devtools_traits,
-    euclid, fonts, ipc_channel, layout_thread_2020, media, net, net_traits, profile,
-    profile_traits, script, script_layout_interface, script_traits, servo_config as config,
-    servo_config, servo_geometry, servo_url, style, style_traits, webrender_api,
+    background_hang_monitor, base, canvas, canvas_traits, devtools, devtools_traits, euclid, fonts,
+    ipc_channel, media, net, net_traits, profile, profile_traits, script, script_layout_interface,
+    script_traits, servo_config as config, servo_config, servo_geometry, servo_url, style,
+    style_traits, webrender_api,
 };
 #[cfg(feature = "bluetooth")]
 pub use {bluetooth, bluetooth_traits};
@@ -123,19 +122,20 @@ pub use {bluetooth, bluetooth_traits};
 use crate::proxies::ConstellationProxy;
 use crate::responders::ServoErrorChannel;
 pub use crate::servo_delegate::{ServoDelegate, ServoError};
-pub use crate::webview::WebView;
+use crate::webrender_api::FrameReadyParams;
+pub use crate::webview::{WebView, WebViewBuilder};
 pub use crate::webview_delegate::{
-    AllowOrDenyRequest, AuthenticationRequest, NavigationRequest, PermissionRequest,
-    WebResourceLoad, WebViewDelegate,
+    AllowOrDenyRequest, AuthenticationRequest, FormControl, NavigationRequest, PermissionRequest,
+    SelectElement, WebResourceLoad, WebViewDelegate,
 };
 
 #[cfg(feature = "webdriver")]
-fn webdriver(port: u16, constellation: Sender<ConstellationMsg>) {
+fn webdriver(port: u16, constellation: Sender<EmbedderToConstellationMessage>) {
     webdriver_server::start_server(port, constellation);
 }
 
 #[cfg(not(feature = "webdriver"))]
-fn webdriver(_port: u16, _constellation: Sender<ConstellationMsg>) {}
+fn webdriver(_port: u16, _constellation: Sender<EmbedderToConstellationMessage>) {}
 
 #[cfg(feature = "media-gstreamer")]
 mod media_platform {
@@ -191,16 +191,16 @@ mod media_platform {
 /// orchestrating the interaction between JavaScript, CSS layout,
 /// rendering, and the client window.
 ///
-/// Clients create a `Servo` instance for a given reference-counted type
-/// implementing `WindowMethods`, which is the bridge to whatever
-/// application Servo is embedded in. Clients then create an event
-/// loop to pump messages between the embedding application and
-/// various browser components.
+// Clients create an event loop to pump messages between the embedding
+// application and various browser components.
 pub struct Servo {
     delegate: RefCell<Rc<dyn ServoDelegate>>,
     compositor: Rc<RefCell<IOCompositor>>,
     constellation_proxy: ConstellationProxy,
     embedder_receiver: Receiver<EmbedderMsg>,
+    /// A struct that tracks ongoing JavaScript evaluations and is responsible for
+    /// calling the callback when the evaluation is complete.
+    javascript_evaluator: Rc<RefCell<JavaScriptEvaluator>>,
     /// Tracks whether we are in the process of shutting down, or have shut down.
     /// This is shared with `WebView`s and the `ServoRenderer`.
     shutdown_state: Rc<Cell<ShutdownState>>,
@@ -214,6 +214,8 @@ pub struct Servo {
     /// and deinitialization of the JS Engine. Multiprocess Servo instances have their
     /// own instance that exists in the content process instead.
     _js_engine_setup: Option<JSEngineSetup>,
+    /// Whether or not any WebView in this instance is animating or WebXR is enabled.
+    animating: Cell<bool>,
 }
 
 #[derive(Clone)]
@@ -237,43 +239,29 @@ impl webrender_api::RenderNotifier for RenderNotifier {
     fn new_frame_ready(
         &self,
         document_id: DocumentId,
-        _scrolled: bool,
-        composite_needed: bool,
-        _frame_publish_id: FramePublishId,
+        _: FramePublishId,
+        frame_ready_params: &FrameReadyParams,
     ) {
         self.compositor_proxy
             .send(CompositorMsg::NewWebRenderFrameReady(
                 document_id,
-                composite_needed,
+                frame_ready_params.render,
             ));
     }
 }
 
 impl Servo {
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(
-            skip(preferences, rendering_context, embedder, window),
-            fields(servo_profiling = true),
-            level = "trace",
-        )
-    )]
-    pub fn new(
-        opts: Opts,
-        preferences: Preferences,
-        rendering_context: Rc<dyn RenderingContext>,
-        mut embedder: Box<dyn EmbedderMethods>,
-        window: Rc<dyn WindowMethods>,
-        user_agent: Option<String>,
-        user_content_manager: UserContentManager,
-    ) -> Self {
+    #[servo_tracing::instrument(skip(builder))]
+    fn new(builder: ServoBuilder) -> Self {
         // Global configuration options, parsed from the command line.
-        opts::set_options(opts);
+        let opts = builder.opts.map(|opts| *opts);
+        opts::set_options(opts.unwrap_or_default());
         let opts = opts::get();
 
         // Set the preferences globally.
         // TODO: It would be better to make these private to a particular Servo instance.
-        servo_config::prefs::set(preferences);
+        let preferences = builder.preferences.map(|opts| *opts);
+        servo_config::prefs::set(preferences.unwrap_or_default());
 
         use std::sync::atomic::Ordering;
 
@@ -288,25 +276,8 @@ impl Servo {
             media_platform::init();
         }
 
-        let user_agent = match user_agent {
-            Some(ref ua) if ua == "ios" => default_user_agent_string_for(UserAgent::iOS).into(),
-            Some(ref ua) if ua == "android" => {
-                default_user_agent_string_for(UserAgent::Android).into()
-            },
-            Some(ref ua) if ua == "desktop" => {
-                default_user_agent_string_for(UserAgent::Desktop).into()
-            },
-            Some(ref ua) if ua == "ohos" => {
-                default_user_agent_string_for(UserAgent::OpenHarmony).into()
-            },
-            Some(ua) => ua.into(),
-            None => embedder
-                .get_user_agent_string()
-                .map(Into::into)
-                .unwrap_or(default_user_agent_string_for(DEFAULT_USER_AGENT).into()),
-        };
-
         // Get GL bindings
+        let rendering_context = builder.rendering_context;
         let webrender_gl = rendering_context.gleam_gl_api();
 
         // Make sure the gl context is made current.
@@ -322,7 +293,7 @@ impl Servo {
         // the client window and the compositor. This channel is unique because
         // messages to client may need to pump a platform-specific event loop
         // to deliver the message.
-        let event_loop_waker = embedder.create_event_loop_waker();
+        let event_loop_waker = builder.event_loop_waker;
         let (compositor_proxy, compositor_receiver) =
             create_compositor_channel(event_loop_waker.clone());
         let (embedder_proxy, embedder_receiver) = create_embedder_channel(event_loop_waker.clone());
@@ -341,10 +312,6 @@ impl Servo {
             None
         };
 
-        let coordinates: compositing::windowing::EmbedderCoordinates = window.get_coordinates();
-        let device_pixel_ratio = coordinates.hidpi_factor.get();
-        let viewport_size = rendering_context.size2d();
-
         let (mut webrender, webrender_api_sender) = {
             let mut debug_flags = webrender::DebugFlags::empty();
             debug_flags.set(
@@ -402,6 +369,7 @@ impl Servo {
                     clear_color,
                     upload_method,
                     workers,
+                    size_of_op: Some(servo_allocator::usable_size),
                     ..Default::default()
                 },
                 None,
@@ -410,7 +378,7 @@ impl Servo {
         };
 
         let webrender_api = webrender_api_sender.create_api();
-        let webrender_document = webrender_api.add_document(viewport_size.to_i32());
+        let webrender_document = webrender_api.add_document(rendering_context.size2d().to_i32());
 
         // Important that this call is done in a single-threaded fashion, we
         // can't defer it after `create_constellation` has started.
@@ -452,7 +420,7 @@ impl Servo {
                 .expect("Failed to create WebXR device registry");
         #[cfg(feature = "webxr")]
         if pref!(dom_webxr_enabled) {
-            embedder.register_webxr(&mut webxr_main_thread, embedder_proxy.clone());
+            builder.webxr_registry.register(&mut webxr_main_thread);
         }
 
         #[cfg(feature = "webgpu")]
@@ -472,21 +440,12 @@ impl Servo {
 
         webrender.set_external_image_handler(external_image_handlers);
 
-        // The division by 1 represents the page's default zoom of 100%,
-        // and gives us the appropriate CSSPixel type for the viewport.
-        let scaled_viewport_size = viewport_size.to_f32().to_untyped() / device_pixel_ratio;
-        let window_size = WindowSizeData {
-            initial_viewport: scaled_viewport_size / Scale::new(1.0),
-            device_pixel_ratio: Scale::new(device_pixel_ratio),
-        };
-
         // Create the constellation, which maintains the engine pipelines, including script and
         // layout, as well as the navigation context.
         let mut protocols = ProtocolRegistry::with_internal_protocols();
-        protocols.merge(embedder.get_protocol_handlers());
+        protocols.merge(builder.protocol_registry);
 
         let constellation_chan = create_constellation(
-            user_agent,
             opts.config_dir.clone(),
             embedder_proxy,
             compositor_proxy.clone(),
@@ -498,12 +457,11 @@ impl Servo {
             #[cfg(feature = "webxr")]
             webxr_main_thread.registry(),
             Some(webgl_threads),
-            window_size,
             external_images,
             #[cfg(feature = "webgpu")]
             wgpu_image_map,
             protocols,
-            user_content_manager,
+            builder.user_content_manager,
         );
 
         if cfg!(feature = "webdriver") {
@@ -516,7 +474,6 @@ impl Servo {
         // rendered page and display it somewhere.
         let shutdown_state = Rc::new(Cell::new(ShutdownState::NotShuttingDown));
         let compositor = IOCompositor::new(
-            window,
             InitialCompositorState {
                 sender: compositor_proxy,
                 receiver: compositor_receiver,
@@ -533,18 +490,22 @@ impl Servo {
                 shutdown_state: shutdown_state.clone(),
             },
             opts.debug.convert_mouse_to_touch,
-            embedder.get_version_string().unwrap_or_default(),
         );
 
+        let constellation_proxy = ConstellationProxy::new(constellation_chan);
         Self {
             delegate: RefCell::new(Rc::new(DefaultServoDelegate)),
             compositor: Rc::new(RefCell::new(compositor)),
-            constellation_proxy: ConstellationProxy::new(constellation_chan),
+            javascript_evaluator: Rc::new(RefCell::new(JavaScriptEvaluator::new(
+                constellation_proxy.clone(),
+            ))),
+            constellation_proxy,
             embedder_receiver,
             shutdown_state,
             webviews: Default::default(),
             servo_errors: ServoErrorChannel::default(),
             _js_engine_setup: js_engine_setup,
+            animating: Cell::new(false),
         }
     }
 
@@ -556,6 +517,15 @@ impl Servo {
         *self.delegate.borrow_mut() = delegate;
     }
 
+    /// Whether or not any [`WebView`] of this Servo instance has animating content, such as a CSS
+    /// animation or transition or is running `requestAnimationFrame` callbacks. In addition, this
+    /// returns true if WebXR content is running. This indicates that the embedding application
+    /// should be spinning the Servo event loop on regular intervals in order to trigger animation
+    /// updates.
+    pub fn animating(&self) -> bool {
+        self.animating.get()
+    }
+
     /// **EXPERIMENTAL:** Intialize GL accelerated media playback. This currently only works on a limited number
     /// of platforms. This should be run *before* calling [`Servo::new`] and creating the first [`WebView`].
     pub fn initialize_gl_accelerated_media(display: NativeDisplay, api: GlApi, context: GlContext) {
@@ -593,6 +563,7 @@ impl Servo {
 
         self.compositor.borrow_mut().perform_updates();
         self.send_new_frame_ready_messages();
+        self.send_animating_changed_messages();
         self.handle_delegate_errors();
         self.clean_up_destroyed_webview_handles();
 
@@ -618,6 +589,19 @@ impl Servo {
         }
     }
 
+    fn send_animating_changed_messages(&self) {
+        let animating = self.compositor.borrow().webxr_running() ||
+            self.webviews
+                .borrow()
+                .values()
+                .filter_map(WebView::from_weak_handle)
+                .any(|webview| webview.animating());
+        if animating != self.animating.get() {
+            self.animating.set(animating);
+            self.delegate().notify_animating_changed(animating);
+        }
+    }
+
     fn handle_delegate_errors(&self) {
         while let Some(error) = self.servo_errors.try_recv() {
             self.delegate().notify_error(self, error);
@@ -634,15 +618,11 @@ impl Servo {
             .retain(|_webview_id, webview| webview.strong_count() > 0);
     }
 
-    pub fn pinch_zoom_level(&self) -> f32 {
-        self.compositor.borrow_mut().pinch_zoom_level().get()
-    }
-
     pub fn setup_logging(&self) {
         let constellation_chan = self.constellation_proxy.sender();
         let env = env_logger::Env::default();
         let env_logger = EnvLoggerBuilder::from_env(env).build();
-        let con_logger = FromCompositorLogger::new(constellation_chan);
+        let con_logger = FromEmbedderLogger::new(constellation_chan);
 
         let filter = max(env_logger.filter(), con_logger.filter());
         let logger = BothLogger(env_logger, con_logger);
@@ -658,7 +638,8 @@ impl Servo {
         }
 
         debug!("Sending Exit message to Constellation");
-        self.constellation_proxy.send(ConstellationMsg::Exit);
+        self.constellation_proxy
+            .send(EmbedderToConstellationMessage::Exit);
         self.shutdown_state.set(ShutdownState::ShuttingDown);
     }
 
@@ -672,24 +653,6 @@ impl Servo {
         self.compositor.borrow_mut().deinit();
     }
 
-    pub fn new_webview(&self, url: url::Url) -> WebView {
-        let webview = WebView::new(&self.constellation_proxy, self.compositor.clone());
-        self.webviews
-            .borrow_mut()
-            .insert(webview.id(), webview.weak_handle());
-        self.constellation_proxy
-            .send(ConstellationMsg::NewWebView(url.into(), webview.id()));
-        webview
-    }
-
-    pub fn new_auxiliary_webview(&self) -> WebView {
-        let webview = WebView::new(&self.constellation_proxy, self.compositor.clone());
-        self.webviews
-            .borrow_mut()
-            .insert(webview.id(), webview.weak_handle());
-        webview
-    }
-
     fn get_webview_handle(&self, id: WebViewId) -> Option<WebView> {
         self.webviews
             .borrow()
@@ -747,8 +710,11 @@ impl Servo {
             },
             EmbedderMsg::AllowOpeningWebView(webview_id, response_sender) => {
                 if let Some(webview) = self.get_webview_handle(webview_id) {
-                    let new_webview = webview.delegate().request_open_auxiliary_webview(webview);
-                    let _ = response_sender.send(new_webview.map(|webview| webview.id()));
+                    let webview_id_and_viewport_details = webview
+                        .delegate()
+                        .request_open_auxiliary_webview(webview)
+                        .map(|webview| (webview.id(), webview.viewport_details()));
+                    let _ = response_sender.send(webview_id_and_viewport_details);
                 }
             },
             EmbedderMsg::WebViewClosed(webview_id) => {
@@ -781,6 +747,11 @@ impl Servo {
                     webview.delegate().request_unload(webview, request);
                 }
             },
+            EmbedderMsg::FinishJavaScriptEvaluation(evaluation_id, result) => {
+                self.javascript_evaluator
+                    .borrow_mut()
+                    .finish_evaluation(evaluation_id, result);
+            },
             EmbedderMsg::Keyboard(webview_id, keyboard_event) => {
                 if let Some(webview) = self.get_webview_handle(webview_id) {
                     webview
@@ -994,6 +965,20 @@ impl Servo {
                     None => self.delegate().show_notification(notification),
                 }
             },
+            EmbedderMsg::ShowSelectElementMenu(
+                webview_id,
+                options,
+                selected_option,
+                position,
+                ipc_sender,
+            ) => {
+                if let Some(webview) = self.get_webview_handle(webview_id) {
+                    let prompt = SelectElement::new(options, selected_option, position, ipc_sender);
+                    webview
+                        .delegate()
+                        .show_form_control(webview, FormControl::SelectElement(prompt));
+                }
+            },
         }
     }
 }
@@ -1013,7 +998,7 @@ fn create_embedder_channel(
 
 fn create_compositor_channel(
     event_loop_waker: Box<dyn EventLoopWaker>,
-) -> (CompositorProxy, CompositorReceiver) {
+) -> (CompositorProxy, Receiver<CompositorMsg>) {
     let (sender, receiver) = unbounded();
 
     let (compositor_ipc_sender, compositor_ipc_receiver) =
@@ -1030,18 +1015,15 @@ fn create_compositor_channel(
     ROUTER.add_typed_route(
         compositor_ipc_receiver,
         Box::new(move |message| {
-            compositor_proxy_clone.send(CompositorMsg::CrossProcess(
-                message.expect("Could not convert Compositor message"),
-            ));
+            compositor_proxy_clone.send(message.expect("Could not convert Compositor message"));
         }),
     );
 
-    (compositor_proxy, CompositorReceiver { receiver })
+    (compositor_proxy, receiver)
 }
 
 #[allow(clippy::too_many_arguments)]
 fn create_constellation(
-    user_agent: Cow<'static, str>,
     config_dir: Option<PathBuf>,
     embedder_proxy: EmbedderProxy,
     compositor_proxy: CompositorProxy,
@@ -1052,12 +1034,11 @@ fn create_constellation(
     webrender_api_sender: RenderApiSender,
     #[cfg(feature = "webxr")] webxr_registry: webxr_api::Registry,
     webgl_threads: Option<WebGLThreads>,
-    initial_window_size: WindowSizeData,
     external_images: Arc<Mutex<WebrenderExternalImageRegistry>>,
     #[cfg(feature = "webgpu")] wgpu_image_map: WGPUImageMap,
     protocols: ProtocolRegistry,
     user_content_manager: UserContentManager,
-) -> Sender<ConstellationMsg> {
+) -> Sender<EmbedderToConstellationMessage> {
     // Global configuration options, parsed from the command line.
     let opts = opts::get();
 
@@ -1066,7 +1047,6 @@ fn create_constellation(
         BluetoothThreadFactory::new(embedder_proxy.clone());
 
     let (public_resource_threads, private_resource_threads) = new_resource_threads(
-        user_agent.clone(),
         devtools_sender.clone(),
         time_profiler_chan.clone(),
         mem_profiler_chan.clone(),
@@ -1078,7 +1058,11 @@ fn create_constellation(
     );
 
     let system_font_service = Arc::new(
-        SystemFontService::spawn(compositor_proxy.cross_process_compositor_api.clone()).to_proxy(),
+        SystemFontService::spawn(
+            compositor_proxy.cross_process_compositor_api.clone(),
+            mem_profiler_chan.clone(),
+        )
+        .to_proxy(),
     );
 
     let (canvas_create_sender, canvas_ipc_sender) = CanvasPaintThread::start(
@@ -1105,19 +1089,17 @@ fn create_constellation(
         #[cfg(not(feature = "webxr"))]
         webxr_registry: None,
         webgl_threads,
-        user_agent,
         webrender_external_images: external_images,
         #[cfg(feature = "webgpu")]
         wgpu_image_map,
         user_content_manager,
     };
 
-    let layout_factory = Arc::new(layout_thread_2020::LayoutFactoryImpl());
+    let layout_factory = Arc::new(LayoutFactoryImpl());
 
     Constellation::<script::ScriptThread, script::ServiceWorkerManager>::start(
         initial_state,
         layout_factory,
-        initial_window_size,
         opts.random_pipeline_closure_probability,
         opts.random_pipeline_closure_seed,
         opts.hard_fail,
@@ -1190,7 +1172,9 @@ pub fn run_content_process(token: String) {
             set_logger(content.script_to_constellation_chan().clone());
 
             let background_hang_monitor_register = content.register_with_background_hang_monitor();
-            let layout_factory = Arc::new(layout_thread_2020::LayoutFactoryImpl());
+            let layout_factory = Arc::new(LayoutFactoryImpl());
+
+            content.register_system_memory_reporter();
 
             content.start_all::<script::ScriptThread>(
                 true,
@@ -1230,70 +1214,76 @@ fn create_sandbox() {
     panic!("Sandboxing is not supported on Windows, iOS, ARM targets and android.");
 }
 
-enum UserAgent {
-    Desktop,
-    Android,
-    OpenHarmony,
-    #[allow(non_camel_case_types)]
-    iOS,
-}
+struct DefaultEventLoopWaker;
 
-fn get_servo_version() -> &'static str {
-    env!("CARGO_PKG_VERSION")
-}
-
-fn default_user_agent_string_for(agent: UserAgent) -> String {
-    let servo_version = get_servo_version();
-
-    #[cfg(all(target_os = "linux", target_arch = "x86_64", not(target_env = "ohos")))]
-    let desktop_ua_string =
-        format!("Mozilla/5.0 (X11; Linux x86_64; rv:128.0) Servo/{servo_version} Firefox/128.0");
-    #[cfg(all(
-        target_os = "linux",
-        not(target_arch = "x86_64"),
-        not(target_env = "ohos")
-    ))]
-    let desktop_ua_string =
-        format!("Mozilla/5.0 (X11; Linux i686; rv:128.0) Servo/{servo_version} Firefox/128.0");
-
-    #[cfg(all(target_os = "windows", target_arch = "x86_64"))]
-    let desktop_ua_string = format!(
-        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Servo/{servo_version} Firefox/128.0"
-    );
-    #[cfg(all(target_os = "windows", not(target_arch = "x86_64")))]
-    let desktop_ua_string =
-        format!("Mozilla/5.0 (Windows NT 10.0; rv:128.0) Servo/{servo_version} Firefox/128.0");
-
-    #[cfg(target_os = "macos")]
-    let desktop_ua_string = format!(
-        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:128.0) Servo/{servo_version} Firefox/128.0"
-    );
-
-    #[cfg(any(target_os = "android", target_env = "ohos"))]
-    let desktop_ua_string = "".to_string();
-
-    match agent {
-        UserAgent::Desktop => desktop_ua_string,
-        UserAgent::Android => {
-            format!("Mozilla/5.0 (Android; Mobile; rv:128.0) Servo/{servo_version} Firefox/128.0")
-        },
-        UserAgent::OpenHarmony => format!(
-            "Mozilla/5.0 (OpenHarmony; Mobile; rv:128.0) Servo/{servo_version} Firefox/128.0"
-        ),
-        UserAgent::iOS => format!(
-            "Mozilla/5.0 (iPhone; CPU iPhone OS 18_0 like Mac OS X; rv:128.0) Servo/{servo_version} Firefox/128.0"
-        ),
+impl EventLoopWaker for DefaultEventLoopWaker {
+    fn clone_box(&self) -> Box<dyn EventLoopWaker> {
+        Box::new(DefaultEventLoopWaker)
     }
 }
 
-#[cfg(target_os = "android")]
-const DEFAULT_USER_AGENT: UserAgent = UserAgent::Android;
+#[cfg(feature = "webxr")]
+struct DefaultWebXrRegistry;
+#[cfg(feature = "webxr")]
+impl webxr::WebXrRegistry for DefaultWebXrRegistry {}
 
-#[cfg(target_env = "ohos")]
-const DEFAULT_USER_AGENT: UserAgent = UserAgent::OpenHarmony;
+pub struct ServoBuilder {
+    rendering_context: Rc<dyn RenderingContext>,
+    opts: Option<Box<Opts>>,
+    preferences: Option<Box<Preferences>>,
+    event_loop_waker: Box<dyn EventLoopWaker>,
+    user_content_manager: UserContentManager,
+    protocol_registry: ProtocolRegistry,
+    #[cfg(feature = "webxr")]
+    webxr_registry: Box<dyn webxr::WebXrRegistry>,
+}
 
-#[cfg(target_os = "ios")]
-const DEFAULT_USER_AGENT: UserAgent = UserAgent::iOS;
+impl ServoBuilder {
+    pub fn new(rendering_context: Rc<dyn RenderingContext>) -> Self {
+        Self {
+            rendering_context,
+            opts: None,
+            preferences: None,
+            event_loop_waker: Box::new(DefaultEventLoopWaker),
+            user_content_manager: UserContentManager::default(),
+            protocol_registry: ProtocolRegistry::default(),
+            #[cfg(feature = "webxr")]
+            webxr_registry: Box::new(DefaultWebXrRegistry),
+        }
+    }
 
-#[cfg(not(any(target_os = "android", target_os = "ios", target_env = "ohos")))]
-const DEFAULT_USER_AGENT: UserAgent = UserAgent::Desktop;
+    pub fn build(self) -> Servo {
+        Servo::new(self)
+    }
+
+    pub fn opts(mut self, opts: Opts) -> Self {
+        self.opts = Some(Box::new(opts));
+        self
+    }
+
+    pub fn preferences(mut self, preferences: Preferences) -> Self {
+        self.preferences = Some(Box::new(preferences));
+        self
+    }
+
+    pub fn event_loop_waker(mut self, event_loop_waker: Box<dyn EventLoopWaker>) -> Self {
+        self.event_loop_waker = event_loop_waker;
+        self
+    }
+
+    pub fn user_content_manager(mut self, user_content_manager: UserContentManager) -> Self {
+        self.user_content_manager = user_content_manager;
+        self
+    }
+
+    pub fn protocol_registry(mut self, protocol_registry: ProtocolRegistry) -> Self {
+        self.protocol_registry = protocol_registry;
+        self
+    }
+
+    #[cfg(feature = "webxr")]
+    pub fn webxr_registry(mut self, webxr_registry: Box<dyn webxr::WebXrRegistry>) -> Self {
+        self.webxr_registry = webxr_registry;
+        self
+    }
+}
diff --git a/components/servo/proxies.rs b/components/servo/proxies.rs
index b18f7e93944..5db701198a4 100644
--- a/components/servo/proxies.rs
+++ b/components/servo/proxies.rs
@@ -5,18 +5,18 @@
 use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
 
-use constellation_traits::ConstellationMsg;
+use constellation_traits::EmbedderToConstellationMessage;
 use crossbeam_channel::{SendError, Sender};
 use log::warn;
 
 #[derive(Clone)]
 pub(crate) struct ConstellationProxy {
-    sender: Sender<ConstellationMsg>,
+    sender: Sender<EmbedderToConstellationMessage>,
     disconnected: Arc<AtomicBool>,
 }
 
 impl ConstellationProxy {
-    pub fn new(sender: Sender<ConstellationMsg>) -> Self {
+    pub fn new(sender: Sender<EmbedderToConstellationMessage>) -> Self {
         Self {
             sender,
             disconnected: Arc::default(),
@@ -27,13 +27,16 @@ impl ConstellationProxy {
         self.disconnected.load(Ordering::SeqCst)
     }
 
-    pub fn send(&self, msg: ConstellationMsg) {
+    pub fn send(&self, msg: EmbedderToConstellationMessage) {
         if self.try_send(msg).is_err() {
             warn!("Lost connection to Constellation. Will report to embedder.")
         }
     }
 
-    fn try_send(&self, msg: ConstellationMsg) -> Result<(), SendError<ConstellationMsg>> {
+    fn try_send(
+        &self,
+        msg: EmbedderToConstellationMessage,
+    ) -> Result<(), SendError<EmbedderToConstellationMessage>> {
         if self.disconnected() {
             return Err(SendError(msg));
         }
@@ -45,7 +48,7 @@ impl ConstellationProxy {
         Ok(())
     }
 
-    pub fn sender(&self) -> Sender<ConstellationMsg> {
+    pub fn sender(&self) -> Sender<EmbedderToConstellationMessage> {
         self.sender.clone()
     }
 }
diff --git a/components/servo/servo_delegate.rs b/components/servo/servo_delegate.rs
index 8ec53a4790b..b119a962029 100644
--- a/components/servo/servo_delegate.rs
+++ b/components/servo/servo_delegate.rs
@@ -28,6 +28,11 @@ pub trait ServoDelegate {
     /// Request a DevTools connection from a DevTools client. Typically an embedder application
     /// will show a permissions prompt when this happens to confirm a connection is allowed.
     fn request_devtools_connection(&self, _servo: &Servo, _request: AllowOrDenyRequest) {}
+    /// Any [`WebView`] in this Servo instance has either started to animate or WebXR is
+    /// running. When a [`WebView`] is animating, it is up to the embedding application
+    /// ensure that `Servo::spin_event_loop` is called at regular intervals in order to
+    /// update the painted contents of the [`WebView`].
+    fn notify_animating_changed(&self, _animating: bool) {}
     /// Triggered when Servo will load a web (HTTP/HTTPS) resource. The load may be
     /// intercepted and alternate contents can be loaded by the client by calling
     /// [`WebResourceLoad::intercept`]. If not handled, the load will continue as normal.
diff --git a/components/servo/tests/common/mod.rs b/components/servo/tests/common/mod.rs
new file mode 100644
index 00000000000..de71361e9be
--- /dev/null
+++ b/components/servo/tests/common/mod.rs
@@ -0,0 +1,124 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::rc::Rc;
+use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::time::Duration;
+
+use anyhow::Error;
+use compositing_traits::rendering_context::{RenderingContext, SoftwareRenderingContext};
+use dpi::PhysicalSize;
+use embedder_traits::EventLoopWaker;
+use servo::{Servo, ServoBuilder};
+
+macro_rules! run_api_tests {
+    ($($test_function:ident), +) => {
+        let mut failed = false;
+
+        // Be sure that `servo_test` is dropped before exiting early.
+        {
+            let servo_test = ServoTest::new();
+            $(
+                common::run_test($test_function, stringify!($test_function), &servo_test, &mut failed);
+            )+
+        }
+
+        if failed {
+            std::process::exit(1);
+        }
+    }
+}
+
+pub(crate) use run_api_tests;
+
+pub(crate) fn run_test(
+    test_function: fn(&ServoTest) -> Result<(), Error>,
+    test_name: &str,
+    servo_test: &ServoTest,
+    failed: &mut bool,
+) {
+    match test_function(servo_test) {
+        Ok(_) => println!("    ✅ {test_name}"),
+        Err(error) => {
+            *failed = true;
+            println!("    ❌ {test_name}");
+            println!("{}", format!("\n{error:?}").replace("\n", "\n        "));
+        },
+    }
+}
+
+pub struct ServoTest {
+    servo: Servo,
+}
+
+impl Drop for ServoTest {
+    fn drop(&mut self) {
+        self.servo.start_shutting_down();
+        while self.servo.spin_event_loop() {
+            std::thread::sleep(Duration::from_millis(1));
+        }
+        self.servo.deinit();
+    }
+}
+
+impl ServoTest {
+    pub(crate) fn new() -> Self {
+        let rendering_context = Rc::new(
+            SoftwareRenderingContext::new(PhysicalSize {
+                width: 500,
+                height: 500,
+            })
+            .expect("Could not create SoftwareRenderingContext"),
+        );
+        assert!(rendering_context.make_current().is_ok());
+
+        #[derive(Clone)]
+        struct EventLoopWakerImpl(Arc<AtomicBool>);
+        impl EventLoopWaker for EventLoopWakerImpl {
+            fn clone_box(&self) -> Box<dyn EventLoopWaker> {
+                Box::new(self.clone())
+            }
+
+            fn wake(&self) {
+                self.0.store(true, Ordering::Relaxed);
+            }
+        }
+
+        let user_event_triggered = Arc::new(AtomicBool::new(false));
+        let servo = ServoBuilder::new(rendering_context.clone())
+            .event_loop_waker(Box::new(EventLoopWakerImpl(user_event_triggered)))
+            .build();
+        Self { servo }
+    }
+
+    pub fn servo(&self) -> &Servo {
+        &self.servo
+    }
+
+    /// Spin the Servo event loop until one of:
+    ///  - The given callback returns `Ok(false)`.
+    ///  - The given callback returns an `Error`, in which case the `Error` will be returned.
+    ///  - Servo has indicated that shut down is complete and we cannot spin the event loop
+    ///    any longer.
+    // The dead code exception here is because not all test suites that use `common` also
+    // use `spin()`.
+    #[allow(dead_code)]
+    pub fn spin(&self, callback: impl Fn() -> Result<bool, Error> + 'static) -> Result<(), Error> {
+        let mut keep_going = true;
+        while keep_going {
+            std::thread::sleep(Duration::from_millis(1));
+            if !self.servo.spin_event_loop() {
+                return Ok(());
+            }
+            let result = callback();
+            match result {
+                Ok(result) => keep_going = result,
+                Err(error) => return Err(error),
+            }
+        }
+
+        Ok(())
+    }
+}
diff --git a/components/servo/tests/servo.rs b/components/servo/tests/servo.rs
new file mode 100644
index 00000000000..6333b0af50a
--- /dev/null
+++ b/components/servo/tests/servo.rs
@@ -0,0 +1,26 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! Servo API unit tests.
+//!
+//! Since all Servo tests must run serially on the same thread, it is important
+//! that tests never panic. In order to ensure this, use `anyhow::ensure!` instead
+//! of `assert!` for test assertions. `ensure!` will produce a `Result::Err` in
+//! place of panicking.
+
+mod common;
+
+use anyhow::ensure;
+use common::{ServoTest, run_api_tests};
+
+fn test_simple_servo_is_not_animating_by_default(
+    servo_test: &ServoTest,
+) -> Result<(), anyhow::Error> {
+    ensure!(!servo_test.servo().animating());
+    Ok(())
+}
+
+fn main() {
+    run_api_tests!(test_simple_servo_is_not_animating_by_default);
+}
diff --git a/components/servo/tests/webview.rs b/components/servo/tests/webview.rs
new file mode 100644
index 00000000000..41900015b94
--- /dev/null
+++ b/components/servo/tests/webview.rs
@@ -0,0 +1,139 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! WebView API unit tests.
+//!
+//! Since all Servo tests must run serially on the same thread, it is important
+//! that tests never panic. In order to ensure this, use `anyhow::ensure!` instead
+//! of `assert!` for test assertions. `ensure!` will produce a `Result::Err` in
+//! place of panicking.
+
+mod common;
+
+use std::cell::{Cell, RefCell};
+use std::rc::Rc;
+
+use anyhow::ensure;
+use common::{ServoTest, run_api_tests};
+use servo::{
+    JSValue, JavaScriptEvaluationError, LoadStatus, WebView, WebViewBuilder, WebViewDelegate,
+};
+
+#[derive(Default)]
+struct WebViewDelegateImpl {
+    url_changed: Cell<bool>,
+}
+
+impl WebViewDelegate for WebViewDelegateImpl {
+    fn notify_url_changed(&self, _webview: servo::WebView, _url: url::Url) {
+        self.url_changed.set(true);
+    }
+}
+
+fn test_create_webview(servo_test: &ServoTest) -> Result<(), anyhow::Error> {
+    let delegate = Rc::new(WebViewDelegateImpl::default());
+    let webview = WebViewBuilder::new(servo_test.servo())
+        .delegate(delegate.clone())
+        .build();
+
+    servo_test.spin(move || Ok(!delegate.url_changed.get()))?;
+
+    let url = webview.url();
+    ensure!(url.is_some());
+    ensure!(url.unwrap().to_string() == "about:blank");
+
+    Ok(())
+}
+
+fn evaluate_javascript(
+    servo_test: &ServoTest,
+    webview: WebView,
+    script: impl ToString,
+) -> Result<JSValue, JavaScriptEvaluationError> {
+    let load_webview = webview.clone();
+    let _ = servo_test.spin(move || Ok(load_webview.load_status() != LoadStatus::Complete));
+
+    let saved_result = Rc::new(RefCell::new(None));
+    let callback_result = saved_result.clone();
+    webview.evaluate_javascript(script, move |result| {
+        *callback_result.borrow_mut() = Some(result)
+    });
+
+    let spin_result = saved_result.clone();
+    let _ = servo_test.spin(move || Ok(spin_result.borrow().is_none()));
+
+    (*saved_result.borrow())
+        .clone()
+        .expect("Should have waited until value available")
+}
+
+fn test_evaluate_javascript_basic(servo_test: &ServoTest) -> Result<(), anyhow::Error> {
+    let delegate = Rc::new(WebViewDelegateImpl::default());
+    let webview = WebViewBuilder::new(servo_test.servo())
+        .delegate(delegate.clone())
+        .build();
+
+    let result = evaluate_javascript(servo_test, webview.clone(), "undefined");
+    ensure!(result == Ok(JSValue::Undefined));
+
+    let result = evaluate_javascript(servo_test, webview.clone(), "null");
+    ensure!(result == Ok(JSValue::Null));
+
+    let result = evaluate_javascript(servo_test, webview.clone(), "42");
+    ensure!(result == Ok(JSValue::Number(42.0)));
+
+    let result = evaluate_javascript(servo_test, webview.clone(), "3 + 4");
+    ensure!(result == Ok(JSValue::Number(7.0)));
+
+    let result = evaluate_javascript(servo_test, webview.clone(), "'abc' + 'def'");
+    ensure!(result == Ok(JSValue::String("abcdef".into())));
+
+    let result = evaluate_javascript(servo_test, webview.clone(), "let foo = {blah: 123}; foo");
+    ensure!(matches!(result, Ok(JSValue::Object(_))));
+    if let Ok(JSValue::Object(values)) = result {
+        ensure!(values.len() == 1);
+        ensure!(values.get("blah") == Some(&JSValue::Number(123.0)));
+    }
+
+    let result = evaluate_javascript(servo_test, webview.clone(), "[1, 2, 3, 4]");
+    let expected = JSValue::Array(vec![
+        JSValue::Number(1.0),
+        JSValue::Number(2.0),
+        JSValue::Number(3.0),
+        JSValue::Number(4.0),
+    ]);
+    ensure!(result == Ok(expected));
+
+    let result = evaluate_javascript(servo_test, webview.clone(), "window");
+    ensure!(matches!(result, Ok(JSValue::Window(..))));
+
+    let result = evaluate_javascript(servo_test, webview.clone(), "document.body");
+    ensure!(matches!(result, Ok(JSValue::Element(..))));
+
+    let result = evaluate_javascript(
+        servo_test,
+        webview.clone(),
+        "document.body.innerHTML += '<iframe>'; frames[0]",
+    );
+    ensure!(matches!(result, Ok(JSValue::Frame(..))));
+
+    Ok(())
+}
+
+fn test_create_webview_and_immediately_drop_webview_before_shutdown(
+    servo_test: &ServoTest,
+) -> Result<(), anyhow::Error> {
+    WebViewBuilder::new(servo_test.servo()).build();
+    Ok(())
+}
+
+fn main() {
+    run_api_tests!(
+        test_create_webview,
+        test_evaluate_javascript_basic,
+        // This test needs to be last, as it tests creating and dropping
+        // a WebView right before shutdown.
+        test_create_webview_and_immediately_drop_webview_before_shutdown
+    );
+}
diff --git a/components/servo/webview.rs b/components/servo/webview.rs
index 78416f565ab..10786ad8b69 100644
--- a/components/servo/webview.rs
+++ b/components/servo/webview.rs
@@ -9,19 +9,23 @@ use std::time::Duration;
 
 use base::id::WebViewId;
 use compositing::IOCompositor;
-use compositing::windowing::WebRenderDebugOption;
-use constellation_traits::{ConstellationMsg, TraversalDirection};
+use compositing_traits::WebViewTrait;
+use constellation_traits::{EmbedderToConstellationMessage, TraversalDirection};
 use dpi::PhysicalSize;
 use embedder_traits::{
-    Cursor, InputEvent, LoadStatus, MediaSessionActionType, Theme, TouchEventType,
+    Cursor, InputEvent, JSValue, JavaScriptEvaluationError, LoadStatus, MediaSessionActionType,
+    ScreenGeometry, Theme, TouchEventType, ViewportDetails,
 };
+use euclid::{Point2D, Scale, Size2D};
+use servo_geometry::DeviceIndependentPixel;
 use url::Url;
 use webrender_api::ScrollLocation;
-use webrender_api::units::{DeviceIntPoint, DeviceRect};
+use webrender_api::units::{DeviceIntPoint, DevicePixel, DeviceRect};
 
-use crate::ConstellationProxy;
 use crate::clipboard_delegate::{ClipboardDelegate, DefaultClipboardDelegate};
+use crate::javascript_evaluator::JavaScriptEvaluator;
 use crate::webview_delegate::{DefaultWebViewDelegate, WebViewDelegate};
+use crate::{ConstellationProxy, Servo, WebRenderDebugOption};
 
 /// A handle to a Servo webview. If you clone this handle, it does not create a new webview,
 /// but instead creates a new handle to the webview. Once the last handle is dropped, Servo
@@ -72,46 +76,92 @@ pub(crate) struct WebViewInner {
     pub(crate) compositor: Rc<RefCell<IOCompositor>>,
     pub(crate) delegate: Rc<dyn WebViewDelegate>,
     pub(crate) clipboard_delegate: Rc<dyn ClipboardDelegate>,
+    javascript_evaluator: Rc<RefCell<JavaScriptEvaluator>>,
 
     rect: DeviceRect,
+    hidpi_scale_factor: Scale<f32, DeviceIndependentPixel, DevicePixel>,
     load_status: LoadStatus,
     url: Option<Url>,
     status_text: Option<String>,
     page_title: Option<String>,
     favicon_url: Option<Url>,
     focused: bool,
+    animating: bool,
     cursor: Cursor,
 }
 
 impl Drop for WebViewInner {
     fn drop(&mut self) {
         self.constellation_proxy
-            .send(ConstellationMsg::CloseWebView(self.id));
+            .send(EmbedderToConstellationMessage::CloseWebView(self.id));
     }
 }
 
 impl WebView {
-    pub(crate) fn new(
-        constellation_proxy: &ConstellationProxy,
-        compositor: Rc<RefCell<IOCompositor>>,
-    ) -> Self {
+    pub(crate) fn new(builder: WebViewBuilder) -> Self {
         let id = WebViewId::new();
-        compositor.borrow_mut().add_webview(id);
-        Self(Rc::new(RefCell::new(WebViewInner {
+        let servo = builder.servo;
+        let size = builder.size.map_or_else(
+            || {
+                builder
+                    .servo
+                    .compositor
+                    .borrow()
+                    .rendering_context_size()
+                    .to_f32()
+            },
+            |size| Size2D::new(size.width as f32, size.height as f32),
+        );
+
+        let webview = Self(Rc::new(RefCell::new(WebViewInner {
             id,
-            constellation_proxy: constellation_proxy.clone(),
-            compositor,
-            delegate: Rc::new(DefaultWebViewDelegate),
+            constellation_proxy: servo.constellation_proxy.clone(),
+            compositor: servo.compositor.clone(),
+            delegate: builder.delegate,
             clipboard_delegate: Rc::new(DefaultClipboardDelegate),
-            rect: DeviceRect::zero(),
-            load_status: LoadStatus::Complete,
+            javascript_evaluator: servo.javascript_evaluator.clone(),
+            rect: DeviceRect::from_origin_and_size(Point2D::origin(), size),
+            hidpi_scale_factor: builder.hidpi_scale_factor,
+            load_status: LoadStatus::Started,
             url: None,
             status_text: None,
             page_title: None,
             favicon_url: None,
             focused: false,
+            animating: false,
             cursor: Cursor::Pointer,
-        })))
+        })));
+
+        let viewport_details = webview.viewport_details();
+        servo.compositor.borrow_mut().add_webview(
+            Box::new(ServoRendererWebView {
+                weak_handle: webview.weak_handle(),
+                id,
+            }),
+            viewport_details,
+        );
+
+        servo
+            .webviews
+            .borrow_mut()
+            .insert(webview.id(), webview.weak_handle());
+
+        if !builder.auxiliary {
+            let url = builder.url.unwrap_or(
+                Url::parse("about:blank").expect("Should always be able to parse 'about:blank'."),
+            );
+
+            builder
+                .servo
+                .constellation_proxy
+                .send(EmbedderToConstellationMessage::NewWebView(
+                    url.into(),
+                    webview.id(),
+                    viewport_details,
+                ));
+        }
+
+        webview
     }
 
     fn inner(&self) -> Ref<'_, WebViewInner> {
@@ -122,6 +172,17 @@ impl WebView {
         self.0.borrow_mut()
     }
 
+    pub(crate) fn viewport_details(&self) -> ViewportDetails {
+        // The division by 1 represents the page's default zoom of 100%,
+        // and gives us the appropriate CSSPixel type for the viewport.
+        let inner = self.inner();
+        let scaled_viewport_size = inner.rect.size() / inner.hidpi_scale_factor;
+        ViewportDetails {
+            size: scaled_viewport_size / Scale::new(1.0),
+            hidpi_scale_factor: Scale::new(inner.hidpi_scale_factor.0),
+        }
+    }
+
     pub(crate) fn from_weak_handle(inner: &Weak<RefCell<WebViewInner>>) -> Option<Self> {
         inner.upgrade().map(WebView)
     }
@@ -247,13 +308,29 @@ impl WebView {
     pub fn focus(&self) {
         self.inner()
             .constellation_proxy
-            .send(ConstellationMsg::FocusWebView(self.id()));
+            .send(EmbedderToConstellationMessage::FocusWebView(self.id()));
     }
 
     pub fn blur(&self) {
         self.inner()
             .constellation_proxy
-            .send(ConstellationMsg::BlurWebView);
+            .send(EmbedderToConstellationMessage::BlurWebView);
+    }
+
+    /// Whether or not this [`WebView`] has animating content, such as a CSS animation or
+    /// transition or is running `requestAnimationFrame` callbacks. This indicates that the
+    /// embedding application should be spinning the Servo event loop on regular intervals
+    /// in order to trigger animation updates.
+    pub fn animating(self) -> bool {
+        self.inner().animating
+    }
+
+    pub(crate) fn set_animating(self, new_value: bool) {
+        if self.inner().animating == new_value {
+            return;
+        }
+        self.inner_mut().animating = new_value;
+        self.delegate().notify_animating_changed(self, new_value);
     }
 
     pub fn rect(&self) -> DeviceRect {
@@ -272,6 +349,25 @@ impl WebView {
             .move_resize_webview(self.id(), rect);
     }
 
+    pub fn hidpi_scale_factor(&self) -> Scale<f32, DeviceIndependentPixel, DevicePixel> {
+        self.inner().hidpi_scale_factor
+    }
+
+    pub fn set_hidpi_scale_factor(
+        &self,
+        new_scale_factor: Scale<f32, DeviceIndependentPixel, DevicePixel>,
+    ) {
+        if self.inner().hidpi_scale_factor == new_scale_factor {
+            return;
+        }
+
+        self.inner_mut().hidpi_scale_factor = new_scale_factor;
+        self.inner()
+            .compositor
+            .borrow_mut()
+            .set_hidpi_scale_factor(self.id(), new_scale_factor);
+    }
+
     pub fn show(&self, hide_others: bool) {
         self.inner()
             .compositor
@@ -299,25 +395,28 @@ impl WebView {
     pub fn notify_theme_change(&self, theme: Theme) {
         self.inner()
             .constellation_proxy
-            .send(ConstellationMsg::ThemeChange(theme))
+            .send(EmbedderToConstellationMessage::ThemeChange(theme))
     }
 
     pub fn load(&self, url: Url) {
         self.inner()
             .constellation_proxy
-            .send(ConstellationMsg::LoadUrl(self.id(), url.into()))
+            .send(EmbedderToConstellationMessage::LoadUrl(
+                self.id(),
+                url.into(),
+            ))
     }
 
     pub fn reload(&self) {
         self.inner()
             .constellation_proxy
-            .send(ConstellationMsg::Reload(self.id()))
+            .send(EmbedderToConstellationMessage::Reload(self.id()))
     }
 
     pub fn go_back(&self, amount: usize) {
         self.inner()
             .constellation_proxy
-            .send(ConstellationMsg::TraverseHistory(
+            .send(EmbedderToConstellationMessage::TraverseHistory(
                 self.id(),
                 TraversalDirection::Back(amount),
             ))
@@ -326,7 +425,7 @@ impl WebView {
     pub fn go_forward(&self, amount: usize) {
         self.inner()
             .constellation_proxy
-            .send(ConstellationMsg::TraverseHistory(
+            .send(EmbedderToConstellationMessage::TraverseHistory(
                 self.id(),
                 TraversalDirection::Forward(amount),
             ))
@@ -358,7 +457,7 @@ impl WebView {
 
         self.inner()
             .constellation_proxy
-            .send(ConstellationMsg::ForwardInputEvent(
+            .send(EmbedderToConstellationMessage::ForwardInputEvent(
                 self.id(),
                 event,
                 None, /* hit_test */
@@ -368,7 +467,7 @@ impl WebView {
     pub fn notify_media_session_action_event(&self, event: MediaSessionActionType) {
         self.inner()
             .constellation_proxy
-            .send(ConstellationMsg::MediaSessionAction(event));
+            .send(EmbedderToConstellationMessage::MediaSessionAction(event));
     }
 
     pub fn notify_vsync(&self) {
@@ -382,25 +481,18 @@ impl WebView {
             .resize_rendering_context(new_size);
     }
 
-    pub fn notify_embedder_window_moved(&self) {
-        self.inner()
-            .compositor
-            .borrow_mut()
-            .on_embedder_window_moved();
-    }
-
     pub fn set_zoom(&self, new_zoom: f32) {
         self.inner()
             .compositor
             .borrow_mut()
-            .on_zoom_window_event(new_zoom);
+            .on_zoom_window_event(self.id(), new_zoom);
     }
 
     pub fn reset_zoom(&self) {
         self.inner()
             .compositor
             .borrow_mut()
-            .on_zoom_reset_window_event();
+            .on_zoom_reset_window_event(self.id());
     }
 
     pub fn set_pinch_zoom(&self, new_pinch_zoom: f32) {
@@ -413,13 +505,16 @@ impl WebView {
     pub fn exit_fullscreen(&self) {
         self.inner()
             .constellation_proxy
-            .send(ConstellationMsg::ExitFullScreen(self.id()));
+            .send(EmbedderToConstellationMessage::ExitFullScreen(self.id()));
     }
 
     pub fn set_throttled(&self, throttled: bool) {
         self.inner()
             .constellation_proxy
-            .send(ConstellationMsg::SetWebViewThrottled(self.id(), throttled));
+            .send(EmbedderToConstellationMessage::SetWebViewThrottled(
+                self.id(),
+                throttled,
+            ));
     }
 
     pub fn toggle_webrender_debugging(&self, debugging: WebRenderDebugOption) {
@@ -436,13 +531,19 @@ impl WebView {
     pub fn toggle_sampling_profiler(&self, rate: Duration, max_duration: Duration) {
         self.inner()
             .constellation_proxy
-            .send(ConstellationMsg::ToggleProfiler(rate, max_duration));
+            .send(EmbedderToConstellationMessage::ToggleProfiler(
+                rate,
+                max_duration,
+            ));
     }
 
     pub fn send_error(&self, message: String) {
         self.inner()
             .constellation_proxy
-            .send(ConstellationMsg::SendError(Some(self.id()), message));
+            .send(EmbedderToConstellationMessage::SendError(
+                Some(self.id()),
+                message,
+            ));
     }
 
     /// Paint the contents of this [`WebView`] into its `RenderingContext`. This will
@@ -451,4 +552,97 @@ impl WebView {
     pub fn paint(&self) -> bool {
         self.inner().compositor.borrow_mut().render()
     }
+
+    /// Evaluate the specified string of JavaScript code. Once execution is complete or an error
+    /// occurs, Servo will call `callback`.
+    pub fn evaluate_javascript<T: ToString>(
+        &self,
+        script: T,
+        callback: impl FnOnce(Result<JSValue, JavaScriptEvaluationError>) + 'static,
+    ) {
+        self.inner().javascript_evaluator.borrow_mut().evaluate(
+            self.id(),
+            script.to_string(),
+            Box::new(callback),
+        );
+    }
+}
+
+/// A structure used to expose a view of the [`WebView`] to the Servo
+/// renderer, without having the Servo renderer depend on the embedding layer.
+struct ServoRendererWebView {
+    id: WebViewId,
+    weak_handle: Weak<RefCell<WebViewInner>>,
+}
+
+impl WebViewTrait for ServoRendererWebView {
+    fn id(&self) -> WebViewId {
+        self.id
+    }
+
+    fn screen_geometry(&self) -> Option<ScreenGeometry> {
+        let webview = WebView::from_weak_handle(&self.weak_handle)?;
+        webview.delegate().screen_geometry(webview)
+    }
+
+    fn set_animating(&self, new_value: bool) {
+        if let Some(webview) = WebView::from_weak_handle(&self.weak_handle) {
+            webview.set_animating(new_value);
+        }
+    }
+}
+
+pub struct WebViewBuilder<'servo> {
+    servo: &'servo Servo,
+    delegate: Rc<dyn WebViewDelegate>,
+    auxiliary: bool,
+    url: Option<Url>,
+    size: Option<PhysicalSize<u32>>,
+    hidpi_scale_factor: Scale<f32, DeviceIndependentPixel, DevicePixel>,
+}
+
+impl<'servo> WebViewBuilder<'servo> {
+    pub fn new(servo: &'servo Servo) -> Self {
+        Self {
+            servo,
+            auxiliary: false,
+            url: None,
+            size: None,
+            hidpi_scale_factor: Scale::new(1.0),
+            delegate: Rc::new(DefaultWebViewDelegate),
+        }
+    }
+
+    pub fn new_auxiliary(servo: &'servo Servo) -> Self {
+        let mut builder = Self::new(servo);
+        builder.auxiliary = true;
+        builder
+    }
+
+    pub fn delegate(mut self, delegate: Rc<dyn WebViewDelegate>) -> Self {
+        self.delegate = delegate;
+        self
+    }
+
+    pub fn url(mut self, url: Url) -> Self {
+        self.url = Some(url);
+        self
+    }
+
+    pub fn size(mut self, size: PhysicalSize<u32>) -> Self {
+        self.size = Some(size);
+        self
+    }
+
+    pub fn hidpi_scale_factor(
+        mut self,
+        hidpi_scale_factor: Scale<f32, DeviceIndependentPixel, DevicePixel>,
+    ) -> Self {
+        self.hidpi_scale_factor = hidpi_scale_factor;
+        self
+    }
+
+    pub fn build(self) -> WebView {
+        WebView::new(self)
+    }
 }
diff --git a/components/servo/webview_delegate.rs b/components/servo/webview_delegate.rs
index 9ea75e32af6..ac3dc7a5152 100644
--- a/components/servo/webview_delegate.rs
+++ b/components/servo/webview_delegate.rs
@@ -5,12 +5,12 @@
 use std::path::PathBuf;
 
 use base::id::PipelineId;
-use constellation_traits::ConstellationMsg;
+use constellation_traits::EmbedderToConstellationMessage;
 use embedder_traits::{
     AllowOrDeny, AuthenticationResponse, ContextMenuResult, Cursor, FilterPattern,
     GamepadHapticEffectType, InputMethodType, LoadStatus, MediaSessionEvent, Notification,
-    PermissionFeature, SimpleDialog, WebResourceRequest, WebResourceResponse,
-    WebResourceResponseMsg,
+    PermissionFeature, ScreenGeometry, SelectElementOptionOrOptgroup, SimpleDialog,
+    WebResourceRequest, WebResourceResponse, WebResourceResponseMsg,
 };
 use ipc_channel::ipc::IpcSender;
 use keyboard_types::KeyboardEvent;
@@ -33,7 +33,7 @@ pub struct NavigationRequest {
 impl NavigationRequest {
     pub fn allow(mut self) {
         self.constellation_proxy
-            .send(ConstellationMsg::AllowNavigationResponse(
+            .send(EmbedderToConstellationMessage::AllowNavigationResponse(
                 self.pipeline_id,
                 true,
             ));
@@ -42,7 +42,7 @@ impl NavigationRequest {
 
     pub fn deny(mut self) {
         self.constellation_proxy
-            .send(ConstellationMsg::AllowNavigationResponse(
+            .send(EmbedderToConstellationMessage::AllowNavigationResponse(
                 self.pipeline_id,
                 false,
             ));
@@ -54,7 +54,7 @@ impl Drop for NavigationRequest {
     fn drop(&mut self) {
         if !self.response_sent {
             self.constellation_proxy
-                .send(ConstellationMsg::AllowNavigationResponse(
+                .send(EmbedderToConstellationMessage::AllowNavigationResponse(
                     self.pipeline_id,
                     true,
                 ));
@@ -296,7 +296,73 @@ impl Drop for InterceptedWebResourceLoad {
     }
 }
 
+/// The controls of an interactive form element.
+pub enum FormControl {
+    /// The picker of a `<select>` element.
+    SelectElement(SelectElement),
+}
+
+/// Represents a dialog triggered by clicking a `<select>` element.
+pub struct SelectElement {
+    pub(crate) options: Vec<SelectElementOptionOrOptgroup>,
+    pub(crate) selected_option: Option<usize>,
+    pub(crate) position: DeviceIntRect,
+    pub(crate) responder: IpcResponder<Option<usize>>,
+}
+
+impl SelectElement {
+    pub(crate) fn new(
+        options: Vec<SelectElementOptionOrOptgroup>,
+        selected_option: Option<usize>,
+        position: DeviceIntRect,
+        ipc_sender: IpcSender<Option<usize>>,
+    ) -> Self {
+        Self {
+            options,
+            selected_option,
+            position,
+            responder: IpcResponder::new(ipc_sender, None),
+        }
+    }
+
+    /// Return the area occupied by the `<select>` element that triggered the prompt.
+    ///
+    /// The embedder should use this value to position the prompt that is shown to the user.
+    pub fn position(&self) -> DeviceIntRect {
+        self.position
+    }
+
+    /// Consecutive `<option>` elements outside of an `<optgroup>` will be combined
+    /// into a single anonymous group, whose [`label`](SelectElementGroup::label) is `None`.
+    pub fn options(&self) -> &[SelectElementOptionOrOptgroup] {
+        &self.options
+    }
+
+    /// Mark a single option as selected.
+    ///
+    /// If there is already a selected option and the `<select>` element does not
+    /// support selecting multiple options, then the previous option will be unselected.
+    pub fn select(&mut self, id: Option<usize>) {
+        self.selected_option = id;
+    }
+
+    pub fn selected_option(&self) -> Option<usize> {
+        self.selected_option
+    }
+
+    /// Resolve the prompt with the options that have been selected by calling [select] previously.
+    pub fn submit(mut self) {
+        let _ = self.responder.send(self.selected_option);
+    }
+}
+
 pub trait WebViewDelegate {
+    /// Get the [`ScreenGeometry`] for this [`WebView`]. If this is unimplemented or returns `None`
+    /// the screen will have the size of the [`WebView`]'s `RenderingContext` and `WebView` will be
+    /// considered to be positioned at the screen's origin.
+    fn screen_geometry(&self, _webview: WebView) -> Option<ScreenGeometry> {
+        None
+    }
     /// The URL of the currently loaded page in this [`WebView`] has changed. The new
     /// URL can accessed via [`WebView::url`].
     fn notify_url_changed(&self, _webview: WebView, _url: Url) {}
@@ -309,6 +375,11 @@ pub trait WebViewDelegate {
     /// This [`WebView`] has either become focused or lost focus. Whether or not the
     /// [`WebView`] is focused can be accessed via [`WebView::focused`].
     fn notify_focus_changed(&self, _webview: WebView, _focused: bool) {}
+    /// This [`WebView`] has either started to animate or stopped animating. When a
+    /// [`WebView`] is animating, it is up to the embedding application ensure that
+    /// `Servo::spin_event_loop` is called at regular intervals in order to update the
+    /// painted contents of the [`WebView`].
+    fn notify_animating_changed(&self, _webview: WebView, _animating: bool) {}
     /// The `LoadStatus` of the currently loading or loaded page in this [`WebView`] has changed. The new
     /// status can accessed via [`WebView::load_status`].
     fn notify_load_status_changed(&self, _webview: WebView, _status: LoadStatus) {}
@@ -443,6 +514,10 @@ pub trait WebViewDelegate {
     /// Request to hide the IME when the editable element is blurred.
     fn hide_ime(&self, _webview: WebView) {}
 
+    /// Request that the embedder show UI elements for form controls that are not integrated
+    /// into page content, such as dropdowns for `<select>` elements.
+    fn show_form_control(&self, _webview: WebView, _form_control: FormControl) {}
+
     /// Request to play a haptic effect on a connected gamepad.
     fn play_gamepad_haptic_effect(
         &self,
diff --git a/components/servo_tracing/Cargo.toml b/components/servo_tracing/Cargo.toml
new file mode 100644
index 00000000000..1660aa7f691
--- /dev/null
+++ b/components/servo_tracing/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "servo-tracing"
+edition.workspace = true
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+publish.workspace = true
+rust-version.workspace = true
+
+[dependencies]
+quote = { workspace = true }
+proc-macro2 = { workspace = true }
+syn = { version = "2", features = ["full"] }
+
+[lib]
+path = "lib.rs"
+proc-macro = true
+doctest = false
+
+[dev-dependencies]
+prettyplease = "0.2.32"
diff --git a/components/servo_tracing/lib.rs b/components/servo_tracing/lib.rs
new file mode 100644
index 00000000000..04e87ee6cc0
--- /dev/null
+++ b/components/servo_tracing/lib.rs
@@ -0,0 +1,394 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+extern crate proc_macro;
+
+use proc_macro::TokenStream;
+use proc_macro2::Punct;
+use quote::{ToTokens, TokenStreamExt, quote};
+use syn::parse::{Parse, Parser};
+use syn::punctuated::Punctuated;
+use syn::token::Comma;
+use syn::{Expr, ItemFn, Meta, MetaList, Token, parse_quote, parse2};
+
+struct Fields(MetaList);
+impl From<MetaList> for Fields {
+    fn from(value: MetaList) -> Self {
+        Fields(value)
+    }
+}
+
+impl Fields {
+    fn create_with_servo_profiling() -> Self {
+        Fields(parse_quote! { fields(servo_profiling = true) })
+    }
+
+    fn inject_servo_profiling(&mut self) -> syn::Result<()> {
+        let metalist = std::mem::replace(&mut self.0, parse_quote! {field()});
+
+        let arguments: Punctuated<Meta, Comma> =
+            Punctuated::parse_terminated.parse2(metalist.tokens)?;
+
+        let servo_profile_given = arguments
+            .iter()
+            .any(|arg| arg.path().is_ident("servo_profiling"));
+
+        let metalist = if servo_profile_given {
+            parse_quote! {
+                fields(#arguments)
+            }
+        } else {
+            parse_quote! {
+                fields(servo_profiling=true, #arguments)
+            }
+        };
+
+        let _ = std::mem::replace(&mut self.0, metalist);
+
+        Ok(())
+    }
+}
+
+impl ToTokens for Fields {
+    fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
+        let items = &self.0;
+        tokens.append_all(quote! { #items });
+    }
+}
+enum Directive {
+    Passthrough(Meta),
+    Level(Expr),
+    Fields(Fields),
+}
+
+impl From<Fields> for Directive {
+    fn from(value: Fields) -> Self {
+        Directive::Fields(value)
+    }
+}
+
+impl Directive {
+    fn is_level(&self) -> bool {
+        matches!(self, Directive::Level(..))
+    }
+
+    fn fields_mut(&mut self) -> Option<&mut Fields> {
+        match self {
+            Directive::Fields(fields) => Some(fields),
+            _ => None,
+        }
+    }
+}
+
+impl ToTokens for Directive {
+    fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
+        match self {
+            Directive::Passthrough(meta) => tokens.append_all(quote! { #meta }),
+            Directive::Level(level) => tokens.append_all(quote! { level = #level }),
+            Directive::Fields(fields) => tokens.append_all(quote! { #fields }),
+        };
+    }
+}
+
+impl ToTokens for InstrumentConfiguration {
+    fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
+        tokens.append_terminated(&self.0, Punct::new(',', proc_macro2::Spacing::Joint));
+    }
+}
+
+struct InstrumentConfiguration(Vec<Directive>);
+
+impl InstrumentConfiguration {
+    fn inject_servo_profiling(&mut self) -> syn::Result<()> {
+        let fields = self.0.iter_mut().find_map(Directive::fields_mut);
+        match fields {
+            None => {
+                self.0
+                    .push(Directive::from(Fields::create_with_servo_profiling()));
+                Ok(())
+            },
+            Some(fields) => fields.inject_servo_profiling(),
+        }
+    }
+
+    fn inject_level(&mut self) {
+        if self.0.iter().any(|a| a.is_level()) {
+            return;
+        }
+        self.0.push(Directive::Level(parse_quote! { "trace" }));
+    }
+}
+
+impl Parse for InstrumentConfiguration {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        let args = Punctuated::<Meta, Token![,]>::parse_terminated(input)?;
+        let mut components = vec![];
+
+        for arg in args {
+            match arg {
+                Meta::List(meta_list) if meta_list.path.is_ident("fields") => {
+                    components.push(Directive::Fields(meta_list.into()));
+                },
+                Meta::NameValue(meta_name_value) if meta_name_value.path.is_ident("level") => {
+                    components.push(Directive::Level(meta_name_value.value));
+                },
+                _ => {
+                    components.push(Directive::Passthrough(arg));
+                },
+            }
+        }
+        Ok(InstrumentConfiguration(components))
+    }
+}
+
+fn instrument_internal(
+    attr: proc_macro2::TokenStream,
+    item: proc_macro2::TokenStream,
+) -> syn::Result<proc_macro2::TokenStream> {
+    // Prepare passthrough arguments for tracing::instrument
+    let mut configuration: InstrumentConfiguration = parse2(attr)?;
+    let input_fn: ItemFn = parse2(item)?;
+
+    configuration.inject_servo_profiling()?;
+    configuration.inject_level();
+
+    let output = quote! {
+        #[cfg_attr(
+            feature = "tracing",
+            tracing::instrument(
+                #configuration
+            )
+        )]
+        #input_fn
+    };
+
+    Ok(output)
+}
+
+#[proc_macro_attribute]
+/// Instruments a function with some sane defaults by automatically:
+///  - setting the attribute behind the "tracing" flag
+///  - adding `servo_profiling = true` in the `tracing::instrument(fields(...))` argument.
+///  - setting `level = "trace"` if it is not given.
+///
+/// This macro assumes the consuming crate has a `tracing` feature flag.
+///
+/// We need to be able to set the following
+/// ```
+/// #[cfg_attr(
+///         feature = "tracing",
+///         tracing::instrument(
+///             name = "MyCustomName",
+///             skip_all,
+///             fields(servo_profiling = true),
+///             level = "trace",
+///         )
+///     )]
+/// fn my_fn() { /* .... */ }
+/// ```
+/// from a simpler macro, such as:
+///
+/// ```
+/// #[servo_tracing::instrument(name = "MyCustomName", skip_all)]
+/// fn my_fn() { /* .... */ }
+/// ```
+pub fn instrument(attr: TokenStream, item: TokenStream) -> TokenStream {
+    match instrument_internal(attr.into(), item.into()) {
+        Ok(stream) => stream.into(),
+        Err(err) => err.to_compile_error().into(),
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use proc_macro2::TokenStream;
+    use quote::{ToTokens, quote};
+    use syn::{Attribute, ItemFn};
+
+    use crate::instrument_internal;
+
+    fn extract_instrument_attribute(item_fn: &mut ItemFn) -> TokenStream {
+        let attr: &Attribute = item_fn
+            .attrs
+            .iter()
+            .find(|attr| {
+                // because this is a very nested structure, it is easier to check
+                // by constructing the full path, and then doing a string comparison.
+                let p = attr.path().to_token_stream().to_string();
+                p == "servo_tracing :: instrument"
+            })
+            .expect("Attribute `servo_tracing::instrument` not found");
+
+        // we create a tokenstream of the actual internal contents of the attribute
+        let attr_args = attr
+            .parse_args::<TokenStream>()
+            .expect("Failed to parse attribute args");
+
+        // we remove the tracing attribute, this is to avoid passing it as an actual attribute to itself.
+        item_fn.attrs.retain(|attr| {
+            attr.path().to_token_stream().to_string() != "servo_tracing :: instrument"
+        });
+
+        attr_args
+    }
+
+    /// To make test case generation easy, we parse a test_case as a function item
+    /// with its own attributes, including [`servo_tracing::instrument`].
+    ///
+    /// We extract the [`servo_tracing::instrument`] attribute, and pass it as the first argument to
+    /// [`servo_tracing::instrument_internal`],
+    fn evaluate(function: TokenStream, test_case: TokenStream, expected: TokenStream) {
+        let test_case = quote! {
+            #test_case
+            #function
+        };
+        let expected = quote! {
+            #expected
+            #function
+        };
+        let function_str = function.to_string();
+        let function_str = syn::parse_file(&function_str).expect("function to have valid syntax");
+        let function_str = prettyplease::unparse(&function_str);
+
+        let mut item_fn: ItemFn =
+            syn::parse2(test_case).expect("Failed to parse input as function");
+
+        let attr_args = extract_instrument_attribute(&mut item_fn);
+        let item_fn = item_fn.to_token_stream();
+
+        let generated = instrument_internal(attr_args, item_fn).expect("Generation to not fail.");
+
+        let generated = syn::parse_file(generated.to_string().as_str())
+            .expect("to have generated a valid function");
+        let generated = prettyplease::unparse(&generated);
+        let expected = syn::parse_file(expected.to_string().as_str())
+            .expect("to have been given a valid expected function");
+        let expected = prettyplease::unparse(&expected);
+
+        eprintln!(
+            "Generated:---------:\n{}--------\nExpected:----------\n{}",
+            &generated, &expected
+        );
+        assert_eq!(generated, expected);
+        assert!(
+            generated.contains(&function_str),
+            "Expected generated code: {generated} to contain the function code: {function_str}"
+        );
+    }
+
+    fn function1() -> TokenStream {
+        quote! {
+            pub fn start(
+                state: (),
+                layout_factory: (),
+                random_pipeline_closure_probability: (),
+                random_pipeline_closure_seed: (),
+                hard_fail: (),
+                canvas_create_sender: (),
+                canvas_ipc_sender: (),
+            ) {
+            }
+        }
+    }
+
+    fn function2() -> TokenStream {
+        quote! {
+            fn layout(
+                mut self,
+                layout_context: &LayoutContext,
+                positioning_context: &mut PositioningContext,
+                containing_block_for_children: &ContainingBlock,
+                containing_block_for_table: &ContainingBlock,
+                depends_on_block_constraints: bool,
+            ) {
+            }
+        }
+    }
+
+    #[test]
+    fn passing_servo_profiling_and_level_and_aux() {
+        let function = function1();
+        let expected = quote! {
+            #[cfg_attr(
+                feature = "tracing",
+                tracing::instrument(skip(state, layout_factory), fields(servo_profiling = true), level = "trace",)
+            )]
+        };
+
+        let test_case = quote! {
+            #[servo_tracing::instrument(skip(state, layout_factory),fields(servo_profiling = true),level = "trace",)]
+        };
+
+        evaluate(function, test_case, expected);
+    }
+
+    #[test]
+    fn passing_servo_profiling_and_level() {
+        let function = function1();
+        let expected = quote! {
+            #[cfg_attr(
+                feature = "tracing",
+                tracing::instrument( fields(servo_profiling = true), level = "trace",)
+            )]
+        };
+
+        let test_case = quote! {
+            #[servo_tracing::instrument(fields(servo_profiling = true),level = "trace",)]
+        };
+        evaluate(function, test_case, expected);
+    }
+
+    #[test]
+    fn passing_servo_profiling() {
+        let function = function1();
+        let expected = quote! {
+            #[cfg_attr(
+                feature = "tracing",
+                tracing::instrument( fields(servo_profiling = true), level = "trace",)
+            )]
+        };
+
+        let test_case = quote! {
+            #[servo_tracing::instrument(fields(servo_profiling = true))]
+        };
+        evaluate(function, test_case, expected);
+    }
+
+    #[test]
+    fn inject_level_and_servo_profiling() {
+        let function = function1();
+        let expected = quote! {
+            #[cfg_attr(
+                feature = "tracing",
+                tracing::instrument(fields(servo_profiling = true), level = "trace",)
+            )]
+        };
+
+        let test_case = quote! {
+            #[servo_tracing::instrument()]
+        };
+        evaluate(function, test_case, expected);
+    }
+
+    #[test]
+    fn instrument_with_name() {
+        let function = function2();
+        let expected = quote! {
+            #[cfg_attr(
+                feature = "tracing",
+                tracing::instrument(
+                    name = "Table::layout",
+                    skip_all,
+                    fields(servo_profiling = true),
+                    level = "trace",
+                )
+            )]
+        };
+
+        let test_case = quote! {
+            #[servo_tracing::instrument(name="Table::layout", skip_all)]
+        };
+
+        evaluate(function, test_case, expected);
+    }
+}
diff --git a/components/shared/base/Cargo.toml b/components/shared/base/Cargo.toml
index a009e0e7bde..fea06db6ed0 100644
--- a/components/shared/base/Cargo.toml
+++ b/components/shared/base/Cargo.toml
@@ -20,9 +20,9 @@ malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 parking_lot = { workspace = true }
 serde = { workspace = true }
+static_assertions = { workspace = true }
 time = { workspace = true }
 webrender_api = { workspace = true }
-static_assertions = { workspace = true }
 
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
 mach2 = { workspace = true }
diff --git a/components/shared/base/id.rs b/components/shared/base/id.rs
index 6a9729c45c5..cc4ad947494 100644
--- a/components/shared/base/id.rs
+++ b/components/shared/base/id.rs
@@ -8,11 +8,12 @@
 
 use std::cell::Cell;
 use std::fmt;
+use std::marker::PhantomData;
 use std::num::NonZeroU32;
 use std::sync::{Arc, LazyLock};
 
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
-use malloc_size_of::malloc_size_of_is_0;
+use malloc_size_of::MallocSizeOfOps;
 use malloc_size_of_derive::MallocSizeOf;
 use parking_lot::Mutex;
 use serde::{Deserialize, Serialize};
@@ -26,44 +27,88 @@ macro_rules! size_of_test {
     };
 }
 
-macro_rules! namespace_id_method {
-    ($func_name:ident, $func_return_data_type:ident, $self:ident, $index_name:ident) => {
-        fn $func_name(&mut $self) -> $func_return_data_type {
-            $func_return_data_type {
-                namespace_id: $self.id,
-                index: $index_name($self.next_index()),
-            }
-        }
-    };
+/// A type that implements this trait is expected to be used as part of
+/// the [NamespaceIndex] type.
+pub trait Indexable {
+    /// The string prefix to display when debug printing an instance of
+    /// this type.
+    const DISPLAY_PREFIX: &'static str;
+}
+
+#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
+/// A non-zero index, associated with a particular type.
+pub struct Index<T>(pub NonZeroU32, pub PhantomData<T>);
+
+#[derive(Debug)]
+/// An attempt to create a new [Index] value failed because the index value
+/// was zero.
+pub struct ZeroIndex;
+
+impl<T> Index<T> {
+    /// Creates a new instance of [Index] with the given value.
+    /// Returns an error if the value is zero.
+    pub fn new(value: u32) -> Result<Index<T>, ZeroIndex> {
+        Ok(Index(NonZeroU32::new(value).ok_or(ZeroIndex)?, PhantomData))
+    }
+}
+
+impl<T> malloc_size_of::MallocSizeOf for Index<T> {
+    fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
+        0
+    }
+}
+
+#[derive(
+    Clone, Copy, Deserialize, Eq, Hash, MallocSizeOf, Ord, PartialEq, PartialOrd, Serialize,
+)]
+/// A pipeline-namespaced index associated with a particular type.
+pub struct NamespaceIndex<T> {
+    pub namespace_id: PipelineNamespaceId,
+    pub index: Index<T>,
+}
+
+impl<T> fmt::Debug for NamespaceIndex<T> {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        let PipelineNamespaceId(namespace_id) = self.namespace_id;
+        let Index(index, _) = self.index;
+        write!(fmt, "({},{})", namespace_id, index.get())
+    }
+}
+
+impl<T: Indexable> fmt::Display for NamespaceIndex<T> {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        write!(fmt, "{}{:?}", T::DISPLAY_PREFIX, self)
+    }
 }
 
 macro_rules! namespace_id {
     ($id_name:ident, $index_name:ident, $display_prefix:literal) => {
         #[derive(
-            Clone, Copy, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize,
+            Clone,
+            Copy,
+            Debug,
+            Deserialize,
+            Eq,
+            Hash,
+            Ord,
+            PartialEq,
+            PartialOrd,
+            Serialize,
+            MallocSizeOf,
         )]
-        pub struct $index_name(pub NonZeroU32);
-        malloc_size_of_is_0!($index_name);
-
-        #[derive(
-            Clone, Copy, Deserialize, Eq, Hash, MallocSizeOf, Ord, PartialEq, PartialOrd, Serialize,
-        )]
-        pub struct $id_name {
-            pub namespace_id: PipelineNamespaceId,
-            pub index: $index_name,
+        pub struct $index_name;
+        impl Indexable for $index_name {
+            const DISPLAY_PREFIX: &'static str = $display_prefix;
         }
-
-        impl fmt::Debug for $id_name {
-            fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-                let PipelineNamespaceId(namespace_id) = self.namespace_id;
-                let $index_name(index) = self.index;
-                write!(fmt, "({},{})", namespace_id, index.get())
-            }
-        }
-
-        impl fmt::Display for $id_name {
-            fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-                write!(fmt, "{}{:?}", $display_prefix, self)
+        pub type $id_name = NamespaceIndex<$index_name>;
+        impl $id_name {
+            pub fn new() -> $id_name {
+                PIPELINE_NAMESPACE.with(|tls| {
+                    let mut namespace = tls.get().expect("No namespace set for this thread!");
+                    let next_id = namespace.next_namespace_index();
+                    tls.set(Some(namespace));
+                    next_id
+                })
             }
         }
     };
@@ -185,17 +230,12 @@ impl PipelineNamespace {
         NonZeroU32::new(self.index).expect("pipeline id index wrapped!")
     }
 
-    namespace_id_method! {next_pipeline_id, PipelineId, self, PipelineIndex}
-    namespace_id_method! {next_browsing_context_id, BrowsingContextId, self, BrowsingContextIndex}
-    namespace_id_method! {next_history_state_id, HistoryStateId, self, HistoryStateIndex}
-    namespace_id_method! {next_message_port_id, MessagePortId, self, MessagePortIndex}
-    namespace_id_method! {next_message_port_router_id, MessagePortRouterId, self, MessagePortRouterIndex}
-    namespace_id_method! {next_broadcast_channel_router_id, BroadcastChannelRouterId, self, BroadcastChannelRouterIndex}
-    namespace_id_method! {next_service_worker_id, ServiceWorkerId, self, ServiceWorkerIndex}
-    namespace_id_method! {next_service_worker_registration_id, ServiceWorkerRegistrationId,
-    self, ServiceWorkerRegistrationIndex}
-    namespace_id_method! {next_blob_id, BlobId, self, BlobIndex}
-    namespace_id_method! {next_dom_point_id, DomPointId, self, DomPointIndex}
+    fn next_namespace_index<T>(&mut self) -> NamespaceIndex<T> {
+        NamespaceIndex {
+            namespace_id: self.id,
+            index: Index(self.next_index(), PhantomData),
+        }
+    }
 }
 
 thread_local!(pub static PIPELINE_NAMESPACE: Cell<Option<PipelineNamespace>> = const { Cell::new(None) });
@@ -211,15 +251,6 @@ size_of_test!(PipelineId, 8);
 size_of_test!(Option<PipelineId>, 8);
 
 impl PipelineId {
-    pub fn new() -> PipelineId {
-        PIPELINE_NAMESPACE.with(|tls| {
-            let mut namespace = tls.get().expect("No namespace set for this thread!");
-            let new_pipeline_id = namespace.next_pipeline_id();
-            tls.set(Some(namespace));
-            new_pipeline_id
-        })
-    }
-
     pub fn root_scroll_id(&self) -> webrender_api::ExternalScrollId {
         ExternalScrollId(0, self.into())
     }
@@ -232,7 +263,7 @@ impl From<WebRenderPipelineId> for PipelineId {
         unsafe {
             PipelineId {
                 namespace_id: PipelineNamespaceId(namespace_id),
-                index: PipelineIndex(NonZeroU32::new_unchecked(index)),
+                index: Index(NonZeroU32::new_unchecked(index), PhantomData),
             }
         }
     }
@@ -241,7 +272,7 @@ impl From<WebRenderPipelineId> for PipelineId {
 impl From<PipelineId> for WebRenderPipelineId {
     fn from(value: PipelineId) -> Self {
         let PipelineNamespaceId(namespace_id) = value.namespace_id;
-        let PipelineIndex(index) = value.index;
+        let Index(index, _) = value.index;
         WebRenderPipelineId(namespace_id, index.get())
     }
 }
@@ -257,17 +288,6 @@ namespace_id! {BrowsingContextId, BrowsingContextIndex, "BrowsingContext"}
 size_of_test!(BrowsingContextId, 8);
 size_of_test!(Option<BrowsingContextId>, 8);
 
-impl BrowsingContextId {
-    pub fn new() -> Self {
-        PIPELINE_NAMESPACE.with(|tls| {
-            let mut namespace = tls.get().expect("No namespace set for this thread!");
-            let new_browsing_context_id = namespace.next_browsing_context_id();
-            tls.set(Some(namespace));
-            new_browsing_context_id
-        })
-    }
-}
-
 #[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
 pub struct BrowsingContextGroupId(pub u32);
 impl fmt::Display for BrowsingContextGroupId {
@@ -335,121 +355,34 @@ impl PartialEq<BrowsingContextId> for WebViewId {
 
 namespace_id! {MessagePortId, MessagePortIndex, "MessagePort"}
 
-impl MessagePortId {
-    pub fn new() -> MessagePortId {
-        PIPELINE_NAMESPACE.with(|tls| {
-            let mut namespace = tls.get().expect("No namespace set for this thread!");
-            let next_message_port_id = namespace.next_message_port_id();
-            tls.set(Some(namespace));
-            next_message_port_id
-        })
-    }
-}
-
 namespace_id! {MessagePortRouterId, MessagePortRouterIndex, "MessagePortRouter"}
 
-impl MessagePortRouterId {
-    pub fn new() -> MessagePortRouterId {
-        PIPELINE_NAMESPACE.with(|tls| {
-            let mut namespace = tls.get().expect("No namespace set for this thread!");
-            let next_message_port_router_id = namespace.next_message_port_router_id();
-            tls.set(Some(namespace));
-            next_message_port_router_id
-        })
-    }
-}
-
 namespace_id! {BroadcastChannelRouterId, BroadcastChannelRouterIndex, "BroadcastChannelRouter"}
 
-impl BroadcastChannelRouterId {
-    pub fn new() -> BroadcastChannelRouterId {
-        PIPELINE_NAMESPACE.with(|tls| {
-            let mut namespace = tls.get().expect("No namespace set for this thread!");
-            let next_broadcast_channel_router_id = namespace.next_broadcast_channel_router_id();
-            tls.set(Some(namespace));
-            next_broadcast_channel_router_id
-        })
-    }
-}
-
 namespace_id! {ServiceWorkerId, ServiceWorkerIndex, "ServiceWorker"}
 
-impl ServiceWorkerId {
-    pub fn new() -> ServiceWorkerId {
-        PIPELINE_NAMESPACE.with(|tls| {
-            let mut namespace = tls.get().expect("No namespace set for this thread!");
-            let next_service_worker_id = namespace.next_service_worker_id();
-            tls.set(Some(namespace));
-            next_service_worker_id
-        })
-    }
-}
-
 namespace_id! {ServiceWorkerRegistrationId, ServiceWorkerRegistrationIndex, "ServiceWorkerRegistration"}
 
-impl ServiceWorkerRegistrationId {
-    pub fn new() -> ServiceWorkerRegistrationId {
-        PIPELINE_NAMESPACE.with(|tls| {
-            let mut namespace = tls.get().expect("No namespace set for this thread!");
-            let next_service_worker_registration_id =
-                namespace.next_service_worker_registration_id();
-            tls.set(Some(namespace));
-            next_service_worker_registration_id
-        })
-    }
-}
-
 namespace_id! {BlobId, BlobIndex, "Blob"}
 
-impl BlobId {
-    pub fn new() -> BlobId {
-        PIPELINE_NAMESPACE.with(|tls| {
-            let mut namespace = tls.get().expect("No namespace set for this thread!");
-            let next_blob_id = namespace.next_blob_id();
-            tls.set(Some(namespace));
-            next_blob_id
-        })
-    }
-}
-
 namespace_id! {DomPointId, DomPointIndex, "DomPoint"}
 
-impl DomPointId {
-    pub fn new() -> DomPointId {
-        PIPELINE_NAMESPACE.with(|tls| {
-            let mut namespace = tls.get().expect("No namespace set for this thread!");
-            let next_point_id = namespace.next_dom_point_id();
-            tls.set(Some(namespace));
-            next_point_id
-        })
-    }
-}
+namespace_id! {DomExceptionId, DomExceptionIndex, "DomException"}
 
 namespace_id! {HistoryStateId, HistoryStateIndex, "HistoryState"}
 
-impl HistoryStateId {
-    pub fn new() -> HistoryStateId {
-        PIPELINE_NAMESPACE.with(|tls| {
-            let mut namespace = tls.get().expect("No namespace set for this thread!");
-            let next_history_state_id = namespace.next_history_state_id();
-            tls.set(Some(namespace));
-            next_history_state_id
-        })
-    }
-}
-
 // We provide ids just for unit testing.
 pub const TEST_NAMESPACE: PipelineNamespaceId = PipelineNamespaceId(1234);
 #[allow(unsafe_code)]
-pub const TEST_PIPELINE_INDEX: PipelineIndex =
-    unsafe { PipelineIndex(NonZeroU32::new_unchecked(5678)) };
+pub const TEST_PIPELINE_INDEX: Index<PipelineIndex> =
+    unsafe { Index(NonZeroU32::new_unchecked(5678), PhantomData) };
 pub const TEST_PIPELINE_ID: PipelineId = PipelineId {
     namespace_id: TEST_NAMESPACE,
     index: TEST_PIPELINE_INDEX,
 };
 #[allow(unsafe_code)]
-pub const TEST_BROWSING_CONTEXT_INDEX: BrowsingContextIndex =
-    unsafe { BrowsingContextIndex(NonZeroU32::new_unchecked(8765)) };
+pub const TEST_BROWSING_CONTEXT_INDEX: Index<BrowsingContextIndex> =
+    unsafe { Index(NonZeroU32::new_unchecked(8765), PhantomData) };
 pub const TEST_BROWSING_CONTEXT_ID: BrowsingContextId = BrowsingContextId {
     namespace_id: TEST_NAMESPACE,
     index: TEST_BROWSING_CONTEXT_INDEX,
diff --git a/components/shared/canvas/Cargo.toml b/components/shared/canvas/Cargo.toml
index d6e96711e1d..c77399ef847 100644
--- a/components/shared/canvas/Cargo.toml
+++ b/components/shared/canvas/Cargo.toml
@@ -26,6 +26,7 @@ pixels = { path = "../../pixels" }
 serde = { workspace = true }
 serde_bytes = { workspace = true }
 servo_config = { path = "../../config" }
+snapshot = { workspace = true }
 stylo = { workspace = true }
 webrender_api = { workspace = true }
 webxr-api = { workspace = true, features = ["ipc"] }
diff --git a/components/shared/canvas/canvas.rs b/components/shared/canvas/canvas.rs
index b01246bf9c1..850f5f9bd9a 100644
--- a/components/shared/canvas/canvas.rs
+++ b/components/shared/canvas/canvas.rs
@@ -6,10 +6,11 @@ use std::default::Default;
 use std::str::FromStr;
 
 use euclid::default::{Point2D, Rect, Size2D, Transform2D};
-use ipc_channel::ipc::{IpcBytesReceiver, IpcBytesSender, IpcSender, IpcSharedMemory};
+use ipc_channel::ipc::{IpcBytesReceiver, IpcSender};
 use malloc_size_of_derive::MallocSizeOf;
 use serde::{Deserialize, Serialize};
 use serde_bytes::ByteBuf;
+use snapshot::IpcSnapshot;
 use style::color::AbsoluteColor;
 use style::properties::style_structs::Font as FontStyleStruct;
 
@@ -87,7 +88,7 @@ pub enum CanvasMsg {
 pub enum Canvas2dMsg {
     Arc(Point2D<f32>, f32, f32, f32, bool),
     ArcTo(Point2D<f32>, Point2D<f32>, f32),
-    DrawImage(IpcSharedMemory, Size2D<f64>, Rect<f64>, Rect<f64>, bool),
+    DrawImage(IpcSnapshot, Rect<f64>, Rect<f64>, bool),
     DrawEmptyImage(Size2D<f64>, Rect<f64>, Rect<f64>),
     DrawImageInOther(CanvasId, Size2D<f64>, Rect<f64>, Rect<f64>, bool),
     BeginPath,
@@ -101,7 +102,7 @@ pub enum Canvas2dMsg {
     FillPath(FillOrStrokeStyle, Vec<PathSegment>),
     FillText(String, f64, f64, Option<f64>, FillOrStrokeStyle, bool),
     FillRect(Rect<f32>, FillOrStrokeStyle),
-    GetImageData(Rect<u64>, Size2D<u64>, IpcBytesSender),
+    GetImageData(Rect<u64>, Size2D<u64>, IpcSender<IpcSnapshot>),
     GetTransform(IpcSender<Transform2D<f32>>),
     IsPointInCurrentPath(f64, f64, FillRule, IpcSender<bool>),
     IsPointInPath(Vec<PathSegment>, f64, f64, FillRule, IpcSender<bool>),
@@ -120,6 +121,8 @@ pub enum Canvas2dMsg {
     SetLineCap(LineCapStyle),
     SetLineJoin(LineJoinStyle),
     SetMiterLimit(f32),
+    SetLineDash(Vec<f32>),
+    SetLineDashOffset(f32),
     SetGlobalAlpha(f32),
     SetGlobalComposition(CompositionOrBlending),
     SetTransform(Transform2D<f32>),
@@ -135,7 +138,7 @@ pub enum Canvas2dMsg {
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub enum FromScriptMsg {
-    SendPixels(IpcSender<IpcSharedMemory>),
+    SendPixels(IpcSender<IpcSnapshot>),
 }
 
 #[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
diff --git a/components/shared/canvas/webgl.rs b/components/shared/canvas/webgl.rs
index eaa934fc145..7ffae5d5fc5 100644
--- a/components/shared/canvas/webgl.rs
+++ b/components/shared/canvas/webgl.rs
@@ -298,7 +298,12 @@ pub enum WebGLCommand {
     PolygonOffset(f32, f32),
     RenderbufferStorage(u32, u32, i32, i32),
     RenderbufferStorageMultisample(u32, i32, u32, i32, i32),
-    ReadPixels(Rect<u32>, u32, u32, IpcBytesSender),
+    ReadPixels(
+        Rect<u32>,
+        u32,
+        u32,
+        IpcSender<(IpcSharedMemory, snapshot::AlphaMode)>,
+    ),
     ReadPixelsPP(Rect<i32>, u32, u32, usize),
     SampleCoverage(f32, bool),
     Scissor(i32, i32, u32, u32),
diff --git a/components/shared/compositing/Cargo.toml b/components/shared/compositing/Cargo.toml
index 02488755cff..2e39ef5397b 100644
--- a/components/shared/compositing/Cargo.toml
+++ b/components/shared/compositing/Cargo.toml
@@ -11,16 +11,30 @@ rust-version.workspace = true
 name = "compositing_traits"
 path = "lib.rs"
 
+[features]
+no-wgl = ["surfman/sm-angle-default"]
+
 [dependencies]
 base = { workspace = true }
+bincode = { workspace = true }
 crossbeam-channel = { workspace = true }
+dpi = { version = "0.1" }
 embedder_traits = { workspace = true }
 euclid = { workspace = true }
+gleam = { workspace = true }
+glow = { workspace = true }
+image = { workspace = true }
 ipc-channel = { workspace = true }
 log = { workspace = true }
+malloc_size_of = { workspace = true }
+malloc_size_of_derive = { workspace = true }
 pixels = { path = '../../pixels' }
-script_traits = { workspace = true }
+profile_traits = { path = '../profile' }
+raw-window-handle = { version = "0.6" }
+serde = { workspace = true }
+servo_geometry = { path = "../../geometry" }
 strum_macros = { workspace = true }
+stylo = { workspace = true }
 stylo_traits = { workspace = true }
+surfman = { workspace = true, features = ["sm-x11"] }
 webrender_api = { workspace = true }
-webrender_traits = { workspace = true }
diff --git a/components/shared/webrender/display_list.rs b/components/shared/compositing/display_list.rs
similarity index 98%
rename from components/shared/webrender/display_list.rs
rename to components/shared/compositing/display_list.rs
index 2b7883c3ce1..6aa822cb145 100644
--- a/components/shared/webrender/display_list.rs
+++ b/components/shared/compositing/display_list.rs
@@ -6,6 +6,7 @@
 
 use base::id::ScrollTreeNodeId;
 use embedder_traits::Cursor;
+use malloc_size_of_derive::MallocSizeOf;
 use serde::{Deserialize, Serialize};
 use style::values::specified::Overflow;
 use webrender_api::units::{LayoutSize, LayoutVector2D};
@@ -13,7 +14,7 @@ use webrender_api::{Epoch, ExternalScrollId, PipelineId, ScrollLocation, Spatial
 
 /// The scroll sensitivity of a scroll node in a particular axis ie whether it can be scrolled due to
 /// input events and script events or only script events.
-#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Copy, Debug, Deserialize, MallocSizeOf, PartialEq, Serialize)]
 pub enum ScrollSensitivity {
     /// This node can be scrolled by input and script events.
     ScriptAndInputEvents,
@@ -35,7 +36,7 @@ impl From<Overflow> for ScrollSensitivity {
 }
 
 /// The [ScrollSensitivity] of particular node in the vertical and horizontal axes.
-#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Copy, Debug, Deserialize, MallocSizeOf, PartialEq, Serialize)]
 pub struct AxesScrollSensitivity {
     pub x: ScrollSensitivity,
     pub y: ScrollSensitivity,
diff --git a/components/shared/compositing/lib.rs b/components/shared/compositing/lib.rs
index 738619ffc31..a6701ca2b52 100644
--- a/components/shared/compositing/lib.rs
+++ b/components/shared/compositing/lib.rs
@@ -7,17 +7,39 @@
 use std::fmt::{Debug, Error, Formatter};
 
 use base::id::{PipelineId, WebViewId};
-use crossbeam_channel::{Receiver, Sender};
-use embedder_traits::{EventLoopWaker, MouseButton, MouseButtonAction};
+use crossbeam_channel::Sender;
+use embedder_traits::{
+    AnimationState, EventLoopWaker, MouseButton, MouseButtonAction, TouchEventResult,
+};
 use euclid::Rect;
 use ipc_channel::ipc::IpcSender;
 use log::warn;
+use malloc_size_of_derive::MallocSizeOf;
 use pixels::Image;
-use script_traits::{AnimationState, TouchEventResult};
 use strum_macros::IntoStaticStr;
 use style_traits::CSSPixel;
 use webrender_api::DocumentId;
-use webrender_traits::{CrossProcessCompositorApi, CrossProcessCompositorMessage};
+
+pub mod display_list;
+pub mod rendering_context;
+
+use std::collections::HashMap;
+use std::sync::{Arc, Mutex};
+
+use display_list::CompositorDisplayListInfo;
+use embedder_traits::{CompositorHitTestResult, ScreenGeometry};
+use euclid::default::Size2D as UntypedSize2D;
+use ipc_channel::ipc::{self, IpcSharedMemory};
+use profile_traits::mem::{OpaqueSender, ReportsChan};
+use serde::{Deserialize, Serialize};
+use servo_geometry::{DeviceIndependentIntRect, DeviceIndependentIntSize};
+use webrender_api::units::{DevicePoint, LayoutPoint, TexelRect};
+use webrender_api::{
+    BuiltDisplayList, BuiltDisplayListDescriptor, ExternalImage, ExternalImageData,
+    ExternalImageHandler, ExternalImageId, ExternalImageSource, ExternalScrollId,
+    FontInstanceFlags, FontInstanceKey, FontKey, HitTestFlags, ImageData, ImageDescriptor,
+    ImageKey, NativeFontHandle, PipelineId as WebRenderPipelineId,
+};
 
 /// Sends messages to the compositor.
 #[derive(Clone)]
@@ -30,6 +52,12 @@ pub struct CompositorProxy {
     pub event_loop_waker: Box<dyn EventLoopWaker>,
 }
 
+impl OpaqueSender<CompositorMsg> for CompositorProxy {
+    fn send(&self, message: CompositorMsg) {
+        CompositorProxy::send(self, message)
+    }
+}
+
 impl CompositorProxy {
     pub fn send(&self, msg: CompositorMsg) {
         if let Err(err) = self.sender.send(msg) {
@@ -39,22 +67,8 @@ impl CompositorProxy {
     }
 }
 
-/// The port that the compositor receives messages on.
-pub struct CompositorReceiver {
-    pub receiver: Receiver<CompositorMsg>,
-}
-
-impl CompositorReceiver {
-    pub fn try_recv_compositor_msg(&mut self) -> Option<CompositorMsg> {
-        self.receiver.try_recv().ok()
-    }
-    pub fn recv_compositor_msg(&mut self) -> CompositorMsg {
-        self.receiver.recv().unwrap()
-    }
-}
-
 /// Messages from (or via) the constellation thread to the compositor.
-#[derive(IntoStaticStr)]
+#[derive(Deserialize, IntoStaticStr, Serialize)]
 pub enum CompositorMsg {
     /// Alerts the compositor that the given pipeline has changed whether it is running animations.
     ChangeRunningAnimationsState(WebViewId, PipelineId, AnimationState),
@@ -65,7 +79,11 @@ pub enum CompositorMsg {
     /// Script has handled a touch event, and either prevented or allowed default actions.
     TouchEventProcessed(WebViewId, TouchEventResult),
     /// Composite to a PNG file and return the Image over a passed channel.
-    CreatePng(Option<Rect<f32, CSSPixel>>, IpcSender<Option<Image>>),
+    CreatePng(
+        WebViewId,
+        Option<Rect<f32, CSSPixel>>,
+        IpcSender<Option<Image>>,
+    ),
     /// A reply to the compositor asking if the output image is stable.
     IsReadyToSaveImageReply(bool),
     /// Set whether to use less resources by stopping animations.
@@ -86,22 +104,70 @@ pub enum CompositorMsg {
     WebDriverMouseButtonEvent(WebViewId, MouseButtonAction, MouseButton, f32, f32),
     /// WebDriver mouse move event
     WebDriverMouseMoveEvent(WebViewId, f32, f32),
+    // Webdriver wheel scroll event
+    WebDriverWheelScrollEvent(WebViewId, f32, f32, f64, f64),
 
-    /// Messages forwarded to the compositor by the constellation from other crates. These
-    /// messages are mainly passed on from the compositor to WebRender.
-    CrossProcess(CrossProcessCompositorMessage),
-}
+    /// Inform WebRender of the existence of this pipeline.
+    SendInitialTransaction(WebRenderPipelineId),
+    /// Perform a scroll operation.
+    SendScrollNode(
+        WebViewId,
+        WebRenderPipelineId,
+        LayoutPoint,
+        ExternalScrollId,
+    ),
+    /// Inform WebRender of a new display list for the given pipeline.
+    SendDisplayList {
+        /// The [`WebViewId`] that this display list belongs to.
+        webview_id: WebViewId,
+        /// A descriptor of this display list used to construct this display list from raw data.
+        display_list_descriptor: BuiltDisplayListDescriptor,
+        /// An [ipc::IpcBytesReceiver] used to send the raw data of the display list.
+        display_list_receiver: ipc::IpcBytesReceiver,
+    },
+    /// Perform a hit test operation. The result will be returned via
+    /// the provided channel sender.
+    HitTest(
+        Option<WebRenderPipelineId>,
+        DevicePoint,
+        HitTestFlags,
+        IpcSender<Vec<CompositorHitTestResult>>,
+    ),
+    /// Create a new image key. The result will be returned via the
+    /// provided channel sender.
+    GenerateImageKey(IpcSender<ImageKey>),
+    /// Add an image with the given data and `ImageKey`.
+    AddImage(ImageKey, ImageDescriptor, SerializableImageData),
+    /// Perform a resource update operation.
+    UpdateImages(Vec<ImageUpdate>),
 
-pub struct SendableFrameTree {
-    pub pipeline: CompositionPipeline,
-    pub children: Vec<SendableFrameTree>,
-}
+    /// Generate a new batch of font keys which can be used to allocate
+    /// keys asynchronously.
+    GenerateFontKeys(
+        usize,
+        usize,
+        IpcSender<(Vec<FontKey>, Vec<FontInstanceKey>)>,
+    ),
+    /// Add a font with the given data and font key.
+    AddFont(FontKey, Arc<IpcSharedMemory>, u32),
+    /// Add a system font with the given font key and handle.
+    AddSystemFont(FontKey, NativeFontHandle),
+    /// Add an instance of a font with the given instance key.
+    AddFontInstance(FontInstanceKey, FontKey, f32, FontInstanceFlags),
+    /// Remove the given font resources from our WebRender instance.
+    RemoveFonts(Vec<FontKey>, Vec<FontInstanceKey>),
 
-/// The subset of the pipeline that is needed for layer composition.
-#[derive(Clone)]
-pub struct CompositionPipeline {
-    pub id: PipelineId,
-    pub webview_id: WebViewId,
+    /// Get the client window size and position.
+    GetClientWindowRect(WebViewId, IpcSender<DeviceIndependentIntRect>),
+    /// Get the size of the screen that the client window inhabits.
+    GetScreenSize(WebViewId, IpcSender<DeviceIndependentIntSize>),
+    /// Get the available screen size (without toolbars and docks) for the screen
+    /// the client window inhabits.
+    GetAvailableScreenSize(WebViewId, IpcSender<DeviceIndependentIntSize>),
+
+    /// Measure the current memory usage associated with the compositor.
+    /// The report must be sent on the provided channel once it's complete.
+    CollectMemoryReport(ReportsChan),
 }
 
 impl Debug for CompositorMsg {
@@ -110,3 +176,376 @@ impl Debug for CompositorMsg {
         write!(formatter, "{string}")
     }
 }
+
+#[derive(Deserialize, Serialize)]
+pub struct SendableFrameTree {
+    pub pipeline: CompositionPipeline,
+    pub children: Vec<SendableFrameTree>,
+}
+
+/// The subset of the pipeline that is needed for layer composition.
+#[derive(Clone, Deserialize, Serialize)]
+pub struct CompositionPipeline {
+    pub id: PipelineId,
+    pub webview_id: WebViewId,
+}
+
+/// A mechanism to send messages from ScriptThread to the parent process' WebRender instance.
+#[derive(Clone, Deserialize, MallocSizeOf, Serialize)]
+pub struct CrossProcessCompositorApi(pub IpcSender<CompositorMsg>);
+
+impl CrossProcessCompositorApi {
+    /// Create a new [`CrossProcessCompositorApi`] struct that does not have a listener on the other
+    /// end to use for unit testing.
+    pub fn dummy() -> Self {
+        let (sender, _) = ipc::channel().unwrap();
+        Self(sender)
+    }
+
+    /// Get the sender for this proxy.
+    pub fn sender(&self) -> &IpcSender<CompositorMsg> {
+        &self.0
+    }
+
+    /// Inform WebRender of the existence of this pipeline.
+    pub fn send_initial_transaction(&self, pipeline: WebRenderPipelineId) {
+        if let Err(e) = self.0.send(CompositorMsg::SendInitialTransaction(pipeline)) {
+            warn!("Error sending initial transaction: {}", e);
+        }
+    }
+
+    /// Perform a scroll operation.
+    pub fn send_scroll_node(
+        &self,
+        webview_id: WebViewId,
+        pipeline_id: WebRenderPipelineId,
+        point: LayoutPoint,
+        scroll_id: ExternalScrollId,
+    ) {
+        if let Err(e) = self.0.send(CompositorMsg::SendScrollNode(
+            webview_id,
+            pipeline_id,
+            point,
+            scroll_id,
+        )) {
+            warn!("Error sending scroll node: {}", e);
+        }
+    }
+
+    /// Inform WebRender of a new display list for the given pipeline.
+    pub fn send_display_list(
+        &self,
+        webview_id: WebViewId,
+        display_list_info: CompositorDisplayListInfo,
+        list: BuiltDisplayList,
+    ) {
+        let (display_list_data, display_list_descriptor) = list.into_data();
+        let (display_list_sender, display_list_receiver) = ipc::bytes_channel().unwrap();
+        if let Err(e) = self.0.send(CompositorMsg::SendDisplayList {
+            webview_id,
+            display_list_descriptor,
+            display_list_receiver,
+        }) {
+            warn!("Error sending display list: {}", e);
+        }
+
+        let display_list_info_serialized =
+            bincode::serialize(&display_list_info).unwrap_or_default();
+        if let Err(error) = display_list_sender.send(&display_list_info_serialized) {
+            warn!("Error sending display list info: {error}");
+        }
+
+        if let Err(error) = display_list_sender.send(&display_list_data.items_data) {
+            warn!("Error sending display list items: {error}");
+        }
+        if let Err(error) = display_list_sender.send(&display_list_data.cache_data) {
+            warn!("Error sending display list cache data: {error}");
+        }
+        if let Err(error) = display_list_sender.send(&display_list_data.spatial_tree) {
+            warn!("Error sending display spatial tree: {error}");
+        }
+    }
+
+    /// Perform a hit test operation. Blocks until the operation is complete and
+    /// and a result is available.
+    pub fn hit_test(
+        &self,
+        pipeline: Option<WebRenderPipelineId>,
+        point: DevicePoint,
+        flags: HitTestFlags,
+    ) -> Vec<CompositorHitTestResult> {
+        let (sender, receiver) = ipc::channel().unwrap();
+        self.0
+            .send(CompositorMsg::HitTest(pipeline, point, flags, sender))
+            .expect("error sending hit test");
+        receiver.recv().expect("error receiving hit test result")
+    }
+
+    /// Create a new image key. Blocks until the key is available.
+    pub fn generate_image_key(&self) -> Option<ImageKey> {
+        let (sender, receiver) = ipc::channel().unwrap();
+        self.0.send(CompositorMsg::GenerateImageKey(sender)).ok()?;
+        receiver.recv().ok()
+    }
+
+    pub fn add_image(
+        &self,
+        key: ImageKey,
+        descriptor: ImageDescriptor,
+        data: SerializableImageData,
+    ) {
+        if let Err(e) = self.0.send(CompositorMsg::AddImage(key, descriptor, data)) {
+            warn!("Error sending image update: {}", e);
+        }
+    }
+
+    /// Perform an image resource update operation.
+    pub fn update_images(&self, updates: Vec<ImageUpdate>) {
+        if let Err(e) = self.0.send(CompositorMsg::UpdateImages(updates)) {
+            warn!("error sending image updates: {}", e);
+        }
+    }
+
+    pub fn remove_unused_font_resources(
+        &self,
+        keys: Vec<FontKey>,
+        instance_keys: Vec<FontInstanceKey>,
+    ) {
+        if keys.is_empty() && instance_keys.is_empty() {
+            return;
+        }
+        let _ = self.0.send(CompositorMsg::RemoveFonts(keys, instance_keys));
+    }
+
+    pub fn add_font_instance(
+        &self,
+        font_instance_key: FontInstanceKey,
+        font_key: FontKey,
+        size: f32,
+        flags: FontInstanceFlags,
+    ) {
+        let _x = self.0.send(CompositorMsg::AddFontInstance(
+            font_instance_key,
+            font_key,
+            size,
+            flags,
+        ));
+    }
+
+    pub fn add_font(&self, font_key: FontKey, data: Arc<IpcSharedMemory>, index: u32) {
+        let _ = self.0.send(CompositorMsg::AddFont(font_key, data, index));
+    }
+
+    pub fn add_system_font(&self, font_key: FontKey, handle: NativeFontHandle) {
+        let _ = self.0.send(CompositorMsg::AddSystemFont(font_key, handle));
+    }
+
+    pub fn fetch_font_keys(
+        &self,
+        number_of_font_keys: usize,
+        number_of_font_instance_keys: usize,
+    ) -> (Vec<FontKey>, Vec<FontInstanceKey>) {
+        let (sender, receiver) = ipc_channel::ipc::channel().expect("Could not create IPC channel");
+        let _ = self.0.send(CompositorMsg::GenerateFontKeys(
+            number_of_font_keys,
+            number_of_font_instance_keys,
+            sender,
+        ));
+        receiver.recv().unwrap()
+    }
+}
+
+/// This trait is used as a bridge between the different GL clients
+/// in Servo that handles WebRender ExternalImages and the WebRender
+/// ExternalImageHandler API.
+//
+/// This trait is used to notify lock/unlock messages and get the
+/// required info that WR needs.
+pub trait WebrenderExternalImageApi {
+    fn lock(&mut self, id: u64) -> (WebrenderImageSource, UntypedSize2D<i32>);
+    fn unlock(&mut self, id: u64);
+}
+
+pub enum WebrenderImageSource<'a> {
+    TextureHandle(u32),
+    Raw(&'a [u8]),
+}
+
+/// Type of Webrender External Image Handler.
+pub enum WebrenderImageHandlerType {
+    WebGL,
+    Media,
+    WebGPU,
+}
+
+/// List of Webrender external images to be shared among all external image
+/// consumers (WebGL, Media, WebGPU).
+/// It ensures that external image identifiers are unique.
+#[derive(Default)]
+pub struct WebrenderExternalImageRegistry {
+    /// Map of all generated external images.
+    external_images: HashMap<ExternalImageId, WebrenderImageHandlerType>,
+    /// Id generator for the next external image identifier.
+    next_image_id: u64,
+}
+
+impl WebrenderExternalImageRegistry {
+    pub fn next_id(&mut self, handler_type: WebrenderImageHandlerType) -> ExternalImageId {
+        self.next_image_id += 1;
+        let key = ExternalImageId(self.next_image_id);
+        self.external_images.insert(key, handler_type);
+        key
+    }
+
+    pub fn remove(&mut self, key: &ExternalImageId) {
+        self.external_images.remove(key);
+    }
+
+    pub fn get(&self, key: &ExternalImageId) -> Option<&WebrenderImageHandlerType> {
+        self.external_images.get(key)
+    }
+}
+
+/// WebRender External Image Handler implementation.
+pub struct WebrenderExternalImageHandlers {
+    /// WebGL handler.
+    webgl_handler: Option<Box<dyn WebrenderExternalImageApi>>,
+    /// Media player handler.
+    media_handler: Option<Box<dyn WebrenderExternalImageApi>>,
+    /// WebGPU handler.
+    webgpu_handler: Option<Box<dyn WebrenderExternalImageApi>>,
+    /// Webrender external images.
+    external_images: Arc<Mutex<WebrenderExternalImageRegistry>>,
+}
+
+impl WebrenderExternalImageHandlers {
+    pub fn new() -> (Self, Arc<Mutex<WebrenderExternalImageRegistry>>) {
+        let external_images = Arc::new(Mutex::new(WebrenderExternalImageRegistry::default()));
+        (
+            Self {
+                webgl_handler: None,
+                media_handler: None,
+                webgpu_handler: None,
+                external_images: external_images.clone(),
+            },
+            external_images,
+        )
+    }
+
+    pub fn set_handler(
+        &mut self,
+        handler: Box<dyn WebrenderExternalImageApi>,
+        handler_type: WebrenderImageHandlerType,
+    ) {
+        match handler_type {
+            WebrenderImageHandlerType::WebGL => self.webgl_handler = Some(handler),
+            WebrenderImageHandlerType::Media => self.media_handler = Some(handler),
+            WebrenderImageHandlerType::WebGPU => self.webgpu_handler = Some(handler),
+        }
+    }
+}
+
+impl ExternalImageHandler for WebrenderExternalImageHandlers {
+    /// Lock the external image. Then, WR could start to read the
+    /// image content.
+    /// The WR client should not change the image content until the
+    /// unlock() call.
+    fn lock(&mut self, key: ExternalImageId, _channel_index: u8) -> ExternalImage {
+        let external_images = self.external_images.lock().unwrap();
+        let handler_type = external_images
+            .get(&key)
+            .expect("Tried to get unknown external image");
+        match handler_type {
+            WebrenderImageHandlerType::WebGL => {
+                let (source, size) = self.webgl_handler.as_mut().unwrap().lock(key.0);
+                let texture_id = match source {
+                    WebrenderImageSource::TextureHandle(b) => b,
+                    _ => panic!("Wrong type"),
+                };
+                ExternalImage {
+                    uv: TexelRect::new(0.0, size.height as f32, size.width as f32, 0.0),
+                    source: ExternalImageSource::NativeTexture(texture_id),
+                }
+            },
+            WebrenderImageHandlerType::Media => {
+                let (source, size) = self.media_handler.as_mut().unwrap().lock(key.0);
+                let texture_id = match source {
+                    WebrenderImageSource::TextureHandle(b) => b,
+                    _ => panic!("Wrong type"),
+                };
+                ExternalImage {
+                    uv: TexelRect::new(0.0, size.height as f32, size.width as f32, 0.0),
+                    source: ExternalImageSource::NativeTexture(texture_id),
+                }
+            },
+            WebrenderImageHandlerType::WebGPU => {
+                let (source, size) = self.webgpu_handler.as_mut().unwrap().lock(key.0);
+                let buffer = match source {
+                    WebrenderImageSource::Raw(b) => b,
+                    _ => panic!("Wrong type"),
+                };
+                ExternalImage {
+                    uv: TexelRect::new(0.0, size.height as f32, size.width as f32, 0.0),
+                    source: ExternalImageSource::RawData(buffer),
+                }
+            },
+        }
+    }
+
+    /// Unlock the external image. The WR should not read the image
+    /// content after this call.
+    fn unlock(&mut self, key: ExternalImageId, _channel_index: u8) {
+        let external_images = self.external_images.lock().unwrap();
+        let handler_type = external_images
+            .get(&key)
+            .expect("Tried to get unknown external image");
+        match handler_type {
+            WebrenderImageHandlerType::WebGL => self.webgl_handler.as_mut().unwrap().unlock(key.0),
+            WebrenderImageHandlerType::Media => self.media_handler.as_mut().unwrap().unlock(key.0),
+            WebrenderImageHandlerType::WebGPU => {
+                self.webgpu_handler.as_mut().unwrap().unlock(key.0)
+            },
+        };
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+/// Serializable image updates that must be performed by WebRender.
+pub enum ImageUpdate {
+    /// Register a new image.
+    AddImage(ImageKey, ImageDescriptor, SerializableImageData),
+    /// Delete a previously registered image registration.
+    DeleteImage(ImageKey),
+    /// Update an existing image registration.
+    UpdateImage(ImageKey, ImageDescriptor, SerializableImageData),
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+/// Serialized `ImageData`. It contains IPC byte channel receiver to prevent from loading bytes too
+/// slow.
+pub enum SerializableImageData {
+    /// A simple series of bytes, provided by the embedding and owned by WebRender.
+    /// The format is stored out-of-band, currently in ImageDescriptor.
+    Raw(IpcSharedMemory),
+    /// An image owned by the embedding, and referenced by WebRender. This may
+    /// take the form of a texture or a heap-allocated buffer.
+    External(ExternalImageData),
+}
+
+impl From<SerializableImageData> for ImageData {
+    fn from(value: SerializableImageData) -> Self {
+        match value {
+            SerializableImageData::Raw(shared_memory) => ImageData::new(shared_memory.to_vec()),
+            SerializableImageData::External(image) => ImageData::External(image),
+        }
+    }
+}
+
+/// A trait that exposes the embedding layer's `WebView` to the Servo renderer.
+/// This is to prevent a dependency cycle between the renderer and the embedding
+/// layer.
+pub trait WebViewTrait {
+    fn id(&self) -> WebViewId;
+    fn screen_geometry(&self) -> Option<ScreenGeometry>;
+    fn set_animating(&self, new_value: bool);
+}
diff --git a/components/shared/webrender/rendering_context.rs b/components/shared/compositing/rendering_context.rs
similarity index 100%
rename from components/shared/webrender/rendering_context.rs
rename to components/shared/compositing/rendering_context.rs
diff --git a/components/shared/script/tests/compositor.rs b/components/shared/compositing/tests/compositor.rs
similarity index 99%
rename from components/shared/script/tests/compositor.rs
rename to components/shared/compositing/tests/compositor.rs
index fb8410cb282..4d2ecfd99c9 100644
--- a/components/shared/script/tests/compositor.rs
+++ b/components/shared/compositing/tests/compositor.rs
@@ -3,12 +3,12 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use base::id::ScrollTreeNodeId;
+use compositing_traits::display_list::{
+    AxesScrollSensitivity, ScrollSensitivity, ScrollTree, ScrollableNodeInfo,
+};
 use euclid::Size2D;
 use webrender_api::units::LayoutVector2D;
 use webrender_api::{ExternalScrollId, PipelineId, ScrollLocation, SpatialId};
-use webrender_traits::display_list::{
-    AxesScrollSensitivity, ScrollSensitivity, ScrollTree, ScrollableNodeInfo,
-};
 
 fn add_mock_scroll_node(tree: &mut ScrollTree) -> ScrollTreeNodeId {
     let pipeline_id = PipelineId(0, 0);
diff --git a/components/shared/constellation/Cargo.toml b/components/shared/constellation/Cargo.toml
index 10ee64d0b42..53a4307df60 100644
--- a/components/shared/constellation/Cargo.toml
+++ b/components/shared/constellation/Cargo.toml
@@ -11,16 +11,30 @@ rust-version.workspace = true
 name = "constellation_traits"
 path = "lib.rs"
 
+[features]
+bluetooth = []
+webgpu = ["wgpu-core"]
+
 [dependencies]
 base = { workspace = true }
 bitflags = { workspace = true }
+canvas_traits = { workspace = true }
+devtools_traits = { workspace = true }
 embedder_traits = { workspace = true }
 euclid = { workspace = true }
+http = { workspace = true }
+hyper_serde = { workspace = true }
 ipc-channel = { workspace = true }
+log = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
+net_traits = { workspace = true }
+profile_traits = { workspace = true }
 serde = { workspace = true }
 servo_url = { path = "../../url" }
+strum = { workspace = true }
 strum_macros = { workspace = true }
-stylo_traits = { workspace = true }
+uuid = { workspace = true }
+webgpu_traits = { workspace = true }
 webrender_api = { workspace = true }
+wgpu-core = { workspace = true, optional = true }
diff --git a/components/shared/constellation/from_script_message.rs b/components/shared/constellation/from_script_message.rs
new file mode 100644
index 00000000000..3856def660e
--- /dev/null
+++ b/components/shared/constellation/from_script_message.rs
@@ -0,0 +1,659 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! Messages send from the ScriptThread to the Constellation.
+
+use std::collections::HashMap;
+use std::fmt;
+
+use base::Epoch;
+use base::id::{
+    BroadcastChannelRouterId, BrowsingContextId, HistoryStateId, MessagePortId,
+    MessagePortRouterId, PipelineId, ServiceWorkerId, ServiceWorkerRegistrationId, WebViewId,
+};
+use canvas_traits::canvas::{CanvasId, CanvasMsg};
+use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg, WorkerId};
+use embedder_traits::{
+    AnimationState, EmbedderMsg, FocusSequenceNumber, JSValue, JavaScriptEvaluationError,
+    JavaScriptEvaluationId, MediaSessionEvent, TouchEventResult, ViewportDetails,
+};
+use euclid::default::Size2D as UntypedSize2D;
+use http::{HeaderMap, Method};
+use ipc_channel::Error as IpcError;
+use ipc_channel::ipc::{IpcReceiver, IpcSender};
+use net_traits::policy_container::PolicyContainer;
+use net_traits::request::{InsecureRequestsPolicy, Referrer, RequestBody};
+use net_traits::storage_thread::StorageType;
+use net_traits::{CoreResourceMsg, ReferrerPolicy, ResourceThreads};
+use profile_traits::mem::MemoryReportResult;
+use profile_traits::{mem, time as profile_time};
+use serde::{Deserialize, Serialize};
+use servo_url::{ImmutableOrigin, ServoUrl};
+use strum_macros::IntoStaticStr;
+#[cfg(feature = "webgpu")]
+use webgpu_traits::{WebGPU, WebGPUAdapterResponse};
+use webrender_api::ImageKey;
+
+use crate::structured_data::{BroadcastMsg, StructuredSerializedData};
+use crate::{
+    LogEntry, MessagePortMsg, PortMessageTask, PortTransferInfo, TraversalDirection, WindowSizeType,
+};
+
+/// A Script to Constellation channel.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct ScriptToConstellationChan {
+    /// Sender for communicating with constellation thread.
+    pub sender: IpcSender<(PipelineId, ScriptToConstellationMessage)>,
+    /// Used to identify the origin of the message.
+    pub pipeline_id: PipelineId,
+}
+
+impl ScriptToConstellationChan {
+    /// Send ScriptMsg and attach the pipeline_id to the message.
+    pub fn send(&self, msg: ScriptToConstellationMessage) -> Result<(), IpcError> {
+        self.sender.send((self.pipeline_id, msg))
+    }
+}
+
+/// The origin where a given load was initiated.
+/// Useful for origin checks, for example before evaluation a JS URL.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum LoadOrigin {
+    /// A load originating in the constellation.
+    Constellation,
+    /// A load originating in webdriver.
+    WebDriver,
+    /// A load originating in script.
+    Script(ImmutableOrigin),
+}
+
+/// can be passed to `LoadUrl` to load a page with GET/POST
+/// parameters or headers
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct LoadData {
+    /// The origin where the load started.
+    pub load_origin: LoadOrigin,
+    /// The URL.
+    pub url: ServoUrl,
+    /// The creator pipeline id if this is an about:blank load.
+    pub creator_pipeline_id: Option<PipelineId>,
+    /// The method.
+    #[serde(
+        deserialize_with = "::hyper_serde::deserialize",
+        serialize_with = "::hyper_serde::serialize"
+    )]
+    pub method: Method,
+    /// The headers.
+    #[serde(
+        deserialize_with = "::hyper_serde::deserialize",
+        serialize_with = "::hyper_serde::serialize"
+    )]
+    pub headers: HeaderMap,
+    /// The data that will be used as the body of the request.
+    pub data: Option<RequestBody>,
+    /// The result of evaluating a javascript scheme url.
+    pub js_eval_result: Option<JsEvalResult>,
+    /// The referrer.
+    pub referrer: Referrer,
+    /// The referrer policy.
+    pub referrer_policy: ReferrerPolicy,
+    /// The policy container.
+    pub policy_container: Option<PolicyContainer>,
+
+    /// The source to use instead of a network response for a srcdoc document.
+    pub srcdoc: String,
+    /// The inherited context is Secure, None if not inherited
+    pub inherited_secure_context: Option<bool>,
+    /// The inherited policy for upgrading insecure requests; None if not inherited.
+    pub inherited_insecure_requests_policy: Option<InsecureRequestsPolicy>,
+    /// Whether the page's ancestors have potentially trustworthy origin
+    pub has_trustworthy_ancestor_origin: bool,
+    /// Servo internal: if crash details are present, trigger a crash error page with these details.
+    pub crash: Option<String>,
+}
+
+/// The result of evaluating a javascript scheme url.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum JsEvalResult {
+    /// The js evaluation had a non-string result, 204 status code.
+    /// <https://html.spec.whatwg.org/multipage/#navigate> 12.11
+    NoContent,
+    /// The js evaluation had a string result.
+    Ok(Vec<u8>),
+}
+
+impl LoadData {
+    /// Create a new `LoadData` object.
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        load_origin: LoadOrigin,
+        url: ServoUrl,
+        creator_pipeline_id: Option<PipelineId>,
+        referrer: Referrer,
+        referrer_policy: ReferrerPolicy,
+        inherited_secure_context: Option<bool>,
+        inherited_insecure_requests_policy: Option<InsecureRequestsPolicy>,
+        has_trustworthy_ancestor_origin: bool,
+    ) -> LoadData {
+        LoadData {
+            load_origin,
+            url,
+            creator_pipeline_id,
+            method: Method::GET,
+            headers: HeaderMap::new(),
+            data: None,
+            js_eval_result: None,
+            referrer,
+            referrer_policy,
+            policy_container: None,
+            srcdoc: "".to_string(),
+            inherited_secure_context,
+            crash: None,
+            inherited_insecure_requests_policy,
+            has_trustworthy_ancestor_origin,
+        }
+    }
+}
+
+/// <https://html.spec.whatwg.org/multipage/#navigation-supporting-concepts:navigationhistorybehavior>
+#[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
+pub enum NavigationHistoryBehavior {
+    /// The default value, which will be converted very early in the navigate algorithm into "push"
+    /// or "replace". Usually it becomes "push", but under certain circumstances it becomes
+    /// "replace" instead.
+    #[default]
+    Auto,
+    /// A regular navigation which adds a new session history entry, and will clear the forward
+    /// session history.
+    Push,
+    /// A navigation that will replace the active session history entry.
+    Replace,
+}
+
+/// Entities required to spawn service workers
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct ScopeThings {
+    /// script resource url
+    pub script_url: ServoUrl,
+    /// network load origin of the resource
+    pub worker_load_origin: WorkerScriptLoadOrigin,
+    /// base resources required to create worker global scopes
+    pub init: WorkerGlobalScopeInit,
+    /// the port to receive devtools message from
+    pub devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>,
+    /// service worker id
+    pub worker_id: WorkerId,
+}
+
+/// Message that gets passed to service worker scope on postMessage
+#[derive(Debug, Deserialize, Serialize)]
+pub struct DOMMessage {
+    /// The origin of the message
+    pub origin: ImmutableOrigin,
+    /// The payload of the message
+    pub data: StructuredSerializedData,
+}
+
+/// Channels to allow service worker manager to communicate with constellation and resource thread
+#[derive(Deserialize, Serialize)]
+pub struct SWManagerSenders {
+    /// Sender of messages to the constellation.
+    pub swmanager_sender: IpcSender<SWManagerMsg>,
+    /// Sender for communicating with resource thread.
+    pub resource_sender: IpcSender<CoreResourceMsg>,
+    /// Sender of messages to the manager.
+    pub own_sender: IpcSender<ServiceWorkerMsg>,
+    /// Receiver of messages from the constellation.
+    pub receiver: IpcReceiver<ServiceWorkerMsg>,
+}
+
+/// Messages sent to Service Worker Manager thread
+#[derive(Debug, Deserialize, Serialize)]
+pub enum ServiceWorkerMsg {
+    /// Timeout message sent by active service workers
+    Timeout(ServoUrl),
+    /// Message sent by constellation to forward to a running service worker
+    ForwardDOMMessage(DOMMessage, ServoUrl),
+    /// <https://w3c.github.io/ServiceWorker/#schedule-job-algorithm>
+    ScheduleJob(Job),
+    /// Exit the service worker manager
+    Exit,
+}
+
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
+/// <https://w3c.github.io/ServiceWorker/#dfn-job-type>
+pub enum JobType {
+    /// <https://w3c.github.io/ServiceWorker/#register>
+    Register,
+    /// <https://w3c.github.io/ServiceWorker/#unregister-algorithm>
+    Unregister,
+    /// <https://w3c.github.io/ServiceWorker/#update-algorithm>
+    Update,
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+/// The kind of error the job promise should be rejected with.
+pub enum JobError {
+    /// <https://w3c.github.io/ServiceWorker/#reject-job-promise>
+    TypeError,
+    /// <https://w3c.github.io/ServiceWorker/#reject-job-promise>
+    SecurityError,
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+#[allow(clippy::large_enum_variant)]
+/// Messages sent from Job algorithms steps running in the SW manager,
+/// in order to resolve or reject the job promise.
+pub enum JobResult {
+    /// <https://w3c.github.io/ServiceWorker/#reject-job-promise>
+    RejectPromise(JobError),
+    /// <https://w3c.github.io/ServiceWorker/#resolve-job-promise>
+    ResolvePromise(Job, JobResultValue),
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+/// Jobs are resolved with the help of various values.
+pub enum JobResultValue {
+    /// Data representing a serviceworker registration.
+    Registration {
+        /// The Id of the registration.
+        id: ServiceWorkerRegistrationId,
+        /// The installing worker, if any.
+        installing_worker: Option<ServiceWorkerId>,
+        /// The waiting worker, if any.
+        waiting_worker: Option<ServiceWorkerId>,
+        /// The active worker, if any.
+        active_worker: Option<ServiceWorkerId>,
+    },
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+/// <https://w3c.github.io/ServiceWorker/#dfn-job>
+pub struct Job {
+    /// <https://w3c.github.io/ServiceWorker/#dfn-job-type>
+    pub job_type: JobType,
+    /// <https://w3c.github.io/ServiceWorker/#dfn-job-scope-url>
+    pub scope_url: ServoUrl,
+    /// <https://w3c.github.io/ServiceWorker/#dfn-job-script-url>
+    pub script_url: ServoUrl,
+    /// <https://w3c.github.io/ServiceWorker/#dfn-job-client>
+    pub client: IpcSender<JobResult>,
+    /// <https://w3c.github.io/ServiceWorker/#job-referrer>
+    pub referrer: ServoUrl,
+    /// Various data needed to process job.
+    pub scope_things: Option<ScopeThings>,
+}
+
+impl Job {
+    /// <https://w3c.github.io/ServiceWorker/#create-job-algorithm>
+    pub fn create_job(
+        job_type: JobType,
+        scope_url: ServoUrl,
+        script_url: ServoUrl,
+        client: IpcSender<JobResult>,
+        referrer: ServoUrl,
+        scope_things: Option<ScopeThings>,
+    ) -> Job {
+        Job {
+            job_type,
+            scope_url,
+            script_url,
+            client,
+            referrer,
+            scope_things,
+        }
+    }
+}
+
+impl PartialEq for Job {
+    /// Equality criteria as described in <https://w3c.github.io/ServiceWorker/#dfn-job-equivalent>
+    fn eq(&self, other: &Self) -> bool {
+        // TODO: match on job type, take worker type and `update_via_cache_mode` into account.
+        let same_job = self.job_type == other.job_type;
+        if same_job {
+            match self.job_type {
+                JobType::Register | JobType::Update => {
+                    self.scope_url == other.scope_url && self.script_url == other.script_url
+                },
+                JobType::Unregister => self.scope_url == other.scope_url,
+            }
+        } else {
+            false
+        }
+    }
+}
+
+/// Messages outgoing from the Service Worker Manager thread to constellation
+#[derive(Debug, Deserialize, Serialize)]
+pub enum SWManagerMsg {
+    /// Placeholder to keep the enum,
+    /// as it will be needed when implementing
+    /// <https://github.com/servo/servo/issues/24660>
+    PostMessageToClient,
+}
+
+/// Used to determine if a script has any pending asynchronous activity.
+#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
+pub enum DocumentState {
+    /// The document has been loaded and is idle.
+    Idle,
+    /// The document is either loading or waiting on an event.
+    Pending,
+}
+
+/// This trait allows creating a `ServiceWorkerManager` without depending on the `script`
+/// crate.
+pub trait ServiceWorkerManagerFactory {
+    /// Create a `ServiceWorkerManager`.
+    fn create(sw_senders: SWManagerSenders, origin: ImmutableOrigin);
+}
+
+/// Whether the sandbox attribute is present for an iframe element
+#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub enum IFrameSandboxState {
+    /// Sandbox attribute is present
+    IFrameSandboxed,
+    /// Sandbox attribute is not present
+    IFrameUnsandboxed,
+}
+
+/// Specifies the information required to load an auxiliary browsing context.
+#[derive(Debug, Deserialize, Serialize)]
+pub struct AuxiliaryWebViewCreationRequest {
+    /// Load data containing the url to load
+    pub load_data: LoadData,
+    /// The webview that caused this request.
+    pub opener_webview_id: WebViewId,
+    /// The pipeline opener browsing context.
+    pub opener_pipeline_id: PipelineId,
+    /// Sender for the constellation’s response to our request.
+    pub response_sender: IpcSender<Option<AuxiliaryWebViewCreationResponse>>,
+}
+
+/// Constellation’s response to auxiliary browsing context creation requests.
+#[derive(Debug, Deserialize, Serialize)]
+pub struct AuxiliaryWebViewCreationResponse {
+    /// The new webview ID.
+    pub new_webview_id: WebViewId,
+    /// The new pipeline ID.
+    pub new_pipeline_id: PipelineId,
+}
+
+/// Specifies the information required to load an iframe.
+#[derive(Debug, Deserialize, Serialize)]
+pub struct IFrameLoadInfo {
+    /// Pipeline ID of the parent of this iframe
+    pub parent_pipeline_id: PipelineId,
+    /// The ID for this iframe's nested browsing context.
+    pub browsing_context_id: BrowsingContextId,
+    /// The ID for the top-level ancestor browsing context of this iframe's nested browsing context.
+    pub webview_id: WebViewId,
+    /// The new pipeline ID that the iframe has generated.
+    pub new_pipeline_id: PipelineId,
+    ///  Whether this iframe should be considered private
+    pub is_private: bool,
+    ///  Whether this iframe should be considered secure
+    pub inherited_secure_context: Option<bool>,
+    /// Whether this load should replace the current entry (reload). If true, the current
+    /// entry will be replaced instead of a new entry being added.
+    pub history_handling: NavigationHistoryBehavior,
+}
+
+/// Specifies the information required to load a URL in an iframe.
+#[derive(Debug, Deserialize, Serialize)]
+pub struct IFrameLoadInfoWithData {
+    /// The information required to load an iframe.
+    pub info: IFrameLoadInfo,
+    /// Load data containing the url to load
+    pub load_data: LoadData,
+    /// The old pipeline ID for this iframe, if a page was previously loaded.
+    pub old_pipeline_id: Option<PipelineId>,
+    /// Sandbox type of this iframe
+    pub sandbox: IFrameSandboxState,
+    /// The initial viewport size for this iframe.
+    pub viewport_details: ViewportDetails,
+}
+
+/// Resources required by workerglobalscopes
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct WorkerGlobalScopeInit {
+    /// Chan to a resource thread
+    pub resource_threads: ResourceThreads,
+    /// Chan to the memory profiler
+    pub mem_profiler_chan: mem::ProfilerChan,
+    /// Chan to the time profiler
+    pub time_profiler_chan: profile_time::ProfilerChan,
+    /// To devtools sender
+    pub to_devtools_sender: Option<IpcSender<ScriptToDevtoolsControlMsg>>,
+    /// From devtools sender
+    pub from_devtools_sender: Option<IpcSender<DevtoolScriptControlMsg>>,
+    /// Messages to send to constellation
+    pub script_to_constellation_chan: ScriptToConstellationChan,
+    /// The worker id
+    pub worker_id: WorkerId,
+    /// The pipeline id
+    pub pipeline_id: PipelineId,
+    /// The origin
+    pub origin: ImmutableOrigin,
+    /// The creation URL
+    pub creation_url: Option<ServoUrl>,
+    /// True if secure context
+    pub inherited_secure_context: Option<bool>,
+}
+
+/// Common entities representing a network load origin
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct WorkerScriptLoadOrigin {
+    /// referrer url
+    pub referrer_url: Option<ServoUrl>,
+    /// the referrer policy which is used
+    pub referrer_policy: ReferrerPolicy,
+    /// the pipeline id of the entity requesting the load
+    pub pipeline_id: PipelineId,
+}
+
+/// An iframe sizing operation.
+#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
+pub struct IFrameSizeMsg {
+    /// The child browsing context for this iframe.
+    pub browsing_context_id: BrowsingContextId,
+    /// The size and scale factor of the iframe.
+    pub size: ViewportDetails,
+    /// The kind of sizing operation.
+    pub type_: WindowSizeType,
+}
+
+/// Messages from the script to the constellation.
+#[derive(Deserialize, IntoStaticStr, Serialize)]
+pub enum ScriptToConstellationMessage {
+    /// Request to complete the transfer of a set of ports to a router.
+    CompleteMessagePortTransfer(MessagePortRouterId, Vec<MessagePortId>),
+    /// The results of attempting to complete the transfer of a batch of ports.
+    MessagePortTransferResult(
+        /* The router whose transfer of ports succeeded, if any */
+        Option<MessagePortRouterId>,
+        /* The ids of ports transferred successfully */
+        Vec<MessagePortId>,
+        /* The ids, and buffers, of ports whose transfer failed */
+        HashMap<MessagePortId, PortTransferInfo>,
+    ),
+    /// A new message-port was created or transferred, with corresponding control-sender.
+    NewMessagePort(MessagePortRouterId, MessagePortId),
+    /// A global has started managing message-ports
+    NewMessagePortRouter(MessagePortRouterId, IpcSender<MessagePortMsg>),
+    /// A global has stopped managing message-ports
+    RemoveMessagePortRouter(MessagePortRouterId),
+    /// A task requires re-routing to an already shipped message-port.
+    RerouteMessagePort(MessagePortId, PortMessageTask),
+    /// A message-port was shipped, let the entangled port know.
+    MessagePortShipped(MessagePortId),
+    /// Entangle two message-ports.
+    EntanglePorts(MessagePortId, MessagePortId),
+    /// Disentangle two message-ports.
+    /// The first is the initiator, the second the other port,
+    /// unless the message is sent to complete a disentanglement,
+    /// in which case the first one is the other port,
+    /// and the second is none.
+    DisentanglePorts(MessagePortId, Option<MessagePortId>),
+    /// A global has started managing broadcast-channels.
+    NewBroadcastChannelRouter(
+        BroadcastChannelRouterId,
+        IpcSender<BroadcastMsg>,
+        ImmutableOrigin,
+    ),
+    /// A global has stopped managing broadcast-channels.
+    RemoveBroadcastChannelRouter(BroadcastChannelRouterId, ImmutableOrigin),
+    /// A global started managing broadcast channels for a given channel-name.
+    NewBroadcastChannelNameInRouter(BroadcastChannelRouterId, String, ImmutableOrigin),
+    /// A global stopped managing broadcast channels for a given channel-name.
+    RemoveBroadcastChannelNameInRouter(BroadcastChannelRouterId, String, ImmutableOrigin),
+    /// Broadcast a message to all same-origin broadcast channels,
+    /// excluding the source of the broadcast.
+    ScheduleBroadcast(BroadcastChannelRouterId, BroadcastMsg),
+    /// Forward a message to the embedder.
+    ForwardToEmbedder(EmbedderMsg),
+    /// Broadcast a storage event to every same-origin pipeline.
+    /// The strings are key, old value and new value.
+    BroadcastStorageEvent(
+        StorageType,
+        ServoUrl,
+        Option<String>,
+        Option<String>,
+        Option<String>,
+    ),
+    /// Indicates whether this pipeline is currently running animations.
+    ChangeRunningAnimationsState(AnimationState),
+    /// Requests that a new 2D canvas thread be created. (This is done in the constellation because
+    /// 2D canvases may use the GPU and we don't want to give untrusted content access to the GPU.)
+    CreateCanvasPaintThread(
+        UntypedSize2D<u64>,
+        IpcSender<(IpcSender<CanvasMsg>, CanvasId, ImageKey)>,
+    ),
+    /// Notifies the constellation that this pipeline is requesting focus.
+    ///
+    /// When this message is sent, the sender pipeline has already its local
+    /// focus state updated. The constellation, after receiving this message,
+    /// will broadcast messages to other pipelines that are affected by this
+    /// focus operation.
+    ///
+    /// The first field contains the browsing context ID of the container
+    /// element if one was focused.
+    ///
+    /// The second field is a sequence number that the constellation should use
+    /// when sending a focus-related message to the sender pipeline next time.
+    Focus(Option<BrowsingContextId>, FocusSequenceNumber),
+    /// Requests the constellation to focus the specified browsing context.
+    FocusRemoteDocument(BrowsingContextId),
+    /// Get the top-level browsing context info for a given browsing context.
+    GetTopForBrowsingContext(BrowsingContextId, IpcSender<Option<WebViewId>>),
+    /// Get the browsing context id of the browsing context in which pipeline is
+    /// embedded and the parent pipeline id of that browsing context.
+    GetBrowsingContextInfo(
+        PipelineId,
+        IpcSender<Option<(BrowsingContextId, Option<PipelineId>)>>,
+    ),
+    /// Get the nth child browsing context ID for a given browsing context, sorted in tree order.
+    GetChildBrowsingContextId(
+        BrowsingContextId,
+        usize,
+        IpcSender<Option<BrowsingContextId>>,
+    ),
+    /// All pending loads are complete, and the `load` event for this pipeline
+    /// has been dispatched.
+    LoadComplete,
+    /// A new load has been requested, with an option to replace the current entry once loaded
+    /// instead of adding a new entry.
+    LoadUrl(LoadData, NavigationHistoryBehavior),
+    /// Abort loading after sending a LoadUrl message.
+    AbortLoadUrl,
+    /// Post a message to the currently active window of a given browsing context.
+    PostMessage {
+        /// The target of the posted message.
+        target: BrowsingContextId,
+        /// The source of the posted message.
+        source: PipelineId,
+        /// The expected origin of the target.
+        target_origin: Option<ImmutableOrigin>,
+        /// The source origin of the message.
+        /// <https://html.spec.whatwg.org/multipage/#dom-messageevent-origin>
+        source_origin: ImmutableOrigin,
+        /// The data to be posted.
+        data: StructuredSerializedData,
+    },
+    /// Inform the constellation that a fragment was navigated to and whether or not it was a replacement navigation.
+    NavigatedToFragment(ServoUrl, NavigationHistoryBehavior),
+    /// HTMLIFrameElement Forward or Back traversal.
+    TraverseHistory(TraversalDirection),
+    /// Inform the constellation of a pushed history state.
+    PushHistoryState(HistoryStateId, ServoUrl),
+    /// Inform the constellation of a replaced history state.
+    ReplaceHistoryState(HistoryStateId, ServoUrl),
+    /// Gets the length of the joint session history from the constellation.
+    JointSessionHistoryLength(IpcSender<u32>),
+    /// Notification that this iframe should be removed.
+    /// Returns a list of pipelines which were closed.
+    RemoveIFrame(BrowsingContextId, IpcSender<Vec<PipelineId>>),
+    /// Successful response to [crate::ConstellationControlMsg::SetThrottled].
+    SetThrottledComplete(bool),
+    /// A load has been requested in an IFrame.
+    ScriptLoadedURLInIFrame(IFrameLoadInfoWithData),
+    /// A load of the initial `about:blank` has been completed in an IFrame.
+    ScriptNewIFrame(IFrameLoadInfoWithData),
+    /// Script has opened a new auxiliary browsing context.
+    CreateAuxiliaryWebView(AuxiliaryWebViewCreationRequest),
+    /// Mark a new document as active
+    ActivateDocument,
+    /// Set the document state for a pipeline (used by screenshot / reftests)
+    SetDocumentState(DocumentState),
+    /// Update the layout epoch in the constellation (used by screenshot / reftests).
+    SetLayoutEpoch(Epoch, IpcSender<bool>),
+    /// Update the pipeline Url, which can change after redirections.
+    SetFinalUrl(ServoUrl),
+    /// Script has handled a touch event, and either prevented or allowed default actions.
+    TouchEventProcessed(TouchEventResult),
+    /// A log entry, with the top-level browsing context id and thread name
+    LogEntry(Option<String>, LogEntry),
+    /// Discard the document.
+    DiscardDocument,
+    /// Discard the browsing context.
+    DiscardTopLevelBrowsingContext,
+    /// Notifies the constellation that this pipeline has exited.
+    PipelineExited,
+    /// Send messages from postMessage calls from serviceworker
+    /// to constellation for storing in service worker manager
+    ForwardDOMMessage(DOMMessage, ServoUrl),
+    /// <https://w3c.github.io/ServiceWorker/#schedule-job-algorithm>
+    ScheduleJob(Job),
+    /// Notifies the constellation about media session events
+    /// (i.e. when there is metadata for the active media session, playback state changes...).
+    MediaSessionEvent(PipelineId, MediaSessionEvent),
+    #[cfg(feature = "webgpu")]
+    /// Create a WebGPU Adapter instance
+    RequestAdapter(
+        IpcSender<WebGPUAdapterResponse>,
+        wgpu_core::instance::RequestAdapterOptions,
+        wgpu_core::id::AdapterId,
+    ),
+    #[cfg(feature = "webgpu")]
+    /// Get WebGPU channel
+    GetWebGPUChan(IpcSender<Option<WebGPU>>),
+    /// Notify the constellation of a pipeline's document's title.
+    TitleChanged(PipelineId, String),
+    /// Notify the constellation that the size of some `<iframe>`s has changed.
+    IFrameSizes(Vec<IFrameSizeMsg>),
+    /// Request results from the memory reporter.
+    ReportMemory(IpcSender<MemoryReportResult>),
+    /// Return the result of the evaluated JavaScript with the given [`JavaScriptEvaluationId`].
+    FinishJavaScriptEvaluation(
+        JavaScriptEvaluationId,
+        Result<JSValue, JavaScriptEvaluationError>,
+    ),
+}
+
+impl fmt::Debug for ScriptToConstellationMessage {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        let variant_string: &'static str = self.into();
+        write!(formatter, "ScriptMsg::{variant_string}")
+    }
+}
diff --git a/components/shared/constellation/lib.rs b/components/shared/constellation/lib.rs
index 38013398dd6..d85fbe31bdf 100644
--- a/components/shared/constellation/lib.rs
+++ b/components/shared/constellation/lib.rs
@@ -8,30 +8,35 @@
 //! embedding/rendering layer all the way to script, thus it should have very minimal dependencies
 //! on other parts of Servo.
 
-use std::collections::HashMap;
-use std::ffi::c_void;
+mod from_script_message;
+mod structured_data;
+
+use std::collections::{HashMap, VecDeque};
 use std::fmt;
 use std::time::Duration;
 
 use base::Epoch;
 use base::cross_process_instant::CrossProcessInstant;
-use base::id::{PipelineId, ScrollTreeNodeId, WebViewId};
-use bitflags::bitflags;
-use embedder_traits::{Cursor, InputEvent, MediaSessionActionType, Theme, WebDriverCommandMsg};
-use euclid::{Scale, Size2D, Vector2D};
+use base::id::{MessagePortId, PipelineId, WebViewId};
+use embedder_traits::{
+    CompositorHitTestResult, Cursor, InputEvent, JavaScriptEvaluationId, MediaSessionActionType,
+    Theme, ViewportDetails, WebDriverCommandMsg,
+};
+use euclid::Vector2D;
+pub use from_script_message::*;
 use ipc_channel::ipc::IpcSender;
-use malloc_size_of::malloc_size_of_is_0;
 use malloc_size_of_derive::MallocSizeOf;
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use servo_url::ServoUrl;
+use serde::{Deserialize, Serialize};
+use servo_url::{ImmutableOrigin, ServoUrl};
+pub use structured_data::*;
 use strum_macros::IntoStaticStr;
-use style_traits::CSSPixel;
 use webrender_api::ExternalScrollId;
-use webrender_api::units::{DevicePixel, LayoutPixel};
+use webrender_api::units::LayoutPixel;
 
-/// Messages to the constellation.
+/// Messages to the Constellation from the embedding layer, whether from `ServoRenderer` or
+/// from `libservo` itself.
 #[derive(IntoStaticStr)]
-pub enum ConstellationMsg {
+pub enum EmbedderToConstellationMessage {
     /// Exit the constellation.
     Exit,
     /// Request that the constellation send the current focused top-level browsing context id,
@@ -47,12 +52,13 @@ pub enum ConstellationMsg {
     ClearCache,
     /// Request to traverse the joint session history of the provided browsing context.
     TraverseHistory(WebViewId, TraversalDirection),
-    /// Inform the constellation of a window being resized.
-    WindowSize(WebViewId, WindowSizeData, WindowSizeType),
+    /// Inform the Constellation that a `WebView`'s [`ViewportDetails`] have changed.
+    ChangeViewportDetails(WebViewId, ViewportDetails, WindowSizeType),
     /// Inform the constellation of a theme change.
     ThemeChange(Theme),
-    /// Requests that the constellation instruct layout to begin a new tick of the animation.
-    TickAnimation(PipelineId, AnimationTickType),
+    /// Requests that the constellation instruct script/layout to try to layout again and tick
+    /// animations.
+    TickAnimation(Vec<WebViewId>),
     /// Dispatch a webdriver command
     WebDriverCommand(WebDriverCommandMsg),
     /// Reload a top-level browsing context.
@@ -60,7 +66,7 @@ pub enum ConstellationMsg {
     /// A log entry, with the top-level browsing context id and thread name
     LogEntry(Option<WebViewId>, Option<String>, LogEntry),
     /// Create a new top level browsing context.
-    NewWebView(ServoUrl, WebViewId),
+    NewWebView(ServoUrl, WebViewId, ViewportDetails),
     /// Close a top level browsing context.
     CloseWebView(WebViewId),
     /// Panic a top level browsing context.
@@ -86,6 +92,9 @@ pub enum ConstellationMsg {
     SetScrollStates(PipelineId, Vec<ScrollState>),
     /// Notify the constellation that a particular paint metric event has happened for the given pipeline.
     PaintMetric(PipelineId, PaintMetricEvent),
+    /// Evaluate a JavaScript string in the context of a `WebView`. When execution is complete or an
+    /// error is encountered, a correpsonding message will be sent to the embedding layer.
+    EvaluateJavaScript(WebViewId, JavaScriptEvaluationId, String),
 }
 
 /// A description of a paint metric that is sent from the Servo renderer to the
@@ -95,7 +104,7 @@ pub enum PaintMetricEvent {
     FirstContentfulPaint(CrossProcessInstant, bool /* first_reflow */),
 }
 
-impl fmt::Debug for ConstellationMsg {
+impl fmt::Debug for EmbedderToConstellationMessage {
     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         let variant_string: &'static str = self.into();
         write!(formatter, "ConstellationMsg::{variant_string}")
@@ -115,17 +124,6 @@ pub enum LogEntry {
     Warn(String),
 }
 
-/// Data about the window size.
-#[derive(Clone, Copy, Debug, Deserialize, MallocSizeOf, PartialEq, Serialize)]
-pub struct WindowSizeData {
-    /// The size of the initial layout viewport, before parsing an
-    /// <http://www.w3.org/TR/css-device-adapt/#initial-viewport>
-    pub initial_viewport: Size2D<f32, CSSPixel>,
-
-    /// The resolution of the window in dppx, not including any "pinch zoom" factor.
-    pub device_pixel_ratio: Scale<f32, CSSPixel, DevicePixel>,
-}
-
 /// The type of window size change.
 #[derive(Clone, Copy, Debug, Deserialize, Eq, MallocSizeOf, PartialEq, Serialize)]
 pub enum WindowSizeType {
@@ -135,39 +133,6 @@ pub enum WindowSizeType {
     Resize,
 }
 
-bitflags! {
-    #[derive(Debug, Default, Deserialize, Serialize)]
-    /// Specifies if rAF should be triggered and/or CSS Animations and Transitions.
-    pub struct AnimationTickType: u8 {
-        /// Trigger a call to requestAnimationFrame.
-        const REQUEST_ANIMATION_FRAME = 0b001;
-        /// Trigger restyles for CSS Animations and Transitions.
-        const CSS_ANIMATIONS_AND_TRANSITIONS = 0b010;
-    }
-}
-
-/// The result of a hit test in the compositor.
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct CompositorHitTestResult {
-    /// The pipeline id of the resulting item.
-    pub pipeline_id: PipelineId,
-
-    /// The hit test point in the item's viewport.
-    pub point_in_viewport: euclid::default::Point2D<f32>,
-
-    /// The hit test point relative to the item itself.
-    pub point_relative_to_item: euclid::default::Point2D<f32>,
-
-    /// The node address of the hit test result.
-    pub node: UntrustedNodeAddress,
-
-    /// The cursor that should be used when hovering the item hit by the hit test.
-    pub cursor: Option<Cursor>,
-
-    /// The scroll tree node associated with this hit test item.
-    pub scroll_tree_node: ScrollTreeNodeId,
-}
-
 /// The scroll state of a stacking context.
 #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
 pub struct ScrollState {
@@ -177,43 +142,6 @@ pub struct ScrollState {
     pub scroll_offset: Vector2D<f32, LayoutPixel>,
 }
 
-/// The address of a node. Layout sends these back. They must be validated via
-/// `from_untrusted_node_address` before they can be used, because we do not trust layout.
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub struct UntrustedNodeAddress(pub *const c_void);
-
-malloc_size_of_is_0!(UntrustedNodeAddress);
-
-#[allow(unsafe_code)]
-unsafe impl Send for UntrustedNodeAddress {}
-
-impl From<style_traits::dom::OpaqueNode> for UntrustedNodeAddress {
-    fn from(o: style_traits::dom::OpaqueNode) -> Self {
-        UntrustedNodeAddress(o.0 as *const c_void)
-    }
-}
-
-impl Serialize for UntrustedNodeAddress {
-    fn serialize<S: Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
-        (self.0 as usize).serialize(s)
-    }
-}
-
-impl<'de> Deserialize<'de> for UntrustedNodeAddress {
-    fn deserialize<D: Deserializer<'de>>(d: D) -> Result<UntrustedNodeAddress, D::Error> {
-        let value: usize = Deserialize::deserialize(d)?;
-        Ok(UntrustedNodeAddress::from_id(value))
-    }
-}
-
-impl UntrustedNodeAddress {
-    /// Creates an `UntrustedNodeAddress` from the given pointer address value.
-    #[inline]
-    pub fn from_id(id: usize) -> UntrustedNodeAddress {
-        UntrustedNodeAddress(id as *const c_void)
-    }
-}
-
 /// The direction of a history traversal
 #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
 pub enum TraversalDirection {
@@ -222,3 +150,39 @@ pub enum TraversalDirection {
     /// Travel backward the given number of documents.
     Back(usize),
 }
+
+/// A task on the <https://html.spec.whatwg.org/multipage/#port-message-queue>
+#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
+pub struct PortMessageTask {
+    /// The origin of this task.
+    pub origin: ImmutableOrigin,
+    /// A data-holder for serialized data and transferred objects.
+    pub data: StructuredSerializedData,
+}
+
+/// The information needed by a global to process the transfer of a port.
+#[derive(Debug, Deserialize, MallocSizeOf, Serialize)]
+pub struct PortTransferInfo {
+    /// <https://html.spec.whatwg.org/multipage/#port-message-queue>
+    pub port_message_queue: VecDeque<PortMessageTask>,
+    /// A boolean indicating whether the port has been disentangled while in transfer,
+    /// if so, the disentanglement should be completed along with the transfer.
+    /// <https://html.spec.whatwg.org/multipage/#disentangle>
+    pub disentangled: bool,
+}
+
+/// Messages for communication between the constellation and a global managing ports.
+#[derive(Debug, Deserialize, Serialize)]
+#[allow(clippy::large_enum_variant)]
+pub enum MessagePortMsg {
+    /// Complete the transfer for a batch of ports.
+    CompleteTransfer(HashMap<MessagePortId, PortTransferInfo>),
+    /// Complete the transfer of a single port,
+    /// whose transfer was pending because it had been requested
+    /// while a previous failed transfer was being rolled-back.
+    CompletePendingTransfer(MessagePortId, PortTransferInfo),
+    /// <https://html.spec.whatwg.org/multipage/#disentangle>
+    CompleteDisentanglement(MessagePortId),
+    /// Handle a new port-message-task.
+    NewTask(MessagePortId, PortMessageTask),
+}
diff --git a/components/shared/constellation/structured_data/mod.rs b/components/shared/constellation/structured_data/mod.rs
new file mode 100644
index 00000000000..3fb9d0c5f67
--- /dev/null
+++ b/components/shared/constellation/structured_data/mod.rs
@@ -0,0 +1,92 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! This module contains implementations of structured data as described in
+//! <https://html.spec.whatwg.org/multipage/#safe-passing-of-structured-data>
+
+mod serializable;
+mod transferable;
+
+use std::collections::HashMap;
+
+use base::id::{BlobId, DomExceptionId, DomPointId, MessagePortId};
+use log::warn;
+use malloc_size_of_derive::MallocSizeOf;
+use serde::{Deserialize, Serialize};
+pub use serializable::*;
+use strum::IntoEnumIterator;
+pub use transferable::*;
+
+/// A data-holder for serialized data and transferred objects.
+/// <https://html.spec.whatwg.org/multipage/#structuredserializewithtransfer>
+#[derive(Clone, Debug, Default, Deserialize, MallocSizeOf, Serialize)]
+pub struct StructuredSerializedData {
+    /// Data serialized by SpiderMonkey.
+    pub serialized: Vec<u8>,
+    /// Serialized in a structured callback,
+    pub blobs: Option<HashMap<BlobId, BlobImpl>>,
+    /// Serialized point objects.
+    pub points: Option<HashMap<DomPointId, DomPoint>>,
+    /// Serialized exception objects.
+    pub exceptions: Option<HashMap<DomExceptionId, DomException>>,
+    /// Transferred objects.
+    pub ports: Option<HashMap<MessagePortId, MessagePortImpl>>,
+}
+
+impl StructuredSerializedData {
+    fn is_empty(&self, val: Transferrable) -> bool {
+        fn is_field_empty<K, V>(field: &Option<HashMap<K, V>>) -> bool {
+            field.as_ref().is_some_and(|h| h.is_empty())
+        }
+        match val {
+            Transferrable::MessagePort => is_field_empty(&self.ports),
+            Transferrable::ReadableStream => is_field_empty(&self.ports),
+            Transferrable::WritableStream => is_field_empty(&self.ports),
+            Transferrable::TransformStream => is_field_empty(&self.ports),
+        }
+    }
+
+    /// Clone all values of the same type stored in this StructuredSerializedData
+    /// into another instance.
+    fn clone_all_of_type<T: BroadcastClone>(&self, cloned: &mut StructuredSerializedData) {
+        let existing = T::source(self);
+        let Some(existing) = existing else { return };
+        let mut clones = HashMap::with_capacity(existing.len());
+
+        for (original_id, obj) in existing.iter() {
+            if let Some(clone) = obj.clone_for_broadcast() {
+                clones.insert(*original_id, clone);
+            }
+        }
+
+        *T::destination(cloned) = Some(clones);
+    }
+
+    /// Clone the serialized data for use with broadcast-channels.
+    pub fn clone_for_broadcast(&self) -> StructuredSerializedData {
+        for transferrable in Transferrable::iter() {
+            if !self.is_empty(transferrable) {
+                // Not panicking only because this is called from the constellation.
+                warn!(
+                    "Attempt to broadcast structured serialized data including {:?} (should never happen).",
+                    transferrable,
+                );
+            }
+        }
+
+        let serialized = self.serialized.clone();
+
+        let mut cloned = StructuredSerializedData {
+            serialized,
+            ..Default::default()
+        };
+
+        for serializable in Serializable::iter() {
+            let clone_impl = serializable.clone_values();
+            clone_impl(self, &mut cloned);
+        }
+
+        cloned
+    }
+}
diff --git a/components/shared/constellation/structured_data/serializable.rs b/components/shared/constellation/structured_data/serializable.rs
new file mode 100644
index 00000000000..194f0567c51
--- /dev/null
+++ b/components/shared/constellation/structured_data/serializable.rs
@@ -0,0 +1,314 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! This module contains implementations in script that are serializable,
+//! as per <https://html.spec.whatwg.org/multipage/#serializable-objects>.
+//! The implementations are here instead of in script as they need to
+//! be passed through the Constellation.
+
+use std::cell::RefCell;
+use std::collections::HashMap;
+use std::path::PathBuf;
+
+use base::id::{BlobId, DomExceptionId, DomPointId};
+use malloc_size_of_derive::MallocSizeOf;
+use net_traits::filemanager_thread::RelativePos;
+use serde::{Deserialize, Serialize};
+use servo_url::ImmutableOrigin;
+use strum::EnumIter;
+use uuid::Uuid;
+
+use super::StructuredSerializedData;
+
+pub(crate) trait BroadcastClone
+where
+    Self: Sized,
+{
+    /// The ID type that uniquely identify each value.
+    type Id: Eq + std::hash::Hash + Copy;
+    /// Clone this value so that it can be reused with a broadcast channel.
+    /// Only return None if cloning is impossible.
+    fn clone_for_broadcast(&self) -> Option<Self>;
+    /// The field from which to clone values.
+    fn source(data: &StructuredSerializedData) -> &Option<HashMap<Self::Id, Self>>;
+    /// The field into which to place cloned values.
+    fn destination(data: &mut StructuredSerializedData) -> &mut Option<HashMap<Self::Id, Self>>;
+}
+
+/// All the DOM interfaces that can be serialized.
+#[derive(Clone, Copy, Debug, EnumIter)]
+pub enum Serializable {
+    /// The `Blob` interface.
+    Blob,
+    /// The `DOMPoint` interface.
+    DomPoint,
+    /// The `DOMPointReadOnly` interface.
+    DomPointReadOnly,
+    /// The `DOMException` interface.
+    DomException,
+}
+
+impl Serializable {
+    pub(super) fn clone_values(
+        &self,
+    ) -> fn(&StructuredSerializedData, &mut StructuredSerializedData) {
+        match self {
+            Serializable::Blob => StructuredSerializedData::clone_all_of_type::<BlobImpl>,
+            Serializable::DomPointReadOnly => {
+                StructuredSerializedData::clone_all_of_type::<DomPoint>
+            },
+            Serializable::DomPoint => StructuredSerializedData::clone_all_of_type::<DomPoint>,
+            Serializable::DomException => {
+                StructuredSerializedData::clone_all_of_type::<DomException>
+            },
+        }
+    }
+}
+
+/// Message for communication between the constellation and a global managing broadcast channels.
+#[derive(Debug, Deserialize, Serialize)]
+pub struct BroadcastMsg {
+    /// The origin of this message.
+    pub origin: ImmutableOrigin,
+    /// The name of the channel.
+    pub channel_name: String,
+    /// A data-holder for serialized data.
+    pub data: StructuredSerializedData,
+}
+
+impl Clone for BroadcastMsg {
+    fn clone(&self) -> BroadcastMsg {
+        BroadcastMsg {
+            data: self.data.clone_for_broadcast(),
+            origin: self.origin.clone(),
+            channel_name: self.channel_name.clone(),
+        }
+    }
+}
+
+/// File-based blob
+#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
+pub struct FileBlob {
+    #[ignore_malloc_size_of = "Uuid are hard(not really)"]
+    id: Uuid,
+    #[ignore_malloc_size_of = "PathBuf are hard"]
+    name: Option<PathBuf>,
+    cache: RefCell<Option<Vec<u8>>>,
+    size: u64,
+}
+
+impl FileBlob {
+    /// Create a new file blob.
+    pub fn new(id: Uuid, name: Option<PathBuf>, cache: Option<Vec<u8>>, size: u64) -> FileBlob {
+        FileBlob {
+            id,
+            name,
+            cache: RefCell::new(cache),
+            size,
+        }
+    }
+
+    /// Get the size of the file.
+    pub fn get_size(&self) -> u64 {
+        self.size
+    }
+
+    /// Get the cached file data, if any.
+    pub fn get_cache(&self) -> Option<Vec<u8>> {
+        self.cache.borrow().clone()
+    }
+
+    /// Cache data.
+    pub fn cache_bytes(&self, bytes: Vec<u8>) {
+        *self.cache.borrow_mut() = Some(bytes);
+    }
+
+    /// Get the file id.
+    pub fn get_id(&self) -> Uuid {
+        self.id
+    }
+}
+
+impl BroadcastClone for BlobImpl {
+    type Id = BlobId;
+
+    fn source(
+        data: &StructuredSerializedData,
+    ) -> &Option<std::collections::HashMap<Self::Id, Self>> {
+        &data.blobs
+    }
+
+    fn destination(
+        data: &mut StructuredSerializedData,
+    ) -> &mut Option<std::collections::HashMap<Self::Id, Self>> {
+        &mut data.blobs
+    }
+
+    fn clone_for_broadcast(&self) -> Option<Self> {
+        let type_string = self.type_string();
+
+        if let BlobData::Memory(bytes) = self.blob_data() {
+            let blob_clone = BlobImpl::new_from_bytes(bytes.clone(), type_string);
+
+            // Note: we insert the blob at the original id,
+            // otherwise this will not match the storage key as serialized by SM in `serialized`.
+            // The clone has it's own new Id however.
+            return Some(blob_clone);
+        } else {
+            // Not panicking only because this is called from the constellation.
+            log::warn!("Serialized blob not in memory format(should never happen).");
+        }
+        None
+    }
+}
+
+/// The data backing a DOM Blob.
+#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
+pub struct BlobImpl {
+    /// UUID of the blob.
+    blob_id: BlobId,
+    /// Content-type string
+    type_string: String,
+    /// Blob data-type.
+    blob_data: BlobData,
+    /// Sliced blobs referring to this one.
+    slices: Vec<BlobId>,
+}
+
+/// Different backends of Blob
+#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
+pub enum BlobData {
+    /// File-based blob, whose content lives in the net process
+    File(FileBlob),
+    /// Memory-based blob, whose content lives in the script process
+    Memory(Vec<u8>),
+    /// Sliced blob, including parent blob-id and
+    /// relative positions of current slicing range,
+    /// IMPORTANT: The depth of tree is only two, i.e. the parent Blob must be
+    /// either File-based or Memory-based
+    Sliced(BlobId, RelativePos),
+}
+
+impl BlobImpl {
+    /// Construct memory-backed BlobImpl
+    pub fn new_from_bytes(bytes: Vec<u8>, type_string: String) -> BlobImpl {
+        let blob_id = BlobId::new();
+        let blob_data = BlobData::Memory(bytes);
+        BlobImpl {
+            blob_id,
+            type_string,
+            blob_data,
+            slices: vec![],
+        }
+    }
+
+    /// Construct file-backed BlobImpl from File ID
+    pub fn new_from_file(file_id: Uuid, name: PathBuf, size: u64, type_string: String) -> BlobImpl {
+        let blob_id = BlobId::new();
+        let blob_data = BlobData::File(FileBlob {
+            id: file_id,
+            name: Some(name),
+            cache: RefCell::new(None),
+            size,
+        });
+        BlobImpl {
+            blob_id,
+            type_string,
+            blob_data,
+            slices: vec![],
+        }
+    }
+
+    /// Construct a BlobImpl from a slice of a parent.
+    pub fn new_sliced(range: RelativePos, parent: BlobId, type_string: String) -> BlobImpl {
+        let blob_id = BlobId::new();
+        let blob_data = BlobData::Sliced(parent, range);
+        BlobImpl {
+            blob_id,
+            type_string,
+            blob_data,
+            slices: vec![],
+        }
+    }
+
+    /// Get a clone of the blob-id
+    pub fn blob_id(&self) -> BlobId {
+        self.blob_id
+    }
+
+    /// Get a clone of the type-string
+    pub fn type_string(&self) -> String {
+        self.type_string.clone()
+    }
+
+    /// Get a mutable ref to the data
+    pub fn blob_data(&self) -> &BlobData {
+        &self.blob_data
+    }
+
+    /// Get a mutable ref to the data
+    pub fn blob_data_mut(&mut self) -> &mut BlobData {
+        &mut self.blob_data
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
+/// A serializable version of the DOMPoint/DOMPointReadOnly interface.
+pub struct DomPoint {
+    /// The x coordinate.
+    pub x: f64,
+    /// The y coordinate.
+    pub y: f64,
+    /// The z coordinate.
+    pub z: f64,
+    /// The w coordinate.
+    pub w: f64,
+}
+
+impl BroadcastClone for DomPoint {
+    type Id = DomPointId;
+
+    fn source(
+        data: &StructuredSerializedData,
+    ) -> &Option<std::collections::HashMap<Self::Id, Self>> {
+        &data.points
+    }
+
+    fn destination(
+        data: &mut StructuredSerializedData,
+    ) -> &mut Option<std::collections::HashMap<Self::Id, Self>> {
+        &mut data.points
+    }
+
+    fn clone_for_broadcast(&self) -> Option<Self> {
+        Some(self.clone())
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
+/// A serializable version of the DOMException interface.
+pub struct DomException {
+    pub message: String,
+    pub name: String,
+}
+
+impl BroadcastClone for DomException {
+    type Id = DomExceptionId;
+
+    fn source(
+        data: &StructuredSerializedData,
+    ) -> &Option<std::collections::HashMap<Self::Id, Self>> {
+        &data.exceptions
+    }
+
+    fn destination(
+        data: &mut StructuredSerializedData,
+    ) -> &mut Option<std::collections::HashMap<Self::Id, Self>> {
+        &mut data.exceptions
+    }
+
+    fn clone_for_broadcast(&self) -> Option<Self> {
+        Some(self.clone())
+    }
+}
diff --git a/components/shared/script/transferable.rs b/components/shared/constellation/structured_data/transferable.rs
similarity index 85%
rename from components/shared/script/transferable.rs
rename to components/shared/constellation/structured_data/transferable.rs
index 8344dd493b0..528c1e79e65 100644
--- a/components/shared/script/transferable.rs
+++ b/components/shared/constellation/structured_data/transferable.rs
@@ -2,20 +2,33 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-//! This module contains implementations in script that are transferable.
-//! The implementations are here instead of in script
-//! so that the other modules involved in the transfer don't have
-//! to depend on script.
+//! This module contains implementations in script that are transferable as per
+//! <https://html.spec.whatwg.org/multipage/#transferable-objects>. The implementations are here
+//! instead of in script as they need to be passed through the Constellation.
 
 use std::collections::VecDeque;
 
 use base::id::MessagePortId;
 use malloc_size_of_derive::MallocSizeOf;
 use serde::{Deserialize, Serialize};
+use strum::EnumIter;
 
 use crate::PortMessageTask;
 
-#[derive(Debug, Deserialize, MallocSizeOf, Serialize)]
+/// All the DOM interfaces that can be transferred.
+#[derive(Clone, Copy, Debug, EnumIter)]
+pub enum Transferrable {
+    /// The `MessagePort` interface.
+    MessagePort,
+    /// The `ReadableStream` interface.
+    ReadableStream,
+    /// The `WritableStream` interface.
+    WritableStream,
+    /// The `TransformStream` interface.
+    TransformStream,
+}
+
+#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
 enum MessagePortState {
     /// <https://html.spec.whatwg.org/multipage/#detached>
     Detached,
@@ -29,7 +42,7 @@ enum MessagePortState {
     Disabled(bool),
 }
 
-#[derive(Debug, Deserialize, MallocSizeOf, Serialize)]
+#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
 /// The data and logic backing the DOM managed MessagePort.
 pub struct MessagePortImpl {
     /// The current state of the port.
@@ -66,7 +79,12 @@ impl MessagePortImpl {
         self.entangled_port
     }
 
-    /// Entanged this port with another.
+    /// <https://html.spec.whatwg.org/multipage/#disentangle>
+    pub fn disentangle(&mut self) -> Option<MessagePortId> {
+        self.entangled_port.take()
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#entangle>
     pub fn entangle(&mut self, other_id: MessagePortId) {
         self.entangled_port = Some(other_id);
     }
diff --git a/components/shared/devtools/Cargo.toml b/components/shared/devtools/Cargo.toml
index 5309d1cda67..e81e0709a00 100644
--- a/components/shared/devtools/Cargo.toml
+++ b/components/shared/devtools/Cargo.toml
@@ -22,3 +22,4 @@ net_traits = { workspace = true }
 serde = { workspace = true }
 servo_url = { path = "../../url" }
 uuid = { workspace = true, features = ["serde"] }
+embedder_traits = { workspace = true }
diff --git a/components/shared/devtools/lib.rs b/components/shared/devtools/lib.rs
index 88a3649ac2a..628d76bd25d 100644
--- a/components/shared/devtools/lib.rs
+++ b/components/shared/devtools/lib.rs
@@ -18,6 +18,7 @@ use std::time::{Duration, SystemTime, UNIX_EPOCH};
 use base::cross_process_instant::CrossProcessInstant;
 use base::id::{BrowsingContextId, PipelineId, WebViewId};
 use bitflags::bitflags;
+use embedder_traits::Theme;
 use http::{HeaderMap, Method};
 use ipc_channel::ipc::IpcSender;
 use malloc_size_of_derive::MallocSizeOf;
@@ -102,6 +103,9 @@ pub enum ScriptToDevtoolsControlMsg {
 
     /// Report a page title change
     TitleChanged(PipelineId, String),
+
+    /// Get source information from script
+    ScriptSourceLoaded(PipelineId, SourceInfo),
 }
 
 /// Serialized JS return values
@@ -140,6 +144,15 @@ pub struct NodeInfo {
     pub shadow_root_mode: Option<ShadowRootMode>,
     pub is_shadow_host: bool,
     pub display: Option<String>,
+
+    /// The `DOCTYPE` name if this is a `DocumentType` node, `None` otherwise
+    pub doctype_name: Option<String>,
+
+    /// The `DOCTYPE` public identifier if this is a `DocumentType` node , `None` otherwise
+    pub doctype_public_identifier: Option<String>,
+
+    /// The `DOCTYPE` system identifier if this is a `DocumentType` node, `None` otherwise
+    pub doctype_system_identifier: Option<String>,
 }
 
 pub struct StartedTimelineMarker {
@@ -258,6 +271,10 @@ pub enum DevtoolScriptControlMsg {
     Reload(PipelineId),
     /// Gets the list of all allowed CSS rules and possible values.
     GetCssDatabase(IpcSender<HashMap<String, CssDatabaseProperty>>),
+    /// Simulates a light or dark color scheme for the given pipeline
+    SimulateColorScheme(PipelineId, Theme),
+    /// Highlight the given DOM node
+    HighlightDomNode(PipelineId, Option<String>),
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -540,3 +557,10 @@ impl fmt::Display for ShadowRootMode {
         }
     }
 }
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct SourceInfo {
+    pub url: ServoUrl,
+    pub external: bool,
+    pub worker_id: Option<WorkerId>,
+}
diff --git a/components/shared/embedder/Cargo.toml b/components/shared/embedder/Cargo.toml
index 1592fb94822..d938169d37a 100644
--- a/components/shared/embedder/Cargo.toml
+++ b/components/shared/embedder/Cargo.toml
@@ -12,7 +12,9 @@ name = "embedder_traits"
 path = "lib.rs"
 
 [features]
-webxr = ["dep:webxr-api"]
+# bakes default resources into the library.
+# This feature is mainly intended for testing purposes.
+baked-default-resources = []
 
 [dependencies]
 base = { workspace = true }
@@ -25,9 +27,9 @@ hyper_serde = { workspace = true }
 ipc-channel = { workspace = true }
 keyboard-types = { workspace = true }
 log = { workspace = true }
-num-derive = "0.4"
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
+num-derive = "0.4"
 num-traits = { workspace = true }
 pixels = { path = "../../pixels" }
 serde = { workspace = true }
@@ -37,4 +39,3 @@ stylo_traits = { workspace = true }
 url = { workspace = true }
 webdriver = { workspace = true }
 webrender_api = { workspace = true }
-webxr-api = { workspace = true, features = ["ipc"], optional = true }
diff --git a/components/shared/embedder/input_events.rs b/components/shared/embedder/input_events.rs
index 0268be6dd9c..acaa9afb3ff 100644
--- a/components/shared/embedder/input_events.rs
+++ b/components/shared/embedder/input_events.rs
@@ -61,15 +61,16 @@ pub enum MouseButton {
     Other(u16),
 }
 
-impl From<u16> for MouseButton {
-    fn from(value: u16) -> Self {
+impl<T: Into<u64>> From<T> for MouseButton {
+    fn from(value: T) -> Self {
+        let value = value.into();
         match value {
             0 => MouseButton::Left,
             1 => MouseButton::Middle,
             2 => MouseButton::Right,
             3 => MouseButton::Back,
             4 => MouseButton::Forward,
-            _ => MouseButton::Other(value),
+            _ => MouseButton::Other(value as u16),
         }
     }
 }
diff --git a/components/shared/embedder/lib.rs b/components/shared/embedder/lib.rs
index 006420c3c64..e9427fcc719 100644
--- a/components/shared/embedder/lib.rs
+++ b/components/shared/embedder/lib.rs
@@ -13,24 +13,30 @@ pub mod resources;
 pub mod user_content_manager;
 mod webdriver;
 
-use std::fmt::{Debug, Error, Formatter};
+use std::collections::HashMap;
+use std::ffi::c_void;
+use std::fmt::{Debug, Display, Error, Formatter};
+use std::hash::Hash;
 use std::path::PathBuf;
 use std::sync::Arc;
 
-use base::id::{PipelineId, WebViewId};
+use base::id::{PipelineId, ScrollTreeNodeId, WebViewId};
 use crossbeam_channel::Sender;
+use euclid::{Scale, Size2D};
 use http::{HeaderMap, Method, StatusCode};
 use ipc_channel::ipc::IpcSender;
 pub use keyboard_types::{KeyboardEvent, Modifiers};
 use log::warn;
+use malloc_size_of::malloc_size_of_is_0;
 use malloc_size_of_derive::MallocSizeOf;
 use num_derive::FromPrimitive;
 use pixels::Image;
-use serde::{Deserialize, Serialize};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use servo_url::ServoUrl;
 use strum_macros::IntoStaticStr;
+use style_traits::CSSPixel;
 use url::Url;
-use webrender_api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize};
+use webrender_api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize, DevicePixel};
 
 pub use crate::input_events::*;
 pub use crate::webdriver::*;
@@ -86,21 +92,16 @@ pub enum Cursor {
     ZoomOut,
 }
 
-#[cfg(feature = "webxr")]
-pub use webxr_api::MainThreadWaker as EventLoopWaker;
-#[cfg(not(feature = "webxr"))]
 pub trait EventLoopWaker: 'static + Send {
     fn clone_box(&self) -> Box<dyn EventLoopWaker>;
-    fn wake(&self);
+    fn wake(&self) {}
 }
 
-#[cfg(not(feature = "webxr"))]
 impl Clone for Box<dyn EventLoopWaker> {
     fn clone(&self) -> Self {
-        EventLoopWaker::clone_box(self.as_ref())
+        self.clone_box()
     }
 }
-
 /// Sends messages to the embedder.
 pub struct EmbedderProxy {
     pub sender: Sender<EmbedderMsg>,
@@ -223,6 +224,38 @@ pub enum AllowOrDeny {
     Deny,
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct SelectElementOption {
+    /// A unique identifier for the option that can be used to select it.
+    pub id: usize,
+    /// The label that should be used to display the option to the user.
+    pub label: String,
+    /// Whether or not the option is selectable
+    pub is_disabled: bool,
+}
+
+/// Represents the contents of either an `<option>` or an `<optgroup>` element
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum SelectElementOptionOrOptgroup {
+    Option(SelectElementOption),
+    Optgroup {
+        label: String,
+        options: Vec<SelectElementOption>,
+    },
+}
+
+/// Data about a `WebView` or `<iframe>` viewport: its size and also the
+/// HiDPI scale factor to use when rendering the contents.
+#[derive(Clone, Copy, Debug, Default, Deserialize, MallocSizeOf, PartialEq, Serialize)]
+pub struct ViewportDetails {
+    /// The size of the layout viewport.
+    pub size: Size2D<f32, CSSPixel>,
+
+    /// The scale factor to use to account for HiDPI scaling. This does not take into account
+    /// any page or pinch zoom applied by the compositor to the contents.
+    pub hidpi_scale_factor: Scale<f32, CSSPixel, DevicePixel>,
+}
+
 #[derive(Deserialize, IntoStaticStr, Serialize)]
 pub enum EmbedderMsg {
     /// A status message to be displayed by the browser chrome.
@@ -254,10 +287,10 @@ pub enum EmbedderMsg {
     /// Whether or not to allow a pipeline to load a url.
     AllowNavigationRequest(WebViewId, PipelineId, ServoUrl),
     /// Whether or not to allow script to open a new tab/browser
-    AllowOpeningWebView(WebViewId, IpcSender<Option<WebViewId>>),
+    AllowOpeningWebView(WebViewId, IpcSender<Option<(WebViewId, ViewportDetails)>>),
     /// A webview was destroyed.
     WebViewClosed(WebViewId),
-    /// A webview gained focus for keyboard events.
+    /// A webview gained focus for keyboard events
     WebViewFocused(WebViewId),
     /// All webviews lost focus for keyboard events.
     WebViewBlurred,
@@ -331,6 +364,22 @@ pub enum EmbedderMsg {
     ShutdownComplete,
     /// Request to display a notification.
     ShowNotification(Option<WebViewId>, Notification),
+    /// Indicates that the user has activated a `<select>` element.
+    ///
+    /// The embedder should respond with the new state of the `<select>` element.
+    ShowSelectElementMenu(
+        WebViewId,
+        Vec<SelectElementOptionOrOptgroup>,
+        Option<usize>,
+        DeviceIntRect,
+        IpcSender<Option<usize>>,
+    ),
+    /// Inform the embedding layer that a JavaScript evaluation has
+    /// finished with the given result.
+    FinishJavaScriptEvaluation(
+        JavaScriptEvaluationId,
+        Result<JSValue, JavaScriptEvaluationError>,
+    ),
 }
 
 impl Debug for EmbedderMsg {
@@ -636,3 +685,239 @@ pub struct NotificationAction {
     /// Icon's raw image data and metadata.
     pub icon_resource: Option<Arc<Image>>,
 }
+
+/// Information about a `WebView`'s screen geometry and offset. This is used
+/// for the [Screen](https://drafts.csswg.org/cssom-view/#the-screen-interface)
+/// CSSOM APIs and `window.screenLeft` / `window.screenTop`.
+#[derive(Clone, Copy, Debug, Default)]
+pub struct ScreenGeometry {
+    /// The size of the screen in device pixels. This will be converted to
+    /// CSS pixels based on the pixel scaling of the `WebView`.
+    pub size: DeviceIntSize,
+    /// The available size of the screen in device pixels. This size is the size
+    /// available for web content on the screen, and should be `size` minus any system
+    /// toolbars, docks, and interface elements of the browser. This will be converted to
+    /// CSS pixels based on the pixel scaling of the `WebView`.
+    pub available_size: DeviceIntSize,
+    /// The offset of the `WebView` in device pixels for the purposes of the `window.screenLeft`
+    /// and `window.screenTop` APIs. This will be converted to CSS pixels based on the pixel scaling
+    /// of the `WebView`.
+    pub offset: DeviceIntPoint,
+}
+
+impl From<SelectElementOption> for SelectElementOptionOrOptgroup {
+    fn from(value: SelectElementOption) -> Self {
+        Self::Option(value)
+    }
+}
+
+/// The address of a node. Layout sends these back. They must be validated via
+/// `from_untrusted_node_address` before they can be used, because we do not trust layout.
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+pub struct UntrustedNodeAddress(pub *const c_void);
+
+malloc_size_of_is_0!(UntrustedNodeAddress);
+
+#[allow(unsafe_code)]
+unsafe impl Send for UntrustedNodeAddress {}
+
+impl From<style_traits::dom::OpaqueNode> for UntrustedNodeAddress {
+    fn from(o: style_traits::dom::OpaqueNode) -> Self {
+        UntrustedNodeAddress(o.0 as *const c_void)
+    }
+}
+
+impl Serialize for UntrustedNodeAddress {
+    fn serialize<S: Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
+        (self.0 as usize).serialize(s)
+    }
+}
+
+impl<'de> Deserialize<'de> for UntrustedNodeAddress {
+    fn deserialize<D: Deserializer<'de>>(d: D) -> Result<UntrustedNodeAddress, D::Error> {
+        let value: usize = Deserialize::deserialize(d)?;
+        Ok(UntrustedNodeAddress::from_id(value))
+    }
+}
+
+impl UntrustedNodeAddress {
+    /// Creates an `UntrustedNodeAddress` from the given pointer address value.
+    #[inline]
+    pub fn from_id(id: usize) -> UntrustedNodeAddress {
+        UntrustedNodeAddress(id as *const c_void)
+    }
+}
+
+/// The result of a hit test in the compositor.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct CompositorHitTestResult {
+    /// The pipeline id of the resulting item.
+    pub pipeline_id: PipelineId,
+
+    /// The hit test point in the item's viewport.
+    pub point_in_viewport: euclid::default::Point2D<f32>,
+
+    /// The hit test point relative to the item itself.
+    pub point_relative_to_item: euclid::default::Point2D<f32>,
+
+    /// The node address of the hit test result.
+    pub node: UntrustedNodeAddress,
+
+    /// The cursor that should be used when hovering the item hit by the hit test.
+    pub cursor: Option<Cursor>,
+
+    /// The scroll tree node associated with this hit test item.
+    pub scroll_tree_node: ScrollTreeNodeId,
+}
+
+/// Whether the default action for a touch event was prevented by web content
+#[derive(Debug, Deserialize, Serialize)]
+pub enum TouchEventResult {
+    /// Allowed by web content
+    DefaultAllowed(TouchSequenceId, TouchEventType),
+    /// Prevented by web content
+    DefaultPrevented(TouchSequenceId, TouchEventType),
+}
+
+/// For a given pipeline, whether any animations are currently running
+/// and any animation callbacks are queued
+#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub enum AnimationState {
+    /// Animations are active but no callbacks are queued
+    AnimationsPresent,
+    /// Animations are active and callbacks are queued
+    AnimationCallbacksPresent,
+    /// No animations are active and no callbacks are queued
+    NoAnimationsPresent,
+    /// No animations are active but callbacks are queued
+    NoAnimationCallbacksPresent,
+}
+
+/// A sequence number generated by a script thread for its pipelines. The
+/// constellation attaches the target pipeline's last seen `FocusSequenceNumber`
+/// to every focus-related message it sends.
+///
+/// This is used to resolve the inconsistency that occurs due to bidirectional
+/// focus state synchronization and provide eventual consistency. Example:
+///
+/// ```text
+/// script                            constellation
+/// -----------------------------------------------------------------------
+/// send ActivateDocument ----------> receive ActivateDocument
+///                             ,---- send FocusDocument
+///                             |
+/// focus an iframe             |
+/// send Focus -----------------|---> receive Focus
+///                             |     focus the iframe's content document
+/// receive FocusDocument <-----'     send FocusDocument to the content pipeline --> ...
+/// unfocus the iframe
+/// focus the document
+///
+/// Final state:                      Final state:
+///  the iframe is not focused         the iframe is focused
+/// ```
+///
+/// When the above sequence completes, from the script thread's point of view,
+/// the iframe is unfocused, but from the constellation's point of view, the
+/// iframe is still focused.
+///
+/// This inconsistency can be resolved by associating a sequence number to each
+/// message. Whenever a script thread initiates a focus operation, it generates
+/// and sends a brand new sequence number. The constellation attaches the
+/// last-received sequence number to each message it sends. This way, the script
+/// thread can discard out-dated incoming focus messages, and eventually, all
+/// actors converge to the consistent state which is determined based on the
+/// last focus message received by the constellation.
+///
+/// ```text
+/// script                            constellation
+/// -----------------------------------------------------------------------
+/// send ActivateDocument ----------> receive ActivateDocument
+///                             ,---- send FocusDocument (0)
+///                             |
+/// seq_number += 1             |
+/// focus an iframe             |
+/// send Focus (1) -------------|---> receive Focus (1)
+///                             |     focus the iframe's content document
+/// receive FocusDocument (0) <-'     send FocusDocument to the content pipeline --> ...
+/// ignore it because 0 < 1
+///
+/// Final state:                      Final state:
+///  the iframe is focused             the iframe is focused
+/// ```
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Default,
+    Deserialize,
+    Eq,
+    Hash,
+    MallocSizeOf,
+    PartialEq,
+    Serialize,
+    PartialOrd,
+)]
+pub struct FocusSequenceNumber(pub u64);
+
+impl Display for FocusSequenceNumber {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+        Display::fmt(&self.0, f)
+    }
+}
+
+/// An identifier for a particular JavaScript evaluation that is used to track the
+/// evaluation from the embedding layer to the script layer and then back.
+#[derive(Clone, Copy, Deserialize, Eq, Hash, PartialEq, Serialize)]
+pub struct JavaScriptEvaluationId(pub usize);
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub enum JSValue {
+    Undefined,
+    Null,
+    Boolean(bool),
+    Number(f64),
+    String(String),
+    Element(String),
+    Frame(String),
+    Window(String),
+    Array(Vec<JSValue>),
+    Object(HashMap<String, JSValue>),
+}
+
+impl From<&WebDriverJSValue> for JSValue {
+    fn from(value: &WebDriverJSValue) -> Self {
+        match value {
+            WebDriverJSValue::Undefined => Self::Undefined,
+            WebDriverJSValue::Null => Self::Null,
+            WebDriverJSValue::Boolean(value) => Self::Boolean(*value),
+            WebDriverJSValue::Int(value) => Self::Number(*value as f64),
+            WebDriverJSValue::Number(value) => Self::Number(*value),
+            WebDriverJSValue::String(value) => Self::String(value.clone()),
+            WebDriverJSValue::Element(web_element) => Self::Element(web_element.0.clone()),
+            WebDriverJSValue::Frame(web_frame) => Self::Frame(web_frame.0.clone()),
+            WebDriverJSValue::Window(web_window) => Self::Window(web_window.0.clone()),
+            WebDriverJSValue::ArrayLike(vector) => {
+                Self::Array(vector.iter().map(Into::into).collect())
+            },
+            WebDriverJSValue::Object(map) => Self::Object(
+                map.iter()
+                    .map(|(key, value)| (key.clone(), value.into()))
+                    .collect(),
+            ),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub enum JavaScriptEvaluationError {
+    /// An internal Servo error prevented the JavaSript evaluation from completing properly.
+    /// This indicates a bug in Servo.
+    InternalError,
+    /// The `WebView` on which this evaluation request was triggered is not ready. This might
+    /// happen if the `WebView`'s `Document` is changing due to ongoing load events, for instance.
+    WebViewNotReady,
+    /// The script executed successfully, but Servo could not serialize the JavaScript return
+    /// value into a [`JSValue`].
+    SerializationError,
+}
diff --git a/components/shared/embedder/resources.rs b/components/shared/embedder/resources.rs
index a5c34a33f30..830a403698e 100644
--- a/components/shared/embedder/resources.rs
+++ b/components/shared/embedder/resources.rs
@@ -3,30 +3,42 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use std::path::PathBuf;
-use std::sync::{LazyLock, RwLock};
+use std::sync::RwLock;
 
-use cfg_if::cfg_if;
+static RES: RwLock<Option<Box<dyn ResourceReaderMethods + Sync + Send>>> = RwLock::new(None);
 
-static RES: LazyLock<RwLock<Option<Box<dyn ResourceReaderMethods + Sync + Send>>>> =
-    LazyLock::new(|| {
-        cfg_if! {
-            if #[cfg(any(servo_production, target_env = "ohos"))] {
-                RwLock::new(None)
-            } else {
-                // Static assert that this is really a non-production build, rather
-                // than a failure of the build script’s production check.
-                const _: () = assert!(cfg!(servo_do_not_use_in_production));
+#[cfg(feature = "baked-default-resources")]
+static INIT_TEST_RESOURCES: std::sync::Once = std::sync::Once::new();
 
-                RwLock::new(Some(resources_for_tests()))
-            }
-        }
-    });
+#[cfg(all(feature = "baked-default-resources", servo_production))]
+const _: () = assert!(
+    false,
+    "baked-default-resources should not be used in production"
+);
 
+/// The Embedder should initialize the ResourceReader early.
 pub fn set(reader: Box<dyn ResourceReaderMethods + Sync + Send>) {
     *RES.write().unwrap() = Some(reader);
 }
 
+#[cfg(not(feature = "baked-default-resources"))]
 pub fn read_bytes(res: Resource) -> Vec<u8> {
+    if let Some(reader) = RES.read().unwrap().as_ref() {
+        reader.read(res)
+    } else {
+        log::error!("Resource reader not set.");
+        vec![]
+    }
+}
+
+#[cfg(feature = "baked-default-resources")]
+pub fn read_bytes(res: Resource) -> Vec<u8> {
+    INIT_TEST_RESOURCES.call_once(|| {
+        let mut reader = RES.write().unwrap();
+        if reader.is_none() {
+            *reader = Some(resources_for_tests())
+        }
+    });
     RES.read()
         .unwrap()
         .as_ref()
@@ -42,16 +54,16 @@ pub fn sandbox_access_files() -> Vec<PathBuf> {
     RES.read()
         .unwrap()
         .as_ref()
-        .expect("Resource reader not set.")
-        .sandbox_access_files()
+        .map(|reader| reader.sandbox_access_files())
+        .unwrap_or_default()
 }
 
 pub fn sandbox_access_files_dirs() -> Vec<PathBuf> {
     RES.read()
         .unwrap()
         .as_ref()
-        .expect("Resource reader not set.")
-        .sandbox_access_files_dirs()
+        .map(|reader| reader.sandbox_access_files_dirs())
+        .unwrap_or_default()
 }
 
 pub enum Resource {
@@ -79,31 +91,13 @@ pub enum Resource {
     /// The message can contain a placeholder `${reason}` for the error code.
     /// It can be empty but then nothing will be displayed when an internal error occurs.
     NetErrorHTML,
-    /// A CSS file to style the user agent stylesheet.
-    /// It can be empty but then there's simply no user agent stylesheet.
-    UserAgentCSS,
-    /// A CSS file to style the Servo browser.
-    /// It can be empty but several features might not work as expected.
-    ServoCSS,
-    /// A CSS file to style the presentational hints.
-    /// It can be empty but then presentational hints will not be styled.
-    PresentationalHintsCSS,
-    /// A CSS file to style the quirks mode.
-    /// It can be empty but then quirks mode will not be styled.
-    QuirksModeCSS,
     /// A placeholder image to display if we couldn't get the requested image.
     ///
-    /// ## Safety
+    /// ## Panic
     ///
-    /// Servo will crash if this is an invalid image. Check `resources/rippy.png` in Servo codebase to see what
-    /// a default rippy png should look like.
+    /// If the resource is not provided, servo will fallback to a baked in default (See resources/rippy.png).
+    /// However, if the image is provided but invalid, Servo will crash.
     RippyPNG,
-    /// A CSS file to style the media controls.
-    /// It can be empty but then media controls will not be styled.
-    MediaControlsCSS,
-    /// A JS file to control the media controls.
-    /// It can be empty but then media controls will not work.
-    MediaControlsJS,
     /// A placeholder HTML page to display when the code responsible for rendering a page panics and the original
     /// page can no longer be displayed.
     /// The message can contain a placeholder `${details}` for the error details.
@@ -125,13 +119,7 @@ impl Resource {
             Resource::HstsPreloadList => "hsts_preload.json",
             Resource::BadCertHTML => "badcert.html",
             Resource::NetErrorHTML => "neterror.html",
-            Resource::UserAgentCSS => "user-agent.css",
-            Resource::ServoCSS => "servo.css",
-            Resource::PresentationalHintsCSS => "presentational-hints.css",
-            Resource::QuirksModeCSS => "quirks-mode.css",
             Resource::RippyPNG => "rippy.png",
-            Resource::MediaControlsCSS => "media-controls.css",
-            Resource::MediaControlsJS => "media-controls.js",
             Resource::CrashHTML => "crash.html",
             Resource::DirectoryListingHTML => "directory-listing.html",
             Resource::AboutMemoryHTML => "about-memory.html",
@@ -145,12 +133,10 @@ pub trait ResourceReaderMethods {
     fn sandbox_access_files_dirs(&self) -> Vec<PathBuf>;
 }
 
-/// Bake all of our resources into this crate for tests, unless we are `cfg!(servo_production)`.
+/// Provides baked in resources for tests.
 ///
-/// Local non-production embedder builds (e.g. servoshell) can still override these with [`set`].
-/// On OpenHarmony we never want to include files, since we ship all the files in the application
-/// bundle anyway.
-#[cfg(not(any(servo_production, target_env = "ohos")))]
+/// Embedder builds (e.g. servoshell) should use [`set`] and ship the resources themselves.
+#[cfg(feature = "baked-default-resources")]
 fn resources_for_tests() -> Box<dyn ResourceReaderMethods + Sync + Send> {
     struct ResourceReader;
     impl ResourceReaderMethods for ResourceReader {
@@ -173,21 +159,7 @@ fn resources_for_tests() -> Box<dyn ResourceReaderMethods + Sync + Send> {
                 },
                 Resource::BadCertHTML => &include_bytes!("../../../resources/badcert.html")[..],
                 Resource::NetErrorHTML => &include_bytes!("../../../resources/neterror.html")[..],
-                Resource::UserAgentCSS => &include_bytes!("../../../resources/user-agent.css")[..],
-                Resource::ServoCSS => &include_bytes!("../../../resources/servo.css")[..],
-                Resource::PresentationalHintsCSS => {
-                    &include_bytes!("../../../resources/presentational-hints.css")[..]
-                },
-                Resource::QuirksModeCSS => {
-                    &include_bytes!("../../../resources/quirks-mode.css")[..]
-                },
                 Resource::RippyPNG => &include_bytes!("../../../resources/rippy.png")[..],
-                Resource::MediaControlsCSS => {
-                    &include_bytes!("../../../resources/media-controls.css")[..]
-                },
-                Resource::MediaControlsJS => {
-                    &include_bytes!("../../../resources/media-controls.js")[..]
-                },
                 Resource::CrashHTML => &include_bytes!("../../../resources/crash.html")[..],
                 Resource::DirectoryListingHTML => {
                     &include_bytes!("../../../resources/directory-listing.html")[..]
diff --git a/components/shared/embedder/webdriver.rs b/components/shared/embedder/webdriver.rs
index 349a45edf1b..3716a29951a 100644
--- a/components/shared/embedder/webdriver.rs
+++ b/components/shared/embedder/webdriver.rs
@@ -44,6 +44,8 @@ pub enum WebDriverCommandMsg {
     MouseButtonAction(WebViewId, MouseButtonAction, MouseButton, f32, f32),
     /// Act as if the mouse was moved in the browsing context with the given ID.
     MouseMoveAction(WebViewId, f32, f32),
+    /// Act as if the mouse wheel is scrolled in the browsing context given the given ID.
+    WheelScrollAction(WebViewId, f32, f32, f64, f64),
     /// Set the window size.
     SetWindowSize(WebViewId, DeviceIntSize, IpcSender<Size2D<f32, CSSPixel>>),
     /// Take a screenshot of the window.
@@ -78,6 +80,7 @@ pub enum WebDriverScriptCommand {
         IpcSender<Result<(), WebDriverCookieError>>,
     ),
     DeleteCookies(IpcSender<Result<(), ErrorStatus>>),
+    DeleteCookie(String, IpcSender<Result<(), ErrorStatus>>),
     ExecuteScript(String, IpcSender<WebDriverJSResult>),
     ExecuteAsyncScript(String, IpcSender<WebDriverJSResult>),
     FindElementCSS(String, IpcSender<Result<Option<String>, ErrorStatus>>),
@@ -113,6 +116,7 @@ pub enum WebDriverScriptCommand {
     FocusElement(String, IpcSender<Result<(), ErrorStatus>>),
     ElementClick(String, IpcSender<Result<Option<String>, ErrorStatus>>),
     GetActiveElement(IpcSender<Option<String>>),
+    GetComputedRole(String, IpcSender<Result<Option<String>, ErrorStatus>>),
     GetCookie(String, IpcSender<Vec<Serde<Cookie<'static>>>>),
     GetCookies(IpcSender<Vec<Serde<Cookie<'static>>>>),
     GetElementAttribute(
@@ -168,6 +172,7 @@ pub enum WebDriverJSError {
     /// Occurs when handler received an event message for a layout channel that is not
     /// associated with the current script thread
     BrowsingContextNotFound,
+    JSException(WebDriverJSValue),
     JSError,
     StaleElementReference,
     Timeout,
diff --git a/components/shared/net/Cargo.toml b/components/shared/net/Cargo.toml
index 056d48146f2..79ea936a688 100644
--- a/components/shared/net/Cargo.toml
+++ b/components/shared/net/Cargo.toml
@@ -15,14 +15,15 @@ doctest = false
 
 [dependencies]
 base = { workspace = true }
+compositing_traits = { workspace = true }
 content-security-policy = { workspace = true }
 cookie = { workspace = true }
 crossbeam-channel = { workspace = true }
 embedder_traits = { workspace = true }
 headers = { workspace = true }
 http = { workspace = true }
-hyper_serde = { workspace = true }
 hyper-util = { workspace = true }
+hyper_serde = { workspace = true }
 ipc-channel = { workspace = true }
 log = { workspace = true }
 malloc_size_of = { workspace = true }
@@ -31,6 +32,7 @@ mime = { workspace = true }
 num-traits = { workspace = true }
 percent-encoding = { workspace = true }
 pixels = { path = "../../pixels" }
+profile_traits = { path = "../profile" }
 rustls-pki-types = { workspace = true }
 serde = { workspace = true }
 servo_arc = { workspace = true }
@@ -38,4 +40,6 @@ servo_rand = { path = "../../rand" }
 servo_url = { path = "../../url" }
 url = { workspace = true }
 uuid = { workspace = true }
-webrender_traits = { workspace = true }
+
+[dev-dependencies]
+embedder_traits = { workspace = true, features = ["baked-default-resources"] }
diff --git a/components/shared/net/filemanager_thread.rs b/components/shared/net/filemanager_thread.rs
index e55fbefcefc..0e9014e1670 100644
--- a/components/shared/net/filemanager_thread.rs
+++ b/components/shared/net/filemanager_thread.rs
@@ -39,7 +39,7 @@ pub enum FileTokenCheck {
 /// Relative slice positions of a sequence,
 /// whose semantic should be consistent with (start, end) parameters in
 /// <https://w3c.github.io/FileAPI/#dfn-slice>
-#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
+#[derive(Clone, Copy, Debug, Deserialize, MallocSizeOf, Serialize)]
 pub struct RelativePos {
     /// Relative to first byte if non-negative,
     /// relative to one past last byte if negative,
diff --git a/components/shared/net/image_cache.rs b/components/shared/net/image_cache.rs
index abe0385c71a..3f316388755 100644
--- a/components/shared/net/image_cache.rs
+++ b/components/shared/net/image_cache.rs
@@ -5,13 +5,15 @@
 use std::sync::Arc;
 
 use base::id::PipelineId;
+use compositing_traits::CrossProcessCompositorApi;
 use ipc_channel::ipc::IpcSender;
 use log::debug;
+use malloc_size_of::MallocSizeOfOps;
 use malloc_size_of_derive::MallocSizeOf;
 use pixels::{Image, ImageMetadata};
+use profile_traits::mem::Report;
 use serde::{Deserialize, Serialize};
 use servo_url::{ImmutableOrigin, ServoUrl};
-use webrender_traits::CrossProcessCompositorApi;
 
 use crate::FetchResponseMsg;
 use crate::request::CorsSettings;
@@ -36,7 +38,7 @@ pub enum ImageOrMetadataAvailable {
 /// and image, and returned to the specified event loop when the
 /// image load completes. It is typically used to trigger a reflow
 /// and/or repaint.
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
 pub struct ImageResponder {
     pipeline_id: PipelineId,
     pub id: PendingImageId,
@@ -73,11 +75,11 @@ impl ImageResponder {
 #[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
 pub enum ImageResponse {
     /// The requested image was loaded.
-    Loaded(#[ignore_malloc_size_of = "Arc"] Arc<Image>, ServoUrl),
+    Loaded(#[conditional_malloc_size_of] Arc<Image>, ServoUrl),
     /// The request image metadata was loaded.
     MetadataLoaded(ImageMetadata),
     /// The requested image failed to load, so a placeholder was loaded instead.
-    PlaceholderLoaded(#[ignore_malloc_size_of = "Arc"] Arc<Image>, ServoUrl),
+    PlaceholderLoaded(#[conditional_malloc_size_of] Arc<Image>, ServoUrl),
     /// Neither the requested image nor the placeholder could be loaded.
     None,
 }
@@ -115,6 +117,8 @@ pub trait ImageCache: Sync + Send {
     where
         Self: Sized;
 
+    fn memory_report(&self, prefix: &str, ops: &mut MallocSizeOfOps) -> Report;
+
     /// Definitively check whether there is a cached, fully loaded image available.
     fn get_image(
         &self,
@@ -137,4 +141,10 @@ pub trait ImageCache: Sync + Send {
 
     /// Inform the image cache about a response for a pending request.
     fn notify_pending_response(&self, id: PendingImageId, action: FetchResponseMsg);
+
+    /// Create new image cache based on this one, while reusing the existing thread_pool.
+    fn create_new_image_cache(
+        &self,
+        compositor_api: CrossProcessCompositorApi,
+    ) -> Arc<dyn ImageCache>;
 }
diff --git a/components/shared/net/lib.rs b/components/shared/net/lib.rs
index c2c447d503e..05ad102f42f 100644
--- a/components/shared/net/lib.rs
+++ b/components/shared/net/lib.rs
@@ -11,6 +11,7 @@ use std::thread;
 
 use base::cross_process_instant::CrossProcessInstant;
 use base::id::HistoryStateId;
+use content_security_policy::{self as csp};
 use cookie::Cookie;
 use crossbeam_channel::{Receiver, Sender, unbounded};
 use headers::{ContentType, HeaderMapExt, ReferrerPolicy as ReferrerPolicyHeader};
@@ -198,6 +199,7 @@ pub enum FetchResponseMsg {
     ProcessResponse(RequestId, Result<FetchMetadata, NetworkError>),
     ProcessResponseChunk(RequestId, Vec<u8>),
     ProcessResponseEOF(RequestId, Result<ResourceFetchTiming, NetworkError>),
+    ProcessCspViolations(RequestId, Vec<csp::Violation>),
 }
 
 impl FetchResponseMsg {
@@ -207,7 +209,8 @@ impl FetchResponseMsg {
             FetchResponseMsg::ProcessRequestEOF(id) |
             FetchResponseMsg::ProcessResponse(id, ..) |
             FetchResponseMsg::ProcessResponseChunk(id, ..) |
-            FetchResponseMsg::ProcessResponseEOF(id, ..) => *id,
+            FetchResponseMsg::ProcessResponseEOF(id, ..) |
+            FetchResponseMsg::ProcessCspViolations(id, ..) => *id,
         }
     }
 }
@@ -235,6 +238,8 @@ pub trait FetchTaskTarget {
     ///
     /// Fired when the response is fully fetched
     fn process_response_eof(&mut self, request: &Request, response: &Response);
+
+    fn process_csp_violations(&mut self, request: &Request, violations: Vec<csp::Violation>);
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -282,6 +287,7 @@ pub trait FetchResponseListener {
     fn resource_timing(&self) -> &ResourceFetchTiming;
     fn resource_timing_mut(&mut self) -> &mut ResourceFetchTiming;
     fn submit_resource_timing(&mut self);
+    fn process_csp_violations(&mut self, request_id: RequestId, violations: Vec<csp::Violation>);
 }
 
 impl FetchTaskTarget for IpcSender<FetchResponseMsg> {
@@ -313,6 +319,12 @@ impl FetchTaskTarget for IpcSender<FetchResponseMsg> {
 
         let _ = self.send(FetchResponseMsg::ProcessResponseEOF(request.id, payload));
     }
+
+    fn process_csp_violations(&mut self, request: &Request, violations: Vec<csp::Violation>) {
+        let _ = self.send(FetchResponseMsg::ProcessCspViolations(
+            request.id, violations,
+        ));
+    }
 }
 
 /// A fetch task that discards all data it's sent,
@@ -326,6 +338,7 @@ impl FetchTaskTarget for DiscardFetch {
     fn process_response(&mut self, _: &Request, _: &Response) {}
     fn process_response_chunk(&mut self, _: &Request, _: Vec<u8>) {}
     fn process_response_eof(&mut self, _: &Request, _: &Response) {}
+    fn process_csp_violations(&mut self, _: &Request, _: Vec<csp::Violation>) {}
 }
 
 pub trait Action<Listener> {
@@ -366,6 +379,9 @@ impl<T: FetchResponseListener> Action<T> for FetchResponseMsg {
                     Err(e) => listener.process_response_eof(request_id, Err(e)),
                 }
             },
+            FetchResponseMsg::ProcessCspViolations(request_id, violations) => {
+                listener.process_csp_violations(request_id, violations)
+            },
         }
     }
 }
@@ -455,6 +471,7 @@ pub enum WebSocketDomAction {
 
 #[derive(Debug, Deserialize, Serialize)]
 pub enum WebSocketNetworkEvent {
+    ReportCSPViolations(Vec<csp::Violation>),
     ConnectionEstablished { protocol_in_use: Option<String> },
     MessageReceived(MessageData),
     Close(Option<u16>, String),
@@ -493,6 +510,7 @@ pub enum CoreResourceMsg {
         CookieSource,
     ),
     DeleteCookies(ServoUrl),
+    DeleteCookie(ServoUrl, String),
     /// Get a history state by a given history state id
     GetHistoryState(HistoryStateId, IpcSender<Option<Vec<u8>>>),
     /// Set a history state for a given history state id
diff --git a/components/shared/net/request.rs b/components/shared/net/request.rs
index 58cba5cba5c..259132b55c4 100644
--- a/components/shared/net/request.rs
+++ b/components/shared/net/request.rs
@@ -8,7 +8,7 @@ use base::id::{PipelineId, WebViewId};
 use content_security_policy::{self as csp};
 use http::header::{AUTHORIZATION, HeaderName};
 use http::{HeaderMap, Method};
-use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
+use ipc_channel::ipc::{self, IpcReceiver, IpcSender, IpcSharedMemory};
 use malloc_size_of_derive::MallocSizeOf;
 use mime::Mime;
 use serde::{Deserialize, Serialize};
@@ -130,7 +130,7 @@ pub enum Window {
 }
 
 /// [CORS settings attribute](https://html.spec.whatwg.org/multipage/#attr-crossorigin-anonymous)
-#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
+#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, MallocSizeOf, PartialEq, Serialize)]
 pub enum CorsSettings {
     Anonymous,
     UseCredentials,
@@ -156,7 +156,7 @@ pub enum BodySource {
 #[derive(Debug, Deserialize, Serialize)]
 pub enum BodyChunkResponse {
     /// A chunk of bytes.
-    Chunk(Vec<u8>),
+    Chunk(IpcSharedMemory),
     /// The body is done.
     Done,
     /// There was an error streaming the body,
@@ -292,6 +292,7 @@ pub struct RequestBuilder {
     /// <https://fetch.spec.whatwg.org/#concept-request-policy-container>
     pub policy_container: RequestPolicyContainer,
     pub insecure_requests_policy: InsecureRequestsPolicy,
+    pub has_trustworthy_ancestor_origin: bool,
 
     /// <https://fetch.spec.whatwg.org/#concept-request-referrer>
     pub referrer: Referrer,
@@ -344,6 +345,7 @@ impl RequestBuilder {
             origin: ImmutableOrigin::new_opaque(),
             policy_container: RequestPolicyContainer::default(),
             insecure_requests_policy: InsecureRequestsPolicy::DoNotUpgrade,
+            has_trustworthy_ancestor_origin: false,
             referrer,
             referrer_policy: ReferrerPolicy::EmptyString,
             pipeline_id: None,
@@ -493,6 +495,14 @@ impl RequestBuilder {
         self
     }
 
+    pub fn has_trustworthy_ancestor_origin(
+        mut self,
+        has_trustworthy_ancestor_origin: bool,
+    ) -> RequestBuilder {
+        self.has_trustworthy_ancestor_origin = has_trustworthy_ancestor_origin;
+        self
+    }
+
     /// <https://fetch.spec.whatwg.org/#request-service-workers-mode>
     pub fn service_workers_mode(
         mut self,
@@ -546,6 +556,7 @@ impl RequestBuilder {
         request.crash = self.crash;
         request.policy_container = self.policy_container;
         request.insecure_requests_policy = self.insecure_requests_policy;
+        request.has_trustworthy_ancestor_origin = self.has_trustworthy_ancestor_origin;
         request
     }
 }
@@ -621,6 +632,7 @@ pub struct Request {
     pub policy_container: RequestPolicyContainer,
     /// <https://w3c.github.io/webappsec-upgrade-insecure-requests/#insecure-requests-policy>
     pub insecure_requests_policy: InsecureRequestsPolicy,
+    pub has_trustworthy_ancestor_origin: bool,
     pub https_state: HttpsState,
     /// Servo internal: if crash details are present, trigger a crash error page with these details.
     pub crash: Option<String>,
@@ -668,6 +680,7 @@ impl Request {
             response_tainting: ResponseTainting::Basic,
             policy_container: RequestPolicyContainer::Client,
             insecure_requests_policy: InsecureRequestsPolicy::DoNotUpgrade,
+            has_trustworthy_ancestor_origin: false,
             https_state,
             crash: None,
         }
diff --git a/components/shared/net/response.rs b/components/shared/net/response.rs
index 06ca0687da2..f91993ddccb 100644
--- a/components/shared/net/response.rs
+++ b/components/shared/net/response.rs
@@ -120,6 +120,9 @@ pub struct Response {
     /// track network metrics
     #[ignore_malloc_size_of = "Mutex heap size undefined"]
     pub resource_timing: Arc<Mutex<ResourceFetchTiming>>,
+
+    /// <https://fetch.spec.whatwg.org/#concept-response-range-requested-flag>
+    pub range_requested: bool,
 }
 
 impl Response {
@@ -142,6 +145,7 @@ impl Response {
             return_internal: true,
             aborted: Arc::new(AtomicBool::new(false)),
             resource_timing: Arc::new(Mutex::new(resource_timing)),
+            range_requested: false,
         }
     }
 
@@ -175,6 +179,7 @@ impl Response {
             resource_timing: Arc::new(Mutex::new(ResourceFetchTiming::new(
                 ResourceTimingType::Error,
             ))),
+            range_requested: false,
         }
     }
 
diff --git a/components/shared/profile/Cargo.toml b/components/shared/profile/Cargo.toml
index 645ab24b4c0..8086bf17ba2 100644
--- a/components/shared/profile/Cargo.toml
+++ b/components/shared/profile/Cargo.toml
@@ -22,6 +22,7 @@ log = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 serde = { workspace = true }
+servo_allocator = { path = "../../allocator" }
 servo_config = { path = "../../config" }
 signpost = { git = "https://github.com/pcwalton/signpost.git" }
 strum_macros = { workspace = true }
diff --git a/components/shared/profile/mem.rs b/components/shared/profile/mem.rs
index 2b13ccb7715..b626facd042 100644
--- a/components/shared/profile/mem.rs
+++ b/components/shared/profile/mem.rs
@@ -6,12 +6,16 @@
 
 #![deny(missing_docs)]
 
+use std::cell::{LazyCell, RefCell};
+use std::collections::HashSet;
+use std::ffi::c_void;
 use std::marker::Send;
 
 use crossbeam_channel::Sender;
 use ipc_channel::ipc::{self, IpcSender};
 use ipc_channel::router::ROUTER;
 use log::warn;
+use malloc_size_of::MallocSizeOfOps;
 use serde::{Deserialize, Serialize};
 
 /// A trait to abstract away the various kinds of message senders we use.
@@ -50,6 +54,21 @@ where
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct ProfilerChan(pub IpcSender<ProfilerMsg>);
 
+/// A handle that encompasses a registration with the memory profiler.
+/// The registration is tied to the lifetime of this type; the memory
+/// profiler unregister the reporter when this object is dropped.
+pub struct ProfilerRegistration {
+    sender: ProfilerChan,
+    reporter_name: String,
+}
+
+impl Drop for ProfilerRegistration {
+    fn drop(&mut self) {
+        self.sender
+            .send(ProfilerMsg::UnregisterReporter(self.reporter_name.clone()));
+    }
+}
+
 impl ProfilerChan {
     /// Send `msg` on this `IpcSender`.
     ///
@@ -60,15 +79,15 @@ impl ProfilerChan {
         }
     }
 
-    /// Runs `f()` with memory profiling.
-    pub fn run_with_memory_reporting<F, M, T, C>(
+    /// Register a new reporter and return a handle to automatically
+    /// unregister it in the future.
+    pub fn prepare_memory_reporting<M, T, C>(
         &self,
-        f: F,
         reporter_name: String,
         channel_for_reporter: C,
         msg: M,
-    ) where
-        F: FnOnce(),
+    ) -> ProfilerRegistration
+    where
         M: Fn(ReportsChan) -> T + Send + 'static,
         T: Send + 'static,
         C: OpaqueSender<T> + Send + 'static,
@@ -88,9 +107,28 @@ impl ProfilerChan {
             Reporter(reporter_sender),
         ));
 
-        f();
+        ProfilerRegistration {
+            sender: self.clone(),
+            reporter_name,
+        }
+    }
 
-        self.send(ProfilerMsg::UnregisterReporter(reporter_name));
+    /// Runs `f()` with memory profiling.
+    pub fn run_with_memory_reporting<F, M, T, C>(
+        &self,
+        f: F,
+        reporter_name: String,
+        channel_for_reporter: C,
+        msg: M,
+    ) where
+        F: FnOnce(),
+        M: Fn(ReportsChan) -> T + Send + 'static,
+        T: Send + 'static,
+        C: OpaqueSender<T> + Send + 'static,
+    {
+        let _registration = self.prepare_memory_reporting(reporter_name, channel_for_reporter, msg);
+
+        f();
     }
 }
 
@@ -140,16 +178,36 @@ pub struct Report {
     pub size: usize,
 }
 
+/// A set of reports belonging to a process.
+#[derive(Debug, Deserialize, Serialize)]
+pub struct ProcessReports {
+    /// The set of reports.
+    pub reports: Vec<Report>,
+
+    /// The process id.
+    pub pid: u32,
+}
+
+impl ProcessReports {
+    /// Adopt these reports and configure the process pid.
+    pub fn new(reports: Vec<Report>) -> Self {
+        Self {
+            reports,
+            pid: std::process::id(),
+        }
+    }
+}
+
 /// A channel through which memory reports can be sent.
 #[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct ReportsChan(pub IpcSender<Vec<Report>>);
+pub struct ReportsChan(pub IpcSender<ProcessReports>);
 
 impl ReportsChan {
     /// Send `report` on this `IpcSender`.
     ///
     /// Panics if the send fails.
-    pub fn send(&self, report: Vec<Report>) {
-        self.0.send(report).unwrap();
+    pub fn send(&self, reports: ProcessReports) {
+        self.0.send(reports).unwrap();
     }
 }
 
@@ -172,12 +230,8 @@ pub struct Reporter(pub IpcSender<ReporterRequest>);
 
 impl Reporter {
     /// Collect one or more memory reports. Returns true on success, and false on failure.
-    pub fn collect_reports(&self, reports_chan: ReportsChan) {
-        self.0
-            .send(ReporterRequest {
-                reports_channel: reports_chan,
-            })
-            .unwrap()
+    pub fn collect_reports(&self, reports_channel: ReportsChan) {
+        self.0.send(ReporterRequest { reports_channel }).unwrap()
     }
 }
 
@@ -216,3 +270,25 @@ pub enum ProfilerMsg {
     /// Triggers sending back the memory profiling metrics,
     Report(IpcSender<MemoryReportResult>),
 }
+
+thread_local!(static SEEN_POINTERS: LazyCell<RefCell<HashSet<*const c_void>>> = const {
+    LazyCell::new(Default::default)
+});
+
+/// Invoke the provided function after initializing the memory profile tools.
+/// The function is expected to call all the desired [MallocSizeOf::size_of]
+/// for allocations reachable from the current thread.
+pub fn perform_memory_report<F: FnOnce(&mut MallocSizeOfOps)>(f: F) {
+    let seen_pointer = move |ptr| SEEN_POINTERS.with(|pointers| !pointers.borrow_mut().insert(ptr));
+    let mut ops = MallocSizeOfOps::new(
+        servo_allocator::usable_size,
+        None,
+        Some(Box::new(seen_pointer)),
+    );
+    f(&mut ops);
+    SEEN_POINTERS.with(|pointers| {
+        let mut pointers = pointers.borrow_mut();
+        pointers.clear();
+        pointers.shrink_to_fit();
+    });
+}
diff --git a/components/shared/script/Cargo.toml b/components/shared/script/Cargo.toml
index e083e263834..0d3690188fe 100644
--- a/components/shared/script/Cargo.toml
+++ b/components/shared/script/Cargo.toml
@@ -13,26 +13,22 @@ path = "lib.rs"
 
 [features]
 bluetooth = ["bluetooth_traits"]
-webgpu = []
+webgpu = ["webgpu_traits"]
 
 [dependencies]
 background_hang_monitor_api = { workspace = true }
 base = { workspace = true }
-bitflags = { workspace = true }
 bluetooth_traits = { workspace = true, optional = true }
 canvas_traits = { workspace = true }
+compositing_traits = { workspace = true }
 constellation_traits = { workspace = true }
-cookie = { workspace = true }
 crossbeam-channel = { workspace = true }
 devtools_traits = { workspace = true }
 embedder_traits = { workspace = true }
 euclid = { workspace = true }
 http = { workspace = true }
-hyper_serde = { workspace = true }
 ipc-channel = { workspace = true }
 keyboard-types = { workspace = true }
-libc = { workspace = true }
-log = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 media = { path = "../../media" }
@@ -40,14 +36,11 @@ net_traits = { workspace = true }
 pixels = { path = "../../pixels" }
 profile_traits = { workspace = true }
 serde = { workspace = true }
-strum_macros = { workspace = true }
-stylo_atoms = { workspace = true }
 servo_url = { path = "../../url" }
 strum = { workspace = true, features = ["derive"] }
+strum_macros = { workspace = true }
+stylo_atoms = { workspace = true }
 stylo_traits = { workspace = true }
-uuid = { workspace = true }
-webdriver = { workspace = true }
-webgpu = { path = "../../webgpu" }
+webgpu_traits = { workspace = true, optional = true }
 webrender_api = { workspace = true }
-webrender_traits = { workspace = true }
 webxr-api = { workspace = true, features = ["ipc"] }
diff --git a/components/shared/script/lib.rs b/components/shared/script/lib.rs
index e7971962106..29acc51765c 100644
--- a/components/shared/script/lib.rs
+++ b/components/shared/script/lib.rs
@@ -9,157 +9,46 @@
 #![deny(missing_docs)]
 #![deny(unsafe_code)]
 
-mod script_msg;
-pub mod serializable;
-pub mod transferable;
-
-use std::borrow::Cow;
-use std::collections::{HashMap, VecDeque};
 use std::fmt;
 use std::sync::Arc;
 
 use background_hang_monitor_api::BackgroundHangMonitorRegister;
 use base::cross_process_instant::CrossProcessInstant;
-use base::id::{
-    BlobId, BrowsingContextId, DomPointId, HistoryStateId, MessagePortId, PipelineId,
-    PipelineNamespaceId, WebViewId,
-};
+use base::id::{BrowsingContextId, HistoryStateId, PipelineId, PipelineNamespaceId, WebViewId};
 #[cfg(feature = "bluetooth")]
 use bluetooth_traits::BluetoothRequest;
 use canvas_traits::webgl::WebGLPipeline;
+use compositing_traits::CrossProcessCompositorApi;
 use constellation_traits::{
-    AnimationTickType, CompositorHitTestResult, ScrollState, WindowSizeData, WindowSizeType,
+    LoadData, NavigationHistoryBehavior, ScriptToConstellationChan, ScrollState,
+    StructuredSerializedData, WindowSizeType,
 };
 use crossbeam_channel::{RecvTimeoutError, Sender};
-use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg, WorkerId};
-use embedder_traits::input_events::InputEvent;
+use devtools_traits::ScriptToDevtoolsControlMsg;
 use embedder_traits::user_content_manager::UserContentManager;
-use embedder_traits::{MediaSessionActionType, Theme, WebDriverScriptCommand};
+use embedder_traits::{
+    CompositorHitTestResult, FocusSequenceNumber, InputEvent, JavaScriptEvaluationId,
+    MediaSessionActionType, Theme, ViewportDetails, WebDriverScriptCommand,
+};
 use euclid::{Rect, Scale, Size2D, UnknownUnit};
-use http::{HeaderMap, Method};
-use ipc_channel::Error as IpcError;
 use ipc_channel::ipc::{IpcReceiver, IpcSender};
 use keyboard_types::Modifiers;
-use log::warn;
 use malloc_size_of_derive::MallocSizeOf;
 use media::WindowGLContext;
+use net_traits::ResourceThreads;
 use net_traits::image_cache::ImageCache;
-use net_traits::request::{InsecureRequestsPolicy, Referrer, RequestBody};
 use net_traits::storage_thread::StorageType;
-use net_traits::{ReferrerPolicy, ResourceThreads};
 use pixels::PixelFormat;
-use profile_traits::{mem, time as profile_time};
+use profile_traits::mem;
 use serde::{Deserialize, Serialize};
 use servo_url::{ImmutableOrigin, ServoUrl};
-use strum::{EnumIter, IntoEnumIterator};
 use strum_macros::IntoStaticStr;
 use style_traits::{CSSPixel, SpeculativePainter};
 use stylo_atoms::Atom;
 #[cfg(feature = "webgpu")]
-use webgpu::WebGPUMsg;
+use webgpu_traits::WebGPUMsg;
+use webrender_api::ImageKey;
 use webrender_api::units::DevicePixel;
-use webrender_api::{DocumentId, ImageKey};
-use webrender_traits::CrossProcessCompositorApi;
-
-pub use crate::script_msg::{
-    DOMMessage, IFrameSizeMsg, Job, JobError, JobResult, JobResultValue, JobType, SWManagerMsg,
-    SWManagerSenders, ScopeThings, ScriptMsg, ServiceWorkerMsg, TouchEventResult,
-};
-use crate::serializable::{BlobImpl, DomPoint};
-use crate::transferable::MessagePortImpl;
-
-/// The origin where a given load was initiated.
-/// Useful for origin checks, for example before evaluation a JS URL.
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub enum LoadOrigin {
-    /// A load originating in the constellation.
-    Constellation,
-    /// A load originating in webdriver.
-    WebDriver,
-    /// A load originating in script.
-    Script(ImmutableOrigin),
-}
-
-/// can be passed to `LoadUrl` to load a page with GET/POST
-/// parameters or headers
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct LoadData {
-    /// The origin where the load started.
-    pub load_origin: LoadOrigin,
-    /// The URL.
-    pub url: ServoUrl,
-    /// The creator pipeline id if this is an about:blank load.
-    pub creator_pipeline_id: Option<PipelineId>,
-    /// The method.
-    #[serde(
-        deserialize_with = "::hyper_serde::deserialize",
-        serialize_with = "::hyper_serde::serialize"
-    )]
-    pub method: Method,
-    /// The headers.
-    #[serde(
-        deserialize_with = "::hyper_serde::deserialize",
-        serialize_with = "::hyper_serde::serialize"
-    )]
-    pub headers: HeaderMap,
-    /// The data that will be used as the body of the request.
-    pub data: Option<RequestBody>,
-    /// The result of evaluating a javascript scheme url.
-    pub js_eval_result: Option<JsEvalResult>,
-    /// The referrer.
-    pub referrer: Referrer,
-    /// The referrer policy.
-    pub referrer_policy: ReferrerPolicy,
-
-    /// The source to use instead of a network response for a srcdoc document.
-    pub srcdoc: String,
-    /// The inherited context is Secure, None if not inherited
-    pub inherited_secure_context: Option<bool>,
-    /// The inherited policy for upgrading insecure requests; None if not inherited.
-    pub inherited_insecure_requests_policy: Option<InsecureRequestsPolicy>,
-
-    /// Servo internal: if crash details are present, trigger a crash error page with these details.
-    pub crash: Option<String>,
-}
-
-/// The result of evaluating a javascript scheme url.
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub enum JsEvalResult {
-    /// The js evaluation had a non-string result, 204 status code.
-    /// <https://html.spec.whatwg.org/multipage/#navigate> 12.11
-    NoContent,
-    /// The js evaluation had a string result.
-    Ok(Vec<u8>),
-}
-
-impl LoadData {
-    /// Create a new `LoadData` object.
-    pub fn new(
-        load_origin: LoadOrigin,
-        url: ServoUrl,
-        creator_pipeline_id: Option<PipelineId>,
-        referrer: Referrer,
-        referrer_policy: ReferrerPolicy,
-        inherited_secure_context: Option<bool>,
-        inherited_insecure_requests_policy: Option<InsecureRequestsPolicy>,
-    ) -> LoadData {
-        LoadData {
-            load_origin,
-            url,
-            creator_pipeline_id,
-            method: Method::GET,
-            headers: HeaderMap::new(),
-            data: None,
-            js_eval_result: None,
-            referrer,
-            referrer_policy,
-            srcdoc: "".to_string(),
-            inherited_secure_context,
-            crash: None,
-            inherited_insecure_requests_policy,
-        }
-    }
-}
 
 /// The initial data required to create a new layout attached to an existing script thread.
 #[derive(Debug, Deserialize, Serialize)]
@@ -177,8 +66,8 @@ pub struct NewLayoutInfo {
     pub opener: Option<BrowsingContextId>,
     /// Network request data which will be initiated by the script thread.
     pub load_data: LoadData,
-    /// Information about the initial window size.
-    pub window_size: WindowSizeData,
+    /// Initial [`ViewportDetails`] for this layout.
+    pub viewport_details: ViewportDetails,
 }
 
 /// When a pipeline is closed, should its browsing context be discarded too?
@@ -190,21 +79,6 @@ pub enum DiscardBrowsingContext {
     No,
 }
 
-/// <https://html.spec.whatwg.org/multipage/#navigation-supporting-concepts:navigationhistorybehavior>
-#[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
-pub enum NavigationHistoryBehavior {
-    /// The default value, which will be converted very early in the navigate algorithm into "push"
-    /// or "replace". Usually it becomes "push", but under certain circumstances it becomes
-    /// "replace" instead.
-    #[default]
-    Auto,
-    /// A regular navigation which adds a new session history entry, and will clear the forward
-    /// session history.
-    Push,
-    /// A navigation that will replace the active session history entry.
-    Replace,
-}
-
 /// Is a document fully active, active or inactive?
 /// A document is active if it is the current active document in its session history,
 /// it is fuly active if it is active and all of its ancestors are active,
@@ -253,11 +127,11 @@ pub enum ScriptThreadMessage {
     /// Gives a channel and ID to a layout, as well as the ID of that layout's parent
     AttachLayout(NewLayoutInfo),
     /// Window resized.  Sends a DOM event eventually, but first we combine events.
-    Resize(PipelineId, WindowSizeData, WindowSizeType),
+    Resize(PipelineId, ViewportDetails, WindowSizeType),
     /// Theme changed.
     ThemeChange(PipelineId, Theme),
     /// Notifies script that window has been resized but to not take immediate action.
-    ResizeInactive(PipelineId, WindowSizeData),
+    ResizeInactive(PipelineId, ViewportDetails),
     /// Window switched from fullscreen mode.
     ExitFullScreen(PipelineId),
     /// Notifies the script that the document associated with this pipeline should 'unload'.
@@ -317,11 +191,19 @@ pub enum ScriptThreadMessage {
     RemoveHistoryStates(PipelineId, Vec<HistoryStateId>),
     /// Set an iframe to be focused. Used when an element in an iframe gains focus.
     /// PipelineId is for the parent, BrowsingContextId is for the nested browsing context
-    FocusIFrame(PipelineId, BrowsingContextId),
+    FocusIFrame(PipelineId, BrowsingContextId, FocusSequenceNumber),
+    /// Focus the document. Used when the container gains focus.
+    FocusDocument(PipelineId, FocusSequenceNumber),
+    /// Notifies that the document's container (e.g., an iframe) is not included
+    /// in the top-level browsing context's focus chain (not considering system
+    /// focus) anymore.
+    ///
+    /// Obviously, this message is invalid for a top-level document.
+    Unfocus(PipelineId, FocusSequenceNumber),
     /// Passes a webdriver command to the script thread for execution
     WebDriverScriptCommand(PipelineId, WebDriverScriptCommand),
     /// Notifies script thread that all animations are done
-    TickAllAnimations(PipelineId, AnimationTickType),
+    TickAllAnimations(Vec<WebViewId>),
     /// Notifies the script thread that a new Web font has been loaded, and thus the page should be
     /// reflowed.
     WebFontLoaded(PipelineId, bool /* success */),
@@ -363,6 +245,9 @@ pub enum ScriptThreadMessage {
     /// The compositor scrolled and is updating the scroll states of the nodes in the given
     /// pipeline via the Constellation.
     SetScrollStates(PipelineId, Vec<ScrollState>),
+    /// Evaluate the given JavaScript and return a result via a corresponding message
+    /// to the Constellation.
+    EvaluateJavaScript(PipelineId, JavaScriptEvaluationId, String),
 }
 
 impl fmt::Debug for ScriptThreadMessage {
@@ -381,22 +266,8 @@ pub enum DocumentState {
     Pending,
 }
 
-/// For a given pipeline, whether any animations are currently running
-/// and any animation callbacks are queued
-#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)]
-pub enum AnimationState {
-    /// Animations are active but no callbacks are queued
-    AnimationsPresent,
-    /// Animations are active and callbacks are queued
-    AnimationCallbacksPresent,
-    /// No animations are active and no callbacks are queued
-    NoAnimationsPresent,
-    /// No animations are active but callbacks are queued
-    NoAnimationCallbacksPresent,
-}
-
 /// Input events from the embedder that are sent via the `Constellation`` to the `ScriptThread`.
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct ConstellationInputEvent {
     /// The hit test result of this input event, if any.
     pub hit_test_result: Option<CompositorHitTestResult>,
@@ -448,8 +319,8 @@ pub struct InitialScriptState {
     pub memory_profiler_sender: mem::ProfilerChan,
     /// A channel to the developer tools, if applicable.
     pub devtools_server_sender: Option<IpcSender<ScriptToDevtoolsControlMsg>>,
-    /// Information about the initial window size.
-    pub window_size: WindowSizeData,
+    /// Initial [`ViewportDetails`] for the frame that is initiating this `ScriptThread`.
+    pub viewport_details: ViewportDetails,
     /// The ID of the pipeline namespace for this script thread.
     pub pipeline_namespace_id: PipelineNamespaceId,
     /// A ping will be sent on this channel once the script thread shuts down.
@@ -458,8 +329,6 @@ pub struct InitialScriptState {
     pub webgl_chan: Option<WebGLPipeline>,
     /// The XR device registry
     pub webxr_registry: Option<webxr_api::Registry>,
-    /// The Webrender document ID associated with this thread.
-    pub webrender_document: DocumentId,
     /// Access to the compositor across a process boundary.
     pub compositor_api: CrossProcessCompositorApi,
     /// Application window's GL Context for Media player
@@ -468,119 +337,6 @@ pub struct InitialScriptState {
     pub user_content_manager: UserContentManager,
 }
 
-/// This trait allows creating a `ServiceWorkerManager` without depending on the `script`
-/// crate.
-pub trait ServiceWorkerManagerFactory {
-    /// Create a `ServiceWorkerManager`.
-    fn create(sw_senders: SWManagerSenders, origin: ImmutableOrigin);
-}
-
-/// Whether the sandbox attribute is present for an iframe element
-#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)]
-pub enum IFrameSandboxState {
-    /// Sandbox attribute is present
-    IFrameSandboxed,
-    /// Sandbox attribute is not present
-    IFrameUnsandboxed,
-}
-
-/// Specifies the information required to load an auxiliary browsing context.
-#[derive(Debug, Deserialize, Serialize)]
-pub struct AuxiliaryWebViewCreationRequest {
-    /// Load data containing the url to load
-    pub load_data: LoadData,
-    /// The webview that caused this request.
-    pub opener_webview_id: WebViewId,
-    /// The pipeline opener browsing context.
-    pub opener_pipeline_id: PipelineId,
-    /// Sender for the constellation’s response to our request.
-    pub response_sender: IpcSender<Option<AuxiliaryWebViewCreationResponse>>,
-}
-
-/// Constellation’s response to auxiliary browsing context creation requests.
-#[derive(Debug, Deserialize, Serialize)]
-pub struct AuxiliaryWebViewCreationResponse {
-    /// The new webview ID.
-    pub new_webview_id: WebViewId,
-    /// The new pipeline ID.
-    pub new_pipeline_id: PipelineId,
-}
-
-/// Specifies the information required to load an iframe.
-#[derive(Debug, Deserialize, Serialize)]
-pub struct IFrameLoadInfo {
-    /// Pipeline ID of the parent of this iframe
-    pub parent_pipeline_id: PipelineId,
-    /// The ID for this iframe's nested browsing context.
-    pub browsing_context_id: BrowsingContextId,
-    /// The ID for the top-level ancestor browsing context of this iframe's nested browsing context.
-    pub webview_id: WebViewId,
-    /// The new pipeline ID that the iframe has generated.
-    pub new_pipeline_id: PipelineId,
-    ///  Whether this iframe should be considered private
-    pub is_private: bool,
-    ///  Whether this iframe should be considered secure
-    pub inherited_secure_context: Option<bool>,
-    /// Whether this load should replace the current entry (reload). If true, the current
-    /// entry will be replaced instead of a new entry being added.
-    pub history_handling: NavigationHistoryBehavior,
-}
-
-/// Specifies the information required to load a URL in an iframe.
-#[derive(Debug, Deserialize, Serialize)]
-pub struct IFrameLoadInfoWithData {
-    /// The information required to load an iframe.
-    pub info: IFrameLoadInfo,
-    /// Load data containing the url to load
-    pub load_data: LoadData,
-    /// The old pipeline ID for this iframe, if a page was previously loaded.
-    pub old_pipeline_id: Option<PipelineId>,
-    /// Sandbox type of this iframe
-    pub sandbox: IFrameSandboxState,
-    /// The initial viewport size for this iframe.
-    pub window_size: WindowSizeData,
-}
-
-/// Resources required by workerglobalscopes
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct WorkerGlobalScopeInit {
-    /// Chan to a resource thread
-    pub resource_threads: ResourceThreads,
-    /// Chan to the memory profiler
-    pub mem_profiler_chan: mem::ProfilerChan,
-    /// Chan to the time profiler
-    pub time_profiler_chan: profile_time::ProfilerChan,
-    /// To devtools sender
-    pub to_devtools_sender: Option<IpcSender<ScriptToDevtoolsControlMsg>>,
-    /// From devtools sender
-    pub from_devtools_sender: Option<IpcSender<DevtoolScriptControlMsg>>,
-    /// Messages to send to constellation
-    pub script_to_constellation_chan: ScriptToConstellationChan,
-    /// The worker id
-    pub worker_id: WorkerId,
-    /// The pipeline id
-    pub pipeline_id: PipelineId,
-    /// The origin
-    pub origin: ImmutableOrigin,
-    /// The creation URL
-    pub creation_url: Option<ServoUrl>,
-    /// An optional string allowing the user agnet to be set for testing.
-    pub user_agent: Cow<'static, str>,
-    /// True if secure context
-    pub inherited_secure_context: Option<bool>,
-}
-
-/// Common entities representing a network load origin
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct WorkerScriptLoadOrigin {
-    /// referrer url
-    pub referrer_url: Option<ServoUrl>,
-    /// the referrer policy which is used
-    pub referrer_policy: ReferrerPolicy,
-    /// the pipeline id of the entity requesting the load
-    pub pipeline_id: PipelineId,
-}
-
 /// Errors from executing a paint worklet
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub enum PaintWorkletError {
@@ -632,177 +388,3 @@ pub struct DrawAPaintImageResult {
     /// Drawing the image might have requested loading some image URLs.
     pub missing_image_urls: Vec<ServoUrl>,
 }
-
-/// A Script to Constellation channel.
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct ScriptToConstellationChan {
-    /// Sender for communicating with constellation thread.
-    pub sender: IpcSender<(PipelineId, ScriptMsg)>,
-    /// Used to identify the origin of the message.
-    pub pipeline_id: PipelineId,
-}
-
-impl ScriptToConstellationChan {
-    /// Send ScriptMsg and attach the pipeline_id to the message.
-    pub fn send(&self, msg: ScriptMsg) -> Result<(), IpcError> {
-        self.sender.send((self.pipeline_id, msg))
-    }
-}
-
-/// A data-holder for serialized data and transferred objects.
-/// <https://html.spec.whatwg.org/multipage/#structuredserializewithtransfer>
-#[derive(Debug, Default, Deserialize, MallocSizeOf, Serialize)]
-pub struct StructuredSerializedData {
-    /// Data serialized by SpiderMonkey.
-    pub serialized: Vec<u8>,
-    /// Serialized in a structured callback,
-    pub blobs: Option<HashMap<BlobId, BlobImpl>>,
-    /// Serialized point objects.
-    pub points: Option<HashMap<DomPointId, DomPoint>>,
-    /// Transferred objects.
-    pub ports: Option<HashMap<MessagePortId, MessagePortImpl>>,
-}
-
-pub(crate) trait BroadcastClone
-where
-    Self: Sized,
-{
-    /// The ID type that uniquely identify each value.
-    type Id: Eq + std::hash::Hash + Copy;
-    /// Clone this value so that it can be reused with a broadcast channel.
-    /// Only return None if cloning is impossible.
-    fn clone_for_broadcast(&self) -> Option<Self>;
-    /// The field from which to clone values.
-    fn source(data: &StructuredSerializedData) -> &Option<HashMap<Self::Id, Self>>;
-    /// The field into which to place cloned values.
-    fn destination(data: &mut StructuredSerializedData) -> &mut Option<HashMap<Self::Id, Self>>;
-}
-
-/// All the DOM interfaces that can be serialized.
-#[derive(Clone, Copy, Debug, EnumIter)]
-pub enum Serializable {
-    /// The `Blob` interface.
-    Blob,
-    /// The `DOMPoint` interface.
-    DomPoint,
-    /// The `DOMPointReadOnly` interface.
-    DomPointReadOnly,
-}
-
-impl Serializable {
-    fn clone_values(&self) -> fn(&StructuredSerializedData, &mut StructuredSerializedData) {
-        match self {
-            Serializable::Blob => StructuredSerializedData::clone_all_of_type::<BlobImpl>,
-            Serializable::DomPointReadOnly => {
-                StructuredSerializedData::clone_all_of_type::<DomPoint>
-            },
-            Serializable::DomPoint => StructuredSerializedData::clone_all_of_type::<DomPoint>,
-        }
-    }
-}
-
-/// All the DOM interfaces that can be transferred.
-#[derive(Clone, Copy, Debug, EnumIter)]
-pub enum Transferrable {
-    /// The `MessagePort` interface.
-    MessagePort,
-}
-
-impl StructuredSerializedData {
-    fn is_empty(&self, val: Transferrable) -> bool {
-        fn is_field_empty<K, V>(field: &Option<HashMap<K, V>>) -> bool {
-            field.as_ref().is_some_and(|h| h.is_empty())
-        }
-        match val {
-            Transferrable::MessagePort => is_field_empty(&self.ports),
-        }
-    }
-
-    /// Clone all values of the same type stored in this StructuredSerializedData
-    /// into another instance.
-    fn clone_all_of_type<T: BroadcastClone>(&self, cloned: &mut StructuredSerializedData) {
-        let existing = T::source(self);
-        let Some(existing) = existing else { return };
-        let mut clones = HashMap::with_capacity(existing.len());
-
-        for (original_id, obj) in existing.iter() {
-            if let Some(clone) = obj.clone_for_broadcast() {
-                clones.insert(*original_id, clone);
-            }
-        }
-
-        *T::destination(cloned) = Some(clones);
-    }
-
-    /// Clone the serialized data for use with broadcast-channels.
-    pub fn clone_for_broadcast(&self) -> StructuredSerializedData {
-        for transferrable in Transferrable::iter() {
-            if !self.is_empty(transferrable) {
-                // Not panicking only because this is called from the constellation.
-                warn!(
-                    "Attempt to broadcast structured serialized data including {:?} (should never happen).",
-                    transferrable,
-                );
-            }
-        }
-
-        let serialized = self.serialized.clone();
-
-        let mut cloned = StructuredSerializedData {
-            serialized,
-            ..Default::default()
-        };
-
-        for serializable in Serializable::iter() {
-            let clone_impl = serializable.clone_values();
-            clone_impl(self, &mut cloned);
-        }
-
-        cloned
-    }
-}
-
-/// A task on the <https://html.spec.whatwg.org/multipage/#port-message-queue>
-#[derive(Debug, Deserialize, MallocSizeOf, Serialize)]
-pub struct PortMessageTask {
-    /// The origin of this task.
-    pub origin: ImmutableOrigin,
-    /// A data-holder for serialized data and transferred objects.
-    pub data: StructuredSerializedData,
-}
-
-/// Messages for communication between the constellation and a global managing ports.
-#[derive(Debug, Deserialize, Serialize)]
-pub enum MessagePortMsg {
-    /// Complete the transfer for a batch of ports.
-    CompleteTransfer(HashMap<MessagePortId, VecDeque<PortMessageTask>>),
-    /// Complete the transfer of a single port,
-    /// whose transfer was pending because it had been requested
-    /// while a previous failed transfer was being rolled-back.
-    CompletePendingTransfer(MessagePortId, VecDeque<PortMessageTask>),
-    /// Remove a port, the entangled one doesn't exists anymore.
-    RemoveMessagePort(MessagePortId),
-    /// Handle a new port-message-task.
-    NewTask(MessagePortId, PortMessageTask),
-}
-
-/// Message for communication between the constellation and a global managing broadcast channels.
-#[derive(Debug, Deserialize, Serialize)]
-pub struct BroadcastMsg {
-    /// The origin of this message.
-    pub origin: ImmutableOrigin,
-    /// The name of the channel.
-    pub channel_name: String,
-    /// A data-holder for serialized data.
-    pub data: StructuredSerializedData,
-}
-
-impl Clone for BroadcastMsg {
-    fn clone(&self) -> BroadcastMsg {
-        BroadcastMsg {
-            data: self.data.clone_for_broadcast(),
-            origin: self.origin.clone(),
-            channel_name: self.channel_name.clone(),
-        }
-    }
-}
diff --git a/components/shared/script/script_msg.rs b/components/shared/script/script_msg.rs
deleted file mode 100644
index 33ebb496dc7..00000000000
--- a/components/shared/script/script_msg.rs
+++ /dev/null
@@ -1,389 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::collections::{HashMap, VecDeque};
-use std::fmt;
-
-use base::Epoch;
-use base::id::{
-    BroadcastChannelRouterId, BrowsingContextId, HistoryStateId, MessagePortId,
-    MessagePortRouterId, PipelineId, ServiceWorkerId, ServiceWorkerRegistrationId, WebViewId,
-};
-use canvas_traits::canvas::{CanvasId, CanvasMsg};
-use constellation_traits::{LogEntry, TraversalDirection};
-use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId};
-use embedder_traits::{EmbedderMsg, MediaSessionEvent, TouchEventType, TouchSequenceId};
-use euclid::Size2D;
-use euclid::default::Size2D as UntypedSize2D;
-use ipc_channel::ipc::{IpcReceiver, IpcSender};
-use net_traits::CoreResourceMsg;
-use net_traits::storage_thread::StorageType;
-use serde::{Deserialize, Serialize};
-use servo_url::{ImmutableOrigin, ServoUrl};
-use strum_macros::IntoStaticStr;
-use style_traits::CSSPixel;
-#[cfg(feature = "webgpu")]
-use webgpu::{WebGPU, WebGPUAdapterResponse, wgc};
-use webrender_api::ImageKey;
-
-use crate::mem::MemoryReportResult;
-use crate::{
-    AnimationState, AuxiliaryWebViewCreationRequest, BroadcastMsg, DocumentState,
-    IFrameLoadInfoWithData, LoadData, MessagePortMsg, NavigationHistoryBehavior, PortMessageTask,
-    StructuredSerializedData, WindowSizeType, WorkerGlobalScopeInit, WorkerScriptLoadOrigin,
-};
-
-/// An iframe sizing operation.
-#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
-pub struct IFrameSizeMsg {
-    /// The child browsing context for this iframe.
-    pub browsing_context_id: BrowsingContextId,
-    /// The size of the iframe.
-    pub size: Size2D<f32, CSSPixel>,
-    /// The kind of sizing operation.
-    pub type_: WindowSizeType,
-}
-
-/// Whether the default action for a touch event was prevented by web content
-#[derive(Debug, Deserialize, Serialize)]
-pub enum TouchEventResult {
-    /// Allowed by web content
-    DefaultAllowed(TouchSequenceId, TouchEventType),
-    /// Prevented by web content
-    DefaultPrevented(TouchSequenceId, TouchEventType),
-}
-
-/// Messages from the script to the constellation.
-#[derive(Deserialize, IntoStaticStr, Serialize)]
-pub enum ScriptMsg {
-    /// Request to complete the transfer of a set of ports to a router.
-    CompleteMessagePortTransfer(MessagePortRouterId, Vec<MessagePortId>),
-    /// The results of attempting to complete the transfer of a batch of ports.
-    MessagePortTransferResult(
-        /* The router whose transfer of ports succeeded, if any */
-        Option<MessagePortRouterId>,
-        /* The ids of ports transferred successfully */
-        Vec<MessagePortId>,
-        /* The ids, and buffers, of ports whose transfer failed */
-        HashMap<MessagePortId, VecDeque<PortMessageTask>>,
-    ),
-    /// A new message-port was created or transferred, with corresponding control-sender.
-    NewMessagePort(MessagePortRouterId, MessagePortId),
-    /// A global has started managing message-ports
-    NewMessagePortRouter(MessagePortRouterId, IpcSender<MessagePortMsg>),
-    /// A global has stopped managing message-ports
-    RemoveMessagePortRouter(MessagePortRouterId),
-    /// A task requires re-routing to an already shipped message-port.
-    RerouteMessagePort(MessagePortId, PortMessageTask),
-    /// A message-port was shipped, let the entangled port know.
-    MessagePortShipped(MessagePortId),
-    /// A message-port has been discarded by script.
-    RemoveMessagePort(MessagePortId),
-    /// Entangle two message-ports.
-    EntanglePorts(MessagePortId, MessagePortId),
-    /// A global has started managing broadcast-channels.
-    NewBroadcastChannelRouter(
-        BroadcastChannelRouterId,
-        IpcSender<BroadcastMsg>,
-        ImmutableOrigin,
-    ),
-    /// A global has stopped managing broadcast-channels.
-    RemoveBroadcastChannelRouter(BroadcastChannelRouterId, ImmutableOrigin),
-    /// A global started managing broadcast channels for a given channel-name.
-    NewBroadcastChannelNameInRouter(BroadcastChannelRouterId, String, ImmutableOrigin),
-    /// A global stopped managing broadcast channels for a given channel-name.
-    RemoveBroadcastChannelNameInRouter(BroadcastChannelRouterId, String, ImmutableOrigin),
-    /// Broadcast a message to all same-origin broadcast channels,
-    /// excluding the source of the broadcast.
-    ScheduleBroadcast(BroadcastChannelRouterId, BroadcastMsg),
-    /// Forward a message to the embedder.
-    ForwardToEmbedder(EmbedderMsg),
-    /// Broadcast a storage event to every same-origin pipeline.
-    /// The strings are key, old value and new value.
-    BroadcastStorageEvent(
-        StorageType,
-        ServoUrl,
-        Option<String>,
-        Option<String>,
-        Option<String>,
-    ),
-    /// Indicates whether this pipeline is currently running animations.
-    ChangeRunningAnimationsState(AnimationState),
-    /// Requests that a new 2D canvas thread be created. (This is done in the constellation because
-    /// 2D canvases may use the GPU and we don't want to give untrusted content access to the GPU.)
-    CreateCanvasPaintThread(
-        UntypedSize2D<u64>,
-        IpcSender<(IpcSender<CanvasMsg>, CanvasId, ImageKey)>,
-    ),
-    /// Notifies the constellation that this frame has received focus.
-    Focus,
-    /// Get the top-level browsing context info for a given browsing context.
-    GetTopForBrowsingContext(BrowsingContextId, IpcSender<Option<WebViewId>>),
-    /// Get the browsing context id of the browsing context in which pipeline is
-    /// embedded and the parent pipeline id of that browsing context.
-    GetBrowsingContextInfo(
-        PipelineId,
-        IpcSender<Option<(BrowsingContextId, Option<PipelineId>)>>,
-    ),
-    /// Get the nth child browsing context ID for a given browsing context, sorted in tree order.
-    GetChildBrowsingContextId(
-        BrowsingContextId,
-        usize,
-        IpcSender<Option<BrowsingContextId>>,
-    ),
-    /// All pending loads are complete, and the `load` event for this pipeline
-    /// has been dispatched.
-    LoadComplete,
-    /// A new load has been requested, with an option to replace the current entry once loaded
-    /// instead of adding a new entry.
-    LoadUrl(LoadData, NavigationHistoryBehavior),
-    /// Abort loading after sending a LoadUrl message.
-    AbortLoadUrl,
-    /// Post a message to the currently active window of a given browsing context.
-    PostMessage {
-        /// The target of the posted message.
-        target: BrowsingContextId,
-        /// The source of the posted message.
-        source: PipelineId,
-        /// The expected origin of the target.
-        target_origin: Option<ImmutableOrigin>,
-        /// The source origin of the message.
-        /// <https://html.spec.whatwg.org/multipage/#dom-messageevent-origin>
-        source_origin: ImmutableOrigin,
-        /// The data to be posted.
-        data: StructuredSerializedData,
-    },
-    /// Inform the constellation that a fragment was navigated to and whether or not it was a replacement navigation.
-    NavigatedToFragment(ServoUrl, NavigationHistoryBehavior),
-    /// HTMLIFrameElement Forward or Back traversal.
-    TraverseHistory(TraversalDirection),
-    /// Inform the constellation of a pushed history state.
-    PushHistoryState(HistoryStateId, ServoUrl),
-    /// Inform the constellation of a replaced history state.
-    ReplaceHistoryState(HistoryStateId, ServoUrl),
-    /// Gets the length of the joint session history from the constellation.
-    JointSessionHistoryLength(IpcSender<u32>),
-    /// Notification that this iframe should be removed.
-    /// Returns a list of pipelines which were closed.
-    RemoveIFrame(BrowsingContextId, IpcSender<Vec<PipelineId>>),
-    /// Successful response to [crate::ConstellationControlMsg::SetThrottled].
-    SetThrottledComplete(bool),
-    /// A load has been requested in an IFrame.
-    ScriptLoadedURLInIFrame(IFrameLoadInfoWithData),
-    /// A load of the initial `about:blank` has been completed in an IFrame.
-    ScriptNewIFrame(IFrameLoadInfoWithData),
-    /// Script has opened a new auxiliary browsing context.
-    CreateAuxiliaryWebView(AuxiliaryWebViewCreationRequest),
-    /// Mark a new document as active
-    ActivateDocument,
-    /// Set the document state for a pipeline (used by screenshot / reftests)
-    SetDocumentState(DocumentState),
-    /// Update the layout epoch in the constellation (used by screenshot / reftests).
-    SetLayoutEpoch(Epoch, IpcSender<bool>),
-    /// Update the pipeline Url, which can change after redirections.
-    SetFinalUrl(ServoUrl),
-    /// Script has handled a touch event, and either prevented or allowed default actions.
-    TouchEventProcessed(TouchEventResult),
-    /// A log entry, with the top-level browsing context id and thread name
-    LogEntry(Option<String>, LogEntry),
-    /// Discard the document.
-    DiscardDocument,
-    /// Discard the browsing context.
-    DiscardTopLevelBrowsingContext,
-    /// Notifies the constellation that this pipeline has exited.
-    PipelineExited,
-    /// Send messages from postMessage calls from serviceworker
-    /// to constellation for storing in service worker manager
-    ForwardDOMMessage(DOMMessage, ServoUrl),
-    /// <https://w3c.github.io/ServiceWorker/#schedule-job-algorithm>
-    ScheduleJob(Job),
-    /// Notifies the constellation about media session events
-    /// (i.e. when there is metadata for the active media session, playback state changes...).
-    MediaSessionEvent(PipelineId, MediaSessionEvent),
-    #[cfg(feature = "webgpu")]
-    /// Create a WebGPU Adapter instance
-    RequestAdapter(
-        IpcSender<WebGPUAdapterResponse>,
-        wgc::instance::RequestAdapterOptions,
-        wgc::id::AdapterId,
-    ),
-    #[cfg(feature = "webgpu")]
-    /// Get WebGPU channel
-    GetWebGPUChan(IpcSender<Option<WebGPU>>),
-    /// Notify the constellation of a pipeline's document's title.
-    TitleChanged(PipelineId, String),
-    /// Notify the constellation that the size of some `<iframe>`s has changed.
-    IFrameSizes(Vec<IFrameSizeMsg>),
-    /// Request results from the memory reporter.
-    ReportMemory(IpcSender<MemoryReportResult>),
-}
-
-impl fmt::Debug for ScriptMsg {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        let variant_string: &'static str = self.into();
-        write!(formatter, "ScriptMsg::{variant_string}")
-    }
-}
-
-/// Entities required to spawn service workers
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct ScopeThings {
-    /// script resource url
-    pub script_url: ServoUrl,
-    /// network load origin of the resource
-    pub worker_load_origin: WorkerScriptLoadOrigin,
-    /// base resources required to create worker global scopes
-    pub init: WorkerGlobalScopeInit,
-    /// the port to receive devtools message from
-    pub devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>,
-    /// service worker id
-    pub worker_id: WorkerId,
-}
-
-/// Message that gets passed to service worker scope on postMessage
-#[derive(Debug, Deserialize, Serialize)]
-pub struct DOMMessage {
-    /// The origin of the message
-    pub origin: ImmutableOrigin,
-    /// The payload of the message
-    pub data: StructuredSerializedData,
-}
-
-/// Channels to allow service worker manager to communicate with constellation and resource thread
-#[derive(Deserialize, Serialize)]
-pub struct SWManagerSenders {
-    /// Sender of messages to the constellation.
-    pub swmanager_sender: IpcSender<SWManagerMsg>,
-    /// Sender for communicating with resource thread.
-    pub resource_sender: IpcSender<CoreResourceMsg>,
-    /// Sender of messages to the manager.
-    pub own_sender: IpcSender<ServiceWorkerMsg>,
-    /// Receiver of messages from the constellation.
-    pub receiver: IpcReceiver<ServiceWorkerMsg>,
-}
-
-/// Messages sent to Service Worker Manager thread
-#[derive(Debug, Deserialize, Serialize)]
-pub enum ServiceWorkerMsg {
-    /// Timeout message sent by active service workers
-    Timeout(ServoUrl),
-    /// Message sent by constellation to forward to a running service worker
-    ForwardDOMMessage(DOMMessage, ServoUrl),
-    /// <https://w3c.github.io/ServiceWorker/#schedule-job-algorithm>
-    ScheduleJob(Job),
-    /// Exit the service worker manager
-    Exit,
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-/// <https://w3c.github.io/ServiceWorker/#dfn-job-type>
-pub enum JobType {
-    /// <https://w3c.github.io/ServiceWorker/#register>
-    Register,
-    /// <https://w3c.github.io/ServiceWorker/#unregister-algorithm>
-    Unregister,
-    /// <https://w3c.github.io/ServiceWorker/#update-algorithm>
-    Update,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-/// The kind of error the job promise should be rejected with.
-pub enum JobError {
-    /// <https://w3c.github.io/ServiceWorker/#reject-job-promise>
-    TypeError,
-    /// <https://w3c.github.io/ServiceWorker/#reject-job-promise>
-    SecurityError,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-#[allow(clippy::large_enum_variant)]
-/// Messages sent from Job algorithms steps running in the SW manager,
-/// in order to resolve or reject the job promise.
-pub enum JobResult {
-    /// <https://w3c.github.io/ServiceWorker/#reject-job-promise>
-    RejectPromise(JobError),
-    /// <https://w3c.github.io/ServiceWorker/#resolve-job-promise>
-    ResolvePromise(Job, JobResultValue),
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-/// Jobs are resolved with the help of various values.
-pub enum JobResultValue {
-    /// Data representing a serviceworker registration.
-    Registration {
-        /// The Id of the registration.
-        id: ServiceWorkerRegistrationId,
-        /// The installing worker, if any.
-        installing_worker: Option<ServiceWorkerId>,
-        /// The waiting worker, if any.
-        waiting_worker: Option<ServiceWorkerId>,
-        /// The active worker, if any.
-        active_worker: Option<ServiceWorkerId>,
-    },
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-/// <https://w3c.github.io/ServiceWorker/#dfn-job>
-pub struct Job {
-    /// <https://w3c.github.io/ServiceWorker/#dfn-job-type>
-    pub job_type: JobType,
-    /// <https://w3c.github.io/ServiceWorker/#dfn-job-scope-url>
-    pub scope_url: ServoUrl,
-    /// <https://w3c.github.io/ServiceWorker/#dfn-job-script-url>
-    pub script_url: ServoUrl,
-    /// <https://w3c.github.io/ServiceWorker/#dfn-job-client>
-    pub client: IpcSender<JobResult>,
-    /// <https://w3c.github.io/ServiceWorker/#job-referrer>
-    pub referrer: ServoUrl,
-    /// Various data needed to process job.
-    pub scope_things: Option<ScopeThings>,
-}
-
-impl Job {
-    /// <https://w3c.github.io/ServiceWorker/#create-job-algorithm>
-    pub fn create_job(
-        job_type: JobType,
-        scope_url: ServoUrl,
-        script_url: ServoUrl,
-        client: IpcSender<JobResult>,
-        referrer: ServoUrl,
-        scope_things: Option<ScopeThings>,
-    ) -> Job {
-        Job {
-            job_type,
-            scope_url,
-            script_url,
-            client,
-            referrer,
-            scope_things,
-        }
-    }
-}
-
-impl PartialEq for Job {
-    /// Equality criteria as described in <https://w3c.github.io/ServiceWorker/#dfn-job-equivalent>
-    fn eq(&self, other: &Self) -> bool {
-        // TODO: match on job type, take worker type and `update_via_cache_mode` into account.
-        let same_job = self.job_type == other.job_type;
-        if same_job {
-            match self.job_type {
-                JobType::Register | JobType::Update => {
-                    self.scope_url == other.scope_url && self.script_url == other.script_url
-                },
-                JobType::Unregister => self.scope_url == other.scope_url,
-            }
-        } else {
-            false
-        }
-    }
-}
-
-/// Messages outgoing from the Service Worker Manager thread to constellation
-#[derive(Debug, Deserialize, Serialize)]
-pub enum SWManagerMsg {
-    /// Placeholder to keep the enum,
-    /// as it will be needed when implementing
-    /// <https://github.com/servo/servo/issues/24660>
-    PostMessageToClient,
-}
diff --git a/components/shared/script/serializable.rs b/components/shared/script/serializable.rs
deleted file mode 100644
index 5d89c622bee..00000000000
--- a/components/shared/script/serializable.rs
+++ /dev/null
@@ -1,217 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-//! This module contains implementations in script that are serializable,
-//! as per <https://html.spec.whatwg.org/multipage/#serializable-objects>.
-//! The implementations are here instead of in script
-//! so that the other modules involved in the serialization don't have
-//! to depend on script.
-
-use std::cell::RefCell;
-use std::path::PathBuf;
-
-use base::id::{BlobId, DomPointId};
-use malloc_size_of_derive::MallocSizeOf;
-use net_traits::filemanager_thread::RelativePos;
-use serde::{Deserialize, Serialize};
-use uuid::Uuid;
-
-/// File-based blob
-#[derive(Debug, Deserialize, MallocSizeOf, Serialize)]
-pub struct FileBlob {
-    #[ignore_malloc_size_of = "Uuid are hard(not really)"]
-    id: Uuid,
-    #[ignore_malloc_size_of = "PathBuf are hard"]
-    name: Option<PathBuf>,
-    cache: RefCell<Option<Vec<u8>>>,
-    size: u64,
-}
-
-impl FileBlob {
-    /// Create a new file blob.
-    pub fn new(id: Uuid, name: Option<PathBuf>, cache: Option<Vec<u8>>, size: u64) -> FileBlob {
-        FileBlob {
-            id,
-            name,
-            cache: RefCell::new(cache),
-            size,
-        }
-    }
-
-    /// Get the size of the file.
-    pub fn get_size(&self) -> u64 {
-        self.size
-    }
-
-    /// Get the cached file data, if any.
-    pub fn get_cache(&self) -> Option<Vec<u8>> {
-        self.cache.borrow().clone()
-    }
-
-    /// Cache data.
-    pub fn cache_bytes(&self, bytes: Vec<u8>) {
-        *self.cache.borrow_mut() = Some(bytes);
-    }
-
-    /// Get the file id.
-    pub fn get_id(&self) -> Uuid {
-        self.id
-    }
-}
-
-impl crate::BroadcastClone for BlobImpl {
-    type Id = BlobId;
-
-    fn source(
-        data: &crate::StructuredSerializedData,
-    ) -> &Option<std::collections::HashMap<Self::Id, Self>> {
-        &data.blobs
-    }
-
-    fn destination(
-        data: &mut crate::StructuredSerializedData,
-    ) -> &mut Option<std::collections::HashMap<Self::Id, Self>> {
-        &mut data.blobs
-    }
-
-    fn clone_for_broadcast(&self) -> Option<Self> {
-        let type_string = self.type_string();
-
-        if let BlobData::Memory(bytes) = self.blob_data() {
-            let blob_clone = BlobImpl::new_from_bytes(bytes.clone(), type_string);
-
-            // Note: we insert the blob at the original id,
-            // otherwise this will not match the storage key as serialized by SM in `serialized`.
-            // The clone has it's own new Id however.
-            return Some(blob_clone);
-        } else {
-            // Not panicking only because this is called from the constellation.
-            log::warn!("Serialized blob not in memory format(should never happen).");
-        }
-        None
-    }
-}
-
-/// The data backing a DOM Blob.
-#[derive(Debug, Deserialize, MallocSizeOf, Serialize)]
-pub struct BlobImpl {
-    /// UUID of the blob.
-    blob_id: BlobId,
-    /// Content-type string
-    type_string: String,
-    /// Blob data-type.
-    blob_data: BlobData,
-    /// Sliced blobs referring to this one.
-    slices: Vec<BlobId>,
-}
-
-/// Different backends of Blob
-#[derive(Debug, Deserialize, MallocSizeOf, Serialize)]
-pub enum BlobData {
-    /// File-based blob, whose content lives in the net process
-    File(FileBlob),
-    /// Memory-based blob, whose content lives in the script process
-    Memory(Vec<u8>),
-    /// Sliced blob, including parent blob-id and
-    /// relative positions of current slicing range,
-    /// IMPORTANT: The depth of tree is only two, i.e. the parent Blob must be
-    /// either File-based or Memory-based
-    Sliced(BlobId, RelativePos),
-}
-
-impl BlobImpl {
-    /// Construct memory-backed BlobImpl
-    pub fn new_from_bytes(bytes: Vec<u8>, type_string: String) -> BlobImpl {
-        let blob_id = BlobId::new();
-        let blob_data = BlobData::Memory(bytes);
-        BlobImpl {
-            blob_id,
-            type_string,
-            blob_data,
-            slices: vec![],
-        }
-    }
-
-    /// Construct file-backed BlobImpl from File ID
-    pub fn new_from_file(file_id: Uuid, name: PathBuf, size: u64, type_string: String) -> BlobImpl {
-        let blob_id = BlobId::new();
-        let blob_data = BlobData::File(FileBlob {
-            id: file_id,
-            name: Some(name),
-            cache: RefCell::new(None),
-            size,
-        });
-        BlobImpl {
-            blob_id,
-            type_string,
-            blob_data,
-            slices: vec![],
-        }
-    }
-
-    /// Construct a BlobImpl from a slice of a parent.
-    pub fn new_sliced(rel_pos: RelativePos, parent: BlobId, type_string: String) -> BlobImpl {
-        let blob_id = BlobId::new();
-        let blob_data = BlobData::Sliced(parent, rel_pos);
-        BlobImpl {
-            blob_id,
-            type_string,
-            blob_data,
-            slices: vec![],
-        }
-    }
-
-    /// Get a clone of the blob-id
-    pub fn blob_id(&self) -> BlobId {
-        self.blob_id
-    }
-
-    /// Get a clone of the type-string
-    pub fn type_string(&self) -> String {
-        self.type_string.clone()
-    }
-
-    /// Get a mutable ref to the data
-    pub fn blob_data(&self) -> &BlobData {
-        &self.blob_data
-    }
-
-    /// Get a mutable ref to the data
-    pub fn blob_data_mut(&mut self) -> &mut BlobData {
-        &mut self.blob_data
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
-/// A serializable version of the DOMPoint/DOMPointReadOnly interface.
-pub struct DomPoint {
-    /// The x coordinate.
-    pub x: f64,
-    /// The y coordinate.
-    pub y: f64,
-    /// The z coordinate.
-    pub z: f64,
-    /// The w coordinate.
-    pub w: f64,
-}
-
-impl crate::BroadcastClone for DomPoint {
-    type Id = DomPointId;
-
-    fn source(
-        data: &crate::StructuredSerializedData,
-    ) -> &Option<std::collections::HashMap<Self::Id, Self>> {
-        &data.points
-    }
-
-    fn destination(
-        data: &mut crate::StructuredSerializedData,
-    ) -> &mut Option<std::collections::HashMap<Self::Id, Self>> {
-        &mut data.points
-    }
-
-    fn clone_for_broadcast(&self) -> Option<Self> {
-        Some(self.clone())
-    }
-}
diff --git a/components/shared/script_layout/Cargo.toml b/components/shared/script_layout/Cargo.toml
index ddb4017c21c..06690192f73 100644
--- a/components/shared/script_layout/Cargo.toml
+++ b/components/shared/script_layout/Cargo.toml
@@ -16,11 +16,14 @@ base = { workspace = true }
 app_units = { workspace = true }
 atomic_refcell = { workspace = true }
 canvas_traits = { workspace = true }
+compositing_traits = { workspace = true }
 constellation_traits = { workspace = true }
+embedder_traits = { workspace = true }
 euclid = { workspace = true }
 fnv = { workspace = true }
 fonts = { path = "../../fonts" }
 fonts_traits = { workspace = true }
+fxhash = { workspace = true }
 html5ever = { workspace = true }
 ipc-channel = { workspace = true }
 libc = { workspace = true }
@@ -39,4 +42,3 @@ servo_url = { path = "../../url" }
 stylo = { workspace = true }
 stylo_traits = { workspace = true }
 webrender_api = { workspace = true }
-webrender_traits = { workspace = true }
diff --git a/components/shared/script_layout/lib.rs b/components/shared/script_layout/lib.rs
index 9c70394b0fd..1f526b64240 100644
--- a/components/shared/script_layout/lib.rs
+++ b/components/shared/script_layout/lib.rs
@@ -11,7 +11,6 @@
 pub mod wrapper_traits;
 
 use std::any::Any;
-use std::borrow::Cow;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicIsize, AtomicU64, Ordering};
 
@@ -19,18 +18,22 @@ use app_units::Au;
 use atomic_refcell::AtomicRefCell;
 use base::Epoch;
 use base::id::{BrowsingContextId, PipelineId, WebViewId};
-use constellation_traits::{ScrollState, UntrustedNodeAddress, WindowSizeData};
-use euclid::Size2D;
+use compositing_traits::CrossProcessCompositorApi;
+use constellation_traits::{LoadData, ScrollState};
+use embedder_traits::{UntrustedNodeAddress, ViewportDetails};
 use euclid::default::{Point2D, Rect};
 use fnv::FnvHashMap;
 use fonts::{FontContext, SystemFontServiceProxy};
+use fxhash::FxHashMap;
 use ipc_channel::ipc::IpcSender;
 use libc::c_void;
+use malloc_size_of::{MallocSizeOf as MallocSizeOfTrait, MallocSizeOfOps};
 use malloc_size_of_derive::MallocSizeOf;
 use net_traits::image_cache::{ImageCache, PendingImageId};
+use pixels::Image;
 use profile_traits::mem::Report;
 use profile_traits::time;
-use script_traits::{InitialScriptState, LoadData, Painter, ScriptThreadMessage};
+use script_traits::{InitialScriptState, Painter, ScriptThreadMessage};
 use serde::{Deserialize, Serialize};
 use servo_arc::Arc as ServoArc;
 use servo_url::{ImmutableOrigin, ServoUrl};
@@ -46,11 +49,13 @@ use style::properties::style_structs::Font;
 use style::queries::values::PrefersColorScheme;
 use style::selector_parser::{PseudoElement, RestyleDamage, Snapshot};
 use style::stylesheets::Stylesheet;
-use style_traits::CSSPixel;
 use webrender_api::ImageKey;
-use webrender_traits::CrossProcessCompositorApi;
 
-pub type GenericLayoutData = dyn Any + Send + Sync;
+pub trait GenericLayoutDataTrait: Any + MallocSizeOfTrait {
+    fn as_any(&self) -> &dyn Any;
+}
+
+pub type GenericLayoutData = dyn GenericLayoutDataTrait + Send + Sync;
 
 #[derive(MallocSizeOf)]
 pub struct StyleData {
@@ -58,7 +63,6 @@ pub struct StyleData {
     /// style system is being used standalone, this is all that hangs
     /// off the node. This must be first to permit the various
     /// transmutations between ElementData and PersistentLayoutData.
-    #[ignore_malloc_size_of = "This probably should not be ignored"]
     pub element_data: AtomicRefCell<ElementData>,
 
     /// Information needed during parallel traversals.
@@ -110,19 +114,12 @@ pub enum LayoutElementType {
     HTMLTableRowElement,
     HTMLTableSectionElement,
     HTMLTextAreaElement,
+    SVGImageElement,
     SVGSVGElement,
 }
 
-pub enum HTMLCanvasDataSource {
-    WebGL(ImageKey),
-    Image(ImageKey),
-    WebGPU(ImageKey),
-    /// transparent black
-    Empty,
-}
-
 pub struct HTMLCanvasData {
-    pub source: HTMLCanvasDataSource,
+    pub source: Option<ImageKey>,
     pub width: u32,
     pub height: u32,
 }
@@ -184,7 +181,7 @@ pub struct LayoutConfig {
     pub font_context: Arc<FontContext>,
     pub time_profiler_chan: time::ProfilerChan,
     pub compositor_api: CrossProcessCompositorApi,
-    pub window_size: WindowSizeData,
+    pub viewport_details: ViewportDetails,
 }
 
 pub trait LayoutFactory: Send + Sync {
@@ -217,7 +214,7 @@ pub trait Layout {
 
     /// Requests that layout measure its memory usage. The resulting reports are sent back
     /// via the supplied channel.
-    fn collect_reports(&self, reports: &mut Vec<Report>);
+    fn collect_reports(&self, reports: &mut Vec<Report>, ops: &mut MallocSizeOfOps);
 
     /// Sets quirks mode for the document, causing the quirks mode stylesheet to be used.
     fn set_quirks_mode(&mut self, quirks_mode: QuirksMode);
@@ -239,16 +236,16 @@ pub trait Layout {
     /// Set the scroll states of this layout after a compositor scroll.
     fn set_scroll_offsets(&mut self, scroll_states: &[ScrollState]);
 
-    fn query_content_box(&self, node: OpaqueNode) -> Option<Rect<Au>>;
-    fn query_content_boxes(&self, node: OpaqueNode) -> Vec<Rect<Au>>;
-    fn query_client_rect(&self, node: OpaqueNode) -> Rect<i32>;
+    fn query_content_box(&self, node: TrustedNodeAddress) -> Option<Rect<Au>>;
+    fn query_content_boxes(&self, node: TrustedNodeAddress) -> Vec<Rect<Au>>;
+    fn query_client_rect(&self, node: TrustedNodeAddress) -> Rect<i32>;
     fn query_element_inner_outer_text(&self, node: TrustedNodeAddress) -> String;
     fn query_nodes_from_point(
         &self,
         point: Point2D<f32>,
         query_type: NodesFromPointQueryType,
     ) -> Vec<UntrustedNodeAddress>;
-    fn query_offset_parent(&self, node: OpaqueNode) -> OffsetParentResponse;
+    fn query_offset_parent(&self, node: TrustedNodeAddress) -> OffsetParentResponse;
     fn query_resolved_style(
         &self,
         node: TrustedNodeAddress,
@@ -264,7 +261,7 @@ pub trait Layout {
         animations: DocumentAnimationSet,
         animation_timeline_value: f64,
     ) -> Option<ServoArc<Font>>;
-    fn query_scrolling_area(&self, node: Option<OpaqueNode>) -> Rect<i32>;
+    fn query_scrolling_area(&self, node: Option<TrustedNodeAddress>) -> Rect<i32>;
     fn query_text_indext(&self, node: OpaqueNode, point: Point2D<f32>) -> Option<usize>;
 }
 
@@ -278,7 +275,6 @@ pub trait ScriptThreadFactory {
         layout_factory: Arc<dyn LayoutFactory>,
         system_font_service: Arc<SystemFontServiceProxy>,
         load_data: LoadData,
-        user_agent: Cow<'static, str>,
     );
 }
 #[derive(Clone, Default)]
@@ -386,7 +382,7 @@ pub struct Reflow {
 pub struct IFrameSize {
     pub browsing_context_id: BrowsingContextId,
     pub pipeline_id: PipelineId,
-    pub size: Size2D<f32, CSSPixel>,
+    pub viewport_details: ViewportDetails,
 }
 
 pub type IFrameSizes = FnvHashMap<BrowsingContextId, IFrameSize>;
@@ -400,6 +396,8 @@ pub struct ReflowResult {
     /// to communicate them with the Constellation and also the `Window`
     /// element of their content pages.
     pub iframe_sizes: IFrameSizes,
+    /// The mapping of node to animated image, need to be returned to ImageAnimationManager
+    pub node_to_image_animation_map: FxHashMap<OpaqueNode, ImageAnimationState>,
 }
 
 /// Information needed for a script-initiated reflow.
@@ -413,8 +411,8 @@ pub struct ReflowRequest {
     pub dirty_root: Option<TrustedNodeAddress>,
     /// Whether the document's stylesheets have changed since the last script reflow.
     pub stylesheets_changed: bool,
-    /// The current window size.
-    pub window_size: WindowSizeData,
+    /// The current [`ViewportDetails`] to use for this reflow.
+    pub viewport_details: ViewportDetails,
     /// The goal of this reflow.
     pub reflow_goal: ReflowGoal,
     /// The number of objects in the dom #10110
@@ -427,8 +425,12 @@ pub struct ReflowRequest {
     pub animation_timeline_value: f64,
     /// The set of animations for this document.
     pub animations: DocumentAnimationSet,
+    /// The set of image animations.
+    pub node_to_image_animation_map: FxHashMap<OpaqueNode, ImageAnimationState>,
     /// The theme for the window
     pub theme: PrefersColorScheme,
+    /// The node highlighted by the devtools, if any
+    pub highlighted_dom_node: Option<OpaqueNode>,
 }
 
 /// A pending restyle.
@@ -501,3 +503,25 @@ pub fn node_id_from_scroll_id(id: usize) -> Option<usize> {
     }
     None
 }
+
+#[derive(Clone, Debug, MallocSizeOf)]
+pub struct ImageAnimationState {
+    #[ignore_malloc_size_of = "Arc is hard"]
+    image: Arc<Image>,
+    active_frame: usize,
+    last_update_time: f64,
+}
+
+impl ImageAnimationState {
+    pub fn new(image: Arc<Image>) -> Self {
+        Self {
+            image,
+            active_frame: 0,
+            last_update_time: 0.,
+        }
+    }
+
+    pub fn image_key(&self) -> Option<ImageKey> {
+        self.image.id
+    }
+}
diff --git a/components/shared/script_layout/wrapper_traits.rs b/components/shared/script_layout/wrapper_traits.rs
index 5effbfdf40b..6c4de339c1b 100644
--- a/components/shared/script_layout/wrapper_traits.rs
+++ b/components/shared/script_layout/wrapper_traits.rs
@@ -11,7 +11,7 @@ use std::sync::Arc as StdArc;
 use atomic_refcell::AtomicRef;
 use base::id::{BrowsingContextId, PipelineId};
 use fonts_traits::ByteIndex;
-use html5ever::{LocalName, Namespace, local_name, namespace_url, ns};
+use html5ever::{LocalName, Namespace};
 use pixels::{Image, ImageMetadata};
 use range::Range;
 use servo_arc::Arc;
@@ -25,11 +25,11 @@ use style::selector_parser::{PseudoElement, PseudoElementCascadeType, SelectorIm
 use style::stylist::RuleInclusion;
 
 use crate::{
-    FragmentType, GenericLayoutData, HTMLCanvasData, HTMLMediaData, LayoutNodeType, SVGSVGData,
-    StyleData,
+    FragmentType, GenericLayoutData, GenericLayoutDataTrait, HTMLCanvasData, HTMLMediaData,
+    LayoutNodeType, SVGSVGData, StyleData,
 };
 
-pub trait LayoutDataTrait: Default + Send + Sync + 'static {}
+pub trait LayoutDataTrait: GenericLayoutDataTrait + Default + Send + Sync + 'static {}
 
 /// A wrapper so that layout can access only the methods that it should have access to. Layout must
 /// only ever see these and must never see instances of `LayoutDom`.
@@ -157,25 +157,6 @@ pub trait ThreadSafeLayoutNode<'dom>: Clone + Copy + Debug + NodeInfo + PartialE
     /// the parent until all the children have been processed.
     fn parent_style(&self) -> Arc<ComputedValues>;
 
-    fn get_pseudo(&self, pseudo_element: PseudoElement) -> Option<Self> {
-        self.as_element()
-            .and_then(|element| element.get_pseudo(pseudo_element))
-            .as_ref()
-            .map(ThreadSafeLayoutElement::as_node)
-    }
-
-    fn get_details_summary_pseudo(&self) -> Option<Self> {
-        self.as_element()
-            .and_then(|el| el.get_details_summary_pseudo())
-            .map(|el| el.as_node())
-    }
-
-    fn get_details_content_pseudo(&self) -> Option<Self> {
-        self.as_element()
-            .and_then(|el| el.get_details_content_pseudo())
-            .map(|el| el.as_node())
-    }
-
     fn debug_id(self) -> usize;
 
     /// Returns an iterator over this node's children.
@@ -231,7 +212,7 @@ pub trait ThreadSafeLayoutNode<'dom>: Clone + Copy + Debug + NodeInfo + PartialE
 
     fn node_text_content(self) -> Cow<'dom, str>;
 
-    /// If the insertion point is within this node, returns it. Otherwise, returns `None`.
+    /// If selection intersects this node, return it. Otherwise, returns `None`.
     fn selection(&self) -> Option<Range<ByteIndex>>;
 
     /// If this is an image element, returns its URL. If this is not an image element, fails.
@@ -266,6 +247,13 @@ pub trait ThreadSafeLayoutNode<'dom>: Clone + Copy + Debug + NodeInfo + PartialE
     fn fragment_type(&self) -> FragmentType {
         self.pseudo_element().into()
     }
+
+    fn with_pseudo(&self, pseudo_element_type: PseudoElement) -> Option<Self> {
+        self.as_element()
+            .and_then(|element| element.with_pseudo(pseudo_element_type))
+            .as_ref()
+            .map(ThreadSafeLayoutElement::as_node)
+    }
 }
 
 pub trait ThreadSafeLayoutElement<'dom>:
@@ -283,7 +271,16 @@ pub trait ThreadSafeLayoutElement<'dom>:
 
     /// Creates a new `ThreadSafeLayoutElement` for the same `LayoutElement`
     /// with a different pseudo-element type.
-    fn with_pseudo(&self, pseudo: PseudoElement) -> Self;
+    ///
+    /// Returns `None` if this pseudo doesn't apply to the given element for one of
+    /// the following reasons:
+    ///
+    ///  1. `pseudo` is eager and is not defined in the stylesheet. In this case, there
+    ///     is not reason to process the pseudo element at all.
+    ///  2. `pseudo` is for `::servo-details-summary` or `::servo-details-content` and
+    ///     it doesn't apply to this element, either because it isn't a details or is
+    ///     in the wrong state.
+    fn with_pseudo(&self, pseudo: PseudoElement) -> Option<Self>;
 
     /// Returns the type ID of this node.
     /// Returns `None` if this is a pseudo-element; otherwise, returns `Some`.
@@ -309,42 +306,6 @@ pub trait ThreadSafeLayoutElement<'dom>:
 
     fn pseudo_element(&self) -> Option<PseudoElement>;
 
-    #[inline]
-    fn get_pseudo(&self, pseudo_element: PseudoElement) -> Option<Self> {
-        if self
-            .style_data()
-            .styles
-            .pseudos
-            .get(&pseudo_element)
-            .is_some()
-        {
-            Some(self.with_pseudo(pseudo_element))
-        } else {
-            None
-        }
-    }
-
-    #[inline]
-    fn get_details_summary_pseudo(&self) -> Option<Self> {
-        if self.has_local_name(&local_name!("details")) && self.has_namespace(&ns!(html)) {
-            Some(self.with_pseudo(PseudoElement::DetailsSummary))
-        } else {
-            None
-        }
-    }
-
-    #[inline]
-    fn get_details_content_pseudo(&self) -> Option<Self> {
-        if self.has_local_name(&local_name!("details")) &&
-            self.has_namespace(&ns!(html)) &&
-            self.get_attr(&ns!(), &local_name!("open")).is_some()
-        {
-            Some(self.with_pseudo(PseudoElement::DetailsContent))
-        } else {
-            None
-        }
-    }
-
     /// Returns the style results for the given node. If CSS selector matching
     /// has not yet been performed, fails.
     ///
@@ -402,22 +363,6 @@ pub trait ThreadSafeLayoutElement<'dom>:
             .clone()
     }
 
-    /// Returns the already resolved style of the node.
-    ///
-    /// This differs from `style(ctx)` in that if the pseudo-element has not yet
-    /// been computed it would panic.
-    ///
-    /// This should be used just for querying layout, or when we know the
-    /// element style is precomputed, not from general layout itself.
-    #[inline]
-    fn resolved_style(&self) -> Arc<ComputedValues> {
-        let data = self.style_data();
-        match self.pseudo_element() {
-            None => data.styles.primary().clone(),
-            Some(pseudo_element) => data.styles.pseudos.get(&pseudo_element).unwrap().clone(),
-        }
-    }
-
     fn is_shadow_host(&self) -> bool;
 
     /// Returns whether this node is a body element of an html element root
@@ -429,4 +374,10 @@ pub trait ThreadSafeLayoutElement<'dom>:
     /// of the parent data is fine, since the bottom-up traversal will not process
     /// the parent until all the children have been processed.
     fn is_body_element_of_html_element_root(&self) -> bool;
+
+    /// Returns whether this node is the root element in an HTML document element.
+    ///
+    /// Note that, like `Self::is_body_element_of_html_element_root`, this accesses the parent.
+    /// As in that case, since this is an immutable borrow, we do not violate thread safety.
+    fn is_root(&self) -> bool;
 }
diff --git a/components/shared/snapshot/Cargo.toml b/components/shared/snapshot/Cargo.toml
new file mode 100644
index 00000000000..9d5bd555623
--- /dev/null
+++ b/components/shared/snapshot/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "snapshot"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
+rust-version.workspace = true
+
+[lib]
+name = "snapshot"
+path = "lib.rs"
+
+
+[dependencies]
+euclid = { workspace = true }
+ipc-channel = { workspace = true }
+serde = { workspace = true }
+pixels = { path = "../../pixels" }
diff --git a/components/shared/snapshot/lib.rs b/components/shared/snapshot/lib.rs
new file mode 100644
index 00000000000..5a8c1a5fbc0
--- /dev/null
+++ b/components/shared/snapshot/lib.rs
@@ -0,0 +1,305 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::ops::{Deref, DerefMut};
+
+use euclid::default::Size2D;
+use ipc_channel::ipc::IpcSharedMemory;
+use pixels::Multiply;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Copy, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
+pub enum PixelFormat {
+    #[default]
+    RGBA,
+    BGRA,
+}
+
+#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub enum AlphaMode {
+    /// Internal data is opaque (alpha is cleared to 1)
+    Opaque,
+    /// Internal data should be threated as opaque (does not mean it actually is)
+    AsOpaque { premultiplied: bool },
+    /// Data is not opaque
+    Transparent { premultiplied: bool },
+}
+
+impl Default for AlphaMode {
+    fn default() -> Self {
+        Self::Transparent {
+            premultiplied: true,
+        }
+    }
+}
+
+impl AlphaMode {
+    pub const fn is_premultiplied(&self) -> bool {
+        match self {
+            AlphaMode::Opaque => true,
+            AlphaMode::AsOpaque { premultiplied } => *premultiplied,
+            AlphaMode::Transparent { premultiplied } => *premultiplied,
+        }
+    }
+
+    pub const fn is_opaque(&self) -> bool {
+        matches!(self, AlphaMode::Opaque | AlphaMode::AsOpaque { .. })
+    }
+}
+
+#[derive(Debug)]
+pub enum Data {
+    // TODO: https://github.com/servo/servo/issues/36594
+    //IPC(IpcSharedMemory),
+    Owned(Vec<u8>),
+}
+
+impl Deref for Data {
+    type Target = [u8];
+
+    fn deref(&self) -> &Self::Target {
+        match &self {
+            //Data::IPC(ipc_shared_memory) => ipc_shared_memory,
+            Data::Owned(items) => items,
+        }
+    }
+}
+
+impl DerefMut for Data {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        match self {
+            //Data::IPC(ipc_shared_memory) => unsafe { ipc_shared_memory.deref_mut() },
+            Data::Owned(items) => items,
+        }
+    }
+}
+
+pub type IpcSnapshot = Snapshot<IpcSharedMemory>;
+
+/// Represents image bitmap with metadata, usually as snapshot of canvas
+///
+/// This allows us to hold off conversions (BGRA <-> RGBA, (un)premultiply)
+/// to when/if they are actually needed (WebGL/WebGPU can load both BGRA and RGBA).
+///
+/// Inspired by snapshot for concept in WebGPU spec:
+/// <https://gpuweb.github.io/gpuweb/#abstract-opdef-get-a-copy-of-the-image-contents-of-a-context>
+#[derive(Debug, Deserialize, Serialize)]
+pub struct Snapshot<T = Data> {
+    size: Size2D<u64>,
+    /// internal data (can be any format it will be converted on use if needed)
+    data: T,
+    /// RGBA/BGRA (reflect internal data)
+    format: PixelFormat,
+    /// How to treat alpha channel
+    alpha_mode: AlphaMode,
+}
+
+impl<T> Snapshot<T> {
+    pub const fn size(&self) -> Size2D<u64> {
+        self.size
+    }
+
+    pub const fn format(&self) -> PixelFormat {
+        self.format
+    }
+
+    pub const fn alpha_mode(&self) -> AlphaMode {
+        self.alpha_mode
+    }
+
+    pub const fn is_premultiplied(&self) -> bool {
+        self.alpha_mode().is_premultiplied()
+    }
+
+    pub const fn is_opaque(&self) -> bool {
+        self.alpha_mode().is_opaque()
+    }
+}
+
+impl Snapshot<Data> {
+    pub fn empty() -> Self {
+        Self {
+            size: Size2D::zero(),
+            data: Data::Owned(vec![]),
+            format: PixelFormat::RGBA,
+            alpha_mode: AlphaMode::Transparent {
+                premultiplied: true,
+            },
+        }
+    }
+
+    /// Returns snapshot with provided size that is black transparent alpha
+    pub fn cleared(size: Size2D<u64>) -> Self {
+        Self {
+            size,
+            data: Data::Owned(vec![0; size.area() as usize * 4]),
+            format: PixelFormat::RGBA,
+            alpha_mode: AlphaMode::Transparent {
+                premultiplied: true,
+            },
+        }
+    }
+
+    pub fn from_vec(
+        size: Size2D<u64>,
+        format: PixelFormat,
+        alpha_mode: AlphaMode,
+        data: Vec<u8>,
+    ) -> Self {
+        Self {
+            size,
+            data: Data::Owned(data),
+            format,
+            alpha_mode,
+        }
+    }
+
+    pub fn from_shared_memory(
+        size: Size2D<u64>,
+        format: PixelFormat,
+        alpha_mode: AlphaMode,
+        ism: IpcSharedMemory,
+    ) -> Self {
+        Self {
+            size,
+            data: Data::Owned(ism.to_vec()),
+            format,
+            alpha_mode,
+        }
+    }
+
+    // TODO: https://github.com/servo/servo/issues/36594
+    /*
+    /// # Safety
+    ///
+    /// This is safe if data is owned by this process only
+    /// (ownership is transferred on send)
+    pub unsafe fn from_shared_memory(
+        size: Size2D<u64>,
+        format: PixelFormat,
+        alpha_mode: AlphaMode,
+        ism: IpcSharedMemory,
+    ) -> Self {
+        Self {
+            size,
+            data: Data::IPC(ism),
+            format,
+            alpha_mode,
+        }
+    }
+    */
+
+    pub fn data(&self) -> &[u8] {
+        &self.data
+    }
+
+    /// Convert inner data of snapshot to target format and alpha mode.
+    /// If data is already in target format and alpha mode no work will be done.
+    pub fn transform(&mut self, target_alpha_mode: AlphaMode, target_format: PixelFormat) {
+        let swap_rb = target_format != self.format;
+        let multiply = match (self.alpha_mode, target_alpha_mode) {
+            (AlphaMode::Opaque, _) => Multiply::None,
+            (alpha_mode, AlphaMode::Opaque) => {
+                if alpha_mode.is_premultiplied() {
+                    Multiply::UnMultiply
+                } else {
+                    Multiply::None
+                }
+            },
+            (
+                AlphaMode::Transparent { premultiplied } | AlphaMode::AsOpaque { premultiplied },
+                AlphaMode::Transparent {
+                    premultiplied: target_premultiplied,
+                } |
+                AlphaMode::AsOpaque {
+                    premultiplied: target_premultiplied,
+                },
+            ) => {
+                if premultiplied == target_premultiplied {
+                    Multiply::None
+                } else if target_premultiplied {
+                    Multiply::PreMultiply
+                } else {
+                    Multiply::UnMultiply
+                }
+            },
+        };
+        let clear_alpha = !matches!(self.alpha_mode, AlphaMode::Opaque) &&
+            matches!(target_alpha_mode, AlphaMode::Opaque);
+        pixels::transform_inplace(self.data.deref_mut(), multiply, swap_rb, clear_alpha);
+        self.alpha_mode = target_alpha_mode;
+        self.format = target_format;
+    }
+
+    pub fn as_ipc(self) -> Snapshot<IpcSharedMemory> {
+        let Snapshot {
+            size,
+            data,
+            format,
+            alpha_mode,
+        } = self;
+        let data = match data {
+            //Data::IPC(ipc_shared_memory) => ipc_shared_memory,
+            Data::Owned(items) => IpcSharedMemory::from_bytes(&items),
+        };
+        Snapshot {
+            size,
+            data,
+            format,
+            alpha_mode,
+        }
+    }
+
+    pub fn to_vec(self) -> Vec<u8> {
+        match self.data {
+            Data::Owned(data) => data,
+        }
+    }
+}
+
+impl Snapshot<IpcSharedMemory> {
+    // TODO: https://github.com/servo/servo/issues/36594
+    /*
+    /// # Safety
+    ///
+    /// This is safe if data is owned by this process only
+    /// (ownership is transferred on send)
+    pub unsafe fn to_data(self) -> Snapshot<Data> {
+        let Snapshot {
+            size,
+            data,
+            format,
+            alpha_mode,
+        } = self;
+        Snapshot {
+            size,
+            data: Data::IPC(data),
+            format,
+            alpha_mode,
+        }
+    }
+    */
+    pub fn to_owned(self) -> Snapshot<Data> {
+        let Snapshot {
+            size,
+            data,
+            format,
+            alpha_mode,
+        } = self;
+        Snapshot {
+            size,
+            data: Data::Owned(data.to_vec()),
+            format,
+            alpha_mode,
+        }
+    }
+
+    pub fn data(&self) -> &[u8] {
+        &self.data
+    }
+
+    pub fn to_ipc_shared_memory(self) -> IpcSharedMemory {
+        self.data
+    }
+}
diff --git a/components/shared/webgpu/Cargo.toml b/components/shared/webgpu/Cargo.toml
new file mode 100644
index 00000000000..04efea0cb9c
--- /dev/null
+++ b/components/shared/webgpu/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "webgpu_traits"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
+rust-version.workspace = true
+
+[lib]
+name = "webgpu_traits"
+path = "lib.rs"
+
+[dependencies]
+arrayvec = { workspace = true }
+base = { workspace = true }
+ipc-channel = { workspace = true }
+malloc_size_of = { workspace = true }
+serde = { workspace = true }
+webrender_api = { workspace = true }
+wgpu-core = { workspace = true, features = ["serde", "wgsl"] }
+wgpu-types = { workspace = true }
+snapshot = { workspace = true }
diff --git a/components/shared/webgpu/error.rs b/components/shared/webgpu/error.rs
new file mode 100644
index 00000000000..4669a605840
--- /dev/null
+++ b/components/shared/webgpu/error.rs
@@ -0,0 +1,97 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! Error scopes and GPUError types
+
+use std::fmt;
+
+use serde::{Deserialize, Serialize};
+use wgpu_core::device::DeviceError;
+
+/// <https://www.w3.org/TR/webgpu/#gpu-error-scope>
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+pub struct ErrorScope {
+    pub errors: Vec<Error>,
+    pub filter: ErrorFilter,
+}
+
+impl ErrorScope {
+    pub fn new(filter: ErrorFilter) -> Self {
+        Self {
+            filter,
+            errors: Vec::new(),
+        }
+    }
+}
+
+/// <https://www.w3.org/TR/webgpu/#enumdef-gpuerrorfilter>
+#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
+pub enum ErrorFilter {
+    Validation,
+    OutOfMemory,
+    Internal,
+}
+
+/// <https://www.w3.org/TR/webgpu/#gpuerror>
+#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
+pub enum Error {
+    Validation(String),
+    OutOfMemory(String),
+    Internal(String),
+}
+
+impl std::error::Error for Error {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        None
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(self.message())
+    }
+}
+
+impl Error {
+    pub fn filter(&self) -> ErrorFilter {
+        match self {
+            Error::Validation(_) => ErrorFilter::Validation,
+            Error::OutOfMemory(_) => ErrorFilter::OutOfMemory,
+            Error::Internal(_) => ErrorFilter::Internal,
+        }
+    }
+
+    pub fn message(&self) -> &str {
+        match self {
+            Error::Validation(m) => m,
+            Error::OutOfMemory(m) => m,
+            Error::Internal(m) => m,
+        }
+    }
+
+    // TODO: labels
+    // based on https://github.com/gfx-rs/wgpu/blob/trunk/wgpu/src/backend/wgpu_core.rs#L289
+    pub fn from_error<E: std::error::Error + 'static>(error: E) -> Self {
+        let mut source_opt: Option<&(dyn std::error::Error + 'static)> = Some(&error);
+        while let Some(source) = source_opt {
+            if let Some(DeviceError::OutOfMemory) = source.downcast_ref::<DeviceError>() {
+                return Self::OutOfMemory(error.to_string());
+            }
+            source_opt = source.source();
+        }
+        // TODO: This hack is needed because there are
+        // multiple OutOfMemory error variant in wgpu-core
+        // and even upstream does not handle them correctly
+        if format!("{error:?}").contains("OutOfMemory") {
+            return Self::OutOfMemory(error.to_string());
+        }
+        Self::Validation(error.to_string())
+    }
+}
+
+#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
+pub enum PopError {
+    Lost,
+    Empty,
+}
diff --git a/components/shared/webgpu/ids.rs b/components/shared/webgpu/ids.rs
new file mode 100644
index 00000000000..28f2d1c24af
--- /dev/null
+++ b/components/shared/webgpu/ids.rs
@@ -0,0 +1,53 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
+use serde::{Deserialize, Serialize};
+pub use wgpu_core::id::markers::{
+    ComputePassEncoder as ComputePass, RenderPassEncoder as RenderPass,
+};
+use wgpu_core::id::{
+    AdapterId, BindGroupId, BindGroupLayoutId, BufferId, CommandBufferId, CommandEncoderId,
+    ComputePipelineId, DeviceId, PipelineLayoutId, QueueId, RenderBundleId, RenderPipelineId,
+    SamplerId, ShaderModuleId, SurfaceId, TextureId, TextureViewId,
+};
+pub use wgpu_core::id::{
+    ComputePassEncoderId as ComputePassId, RenderPassEncoderId as RenderPassId,
+};
+
+macro_rules! webgpu_resource {
+    ($name:ident, $id:ty) => {
+        #[derive(Clone, Copy, Debug, Deserialize, Hash, PartialEq, PartialOrd, Serialize)]
+        pub struct $name(pub $id);
+
+        impl MallocSizeOf for $name {
+            fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
+                0
+            }
+        }
+
+        impl Eq for $name {}
+    };
+}
+
+webgpu_resource!(WebGPUAdapter, AdapterId);
+webgpu_resource!(WebGPUBindGroup, BindGroupId);
+webgpu_resource!(WebGPUBindGroupLayout, BindGroupLayoutId);
+webgpu_resource!(WebGPUBuffer, BufferId);
+webgpu_resource!(WebGPUCommandBuffer, CommandBufferId);
+webgpu_resource!(WebGPUCommandEncoder, CommandEncoderId);
+webgpu_resource!(WebGPUComputePipeline, ComputePipelineId);
+webgpu_resource!(WebGPUDevice, DeviceId);
+webgpu_resource!(WebGPUPipelineLayout, PipelineLayoutId);
+webgpu_resource!(WebGPUQueue, QueueId);
+webgpu_resource!(WebGPURenderBundle, RenderBundleId);
+webgpu_resource!(WebGPURenderPipeline, RenderPipelineId);
+webgpu_resource!(WebGPUSampler, SamplerId);
+webgpu_resource!(WebGPUShaderModule, ShaderModuleId);
+webgpu_resource!(WebGPUSurface, SurfaceId);
+webgpu_resource!(WebGPUTexture, TextureId);
+webgpu_resource!(WebGPUTextureView, TextureViewId);
+webgpu_resource!(WebGPUComputePass, ComputePassId);
+webgpu_resource!(WebGPURenderPass, RenderPassId);
+webgpu_resource!(WebGPUContextId, u64);
diff --git a/components/shared/webgpu/lib.rs b/components/shared/webgpu/lib.rs
new file mode 100644
index 00000000000..b03a82c1996
--- /dev/null
+++ b/components/shared/webgpu/lib.rs
@@ -0,0 +1,165 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+pub mod error;
+pub mod ids;
+pub mod messages;
+pub mod render_commands;
+
+use std::ops::Range;
+
+use ipc_channel::ipc::{IpcSender, IpcSharedMemory};
+use serde::{Deserialize, Serialize};
+use webrender_api::ImageFormat;
+use wgpu_core::device::HostMap;
+pub use wgpu_core::id::markers::{
+    ComputePassEncoder as ComputePass, RenderPassEncoder as RenderPass,
+};
+pub use wgpu_core::id::{
+    ComputePassEncoderId as ComputePassId, RenderPassEncoderId as RenderPassId,
+};
+use wgpu_core::id::{ComputePipelineId, DeviceId, QueueId, RenderPipelineId};
+use wgpu_core::instance::FailedLimit;
+use wgpu_core::pipeline::CreateShaderModuleError;
+use wgpu_types::{AdapterInfo, DeviceDescriptor, Features, Limits, TextureFormat};
+
+pub use crate::error::*;
+pub use crate::ids::*;
+pub use crate::messages::*;
+pub use crate::render_commands::*;
+
+pub const PRESENTATION_BUFFER_COUNT: usize = 10;
+
+pub type WebGPUAdapterResponse = Option<Result<Adapter, String>>;
+pub type WebGPUComputePipelineResponse = Result<Pipeline<ComputePipelineId>, Error>;
+pub type WebGPUPoppedErrorScopeResponse = Result<Option<Error>, PopError>;
+pub type WebGPURenderPipelineResponse = Result<Pipeline<RenderPipelineId>, Error>;
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct WebGPU(pub IpcSender<WebGPURequest>);
+
+impl WebGPU {
+    pub fn exit(&self, sender: IpcSender<()>) -> Result<(), &'static str> {
+        self.0
+            .send(WebGPURequest::Exit(sender))
+            .map_err(|_| "Failed to send Exit message")
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct Adapter {
+    pub adapter_info: AdapterInfo,
+    pub adapter_id: WebGPUAdapter,
+    pub features: Features,
+    pub limits: Limits,
+    pub channel: WebGPU,
+}
+
+#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
+pub struct ContextConfiguration {
+    pub device_id: DeviceId,
+    pub queue_id: QueueId,
+    pub format: TextureFormat,
+    pub is_opaque: bool,
+}
+
+impl ContextConfiguration {
+    pub fn format(&self) -> ImageFormat {
+        match self.format {
+            TextureFormat::Rgba8Unorm => ImageFormat::RGBA8,
+            TextureFormat::Bgra8Unorm => ImageFormat::BGRA8,
+            // TODO: wgt::TextureFormat::Rgba16Float
+            _ => unreachable!("Unsupported canvas context format in configuration"),
+        }
+    }
+}
+
+/// <https://gpuweb.github.io/gpuweb/#enumdef-gpudevicelostreason>
+#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
+pub enum DeviceLostReason {
+    Unknown,
+    Destroyed,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+pub struct ShaderCompilationInfo {
+    pub line_number: u64,
+    pub line_pos: u64,
+    pub offset: u64,
+    pub length: u64,
+    pub message: String,
+}
+
+impl ShaderCompilationInfo {
+    pub fn from(error: &CreateShaderModuleError, source: &str) -> Self {
+        let location = match error {
+            CreateShaderModuleError::Parsing(e) => e.inner.location(source),
+            CreateShaderModuleError::Validation(e) => e.inner.location(source),
+            _ => None,
+        };
+
+        if let Some(location) = location {
+            // Naga reports locations in UTF-8 code units, but spec requires location in UTF-16 code units
+            // Based on https://searchfox.org/mozilla-central/rev/5b037d9c6ecdb0729f39ad519f0b867d80a92aad/gfx/wgpu_bindings/src/server.rs#353
+            fn len_utf16(s: &str) -> u64 {
+                s.chars().map(|c| c.len_utf16() as u64).sum()
+            }
+            let start = location.offset as usize;
+            let end = start + location.length as usize;
+            let line_start = source[0..start].rfind('\n').map(|pos| pos + 1).unwrap_or(0);
+            Self {
+                line_number: location.line_number as u64,
+                line_pos: len_utf16(&source[line_start..start]) + 1,
+                offset: len_utf16(&source[0..start]),
+                length: len_utf16(&source[start..end]),
+                message: error.to_string(),
+            }
+        } else {
+            Self {
+                message: error.to_string(),
+                ..Default::default()
+            }
+        }
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct Pipeline<T: std::fmt::Debug + Serialize> {
+    pub id: T,
+    pub label: String,
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct Mapping {
+    pub data: IpcSharedMemory,
+    pub mode: HostMap,
+    pub range: Range<u64>,
+}
+
+pub type WebGPUDeviceResponse = (
+    WebGPUDevice,
+    WebGPUQueue,
+    Result<DeviceDescriptor<Option<String>>, RequestDeviceError>,
+);
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum RequestDeviceError {
+    LimitsExceeded(FailedLimit),
+    UnsupportedFeature(Features),
+    Other(String),
+}
+
+impl From<wgpu_core::instance::RequestDeviceError> for RequestDeviceError {
+    fn from(value: wgpu_core::instance::RequestDeviceError) -> Self {
+        match value {
+            wgpu_core::instance::RequestDeviceError::LimitsExceeded(failed_limit) => {
+                RequestDeviceError::LimitsExceeded(failed_limit)
+            },
+            wgpu_core::instance::RequestDeviceError::UnsupportedFeature(features) => {
+                RequestDeviceError::UnsupportedFeature(features)
+            },
+            e => RequestDeviceError::Other(e.to_string()),
+        }
+    }
+}
diff --git a/components/shared/webgpu/messages/mod.rs b/components/shared/webgpu/messages/mod.rs
new file mode 100644
index 00000000000..47fa26161f7
--- /dev/null
+++ b/components/shared/webgpu/messages/mod.rs
@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+pub mod recv;
+pub mod to_dom;
+pub mod to_script;
+
+pub use recv::*;
+pub use to_dom::*;
+pub use to_script::*;
diff --git a/components/shared/webgpu/messages/recv.rs b/components/shared/webgpu/messages/recv.rs
new file mode 100644
index 00000000000..4a30177cf0a
--- /dev/null
+++ b/components/shared/webgpu/messages/recv.rs
@@ -0,0 +1,339 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! IPC messages that are received in the WebGPU thread
+//! (usually from the ScriptThread, and more specifically from DOM objects)
+
+use arrayvec::ArrayVec;
+use base::id::PipelineId;
+use ipc_channel::ipc::{IpcSender, IpcSharedMemory};
+use serde::{Deserialize, Serialize};
+use snapshot::IpcSnapshot;
+use webrender_api::ImageKey;
+use webrender_api::units::DeviceIntSize;
+use wgpu_core::Label;
+use wgpu_core::binding_model::{
+    BindGroupDescriptor, BindGroupLayoutDescriptor, PipelineLayoutDescriptor,
+};
+use wgpu_core::command::{
+    RenderBundleDescriptor, RenderBundleEncoder, RenderPassColorAttachment,
+    RenderPassDepthStencilAttachment, TexelCopyBufferInfo, TexelCopyTextureInfo,
+};
+use wgpu_core::device::HostMap;
+pub use wgpu_core::id::markers::{
+    ComputePassEncoder as ComputePass, RenderPassEncoder as RenderPass,
+};
+use wgpu_core::id::{
+    AdapterId, BindGroupId, BindGroupLayoutId, BufferId, CommandBufferId, CommandEncoderId,
+    ComputePassEncoderId, ComputePipelineId, DeviceId, PipelineLayoutId, QuerySetId, QueueId,
+    RenderBundleId, RenderPassEncoderId, RenderPipelineId, SamplerId, ShaderModuleId, TextureId,
+    TextureViewId,
+};
+pub use wgpu_core::id::{
+    ComputePassEncoderId as ComputePassId, RenderPassEncoderId as RenderPassId,
+};
+use wgpu_core::instance::RequestAdapterOptions;
+use wgpu_core::pipeline::{ComputePipelineDescriptor, RenderPipelineDescriptor};
+use wgpu_core::resource::{
+    BufferAccessError, BufferDescriptor, SamplerDescriptor, TextureDescriptor,
+    TextureViewDescriptor,
+};
+use wgpu_types::{
+    BufferAddress, CommandBufferDescriptor, CommandEncoderDescriptor, DeviceDescriptor, Extent3d,
+    TexelCopyBufferLayout,
+};
+
+use crate::{
+    ContextConfiguration, Error, ErrorFilter, Mapping, PRESENTATION_BUFFER_COUNT, RenderCommand,
+    ShaderCompilationInfo, WebGPUAdapter, WebGPUAdapterResponse, WebGPUComputePipelineResponse,
+    WebGPUContextId, WebGPUDeviceResponse, WebGPUPoppedErrorScopeResponse,
+    WebGPURenderPipelineResponse,
+};
+
+#[derive(Debug, Deserialize, Serialize)]
+pub enum WebGPURequest {
+    BufferMapAsync {
+        sender: IpcSender<Result<Mapping, BufferAccessError>>,
+        buffer_id: BufferId,
+        device_id: DeviceId,
+        host_map: HostMap,
+        offset: u64,
+        size: Option<u64>,
+    },
+    CommandEncoderFinish {
+        command_encoder_id: CommandEncoderId,
+        device_id: DeviceId,
+        desc: CommandBufferDescriptor<Label<'static>>,
+    },
+    CopyBufferToBuffer {
+        command_encoder_id: CommandEncoderId,
+        source_id: BufferId,
+        source_offset: BufferAddress,
+        destination_id: BufferId,
+        destination_offset: BufferAddress,
+        size: BufferAddress,
+    },
+    CopyBufferToTexture {
+        command_encoder_id: CommandEncoderId,
+        source: TexelCopyBufferInfo,
+        destination: TexelCopyTextureInfo,
+        copy_size: Extent3d,
+    },
+    CopyTextureToBuffer {
+        command_encoder_id: CommandEncoderId,
+        source: TexelCopyTextureInfo,
+        destination: TexelCopyBufferInfo,
+        copy_size: Extent3d,
+    },
+    CopyTextureToTexture {
+        command_encoder_id: CommandEncoderId,
+        source: TexelCopyTextureInfo,
+        destination: TexelCopyTextureInfo,
+        copy_size: Extent3d,
+    },
+    CreateBindGroup {
+        device_id: DeviceId,
+        bind_group_id: BindGroupId,
+        descriptor: BindGroupDescriptor<'static>,
+    },
+    CreateBindGroupLayout {
+        device_id: DeviceId,
+        bind_group_layout_id: BindGroupLayoutId,
+        descriptor: Option<BindGroupLayoutDescriptor<'static>>,
+    },
+    CreateBuffer {
+        device_id: DeviceId,
+        buffer_id: BufferId,
+        descriptor: BufferDescriptor<'static>,
+    },
+    CreateCommandEncoder {
+        device_id: DeviceId,
+        command_encoder_id: CommandEncoderId,
+        desc: CommandEncoderDescriptor<Label<'static>>,
+    },
+    CreateComputePipeline {
+        device_id: DeviceId,
+        compute_pipeline_id: ComputePipelineId,
+        descriptor: ComputePipelineDescriptor<'static>,
+        implicit_ids: Option<(PipelineLayoutId, Vec<BindGroupLayoutId>)>,
+        /// present only on ASYNC versions
+        async_sender: Option<IpcSender<WebGPUComputePipelineResponse>>,
+    },
+    CreatePipelineLayout {
+        device_id: DeviceId,
+        pipeline_layout_id: PipelineLayoutId,
+        descriptor: PipelineLayoutDescriptor<'static>,
+    },
+    CreateRenderPipeline {
+        device_id: DeviceId,
+        render_pipeline_id: RenderPipelineId,
+        descriptor: RenderPipelineDescriptor<'static>,
+        implicit_ids: Option<(PipelineLayoutId, Vec<BindGroupLayoutId>)>,
+        /// present only on ASYNC versions
+        async_sender: Option<IpcSender<WebGPURenderPipelineResponse>>,
+    },
+    CreateSampler {
+        device_id: DeviceId,
+        sampler_id: SamplerId,
+        descriptor: SamplerDescriptor<'static>,
+    },
+    CreateShaderModule {
+        device_id: DeviceId,
+        program_id: ShaderModuleId,
+        program: String,
+        label: Option<String>,
+        sender: IpcSender<Option<ShaderCompilationInfo>>,
+    },
+    /// Creates context
+    CreateContext {
+        buffer_ids: ArrayVec<BufferId, PRESENTATION_BUFFER_COUNT>,
+        size: DeviceIntSize,
+        sender: IpcSender<(WebGPUContextId, ImageKey)>,
+    },
+    /// Recreates swapchain (if needed)
+    UpdateContext {
+        context_id: WebGPUContextId,
+        size: DeviceIntSize,
+        configuration: Option<ContextConfiguration>,
+    },
+    /// Reads texture to swapchains buffer and maps it
+    SwapChainPresent {
+        context_id: WebGPUContextId,
+        texture_id: TextureId,
+        encoder_id: CommandEncoderId,
+    },
+    /// Obtains image from latest presentation buffer (same as wr update)
+    GetImage {
+        context_id: WebGPUContextId,
+        sender: IpcSender<IpcSnapshot>,
+    },
+    ValidateTextureDescriptor {
+        device_id: DeviceId,
+        texture_id: TextureId,
+        descriptor: TextureDescriptor<'static>,
+    },
+    DestroyContext {
+        context_id: WebGPUContextId,
+    },
+    CreateTexture {
+        device_id: DeviceId,
+        texture_id: TextureId,
+        descriptor: TextureDescriptor<'static>,
+    },
+    CreateTextureView {
+        texture_id: TextureId,
+        texture_view_id: TextureViewId,
+        device_id: DeviceId,
+        descriptor: Option<TextureViewDescriptor<'static>>,
+    },
+    DestroyBuffer(BufferId),
+    DestroyDevice(DeviceId),
+    DestroyTexture(TextureId),
+    DropTexture(TextureId),
+    DropAdapter(AdapterId),
+    DropDevice(DeviceId),
+    DropBuffer(BufferId),
+    DropPipelineLayout(PipelineLayoutId),
+    DropComputePipeline(ComputePipelineId),
+    DropRenderPipeline(RenderPipelineId),
+    DropBindGroup(BindGroupId),
+    DropBindGroupLayout(BindGroupLayoutId),
+    DropCommandBuffer(CommandBufferId),
+    DropTextureView(TextureViewId),
+    DropSampler(SamplerId),
+    DropShaderModule(ShaderModuleId),
+    DropRenderBundle(RenderBundleId),
+    DropQuerySet(QuerySetId),
+    DropComputePass(ComputePassEncoderId),
+    DropRenderPass(RenderPassEncoderId),
+    Exit(IpcSender<()>),
+    RenderBundleEncoderFinish {
+        render_bundle_encoder: RenderBundleEncoder,
+        descriptor: RenderBundleDescriptor<'static>,
+        render_bundle_id: RenderBundleId,
+        device_id: DeviceId,
+    },
+    RequestAdapter {
+        sender: IpcSender<WebGPUAdapterResponse>,
+        options: RequestAdapterOptions,
+        adapter_id: AdapterId,
+    },
+    RequestDevice {
+        sender: IpcSender<WebGPUDeviceResponse>,
+        adapter_id: WebGPUAdapter,
+        descriptor: DeviceDescriptor<Option<String>>,
+        device_id: DeviceId,
+        queue_id: QueueId,
+        pipeline_id: PipelineId,
+    },
+    // Compute Pass
+    BeginComputePass {
+        command_encoder_id: CommandEncoderId,
+        compute_pass_id: ComputePassId,
+        label: Label<'static>,
+        device_id: DeviceId,
+    },
+    ComputePassSetPipeline {
+        compute_pass_id: ComputePassId,
+        pipeline_id: ComputePipelineId,
+        device_id: DeviceId,
+    },
+    ComputePassSetBindGroup {
+        compute_pass_id: ComputePassId,
+        index: u32,
+        bind_group_id: BindGroupId,
+        offsets: Vec<u32>,
+        device_id: DeviceId,
+    },
+    ComputePassDispatchWorkgroups {
+        compute_pass_id: ComputePassId,
+        x: u32,
+        y: u32,
+        z: u32,
+        device_id: DeviceId,
+    },
+    ComputePassDispatchWorkgroupsIndirect {
+        compute_pass_id: ComputePassId,
+        buffer_id: BufferId,
+        offset: u64,
+        device_id: DeviceId,
+    },
+    EndComputePass {
+        compute_pass_id: ComputePassId,
+        device_id: DeviceId,
+        command_encoder_id: CommandEncoderId,
+    },
+    // Render Pass
+    BeginRenderPass {
+        command_encoder_id: CommandEncoderId,
+        render_pass_id: RenderPassId,
+        label: Label<'static>,
+        color_attachments: Vec<Option<RenderPassColorAttachment>>,
+        depth_stencil_attachment: Option<RenderPassDepthStencilAttachment>,
+        device_id: DeviceId,
+    },
+    RenderPassCommand {
+        render_pass_id: RenderPassId,
+        render_command: RenderCommand,
+        device_id: DeviceId,
+    },
+    EndRenderPass {
+        render_pass_id: RenderPassId,
+        device_id: DeviceId,
+        command_encoder_id: CommandEncoderId,
+    },
+    Submit {
+        device_id: DeviceId,
+        queue_id: QueueId,
+        command_buffers: Vec<CommandBufferId>,
+    },
+    UnmapBuffer {
+        buffer_id: BufferId,
+        /// Return back mapping for writeback
+        mapping: Option<Mapping>,
+    },
+    WriteBuffer {
+        device_id: DeviceId,
+        queue_id: QueueId,
+        buffer_id: BufferId,
+        buffer_offset: u64,
+        data: IpcSharedMemory,
+    },
+    WriteTexture {
+        device_id: DeviceId,
+        queue_id: QueueId,
+        texture_cv: TexelCopyTextureInfo,
+        data_layout: TexelCopyBufferLayout,
+        size: Extent3d,
+        data: IpcSharedMemory,
+    },
+    QueueOnSubmittedWorkDone {
+        sender: IpcSender<()>,
+        queue_id: QueueId,
+    },
+    PushErrorScope {
+        device_id: DeviceId,
+        filter: ErrorFilter,
+    },
+    DispatchError {
+        device_id: DeviceId,
+        error: Error,
+    },
+    PopErrorScope {
+        device_id: DeviceId,
+        sender: IpcSender<WebGPUPoppedErrorScopeResponse>,
+    },
+    ComputeGetBindGroupLayout {
+        device_id: DeviceId,
+        pipeline_id: ComputePipelineId,
+        index: u32,
+        id: BindGroupLayoutId,
+    },
+    RenderGetBindGroupLayout {
+        device_id: DeviceId,
+        pipeline_id: RenderPipelineId,
+        index: u32,
+        id: BindGroupLayoutId,
+    },
+}
diff --git a/components/shared/webgpu/messages/to_dom.rs b/components/shared/webgpu/messages/to_dom.rs
new file mode 100644
index 00000000000..b5d5db72e38
--- /dev/null
+++ b/components/shared/webgpu/messages/to_dom.rs
@@ -0,0 +1,16 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! IPC messages that are sent to WebGPU DOM objects.
+
+use wgpu_core::instance::RequestDeviceError;
+use wgpu_types::DeviceDescriptor;
+
+use crate::{WebGPUDevice, WebGPUQueue};
+
+pub type WebGPUDeviceResponse = (
+    WebGPUDevice,
+    WebGPUQueue,
+    Result<DeviceDescriptor<Option<String>>, RequestDeviceError>,
+);
diff --git a/components/webgpu/ipc_messages/to_script.rs b/components/shared/webgpu/messages/to_script.rs
similarity index 83%
rename from components/webgpu/ipc_messages/to_script.rs
rename to components/shared/webgpu/messages/to_script.rs
index 1f0cd56cf83..303e17eeaad 100644
--- a/components/webgpu/ipc_messages/to_script.rs
+++ b/components/shared/webgpu/messages/to_script.rs
@@ -2,26 +2,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-//! IPC messages that are send to script thread.
+//! IPC messages that are sent to the ScriptThread.
 
 use base::id::PipelineId;
 use serde::{Deserialize, Serialize};
-
-use crate::gpu_error::Error;
-use crate::identity::WebGPUDevice;
-use crate::wgc::id::{
+use wgpu_core::id::{
     AdapterId, BindGroupId, BindGroupLayoutId, BufferId, CommandBufferId, ComputePassEncoderId,
     ComputePipelineId, DeviceId, PipelineLayoutId, QuerySetId, RenderBundleId, RenderPassEncoderId,
     RenderPipelineId, SamplerId, ShaderModuleId, StagingBufferId, SurfaceId, TextureId,
     TextureViewId,
 };
 
-/// <https://gpuweb.github.io/gpuweb/#enumdef-gpudevicelostreason>
-#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
-pub enum DeviceLostReason {
-    Unknown,
-    Destroyed,
-}
+use crate::{DeviceLostReason, Error, WebGPUDevice};
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub enum WebGPUMsg {
diff --git a/components/webgpu/render_commands.rs b/components/shared/webgpu/render_commands.rs
similarity index 89%
rename from components/webgpu/render_commands.rs
rename to components/shared/webgpu/render_commands.rs
index 3cd374e4118..37ba70daaca 100644
--- a/components/webgpu/render_commands.rs
+++ b/components/shared/webgpu/render_commands.rs
@@ -7,17 +7,15 @@
 use serde::{Deserialize, Serialize};
 use wgpu_core::command::{RenderPass, RenderPassError};
 use wgpu_core::global::Global;
-
-use crate::wgc::id;
-use crate::wgt;
+use wgpu_core::id::{BindGroupId, BufferId, RenderBundleId, RenderPipelineId};
 
 /// <https://github.com/gfx-rs/wgpu/blob/f25e07b984ab391628d9568296d5970981d79d8b/wgpu-core/src/command/render_command.rs#L17>
 #[derive(Debug, Deserialize, Serialize)]
 pub enum RenderCommand {
-    SetPipeline(id::RenderPipelineId),
+    SetPipeline(RenderPipelineId),
     SetBindGroup {
         index: u32,
-        bind_group_id: id::BindGroupId,
+        bind_group_id: BindGroupId,
         offsets: Vec<u32>,
     },
     SetViewport {
@@ -34,19 +32,19 @@ pub enum RenderCommand {
         width: u32,
         height: u32,
     },
-    SetBlendConstant(wgt::Color),
+    SetBlendConstant(wgpu_types::Color),
     SetStencilReference(u32),
     SetIndexBuffer {
-        buffer_id: id::BufferId,
-        index_format: wgt::IndexFormat,
+        buffer_id: BufferId,
+        index_format: wgpu_types::IndexFormat,
         offset: u64,
-        size: Option<wgt::BufferSize>,
+        size: Option<wgpu_types::BufferSize>,
     },
     SetVertexBuffer {
         slot: u32,
-        buffer_id: id::BufferId,
+        buffer_id: BufferId,
         offset: u64,
-        size: Option<wgt::BufferSize>,
+        size: Option<wgpu_types::BufferSize>,
     },
     Draw {
         vertex_count: u32,
@@ -62,14 +60,14 @@ pub enum RenderCommand {
         first_instance: u32,
     },
     DrawIndirect {
-        buffer_id: id::BufferId,
+        buffer_id: BufferId,
         offset: u64,
     },
     DrawIndexedIndirect {
-        buffer_id: id::BufferId,
+        buffer_id: BufferId,
         offset: u64,
     },
-    ExecuteBundles(Vec<id::RenderBundleId>),
+    ExecuteBundles(Vec<RenderBundleId>),
 }
 
 pub fn apply_render_command(
diff --git a/components/shared/webrender/Cargo.toml b/components/shared/webrender/Cargo.toml
deleted file mode 100644
index 12599c9070d..00000000000
--- a/components/shared/webrender/Cargo.toml
+++ /dev/null
@@ -1,36 +0,0 @@
-[package]
-name = "webrender_traits"
-version.workspace = true
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-publish.workspace = true
-rust-version.workspace = true
-
-[lib]
-name = "webrender_traits"
-path = "lib.rs"
-test = true
-
-[features]
-no-wgl = ["surfman/sm-angle-default"]
-
-[dependencies]
-base = { workspace = true }
-constellation_traits = { workspace = true }
-embedder_traits = { workspace = true }
-euclid = { workspace = true }
-image = { workspace = true }
-ipc-channel = { workspace = true }
-log = { workspace = true }
-libc = { workspace = true }
-gleam = { workspace = true }
-glow = { workspace = true }
-webrender_api = { workspace = true }
-serde = { workspace = true }
-servo_geometry = { path = "../../geometry" }
-servo-media = { workspace = true }
-stylo = { workspace = true }
-surfman = { workspace = true, features = ["sm-x11"] }
-raw-window-handle = { version = "0.6" }
-dpi = { version = "0.1" }
diff --git a/components/shared/webrender/lib.rs b/components/shared/webrender/lib.rs
deleted file mode 100644
index 9de994f3ca2..00000000000
--- a/components/shared/webrender/lib.rs
+++ /dev/null
@@ -1,480 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-#![deny(unsafe_code)]
-
-pub mod display_list;
-pub mod rendering_context;
-
-use core::fmt;
-use std::collections::HashMap;
-use std::sync::{Arc, Mutex};
-
-use base::id::WebViewId;
-use constellation_traits::CompositorHitTestResult;
-use display_list::CompositorDisplayListInfo;
-use euclid::default::Size2D as UntypedSize2D;
-use ipc_channel::ipc::{self, IpcSender, IpcSharedMemory};
-use log::warn;
-use serde::{Deserialize, Serialize};
-use servo_geometry::{DeviceIndependentIntRect, DeviceIndependentIntSize};
-use webrender_api::units::{DevicePoint, LayoutPoint, TexelRect};
-use webrender_api::{
-    BuiltDisplayList, BuiltDisplayListDescriptor, ExternalImage, ExternalImageData,
-    ExternalImageHandler, ExternalImageId, ExternalImageSource, ExternalScrollId,
-    FontInstanceFlags, FontInstanceKey, FontKey, HitTestFlags, ImageData, ImageDescriptor,
-    ImageKey, NativeFontHandle, PipelineId as WebRenderPipelineId,
-};
-
-#[derive(Deserialize, Serialize)]
-pub enum CrossProcessCompositorMessage {
-    /// Inform WebRender of the existence of this pipeline.
-    SendInitialTransaction(WebRenderPipelineId),
-    /// Perform a scroll operation.
-    SendScrollNode(
-        WebViewId,
-        WebRenderPipelineId,
-        LayoutPoint,
-        ExternalScrollId,
-    ),
-    /// Inform WebRender of a new display list for the given pipeline.
-    SendDisplayList {
-        /// The [`WebViewId`] that this display list belongs to.
-        webview_id: WebViewId,
-        /// The [CompositorDisplayListInfo] that describes the display list being sent.
-        display_list_info: Box<CompositorDisplayListInfo>,
-        /// A descriptor of this display list used to construct this display list from raw data.
-        display_list_descriptor: BuiltDisplayListDescriptor,
-        /// An [ipc::IpcBytesReceiver] used to send the raw data of the display list.
-        display_list_receiver: ipc::IpcBytesReceiver,
-    },
-    /// Perform a hit test operation. The result will be returned via
-    /// the provided channel sender.
-    HitTest(
-        Option<WebRenderPipelineId>,
-        DevicePoint,
-        HitTestFlags,
-        IpcSender<Vec<CompositorHitTestResult>>,
-    ),
-    /// Create a new image key. The result will be returned via the
-    /// provided channel sender.
-    GenerateImageKey(IpcSender<ImageKey>),
-    /// Add an image with the given data and `ImageKey`.
-    AddImage(ImageKey, ImageDescriptor, SerializableImageData),
-    /// Perform a resource update operation.
-    UpdateImages(Vec<ImageUpdate>),
-
-    /// Generate a new batch of font keys which can be used to allocate
-    /// keys asynchronously.
-    GenerateFontKeys(
-        usize,
-        usize,
-        IpcSender<(Vec<FontKey>, Vec<FontInstanceKey>)>,
-    ),
-    /// Add a font with the given data and font key.
-    AddFont(FontKey, Arc<IpcSharedMemory>, u32),
-    /// Add a system font with the given font key and handle.
-    AddSystemFont(FontKey, NativeFontHandle),
-    /// Add an instance of a font with the given instance key.
-    AddFontInstance(FontInstanceKey, FontKey, f32, FontInstanceFlags),
-    /// Remove the given font resources from our WebRender instance.
-    RemoveFonts(Vec<FontKey>, Vec<FontInstanceKey>),
-
-    /// Get the client window size and position.
-    GetClientWindowRect(IpcSender<DeviceIndependentIntRect>),
-    /// Get the size of the screen that the client window inhabits.
-    GetScreenSize(IpcSender<DeviceIndependentIntSize>),
-    /// Get the available screen size (without toolbars and docks) for the screen
-    /// the client window inhabits.
-    GetAvailableScreenSize(IpcSender<DeviceIndependentIntSize>),
-}
-
-impl fmt::Debug for CrossProcessCompositorMessage {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::AddImage(..) => f.write_str("AddImage"),
-            Self::GenerateFontKeys(..) => f.write_str("GenerateFontKeys"),
-            Self::AddSystemFont(..) => f.write_str("AddSystemFont"),
-            Self::SendInitialTransaction(..) => f.write_str("SendInitialTransaction"),
-            Self::SendScrollNode(..) => f.write_str("SendScrollNode"),
-            Self::SendDisplayList { .. } => f.write_str("SendDisplayList"),
-            Self::HitTest(..) => f.write_str("HitTest"),
-            Self::GenerateImageKey(..) => f.write_str("GenerateImageKey"),
-            Self::UpdateImages(..) => f.write_str("UpdateImages"),
-            Self::RemoveFonts(..) => f.write_str("RemoveFonts"),
-            Self::AddFontInstance(..) => f.write_str("AddFontInstance"),
-            Self::AddFont(..) => f.write_str("AddFont"),
-            Self::GetClientWindowRect(..) => f.write_str("GetClientWindowRect"),
-            Self::GetScreenSize(..) => f.write_str("GetScreenSize"),
-            Self::GetAvailableScreenSize(..) => f.write_str("GetAvailableScreenSize"),
-        }
-    }
-}
-
-/// A mechanism to send messages from ScriptThread to the parent process' WebRender instance.
-#[derive(Clone, Deserialize, Serialize)]
-pub struct CrossProcessCompositorApi(pub IpcSender<CrossProcessCompositorMessage>);
-
-impl CrossProcessCompositorApi {
-    /// Create a new [`CrossProcessCompositorApi`] struct that does not have a listener on the other
-    /// end to use for unit testing.
-    pub fn dummy() -> Self {
-        let (sender, _) = ipc::channel().unwrap();
-        Self(sender)
-    }
-
-    /// Get the sender for this proxy.
-    pub fn sender(&self) -> &IpcSender<CrossProcessCompositorMessage> {
-        &self.0
-    }
-
-    /// Inform WebRender of the existence of this pipeline.
-    pub fn send_initial_transaction(&self, pipeline: WebRenderPipelineId) {
-        if let Err(e) = self
-            .0
-            .send(CrossProcessCompositorMessage::SendInitialTransaction(
-                pipeline,
-            ))
-        {
-            warn!("Error sending initial transaction: {}", e);
-        }
-    }
-
-    /// Perform a scroll operation.
-    pub fn send_scroll_node(
-        &self,
-        webview_id: WebViewId,
-        pipeline_id: WebRenderPipelineId,
-        point: LayoutPoint,
-        scroll_id: ExternalScrollId,
-    ) {
-        if let Err(e) = self.0.send(CrossProcessCompositorMessage::SendScrollNode(
-            webview_id,
-            pipeline_id,
-            point,
-            scroll_id,
-        )) {
-            warn!("Error sending scroll node: {}", e);
-        }
-    }
-
-    /// Inform WebRender of a new display list for the given pipeline.
-    pub fn send_display_list(
-        &self,
-        webview_id: WebViewId,
-        display_list_info: CompositorDisplayListInfo,
-        list: BuiltDisplayList,
-    ) {
-        let (display_list_data, display_list_descriptor) = list.into_data();
-        let (display_list_sender, display_list_receiver) = ipc::bytes_channel().unwrap();
-        if let Err(e) = self.0.send(CrossProcessCompositorMessage::SendDisplayList {
-            webview_id,
-            display_list_info: Box::new(display_list_info),
-            display_list_descriptor,
-            display_list_receiver,
-        }) {
-            warn!("Error sending display list: {}", e);
-        }
-
-        if let Err(error) = display_list_sender.send(&display_list_data.items_data) {
-            warn!("Error sending display list items: {}", error);
-        }
-        if let Err(error) = display_list_sender.send(&display_list_data.cache_data) {
-            warn!("Error sending display list cache data: {}", error);
-        }
-        if let Err(error) = display_list_sender.send(&display_list_data.spatial_tree) {
-            warn!("Error sending display spatial tree: {}", error);
-        }
-    }
-
-    /// Perform a hit test operation. Blocks until the operation is complete and
-    /// and a result is available.
-    pub fn hit_test(
-        &self,
-        pipeline: Option<WebRenderPipelineId>,
-        point: DevicePoint,
-        flags: HitTestFlags,
-    ) -> Vec<CompositorHitTestResult> {
-        let (sender, receiver) = ipc::channel().unwrap();
-        self.0
-            .send(CrossProcessCompositorMessage::HitTest(
-                pipeline, point, flags, sender,
-            ))
-            .expect("error sending hit test");
-        receiver.recv().expect("error receiving hit test result")
-    }
-
-    /// Create a new image key. Blocks until the key is available.
-    pub fn generate_image_key(&self) -> Option<ImageKey> {
-        let (sender, receiver) = ipc::channel().unwrap();
-        self.0
-            .send(CrossProcessCompositorMessage::GenerateImageKey(sender))
-            .ok()?;
-        receiver.recv().ok()
-    }
-
-    pub fn add_image(
-        &self,
-        key: ImageKey,
-        descriptor: ImageDescriptor,
-        data: SerializableImageData,
-    ) {
-        if let Err(e) = self.0.send(CrossProcessCompositorMessage::AddImage(
-            key, descriptor, data,
-        )) {
-            warn!("Error sending image update: {}", e);
-        }
-    }
-
-    /// Perform an image resource update operation.
-    pub fn update_images(&self, updates: Vec<ImageUpdate>) {
-        if let Err(e) = self
-            .0
-            .send(CrossProcessCompositorMessage::UpdateImages(updates))
-        {
-            warn!("error sending image updates: {}", e);
-        }
-    }
-
-    pub fn remove_unused_font_resources(
-        &self,
-        keys: Vec<FontKey>,
-        instance_keys: Vec<FontInstanceKey>,
-    ) {
-        if keys.is_empty() && instance_keys.is_empty() {
-            return;
-        }
-        let _ = self.0.send(CrossProcessCompositorMessage::RemoveFonts(
-            keys,
-            instance_keys,
-        ));
-    }
-
-    pub fn add_font_instance(
-        &self,
-        font_instance_key: FontInstanceKey,
-        font_key: FontKey,
-        size: f32,
-        flags: FontInstanceFlags,
-    ) {
-        let _x = self.0.send(CrossProcessCompositorMessage::AddFontInstance(
-            font_instance_key,
-            font_key,
-            size,
-            flags,
-        ));
-    }
-
-    pub fn add_font(&self, font_key: FontKey, data: Arc<IpcSharedMemory>, index: u32) {
-        let _ = self.0.send(CrossProcessCompositorMessage::AddFont(
-            font_key, data, index,
-        ));
-    }
-
-    pub fn add_system_font(&self, font_key: FontKey, handle: NativeFontHandle) {
-        let _ = self.0.send(CrossProcessCompositorMessage::AddSystemFont(
-            font_key, handle,
-        ));
-    }
-
-    pub fn fetch_font_keys(
-        &self,
-        number_of_font_keys: usize,
-        number_of_font_instance_keys: usize,
-    ) -> (Vec<FontKey>, Vec<FontInstanceKey>) {
-        let (sender, receiver) = ipc_channel::ipc::channel().expect("Could not create IPC channel");
-        let _ = self.0.send(CrossProcessCompositorMessage::GenerateFontKeys(
-            number_of_font_keys,
-            number_of_font_instance_keys,
-            sender,
-        ));
-        receiver.recv().unwrap()
-    }
-}
-
-/// This trait is used as a bridge between the different GL clients
-/// in Servo that handles WebRender ExternalImages and the WebRender
-/// ExternalImageHandler API.
-//
-/// This trait is used to notify lock/unlock messages and get the
-/// required info that WR needs.
-pub trait WebrenderExternalImageApi {
-    fn lock(&mut self, id: u64) -> (WebrenderImageSource, UntypedSize2D<i32>);
-    fn unlock(&mut self, id: u64);
-}
-
-pub enum WebrenderImageSource<'a> {
-    TextureHandle(u32),
-    Raw(&'a [u8]),
-}
-
-/// Type of Webrender External Image Handler.
-pub enum WebrenderImageHandlerType {
-    WebGL,
-    Media,
-    WebGPU,
-}
-
-/// List of Webrender external images to be shared among all external image
-/// consumers (WebGL, Media, WebGPU).
-/// It ensures that external image identifiers are unique.
-#[derive(Default)]
-pub struct WebrenderExternalImageRegistry {
-    /// Map of all generated external images.
-    external_images: HashMap<ExternalImageId, WebrenderImageHandlerType>,
-    /// Id generator for the next external image identifier.
-    next_image_id: u64,
-}
-
-impl WebrenderExternalImageRegistry {
-    pub fn next_id(&mut self, handler_type: WebrenderImageHandlerType) -> ExternalImageId {
-        self.next_image_id += 1;
-        let key = ExternalImageId(self.next_image_id);
-        self.external_images.insert(key, handler_type);
-        key
-    }
-
-    pub fn remove(&mut self, key: &ExternalImageId) {
-        self.external_images.remove(key);
-    }
-
-    pub fn get(&self, key: &ExternalImageId) -> Option<&WebrenderImageHandlerType> {
-        self.external_images.get(key)
-    }
-}
-
-/// WebRender External Image Handler implementation.
-pub struct WebrenderExternalImageHandlers {
-    /// WebGL handler.
-    webgl_handler: Option<Box<dyn WebrenderExternalImageApi>>,
-    /// Media player handler.
-    media_handler: Option<Box<dyn WebrenderExternalImageApi>>,
-    /// WebGPU handler.
-    webgpu_handler: Option<Box<dyn WebrenderExternalImageApi>>,
-    /// Webrender external images.
-    external_images: Arc<Mutex<WebrenderExternalImageRegistry>>,
-}
-
-impl WebrenderExternalImageHandlers {
-    pub fn new() -> (Self, Arc<Mutex<WebrenderExternalImageRegistry>>) {
-        let external_images = Arc::new(Mutex::new(WebrenderExternalImageRegistry::default()));
-        (
-            Self {
-                webgl_handler: None,
-                media_handler: None,
-                webgpu_handler: None,
-                external_images: external_images.clone(),
-            },
-            external_images,
-        )
-    }
-
-    pub fn set_handler(
-        &mut self,
-        handler: Box<dyn WebrenderExternalImageApi>,
-        handler_type: WebrenderImageHandlerType,
-    ) {
-        match handler_type {
-            WebrenderImageHandlerType::WebGL => self.webgl_handler = Some(handler),
-            WebrenderImageHandlerType::Media => self.media_handler = Some(handler),
-            WebrenderImageHandlerType::WebGPU => self.webgpu_handler = Some(handler),
-        }
-    }
-}
-
-impl ExternalImageHandler for WebrenderExternalImageHandlers {
-    /// Lock the external image. Then, WR could start to read the
-    /// image content.
-    /// The WR client should not change the image content until the
-    /// unlock() call.
-    fn lock(&mut self, key: ExternalImageId, _channel_index: u8) -> ExternalImage {
-        let external_images = self.external_images.lock().unwrap();
-        let handler_type = external_images
-            .get(&key)
-            .expect("Tried to get unknown external image");
-        match handler_type {
-            WebrenderImageHandlerType::WebGL => {
-                let (source, size) = self.webgl_handler.as_mut().unwrap().lock(key.0);
-                let texture_id = match source {
-                    WebrenderImageSource::TextureHandle(b) => b,
-                    _ => panic!("Wrong type"),
-                };
-                ExternalImage {
-                    uv: TexelRect::new(0.0, size.height as f32, size.width as f32, 0.0),
-                    source: ExternalImageSource::NativeTexture(texture_id),
-                }
-            },
-            WebrenderImageHandlerType::Media => {
-                let (source, size) = self.media_handler.as_mut().unwrap().lock(key.0);
-                let texture_id = match source {
-                    WebrenderImageSource::TextureHandle(b) => b,
-                    _ => panic!("Wrong type"),
-                };
-                ExternalImage {
-                    uv: TexelRect::new(0.0, size.height as f32, size.width as f32, 0.0),
-                    source: ExternalImageSource::NativeTexture(texture_id),
-                }
-            },
-            WebrenderImageHandlerType::WebGPU => {
-                let (source, size) = self.webgpu_handler.as_mut().unwrap().lock(key.0);
-                let buffer = match source {
-                    WebrenderImageSource::Raw(b) => b,
-                    _ => panic!("Wrong type"),
-                };
-                ExternalImage {
-                    uv: TexelRect::new(0.0, size.height as f32, size.width as f32, 0.0),
-                    source: ExternalImageSource::RawData(buffer),
-                }
-            },
-        }
-    }
-
-    /// Unlock the external image. The WR should not read the image
-    /// content after this call.
-    fn unlock(&mut self, key: ExternalImageId, _channel_index: u8) {
-        let external_images = self.external_images.lock().unwrap();
-        let handler_type = external_images
-            .get(&key)
-            .expect("Tried to get unknown external image");
-        match handler_type {
-            WebrenderImageHandlerType::WebGL => self.webgl_handler.as_mut().unwrap().unlock(key.0),
-            WebrenderImageHandlerType::Media => self.media_handler.as_mut().unwrap().unlock(key.0),
-            WebrenderImageHandlerType::WebGPU => {
-                self.webgpu_handler.as_mut().unwrap().unlock(key.0)
-            },
-        };
-    }
-}
-
-#[derive(Deserialize, Serialize)]
-/// Serializable image updates that must be performed by WebRender.
-pub enum ImageUpdate {
-    /// Register a new image.
-    AddImage(ImageKey, ImageDescriptor, SerializableImageData),
-    /// Delete a previously registered image registration.
-    DeleteImage(ImageKey),
-    /// Update an existing image registration.
-    UpdateImage(ImageKey, ImageDescriptor, SerializableImageData),
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-/// Serialized `ImageData`. It contains IPC byte channel receiver to prevent from loading bytes too
-/// slow.
-pub enum SerializableImageData {
-    /// A simple series of bytes, provided by the embedding and owned by WebRender.
-    /// The format is stored out-of-band, currently in ImageDescriptor.
-    Raw(IpcSharedMemory),
-    /// An image owned by the embedding, and referenced by WebRender. This may
-    /// take the form of a texture or a heap-allocated buffer.
-    External(ExternalImageData),
-}
-
-impl From<SerializableImageData> for ImageData {
-    fn from(value: SerializableImageData) -> Self {
-        match value {
-            SerializableImageData::Raw(shared_memory) => ImageData::new(shared_memory.to_vec()),
-            SerializableImageData::External(image) => ImageData::External(image),
-        }
-    }
-}
diff --git a/components/shared/webxr/Cargo.toml b/components/shared/webxr/Cargo.toml
index d9a80f84a25..3ba1d112f96 100644
--- a/components/shared/webxr/Cargo.toml
+++ b/components/shared/webxr/Cargo.toml
@@ -19,6 +19,7 @@ path = "lib.rs"
 ipc = ["serde", "ipc-channel", "euclid/serde"]
 
 [dependencies]
+embedder_traits = { workspace = true }
 euclid = { workspace = true }
 ipc-channel = { workspace = true, optional = true }
 log = { workspace = true }
diff --git a/components/shared/webxr/lib.rs b/components/shared/webxr/lib.rs
index a539fd55457..ff10fc33656 100644
--- a/components/shared/webxr/lib.rs
+++ b/components/shared/webxr/lib.rs
@@ -50,7 +50,7 @@ pub use mock::{
     MockButton, MockButtonType, MockDeviceInit, MockDeviceMsg, MockDiscoveryAPI, MockInputInit,
     MockInputMsg, MockRegion, MockViewInit, MockViewsInit, MockWorld,
 };
-pub use registry::{MainThreadRegistry, MainThreadWaker, Registry};
+pub use registry::{MainThreadRegistry, Registry};
 pub use session::{
     EnvironmentBlendMode, MainThreadSession, Quitter, Session, SessionBuilder, SessionId,
     SessionInit, SessionMode, SessionThread,
diff --git a/components/shared/webxr/registry.rs b/components/shared/webxr/registry.rs
index fc894b62fd6..89ab6c1e2e6 100644
--- a/components/shared/webxr/registry.rs
+++ b/components/shared/webxr/registry.rs
@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use embedder_traits::EventLoopWaker;
 use log::warn;
 #[cfg(feature = "ipc")]
 use serde::{Deserialize, Serialize};
@@ -30,29 +31,18 @@ pub struct MainThreadRegistry<GL> {
     next_session_id: u32,
 }
 
-pub trait MainThreadWaker: 'static + Send {
-    fn clone_box(&self) -> Box<dyn MainThreadWaker>;
-    fn wake(&self);
-}
-
-impl Clone for Box<dyn MainThreadWaker> {
-    fn clone(&self) -> Self {
-        self.clone_box()
-    }
-}
-
 #[derive(Clone)]
 #[cfg_attr(feature = "ipc", derive(Serialize, Deserialize))]
 struct MainThreadWakerImpl {
     #[cfg(feature = "ipc")]
     sender: WebXrSender<()>,
     #[cfg(not(feature = "ipc"))]
-    waker: Box<dyn MainThreadWaker>,
+    waker: Box<dyn EventLoopWaker>,
 }
 
 #[cfg(feature = "ipc")]
 impl MainThreadWakerImpl {
-    fn new(waker: Box<dyn MainThreadWaker>) -> Result<MainThreadWakerImpl, Error> {
+    fn new(waker: Box<dyn EventLoopWaker>) -> Result<MainThreadWakerImpl, Error> {
         let (sender, receiver) = crate::webxr_channel().or(Err(Error::CommunicationError))?;
         ipc_channel::router::ROUTER.add_typed_route(receiver, Box::new(move |_| waker.wake()));
         Ok(MainThreadWakerImpl { sender })
@@ -65,7 +55,7 @@ impl MainThreadWakerImpl {
 
 #[cfg(not(feature = "ipc"))]
 impl MainThreadWakerImpl {
-    fn new(waker: Box<dyn MainThreadWaker>) -> Result<MainThreadWakerImpl, Error> {
+    fn new(waker: Box<dyn EventLoopWaker>) -> Result<MainThreadWakerImpl, Error> {
         Ok(MainThreadWakerImpl { waker })
     }
 
@@ -110,7 +100,7 @@ impl Registry {
 
 impl<GL: 'static + GLTypes> MainThreadRegistry<GL> {
     pub fn new(
-        waker: Box<dyn MainThreadWaker>,
+        waker: Box<dyn EventLoopWaker>,
         grand_manager: LayerGrandManager<GL>,
     ) -> Result<Self, Error> {
         let (sender, receiver) = crate::webxr_channel().or(Err(Error::CommunicationError))?;
diff --git a/components/url/lib.rs b/components/url/lib.rs
index 17a8e6523a4..f1ae1083c8e 100644
--- a/components/url/lib.rs
+++ b/components/url/lib.rs
@@ -35,7 +35,7 @@ pub enum UrlError {
 }
 
 #[derive(Clone, Deserialize, Eq, Hash, MallocSizeOf, Ord, PartialEq, PartialOrd, Serialize)]
-pub struct ServoUrl(#[ignore_malloc_size_of = "Arc"] Arc<Url>);
+pub struct ServoUrl(#[conditional_malloc_size_of] Arc<Url>);
 
 impl ServoUrl {
     pub fn from_url(url: Url) -> Self {
@@ -224,33 +224,7 @@ impl ServoUrl {
             return true;
         }
         // Step 3
-        self.is_origin_trustworthy()
-    }
-
-    /// <https://w3c.github.io/webappsec-secure-contexts/#is-origin-trustworthy>
-    pub fn is_origin_trustworthy(&self) -> bool {
-        // Step 1
-        if !self.origin().is_tuple() {
-            return false;
-        }
-
-        // Step 3
-        if self.scheme() == "https" || self.scheme() == "wss" {
-            true
-        // Steps 4-5
-        } else if self.host().is_some() {
-            let host = self.host_str().unwrap();
-            // Step 4
-            if let Ok(ip_addr) = host.parse::<IpAddr>() {
-                ip_addr.is_loopback()
-            // Step 5
-            } else {
-                host == "localhost" || host.ends_with(".localhost")
-            }
-        // Step 6
-        } else {
-            self.scheme() == "file"
-        }
+        self.origin().is_potentially_trustworthy()
     }
 }
 
diff --git a/components/url/origin.rs b/components/url/origin.rs
index ede6b134135..a19d45b966c 100644
--- a/components/url/origin.rs
+++ b/components/url/origin.rs
@@ -3,6 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use std::cell::RefCell;
+use std::net::IpAddr;
 use std::rc::Rc;
 
 use malloc_size_of::malloc_size_of_is_0;
@@ -39,7 +40,14 @@ impl ImmutableOrigin {
 
     /// Creates a new opaque origin that is only equal to itself.
     pub fn new_opaque() -> ImmutableOrigin {
-        ImmutableOrigin::Opaque(OpaqueOrigin(servo_rand::random_uuid()))
+        ImmutableOrigin::Opaque(OpaqueOrigin::Opaque(servo_rand::random_uuid()))
+    }
+
+    // For use in mixed security context tests because data: URL workers inherit contexts
+    pub fn new_opaque_data_url_worker() -> ImmutableOrigin {
+        ImmutableOrigin::Opaque(OpaqueOrigin::SecureWorkerFromDataUrl(
+            servo_rand::random_uuid(),
+        ))
     }
 
     pub fn scheme(&self) -> Option<&str> {
@@ -79,6 +87,43 @@ impl ImmutableOrigin {
         }
     }
 
+    /// <https://w3c.github.io/webappsec-secure-contexts/#is-origin-trustworthy>
+    pub fn is_potentially_trustworthy(&self) -> bool {
+        // 1. If origin is an opaque origin return "Not Trustworthy"
+        if matches!(self, ImmutableOrigin::Opaque(_)) {
+            return false;
+        }
+
+        if let ImmutableOrigin::Tuple(scheme, host, _) = self {
+            // 3. If origin’s scheme is either "https" or "wss", return "Potentially Trustworthy"
+            if scheme == "https" || scheme == "wss" {
+                return true;
+            }
+            // 6. If origin’s scheme is "file", return "Potentially Trustworthy".
+            if scheme == "file" {
+                return true;
+            }
+
+            // 4. If origin’s host matches one of the CIDR notations 127.0.0.0/8 or ::1/128,
+            // return "Potentially Trustworthy".
+            if let Ok(ip_addr) = host.to_string().parse::<IpAddr>() {
+                return ip_addr.is_loopback();
+            }
+            // 5. If the user agent conforms to the name resolution rules in
+            // [let-localhost-be-localhost] and one of the following is true:
+            // * origin’s host is "localhost" or "localhost."
+            // * origin’s host ends with ".localhost" or ".localhost."
+            // then return "Potentially Trustworthy".
+            if let Host::Domain(domain) = host {
+                if domain == "localhost" || domain.ends_with(".localhost") {
+                    return true;
+                }
+            }
+        }
+        // 9. Return "Not Trustworthy".
+        false
+    }
+
     /// <https://html.spec.whatwg.org/multipage/#ascii-serialisation-of-an-origin>
     pub fn ascii_serialization(&self) -> String {
         self.clone().into_url_origin().ascii_serialization()
@@ -87,8 +132,13 @@ impl ImmutableOrigin {
 
 /// Opaque identifier for URLs that have file or other schemes
 #[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
-pub struct OpaqueOrigin(Uuid);
-
+pub enum OpaqueOrigin {
+    Opaque(Uuid),
+    // Workers created from `data:` urls will have opaque origins but need to be treated
+    // as inheriting the secure context they were created in. This tracks that the origin
+    // was created in such a context
+    SecureWorkerFromDataUrl(Uuid),
+}
 malloc_size_of_is_0!(OpaqueOrigin);
 
 /// A representation of an [origin](https://html.spec.whatwg.org/multipage/#origin-2).
diff --git a/components/webdriver_server/actions.rs b/components/webdriver_server/actions.rs
index 542e9f042d6..43dd0e183dc 100644
--- a/components/webdriver_server/actions.rs
+++ b/components/webdriver_server/actions.rs
@@ -6,35 +6,38 @@ use std::collections::HashSet;
 use std::time::{Duration, Instant};
 use std::{cmp, thread};
 
-use constellation_traits::ConstellationMsg;
+use constellation_traits::EmbedderToConstellationMessage;
 use embedder_traits::{MouseButtonAction, WebDriverCommandMsg, WebDriverScriptCommand};
 use ipc_channel::ipc;
 use keyboard_types::webdriver::KeyInputState;
 use webdriver::actions::{
     ActionSequence, ActionsType, GeneralAction, KeyAction, KeyActionItem, KeyDownAction,
     KeyUpAction, NullActionItem, PointerAction, PointerActionItem, PointerActionParameters,
-    PointerDownAction, PointerMoveAction, PointerOrigin, PointerType, PointerUpAction,
+    PointerDownAction, PointerMoveAction, PointerOrigin, PointerType, PointerUpAction, WheelAction,
+    WheelActionItem, WheelScrollAction,
 };
-use webdriver::error::ErrorStatus;
+use webdriver::error::{ErrorStatus, WebDriverError};
 
-use crate::Handler;
+use crate::{Handler, WebElement, wait_for_script_response};
 
-// Interval between pointerMove increments in ms, based on common vsync
+// Interval between wheelScroll and pointerMove increments in ms, based on common vsync
 static POINTERMOVE_INTERVAL: u64 = 17;
+static WHEELSCROLL_INTERVAL: u64 = 17;
 
 // https://w3c.github.io/webdriver/#dfn-input-source-state
 pub(crate) enum InputSourceState {
     Null,
     Key(KeyInputState),
     Pointer(PointerInputState),
+    Wheel,
 }
 
 // https://w3c.github.io/webdriver/#dfn-pointer-input-source
 pub(crate) struct PointerInputState {
     subtype: PointerType,
     pressed: HashSet<u64>,
-    x: i64,
-    y: i64,
+    x: f64,
+    y: f64,
 }
 
 impl PointerInputState {
@@ -46,8 +49,8 @@ impl PointerInputState {
                 PointerType::Touch => PointerType::Touch,
             },
             pressed: HashSet::new(),
-            x: 0,
-            y: 0,
+            x: 0.0,
+            y: 0.0,
         }
     }
 }
@@ -76,7 +79,15 @@ fn compute_tick_duration(tick_actions: &ActionSequence) -> u64 {
             }
         },
         ActionsType::Key { actions: _ } => (),
-        ActionsType::Wheel { .. } => todo!("Not implemented."),
+        ActionsType::Wheel { actions } => {
+            for action in actions.iter() {
+                let action_duration = match action {
+                    WheelActionItem::General(GeneralAction::Pause(action)) => action.duration,
+                    WheelActionItem::Wheel(WheelAction::Scroll(action)) => action.duration,
+                };
+                duration = cmp::max(duration, action_duration.unwrap_or(0));
+            }
+        },
     }
     duration
 }
@@ -176,7 +187,27 @@ impl Handler {
                     }
                 }
             },
-            ActionsType::Wheel { .. } => todo!("Not implemented."),
+            ActionsType::Wheel { actions } => {
+                for action in actions.iter() {
+                    match action {
+                        WheelActionItem::General(_action) => {
+                            self.dispatch_general_action(source_id)
+                        },
+                        WheelActionItem::Wheel(action) => {
+                            self.session_mut()
+                                .unwrap()
+                                .input_state_table
+                                .entry(source_id.to_string())
+                                .or_insert(InputSourceState::Wheel);
+                            match action {
+                                WheelAction::Scroll(action) => {
+                                    self.dispatch_scroll_action(action, tick_duration)?
+                                },
+                            }
+                        },
+                    }
+                }
+            },
         }
 
         Ok(())
@@ -188,9 +219,8 @@ impl Handler {
 
         let raw_key = action.value.chars().next().unwrap();
         let key_input_state = match session.input_state_table.get_mut(source_id).unwrap() {
-            InputSourceState::Null => unreachable!(),
             InputSourceState::Key(key_input_state) => key_input_state,
-            InputSourceState::Pointer(_) => unreachable!(),
+            _ => unreachable!(),
         };
 
         session.input_cancel_list.push(ActionSequence {
@@ -206,7 +236,7 @@ impl Handler {
         let cmd_msg =
             WebDriverCommandMsg::KeyboardAction(session.browsing_context_id, keyboard_event);
         self.constellation_chan
-            .send(ConstellationMsg::WebDriverCommand(cmd_msg))
+            .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
             .unwrap();
     }
 
@@ -216,9 +246,8 @@ impl Handler {
 
         let raw_key = action.value.chars().next().unwrap();
         let key_input_state = match session.input_state_table.get_mut(source_id).unwrap() {
-            InputSourceState::Null => unreachable!(),
             InputSourceState::Key(key_input_state) => key_input_state,
-            InputSourceState::Pointer(_) => unreachable!(),
+            _ => unreachable!(),
         };
 
         session.input_cancel_list.push(ActionSequence {
@@ -234,7 +263,7 @@ impl Handler {
             let cmd_msg =
                 WebDriverCommandMsg::KeyboardAction(session.browsing_context_id, keyboard_event);
             self.constellation_chan
-                .send(ConstellationMsg::WebDriverCommand(cmd_msg))
+                .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
                 .unwrap();
         }
     }
@@ -248,9 +277,8 @@ impl Handler {
         let session = self.session.as_mut().unwrap();
 
         let pointer_input_state = match session.input_state_table.get_mut(source_id).unwrap() {
-            InputSourceState::Null => unreachable!(),
-            InputSourceState::Key(_) => unreachable!(),
             InputSourceState::Pointer(pointer_input_state) => pointer_input_state,
+            _ => unreachable!(),
         };
 
         if pointer_input_state.pressed.contains(&action.button) {
@@ -277,16 +305,15 @@ impl Handler {
             },
         });
 
-        let button = (action.button as u16).into();
         let cmd_msg = WebDriverCommandMsg::MouseButtonAction(
             session.webview_id,
             MouseButtonAction::Down,
-            button,
+            action.button.into(),
             pointer_input_state.x as f32,
             pointer_input_state.y as f32,
         );
         self.constellation_chan
-            .send(ConstellationMsg::WebDriverCommand(cmd_msg))
+            .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
             .unwrap();
     }
 
@@ -295,9 +322,8 @@ impl Handler {
         let session = self.session.as_mut().unwrap();
 
         let pointer_input_state = match session.input_state_table.get_mut(source_id).unwrap() {
-            InputSourceState::Null => unreachable!(),
-            InputSourceState::Key(_) => unreachable!(),
             InputSourceState::Pointer(pointer_input_state) => pointer_input_state,
+            _ => unreachable!(),
         };
 
         if !pointer_input_state.pressed.contains(&action.button) {
@@ -324,16 +350,15 @@ impl Handler {
             },
         });
 
-        let button = (action.button as u16).into();
         let cmd_msg = WebDriverCommandMsg::MouseButtonAction(
             session.webview_id,
             MouseButtonAction::Up,
-            button,
+            action.button.into(),
             pointer_input_state.x as f32,
             pointer_input_state.y as f32,
         );
         self.constellation_chan
-            .send(ConstellationMsg::WebDriverCommand(cmd_msg))
+            .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
             .unwrap();
     }
 
@@ -359,59 +384,39 @@ impl Handler {
             .get(source_id)
             .unwrap()
         {
-            InputSourceState::Null => unreachable!(),
-            InputSourceState::Key(_) => unreachable!(),
             InputSourceState::Pointer(pointer_input_state) => {
                 (pointer_input_state.x, pointer_input_state.y)
             },
+            _ => unreachable!(),
+        };
+
+        let (x, y) = match action.origin {
+            PointerOrigin::Viewport => (x_offset, y_offset),
+            PointerOrigin::Pointer => (start_x + x_offset, start_y + y_offset),
+            PointerOrigin::Element(ref web_element) => {
+                let point = self.get_element_origin_relative_coordinates(web_element)?;
+                (point.0 as f64, point.1 as f64)
+            },
         };
 
         // Step 5 - 6
-        let (x, y) = match action.origin {
-            PointerOrigin::Viewport => (x_offset, y_offset),
-            PointerOrigin::Pointer => (start_x + x_offset, start_y + y_offset),
-            PointerOrigin::Element(ref x) => {
-                let (sender, receiver) = ipc::channel().unwrap();
-                self.browsing_context_script_command(
-                    WebDriverScriptCommand::GetElementInViewCenterPoint(x.to_string(), sender),
-                )
-                .unwrap();
+        self.check_viewport_bound(x, y)?;
 
-                let Some(point) = receiver.recv().unwrap()? else {
-                    return Err(ErrorStatus::UnknownError);
-                };
-                point
-            },
-        };
-
-        let (sender, receiver) = ipc::channel().unwrap();
-        let cmd_msg =
-            WebDriverCommandMsg::GetWindowSize(self.session.as_ref().unwrap().webview_id, sender);
-        self.constellation_chan
-            .send(ConstellationMsg::WebDriverCommand(cmd_msg))
-            .unwrap();
-
-        // Steps 7 - 8
-        let viewport_size = receiver.recv().unwrap();
-        if x < 0 || x as f32 > viewport_size.width || y < 0 || y as f32 > viewport_size.height {
-            return Err(ErrorStatus::MoveTargetOutOfBounds);
-        }
-
-        // Step 9
+        // Step 7
         let duration = match action.duration {
             Some(duration) => duration,
             None => tick_duration,
         };
 
-        // Step 10
+        // Step 8
         if duration > 0 {
             thread::sleep(Duration::from_millis(POINTERMOVE_INTERVAL));
         }
 
-        // Step 11
+        // Step 9 - 18
         self.perform_pointer_move(source_id, duration, start_x, start_y, x, y, tick_start);
 
-        // Step 12
+        // Step 19
         Ok(())
     }
 
@@ -421,17 +426,16 @@ impl Handler {
         &mut self,
         source_id: &str,
         duration: u64,
-        start_x: i64,
-        start_y: i64,
-        target_x: i64,
-        target_y: i64,
+        start_x: f64,
+        start_y: f64,
+        target_x: f64,
+        target_y: f64,
         tick_start: Instant,
     ) {
         let session = self.session.as_mut().unwrap();
         let pointer_input_state = match session.input_state_table.get_mut(source_id).unwrap() {
-            InputSourceState::Null => unreachable!(),
-            InputSourceState::Key(_) => unreachable!(),
             InputSourceState::Pointer(pointer_input_state) => pointer_input_state,
+            _ => unreachable!(),
         };
 
         loop {
@@ -453,8 +457,8 @@ impl Handler {
                 (target_x, target_y)
             } else {
                 (
-                    (duration_ratio * (target_x - start_x) as f64) as i64 + start_x,
-                    (duration_ratio * (target_y - start_y) as f64) as i64 + start_y,
+                    duration_ratio * (target_x - start_x) + start_x,
+                    duration_ratio * (target_y - start_y) + start_y,
                 )
             };
 
@@ -467,8 +471,9 @@ impl Handler {
                 // Step 7.2
                 let cmd_msg =
                     WebDriverCommandMsg::MouseMoveAction(session.webview_id, x as f32, y as f32);
+                //TODO: Need Synchronization here before updating `pointer_input_state`
                 self.constellation_chan
-                    .send(ConstellationMsg::WebDriverCommand(cmd_msg))
+                    .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
                     .unwrap();
                 // Step 7.3
                 pointer_input_state.x = x;
@@ -484,4 +489,186 @@ impl Handler {
             thread::sleep(Duration::from_millis(POINTERMOVE_INTERVAL));
         }
     }
+
+    /// <https://w3c.github.io/webdriver/#dfn-dispatch-a-scroll-action>
+    fn dispatch_scroll_action(
+        &mut self,
+        action: &WheelScrollAction,
+        tick_duration: u64,
+    ) -> Result<(), ErrorStatus> {
+        // Note: We have not implemented `extract an action sequence` which will calls
+        // `process a wheel action` that validate many of the variable used here.
+        // Hence, we do all the checking here until those functions is properly
+        // implemented.
+        // <https://w3c.github.io/webdriver/#dfn-process-a-wheel-action>
+
+        let tick_start = Instant::now();
+
+        // Step 1
+        let Some(x_offset) = action.x else {
+            return Err(ErrorStatus::InvalidArgument);
+        };
+
+        // Step 2
+        let Some(y_offset) = action.y else {
+            return Err(ErrorStatus::InvalidArgument);
+        };
+
+        // Step 3 - 4
+        // Get coordinates relative to an origin.
+        let (x, y) = match action.origin {
+            PointerOrigin::Viewport => (x_offset, y_offset),
+            PointerOrigin::Pointer => return Err(ErrorStatus::InvalidArgument),
+            PointerOrigin::Element(ref web_element) => {
+                self.get_element_origin_relative_coordinates(web_element)?
+            },
+        };
+
+        // Step 5 - 6
+        self.check_viewport_bound(x as _, y as _)?;
+
+        // Step 7 - 8
+        let Some(delta_x) = action.deltaX else {
+            return Err(ErrorStatus::InvalidArgument);
+        };
+
+        let Some(delta_y) = action.deltaY else {
+            return Err(ErrorStatus::InvalidArgument);
+        };
+
+        // Step 9
+        let duration = match action.duration {
+            Some(duration) => duration,
+            None => tick_duration,
+        };
+
+        // Step 10
+        if duration > 0 {
+            thread::sleep(Duration::from_millis(WHEELSCROLL_INTERVAL));
+        }
+
+        // Step 11
+        self.perform_scroll(duration, x, y, delta_x, delta_y, 0, 0, tick_start);
+
+        // Step 12
+        Ok(())
+    }
+
+    /// <https://w3c.github.io/webdriver/#dfn-perform-a-scroll>
+    #[allow(clippy::too_many_arguments)]
+    fn perform_scroll(
+        &mut self,
+        duration: u64,
+        x: i64,
+        y: i64,
+        target_delta_x: i64,
+        target_delta_y: i64,
+        mut curr_delta_x: i64,
+        mut curr_delta_y: i64,
+        tick_start: Instant,
+    ) {
+        let session = self.session.as_mut().unwrap();
+
+        // Step 1
+        let time_delta = tick_start.elapsed().as_millis();
+
+        // Step 2
+        let duration_ratio = if duration > 0 {
+            time_delta as f64 / duration as f64
+        } else {
+            1.0
+        };
+
+        // Step 3
+        let last = 1.0 - duration_ratio < 0.001;
+
+        // Step 4
+        let (delta_x, delta_y) = if last {
+            (target_delta_x - curr_delta_x, target_delta_y - curr_delta_y)
+        } else {
+            (
+                (duration_ratio * target_delta_x as f64) as i64 - curr_delta_x,
+                (duration_ratio * target_delta_y as f64) as i64 - curr_delta_y,
+            )
+        };
+
+        // Step 5
+        if delta_x != 0 || delta_y != 0 {
+            // Perform implementation-specific action dispatch steps
+            let cmd_msg = WebDriverCommandMsg::WheelScrollAction(
+                session.webview_id,
+                x as f32,
+                y as f32,
+                delta_x as f64,
+                delta_y as f64,
+            );
+            self.constellation_chan
+                .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
+                .unwrap();
+
+            curr_delta_x += delta_x;
+            curr_delta_y += delta_y;
+        }
+
+        // Step 6
+        if last {
+            return;
+        }
+
+        // Step 7
+        // TODO: The two steps should be done in parallel
+        // 7.1. Asynchronously wait for an implementation defined amount of time to pass.
+        thread::sleep(Duration::from_millis(WHEELSCROLL_INTERVAL));
+        // 7.2. Perform a scroll with arguments duration, x, y, target delta x,
+        // target delta y, current delta x, current delta y.
+        self.perform_scroll(
+            duration,
+            x,
+            y,
+            target_delta_x,
+            target_delta_y,
+            curr_delta_x,
+            curr_delta_y,
+            tick_start,
+        );
+    }
+
+    fn check_viewport_bound(&self, x: f64, y: f64) -> Result<(), ErrorStatus> {
+        let (sender, receiver) = ipc::channel().unwrap();
+        let cmd_msg =
+            WebDriverCommandMsg::GetWindowSize(self.session.as_ref().unwrap().webview_id, sender);
+        self.constellation_chan
+            .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
+            .unwrap();
+
+        let viewport_size = match wait_for_script_response(receiver) {
+            Ok(response) => response,
+            Err(WebDriverError { error, .. }) => return Err(error),
+        };
+        if x < 0.0 || x > viewport_size.width.into() || y < 0.0 || y > viewport_size.height.into() {
+            Err(ErrorStatus::MoveTargetOutOfBounds)
+        } else {
+            Ok(())
+        }
+    }
+
+    fn get_element_origin_relative_coordinates(
+        &self,
+        web_element: &WebElement,
+    ) -> Result<(i64, i64), ErrorStatus> {
+        let (sender, receiver) = ipc::channel().unwrap();
+        self.browsing_context_script_command(WebDriverScriptCommand::GetElementInViewCenterPoint(
+            web_element.to_string(),
+            sender,
+        ))
+        .unwrap();
+        let response = match wait_for_script_response(receiver) {
+            Ok(response) => response,
+            Err(WebDriverError { error, .. }) => return Err(error),
+        };
+        match response? {
+            Some(point) => Ok(point),
+            None => Err(ErrorStatus::UnknownError),
+        }
+    }
 }
diff --git a/components/webdriver_server/capabilities.rs b/components/webdriver_server/capabilities.rs
index 477a3bfd34c..32596f5275a 100644
--- a/components/webdriver_server/capabilities.rs
+++ b/components/webdriver_server/capabilities.rs
@@ -4,7 +4,7 @@
 
 use serde_json::{Map, Value};
 use webdriver::capabilities::{BrowserCapabilities, Capabilities};
-use webdriver::error::{WebDriverError, WebDriverResult};
+use webdriver::error::{ErrorStatus, WebDriverError, WebDriverResult};
 
 pub struct ServoCapabilities {
     pub browser_name: String,
@@ -79,42 +79,42 @@ impl BrowserCapabilities for ServoCapabilities {
         &mut self,
         _: &serde_json::Map<std::string::String, Value>,
     ) -> Result<bool, WebDriverError> {
-        todo!()
+        Err(WebDriverError::new(ErrorStatus::UnsupportedOperation, ""))
     }
 
     fn webauthn_virtual_authenticators(
         &mut self,
         _: &serde_json::Map<std::string::String, Value>,
     ) -> Result<bool, WebDriverError> {
-        todo!()
+        Err(WebDriverError::new(ErrorStatus::UnsupportedOperation, ""))
     }
 
     fn webauthn_extension_uvm(
         &mut self,
         _: &serde_json::Map<std::string::String, Value>,
     ) -> Result<bool, WebDriverError> {
-        todo!()
+        Err(WebDriverError::new(ErrorStatus::UnsupportedOperation, ""))
     }
 
     fn webauthn_extension_prf(
         &mut self,
         _: &serde_json::Map<std::string::String, Value>,
     ) -> Result<bool, WebDriverError> {
-        todo!()
+        Err(WebDriverError::new(ErrorStatus::UnsupportedOperation, ""))
     }
 
     fn webauthn_extension_large_blob(
         &mut self,
         _: &serde_json::Map<std::string::String, Value>,
     ) -> Result<bool, WebDriverError> {
-        todo!()
+        Err(WebDriverError::new(ErrorStatus::UnsupportedOperation, ""))
     }
 
     fn webauthn_extension_cred_blob(
         &mut self,
         _: &serde_json::Map<std::string::String, Value>,
     ) -> Result<bool, WebDriverError> {
-        todo!()
+        Err(WebDriverError::new(ErrorStatus::UnsupportedOperation, ""))
     }
 }
 
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
index e3538dde617..5735594b058 100644
--- a/components/webdriver_server/lib.rs
+++ b/components/webdriver_server/lib.rs
@@ -19,17 +19,17 @@ use std::{env, fmt, mem, process, thread};
 use base::id::{BrowsingContextId, WebViewId};
 use base64::Engine;
 use capabilities::ServoCapabilities;
-use constellation_traits::{ConstellationMsg, TraversalDirection};
+use constellation_traits::{EmbedderToConstellationMessage, TraversalDirection};
 use cookie::{CookieBuilder, Expiration};
 use crossbeam_channel::{Receiver, Sender, after, select, unbounded};
 use embedder_traits::{
-    WebDriverCommandMsg, WebDriverCookieError, WebDriverFrameId, WebDriverJSError,
+    MouseButton, WebDriverCommandMsg, WebDriverCookieError, WebDriverFrameId, WebDriverJSError,
     WebDriverJSResult, WebDriverJSValue, WebDriverLoadStatus, WebDriverScriptCommand,
 };
 use euclid::{Rect, Size2D};
 use http::method::Method;
 use image::{DynamicImage, ImageFormat, RgbaImage};
-use ipc_channel::ipc::{self, IpcSender};
+use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use ipc_channel::router::ROUTER;
 use keyboard_types::webdriver::send_keys;
 use log::{debug, info};
@@ -100,7 +100,7 @@ fn cookie_msg_to_cookie(cookie: cookie::Cookie) -> Cookie {
     }
 }
 
-pub fn start_server(port: u16, constellation_chan: Sender<ConstellationMsg>) {
+pub fn start_server(port: u16, constellation_chan: Sender<EmbedderToConstellationMessage>) {
     let handler = Handler::new(constellation_chan);
     thread::Builder::new()
         .name("WebDriverHttpServer".to_owned())
@@ -188,7 +188,7 @@ struct Handler {
     /// will be forwarded to the load_status_receiver.
     load_status_sender: IpcSender<WebDriverLoadStatus>,
     session: Option<WebDriverSession>,
-    constellation_chan: Sender<ConstellationMsg>,
+    constellation_chan: Sender<EmbedderToConstellationMessage>,
     resize_timeout: u32,
 }
 
@@ -400,7 +400,7 @@ impl<'de> Visitor<'de> for TupleVecMapVisitor {
 }
 
 impl Handler {
-    pub fn new(constellation_chan: Sender<ConstellationMsg>) -> Handler {
+    pub fn new(constellation_chan: Sender<EmbedderToConstellationMessage>) -> Handler {
         // Create a pair of both an IPC and a threaded channel,
         // keep the IPC sender to clone and pass to the constellation for each load,
         // and keep a threaded receiver to block on an incoming load-status.
@@ -425,7 +425,8 @@ impl Handler {
         let (sender, receiver) = ipc::channel().unwrap();
 
         for _ in 0..iterations {
-            let msg = ConstellationMsg::GetFocusTopLevelBrowsingContext(sender.clone());
+            let msg =
+                EmbedderToConstellationMessage::GetFocusTopLevelBrowsingContext(sender.clone());
             self.constellation_chan.send(msg).unwrap();
             // Wait until the document is ready before returning the top-level browsing context id.
             if let Some(x) = receiver.recv().unwrap() {
@@ -622,20 +623,18 @@ impl Handler {
         cmd_msg: WebDriverScriptCommand,
     ) -> WebDriverResult<()> {
         let browsing_context_id = self.session()?.browsing_context_id;
-        let msg = ConstellationMsg::WebDriverCommand(WebDriverCommandMsg::ScriptCommand(
-            browsing_context_id,
-            cmd_msg,
-        ));
+        let msg = EmbedderToConstellationMessage::WebDriverCommand(
+            WebDriverCommandMsg::ScriptCommand(browsing_context_id, cmd_msg),
+        );
         self.constellation_chan.send(msg).unwrap();
         Ok(())
     }
 
     fn top_level_script_command(&self, cmd_msg: WebDriverScriptCommand) -> WebDriverResult<()> {
         let browsing_context_id = BrowsingContextId::from(self.session()?.webview_id);
-        let msg = ConstellationMsg::WebDriverCommand(WebDriverCommandMsg::ScriptCommand(
-            browsing_context_id,
-            cmd_msg,
-        ));
+        let msg = EmbedderToConstellationMessage::WebDriverCommand(
+            WebDriverCommandMsg::ScriptCommand(browsing_context_id, cmd_msg),
+        );
         self.constellation_chan.send(msg).unwrap();
         Ok(())
     }
@@ -656,7 +655,7 @@ impl Handler {
         let cmd_msg =
             WebDriverCommandMsg::LoadUrl(webview_id, url, self.load_status_sender.clone());
         self.constellation_chan
-            .send(ConstellationMsg::WebDriverCommand(cmd_msg))
+            .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
             .unwrap();
 
         self.wait_for_load()
@@ -679,7 +678,7 @@ impl Handler {
         let (sender, receiver) = ipc::channel().unwrap();
         self.top_level_script_command(WebDriverScriptCommand::GetUrl(sender))?;
 
-        let url = receiver.recv().unwrap();
+        let url = wait_for_script_response(receiver)?;
 
         Ok(WebDriverResponse::Generic(ValueResponse(
             serde_json::to_value(url.as_str())?,
@@ -692,10 +691,10 @@ impl Handler {
         let cmd_msg = WebDriverCommandMsg::GetWindowSize(webview_id, sender);
 
         self.constellation_chan
-            .send(ConstellationMsg::WebDriverCommand(cmd_msg))
+            .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
             .unwrap();
 
-        let window_size = receiver.recv().unwrap();
+        let window_size = wait_for_script_response(receiver)?;
         let window_size_response = WindowRectResponse {
             x: 0,
             y: 0,
@@ -724,7 +723,7 @@ impl Handler {
         let cmd_msg = WebDriverCommandMsg::SetWindowSize(webview_id, size.to_i32(), sender.clone());
 
         self.constellation_chan
-            .send(ConstellationMsg::WebDriverCommand(cmd_msg))
+            .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
             .unwrap();
 
         let timeout = self.resize_timeout;
@@ -735,11 +734,11 @@ impl Handler {
             thread::sleep(Duration::from_millis(timeout as u64));
             let cmd_msg = WebDriverCommandMsg::GetWindowSize(webview_id, sender);
             constellation_chan
-                .send(ConstellationMsg::WebDriverCommand(cmd_msg))
+                .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
                 .unwrap();
         });
 
-        let window_size = receiver.recv().unwrap();
+        let window_size = wait_for_script_response(receiver)?;
         let window_size_response = WindowRectResponse {
             x: 0,
             y: 0,
@@ -757,7 +756,7 @@ impl Handler {
             sender,
         ))?;
 
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(is_enabled) => Ok(WebDriverResponse::Generic(ValueResponse(
                 serde_json::to_value(is_enabled)?,
             ))),
@@ -773,7 +772,7 @@ impl Handler {
             sender,
         ))?;
 
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(is_selected) => Ok(WebDriverResponse::Generic(ValueResponse(
                 serde_json::to_value(is_selected)?,
             ))),
@@ -784,7 +783,7 @@ impl Handler {
     fn handle_go_back(&self) -> WebDriverResult<WebDriverResponse> {
         let webview_id = self.session()?.webview_id;
         let direction = TraversalDirection::Back(1);
-        let msg = ConstellationMsg::TraverseHistory(webview_id, direction);
+        let msg = EmbedderToConstellationMessage::TraverseHistory(webview_id, direction);
         self.constellation_chan.send(msg).unwrap();
         Ok(WebDriverResponse::Void)
     }
@@ -792,7 +791,7 @@ impl Handler {
     fn handle_go_forward(&self) -> WebDriverResult<WebDriverResponse> {
         let webview_id = self.session()?.webview_id;
         let direction = TraversalDirection::Forward(1);
-        let msg = ConstellationMsg::TraverseHistory(webview_id, direction);
+        let msg = EmbedderToConstellationMessage::TraverseHistory(webview_id, direction);
         self.constellation_chan.send(msg).unwrap();
         Ok(WebDriverResponse::Void)
     }
@@ -802,7 +801,7 @@ impl Handler {
 
         let cmd_msg = WebDriverCommandMsg::Refresh(webview_id, self.load_status_sender.clone());
         self.constellation_chan
-            .send(ConstellationMsg::WebDriverCommand(cmd_msg))
+            .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
             .unwrap();
 
         self.wait_for_load()
@@ -813,7 +812,7 @@ impl Handler {
 
         self.top_level_script_command(WebDriverScriptCommand::GetTitle(sender))?;
 
-        let value = receiver.recv().unwrap();
+        let value = wait_for_script_response(receiver)?;
         Ok(WebDriverResponse::Generic(ValueResponse(
             serde_json::to_value(value)?,
         )))
@@ -875,7 +874,7 @@ impl Handler {
             },
         }
 
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(value) => {
                 let value_resp = serde_json::to_value(
                     value.map(|x| serde_json::to_value(WebElement(x)).unwrap()),
@@ -892,7 +891,7 @@ impl Handler {
             session.window_handles.remove(&session.webview_id);
             let cmd_msg = WebDriverCommandMsg::CloseWebView(session.webview_id);
             self.constellation_chan
-                .send(ConstellationMsg::WebDriverCommand(cmd_msg))
+                .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
                 .unwrap();
         }
 
@@ -919,7 +918,7 @@ impl Handler {
             self.load_status_sender.clone(),
         );
         self.constellation_chan
-            .send(ConstellationMsg::WebDriverCommand(cmd_msg))
+            .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
             .unwrap();
 
         let mut handle = self.session.as_ref().unwrap().id.to_string();
@@ -980,7 +979,7 @@ impl Handler {
             session.webview_id = webview_id;
             session.browsing_context_id = BrowsingContextId::from(webview_id);
 
-            let msg = ConstellationMsg::FocusWebView(webview_id);
+            let msg = EmbedderToConstellationMessage::FocusWebView(webview_id);
             self.constellation_chan.send(msg).unwrap();
             Ok(WebDriverResponse::Void)
         } else {
@@ -1006,7 +1005,7 @@ impl Handler {
         let cmd = WebDriverScriptCommand::GetBrowsingContextId(frame_id, sender);
         self.browsing_context_script_command(cmd)?;
 
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(browsing_context_id) => {
                 self.session_mut()?.browsing_context_id = browsing_context_id;
                 Ok(WebDriverResponse::Void)
@@ -1048,7 +1047,7 @@ impl Handler {
             },
         }
 
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(value) => {
                 let resp_value: Vec<Value> = value
                     .into_iter()
@@ -1104,7 +1103,7 @@ impl Handler {
             },
         }
 
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(value) => {
                 let value_resp = serde_json::to_value(
                     value.map(|x| serde_json::to_value(WebElement(x)).unwrap()),
@@ -1157,7 +1156,7 @@ impl Handler {
             },
         }
 
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(value) => {
                 let resp_value: Vec<Value> = value
                     .into_iter()
@@ -1176,7 +1175,7 @@ impl Handler {
         let (sender, receiver) = ipc::channel().unwrap();
         let cmd = WebDriverScriptCommand::GetElementRect(element.to_string(), sender);
         self.browsing_context_script_command(cmd)?;
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(rect) => {
                 let response = ElementRectResponse {
                     x: rect.origin.x,
@@ -1194,7 +1193,7 @@ impl Handler {
         let (sender, receiver) = ipc::channel().unwrap();
         let cmd = WebDriverScriptCommand::GetElementText(element.to_string(), sender);
         self.browsing_context_script_command(cmd)?;
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(value) => Ok(WebDriverResponse::Generic(ValueResponse(
                 serde_json::to_value(value)?,
             ))),
@@ -1206,20 +1205,30 @@ impl Handler {
         let (sender, receiver) = ipc::channel().unwrap();
         let cmd = WebDriverScriptCommand::GetActiveElement(sender);
         self.browsing_context_script_command(cmd)?;
-        let value = receiver
-            .recv()
-            .unwrap()
+        let value = wait_for_script_response(receiver)?
             .map(|x| serde_json::to_value(WebElement(x)).unwrap());
         Ok(WebDriverResponse::Generic(ValueResponse(
             serde_json::to_value(value)?,
         )))
     }
 
+    fn handle_computed_role(&self, element: &WebElement) -> WebDriverResult<WebDriverResponse> {
+        let (sender, receiver) = ipc::channel().unwrap();
+        let cmd = WebDriverScriptCommand::GetComputedRole(element.to_string(), sender);
+        self.browsing_context_script_command(cmd)?;
+        match wait_for_script_response(receiver)? {
+            Ok(value) => Ok(WebDriverResponse::Generic(ValueResponse(
+                serde_json::to_value(value)?,
+            ))),
+            Err(error) => Err(WebDriverError::new(error, "")),
+        }
+    }
+
     fn handle_element_tag_name(&self, element: &WebElement) -> WebDriverResult<WebDriverResponse> {
         let (sender, receiver) = ipc::channel().unwrap();
         let cmd = WebDriverScriptCommand::GetElementTagName(element.to_string(), sender);
         self.browsing_context_script_command(cmd)?;
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(value) => Ok(WebDriverResponse::Generic(ValueResponse(
                 serde_json::to_value(value)?,
             ))),
@@ -1239,7 +1248,7 @@ impl Handler {
             sender,
         );
         self.browsing_context_script_command(cmd)?;
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(value) => Ok(WebDriverResponse::Generic(ValueResponse(
                 serde_json::to_value(value)?,
             ))),
@@ -1261,7 +1270,7 @@ impl Handler {
         );
         self.browsing_context_script_command(cmd)?;
 
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(value) => Ok(WebDriverResponse::Generic(ValueResponse(
                 serde_json::to_value(SendableWebDriverJSValue(value))?,
             ))),
@@ -1278,7 +1287,7 @@ impl Handler {
         let cmd =
             WebDriverScriptCommand::GetElementCSS(element.to_string(), name.to_owned(), sender);
         self.browsing_context_script_command(cmd)?;
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(value) => Ok(WebDriverResponse::Generic(ValueResponse(
                 serde_json::to_value(value)?,
             ))),
@@ -1290,7 +1299,7 @@ impl Handler {
         let (sender, receiver) = ipc::channel().unwrap();
         let cmd = WebDriverScriptCommand::GetCookies(sender);
         self.browsing_context_script_command(cmd)?;
-        let cookies = receiver.recv().unwrap();
+        let cookies = wait_for_script_response(receiver)?;
         let response = cookies
             .into_iter()
             .map(|cookie| cookie_msg_to_cookie(cookie.into_inner()))
@@ -1298,16 +1307,18 @@ impl Handler {
         Ok(WebDriverResponse::Cookies(CookiesResponse(response)))
     }
 
-    fn handle_get_cookie(&self, name: &str) -> WebDriverResult<WebDriverResponse> {
+    fn handle_get_cookie(&self, name: String) -> WebDriverResult<WebDriverResponse> {
         let (sender, receiver) = ipc::channel().unwrap();
-        let cmd = WebDriverScriptCommand::GetCookie(name.to_owned(), sender);
+        let cmd = WebDriverScriptCommand::GetCookie(name, sender);
         self.browsing_context_script_command(cmd)?;
-        let cookies = receiver.recv().unwrap();
-        let response = cookies
+        let cookies = wait_for_script_response(receiver)?;
+        let Some(response) = cookies
             .into_iter()
             .map(|cookie| cookie_msg_to_cookie(cookie.into_inner()))
             .next()
-            .unwrap();
+        else {
+            return Err(WebDriverError::new(ErrorStatus::NoSuchCookie, ""));
+        };
         Ok(WebDriverResponse::Cookie(CookieResponse(response)))
     }
 
@@ -1331,7 +1342,7 @@ impl Handler {
 
         let cmd = WebDriverScriptCommand::AddCookie(cookie_builder.build(), sender);
         self.browsing_context_script_command(cmd)?;
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(_) => Ok(WebDriverResponse::Void),
             Err(response) => match response {
                 WebDriverCookieError::InvalidDomain => Err(WebDriverError::new(
@@ -1346,11 +1357,21 @@ impl Handler {
         }
     }
 
+    fn handle_delete_cookie(&self, name: String) -> WebDriverResult<WebDriverResponse> {
+        let (sender, receiver) = ipc::channel().unwrap();
+        let cmd = WebDriverScriptCommand::DeleteCookie(name, sender);
+        self.browsing_context_script_command(cmd)?;
+        match wait_for_script_response(receiver)? {
+            Ok(_) => Ok(WebDriverResponse::Void),
+            Err(error) => Err(WebDriverError::new(error, "")),
+        }
+    }
+
     fn handle_delete_cookies(&self) -> WebDriverResult<WebDriverResponse> {
         let (sender, receiver) = ipc::channel().unwrap();
         let cmd = WebDriverScriptCommand::DeleteCookies(sender);
         self.browsing_context_script_command(cmd)?;
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(_) => Ok(WebDriverResponse::Void),
             Err(error) => Err(WebDriverError::new(error, "")),
         }
@@ -1405,7 +1426,7 @@ impl Handler {
         let cmd = WebDriverScriptCommand::GetPageSource(sender);
         self.browsing_context_script_command(cmd)?;
 
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(source) => Ok(WebDriverResponse::Generic(ValueResponse(
                 serde_json::to_value(source)?,
             ))),
@@ -1466,9 +1487,7 @@ impl Handler {
         let (sender, receiver) = ipc::channel().unwrap();
         let command = WebDriverScriptCommand::ExecuteScript(script, sender);
         self.browsing_context_script_command(command)?;
-        let result = receiver
-            .recv()
-            .unwrap_or(Err(WebDriverJSError::BrowsingContextNotFound));
+        let result = wait_for_script_response(receiver)?;
         self.postprocess_js_result(result)
     }
 
@@ -1484,7 +1503,7 @@ impl Handler {
             .iter()
             .map(webdriver_value_to_js_argument)
             .collect();
-        args_string.push("window.webdriverCallback".to_string());
+        args_string.push("resolve".to_string());
 
         let timeout_script = if let Some(script_timeout) = self.session()?.script_timeout {
             format!("setTimeout(webdriverTimeout, {});", script_timeout)
@@ -1492,7 +1511,17 @@ impl Handler {
             "".into()
         };
         let script = format!(
-            "{} (function() {{ {}\n }})({})",
+            r#"(function() {{
+              let webdriverPromise = new Promise(function(resolve, reject) {{
+                  {}
+                  (async function() {{
+                    {}
+                  }})({})
+                    .then((v) => {{}}, (err) => reject(err))
+              }})
+              .then((v) => window.webdriverCallback(v), (r) => window.webdriverException(r))
+              .catch((r) => window.webdriverException(r));
+            }})();"#,
             timeout_script,
             func_body,
             args_string.join(", "),
@@ -1502,9 +1531,7 @@ impl Handler {
         let (sender, receiver) = ipc::channel().unwrap();
         let command = WebDriverScriptCommand::ExecuteAsyncScript(script, sender);
         self.browsing_context_script_command(command)?;
-        let result = receiver
-            .recv()
-            .unwrap_or(Err(WebDriverJSError::BrowsingContextNotFound));
+        let result = wait_for_script_response(receiver)?;
         self.postprocess_js_result(result)
     }
 
@@ -1520,15 +1547,21 @@ impl Handler {
                 ErrorStatus::NoSuchWindow,
                 "Pipeline id not found in browsing context",
             )),
-            Err(WebDriverJSError::JSError) => Err(WebDriverError::new(
+            Err(WebDriverJSError::JSException(_e)) => Err(WebDriverError::new(
                 ErrorStatus::JavascriptError,
                 "JS evaluation raised an exception",
             )),
+            Err(WebDriverJSError::JSError) => Err(WebDriverError::new(
+                ErrorStatus::JavascriptError,
+                "JS evaluation raised an unknown exception",
+            )),
             Err(WebDriverJSError::StaleElementReference) => Err(WebDriverError::new(
                 ErrorStatus::StaleElementReference,
                 "Stale element",
             )),
-            Err(WebDriverJSError::Timeout) => Err(WebDriverError::new(ErrorStatus::Timeout, "")),
+            Err(WebDriverJSError::Timeout) => {
+                Err(WebDriverError::new(ErrorStatus::ScriptTimeout, ""))
+            },
             Err(WebDriverJSError::UnknownType) => Err(WebDriverError::new(
                 ErrorStatus::UnsupportedOperation,
                 "Unsupported return type",
@@ -1548,14 +1581,11 @@ impl Handler {
         let cmd = WebDriverScriptCommand::FocusElement(element.to_string(), sender);
         let cmd_msg = WebDriverCommandMsg::ScriptCommand(browsing_context_id, cmd);
         self.constellation_chan
-            .send(ConstellationMsg::WebDriverCommand(cmd_msg))
+            .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
             .unwrap();
 
         // TODO: distinguish the not found and not focusable cases
-        receiver
-            .recv()
-            .unwrap()
-            .map_err(|error| WebDriverError::new(error, ""))?;
+        wait_for_script_response(receiver)?.map_err(|error| WebDriverError::new(error, ""))?;
 
         let input_events = send_keys(&keys.text);
 
@@ -1564,7 +1594,7 @@ impl Handler {
         // so the constellation may have changed state between them.
         let cmd_msg = WebDriverCommandMsg::SendKeys(browsing_context_id, input_events);
         self.constellation_chan
-            .send(ConstellationMsg::WebDriverCommand(cmd_msg))
+            .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
             .unwrap();
 
         Ok(WebDriverResponse::Void)
@@ -1578,7 +1608,7 @@ impl Handler {
         let command = WebDriverScriptCommand::ElementClick(element.to_string(), sender);
         self.browsing_context_script_command(command)?;
 
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(element_id) => match element_id {
                 Some(element_id) => {
                     let id = Uuid::new_v4().to_string();
@@ -1589,41 +1619,44 @@ impl Handler {
                         InputSourceState::Pointer(PointerInputState::new(&PointerType::Mouse)),
                     );
 
-                    // Steps 8.3 - 8.6
+                    // Step 8.7. Construct a pointer move action.
+                    // Step 8.8. Set a property x to 0 on pointer move action.
+                    // Step 8.9. Set a property y to 0 on pointer move action.
+                    // Step 8.10. Set a property origin to element on pointer move action.
                     let pointer_move_action = PointerMoveAction {
                         duration: None,
                         origin: PointerOrigin::Element(WebElement(element_id)),
-                        x: 0,
-                        y: 0,
+                        x: 0.0,
+                        y: 0.0,
                         ..Default::default()
                     };
 
-                    // Steps 8.7 - 8.8
+                    // Step 8.11. Construct pointer down action.
+                    // Step 8.12. Set a property button to 0 on pointer down action.
                     let pointer_down_action = PointerDownAction {
-                        button: 1,
+                        button: i16::from(MouseButton::Left) as u64,
                         ..Default::default()
                     };
 
-                    // Steps 8.9 - 8.10
+                    // Step 8.13. Construct pointer up action.
+                    // Step 8.14. Set a property button to 0 on pointer up action.
                     let pointer_up_action = PointerUpAction {
-                        button: 1,
+                        button: i16::from(MouseButton::Left) as u64,
                         ..Default::default()
                     };
 
-                    // Step 8.11
+                    // Step 8.16 Dispatch a list of actions with input state,
+                    // actions, session's current browsing context, and actions options.
                     if let Err(error) =
                         self.dispatch_pointermove_action(&id, &pointer_move_action, 0)
                     {
                         return Err(WebDriverError::new(error, ""));
                     }
 
-                    // Steps 8.12
                     self.dispatch_pointerdown_action(&id, &pointer_down_action);
-
-                    // Steps 8.13
                     self.dispatch_pointerup_action(&id, &pointer_up_action);
 
-                    // Step 8.14
+                    // Step 8.17 Remove an input source with input state and input id.
                     self.session_mut()?.input_state_table.remove(&id);
 
                     // Step 13
@@ -1648,10 +1681,10 @@ impl Handler {
             let cmd_msg =
                 WebDriverCommandMsg::TakeScreenshot(self.session()?.webview_id, rect, sender);
             self.constellation_chan
-                .send(ConstellationMsg::WebDriverCommand(cmd_msg))
+                .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
                 .unwrap();
 
-            if let Some(x) = receiver.recv().unwrap() {
+            if let Some(x) = wait_for_script_response(receiver)? {
                 img = Some(x);
                 break;
             };
@@ -1702,7 +1735,7 @@ impl Handler {
         let command = WebDriverScriptCommand::GetBoundingClientRect(element.to_string(), sender);
         self.browsing_context_script_command(command)?;
 
-        match receiver.recv().unwrap() {
+        match wait_for_script_response(receiver)? {
             Ok(rect) => {
                 let encoded = self.take_screenshot(Some(Rect::from_untyped(&rect)))?;
 
@@ -1832,9 +1865,10 @@ impl WebDriverHandler<ServoExtensionRoute> for Handler {
             WebDriverCommand::FindElementElements(ref element, ref parameters) => {
                 self.handle_find_elements_from_element(element, parameters)
             },
-            WebDriverCommand::GetNamedCookie(ref name) => self.handle_get_cookie(name),
+            WebDriverCommand::GetNamedCookie(name) => self.handle_get_cookie(name),
             WebDriverCommand::GetCookies => self.handle_get_cookies(),
             WebDriverCommand::GetActiveElement => self.handle_active_element(),
+            WebDriverCommand::GetComputedRole(ref element) => self.handle_computed_role(element),
             WebDriverCommand::GetElementRect(ref element) => self.handle_element_rect(element),
             WebDriverCommand::GetElementText(ref element) => self.handle_element_text(element),
             WebDriverCommand::GetElementTagName(ref element) => {
@@ -1860,6 +1894,7 @@ impl WebDriverHandler<ServoExtensionRoute> for Handler {
             WebDriverCommand::ElementClick(ref element) => self.handle_element_click(element),
             WebDriverCommand::DismissAlert => self.handle_dismiss_alert(),
             WebDriverCommand::DeleteCookies => self.handle_delete_cookies(),
+            WebDriverCommand::DeleteCookie(name) => self.handle_delete_cookie(name),
             WebDriverCommand::GetTimeouts => self.handle_get_timeouts(),
             WebDriverCommand::SetTimeouts(ref x) => self.handle_set_timeouts(x),
             WebDriverCommand::TakeScreenshot => self.handle_take_screenshot(),
@@ -1883,6 +1918,15 @@ impl WebDriverHandler<ServoExtensionRoute> for Handler {
     }
 }
 
+/// <https://w3c.github.io/webdriver/#dfn-web-element-identifier>
+const ELEMENT_IDENTIFIER: &str = "element-6066-11e4-a52e-4f735466cecf";
+/// <https://w3c.github.io/webdriver/#dfn-web-frame-identifier>
+const FRAME_IDENTIFIER: &str = "frame-075b-4da1-b6ba-e579c2d3230a";
+/// <https://w3c.github.io/webdriver/#dfn-web-window-identifier>
+const WINDOW_IDENTIFIER: &str = "window-fcc6-11e5-b4f8-330a88ab9d7f";
+/// <https://w3c.github.io/webdriver/#dfn-shadow-root-identifier>
+const SHADOW_ROOT_IDENTIFIER: &str = "shadow-6066-11e4-a52e-4f735466cecf";
+
 fn webdriver_value_to_js_argument(v: &Value) -> String {
     match v {
         Value::String(s) => format!("\"{}\"", s),
@@ -1897,6 +1941,22 @@ fn webdriver_value_to_js_argument(v: &Value) -> String {
             format!("[{}]", elems.join(", "))
         },
         Value::Object(map) => {
+            let key = map.keys().next().map(String::as_str);
+            match (key, map.values().next()) {
+                (Some(ELEMENT_IDENTIFIER), Some(id)) => {
+                    return format!("window.webdriverElement({})", id);
+                },
+                (Some(FRAME_IDENTIFIER), Some(id)) => {
+                    return format!("window.webdriverFrame({})", id);
+                },
+                (Some(WINDOW_IDENTIFIER), Some(id)) => {
+                    return format!("window.webdriverWindow({})", id);
+                },
+                (Some(SHADOW_ROOT_IDENTIFIER), Some(id)) => {
+                    return format!("window.webdriverShadowRoot({})", id);
+                },
+                _ => {},
+            }
             let elems = map
                 .iter()
                 .map(|(k, v)| format!("{}: {}", k, webdriver_value_to_js_argument(v)))
@@ -1905,3 +1965,12 @@ fn webdriver_value_to_js_argument(v: &Value) -> String {
         },
     }
 }
+
+fn wait_for_script_response<T>(receiver: IpcReceiver<T>) -> Result<T, WebDriverError>
+where
+    T: for<'de> Deserialize<'de> + Serialize,
+{
+    receiver
+        .recv()
+        .map_err(|_| WebDriverError::new(ErrorStatus::NoSuchWindow, ""))
+}
diff --git a/components/webgl/Cargo.toml b/components/webgl/Cargo.toml
new file mode 100644
index 00000000000..542a3cb4fae
--- /dev/null
+++ b/components/webgl/Cargo.toml
@@ -0,0 +1,37 @@
+[package]
+name = "webgl"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
+rust-version.workspace = true
+
+[lib]
+name = "webgl"
+path = "lib.rs"
+
+[features]
+webgl_backtrace = ["canvas_traits/webgl_backtrace"]
+webxr = ["dep:webxr", "dep:webxr-api"]
+
+[dependencies]
+bitflags = { workspace = true }
+byteorder = { workspace = true }
+canvas_traits = { workspace = true }
+compositing_traits = { workspace = true }
+crossbeam-channel = { workspace = true }
+euclid = { workspace = true }
+fnv = { workspace = true }
+glow = { workspace = true }
+half = "2"
+ipc-channel = { workspace = true }
+itertools = { workspace = true }
+log = { workspace = true }
+pixels = { path = "../pixels" }
+snapshot = { workspace = true }
+surfman = { workspace = true }
+webrender = { workspace = true }
+webrender_api = { workspace = true }
+webxr = { path = "../webxr", features = ["ipc"], optional = true }
+webxr-api = { workspace = true, features = ["ipc"], optional = true }
diff --git a/components/webgl/lib.rs b/components/webgl/lib.rs
new file mode 100644
index 00000000000..923e7faad24
--- /dev/null
+++ b/components/webgl/lib.rs
@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#![deny(unsafe_code)]
+
+pub use webgl_mode::WebGLComm;
+
+mod webgl_limits;
+mod webgl_mode;
+pub mod webgl_thread;
+#[cfg(feature = "webxr")]
+mod webxr;
diff --git a/components/canvas/webgl_limits.rs b/components/webgl/webgl_limits.rs
similarity index 100%
rename from components/canvas/webgl_limits.rs
rename to components/webgl/webgl_limits.rs
diff --git a/components/canvas/webgl_mode/inprocess.rs b/components/webgl/webgl_mode/inprocess.rs
similarity index 98%
rename from components/canvas/webgl_mode/inprocess.rs
rename to components/webgl/webgl_mode/inprocess.rs
index 5a7e59ebaad..566da2c58c8 100644
--- a/components/canvas/webgl_mode/inprocess.rs
+++ b/components/webgl/webgl_mode/inprocess.rs
@@ -7,6 +7,10 @@ use std::rc::Rc;
 use std::sync::{Arc, Mutex};
 
 use canvas_traits::webgl::{GlType, WebGLContextId, WebGLMsg, WebGLThreads, webgl_channel};
+use compositing_traits::rendering_context::RenderingContext;
+use compositing_traits::{
+    WebrenderExternalImageApi, WebrenderExternalImageRegistry, WebrenderImageSource,
+};
 use euclid::default::Size2D;
 use fnv::FnvHashMap;
 use log::debug;
@@ -14,10 +18,6 @@ use surfman::chains::{SwapChainAPI, SwapChains, SwapChainsAPI};
 use surfman::{Device, SurfaceTexture};
 use webrender::RenderApiSender;
 use webrender_api::DocumentId;
-use webrender_traits::rendering_context::RenderingContext;
-use webrender_traits::{
-    WebrenderExternalImageApi, WebrenderExternalImageRegistry, WebrenderImageSource,
-};
 #[cfg(feature = "webxr")]
 use webxr::SurfmanGL as WebXRSurfman;
 #[cfg(feature = "webxr")]
diff --git a/components/canvas/webgl_mode/mod.rs b/components/webgl/webgl_mode/mod.rs
similarity index 100%
rename from components/canvas/webgl_mode/mod.rs
rename to components/webgl/webgl_mode/mod.rs
diff --git a/components/canvas/webgl_thread.rs b/components/webgl/webgl_thread.rs
similarity index 99%
rename from components/canvas/webgl_thread.rs
rename to components/webgl/webgl_thread.rs
index aee5663c2a7..9562c4cb4e0 100644
--- a/components/canvas/webgl_thread.rs
+++ b/components/webgl/webgl_thread.rs
@@ -22,6 +22,7 @@ use canvas_traits::webgl::{
     WebGLSLVersion, WebGLSamplerId, WebGLSender, WebGLShaderId, WebGLSyncId, WebGLTextureId,
     WebGLVersion, WebGLVertexArrayId, YAxisTreatment,
 };
+use compositing_traits::{WebrenderExternalImageRegistry, WebrenderImageHandlerType};
 use euclid::default::Size2D;
 use fnv::FnvHashMap;
 use glow::{
@@ -30,6 +31,8 @@ use glow::{
     bytes_per_type, components_per_format,
 };
 use half::f16;
+use ipc_channel::ipc::IpcSharedMemory;
+use itertools::Itertools;
 use log::{debug, error, trace, warn};
 use pixels::{self, PixelFormat, unmultiply_inplace};
 use surfman::chains::{PreserveBuffer, SwapChains, SwapChainsAPI};
@@ -43,7 +46,6 @@ use webrender_api::{
     DirtyRect, DocumentId, ExternalImageData, ExternalImageId, ExternalImageType, ImageBufferKind,
     ImageData, ImageDescriptor, ImageDescriptorFlags, ImageFormat, ImageKey,
 };
-use webrender_traits::{WebrenderExternalImageRegistry, WebrenderImageHandlerType};
 
 use crate::webgl_limits::GLLimitsDetect;
 #[cfg(feature = "webxr")]
@@ -1212,7 +1214,13 @@ impl WebGLImpl {
                         glow::PixelPackData::Slice(Some(&mut pixels)),
                     )
                 };
-                sender.send(&pixels).unwrap();
+                let alpha_mode = match (attributes.alpha, attributes.premultiplied_alpha) {
+                    (true, premultiplied) => snapshot::AlphaMode::Transparent { premultiplied },
+                    (false, _) => snapshot::AlphaMode::Opaque,
+                };
+                sender
+                    .send((IpcSharedMemory::from_bytes(&pixels), alpha_mode))
+                    .unwrap();
             },
             WebGLCommand::ReadPixelsPP(rect, format, pixel_type, offset) => unsafe {
                 gl.read_pixels(
@@ -2563,24 +2571,10 @@ impl WebGLImpl {
         chan.send((range_min, range_max, precision)).unwrap();
     }
 
-    fn get_extensions(gl: &Gl, chan: &WebGLSender<String>) {
-        let mut ext_count = [0];
-        unsafe {
-            gl.get_parameter_i32_slice(gl::NUM_EXTENSIONS, &mut ext_count);
-        }
-        // Fall back to the depricated extensions API if that fails
-        if unsafe { gl.get_error() } != gl::NO_ERROR {
-            chan.send(unsafe { gl.get_parameter_string(gl::EXTENSIONS) })
-                .unwrap();
-            return;
-        }
-        let ext_count = ext_count[0] as usize;
-        let mut extensions = Vec::with_capacity(ext_count);
-        for idx in 0..ext_count {
-            extensions.push(unsafe { gl.get_parameter_indexed_string(gl::EXTENSIONS, idx as u32) })
-        }
-        let extensions = extensions.join(" ");
-        chan.send(extensions).unwrap();
+    /// This is an implementation of `getSupportedExtensions()` from
+    /// <https://registry.khronos.org/webgl/specs/latest/1.0/#5.14>
+    fn get_extensions(gl: &Gl, result_sender: &WebGLSender<String>) {
+        let _ = result_sender.send(gl.supported_extensions().iter().join(" "));
     }
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.6
diff --git a/components/canvas/webxr.rs b/components/webgl/webxr.rs
similarity index 100%
rename from components/canvas/webxr.rs
rename to components/webgl/webxr.rs
diff --git a/components/webgpu/Cargo.toml b/components/webgpu/Cargo.toml
index fe456cecef7..39ca562affe 100644
--- a/components/webgpu/Cargo.toml
+++ b/components/webgpu/Cargo.toml
@@ -14,15 +14,17 @@ path = "lib.rs"
 [dependencies]
 arrayvec = { workspace = true, features = ["serde"] }
 base = { workspace = true }
+compositing_traits = { workspace = true }
 euclid = { workspace = true }
 ipc-channel = { workspace = true }
 log = { workspace = true }
 malloc_size_of = { workspace = true }
 serde = { workspace = true, features = ["serde_derive"] }
 servo_config = { path = "../config" }
+webgpu_traits = { workspace = true }
+snapshot = { workspace = true }
 webrender = { workspace = true }
 webrender_api = { workspace = true }
-webrender_traits = { workspace = true }
 wgpu-core = { workspace = true, features = ["serde", "wgsl"] }
 wgpu-types = { workspace = true }
 
diff --git a/components/webgpu/gpu_error.rs b/components/webgpu/gpu_error.rs
deleted file mode 100644
index 173598e1c8e..00000000000
--- a/components/webgpu/gpu_error.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-//! Error scopes and GPUError types
-
-use std::fmt;
-
-use serde::{Deserialize, Serialize};
-
-use crate::wgc;
-
-/// <https://www.w3.org/TR/webgpu/#gpu-error-scope>
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub(crate) struct ErrorScope {
-    pub errors: Vec<Error>,
-    pub filter: ErrorFilter,
-}
-
-impl ErrorScope {
-    pub fn new(filter: ErrorFilter) -> Self {
-        Self {
-            filter,
-            errors: Vec::new(),
-        }
-    }
-}
-
-/// <https://www.w3.org/TR/webgpu/#enumdef-gpuerrorfilter>
-#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
-pub enum ErrorFilter {
-    Validation,
-    OutOfMemory,
-    Internal,
-}
-
-/// <https://www.w3.org/TR/webgpu/#gpuerror>
-#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
-pub enum Error {
-    Validation(String),
-    OutOfMemory(String),
-    Internal(String),
-}
-
-impl std::error::Error for Error {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        None
-    }
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(self.message())
-    }
-}
-
-impl Error {
-    pub fn filter(&self) -> ErrorFilter {
-        match self {
-            Error::Validation(_) => ErrorFilter::Validation,
-            Error::OutOfMemory(_) => ErrorFilter::OutOfMemory,
-            Error::Internal(_) => ErrorFilter::Internal,
-        }
-    }
-
-    pub fn message(&self) -> &str {
-        match self {
-            Error::Validation(m) => m,
-            Error::OutOfMemory(m) => m,
-            Error::Internal(m) => m,
-        }
-    }
-
-    // TODO: labels
-    // based on https://github.com/gfx-rs/wgpu/blob/trunk/wgpu/src/backend/wgpu_core.rs#L289
-    pub fn from_error<E: std::error::Error + 'static>(error: E) -> Self {
-        let mut source_opt: Option<&(dyn std::error::Error + 'static)> = Some(&error);
-        while let Some(source) = source_opt {
-            if let Some(wgc::device::DeviceError::OutOfMemory) =
-                source.downcast_ref::<wgc::device::DeviceError>()
-            {
-                return Self::OutOfMemory(error.to_string());
-            }
-            source_opt = source.source();
-        }
-        // TODO: This hack is needed because there are
-        // multiple OutOfMemory error variant in wgpu-core
-        // and even upstream does not handle them correctly
-        if format!("{error:?}").contains("OutOfMemory") {
-            return Self::OutOfMemory(error.to_string());
-        }
-        Self::Validation(error.to_string())
-    }
-}
-
-#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
-pub enum PopError {
-    Lost,
-    Empty,
-}
diff --git a/components/webgpu/identity.rs b/components/webgpu/identity.rs
deleted file mode 100644
index 2203f6db35a..00000000000
--- a/components/webgpu/identity.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
-use serde::{Deserialize, Serialize};
-
-pub use crate::wgc::id::markers::{
-    ComputePassEncoder as ComputePass, RenderPassEncoder as RenderPass,
-};
-use crate::wgc::id::{
-    AdapterId, BindGroupId, BindGroupLayoutId, BufferId, CommandBufferId, CommandEncoderId,
-    ComputePipelineId, DeviceId, PipelineLayoutId, QueueId, RenderBundleId, RenderPipelineId,
-    SamplerId, ShaderModuleId, SurfaceId, TextureId, TextureViewId,
-};
-pub use crate::wgc::id::{
-    ComputePassEncoderId as ComputePassId, RenderPassEncoderId as RenderPassId,
-};
-
-macro_rules! webgpu_resource {
-    ($name:ident, $id:ty) => {
-        #[derive(Clone, Copy, Debug, Deserialize, Hash, PartialEq, Serialize)]
-        pub struct $name(pub $id);
-
-        impl MallocSizeOf for $name {
-            fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
-                0
-            }
-        }
-
-        impl Eq for $name {}
-    };
-}
-
-webgpu_resource!(WebGPUAdapter, AdapterId);
-webgpu_resource!(WebGPUBindGroup, BindGroupId);
-webgpu_resource!(WebGPUBindGroupLayout, BindGroupLayoutId);
-webgpu_resource!(WebGPUBuffer, BufferId);
-webgpu_resource!(WebGPUCommandBuffer, CommandBufferId);
-webgpu_resource!(WebGPUCommandEncoder, CommandEncoderId);
-webgpu_resource!(WebGPUComputePipeline, ComputePipelineId);
-webgpu_resource!(WebGPUDevice, DeviceId);
-webgpu_resource!(WebGPUPipelineLayout, PipelineLayoutId);
-webgpu_resource!(WebGPUQueue, QueueId);
-webgpu_resource!(WebGPURenderBundle, RenderBundleId);
-webgpu_resource!(WebGPURenderPipeline, RenderPipelineId);
-webgpu_resource!(WebGPUSampler, SamplerId);
-webgpu_resource!(WebGPUShaderModule, ShaderModuleId);
-webgpu_resource!(WebGPUSurface, SurfaceId);
-webgpu_resource!(WebGPUTexture, TextureId);
-webgpu_resource!(WebGPUTextureView, TextureViewId);
-webgpu_resource!(WebGPUComputePass, ComputePassId);
-webgpu_resource!(WebGPURenderPass, RenderPassId);
diff --git a/components/webgpu/ipc_messages/mod.rs b/components/webgpu/ipc_messages/mod.rs
deleted file mode 100644
index 017749d4807..00000000000
--- a/components/webgpu/ipc_messages/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-pub mod recv;
-pub mod to_dom;
-pub mod to_script;
diff --git a/components/webgpu/ipc_messages/recv.rs b/components/webgpu/ipc_messages/recv.rs
deleted file mode 100644
index ce69080760e..00000000000
--- a/components/webgpu/ipc_messages/recv.rs
+++ /dev/null
@@ -1,335 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-//! IPC messages that are received in wgpu thread
-//! (usually from script thread more specifically from dom objects)
-
-use arrayvec::ArrayVec;
-use base::id::PipelineId;
-use ipc_channel::ipc::{IpcSender, IpcSharedMemory};
-use serde::{Deserialize, Serialize};
-use webrender_api::ImageKey;
-use webrender_api::units::DeviceIntSize;
-use wgc::binding_model::{
-    BindGroupDescriptor, BindGroupLayoutDescriptor, PipelineLayoutDescriptor,
-};
-use wgc::command::{
-    RenderBundleDescriptor, RenderBundleEncoder, TexelCopyBufferInfo, TexelCopyTextureInfo,
-};
-use wgc::device::HostMap;
-use wgc::id;
-use wgc::instance::RequestAdapterOptions;
-use wgc::pipeline::{ComputePipelineDescriptor, RenderPipelineDescriptor};
-use wgc::resource::{
-    BufferDescriptor, SamplerDescriptor, TextureDescriptor, TextureViewDescriptor,
-};
-use wgpu_core::Label;
-use wgpu_core::command::{RenderPassColorAttachment, RenderPassDepthStencilAttachment};
-use wgpu_core::id::AdapterId;
-pub use {wgpu_core as wgc, wgpu_types as wgt};
-
-use crate::identity::*;
-use crate::render_commands::RenderCommand;
-use crate::swapchain::WebGPUContextId;
-use crate::wgc::resource::BufferAccessError;
-use crate::{
-    Error, ErrorFilter, Mapping, PRESENTATION_BUFFER_COUNT, ShaderCompilationInfo,
-    WebGPUAdapterResponse, WebGPUComputePipelineResponse, WebGPUDeviceResponse,
-    WebGPUPoppedErrorScopeResponse, WebGPURenderPipelineResponse,
-};
-
-#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
-pub struct ContextConfiguration {
-    pub device_id: id::DeviceId,
-    pub queue_id: id::QueueId,
-    pub format: wgt::TextureFormat,
-    pub is_opaque: bool,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-pub enum WebGPURequest {
-    BufferMapAsync {
-        sender: IpcSender<Result<Mapping, BufferAccessError>>,
-        buffer_id: id::BufferId,
-        device_id: id::DeviceId,
-        host_map: HostMap,
-        offset: u64,
-        size: Option<u64>,
-    },
-    CommandEncoderFinish {
-        command_encoder_id: id::CommandEncoderId,
-        device_id: id::DeviceId,
-        desc: wgt::CommandBufferDescriptor<Label<'static>>,
-    },
-    CopyBufferToBuffer {
-        command_encoder_id: id::CommandEncoderId,
-        source_id: id::BufferId,
-        source_offset: wgt::BufferAddress,
-        destination_id: id::BufferId,
-        destination_offset: wgt::BufferAddress,
-        size: wgt::BufferAddress,
-    },
-    CopyBufferToTexture {
-        command_encoder_id: id::CommandEncoderId,
-        source: TexelCopyBufferInfo,
-        destination: TexelCopyTextureInfo,
-        copy_size: wgt::Extent3d,
-    },
-    CopyTextureToBuffer {
-        command_encoder_id: id::CommandEncoderId,
-        source: TexelCopyTextureInfo,
-        destination: TexelCopyBufferInfo,
-        copy_size: wgt::Extent3d,
-    },
-    CopyTextureToTexture {
-        command_encoder_id: id::CommandEncoderId,
-        source: TexelCopyTextureInfo,
-        destination: TexelCopyTextureInfo,
-        copy_size: wgt::Extent3d,
-    },
-    CreateBindGroup {
-        device_id: id::DeviceId,
-        bind_group_id: id::BindGroupId,
-        descriptor: BindGroupDescriptor<'static>,
-    },
-    CreateBindGroupLayout {
-        device_id: id::DeviceId,
-        bind_group_layout_id: id::BindGroupLayoutId,
-        descriptor: Option<BindGroupLayoutDescriptor<'static>>,
-    },
-    CreateBuffer {
-        device_id: id::DeviceId,
-        buffer_id: id::BufferId,
-        descriptor: BufferDescriptor<'static>,
-    },
-    CreateCommandEncoder {
-        device_id: id::DeviceId,
-        command_encoder_id: id::CommandEncoderId,
-        desc: wgt::CommandEncoderDescriptor<Label<'static>>,
-    },
-    CreateComputePipeline {
-        device_id: id::DeviceId,
-        compute_pipeline_id: id::ComputePipelineId,
-        descriptor: ComputePipelineDescriptor<'static>,
-        implicit_ids: Option<(id::PipelineLayoutId, Vec<id::BindGroupLayoutId>)>,
-        /// present only on ASYNC versions
-        async_sender: Option<IpcSender<WebGPUComputePipelineResponse>>,
-    },
-    CreatePipelineLayout {
-        device_id: id::DeviceId,
-        pipeline_layout_id: id::PipelineLayoutId,
-        descriptor: PipelineLayoutDescriptor<'static>,
-    },
-    CreateRenderPipeline {
-        device_id: id::DeviceId,
-        render_pipeline_id: id::RenderPipelineId,
-        descriptor: RenderPipelineDescriptor<'static>,
-        implicit_ids: Option<(id::PipelineLayoutId, Vec<id::BindGroupLayoutId>)>,
-        /// present only on ASYNC versions
-        async_sender: Option<IpcSender<WebGPURenderPipelineResponse>>,
-    },
-    CreateSampler {
-        device_id: id::DeviceId,
-        sampler_id: id::SamplerId,
-        descriptor: SamplerDescriptor<'static>,
-    },
-    CreateShaderModule {
-        device_id: id::DeviceId,
-        program_id: id::ShaderModuleId,
-        program: String,
-        label: Option<String>,
-        sender: IpcSender<Option<ShaderCompilationInfo>>,
-    },
-    /// Creates context
-    CreateContext {
-        buffer_ids: ArrayVec<id::BufferId, PRESENTATION_BUFFER_COUNT>,
-        size: DeviceIntSize,
-        sender: IpcSender<(WebGPUContextId, ImageKey)>,
-    },
-    /// Recreates swapchain (if needed)
-    UpdateContext {
-        context_id: WebGPUContextId,
-        size: DeviceIntSize,
-        configuration: Option<ContextConfiguration>,
-    },
-    /// Reads texture to swapchains buffer and maps it
-    SwapChainPresent {
-        context_id: WebGPUContextId,
-        texture_id: id::TextureId,
-        encoder_id: id::CommandEncoderId,
-    },
-    /// Obtains image from latest presentation buffer (same as wr update)
-    GetImage {
-        context_id: WebGPUContextId,
-        sender: IpcSender<IpcSharedMemory>,
-    },
-    ValidateTextureDescriptor {
-        device_id: id::DeviceId,
-        texture_id: id::TextureId,
-        descriptor: TextureDescriptor<'static>,
-    },
-    DestroyContext {
-        context_id: WebGPUContextId,
-    },
-    CreateTexture {
-        device_id: id::DeviceId,
-        texture_id: id::TextureId,
-        descriptor: TextureDescriptor<'static>,
-    },
-    CreateTextureView {
-        texture_id: id::TextureId,
-        texture_view_id: id::TextureViewId,
-        device_id: id::DeviceId,
-        descriptor: Option<TextureViewDescriptor<'static>>,
-    },
-    DestroyBuffer(id::BufferId),
-    DestroyDevice(id::DeviceId),
-    DestroyTexture(id::TextureId),
-    DropTexture(id::TextureId),
-    DropAdapter(id::AdapterId),
-    DropDevice(id::DeviceId),
-    DropBuffer(id::BufferId),
-    DropPipelineLayout(id::PipelineLayoutId),
-    DropComputePipeline(id::ComputePipelineId),
-    DropRenderPipeline(id::RenderPipelineId),
-    DropBindGroup(id::BindGroupId),
-    DropBindGroupLayout(id::BindGroupLayoutId),
-    DropCommandBuffer(id::CommandBufferId),
-    DropTextureView(id::TextureViewId),
-    DropSampler(id::SamplerId),
-    DropShaderModule(id::ShaderModuleId),
-    DropRenderBundle(id::RenderBundleId),
-    DropQuerySet(id::QuerySetId),
-    DropComputePass(id::ComputePassEncoderId),
-    DropRenderPass(id::RenderPassEncoderId),
-    Exit(IpcSender<()>),
-    RenderBundleEncoderFinish {
-        render_bundle_encoder: RenderBundleEncoder,
-        descriptor: RenderBundleDescriptor<'static>,
-        render_bundle_id: id::RenderBundleId,
-        device_id: id::DeviceId,
-    },
-    RequestAdapter {
-        sender: IpcSender<WebGPUAdapterResponse>,
-        options: RequestAdapterOptions,
-        adapter_id: AdapterId,
-    },
-    RequestDevice {
-        sender: IpcSender<WebGPUDeviceResponse>,
-        adapter_id: WebGPUAdapter,
-        descriptor: wgt::DeviceDescriptor<Option<String>>,
-        device_id: id::DeviceId,
-        queue_id: id::QueueId,
-        pipeline_id: PipelineId,
-    },
-    // Compute Pass
-    BeginComputePass {
-        command_encoder_id: id::CommandEncoderId,
-        compute_pass_id: ComputePassId,
-        label: Label<'static>,
-        device_id: id::DeviceId,
-    },
-    ComputePassSetPipeline {
-        compute_pass_id: ComputePassId,
-        pipeline_id: id::ComputePipelineId,
-        device_id: id::DeviceId,
-    },
-    ComputePassSetBindGroup {
-        compute_pass_id: ComputePassId,
-        index: u32,
-        bind_group_id: id::BindGroupId,
-        offsets: Vec<u32>,
-        device_id: id::DeviceId,
-    },
-    ComputePassDispatchWorkgroups {
-        compute_pass_id: ComputePassId,
-        x: u32,
-        y: u32,
-        z: u32,
-        device_id: id::DeviceId,
-    },
-    ComputePassDispatchWorkgroupsIndirect {
-        compute_pass_id: ComputePassId,
-        buffer_id: id::BufferId,
-        offset: u64,
-        device_id: id::DeviceId,
-    },
-    EndComputePass {
-        compute_pass_id: ComputePassId,
-        device_id: id::DeviceId,
-        command_encoder_id: id::CommandEncoderId,
-    },
-    // Render Pass
-    BeginRenderPass {
-        command_encoder_id: id::CommandEncoderId,
-        render_pass_id: RenderPassId,
-        label: Label<'static>,
-        color_attachments: Vec<Option<RenderPassColorAttachment>>,
-        depth_stencil_attachment: Option<RenderPassDepthStencilAttachment>,
-        device_id: id::DeviceId,
-    },
-    RenderPassCommand {
-        render_pass_id: RenderPassId,
-        render_command: RenderCommand,
-        device_id: id::DeviceId,
-    },
-    EndRenderPass {
-        render_pass_id: RenderPassId,
-        device_id: id::DeviceId,
-        command_encoder_id: id::CommandEncoderId,
-    },
-    Submit {
-        device_id: id::DeviceId,
-        queue_id: id::QueueId,
-        command_buffers: Vec<id::CommandBufferId>,
-    },
-    UnmapBuffer {
-        buffer_id: id::BufferId,
-        /// Return back mapping for writeback
-        mapping: Option<Mapping>,
-    },
-    WriteBuffer {
-        device_id: id::DeviceId,
-        queue_id: id::QueueId,
-        buffer_id: id::BufferId,
-        buffer_offset: u64,
-        data: IpcSharedMemory,
-    },
-    WriteTexture {
-        device_id: id::DeviceId,
-        queue_id: id::QueueId,
-        texture_cv: TexelCopyTextureInfo,
-        data_layout: wgt::TexelCopyBufferLayout,
-        size: wgt::Extent3d,
-        data: IpcSharedMemory,
-    },
-    QueueOnSubmittedWorkDone {
-        sender: IpcSender<()>,
-        queue_id: id::QueueId,
-    },
-    PushErrorScope {
-        device_id: id::DeviceId,
-        filter: ErrorFilter,
-    },
-    DispatchError {
-        device_id: id::DeviceId,
-        error: Error,
-    },
-    PopErrorScope {
-        device_id: id::DeviceId,
-        sender: IpcSender<WebGPUPoppedErrorScopeResponse>,
-    },
-    ComputeGetBindGroupLayout {
-        device_id: id::DeviceId,
-        pipeline_id: id::ComputePipelineId,
-        index: u32,
-        id: id::BindGroupLayoutId,
-    },
-    RenderGetBindGroupLayout {
-        device_id: id::DeviceId,
-        pipeline_id: id::RenderPipelineId,
-        index: u32,
-        id: id::BindGroupLayoutId,
-    },
-}
diff --git a/components/webgpu/ipc_messages/to_dom.rs b/components/webgpu/ipc_messages/to_dom.rs
deleted file mode 100644
index 5dfa2e1abca..00000000000
--- a/components/webgpu/ipc_messages/to_dom.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-//! IPC messages that are send to WebGPU DOM objects.
-
-use std::ops::Range;
-
-use ipc_channel::ipc::IpcSharedMemory;
-use serde::{Deserialize, Serialize};
-use wgc::id;
-use wgc::pipeline::CreateShaderModuleError;
-use wgpu_core::device::HostMap;
-use wgpu_core::instance::{RequestAdapterError, RequestDeviceError};
-pub use {wgpu_core as wgc, wgpu_types as wgt};
-
-use crate::identity::*;
-use crate::{Error, PopError, WebGPU};
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-pub struct ShaderCompilationInfo {
-    pub line_number: u64,
-    pub line_pos: u64,
-    pub offset: u64,
-    pub length: u64,
-    pub message: String,
-}
-
-impl ShaderCompilationInfo {
-    pub fn from(error: &CreateShaderModuleError, source: &str) -> Self {
-        let location = match error {
-            CreateShaderModuleError::Parsing(e) => e.inner.location(source),
-            CreateShaderModuleError::Validation(e) => e.inner.location(source),
-            _ => None,
-        };
-
-        if let Some(location) = location {
-            // Naga reports locations in UTF-8 code units, but spec requires location in UTF-16 code units
-            // Based on https://searchfox.org/mozilla-central/rev/5b037d9c6ecdb0729f39ad519f0b867d80a92aad/gfx/wgpu_bindings/src/server.rs#353
-            fn len_utf16(s: &str) -> u64 {
-                s.chars().map(|c| c.len_utf16() as u64).sum()
-            }
-            let start = location.offset as usize;
-            let end = start + location.length as usize;
-            let line_start = source[0..start].rfind('\n').map(|pos| pos + 1).unwrap_or(0);
-            Self {
-                line_number: location.line_number as u64,
-                line_pos: len_utf16(&source[line_start..start]) + 1,
-                offset: len_utf16(&source[0..start]),
-                length: len_utf16(&source[start..end]),
-                message: error.to_string(),
-            }
-        } else {
-            Self {
-                message: error.to_string(),
-                ..Default::default()
-            }
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-pub struct Adapter {
-    pub adapter_info: wgt::AdapterInfo,
-    pub adapter_id: WebGPUAdapter,
-    pub features: wgt::Features,
-    pub limits: wgt::Limits,
-    pub channel: WebGPU,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-pub struct Pipeline<T: std::fmt::Debug + Serialize> {
-    pub id: T,
-    pub label: String,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-pub struct Mapping {
-    pub data: IpcSharedMemory,
-    pub mode: HostMap,
-    pub range: Range<u64>,
-}
-
-pub type WebGPUDeviceResponse = (
-    WebGPUDevice,
-    WebGPUQueue,
-    Result<wgt::DeviceDescriptor<Option<String>>, RequestDeviceError>,
-);
-
-pub type WebGPUAdapterResponse = Option<Result<Adapter, RequestAdapterError>>;
-
-pub type WebGPUPoppedErrorScopeResponse = Result<Option<Error>, PopError>;
-pub type WebGPURenderPipelineResponse = Result<Pipeline<id::RenderPipelineId>, Error>;
-pub type WebGPUComputePipelineResponse = Result<Pipeline<id::ComputePipelineId>, Error>;
diff --git a/components/webgpu/lib.rs b/components/webgpu/lib.rs
index f67c55ab02e..ce09f77af49 100644
--- a/components/webgpu/lib.rs
+++ b/components/webgpu/lib.rs
@@ -5,95 +5,73 @@
 use log::warn;
 use swapchain::WGPUImageMap;
 pub use swapchain::{ContextData, WGPUExternalImages};
+use webgpu_traits::{WebGPU, WebGPUMsg};
 use webrender::RenderApiSender;
 use wgpu_thread::WGPU;
 pub use {wgpu_core as wgc, wgpu_types as wgt};
 
-pub mod identity;
 mod poll_thread;
 mod wgpu_thread;
 
 use std::borrow::Cow;
 use std::sync::{Arc, Mutex};
 
-pub use gpu_error::{Error, ErrorFilter, PopError};
-use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
-pub use render_commands::RenderCommand;
-use serde::{Deserialize, Serialize};
+use compositing_traits::WebrenderExternalImageRegistry;
+use ipc_channel::ipc::{self, IpcReceiver};
 use servo_config::pref;
 use webrender_api::DocumentId;
-use webrender_traits::WebrenderExternalImageRegistry;
 
-mod gpu_error;
-mod ipc_messages;
-mod render_commands;
 pub mod swapchain;
-pub use identity::*;
-pub use ipc_messages::recv::*;
-pub use ipc_messages::to_dom::*;
-pub use ipc_messages::to_script::*;
-pub use swapchain::PRESENTATION_BUFFER_COUNT;
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct WebGPU(pub IpcSender<WebGPURequest>);
-
-impl WebGPU {
-    pub fn new(
-        webrender_api_sender: RenderApiSender,
-        webrender_document: DocumentId,
-        external_images: Arc<Mutex<WebrenderExternalImageRegistry>>,
-        wgpu_image_map: WGPUImageMap,
-    ) -> Option<(Self, IpcReceiver<WebGPUMsg>)> {
-        if !pref!(dom_webgpu_enabled) {
-            return None;
-        }
-        let (sender, receiver) = match ipc::channel() {
-            Ok(sender_and_receiver) => sender_and_receiver,
-            Err(e) => {
-                warn!(
-                    "Failed to create sender and receiver for WGPU thread ({})",
-                    e
-                );
-                return None;
-            },
-        };
-        let sender_clone = sender.clone();
-
-        let (script_sender, script_recv) = match ipc::channel() {
-            Ok(sender_and_receiver) => sender_and_receiver,
-            Err(e) => {
-                warn!(
-                    "Failed to create receiver and sender for WGPU thread ({})",
-                    e
-                );
-                return None;
-            },
-        };
-
-        if let Err(e) = std::thread::Builder::new()
-            .name("WGPU".to_owned())
-            .spawn(move || {
-                WGPU::new(
-                    receiver,
-                    sender_clone,
-                    script_sender,
-                    webrender_api_sender,
-                    webrender_document,
-                    external_images,
-                    wgpu_image_map,
-                )
-                .run();
-            })
-        {
-            warn!("Failed to spawn WGPU thread ({})", e);
-            return None;
-        }
-        Some((WebGPU(sender), script_recv))
+pub fn start_webgpu_thread(
+    webrender_api_sender: RenderApiSender,
+    webrender_document: DocumentId,
+    external_images: Arc<Mutex<WebrenderExternalImageRegistry>>,
+    wgpu_image_map: WGPUImageMap,
+) -> Option<(WebGPU, IpcReceiver<WebGPUMsg>)> {
+    if !pref!(dom_webgpu_enabled) {
+        return None;
     }
+    let (sender, receiver) = match ipc::channel() {
+        Ok(sender_and_receiver) => sender_and_receiver,
+        Err(e) => {
+            warn!(
+                "Failed to create sender and receiver for WGPU thread ({})",
+                e
+            );
+            return None;
+        },
+    };
+    let sender_clone = sender.clone();
 
-    pub fn exit(&self, sender: IpcSender<()>) -> Result<(), &'static str> {
-        self.0
-            .send(WebGPURequest::Exit(sender))
-            .map_err(|_| "Failed to send Exit message")
+    let (script_sender, script_recv) = match ipc::channel() {
+        Ok(sender_and_receiver) => sender_and_receiver,
+        Err(e) => {
+            warn!(
+                "Failed to create receiver and sender for WGPU thread ({})",
+                e
+            );
+            return None;
+        },
+    };
+
+    if let Err(e) = std::thread::Builder::new()
+        .name("WGPU".to_owned())
+        .spawn(move || {
+            WGPU::new(
+                receiver,
+                sender_clone,
+                script_sender,
+                webrender_api_sender,
+                webrender_document,
+                external_images,
+                wgpu_image_map,
+            )
+            .run();
+        })
+    {
+        warn!("Failed to spawn WGPU thread ({})", e);
+        return None;
     }
+    Some((WebGPU(sender), script_recv))
 }
diff --git a/components/webgpu/swapchain.rs b/components/webgpu/swapchain.rs
index 78b0c2bbf7e..a3ca15b638d 100644
--- a/components/webgpu/swapchain.rs
+++ b/components/webgpu/swapchain.rs
@@ -8,48 +8,30 @@ use std::slice;
 use std::sync::{Arc, Mutex};
 
 use arrayvec::ArrayVec;
+use compositing_traits::{WebrenderExternalImageApi, WebrenderImageSource};
 use euclid::default::Size2D;
-use ipc_channel::ipc::{IpcSender, IpcSharedMemory};
+use ipc_channel::ipc::IpcSender;
 use log::{error, warn};
-use malloc_size_of::MallocSizeOf;
 use serde::{Deserialize, Serialize};
+use snapshot::{IpcSnapshot, Snapshot};
+use webgpu_traits::{
+    ContextConfiguration, Error, PRESENTATION_BUFFER_COUNT, WebGPUContextId, WebGPUMsg,
+};
 use webrender::{RenderApi, Transaction};
 use webrender_api::units::DeviceIntSize;
 use webrender_api::{
     DirtyRect, DocumentId, ExternalImageData, ExternalImageId, ExternalImageType, ImageData,
     ImageDescriptor, ImageDescriptorFlags, ImageFormat, ImageKey,
 };
-use webrender_traits::{WebrenderExternalImageApi, WebrenderImageSource};
 use wgpu_core::device::HostMap;
 use wgpu_core::global::Global;
 use wgpu_core::id;
 use wgpu_core::resource::{BufferAccessError, BufferMapOperation};
 
-use crate::{ContextConfiguration, Error, WebGPUMsg, wgt};
+use crate::wgt;
 
-pub const PRESENTATION_BUFFER_COUNT: usize = 10;
 const DEFAULT_IMAGE_FORMAT: ImageFormat = ImageFormat::RGBA8;
 
-#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
-pub struct WebGPUContextId(pub u64);
-
-impl MallocSizeOf for WebGPUContextId {
-    fn size_of(&self, _ops: &mut malloc_size_of::MallocSizeOfOps) -> usize {
-        0
-    }
-}
-
-impl ContextConfiguration {
-    fn format(&self) -> ImageFormat {
-        match self.format {
-            wgt::TextureFormat::Rgba8Unorm => ImageFormat::RGBA8,
-            wgt::TextureFormat::Bgra8Unorm => ImageFormat::BGRA8,
-            // TODO: wgt::TextureFormat::Rgba16Float
-            _ => unreachable!("Unsupported canvas context format in configuration"),
-        }
-    }
-}
-
 pub type WGPUImageMap = Arc<Mutex<HashMap<WebGPUContextId, ContextData>>>;
 
 /// Presentation id encodes current configuration and current image
@@ -383,20 +365,34 @@ impl crate::WGPU {
         );
     }
 
-    pub(crate) fn get_image(&self, context_id: WebGPUContextId) -> IpcSharedMemory {
+    pub(crate) fn get_image(&self, context_id: WebGPUContextId) -> IpcSnapshot {
         let webgpu_contexts = self.wgpu_image_map.lock().unwrap();
         let context_data = webgpu_contexts.get(&context_id).unwrap();
-        let buffer_size = context_data.image_desc.buffer_size();
+        let size = context_data.image_desc.size().cast().cast_unit();
         let data = if let Some(present_buffer) = context_data
             .swap_chain
             .as_ref()
             .and_then(|swap_chain| swap_chain.data.as_ref())
         {
-            IpcSharedMemory::from_bytes(present_buffer.slice())
+            let format = match context_data.image_desc.0.format {
+                ImageFormat::RGBA8 => snapshot::PixelFormat::RGBA,
+                ImageFormat::BGRA8 => snapshot::PixelFormat::BGRA,
+                _ => unimplemented!(),
+            };
+            let alpha_mode = if context_data.image_desc.0.is_opaque() {
+                snapshot::AlphaMode::AsOpaque {
+                    premultiplied: false,
+                }
+            } else {
+                snapshot::AlphaMode::Transparent {
+                    premultiplied: true,
+                }
+            };
+            Snapshot::from_vec(size, format, alpha_mode, present_buffer.slice().to_vec())
         } else {
-            IpcSharedMemory::from_byte(0, buffer_size as usize)
+            Snapshot::cleared(size)
         };
-        data
+        data.as_ipc()
     }
 
     pub(crate) fn update_context(
diff --git a/components/webgpu/wgpu_thread.rs b/components/webgpu/wgpu_thread.rs
index d0cec8250ba..8ca979670b2 100644
--- a/components/webgpu/wgpu_thread.rs
+++ b/components/webgpu/wgpu_thread.rs
@@ -10,12 +10,17 @@ use std::slice;
 use std::sync::{Arc, Mutex};
 
 use base::id::PipelineId;
+use compositing_traits::{WebrenderExternalImageRegistry, WebrenderImageHandlerType};
 use ipc_channel::ipc::{IpcReceiver, IpcSender, IpcSharedMemory};
 use log::{info, warn};
 use servo_config::pref;
+use webgpu_traits::{
+    Adapter, ComputePassId, DeviceLostReason, Error, ErrorScope, Mapping, Pipeline, PopError,
+    RenderPassId, ShaderCompilationInfo, WebGPU, WebGPUAdapter, WebGPUContextId, WebGPUDevice,
+    WebGPUMsg, WebGPUQueue, WebGPURequest, apply_render_command,
+};
 use webrender::{RenderApi, RenderApiSender};
 use webrender_api::{DocumentId, ExternalImageId};
-use webrender_traits::{WebrenderExternalImageRegistry, WebrenderImageHandlerType};
 use wgc::command::{ComputePass, ComputePassDescriptor, RenderPass};
 use wgc::device::{DeviceDescriptor, ImplicitPipelineIds};
 use wgc::id;
@@ -30,14 +35,8 @@ use wgpu_types::MemoryHints;
 use wgt::InstanceDescriptor;
 pub use {wgpu_core as wgc, wgpu_types as wgt};
 
-use crate::gpu_error::ErrorScope;
 use crate::poll_thread::Poller;
-use crate::render_commands::apply_render_command;
-use crate::swapchain::{WGPUImageMap, WebGPUContextId};
-use crate::{
-    Adapter, ComputePassId, Error, Mapping, Pipeline, PopError, RenderPassId, WebGPU,
-    WebGPUAdapter, WebGPUDevice, WebGPUMsg, WebGPUQueue, WebGPURequest,
-};
+use crate::swapchain::WGPUImageMap;
 
 #[derive(Eq, Hash, PartialEq)]
 pub(crate) struct DeviceScope {
@@ -489,7 +488,7 @@ impl WGPU {
                         if let Err(e) = sender.send(
                             error
                                 .as_ref()
-                                .map(|e| crate::ShaderCompilationInfo::from(e, &program)),
+                                .map(|e| ShaderCompilationInfo::from(e, &program)),
                         ) {
                             warn!("Failed to send CompilationInfo {e:?}");
                         }
@@ -665,7 +664,8 @@ impl WGPU {
                                     limits,
                                     channel: WebGPU(self.sender.clone()),
                                 }
-                            });
+                            })
+                            .map_err(|err| err.to_string());
 
                         if let Err(e) = sender.send(Some(response)) {
                             warn!(
@@ -687,6 +687,7 @@ impl WGPU {
                             required_features: descriptor.required_features,
                             required_limits: descriptor.required_limits.clone(),
                             memory_hints: MemoryHints::MemoryUsage,
+                            trace: wgpu_types::Trace::Off,
                         };
                         let global = &self.global;
                         let device = WebGPUDevice(device_id);
@@ -695,7 +696,6 @@ impl WGPU {
                             .adapter_request_device(
                                 adapter_id.0,
                                 &desc,
-                                None,
                                 Some(device_id),
                                 Some(queue_id),
                             )
@@ -710,11 +710,9 @@ impl WGPU {
                                 let devices = Arc::clone(&self.devices);
                                 let callback = Box::from(move |reason, msg| {
                                     let reason = match reason {
-                                        wgt::DeviceLostReason::Unknown => {
-                                            crate::DeviceLostReason::Unknown
-                                        },
+                                        wgt::DeviceLostReason::Unknown => DeviceLostReason::Unknown,
                                         wgt::DeviceLostReason::Destroyed => {
-                                            crate::DeviceLostReason::Destroyed
+                                            DeviceLostReason::Destroyed
                                         },
                                     };
                                     // make device lost by removing error scopes stack
@@ -736,7 +734,8 @@ impl WGPU {
                                 });
                                 global.device_set_device_lost_closure(device_id, callback);
                                 descriptor
-                            });
+                            })
+                            .map_err(Into::into);
                         if let Err(e) = sender.send((device, queue, result)) {
                             warn!(
                                 "Failed to send response to WebGPURequest::RequestDevice ({})",
diff --git a/components/webxr/Cargo.toml b/components/webxr/Cargo.toml
index 84faa7d6ac4..49315ac41db 100644
--- a/components/webxr/Cargo.toml
+++ b/components/webxr/Cargo.toml
@@ -25,15 +25,16 @@ ipc = ["webxr-api/ipc", "serde"]
 openxr-api = ["angle", "openxr", "winapi", "wio", "surfman/sm-angle-default"]
 
 [dependencies]
-webxr-api = { workspace = true }
 crossbeam-channel = { workspace = true }
+embedder_traits = { workspace = true }
 euclid = { workspace = true }
+glow = { workspace = true }
 log = { workspace = true }
 openxr = { workspace = true, optional = true }
-serde = { workspace = true, optional = true }
-glow = { workspace = true }
 raw-window-handle = { workspace = true }
+serde = { workspace = true, optional = true }
 surfman = { workspace = true, features = ["chains", "sm-raw-window-handle-06"] }
+webxr-api = { workspace = true }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = { workspace = true, features = ["dxgi", "d3d11", "winerror"], optional = true }
diff --git a/components/webxr/lib.rs b/components/webxr/lib.rs
index 862d8e9814e..ba3bd37f118 100644
--- a/components/webxr/lib.rs
+++ b/components/webxr/lib.rs
@@ -19,3 +19,8 @@ pub type MainThreadRegistry = webxr_api::MainThreadRegistry<surfman_layer_manage
 pub type Discovery = Box<dyn webxr_api::DiscoveryAPI<SurfmanGL>>;
 
 pub(crate) mod gl_utils;
+
+pub trait WebXrRegistry {
+    /// Register services with a WebXR Registry.
+    fn register(&self, _: &mut MainThreadRegistry) {}
+}
diff --git a/components/webxr/openxr/graphics_d3d11.rs b/components/webxr/openxr/graphics_d3d11.rs
index a22df9f5bb1..93ac3ac6bba 100644
--- a/components/webxr/openxr/graphics_d3d11.rs
+++ b/components/webxr/openxr/graphics_d3d11.rs
@@ -65,7 +65,7 @@ impl GraphicsProviderMethods<D3D11> for GraphicsProvider {
         //        already created is appropriate. OpenXR returns a validation error
         //        unless we call this method, so we call it and ignore the results
         //        in the short term.
-        let _requirements = D3D11::requirements(&instance, system)
+        let _requirements = D3D11::requirements(instance, system)
             .map_err(|e| Error::BackendSpecific(format!("D3D11::requirements {:?}", e)))?;
 
         unsafe {
diff --git a/components/webxr/openxr/input.rs b/components/webxr/openxr/input.rs
index 16335cc01a2..76bfe52a465 100644
--- a/components/webxr/openxr/input.rs
+++ b/components/webxr/openxr/input.rs
@@ -311,7 +311,7 @@ impl OpenXRInput {
             InputId(0),
             Handedness::Right,
             &action_set,
-            &session,
+            session,
             needs_hands,
             supported_interaction_profiles.clone(),
         );
@@ -319,7 +319,7 @@ impl OpenXRInput {
             InputId(1),
             Handedness::Left,
             &action_set,
-            &session,
+            session,
             needs_hands,
             supported_interaction_profiles.clone(),
         );
diff --git a/components/webxr/openxr/mod.rs b/components/webxr/openxr/mod.rs
index 585752dffa8..03651072da1 100644
--- a/components/webxr/openxr/mod.rs
+++ b/components/webxr/openxr/mod.rs
@@ -560,9 +560,9 @@ impl LayerManagerAPI<SurfmanGL> for OpenXrLayerManager {
             for surface_texture in mem::replace(&mut layer.surface_textures, vec![]) {
                 if let Some(surface_texture) = surface_texture {
                     let mut surface = device
-                        .destroy_surface_texture(&mut context, surface_texture)
+                        .destroy_surface_texture(context, surface_texture)
                         .unwrap();
-                    device.destroy_surface(&mut context, &mut surface).unwrap();
+                    device.destroy_surface(context, &mut surface).unwrap();
                 }
             }
         }
diff --git a/deny.toml b/deny.toml
index 6be232e669f..5284cb80b31 100644
--- a/deny.toml
+++ b/deny.toml
@@ -34,6 +34,7 @@ allow = [
     "BSD-3-Clause",
     "BSL-1.0",
     "CC0-1.0",
+    "CDLA-Permissive-2.0",
     "ISC",
     "MIT",
     "MPL-2.0",
@@ -118,7 +119,6 @@ skip = [
     "foreign-types-shared",
     "metal",
     "windows-core",
-    "hashbrown",
 
     # wgpu-hal depends on 0.5.0.
     "ndk-sys",
@@ -159,8 +159,13 @@ skip = [
     # duplicated by font-kit
     "redox_users",
     "dirs-sys",
+
+    # duplicated by winit
+    "objc2-app-kit",
+    "objc2-foundation",
+    "objc2",
 ]
 
 # github.com organizations to allow git sources for
 [sources.allow-org]
-github = ["pcwalton", "servo", "gfx-rs"]
+github = ["pcwalton", "servo"]
diff --git a/etc/devtools_parser.py b/etc/devtools_parser.py
index 2747d26e48f..9455ba39ead 100755
--- a/etc/devtools_parser.py
+++ b/etc/devtools_parser.py
@@ -38,8 +38,8 @@
 # ./devtools_parser.py --use cap.pcap --port 1234 --filter watcher --range 10:30
 
 import json
-import re
 import signal
+import sys
 from argparse import ArgumentParser
 from subprocess import Popen, PIPE
 try:
@@ -49,7 +49,6 @@ except ImportError:
         return text
 
 fields = ["frame.time", "tcp.srcport", "tcp.payload"]
-pattern = r"(\d+:){"
 
 
 # Use tshark to capture network traffic and save the result in a
@@ -98,40 +97,84 @@ def read_data(file):
 
 
 # Transform the raw output of wireshark into a more manageable one
-def process_data(out, port):
-    out = [line.split("\t") for line in out.split("\n")]
+def process_data(input, port):
+    # Split the input into lines.
+    # `input` = newline-terminated lines of tab-delimited tshark(1) output
+    lines = [line.split("\t") for line in input.split("\n")]
 
-    # Process fields
-    data = []
-    for line in out:
+    # Remove empty lines and empty sends, and decode hex to bytes.
+    # `lines` = [[date, port, hex-encoded data]], e.g.
+    # `["Mar 18, 2025 21:09:51.879661797 AWST", "6080", "3133"]`
+    # `["Mar 18, 2025 21:09:51.879661797 AWST", "6080", "393a"]`
+    # `["Mar 18, 2025 21:09:51.879661797 AWST", "6080", "7b..."]`
+    sends = []
+    for line in lines:
         if len(line) != 3:
             continue
-
         curr_time, curr_port, curr_data = line
+        if len(curr_data) == 0:
+            continue
+        elif len(curr_data) % 2 == 1:
+            print(f"[WARNING] Extra byte in hex-encoded data: {curr_data[-1]}", file=sys.stderr)
+            curr_data = curr_data[:-1]
+        if len(sends) > 0 and sends[-1][1] == curr_port:
+            sends[-1][2] += bytearray.fromhex(curr_data)
+        else:
+            sends.append([curr_time, curr_port, bytearray.fromhex(curr_data)])
 
+    # Split and merge consecutive sends with the same port, to yield exactly one record per message.
+    # Message records are of the form `length:{...}`, where `length` is an integer in ASCII decimal.
+    # Incomplete messages are deferred until they are complete.
+    # `sends` = [[date, port, record data]], e.g.
+    # `["Mar 18, 2025 21:09:51.879661797 AWST", "6080", b"13"]`
+    # `["Mar 18, 2025 21:09:51.879661797 AWST", "6080", b"9:"]`
+    # `["Mar 18, 2025 21:09:51.879661797 AWST", "6080", b"{..."]`
+    # `["Mar 18, 2025 21:09:51.879661797 AWST", "6080", b"...}"]`
+    records = []
+    scunge = {}  # Map from port to incomplete message data
+    for curr_time, curr_port, rest in sends:
+        rest = scunge.pop(curr_port, b"") + rest
+        while rest != b"":
+            try:
+                length, new_rest = rest.split(b":", 1)  # Can raise ValueError
+                length = int(length)
+                if len(new_rest) < length:
+                    raise ValueError("Incomplete message (for now)")
+                # If we found a `length:` prefix and we have enough data to satisfy it,
+                # cut off the prefix so `rest` is just `{...}length:{...}length:{...}`.
+                rest = new_rest
+            except ValueError:
+                print(f"[WARNING] Incomplete message detected (will try to reassemble): {repr(rest)}", file=sys.stderr)
+                scunge[curr_port] = rest
+                # Wait for more data from later sends, potentially after sends with the other port.
+                break
+            # Cut off the message so `rest` is just `length:{...}length:{...}`.
+            message = rest[:length]
+            rest = rest[length:]
+            try:
+                records.append([curr_time, curr_port, message.decode()])
+            except UnicodeError as e:
+                print(f"[WARNING] Failed to decode message as UTF-8: {e}")
+                continue
+
+    # Process message records.
+    # `records` = [[date, port, message text]], e.g.
+    # `["Mar 18, 2025 21:09:51.879661797 AWST", "6080", "{...}"]`
+    result = []
+    for line in records:
+        if len(line) != 3:
+            continue
+        curr_time, curr_port, text = line
         # Time
         curr_time = curr_time.split(" ")[-2].split(".")[0]
         # Port
         curr_port = "Servo" if curr_port == port else "Firefox"
         # Data
-        if not curr_data:
-            continue
-        try:
-            dec = bytearray.fromhex(curr_data).decode()
-        except UnicodeError:
-            continue
+        result.append([curr_time, curr_port, len(result), text])
 
-        indices = [m.span() for m in re.finditer(pattern, dec)]
-        indices.append((len(dec), -1))
-        prev = 0
-
-        for min, max in indices:
-            if min > 0:
-                text = dec[prev - 1:min]
-                data.append([curr_time, curr_port, len(data), text])
-            prev = max
-
-    return data
+    # `result` = [[date, endpoint, index, message text]], e.g.
+    # `["Mar 18, 2025 21:09:51.879661797 AWST", "Servo", 0, "{...}"]`
+    return result
 
 
 # Pretty prints the json message
diff --git a/etc/devtools_parser_test.json b/etc/devtools_parser_test.json
new file mode 100644
index 00000000000..3361ddad9e2
--- /dev/null
+++ b/etc/devtools_parser_test.json
@@ -0,0 +1,59 @@
+{"_from": "root", "message": {"applicationType": "browser", "from": "root", "traits": {"customHighlighters": true, "highlightable": true, "networkMonitor": false, "sources": true}}}
+{"_to": "root", "message": {"frontendVersion": "135.0.1", "to": "root", "type": "connect"}}
+{"_from": "root", "message": {"from": "root"}}
+{"_to": "root", "message": {"to": "root", "type": "getRoot"}}
+{"_from": "root", "message": {"deviceActor": "server1.conn0.device1", "from": "root", "performanceActor": "server1.conn0.performance0", "preferenceActor": "server1.conn0.preference2", "selected": 0}}
+{"_to": "server1.conn0.device1", "message": {"to": "server1.conn0.device1", "type": "getDescription"}}
+{"_from": "server1.conn0.device1", "message": {"from": "server1.conn0.device1", "value": {"appbuildid": "20250318210028", "apptype": "servo", "brandName": "Servo", "platformversion": "133.0", "version": "0.0.1"}}}
+{"_to": "server1.conn0.device1", "message": {"to": "server1.conn0.device1", "type": "getDescription"}}
+{"_from": "server1.conn0.device1", "message": {"from": "server1.conn0.device1", "value": {"appbuildid": "20250318210028", "apptype": "servo", "brandName": "Servo", "platformversion": "133.0", "version": "0.0.1"}}}
+{"_to": "server1.conn0.preference2", "message": {"to": "server1.conn0.preference2", "type": "getBoolPref", "value": "devtools.debugger.prompt-connection"}}
+{"_from": "server1.conn0.preference2", "message": {"from": "server1.conn0.preference2", "value": false}}
+{"_to": "server1.conn0.preference2", "message": {"to": "server1.conn0.preference2", "type": "getBoolPref", "value": "browser.privatebrowsing.autostart"}}
+{"_from": "server1.conn0.preference2", "message": {"from": "server1.conn0.preference2", "value": false}}
+{"_to": "server1.conn0.preference2", "message": {"to": "server1.conn0.preference2", "type": "getBoolPref", "value": "dom.serviceWorkers.enabled"}}
+{"_from": "server1.conn0.preference2", "message": {"from": "server1.conn0.preference2", "value": false}}
+{"_to": "root", "message": {"iconDataURL": true, "to": "root", "type": "listAddons"}}
+{"_to": "root", "message": {"to": "root", "type": "listTabs"}}
+{"_from": "root", "message": {"addons": [], "from": "root"}}
+{"_from": "root", "message": {"from": "root", "tabs": [{"actor": "server1.conn0.tab-description11", "browserId": 1, "browsingContextID": 1, "isZombieTab": false, "outerWindowID": 1, "selected": false, "title": "", "traits": {"supportsReloadDescriptor": true, "watcher": true}, "url": "file:///cuffs/code/servo/attic/iframe4.html"}]}}
+{"_to": "server1.conn0.tab-description11", "message": {"to": "server1.conn0.tab-description11", "type": "getFavicon"}}
+{"_from": "server1.conn0.tab-description11", "message": {"favicon": "", "from": "server1.conn0.tab-description11"}}
+{"_to": "root", "message": {"to": "root", "type": "listWorkers"}}
+{"_to": "root", "message": {"to": "root", "type": "listProcesses"}}
+{"_to": "root", "message": {"id": 0, "to": "root", "type": "getProcess"}}
+{"_from": "root", "message": {"from": "root", "workers": []}}
+{"_from": "root", "message": {"from": "root", "processes": [{"actor": "server1.conn0.process3", "id": 0, "isParent": true, "isWindowlessParent": false, "traits": {"supportsReloadDescriptor": false, "watcher": false}}]}}
+{"_from": "root", "message": {"from": "root", "processDescriptor": {"actor": "server1.conn0.process3", "id": 0, "isParent": true, "isWindowlessParent": false, "traits": {"supportsReloadDescriptor": false, "watcher": false}}}}
+{"_to": "root", "message": {"to": "root", "type": "listServiceWorkerRegistrations"}}
+{"_from": "root", "message": {"from": "root", "registrations": []}}
+{"_to": "root", "message": {"browserId": 1, "to": "root", "type": "getTab"}}
+{"_from": "root", "message": {"from": "root", "tab": {"actor": "server1.conn0.tab-description11", "browserId": 1, "browsingContextID": 1, "isZombieTab": false, "outerWindowID": 1, "selected": true, "title": "", "traits": {"supportsReloadDescriptor": true, "watcher": true}, "url": "file:///cuffs/code/servo/attic/iframe4.html"}}}
+{"_to": "server1.conn0.tab-description11", "message": {"isPopupDebuggingEnabled": false, "isServerTargetSwitchingEnabled": true, "to": "server1.conn0.tab-description11", "type": "getWatcher"}}
+{"_from": "server1.conn0.tab-description11", "message": {"actor": "server1.conn0.watcher16", "from": "server1.conn0.tab-description11", "traits": {"frame": true, "process": false, "resources": {"Cache": false, "console-message": true, "cookies": false, "css-change": true, "css-message": false, "css-registered-properties": false, "document-event": false, "error-message": true, "extension-storage": false, "indexed-db": false, "jstracer-state": false, "jstracer-trace": false, "last-private-context-exit": false, "local-storage": false, "network-event": false, "network-event-stacktrace": false, "platform-message": false, "reflow": false, "server-sent-event": false, "session-storage": false, "source": true, "stylesheet": false, "thread-state": false, "websocket": false}, "service_worker": false, "shared_worker": false, "worker": false}}}
+{"_to": "server1.conn0.watcher16", "message": {"targetType": "frame", "to": "server1.conn0.watcher16", "type": "watchTargets"}}
+{"_from": "server1.conn0.watcher16", "message": {"from": "server1.conn0.watcher16", "target": {"accessibilityActor": "server1.conn0.accessibility6", "actor": "server1.conn0.target5", "browserId": 1, "browsingContextID": 1, "consoleActor": "server1.conn0.console4", "cssPropertiesActor": "server1.conn0.css-properties7", "inspectorActor": "server1.conn0.inspector8", "isTopLevelTarget": true, "outerWindowID": 1, "reflowActor": "server1.conn0.reflow9", "styleSheetsActor": "server1.conn0.stylesheets10", "threadActor": "server1.conn0.thread12", "title": "", "traits": {"frames": true, "isBrowsingContext": true, "logInPage": false, "navigation": true, "supportsTopLevelTargetFlag": true, "watchpoints": true}, "url": "file:///cuffs/code/servo/attic/iframe4.html"}, "type": "target-available-form"}}
+{"_from": "server1.conn0.target5", "message": {"frames": [{"id": 1, "isTopLevel": true, "title": "", "url": "file:///cuffs/code/servo/attic/iframe4.html"}], "from": "server1.conn0.target5", "type": "frameUpdate"}}
+{"_from": "server1.conn0.watcher16", "message": {"from": "server1.conn0.watcher16"}}
+{"_to": "server1.conn0.console4", "message": {"listeners": ["DocumentEvents"], "to": "server1.conn0.console4", "type": "startListeners"}}
+{"_from": "server1.conn0.console4", "message": {"from": "server1.conn0.console4", "nativeConsoleApi": true, "startedListeners": ["DocumentEvents"], "traits": null}}
+{"_to": "server1.conn0.watcher16", "message": {"to": "server1.conn0.watcher16", "type": "getTargetConfigurationActor"}}
+{"_from": "server1.conn0.watcher16", "message": {"configuration": {"actor": "server1.conn0.target-configuration14", "configuration": {}, "traits": {"supportedOptions": {"cacheDisabled": false, "colorSchemeSimulation": false, "customFormatters": false, "customUserAgent": false, "javascriptEnabled": false, "overrideDPPX": false, "printSimulationEnabled": false, "rdmPaneMaxTouchPoints": false, "rdmPaneOrientation": false, "recordAllocations": false, "reloadOnTouchSimulationToggle": false, "restoreFocus": false, "serviceWorkersTestingEnabled": false, "setTabOffline": false, "touchEventsOverride": false, "tracerOptions": false, "useSimpleHighlightersForReducedMotion": false}}}, "from": "server1.conn0.watcher16"}}
+{"_to": "server1.conn0.target-configuration14", "message": {"configuration": {"cacheDisabled": true, "customFormatters": false, "isTracerFeatureEnabled": false, "serviceWorkersTestingEnabled": false, "useSimpleHighlightersForReducedMotion": false}, "to": "server1.conn0.target-configuration14", "type": "updateConfiguration"}}
+{"_from": "server1.conn0.target-configuration14", "message": {"from": "server1.conn0.target-configuration14"}}
+{"_to": "server1.conn0.watcher16", "message": {"to": "server1.conn0.watcher16", "type": "getThreadConfigurationActor"}}
+{"_from": "server1.conn0.watcher16", "message": {"configuration": {"actor": "server1.conn0.thread-configuration15"}, "from": "server1.conn0.watcher16"}}
+{"_to": "server1.conn0.thread-configuration15", "message": {"configuration": {"ignoreCaughtExceptions": true, "logEventBreakpoints": false, "observeAsmJS": true, "pauseOnExceptions": false, "pauseOverlay": true, "shouldIncludeAsyncLiveFrames": false, "shouldIncludeSavedFrames": true, "shouldPauseOnDebuggerStatement": true, "skipBreakpoints": false}, "to": "server1.conn0.thread-configuration15", "type": "updateConfiguration"}}
+{"_from": "server1.conn0.thread-configuration15", "message": {"from": "server1.conn0.thread-configuration15"}}
+{"_to": "server1.conn0.target5", "message": {"to": "server1.conn0.target5", "type": "listFrames"}}
+{"_to": "server1.conn0.watcher16", "message": {"resourceTypes": ["console-message"], "to": "server1.conn0.watcher16", "type": "watchResources"}}
+{"_from": "server1.conn0.target5", "message": {"from": "server1.conn0.target5"}}
+{"_to": "server1.conn0.watcher16", "message": {"resourceTypes": ["error-message"], "to": "server1.conn0.watcher16", "type": "watchResources"}}
+{"_from": "server1.conn0.target5", "message": {"array": [["console-message", []]], "from": "server1.conn0.target5", "type": "resources-available-array"}}
+{"_from": "server1.conn0.watcher16", "message": {"from": "server1.conn0.watcher16"}}
+{"_from": "server1.conn0.target5", "message": {"array": [["error-message", []]], "from": "server1.conn0.target5", "type": "resources-available-array"}}
+{"_from": "server1.conn0.watcher16", "message": {"from": "server1.conn0.watcher16"}}
+{"_to": "server1.conn0.target5", "message": {"to": "server1.conn0.target5", "type": "listWorkers"}}
+{"_to": "server1.conn0.thread-configuration15", "message": {"configuration": {"shouldPauseOnDebuggerStatement": true}, "to": "server1.conn0.thread-configuration15", "type": "updateConfiguration"}}
+{"_from": "server1.conn0.thread-configuration15", "message": {"from": "server1.conn0.thread-configuration15"}}
+{"_to": "server1.conn0.thread-configuration15", "message": {"configuration": {"ignoreCaughtExceptions": false, "pauseOnExceptions": false}, "to": "server1.conn0.thread-configuration15", "type": "updateConfiguration"}}
diff --git a/etc/devtools_parser_test.pcap b/etc/devtools_parser_test.pcap
new file mode 100644
index 00000000000..5196d27cc0a
Binary files /dev/null and b/etc/devtools_parser_test.pcap differ
diff --git a/ports/servoshell/Cargo.toml b/ports/servoshell/Cargo.toml
index 7566721145f..a77bd885549 100644
--- a/ports/servoshell/Cargo.toml
+++ b/ports/servoshell/Cargo.toml
@@ -22,8 +22,7 @@ bench = false
 # since build-scripts can't detect the cargo target os at build-time, we
 # must unconditionally add these dependencies. See https://github.com/rust-lang/cargo/issues/4932
 [build-dependencies]
-vergen-git2 = { version = "1.0.5", features = ["build"] }
-# MacOS only
+# macOS only
 cc = "1.2"
 
 [target.'cfg(windows)'.build-dependencies]
@@ -38,12 +37,11 @@ ProductName = "Servo"
 [features]
 crown = ["libservo/crown"]
 debugmozjs = ["libservo/debugmozjs"]
-default = ["max_log_level", "webdriver", "webxr", "webgpu"]
+default = ["max_log_level", "webdriver", "webgpu", "webxr"]
 jitspew = ["libservo/jitspew"]
 js_backtrace = ["libservo/js_backtrace"]
 max_log_level = ["log/release_max_level_info"]
 media-gstreamer = ["libservo/media-gstreamer"]
-multiview = ["libservo/multiview"]
 native-bluetooth = ["libservo/native-bluetooth"]
 profilemozjs = ["libservo/profilemozjs"]
 refcell_backtrace = ["libservo/refcell_backtrace"]
@@ -52,29 +50,30 @@ tracing-hitrace = ["tracing", "dep:hitrace"]
 tracing-perfetto = ["tracing", "dep:tracing-perfetto"]
 webdriver = ["libservo/webdriver"]
 webgl_backtrace = ["libservo/webgl_backtrace"]
-webxr = ["libservo/webxr"]
 webgpu = ["libservo/webgpu"]
+webxr = ["libservo/webxr"]
 
 [dependencies]
+cfg-if = { workspace = true }
 dpi = { workspace = true }
 euclid = { workspace = true }
-libc = { workspace = true }
-libservo = { path = "../../components/servo", features = ["background_hang_monitor", "bluetooth"] }
-cfg-if = { workspace = true }
-keyboard-types = { workspace = true }
-log = { workspace = true }
 getopts = { workspace = true }
 hitrace = { workspace = true, optional = true }
+icu_locid = "1.5.0"
 image = { workspace = true }
+keyboard-types = { workspace = true }
+libc = { workspace = true }
+libservo = { path = "../../components/servo", features = ["background_hang_monitor", "bluetooth"] }
+log = { workspace = true }
 mime_guess = { workspace = true }
-url = { workspace = true }
 raw-window-handle = { workspace = true }
 rustls = { workspace = true, features = ["aws-lc-rs"] }
+servo-tracing = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true, optional = true }
-tracing-subscriber = { workspace = true, optional = true, features = ["env-filter"] }
 tracing-perfetto = { workspace = true, optional = true }
-icu_locid = "1.5.0"
+tracing-subscriber = { workspace = true, optional = true, features = ["env-filter"] }
+url = { workspace = true }
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = "0.15"
@@ -82,36 +81,34 @@ ipc-channel = { workspace = true }
 jni = "0.21.1"
 libloading = "0.8"
 
-
 [target.'cfg(not(target_os = "android"))'.dependencies]
 backtrace = { workspace = true }
 
 [target.'cfg(target_env = "ohos")'.dependencies]
 env_filter = "0.1.3"
 euclid = { workspace = true }
+hilog = "0.2.0"
 # force inprocess, until libc-rs 0.2.156 is released containing
 # https://github.com/rust-lang/libc/commit/9e248e212c5602cb4e98676e4c21ea0382663a12
 ipc-channel = { workspace = true, features = ["force-inprocess"] }
-hilog = "0.1.1"
 napi-derive-ohos = "1.0.4"
 napi-ohos = "1.0.4"
-ohos-vsync = "0.1.3"
-ohos-ime = { version = "0.2" }
+ohos-ime = "0.2"
 ohos-ime-sys = "0.1.4"
+ohos-vsync = "0.1.3"
 xcomponent-sys = { version = "0.3.1", features = ["api-12", "keyboard-types"] }
 
 [target.'cfg(any(target_os = "android", target_env = "ohos"))'.dependencies]
 nix = { workspace = true, features = ["fs"] }
-surfman = { workspace = true, features = ["sm-angle-default"] }
 serde_json = { workspace = true }
+surfman = { workspace = true, features = ["sm-angle-default"] }
 
 [target.'cfg(not(any(target_os = "android", target_env = "ohos")))'.dependencies]
-# For optional feature servo_allocator/use-system-allocator
-servo_allocator = { path = "../../components/allocator" }
 dirs = "5.0"
-egui = { version = "0.31.1" }
-egui_glow = { version = "0.31.1", features = ["winit"] }
+egui = "0.31.1"
+egui-file-dialog = "0.9.0"
 egui-winit = { version = "0.31.1", default-features = false, features = ["clipboard", "wayland"] }
+egui_glow = { version = "0.31.1", features = ["winit"] }
 gilrs = "0.11.0"
 gleam = { workspace = true }
 glow = "0.16.0"
@@ -120,26 +117,27 @@ http = { workspace = true }
 net = { path = "../../components/net" }
 net_traits = { workspace = true }
 serde_json = { workspace = true }
+# For optional feature servo_allocator/use-system-allocator
+servo_allocator = { path = "../../components/allocator" }
 shellwords = "1.0.0"
-surfman = { workspace = true, features = ["sm-x11", "sm-raw-window-handle-06"] }
-egui-file-dialog = "0.9.0"
-winit = "0.30.9"
+surfman = { workspace = true, features = ["sm-raw-window-handle-06", "sm-x11"] }
+winit = "0.30.10"
 
 [target.'cfg(any(all(target_os = "linux", not(target_env = "ohos")), target_os = "macos"))'.dependencies]
 sig = "1.0"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows-sys = { workspace = true, features = ["Win32_Graphics_Gdi"] }
 libservo = { path = "../../components/servo", features = ["no-wgl"] }
+windows-sys = { workspace = true, features = ["Win32_Graphics_Gdi"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-objc2-app-kit = { version = "0.2.2", default-features = false, features = [
+objc2-app-kit = { version = "0.3.1", default-features = false, features = [
     "std",
     "NSColorSpace",
     "NSResponder",
     "NSView",
     "NSWindow",
 ] }
-objc2-foundation = { version = "0.2.2", default-features = false, features = [
+objc2-foundation = { version = "0.3.1", default-features = false, features = [
     "std",
 ] }
diff --git a/ports/servoshell/build.rs b/ports/servoshell/build.rs
index c401016201e..c014245ef46 100644
--- a/ports/servoshell/build.rs
+++ b/ports/servoshell/build.rs
@@ -6,18 +6,23 @@ use std::error::Error;
 use std::fs::File;
 use std::io::Write;
 use std::path::Path;
+use std::process::Command;
 
-use vergen_git2::{Emitter, Git2Builder};
-
-fn emit_git_sha() -> Result<(), String> {
-    let git_options = Git2Builder::default()
-        .sha(true /* short */)
-        .build()
+fn git_sha() -> Result<String, String> {
+    let output = Command::new("git")
+        .args(["rev-parse", "--short", "HEAD"])
+        // on macos mach sets DYLD_LIBRARY_PATH since it is needed for unit-tests, but it
+        // causes git to fail, so we remove it for the git invocation.
+        .env_remove("DYLD_LIBRARY_PATH")
+        .output()
         .map_err(|e| e.to_string())?;
-    Emitter::default()
-        .add_instructions(&git_options)
-        .and_then(|emitter| emitter.fail_on_error().emit())
-        .map_err(|e| e.to_string())
+    if output.status.success() {
+        let hash = String::from_utf8(output.stdout).map_err(|e| e.to_string())?;
+        Ok(hash.trim().to_owned())
+    } else {
+        let stderr = String::from_utf8(output.stderr).map_err(|e| e.to_string())?;
+        Err(stderr)
+    }
 }
 
 fn main() -> Result<(), Box<dyn Error>> {
@@ -72,12 +77,15 @@ fn main() -> Result<(), Box<dyn Error>> {
         println!("cargo:rustc-link-search=native={}", out.display());
     }
 
-    if let Err(error) = emit_git_sha() {
-        println!(
-            "cargo:warning=Could not generate git version information: {:?}",
-            error
-        );
-        println!("cargo:rustc-env=VERGEN_GIT_SHA=nogit");
+    match git_sha() {
+        Ok(hash) => println!("cargo:rustc-env=GIT_SHA={}", hash),
+        Err(error) => {
+            println!(
+                "cargo:warning=Could not generate git version information: {:?}",
+                error
+            );
+            println!("cargo:rustc-env=GIT_SHA=nogit");
+        },
     }
 
     // On MacOS, all dylib dependencies are shipped along with the binary
diff --git a/ports/servoshell/desktop/app.rs b/ports/servoshell/desktop/app.rs
index 6df9945ee7a..7bbac47cda3 100644
--- a/ports/servoshell/desktop/app.rs
+++ b/ports/servoshell/desktop/app.rs
@@ -11,17 +11,14 @@ use std::rc::Rc;
 use std::time::Instant;
 use std::{env, fs};
 
+use ::servo::ServoBuilder;
 use log::{info, trace, warn};
-use servo::compositing::windowing::{AnimationState, WindowMethods};
+use net::protocols::ProtocolRegistry;
+use servo::EventLoopWaker;
 use servo::config::opts::Opts;
 use servo::config::prefs::Preferences;
-use servo::servo_config::pref;
 use servo::servo_url::ServoUrl;
 use servo::user_content_manager::{UserContentManager, UserScript};
-use servo::webxr::glwindow::GlWindowDiscovery;
-#[cfg(target_os = "windows")]
-use servo::webxr::openxr::{AppInfo, OpenXrDiscovery};
-use servo::{EventLoopWaker, Servo};
 use url::Url;
 use winit::application::ApplicationHandler;
 use winit::event::WindowEvent;
@@ -33,8 +30,9 @@ use super::events_loop::{EventsLoop, WakerEvent};
 use super::minibrowser::{Minibrowser, MinibrowserEvent};
 use super::{headed_window, headless_window};
 use crate::desktop::app_state::RunningAppState;
-use crate::desktop::embedder::{EmbedderCallbacks, XrDiscovery};
+use crate::desktop::protocols;
 use crate::desktop::tracing::trace_winit_event;
+use crate::desktop::webxr::XrDiscoveryWebXrRegistry;
 use crate::desktop::window_trait::WindowPortsMethods;
 use crate::parser::{get_default_url, location_bar_input_to_url};
 use crate::prefs::ServoShellPreferences;
@@ -116,38 +114,6 @@ impl App {
         self.suspended.set(false);
         let (_, window) = self.windows.iter().next().unwrap();
 
-        let xr_discovery = if pref!(dom_webxr_openxr_enabled) && !headless {
-            #[cfg(target_os = "windows")]
-            let openxr = {
-                let app_info = AppInfo::new("Servoshell", 0, "Servo", 0);
-                Some(XrDiscovery::OpenXr(OpenXrDiscovery::new(None, app_info)))
-            };
-            #[cfg(not(target_os = "windows"))]
-            let openxr = None;
-
-            openxr
-        } else if pref!(dom_webxr_glwindow_enabled) && !headless {
-            let window = window.new_glwindow(event_loop.unwrap());
-            Some(XrDiscovery::GlWindow(GlWindowDiscovery::new(window)))
-        } else {
-            None
-        };
-
-        // Implements embedder methods, used by libservo and constellation.
-        let embedder = Box::new(EmbedderCallbacks::new(self.waker.clone(), xr_discovery));
-
-        // TODO: Remove this once dyn upcasting coercion stabilises
-        // <https://github.com/rust-lang/rust/issues/65991>
-        struct UpcastedWindow(Rc<dyn WindowPortsMethods>);
-        impl WindowMethods for UpcastedWindow {
-            fn get_coordinates(&self) -> servo::compositing::windowing::EmbedderCoordinates {
-                self.0.get_coordinates()
-            }
-            fn set_animation_state(&self, state: AnimationState) {
-                self.0.set_animation_state(state);
-            }
-        }
-
         let mut user_content_manager = UserContentManager::new();
         for script in load_userscripts(self.servoshell_preferences.userscripts_directory.as_deref())
             .expect("Loading userscripts failed")
@@ -155,15 +121,33 @@ impl App {
             user_content_manager.add_script(script);
         }
 
-        let servo = Servo::new(
-            self.opts.clone(),
-            self.preferences.clone(),
-            window.rendering_context(),
-            embedder,
-            Rc::new(UpcastedWindow(window.clone())),
-            self.servoshell_preferences.user_agent.clone(),
-            user_content_manager,
+        let mut protocol_registry = ProtocolRegistry::default();
+        let _ = protocol_registry.register(
+            "urlinfo",
+            protocols::urlinfo::UrlInfoProtocolHander::default(),
         );
+        let _ =
+            protocol_registry.register("servo", protocols::servo::ServoProtocolHandler::default());
+        let _ = protocol_registry.register(
+            "resource",
+            protocols::resource::ResourceProtocolHandler::default(),
+        );
+
+        let servo_builder = ServoBuilder::new(window.rendering_context())
+            .opts(self.opts.clone())
+            .preferences(self.preferences.clone())
+            .user_content_manager(user_content_manager)
+            .protocol_registry(protocol_registry)
+            .event_loop_waker(self.waker.clone());
+
+        #[cfg(feature = "webxr")]
+        let servo_builder = servo_builder.webxr_registry(XrDiscoveryWebXrRegistry::new_boxed(
+            window.clone(),
+            event_loop,
+            &self.preferences,
+        ));
+
+        let servo = servo_builder.build();
         servo.setup_logging();
 
         let running_state = Rc::new(RunningAppState::new(
@@ -181,8 +165,12 @@ impl App {
         self.state = AppState::Running(running_state);
     }
 
-    pub fn is_animating(&self) -> bool {
-        self.windows.iter().any(|(_, window)| window.is_animating())
+    pub(crate) fn animating(&self) -> bool {
+        match self.state {
+            AppState::Initializing => false,
+            AppState::Running(ref running_app_state) => running_app_state.servo().animating(),
+            AppState::ShuttingDown => false,
+        }
     }
 
     /// Handle events with winit contexts
@@ -355,7 +343,7 @@ impl ApplicationHandler<WakerEvent> for App {
                     // Intercept any ScaleFactorChanged events away from EguiGlow::on_window_event, so
                     // we can use our own logic for calculating the scale factor and set egui’s
                     // scale factor to that value manually.
-                    let desired_scale_factor = window.hidpi_factor().get();
+                    let desired_scale_factor = window.hidpi_scale_factor().get();
                     let effective_egui_zoom_factor = desired_scale_factor / scale_factor as f32;
 
                     info!(
@@ -368,6 +356,8 @@ impl ApplicationHandler<WakerEvent> for App {
                         .egui_ctx
                         .set_zoom_factor(effective_egui_zoom_factor);
 
+                    state.hidpi_scale_factor_changed();
+
                     // Request a winit redraw event, so we can recomposite, update and paint
                     // the minibrowser, and present the new frame.
                     window.winit_window().unwrap().request_redraw();
@@ -399,10 +389,8 @@ impl ApplicationHandler<WakerEvent> for App {
             window.handle_winit_event(state.clone(), event);
         }
 
-        let animating = self.is_animating();
-
         // Block until the window gets an event
-        if !animating || self.suspended.get() {
+        if !self.animating() || self.suspended.get() {
             event_loop.set_control_flow(ControlFlow::Wait);
         } else {
             event_loop.set_control_flow(ControlFlow::Poll);
@@ -425,7 +413,7 @@ impl ApplicationHandler<WakerEvent> for App {
         );
         self.t = now;
 
-        if !matches!(self.state, AppState::Running(_)) {
+        if !matches!(self.state, AppState::Running(..)) {
             return;
         };
         let Some(window) = self.windows.values().next() else {
@@ -433,10 +421,8 @@ impl ApplicationHandler<WakerEvent> for App {
         };
         let window = window.clone();
 
-        let animating = self.is_animating();
-
         // Block until the window gets an event
-        if !animating || self.suspended.get() {
+        if !self.animating() || self.suspended.get() {
             event_loop.set_control_flow(ControlFlow::Wait);
         } else {
             event_loop.set_control_flow(ControlFlow::Poll);
diff --git a/ports/servoshell/desktop/app_state.rs b/ports/servoshell/desktop/app_state.rs
index 71881d41059..bb7c16f72e8 100644
--- a/ports/servoshell/desktop/app_state.rs
+++ b/ports/servoshell/desktop/app_state.rs
@@ -17,9 +17,9 @@ use servo::ipc_channel::ipc::IpcSender;
 use servo::webrender_api::ScrollLocation;
 use servo::webrender_api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize};
 use servo::{
-    AllowOrDenyRequest, AuthenticationRequest, FilterPattern, GamepadHapticEffectType, LoadStatus,
-    PermissionRequest, Servo, ServoDelegate, ServoError, SimpleDialog, TouchEventType, WebView,
-    WebViewDelegate,
+    AllowOrDenyRequest, AuthenticationRequest, FilterPattern, FormControl, GamepadHapticEffectType,
+    LoadStatus, PermissionRequest, Servo, ServoDelegate, ServoError, SimpleDialog, TouchEventType,
+    WebView, WebViewBuilder, WebViewDelegate,
 };
 use url::Url;
 
@@ -107,8 +107,11 @@ impl RunningAppState {
     }
 
     pub(crate) fn new_toplevel_webview(self: &Rc<Self>, url: Url) {
-        let webview = self.servo().new_webview(url);
-        webview.set_delegate(self.clone());
+        let webview = WebViewBuilder::new(self.servo())
+            .url(url)
+            .hidpi_scale_factor(self.inner().window.hidpi_scale_factor())
+            .delegate(self.clone())
+            .build();
 
         webview.focus();
         webview.raise_to_top(true);
@@ -128,6 +131,14 @@ impl RunningAppState {
         &self.servo
     }
 
+    pub(crate) fn hidpi_scale_factor_changed(&self) {
+        let inner = self.inner();
+        let new_scale_factor = inner.window.hidpi_scale_factor();
+        for webview in inner.webviews.values() {
+            webview.set_hidpi_scale_factor(new_scale_factor);
+        }
+    }
+
     pub(crate) fn save_output_image_if_necessary(&self) {
         let Some(output_path) = self.servoshell_preferences.output_image_path.as_ref() else {
             return;
@@ -392,6 +403,10 @@ impl ServoDelegate for ServoShellServoDelegate {
 }
 
 impl WebViewDelegate for RunningAppState {
+    fn screen_geometry(&self, _webview: WebView) -> Option<servo::ScreenGeometry> {
+        Some(self.inner().window.screen_geometry())
+    }
+
     fn notify_status_text_changed(&self, _webview: servo::WebView, _status: Option<String>) {
         self.inner_mut().need_update = true;
     }
@@ -455,8 +470,10 @@ impl WebViewDelegate for RunningAppState {
         &self,
         parent_webview: servo::WebView,
     ) -> Option<servo::WebView> {
-        let webview = self.servo.new_auxiliary_webview();
-        webview.set_delegate(parent_webview.delegate());
+        let webview = WebViewBuilder::new_auxiliary(&self.servo)
+            .hidpi_scale_factor(self.inner().window.hidpi_scale_factor())
+            .delegate(parent_webview.delegate())
+            .build();
 
         webview.focus();
         webview.raise_to_top(true);
@@ -579,4 +596,19 @@ impl WebViewDelegate for RunningAppState {
     fn hide_ime(&self, _webview: WebView) {
         self.inner().window.hide_ime();
     }
+
+    fn show_form_control(&self, webview: WebView, form_control: FormControl) {
+        if self.servoshell_preferences.headless {
+            return;
+        }
+
+        match form_control {
+            FormControl::SelectElement(prompt) => {
+                // FIXME: Reading the toolbar height is needed here to properly position the select dialog.
+                // But if the toolbar height changes while the dialog is open then the position won't be updated
+                let offset = self.inner().window.toolbar_height();
+                self.add_dialog(webview, Dialog::new_select_element_dialog(prompt, offset));
+            },
+        }
+    }
 }
diff --git a/ports/servoshell/desktop/dialog.rs b/ports/servoshell/desktop/dialog.rs
index 0ff8d4cd900..c113682de56 100644
--- a/ports/servoshell/desktop/dialog.rs
+++ b/ports/servoshell/desktop/dialog.rs
@@ -7,11 +7,14 @@ use std::sync::Arc;
 
 use egui::Modal;
 use egui_file_dialog::{DialogState, FileDialog as EguiFileDialog};
+use euclid::Length;
 use log::warn;
 use servo::ipc_channel::ipc::IpcSender;
+use servo::servo_geometry::DeviceIndependentPixel;
 use servo::{
     AlertResponse, AuthenticationRequest, ConfirmResponse, FilterPattern, PermissionRequest,
-    PromptResponse, SimpleDialog,
+    PromptResponse, SelectElement, SelectElementOption, SelectElementOptionOrOptgroup,
+    SimpleDialog,
 };
 
 pub enum Dialog {
@@ -36,6 +39,10 @@ pub enum Dialog {
         selected_device_index: usize,
         response_sender: IpcSender<Option<String>>,
     },
+    SelectElement {
+        maybe_prompt: Option<SelectElement>,
+        toolbar_offset: Length<f32, DeviceIndependentPixel>,
+    },
 }
 
 impl Dialog {
@@ -102,6 +109,16 @@ impl Dialog {
         }
     }
 
+    pub fn new_select_element_dialog(
+        prompt: SelectElement,
+        toolbar_offset: Length<f32, DeviceIndependentPixel>,
+    ) -> Self {
+        Dialog::SelectElement {
+            maybe_prompt: Some(prompt),
+            toolbar_offset,
+        }
+    }
+
     pub fn update(&mut self, ctx: &egui::Context) -> bool {
         match self {
             Dialog::File {
@@ -373,6 +390,103 @@ impl Dialog {
                 });
                 is_open
             },
+            Dialog::SelectElement {
+                maybe_prompt,
+                toolbar_offset,
+            } => {
+                let Some(prompt) = maybe_prompt else {
+                    // Prompt was dismissed, so the dialog should be closed too.
+                    return false;
+                };
+                let mut is_open = true;
+
+                let mut position = prompt.position();
+                position.min.y += toolbar_offset.0 as i32;
+                position.max.y += toolbar_offset.0 as i32;
+                let area = egui::Area::new(egui::Id::new("select-window"))
+                    .fixed_pos(egui::pos2(position.min.x as f32, position.max.y as f32));
+
+                let mut selected_option = prompt.selected_option();
+
+                fn display_option(
+                    ui: &mut egui::Ui,
+                    option: &SelectElementOption,
+                    selected_option: &mut Option<usize>,
+                    is_open: &mut bool,
+                    in_group: bool,
+                ) {
+                    let is_checked =
+                        selected_option.is_some_and(|selected_index| selected_index == option.id);
+
+                    // TODO: Surely there's a better way to align text in a selectable label in egui.
+                    let label_text = if in_group {
+                        format!("   {}", option.label)
+                    } else {
+                        option.label.to_owned()
+                    };
+                    let label = if option.is_disabled {
+                        egui::RichText::new(&label_text).strikethrough()
+                    } else {
+                        egui::RichText::new(&label_text)
+                    };
+                    let clickable_area = ui
+                        .allocate_ui_with_layout(
+                            [ui.available_width(), 0.0].into(),
+                            egui::Layout::top_down_justified(egui::Align::LEFT),
+                            |ui| ui.selectable_label(is_checked, label),
+                        )
+                        .inner;
+
+                    if clickable_area.clicked() && !option.is_disabled {
+                        *selected_option = Some(option.id);
+                        *is_open = false;
+                    }
+
+                    if clickable_area.hovered() && option.is_disabled {
+                        ui.ctx().set_cursor_icon(egui::CursorIcon::NotAllowed);
+                    }
+                }
+
+                let modal = Modal::new("select_element_picker".into()).area(area);
+                modal.show(ctx, |ui| {
+                    egui::ScrollArea::vertical().show(ui, |ui| {
+                        for option_or_optgroup in prompt.options() {
+                            match &option_or_optgroup {
+                                SelectElementOptionOrOptgroup::Option(option) => {
+                                    display_option(
+                                        ui,
+                                        option,
+                                        &mut selected_option,
+                                        &mut is_open,
+                                        false,
+                                    );
+                                },
+                                SelectElementOptionOrOptgroup::Optgroup { label, options } => {
+                                    ui.label(egui::RichText::new(label).strong());
+
+                                    for option in options {
+                                        display_option(
+                                            ui,
+                                            option,
+                                            &mut selected_option,
+                                            &mut is_open,
+                                            true,
+                                        );
+                                    }
+                                },
+                            }
+                        }
+                    });
+                });
+
+                prompt.select(selected_option);
+
+                if !is_open {
+                    maybe_prompt.take().unwrap().submit();
+                }
+
+                is_open
+            },
         }
     }
 }
diff --git a/ports/servoshell/desktop/embedder.rs b/ports/servoshell/desktop/embedder.rs
deleted file mode 100644
index ccb4e5fde84..00000000000
--- a/ports/servoshell/desktop/embedder.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-//! Implements the global methods required by Servo (not window/gl/compositor related).
-
-use net::protocols::ProtocolRegistry;
-use servo::compositing::windowing::EmbedderMethods;
-use servo::servo_config::pref;
-use servo::webxr::glwindow::GlWindowDiscovery;
-#[cfg(target_os = "windows")]
-use servo::webxr::openxr::OpenXrDiscovery;
-use servo::{EmbedderProxy, EventLoopWaker};
-
-use crate::desktop::protocols::{resource, servo as servo_handler, urlinfo};
-
-pub enum XrDiscovery {
-    GlWindow(GlWindowDiscovery),
-    #[cfg(target_os = "windows")]
-    OpenXr(OpenXrDiscovery),
-}
-
-pub struct EmbedderCallbacks {
-    event_loop_waker: Box<dyn EventLoopWaker>,
-    xr_discovery: Option<XrDiscovery>,
-}
-
-impl EmbedderCallbacks {
-    pub fn new(
-        event_loop_waker: Box<dyn EventLoopWaker>,
-        xr_discovery: Option<XrDiscovery>,
-    ) -> EmbedderCallbacks {
-        EmbedderCallbacks {
-            event_loop_waker,
-            xr_discovery,
-        }
-    }
-}
-
-impl EmbedderMethods for EmbedderCallbacks {
-    fn create_event_loop_waker(&mut self) -> Box<dyn EventLoopWaker> {
-        self.event_loop_waker.clone()
-    }
-
-    #[cfg(feature = "webxr")]
-    fn register_webxr(
-        &mut self,
-        xr: &mut servo::webxr::MainThreadRegistry,
-        _embedder_proxy: EmbedderProxy,
-    ) {
-        use servo::webxr::headless::HeadlessMockDiscovery;
-
-        if pref!(dom_webxr_test) {
-            xr.register_mock(HeadlessMockDiscovery::default());
-        } else if let Some(xr_discovery) = self.xr_discovery.take() {
-            match xr_discovery {
-                XrDiscovery::GlWindow(discovery) => xr.register(discovery),
-                #[cfg(target_os = "windows")]
-                XrDiscovery::OpenXr(discovery) => xr.register(discovery),
-            }
-        }
-    }
-
-    fn get_protocol_handlers(&self) -> ProtocolRegistry {
-        let mut registry = ProtocolRegistry::default();
-        registry.register("urlinfo", urlinfo::UrlInfoProtocolHander::default());
-        registry.register("servo", servo_handler::ServoProtocolHandler::default());
-        registry.register("resource", resource::ResourceProtocolHandler::default());
-        registry
-    }
-
-    fn get_version_string(&self) -> Option<String> {
-        crate::servo_version().into()
-    }
-}
diff --git a/ports/servoshell/desktop/events_loop.rs b/ports/servoshell/desktop/events_loop.rs
index ffe40eb8cb9..e47257d4f23 100644
--- a/ports/servoshell/desktop/events_loop.rs
+++ b/ports/servoshell/desktop/events_loop.rs
@@ -96,7 +96,7 @@ impl EventsLoop {
                     if !app.handle_events_with_headless() {
                         break;
                     }
-                    if !app.is_animating() {
+                    if !app.animating() {
                         *flag.lock().unwrap() = false;
                     }
                 }
diff --git a/ports/servoshell/desktop/headed_window.rs b/ports/servoshell/desktop/headed_window.rs
index ae741586be0..8efb16954d8 100644
--- a/ports/servoshell/desktop/headed_window.rs
+++ b/ports/servoshell/desktop/headed_window.rs
@@ -14,18 +14,15 @@ use euclid::{Angle, Length, Point2D, Rotation3D, Scale, Size2D, UnknownUnit, Vec
 use keyboard_types::{Modifiers, ShortcutMatcher};
 use log::{debug, info};
 use raw_window_handle::{HasDisplayHandle, HasWindowHandle, RawWindowHandle};
-use servo::compositing::windowing::{
-    AnimationState, EmbedderCoordinates, WebRenderDebugOption, WindowMethods,
-};
 use servo::servo_config::pref;
 use servo::servo_geometry::DeviceIndependentPixel;
 use servo::webrender_api::ScrollLocation;
-use servo::webrender_api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize, DevicePixel};
+use servo::webrender_api::units::{DeviceIntPoint, DeviceIntSize, DevicePixel};
 use servo::{
     Cursor, ImeEvent, InputEvent, Key, KeyState, KeyboardEvent, MouseButton as ServoMouseButton,
     MouseButtonAction, MouseButtonEvent, MouseMoveEvent, OffscreenRenderingContext,
-    RenderingContext, Theme, TouchEvent, TouchEventType, TouchId, WebView, WheelDelta, WheelEvent,
-    WheelMode, WindowRenderingContext,
+    RenderingContext, ScreenGeometry, Theme, TouchEvent, TouchEventType, TouchId,
+    WebRenderDebugOption, WebView, WheelDelta, WheelEvent, WheelMode, WindowRenderingContext,
 };
 use surfman::{Context, Device};
 use url::Url;
@@ -56,15 +53,12 @@ pub struct Window {
     screen_size: Size2D<u32, DeviceIndependentPixel>,
     inner_size: Cell<PhysicalSize<u32>>,
     toolbar_height: Cell<Length<f32, DeviceIndependentPixel>>,
-    mouse_down_button: Cell<Option<MouseButton>>,
-    webview_relative_mouse_down_point: Cell<Point2D<f32, DevicePixel>>,
     monitor: winit::monitor::MonitorHandle,
     webview_relative_mouse_point: Cell<Point2D<f32, DevicePixel>>,
     last_pressed: Cell<Option<(KeyboardEvent, Option<LogicalKey>)>>,
     /// A map of winit's key codes to key values that are interpreted from
     /// winit's ReceivedChar events.
     keys_down: RefCell<HashMap<LogicalKey, Key>>,
-    animation_state: Cell<AnimationState>,
     fullscreen: Cell<bool>,
     device_pixel_ratio_override: Option<f32>,
     xr_window_poses: RefCell<Vec<Rc<XRWindowPose>>>,
@@ -114,7 +108,7 @@ impl Window {
             .expect("No monitor detected");
 
         let (screen_size, screen_scale) = servoshell_preferences.screen_size_override.map_or_else(
-            || (monitor.size(), monitor.scale_factor()),
+            || (monitor.size(), winit_window.scale_factor()),
             |size| (PhysicalSize::new(size.width, size.height), 1.0),
         );
         let screen_scale: Scale<f64, DeviceIndependentPixel, DevicePixel> =
@@ -148,12 +142,9 @@ impl Window {
         debug!("Created window {:?}", winit_window.id());
         Window {
             winit_window,
-            mouse_down_button: Cell::new(None),
-            webview_relative_mouse_down_point: Cell::new(Point2D::zero()),
             webview_relative_mouse_point: Cell::new(Point2D::zero()),
             last_pressed: Cell::new(None),
             keys_down: RefCell::new(HashMap::new()),
-            animation_state: Cell::new(AnimationState::Idle),
             fullscreen: Cell::new(false),
             inner_size: Cell::new(inner_size),
             monitor,
@@ -256,7 +247,6 @@ impl Window {
 
     /// Helper function to handle a click
     fn handle_mouse(&self, webview: &WebView, button: MouseButton, action: ElementState) {
-        let max_pixel_dist = 10.0 * self.hidpi_factor().get();
         let mouse_button = match &button {
             MouseButton::Left => ServoMouseButton::Left,
             MouseButton::Right => ServoMouseButton::Right,
@@ -268,11 +258,7 @@ impl Window {
 
         let point = self.webview_relative_mouse_point.get();
         let action = match action {
-            ElementState::Pressed => {
-                self.webview_relative_mouse_down_point.set(point);
-                self.mouse_down_button.set(Some(button));
-                MouseButtonAction::Down
-            },
+            ElementState::Pressed => MouseButtonAction::Down,
             ElementState::Released => MouseButtonAction::Up,
         };
 
@@ -281,26 +267,6 @@ impl Window {
             button: mouse_button,
             point,
         }));
-
-        // Also send a 'click' event if this is release and the press was recorded
-        // to be within a 10 pixels.
-        //
-        // TODO: This should be happening within the ScriptThread.
-        if action != MouseButtonAction::Up {
-            return;
-        }
-
-        if let Some(mouse_down_button) = self.mouse_down_button.get() {
-            let pixel_dist = self.webview_relative_mouse_down_point.get() - point;
-            let pixel_dist = (pixel_dist.x * pixel_dist.x + pixel_dist.y * pixel_dist.y).sqrt();
-            if mouse_down_button == button && pixel_dist < max_pixel_dist {
-                webview.notify_input_event(InputEvent::MouseButton(MouseButtonEvent {
-                    action: MouseButtonAction::Click,
-                    button: mouse_button,
-                    point,
-                }));
-            }
-        }
     }
 
     /// Handle key events before sending them to Servo.
@@ -446,18 +412,41 @@ impl Window {
 }
 
 impl WindowPortsMethods for Window {
-    fn device_hidpi_factor(&self) -> Scale<f32, DeviceIndependentPixel, DevicePixel> {
+    fn screen_geometry(&self) -> ScreenGeometry {
+        let hidpi_factor = self.hidpi_scale_factor();
+        let toolbar_size = Size2D::new(
+            0.0,
+            (self.toolbar_height.get() * self.hidpi_scale_factor()).0,
+        );
+
+        let screen_size = self.screen_size.to_f32() * hidpi_factor;
+        let available_screen_size = screen_size - toolbar_size;
+
+        // Offset the WebView origin by the toolbar so that it reflects the actual viewport and
+        // not the window origin.
+        let window_origin = self.winit_window.inner_position().unwrap_or_default();
+        let window_origin = winit_position_to_euclid_point(window_origin).to_f32();
+        let offset = window_origin + toolbar_size;
+
+        ScreenGeometry {
+            size: screen_size.to_i32(),
+            available_size: available_screen_size.to_i32(),
+            offset: offset.to_i32(),
+        }
+    }
+
+    fn device_hidpi_scale_factor(&self) -> Scale<f32, DeviceIndependentPixel, DevicePixel> {
         Scale::new(self.winit_window.scale_factor() as f32)
     }
 
-    fn device_pixel_ratio_override(
-        &self,
-    ) -> Option<Scale<f32, DeviceIndependentPixel, DevicePixel>> {
-        self.device_pixel_ratio_override.map(Scale::new)
+    fn hidpi_scale_factor(&self) -> Scale<f32, DeviceIndependentPixel, DevicePixel> {
+        self.device_pixel_ratio_override
+            .map(Scale::new)
+            .unwrap_or_else(|| self.device_hidpi_scale_factor())
     }
 
     fn page_height(&self) -> f32 {
-        let dpr = self.hidpi_factor();
+        let dpr = self.hidpi_scale_factor();
         let size = self.winit_window.inner_size();
         size.height as f32 * dpr.get()
     }
@@ -467,7 +456,7 @@ impl WindowPortsMethods for Window {
     }
 
     fn request_resize(&self, _: &WebView, size: DeviceIntSize) -> Option<DeviceIntSize> {
-        let toolbar_height = self.toolbar_height() * self.hidpi_factor();
+        let toolbar_height = self.toolbar_height() * self.hidpi_scale_factor();
         let toolbar_height = toolbar_height.get().ceil() as i32;
         let total_size = PhysicalSize::new(size.width, size.height + toolbar_height);
         self.winit_window
@@ -552,10 +541,6 @@ impl WindowPortsMethods for Window {
         self.winit_window.set_cursor_visible(true);
     }
 
-    fn is_animating(&self) -> bool {
-        self.animation_state.get() == AnimationState::Animating
-    }
-
     fn id(&self) -> winit::window::WindowId {
         self.winit_window.id()
     }
@@ -575,7 +560,7 @@ impl WindowPortsMethods for Window {
             },
             WindowEvent::CursorMoved { position, .. } => {
                 let mut point = winit_position_to_euclid_point(position).to_f32();
-                point.y -= (self.toolbar_height() * self.hidpi_factor()).0;
+                point.y -= (self.toolbar_height() * self.hidpi_scale_factor()).0;
 
                 self.webview_relative_mouse_point.set(point);
                 webview.notify_input_event(InputEvent::MouseMove(MouseMoveEvent { point }));
@@ -586,7 +571,7 @@ impl WindowPortsMethods for Window {
                         (dx as f64, (dy * LINE_HEIGHT) as f64, WheelMode::DeltaLine)
                     },
                     MouseScrollDelta::PixelDelta(position) => {
-                        let scale_factor = self.device_hidpi_factor().inverse().get() as f64;
+                        let scale_factor = self.device_hidpi_scale_factor().inverse().get() as f64;
                         let position = position.to_logical(scale_factor);
                         (position.x, position.y, WheelMode::DeltaPixel)
                     },
@@ -646,9 +631,6 @@ impl WindowPortsMethods for Window {
                     winit::window::Theme::Dark => Theme::Dark,
                 });
             },
-            WindowEvent::Moved(_new_position) => {
-                webview.notify_embedder_window_moved();
-            },
             WindowEvent::Ime(ime) => match ime {
                 Ime::Enabled => {
                     webview.notify_input_event(InputEvent::Ime(ImeEvent::Composition(
@@ -719,7 +701,7 @@ impl WindowPortsMethods for Window {
         // this prevents a crash in the compositor due to invalid surface size
         self.winit_window.set_min_inner_size(Some(PhysicalSize::new(
             1.0,
-            1.0 + (self.toolbar_height() * self.hidpi_factor()).0,
+            1.0 + (self.toolbar_height() * self.hidpi_scale_factor()).0,
         )));
     }
 
@@ -752,31 +734,6 @@ impl WindowPortsMethods for Window {
     }
 }
 
-impl WindowMethods for Window {
-    fn get_coordinates(&self) -> EmbedderCoordinates {
-        let window_size = winit_size_to_euclid_size(self.winit_window.outer_size()).to_i32();
-        let window_origin = self.winit_window.outer_position().unwrap_or_default();
-        let window_origin = winit_position_to_euclid_point(window_origin).to_i32();
-        let window_rect = DeviceIntRect::from_origin_and_size(window_origin, window_size);
-        let window_scale: Scale<f64, DeviceIndependentPixel, DevicePixel> =
-            Scale::new(self.winit_window.scale_factor());
-        let window_rect = (window_rect.to_f64() / window_scale).to_i32();
-        let screen_size = self.screen_size.to_i32();
-
-        EmbedderCoordinates {
-            window_rect,
-            screen_size,
-            // FIXME: Winit doesn't have API for available size. Fallback to screen size
-            available_screen_size: screen_size,
-            hidpi_factor: self.hidpi_factor(),
-        }
-    }
-
-    fn set_animation_state(&self, state: AnimationState) {
-        self.animation_state.set(state);
-    }
-}
-
 fn winit_phase_to_touch_event_type(phase: TouchPhase) -> TouchEventType {
     match phase {
         TouchPhase::Started => TouchEventType::Down,
diff --git a/ports/servoshell/desktop/headless_window.rs b/ports/servoshell/desktop/headless_window.rs
index 415bff01f26..bf99b400349 100644
--- a/ports/servoshell/desktop/headless_window.rs
+++ b/ports/servoshell/desktop/headless_window.rs
@@ -8,11 +8,10 @@ use std::cell::Cell;
 use std::rc::Rc;
 
 use euclid::num::Zero;
-use euclid::{Box2D, Length, Point2D, Scale, Size2D};
-use servo::compositing::windowing::{AnimationState, EmbedderCoordinates, WindowMethods};
+use euclid::{Length, Scale, Size2D};
 use servo::servo_geometry::DeviceIndependentPixel;
 use servo::webrender_api::units::{DeviceIntSize, DevicePixel};
-use servo::{RenderingContext, SoftwareRenderingContext};
+use servo::{RenderingContext, ScreenGeometry, SoftwareRenderingContext};
 use winit::dpi::PhysicalSize;
 
 use super::app_state::RunningAppState;
@@ -20,12 +19,10 @@ use crate::desktop::window_trait::WindowPortsMethods;
 use crate::prefs::ServoShellPreferences;
 
 pub struct Window {
-    animation_state: Cell<AnimationState>,
     fullscreen: Cell<bool>,
     device_pixel_ratio_override: Option<Scale<f32, DeviceIndependentPixel, DevicePixel>>,
     inner_size: Cell<DeviceIntSize>,
-    screen_size: Size2D<i32, DeviceIndependentPixel>,
-    window_rect: Box2D<i32, DeviceIndependentPixel>,
+    screen_size: Size2D<i32, DevicePixel>,
     rendering_context: Rc<SoftwareRenderingContext>,
 }
 
@@ -44,20 +41,17 @@ impl Window {
         let rendering_context =
             SoftwareRenderingContext::new(physical_size).expect("Failed to create WR surfman");
 
-        let window_rect = Box2D::from_origin_and_size(Point2D::zero(), size.to_i32());
-
-        let screen_size = servoshell_preferences.screen_size_override.map_or_else(
-            || window_rect.size(),
-            |screen_size_override| screen_size_override.to_i32(),
-        );
+        let screen_size = servoshell_preferences
+            .screen_size_override
+            .map_or(inner_size, |screen_size_override| {
+                (screen_size_override.to_f32() * hidpi_factor).to_i32()
+            });
 
         let window = Window {
-            animation_state: Cell::new(AnimationState::Idle),
             fullscreen: Cell::new(false),
             device_pixel_ratio_override,
             inner_size: Cell::new(inner_size),
             screen_size,
-            window_rect,
             rendering_context: Rc::new(rendering_context),
         };
 
@@ -70,6 +64,14 @@ impl WindowPortsMethods for Window {
         winit::window::WindowId::dummy()
     }
 
+    fn screen_geometry(&self) -> servo::ScreenGeometry {
+        ScreenGeometry {
+            size: self.screen_size,
+            available_size: self.screen_size,
+            offset: Default::default(),
+        }
+    }
+
     fn request_resize(
         &self,
         webview: &::servo::WebView,
@@ -91,19 +93,18 @@ impl WindowPortsMethods for Window {
         Some(new_size)
     }
 
-    fn device_hidpi_factor(&self) -> Scale<f32, DeviceIndependentPixel, DevicePixel> {
+    fn device_hidpi_scale_factor(&self) -> Scale<f32, DeviceIndependentPixel, DevicePixel> {
         Scale::new(1.0)
     }
 
-    fn device_pixel_ratio_override(
-        &self,
-    ) -> Option<Scale<f32, DeviceIndependentPixel, DevicePixel>> {
+    fn hidpi_scale_factor(&self) -> Scale<f32, DeviceIndependentPixel, DevicePixel> {
         self.device_pixel_ratio_override
+            .unwrap_or_else(|| self.device_hidpi_scale_factor())
     }
 
     fn page_height(&self) -> f32 {
         let height = self.inner_size.get().height;
-        let dpr = self.hidpi_factor();
+        let dpr = self.hidpi_scale_factor();
         height as f32 * dpr.get()
     }
 
@@ -115,10 +116,6 @@ impl WindowPortsMethods for Window {
         self.fullscreen.get()
     }
 
-    fn is_animating(&self) -> bool {
-        self.animation_state.get() == AnimationState::Animating
-    }
-
     fn handle_winit_event(&self, _: Rc<RunningAppState>, _: winit::event::WindowEvent) {
         // Not expecting any winit events.
     }
@@ -146,18 +143,3 @@ impl WindowPortsMethods for Window {
         self.rendering_context.clone()
     }
 }
-
-impl WindowMethods for Window {
-    fn get_coordinates(&self) -> EmbedderCoordinates {
-        EmbedderCoordinates {
-            window_rect: self.window_rect,
-            screen_size: self.screen_size,
-            available_screen_size: self.screen_size,
-            hidpi_factor: self.hidpi_factor(),
-        }
-    }
-
-    fn set_animation_state(&self, state: AnimationState) {
-        self.animation_state.set(state);
-    }
-}
diff --git a/ports/servoshell/desktop/mod.rs b/ports/servoshell/desktop/mod.rs
index ffa1353906b..15c4301373f 100644
--- a/ports/servoshell/desktop/mod.rs
+++ b/ports/servoshell/desktop/mod.rs
@@ -10,7 +10,6 @@ mod app_state;
 pub(crate) mod cli;
 mod dialog;
 mod egui_glue;
-mod embedder;
 pub(crate) mod events_loop;
 mod gamepad;
 pub mod geometry;
@@ -20,4 +19,5 @@ mod keyutils;
 mod minibrowser;
 mod protocols;
 mod tracing;
+mod webxr;
 mod window_trait;
diff --git a/ports/servoshell/desktop/protocols/urlinfo.rs b/ports/servoshell/desktop/protocols/urlinfo.rs
index 4408ce47e52..14ad6bdb549 100644
--- a/ports/servoshell/desktop/protocols/urlinfo.rs
+++ b/ports/servoshell/desktop/protocols/urlinfo.rs
@@ -46,4 +46,8 @@ impl ProtocolHandler for UrlInfoProtocolHander {
     fn is_fetchable(&self) -> bool {
         true
     }
+
+    fn is_secure(&self) -> bool {
+        true
+    }
 }
diff --git a/ports/servoshell/desktop/webxr.rs b/ports/servoshell/desktop/webxr.rs
new file mode 100644
index 00000000000..8f85d6b08b2
--- /dev/null
+++ b/ports/servoshell/desktop/webxr.rs
@@ -0,0 +1,78 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use servo::config::pref;
+use servo::config::prefs::Preferences;
+use servo::webxr::WebXrRegistry;
+use servo::webxr::glwindow::GlWindowDiscovery;
+#[cfg(target_os = "windows")]
+use servo::webxr::openxr::{AppInfo, OpenXrDiscovery};
+use winit::event_loop::ActiveEventLoop;
+
+use super::window_trait::WindowPortsMethods;
+
+#[cfg(feature = "webxr")]
+enum XrDiscovery {
+    GlWindow(GlWindowDiscovery),
+    #[cfg(target_os = "windows")]
+    OpenXr(OpenXrDiscovery),
+}
+
+#[cfg(feature = "webxr")]
+pub(crate) struct XrDiscoveryWebXrRegistry {
+    xr_discovery: RefCell<Option<XrDiscovery>>,
+}
+
+impl XrDiscoveryWebXrRegistry {
+    pub(crate) fn new_boxed(
+        window: Rc<dyn WindowPortsMethods>,
+        event_loop: Option<&ActiveEventLoop>,
+        preferences: &Preferences,
+    ) -> Box<Self> {
+        let Some(event_loop) = event_loop else {
+            return Box::new(Self {
+                xr_discovery: RefCell::new(None),
+            });
+        };
+
+        let xr_discovery = if preferences.dom_webxr_openxr_enabled {
+            #[cfg(target_os = "windows")]
+            {
+                let app_info = AppInfo::new("Servoshell", 0, "Servo", 0);
+                Some(XrDiscovery::OpenXr(OpenXrDiscovery::new(None, app_info)))
+            }
+            #[cfg(not(target_os = "windows"))]
+            None
+        } else if preferences.dom_webxr_glwindow_enabled {
+            let window = window.new_glwindow(event_loop);
+            Some(XrDiscovery::GlWindow(GlWindowDiscovery::new(window)))
+        } else {
+            None
+        };
+
+        Box::new(Self {
+            xr_discovery: RefCell::new(xr_discovery),
+        })
+    }
+}
+
+#[cfg(feature = "webxr")]
+impl WebXrRegistry for XrDiscoveryWebXrRegistry {
+    fn register(&self, xr: &mut servo::webxr::MainThreadRegistry) {
+        use servo::webxr::headless::HeadlessMockDiscovery;
+
+        if pref!(dom_webxr_test) {
+            xr.register_mock(HeadlessMockDiscovery::default());
+        } else if let Some(xr_discovery) = self.xr_discovery.take() {
+            match xr_discovery {
+                XrDiscovery::GlWindow(discovery) => xr.register(discovery),
+                #[cfg(target_os = "windows")]
+                XrDiscovery::OpenXr(discovery) => xr.register(discovery),
+            }
+        }
+    }
+}
diff --git a/ports/servoshell/desktop/window_trait.rs b/ports/servoshell/desktop/window_trait.rs
index 678e5142f75..d006578cd1f 100644
--- a/ports/servoshell/desktop/window_trait.rs
+++ b/ports/servoshell/desktop/window_trait.rs
@@ -8,30 +8,23 @@
 use std::rc::Rc;
 
 use euclid::{Length, Scale};
-use servo::compositing::windowing::WindowMethods;
 use servo::servo_geometry::DeviceIndependentPixel;
 use servo::webrender_api::units::{DeviceIntPoint, DeviceIntSize, DevicePixel};
-use servo::{Cursor, RenderingContext, WebView};
+use servo::{Cursor, RenderingContext, ScreenGeometry, WebView};
 
 use super::app_state::RunningAppState;
 
 // This should vary by zoom level and maybe actual text size (focused or under cursor)
 pub const LINE_HEIGHT: f32 = 38.0;
 
-pub trait WindowPortsMethods: WindowMethods {
+pub trait WindowPortsMethods {
     fn id(&self) -> winit::window::WindowId;
-    fn hidpi_factor(&self) -> Scale<f32, DeviceIndependentPixel, DevicePixel> {
-        self.device_pixel_ratio_override()
-            .unwrap_or_else(|| self.device_hidpi_factor())
-    }
-    fn device_hidpi_factor(&self) -> Scale<f32, DeviceIndependentPixel, DevicePixel>;
-    fn device_pixel_ratio_override(
-        &self,
-    ) -> Option<Scale<f32, DeviceIndependentPixel, DevicePixel>>;
+    fn screen_geometry(&self) -> ScreenGeometry;
+    fn device_hidpi_scale_factor(&self) -> Scale<f32, DeviceIndependentPixel, DevicePixel>;
+    fn hidpi_scale_factor(&self) -> Scale<f32, DeviceIndependentPixel, DevicePixel>;
     fn page_height(&self) -> f32;
     fn get_fullscreen(&self) -> bool;
     fn handle_winit_event(&self, state: Rc<RunningAppState>, event: winit::event::WindowEvent);
-    fn is_animating(&self) -> bool;
     fn set_title(&self, _title: &str) {}
     /// Request a new inner size for the window, not including external decorations.
     fn request_resize(&self, webview: &WebView, inner_size: DeviceIntSize)
diff --git a/ports/servoshell/egl/android.rs b/ports/servoshell/egl/android.rs
index 0cb9c36fdce..5a3047c8542 100644
--- a/ports/servoshell/egl/android.rs
+++ b/ports/servoshell/egl/android.rs
@@ -20,11 +20,10 @@ use raw_window_handle::{
     AndroidDisplayHandle, AndroidNdkWindowHandle, RawDisplayHandle, RawWindowHandle,
 };
 use servo::{
-    AlertResponse, LoadStatus, MediaSessionActionType, PermissionRequest, SimpleDialog, WebView,
-};
-use simpleservo::{
-    APP, DeviceIntRect, EventLoopWaker, InitOptions, InputMethodType, MediaSessionPlaybackState,
+    AlertResponse, EventLoopWaker, LoadStatus, MediaSessionActionType, PermissionRequest,
+    SimpleDialog, WebView,
 };
+use simpleservo::{APP, DeviceIntRect, InitOptions, InputMethodType, MediaSessionPlaybackState};
 
 use super::app_state::{Coordinates, RunningAppState};
 use super::host_trait::HostTrait;
diff --git a/ports/servoshell/egl/android/resources.rs b/ports/servoshell/egl/android/resources.rs
index d39015aece1..0726d639f38 100644
--- a/ports/servoshell/egl/android/resources.rs
+++ b/ports/servoshell/egl/android/resources.rs
@@ -21,23 +21,11 @@ impl ResourceReaderMethods for ResourceReaderInstance {
             },
             Resource::BadCertHTML => &include_bytes!("../../../../resources/badcert.html")[..],
             Resource::NetErrorHTML => &include_bytes!("../../../../resources/neterror.html")[..],
-            Resource::UserAgentCSS => &include_bytes!("../../../../resources/user-agent.css")[..],
-            Resource::ServoCSS => &include_bytes!("../../../../resources/servo.css")[..],
-            Resource::PresentationalHintsCSS => {
-                &include_bytes!("../../../../resources/presentational-hints.css")[..]
-            },
-            Resource::QuirksModeCSS => &include_bytes!("../../../../resources/quirks-mode.css")[..],
             Resource::RippyPNG => &include_bytes!("../../../../resources/rippy.png")[..],
             Resource::DomainList => &include_bytes!("../../../../resources/public_domains.txt")[..],
             Resource::BluetoothBlocklist => {
                 &include_bytes!("../../../../resources/gatt_blocklist.txt")[..]
             },
-            Resource::MediaControlsCSS => {
-                &include_bytes!("../../../../resources/media-controls.css")[..]
-            },
-            Resource::MediaControlsJS => {
-                &include_bytes!("../../../../resources/media-controls.js")[..]
-            },
             Resource::CrashHTML => &include_bytes!("../../../../resources/crash.html")[..],
             Resource::DirectoryListingHTML => {
                 &include_bytes!("../../../../resources/directory-listing.html")[..]
diff --git a/ports/servoshell/egl/android/simpleservo.rs b/ports/servoshell/egl/android/simpleservo.rs
index 348faa8d4e0..4f7e35d3923 100644
--- a/ports/servoshell/egl/android/simpleservo.rs
+++ b/ports/servoshell/egl/android/simpleservo.rs
@@ -8,18 +8,14 @@ use std::rc::Rc;
 
 use dpi::PhysicalSize;
 use raw_window_handle::{DisplayHandle, RawDisplayHandle, RawWindowHandle, WindowHandle};
-/// The EventLoopWaker::wake function will be called from any thread.
-/// It will be called to notify embedder that some events are available,
-/// and that perform_updates need to be called
-pub use servo::EventLoopWaker;
 pub use servo::webrender_api::units::DeviceIntRect;
-use servo::{self, Servo, resources};
+use servo::{self, EventLoopWaker, ServoBuilder, resources};
 pub use servo::{InputMethodType, MediaSessionPlaybackState, WindowRenderingContext};
 
 use crate::egl::android::resources::ResourceReaderInstance;
-use crate::egl::app_state::{
-    Coordinates, RunningAppState, ServoEmbedderCallbacks, ServoWindowCallbacks,
-};
+#[cfg(feature = "webxr")]
+use crate::egl::app_state::XrDiscoveryWebXrRegistry;
+use crate::egl::app_state::{Coordinates, RunningAppState, ServoWindowCallbacks};
 use crate::egl::host_trait::HostTrait;
 use crate::prefs::{ArgumentParsingResult, parse_command_line_arguments};
 
@@ -83,30 +79,24 @@ pub fn init(
     let window_callbacks = Rc::new(ServoWindowCallbacks::new(
         callbacks,
         RefCell::new(init_opts.coordinates),
-        init_opts.density,
     ));
 
-    let embedder_callbacks = Box::new(ServoEmbedderCallbacks::new(
-        waker,
-        #[cfg(feature = "webxr")]
+    let servo_builder = ServoBuilder::new(rendering_context.clone())
+        .opts(opts)
+        .preferences(preferences)
+        .event_loop_waker(waker);
+
+    #[cfg(feature = "webxr")]
+    let servo_builder = servo_builder.webxr_registry(Box::new(XrDiscoveryWebXrRegistry::new(
         init_opts.xr_discovery,
-    ));
-
-    let servo = Servo::new(
-        opts,
-        preferences,
-        rendering_context.clone(),
-        embedder_callbacks,
-        window_callbacks.clone(),
-        None,
-        Default::default(),
-    );
+    )));
 
     APP.with(|app| {
         let app_state = RunningAppState::new(
             init_opts.url,
+            init_opts.density,
             rendering_context,
-            servo,
+            servo_builder.build(),
             window_callbacks,
             servoshell_preferences,
         );
diff --git a/ports/servoshell/egl/app_state.rs b/ports/servoshell/egl/app_state.rs
index bc3ea56a708..737a2f23b7d 100644
--- a/ports/servoshell/egl/app_state.rs
+++ b/ports/servoshell/egl/app_state.rs
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-use std::cell::{Ref, RefCell, RefMut};
+use std::cell::{Cell, Ref, RefCell, RefMut};
 use std::collections::HashMap;
 use std::rc::Rc;
 
@@ -11,20 +11,16 @@ use keyboard_types::{CompositionEvent, CompositionState};
 use log::{debug, error, info, warn};
 use raw_window_handle::{RawWindowHandle, WindowHandle};
 use servo::base::id::WebViewId;
-use servo::compositing::windowing::{
-    AnimationState, EmbedderCoordinates, EmbedderMethods, WindowMethods,
-};
-use servo::euclid::{Box2D, Point2D, Rect, Scale, Size2D, Vector2D};
+use servo::euclid::{Point2D, Rect, Scale, Size2D, Vector2D};
 use servo::servo_geometry::DeviceIndependentPixel;
 use servo::webrender_api::ScrollLocation;
 use servo::webrender_api::units::{DeviceIntRect, DeviceIntSize, DevicePixel};
 use servo::{
-    AllowOrDenyRequest, ContextMenuResult, EmbedderProxy, EventLoopWaker, ImeEvent, InputEvent,
-    InputMethodType, Key, KeyState, KeyboardEvent, LoadStatus, MediaSessionActionType,
-    MediaSessionEvent, MouseButton, MouseButtonAction, MouseButtonEvent, MouseMoveEvent,
-    NavigationRequest, PermissionRequest, RenderingContext, Servo, ServoDelegate, ServoError,
-    SimpleDialog, TouchEvent, TouchEventType, TouchId, WebView, WebViewDelegate,
-    WindowRenderingContext,
+    AllowOrDenyRequest, ContextMenuResult, ImeEvent, InputEvent, InputMethodType, Key, KeyState,
+    KeyboardEvent, LoadStatus, MediaSessionActionType, MediaSessionEvent, MouseButton,
+    MouseButtonAction, MouseButtonEvent, MouseMoveEvent, NavigationRequest, PermissionRequest,
+    RenderingContext, ScreenGeometry, Servo, ServoDelegate, ServoError, SimpleDialog, TouchEvent,
+    TouchEventType, TouchId, WebView, WebViewBuilder, WebViewDelegate, WindowRenderingContext,
 };
 use url::Url;
 
@@ -42,24 +38,29 @@ impl Coordinates {
             viewport: Rect::new(Point2D::new(x, y), Size2D::new(width, height)),
         }
     }
+
+    pub fn origin(&self) -> Point2D<i32, DevicePixel> {
+        self.viewport.origin
+    }
+
+    pub fn size(&self) -> Size2D<i32, DevicePixel> {
+        self.viewport.size
+    }
 }
 
 pub(super) struct ServoWindowCallbacks {
     host_callbacks: Box<dyn HostTrait>,
     coordinates: RefCell<Coordinates>,
-    hidpi_factor: Scale<f32, DeviceIndependentPixel, DevicePixel>,
 }
 
 impl ServoWindowCallbacks {
     pub(super) fn new(
         host_callbacks: Box<dyn HostTrait>,
         coordinates: RefCell<Coordinates>,
-        hidpi_factor: f32,
     ) -> Self {
         Self {
             host_callbacks,
             coordinates,
-            hidpi_factor: Scale::new(hidpi_factor),
         }
     }
 }
@@ -88,9 +89,19 @@ struct RunningAppStateInner {
     focused_webview_id: Option<WebViewId>,
 
     context_menu_sender: Option<IpcSender<ContextMenuResult>>,
+
+    /// Whether or not the animation state has changed. This is used to trigger
+    /// host callbacks indicating that animation state has changed.
+    animating_state_changed: Rc<Cell<bool>>,
+
+    /// The HiDPI scaling factor to use for the display of [`WebView`]s.
+    hidpi_scale_factor: Scale<f32, DeviceIndependentPixel, DevicePixel>,
+}
+
+struct ServoShellServoDelegate {
+    animating_state_changed: Rc<Cell<bool>>,
 }
 
-struct ServoShellServoDelegate;
 impl ServoDelegate for ServoShellServoDelegate {
     fn notify_devtools_server_started(&self, _servo: &Servo, port: u16, _token: String) {
         info!("Devtools Server running on port {port}");
@@ -103,9 +114,25 @@ impl ServoDelegate for ServoShellServoDelegate {
     fn notify_error(&self, _servo: &Servo, error: ServoError) {
         error!("Saw Servo error: {error:?}!");
     }
+
+    fn notify_animating_changed(&self, _animating: bool) {
+        self.animating_state_changed.set(true);
+    }
 }
 
 impl WebViewDelegate for RunningAppState {
+    fn screen_geometry(&self, _webview: WebView) -> Option<ScreenGeometry> {
+        let coord = self.callbacks.coordinates.borrow();
+        let offset = coord.origin();
+        let available_size = coord.size();
+        let screen_size = coord.size();
+        Some(ScreenGeometry {
+            size: screen_size,
+            available_size,
+            offset,
+        })
+    }
+
     fn notify_page_title_changed(&self, _webview: servo::WebView, title: Option<String>) {
         self.callbacks.host_callbacks.on_title_changed(title);
     }
@@ -192,10 +219,13 @@ impl WebViewDelegate for RunningAppState {
         }
     }
 
-    fn request_open_auxiliary_webview(&self, _parent_webview: WebView) -> Option<WebView> {
-        let new_webview = self.servo.new_auxiliary_webview();
-        self.add(new_webview.clone());
-        Some(new_webview)
+    fn request_open_auxiliary_webview(&self, parent_webview: WebView) -> Option<WebView> {
+        let webview = WebViewBuilder::new_auxiliary(&self.servo)
+            .delegate(parent_webview.delegate())
+            .hidpi_scale_factor(self.inner().hidpi_scale_factor)
+            .build();
+        self.add(webview.clone());
+        Some(webview)
     }
 
     fn request_permission(&self, webview: WebView, request: PermissionRequest) {
@@ -254,6 +284,7 @@ impl WebViewDelegate for RunningAppState {
 impl RunningAppState {
     pub(super) fn new(
         initial_url: Option<String>,
+        hidpi_scale_factor: f32,
         rendering_context: Rc<WindowRenderingContext>,
         servo: Servo,
         callbacks: Rc<ServoWindowCallbacks>,
@@ -265,7 +296,10 @@ impl RunningAppState {
             .or_else(|| Url::parse("about:blank").ok())
             .unwrap();
 
-        servo.set_delegate(Rc::new(ServoShellServoDelegate));
+        let animating_state_changed = Rc::new(Cell::new(false));
+        servo.set_delegate(Rc::new(ServoShellServoDelegate {
+            animating_state_changed: animating_state_changed.clone(),
+        }));
 
         let app_state = Rc::new(Self {
             rendering_context,
@@ -278,6 +312,8 @@ impl RunningAppState {
                 webviews: Default::default(),
                 creation_order: vec![],
                 focused_webview_id: None,
+                animating_state_changed,
+                hidpi_scale_factor: Scale::new(hidpi_scale_factor),
             }),
         });
 
@@ -286,8 +322,12 @@ impl RunningAppState {
     }
 
     pub(crate) fn new_toplevel_webview(self: &Rc<Self>, url: Url) {
-        let webview = self.servo.new_webview(url);
-        webview.set_delegate(self.clone());
+        let webview = WebViewBuilder::new(&self.servo)
+            .url(url)
+            .hidpi_scale_factor(self.inner().hidpi_scale_factor)
+            .delegate(self.clone())
+            .build();
+
         webview.focus();
         self.add(webview.clone());
     }
@@ -347,6 +387,12 @@ impl RunningAppState {
         if !should_continue {
             self.callbacks.host_callbacks.on_shutdown_complete();
         }
+        if self.inner().animating_state_changed.get() {
+            self.inner().animating_state_changed.set(false);
+            self.callbacks
+                .host_callbacks
+                .on_animating_changed(self.servo.animating());
+        }
     }
 
     /// Load an URL.
@@ -644,59 +690,26 @@ impl RunningAppState {
     }
 }
 
-pub(super) struct ServoEmbedderCallbacks {
-    waker: Box<dyn EventLoopWaker>,
-    #[cfg(feature = "webxr")]
-    xr_discovery: Option<servo::webxr::Discovery>,
+#[cfg(feature = "webxr")]
+pub(crate) struct XrDiscoveryWebXrRegistry {
+    xr_discovery: RefCell<Option<servo::webxr::Discovery>>,
 }
 
-impl ServoEmbedderCallbacks {
-    pub(super) fn new(
-        waker: Box<dyn EventLoopWaker>,
-        #[cfg(feature = "webxr")] xr_discovery: Option<servo::webxr::Discovery>,
-    ) -> Self {
+#[cfg(feature = "webxr")]
+impl XrDiscoveryWebXrRegistry {
+    pub(crate) fn new(xr_discovery: Option<servo::webxr::Discovery>) -> Self {
         Self {
-            waker,
-            #[cfg(feature = "webxr")]
-            xr_discovery,
+            xr_discovery: RefCell::new(xr_discovery),
         }
     }
 }
 
-impl EmbedderMethods for ServoEmbedderCallbacks {
-    fn create_event_loop_waker(&mut self) -> Box<dyn EventLoopWaker> {
-        debug!("EmbedderMethods::create_event_loop_waker");
-        self.waker.clone()
-    }
-
-    #[cfg(feature = "webxr")]
-    fn register_webxr(
-        &mut self,
-        registry: &mut servo::webxr::MainThreadRegistry,
-        _embedder_proxy: EmbedderProxy,
-    ) {
-        debug!("EmbedderMethods::register_xr");
+#[cfg(feature = "webxr")]
+impl servo::webxr::WebXrRegistry for XrDiscoveryWebXrRegistry {
+    fn register(&self, registry: &mut servo::webxr::MainThreadRegistry) {
+        debug!("XrDiscoveryWebXrRegistry::register");
         if let Some(discovery) = self.xr_discovery.take() {
             registry.register(discovery);
         }
     }
 }
-
-impl WindowMethods for ServoWindowCallbacks {
-    fn get_coordinates(&self) -> EmbedderCoordinates {
-        let coords = self.coordinates.borrow();
-        let screen_size = (coords.viewport.size.to_f32() / self.hidpi_factor).to_i32();
-        EmbedderCoordinates {
-            window_rect: Box2D::from_origin_and_size(Point2D::zero(), screen_size),
-            screen_size,
-            available_screen_size: screen_size,
-            hidpi_factor: self.hidpi_factor,
-        }
-    }
-
-    fn set_animation_state(&self, state: AnimationState) {
-        debug!("WindowMethods::set_animation_state: {:?}", state);
-        self.host_callbacks
-            .on_animating_changed(state == AnimationState::Animating);
-    }
-}
diff --git a/ports/servoshell/egl/ohos.rs b/ports/servoshell/egl/ohos.rs
index 1153ad80de9..79172d368ab 100644
--- a/ports/servoshell/egl/ohos.rs
+++ b/ports/servoshell/egl/ohos.rs
@@ -7,7 +7,7 @@ use std::cell::RefCell;
 use std::mem::MaybeUninit;
 use std::os::raw::c_void;
 use std::sync::mpsc::{Receiver, Sender};
-use std::sync::{Once, OnceLock, mpsc};
+use std::sync::{LazyLock, Once, OnceLock, mpsc};
 use std::thread;
 use std::thread::sleep;
 use std::time::Duration;
@@ -22,15 +22,15 @@ use ohos_ime::{AttachOptions, Ime, ImeProxy, RawTextEditorProxy};
 use ohos_ime_sys::types::InputMethod_EnterKeyType;
 use servo::style::Zero;
 use servo::{
-    AlertResponse, InputMethodType, LoadStatus, MediaSessionPlaybackState, PermissionRequest,
-    SimpleDialog, WebView,
+    AlertResponse, EventLoopWaker, InputMethodType, LoadStatus, MediaSessionPlaybackState,
+    PermissionRequest, SimpleDialog, WebView,
 };
-use simpleservo::EventLoopWaker;
 use xcomponent_sys::{
     OH_NativeXComponent, OH_NativeXComponent_Callback, OH_NativeXComponent_GetKeyEvent,
     OH_NativeXComponent_GetKeyEventAction, OH_NativeXComponent_GetKeyEventCode,
-    OH_NativeXComponent_GetTouchEvent, OH_NativeXComponent_GetXComponentSize,
-    OH_NativeXComponent_KeyAction, OH_NativeXComponent_KeyCode, OH_NativeXComponent_KeyEvent,
+    OH_NativeXComponent_GetTouchEvent, OH_NativeXComponent_GetXComponentOffset,
+    OH_NativeXComponent_GetXComponentSize, OH_NativeXComponent_KeyAction,
+    OH_NativeXComponent_KeyCode, OH_NativeXComponent_KeyEvent,
     OH_NativeXComponent_RegisterCallback, OH_NativeXComponent_RegisterKeyEventCallback,
     OH_NativeXComponent_TouchEvent, OH_NativeXComponent_TouchEventType,
 };
@@ -268,6 +268,33 @@ extern "C" fn on_surface_created_cb(xcomponent: *mut OH_NativeXComponent, window
     info!("Returning from on_surface_created_cb");
 }
 
+/// Returns the offset of the surface relative to its parent's top left corner
+///
+/// # Safety
+///
+/// `xcomponent` and `native_window` must be valid, non-null and aligned pointers to a
+/// live xcomponent and associated native window surface.
+unsafe fn get_xcomponent_offset(
+    xcomponent: *mut OH_NativeXComponent,
+    native_window: *mut c_void,
+) -> Result<(i32, i32), i32> {
+    let mut x: f64 = 0.0;
+    let mut y: f64 = 0.0;
+
+    let result = unsafe {
+        OH_NativeXComponent_GetXComponentOffset(xcomponent, native_window, &raw mut x, &raw mut y)
+    };
+    if result != 0 {
+        error!("OH_NativeXComponent_GetXComponentOffset failed with {result}");
+        return Err(result);
+    }
+
+    Ok((
+        (x.round() as i64).try_into().expect("X offset too large"),
+        (y.round() as i64).try_into().expect("Y offset too large"),
+    ))
+}
+
 /// Returns the size of the surface
 ///
 /// # Safety
@@ -386,32 +413,39 @@ extern "C" fn on_dispatch_key_event(xc: *mut OH_NativeXComponent, _window: *mut
     }
 }
 
+static LOGGER: LazyLock<hilog::Logger> = LazyLock::new(|| {
+    let mut builder = hilog::Builder::new();
+    builder.set_domain(hilog::LogDomain::new(0xE0C3));
+    let filters = [
+        "fonts",
+        "servo",
+        "servoshell",
+        "servoshell::egl:gl_glue",
+        // Show redirected stdout / stderr by default
+        "servoshell::egl::log",
+        // Show JS errors by default.
+        "script::dom::bindings::error",
+        // Show GL errors by default.
+        "canvas::webgl_thread",
+        "compositing::compositor",
+        "compositing::touch",
+        "constellation::constellation",
+        "ohos_ime",
+    ];
+    for &module in &filters {
+        builder.filter_module(module, log::LevelFilter::Debug);
+    }
+
+    builder.filter_level(LevelFilter::Warn).build()
+});
+
 fn initialize_logging_once() {
     static ONCE: Once = Once::new();
     ONCE.call_once(|| {
-        let mut builder = hilog::Builder::new();
-        let filters = [
-            "fonts",
-            "servo",
-            "servoshell",
-            "servoshell::egl:gl_glue",
-            // Show redirected stdout / stderr by default
-            "servoshell::egl::log",
-            // Show JS errors by default.
-            "script::dom::bindings::error",
-            // Show GL errors by default.
-            "canvas::webgl_thread",
-            "compositing::compositor",
-            "compositing::touch",
-            "constellation::constellation",
-            "ohos_ime",
-        ];
-        for &module in &filters {
-            builder.filter_module(module, log::LevelFilter::Debug);
-        }
-
-        builder.filter_level(LevelFilter::Warn).init();
-
+        let logger: &'static hilog::Logger = &LOGGER;
+        let max_level = logger.filter();
+        let r = log::set_logger(logger).and_then(|()| Ok(log::set_max_level(max_level)));
+        debug!("Attempted to register the logger: {r:?} and set max level to: {max_level}");
         info!("Servo Register callback called!");
 
         std::panic::set_hook(Box::new(|info| {
@@ -447,7 +481,26 @@ fn initialize_logging_once() {
         if let Err(e) = super::log::redirect_stdout_and_stderr() {
             error!("Failed to redirect stdout and stderr to hilog due to: {e:?}");
         }
-    })
+    });
+}
+
+pub fn set_log_filter(filter: Option<&str>) {
+    let Some(filter) = filter else {
+        debug!("Called ohos::set_log_filter without providing a filter");
+        return;
+    };
+
+    debug!("Updating log filter to {filter}");
+    let mut builder = env_filter::Builder::new();
+    let filter = match builder.try_parse(filter) {
+        Result::Ok(filter) => filter,
+        Result::Err(err) => {
+            error!("Failed to parse log filter: {err}");
+            return;
+        },
+    };
+    let filter = filter.build();
+    (*LOGGER).set_filter(filter);
 }
 
 fn register_xcomponent_callbacks(env: &Env, xcomponent: &JsObject) -> napi_ohos::Result<()> {
@@ -654,7 +707,7 @@ impl EventLoopWaker for WakeupCallback {
     }
 
     fn wake(&self) {
-        info!("wake called!");
+        log::trace!("wake called!");
         self.chan.send(ServoAction::WakeUp).unwrap_or_else(|e| {
             error!("Failed to send wake message with: {e}");
         });
diff --git a/ports/servoshell/egl/ohos/simpleservo.rs b/ports/servoshell/egl/ohos/simpleservo.rs
index 621b2f446ed..c867c7a5330 100644
--- a/ports/servoshell/egl/ohos/simpleservo.rs
+++ b/ports/servoshell/egl/ohos/simpleservo.rs
@@ -14,16 +14,10 @@ use raw_window_handle::{
     DisplayHandle, OhosDisplayHandle, OhosNdkWindowHandle, RawDisplayHandle, RawWindowHandle,
     WindowHandle,
 };
-/// The EventLoopWaker::wake function will be called from any thread.
-/// It will be called to notify embedder that some events are available,
-/// and that perform_updates need to be called
-pub use servo::EventLoopWaker;
-use servo::{self, Servo, WindowRenderingContext, resources};
+use servo::{self, EventLoopWaker, ServoBuilder, WindowRenderingContext, resources};
 use xcomponent_sys::OH_NativeXComponent;
 
-use crate::egl::app_state::{
-    Coordinates, RunningAppState, ServoEmbedderCallbacks, ServoWindowCallbacks,
-};
+use crate::egl::app_state::{Coordinates, RunningAppState, ServoWindowCallbacks};
 use crate::egl::host_trait::HostTrait;
 use crate::egl::ohos::InitOpts;
 use crate::egl::ohos::resources::ResourceReaderInstance;
@@ -66,6 +60,15 @@ pub fn init(
             );
         });
 
+    // Ensure cache dir exists before copy `prefs.json`
+    let _ = crate::prefs::default_config_dir().inspect(|path| {
+        if !path.exists() {
+            fs::create_dir_all(path).unwrap_or_else(|e| {
+                log::error!("Failed to create config directory at {:?}: {:?}", path, e)
+            })
+        }
+    });
+
     // Try copy `prefs.json` from {this.context.resource_prefsDir}/servo/
     // to `config_dir` if none exist
     let source_prefs = resource_dir.join("prefs.json");
@@ -88,11 +91,16 @@ pub fn init(
     };
 
     crate::init_tracing(servoshell_preferences.tracing_filter.as_deref());
+    #[cfg(target_env = "ohos")]
+    crate::egl::ohos::set_log_filter(servoshell_preferences.log_filter.as_deref());
 
     let Ok(window_size) = (unsafe { super::get_xcomponent_size(xcomponent, native_window) }) else {
         return Err("Failed to get xcomponent size");
     };
-    let coordinates = Coordinates::new(0, 0, window_size.width, window_size.height);
+    let Ok((x, y)) = (unsafe { super::get_xcomponent_offset(xcomponent, native_window) }) else {
+        return Err("Failed to get xcomponent offset");
+    };
+    let coordinates = Coordinates::new(x, y, window_size.width, window_size.height);
 
     let display_handle = RawDisplayHandle::Ohos(OhosDisplayHandle::new());
     let display_handle = unsafe { DisplayHandle::borrow_raw(display_handle) };
@@ -115,27 +123,17 @@ pub fn init(
     let window_callbacks = Rc::new(ServoWindowCallbacks::new(
         callbacks,
         RefCell::new(coordinates),
-        options.display_density as f32,
     ));
 
-    let embedder_callbacks = Box::new(ServoEmbedderCallbacks::new(
-        waker,
-        #[cfg(feature = "webxr")]
-        None,
-    ));
-
-    let servo = Servo::new(
-        opts,
-        preferences,
-        rendering_context.clone(),
-        embedder_callbacks,
-        window_callbacks.clone(),
-        None, /* user_agent */
-        Default::default(),
-    );
+    let servo = ServoBuilder::new(rendering_context.clone())
+        .opts(opts)
+        .preferences(preferences)
+        .event_loop_waker(waker)
+        .build();
 
     let app_state = RunningAppState::new(
         Some(options.url),
+        options.display_density as f32,
         rendering_context,
         servo,
         window_callbacks,
diff --git a/ports/servoshell/lib.rs b/ports/servoshell/lib.rs
index e9cad7ca480..54b4d2d54a0 100644
--- a/ports/servoshell/lib.rs
+++ b/ports/servoshell/lib.rs
@@ -88,7 +88,7 @@ pub fn init_tracing(filter_directives: Option<&str>) {
         let subscriber = subscriber.with(filter);
 
         // Same as SubscriberInitExt::init, but avoids initialising the tracing-log compat layer,
-        // since it would break Servo’s FromScriptLogger and FromCompositorLogger.
+        // since it would break Servo’s FromScriptLogger and FromEmbederLogger.
         // <https://docs.rs/tracing-subscriber/0.3.18/tracing_subscriber/util/trait.SubscriberInitExt.html#method.init>
         // <https://docs.rs/tracing/0.1.40/tracing/#consuming-log-records>
         tracing::subscriber::set_global_default(subscriber)
@@ -97,11 +97,7 @@ pub fn init_tracing(filter_directives: Option<&str>) {
 }
 
 pub fn servo_version() -> String {
-    format!(
-        "Servo {}-{}",
-        env!("CARGO_PKG_VERSION"),
-        env!("VERGEN_GIT_SHA")
-    )
+    format!("Servo {}-{}", env!("CARGO_PKG_VERSION"), env!("GIT_SHA"))
 }
 
 /// Plumbs tracing spans into HiTrace, with the following caveats:
diff --git a/ports/servoshell/prefs.rs b/ports/servoshell/prefs.rs
index 5157615f44a..a3ebda231d0 100644
--- a/ports/servoshell/prefs.rs
+++ b/ports/servoshell/prefs.rs
@@ -23,8 +23,6 @@ use url::Url;
 #[cfg_attr(any(target_os = "android", target_env = "ohos"), allow(dead_code))]
 #[derive(Clone)]
 pub(crate) struct ServoShellPreferences {
-    /// The user agent to use for servoshell.
-    pub user_agent: Option<String>,
     /// A URL to load when starting servoshell.
     pub url: Option<String>,
     /// An override value for the device pixel ratio.
@@ -59,6 +57,11 @@ pub(crate) struct ServoShellPreferences {
     /// Where to load userscripts from, if any.
     /// and if the option isn't passed userscripts won't be loaded.
     pub userscripts_directory: Option<PathBuf>,
+
+    /// Log filter given in the `log_filter` spec as a String, if any.
+    /// If a filter is passed, the logger should adjust accordingly.
+    #[cfg(target_env = "ohos")]
+    pub log_filter: Option<String>,
 }
 
 impl Default for ServoShellPreferences {
@@ -74,10 +77,11 @@ impl Default for ServoShellPreferences {
             searchpage: "https://duckduckgo.com/html/?q=%s".into(),
             tracing_filter: None,
             url: None,
-            user_agent: None,
             output_image_path: None,
             exit_after_stable_image: false,
             userscripts_directory: None,
+            #[cfg(target_env = "ohos")]
+            log_filter: None,
         }
     }
 }
@@ -351,6 +355,14 @@ pub(crate) fn parse_command_line_arguments(args: Vec<String>) -> ArgumentParsing
         "FILTER",
     );
 
+    #[cfg(target_env = "ohos")]
+    opts.optmulti(
+        "",
+        "log-filter",
+        "Define a custom filter for logging.",
+        "FILTER",
+    );
+
     opts.optflag(
         "",
         "enable-experimental-web-platform-features",
@@ -411,10 +423,16 @@ pub(crate) fn parse_command_line_arguments(args: Vec<String>) -> ArgumentParsing
     }
     // Env-Filter directives are comma seperated.
     let filters = opt_match.opt_strs("tracing-filter").join(",");
-    let tracing_filter = if filters.is_empty() {
-        None
-    } else {
-        Some(filters)
+    let tracing_filter = (!filters.is_empty()).then_some(filters);
+
+    #[cfg(target_env = "ohos")]
+    let log_filter = {
+        let filters = opt_match.opt_strs("log-filter").join(",");
+        let log_filter = (!filters.is_empty()).then_some(filters).or_else(|| {
+            (!preferences.log_filter.is_empty()).then_some(preferences.log_filter.clone())
+        });
+        log::debug!("Set log_filter to: {:?}", log_filter);
+        log_filter
     };
 
     let mut debug_options = DebugOptions::default();
@@ -551,6 +569,7 @@ pub(crate) fn parse_command_line_arguments(args: Vec<String>) -> ArgumentParsing
 
     if opt_match.opt_present("enable-experimental-web-platform-features") {
         vec![
+            "dom_async_clipboard_enabled",
             "dom_fontface_enabled",
             "dom_imagebitmap_enabled",
             "dom_intersection_observer_enabled",
@@ -559,15 +578,14 @@ pub(crate) fn parse_command_line_arguments(args: Vec<String>) -> ArgumentParsing
             "dom_offscreen_canvas_enabled",
             "dom_permissions_enabled",
             "dom_resize_observer_enabled",
-            "dom_serviceworker_enabled",
             "dom_svg_enabled",
+            "dom_trusted_types_enabled",
             "dom_webgl2_enabled",
             "dom_webgpu_enabled",
             "dom_xpath_enabled",
             "layout_columns_enabled",
             "layout_container_queries_enabled",
             "layout_grid_enabled",
-            "layout_writing_mode_enabled",
         ]
         .iter()
         .for_each(|pref| preferences.set_value(pref, PrefValue::Bool(true)));
@@ -615,7 +633,6 @@ pub(crate) fn parse_command_line_arguments(args: Vec<String>) -> ArgumentParsing
     let exit_after_load = opt_match.opt_present("x") || output_image_path.is_some();
     let wait_for_stable_image = exit_after_load;
     let servoshell_preferences = ServoShellPreferences {
-        user_agent: opt_match.opt_str("u"),
         url,
         no_native_titlebar,
         device_pixel_ratio_override,
@@ -629,6 +646,8 @@ pub(crate) fn parse_command_line_arguments(args: Vec<String>) -> ArgumentParsing
         userscripts_directory: opt_match
             .opt_default("userscripts", "resources/user-agent-js")
             .map(PathBuf::from),
+        #[cfg(target_env = "ohos")]
+        log_filter,
         ..Default::default()
     };
 
@@ -637,6 +656,10 @@ pub(crate) fn parse_command_line_arguments(args: Vec<String>) -> ArgumentParsing
         preferences.media_glvideo_enabled = false;
     }
 
+    if let Some(user_agent) = opt_match.opt_str("user-agent") {
+        preferences.user_agent = user_agent;
+    }
+
     let opts = Opts {
         debug: debug_options.clone(),
         wait_for_stable_image,
diff --git a/python/requirements.txt b/python/requirements.txt
index 20d42065dde..d026ce3ee5f 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -37,3 +37,6 @@ types-requests
 
 # For mach package on macOS.
 Mako == 1.2.2
+
+# For devtools tests.
+geckordp == 1.0.3
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index b21f89980c0..42988debf35 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -13,10 +13,11 @@ import os.path as path
 import pathlib
 import shutil
 import stat
+import subprocess
 import sys
 
 from time import time
-from typing import Optional
+from typing import Optional, List
 
 import notifypy
 
@@ -40,6 +41,32 @@ SUPPORTED_ASAN_TARGETS = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu",
                           "x86_64-apple-darwin", "x86_64-unknown-linux-gnu"]
 
 
+def get_rustc_llvm_version() -> Optional[List[int]]:
+    """Determine the LLVM version of `rustc` and return it as a List[major, minor, patch, ...]
+
+    In some cases we want to ensure that the LLVM version of rustc and clang match, e.g.
+    when using ASAN for both C/C++ and Rust code, we want to use the same ASAN implementation.
+    This function assumes that rustc points to the rust compiler we are interested in, which should
+    be valid in both rustup managed environment and on nix.
+    """
+    try:
+        result = subprocess.run(['rustc', '--version', '--verbose'], encoding='utf-8', capture_output=True)
+        result.check_returncode()
+        for line in result.stdout.splitlines():
+            line_lowercase = line.lower()
+            if line_lowercase.startswith("llvm version:"):
+                llvm_version = line_lowercase.strip("llvm version:")
+                llvm_version = llvm_version.strip()
+                version = llvm_version.split('.')
+                print(f"Info: rustc is using LLVM version {'.'.join(version)}")
+                return version
+        else:
+            print(f"Error: Couldn't find LLVM version in output of `rustc --version --verbose`: `{result.stdout}`")
+    except Exception as e:
+        print(f"Error: Failed to determine rustc version: {e}")
+    return None
+
+
 @CommandProvider
 class MachCommands(CommandBase):
     @Command('build', description='Build Servo', category='build')
@@ -99,11 +126,30 @@ class MachCommands(CommandBase):
             env["RUSTFLAGS"] = env.get("RUSTFLAGS", "") + " -Zsanitizer=address"
             opts += ["-Zbuild-std"]
             kwargs["target_override"] = target_triple
-            # TODO: Investigate sanitizers in C/C++ code:
-            # env.setdefault("CFLAGS", "")
-            # env.setdefault("CXXFLAGS", "")
-            # env["CFLAGS"] += " -fsanitize=address"
-            # env["CXXFLAGS"] += " -fsanitize=address"
+
+            # Note: We want to use the same clang/LLVM version as rustc.
+            rustc_llvm_version = get_rustc_llvm_version()
+            if rustc_llvm_version is None:
+                raise RuntimeError("Unable to determine necessary clang version for ASAN support")
+            llvm_major: int = rustc_llvm_version[0]
+            target_clang = f"clang-{llvm_major}"
+            target_cxx = f"clang++-{llvm_major}"
+            if shutil.which(target_clang) is None or shutil.which(target_cxx) is None:
+                raise RuntimeError(f"--with-asan requires `{target_clang}` and `{target_cxx}` to be in PATH")
+            env.setdefault("TARGET_CC", target_clang)
+            env.setdefault("TARGET_CXX", target_cxx)
+            # TODO: We should also parse the LLVM version from the clang compiler we chose.
+            # It's unclear if the major version being the same is sufficient.
+
+            # We need to use `TARGET_CFLAGS`, since we don't want to compile host dependencies with ASAN,
+            # since that causes issues when building build-scripts / proc macros.
+            env.setdefault("TARGET_CFLAGS", "")
+            env.setdefault("TARGET_CXXFLAGS", "")
+            env["TARGET_CFLAGS"] += " -fsanitize=address"
+            env["TARGET_CXXFLAGS"] += " -fsanitize=address"
+            env["TARGET_LDFLAGS"] = "-static-libasan"
+            # By default build mozjs from source to enable ASAN with mozjs.
+            env.setdefault("MOZJS_FROM_SOURCE", "1")
 
             # asan replaces system allocator with asan allocator
             # we need to make sure that we do not replace it with jemalloc
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 799fbdca8ee..1a704bf7c05 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -512,6 +512,19 @@ class CommandBase(object):
 
         self.target.configure_build_environment(env, self.config, self.context.topdir)
 
+        if sys.platform == 'win32' and 'windows' not in self.target.triple():
+            # aws-lc-rs only supports the Ninja Generator when cross-compiling on windows hosts to non-windows.
+            env['TARGET_CMAKE_GENERATOR'] = "Ninja"
+            if shutil.which('ninja') is None:
+                print("Error: Cross-compiling servo on windows requires the Ninja tool to be installed and in PATH.")
+                print("Hint: Ninja-build is available on github at: https://github.com/ninja-build/ninja/releases")
+                exit(1)
+            # `tr` is also required by the CMake build rules of `aws-lc-rs`
+            if shutil.which('tr') is None:
+                print("Error: Cross-compiling servo on windows requires the `tr` tool, which was not found.")
+                print("Hint: Try running ./mach from `git bash` instead of powershell.")
+                exit(1)
+
         return env
 
     @staticmethod
diff --git a/python/servo/devtools_tests.py b/python/servo/devtools_tests.py
new file mode 100644
index 00000000000..0d336fbcb9c
--- /dev/null
+++ b/python/servo/devtools_tests.py
@@ -0,0 +1,207 @@
+# Copyright 2013 The Servo Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
+from concurrent.futures import Future
+import logging
+from geckordp.actors.root import RootActor
+from geckordp.actors.descriptors.tab import TabActor
+from geckordp.actors.watcher import WatcherActor
+from geckordp.actors.resources import Resources
+from geckordp.actors.events import Events
+from geckordp.rdp_client import RDPClient
+import http.server
+import os.path
+import socketserver
+import subprocess
+import time
+from threading import Thread
+from typing import Optional
+import unittest
+
+
+# Set this to true to log requests in the internal web servers.
+LOG_REQUESTS = False
+
+
+class DevtoolsTests(unittest.IsolatedAsyncioTestCase):
+    # /path/to/servo/python/servo
+    script_path = None
+
+    def __init__(self, methodName="runTest"):
+        super().__init__(methodName)
+        self.servoshell = None
+        self.base_url = None
+        self.web_server = None
+        self.web_server_thread = None
+
+    # Classic script vs module script:
+    # - <https://html.spec.whatwg.org/multipage/#classic-script>
+    # - <https://html.spec.whatwg.org/multipage/#module-script>
+    # Worker scripts can be classic or module:
+    # - <https://html.spec.whatwg.org/multipage/#fetch-a-classic-worker-script>
+    # - <https://html.spec.whatwg.org/multipage/#fetch-a-module-worker-script-tree>
+    # Non-worker(?) script sources can be inline, external, or blob.
+    # Worker script sources can be external or blob.
+    def test_sources_list(self):
+        self.start_web_server(test_dir=os.path.join(DevtoolsTests.script_path, "devtools_tests/sources"))
+        self.run_servoshell()
+        self.assert_sources_list(2, set([
+            tuple([f"{self.base_url}/classic.js", f"{self.base_url}/test.html", "https://servo.org/js/load-table.js"]),
+            tuple([f"{self.base_url}/worker.js"]),
+        ]))
+
+    def test_sources_list_with_data_no_scripts(self):
+        self.run_servoshell(url="data:text/html,")
+        self.assert_sources_list(1, set([tuple()]))
+
+    def test_sources_list_with_data_empty_inline_classic_script(self):
+        self.run_servoshell(url="data:text/html,<script></script>")
+        self.assert_sources_list(1, set([tuple()]))
+
+    def test_sources_list_with_data_inline_classic_script(self):
+        self.run_servoshell(url="data:text/html,<script>;</script>")
+        self.assert_sources_list(1, set([tuple(["data:text/html,<script>;</script>"])]))
+
+    def test_sources_list_with_data_external_classic_script(self):
+        self.start_web_server(test_dir=os.path.join(DevtoolsTests.script_path, "devtools_tests/sources"))
+        self.run_servoshell(url=f"data:text/html,<script src=\"{self.base_url}/classic.js\"></script>")
+        self.assert_sources_list(1, set([tuple([f"{self.base_url}/classic.js"])]))
+
+    def test_sources_list_with_data_empty_inline_module_script(self):
+        self.run_servoshell(url="data:text/html,<script type=module></script>")
+        self.assert_sources_list(1, set([tuple()]))
+
+    def test_sources_list_with_data_inline_module_script(self):
+        self.run_servoshell(url="data:text/html,<script type=module>;</script>")
+        self.assert_sources_list(1, set([tuple(["data:text/html,<script type=module>;</script>"])]))
+
+    # Sets `base_url` and `web_server` and `web_server_thread`.
+    def start_web_server(self, *, test_dir=None):
+        if test_dir is None:
+            test_dir = os.path.join(DevtoolsTests.script_path, "devtools_tests")
+        base_url = Future()
+
+        class Handler(http.server.SimpleHTTPRequestHandler):
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, directory=test_dir, **kwargs)
+
+            def log_message(self, format, *args):
+                if LOG_REQUESTS:
+                    return super().log_message(format, *args)
+
+        def server_thread():
+            self.web_server = socketserver.TCPServer(("0.0.0.0", 0), Handler)
+            base_url.set_result(f"http://127.0.0.1:{self.web_server.server_address[1]}")
+            self.web_server.serve_forever()
+
+        # Start a web server for the test.
+        self.web_server_thread = Thread(target=server_thread)
+        self.web_server_thread.start()
+        self.base_url = base_url.result(1)
+
+    # Sets `servoshell`.
+    def run_servoshell(self, *, url=None):
+        # Change this setting if you want to debug Servo.
+        os.environ["RUST_LOG"] = "error,devtools=warn"
+
+        # Run servoshell.
+        if url is None:
+            url = f"{self.base_url}/test.html"
+        self.servoshell = subprocess.Popen(["target/release/servo", "--devtools=6080", url])
+
+        # FIXME: Don’t do this
+        time.sleep(1)
+
+    def tearDown(self):
+        # Terminate servoshell.
+        if self.servoshell is not None:
+            self.servoshell.terminate()
+            self.servoshell = None
+
+        # Stop the web server.
+        if self.web_server is not None:
+            self.web_server.shutdown()
+            self.web_server = None
+        if self.web_server_thread is not None:
+            self.web_server_thread.join()
+            self.web_server_thread = None
+        if self.base_url is not None:
+            self.base_url = None
+
+    def assert_sources_list(self, expected_targets: int, expected_urls_by_target: set[tuple[str]]):
+        client = RDPClient()
+        client.connect("127.0.0.1", 6080)
+        root = RootActor(client)
+        tabs = root.list_tabs()
+        tab_dict = tabs[0]
+        tab = TabActor(client, tab_dict["actor"])
+        watcher = tab.get_watcher()
+        watcher = WatcherActor(client, watcher["actor"])
+
+        done = Future()
+        targets = []
+
+        def on_target(data):
+            try:
+                targets.append(data["target"])
+                if len(targets) == expected_targets:
+                    done.set_result(None)
+            except Exception as e:
+                # Raising here does nothing, for some reason.
+                # Send the exception back so it can be raised.
+                done.set_result(e)
+
+        client.add_event_listener(
+            watcher.actor_id, Events.Watcher.TARGET_AVAILABLE_FORM, on_target,
+        )
+        watcher.watch_targets(WatcherActor.Targets.FRAME)
+        watcher.watch_targets(WatcherActor.Targets.WORKER)
+
+        result: Optional[Exception] = done.result(1)
+        if result:
+            raise result
+        done = Future()
+        # NOTE: breaks if two targets have the same list of source urls.
+        # This should really be a multiset, but Python does not have multisets.
+        actual_urls_by_target: set[tuple[str]] = set()
+
+        def on_source_resource(data):
+            for [resource_type, sources] in data["array"]:
+                try:
+                    self.assertEqual(resource_type, "source")
+                    source_urls = tuple([source["url"] for source in sources])
+                    self.assertFalse(source_urls in sources)  # See NOTE above
+                    actual_urls_by_target.add(source_urls)
+                    if len(actual_urls_by_target) == expected_targets:
+                        done.set_result(None)
+                except Exception as e:
+                    # Raising here does nothing, for some reason.
+                    # Send the exception back so it can be raised.
+                    done.set_result(e)
+
+        for target in targets:
+            client.add_event_listener(
+                target["actor"],
+                Events.Watcher.RESOURCES_AVAILABLE_ARRAY,
+                on_source_resource,
+            )
+        watcher.watch_resources([Resources.SOURCE])
+
+        result: Optional[Exception] = done.result(1)
+        if result:
+            raise result
+        self.assertEqual(actual_urls_by_target, expected_urls_by_target)
+        client.disconnect()
+
+
+def run_tests(script_path):
+    DevtoolsTests.script_path = script_path
+    verbosity = 1 if logging.getLogger().level >= logging.WARN else 2
+    suite = unittest.TestLoader().loadTestsFromTestCase(DevtoolsTests)
+    return unittest.TextTestRunner(verbosity=verbosity).run(suite).wasSuccessful()
diff --git a/python/servo/devtools_tests/sources/classic.js b/python/servo/devtools_tests/sources/classic.js
new file mode 100644
index 00000000000..84fd1671805
--- /dev/null
+++ b/python/servo/devtools_tests/sources/classic.js
@@ -0,0 +1 @@
+console.log("external classic");
diff --git a/python/servo/devtools_tests/sources/module.js b/python/servo/devtools_tests/sources/module.js
new file mode 100644
index 00000000000..a1d0f1f37cf
--- /dev/null
+++ b/python/servo/devtools_tests/sources/module.js
@@ -0,0 +1,2 @@
+export default 1;
+console.log("external module");
diff --git a/python/servo/devtools_tests/sources/test.html b/python/servo/devtools_tests/sources/test.html
new file mode 100644
index 00000000000..b8e1aa0e334
--- /dev/null
+++ b/python/servo/devtools_tests/sources/test.html
@@ -0,0 +1,11 @@
+<!doctype html><meta charset=utf-8>
+<script src="classic.js"></script>
+<script>
+    console.log("inline classic");
+    new Worker("worker.js");
+</script>
+<script type="module">
+    import module from "./module.js";
+    console.log("inline module");
+</script>
+<script src="https://servo.org/js/load-table.js"></script>
diff --git a/python/servo/devtools_tests/sources/worker.js b/python/servo/devtools_tests/sources/worker.js
new file mode 100644
index 00000000000..a7993a8b5fb
--- /dev/null
+++ b/python/servo/devtools_tests/sources/worker.js
@@ -0,0 +1 @@
+console.log("external classic worker");
diff --git a/python/servo/platform/linux.py b/python/servo/platform/linux.py
index c6bf1be5b92..8ff35b25bdf 100644
--- a/python/servo/platform/linux.py
+++ b/python/servo/platform/linux.py
@@ -10,20 +10,21 @@
 import distro
 import os
 import subprocess
+import shutil
 from typing import Optional, Tuple
 
 from .base import Base
 from .build_target import BuildTarget
 
-# Please keep these in sync with the packages on the wiki, using the instructions below
-# https://github.com/servo/servo/wiki/Building
+# Please keep these in sync with the packages in the book, using the instructions below
+# https://book.servo.org/hacking/setting-up-your-environment.html
 
 # https://packages.debian.org
 # https://packages.ubuntu.com
 # 1. open devtools
 # 2. paste in the whole APT_PKGS = [...]
 # 3. copy(`sudo apt install ${APT_PKGS.join(" ")}`)
-# 4. paste into https://github.com/servo/servo/wiki/Building#debian-based-distributions
+# 4. paste into https://github.com/servo/book/edit/main/src/hacking/setting-up-your-environment.md
 APT_PKGS = [
     'build-essential', 'ccache', 'clang', 'cmake', 'curl', 'g++', 'git',
     'gperf', 'libdbus-1-dev', 'libfreetype6-dev', 'libgl1-mesa-dri',
@@ -39,14 +40,15 @@ APT_PKGS = [
     'libharfbuzz-dev', 'liblzma-dev', 'libudev-dev', 'libunwind-dev',
     'libvulkan1', 'libx11-dev', 'libxcb-render0-dev', 'libxcb-shape0-dev',
     'libxcb-xfixes0-dev', 'libxmu-dev', 'libxmu6', 'libegl1-mesa-dev',
-    'llvm-dev', 'm4', 'xorg-dev', 'libxkbcommon0', "libxkbcommon-x11-0"
+    'llvm-dev', 'm4', 'xorg-dev', 'libxkbcommon0', "libxkbcommon-x11-0",
+    'tshark',
 ]
 
 # https://packages.fedoraproject.org
 # 1. open devtools
 # 2. paste in the whole DNF_PKGS = [...]
 # 3. copy(`sudo dnf install ${DNF_PKGS.join(" ")}`)
-# 4. paste into https://github.com/servo/servo/wiki/Building#fedora
+# 4. paste into https://github.com/servo/book/edit/main/src/hacking/setting-up-your-environment.md
 DNF_PKGS = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel',
             'libunwind-devel', 'mesa-libGL-devel', 'mesa-libEGL-devel',
             'glib2-devel', 'libX11-devel', 'libXrandr-devel', 'gperf',
@@ -58,13 +60,13 @@ DNF_PKGS = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel',
             'gstreamer1-plugins-good', 'gstreamer1-plugins-bad-free-devel',
             'gstreamer1-plugins-ugly-free', 'libjpeg-turbo-devel',
             'zlib-ng', 'libjpeg-turbo', 'vulkan-loader', 'libxkbcommon',
-            'libxkbcommon-x11']
+            'libxkbcommon-x11', 'wireshark-cli']
 
 # https://voidlinux.org/packages/
 # 1. open devtools
 # 2. paste in the whole XBPS_PKGS = [...]
 # 3. copy(`sudo xbps-install ${XBPS_PKGS.join(" ")}`)
-# 4. paste into https://github.com/servo/servo/wiki/Building#void-linux
+# 4. paste into https://github.com/servo/book/edit/main/src/hacking/setting-up-your-environment.md
 XBPS_PKGS = ['libtool', 'gcc', 'libXi-devel', 'freetype-devel',
              'libunwind-devel', 'MesaLib-devel', 'glib-devel', 'pkg-config',
              'libX11-devel', 'libXrandr-devel', 'gperf', 'bzip2-devel',
@@ -203,6 +205,12 @@ class Linux(Base):
         if not install:
             return False
 
+        def check_sudo():
+            if os.geteuid() != 0:
+                if shutil.which('sudo') is None:
+                    return False
+            return True
+
         def run_as_root(command, force=False):
             if os.geteuid() != 0:
                 command.insert(0, 'sudo')
@@ -211,6 +219,13 @@ class Linux(Base):
             return subprocess.call(command)
 
         print("Installing missing dependencies...")
+        if not check_sudo():
+            print("'sudo' command not found."
+                  " You may be able to install dependencies manually."
+                  " See https://github.com/servo/servo/wiki/Building.")
+            input("Press Enter to continue...")
+            return False
+
         if run_as_root(command + pkgs, force) != 0:
             raise EnvironmentError("Installation of dependencies failed.")
         return True
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index fe408fb5442..5e5a8c2e8d2 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -13,11 +13,13 @@ import re
 import sys
 import os
 import os.path as path
+import platform
 import shutil
 import subprocess
 import textwrap
 import json
 
+import servo.devtools_tests
 from servo.post_build_commands import PostBuildCommands
 import wpt
 import wpt.manifestupdate
@@ -57,7 +59,7 @@ TOML_GLOBS = [
     "*.toml",
     ".cargo/*.toml",
     "components/*/*.toml",
-    "components/shared/*.toml",
+    "components/shared/*/*.toml",
     "ports/*/*.toml",
     "support/*/*.toml",
 ]
@@ -161,10 +163,13 @@ class MachCommands(CommandBase):
         self_contained_tests = [
             "background_hang_monitor",
             "base",
+            "compositing",
+            "compositing_traits",
             "constellation",
+            "devtools",
             "fonts",
             "hyper_serde",
-            "layout_2020",
+            "layout",
             "libservo",
             "metrics",
             "net",
@@ -175,7 +180,6 @@ class MachCommands(CommandBase):
             "servo_config",
             "servoshell",
             "stylo_config",
-            "webrender_traits",
         ]
         if not packages:
             packages = set(os.listdir(path.join(self.context.topdir, "tests", "unit"))) - set(['.DS_Store'])
@@ -291,6 +295,25 @@ class MachCommands(CommandBase):
         print("Running WPT tests...")
         passed = wpt.run_tests() and passed
 
+        print("Running devtools parser tests...")
+        # TODO: Enable these tests on other platforms once mach bootstrap installs tshark(1) for them
+        if platform.system() == "Linux":
+            try:
+                result = subprocess.run(
+                    ["etc/devtools_parser.py", "--json", "--use", "etc/devtools_parser_test.pcap"],
+                    check=True, capture_output=True)
+                expected = open("etc/devtools_parser_test.json", "rb").read()
+                actual = result.stdout
+                assert actual == expected, f"Incorrect output!\nExpected: {repr(expected)}\nActual:   {repr(actual)}"
+                print("OK")
+            except subprocess.CalledProcessError as e:
+                print(f"Process failed with exit status {e.returncode}: {e.cmd}", file=sys.stderr)
+                print(f"stdout: {repr(e.stdout)}", file=sys.stderr)
+                print(f"stderr: {repr(e.stderr)}", file=sys.stderr)
+                raise e
+        else:
+            print("SKIP")
+
         if all or tests:
             print("Running WebIDL tests...")
 
@@ -304,6 +327,14 @@ class MachCommands(CommandBase):
 
         return 0 if passed else 1
 
+    @Command('test-devtools',
+             description='Run tests for devtools.',
+             category='testing')
+    def test_devtools(self):
+        print("Running devtools tests...")
+        passed = servo.devtools_tests.run_tests(SCRIPT_PATH)
+        return 0 if passed else 1
+
     @Command('test-wpt-failure',
              description='Run the tests harness that verifies that the test failures are reported correctly',
              category='testing',
@@ -410,9 +441,9 @@ class MachCommands(CommandBase):
         return [py, avd, apk]
 
     @Command('test-jquery', description='Run the jQuery test suite', category='testing')
-    @CommandBase.common_command_arguments(build_configuration=False, build_type=True)
-    def test_jquery(self, build_type: BuildType):
-        return self.jquery_test_runner("test", build_type)
+    @CommandBase.common_command_arguments(binary_selection=True)
+    def test_jquery(self, servo_binary: str):
+        return self.jquery_test_runner("test", servo_binary)
 
     @Command('test-dromaeo', description='Run the Dromaeo test suite', category='testing')
     @CommandArgument('tests', default=["recommended"], nargs="...", help="Specific tests to run")
@@ -651,6 +682,12 @@ class MachCommands(CommandBase):
         # Write the file out again
         with open(cts_html, 'w') as file:
             file.write(filedata)
+        logger = path.join(clone_dir, "out-wpt", "common/internal/logging/test_case_recorder.js")
+        with open(logger, 'r') as file:
+            filedata = file.read()
+        filedata.replace("info(ex) {", "info(ex) {return;")
+        with open(logger, 'w') as file:
+            file.write(filedata)
         # copy
         delete(path.join(tdir, "webgpu"))
         shutil.copytree(path.join(clone_dir, "out-wpt"), path.join(tdir, "webgpu"))
diff --git a/python/servo/try_parser.py b/python/servo/try_parser.py
index edbea49ce7b..0d78599c06f 100644
--- a/python/servo/try_parser.py
+++ b/python/servo/try_parser.py
@@ -39,10 +39,12 @@ class JobConfig(object):
     unit_tests: bool = False
     build_libservo: bool = False
     bencher: bool = False
+    build_args: str = ""
     wpt_args: str = ""
+    number_of_wpt_chunks: int = 20
     # These are the fields that must match in between two JobConfigs for them to be able to be
     # merged. If you modify any of the fields above, make sure to update this line as well.
-    merge_compatibility_fields: ClassVar[List[str]] = ['workflow', 'profile', 'wpt_args']
+    merge_compatibility_fields: ClassVar[List[str]] = ['workflow', 'profile', 'wpt_args', 'build_args']
 
     def merge(self, other: JobConfig) -> bool:
         """Try to merge another job with this job. Returns True if merging is successful
@@ -55,6 +57,7 @@ class JobConfig(object):
         self.unit_tests |= other.unit_tests
         self.build_libservo |= other.build_libservo
         self.bencher |= other.bencher
+        self.number_of_wpt_chunks = max(self.number_of_wpt_chunks, other.number_of_wpt_chunks)
         self.update_name()
         return True
 
@@ -154,6 +157,9 @@ class Config(object):
             if word in ["fail-fast", "failfast", "fail_fast"]:
                 self.fail_fast = True
                 continue  # skip over keyword
+            if word == "wpt":
+                words.extend(["linux-wpt"])
+                continue  # skip over keyword
             if word == "full":
                 words.extend(["linux-unit-tests", "linux-wpt", "linux-bencher"])
                 words.extend(["macos-unit-tests", "windows-unit-tests", "android", "ohos", "lint"])
@@ -198,12 +204,14 @@ class TestParser(unittest.TestCase):
                               'matrix': [{
                                   'bencher': False,
                                   'name': 'Linux (Unit Tests)',
+                                  'number_of_wpt_chunks': 20,
                                   'profile': 'release',
                                   'unit_tests': True,
                                   'build_libservo': False,
                                   'workflow': 'linux',
                                   'wpt': False,
-                                  'wpt_args': ''
+                                  'wpt_args': '',
+                                  'build_args': ''
                               }]
                               })
 
@@ -212,63 +220,76 @@ class TestParser(unittest.TestCase):
                              {"fail_fast": False, "matrix": [
                               {
                                   "name": "Linux (Unit Tests, WPT, Bencher)",
+                                  'number_of_wpt_chunks': 20,
                                   "workflow": "linux",
                                   "wpt": True,
                                   "profile": "release",
                                   "unit_tests": True,
                                   'build_libservo': False,
                                   'bencher': True,
-                                  "wpt_args": ""
+                                  "wpt_args": "",
+                                  'build_args': ''
                               },
                               {
                                   "name": "MacOS (Unit Tests)",
+                                  'number_of_wpt_chunks': 20,
                                   "workflow": "macos",
                                   "wpt": False,
                                   "profile": "release",
                                   "unit_tests": True,
                                   'build_libservo': False,
                                   'bencher': False,
-                                  "wpt_args": ""
+                                  "wpt_args": "",
+                                  'build_args': ''
                               },
                               {
                                   "name": "Windows (Unit Tests)",
+                                  'number_of_wpt_chunks': 20,
                                   "workflow": "windows",
                                   "wpt": False,
                                   "profile": "release",
                                   "unit_tests": True,
                                   'build_libservo': False,
                                   'bencher': False,
-                                  "wpt_args": ""
+                                  "wpt_args": "",
+                                  'build_args': ''
                               },
                               {
                                   "name": "Android",
+                                  'number_of_wpt_chunks': 20,
                                   "workflow": "android",
                                   "wpt": False,
                                   "profile": "release",
                                   "unit_tests": False,
                                   'build_libservo': False,
                                   'bencher': False,
-                                  "wpt_args": ""
+                                  "wpt_args": "",
+                                  'build_args': ''
                               },
                               {
                                   "name": "OpenHarmony",
+                                  'number_of_wpt_chunks': 20,
                                   "workflow": "ohos",
                                   "wpt": False,
                                   "profile": "release",
                                   "unit_tests": False,
                                   'build_libservo': False,
                                   'bencher': False,
-                                  "wpt_args": ""
+                                  "wpt_args": "",
+                                  'build_args': ''
                               },
                               {
                                   "name": "Lint",
+                                  'number_of_wpt_chunks': 20,
                                   "workflow": "lint",
                                   "wpt": False,
                                   "profile": "release",
                                   "unit_tests": False,
                                   'build_libservo': False,
                                   'bencher': False,
-                                  "wpt_args": ""}
+                                  "wpt_args": "",
+                                  'build_args': ''
+                              }
                               ]})
 
     def test_job_merging(self):
@@ -277,12 +298,14 @@ class TestParser(unittest.TestCase):
                               'matrix': [{
                                   'bencher': False,
                                   'name': 'Linux (WPT)',
+                                  'number_of_wpt_chunks': 20,
                                   'profile': 'release',
                                   'unit_tests': False,
                                   'build_libservo': False,
                                   'workflow': 'linux',
                                   'wpt': True,
-                                  'wpt_args': ''
+                                  'wpt_args': '',
+                                  'build_args': ''
                               }]
                               })
 
@@ -314,10 +337,19 @@ class TestParser(unittest.TestCase):
         self.assertFalse(a.merge(b), "Should not merge jobs that run different WPT tests.")
         self.assertEqual(a, JobConfig("Linux (Unit Tests)", Workflow.LINUX, unit_tests=True))
 
+        a = JobConfig("Linux (Unit Tests)", Workflow.LINUX, unit_tests=True)
+        b = JobConfig("Linux (Unit Tests)", Workflow.LINUX, unit_tests=True, build_args="--help")
+        self.assertFalse(a.merge(b), "Should not merge jobs with different build arguments.")
+        self.assertEqual(a, JobConfig("Linux (Unit Tests)", Workflow.LINUX, unit_tests=True))
+
     def test_full(self):
         self.assertDictEqual(json.loads(Config("full").to_json()),
                              json.loads(Config("").to_json()))
 
+    def test_wpt_alias(self):
+        self.assertDictEqual(json.loads(Config("wpt").to_json()),
+                             json.loads(Config("linux-wpt").to_json()))
+
 
 def run_tests():
     verbosity = 1 if logging.getLogger().level >= logging.WARN else 2
diff --git a/python/tidy/tidy.py b/python/tidy/tidy.py
index f312811456b..fe44be23df8 100644
--- a/python/tidy/tidy.py
+++ b/python/tidy/tidy.py
@@ -80,6 +80,7 @@ WEBIDL_STANDARDS = [
     b"//dev.w3.org/csswg",
     b"//dev.w3.org/fxtf",
     b"//dvcs.w3.org/hg",
+    b"//www.w3.org/TR/trusted-types/",
     b"//dom.spec.whatwg.org",
     b"//drafts.csswg.org",
     b"//drafts.css-houdini.org",
@@ -90,6 +91,7 @@ WEBIDL_STANDARDS = [
     b"//html.spec.whatwg.org",
     b"//streams.spec.whatwg.org",
     b"//url.spec.whatwg.org",
+    b"//urlpattern.spec.whatwg.org",
     b"//xhr.spec.whatwg.org",
     b"//w3c.github.io",
     b"//heycam.github.io/webidl",
@@ -102,6 +104,7 @@ WEBIDL_STANDARDS = [
     b"//github.com/immersive-web/webxr-hands-input/",
     b"//gpuweb.github.io",
     b"//notifications.spec.whatwg.org",
+    b"//testutils.spec.whatwg.org/",
     # Not a URL
     b"// This interface is entirely internal to Servo, and should not be"
     + b" accessible to\n// web pages."
diff --git a/python/wpt/run.py b/python/wpt/run.py
index 97639ff34b6..b40287cbd96 100644
--- a/python/wpt/run.py
+++ b/python/wpt/run.py
@@ -51,6 +51,11 @@ def run_tests(default_binary_path: str, **kwargs):
     os.environ["RUST_BACKTRACE"] = "1"
     os.environ["HOST_FILE"] = os.path.join(SERVO_ROOT, "tests", "wpt", "hosts")
 
+    # The pytest framework used in the webdriver conformance tests dumps the
+    # environment variables when unexpected results occur, and this variable
+    # makes CI logs unreadable.
+    github_context = os.environ.pop("GITHUB_CONTEXT", None)
+
     set_if_none(kwargs, "product", "servo")
     set_if_none(kwargs, "config", os.path.join(WPT_PATH, "config.ini"))
     set_if_none(kwargs, "include_manifest", os.path.join(WPT_PATH, "include.ini"))
@@ -142,6 +147,9 @@ def run_tests(default_binary_path: str, **kwargs):
         kwargs["pause_after_test"] = False
         wptrunner.run_tests(**kwargs)
 
+        if github_context:
+            os.environ["GITHUB_CONTEXT"] = github_context
+
         # Use the second run to mark tests from the first run as flaky, but
         # discard the results otherwise.
         # TODO: It might be a good idea to send the new results to the
diff --git a/resources/about-memory.html b/resources/about-memory.html
index 380cee3d6ec..7e6e4c188e3 100644
--- a/resources/about-memory.html
+++ b/resources/about-memory.html
@@ -63,6 +63,96 @@
         return result;
       }
 
+      function reportsForProcess(processReport) {
+        let explicitRoot = {};
+        let nonExplicitRoot = {};
+
+        let jemallocHeapReportedSize = 0;
+        let systemHeapReportedSize = 0;
+
+        let jemallocHeapAllocatedSize = NaN;
+        let systemHeapAllocatedSize = NaN;
+
+        // In content processes, get the list of urls.
+        let urls = new Set();
+
+        processReport.reports.forEach((report) => {
+          if (report.path[0].startsWith("url(")) {
+            // This can be a list of urls.
+            let path_urls = report.path[0].slice(4, -1).split(", ");
+            path_urls.forEach((url) => urls.add(url));
+          }
+
+          // Add "explicit" to the start of the path, when appropriate.
+          if (report.kind.startsWith("Explicit")) {
+            report.path.unshift("explicit");
+          }
+
+          // Update the reported fractions of the heaps, when appropriate.
+          if (report.kind == "ExplicitJemallocHeapSize") {
+            jemallocHeapReportedSize += report.size;
+          } else if (report.kind == "ExplicitSystemHeapSize") {
+            systemHeapReportedSize += report.size;
+          }
+
+          // Record total size of the heaps, when we see them.
+          if (report.path.length == 1) {
+            if (report.path[0] == "jemalloc-heap-allocated") {
+              jemallocHeapAllocatedSize = report.size;
+            } else if (report.path[0] == "system-heap-allocated") {
+              systemHeapAllocatedSize = report.size;
+            }
+          }
+
+          // Insert this report at the proper position.
+          insertNode(
+            report.kind.startsWith("Explicit") ? explicitRoot : nonExplicitRoot,
+            report
+          );
+        });
+
+        // Compute and insert the heap-unclassified values.
+        if (!isNaN(jemallocHeapAllocatedSize)) {
+          insertNode(explicitRoot, {
+            path: ["explicit", "jemalloc-heap-unclassified"],
+            size: jemallocHeapAllocatedSize - jemallocHeapReportedSize,
+          });
+        }
+        if (!isNaN(systemHeapAllocatedSize)) {
+          insertNode(explicitRoot, {
+            path: ["explicit", "system-heap-unclassified"],
+            size: systemHeapAllocatedSize - systemHeapReportedSize,
+          });
+        }
+
+        // Create the DOM structure for each process report:
+        // <div class=process> <h4>...<h4> <pre> ...</pre> </div>
+        let container = document.createElement("div");
+        container.classList.add("process");
+        let reportTitle = document.createElement("h4");
+        reportTitle.textContent = `${
+          processReport.isMainProcess ? "Main Process" : "Content Process"
+        } (pid ${processReport.pid}) ${[...urls.values()].join(", ")}`;
+
+        container.append(reportTitle);
+        let reportNode = document.createElement("pre");
+        reportNode.classList.add("report");
+        container.append(reportNode);
+
+        reportNode.append(convertNodeToDOM(explicitRoot.explicit, "explicit"));
+
+        for (let prop in nonExplicitRoot) {
+          reportNode.append(convertNodeToDOM(nonExplicitRoot[prop], prop));
+        }
+
+        // Make sure we always put the main process first.
+        if (processReport.isMainProcess) {
+          window.reports.prepend(container);
+        } else {
+          window.reports.append(container);
+        }
+      }
+
       function start() {
         window.startButton.onclick = async () => {
           let content = await navigator.servo.reportMemory();
@@ -71,70 +161,15 @@
             console.error(reports.error);
             return;
           }
-          window.report.innerHTML = "";
-          window.report.classList.remove("hidden");
+          window.reports.innerHTML = "";
+          window.reports.classList.remove("hidden");
 
-          let explicitRoot = {};
-          let nonExplicitRoot = {};
-
-          let jemallocHeapReportedSize = 0;
-          let systemHeapReportedSize = 0;
-
-          let jemallocHeapAllocatedSize = NaN;
-          let systemHeapAllocatedSize = NaN;
-
-          reports.forEach((report) => {
-            // Add "explicit" to the start of the path, when appropriate.
-            if (report.kind.startsWith("Explicit")) {
-              report.path.unshift("explicit");
-            }
-
-            // Update the reported fractions of the heaps, when appropriate.
-            if (report.kind == "ExplicitJemallocHeapSize") {
-              jemallocHeapReportedSize += report.size;
-            } else if (report.kind == "ExplicitSystemHeapSize") {
-              systemHeapReportedSize += report.size;
-            }
-
-            // Record total size of the heaps, when we see them.
-            if (report.path.length == 1) {
-              if (report.path[0] == "jemalloc-heap-allocated") {
-                jemallocHeapAllocatedSize = report.size;
-              } else if (report.path[0] == "system-heap-allocated") {
-                systemHeapAllocatedSize = report.size;
-              }
-            }
-
-            // Insert this report at the proper position.
-            insertNode(
-              report.kind.startsWith("Explicit")
-                ? explicitRoot
-                : nonExplicitRoot,
-              report
-            );
-          });
-
-          // Compute and insert the heap-unclassified values.
-          if (!isNaN(jemallocHeapAllocatedSize)) {
-            insertNode(explicitRoot, {
-              path: ["explicit", "jemalloc-heap-unclassified"],
-              size: jemallocHeapAllocatedSize - jemallocHeapReportedSize,
-            });
-          }
-          if (!isNaN(systemHeapAllocatedSize)) {
-            insertNode(explicitRoot, {
-              path: ["explicit", "system-heap-unclassified"],
-              size: systemHeapAllocatedSize - systemHeapReportedSize,
-            });
+          if (!Array.isArray(reports)) {
+            console.error("Unexpected memory report format!");
+            return;
           }
 
-          window.report.append(
-            convertNodeToDOM(explicitRoot.explicit, "explicit")
-          );
-
-          for (let prop in nonExplicitRoot) {
-            window.report.append(convertNodeToDOM(nonExplicitRoot[prop], prop));
-          }
+          reports.forEach(reportsForProcess);
         };
       }
     </script>
@@ -152,15 +187,19 @@
         cursor: pointer;
       }
 
-      #report {
-        line-height: 1.5em;
+      div.process {
+        margin: 0.5em;
         border: 2px solid gray;
         border-radius: 10px;
         padding: 5px;
         background-color: lightgray;
       }
 
-      #report > details {
+      .report {
+        line-height: 1.5em;
+      }
+
+      .report > details {
         margin-bottom: 1em;
       }
 
@@ -172,6 +211,6 @@
   <body>
     <h2>Memory Reports</h2>
     <button id="startButton">Measure</button>
-    <pre id="report" class="hidden"></pre>
+    <div id="reports" class="hidden"></div>
   </body>
 </html>
diff --git a/resources/servo.css b/resources/servo.css
deleted file mode 100644
index cea5caedc69..00000000000
--- a/resources/servo.css
+++ /dev/null
@@ -1,358 +0,0 @@
-button {
-    cursor: default;
-}
-
-button,
-input {
-  background: white;
-  border: solid lightgrey 1px;
-  color: black;
-  font-family: sans-serif;
-  font-size: 0.8333em;
-}
-
-textarea {
-  background: white;
-  border: solid lightgrey 1px;
-  color: black;
-  font-family: sans-serif;
-  font-size: 0.8333em;
-}
-
-input::selection,
-textarea::selection {
-  background: rgba(176, 214, 255, 1.0);
-  color: black;
-}
-
-button,
-input[type="button"],
-input[type="submit"],
-input[type="reset"] {
-  background: lightgrey;
-  border-top: solid 1px #EEEEEE;
-  border-left: solid 1px #CCCCCC;
-  border-right: solid 1px #999999;
-  border-bottom: solid 1px #999999;
-  color: black;
-}
-
-input[type="hidden"] { display: none !important }
-
-input[type="checkbox"],
-input[type="radio"] {
-  font-family: monospace !important;
-  border: none !important;
-  background: transparent;
-}
-
-input[type="checkbox"]::before {
-  display: inline-block;
-  border: solid currentcolor 1px;
-  content: "";
-  padding: 0;
-  width: 1em;
-  height: 1em;
-  text-align: center;
-}
-
-input[type="checkbox"]:checked::before { content: "✓"; }
-input[type="checkbox"]:indeterminate::before { content: "-"; }
-
-input[type="radio"]::before {
-  display: inline-block;
-  border: solid currentcolor 1px;
-  content: "";
-  padding: 0;
-  width: 1em;
-  height: 1em;
-  border-radius: 50%;
-  text-align: center;
-}
-
-input[type="radio"]:checked::before { content: "●"; line-height: 1em; }
-
-input[type="file"]::before {
-  content: "Choose File";
-  background: lightgrey;
-  border-top: solid 1px #EEEEEE;
-  border-left: solid 1px #CCCCCC;
-  border-right: solid 1px #999999;
-  border-bottom: solid 1px #999999;
-}
-
-input[type="file"] {
-  text-align: center;
-  color: black;
-  border-style: none;
-}
-
-select {
-  border-style: solid;
-  border-width: 1px;
-  background: white;
-}
-
-select[multiple]              { padding: 0em 0.25em; }
-select:not([multiple])        { padding: 0.25em 0.5em; border-radius: 6px; }
-
-select:not([multiple])::after {
-  content: "";
-  display: inline-block;
-  border-width: 5.2px 3px 0 3px;
-  border-style: solid;
-  border-color: currentcolor transparent transparent transparent;
-  margin-left: 0.5em;
-}
-
-select:not([multiple]) option           { display: none !important; }
-select:not([multiple]) option[selected] { display: inline !important; }
-select[multiple] option                 { display: block !important; }
-select[multiple] option[selected]       { background-color: grey; color: white; }
-select[multiple]:focus option[selected] { background-color: darkblue; }
-
-td[align="left"]    { text-align: left; }
-td[align="center"]  { text-align: center; }
-td[align="right"]   { text-align: right; }
-
-center { text-align: -moz-center; }
-
-label { cursor: default; }
-
-img {
-  overflow: clip !important;
-  overflow-clip-margin: 0 !important;
-}
-
-input:not([type=radio i]):not([type=checkbox i]):not([type=reset i]):not([type=button i]):not([type=submit i]) {
-  cursor: text;
-  overflow: hidden !important;
-  white-space: pre;
-}
-
-textarea {
-  cursor: text;
-  overflow: auto;
-}
-
-/* https://html.spec.whatwg.org/multipage/rendering.html#the-details-and-summary-elements */
-details {
-  display: block;
-}
-
-details::-servo-details-summary {
-  margin-left: 40px;
-  display: list-item;
-  list-style: disclosure-closed;
-}
-
-details[open]::-servo-details-summary {
-  list-style: disclosure-open;
-}
-
-*|*::-servo-details-content {
-  margin-left: 40px;
-  overflow: hidden;
-  display: block;
-}
-
-/*
- * Until servo supports svg properly, make sure to at least prevent svg
- * children from being layed out and rendered like usual html.
- * https://github.com/servo/servo/issues/10646
- */
-svg > * {
-  display: none;
-}
-
-/*
- * For most (but not all) anon-boxes, we inherit all values from the
- * parent.
- *
- * Anonymous table flows shouldn't inherit their parents properties in order
- * to avoid doubling up styles such as transformations. Same for text and such.
- *
- * For tables, we do want style to inherit, because TableWrapper is
- * responsible for handling clipping and scrolling, while Table is
- * responsible for creating stacking contexts.
- *
- * StackingContextCollectionFlags makes sure this is processed
- * properly.
- *
- * FIXME(emilio): inheriting all is a very strong hammer, and it's likely
- * broken for stuff like table backgrounds and such. Gecko explicitly inherits
- * what it wants, which seems a bit better off-hand.
- */
-*|*::-servo-legacy-anonymous-table,
-*|*::-servo-legacy-anonymous-table-wrapper,
-*|*::-servo-legacy-table-wrapper,
-*|*::-servo-legacy-anonymous-block,
-*|*::-servo-legacy-inline-block-wrapper,
-*|*::-servo-legacy-inline-absolute {
-    all: inherit;
-}
-
-*|*::-servo-anonymous-box {
-  unicode-bidi: inherit;
-  direction: inherit;
-  writing-mode: inherit;
-}
-
-/* style for text node. */
-*|*::-servo-legacy-text {
-    text-overflow: inherit;
-    overflow: inherit;
-}
-
-*|*::-servo-legacy-table-wrapper {
-    display: table;
-    border: none;
-}
-
-*|*::-servo-legacy-anonymous-table-wrapper {
-    position: static;
-    margin: 0;
-    counter-increment: none;
-
-    /* We don't want anonymous table parts to inherit hidden overflow, because
-     * they will create extra unnecessary ClipScrollNodes which also throws
-     * off assignment of contained flows. */
-    overflow: visible;
-}
-
-*|*::-servo-legacy-anonymous-table {
-    display: table;
-    position: static;
-    border: none;
-    padding: 0;
-    counter-increment: none;
-    overflow: visible;
-}
-
-*|*::-servo-anonymous-table {
-    display: table;
-}
-
-*|*::-servo-anonymous-table-row {
-    display: table-row;
-}
-
-*|*::-servo-anonymous-table-cell {
-    display: table-cell;
-}
-
-*|*::-servo-table-grid {
-  all: inherit;
-  margin: unset;
-  float: unset;
-  clear: unset;
-  position: unset;
-  z-index: unset;
-  page-break-before: unset;
-  page-break-after: unset;
-  page-break-inside: unset;
-  vertical-align: unset;
-  line-height: unset;
-  transform: unset;
-  transform-origin: unset;
-  backface-visibility: unset;
-  clip: unset;
-  transform-style: unset;
-  rotate: unset;
-  scale: unset;
-  translate: unset;
-  align-self: unset;
-  justify-self: unset;
-  grid-column-start: unset;
-  grid-column-end: unset;
-  grid-row-start: unset;
-  grid-row-end: unset;
-  order: unset;
-  outline: unset;
-  outline-offset: unset;
-  column-span: unset;
-  contain: unset;
-  container: unset;
-  scroll-margin: unset;
-
-  /* The grid needs to be block-level, so avoid inheriting `display: inline-table`. */
-  display: table;
-}
-
-*|*::-servo-legacy-anonymous-block {
-    display: block;
-    position: static;
-    border: none;
-    padding: 0;
-    margin: 0;
-    width: auto;
-    height: auto;
-}
-
-/* The outer fragment wrapper of an inline-block. */
-*|*::-servo-legacy-inline-block-wrapper {
-    position: static;
-    border: none;
-    padding: 0;
-    margin: 0;
-}
-
-/* The outer fragment wrapper of an inline absolute hypothetical fragment. */
-*|*::-servo-legacy-inline-absolute {
-    clip: auto;
-    border: none;
-    padding: 0;
-    margin: 0;
-}
-
-meter {
-  display: inline-block;
-  width: 100px;
-  height: 12px;
-  border-radius: 6px;
-  background: linear-gradient(#e6e6e6, #e6e6e6, #eeeeee 20%, #cccccc 45%, #cccccc 55%);
-  overflow: clip;
-}
-
-/* FIXME: These should use the ::-moz-meter-bar pseudo element */
-meter div {
-  height: 100%;
-}
-
-meter:-moz-meter-optimum div {
-  background: linear-gradient(#ad7, #ad7, #cea 20%, #7a3 45%, #7a3 55%);
-}
-meter:-moz-meter-sub-optimum div {
-  background: linear-gradient(#fe7, #fe7, #ffc 20%, #db3 45%, #db3 55%);
-}
-meter:-moz-meter-sub-sub-optimum div {
-  background: linear-gradient(#f77, #f77, #fcc 20%, #d44 45%, #d44 55%);
-}
-
-/* https://html.spec.whatwg.org/#the-details-and-summary-elements */
-details, summary {
-  display: block;
-}
-details > summary:first-of-type {
-  display: list-item;
-  counter-increment: list-item 0;
-  list-style: disclosure-closed inside;
-}
-details[open] > summary:first-of-type {
-  list-style-type: disclosure-open;
-}
-
-/* Styles for the <progress> element */
-progress {
-  display: inline-block;
-  width: 200px;
-  height: 6px;
-  border-radius: 3px;
-  border: 1px solid rgba(0, 0, 0, 0.5);
-}
-/* FIXME: This should use ::-moz-progress-bar */
-progress #-servo-progress-bar {
-  display: block;
-  height: 100%;
-  background-color: #7a3;
-}
diff --git a/resources/wpt-prefs.json b/resources/wpt-prefs.json
index 7e2259b4762..70e7ab1d269 100644
--- a/resources/wpt-prefs.json
+++ b/resources/wpt-prefs.json
@@ -1,4 +1,5 @@
 {
   "dom_webxr_test": true,
-  "gfx_text_antialiasing_enabled": false
+  "gfx_text_antialiasing_enabled": false,
+  "dom_testutils_enabled": true
 }
diff --git a/shell.nix b/shell.nix
index bec1eb3c621..74a5dd4511b 100644
--- a/shell.nix
+++ b/shell.nix
@@ -81,6 +81,7 @@ stdenv.mkDerivation (androidEnvironment // {
     llvmPackages.bintools # provides lld
 
     udev # Needed by libudev-sys for GamePad API.
+    wireshark-cli  # for `tshark` in etc/devtools_parser.py
 
     # Build utilities
     cmake dbus gcc git pkg-config which llvm perl yasm m4
diff --git a/tests/unit/style/custom_properties.rs b/tests/unit/style/custom_properties.rs
index 4556e930d02..b7c53535ea5 100644
--- a/tests/unit/style/custom_properties.rs
+++ b/tests/unit/style/custom_properties.rs
@@ -25,6 +25,7 @@ use style::stylesheets::layer_rule::LayerOrder;
 use style::stylist::Stylist;
 use style::values::computed::font::GenericFontFamily;
 use style::values::computed::{Context, Length};
+use style::values::specified::font::QueryFontMetricsFlags;
 use test::{self, Bencher};
 use url::Url;
 
@@ -37,8 +38,7 @@ impl FontMetricsProvider for DummyMetricsProvider {
         _vertical: bool,
         _font: &Font,
         _base_size: Length,
-        _in_media_query: bool,
-        _retrieve_math_scales: bool,
+        _flags: QueryFontMetricsFlags,
     ) -> FontMetrics {
         Default::default()
     }
diff --git a/tests/unit/style/stylist.rs b/tests/unit/style/stylist.rs
index 9fa422b2294..e5447968151 100644
--- a/tests/unit/style/stylist.rs
+++ b/tests/unit/style/stylist.rs
@@ -26,6 +26,7 @@ use style::stylist::{
 use style::thread_state::{self, ThreadState};
 use style::values::computed::Length;
 use style::values::computed::font::GenericFontFamily;
+use style::values::specified::font::QueryFontMetricsFlags;
 use stylo_atoms::Atom;
 use url::Url;
 
@@ -38,8 +39,7 @@ impl FontMetricsProvider for DummyMetricsProvider {
         _vertical: bool,
         _font: &Font,
         _base_size: Length,
-        _in_media_query: bool,
-        _retrieve_math_scales: bool,
+        _flags: QueryFontMetricsFlags,
     ) -> FontMetrics {
         Default::default()
     }
diff --git a/tests/wpt/include.ini b/tests/wpt/include.ini
index b8eef057dbc..8ea1e50b8d0 100644
--- a/tests/wpt/include.ini
+++ b/tests/wpt/include.ini
@@ -12,10 +12,9 @@ skip: true
   [samesite]
     skip: true
 [content-security-policy]
-  [unsafe-eval]
-    skip: false
-  [wasm-unsafe-eval]
-    skip: false
+  skip: false
+  [embedded-enforcement]
+    skip: true
 [cors]
   skip: false
 [css]
@@ -68,7 +67,7 @@ skip: true
   [css-multicol]
     skip: true
   [css-nesting]
-    skip: true
+    skip: false
   [css-overscroll-behavior]
     skip: true
   [css-page]
@@ -107,8 +106,6 @@ skip: true
     skip: true
   [css-text]
     skip: false
-    [i18n]
-      skip: true
   [css-typed-om]
     skip: true
   [css-view-transitions]
@@ -163,14 +160,6 @@ skip: true
         skip: true
   [semantics]
     skip: false
-    [document-metadata]
-      skip: false
-      [the-meta-element]
-        skip: false
-        [pragma-directives]
-          skip: false
-          [attr-meta-http-equiv-refresh]
-            skip: true
     [embedded-content]
       skip: false
       [media-elements]
@@ -204,9 +193,7 @@ skip: true
 [notifications]
   skip: false
 [old-tests]
-  skip: true
-  [submission]
-    skip: true
+  skip: false
 [page-visibility]
   skip: false
 [performance-timeline]
@@ -237,6 +224,8 @@ skip: true
   skip: false
 [selection]
   skip: false
+[service-workers]
+  skip: false
 [shadow-dom]
   skip: false
 [streams]
@@ -247,12 +236,34 @@ skip: true
     skip: false
   [readable-byte-streams]
     skip: false
+  [transferable]
+    skip: false
+    [service-worker.https.html]
+      skip: true
+    [shared-worker.html]
+      skip: true
+    [transform-stream-members.any.shadowrealm-in-dedicatedworker.html]
+      skip: true
+    [transform-stream-members.any.shadowrealm-in-shadowrealm.html]
+      skip: true
+    [transform-stream-members.any.shadowrealm-in-sharedworker.html]
+      skip: true
+    [transform-stream-members.any.shadowrealm-in-window.html]
+      skip: true
+    [transform-stream-members.https.any.shadowrealm-in-audioworklet.html]
+      skip: true
+    [transform-stream-members.https.any.shadowrealm-in-serviceworker.html]
+      skip: true
   [writable-streams]
     skip: false
+  [transform-streams]
+    skip: false
 [subresource-integrity]
   skip: false
 [touch-events]
   skip: false
+[trusted-types]
+  skip: false
 [uievents]
   skip: false
 [upgrade-insecure-requests]
@@ -266,13 +277,29 @@ skip: true
 [wasm]
   skip: false
 [webaudio]
-  skip: true
+  skip: false
 [WebCryptoAPI]
   skip: false
+[webdriver]
+  skip: false
+  [tests]
+    skip: false
+    [bidi]
+      skip: true
+    [classic]
+      skip: true
+    [interop]
+      skip: true
 [webgl]
   skip: false
 [webidl]
   skip: false
+[webmessaging]
+  skip: false
+[websockets]
+  skip: false
+[webstorage]
+  skip: false
 [webvr]
   skip: false
 [webvtt]
@@ -283,12 +310,6 @@ skip: true
   skip: false
   [dom-overlay]
     skip: true
-[webmessaging]
-  skip: false
-[websockets]
-  skip: false
-[webstorage]
-  skip: false
 [workers]
   skip: false
   [modules]
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.nested.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.nested.html.ini
deleted file mode 100644
index 5d0bc4fed5a..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.nested.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.layer.nested.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.ctx-filter.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.ctx-filter.html.ini
deleted file mode 100644
index d62728c4e39..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.ctx-filter.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.ctx-filter.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.layer-filter.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.layer-filter.tentative.html.ini
deleted file mode 100644
index 3194f2c628e..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.layer-filter.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.layer-filter.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.ctx-filter.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.ctx-filter.html.ini
deleted file mode 100644
index 2081a100db5..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.ctx-filter.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.ctx-filter.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.layer-filter.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.layer-filter.tentative.html.ini
deleted file mode 100644
index 95c1d08d9a0..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.layer-filter.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.layer-filter.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.nested.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.nested.html.ini
deleted file mode 100644
index 5d0bc4fed5a..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.nested.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.layer.nested.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.ctx-filter.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.ctx-filter.html.ini
deleted file mode 100644
index d62728c4e39..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.ctx-filter.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.ctx-filter.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.layer-filter.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.layer-filter.tentative.html.ini
deleted file mode 100644
index 3194f2c628e..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.layer-filter.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.layer-filter.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.ctx-filter.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.ctx-filter.html.ini
deleted file mode 100644
index 2081a100db5..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.ctx-filter.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.ctx-filter.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.layer-filter.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.layer-filter.tentative.html.ini
deleted file mode 100644
index 95c1d08d9a0..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.layer-filter.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.layer-filter.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/FileAPI/file/File-constructor.any.js.ini b/tests/wpt/meta/FileAPI/file/File-constructor.any.js.ini
deleted file mode 100644
index 1c83950aa88..00000000000
--- a/tests/wpt/meta/FileAPI/file/File-constructor.any.js.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[File-constructor.any.html]
-  [No replacement when using special character in fileName]
-    expected: FAIL
-
-
-[File-constructor.any.worker.html]
-  [No replacement when using special character in fileName]
-    expected: FAIL
diff --git a/tests/wpt/meta/FileAPI/url/url-with-fetch.any.js.ini b/tests/wpt/meta/FileAPI/url/url-with-fetch.any.js.ini
index 5f4566bad57..292dc852b9f 100644
--- a/tests/wpt/meta/FileAPI/url/url-with-fetch.any.js.ini
+++ b/tests/wpt/meta/FileAPI/url/url-with-fetch.any.js.ini
@@ -5,9 +5,6 @@
   [Revoke blob URL after creating Request, then clone Request, will fetch]
     expected: FAIL
 
-  [Revoke blob URL after calling fetch, fetch should succeed]
-    expected: FAIL
-
 
 [url-with-fetch.any.worker.html]
   [Revoke blob URL after creating Request, will fetch]
@@ -15,6 +12,3 @@
 
   [Revoke blob URL after creating Request, then clone Request, will fetch]
     expected: FAIL
-
-  [Revoke blob URL after calling fetch, fetch should succeed]
-    expected: FAIL
diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json
index 522021d0a9c..c847669c619 100644
--- a/tests/wpt/meta/MANIFEST.json
+++ b/tests/wpt/meta/MANIFEST.json
@@ -410,11 +410,13 @@
    },
    "ai": {
     "language_detection": {
-     "availability-detached-crash.tentative.https.html": [
-      "8dd685d990ad0c2e2524ab134da7284dbe79d010",
+     "availability-detached-crash.https.html": [
+      "ee5e27e35b60e89f17f8008d809f4d6040e4eb5b",
       [
        null,
-       {}
+       {
+        "testdriver": true
+       }
       ]
      ]
     }
@@ -596,6 +598,20 @@
        {}
       ]
      ],
+     "root-element-background-contain-hidden-crash.html": [
+      "da07de5bf5126d4d951f2522315991807eb09fcc",
+      [
+       null,
+       {}
+      ]
+     ],
+     "root-element-background-image-opaque-crash.html": [
+      "d380310d0968c3ad63eb6adc52acd929b3b43b14",
+      [
+       null,
+       {}
+      ]
+     ],
      "root-element-filter-background-clip-text-crash.html": [
       "e12e4bb80f40e09e189f7f239486be246ea67ade",
       [
@@ -612,6 +628,13 @@
        {}
       ]
      ],
+     "anchor-display-none-crash.html": [
+      "bf513e391473d788fd2e06de7a2088e1d13939a1",
+      [
+       null,
+       {}
+      ]
+     ],
      "anchor-fallback-to-self-crash.html": [
       "c5a8165d11322901546f30f948041ca96cf43639",
       [
@@ -737,6 +760,13 @@
        null,
        {}
       ]
+     ],
+     "viewport-overflow-hidden-invisible-anchor-crash.html": [
+      "b2fa5255b5e891b983944c76e741e9cc291ca30c",
+      [
+       null,
+       {}
+      ]
      ]
     },
     "css-animations": {
@@ -762,6 +792,27 @@
         {}
        ]
       ],
+      "chrome-bug-404743651.html": [
+       "238862374028415bb2ddb91de5f9a16132ec654d",
+       [
+        null,
+        {}
+       ]
+      ],
+      "chrome-bug-405795970.html": [
+       "5b45527fd9ccb2038fdd3f459bcf10a9514f199c",
+       [
+        null,
+        {}
+       ]
+      ],
+      "chrome-bug-415627003.html": [
+       "af942fbcc9701955f3778dc2e57521d10bb1ce41",
+       [
+        null,
+        {}
+       ]
+      ],
       "pseudo-element-animation-with-marker.html": [
        "ba7fc2371abfdc463f8ed36e6f1bb39fb9ef6ef5",
        [
@@ -1326,6 +1377,13 @@
        {}
       ]
      ],
+     "nested-fixedpos-in-inline-003-crash.html": [
+      "88a042884644feff5eac8a367fbdc36326d2d4ef",
+      [
+       null,
+       {}
+      ]
+     ],
      "nested-float-in-multicol-crash.html": [
       "6878d384e54b0f3262cbbfb0552b9d19e707140d",
       [
@@ -2091,6 +2149,13 @@
         null,
         {}
        ]
+      ],
+      "position-sticky-crash.html": [
+       "aebebbdc7ac35aca48bde4c2bb203bb8a17e4ef8",
+       [
+        null,
+        {}
+       ]
       ]
      }
     },
@@ -2496,6 +2561,15 @@
       ]
      ]
     },
+    "css-easing": {
+     "linear-timing-functions-chrome-406926307-crash.html": [
+      "32d48dca76b78d2b08546322d01ac9315705195c",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "css-flexbox": {
      "animation": {
       "flex-basis-content-crash.html": [
@@ -2741,6 +2815,13 @@
     },
     "css-grid": {
      "abspos": {
+      "abspos-in-flexbox-in-grid-crash.html": [
+       "a2f71fb78e7f6fd82ea539e3af6c76d36f21e134",
+       [
+        null,
+        {}
+       ]
+      ],
       "positioned-grid-items-crash.html": [
        "228a6264df77fe82587a4116f231ff09537c8372",
        [
@@ -2756,6 +2837,13 @@
        {}
       ]
      ],
+     "firefox-bug-1958131-crash.html": [
+      "6cfb2069f4d9e3d2aa1f993055b3bbd5bbdbaa05",
+      [
+       null,
+       {}
+      ]
+     ],
      "grid-definition": {
       "grid-add-item-with-positioned-items-crash.html": [
        "7b2ed99f223ed4333c265f242b3f043afd9232b6",
@@ -4169,6 +4257,13 @@
         {}
        ]
       ],
+      "line-clamp-auto-002-crash.html": [
+       "be5693c70456bd664dd219d6985067400a26084e",
+       [
+        null,
+        {}
+       ]
+      ],
       "webkit-line-clamp-041-crash.html": [
        "3f4bf3c8ef578fa22469e81e504879aa5d713bf8",
        [
@@ -4240,6 +4335,15 @@
        {}
       ]
      ],
+     "scroll-marker-activation-crash.html": [
+      "1f2360a1943fb470914ec1e2e106ebf14b14ef37",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "scroll-marker-dynamic-crash.html": [
       "22c5b7d2299b8ebef349b393da82a88e224fbff9",
       [
@@ -4306,6 +4410,20 @@
     },
     "css-page": {
      "crashtests": {
+      "counter-containment-001.html": [
+       "2672bfffb5b6736259615215d77ee8603d17b6ba",
+       [
+        null,
+        {}
+       ]
+      ],
+      "counter-containment-002.html": [
+       "04b4710ab28a2e01ea3765123dc0639f438e11e9",
+       [
+        null,
+        {}
+       ]
+      ],
       "match-media-listener-relayout-contained-inline-subtree-print.html": [
        "634cf5f4f5836ba9671312f1b761ba312ef4fb22",
        [
@@ -4321,7 +4439,7 @@
        ]
       ],
       "match-media-listener-relayout-inside-fixed-size-overflow-hidden-print.html": [
-       "77f9dc335fd9bdf21865e70ece214917bbcf904a",
+       "c749535875aa7c01bed745414789c7aa745b1e38",
        [
         null,
         {}
@@ -4657,6 +4775,13 @@
        null,
        {}
       ]
+     ],
+     "ruby-inlinize-fieldset-crash.html": [
+      "09ad1821bad53ec5f176bfdfe69d1e8649fd146e",
+      [
+       null,
+       {}
+      ]
      ]
     },
     "css-scoping": {
@@ -4683,6 +4808,13 @@
        {}
       ]
      ],
+     "table-col-and-dead-row-group-crash.html": [
+      "e6e90a63a345fe2bb9499b729d2cf2df6ed65d9d",
+      [
+       null,
+       {}
+      ]
+     ],
      "table-collapsed-borders-crash.html": [
       "aa699317e2734fece3d662ad102fdd2772680e25",
       [
@@ -4749,7 +4881,14 @@
         ]
        }
       }
-     }
+     },
+     "shape-outside-infinite-crash.html": [
+      "b2dfd4fad51062f0b280771ebcf60a246f551765",
+      [
+       null,
+       {}
+      ]
+     ]
     },
     "css-sizing": {
      "aspect-ratio": {
@@ -4812,6 +4951,13 @@
        {}
       ]
      ],
+     "colspan-zero-crash.html": [
+      "a50586a5bfa7551724b838a0438339a34b4930fb",
+      [
+       null,
+       {}
+      ]
+     ],
      "crashtests": {
       "caption-repaint-crash.html": [
        "6a024d0c1d7ef58da06a489d80d187bcb2a3e350",
@@ -4827,6 +4973,13 @@
         {}
        ]
       ],
+      "cell-contents-with-negative-outer-size.html": [
+       "c9cd275ad9e07fa33fa4c8ac363b891562628614",
+       [
+        null,
+        {}
+       ]
+      ],
       "col_span_dynamic_crash.html": [
        "67630066fad440e64f901512622cbaabdc4af370",
        [
@@ -5250,6 +5403,13 @@
         {}
        ]
       ],
+      "text-decoration-animation-crash.html": [
+       "a20f166c427159f87daf082ae19e384f96f10939",
+       [
+        null,
+        {}
+       ]
+      ],
       "text-decoration-first-line-multi-crash.html": [
        "f6176334ad6e6ef2662a8f89785f601f48a762cf",
        [
@@ -5571,7 +5731,23 @@
        {}
       ]
      ],
+     "calc-size": {
+      "calc-size-svg-001-crash.html": [
+       "ec1e09a4315ea515fc1d9c593a5e8041110fd615",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
      "crashtests": {
+      "chrome-405422528-crash.html": [
+       "fcf7407b5f754aa236ddd053f67fb3a15fc6e1d9",
+       [
+        null,
+        {}
+       ]
+      ],
       "viewport-unit-inline-style-crash.html": [
        "4c38e18781bfdbcddce02c1cc5cd3336a7529e85",
        [
@@ -5711,10 +5887,42 @@
        null,
        {}
       ]
-     ]
+     ],
+     "root-preserve3d-crash.html": [
+      "1123280187506b326adc9378465bfc560af4415e",
+      [
+       null,
+       {}
+      ]
+     ],
+     "root-replace-crash.html": [
+      "165eec41b6bc56db131cc7fc19f23701bc291b8c",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scoped": {
+      "crashtests": {
+       "shadow-dom.html": [
+        "a2faafc1694e15f5c513655e57e320325bd4f45a",
+        [
+         null,
+         {}
+        ]
+       ]
+      }
+     }
     },
     "css-viewport": {
      "zoom": {
+      "iframe-very-small-zoom-001-crash.html": [
+       "05369040456e06a0ab9769edefbe19aec6b77a93",
+       [
+        null,
+        {}
+       ]
+      ],
       "perspective-small-effective-zoom-crash.html": [
        "ab6f563d19ee8a826cf2ff9d0f04d105c7ba8d96",
        [
@@ -5742,6 +5950,13 @@
         null,
         {}
        ]
+      ],
+      "zoom-revert-layer-crash.html": [
+       "c75b792e6de78a27a4c5961a0efcbf7593f02eb7",
+       [
+        null,
+        {}
+       ]
       ]
      }
     },
@@ -5945,6 +6160,13 @@
        {}
       ]
      ],
+     "backdrop-filter-transform-popover-crash.html": [
+      "582f0c119656020aaa5167b0547cfbde20d11b95",
+      [
+       null,
+       {}
+      ]
+     ],
      "crashtests": {
       "broken-reference-crash-001.html": [
        "6e18e06c317e329a58b2b5132cf17dc6086d444f",
@@ -6301,6 +6523,15 @@
       ]
      ]
     },
+    "ranges": {
+     "Range-compareBoundaryPoints-crash.html": [
+      "673eeb6182844b5097d6edb0699a7b480c50b404",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "svg-insert-crash.html": [
      "80eec1fba7ddc50db35fa53f7f4e72b59e6e31c7",
      [
@@ -6737,6 +6968,13 @@
        {}
       ]
      ],
+     "inserthorizontalrule-to-replace-selection-containing-comment.html": [
+      "5db139351cd1908e0483059f476717af11571edf",
+      [
+       null,
+       {}
+      ]
+     ],
      "inserthorizontalrule-with-2-selection-ranges-and-one-is-outside-body.html": [
       "d248c333d940fff01e2c2f183f5717970a89b61e",
       [
@@ -7304,6 +7542,15 @@
      }
     }
    },
+   "focus": {
+    "focus-element-crash.html": [
+     "27df1c0b13081827685fa96e0cba2f7b9b03c89a",
+     [
+      null,
+      {}
+     ]
+    ]
+   },
    "fullscreen": {
     "crashtests": {
      "backdrop-list-item.html": [
@@ -7660,6 +7907,13 @@
          {}
         ]
        ],
+       "iframe-hit-test-during-load-event-crash.html": [
+        "f668fc51573647e633fc3ac6430735d6fb4dfea7",
+        [
+         null,
+         {}
+        ]
+       ],
        "iframe-loading-lazy-simple-crash.html": [
         "b0b251438f73811ce2ec4d82fe47ffb3a2445c93",
         [
@@ -7779,6 +8033,13 @@
          {}
         ]
        ],
+       "form-controls-id-removal-crash.html": [
+        "2b1ef87774fc1c5393129fca8e65147c379ea7a9",
+        [
+         null,
+         {}
+        ]
+       ],
        "form-controls-nested-id-crash.html": [
         "ed6c7e6e2b961fd1cc2699da9e8e29f04ce2718c",
         [
@@ -8056,6 +8317,27 @@
          {}
         ]
        ],
+       "dialog-requestclose-2-crash.html": [
+        "a6ddac7e09cbd9d98d21ae75306704a9405f1363",
+        [
+         null,
+         {}
+        ]
+       ],
+       "dialog-requestclose-3-crash.html": [
+        "121e86455972ddf97befa00c58d0825321b7ad93",
+        [
+         null,
+         {}
+        ]
+       ],
+       "dialog-requestclose-4-crash.html": [
+        "a6b0268cb908ffe3589fca420a18d6454ddc1767",
+        [
+         null,
+         {}
+        ]
+       ],
        "dialog-requestclose-crash.html": [
         "c4c4850a2d3c66c189c1e81810a856f5b6c86ff2",
         [
@@ -9123,7 +9405,7 @@
     }
    },
    "mediacapture-image": {
-    "ImageCapture-grabFrame-crash.html": [
+    "ImageCapture-grabFrame-crash.https.html": [
      "d4bf57f0fa9f851db48cf47a78ef62f86e2942fb",
      [
       null,
@@ -9163,6 +9445,13 @@
     }
    },
    "quirks": {
+    "body-fill-html-quirk-intrinsic-crash.html": [
+     "aadb6037f34675d8a5b401c03af417f232d08f98",
+     [
+      null,
+      {}
+     ]
+    ],
     "crashtests": {
      "list-item-whole-line-quirks-crash.html": [
       "b91b09db0e37727e2d3a3e13ca2c7cae25b8d761",
@@ -9694,6 +9983,13 @@
      ]
     },
     "styling": {
+     "cx-sibling-index-crash.html": [
+      "9fe97b12d774a547a2cb3bf65f9a9ad8f1af8a58",
+      [
+       null,
+       {}
+      ]
+     ],
      "font-size-number-calc-crash.svg": [
       "6b56d9df2b426e2376f87668a98f5e21ee56e37b",
       [
@@ -9856,6 +10152,13 @@
        null,
        {}
       ]
+     ],
+     "sibling-index-offset-crash.html": [
+      "812a7952738231f4c1bc2bf22c0d87f9a39c86cd",
+      [
+       null,
+       {}
+      ]
      ]
     },
     "interfaces": {
@@ -10109,7 +10412,7 @@
       ]
      ],
      "description_test_case_557-manual.html": [
-      "1294baf65718f218bac19406e5f6909c0193a7e8",
+      "e228f857ac446f7850dfb05f61614a7dbd4ea0bd",
       [
        null,
        {}
@@ -15533,7 +15836,7 @@
        ]
       ],
       "c414-flt-ln-002.xht": [
-       "99965439661169fd554c4ffa5f0bfa49e29f4c5f",
+       "ef5448c489331320ee2d3d20832e9d623180b73e",
        [
         null,
         {}
@@ -25605,7 +25908,7 @@
        ]
       ],
       "fcTL-delay-zero-num-manual.html": [
-       "561d01e4db409cadb239fd3d4f0a062f181c1744",
+       "130500d24dbaec44be250dab3a52918a24edac0c",
        [
         null,
         {}
@@ -27415,7 +27718,7 @@
       ]
      ],
      "interact-dom-01-b-manual.svg": [
-      "32cf2f546c730f81362ff705e44b28fe3846c8aa",
+      "a16c25450338d068baf8076936d9e3a903b91ac4",
       [
        null,
        {}
@@ -32399,7 +32702,7 @@
     },
     "css-anchor-position": {
      "anchor-position-005-print.html": [
-      "eeae841405a774cfa77012b7f01b304ea8c89632",
+      "98c663e3918a8a264325e526db39b9d8d4aa4bb6",
       [
        null,
        [
@@ -32440,7 +32743,7 @@
       ]
      ],
      "block-001-wm-vlr-print.html": [
-      "6cd5ea07c7b2a132cef7d26abd4204cb157b5eae",
+      "bfb48428dd537bf1c969332baffd48739dc5b7e1",
       [
        null,
        [
@@ -32469,7 +32772,7 @@
       ]
      ],
      "block-001-wm-vrl-print.html": [
-      "6e073121c6acf3b7c5b381e230365fcf4b7e6d56",
+      "60ee504dd7722278cf13386aaf16030d0f657aa1",
       [
        null,
        [
@@ -32498,7 +32801,7 @@
       ]
      ],
      "block-002-wm-vlr-print.html": [
-      "99949623c3923e529687e75ee18e849bfc852180",
+      "d427242dc4027774421b22247033bdba06ea35a9",
       [
        null,
        [
@@ -32527,7 +32830,7 @@
       ]
      ],
      "block-002-wm-vrl-print.html": [
-      "084b5325b7ac40ee5b81f22cd542e5b3f5c16b57",
+      "0ca2b73012fa8ebe133b0cf0f91eeac290c37da3",
       [
        null,
        [
@@ -32556,7 +32859,7 @@
       ]
      ],
      "break-inside-avoid-multicol-001-print.html": [
-      "a97ac9f5cdad2d191588dbdc6a2de80607a00a43",
+      "0398110fe3d2e83b8aa7ac835e04603490d5dd27",
       [
        null,
        [
@@ -32582,7 +32885,7 @@
       ]
      ],
      "break-nested-float-in-table-001-print.html": [
-      "e4e0a578e9a6c6d763fcb9e80d6ff8b91561f3e5",
+      "320f28687a73463ba4c99e9ffece97a44244bdf1",
       [
        null,
        [
@@ -32596,7 +32899,7 @@
      ],
      "flexbox": {
       "multi-line-row-flex-fragmentation-063-print.html": [
-       "1225792abac5a223be7c98cb298e979c1ceda3d7",
+       "aa83978be20a9360c7699e82bb138842392be3cb",
        [
         null,
         [
@@ -32609,7 +32912,7 @@
        ]
       ],
       "multi-line-row-flex-fragmentation-064-print.html": [
-       "969c3a3010bc92631a77c356ff199937a1f4e19f",
+       "67f52d85d64d1763d4216bdd516b252a27cdc846",
        [
         null,
         [
@@ -32622,7 +32925,7 @@
        ]
       ],
       "multi-line-row-flex-fragmentation-075-print.html": [
-       "f1f3c79377b4a6315bab6c4903bd064c11af7819",
+       "92ecefb3f47fb3edfb9c6a82af6d86ccda8ae7d9",
        [
         null,
         [
@@ -32635,7 +32938,7 @@
        ]
       ],
       "multi-line-row-flex-fragmentation-076-print.html": [
-       "a6caab736b52b1909c852ffe9f335a2695101dab",
+       "74c74262445075de3fe522b5ed93aff7b91c6e69",
        [
         null,
         [
@@ -32648,7 +32951,7 @@
        ]
       ],
       "multi-line-row-flex-fragmentation-080-print.html": [
-       "4fd577cc4213aab38e4e4d2cfcc05fee0ae7aada",
+       "31fd4a25113c52c809c7db80d007bed9c1ffa9c6",
        [
         null,
         [
@@ -32765,7 +33068,7 @@
        ]
       ],
       "single-line-column-flex-fragmentation-060-print.html": [
-       "15890801979709a152f580ad8f18d6af7e102b61",
+       "ea1f2d690e142694a00e23fdce6054fd29d4f4c9",
        [
         null,
         [
@@ -32778,7 +33081,7 @@
        ]
       ],
       "single-line-column-flex-fragmentation-065-print.html": [
-       "14a5dc6ac0ca62134f9ca87afefe66235ba25514",
+       "99997a6e4e98cd9f54466e566b95e11d3d86151d",
        [
         null,
         [
@@ -32908,7 +33211,7 @@
        ]
       ],
       "single-line-row-flex-fragmentation-042-print.html": [
-       "f8a2934ac5a9d9a9f2b67867545dd37486cae38a",
+       "6762604e534629a531a8a7c5e61f2de67424ae13",
        [
         null,
         [
@@ -32921,7 +33224,7 @@
        ]
       ],
       "single-line-row-flex-fragmentation-045-print.html": [
-       "f51d0d161f8f1f72d2ea5a0c303ce1969cbd26d5",
+       "c6da1a7e4e0669fa0f0f4cfac8b36c228f418724",
        [
         null,
         [
@@ -32948,7 +33251,7 @@
       ]
      },
      "float-with-large-margin-bottom-cross-page-001-print.html": [
-      "cd1026faf6491703b23aca67678911a8f1f2b17c",
+      "94517e917ca4078f4412ed7812e0d6c75ef3ae67",
       [
        null,
        [
@@ -32961,7 +33264,7 @@
       ]
      ],
      "float-with-large-margin-bottom-cross-page-002-print.html": [
-      "e2c6b7711aefed9560f620a1cc3913469ab72342",
+      "9692dde778d9dba81007cf03e329792b410abcc9",
       [
        null,
        [
@@ -32975,7 +33278,7 @@
      ],
      "grid": {
       "monolithic-overflow-print.html": [
-       "9b174caf96cb69c201115910fe746bd74153017b",
+       "11ce95a34e74cd95d9bb74ad039fa5109383d202",
        [
         null,
         [
@@ -32989,7 +33292,7 @@
       ]
      },
      "ink-overflow-001-print.html": [
-      "495153d3d423b014aa40aeed87ea0a899edce1f5",
+      "7d7e8518999b9c9dc99a7b09f0d44badbc2387b0",
       [
        null,
        [
@@ -33040,6 +33343,19 @@
        {}
       ]
      ],
+     "root-margin-001-print.html": [
+      "b2ec34fe0799d7cab5ac4dacb237780b6f7503e0",
+      [
+       null,
+       [
+        [
+         "/css/css-break/root-margin-001-print-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "table": {
       "repeated-section": {
        "fixedpos-in-footer-forced-break-print.html": [
@@ -33057,7 +33373,7 @@
        ]
       },
       "table-fragmentation-001a-print.html": [
-       "4f2123b6487cb81d8bc42e4654b35dc136c1a1c3",
+       "c7300590ff160535f0d91ac0af9ff49c95dfa0c0",
        [
         null,
         [
@@ -33070,7 +33386,7 @@
        ]
       ],
       "table-fragmentation-001b-print.html": [
-       "d445206a2b8df031bd2f9a7d78d1f6874ac86913",
+       "193a222f0392cbcfe3aa670da24e910be91f4641",
        [
         null,
         [
@@ -33083,7 +33399,7 @@
        ]
       ],
       "table-fragmentation-001c-print.html": [
-       "4615270c4000db50d56c1c95d6a2610e887212fb",
+       "1bf8c68ff78f1bc62fc8e50259e9d8efaa29d696",
        [
         null,
         [
@@ -33096,7 +33412,7 @@
        ]
       ],
       "table-fragmentation-001d-print.html": [
-       "ad120c24818b6134a6d7fdac79cb14889697c186",
+       "27c07c87818762a8d3b9bad20c275a131bcda44b",
        [
         null,
         [
@@ -33109,7 +33425,7 @@
        ]
       ],
       "table-fragmentation-002a-print.html": [
-       "88ea8cd6977577d49ebba689ca88835c8933f19f",
+       "f7e0d4b612b01d516f0b1b6c985328cc0742b1e3",
        [
         null,
         [
@@ -33122,7 +33438,7 @@
        ]
       ],
       "table-fragmentation-002b-print.html": [
-       "97e102e3cd725e5e1eaa6f35d6361557f49a5e45",
+       "a483e72a2b8f6b42adb33f7b14c4e5435a877c40",
        [
         null,
         [
@@ -33135,7 +33451,7 @@
        ]
       ],
       "table-fragmentation-002c-print.html": [
-       "29fccdef999087aa88d429e6cc0351cf4471f9ad",
+       "183a0f7e9a555a8050df1382f28116d4be28bdf9",
        [
         null,
         [
@@ -33148,7 +33464,7 @@
        ]
       ],
       "table-fragmentation-002d-print.html": [
-       "67aa7624b76e2fddb1e406178ac91c6f0128f7ae",
+       "66b870333f61708b03d0c2e07ce387d4b7e682d9",
        [
         null,
         [
@@ -33161,7 +33477,7 @@
        ]
       ],
       "table-fragmentation-003a-print.html": [
-       "c6190855b01b7a2e71e7cec577739654e930348d",
+       "e2451f8bab9c914a350f8da25d0983e1a96a9359",
        [
         null,
         [
@@ -33174,7 +33490,7 @@
        ]
       ],
       "table-fragmentation-003b-print.html": [
-       "a1d3b21298e594d0dd14bd74b74a7319b9fd3c7c",
+       "451c7c815029a4c5429e2a26c0b80570ab703ee9",
        [
         null,
         [
@@ -33187,7 +33503,7 @@
        ]
       ],
       "table-fragmentation-003c-print.html": [
-       "9c4f8d3873af50c72292ba9428f4afe455db20fb",
+       "d907f904d602fc8c0b14eb2d995a5329914f87e4",
        [
         null,
         [
@@ -33200,7 +33516,7 @@
        ]
       ],
       "table-fragmentation-003d-print.html": [
-       "1903a68c58d4d5cc58ba2bec19154114bccd2e5e",
+       "009ea5a97e836871414f8f6e793a481b2258f9ab",
        [
         null,
         [
@@ -33227,7 +33543,7 @@
       ]
      ],
      "transform-023-print.html": [
-      "7650571abe1825fb191d7219fdd6d17acc081940",
+      "53abb1939bbf844642742d11a8d179a79f765972",
       [
        null,
        [
@@ -33240,7 +33556,7 @@
       ]
      ],
      "transform-024-print.html": [
-      "510b4c2e44f1987f3e260854635e21e346897e98",
+      "22b6cd1207574bc50fef0e29a99d28fa80bd38b7",
       [
        null,
        [
@@ -33324,7 +33640,7 @@
     },
     "css-flexbox": {
      "break-nested-float-in-flex-item-001-print.html": [
-      "2fbf939f6a54c9056b4bd39fe0466f0df25f0bb0",
+      "297967714517420dfef6df5ebec893e2349d5907",
       [
        null,
        [
@@ -33337,7 +33653,7 @@
       ]
      ],
      "break-nested-float-in-flex-item-002-print.html": [
-      "cc6037a87132d343e8ecfc6d633685a76ea92e15",
+      "06daebec2895ac1a6eb9a1f152fb1c6ad8dd9217",
       [
        null,
        [
@@ -33393,7 +33709,7 @@
     },
     "css-grid": {
      "grid-fragmentation-between-rows-001-print.tentative.html": [
-      "01fd97528fc5f470400b569f6169799d143d8259",
+      "af345718e6e3fce6dc307e17cb38241bec66254a",
       [
        null,
        [
@@ -33409,7 +33725,7 @@
     "css-inline": {
      "text-box-trim": {
       "not-at-page-edges-001-print.html": [
-       "c565ac7cc8695d2e56ce7fee49b7a482a20908d4",
+       "3fc6c24bf54e6223a412672217ecc183aad39e98",
        [
         null,
         [
@@ -33422,7 +33738,7 @@
        ]
       ],
       "not-at-page-edges-002-print.html": [
-       "50a370dbee2a0c38007c11d2c4c1f508dca336bf",
+       "b58c0db64b044c8db8ab152306de1679c2531eaa",
        [
         null,
         [
@@ -33435,7 +33751,7 @@
        ]
       ],
       "not-at-page-edges-003-print.html": [
-       "9707412fa7d76ef1067e52a4a930a2a94240f32a",
+       "ac5ffc3261783b78bb15237ae73b4d63af1e0d5d",
        [
         null,
         [
@@ -33477,7 +33793,7 @@
       ]
      ],
      "column-balancing-paged-001-print.html": [
-      "933519ab5b01ded09f1173c9e45a1692a65daa99",
+      "1d6f6e87f02f7ef341f46a36e537ea47f388e7d5",
       [
        null,
        [
@@ -33505,7 +33821,7 @@
     },
     "css-page": {
      "background-image-only-for-print.html": [
-      "f100f7eaeed55c5707e0918c01884cab6789a686",
+      "cb931a993020bb02593ea85cde2a84333514f63f",
       [
        null,
        [
@@ -33518,7 +33834,7 @@
       ]
      ],
      "basic-pagination-001-print.html": [
-      "4bdf2ac6fdbca53e19769f1ccb6cba5f829fb4c0",
+      "93293ff4879cac0f8d88868f1f7d20c1fb95d723",
       [
        null,
        [
@@ -33531,7 +33847,7 @@
       ]
      ],
      "basic-pagination-002-print.html": [
-      "4cf0de750daedc6695cc9a0e9cb291c3db67f8e7",
+      "f2d07730e1c55c6522052d76ea96f24989062902",
       [
        null,
        [
@@ -33544,7 +33860,7 @@
       ]
      ],
      "basic-pagination-003-print.html": [
-      "56f10d2dc72224f964dad96d526c133d39e549f8",
+      "6a133059f99c46b58f013ab552a4b4503dc2a3c5",
       [
        null,
        [
@@ -33557,7 +33873,7 @@
       ]
      ],
      "basic-pagination-004-print.html": [
-      "0d6f989b185b8d8ade7f1b8c3a03a45ce0787015",
+      "15e0a7eaf066d44239cac2a3ab1349816346d60a",
       [
        null,
        [
@@ -33570,7 +33886,7 @@
       ]
      ],
      "basic-pagination-005-print.html": [
-      "03c04a41c4d423bb005d833435c9055219445836",
+      "1429f05f464a5996f8ffc1ca3b69b66839e15f2f",
       [
        null,
        [
@@ -33583,7 +33899,7 @@
       ]
      ],
      "body-background-slr-print.html": [
-      "d7c1e91db7ce1de876e86498f93a23a0000c2a4b",
+      "a99ea9e26bf856a186f7bad0329338ba763e039e",
       [
        null,
        [
@@ -33596,7 +33912,7 @@
       ]
      ],
      "body-background-srl-print.html": [
-      "1c5f1c3362244d73e5cf0a0c50604e0cedb2c643",
+      "ebf5adb821bf6f55db19cabf03e09da7a90376af",
       [
        null,
        [
@@ -33609,7 +33925,7 @@
       ]
      ],
      "body-background-vlr-print.html": [
-      "505e74400d56e163261ab08ff0d48ca3828f9fb9",
+      "eec1914ea02473eabdb5dd4a6bac3b6e6fc42648",
       [
        null,
        [
@@ -33622,7 +33938,7 @@
       ]
      ],
      "body-background-vrl-print.html": [
-      "6f9df91c5dcbfd2e1087e657f1e98b0cd13ea67c",
+      "48ec7a70a5c03923fee977479b381c9eb5742f6a",
       [
        null,
        [
@@ -33636,7 +33952,7 @@
      ],
      "cssom": {
       "dynamic-001-print.html": [
-       "90799d3a721bdab9c11bba84cfd276e5c18f8ef3",
+       "5cdf26454c1dd3537cc0258269471a866b589877",
        [
         null,
         [
@@ -33754,7 +34070,7 @@
       ]
      ],
      "fixedpos-009-print.html": [
-      "803a077c0a7148ac157612c4b3633585eb947aab",
+      "3b784670074d58909c157fbe24db7c5a59787778",
       [
        null,
        [
@@ -33767,7 +34083,7 @@
       ]
      ],
      "fixedpos-010-print.html": [
-      "cdd50828d865d6cb7e7fe71326eaa90fa1c88ac2",
+      "d333f7279cd8aeaf8e09eb93d52e461cdef6df37",
       [
        null,
        [
@@ -33780,7 +34096,7 @@
       ]
      ],
      "fixedpos-011-print.html": [
-      "556965138cc32ef76930ca553e43419707f9d433",
+      "89154296dc4b80c3581076f4727fa3fb51c89e76",
       [
        null,
        [
@@ -33806,7 +34122,7 @@
       ]
      ],
      "fixedpos-with-iframe-print.html": [
-      "5102d045c4202e4bc22c6c876fd3bbbcf620c4b0",
+      "215643601b2057224089d48862904bbe896469cc",
       [
        null,
        [
@@ -33911,7 +34227,7 @@
        ]
       ],
       "auto-margins-002-print.html": [
-       "5b424941cadd75afad2083a619871a9d5aa80749",
+       "28d091ffa1a1ddf9243b89b42ea993a300ca0e17",
        [
         null,
         [
@@ -33937,7 +34253,7 @@
        ]
       ],
       "background-001-print.html": [
-       "66560fce099c6848670fcb0d766435fb2afadf28",
+       "0e6db527320151d0b5eee0fdf080959878f7dd28",
        [
         null,
         [
@@ -33950,7 +34266,7 @@
        ]
       ],
       "content-001-print.html": [
-       "11b5bd6f44d5e01e0296ca37caee0ec2004e0bfc",
+       "cf61311491dc7a2697d83faf4def4490e8a81815",
        [
         null,
         [
@@ -34145,7 +34461,7 @@
        ]
       ],
       "dimensions-003-print.html": [
-       "fe9f26da5d7c4dc008cd58539ba4ffc23adc309b",
+       "ed0d62f95306b990d6948c274e34967d10a3667a",
        [
         null,
         [
@@ -34158,7 +34474,7 @@
        ]
       ],
       "dimensions-004-print.html": [
-       "80bcc43fb39b84fb291fb822de9a58bf26181a1c",
+       "c45732790df4c889b601535d43f14485a58830b5",
        [
         null,
         [
@@ -34171,7 +34487,7 @@
        ]
       ],
       "dimensions-005-print.html": [
-       "2823424f39a1ce99f39af781e830378bb62f738a",
+       "6aafaf98a66553ea0d113b9ffb59bfd136b65833",
        [
         null,
         [
@@ -34184,7 +34500,7 @@
        ]
       ],
       "dimensions-006-print.html": [
-       "6ea477f2c84d63b599d673ccbd943ae5ba62be26",
+       "b06c41fae683ee6ca5190d91e4dd6946cc817606",
        [
         null,
         [
@@ -34197,7 +34513,7 @@
        ]
       ],
       "dimensions-007-print.html": [
-       "cf7e5f507543f0ea8b523e83493d91cdb5b0e94b",
+       "1f7edb53766989ef9ebf3286087a91f49868f7cc",
        [
         null,
         [
@@ -34210,7 +34526,7 @@
        ]
       ],
       "dimensions-008-print.html": [
-       "8bdf0cdac0bb5796f3e6c99c0f3ded01f13527ee",
+       "5d25535aa1e7c84797395b56aa5d421b8689fab4",
        [
         null,
         [
@@ -34223,7 +34539,7 @@
        ]
       ],
       "dimensions-009-print.html": [
-       "602cc5680ec315dc8335a8ed294a14f0286b580b",
+       "10f796913f508e9c643dbcbfbfe0c8d7552609a4",
        [
         null,
         [
@@ -34236,7 +34552,7 @@
        ]
       ],
       "dimensions-010-print.html": [
-       "1ebaa6d9288b89bb90c62fa5f99406e2e8fb91bb",
+       "28e8f87736c4f598203343e250b36ff5ce6d905c",
        [
         null,
         [
@@ -34249,7 +34565,7 @@
        ]
       ],
       "dimensions-011-print.html": [
-       "e51d1fbd75eea07e2b8bc3106b3a344b944181e6",
+       "9dbbae94a6f38ef6476f0bb247e596097c3872bb",
        [
         null,
         [
@@ -34262,7 +34578,7 @@
        ]
       ],
       "dimensions-012-print.html": [
-       "6b4ac2c28c723f6db09d16c50df301b0884b9af2",
+       "1536312f85fcf8121808c6edce1562bca05d458a",
        [
         null,
         [
@@ -34275,7 +34591,7 @@
        ]
       ],
       "dimensions-013-print.html": [
-       "4540b07190673da2fe0bbb616fb66a46512acae1",
+       "d8fd801d14742e691b897516d954fcc12cdab483",
        [
         null,
         [
@@ -34288,7 +34604,7 @@
        ]
       ],
       "dimensions-014-print.html": [
-       "d126f2d0c91c5daba93e78c5075adb7499059c9f",
+       "0a31e8f366573ef77ef9e11e65d4fe6129a9fdcc",
        [
         null,
         [
@@ -34301,7 +34617,7 @@
        ]
       ],
       "dimensions-015-print.tentative.html": [
-       "1f7bf1fdc09f59277a4db2e520c5244f080b36aa",
+       "14905102014b5c809190bd40e84cfcedffd301f1",
        [
         null,
         [
@@ -34314,7 +34630,7 @@
        ]
       ],
       "inapplicable-properties-print.html": [
-       "9ca4087a164cfb08a0870570043d20c9af9192cc",
+       "df5d8acfea9ed7b754e8d3b09d8d37bc1fea81ac",
        [
         null,
         [
@@ -34340,7 +34656,7 @@
        ]
       ],
       "paint-order-001-print.html": [
-       "839762f0b9a7de87cba63e13be87d6af66bddd53",
+       "6b99a79ff161e6d7971796fc7397f5b551626dd8",
        [
         null,
         [
@@ -34353,7 +34669,7 @@
        ]
       ],
       "paint-order-002-print.html": [
-       "ac00e154facdb65d8e815301aba583c3139cef33",
+       "a5d687f879eafdde04c823b8b91d6436d61365fa",
        [
         null,
         [
@@ -34366,7 +34682,7 @@
        ]
       ],
       "paint-order-003-print.html": [
-       "0ce4618a148c6a0cca5dfc06a5c1c12189cf9b8b",
+       "4cdc4d5b4f61b38a525b01c423f59b1d971046b3",
        [
         null,
         [
@@ -34380,7 +34696,7 @@
       ]
      },
      "media-queries-001-print.html": [
-      "01b2a00e470263b6371313b5107c7add544d858c",
+      "61dae2a02437c789b6026acc74c7f25f09e1a884",
       [
        null,
        [
@@ -34445,7 +34761,7 @@
       ]
      ],
      "monolithic-overflow-003-print.html": [
-      "76905b180a1232597b28c05ee3aac45690de13fa",
+      "c6bbefddc639d4c87c7b97e25d0e48c6820c07de",
       [
        null,
        [
@@ -34458,7 +34774,7 @@
       ]
      ],
      "monolithic-overflow-004-print.html": [
-      "ea5a659bd8416a46fa3c2d1c69b68f7ea7f158bb",
+      "e1c492a422003af625320420252fd46174e2e9e0",
       [
        null,
        [
@@ -34471,7 +34787,7 @@
       ]
      ],
      "monolithic-overflow-005-print.html": [
-      "bb0fc212fc0d8940363e7de9d1a3771fd90f2c57",
+      "d690fc3b8344dc4574c8148510974c5b89fae7c4",
       [
        null,
        [
@@ -34484,7 +34800,7 @@
       ]
      ],
      "monolithic-overflow-006-print.html": [
-      "1cbcdbbe1e5a036a6eae8408731a15028aaae125",
+      "416617ebc655ba64b06da80ef22ebf7b43b8f53f",
       [
        null,
        [
@@ -34497,7 +34813,7 @@
       ]
      ],
      "monolithic-overflow-007-print.html": [
-      "14a6f051fec8489d957b14639bc3ccfcb0b644bd",
+      "34fa065bb3c2faa3efb1f4814b75c5d0372e5607",
       [
        null,
        [
@@ -34510,7 +34826,7 @@
       ]
      ],
      "monolithic-overflow-008-print.html": [
-      "ff302dc30caa1999f9e09168feb5ac56c08af552",
+      "576ced54595c1238f70b8624cace4eec0b501782",
       [
        null,
        [
@@ -34523,7 +34839,7 @@
       ]
      ],
      "monolithic-overflow-009-print.html": [
-      "bdff66e791c0fde0065578e1179085e76297d1d4",
+      "0a62f82117896b443d19762f282cb2a0563c41bf",
       [
        null,
        [
@@ -34536,7 +34852,7 @@
       ]
      ],
      "monolithic-overflow-010-print.html": [
-      "a75c932d30b4133244ccfd7f695ff03a4870b3c3",
+      "325d714e03169514cdbf368dc45e434f730607e2",
       [
        null,
        [
@@ -34549,7 +34865,7 @@
       ]
      ],
      "monolithic-overflow-011-print.html": [
-      "973a3aff4dccd49117247708413bf910b8406518",
+      "b3388892cb9feb7124ee9713e2ab2fb33ea88c5f",
       [
        null,
        [
@@ -34562,7 +34878,7 @@
       ]
      ],
      "monolithic-overflow-012-print.html": [
-      "53ed74bc7289cffacd1ec7f34b9d4e14060de6b5",
+      "fb307d60ff67c1ff47881eb70f002fe87996efb4",
       [
        null,
        [
@@ -34575,7 +34891,7 @@
       ]
      ],
      "monolithic-overflow-013-print.html": [
-      "b9a174879d77d139688031724fa1b1a5093e78d3",
+      "3c16293c19e50eeb72e225161bb68488a15ab67f",
       [
        null,
        [
@@ -34588,7 +34904,7 @@
       ]
      ],
      "monolithic-overflow-014-print.html": [
-      "d12ddf4c6847ed3b6ac980e4c327ae4b77a7d148",
+      "d993acc58d08d4d2156b40186e2c5deaf758520d",
       [
        null,
        [
@@ -34601,7 +34917,7 @@
       ]
      ],
      "monolithic-overflow-015-print.html": [
-      "d52605605c93eece74a0c4e78669aeb5a8ffbbdb",
+      "a1b975df3bf01200236aa7b9ea13392ada7dc5af",
       [
        null,
        [
@@ -34614,7 +34930,7 @@
       ]
      ],
      "monolithic-overflow-016-print.html": [
-      "029523e924afb21bf190420f95062214127fae61",
+      "639296e6189a1d7f6fb3cf46a50de24eea34a1bf",
       [
        null,
        [
@@ -34627,7 +34943,7 @@
       ]
      ],
      "monolithic-overflow-017-print.html": [
-      "c8ce9060fffcee8a79f265e1182e0c0cd9c2e7ae",
+      "0183c82bf62e020da1a3bc987b5831d0fd6d1863",
       [
        null,
        [
@@ -34640,7 +34956,7 @@
       ]
      ],
      "monolithic-overflow-018-print.html": [
-      "93da11dc62e73e2a98a275ec71f56579e1f1a604",
+      "fb3164395c9eda8b78ba6b2fabf13408aae0ee60",
       [
        null,
        [
@@ -34653,7 +34969,7 @@
       ]
      ],
      "monolithic-overflow-019-print.html": [
-      "3740b5d5b0b954f403954e2120db6a0ca32ce1c5",
+      "af5ba41bfa679c206d7ca9dd12990ecdc7bd296c",
       [
        null,
        [
@@ -34666,7 +34982,7 @@
       ]
      ],
      "monolithic-overflow-020-print.html": [
-      "403d932d643b81a620df3eba64156d1431d14579",
+      "a296ba4d3d75cbc15f3df55e291edb0d4c98c056",
       [
        null,
        [
@@ -34679,7 +34995,7 @@
       ]
      ],
      "monolithic-overflow-021-print.html": [
-      "584c4943dcf16e1713c93a6b482b858076163842",
+      "01355f5686bea0ed4bd2d91790a57ecf8a5cf7a8",
       [
        null,
        [
@@ -34692,7 +35008,7 @@
       ]
      ],
      "monolithic-overflow-022-print.html": [
-      "d37c74ad8ac33a3f767e962dee71858f491c0071",
+      "a7bfc5a3477a27f728bd019440ac4a0c6048dec5",
       [
        null,
        [
@@ -34705,7 +35021,7 @@
       ]
      ],
      "monolithic-overflow-023-print.html": [
-      "c047d4865751892503c5b8341b5c3a79eb7ad5f5",
+      "4ccecf0c37b8977b056f1b3eeb64750f1d9b5b52",
       [
        null,
        [
@@ -34757,7 +35073,7 @@
       ]
      ],
      "monolithic-overflow-027-print.html": [
-      "c7cfd37e2e882a3d6a860fd854001e44b699c7c5",
+      "0713b2061f9914b0827ac31e55305d5f8d0adc20",
       [
        null,
        [
@@ -34770,7 +35086,7 @@
       ]
      ],
      "monolithic-overflow-028-print.html": [
-      "c549db6410daef1ec89f71348b3da4b462c3111e",
+      "195110a0becbc6fc2a783803381aea65c121dedd",
       [
        null,
        [
@@ -34783,7 +35099,7 @@
       ]
      ],
      "monolithic-overflow-029-print.html": [
-      "c869d87d6839fe230d039d39142da710b8dd0d3d",
+      "b201533ac947eaeefaa90c0b985fbccdf4029426",
       [
        null,
        [
@@ -34796,7 +35112,7 @@
       ]
      ],
      "monolithic-overflow-030-print.html": [
-      "e36f25434dfc2466b1d4dad840914d4909df4918",
+      "7915ec2995c0f040cb0e42bbd6509759efd9bdfd",
       [
        null,
        [
@@ -34809,7 +35125,7 @@
       ]
      ],
      "monolithic-overflow-031-print.html": [
-      "c17849006222a5c71c2d0d53c4c521baccd8ec1a",
+      "7cb16ffebc59b61ce4566bf7fe6969bdba1b8784",
       [
        null,
        [
@@ -34822,7 +35138,7 @@
       ]
      ],
      "monolithic-overflow-032-print.tentative.html": [
-      "ad7ccf029f683c9b3b857d401357292418b7f208",
+      "390276127b5f6e4c66d739ea3f466e6e8969f1a1",
       [
        null,
        [
@@ -34835,7 +35151,7 @@
       ]
      ],
      "page-background-001-print.html": [
-      "e1bc2196940047d8948f819c32d65aedd0e76416",
+      "354dc48a490d20fefd22bb0d5d0a30afbe65a391",
       [
        null,
        [
@@ -34848,7 +35164,7 @@
       ]
      ],
      "page-background-002-print.html": [
-      "240d468ce4438ee29a6afb74aee1539b897b5ea5",
+      "10bb6cab7fac40692e2af35353983de50e135e2a",
       [
        null,
        [
@@ -34861,7 +35177,7 @@
       ]
      ],
      "page-background-003-print.html": [
-      "fbc72ecd7d77bd0a2382149019495736e7be34ce",
+      "e796400cdd102e88a35e44ee18cd9d4a1001541f",
       [
        null,
        [
@@ -34874,7 +35190,7 @@
       ]
      ],
      "page-background-004-print.html": [
-      "dcf14565628556903a4a27d30d5ee08ba6f58812",
+      "a700e1d32dea9b45159f54c6a7bd4446e36a1f46",
       [
        null,
        [
@@ -34887,7 +35203,7 @@
       ]
      ],
      "page-background-005-print.html": [
-      "9070564bdde1a092df639c50d53690edab7028d4",
+      "1b5d227fd5aecd9242e4f388e91f226b623142c7",
       [
        null,
        [
@@ -34900,7 +35216,7 @@
       ]
      ],
      "page-background-image-print.html": [
-      "633cd4ec6c9027902782f271c2161394cf6cb5e6",
+      "f9fe83a9d0c9bbef57228c45d474df90a788b012",
       [
        null,
        [
@@ -34926,7 +35242,7 @@
       ]
      ],
      "page-box-001-print.html": [
-      "35c2f06c93bfa3f5f162d945393d7acbea1250dc",
+      "f87dbe3ca38257b0a9a65aa8942bf6ad7bdd08c5",
       [
        null,
        [
@@ -34939,7 +35255,7 @@
       ]
      ],
      "page-box-002-print.html": [
-      "3b87b6903dd321b1c56df812b6ef1458c3c4a8ce",
+      "5557796a96e588f6c05b874fc6eb969b8b53d5f9",
       [
        null,
        [
@@ -34952,7 +35268,7 @@
       ]
      ],
      "page-box-003-print.html": [
-      "44cc13555b543b8a4d9db28dcac6282438f74c51",
+      "ff6c95cc54fbe920f6fc1c1ccc7994265c09c227",
       [
        null,
        [
@@ -34965,7 +35281,7 @@
       ]
      ],
      "page-box-004-print.html": [
-      "91ea66090da1bbe822c3612361543d210daf2f7d",
+      "d2fd44db0a55ed609935a34c3dd99561d5c54aca",
       [
        null,
        [
@@ -34978,7 +35294,7 @@
       ]
      ],
      "page-box-005-print.html": [
-      "02811b38fea2836dd84bf48f06ff0e2ebf8dc2b6",
+      "3636d878f5abad0c6bab02dbeed936be62528ff6",
       [
        null,
        [
@@ -34991,7 +35307,7 @@
       ]
      ],
      "page-box-006-print.html": [
-      "eb6c2098978d199cffd697c48979298e335621ad",
+      "208a0d6124e9b3be96a7615a6b3218f508dbcb58",
       [
        null,
        [
@@ -35004,7 +35320,7 @@
       ]
      ],
      "page-box-007-print.html": [
-      "2ed198b32ef540c37af6f965da9db33afff526b1",
+      "da8f79a9ad40728e0c03afc8df0466415bd0f188",
       [
        null,
        [
@@ -35017,7 +35333,7 @@
       ]
      ],
      "page-box-008-print.html": [
-      "c05f0e24af08b0e497de5a91ae869315e82092c0",
+      "34ab16ba424c594028c665fbbaf802182b1bf4f1",
       [
        null,
        [
@@ -35030,7 +35346,7 @@
       ]
      ],
      "page-box-009-print.html": [
-      "dc9ced3bdf9ea7cdc23988a9fc3fba1420262300",
+      "6d0766f71ea12b9b172695fa9394cebb0a8374a6",
       [
        null,
        [
@@ -35056,7 +35372,7 @@
       ]
      ],
      "page-box-011-print.html": [
-      "d6e51736d3ade88e577421dddc0839954c7dd22d",
+      "548f5e165d64a222a49a78400056f14e782d821a",
       [
        null,
        [
@@ -35069,7 +35385,7 @@
       ]
      ],
      "page-left-right-001-print.html": [
-      "044696fcca27ec7ebe18edab3053dfbb65af6bbc",
+      "6026e75cfe21bd653208ee4af37c3e29cbaa8632",
       [
        null,
        [
@@ -35082,7 +35398,7 @@
       ]
      ],
      "page-left-right-002-print.html": [
-      "59e23479e6f28b64e6c55b502000d3622a15bca7",
+      "02f1f513b9e04330e1d8bcc92a6b6ae063370720",
       [
        null,
        [
@@ -35095,7 +35411,7 @@
       ]
      ],
      "page-margin-001-print.html": [
-      "c59b3c642760b3eeb548fad799ed147b77e27ff2",
+      "0d6c8ce95c407cefc643584e457c7cf20bd3fa09",
       [
        null,
        [
@@ -35108,7 +35424,7 @@
       ]
      ],
      "page-margin-002-print.html": [
-      "944d7efcfd08fbd2508d4d8d78e9dbb30c210487",
+      "42d0f0bc1470efc647b06a0d69b0d775b03d28ab",
       [
        null,
        [
@@ -35121,7 +35437,7 @@
       ]
      ],
      "page-margin-003-print.html": [
-      "e7410c02e09b595ee39ab0dd0ed162827d2469c7",
+      "93c6a1dca6477ccd68ae571bdbbcb6f8e9282345",
       [
        null,
        [
@@ -35134,7 +35450,7 @@
       ]
      ],
      "page-margin-004-print.html": [
-      "cb9343dcf17b69fb5c52d2bef830f260798092c5",
+      "c621d4063a903da5ac158e415e17de8d85de2786",
       [
        null,
        [
@@ -35147,7 +35463,7 @@
       ]
      ],
      "page-margin-005-print.html": [
-      "8ca80bc69724ee8f8b1801af2b08d4ac923466a1",
+      "3c888422eefe4fe904fda2698e79c4a3dc6634ad",
       [
        null,
        [
@@ -35160,7 +35476,7 @@
       ]
      ],
      "page-margin-006-print.html": [
-      "43621acf80920276c11349e4f3677ee03c6204ca",
+      "0526d058ae678452fbe8162e343dc9654f6e720f",
       [
        null,
        [
@@ -35173,7 +35489,7 @@
       ]
      ],
      "page-margin-007-print.html": [
-      "c2045d0dac22111a4e1ee209cc9b7cec86a5efd2",
+      "2f6432b36fb0dbdfa49841986bc92c6febf40312",
       [
        null,
        [
@@ -35186,7 +35502,7 @@
       ]
      ],
      "page-margin-auto-and-non-zero-print.html": [
-      "6287c2a1032c791d78fa9fb64f99e1c4335f1543",
+      "634bc12616f3be7c833fb7e0979adf1154e20325",
       [
        null,
        [
@@ -35199,7 +35515,7 @@
       ]
      ],
      "page-margin-auto-negative-print.tentative.html": [
-      "452056a1003e7b9d7a56601e72683d3d6f60f2a0",
+      "64efb19bccb4c212ee61160920240d3986e78f24",
       [
        null,
        [
@@ -35212,7 +35528,7 @@
       ]
      ],
      "page-margin-auto-print.html": [
-      "1c94ec4e4980cb3a8297920a94b82d24b837975c",
+      "14a23a31db21a7ee8406ff0340499d32cea2b686",
       [
        null,
        [
@@ -35225,7 +35541,7 @@
       ]
      ],
      "page-margin-negative-print.tentative.html": [
-      "205a13f7a589ff0403641fc3f5c8d391cf209043",
+      "e8d48bccde52b759e735a3d8711dab7fe396da59",
       [
        null,
        [
@@ -35888,7 +36204,7 @@
       ]
      ],
      "page-name-unnamed-trailing-001-print.html": [
-      "61baa23603ff041ce9dce92e6e1f01b9d2a4f086",
+      "7e78a9e3b21e78e7fd5e9446243f9d6b037eb429",
       [
        null,
        [
@@ -36105,7 +36421,7 @@
       ]
      ],
      "page-size-004-print.html": [
-      "125d7636d265c61eb604dc67811efb1d5df572c3",
+      "05fb8ba097875daafcc8e30cf78655594a23873a",
       [
        null,
        [
@@ -36118,7 +36434,7 @@
       ]
      ],
      "page-size-005-print.html": [
-      "37876ae230edae36fa350657da278037aef00709",
+      "a3909f944a38316051fd1a14028dd4b33c70765a",
       [
        null,
        [
@@ -36144,7 +36460,7 @@
       ]
      ],
      "page-size-007-print.html": [
-      "50ab2f4d1090e2fac5c26eaf601985e1ad0f7f1e",
+      "1a7b823fbfe070606a058701538d4ed1844fd602",
       [
        null,
        [
@@ -36157,7 +36473,7 @@
       ]
      ],
      "page-size-008-print.html": [
-      "683bdc3a50a45abbac6cada7ff4863a705262ba5",
+      "63600bf5ef7fb64aca4bd7aadf2e97da762ae6c4",
       [
        null,
        [
@@ -36170,7 +36486,7 @@
       ]
      ],
      "page-size-009-print.html": [
-      "48ead4eab3896c7b71bad144aeb2e2c518c81ce2",
+      "b362ad58cdba25938752f734d32f61f7b477669d",
       [
        null,
        [
@@ -36209,7 +36525,7 @@
       ]
      ],
      "page-size-012-print.html": [
-      "737b37cbc3dbe30f83e9cae3eaf4582f5cf2e04d",
+      "d4ddd996514b2885d4c1e4fc35e6f172136e56b9",
       [
        null,
        [
@@ -36222,7 +36538,7 @@
       ]
      ],
      "page-size-013-print.html": [
-      "5768e2d54cb08871755db09c5babf5fa9846b67b",
+      "a2fd9fe99931ac7a867035d0401eff6e7152a97c",
       [
        null,
        [
@@ -36235,7 +36551,7 @@
       ]
      ],
      "page-size-014-print.html": [
-      "f224bafaa87a1fd84c2ed5166f830b7f5f0c98d4",
+      "4188e59cf61f3af27089aa6264c2b38ff0bf035c",
       [
        null,
        [
@@ -36261,7 +36577,7 @@
       ]
      ],
      "page-size-016-print.tentative.html": [
-      "0fd12954c66441dbb0d66b03a4156426f9e83d1c",
+      "7c410a3cd285ae5383db1ea5a7f63814c1cbd656",
       [
        null,
        [
@@ -36274,7 +36590,7 @@
       ]
      ],
      "page-size-017-print.tentative.html": [
-      "e036e83f7178328b58c960e421af66d05151d543",
+      "a63eac3052e352abaa9fc0b8956f2bb0c6c66664",
       [
        null,
        [
@@ -36365,7 +36681,7 @@
       ]
      ],
      "root-element-display-none-print.html": [
-      "d6802f62251a3457858933b4a71b12b7032c4282",
+      "d7cc3062759f44e3f42f8729e67322d252bc62a7",
       [
        null,
        [
@@ -36378,7 +36694,7 @@
       ]
      ],
      "subpixel-page-size-001-print.html": [
-      "9054cd4513f73edd4a8674a106ba7e6358b2e91b",
+      "4108d9bdd282049767b75f21881ffc6acbf30245",
       [
        null,
        [
@@ -36399,7 +36715,7 @@
       ]
      ],
      "subpixel-page-size-002-print.html": [
-      "463cb21f25d7c2acf500d31729508375fa7e4cdf",
+      "d71da40fa5e5c85ecc7f7dcf4a97338aa5b3c113",
       [
        null,
        [
@@ -36422,7 +36738,7 @@
     },
     "css-position": {
      "position-fixed-overflow-print.html": [
-      "cf5cf2ea530d7bec477e640356d4e3f2dac42f89",
+      "497556bd9b904e8cc9f6816af24ff74ce297b95e",
       [
        null,
        [
@@ -36449,12 +36765,12 @@
      ],
      "sticky": {
       "position-sticky-offset-print.html": [
-       "3954bbcf4418b8af87dca12949efc7e6f59c963e",
+       "f74a30c7a9871bc970996d6d88f6604033129207",
        [
         null,
         [
          [
-          "/css/reference/ref-filled-green-100px-square.xht",
+          "/css/reference/ref-filled-green-100px-square-print-ref.html",
           "=="
          ]
         ],
@@ -36534,7 +36850,7 @@
       ]
      ],
      "background-image-print.html": [
-      "8d294107406e902bae7b368a8e34100221cea2d2",
+      "2119f6952a469e3a40be16188904b1c8a125d309",
       [
        null,
        [
@@ -36795,7 +37111,7 @@
    },
    "custom-elements": {
     "pseudo-class-defined-print.html": [
-     "24e1bb7b03fa43ce2fa264711a247d5977e763f6",
+     "a6b87bb0bb92cf12fc88d8677a065b24f90d4e48",
      [
       null,
       [
@@ -36856,7 +37172,7 @@
      "non-replaced-elements": {
       "tables": {
        "table-background-print.html": [
-        "0cbaca601922e403fed54ce5a489c2c8170ab847",
+        "05fdef0a860fd32d02f10dd481e9bedb78b4720f",
         [
          null,
          [
@@ -36869,7 +37185,7 @@
         ]
        ],
        "table-row-pagination-001-print.html": [
-        "3a14558a8b21f78a3de04b13b1b0e1f86cecb11c",
+        "751a445a87b1f3602c07b695d564bd2332eef238",
         [
          null,
          [
@@ -37156,7 +37472,7 @@
       ]
      ],
      "reftest_wait_0-print.html": [
-      "fec62a3cae00655a95f7bc569d2eb1f43eac6062",
+      "5cbca7a30a4907700b5d5809e77ff7e9417aeb60",
       [
        null,
        [
@@ -37187,7 +37503,7 @@
     "css": {
      "printing": {
       "animation-timeline-none-with-progress-print.tentative.html": [
-       "54f629dafac4829140916f19e0242bfa181c40b7",
+       "c250b99d6d4a569a60b799ed3b4a8cc8481fe2ef",
        [
         null,
         [
@@ -37200,7 +37516,7 @@
        ]
       ],
       "scroll-timeline-default-iframe-print.html": [
-       "0e0d42b0084fc3f482a4ff84464785c7a9e130e5",
+       "187d9deffe482054585729f6b648ff745549da9d",
        [
         null,
         [
@@ -37229,7 +37545,7 @@
        ]
       ],
       "scroll-timeline-default-print.tentative.html": [
-       "3f25cc93dba6a6f8c360e416b328f897cab29e99",
+       "0c0e744e55a7ce93be78ed0d169f6a48f5532e8b",
        [
         null,
         [
@@ -37242,7 +37558,7 @@
        ]
       ],
       "scroll-timeline-specified-scroller-print.html": [
-       "dd4add49b0f0946cfbd5e4889c20ce21086af4d7",
+       "53905d752a20c0b5fd88cfc49381eb2fd6c23d56",
        [
         null,
         [
@@ -37790,6 +38106,19 @@
       {}
      ]
     ],
+    "webkit-box-ignores-flex-wrap.tentative.html": [
+     "98086f83570d4c5b4c6251f31093744442a907ca",
+     [
+      null,
+      [
+       [
+        "/compat/green-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ],
     "webkit-box-rtl-flex.html": [
      "d20b3a0a9dbab237a799f62504b9b1ea7b90a564",
      [
@@ -102080,6 +102409,19 @@
         {}
        ]
       ],
+      "root-element-creates-stacking-context.html": [
+       "be7b027ee791d8d83d6fcecae60654eb22ff960c",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/stacking-context/root-element-creates-stacking-context-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "zindex-affects-block-in-inline.html": [
        "5a5c9e3dcca6171910f85790e13dc754acda58e0",
        [
@@ -123909,6 +124251,35 @@
        }
       ]
      ],
+     "root-element-background-margin-opacity.html": [
+      "e1e7fed5a66b0993174617550e2775206a91930b",
+      [
+       null,
+       [
+        [
+         "/css/compositing/root-element-background-margin-opacity-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            10000
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
      "root-element-background-transparency.html": [
       "910eb08e8d3004da7418f8f00f38d022841262f2",
       [
@@ -124021,8 +124392,34 @@
     },
     "css-align": {
      "abspos": {
+      "align-items-static-position-001.tentative.html": [
+       "06c11e6cdb61a519fdbc77d377fb0ace0e92f6b1",
+       [
+        null,
+        [
+         [
+          "/css/css-align/abspos/align-items-static-position-001-ref.tentative.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-items-static-position-002.tentative.html": [
+       "f90004b5672a1fef9f42cf32ae13b06fc085e0ec",
+       [
+        null,
+        [
+         [
+          "/css/css-align/abspos/align-items-static-position-002-ref.tentative.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "align-items-static-position.html": [
-       "8f3dbb7ae41e5dae167282cfffa522e800f0bbc7",
+       "0b653ca5d6c2bbaf29b3834aec7d806169c8de55",
        [
         null,
         [
@@ -124034,6 +124431,136 @@
         {}
        ]
       ],
+      "align-self-static-position-001.html": [
+       "1ff73ef116d9d59786bf91c73c546a3f0f7e89df",
+       [
+        null,
+        [
+         [
+          "/css/css-align/abspos/align-self-static-position-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-self-static-position-002.html": [
+       "4c794bac28732040112ac7e56ff85c0cea4e371a",
+       [
+        null,
+        [
+         [
+          "/css/css-align/abspos/align-self-static-position-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-self-static-position-003.html": [
+       "39f871f4c2b837dc67b30d615e9c8ad0e4392d24",
+       [
+        null,
+        [
+         [
+          "/css/css-align/abspos/align-self-static-position-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-self-static-position-004.html": [
+       "afba7215b116506138434da5fa3c13ec832fb393",
+       [
+        null,
+        [
+         [
+          "/css/css-align/abspos/align-self-static-position-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-self-static-position-005.html": [
+       "207a5443331e2f04f0d3b6e9e4fd8c55716af8de",
+       [
+        null,
+        [
+         [
+          "/css/css-align/abspos/align-self-static-position-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-self-static-position-006.html": [
+       "253b2a52f618a82fcf13b82bd61075bc2dcee8be",
+       [
+        null,
+        [
+         [
+          "/css/css-align/abspos/align-self-static-position-006-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-self-static-position-007.html": [
+       "ebe872aaab909e29abf3eed33840a577a616b34b",
+       [
+        null,
+        [
+         [
+          "/css/css-align/abspos/align-self-static-position-007-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-self-static-position-008.html": [
+       "187974884b4aded9a031c0c2fdc9d2caafd9ef5b",
+       [
+        null,
+        [
+         [
+          "/css/css-align/abspos/align-self-static-position-008-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-self-stretch-auto-margins-aspect-ratio.html": [
+       "4eaa9d2f3a6dbab63d3d931d4c58a427bc11976f",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-self-stretch-auto-margins.html": [
+       "9d1b6454c848c02b7fef360fb447d4d6b46ee8c0",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "align-self-stretch-auto-size.tentative.html": [
        "74091feacfe63813aa4a6bbc3ef1b4d3e4e8a59c",
        [
@@ -124059,6 +124586,32 @@
         ],
         {}
        ]
+      ],
+      "justify-self-stretch-auto-margins-aspect-ratio.html": [
+       "c50b32f089b1b0043ac5d9dbd0f79906d82827f3",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "justify-self-stretch-auto-margins.html": [
+       "7d7b4bfc8570d3dde59fc903de7cb173b0b5baf8",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      },
      "baseline-of-scrollable-1a.html": [
@@ -124280,6 +124833,19 @@
         {}
        ]
       ],
+      "justify-items-anonymous.tentative.html": [
+       "641dea1f54b2f0cea29bc4c4c82e023a479e3d3c",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "justify-self-auto-margins-1.html": [
        "b54eb775114808ff22b82a858426e764a623e432",
        [
@@ -124551,6 +125117,32 @@
        {}
       ]
      ],
+     "anchor-center-visibility-change.html": [
+      "0f7d805844f010d9854301c094b5ce6fd03d13fa",
+      [
+       null,
+       [
+        [
+         "/css/css-anchor-position/anchor-center-visibility-change-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "anchor-css-zoom.html": [
+      "2fab3f2e56241f3e303e101ac68060c09c93cf77",
+      [
+       null,
+       [
+        [
+         "/css/css-anchor-position/reference/anchor-css-zoom-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "anchor-in-css-min-max-function.html": [
       "c7e56ecc159bb9ea507fe9b8dd1cb0a8b05092b7",
       [
@@ -125087,6 +125679,19 @@
        {}
       ]
      ],
+     "anchor-size-css-zoom.html": [
+      "7bd9b799dfebcb632915b711575322fef4285284",
+      [
+       null,
+       [
+        [
+         "/css/css-anchor-position/reference/anchor-size-css-zoom-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "position-anchor-001.html": [
       "b0a964485c65ed1c8eeff89a1406bda9f4ea9b48",
       [
@@ -125295,8 +125900,8 @@
        {}
       ]
      ],
-     "position-visibility-anchors-visible-both-position-fixed.tentative.html": [
-      "c603288f0a70a1f43e7384b9dd26c474ce96bac5",
+     "position-visibility-anchors-visible-both-position-fixed.html": [
+      "c5e8e839ded4e81258aebf723af93b1119077596",
       [
        null,
        [
@@ -125412,13 +126017,13 @@
        {}
       ]
      ],
-     "position-visibility-anchors-visible-position-fixed.tentative.html": [
-      "9c3495a635d2eaeb77de9586f031dedec5d7af97",
+     "position-visibility-anchors-visible-position-fixed.html": [
+      "5107823efd9ef0fa9c3a4fc66cda8e016954eb33",
       [
        null,
        [
         [
-         "/css/css-anchor-position/position-visibility-anchors-visible-position-fixed-ref.html",
+         "/css/css-anchor-position/position-visibility-anchors-visible-ref.html",
          "=="
         ]
        ],
@@ -125452,12 +126057,12 @@
       ]
      ],
      "position-visibility-anchors-visible-with-position.html": [
-      "8ad3eb7e31053a6978a638e88003eadd150138ff",
+      "32eede4f08819a54e2f6b4c5bdad8a488805e972",
       [
        null,
        [
         [
-         "/css/css-anchor-position/position-visibility-anchors-visible-ref.html",
+         "/css/css-anchor-position/position-visibility-anchors-visible-with-position-ref.html",
          "=="
         ]
        ],
@@ -125554,9 +126159,35 @@
        ],
        {}
       ]
+     ],
+     "vertical-aligned-table-cell.html": [
+      "9b16621b7132fdf92856f65eaf7a8450c1fc7b63",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
      ]
     },
     "css-animations": {
+     "animate-with-background-color-oklch-001.html": [
+      "37d10e07cdb467aee54d5826ce2a1604417829f8",
+      [
+       null,
+       [
+        [
+         "/css/css-animations/animate-with-background-color-oklch-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "animation-delay-008.html": [
       "52883fa72ff5a4a57c6a8c2866805ceb5fa0a507",
       [
@@ -134071,7 +134702,7 @@
       ]
      ],
      "border-image-width-005.xht": [
-      "eeceedef90e9a74a20e151b346e9030fe05d84ea",
+      "1e93b7219d4f32e60d336c62eb7a41245c710523",
       [
        null,
        [
@@ -134084,7 +134715,7 @@
       ]
      ],
      "border-image-width-006.xht": [
-      "aa487b76c53a11cba41b285d4d86743bf3ca1324",
+      "bd046c25876cfd7de0dad157225be28bbb63cd9c",
       [
        null,
        [
@@ -134097,7 +134728,7 @@
       ]
      ],
      "border-image-width-007.xht": [
-      "61726c00873739c076812f72645d8324494ff44c",
+      "6c4647dd87fe847314a16b3fb8ba18086502c5d3",
       [
        null,
        [
@@ -134139,7 +134770,7 @@
       ]
      ],
      "border-image-width-009.html": [
-      "112c2a485ac424e3b1097ded5a59c16aafcefb01",
+      "109f34fe9fd98825d95c3c88ca126def252ac83b",
       [
        null,
        [
@@ -136001,13 +136632,13 @@
        ]
       },
       "corner-shape": {
-       "corner-shape-any.html": [
-        "9c256eb89778f8060906b7d943d08a01a3cfe300",
+       "corner-shape-backdrop-filter-overflow.html": [
+        "550428a37e3fca4a0f50bba755f9c4f4cb738dd9",
         [
-         "css/css-borders/tentative/corner-shape/corner-shape-any.html?corner-bottom-left-shape=bevel&border-bottom-left-radius=30px",
+         null,
          [
           [
-           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-bottom-left-shape=bevel&border-bottom-left-radius=30px",
+           "/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter-overflow-ref.html",
            "=="
           ]
          ],
@@ -136018,22 +136649,25 @@
             [
              [
               0,
-              180
+              64
              ],
              [
               0,
-              520
+              360
              ]
             ]
            ]
           ]
          }
-        ],
+        ]
+       ],
+       "corner-shape-backdrop-filter.html": [
+        "c4a2523b1f818cd3c670969c730d0fbe82eba8a8",
         [
-         "css/css-borders/tentative/corner-shape/corner-shape-any.html?corner-bottom-right-shape=superellipse(1.9)&border-bottom-right-radius=50%",
+         null,
          [
           [
-           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-bottom-right-shape=superellipse(1.9)&border-bottom-right-radius=50%",
+           "/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter-ref.html",
            "=="
           ]
          ],
@@ -136044,219 +136678,11 @@
             [
              [
               0,
-              180
+              64
              ],
              [
               0,
-              520
-             ]
-            ]
-           ]
-          ]
-         }
-        ],
-        [
-         "css/css-borders/tentative/corner-shape/corner-shape-any.html?corner-shape=squircle&border-radius=50%",
-         [
-          [
-           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=squircle&border-radius=50%",
-           "=="
-          ]
-         ],
-         {
-          "fuzzy": [
-           [
-            null,
-            [
-             [
-              0,
-              180
-             ],
-             [
-              0,
-              520
-             ]
-            ]
-           ]
-          ]
-         }
-        ],
-        [
-         "css/css-borders/tentative/corner-shape/corner-shape-any.html?corner-shape=squircle&border-top-left-radius=30%",
-         [
-          [
-           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=squircle&border-top-left-radius=30%",
-           "=="
-          ]
-         ],
-         {
-          "fuzzy": [
-           [
-            null,
-            [
-             [
-              0,
-              180
-             ],
-             [
-              0,
-              520
-             ]
-            ]
-           ]
-          ]
-         }
-        ],
-        [
-         "css/css-borders/tentative/corner-shape/corner-shape-any.html?corner-shape=squircle&border-top-right-radius=30px",
-         [
-          [
-           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=squircle&border-top-right-radius=30px",
-           "=="
-          ]
-         ],
-         {
-          "fuzzy": [
-           [
-            null,
-            [
-             [
-              0,
-              180
-             ],
-             [
-              0,
-              520
-             ]
-            ]
-           ]
-          ]
-         }
-        ],
-        [
-         "css/css-borders/tentative/corner-shape/corner-shape-any.html?corner-shape=straight&border-bottom-leftradius=5px",
-         [
-          [
-           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=straight&border-bottom-leftradius=5px",
-           "=="
-          ]
-         ],
-         {
-          "fuzzy": [
-           [
-            null,
-            [
-             [
-              0,
-              180
-             ],
-             [
-              0,
-              520
-             ]
-            ]
-           ]
-          ]
-         }
-        ],
-        [
-         "css/css-borders/tentative/corner-shape/corner-shape-any.html?corner-shape=superellipse(5.2)&border-radius=40%",
-         [
-          [
-           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=superellipse(5.2)&border-radius=40%",
-           "=="
-          ]
-         ],
-         {
-          "fuzzy": [
-           [
-            null,
-            [
-             [
-              0,
-              180
-             ],
-             [
-              0,
-              520
-             ]
-            ]
-           ]
-          ]
-         }
-        ],
-        [
-         "css/css-borders/tentative/corner-shape/corner-shape-any.html?corner-shape=superellipse(8)&border-top-right-radius=33px",
-         [
-          [
-           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=superellipse(8)&border-top-right-radius=33px",
-           "=="
-          ]
-         ],
-         {
-          "fuzzy": [
-           [
-            null,
-            [
-             [
-              0,
-              180
-             ],
-             [
-              0,
-              520
-             ]
-            ]
-           ]
-          ]
-         }
-        ],
-        [
-         "css/css-borders/tentative/corner-shape/corner-shape-any.html?corner-top-left-shape=scoop&corner-top-right-shape=scoop&border-radius=50%",
-         [
-          [
-           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-left-shape=scoop&corner-top-right-shape=scoop&border-radius=50%",
-           "=="
-          ]
-         ],
-         {
-          "fuzzy": [
-           [
-            null,
-            [
-             [
-              0,
-              180
-             ],
-             [
-              0,
-              520
-             ]
-            ]
-           ]
-          ]
-         }
-        ],
-        [
-         "css/css-borders/tentative/corner-shape/corner-shape-any.html?corner-top-right-shape=superellipse(0.1)&border-top-right-radius=50px",
-         [
-          [
-           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-right-shape=superellipse(0.1)&border-top-right-radius=50px",
-           "=="
-          ]
-         ],
-         {
-          "fuzzy": [
-           [
-            null,
-            [
-             [
-              0,
-              180
-             ],
-             [
-              0,
-              520
+              360
              ]
             ]
            ]
@@ -136294,7 +136720,7 @@
         ]
        ],
        "corner-shape-bevel-overflow.html": [
-        "df604db8d13888a2c59488e374ee27ebe6878001",
+        "5a18e11af61b9aa9176802dac24d7064a4aab58d",
         [
          null,
          [
@@ -136314,7 +136740,7 @@
              ],
              [
               0,
-              32
+              256
              ]
             ]
            ]
@@ -136323,7 +136749,7 @@
         ]
        ],
        "corner-shape-fill.html": [
-        "6e5df8364c5fa57398644a72d40ca0e3dc8b2b65",
+        "b8c8bc0ad2e3d9a6eb18422925660b79de9d2a9b",
         [
          null,
          [
@@ -136343,7 +136769,36 @@
              ],
              [
               0,
-              32
+              256
+             ]
+            ]
+           ]
+          ]
+         }
+        ]
+       ],
+       "corner-shape-inset-shadow.html": [
+        "7a83caff70c08b74d5d6c2540684c49f8e893f72",
+        [
+         null,
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-inset-shadow-ref.html",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              255
+             ],
+             [
+              0,
+              360
              ]
             ]
            ]
@@ -136352,7 +136807,7 @@
         ]
        ],
        "corner-shape-notch.html": [
-        "79f64070bd8389e5cdcf01566bb0da117d1f313a",
+        "30acefe527f81eec1b807d1f3fa4a16ff0bcb549",
         [
          null,
          [
@@ -136380,13 +136835,13 @@
          }
         ]
        ],
-       "corner-shape-render.html": [
-        "6b9acb3447f7745757ca4f749057cd5177e8d59e",
+       "corner-shape-render-fuzzy.html": [
+        "590e960830f595c7bc6f730d12d69e19c2ba0453",
         [
-         "css/css-borders/tentative/corner-shape/corner-shape-render.html?corner-bottom-left-shape=bevel",
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?border-radius=30%&corner-shape=superellipse(-1.5)&box-shadow=10px%2010px%200%2010px%20black",
          [
           [
-           "/css/css-borders/tentative/corner-shape/corner-shape-render-ref.html?corner-bottom-left-shape=bevel",
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?border-radius=30%&corner-shape=superellipse(-1.5)&box-shadow=10px%2010px%200%2010px%20black",
            "=="
           ]
          ],
@@ -136397,11 +136852,11 @@
             [
              [
               0,
-              82
+              200
              ],
              [
               0,
-              800
+              550
              ]
             ]
            ]
@@ -136409,10 +136864,10 @@
          }
         ],
         [
-         "css/css-borders/tentative/corner-shape/corner-shape-render.html?corner-bottom-right-shape=bevel",
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?border-radius=40%&corner-shape=notch&box-shadow=10px%2010px%200%2010px%20yellow",
          [
           [
-           "/css/css-borders/tentative/corner-shape/corner-shape-render-ref.html?corner-bottom-right-shape=bevel",
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?border-radius=40%&corner-shape=notch&box-shadow=10px%2010px%200%2010px%20yellow",
            "=="
           ]
          ],
@@ -136423,11 +136878,11 @@
             [
              [
               0,
-              82
+              200
              ],
              [
               0,
-              800
+              550
              ]
             ]
            ]
@@ -136435,10 +136890,10 @@
          }
         ],
         [
-         "css/css-borders/tentative/corner-shape/corner-shape-render.html?corner-bottom-right-shape=bevel&corner-bottom-left-shape=bevel",
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?border-radius=50%&corner-top-left-shape=scoop&corner-bottom-right-shape=scoop&corner-top-right-shape=notch&corner-bottom-left-shape=notch&border-width=10px",
          [
           [
-           "/css/css-borders/tentative/corner-shape/corner-shape-render-ref.html?corner-bottom-right-shape=bevel&corner-bottom-left-shape=bevel",
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?border-radius=50%&corner-top-left-shape=scoop&corner-bottom-right-shape=scoop&corner-top-right-shape=notch&corner-bottom-left-shape=notch&border-width=10px",
            "=="
           ]
          ],
@@ -136449,11 +136904,11 @@
             [
              [
               0,
-              82
+              200
              ],
              [
               0,
-              800
+              550
              ]
             ]
            ]
@@ -136461,10 +136916,10 @@
          }
         ],
         [
-         "css/css-borders/tentative/corner-shape/corner-shape-render.html?corner-shape=bevel",
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?border-radius=50%&corner-top-right-shape=scoop&corner-bottom-left-shape=scoop&corner-top-left-shape=notch&corner-bottom-right-shape=notch&border-width=10px",
          [
           [
-           "/css/css-borders/tentative/corner-shape/corner-shape-render-ref.html?corner-shape=bevel",
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?border-radius=50%&corner-top-right-shape=scoop&corner-bottom-left-shape=scoop&corner-top-left-shape=notch&corner-bottom-right-shape=notch&border-width=10px",
            "=="
           ]
          ],
@@ -136475,11 +136930,11 @@
             [
              [
               0,
-              82
+              200
              ],
              [
               0,
-              800
+              550
              ]
             ]
            ]
@@ -136487,10 +136942,10 @@
          }
         ],
         [
-         "css/css-borders/tentative/corner-shape/corner-shape-render.html?corner-top-left-shape=bevel",
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-shape=scoop&border-radius=20%&border-width=20px",
          [
           [
-           "/css/css-borders/tentative/corner-shape/corner-shape-render-ref.html?corner-top-left-shape=bevel",
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=scoop&border-radius=20%&border-width=20px",
            "=="
           ]
          ],
@@ -136501,11 +136956,11 @@
             [
              [
               0,
-              82
+              200
              ],
              [
               0,
-              800
+              550
              ]
             ]
            ]
@@ -136513,10 +136968,10 @@
          }
         ],
         [
-         "css/css-borders/tentative/corner-shape/corner-shape-render.html?corner-top-left-shape=bevel&border-radius=40px",
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-shape=scoop&border-radius=20%&border-width=20px&border-top-color=rebeccapurple&border-bottom-color=blue",
          [
           [
-           "/css/css-borders/tentative/corner-shape/corner-shape-render-ref.html?corner-top-left-shape=bevel&border-radius=40px",
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=scoop&border-radius=20%&border-width=20px&border-top-color=rebeccapurple&border-bottom-color=blue",
            "=="
           ]
          ],
@@ -136527,11 +136982,11 @@
             [
              [
               0,
-              82
+              200
              ],
              [
               0,
-              800
+              550
              ]
             ]
            ]
@@ -136539,10 +136994,10 @@
          }
         ],
         [
-         "css/css-borders/tentative/corner-shape/corner-shape-render.html?corner-top-right-shape=bevel",
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-shape=squircle&border-radius=25%&border-width=20px",
          [
           [
-           "/css/css-borders/tentative/corner-shape/corner-shape-render-ref.html?corner-top-right-shape=bevel",
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=squircle&border-radius=25%&border-width=20px",
            "=="
           ]
          ],
@@ -136553,11 +137008,11 @@
             [
              [
               0,
-              82
+              200
              ],
              [
               0,
-              800
+              550
              ]
             ]
            ]
@@ -136565,10 +137020,10 @@
          }
         ],
         [
-         "css/css-borders/tentative/corner-shape/corner-shape-render.html?corner-top-right-shape=bevel&corner-bottom-right-shape=bevel&border-bottom-right-radius=80px&border-width=32px",
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-shape=squircle&border-radius=25%&box-shadow=10px 10px 0 10px black",
          [
           [
-           "/css/css-borders/tentative/corner-shape/corner-shape-render-ref.html?corner-top-right-shape=bevel&corner-bottom-right-shape=bevel&border-bottom-right-radius=80px&border-width=32px",
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=squircle&border-radius=25%&box-shadow=10px 10px 0 10px black",
            "=="
           ]
          ],
@@ -136579,11 +137034,11 @@
             [
              [
               0,
-              82
+              200
              ],
              [
               0,
-              800
+              550
              ]
             ]
            ]
@@ -136591,10 +137046,10 @@
          }
         ],
         [
-         "css/css-borders/tentative/corner-shape/corner-shape-render.html?corner-top-right-shape=bevel&corner-bottom-right-shape=bevel&border-radius=80px",
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-shape=squircle&border-radius=50%",
          [
           [
-           "/css/css-borders/tentative/corner-shape/corner-shape-render-ref.html?corner-top-right-shape=bevel&corner-bottom-right-shape=bevel&border-radius=80px",
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=squircle&border-radius=50%",
            "=="
           ]
          ],
@@ -136605,11 +137060,323 @@
             [
              [
               0,
-              82
+              200
              ],
              [
               0,
-              800
+              550
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-shape=superellipse(-2)&border-radius=20%&border-width=20px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=superellipse(-2)&border-radius=20%&border-width=20px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              200
+             ],
+             [
+              0,
+              550
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-shape=superellipse(-7)&border-radius=20%&border-width=20px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=superellipse(-7)&border-radius=20%&border-width=20px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              200
+             ],
+             [
+              0,
+              550
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-shape=superellipse(0.8)&border-radius=40px&border-width=10px&border-left-color=purple",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=superellipse(0.8)&border-radius=40px&border-width=10px&border-left-color=purple",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              200
+             ],
+             [
+              0,
+              550
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-shape=superellipse(3)&border-radius=40px&box-shadow=10px 10px 0 10px black",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=superellipse(3)&border-radius=40px&box-shadow=10px 10px 0 10px black",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              200
+             ],
+             [
+              0,
+              550
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-shape=superellipse(5)&border-radius=20%&border-width=20px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=superellipse(5)&border-radius=20%&border-width=20px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              200
+             ],
+             [
+              0,
+              550
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-top-left-shape=bevel&border-radius=40px&border-width=10px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-left-shape=bevel&border-radius=40px&border-width=10px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              200
+             ],
+             [
+              0,
+              550
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-top-left-shape=bevel&corner-bottom-right-shape=bevel&border-radius=40px&border-width=10px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-left-shape=bevel&corner-bottom-right-shape=bevel&border-radius=40px&border-width=10px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              200
+             ],
+             [
+              0,
+              550
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-top-left-shape=notch&border-radius=40px&border-width=10px&border-color=blue&border-left-color=yellow",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-left-shape=notch&border-radius=40px&border-width=10px&border-color=blue&border-left-color=yellow",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              200
+             ],
+             [
+              0,
+              550
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-top-left-shape=scoop&corner-top-right-shape=scoop&border-radius=50%",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-left-shape=scoop&corner-top-right-shape=scoop&border-radius=50%",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              200
+             ],
+             [
+              0,
+              550
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-top-left-shape=superellipse(-4)&border-radius=40%",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-left-shape=superellipse(-4)&border-radius=40%",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              200
+             ],
+             [
+              0,
+              550
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-top-left-shape=superellipse(2.5)&border-radius=20%&border-width=10px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-left-shape=superellipse(2.5)&border-radius=20%&border-width=10px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              200
+             ],
+             [
+              0,
+              550
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html?corner-top-right-shape=scoop&border-radius=20%&border-width=10px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-right-shape=scoop&border-radius=20%&border-width=10px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              200
+             ],
+             [
+              0,
+              550
              ]
             ]
            ]
@@ -136617,13 +137384,13 @@
          }
         ]
        ],
-       "corner-shape-straight.html": [
-        "04cd37b5a3170e7a725de9ed2ac92f8801c317c1",
+       "corner-shape-render-precise.html": [
+        "5293589222a3f2d918bdbfeecd11280f667578c2",
         [
-         null,
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?border-radius=50%&corner-shape=bevel&box-shadow=10px%2010px%200%2010px%20black",
          [
           [
-           "/css/css-borders/tentative/corner-shape/corner-shape-straight-ref.html",
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?border-radius=50%&corner-shape=bevel&box-shadow=10px%2010px%200%2010px%20black",
            "=="
           ]
          ],
@@ -136634,11 +137401,586 @@
             [
              [
               0,
-              32
+              180
              ],
              [
               0,
-              32
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?border-top-left-radius=50%&corner-shape=superellipse(0.7)&border-left-width=30px&border-top-width=30px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?border-top-left-radius=50%&corner-shape=superellipse(0.7)&border-left-width=30px&border-top-width=30px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-bottom-left-shape=bevel&border-bottom-left-radius=30px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-bottom-left-shape=bevel&border-bottom-left-radius=30px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-bottom-left-shape=bevel&border-width=10px&border-radius=20px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-bottom-left-shape=bevel&border-width=10px&border-radius=20px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-bottom-right-shape=bevel&border-width=10px&border-radius=20px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-bottom-right-shape=bevel&border-width=10px&border-radius=20px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-bottom-right-shape=bevel&corner-bottom-left-shape=bevel",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-bottom-right-shape=bevel&corner-bottom-left-shape=bevel",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-bottom-right-shape=superellipse(0.8)&border-bottom-right-radius=50%",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-bottom-right-shape=superellipse(0.8)&border-bottom-right-radius=50%",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-shape=square&border-bottom-left-radius=5px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=square&border-bottom-left-radius=5px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-shape=squircle&border-top-left-radius=25%&border-width=10px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=squircle&border-top-left-radius=25%&border-width=10px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-shape=squircle&border-top-left-radius=30%",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=squircle&border-top-left-radius=30%",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-shape=squircle&border-top-right-radius=30px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=squircle&border-top-right-radius=30px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-shape=superellipse(-2)&border-top-left-radius=40%&border-width=20px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=superellipse(-2)&border-top-left-radius=40%&border-width=20px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-shape=superellipse(2.3)&border-radius=40%",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=superellipse(2.3)&border-radius=40%",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-shape=superellipse(3)&border-top-right-radius=33px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-shape=superellipse(3)&border-top-right-radius=33px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-top-left-shape=bevel&border-radius=40px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-left-shape=bevel&border-radius=40px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-top-left-shape=bevel&border-width=10px&border-color=black",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-left-shape=bevel&border-width=10px&border-color=black",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-top-left-shape=scoop&border-radius=40px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-left-shape=scoop&border-radius=40px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-top-left-shape=superellipse(-0.5)&border-radius=40px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-left-shape=superellipse(-0.5)&border-radius=40px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-top-left-shape=superellipse(-4)&border-radius=40px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-left-shape=superellipse(-4)&border-radius=40px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-top-left-shape=superellipse(0.5)&border-radius=40px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-left-shape=superellipse(0.5)&border-radius=40px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-top-right-shape=bevel&border-width=10px&border-color=black",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-right-shape=bevel&border-width=10px&border-color=black",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ],
+        [
+         "css/css-borders/tentative/corner-shape/corner-shape-render-precise.html?corner-top-right-shape=superellipse(-4)&border-top-right-radius=50px",
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html?corner-top-right-shape=superellipse(-4)&border-top-right-radius=50px",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              180
+             ],
+             [
+              0,
+              350
+             ]
+            ]
+           ]
+          ]
+         }
+        ]
+       ],
+       "corner-shape-square.html": [
+        "13ab05cc7f677bab47f1fd5d3aa610897a0ccefe",
+        [
+         null,
+         [
+          [
+           "/css/css-borders/tentative/corner-shape/corner-shape-square-ref.html",
+           "=="
+          ]
+         ],
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              60
+             ],
+             [
+              0,
+              80
              ]
             ]
            ]
@@ -154389,6 +155731,32 @@
        {}
       ]
      ],
+     "at-supports-selector-details-content-before.html": [
+      "731b2c4d6d2f6f871f41ffb4cf6a2e700d992f64",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/at-supports-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "at-supports-selector-details-content.html": [
+      "89e7606de5b27d586468a9ef98788c2988d8adf6",
+      [
+       null,
+       [
+        [
+         "/css/css-conditional/at-supports-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "at-supports-selector-detecting-invalid-in-logical-combinations.html": [
       "ff4c09195a9de215117241abc0601a4f79f5cad1",
       [
@@ -158085,7 +159453,7 @@
       ]
      ],
      "contain-paint-stacking-context-001a.html": [
-      "71102b6c73a3d88cdd953ecf82c69602ff87baa2",
+      "5e588cb61742ca406b23f573dd3609a52a191a1e",
       [
        null,
        [
@@ -158098,7 +159466,7 @@
       ]
      ],
      "contain-paint-stacking-context-001b.html": [
-      "0c4d3323bf7cb28b5a31de8aac41563013b2ecd4",
+      "e03323782a7fbfbb924184fa71b0ab1031381671",
       [
        null,
        [
@@ -160405,6 +161773,19 @@
         {}
        ]
       ],
+      "content-visibility-auto-img-001.html": [
+       "ba6fdd316dc700feafacbe17febcc47330ebb3e4",
+       [
+        null,
+        [
+         [
+          "/css/css-contain/content-visibility/content-visibility-auto-img-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "content-visibility-auto-in-iframe.html": [
        "ba02cac6684d2c283de114c0b00fcd4e6f99f724",
        [
@@ -165842,6 +167223,19 @@
        {}
       ]
      ],
+     "display-contents-inline-002.html": [
+      "f40a34129f348aca37fca83f70598053cf22785b",
+      [
+       null,
+       [
+        [
+         "/css/css-display/display-contents-pass-no-red-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "display-contents-inline-flex-001.html": [
       "43b502731aefbaa348671e32171f0e1eb4bca04b",
       [
@@ -168170,6 +169564,32 @@
         {}
        ]
       ],
+      "flex-abspos-staticpos-align-self-safe-002.html": [
+       "a474254fbd2d34602d9571109bf2cb1b6d84fa06",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-abspos-staticpos-align-self-safe-003.html": [
+       "cfcc8b58fdf8f3749a56f3b3ada1f780f7bd2a94",
+       [
+        null,
+        [
+         [
+          "/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "flex-abspos-staticpos-fallback-justify-content-001.html": [
        "004ce831c2933efadd3d5434ce4201b8d60c3a09",
        [
@@ -169889,7 +171309,7 @@
       ]
      ],
      "fixed-table-layout-with-percentage-width-in-flex-item.html": [
-      "507e0e9fcefd131757ef20bf7cad88a22f6df028",
+      "66cefc8f23cab8a080c98a48b551ac882f045e47",
       [
        null,
        [
@@ -170721,7 +172141,7 @@
       ]
      ],
      "flex-direction.html": [
-      "709b1b036a2abff289cae6bd8e8461887dfdcc97",
+      "01c6778a122c701b2350bfa9518f643919518d9e",
       [
        null,
        [
@@ -177999,7 +179419,7 @@
       ]
      ],
      "gap-007-lr.html": [
-      "9d0a3717816f1850c4cf0a666fe563c9309c7b33",
+      "567dad749dac46887703f44d648b12ef086ee623",
       [
        null,
        [
@@ -178012,7 +179432,7 @@
       ]
      ],
      "gap-007-ltr.html": [
-      "6b24fc44eea9e8cca2d62e550d45ebe395b050db",
+      "e0dfc48f788499db4be8090098abdbde2d274a69",
       [
        null,
        [
@@ -178025,7 +179445,7 @@
       ]
      ],
      "gap-007-rl.html": [
-      "1461416abe9557d55d5eed623b314f0260dc4ddf",
+      "dd0af032bad23d3c6217c58100cfc97a99933e87",
       [
        null,
        [
@@ -178038,7 +179458,7 @@
       ]
      ],
      "gap-007-rtl.html": [
-      "cff3440a760bbd45b32c87017f7c95099bf9ef1c",
+      "d043f03a8dabef7f3c2dd2609d0585919c772821",
       [
        null,
        [
@@ -179029,7 +180449,7 @@
       ]
      ],
      "overflow-area-001.html": [
-      "10685c6e84a1683f75e6822b66d9e02645973ccc",
+      "ac0573a7282fa1a739143c2fba8887f625a47762",
       [
        null,
        [
@@ -179042,7 +180462,7 @@
       ]
      ],
      "overflow-area-002.html": [
-      "1287270f1ef645fb4e04a67fb90b368d03b3f208",
+      "24fb312397dbece40a3262a7ce7678d3ad25b467",
       [
        null,
        [
@@ -179055,7 +180475,7 @@
       ]
      ],
      "overflow-area-003.html": [
-      "ff86dea30f10bf9e8411871b98a249500d74832b",
+      "382fb8863393561389aac105ee24c11d446b22b6",
       [
        null,
        [
@@ -179707,6 +181127,19 @@
        {}
       ]
      ],
+     "stretch-requires-computed-auto-size.html": [
+      "01bc822af2a20636efe2d3a281ddaa41f5898906",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "stretched-child-in-nested-flexbox.html": [
       "325d79e7c63f3e301c21f53f8bc97b48ae15c6b5",
       [
@@ -183325,7 +184758,7 @@
       ]
      ],
      "font-variant-emoji-003.html": [
-      "e197afa7c40f6537a7ab3c57c7143b52126d139f",
+      "a8f3f15e19b04174bc4c855b77f27071ea23b529",
       [
        null,
        [
@@ -183338,7 +184771,7 @@
       ]
      ],
      "font-variant-emoji-004.html": [
-      "d76828dff01d5fab2b374656caab1003d2f84840",
+      "39a910f03de57a32f8a1036512b249695eba5cfa",
       [
        null,
        [
@@ -183350,6 +184783,19 @@
        {}
       ]
      ],
+     "font-variant-emoji-005.html": [
+      "0f5c2d7a98a615323b1adc0babb479fdb738537d",
+      [
+       null,
+       [
+        [
+         "/css/css-fonts/font-variant-emoji-005-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "font-variant-emoji-1.html": [
       "53cf539edd8b61a7f08f8b95ae83f4f7a5179308",
       [
@@ -184909,74 +186355,921 @@
      ]
     },
     "css-gaps": {
-     "tentative": {
-      "grid": {
-       "grid-gap-decorations-001.html": [
-        "5fe13a11bbfdb6086dfac68ef20412d6f8a87dc5",
+     "flex": {
+      "flex-gap-decorations-001.html": [
+       "b32e2f13d8cdb39c12e26423f882734f2f5bf4fd",
+       [
+        null,
         [
-         null,
          [
-          [
-           "/css/reference/ref-filled-green-100px-square.xht",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "grid-gap-decorations-002.html": [
-        "429798d0fe762589b451d4b05aa1be6cac4aed2e",
-        [
-         null,
-         [
-          [
-           "/css/css-gaps/tentative/grid/grid-gap-decorations-002-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "grid-gap-decorations-003.html": [
-        "f9d07a183ec5231a9a71d348d70cacb231fef329",
-        [
-         null,
-         [
-          [
-           "/css/css-gaps/tentative/grid/grid-gap-decorations-003-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "grid-gap-decorations-004.html": [
-        "e28988151a537d3f7df0e0964590c9f2c44ce49d",
-        [
-         null,
-         [
-          [
-           "/css/css-gaps/tentative/grid/grid-gap-decorations-004-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "grid-gap-decorations-005.html": [
-        "741977d2eb47402061fc4976d28bbfcf59d47e13",
-        [
-         null,
-         [
-          [
-           "/css/css-gaps/tentative/grid/grid-gap-decorations-005-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
        ]
-      }
+      ],
+      "flex-gap-decorations-002.html": [
+       "58740200d4a8cdb2a9c450353adb920df97763fd",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/agnostic/gap-decorations-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-003.html": [
+       "effab7fee24a20936dd0cc487947693c8e87a72d",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-004.html": [
+       "a5c0698e7fa3829cd515323dbb851cc55c30db7d",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-005.html": [
+       "1688d447d50dbab028f0a8a82815f5661f921d53",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-006.html": [
+       "3d7dbfd9fedb7513c77b7c5dce132935c8e52617",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-006-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-007.html": [
+       "34853bb32062009381d7d868fcef8c99fdc9ffa8",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-007-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-008.html": [
+       "bd4e73c158c1d329d7c747d69477d19c8ed6c3fd",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-008-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-009.html": [
+       "6bb406c5b0155c7eb65d0117e388bad2272a6ac9",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-009-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-010.html": [
+       "49f6ec962ada962ac2253b148f316df237bbf5e5",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-010-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-011.html": [
+       "7b142e54ec7d0dade4d8e7b5b46a85c70ca6aa8e",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-011-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-012.html": [
+       "2f1f95c00c8c0eed6e11dc10c1e0e90c392ddb6f",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-012-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-013.html": [
+       "1cdf1c2749660c9147dffc07f171f698d6a9fd2b",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-013-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-014.html": [
+       "b7d19549e038ee8efad8d17065071cab00f6b7af",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-014-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-015.html": [
+       "8d100978205684b4a21dfcc2962f6f47bbe5417a",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-015-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-016.html": [
+       "9f956369d48c08793bafca4cd61653dfd963cc77",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-016-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-017.html": [
+       "21fb643a241139915b5d09022513b8f0435b69db",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-017-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-018.html": [
+       "073fa1b9af7a2830021f3d57e0c648fee6084ce8",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/flex/flex-gap-decorations-018-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-019.html": [
+       "5bad5f00d496827b83905aabd39b794e84beae46",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-gap-decorations-022.html": [
+       "5f3b512ef76214b3645c329c92bd06ebf23efd9d",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/agnostic/gap-decorations-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
+     },
+     "grid": {
+      "grid-gap-decorations-001.html": [
+       "648f3f26e56892732d8db78ae0e8a852694f9679",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-002.html": [
+       "7e7e0e4d325a89d96e9e4978da56d410769a5719",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/agnostic/gap-decorations-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-003.html": [
+       "f9d07a183ec5231a9a71d348d70cacb231fef329",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-004.html": [
+       "e28988151a537d3f7df0e0964590c9f2c44ce49d",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-005.html": [
+       "741977d2eb47402061fc4976d28bbfcf59d47e13",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-006.html": [
+       "7b1187c4e44bed68af665462107fa34d7a2cfc4a",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-006-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-007.html": [
+       "adc98e4bc03dd1305402ab33ed1c146f7f4c5718",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-007-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-008.html": [
+       "f8dc0df36e2d7a4a30576e60180647bf7b2edb94",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-008-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-009.html": [
+       "0756b9294be1daae5af190bf27235fdc23f9c5f8",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-009-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-010.html": [
+       "d9201b51cea33053cdab2d55ddb10b06acc7f629",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-010-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-011.html": [
+       "c0540398d0533e66d2f86a3aa15cf4998a4e74f4",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-011-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-012.html": [
+       "26ba45a14ff9b1526bfe44e480171e0f95a0e8a7",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-012-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-013.html": [
+       "4a056134089e58169ae0769633c30ed1ca160478",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-013-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-014.html": [
+       "97ad626e1f24cd489a4470c84118d1161b4c46e2",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-014-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-015.html": [
+       "e575c134353b2c97e16a1440e25fc5d6a28cadc9",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-015-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-016.html": [
+       "a0618e44b56b3621c6d0730a83837792f3b59c21",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-016-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-017.html": [
+       "be0f7fc27515b3d35cde376fd99e6b6c87cfdeb4",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-017-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-018.html": [
+       "dc5e2e38e0b2207388c7c7456758fda49935fb88",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-018-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-019.html": [
+       "637e0467a80116bac40b7270d69e0f0aae214129",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-019-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-020.html": [
+       "eb91644053f7b2287e560c952c1c1600eedf34b1",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-020-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-021.html": [
+       "63db3b4e04868b867d10919f8a1a919eb846b790",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-021-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-022.html": [
+       "ad73239bade785ca3a9d176599ddf75d795e7df1",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-023.html": [
+       "706f66ebcfac1a0000debf4c753f11ca4f481f16",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-023-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-024.html": [
+       "104df87c7e22568b93b758c9d17a395ca9f496b8",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-024-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-025.html": [
+       "fc48f15f5c27d591a0b417355156b1a66f5c31a8",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-025-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-026.html": [
+       "17e0a99dd844d607859d09aa85749b0946431f02",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-026-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-027.html": [
+       "e39305f74b8a432cd5b8a1e386c75daab6c1433d",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-027-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-029.html": [
+       "6da75548d94b5e17e1ad7ba1011662c42b818d83",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-029-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-030.html": [
+       "ef4507ef92638eeff660e67e2024bbce323c1aa8",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-030-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-031.html": [
+       "530b661bfe32c5af7687954f3f4b2cbdfa61380a",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-031-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-032.html": [
+       "ac2d38fdda0ec6a1f4a3b7b091d03c896e3e5e47",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-032-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-033.html": [
+       "47ef35cc3688b2fcd2329558b1d0a27880983b38",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/grid/grid-gap-decorations-033-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "grid-gap-decorations-38.html": [
+       "8b87bcd4860ac50a1c2f3de98cec9599bebb77a3",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/agnostic/gap-decorations-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
+     },
+     "multicol": {
+      "multicol-gap-decorations-001.html": [
+       "c3752156c7d54f6620ade9715b4562582c6135f6",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-002.html": [
+       "0b632fa94ace20a253f5f56079d29adbb7997135",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-003.html": [
+       "2f2473fd04686283e120abd29b5f273da40c3ef3",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-004.html": [
+       "0dcbeef4df82f4d9dc6e2ed2215ee2fa39773052",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-005.html": [
+       "daa65e904e71ee62c83ba2a16933d13311328539",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-006.html": [
+       "64b3b007ab5f6282c95bb79a39a3bcf89d10de88",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-006-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-007.html": [
+       "1f23ed7f7ca34602f4310627edb5ae96885028b8",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-007-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-008.html": [
+       "ed299b5d9f68e8560d99cdd58fcc9b3830929117",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-008-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-009.html": [
+       "b00c6a70f8abf9894e548d9e40882e396ed5b1f0",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-009-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-010.html": [
+       "61bb4a9b93314bb7d96a90b98f67b175a4cf86c6",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-010-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-011.html": [
+       "cf588ded41ea3e811c241984ec8909e5fbcf14be",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-011-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-012.html": [
+       "078b810cf8e608b16dd2a898136f4ce757325ed9",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-012-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-013.html": [
+       "d4170084f066688fd136b2abeb40da03b1243816",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-013-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-014.html": [
+       "1dcd393d99aa19021684e42e9f835e17281fc6a4",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-014-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-015.html": [
+       "65af5112097f1a2d2d80ee5779fe5e5adc8b58a6",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-015-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-016.html": [
+       "da205e0b88bf7f8d8ca0988a54f6ac1237bc1669",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-016-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "multicol-gap-decorations-017.html": [
+       "c7d1fe42584f77e77acd3676f249ffa6510ada3b",
+       [
+        null,
+        [
+         [
+          "/css/css-gaps/multicol/multicol-gap-decorations-017-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
      }
     },
     "css-grid": {
@@ -188788,6 +191081,19 @@
         {}
        ]
       ],
+      "grid-auto-fit-with-calc.html": [
+       "4b655c1e1218923f2ddeb75293dfc87f5ce1c8a8",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "grid-auto-repeat-aspect-ratio-001.html": [
        "bd744cf0cb30fd3349dfa85460ec1dd9ff962c40",
        [
@@ -189049,6 +191355,19 @@
        ]
       ]
      },
+     "grid-flex-spanning-items-001.html": [
+      "f9358b65db96d2e7c184ccabd79c5a95765de90c",
+      [
+       null,
+       [
+        [
+         "/css/css-grid/grid-flex-spanning-items-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "grid-in-table-cell-with-img.html": [
       "492a5866b71cf503ea41c9cb4d862e96c4ee4d18",
       [
@@ -191065,6 +193384,32 @@
         {}
        ]
       ],
+      "replaced-element-016.tentative.html": [
+       "2d5b401b8d20ac682675b3eeb23f264239b83d49",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-element-017.tentative.html": [
+       "575fa8c78179d3741948e0d987fc446534bb6a86",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "table-with-infinite-max-intrinsic-width.html": [
        "877e982cd4c5987f131587da33a23f3b7a49d538",
        [
@@ -192088,6 +194433,19 @@
         {}
        ]
       ],
+      "grid-intrinsic-track-sizes-min-size-001.html": [
+       "d2c8f504bace8a0ad0dd0ed03c3e6c7f8fad11f7",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "grid-layout-free-space-unit.html": [
        "10649a963988bb7060aba3a477fe69d443f0a0ea",
        [
@@ -192332,7 +194690,7 @@
          ]
         ],
         "masonry-grid-item-self-baseline-002a.html": [
-         "6708e58332808b1bba0f20db46cfa062270956b8",
+         "4ece8d754d3d686e4691f5140af9b7f14503e036",
          [
           null,
           [
@@ -192345,7 +194703,7 @@
          ]
         ],
         "masonry-grid-item-self-baseline-002b.html": [
-         "34911b7c9fa632da919b769e015148e2b8c4c488",
+         "cc0eaaa9cc27dc3e54f660314d63f155a838212e",
          [
           null,
           [
@@ -193005,7 +195363,7 @@
          ]
         ],
         "masonry-item-placement-004.html": [
-         "52867cd4a213530e8cb9640b20371a7f35bbaac8",
+         "92741f4b1153ff7487a84e4f053c1288bcd2fa0f",
          [
           null,
           [
@@ -193018,7 +195376,7 @@
          ]
         ],
         "masonry-item-placement-005.html": [
-         "7d4993fb3a61a015af6098e1f79d7e5f94d1b17e",
+         "f879ddce562b40133ac6e5522b86c4bd177c85ef",
          [
           null,
           [
@@ -193031,7 +195389,7 @@
          ]
         ],
         "masonry-item-placement-006.html": [
-         "467e313d339776a90d994459991724b75210e1b9",
+         "0f963762af5a71a73ddbbaa1a6f01ab0396d875a",
          [
           null,
           [
@@ -193044,7 +195402,7 @@
          ]
         ],
         "masonry-item-placement-007.html": [
-         "4c8053ba666b5c6ddc3b61f74a2233151414e4ff",
+         "ebbed114a1171a3218be7e1378c199cb82c0fe97",
          [
           null,
           [
@@ -193069,19 +195427,6 @@
           {}
          ]
         ],
-        "masonry-rows-item-placement-auto-flow-next-001.html": [
-         "c425490d2d8f464e9fae0a1777c4c8366cb283af",
-         [
-          null,
-          [
-           [
-            "/css/css-grid/masonry/tentative/item-placement/masonry-rows-item-placement-auto-flow-next-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
         "masonry-rows-with-grid-width-changed.html": [
          "3a1c4cfa9c065425d8de17dba157663f6024711c",
          [
@@ -193135,19 +195480,6 @@
           ],
           {}
          ]
-        ],
-        "masonry-order-002.html": [
-         "5ebdec27193a454e98fb54ea48508c2b26b3cfa8",
-         [
-          null,
-          [
-           [
-            "/css/css-grid/masonry/tentative/order/masonry-order-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
         ]
        },
        "subgrid": {
@@ -194175,6 +196507,32 @@
         {}
        ]
       ],
+      "line-names-014.html": [
+       "fe1d5d46633568287d502c09e0ae1d30c74d1658",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-names-015.html": [
+       "6f5479abf8932d1e8da9950c339b3c8a2314960b",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "orthogonal-writing-mode-001.html": [
        "1cf99a73e2ef7b0e3fe42bbf8c188fa4d2733979",
        [
@@ -196382,7 +198740,7 @@
       ]
      ],
      "conic-gradient-angle-negative.html": [
-      "5a7030d0ff098d020864ccd16856119026322369",
+      "faf9a2d20336159b7cd0ae0d552a9392eea21287",
       [
        null,
        [
@@ -196397,11 +198755,11 @@
           null,
           [
            [
-            1,
+            0,
             1
            ],
            [
-            40000,
+            0,
             40000
            ]
           ]
@@ -196411,7 +198769,7 @@
       ]
      ],
      "conic-gradient-angle.html": [
-      "ba37ec15e1e4ad6651a5b8e039884d0980d897ca",
+      "500d39366c9f39e63632f46de3f7637194799a14",
       [
        null,
        [
@@ -196426,11 +198784,11 @@
           null,
           [
            [
-            1,
+            0,
             1
            ],
            [
-            40000,
+            0,
             40000
            ]
           ]
@@ -196440,7 +198798,7 @@
       ]
      ],
      "conic-gradient-center.html": [
-      "7e810270567dc7ec63157054d6d6415d38d415e4",
+      "fb2fcd994c4799e5436b93df091aef72aa86e355",
       [
        null,
        [
@@ -196455,11 +198813,11 @@
           null,
           [
            [
-            1,
+            0,
             1
            ],
            [
-            40000,
+            0,
             40000
            ]
           ]
@@ -196663,6 +199021,19 @@
         {}
        ]
       ],
+      "conic-gradient-001.html": [
+       "37e41094fb28a03d3dbbcd6e88c0c36e1e520b62",
+       [
+        null,
+        [
+         [
+          "/css/css-images/gradient/conic-gradient-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "css-color-4-colors-default-to-oklab-gradient.html": [
        "2b1edca0da1e168c3fa921202c54346b911f354a",
        [
@@ -196731,6 +199102,19 @@
         {}
        ]
       ],
+      "gradient-analogous-missing-components-004.html": [
+       "286caa0226a529082daf4b63c60a846344d5f826",
+       [
+        null,
+        [
+         [
+          "/css/css-images/gradient/gradient-analogous-missing-components-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "gradient-decreasing-hue-hsl.html": [
        "973974417ea306380adc4f3fc3e75b6daa0b9af9",
        [
@@ -196877,7 +199261,7 @@
        ]
       ],
       "gradient-eval-004.html": [
-       "ada406fd2a0ec8bea1af74daeafc95563174ac1f",
+       "1a9c43610f41cb8cab10543ffcc3fd7ee378dd07",
        [
         null,
         [
@@ -196897,7 +199281,7 @@
             ],
             [
              0,
-             10000
+             2000
             ]
            ]
           ]
@@ -197150,6 +199534,45 @@
         }
        ]
       ],
+      "gradient-infinity-001.html": [
+       "73b9ac1bd1bc466fa49a822df3d0ac157e19e4e7",
+       [
+        null,
+        [
+         [
+          "/css/css-images/gradient/gradient-infinity-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "gradient-infinity-002.html": [
+       "0f48249259022b475354680f211c32577f7daf45",
+       [
+        null,
+        [
+         [
+          "/css/css-images/gradient/gradient-infinity-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "gradient-infinity-003.html": [
+       "74008e416912c8fd1d65a4f37e6f046ffd39846a",
+       [
+        null,
+        [
+         [
+          "/css/css-images/gradient/gradient-infinity-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "gradient-longer-hue-hsl-001.html": [
        "ca5eb76c0f1be8971df228d75d34f2a8bc5f36d5",
        [
@@ -197680,6 +200103,90 @@
         }
        ]
       ],
+      "gradient-powerless-hue-hsl.html": [
+       "7b37596bfacada02dbf7c8ffa5e2fe74a2a74d1c",
+       [
+        null,
+        [
+         [
+          "/css/css-images/gradient/gradient-powerless-hue-hsl-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "gradient-powerless-hue-hwb.html": [
+       "e04e5f1bffcae04cbb7ae49e718633dc1e9b123f",
+       [
+        null,
+        [
+         [
+          "/css/css-images/gradient/gradient-powerless-hue-hwb-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "gradient-powerless-hue-lch.html": [
+       "b0485869d1d1e5e3e84c0399b27bf86359630388",
+       [
+        null,
+        [
+         [
+          "/css/css-images/gradient/gradient-powerless-hue-lch-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             1,
+             1
+            ],
+            [
+             0,
+             1500
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "gradient-powerless-hue-oklch.html": [
+       "68c4e120279b3190b281aae548df0209a3ec8908",
+       [
+        null,
+        [
+         [
+          "/css/css-images/gradient/gradient-powerless-hue-oklch-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             1,
+             1
+            ],
+            [
+             0,
+             500
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
       "gradient-single-stop-001.html": [
        "1e89b3ffc67766552529f7dd09c8590b2c55c27c",
        [
@@ -199644,6 +202151,45 @@
        {}
       ]
      ],
+     "linear-gradient-body-sibling-index.html": [
+      "299b86d464ad54f383ce8f384ec6677b3d3e305b",
+      [
+       null,
+       [
+        [
+         "/css/css-images/linear-gradient-body-sibling-index-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "linear-gradient-calc-em-units.html": [
+      "e764e62890dad81adfda9d60d50d82a1e07c5de5",
+      [
+       null,
+       [
+        [
+         "/css/css-images/linear-gradient-calc-em-units-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "linear-gradient-sibling-index.html": [
+      "b92897e0697441df6876b88e53daa148a5edb009",
+      [
+       null,
+       [
+        [
+         "/css/css-images/linear-gradient-sibling-index-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "multiple-position-color-stop-conic-2.html": [
       "f3171bf3fb9823095312ab080ee3d0481a8545f6",
       [
@@ -199658,7 +202204,7 @@
       ]
      ],
      "multiple-position-color-stop-conic.html": [
-      "41aa505c879562f90658f0f8fd83f597a62d44d8",
+      "50ec959e221fa4648ecd16b83c19c7da17e889cd",
       [
        null,
        [
@@ -199673,11 +202219,11 @@
           null,
           [
            [
-            1,
+            0,
             1
            ],
            [
-            10000,
+            0,
             10000
            ]
           ]
@@ -199755,7 +202301,7 @@
       ]
      ],
      "normalization-conic-2.html": [
-      "9856f6b8f2c1472330a97cf79b553e7703cb1df5",
+      "a42829537adea01832a84a97446be73a0e7de520",
       [
        null,
        [
@@ -199770,11 +202316,11 @@
           null,
           [
            [
-            1,
+            0,
             1
            ],
            [
-            10000,
+            0,
             10000
            ]
           ]
@@ -199784,7 +202330,7 @@
       ]
      ],
      "normalization-conic-degenerate.html": [
-      "6905c39ef9d2c2c92c8ad2b1029ae1feb6e4f2e5",
+      "047aaecd46fd3384f465e4b2ed2863804d9e2462",
       [
        null,
        [
@@ -199799,11 +202345,11 @@
           null,
           [
            [
-            1,
+            0,
             1
            ],
            [
-            10000,
+            0,
             10000
            ]
           ]
@@ -199813,7 +202359,7 @@
       ]
      ],
      "normalization-conic.html": [
-      "21fb8bae8a62043ca63b60006443a558c42f6dee",
+      "3631c8e0df346c64ae9570debc9eb582e668da25",
       [
        null,
        [
@@ -199828,11 +202374,11 @@
           null,
           [
            [
-            1,
+            0,
             1
            ],
            [
-            10000,
+            0,
             10000
            ]
           ]
@@ -200420,7 +202966,7 @@
       ]
      ],
      "object-fit-containcontainintrinsicsize-png-001c.tentative.html": [
-      "b17f59f887f216f11a386077c41156388624ee27",
+      "dd1bf249a5555aaeec924de5d944442b55452e2f",
       [
        null,
        [
@@ -200472,7 +203018,7 @@
       ]
      ],
      "object-fit-containsize-png-001c.tentative.html": [
-      "43a50adcedcf2bcdf81d86f717ec52e6a96e0f1a",
+      "733b7592f3ba8f748300c7ee681b765ba66cb559",
       [
        null,
        [
@@ -203013,7 +205559,7 @@
       ]
      ],
      "out-of-range-color-stop-conic.html": [
-      "1fe59a5a6b917062b834ef898345ace2a0c90217",
+      "16bdccb948ce5bb0011e83022c550cb8015f4c9b",
       [
        null,
        [
@@ -203028,11 +205574,11 @@
           null,
           [
            [
-            1,
+            0,
             1
            ],
            [
-            40000,
+            0,
             40000
            ]
           ]
@@ -203149,7 +205695,7 @@
       ]
      ],
      "tiled-conic-gradients.html": [
-      "eab48b83e92572f3936bd9601876633c47d4bf48",
+      "c5902c07c9afc0d070405b414456f0d763657038",
       [
        null,
        [
@@ -203164,11 +205710,11 @@
           null,
           [
            [
-            1,
+            0,
             1
            ],
            [
-            40000,
+            0,
             40000
            ]
           ]
@@ -204901,7 +207447,7 @@
        ]
       ],
       "text-box-trim-not-ignore-nested-text-box-edge.html": [
-       "067281d893afb1c69e96c523a3ebb334f8c09825",
+       "4f8568acf8a9545c07f243ce8fc8e8ecb4bfd18e",
        [
         null,
         [
@@ -209279,6 +211825,19 @@
          {}
         ]
        ],
+       "clip-path-animation-geometry-box-delay.html": [
+        "a6040d445a90c35f811ba31a70622b1b88351af1",
+        [
+         null,
+         [
+          [
+           "/css/css-masking/clip-path/animations/clip-path-animation-non-shape-delay-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "clip-path-animation-incompatible-shapes1.html": [
         "88c6862aa9ede58f0d2d0b384f2454ed6130c86f",
         [
@@ -209515,6 +212074,19 @@
          {}
         ]
        ],
+       "clip-path-animation-reference-delay.html": [
+        "4afecbbf9870560718be1ec454d40261326928b5",
+        [
+         null,
+         [
+          [
+           "/css/css-masking/clip-path/animations/clip-path-animation-non-shape-delay-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "clip-path-animation-revert-layer.html": [
         "cc23c96e2ee76f75cb30280320da3ee9e4cbdb1b",
         [
@@ -209542,7 +212114,7 @@
         ]
        ],
        "clip-path-animation-svg-zoom.html": [
-        "f7be6d25324ce92e6bf56921fffb3eeec27cfd98",
+        "0accfd2102b72b196a4cfa987f88a5e31223d249",
         [
          null,
          [
@@ -209551,7 +212123,23 @@
            "=="
           ]
          ],
-         {}
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              10
+             ],
+             [
+              0,
+              2
+             ]
+            ]
+           ]
+          ]
+         }
         ]
        ],
        "clip-path-animation-svg.html": [
@@ -215784,6 +218372,19 @@
         ],
         {}
        ]
+      ],
+      "mask-under-border-radius.html": [
+       "a33e71ae121953a386bacb06f6f1b5dee4ee22c0",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      },
      "mask-svg-content": {
@@ -216388,6 +218989,162 @@
        {}
       ]
      ],
+     "column-height-001.html": [
+      "cb7cb6323f5a77fe0d461cd687fa589dd66a038a",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "column-height-002.html": [
+      "902076a65a8d224059cb4e9ad57ad024bf888c00",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "column-height-003.html": [
+      "879358c1803c49374f98092aaa7301c03ed30ddb",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "column-height-004.html": [
+      "07107f3c3695038030e09395b49831d000d58eef",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "column-height-005.html": [
+      "73303e275a80aec37e6910e6a0b7f62baafdee60",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "column-height-006.html": [
+      "773f25edd5c7b6015c8d2185c0f6dca8a189aeb0",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "column-height-007.html": [
+      "4e7308dbd12025ea9d0b9b2b930595a974fb8ee7",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "column-height-008.html": [
+      "f8ef2b1477f4be36a2300bc7b45d2393a4abb56d",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "column-height-009.html": [
+      "1e08242e0f9c9dc415854af29ce04a6e7ee2ef9e",
+      [
+       null,
+       [
+        [
+         "/css/css-multicol/column-height-009-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "column-height-010.html": [
+      "8c7e8d5b0f166e34c05e2b3e1c97f2750f12a3ef",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "column-height-011.html": [
+      "37495a15a097b8927fcda5f46c83060652b77c82",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "column-height-012.html": [
+      "b663ea981ce34a0b04348e9b4185bd56a3f4e314",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "column-pseudo-background-color.html": [
       "f321b1076eb58fcc00add55ab9f7dacd9daa2fba",
       [
@@ -218209,7 +220966,7 @@
       ]
      ],
      "multicol-nested-016.html": [
-      "ad4b6a5aaaf9390917d2c6566e5e7758bfc1b1ec",
+      "2f428957da44b29bc00948e7de89c04540f4e552",
       [
        null,
        [
@@ -219382,7 +222139,7 @@
       ]
      ],
      "multicol-span-all-children-height-001.html": [
-      "3226e81c3205528f72ca4ce2f96d9a700d6fa78d",
+      "64c04c868d925154cdd1aa62ad061b43d8073304",
       [
        null,
        [
@@ -220707,6 +223464,19 @@
        {}
       ]
      ],
+     "resize-multicol-with-fixed-size-children-002.html": [
+      "9a582bf51771454df6226b8fa26d982c66ec5ea9",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "resize-multicol-with-fixed-size-children.html": [
       "a3963d06a3d71d50833f6df382e5b330011fe059",
       [
@@ -222207,6 +224977,162 @@
         {}
        ]
       ],
+      "block-ellipsis-011.tentative.html": [
+       "9ee252082399c2967cb70c4dbf0ca7fdd9a28028",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/block-ellipsis-011-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-ellipsis-012.tentative.html": [
+       "54dd4df51417f31e68dbfa956aa8024a75df49a2",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/block-ellipsis-012-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-ellipsis-013.html": [
+       "576ec3aec5460f6d0f12de65a73bee8cbbc60292",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/block-ellipsis-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-ellipsis-014.html": [
+       "3fa55ddde4da4c04f6b32a6827ac2146e2177355",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/block-ellipsis-014-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-ellipsis-015.html": [
+       "22b125f0f50140c367eb080333dccb016b06fc19",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/block-ellipsis-015-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-ellipsis-016.html": [
+       "7c7256a953a3a60f5ed06aa6cb25fb036b733ac5",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/block-ellipsis-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-ellipsis-017.html": [
+       "9c84673e9e8a7a5efdfd14a9db9dec66d75af4af",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/block-ellipsis-017-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-ellipsis-018.html": [
+       "9c4ae82d0038311852cc63d2116c11c3bde8421c",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-ellipsis-019.tentative.html": [
+       "afee5d6eddc1336adbed4d4ae235ea53a058a3fe",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-ellipsis-020.tentative.html": [
+       "473aad392c1207213c9547be4eae24c94aac7cd9",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-ellipsis-021.tentative.html": [
+       "517245ac8b09285d8da041adfdb5fe2030ee2fb8",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-ellipsis-022.html": [
+       "caa3489e6c5a54fcdb259b092f89dcd107b9bc99",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/block-ellipsis-022-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "line-clamp-001.html": [
        "c8cfcb1066de1a1d5c98e147c8e47499069046be",
        [
@@ -222741,7 +225667,7 @@
        ]
       ],
       "line-clamp-auto-009.tentative.html": [
-       "44d111056c6b021c796ea694d744816125314def",
+       "33d4a9abbae87bf252413324ac61100c7b1c8f55",
        [
         null,
         [
@@ -222754,7 +225680,7 @@
        ]
       ],
       "line-clamp-auto-010.tentative.html": [
-       "cb706bba08e2c9dd6ff05b926be23eb22c9c25b7",
+       "6b69dc0030aee0ed209b031f6da6870e4c874c1d",
        [
         null,
         [
@@ -222948,19 +225874,6 @@
         {}
        ]
       ],
-      "line-clamp-auto-025.tentative.html": [
-       "ab741d3df4d9ba823897ee1bcff1de9118353ada",
-       [
-        null,
-        [
-         [
-          "/css/css-overflow/line-clamp/reference/webkit-line-clamp-005-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
       "line-clamp-auto-027.tentative.html": [
        "9ed461d8cfb4c2ee035987148e15b6dcce3cdffa",
        [
@@ -223014,7 +225927,7 @@
        ]
       ],
       "line-clamp-auto-031.tentative.html": [
-       "a723430c83ed7f0ea8ae8f2966d971c5c56d3cff",
+       "737caff7775d59ba02320bf942d479f083a0041c",
        [
         null,
         [
@@ -223182,8 +226095,8 @@
         {}
        ]
       ],
-      "line-clamp-with-abspos-001.tentative.html": [
-       "79667f23fbdc3d941484c343b2cf0a04ec34363f",
+      "line-clamp-with-abspos-001.html": [
+       "fd261493f0653a2cceaac302ca74640b3ce91db3",
        [
         null,
         [
@@ -223195,8 +226108,8 @@
         {}
        ]
       ],
-      "line-clamp-with-abspos-002.tentative.html": [
-       "cecb9d52bc63ec161dd96dfadcef166edd9334ed",
+      "line-clamp-with-abspos-002.html": [
+       "233a345c927e7af439943144a0ee6c989835744e",
        [
         null,
         [
@@ -223208,34 +226121,34 @@
         {}
        ]
       ],
-      "line-clamp-with-abspos-003.tentative.html": [
-       "e4bd1de222e2b75455ae50d4c8bfa5c62b0c47c2",
+      "line-clamp-with-abspos-003.html": [
+       "8b5d681d97c24b180f5dea407b1b94747c1b393a",
        [
         null,
         [
          [
-          "/css/css-overflow/line-clamp/reference/webkit-line-clamp-005-ref.html",
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-001-ref.html",
           "=="
          ]
         ],
         {}
        ]
       ],
-      "line-clamp-with-abspos-004.tentative.html": [
-       "483e6d1da6dc739599e25f3172b0ad248ac23c1b",
+      "line-clamp-with-abspos-004.html": [
+       "c079974ac5c134474e9d16cd0317f29957a773fa",
        [
         null,
         [
          [
-          "/css/css-overflow/line-clamp/reference/webkit-line-clamp-005-ref.html",
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-001-ref.html",
           "=="
          ]
         ],
         {}
        ]
       ],
-      "line-clamp-with-abspos-005.tentative.html": [
-       "3dc77831a06ffd28df3a5a4dca6045cba30fe1dd",
+      "line-clamp-with-abspos-005.html": [
+       "58656135cf00e70846cb057a03414879f9bd25f2",
        [
         null,
         [
@@ -223247,47 +226160,73 @@
         {}
        ]
       ],
-      "line-clamp-with-abspos-006.tentative.html": [
-       "f18fed6c2daea0ab6e1ab715c1257407067fa97b",
+      "line-clamp-with-abspos-006.html": [
+       "39f1758fa18f30c72db2c27fb442041e8bc4fdd0",
        [
         null,
         [
          [
-          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-006-ref.html",
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-005-ref.html",
           "=="
          ]
         ],
         {}
        ]
       ],
-      "line-clamp-with-abspos-007.tentative.html": [
-       "f0a1f58c8d304aead5490db007f763d437e9c5ad",
+      "line-clamp-with-abspos-007.html": [
+       "f5b4e6ce291681dd7adfa87302bb2e61ca693a1c",
        [
         null,
         [
          [
-          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-007-ref.html",
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-005-ref.html",
           "=="
          ]
         ],
         {}
        ]
       ],
-      "line-clamp-with-abspos-008.tentative.html": [
-       "9c62e44f3897b5868dde26a6d6c203c7ddea4b8a",
+      "line-clamp-with-abspos-008.html": [
+       "cd619d515383e2dc418b7e6ab1b1da30c076a3b4",
        [
         null,
         [
          [
-          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-008-ref.html",
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-005-ref.html",
           "=="
          ]
         ],
         {}
        ]
       ],
-      "line-clamp-with-abspos-009.tentative.html": [
-       "dce04d720cfc83d82e2228204b7f6d41e244aabf",
+      "line-clamp-with-abspos-009.html": [
+       "b3d332811d6a6539ab9524c47b9eae3ffc09ea57",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-009-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-abspos-010.html": [
+       "8a7c2790d6c997b62ccc1bdf7d2e051822798e8a",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-009-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-abspos-011.html": [
+       "cb4ab0514809e8ce7b6569f922a985f2e429414c",
        [
         null,
         [
@@ -223299,34 +226238,8 @@
         {}
        ]
       ],
-      "line-clamp-with-abspos-010.tentative.html": [
-       "325278b3a0b44f480ea020c575b9427b33f2ec4e",
-       [
-        null,
-        [
-         [
-          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-010-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "line-clamp-with-abspos-011.tentative.html": [
-       "ab5102a7cf2ea75cdb4729092d7618882e9c6ddf",
-       [
-        null,
-        [
-         [
-          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-011-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "line-clamp-with-abspos-012.tentative.html": [
-       "bed065f38381a9b151cee045b37b45de8f7cd0fb",
+      "line-clamp-with-abspos-012.html": [
+       "ae2f0364f39550edbc1e2ccfe094167bd1551f79",
        [
         null,
         [
@@ -223338,8 +226251,34 @@
         {}
        ]
       ],
-      "line-clamp-with-abspos-013.tentative.html": [
-       "ccea125f7246cf526da15a469261c3e90d4d2609",
+      "line-clamp-with-abspos-013.html": [
+       "66a615ddd1c9b32903447a3aa8332ad87d5536cb",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-013-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-abspos-014.html": [
+       "e8257d1d40297ba0603d4c20d8fd79a97e08b714",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-013-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-abspos-015.html": [
+       "273610e071dbc2e355b8dc03ba96fae3882a4801",
        [
         null,
         [
@@ -223351,8 +226290,307 @@
         {}
        ]
       ],
-      "line-clamp-with-abspos-014.tentative.html": [
-       "ea2f531207084097c4ab0406a270b045894a0d5d",
+      "line-clamp-with-abspos-016.html": [
+       "0b329a7d734b048e563faf8dbcfe6fdc35b9e8ed",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-016-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-abspos-017.tentative.html": [
+       "8ae9cc949c69b20a4227d66348c6a7c552de8748",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/webkit-line-clamp-030-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-abspos-018.html": [
+       "27139b18b8dec8f18efee3fa6bb9dc198d61c122",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-018-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-abspos-019.html": [
+       "237ed69b67d29458ebbf9881b97bc6f5c0abbea4",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-019-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-abspos-020.html": [
+       "55fb07c2061593aa17f0404c1eedfaf550ce1dae",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/webkit-line-clamp-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-abspos-021.html": [
+       "21a0e96eee3fef22f8c44ba418e438db6ea2f0cc",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/webkit-line-clamp-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-abspos-022.html": [
+       "6599365883b6d0a8507c4de31d033caa153dc114",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/webkit-line-clamp-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-001.html": [
+       "7f69c970baa5d81de1f0cf005e073481d44a41d7",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-002.html": [
+       "90eecbd6af6a9b0e58413843ab9962ef194be16e",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-003.html": [
+       "c4bc8a64784fac808edc4e1249d9a0e3c0a7b19f",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-004.html": [
+       "673b7d8c9d811c31e0d8ef383c56512977d6be89",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-005.html": [
+       "22cf7e0c132c0159a256a9a503962ac23068ae5e",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-006.html": [
+       "46f2e0b2b3976325e178f545ba2e00d004faa111",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-007.html": [
+       "0197ecb6d4a40c2cecc5461667d77bccc653ef8f",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-008.html": [
+       "b14856a417f3e621085eefa7d2fe1d6a72cc87b4",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-009.html": [
+       "93faeed3bb10e75fa5357d164bdf4e8f199203b9",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-009-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-010.html": [
+       "8bd64fee61575251b6682ce7e6ccb14d4e4e18d0",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-009-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-011.html": [
+       "70273b36cda05e585483c0f690e58c38504d00d0",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/webkit-line-clamp-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-012.html": [
+       "0e5584db10ba179821e784ce8709beb8188edf0d",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/webkit-line-clamp-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-013.html": [
+       "580619be41e76bd45fbcde4f5ddbcf64f909ad3d",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-013-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-014.html": [
+       "371fb5957024db34777a4383bb7d981715d51ecd",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-013-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-015.html": [
+       "a458c11c04ea4599982047c8c403eca1212ee955",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/webkit-line-clamp-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-016.html": [
+       "07a6f4e4f0d518a270e51a5ee7343677c43f28e3",
+       [
+        null,
+        [
+         [
+          "/css/css-overflow/line-clamp/reference/webkit-line-clamp-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "line-clamp-with-fixed-pos-017.html": [
+       "97c77429ee49e9d00f9e6b12b852ec22866b1c7d",
        [
         null,
         [
@@ -223937,7 +227175,7 @@
        ]
       ],
       "webkit-line-clamp-036.html": [
-       "b8d7b194f05dd8dc1189900b399188e0d17391d1",
+       "437a93a711d5611f19ce2f0bc6442a483743b7bb",
        [
         null,
         [
@@ -223950,7 +227188,7 @@
        ]
       ],
       "webkit-line-clamp-037.html": [
-       "86015228f88e4c622c4bd1c20cb35a20619075c7",
+       "70c33f75d1107d83ca0e11e567d6a66fe1520cb9",
        [
         null,
         [
@@ -224144,7 +227382,7 @@
         {}
        ]
       ],
-      "webkit-line-clamp-abspos-001.tentative.html": [
+      "webkit-line-clamp-abspos-001.html": [
        "fb8e027740d7991015313d62df86fbd147aa2f8b",
        [
         null,
@@ -224210,6 +227448,19 @@
        {}
       ]
      ],
+     "nested-scroll-markers-under-content-visibility-auto.html": [
+      "0cb62fec70e8e4e83fffec54b1bd1a1a13de1c13",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/nested-scroll-markers-under-content-visibility-auto-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "no-scrollable-overflow-vertical-rl-2.html": [
       "895f9bafc621329b95d1bb2fe086602945991cde",
       [
@@ -225077,6 +228328,32 @@
        {}
       ]
      ],
+     "root-scroll-button.html": [
+      "a4f96f45cbc80a8225f1cecf7f9defe0688a80b2",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/root-scroll-button-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "root-scroll-marker.html": [
+      "48f3a81338a8f0c0445ab1365349d047493e92fc",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/root-scroll-marker-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "rounded-overflow-clip-visible.html": [
       "65e7f055a3907da79701f1f8d68f6527d7c69181",
       [
@@ -225441,6 +228718,149 @@
        {}
       ]
      ],
+     "scroll-marker-contain-001.tentative.html": [
+      "93d7df72508d19d89ac6c2d775e24a1937b660aa",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/scroll-marker-contain-001-ref.tentative.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scroll-marker-contain-002.tentative.html": [
+      "af2a5e668be4673ae5d976fa901fd5106dc8ad1c",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/scroll-marker-contain-002-ref.tentative.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scroll-marker-contain-003.tentative.html": [
+      "59daa5cf5ced7c57248cfbbf4fef637ad91728be",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/scroll-marker-contain-003-ref.tentative.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scroll-marker-contain-004.tentative.html": [
+      "2ec6f6bde76fb3c16b04628f49415edda014985e",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/scroll-marker-contain-001-ref.tentative.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scroll-marker-contain-005.tentative.html": [
+      "3d435bf74cbe204857b62974bcd0f12ee1ec8430",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/scroll-marker-contain-001-ref.tentative.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scroll-marker-contain-006.tentative.html": [
+      "234b57e5bbea2b29a1beb2671fb1b6a1ec1de976",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/scroll-marker-contain-001-ref.tentative.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scroll-marker-contain-007.tentative.html": [
+      "5f15c85819a3d00ca9d3088425345bbc9be60cb3",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/scroll-marker-contain-001-ref.tentative.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scroll-marker-contain-008.tentative.html": [
+      "80801854a0f05abb47243873ae084a1564e5cd30",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/scroll-marker-contain-008-ref.tentative.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scroll-marker-contain-009.tentative.html": [
+      "8037adf8441168ec87f118c1da3a6a7bede7ef77",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/scroll-marker-contain-009-ref.tentative.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scroll-marker-contain-010.tentative.html": [
+      "fbdad62f84665ea55b8c7d647b631b0f215f1e19",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/scroll-marker-contain-009-ref.tentative.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "scroll-marker-contain-011.tentative.html": [
+      "8cfc78130e0f93ddf3a768b0b582f292d9c4291c",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/scroll-marker-contain-009-ref.tentative.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "scroll-marker-counters.html": [
       "25e4fdfd24f849128c711cdc5a8610abba5e1d8f",
       [
@@ -226152,6 +229572,35 @@
        }
       ]
      ],
+     "scrollbar-gutter-with-background-gradient.html": [
+      "0b392446c20145cda9b15922bdffc970b1321218",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/scrollbar-gutter-with-background-gradient-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            70000
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
      "scrollbar-large-scale-in-iframe.html": [
       "1808d1dc8a97496453dfe00dc3a0b96b8b2dc184",
       [
@@ -230475,6 +233924,19 @@
         {}
        ]
       ],
+      "position-sticky-table-pixel-rounding.html": [
+       "3bda20efc9d7381f5967810711d552fe4a2a57b8",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-table-pixel-rounding-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "position-sticky-table-td-bottom.html": [
        "7cd3b8d695e00a68e58c9016aa2990eaf78ba846",
        [
@@ -230514,6 +233976,19 @@
         {}
        ]
       ],
+      "position-sticky-table-td-subpixel-zoom.html": [
+       "ecdda37c39a507413cf3ee3aec68e608efc12e83",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-table-td-subpixel-zoom-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "position-sticky-table-td-top.html": [
        "46931333c6a0db7d73aaf685e5215fe383172241",
        [
@@ -236123,7 +239598,7 @@
       ]
      ],
      "has-slotted-001.html": [
-      "e750d97a180b5daa6eb0ac18e7178372eeaf96b6",
+      "4e3de3f6adbdfc20fa6a441d23b90d3e9f28c7ea",
       [
        null,
        [
@@ -236149,7 +239624,7 @@
       ]
      ],
      "has-slotted-003.html": [
-      "7578413ff3977094a5ffbcb151498a92ddc4c36d",
+      "d13911e96b76f524e9d934a3a3d13e24360111b7",
       [
        null,
        [
@@ -236551,6 +240026,19 @@
        {}
       ]
      ],
+     "host-has-internal-004.html": [
+      "fe51186f59f88bdfcf5ed8641938b7491024bfda",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "host-is-001.html": [
       "16d0dd76691362ee963e386a2fd238783c096243",
       [
@@ -237085,7 +240573,7 @@
       ]
      ],
      "slotted-has-001.html": [
-      "f70bac7eca386d9060530c2c7b7048cc3c5c2f57",
+      "dcb11ec32eaea0b9982f8d5bc6b4a6cad7c41fad",
       [
        null,
        [
@@ -237098,7 +240586,7 @@
       ]
      ],
      "slotted-has-002.html": [
-      "9ecbea5d413f9244e346e90b25c678471dfc9b53",
+      "5e709a969619b3b48f62231c4ac30209388dc8a5",
       [
        null,
        [
@@ -237111,7 +240599,7 @@
       ]
      ],
      "slotted-has-003.html": [
-      "1ea412492c567e82fe8e911a90cfd5e54f704907",
+      "548f2c5d421d673367abc89c9289d756cf463016",
       [
        null,
        [
@@ -237124,7 +240612,7 @@
       ]
      ],
      "slotted-has-004.html": [
-      "adf50da13a95a5e95e681cb726ac0c1991394d3d",
+      "7e76b1b6de62920eb863a7fb114de6ba6c160b78",
       [
        null,
        [
@@ -244515,7 +248003,7 @@
        ]
       ],
       "replaced-element-013.html": [
-       "bcbf653d68af4c1f908a59ca6e66e5752a09c833",
+       "564858e360eee6aaa676224fe342409d06486f1b",
        [
         null,
         [
@@ -244528,7 +248016,7 @@
        ]
       ],
       "replaced-element-014.html": [
-       "4c1ad16ce8624295251b73d1a14f53b9c9905610",
+       "8b7bdafc10770d3f3371c5ec7a699f4189c982cb",
        [
         null,
         [
@@ -244852,6 +248340,32 @@
         {}
        ]
       ],
+      "replaced-element-045.html": [
+       "3339de4cb7dfc7aaf7cb8f27de542515626a0563",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-element-046.html": [
+       "13a9fd99513aa622bf1338a497d5810822de1aaf",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "replaced-element-dynamic-aspect-ratio.html": [
        "d4b83d3673cbfba940baec1c88f3e6630c760eb4",
        [
@@ -247169,6 +250683,32 @@
        {}
       ]
      ],
+     "intrinsic-percent-replaced-029.tentative.html": [
+      "feff03bbe2e1a1e18a22429a58a9d20cc0f9987b",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "intrinsic-percent-replaced-030.tentative.html": [
+      "5a6b103c22e20d23aa842e72ac6ffe6c9948156f",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "intrinsic-percent-replaced-dynamic-001.html": [
       "1128ffa1759f26011c0639d8b5f498322c6396ac",
       [
@@ -247325,6 +250865,71 @@
        {}
       ]
      ],
+     "margin-collapse-with-indefinite-block-size-001.html": [
+      "47d2a0a043d32ba6220c1dd6a26859908a19bf6e",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "margin-collapse-with-indefinite-block-size-002.html": [
+      "eb401c92b5e9475129f39be9980f47f42cb2bfa0",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "margin-collapse-with-indefinite-block-size-003.html": [
+      "51f16f68e6998de4956a5f0615b49406fcacb02e",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "margin-collapse-with-indefinite-block-size-004.html": [
+      "c393560d6c6ce799943db09468ba8e5cb0e90a5c",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "margin-collapse-with-indefinite-block-size-005.html": [
+      "27814994aaac7ead76f67d051e8744323e8f4247",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "max-content-input-001.html": [
       "aabbea015748f9276718e2ba9728efc375c8910b",
       [
@@ -247338,6 +250943,19 @@
        {}
       ]
      ],
+     "min-content-le-max-content.tentative.html": [
+      "81bc6969d50cd57e33b0268bc26bec6ec42ea6a9",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "min-content-min-width-000.html": [
       "9dff1b973477b15b1118787e4ad5d213abfb6809",
       [
@@ -248728,7 +252346,7 @@
       ]
      ],
      "collapsed-border-remove-row-group.html": [
-      "39b89956c54c3b589e9396c23a7ce87c6028a2cb",
+      "44e7cabd7e9fe570afb8550a1a74b55c67641aad",
       [
        null,
        [
@@ -253558,6 +257176,19 @@
         {}
        ]
       ],
+      "letter-spacing-cursive-001.html": [
+       "5700c600981ab815e2ecf33577a6408d8e54dee1",
+       [
+        null,
+        [
+         [
+          "/css/css-text/letter-spacing/reference/letter-spacing-cursive-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "letter-spacing-end-of-line-001.html": [
        "645ef10509803cb86b31c7250928c007acb21431",
        [
@@ -255058,7 +258689,7 @@
        ]
       ],
       "line-breaking-022.html": [
-       "3591f46534a808a95bfdaf375b0862f32f8acdf3",
+       "dc7a3c28786d5ba71958649396dafcae59410059",
        [
         null,
         [
@@ -259204,7 +262835,7 @@
        ]
       ],
       "text-autospace-break-001.html": [
-       "fd843bc6636066800486aebab172f7d1344294f7",
+       "6e540d8f1e1feb264d0ceb6f8de2f6849b71ea37",
        [
         null,
         [
@@ -259779,7 +263410,7 @@
        ]
       ],
       "text-justify-006.html": [
-       "7744f52afea63d9b1abe7c7edab4880d703be855",
+       "80c574d28cb2afdfeb64b644e3a73e050107f72c",
        [
         null,
         [
@@ -265252,7 +268883,7 @@
        ]
       ],
       "text-wrap-balance-before-after-001.html": [
-       "9f5741e23492875670f1406e934a1306bdd51973",
+       "7176768b8df4fe19d63188097cd8be96c43ae1cb",
        [
         null,
         [
@@ -265265,7 +268896,7 @@
        ]
       ],
       "text-wrap-balance-before-after-002.html": [
-       "e9d08953fac0963ba2a9639ac9aabb6f3f59764b",
+       "60e3a777df33b008284669c35c64742ea19d6ba0",
        [
         null,
         [
@@ -268255,7 +271886,7 @@
        ]
       ],
       "word-break-break-all-ethiopic.html": [
-       "1fa7f9054a9893bcc058683392b77ee0904a6203",
+       "ef45231d3596f29d671e106cad8785e3d5cb38ae",
        [
         null,
         [
@@ -272423,7 +276054,7 @@
        ]
       ],
       "decorations-multiple-zorder.html": [
-       "22406534b689e1ee810a4ad3eb5e41a86f93e088",
+       "b221092252b43d1ea9728b80a458564eea13b51a",
        [
         null,
         [
@@ -272432,7 +276063,23 @@
           "=="
          ]
         ],
-        {}
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             45
+            ],
+            [
+             0,
+             5
+            ]
+           ]
+          ]
+         ]
+        }
        ]
       ],
       "dynamic-blur.html": [
@@ -272531,7 +276178,7 @@
        ]
       ],
       "standards-decor-noblur-2.html": [
-       "75d95b578dcf08d073576940c7a7a06f6458909e",
+       "3d1a834ab34d3dfd401741cdad0624ebf676449c",
        [
         null,
         [
@@ -272547,11 +276194,11 @@
            [
             [
              0,
-             40
+             1
             ],
             [
              0,
-             14
+             8
             ]
            ]
           ]
@@ -273785,6 +277432,35 @@
        {}
       ]
      ],
+     "css-scale-of-clip-path.html": [
+      "dda72c0d139979213741174da8c9572f1237bcc3",
+      [
+       null,
+       [
+        [
+         "/css/css-transforms/css-scale-of-clip-path-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            40
+           ],
+           [
+            0,
+            3000
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
      "css-skew-001.html": [
       "f209834121bb00ff3542029d44ba1ce878b0dd77",
       [
@@ -275042,7 +278718,7 @@
        ]
       ],
       "svg-transform-nested-019.html": [
-       "4bb658d2f9ccc1d844141538b1e8cbc87396d684",
+       "319c2e28631453dc19ec0ddbfa7e4125e24fed04",
        [
         null,
         [
@@ -275058,11 +278734,11 @@
            [
             [
              0,
-             1
+             2
             ],
             [
              0,
-             299
+             400
             ]
            ]
           ]
@@ -275373,6 +279049,45 @@
         {}
        ]
       ],
+      "stacking-context-002.html": [
+       "ff1d06dcc11ff445abc8ecaebe305836aa6ab14f",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "stacking-context-003.html": [
+       "6852722ed79183119f2a3fb142077b9e7c638e91",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "stacking-context-004.html": [
+       "6d7ec896736db0dc813a6e80ac4c75b7066e12e0",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "translate-fill-box.html": [
        "8892d63327964cf1e9c16a3febaecf5af4d1cceb",
        [
@@ -277715,6 +281430,35 @@
        {}
       ]
      ],
+     "scale-transform-filtered-text.html": [
+      "a479b12528a0bb6903d58d46a4b2a0d073b9ee97",
+      [
+       null,
+       [
+        [
+         "/css/css-transforms/scale-transform-filtered-text-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            25
+           ],
+           [
+            0,
+            500
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
      "scale-transform-overlap.html": [
       "0cb8db40b66accf337babe82d281d0a77c0ffa0d",
       [
@@ -284824,7 +288568,7 @@
       ]
      ],
      "transition-test.html": [
-      "10700abf9bc48d0938fd3f5b77b031ecc0c05e4a",
+      "79094cee61c8cb88514b4f045b28af73c988a307",
       [
        null,
        [
@@ -284838,6 +288582,19 @@
      ]
     },
     "css-typed-om": {
+     "background-image-gradient.html": [
+      "00d7de91fb853dc1d6e7637ab9ed53cc141b1530",
+      [
+       null,
+       [
+        [
+         "/css/css-typed-om/background-image-gradient-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "rotate-by-added-angle.html": [
       "bb79a7df8d27c708e21a70a7589fbfa0422be3fb",
       [
@@ -284958,7 +288715,7 @@
       ]
      ],
      "appearance-auto-001.html": [
-      "deef1c5d0b52fe7c91a319abbd1f6ccc2eeda08d",
+      "60f90c587368fd224814a19bf5f5f44988ecd056",
       [
        null,
        [
@@ -284967,7 +288724,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "appearance-auto-input-non-widget-001.html": [
@@ -284997,7 +288770,7 @@
       ]
      ],
      "appearance-button-001.html": [
-      "317f56b18ae7109962340f3364d06d7116f97077",
+      "92e24c69113db8d8c12c80b052f74bf16edd5c44",
       [
        null,
        [
@@ -285006,11 +288779,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "appearance-checkbox-001.html": [
-      "54ebef94f24cd207f1e7a3f40f45cc825698df1c",
+      "69df5739d79141499eee82a9856cc71e7675385c",
       [
        null,
        [
@@ -285019,11 +288808,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "appearance-listbox-001.html": [
-      "b391754b7493242010cda8789bcb10beb0be5ea1",
+      "dd5b00188891a0001fbd74c084f6703e531964f2",
       [
        null,
        [
@@ -285032,11 +288837,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "appearance-menulist-001.html": [
-      "b4586870e3d623b2815405e1de3723f4a3618395",
+      "40892b14b7bf5b28a09a378883fa920667d4d923",
       [
        null,
        [
@@ -285045,11 +288866,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "appearance-menulist-button-001.html": [
-      "a170eb312643db5a639f3d1fd4ad173218bb6d9c",
+      "3f9cc6b6a56d063b87e24e3015986c6ee8802a48",
       [
        null,
        [
@@ -285058,7 +288895,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "appearance-menulist-button-002.tentative.html": [
@@ -285075,7 +288928,7 @@
       ]
      ],
      "appearance-meter-001.html": [
-      "da6f1ffa6cacd3ac0e77b343ffaa33ab44f4c2c2",
+      "bdcf886a0fadd554b8a30e3567385e2af088cbb0",
       [
        null,
        [
@@ -285084,11 +288937,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "appearance-progress-bar-001.html": [
-      "1573f69911566fc4410f6d49959f83dad140ce3e",
+      "3d1d626ea78a45517af4435f18f782a1f071b4c4",
       [
        null,
        [
@@ -285097,7 +288966,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "appearance-progress-bar-002.html": [
@@ -285114,7 +288999,7 @@
       ]
      ],
      "appearance-radio-001.html": [
-      "5a64ba7b0132201d5928837847aee446149a5663",
+      "bf6f103191c3c5f736072e0187b7ad6c2f81a2f8",
       [
        null,
        [
@@ -285123,7 +289008,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "appearance-revert-001.tentative.html": [
@@ -285140,7 +289041,7 @@
       ]
      ],
      "appearance-searchfield-001.html": [
-      "78741411551c667c3f3f317eeb475db883d9d7d4",
+      "9ed4110ee0303900da91e39fccd7269b22e4543e",
       [
        null,
        [
@@ -285149,11 +289050,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "appearance-textarea-001.html": [
-      "5c55ff9fbf6fd993aaf51114c175414a9ec8fe0b",
+      "890f2b20f9ad345c7bc2a728e11b8c733f28e9e4",
       [
        null,
        [
@@ -285162,7 +289079,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "appearance-textfield-001.html": [
@@ -285192,7 +289125,7 @@
       ]
      ],
      "box-sizing-003.html": [
-      "4aefec6656653c8bfff94f645554b9d5395e7d30",
+      "c9a7effd7eb976b3243e26d911f7482da9ba57f4",
       [
        null,
        [
@@ -285205,7 +289138,7 @@
       ]
      ],
      "box-sizing-005.html": [
-      "64267da852871de78c15c20bb64635db9f9c1759",
+      "c75265fbccf2a49eb746c96766f9cc74e24ec6d5",
       [
        null,
        [
@@ -296038,6 +299971,19 @@
        {}
       ]
      ],
+     "native-appearance-disabled-for-value-unset.html": [
+      "c720d04bf23b37a0b689871bc7ab6a1960340a58",
+      [
+       null,
+       [
+        [
+         "/css/css-ui/reference/native-appearance-disabled-for-value-unset-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "negative-outline-offset.html": [
       "3d20df08539d917f91fada7063ded4bc541936b5",
       [
@@ -297157,7 +301103,7 @@
       ]
      ],
      "webkit-appearance-auto-001.html": [
-      "fb0261b020f6fc2b1e3bfccb3da7d899f0337f79",
+      "df73cba13349ad843e5ca2326899717d78f3432a",
       [
        null,
        [
@@ -297166,7 +301112,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "webkit-appearance-auto-input-non-widget-001.html": [
@@ -297196,7 +301158,7 @@
       ]
      ],
      "webkit-appearance-button-001.html": [
-      "cf36b42384a7168d85a0475bded03aaadf26d52c",
+      "ac30091901aa91a1db7c17027fc6e73d1aa9e281",
       [
        null,
        [
@@ -297205,11 +301167,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "webkit-appearance-checkbox-001.html": [
-      "09dd3d76cd66d59522b02d1b6a0c0126bb5eda2a",
+      "a0dea650255027c0969bbe452973d4e124c82390",
       [
        null,
        [
@@ -297218,11 +301196,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "webkit-appearance-listbox-001.html": [
-      "2a33758e2b5671c1cf3317dd4936db9715ec4826",
+      "189286b8c71986cacb1e8e0b9e26e833a9929ad2",
       [
        null,
        [
@@ -297231,11 +301225,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "webkit-appearance-menulist-001.html": [
-      "b9826c4bd273a4d97c5113c43b94fec6b33bbb46",
+      "c5dac6920ff6308ea42b72d7e844057884bafb26",
       [
        null,
        [
@@ -297244,11 +301254,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "webkit-appearance-menulist-button-001.html": [
-      "ba4016a495aa59037a5f973127bb5602acc567bc",
+      "78d41248ed5198539dc17df54afbdc4c22d82431",
       [
        null,
        [
@@ -297257,7 +301283,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "webkit-appearance-menulist-button-002.tentative.html": [
@@ -297274,7 +301316,7 @@
       ]
      ],
      "webkit-appearance-meter-001.html": [
-      "05fb5ce25f24df1bf8fd2c72323a9deea9d0e112",
+      "496024d0505af749cacd91b530792d1401f73e0d",
       [
        null,
        [
@@ -297283,11 +301325,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "webkit-appearance-progress-bar-001.html": [
-      "b989502902d2b8716f7fcc0d8f18e124ec8cb94e",
+      "47db33234dacdf9075e5fae3aba4cf26fb25e9a1",
       [
        null,
        [
@@ -297296,7 +301354,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "webkit-appearance-progress-bar-002.html": [
@@ -297313,7 +301387,7 @@
       ]
      ],
      "webkit-appearance-radio-001.html": [
-      "52d9fb22ac144c2ba932e4a97bc65796760414b7",
+      "e10de4aca62c528d94bcc491816c7490c49867f4",
       [
        null,
        [
@@ -297322,11 +301396,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "webkit-appearance-searchfield-001.html": [
-      "8abd91e3c8faa9f5e02a8af6d2f4e66e1a0c6c29",
+      "af56298d4e4a9808c6ecbe9e01d29cad3fcea507",
       [
        null,
        [
@@ -297335,11 +301425,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "webkit-appearance-textarea-001.html": [
-      "cf3a15f4db6c9745de687cb38f593132d5ddf2f8",
+      "eba4d3044beae109150b619974a7cdfb898dfe2e",
       [
        null,
        [
@@ -297348,7 +301454,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            2
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "webkit-appearance-textfield-001.html": [
@@ -298372,6 +302494,19 @@
         ],
         {}
        ]
+      ],
+      "calc-size-no-body-height-quirk-001.html": [
+       "70a2670ab8772ba6d16e8948990d59af89b5cfd2",
+       [
+        null,
+        [
+         [
+          "/css/css-values/calc-size/calc-size-no-body-height-quirk-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      },
      "calc-text-indent-1.html": [
@@ -299124,6 +303259,288 @@
        {}
       ]
      ],
+     "urls": {
+      "cross-origin": {
+       "url-image-crossorigin-anonymous-negative.sub.html": [
+        "f5066a55d2b5488110df132730c70e4be39973e2",
+        [
+         null,
+         [
+          [
+           "/css/css-values/urls/url-image-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "url-image-crossorigin-anonymous.sub.html": [
+        "0a45eda33d7315d1a2e6e45bb722bd671c1b5bdb",
+        [
+         null,
+         [
+          [
+           "/css/css-values/urls/url-image-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "url-image-crossorigin-use-credentials-negative.sub.html": [
+        "952f953d8443b6873d5348e5fee8473ac506f07b",
+        [
+         null,
+         [
+          [
+           "/css/css-values/urls/url-image-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "url-image-crossorigin-use-credentials.sub.html": [
+        "f592a02c4869ded268bd6e4822ae48957ddd82ff",
+        [
+         null,
+         [
+          [
+           "/css/css-values/urls/url-image-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ]
+      },
+      "referrer-policy": {
+       "no-referrer": {
+        "url-image-referrerpolicy-cross-origin.sub.html": [
+         "30a52a848a4fc3b696d65cad27263fbb5753a1bc",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "url-image-referrerpolicy-same-origin.sub.html": [
+         "ebbff834b92fe084e779a91ad38a882d8640e098",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ]
+       },
+       "no-referrer-when-downgrade": {
+        "url-image-referrerpolicy-cross-origin.sub.html": [
+         "ce51df67c027ca74a8c033f78530dc7f1d1f9701",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "url-image-referrerpolicy-same-origin.sub.html": [
+         "6860e7386bf65b16be804952df14d9613d742073",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ]
+       },
+       "origin": {
+        "url-image-referrerpolicy-cross-origin.sub.html": [
+         "14a8172d6e354693c5fd0857223e3c3601833588",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "url-image-referrerpolicy-same-origin.sub.html": [
+         "1cc6f011c12ee992c4414446fe8cb569aab49a70",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ]
+       },
+       "origin-when-cross-origin": {
+        "url-image-referrerpolicy-cross-origin.sub.html": [
+         "6285f2f0e5de1dd3e0f3a405eb226926bad660ae",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "url-image-referrerpolicy-same-origin.sub.html": [
+         "eb4e081e94013b5ceb5cfa8e637c5074c4e69a5d",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ]
+       },
+       "same-origin": {
+        "url-image-referrerpolicy-cross-origin.sub.html": [
+         "de23eb1f0954c05d617e1e2b28e8d1ff743f6aa2",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "url-image-referrerpolicy-same-origin.sub.html": [
+         "866affc6d9fb61d1f4e88a88355e8cb362684497",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ]
+       },
+       "strict-origin": {
+        "url-image-referrerpolicy-cross-origin.sub.html": [
+         "b17ac4b4ef7d39e1f700bb4c0b969fc1e7d4401a",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "url-image-referrerpolicy-same-origin.sub.html": [
+         "dadf1c58d526c1e6674d67d54a5f1e1cc65ffa42",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ]
+       },
+       "strict-origin-when-cross-origin": {
+        "url-image-referrerpolicy-cross-origin.sub.html": [
+         "1e66fbf659f821cbf3335dca2147e7c7a636528e",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "url-image-referrerpolicy-same-origin.sub.html": [
+         "57f5351a5a1bcf8c33c3607c720fa0bac934ba0b",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ]
+       },
+       "unsafe-url": {
+        "url-image-referrerpolicy-cross-origin.sub.html": [
+         "dc5a3d5143598159090c35db4560389aa5b6cae3",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "url-image-referrerpolicy-same-origin.sub.html": [
+         "7eaba535f142aeb4d00704f7096c62ba99dab4b8",
+         [
+          null,
+          [
+           [
+            "/css/css-values/urls/url-image-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ]
+       }
+      }
+     },
      "vh-calc-support-pct.html": [
       "3a422d4ce46fd57636eaf564c356f4152ca3a061",
       [
@@ -301779,7 +306196,7 @@
       ]
      ],
      "active-view-transition-on-non-root.html": [
-      "9870b15cca958d0e7c5080cebe24c463ad7a33ca",
+      "d8699d3a2c7c1410cb86bcc9e4fb2a2a0e561865",
       [
        null,
        [
@@ -301805,7 +306222,7 @@
       ]
      ],
      "active-view-transition-type-on-non-root.html": [
-      "f4225485b860b09fc0fca560fbc7f33c270dbf05",
+      "4569af04fff5462e57ed5f6e30de535b263a7b00",
       [
        null,
        [
@@ -301870,7 +306287,7 @@
       ]
      ],
      "auto-name-from-id.html": [
-      "9a04d431dfdc2225670e6bb2f87e6ac7a4fcd486",
+      "d3430c93a1d2043146e7205c2734a2b8b19af2e0",
       [
        null,
        [
@@ -301993,7 +306410,7 @@
       ]
      ],
      "capture-with-offscreen-child-translated.html": [
-      "925bb8dbc456e8968d099eedf9632e2857e383d8",
+      "d7f4f2b122a29812aaba4fac2ce301158ff16bf9",
       [
        null,
        [
@@ -302006,7 +306423,7 @@
       ]
      ],
      "capture-with-offscreen-child.html": [
-      "7f8085cae2d23b26125db0b49914cb2f9f41a148",
+      "576c1a0a4adfef3f389f217a84f334fe9c26e826",
       [
        null,
        [
@@ -302035,7 +306452,7 @@
       ]
      ],
      "capture-with-opacity-zero-child.html": [
-      "2b0563ea31b6c7e875c7eee4e302836437a72ba8",
+      "78bd49f24a214c9ba40bd480d780cc14f6f65397",
       [
        null,
        [
@@ -302064,7 +306481,7 @@
       ]
      ],
      "capture-with-visibility-hidden-child.html": [
-      "2d1761249964f667017bd385954c6aef4b2a2da7",
+      "ba49933390f9d4d6fe1d82c0337506dacd5ab135",
       [
        null,
        [
@@ -302077,7 +306494,7 @@
       ]
      ],
      "capture-with-visibility-mixed-descendants.html": [
-      "3a4811ada10ec3d9bf8f2b3df6adec97c9c9ea67",
+      "457760524912766276bb1ae1fa28c2255ebb355e",
       [
        null,
        [
@@ -302446,6 +306863,19 @@
        {}
       ]
      ],
+     "empty-render-target-capture.html": [
+      "f0be6019a39435cf139b241fe1071c5580f8c207",
+      [
+       null,
+       [
+        [
+         "/css/css-view-transitions/empty-render-target-capture-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "exit-transition-with-anonymous-layout-object.html": [
       "ea2d17b276100111263b1ea5278fbb4167042ee0",
       [
@@ -302859,7 +307289,7 @@
       ]
      ],
      "inline-child-with-filter.html": [
-      "2c4a8b85ec175ef0e611f92019481b76658ef387",
+      "61f0f1f6a8c389cd7298c56d8c2e35c3f101027b",
       [
        null,
        [
@@ -302868,7 +307298,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            2
+           ],
+           [
+            0,
+            2400
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "inline-child-with-overflow-shadow.html": [
@@ -302898,7 +307344,7 @@
       ]
      ],
      "inline-with-offset-from-containing-block.html": [
-      "6bbb8b49392c84adecf32f972e4889f2ba356968",
+      "31f8449ff630fe6844eb16b46e445ec840d550d8",
       [
        null,
        [
@@ -303985,12 +308431,25 @@
          ],
          {}
         ]
+       ],
+       "at-rule-types-shared-elements.html": [
+        "50dc5ba1f43b95927f1c2a7559d68ce2bf2b10d7",
+        [
+         null,
+         [
+          [
+           "/css/css-view-transitions/navigation/with-types/at-rule-types-shared-elements-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
        ]
       }
      },
      "nested": {
       "adjust-transform-with-scale.tentative.html": [
-       "e58a7f363004def39a6ef9e8acb8e73e84dd18e2",
+       "a1177e7801d412a425de3bb9c0fea11bfabed2d8",
        [
         null,
         [
@@ -304019,7 +308478,7 @@
        ]
       ],
       "adjust-transform.tentative.html": [
-       "915bd22e420fde68ca0a794b4f3c6f928d4f1c97",
+       "54b5f494419bf2e1c41bb102f0e6525123548ea4",
        [
         null,
         [
@@ -304048,7 +308507,7 @@
        ]
       ],
       "compute-explicit-name-direct.tentative.html": [
-       "d0b3e0f16d64e710cd2cfb144bff0c4ebcddda78",
+       "31f49979e8e3ed25bfa825daa772c5950f8d41b0",
        [
         null,
         [
@@ -304077,7 +308536,7 @@
        ]
       ],
       "compute-explicit-name-nested-vt-names.tentative.html": [
-       "dcf56b500f4ab0ce732221f0ff412c38a1040381",
+       "0be0f3c56aaf543c9e713b26f30d5fd90d42603d",
        [
         null,
         [
@@ -304106,7 +308565,7 @@
        ]
       ],
       "compute-explicit-name-nested.tentative.html": [
-       "ad47461b142323817196f49c81b0e8ada34f4154",
+       "f455210cce293239b2d2081864ce6199b14a6540",
        [
         null,
         [
@@ -304135,7 +308594,7 @@
        ]
       ],
       "compute-explicit-name-non-ancestor.tentative.html": [
-       "8a2c69147ad6bfe28146b1ab22db857fdf0e2fa3",
+       "f16628908d2c5382ce861e642868b7d70670c02f",
        [
         null,
         [
@@ -304164,7 +308623,7 @@
        ]
       ],
       "compute-explicit-name-non-existent.tentative.html": [
-       "2e3d71f96d15abb468a03d6a7f41a26399867a38",
+       "090637b8e63cce618fd97217a6ca527f138ba1cc",
        [
         null,
         [
@@ -304193,7 +308652,7 @@
        ]
       ],
       "compute-explicit-name-self.tentative.html": [
-       "09aa0f653318610fca56decf9366e984c1d4f0a7",
+       "63f3a3523e3ee5f6107666afb9fade903656e781",
        [
         null,
         [
@@ -304222,7 +308681,7 @@
        ]
       ],
       "contain-direct.tentative.html": [
-       "8cc856883df16410730d40da72d3ef4cc35562be",
+       "a90a843b5eefcff9c0ca3daeada93df29b1d007b",
        [
         null,
         [
@@ -304251,7 +308710,7 @@
        ]
       ],
       "contain-nested.tentative.html": [
-       "643aad7b6db97b890ecd7fcb9e650915426d3520",
+       "b995d11c997a30548c79aa0f5d2b7d23be5ca5ea",
        [
         null,
         [
@@ -304280,7 +308739,7 @@
        ]
       ],
       "contain-on-self.tentative.html": [
-       "f8662850bb94b64e27448b9e1187f7c4a5e788d6",
+       "a0a63188d3ec663210998b14da5caa44df0a3c58",
        [
         null,
         [
@@ -304309,7 +308768,7 @@
        ]
       ],
       "custom-ident-implies-contain.html": [
-       "6524d2c2680cd1ebcd00d5335adde259b321a6cd",
+       "545e98bc1716e3f2e1227eeeec2558a56f62082a",
        [
         null,
         [
@@ -304338,7 +308797,7 @@
        ]
       ],
       "nearest-direct.tentative.html": [
-       "a42e5a847c053b2b248208df64be87512b24716e",
+       "9bfd2e29c83a17c4244af589aa2877d4437da07f",
        [
         null,
         [
@@ -304367,7 +308826,7 @@
        ]
       ],
       "nearest-ignores-nearest-name.tentative.html": [
-       "ddae634f87a0ace4216ea66cbb72bc7734df3e10",
+       "3c904f3abb4a4c3299a522be61b88b312e9ac697",
        [
         null,
         [
@@ -304396,7 +308855,7 @@
        ]
       ],
       "nearest-implies-contain.html": [
-       "94f8b8d1b7e84bd4055a202729c41efa70cb9a5a",
+       "378d2ebcdc189efb69d09365cc298f2bcf88e62c",
        [
         null,
         [
@@ -304425,7 +308884,7 @@
        ]
       ],
       "nearest-nested.tentative.html": [
-       "9ec3e8f95ffe3194e85cdbe455ee3b3a3d723211",
+       "3e445c6bfcfba701114ff0b579d3d270f18e6c93",
        [
         null,
         [
@@ -304454,7 +308913,7 @@
        ]
       ],
       "nested-exit.tentative.html": [
-       "dd1d65622808a096731e557be292075967fe142d",
+       "83570762061638bd2a780922e45cf39da100d713",
        [
         null,
         [
@@ -304483,7 +308942,7 @@
        ]
       ],
       "nested-group-display-none.tentative.html": [
-       "084348732540c7651230c3072ee736dbea0c0bd5",
+       "a4aad5aeee6d6cbfbce8b1db2bef5cc289c8816f",
        [
         null,
         [
@@ -304512,7 +308971,7 @@
        ]
       ],
       "nested-group-in-pseudo-basic.tentative.html": [
-       "77241d06b73217a9a99f46aa9838f3ebb7507732",
+       "f2a228144e27f25630806048b76611fbf8013e8a",
        [
         null,
         [
@@ -304540,8 +308999,37 @@
         }
        ]
       ],
+      "nested-root-capture-with-clip.html": [
+       "4a063b57ba1fbe3d821850195fcf8adb9fc75565",
+       [
+        null,
+        [
+         [
+          "/css/css-view-transitions/nested/nested-root-capture-with-clip-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             40
+            ],
+            [
+             0,
+             500
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
       "normal-goes-up.tentative.html": [
-       "f68c93d474425d958b46c3dcd2d29197f797fbdd",
+       "b027e36672fc879fd6aa3dfaa9d7af01fc2c93a5",
        [
         null,
         [
@@ -304570,7 +309058,7 @@
        ]
       ],
       "render-element.tentative.html": [
-       "59a5a108314c0270b561339bf9a8a0cb6fdfe27d",
+       "4b74290279b5ff92018d031dc21f1c0928fd008d",
        [
         null,
         [
@@ -305902,7 +310390,7 @@
       ]
      ],
      "pseudo-rendering-invalidation.html": [
-      "4d492c40d8761ddda3551448ce725cfbb5a82f4a",
+      "9624137e754eed3a46336fc8edb0d7edfc7182c4",
       [
        null,
        [
@@ -305957,7 +310445,7 @@
       ]
      ],
      "pseudo-with-classes-match-ident.html": [
-      "9cfc3f12ce8450a845f2a407f95476e10bccd1b6",
+      "51705ccdeac46f5e19fbe09a4227ed13bb7de1a4",
       [
        null,
        [
@@ -305970,7 +310458,7 @@
       ]
      ],
      "pseudo-with-classes-match-multiple-wildcard.html": [
-      "261c00f0875ac4d1d566a1cca0dda13cf209132a",
+      "c0f077a425079eb9a852bbcd37e64d8214f1b049",
       [
        null,
        [
@@ -305983,7 +310471,7 @@
       ]
      ],
      "pseudo-with-classes-match-multiple.html": [
-      "7ff42edf366d8f97cb53961c00b84bb9feac66ec",
+      "f5c060c20953c84a6a0a0d623e9890b5fe3b1ef1",
       [
        null,
        [
@@ -305996,7 +310484,7 @@
       ]
      ],
      "pseudo-with-classes-match-wildcard-no-star.html": [
-      "96186cd8784ab76ea3ac4a0b210da43030bfa5a1",
+      "123168310b8b598eec1fd90c746be5b47687f844",
       [
        null,
        [
@@ -306009,7 +310497,7 @@
       ]
      ],
      "pseudo-with-classes-match-wildcard.html": [
-      "f777e245ba68f2c06440372bbcb671e09982c419",
+      "11bdcbc12cbadd810ac05bab78fca00000a75f52",
       [
        null,
        [
@@ -306022,7 +310510,7 @@
       ]
      ],
      "pseudo-with-classes-mismatch-ident.html": [
-      "107f388b388f42a51c311198cd911b54008a21d7",
+      "493127b86b3d159c9d137704d991ab878568ba4d",
       [
        null,
        [
@@ -306035,7 +310523,7 @@
       ]
      ],
      "pseudo-with-classes-mismatch-partial.html": [
-      "ddb9b2535f26aa77e6c485e99043dd9496ef3dab",
+      "d4a6e0a4f15d358492d95bbca7807cda814072e3",
       [
        null,
        [
@@ -306048,7 +310536,7 @@
       ]
      ],
      "pseudo-with-classes-mismatch-wildcard.html": [
-      "1e27dc2c05ce97b54f4b362f6d21b94bf6e32d61",
+      "bdf5116144767b8214e3d775158b16be993008f6",
       [
        null,
        [
@@ -306061,7 +310549,7 @@
       ]
      ],
      "pseudo-with-classes-multiple-vt-classes.html": [
-      "fa7ae4eeb15f1df1366069d7fa7cdf4a3c30947f",
+      "c28d6f90dfe109a299213ae488c3bda12ba96eea",
       [
        null,
        [
@@ -306074,7 +310562,7 @@
       ]
      ],
      "pseudo-with-classes-new-with-class-old-without.html": [
-      "225ed1cb7f32194b67808207f899fc1034d33171",
+      "5adb88f143f8f7f307838f83652a3885d4f4424b",
       [
        null,
        [
@@ -306087,7 +310575,7 @@
       ]
      ],
      "pseudo-with-classes-old-with-class-new-without.html": [
-      "f9ef100ef7edf9f279594af18cb970ea7b1dab80",
+      "17d03f8fcfc58443f60a20143c13036624a7b90b",
       [
        null,
        [
@@ -306113,7 +310601,7 @@
       ]
      ],
      "pseudo-with-classes-view-transition-image-pair.html": [
-      "0473742260c3d40ccd8ddd311e4a40b3647a1852",
+      "5cc971b94463ee93198bb06540ddf35126359465",
       [
        null,
        [
@@ -306220,7 +310708,7 @@
       ]
      ],
      "rotated-cat-off-top-edge.html": [
-      "f61b916caa53c076d843851da6a859d2069889a3",
+      "349793614299e89dbb9cde05ce5581b844bc2613",
       [
        null,
        [
@@ -306261,6 +310749,34 @@
        {}
       ]
      ],
+     "scoped": {
+      "new-content.html": [
+       "7302f7c4f8ee4c22bee0fe286a7b2343af98603e",
+       [
+        null,
+        [
+         [
+          "/css/css-view-transitions/scoped/content-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "old-content.html": [
+       "82b45eb75f4a2645cde3fbd7344d6d6a417ab56c",
+       [
+        null,
+        [
+         [
+          "/css/css-view-transitions/scoped/content-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
+     },
      "scroller-child-abspos.html": [
       "d04f87215edfd41131a1d02b84dc4f999f8c7138",
       [
@@ -306495,7 +311011,7 @@
       ]
      ],
      "snapshot-containing-block-absolute.html": [
-      "91b71f7eec99096a7f9ce7615f418634728cee5f",
+      "a8a03b62e19bd5be73b077cc4c785bd1ac2abc76",
       [
        null,
        [
@@ -306552,8 +311068,21 @@
        }
       ]
      ],
+     "snapshot-containing-block-static-iframe.html": [
+      "1903b9cacbd334c3d0d6be4e7083cb1ced9d9b92",
+      [
+       null,
+       [
+        [
+         "/css/css-view-transitions/snapshot-containing-block-static-iframe-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "snapshot-containing-block-static.html": [
-      "44fe4cfc5e66e8afff7ad1a21db40d8d1576be37",
+      "fcea95e6efdb5d156a3c940faeef3928a3640910",
       [
        null,
        [
@@ -306724,7 +311253,7 @@
       ]
      ],
      "update-callback-called-once.html": [
-      "c84368c95c4dc67a8c07d1a50a3a97e4f8f7c303",
+      "cd27df6dafdcf82c0448f27eff9f2dd0cba1ca92",
       [
        null,
        [
@@ -306804,6 +311333,19 @@
        {}
       ]
      ],
+     "view-transition-name-stacking-context-dynamic.html": [
+      "1a908e6f65949a0874bb8dc107156c0db22f783a",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "view-transition-types-match-early-mutation.html": [
       "24737d9050ef6d53be5a44c553faa2901d014928",
       [
@@ -306843,6 +311385,19 @@
        {}
       ]
      ],
+     "view-transition-types-matches-case-sensitive.html": [
+      "411c73c607a05734051921c858222373fe191b96",
+      [
+       null,
+       [
+        [
+         "/css/css-view-transitions/view-transition-types-matches-case-sensitive-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "view-transition-types-matches.html": [
       "c84819e8c724da84ffeb949d63f6725569022435",
       [
@@ -307190,6 +311745,19 @@
         {}
        ]
       ],
+      "font-size-keyword-specified.html": [
+       "fc724307f46bc5c77f8599f07e4cca1411d6d0e3",
+       [
+        null,
+        [
+         [
+          "/css/css-viewport/zoom/font-size-keyword-specified-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "font-size.html": [
        "e572806be41f21297b6b864f9b74378de35a28c6",
        [
@@ -311803,7 +316371,7 @@
       ]
      ],
      "available-size-020.html": [
-      "bf09886f30a0762e8a56d0ad01a335b263280b39",
+      "f20dfe1199aaed7e1112792d285c182ad9cb359b",
       [
        null,
        [
@@ -311816,7 +316384,7 @@
       ]
      ],
      "available-size-021.html": [
-      "4547ba1934f8ec3432f1f09dfda0c06f84494026",
+      "63c50fd07d8c8050ea4057568b287a279adf02d6",
       [
        null,
        [
@@ -318477,6 +323045,19 @@
        {}
       ]
      ],
+     "orthogonal-dynamic-size-001.html": [
+      "add7f1fc2aa8ac0ecaa6452c6a171c9781e9fd83",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "orthogonal-root-resize-icb-001.html": [
       "5e7ff7aef51344e8fa6fafed85318da33a33397b",
       [
@@ -320765,6 +325346,136 @@
        {}
       ]
      ],
+     "table-cell-align-001.html": [
+      "046dc96e8f2257dfae966e20f0972a18f6eceda8",
+      [
+       null,
+       [
+        [
+         "/css/css-writing-modes/reference/table-cell-align-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "table-cell-align-002.html": [
+      "14c201d937daaebbbf66243e45e6a34731489ab8",
+      [
+       null,
+       [
+        [
+         "/css/css-writing-modes/reference/table-cell-align-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "table-cell-align-003.html": [
+      "c32f535c5464c9463bc797f53887747b44160cd1",
+      [
+       null,
+       [
+        [
+         "/css/css-writing-modes/reference/table-cell-align-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "table-cell-align-004.html": [
+      "d9b31bf6f948cd1baa553e7b89ad57b31a6ca139",
+      [
+       null,
+       [
+        [
+         "/css/css-writing-modes/reference/table-cell-align-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "table-cell-align-005.html": [
+      "569a59db08c5b4e8c94ba4da1749749b881e5479",
+      [
+       null,
+       [
+        [
+         "/css/css-writing-modes/reference/table-cell-align-005-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "table-cell-align-006.html": [
+      "a8d33f281fda76603ea312601933fdf170ddf64b",
+      [
+       null,
+       [
+        [
+         "/css/css-writing-modes/reference/table-cell-align-006-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "table-cell-valign-001.html": [
+      "f3026810dd58cd04f87df5f3ae2ad474d5c289db",
+      [
+       null,
+       [
+        [
+         "/css/css-writing-modes/reference/table-cell-valign-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "table-cell-valign-002.html": [
+      "d9440e4b299c74e4484ab68c8fa4a5cfca404f01",
+      [
+       null,
+       [
+        [
+         "/css/css-writing-modes/reference/table-cell-valign-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "table-cell-valign-003.html": [
+      "aaaea9bd0fe669860d8a874f7d34ee4f51425c1e",
+      [
+       null,
+       [
+        [
+         "/css/css-writing-modes/reference/table-cell-valign-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "table-cell-valign-004.html": [
+      "9ccf09b6fb47631a2960e5e4b3943e5de6a67ad2",
+      [
+       null,
+       [
+        [
+         "/css/css-writing-modes/reference/table-cell-valign-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "table-column-order-002.xht": [
       "9fd26e3caddea5b582ef70951e38244c04541b68",
       [
@@ -322109,6 +326820,32 @@
        {}
       ]
      ],
+     "text-orientation-020.html": [
+      "84f4e62e5736def73afbef6024880182bd5793ee",
+      [
+       null,
+       [
+        [
+         "/css/css-writing-modes/reference/text-orientation-020-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "text-orientation-021.html": [
+      "27fae03dddcd9e27b0f50d84cc10605b4830b013",
+      [
+       null,
+       [
+        [
+         "/css/css-writing-modes/reference/text-orientation-021-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "text-orientation-initial.html": [
       "434e14ccb88f8fde666c7ab646bf882a15bea294",
       [
@@ -324168,6 +328905,19 @@
        {}
       ]
      ],
+     "backdrop-filter-scale-transform.html": [
+      "813fb95d5ad3b5e4844e480980b4c712d6b8f28d",
+      [
+       null,
+       [
+        [
+         "/css/filter-effects/backdrop-filter-scale-transform-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "backdrop-filter-svg-background-image-blur.html": [
       "9cd18b0542c86911b3a0b774fe892a61102c8b85",
       [
@@ -325280,6 +330030,19 @@
        {}
       ]
      ],
+     "empty-element-with-filter-004.html": [
+      "38f746ff405fcf90ccd34a75ed4209a7b4669634",
+      [
+       null,
+       [
+        [
+         "/css/filter-effects/reference/green-100x100.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "empty-element-with-filter.html": [
       "3e8fc7e164cde54a8ff81a241909c2f729f32afb",
       [
@@ -325293,6 +330056,32 @@
        {}
       ]
      ],
+     "feComposite-intersection-feTile-input-svg.html": [
+      "7c9fd6a6f4d64b71e0116e1662221af20d7b67a5",
+      [
+       null,
+       [
+        [
+         "/css/filter-effects/feComposite-intersection-feTile-input-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "feComposite-intersection-feTile-input.html": [
+      "1bf1f4b8fba8ca37705e276d8c72888f01db4954",
+      [
+       null,
+       [
+        [
+         "/css/filter-effects/feComposite-intersection-feTile-input-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "fecolormatrix-negative.html": [
       "eddec862154fc9929a9f7ad8f9cbb0a7d182ef18",
       [
@@ -326368,7 +331157,7 @@
       ]
      ],
      "svg-feimage-005.html": [
-      "21846db376b73ad96642d2823b84d5817b8b57be",
+      "52ecaac3ffdaf162f5fba3ec6ad7a0cb2402ede9",
       [
        null,
        [
@@ -329162,7 +333951,7 @@
       ]
      ],
      "offset-path-shape-shape-001.html": [
-      "4cca1744d061257c3cf1245988cd5f479e0b50f3",
+      "dd2fc6327b8ddebd3c02c1d59164968516fce84e",
       [
        null,
        [
@@ -329674,7 +334463,7 @@
       ]
      ],
      "dir-selector-auto-direction-change-001.html": [
-      "f6c6393b08a940054b90b68fe3ebea9ebc8846ec",
+      "f376e33e2bae1cfddda202773461d7f5c4cb4330",
       [
        null,
        [
@@ -333224,6 +338013,19 @@
        ]
       ]
      },
+     "popover-open-with-has-sibling-selector.html": [
+      "85f433e17919c75c799767bf3ec755f1fe16c516",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "remove-hovered-element.html": [
       "ec2eed1d47d33ef492c601bda08f9b6d779a28fc",
       [
@@ -335135,6 +339937,32 @@
        ]
       }
      ]
+    ],
+    "forced-colors-mode-55.html": [
+     "db457fb0cfe1bfca3d9a9ff545cd269202a0e196",
+     [
+      null,
+      [
+       [
+        "/forced-colors-mode/forced-colors-mode-55-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ],
+    "forced-colors-mode-56.html": [
+     "632a6c7bd035a6d57388be5d8ae97d878f7c008d",
+     [
+      null,
+      [
+       [
+        "/forced-colors-mode/forced-colors-mode-56-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
     ]
    },
    "fullscreen": {
@@ -337797,7 +342625,7 @@
          ]
         ],
         "canvas.2d.lang.dynamic.html": [
-         "225fcaa7ba19ddb4311d994760e262892a8f98fe",
+         "02fb530baefe6517b4eba71ab7415b9ab1d06fa9",
          [
           null,
           [
@@ -337810,7 +342638,7 @@
          ]
         ],
         "canvas.2d.lang.empty.canvas.html": [
-         "099081de379890e28efd18b29f395cf780e3ce37",
+         "9c5eb3f96b216d2866dbd5d8a82ce35b67037c00",
          [
           null,
           [
@@ -337823,7 +342651,7 @@
          ]
         ],
         "canvas.2d.lang.html": [
-         "b8fca4dd5e72b95c6a47d61b2bb3d895cc4ddb8d",
+         "e078eaa123561951f8ed54b6d6e51b177420812e",
          [
           null,
           [
@@ -337836,7 +342664,7 @@
          ]
         ],
         "canvas.2d.lang.inherit.disconnected.canvas.html": [
-         "0af5f20d6f5d21a0e79122d4ef76c0535a75654a",
+         "83854b9b3773ed9f1da1920fa56bfe5786bba108",
          [
           null,
           [
@@ -337849,7 +342677,7 @@
          ]
         ],
         "canvas.2d.lang.inherit.disconnected.canvas.no.lang.html": [
-         "6b06ae5df960c0ffe240894dce5c50461db65fc9",
+         "87fc358af9eb38b378d3ddccdac3df795688b4cc",
          [
           null,
           [
@@ -337862,7 +342690,7 @@
          ]
         ],
         "canvas.2d.lang.inherit.html": [
-         "845880f20d86c45983caf0cd839583d07082cedf",
+         "06e97745ddbd0cff3e1a3d311e21b19f440393ae",
          [
           null,
           [
@@ -341462,7 +346290,7 @@
          ]
         ],
         "canvas.2d.offscreen.lang.html": [
-         "c3c6b36901d39d18689930171fdef69947870bd0",
+         "d1d9bc0998d0f6f8a1b6cf56d93fea2bb158d1c4",
          [
           null,
           [
@@ -341475,7 +346303,7 @@
          ]
         ],
         "canvas.2d.offscreen.lang.inherit.html": [
-         "63b6854cd780b9a93f3bdcab8b7418b96e3f0422",
+         "05849f419ff3836499f93e0e8b5b39b913f65ad8",
          [
           null,
           [
@@ -341514,7 +346342,7 @@
          ]
         ],
         "canvas.2d.offscreen.transferred.lang.html": [
-         "06c0db121d0b213d23a8f03b3aae6c39e168de0b",
+         "a6a908b1d184a8b9eef311e10be34d13c5d428df",
          [
           null,
           [
@@ -341527,7 +346355,7 @@
          ]
         ],
         "canvas.2d.offscreen.transferred.lang.inherit.document.html": [
-         "a7561ddd855649790f437922daed20d22bac9a08",
+         "3146d078ebacfdb97dde719937648b292446b670",
          [
           null,
           [
@@ -341540,7 +346368,7 @@
          ]
         ],
         "canvas.2d.offscreen.transferred.lang.inherit.html": [
-         "72aab773a5e9dc85e32625a4b66dd227d1a292ef",
+         "1a9b7ec63e12059efa6e35e5aa533757a4aa382f",
          [
           null,
           [
@@ -341579,7 +346407,7 @@
          ]
         ],
         "canvas.2d.offscreen.worker.lang.html": [
-         "8ed884a177539048d8670383c8d586ea4b34173f",
+         "3cd2ec4f42cfc5d4a3a4d6dd595212044155dc43",
          [
           null,
           [
@@ -341592,7 +346420,7 @@
          ]
         ],
         "canvas.2d.offscreen.worker.lang.inherit.html": [
-         "43157d54d2b8403011ccb668536439f33453f1d7",
+         "ce437887bc42ad566cc1b6930afdeb53e1a441e7",
          [
           null,
           [
@@ -344257,7 +349085,7 @@
        ]
       ],
       "hidden-until-found-001.html": [
-       "3c87b985dcc885208017f38229fdf853ed748a67",
+       "0fa46f523cd8161879093a78af3a84632e58c91f",
        [
         null,
         [
@@ -344270,7 +349098,7 @@
        ]
       ],
       "hidden-until-found-004.html": [
-       "3ca6feb7a3dd41ab5067b952372962a6446cfda8",
+       "2c0c643c307479b40e3ff4a18a8e97b05117c9fc",
        [
         null,
         [
@@ -344283,7 +349111,7 @@
        ]
       ],
       "hidden-until-found-005.html": [
-       "fabf636ec94850c7eea86b4e4bafafb1f795fd66",
+       "2c4df955aee922c7f53db4b8d432cbe751a7a14a",
        [
         null,
         [
@@ -344296,7 +349124,7 @@
        ]
       ],
       "hidden-until-found-007.html": [
-       "7b11a92cc93940d99769804951ad3fb6c3929094",
+       "64c39c4153a58f2049f50c265dae7346e6b313ee",
        [
         null,
         [
@@ -344344,6 +349172,19 @@
          ],
          {}
         ]
+       ],
+       "marquee-with-trusted-types.html": [
+        "f16c58bb85d71b011e4ee524dfb63184a5fca81a",
+        [
+         null,
+         [
+          [
+           "/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-with-trusted-types-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
        ]
       }
      }
@@ -346611,6 +351452,19 @@
        ]
       },
       "the-option-element": {
+       "option-label-whitespace-2.html": [
+        "95b3a3c73db92ee641384fb54c599c9765bf9004",
+        [
+         null,
+         [
+          [
+           "/html/rendering/replaced-elements/the-option-element/option-label-whitespace-2-ref.html",
+           "!="
+          ]
+         ],
+         {}
+        ]
+       ],
        "option-label-whitespace.html": [
         "aad1039d7b4f1c0078b622a94bc6364b992e60af",
         [
@@ -346838,6 +351692,19 @@
         ],
         {}
        ]
+      ],
+      "pre-margin-block.html": [
+       "c880bbda68aa964086904886c5d74ad9f378e991",
+       [
+        null,
+        [
+         [
+          "/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/pre-margin-block-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      },
      "the-details-element": {
@@ -347345,7 +352212,7 @@
        ]
       ],
       "field-sizing-textarea-relayout.html": [
-       "1e18bd2070377923ec1e29d012ddcf94ad7aa6a2",
+       "579462ca2f579b7360790c3ad3a63d0de45e4c41",
        [
         null,
         [
@@ -347360,11 +352227,11 @@
            null,
            [
             [
-             153,
+             0,
              153
             ],
             [
-             2,
+             0,
              2
             ]
            ]
@@ -347600,7 +352467,7 @@
       ],
       "the-select-element": {
        "option-add-label-quirks.html": [
-        "2c3c8093e253250f11a7e84a7ba89f3535d2eb20",
+        "f91609afc506b7530c6106bd047eab93b8645aa7",
         [
          null,
          [
@@ -348537,6 +353404,19 @@
          {}
         ]
        ],
+       "date-time-with-trusted-types.html": [
+        "d510225bce5ae3b75b27a1c86147b81a69323085",
+        [
+         null,
+         [
+          [
+           "/html/semantics/forms/the-input-element/date-time-with-trusted-types-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "image01.html": [
         "e9028dceec736da67b8c8814cb103cfecbc518a0",
         [
@@ -349533,6 +354413,19 @@
           }
          ]
         ],
+        "select-appearance-sizing-in-flex.tentative.html": [
+         "563cf72b5f3e76dfc465930b9cb80ae434d66069",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-sizing-in-flex-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
         "select-appearance-switching-invalidation.tentative.html": [
          "d02c2a523141657b4abc4d2dbddab7305d987421",
          [
@@ -349673,19 +354566,6 @@
           }
          ]
         ],
-        "select-multiple-base-appearance.html": [
-         "48673b446bc8e6e6cce72e6c4d29671bed313779",
-         [
-          null,
-          [
-           [
-            "/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
         "select-only-button-opt-in.tentative.html": [
          "b010d15e8adab1ebfe448842e195e29b24d332fb",
          [
@@ -349918,6 +354798,21 @@
          ]
         ]
        },
+       "customizable-select-in-page": {
+        "customizable-select-in-page-appearance.tentative.html": [
+         "b3bf75eb0ff25df6d4737326940a498a11d264d2",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-appearance-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ]
+       },
        "reset-algorithm-rendering.html": [
         "67da173ff2eb0d90c063294db486eaa34ea8878a",
         [
@@ -351088,7 +355983,7 @@
      },
      "permission-element": {
       "bounded-css-properties-reftest.tentative.html": [
-       "ad6986f52b40e3a164fe0237df9aec1365d513cd",
+       "4d27b23eb517cee863997d5e765923e040b46ad4",
        [
         null,
         [
@@ -351101,7 +355996,7 @@
        ]
       ],
       "bounded-sizes-reftest.tentative.html": [
-       "376fb2dcb3ff9280934f5c3541637db111928763",
+       "3c3a2d5b5b9ac8d09c7d47ce21154c85bf36d42c",
        [
         null,
         [
@@ -351114,7 +356009,7 @@
        ]
       ],
       "display-css-property-reftest.tentative.html": [
-       "e83786373d599a6df6934b019ffaf7ff08918b6d",
+       "e4288cae3b286e8d9b0d9f2ff4c857cd959a460c",
        [
         null,
         [
@@ -351126,8 +356021,21 @@
         {}
        ]
       ],
+      "invalid-type-reftest.tentative.html": [
+       "80f3e793e114fb66f968ac979b6dbd189e3b0b85",
+       [
+        null,
+        [
+         [
+          "/html/semantics/permission-element/invalid-type-reftest-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "large-min-size-reftest.tentative.html": [
-       "c61346c35267b88bf4f411446d8d8ae065a3ed44",
+       "2e2b3791fd081e23eeb49792d63df60cd5da8ff2",
        [
         null,
         [
@@ -351140,7 +356048,7 @@
        ]
       ],
       "pseudo-elements-in-div.tentative.html": [
-       "e9080708021d2d44fd6675c662ce62d141ed9f9b",
+       "24a2be07fabae34fd969fa89c233b2a209c0c08f",
        [
         null,
         [
@@ -351153,7 +356061,7 @@
        ]
       ],
       "pseudo-elements.tentative.html": [
-       "e0faefeb55d34ff93cf28da22e62463ac2f28ace",
+       "3e553e01bcf869c8e43870c1ec3283ec24d7cae2",
        [
         null,
         [
@@ -351166,7 +356074,7 @@
        ]
       ],
       "quirks-mode-no-height-is-still-bounded.tentative.html": [
-       "cca12c5fb721b1cd079bc0d18efa1fa9075a7f91",
+       "78bd4f2555a5f75739e829b21f98e2fb640a0d2b",
        [
         null,
         [
@@ -351179,7 +356087,7 @@
        ]
       ],
       "unbounded-width-with-border-reftest.tentative.html": [
-       "8de1876b210aff5d684aca092b31d1fd94af11ce",
+       "39c9b107ae6487b2495186dd227d55944f838c0d",
        [
         null,
         [
@@ -351833,7 +356741,7 @@
      "the-button-element": {
       "interest-target": {
        "interesttarget-keyboard-invalidation.tentative.html": [
-        "a7b9724d9c86039fec346cf6207afce7771696db",
+        "b6d0ff10932f1717fb038efb28c42c2bbf57cbf8",
         [
          null,
          [
@@ -351847,19 +356755,6 @@
          }
         ]
        ],
-       "interesttarget-outline-appearance.tentative.html": [
-        "28cb2052a8d430b5dfadd31171b17d32a567d073",
-        [
-         null,
-         [
-          [
-           "/html/semantics/the-button-element/interest-target/interesttarget-outline-appearance-ref.html",
-           "!="
-          ]
-         ],
-         {}
-        ]
-       ],
        "interesttarget-plain-inline-element.tentative.html": [
         "68ce00193f70c021cc392e0e2460662d7eb38ad9",
         [
@@ -355992,7 +360887,7 @@
        ]
       ],
       "lengths-1.html": [
-       "896f08d111907e62a23a146299ab20a8a5260c09",
+       "224bedc1efc1149ad0cad381fbd3a43e398d4e06",
        [
         null,
         [
@@ -357613,6 +362508,34 @@
     ]
    },
    "scroll-animations": {
+    "animation-trigger": {
+     "animation-trigger-fill-mode-both.tentative.html": [
+      "237bbb996702d35e3992ce51afb42298398443c2",
+      [
+       null,
+       [
+        [
+         "/scroll-animations/animation-trigger/animation-trigger-fill-mode-both-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "animation-trigger-fill-mode-none.tentative.html": [
+      "81dae8a2f724845c35c50d1413af6796e62797a3",
+      [
+       null,
+       [
+        [
+         "/scroll-animations/animation-trigger/animation-trigger-fill-mode-none-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ]
+    },
     "css": {
      "animation-fill-outside-range-test.html": [
       "c63a5f07662dd04b9b97209b27ec575866680216",
@@ -357896,7 +362819,7 @@
       ]
      ],
      "animation-with-transform.html": [
-      "f741cc634d732624186d8d0a034822bef831c872",
+      "323d984c98938fbb5bd224560d7adf0711149430",
       [
        null,
        [
@@ -357961,7 +362884,7 @@
       ]
      ],
      "two-animations-attach-to-same-scroll-timeline-cancel-one.html": [
-      "ed8e8337a65af3033e3df4e158333d225d88a56d",
+      "28973d2d1858421ff53bae1d667c160152d6ecda",
       [
        null,
        [
@@ -357974,7 +362897,7 @@
       ]
      ],
      "two-animations-attach-to-same-scroll-timeline.html": [
-      "de50599fbafb634e44ccd9546e18bea8ba7f7f7e",
+      "45ba3f99ccdbf9ef64f915c1c124d7f946a1f74f",
       [
        null,
        [
@@ -358551,138 +363474,6 @@
        {}
       ]
      ],
-     "reftests": {
-      "discard-check-remove-duplicate.svg": [
-       "e99e7b0e5776acdf446f0d3a5c671b71100b688c",
-       [
-        null,
-        [
-         [
-          "/svg/animations/reftests/reference/green-100x100.svg",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "discard-check-remove-duplicate2.svg": [
-       "aae13b64988a13adb5ff42da2636c2def382d7e9",
-       [
-        null,
-        [
-         [
-          "/svg/animations/reftests/reference/green-100x100.svg",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "discard-check-remove-replace.svg": [
-       "efca35c13689dcfe043c81bca94cbeef23be6be3",
-       [
-        null,
-        [
-         [
-          "/svg/animations/reftests/reference/green-100x100.svg",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "discard-check-remove-replace2.svg": [
-       "20c61bb985ca7398a164b01ecdacae41674258dc",
-       [
-        null,
-        [
-         [
-          "/svg/animations/reftests/reference/green-100x100.svg",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "discard-check-remove.svg": [
-       "a63eee29c93f2f295e26ad6e5ecf96b59dc519fa",
-       [
-        null,
-        [
-         [
-          "/svg/animations/reftests/reference/green-100x100.svg",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "discard-check-remove2.html": [
-       "92ecaec9d2137f9c70c1160af24536800f50ec53",
-       [
-        null,
-        [
-         [
-          "/svg/animations/reftests/reference/green-100x100.svg",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "discard-rect-as-child.svg": [
-       "93e14c0d73e6ea14d910507047a3ba00c637cf74",
-       [
-        null,
-        [
-         [
-          "/svg/animations/reftests/reference/green-100x100.svg",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "discard-rect-as-href.svg": [
-       "e9cf560991e86f9751b20ac7cd1a6227ad3d5861",
-       [
-        null,
-        [
-         [
-          "/svg/animations/reftests/reference/green-100x100.svg",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "discard-rect-with-anim-child-a.svg": [
-       "57e6cb2d442a67284d8eed3690d47228bf8de28b",
-       [
-        null,
-        [
-         [
-          "/svg/animations/reftests/reference/green-100x100.svg",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "discard-rect-with-anim-child-b.svg": [
-       "5b1fc113c4fac8f28357e1c2fced67786fd91138",
-       [
-        null,
-        [
-         [
-          "/svg/animations/reftests/reference/green-100x100.svg",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ]
-     },
      "scripted": {
       "animateMotion-animated-line.svg": [
        "5e853dab03a547f2e963e0ecc51048a9ea3ea307",
@@ -358894,9 +363685,128 @@
        ],
        {}
       ]
+     ],
+     "viewBox-synthesized-in-img-001.tentative.html": [
+      "4496be9a5c2908171b37616427fd4f0cf6b97c0a",
+      [
+       null,
+       [
+        [
+         "/svg/coordinate-systems/viewBox-synthesized-in-img-001-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "timeout": "long"
+       }
+      ]
      ]
     },
     "embedded": {
+     "image-embedding-nested-data-url-from-canvas-post-window-load.html": [
+      "92883dc21be9dd981f2debdb479d8d8c7c1c16f5",
+      [
+       null,
+       [
+        [
+         "/svg/embedded/reference/image-with-nested-rects.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "image-embedding-nested-data-url-from-canvas-window-load.html": [
+      "a86cb2519012e6bad2a5cd260292d140a7b32e56",
+      [
+       null,
+       [
+        [
+         "/svg/embedded/reference/image-with-nested-rects.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "image-embedding-nested-data-url-from-canvas.html": [
+      "c935e3eaa9c8d47b9e12fd51d0e2cb527eab77f5",
+      [
+       null,
+       [
+        [
+         "/svg/embedded/reference/image-with-nested-rects.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "image-embedding-nested-data-url-png.html": [
+      "ff54e38b1a48c1692a4e7cb3c7ab44a82e0e36bf",
+      [
+       null,
+       [
+        [
+         "/svg/struct/reftests/reference/green-100x100.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "image-embedding-nested-data-url.html": [
+      "7e58c3e7e10b0b5679b02f77dde8cb2479bbf96e",
+      [
+       null,
+       [
+        [
+         "/svg/struct/reftests/reference/green-100x100.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "image-embedding-nested-external-data-url-png.html": [
+      "0935507c045f71ff195ff7141b6171c9099ceb78",
+      [
+       null,
+       [
+        [
+         "/svg/struct/reftests/reference/green-100x100.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "image-embedding-nested-http-url.sub.html": [
+      "f3d8a79b999ab50790c7c2cbbac29dc5ebbb4c9d",
+      [
+       null,
+       [
+        [
+         "/svg/struct/reftests/reference/green-100x100.html",
+         "!="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "image-embedding-nesteder-data-url.html": [
+      "48fb4fa48b7439dde62fbe82a0ff20ff5d64e550",
+      [
+       null,
+       [
+        [
+         "/svg/struct/reftests/reference/green-100x100.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "image-embedding-svg-nested-svg-in-foreignobject.html": [
       "880305253c59fe4d7af9808894f82bd88a6aa760",
       [
@@ -359481,6 +364391,19 @@
         {}
        ]
       ],
+      "circle-calc-dynamic-viewport.html": [
+       "cff8915d6f0ca9396da0afaaf1c27b86925d8459",
+       [
+        null,
+        [
+         [
+          "/svg/geometry/reftests/circle-calc-dynamic-viewport-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "ellipse-001.svg": [
        "e6d394de206f8831136dbe916d55166038ee94c2",
        [
@@ -359565,6 +364488,19 @@
         {}
        ]
       ],
+      "ellipse-calc-dynamic-viewport.html": [
+       "d817b78824633d3c6afea42c86912b0de090ab7c",
+       [
+        null,
+        [
+         [
+          "/svg/geometry/reftests/ellipse-calc-dynamic-viewport-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "percentage-attribute.svg": [
        "44c386d517179621fbf763d0c82c6750ca8d0f63",
        [
@@ -359642,6 +364578,19 @@
         ],
         {}
        ]
+      ],
+      "rect-calc-dynamic-viewport.html": [
+       "6fe39012511d7c57cae0d522a94299b589912f27",
+       [
+        null,
+        [
+         [
+          "/svg/geometry/reftests/rect-calc-dynamic-viewport-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      }
     },
@@ -360910,6 +365859,19 @@
        {}
       ]
      ],
+     "svg-percent-stroke-width-viewbox-update.html": [
+      "cc88e9276f2bd61bc78849c3f0fa38dd0311ca8a",
+      [
+       null,
+       [
+        [
+         "/svg/painting/svg-percent-stroke-width-viewbox-update-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "svg-with-outline.html": [
       "56ed98083a62a4ec00d05c6e99d5b7b55bd15658",
       [
@@ -361233,6 +366195,21 @@
         {}
        ]
       ]
+     },
+     "reftests": {
+      "path-zoom.html": [
+       "281124334a2fab589fcb424cb66fe405bf8d1438",
+       [
+        null,
+        [
+         [
+          "/svg/path/reftests/path-zoom-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
      }
     },
     "pservers": {
@@ -362168,6 +367145,58 @@
         {}
        ]
       ],
+      "inner-svg-css-transform.svg": [
+       "9187b0098facbc2d98c374ed13d640f1ceddba79",
+       [
+        null,
+        [
+         [
+          "/svg/struct/reftests/reference/inner-svg-transform-ref.svg",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "inner-svg-rotate-transform.svg": [
+       "c8a7c2c612e20ab2c9a1072f1bbf08d86b9ccb0d",
+       [
+        null,
+        [
+         [
+          "/svg/struct/reftests/reference/inner-svg-rotate-transform-ref.svg",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "inner-svg-transform-and-viewbox.svg": [
+       "3b96cef3d93cdcd0a46b46508591701b809aa6cd",
+       [
+        null,
+        [
+         [
+          "/svg/struct/reftests/reference/inner-svg-transform-and-viewbox-ref.svg",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "inner-svg-transform.svg": [
+       "31b2c613c6ae30eae1dcb2d913218f1a42503350",
+       [
+        null,
+        [
+         [
+          "/svg/struct/reftests/reference/inner-svg-transform-ref.svg",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "nested-svg-through-display-contents.svg": [
        "1be64d5242f9f65f53cd079df270c8a2232b741b",
        [
@@ -362181,6 +367210,19 @@
         {}
        ]
       ],
+      "outer-svg-transform.svg": [
+       "743ced136fa0640b7f2ab434c8b4a2585d30fc3b",
+       [
+        null,
+        [
+         [
+          "/svg/struct/reftests/reference/outer-svg-transform-ref.svg",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "requiredextensions-empty-string.svg": [
        "22efef20d31940a3f7fac60529687d13ddaa0dd1",
        [
@@ -362402,6 +367444,19 @@
         {}
        ]
       ],
+      "use-external-svg-resource-no-fragment-id.html": [
+       "37bcd3f370ac50250b02eeecc733fe53deb814a2",
+       [
+        null,
+        [
+         [
+          "/svg/struct/reftests/reference/green-100x100.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "use-inheritance-001.svg": [
        "5e375b94cd6c15f4ded39f351ce91d67e94b74bd",
        [
@@ -366917,7 +371972,7 @@
   },
   "support": {
    ".azure-pipelines.yml": [
-    "56b67ef6057c99a5a5f9104d89a12b93c07b836d",
+    "5e37bc4d3f4498b707a6a6f05b3a74af9ce258e2",
     []
    ],
    ".gitattributes": [
@@ -366935,31 +371990,31 @@
     ],
     "workflows": {
      "check-workflow-run.yml": [
-      "0487f03a592fa354557ef109e0c3767017e0f856",
+      "7afc1678105236554081be440995cfae532e5340",
       []
      ],
      "docker.yml": [
-      "6d5c7c79a05faeaeb5e18040ceedaf99240020c4",
+      "5de0cc4bcb1faf6c919d41998bd9ec035e8594cf",
       []
      ],
      "documentation.yml": [
-      "f7e9fb2e13505840666e5831f4b20a9d119c3cbf",
+      "6c92e435c69ae60a2ff73fe482dfc047bb2cb461",
       []
      ],
      "epochs.yml": [
-      "8b2081364e5d75066bf62414dfcf45636226f2c7",
+      "fa88b50ff3f5746b07f1a7acb9267d8f52399c82",
       []
      ],
      "interfaces.yml": [
-      "302e0a846d823e7bb5f37586c8b595307a2a3ac8",
+      "c3deb7c0b7d942113e380f2b2752fb0c441fc3ec",
       []
      ],
      "manifest.yml": [
-      "a27fc2258dea84679dd0e4b667d183526dea6208",
+      "4ac2c8b27005a5468482f34364c6387debd9c9cb",
       []
      ],
      "regen_certs.yml": [
-      "b66ba90065f9b142138f49d1a5ebf5b12d428f4e",
+      "d60c6b04b30800c6ffe2576cc81bb65d28d8d55c",
       []
      ],
      "safari-wptrunner.yml": [
@@ -366975,11 +372030,15 @@
       []
      ],
      "update-wasm-tests.yml": [
-      "283e6e728786fd3ff64004c4a372be540929c2c4",
+      "d1aafdcb12445a77e4a395ac1aa509f54daf69c7",
+      []
+     ],
+     "update_codeowners.yml": [
+      "9e3f23efa7df7b362785aea566619253842056e4",
       []
      ],
      "wpt_fyi_notify.yml": [
-      "c066136641836a903ae2330d7cb06fc72e28e37a",
+      "8e9a043f2c363e9bb661a9afa1a9fabebfe1fe98",
       []
      ]
     }
@@ -366993,7 +372052,7 @@
     []
    ],
    ".taskcluster.yml": [
-    "18c82321f92862ef9a7e04c5088eafa663cc58f2",
+    "9ade5168bbb558c8af822a4008074ccfebdad6af",
     []
    ],
    ".well-known": {
@@ -367097,7 +372156,7 @@
     ]
    },
    "CODEOWNERS": [
-    "c5db991b4007a177feef8441884abbc6f82d03fd",
+    "da5b3f0d33037a3f2b58a69fd10d19401c9523fd",
     []
    ],
    "CODE_OF_CONDUCT.md": [
@@ -367417,7 +372476,7 @@
       []
      ],
      "importKey_failures.js": [
-      "453461a8771f516ac48c9f0e8e02b2284e008088",
+      "39c70a85470dcadf471735fcc040f9d9b6c81981",
       []
      ],
      "okp_importKey.js": [
@@ -367530,7 +372589,7 @@
    },
    "accname": {
     "META.yml": [
-     "7f538628e8c0b2134f9605106616b3a1d05eb7a7",
+     "775209284947114b6f50e5dfaf7695afd2ba7abf",
      []
     ],
     "manual": {
@@ -367673,11 +372732,43 @@
     }
    },
    "ai": {
+    "language_detection": {
+     "resources": {
+      "iframe-helper.html": [
+       "35ba852558725ecf4adb9af92e4bc0abb1cf8c38",
+       []
+      ],
+      "util.js": [
+       "7cb3e7c2e13cb0415be019580ccfcc339cd7bd8f",
+       []
+      ]
+     }
+    },
     "resources": {
+     "locale-util.js": [
+      "cacb11f4f25e04555a4d2a29b9344b19fc79c4d1",
+      []
+     ],
      "util.js": [
-      "49d677edae26df95eac3078dc6deb4dd6c3b3f72",
+      "3e95a936304f3190066f3774e9483394d31a501f",
       []
      ]
+    },
+    "summarizer": {
+     "resources": {
+      "iframe-helper.html": [
+       "8db84705a2b87fe958b09d089722fe08700426fa",
+       []
+      ]
+     }
+    },
+    "translator": {
+     "resources": {
+      "util.js": [
+       "ad06086a123bccbe2c852dffd1a36ffde0613ada",
+       []
+      ]
+     }
     }
    },
    "ambient-light": {
@@ -369939,6 +375030,10 @@
      "840e187cbad1cca4ea09e144c88df2a14032136a",
      []
     ],
+    "WEB_FEATURES.yml": [
+     "3c4f69200f67b3cd856f56913025c14de17a0e73",
+     []
+    ],
     "resources": {
      "setAppBadge_iframe.html": [
       "8738099658fbb2de893658e70242e855ecccd4b1",
@@ -370191,7 +375286,7 @@
       []
      ],
      "bluetooth-test.js": [
-      "bd597efd01b601754ce2c62e4c7fb4842fd5057c",
+      "05981c07e15c8c89d735bc8985364ebe9377398e",
       []
      ],
      "health-thermometer-iframe.html": [
@@ -370275,7 +375370,15 @@
      "65ca96dbb9d774e97cc3a60f6b6dde952104893b",
      []
     ],
+    "WEB_FEATURES.yml": [
+     "d55b5faaf11be9aa92df01f814d5ce165b23025f",
+     []
+    ],
     "support": {
+     "clear-cache-helper.sub.js": [
+      "5db0caf834cbf6a598f02761beda267dc8f1bcf8",
+      []
+     ],
      "clear-site-data-cache.py": [
       "38f131bdd52b51250204cca79972d93a62ace715",
       []
@@ -370284,6 +375387,14 @@
       "eb50cb54ef867844ea741fe1fdb01df970e4deea",
       []
      ],
+     "clear-site-data-prefetchCache.py": [
+      "3a332dd58b2012154b6a193410be34dc3f92a172",
+      []
+     ],
+     "clear-site-data-prerenderCache.py": [
+      "bf845cfb699c311c145357ad12a5b4b056d2c986",
+      []
+     ],
      "controlled-endpoint.py": [
       "bb4f464088e46438f993d66ae0da134bb4410c7b",
       []
@@ -389874,6 +394985,22 @@
      ]
     }
    },
+   "container-timing": {
+    "META.yml": [
+     "b786960789921b08bdbb782ea4a57afc8c20f826",
+     []
+    ],
+    "resources": {
+     "container-timing-helpers.js": [
+      "a80ad964fef311f55062631d5548a6d8f0eecb3f",
+      []
+     ],
+     "square100.png": [
+      "567babb96d1ec3e1032d476f8f7ee1fcb2aa4875",
+      []
+     ]
+    }
+   },
    "content-dpr": {
     "content-dpr-various-elements-ref.html": [
      "9a7e10e51b06ab6a4c2453b8f048cfd8709bd471",
@@ -391819,7 +396946,7 @@
       []
      ],
      "helper_iframe.sub.html": [
-      "750f19b56d39b25cbe5d770640bd9f2b36c78005",
+      "3bd1843d5742dcbbbeca6318c4c9793d3532a7a2",
       []
      ],
      "helpers.js": [
@@ -391955,6 +397082,10 @@
        "67ce1b2759ef661b04d267b748bef435fc33aaf0",
        []
       ],
+      "partitioned-cookies-samesite-attributes-embed.html": [
+       "c6f64639eac8b432677933d4e9a5c36f4259548b",
+       []
+      ],
       "partitioned-cookies-top-level-redirect.html": [
        "c94beff5285578dab643c2c330e864135742291b",
        []
@@ -392143,6 +397274,10 @@
        "2d579c91bed92b69235c357dafb51ef98490dab6",
        []
       ],
+      "third-party-cookies-cross-site-embedder-opener.html": [
+       "f7458f8be166f66419d4f1950d3eb78a28b8e03b",
+       []
+      ],
       "third-party-cookies-cross-site-embedder.html": [
        "ec25902a915a1d2b93e1cd2028a5f42476476713",
        []
@@ -392164,7 +397299,7 @@
    },
    "core-aam": {
     "META.yml": [
-     "dfce961fa8a5152167da328a70618c7459fe8241",
+     "f150c4fe065b7569c673c4e4007882063d723bef",
      []
     ],
     "README.md": [
@@ -403887,6 +409022,10 @@
        "65138c9a66713e1ed8c2f649751deb1ceb22eac3",
        []
       ],
+      "root-element-creates-stacking-context-ref.html": [
+       "9bb42041498c4a5b2b86e6b282ec49e603a0880b",
+       []
+      ],
       "zindex-affects-block-in-inline-ref.html": [
        "c0fdb338d08198cfd058ccdabd7766a9e57375fd",
        []
@@ -409794,6 +414933,10 @@
       "b07685d951735d521418a98e2b7bf283a068019b",
       []
      ],
+     "root-element-background-margin-opacity-ref.html": [
+      "afe543029d800f5b3c53c1c2179e981693c033ba",
+      []
+     ],
      "root-element-background-transparency-ref.html": [
       "4671d44c1c3f3e2ff16149cbaabebb0433aef3e5",
       []
@@ -409875,8 +415018,48 @@
       []
      ],
      "abspos": {
+      "align-items-static-position-001-ref.tentative.html": [
+       "22c1fd03e38792a3d697659c1e087178c453f1ed",
+       []
+      ],
+      "align-items-static-position-002-ref.tentative.html": [
+       "6f53b04178707a83eb2822e5807cf42d3c547ca6",
+       []
+      ],
       "align-items-static-position-ref.html": [
-       "1b36d26bbe15f14c15fd71c98347ca2bdfb5e722",
+       "fd7093f98748709d0f6d03c9dc9993a7a1447446",
+       []
+      ],
+      "align-self-static-position-001-ref.html": [
+       "94d0b43b2127080e961be8a7277865e2b6013d88",
+       []
+      ],
+      "align-self-static-position-002-ref.html": [
+       "d8bef63aa292aecd1ce6628e27abbc2c196f8a29",
+       []
+      ],
+      "align-self-static-position-003-ref.html": [
+       "132bbb7360fb5a40130e0a7af9ffb3a9d2baf753",
+       []
+      ],
+      "align-self-static-position-004-ref.html": [
+       "68130ee1d7e723a6b5c4c8a7e3b78d7bdb2f35da",
+       []
+      ],
+      "align-self-static-position-005-ref.html": [
+       "62597fba605b06b5b0240f808d85b633d763bbe3",
+       []
+      ],
+      "align-self-static-position-006-ref.html": [
+       "5bbafc6484585ad25223cf1b5825214e90705836",
+       []
+      ],
+      "align-self-static-position-007-ref.html": [
+       "bc9b5f4f6502f647e97332401308a87a64c339f0",
+       []
+      ],
+      "align-self-static-position-008-ref.html": [
+       "79cf612b8f846920af1d2d7b188376693c789b3f",
        []
       ],
       "align-self-with-flex-grid-parent-ref.html": [
@@ -409907,6 +415090,10 @@
       ]
      },
      "blocks": {
+      "WEB_FEATURES.yml": [
+       "c5493f759563dff533cd974fd211ec49e3635046",
+       []
+      ],
       "align-content-block-001-ref.html": [
        "6a454d60d7689bcd3e7f028d8357032f545a19c4",
        []
@@ -410022,8 +415209,12 @@
       "d2638491cef23e0c1a788801aec9a4ec848b78d4",
       []
      ],
+     "anchor-center-visibility-change-ref.html": [
+      "66bf9083c3a24e6adad0ad724a1e54ccbe6f568b",
+      []
+     ],
      "anchor-position-005-print-ref.html": [
-      "94a1f8e55d30e2de6607ca741142d4bdbdf87098",
+      "2c8824bbc3536186d6bc8aed7222ded7da2c40be",
       []
      ],
      "anchor-position-top-layer-ref.html": [
@@ -410083,7 +415274,7 @@
       []
      ],
      "position-visibility-anchors-visible-both-position-fixed-ref.html": [
-      "7a9d69a9e3b3206fbc8a5865fb951ecec67b1bea",
+      "3af597aee65d3d679ae21e55d2f5859a3459e297",
       []
      ],
      "position-visibility-anchors-visible-chained-004-ref.html": [
@@ -410106,14 +415297,14 @@
       "3b6532e27b02a21037926adda9c4204c3ac6c017",
       []
      ],
-     "position-visibility-anchors-visible-position-fixed-ref.html": [
-      "e24992fd5ea44d66f01c275049436d15349f7a2b",
-      []
-     ],
      "position-visibility-anchors-visible-ref.html": [
       "17798173804b41258690ed22f1169a529bca42fe",
       []
      ],
+     "position-visibility-anchors-visible-with-position-ref.html": [
+      "5a364aa7847a13e5c786708f5f97dd0dd718649d",
+      []
+     ],
      "position-visibility-no-overflow-ref.html": [
       "d6e64d0d107664532f657d8774df1aeda6e038f9",
       []
@@ -410131,6 +415322,10 @@
       []
      ],
      "reference": {
+      "anchor-css-zoom-ref.html": [
+       "9ec7e06aa85a0cad828cfb483bb48bbef7748bb0",
+       []
+      ],
       "anchor-in-css-min-max-function-ref.html": [
        "781a8ae6a2ccc838a9728005cde92111c9fe0039",
        []
@@ -410207,6 +415402,10 @@
        "2366a7dc097e619bc6bcd4eb06e347a877c7e166",
        []
       ],
+      "anchor-size-css-zoom-ref.html": [
+       "a4feab487c5c9262e6c71d2f16f4bb83384cdcbe",
+       []
+      ],
       "sticky-anchor-position-invalid-ref.html": [
        "c4a5dd37354f61c66b0e2e53847b8fcc16112fc3",
        []
@@ -410232,6 +415431,10 @@
       "398217c4587e0c5f5364b00b8b39b49885c7f27b",
       []
      ],
+     "animate-with-background-color-oklch-001-ref.html": [
+      "92b91077f3fe1cc66cca5b5202cd5d9a2d5f6b50",
+      []
+     ],
      "animation-common-ref.html": [
       "ddc7da67ddf5fed83e653d1130a65f5c1e3a6dec",
       []
@@ -412443,7 +417646,15 @@
      "tentative": {
       "corner-shape": {
        "corner-shape-any-ref.html": [
-        "688f01c8668554efce1ccde22ebf2b12a2ff61c8",
+        "36fc7a88825fea38ad5cfcdf544946e3644cc00b",
+        []
+       ],
+       "corner-shape-backdrop-filter-overflow-ref.html": [
+        "4aabd7e8e353f90f3ceeaf590eca42854c9552b7",
+        []
+       ],
+       "corner-shape-backdrop-filter-ref.html": [
+        "165f93e6be13d9d856ac008b4eb9a5db4b0873cd",
         []
        ],
        "corner-shape-bevel-overflow-composite-ref.html": [
@@ -412458,29 +417669,33 @@
         "4000833c31d1cad31076f52f33f0f4f95922bbd1",
         []
        ],
+       "corner-shape-gallery.manual.html": [
+        "1eb6cbd8df349f0a27b1575b8a77583c95b44a42",
+        []
+       ],
+       "corner-shape-inset-shadow-ref.html": [
+        "fa36c9d6ecc527fee37bb589c3c5194df1ff2291",
+        []
+       ],
        "corner-shape-notch-ref.html": [
         "8963c0ca2939c4036d9505461c9772b803b586f2",
         []
        ],
-       "corner-shape-render-ref.html": [
-        "1a9043cbc827f4ef4b1ba753e1fae278647de5f2",
-        []
-       ],
-       "corner-shape-straight-ref.html": [
+       "corner-shape-square-ref.html": [
         "4576240ef3288a954c9a627cbafd640eacd95444",
         []
        ],
        "resources": {
         "corner-shape.js": [
-         "2aaaf5ed28987608fba8f4f8b756cd3062e82498",
+         "4757a43ad051f42a88ddefeba344bcea0b9a0149",
          []
         ],
         "corner-utils.js": [
-         "39203aefc67d57e9e0128112e60ac5b01e147d95",
+         "ad3b235addff11e418d78e372b20c09a2ebd4a19",
          []
         ],
         "resolve-corner-style.js": [
-         "ea065f577e09c30b56cf1171685375b7aefeebc7",
+         "a890c57b868e45648eaf097c97163d214a9a1d92",
          []
         ]
        }
@@ -412753,11 +417968,11 @@
       []
      ],
      "break-inside-avoid-multicol-001-print-ref.html": [
-      "baf114d35c9d86ec0708f070e269d965f47bc972",
+      "0e6f2500d9202402c6f7a7b711ce47a25dc495e3",
       []
      ],
      "break-nested-float-in-table-001-print-ref.html": [
-      "3459e25edd64ca8d90cebd4a44f68aa9b4106e25",
+      "ffd4196708f659f34cafef28abb71efc8fd3914f",
       []
      ],
      "change-inline-color-ref.html": [
@@ -412826,11 +418041,11 @@
        []
       ],
       "multi-line-row-flex-fragmentation-063-print-ref.html": [
-       "4eeea8dcb590c4f85d7b853ac0d0457cc0faab0a",
+       "a1fd5f401e8c12443ae4824b9406f196ad1e22da",
        []
       ],
       "multi-line-row-flex-fragmentation-064-print-ref.html": [
-       "bc659553eddd5c8ca529105e3dc8c6b96ac07d8a",
+       "2ea14e37d1e105aeb14d96a4e0b053921467cc8c",
        []
       ],
       "multi-line-row-flex-fragmentation-065-ref.html": [
@@ -412858,15 +418073,15 @@
        []
       ],
       "multi-line-row-flex-fragmentation-075-print-ref.html": [
-       "65b68b27e5f7bb37a4919739de78a7a9cb5f00c2",
+       "fb211111e5159c99def98d35515bc6e1b925bf58",
        []
       ],
       "multi-line-row-flex-fragmentation-076-print-ref.html": [
-       "a14e3ed016216cb98822dac51c4a07e037b5f993",
+       "454c5973b012e7125a35b51b18da03aeb7295204",
        []
       ],
       "multi-line-row-flex-fragmentation-080-print-ref.html": [
-       "de6bd49c922454e303216fb45a627954bab33df6",
+       "127ac1730fb623af15af06d6e36a80f6d111b747",
        []
       ],
       "multi-line-row-flex-fragmentation-081-print-ref.html": [
@@ -412882,11 +418097,11 @@
        []
       ],
       "single-line-column-flex-fragmentation-060-print-ref.html": [
-       "56c38817e420507c08dfab56727cfe870ac93172",
+       "88ab65eda665c8c5f374b1f8d4dbe33ade8aba9b",
        []
       ],
       "single-line-column-flex-fragmentation-065-print-ref.html": [
-       "07d0c637667a5556da69518e18500942759ff554",
+       "86746d05c25d94e9955799329250604191698eaa",
        []
       ],
       "single-line-column-flex-fragmentation-066-print-ref.html": [
@@ -412906,7 +418121,7 @@
        []
       ],
       "single-line-row-flex-fragmentation-042-print-ref.html": [
-       "5f65fbaf687e6b5de87da8a223298778e03eece7",
+       "80d3923e2336140cfd2fb290f97f057a92f8d05c",
        []
       ],
       "single-line-row-flex-fragmentation-044-ref.html": [
@@ -412914,7 +418129,7 @@
        []
       ],
       "single-line-row-flex-fragmentation-045-print-ref.html": [
-       "07d0c637667a5556da69518e18500942759ff554",
+       "86746d05c25d94e9955799329250604191698eaa",
        []
       ],
       "single-line-row-flex-fragmentation-046-print-ref.html": [
@@ -412931,11 +418146,11 @@
       []
      ],
      "float-with-large-margin-bottom-cross-page-001-print-ref.html": [
-      "dd78a266f426ba676446a78188fe4916348bfe31",
+      "e48009315de1a63a583444d9c16e4b8a374e23f9",
       []
      ],
      "float-with-large-margin-bottom-cross-page-002-print-ref.html": [
-      "cb1701418d0a119f7d93b49458a97c979a46d543",
+      "205e73b6b8bc2c0338bd6c423d854bd239461426",
       []
      ],
      "floats-and-text-narrow-and-short-dynamic-ref.html": [
@@ -412948,7 +418163,7 @@
      ],
      "grid": {
       "monolithic-overflow-print-ref.html": [
-       "58cc0828d2cd31182dac2b5e8ee555721d0ed39e",
+       "d4b5629d243ad869bc36eb180ba2cb6d4080da04",
        []
       ]
      },
@@ -413064,6 +418279,10 @@
       "8c19f1cf4c6c0173b45face28d624368d365ec70",
       []
      ],
+     "root-margin-001-print-ref.html": [
+      "320da2e0f551b82e2e699500179fe06db612151b",
+      []
+     ],
      "rounded-clipped-border-ref.html": [
       "be08126fd2c3bab356a3a4fd5ff1cc1579184662",
       []
@@ -413148,27 +418367,27 @@
        []
       ],
       "table-fragmentation-001a-print-ref.html": [
-       "d4229ebb873ef95f1abe12b31493dad789183a04",
+       "dd0e61badef3696da734ffcb6b26c92c82d25556",
        []
       ],
       "table-fragmentation-001c-print-ref.html": [
-       "d7778e340ab092422994fa3fcd0d87dc4fee6599",
+       "60f4e1b92032f79cd11c07e2367f89ed5b4ffef1",
        []
       ],
       "table-fragmentation-002a-print-ref.html": [
-       "d7272352a158923070af69e47e07ed08ebb5b11c",
+       "94777453f421342daf1f77b0ff78dfccd067b182",
        []
       ],
       "table-fragmentation-002c-print-ref.html": [
-       "18c1e0d5a9b8cc291f1142776736680f791f8aed",
+       "427791d8418aab00c58c616bad41fcb756292a15",
        []
       ],
       "table-fragmentation-003a-print-ref.html": [
-       "bf99e5b41e2094ade866ef5ff9451f414a2e2916",
+       "bfd817a9411e046596987edc9f9088fc25eae46b",
        []
       ],
       "table-fragmentation-003c-print-ref.html": [
-       "50738fbaa8af3ed2abe0cd8a498d8f299000578f",
+       "793880e203f89d47e1953a04eb7191f6b35cbe36",
        []
       ],
       "table-grid-paint-htb-ltr-ref.html": [
@@ -413229,11 +418448,11 @@
       []
      ],
      "transform-023-print-ref.html": [
-      "7204e1d65712ce4e4b8680184b976b8982b6a981",
+      "856e6435fb8102352f60fce0f6007c2dfe84a2a6",
       []
      ],
      "transform-024-print-ref.html": [
-      "766c415a1be21e6ebf9022a0826a1e865688fcb8",
+      "582794ca046e6942c19101dc245fc0394b7a4b54",
       []
      ],
      "underflow-from-next-page-print-ref.html": [
@@ -413361,7 +418580,7 @@
       []
      ],
      "WEB_FEATURES.yml": [
-      "a7e2044aeaa04a5e45449caee2269319f4906237",
+      "275611f531ea49474d58e8c28e0b953521f0a7ab",
       []
      ],
      "a98rgb-003-ref.html": [
@@ -413660,7 +418879,7 @@
      ],
      "parsing": {
       "WEB_FEATURES.yml": [
-       "cc8273c2adc8a53ee46bd3882878cbebe0f39b07",
+       "0bb97b1e1d9779296b1290591fcd9fb38b038573",
        []
       ]
      },
@@ -414068,7 +419287,7 @@
      ],
      "container-queries": {
       "WEB_FEATURES.yml": [
-       "445ceb373f006b2741029c1360416dee2d3d7057",
+       "7e15715f583d214becbee9cd40551b021bfdb5ce",
        []
       ],
       "change-display-in-container-ref.html": [
@@ -414347,7 +419566,7 @@
       []
      ],
      "contain-paint-stacking-context-001-ref.html": [
-      "c7553716ab6c257bb0d9407582eed186bd763369",
+      "e2516f3d3788fd7f28356d266ee73e6b7ec0a4e3",
       []
      ],
      "contain-size-block-001-ref.html": [
@@ -414599,6 +419818,10 @@
        "f927a02ca8cc6c7ad097401725d2977f6d9d218f",
        []
       ],
+      "content-visibility-auto-img-001-ref.html": [
+       "d47ced1c33d8c57c7bf9072714e177dd8250f391",
+       []
+      ],
       "content-visibility-auto-in-iframe-ref.html": [
        "03a2875b75a7de0cb2fad0284da20bd6420c3f49",
        []
@@ -416775,6 +421998,14 @@
        "fb1fb93ea997b1107efa595f17ae5b9c38419a92",
        []
       ],
+      "flex-abspos-staticpos-align-self-safe-002-ref.html": [
+       "59db32c67a9dc720b8e40e25a058d4eed37f9efd",
+       []
+      ],
+      "flex-abspos-staticpos-align-self-safe-003-ref.html": [
+       "d0499adcf0fffd1ca8503db3eb24374e769a2021",
+       []
+      ],
       "flex-abspos-staticpos-fallback-justify-content-001-ref.html": [
        "0abf592d6d476d0e5a9a01b163e3aebf9fffb74d",
        []
@@ -416849,7 +422080,7 @@
       []
      ],
      "break-nested-float-in-flex-item-print-ref.html": [
-      "d4a678d0746e87768b6a5be24a66b5f79e35a116",
+      "6b32a2066ab59b1c18939b7ddb5f3fc95ae59e7b",
       []
      ],
      "css-flexbox-height-animation-stretch-ref.html": [
@@ -418343,19 +423574,19 @@
       []
      ],
      "gap-007-lr-ref.html": [
-      "a3b461fa127e8f5ec25fc1732c04dcc0c544c1cb",
+      "6000deb624348e8abe31a16693f2d262837e1952",
       []
      ],
      "gap-007-ltr-ref.html": [
-      "13741eb9bd3de3221bd820d2ab1b65a4a15dc287",
+      "9972a8c5ccf9aef9d6ca3719b2c30902ecc17ad2",
       []
      ],
      "gap-007-rl-ref.html": [
-      "1ca3b5cea987b628dedf30b720504ed948c04d1d",
+      "9dfc1860b526556ca36eedd5bd33f1faa9dcd8a7",
       []
      ],
      "gap-007-rtl-ref.html": [
-      "9e329cc0a4401365cafebf36e738651989f8817f",
+      "8c16fbdb22c4c7f79c5dc28b829a4ced2554ab2a",
       []
      ],
      "gap-008-ltr-ref.html": [
@@ -418654,15 +423885,15 @@
        []
       ],
       "overflow-area-001-ref.html": [
-       "2c2a825f41ef5aaa51f962d0f46d8b9ac099c1a0",
+       "cd13c7e0915933a662996005d195957a28d2d787",
        []
       ],
       "overflow-area-002-ref.html": [
-       "f5d06c6cf3e3227f9c415c6d5e3e11b3d766bd67",
+       "6422d4f7dfb80db8a9adfd8e5a6d4f63aa64782a",
        []
       ],
       "overflow-area-003-ref.html": [
-       "2d9bf19922ce5bbe12327bd6c833fbe167bcb856",
+       "40df8cb5a8b5dd2a865ab23c9ca971bad8a174d7",
        []
       ],
       "overflow-auto-005-ref.html": [
@@ -418958,6 +424189,10 @@
       "3ac9b655b0606783334ff91f9fba852df8efdbc1",
       []
      ],
+     "WEB_FEATURES.yml": [
+      "22137bf82799f16ccf4548eca288bee5fc257e37",
+      []
+     ],
      "fontface-descriptor-updates-ref.html": [
       "513867b3503042886e51312bcfec20967f7384d4",
       []
@@ -419009,7 +424244,7 @@
       []
      ],
      "WEB_FEATURES.yml": [
-      "dd313f81ed650f57e270a04de45917ee7d6dd045",
+      "856ded1a75b799024be278a854d6a501bd7055c5",
       []
      ],
      "alternates-order-ref.html": [
@@ -419741,11 +424976,15 @@
       []
      ],
      "font-variant-emoji-003-ref.html": [
-      "1e8cdb89cfa744b2f13ed7fc1d53ee06b8d735d9",
+      "f14584c13236853df9b5d13340aad03ec2434f91",
       []
      ],
      "font-variant-emoji-004-ref.html": [
-      "b15c8227cc4a019c369c5c97b53bd6810eb0b72f",
+      "633a94c4e51f32328bc68eeb74837aada6f4aff0",
+      []
+     ],
+     "font-variant-emoji-005-ref.html": [
+      "d4275b5c951c05ea270f1a2a474ff4ccaf9afc4a",
       []
      ],
      "font-variant-emoji-1-notref.html": [
@@ -420348,14 +425587,6 @@
         "ea32e1787e58047763ca26ca575e5ff67325d110",
         []
        ],
-       "Lato-Medium-Liga.ttf": [
-        "3a0beaea38b8bc0cbf6fa656bf23e28cfdf18c6f",
-        []
-       ],
-       "Lato-Medium.ttf": [
-        "2c612da2ae589dc264deb683f90baf75c8e18e03",
-        []
-       ],
        "LigatureSymbolsWithSpaces.woff": [
         "1f0e7ca0076ae09f3fdea656052a1a08ab2b1111",
         []
@@ -426626,25 +431857,269 @@
      }
     },
     "css-gaps": {
-     "tentative": {
-      "grid": {
-       "grid-gap-decorations-002-ref.html": [
-        "f21be425243208a8fd5baa7ead43313ea88fb19a",
-        []
-       ],
-       "grid-gap-decorations-003-ref.html": [
-        "15fc305633d377c286ed9d8fefc6f86aef78c467",
-        []
-       ],
-       "grid-gap-decorations-004-ref.html": [
-        "e4e6b8b458f30c5b8ef5cefbeaf23c13571e0c15",
-        []
-       ],
-       "grid-gap-decorations-005-ref.html": [
-        "aebfba5a20e97e826e27e27c0ce962f6f675eba2",
-        []
-       ]
-      }
+     "agnostic": {
+      "gap-decorations-001-ref.html": [
+       "a7314fc7dca1545dacd710c261c7594117a3894a",
+       []
+      ],
+      "gap-decorations-002-ref.html": [
+       "42c5ef128b47fc9cdd14c9ce4f8abdffb209d94e",
+       []
+      ]
+     },
+     "flex": {
+      "flex-gap-decorations-003-ref.html": [
+       "137a63474b80d8cae010511de93d21144052366f",
+       []
+      ],
+      "flex-gap-decorations-004-ref.html": [
+       "f77dd318db7747a5a7107e69afe2a21436aafc33",
+       []
+      ],
+      "flex-gap-decorations-005-ref.html": [
+       "04b3e8d1af4eee718bda8b432c157a45c3a3f623",
+       []
+      ],
+      "flex-gap-decorations-006-ref.html": [
+       "46c4fd49e39239b3940911f514e169f86cc613b0",
+       []
+      ],
+      "flex-gap-decorations-007-ref.html": [
+       "8511c66acf4511670a0268f8bf170a883e2d3924",
+       []
+      ],
+      "flex-gap-decorations-008-ref.html": [
+       "8ca5749417f4eac98bbd9145f8a7cdd6bddc8cc0",
+       []
+      ],
+      "flex-gap-decorations-009-ref.html": [
+       "0adb9af6994746b1e80d056a0c92cd48f2106108",
+       []
+      ],
+      "flex-gap-decorations-010-ref.html": [
+       "8756c5d038c147a561b20ce4ce2aa45e0ade0ab7",
+       []
+      ],
+      "flex-gap-decorations-011-ref.html": [
+       "082be2875a4274d8744b098f8858635c0df8c8d3",
+       []
+      ],
+      "flex-gap-decorations-012-ref.html": [
+       "33be4b76212fde92bf4488574228c37b50edc1b6",
+       []
+      ],
+      "flex-gap-decorations-013-ref.html": [
+       "3d999788023d13c8414796f6839ceafcd94803d5",
+       []
+      ],
+      "flex-gap-decorations-014-ref.html": [
+       "59ce37deaec3e993e594c01fb9ac9887ced10668",
+       []
+      ],
+      "flex-gap-decorations-015-ref.html": [
+       "48745eff931a803f4da17ea6a527b62367720560",
+       []
+      ],
+      "flex-gap-decorations-016-ref.html": [
+       "155e0bfac7b35307f211535f4a940edc7af32dfc",
+       []
+      ],
+      "flex-gap-decorations-017-ref.html": [
+       "031be2abaf1b856b6b33a40958a7fe7438a01ed2",
+       []
+      ],
+      "flex-gap-decorations-018-ref.html": [
+       "644a409bd977acb91812666ac2f9a6e1c1b66830",
+       []
+      ]
+     },
+     "grid": {
+      "grid-gap-decorations-003-ref.html": [
+       "15fc305633d377c286ed9d8fefc6f86aef78c467",
+       []
+      ],
+      "grid-gap-decorations-004-ref.html": [
+       "e4e6b8b458f30c5b8ef5cefbeaf23c13571e0c15",
+       []
+      ],
+      "grid-gap-decorations-005-ref.html": [
+       "aebfba5a20e97e826e27e27c0ce962f6f675eba2",
+       []
+      ],
+      "grid-gap-decorations-006-ref.html": [
+       "94d455c1d86af89ff2b3e872eeaf9f59cd4bde0a",
+       []
+      ],
+      "grid-gap-decorations-007-ref.html": [
+       "5d89f414ed5fa6f259eb95ad9de96e260586ccdd",
+       []
+      ],
+      "grid-gap-decorations-008-ref.html": [
+       "3e2562cfccb8d4a5c6ce1f6f5b5a0781421392ad",
+       []
+      ],
+      "grid-gap-decorations-009-ref.html": [
+       "964f2111eb8d97cf0c18f705115027136ee147a3",
+       []
+      ],
+      "grid-gap-decorations-010-ref.html": [
+       "0c07124b0864605d7fafabece01988036b501019",
+       []
+      ],
+      "grid-gap-decorations-011-ref.html": [
+       "c8824a5296ea8b87fe3a59f01195ab456cd7b46b",
+       []
+      ],
+      "grid-gap-decorations-012-ref.html": [
+       "51ca67dd6a2ba00b2618e11535b1447ccfaa28c9",
+       []
+      ],
+      "grid-gap-decorations-013-ref.html": [
+       "7ebf7c00b181f6480975367ca97dedad9a4221c5",
+       []
+      ],
+      "grid-gap-decorations-014-ref.html": [
+       "7631d5287a85997f1f2f89dcf2a727f3c0a07c65",
+       []
+      ],
+      "grid-gap-decorations-015-ref.html": [
+       "f95324d3320bbb7653963c0a260c8a4a78ff41ea",
+       []
+      ],
+      "grid-gap-decorations-016-ref.html": [
+       "c11380a68aa09f730a4bd2b609274ff94424c772",
+       []
+      ],
+      "grid-gap-decorations-017-ref.html": [
+       "ac0bbd1f1e19cfc5729486fe5109af8f400f655d",
+       []
+      ],
+      "grid-gap-decorations-018-ref.html": [
+       "072dc508ea340c5dbebb14aa8baf06bbb9e7a127",
+       []
+      ],
+      "grid-gap-decorations-019-ref.html": [
+       "e9f8a87979d0e66aa708911798d6ea5bd1b40b42",
+       []
+      ],
+      "grid-gap-decorations-020-ref.html": [
+       "6f31b5a09fc8717d5fcee2f67b7e765d1b9ba2a4",
+       []
+      ],
+      "grid-gap-decorations-021-ref.html": [
+       "de36d206606d1dd324ee2eb458a840eedb81e140",
+       []
+      ],
+      "grid-gap-decorations-023-ref.html": [
+       "e630694c6a55a5e710c6517574b8377527db6d19",
+       []
+      ],
+      "grid-gap-decorations-024-ref.html": [
+       "94b1eccd7470157065bbc6fbe2961b311a1762fd",
+       []
+      ],
+      "grid-gap-decorations-025-ref.html": [
+       "3834da46a5d58d0785bb3b767f21cbeff5e2f7d4",
+       []
+      ],
+      "grid-gap-decorations-026-ref.html": [
+       "d57c622810dcc70270db45742f14faaf75d65357",
+       []
+      ],
+      "grid-gap-decorations-027-ref.html": [
+       "7e0d9cbcd6ff64b17bc8fe57616a37ba29a9fd8e",
+       []
+      ],
+      "grid-gap-decorations-029-ref.html": [
+       "35450e07ae5579707c94b4a0a58f29eb83d7f7fa",
+       []
+      ],
+      "grid-gap-decorations-030-ref.html": [
+       "d4953ae2ddda701324d350ccf25a113b8e67fc37",
+       []
+      ],
+      "grid-gap-decorations-031-ref.html": [
+       "0615305bc9f8de791f1c2061ad6d90039932b157",
+       []
+      ],
+      "grid-gap-decorations-032-ref.html": [
+       "f90e3dd68132078e2557f33b7e32605d278cd0eb",
+       []
+      ],
+      "grid-gap-decorations-033-ref.html": [
+       "e26143a6b93e9fdd53d4055234d89e40d98dc2af",
+       []
+      ]
+     },
+     "multicol": {
+      "multicol-gap-decorations-001-ref.html": [
+       "834c96ccd397fbc41abcfb80dbd298094cb929b1",
+       []
+      ],
+      "multicol-gap-decorations-002-ref.html": [
+       "d132f0ca6770be13d87ee66fb033f2f498d0e37b",
+       []
+      ],
+      "multicol-gap-decorations-003-ref.html": [
+       "cd26da243891f05c83c5d1eea17c747dcf390f05",
+       []
+      ],
+      "multicol-gap-decorations-004-ref.html": [
+       "002b1f2b594cf791b6d66613f48128e915517e01",
+       []
+      ],
+      "multicol-gap-decorations-005-ref.html": [
+       "6543021c97934a217568e567ac005166f7a9c0a0",
+       []
+      ],
+      "multicol-gap-decorations-006-ref.html": [
+       "4cb56d207fef4f801ec2063828103712267c030e",
+       []
+      ],
+      "multicol-gap-decorations-007-ref.html": [
+       "09973ddc690a899be9fb321e603b7831bfeb22a7",
+       []
+      ],
+      "multicol-gap-decorations-008-ref.html": [
+       "d49c2f50f1909d5b04be07798e62448d9b82ab72",
+       []
+      ],
+      "multicol-gap-decorations-009-ref.html": [
+       "124bf7eaeb1779d067d84f1c30560f45763add7c",
+       []
+      ],
+      "multicol-gap-decorations-010-ref.html": [
+       "9582ab4103d197d25823ed75dc8cafa83e0b1a7c",
+       []
+      ],
+      "multicol-gap-decorations-011-ref.html": [
+       "3387918d399cdbd3b39364ebe954a2a204a5145c",
+       []
+      ],
+      "multicol-gap-decorations-012-ref.html": [
+       "9fb5e85e920812d259e057c7538d35db56659b05",
+       []
+      ],
+      "multicol-gap-decorations-013-ref.html": [
+       "8e426d8ed32b25248e602e063e69678ca94b5e09",
+       []
+      ],
+      "multicol-gap-decorations-014-ref.html": [
+       "9d9674bd476896f0f1b03ec6835b069c97d9c8e5",
+       []
+      ],
+      "multicol-gap-decorations-015-ref.html": [
+       "2fee77be84c105e2f1001d13152883c5a7dea6e4",
+       []
+      ],
+      "multicol-gap-decorations-016-ref.html": [
+       "8b2458fccce5a190c2c804b7e552dc0d85a8849a",
+       []
+      ],
+      "multicol-gap-decorations-017-ref.html": [
+       "23fd089ac8e575e4035c5614c10ae55d7c3b06a4",
+       []
+      ]
      }
     },
     "css-gcpm": {
@@ -427100,7 +432575,7 @@
        []
       ],
       "grid-item-aspect-ratio-stretch-4-ref.html": [
-       "8d7fc870fae1ad7f969b7a9de4035da783c1dae4",
+       "8c251a9d9f002041354bb252baf12e694b6a2207",
        []
       ],
       "grid-item-content-baseline-001-ref.html": [
@@ -427416,8 +432891,12 @@
        ]
       }
      },
+     "grid-flex-spanning-items-001-ref.html": [
+      "ec65437e8f385b016dff2f28ac3f82d3500ff91f",
+      []
+     ],
      "grid-fragmentation-between-rows-001-print-ref.tentative.html": [
-      "78464712c5cb698fd26a7a12b6c522d4bda946d6",
+      "ba97d33c8b6cd1e62b3cc2acca2f1c16c0660640",
       []
      ],
      "grid-item-non-auto-height-stretch-ref.html": [
@@ -427802,7 +433281,7 @@
          []
         ],
         "masonry-intrinsic-sizing-rows-003-fr-ref.html": [
-         "ca2aaef482dc6207913d66db1d38fba4e21f43b0",
+         "41a032712a21a28b2710630425391f7f63d15402",
          []
         ],
         "masonry-intrinsic-sizing-rows-003-mix1-ref.html": [
@@ -427826,7 +433305,7 @@
          []
         ],
         "masonry-intrinsic-sizing-rows-004-mix2-ref.html": [
-         "97e6b3ea2922b8810d5bc940caad3eb48b3ac371",
+         "4d1470896c8e828f3aa52d6e6dc701f76fbd31a0",
          []
         ],
         "masonry-intrinsic-sizing-rows-005-ref.html": [
@@ -427858,29 +433337,25 @@
          []
         ],
         "masonry-item-placement-004-ref.html": [
-         "75d6b741c2f04de618708486dfbd0e066b4fc738",
+         "ba9c72f292553fe9ad54c6c218741b0126ba7bde",
          []
         ],
         "masonry-item-placement-005-ref.html": [
-         "806f314300dd1c9127a8f59ba9e1bb09c6d99265",
+         "bd5d55262a3c0579fa208b85aab10c74b9a071d1",
          []
         ],
         "masonry-item-placement-006-ref.html": [
-         "a6e9b75d0e61ce1404229781f5d55da34c4d2a68",
+         "a54476a6ba806d5b003b74a8c8fd12dfca1dfc0e",
          []
         ],
         "masonry-item-placement-007-ref.html": [
-         "50236046fb0610dcac5723f212ab69a9155847b1",
+         "5c1fd18b3d14664e3908d98f2af3fbce0da1b580",
          []
         ],
         "masonry-item-placement-008-ref.html": [
          "f3503bf071131f396111956dcc0ebddf5e9bd051",
          []
         ],
-        "masonry-rows-item-placement-auto-flow-next-001-ref.html": [
-         "cbb3e825a4b76d28dc6e93b53eeeea1b5e40a118",
-         []
-        ],
         "masonry-rows-with-grid-width-changed-ref.html": [
          "71c081f2cac1b1f358b484834ab0c5f8df68625c",
          []
@@ -427894,10 +433369,6 @@
         "masonry-order-001-ref.html": [
          "6f20bd05838efed10a0915b30941ff7bcbb73b6a",
          []
-        ],
-        "masonry-order-002-ref.html": [
-         "15be3fde83710c6a7876a5befa8d91dc9f26f8e7",
-         []
         ]
        },
        "subgrid": {
@@ -428665,6 +434136,10 @@
        "28d57bc19c779250d792eafc2d5e4461baece0d5",
        []
       ],
+      "conic-gradient-001-ref.html": [
+       "2f12c01bb5fe1aee2f1eedd2461133ed257f3bf9",
+       []
+      ],
       "gradient-analogous-missing-components-001-ref.html": [
        "5e89048bf00d924bc63fce23301c59c0a4a3c417",
        []
@@ -428677,6 +434152,10 @@
        "134388315a03691bdd20e77cf7d54ba959e9b7fb",
        []
       ],
+      "gradient-analogous-missing-components-004-ref.html": [
+       "09f168115bee8485e27da66a686d888cfcc3259b",
+       []
+      ],
       "gradient-decreasing-hue-hsl-ref.html": [
        "df6dc90ac033e4d00fca3e8f5f6e7ad998aa4c6c",
        []
@@ -428698,7 +434177,7 @@
        []
       ],
       "gradient-eval-004-ref.html": [
-       "f197386bcfb4af5bc084fd262cc29a73f2329ffe",
+       "f28b30137cdc176fa6c9134ffecbb981e87da557",
        []
       ],
       "gradient-eval-005-ref.html": [
@@ -428741,6 +434220,18 @@
        "8b050646754406a6a03c510730574c9e24b93732",
        []
       ],
+      "gradient-infinity-001-ref.html": [
+       "b15e7fcae69e5d57109f08f6ba0f56e4ea0e69b2",
+       []
+      ],
+      "gradient-infinity-002-ref.html": [
+       "30857abd9a1532e4b9ff0e6f20ce54145e29b8a8",
+       []
+      ],
+      "gradient-infinity-003-ref.html": [
+       "798df7bbbb6f867b8e9b5f8a4aab7346d109cc5d",
+       []
+      ],
       "gradient-longer-hue-hsl-001-ref.html": [
        "c75fe98ec14697db74db28f7010a0599d1bc07d3",
        []
@@ -428845,6 +434336,22 @@
        "154112fe612979103ad5f7c3c8fa528c1d434a5b",
        []
       ],
+      "gradient-powerless-hue-hsl-ref.html": [
+       "b6ce2a32d1d39b76c9e8279e491b29ebbc1d215e",
+       []
+      ],
+      "gradient-powerless-hue-hwb-ref.html": [
+       "6bb79ddf4199c482b3ea253ac7db621de6918ce5",
+       []
+      ],
+      "gradient-powerless-hue-lch-ref.html": [
+       "ca383a9857d9e853a15ee545779566ed7ffd3a69",
+       []
+      ],
+      "gradient-powerless-hue-oklch-ref.html": [
+       "4e25773f280b8d3fb61a370c32d056ff25356c72",
+       []
+      ],
       "gradient-single-stop-longer-hue-hsl-002-ref.html": [
        "a05f99e986dfc405f9037877cf0141c76dbc9b08",
        []
@@ -429182,10 +434689,22 @@
       "a80236dcf75c22ecd8e43935d004f1fddf0550cb",
       []
      ],
+     "linear-gradient-body-sibling-index-ref.html": [
+      "7325685511a542964859c34a359b107823db18df",
+      []
+     ],
+     "linear-gradient-calc-em-units-ref.html": [
+      "be13be8e260ef8d89be878d811edf83411dd2cee",
+      []
+     ],
      "linear-gradient-ref.html": [
       "033f1767799d718f072b48b6a99a4eaf7070f90e",
       []
      ],
+     "linear-gradient-sibling-index-ref.html": [
+      "eea8518d95b9393a5c1e1d34afc20744b8834c34",
+      []
+     ],
      "multiple-position-color-stop-conic-2-ref.html": [
       "2ee92a11ee43a60031302ecb24b5a1e2865590ec",
       []
@@ -429520,7 +435039,7 @@
      ],
      "parsing": {
       "WEB_FEATURES.yml": [
-       "023eb5f6e051bdb858b88e1d70bdbb1f07efe816",
+       "d60ed3efd4ce9e1c4703439b0976b3e625e3bfab",
        []
       ]
      },
@@ -429888,6 +435407,12 @@
       "42e669d316d4f470cf4d339fce632a6a69c583ca",
       []
      ],
+     "animation": {
+      "WEB_FEATURES.yml": [
+       "45a7bc89e0f5d831a9f60e01cb6e02ed3d86e755",
+       []
+      ]
+     },
      "baseline-source": {
       "WEB_FEATURES.yml": [
        "f399a6dc6f73dccf050094c4b646cc0125ce4167",
@@ -430150,21 +435675,27 @@
        ]
       }
      },
+     "parsing": {
+      "WEB_FEATURES.yml": [
+       "1bf846df2aa53802533dd106eb6743b972014365",
+       []
+      ]
+     },
      "text-box-trim": {
       "WEB_FEATURES.yml": [
-       "e9a2fc218b369825c991e3109986481a922e671f",
+       "f08cd6aa7fca7993ac4a9431873f24e0630546d1",
        []
       ],
       "not-at-page-edges-001-print-ref.html": [
-       "f142aeec84dd5abdf87bf754554fbdf64888490b",
+       "301ed7d76e71f338a0854434754f10ec470d70e1",
        []
       ],
       "not-at-page-edges-002-print-ref.html": [
-       "0d73c1675aa0039e79e1bb7da3ccf5bff88b93d2",
+       "86d7ddfedda688b36c589d8a6f811b65e0610c7d",
        []
       ],
       "not-at-page-edges-003-print-ref.html": [
-       "77fbb2630bf84a66c0b54e225efb42883e977dc4",
+       "5b0d41404bda00a8466bd39f3a81c17740f9984f",
        []
       ],
       "parsing": {
@@ -431079,6 +436610,10 @@
       }
      },
      "clip-path": {
+      "WEB_FEATURES.yml": [
+       "b098d35ca731931d2cce2450f70e69e5f9dde900",
+       []
+      ],
       "animations": {
        "clip-path-animation-cancel-ref.html": [
         "ac04bd53798188fb5fcc27ea87a6eae2ffb46a3b",
@@ -431144,6 +436679,10 @@
         "d351f80a26fa93866afaed00f872a7800078d6c7",
         []
        ],
+       "clip-path-animation-non-shape-delay-ref.html": [
+        "1bd7107cbbd2083b779bb0e82a8341d4576afbbd",
+        []
+       ],
        "clip-path-animation-none-ref.html": [
         "f47e9f31b07c993aac8e065a699d5db2bc3cd9a0",
         []
@@ -431503,6 +437042,10 @@
       ]
      },
      "clip-path-svg-content": {
+      "WEB_FEATURES.yml": [
+       "a694bbb9907545594ff9bc6692418edbdfe50566",
+       []
+      ],
       "reference": {
        "clip-path-circle-001-ref.svg": [
         "56b7fbeef04049f1f8a69522fdd2efaaabacd2be",
@@ -431626,6 +437169,12 @@
        ]
       }
      },
+     "hit-test": {
+      "WEB_FEATURES.yml": [
+       "360c013a2bd88f7b1162ceb4b41e0b0dd6dcc65b",
+       []
+      ]
+     },
      "mask-image": {
       "WEB_FEATURES.yml": [
        "b5bbd438dac187e92af375c0933ed9a27783a6a7",
@@ -432017,7 +437566,11 @@
       []
      ],
      "column-balancing-paged-001-print-ref.html": [
-      "f0ee4df8c9de3a77fb39b40942dbf0743312494f",
+      "f832a0cf70abdbd650cee21004b7806a611c3614",
+      []
+     ],
+     "column-height-009-ref.html": [
+      "034440ebd5c81be43f0d871d3adb276b2a735768",
       []
      ],
      "column-pseudo-background-color-ref.html": [
@@ -433178,6 +438731,30 @@
         "b5f15ca3dcdf00d68fd2c11611aa69853cc07414",
         []
        ],
+       "block-ellipsis-011-ref.html": [
+        "379cf974f649e4a7e96e19289509982a0ac5c514",
+        []
+       ],
+       "block-ellipsis-012-ref.html": [
+        "7f9c44293e8e6bdc768a1ab0bc5ac50564f519ff",
+        []
+       ],
+       "block-ellipsis-014-ref.html": [
+        "d135a74cfad7cfaab7ded439de29f3b8881497df",
+        []
+       ],
+       "block-ellipsis-015-ref.html": [
+        "baa8dd1a8d7271389e10d1058e674cc64a86e34b",
+        []
+       ],
+       "block-ellipsis-017-ref.html": [
+        "7a801508e2e564bad79b512c4e327632399c2ce7",
+        []
+       ],
+       "block-ellipsis-022-ref.html": [
+        "1e89789852b9ed51a0ae9e6ab6995ad996b8f438",
+        []
+       ],
        "line-clamp-010-ref.html": [
         "46ca731c5446db88ba4e5fc8a3d6b8b43c4fc056",
         []
@@ -433307,31 +438884,31 @@
         []
        ],
        "line-clamp-with-abspos-001-ref.html": [
-        "d756162dde0c54bd52646597b01bbff8a80f5fd8",
+        "ffa463369c1bcd592661c7d1bb8f8a9eed57a536",
         []
        ],
        "line-clamp-with-abspos-005-ref.html": [
-        "3b1f9218e887a7e50745f0c5e540c099475a59df",
+        "9825838e7b434d38c53cc49f830c7c9120a995ab",
         []
        ],
-       "line-clamp-with-abspos-006-ref.html": [
-        "4b55c37a033ea4d4a9d97b5fdf8035a60aace4bd",
+       "line-clamp-with-abspos-009-ref.html": [
+        "cc3a43df2386b26f6d3ff2de67961503c7700389",
         []
        ],
-       "line-clamp-with-abspos-007-ref.html": [
-        "e3dcc696e39684b47e1785968f29ec9adf8f9c0b",
+       "line-clamp-with-abspos-013-ref.html": [
+        "cae83ecc37c713b710c688d39c528cb2108bf48e",
         []
        ],
-       "line-clamp-with-abspos-008-ref.html": [
-        "373b2755c1d617e1716afe8060c28b246d52c33e",
+       "line-clamp-with-abspos-016-ref.html": [
+        "3c8011394d295ce65eca946b4c88255eefb24631",
         []
        ],
-       "line-clamp-with-abspos-010-ref.html": [
+       "line-clamp-with-abspos-018-ref.html": [
         "ecc2fcee1b5219b310ef15b28f0684b07d84baf6",
         []
        ],
-       "line-clamp-with-abspos-011-ref.html": [
-        "f08b0270e8d7aa8a389910319617528dac6a4240",
+       "line-clamp-with-abspos-019-ref.html": [
+        "f97a972532556b347c95cf5b10bdbd649b5335be",
         []
        ],
        "line-clamp-with-floats-001-ref.html": [
@@ -433475,11 +439052,11 @@
         []
        ],
        "webkit-line-clamp-036-ref.html": [
-        "0de35e98ab353519664996fba8ab8ef6916a18d0",
+        "321cce96bb34d11082e15e92416214e9aa055a95",
         []
        ],
        "webkit-line-clamp-037-ref.html": [
-        "2927716d76dbc8ebc8b98169c533301214a517aa",
+        "c5050d5d41453102c2b64faa2e2fd2634c2503ac",
         []
        ],
        "webkit-line-clamp-038-ref.html": [
@@ -433540,6 +439117,10 @@
        ]
       }
      },
+     "nested-scroll-markers-under-content-visibility-auto-ref.html": [
+      "afb2d5d65a29e428aefb6b16cc3e6ada95a0603e",
+      []
+     ],
      "overflow-alignment-001-ref.html": [
       "5a89c88467eccda859bbec0c09d421afd2a61613",
       []
@@ -433804,6 +439385,20 @@
        []
       ]
      },
+     "resources": {
+      "root-scroll-marker-activation-iframe.html": [
+       "1724f9c56ea5c7b2b4652ede4c54980b484bb4d5",
+       []
+      ]
+     },
+     "root-scroll-button-ref.html": [
+      "28fc31b7ca5063498efbbd7828fa6915630c2d02",
+      []
+     ],
+     "root-scroll-marker-ref.html": [
+      "24d3fab4ef1e109a62006799a55b344fd0178759",
+      []
+     ],
      "rounded-overflow-clip-visible-ref.html": [
       "3a25b794d8d4136c2a7c8c94e5d9eb80daceedc7",
       []
@@ -433817,7 +439412,7 @@
       []
      ],
      "scroll-buttons-appearance-ref.html": [
-      "462186407d55da46e14f5ebbc8f90218cd0b80b7",
+      "c382f738a6fc01402668747529ce7ab7b46f5f4f",
       []
      ],
      "scroll-buttons-disabled-ref.html": [
@@ -433872,6 +439467,26 @@
       "dca775fcecadf26d115e3961da6affb519b0fdba",
       []
      ],
+     "scroll-marker-contain-001-ref.tentative.html": [
+      "69e9167cc33a2ec61e47ea9c2199141c028424b2",
+      []
+     ],
+     "scroll-marker-contain-002-ref.tentative.html": [
+      "3fa777f7863f1f5e395e3304f6fbd763a9cf206e",
+      []
+     ],
+     "scroll-marker-contain-003-ref.tentative.html": [
+      "09bb93d4ebcefa99f22ae932626bf21c0b6ba528",
+      []
+     ],
+     "scroll-marker-contain-008-ref.tentative.html": [
+      "d74777d3bbf0b230048a17320afa6040a6b8eb62",
+      []
+     ],
+     "scroll-marker-contain-009-ref.tentative.html": [
+      "07b797ff789a382d91ee3207ba0172009bef0c77",
+      []
+     ],
      "scroll-marker-counters-ref.html": [
       "7113a5c5d23a97cf83f173a72ef96b57ecf09263",
       []
@@ -434008,6 +439623,10 @@
       "7dbadf995ed89bc3032c4ca1b53e1cebecd6237e",
       []
      ],
+     "scrollbar-gutter-with-background-gradient-ref.html": [
+      "1af00bae87d0ade4e13e5ce696679da90e0b203f",
+      []
+     ],
      "scrollbar-large-scale-in-iframe-ref.html": [
       "38c8d0c513bf6e3763e05ea205bcbe8d6253b0ed",
       []
@@ -434063,48 +439682,48 @@
       []
      ],
      "WEB_FEATURES.yml": [
-      "ab327a89b24efa62231d036ca6171a5d75b0a0e4",
+      "e19befe8e243712602751db7a6b9c24b184b4fea",
       []
      ],
      "background-image-only-for-print-ref.html": [
-      "c3e5d8d1c5ed202868602e8fdea57225be448dbf",
+      "3271ab98ec69ffcd6fde57d09629e2d7d3e2ba6a",
       []
      ],
      "basic-pagination-001-print-ref.html": [
-      "3487aa6eabb456eda6d342e4bc5200d0d9c28509",
+      "df3da84637ba37933a07a29f9cc87113fbab00e8",
       []
      ],
      "basic-pagination-002-print-ref.html": [
-      "90e0e26502b067d3f82cbaf7fb0ee0faf3e915aa",
+      "cf040af63d751486104d3b4d666f7b4b8f9bc9f8",
       []
      ],
      "basic-pagination-003-print-ref.html": [
-      "6fd7ef2d45344ae131728a9ede3f7896bbd3bc98",
+      "9d3810213a5b4237f0d5d9a3d74d5b0ae4724c14",
       []
      ],
      "basic-pagination-004-print-ref.html": [
-      "3487aa6eabb456eda6d342e4bc5200d0d9c28509",
+      "df3da84637ba37933a07a29f9cc87113fbab00e8",
       []
      ],
      "body-background-slr-print-ref.html": [
-      "d47a59af4d3f29326f2707a1a4cd893f6370890e",
+      "ca55f669e277dadb0815098827b326da4169469c",
       []
      ],
      "body-background-srl-print-ref.html": [
-      "293bcbae7d5cea493a2664a710de025cb701e4d5",
+      "81ff9e23925c59b5783897e5a4eb4d21549635ea",
       []
      ],
      "body-background-vlr-print-ref.html": [
-      "7b966a5b3d5f2065caef6cf5a0609da52263d96d",
+      "4c2f54387605628e3fcef7f5d23d0dbe1cc7e348",
       []
      ],
      "body-background-vrl-print-ref.html": [
-      "bbc265e6cfa3d8e39ad7d8b37625cbfd607e789f",
+      "77c12e92653a2b6c316ebfee8b6a02a7b9d82709",
       []
      ],
      "cssom": {
       "dynamic-001-print-ref.html": [
-       "e697d8e23dbc1459775426316a11919881fbf11e",
+       "850bf80b720711bc08fae1df15aa7230fee4a551",
        []
       ]
      },
@@ -434141,15 +439760,15 @@
       []
      ],
      "fixedpos-009-print-ref.html": [
-      "31a6a6724faec358e91a655f546b0c3ef3570be4",
+      "970308cfbbcd0e2a5628a4a31d74d2f3e078ad4a",
       []
      ],
      "fixedpos-010-print-ref.html": [
-      "90bd5e7fc31f5ef0c4e11a352cd4c309975c193c",
+      "8eb61333a8341ed0cf89536f99b3550485c16a4a",
       []
      ],
      "fixedpos-011-print-ref.html": [
-      "8f0be4ea2fabc84194398f47247b48a2af895270",
+      "ba741eb940a2600ee25ab3673d0b64eea575a91c",
       []
      ],
      "fixedpos-with-abspos-with-link-print-ref.html": [
@@ -434157,7 +439776,7 @@
       []
      ],
      "fixedpos-with-iframe-print-ref.html": [
-      "5c1714045083dfc22272b0522273e7a7235cde6f",
+      "718d15dfee060cc59a805e93d630fabcd57e21c1",
       []
      ],
      "fixedpos-with-link-with-inline-child-print-ref.html": [
@@ -434190,7 +439809,7 @@
        []
       ],
       "auto-margins-002-print-ref.html": [
-       "56adf2a5401944e58bab8382a14879bd1b655bc3",
+       "57d966fc46d03f7ea6c335ae91545848c43ef4e9",
        []
       ],
       "auto-margins-003-print-ref.html": [
@@ -434198,11 +439817,11 @@
        []
       ],
       "background-001-print-ref.html": [
-       "d43af0ca4bfef4f4ed8f24cec818741c4fd61c5c",
+       "af1215c88eb1939796f41f9c5532e6dc746a9529",
        []
       ],
       "content-001-print-ref.html": [
-       "00c44928daa664661b5650443faf92fd2b7bc351",
+       "ac79c15cc0566b6d75ab58c5c6177ddaa8d49a96",
        []
       ],
       "content-002-print-ref.html": [
@@ -434210,7 +439829,7 @@
        []
       ],
       "content-003-print-ref.html": [
-       "ba45b88cd4d84e429c97796d5941fe999e0143fd",
+       "25390c7f3ca4d0ffb5eb4579691195879b18de8f",
        []
       ],
       "content-004-print-ref.html": [
@@ -434254,55 +439873,55 @@
        []
       ],
       "dimensions-003-print-ref.html": [
-       "c491cdde98ee56e98cfba9f15f91f1fbfe2f9952",
+       "fd761a194290a1aee35d31babe94d00f2cb2eb2e",
        []
       ],
       "dimensions-004-print-ref.html": [
-       "3f45190e330d2df06ad3b6b4928d0239bdb2ca5e",
+       "4ce84aacf1f3fb2b0d3bc49e46170d00b000ac17",
        []
       ],
       "dimensions-005-print-ref.html": [
-       "1749b1c71471fcceb9599b8e09105b08921ff090",
+       "79774b8bc4d7c629a2d9c9e046a73e06fc01bff0",
        []
       ],
       "dimensions-006-print-ref.html": [
-       "f6aa9e60f48b9949a4dabb5833b0590bef56fe81",
+       "bd989f0d982effa4a6a3a24c5e283e71102e7c3c",
        []
       ],
       "dimensions-007-print-ref.html": [
-       "b91c086879a1967dfcd83c2f433c10cdd8824ad2",
+       "bd67f064e89c3816e7911d1cc1788251306316c6",
        []
       ],
       "dimensions-008-print-ref.html": [
-       "5bd141a28e1cb394beffd81e656d8eaaa7802908",
+       "fb96506d4d501c48cf6370146754117de0e4d147",
        []
       ],
       "dimensions-009-print-ref.html": [
-       "922d165efa1b4af7d2c86a4c074894f07eb0a16c",
+       "b946f1eaaffffe940f9449179f24d1d9c76d1acb",
        []
       ],
       "dimensions-010-print-ref.html": [
-       "a4c0b4702d54007fbc036fd8f4a8e7ecd8196866",
+       "c2c98dd6d1a842c61e0ffbf603a185dc97319b3e",
        []
       ],
       "dimensions-011-print-ref.html": [
-       "54983175e3db5052e46af701975393952853ff06",
+       "dc84a0e6c87d1043a80690eb28d1a86c93a47a9b",
        []
       ],
       "dimensions-012-print-ref.html": [
-       "e62880031a164230240d334ffa6e370f0ffeb562",
+       "6dfa80b4406a66a9965427eff6d2bbb4e118f327",
        []
       ],
       "dimensions-013-print-ref.html": [
-       "a131b564fd62fd9f7935bbd371e0298c74e2f68c",
+       "1b7dfed8f704a4680de17443e6f8ee7b03d8c16c",
        []
       ],
       "dimensions-015-print-ref.html": [
-       "d61359f8aae800cece3156d9b77becefa192049b",
+       "d834df34ae30d9f18f1ee9f4f3313653287a1e43",
        []
       ],
       "inapplicable-properties-print-ref.html": [
-       "157cb8effa4d501dd3dab2c8535e8cc45f26b390",
+       "a3cfc9cdca6b046c009aba10be47b3775515e4e4",
        []
       ],
       "overconstrained-001-print-ref.html": [
@@ -434310,20 +439929,20 @@
        []
       ],
       "paint-order-001-print-ref.html": [
-       "2677aee123cba64e023d9be967f71a8d4caa5c20",
+       "a3a889697ce8926865031d4de50eec6ce0f06e46",
        []
       ],
       "paint-order-003-print-ref.html": [
-       "92bfe8757f6cf1ff2f3fd29ae4132e6333775117",
+       "ef6b859e215e257417604a89e0b8b6d85871e849",
        []
       ]
      },
      "media-queries-001-print-ref.html": [
-      "35af04dc3c45b06a092d11569227a9a7014c2068",
+      "d84d9ee8e88606907edf6b86d4ce92a64f407a21",
       []
      ],
      "media-queries-003-print-ref.html": [
-      "99642ca567459a8eb0f5b40e04805c073b31dd9d",
+      "f1f901b85c853656b68c935e444935a6f5ca6c69",
       []
      ],
      "monolithic-overflow-001-print-ref.html": [
@@ -434335,59 +439954,59 @@
       []
      ],
      "monolithic-overflow-012-print-ref.html": [
-      "e47ca880f93196bd9c1a488ed883a46839744a1c",
+      "2dd7adc644c7f31de2fce3603b1378ffc5333652",
       []
      ],
      "monolithic-overflow-013-print-ref.html": [
-      "e47ca880f93196bd9c1a488ed883a46839744a1c",
+      "2dd7adc644c7f31de2fce3603b1378ffc5333652",
       []
      ],
      "monolithic-overflow-014-print-ref.html": [
-      "a74e0d19a558a6c663b632ad88fb888ca42c707a",
+      "0aca6e03a48c583fae4b8dcabc88b58d5ec3c542",
       []
      ],
      "monolithic-overflow-015-print-ref.html": [
-      "db44a3ee21e57cf4c0c11cf081a516ca150fcba8",
+      "aa26df11c32e9c2b28e99985e91e3d0eab556614",
       []
      ],
      "monolithic-overflow-016-print-ref.html": [
-      "a675fb966c56aa5db37731e382a54675dcb7cb20",
+      "62ce80590d136802efb134c4411c4a2af48863ba",
       []
      ],
      "monolithic-overflow-017-print-ref.html": [
-      "45f839787e03f286e1cdca0a887a48297ea03294",
+      "3fe43748594a834f23659441131fac98644081df",
       []
      ],
      "monolithic-overflow-018-print-ref.html": [
-      "cf31737d6c3f750524ad1c291281f6fcb777f786",
+      "3e4d6c995648df0bba0c1f6c5b10a16dd28216bf",
       []
      ],
      "monolithic-overflow-019-print-ref.html": [
-      "f37740ae7e606b2f8acce89f4210bdd961c11edd",
+      "501a8b6a9617c45a5897ad2b872b5c910c6f1126",
       []
      ],
      "monolithic-overflow-020-print-ref.html": [
-      "528c4980de590bc48c3017b246052b561f170bbd",
+      "6b40bcae95773138c4c3a80cd0eaaab4292bda62",
       []
      ],
      "monolithic-overflow-021-print-ref.html": [
-      "112b1ebdccf07881e49c9420cc0f214861126d30",
+      "e1dc3792df6436b53bb5a9bf3edc12adf7f280d3",
       []
      ],
      "monolithic-overflow-022-print-ref.html": [
-      "64572dd6392d79e6bda89e64f8e8f58e08898dc0",
+      "d70edf98fda83e13cf7c099aa7513e34e3f15e7f",
       []
      ],
      "monolithic-overflow-023-print-ref.html": [
-      "bdc4eb1ab0e14cfe65cce3eaf080d0b46029bd9d",
+      "4f841b3cc4ee9519e503efe5c48b40edef4f17b5",
       []
      ],
      "monolithic-overflow-024-print-ref.html": [
-      "fc964fde32d70e035633c519bb4fad0377f498e1",
+      "4812447034f40346db7ae67d17870f09a9a9fb25",
       []
      ],
      "monolithic-overflow-025-print-ref.html": [
-      "edbb9ac011aa85d161e88f4beace4955cb1d23d2",
+      "cebca7e838121d32acbf9f4ff057c592d9fd4a06",
       []
      ],
      "monolithic-overflow-026-print-ref.html": [
@@ -434395,27 +440014,27 @@
       []
      ],
      "monolithic-overflow-027-print-ref.html": [
-      "560f137bf5294b3317b89b7479f429cb82c9ecf0",
+      "f18233d7ad07fab79eb44599d7b4c552e5f93a62",
       []
      ],
      "monolithic-overflow-028-print-ref.html": [
-      "560f137bf5294b3317b89b7479f429cb82c9ecf0",
+      "f18233d7ad07fab79eb44599d7b4c552e5f93a62",
       []
      ],
      "monolithic-overflow-029-print-ref.html": [
-      "560f137bf5294b3317b89b7479f429cb82c9ecf0",
+      "f18233d7ad07fab79eb44599d7b4c552e5f93a62",
       []
      ],
      "monolithic-overflow-030-print-ref.html": [
-      "d8468e3b14dc0346f178727336572f5122b0e4bf",
+      "ec371d46976012615165e17744a97d80a63c57ac",
       []
      ],
      "monolithic-overflow-031-print-ref.html": [
-      "c2d8b7ea5ff42b01399c39691a3a2c97b5001949",
+      "22f144beb9f51d04b88f57cb573b1a4430c3fe86",
       []
      ],
      "monolithic-overflow-032-print-ref.html": [
-      "36724ac929d83e3f3286a971f56700acd96047b4",
+      "18b1a5a5303f8f5960f47393a628d82793cc5866",
       []
      ],
      "page-background-001-print-ref.html": [
@@ -434431,15 +440050,15 @@
       []
      ],
      "page-background-004-print-ref.html": [
-      "0a93dfc04528fa9518c30a65f246b9e71cf6cb6c",
+      "1b7ae5f7a4b6f9a7de23ee4f11ecf0e7f669e890",
       []
      ],
      "page-background-005-print-ref.html": [
-      "c80558f2f8e61afd8875bbb34cc4051814b9330b",
+      "b39f9c90875804e2fa7a8784c41c838923fefa2b",
       []
      ],
      "page-background-image-print-ref.html": [
-      "f38cc89838027f5f862cbd08459c1694f4a30e01",
+      "44ade6ec4c09b82a97c01b5032472d9f2b491631",
       []
      ],
      "page-box-000-print-ref.html": [
@@ -434447,39 +440066,39 @@
       []
      ],
      "page-box-001-print-ref.html": [
-      "d9ab323877f7144062ce908345d32e57900cc2d6",
+      "dc71c9ed6737072461483fc8914230b78faf547e",
       []
      ],
      "page-box-002-print-ref.html": [
-      "e1ee4ab5d148662f6ea6af9f906caed7e821b207",
+      "ab858280bc5eccdf62c63f1c8a732e6acca0bb62",
       []
      ],
      "page-box-003-print-ref.html": [
-      "e1ee4ab5d148662f6ea6af9f906caed7e821b207",
+      "ab858280bc5eccdf62c63f1c8a732e6acca0bb62",
       []
      ],
      "page-box-004-print-ref.html": [
-      "ab2fda9afb6443e0b2da05813f41bfc0edc17f98",
+      "efae5d72693c0bf76a19424dc357541267abe5c1",
       []
      ],
      "page-box-005-print-ref.html": [
-      "69e0061271d76042128df8f03812e433b0d74036",
+      "f36320e247afd188e10e816f873a0001346e4947",
       []
      ],
      "page-box-006-print-ref.html": [
-      "c5081a41c4803a204a30233850d7516f1851a79b",
+      "f2806372b2a0c2819aac30380ac42649dd9c278b",
       []
      ],
      "page-box-007-print-ref.html": [
-      "9f5550f8f585a04ab48bc26ef834ef09ed85ce00",
+      "68553d2d35ac89e3d206bb73e375bd85431ae587",
       []
      ],
      "page-box-008-print-ref.html": [
-      "91ed0cec3fac6fea39363a23058951f4408f3daf",
+      "a0ec17f5c069fca3833f71b3259eafcaa4ec1be7",
       []
      ],
      "page-box-009-print-ref.html": [
-      "3c034171d3b70e62e0e2aebfff9d419d2cd51451",
+      "0c61bd205ad016e33c4a74e3f73a34738c354ba1",
       []
      ],
      "page-box-010-print-ref.html": [
@@ -434487,59 +440106,59 @@
       []
      ],
      "page-box-011-print-ref.html": [
-      "7a96161927531fbe8b201308ad29f052681dee19",
+      "c54855df242dda3928401672d46ea2dd865e565f",
       []
      ],
      "page-left-right-001-print-ref.html": [
-      "1eb011bed8a0dde4a65494d54fc2e2bd9a042080",
+      "7544f7d254f5f258da21c04524afa93e5c1254e6",
       []
      ],
      "page-left-right-002-print-ref.html": [
-      "3480039046aeca2dee76a7d4bdd720ddbac82784",
+      "69e377b45aa9dbeace4a27fa97c6df40bb5e0436",
       []
      ],
      "page-margin-001-print-ref.html": [
-      "12ebd76dc91cc2fe9d8991a758085e29eab4d5ec",
+      "6e98f8cd9e5192cd0ac518df9a88dbd621e677a4",
       []
      ],
      "page-margin-002-print-ref.html": [
-      "2b56504855863876c308673fa852b41952cc09df",
+      "d925856597ade1d792b0b3b2b866f45a32ae7b54",
       []
      ],
      "page-margin-003-print-ref.html": [
-      "52bf73609089087e0310c8a5d0453f88be9d3617",
+      "64a2482fd3bcb12b9bfd2522aacf04adcb54c413",
       []
      ],
      "page-margin-004-print-ref.html": [
-      "24549d4954228c1e48e230fcf4981eeadd4b5d9c",
+      "d36d4862b3bee913bd5f8de170ad4c9795815582",
       []
      ],
      "page-margin-005-print-ref.html": [
-      "bd1829be383a7cbd7c6b134fc6efb6517520731f",
+      "e710123bf6f0f0e8bdc645586fd5e99023c832b5",
       []
      ],
      "page-margin-006-print-ref.html": [
-      "fe7a2c66db21b005464b89a5436894c67b95ad58",
+      "09f782d056e4b395f2ff48a821d881caf0486898",
       []
      ],
      "page-margin-007-print-ref.html": [
-      "20d16df19de9dc0ad95f5b17344cd21210983c18",
+      "ea1314d5380d9bab2ad3bb3ba70af63f28868722",
       []
      ],
      "page-margin-auto-and-non-zero-print-ref.html": [
-      "5f9be531886c9aaa78df681bb494c50177073c02",
+      "bb23bbb2affdeea1d9079ff0ad63b8d8a3b6cdab",
       []
      ],
      "page-margin-auto-negative-print-ref.tentative.html": [
-      "9e816c12fb7ddcd94cdfaf1e910f6146e70c05c6",
+      "63a32ea9d0729ffd618092267daa96584b3ac637",
       []
      ],
      "page-margin-auto-print-ref.html": [
-      "d7fda4ab6d9919370898450f0e3ee79c65db1a6b",
+      "e27de9353ff491b9a37fa49c3711f51782271fdc",
       []
      ],
      "page-margin-negative-print-ref.tentative.html": [
-      "9e816c12fb7ddcd94cdfaf1e910f6146e70c05c6",
+      "63a32ea9d0729ffd618092267daa96584b3ac637",
       []
      ],
      "page-name-000-print-ref.html": [
@@ -434715,7 +440334,7 @@
       []
      ],
      "page-name-unnamed-trailing-001-print-ref.html": [
-      "6cb29e1c7c602b316866e24e094f40d3d192a35c",
+      "b6da8ba1aaef1d776192e532b7a8984dab6685cc",
       []
      ],
      "page-name-zero-height-001-print-ref.html": [
@@ -434763,11 +440382,11 @@
       []
      ],
      "page-size-004-print-ref.html": [
-      "0468a745b23855dade0883fd55d8a366e9a621a9",
+      "30a4e25ff36ef5de560eb22c4f38793e875d2528",
       []
      ],
      "page-size-005-print-ref.html": [
-      "c2e07daa295c7d0c3337506c4f7dbf817259bfaa",
+      "40127909c2b08d50d884deb08e6385fb3caa5433",
       []
      ],
      "page-size-006-print-ref.html": [
@@ -434775,15 +440394,15 @@
       []
      ],
      "page-size-007-print-ref.html": [
-      "9498e2c17b24f3b3f9308f9be6f87e2991d536f6",
+      "a669ba0502963303dad35274b54ea7815bff665c",
       []
      ],
      "page-size-008-print-ref.html": [
-      "f50ad3531e4be209c7858adc238c9d24cc767672",
+      "19742482c6c18214f1ef9f6aa6c931ad05c10f32",
       []
      ],
      "page-size-009-print-ref.html": [
-      "86ffa278c9306e5a8ddcb8eeb02147dc01c7a266",
+      "0157c5a68e7376f81ca1ab6e7074f47493c1afda",
       []
      ],
      "page-size-010-print-ref.html": [
@@ -434795,15 +440414,15 @@
       []
      ],
      "page-size-012-print-ref.html": [
-      "e85e5f078508ca299255ea8270dd1519115019a1",
+      "dd5e22884610bb6f97b68b3d69f2685be516a86b",
       []
      ],
      "page-size-013-print-ref.html": [
-      "23c93e5c47a9c8cc7fe8545a97920c961d7d31a8",
+      "3f2f3113693abfd9ed1490837e4fed715aeb4a7a",
       []
      ],
      "page-size-014-print-ref.html": [
-      "23c93e5c47a9c8cc7fe8545a97920c961d7d31a8",
+      "3f2f3113693abfd9ed1490837e4fed715aeb4a7a",
       []
      ],
      "page-size-015-print-ref.html": [
@@ -434811,11 +440430,11 @@
       []
      ],
      "page-size-016-print-ref.html": [
-      "c9818f3af128937d59b0f2ceffcaf21e1c8f09a7",
+      "accd468bba8da6cd0bdc1ae5c76afe3edf718798",
       []
      ],
      "page-size-017-print-ref.html": [
-      "72508e3d030f2a8a82a1566bf1c06f1f9e3b3b97",
+      "589460ef2b8683c3c60887d2e963ca0facd2c1ce",
       []
      ],
      "page-visibility-hidden-001-print-ref.html": [
@@ -434838,11 +440457,11 @@
        []
       ],
       "filled-green-100px-square-print-ref.html": [
-       "d4834d1358a6434664996c635e7b8ee1e51f7628",
+       "52a580457768b411951da2b3934daf7d9dbc3b1d",
        []
       ],
       "monolithic-overflow-4-pages-print-ref.html": [
-       "c115782d6ad862870235953e56474e7eae4902bc",
+       "0a93575d0289e3f7f14ffc53fc7d1d0b9e37331a",
        []
       ]
      },
@@ -434856,7 +440475,7 @@
        []
       ],
       "mq-frame-100px.html": [
-       "ed823c09e89635da4933a941850265c2eb168e5d",
+       "48ee9e390a37b55a071dc0e2c7bf924f7011d946",
        []
       ]
      },
@@ -435379,7 +440998,7 @@
       []
      ],
      "position-fixed-overflow-print-ref.html": [
-      "0fb21d47f54c974c2ee1ca7dae801ca188d09715",
+      "e97d667764a7240cf07b3f195f2feec5aace8dc2",
       []
      ],
      "position-fixed-root-element-ref.html": [
@@ -435559,6 +441178,10 @@
        "9ba42e18b2bc6d37ac1d98af14d30f9894d4e2bc",
        []
       ],
+      "position-sticky-table-pixel-rounding-ref.html": [
+       "83313e0ad109ffee6bc313d9814aa26866e839f7",
+       []
+      ],
       "position-sticky-table-td-bottom-ref.html": [
        "e851315641e0212bcbc2453b56e831422b6d6c32",
        []
@@ -435571,6 +441194,10 @@
        "633c2fa50ea0ba41778fc53276de58388e15f7db",
        []
       ],
+      "position-sticky-table-td-subpixel-zoom-ref.html": [
+       "719319b4da92936446b315c01da3b8a0a553ab99",
+       []
+      ],
       "position-sticky-table-td-top-ref.html": [
        "2ef7c2678b4a37a0b672f7e95a4d4523c2db07a6",
        []
@@ -435713,7 +441340,7 @@
       []
      ],
      "WEB_FEATURES.yml": [
-      "ac89c2b73139a5c5c475fdfa06794088cd406236",
+      "780cca251d664a8428fff3fc70c208d19ecb0420",
       []
      ],
      "active-selection-051-ref.html": [
@@ -436318,6 +441945,12 @@
       "441a354732fc6690ea0d8af93dd33d57c8049374",
       []
      ],
+     "parsing": {
+      "WEB_FEATURES.yml": [
+       "2a5edba05a17bf646d5bc2f302dbe6594a8143d5",
+       []
+      ]
+     },
      "placeholder-input-number-notref.html": [
       "92ae71d83fcbea52e4120ed28af5438dd54d4509",
       []
@@ -436938,6 +442571,10 @@
       "826341652122a40956ccc74288e23f952f1f40e8",
       []
      ],
+     "WEB_FEATURES.yml": [
+      "88e56feb543f5c84cc630e6dabc72694c7caba60",
+      []
+     ],
      "reference": {
       "green-box.html": [
        "24b5e0d5f53d8fab39a2d1699f77ccef417ef6b6",
@@ -437176,6 +442813,10 @@
       "f7c0439e202113c9611405ae967b33c2b12cfcee",
       []
      ],
+     "WEB_FEATURES.yml": [
+      "e3040abd869bba617bbba9fc8dd0109a9ae64071",
+      []
+     ],
      "input-scrollbar-color-ref.html": [
       "389cf34b716ea17620c6a1d750ac5406945bf9ba",
       []
@@ -440500,6 +446141,10 @@
         "977d8211457a6e7b4976b596be91068cdf518869",
         []
        ],
+       "letter-spacing-cursive-001-ref.html": [
+        "720c9491b4d8cfdba5c2279dacdc297d495c2b67",
+        []
+       ],
        "letter-spacing-end-of-line-001-ref.html": [
         "eb474ab8d234d0836c3466e29bfe9b313e10d302",
         []
@@ -441124,7 +446769,7 @@
      },
      "parsing": {
       "WEB_FEATURES.yml": [
-       "8fa38638f1791298cdfa0362cdcfefc2408d6813",
+       "b8da9745265389e97f7d5306e50909fd42e973ed",
        []
       ]
      },
@@ -441833,7 +447478,7 @@
      "text-justify": {
       "reference": {
        "text-justify-006-ref.html": [
-        "595485c5f4ea346b011f07128649da3f2c020902",
+        "a017f7a8e6b53d967bd27098be060bb799844ad8",
         []
        ],
        "text-justify-and-trailing-spaces-001-ref.html": [
@@ -444254,6 +449899,10 @@
       "54940566cd107ba443d3183dccecb505a811d14e",
       []
      ],
+     "css-scale-of-clip-path-ref.html": [
+      "d6fa480b0408ffc9c3687515e25a30ddc68f199f",
+      []
+     ],
      "css-skew-001-ref.html": [
       "70c256ebec653128a2d91555e817b54880666a35",
       []
@@ -444704,6 +450353,10 @@
        ]
       }
      },
+     "scale-transform-filtered-text-ref.html": [
+      "e8b564ce3ddd6560299d91f347b4407fe6a5db6b",
+      []
+     ],
      "scale-transform-overlap-ref.html": [
       "4750764ae93092e7b7e9f7d151eb1b7904c32ca8",
       []
@@ -445716,7 +451369,7 @@
        []
       ],
       "helper.js": [
-       "a37aae918300d1136debbebbfbb75d46259e0bce",
+       "0ccfe2648ea297fb55360bfa4e47e371a34a7168",
        []
       ],
       "import-green.css": [
@@ -445748,7 +451401,7 @@
        []
       ],
       "properties.js": [
-       "81cf9d46d5ff575e16b955ec2d64f579699fd441",
+       "e450208389086aa559b576eeea723800c3acf933",
        []
       ],
       "ruler-h-50%.png": [
@@ -445854,6 +451507,14 @@
       "a448fc800d26f26f7976bb9358251a5c392262e1",
       []
      ],
+     "WEB_FEATURES.yml": [
+      "13ff52f509289cb229e9559f36f464c526b2945b",
+      []
+     ],
+     "background-image-gradient-ref.html": [
+      "588b934c7e81abaaf223f7659230aaf9b9c15389",
+      []
+     ],
      "resources": {
       "testhelper.js": [
        "4c9ed78c78cb905c95fc98a6d07b53beb0bccca1",
@@ -446123,6 +451784,10 @@
        "dc8f37feaeefa314f3f6bde2ec031eb4e9b9cf02",
        []
       ],
+      "native-appearance-disabled-for-value-unset-ref.html": [
+       "f3f8a11ed88b9cb9f72ff086021af8d856d442e0",
+       []
+      ],
       "outline-006-ref.html": [
        "3c15fcbf6cc0870159c4fe7ddaff8b61747126be",
        []
@@ -447352,7 +453017,11 @@
         "39f1ebfa0c34eda1fc7a05c3feca972b70dd29c9",
         []
        ]
-      }
+      },
+      "calc-size-no-body-height-quirk-001-ref.html": [
+       "0c0d6b3607bc6c09848b8f8f4d7079bc0c985fc4",
+       []
+      ]
      },
      "calc-text-indent-1-ref.html": [
       "71c0b48d6eee5eb7a09b440f934e24d1f912e680",
@@ -447746,6 +453415,18 @@
      },
      "urls": {
       "support": {
+       "1x1-green.png": [
+        "b98ca0ba0a03c580ac339e4a3653539cfa8edc71",
+        []
+       ],
+       "1x1-navy.png": [
+        "9b9a03955baea7abde9e056e8604e18694e49b66",
+        []
+       ],
+       "1x1-red.png": [
+        "6bd73ac101874f306d007e9cea8fa3a1f62dce16",
+        []
+       ],
        "empty-urls.css": [
         "0559e3b2352519e00cc5196dc99a6ab69e8ae90e",
         []
@@ -447754,11 +453435,23 @@
         "2c39a087e9eeb786967751acbbbda112ad590ff9",
         []
        ],
+       "image-referrerpolicy.py": [
+        "cff09165f1047eae0b7f94008d076cc3a417c282",
+        []
+       ],
+       "image-referrerpolicy.sub.js": [
+        "4fc9d46218f154736106c3294a77ce695f21ce1b",
+        []
+       ],
        "relative-urls.css": [
         "1354c655e9898cff845ff78df717cca7c73f030f",
         []
        ]
-      }
+      },
+      "url-image-ref.html": [
+       "a56c789f1474de969ee9c2276ec22c2594f921a8",
+       []
+      ]
      },
      "vh-update-and-transition-in-subframe-iframe.html": [
       "61831f42f7d6ca1efe2e9534366f4b91da2ca155",
@@ -447919,7 +453612,7 @@
       []
      ],
      "WEB_FEATURES.yml": [
-      "e1df1b8c670205931df252d4956287277f97700d",
+      "cbdc654b1d6280d3eeb3d49e440b69c71eb00463",
       []
      ],
      "animating-new-content-ref.html": [
@@ -448062,6 +453755,10 @@
       "698b32956b31634f8ddce8502633f91a6a4fc75d",
       []
      ],
+     "empty-render-target-capture-ref.html": [
+      "a8c2732cd85013a8f2ecea3f2057c0ff89b30149",
+      []
+     ],
      "exit-transition-with-anonymous-layout-object-ref.html": [
       "10e04ac58a44e9005d7297ca17c63666ed2c542a",
       []
@@ -448227,6 +453924,10 @@
       []
      ],
      "navigation": {
+      "WEB_FEATURES.yml": [
+       "1b95bc2b45bbeb5535d60c0786f7f4794ab16620",
+       []
+      ],
       "at-rule-opt-in-auto-ref.html": [
        "be8cc501cf09a01105a8f0c89d8e47b91dd66c01",
        []
@@ -448296,8 +453997,12 @@
         "bf5a73c73ee014ecf5777f77b9282d8f947f58af",
         []
        ],
+       "at-rule-types-shared-elements.html": [
+        "c9cff7f473410e36bad847c37eb3dbdd1369f9ae",
+        []
+       ],
        "auto-name-from-id.html": [
-        "f1fd1e48a68e6d7d63184f092bb1b607b6d6967d",
+        "71ea52a273e3fca98440cdefc50c77c722663a21",
         []
        ],
        "chromium-paint-holding-timeout.html": [
@@ -448313,7 +454018,7 @@
         []
        ],
        "navigate-after-hide.html": [
-        "0b6a3d669e89e07b6b6476dcdaafef3157fdaa77",
+        "9bed19eda2a0187a18583f05a151ca0ebb1247a2",
         []
        ],
        "opt-in-style.css": [
@@ -448384,7 +454089,13 @@
       "transition-to-prerender-ref.html": [
        "7df899fdca151dd273063323733c0c20fedb3bb3",
        []
-      ]
+      ],
+      "with-types": {
+       "at-rule-types-shared-elements-ref.html": [
+        "2fc574c0f793c57645d9c2e058b1f525b512d401",
+        []
+       ]
+      }
      },
      "nested": {
       "nested-opacity-ref.html": [
@@ -448399,6 +454110,10 @@
        "d189a460c7cb5147b04367d4e56aac0ae751c6d5",
        []
       ],
+      "nested-root-capture-with-clip-ref.html": [
+       "b598df17a0ec92234b2bfff8920344eec0d5dbc2",
+       []
+      ],
       "resources": {
        "compute-common.css": [
         "20337ccce5f3387e7e70e6fb219544369b74aa06",
@@ -448407,6 +454122,10 @@
        "compute-test.js": [
         "f71cf27b2504163ccb47e5253dcbe3b26deb1226",
         []
+       ],
+       "pause-view-transitions.css": [
+        "823235f3fbbfc6b9b4c39d9d9a1ac0c53f193473",
+        []
        ]
       },
       "rounded-border-clipper-ref.html": [
@@ -448614,6 +454333,12 @@
       "23852cf6a7cae7868ee19a52315be1f20c47ac84",
       []
      ],
+     "parsing": {
+      "WEB_FEATURES.yml": [
+       "e011b34e2a06d5edbbdde0cf541fb86f00803644",
+       []
+      ]
+     },
      "pseudo-element-overflow-hidden-ref.html": [
       "02bcb5bb49c09ba151b10751ad31b9ebba91bdef",
       []
@@ -448666,6 +454391,12 @@
       "dc9d6ae245c61d82f8515a94da8b60df9bc80b80",
       []
      ],
+     "scoped": {
+      "content-ref.html": [
+       "1216fdfa85051ce2d19e97853b63f8ba70348209",
+       []
+      ]
+     },
      "scroller-child-abspos-ref.html": [
       "ed118e633f013e10761fe2e66a88bce867a6b9a0",
       []
@@ -448702,6 +454433,10 @@
       "c219fb1edd4c24f29760aef7e18332f7362accf7",
       []
      ],
+     "snapshot-containing-block-static-iframe-ref.html": [
+      "188cefecd3d9b225b594e5604aeb68774762d442",
+      []
+     ],
      "snapshot-containing-block-static-ref.html": [
       "0bff68efb23da1a7bf2189f8bcea4a936faeba94",
       []
@@ -448768,6 +454503,10 @@
       "e86fa3f3e21e9a8df3a28ba9ca60332a4d1b6ab7",
       []
      ],
+     "view-transition-types-matches-case-sensitive-ref.html": [
+      "6a9af3f82862d0908ba9443c4adbf3b80c16f7f9",
+      []
+     ],
      "view-transition-types-matches-ref.html": [
       "7f697364c29f30dc18f0a94310a58fc43a409ea1",
       []
@@ -448815,6 +454554,10 @@
        "d1b9a0d68dd5cf15d035896a6e4deac59b950310",
        []
       ],
+      "font-size-keyword-specified-ref.html": [
+       "3395465c5d59422520d62002618e406e97e63423",
+       []
+      ],
       "font-size-ref.html": [
        "30eaa4aeb9fcae4e42ca2061358bd976e9144eee",
        []
@@ -449512,7 +455255,7 @@
        []
       ],
       "available-size-020-ref.html": [
-       "ecd3ac273a2be4c198abba2730ef8355f4b52111",
+       "07eb33e3ec1239cc1e6d34e03c044f94a0be28b8",
        []
       ],
       "available-size-022-ref.html": [
@@ -450027,6 +455770,30 @@
        "e5b895aa956bd26084737a174c31628c9c51db90",
        []
       ],
+      "table-cell-align-001-ref.html": [
+       "b324e3c308326db8ff19cae1ba822d71c40a468b",
+       []
+      ],
+      "table-cell-align-002-ref.html": [
+       "eaacb7786baace57795f85fc3f73cb9cf9aff5fe",
+       []
+      ],
+      "table-cell-align-005-ref.html": [
+       "c5cd6fe28a97343b94989193c4583ddd2393538a",
+       []
+      ],
+      "table-cell-align-006-ref.html": [
+       "c5b52346fc0ad931aedb40339150146e067bc268",
+       []
+      ],
+      "table-cell-valign-001-ref.html": [
+       "03cb9ec9e4c6b1d7b6e0973b57f3c93ce293b1e4",
+       []
+      ],
+      "table-cell-valign-003-ref.html": [
+       "f649110965ae1fa1f9f5e23e36061abd5c217ece",
+       []
+      ],
       "tcy-white-space-processing-001-ref.html": [
        "9c5acb315d7793026e13daecfe70cecff44a1c84",
        []
@@ -450067,6 +455834,14 @@
        "aeda4e4f9556bb2b54ce6c32b763c11827a5812c",
        []
       ],
+      "text-orientation-020-ref.html": [
+       "c5f83ef92a3481b209e568903dedc0f1a46fa255",
+       []
+      ],
+      "text-orientation-021-ref.html": [
+       "3ff53e3da4a514ef05276b91002dd07da23cef4d",
+       []
+      ],
       "text-shadow-orientation-upright-001-ref.html": [
        "54c1f74259e1fb689d2ffd3dbbd43478c62638c5",
        []
@@ -451238,7 +457013,7 @@
        []
       ],
       "req-tcu-font.html": [
-       "d329eea041c509a4102e868025504dde0d5a868e",
+       "16414a1b2b1743812788257efc4ef25c5ea3932b",
        []
       ]
      },
@@ -451455,7 +457230,7 @@
       []
      ],
      "wm-propagation-body-044-ref.html": [
-      "9cf46c0b214652ca0bd7f28fe88c7943f6ccef8c",
+      "f61f97c9a1de34e246f1edb056cab56cc6db62b7",
       []
      ],
      "wm-propagation-body-047-ref.html": [
@@ -451509,7 +457284,7 @@
       []
      ],
      "WEB_FEATURES.yml": [
-      "def314c45c7988cd00180f6687d6fc296ded7aad",
+      "cabaad6760c90e88d5e3384c2569f5e900e64a5e",
       []
      ],
      "insertRule-from-script-ref.html": [
@@ -451771,6 +457546,10 @@
        "f8947e0472f489ca1a98a9e231b17e7d8ce6585e",
        []
       ],
+      "scrollIntoView-frame.html": [
+       "ee2be2fd3ab04ad9a1bde48ee188789d92d9ca8a",
+       []
+      ],
       "simultaneousScrollIntoViews.js": [
        "32de35fb544c5a83b0c8159de21f9a6ebfed19ba",
        []
@@ -451833,6 +457612,10 @@
        "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
        []
       ],
+      "action-utils.js": [
+       "c3ab5272da666146564deae7fc6ab9ffbec3a9e4",
+       []
+      ],
       "b-green.css": [
        "a0473f5ca26652c1229290bbf1f81eabc1e37280",
        []
@@ -452094,6 +457877,10 @@
       "c92741df4300e5416cbe26339d52b819ec35347c",
       []
      ],
+     "backdrop-filter-scale-transform-ref.html": [
+      "d7faa0e97a175fc5dabf6f2d89ce71ba0fd498e1",
+      []
+     ],
      "backdrop-filter-transform-ref.html": [
       "1af8776cf0dc663ec7bac1f83ba361ccb8b2b5d4",
       []
@@ -452234,6 +458021,10 @@
       "21c33ea1cd44fa23f6f92c3881e6ef22d33587d2",
       []
      ],
+     "feComposite-intersection-feTile-input-ref.html": [
+      "4345e3d8ac143dfffef9638d75481bfe40630163",
+      []
+     ],
      "fecolormatrix-negative-ref.html": [
       "95a0051c18a1219012e48ad91e58ecc213ba24b6",
       []
@@ -452865,7 +458656,7 @@
       []
      ],
      "WEB_FEATURES.yml": [
-      "cc952ac20098092f75ff503d4bdded9c9ee2ed99",
+      "7f15b7fa475230b42981a3f92f60f434e9ccf1af",
       []
      ],
      "prefers-color-scheme-svg-as-image-ref.html": [
@@ -453199,7 +458990,7 @@
       []
      ],
      "background-image-print-ref.html": [
-      "305aa2fce2f490ef161c803558cc7a17bf7aa117",
+      "8fb1b3998f0548127b02808b9335b64a24603ae2",
       []
      ],
      "fragmented-inline-block-002-print-ref.html": [
@@ -453292,6 +459083,10 @@
       "82fcaa3b2aa4a271db14feb00256d0aedbce2d85",
       []
      ],
+     "ref-filled-green-100px-square-print-ref.html": [
+      "f55a4cf12ecd7bad816a2ec3a8af45d943e54e5b",
+      []
+     ],
      "ref-filled-green-100px-square.xht": [
       "05a13794482a94f6c10bd9d4c98704e63ef60331",
       []
@@ -453876,7 +459671,7 @@
      },
      "parsing": {
       "WEB_FEATURES.yml": [
-       "f3453b29162aab65363b2caf0ba076c8ccb58de1",
+       "ab1fe19e4d1e36f06166e76477d0bcf907d34db6",
        []
       ]
      },
@@ -454249,12 +460044,6 @@
      "e77a8695bdd8f4782ba02a1a039597d300965601",
      []
     ],
-    "custom-element-registry": {
-     "WEB_FEATURES.yml": [
-      "c8486615c1e03c1b70d9f22ddbfe2f95b617fd0a",
-      []
-     ]
-    },
     "form-associated": {
      "ElementInternals-reportValidity-bubble-notref.html": [
       "dda233296569d8ec855855434a4947d8a847a2c6",
@@ -454282,7 +460071,7 @@
      ]
     },
     "pseudo-class-defined-print-ref.html": [
-     "1ed6da59582b3c6cad43768def8136b36af496c4",
+     "903f3f7d8dd3c6dae14069719da5827f9e222733",
      []
     ],
     "reactions": {
@@ -454303,6 +460092,12 @@
       ]
      }
     },
+    "registries": {
+     "WEB_FEATURES.yml": [
+      "c8486615c1e03c1b70d9f22ddbfe2f95b617fd0a",
+      []
+     ]
+    },
     "resources": {
      "custom-elements-helpers.js": [
       "48775af162ac86f429431a84daacc86e3ef0c140",
@@ -454463,6 +460258,10 @@
       []
      ]
     },
+    "fetch-verify-authenticated.https.html": [
+     "d9e3df9f5c6e6030ed642dc302d600a3c974f110",
+     []
+    ],
     "helper.js": [
      "58b7a5fe7a2da56b9c6555f6e21510abd1c81473",
      []
@@ -454547,21 +460346,25 @@
      "d062affc1848e3f315ef4f7e1d30319545bc7992",
      []
     ],
-    "dc-types.ts": [
-     "30284e7fad68ea31854bef5e1a47364b11e46d19",
+    "create.disabled-by-permissions-policy.https.sub.html.headers": [
+     "9847d173eb6278152c83f719914f604375b4d151",
      []
     ],
-    "disabled-by-permissions-policy.https.sub.html.headers": [
-     "02a76b7c3f289bed45a44e7c949b4792fd798dbc",
+    "dc-types.ts": [
+     "83168f8a343469d479c5a11736e6e1e5ae35f6b1",
      []
     ],
     "enabled-on-self-origin-by-permissions-policy.https.sub.html.headers": [
-     "1207d9e29a111a46b920d27dd3188bae1e6cf8f4",
+     "4de358e6a4404c94768441ee20cfc9e7f6191b06",
+     []
+    ],
+    "get.disabled-by-permissions-policy.https.sub.html.headers": [
+     "5672154a42328b467a7cbf9e1ad94f3b2e7842d8",
      []
     ],
     "support": {
      "helper.js": [
-      "71022432652c19ccb7272b02f723dcf748d9e7b3",
+      "5a9cda347888a2527ac059e332d6ad14331dc7ef",
       []
      ],
      "iframe.html": [
@@ -454793,11 +460596,11 @@
       []
      ],
      "webkitgtk_minibrowser.md": [
-      "55bcbf1bd6af9812390de1e68af964fd6cebd401",
+      "6af2da94406500bcfbd62bd994070c110faad089",
       []
      ],
      "wpewebkit_minibrowser.md": [
-      "7721279b041580bbe2ab0ccb13e91dd300f493f5",
+      "6f9328633a1d50e35593b15ecf1f3a5793fadce6",
       []
      ]
     },
@@ -454917,7 +460720,7 @@
       []
      ],
      "testdriver.md": [
-      "537b3c01976c3c798ea7afda47832aaea324830d",
+      "e0fae529875ee89d5e8a2457cdab35e1866f663b",
       []
      ],
      "testharness-api.md": [
@@ -455099,6 +460902,10 @@
        "e4fba841b62ac948a7fef93e514b02169057d494",
        []
       ],
+      "scroll-cross-origin-iframes.sub.html": [
+       "e6d12794e3fd29e976249d8932dde3a9be4dc083",
+       []
+      ],
       "scroll_support.js": [
        "59deaf473dba08b641e372d75afb602fa795b387",
        []
@@ -455483,6 +461290,12 @@
       ]
      }
     },
+    "observable": {
+     "WEB_FEATURES.yml": [
+      "3e872791165e41402949da13fedd7a8780aaf660",
+      []
+     ]
+    },
     "parts": {
      "resources": {
       "domparts-utils.js": [
@@ -455891,7 +461704,7 @@
     },
     "include": {
      "editor-test-utils.js": [
-      "f88a9bac3b4d71f19da915ae1f43114d862f3cf7",
+      "f0c4f58399263a453b11a37e54d7152d935adec5",
       []
      ],
      "implementation.js": [
@@ -455947,7 +461760,7 @@
       []
      ],
      "element-timing-helpers.js": [
-      "2c1bd195ea76f8126d739e705fed7af3a562fc45",
+      "5ff01bfa1209a26d84d69bb5a80d7fd21d671fab",
       []
      ],
      "iframe-stores-entry.html": [
@@ -456943,7 +462756,7 @@
     },
     "polyfill": {
      "cast-polyfill.js": [
-      "576e0ad04066d37670634b39fc128dc2ea905dae",
+      "0c6b47b5cd0b7f046fff931e65a70d83a2b7c6d7",
       []
      ],
      "chrome-polyfill.js": [
@@ -456951,23 +462764,19 @@
       []
      ],
      "clearkey-polyfill.js": [
-      "057ea3e0301fafebb1ee8f194bab61363dfd2c11",
+      "c21a4e8becf953a89023bb7e99941f0de3bb96f5",
       []
      ],
      "edge-keystatuses.js": [
       "8861444591bbd8ec5c5e1e86ccad2d5c45adab39",
       []
      ],
-     "edge-persistent-usage-record.js": [
-      "7f86f0c05895a2f82ec4ac80252cf4eb4a33d5e2",
-      []
-     ],
      "firefox-polyfill.js": [
       "ce241af362a873af0ba490013790a5be365b9fac",
       []
      ],
      "make-polyfill-tests.py": [
-      "97c6fc74e93ba0f89f34c75cab3d4fb6ad183626",
+      "7773cf9a21f93bc359c9d402941a32b95a7cd02d",
       []
      ]
     },
@@ -456987,14 +462796,6 @@
      "drm-retrieve-persistent-license.html": [
       "bf554248f43e2bfbc82d5de38cbe9b8de9c4f6cb",
       []
-     ],
-     "drm-retrieve-persistent-usage-record.html": [
-      "d1b3e0c6949091aa208481bc55b85561e74da1a5",
-      []
-     ],
-     "retrieve-persistent-usage-record.html": [
-      "c09134b54695b979ee586105710e025073f3b049",
-      []
      ]
     },
     "scripts": {
@@ -457051,31 +462852,19 @@
       []
      ],
      "playback-destroy-persistent-license.js": [
-      "8a6cacedb40ad424ffe3a4bd5bb3c6c2c1dfd831",
+      "ce3ede67b654ea3302a9d371b7d11e02d1dacc18",
       []
      ],
      "playback-persistent-license-events.js": [
-      "2d99f679f4cf489703a20b105a7e3952e40a3bef",
+      "7a381bb2f9d090424f0bf60d254c056fdac3f7d2",
       []
      ],
      "playback-persistent-license.js": [
-      "c7e56e3aeaf30c809ea3563548f6198925e0c2c2",
-      []
-     ],
-     "playback-persistent-usage-record-events.js": [
-      "e8e1e54790b6c7a90ed48ee12be8d795dcab290c",
-      []
-     ],
-     "playback-persistent-usage-record.js": [
-      "1772b4bd5f361163603598143c4be74ad8883a53",
+      "9b1f9da4cdd997b3ca9f45a4e577090b264352de",
       []
      ],
      "playback-retrieve-persistent-license.js": [
-      "83cba34028e92a38b2079bcf78460a4b2fa29e31",
-      []
-     ],
-     "playback-retrieve-persistent-usage-record.js": [
-      "a04f97d2ca9baed1734c49701d237d08842f00a4",
+      "ad9728e01adf66fe07822d39a2631567d5800e61",
       []
      ],
      "playback-temporary-encrypted-clear-segmented-sources.js": [
@@ -457087,11 +462876,11 @@
       []
      ],
      "playback-temporary-events.js": [
-      "d8dac4463df42bde9cc57745f822b95b5ef7d583",
+      "1d81cf2607156c5c239b264f6bec420da70f4d39",
       []
      ],
      "playback-temporary-expired.js": [
-      "3d1bd9591db309deb64df8765f5a7fd6fb5c4791",
+      "16b6e7da2e8a49c4f5ad4f2daf9f2bac7e0c6d94",
       []
      ],
      "playback-temporary-multikey-sequential.js": [
@@ -457175,7 +462964,7 @@
       []
      ],
      "temporary-license-type.js": [
-      "44c9f158085fcffd42a8573e080d17939a7a866c",
+      "367e2e5aaf12c4685b5f28d934ba9f5f0c584c2c",
       []
      ],
      "unique-origin.js": [
@@ -457197,7 +462986,7 @@
       []
      ],
      "drm-messagehandler.js": [
-      "b1565c12cb02e4a99caa9399f2d7714db22501f8",
+      "0af63be0686644d493c20d9939ccbc8b83f093e6",
       []
      ],
      "testmediasource.js": [
@@ -457279,13 +463068,17 @@
      "e38d492da0a2c22c30bdc799b6b06c224bfec136",
      []
     ],
+    "WEB_FEATURES.yml": [
+     "b20102ff2a34622e493481126f59717660d9d2fd",
+     []
+    ],
     "resources": {
      "crossiframe-childframe.html": [
       "6a8bc6b64240636dbc576aaa15b9c86b799dae8e",
       []
      ],
      "event-timing-test-utils.js": [
-      "7bd9782000f40d9f96d8c7074337e6dbaa7aaeeb",
+      "afad67bb6fc2d90e02bf7b40633be891bb2fe3d0",
       []
      ],
      "slow-image.py": [
@@ -457946,12 +463739,16 @@
       "5f9b7a81b9a4f9cdb1506dffc922bd15627a1222",
       []
      ],
+     "manifest_with_single_identifier.json": [
+      "76984065d2106ae255166e40ee8b3d8dda3c3d68",
+      []
+     ],
      "manifest_with_two_accounts.json": [
       "6310fb0a0becfbe03b7fec666aea406a587b0858",
       []
      ],
      "manifest_with_variable_accounts.json": [
-      "b3161e5f286034714af357cd98a7949c57f6937c",
+      "b0fa2bbcc158e4ad1e32d46d7556f7db629255c8",
       []
      ],
      "mark_signedin": [
@@ -458006,6 +463803,10 @@
       "000a23d925c8ce58e2b6d578badc3957cc8c9381",
       []
      ],
+     "single_identifier_accounts.py": [
+      "38eff8c35716e8d2664077342b0d54f5d8fba806",
+      []
+     ],
      "token.py": [
       "f4ad108d8d5159a1fc130b0a1dc6fc3bea229f32",
       []
@@ -458534,6 +464335,10 @@
       "1b63235b7cdffe9ebb43bfac3a01d5220e1519fb",
       []
      ],
+     "history-length-test-helper.js": [
+      "0dc2e37db9cad611186124c7d6bd91f581e6039b",
+      []
+     ],
      "ignore-child-fenced-frame-onload-event-inner.html": [
       "4fe496f29c84806d0fa41c4d23851cd4878214c6",
       []
@@ -458874,6 +464679,12 @@
      []
     ],
     "api": {
+     "basic": {
+      "WEB_FEATURES.yml": [
+       "d6cd4adaeff73410db2d9d516b9ae695a3fabcff",
+       []
+      ]
+     },
      "body": {
       "cloned-any.js": [
        "2bca96c7043db34b9cd4a60156019b7f870100a2",
@@ -458963,6 +464774,10 @@
       ]
      },
      "request": {
+      "WEB_FEATURES.yml": [
+       "69b2ea582a2281403c4899e122343262e43976db",
+       []
+      ],
       "destination": {
        "resources": {
         "dummy": [
@@ -459146,7 +464961,7 @@
        []
       ],
       "keepalive-helper.js": [
-       "1e75c060aea1d8251f3546429f73e613575e7966",
+       "ad0e9bfa06c0bb25cccda2ef279ba0c1c5abe36d",
        []
       ],
       "keepalive-iframe.html": [
@@ -459395,6 +465210,10 @@
       }
      },
      "zstd": {
+      "WEB_FEATURES.yml": [
+       "b5d970fdb14ac3fd01ac25c0f9c809460e5e561f",
+       []
+      ],
       "resources": {
        "bad-zstd-body.py": [
         "496f26881dc9574f8e8f3fcc04c49fa4145c8a20",
@@ -459821,7 +465640,7 @@
     },
     "http-cache": {
      "README.md": [
-      "512c422e1087c5ef726b24242b7bfc7af4e43170",
+      "f3815aabfd94b7d0625cd6db35353eca4b7d5cb6",
       []
      ],
      "basic-auth-cache-test-ref.html": [
@@ -459829,10 +465648,14 @@
       []
      ],
      "http-cache.js": [
-      "19f1ca9b2bcce2dbe1120ceeb4c5283103d5d105",
+      "e22347369109de27cd63cd359d9e9608c34243ee",
       []
      ],
      "resources": {
+      "cached_pragma_rand.py": [
+       "18c7d25159fa3041b8aa278c8ac022003eee0e36",
+       []
+      ],
       "http-cache.py": [
        "3ab610dd1421cea5289ad14a8ef472ade27f07f1",
        []
@@ -459851,6 +465674,30 @@
       ]
      }
     },
+    "local-network-access": {
+     "META.yml": [
+      "4c5c6983ed0467f3ebca3182a6b5d095270f85d2",
+      []
+     ],
+     "README.md": [
+      "95066cdcd0ba6f2baed3cd02d67610420367b6df",
+      []
+     ],
+     "resources": {
+      "fetch-private.html": [
+       "b96a207ec33a13e5dd4c53083ac3d73123b23cbb",
+       []
+      ],
+      "support.sub.js": [
+       "774e34d0a6fe59bab19aca14cb71b6e520acb798",
+       []
+      ],
+      "target.py": [
+       "eabcdd47517c8938d12cd08a0d66f0db2e518456",
+       []
+      ]
+     }
+    },
     "metadata": {
      "META.yml": [
       "85f0a7d2ee12616aa7a5698b346954829d8a8bb0",
@@ -460247,7 +466094,7 @@
       []
      ],
      "README.md": [
-      "a69aab487239021088f944b0a8cee2dad4b3d111",
+      "cbb5b85b74d1347b93c7f0e480cf978262da6b03",
       []
      ],
      "resources": {
@@ -460471,6 +466318,10 @@
      "b007264cea5db3c1ad6f2825ae44b149445dcaec",
      []
     ],
+    "WEB_FEATURES.yml": [
+     "7faf67952b5b82107a2797706e41dfdc780ef041",
+     []
+    ],
     "resources": {
      "data": {
       "testfile.txt": [
@@ -460504,9 +466355,13 @@
       "e05fe65911d4154f3e8bee9214b21e0ec64ba3af",
       []
      ],
+     "cross-origin-embedder-policy.https.window.js.headers": [
+      "20319c1b02dda1ca0d40a0cae6bf6b460f5562f1",
+      []
+     ],
      "resources": {
       "additional-bids.py": [
-       "8a947533307ac553a5a16ee05fbc5de2f99dfe30",
+       "89a47c0e0d0d3702a33bbc3e10f811d140e2fa61",
        []
       ],
       "authorize-server-response.py": [
@@ -460514,7 +466369,7 @@
        []
       ],
       "ba-fledge-util.sub.js": [
-       "3371813feee6e11dedd71126ca1b354e64021d73",
+       "8fa4eb1e3514274e9ca179253fdae56150ccf07b",
        []
       ],
       "ba-public-keys": [
@@ -460522,7 +466377,7 @@
        []
       ],
       "bidding-logic.sub.py": [
-       "8c0539d43c83a72b57498b0ec5c4f16d2fb26599",
+       "97d2d80343cdd0d94925143dece2b506ef3983ca",
        []
       ],
       "decision-logic.sub.py": [
@@ -460542,11 +466397,11 @@
        []
       ],
       "fledge-util.sub.js": [
-       "ebd2b44b9928a9c72e93112f226e51cfa54d4094",
+       "49ebfd1c596c102970f0062592284b14da3841f9",
        []
       ],
       "fledge_http_server_util.py": [
-       "179262d33926896588393971f61f1cc6dfc8546d",
+       "30889d92d4f7ba5793ac72ed7b0dd19d2a939511",
        []
       ],
       "incrementer.wasm": [
@@ -460554,13 +466409,21 @@
        []
       ],
       "permissions.py": [
-       "eed93c42756b75045dd38ccc4c085059d040bf66",
+       "f66e28bb27ba099b0fc171fec1af9edfd884caa2",
        []
       ],
       "real-time-report.py": [
        "54873674eb58783731237dde5ef299ce15947638",
        []
       ],
+      "record-click.py": [
+       "b4e76873d9b12227e350e2d4d01321cab05a44ce",
+       []
+      ],
+      "record-view.py": [
+       "d423b2d9c72930a1302738418eef197f28dfb661",
+       []
+      ],
       "redirect-to-trusted-signals.py": [
        "7da27cd6872f9119c8647be939aecc4452526e50",
        []
@@ -460574,7 +466437,7 @@
        []
       ],
       "service-worker-helper.js": [
-       "cc00181359740b51f83c3289cfc215252123b67e",
+       "2b94dc60e0175996ac27dfcc8df93ef573978a56",
        []
       ],
       "service-worker-helper.js.headers": [
@@ -460594,11 +466457,11 @@
        []
       ],
       "trusted-bidding-signals.py": [
-       "5a89e3b602565170c5e5eb3427eea71c36579dbe",
+       "e6e7d6605258ace5564986dfa1d550316e207e1b",
        []
       ],
       "trusted-scoring-signals.py": [
-       "934d2e9129d04a511b44540a6d326eff4d2b75f3",
+       "bfd23b124cbab6cf8f3e49ed690004c085248e70",
        []
       ],
       "update-url.py": [
@@ -461233,6 +467096,14 @@
      "2d3bf3ed873e8b1d361afbd8aacaee3f3d0b6251",
      []
     ],
+    "Lato-Medium-Liga.ttf": [
+     "3a0beaea38b8bc0cbf6fa656bf23e28cfdf18c6f",
+     []
+    ],
+    "Lato-Medium.ttf": [
+     "2c612da2ae589dc264deb683f90baf75c8e18e03",
+     []
+    ],
     "META.yml": [
      "5b04a86e6ef33a371a3e4199fff4cd8d2fc6e25b",
      []
@@ -461259,7 +467130,7 @@
       []
      ],
      "LICENSE": [
-      "ac5f0b043202bc1e0979388c026014e51a3d60d9",
+      "4cbddfbc646f99510d69f525b02c38da789fdf06",
       []
      ],
      "README.md": [
@@ -461352,6 +467223,10 @@
       "70f366a3d0b7ec891fc4041584a1ddea55b0bc42",
       []
      ],
+     "css-units.woff": [
+      "0957a2fc973700ac5bff6586bc60721b7d4142da",
+      []
+     ],
      "fraction-axisheight7000-rulethickness1000.woff": [
       "2a9d78cc9d430e9987e977ef83f4e47dfee6a99f",
       []
@@ -461396,6 +467271,10 @@
       "0b4f8bf46a76ab5cc70c2a12cb7db0d49570bd7c",
       []
      ],
+     "largeop-displayoperatorminheight3000-2AFF-axisheight1000.woff": [
+      "13d3e4ad4ed6d12cb30b27ea14169866b874f4e7",
+      []
+     ],
      "largeop-displayoperatorminheight5000.woff": [
       "53fcc13a1603621c0985dd8ea8d956fd01c974f4",
       []
@@ -461941,6 +467820,14 @@
      "6bfa7710fa337ffba4edf0c33d916d30aa675610",
      []
     ],
+    "forced-colors-mode-55-ref.html": [
+     "55ecd284b70fb8fe0b35c151ebd798fe66ca42d6",
+     []
+    ],
+    "forced-colors-mode-56-ref.html": [
+     "d3a90b8c87fe55f341c16d7dbb11a56258bc9a05",
+     []
+    ],
     "resources": {
      "float-image.jpg": [
       "ab06d5f94d16e22bb08fad79d6fef662b2a7de5a",
@@ -462282,7 +468169,7 @@
    },
    "graphics-aam": {
     "META.yml": [
-     "197263836e7695882d4d1fb533c1e043a70ff234",
+     "c51c6e1b186e7bf9c026905ea2f07531035964d6",
      []
     ]
    },
@@ -462450,7 +468337,7 @@
          []
         ],
         "helper.sub.js": [
-         "a1d18d108e808ba128a200ab4c0ee0f5d64e3ccb",
+         "7df1a30549ae428908e6dd51236dd6c76db6c6d1",
          []
         ],
         "inflight-fetch-helper.js": [
@@ -463034,7 +468921,7 @@
          []
         ],
         "004-1.html": [
-         "a3ca82f520a7681d0e53a82a234613b8e8773756",
+         "5391f933f9ab146b4cc0f27149229cc3cff5477f",
          []
         ],
         "004-2.html": [
@@ -464070,14 +469957,6 @@
         "6f44d8a83ecade23c4b02707c56981d25ed62811",
         []
        ],
-       "close_noopener_beforeunload-1.html": [
-        "fc114bc443e500819487efc92f9e1042c2dcfa60",
-        []
-       ],
-       "close_noopener_beforeunload-2.html": [
-        "4cce1e2e6f7dd058ed0129abb2a14e5f879aa340",
-        []
-       ],
        "close_pagehide-1.html": [
         "5631b539a6af1ffee4f77b265b03eed3255f364f",
         []
@@ -464133,7 +470012,11 @@
          "a9d42e26dea16afa9743d31aa7b72f3f09e46e68",
          []
         ]
-       }
+       },
+       "self-close.html": [
+        "d409e9f423d521327e1853dc1e1b4728ac3d107c",
+        []
+       ]
       },
       "support": {
        "BarProp-target.html": [
@@ -465229,6 +471112,10 @@
        "2d.gradient.object.current.png": [
         "d638d033868afd3aab0a7b26d5b2a0a2b95da010",
         []
+       ],
+       "WEB_FEATURES.yml": [
+        "319b5b8e04cb32161be0d8eb36cc4ba99eb6459c",
+        []
        ]
       },
       "filters": {
@@ -465649,6 +471536,10 @@
         ]
        },
        "fill-and-stroke-styles": {
+        "WEB_FEATURES.yml": [
+         "5d9106c1cd63b77005e44a30177d9e623f4e98df",
+         []
+        ],
         "conic-gradient-expected.html": [
          "f347abc9d3939fb52c4fe08d949f8d96c4de3386",
          []
@@ -465840,19 +471731,19 @@
          []
         ],
         "canvas.2d.lang-ref.html": [
-         "6bb9238a74a287c88dd7846aa98cbfdd3e2d611f",
+         "f20533fc4710db7be7cdc94bf7d8a0d360ffd6d6",
          []
         ],
         "canvas.2d.lang.dynamic-ref.html": [
-         "177bddb1794ef440663d90f75b204360e05dc100",
+         "0262f588978ac0db86dc8c1e9570faef73d2217b",
          []
         ],
         "canvas.2d.lang.empty-ref.html": [
-         "258ebf6298e164ad4edf9f6171f1ff17ac1991d2",
+         "7fa4dacd6e4ead887420d9ba2ecf32e9d6ef9fa2",
          []
         ],
         "canvas.2d.unknown.lang-ref.html": [
-         "9d12ba0d695b39bca17b3fec88b1eb2d14c890c1",
+         "d48f9286da5592e0e38c648296bdd6d6bc5e69f7",
          []
         ],
         "canvas_text_font_001-ref.htm": [
@@ -465897,6 +471788,10 @@
         []
        ],
        "wide-gamut-canvas": {
+        "WEB_FEATURES.yml": [
+         "b4d11212a6c677339784cdab33e0e31b0b948379",
+         []
+        ],
         "canvas-display-p3.js": [
          "c6ee97b7880a4ac2333b82b60407102045d1f509",
          []
@@ -466259,6 +472154,10 @@
        "2d.path.stroke.overlap.png": [
         "e2a35d48d4c4363294aec671a38cbd4b39c9a53c",
         []
+       ],
+       "WEB_FEATURES.yml": [
+        "1bbef5e88d6630d820e2206f283ac38cffceb67d",
+        []
        ]
       },
       "pixel-manipulation": {
@@ -466442,6 +472341,12 @@
          []
         ]
        }
+      },
+      "wide-gamut-canvas": {
+       "WEB_FEATURES.yml": [
+        "b4d11212a6c677339784cdab33e0e31b0b948379",
+        []
+       ]
       }
      },
      "offscreen": {
@@ -466559,6 +472464,10 @@
        "2d.gradient.hueInterpolationMethod-expected.html": [
         "13ae67ad970eb6bc6a94d837d3f2c01c2ad9c3ba",
         []
+       ],
+       "WEB_FEATURES.yml": [
+        "319b5b8e04cb32161be0d8eb36cc4ba99eb6459c",
+        []
        ]
       },
       "filters": {
@@ -466880,7 +472789,7 @@
          []
         ],
         "canvas.2d.offscreen.lang-ref.html": [
-         "51eff356b8e6fd2742cc4da82ba015383f8f0a1a",
+         "d3a4a4089e0c1f1c36660ddea131b498cbf42b1a",
          []
         ],
         "canvas.2d.offscreen.worker.direction-ref.html": [
@@ -466888,7 +472797,7 @@
          []
         ],
         "canvas.2d.offscreen.worker.lang-ref.html": [
-         "35c87f8c69e2ad0983e8838fdcf00b2b13ca9da7",
+         "1c2228a7acc341e1025673df937d0e5ab96ee353",
          []
         ],
         "text-direction-worker-inherit.js": [
@@ -466917,8 +472826,20 @@
          "fc7265a48c393566ad8c9fe7b73281e4f5137b21",
          []
         ]
+       },
+       "wide-gamut-canvas": {
+        "WEB_FEATURES.yml": [
+         "b4d11212a6c677339784cdab33e0e31b0b948379",
+         []
+        ]
        }
       },
+      "path-objects": {
+       "WEB_FEATURES.yml": [
+        "1bbef5e88d6630d820e2206f283ac38cffceb67d",
+        []
+       ]
+      },
       "reset": {
        "2d.reset.after-rasterization-expected.html": [
         "3162e16e63d9fa5cc495401ca53d6c0242d3ee65",
@@ -467030,6 +472951,12 @@
         "00ecdccad3743db0d0a1ec99850f80ea7964d512",
         []
        ]
+      },
+      "wide-gamut-canvas": {
+       "WEB_FEATURES.yml": [
+        "b4d11212a6c677339784cdab33e0e31b0b948379",
+        []
+       ]
       }
      },
      "resources": {
@@ -467058,11 +472985,11 @@
        []
       ],
       "canvas-promise-test-worker.js": [
-       "f5410efca5b92d3b1272f94a9049027972698996",
+       "2cb50c322f7978c12bbc10faed1d8302ad58d79a",
        []
       ],
       "canvas-promise-test.js": [
-       "1b2e2b3a584a1740c01e6911f6e5c72b0a5aafda",
+       "afcbec9a6d537efaf30fd86b7d6e4ed9e8566349",
        []
       ],
       "canvas-spec.css": [
@@ -467171,7 +473098,7 @@
       },
       "yaml": {
        "color_space.yaml": [
-        "0582f4953470c05d1b0f0704d40e778ebfc4dff1",
+        "118ca1e4d3880ca543d29a3203f3f664745621f5",
         []
        ],
        "color_type.yaml": [
@@ -467215,7 +473142,7 @@
         []
        ],
        "pixel-manipulation.yaml": [
-        "6721f5ffde52ac54372d6e6dbb6f0511baf58a3f",
+        "0dfa9a4329e067fdcdb21a075b24c7d837212703",
         []
        ],
        "reset.yaml": [
@@ -467227,7 +473154,7 @@
         []
        ],
        "text.yaml": [
-        "48a0429f267d281927fad8d59dd6a791e6f029ac",
+        "0a8e54135775874c4f390101dce100bfab6716f1",
         []
        ],
        "the-canvas-state.yaml": [
@@ -467418,7 +473345,7 @@
      ],
      "resources": {
       "blob-url-factory.html": [
-       "928d404672ddece3576c8f4e1132126c50315873",
+       "98937a2501dd623e9c851d566025dca03db9c7fe",
        []
       ],
       "blob-url-factory.html.headers": [
@@ -467550,7 +473477,7 @@
        []
       ],
       "script-factory.js": [
-       "ac7a1fda06f6237973264abf6f2b1b62e746e6ab",
+       "e57449abac4b806a129d679f49f0ad409f184fee",
        []
       ],
       "shared-worker-fetch.js.py": [
@@ -467925,82 +473852,6 @@
        "244167937219cfd784f13d8ed37eedead64665e9",
        []
       ]
-     },
-     "tentative": {
-      "restrict-properties": {
-       "README.md": [
-        "b3c24c3f82d2dbf07eefa9fa2e88fcf3817473d2",
-        []
-       ],
-       "coop-rp-in-navigation-chain.https.html.headers": [
-        "073ce7adfbd81cb7c0b2f91f96c8349b6677f26c",
-        []
-       ],
-       "iframe-popup-about-blank.https.window.js.headers": [
-        "19d0dbe4e18df8ba52c2a564853f5614a0469b95",
-        []
-       ],
-       "iframe-popup-to-so.https.html.headers": [
-        "d5c99062d2bb8f9660b68c172754867b598ed43f",
-        []
-       ],
-       "iframe-popup-to-soap.https.html.headers": [
-        "d5c99062d2bb8f9660b68c172754867b598ed43f",
-        []
-       ],
-       "iframe-popup-to-un.https.html.headers": [
-        "d5c99062d2bb8f9660b68c172754867b598ed43f",
-        []
-       ],
-       "iframe-popup.https.html.headers": [
-        "d5c99062d2bb8f9660b68c172754867b598ed43f",
-        []
-       ],
-       "popup-so.https.html.headers": [
-        "46ad58d83bf6e98913ca4c564b7acb8f19fa0093",
-        []
-       ],
-       "popup-soap.https.html.headers": [
-        "d83ed86fb9b5d159b9f380424887402edc96cb75",
-        []
-       ],
-       "popup-un.https.html.headers": [
-        "073ce7adfbd81cb7c0b2f91f96c8349b6677f26c",
-        []
-       ],
-       "popup-with-cross-origin.https.html.headers": [
-        "d5c99062d2bb8f9660b68c172754867b598ed43f",
-        []
-       ],
-       "popup-with-same-origin.https.html.headers": [
-        "d5c99062d2bb8f9660b68c172754867b598ed43f",
-        []
-       ],
-       "popup-with-same-site.https.html.headers": [
-        "d5c99062d2bb8f9660b68c172754867b598ed43f",
-        []
-       ],
-       "reporting-bcg-reuse.https.html.sub.headers": [
-        "33abadd83dd9187bfa5ecf811f9fef7058412780",
-        []
-       ],
-       "reporting-from-rp-ro.https.html.sub.headers": [
-        "07ecad96f2493c7ddc70cc5f37d242c07f0cabb1",
-        []
-       ],
-       "reporting-from-rp.https.html.sub.headers": [
-        "a61e2919c8acb6be886ef16e764f1ba5dcabe9bc",
-        []
-       ],
-       "reporting-to-rp-ro.https.html.headers": [
-        "16903320bb50789e0a64f9620540f1cc8c0902fd",
-        []
-       ],
-       "reporting-to-rp.https.html.headers": [
-        "16903320bb50789e0a64f9620540f1cc8c0902fd",
-        []
-       ]
-      }
      }
     },
     "document-isolation-policy": {
@@ -468024,13 +473875,9 @@
       "bcc6f0734d580474a8bd25f25d4662f175cdc39b",
       []
      ],
-     "reporting-subresource-corp.tentative.https.html.headers": [
-      "bcc6f0734d580474a8bd25f25d4662f175cdc39b",
-      []
-     ],
      "resources": {
       "common.js": [
-       "df4bfcfc7d52ac006f84f4ca046cc64b4dd7a171",
+       "64c1f8df416eb09115d04b9f480a65353ab0a164",
        []
       ],
       "fetch-and-create-url.html": [
@@ -468053,6 +473900,10 @@
        "34b4e9f8ea41fd1aed28b86715df31c1692b88aa",
        []
       ],
+      "report.py": [
+       "3b677a91fdda472e41fd6f1cb2ce9b8d22594b2d",
+       []
+      ],
       "reporting-empty-frame-multiple-headers.html.asis": [
        "5020ad39fee282b2755f020133f09a6c5058ec1f",
        []
@@ -468673,7 +474524,7 @@
       []
      ],
      "reflection.js": [
-      "b2c3b30aae36b390a60c05b39901826ba71e0b1a",
+      "eeecd450fca8139e924affb298e7feb1a1fb46fb",
       []
      ],
      "render-blocking": {
@@ -471996,6 +477847,12 @@
          []
         ]
        }
+      },
+      "writing-suggestions": {
+       "WEB_FEATURES.yml": [
+        "4700eca4a12b8b607c16d85ff987a8ef42ac81a3",
+        []
+       ]
       }
      },
      "the-hidden-attribute": {
@@ -472012,41 +477869,49 @@
        []
       ],
       "hidden-until-found-005-ref.html": [
-       "0ca77849a4696c741333c59ca6ab3d5e17c055ae",
+       "e128e1e71395b138e96ac078b8f4616ebf8c6531",
        []
       ],
       "hidden-until-found-006-ref.html": [
-       "e14ba82c278e2c1fc4ecb864871bd6a961c28622",
+       "d8b9761694c396cdab6dfd2b382989c1c3604ab0",
        []
       ],
       "resources": {
        "beforematch-scroll-to-text-fragment-basic.html": [
-        "884e9a67faeae5b3c8236f9843bb2b0ae0c5e803",
+        "9918b7c29f84dbc415bfe5690d0a6f3700f49632",
         []
        ],
        "beforematch-scroll-to-text-fragment-bubble.html": [
-        "abfe8ddd54407c4eb12e5430e72f140e2bad9e24",
+        "3b196cd887ad752315018d5a8eb5009b47e5de1c",
         []
        ],
        "beforematch-scroll-to-text-fragment-with-anchor.html": [
-        "3506c6e60caa4df1093af49c1008e44df13aaec7",
+        "fd000d411995f65da01c2ab23ce3fbb43430c005",
         []
        ],
        "container-ref.html": [
-        "e2df59014b06c6f44a506b6e4fd7d56537ae5fa4",
+        "53986abdd1fce970445f7310ab4dfafa59b068d9",
         []
        ],
        "hidden-until-found-text-fragment.html": [
-        "fe89b407e654a7b7abbb98dcf4edf1a3d8f64721",
+        "b765c07f27728c9d786eea9616cf3e71a681b7a2",
         []
        ],
        "spacer-and-container-ref.html": [
-        "816a6c9a9d800688217a581e7ec0c2164c1f9ec7",
+        "474da70708383ed52e99549b136adfd4a829d0c6",
         []
        ]
       }
      }
     },
+    "embedded-content": {
+     "the-img-element": {
+      "WEB_FEATURES.yml": [
+       "5716baa5def9bd2af6813751aa7a93ffba64c4cd",
+       []
+      ]
+     }
+    },
     "iana": {
      "application-x-www-form-urlencoded": {
       "original-id.json": [
@@ -472559,6 +478424,14 @@
        "80fbe8db6cbfc1f6e478b6c3cc8d2ae3c707c053",
        []
       ]
+     },
+     "stylesheet": {
+      "resources": {
+       "quirk-stylesheet.css.txt": [
+        "d2ae382583192b0284aa44c038811e7254a9386b",
+        []
+       ]
+      }
      }
     },
     "meta": {
@@ -472597,6 +478470,10 @@
        "marquee-min-intrinsic-size-ref.html": [
         "7a79361fc399301161400ef4ba75c876369329f7",
         []
+       ],
+       "marquee-with-trusted-types-ref.html": [
+        "5042557212e58741859ad6750543540cff563493",
+        []
        ]
       }
      }
@@ -472785,7 +478662,7 @@
         []
        ],
        "table-background-print-ref.html": [
-        "3aa0abd3207469be60d54475e92b4f882f69dcdc",
+        "a386cbb7e324642e3dbeb86e68363a9e545642de",
         []
        ],
        "table-border-1-ref.html": [
@@ -472853,7 +478730,7 @@
         []
        ],
        "table-row-pagination-001-print-ref.html": [
-        "2aa94109ad6db97080b978572e44e14f9d0ed52d",
+        "b78f9d3bf8a839c7b4685bbcb5fdf53573199b3e",
         []
        ],
        "table-row-pagination-002-print-ref.html": [
@@ -473246,6 +479123,10 @@
        ]
       },
       "the-option-element": {
+       "option-label-whitespace-2-ref.html": [
+        "b0567c2b4e33f48efe31b62620f243b0089f0589",
+        []
+       ],
        "option-label-whitespace-ref.html": [
         "acb4f9ee2478898eb648c00ea6b9f6ed0e71c7a7",
         []
@@ -473328,6 +479209,10 @@
       "body-bgcolor-attribute-change-ref.html": [
        "43f0c6dd200187fcb294e7691438c4a166e6469d",
        []
+      ],
+      "pre-margin-block-ref.html": [
+       "b66f6980cec1a96c86e6df4d6957f007fa1b2a9f",
+       []
       ]
      },
      "the-details-element": {
@@ -473381,7 +479266,7 @@
       ],
       "resources": {
        "auto-expand-details-text-fragment.html": [
-        "b95459fe5c03a91e0baa2ab8f4b1b0503a059e46",
+        "102e4aebd958c3bc8e9669551329054170d4aa2a",
         []
        ]
       },
@@ -473579,6 +479464,10 @@
     },
     "scripting": {
      "the-script-element": {
+      "WEB_FEATURES.yml": [
+       "864bd3398ee21fb62665a2d5c259a52acdd04232",
+       []
+      ],
       "resources": {
        "script.js": [
         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
@@ -474783,7 +480672,7 @@
         ]
        },
        "responsive-image-select-print-ref.html": [
-        "7189a57642701ebf616ee1f598c4ce96cd56603d",
+        "e6d50908706c177ee4a1a9322d22b1fa95ad87f0",
         []
        ],
        "sizes": {
@@ -475074,6 +480963,10 @@
         "675ba509144515a44e06f39dd1ac727b4a2d2bc6",
         []
        ],
+       "date-time-with-trusted-types-ref.html": [
+        "8cea76c7f0e17e42be07582d478a3f536b193c9b",
+        []
+       ],
        "hidden-charset-case-sensitive-child.html": [
         "92c9981a1123454af8462cea7840a099721109a0",
         []
@@ -475231,7 +481124,7 @@
           []
          ],
          "customizable-select-styles.css": [
-          "13a500a6197955a4bceebf0382ddc41feaf09b46",
+          "acf84493d5cff7e7f1b4c7e0c97c00f566e854c5",
           []
          ],
          "customizable-select-utils.js": [
@@ -475331,6 +481224,10 @@
          "d09f9bc42166908f9161911ea8bcd9d7124284af",
          []
         ],
+        "select-appearance-sizing-in-flex-ref.html": [
+         "66b27ea686ef28c853f53a27aa001237b7420813",
+         []
+        ],
         "select-appearance-switching-invalidation-ref.html": [
          "293653055558e212f9c8cd242b1a571037be9b6b",
          []
@@ -475355,10 +481252,6 @@
          "b351c80c273940c8422db8f66da959fb36e962cb",
          []
         ],
-        "select-multiple-base-appearance-ref.html": [
-         "45a74da7559c72ee5840c00842aef4fc23915e0e",
-         []
-        ],
         "select-only-picker-opt-in-ref.html": [
          "67a0abe43f2d1aad0b1d82da8b8cdfc77a25b549",
          []
@@ -475396,6 +481289,22 @@
          []
         ]
        },
+       "customizable-select-in-page": {
+        "customizable-select-in-page-appearance-ref.html": [
+         "57ea51e367cfad284ed80e71870698dfed0b26e4",
+         []
+        ],
+        "resources": {
+         "customizable-select-in-page.css": [
+          "deb080b4756cf51d2ece9d2b132e9fff6ccd6f7c",
+          []
+         ],
+         "customizable-select-in-page.js": [
+          "1323094332135c46297a1df5c9fed1922efe8f4a",
+          []
+         ]
+        }
+       },
        "reset-algorithm-rendering-ref.html": [
         "acf192d1d55b7da110d04651093e3ebe0cd48214",
         []
@@ -475864,35 +481773,39 @@
      },
      "permission-element": {
       "bounded-css-properties-reftest-ref.html": [
-       "c62ff5b24d66b2cc8499f7dfe891f307c7a186f3",
+       "2fb0c1f4e951cc09468238a94272d10aef61ce4c",
        []
       ],
       "bounded-sizes-reftest-ref.html": [
-       "c0782ce9cd51bfadd694ed8b28ea70128dd3c45b",
+       "462f346edf591e8fa76b52191f00bc2bbe3bbfcc",
        []
       ],
       "display-css-property-reftest-ref.html": [
-       "6a04c94c037ae5f6fe0d7fd4b2dcf7671eef7a4e",
+       "aa5ffe07a952744499c81039072e49f0a8ea59d4",
+       []
+      ],
+      "invalid-type-reftest-ref.html": [
+       "359872ea61358720c36fe2f0de282009b49f88ac",
        []
       ],
       "large-min-size-reftest-ref.html": [
-       "6c0b7a73f0c037e15121bbcec11d4750c6d80842",
+       "8b48bb93febed1c7fd88f62fe747b3379b349e22",
        []
       ],
       "pseudo-elements-in-div-ref.html": [
-       "38d0cc25a525ddd6d2d8253d1ef1e192d60c4866",
+       "8e6267f9aa350333cef620d248dfce40b85b43e2",
        []
       ],
       "pseudo-elements-ref.html": [
-       "ca7ad2daa89a84d868d46c323a72714467604b50",
+       "a9d8d8655957cec3594c466fb1593552598da60f",
        []
       ],
       "quirks-mode-no-height-is-still-bounded-ref.html": [
-       "a97003d82f0372a96b79124fbf0dac967e4675d9",
+       "738dc95f8eba6da8ec11a46c065cccbf94b438bd",
        []
       ],
       "unbounded-width-with-border-reftest-ref.html": [
-       "8219b9a74206e84b92001d6af9f00ebd03fd40b7",
+       "0753b313e8893d8d25bb9ae7aa525408edee7c17",
        []
       ]
      },
@@ -475971,7 +481884,7 @@
         []
        ],
        "popover-utils.js": [
-        "544ec843152cedacc6c6ebb5ecfa14f33fd5b2ff",
+        "7878b125f2f6b1f6d39d1972f7387e8014b6dcf8",
         []
        ]
       }
@@ -477569,22 +483482,22 @@
       },
       "interest-target": {
        "interesttarget-keyboard-invalidation-ref.html": [
-        "76424374fb8cda5ec698e3229eac55570963f3e9",
-        []
-       ],
-       "interesttarget-outline-appearance-ref.html": [
-        "33b0cf668587f182caf87dfb98665a9301fca19a",
+        "9d520943d5f542a2aeb45ac6cb1417eb20c25477",
         []
        ],
        "resources": {
         "invoker-utils.js": [
-         "b89a14ee16c57815ce9fd9ea051612f00407fddc",
+         "bc43e738c34e58f450874d8ccc99e110e07e7800",
          []
         ]
        }
       }
      },
      "the-link-element": {
+      "WEB_FEATURES.yml": [
+       "6a444ee171ad29c442d573fb2131b544820b6cad",
+       []
+      ],
       "resources": {
        "stylesheet.css": [
         "9d9d772fb468756d1a90f72325f89cd372f812ef",
@@ -479340,6 +485253,10 @@
      },
      "system-state-and-capabilities": {
       "the-navigator-object": {
+       "WEB_FEATURES.yml": [
+        "a1af3e21a48f5941a078209963d1ae7bc379dd59",
+        []
+       ],
        "resources": {
         "handler-sw.js": [
          "5fd915d17f98d8fa9c3c81451f46d71bc6cd024e",
@@ -479400,7 +485317,7 @@
    },
    "html-aam": {
     "META.yml": [
-     "212cae7fa52e95b820d11e7ca8e2eed7d36bf112",
+     "bfca09eadfa361255d89f89bee31af839c3dda0d",
      []
     ]
    },
@@ -480101,11 +486018,15 @@
      "infrastructure": {
       "assumptions": {
        "ahem.html.ini": [
-        "8587775d8fc86891605a1509d3062a2c08f56a31",
+        "ada156a59f5f8fd2cedb0d8648c71f2c4fcaa40f",
         []
        ],
        "allowed-to-play.html.ini": [
-        "6891cbe24e3c124a983939f811e23f23b3b52ed7",
+        "17ceac0d26dd2368a1e5383dc71d9cebbac595e4",
+        []
+       ],
+       "canvas-background.html.ini": [
+        "198b67c43cd9ee8ff0eef85ea7c3ee41d0689073",
         []
        ],
        "document-fonts-ready.html.ini": [
@@ -480190,6 +486111,10 @@
          []
         ]
        },
+       "reftest.www.sub.html.ini": [
+        "b6066673120f5622b48397f143f843f032742c04",
+        []
+       ],
        "reftest_fuzzy_ini_full.html.ini": [
         "0ea76527da400b3c4e1c9dbe0ea9b8c837e3eeb9",
         []
@@ -480259,7 +486184,7 @@
         []
        ],
        "testdriver-in-ref.html.ini": [
-        "05850761b1649974c759e90293c576b36521b953",
+        "5dbd6945aa0381f0d56a7d8abc80c72bcd6a2ddb",
         []
        ]
       },
@@ -480363,21 +486288,27 @@
        "bidi": {
         "bluetooth": {
          "handle_request_device_prompt.https.html.ini": [
-          "1a5ac47c67d942a0123f7d7caa91f7088f66a898",
+          "fd44ded394bf81019f54cb929e89eb82ac9eb793",
           []
          ],
          "simulate_adapter.https.html.ini": [
-          "1a5ac47c67d942a0123f7d7caa91f7088f66a898",
+          "feaf5ceae7a8828a6020a0c89730ed0e17a6d4f2",
           []
          ],
          "simulate_preconnected_peripheral.https.html.ini": [
-          "1a5ac47c67d942a0123f7d7caa91f7088f66a898",
+          "b2c823097f63695eb3567355bcd65bea7df2be7b",
+          []
+         ]
+        },
+        "emulation": {
+         "set_geolocation_override.https.html.ini": [
+          "7de34991442711cd389fe324dabd6005605268af",
           []
          ]
         },
         "permissions": {
          "set_permission.https.html.ini": [
-          "1a5ac47c67d942a0123f7d7caa91f7088f66a898",
+          "2101196fa2fe436c3f94c5f84451f1746501c84d",
           []
          ]
         }
@@ -480387,7 +486318,7 @@
         []
        ],
        "file_upload.sub.html.ini": [
-        "8b7c0f25e6a3bc8d92cf4066c68fbaf3f3d1990d",
+        "ce88c728e034a87334b2f9b275fbc31160f32222",
         []
        ],
        "generate_test_report.html.ini": [
@@ -480398,6 +486329,14 @@
         "c733dac7c389f68cdea6d6a94c8884d6075360e9",
         []
        ],
+       "get_all_cookies.sub.https.html.ini": [
+        "ede46b74c64027d7e350664f331c858eeae9a81f",
+        []
+       ],
+       "get_named_cookie.sub.https.html.ini": [
+        "05352bf82a1347bbb966f12fe99a0f30205fc829",
+        []
+       ],
        "minimize_restore_popup.html.ini": [
         "6075b58d09cc51dc5069e446287246df76b1d5e8",
         []
@@ -480424,20 +486363,20 @@
       "webdriver": {
        "bidi": {
         "subscription.html.ini": [
-         "1a5ac47c67d942a0123f7d7caa91f7088f66a898",
+         "2d828266f1083bad6be94d8f7a21cd9f902a7899",
          []
         ],
         "subscription.window.js.ini": [
-         "1a5ac47c67d942a0123f7d7caa91f7088f66a898",
-         []
-        ]
-       },
-       "tests": {
-        "test_load_file.py.ini": [
-         "7e6ef522c9b9544508654f63d12501560625608a",
+         "1acf3eb9819d860cd03139dd257c0b87389a7461",
          []
         ]
        }
+      },
+      "window": {
+       "minimize-1.html.ini": [
+        "2e3ac5190f397acff96227d8b80042b62e1869ae",
+        []
+       ]
       }
      },
      "update_properties.json": [
@@ -480451,7 +486390,7 @@
       []
      ],
      "green.html": [
-      "38167bb58d571e75f54908166c542aca84731aec",
+      "0c9676a7fdc64644e965a657cd5329dee74de6b1",
       []
      ],
      "legacy": {
@@ -480829,10 +486768,6 @@
      "035e1d233d6f5646768b78e878c9db43b84a0068",
      []
     ],
-    "WebCryptoAPI.idl": [
-     "ff7a89cd0d51be01760b9bfdb709393f4db5fd31",
-     []
-    ],
     "accelerometer.idl": [
      "a082224dc88e10e043d86d09cbf981616f6bb9a7",
      []
@@ -481122,7 +487057,7 @@
      []
     ],
     "dom.idl": [
-     "7b4fcb920e2ec67570580b538c13bbaa86985b74",
+     "253e7bf913eba90db9dc6c2e7e7412dda6f2d493",
      []
     ],
     "edit-context.idl": [
@@ -481158,7 +487093,7 @@
      []
     ],
     "fedcm.idl": [
-     "f7038a6fee1063734193f00341de6ceaf5f792b0",
+     "5ce2d260f114ddcc25210905ee010a9b96b47410",
      []
     ],
     "fenced-frame.idl": [
@@ -481242,7 +487177,7 @@
      []
     ],
     "html.idl": [
-     "97fabdf80fa835b0a92ab660f8c8ff3d3eca9db2",
+     "102149c4dfac2aafb10edc8cfe19d5fa4eba354e",
      []
     ],
     "idle-detection.idl": [
@@ -481250,7 +487185,7 @@
      []
     ],
     "image-capture.idl": [
-     "21e03d4db8248d469671d8286be877e3ad7dc7b5",
+     "26cc7fab5cdf1f3209057cf159171961b779dcd5",
      []
     ],
     "image-resource.idl": [
@@ -481298,7 +487233,7 @@
      []
     ],
     "largest-contentful-paint.idl": [
-     "872ba552b0d3b0398be533beb578fdedd260baea",
+     "d1630cc7daae802bf27107ce0ab07185d0746d7f",
      []
     ],
     "layout-instability.idl": [
@@ -481390,7 +487325,7 @@
      []
     ],
     "mediastream-recording.idl": [
-     "496bfcf2e27da7a7da6c653b8e7f27b702f7386f",
+     "68c891cdc918e7468de8add96acce35d6d63102f",
      []
     ],
     "model-element.idl": [
@@ -481494,7 +487429,7 @@
      []
     ],
     "ppa.idl": [
-     "ef3eb360bdf8e99f4276554ab290f85981888798",
+     "3524d503c184019d90e5b2b3bd23151f17192318",
      []
     ],
     "prefer-current-tab.idl": [
@@ -481581,8 +487516,12 @@
      "6f93db15a74e052913a277e5130226280a3f9311",
      []
     ],
+    "scoped-custom-elements-registry.tentative.idl": [
+     "46ca2d6b9c45805d8aa684af7fe91af6dd5d7919",
+     []
+    ],
     "screen-capture.idl": [
-     "45fd0dd72c58e2faaa745409366291eeff51ae24",
+     "db9282ce0a57bb3b84ea45f5ed2d7e69bc3a8a32",
      []
     ],
     "screen-orientation.idl": [
@@ -481602,7 +487541,7 @@
      []
     ],
     "secure-payment-confirmation.idl": [
-     "bec599d7a23512f6e608ccb9930bfbf38df83768",
+     "5b67ca6267839c4c54ba75c55a9da03231642303",
      []
     ],
     "selection-api.idl": [
@@ -481618,7 +487557,7 @@
      []
     ],
     "service-workers.idl": [
-     "d9ff2f651f8235968dd29bd6d7f86e9e8fdcb4cf",
+     "34af3372401eed53328b8bc5e7ea42b87ddd9b20",
      []
     ],
     "shape-detection-api.idl": [
@@ -481630,7 +487569,7 @@
      []
     ],
     "speech-api.idl": [
-     "bc0635fa3f2cc0afeca8db5e3f9ce6d74ad7798c",
+     "0e07b4619a5b80e901f0b8c17a208f9077f9187f",
      []
     ],
     "storage-access.idl": [
@@ -481678,7 +487617,7 @@
      []
     ],
     "turtledove.idl": [
-     "b9f50d47885cf9186c9a2dd3c2d08e1dc4054431",
+     "7f11cdc37908f411280ea6f79eeb759c85acbe62",
      []
     ],
     "ua-client-hints.idl": [
@@ -481766,11 +487705,11 @@
      []
     ],
     "webaudio.idl": [
-     "3b351f4d9e99452f4e81ba401bf283f1c49dd85b",
+     "286aeba40693992ede1cdd233d449fe4f6b59e6c",
      []
     ],
     "webauthn.idl": [
-     "a33c85e7bad86753211fa7aa9270abac18b1e54e",
+     "7fbe55e67652b3fd35079d1a06423bb441657bd5",
      []
     ],
     "webcodecs-aac-codec-registration.idl": [
@@ -481802,13 +487741,17 @@
      []
     ],
     "webcodecs.idl": [
-     "274ef96578a3d16b9fcda6e817c25e12373ec824",
+     "3d4db1ed49d316c31005a5be857ad7d48eca378d",
      []
     ],
     "webcrypto-secure-curves.idl": [
      "01bb290b747827bb4e45ea6d0c8f6146e59b01ee",
      []
     ],
+    "webcrypto.idl": [
+     "ff7a89cd0d51be01760b9bfdb709393f4db5fd31",
+     []
+    ],
     "webdriver.idl": [
      "194e2d806adb2131f7cdc56a70a46d7784cb7d75",
      []
@@ -481822,7 +487765,7 @@
      []
     ],
     "webgpu.idl": [
-     "d91a6a710b102d0d9dae24638b2d5e40c8eaa38a",
+     "4fec46a2557033a941b5da7a7481aa8125696ed2",
      []
     ],
     "webhid.idl": [
@@ -481838,7 +487781,7 @@
      []
     ],
     "webnn.idl": [
-     "8dc3a0ebc14e42a993e3cc3c5c4e494a334be712",
+     "37fcc32501efbeb38c9686a8fc96e1ce062eb30a",
      []
     ],
     "webrtc-encoded-transform.idl": [
@@ -481858,7 +487801,7 @@
      []
     ],
     "webrtc-stats.idl": [
-     "ac820c7c9dcbc23954a12898786a835dc3a8a89c",
+     "1e7a2648bbb4580e86f8908282a408d4daac16d8",
      []
     ],
     "webrtc-svc.idl": [
@@ -481866,7 +487809,7 @@
      []
     ],
     "webrtc.idl": [
-     "174ead6261c6c28eac7bd9dd5a1feb374d521b4d",
+     "4a651551f14dc9e8708b0c64ee6bc0908d80c72c",
      []
     ],
     "websockets.idl": [
@@ -481874,7 +487817,7 @@
      []
     ],
     "webtransport.idl": [
-     "eb456336081972b4989a6c549006708a293ec6b6",
+     "87da2a77303c2198b4c136a7918f5a1e6423933c",
      []
     ],
     "webusb.idl": [
@@ -481894,7 +487837,7 @@
      []
     ],
     "webxr-depth-sensing.idl": [
-     "b77b59c0ce67425d459428721c92d3f548f10048",
+     "7ddbec7cc975dfd1c5be6f05f1a854fffe653e79",
      []
     ],
     "webxr-dom-overlays.idl": [
@@ -481922,11 +487865,11 @@
      []
     ],
     "webxr.idl": [
-     "dea448d744078292c08e620f4651e5ea5140616e",
+     "874994086a250df0f3c0a0eed03375d9429aeaa9",
      []
     ],
     "webxrlayers.idl": [
-     "c8b3a71c699cb641d1b037d2b2c41190fea11bd7",
+     "b99bef707fbd03e7a578215079c5df7714e67168",
      []
     ],
     "window-controls-overlay.idl": [
@@ -481937,6 +487880,10 @@
      "527c41deb6cda2de79780899d15bc43f02b281db",
      []
     ],
+    "writing-assistance-apis.idl": [
+     "916daee754e3ef992ad8fa282882c88dd9aa0734",
+     []
+    ],
     "xhr.idl": [
      "6ff75fd27741369f9671509998a21aeb9de3761a",
      []
@@ -482239,6 +488186,10 @@
      "e11810cc10fa16774924fe8a8080ab5aae161ac7",
      []
     ],
+    "WEB_FEATURES.yml": [
+     "fbd4cc58df949323199f8832a72592f6e00d8b5f",
+     []
+    ],
     "resources": {
      "iframe-stores-entry.html": [
       "cd600254805570deab8447ea843657d7f268b7c5",
@@ -482249,7 +488200,7 @@
       []
      ],
      "largest-contentful-paint-helpers.js": [
-      "a01080c00881d7b66a80886e34367624913e1d6f",
+      "99916f5c5d31110d83c91d4ce346890efb494b12",
       []
      ],
      "lcp-sw-from-cache.js": [
@@ -482331,7 +488282,7 @@
     ]
    },
    "lint.ignore": [
-    "65e22dccbc1d9cce01a6c570fe739e68d112df3e",
+    "955e5df49077cab63e762988714e1319d551089d",
     []
    ],
    "loading": {
@@ -483484,7 +489435,7 @@
        []
       ],
       "lengths-1-ref.html": [
-       "9fca6f49632ca080ee1b2a32a9ce2d251241dfcc",
+       "74c1397ce62593293b1444dfd52c959856a9060e",
        []
       ],
       "mathbackground-001-notref.html": [
@@ -483802,12 +489753,16 @@
       "7640c4f789cc0248f450b2491b70da3510167c1f",
       []
      ],
+     "css-units.py": [
+      "cdf06bb77445c9b8fd2c2464d9725513b4eb3e35",
+      []
+     ],
      "fractions.py": [
       "bd39fc2fdbede519138e577269c6aacf802b303e",
       []
      ],
      "largeop.py": [
-      "9832ff0039c938ee8ad9cc8983211942b29acc5a",
+      "625157519483e1bd8100360c51d3097f70e919fc",
       []
      ],
      "limits.py": [
@@ -484272,7 +490227,7 @@
      []
     ],
     "mediasource-util.js": [
-     "0bbb6a7386393f9c72e1a353e1db83f3cce0a99e",
+     "00105238e6bf3e37b3acccc1f78db21809b07fac",
      []
     ],
     "mp3": {
@@ -484295,7 +490250,7 @@
       []
      ],
      "test-a-128k-44100Hz-1ch-manifest.json": [
-      "f3caa460e9f078278680c6cdb9e1ce914a8c59ae",
+      "9e448d16f0a9625f03689db4e4427b140e88e28f",
       []
      ],
      "test-a-128k-44100Hz-1ch.mp4": [
@@ -484303,7 +490258,7 @@
       []
      ],
      "test-a-192k-44100Hz-1ch-manifest.json": [
-      "41a6f339b79180ba8e811f1c899c0a3cc14f4452",
+      "1cfeddb8d7db6a9471c85f963b82dcaecdee5787",
       []
      ],
      "test-a-192k-44100Hz-1ch.mp4": [
@@ -484311,7 +490266,7 @@
       []
      ],
      "test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json": [
-      "7731e3170e5ca52347eff3def8e5409f121b8ace",
+      "642eae99f22154c85df6e402d634d999b9b7ba93",
       []
      ],
      "test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.mp4": [
@@ -484319,7 +490274,7 @@
       []
      ],
      "test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json": [
-      "78ded611f682d52e78184a7cbce47f3b102aa7d0",
+      "6d7d53878d5d7d8f62736d2edc08c312bf181f77",
       []
      ],
      "test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.mp4": [
@@ -484327,7 +490282,7 @@
       []
      ],
      "test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json": [
-      "ba46349f93ed218d970f3efa8b3e748c016dc70b",
+      "7b2972b7e04db329c1cfe28c263b2d004cd9d648",
       []
      ],
      "test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.mp4": [
@@ -484335,7 +490290,7 @@
       []
      ],
      "test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json": [
-      "24da9b4ce3f738c3462be244ee69f41c2e4c2175",
+      "c04d4d895fb94ed98421b5366d1ee4957b1dd77a",
       []
      ],
      "test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.mp4": [
@@ -484351,7 +490306,7 @@
       []
      ],
      "test-v-128k-320x240-24fps-8kfr-manifest.json": [
-      "a31b6d0245ba5de8a59dcdf795ba2ab008647ef4",
+      "1fd4d41601762287832c221ea45559e0ac093f6a",
       []
      ],
      "test-v-128k-320x240-24fps-8kfr.mp4": [
@@ -484359,7 +490314,7 @@
       []
      ],
      "test-v-128k-320x240-30fps-10kfr-manifest.json": [
-      "3e02844105baa629bf438e1a6e9c1cc62ed978b6",
+      "14eef16f6a68f3c2c2c3fd260c5d0da20138400f",
       []
      ],
      "test-v-128k-320x240-30fps-10kfr.mp4": [
@@ -484367,7 +490322,7 @@
       []
      ],
      "test-v-128k-640x480-30fps-10kfr-manifest.json": [
-      "10c4f4bcbdfccae8e5a386831e912867917cc04c",
+      "75351790503915b3513e92140415cc1861094dab",
       []
      ],
      "test-v-128k-640x480-30fps-10kfr.mp4": [
@@ -484375,7 +490330,7 @@
       []
      ],
      "test-v-256k-320x240-30fps-10kfr-manifest.json": [
-      "42d3e1e524ec7f91fd24cfe08d19fe58095356ac",
+      "5143782ba69d95d80af35d221a609ad666a5afa1",
       []
      ],
      "test-v-256k-320x240-30fps-10kfr.mp4": [
@@ -484405,7 +490360,7 @@
       []
      ],
      "test-a-128k-44100Hz-1ch-manifest.json": [
-      "524da8149fe6d36c891501d059f85621f06cde36",
+      "8c70ccde4bb8208d6a19c661080f93b1d80ee3b6",
       []
      ],
      "test-a-128k-44100Hz-1ch.webm": [
@@ -484413,7 +490368,7 @@
       []
      ],
      "test-a-192k-44100Hz-1ch-manifest.json": [
-      "7f2fa1e8c335df16f16c49109088b9a9148c5335",
+      "1b09316e49257036b8015830a9b85fecad527e2a",
       []
      ],
      "test-a-192k-44100Hz-1ch.webm": [
@@ -484421,7 +490376,7 @@
       []
      ],
      "test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json": [
-      "af9f07af15db8acb08fec6967a6c92efb62be57e",
+      "3aa25b78f8b93c075bc36d7c5a0f5f0cd27c6399",
       []
      ],
      "test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.webm": [
@@ -484429,7 +490384,7 @@
       []
      ],
      "test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json": [
-      "f7ec86b3db9277878705fd1708ec7aeba71d0887",
+      "58d9fb0e2480554f78419fbfc0b5aa65f0f23c62",
       []
      ],
      "test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.webm": [
@@ -484437,7 +490392,7 @@
       []
      ],
      "test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json": [
-      "96a59db586ed59bbb308cf4968c9de9907193a73",
+      "43aa1b8755dff33064a80b9e9c316d313d3ade62",
       []
      ],
      "test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.webm": [
@@ -484445,7 +490400,7 @@
       []
      ],
      "test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json": [
-      "86723b34a819cf7d3a469abca2ad60ea15a9bf36",
+      "9b0b98c2051e3d7e4817c66d08a6b54717696bb5",
       []
      ],
      "test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.webm": [
@@ -484453,7 +490408,7 @@
       []
      ],
      "test-v-128k-320x240-24fps-8kfr-manifest.json": [
-      "00e103aca9b66d8c6e14a8eeb0fd7888302069f3",
+      "abc3026c158f8ac3c5eb23c1ffeec89d9281461a",
       []
      ],
      "test-v-128k-320x240-24fps-8kfr.webm": [
@@ -484461,7 +490416,7 @@
       []
      ],
      "test-v-128k-320x240-30fps-10kfr-manifest.json": [
-      "fdeeb401d969115e5d3fe178e39d090c7c766496",
+      "8b52e095c293a441fe97e94a13b5683078b7683b",
       []
      ],
      "test-v-128k-320x240-30fps-10kfr.webm": [
@@ -484469,7 +490424,7 @@
       []
      ],
      "test-v-128k-640x480-30fps-10kfr-manifest.json": [
-      "4e304606678160ff875a41f99790be8cba8e7524",
+      "12926ceb8f0b8045dbe7411685d64315702f5ec9",
       []
      ],
      "test-v-128k-640x480-30fps-10kfr.webm": [
@@ -484477,7 +490432,7 @@
       []
      ],
      "test-v-256k-320x240-30fps-10kfr-manifest.json": [
-      "3470674bff5d75daa972e472fb2219287408183d",
+      "7a437e5f84c0653d43599d8581eebcdbced898c2",
       []
      ],
      "test-v-256k-320x240-30fps-10kfr.webm": [
@@ -484548,7 +490503,7 @@
    },
    "mediacapture-record": {
     "META.yml": [
-     "d59e5e30845eaef12bab6419e348a01779313c56",
+     "6a5b5839b61443a25ff642b0d9bb3ce77b9e4427",
      []
     ],
     "support": {
@@ -484634,7 +490589,11 @@
       "5a2fbb151d9b4eec6f6dc16fc12d8708e01e25d9",
       []
      ]
-    }
+    },
+    "media-session-artwork-fetch-service-worker.js": [
+     "e62b9b4486257d5ae9d4e321bad1e5cc91b14d48",
+     []
+    ]
    },
    "merchant-validation": {
     "META.yml": [
@@ -485060,7 +491019,7 @@
    },
    "nav-tracking-mitigations": {
     "META.yml": [
-     "00a8c7b72a17b91a7438358ff7d311516544d36f",
+     "9e7ffe47ba90b4a60c96648861fb60f2e80e46b7",
      []
     ],
     "resources": {
@@ -485103,14 +491062,6 @@
      "3516e9555e60a6cb1b038d978eb7b36a8f34d79a",
      []
     ],
-    "commit-behavior": {
-     "resources": {
-      "after-transition-commit-helpers.js": [
-       "2be6a03bac8d6a4526e36d70f1b7a7a9d4badc3b",
-       []
-      ]
-     }
-    },
     "focus-reset": {
      "resources": {
       "helpers.mjs": [
@@ -485246,7 +491197,7 @@
      ],
      "resources": {
       "helpers.mjs": [
-       "341befc10565d0759fd517258b2a6883fe6d564a",
+       "22752e4cfed7baaf26afc52db6569feb1af07e2a",
        []
       ],
       "notify-top-early.html": [
@@ -485255,6 +491206,14 @@
       ]
      }
     },
+    "precommit-handler": {
+     "resources": {
+      "precommitHandler-helpers.js": [
+       "1338617681feb373a47052a7f605f44d3eca2a16",
+       []
+      ]
+     }
+    },
     "state": {
      "resources": {
       "helpers.js": [
@@ -485657,7 +491616,7 @@
       []
      ],
      "utils.js": [
-      "ed58c957c97132276bb813603e1d25133cf0d860",
+      "41c76d6826658c0f73301f70ef0ae08cf84572e4",
       []
      ]
     }
@@ -486364,6 +492323,10 @@
       "56780cf6dc05879731bff0bbb1486c51b0b4141b",
       []
      ],
+     "digital-credentials-create.html": [
+      "aafd436282e8b740c713aaeeb6d28c0ab60cc324",
+      []
+     ],
      "digital-credentials-get.html": [
       "543417f230a59b3d09705b20775a38cbabaf7a22",
       []
@@ -486614,7 +492577,7 @@
        []
       ],
       "source.html": [
-       "cca7063cff44792e7720d431b159a7a6ab798af4",
+       "56c34fc88148777cfffcb5aa198dafd08046059d",
        []
       ]
      },
@@ -488815,6 +494778,10 @@
      "da9bbc387f41ab069c27edc055962f72036b96f2",
      []
     ],
+    "WEB_FEATURES.yml": [
+     "f59321971a7668545949ee3212e54420e424c7ae",
+     []
+    ],
     "prepare-device.js": [
      "a12dbaf28717cf3776d9e34f5a12e4adaa7bae18",
      []
@@ -488923,7 +494890,7 @@
       []
      ],
      "report-helper.js": [
-      "5b5438903de11c346ac3901a9de81a96e4446386",
+      "216da22eae8c0ccde223c70a110a7a892676c14f",
       []
      ],
      "report.py": [
@@ -488958,6 +494925,10 @@
      []
     ],
     "resources": {
+     "child.html": [
+      "4d6895125a2acaad00cc2bc849e026a2632dd88e",
+      []
+     ],
      "post_name_on_load.html": [
       "4679a6e6ec73ea4c2dae646b0f027dd7f2ce6823",
       []
@@ -489631,7 +495602,7 @@
       []
      ],
      "webxr-test.js": [
-      "15d015debb12089d7bf8972a9393859ccad75aa8",
+      "ce2503b1bbcfbd5c4318c08b49020e9453c4b3a6",
       []
      ],
      "webxr-test.js.headers": [
@@ -489665,7 +495636,7 @@
       []
      ],
      "conftest.py": [
-      "723087d31841b831b598edcd2cf7bc7cf290f495",
+      "1301e7a9f7701d40390ad19d9439d7d95bfc9ebc",
       []
      ],
      "harness.html": [
@@ -489735,7 +495706,7 @@
         []
        ],
        "api-tests-1.html": [
-        "9de875b0f127776e0d60df68075402d32c195749",
+        "6ec396c221b98f282b46a366e99a76bd9daef492",
         []
        ],
        "api-tests-2.html": [
@@ -490120,7 +496091,7 @@
      []
     ],
     "testdriver.js": [
-     "05301bf55895eef71dc7e949871388f8f9cd7a49",
+     "992b9e3ab2ce0b63b94be2a5aa671b321f65e334",
      []
     ],
     "testdriver.js.headers": [
@@ -490140,7 +496111,7 @@
      []
     ],
     "testharness.js": [
-     "bd668be20f87c8ac8f802f556a2b0d4813b60bd7",
+     "6ccede34483b227cc41fcb15235e56aa60d4022e",
      []
     ],
     "testharness.js.headers": [
@@ -490190,15 +496161,15 @@
      []
     ],
     "sethtml-safety.sub.dat": [
-     "6969835d66d7142625ebf19dfddaa01baaeeef38",
+     "314d5ac37b135f9303a76ad84bce5d8065524140",
      []
     ],
     "sethtml-tree-construction.sub.dat": [
-     "47cc159df1fbf8066da5392311ce36a481ef1c83",
+     "cfbc74d11284c2b708830cf7291cb443f122ac29",
      []
     ],
     "sethtml-unsafety.sub.dat": [
-     "bc162c04e5f7dee88414c2f8cb1794ed58c7e5b7",
+     "3b132a254cac94b46679e80bf9623819ec7ae7f2",
      []
     ],
     "support": {
@@ -490279,7 +496250,7 @@
       []
      ],
      "sandboxed-iframe-locking.html": [
-      "436c67f5b53b1f88ef1537072be3b0011724d7b3",
+      "f4773535dbc3d21319f8dd7a398ff7731d19a240",
       []
      ]
     }
@@ -490321,6 +496292,22 @@
      "adf4bf2ac173e8bff0978fa19b24e535f4229c2e",
      []
     ],
+    "animation-trigger": {
+     "animation-trigger-fill-mode-both-ref.html": [
+      "62b74fb778f1acb5e481ad8135b9b34a06a69d24",
+      []
+     ],
+     "animation-trigger-fill-mode-none-ref.html": [
+      "229a31dec909a69aad6e7d86d4d009948db2df74",
+      []
+     ],
+     "support": {
+      "support.js": [
+       "f5aa18e82f19f7fa56b2853e2c46b21342b7d970",
+       []
+      ]
+     }
+    },
     "css": {
      "animation-fill-outside-range-ref.html": [
       "998576b3a4f2257006232506ee32306bc716895c",
@@ -490344,7 +496331,7 @@
      ],
      "printing": {
       "scroll-timeline-default-print-ref.html": [
-       "6610f7a5a7e503c2deab83a7cde3979222898abc",
+       "fa8371a5f1ef1b83e4cc5e64af6722ec6d17a574",
        []
       ],
       "scroll-timeline-specified-scroller-ref.html": [
@@ -490357,7 +496344,7 @@
       []
      ],
      "scroll-timeline-default-iframe-ref.html": [
-      "1ab5646c8bddbec83b29c3d335b0e33fb1a3465c",
+      "e1c48f67ec85314287a52286ed060849e7fdeced",
       []
      ],
      "scroll-timeline-default-ref.html": [
@@ -491883,6 +497870,14 @@
        "307f7f9ac6ea8a4ffd97b4f781932d65137de32f",
        []
       ],
+      "client-url-creation-url-iframe.html": [
+       "db2b9e5bbd91d9a3ce606d7e6dac8e466c986e87",
+       []
+      ],
+      "client-url-creation-url-sw.js": [
+       "013d9be4caeb29bd428a7e9bd37d728a95a9346c",
+       []
+      ],
       "client-url-of-blob-url-worker.html": [
        "00f6acede8eb4fafbbf6a248c75db84dba3efc40",
        []
@@ -493262,7 +499257,7 @@
        []
       ],
       "testharness-helpers.js": [
-       "b1a5b960e0656ac36e553c70965aebf7b8344c97",
+       "5f93a25438a0cbf067675d4715e695388dc6c7bc",
        []
       ],
       "trickle.py": [
@@ -493448,12 +499443,12 @@
      []
     ],
     "WEB_FEATURES.yml": [
-     "dcb21f387167f46062bc66d2bf5d0f3fc8c58417",
+     "9bdf694256ba93268d6ee24cf249bf4bb25e92f0",
      []
     ],
     "declarative": {
      "WEB_FEATURES.yml": [
-      "4e31ed49627c40f145e87e867d5c0395a72783f3",
+      "e5a15eb02317e21cba571ca1793e635e93922a54",
       []
      ],
      "support": {
@@ -493510,7 +499505,13 @@
       "README.md": [
        "5c43d245d8a9474f7af4e75ebce9a0a54543cfb0",
        []
-      ]
+      ],
+      "resources": {
+       "property-reflection-helper.js": [
+        "88b7f743831acbfd41ed4ae6a782733bde9875a6",
+        []
+       ]
+      }
      }
     },
     "resources": {
@@ -494349,7 +500350,7 @@
       []
      ],
      "soft-navigation-helper.js": [
-      "d405adb4e7eb7690fe73f31db523d357a38734ee",
+      "a29978c8760495ffccbd6fc56d62f4625d89334d",
       []
      ]
     }
@@ -494380,19 +500381,11 @@
      },
      "resources": {
       "authenticate.py": [
-       "8820781709d30f11cb842f54d8e25d1ed24a4a8e",
+       "b2ca9c450e07278f654a54c868d42c90520451c1",
        []
       ],
       "basic-service-worker.js": [
-       "07beb37d660ed465e6eef57131f3d140cefbb27a",
-       []
-      ],
-      "cacheable-executor.sub.html": [
-       "ba1b3acb0c1198284c74c345b3de5c6d98fc2421",
-       []
-      ],
-      "cacheable-executor.sub.html.headers": [
-       "0ee6ec2ab103e45685829452b0b50b3ac8e3f343",
+       "59d7d8bae9ee4d46d8a0bb12bcc3377d041280f4",
        []
       ],
       "conditional-status.py": [
@@ -494400,15 +500393,15 @@
        []
       ],
       "cookies.py": [
-       "304f999570b22f432681f93c17db4d06d439ad5b",
+       "1b56c674c0b6643ab1485500276582805ac8ec62",
        []
       ],
       "counting-executor.py": [
-       "cbcbc8eccb9bd8cf536c56cf576a4b5ea73ca44a",
+       "3511fe4905e2d8962175f0e4bc318a13c41c35f5",
        []
       ],
       "executor.sub.html": [
-       "24fef916bb318fba6845f2a8485bffbb91f47981",
+       "975a3e5092ed149b687f34ba6b9c6d5af11432ea",
        []
       ],
       "executor.sub.html.headers": [
@@ -494420,7 +500413,7 @@
        []
       ],
       "prefetch_nvs_hint.py": [
-       "d912eff90a5b9cc7f726a2a9c9d5da7eb4103fa6",
+       "f4ecb004bc1d6ec9e1eaa3199cd6d0bc54734afd",
        []
       ],
       "random_redirect.py": [
@@ -494443,8 +500436,12 @@
        "dd8a9631b4e8d25e0f3a4258806b909b07e682d7",
        []
       ],
+      "util.py": [
+       "1ef6778badf0078af48e06b8ff1b289c8eb5935e",
+       []
+      ],
       "utils.sub.js": [
-       "0ab3f1ac3419a4ac8653ddef199d82e238b333da",
+       "d4efc2dc7dce21e1da25842aceda4c3fc50227da",
        []
       ]
      },
@@ -494739,6 +500736,14 @@
        "8cfe09a41fe2ac32e734073329681bb74962eb03",
        []
       ],
+      "protocol-handler-service-worker.js": [
+       "cb6142db0e3c4b00fecfde154b77f06a3517ef9d",
+       []
+      ],
+      "protocol-handler.html": [
+       "210b23aae21a5ab25d48262b9f0bd31f489a7de8",
+       []
+      ],
       "push.https.html": [
        "30eb563ab75532d47dfc5706b81686059d19a8a0",
        []
@@ -494815,8 +500820,12 @@
        "06688e3bd4cf6e8d251ef694ffba40b8dab95248",
        []
       ],
+      "shared-storage-worklet.js": [
+       "22dfc5377011977259c6cc4fcb0a406708c69fef",
+       []
+      ],
       "shared-storage.https.html": [
-       "53edf109698d013e21c001525e00a74e9a3a5350",
+       "bf316658141bd33153669284e5e7470718f1b92f",
        []
       ],
       "shared-worker.py": [
@@ -494910,6 +500919,18 @@
       "cb72f4468132896689de081ce45a1da97b48923d",
       []
      ]
+    },
+    "speculation-tags": {
+     "README": [
+      "b69880c01c2e17bb42dad1168365a386ff46d51e",
+      []
+     ],
+     "resources": {
+      "speculation-tags-utils.js": [
+       "17f36f1f7c42aabbe6f9970b33761a7634bbf3e7",
+       []
+      ]
+     }
     }
    },
    "speech-api": {
@@ -495004,6 +501025,10 @@
       "c3c5b6c0b073d0c0c15bfb6d78ef2335bd228034",
       []
      ],
+     "blob-url-creation.html": [
+      "fe3e169b5c4620ea8abbfb45964f7d36e08b785e",
+      []
+     ],
      "echo-cookie-header.py": [
       "0d84b0edd183c8bd0850c917010f3362fd8b69f6",
       []
@@ -495052,6 +501077,10 @@
       "6909fd896ede888ec664f6414e993ce4aeba9eaa",
       []
      ],
+     "iframe-creation.sub.html": [
+      "2927866bdf15755158e7a0a29c2463ff28c55575",
+      []
+     ],
      "nested-handle-storage-access-headers.py": [
       "db0bf34357382e15d99e7a9045437be214a58064",
       []
@@ -495109,11 +501138,11 @@
       []
      ],
      "storage-access-beyond-cookies-iframe-iframe.html": [
-      "44ac9cd8986067b611196836210511b07bbb2a61",
+      "09eef3fe52fbb3d2370a6f9e631057eb4e39460b",
       []
      ],
      "storage-access-beyond-cookies-iframe.sub.html": [
-      "7d43a06bc7eeb942c498f52856eb7e50b37b26b0",
+      "2e10d1cae157bbef7e7ca5a181335dca4152e39b",
       []
      ]
     }
@@ -495127,8 +501156,32 @@
      "9ab6e1284ad50d2982ea1f6fc78d7a519e796460",
      []
     ],
+    "WEB_FEATURES.yml": [
+     "d10bbe4a7d7012c197805bc997044989779d23ea",
+     []
+    ],
+    "piping": {
+     "WEB_FEATURES.yml": [
+      "8cf3517baf08a4611d43a4b0c8d1763835ef19fa",
+      []
+     ]
+    },
+    "readable-byte-streams": {
+     "WEB_FEATURES.yml": [
+      "a35508fc0dc65d5fcbf785289c5bd05674de7b32",
+      []
+     ]
+    },
     "readable-streams": {
+     "WEB_FEATURES.yml": [
+      "ad2cb549631fd2b1ab480db217c345d79998c215",
+      []
+     ],
      "crashtests": {
+      "WEB_FEATURES.yml": [
+       "b5dbd1ff4199707f1ef59f40a7f5194ec8e5fa4a",
+       []
+      ],
       "empty.js": [
        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
        []
@@ -495158,6 +501211,10 @@
      ]
     },
     "transferable": {
+     "WEB_FEATURES.yml": [
+      "4ecacf5edbc7daca0cc2f94e71c3b8daf8ee52d4",
+      []
+     ],
      "resources": {
       "create-wasm-module.js": [
        "37064af95c55c00e27d5f73b8fc3b0603ac63077",
@@ -495204,6 +501261,18 @@
        []
       ]
      }
+    },
+    "transform-streams": {
+     "WEB_FEATURES.yml": [
+      "f39dc16de4c73144c772133264f2691855fa2e4e",
+      []
+     ]
+    },
+    "writable-streams": {
+     "WEB_FEATURES.yml": [
+      "8cf3517baf08a4611d43a4b0c8d1763835ef19fa",
+      []
+     ]
     }
    },
    "subapps": {
@@ -495266,7 +501335,7 @@
      ],
      "tentative": {
       "helper.js": [
-       "e5e00ec7b5318d5bbe5c8542458e61b4105c5c93",
+       "c5b7de607470780a4b38a3c557452f6639bb2c38",
        []
       ]
      }
@@ -495308,14 +501377,6 @@
      []
     ],
     "animations": {
-     "reftests": {
-      "reference": {
-       "green-100x100.svg": [
-        "120941444a4898197d6b6001f9908a6cd48b62ba",
-        []
-       ]
-      }
-     },
      "support": {
       "animated-path-helpers.js": [
        "8fd4492265c2eb8aa00fb173bd8d625f119adaac",
@@ -495345,7 +501406,11 @@
        "93f801a4f8da06b61f497ea8152de59646e57b72",
        []
       ]
-     }
+     },
+     "viewBox-synthesized-in-img-001-ref.html": [
+      "306b4f6b1910f62cc34406e76c7720584adf6d5e",
+      []
+     ]
     },
     "crashtests": {
      "support": {
@@ -495356,6 +501421,10 @@
      }
     },
     "embedded": {
+     "WEB_FEATURES.yml": [
+      "8482e555584bf205a6afa11836b35d046976e0df",
+      []
+     ],
      "image-embedding-svg-with-near-integral-width-ref.html": [
       "655d982b16ce0582f6b83e26844b2a6e2437b17b",
       []
@@ -495364,6 +501433,24 @@
       "green-rect-100x100.svg": [
        "120941444a4898197d6b6001f9908a6cd48b62ba",
        []
+      ],
+      "image-with-nested-rects.html": [
+       "a9aa379d1aa1bb8a700696e61b4424551c1f8779",
+       []
+      ]
+     },
+     "support": {
+      "external-with-data-url.svg": [
+       "e5f707c79809cfcc2eabc3361b291cdae8114ad0",
+       []
+      ],
+      "image-with-nested-data-url-images.svg": [
+       "fee329360118b4de83393018225d7e03231b5a7b",
+       []
+      ],
+      "image-with-nested-rects.svg": [
+       "571ff921f13cce75d6fbf2b0c206f823a748ebb7",
+       []
       ]
      }
     },
@@ -495429,10 +501516,18 @@
     },
     "geometry": {
      "reftests": {
+      "circle-calc-dynamic-viewport-ref.html": [
+       "dfd1f609496d760807e93b4c6e4e90d6f3a383b6",
+       []
+      ],
       "circle-ref.svg": [
        "36ccde7fce5f82093b4930f314f3a2558a5518f9",
        []
       ],
+      "ellipse-calc-dynamic-viewport-ref.html": [
+       "70576349bc034b9fc255061400218649f1e4103e",
+       []
+      ],
       "ellipse-ref.svg": [
        "57e6f4d5e854cd1672f987d5f639bcb1e6186d5e",
        []
@@ -495441,6 +501536,10 @@
        "09fd10f287ba2f0b51f91048ff416d8e03ead34d",
        []
       ],
+      "rect-calc-dynamic-viewport-ref.html": [
+       "84971d4b811c2eb0b0d6d0f8446e326676bae775",
+       []
+      ],
       "rect-ref.svg": [
        "ddfd51eed1f2403e2c6a964cee6a307c0d3838fb",
        []
@@ -495775,6 +501874,10 @@
       []
      ],
      "reftests": {
+      "WEB_FEATURES.yml": [
+       "123f8c0419ae837dc8122c8c91198305a6852acf",
+       []
+      ],
       "display-none-mask-ref.html": [
        "3739265b23d22e39f2e2acdc90d94c583b36f4f9",
        []
@@ -495916,6 +502019,10 @@
       "0d760d18dce03df5917086ccb0253a8ced421e36",
       []
      ],
+     "svg-percent-stroke-width-viewbox-update-ref.html": [
+      "6e7c2b23af64a07229297eb728b489cbf467c943",
+      []
+     ],
      "svg-with-outline-ref.html": [
       "6729a2595bf569a310d0b534f4d2d44b1b54af48",
       []
@@ -496027,6 +502134,12 @@
         []
        ]
       }
+     },
+     "reftests": {
+      "path-zoom-ref.html": [
+       "4b09749e2c2bfad2f7c7323b077836e014b5e620",
+       []
+      ]
      }
     },
     "pservers": {
@@ -496150,6 +502263,10 @@
      }
     },
     "scripted": {
+     "WEB_FEATURES.yml": [
+      "864bd3398ee21fb62665a2d5c259a52acdd04232",
+      []
+     ],
      "script-style-attribute-csp-ref.html": [
       "a7316213f13a57fa1c3ab5c058bc9d21f14d5055",
       []
@@ -496251,6 +502368,22 @@
        "green-100x100.svg": [
         "120941444a4898197d6b6001f9908a6cd48b62ba",
         []
+       ],
+       "inner-svg-rotate-transform-ref.svg": [
+        "6c09ab219c6b871d9812320dcedcdc2814d48131",
+        []
+       ],
+       "inner-svg-transform-and-viewbox-ref.svg": [
+        "b6d245fd4da176f5180dc10854b38b3aea5bb161",
+        []
+       ],
+       "inner-svg-transform-ref.svg": [
+        "c717788d91a82d3bae02ebdd0ae9fcd94ec09d04",
+        []
+       ],
+       "outer-svg-transform-ref.svg": [
+        "55a74fe29d2c4e7e2ba11faf0af6865fdcd6ee9f",
+        []
        ]
       },
       "support": {
@@ -496294,6 +502427,10 @@
         "1eb11bfbfb4271442c83a99e81a8a44ad8c1d1da",
         []
        ],
+       "sprites-without-id.svg": [
+        "120941444a4898197d6b6001f9908a6cd48b62ba",
+        []
+       ],
        "sprites.svg": [
         "f73b8851913f402aa41adac40360b15acbad1119",
         []
@@ -496590,7 +502727,7 @@
    },
    "svg-aam": {
     "META.yml": [
-     "b0a59c18030bd44644bde1df16b0c08e74ff6abd",
+     "c55d09e15c2ee6917e46e66135c1d977d4128ec3",
      []
     ]
    },
@@ -496633,11 +502770,11 @@
       []
      ],
      "cacert.key": [
-      "dd47af3f939c7dd3479810a82670c4c3f3cd212e",
+      "26e5b3577da799fdeb8fdd5b7d645fcf1925d40a",
       []
      ],
      "cacert.pem": [
-      "7b3fb3da14d0d228bfc83a58affd11b535ab0b69",
+      "18255d049619f0c68037c521077619c588482786",
       []
      ],
      "config.json": [
@@ -496645,11 +502782,11 @@
       []
      ],
      "web-platform.test.key": [
-      "4f68bb3caa0ddaef5799966bb88477273bbdcc0d",
+      "2516ae7459387b16b6075b177c3bbbdd77679f9a",
       []
      ],
      "web-platform.test.pem": [
-      "02a2d94e935ab6c760b282665d3ec409d51a739e",
+      "ad77f3e9e14a4c542b04495535c40555f8474fc7",
       []
      ]
     },
@@ -496680,7 +502817,7 @@
        []
       ],
       "fyi_hook.yml": [
-       "df92ce10664d4f697cd0456cfc586f1b5cec33c9",
+       "8e541e14d86726d9c8ca8579b763a4190493e603",
        []
       ],
       "install_certs.yml": [
@@ -496761,7 +502898,7 @@
       []
      ],
      "commands.json": [
-      "f26baddacadefc150ec36db11ef0f83dc20e6ca1",
+      "7c54fb72cbfda4aa4241df50b91bc3749faf156f",
       []
      ],
      "epochs_update.sh": [
@@ -496793,15 +502930,15 @@
       []
      ],
      "requirements_build.txt": [
-      "e74e4e5302de95611631ab3193f8ae38f643f7dc",
+      "60c09170a98e2d16fd3e499962f59b0df8089fd3",
       []
      ],
      "requirements_macos_color_profile.txt": [
-      "cd3e785aa47963c00137c5c94d55c8f3cb692d8e",
+      "5b95e3357b806cc6edfcbc9aff7b78c341dc8732",
       []
      ],
      "requirements_tc.txt": [
-      "a70216679708b4d3cdc6e72c435992d06fff481f",
+      "ada75c2f761904412048f3525f3010b658d174f9",
       []
      ],
      "run_tc.py": [
@@ -496843,7 +502980,7 @@
       ],
       "tasks": {
        "test.yml": [
-        "54cf522ebd8cd039e203d06ebfcc2780777148fa",
+        "c96082cfa035f1eabccd7874d40eedd0b0c4492a",
         []
        ]
       },
@@ -496902,6 +503039,10 @@
       "76a64d0accac0954faf9a61c42230656d55140b2",
       []
      ],
+     "update_codeowners.py": [
+      "4e36e2679bfd68e0038ba0f3d2952392399feffe",
+      []
+     ],
      "website_build.sh": [
       "adfdf41ae73812de177978ac07f87d6c8eb10b10",
       []
@@ -497192,7 +503333,7 @@
        }
       },
       "test_file_lints.py": [
-       "92270e38a69d70e6e8748aee57372ed1b2d250f4",
+       "f63110432939d01265482611261f463e5b49e45f",
        []
       ],
       "test_lint.py": [
@@ -497376,7 +503517,7 @@
        []
       ],
       "load.py": [
-       "831f7e8fff18bd37201a2ca21f4a1f8caea38258",
+       "c6813f23392b1ab96cebba875e6e3d9ce06c7527",
        []
       ],
       "requirements.txt": [
@@ -497408,7 +503549,7 @@
      []
     ],
     "requirements_mypy.txt": [
-     "06fb778ea664256d5bdc515fc9df5bf856a45961",
+     "5edf2d9614d60e520aa53406d450dd6dc8344114",
      []
     ],
     "requirements_pytest.txt": [
@@ -497416,7 +503557,7 @@
      []
     ],
     "requirements_tests.txt": [
-     "9bb2dceafe4e5d9dd616bdc3e09bb8fbfb99053d",
+     "ca00b8f1f9835eea866a0462962b705a63366de6",
      []
     ],
     "runner": {
@@ -507678,7 +513819,7 @@
      ],
      "webdriver": {
       "__init__.py": [
-       "eb03184974682da2f869935641e2670c3e9a91dd",
+       "53e53b9ac269a16bfa793ae847c85b8f2d4464fd",
        []
       ],
       "bidi": {
@@ -507687,7 +513828,7 @@
         []
        ],
        "client.py": [
-        "a2ed903c5774e689d955635d5f4cfcbead75bcac",
+        "1f4647cf174d67b444cec5255a29695b1585f4fc",
         []
        ],
        "error.py": [
@@ -507696,7 +513837,7 @@
        ],
        "modules": {
         "__init__.py": [
-         "ff76f69ba75f7be8938c383155f66271aa6c8000",
+         "3ed98e259987def608128611e5c10060fd146bfe",
          []
         ],
         "_module.py": [
@@ -507715,6 +513856,10 @@
          "f95196da1747b0586a2768f5b807b59a24fb7125",
          []
         ],
+        "emulation.py": [
+         "fd5cf733ab761639493df402268429f5ab09f528",
+         []
+        ],
         "input.py": [
          "ee4f8136e9d694357400fd7a59e8032aa004079d",
          []
@@ -507740,7 +513885,7 @@
          []
         ],
         "web_extension.py": [
-         "70572a126f21d3197403292d93c13a8ba98d89b1",
+         "d313e416d75ca40f21736ee31b3751ca1e6e5d98",
          []
         ]
        },
@@ -507758,7 +513903,7 @@
        ]
       },
       "client.py": [
-       "97b29c64bcd6e3868b6554570a4505606c5c3413",
+       "5a54bf66ac6bf58bf2953bc99cabfd966c91907c",
        []
       ],
       "error.py": [
@@ -507821,7 +513966,7 @@
       []
      ],
      "android.py": [
-      "b4720ada41b656ae3c560091c5f217a4c69118d2",
+      "cbde92b8d5cc2b8c8374c39145f1e3e2ee43d899",
       []
      ],
      "browser.py": [
@@ -507829,7 +513974,7 @@
       []
      ],
      "commands.json": [
-      "de825c79b76027d82f13b36fbba032ed57de0226",
+      "72e1ec7d42341416554d971df09bddf6be09098a",
       []
      ],
      "create.py": [
@@ -507844,6 +513989,10 @@
       "e1d8c4ebfeb24f00ee275b4867f700c01ab79570",
       []
      ],
+     "metadata.py": [
+      "2e91da7c658f5662458a7f329d433f74fe2ffd72",
+      []
+     ],
      "paths": [
       "5a1303362b368be0dce52433adb1528de515a510",
       []
@@ -507857,11 +514006,11 @@
       []
      ],
      "requirements_install.txt": [
-      "f7df06548c9424a1039db27f9772845b217ef124",
+      "9da7570da49bbe87171a2e23eb2c94b0113993a4",
       []
      ],
      "revlist.py": [
-      "e9fea30522085a461caaf61986868b6f53ce0ced",
+      "ef8dbf043fee0df11e90d88e21af534f1f6e6c3a",
       []
      ],
      "run.py": [
@@ -507960,7 +514109,7 @@
        []
       ],
       "test_wpt.py": [
-       "c977b9a873f90c95cf1aef8cfdcc3bf91c936476",
+       "cea4122dc9e0906e9b614a8f5b8aa4b072408817",
        []
       ]
      },
@@ -508025,7 +514174,7 @@
       ]
      },
      "requirements.txt": [
-      "4074b20618ae15add1e1f216041e8178032f6c74",
+      "97b569379553f692f8420efc98504edbb82f84dc",
       []
      ],
      "requirements_chromium.txt": [
@@ -508067,7 +514216,7 @@
         []
        ],
        "android_webview.py": [
-        "0e02d3c02cd5456d62401423e7bb7581d70dc32f",
+        "c796be18a734cfbb33fd73b0d99a7c30512c8dd6",
         []
        ],
        "base.py": [
@@ -508075,11 +514224,11 @@
         []
        ],
        "chrome.py": [
-        "76bc652075eef3e4738ec4b276e1b19bcd55579e",
+        "24723734211065c358566f7e48495f3607bdfc9f",
         []
        ],
        "chrome_android.py": [
-        "820323e615ad57d89df7ccdee68a4587b8acc6fc",
+        "4ed7707c3bed88e2f5061a331e49683db8a4f583",
         []
        ],
        "chrome_ios.py": [
@@ -508087,7 +514236,7 @@
         []
        ],
        "chrome_spki_certs.py": [
-        "875ae3ea4a7ea7e1241023e9b31b097c1d44e2c4",
+        "f1e7df1d4c7d2cbbf6987eff133f1851c44a147f",
         []
        ],
        "chromium.py": [
@@ -508103,11 +514252,11 @@
         []
        ],
        "firefox.py": [
-        "42311d9f4d6a0c12e5d163f47a0025613e79d1ca",
+        "c63bfa2ceebb281e01e49a79aaf6cdeb2bbd92e5",
         []
        ],
        "firefox_android.py": [
-        "5ad270ef114ff3117eebcc44a06ca63e3d01b9c2",
+        "32a82d7ccc474e7a0d69ef03862dc04cb8dcda84",
         []
        ],
        "headless_shell.py": [
@@ -508137,11 +514286,11 @@
         ]
        },
        "servo.py": [
-        "d0bf0a38ea3f48ef1921360e25ea9ec63e44ca7a",
+        "00d7eac0dfd5b235df36724be983d574a9dd9737",
         []
        ],
        "servodriver.py": [
-        "bd16d7987e539a3325d88876982462ea1a3eb638",
+        "7121e1dafcc2d55ebc18bdf3e922ce9978b94ee1",
         []
        ],
        "webkit.py": [
@@ -508175,11 +514324,11 @@
         []
        ],
        "actions.py": [
-        "859ce8f4fa604481a029b0af624d4cddaeafd429",
+        "b093b0355d357f1584dae9d0dd89cb530545148d",
         []
        ],
        "asyncactions.py": [
-        "71187ee76d7a1aff4803903a8506cb4dac4a8a04",
+        "8397d7838a3d6bd45e28dc613322d00ff8f2aebb",
         []
        ],
        "base.py": [
@@ -508195,7 +514344,7 @@
         []
        ],
        "executormarionette.py": [
-        "ebc4a4a565667d66af7da73332802da72fadf580",
+        "08bc02cbc3c0278ed33feb35b22569c73afa0a44",
         []
        ],
        "executorselenium.py": [
@@ -508203,7 +514352,7 @@
         []
        ],
        "executorservo.py": [
-        "e3369d24ebc6d6aac1b4632ef673a36602417745",
+        "7b0a64a60489f91fe2d2ec92c69118c0b5b1b8c0",
         []
        ],
        "executorservodriver.py": [
@@ -508211,7 +514360,7 @@
         []
        ],
        "executorwebdriver.py": [
-        "95667480afe7bd67a54f235428f12a45879bac5a",
+        "7ca46a05a7b0f2bc3da65512fdee57080946b7d0",
         []
        ],
        "executorwktr.py": [
@@ -508227,7 +514376,7 @@
         []
        ],
        "protocol.py": [
-        "0940e87cdbdea9b78397a067240553f3034eb0f6",
+        "16eb3cbb4a528ac9e4fc4897aa36f2a58e6d68ec",
         []
        ],
        "pytestrunner": {
@@ -508282,18 +514431,10 @@
         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
         []
        ],
-       "chromium.py": [
-        "95f53011bfc32de47a93e0bb7d2ac99f84be4e40",
-        []
-       ],
        "tests": {
         "__init__.py": [
          "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
          []
-        ],
-        "test_chromium.py": [
-         "bf815d5dc761b869f89ec71fdec66c395b453fbd",
-         []
         ]
        },
        "wptreport.py": [
@@ -508342,7 +514483,7 @@
        []
       ],
       "testdriver-extra.js": [
-       "9ddbe2e8df53886c5c3c89e5f21b62c5da760a2d",
+       "3c2dd8b42dd5b572841b5b5529b42a17f724cef9",
        []
       ],
       "testdriver-vendor.js": [
@@ -508370,7 +514511,7 @@
        []
       ],
       "testrunner.py": [
-       "64668fc470b730ecc664c06c0c5412a657f3d2da",
+       "2c2da790e901f8e56f5f5f77673a281530c53294",
        []
       ],
       "tests": {
@@ -508484,7 +514625,7 @@
        []
       ],
       "wptcommandline.py": [
-       "647cc7f21b1e2f35f9111650cb6eba2dce5376a4",
+       "7bfeef317170f2032152df46d9f976a1a82cbc90",
        []
       ],
       "wptlogging.py": [
@@ -508641,7 +514782,7 @@
         []
        ],
        "base.py": [
-        "f47308d88df27d21469f0e80f92fd98681a1dd70",
+        "1897d224761d14e33f4c3dc854efca905d1f50a8",
         []
        ],
        "docroot": {
@@ -509069,6 +515210,14 @@
       []
      ]
     },
+    "should-sink-type-mismatch-violation-be-blocked-by-csp-003.html.headers": [
+     "b48df2b0ccc70404c91bc6e0311b62f70db5573d",
+     []
+    ],
+    "should-trusted-type-policy-creation-be-blocked-by-csp-005.html.headers": [
+     "7e28a4dbc8e80bb47e340df23428a51fabd09aaa",
+     []
+    ],
     "support": {
      "DOMWindowTimers-setTimeout-setInterval-worker.js": [
       "a31ababde928db87f7c20e822814a02830954c11",
@@ -509155,7 +515304,7 @@
       []
      ],
      "csp-violations.js": [
-      "49649f45cd6e263bff984f0afcb5ecafbbb8a0a5",
+      "46c2ca1b30f33bec538b2245ed8e9a8c1a1b7c6d",
       []
      ],
      "event-handler-attributes.mjs": [
@@ -509175,23 +515324,23 @@
       []
      ],
      "navigation-report-only-support.html": [
-      "791559f7a19bec50648245c15c1e92723034d5b9",
+      "d4e4ded7daad113f34d56288ccb9a1bf480e45d2",
       []
      ],
      "navigation-report-only-support.html.headers": [
-      "4c1ff15e167a9581839c64532078440689ca741c",
+      "e9e9a92f766e905a407252dddd4147b50bd8c740",
       []
      ],
      "navigation-support.html": [
-      "47f33c9fb6430cb0ded9f09facd8a3974901d1f5",
+      "306cc0e84f7dfbf5aacee2c0dadc7b2e08512fa6",
       []
      ],
      "navigation-support.html.headers": [
-      "604e765da46d85fe8ab85d3097fe7c2cbe00a930",
+      "cd8c4c6d24a0fd4099bb5c5cff5629c5f58fb096",
       []
      ],
      "navigation-support.js": [
-      "41dce761def94a328ac75f05699a6f079e0d0bee",
+      "8449dd202b6c76d1830dc348fc84ef927baae9f4",
       []
      ],
      "send-plain-string-to-trusted-type-sink.html": [
@@ -509202,10 +515351,182 @@
       "45053d43e362e223e0ce5e6dffb4da09c0ce3f34",
       []
      ],
+     "should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-location.js": [
+      "ff0e26bbc3a9a44c3d79d41714852b5f280d39f1",
+      []
+     ],
+     "should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-location.js.headers": [
+      "b48df2b0ccc70404c91bc6e0311b62f70db5573d",
+      []
+     ],
+     "should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-multiple-violations.js": [
+      "4979b7fc51ef34fb26a278ca93537e002dd3bd49",
+      []
+     ],
+     "should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-multiple-violations.js.headers": [
+      "c17d57d19ae4ef9d3e584d10fc39065823cb2f73",
+      []
+     ],
+     "should-sink-type-mismatch-violation-be-blocked-by-csp-location.js": [
+      "8568b960aa3a7124c37036a9b47b8162b6bce3df",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-allow-duplicates-tt-policy-name.js": [
+      "59d9711f1225a9ebbe91afe8f0cc12888cf183bc",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-allow-duplicates-tt-policy-name.js.headers": [
+      "9fa44d4200b670da44b6b98699aeef3a5f5392de",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-location.js": [
+      "fc4773f923809e96bf44b8af4e34c92ee7bd0ceb",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-location.js.headers": [
+      "7e28a4dbc8e80bb47e340df23428a51fabd09aaa",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-multiple-violations.js": [
+      "74d4429c3949863c209492d093d26e103f165153",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-multiple-violations.js.headers": [
+      "5edaafc1ff6769a5e1c6a5d7d20e1d79aa44ded9",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-none.js": [
+      "8d0ba3da646a5c8e3cfc5031094b240d865125e4",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-none.js.headers": [
+      "7e28a4dbc8e80bb47e340df23428a51fabd09aaa",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-allow-duplicates.js": [
+      "ed3524005eafdc3d8f9fdfcbc4f0b91008eeabba",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-allow-duplicates.js.headers": [
+      "673b327086267519e887ea7753da73901d757d13",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-none.js": [
+      "d34bd04eaeb4c9256e67391fe9ac22b6899f6caf",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-none.js.headers": [
+      "55cf94e10e624d47acfd0283e8fa35529a1e9185",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name.js": [
+      "985ee43e833b7e7ac00072e3eb92f51534b8cec6",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name.js.headers": [
+      "96b79d71c5d506851a6f708b7b67b98e1a9a2813",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-wildcard.js": [
+      "004530def32d301d56235c0b45b420d10656feb2",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-wildcard.js.headers": [
+      "b93b85d4a352ddfb355a4e708e3b4f50111326f9",
+      []
+     ],
+     "should-trusted-type-policy-creation-be-blocked-by-csp-location.js": [
+      "11390a6318497968e40fd9393fa6a6bf9266a163",
+      []
+     ],
+     "trusted-types-reporting-check-report-create-policy-worker.js": [
+      "6bb346e3195f613bc45d806b63496c7c9a0b6903",
+      []
+     ],
+     "trusted-types-reporting-check-report-create-policy-worker.js.sub.headers": [
+      "58beda2418334357fedf554f2dfda27aaff10040",
+      []
+     ],
+     "trusted-types-reporting-check-report-create-policy.js": [
+      "5d96829727b7df77c3d37c2a4f1b56f689c0742e",
+      []
+     ],
+     "trusted-types-reporting-check-report-sink-mismatch-worker.js": [
+      "85910e2e92622c3550e455aa61fde11a31c69a50",
+      []
+     ],
+     "trusted-types-reporting-check-report-sink-mismatch-worker.js.sub.headers": [
+      "5fcdf6ccbfcc9121834a2b3e04650fd185232a90",
+      []
+     ],
+     "trusted-types-reporting-check-report-sink-mismatch.js": [
+      "96ad9c116b4035c8787fc8bf64b776de5fc28640",
+      []
+     ],
      "trusted-types-reporting-for-DOMWindowTimers-setTimeout-setInterval.js": [
       "15a18304496c21f074354a8e7e0a7671cceed738",
       []
      ],
+     "trusted-types-reporting-for-DedicatedWorker-constructor-worker.js": [
+      "e5b09eb3707ef22b96160f7b4143b35f07728118",
+      []
+     ],
+     "trusted-types-reporting-for-DedicatedWorker-constructor-worker.js.headers": [
+      "54d8b1d4c1285d05cbabf7b35b0facea96284bad",
+      []
+     ],
+     "trusted-types-reporting-for-DedicatedWorker-constructor.js": [
+      "cb5ae4c8e2cd1b2cc20e7e1d9928cc2078106ac7",
+      []
+     ],
+     "trusted-types-reporting-for-ServiceWorkerContainer-register-worker.https.js": [
+      "cce29cb2f7b946d9aa0171a54b26b541204076c4",
+      []
+     ],
+     "trusted-types-reporting-for-ServiceWorkerContainer-register-worker.https.js.headers": [
+      "54d8b1d4c1285d05cbabf7b35b0facea96284bad",
+      []
+     ],
+     "trusted-types-reporting-for-ServiceWorkerContainer-register.https.js": [
+      "f59799d4776d33534d610c2fc6e83bf7c9a1deb1",
+      []
+     ],
+     "trusted-types-reporting-for-SharedWorker-constructor.js": [
+      "a65731a2f9c5e569e2653d46ca0740dda7c31c15",
+      []
+     ],
+     "trusted-types-reporting-for-eval-worker.js": [
+      "2a4780dcbaddfc8cab4dc2e3d895db94ba7f4edf",
+      []
+     ],
+     "trusted-types-reporting-for-eval-worker.js.headers": [
+      "54d8b1d4c1285d05cbabf7b35b0facea96284bad",
+      []
+     ],
+     "trusted-types-reporting-for-eval.js": [
+      "0f8120a7a1fb901b0e7836a1ba04b644228e9a28",
+      []
+     ],
+     "trusted-types-reporting-for-function-constructor-worker.js": [
+      "ce73b9136897416dfef0d229bd5c87ceea1e5305",
+      []
+     ],
+     "trusted-types-reporting-for-function-constructor-worker.js.headers": [
+      "54d8b1d4c1285d05cbabf7b35b0facea96284bad",
+      []
+     ],
+     "trusted-types-reporting-for-function-constructor.js": [
+      "51d04b661f4e4a0d3ad11ea90a9bb09a624a1183",
+      []
+     ],
+     "trusted-types-reporting-for-importScripts.js": [
+      "c03c29a4e9ed19c14c2962aad60b70cc8bc08267",
+      []
+     ],
+     "trusted-types-reporting-for-importScripts.js.headers": [
+      "54d8b1d4c1285d05cbabf7b35b0facea96284bad",
+      []
+     ],
      "trusted-types-reporting-for-setTimeout-setInterval-worker.js": [
       "7c65802c9ef09696f0f74fa386629948847c1783",
       []
@@ -509214,6 +515535,14 @@
       "54d8b1d4c1285d05cbabf7b35b0facea96284bad",
       []
      ],
+     "trusted-types-sandbox-no-allow-scripts.html": [
+      "11967a4d97f80d0ce5344cb2dc309070c2ab57da",
+      []
+     ],
+     "trusted-types-sandbox-no-allow-scripts.html.headers": [
+      "da0823c6bc5d9682dd643ee9d6a64b4f3be47bae",
+      []
+     ],
      "worker.https.js": [
       "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
       []
@@ -509227,28 +515556,28 @@
      "b6608515aa85a08dbb56531c46c097e179c76200",
      []
     ],
-    "trusted-types-eval-reporting-no-unsafe-eval.html.headers": [
-     "72cebc03552da9db7a51cf88a4f709f950d5b5c9",
-     []
-    ],
     "trusted-types-eval-reporting-report-only.html.headers": [
      "9ab275fe6f1d4988717f004be774f84374df276f",
      []
     ],
-    "trusted-types-eval-reporting.html.headers": [
-     "1e57f8bf5851bc42b282a554e4d5211281850f8d",
-     []
-    ],
     "trusted-types-report-only.html.headers": [
-     "602186027d0d759b9cc224f29de584bb9c71c198",
+     "096c0b401953f847a278792d810402e6ccc633c7",
      []
     ],
-    "trusted-types-reporting-check-report.html.sub.headers": [
-     "c055bdc6563685adabeffb8141a83376a0cea1f2",
+    "trusted-types-reporting-check-report-Window-create-policy.html.sub.headers": [
+     "4653c9d7031864065b600f460dd604de64886f7e",
+     []
+    ],
+    "trusted-types-reporting-check-report-Window-sink-mismatch.html.sub.headers": [
+     "62a0c13f0a38df5b092cdab116f4fdc556a126ec",
      []
     ],
     "trusted-types-reporting.html.headers": [
-     "7076f4106f73488aad64064213fda18b4c43392b",
+     "5809a919913781a50db9612d0173e529eac7a826",
+     []
+    ],
+    "trusted-types-sandbox-allow-scripts.html.headers": [
+     "6bd66164613016269ebcee6416ed41cdf312a42a",
      []
     ]
    },
@@ -509945,7 +516274,7 @@
       []
      ],
      "urlpatterntestdata.json": [
-      "f92ab76b71df5ab42b729ebe366e381bd9e939af",
+      "a613b6a74b5a900e51185f63bfe597e38f8557b6",
       []
      ],
      "urlpatterntests.js": [
@@ -510004,6 +516333,20 @@
      []
     ]
    },
+   "viewport-segments": {
+    "META.yml": [
+     "38eb8c0cb93a2199986c84460769a920eb122bda",
+     []
+    ],
+    "README.md": [
+     "50e724bd711c02faf304433667b3738a25aed584",
+     []
+    ],
+    "WEB_FEATURES.yml": [
+     "ebb7d6a73d30469d3084bd2353c89833dae2e5ca",
+     []
+    ]
+   },
    "virtual-keyboard": {
     "META.yml": [
      "a925b52d6f0e9d2ef1b291d50486713d0ee83744",
@@ -510055,7 +516398,7 @@
     },
     "scripts": {
      "ATTAcomm.js": [
-      "b748233fc22c43153212e8a495cdce3b48425fd9",
+      "61ce6e5e6f115ac499222b9f476a0e5aa1d5e250",
       []
      ],
      "aria-utils.js": [
@@ -510239,7 +516582,7 @@
         []
        ],
        "testharness.js": [
-        "fdd87e8fc2a19e60c457bf3e3342f060cc35784e",
+        "7c1ded21d0e266612d49cfe9eef89c24f704cf84",
         []
        ],
        "testharnessreport.js": [
@@ -510576,6 +516919,10 @@
         "afa5e4eaf032e0ad26e730615d633ce498a73c12",
         []
        ],
+       "simd_select.wast.js": [
+        "e997d81f75abc7ef0ba8e6e78e5435e3bd63e13c",
+        []
+       ],
        "simd_splat.wast.js": [
         "3ecdc10e2791eda422bb2fa657386ea476951592",
         []
@@ -511118,7 +517465,7 @@
      []
     ],
     "README.md": [
-     "c41e0e048efe704917b05894ab72c3f60f5a9a97",
+     "7526978c1f8e357e99e2e9bd4d47af8c43cd60b2",
      []
     ],
     "WEB_FEATURES.yml": [
@@ -511128,7 +517475,7 @@
     "animation-model": {
      "animation-types": {
       "property-list.js": [
-       "f31ee8e4ccf05471e94417971da6ca31b288719e",
+       "21f39b1fc185345f3794cb9f0f28865e10c7ceb6",
        []
       ],
       "property-types.js": [
@@ -511183,7 +517530,7 @@
       []
      ],
      "keyframe-tests.js": [
-      "2bcce1ecf47f180d7f91a8160ad548e2ad06f5b9",
+      "34a84f45b20dea524016a6f479e9e0d0f5b7b2e7",
       []
      ],
      "keyframe-utils.js": [
@@ -511817,7 +518164,7 @@
       []
      ],
      "audionodeoptions.js": [
-      "3b7867cabf1c6068d8185ce52b51b43d1f5b18f6",
+      "ef2dab672b3b3f1071d3febebc2bd3fc02196d38",
       []
      ],
      "audioparam-testing.js": [
@@ -511968,7 +518315,7 @@
        []
       ],
       "automation-rate-testing.js": [
-       "43279f91d68d3c5e2d7a086c739c838b31dc7335",
+       "e06a1d456144289fb54aa1020316511208167517",
        []
       ],
       "retrospective-test.js": [
@@ -512512,7 +518859,7 @@
      []
     ],
     "video-encoder-utils.js": [
-     "916f995156e51d7fed083d9ab175cc44d974dc6b",
+     "5c8d17e5bfe65ff382cc8ae617350873f7cabd4d",
      []
     ],
     "videoDecoder-codec-specific-setup.js": [
@@ -512568,7 +518915,7 @@
        []
       ],
       "__init__.py": [
-       "8e45c0f72651ed7b825458682fc04bc2e1a7be5a",
+       "587dc91a9387d3047fa56fa85ad80612637b24fd",
        []
       ],
       "browser": {
@@ -512603,7 +518950,7 @@
       },
       "browsing_context": {
        "__init__.py": [
-        "606ac071ed7b1def5316d84a5c29ca00d7187da5",
+        "8987e12a967162cfad502cf81429e4e4d74c3023",
         []
        ],
        "activate": {
@@ -512648,6 +518995,12 @@
          []
         ]
        },
+       "download_will_begin": {
+        "__init__.py": [
+         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+         []
+        ]
+       },
        "fragment_navigated": {
         "__init__.py": [
          "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
@@ -512779,6 +519132,22 @@
         ]
        }
       },
+      "emulation": {
+       "__init__.py": [
+        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+        []
+       ],
+       "set_geolocation_override": {
+        "__init__.py": [
+         "5e1fd1aa8637529a20b48356fe20e4f970b8428c",
+         []
+        ],
+        "conftest.py": [
+         "5fb9451f0a23821bbd7d25ac59efeb928f84b5ac",
+         []
+        ]
+       }
+      },
       "errors": {
        "__init__.py": [
         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
@@ -512815,7 +519184,7 @@
         ],
         "set_permission": {
          "__init__.py": [
-          "b8f6358d61746af39d32612db6649f135e8d94c0",
+          "86c8ade30a8718f67a9abeaec58552f6f66fc5c5",
           []
          ]
         }
@@ -512885,7 +519254,7 @@
       },
       "network": {
        "__init__.py": [
-        "840b8086d1373852dad9c2468736b98a76044b49",
+        "46146d52eb9cd986d8712aac7965e6a19ce4dbd6",
         []
        ],
        "add_intercept": {
@@ -513192,10 +519561,6 @@
         "0f229bd3f996728daac75ccbf22ffbc84517b40b",
         []
        ],
-       "conftest.py": [
-        "e59af399b07c343b504a28f5ee8f1eb7ebd3df9f",
-        []
-       ],
        "install": {
         "__init__.py": [
          "8b137891791fe96927ad78e64b0aad7bded08bdc",
@@ -513682,11 +520047,11 @@
        []
       ],
       "fixtures.py": [
-       "a8f1f2959d4acb02776fc7cc2440fc00f408f50c",
+       "6ccf394f27caafec6d54cae4967b9e9a63f4d57f",
        []
       ],
       "fixtures_bidi.py": [
-       "c391f2b5a4100200643e2354648c90d9e8fc3114",
+       "0996821cfefee7573d3f352adc7a43166d6628f6",
        []
       ],
       "fixtures_http.py": [
@@ -513694,7 +520059,7 @@
        []
       ],
       "helpers.py": [
-       "8baa895adf2ebace57f8b37ba444be66aaf4eb0b",
+       "f4763deca141b4cf2bb592a740b7fbdd2a4d2869",
        []
       ],
       "html": {
@@ -513760,6 +520125,10 @@
         "438f39aa0fa6af5ebc3045034ba24f2054e613f7",
         []
        ],
+       "geolocation_override.py": [
+        "038e947f7aa00fa08afe0156bd8037c74034809d",
+        []
+       ],
        "headers.py": [
         "cb8d18d964416a5db9f98bcc273762e47bc10c81",
         []
@@ -513801,6 +520170,10 @@
        "4e92bcdf23e044de9d6ec00c2f90d39f9672e7e3",
        []
       ],
+      "web_extension.py": [
+       "ba9473a7947e9f6cee367f47d7aadf5486fbc1fa",
+       []
+      ],
       "webextensions": {
        "chrome": {
         "packed.crx": [
@@ -513931,6 +520304,10 @@
      "0b81aa0658cb4d69ff5b958ba27b79e32ebdb461",
      []
     ],
+    "WEB_FEATURES.yml": [
+     "0aacecad8927ad0841a5e507fc1cfa5c5cd99016",
+     []
+    ],
     "broadcastchannel": {
      "WEB_FEATURES.yml": [
       "378ed57dc52d077675669200b20dcbe833b007a7",
@@ -513967,7 +520344,7 @@
      "close-event": {
       "resources": {
        "helper.js": [
-        "cb9ea9fe981e95374b836255c752a42de788fc7b",
+        "48744ac1c5b530ef8d46c3d9a0378c698353a5bc",
         []
        ]
       }
@@ -514085,7 +520462,7 @@
     },
     "resources": {
      "utils.js": [
-      "7cecf29061fe35408b0875ba3cf2638ea5eb0605",
+      "9d5cfc70c10187743807096421975a099f22afc9",
       []
      ],
      "utils_validation.js": [
@@ -514255,6 +520632,10 @@
      "06fa607635a68aa0e866cbb83b47dc0b0ddf6f86",
      []
     ],
+    "WEB_FEATURES.yml": [
+     "0df5a2c40ef70132caa3ee324837f3d5fd4496f9",
+     []
+    ],
     "helper.js": [
      "d4cec39ffce0f58b76da653c78dc384f22ffa43d",
      []
@@ -514301,7 +520682,7 @@
       []
      ],
      "RTCPeerConnection-insertable-streams.js": [
-      "0bf820acde48058711163708b05d02e89501546b",
+      "f3873e1de4b12aa668f711dfbbf41cb9b2d0ac66",
       []
      ],
      "RTCPeerConnection-sender-worker-single-frame.js": [
@@ -516951,7 +523332,15 @@
       []
      ],
      "inactiveFrameTests.js": [
-      "b310f01ef871a248bdde3da0efef6b2126f13cd0",
+      "0cc425955374e214cd5dd9bdb75a654c7c69faa9",
+      []
+     ],
+     "matchDepthViewValues.js": [
+      "697f4deb8ffce83d29dfc0dde36ee4e6c8ec1e87",
+      []
+     ],
+     "pauseResumeTests.js": [
+      "e7513ef61c13b856ea9e49ff93ad9088e57163b3",
       []
      ],
      "staleViewsTests.js": [
@@ -518785,7 +525174,7 @@
       []
      ],
      "redirect.py": [
-      "3839b635e022a347a7877e9022d9820d55831588",
+      "e2786b45031b3d6493eeff9bbe8d7eaf7a46c566",
       []
      ],
      "requri.py": [
@@ -523127,7 +529516,7 @@
      ]
     ],
     "idbcursor-request-source.any.js": [
-     "2fe8c66f2e590b170a1456648e1dca74077464d8",
+     "8e1b34ee798a69c3d61386c5ae1f9adaeba6f21a",
      [
       "IndexedDB/idbcursor-request-source.any.html",
       {
@@ -531209,28 +537598,260 @@
       }
      ]
     ],
-    "key-conversion-exceptions.htm": [
-     "9fdab58eb1212f911203177aac04d57440245d94",
+    "key-conversion-exceptions.any.js": [
+     "08b99946c01f57a5875d31ad79d0051c57736555",
      [
-      null,
+      "IndexedDB/key-conversion-exceptions.any.html",
       {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: Exceptions thrown during key conversion"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ],
+     [
+      "IndexedDB/key-conversion-exceptions.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: Exceptions thrown during key conversion"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ],
+     [
+      "IndexedDB/key-conversion-exceptions.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: Exceptions thrown during key conversion"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ],
+     [
+      "IndexedDB/key-conversion-exceptions.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "IndexedDB: Exceptions thrown during key conversion"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
        "timeout": "long"
       }
      ]
     ],
-    "key_invalid.htm": [
-     "cf649b07d0572cb6543f7ea081ac8db9b0a95e58",
+    "key_invalid.any.js": [
+     "2d673ed5e9191b459e527829ed4a45392886224c",
      [
-      null,
-      {}
+      "IndexedDB/key_invalid.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Invalid key"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/key_invalid.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Invalid key"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/key_invalid.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Invalid key"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/key_invalid.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Invalid key"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
      ]
     ],
-    "key_valid.html": [
-     "0cca54cdbb3db3a0ffe3abf317aa7529a98ee49c",
+    "key_valid.any.js": [
+     "8c015d331bafba5c1944fca4b41461d55f343ce3",
      [
-      null,
+      "IndexedDB/key_valid.any.html",
       {
-       "timeout": "long"
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Valid key"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/key_valid.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Valid key"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/key_valid.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Valid key"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/key_valid.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Valid key"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
       }
      ]
     ],
@@ -531297,11 +537918,83 @@
       }
      ]
     ],
-    "keyorder.htm": [
-     "7e8b3d412648e739fc121d99797c8c62a5301d95",
+    "keyorder.any.js": [
+     "fe3eb11fa92b038514e3ab861b7ad304da7d758d",
      [
-      null,
-      {}
+      "IndexedDB/keyorder.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Key sort order"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keyorder.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Key sort order"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keyorder.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Key sort order"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/keyorder.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Key sort order"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
      ]
     ],
     "keypath-exceptions.any.js": [
@@ -536211,7 +542904,7 @@
      ]
     ],
     "worker-termination-aborts-upgrade.window.js": [
-     "e84ca2c2a644abe87f16aaa789eab40bb2c6fd64",
+     "c2d8d91787e9b0487f46dc1c57df9552d678c59f",
      [
       "IndexedDB/worker-termination-aborts-upgrade.window.html",
       {
@@ -543540,7 +550233,7 @@
      ]
     ],
     "idlharness.https.any.js": [
-     "ae65eb49f2120e1a6d7222a7c0ecc9836c4ff5a8",
+     "5ddf7eab6dba2116d0d3bbc6826b176463107eb0",
      [
       "WebCryptoAPI/idlharness.https.any.html",
       {
@@ -544948,6 +551641,15 @@
        }
       ]
      ],
+     "comp_labeledby_non_standard.html": [
+      "f86a62b34ef31d0949ea082fd243463865431c7b",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "comp_labelledby.html": [
       "26c2f5e5005cb9041e2e0b724f676a8e54ec035d",
       [
@@ -545048,10 +551750,20 @@
    },
    "ai": {
     "language_detection": {
-     "detector.https.tentative.any.js": [
-      "337f11d338d495a46a6926308970768f99ac2526",
+     "detector-iframe.https.html": [
+      "9dc39d44a007934715b181c0025cc885db33264e",
       [
-       "ai/language_detection/detector.https.tentative.any.html",
+       null,
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ]
+     ],
+     "detector-locale.https.window.js": [
+      "80cbfa485e3944ba13de2aec3ba317e2cc84026f",
+      [
+       "ai/language_detection/detector-locale.https.window.html",
        {
         "script_metadata": [
          [
@@ -545060,17 +551772,37 @@
          ],
          [
           "global",
-          "window,worker"
+          "window"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "script",
+          "resources/util.js"
+         ],
+         [
+          "script",
+          "/resources/testdriver.js"
          ],
          [
           "script",
           "../resources/util.js"
+         ],
+         [
+          "script",
+          "../resources/locale-util.js"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
-      ],
+      ]
+     ],
+     "detector.https.window.js": [
+      "379b87415347a1980209fb471d9b1ccb78ccd032",
       [
-       "ai/language_detection/detector.https.tentative.any.serviceworker.html",
+       "ai/language_detection/detector.https.window.html",
        {
         "script_metadata": [
          [
@@ -545079,17 +551811,37 @@
          ],
          [
           "global",
-          "window,worker"
+          "window"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "script",
+          "resources/util.js"
+         ],
+         [
+          "script",
+          "/resources/testdriver.js"
          ],
          [
           "script",
           "../resources/util.js"
+         ],
+         [
+          "script",
+          "../resources/locale-util.js"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
-      ],
+      ]
+     ],
+     "detector.optional.https.window.js": [
+      "1dd248a9ecab667355702d00e865341122a2ebe2",
       [
-       "ai/language_detection/detector.https.tentative.any.sharedworker.html",
+       "ai/language_detection/detector.optional.https.window.html",
        {
         "script_metadata": [
          [
@@ -545098,22 +551850,40 @@
          ],
          [
           "global",
-          "window,worker"
+          "window"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "script",
+          "resources/util.js"
+         ],
+         [
+          "script",
+          "/resources/testdriver.js"
          ],
          [
           "script",
           "../resources/util.js"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
-      ],
+      ]
+     ]
+    },
+    "summarizer": {
+     "summarizer-abort.tentative.https.window.js": [
+      "64595ea930c9e21b8044a281c2f9f4d467478772",
       [
-       "ai/language_detection/detector.https.tentative.any.worker.html",
+       "ai/summarizer/summarizer-abort.tentative.https.window.html",
        {
         "script_metadata": [
          [
           "title",
-          "Detect english"
+          "Summarizer Abort"
          ],
          [
           "global",
@@ -545126,82 +551896,20 @@
         ]
        }
       ]
-     ]
-    },
-    "translator": {
-     "ai_translator_bad_input.tentative.https.any.js": [
-      "980d3c0f6976d5710d42ec55a37abe8d2a5248fb",
+     ],
+     "summarizer-availability-available.tentative.https.window.js": [
+      "31c21ca777fb09fc8058b57d5d8230d3f3798410",
       [
-       "ai/translator/ai_translator_bad_input.tentative.https.any.html",
+       "ai/summarizer/summarizer-availability-available.tentative.https.window.html",
        {
         "script_metadata": [
          [
           "title",
-          "translator.create without options do not crash"
+          "Summarizer Availability Available"
          ],
          [
-          "global",
-          "window,worker"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ],
-      [
-       "ai/translator/ai_translator_bad_input.tentative.https.any.serviceworker.html",
-       {
-        "script_metadata": [
-         [
-          "title",
-          "translator.create without options do not crash"
-         ],
-         [
-          "global",
-          "window,worker"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ],
-      [
-       "ai/translator/ai_translator_bad_input.tentative.https.any.sharedworker.html",
-       {
-        "script_metadata": [
-         [
-          "title",
-          "translator.create without options do not crash"
-         ],
-         [
-          "global",
-          "window,worker"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ],
-      [
-       "ai/translator/ai_translator_bad_input.tentative.https.any.worker.html",
-       {
-        "script_metadata": [
-         [
-          "title",
-          "translator.create without options do not crash"
-         ],
-         [
-          "global",
-          "window,worker"
+          "script",
+          "../resources/util.js"
          ],
          [
           "timeout",
@@ -545212,15 +551920,185 @@
        }
       ]
      ],
-     "ai_translator_translate.tentative.https.any.js": [
-      "729cb04fb76e94d9bf8eb40e463b840931b0e3a7",
+     "summarizer-availability.tentative.https.window.js": [
+      "8691765f6933a576711282750b0d7ebca99e98e8",
       [
-       "ai/translator/ai_translator_translate.tentative.https.any.html",
+       "ai/summarizer/summarizer-availability.tentative.https.window.html",
        {
         "script_metadata": [
          [
           "title",
-          "Translate from English to Japanese"
+          "Summarizer Availability"
+         ],
+         [
+          "script",
+          "../resources/util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "summarizer-create-available.tentative.https.window.js": [
+      "c7e27d9766bee9b62d7b8463654dfea7536cb338",
+      [
+       "ai/summarizer/summarizer-create-available.tentative.https.window.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "Summarizer Create Available"
+         ],
+         [
+          "script",
+          "../resources/util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "summarizer-create.tentative.https.window.js": [
+      "328cceefefb11dab0844cfee5773a5194aabd52e",
+      [
+       "ai/summarizer/summarizer-create.tentative.https.window.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "Summarizer Create"
+         ],
+         [
+          "script",
+          "../resources/util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "summarizer-iframe.tentative.https.html": [
+      "219811c8831e4008726a6507810405e69756fbd6",
+      [
+       null,
+       {}
+      ]
+     ],
+     "summarizer-measureInputUsage.tentative.https.window.js": [
+      "ce9745acf173c8d94a52427446460a47c6fbb378",
+      [
+       "ai/summarizer/summarizer-measureInputUsage.tentative.https.window.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "Summarizer measureInputUsage"
+         ],
+         [
+          "script",
+          "../resources/util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "summarizer-summarize-streaming.tentative.https.window.js": [
+      "dbf41cdadbc679e68279886506660262952f0b5e",
+      [
+       "ai/summarizer/summarizer-summarize-streaming.tentative.https.window.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "Summarizer Summarize Streaming"
+         ],
+         [
+          "script",
+          "../resources/util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "summarizer-summarize.tentative.https.window.js": [
+      "62a780a3fc7960f30b2f4ab6beab89f9e570699f",
+      [
+       "ai/summarizer/summarizer-summarize.tentative.https.window.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "Summarizer Create Available"
+         ],
+         [
+          "script",
+          "../resources/util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ]
+    },
+    "translator": {
+     "translator-bad-input.https.window.js": [
+      "db8905a61f660f8dc0aa7666c044794d22683799",
+      [
+       "ai/translator/translator-bad-input.https.window.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "translator.create without options do not crash"
+         ],
+         [
+          "global",
+          "window"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "translator.optional.https.window.js": [
+      "96eca09d28bd61ccc4d31b746216f1f252d0bf3b",
+      [
+       "ai/translator/translator.optional.https.window.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "Translator Translate"
          ],
          [
           "global",
@@ -545241,6 +552119,10 @@
          [
           "script",
           "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "resources/util.js"
          ]
         ],
         "timeout": "long"
@@ -545817,7 +552699,7 @@
      ]
     ],
     "setSinkId.https.html": [
-     "be65f0ac81bc41a89e5085a43124f7ee991fea7b",
+     "662596910ee9adf94f83d536fe9c67a49db67f4b",
      [
       null,
       {
@@ -553109,8 +559991,18 @@
     ]
    },
    "clear-site-data": {
-    "clear-cache-partitioning.sub.https.html": [
-     "b3841450b5a3fcfbe79857cebd7da8855754597a",
+    "clear-cache-bfcache.sub.https.html": [
+     "61d810f453b827946cb6ef943b4509b24e5f3246",
+     [
+      null,
+      {
+       "testdriver": true,
+       "timeout": "long"
+      }
+     ]
+    ],
+    "clear-cache-partitioning.tentative.https.html": [
+     "2deadeef2d0853d08a559a9af8050646fb8e3163",
      [
       null,
       {
@@ -553119,7 +560011,7 @@
      ]
     ],
     "clear-cache.https.html": [
-     "e356001d0c89e39273e3070dec43e3a66cd44171",
+     "c75c2e16becf994dccfc7d05aa6147ba1022d72b",
      [
       null,
       {
@@ -559564,6 +566456,87 @@
      ]
     ]
    },
+   "container-timing": {
+    "tentative": {
+     "containertiming-body-with-child-img.html": [
+      "53e9bc550745067be9a573ed5505063438a075e3",
+      [
+       null,
+       {}
+      ]
+     ],
+     "containertiming-img-itself.html": [
+      "6d55532a419bbdc6f8c353298b4b74bc738c7d87",
+      [
+       null,
+       {}
+      ]
+     ],
+     "containertiming-observe-after-paint-with-buffering.html": [
+      "4ceb38afd7d0d775bb6a5e7ddb6160c4fd48b942",
+      [
+       null,
+       {}
+      ]
+     ],
+     "containertiming-observe-after-paint-without-buffering.html": [
+      "0191b2ee7583ab603d8894cd7aeaa1666ae98aa5",
+      [
+       null,
+       {}
+      ]
+     ],
+     "containertiming-observe-no-paint.html": [
+      "f2384248255283e48bf5b5263dc0eaee1c7b259a",
+      [
+       null,
+       {}
+      ]
+     ],
+     "containertiming-text-itself.html": [
+      "bead4d1724b10b8d664eec62222bbcfc41da2d17",
+      [
+       null,
+       {}
+      ]
+     ],
+     "containertiming-two-overlapping-imgs.html": [
+      "1a36c6f253211c3838b2586feff6660b6b53a379",
+      [
+       null,
+       {}
+      ]
+     ],
+     "containertiming-with-child-img.html": [
+      "03f0e113902d0d4117a38870dfd22defe99c4653",
+      [
+       null,
+       {}
+      ]
+     ],
+     "containertiming-with-child-text.html": [
+      "1efc189c34e42eb616f56f4e0c259e5be55a079c",
+      [
+       null,
+       {}
+      ]
+     ],
+     "img-not-child-of-container-timing.html": [
+      "751342a7ceb1eaa2a98d1c07dc4000c34d14e4fd",
+      [
+       null,
+       {}
+      ]
+     ],
+     "nested-containertiming-child-img.html": [
+      "3f830fe786307c5d8400544911f27eaf9fb39df7",
+      [
+       null,
+       {}
+      ]
+     ]
+    }
+   },
    "content-dpr": {
     "image-with-dpr-header.html": [
      "bfa1509d46455945acb9b31d6789726b2f860c84",
@@ -559911,14 +566884,14 @@
       ]
      ],
      "connect-src-websocket-allowed.sub.html": [
-      "4263d97fe2dfbb9e2a0f0851c07798d40a5671a9",
+      "1d83bdd18e379f9780cbf7a64e05433ad92dde8b",
       [
        null,
        {}
       ]
      ],
      "connect-src-websocket-blocked.sub.html": [
-      "02c52837bb8bd5cbc26f54f899fe25b5d68bd561",
+      "2cc3f1b5a054dd89c675d7564be8f52ef6d1daa7",
       [
        null,
        {}
@@ -563271,7 +570244,7 @@
       ]
      ],
      "icon-blocked.sub.html": [
-      "cc882347a1ac7b595275c2263ef266826e6f07bd",
+      "4c39e5dec735c10635a603356367610d3aad3fa2",
       [
        null,
        {}
@@ -563326,6 +570299,13 @@
        {}
       ]
      ],
+     "img-src-targeting.html": [
+      "3b4fe7c690b0b980a9626de0deb02c8950f5d4a0",
+      [
+       null,
+       {}
+      ]
+     ],
      "img-src-wildcard-allowed.html": [
       "050a4d14100bb1ef719d6700bfbd37a97424af59",
       [
@@ -563689,7 +570669,7 @@
       ]
      ],
      "to-javascript-parent-initiated-child-csp.html": [
-      "41945fa460fc4ec2b776db5bb90a116d76532701",
+      "41c57c6e04626c993be68079ca01a92c3f8f4393",
       [
        null,
        {}
@@ -565388,6 +572368,13 @@
        {}
       ]
      ],
+     "style-src-inline-style-with-csstext.html": [
+      "5e812b4aee9d0d081673a0f333f8b29187619c3d",
+      [
+       null,
+       {}
+      ]
+     ],
      "style-src-multiple-policies-multiple-hashing-algorithms.html": [
       "027c61d8c632f2387408b8fb6869dee69bb8913d",
       [
@@ -565542,31 +572529,6 @@
       ]
      ]
     },
-    "tentative": {
-     "require-sri-for": {
-      "script-allowed-meta.https.html": [
-       "087498f0c573da8a7212f31348898769e070bb7d",
-       [
-        null,
-        {}
-       ]
-      ],
-      "script-blocked-meta.https.html": [
-       "fe69c61f5b6c68bfefc4c88a18c6f48b6466060e",
-       [
-        null,
-        {}
-       ]
-      ],
-      "script.https.html": [
-       "65553e523ccac1764b957dbe7af34f42acdfc551",
-       [
-        null,
-        {}
-       ]
-      ]
-     }
-    },
     "unsafe-eval": {
      "eval-allowed.sub.html": [
       "186996311b707e1fc646885c847e082797847a9b",
@@ -565583,7 +572545,7 @@
       ]
      ],
      "eval-blocked-in-about-blank-iframe.html": [
-      "054e75b52749b37530a02bc5ee0119ca5e76a474",
+      "b2286f56a234a515cddec0e02439f9768e3a2905",
       [
        null,
        {}
@@ -566437,8 +573399,26 @@
     ]
    },
    "cookie-store": {
+    "change_eventhandler_for_already_expired.https.window.js": [
+     "f3bbe0ea560974e9486941384e75a58d2d6a4637",
+     [
+      "cookie-store/change_eventhandler_for_already_expired.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "Cookie Store API: Test that setting an already-expired cookie does not trigger an event."
+        ],
+        [
+         "script",
+         "resources/cookie-test-helpers.js"
+        ]
+       ]
+      }
+     ]
+    ],
     "change_eventhandler_for_document_cookie.https.window.js": [
-     "0a8b1bd21efc9b0ac69468ad81c306757e5b18ff",
+     "1937ebdae35942840dc3b641b5907f334048f3fb",
      [
       "cookie-store/change_eventhandler_for_document_cookie.https.window.html",
       {
@@ -566456,7 +573436,7 @@
      ]
     ],
     "change_eventhandler_for_http_cookie_and_set_cookie_headers.https.window.js": [
-     "2028df5b4bf4611f565e223579b6673a0d368483",
+     "8517995acfe746bbff09243597d6d319e3af1bc2",
      [
       "cookie-store/change_eventhandler_for_http_cookie_and_set_cookie_headers.https.window.html",
       {
@@ -566473,6 +573453,24 @@
       }
      ]
     ],
+    "change_eventhandler_for_no_change.https.window.js": [
+     "5f9c2927433fc408c70c005789dc0bcc34d46caa",
+     [
+      "cookie-store/change_eventhandler_for_no_change.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "Cookie Store API: Test that setting a duplicate cookie does not fire a second event."
+        ],
+        [
+         "script",
+         "resources/cookie-test-helpers.js"
+        ]
+       ]
+      }
+     ]
+    ],
     "change_eventhandler_for_no_name_and_no_value.https.window.js": [
      "4498caf59689cc3da875d1c56937f6d2a235cb5d",
      [
@@ -566528,7 +573526,7 @@
      ]
     ],
     "cookieListItem_attributes.https.any.js": [
-     "6716d91788db746765593a2a95d34e1ecbb4e3a5",
+     "542bd6c53870b5baaa9ac0f75c2235079b7bfe88",
      [
       "cookie-store/cookieListItem_attributes.https.any.html",
       {
@@ -566683,6 +573681,13 @@
       }
      ]
     ],
+    "cookieStore_delete.sub.https.html": [
+     "8cdfae6776dd88183479f7c1378be814f8c66105",
+     [
+      null,
+      {}
+     ]
+    ],
     "cookieStore_delete_arguments.https.any.js": [
      "37a551b3a9f2511d915bb06b4d2311e3e7979ae2",
      [
@@ -567146,7 +574151,7 @@
      ]
     ],
     "cookieStore_special_names.https.any.js": [
-     "6b18c4f0668a4dfad5864273082bc1ae7ba6ca95",
+     "e2a3df7fe33f3d4325cb1f602d5582dba97da627",
      [
       "cookie-store/cookieStore_special_names.https.any.html",
       {
@@ -567275,7 +574280,7 @@
      ]
     ],
     "httponly_cookies.https.window.js": [
-     "8a10e358ef6de72d5476ae8dc8a571482881d7ef",
+     "605e94e67440aaedbcaa39f185270fe77b316ad3",
      [
       "cookie-store/httponly_cookies.https.window.html",
       {
@@ -567417,6 +574422,24 @@
       {}
      ]
     ],
+    "serviceworker_cookiechange_eventhandler_already_expired.https.any.js": [
+     "c40fdbeb6f108db1ea6e100c833a03c3fedbfc19",
+     [
+      "cookie-store/serviceworker_cookiechange_eventhandler_already_expired.https.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "Cookie Store API: cookiechange event in ServiceWorker with already-expired cookie."
+        ],
+        [
+         "global",
+         "serviceworker"
+        ]
+       ]
+      }
+     ]
+    ],
     "serviceworker_cookiechange_eventhandler_mismatched_subscription.https.any.js": [
      "30d8d70940dae248b3b5cba030056daac78b32a6",
      [
@@ -567436,7 +574459,7 @@
      ]
     ],
     "serviceworker_cookiechange_eventhandler_multiple_subscriptions.https.any.js": [
-     "cd0657c0bcdf5fc5a2133fb0598778aa237c384c",
+     "ef7cadf4c9e6553192c84610dd1d1692dd7248f6",
      [
       "cookie-store/serviceworker_cookiechange_eventhandler_multiple_subscriptions.https.any.serviceworker.html",
       {
@@ -567453,8 +574476,26 @@
       }
      ]
     ],
+    "serviceworker_cookiechange_eventhandler_no_change.https.any.js": [
+     "fb2e2db7381fea7cbd3463576e126e1581a32d97",
+     [
+      "cookie-store/serviceworker_cookiechange_eventhandler_no_change.https.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "Cookie Store API: cookiechange event in ServiceWorker with already-expired cookie."
+        ],
+        [
+         "global",
+         "serviceworker"
+        ]
+       ]
+      }
+     ]
+    ],
     "serviceworker_cookiechange_eventhandler_overlapping_subscriptions.https.any.js": [
-     "1f433aeb9476983cabccead67032ddb88d3ebc32",
+     "f8b1c1b7aa96f13ec40df6dfdfef2c605c447468",
      [
       "cookie-store/serviceworker_cookiechange_eventhandler_overlapping_subscriptions.https.any.serviceworker.html",
       {
@@ -567727,7 +574768,7 @@
       ]
      ],
      "partitioned-cookies-parallel-iframes.embed.tentative.https.html": [
-      "68de567afee135e0e75e2e97c869005163eada8e",
+      "e92a15bcc29435c5bc7ab6d6bae77fe724a2a2e2",
       [
        null,
        {
@@ -567744,6 +574785,16 @@
        }
       ]
      ],
+     "partitioned-cookies-samesite-attribute.https.html": [
+      "323fb08236eb35b207ea72fa0db80fc6f20d7d6a",
+      [
+       null,
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ]
+     ],
      "partitioned-cookies-top-level-redirect.tentative.https.html": [
       "e9dd82c1cec0d1bad55d4dbdd66ecdb01e9d2ed7",
       [
@@ -568152,10 +575203,11 @@
       ]
      ],
      "third-party-cookies.tentative.https.html": [
-      "018849c82791b1702a9a938bc119b737de99e59d",
+      "decf64192817b46b012442b11ef1d8a8ecbd0081",
       [
        null,
        {
+        "testdriver": true,
         "timeout": "long"
        }
       ]
@@ -568487,7 +575539,7 @@
      ]
     ],
     "non-fully-active.https.html": [
-     "508b4325d78b6565f4e0b9b79420b9523a327d83",
+     "a0a76f0fce102c53fe101ba38d1fbff76d934865",
      [
       null,
       {
@@ -568684,7 +575736,7 @@
      "linebox": {
       "animations": {
        "line-height-interpolation.html": [
-        "a0570f82a905af0ba601932b0447c92b28cbf303",
+        "39b768541d7266f9a9c1d5bdae974d7743baef16",
         [
          null,
          {
@@ -570785,14 +577837,14 @@
       ]
      ],
      "anchor-center-htb-htb.html": [
-      "50fc09061073a7bcd16d9669b3fd6ad85234e783",
+      "88e01619cafad8a51e5dcea6bbb565e8cdae14e2",
       [
        null,
        {}
       ]
      ],
      "anchor-center-htb-vrl.html": [
-      "eba72d649133da882a9fa095f0433f426b54bf8e",
+      "f777a2caf8803f77283d9fe667ca29c7ecdf4fa0",
       [
        null,
        {}
@@ -570806,14 +577858,14 @@
       ]
      ],
      "anchor-center-vrl-htb.html": [
-      "8f7af0414edd4eb606e7be3437f81468696522b9",
+      "595f7ea1ecdc6fb52e86624fa6dccc7861563aa7",
       [
        null,
        {}
       ]
      ],
      "anchor-center-vrl-vrl.html": [
-      "d8e90057dc3372c5ccca659132e708c678678a56",
+      "e22391a8192e1c0909a7983b08c450f9bff219e3",
       [
        null,
        {}
@@ -570862,7 +577914,7 @@
       ]
      ],
      "anchor-invalid-fallback.html": [
-      "254ba185c62c6e684457b2dd58de85b5c3f970f3",
+      "b1a4770de535244848de3dd5667bf7a13b33cb93",
       [
        null,
        {}
@@ -571043,8 +578095,15 @@
        {}
       ]
      ],
+     "anchor-position-flip-sibling-index.html": [
+      "5fa17dc057a62d7b07c83c8203c30cab8bb668ff",
+      [
+       null,
+       {}
+      ]
+     ],
      "anchor-position-grid-001.html": [
-      "92fb4d275b8988641ed0736969e918703e4d649d",
+      "7bd389b39d8d6642f02181e475bbc5eaa7322f2d",
       [
        null,
        {}
@@ -571086,7 +578145,7 @@
       ]
      ],
      "anchor-position-multicol-002.html": [
-      "7b2691a2b904ffb7fdc3d720b07ca454e1df7fe1",
+      "1e1f0a5c95b1b5f1d86efc5f22ffc87afbbab453",
       [
        null,
        {}
@@ -571100,7 +578159,7 @@
       ]
      ],
      "anchor-position-multicol-004.html": [
-      "399494120ea0ea5da5534a0a14a9b99e598222d5",
+      "8f7a3dad12915ddbea9bd88077694434d0a17b48",
       [
        null,
        {}
@@ -571142,7 +578201,7 @@
       ]
      ],
      "anchor-position-multicol-nested-001.html": [
-      "35ab2cfc15cea1fa1788f9b4cb09f9af39d079ec",
+      "c5ce41299af29008356b7a049a3d479038379fae",
       [
        null,
        {}
@@ -571155,6 +578214,13 @@
        {}
       ]
      ],
+     "anchor-position-sibling-index.html": [
+      "ade6b4a0e01469119d451082ff31f4743e2cb245",
+      [
+       null,
+       {}
+      ]
+     ],
      "anchor-position-top-layer-007.html": [
       "944911f70085b9412e2865a90d52889cc6d37cc0",
       [
@@ -571401,7 +578467,7 @@
       ]
      ],
      "anchor-size-parse-valid.html": [
-      "8e69476512b61d579b3d68927b93c6dda7444bd4",
+      "312d3c71801353728feeb62f66b8cf658c6f084d",
       [
        null,
        {}
@@ -571685,35 +578751,35 @@
       ]
      ],
      "position-area-align-justify-wm-dir.html": [
-      "25b53d44f788b3b2412a84b07cd394cfa89462e8",
+      "82a11a8868a0b216f34b33da3e4a78d3ae559c07",
       [
        null,
        {}
       ]
      ],
      "position-area-align-justify.html": [
-      "e0bce2c82683243ecff838f71a56e805bd1fac7e",
+      "483a9d6ec0affaf8840e4e1148f4c2e277bf75b3",
       [
        null,
        {}
       ]
      ],
      "position-area-anchor-outside.html": [
-      "d8fb5dbc98fa90513e339487b6e8284ca2db92bc",
+      "9b0c74170aa0f44821b28c7899011128c18c896e",
       [
        null,
        {}
       ]
      ],
      "position-area-anchor-partially-outside.html": [
-      "e23cea474787b1f613a87fdddf306aec40fb93b1",
+      "3dd537d26e09fb43bbf0fd3cd3dd30efd8b55e94",
       [
        null,
        {}
       ]
      ],
      "position-area-basic.html": [
-      "6cbaf8e50145b19a3e761f91abb7adcdb30d400d",
+      "2a568cc80281489fb54da4c48e55400d816718ab",
       [
        null,
        {}
@@ -571734,7 +578800,7 @@
       ]
      ],
      "position-area-in-grid.html": [
-      "85dd4f483060168ed3d312c044a38915705fcd7e",
+      "3407fcbc351ec3601436d96a31b6181826944ee0",
       [
        null,
        {}
@@ -571790,7 +578856,7 @@
       ]
      ],
      "position-area-scrolling-006.html": [
-      "0d49a0303590a324e454b4f5bcbb6d7d15a6a3aa",
+      "fb478385ef349796d306ff931039c4b45b3a1fa3",
       [
        null,
        {}
@@ -572013,6 +579079,13 @@
        {}
       ]
      ],
+     "remove-position-try-rules-001.html": [
+      "56ad5cf7b3268304a457ef9cf06fa794cfeb98b0",
+      [
+       null,
+       {}
+      ]
+     ],
      "try-tactic-alignment.html": [
       "b39a92983717e40a37d6092583cbc95ce7b967f5",
       [
@@ -572227,6 +579300,13 @@
        {}
       ]
      ],
+     "animate-with-background-color-oklch-002.html": [
+      "ee6847c11bf1257c59bdcf5b53a61245403d7cfa",
+      [
+       null,
+       {}
+      ]
+     ],
      "animate-with-color-mix.html": [
       "0b6d9bb4ab3ae911e7291e1da5e2259c0afbd0fc",
       [
@@ -572739,7 +579819,7 @@
        ]
       ],
       "animation-range-start-valid.html": [
-       "bb1dbe35c04306c96ec4145524492459aaa9d50d",
+       "311df59b51bfff963a13f1ec15f79a27608bd780",
        [
         null,
         {}
@@ -572760,49 +579840,49 @@
        ]
       ],
       "animation-trigger-exit-range-end-computed.html": [
-       "d2baab5b2a5c23e42c377341ebba82f9fc605072",
+       "c1aa5d16c5a8430acc5f23239db3cef00c2bc480",
        [
         null,
         {}
        ]
       ],
       "animation-trigger-exit-range-end-invalid.html": [
-       "111847151ef6c03db61470c746654e6705884918",
+       "db4aefef17a8ee03b10d3e450efb1ae9690bd014",
        [
         null,
         {}
        ]
       ],
       "animation-trigger-exit-range-end-valid.html": [
-       "9a41889d3396de0a83a448a99684b011bc7eadd4",
+       "04ea80de23619f385fbd4825f385868ba1af9ce9",
        [
         null,
         {}
        ]
       ],
       "animation-trigger-exit-range-shorthand.html": [
-       "5ddc0682ea8e548ca38a24a6093932c54dd17d3a",
+       "1f1c9496c0d462e3c4dec1302f9cbc0ab5a5f92b",
        [
         null,
         {}
        ]
       ],
       "animation-trigger-exit-range-start-computed.html": [
-       "a48e15a578dcbb3e5b0eeab18476242f445d99ae",
+       "b8f5bd877380d6996148cb399b05919a4b862246",
        [
         null,
         {}
        ]
       ],
       "animation-trigger-exit-range-start-invalid.html": [
-       "220b8028dd312e154c4b7c63f6aa4264b138ffc5",
+       "f8a38fc21d78ed357a6e5de3732c95ba1b969b1c",
        [
         null,
         {}
        ]
       ],
       "animation-trigger-exit-range-start-valid.html": [
-       "11d1adb26f8983d5460a250db1a47113720b8313",
+       "881ad833c4b1427c9c1ff118ded4e27d07557e27",
        [
         null,
         {}
@@ -572816,14 +579896,14 @@
        ]
       ],
       "animation-trigger-range-end-invalid.html": [
-       "8d66ac661d5434d650b1fdc299f4019ade53d842",
+       "30924969482148c2b772ecead19146f867a0847d",
        [
         null,
         {}
        ]
       ],
       "animation-trigger-range-end-valid.html": [
-       "6d9533e26480929794d488cf66a82c5e22e2fd62",
+       "1b72ef2b60d20a25400bed661c9d67505b617387",
        [
         null,
         {}
@@ -572851,14 +579931,14 @@
        ]
       ],
       "animation-trigger-range-start-valid.html": [
-       "d48151b6db07693ee7157b44477be8630905a07a",
+       "6a091fa4d07bd390c56f148977b74a92b5dc7e0c",
        [
         null,
         {}
        ]
       ],
       "animation-trigger-shorthand.tentative.html": [
-       "d0b6befea8e125eb2385fed855bcec7be8f44c4c",
+       "784790e750cddaf6420b578fe0c49cc2182b8309",
        [
         null,
         {}
@@ -572899,6 +579979,13 @@
         {}
        ]
       ],
+      "keyframe-selectors.html": [
+       "900cba5a05a3917649a9b0dc8d21096281ca64f0",
+       [
+        null,
+        {}
+       ]
+      ],
       "keyframes-allowed-properties.html": [
        "f682920b35769e7a6479dad625510b9f163e56fd",
        [
@@ -573848,6 +580935,13 @@
          null,
          {}
         ]
+       ],
+       "corner-shape-interpolation.html": [
+        "2ba9d43cb1fcd79b5d37e848b483fe8ad2c85436",
+        [
+         null,
+         {}
+        ]
        ]
       },
       "parsing": {
@@ -574146,21 +581240,21 @@
         ]
        ],
        "corner-shape-computed.html": [
-        "1d084e23397b3bd34764c8dd874aa69bd8678a89",
+        "e1b458fd06eb512ccd12912ed96c464f8a29bf82",
         [
          null,
          {}
         ]
        ],
        "corner-shape-invalid.html": [
-        "582617a634afe223aa7f7aca5974b4b58a5a54f6",
+        "6aee773f4a4005e1365ff7601b69cc4c08533e46",
         [
          null,
          {}
         ]
        ],
        "corner-shape-valid.html": [
-        "32aaa89fc5b18ae332e983852f61d84397f5cae4",
+        "0ad14c81a74425ce905ea5f1b560e737fbff6d08",
         [
          null,
          {}
@@ -574654,14 +581748,14 @@
        ]
       ],
       "margin-trim-computed.html": [
-       "ad2d17f2ef01d2f870a4f07cd3eccb226e4de0f2",
+       "c38adea9a68e1eeee53e8a42ba9d745546624f88",
        [
         null,
         {}
        ]
       ],
       "margin-trim.html": [
-       "0d92f80b9b96ee409b141487f26cb664ce67f8df",
+       "e8679f9cbf3fb606c542ae8ccc653e0b90b96bbc",
        [
         null,
         {}
@@ -575040,7 +582134,7 @@
      ],
      "table": {
       "border-spacing.html": [
-       "fc5e87e35dde4b4cb2ed5c457f5cd22ec73d96b0",
+       "9fd94760681f0186f86f9a55da300250499f2a50",
        [
         null,
         {}
@@ -575084,7 +582178,7 @@
        ]
       ],
       "table-parts-offsets-vertical-rl.tentative.html": [
-       "9d4a472d4382825c13af35114acc48a3b5face2a",
+       "1eb751032ca4b7598ee3a413408c61c5a592b3e4",
        [
         null,
         {}
@@ -575261,6 +582355,13 @@
        {}
       ]
      ],
+     "inline-style-background.html": [
+      "11451f8cefd3e725b017b263dded4bf9a806d785",
+      [
+       null,
+       {}
+      ]
+     ],
      "layer-basic.html": [
       "e214bffc25f5fc3b56480ec9c8704a80bf109c17",
       [
@@ -575833,7 +582934,7 @@
        ]
       ],
       "color-computed-relative-color.html": [
-       "23ee07d177ac525c2ce2b4e60cd1861a33cc23c5",
+       "9bb87459623ac3c50b2154432269adef114fe811",
        [
         null,
         {}
@@ -576175,7 +583276,7 @@
     },
     "css-color-hdr": {
      "computed.html": [
-      "47021144087d8fe6976ee7a06a187e85665b8fdf",
+      "38a540bd66a91c293d81fd30f4c1cdf47145792c",
       [
        null,
        {}
@@ -576196,7 +583297,7 @@
       ]
      ],
      "parsing.html": [
-      "e165a60d7edb9f7599608f6d4749ca640bfa9635",
+      "2447891f2c4b163cc30eaaa2c6542d9a80a2b4cf",
       [
        null,
        {}
@@ -576773,7 +583874,7 @@
        ]
       ],
       "multiple-style-containers-comma-separated-queries.html": [
-       "23ea471c4172c077dffa18cd3f2659fd1f8064bf",
+       "daa64aaa42f46c2258f1445172fbc17f459262f1",
        [
         null,
         {}
@@ -577422,6 +584523,13 @@
         {}
        ]
       ],
+      "CSS-supports-details-content-pseudo-parsing.html": [
+       "67a46fe82a2ffaa4d5a9bd0729831c6e4415ab54",
+       [
+        null,
+        {}
+       ]
+      ],
       "CSS-supports-selector-detecting-invalid-in-logical-combinations.html": [
        "3adcd7ae2e62bd76130b3ecf2b903e1401b23c77",
        [
@@ -577904,7 +585012,7 @@
        ]
       ],
       "content-visibility-auto-text-fragment.html": [
-       "d5184d72a4ebc9192c1d15a4334fe603048e91b8",
+       "923c5af04f438a690a1048b6729fe51abc7a2932",
        [
         null,
         {
@@ -578335,6 +585443,15 @@
        {}
       ]
      ],
+     "display-contents-pseudo-click-target.html": [
+      "2620c97312fe207aad532ca413b6218312e055d7",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "display-contents-svg-anchor-child.html": [
       "d0119d7fff3d2dcb833136eacd6654394f9f737f",
       [
@@ -578532,7 +585649,7 @@
       ]
      ],
      "linear-timing-functions-syntax.html": [
-      "0c949e9ea7dc50c86cd6877da1a10f7b2ba01625",
+      "408264b58dfe41dd7744d20419bae3a5fc7fd3eb",
       [
        null,
        {}
@@ -578546,7 +585663,7 @@
       ]
      ],
      "step-timing-functions-syntax.html": [
-      "4e8b21e4413f8000ae584396355ed7df1c44a447",
+      "e8465ff7a3304184046f7eb81f93d51a61c19dad",
       [
        null,
        {}
@@ -578567,7 +585684,7 @@
       ]
      ],
      "timing-functions-syntax-valid.html": [
-      "b858f45f4a4a00bd3bde7d15d5ade94ddcc1cfec",
+      "3ebe1f513be786475dbaba7adbafb238c94777cf",
       [
        null,
        {}
@@ -579383,6 +586500,13 @@
         null,
         {}
        ]
+      ],
+      "flex-content-alignment-with-abspos-001.html": [
+       "1a70500f2c57aa2b83300530bbfb518ae0c82451",
+       [
+        null,
+        {}
+       ]
       ]
      },
      "animation": {
@@ -579667,6 +586791,13 @@
        {}
       ]
      ],
+     "flex-shorthand-calc.html": [
+      "2cbd1c20c282a194d06fe9511b2b1ab4409da62d",
+      [
+       null,
+       {}
+      ]
+     ],
      "flex-shorthand-flex-basis-middle.html": [
       "284aac275b87b59a2703e3aaaf78e2369d77a95a",
       [
@@ -580674,7 +587805,7 @@
        ]
       ],
       "flex-computed.html": [
-       "ea1f4f6fa4568e8a3b4913aea52d89d5ec1e1870",
+       "074d0f7395c1ce53fb37e2875d389ddf8c352c7e",
        [
         null,
         {}
@@ -580751,7 +587882,7 @@
        ]
       ],
       "flex-invalid.html": [
-       "ae010d7b4b4540f6591c1ad42f1c89753a71afc6",
+       "d47f8b6793074c5aa27881eaf58809e69a76812d",
        [
         null,
         {}
@@ -580786,7 +587917,7 @@
        ]
       ],
       "flex-valid.html": [
-       "f3eaf118da61d2eb9cd6f30e7f703a0de8053305",
+       "4c57fe4e25361f9223fade0794bb3a1869c89caa",
        [
         null,
         {}
@@ -580842,6 +587973,13 @@
        ]
       ]
      },
+     "percent-height-flex-items-cross-sizes-with-mutations.html": [
+      "87f20000f1f2e1718e31dddb9c92d0edf10b6cb3",
+      [
+       null,
+       {}
+      ]
+     ],
      "percentage-heights-000.html": [
       "cf501031448c8d3d020061d29a2c7e6991deea92",
       [
@@ -581331,7 +588469,7 @@
       ]
      ],
      "font-shorthand-serialization-font-stretch.html": [
-      "3079cc06e7e4a0c88203ed3521d63570c34d9575",
+      "7bc591ec73dbfcb53030cb46937e40469ac0e298",
       [
        null,
        {}
@@ -581400,6 +588538,13 @@
        {}
       ]
      ],
+     "font-variation-settings-calc.html": [
+      "f9ecbfe194136bfe030241e49b88a3c567dc5fcd",
+      [
+       null,
+       {}
+      ]
+     ],
      "font-variation-settings-serialization-001.html": [
       "88764fd652f453f2def184a26f922783aa6d0121",
       [
@@ -581670,7 +588815,7 @@
        ]
       ],
       "font-palette-values-invalid.html": [
-       "a3a0a88ba68c8fcc1f8b00054d7b12bc08d4b7af",
+       "32c9c4c5efeec345c24261b7bb0aa237f11d25e0",
        [
         null,
         {}
@@ -581739,27 +588884,6 @@
         {}
        ]
       ],
-      "font-stretch-computed.html": [
-       "42e1989b1ae1bfa7c3d2378024eaf79279049a03",
-       [
-        null,
-        {}
-       ]
-      ],
-      "font-stretch-invalid.html": [
-       "0f7f7c88975e792af5a6bcf6dc1e19eae5d69f66",
-       [
-        null,
-        {}
-       ]
-      ],
-      "font-stretch-valid.html": [
-       "90cde6031332b5f6964d6a3ad26a4eead3e86880",
-       [
-        null,
-        {}
-       ]
-      ],
       "font-style-computed.html": [
        "acb870cdc1f3328417843fd0d5259ad1735cc096",
        [
@@ -582067,6 +589191,27 @@
         null,
         {}
        ]
+      ],
+      "font-width-computed.html": [
+       "4e38a5d5e9a8a529305b082f2ef4d6dc350e11d9",
+       [
+        null,
+        {}
+       ]
+      ],
+      "font-width-invalid.html": [
+       "7f30eab3e5b6b4934bae8d92f0e88ebd09a63114",
+       [
+        null,
+        {}
+       ]
+      ],
+      "font-width-valid.html": [
+       "44cbb37fd601f0cb3e04dd09b57ec10458683f6d",
+       [
+        null,
+        {}
+       ]
       ]
      },
      "system-fonts-serialization.tentative.html": [
@@ -582091,7 +589236,7 @@
       ]
      ],
      "test_font_feature_values_parsing.html": [
-      "7a5844d56008eae798652b59a335d08d24b34032",
+      "08c20142449646123ebdecde6f023511b45feed4",
       [
        null,
        {}
@@ -582242,135 +589387,165 @@
      }
     },
     "css-gaps": {
-     "tentative": {
-      "parsing": {
-       "gap-decorations-color-computed.html": [
-        "3ef68de73922e853c4d3aa938876064e4b1b6738",
-        [
-         null,
-         {}
-        ]
-       ],
-       "gap-decorations-color-invalid.html": [
-        "e553d24ea7b8bd7aa85bb10dadd1d285f0c2cc56",
-        [
-         null,
-         {}
-        ]
-       ],
-       "gap-decorations-color-valid.html": [
-        "af24afc3c98a40a2201e3c09f954bca6771a4454",
-        [
-         null,
-         {}
-        ]
-       ],
-       "gap-decorations-style-computed.html": [
-        "4de870c09847f7eb3fbf98f26a9196e4dcb52214",
-        [
-         null,
-         {}
-        ]
-       ],
-       "gap-decorations-style-invalid.html": [
-        "af1d5ccae57f47d960b4d3886588955efbaec784",
-        [
-         null,
-         {}
-        ]
-       ],
-       "gap-decorations-style-valid.html": [
-        "1f41238345c4d42e95a0ada017b67860fa2f6bb0",
-        [
-         null,
-         {}
-        ]
-       ],
-       "gap-decorations-width-computed.html": [
-        "f24565ba5eede88234d1b8eb3346aa4cfc44a7d5",
-        [
-         null,
-         {}
-        ]
-       ],
-       "gap-decorations-width-invalid.html": [
-        "902c619affb079feae0dcc6ac0561ee958a1a367",
-        [
-         null,
-         {}
-        ]
-       ],
-       "gap-decorations-width-valid.html": [
-        "05d45123fcec5cc595673eceaf05e67b8c430cef",
-        [
-         null,
-         {}
-        ]
-       ],
-       "rule-break-computed.html": [
-        "0490428f3e723f0e108aa6875cdaa676e145a859",
-        [
-         null,
-         {}
-        ]
-       ],
-       "rule-break-invalid.html": [
-        "a6eb68a1644ba848d86e7f92d0c8d121d0280403",
-        [
-         null,
-         {}
-        ]
-       ],
-       "rule-break-valid.html": [
-        "02f338806196110a12cd8c4a1b36d04b88a6905a",
-        [
-         null,
-         {}
-        ]
-       ],
-       "rule-outset-computed.html": [
-        "dd59018ccf5356a987cba45e4f1bddba2c6c4bd7",
-        [
-         null,
-         {}
-        ]
-       ],
-       "rule-outset-invalid.html": [
-        "f39139ade83af7d4b79d400f24c07a10a498d715",
-        [
-         null,
-         {}
-        ]
-       ],
-       "rule-outset-valid.html": [
-        "6ad45bbc7acd1eb95fd0b015b31dc41667c480d1",
-        [
-         null,
-         {}
-        ]
-       ],
-       "rule-paint-order-computed.html": [
-        "441be8670d782ccc6dbb252bea4288f87e43918e",
-        [
-         null,
-         {}
-        ]
-       ],
-       "rule-paint-order-invalid.html": [
-        "b18349a1aedadf9eda10fdea21ab03c99d9b0825",
-        [
-         null,
-         {}
-        ]
-       ],
-       "rule-paint-order-valid.html": [
-        "6a4294f7f4b5c07ea3b556e6cade62f47c6f72b3",
-        [
-         null,
-         {}
-        ]
+     "grid": {
+      "grid-gap-decorations-028.html": [
+       "125a34ca9668ecfc430f76e26365c62da17e3b4b",
+       [
+        null,
+        {}
        ]
-      }
+      ]
+     },
+     "parsing": {
+      "gap-decorations-bidirectional-shorthands.html": [
+       "9ff3815c21f0f2707c4813b1c32423dbdfe15c19",
+       [
+        null,
+        {}
+       ]
+      ],
+      "gap-decorations-col-rule-width.html": [
+       "db7b97e74a58f30a52b22b68a92475f48f865ed7",
+       [
+        null,
+        {}
+       ]
+      ],
+      "gap-decorations-color-computed.html": [
+       "fbc3c3f4c976b344d48a9bd927547214f072e3ab",
+       [
+        null,
+        {}
+       ]
+      ],
+      "gap-decorations-color-invalid.html": [
+       "5a0128e2303ebaef9469330ddfdb290ebeeff912",
+       [
+        null,
+        {}
+       ]
+      ],
+      "gap-decorations-color-valid.html": [
+       "f4cc0156e3f432d6193c1041d65077295496f1c3",
+       [
+        null,
+        {}
+       ]
+      ],
+      "gap-decorations-style-computed.html": [
+       "8c78bf618e3226609ad451e27ff97816b6b73cf6",
+       [
+        null,
+        {}
+       ]
+      ],
+      "gap-decorations-style-invalid.html": [
+       "48ac0680338de220caaa23eae06fbbffdabab634",
+       [
+        null,
+        {}
+       ]
+      ],
+      "gap-decorations-style-valid.html": [
+       "1eb259a82bce43751f6d511f33134a924f5b2aab",
+       [
+        null,
+        {}
+       ]
+      ],
+      "gap-decorations-width-computed.html": [
+       "299cbe0f3bbd8bc495912e59f6866b19513da914",
+       [
+        null,
+        {}
+       ]
+      ],
+      "gap-decorations-width-invalid.html": [
+       "025d52636266b1961cd5c0295a552eb612cf6455",
+       [
+        null,
+        {}
+       ]
+      ],
+      "gap-decorations-width-valid.html": [
+       "bd42d8356234cd51968877986b1927c7af301a12",
+       [
+        null,
+        {}
+       ]
+      ],
+      "rule-break-computed.html": [
+       "0490428f3e723f0e108aa6875cdaa676e145a859",
+       [
+        null,
+        {}
+       ]
+      ],
+      "rule-break-invalid.html": [
+       "a6eb68a1644ba848d86e7f92d0c8d121d0280403",
+       [
+        null,
+        {}
+       ]
+      ],
+      "rule-break-valid.html": [
+       "02f338806196110a12cd8c4a1b36d04b88a6905a",
+       [
+        null,
+        {}
+       ]
+      ],
+      "rule-outset-computed.html": [
+       "dd59018ccf5356a987cba45e4f1bddba2c6c4bd7",
+       [
+        null,
+        {}
+       ]
+      ],
+      "rule-outset-invalid.html": [
+       "f39139ade83af7d4b79d400f24c07a10a498d715",
+       [
+        null,
+        {}
+       ]
+      ],
+      "rule-outset-valid.html": [
+       "6ad45bbc7acd1eb95fd0b015b31dc41667c480d1",
+       [
+        null,
+        {}
+       ]
+      ],
+      "rule-paint-order-computed.html": [
+       "441be8670d782ccc6dbb252bea4288f87e43918e",
+       [
+        null,
+        {}
+       ]
+      ],
+      "rule-paint-order-invalid.html": [
+       "b18349a1aedadf9eda10fdea21ab03c99d9b0825",
+       [
+        null,
+        {}
+       ]
+      ],
+      "rule-paint-order-valid.html": [
+       "6a4294f7f4b5c07ea3b556e6cade62f47c6f72b3",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
+     "serialization": {
+      "gap-decorations-properties.html": [
+       "4985b5550f25f0ee0a2be125900f16c65c6ec0cf",
+       [
+        null,
+        {}
+       ]
+      ]
      }
     },
     "css-grid": {
@@ -584993,6 +592168,13 @@
        ]
       ]
      },
+     "grid-extrinsically-sized-mutations.html": [
+      "75600046e821099a19a0fa7b78670608fb626793",
+      [
+       null,
+       {}
+      ]
+     ],
      "grid-important.html": [
       "42896ed200d787a09255f28d31ec0a2238586304",
       [
@@ -585626,7 +592808,7 @@
        ],
        "parsing": {
         "masonry-parsing.html": [
-         "2204c06f72b8bd15c9662def13c3d89fb64048b4",
+         "64af83b316c912fcc4eeac9a13f52ed089d0f358",
          [
           null,
           {}
@@ -585637,7 +592819,7 @@
      },
      "parsing": {
       "grid-area-computed.html": [
-       "d1ae78c7023c9cbd9ea4040e63692c24b1323a74",
+       "9b31e2b23c6fbe99bc712a116a57e0384a5396e0",
        [
         null,
         {}
@@ -585749,7 +592931,7 @@
        ]
       ],
       "grid-columns-rows-get-set-multiple.html": [
-       "99af0110be7d14ae6a61f612cebf02c4a86be76b",
+       "c08290af9d573f58299e0a0dc92ec34528de4eb9",
        [
         null,
         {}
@@ -586336,7 +593518,7 @@
        ]
       ],
       "image-set-parsing.html": [
-       "83c0d73ab95439a806da2932f24a961c4cc5bf3a",
+       "ee57c8599eb421ff5559c2af2aafd791ba948b55",
        [
         null,
         {}
@@ -588284,21 +595466,21 @@
         ]
        ],
        "masonry-slack-computed.html": [
-        "abe20d543c7f7fd4e632e5b010c474341764e3a3",
+        "57f36c9f4a1a8ba728729ab2de1b0025cc81d47a",
         [
          null,
          {}
         ]
        ],
        "masonry-slack-invalid.html": [
-        "75bae04011a171de276312706e58dfaad811a431",
+        "6cdd0bd270c3119492b883ca22eee445a45ec4d4",
         [
          null,
          {}
         ]
        ],
        "masonry-slack-valid.html": [
-        "55044a98f6bf9fd7c7432b5bab397544ce57a43f",
+        "9dc6721541e79bb4b0d5c4b934c1650716f3cf6a",
         [
          null,
          {}
@@ -588357,8 +595539,8 @@
        {}
       ]
      ],
-     "dashed-function-cycles.tentative.html": [
-      "11e653e9b7d02d944e4bd74bda6e08e838c4ea42",
+     "dashed-function-cycles.html": [
+      "15305be2b287ca3e4fbfad928f8d101ed8463104",
       [
        null,
        {}
@@ -588592,6 +595774,34 @@
        {}
       ]
      ],
+     "getclientrects-005.html": [
+      "ee60a607dccb3fdba2ed7dc99cb344071f5bb34a",
+      [
+       null,
+       {}
+      ]
+     ],
+     "getclientrects-006.html": [
+      "9f07a7de7444de7a2f91f97ff0a4fe44b7e177af",
+      [
+       null,
+       {}
+      ]
+     ],
+     "getclientrects-007.html": [
+      "0791c5b931fe3fade4c7b4483ef2469435ffbd77",
+      [
+       null,
+       {}
+      ]
+     ],
+     "getclientrects-008.html": [
+      "21505a7e48a2d2f9947342329de19dfde974d8e5",
+      [
+       null,
+       {}
+      ]
+     ],
      "going-out-of-flow-after-spanner.html": [
       "2fe0e42a7522647b7eca4db1e6f710a9975faaa4",
       [
@@ -589035,6 +596245,13 @@
        ]
       ]
      },
+     "resize-multicol-with-fixed-size-children-003.html": [
+      "7e73c8373ed115002f6fb650f6ab5def0c673902",
+      [
+       null,
+       {}
+      ]
+     ],
      "scroll-width-height.tentative.html": [
       "9efaf1bff881264e2da85e28aa911c479d7739cf",
       [
@@ -589259,6 +596476,33 @@
        }
       ]
      ],
+     "column-scroll-marker-focus-002.html": [
+      "cd26b8aca85fe6d4e9ac643f4675d8ca1a3b83bd",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "column-scroll-marker-focus-003.html": [
+      "bb3868066e3d19a54c8701797b1cb73fba4dfd88",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "column-scroll-marker-focus-004.html": [
+      "fa6adbb15d00b795c5607f52d80924197204fccb",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "column-updates-computed-style.html": [
       "d741b8cf915a189e13a7f7c2738bb2880aa4e852",
       [
@@ -589579,7 +596823,7 @@
       ]
      },
      "resizer-no-size-change.tentative.html": [
-      "a8c659dc48d0f83e025c9f7f4abd5c24e3c3aa54",
+      "61b149e1da10717a93a218eb00ee9779398d4551",
       [
        null,
        {
@@ -589588,7 +596832,34 @@
       ]
      ],
      "resizer-transform.tentative.html": [
-      "7b1af7f8f9029b2e0a98a2f1a45390d28495e24a",
+      "8dfeac2d35b681235dba80cbcc7d4b3a30ec0316",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "root-scroll-button-activation.html": [
+      "bb377e52fdec3a911057ea3e95ffa4d139ea7858",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "root-scroll-marker-activation-and-scroll-tracking.html": [
+      "524e5399022a106133491edd9b926550439c7961",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "root-scroll-marker-activation-in-iframe.html": [
+      "4aee04eac20e08d4d1ea77b98927faf29fabb030",
       [
        null,
        {
@@ -589605,6 +596876,33 @@
        }
       ]
      ],
+     "scroll-button-activation-without-scroller.html": [
+      "f5951efc419d62a28f661c4f7d93cd9654b42616",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "scroll-button-disabled-no-focus.html": [
+      "a88977068742f03bdd4929ff1e3f96e581d9ba2d",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "scroll-button-display-none.html": [
+      "8b3068be6dad6d1ccbe1134b9833ecc1c8b0f594",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "scroll-button-hover-remove.html": [
       "af000012b4ec605fb0e30a34e50bc02119a9b925",
       [
@@ -589675,6 +596973,13 @@
        }
       ]
      ],
+     "scroll-marker-15.html": [
+      "764e56b55436ad461df39ec44e25d660c1d99bc6",
+      [
+       null,
+       {}
+      ]
+     ],
      "scroll-marker-activation-retains-focus.html": [
       "cf38ed354c73d3c5840258f87912a76c50ccebed",
       [
@@ -589693,6 +596998,15 @@
        }
       ]
      ],
+     "scroll-marker-active-unreached-target.html": [
+      "6a6bcc2891f56709aaaee6442f5abc6c0877c297",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "scroll-marker-controls-scroll-tracking-001.html": [
       "42dff1a7800176a6d5de9ecbf07d59dd47350e76",
       [
@@ -589784,6 +597098,24 @@
        }
       ]
      ],
+     "scroll-marker-inert-001.html": [
+      "612a4cb9f4b38d2de37ad7cd5f802c6ea5b7be32",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "scroll-marker-inert-002.html": [
+      "bf56426dea36459b427378419d4db6ee24409647",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "scroll-marker-navigation-cycles.html": [
       "d41b720ed9252b78845efb473d566f447ce71991",
       [
@@ -589938,6 +597270,55 @@
        {}
       ]
      ],
+     "scrollable-overflow-transform-004.html": [
+      "b398167fa309885658f044ccdd1df75bca880701",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scrollable-overflow-transform-005.tentative.html": [
+      "837b95ba96db71e7d696edfe4bb6c7c489e7a411",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scrollable-overflow-transform-006.html": [
+      "2eea759da6a1adad341b2145a8b29725e84c2db6",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scrollable-overflow-transform-007.html": [
+      "8aa6e5f17d8633e759d5b52b5096057c367d7b58",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scrollable-overflow-transform-008.html": [
+      "df1daeb842405ba6107be563e1652651ec232d58",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scrollable-overflow-transform-009.html": [
+      "aca1b28418adf361a38f59bb10e6ba3cdabd3097",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scrollable-overflow-transform-010.tentative.html": [
+      "e2c62cb4474ecbd486360fdd4aeb1c306a433f2d",
+      [
+       null,
+       {}
+      ]
+     ],
      "scrollable-overflow-transform-dynamic-001.html": [
       "a233376bdb222e5eeb45e3b5f646a84a665e6594",
       [
@@ -589980,6 +597361,13 @@
        {}
       ]
      ],
+     "scrollable-overflow-transform-unreachable-region.html": [
+      "91e987bf82654415f47500f9d6d7d568e4eefcbc",
+      [
+       null,
+       {}
+      ]
+     ],
      "scrollable-overflow-vertical-rl-dynamic.html": [
       "07f322901748c9709c3037d0223a546549cc9cff",
       [
@@ -590122,7 +597510,7 @@
       ]
      ],
      "overscroll-behavior-root.html": [
-      "18c172b40a13b5bac3bcfeb08f23d59fd94ee17e",
+      "71c5f6573d6f31f1ef872c09302063919597d8da",
       [
        null,
        {
@@ -590166,7 +597554,7 @@
     "css-page": {
      "cssom": {
       "margin-001.html": [
-       "29c38b2f98e854f79b385349e3bf05c64c25e20a",
+       "a9fdb24caf7fa69262cd788875ff9505af2d30a6",
        [
         null,
         {}
@@ -590194,7 +597582,7 @@
        ]
       ],
       "page-002.html": [
-       "0060d295b4a4f0949ac2d4ed0bb699b891007630",
+       "4669ec84a78477cb50d07d23f1a938dd1914eac1",
        [
         null,
         {}
@@ -590216,7 +597604,7 @@
       ]
      ],
      "page-rule-declarations-000.html": [
-      "cbe53855a0a6869dfc49d5997bba7584b04dcbdd",
+      "a1a63c9f38c7e52060cf68fec5e1162d9ba3ef45",
       [
        null,
        {}
@@ -591397,6 +598785,13 @@
         {}
        ]
       ],
+      "custom-property-transition-number-percentage.html": [
+       "5ec938182eecd08a1e3a399c1134b14074511808",
+       [
+        null,
+        {}
+       ]
+      ],
       "custom-property-transition-number.html": [
        "8ae01869fc18c48499183f6cc7408395ef72e45a",
        [
@@ -591792,6 +599187,15 @@
        {}
       ]
      ],
+     "focus-visible-originating-element.html": [
+      "05fc82324917c49ce3fab8e667dd3a9df51825d8",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "highlight-cascade": {
       "highlight-cascade-007.html": [
        "df79d8dff51ae23a75a7a4ef593f673ea596f36d",
@@ -593151,7 +600555,7 @@
        ]
       ],
       "snap-area-overflow-boundary-viewport-covering.tentative.html": [
-       "1c6caf224acf4ffa75d7d85013239dc0fa861cf2",
+       "5c03c049a010faf6e76efb9c68bbb0c4428e31d3",
        [
         null,
         {
@@ -593681,7 +601085,7 @@
        ]
       ],
       "scroll-start-overflow-toggled.tentative.html": [
-       "8829519024a3ce7e98e8bb1321c6f3f1509c40cd",
+       "8c0f2a45177eafd01816d2d8ab9a95cd6392c4e8",
        [
         null,
         {}
@@ -593973,6 +601377,13 @@
         {}
        ]
       ],
+      "resnap-on-oveflow-hidden-container.html": [
+       "41e454b2789cb90f1c72edf9f3dab8b3960b400d",
+       [
+        null,
+        {}
+       ]
+      ],
       "resnap-on-reconstructing-frame.html": [
        "d046608815aff119e443a17594a4947bea2ce587",
        [
@@ -594577,6 +601988,13 @@
        {}
       ]
      ],
+     "host-part-nesting.html": [
+      "c0dc8e20eee9ab3fda124ef99cb7623146b8a321",
+      [
+       null,
+       {}
+      ]
+     ],
      "host-stylesheet.html": [
       "2e65c4b1b57bd9959c68e85e11b442c67f2c5a42",
       [
@@ -594879,7 +602297,7 @@
        ]
       ],
       "shape-outside-computed.html": [
-       "19d69ee738855cc26822875651ab0e4c30381fb3",
+       "97ac87e1e610c2bc0d31869f7361bfe504d9b8ad",
        [
         null,
         {}
@@ -594893,7 +602311,7 @@
        ]
       ],
       "shape-outside-valid-position.html": [
-       "07b82ddda6472d04d8fc53a9803e83f8214723dd",
+       "5a23d4f5986633808872ee4b6490c0a37b0ae9d2",
        [
         null,
         {}
@@ -595737,7 +603155,7 @@
      ],
      "parsing": {
       "text-size-adjust-computed.html": [
-       "2d80b86172364343b785129b239e66a7b6b2e53e",
+       "5646f149d80810af473173690dbee590a58c6a53",
        [
         null,
         {}
@@ -595751,7 +603169,7 @@
        ]
       ],
       "text-size-adjust-valid.html": [
-       "bd58ae5f699790fe90cc125fef75cd8fcc52f2bd",
+       "a9835da3ab42d420df5959cd122544e0d5463fe9",
        [
         null,
         {}
@@ -596141,7 +603559,7 @@
        ]
       ],
       "contain-intrinsic-size-028.html": [
-       "15e8e0e89108b112bc113d6090946307379f53e7",
+       "da31a1efeadea5bf6f32b6aee6ec9e452a30917c",
        [
         null,
         {}
@@ -596183,7 +603601,7 @@
        ]
       ],
       "contain-intrinsic-size-logical-003.html": [
-       "48fedb11483342fd6f6fd580bab4f16b0b0fa334",
+       "9ee60268d60482ddbfe4c7263d2ce7b85e3c3c55",
        [
         null,
         {}
@@ -597020,7 +604438,7 @@
       ]
      ],
      "serialize-consecutive-tokens.html": [
-      "f6e220de64bb9565cac18d6ac2e2ab17e838ce1e",
+      "0b9015050b345b6fe765736b410f4b352b4a8f8b",
       [
        null,
        {}
@@ -600807,6 +608225,20 @@
        {}
       ]
      ],
+     "3d-point-mapping-coplanar.html": [
+      "0ae0ab1ee483f627c9a1142f82d9976ce7ee5a3c",
+      [
+       null,
+       {}
+      ]
+     ],
+     "3d-point-mapping-overlapping.html": [
+      "ffcfc1ae042697fc083ceb108182ba09086b4593",
+      [
+       null,
+       {}
+      ]
+     ],
      "3d-rendering-context-behavior.html": [
       "94e476c3426b53c96b6b1a7ebb70d7f0586e8313",
       [
@@ -601232,7 +608664,7 @@
        ]
       ],
       "transform-valid.html": [
-       "89a8b519b1b9c702d7bdedd3895e90c057a34dcb",
+       "b436fbdea30ec14b989bef19a747c67255fa2935",
        [
         null,
         {}
@@ -601905,7 +609337,7 @@
        ]
       ],
       "transition-timing-function-computed.html": [
-       "cb110549d0b072311d6f00e23bb5452170b0f43c",
+       "3bf1e818e7769c8f4f048f53fc1f4a2220d78441",
        [
         null,
         {}
@@ -601919,7 +609351,7 @@
        ]
       ],
       "transition-timing-function-valid.html": [
-       "658ef76bbe84d47864570be49726d36e75b1b555",
+       "5c7214e4041dcec617dc83ebca2c99c6b9bcd302",
        [
         null,
         {}
@@ -602181,6 +609613,13 @@
        {}
       ]
      ],
+     "transition-remove-and-change-immediate.html": [
+      "717436436302504ce8f068f56dfbba4a6671cce5",
+      [
+       null,
+       {}
+      ]
+     ],
      "transition-reparented.html": [
       "3dfd19425fcaa76051618113bfb4793baf06f364",
       [
@@ -602188,6 +609627,13 @@
        {}
       ]
      ],
+     "transition-zero-duration-with-delay.html": [
+      "0b6b9c37a9b2a1c225889c1f362beb9d559c25d7",
+      [
+       null,
+       {}
+      ]
+     ],
      "transitioncancel-001.html": [
       "6546195259fd9d1870942402fa80d1cb0ff13ea4",
       [
@@ -602204,6 +609650,13 @@
        {}
       ]
      ],
+     "transitioncancel-003.html": [
+      "1c47b3084d486eaaa8218defa689bd7cc4af357c",
+      [
+       null,
+       {}
+      ]
+     ],
      "transitionevent-interface.html": [
       "a40ba4537518361c13aab1d9b0648387f7c88aaa",
       [
@@ -602352,7 +609805,7 @@
        ]
       ],
       "parseAll-invalid.html": [
-       "45fad409bbfea4b8485514ed43087df62680dd24",
+       "1f66f448425b102437df7b3c44040f3d394f7c34",
        [
         null,
         {}
@@ -602403,7 +609856,7 @@
        ]
       ],
       "cssTransformValue.tentative.html": [
-       "89330b8e1c0c21dd598eb26d7a311dcf8a43ad2c",
+       "db877b526426f5f5da27db6a17eff1a84b61b6fa",
        [
         null,
         {}
@@ -602932,7 +610385,7 @@
       },
       "inline": {
        "append.tentative.html": [
-        "f80875622366939f48a7471513fb6319f75be718",
+        "fa23071c4f22468fd46015b9767c91d6ef81e232",
         [
          null,
          {}
@@ -603388,6 +610841,13 @@
          {}
         ]
        ],
+       "column-height.html": [
+        "f9986221f4886a756584258e8e3d4ad01c39c81c",
+        [
+         null,
+         {}
+        ]
+       ],
        "column-rule-color.html": [
         "3d35b856d71f2de9c87e83aa1ace57b3b4d8cf5d",
         [
@@ -604565,7 +612025,7 @@
         ]
        ],
        "transform.html": [
-        "7a852545a74a494348d90d727fc7266140033d2f",
+        "d12714a499c75ecbae8c4586f452d335594240fb",
         [
          null,
          {}
@@ -604889,6 +612349,13 @@
        {}
       ]
      ],
+     "cursor-calc-hotspot.html": [
+      "825d9571271c06d96302faa46edcf0f2e5a4cda9",
+      [
+       null,
+       {}
+      ]
+     ],
      "historical": {
       "moz-user-modify-01.html": [
        "595df9440e523fc371cf55975e4042d569163136",
@@ -604975,6 +612442,22 @@
        {}
       ]
      ],
+     "interactivity-inert-all.tentative.html": [
+      "e0bfe76db648fb1fcb040e85f0c4797a9996e601",
+      [
+       null,
+       {}
+      ]
+     ],
+     "interactivity-inert-animated.html": [
+      "8fc86dabbfd7245c1a88246597757931d7bb3ba3",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "interactivity-inert-click-002.html": [
       "4304aa47cf8d4042a731d532f72a4e84800c8d36",
       [
@@ -605333,6 +612816,15 @@
        ]
       ]
      },
+     "resize-iframe-3d-transform.tentative.html": [
+      "50c894084c7efbfed761a321458a92d8d07620a1",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "resize-interactive.html": [
       "2a2332d3ef58184aa55114758fa219a51f8fbd78",
       [
@@ -605342,6 +612834,33 @@
        }
       ]
      ],
+     "resize-textarea-relative-to-right-001.tentative.html": [
+      "95a0bf189ec32edb445d4a6d81ec97f7092592f1",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "resize-textarea-rtl-001.tentative.html": [
+      "dab08fb7514352d123a4cc9a70d4e291f94d8f79",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "resize-textarea-rtl-002.tentative.html": [
+      "1715df3bb47d2e5ce7cdf4452e765b79eba424c9",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "text-overflow-017.html": [
       "7f61a57620c126c9ee99c7a2d41b567d84506bf1",
       [
@@ -605449,7 +612968,7 @@
       ]
      ],
      "acos-asin-atan-atan2-computed.html": [
-      "76033289a2cef095392731b00e46e732f2e7f4d8",
+      "cacee588f3cbd6c6342960fab8d7e37f061ca906",
       [
        null,
        {}
@@ -605576,6 +613095,13 @@
        {}
       ]
      ],
+     "calc-complex-unresolved-serialize.html": [
+      "64bccd216abe357a3594d27f1b016d473c44f7a0",
+      [
+       null,
+       {}
+      ]
+     ],
      "calc-in-color-001.html": [
       "7db087def7552af2662524e26813aa51daae0cb1",
       [
@@ -605728,7 +613254,7 @@
         ]
        ],
        "calc-size-interpolation-expansion.html": [
-        "354d108f1daa5a020aa4499933bf1d965dd6573b",
+        "0b2a60cde7ff5ff93b492d9a1b7a53a231d3e445",
         [
          null,
          {}
@@ -605878,14 +613404,14 @@
        ]
       ],
       "calc-size-parsing.html": [
-       "6db2635e5ef7a841c84ba1ccf379bddb12192da7",
+       "a7e948497e7a6a06c6ad75e26183a2cb1e8a67c5",
        [
         null,
         {}
        ]
       ],
       "calc-size-typed-om.html": [
-       "8f9600e26a9c2a06e4c6ccf81fe3c040598e0905",
+       "606de7f50605d2617e79ff00a7f72a8c98f18556",
        [
         null,
         {}
@@ -606019,7 +613545,7 @@
       ]
      ],
      "exp-log-compute.html": [
-      "9efc1a7721c754828380deb61b530950f7efcea2",
+      "9b11fe25b3256b7d04766c9ac74fca02c050b80c",
       [
        null,
        {}
@@ -606082,14 +613608,14 @@
       ]
      ],
      "hypot-pow-sqrt-computed.html": [
-      "6ac416c0f5b35b1123722e945bcbc73d6b9de68b",
+      "19ce1c2d49dfe015126ba5c11a3f4058b7401ebb",
       [
        null,
        {}
       ]
      ],
      "hypot-pow-sqrt-invalid.html": [
-      "edecfceb13afe79ad0b13b6b5d29a9924f5fad9b",
+      "3e29889588399a53ddb7b1dbce84a9f2c0c36f7c",
       [
        null,
        {}
@@ -606109,7 +613635,7 @@
        {}
       ]
      ],
-     "if-cycle.tentative.html": [
+     "if-cycle.html": [
       "74d56dc9ed7c382ee8427feaefacc2198b94216f",
       [
        null,
@@ -606292,7 +613818,7 @@
       ]
      ],
      "minmax-length-serialize.html": [
-      "bd00ee058859b3b805e621474fa9221f2cd44d17",
+      "1ab6f84637913eb34dd16ac56dd5c7d22dbfbf35",
       [
        null,
        {}
@@ -606361,21 +613887,21 @@
        {}
       ]
      ],
-     "progress-computed.tentative.html": [
+     "progress-computed.html": [
       "8eb4e2b6757e2559b76c6a641dca40f1df32e0b7",
       [
        null,
        {}
       ]
      ],
-     "progress-invalid.tentative.html": [
+     "progress-invalid.html": [
       "f135487e1c4dd0cef9d99652c7c10a8ebe44070a",
       [
        null,
        {}
       ]
      ],
-     "progress-serialize.tentative.html": [
+     "progress-serialize.html": [
       "49c3a3c3d56596d529ee40df71373dca1290b16b",
       [
        null,
@@ -606383,21 +613909,23 @@
       ]
      ],
      "random-computed.tentative.html": [
-      "c6a408040cec4edbf5da1170a3c14594f0e12092",
+      "b0539acf5936d9bb742f855cae986ee591a919f4",
       [
        null,
-       {}
+       {
+        "timeout": "long"
+       }
       ]
      ],
      "random-invalid.tentative.html": [
-      "f21d36077dc777ace3b2a73d8b7c8bb0fd26fe6c",
+      "dd428868a2d0172c1cb0263e3467adab1e069b22",
       [
        null,
        {}
       ]
      ],
      "random-serialize.tentative.html": [
-      "43dc3a3f67760316bbdf3c926ffa0a4c9e893450",
+      "5c0b9601da055ca9a54231080df17b44a602d6dd",
       [
        null,
        {}
@@ -606516,7 +614044,7 @@
       ]
      ],
      "sin-cos-tan-computed.html": [
-      "a19b118f75489d9f9e1ad5b7a6f65d2318f183d8",
+      "80b4d1972f6b2c0ac38baba22ba7d1cc94eb321e",
       [
        null,
        {}
@@ -606538,7 +614066,7 @@
      ],
      "tree-counting": {
       "calc-sibling-function-in-shadow-dom.html": [
-       "92fb6ce3351b9c37b3616445b4f83969a5f30b63",
+       "ca8eb560ba13c8849a468442cc242a68398bbb9f",
        [
         null,
         {}
@@ -606566,14 +614094,14 @@
        ]
       ],
       "sibling-function-descriptors.tentative.html": [
-       "d31d4acf499fb62f777817f24186e394626d507e",
+       "76d2ff8ee4db660e41ede9b188465a6c31843e3b",
        [
         null,
         {}
        ]
       ],
       "sibling-function-invalidation.html": [
-       "3c75c78530dca4cfb30dfc0c17c0ad2049cfb087",
+       "74f4995f5f72413330e577a3a4c72ce095479225",
        [
         null,
         {}
@@ -606586,6 +614114,20 @@
         {}
        ]
       ],
+      "sibling-index-keyframe-length-value-dynamic.html": [
+       "cbd34602fb3c74f3cea8a1e2192d1b5687e38a05",
+       [
+        null,
+        {}
+       ]
+      ],
+      "sibling-index-keyframe-value-dynamic.html": [
+       "286e0d3d3e2eecdd091df74c8c47f738cb700dd1",
+       [
+        null,
+        {}
+       ]
+      ],
       "tree-scoped-sibling-function.html": [
        "979466bb7cf3d5e5c4e9a2681f02f969858953e6",
        [
@@ -606629,6 +614171,27 @@
         null,
         {}
        ]
+      ],
+      "url-request-modifiers-computed.sub.html": [
+       "bc8c4ad95df7a33a64b92d240cf68d14594745b2",
+       [
+        null,
+        {}
+       ]
+      ],
+      "url-request-modifiers-invalid.sub.html": [
+       "c30edfbaeaae9f3a610c5c6e12becdae85ff1ebb",
+       [
+        null,
+        {}
+       ]
+      ],
+      "url-request-modifiers-serialize.sub.html": [
+       "cca9f2ccf9b04719e8266d56fde09fb0154fcb47",
+       [
+        null,
+        {}
+       ]
       ]
      },
      "various-values-important.html": [
@@ -607281,7 +614844,7 @@
        ]
       ],
       "pageswap-in-hidden-doc-should-skip-transition.html": [
-       "aceced0dded84f88782356a99d96fec5febd40c3",
+       "2fddb7e17a4c7bdd006a255cb8e7d713c2c29660",
        [
         null,
         {
@@ -607420,7 +614983,7 @@
       ]
      ],
      "only-child-group.html": [
-      "551e8816116c9b54f35dc2afbff57eb5460251f5",
+      "970a5a501144ddf68cd9d34294a0d48a05a57e4c",
       [
        null,
        {}
@@ -607597,6 +615160,48 @@
       ]
      ],
      "scoped": {
+      "auto-name-on-descendant.html": [
+       "01d570e8bfced7cd702f42ed4def947b5f74e007",
+       [
+        null,
+        {}
+       ]
+      ],
+      "auto-name.html": [
+       "2d11985b3986b479304d5de0195eea1840148868",
+       [
+        null,
+        {}
+       ]
+      ],
+      "capture.html": [
+       "06f848d2de16d7a26defcc3279d24622ceb32f54",
+       [
+        null,
+        {}
+       ]
+      ],
+      "display-none-during-transition.html": [
+       "f94d6f7fd76af7a889e5a9a1cf6fc6538377eb0e",
+       [
+        null,
+        {}
+       ]
+      ],
+      "document-element-start-view-transition.html": [
+       "42f87f93a07fac6715d422dea4d1e5835437858e",
+       [
+        null,
+        {}
+       ]
+      ],
+      "run_in_parallel.html": [
+       "1afdae2be9d8092953746d360d2a77ea1a538ba1",
+       [
+        null,
+        {}
+       ]
+      ],
       "start-view-transition.html": [
        "a1bc95891956e6678c8ee2ecd51be7d6e94b70ca",
        [
@@ -607605,6 +615210,13 @@
        ]
       ]
      },
+     "start-skip-start.html": [
+      "e04979472f1725b0225cdb98bbbd5222ed98c16c",
+      [
+       null,
+       {}
+      ]
+     ],
      "start-view-transtion-skips-active.html": [
       "971c7b38d4c816489caab9c611adc800b3638971",
       [
@@ -607626,6 +615238,13 @@
        {}
       ]
      ],
+     "to-keyframe-values.html": [
+      "f50cf993ee80e9d04dc8b6e95789ca499d9e4491",
+      [
+       null,
+       {}
+      ]
+     ],
      "transition-in-hidden-page.html": [
       "c2d0044c69237efecb36cc6a1b202ac2ca4715dd",
       [
@@ -607674,7 +615293,7 @@
       ]
      ],
      "view-transition-types-mutable-no-document-element-crashtest.html": [
-      "f1940c398695989d6cc569ffb25a03a83be1d064",
+      "3ac946b273ba9fa9f9da27b10e492420daa3430a",
       [
        null,
        {}
@@ -607695,7 +615314,7 @@
       ]
      ],
      "window-resize-aborts-transition-before-ready.html": [
-      "3c4ba37b26b0dff7f4e0d79ef55dd95f1a375ce1",
+      "09e6e6cc1c9c003237c280bf2612109f3b7f379f",
       [
        null,
        {
@@ -607704,7 +615323,7 @@
       ]
      ],
      "window-resize-aborts-transition.html": [
-      "8d61a3e3c53998cf612ff544895cd0f34f96a6e8",
+      "966f23c0fdf98ba31fbfa8ce627460a50fa10b0b",
       [
        null,
        {
@@ -607766,6 +615385,13 @@
         {}
        ]
       ],
+      "zoom-iframe-dynamic.html": [
+       "1836408fb33f4111be2e1f8e389defa7741cd5ca",
+       [
+        null,
+        {}
+       ]
+      ],
       "zoom-with-sign-function.html": [
        "d3df186199bc8b4e28f7becdad555210d063a225",
        [
@@ -608823,7 +616449,7 @@
       ]
      ],
      "cssom-fontfacerule-constructors.html": [
-      "ed1cab257df2d14055040301ec8ce39fbedd3b11",
+      "7068b822a1cb510127a7e7b0fdd5de6dd597f573",
       [
        null,
        {}
@@ -608872,14 +616498,14 @@
       ]
      ],
      "cssstyledeclaration-cssfontrule.tentative.html": [
-      "2efab276c5bf3a7e66be5bdd0ae1c4d6b697944b",
+      "f56d23e553bfe1c7db1f2a3fe73a43d66855d92a",
       [
        null,
        {}
       ]
      ],
      "cssstyledeclaration-csstext-all-shorthand.html": [
-      "3b408f4cd6740e37451d2cd2a3669fb107427ae8",
+      "1e22420064925c4b67124076bae24d17d1ed92bc",
       [
        null,
        {}
@@ -609256,6 +616882,13 @@
        {}
       ]
      ],
+     "getComputedStyle-resolved-min-size-auto.html": [
+      "be6010d1999eddd84bcd555bde83f008e3c643aa",
+      [
+       null,
+       {}
+      ]
+     ],
      "getComputedStyle-sticky-pos-percent.html": [
       "12ad5e89653564f91006c78baeac353c12865c00",
       [
@@ -609278,7 +616911,7 @@
       ]
      ],
      "idlharness.html": [
-      "e27629c03b152da8359e1b25f8cd7d99195e27e4",
+      "a54b77a3b94eb66b67b0b73a06033479bcd476ba",
       [
        null,
        {
@@ -610016,6 +617649,13 @@
        {}
       ]
      ],
+     "getBoundingClientRect-newline.html": [
+      "ce82b7237d003d79fe4333e5a67aa74b004bb11c",
+      [
+       null,
+       {}
+      ]
+     ],
      "getBoundingClientRect-shy.html": [
       "b27a7884605f16cbac77e705d05f8ab519a39d9e",
       [
@@ -610485,6 +618125,13 @@
        {}
       ]
      ],
+     "scrollIntoView-container.html": [
+      "3b241ea22517ecc5db6f286422233ed9f25cab5f",
+      [
+       null,
+       {}
+      ]
+     ],
      "scrollIntoView-fixed-outside-of-viewport.html": [
       "b3d61a430a3d2b566ff73b0844a79bf5ec4e92db",
       [
@@ -610710,7 +618357,7 @@
       ]
      ],
      "scrollingElement.html": [
-      "408fa47be9a3330aff88ef01e9b8be90fd4008ce",
+      "093c016da557ff867f86b13f5dff9c6d118230ff",
       [
        null,
        {}
@@ -610789,7 +618436,7 @@
       ]
      ],
      "table-client-props.html": [
-      "4af06d6bf71f0df75d3710ec0906445e943d340d",
+      "2895bebebbf1868ef60f947d230ecca96dd6e85a",
       [
        null,
        {}
@@ -610823,8 +618470,26 @@
        {}
       ]
      ],
-     "visual-scrollIntoView.html": [
-      "78a3203c58587b6cf9d78faa607105dc8751179d",
+     "visual-scrollIntoView-001.html": [
+      "825556be9691c2438be783df203e54d6b1c8d189",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "visual-scrollIntoView-002.html": [
+      "7f9170654e3220807b7980bfb9c2e16c1821ce7b",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "visual-scrollIntoView-003.html": [
+      "c0592098a90e7550781242a042c810d655b4c356",
       [
        null,
        {
@@ -610961,6 +618626,13 @@
        {}
       ]
      ],
+     "css-filters-opacity-hit-testing.html": [
+      "3b288fca4df13fcad7cfe0104c0f333aec73e45c",
+      [
+       null,
+       {}
+      ]
+     ],
      "filter-sign-function.html": [
       "97e5a26073b097728cf4571712bb9bd472ed69fd",
       [
@@ -611104,7 +618776,7 @@
        ]
       ],
       "flood-opacity-computed.svg": [
-       "a395eda22e377757afc1583016e8d14da13268cc",
+       "9024aaa4f3f2ba3b08d4eb65933553db44e5ed3f",
        [
         null,
         {}
@@ -611118,7 +618790,7 @@
        ]
       ],
       "flood-opacity-valid.svg": [
-       "67eb37fad5ec15e01f9f54ea016e74606dec9f03",
+       "7c11b26bc9226c2a9ba83d50fe488a9642f72974",
        [
         null,
         {}
@@ -611156,7 +618828,7 @@
     },
     "geometry": {
      "DOMMatrix-001.html": [
-      "f578da076cbe6d7d7eb69b2cf438aa6f11a5c060",
+      "3436e17ced00de235f23117ed3a2bf8eba828a03",
       [
        null,
        {}
@@ -611649,7 +619321,7 @@
        ]
       ],
       "offset-path-interpolation-008.html": [
-       "2af20f78d1f641f49c77afb53eb992705b406504",
+       "5fb7c7c333c89f4107e2824390c73862be8107d0",
        [
         null,
         {}
@@ -611791,14 +619463,14 @@
        ]
       ],
       "offset-path-shape-computed.html": [
-       "8904eaf16a2771e5a42f5ff9b2d4a5623fe6066b",
+       "c9ecc3acb06c065913f8b7538fdf81bff6c802df",
        [
         null,
         {}
        ]
       ],
       "offset-path-shape-parsing.html": [
-       "6ca288b660e4a322f7585feba86a776674fa9732",
+       "013cea2c8211d97a5e90c42379cf5aadfe8b59fd",
        [
         null,
         {}
@@ -613421,7 +621093,7 @@
       ]
      ],
      "open-pseudo.html": [
-      "0f3b9f3c37966fa0be02d583ba8549c663e54df1",
+      "c215bf18645c1fda60bd15fffe650e0ba0edcc80",
       [
        null,
        {
@@ -613839,36 +621511,6 @@
       {}
      ]
     ],
-    "custom-element-registry": {
-     "define-customized-builtins.html": [
-      "b691033871c05b680c13dca7e7cae0f25962f2af",
-      [
-       null,
-       {}
-      ]
-     ],
-     "define.html": [
-      "d3d923bd916fd04576d0de1d809e43a5395b9edb",
-      [
-       null,
-       {}
-      ]
-     ],
-     "per-global.html": [
-      "3570dcf811dbac33ecf60cd845f5b287f65ea550",
-      [
-       null,
-       {}
-      ]
-     ],
-     "upgrade.html": [
-      "e020d95a576852b8a95c1f72a6061571efb6a4af",
-      [
-       null,
-       {}
-      ]
-     ]
-    },
     "customized-built-in-constructor-exceptions.html": [
      "fbc1a6fd87480db9f6f90bf78bbe2aabf8a57f83",
      [
@@ -614018,7 +621660,7 @@
      ]
     },
     "historical.html": [
-     "5a961b13ad7f44f64b3df6dafeeb9321e8bf6762",
+     "a2713ad57c5b605fab14a3b80907a231bfde364b",
      [
       null,
       {}
@@ -614578,192 +622220,214 @@
       ]
      ]
     },
-    "revamped-scoped-registry": {
-     "Construct.tentative.html": [
-      "8233e6832eb928d7b59d38de876528f94f3e0456",
+    "registries": {
+     "Construct.html": [
+      "a5e825f439a1f38772f5aa5713d959da970a3412",
       [
        null,
        {}
       ]
      ],
-     "CustomElementRegistry-define.tentative.html": [
+     "CustomElementRegistry-define.html": [
       "9ade81bef0ca59a46310c0c19c6f0c1cf0c78168",
       [
        null,
        {}
       ]
      ],
-     "CustomElementRegistry-initialize.tentative.html": [
-      "7ccc63e2077d6abeb2bf82f248fab75696f1c08d",
+     "CustomElementRegistry-initialize.html": [
+      "c4b291751eca8c135657845e1cda244397607cbf",
       [
        null,
        {}
       ]
      ],
-     "CustomElementRegistry-upgrade.tentative.html": [
-      "575b23e0ee44784c8ac8200140e13a6a8990f1ae",
-      [
-       null,
-       {}
-      ]
-     ],
-     "Document-createElement.tentative.html": [
-      "23a8ba5b06db4a3a24f4bdfb0b7d136bf9265831",
-      [
-       null,
-       {}
-      ]
-     ],
-     "Document-createElementNS.tentative.html": [
-      "35a30999ce7f79e985eb8fb8888a163ae136ae31",
-      [
-       null,
-       {}
-      ]
-     ],
-     "Document-importNode.tentative.html": [
-      "989dea0b263aee88f621e010792151e03406688d",
-      [
-       null,
-       {}
-      ]
-     ],
-     "Element-customElements-exceptions.tentative.html": [
-      "4442c04c53de4ebd975d4bb243f83027772702b1",
-      [
-       null,
-       {}
-      ]
-     ],
-     "Element-customElements.tentative.html": [
-      "e27074d5eb6509b91c6c214c226029dc9426bc05",
-      [
-       null,
-       {}
-      ]
-     ],
-     "Element-innerHTML.tentative.html": [
-      "dcbbbdcd673e746ab95a45aff4274ba1fa11dffb",
-      [
-       null,
-       {}
-      ]
-     ],
-     "ShadowRoot-init-customElements.tentative.html": [
-      "6169bfff1166a9d21520772aaf6581343cf23245",
-      [
-       null,
-       {}
-      ]
-     ],
-     "ShadowRoot-innerHTML.tentative.html": [
-      "9cfa1759d391fc80b96e9df229e9486f59d8b2a3",
-      [
-       null,
-       {}
-      ]
-     ],
-     "polymer-polyfill-regression.tentative.html": [
-      "d3d56c8125e0d5ff05e87194b2794497c7f6f942",
-      [
-       null,
-       {}
-      ]
-     ],
-     "template.tentative.window.js": [
-      "68a247d346d43fe164b97c93d09ce4f6ce7e5645",
-      [
-       "custom-elements/revamped-scoped-registry/template.tentative.window.html",
-       {}
-      ]
-     ]
-    },
-    "scoped-registry": {
-     "CustomElementRegistry-constructor.tentative.html": [
-      "d80a1fbe6c80aea79f2d7adc01d85b0e3ca7e50b",
-      [
-       null,
-       {}
-      ]
-     ],
-     "CustomElementRegistry-multi-register.tentative.html": [
+     "CustomElementRegistry-multi-register.html": [
       "bd97017308ae627d4922d7818b8d4e6530680e62",
       [
        null,
        {}
       ]
      ],
-     "ShadowRoot-createElement.tentative.html": [
-      "335773f9c6d011578f9c6093ee051c8a12085ada",
+     "CustomElementRegistry-upgrade.html": [
+      "0f7a7a835bec5010195bc30f92bdb2f078ddf409",
       [
        null,
        {}
       ]
      ],
-     "ShadowRoot-importNode.tentative.html": [
-      "dc5ef24bd8009ecc27ac8b592a44497a91b9a68f",
+     "Document-createElement.html": [
+      "c3dd6d9b85782672f3ec97bebf8288c8fe9756f0",
       [
        null,
        {}
       ]
      ],
-     "ShadowRoot-init-registry.tentative.html": [
-      "f9bc5b5b5686a0f5cb43ea653f623ba164c5cabb",
+     "Document-createElementNS.html": [
+      "d9b21113339505b97fc1bf3f7fabdf51f806e574",
       [
        null,
        {}
       ]
      ],
-     "ShadowRoot-innerHTML-upgrade.tentative.html": [
-      "11cecb1533b53839570387ff5d0c5e9e9df69f56",
+     "Document-customElementRegistry.html": [
+      "ba062aa3cfc2f7740940c73ffe4c194e2f9c6654",
       [
        null,
        {}
       ]
      ],
-     "ShadowRoot-innerHTML.tentative.html": [
-      "bee3f18a96d2e3694e5d859e1ca1dc2da5047d4e",
+     "Document-importNode.html": [
+      "149a135c41ce80c01ae2d2f1eacbf0eb9365ceb9",
       [
        null,
        {}
       ]
      ],
-     "constructor-call.tentative.html": [
-      "19a8e3f4d8ac690aef9903c492df7a2f8fe99fad",
+     "Element-customElementRegistry-exceptions.html": [
+      "fb213b1d15ac81bff4feb345d6fdcaa082c1e48b",
       [
        null,
        {}
       ]
      ],
-     "constructor-reentry-with-different-definition.tentative.html": [
-      "dc93e3c702d5789657f92d81294b378bcf37c6e4",
+     "Element-customElementRegistry.html": [
+      "72e54bdbaabd1a70aa7b0d1e2bebb767f63f576a",
       [
        null,
        {}
       ]
      ],
-     "scoped-registry-define-upgrade-criteria.tentative.html": [
-      "d3d5d4fb969d2c9c42b67ed131257ed78d6c1301",
+     "Element-innerHTML.html": [
+      "c4f3ad34ddf7573ba8b0154eadc32432ad92c65e",
       [
        null,
        {}
       ]
      ],
-     "scoped-registry-define-upgrade-order.tentative.html": [
-      "4fb0f49f9f0bd761ac8e6b9fc68970f20f675e71",
+     "ShadowRoot-init-customElementRegistry.html": [
+      "bbf1b414aa0df9ecef458a773d903fd446b5b037",
       [
        null,
        {}
       ]
      ],
-     "scoped-registry-registry-define-get-etc.tentative.html": [
-      "c37f27ba023cc471e73aacead65376251b1be89d",
+     "ShadowRoot-innerHTML.html": [
+      "0d4be66544007805484e7871b64c22d68880c55c",
+      [
+       null,
+       {}
+      ]
+     ],
+     "constructor-reentry-with-different-definition.html": [
+      "ef104ebe4c1df1affe6540dae1138e40b724432e",
+      [
+       null,
+       {}
+      ]
+     ],
+     "define-customized-builtins.html": [
+      "b691033871c05b680c13dca7e7cae0f25962f2af",
+      [
+       null,
+       {}
+      ]
+     ],
+     "define.html": [
+      "d3d923bd916fd04576d0de1d809e43a5395b9edb",
+      [
+       null,
+       {}
+      ]
+     ],
+     "initial-about-blank.window.js": [
+      "b3bb7e139b5c543bae2d4cc86d3f5ebe1fe197f1",
+      [
+       "custom-elements/registries/initial-about-blank.window.html",
+       {}
+      ]
+     ],
+     "per-global.html": [
+      "3570dcf811dbac33ecf60cd845f5b287f65ea550",
+      [
+       null,
+       {}
+      ]
+     ],
+     "pseudo-class-defined.window.js": [
+      "71c0459e39cb0e06ef1780adbd964b8b25d1bc57",
+      [
+       "custom-elements/registries/pseudo-class-defined.window.html",
+       {}
+      ]
+     ],
+     "scoped-registry-define-upgrade-criteria.html": [
+      "9c9b076aa8d615c43fecaa77c62e404739db8cfc",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scoped-registry-define-upgrade-order.html": [
+      "d115522a7b8e19dbbeaea3bcc88121df0d7b4384",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scoped-registry-registry-define-get-etc.html": [
+      "29e11d97052c0683d92089583957c8217a98fa4f",
+      [
+       null,
+       {}
+      ]
+     ],
+     "template.window.js": [
+      "7d442a618f846ef30fde5c655e8127028e01beea",
+      [
+       "custom-elements/registries/template.window.html",
+       {}
+      ]
+     ],
+     "upgrade.html": [
+      "e020d95a576852b8a95c1f72a6061571efb6a4af",
       [
        null,
        {}
       ]
      ]
     },
+    "revamped-scoped-registry": {
+     "idlharness.tentative.window.js": [
+      "1f5c776cc2513e651de15b85884ba785027e59b6",
+      [
+       "custom-elements/revamped-scoped-registry/idlharness.tentative.window.html",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/WebIDLParser.js"
+         ],
+         [
+          "script",
+          "/resources/idlharness.js"
+         ],
+         [
+          "global",
+          "window,dedicatedworker,shadowrealm-in-window"
+         ]
+        ]
+       }
+      ]
+     ]
+    },
+    "scoped-registry-initialize.html": [
+     "18dbd0ebeddc0d115d596058fc11d863397c4ee5",
+     [
+      null,
+      {}
+     ]
+    ],
     "state": {
      "ElementInternals-states.html": [
       "1521a8098a36f0c0339fc1e7dceac12d149de385",
@@ -615017,6 +622681,13 @@
       {}
      ]
     ],
+    "fetch-no-credentials.https.html": [
+     "4cac685727ad29cd96be041753623cbc4fdd1be6",
+     [
+      null,
+      {}
+     ]
+    ],
     "include-site.https.html": [
      "6eaf522c73ba6d6378c60f8460fb3497cd8df424",
      [
@@ -615229,8 +622900,26 @@
     ]
    },
    "digital-credentials": {
-    "allow-attribute.https.html": [
-     "667b84bc704c23602b481538ea16f6f77f801902",
+    "allow-attribute-with-create.https.html": [
+     "4b1e96fec4cb62d336d3c1358a7c9781e6657f8d",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "allow-attribute-with-get.https.html": [
+     "15601d891f25c4c2d75dad2260d1b45a26a9344d",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "create.disabled-by-permissions-policy.https.sub.html": [
+     "52db2373f09596b01e2df28fdf14e34e540d3777",
      [
       null,
       {
@@ -615239,7 +622928,7 @@
      ]
     ],
     "create.tentative.https.html": [
-     "299a240ced17f11c8d5249d65b54e873fe3362b3",
+     "3e17d5b0853b38b36cb640ee665a12c398eb4ed3",
      [
       null,
       {
@@ -615248,7 +622937,7 @@
      ]
     ],
     "default-permissions-policy.https.sub.html": [
-     "742a94ec4eb8ff079b1b24f17179962818fb3868",
+     "8041e25d33bd302fb6bcbf37f7111a00f5907fe2",
      [
       null,
       {
@@ -615263,7 +622952,16 @@
       {}
      ]
     ],
-    "disabled-by-permissions-policy.https.sub.html": [
+    "enabled-on-self-origin-by-permissions-policy.https.sub.html": [
+     "261ebb0ce705329cf7fe54fa50cbb6e20179fe0c",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "get.disabled-by-permissions-policy.https.sub.html": [
      "c32f73aa309b64e5785d67b3565077a8ac6b8424",
      [
       null,
@@ -615272,26 +622970,8 @@
       }
      ]
     ],
-    "enabled-on-self-origin-by-permissions-policy.https.sub.html": [
-     "d530f4920a395b0a612964a32b60fec65833054e",
-     [
-      null,
-      {
-       "testdriver": true
-      }
-     ]
-    ],
-    "get-user-activation.https.html": [
-     "fbf2099dad37443c4522e3a838ab962f2c260004",
-     [
-      null,
-      {
-       "testdriver": true
-      }
-     ]
-    ],
     "get.tentative.https.html": [
-     "a090e1b14321bd31ea3e1d5470bbe9442a99dd08",
+     "b04a6e3a713e26f759cc62d81a6a439ea69e189e",
      [
       null,
       {
@@ -615311,7 +622991,16 @@
      ]
     ],
     "non-fully-active.https.html": [
-     "9e617827f6468dfe1b7d91fb2d47db4193f69143",
+     "3c09b132daf76ec719cadf2fc741d60a2a8d0df2",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "user-activation.https.html": [
+     "facaf7bddbbd419801a9ffa470f4bb5bbc1ab07c",
      [
       null,
       {
@@ -616621,6 +624310,13 @@
       ]
      ],
      "non-cancelable-when-passive": {
+      "generic-events-stay-cancelable.html": [
+       "961794728d3799a2096bad18dd60e79f619533a4",
+       [
+        null,
+        {}
+       ]
+      ],
       "non-passive-mousewheel-event-listener-on-body.html": [
        "5574fe0acbcccb64ff05213fa518c49d4149e7e4",
        [
@@ -617045,7 +624741,7 @@
         }
        ]
       ],
-      "overscroll-deltas.html": [
+      "overscroll-deltas.tentative.html": [
        "e13e9f1cce5949da74227a1f069f64baad1f517c",
        [
         null,
@@ -617054,7 +624750,7 @@
         }
        ]
       ],
-      "overscroll-event-fired-to-document.html": [
+      "overscroll-event-fired-to-document.tentative.html": [
        "c054ffca9c471f78ce5d1cbaa210fa7aad3aee3b",
        [
         null,
@@ -617063,7 +624759,7 @@
         }
        ]
       ],
-      "overscroll-event-fired-to-element-with-overscroll-behavior.html": [
+      "overscroll-event-fired-to-element-with-overscroll-behavior.tentative.html": [
        "750080e6568e863a9249bc62e52971d9459f8418",
        [
         null,
@@ -617072,7 +624768,7 @@
         }
        ]
       ],
-      "overscroll-event-fired-to-scrolled-element.html": [
+      "overscroll-event-fired-to-scrolled-element.tentative.html": [
        "be4176df59d6a1d59d90beee839bc5ca6a72f1c5",
        [
         null,
@@ -617081,7 +624777,7 @@
         }
        ]
       ],
-      "overscroll-event-fired-to-window.html": [
+      "overscroll-event-fired-to-window.tentative.html": [
        "ef5ae3daef8158c9424cf07ad091c6a945456d0a",
        [
         null,
@@ -617090,6 +624786,15 @@
         }
        ]
       ],
+      "scroll-cross-origin-iframes.html": [
+       "4c873139965c34378eb7ad65dcb56540df42c60d",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
       "scrollend-event-fired-after-sequence-of-scrolls.tentative.html": [
        "dab6dcc9bd8d67a514ca95daf3e1d64b10a45188",
        [
@@ -617220,9 +624925,37 @@
        ]
       ],
       "scrollend-event-fired-for-scrollIntoView.html": [
-       "40aa77f4764b6c4301b8aba7221e1e42e768505d",
+       "e3e63f2820158623851bc83ec6b49d6da9adc0c2",
        [
-        null,
+        "dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html?include=nested-scrollIntoView",
+        {
+         "testdriver": true,
+         "timeout": "long"
+        }
+       ],
+       [
+        "dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html?include=root-inline-end-block-end-behavior-auto",
+        {
+         "testdriver": true,
+         "timeout": "long"
+        }
+       ],
+       [
+        "dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html?include=root-inline-start-block-start-behavior-smooth",
+        {
+         "testdriver": true,
+         "timeout": "long"
+        }
+       ],
+       [
+        "dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html?include=subframe-inline-end-block-end-behavior-auto",
+        {
+         "testdriver": true,
+         "timeout": "long"
+        }
+       ],
+       [
+        "dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html?include=subframe-inline-start-block-start-behavior-smooth",
         {
          "testdriver": true,
          "timeout": "long"
@@ -618640,6 +626373,13 @@
        {}
       ]
      ],
+     "Node-childNodes-cache-2.html": [
+      "9079fc6ea7a146cb854389bf4f1b8c302a102746",
+      [
+       null,
+       {}
+      ]
+     ],
      "Node-childNodes-cache.html": [
       "da9e32c6a9cf579f3d7c6ce2e3208e04f90d7105",
       [
@@ -619084,7 +626824,7 @@
       ]
      ],
      "attributes-namednodemap.html": [
-      "96f9d30703b01dfe446a9acb37ff07a5a1da0cb0",
+      "0b631c1fb93d9ff32fa012540630791326508269",
       [
        null,
        {}
@@ -619570,7 +627310,7 @@
        ]
       ],
       "custom-element-move-reactions.html": [
-       "a561180f9457c00a615ba6464751f4bd1ec825dd",
+       "c5702eb7bc17153af75f5135daea80deb024b58d",
        [
         null,
         {}
@@ -619583,6 +627323,13 @@
         {}
        ]
       ],
+      "focus-preserve.html": [
+       "a00e8b77880697a51d4418fc15637b1dcef6914b",
+       [
+        null,
+        {}
+       ]
+      ],
       "focus-within.html": [
        "18d8c93b9982dd96a14c5548257292ad7b76c315",
        [
@@ -619747,15 +627494,6 @@
         {}
        ]
       ],
-      "tentative": {
-       "focus-preserve.html": [
-        "a00e8b77880697a51d4418fc15637b1dcef6914b",
-        [
-         null,
-         {}
-        ]
-       ]
-      },
       "throws-exception.html": [
        "34123c72dfd1bf8617f716cf755bd4d9e34e0272",
        [
@@ -619959,7 +627697,7 @@
        ]
       ],
       "observable-from.any.js": [
-       "b5fcb5ed1fc6c89725d3bd26f2702b8156fb159d",
+       "20b2c8010ccf3b870bfb9d731b2e0273bdc2384c",
        [
         "dom/observable/tentative/observable-from.any.html",
         {}
@@ -620577,6 +628315,13 @@
      ]
     ],
     "xslt": {
+     "document-element.window.js": [
+      "4079533c1e0d9b62bf3d9b244101b6850c9e3935",
+      [
+       "dom/xslt/document-element.window.html",
+       {}
+      ]
+     ],
      "document-function.window.js": [
       "a01f3b37c945d0fcded4a0853d32e97d60bb9696",
       [
@@ -620679,7 +628424,7 @@
      ]
     ],
     "XMLSerializer-serializeToString.html": [
-     "ad65c9fafb370de6d482bd0166bc030453750b4d",
+     "352a62c7d5db0710da6819bbc094ebfae46f4099",
      [
       null,
       {}
@@ -620783,6 +628528,13 @@
       {}
      ]
     ],
+    "xml-parse-serialize-roundtrip.html": [
+     "5195b9f04b5dd9f47937a5d11d2e82f09fdb9204",
+     [
+      null,
+      {}
+     ]
+    ],
     "xml-serialization.xhtml": [
      "852bbcc9fd1b1c91fd544dfc2fc462efc1195a4a",
      [
@@ -621006,7 +628758,7 @@
    },
    "ecmascript": {
     "locale-compat.html": [
-     "74806987879e74befd087489285b6610d8107089",
+     "1f863b21ecb3b74287f9f5464303dec45c116c16",
      [
       null,
       {}
@@ -621140,6 +628892,24 @@
        }
       ]
      ],
+     "delete-at-end-boundary-of-div-followed-by-inline-element-containing-hidden-select-element-with-non-editable-node.html": [
+      "5c362d4963f6c2ccc955a38775ff4a054ff65b53",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "delete-at-start-boundary-of-div-containing-hidden-select-element-with-non-editable-node.html": [
+      "0ed42e5729235f8baca7519e781bbf74871dfc0a",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "delete-in-child-of-head.tentative.html": [
       "978cf83d47add5ef754e588074844d0e624dfa27",
       [
@@ -621736,6 +629506,15 @@
        }
       ]
      ],
+     "insert-space-at-beginning-of-wrapped-line.html": [
+      "6afedff12b5e89cf02414c1d5821c7d5fe102529",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "insert-text-in-void-element.tentative.html": [
       "f84d3fce036981bb441e6e5b989341627a166b23",
       [
@@ -622576,7 +630355,7 @@
       ]
      ],
      "insertparagraph-in-non-splittable-element.html": [
-      "c77862fecb297e86cbe3605057646cc1238fa1d7",
+      "5ee721758309614a35ea6c385ec60a7d02e0a154",
       [
        null,
        {
@@ -624314,7 +632093,7 @@
       ]
      ],
      "selection-change-not-fired-if-selection-set-to-root.html": [
-      "39e8b46e69b2c469b4b5d4ed40314bd67a2b3524",
+      "cac621ad3cdd3b1b8c9fcbbdf09cac739f9756ff",
       [
        null,
        {
@@ -624349,6 +632128,13 @@
        }
       ]
      ],
+     "shadow_root_iteration_in_block_style.html": [
+      "2a7d8ac178e80d06b6c9384ba32f0056aa9e28b6",
+      [
+       null,
+       {}
+      ]
+     ],
      "typing-around-link-element-after-joining-paragraphs.html": [
       "4934530c9b842dfe9e1259c0d7541427279eb2f2",
       [
@@ -625745,6 +633531,33 @@
        }
       ]
      ],
+     "delete-word-around-span.html": [
+      "6250e9aec21620334d0d74e6d7642a21480ec0a1",
+      [
+       "editing/whitespaces/delete-word-around-span.html?white-space=normal",
+       {
+        "testdriver": true
+       }
+      ],
+      [
+       "editing/whitespaces/delete-word-around-span.html?white-space=pre",
+       {
+        "testdriver": true
+       }
+      ],
+      [
+       "editing/whitespaces/delete-word-around-span.html?white-space=pre-line",
+       {
+        "testdriver": true
+       }
+      ],
+      [
+       "editing/whitespaces/delete-word-around-span.html?white-space=pre-wrap",
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "forwarddelete-chars-following-collapsible-white-space.html": [
       "2bf42ed18e521cfd0916307e14a3db98d6b2c439",
       [
@@ -625755,6 +633568,33 @@
        }
       ]
      ],
+     "forwarddelete-word-around-span.html": [
+      "ac7cbaee18654d43a657beb568bf0bd5ea426b69",
+      [
+       "editing/whitespaces/forwarddelete-word-around-span.html?white-space=normal",
+       {
+        "testdriver": true
+       }
+      ],
+      [
+       "editing/whitespaces/forwarddelete-word-around-span.html?white-space=pre",
+       {
+        "testdriver": true
+       }
+      ],
+      [
+       "editing/whitespaces/forwarddelete-word-around-span.html?white-space=pre-line",
+       {
+        "testdriver": true
+       }
+      ],
+      [
+       "editing/whitespaces/forwarddelete-word-around-span.html?white-space=pre-wrap",
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "inserttext-at-end-of-block-when-br-always-block.html": [
       "922b8bd1c86230c1284fc0f14ce2031ab345c1ee",
       [
@@ -638425,62 +646265,6 @@
       {}
      ]
     ],
-    "clearkey-mp4-playback-destroy-persistent-license.https.html": [
-     "2fb1db4dccfb4fe3b10958602522deb2e01e08e6",
-     [
-      null,
-      {}
-     ]
-    ],
-    "clearkey-mp4-playback-persistent-license-events.https.html": [
-     "66720946d4b5f41214b2bd86dbb864c202318643",
-     [
-      null,
-      {}
-     ]
-    ],
-    "clearkey-mp4-playback-persistent-license.https.html": [
-     "b65cf5337ffeab77b722ffab15b1ca168423dcd9",
-     [
-      null,
-      {}
-     ]
-    ],
-    "clearkey-mp4-playback-persistent-usage-record-events.https.html": [
-     "11b3e8f15ce9450bc46a4ca9c4f81fb8a01a16ac",
-     [
-      null,
-      {}
-     ]
-    ],
-    "clearkey-mp4-playback-persistent-usage-record.https.html": [
-     "3f0d55e413861d48cce462d1715b2b6cfca647b3",
-     [
-      null,
-      {}
-     ]
-    ],
-    "clearkey-mp4-playback-retrieve-destroy-persistent-license.https.html": [
-     "c8838d2b7dc5f09553df38d01368d3db3927f5c3",
-     [
-      null,
-      {}
-     ]
-    ],
-    "clearkey-mp4-playback-retrieve-persistent-license.https.html": [
-     "072b885d21eb35975d3bbcc945e78660ed5d26f8",
-     [
-      null,
-      {}
-     ]
-    ],
-    "clearkey-mp4-playback-retrieve-persistent-usage-record.https.html": [
-     "63e792c2987558a83b81e59620f1bff4e8b159d9",
-     [
-      null,
-      {}
-     ]
-    ],
     "clearkey-mp4-playback-temporary-clear-encrypted-segmented.https.html": [
      "e402688aacfcd47945278ffc65d721e21361285d",
      [
@@ -638544,10 +646328,12 @@
      ]
     ],
     "clearkey-mp4-playback-temporary-multisession.https.html": [
-     "b64befda178f9c72c2d61ce2b47e8425c234b6a2",
+     "bbf7777ade82e8ad0148c2557f9d9dc1b7c526e5",
      [
       null,
-      {}
+      {
+       "timeout": "long"
+      }
      ]
     ],
     "clearkey-mp4-playback-temporary-setMediaKeys-after-src.https.html": [
@@ -638834,24 +646620,6 @@
       }
      ]
     ],
-    "drm-mp4-playback-persistent-usage-record-events.https.html": [
-     "5cbb8021b0782eba074b8e04591c523f03a7891d",
-     [
-      null,
-      {
-       "timeout": "long"
-      }
-     ]
-    ],
-    "drm-mp4-playback-persistent-usage-record.https.html": [
-     "69876be989278caf422c2db047b66bc1c9f4fdcb",
-     [
-      null,
-      {
-       "timeout": "long"
-      }
-     ]
-    ],
     "drm-mp4-playback-retrieve-destroy-persistent-license.https.html": [
      "9bba71f89aa7047dafcdae9c15d9cd827d355c37",
      [
@@ -638870,15 +646638,6 @@
       }
      ]
     ],
-    "drm-mp4-playback-retrieve-persistent-usage-record.https.html": [
-     "4059bff0cfc551b2b1e39c0209121f8d10769f96",
-     [
-      null,
-      {
-       "timeout": "long"
-      }
-     ]
-    ],
     "drm-mp4-playback-temporary-clear-encrypted.https.html": [
      "6b6e1ce62169fc246de6991f3c75010ff22fb657",
      [
@@ -638960,14 +646719,14 @@
       }
      ]
     ],
-    "drm-mp4-playback-temporary-playduration-keystatus.html": [
+    "drm-mp4-playback-temporary-playduration-keystatus.https.html": [
      "46cf5c9184f86bd661b202f02add0fae7faee66d",
      [
       null,
       {}
      ]
     ],
-    "drm-mp4-playback-temporary-playduration.html": [
+    "drm-mp4-playback-temporary-playduration.https.html": [
      "173e0f0d593232f9bc8ed16130df3818344eaf09",
      [
       null,
@@ -639555,7 +647314,7 @@
      ]
     ],
     "interactionid-keyboard-event-simulated-click-button-space.html": [
-     "d3ab5437f8e533a32fad8d327e5e1dd58d210574",
+     "b7a7675f3244835a4074827868f5a1423c1f0b24",
      [
       null,
       {
@@ -639564,7 +647323,7 @@
      ]
     ],
     "interactionid-keyboard-event-simulated-click-checkbox-space.html": [
-     "3dd8e21e784d7d8970e2fdfba4d4e146ce32f968",
+     "e2582259e1557106cfa587ab7d12465773561519",
      [
       null,
       {
@@ -639573,7 +647332,7 @@
      ]
     ],
     "interactionid-keyboard-event-simulated-click-link-enter.html": [
-     "6945d2ff771976ea1a17ba66f427e51d840268d5",
+     "9e1f4ee3761d2f7808ccb7221e426af7ab240a4a",
      [
       null,
       {
@@ -639592,7 +647351,7 @@
      ]
     ],
     "interactionid-orphan-pointerup.html": [
-     "9c4a0ecf584e83f3efa531c19be82aecfaa42917",
+     "e08142f11bce202d852a93e88c4f33ac69c11e96",
      [
       null,
       {
@@ -639747,6 +647506,15 @@
       }
      ]
     ],
+    "orphan-keydown.html": [
+     "0ab105d4d7284c19513a92241a9e16976fadefd0",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "pointerdown.html": [
      "2eb6ae898ccd006da1633a7f812dbcfc0fcbe9f1",
      [
@@ -641089,7 +648857,7 @@
       ]
      ],
      "trust-token-redemption-supported-by-feature-policy.tentative.html": [
-      "e349eadc5d1f79b4423052bee9b1903ae6c5e437",
+      "646f8eee548bc186a445b02fca3e6c04c809e07f",
       [
        null,
        {}
@@ -641449,6 +649217,17 @@
     }
    },
    "fedcm": {
+    "alternative-identifiers": {
+     "fedcm-single-identifier.https.html": [
+      "3167a2c88af82590124f3637be5aee00525f525a",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ]
+    },
     "fedcm-abort-silent-mediation-not-permitted.https.html": [
      "63c49c68ce4826a907885ae79a54661ffc1e004c",
      [
@@ -641670,7 +649449,7 @@
      ]
     ],
     "fedcm-disconnect.sub.https.html": [
-     "2ea2d4a2599751cad941552964c700ced2f1b7cc",
+     "04fcd272dcf261a19cf71abb049e41c8b41abbbf",
      [
       null,
       {
@@ -641842,6 +649621,15 @@
         "testdriver": true
        }
       ]
+     ],
+     "fedcm-too-many-idps.https.html": [
+      "ad646910b64aa5166fb8ff8a48c1bc7f3750fbf1",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
      ]
     },
     "fedcm-no-login-url.https.html": [
@@ -642858,8 +650646,15 @@
       {}
      ]
     ],
+    "history-length-outer-page-navigation-not-reflected-in-fenced-nested-iframe.https.html": [
+     "5bb727a34a70d40ad7c3b4745aad43f9b15329de",
+     [
+      null,
+      {}
+     ]
+    ],
     "history-length-outer-page-navigation-not-reflected-in-fenced.https.html": [
-     "da643040316e93407d7b9edc333c6227ae6015ce",
+     "818ed5f795acc3f75d63f892810d1b23f198577c",
      [
       null,
       {}
@@ -645722,7 +653517,7 @@
        ]
       ],
       "mime-type.any.js": [
-       "67c9af7da2dd539c219bc5848af45e6baaae65a9",
+       "ed19309bdb24f199d3a985ec8c1de9a5452a28f3",
        [
         "fetch/api/body/mime-type.any.html",
         {}
@@ -654651,7 +662446,7 @@
       ]
      ],
      "heuristic.any.js": [
-      "d846131888288cb863308081eee9271caa108a09",
+      "2bec1aa4c6434513140ee6c342b3685f7be276c1",
       [
        "fetch/http-cache/heuristic.any.html",
        {
@@ -654912,6 +662707,137 @@
        }
       ]
      ],
+     "no-vary-search.tentative.any.js": [
+      "6c5a714e2875e6a0c5ef752de98e38f2ef887383",
+      [
+       "fetch/http-cache/no-vary-search.tentative.any.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "title",
+          "NoVarySearch HTTP Cache"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "http-cache.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fetch/http-cache/no-vary-search.tentative.any.serviceworker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "title",
+          "NoVarySearch HTTP Cache"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "http-cache.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fetch/http-cache/no-vary-search.tentative.any.sharedworker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "title",
+          "NoVarySearch HTTP Cache"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "http-cache.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fetch/http-cache/no-vary-search.tentative.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "title",
+          "NoVarySearch HTTP Cache"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "http-cache.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
      "partial.any.js": [
       "3f23b5930f73799cc6b0029527e800b69774904d",
       [
@@ -655174,8 +663100,15 @@
        }
       ]
      ],
+     "pragma-no-cache-with-cache-control.html": [
+      "19a80fe5edc6fcfdaad36219bc608312f5d15a3b",
+      [
+       null,
+       {}
+      ]
+     ],
      "split-cache.html": [
-      "fe93d2e3400e9cba5390d0a3a0cae7ff64f4907f",
+      "c822abba3acee8db1079ad08dd7fbcbf38d9e3b9",
       [
        null,
        {}
@@ -655453,6 +663386,17 @@
       ]
      ]
     },
+    "local-network-access": {
+     "fetch.tentative.https.html": [
+      "9c591f309b75af6731c6d6be9c0907d3b8c22618",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ]
+    },
     "metadata": {
      "audio-worklet.https.html": [
       "3b768ef0b5ddd2d13361629afd011e6987cb38d0",
@@ -656720,247 +664664,6 @@
        }
       ]
      ],
-     "fenced-frame-no-preflight-required.tentative.https.window.js": [
-      "33e94d57f1a3b04452b2609fb1c3ed0f828666ae",
-      [
-       "fetch/private-network-access/fenced-frame-no-preflight-required.tentative.https.window.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "/common/dispatcher/dispatcher.js"
-         ],
-         [
-          "script",
-          "/common/utils.js"
-         ],
-         [
-          "script",
-          "resources/support.sub.js"
-         ],
-         [
-          "script",
-          "/fenced-frame/resources/utils.js"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ]
-     ],
-     "fenced-frame-subresource-fetch.tentative.https.window.js": [
-      "2dff325e3e1bcffc885ac59b46dbe278c9d00c42",
-      [
-       "fetch/private-network-access/fenced-frame-subresource-fetch.tentative.https.window.html?include=baseline",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "/common/subset-tests-by-key.js"
-         ],
-         [
-          "script",
-          "/common/utils.js"
-         ],
-         [
-          "script",
-          "resources/support.sub.js"
-         ],
-         [
-          "script",
-          "/fenced-frame/resources/utils.js"
-         ],
-         [
-          "variant",
-          "?include=baseline"
-         ],
-         [
-          "variant",
-          "?include=from-local"
-         ],
-         [
-          "variant",
-          "?include=from-private"
-         ],
-         [
-          "variant",
-          "?include=from-public"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ],
-      [
-       "fetch/private-network-access/fenced-frame-subresource-fetch.tentative.https.window.html?include=from-local",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "/common/subset-tests-by-key.js"
-         ],
-         [
-          "script",
-          "/common/utils.js"
-         ],
-         [
-          "script",
-          "resources/support.sub.js"
-         ],
-         [
-          "script",
-          "/fenced-frame/resources/utils.js"
-         ],
-         [
-          "variant",
-          "?include=baseline"
-         ],
-         [
-          "variant",
-          "?include=from-local"
-         ],
-         [
-          "variant",
-          "?include=from-private"
-         ],
-         [
-          "variant",
-          "?include=from-public"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ],
-      [
-       "fetch/private-network-access/fenced-frame-subresource-fetch.tentative.https.window.html?include=from-private",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "/common/subset-tests-by-key.js"
-         ],
-         [
-          "script",
-          "/common/utils.js"
-         ],
-         [
-          "script",
-          "resources/support.sub.js"
-         ],
-         [
-          "script",
-          "/fenced-frame/resources/utils.js"
-         ],
-         [
-          "variant",
-          "?include=baseline"
-         ],
-         [
-          "variant",
-          "?include=from-local"
-         ],
-         [
-          "variant",
-          "?include=from-private"
-         ],
-         [
-          "variant",
-          "?include=from-public"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ],
-      [
-       "fetch/private-network-access/fenced-frame-subresource-fetch.tentative.https.window.html?include=from-public",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "/common/subset-tests-by-key.js"
-         ],
-         [
-          "script",
-          "/common/utils.js"
-         ],
-         [
-          "script",
-          "resources/support.sub.js"
-         ],
-         [
-          "script",
-          "/fenced-frame/resources/utils.js"
-         ],
-         [
-          "variant",
-          "?include=baseline"
-         ],
-         [
-          "variant",
-          "?include=from-local"
-         ],
-         [
-          "variant",
-          "?include=from-private"
-         ],
-         [
-          "variant",
-          "?include=from-public"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ]
-     ],
-     "fenced-frame.tentative.https.window.js": [
-      "370cc9fbe9d28b002238ff027a44cfdea058ae73",
-      [
-       "fetch/private-network-access/fenced-frame.tentative.https.window.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "/common/dispatcher/dispatcher.js"
-         ],
-         [
-          "script",
-          "/common/utils.js"
-         ],
-         [
-          "script",
-          "resources/support.sub.js"
-         ],
-         [
-          "script",
-          "/fenced-frame/resources/utils.js"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ]
-     ],
      "fetch-from-treat-as-public.tentative.https.window.js": [
       "084e03282f4f78cf10408647ffd7d9a2f274c0e7",
       [
@@ -658674,8 +666377,8 @@
       ]
      ],
      "dangling-markup": {
-      "dangling-markup-mitigation-allowed-apis.tentative.https.html": [
-       "428decfc583d8268ae36bc1ddf832d21c30ea6a6",
+      "dangling-markup-mitigation-allowed-apis.https.html": [
+       "62804283075c68edc2d6b2334f931e908ca2053e",
        [
         null,
         {
@@ -659033,7 +666736,7 @@
    "fledge": {
     "tentative": {
      "abort.https.window.js": [
-      "db6aae4604575fd0f096efeec45c86fe94e11e3d",
+      "e4a3189a30c823b9c7135c1733b0021ea8728684",
       [
        "fledge/tentative/abort.https.window.html",
        {
@@ -659064,7 +666767,7 @@
       ]
      ],
      "additional-bids.https.window.js": [
-      "edacb05512e968fb98668a4b40ec92c68c9a1410",
+      "384a9e620307bd05ba4594bb4494fd3382126333",
       [
        "fledge/tentative/additional-bids.https.window.html?1-last",
        {
@@ -659103,7 +666806,7 @@
       ]
      ],
      "auction-config-passed-to-worklets.https.window.js": [
-      "dec49b80a96967e86d318f9e31995c1786e95654",
+      "1fb59972b58768227e3e1e2e272ee3e8969d86dd",
       [
        "fledge/tentative/auction-config-passed-to-worklets.https.window.html?1-5",
        {
@@ -659526,7 +667229,7 @@
       ]
      ],
      "auction-config.https.window.js": [
-      "50b9cb9e9e6b071604522268fc1113a7f1a8a662",
+      "e0e27d23db2feaf446b4003964b34b3035cb73f1",
       [
        "fledge/tentative/auction-config.https.window.html?1-5",
        {
@@ -660761,7 +668464,7 @@
       ]
      ],
      "clear-origin-joined-ad-interest-groups.https.window.js": [
-      "097978a7858523c759a70ac9843baec8eee65dc4",
+      "9f0818da2c4b1600d9c1f3ba7668c2e434f14cbe",
       [
        "fledge/tentative/clear-origin-joined-ad-interest-groups.https.window.html?1-4",
        {
@@ -660956,7 +668659,7 @@
       ]
      ],
      "component-ads.https.window.js": [
-      "6fec80102bb94da42a4fffa6bb3f5d5d8ded7d33",
+      "9e3e6e8878d041aa5f755a191138ebc00855e651",
       [
        "fledge/tentative/component-ads.https.window.html?1-5",
        {
@@ -661345,8 +669048,39 @@
        }
       ]
      ],
+     "cross-origin-embedder-policy.https.window.js": [
+      "09a89e2009de5f7691a04f72b34f4d075f55dbbf",
+      [
+       "fledge/tentative/cross-origin-embedder-policy.https.window.html",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/resources/testdriver-vendor.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
      "cross-origin.https.window.js": [
-      "9669f2790bcfa492a5419c9f7f16d39b12da0f2c",
+      "c1119a94d5932f6088fad52e1b8b2d2b785c2dd6",
       [
        "fledge/tentative/cross-origin.https.window.html?1-4",
        {
@@ -661541,7 +669275,7 @@
       ]
      ],
      "currency.https.window.js": [
-      "f1b2bba87340340fdf04b5d4c065fe06707f53a1",
+      "b65dea5820ab69aad19839281dcda54ea7d0b1d1",
       [
        "fledge/tentative/currency.https.window.html?1-4",
        {
@@ -662156,7 +669890,7 @@
       ]
      ],
      "deprecated-render-url-replacements.https.window.js": [
-      "75377ca7aa348486fad8ed589e7d947f2dcb3b64",
+      "51daaf277975043f065c39fc2dfc043c5301af8d",
       [
        "fledge/tentative/deprecated-render-url-replacements.https.window.html?1-5",
        {
@@ -662351,7 +670085,7 @@
       ]
      ],
      "direct-from-seller-signals.https.window.js": [
-      "3f58b2c8ad541da98b1345bc7db3994d8ed5340e",
+      "a4e6911491d2c7b1f5df6f190139d0d7a15752e8",
       [
        "fledge/tentative/direct-from-seller-signals.https.window.html?1-4",
        {
@@ -662980,7 +670714,7 @@
       ]
      ],
      "generate-bid-browser-signals.https.window.js": [
-      "00c4bfdcc315c02211792888b0e377302df2e36d",
+      "ee0cdd84efa4a3307bb674015c3eb5a8211fe962",
       [
        "fledge/tentative/generate-bid-browser-signals.https.window.html?1-4",
        {
@@ -663039,7 +670773,15 @@
          ],
          [
           "variant",
-          "?29-last"
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-last"
          ]
         ],
         "timeout": "long"
@@ -663103,7 +670845,15 @@
          ],
          [
           "variant",
-          "?29-last"
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-last"
          ]
         ],
         "timeout": "long"
@@ -663167,7 +670917,15 @@
          ],
          [
           "variant",
-          "?29-last"
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-last"
          ]
         ],
         "timeout": "long"
@@ -663231,7 +670989,15 @@
          ],
          [
           "variant",
-          "?29-last"
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-last"
          ]
         ],
         "timeout": "long"
@@ -663295,14 +671061,22 @@
          ],
          [
           "variant",
-          "?29-last"
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-last"
          ]
         ],
         "timeout": "long"
        }
       ],
       [
-       "fledge/tentative/generate-bid-browser-signals.https.window.html?29-last",
+       "fledge/tentative/generate-bid-browser-signals.https.window.html?29-32",
        {
         "script_metadata": [
          [
@@ -663359,7 +671133,159 @@
          ],
          [
           "variant",
-          "?29-last"
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/generate-bid-browser-signals.https.window.html?33-36",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/resources/testdriver-vendor.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-20"
+         ],
+         [
+          "variant",
+          "?21-24"
+         ],
+         [
+          "variant",
+          "?25-28"
+         ],
+         [
+          "variant",
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/generate-bid-browser-signals.https.window.html?37-last",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/resources/testdriver-vendor.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.sub.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-16"
+         ],
+         [
+          "variant",
+          "?17-20"
+         ],
+         [
+          "variant",
+          "?21-24"
+         ],
+         [
+          "variant",
+          "?25-28"
+         ],
+         [
+          "variant",
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-last"
          ]
         ],
         "timeout": "long"
@@ -663423,7 +671349,15 @@
          ],
          [
           "variant",
-          "?29-last"
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-last"
          ]
         ],
         "timeout": "long"
@@ -663487,7 +671421,15 @@
          ],
          [
           "variant",
-          "?29-last"
+          "?29-32"
+         ],
+         [
+          "variant",
+          "?33-36"
+         ],
+         [
+          "variant",
+          "?37-last"
          ]
         ],
         "timeout": "long"
@@ -663495,7 +671437,7 @@
       ]
      ],
      "get-interest-group-auction-data.https.window.js": [
-      "855e6b5a075cfbbba74772dc222e8a487fb3a118",
+      "2f2fb390dec868c3652a1c6eb94296296cef40dd",
       [
        "fledge/tentative/get-interest-group-auction-data.https.window.html?1-4",
        {
@@ -663805,7 +671747,7 @@
       ]
      ],
      "interest-group-passed-to-generate-bid.https.window.js": [
-      "172cbab466440b4f2d8ffe3a1f937e9b4520461d",
+      "6b5602158ffcfe5930feeb653e0a85e3ab599b60",
       [
        "fledge/tentative/interest-group-passed-to-generate-bid.https.window.html?1-5",
        {
@@ -665508,7 +673450,7 @@
       ]
      ],
      "interest-group-update.https.window.js": [
-      "ceac2c79a6e93635f5f4ebb9e7e26256cb695a7b",
+      "24d814cf0913a9d4f2108b767a6a12f4f031c9b1",
       [
        "fledge/tentative/interest-group-update.https.window.html?1-4",
        {
@@ -665771,7 +673713,7 @@
       ]
      ],
      "join-leave-ad-interest-group-in-fenced-frame.https.window.js": [
-      "1e2824666cc7c2b8c1fd8c19e2414bdea07f9714",
+      "2939d3847841357187e1999e4ad214510bac60cc",
       [
        "fledge/tentative/join-leave-ad-interest-group-in-fenced-frame.https.window.html?1-4",
        {
@@ -665906,7 +673848,7 @@
       ]
      ],
      "join-leave-ad-interest-group.https.window.js": [
-      "68a4e9d09c941493b8dd8c85c5a535a5d962d761",
+      "5e004ed1dc5dbb71216eb0f2f5e44cea41e722b5",
       [
        "fledge/tentative/join-leave-ad-interest-group.https.window.html?1-10",
        {
@@ -666521,7 +674463,7 @@
       ]
      ],
      "kanon-status-below-threshold.https.window.js": [
-      "6f3c2f572a198469607a27b51328c9ff8364d7a0",
+      "12e8747af0b3db9695683229b4f5199fd7b4643a",
       [
        "fledge/tentative/kanon-status-below-threshold.https.window.html",
        {
@@ -666550,36 +674492,6 @@
        }
       ]
      ],
-     "kanon-status-not-calculated.https.window.js": [
-      "87a66c106fbff5388e05905539840556ceb41e35",
-      [
-       "fledge/tentative/kanon-status-not-calculated.https.window.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "/resources/testdriver.js"
-         ],
-         [
-          "script",
-          "/resources/testdriver-vendor.js"
-         ],
-         [
-          "script",
-          "/common/utils.js"
-         ],
-         [
-          "script",
-          "resources/fledge-util.sub.js"
-         ],
-         [
-          "script",
-          "/common/subset-tests.js"
-         ]
-        ]
-       }
-      ]
-     ],
      "network.https.window.js": [
       "0b41662155a67ba5e14c383d7f7075f9d808cecf",
       [
@@ -666776,7 +674688,7 @@
       ]
      ],
      "no-winner.https.window.js": [
-      "2632a95deeeb85eb9bc7be26194260af218c59ad",
+      "cfa0704dbc400248d48ed8bbfa771af86fc73dc6",
       [
        "fledge/tentative/no-winner.https.window.html?1-5",
        {
@@ -667499,7 +675411,7 @@
       ]
      ],
      "private-aggregation.https.window.js": [
-      "a1c261b6291495ffb778753f1444dac5f414b910",
+      "474bf4ced76c2214d9abc82e0e5b69fe7b787b82",
       [
        "fledge/tentative/private-aggregation.https.window.html?1-5",
        {
@@ -667710,7 +675622,7 @@
       ]
      ],
      "real-time-reporting.https.window.js": [
-      "5ebd20d19aec35f8c5fa14c314621f8724493126",
+      "84dce53844f44c9dc468ad63f168588bd973841d",
       [
        "fledge/tentative/real-time-reporting.https.window.html?1-5",
        {
@@ -667801,7 +675713,7 @@
       ]
      ],
      "register-ad-beacon.https.window.js": [
-      "d74f0dab5e56601c808d7cd28dc6dea78aa5b628",
+      "98b6a75c42f33bf5d8a900d817c5a20e718718da",
       [
        "fledge/tentative/register-ad-beacon.https.window.html?1-5",
        {
@@ -667936,7 +675848,7 @@
       ]
      ],
      "reporting-arguments.https.window.js": [
-      "a3b546f596476d95d36e6d0a6c7dd858c2a62e27",
+      "04af8ebc64354d6fe987c310352f08eb2d8a289f",
       [
        "fledge/tentative/reporting-arguments.https.window.html?1-5",
        {
@@ -668131,7 +676043,7 @@
       ]
      ],
      "reporting-ids.https.window.js": [
-      "43c78987f1e8610c5aff66f72ec37d2e58330dca",
+      "0019393008bc565c10aa8af9cd7ab28f82d102d1",
       [
        "fledge/tentative/reporting-ids.https.window.html?1-5",
        {
@@ -668214,7 +676126,7 @@
       ]
      ],
      "round-a-value.https.window.js": [
-      "2195b45ea5f81893699a6732f102d492f3d12bec",
+      "21bbf29572659789651de645f38a89d759f62dc0",
       [
        "fledge/tentative/round-a-value.https.window.html",
        {
@@ -668245,7 +676157,7 @@
       ]
      ],
      "score-ad-browser-signals.https.window.js": [
-      "23fee313af53b5431928f6d4c5cd406c3ccb915c",
+      "9acf994cf9fd9b0355561af7ca3b97ea5eb5ddc1",
       [
        "fledge/tentative/score-ad-browser-signals.https.window.html?1-last",
        {
@@ -668284,7 +676196,7 @@
       ]
      ],
      "send-report-to.https.window.js": [
-      "163443cb76d450e5a559fefcbd48ac26266e33dc",
+      "fa0f01ccfe8b403fcd6ceded435688481b37f467",
       [
        "fledge/tentative/send-report-to.https.window.html?1-5",
        {
@@ -668367,7 +676279,7 @@
       ]
      ],
      "server-response-for-debugging-only.https.window.js": [
-      "1b4edc66a89ce0577f14ef76b79d655492629a19",
+      "e6787e8a2d9bda86c78b289e26ac1361f1652c35",
       [
        "fledge/tentative/server-response-for-debugging-only.https.window.html?1-last",
        {
@@ -668418,7 +676330,7 @@
       ]
      ],
      "server-response-private-aggregation.https.window.js": [
-      "d7f21e16cf08506ec277985dec74ae81e350a2e6",
+      "6d9a8a887706eeb75506a95884271a754e4ee05e",
       [
        "fledge/tentative/server-response-private-aggregation.https.window.html?1-6",
        {
@@ -668525,7 +676437,7 @@
       ]
      ],
      "server-response.https.window.js": [
-      "d4eaf0d25123298a696f0116cb54c6fe144038d4",
+      "4241cc8e1c9025bfae29d72a1567fcf63be3242e",
       [
        "fledge/tentative/server-response.https.window.html?1-6",
        {
@@ -670364,7 +678276,7 @@
       ]
      ],
      "service-worker-request-visibility.https.window.js": [
-      "8b8618420e56e30d2a9e4428f24f22cc7d9053b9",
+      "41ebf839600bb2cd52bbb9f01b7a8118dc1eee13",
       [
        "fledge/tentative/service-worker-request-visibility.https.window.html?1-last",
        {
@@ -670403,7 +678315,7 @@
       ]
      ],
      "tie.https.window.js": [
-      "f528df8fb020382907a63d372452010217bf2b55",
+      "21be690c92ef4386d7100d1e600a1c3524f48809",
       [
        "fledge/tentative/tie.https.window.html",
        {
@@ -671973,7 +679885,7 @@
       ]
      ],
      "trusted-scoring-signals.https.window.js": [
-      "ea820d3acf54e7d746d46ae325b2ff61a30c2a82",
+      "df613facaad1e75f6878515a1031c8b96274632f",
       [
        "fledge/tentative/trusted-scoring-signals.https.window.html?1-5",
        {
@@ -672936,7 +680848,7 @@
       ]
      ],
      "utf8-helpers.https.window.js": [
-      "4a712bf6269ea1fc2b9e7eb832a2b3cdcf2a9e07",
+      "9d8d0836419fd7f7223707be99d700b28ee39aca",
       [
        "fledge/tentative/utf8-helpers.https.window.html?1-5",
        {
@@ -673207,6 +681119,13 @@
       {}
      ]
     ],
+    "focus-double-sync-calls.html": [
+     "8d5f5c8a79fc6c65556e151fed9610a9cb915f98",
+     [
+      null,
+      {}
+     ]
+    ],
     "focus-event-after-focusing-iframes.html": [
      "f2aa2233e560eb6e73b20fe753386ef74ac282e7",
      [
@@ -673314,6 +681233,13 @@
       {}
      ]
     ],
+    "nested-focus-within-iframe-focus-event.html": [
+     "e0daf56386ebd5fd1e8711c1d27954e9b72202c4",
+     [
+      null,
+      {}
+     ]
+    ],
     "scroll-matches-focus.html": [
      "46a58fdf974f53129b62dc1d05f965f02631417b",
      [
@@ -676002,6 +683928,24 @@
        "testdriver": true
       }
      ]
+    ],
+    "watchposition-timeout.https.window.js": [
+     "fc1edd6ea95e9cbdfb20a20cb13fa05063d7c643",
+     [
+      "geolocation/watchposition-timeout.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/testdriver.js"
+        ],
+        [
+         "script",
+         "/resources/testdriver-vendor.js"
+        ]
+       ]
+      }
+     ]
     ]
    },
    "geolocation-sensor": {
@@ -677773,7 +685717,7 @@
       ]
      ],
      "fenced-frame-bypass.tentative.https.window.js": [
-      "e5d12397a9af11fd9d5dde1d3d484e7c7627192c",
+      "b84dffb9aa4bfbadc2754d88ef8883a372c18280",
       [
        "html/anonymous-iframe/fenced-frame-bypass.tentative.https.window.html",
        {
@@ -678747,7 +686691,7 @@
          ]
         ],
         "order-in-bfcache-restore.html": [
-         "f453c80a2aee8c2cff5bca12f361a6a7b7683be8",
+         "fae06df00f67323c70dbdee28d967bc1c289004d",
          [
           null,
           {
@@ -678769,7 +686713,7 @@
           {}
          ]
         ],
-        "order-in-prerender-activation.html": [
+        "order-in-prerender-activation.https.html": [
          "b281b2b08810d59c32fe332cb869151946de8c96",
          [
           null,
@@ -680140,7 +688084,7 @@
         ]
        ],
        "nav-cancelation-2.sub.html": [
-        "c081513b7c86901c73d0648d6972e77ec10d77df",
+        "21096519503aa84968d639bb6df196e6fbca9b4f",
         [
          null,
          {}
@@ -682206,6 +690150,13 @@
          {}
         ]
        ],
+       "history_pushstate_too_many_calls.optional.html": [
+        "4242ab488ca2cbe4b4433b1fa251bd8eb303cecf",
+        [
+         null,
+         {}
+        ]
+       ],
        "history_pushstate_url.html": [
         "cfbca35bfdfb6e29682f52d09577e6b081801f14",
         [
@@ -682241,6 +690192,13 @@
          {}
         ]
        ],
+       "history_replacestate_too_many_calls.optional.html": [
+        "d412983270c42fd37cf832119567013982456121",
+        [
+         null,
+         {}
+        ]
+       ],
        "history_state.html": [
         "2ee2356b1acdde48ee03bd18d644857bb9fc1062",
         [
@@ -682605,7 +690563,7 @@
         ]
        ],
        "location_hash_set_empty_string.html": [
-        "bfde4e638290c0ef1b4068b399e7428d090544b2",
+        "8eef392e611f5fbe6afa07b4c8ea77a8aef2c440",
         [
          null,
          {}
@@ -684154,7 +692112,7 @@
         ]
        },
        "regression-1399759.https.sub.html": [
-        "d0b09f335db6c9292417fdf64f4148db1a7abbc7",
+        "a960fb87020061887a4aef20dfe37a27bcb2b5f6",
         [
          "html/browsers/origin/origin-keyed-agent-clusters/regression-1399759.https.sub.html?pipe=header(Origin-Agent-Cluster,%3F0)",
          {}
@@ -684659,7 +692617,7 @@
         ]
        ],
        "close_noopener_beforeunload.html": [
-        "6862a70b8c1489a1d6ab8450cc01772d753fbe4d",
+        "4db39fcb7c7b2133f672165c984c303dbf0bedb2",
         [
          null,
          {}
@@ -684890,6 +692848,20 @@
           "timeout": "long"
          }
         ]
+       ],
+       "open_initial_size.html": [
+        "a3a82d7646891edc92008073c1bb66fab7d36fa6",
+        [
+         null,
+         {}
+        ]
+       ],
+       "script-closable.html": [
+        "2a7278c2ce810a39afbc8a4a0fc1bca96e3a63dc",
+        [
+         null,
+         {}
+        ]
        ]
       },
       "proxy-getOwnPropertyDescriptor.html": [
@@ -685107,6 +693079,13 @@
      },
      "windows": {
       "auxiliary-browsing-contexts": {
+       "named-lookup-noopener.html": [
+        "91cf6ae6ee24611856b1a5eeb87f60b99cb82d64",
+        [
+         null,
+         {}
+        ]
+       ],
        "named-lookup-scoped-to-browsing-context-group.html": [
         "0450d479196a19535419c286fa2447580b344b25",
         [
@@ -691352,6 +699331,27 @@
          {}
         ]
        ],
+       "2d.imageData.createImageBitmap.p3.rgba.unorm8.html": [
+        "09d12ff82bc12ef093bf41524e71496a8c935484",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.imageData.createImageBitmap.srgb.rgba.float16.html": [
+        "61519ebce984004d58a7b74f01c1ed38402c1ba7",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.imageData.createImageBitmap.srgb.rgba.unorm8.html": [
+        "eee3846cf5aba02583a9ea7fcb31b194f79effa6",
+        [
+         null,
+         {}
+        ]
+       ],
        "2d.imageData.get.basic.html": [
         "71b2d5ab2f205d987b2ac187133d34a897e625fd",
         [
@@ -691520,6 +699520,13 @@
          {}
         ]
        ],
+       "2d.imageData.object.ctor.pixelFormat.html": [
+        "9d4c4ccc7ee04dd8ee08f6059b437a902e1bc7f7",
+        [
+         null,
+         {}
+        ]
+       ],
        "2d.imageData.object.ctor.size.bounds.html": [
         "5ea899ac861aac26bf97320213370d88f9372bab",
         [
@@ -691542,7 +699549,7 @@
         ]
        ],
        "2d.imageData.object.properties.html": [
-        "de586fda3ff90d9f879bb2f4c530d5dae7b93c48",
+        "72f314bf66035ae3664d360e437f80ad7dfb716a",
         [
          null,
          {}
@@ -691597,6 +699604,13 @@
          {}
         ]
        ],
+       "2d.imageData.put.basic.rgba.float16.html": [
+        "8307f7fda46883e1ec6e6d2430e9bc6f9532aac5",
+        [
+         null,
+         {}
+        ]
+       ],
        "2d.imageData.put.clip.html": [
         "f61fa4f5e9b4bb3f181f55beb20a8ea489f4da95",
         [
@@ -692954,8 +700968,22 @@
          {}
         ]
        ],
+       "2d.text.measure.lang.html": [
+        "a11e838799c635a33b35c2233bcf92f8d0b71b7d",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.measure.lang.inherit.html": [
+        "565308a895bc2442c98087f0e5341cd7ac530697",
+        [
+         null,
+         {}
+        ]
+       ],
        "2d.text.measure.selection-rects-baselines.tentative.html": [
-        "8ef5e83199c395d1de79b7730b47c2c9342d074e",
+        "5e8c7bcc73d4e2d03d98b84ec1556bffa210366d",
         [
          null,
          {}
@@ -692969,7 +700997,7 @@
         ]
        ],
        "2d.text.measure.selection-rects.tentative.html": [
-        "4cde3807fd6c3fb634ac45ce63341005c8234cf9",
+        "ee9ad76cdcbd0413e627cab5ab5d3270b5972148",
         [
          null,
          {}
@@ -693397,7 +701425,7 @@
         ]
        ],
        "2d.color.space.p3.to.srgb.html": [
-        "8320a2948517ce39da51a6e89c6b289414a539da",
+        "abfda62cb522d97b56e391bc687fdb91ebf29a52",
         [
          null,
          {}
@@ -703814,6 +711842,48 @@
          {}
         ]
        ],
+       "2d.imageData.createImageBitmap.p3.rgba.unorm8.html": [
+        "4712a13acfd26b11522c5614d8f3bc6c5ed6f7c5",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.imageData.createImageBitmap.p3.rgba.unorm8.worker.js": [
+        "51034aad72c5df91b5d00e8ce3edbb0c3372857c",
+        [
+         "html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.worker.html",
+         {}
+        ]
+       ],
+       "2d.imageData.createImageBitmap.srgb.rgba.float16.html": [
+        "3b31076d7c791e72b1a13454324d30caa8b23325",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.imageData.createImageBitmap.srgb.rgba.float16.worker.js": [
+        "c0e2b265600cb6f699af2824598b3f6ba93d1b87",
+        [
+         "html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.worker.html",
+         {}
+        ]
+       ],
+       "2d.imageData.createImageBitmap.srgb.rgba.unorm8.html": [
+        "687ffc2a29ea4eca2b5760b4f261133c608196f4",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.imageData.createImageBitmap.srgb.rgba.unorm8.worker.js": [
+        "77993c46b4cc8f81b16bdd6c7d44a6ccef9ae48b",
+        [
+         "html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.worker.html",
+         {}
+        ]
+       ],
        "2d.imageData.get.basic.html": [
         "c92771eab51798806f7440983fd9f630a4a2d638",
         [
@@ -704109,14 +712179,14 @@
         ]
        ],
        "2d.imageData.object.properties.html": [
-        "f936938b7fc6b9bea322952de0426965c42ffdec",
+        "5c334ceb301c96f7754cef7af1f3bfd199805f2c",
         [
          null,
          {}
         ]
        ],
        "2d.imageData.object.properties.worker.js": [
-        "e428e0d4fcead269bcc1c85a1212386754e129d6",
+        "6c2026c8eae371c15593b387d97e77d3d2ea5960",
         [
          "html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.html",
          {}
@@ -704213,6 +712283,20 @@
          {}
         ]
        ],
+       "2d.imageData.put.basic.rgba.float16.html": [
+        "f8bd9ad8a731812e78756b4760a0a12e40067e39",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.imageData.put.basic.rgba.float16.worker.js": [
+        "06496eae05f0c41e01fb36814d52f8f481bdbccd",
+        [
+         "html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.rgba.float16.worker.html",
+         {}
+        ]
+       ],
        "2d.imageData.put.basic.worker.js": [
         "6a68ffa792eea103ed9dada38ae6dc36f89d8c5c",
         [
@@ -706851,15 +714935,36 @@
          {}
         ]
        ],
+       "2d.text.measure.lang.html": [
+        "22183f9434296c0d6f99266fa06659a40194719f",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.measure.lang.inherit.html": [
+        "8b630794e1d6daeb0c48953d71f07ee86adb24d1",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.measure.lang.worker.js": [
+        "5bbb2317f243b09f6030b86895f3622993cd2f32",
+        [
+         "html/canvas/offscreen/text/2d.text.measure.lang.worker.html",
+         {}
+        ]
+       ],
        "2d.text.measure.selection-rects-baselines.tentative.html": [
-        "fc1683bcce17a948e3580a64357da5a7927ce289",
+        "60c3e66b55b6b12fadb35b52d220dc58e262d0a6",
         [
          null,
          {}
         ]
        ],
        "2d.text.measure.selection-rects-baselines.tentative.worker.js": [
-        "bdd015eef827a23bafccb9b95d9c595d2654d5ef",
+        "d270e1dcfd81b6ca55a919a3e2fea21ebc53d981",
         [
          "html/canvas/offscreen/text/2d.text.measure.selection-rects-baselines.tentative.worker.html",
          {}
@@ -706880,7 +714985,7 @@
         ]
        ],
        "2d.text.measure.selection-rects.tentative.html": [
-        "95a8c8b4955c80963553f0607a37063809a02da8",
+        "c194c860d8f1092d62b3e222863396bb5935be2f",
         [
          null,
          {}
@@ -707607,14 +715712,14 @@
         ]
        ],
        "2d.color.space.p3.to.srgb.html": [
-        "0197c10ad2882fae964b8963e32961791816a2ed",
+        "7d22528bc5b6878a565e358f7cf62e327396e5d9",
         [
          null,
          {}
         ]
        ],
        "2d.color.space.p3.to.srgb.worker.js": [
-        "da84a683bcfadaae54c5f31cf63a0bf50b661514",
+        "13ee21933dbfc3a6cf5f0a1eae945f1f7f573e5f",
         [
          "html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.worker.html",
          {}
@@ -707688,7 +715793,7 @@
       ]
      ],
      "blob.https.html": [
-      "ce72f247ef7b6fc6b54196dbc47582b5118d54ca",
+      "e27b281a11d747d9df322483d3d09723ff3891f5",
       [
        null,
        {}
@@ -711069,7 +719174,7 @@
       }
      },
      "resource-popup.https.html": [
-      "481cceb72f0d0ab47f79dc0cdf84ad442a420509",
+      "ec2f7af28fe4fee535370a3b3d14afd40d3a60be",
       [
        null,
        {}
@@ -711086,350 +719191,14 @@
          }
         ]
        ]
-      },
-      "restrict-properties": {
-       "access-reporting-closed.https.html": [
-        "1c315b35d7fa81188aabf59c1c3196a5d5d2a2ea",
-        [
-         null,
-         {}
-        ]
-       ],
-       "access-reporting-openee-rp-ro.https.html": [
-        "7a96f4f5762721378036b47d248c3ae1ef21dd2f",
-        [
-         null,
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "access-reporting-opener-rp-ro.https.html": [
-        "9e1e85b16a5876c3e78656b8300c2fcc9e3e3ab1",
-        [
-         null,
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "access-reporting-post-message.https.html": [
-        "5bc718e2a89a28a6867e83c0d85bc0cedefe39f6",
-        [
-         null,
-         {}
-        ]
-       ],
-       "coop-rp-in-navigation-chain.https.html": [
-        "e5c877517488f755e08f69233439a817dd444164",
-        [
-         null,
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "iframe-popup-about-blank.https.window.js": [
-        "1247400a4e37d2f6bd52b2731c2a3eb7f84a7185",
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.html",
-         {
-          "script_metadata": [
-           [
-            "script",
-            "/common/get-host-info.sub.js"
-           ],
-           [
-            "script",
-            "/common/utils.js"
-           ],
-           [
-            "script",
-            "/common/dispatcher/dispatcher.js"
-           ]
-          ]
-         }
-        ]
-       ],
-       "iframe-popup-to-so.https.html": [
-        "8cf2679e190129e91de8e2af4ceef5b064fedba4",
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html?1-1",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html?2-2",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html?3-3",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html?4-4",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html?5-5",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html?6-6",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html?7-7",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html?8-8",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html?9-last",
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "iframe-popup-to-soap.https.html": [
-        "f3af3ca7db1bad6506fef6b519c8f244d2080d0e",
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html?1-2",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html?3-4",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html?5-6",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html?7-8",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html?9-last",
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "iframe-popup-to-un.https.html": [
-        "560dfd90511dca11a8b5f4fb30d88beb093c538a",
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html?1-2",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html?3-4",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html?5-6",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html?7-8",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html?9-last",
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "iframe-popup.https.html": [
-        "17840724d9e342aa52cdcc474356b25d554dfd63",
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html?1-2",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html?3-4",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html?5-6",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html?7-8",
-         {
-          "timeout": "long"
-         }
-        ],
-        [
-         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html?9-last",
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "named_targeting.https.html": [
-        "10929847ee64d1f47e78b1c34af55c963871c055",
-        [
-         null,
-         {}
-        ]
-       ],
-       "popup-so.https.html": [
-        "e5313a6e222d5b7671747516b8d056fda7e9db8b",
-        [
-         null,
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "popup-soap.https.html": [
-        "595a10a84bbc9c23ba609411e84f5e0bf107e6ac",
-        [
-         null,
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "popup-u.https.html": [
-        "595a10a84bbc9c23ba609411e84f5e0bf107e6ac",
-        [
-         null,
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "popup-un.https.html": [
-        "595a10a84bbc9c23ba609411e84f5e0bf107e6ac",
-        [
-         null,
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "popup-with-cross-origin.https.html": [
-        "a84d52584e9b4fbd6a9a35e5472c5a990fdf2351",
-        [
-         null,
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "popup-with-same-origin.https.html": [
-        "c0020fa23a478fd75aa27b69edb95c84f3e3789a",
-        [
-         null,
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "popup-with-same-site.https.html": [
-        "7d115ac7e639a53c76f6bc1b7b7c9210d8d6bf89",
-        [
-         null,
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "reporting-bcg-reuse.https.html": [
-        "9bc171a269c5284de80cad871baafd58fb297da0",
-        [
-         null,
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "reporting-from-rp-ro.https.html": [
-        "b89030f218ffeb79da7269f70a3432f79700e95a",
-        [
-         null,
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "reporting-from-rp.https.html": [
-        "6b31f7e0098da78db34e91ba179ac1ef86e3035d",
-        [
-         null,
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "reporting-to-rp-ro.https.html": [
-        "c47e59cd8f1aeac7ee6b1dbe2177595730148a38",
-        [
-         null,
-         {
-          "timeout": "long"
-         }
-        ]
-       ],
-       "reporting-to-rp.https.html": [
-        "ff60e8c5afda67ff3ca1573dab5405769b2b2cc3",
-        [
-         null,
-         {
-          "timeout": "long"
-         }
-        ]
-       ]
       }
      }
     },
     "document-isolation-policy": {
-     "credentialless-cache-storage.https.tentative.window.js": [
-      "cb4b174e945efaf14cff897d46661971bff964f8",
+     "credentialless-cache-storage-from-credentialless.https.tentative.window.js": [
+      "cae480526b8c2e38801e05edfbabc83dc1d62570",
       [
-       "html/document-isolation-policy/credentialless-cache-storage.https.tentative.window.html?dedicated_worker",
+       "html/document-isolation-policy/credentialless-cache-storage-from-credentialless.https.tentative.window.html?dedicated_worker",
        {
         "script_metadata": [
          [
@@ -711464,6 +719233,10 @@
           "script",
           "/common/dispatcher/dispatcher.js"
          ],
+         [
+          "script",
+          "/service-workers/service-worker/resources/test-helpers.sub.js"
+         ],
          [
           "script",
           "./resources/common.js"
@@ -711473,7 +719246,7 @@
        }
       ],
       [
-       "html/document-isolation-policy/credentialless-cache-storage.https.tentative.window.html?document",
+       "html/document-isolation-policy/credentialless-cache-storage-from-credentialless.https.tentative.window.html?document",
        {
         "script_metadata": [
          [
@@ -711508,6 +719281,10 @@
           "script",
           "/common/dispatcher/dispatcher.js"
          ],
+         [
+          "script",
+          "/service-workers/service-worker/resources/test-helpers.sub.js"
+         ],
          [
           "script",
           "./resources/common.js"
@@ -711517,7 +719294,7 @@
        }
       ],
       [
-       "html/document-isolation-policy/credentialless-cache-storage.https.tentative.window.html?service_worker",
+       "html/document-isolation-policy/credentialless-cache-storage-from-credentialless.https.tentative.window.html?service_worker",
        {
         "script_metadata": [
          [
@@ -711552,6 +719329,10 @@
           "script",
           "/common/dispatcher/dispatcher.js"
          ],
+         [
+          "script",
+          "/service-workers/service-worker/resources/test-helpers.sub.js"
+         ],
          [
           "script",
           "./resources/common.js"
@@ -711561,7 +719342,7 @@
        }
       ],
       [
-       "html/document-isolation-policy/credentialless-cache-storage.https.tentative.window.html?shared_worker",
+       "html/document-isolation-policy/credentialless-cache-storage-from-credentialless.https.tentative.window.html?shared_worker",
        {
         "script_metadata": [
          [
@@ -711596,6 +719377,400 @@
           "script",
           "/common/dispatcher/dispatcher.js"
          ],
+         [
+          "script",
+          "/service-workers/service-worker/resources/test-helpers.sub.js"
+         ],
+         [
+          "script",
+          "./resources/common.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "credentialless-cache-storage-from-none.https.tentative.window.js": [
+      "e2478abeed21ec9db89273c5c9e9665cdb71d1ba",
+      [
+       "html/document-isolation-policy/credentialless-cache-storage-from-none.https.tentative.window.html?dedicated_worker",
+       {
+        "script_metadata": [
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?document"
+         ],
+         [
+          "variant",
+          "?dedicated_worker"
+         ],
+         [
+          "variant",
+          "?shared_worker"
+         ],
+         [
+          "variant",
+          "?service_worker"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/dispatcher/dispatcher.js"
+         ],
+         [
+          "script",
+          "/service-workers/service-worker/resources/test-helpers.sub.js"
+         ],
+         [
+          "script",
+          "./resources/common.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "html/document-isolation-policy/credentialless-cache-storage-from-none.https.tentative.window.html?document",
+       {
+        "script_metadata": [
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?document"
+         ],
+         [
+          "variant",
+          "?dedicated_worker"
+         ],
+         [
+          "variant",
+          "?shared_worker"
+         ],
+         [
+          "variant",
+          "?service_worker"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/dispatcher/dispatcher.js"
+         ],
+         [
+          "script",
+          "/service-workers/service-worker/resources/test-helpers.sub.js"
+         ],
+         [
+          "script",
+          "./resources/common.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "html/document-isolation-policy/credentialless-cache-storage-from-none.https.tentative.window.html?service_worker",
+       {
+        "script_metadata": [
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?document"
+         ],
+         [
+          "variant",
+          "?dedicated_worker"
+         ],
+         [
+          "variant",
+          "?shared_worker"
+         ],
+         [
+          "variant",
+          "?service_worker"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/dispatcher/dispatcher.js"
+         ],
+         [
+          "script",
+          "/service-workers/service-worker/resources/test-helpers.sub.js"
+         ],
+         [
+          "script",
+          "./resources/common.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "html/document-isolation-policy/credentialless-cache-storage-from-none.https.tentative.window.html?shared_worker",
+       {
+        "script_metadata": [
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?document"
+         ],
+         [
+          "variant",
+          "?dedicated_worker"
+         ],
+         [
+          "variant",
+          "?shared_worker"
+         ],
+         [
+          "variant",
+          "?service_worker"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/dispatcher/dispatcher.js"
+         ],
+         [
+          "script",
+          "/service-workers/service-worker/resources/test-helpers.sub.js"
+         ],
+         [
+          "script",
+          "./resources/common.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "credentialless-cache-storage-from-require-corp.https.tentative.window.js": [
+      "720fa6a987a164f95fd91200b574ca6569215c10",
+      [
+       "html/document-isolation-policy/credentialless-cache-storage-from-require-corp.https.tentative.window.html?dedicated_worker",
+       {
+        "script_metadata": [
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?document"
+         ],
+         [
+          "variant",
+          "?dedicated_worker"
+         ],
+         [
+          "variant",
+          "?shared_worker"
+         ],
+         [
+          "variant",
+          "?service_worker"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/dispatcher/dispatcher.js"
+         ],
+         [
+          "script",
+          "/service-workers/service-worker/resources/test-helpers.sub.js"
+         ],
+         [
+          "script",
+          "./resources/common.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "html/document-isolation-policy/credentialless-cache-storage-from-require-corp.https.tentative.window.html?document",
+       {
+        "script_metadata": [
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?document"
+         ],
+         [
+          "variant",
+          "?dedicated_worker"
+         ],
+         [
+          "variant",
+          "?shared_worker"
+         ],
+         [
+          "variant",
+          "?service_worker"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/dispatcher/dispatcher.js"
+         ],
+         [
+          "script",
+          "/service-workers/service-worker/resources/test-helpers.sub.js"
+         ],
+         [
+          "script",
+          "./resources/common.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "html/document-isolation-policy/credentialless-cache-storage-from-require-corp.https.tentative.window.html?service_worker",
+       {
+        "script_metadata": [
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?document"
+         ],
+         [
+          "variant",
+          "?dedicated_worker"
+         ],
+         [
+          "variant",
+          "?shared_worker"
+         ],
+         [
+          "variant",
+          "?service_worker"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/dispatcher/dispatcher.js"
+         ],
+         [
+          "script",
+          "/service-workers/service-worker/resources/test-helpers.sub.js"
+         ],
+         [
+          "script",
+          "./resources/common.js"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "html/document-isolation-policy/credentialless-cache-storage-from-require-corp.https.tentative.window.html?shared_worker",
+       {
+        "script_metadata": [
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?document"
+         ],
+         [
+          "variant",
+          "?dedicated_worker"
+         ],
+         [
+          "variant",
+          "?shared_worker"
+         ],
+         [
+          "variant",
+          "?service_worker"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/dispatcher/dispatcher.js"
+         ],
+         [
+          "script",
+          "/service-workers/service-worker/resources/test-helpers.sub.js"
+         ],
          [
           "script",
           "./resources/common.js"
@@ -711606,11 +719781,15 @@
       ]
      ],
      "credentialless-cache.tentative.window.js": [
-      "99a0f077102b4ab914c553897426c6b160d6ee0a",
+      "0c52d6ced32e1f7b1f20cf04d7fdc5b6250b3f11",
       [
        "html/document-isolation-policy/credentialless-cache.tentative.window.html",
        {
         "script_metadata": [
+         [
+          "timeout",
+          "long"
+         ],
          [
           "script",
           "/common/get-host-info.sub.js"
@@ -711627,7 +719806,8 @@
           "script",
           "./resources/common.js"
          ]
-        ]
+        ],
+        "timeout": "long"
        }
       ]
      ],
@@ -711658,7 +719838,7 @@
       ]
      ],
      "credentialless-dedicated-worker.https.tentative.window.js": [
-      "748130dfdc209bf9cfac158297e772a52851b48a",
+      "539ed0a6955ad06ed0571e7fcf130624e8ec86f4",
       [
        "html/document-isolation-policy/credentialless-dedicated-worker.https.tentative.window.html",
        {
@@ -711679,6 +719859,10 @@
           "script",
           "/common/dispatcher/dispatcher.js"
          ],
+         [
+          "script",
+          "/service-workers/service-worker/resources/test-helpers.sub.js"
+         ],
          [
           "script",
           "./resources/common.js"
@@ -712396,7 +720580,7 @@
       ]
      ],
      "reporting-cache-storage-corp.tentative.https.html": [
-      "934c87b2abc674dbb4e2f179b793497686dccca7",
+      "0b7c12ac514c518c04aeee214939cdfffbf8aa5b",
       [
        null,
        {
@@ -712405,7 +720589,7 @@
       ]
      ],
      "reporting-subresource-corp.tentative.https.html": [
-      "6be3c35ad7ab749f52c4cd20d348bea21dfad448",
+      "013eb34d1065ee7bbe274af2b5409d47a37be0bf",
       [
        null,
        {
@@ -712474,10 +720658,12 @@
       ]
      ],
      "shared-workers.tentative.https.html": [
-      "d0a186f45e7865c9f585112601f934b1861c5471",
+      "0403ba3e61b9810947bcdf05d42adab14f45c383",
       [
        null,
-       {}
+       {
+        "timeout": "long"
+       }
       ]
      ]
     },
@@ -712783,14 +720969,14 @@
         ]
        ],
        "nameditem-01.html": [
-        "2b428aa65bd7d6cda28fee7e83ef2528a1b751f5",
+        "2caeed7dd000a7ca7951980ac59c724f251ee0f4",
         [
          null,
          {}
         ]
        ],
        "nameditem-02.html": [
-        "8c3155e7e4cabc69a58315d620ace5b20fa91b4c",
+        "84cf64c1ffc685164bda1f3e5493c2fe9db0bda8",
         [
          null,
          {}
@@ -712804,28 +720990,28 @@
         ]
        ],
        "nameditem-04.html": [
-        "b7c3ef8e9bb1697d57f451021672b5491a21e090",
+        "2b4a3c55b71d16660c680bc86e799b43565586ee",
         [
          null,
          {}
         ]
        ],
        "nameditem-05.html": [
-        "843ce357962e5990ed8e72674b46def587b2badc",
+        "b38872498b60fa728d7617243d4bdf206146609c",
         [
          null,
          {}
         ]
        ],
        "nameditem-06.html": [
-        "15a72b5f6bad01ca6a71eb432522acf905322340",
+        "592535f0d6a3172c711dd5b85919336616743921",
         [
          null,
          {}
         ]
        ],
        "nameditem-07.html": [
-        "fc3f06c01b9ec6f0c8ea51c0474da9adaa7c9d70",
+        "69a3bb0f09ac6311c3fc08a1a04f2e337341b6f0",
         [
          null,
          {}
@@ -713851,6 +722037,20 @@
         {}
        ]
       ],
+      "element-render-blocking-040.html": [
+       "3ef1fefc4f85bc6accb6b5d81c2f58bef821578e",
+       [
+        null,
+        {}
+       ]
+      ],
+      "element-render-blocking-041.html": [
+       "c6d87710f7e56fd3e80b60f21c79ac4a28431330",
+       [
+        null,
+        {}
+       ]
+      ],
       "non-render-blocking-scripts.optional.html": [
        "a4c32ea037b7b47490c54ddd7616b88bfebcdc76",
        [
@@ -714285,7 +722485,7 @@
        ]
       },
       "platform": {
-       "mousedown-move-inner-when-dragging.html": [
+       "mousedown-move-inner-when-dragging-1.html": [
         "81ee4f03751aaa8c2115e6d842501c6042b61efd",
         [
          null,
@@ -714293,6 +722493,33 @@
           "testdriver": true
          }
         ]
+       ],
+       "mousedown-move-inner-when-dragging-2.html": [
+        "1cabc554923b3a2a9c0b185e4f3fe0a27336fe4d",
+        [
+         null,
+         {
+          "testdriver": true
+         }
+        ]
+       ],
+       "pointerdown-add-display-none.html": [
+        "653944e155b71055761ab900f9f485ba812b46d2",
+        [
+         null,
+         {
+          "testdriver": true
+         }
+        ]
+       ],
+       "pointerdown-add-overflow-hidden.html": [
+        "ac953adfd874b19ab42379039dc26ac0efb67b7b",
+        [
+         null,
+         {
+          "testdriver": true
+         }
+        ]
        ]
       },
       "synthetic": {
@@ -714452,18 +722679,19 @@
      },
      "the-hidden-attribute": {
       "beforematch-element-fragment-navigation.html": [
-       "812a55f3187f60bda3ae702142de47168b1d8abd",
+       "96f5c8e77b231eb1ce49505edf23e8ad8c595d38",
        [
         null,
         {}
        ]
       ],
       "beforematch-scroll-to-text-fragment.html": [
-       "dddab4c6ba8621fb27e63835311930f2b53f41df",
+       "d7bdcff755c67ba67bcad7670220dd64e34f0917",
        [
         null,
         {
-         "testdriver": true
+         "testdriver": true,
+         "timeout": "long"
         }
        ]
       ],
@@ -714475,14 +722703,14 @@
        ]
       ],
       "hidden-ua-stylesheet.html": [
-       "913ecc037cfcd3ff4d0b1f41f210808f009d9ca4",
+       "0fde9ea753f14fd039082d4a28da67e6e8abb1f1",
        [
         null,
         {}
        ]
       ],
       "hidden-until-found-002.html": [
-       "a454e3a0091d1f5913b7656114bc1e7650c14949",
+       "0f3dcb1ffb2f3e5d48a5e3b6e0ca5923190e54ba",
        [
         null,
         {
@@ -714498,7 +722726,7 @@
        ]
       ],
       "hidden-until-found-text-fragment.html": [
-       "05220f7ce11b5c4d59d20904d2c6303c2107f25c",
+       "aa8a989509f5f68c7bf589d4ee2e399f1a7a0f6e",
        [
         null,
         {
@@ -716656,6 +724884,21 @@
         }
        ]
       ],
+      "tab-table-caption.html": [
+       "a26c8f0e7ed83827a385de5e351b2d90a4fad47b",
+       [
+        "html/interaction/focus/tab-table-caption.html?caption-side=bottom",
+        {
+         "testdriver": true
+        }
+       ],
+       [
+        "html/interaction/focus/tab-table-caption.html?caption-side=top",
+        {
+         "testdriver": true
+        }
+       ]
+      ],
       "tabindex-focus-flag.html": [
        "93fdb19a592ff632405c338256082043ae608002",
        [
@@ -716875,6 +725118,13 @@
       }
      },
      "stylesheet": {
+      "quirk-origin-check-positive.html": [
+       "02ab832cbe207c9bbfb1d16cbdc9a685b474372c",
+       [
+        null,
+        {}
+       ]
+      ],
       "quirk-origin-check-recursive-import.html": [
        "c0053f1f29ad8f23dbebdd41b38dbdd8537e9e27",
        [
@@ -716910,6 +725160,13 @@
          {}
         ]
        ],
+       "document-applets.html": [
+        "493e75262e6e398167ae29a8065feca1a3557185",
+        [
+         null,
+         {}
+        ]
+       ],
        "document-color-01.html": [
         "e6f0c2b573eaef279418b373884fb6c41a3b0320",
         [
@@ -717124,8 +725381,15 @@
          {}
         ]
        ],
+       "lists-styles-quirks.html": [
+        "ba3d8241f0f309aafe0805dc370747db6d3e5816",
+        [
+         null,
+         {}
+        ]
+       ],
        "lists-styles.html": [
-        "a5f011cecc1dbd6d199d4af5e0cd09113ca90735",
+        "6c2500b7eeda6d182977701771d7ca2405877416",
         [
          null,
          {}
@@ -717318,6 +725582,27 @@
          {}
         ]
        ],
+       "fieldset-multicol-column-height.html": [
+        "afd2425221f86878ec407064c8c87c528fdc6e78",
+        [
+         null,
+         {}
+        ]
+       ],
+       "fieldset-multicol-only-column-count.html": [
+        "9f794007a47e517a357818e007333277c486e47f",
+        [
+         null,
+         {}
+        ]
+       ],
+       "fieldset-multicol-only-column-width.html": [
+        "e3fd552439af219ca7b6f329e5719218c9365a51",
+        [
+         null,
+         {}
+        ]
+       ],
        "fieldset-multicol.html": [
         "bdb2c2fd94686b502ed5a663b1026180283af22f",
         [
@@ -717777,7 +726062,7 @@
      },
      "the-details-element": {
       "auto-expand-details-text-fragment.html": [
-       "321d82c02d0e1b04d2dd3cafb1d47a6776f36db7",
+       "b2416c942b633d04c84283aacb23adeca6da634b",
        [
         null,
         {
@@ -718865,6 +727150,13 @@
          ]
         ]
        },
+       "error-sequence.html": [
+        "e2cf412311154f71bfa22420db3ecefdb2554558",
+        [
+         null,
+         {}
+        ]
+       ],
        "event_canplay.html": [
         "e5c632bc17bb8dc95ede1b9456b77dfa56b77b51",
         [
@@ -721064,7 +729356,7 @@
         ]
        ],
        "imagedata.html": [
-        "e124f8ff6ea869d23a7c28418f8435a3d21e2677",
+        "123654a528a4bde858a479d63ee058ac2b9c2c61",
         [
          null,
          {}
@@ -723925,6 +732217,13 @@
          {}
         ]
        ],
+       "radio-group-valueMissing.html": [
+        "5f14c0b82e15c2e1ad259d47b970e4b19e7b3f0e",
+        [
+         null,
+         {}
+        ]
+       ],
        "radio-valueMissing.html": [
         "a02b6b96454f28c7ebd6ebfbedd604b67e8b1d77",
         [
@@ -725417,7 +733716,7 @@
         ]
        ],
        "radio-input-cancel.html": [
-        "fc2796b0415355481db123aa91762a52d4f9a71b",
+        "bccd70cac3007ae394810a7d173125af042c1a6d",
         [
          null,
          {}
@@ -725907,8 +734206,8 @@
           }
          ]
         ],
-        "option-computed-style.tentative.html": [
-         "ba2861a5c6181b72c3b8abc3e077a9f414f2cd99",
+        "option-color-inheritance.html": [
+         "d96124d008c50be1f62a7b2f4c3ddf153c62bdd6",
          [
           null,
           {}
@@ -726057,6 +734356,15 @@
           }
          ]
         ],
+        "select-input-keyboard-behavior.tentative.html": [
+         "bf3fbab9d18a4747f903d082a8c11d6ebad737aa",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ],
         "select-inside-top-layer.tentative.html": [
          "6d70f3aaf8d3dc23b2f5fb784c399991913dc938",
          [
@@ -726067,7 +734375,7 @@
          ]
         ],
         "select-iterate-before-beginning.tentative.html": [
-         "5ccaa111499d55a1ebe8446e045bc672ff0943d7",
+         "0e8c16f8fdac6412dac0da80a09fe2be93122584",
          [
           null,
           {
@@ -726133,7 +734441,7 @@
          ]
         ],
         "select-parsing.tentative.html": [
-         "cc6596b42fe80caa895e2997dcc86533558fb87a",
+         "0c6972bcab5b8d039bb1634d675276d2d7c8a28a",
          [
           null,
           {}
@@ -726255,6 +734563,26 @@
          ]
         ]
        },
+       "customizable-select-in-page": {
+        "customizable-select-in-page-keyboard-behavior.tentative.html": [
+         "7040105c096d4b9f3512bf1cbbec7dfa05f5dd77",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ],
+        "customizable-select-in-page-mouse-behavior.tentative.html": [
+         "d5b93693cf7d65b1202f459223a8cf6b8cff581a",
+         [
+          null,
+          {
+           "testdriver": true
+          }
+         ]
+        ]
+       },
        "inserted-or-removed.html": [
         "0db2bf0e77a4a8a76ebcef1b0879cac9bb8c3fea",
         [
@@ -726917,8 +735245,18 @@
          {}
         ]
        ],
+       "dialog-closedby-bounds-clicking.html": [
+        "584d4b306446c50c9d0c7c0a58849f9250b27956",
+        [
+         null,
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ]
+       ],
        "dialog-closedby-corner-cases.html": [
-        "e25b9533b905f52decdcde07992ee587e41ca7c6",
+        "06a9084415410e208ea3d75bcf04547aad829072",
         [
          null,
          {
@@ -726938,7 +735276,7 @@
         ]
        ],
        "dialog-closedby.html": [
-        "50d600219d202cb0e4df33fde899b287dc9a3edf",
+        "b67bc80765aded1bf376d967ebce989b2861cf12",
         [
          null,
          {
@@ -726976,7 +735314,7 @@
         ]
        ],
        "dialog-focusability.html": [
-        "1e000866099c7044ce07fc812229293f645c2f27",
+        "5afb407640b7d2ee1487454464df9adb41419a8a",
         [
          null,
          {
@@ -727086,7 +735424,7 @@
         ]
        ],
        "dialog-requestclose.html": [
-        "f63bc91ab475e3d21bd6002ffae1c669e8a493c2",
+        "6555f1b43bd399cc4e885f80a3a9cbee1dd752dc",
         [
          null,
          {
@@ -727116,7 +735454,7 @@
         ]
        ],
        "focus-after-close.html": [
-        "93baf65cf60c17d9292525e110faff15bcbd52b9",
+        "7137edcd1a18080c96d627e5f40da13b1d36437f",
         [
          null,
          {
@@ -727324,7 +735662,7 @@
         ]
        ],
        "toggle-events.html": [
-        "555dc03b019e6293047322c278febf80d9e99cbe",
+        "ba04b7cc391973edf233b31cb759afca3e49a484",
         [
          null,
          {}
@@ -727638,28 +735976,28 @@
      },
      "permission-element": {
       "bounded-css-properties.tentative.html": [
-       "c0f0fe34542f4b6e7742a99f725985e14aa1e876",
+       "9678286179ac494d92864836f4bb09e809e3382a",
        [
         null,
         {}
        ]
       ],
       "bounded-sizes.tentative.html": [
-       "dbeaebe04de01adddfe6dc0d8c13d4b5243c4751",
+       "7a620c2652b32c60bb461915c1734757f62392dd",
        [
         null,
         {}
        ]
       ],
       "display-css-property.tentative.html": [
-       "7aa22ef4a2bee44968b4a960d49a789778c2868e",
+       "b87b6aa9e0449a969765666a18a03670e3ae3091",
        [
         null,
         {}
        ]
       ],
       "granted-selector.html": [
-       "3ce1ad728e0499365a7bdebec3cf95a702ff469c",
+       "9fd00114bdfdb49fe293c265ee6baf497b464d7f",
        [
         null,
         {
@@ -727668,14 +736006,14 @@
        ]
       ],
       "invalid-css-properties.tentative.html": [
-       "162eba7d67975edc665d59527a824c6c81acc1be",
+       "f8dd5b681161e86a62bc353062d3e1bc83cf334e",
        [
         null,
         {}
        ]
       ],
       "lang-attribute-update.html": [
-       "cd470337e78a023adb406f8b2d7fe895377970a8",
+       "bca110aabc6cd042fb47780ea8d1980726aca411",
        [
         null,
         {
@@ -727684,27 +736022,34 @@
        ]
       ],
       "negative-offset-and-margin.tentative.html": [
-       "7d6be1a3bc8a8e863af37e85497cecddb3ef6507",
+       "0b3d8dc98812e01e7255cc166fa0bc0704f0eac4",
        [
         null,
         {}
        ]
       ],
-      "no-end-tag-no-contents.tentative.html": [
-       "bea3d7102caf7dc97122dee600373899e1ca414e",
+      "no-children-rendered.tentative.html": [
+       "70166104af82d902e07e28982a1dd554ceeee0f2",
        [
         null,
         {}
        ]
       ],
       "no-focus.tentative.html": [
-       "6e81a20962c26051aa0f1f6f9d458eb7d24fc88e",
+       "9646788518323b331ac7278dd0afb754392ef6be",
        [
         null,
         {
          "testdriver": true
         }
        ]
+      ],
+      "type-supported-feature-detect.tentative.html": [
+       "fb06f57672e0cb1b176fc72d188ec531eb74edff",
+       [
+        null,
+        {}
+       ]
       ]
      },
      "popovers": {
@@ -727858,7 +736203,41 @@
        ]
       ],
       "popover-focus-2.html": [
-       "6f361698f54e7ceee7aabaa08c5d0f13d190d8d4",
+       "9cacd2b8757748c1da7ae3a31a3a55efb72c0245",
+       [
+        "html/semantics/popovers/popover-focus-2.html?test1",
+        {
+         "testdriver": true,
+         "timeout": "long"
+        }
+       ],
+       [
+        "html/semantics/popovers/popover-focus-2.html?test2",
+        {
+         "testdriver": true,
+         "timeout": "long"
+        }
+       ],
+       [
+        "html/semantics/popovers/popover-focus-2.html?test3",
+        {
+         "testdriver": true,
+         "timeout": "long"
+        }
+       ]
+      ],
+      "popover-focus-3.html": [
+       "bcf49cb19e38e4811e5415b937c4b81e28980efa",
+       [
+        null,
+        {
+         "testdriver": true,
+         "timeout": "long"
+        }
+       ]
+      ],
+      "popover-focus-4.html": [
+       "81a2f26e3b3ffc8976fe3214aa70762a834d1f34",
        [
         null,
         {
@@ -727876,6 +736255,16 @@
         }
        ]
       ],
+      "popover-focus-tabindex.html": [
+       "f9c2342ba5e0956730c904476544ebab814fedb3",
+       [
+        null,
+        {
+         "testdriver": true,
+         "timeout": "long"
+        }
+       ]
+      ],
       "popover-focus.html": [
        "25a6c2da536355fb1ddffc4587b18acff3421c0a",
        [
@@ -729846,8 +738235,15 @@
           }
          ]
         ],
+        "parse-error-location.tentative.html": [
+         "5c8dda80cd5ad692fac1e233864519af769307ce",
+         [
+          null,
+          {}
+         ]
+        ],
         "parse-error.html": [
-         "88fb23a00d963b97e789deb5750e8a6ad62b533a",
+         "3c079f0654b16c476693afa7e56358afad30d748",
          [
           null,
           {}
@@ -732429,14 +740825,14 @@
       ],
       "processing-model-1": {
        "col-span-limits.html": [
-        "a4a425b9c1f70926c77ad3eb1b8a8a87a4655de9",
+        "2a1ac80e65ad37a0e15ca383e67889b79f2308d0",
         [
          null,
          {}
         ]
        ],
        "span-limits.html": [
-        "cdfa61bbcdc06ea62b80d042440d55fb0c89a186",
+        "798639b387562a54965d5283673a50773c2a3c49",
         [
          null,
          {
@@ -732842,7 +741238,7 @@
         ]
        ],
        "on-popover-behavior.html": [
-        "77325b5f0f64524766a254ac6f30a13bdbadfe42",
+        "44496e9b3869ac159ffe390fe4ac69d55f98046d",
         [
          null,
          {
@@ -732950,7 +741346,7 @@
         ]
        ],
        "interesttarget-css-properties.tentative.html": [
-        "8e918b0434c11e626fbb24a9007fe91b9d9de588",
+        "0aa45a41b3b21df441ba323172801297ed60b08c",
         [
          null,
          {}
@@ -732963,19 +741359,17 @@
          {}
         ]
        ],
-       "interesttarget-has-interest-pseudo.tentative.html": [
-        "2ace6fdcd44e028bf8ddc4bb68f33e67afa403a8",
-        [
-         null,
-         {
-          "testdriver": true
-         }
-        ]
-       ],
        "interesttarget-hide-delay.tentative.html": [
-        "9ec1c229c01aaca68ca6fb379f56b0b17a383c14",
+        "8828d879cac2b55e485b67511e41d64609a635e0",
         [
-         null,
+         "html/semantics/the-button-element/interest-target/interesttarget-hide-delay.tentative.html?method=focus",
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ],
+        [
+         "html/semantics/the-button-element/interest-target/interesttarget-hide-delay.tentative.html?method=hover",
          {
           "testdriver": true,
           "timeout": "long"
@@ -732983,7 +741377,7 @@
         ]
        ],
        "interesttarget-keyboard-behavior.tentative.html": [
-        "93930140b3d4f3e93355362b0924240dc8c4b11d",
+        "7040019e7504da05d46cc6d1745d6491f72574b4",
         [
          null,
          {
@@ -733001,10 +741395,73 @@
          }
         ]
        ],
-       "interesttarget-show-delay.tentative.html": [
-        "ca47c0f237d1fb0e94589fc2a0dc694bf97dc863",
+       "interesttarget-partial-interest.tentative.html": [
+        "bc7184d42d2528fe8e027e7af51463a796177ca9",
         [
          null,
+         {
+          "testdriver": true
+         }
+        ]
+       ],
+       "interesttarget-popover-focus.tentative.html": [
+        "9dfc39a37a60d438ecf9287d0ddffc0212e7a21c",
+        [
+         null,
+         {
+          "testdriver": true
+         }
+        ]
+       ],
+       "interesttarget-pseudo-classes.tentative.html": [
+        "7cd50ebfe20b006c1d07af9941b98c5391993563",
+        [
+         null,
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ]
+       ],
+       "interesttarget-show-delay.tentative.html": [
+        "8d7b78de7fc6ae38a25ee70c413939aad7932f8e",
+        [
+         "html/semantics/the-button-element/interest-target/interesttarget-show-delay.tentative.html?layout=nested&method=focus",
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ],
+        [
+         "html/semantics/the-button-element/interest-target/interesttarget-show-delay.tentative.html?layout=nested&method=hover",
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ],
+        [
+         "html/semantics/the-button-element/interest-target/interesttarget-show-delay.tentative.html?layout=nested-offset&method=focus",
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ],
+        [
+         "html/semantics/the-button-element/interest-target/interesttarget-show-delay.tentative.html?layout=nested-offset&method=hover",
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ],
+        [
+         "html/semantics/the-button-element/interest-target/interesttarget-show-delay.tentative.html?layout=plain&method=focus",
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ],
+        [
+         "html/semantics/the-button-element/interest-target/interesttarget-show-delay.tentative.html?layout=plain&method=hover",
          {
           "testdriver": true,
           "timeout": "long"
@@ -734755,6 +743212,20 @@
         {}
        ]
       ],
+      "serializing-cdata-in-html-document.html": [
+       "b2366285a41d946324981e771bfbfe2b157606f5",
+       [
+        null,
+        {}
+       ]
+      ],
+      "serializing-lt-gt.tentative.html": [
+       "6c74b443a838267be7f0d2ad8a8a80964c57209f",
+       [
+        null,
+        {}
+       ]
+      ],
       "serializing.html": [
        "1bccbf560880d98287c57046e84a449b20c39d90",
        [
@@ -737390,6 +745861,13 @@
          {}
         ]
        ],
+       "new-scroll-event-dispatched-at-next-updating-rendering-time.html": [
+        "a858c205d051ee15d2cd2e47cedb9668ffe32cc4",
+        [
+         null,
+         {}
+        ]
+       ],
        "task_microtask_ordering.html": [
         "c14a043b6ab10ab5e9e08d5bae1088f8dbf5e9c3",
         [
@@ -738612,7 +747090,7 @@
      },
      "update-rendering": {
       "child-document-raf-order.html": [
-       "222c1af444e5c3f7aab2ac466b6bd1a7e2c93e3e",
+       "eccc1bde7fb83449275ed61e0dacaeb13d684456",
        [
         null,
         {}
@@ -738670,6 +747148,15 @@
       }
      ]
     ],
+    "figure-name-no-figcaption.tentative.html": [
+     "f75074efb6bf5380b00fab8dc18da479ee8efca2",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "fragile": {
      "area-role.html": [
       "315d4a8e838f2d27508b53d7f6684119ebffd6bf",
@@ -738700,7 +747187,7 @@
      ]
     ],
     "roles-contextual.html": [
-     "793bdf1f4130912fe679e91f04c39e0af513ae4b",
+     "e1f343cd07459d7ac9b0ae6e637646b8022edafe",
      [
       null,
       {
@@ -738709,7 +747196,7 @@
      ]
     ],
     "roles-contextual.tentative.html": [
-     "0f918b24c700c31f399a015d7e0219c3e112640a",
+     "e3b5f4e925b4721a655623c0ec01f1a85e27483e",
      [
       null,
       {
@@ -739584,7 +748071,7 @@
      ]
     ],
     "inert-node-is-uneditable.html": [
-     "ecb69695793062e46741d19b95dd71bbbf572366",
+     "18cc079ea4e1d362d7831b0e6507d4beee1f15a6",
      [
       null,
       {
@@ -740540,6 +749027,20 @@
         ]
        ]
       },
+      "emulation": {
+       "set_geolocation_override.https.html": [
+        "e339f39dcd89aa311e91c744669bf2cd9aadc103",
+        [
+         null,
+         {
+          "testdriver": true,
+          "testdriver_features": [
+           "bidi"
+          ]
+         }
+        ]
+       ]
+      },
       "permissions": {
        "set_permission.https.html": [
         "5b05e2374e2b4b451a0f98eabd36a6e72a03f933",
@@ -740659,7 +749160,7 @@
       ]
      ],
      "get_all_cookies.sub.https.html": [
-      "e94167133b3aa852a54f06b49e850e66e2873f65",
+      "70a4ff773333dbd764ce04e99da2f49d5c74f47b",
       [
        null,
        {
@@ -740677,7 +749178,7 @@
       ]
      ],
      "get_named_cookie.sub.https.html": [
-      "8e8f44338128b9f110c22861b067cd6af1ef2e09",
+      "32b3bed459e8a282481a7b3e293155691ee0ab6a",
       [
        null,
        {
@@ -740777,6 +749278,26 @@
        ]
       ]
      }
+    },
+    "window": {
+     "minimize-1.html": [
+      "3b6d46874b3e51f0391d7de0728b42c795c91cad",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "minimize-2.html": [
+      "279f01b7b73abc434c2daa640c1aa292f419ea53",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ]
     }
    },
    "input-device-capabilities": {
@@ -741019,7 +749540,7 @@
      ]
     ],
     "input-events-spin-button-click-on-number-input-delete-document.html": [
-     "fb3655398dbd1bdde84f032df392b6352b7fcafe",
+     "9e5d9b9ef99a4290b4195ff5901eab324935c3fe",
      [
       null,
       {
@@ -742815,14 +751336,14 @@
       ]
      ],
      "observe-cross-origin-animated-image.tentative.html": [
-      "49207f9d690b169a5e73d396ce7f4ffc00241780",
+      "8ef198dac68f71ccccfe1c93178270084bbc0fc0",
       [
        null,
        {}
       ]
      ],
      "observe-cross-origin-tao-animated-image.tentative.html": [
-      "137dde66383f772b06d381e4f6293e15a1d8b88a",
+      "13181670c16240a6e9efe40136cda0843baec3b3",
       [
        null,
        {}
@@ -742900,7 +751421,7 @@
      ]
     ],
     "idlharness.html": [
-     "5f5d286b356cf5dcffd76f2ed6f689804e8426ba",
+     "0dd006e711c6d7b02fcbcd4d31a5c11381fe8d69",
      [
       null,
       {}
@@ -743103,7 +751624,7 @@
      ]
     ],
     "observe-text.html": [
-     "0724a0bb92bf5248938c33fe1377d2e3a23309a5",
+     "d029d500aa1217b92c3898e90a50de83a98bc9e0",
      [
       null,
       {}
@@ -743173,14 +751694,14 @@
      ]
     ],
     "transparent-text-with-shadow.html": [
-     "8231ed9ff115ca88fe59a0a3e4ebd3d14a678b70",
+     "2c4cdb80c477b9f1f88bb004df9b1f2cf213bb04",
      [
       null,
       {}
      ]
     ],
     "transparent-text-with-text-stroke.html": [
-     "2c81ff8aad70d71e92340dcd9d5a1001533a7bd2",
+     "6434c172836061710595303dcecca2edbe09e86a",
      [
       null,
       {}
@@ -745835,6 +754356,13 @@
         null,
         {}
        ]
+      ],
+      "symmetric-largeop.html": [
+       "b93ed5214e2039af713b895ceca1a5af0b1a0f14",
+       [
+        null,
+        {}
+       ]
       ]
      },
      "radicals": {
@@ -746177,7 +754705,14 @@
        ]
       ],
       "lengths-2.html": [
-       "942611a8dada4dae5fcc133ff01993226c6941df",
+       "af5cae1368832d6f40d2cd68b73be1b0fb5e4385",
+       [
+        null,
+        {}
+       ]
+      ],
+      "lengths-vi-vb-units.html": [
+       "a01fd13b98fbc1c03ab087169d7f7c7919779ec6",
        [
         null,
         {}
@@ -746898,7 +755433,7 @@
    },
    "media-capabilities": {
     "decodingInfo-webrtc.any.js": [
-     "0f3a4fa0f2d282a694a9e0a0d5c2abfe0697cde1",
+     "34ce5fb2921810df672b4a90e678d05f7bdfc8d1",
      [
       "media-capabilities/decodingInfo-webrtc.any.html",
       {
@@ -746925,7 +755460,7 @@
      ]
     ],
     "decodingInfo.any.js": [
-     "2fd3743b442cf8f3143ee2d4c3ccb02571036b15",
+     "510a59d9d781d8b400ad429bbeccd94b319ae3d5",
      [
       "media-capabilities/decodingInfo.any.html",
       {
@@ -746952,14 +755487,14 @@
      ]
     ],
     "decodingInfoEncryptedMedia.http.html": [
-     "267b23431b7fdf3baf3d4843d68778bb1cc15c85",
+     "5c4dc43fc9be57d1be2779294c737d005549ddb8",
      [
       null,
       {}
      ]
     ],
     "decodingInfoEncryptedMedia.https.html": [
-     "7ac914de89ddc0f7bee0169a7c7cee04ab261f2b",
+     "2d671b3ce831893528ef07c9f28fd064df627e41",
      [
       null,
       {
@@ -746968,7 +755503,7 @@
      ]
     ],
     "encodingInfo-webrtc.any.js": [
-     "635801c9f1a4163269d719aa12e5e5396b9e6562",
+     "1369941a0a5d52bdcbcc3ffe6ba0feaddce8329c",
      [
       "media-capabilities/encodingInfo-webrtc.any.html",
       {
@@ -746995,7 +755530,7 @@
      ]
     ],
     "encodingInfo.any.js": [
-     "14612238e60cdb45cf716a6bd0d7037e1e2506a6",
+     "97b6c196f09d3c4fc3d46f92a916e4020c39d646",
      [
       "media-capabilities/encodingInfo.any.html",
       {}
@@ -747850,14 +756385,14 @@
       }
      ]
     ],
-    "ImageCapture-grabFrame.html": [
+    "ImageCapture-grabFrame.https.html": [
      "a9a6930aafc577d9d554491341473287b0454d79",
      [
       null,
       {}
      ]
     ],
-    "ImageCapture-track.html": [
+    "ImageCapture-track.https.html": [
      "774970ad0c4330983574f78aa3f3aabb9d18fd90",
      [
       null,
@@ -747955,14 +756490,14 @@
       {}
      ]
     ],
-    "getPhotoCapabilities.html": [
+    "getPhotoCapabilities.https.html": [
      "8b6ab891ff8cead9d99ac017db5065ed4dad709f",
      [
       null,
       {}
      ]
     ],
-    "getPhotoSettings.html": [
+    "getPhotoSettings.https.html": [
      "04a7a5395fc72f13284af4b0e6f0a92b6b15737a",
      [
       null,
@@ -747976,10 +756511,10 @@
       {}
      ]
     ],
-    "idlharness.window.js": [
+    "idlharness.https.window.js": [
      "2977138647b11c5c9a48b779ec2a9f8507221b46",
      [
-      "mediacapture-image/idlharness.window.html",
+      "mediacapture-image/idlharness.https.window.html",
       {
        "script_metadata": [
         [
@@ -747999,14 +756534,14 @@
       }
      ]
     ],
-    "takePhoto-reject.html": [
-     "fff36e1a3b8bcf46c6a6f3ac765a509f37c45a07",
+    "takePhoto-reject.https.html": [
+     "669512ca5161fd3834b9077c6038828d436fe303",
      [
       null,
       {}
      ]
     ],
-    "takePhoto-with-PhotoSettings.html": [
+    "takePhoto-with-PhotoSettings.https.html": [
      "2946e782d0b99166c0b0c928e6ea32da76c01562",
      [
       null,
@@ -748020,7 +756555,7 @@
       {}
      ]
     ],
-    "takePhoto.html": [
+    "takePhoto.https.html": [
      "44586406c470cef6a591a3a94081fdfd0a90f7ea",
      [
       null,
@@ -748233,7 +756768,7 @@
      ]
     ],
     "MediaRecorder-canvas-media-source.https.html": [
-     "0c5f47f0ef83efe6d8e36d76a1ff88534b51c6ab",
+     "0339c18df424df1081b4ab2275d83d607301637b",
      [
       "mediacapture-record/MediaRecorder-canvas-media-source.https.html?mimeType=''",
       {
@@ -748875,6 +757410,123 @@
       }
      ]
     ],
+    "legacy": {
+     "MediaRecorder-canvas-media-source-legacy.https.html": [
+      "bcfc2af2737716810d22826ff8441b5a0bc668a0",
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=''",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ],
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=video/mp4",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ],
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=video/mp4;codecs=av01,mp4a.40.2",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ],
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=video/mp4;codecs=av01,opus",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ],
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=video/mp4;codecs=avc1.64003E,mp4a.40.2",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ],
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=video/mp4;codecs=avc3.64003E,mp4a.40.2",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ],
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=video/mp4;codecs=hev1.1.6.L186.B0,mp4a.40.2",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ],
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=video/mp4;codecs=hev1.1.6.L186.B0,opus",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ],
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=video/mp4;codecs=hvc1.1.6.L186.B0,mp4a.40.2",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ],
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=video/mp4;codecs=hvc1.1.6.L186.B0,opus",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ],
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=video/mp4;codecs=vp9,opus",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ],
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=video/webm;codecs=av1,opus",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ],
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=video/webm;codecs=vp8,opus",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ],
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=video/webm;codecs=vp9,opus",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ],
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=video/x-matroska;codecs=hev1.1.6.L186.B0,opus",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ],
+      [
+       "mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html?mimeType=video/x-matroska;codecs=hvc1.1.6.L186.B0,opus",
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ]
+     ]
+    },
     "passthrough": {
      "MediaRecorder-passthrough.https.html": [
       "6a8ebf50dd59c87eeef411566998bd5bb79ff9a9",
@@ -749041,7 +757693,7 @@
      ]
     ],
     "MediaDevices-enumerateDevices-per-origin-ids.sub.https.html": [
-     "714355f5c1c0b2fe37cff162c7be6240540cc0e2",
+     "467cf5d50c71c28675e87445ec311df53815a100",
      [
       null,
       {
@@ -749396,6 +758048,15 @@
       }
      ]
     ],
+    "media-session-artwork-fetch.https.html": [
+     "758446160ae05dcbdc84ef63f5acb94dd24538b9",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "mediametadata.html": [
      "8dcf7dc25c6fa460c94d7c91387e826d7464d980",
      [
@@ -751156,113 +759817,6 @@
     ]
    },
    "navigation-api": {
-    "commit-behavior": {
-     "after-transition-new-navigation-before-commit.html": [
-      "2d09d40dc952f5f333f08ecc99cde7ae4adcd521",
-      [
-       null,
-       {}
-      ]
-     ],
-     "after-transition-push.html": [
-      "34bdcf7cac733c78b1eeec4bbb1c3a5cc64dd045",
-      [
-       null,
-       {}
-      ]
-     ],
-     "after-transition-redirect-explicit-commit.html": [
-      "7fa356760870c4d519e9d53f92bbebe6b4849a79",
-      [
-       null,
-       {}
-      ]
-     ],
-     "after-transition-redirect-push.html": [
-      "79b46ea475087c0ba16783899d2af93addc5b033",
-      [
-       null,
-       {}
-      ]
-     ],
-     "after-transition-redirect-replace.html": [
-      "e31f5884a2762630abfc2974c3a2dbcd3871b4d3",
-      [
-       null,
-       {}
-      ]
-     ],
-     "after-transition-reload.html": [
-      "203150eb0516f2eea57f9e398f5bb50a972f0569",
-      [
-       null,
-       {}
-      ]
-     ],
-     "after-transition-replace.html": [
-      "2fd48736a34368b6f16eca126f59f5f77243dd57",
-      [
-       null,
-       {}
-      ]
-     ],
-     "after-transition-traversal-commit-new-navigation-before-commit.html": [
-      "9e74e10676de5db44655b80851ef8b0e1383986c",
-      [
-       null,
-       {}
-      ]
-     ],
-     "after-transition-traversal-window-stop-before-commit.html": [
-      "282f806f4d38626c7afa08bdbf4f2eaf7704f385",
-      [
-       null,
-       {}
-      ]
-     ],
-     "after-transition-traverse.html": [
-      "d348a218ac4a4b7efa0c54ac8e50b51783b1253a",
-      [
-       null,
-       {}
-      ]
-     ],
-     "after-transition-uncancelable.html": [
-      "45bde9f0900b6835f754cfa09129c63dfd1f4e7b",
-      [
-       null,
-       {}
-      ]
-     ],
-     "after-transition-window-stop-before-commit.html": [
-      "0f5e57d5b665e5d83fcaf7fc5b21e03b32fdc108",
-      [
-       null,
-       {}
-      ]
-     ],
-     "commit-throws.html": [
-      "54abdbfd0fb19f68a9b87a183581d7a5462b2134",
-      [
-       null,
-       {}
-      ]
-     ],
-     "multiple-intercept.html": [
-      "848af6a65d8954accaa0c9882224ba07d76f7958",
-      [
-       null,
-       {}
-      ]
-     ],
-     "redirect-throws.html": [
-      "4bb6f9660711e853d35d9aef41eab04cf80a1a18",
-      [
-       null,
-       {}
-      ]
-     ]
-    },
     "currententrychange-event": {
      "anchor-click.html": [
       "ce8fc69f5d4486c990284adfa5e4608af8fd198e",
@@ -751681,7 +760235,7 @@
       ]
      ],
      "defaultPrevented-window-stop-after-dispatch.html": [
-      "da5de10ddd8ba5753265f7a2b2448915e31cd257",
+      "889179603b8dfc3088fbf58a38c379cba0026ecb",
       [
        null,
        {}
@@ -752169,13 +760723,6 @@
        {}
       ]
      ],
-     "replaceState-in-unload-then-remove-iframe.html": [
-      "e97b72b15717325b49594382931635574c76f65c",
-      [
-       null,
-       {}
-      ]
-     ],
      "replaceState-inside-back-handler.html": [
       "29409b5e2bc3e680cf99f54abea90bcdd5bfd1b2",
       [
@@ -752233,7 +760780,7 @@
       ]
      ],
      "signal-abort-window-stop.html": [
-      "43e005e8b41180b058055ef30714e7dd49954861",
+      "cd3bb7431a381c5cc64902d00959f71193cd1b89",
       [
        null,
        {}
@@ -753461,7 +762008,7 @@
       ]
      ],
      "intercept-async.html": [
-      "d402340b068837ab29807f5d2b083565034e1e8c",
+      "4fa7c88833e0232bd743c206d0d10605c7357d1a",
       [
        "navigation-api/ordering-and-transition/intercept-async.html?currententrychange",
        {}
@@ -753536,28 +762083,6 @@
        {}
       ]
      ],
-     "navigate-commit-after-transition-intercept-with-redirect.html": [
-      "1d7c47b5e73f7306fbf68a21233caae8310f123e",
-      [
-       "navigation-api/ordering-and-transition/navigate-commit-after-transition-intercept-with-redirect.html?currententrychange",
-       {}
-      ],
-      [
-       "navigation-api/ordering-and-transition/navigate-commit-after-transition-intercept-with-redirect.html?no-currententrychange",
-       {}
-      ]
-     ],
-     "navigate-commit-after-transition-intercept.html": [
-      "16c8796d6f45ce94f594280339596464e60b49cf",
-      [
-       "navigation-api/ordering-and-transition/navigate-commit-after-transition-intercept.html?currententrychange",
-       {}
-      ],
-      [
-       "navigation-api/ordering-and-transition/navigate-commit-after-transition-intercept.html?no-currententrychange",
-       {}
-      ]
-     ],
      "navigate-cross-document-double.html": [
       "262809a0ad7216685cb0915c44bf1b6d591e123f",
       [
@@ -753573,7 +762098,7 @@
       ]
      ],
      "navigate-double-intercept.html": [
-      "8baea7bf1ea00ccfa919cb178c12ce8deb16ad5d",
+      "0598fb554e0a8d57b0dfcb0ba365058a2f83dbd5",
       [
        "navigation-api/ordering-and-transition/navigate-double-intercept.html?currententrychange",
        {}
@@ -753584,7 +762109,7 @@
       ]
      ],
      "navigate-in-transition-finished.html": [
-      "6f8b667ce314dae6c7ae06965dbf5369ca5d0a06",
+      "8b3811dd36fd5586930492e5d1d514d61453fc66",
       [
        "navigation-api/ordering-and-transition/navigate-in-transition-finished.html?currententrychange",
        {}
@@ -753594,8 +762119,41 @@
        {}
       ]
      ],
+     "navigate-intercept-precommitHandler-redirect.html": [
+      "2f60bfd749d271808cc1f56e2e2566768c607866",
+      [
+       "navigation-api/ordering-and-transition/navigate-intercept-precommitHandler-redirect.html?currententrychange",
+       {}
+      ],
+      [
+       "navigation-api/ordering-and-transition/navigate-intercept-precommitHandler-redirect.html?no-currententrychange",
+       {}
+      ]
+     ],
+     "navigate-intercept-precommitHandler-reject.tentative.html": [
+      "6d19614f7437fa95f41ba5c6cabf977f44bbdcc2",
+      [
+       "navigation-api/ordering-and-transition/navigate-intercept-precommitHandler-reject.tentative.html?currententrychange",
+       {}
+      ],
+      [
+       "navigation-api/ordering-and-transition/navigate-intercept-precommitHandler-reject.tentative.html?no-currententrychange",
+       {}
+      ]
+     ],
+     "navigate-intercept-precommitHandler.html": [
+      "8257e56d44e15e9a29d74c3990f8f29afd58b0d7",
+      [
+       "navigation-api/ordering-and-transition/navigate-intercept-precommitHandler.html?currententrychange",
+       {}
+      ],
+      [
+       "navigation-api/ordering-and-transition/navigate-intercept-precommitHandler.html?no-currententrychange",
+       {}
+      ]
+     ],
      "navigate-intercept-stop.html": [
-      "189475d5de1edabd6d33032885b2f4aa9fdd1811",
+      "1a7faa4e0eebc7ef490c15805086ac16de385fb1",
       [
        "navigation-api/ordering-and-transition/navigate-intercept-stop.html?currententrychange",
        {}
@@ -753606,7 +762164,7 @@
       ]
      ],
      "navigate-intercept.html": [
-      "cdbd8f6ef668432b939477260c5f9b0ced1b80d0",
+      "eec9d3ca119b82406cdd93ad4de6af93f0ef1cf2",
       [
        "navigation-api/ordering-and-transition/navigate-intercept.html?currententrychange",
        {}
@@ -753617,7 +762175,7 @@
       ]
      ],
      "navigate-same-document-intercept-reentrant.html": [
-      "0106e997c9fdc4f408fef6c77046ee877f7da4df",
+      "88715fda355252a1ec299df1c00ce0277fe5fcd2",
       [
        "navigation-api/ordering-and-transition/navigate-same-document-intercept-reentrant.html?currententrychange",
        {}
@@ -753628,7 +762186,7 @@
       ]
      ],
      "navigate-same-document-intercept-reject.html": [
-      "6713edca2d9234ae7e90c04540ffe96894273a14",
+      "05f295177a062bc9f471952cf8d821b7bfad3bce",
       [
        "navigation-api/ordering-and-transition/navigate-same-document-intercept-reject.html?currententrychange",
        {}
@@ -753657,7 +762215,7 @@
       ]
      ],
      "reload-intercept-reject.html": [
-      "7394ce4d17a06887d2c8281ad777e2c8fb8125ad",
+      "96833f314f464724ec32c71837c7439cb687a46a",
       [
        "navigation-api/ordering-and-transition/reload-intercept-reject.html?currententrychange",
        {}
@@ -753668,7 +762226,7 @@
       ]
      ],
      "reload-intercept.html": [
-      "18ff6191c0d05078c097333f9a360d37f6bcdee6",
+      "1494136e199c508564a7449586c2f5579d9be69c",
       [
        "navigation-api/ordering-and-transition/reload-intercept.html?currententrychange",
        {}
@@ -753679,7 +762237,7 @@
       ]
      ],
      "reload-no-popstate.html": [
-      "9c1186344dc7f1c988166b459e67b8b482ba9413",
+      "6c4592b67cc1417e1aa69491c41bb69cc8caba6e",
       [
        null,
        {}
@@ -753786,6 +762344,106 @@
       ]
      ]
     },
+    "precommit-handler": {
+     "multiple-intercept.html": [
+      "b7fd9109bd56334b985212595e8f34f7c550ee6d",
+      [
+       null,
+       {}
+      ]
+     ],
+     "precommitHandler-new-navigation-before-commit.html": [
+      "89e9895534f4583d3bf19b2c3d756c5cf58da487",
+      [
+       null,
+       {}
+      ]
+     ],
+     "precommitHandler-push.html": [
+      "41856ed6c433e586b683e9fd1d0e4ca0c0e277cd",
+      [
+       null,
+       {}
+      ]
+     ],
+     "precommitHandler-redirect-options.html": [
+      "06542d7e084f9232d8c7704090d1a184b9b6cec5",
+      [
+       null,
+       {}
+      ]
+     ],
+     "precommitHandler-redirect-push.html": [
+      "de75198d9754a5510adb449f5845fa5daa7ea63b",
+      [
+       null,
+       {}
+      ]
+     ],
+     "precommitHandler-redirect-replace.html": [
+      "049909fefdead4c6a72b94d2a05423523733c50f",
+      [
+       null,
+       {}
+      ]
+     ],
+     "precommitHandler-redirect-throws.html": [
+      "b459271201050717bed97920dea3cb41cc772201",
+      [
+       null,
+       {}
+      ]
+     ],
+     "precommitHandler-reload.html": [
+      "0fd5da33e4cf85566350f066ad9a60baa16171a3",
+      [
+       null,
+       {}
+      ]
+     ],
+     "precommitHandler-replace.html": [
+      "7c28c99af1e15c06dba2acdf4d3e6ce1381c18e4",
+      [
+       null,
+       {}
+      ]
+     ],
+     "precommitHandler-traversal-commit-new-navigation-before-commit.html": [
+      "226f332e421687bf92430f9009b329e751adc7c0",
+      [
+       null,
+       {}
+      ]
+     ],
+     "precommitHandler-traversal-window-stop-before-commit.html": [
+      "c45f8268f2a31a7440f74c8ed7336694bcfabea9",
+      [
+       null,
+       {}
+      ]
+     ],
+     "precommitHandler-traverse.html": [
+      "f152129ce264b79bc7407f5308559701ef97210e",
+      [
+       null,
+       {}
+      ]
+     ],
+     "precommitHandler-uncancelable.html": [
+      "af320b4e32c920947212cc8edce1be23c7520221",
+      [
+       null,
+       {}
+      ]
+     ],
+     "precommitHandler-window-stop-before-commit.html": [
+      "857a21ed3a97dd695d553818b5d067fec6666534",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "scroll-behavior": {
      "after-transition-basic.html": [
       "8ee4cc395b6722affc8ac657ee35d7cb41761b9d",
@@ -753878,15 +762536,15 @@
        {}
       ]
      ],
-     "manual-scroll-before-after-transition-commit.html": [
-      "3b32e72bb1118f4c81ad1da31d927dc1a2abe2a8",
+     "manual-scroll-fragment-does-not-exist.html": [
+      "1ca582787e2e27ae63fec6170ed658b7f1453b65",
       [
        null,
        {}
       ]
      ],
-     "manual-scroll-fragment-does-not-exist.html": [
-      "1ca582787e2e27ae63fec6170ed658b7f1453b65",
+     "manual-scroll-in-precommit-handler.html": [
+      "3f92b5276a31c89613e2c78bf7445e9a8e7c17da",
       [
        null,
        {}
@@ -755886,7 +764544,7 @@
      ]
     ],
     "paint-timing-mixin.html": [
-     "65c1062a05912dc87d142a29cd493d92ac52d2bf",
+     "048c985c7c75cc3fe717b3b836120f170e847d1e",
      [
       null,
       {}
@@ -761369,6 +770027,15 @@
       }
      ]
     ],
+    "pointerevent_boundary_events_before_pointerrawupdate.https.html": [
+     "4de52758126e26089954a51804afaf411c38b290",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "pointerevent_boundary_events_in_capturing.html": [
      "b3a3fe7fe1245369124395ea5494cf2064290a73",
      [
@@ -761520,7 +770187,7 @@
      ]
     ],
     "pointerevent_click_on_chorded_mouse_button.tentative.html": [
-     "4c6431751070d166882db8cd6af7dd312585f6f6",
+     "096802d50eeb719e18a8062cc03869d06cb0bacd",
      [
       null,
       {
@@ -761928,7 +770595,7 @@
      ]
     ],
     "pointerevent_pointerout_no_pointer_movement.html": [
-     "856f2ce37cec59f70dc1a9ad4d3fe0436da3e4cd",
+     "1af166593266f671b1b4705e1911e46eb4c4b990",
      [
       null,
       {
@@ -761973,6 +770640,57 @@
       }
      ]
     ],
+    "pointerevent_pointerrawupdate_after_adoption_from_child.https.html": [
+     "9b67f776d046a1cce50ac10ab18d9de6932c86ca",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "pointerevent_pointerrawupdate_after_adoption_from_parent.https.html": [
+     "132be023178c4f18c94e4e0ebfe0bcbfe25f1493",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "pointerevent_pointerrawupdate_flush_pointercapture.https.html": [
+     "1d444c75097c4adf1f60b7356bb5d09de546c416",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "pointerevent_pointerrawupdate_remove_target.https.html": [
+     "2a7af77af0de42db600d5a4db2d5956c0b5e64cf",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "pointerevent_range_input.html": [
+     "4a67f4dd65309334ae238b8f69ffdb65ec2ce46b",
+     [
+      "pointerevents/pointerevent_range_input.html?mouse",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/pointerevent_range_input.html?touch",
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "pointerevent_releasepointercapture_events_to_original_target.html": [
      "325b58c85ccdf60a517698330e729f3930634269",
      [
@@ -763352,7 +772070,7 @@
      ]
     ],
     "shared-storage-surface-context-id.https.html": [
-     "3b0e1b3d740ad56382ace7946304709181e50b39",
+     "f51f3960550ab4fabb2de7395ae3c441e84883bc",
      [
       null,
       {}
@@ -763373,7 +772091,7 @@
      ]
     ],
     "shared-storage-surface-filtering-id.https.html": [
-     "53ed3a109bc1a025446072e1399f1859053c3d68",
+     "e79634b7391335212155d1df9c28d69d2c4da79c",
      [
       null,
       {}
@@ -776111,6 +784829,13 @@
       }
      ]
     ],
+    "callback-iframe-different-origin.html": [
+     "5e66b36d7123a26e9ee142fa792e305d8440f5e4",
+     [
+      null,
+      {}
+     ]
+    ],
     "callback-iframe.html": [
      "8ec08a804a6d3b2dfb1b4d6ba1dfcb70ee188944",
      [
@@ -777529,7 +786254,7 @@
      ]
     ],
     "sanitizer-basic-filtering.tentative.html": [
-     "0b6924b0980d8295d02a5ed3d552ba4e58beb212",
+     "38c764ae181418014488cf86126398158e653157",
      [
       null,
       {}
@@ -777543,7 +786268,7 @@
      ]
     ],
     "sanitizer-config.tentative.html": [
-     "438e1db7eadc0a5f6404c4f7f2ce39d7f37c3eac",
+     "a782b5a7e07024cd6db6bdfcec39c844054767fd",
      [
       null,
       {}
@@ -777556,6 +786281,13 @@
       {}
      ]
     ],
+    "sanitizer-parseHTML.tentative.html": [
+     "c4a31e2eb0365f67479968f4ce08117d04384889",
+     [
+      null,
+      {}
+     ]
+    ],
     "sanitizer-removeUnsafe.tentative.html": [
      "7ad8253ad5fdec29b79c590e50e9c0d211d17031",
      [
@@ -777583,6 +786315,13 @@
       null,
       {}
      ]
+    ],
+    "sethtml-xml-document.html": [
+     "73b1deb1abfed3f01e19ebcbbd54b504589ebcb9",
+     [
+      null,
+      {}
+     ]
     ]
    },
    "savedata": {
@@ -777747,6 +786486,20 @@
       }
      ]
     ],
+    "post-task-multiple-scheduler-order.window.js": [
+     "14c7013d5267c058937017be88f62f08405ea0f3",
+     [
+      "scheduler/post-task-multiple-scheduler-order.window.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "Scheduler: Tasks run order when multiple scheduler interfere the same event loop"
+        ]
+       ]
+      }
+     ]
+    ],
     "post-task-result-success.any.js": [
      "dd73c148e903258ff77862be81ae89505ffe9356",
      [
@@ -779134,7 +787887,7 @@
     "tentative": {
      "yield": {
       "yield-abort.any.js": [
-       "94a8b2cb2b8f842bff780e3d169f148b6dc78136",
+       "d5119b1c1638ecfcd1b861332b5de8e370529c67",
        [
         "scheduler/tentative/yield/yield-abort.any.html",
         {}
@@ -779237,7 +787990,7 @@
      ]
     ],
     "getallscreensmedia-exposure.tentative.https.window.js": [
-     "9be2fa07dd6148fb4f29aced39d8c6b2eb3bd33d",
+     "983fd6fbc9a97e9f3014a38ac6d48152118efb08",
      [
       "screen-capture/getallscreensmedia-exposure.tentative.https.window.html",
       {}
@@ -779359,7 +788112,7 @@
     ],
     "tentative": {
      "getdisplaymedia-captured-surface-resolution.https.html": [
-      "a1e7997ca69707d2e3c76924aa421c041d6d2926",
+      "31b62943eb1cf357479be390a974a6c7c03eb3c0",
       [
        null,
        {
@@ -779503,7 +788256,7 @@
      ]
     ],
     "lock-sandboxed-iframe.html": [
-     "ab954f04b4c5d9043d893e36892c4061ed446661",
+     "f78d7d72d538fd9384e9b5f7193d318a0ae69589",
      [
       null,
       {
@@ -779779,6 +788532,64 @@
     ]
    },
    "scroll-animations": {
+    "animation-trigger": {
+     "animation-trigger-alternate.tentative.html": [
+      "aa92e32c5628392813cd576b64eb2bb32129e2ef",
+      [
+       null,
+       {}
+      ]
+     ],
+     "animation-trigger-getanimations.tentative.html": [
+      "08d509d8cb2fdfff7bef3ce76f010d8dc4535356",
+      [
+       null,
+       {}
+      ]
+     ],
+     "animation-trigger-late-attached-timeline.tentative.html": [
+      "e8b85b442206bfe62bae9d1ba53d834e8dfb741a",
+      [
+       null,
+       {}
+      ]
+     ],
+     "animation-trigger-once-play-state.tentative.html": [
+      "23c6aa8ce9f697cab4121e713556b544cb4202cf",
+      [
+       null,
+       {}
+      ]
+     ],
+     "animation-trigger-once.tentative.html": [
+      "e7603b458bc0793a9b5303d8bd72b8d6908ebf26",
+      [
+       null,
+       {}
+      ]
+     ],
+     "animation-trigger-repeat.tentative.html": [
+      "cfbe9d3c9334148789d4cebc7a01a2f9e848b22d",
+      [
+       null,
+       {}
+      ]
+     ],
+     "animation-trigger-state.tentative.html": [
+      "a9d58ae4c3268baa4c7b3ad61310b73cc00cf467",
+      [
+       null,
+       {}
+      ]
+     ],
+     "animation-trigger.html": [
+      "7506fb05829d8d2c84dbaf3915a9e08314302af1",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "css": {
      "animation-duration-auto.tentative.html": [
       "01982859137855c7f6c3c5011b013ea715c9c4ea",
@@ -780264,7 +789075,7 @@
       ]
      ],
      "view-timeline-range-animation.html": [
-      "9e5993b63a8792077c8e67302cea16671b8521b5",
+      "0998a9909f97da5662f30ca8462fdd02c0669361",
       [
        null,
        {}
@@ -780442,14 +789253,14 @@
       ]
      ],
      "scroll-animation.html": [
-      "e3544762f60dac3d1af563b061f5a9064f44a84b",
+      "cca59eff05637d8cfb5d45893897898a42539158",
       [
        null,
        {}
       ]
      ],
      "scroll-timeline-invalidation.html": [
-      "a26500989ed0c64ca715f94f120b79ee19f45bd7",
+      "a0d33c28e088b90e74e3528d625892ebc9459c64",
       [
        null,
        {}
@@ -780579,7 +789390,7 @@
       ]
      ],
      "fieldset-source.html": [
-      "d75f30e664e325f4e43277b4036da0cbb157a990",
+      "cdd2e0be40c87d0cb932a341c9f2f9bf842f96b8",
       [
        null,
        {}
@@ -780700,14 +789511,14 @@
       ]
      ],
      "view-timeline-get-current-time-range-name.tentative.html": [
-      "25e477e1a97acc56bb692abb8375ab05f9b8e9c9",
+      "c6920143ee151d69aae63bdd97661ad64bc48adc",
       [
        null,
        {}
       ]
      ],
      "view-timeline-get-set-range.html": [
-      "94660abcf27b370b35b67471028237a52af1eb27",
+      "7bf4516700cea883b94638b2d1d8cbd705ce3173",
       [
        null,
        {}
@@ -781396,6 +790207,15 @@
         "testdriver": true
        }
       ]
+     ],
+     "move-around-generated-content.html": [
+      "ea22a399ae83e012f55c3a097840a535080cee23",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
      ]
     },
     "caret-position-should-be-correct-while-moveup-movedown.html": [
@@ -781676,6 +790496,15 @@
       {}
      ]
     ],
+    "move-by-word-with-symbol.html": [
+     "7a0f9048960c1955f4b1f4edb7d3384bb4185edf",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "move-paragraph-cross-editing-boundary.tentative.html": [
      "f6a558d7582e73386b9e7f6b1443d31b35efb875",
      [
@@ -781852,7 +790681,7 @@
        ]
       ],
       "Selection-getComposedRanges-range-update.html": [
-       "15f07305b0dfd507a4b22f7ad950f602a39f6c5a",
+       "2e54b328f02bbab03b4838cb9a86591d414e2c1a",
        [
         null,
         {}
@@ -783731,7 +792560,7 @@
       ]
      ],
      "claim-using-registration.https.html": [
-      "8a2a6ff25c82d8d6de26cca521da99f8ef6d5fbf",
+      "a02f8e9ca6f1ea7b4df36870b7ca46c3b5b5fab2",
       [
        null,
        {}
@@ -783767,6 +792596,13 @@
        }
       ]
      ],
+     "client-url-creation-url.https.html": [
+      "ba597d893d34591167310f452fd414b827498b62",
+      [
+       null,
+       {}
+      ]
+     ],
      "client-url-of-blob-url-worker.https.html": [
       "97a2fcf98f290c290b3489b81c9187922e3e711b",
       [
@@ -785305,7 +794141,7 @@
      "tentative": {
       "static-router": {
        "static-router-resource-timing.https.html": [
-        "e32436da41b347865875c6fca0bc86080b306c20",
+        "f554bf7c2ecfef89a8cd15fda14cee1325dc347a",
         [
          null,
          {}
@@ -785328,7 +794164,7 @@
       ]
      ],
      "unregister-immediately-before-installed.https.html": [
-      "79cdaf062dc729c8029c553b485e59d510b87982",
+      "c56674c0fb1ba7eb4b2100695ade8b3fd5357dac",
       [
        null,
        {}
@@ -785342,7 +794178,7 @@
       ]
      ],
      "unregister-immediately.https.html": [
-      "54be40a545220d9d58569816feef87a0ee17f891",
+      "c6a91f8e235fca71563e55164137c6417ced9670",
       [
        null,
        {}
@@ -785880,7 +794716,7 @@
      ]
     ],
     "event-post-dispatch.html": [
-     "98157a69b9c21f82b3fc8ee45343da0c50003839",
+     "0cab1fcc6b47924e6eeed37c6a36ebac56291d4e",
      [
       null,
       {}
@@ -786199,6 +795035,15 @@
        }
       ]
      ],
+     "text-selection-with-delegatesFocus-text-control.html": [
+      "6474729b8b4a8c496b33e40d5b056a12b7232418",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "text-selection-with-delegatesFocus.html": [
       "7c92d35394f126d878780a1c04f2bdb49550ba86",
       [
@@ -786396,6 +795241,16 @@
      ],
      "reading-flow": {
       "tentative": {
+       "carousel-grid-order.html": [
+        "89b3f8dd928f33fe73fa6b9bd987ad0402e7f255",
+        [
+         null,
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ]
+       ],
        "flex-flow.html": [
         "a956ae476fae8febccf32054d50f6b550ac4bbd6",
         [
@@ -786760,6 +795615,15 @@
         }
        ]
       ],
+      "form.html": [
+       "5ab144b05ed130409a09c116fcceecfc57cfaab5",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
       "interesttarget.tentative.html": [
        "e8d7c814d865fa95df4a75fc59a119211fe8caf0",
        [
@@ -786796,8 +795660,26 @@
         }
        ]
       ],
+      "property-reflection-idl-setters.html": [
+       "74f2e670915f894b2cc4d8b0443028900c0154c3",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
+      "property-reflection-imperative-setup.html": [
+       "44039295169999ce58f0b8904da6c64e718704f2",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
       "property-reflection.html": [
-       "a44baeaf4a37b5472f9d8e5590f8805613390688",
+       "3054d8eb391a59a93b35232638154551b7b1416c",
        [
         null,
         {
@@ -786816,6 +795698,13 @@
       ]
      }
     },
+    "scroll-restore-shadow.html": [
+     "254940ebfb5a9e4d8098ae00152d30cae6e8b9aa",
+     [
+      null,
+      {}
+     ]
+    ],
     "scroll-to-the-fragment-in-shadow-tree.html": [
      "b4ecc16a67daeb1160523e10cca057d0c9582d5c",
      [
@@ -787577,6 +796466,13 @@
       }
      ]
     ],
+    "batch-update-inner-method-lock-not-allowed.tentative.https.sub.html": [
+     "2b445c805d09f7e7b1e0e281e2d233a97dccbc8b",
+     [
+      null,
+      {}
+     ]
+    ],
     "blob-module-script-url-invalid-mime-type.tentative.https.sub.html": [
      "116facbcd5f558b3d186878a3247ba81ea9c7c4e",
      [
@@ -787888,7 +796784,7 @@
      ]
     ],
     "setters.tentative.https.sub.html": [
-     "c5380f8dd8565e22d97287d42fe289b7f12e03ff",
+     "c3cd19c0bdbd1954d793be837f9037bf3206666e",
      [
       null,
       {}
@@ -788125,13 +797021,6 @@
       {}
      ]
     ],
-    "web-locks-header-modifier-method.tentative.https.sub.html": [
-     "05ec7bf82bd146bb307bc627235d2edfb9f8f7f0",
-     [
-      null,
-      {}
-     ]
-    ],
     "web-locks-pa-worklet-batch-update.tentative.https.window.js": [
      "5e6d5fdbc78d7a9d7e171274b22bf6ab30e1adf1",
      [
@@ -788849,7 +797738,7 @@
      ]
     ],
     "innertext.tentative.html": [
-     "d40b6047924834ef09137fa975cbd2d142999bcb",
+     "7716488f25a08ea62635fceec679d97650d1f383",
      [
       null,
       {
@@ -788858,7 +797747,7 @@
      ]
     ],
     "interaction-with-paint-before-back.tentative.html": [
-     "b587411991383e47381e14fc6e00c0bcfc2dc447",
+     "5961a6ebcdfdd2b10bf16173d3f0cece2733fa1c",
      [
       null,
       {
@@ -788912,15 +797801,6 @@
       }
      ]
     ],
-    "navigation-api-after-transition-commit.tentative.html": [
-     "ae17db7d59f4c5cf2bf01af2b7224fa6aa8232df",
-     [
-      null,
-      {
-       "testdriver": true
-      }
-     ]
-    ],
     "navigation-api-back.tentative.html": [
      "cb96d9caf95ba7987adb065a150b2182ec784b9a",
      [
@@ -788948,6 +797828,15 @@
       }
      ]
     ],
+    "navigation-api-precommit.tentative.html": [
+     "b5d6077e13d7ef56ccdb9559d446c64e5a3edd02",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "navigation-api-preventDefault.tentative.html": [
      "b7b2a24c94203080d052411f080a0dd3c0d11cbe",
      [
@@ -789038,6 +797927,19 @@
       }
      ]
     ],
+    "smoke": {
+     "tentative": {
+      "basic.html": [
+       "9bfedf09b1934e00a85cd030388ed470f575f7b0",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ]
+     }
+    },
     "soft-navigation-detection-main-descendent.tentative.html": [
      "96ff55260c3b9553ac5735cc5fe209ee7cfd5f37",
      [
@@ -789145,7 +798047,7 @@
      ]
     ],
     "text-lcp-followed-by-anim-image-softnav-lcp.tentative.html": [
-     "0615b513e61319d61bcbed3540aa1a5d47289cb6",
+     "b34a6e81a58333c61ccedb4e25551feba4893736",
      [
       null,
       {
@@ -789172,7 +798074,7 @@
      ]
     ],
     "visited-link.tentative.html": [
-     "0bb149f00e91fc2f0033a6f763543967ef542ab2",
+     "0bb31aaac1540b3d2b9f6a3157bb43d96e430a58",
      [
       null,
       {
@@ -789184,14 +798086,14 @@
    "speculation-rules": {
     "prefetch": {
      "anonymous-client.https.html": [
-      "bf5896b2dd0626a14e80fe694bd443fea784c4b7",
+      "902724cdb0e08e603d0d41566a2fe889646088f0",
       [
        null,
        {}
       ]
      ],
-     "clear-prefetch-cache-after-clear-site-data-cache.https.html": [
-      "c5796e48b768868f084ae5ad97a63fca5abf6992",
+     "clear-prefetch-cache-after-clear-site-data-cache.tentative.https.html": [
+      "48f6264e852b0e32e6be06367e16b27f7cc6d14b",
       [
        null,
        {}
@@ -789243,7 +798145,7 @@
       ]
      ],
      "cross-origin-cookies.https.html": [
-      "a16872fcef9c1b836b6b24a380bd12f068d55209",
+      "95c95197a70e200542bf3691f10ee1a73a4deb76",
       [
        null,
        {
@@ -789856,7 +798758,7 @@
       ]
      ],
      "prefetch-uses-cache.sub.https.html": [
-      "c0e9e73c75e877f4e130a26de6764c8966ef8620",
+      "59071c82021ccb3726f58c73a6c5fdf5036fb240",
       [
        "speculation-rules/prefetch/prefetch-uses-cache.sub.https.html?cross-site",
        {
@@ -789934,7 +798836,7 @@
       ]
      ],
      "referrer-policy-from-rules.https.html": [
-      "5024052eb464a38a0f5c244af1deac239af6f30c",
+      "f877bd848246fff7b2145edd106ae48af696b24b",
       [
        "speculation-rules/prefetch/referrer-policy-from-rules.https.html?1-1",
        {}
@@ -789984,7 +798886,7 @@
       ]
      ],
      "referrer-policy.https.html": [
-      "8eb24c45815fd2601d19a7f46152ecc36cb0e6a9",
+      "a1d2aa4b188de828d93174eab1e59d219c56a067",
       [
        "speculation-rules/prefetch/referrer-policy.https.html?1-1",
        {}
@@ -790020,7 +798922,7 @@
       ]
      ],
      "sec-fetch-headers.https.html": [
-      "730f0720995b9b548617e437d7d748f66c83335f",
+      "3d1d1770d789e6a8591c742c4129fb276e7bc289",
       [
        null,
        {
@@ -790031,7 +798933,7 @@
      "tentative": {
       "service-worker": {
        "basic.sub.https.html": [
-        "e4c103535cc9f3ff2ba23fbe2ca7ff4bfb82a576",
+        "98e089bcc660f24ba3e82425e2b23ef928a0f08a",
         [
          "speculation-rules/prefetch/tentative/service-worker/basic.sub.https.html?origin=cross-site&sw=fetch-handler",
          {
@@ -790062,6 +798964,18 @@
           "timeout": "long"
          }
         ],
+        [
+         "speculation-rules/prefetch/tentative/service-worker/basic.sub.https.html?origin=same-site&sw=fetch-handler-modify-referrer",
+         {
+          "timeout": "long"
+         }
+        ],
+        [
+         "speculation-rules/prefetch/tentative/service-worker/basic.sub.https.html?origin=same-site&sw=fetch-handler-modify-url",
+         {
+          "timeout": "long"
+         }
+        ],
         [
          "speculation-rules/prefetch/tentative/service-worker/basic.sub.https.html?origin=same-site&sw=fetch-handler-to-fallback",
          {
@@ -790080,11 +798994,80 @@
           "timeout": "long"
          }
         ]
+       ],
+       "redirect.sub.https.html": [
+        "f56f6bf09b9f61956e9297f8098677b846270d49",
+        [
+         "speculation-rules/prefetch/tentative/service-worker/redirect.sub.https.html?origin=same-site&sc=in-in&sw=fetch-handler",
+         {
+          "timeout": "long"
+         }
+        ],
+        [
+         "speculation-rules/prefetch/tentative/service-worker/redirect.sub.https.html?origin=same-site&sc=in-in&sw=fetch-handler-synthetic",
+         {
+          "timeout": "long"
+         }
+        ],
+        [
+         "speculation-rules/prefetch/tentative/service-worker/redirect.sub.https.html?origin=same-site&sc=in-in&sw=fetch-handler-to-fallback",
+         {
+          "timeout": "long"
+         }
+        ],
+        [
+         "speculation-rules/prefetch/tentative/service-worker/redirect.sub.https.html?origin=same-site&sc=in-in&sw=no-fetch-handler",
+         {
+          "timeout": "long"
+         }
+        ],
+        [
+         "speculation-rules/prefetch/tentative/service-worker/redirect.sub.https.html?origin=same-site&sc=in-out&sw=fetch-handler",
+         {
+          "timeout": "long"
+         }
+        ],
+        [
+         "speculation-rules/prefetch/tentative/service-worker/redirect.sub.https.html?origin=same-site&sc=in-out&sw=fetch-handler-synthetic",
+         {
+          "timeout": "long"
+         }
+        ],
+        [
+         "speculation-rules/prefetch/tentative/service-worker/redirect.sub.https.html?origin=same-site&sc=in-out&sw=fetch-handler-to-fallback",
+         {
+          "timeout": "long"
+         }
+        ],
+        [
+         "speculation-rules/prefetch/tentative/service-worker/redirect.sub.https.html?origin=same-site&sc=in-out&sw=no-fetch-handler",
+         {
+          "timeout": "long"
+         }
+        ],
+        [
+         "speculation-rules/prefetch/tentative/service-worker/redirect.sub.https.html?origin=same-site&sc=out-in&sw=fetch-handler",
+         {
+          "timeout": "long"
+         }
+        ],
+        [
+         "speculation-rules/prefetch/tentative/service-worker/redirect.sub.https.html?origin=same-site&sc=out-in&sw=fetch-handler-to-fallback",
+         {
+          "timeout": "long"
+         }
+        ],
+        [
+         "speculation-rules/prefetch/tentative/service-worker/redirect.sub.https.html?origin=same-site&sc=out-in&sw=no-fetch-handler",
+         {
+          "timeout": "long"
+         }
+        ]
        ]
       }
      },
      "user-pass.https.html": [
-      "011e6137e61ad8afb21070a7d3e341a42061c000",
+      "c6cc51bdb04ba860142de6a789bc30f9d36cf740",
       [
        "speculation-rules/prefetch/user-pass.https.html?cross-origin=false",
        {
@@ -790100,7 +799083,7 @@
      ]
     },
     "prerender": {
-     "about-blank-iframes.html": [
+     "about-blank-iframes.https.html": [
       "af289197c6e62c952064f967022b39ac580260a8",
       [
        null,
@@ -790118,7 +799101,7 @@
        }
       ]
      ],
-     "activation-start.html": [
+     "activation-start.https.html": [
       "7aee20c3465dcfb02e370ada84b62af6e99f35d0",
       [
        null,
@@ -790127,7 +799110,7 @@
        }
       ]
      ],
-     "blob_object_url.html": [
+     "blob_object_url.https.html": [
       "49fb7c9e2c3618a59245090379961c6ab4b5b1ca",
       [
        null,
@@ -790145,8 +799128,17 @@
        }
       ]
      ],
-     "cancel-prerendering-after-clear-site-data-cache.https.html": [
-      "a31046d34b2eca47a2108200bf02f31a836942ce",
+     "cancel-prerendering-after-clear-site-data-cache-different-origins.tentative.https.html": [
+      "db52e758750f2757f722c025e3accf6fce13a9cc",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
+     "cancel-prerendering-after-clear-site-data-cache-same-origin.tentative.https.html": [
+      "23d862c5130139bc5e20242e73cb8d2e4a93e332",
       [
        null,
        {
@@ -790172,7 +799164,7 @@
        }
       ]
      ],
-     "credentialed-prerender-not-opt-in.html": [
+     "credentialed-prerender-not-opt-in.https.html": [
       "697382a6dc8569600a34f866288f4a2405d62188",
       [
        null,
@@ -790181,7 +799173,7 @@
        }
       ]
      ],
-     "credentialed-prerender-opt-in.html": [
+     "credentialed-prerender-opt-in.https.html": [
       "91626bafce677b96fef8115a1a90ca533dd31482",
       [
        null,
@@ -790190,16 +799182,16 @@
        }
       ]
      ],
-     "cross-origin-iframe.html": [
+     "cross-origin-iframe.https.html": [
       "0fc92fcce1c4583a39d09ef80abef7e5a804c2b8",
       [
-       "speculation-rules/prerender/cross-origin-iframe.html?target_hint=_blank",
+       "speculation-rules/prerender/cross-origin-iframe.https.html?target_hint=_blank",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/cross-origin-iframe.html?target_hint=_self",
+       "speculation-rules/prerender/cross-origin-iframe.https.html?target_hint=_self",
        {
         "timeout": "long"
        }
@@ -790220,91 +799212,91 @@
        }
       ]
      ],
-     "csp-script-src-elem-inline-speculation-rules.html": [
+     "csp-script-src-elem-inline-speculation-rules.https.html": [
       "7f33c32793bef2afa773abf27be3158797fbdd30",
       [
-       "speculation-rules/prerender/csp-script-src-elem-inline-speculation-rules.html?target_hint=_blank",
+       "speculation-rules/prerender/csp-script-src-elem-inline-speculation-rules.https.html?target_hint=_blank",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/csp-script-src-elem-inline-speculation-rules.html?target_hint=_self",
+       "speculation-rules/prerender/csp-script-src-elem-inline-speculation-rules.https.html?target_hint=_self",
        {
         "timeout": "long"
        }
       ]
      ],
-     "csp-script-src-inline-speculation-rules.html": [
+     "csp-script-src-inline-speculation-rules.https.html": [
       "1d5b35c30fba7c963e4c7c62bc487352dd07804f",
       [
-       "speculation-rules/prerender/csp-script-src-inline-speculation-rules.html?target_hint=_blank",
+       "speculation-rules/prerender/csp-script-src-inline-speculation-rules.https.html?target_hint=_blank",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/csp-script-src-inline-speculation-rules.html?target_hint=_self",
+       "speculation-rules/prerender/csp-script-src-inline-speculation-rules.https.html?target_hint=_self",
        {
         "timeout": "long"
        }
       ]
      ],
-     "csp-script-src-self.html": [
+     "csp-script-src-self.https.html": [
       "86cf9def4a5a0d3f7e1d005e439670571bafaca6",
       [
-       "speculation-rules/prerender/csp-script-src-self.html?target_hint=_blank",
+       "speculation-rules/prerender/csp-script-src-self.https.html?target_hint=_blank",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/csp-script-src-self.html?target_hint=_self",
+       "speculation-rules/prerender/csp-script-src-self.https.html?target_hint=_self",
        {
         "timeout": "long"
        }
       ]
      ],
-     "csp-script-src-strict-dynamic.html": [
+     "csp-script-src-strict-dynamic.https.html": [
       "d5d8079401127cec27cad30e3cfbb66b997b509b",
       [
-       "speculation-rules/prerender/csp-script-src-strict-dynamic.html?target_hint=_blank",
+       "speculation-rules/prerender/csp-script-src-strict-dynamic.https.html?target_hint=_blank",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/csp-script-src-strict-dynamic.html?target_hint=_self",
+       "speculation-rules/prerender/csp-script-src-strict-dynamic.https.html?target_hint=_self",
        {
         "timeout": "long"
        }
       ]
      ],
-     "csp-script-src-unsafe-inline.html": [
+     "csp-script-src-unsafe-inline.https.html": [
       "b9b3092a1282bd1876d9cb0d93c382a4a851923f",
       [
-       "speculation-rules/prerender/csp-script-src-unsafe-inline.html?target_hint=_blank",
+       "speculation-rules/prerender/csp-script-src-unsafe-inline.https.html?target_hint=_blank",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/csp-script-src-unsafe-inline.html?target_hint=_self",
+       "speculation-rules/prerender/csp-script-src-unsafe-inline.https.html?target_hint=_self",
        {
         "timeout": "long"
        }
       ]
      ],
-     "fetch-blob.html": [
+     "fetch-blob.https.html": [
       "37577f3b5bcc386c4a7c1db6bf01a6e015f3b856",
       [
-       "speculation-rules/prerender/fetch-blob.html?target_hint=_blank",
+       "speculation-rules/prerender/fetch-blob.https.html?target_hint=_blank",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/fetch-blob.html?target_hint=_self",
+       "speculation-rules/prerender/fetch-blob.https.html?target_hint=_self",
        {
         "timeout": "long"
        }
@@ -790319,7 +799311,7 @@
        }
       ]
      ],
-     "iframe-added-post-activation.html": [
+     "iframe-added-post-activation.https.html": [
       "d22b511e108d8b7c7f0b63f28e5bf485eca98758",
       [
        null,
@@ -790328,7 +799320,7 @@
        }
       ]
      ],
-     "indexeddb.html": [
+     "indexeddb.https.html": [
       "f8240014dee43382e7320abf99eaa270e04fd434",
       [
        null,
@@ -790337,16 +799329,16 @@
        }
       ]
      ],
-     "local-storage.html": [
+     "local-storage.https.html": [
       "2f7428746cc5be76ec683e6cf1eeaa49ce1adfb6",
       [
-       "speculation-rules/prerender/local-storage.html?target_hint=_blank",
+       "speculation-rules/prerender/local-storage.https.html?target_hint=_blank",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/local-storage.html?target_hint=_self",
+       "speculation-rules/prerender/local-storage.https.html?target_hint=_self",
        {
         "timeout": "long"
        }
@@ -790361,7 +799353,7 @@
        }
       ]
      ],
-     "media-autoplay.html": [
+     "media-autoplay.https.html": [
       "f5d3291ffdca4ebf4beef6d3eb13c15fa3ec8f62",
       [
        null,
@@ -790370,7 +799362,7 @@
        }
       ]
      ],
-     "navigation-api-location-replace.html": [
+     "navigation-api-location-replace.https.html": [
       "e3ecf1b72b61f5cfbb610906c2c4049ace2d51eb",
       [
        null,
@@ -790379,7 +799371,7 @@
        }
       ]
      ],
-     "navigation-api-multiple-entries.html": [
+     "navigation-api-multiple-entries.https.html": [
       "e8e0f874597081ca12e653e04c3c9c43716778cf",
       [
        null,
@@ -790388,7 +799380,7 @@
        }
       ]
      ],
-     "navigation-api.html": [
+     "navigation-api.https.html": [
       "fd25e94b5b32d56faac7875f88f48fe484cde3d0",
       [
        null,
@@ -790406,7 +799398,7 @@
        }
       ]
      ],
-     "navigator-plugins.html": [
+     "navigator-plugins.https.html": [
       "4d7fa4902acad9d0edb7562136fbcc8af5bc0380",
       [
        null,
@@ -790778,7 +799770,7 @@
        }
       ]
      ],
-     "prerender-while-prerender.html": [
+     "prerender-while-prerender.https.html": [
       "8aa80baf5253f749ce1307b8ca013d753a84e96c",
       [
        null,
@@ -790787,22 +799779,51 @@
        }
       ]
      ],
-     "referrer-policy-from-rules.html": [
-      "7e3b65fe6127c9ecd6f5448d0d31be8962ff8db2",
+     "protocol-handler-register.https.html": [
+      "af2df0f12abac3d7f8908e01a987e0cbd5e2fe25",
       [
-       "speculation-rules/prerender/referrer-policy-from-rules.html?1-1",
+       null,
        {
+        "testdriver": true,
         "timeout": "long"
        }
-      ],
+      ]
+     ],
+     "protocol-handler-unregister.https.html": [
+      "586ce43385445f85ee0a9d52105a77a447c1294c",
       [
-       "speculation-rules/prerender/referrer-policy-from-rules.html?2-last",
+       null,
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ]
+     ],
+     "protocol-handler-validation.https.html": [
+      "613b9bfad087e1ca10c79c4481f99e841d1a56a3",
+      [
+       null,
        {
         "timeout": "long"
        }
       ]
      ],
-     "referrer-policy-mismatch.html": [
+     "referrer-policy-from-rules.https.html": [
+      "7e3b65fe6127c9ecd6f5448d0d31be8962ff8db2",
+      [
+       "speculation-rules/prerender/referrer-policy-from-rules.https.html?1-1",
+       {
+        "timeout": "long"
+       }
+      ],
+      [
+       "speculation-rules/prerender/referrer-policy-from-rules.https.html?2-last",
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
+     "referrer-policy-mismatch.https.html": [
       "fa2d424660a3674ba7c7db7a248df70ba6acde73",
       [
        null,
@@ -790811,7 +799832,7 @@
        }
       ]
      ],
-     "referrer-policy-no-referrer.html": [
+     "referrer-policy-no-referrer.https.html": [
       "a0d1763f95bd749c7ed3fe49a3f22348d591b6b8",
       [
        null,
@@ -790820,7 +799841,7 @@
        }
       ]
      ],
-     "referrer-policy-origin.html": [
+     "referrer-policy-origin.https.html": [
       "95eb8ba72f7ed48c213f6cf5d85ff687719bdf28",
       [
        null,
@@ -790829,7 +799850,7 @@
        }
       ]
      ],
-     "referrer-policy-strict-origin.html": [
+     "referrer-policy-strict-origin.https.html": [
       "0861012fa44cdf5ad10512cb43beb2de783a071b",
       [
        null,
@@ -790838,7 +799859,7 @@
        }
       ]
      ],
-     "referrer.html": [
+     "referrer.https.html": [
       "c0ecc845b56e6e67b4c62f32cf778fd6ab6b9474",
       [
        null,
@@ -790856,110 +799877,110 @@
        }
       ]
      ],
-     "remove-script-element.html": [
+     "remove-script-element.https.html": [
       "31f5f4bb4b9604e459b26ebd612ea12e00581ce7",
       [
        null,
        {}
       ]
      ],
-     "response-code-non-successful.html": [
+     "response-code-non-successful.https.html": [
       "68cd505b2ba56f987ec3918acd2d439fce8c1dab",
       [
-       "speculation-rules/prerender/response-code-non-successful.html?code=204",
+       "speculation-rules/prerender/response-code-non-successful.https.html?code=204",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/response-code-non-successful.html?code=205",
+       "speculation-rules/prerender/response-code-non-successful.https.html?code=205",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/response-code-non-successful.html?code=402",
+       "speculation-rules/prerender/response-code-non-successful.https.html?code=402",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/response-code-non-successful.html?code=404",
+       "speculation-rules/prerender/response-code-non-successful.https.html?code=404",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/response-code-non-successful.html?code=500",
+       "speculation-rules/prerender/response-code-non-successful.https.html?code=500",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/response-code-non-successful.html?code=503",
+       "speculation-rules/prerender/response-code-non-successful.https.html?code=503",
        {
         "timeout": "long"
        }
       ]
      ],
-     "response-code-successful.html": [
+     "response-code-successful.https.html": [
       "eca7f38c8c3d0b4e989ef68192c6248882d44cfe",
       [
-       "speculation-rules/prerender/response-code-successful.html?code=200",
+       "speculation-rules/prerender/response-code-successful.https.html?code=200",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/response-code-successful.html?code=201",
+       "speculation-rules/prerender/response-code-successful.https.html?code=201",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/response-code-successful.html?code=202",
+       "speculation-rules/prerender/response-code-successful.https.html?code=202",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/response-code-successful.html?code=203",
+       "speculation-rules/prerender/response-code-successful.https.html?code=203",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/response-code-successful.html?code=232",
+       "speculation-rules/prerender/response-code-successful.https.html?code=232",
        {
         "timeout": "long"
        }
       ]
      ],
-     "restriction-audio-setSinkId-with-invalid-sinkId.https.tentative.html": [
+     "restriction-audio-setSinkId-with-invalid-sinkId.https.tentative.https.html": [
       "f4a362894c877d7e1d22c59da4b3ffb4f0422301",
       [
-       "speculation-rules/prerender/restriction-audio-setSinkId-with-invalid-sinkId.https.tentative.html?target_hint=_blank",
+       "speculation-rules/prerender/restriction-audio-setSinkId-with-invalid-sinkId.https.tentative.https.html?target_hint=_blank",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/restriction-audio-setSinkId-with-invalid-sinkId.https.tentative.html?target_hint=_self",
+       "speculation-rules/prerender/restriction-audio-setSinkId-with-invalid-sinkId.https.tentative.https.html?target_hint=_self",
        {
         "timeout": "long"
        }
       ]
      ],
-     "restriction-audio-setSinkId.https.tentative.html": [
+     "restriction-audio-setSinkId.https.tentative.https.html": [
       "a3b6db5041817a49480a7b26f9a85332fd878441",
       [
-       "speculation-rules/prerender/restriction-audio-setSinkId.https.tentative.html?target_hint=_blank",
+       "speculation-rules/prerender/restriction-audio-setSinkId.https.tentative.https.html?target_hint=_blank",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/restriction-audio-setSinkId.https.tentative.html?target_hint=_self",
+       "speculation-rules/prerender/restriction-audio-setSinkId.https.tentative.https.html?target_hint=_self",
        {
         "timeout": "long"
        }
@@ -791023,7 +800044,7 @@
        }
       ]
      ],
-     "restriction-broadcast-channel.html": [
+     "restriction-broadcast-channel.https.html": [
       "167f5f9bc4d1992a4f97d49a72b02ac4b9c03f28",
       [
        null,
@@ -791059,7 +800080,7 @@
        }
       ]
      ],
-     "restriction-focus.html": [
+     "restriction-focus.https.html": [
       "b606d1f8bf97586c3d056adec12f7adc8f9479cb",
       [
        null,
@@ -791086,16 +800107,16 @@
        }
       ]
      ],
-     "restriction-media-auto-play-attribute.html": [
+     "restriction-media-auto-play-attribute.https.html": [
       "10db174db9fdc9c8a2c7c2694bb22799984867bc",
       [
-       "speculation-rules/prerender/restriction-media-auto-play-attribute.html?target_hint=_blank",
+       "speculation-rules/prerender/restriction-media-auto-play-attribute.https.html?target_hint=_blank",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/restriction-media-auto-play-attribute.html?target_hint=_self",
+       "speculation-rules/prerender/restriction-media-auto-play-attribute.https.html?target_hint=_self",
        {
         "timeout": "long"
        }
@@ -791180,22 +800201,22 @@
        }
       ]
      ],
-     "restriction-media-play.html": [
+     "restriction-media-play.https.html": [
       "3db8c22c4178f8161b21fad6fc18d8b41a7b3e3e",
       [
-       "speculation-rules/prerender/restriction-media-play.html?target_hint=_blank",
+       "speculation-rules/prerender/restriction-media-play.https.html?target_hint=_blank",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/restriction-media-play.html?target_hint=_self",
+       "speculation-rules/prerender/restriction-media-play.https.html?target_hint=_self",
        {
         "timeout": "long"
        }
       ]
      ],
-     "restriction-message-boxes.html": [
+     "restriction-message-boxes.https.html": [
       "a40df1acc2ba00d215c2b45b80cf5b621ec2f977",
       [
        null,
@@ -791243,7 +800264,7 @@
        }
       ]
      ],
-     "restriction-prompt-by-before-unload.html": [
+     "restriction-prompt-by-before-unload.https.html": [
       "63a4b11fc3a3fc4a9bea991831e90896cfa018ab",
       [
        null,
@@ -791262,7 +800283,7 @@
        }
       ]
      ],
-     "restriction-request-picture-in-picture.html": [
+     "restriction-request-picture-in-picture.https.html": [
       "743254d3d9cdf00c2cf5621b0168ec89532d3b06",
       [
        null,
@@ -791390,7 +800411,7 @@
        }
       ]
      ],
-     "restriction-speech-synthesis.html": [
+     "restriction-speech-synthesis.https.html": [
       "9dbdf9fd45b0e4d31d13d37f89b7b2eb8626ded8",
       [
        null,
@@ -791502,7 +800523,7 @@
        }
       ]
      ],
-     "restriction-window-move.html": [
+     "restriction-window-move.https.html": [
       "232760db36576e4079850aeb2339684e92f4293d",
       [
        null,
@@ -791511,7 +800532,7 @@
        }
       ]
      ],
-     "restriction-window-open.html": [
+     "restriction-window-open.https.html": [
       "7397d31e65ce13785b5d01e6e420a827715740f9",
       [
        null,
@@ -791520,7 +800541,7 @@
        }
       ]
      ],
-     "restriction-window-resize.html": [
+     "restriction-window-resize.https.html": [
       "a2466c48b36ea0f9d2048fcfafd2e9d85ef2b611",
       [
        null,
@@ -791529,7 +800550,7 @@
        }
       ]
      ],
-     "restrictions.html": [
+     "restrictions.https.html": [
       "817a1995bc561c945c81862fdf41877977aaf368",
       [
        null,
@@ -791547,7 +800568,28 @@
        }
       ]
      ],
-     "sandbox-iframe.html": [
+     "restrictions_shared_storage_worklet.https.html": [
+      "ef6a3031f04c71a5f102a869114db5f5fd1de70f",
+      [
+       "speculation-rules/prerender/restrictions_shared_storage_worklet.https.html?type=add_module",
+       {
+        "timeout": "long"
+       }
+      ],
+      [
+       "speculation-rules/prerender/restrictions_shared_storage_worklet.https.html?type=run",
+       {
+        "timeout": "long"
+       }
+      ],
+      [
+       "speculation-rules/prerender/restrictions_shared_storage_worklet.https.html?type=select_url",
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
+     "sandbox-iframe.https.html": [
       "469b8aadc31137d412faad400523af61922c6c0b",
       [
        null,
@@ -791556,7 +800598,7 @@
        }
       ]
      ],
-     "script-supports-speculationrules.html": [
+     "script-supports-speculationrules.https.html": [
       "2dc856fce5da7c8fa2fb24a8df70348fe5aa84e8",
       [
        null,
@@ -791565,16 +800607,16 @@
        }
       ]
      ],
-     "send-beacon.html": [
+     "send-beacon.https.html": [
       "34843efcde78c5338116ab2ae2dfbfab023df389",
       [
-       "speculation-rules/prerender/send-beacon.html?target_hint=_blank",
+       "speculation-rules/prerender/send-beacon.https.html?target_hint=_blank",
        {
         "timeout": "long"
        }
       ],
       [
-       "speculation-rules/prerender/send-beacon.html?target_hint=_self",
+       "speculation-rules/prerender/send-beacon.https.html?target_hint=_self",
        {
         "timeout": "long"
        }
@@ -791643,7 +800685,7 @@
        }
       ]
      ],
-     "session-storage.tentative.html": [
+     "session-storage.tentative.https.html": [
       "92d73285cce8df081691cb13d7bd288ab79b6b52",
       [
        null,
@@ -791652,7 +800694,7 @@
        }
       ]
      ],
-     "state-and-event.html": [
+     "state-and-event.https.html": [
       "7e8e7fd0a92b7175d2f761f128723404f4a3ba08",
       [
        null,
@@ -791661,7 +800703,7 @@
        }
       ]
      ],
-     "visibility-state.html": [
+     "visibility-state.https.html": [
       "e9e8548c4f686bd55b56210f8b9dd94d5900f7fa",
       [
        null,
@@ -791697,7 +800739,7 @@
        }
       ]
      ],
-     "workers-in-cross-origin-iframe.html": [
+     "workers-in-cross-origin-iframe.https.html": [
       "260bc8eacbf0e0081d1209deafecb07e60be502d",
       [
        null,
@@ -791706,7 +800748,7 @@
        }
       ]
      ],
-     "workers.html": [
+     "workers.https.html": [
       "3abae233a5fbbc1abfdd2c845fb0ba4fe4256f25",
       [
        null,
@@ -791715,6 +800757,142 @@
        }
       ]
      ]
+    },
+    "speculation-tags": {
+     "cross-site-prefetch.https.html": [
+      "b10aecf40350cf9849b6e36e577a29cd9100ee64",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
+     "cross-site-to-same-site-redirection-prefetch.https.html": [
+      "e264572c2f963ed1b1d63515049c33a221551ef5",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
+     "deduped-and-sorted-tags.https.html": [
+      "3d1baaf1907f047b4cdcb64c598a79a101835f65",
+      [
+       "speculation-rules/speculation-tags/deduped-and-sorted-tags.https.html?type=prefetch",
+       {
+        "timeout": "long"
+       }
+      ],
+      [
+       "speculation-rules/speculation-tags/deduped-and-sorted-tags.https.html?type=prerender",
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
+     "invalid-tags.https.html": [
+      "fce1a2a539de44216f5f6b5b201dbf11e5229fc8",
+      [
+       "speculation-rules/speculation-tags/invalid-tags.https.html?tag-level=rule&type=prefetch",
+       {
+        "timeout": "long"
+       }
+      ],
+      [
+       "speculation-rules/speculation-tags/invalid-tags.https.html?tag-level=rule&type=prerender",
+       {
+        "timeout": "long"
+       }
+      ],
+      [
+       "speculation-rules/speculation-tags/invalid-tags.https.html?tag-level=ruleset&type=prefetch",
+       {
+        "timeout": "long"
+       }
+      ],
+      [
+       "speculation-rules/speculation-tags/invalid-tags.https.html?tag-level=ruleset&type=prerender",
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
+     "no-tags.https.html": [
+      "176b3d20bb259e15692228266760ccd679c91429",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
+     "prefetch-eagerness-pointer-down.https.html": [
+      "cbf69cefba61f23b706c9b397308625467671237",
+      [
+       null,
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ]
+     ],
+     "prefetch-eagerness-pointer-hover.https.html": [
+      "f5e749b9c6f63f80c40ed9ff7cac42570f8b8d13",
+      [
+       null,
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ]
+     ],
+     "prerender-target-hint.https.html": [
+      "cab8f4586c514f562976ee41acb2cd6f74568eac",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
+     "same-site-to-cross-site-redirection-prefetch.https.html": [
+      "27ece0cfde17716cf2846d18c825d7d1d286d538",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
+     "valid-tags.https.html": [
+      "f39c2d80235e5a9cad9806ffe47f2bb8b900f4fd",
+      [
+       "speculation-rules/speculation-tags/valid-tags.https.html?tag-level=rule&type=prefetch",
+       {
+        "timeout": "long"
+       }
+      ],
+      [
+       "speculation-rules/speculation-tags/valid-tags.https.html?tag-level=rule&type=prerender",
+       {
+        "timeout": "long"
+       }
+      ],
+      [
+       "speculation-rules/speculation-tags/valid-tags.https.html?tag-level=ruleset&type=prefetch",
+       {
+        "timeout": "long"
+       }
+      ],
+      [
+       "speculation-rules/speculation-tags/valid-tags.https.html?tag-level=ruleset&type=prerender",
+       {
+        "timeout": "long"
+       }
+      ]
+     ]
     }
    },
    "speech-api": {
@@ -791726,7 +800904,7 @@
      ]
     ],
     "SpeechRecognition-basics.https.html": [
-     "16c22e7c95fbaf13125692bb3ecef865a9f365f5",
+     "827844096f6e58a7b64f1192958c8a2475a1410f",
      [
       null,
       {}
@@ -791747,10 +800925,12 @@
      ]
     ],
     "SpeechRecognition-installOnDevice.https.html": [
-     "08d370d5dc21c95b137712c0da2b6655331f4fd2",
+     "2f5b359c571d6d9cc97815ae6ba46e4249ec569e",
      [
       null,
-      {}
+      {
+       "testdriver": true
+      }
      ]
     ],
     "SpeechRecognition-onerror.https.html": [
@@ -792908,10 +802088,10 @@
       }
      ]
     ],
-    "requestStorageAccess-cross-origin-fetch.sub.https.tentative.window.js": [
+    "requestStorageAccess-cross-origin-fetch.sub.https.window.js": [
      "21592a9225f646e51f935b044a476217f4e1e4f4",
      [
-      "storage-access-api/requestStorageAccess-cross-origin-fetch.sub.https.tentative.window.html",
+      "storage-access-api/requestStorageAccess-cross-origin-fetch.sub.https.window.html",
       {
        "script_metadata": [
         [
@@ -793324,6 +802504,42 @@
       }
      ]
     ],
+    "storage-access-beyond-cookies.BlobURLDedicatedWorker.sub.https.tentative.window.js": [
+     "2d04c2ee405fcff67dd0e6e79fbddc385ef05510",
+     [
+      "storage-access-api/storage-access-beyond-cookies.BlobURLDedicatedWorker.sub.https.tentative.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/testdriver.js"
+        ],
+        [
+         "script",
+         "/resources/testdriver-vendor.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "storage-access-beyond-cookies.BlobURLSharedWorker.sub.https.tentative.window.js": [
+     "f0559984230abc417d7b481ac1e9b549c69ef565",
+     [
+      "storage-access-api/storage-access-beyond-cookies.BlobURLSharedWorker.sub.https.tentative.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/testdriver.js"
+        ],
+        [
+         "script",
+         "/resources/testdriver-vendor.js"
+        ]
+       ]
+      }
+     ]
+    ],
     "storage-access-beyond-cookies.BroadcastChannel.sub.https.window.js": [
      "feb268b4b8146290eec743779c4a8d9567bc74b3",
      [
@@ -793540,6 +802756,24 @@
       }
      ]
     ],
+    "storage-access-beyond-cookies.thirdPartyBlobStorage.sub.https.window.js": [
+     "5dc67f0c7f1d8553d79ded2f315d0bfd073ec500",
+     [
+      "storage-access-api/storage-access-beyond-cookies.thirdPartyBlobStorage.sub.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/testdriver.js"
+        ],
+        [
+         "script",
+         "/resources/testdriver-vendor.js"
+        ]
+       ]
+      }
+     ]
+    ],
     "storage-access-beyond-cookies.unpartitioned.sub.https.window.js": [
      "ddc5b49f4819fc127a99d30ebc2792244cae3570",
      [
@@ -798623,6 +807857,71 @@
        }
       ]
      ],
+     "crashtests": {
+      "garbage-collection.any.js": [
+       "6e9d80c41425b13800717f9e27184f64f1514752",
+       [
+        "streams/readable-streams/crashtests/garbage-collection.any.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "script",
+           "/common/gc.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "streams/readable-streams/crashtests/garbage-collection.any.serviceworker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "script",
+           "/common/gc.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "streams/readable-streams/crashtests/garbage-collection.any.sharedworker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "script",
+           "/common/gc.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "streams/readable-streams/crashtests/garbage-collection.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "script",
+           "/common/gc.js"
+          ]
+         ]
+        }
+       ]
+      ]
+     },
      "cross-realm-crash.window.js": [
       "5fc7ce37a5f6d2dbd90b5f898bcd7b198f0c50b0",
       [
@@ -803339,7 +812638,7 @@
       ]
      ],
      "close.any.js": [
-      "45261e7ca7e01dd056df13cbc8a6816ba7ba9b22",
+      "3b2c07cc3bfea1bf09a4c170f08e10c5be495848",
       [
        "streams/writable-streams/close.any.html",
        {
@@ -803757,6 +813056,71 @@
        }
       ]
      ],
+     "crashtests": {
+      "garbage-collection.any.js": [
+       "a3796881c9fb544a0b446db39af233b3866ae2b9",
+       [
+        "streams/writable-streams/crashtests/garbage-collection.any.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "script",
+           "/common/gc.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "streams/writable-streams/crashtests/garbage-collection.any.serviceworker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "script",
+           "/common/gc.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "streams/writable-streams/crashtests/garbage-collection.any.sharedworker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "script",
+           "/common/gc.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "streams/writable-streams/crashtests/garbage-collection.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "script",
+           "/common/gc.js"
+          ]
+         ]
+        }
+       ]
+      ]
+     },
      "error.any.js": [
       "d08c8a54863bb9693e76116946bd118592d6928c",
       [
@@ -805027,7 +814391,7 @@
        ]
       ],
       "accept-signature.window.js": [
-       "efcbf0cdad6cb2816b47e989701835a30b777639",
+       "97e817e328c279149ac9668ed5014a30f811006d",
        [
         "subresource-integrity/signatures/tentative/accept-signature.window.html",
         {
@@ -805055,7 +814419,7 @@
        ]
       ],
       "client-initiated.cross-origin.window.js": [
-       "ce7b817f7e863d4502494e9946955cbefb145b0a",
+       "26e1a3090eb447602beb5fc1cf3ae2ab3b86c71b",
        [
         "subresource-integrity/signatures/tentative/client-initiated.cross-origin.window.html",
         {
@@ -805139,6 +814503,24 @@
         }
        ]
       ],
+      "scheme.window.js": [
+       "69ff21de3c7976c2124a3607bd21b6dca6508084",
+       [
+        "subresource-integrity/signatures/tentative/scheme.window.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "/common/get-host-info.sub.js"
+          ],
+          [
+           "script",
+           "helper.js"
+          ]
+         ]
+        }
+       ]
+      ],
       "script.window.js": [
        "d4c4e57b270ad807bb46306509121469b6627001",
        [
@@ -805154,7 +814536,7 @@
        ]
       ],
       "server-initiated.window.js": [
-       "e2b3e78ac1163fff9ff470fb958f5844168d56a4",
+       "8dec3daaded618997ed43747475a3316574efc42",
        [
         "subresource-integrity/signatures/tentative/server-initiated.window.html",
         {
@@ -805184,6 +814566,20 @@
          ]
         }
        ]
+      ],
+      "unknown-parameter.window.js": [
+       "2b4df54c6ed62ff9898e640790a1126b950f1915",
+       [
+        "subresource-integrity/signatures/tentative/unknown-parameter.window.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "helper.js"
+          ]
+         ]
+        }
+       ]
       ]
      }
     },
@@ -805194,6 +814590,34 @@
       {}
      ]
     ],
+    "tentative": {
+     "integrity-policy": {
+      "parsing.https.html": [
+       "205854419a7d58871e39a5cfb3a86ccd38cd5492",
+       [
+        "subresource-integrity/tentative/integrity-policy/parsing.https.html?type=enforce",
+        {
+         "timeout": "long"
+        }
+       ],
+       [
+        "subresource-integrity/tentative/integrity-policy/parsing.https.html?type=report",
+        {
+         "timeout": "long"
+        }
+       ]
+      ],
+      "script.https.html": [
+       "783374db920a24ae32a3492d8cfe2edc5d8eb5d3",
+       [
+        null,
+        {
+         "timeout": "long"
+        }
+       ]
+      ]
+     }
+    },
     "unencoded-digest": {
      "tentative": {
       "fetch.any.js": [
@@ -806139,13 +815563,6 @@
        {}
       ]
      ],
-     "discard-check-removal-order.html": [
-      "2935a69addaabdeee2eb381de847cd7f77688ce3",
-      [
-       null,
-       {}
-      ]
-     ],
      "end-attribute-change-end-time.html": [
       "9f05d7d405d364a1eadfa104c1c4bd90a2bf3b8c",
       [
@@ -806195,6 +815612,13 @@
        {}
       ]
      ],
+     "historical.html": [
+      "2a807125296bac8f2338ac9e1b94a0c42a2ac409",
+      [
+       null,
+       {}
+      ]
+     ],
      "interval-restart-events.html": [
       "3c3ad89a3230bb03048dc3fc9727558de511bee9",
       [
@@ -807073,6 +816497,13 @@
      ]
     },
     "embedded": {
+     "attr-image-fetchpriority.html": [
+      "b083538a8b8ba723347860dda97afecadd1283ee",
+      [
+       null,
+       {}
+      ]
+     ],
      "image-crossorigin.sub.html": [
       "531512ec168003a55bd687b1b8db010e161f1b0e",
       [
@@ -807115,6 +816546,29 @@
       ]
      }
     },
+    "fonts": {
+     "zero-font-size-adjust-no-glyphs-font.html": [
+      "b1783af474c0e866694b619ca9c4d89a29bfb829",
+      [
+       null,
+       {}
+      ]
+     ],
+     "zero-font-size-adjust-no-glyphs-zero-height-font.html": [
+      "25839e0ef5f386700be0edbbd3658ea8f47e7434",
+      [
+       null,
+       {}
+      ]
+     ],
+     "zero-font-size-adjust.html": [
+      "7e7a226c6b35cb6b7469d7400f72225ee7dd13b0",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "geometry": {
      "inheritance.svg": [
       "760328ac31818d86a9410fd7c412d803e30416a2",
@@ -807330,7 +816784,7 @@
      ]
     ],
     "idlharness.window.js": [
-     "b363128c25a9068df93b26966b82b50cdd9b87f7",
+     "57beca77fd45b83f40fcdf378103d6f1c1c0940d",
      [
       "svg/idlharness.window.html",
       {
@@ -807353,6 +816807,33 @@
      ]
     ],
     "interact": {
+     "focus-inside-hidden-svg-containers-01.html": [
+      "25765c5b93e66b597c3e66a3083e40e298491cb2",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "focus-inside-hidden-svg-containers-02.html": [
+      "fd9fd34275d0784d82ec0ef847b295c3ad93bcca",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "focus-inside-hidden-svg-containers-03.html": [
+      "097cff57b5ac8296f2e528f96e5333a7370e9722",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "inheritance.svg": [
       "e67f19ed43529af5e34683b6853ae870435be014",
       [
@@ -807391,7 +816872,7 @@
       ]
      ],
      "script-content.svg": [
-      "94836f7c0331cb8a1caebacef02a75018b2b4ddb",
+      "b882160b4e68d4eeb27cc498d2f3ed8967bbdd7d",
       [
        null,
        {}
@@ -808065,7 +817546,7 @@
      },
      "scripted": {
       "SVGMarkerElement-orientType-synchronization.html": [
-       "041421283105b1fbc1cacabbe81267b9babfb5ac",
+       "a409183189a828fd33c28adfe6160a6bd027b8ab",
        [
         null,
         {}
@@ -808230,6 +817711,13 @@
      ]
     },
     "scripted": {
+     "attr-script-fetchpriority.html": [
+      "2f73e1e59a8a450d0a1ad74e45cbb6d25c70bf4a",
+      [
+       null,
+       {}
+      ]
+     ],
      "script-invalid-script-type.html": [
       "9602dd525bd4d2b77b8d4ffadebef9e568a98c77",
       [
@@ -808460,7 +817948,7 @@
       ]
      ],
      "presentation-attributes-special-cases.html": [
-      "7bfa001030a0e0969d845e353a9d721d9ce940a0",
+      "9a5da751ce1ace3c277bfce3bf9b99352ac7786f",
       [
        null,
        {}
@@ -808974,6 +818462,13 @@
         {}
        ]
       ],
+      "SVGGraphicsElement-padding.svg": [
+       "7bf47767a525a4950cf4be9f7da970ec9c8fdbe0",
+       [
+        null,
+        {}
+       ]
+      ],
       "SVGGraphicsElement.getBBox-01.html": [
        "773b06e5043d8d942b793a03d967a8acc925d5b1",
        [
@@ -809648,10 +819143,12 @@
      ]
     ],
     "ServiceWorkerContainer-register-from-ServiceWorker.https.html": [
-     "7bc1ee7469db2660699f265bac57ce15c7a6778a",
+     "23020096383ff1bdce32f7880d0ff2baf0e72435",
      [
       null,
-      {}
+      {
+       "timeout": "long"
+      }
      ]
     ],
     "ServiceWorkerContainer-register-from-SharedWorker.https.html": [
@@ -809725,7 +819222,7 @@
      ]
     ],
     "TrustedTypePolicy-createXXX.html": [
-     "4cd91aa2a2b26877e0c5cacdcaf5719f267a3cca",
+     "f51f51d98455ebccdee31a5b0d844a926b27fc0e",
      [
       null,
       {}
@@ -809801,6 +819298,13 @@
       {}
      ]
     ],
+    "TrustedTypePolicyFactory-createPolicy-non-tt-policy-name.html": [
+     "2530b33d29085c01a5f50b15ad38021608b1fbf9",
+     [
+      null,
+      {}
+     ]
+    ],
     "TrustedTypePolicyFactory-createPolicy-unenforced.html": [
      "293444820216e17adb8c4f02a1615d7dfbfe2e6e",
      [
@@ -809918,7 +819422,7 @@
      ]
     ],
     "block-string-assignment-to-Document-write.html": [
-     "0b16a9c4910070b2bcf829d15b1aba8b7be9d060",
+     "c774dca4390955b3b91f1648adb18ad22bd6e355",
      [
       null,
       {}
@@ -810272,7 +819776,25 @@
      ]
     ],
     "should-sink-type-mismatch-violation-be-blocked-by-csp-001.html": [
-     "5662c64ac4ed531d2dee12356e8ab2c117a01c5f",
+     "a920f5240d722480eafb03c45effd9ff0e5a758f",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
+    ],
+    "should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker.html": [
+     "55e4c57bdebe994fbe938d2e34d121e34d1e77bf",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
+    ],
+    "should-sink-type-mismatch-violation-be-blocked-by-csp-003.html": [
+     "d5bbf704443874717812c08080a7e61b835f45a5",
      [
       null,
       {
@@ -810281,7 +819803,7 @@
      ]
     ],
     "should-trusted-type-policy-creation-be-blocked-by-csp-001.html": [
-     "6e51bd5ef198a7419539e63b835b4f07becfcea3",
+     "1816a34746fe0f101594f027b68f49646cc4cf2c",
      [
       null,
       {
@@ -810290,7 +819812,7 @@
      ]
     ],
     "should-trusted-type-policy-creation-be-blocked-by-csp-002.html": [
-     "ef1a4bde3782b5dfb5a3e1471f6b9e38217d6f1f",
+     "abf24276372da37c7b88e03d65328612b8732a54",
      [
       null,
       {
@@ -810299,7 +819821,25 @@
      ]
     ],
     "should-trusted-type-policy-creation-be-blocked-by-csp-003.html": [
-     "55f1479e3db0e88684a171cfee5a948e5cae8fe9",
+     "052fbb8cbfb94023cadb003e858647de0d2b139e",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
+    ],
+    "should-trusted-type-policy-creation-be-blocked-by-csp-004-worker.html": [
+     "5726db94bf374996de8049af62036b69150b7608",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
+    ],
+    "should-trusted-type-policy-creation-be-blocked-by-csp-005.html": [
+     "8d10bcb30132755e9301913b0eebeee48c754f01",
      [
       null,
       {
@@ -810343,21 +819883,14 @@
      ]
     ],
     "trusted-types-eval-reporting-no-unsafe-eval.html": [
-     "69b5bf3c1d1e901227a37d841f4bafae0401e362",
+     "27bd4644496e34bf6a253a80ffeff059a317770c",
      [
       null,
       {}
      ]
     ],
     "trusted-types-eval-reporting-report-only.html": [
-     "a9e14f09e4ab322d6dcb6935b83cc819aa55f412",
-     [
-      null,
-      {}
-     ]
-    ],
-    "trusted-types-eval-reporting.html": [
-     "d037c058d9b2b495a8b90954b17b89075b98ccf2",
+     "09b2f1c258574087b7de48d5a568a77dbdd2c2a9",
      [
       null,
       {}
@@ -810378,21 +819911,56 @@
      ]
     ],
     "trusted-types-navigation.html": [
-     "74a25fa3480c3779da87705812e26a3043edd2bc",
+     "f29405651f11a47d398cde6d01f57ce71afd97b3",
      [
       null,
       {}
      ]
     ],
     "trusted-types-report-only.html": [
-     "f4386f832f43f57b82c52edc5e7dbe16308b6255",
+     "7b1a9c7e302c9da93b65b420e316c7cc94823a99",
      [
       null,
       {}
      ]
     ],
-    "trusted-types-reporting-check-report.html": [
-     "ae5ac25052d34be4d64bada3fb23283c783978ee",
+    "trusted-types-reporting-check-report-DedicatedWorker-create-policy.html": [
+     "71576c4ecc121a1005237773ed7d17b871ee7fd0",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-check-report-DedicatedWorker-sink-mismatch.html": [
+     "72354a99eed9d2d26f4b01ab811a6ab41b788551",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-check-report-Window-create-policy.html": [
+     "4c9506c5b435d41241d0aa905a357db0c739f211",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-check-report-Window-sink-mismatch.html": [
+     "ad855dfb2f15a85548c423fe587592925e9a962d",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-clipping-of-sample.html": [
+     "1e4a8470ad1f5b001f4bcd862b74b579758b59cc",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-clipping-of-sample.tentative.html": [
+     "203cff8611086c9642bc5d690c617486b5372dae",
      [
       null,
       {}
@@ -810405,6 +819973,41 @@
       {}
      ]
     ],
+    "trusted-types-reporting-for-DedicatedWorker-DedicatedWorker-constructor.html": [
+     "b70a074fc7fd2c07428a3aca281ec263825a6883",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-DedicatedWorker-ServiceWorkerContainer-register.https.html": [
+     "9db187a2f91600b83883226aedca2b339f01e77f",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-DedicatedWorker-eval.html": [
+     "184bc8ad333b855745c29ca3709bf55696a5fd8f",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-DedicatedWorker-function-constructor.html": [
+     "26d4e54634a218d504adc136eb10f4813e38a973",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-DedicatedWorker-importScripts.html": [
+     "5db284f715cfc67847cd61e8028c2887d4a20fe4",
+     [
+      null,
+      {}
+     ]
+    ],
     "trusted-types-reporting-for-DedicatedWorker-setTimeout-setInterval.html": [
      "7e44a12fd2df50ee5beaf478470c4c828ab9c2b8",
      [
@@ -810503,6 +820106,41 @@
       {}
      ]
     ],
+    "trusted-types-reporting-for-ServiceWorker-ServiceWorkerContainer-register.https.html": [
+     "ac853cd8f6e71245d561bdc0abf2342b6afb22d9",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-ServiceWorker-eval.https.html": [
+     "2d0b6315fb9dc160e03167d567845e82fafbcae8",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-ServiceWorker-function-constructor.https.html": [
+     "791663dfc792179e9c145bc33442fa0b81966f7a",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-ServiceWorker-importScripts.https.html": [
+     "865409aca1b55958a0c7ca3751b289820c8b8123",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-ServiceWorker-setTimeout-setInterval.https.html": [
+     "34b962df085e29da2301156ba495b336866a4554",
+     [
+      null,
+      {}
+     ]
+    ],
     "trusted-types-reporting-for-ShadowRoot-innerHTML.html": [
      "9aaf2d8aa4f50dd4712efb1f6f47bbe05b0dd2c9",
      [
@@ -810517,6 +820155,41 @@
       {}
      ]
     ],
+    "trusted-types-reporting-for-SharedWorker-DedicatedWorker-constructor.html": [
+     "3b382d8774a0c8bff47847118cfa5df5f5f09688",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-SharedWorker-ServiceWorkerContainer-register.https.html": [
+     "00e9a75dfb0443edbf789d42be9759db670b8930",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-SharedWorker-eval.html": [
+     "6ae0f60351f30ccb339c0e7af757fd9f991b1ec0",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-SharedWorker-function-constructor.html": [
+     "dc77be79640b692a618a853cea67cc9159e7eab4",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-SharedWorker-importScripts.html": [
+     "fb01333dd463c4860aa3f7fc25e1bbf1568a06ab",
+     [
+      null,
+      {}
+     ]
+    ],
     "trusted-types-reporting-for-SharedWorker-setTimeout-setInterval.html": [
      "7c97f644873f4ad4888c72d07e0ffbb4698cde05",
      [
@@ -810524,6 +820197,41 @@
       {}
      ]
     ],
+    "trusted-types-reporting-for-Window-DedicatedWorker-constructor.html": [
+     "3d2a91d74ca45fec8ecba500c6da50d02cb68cdb",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-Window-ServiceWorkerContainer-register.https.html": [
+     "482b9c333e3a9ea16de19d8e53fc8125b7250396",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-Window-SharedWorker-constructor.html": [
+     "a03dd21be9779b113eca42a46444d554faaf1d63",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-Window-eval.html": [
+     "7f4772aed149ee0ce2458d1f8df13500d2418f65",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-reporting-for-Window-function-constructor.html": [
+     "9b9617a9b5df7be69271bf7fe7a184b542c56491",
+     [
+      null,
+      {}
+     ]
+    ],
     "trusted-types-reporting-for-Window-setTimeout-setInterval.html": [
      "87e26060ab74a44db8ae902ff178642b1aa6081f",
      [
@@ -810532,7 +820240,7 @@
      ]
     ],
     "trusted-types-reporting.html": [
-     "5e7930382ad16c3def4ae4055148595cf64a2325",
+     "7432d3bded8c45b64e12eca00cc6c477349d4869",
      [
       null,
       {
@@ -810540,6 +820248,20 @@
       }
      ]
     ],
+    "trusted-types-sandbox-allow-scripts.html": [
+     "b89cb56710266c91fd06bb7462d953a3efd695ea",
+     [
+      null,
+      {}
+     ]
+    ],
+    "trusted-types-sandbox-no-allow-scripts.html": [
+     "c4e4683934ec2d59a521e5cb7f99e2d0799723fa",
+     [
+      null,
+      {}
+     ]
+    ],
     "trusted-types-source-file-path.html": [
      "105a04247f630ddb49a2813cfa2345226eac91aa",
      [
@@ -810627,6 +820349,31 @@
        ]
       }
      ]
+    ],
+    "useragentdata.https.tentative.any.js": [
+     "3af48ee416ac217d7c5d488d6874e445bc6edf1e",
+     [
+      "ua-client-hints/useragentdata.https.tentative.any.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "tests for navigator.userAgentData on Linux"
+        ]
+       ]
+      }
+     ],
+     [
+      "ua-client-hints/useragentdata.https.tentative.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "tests for navigator.userAgentData on Linux"
+        ]
+       ]
+      }
+     ]
     ]
    },
    "uievents": {
@@ -814671,7 +824418,7 @@
      ]
     ],
     "measure-l3.any.js": [
-     "642b55ab635e2c021d99c1aaf3e924ca2c5c0c29",
+     "13511dfbf494e5963186e1f97a5e47f4b1fb0eea",
      [
       "user-timing/measure-l3.any.html",
       {
@@ -814908,7 +824655,7 @@
      ]
     ],
     "request-video-frame-callback-during-xr-session.https.html": [
-     "d5f69ec285c8c8462a93418a9936c4e65cf609b8",
+     "0c881472547a85fbb49a7ced2425bfba8a231cd3",
      [
       null,
       {}
@@ -814945,13 +824692,42 @@
    },
    "viewport": {
     "viewport-segments.html": [
-     "64f0eb9caefb0b862faabcfe0ab23df52c00735d",
+     "cd24f2bd230b6ce60da9fd230554856ae43d6b64",
      [
       null,
       {}
      ]
     ]
    },
+   "viewport-segments": {
+    "viewport-segments-change-event.https.html": [
+     "f039d5514d0ae2974d793342c8b95e10cc1c0a63",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "viewport-segments-env-variables.https.html": [
+     "dce6757d49a39059d67433e1663813ce56b093eb",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "viewport-segments-segments-property.https.html": [
+     "653e2bcb2530ef0bd86712981726f2df71ac093f",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ]
+   },
    "virtual-keyboard": {
     "idlharness.https.window.js": [
      "8a40e68575f0fc7383f660346e8b98c646c798e2",
@@ -816205,6 +825981,13 @@
         {}
        ]
       ],
+      "simd_select.wast.js.html": [
+       "5d50138374b1ce1edaa9d8b28d03f33b6cb6bab3",
+       [
+        null,
+        {}
+       ]
+      ],
       "simd_splat.wast.js.html": [
        "45204220343e96015990bb8c6374c2a98aa62382",
        [
@@ -825731,7 +835514,7 @@
        ]
       ],
       "effect-value-context-filling.html": [
-       "fcb7f131266c47bb225aa78458ba96b043a47e41",
+       "499a779b87ffbb24b6cbdd4b84fa6287fd241c7f",
        [
         null,
         {}
@@ -825851,7 +835634,14 @@
        ]
       ],
       "commitStyles.html": [
-       "9a7dbea8b8649bb4580e60fef1e1530a84f2b13f",
+       "26c8342e6f24b70d0acc81f4e62865b8cce6b261",
+       [
+        null,
+        {}
+       ]
+      ],
+      "commitStyles.tentative.html": [
+       "8b7d089ae34fcc7660c153e61a571b547b94e141",
        [
         null,
         {}
@@ -825963,7 +835753,7 @@
        ]
       ],
       "style-change-events.html": [
-       "d1c1c96f7b03e8f8cd6596f1ae24772d292e77b4",
+       "c64400e869df5e844e276facb7d975827027f68a",
        [
         null,
         {}
@@ -825997,7 +835787,7 @@
      },
      "AnimationTrigger": {
       "constructor.html": [
-       "3429c5b1877fa357255b6967fb13083cf9d0d7ef",
+       "8b59b9fc637a4ddb31d2e2cfca07ee0f93de24ed",
        [
         null,
         {}
@@ -826433,7 +836223,7 @@
        ]
       ],
       "finishing-an-animation.html": [
-       "fbf6558f781e624ed9ea7c9470e78d75d0854cb2",
+       "d4f36becea496af2430c4a7a459622579f60ab4c",
        [
         null,
         {}
@@ -828664,7 +838454,7 @@
        ]
       ],
       "audiocontext-sinkid-constructor.https.html": [
-       "d2dc54aee6a7f93e846244e1f3ab88c3774cf917",
+       "6e1bdb22d52f3da2f57c10103291575af2695faa",
        [
         null,
         {}
@@ -829886,7 +839676,7 @@
        ]
       ],
       "mediaElementAudioSourceToScriptProcessorTest.html": [
-       "56d0787b7673b11d903de23159b49ba15b85c1f4",
+       "1099ee8d244a9d8a2d0d3e60531d5ae9f516ca57",
        [
         null,
         {}
@@ -830813,7 +840603,7 @@
      ]
     ],
     "audio-data.any.js": [
-     "c18606e2b7054a1965233f9dc602e1b6fdfeaadc",
+     "dd199c485fb22370d7af03cb8b3df6601a825dbe",
      [
       "webcodecs/audio-data.any.html",
       {
@@ -831011,7 +840801,7 @@
      ]
     ],
     "audioDecoder-codec-specific.https.any.js": [
-     "32eb6598c66451b366ad014635c73049589565f4",
+     "b0791813f21dc056a0e523b349fe114a35ff457c",
      [
       "webcodecs/audioDecoder-codec-specific.https.any.html?adts_aac",
       {
@@ -834427,7 +844217,7 @@
      ]
     ],
     "image-decoder.https.any.js": [
-     "1b3fabbfc4ae1879f816b01dac2c771d2cec2a69",
+     "9ca28e49c4a2b5254c2f3c18664809bad9384b05",
      [
       "webcodecs/image-decoder.https.any.html",
       {
@@ -835472,7 +845262,7 @@
      ]
     ],
     "video-decoder-no-size-in-configure.https.any.js": [
-     "3481b465f9eb431ce3dc799f4f1e625fbe3d7c0c",
+     "2ad7040e08b72617ac77b19fb47efc967c95bea8",
      [
       "webcodecs/video-decoder-no-size-in-configure.https.any.html?av1",
       {
@@ -836734,8 +846524,57 @@
       }
      ]
     ],
+    "video-encoder-orientation.https.any.js": [
+     "de687f114987bc0172f0fc2fe5e343e268d72a45",
+     [
+      "webcodecs/video-encoder-orientation.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/common/media.js"
+        ],
+        [
+         "script",
+         "/webcodecs/utils.js"
+        ],
+        [
+         "script",
+         "/webcodecs/video-encoder-utils.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "webcodecs/video-encoder-orientation.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/common/media.js"
+        ],
+        [
+         "script",
+         "/webcodecs/utils.js"
+        ],
+        [
+         "script",
+         "/webcodecs/video-encoder-utils.js"
+        ]
+       ]
+      }
+     ]
+    ],
     "video-encoder-rescaling.https.any.js": [
-     "70bafa04964cba77acc1c86b3f7d6f4b8ce4b728",
+     "a7f89da67bc7b10a294f5f8465b0175e623376d5",
      [
       "webcodecs/video-encoder-rescaling.https.any.html?av1",
       {
@@ -840618,7 +850457,7 @@
        ]
       ],
       "explicitly-closed.tentative.window.js": [
-       "612003d58eaea908ad93294a7bbf777184356a28",
+       "12bfa0bd73e9278e39b825d4fa81437f943cbd02",
        [
         "webmessaging/message-channels/close-event/explicitly-closed.tentative.window.html",
         {
@@ -841495,7 +851334,7 @@
    "webnn": {
     "conformance_tests": {
      "abs.https.any.js": [
-      "fcf144200f665b7f9370c2c3f0867f6cfc80a059",
+      "de6a5761df443ab6977ee3a61afc764eedd31c2c",
       [
        "webnn/conformance_tests/abs.https.any.html?cpu",
        {
@@ -841606,7 +851445,7 @@
       ]
      ],
      "add.https.any.js": [
-      "ad1df74b65aa34b672afd1480c2abc29d48df03f",
+      "be82df1dc280bbf1a2e880f3adb7a6a8aef60c16",
       [
        "webnn/conformance_tests/add.https.any.html?cpu",
        {
@@ -841828,7 +851667,7 @@
       ]
      ],
      "batch_normalization.https.any.js": [
-      "b8fa3f026bcf75afc4dcaef375861b438216446b",
+      "1da85777342c9cead346f2cfd96eaf965544a088",
       [
        "webnn/conformance_tests/batch_normalization.https.any.html?cpu",
        {
@@ -842533,7 +852372,7 @@
       ]
      ],
      "ceil.https.any.js": [
-      "7f31a80ce7a9148431379b09dbcc91e9faab72b6",
+      "7d487dd65fa708e2a94c83a7278d7693359075bf",
       [
        "webnn/conformance_tests/ceil.https.any.html?cpu",
        {
@@ -842644,7 +852483,7 @@
       ]
      ],
      "clamp.https.any.js": [
-      "d6fa68eb19d7c7c1a28f5ce9cfade0e73e4f4e8a",
+      "b3ccdcddca306b018f64011210da3036ee66cf6f",
       [
        "webnn/conformance_tests/clamp.https.any.html?cpu",
        {
@@ -842755,7 +852594,7 @@
       ]
      ],
      "concat.https.any.js": [
-      "0208e2ec605387a8d4dac040b64a1465b61d6848",
+      "d41921720463d388eeb0e152b30e04d8246b40b0",
       [
        "webnn/conformance_tests/concat.https.any.html?cpu",
        {
@@ -842865,8 +852704,119 @@
        }
       ]
      ],
+     "constant-reshape-optimization.https.any.js": [
+      "eaa232b7413ebd132509ae9a605d3f5e49dc8d17",
+      [
+       "webnn/conformance_tests/constant-reshape-optimization.https.any.html?cpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test constant reshape optimization"
+         ],
+         [
+          "global",
+          "window"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/constant-reshape-optimization.https.any.html?gpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test constant reshape optimization"
+         ],
+         [
+          "global",
+          "window"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/constant-reshape-optimization.https.any.html?npu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test constant reshape optimization"
+         ],
+         [
+          "global",
+          "window"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
      "conv2d.https.any.js": [
-      "9fe246c9395c6cacf7e2f5245dac420e295707be",
+      "45fecb2b40cc399ace227264e881d2009d467cd2",
       [
        "webnn/conformance_tests/conv2d.https.any.html?cpu",
        {
@@ -842977,7 +852927,7 @@
       ]
      ],
      "conv_transpose2d.https.any.js": [
-      "3a2ac69effe5af4baac10c8d116c73eb3b19ef26",
+      "a17df911e4482de7e49874d84f5818694515e722",
       [
        "webnn/conformance_tests/conv_transpose2d.https.any.html?cpu",
        {
@@ -843310,7 +853260,7 @@
       ]
      ],
      "dequantizeLinear.https.any.js": [
-      "8642a9647528c3ba3268d076fb2c92b9751d56d7",
+      "7f1ed15cc4a36aba360daebda56a44da32620a5b",
       [
        "webnn/conformance_tests/dequantizeLinear.https.any.html?cpu",
        {
@@ -843421,7 +853371,7 @@
       ]
      ],
      "div.https.any.js": [
-      "1fb80fe17ed82cdfa65b98817b80f40b3b67a75b",
+      "1914c4829c47a622881d84f69f6c445cc1a37da4",
       [
        "webnn/conformance_tests/div.https.any.html?cpu",
        {
@@ -843532,7 +853482,7 @@
       ]
      ],
      "elu.https.any.js": [
-      "6b789e6308c3f289b3f290e95cb7f05f8eb3e664",
+      "09cb0a99115f4089aa82ea6bcb978e9ff6c3c853",
       [
        "webnn/conformance_tests/elu.https.any.html?cpu",
        {
@@ -845197,7 +855147,7 @@
       ]
      ],
      "hard_sigmoid.https.any.js": [
-      "cfa033ba4b024abbde8bfa154d8ba81180c0b501",
+      "b5f6fd0c97aa71d8bb75b466dd72526724681060",
       [
        "webnn/conformance_tests/hard_sigmoid.https.any.html?cpu",
        {
@@ -845308,7 +855258,7 @@
       ]
      ],
      "hard_swish.https.any.js": [
-      "6bd054b326e8fbd86856fdd9913db37db41f3416",
+      "e49ea6fd719f17aea3c58c7ed78c0bbad3685399",
       [
        "webnn/conformance_tests/hard_swish.https.any.html?cpu",
        {
@@ -846288,8 +856238,119 @@
        }
       ]
      ],
+     "inputs-with-special-names.https.any.js": [
+      "2921cf1fe5ebfd33e504e81bf5367f4940a3ac3c",
+      [
+       "webnn/conformance_tests/inputs-with-special-names.https.any.html?cpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test input with special character names"
+         ],
+         [
+          "global",
+          "window"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/inputs-with-special-names.https.any.html?gpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test input with special character names"
+         ],
+         [
+          "global",
+          "window"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/inputs-with-special-names.https.any.html?npu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test input with special character names"
+         ],
+         [
+          "global",
+          "window"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
      "instance_normalization.https.any.js": [
-      "26e0cd0aa935d473a7bdb84da59e46f534544066",
+      "2766f914b3dd66ef5f8120642bfaf30dc3a052fa",
       [
        "webnn/conformance_tests/instance_normalization.https.any.html?cpu",
        {
@@ -846400,7 +856461,7 @@
       ]
      ],
      "layer_normalization.https.any.js": [
-      "2d5e98ea09d492732dd3e70b7e02902e6be5d390",
+      "f22d0444cfa79285cc9860b7b5a75a7cdfb0f18e",
       [
        "webnn/conformance_tests/layer_normalization.https.any.html?cpu",
        {
@@ -846511,7 +856572,7 @@
       ]
      ],
      "leaky_relu.https.any.js": [
-      "fe950c0ed4d88cb6ca0e84d59106a22713008be3",
+      "03c8985c6c64e12b8aca59caf071493c7daefa61",
       [
        "webnn/conformance_tests/leaky_relu.https.any.html?cpu",
        {
@@ -846955,7 +857016,7 @@
       ]
      ],
      "log.https.any.js": [
-      "011beef53aca200f5916dc51152fe745866989ec",
+      "8ed807b3401330e961f2ae9721f6378147580ddd",
       [
        "webnn/conformance_tests/log.https.any.html?cpu",
        {
@@ -847843,7 +857904,7 @@
       ]
      ],
      "max.https.any.js": [
-      "9685572bcd7bfd02bae1bab4c9adb11af045d017",
+      "2da14e1545a5c4c44fe8c94e4688957b1f257ca9",
       [
        "webnn/conformance_tests/max.https.any.html?cpu",
        {
@@ -847954,7 +858015,7 @@
       ]
      ],
      "min.https.any.js": [
-      "e843b003a0b17804fc9dd4aacd5be260a354a47b",
+      "5e324e412bf291b9973c6a5fb9594015a911c899",
       [
        "webnn/conformance_tests/min.https.any.html?cpu",
        {
@@ -848065,7 +858126,7 @@
       ]
      ],
      "mul.https.any.js": [
-      "e64a70d099a45489d14f0cf8b0873cc3801b2042",
+      "277d3e2fa0d5e1005781ba400d4870c6459e6f6e",
       [
        "webnn/conformance_tests/mul.https.any.html?cpu",
        {
@@ -848176,7 +858237,7 @@
       ]
      ],
      "neg.https.any.js": [
-      "c03afc52516e3e59bd84c500afbbefe6ef7ce7cf",
+      "8bc10475453e24ce6e7d4049d5470b21d8e7b147",
       [
        "webnn/conformance_tests/neg.https.any.html?cpu",
        {
@@ -848944,7 +859005,7 @@
       ]
      ],
      "pooling.https.any.js": [
-      "cf62a0e95bcd97dea07790b7073928d0076dacec",
+      "8f81ff565d232dec427381dfdae638cffceb0d91",
       [
        "webnn/conformance_tests/pooling.https.any.html?cpu",
        {
@@ -849055,7 +859116,7 @@
       ]
      ],
      "pow.https.any.js": [
-      "ae3524f3376d12aaf3d70a4a39704a91db3ffc90",
+      "f51feca4eacae6a0a36bd6125e78bb889aac011d",
       [
        "webnn/conformance_tests/pow.https.any.html?cpu",
        {
@@ -849166,7 +859227,7 @@
       ]
      ],
      "prelu.https.any.js": [
-      "a3612715805db9f55fee1ee36dde77318900d75b",
+      "b89de832d3e4c583b13d12a29c92a62f0c01a95e",
       [
        "webnn/conformance_tests/prelu.https.any.html?cpu",
        {
@@ -849276,8 +859337,443 @@
        }
       ]
      ],
+     "qdq_subgraph.https.any.js": [
+      "aa816cce7fb2cd3d0a3f81d0453c8c199bf052fe",
+      [
+       "webnn/conformance_tests/qdq_subgraph.https.any.html?cpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN `dequantization -> operators -> quantization` subgraph"
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/qdq_subgraph.https.any.html?gpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN `dequantization -> operators -> quantization` subgraph"
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/qdq_subgraph.https.any.html?npu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN `dequantization -> operators -> quantization` subgraph"
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/qdq_subgraph.https.any.serviceworker.html?cpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN `dequantization -> operators -> quantization` subgraph"
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/qdq_subgraph.https.any.serviceworker.html?gpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN `dequantization -> operators -> quantization` subgraph"
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/qdq_subgraph.https.any.serviceworker.html?npu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN `dequantization -> operators -> quantization` subgraph"
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/qdq_subgraph.https.any.sharedworker.html?cpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN `dequantization -> operators -> quantization` subgraph"
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/qdq_subgraph.https.any.sharedworker.html?gpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN `dequantization -> operators -> quantization` subgraph"
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/qdq_subgraph.https.any.sharedworker.html?npu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN `dequantization -> operators -> quantization` subgraph"
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/qdq_subgraph.https.any.worker.html?cpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN `dequantization -> operators -> quantization` subgraph"
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/qdq_subgraph.https.any.worker.html?gpu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN `dequantization -> operators -> quantization` subgraph"
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "webnn/conformance_tests/qdq_subgraph.https.any.worker.html?npu",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "test WebNN `dequantization -> operators -> quantization` subgraph"
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "variant",
+          "?cpu"
+         ],
+         [
+          "variant",
+          "?gpu"
+         ],
+         [
+          "variant",
+          "?npu"
+         ],
+         [
+          "script",
+          "../resources/utils.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
      "quantizeLinear.https.any.js": [
-      "c25bdbaac60fca0525e8cbcf080c1319a5ab0c26",
+      "af46c8945a3dcbedf573543c58b8299d86e5f2ff",
       [
        "webnn/conformance_tests/quantizeLinear.https.any.html?cpu",
        {
@@ -849499,7 +859995,7 @@
       ]
      ],
      "reduce_l1.https.any.js": [
-      "63a6ab727cb5f0c64034c533ccab031fe89f7ef0",
+      "1e6b163cff340a6ceb9b161e6f2920b5d833e22c",
       [
        "webnn/conformance_tests/reduce_l1.https.any.html?cpu",
        {
@@ -849610,7 +860106,7 @@
       ]
      ],
      "reduce_l2.https.any.js": [
-      "7358ee8a15c82b839590a99654db3bf235eed702",
+      "0670a1d25c1c6d6abe8c2a585a4fa6421573e9bf",
       [
        "webnn/conformance_tests/reduce_l2.https.any.html?cpu",
        {
@@ -849721,7 +860217,7 @@
       ]
      ],
      "reduce_log_sum.https.any.js": [
-      "31e21dbd50ae51d57097bde5e0f09f24a195dfff",
+      "9d30accb2cb39262f70b8dd2756c5ceaeca846e1",
       [
        "webnn/conformance_tests/reduce_log_sum.https.any.html?cpu",
        {
@@ -849832,7 +860328,7 @@
       ]
      ],
      "reduce_log_sum_exp.https.any.js": [
-      "e60d6cfc892cb2ccda3593023c6d6e69fcd37cd6",
+      "e8026435017b67ee118741eac5d17487d46a5e21",
       [
        "webnn/conformance_tests/reduce_log_sum_exp.https.any.html?cpu",
        {
@@ -849943,7 +860439,7 @@
       ]
      ],
      "reduce_max.https.any.js": [
-      "03458a30470ea09aae07624bd212b7fda14b5ceb",
+      "784db3101b66104ad8ac1208e2d15b5c4982b5ed",
       [
        "webnn/conformance_tests/reduce_max.https.any.html?cpu",
        {
@@ -850054,7 +860550,7 @@
       ]
      ],
      "reduce_mean.https.any.js": [
-      "e9c9475088aa9b01f7b59769287ec3b52f9f1c67",
+      "63566b011c0bfc6ea0a212bec80db3aaa7c31c96",
       [
        "webnn/conformance_tests/reduce_mean.https.any.html?cpu",
        {
@@ -850165,7 +860661,7 @@
       ]
      ],
      "reduce_min.https.any.js": [
-      "aca474d74ff7dc993cd63a9ca3b2e865633f39ac",
+      "64cf8b7ee98cdbe89ff06f7e6c6f11b4eefa2596",
       [
        "webnn/conformance_tests/reduce_min.https.any.html?cpu",
        {
@@ -850276,7 +860772,7 @@
       ]
      ],
      "reduce_product.https.any.js": [
-      "9534c5b92e54ab4f02a1e5c18b78dcc7371d2573",
+      "6b4c1242d7f8f19c4357a91bec38eeec8e3f8e25",
       [
        "webnn/conformance_tests/reduce_product.https.any.html?cpu",
        {
@@ -850387,7 +860883,7 @@
       ]
      ],
      "reduce_sum.https.any.js": [
-      "687f8e5e7ee66847e00525f284581b5ffdbf9a9d",
+      "d333f9fb5ad92b902b17aa55b8a9cb73a0912b7e",
       [
        "webnn/conformance_tests/reduce_sum.https.any.html?cpu",
        {
@@ -850609,7 +861105,7 @@
       ]
      ],
      "relu.https.any.js": [
-      "30b797637db06896df52f95e2f735b792e41316f",
+      "63ef9fa9ff09d41d60a228b79b20fd29ff911a21",
       [
        "webnn/conformance_tests/relu.https.any.html?cpu",
        {
@@ -850831,7 +861327,7 @@
       ]
      ],
      "reshape.https.any.js": [
-      "fe758193730c0c8a43ba226bd3c50cccb3224b70",
+      "05b8ea21e674796818f4c6143044a1beaaa3fb59",
       [
        "webnn/conformance_tests/reshape.https.any.html?cpu",
        {
@@ -852073,7 +862569,7 @@
       ]
      ],
      "sigmoid.https.any.js": [
-      "a925f0c611076884905531ef9a3d4e52c4b118e5",
+      "287568a390ab8d49ccf0a1422c551ab79b57c1cd",
       [
        "webnn/conformance_tests/sigmoid.https.any.html?cpu",
        {
@@ -852184,7 +862680,7 @@
       ]
      ],
      "sign.https.any.js": [
-      "4c3a330f850ca591bcc5a1b9c8fc784469ee821e",
+      "004c03bdf1339d74a84c95d5b03b31b56876d0fe",
       [
        "webnn/conformance_tests/sign.https.any.html?cpu",
        {
@@ -852517,7 +863013,7 @@
       ]
      ],
      "softmax.https.any.js": [
-      "f289f081b16ac90241af68566630199057fdbd4f",
+      "33c2e1db9efd23499a0ea12826916b8a8b8a69b7",
       [
        "webnn/conformance_tests/softmax.https.any.html?cpu",
        {
@@ -852628,7 +863124,7 @@
       ]
      ],
      "softplus.https.any.js": [
-      "52fce910dfebe5ac0bb9d27d8eb6303f7ed4db10",
+      "36386c03378eabe3dd2baecb2cf6c46d92cadcc1",
       [
        "webnn/conformance_tests/softplus.https.any.html?cpu",
        {
@@ -852739,7 +863235,7 @@
       ]
      ],
      "softsign.https.any.js": [
-      "21eeb6c5d817bcaf695e06f05d0ebaa65d54e554",
+      "cf06bbc4fdb8c5e57d247955ba53a5dca7597941",
       [
        "webnn/conformance_tests/softsign.https.any.html?cpu",
        {
@@ -853072,7 +863568,7 @@
       ]
      ],
      "sub.https.any.js": [
-      "565f532c8f06f7e2a1e7eaea4dfd27954e98465a",
+      "85b15f5a00051c0ece94f6202150c0b93b23260f",
       [
        "webnn/conformance_tests/sub.https.any.html?cpu",
        {
@@ -853729,7 +864225,7 @@
       ]
      ],
      "tanh.https.any.js": [
-      "1b38d7707e859a2f8f1fdb90093dc0235a7d3e31",
+      "63b8668644a10c0f13ab8b3c19cb9a9edf29be2b",
       [
        "webnn/conformance_tests/tanh.https.any.html?cpu",
        {
@@ -856699,7 +867195,7 @@
       ]
      ],
      "createContext.https.any.js": [
-      "314f7e3e3c65ec5fbabd0615602d128b9fd21766",
+      "3f089a1de2946176ecd4eb6a5daf1194796ecd5a",
       [
        "webnn/validation_tests/createContext.https.any.html?cpu",
        {
@@ -869993,7 +880489,7 @@
      ]
     ],
     "RTCCertificate.html": [
-     "6b7626c92e75c06dba8606558abe003d8d994fd3",
+     "2662580c95973a9367c605b6230e0e07a0b9d6bd",
      [
       null,
       {}
@@ -870014,7 +880510,7 @@
      ]
     ],
     "RTCConfiguration-iceServers.html": [
-     "aa66bfbb2bfff0febc9404e4b73e0637a3226a70",
+     "bc7831361ab5f417b46a507b0e5977bef9bedd49",
      [
       null,
       {}
@@ -870174,7 +880670,7 @@
      ]
     ],
     "RTCIceCandidate-constructor.html": [
-     "b760c7b05a565c97c9c75287d11ca8cc83258d1f",
+     "05c0849f7a040b08dabd6201e08825328bdc7a8b",
      [
       null,
       {}
@@ -870190,7 +880686,7 @@
      ]
     ],
     "RTCIceTransport.html": [
-     "31504481f4ba36e2bf57f3b968bb8b58c394a209",
+     "f00af08e97c32408fcaf8e6efd0d1c134128335b",
      [
       null,
       {
@@ -870240,7 +880736,7 @@
      ]
     ],
     "RTCPeerConnection-addIceCandidate.html": [
-     "618ef7e33c69735338ec4e05f2e15cd40d34c063",
+     "4517554bc0bcd5fe0275a358b4c51e5dca7dfaa5",
      [
       null,
       {}
@@ -870265,7 +880761,7 @@
      ]
     ],
     "RTCPeerConnection-addTransceiver.https.html": [
-     "3fd83a76fe2f687114de006bc877bc915a1809be",
+     "62df4293067e554dee9328f3f4f03556dedcdb10",
      [
       null,
       {}
@@ -870803,7 +881299,7 @@
      ]
     ],
     "RTCRtpReceiver-getSynchronizationSources.https.html": [
-     "cb5336f3f3523d0684e48de42f2666a6e6a3aa50",
+     "de9ad184af0d7619a725bb302b0814bf57b70c62",
      [
       null,
       {
@@ -871239,6 +881735,13 @@
       {}
      ]
     ],
+    "outbound-rtp-encoding-index.https.html": [
+     "825fe6949c3d9b040763c51c088b75162a03b481",
+     [
+      null,
+      {}
+     ]
+    ],
     "promises-call.html": [
      "ee64b463ee22aca1b68e6875e124425c9e43743f",
      [
@@ -871263,6 +881766,13 @@
        }
       ]
      ],
+     "av1-profile-asymmetry.https.html": [
+      "f7d14ad6d8613c70c1bbecdda84281ca4d3620df",
+      [
+       null,
+       {}
+      ]
+     ],
      "bundle.https.html": [
       "73ea477e0473e698bec25ca01a3b21f1579b8b35",
       [
@@ -871352,6 +881862,15 @@
        {}
       ]
      ],
+     "h265-loopback.https.html": [
+      "c3a394ef8f4ce5fa03ff8b272eacbd1b61e6ff07",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
      "handover-datachannel.html": [
       "8f224f822a76bb48924bc13e59d53f8a24d99f64",
       [
@@ -871517,7 +882036,7 @@
       ]
      ],
      "video-codecs.https.html": [
-      "2fbb4ae28f64b07da1bc8defa1f8c65fc448604d",
+      "bf76e1b2e6a417a0ba7a7e512782f52f9a941281",
       [
        null,
        {}
@@ -871549,6 +882068,13 @@
       {}
      ]
     ],
+    "rtp-stats-lifetime.https.html": [
+     "4ddd6ad4f16c5432694723f4da6b68acd24e06cb",
+     [
+      null,
+      {}
+     ]
+    ],
     "simplecall-no-ssrcs.https.html": [
      "b47cd30eaf4e5db337a1fb91e34e9ede16ee5421",
      [
@@ -871786,7 +882312,7 @@
      ]
     ],
     "script-metadata-transform.https.html": [
-     "11c88b469363e3faeff5723e07628f9ba2f1c6b1",
+     "106593879c24e1903beebc146f6c804854cc441b",
      [
       null,
       {
@@ -871816,7 +882342,7 @@
      ]
     ],
     "script-transform-sendKeyFrameRequest.https.html": [
-     "51b797eb68346e928bba18bff94c39f1c9d7a4e4",
+     "9bc75bd7a0e0894cdecab7ffb7eb70d9bf967159",
      [
       null,
       {
@@ -871884,7 +882410,7 @@
     ],
     "tentative": {
      "RTCEncodedAudioFrame-clone.https.html": [
-      "9f07713d4439c676fd7a5cc2f7d32af92a350e19",
+      "c93f8b3e54150b94334c33f30031d0b9f3afcd19",
       [
        null,
        {
@@ -871893,7 +882419,7 @@
       ]
      ],
      "RTCEncodedAudioFrame-metadata.https.html": [
-      "435e1c067834fe2050fd5c510f95516c5e6aeb61",
+      "df4577c5614a82afd7b02d988d0f15caa3b9e848",
       [
        null,
        {
@@ -872208,7 +882734,7 @@
      ]
     ],
     "supported-stats.https.html": [
-     "677736f3cd8f33963c53d4fa9bee0c52f4826a5f",
+     "81aef5f94b90da1ee83de617ecabf0d3e11ad21d",
      [
       null,
       {
@@ -888383,7 +898909,7 @@
        ]
       ],
       "depth_sensing_cpu_inactiveFrame.https.html": [
-       "92c20cecbf677900a474f0fd6694bf3c024ce4b1",
+       "c6ac8c60b0a765ecc893d7b5e0e7555c3ddabf51",
        [
         null,
         {}
@@ -888403,6 +898929,20 @@
         {}
        ]
       ],
+      "depth_sensing_cpu_matchDepthViewIdentity.https.html": [
+       "f3256106e904b2b66291834197a80a4537c3c682",
+       [
+        null,
+        {}
+       ]
+      ],
+      "depth_sensing_cpu_pauseResume.https.html": [
+       "47469f4a0ea186e981843db8c00a1d72bc938907",
+       [
+        null,
+        {}
+       ]
+      ],
       "depth_sensing_cpu_staleView.https.html": [
        "6a411ace451f817ba20c69a3eca22b55c536a56a",
        [
@@ -888411,6 +898951,13 @@
        ]
       ]
      },
+     "depth_sensing_attributes_throw_not_enabled.https.html": [
+      "4e1f2e8c76d19a6e4e23534d0ab7fdd65065031b",
+      [
+       null,
+       {}
+      ]
+     ],
      "depth_sensing_notEnabled.https.html": [
       "23bae35493a651a6a2bd9c424d020825bdf12dcf",
       [
@@ -888425,6 +898972,13 @@
        {}
       ]
      ],
+     "depth_type_request_respected.https.html": [
+      "2846c9ce10b433d69f9db8f0864a38bc1cce9b25",
+      [
+       null,
+       {}
+      ]
+     ],
      "gpu": {
       "depth_sensing_gpu_dataUnavailable.https.html": [
        "018edf7693452d69753758dc0db8e25a36d8615c",
@@ -888434,7 +898988,7 @@
        ]
       ],
       "depth_sensing_gpu_inactiveFrame.https.html": [
-       "6116f7a0414e578e88ada99508d67f8318578b8d",
+       "8528b4f80d85b44dad93dafc92ce598b8ea79bb0",
        [
         null,
         {}
@@ -888447,6 +899001,20 @@
         {}
        ]
       ],
+      "depth_sensing_gpu_matchDepthViewIdentity.https.html": [
+       "1813ddd449ec40a9722d38795b23c3397e02dc16",
+       [
+        null,
+        {}
+       ]
+      ],
+      "depth_sensing_gpu_pauseResume.https.html": [
+       "d51edb8cd3b85192fc5904df9f488e7c32356080",
+       [
+        null,
+        {}
+       ]
+      ],
       "depth_sensing_gpu_staleView.https.html": [
        "ecd0d479f7aac7222d512edeafef9565993add1d",
        [
@@ -890101,6 +900669,13 @@
       {}
      ]
     ],
+    "WorkerNavigator_userAgentData.https.tentative.html": [
+     "e4026e2ff06873c24c37cd59108b0a83dc69fd9a",
+     [
+      null,
+      {}
+     ]
+    ],
     "WorkerPerformanceNow.html": [
      "286832fd947138c3e13b3c10cd5632706f57b335",
      [
@@ -895711,7 +906286,7 @@
      ]
     ],
     "send-redirect.htm": [
-     "7d73f0f64cc4d7506e607f75d3bba37b9d3d74a9",
+     "de3899f5e5d3ccef28ac54dfa05a7dbf8af98bd9",
      [
       null,
       {}
@@ -895859,7 +906434,7 @@
      ]
     ],
     "setrequestheader-case-insensitive.htm": [
-     "1aed30d1c2a13fcb35e90a31e599a6cc963c6491",
+     "ce10482cad8d47f8f3933a55f321b44f88f663aa",
      [
       null,
       {}
@@ -902036,14 +912611,14 @@
         ]
        ],
        "direction-unicode-bidi-007.xht": [
-        "d7f00230f9dfc06ea056f1af11da8ce5e34f8622",
+        "ff45a8cb230261009da18cefdf79048da311e7a4",
         [
          null,
          {}
         ]
        ],
        "direction-unicode-bidi-008.xht": [
-        "3b5e7299fea1c15991af45ab8df572698459b4cd",
+        "53c0318839bd03e9cfffcd796c1eee6671b411d8",
         [
          null,
          {}
@@ -917206,7 +927781,7 @@
        },
        "context_created": {
         "context_created.py": [
-         "152bcdb018b120f9d4bc9164168f78905f0e6fd7",
+         "2982f78d99188ba77f4bf243cb7dd363644ed6a2",
          [
           null,
           {}
@@ -917222,7 +927797,7 @@
        },
        "context_destroyed": {
         "context_destroyed.py": [
-         "254708c725a6394b1e094290c30c613e20104932",
+         "2fd0cd6bb479ee97b50a2137e7993dbbc8a94ec5",
          [
           null,
           {}
@@ -917282,6 +927857,15 @@
          ]
         ]
        },
+       "download_will_begin": {
+        "download_will_begin.py": [
+         "7e402783aada70ee561401fada6afed927645120",
+         [
+          null,
+          {}
+         ]
+        ]
+       },
        "fragment_navigated": {
         "fragment_navigated.py": [
          "45a65cacdf03503325bc5357e6971e747a13d2fd",
@@ -917293,7 +927877,7 @@
        },
        "get_tree": {
         "frames.py": [
-         "4fd220ed8fc4426f540bf9eedad9e1d8ac399a05",
+         "df4ff899e90356bf9e84e36dc00ab9aba9230896",
          [
           null,
           {}
@@ -917307,7 +927891,7 @@
          ]
         ],
         "max_depth.py": [
-         "b855b8e7eba06b56a63ee2dd4f64b0e88d8a7513",
+         "9f7130f59c94a91582cd0daa32b5bc5ec9166a34",
          [
           null,
           {}
@@ -917321,7 +927905,7 @@
          ]
         ],
         "root.py": [
-         "40e9f8ac93b81b5c499133db9682798683725131",
+         "171cc0eb607e50493c29eb54de71c3c0e922afd3",
          [
           null,
           {}
@@ -917629,7 +928213,7 @@
          ]
         ],
         "user_contexts.py": [
-         "64c261637342868e90ee67a2332503e00fa96b0d",
+         "fa1e748d6b2a91addeb6c0569ebd271c00865fb8",
          [
           null,
           {}
@@ -917668,14 +928252,14 @@
        },
        "user_prompt_closed": {
         "beforeunload.py": [
-         "ab16526fdb177417269ff93c2e3d8abfdf730e56",
+         "bfc857168cbaaf8b2aed66d1d4c8485b0ba161af",
          [
           null,
           {}
          ]
         ],
         "user_prompt_closed.py": [
-         "fdb9e8b3ca7d5cc642ec69517f065887b16cdc24",
+         "8322829ebaf078152fd1874773ce0d110a0aac8e",
          [
           null,
           {}
@@ -917684,7 +928268,7 @@
        },
        "user_prompt_opened": {
         "beforeunload.py": [
-         "782cc766507419568ff668648d16b63cd67a3780",
+         "4b0346cde838bda2be5369271bbca32f0ff103bf",
          [
           null,
           {}
@@ -917698,7 +928282,46 @@
          ]
         ],
         "user_prompt_opened.py": [
-         "c24128004f73a8b09a61991837b1dad103f91789",
+         "a9051f662c8124b6ee4a8c1fc657a5a1aaf2a2b9",
+         [
+          null,
+          {}
+         ]
+        ]
+       }
+      },
+      "emulation": {
+       "set_geolocation_override": {
+        "contexts.py": [
+         "068bb804e73bd06e2d901363280792d479cfb38f",
+         [
+          null,
+          {}
+         ]
+        ],
+        "coordinates.py": [
+         "ea4fe643c3ecfc6e3609172706b51df17456e2e7",
+         [
+          null,
+          {}
+         ]
+        ],
+        "error.py": [
+         "27c23dc7811458feb7cd43c8a286c83809d9d2d0",
+         [
+          null,
+          {}
+         ]
+        ],
+        "invalid.py": [
+         "2334d37517df00cde8f845e7ec6412d1570e405b",
+         [
+          null,
+          {}
+         ]
+        ],
+        "user_contexts.py": [
+         "b3038bb59587b661e75945c5b8eeb4e943c72d9e",
          [
           null,
           {}
@@ -917767,14 +928390,14 @@
           ]
          ],
          "set_permission.py": [
-          "574f2149841dd69e579bebca6efaaf25b007c255",
+          "5edb3caee7c849b00349fd3c79df66475c1b5b25",
           [
            null,
            {}
           ]
          ],
          "user_context.py": [
-          "b45ddb12b7e59093210dfdf55d3d9008918b0b41",
+          "7b621d7ec6788db627b952e2a522b860308e40c0",
           [
            null,
            {}
@@ -918143,7 +928766,7 @@
          ]
         ],
         "before_request_sent_cached.py": [
-         "9483a707eab1d4caa561a193d641611cf92ffa2e",
+         "e8119d29d9e259208a11bed7c330a9ecbca49886",
          [
           null,
           {}
@@ -918379,14 +929002,14 @@
        },
        "response_completed": {
         "response_completed.py": [
-         "127416d8de41740b2b7199c93d1256f110c28ecb",
+         "6f53572a341aa5db214714a77e921dd4ce8fcb78",
          [
           null,
           {}
          ]
         ],
         "response_completed_cached.py": [
-         "5b1e3592e09e4dda83ddcd49bdc692f3f9c6c941",
+         "2c7ea02d6011e30ff4ef19050b0cf88681eea653",
          [
           null,
           {}
@@ -918395,14 +929018,14 @@
        },
        "response_started": {
         "response_started.py": [
-         "6ab3e1c3cace1069705f2bf979e843315ec39ca9",
+         "324105197f048622428d30492c95b78957272983",
          [
           null,
           {}
          ]
         ],
         "response_started_cached.py": [
-         "57db04a3afe7ccc09dc771ad11e5d896c4535f6a",
+         "db34035fca15d5b7c2749c316ed6eb8905cabbe7",
          [
           null,
           {}
@@ -919099,7 +929722,7 @@
        },
        "uninstall": {
         "invalid.py": [
-         "54fbb22cf5ebeb1cc633835ae8a1bb5523313d3d",
+         "228f0e57e52f67cd777fa1c7df96a22df4880235",
          [
           null,
           {}
diff --git a/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_failures_Ed25519.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_failures_Ed25519.https.any.js.ini
index 95e6f053ad3..07da8e79d19 100644
--- a/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_failures_Ed25519.https.any.js.ini
+++ b/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_failures_Ed25519.https.any.js.ini
@@ -767,6 +767,18 @@
   [Invalid 'crv' field: importKey(jwk (public) , {name: Ed25519}, true, [verify\])]
     expected: FAIL
 
+  [Invalid 'alg' field 'ed25519': importKey(jwk(private), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Invalid 'alg' field 'ED25519': importKey(jwk(private), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Invalid 'alg' field 'ed25519': importKey(jwk (public) , {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Invalid 'alg' field 'ED25519': importKey(jwk (public) , {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
 
 [okp_importKey_failures_Ed25519.https.any.html]
   [Bad usages: importKey(spki, {name: Ed25519}, true, [encrypt\])]
@@ -1536,3 +1548,15 @@
 
   [Invalid 'crv' field: importKey(jwk (public) , {name: Ed25519}, true, [verify\])]
     expected: FAIL
+
+  [Invalid 'alg' field 'ed25519': importKey(jwk(private), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Invalid 'alg' field 'ED25519': importKey(jwk(private), {name: Ed25519}, true, [sign\])]
+    expected: FAIL
+
+  [Invalid 'alg' field 'ed25519': importKey(jwk (public) , {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Invalid 'alg' field 'ED25519': importKey(jwk (public) , {name: Ed25519}, true, [verify\])]
+    expected: FAIL
diff --git a/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_failures_Ed448.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_failures_Ed448.https.any.js.ini
index 41d6a029444..88c26c527ee 100644
--- a/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_failures_Ed448.https.any.js.ini
+++ b/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey_failures_Ed448.https.any.js.ini
@@ -773,6 +773,18 @@
   [Invalid 'crv' field: importKey(jwk (public) , {name: Ed448}, true, [verify\])]
     expected: FAIL
 
+  [Invalid 'alg' field 'ed448': importKey(jwk(private), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Invalid 'alg' field 'ED448': importKey(jwk(private), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Invalid 'alg' field 'ed448': importKey(jwk (public) , {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Invalid 'alg' field 'ED448': importKey(jwk (public) , {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
 
 [okp_importKey_failures_Ed448.https.any.html]
   [Bad usages: importKey(spki, {name: Ed448}, true, [encrypt\])]
@@ -1548,3 +1560,15 @@
 
   [Invalid 'crv' field: importKey(jwk (public) , {name: Ed448}, true, [verify\])]
     expected: FAIL
+
+  [Invalid 'alg' field 'ed448': importKey(jwk(private), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Invalid 'alg' field 'ED448': importKey(jwk(private), {name: Ed448}, true, [sign\])]
+    expected: FAIL
+
+  [Invalid 'alg' field 'ed448': importKey(jwk (public) , {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Invalid 'alg' field 'ED448': importKey(jwk (public) , {name: Ed448}, true, [verify\])]
+    expected: FAIL
diff --git a/tests/wpt/meta/__dir__.ini b/tests/wpt/meta/__dir__.ini
index 9a3f520ac80..057fb932df2 100644
--- a/tests/wpt/meta/__dir__.ini
+++ b/tests/wpt/meta/__dir__.ini
@@ -1 +1,5 @@
-prefs: ["dom_imagebitmap_enabled:true", "dom_offscreen_canvas_enabled:true", "dom_xpath_enabled:true", "dom_intersection_observer_enabled:true", "dom_resize_observer_enabled:true", "dom_notification_enabled:true", "dom_fontface_enabled:true"]
+prefs: [
+  "dom_serviceworker_enabled:true",
+  "dom_testutils_enabled:true",
+  "dom_urlpattern_enabled:true",
+]
diff --git a/tests/wpt/meta/acid/acid2/reftest.html.ini b/tests/wpt/meta/acid/acid2/reftest.html.ini
new file mode 100644
index 00000000000..4aec05f1495
--- /dev/null
+++ b/tests/wpt/meta/acid/acid2/reftest.html.ini
@@ -0,0 +1,2 @@
+[reftest.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/acid/acid3/numbered-tests.html.ini b/tests/wpt/meta/acid/acid3/numbered-tests.html.ini
new file mode 100644
index 00000000000..420fd9863e1
--- /dev/null
+++ b/tests/wpt/meta/acid/acid3/numbered-tests.html.ini
@@ -0,0 +1,42 @@
+[numbered-tests.html]
+  [Test 2]
+    expected: FAIL
+
+  [Test 40]
+    expected: FAIL
+
+  [Test 42]
+    expected: FAIL
+
+  [Test 43]
+    expected: FAIL
+
+  [Test 46]
+    expected: FAIL
+
+  [Test 64]
+    expected: FAIL
+
+  [Test 69]
+    expected: FAIL
+
+  [Test 70]
+    expected: FAIL
+
+  [Test 72]
+    expected: FAIL
+
+  [Test 74]
+    expected: FAIL
+
+  [Test 75]
+    expected: FAIL
+
+  [Test 77]
+    expected: FAIL
+
+  [Test 79]
+    expected: FAIL
+
+  [Test 80]
+    expected: FAIL
diff --git a/tests/wpt/meta/acid/acid3/test.html.ini b/tests/wpt/meta/acid/acid3/test.html.ini
new file mode 100644
index 00000000000..4cb35b9b730
--- /dev/null
+++ b/tests/wpt/meta/acid/acid3/test.html.ini
@@ -0,0 +1,2 @@
+[test.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/clipboard-apis/clipboard-item.https.html.ini b/tests/wpt/meta/clipboard-apis/clipboard-item.https.html.ini
index 057b25ac030..2a5d4f9792e 100644
--- a/tests/wpt/meta/clipboard-apis/clipboard-item.https.html.ini
+++ b/tests/wpt/meta/clipboard-apis/clipboard-item.https.html.ini
@@ -2,21 +2,6 @@
   [ClipboardItem({string, Blob}) succeeds with different types]
     expected: FAIL
 
-  [ClipboardItem() succeeds with empty options]
-    expected: FAIL
-
-  [ClipboardItem({}) fails with empty dictionary input]
-    expected: FAIL
-
-  [ClipboardItem(Blob) fails]
-    expected: FAIL
-
-  [ClipboardItem() fails with null input]
-    expected: FAIL
-
-  [ClipboardItem() fails with no input]
-    expected: FAIL
-
   [types() returns correct values]
     expected: FAIL
 
diff --git a/tests/wpt/meta/clipboard-apis/idlharness.https.window.js.ini b/tests/wpt/meta/clipboard-apis/idlharness.https.window.js.ini
index d16c54f589e..e648b62a314 100644
--- a/tests/wpt/meta/clipboard-apis/idlharness.https.window.js.ini
+++ b/tests/wpt/meta/clipboard-apis/idlharness.https.window.js.ini
@@ -1,93 +1,24 @@
 [idlharness.https.window.html]
-  [ClipboardItem interface: existence and properties of interface object]
-    expected: FAIL
-
-  [ClipboardItem interface object length]
-    expected: FAIL
-
-  [ClipboardItem interface object name]
-    expected: FAIL
-
-  [ClipboardItem interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [ClipboardItem interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [ClipboardItem interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [ClipboardItem interface: attribute presentationStyle]
-    expected: FAIL
-
-  [ClipboardItem interface: attribute types]
-    expected: FAIL
-
   [ClipboardItem interface: operation getType(DOMString)]
     expected: FAIL
 
   [ClipboardItem interface: operation supports(DOMString)]
     expected: FAIL
 
-  [Clipboard interface: existence and properties of interface object]
-    expected: FAIL
-
-  [Clipboard interface object length]
-    expected: FAIL
-
-  [Clipboard interface object name]
-    expected: FAIL
-
-  [Clipboard interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [Clipboard interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [Clipboard interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
   [Clipboard interface: operation read(optional ClipboardUnsanitizedFormats)]
     expected: FAIL
 
-  [Clipboard interface: operation readText()]
-    expected: FAIL
-
   [Clipboard interface: operation write(ClipboardItems)]
     expected: FAIL
 
-  [Clipboard interface: operation writeText(DOMString)]
-    expected: FAIL
-
-  [Clipboard must be primary interface of navigator.clipboard]
-    expected: FAIL
-
-  [Stringification of navigator.clipboard]
-    expected: FAIL
-
   [Clipboard interface: navigator.clipboard must inherit property "read(optional ClipboardUnsanitizedFormats)" with the proper type]
     expected: FAIL
 
   [Clipboard interface: calling read(optional ClipboardUnsanitizedFormats) on navigator.clipboard with too few arguments must throw TypeError]
     expected: FAIL
 
-  [Clipboard interface: navigator.clipboard must inherit property "readText()" with the proper type]
-    expected: FAIL
-
   [Clipboard interface: navigator.clipboard must inherit property "write(ClipboardItems)" with the proper type]
     expected: FAIL
 
   [Clipboard interface: calling write(ClipboardItems) on navigator.clipboard with too few arguments must throw TypeError]
     expected: FAIL
-
-  [Clipboard interface: navigator.clipboard must inherit property "writeText(DOMString)" with the proper type]
-    expected: FAIL
-
-  [Clipboard interface: calling writeText(DOMString) on navigator.clipboard with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [Navigator interface: attribute clipboard]
-    expected: FAIL
-
-  [Navigator interface: navigator must inherit property "clipboard" with the proper type]
-    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/base-uri/base-uri-deny-url-encoded-host.sub.html.ini b/tests/wpt/meta/content-security-policy/base-uri/base-uri-deny-url-encoded-host.sub.html.ini
new file mode 100644
index 00000000000..89c53bc50ce
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/base-uri/base-uri-deny-url-encoded-host.sub.html.ini
@@ -0,0 +1,7 @@
+[base-uri-deny-url-encoded-host.sub.html]
+  expected: TIMEOUT
+  [Check that baseURI fires a securitypolicyviolation event when it does not match the csp directive due to a url encoded host character.]
+    expected: NOTRUN
+
+  [Check that the baseURI is not set when it does not match the csp directive]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/base-uri/base-uri-deny.sub.html.ini b/tests/wpt/meta/content-security-policy/base-uri/base-uri-deny.sub.html.ini
new file mode 100644
index 00000000000..0968c7cad44
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/base-uri/base-uri-deny.sub.html.ini
@@ -0,0 +1,7 @@
+[base-uri-deny.sub.html]
+  expected: TIMEOUT
+  [Check that baseURI fires a securitypolicyviolation event when it does not match the csp directive]
+    expected: NOTRUN
+
+  [Check that the baseURI is not set when it does not match the csp directive]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/base-uri/base-uri_iframe_sandbox.sub.html.ini b/tests/wpt/meta/content-security-policy/base-uri/base-uri_iframe_sandbox.sub.html.ini
new file mode 100644
index 00000000000..8a286ec5b93
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/base-uri/base-uri_iframe_sandbox.sub.html.ini
@@ -0,0 +1,7 @@
+[base-uri_iframe_sandbox.sub.html]
+  expected: TIMEOUT
+  [base-uri 'self' works with same-origin sandboxed iframes.]
+    expected: TIMEOUT
+
+  [base-uri 'self' blocks foreign-origin sandboxed iframes.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html.ini b/tests/wpt/meta/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html.ini
new file mode 100644
index 00000000000..e3d7c23eef2
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html.ini
@@ -0,0 +1,3 @@
+[report-uri-does-not-respect-base-uri.sub.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/blob/blob-urls-do-not-match-self.sub.html.ini b/tests/wpt/meta/content-security-policy/blob/blob-urls-do-not-match-self.sub.html.ini
new file mode 100644
index 00000000000..7c4537daa5a
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/blob/blob-urls-do-not-match-self.sub.html.ini
@@ -0,0 +1,6 @@
+[blob-urls-do-not-match-self.sub.html]
+  [Expecting logs: ["violated-directive=script-src-elem"\]]
+    expected: FAIL
+
+  [blob-urls-do-not-match-self]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/blob/self-doesnt-match-blob.sub.html.ini b/tests/wpt/meta/content-security-policy/blob/self-doesnt-match-blob.sub.html.ini
new file mode 100644
index 00000000000..07526d1f79e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/blob/self-doesnt-match-blob.sub.html.ini
@@ -0,0 +1,9 @@
+[self-doesnt-match-blob.sub.html]
+  [Expecting logs: ["violated-directive=worker-src","TEST COMPLETE"\]]
+    expected: FAIL
+
+  [worker-connect-src-blocked]
+    expected: FAIL
+
+  [worker-connect-src-blocked 1]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/blob/star-doesnt-match-blob.sub.html.ini b/tests/wpt/meta/content-security-policy/blob/star-doesnt-match-blob.sub.html.ini
new file mode 100644
index 00000000000..179a42c0c69
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/blob/star-doesnt-match-blob.sub.html.ini
@@ -0,0 +1,3 @@
+[star-doesnt-match-blob.sub.html]
+  [Expecting logs: ["violated-directive=worker-src","TEST COMPLETE"\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/child-src/child-src-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/child-src/child-src-blocked.sub.html.ini
new file mode 100644
index 00000000000..b1dc13e61d8
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/child-src/child-src-blocked.sub.html.ini
@@ -0,0 +1,3 @@
+[child-src-blocked.sub.html]
+  [Expecting logs: ["PASS IFrame #1 generated a load event.", "violated-directive=frame-src"\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html.ini b/tests/wpt/meta/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html.ini
new file mode 100644
index 00000000000..c070a772235
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html.ini
@@ -0,0 +1,3 @@
+[child-src-conflicting-frame-src.sub.html]
+  [Expecting logs: ["PASS IFrame #1 generated a load event.", "violated-directive=frame-src"\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/child-src/child-src-cross-origin-load.sub.html.ini b/tests/wpt/meta/content-security-policy/child-src/child-src-cross-origin-load.sub.html.ini
new file mode 100644
index 00000000000..39402f3584f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/child-src/child-src-cross-origin-load.sub.html.ini
@@ -0,0 +1,3 @@
+[child-src-cross-origin-load.sub.html]
+  [Two of the three iframe are expected to load.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/child-src/child-src-redirect-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/child-src/child-src-redirect-blocked.sub.html.ini
new file mode 100644
index 00000000000..47d275f8682
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/child-src/child-src-redirect-blocked.sub.html.ini
@@ -0,0 +1,3 @@
+[child-src-redirect-blocked.sub.html]
+  [Expecting logs: ["PASS IFrame #1 generated a load event.", "violated-directive=frame-src"\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/child-src/child-src-worker-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/child-src/child-src-worker-blocked.sub.html.ini
new file mode 100644
index 00000000000..00dc3a8948a
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/child-src/child-src-worker-blocked.sub.html.ini
@@ -0,0 +1,4 @@
+[child-src-worker-blocked.sub.html]
+  expected: TIMEOUT
+  [Should throw a securitypolicyviolation event]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/connect-src/connect-src-beacon-allowed.sub.html.ini b/tests/wpt/meta/content-security-policy/connect-src/connect-src-beacon-allowed.sub.html.ini
new file mode 100644
index 00000000000..ba79b872b4a
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/connect-src/connect-src-beacon-allowed.sub.html.ini
@@ -0,0 +1,3 @@
+[connect-src-beacon-allowed.sub.html]
+  [Expecting logs: ["Pass"\]]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html.ini
new file mode 100644
index 00000000000..d1a7e7f312a
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html.ini
@@ -0,0 +1,3 @@
+[connect-src-beacon-blocked.sub.html]
+  [Expecting logs: ["Pass", "violated-directive=connect-src"\]]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html.ini
new file mode 100644
index 00000000000..94269848821
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html.ini
@@ -0,0 +1,3 @@
+[connect-src-beacon-redirect-to-blocked.sub.html]
+  [Expecting logs: ["violated-directive=connect-src"\]]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html.ini
new file mode 100644
index 00000000000..7345d867a6e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html.ini
@@ -0,0 +1,3 @@
+[connect-src-eventsource-blocked.sub.html]
+  [Expecting logs: ["blocked","violated-directive=connect-src"\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html.ini
new file mode 100644
index 00000000000..79f00815258
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html.ini
@@ -0,0 +1,3 @@
+[connect-src-eventsource-redirect-to-blocked.sub.html]
+  [Expecting logs: ["PASS EventSource() did not follow the disallowed redirect.","TEST COMPLETE", "violated-directive=connect-src"\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/connect-src/connect-src-json-import-allowed.sub.html.ini b/tests/wpt/meta/content-security-policy/connect-src/connect-src-json-import-allowed.sub.html.ini
new file mode 100644
index 00000000000..a9cc8da56d7
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/connect-src/connect-src-json-import-allowed.sub.html.ini
@@ -0,0 +1,2 @@
+[connect-src-json-import-allowed.sub.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/content-security-policy/connect-src/connect-src-json-import-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/connect-src/connect-src-json-import-blocked.sub.html.ini
new file mode 100644
index 00000000000..f84b0f2c95c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/connect-src/connect-src-json-import-blocked.sub.html.ini
@@ -0,0 +1,2 @@
+[connect-src-json-import-blocked.sub.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/content-security-policy/connect-src/connect-src-syncxmlhttprequest-redirect-to-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/connect-src/connect-src-syncxmlhttprequest-redirect-to-blocked.sub.html.ini
new file mode 100644
index 00000000000..e6156eab928
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/connect-src/connect-src-syncxmlhttprequest-redirect-to-blocked.sub.html.ini
@@ -0,0 +1,3 @@
+[connect-src-syncxmlhttprequest-redirect-to-blocked.sub.html]
+  [Expecting logs: ["PASS Sync XMLHttpRequest.send() did not follow the disallowed redirect.","TEST COMPLETE","violated-directive=connect-src"\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.ini
new file mode 100644
index 00000000000..9b86b6b2d9c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.ini
@@ -0,0 +1,3 @@
+[connect-src-xmlhttprequest-redirect-to-blocked.sub.html]
+  [Expecting logs: ["PASS XMLHttpRequest.send() did not follow the disallowed redirect.","TEST COMPLETE","violated-directive=connect-src"\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/connect-src/shared-worker-connect-src-allowed.sub.html.ini b/tests/wpt/meta/content-security-policy/connect-src/shared-worker-connect-src-allowed.sub.html.ini
new file mode 100644
index 00000000000..1c774a2fb7a
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/connect-src/shared-worker-connect-src-allowed.sub.html.ini
@@ -0,0 +1,4 @@
+[shared-worker-connect-src-allowed.sub.html]
+  expected: ERROR
+  [Expecting logs: ["xhr allowed","TEST COMPLETE"\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/connect-src/shared-worker-connect-src-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/connect-src/shared-worker-connect-src-blocked.sub.html.ini
new file mode 100644
index 00000000000..17ef48ba8e1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/connect-src/shared-worker-connect-src-blocked.sub.html.ini
@@ -0,0 +1,3 @@
+[shared-worker-connect-src-blocked.sub.html]
+  [Expecting logs: ["xhr blocked","TEST COMPLETE"\]]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/connect-src/worker-from-guid.sub.html.ini b/tests/wpt/meta/content-security-policy/connect-src/worker-from-guid.sub.html.ini
new file mode 100644
index 00000000000..3de3b52028c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/connect-src/worker-from-guid.sub.html.ini
@@ -0,0 +1,3 @@
+[worker-from-guid.sub.html]
+  [Expecting logs: ["violated-directive=connect-src","xhr blocked","TEST COMPLETE"\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/font-src/font-match-allowed.sub.html.ini b/tests/wpt/meta/content-security-policy/font-src/font-match-allowed.sub.html.ini
new file mode 100644
index 00000000000..6c90dc5033b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/font-src/font-match-allowed.sub.html.ini
@@ -0,0 +1,4 @@
+[font-match-allowed.sub.html]
+  expected: TIMEOUT
+  [Test font loads if it matches font-src.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/font-src/font-mismatch-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/font-src/font-mismatch-blocked.sub.html.ini
new file mode 100644
index 00000000000..39efa2c9cb2
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/font-src/font-mismatch-blocked.sub.html.ini
@@ -0,0 +1,4 @@
+[font-mismatch-blocked.sub.html]
+  expected: TIMEOUT
+  [Test font does not load if it does not match font-src.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/font-src/font-none-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/font-src/font-none-blocked.sub.html.ini
new file mode 100644
index 00000000000..911f745bb2c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/font-src/font-none-blocked.sub.html.ini
@@ -0,0 +1,4 @@
+[font-none-blocked.sub.html]
+  expected: TIMEOUT
+  [Test font does not load if it does not match font-src.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/font-src/font-self-allowed.html.ini b/tests/wpt/meta/content-security-policy/font-src/font-self-allowed.html.ini
new file mode 100644
index 00000000000..3f0903770c4
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/font-src/font-self-allowed.html.ini
@@ -0,0 +1,4 @@
+[font-self-allowed.html]
+  expected: TIMEOUT
+  [Test font loads if it matches font-src.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/font-src/font-stylesheet-font-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/font-src/font-stylesheet-font-blocked.sub.html.ini
new file mode 100644
index 00000000000..a58c79c1fe9
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/font-src/font-stylesheet-font-blocked.sub.html.ini
@@ -0,0 +1,4 @@
+[font-stylesheet-font-blocked.sub.html]
+  expected: TIMEOUT
+  [Test font does not load if it does not match font-src.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/form-action/form-action-src-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/form-action/form-action-src-blocked.sub.html.ini
new file mode 100644
index 00000000000..3e19126dc82
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/form-action/form-action-src-blocked.sub.html.ini
@@ -0,0 +1,6 @@
+[form-action-src-blocked.sub.html]
+  [Expecting logs: ["violated-directive=form-action","TEST COMPLETE"\]]
+    expected: FAIL
+
+  [form-action-src-blocked]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/form-action/form-action-src-get-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/form-action/form-action-src-get-blocked.sub.html.ini
new file mode 100644
index 00000000000..6bfb5c7b2d2
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/form-action/form-action-src-get-blocked.sub.html.ini
@@ -0,0 +1,3 @@
+[form-action-src-get-blocked.sub.html]
+  [Expecting logs: ["violated-directive=form-action","TEST COMPLETE"\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html.ini
new file mode 100644
index 00000000000..0c3b09b5436
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html.ini
@@ -0,0 +1,3 @@
+[form-action-src-javascript-blocked.sub.html]
+  [Expecting logs: ["violated-directive=form-action","TEST COMPLETE"\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/form-action/form-action-src-redirect-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/form-action/form-action-src-redirect-blocked.sub.html.ini
new file mode 100644
index 00000000000..991d6bf5ce2
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/form-action/form-action-src-redirect-blocked.sub.html.ini
@@ -0,0 +1,6 @@
+[form-action-src-redirect-blocked.sub.html]
+  [Expecting logs: ["violated-directive=form-action","blocked-uri=http://web-platform.test:8000/common/redirect.py?location=http://www1.web-platform.test:8000/content-security-policy/support/postmessage-fail.html","TEST COMPLETE"\]]
+    expected: FAIL
+
+  [form-action-src-redirect-blocked]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-from-serviceworker.https.html.ini b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-from-serviceworker.https.html.ini
new file mode 100644
index 00000000000..f4abd9c7f54
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-from-serviceworker.https.html.ini
@@ -0,0 +1,4 @@
+[frame-ancestors-from-serviceworker.https.html]
+  expected: ERROR
+  [A 'frame-ancestors' CSP directive set from a serviceworker response with a value 'none' should block rendering.]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block.html.ini b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block.html.ini
new file mode 100644
index 00000000000..85197986fba
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block.html.ini
@@ -0,0 +1,3 @@
+[frame-ancestors-nested-cross-in-cross-none-block.html]
+  [A 'frame-ancestors' CSP directive with a value 'none' should block rendering in nested frames.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block.html.ini b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block.html.ini
new file mode 100644
index 00000000000..05706b70fde
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block.html.ini
@@ -0,0 +1,3 @@
+[frame-ancestors-nested-cross-in-cross-self-block.html]
+  [A 'frame-ancestors' CSP directive with a value 'self' should block render in same-origin nested frames.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-block.html.ini b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-block.html.ini
new file mode 100644
index 00000000000..4c8783ec9cb
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-block.html.ini
@@ -0,0 +1,3 @@
+[frame-ancestors-nested-cross-in-cross-url-block.html]
+  [A 'frame-ancestors' CSP directive with a URL value should block or allow rendering in nested frames as appropriate.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-none-block.html.ini b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-none-block.html.ini
new file mode 100644
index 00000000000..e62d12e8b11
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-none-block.html.ini
@@ -0,0 +1,3 @@
+[frame-ancestors-nested-same-in-cross-none-block.html]
+  [A 'frame-ancestors' CSP directive with a value 'none' should block rendering in nested frames.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block.html.ini b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block.html.ini
new file mode 100644
index 00000000000..2cac8df4a5c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block.html.ini
@@ -0,0 +1,3 @@
+[frame-ancestors-nested-same-in-cross-self-block.html]
+  [A 'frame-ancestors' CSP directive with a value 'self' should block render in same-origin nested frames.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-url-block.html.ini b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-url-block.html.ini
new file mode 100644
index 00000000000..b8055da2147
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-url-block.html.ini
@@ -0,0 +1,3 @@
+[frame-ancestors-nested-same-in-cross-url-block.html]
+  [A 'frame-ancestors' CSP directive with a URL value should block or allow rendering in nested frames as appropriate.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-none-block.html.ini b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-none-block.html.ini
new file mode 100644
index 00000000000..17b0cc814fe
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-none-block.html.ini
@@ -0,0 +1,3 @@
+[frame-ancestors-nested-same-in-same-none-block.html]
+  [A 'frame-ancestors' CSP directive with a value 'none' should block rendering in nested frames.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-url-block.html.ini b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-url-block.html.ini
new file mode 100644
index 00000000000..39bc42ba8f4
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-url-block.html.ini
@@ -0,0 +1,3 @@
+[frame-ancestors-nested-same-in-same-url-block.html]
+  [A 'frame-ancestors' CSP directive with a URL value should block or allow rendering in nested frames as appropriate.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-none-block.html.ini b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-none-block.html.ini
new file mode 100644
index 00000000000..8d64bd37513
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-none-block.html.ini
@@ -0,0 +1,3 @@
+[frame-ancestors-none-block.html]
+  [A 'frame-ancestors' CSP directive with a value 'none' should block rendering.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-overrides-xfo.html.ini b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-overrides-xfo.html.ini
new file mode 100644
index 00000000000..2bdb212bde7
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-overrides-xfo.html.ini
@@ -0,0 +1,3 @@
+[frame-ancestors-overrides-xfo.html]
+  [A 'frame-ancestors' CSP directive overrides an 'x-frame-options' header which would allow the page.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-path-ignored.window.js.ini b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-path-ignored.window.js.ini
new file mode 100644
index 00000000000..493d04ea590
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-ancestors/frame-ancestors-path-ignored.window.js.ini
@@ -0,0 +1,3 @@
+[frame-ancestors-path-ignored.window.html]
+  [A 'frame-ancestors' CSP directive with a URL that includes a path should be ignored.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-ancestors/report-blocked-frame.sub.html.ini b/tests/wpt/meta/content-security-policy/frame-ancestors/report-blocked-frame.sub.html.ini
new file mode 100644
index 00000000000..87668edee55
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-ancestors/report-blocked-frame.sub.html.ini
@@ -0,0 +1,3 @@
+[report-blocked-frame.sub.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-ancestors/report-only-frame.sub.html.ini b/tests/wpt/meta/content-security-policy/frame-ancestors/report-only-frame.sub.html.ini
new file mode 100644
index 00000000000..452f2bda704
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-ancestors/report-only-frame.sub.html.ini
@@ -0,0 +1,3 @@
+[report-only-frame.sub.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-src/frame-src-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/frame-src/frame-src-blocked.sub.html.ini
new file mode 100644
index 00000000000..0ba5c4c9773
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-src/frame-src-blocked.sub.html.ini
@@ -0,0 +1,4 @@
+[frame-src-blocked.sub.html]
+  expected: ERROR
+  [Expecting logs: ["PASS IFrame #1 generated a load event.","violated-directive=frame-src"\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-src/frame-src-cross-origin-same-document-navigation.window.js.ini b/tests/wpt/meta/content-security-policy/frame-src/frame-src-cross-origin-same-document-navigation.window.js.ini
new file mode 100644
index 00000000000..b22b217fc25
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-src/frame-src-cross-origin-same-document-navigation.window.js.ini
@@ -0,0 +1,4 @@
+[frame-src-cross-origin-same-document-navigation.window.html]
+  expected: OK
+  [frame-src-cross-origin-same-document-navigation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/frame-src/frame-src-redirect.html.ini b/tests/wpt/meta/content-security-policy/frame-src/frame-src-redirect.html.ini
new file mode 100644
index 00000000000..d9e7e433022
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-src/frame-src-redirect.html.ini
@@ -0,0 +1,4 @@
+[frame-src-redirect.html]
+  expected: TIMEOUT
+  [Redirected iframe src should evaluate both enforced and report-only policies on both original request and when following redirect]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/frame-src/frame-src-same-document-meta.sub.html.ini b/tests/wpt/meta/content-security-policy/frame-src/frame-src-same-document-meta.sub.html.ini
new file mode 100644
index 00000000000..76c2310e18b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-src/frame-src-same-document-meta.sub.html.ini
@@ -0,0 +1,4 @@
+[frame-src-same-document-meta.sub.html]
+  expected: TIMEOUT
+  [Same-document navigations in an iframe blocked by CSP frame-src dynamically using the <meta> tag]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/frame-src/frame-src-same-document.sub.html.ini b/tests/wpt/meta/content-security-policy/frame-src/frame-src-same-document.sub.html.ini
new file mode 100644
index 00000000000..5dfedaaf046
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-src/frame-src-same-document.sub.html.ini
@@ -0,0 +1,4 @@
+[frame-src-same-document.sub.html]
+  expected: TIMEOUT
+  [Same-document navigation in an iframe blocked by CSP frame-src]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/frame-src/frame-src-self-unique-origin.html.ini b/tests/wpt/meta/content-security-policy/frame-src/frame-src-self-unique-origin.html.ini
new file mode 100644
index 00000000000..3f276fa4eb9
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/frame-src/frame-src-self-unique-origin.html.ini
@@ -0,0 +1,4 @@
+[frame-src-self-unique-origin.html]
+  expected: TIMEOUT
+  [Iframe's url must not match with 'self'. It must be blocked.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html.ini
new file mode 100644
index 00000000000..5891a18681e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html.ini
@@ -0,0 +1,6 @@
+[script-tag.http.html]
+  [Content Security Policy: Expects blocked for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for script-tag to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html.ini
new file mode 100644
index 00000000000..699a0dd6238
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html.ini
@@ -0,0 +1,6 @@
+[script-tag.https.html]
+  [Content Security Policy: Expects blocked for script-tag to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for script-tag to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html.ini
new file mode 100644
index 00000000000..b3f759cfae0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html.ini
new file mode 100644
index 00000000000..97b882b5f1f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html.ini
new file mode 100644
index 00000000000..a45c64db259
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html.ini
new file mode 100644
index 00000000000..921d40badc0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html.ini
new file mode 100644
index 00000000000..bea121921e7
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html.ini
new file mode 100644
index 00000000000..8b4f9913c21
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html.ini
new file mode 100644
index 00000000000..29ec5913022
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html.ini
new file mode 100644
index 00000000000..3f885487b53
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html.ini
new file mode 100644
index 00000000000..437d2f9f629
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.http.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html.ini
new file mode 100644
index 00000000000..7ae7249b54b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.https.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html.ini
new file mode 100644
index 00000000000..608c98d386b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import.http.html]
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html.ini
new file mode 100644
index 00000000000..527cfd1eaa1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import.https.html]
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html.ini
new file mode 100644
index 00000000000..0047e9e5edb
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html.ini
new file mode 100644
index 00000000000..56956467bb0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html.ini
new file mode 100644
index 00000000000..6eece95fb56
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html.ini
new file mode 100644
index 00000000000..69622b1f718
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html.ini
new file mode 100644
index 00000000000..94e74056e3b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html.ini
new file mode 100644
index 00000000000..86dcbe91c71
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html.ini
new file mode 100644
index 00000000000..d79d620f445
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html.ini
new file mode 100644
index 00000000000..90d3d6df098
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html.ini
new file mode 100644
index 00000000000..b3f759cfae0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html.ini
new file mode 100644
index 00000000000..97b882b5f1f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html.ini
new file mode 100644
index 00000000000..a45c64db259
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html.ini
new file mode 100644
index 00000000000..921d40badc0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html.ini
new file mode 100644
index 00000000000..6f6c214ac7b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html.ini
new file mode 100644
index 00000000000..3c993624663
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html.ini
new file mode 100644
index 00000000000..29ec5913022
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html.ini
new file mode 100644
index 00000000000..3f885487b53
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html.ini
new file mode 100644
index 00000000000..437d2f9f629
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.http.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html.ini
new file mode 100644
index 00000000000..7ae7249b54b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.https.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html.ini
new file mode 100644
index 00000000000..7a5623c4d4d
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import.http.html]
+  [Content Security Policy: Expects allowed for worker-import to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html.ini
new file mode 100644
index 00000000000..0def7660cac
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import.https.html]
+  [Content Security Policy: Expects allowed for worker-import to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html.ini
new file mode 100644
index 00000000000..0047e9e5edb
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html.ini
new file mode 100644
index 00000000000..b86a23f746c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html.ini
new file mode 100644
index 00000000000..6eece95fb56
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html.ini
new file mode 100644
index 00000000000..ecf7af4c0b0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html.ini
new file mode 100644
index 00000000000..94e74056e3b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html.ini
new file mode 100644
index 00000000000..1faa14a5922
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html.ini
new file mode 100644
index 00000000000..d79d620f445
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html.ini
new file mode 100644
index 00000000000..84130ba65d1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html.ini
new file mode 100644
index 00000000000..3b5bbab1be5
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-classic to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-classic to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html.ini
new file mode 100644
index 00000000000..72b96f1fe61
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-classic to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-classic to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html.ini
new file mode 100644
index 00000000000..a45c64db259
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html.ini
new file mode 100644
index 00000000000..921d40badc0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html.ini
new file mode 100644
index 00000000000..13c98c21e61
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html.ini
new file mode 100644
index 00000000000..25d301db524
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html.ini
new file mode 100644
index 00000000000..cd374fee28e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-module to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-module to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html.ini
new file mode 100644
index 00000000000..9ba93182139
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-module to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-module to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html.ini
new file mode 100644
index 00000000000..c1baa1ca94c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html.ini
@@ -0,0 +1,6 @@
+[worker-classic.http.html]
+  [Content Security Policy: Expects blocked for worker-classic to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-classic to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html.ini
new file mode 100644
index 00000000000..1e57b472300
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html.ini
@@ -0,0 +1,6 @@
+[worker-classic.https.html]
+  [Content Security Policy: Expects blocked for worker-classic to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-classic to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html.ini
new file mode 100644
index 00000000000..437d2f9f629
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.http.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html.ini
new file mode 100644
index 00000000000..7ae7249b54b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.https.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html.ini
new file mode 100644
index 00000000000..de8aee6d0d9
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import.http.html]
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html.ini
new file mode 100644
index 00000000000..083522812e5
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import.https.html]
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html.ini
new file mode 100644
index 00000000000..8c6ad15c0ec
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html.ini
@@ -0,0 +1,6 @@
+[worker-module.http.html]
+  [Content Security Policy: Expects blocked for worker-module to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-module to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html.ini
new file mode 100644
index 00000000000..30aa1c64f98
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html.ini
@@ -0,0 +1,6 @@
+[worker-module.https.html]
+  [Content Security Policy: Expects blocked for worker-module to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-module to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html.ini
new file mode 100644
index 00000000000..d07fb3b5f35
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html.ini
new file mode 100644
index 00000000000..b86a23f746c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html.ini
new file mode 100644
index 00000000000..852411fad1e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html.ini
new file mode 100644
index 00000000000..ecf7af4c0b0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html.ini
new file mode 100644
index 00000000000..e41ebb4f021
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html.ini
new file mode 100644
index 00000000000..1faa14a5922
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html.ini
new file mode 100644
index 00000000000..e808725da67
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html.ini
new file mode 100644
index 00000000000..84130ba65d1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html.ini
new file mode 100644
index 00000000000..b3f759cfae0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html.ini
new file mode 100644
index 00000000000..97b882b5f1f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html.ini
new file mode 100644
index 00000000000..a45c64db259
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html.ini
new file mode 100644
index 00000000000..921d40badc0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html.ini
new file mode 100644
index 00000000000..bea121921e7
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html.ini
new file mode 100644
index 00000000000..8b4f9913c21
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html.ini
new file mode 100644
index 00000000000..29ec5913022
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html.ini
new file mode 100644
index 00000000000..3f885487b53
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html.ini
new file mode 100644
index 00000000000..437d2f9f629
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.http.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html.ini
new file mode 100644
index 00000000000..7ae7249b54b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.https.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html.ini
new file mode 100644
index 00000000000..608c98d386b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import.http.html]
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html.ini
new file mode 100644
index 00000000000..527cfd1eaa1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import.https.html]
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html.ini
new file mode 100644
index 00000000000..d07fb3b5f35
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html.ini
new file mode 100644
index 00000000000..b86a23f746c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html.ini
new file mode 100644
index 00000000000..852411fad1e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html.ini
new file mode 100644
index 00000000000..ecf7af4c0b0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html.ini
new file mode 100644
index 00000000000..e41ebb4f021
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html.ini
new file mode 100644
index 00000000000..1faa14a5922
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html.ini
new file mode 100644
index 00000000000..e808725da67
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html.ini
new file mode 100644
index 00000000000..84130ba65d1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html.ini
new file mode 100644
index 00000000000..b3f759cfae0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html.ini
new file mode 100644
index 00000000000..97b882b5f1f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html.ini
new file mode 100644
index 00000000000..a45c64db259
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html.ini
new file mode 100644
index 00000000000..921d40badc0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html.ini
new file mode 100644
index 00000000000..6f6c214ac7b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html.ini
new file mode 100644
index 00000000000..3c993624663
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html.ini
new file mode 100644
index 00000000000..29ec5913022
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html.ini
new file mode 100644
index 00000000000..3f885487b53
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html.ini
new file mode 100644
index 00000000000..437d2f9f629
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.http.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html.ini
new file mode 100644
index 00000000000..7ae7249b54b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.https.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html.ini
new file mode 100644
index 00000000000..7a5623c4d4d
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import.http.html]
+  [Content Security Policy: Expects allowed for worker-import to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html.ini
new file mode 100644
index 00000000000..0def7660cac
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import.https.html]
+  [Content Security Policy: Expects allowed for worker-import to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html.ini
new file mode 100644
index 00000000000..d07fb3b5f35
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html.ini
new file mode 100644
index 00000000000..b86a23f746c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html.ini
new file mode 100644
index 00000000000..852411fad1e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html.ini
new file mode 100644
index 00000000000..ecf7af4c0b0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html.ini
new file mode 100644
index 00000000000..e41ebb4f021
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html.ini
new file mode 100644
index 00000000000..1faa14a5922
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html.ini
new file mode 100644
index 00000000000..e808725da67
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html.ini
new file mode 100644
index 00000000000..84130ba65d1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/script-tag.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/script-tag.http.html.ini
new file mode 100644
index 00000000000..5891a18681e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/script-tag.http.html.ini
@@ -0,0 +1,6 @@
+[script-tag.http.html]
+  [Content Security Policy: Expects blocked for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for script-tag to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/script-tag.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/script-tag.https.html.ini
new file mode 100644
index 00000000000..699a0dd6238
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/script-tag.https.html.ini
@@ -0,0 +1,6 @@
+[script-tag.https.html]
+  [Content Security Policy: Expects blocked for script-tag to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for script-tag to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.http.html.ini
new file mode 100644
index 00000000000..b3f759cfae0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.https.html.ini
new file mode 100644
index 00000000000..97b882b5f1f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.http.html.ini
new file mode 100644
index 00000000000..a45c64db259
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.https.html.ini
new file mode 100644
index 00000000000..921d40badc0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.http.html.ini
new file mode 100644
index 00000000000..bea121921e7
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.https.html.ini
new file mode 100644
index 00000000000..8b4f9913c21
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.http.html.ini
new file mode 100644
index 00000000000..29ec5913022
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.https.html.ini
new file mode 100644
index 00000000000..3f885487b53
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worker-import-data.http.html.ini
new file mode 100644
index 00000000000..437d2f9f629
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.http.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worker-import-data.https.html.ini
new file mode 100644
index 00000000000..7ae7249b54b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.https.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worker-import.http.html.ini
new file mode 100644
index 00000000000..608c98d386b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worker-import.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import.http.html]
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worker-import.https.html.ini
new file mode 100644
index 00000000000..527cfd1eaa1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worker-import.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import.https.html]
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-animation-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-animation-import-data.https.html.ini
new file mode 100644
index 00000000000..0047e9e5edb
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-animation-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-animation.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-animation.https.html.ini
new file mode 100644
index 00000000000..56956467bb0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-animation.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-audio-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-audio-import-data.https.html.ini
new file mode 100644
index 00000000000..6eece95fb56
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-audio-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-audio.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-audio.https.html.ini
new file mode 100644
index 00000000000..69622b1f718
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-audio.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-layout-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-layout-import-data.https.html.ini
new file mode 100644
index 00000000000..94e74056e3b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-layout-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-layout.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-layout.https.html.ini
new file mode 100644
index 00000000000..86dcbe91c71
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-layout.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-paint-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-paint-import-data.https.html.ini
new file mode 100644
index 00000000000..d79d620f445
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-paint-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-paint.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-paint.https.html.ini
new file mode 100644
index 00000000000..90d3d6df098
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-self/worklet-paint.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.http.html.ini
new file mode 100644
index 00000000000..b3f759cfae0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.https.html.ini
new file mode 100644
index 00000000000..97b882b5f1f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.http.html.ini
new file mode 100644
index 00000000000..a45c64db259
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.https.html.ini
new file mode 100644
index 00000000000..921d40badc0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.http.html.ini
new file mode 100644
index 00000000000..6f6c214ac7b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.https.html.ini
new file mode 100644
index 00000000000..3c993624663
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.http.html.ini
new file mode 100644
index 00000000000..29ec5913022
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.https.html.ini
new file mode 100644
index 00000000000..3f885487b53
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.http.html.ini
new file mode 100644
index 00000000000..437d2f9f629
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.http.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.https.html.ini
new file mode 100644
index 00000000000..7ae7249b54b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.https.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.http.html.ini
new file mode 100644
index 00000000000..7a5623c4d4d
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import.http.html]
+  [Content Security Policy: Expects allowed for worker-import to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.https.html.ini
new file mode 100644
index 00000000000..0def7660cac
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import.https.html]
+  [Content Security Policy: Expects allowed for worker-import to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation-import-data.https.html.ini
new file mode 100644
index 00000000000..0047e9e5edb
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation.https.html.ini
new file mode 100644
index 00000000000..b86a23f746c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio-import-data.https.html.ini
new file mode 100644
index 00000000000..6eece95fb56
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio.https.html.ini
new file mode 100644
index 00000000000..ecf7af4c0b0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout-import-data.https.html.ini
new file mode 100644
index 00000000000..94e74056e3b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout.https.html.ini
new file mode 100644
index 00000000000..1faa14a5922
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint-import-data.https.html.ini
new file mode 100644
index 00000000000..d79d620f445
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint-import-data.https.html]
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint.https.html.ini
new file mode 100644
index 00000000000..84130ba65d1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.http.html.ini
new file mode 100644
index 00000000000..3b5bbab1be5
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-classic to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-classic to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.https.html.ini
new file mode 100644
index 00000000000..72b96f1fe61
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-classic to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-classic to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.http.html.ini
new file mode 100644
index 00000000000..a45c64db259
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.https.html.ini
new file mode 100644
index 00000000000..921d40badc0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.http.html.ini
new file mode 100644
index 00000000000..13c98c21e61
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.https.html.ini
new file mode 100644
index 00000000000..25d301db524
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.http.html.ini
new file mode 100644
index 00000000000..cd374fee28e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-module to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-module to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.https.html.ini
new file mode 100644
index 00000000000..9ba93182139
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-module to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-module to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-classic.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-classic.http.html.ini
new file mode 100644
index 00000000000..c1baa1ca94c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-classic.http.html.ini
@@ -0,0 +1,6 @@
+[worker-classic.http.html]
+  [Content Security Policy: Expects blocked for worker-classic to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-classic to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-classic.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-classic.https.html.ini
new file mode 100644
index 00000000000..1e57b472300
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-classic.https.html.ini
@@ -0,0 +1,6 @@
+[worker-classic.https.html]
+  [Content Security Policy: Expects blocked for worker-classic to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-classic to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.http.html.ini
new file mode 100644
index 00000000000..437d2f9f629
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.http.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.https.html.ini
new file mode 100644
index 00000000000..7ae7249b54b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.https.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-import.http.html.ini
new file mode 100644
index 00000000000..de8aee6d0d9
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-import.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import.http.html]
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-import.https.html.ini
new file mode 100644
index 00000000000..083522812e5
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-import.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import.https.html]
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-module.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-module.http.html.ini
new file mode 100644
index 00000000000..8c6ad15c0ec
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-module.http.html.ini
@@ -0,0 +1,6 @@
+[worker-module.http.html]
+  [Content Security Policy: Expects blocked for worker-module to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-module to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-module.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-module.https.html.ini
new file mode 100644
index 00000000000..30aa1c64f98
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worker-module.https.html.ini
@@ -0,0 +1,6 @@
+[worker-module.https.html]
+  [Content Security Policy: Expects blocked for worker-module to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-module to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-animation-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-animation-import-data.https.html.ini
new file mode 100644
index 00000000000..d07fb3b5f35
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-animation-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-animation.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-animation.https.html.ini
new file mode 100644
index 00000000000..b86a23f746c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-animation.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-audio-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-audio-import-data.https.html.ini
new file mode 100644
index 00000000000..852411fad1e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-audio-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-audio.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-audio.https.html.ini
new file mode 100644
index 00000000000..ecf7af4c0b0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-audio.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-layout-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-layout-import-data.https.html.ini
new file mode 100644
index 00000000000..e41ebb4f021
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-layout-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-layout.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-layout.https.html.ini
new file mode 100644
index 00000000000..1faa14a5922
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-layout.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-paint-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-paint-import-data.https.html.ini
new file mode 100644
index 00000000000..e808725da67
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-paint-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-paint.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-paint.https.html.ini
new file mode 100644
index 00000000000..84130ba65d1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-none/worklet-paint.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.http.html.ini
new file mode 100644
index 00000000000..b3f759cfae0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.https.html.ini
new file mode 100644
index 00000000000..97b882b5f1f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.http.html.ini
new file mode 100644
index 00000000000..a45c64db259
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.https.html.ini
new file mode 100644
index 00000000000..921d40badc0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.http.html.ini
new file mode 100644
index 00000000000..bea121921e7
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.https.html.ini
new file mode 100644
index 00000000000..8b4f9913c21
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.http.html.ini
new file mode 100644
index 00000000000..29ec5913022
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.https.html.ini
new file mode 100644
index 00000000000..3f885487b53
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.http.html.ini
new file mode 100644
index 00000000000..437d2f9f629
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.http.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.https.html.ini
new file mode 100644
index 00000000000..7ae7249b54b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.https.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worker-import.http.html.ini
new file mode 100644
index 00000000000..608c98d386b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worker-import.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import.http.html]
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worker-import.https.html.ini
new file mode 100644
index 00000000000..527cfd1eaa1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worker-import.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import.https.html]
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-animation-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-animation-import-data.https.html.ini
new file mode 100644
index 00000000000..d07fb3b5f35
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-animation-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-animation.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-animation.https.html.ini
new file mode 100644
index 00000000000..b86a23f746c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-animation.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-audio-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-audio-import-data.https.html.ini
new file mode 100644
index 00000000000..852411fad1e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-audio-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-audio.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-audio.https.html.ini
new file mode 100644
index 00000000000..ecf7af4c0b0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-audio.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-layout-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-layout-import-data.https.html.ini
new file mode 100644
index 00000000000..e41ebb4f021
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-layout-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-layout.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-layout.https.html.ini
new file mode 100644
index 00000000000..1faa14a5922
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-layout.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-paint-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-paint-import-data.https.html.ini
new file mode 100644
index 00000000000..e808725da67
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-paint-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-paint.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-paint.https.html.ini
new file mode 100644
index 00000000000..84130ba65d1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-self/worklet-paint.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.http.html.ini
new file mode 100644
index 00000000000..b3f759cfae0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.https.html.ini
new file mode 100644
index 00000000000..97b882b5f1f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-classic.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.http.html.ini
new file mode 100644
index 00000000000..a45c64db259
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.http.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.https.html.ini
new file mode 100644
index 00000000000..921d40badc0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import-data.https.html]
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.http.html.ini
new file mode 100644
index 00000000000..6f6c214ac7b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.http.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.https.html.ini
new file mode 100644
index 00000000000..3c993624663
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.https.html.ini
@@ -0,0 +1,18 @@
+[sharedworker-import.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-import to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.http.html.ini
new file mode 100644
index 00000000000..29ec5913022
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.http.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.http.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.https.html.ini
new file mode 100644
index 00000000000..3f885487b53
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.https.html.ini
@@ -0,0 +1,6 @@
+[sharedworker-module.https.html]
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.http.html.ini
new file mode 100644
index 00000000000..437d2f9f629
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.http.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.https.html.ini
new file mode 100644
index 00000000000..7ae7249b54b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import-data.https.html]
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context.: securitypolicyviolation]
+    expected: FAIL
+
+  [Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context.: securitypolicyviolation]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.http.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.http.html.ini
new file mode 100644
index 00000000000..7a5623c4d4d
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.http.html.ini
@@ -0,0 +1,18 @@
+[worker-import.http.html]
+  [Content Security Policy: Expects allowed for worker-import to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.https.html.ini
new file mode 100644
index 00000000000..0def7660cac
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.https.html.ini
@@ -0,0 +1,18 @@
+[worker-import.https.html]
+  [Content Security Policy: Expects allowed for worker-import to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worker-import to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation-import-data.https.html.ini
new file mode 100644
index 00000000000..d07fb3b5f35
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation.https.html.ini
new file mode 100644
index 00000000000..b86a23f746c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-animation.https.html]
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio-import-data.https.html.ini
new file mode 100644
index 00000000000..852411fad1e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio.https.html.ini
new file mode 100644
index 00000000000..ecf7af4c0b0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-audio.https.html]
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout-import-data.https.html.ini
new file mode 100644
index 00000000000..e41ebb4f021
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout.https.html.ini
new file mode 100644
index 00000000000..1faa14a5922
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-layout.https.html]
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint-import-data.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint-import-data.https.html.ini
new file mode 100644
index 00000000000..e808725da67
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint-import-data.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint-import-data.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint.https.html.ini b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint.https.html.ini
new file mode 100644
index 00000000000..84130ba65d1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint.https.html.ini
@@ -0,0 +1,18 @@
+[worklet-paint.https.html]
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/generic/filesystem-urls-do-not-match-self.sub.html.ini b/tests/wpt/meta/content-security-policy/generic/filesystem-urls-do-not-match-self.sub.html.ini
new file mode 100644
index 00000000000..774fece4edc
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/generic/filesystem-urls-do-not-match-self.sub.html.ini
@@ -0,0 +1,7 @@
+[filesystem-urls-do-not-match-self.sub.html]
+  expected: TIMEOUT
+  [Expecting logs: ["violated-directive=script-src-elem"\]]
+    expected: NOTRUN
+
+  [filesystem-urls-do-not-match-self]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/generic/filesystem-urls-match-filesystem.sub.html.ini b/tests/wpt/meta/content-security-policy/generic/filesystem-urls-match-filesystem.sub.html.ini
new file mode 100644
index 00000000000..1dddfa6bc6a
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/generic/filesystem-urls-match-filesystem.sub.html.ini
@@ -0,0 +1,3 @@
+[filesystem-urls-match-filesystem.sub.html]
+  [Expecting logs: ["PASS (1/1)"\]]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/generic/invalid-characters-in-policy.html.ini b/tests/wpt/meta/content-security-policy/generic/invalid-characters-in-policy.html.ini
new file mode 100644
index 00000000000..395e5cf9f3f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/generic/invalid-characters-in-policy.html.ini
@@ -0,0 +1,12 @@
+[invalid-characters-in-policy.html]
+  [Non-ASCII character in directive value should not affect other directives. - HTTP header]
+    expected: FAIL
+
+  [Non-ASCII character in directive name should not affect other directives. - HTTP header]
+    expected: FAIL
+
+  [Non-ASCII character in directive value should drop the whole directive. - meta tag]
+    expected: FAIL
+
+  [Non-ASCII quote character in directive value should drop the whole directive. - meta tag]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/generic/only-valid-whitespaces-are-allowed.html.ini b/tests/wpt/meta/content-security-policy/generic/only-valid-whitespaces-are-allowed.html.ini
new file mode 100644
index 00000000000..e3648061bc3
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/generic/only-valid-whitespaces-are-allowed.html.ini
@@ -0,0 +1,10 @@
+[only-valid-whitespaces-are-allowed.html]
+  expected: TIMEOUT
+  [U+000C FF    should be properly parsed between directive name and value - HTTP header]
+    expected: TIMEOUT
+
+  [U+000C FF    should be properly parsed inside directive value - HTTP header]
+    expected: TIMEOUT
+
+  [U+00A0 NBSP  should not be parsed inside directive value - meta tag]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/generic/policy-inherited-correctly-by-plznavigate.html.ini b/tests/wpt/meta/content-security-policy/generic/policy-inherited-correctly-by-plznavigate.html.ini
new file mode 100644
index 00000000000..97fc185b7ba
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/generic/policy-inherited-correctly-by-plznavigate.html.ini
@@ -0,0 +1,7 @@
+[policy-inherited-correctly-by-plznavigate.html]
+  expected: ERROR
+  [iframe still inherits correct CSP]
+    expected: NOTRUN
+
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/generic/src-trailing-dot.sub.any.js.ini b/tests/wpt/meta/content-security-policy/generic/src-trailing-dot.sub.any.js.ini
new file mode 100644
index 00000000000..d96ded74d88
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/generic/src-trailing-dot.sub.any.js.ini
@@ -0,0 +1,14 @@
+[src-trailing-dot.sub.any.serviceworker.html]
+  expected: ERROR
+
+[src-trailing-dot.sub.any.sharedworker.html]
+  expected: ERROR
+
+[src-trailing-dot.sub.any.html]
+  [Fetch from host with trailing dot should be allowed by CSP.]
+    expected: FAIL
+
+
+[src-trailing-dot.sub.any.worker.html]
+  [Fetch from host with trailing dot should be allowed by CSP.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/generic/wildcard-host-part.sub.window.js.ini b/tests/wpt/meta/content-security-policy/generic/wildcard-host-part.sub.window.js.ini
new file mode 100644
index 00000000000..7770d4e4454
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/generic/wildcard-host-part.sub.window.js.ini
@@ -0,0 +1,2 @@
+[wildcard-host-part.sub.window.html]
+  expected: CRASH
diff --git a/tests/wpt/meta/content-security-policy/img-src/css-filter-blocked.tentative.html.ini b/tests/wpt/meta/content-security-policy/img-src/css-filter-blocked.tentative.html.ini
new file mode 100644
index 00000000000..204e15a4b4a
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/img-src/css-filter-blocked.tentative.html.ini
@@ -0,0 +1,4 @@
+[css-filter-blocked.tentative.html]
+  expected: TIMEOUT
+  [Blocked CSS filter: SVG]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/img-src/icon-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/img-src/icon-blocked.sub.html.ini
new file mode 100644
index 00000000000..1ed665f5245
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/img-src/icon-blocked.sub.html.ini
@@ -0,0 +1,4 @@
+[icon-blocked.sub.html]
+  expected: TIMEOUT
+  [Test that spv event is fired]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/img-src/svg-use-blocked.tentative.html.ini b/tests/wpt/meta/content-security-policy/img-src/svg-use-blocked.tentative.html.ini
new file mode 100644
index 00000000000..3ba99de903a
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/img-src/svg-use-blocked.tentative.html.ini
@@ -0,0 +1,4 @@
+[svg-use-blocked.tentative.html]
+  expected: TIMEOUT
+  [Blocked SVG <use> element]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/inheritance/blob-url-in-child-frame-self-navigate-inherits.sub.html.ini b/tests/wpt/meta/content-security-policy/inheritance/blob-url-in-child-frame-self-navigate-inherits.sub.html.ini
new file mode 100644
index 00000000000..25062b63645
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/blob-url-in-child-frame-self-navigate-inherits.sub.html.ini
@@ -0,0 +1,3 @@
+[blob-url-in-child-frame-self-navigate-inherits.sub.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inheritance/blob-url-in-main-window-self-navigate-inherits.sub.html.ini b/tests/wpt/meta/content-security-policy/inheritance/blob-url-in-main-window-self-navigate-inherits.sub.html.ini
new file mode 100644
index 00000000000..948eea2bac2
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/blob-url-in-main-window-self-navigate-inherits.sub.html.ini
@@ -0,0 +1,3 @@
+[blob-url-in-main-window-self-navigate-inherits.sub.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inheritance/blob-url-inherits-from-initiator.sub.html.ini b/tests/wpt/meta/content-security-policy/inheritance/blob-url-inherits-from-initiator.sub.html.ini
new file mode 100644
index 00000000000..9385f4e6025
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/blob-url-inherits-from-initiator.sub.html.ini
@@ -0,0 +1,7 @@
+[blob-url-inherits-from-initiator.sub.html]
+  expected: TIMEOUT
+  [Initiator is same-origin with target frame.]
+    expected: TIMEOUT
+
+  [Initiator is cross-origin with target frame.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/inheritance/frame-src-javascript-url.html.ini b/tests/wpt/meta/content-security-policy/inheritance/frame-src-javascript-url.html.ini
new file mode 100644
index 00000000000..630c7204927
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/frame-src-javascript-url.html.ini
@@ -0,0 +1,4 @@
+[frame-src-javascript-url.html]
+  expected: TIMEOUT
+  [<iframe src='javascript:...'>'s inherits policy (dynamically inserted <iframe> is blocked)]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/inheritance/history-iframe.sub.html.ini b/tests/wpt/meta/content-security-policy/inheritance/history-iframe.sub.html.ini
new file mode 100644
index 00000000000..73a32477504
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/history-iframe.sub.html.ini
@@ -0,0 +1,18 @@
+[history-iframe.sub.html]
+  [History navigation in iframe: "about:blank" document is navigated back from history same-origin.]
+    expected: FAIL
+
+  [History navigation in iframe: "about:blank" document is navigated back from history cross-origin.]
+    expected: FAIL
+
+  [History navigation in iframe: blob URL document is navigated back from history same-origin.]
+    expected: FAIL
+
+  [History navigation in iframe: blob URL document is navigated back from history cross-origin.]
+    expected: FAIL
+
+  [History navigation in iframe: data URL document is navigated back from history same-origin.]
+    expected: FAIL
+
+  [History navigation in iframe: data URL document is navigated back from history cross-origin.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inheritance/history.sub.html.ini b/tests/wpt/meta/content-security-policy/inheritance/history.sub.html.ini
new file mode 100644
index 00000000000..c6c78131de0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/history.sub.html.ini
@@ -0,0 +1,18 @@
+[history.sub.html]
+  [History navigation: "about:blank" document is navigated back from history same-origin.]
+    expected: FAIL
+
+  [History navigation: "about:blank" document is navigated back from history cross-origin.]
+    expected: FAIL
+
+  [History navigation: blob URL document is navigated back from history same-origin.]
+    expected: FAIL
+
+  [History navigation: blob URL document is navigated back from history cross-origin.]
+    expected: FAIL
+
+  [History navigation: blob URL document is navigated back from history (without bfcache on Firefox) same-origin.]
+    expected: FAIL
+
+  [History navigation: blob URL document is navigated back from history (without bfcache on Firefox) cross-origin.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inheritance/iframe-all-local-schemes.sub.html.ini b/tests/wpt/meta/content-security-policy/inheritance/iframe-all-local-schemes.sub.html.ini
new file mode 100644
index 00000000000..fcd96aa7a47
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/iframe-all-local-schemes.sub.html.ini
@@ -0,0 +1,18 @@
+[iframe-all-local-schemes.sub.html]
+  [<iframe src='data:...'>'s inherits policy.]
+    expected: FAIL
+
+  [<iframe sandbox src='blob:...'>'s inherits policy. (opaque origin sandbox)]
+    expected: FAIL
+
+  [window about:blank inherits policy.]
+    expected: FAIL
+
+  [<iframe src='blob:...'>'s inherits policy.]
+    expected: FAIL
+
+  [window url='blob:...' inherits policy.]
+    expected: FAIL
+
+  [window url='javascript:...'>'s inherits policy (static <img> is blocked)]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inheritance/iframe-srcdoc-history-inheritance.html.ini b/tests/wpt/meta/content-security-policy/inheritance/iframe-srcdoc-history-inheritance.html.ini
new file mode 100644
index 00000000000..ae178939b32
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/iframe-srcdoc-history-inheritance.html.ini
@@ -0,0 +1,4 @@
+[iframe-srcdoc-history-inheritance.html]
+  expected: TIMEOUT
+  [iframe-srcdoc-history-inheritance]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/inheritance/inheritance-from-initiator.sub.html.ini b/tests/wpt/meta/content-security-policy/inheritance/inheritance-from-initiator.sub.html.ini
new file mode 100644
index 00000000000..397f1e43e6f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/inheritance-from-initiator.sub.html.ini
@@ -0,0 +1,21 @@
+[inheritance-from-initiator.sub.html]
+  [Setting src inherits from parent.]
+    expected: FAIL
+
+  [Changing contentWindow.location inherits from who changed it.]
+    expected: FAIL
+
+  [Changing contentWindow.location indirectly inherits from who changed it directly.]
+    expected: FAIL
+
+  [window.open() inherits from caller.]
+    expected: FAIL
+
+  [Click on anchor inherits from owner of the anchor.]
+    expected: FAIL
+
+  [Form submission through submit() inherits from owner of form.]
+    expected: FAIL
+
+  [Form submission through button click inherits from owner of form.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inheritance/javascript-url-open-in-main-window.html.ini b/tests/wpt/meta/content-security-policy/inheritance/javascript-url-open-in-main-window.html.ini
new file mode 100644
index 00000000000..bf5137f7bb9
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/javascript-url-open-in-main-window.html.ini
@@ -0,0 +1,3 @@
+[javascript-url-open-in-main-window.html]
+  [Executing Javascript URL keeps enforcing previous CSPs of the document.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inheritance/javascript-url-srcdoc-cross-origin-iframe-inheritance.html.ini b/tests/wpt/meta/content-security-policy/inheritance/javascript-url-srcdoc-cross-origin-iframe-inheritance.html.ini
new file mode 100644
index 00000000000..ab2897917b1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/javascript-url-srcdoc-cross-origin-iframe-inheritance.html.ini
@@ -0,0 +1,4 @@
+[javascript-url-srcdoc-cross-origin-iframe-inheritance.html]
+  expected: TIMEOUT
+  [Nested cross-origin iframe should be blocked by frame-src 'self'.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/inheritance/location-reload.html.ini b/tests/wpt/meta/content-security-policy/inheritance/location-reload.html.ini
new file mode 100644
index 00000000000..4efb1bf017b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/location-reload.html.ini
@@ -0,0 +1,7 @@
+[location-reload.html]
+  expected: TIMEOUT
+  [location.reload() of srcdoc iframe.]
+    expected: TIMEOUT
+
+  [location.reload() of blob URL iframe.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inheritance/sandboxed-blob-scheme.html.ini b/tests/wpt/meta/content-security-policy/inheritance/sandboxed-blob-scheme.html.ini
new file mode 100644
index 00000000000..2d9ee4f9447
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/sandboxed-blob-scheme.html.ini
@@ -0,0 +1,3 @@
+[sandboxed-blob-scheme.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inheritance/sandboxed-data-scheme.html.ini b/tests/wpt/meta/content-security-policy/inheritance/sandboxed-data-scheme.html.ini
new file mode 100644
index 00000000000..b33c47c75c7
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/sandboxed-data-scheme.html.ini
@@ -0,0 +1,3 @@
+[sandboxed-data-scheme.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inheritance/unsandboxed-blob-scheme.html.ini b/tests/wpt/meta/content-security-policy/inheritance/unsandboxed-blob-scheme.html.ini
new file mode 100644
index 00000000000..0fe22eefc30
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/unsandboxed-blob-scheme.html.ini
@@ -0,0 +1,3 @@
+[unsandboxed-blob-scheme.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inheritance/unsandboxed-data-scheme.html.ini b/tests/wpt/meta/content-security-policy/inheritance/unsandboxed-data-scheme.html.ini
new file mode 100644
index 00000000000..cfaaf57ab3a
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/unsandboxed-data-scheme.html.ini
@@ -0,0 +1,3 @@
+[unsandboxed-data-scheme.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inheritance/window-open-local-after-network-scheme.sub.html.ini b/tests/wpt/meta/content-security-policy/inheritance/window-open-local-after-network-scheme.sub.html.ini
new file mode 100644
index 00000000000..05caa33cfaf
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/window-open-local-after-network-scheme.sub.html.ini
@@ -0,0 +1,6 @@
+[window-open-local-after-network-scheme.sub.html]
+  [Popup being navigated to about:blank was same-origin.]
+    expected: FAIL
+
+  [Popup being navigated to about:blank was cross-origin.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inheritance/window.html.ini b/tests/wpt/meta/content-security-policy/inheritance/window.html.ini
new file mode 100644
index 00000000000..e8f1ad8e3df
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inheritance/window.html.ini
@@ -0,0 +1,12 @@
+[window.html]
+  [window.open() inherits policy.]
+    expected: FAIL
+
+  [`document.write` into `window.open()` inherits policy.]
+    expected: FAIL
+
+  [window.open('blob:...') inherits policy.]
+    expected: FAIL
+
+  [window.open('javascript:...') inherits policy.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inside-worker/dedicatedworker-connect-src.html.ini b/tests/wpt/meta/content-security-policy/inside-worker/dedicatedworker-connect-src.html.ini
new file mode 100644
index 00000000000..ad01d630c28
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inside-worker/dedicatedworker-connect-src.html.ini
@@ -0,0 +1,21 @@
+[dedicatedworker-connect-src.html]
+  [Same-origin => cross-origin 'fetch()' in http: with connect-src 'self']
+    expected: FAIL
+
+  [Reports match in http: with connect-src 'self']
+    expected: FAIL
+
+  [Cross-origin 'fetch()' in blob: with connect-src 'self']
+    expected: FAIL
+
+  [Cross-origin XHR in blob: with connect-src 'self']
+    expected: FAIL
+
+  [Same-origin => cross-origin 'fetch()' in blob: with connect-src 'self']
+    expected: FAIL
+
+  [WebSocket in blob: with connect-src 'self']
+    expected: FAIL
+
+  [Reports match in blob: with connect-src 'self']
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inside-worker/dedicatedworker-report-only.html.ini b/tests/wpt/meta/content-security-policy/inside-worker/dedicatedworker-report-only.html.ini
new file mode 100644
index 00000000000..cb18d19fb52
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inside-worker/dedicatedworker-report-only.html.ini
@@ -0,0 +1,16 @@
+[dedicatedworker-report-only.html]
+  expected: TIMEOUT
+  [Cross-origin 'fetch()'.]
+    expected: TIMEOUT
+
+  [Cross-origin XHR.]
+    expected: NOTRUN
+
+  [Same-origin => cross-origin 'fetch()'.]
+    expected: NOTRUN
+
+  [WebSocket.]
+    expected: NOTRUN
+
+  [connect-src-self-report-only]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/inside-worker/dedicatedworker-script-src.html.ini b/tests/wpt/meta/content-security-policy/inside-worker/dedicatedworker-script-src.html.ini
new file mode 100644
index 00000000000..3bc4ce7feda
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inside-worker/dedicatedworker-script-src.html.ini
@@ -0,0 +1,28 @@
+[dedicatedworker-script-src.html]
+  expected: TIMEOUT
+  [Cross-origin `importScripts()` blocked in http: with script-src 'self']
+    expected: TIMEOUT
+
+  [`eval()` blocked in http: with script-src 'self']
+    expected: NOTRUN
+
+  [`setTimeout([string\])` blocked in http: with script-src 'self']
+    expected: NOTRUN
+
+  [Reports are sent for http: with script-src 'self']
+    expected: NOTRUN
+
+  [Cross-origin `importScripts()` blocked in blob: with script-src 'self']
+    expected: FAIL
+
+  [`eval()` blocked in blob: with script-src 'self']
+    expected: FAIL
+
+  [`setTimeout([string\])` blocked in blob: with script-src 'self']
+    expected: FAIL
+
+  [Reports are sent for blob: with script-src 'self']
+    expected: FAIL
+
+  [dedicatedworker-script-src]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/inside-worker/serviceworker-connect-src.https.sub.html.ini b/tests/wpt/meta/content-security-policy/inside-worker/serviceworker-connect-src.https.sub.html.ini
new file mode 100644
index 00000000000..b86f6845ee9
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inside-worker/serviceworker-connect-src.https.sub.html.ini
@@ -0,0 +1,10 @@
+[serviceworker-connect-src.https.sub.html]
+  expected: TIMEOUT
+  [serviceworker-connect-src]
+    expected: TIMEOUT
+
+  [serviceworker-connect-src 1]
+    expected: NOTRUN
+
+  [serviceworker-connect-src 2]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/inside-worker/serviceworker-report-only.https.sub.html.ini b/tests/wpt/meta/content-security-policy/inside-worker/serviceworker-report-only.https.sub.html.ini
new file mode 100644
index 00000000000..2c67d93c625
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inside-worker/serviceworker-report-only.https.sub.html.ini
@@ -0,0 +1,4 @@
+[serviceworker-report-only.https.sub.html]
+  expected: TIMEOUT
+  [serviceworker-report-only]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/inside-worker/serviceworker-script-src.https.sub.html.ini b/tests/wpt/meta/content-security-policy/inside-worker/serviceworker-script-src.https.sub.html.ini
new file mode 100644
index 00000000000..373fd612d30
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inside-worker/serviceworker-script-src.https.sub.html.ini
@@ -0,0 +1,10 @@
+[serviceworker-script-src.https.sub.html]
+  expected: TIMEOUT
+  [serviceworker-script-src]
+    expected: TIMEOUT
+
+  [serviceworker-script-src 1]
+    expected: NOTRUN
+
+  [serviceworker-script-src 2]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/inside-worker/sharedworker-connect-src.sub.html.ini b/tests/wpt/meta/content-security-policy/inside-worker/sharedworker-connect-src.sub.html.ini
new file mode 100644
index 00000000000..3c2c692d657
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inside-worker/sharedworker-connect-src.sub.html.ini
@@ -0,0 +1,3 @@
+[sharedworker-connect-src.sub.html]
+  [sharedworker-connect-src]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/inside-worker/sharedworker-report-only.sub.html.ini b/tests/wpt/meta/content-security-policy/inside-worker/sharedworker-report-only.sub.html.ini
new file mode 100644
index 00000000000..8916dff227a
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inside-worker/sharedworker-report-only.sub.html.ini
@@ -0,0 +1,2 @@
+[sharedworker-report-only.sub.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/content-security-policy/inside-worker/sharedworker-script-src.sub.html.ini b/tests/wpt/meta/content-security-policy/inside-worker/sharedworker-script-src.sub.html.ini
new file mode 100644
index 00000000000..07c8971a6d5
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/inside-worker/sharedworker-script-src.sub.html.ini
@@ -0,0 +1,3 @@
+[sharedworker-script-src.sub.html]
+  [sharedworker-script-src]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/media-src/media-src-7_1_2.sub.html.ini b/tests/wpt/meta/content-security-policy/media-src/media-src-7_1_2.sub.html.ini
new file mode 100644
index 00000000000..cb39752b7cf
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/media-src/media-src-7_1_2.sub.html.ini
@@ -0,0 +1,4 @@
+[media-src-7_1_2.sub.html]
+  expected: TIMEOUT
+  [Test that securitypolicyviolation events are fired]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/media-src/media-src-7_2_2.sub.html.ini b/tests/wpt/meta/content-security-policy/media-src/media-src-7_2_2.sub.html.ini
new file mode 100644
index 00000000000..790f54981cc
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/media-src/media-src-7_2_2.sub.html.ini
@@ -0,0 +1,4 @@
+[media-src-7_2_2.sub.html]
+  expected: TIMEOUT
+  [Disallowed audio source element]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/media-src/media-src-7_3_2.sub.html.ini b/tests/wpt/meta/content-security-policy/media-src/media-src-7_3_2.sub.html.ini
new file mode 100644
index 00000000000..25ba27cd1b7
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/media-src/media-src-7_3_2.sub.html.ini
@@ -0,0 +1,7 @@
+[media-src-7_3_2.sub.html]
+  expected: TIMEOUT
+  [Disallowed track element onerror handler fires.]
+    expected: FAIL
+
+  [Test that securitypolicyviolation events are fired]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/media-src/media-src-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/media-src/media-src-blocked.sub.html.ini
new file mode 100644
index 00000000000..8ea44b08e0b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/media-src/media-src-blocked.sub.html.ini
@@ -0,0 +1,10 @@
+[media-src-blocked.sub.html]
+  expected: TIMEOUT
+  [Disallowed async video source element]
+    expected: TIMEOUT
+
+  [Disallowed audio src]
+    expected: NOTRUN
+
+  [Disallowed audio source element]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/meta/combine-header-and-meta-policies.sub.html.ini b/tests/wpt/meta/content-security-policy/meta/combine-header-and-meta-policies.sub.html.ini
new file mode 100644
index 00000000000..e91dd2236b8
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/meta/combine-header-and-meta-policies.sub.html.ini
@@ -0,0 +1,3 @@
+[combine-header-and-meta-policies.sub.html]
+  [Expecting logs: ["TEST COMPLETE", "violated-directive=img-src", "violated-directive=style-src-elem"\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/meta/sandbox-iframe.html.ini b/tests/wpt/meta/content-security-policy/meta/sandbox-iframe.html.ini
new file mode 100644
index 00000000000..60605889895
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/meta/sandbox-iframe.html.ini
@@ -0,0 +1,4 @@
+[sandbox-iframe.html]
+  expected: TIMEOUT
+  [img-src 'self' works when specified in a meta tag.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/navigation/javascript-url-navigation-evaluated-to-string-inherits-csp.html.ini b/tests/wpt/meta/content-security-policy/navigation/javascript-url-navigation-evaluated-to-string-inherits-csp.html.ini
new file mode 100644
index 00000000000..ab1ff9392a4
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/navigation/javascript-url-navigation-evaluated-to-string-inherits-csp.html.ini
@@ -0,0 +1,3 @@
+[javascript-url-navigation-evaluated-to-string-inherits-csp.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/navigation/to-javascript-parent-initiated-check-csp-order.html.ini b/tests/wpt/meta/content-security-policy/navigation/to-javascript-parent-initiated-check-csp-order.html.ini
new file mode 100644
index 00000000000..adba5ecd2f0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/navigation/to-javascript-parent-initiated-check-csp-order.html.ini
@@ -0,0 +1,22 @@
+[to-javascript-parent-initiated-check-csp-order.html]
+  expected: TIMEOUT
+  [Executing the javascript URL should violate the parent's CSP for\n          iframe.contentWindow.location.href]
+    expected: TIMEOUT
+
+  [Executing the javascript URL should violate the parent's CSP for\n          iframe.src]
+    expected: NOTRUN
+
+  [Executing the javascript URL should violate the parent's CSP for\n          a[target=iframeWithScriptSrcNone\].href]
+    expected: NOTRUN
+
+  [Executing the javascript URL should violate the parent's CSP for\n          a[target=otherTabWithScriptSrcNone\].href]
+    expected: NOTRUN
+
+  [Executing the javascript URL should violate the parent's CSP for\n          area[target=iframeWithScriptScrcNone\].href]
+    expected: NOTRUN
+
+  [Executing the javascript URL should violate the parent's CSP for\n          area[target=otherTabWithScriptSrcNone\].href]
+    expected: NOTRUN
+
+  [Executing the javascript URL should violate the parent's CSP for\n          otherTabWithScriptSrcNone.location.href]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html.ini b/tests/wpt/meta/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html.ini
new file mode 100644
index 00000000000..3eb78514061
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html.ini
@@ -0,0 +1,16 @@
+[to-javascript-parent-initiated-child-csp.html]
+  expected: TIMEOUT
+  [Should not have executed the javascript URL for\n        iframe.src with child's CSP "script-src 'none'"]
+    expected: TIMEOUT
+
+  [Should not have executed the javascript URL for\n        otherTabWithScriptSrcNone.location.href with child's CSP "script-src 'none'"]
+    expected: NOTRUN
+
+  [Should not have executed the javascript URL for\n        a[target=iframeWithScriptSrcNone\].href with child's CSP "script-src 'none'"]
+    expected: NOTRUN
+
+  [Should not have executed the javascript URL for\n        area[target=iframeWithScriptSrcNone\].href with child's CSP "script-src 'none'"]
+    expected: NOTRUN
+
+  [Should not have executed the javascript URL for\n        area[target=otherTabWithScriptSrcNone\].href with child's CSP "script-src 'none'"]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/navigation/to-javascript-parent-initiated-parent-csp.html.ini b/tests/wpt/meta/content-security-policy/navigation/to-javascript-parent-initiated-parent-csp.html.ini
new file mode 100644
index 00000000000..45056666dd3
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/navigation/to-javascript-parent-initiated-parent-csp.html.ini
@@ -0,0 +1,22 @@
+[to-javascript-parent-initiated-parent-csp.html]
+  expected: TIMEOUT
+  [Should not have executed the javascript url for\n      iframe.contentWindow.location.href]
+    expected: TIMEOUT
+
+  [Should not have executed the javascript url for\n      otherTab.location.href]
+    expected: NOTRUN
+
+  [Should not have executed the javascript url for\n      area[target=iframe\].href]
+    expected: NOTRUN
+
+  [Should not have executed the javascript url for\n      area[target=otherTab\].href]
+    expected: NOTRUN
+
+  [Should not have executed the javascript url for\n      a[target=otherTab\].href]
+    expected: NOTRUN
+
+  [Should not have executed the javascript url for\n      a[target=iframe\].href]
+    expected: NOTRUN
+
+  [Should not have executed the javascript url for\n      iframe.src]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/nonce-hiding/dangling-html-or-body.html.ini b/tests/wpt/meta/content-security-policy/nonce-hiding/dangling-html-or-body.html.ini
new file mode 100644
index 00000000000..47023b4596f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/nonce-hiding/dangling-html-or-body.html.ini
@@ -0,0 +1,6 @@
+[dangling-html-or-body.html]
+  [Nonces don't leak via CSS side-channels when a dangling body is injected.]
+    expected: FAIL
+
+  [Nonces don't leak via CSS side-channels when a dangling html is injected.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/nonce-hiding/script-nonces-hidden-meta.sub.html.ini b/tests/wpt/meta/content-security-policy/nonce-hiding/script-nonces-hidden-meta.sub.html.ini
new file mode 100644
index 00000000000..94d7bf64166
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/nonce-hiding/script-nonces-hidden-meta.sub.html.ini
@@ -0,0 +1,3 @@
+[script-nonces-hidden-meta.sub.html]
+  [createElement.nonce.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/nonce-hiding/script-nonces-hidden.html.ini b/tests/wpt/meta/content-security-policy/nonce-hiding/script-nonces-hidden.html.ini
new file mode 100644
index 00000000000..e8896cde9c4
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/nonce-hiding/script-nonces-hidden.html.ini
@@ -0,0 +1,3 @@
+[script-nonces-hidden.html]
+  [createElement.nonce.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/nonce-hiding/svgscript-nonces-hidden-meta.sub.html.ini b/tests/wpt/meta/content-security-policy/nonce-hiding/svgscript-nonces-hidden-meta.sub.html.ini
new file mode 100644
index 00000000000..54fff6e8d97
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/nonce-hiding/svgscript-nonces-hidden-meta.sub.html.ini
@@ -0,0 +1,4 @@
+[svgscript-nonces-hidden-meta.sub.html]
+  expected: TIMEOUT
+  [Document-written script executes.]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/nonce-hiding/svgscript-nonces-hidden.html.ini b/tests/wpt/meta/content-security-policy/nonce-hiding/svgscript-nonces-hidden.html.ini
new file mode 100644
index 00000000000..277bef043c8
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/nonce-hiding/svgscript-nonces-hidden.html.ini
@@ -0,0 +1,4 @@
+[svgscript-nonces-hidden.html]
+  expected: TIMEOUT
+  [Document-written script executes.]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/object-src/object-src-no-url-blocked.html.ini b/tests/wpt/meta/content-security-policy/object-src/object-src-no-url-blocked.html.ini
new file mode 100644
index 00000000000..a0e1c56214a
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/object-src/object-src-no-url-blocked.html.ini
@@ -0,0 +1,4 @@
+[object-src-no-url-blocked.html]
+  expected: TIMEOUT
+  [Should block the object and fire a spv]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/object-src/object-src-url-blocked.html.ini b/tests/wpt/meta/content-security-policy/object-src/object-src-url-blocked.html.ini
new file mode 100644
index 00000000000..c6642793ea3
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/object-src/object-src-url-blocked.html.ini
@@ -0,0 +1,4 @@
+[object-src-url-blocked.html]
+  expected: TIMEOUT
+  [Should block the object and fire a spv]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/object-src/object-src-url-embed-blocked.html.ini b/tests/wpt/meta/content-security-policy/object-src/object-src-url-embed-blocked.html.ini
new file mode 100644
index 00000000000..243bbcce03b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/object-src/object-src-url-embed-blocked.html.ini
@@ -0,0 +1,4 @@
+[object-src-url-embed-blocked.html]
+  expected: TIMEOUT
+  [Should block the object and fire a spv]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/object-src/object-src-url-redirect-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/object-src/object-src-url-redirect-blocked.sub.html.ini
new file mode 100644
index 00000000000..1058fc1856e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/object-src/object-src-url-redirect-blocked.sub.html.ini
@@ -0,0 +1,4 @@
+[object-src-url-redirect-blocked.sub.html]
+  expected: TIMEOUT
+  [Should block the object and fire a spv]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/report-hash/default-src.https.window.js.ini b/tests/wpt/meta/content-security-policy/report-hash/default-src.https.window.js.ini
new file mode 100644
index 00000000000..97015c0d985
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/report-hash/default-src.https.window.js.ini
@@ -0,0 +1,2 @@
+[default-src.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/content-security-policy/report-hash/multiple-policies.https.sub.html.ini b/tests/wpt/meta/content-security-policy/report-hash/multiple-policies.https.sub.html.ini
new file mode 100644
index 00000000000..8c85b90e8f9
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/report-hash/multiple-policies.https.sub.html.ini
@@ -0,0 +1,2 @@
+[multiple-policies.https.sub.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/content-security-policy/report-hash/reportonly-default-src.https.window.js.ini b/tests/wpt/meta/content-security-policy/report-hash/reportonly-default-src.https.window.js.ini
new file mode 100644
index 00000000000..d8d4cb11a7e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/report-hash/reportonly-default-src.https.window.js.ini
@@ -0,0 +1,2 @@
+[reportonly-default-src.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/content-security-policy/report-hash/reportonly-script-src-elem.https.window.js.ini b/tests/wpt/meta/content-security-policy/report-hash/reportonly-script-src-elem.https.window.js.ini
new file mode 100644
index 00000000000..153531bb6c0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/report-hash/reportonly-script-src-elem.https.window.js.ini
@@ -0,0 +1,2 @@
+[reportonly-script-src-elem.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/content-security-policy/report-hash/reportonly-script-src-none.https.window.js.ini b/tests/wpt/meta/content-security-policy/report-hash/reportonly-script-src-none.https.window.js.ini
new file mode 100644
index 00000000000..e66c84f5425
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/report-hash/reportonly-script-src-none.https.window.js.ini
@@ -0,0 +1,2 @@
+[reportonly-script-src-none.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/content-security-policy/report-hash/reportonly-script-src.https.window.js.ini b/tests/wpt/meta/content-security-policy/report-hash/reportonly-script-src.https.window.js.ini
new file mode 100644
index 00000000000..40a3040ab2b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/report-hash/reportonly-script-src.https.window.js.ini
@@ -0,0 +1,2 @@
+[reportonly-script-src.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/content-security-policy/report-hash/script-src-elem.https.window.js.ini b/tests/wpt/meta/content-security-policy/report-hash/script-src-elem.https.window.js.ini
new file mode 100644
index 00000000000..449223773b0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/report-hash/script-src-elem.https.window.js.ini
@@ -0,0 +1,2 @@
+[script-src-elem.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/content-security-policy/report-hash/script-src-sha512.https.window.js.ini b/tests/wpt/meta/content-security-policy/report-hash/script-src-sha512.https.window.js.ini
new file mode 100644
index 00000000000..b03172ffbd4
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/report-hash/script-src-sha512.https.window.js.ini
@@ -0,0 +1,2 @@
+[script-src-sha512.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/content-security-policy/report-hash/script-src.https.window.js.ini b/tests/wpt/meta/content-security-policy/report-hash/script-src.https.window.js.ini
new file mode 100644
index 00000000000..f9e1ac1f9c0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/report-hash/script-src.https.window.js.ini
@@ -0,0 +1,2 @@
+[script-src.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/content-security-policy/reporting-api/report-to-directive-allowed-in-meta.https.sub.html.ini b/tests/wpt/meta/content-security-policy/reporting-api/report-to-directive-allowed-in-meta.https.sub.html.ini
new file mode 100644
index 00000000000..950bcfb5a23
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting-api/report-to-directive-allowed-in-meta.https.sub.html.ini
@@ -0,0 +1,6 @@
+[report-to-directive-allowed-in-meta.https.sub.html]
+  [Report is observable to ReportingObserver]
+    expected: FAIL
+
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting-api/reporting-api-report-only-sends-reports-on-violation.https.sub.html.ini b/tests/wpt/meta/content-security-policy/reporting-api/reporting-api-report-only-sends-reports-on-violation.https.sub.html.ini
new file mode 100644
index 00000000000..215ef61c88a
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting-api/reporting-api-report-only-sends-reports-on-violation.https.sub.html.ini
@@ -0,0 +1,7 @@
+[reporting-api-report-only-sends-reports-on-violation.https.sub.html]
+  expected: TIMEOUT
+  [Event is fired]
+    expected: TIMEOUT
+
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting-api/reporting-api-sends-reports-on-violation.https.sub.html.ini b/tests/wpt/meta/content-security-policy/reporting-api/reporting-api-sends-reports-on-violation.https.sub.html.ini
new file mode 100644
index 00000000000..2e2c16c80c7
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting-api/reporting-api-sends-reports-on-violation.https.sub.html.ini
@@ -0,0 +1,6 @@
+[reporting-api-sends-reports-on-violation.https.sub.html]
+  [Report is observable to ReportingObserver]
+    expected: FAIL
+
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting-api/reporting-api-works-on-frame-ancestors.https.sub.html.ini b/tests/wpt/meta/content-security-policy/reporting-api/reporting-api-works-on-frame-ancestors.https.sub.html.ini
new file mode 100644
index 00000000000..a99307cc850
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting-api/reporting-api-works-on-frame-ancestors.https.sub.html.ini
@@ -0,0 +1,3 @@
+[reporting-api-works-on-frame-ancestors.https.sub.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting-api/reporting-api-works-on-frame-src.https.sub.html.ini b/tests/wpt/meta/content-security-policy/reporting-api/reporting-api-works-on-frame-src.https.sub.html.ini
new file mode 100644
index 00000000000..40ed15766c9
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting-api/reporting-api-works-on-frame-src.https.sub.html.ini
@@ -0,0 +1,7 @@
+[reporting-api-works-on-frame-src.https.sub.html]
+  expected: TIMEOUT
+  [Event is fired]
+    expected: TIMEOUT
+
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/multiple-report-policies.html.ini b/tests/wpt/meta/content-security-policy/reporting/multiple-report-policies.html.ini
new file mode 100644
index 00000000000..b691cd78d4f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/multiple-report-policies.html.ini
@@ -0,0 +1,6 @@
+[multiple-report-policies.html]
+  [2-Violation report status OK]
+    expected: FAIL
+
+  [1-Violation report status OK]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/post-redirect-stacktrace.https.html.ini b/tests/wpt/meta/content-security-policy/reporting/post-redirect-stacktrace.https.html.ini
new file mode 100644
index 00000000000..0623ac8d003
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/post-redirect-stacktrace.https.html.ini
@@ -0,0 +1,13 @@
+[post-redirect-stacktrace.https.html]
+  expected: ERROR
+  [StackTrace do not leak cross-origin post-redirect URL]
+    expected: FAIL
+
+  [StackTrace do not leak cross-site post-redirect URL]
+    expected: FAIL
+
+  [CSP report do not leak cross-origin post-redirect URL]
+    expected: NOTRUN
+
+  [CSP report do not leak cross-site post-redirect URL]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-and-enforce.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-and-enforce.html.ini
new file mode 100644
index 00000000000..db4b7b25753
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-and-enforce.html.ini
@@ -0,0 +1,3 @@
+[report-and-enforce.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-blocked-data-uri.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-blocked-data-uri.html.ini
new file mode 100644
index 00000000000..d8269171239
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-blocked-data-uri.html.ini
@@ -0,0 +1,3 @@
+[report-blocked-data-uri.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-blocked-uri-cross-origin.sub.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-blocked-uri-cross-origin.sub.html.ini
new file mode 100644
index 00000000000..e70dcdeca70
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-blocked-uri-cross-origin.sub.html.ini
@@ -0,0 +1,3 @@
+[report-blocked-uri-cross-origin.sub.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-blocked-uri.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-blocked-uri.html.ini
new file mode 100644
index 00000000000..2275d16dae2
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-blocked-uri.html.ini
@@ -0,0 +1,3 @@
+[report-blocked-uri.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-clips-sample.https.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-clips-sample.https.html.ini
new file mode 100644
index 00000000000..282ea4398ee
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-clips-sample.https.html.ini
@@ -0,0 +1,18 @@
+[report-clips-sample.https.html]
+  [Unsafe eval violation sample is clipped to 40 characters.]
+    expected: FAIL
+
+  [Unsafe indirect eval violation sample is clipped to 40 characters.]
+    expected: FAIL
+
+  [Function constructor - the other kind of eval - is clipped.]
+    expected: FAIL
+
+  [Async Function constructor is also clipped.]
+    expected: FAIL
+
+  [Generator Function constructor is also clipped.]
+    expected: FAIL
+
+  [AsyncGenerator Function constructor is also clipped.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-cross-origin-no-cookies.sub.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-cross-origin-no-cookies.sub.html.ini
new file mode 100644
index 00000000000..c7665aab918
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-cross-origin-no-cookies.sub.html.ini
@@ -0,0 +1,3 @@
+[report-cross-origin-no-cookies.sub.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-frame-ancestors-no-parent-cookies.sub.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-frame-ancestors-no-parent-cookies.sub.html.ini
new file mode 100644
index 00000000000..98c1f8c14cb
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-frame-ancestors-no-parent-cookies.sub.html.ini
@@ -0,0 +1,3 @@
+[report-frame-ancestors-no-parent-cookies.sub.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-frame-ancestors-with-x-frame-options.sub.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-frame-ancestors-with-x-frame-options.sub.html.ini
new file mode 100644
index 00000000000..82711cce67b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-frame-ancestors-with-x-frame-options.sub.html.ini
@@ -0,0 +1,3 @@
+[report-frame-ancestors-with-x-frame-options.sub.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-frame-ancestors.sub.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-frame-ancestors.sub.html.ini
new file mode 100644
index 00000000000..24f5c02ceda
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-frame-ancestors.sub.html.ini
@@ -0,0 +1,3 @@
+[report-frame-ancestors.sub.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-multiple-violations-01.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-multiple-violations-01.html.ini
new file mode 100644
index 00000000000..5b221057d2f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-multiple-violations-01.html.ini
@@ -0,0 +1,6 @@
+[report-multiple-violations-01.html]
+  [Violation report status OK.]
+    expected: FAIL
+
+  [Test number of sent reports.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-multiple-violations-02.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-multiple-violations-02.html.ini
new file mode 100644
index 00000000000..9934866aef7
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-multiple-violations-02.html.ini
@@ -0,0 +1,6 @@
+[report-multiple-violations-02.html]
+  [Violation report status OK.]
+    expected: FAIL
+
+  [Test number of sent reports.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-only-cross-origin-frame.sub.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-only-cross-origin-frame.sub.html.ini
new file mode 100644
index 00000000000..d005975d3bb
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-only-cross-origin-frame.sub.html.ini
@@ -0,0 +1,7 @@
+[report-only-cross-origin-frame.sub.html]
+  expected: TIMEOUT
+  [The securitypolicyviolation is triggered.]
+    expected: NOTRUN
+
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-only-unsafe-eval.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-only-unsafe-eval.html.ini
new file mode 100644
index 00000000000..0c3690b9bec
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-only-unsafe-eval.html.ini
@@ -0,0 +1,6 @@
+[report-only-unsafe-eval.html]
+  [SPV event is still raised]
+    expected: FAIL
+
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-original-url-on-mixed-content-frame.https.sub.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-original-url-on-mixed-content-frame.https.sub.html.ini
new file mode 100644
index 00000000000..92366249526
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-original-url-on-mixed-content-frame.https.sub.html.ini
@@ -0,0 +1,3 @@
+[report-original-url-on-mixed-content-frame.https.sub.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-original-url.sub.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-original-url.sub.html.ini
new file mode 100644
index 00000000000..66a2ee93f3b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-original-url.sub.html.ini
@@ -0,0 +1,10 @@
+[report-original-url.sub.html]
+  expected: TIMEOUT
+  [Block after redirect, same-origin = original URL in report]
+    expected: TIMEOUT
+
+  [Block after redirect, cross-origin = original URL in report]
+    expected: TIMEOUT
+
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-preload-and-consume.https.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-preload-and-consume.https.html.ini
new file mode 100644
index 00000000000..2d09ea340b3
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-preload-and-consume.https.html.ini
@@ -0,0 +1,4 @@
+[report-preload-and-consume.https.html]
+  expected: TIMEOUT
+  [Reporting endpoints received credentials.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-same-origin-with-cookies.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-same-origin-with-cookies.html.ini
new file mode 100644
index 00000000000..882211ab9fb
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-same-origin-with-cookies.html.ini
@@ -0,0 +1,6 @@
+[report-same-origin-with-cookies.html]
+  [Violation report status OK.]
+    expected: FAIL
+
+  [Test report cookies.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-strips-fragment.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-strips-fragment.html.ini
new file mode 100644
index 00000000000..1aab8623c95
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-strips-fragment.html.ini
@@ -0,0 +1,4 @@
+[report-strips-fragment.html]
+  expected: TIMEOUT
+  [Reported document URI does not contain fragments.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-uri-effective-directive.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-uri-effective-directive.html.ini
new file mode 100644
index 00000000000..1571539a4e4
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-uri-effective-directive.html.ini
@@ -0,0 +1,3 @@
+[report-uri-effective-directive.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-uri-from-child-frame.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-uri-from-child-frame.html.ini
new file mode 100644
index 00000000000..4112d8054e5
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-uri-from-child-frame.html.ini
@@ -0,0 +1,3 @@
+[report-uri-from-child-frame.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-uri-from-inline-javascript.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-uri-from-inline-javascript.html.ini
new file mode 100644
index 00000000000..a37311b0d13
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-uri-from-inline-javascript.html.ini
@@ -0,0 +1,3 @@
+[report-uri-from-inline-javascript.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-uri-from-javascript.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-uri-from-javascript.html.ini
new file mode 100644
index 00000000000..92daa7fe26d
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-uri-from-javascript.html.ini
@@ -0,0 +1,3 @@
+[report-uri-from-javascript.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-uri-multiple-reversed.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-uri-multiple-reversed.html.ini
new file mode 100644
index 00000000000..1edf44b5887
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-uri-multiple-reversed.html.ini
@@ -0,0 +1,3 @@
+[report-uri-multiple-reversed.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-uri-multiple.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-uri-multiple.html.ini
new file mode 100644
index 00000000000..1ea240219fa
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-uri-multiple.html.ini
@@ -0,0 +1,3 @@
+[report-uri-multiple.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/reporting/report-uri-scheme-relative.html.ini b/tests/wpt/meta/content-security-policy/reporting/report-uri-scheme-relative.html.ini
new file mode 100644
index 00000000000..6a803717b04
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/reporting/report-uri-scheme-relative.html.ini
@@ -0,0 +1,3 @@
+[report-uri-scheme-relative.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/resource-hints/prefetch-allowed-by-any-directive.sub.html.ini b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-allowed-by-any-directive.sub.html.ini
new file mode 100644
index 00000000000..816cd785fe7
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-allowed-by-any-directive.sub.html.ini
@@ -0,0 +1,10 @@
+[prefetch-allowed-by-any-directive.sub.html]
+  expected: TIMEOUT
+  [Prefetch should succeed when restricted by default-src but allowed by other directive]
+    expected: TIMEOUT
+
+  [Prefetch should fail when restricted by default-src and different origin allowed by other directive]
+    expected: NOTRUN
+
+  [Prefetch should succeed when restricted by default-src but origin allowed by other directive]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/resource-hints/prefetch-allowed-by-default.html.ini b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-allowed-by-default.html.ini
new file mode 100644
index 00000000000..8d5f47089a3
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-allowed-by-default.html.ini
@@ -0,0 +1,4 @@
+[prefetch-allowed-by-default.html]
+  expected: TIMEOUT
+  [Prefetch should succeed when allowed by default-src]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/resource-hints/prefetch-allowed-no-default.html.ini b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-allowed-no-default.html.ini
new file mode 100644
index 00000000000..328cb2551c4
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-allowed-no-default.html.ini
@@ -0,0 +1,4 @@
+[prefetch-allowed-no-default.html]
+  expected: TIMEOUT
+  [Prefetch should succeed when there is no default-src]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/resource-hints/prefetch-allowed-with-conflicting-permissive-policies.html.ini b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-allowed-with-conflicting-permissive-policies.html.ini
new file mode 100644
index 00000000000..0919ef94aa5
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-allowed-with-conflicting-permissive-policies.html.ini
@@ -0,0 +1,4 @@
+[prefetch-allowed-with-conflicting-permissive-policies.html]
+  expected: TIMEOUT
+  [Prefetch should succeed when a directive in a policy is permissive, even if a subsequent policy overrides that.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/resource-hints/prefetch-blocked-by-default-multiple-policies.html.ini b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-blocked-by-default-multiple-policies.html.ini
new file mode 100644
index 00000000000..f795f8c5d4b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-blocked-by-default-multiple-policies.html.ini
@@ -0,0 +1,4 @@
+[prefetch-blocked-by-default-multiple-policies.html]
+  expected: TIMEOUT
+  [Prefetch should fail when restricted by default-src]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/resource-hints/prefetch-blocked-by-default.html.ini b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-blocked-by-default.html.ini
new file mode 100644
index 00000000000..3ee2b910a58
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-blocked-by-default.html.ini
@@ -0,0 +1,4 @@
+[prefetch-blocked-by-default.html]
+  expected: TIMEOUT
+  [Prefetch should fail when restricted by default-src]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/resource-hints/prefetch-generate-directives.html.ini b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-generate-directives.html.ini
new file mode 100644
index 00000000000..df10ea63fd6
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-generate-directives.html.ini
@@ -0,0 +1,79 @@
+[prefetch-generate-directives.html]
+  expected: TIMEOUT
+  [Test that script-src enabled with everything else disabled allows prefetching]
+    expected: TIMEOUT
+
+  [Test that script-src enabled with default-src disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that img-src enabled with everything else disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that img-src enabled with default-src disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that connect-src enabled with everything else disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that connect-src enabled with default-src disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that object-src enabled with everything else disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that object-src enabled with default-src disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that font-src enabled with everything else disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that font-src enabled with default-src disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that manifest-src enabled with everything else disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that manifest-src enabled with default-src disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that media-src enabled with everything else disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that media-src enabled with default-src disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that style-src enabled with everything else disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that style-src enabled with default-src disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that child-src enabled with everything else disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that child-src enabled with default-src disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that frame-src enabled with everything else disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that frame-src enabled with default-src disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that worker-src enabled with everything else disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that worker-src enabled with default-src disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that base-uri enabled with everything else disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that base-uri enabled with default-src disabled allows prefetching]
+    expected: NOTRUN
+
+  [Test that permissive script-src-elem supersedes script-src]
+    expected: NOTRUN
+
+  [Test that permissive script-src supersedes script-src-elem]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/resource-hints/prefetch-ignores-prefetch-src.sub.html.ini b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-ignores-prefetch-src.sub.html.ini
new file mode 100644
index 00000000000..30e8ff98e77
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-ignores-prefetch-src.sub.html.ini
@@ -0,0 +1,4 @@
+[prefetch-ignores-prefetch-src.sub.html]
+  expected: TIMEOUT
+  [Prefetch should fail when restricted by default-src and allowed by unsupported prefetch-src directive (prefetch-src should be ignored)]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/resource-hints/prefetch-no-csp.html.ini b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-no-csp.html.ini
new file mode 100644
index 00000000000..414e4ff720e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/resource-hints/prefetch-no-csp.html.ini
@@ -0,0 +1,4 @@
+[prefetch-no-csp.html]
+  expected: TIMEOUT
+  [Prefetch succeeds when no CSP]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/sandbox/sandbox-empty-subframe.sub.html.ini b/tests/wpt/meta/content-security-policy/sandbox/sandbox-empty-subframe.sub.html.ini
new file mode 100644
index 00000000000..f8d402376f5
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/sandbox/sandbox-empty-subframe.sub.html.ini
@@ -0,0 +1,3 @@
+[sandbox-empty-subframe.sub.html]
+  [Expecting logs: ["PASS2"\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/sandbox/service-worker-sandbox.https.html.ini b/tests/wpt/meta/content-security-policy/sandbox/service-worker-sandbox.https.html.ini
new file mode 100644
index 00000000000..295b4b39ba3
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/sandbox/service-worker-sandbox.https.html.ini
@@ -0,0 +1,21 @@
+[service-worker-sandbox.https.html]
+  [global setup]
+    expected: FAIL
+
+  [Origin of service worker]
+    expected: FAIL
+
+  [Response generated by service worker can be fetched as same-origin]
+    expected: FAIL
+
+  [Origin used in fetch on service worker (mode: same-origin, with ACAOrigin)]
+    expected: FAIL
+
+  [Origin used in fetch on service worker (mode: same-origin)]
+    expected: FAIL
+
+  [Origin used in fetch on service worker (mode: cors, with ACAOrigin)]
+    expected: FAIL
+
+  [Origin used in fetch on service worker (mode: cors)]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/sandbox/shared-worker-sandbox.html.ini b/tests/wpt/meta/content-security-policy/sandbox/shared-worker-sandbox.html.ini
new file mode 100644
index 00000000000..c0387673a23
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/sandbox/shared-worker-sandbox.html.ini
@@ -0,0 +1,3 @@
+[shared-worker-sandbox.html]
+  [sandbox directive for SharedWorker]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/sandbox/window-reuse-unsandboxed.html.ini b/tests/wpt/meta/content-security-policy/sandbox/window-reuse-unsandboxed.html.ini
new file mode 100644
index 00000000000..d85981340d8
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/sandbox/window-reuse-unsandboxed.html.ini
@@ -0,0 +1,3 @@
+[window-reuse-unsandboxed.html]
+  [Window object should be reused]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html.ini b/tests/wpt/meta/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html.ini
new file mode 100644
index 00000000000..e0ac35d5d2d
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html.ini
@@ -0,0 +1,3 @@
+[eval-allowed-in-report-only-mode-and-sends-report.html]
+  [Violation report status OK.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/script-src/javascript-window-open-blocked.html.ini b/tests/wpt/meta/content-security-policy/script-src/javascript-window-open-blocked.html.ini
new file mode 100644
index 00000000000..125b4088132
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/script-src/javascript-window-open-blocked.html.ini
@@ -0,0 +1,4 @@
+[javascript-window-open-blocked.html]
+  expected: TIMEOUT
+  [Check that a securitypolicyviolation event is fired]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/script-src/nonce-enforce-blocked.html.ini b/tests/wpt/meta/content-security-policy/script-src/nonce-enforce-blocked.html.ini
new file mode 100644
index 00000000000..f6f7521b516
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/script-src/nonce-enforce-blocked.html.ini
@@ -0,0 +1,3 @@
+[nonce-enforce-blocked.html]
+  [Unnonced scripts generate reports.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/script-src/script-src-strict_dynamic_meta_tag.html.ini b/tests/wpt/meta/content-security-policy/script-src/script-src-strict_dynamic_meta_tag.html.ini
new file mode 100644
index 00000000000..77fdfb89f19
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/script-src/script-src-strict_dynamic_meta_tag.html.ini
@@ -0,0 +1,7 @@
+[script-src-strict_dynamic_meta_tag.html]
+  expected: ERROR
+  [Script injected via `appendChild` populated via `textContent` is allowed with `strict-dynamic`.]
+    expected: TIMEOUT
+
+  [Script injected via `appendChild` populated via `textContent` is allowed with `strict-dynamic`, even if it carries an incorrect nonce.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted.html.ini b/tests/wpt/meta/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted.html.ini
new file mode 100644
index 00000000000..ca8b9d7bd1f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted.html.ini
@@ -0,0 +1,7 @@
+[script-src-strict_dynamic_non_parser_inserted.html]
+  expected: ERROR
+  [Script injected via `appendChild` populated via `textContent` is allowed with `strict-dynamic`.]
+    expected: TIMEOUT
+
+  [Script injected via `appendChild` populated via `textContent` is allowed with `strict-dynamic`, even if it carries an incorrect nonce.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html.ini b/tests/wpt/meta/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html.ini
new file mode 100644
index 00000000000..67a423f9b8a
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html.ini
@@ -0,0 +1,7 @@
+[script-src-strict_dynamic_parser_inserted.html]
+  expected: TIMEOUT
+  [Script injected via `innerHTML` is not allowed with `strict-dynamic`.]
+    expected: TIMEOUT
+
+  [Script injected via `insertAdjacentHTML` is not allowed with `strict-dynamic`.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/script-src/script-src-strict_dynamic_worker.https.html.ini b/tests/wpt/meta/content-security-policy/script-src/script-src-strict_dynamic_worker.https.html.ini
new file mode 100644
index 00000000000..6015fecfd69
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/script-src/script-src-strict_dynamic_worker.https.html.ini
@@ -0,0 +1,7 @@
+[script-src-strict_dynamic_worker.https.html]
+  expected: TIMEOUT
+  [Shared worker is allowed via 'strict-dynamic']
+    expected: FAIL
+
+  [Service worker is allowed via 'strict-dynamic']
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/script-src/worker-data-set-timeout.sub.html.ini b/tests/wpt/meta/content-security-policy/script-src/worker-data-set-timeout.sub.html.ini
new file mode 100644
index 00000000000..82516e33560
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/script-src/worker-data-set-timeout.sub.html.ini
@@ -0,0 +1,3 @@
+[worker-data-set-timeout.sub.html]
+  [Shared worker with data: url inherits CSP]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/script-src/worker-importscripts.sub.html.ini b/tests/wpt/meta/content-security-policy/script-src/worker-importscripts.sub.html.ini
new file mode 100644
index 00000000000..69268dc710f
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/script-src/worker-importscripts.sub.html.ini
@@ -0,0 +1,3 @@
+[worker-importscripts.sub.html]
+  [Shared worker delivers its own CSP]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/script-src/worker-set-timeout.sub.html.ini b/tests/wpt/meta/content-security-policy/script-src/worker-set-timeout.sub.html.ini
new file mode 100644
index 00000000000..f070a322a17
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/script-src/worker-set-timeout.sub.html.ini
@@ -0,0 +1,3 @@
+[worker-set-timeout.sub.html]
+  [Shared worker delivers its own CSP]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/blockeduri-inline.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/blockeduri-inline.html.ini
new file mode 100644
index 00000000000..3d0febce2b5
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/blockeduri-inline.html.ini
@@ -0,0 +1,3 @@
+[blockeduri-inline.html]
+  [Inline violations have a blockedURI of 'inline']
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/blockeduri-ws-wss-scheme.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/blockeduri-ws-wss-scheme.html.ini
new file mode 100644
index 00000000000..14fa5353a94
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/blockeduri-ws-wss-scheme.html.ini
@@ -0,0 +1,3 @@
+[blockeduri-ws-wss-scheme.html]
+  [redirect]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/idlharness.window.js.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/idlharness.window.js.ini
new file mode 100644
index 00000000000..5db26da0f4d
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/idlharness.window.js.ini
@@ -0,0 +1,54 @@
+[idlharness.window.html]
+  [CSPViolationReportBody interface: existence and properties of interface object]
+    expected: FAIL
+
+  [CSPViolationReportBody interface object length]
+    expected: FAIL
+
+  [CSPViolationReportBody interface object name]
+    expected: FAIL
+
+  [CSPViolationReportBody interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [CSPViolationReportBody interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [CSPViolationReportBody interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [CSPViolationReportBody interface: operation toJSON()]
+    expected: FAIL
+
+  [CSPViolationReportBody interface: attribute documentURL]
+    expected: FAIL
+
+  [CSPViolationReportBody interface: attribute referrer]
+    expected: FAIL
+
+  [CSPViolationReportBody interface: attribute blockedURL]
+    expected: FAIL
+
+  [CSPViolationReportBody interface: attribute effectiveDirective]
+    expected: FAIL
+
+  [CSPViolationReportBody interface: attribute originalPolicy]
+    expected: FAIL
+
+  [CSPViolationReportBody interface: attribute sourceFile]
+    expected: FAIL
+
+  [CSPViolationReportBody interface: attribute sample]
+    expected: FAIL
+
+  [CSPViolationReportBody interface: attribute disposition]
+    expected: FAIL
+
+  [CSPViolationReportBody interface: attribute statusCode]
+    expected: FAIL
+
+  [CSPViolationReportBody interface: attribute lineNumber]
+    expected: FAIL
+
+  [CSPViolationReportBody interface: attribute columnNumber]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/img-src-redirect-upgrade-reporting.https.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/img-src-redirect-upgrade-reporting.https.html.ini
new file mode 100644
index 00000000000..6f040a33d88
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/img-src-redirect-upgrade-reporting.https.html.ini
@@ -0,0 +1,4 @@
+[img-src-redirect-upgrade-reporting.https.html]
+  expected: TIMEOUT
+  [Image that redirects to http:// URL prohibited by Report-Only must generate a violation report, even with upgrade-insecure-requests]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/img-src-redirect.sub.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/img-src-redirect.sub.html.ini
new file mode 100644
index 00000000000..95cb135df4e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/img-src-redirect.sub.html.ini
@@ -0,0 +1,3 @@
+[img-src-redirect.sub.html]
+  [The blocked URI in the security policy violation event should be the original URI before redirects.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/inside-dedicated-worker.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/inside-dedicated-worker.html.ini
new file mode 100644
index 00000000000..0ee98ae20c9
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/inside-dedicated-worker.html.ini
@@ -0,0 +1,4 @@
+[inside-dedicated-worker.html]
+  expected: TIMEOUT
+  [SecurityPolicyViolation event fired on global with the correct blockedURI.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/inside-service-worker.https.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/inside-service-worker.https.html.ini
new file mode 100644
index 00000000000..16431d7ffdd
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/inside-service-worker.https.html.ini
@@ -0,0 +1,2 @@
+[inside-service-worker.https.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/inside-shared-worker.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/inside-shared-worker.html.ini
new file mode 100644
index 00000000000..ccf09801bc1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/inside-shared-worker.html.ini
@@ -0,0 +1,2 @@
+[inside-shared-worker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/linenumber.tentative.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/linenumber.tentative.html.ini
new file mode 100644
index 00000000000..e8114229ab9
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/linenumber.tentative.html.ini
@@ -0,0 +1,3 @@
+[linenumber.tentative.html]
+  [linenumber]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/script-sample-no-opt-in.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/script-sample-no-opt-in.html.ini
new file mode 100644
index 00000000000..409022079e0
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/script-sample-no-opt-in.html.ini
@@ -0,0 +1,7 @@
+[script-sample-no-opt-in.html]
+  expected: TIMEOUT
+  [JavaScript URLs in iframes should not have a sample.]
+    expected: TIMEOUT
+
+  [Inline event handlers should not have a sample.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/script-sample.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/script-sample.html.ini
new file mode 100644
index 00000000000..8723775f27e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/script-sample.html.ini
@@ -0,0 +1,7 @@
+[script-sample.html]
+  expected: TIMEOUT
+  [JavaScript URLs in iframes should have a sample.]
+    expected: TIMEOUT
+
+  [Inline event handlers should have a sample.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-cross-origin-image-from-script.sub.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-cross-origin-image-from-script.sub.html.ini
new file mode 100644
index 00000000000..f89c598a39b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-cross-origin-image-from-script.sub.html.ini
@@ -0,0 +1,3 @@
+[securitypolicyviolation-block-cross-origin-image-from-script.sub.html]
+  [Non-redirected cross-origin URLs are not stripped.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-cross-origin-image.sub.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-cross-origin-image.sub.html.ini
new file mode 100644
index 00000000000..3d3531dc0b5
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-cross-origin-image.sub.html.ini
@@ -0,0 +1,3 @@
+[securitypolicyviolation-block-cross-origin-image.sub.html]
+  [Non-redirected cross-origin URLs are not stripped.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image-from-script.sub.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image-from-script.sub.html.ini
new file mode 100644
index 00000000000..e3ca9694e1c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image-from-script.sub.html.ini
@@ -0,0 +1,3 @@
+[securitypolicyviolation-block-image-from-script.sub.html]
+  [Non-redirected cross-origin URLs are not stripped.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image.sub.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image.sub.html.ini
new file mode 100644
index 00000000000..900d04f76cb
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image.sub.html.ini
@@ -0,0 +1,3 @@
+[securitypolicyviolation-block-image.sub.html]
+  [Non-redirected same-origin URLs are not stripped.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/source-file-blob-scheme.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/source-file-blob-scheme.html.ini
new file mode 100644
index 00000000000..514f91961e3
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/source-file-blob-scheme.html.ini
@@ -0,0 +1,3 @@
+[source-file-blob-scheme.html]
+  [Violations from data:-URL scripts have a sourceFile of 'blob']
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/source-file-data-scheme.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/source-file-data-scheme.html.ini
new file mode 100644
index 00000000000..ed4dba7d3c3
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/source-file-data-scheme.html.ini
@@ -0,0 +1,3 @@
+[source-file-data-scheme.html]
+  [Violations from data:-URL scripts have a sourceFile of 'data']
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/source-file.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/source-file.html.ini
new file mode 100644
index 00000000000..36fcab9f04d
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/source-file.html.ini
@@ -0,0 +1,51 @@
+[source-file.html]
+  [Basic HTTPS URL]
+    expected: FAIL
+
+  [Basic HTTP URL]
+    expected: FAIL
+
+  [Basic WSS URL]
+    expected: FAIL
+
+  [Basic WS URL]
+    expected: FAIL
+
+  [Fragment]
+    expected: FAIL
+
+  [Query]
+    expected: FAIL
+
+  [Port]
+    expected: FAIL
+
+  [User:password]
+    expected: FAIL
+
+  [User]
+    expected: FAIL
+
+  [Invalid URL]
+    expected: FAIL
+
+  [file:]
+    expected: FAIL
+
+  [Custom protocol]
+    expected: FAIL
+
+  [about:blank]
+    expected: FAIL
+
+  [about:custom]
+    expected: FAIL
+
+  [data:]
+    expected: FAIL
+
+  [blob:]
+    expected: FAIL
+
+  [javascript:]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/style-sample-no-opt-in.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/style-sample-no-opt-in.html.ini
new file mode 100644
index 00000000000..ef89e7cb1a9
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/style-sample-no-opt-in.html.ini
@@ -0,0 +1,4 @@
+[style-sample-no-opt-in.html]
+  expected: TIMEOUT
+  [Inline style attributes should not have a sample.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/style-sample.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/style-sample.html.ini
new file mode 100644
index 00000000000..63e278182d8
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/style-sample.html.ini
@@ -0,0 +1,4 @@
+[style-sample.html]
+  expected: TIMEOUT
+  [Inline style attributes should have a sample.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/targeting.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/targeting.html.ini
new file mode 100644
index 00000000000..952c5185dd8
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/targeting.html.ini
@@ -0,0 +1,13 @@
+[targeting.html]
+  expected: TIMEOUT
+  [These tests should not fail.]
+    expected: NOTRUN
+
+  [Inline violations target the right element.]
+    expected: FAIL
+
+  [Correct targeting inside shadow tree (inline handler).]
+    expected: TIMEOUT
+
+  [Elements created in this document, but pushed into a same-origin frame trigger on that frame's document, not on this frame's document.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/securitypolicyviolation/upgrade-insecure-requests-reporting.https.html.ini b/tests/wpt/meta/content-security-policy/securitypolicyviolation/upgrade-insecure-requests-reporting.https.html.ini
new file mode 100644
index 00000000000..f84e31682d3
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/securitypolicyviolation/upgrade-insecure-requests-reporting.https.html.ini
@@ -0,0 +1,7 @@
+[upgrade-insecure-requests-reporting.https.html]
+  expected: TIMEOUT
+  [Upgraded iframe is reported]
+    expected: TIMEOUT
+
+  [Navigated iframe is upgraded and reported]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/style-src/import-style-allowed.sub.html.ini b/tests/wpt/meta/content-security-policy/style-src/import-style-allowed.sub.html.ini
new file mode 100644
index 00000000000..b2ba54aff55
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/style-src/import-style-allowed.sub.html.ini
@@ -0,0 +1,2 @@
+[import-style-allowed.sub.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/content-security-policy/style-src/import-style-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/style-src/import-style-blocked.sub.html.ini
new file mode 100644
index 00000000000..14e556cb044
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/style-src/import-style-blocked.sub.html.ini
@@ -0,0 +1,2 @@
+[import-style-blocked.sub.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html.ini b/tests/wpt/meta/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html.ini
new file mode 100644
index 00000000000..c99d7bd7844
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html.ini
@@ -0,0 +1,36 @@
+[inline-style-allowed-while-cloning-objects.sub.html]
+  [non-HTML namespace]
+    expected: FAIL
+
+  [inline-style-allowed-while-cloning-objects 1]
+    expected: FAIL
+
+  [inline-style-allowed-while-cloning-objects 3]
+    expected: FAIL
+
+  [inline-style-allowed-while-cloning-objects 5]
+    expected: FAIL
+
+  [inline-style-allowed-while-cloning-objects 7]
+    expected: FAIL
+
+  [inline-style-allowed-while-cloning-objects 8]
+    expected: FAIL
+
+  [inline-style-allowed-while-cloning-objects 9]
+    expected: FAIL
+
+  [inline-style-allowed-while-cloning-objects 10]
+    expected: FAIL
+
+  [inline-style-allowed-while-cloning-objects 11]
+    expected: FAIL
+
+  [inline-style-allowed-while-cloning-objects 17]
+    expected: FAIL
+
+  [inline-style-allowed-while-cloning-objects 18]
+    expected: FAIL
+
+  [inline-style-allowed-while-cloning-objects 19]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/style-src/style-blocked.html.ini b/tests/wpt/meta/content-security-policy/style-src/style-blocked.html.ini
new file mode 100644
index 00000000000..8b0389aab92
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/style-src/style-blocked.html.ini
@@ -0,0 +1,3 @@
+[style-blocked.html]
+  [document.styleSheets should contain an item for the blocked CSS.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/style-src/style-src-error-event-fires.html.ini b/tests/wpt/meta/content-security-policy/style-src/style-src-error-event-fires.html.ini
new file mode 100644
index 00000000000..e8bc14668dc
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/style-src/style-src-error-event-fires.html.ini
@@ -0,0 +1,4 @@
+[style-src-error-event-fires.html]
+  expected: TIMEOUT
+  [Test error event fires on inline style]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/style-src/style-src-inline-style-nonce-blocked-error-event.html.ini b/tests/wpt/meta/content-security-policy/style-src/style-src-inline-style-nonce-blocked-error-event.html.ini
new file mode 100644
index 00000000000..eb2f1c46fbb
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/style-src/style-src-inline-style-nonce-blocked-error-event.html.ini
@@ -0,0 +1,4 @@
+[style-src-inline-style-nonce-blocked-error-event.html]
+  expected: TIMEOUT
+  [Test that paragraph remains unmodified and error events received.]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/style-src/style-src-stylesheet-nonce-allowed.html.ini b/tests/wpt/meta/content-security-policy/style-src/style-src-stylesheet-nonce-allowed.html.ini
new file mode 100644
index 00000000000..6a653527a0b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/style-src/style-src-stylesheet-nonce-allowed.html.ini
@@ -0,0 +1,3 @@
+[style-src-stylesheet-nonce-allowed.html]
+  [Stylesheet link should load with correct nonce]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/svg/object-in-svg-foreignobject.sub.html.ini b/tests/wpt/meta/content-security-policy/svg/object-in-svg-foreignobject.sub.html.ini
new file mode 100644
index 00000000000..b6620011bb9
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/svg/object-in-svg-foreignobject.sub.html.ini
@@ -0,0 +1,4 @@
+[object-in-svg-foreignobject.sub.html]
+  expected: TIMEOUT
+  [Should throw a securitypolicyviolation]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/svg/svg-inline.sub.html.ini b/tests/wpt/meta/content-security-policy/svg/svg-inline.sub.html.ini
new file mode 100644
index 00000000000..79792113915
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/svg/svg-inline.sub.html.ini
@@ -0,0 +1,4 @@
+[svg-inline.sub.html]
+  expected: TIMEOUT
+  [Should fire violation event]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.html.ini b/tests/wpt/meta/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.html.ini
deleted file mode 100644
index d47972783e3..00000000000
--- a/tests/wpt/meta/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[eval-blocked-in-about-blank-iframe.html]
-  expected: ERROR
-  [eval-blocked-in-about-blank-iframe]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank-script-src-elem.html.ini b/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank-script-src-elem.html.ini
new file mode 100644
index 00000000000..a3d83dd566b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank-script-src-elem.html.ini
@@ -0,0 +1,3 @@
+[javascript_src_denied_missing_unsafe_hashes-href_blank-script-src-elem.html]
+  [javascript: navigation using <a href target=_blank> should be refused due to missing unsafe-hashes]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank.html.ini b/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank.html.ini
new file mode 100644
index 00000000000..c66badeaccc
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank.html.ini
@@ -0,0 +1,3 @@
+[javascript_src_denied_missing_unsafe_hashes-href_blank.html]
+  [javascript: navigation using <a href target=_blank> should be refused due to missing unsafe-hashes]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-window_open.html.ini b/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-window_open.html.ini
new file mode 100644
index 00000000000..f9f0d0de85e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-window_open.html.ini
@@ -0,0 +1,3 @@
+[javascript_src_denied_missing_unsafe_hashes-window_open.html]
+  [Test that the javascript: src is not allowed to run]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank-script-src-elem.html.ini b/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank-script-src-elem.html.ini
new file mode 100644
index 00000000000..9d3c2babe20
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank-script-src-elem.html.ini
@@ -0,0 +1,3 @@
+[javascript_src_denied_wrong_hash-href_blank-script-src-elem.html]
+  [javascript: navigation using <a href target=_blank> should be refused due to wrong hash]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank.html.ini b/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank.html.ini
new file mode 100644
index 00000000000..5253448b548
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank.html.ini
@@ -0,0 +1,3 @@
+[javascript_src_denied_wrong_hash-href_blank.html]
+  [javascript: navigation using <a href target=_blank> should be refused due to wrong hash]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-window_open.html.ini b/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-window_open.html.ini
new file mode 100644
index 00000000000..2e96e3d7594
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-window_open.html.ini
@@ -0,0 +1,3 @@
+[javascript_src_denied_wrong_hash-window_open.html]
+  [Test that the javascript: src is not allowed to run]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/wasm-unsafe-eval/default-src-blocks-wasm.any.js.ini b/tests/wpt/meta/content-security-policy/wasm-unsafe-eval/default-src-blocks-wasm.any.js.ini
index e6fefbf0518..f7eabdba90c 100644
--- a/tests/wpt/meta/content-security-policy/wasm-unsafe-eval/default-src-blocks-wasm.any.js.ini
+++ b/tests/wpt/meta/content-security-policy/wasm-unsafe-eval/default-src-blocks-wasm.any.js.ini
@@ -1,7 +1,4 @@
 [default-src-blocks-wasm.any.worker.html]
-  [default-src-blocks-wasm]
-    expected: FAIL
-
 
 [default-src-blocks-wasm.any.html]
 
diff --git a/tests/wpt/meta/content-security-policy/wasm-unsafe-eval/script-src-blocks-wasm.any.js.ini b/tests/wpt/meta/content-security-policy/wasm-unsafe-eval/script-src-blocks-wasm.any.js.ini
index e5b65e2f659..13e5909d431 100644
--- a/tests/wpt/meta/content-security-policy/wasm-unsafe-eval/script-src-blocks-wasm.any.js.ini
+++ b/tests/wpt/meta/content-security-policy/wasm-unsafe-eval/script-src-blocks-wasm.any.js.ini
@@ -2,9 +2,6 @@
   expected: ERROR
 
 [script-src-blocks-wasm.any.worker.html]
-  [script-src-blocks-wasm]
-    expected: FAIL
-
 
 [script-src-blocks-wasm.any.html]
 
diff --git a/tests/wpt/meta/content-security-policy/wasm-unsafe-eval/script-src-spv-asynch.any.js.ini b/tests/wpt/meta/content-security-policy/wasm-unsafe-eval/script-src-spv-asynch.any.js.ini
index f9ebe61a198..d0ccabd1ef8 100644
--- a/tests/wpt/meta/content-security-policy/wasm-unsafe-eval/script-src-spv-asynch.any.js.ini
+++ b/tests/wpt/meta/content-security-policy/wasm-unsafe-eval/script-src-spv-asynch.any.js.ini
@@ -7,9 +7,8 @@
 
 
 [script-src-spv-asynch.any.worker.html]
-  expected: TIMEOUT
   [Securitypolicyviolation event looks like it should]
-    expected: TIMEOUT
+    expected: FAIL
 
 
 [script-src-spv-asynch.any.serviceworker.html]
diff --git a/tests/wpt/meta/content-security-policy/webrtc/webrtc-allowed-default-src-none.html.ini b/tests/wpt/meta/content-security-policy/webrtc/webrtc-allowed-default-src-none.html.ini
new file mode 100644
index 00000000000..bda6bb22662
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/webrtc/webrtc-allowed-default-src-none.html.ini
@@ -0,0 +1,3 @@
+[webrtc-allowed-default-src-none.html]
+  [webrtc allowed with default-src 'none']
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/webrtc/webrtc-allowed-explicit.html.ini b/tests/wpt/meta/content-security-policy/webrtc/webrtc-allowed-explicit.html.ini
new file mode 100644
index 00000000000..4af6b371b85
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/webrtc/webrtc-allowed-explicit.html.ini
@@ -0,0 +1,3 @@
+[webrtc-allowed-explicit.html]
+  [webrtc allowed with an explicit webrtc allowed policy]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/webrtc/webrtc-allowed-nopolicy.html.ini b/tests/wpt/meta/content-security-policy/webrtc/webrtc-allowed-nopolicy.html.ini
new file mode 100644
index 00000000000..c5df58eec7d
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/webrtc/webrtc-allowed-nopolicy.html.ini
@@ -0,0 +1,3 @@
+[webrtc-allowed-nopolicy.html]
+  [webrtc allowed with no policy]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/webrtc/webrtc-blocked-explicit.html.ini b/tests/wpt/meta/content-security-policy/webrtc/webrtc-blocked-explicit.html.ini
new file mode 100644
index 00000000000..08f9839e5db
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/webrtc/webrtc-blocked-explicit.html.ini
@@ -0,0 +1,3 @@
+[webrtc-blocked-explicit.html]
+  [webrtc blocked with an explicit webrtc blocked policy]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/webrtc/webrtc-blocked-unknown.html.ini b/tests/wpt/meta/content-security-policy/webrtc/webrtc-blocked-unknown.html.ini
new file mode 100644
index 00000000000..8ac24260a7b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/webrtc/webrtc-blocked-unknown.html.ini
@@ -0,0 +1,3 @@
+[webrtc-blocked-unknown.html]
+  [webrtc blocked with an unrecognized explicit webrtc policy]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/worker-src/dedicated-none.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/dedicated-none.sub.html.ini
new file mode 100644
index 00000000000..33e648d1faa
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/dedicated-none.sub.html.ini
@@ -0,0 +1,7 @@
+[dedicated-none.sub.html]
+  expected: TIMEOUT
+  [Same-origin dedicated worker blocked by host-source expression.]
+    expected: TIMEOUT
+
+  [blob: dedicated worker blocked by 'blob:'.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/worker-src/dedicated-worker-src-child-fallback-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/dedicated-worker-src-child-fallback-blocked.sub.html.ini
new file mode 100644
index 00000000000..84fd9e4b730
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/dedicated-worker-src-child-fallback-blocked.sub.html.ini
@@ -0,0 +1,4 @@
+[dedicated-worker-src-child-fallback-blocked.sub.html]
+  expected: TIMEOUT
+  [Same-origin dedicated worker allowed by worker-src 'self'.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/worker-src/service-child.https.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/service-child.https.sub.html.ini
new file mode 100644
index 00000000000..6b731628095
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/service-child.https.sub.html.ini
@@ -0,0 +1,4 @@
+[service-child.https.sub.html]
+  expected: TIMEOUT
+  [Same-origin service worker allowed by host-source expression.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/worker-src/service-fallback.https.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/service-fallback.https.sub.html.ini
new file mode 100644
index 00000000000..be55e35f549
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/service-fallback.https.sub.html.ini
@@ -0,0 +1,4 @@
+[service-fallback.https.sub.html]
+  expected: TIMEOUT
+  [Same-origin service worker allowed by host-source expression.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/worker-src/service-list.https.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/service-list.https.sub.html.ini
new file mode 100644
index 00000000000..2417914a0a1
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/service-list.https.sub.html.ini
@@ -0,0 +1,4 @@
+[service-list.https.sub.html]
+  expected: TIMEOUT
+  [Same-origin service worker allowed by host-source expression.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/worker-src/service-none.https.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/service-none.https.sub.html.ini
new file mode 100644
index 00000000000..30b52f38ed2
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/service-none.https.sub.html.ini
@@ -0,0 +1,3 @@
+[service-none.https.sub.html]
+  [Same-origin service worker blocked by 'none'.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/worker-src/service-self.https.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/service-self.https.sub.html.ini
new file mode 100644
index 00000000000..c9daf2455ed
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/service-self.https.sub.html.ini
@@ -0,0 +1,4 @@
+[service-self.https.sub.html]
+  expected: TIMEOUT
+  [Same-origin service worker allowed by 'self'.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/worker-src/service-worker-src-child-fallback-blocked.https.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/service-worker-src-child-fallback-blocked.https.sub.html.ini
new file mode 100644
index 00000000000..5b2d82aa71e
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/service-worker-src-child-fallback-blocked.https.sub.html.ini
@@ -0,0 +1,3 @@
+[service-worker-src-child-fallback-blocked.https.sub.html]
+  [Same-origin service worker allowed by child-src 'self'.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/worker-src/service-worker-src-child-fallback.https.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/service-worker-src-child-fallback.https.sub.html.ini
new file mode 100644
index 00000000000..6599ba16cba
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/service-worker-src-child-fallback.https.sub.html.ini
@@ -0,0 +1,4 @@
+[service-worker-src-child-fallback.https.sub.html]
+  expected: TIMEOUT
+  [Same-origin service worker allowed by child-src 'self'.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/worker-src/service-worker-src-default-fallback.https.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/service-worker-src-default-fallback.https.sub.html.ini
new file mode 100644
index 00000000000..217c1b6f1a4
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/service-worker-src-default-fallback.https.sub.html.ini
@@ -0,0 +1,4 @@
+[service-worker-src-default-fallback.https.sub.html]
+  expected: TIMEOUT
+  [Same-origin service worker allowed by default-src 'self'.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/worker-src/service-worker-src-script-fallback.https.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/service-worker-src-script-fallback.https.sub.html.ini
new file mode 100644
index 00000000000..ffcf76f5780
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/service-worker-src-script-fallback.https.sub.html.ini
@@ -0,0 +1,4 @@
+[service-worker-src-script-fallback.https.sub.html]
+  expected: TIMEOUT
+  [Same-origin service worker allowed by script-src 'self'.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/worker-src/service-worker-src-self-fallback.https.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/service-worker-src-self-fallback.https.sub.html.ini
new file mode 100644
index 00000000000..2df736dc563
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/service-worker-src-self-fallback.https.sub.html.ini
@@ -0,0 +1,4 @@
+[service-worker-src-self-fallback.https.sub.html]
+  expected: TIMEOUT
+  [Same-origin service worker allowed by worker-src 'self'.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/content-security-policy/worker-src/shared-child.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/shared-child.sub.html.ini
new file mode 100644
index 00000000000..0e5f7c2a38b
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/shared-child.sub.html.ini
@@ -0,0 +1,6 @@
+[shared-child.sub.html]
+  [Same-origin dedicated worker allowed by 'self'.]
+    expected: FAIL
+
+  [blob: dedicated worker allowed by 'blob:'.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/worker-src/shared-fallback.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/shared-fallback.sub.html.ini
new file mode 100644
index 00000000000..47f3a03406c
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/shared-fallback.sub.html.ini
@@ -0,0 +1,6 @@
+[shared-fallback.sub.html]
+  [Same-origin dedicated worker allowed by 'self'.]
+    expected: FAIL
+
+  [blob: dedicated worker allowed by 'blob:'.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/worker-src/shared-list.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/shared-list.sub.html.ini
new file mode 100644
index 00000000000..a88259b9801
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/shared-list.sub.html.ini
@@ -0,0 +1,6 @@
+[shared-list.sub.html]
+  [Same-origin dedicated worker allowed by 'self'.]
+    expected: FAIL
+
+  [blob: dedicated worker allowed by 'blob:'.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/worker-src/shared-none.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/shared-none.sub.html.ini
new file mode 100644
index 00000000000..dd44f6df2ff
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/shared-none.sub.html.ini
@@ -0,0 +1,6 @@
+[shared-none.sub.html]
+  [Same-origin shared worker blocked by 'none'.]
+    expected: FAIL
+
+  [blob: shared worker blocked by 'none'.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/worker-src/shared-self.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/shared-self.sub.html.ini
new file mode 100644
index 00000000000..9b929e77ef7
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/shared-self.sub.html.ini
@@ -0,0 +1,3 @@
+[shared-self.sub.html]
+  [Same-origin dedicated worker allowed by 'self'.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/worker-src/shared-worker-src-child-fallback-blocked.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/shared-worker-src-child-fallback-blocked.sub.html.ini
new file mode 100644
index 00000000000..999f7606838
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/shared-worker-src-child-fallback-blocked.sub.html.ini
@@ -0,0 +1,3 @@
+[shared-worker-src-child-fallback-blocked.sub.html]
+  [Same-origin shared worker allowed by child-src 'self'.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/worker-src/shared-worker-src-child-fallback.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/shared-worker-src-child-fallback.sub.html.ini
new file mode 100644
index 00000000000..e1fc9f7f652
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/shared-worker-src-child-fallback.sub.html.ini
@@ -0,0 +1,3 @@
+[shared-worker-src-child-fallback.sub.html]
+  [Same-origin shared worker allowed by child-src 'self'.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/worker-src/shared-worker-src-default-fallback.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/shared-worker-src-default-fallback.sub.html.ini
new file mode 100644
index 00000000000..901cce76a88
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/shared-worker-src-default-fallback.sub.html.ini
@@ -0,0 +1,3 @@
+[shared-worker-src-default-fallback.sub.html]
+  [Same-origin shared worker allowed by default-src 'self'.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/worker-src/shared-worker-src-script-fallback.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/shared-worker-src-script-fallback.sub.html.ini
new file mode 100644
index 00000000000..4225fd25173
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/shared-worker-src-script-fallback.sub.html.ini
@@ -0,0 +1,3 @@
+[shared-worker-src-script-fallback.sub.html]
+  [Same-origin shared worker allowed by script-src 'self'.]
+    expected: FAIL
diff --git a/tests/wpt/meta/content-security-policy/worker-src/shared-worker-src-self-fallback.sub.html.ini b/tests/wpt/meta/content-security-policy/worker-src/shared-worker-src-self-fallback.sub.html.ini
new file mode 100644
index 00000000000..427dbde5fe5
--- /dev/null
+++ b/tests/wpt/meta/content-security-policy/worker-src/shared-worker-src-self-fallback.sub.html.ini
@@ -0,0 +1,3 @@
+[shared-worker-src-self-fallback.sub.html]
+  [Same-origin shared worker allowed by worker-src 'self'.]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/CSS2/linebox/animations/line-height-interpolation.html.ini b/tests/wpt/meta/css/CSS2/linebox/animations/line-height-interpolation.html.ini
index 7d12899961b..436384ff8d4 100644
--- a/tests/wpt/meta/css/CSS2/linebox/animations/line-height-interpolation.html.ini
+++ b/tests/wpt/meta/css/CSS2/linebox/animations/line-height-interpolation.html.ini
@@ -412,3 +412,36 @@
 
   [CSS Transitions: property <line-height> from [14q\] to [normal\] at (0.3) should be [14q\]]
     expected: FAIL
+
+  [Web Animations: property <line-height> from [1\] to [200%\] at (-0.3) should be [1\]]
+    expected: FAIL
+
+  [Web Animations: property <line-height> from [1\] to [200%\] at (0) should be [1\]]
+    expected: FAIL
+
+  [Web Animations: property <line-height> from [1\] to [200%\] at (0.3) should be [1\]]
+    expected: FAIL
+
+  [Web Animations: property <line-height> from [1\] to [200%\] at (0.5) should be [200%\]]
+    expected: FAIL
+
+  [Web Animations: property <line-height> from [1\] to [200%\] at (0.6) should be [200%\]]
+    expected: FAIL
+
+  [Web Animations: property <line-height> from [1\] to [200%\] at (1) should be [200%\]]
+    expected: FAIL
+
+  [Web Animations: property <line-height> from [1\] to [200%\] at (1.5) should be [200%\]]
+    expected: FAIL
+
+  [Web Animations: property <line-height> from [100%\] to [200%\] at (0) should be [100%\]]
+    expected: FAIL
+
+  [Web Animations: property <line-height> from [100%\] to [200%\] at (0.3) should be [130%\]]
+    expected: FAIL
+
+  [Web Animations: property <line-height> from [100%\] to [200%\] at (0.6) should be [160%\]]
+    expected: FAIL
+
+  [Web Animations: property <line-height> from [100%\] to [200%\] at (1) should be [200%\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/compositing/root-element-background-margin-opacity.html.ini b/tests/wpt/meta/css/compositing/root-element-background-margin-opacity.html.ini
new file mode 100644
index 00000000000..bc87205da82
--- /dev/null
+++ b/tests/wpt/meta/css/compositing/root-element-background-margin-opacity.html.ini
@@ -0,0 +1,2 @@
+[root-element-background-margin-opacity.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/__dir__.ini b/tests/wpt/meta/css/css-align/__dir__.ini
deleted file mode 100644
index bd1bf899085..00000000000
--- a/tests/wpt/meta/css/css-align/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-prefs: ["layout_columns_enabled:true", "layout_flexbox_enabled:true"]
diff --git a/tests/wpt/meta/css/css-align/abspos/align-items-static-position.html.ini b/tests/wpt/meta/css/css-align/abspos/align-items-static-position.html.ini
deleted file mode 100644
index 4dfc54b41ab..00000000000
--- a/tests/wpt/meta/css/css-align/abspos/align-items-static-position.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[align-items-static-position.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/abspos/align-self-static-position-001.html.ini b/tests/wpt/meta/css/css-align/abspos/align-self-static-position-001.html.ini
new file mode 100644
index 00000000000..6937145efa4
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/abspos/align-self-static-position-001.html.ini
@@ -0,0 +1,2 @@
+[align-self-static-position-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/abspos/align-self-static-position-002.html.ini b/tests/wpt/meta/css/css-align/abspos/align-self-static-position-002.html.ini
new file mode 100644
index 00000000000..99090212432
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/abspos/align-self-static-position-002.html.ini
@@ -0,0 +1,2 @@
+[align-self-static-position-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/abspos/align-self-static-position-003.html.ini b/tests/wpt/meta/css/css-align/abspos/align-self-static-position-003.html.ini
new file mode 100644
index 00000000000..2f9fddf138a
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/abspos/align-self-static-position-003.html.ini
@@ -0,0 +1,2 @@
+[align-self-static-position-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/abspos/align-self-static-position-004.html.ini b/tests/wpt/meta/css/css-align/abspos/align-self-static-position-004.html.ini
new file mode 100644
index 00000000000..f268ef7e7a6
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/abspos/align-self-static-position-004.html.ini
@@ -0,0 +1,2 @@
+[align-self-static-position-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/abspos/align-self-static-position-006.html.ini b/tests/wpt/meta/css/css-align/abspos/align-self-static-position-006.html.ini
new file mode 100644
index 00000000000..07f1806f326
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/abspos/align-self-static-position-006.html.ini
@@ -0,0 +1,2 @@
+[align-self-static-position-006.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/abspos/align-self-static-position-007.html.ini b/tests/wpt/meta/css/css-align/abspos/align-self-static-position-007.html.ini
new file mode 100644
index 00000000000..d5abf6545c2
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/abspos/align-self-static-position-007.html.ini
@@ -0,0 +1,2 @@
+[align-self-static-position-007.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/abspos/align-self-static-position-008.html.ini b/tests/wpt/meta/css/css-align/abspos/align-self-static-position-008.html.ini
new file mode 100644
index 00000000000..bfeba12b70e
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/abspos/align-self-static-position-008.html.ini
@@ -0,0 +1,2 @@
+[align-self-static-position-008.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/abspos/align-self-stretch-auto-margins-aspect-ratio.html.ini b/tests/wpt/meta/css/css-align/abspos/align-self-stretch-auto-margins-aspect-ratio.html.ini
new file mode 100644
index 00000000000..6094b40bf56
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/abspos/align-self-stretch-auto-margins-aspect-ratio.html.ini
@@ -0,0 +1,2 @@
+[align-self-stretch-auto-margins-aspect-ratio.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/abspos/align-self-stretch-auto-margins.html.ini b/tests/wpt/meta/css/css-align/abspos/align-self-stretch-auto-margins.html.ini
new file mode 100644
index 00000000000..cfef366e7b3
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/abspos/align-self-stretch-auto-margins.html.ini
@@ -0,0 +1,2 @@
+[align-self-stretch-auto-margins.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/abspos/justify-self-stretch-auto-margins-aspect-ratio.html.ini b/tests/wpt/meta/css/css-align/abspos/justify-self-stretch-auto-margins-aspect-ratio.html.ini
new file mode 100644
index 00000000000..bfba165e645
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/abspos/justify-self-stretch-auto-margins-aspect-ratio.html.ini
@@ -0,0 +1,2 @@
+[justify-self-stretch-auto-margins-aspect-ratio.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/abspos/justify-self-stretch-auto-margins.html.ini b/tests/wpt/meta/css/css-align/abspos/justify-self-stretch-auto-margins.html.ini
new file mode 100644
index 00000000000..75934b08795
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/abspos/justify-self-stretch-auto-margins.html.ini
@@ -0,0 +1,2 @@
+[justify-self-stretch-auto-margins.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/baseline-rules/synthesized-baseline-grid-001.html.ini b/tests/wpt/meta/css/css-align/baseline-rules/synthesized-baseline-grid-001.html.ini
index 13d43e6f316..e51d46cb18e 100644
--- a/tests/wpt/meta/css/css-align/baseline-rules/synthesized-baseline-grid-001.html.ini
+++ b/tests/wpt/meta/css/css-align/baseline-rules/synthesized-baseline-grid-001.html.ini
@@ -1,10 +1,4 @@
 [synthesized-baseline-grid-001.html]
-  [.wrapper 1]
-    expected: FAIL
-
-  [.wrapper 2]
-    expected: FAIL
-
   [.wrapper 4]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-align/blocks/justify-self-auto-margins-2.html.ini b/tests/wpt/meta/css/css-align/blocks/justify-self-auto-margins-2.html.ini
new file mode 100644
index 00000000000..046c147dc0b
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/blocks/justify-self-auto-margins-2.html.ini
@@ -0,0 +1,2 @@
+[justify-self-auto-margins-2.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/justify-self-block-in-inline.html.ini b/tests/wpt/meta/css/css-align/blocks/justify-self-block-in-inline.html.ini
deleted file mode 100644
index f46e4cb70e6..00000000000
--- a/tests/wpt/meta/css/css-align/blocks/justify-self-block-in-inline.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[justify-self-block-in-inline.html]
-  [.block-in-inline 1]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/justify-self-htb-ltr-htb.html.ini b/tests/wpt/meta/css/css-align/blocks/justify-self-htb-ltr-htb.html.ini
deleted file mode 100644
index 09cc50092f7..00000000000
--- a/tests/wpt/meta/css/css-align/blocks/justify-self-htb-ltr-htb.html.ini
+++ /dev/null
@@ -1,42 +0,0 @@
-[justify-self-htb-ltr-htb.html]
-  [.item 1]
-    expected: FAIL
-
-  [.item 2]
-    expected: FAIL
-
-  [.item 3]
-    expected: FAIL
-
-  [.item 4]
-    expected: FAIL
-
-  [.item 5]
-    expected: FAIL
-
-  [.item 6]
-    expected: FAIL
-
-  [.item 7]
-    expected: FAIL
-
-  [.item 9]
-    expected: FAIL
-
-  [.item 10]
-    expected: FAIL
-
-  [.item 11]
-    expected: FAIL
-
-  [.item 12]
-    expected: FAIL
-
-  [.item 13]
-    expected: FAIL
-
-  [.item 14]
-    expected: FAIL
-
-  [.item 15]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/justify-self-htb-ltr-vlr.html.ini b/tests/wpt/meta/css/css-align/blocks/justify-self-htb-ltr-vlr.html.ini
index 91b531b8c25..e299569c1f9 100644
--- a/tests/wpt/meta/css/css-align/blocks/justify-self-htb-ltr-vlr.html.ini
+++ b/tests/wpt/meta/css/css-align/blocks/justify-self-htb-ltr-vlr.html.ini
@@ -1,42 +1,6 @@
 [justify-self-htb-ltr-vlr.html]
-  [.item 1]
-    expected: FAIL
-
-  [.item 2]
-    expected: FAIL
-
-  [.item 3]
-    expected: FAIL
-
-  [.item 4]
-    expected: FAIL
-
-  [.item 5]
-    expected: FAIL
-
-  [.item 6]
-    expected: FAIL
-
-  [.item 7]
-    expected: FAIL
-
-  [.item 9]
-    expected: FAIL
-
-  [.item 10]
-    expected: FAIL
-
-  [.item 11]
-    expected: FAIL
-
   [.item 12]
     expected: FAIL
 
   [.item 13]
     expected: FAIL
-
-  [.item 14]
-    expected: FAIL
-
-  [.item 15]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/justify-self-htb-ltr-vrl.html.ini b/tests/wpt/meta/css/css-align/blocks/justify-self-htb-ltr-vrl.html.ini
index f67f288e230..bce83361fd5 100644
--- a/tests/wpt/meta/css/css-align/blocks/justify-self-htb-ltr-vrl.html.ini
+++ b/tests/wpt/meta/css/css-align/blocks/justify-self-htb-ltr-vrl.html.ini
@@ -1,42 +1,6 @@
 [justify-self-htb-ltr-vrl.html]
-  [.item 1]
-    expected: FAIL
-
-  [.item 2]
-    expected: FAIL
-
-  [.item 3]
-    expected: FAIL
-
   [.item 4]
     expected: FAIL
 
   [.item 5]
     expected: FAIL
-
-  [.item 6]
-    expected: FAIL
-
-  [.item 7]
-    expected: FAIL
-
-  [.item 9]
-    expected: FAIL
-
-  [.item 10]
-    expected: FAIL
-
-  [.item 11]
-    expected: FAIL
-
-  [.item 12]
-    expected: FAIL
-
-  [.item 13]
-    expected: FAIL
-
-  [.item 14]
-    expected: FAIL
-
-  [.item 15]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/justify-self-htb-rtl-htb.html.ini b/tests/wpt/meta/css/css-align/blocks/justify-self-htb-rtl-htb.html.ini
deleted file mode 100644
index 06c734facf2..00000000000
--- a/tests/wpt/meta/css/css-align/blocks/justify-self-htb-rtl-htb.html.ini
+++ /dev/null
@@ -1,42 +0,0 @@
-[justify-self-htb-rtl-htb.html]
-  [.item 1]
-    expected: FAIL
-
-  [.item 2]
-    expected: FAIL
-
-  [.item 3]
-    expected: FAIL
-
-  [.item 4]
-    expected: FAIL
-
-  [.item 5]
-    expected: FAIL
-
-  [.item 6]
-    expected: FAIL
-
-  [.item 7]
-    expected: FAIL
-
-  [.item 9]
-    expected: FAIL
-
-  [.item 10]
-    expected: FAIL
-
-  [.item 11]
-    expected: FAIL
-
-  [.item 12]
-    expected: FAIL
-
-  [.item 13]
-    expected: FAIL
-
-  [.item 14]
-    expected: FAIL
-
-  [.item 15]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/justify-self-htb-rtl-vlr.html.ini b/tests/wpt/meta/css/css-align/blocks/justify-self-htb-rtl-vlr.html.ini
index f1cd616a3ce..a8bb4abda0f 100644
--- a/tests/wpt/meta/css/css-align/blocks/justify-self-htb-rtl-vlr.html.ini
+++ b/tests/wpt/meta/css/css-align/blocks/justify-self-htb-rtl-vlr.html.ini
@@ -1,42 +1,6 @@
 [justify-self-htb-rtl-vlr.html]
-  [.item 1]
-    expected: FAIL
-
-  [.item 2]
-    expected: FAIL
-
-  [.item 3]
-    expected: FAIL
-
-  [.item 4]
-    expected: FAIL
-
-  [.item 5]
-    expected: FAIL
-
-  [.item 6]
-    expected: FAIL
-
-  [.item 7]
-    expected: FAIL
-
-  [.item 9]
-    expected: FAIL
-
-  [.item 10]
-    expected: FAIL
-
-  [.item 11]
-    expected: FAIL
-
   [.item 12]
     expected: FAIL
 
   [.item 13]
     expected: FAIL
-
-  [.item 14]
-    expected: FAIL
-
-  [.item 15]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/justify-self-htb-rtl-vrl.html.ini b/tests/wpt/meta/css/css-align/blocks/justify-self-htb-rtl-vrl.html.ini
index e4df4202cb0..be0e1f9db72 100644
--- a/tests/wpt/meta/css/css-align/blocks/justify-self-htb-rtl-vrl.html.ini
+++ b/tests/wpt/meta/css/css-align/blocks/justify-self-htb-rtl-vrl.html.ini
@@ -1,42 +1,6 @@
 [justify-self-htb-rtl-vrl.html]
-  [.item 1]
-    expected: FAIL
-
-  [.item 2]
-    expected: FAIL
-
-  [.item 3]
-    expected: FAIL
-
   [.item 4]
     expected: FAIL
 
   [.item 5]
     expected: FAIL
-
-  [.item 6]
-    expected: FAIL
-
-  [.item 7]
-    expected: FAIL
-
-  [.item 9]
-    expected: FAIL
-
-  [.item 10]
-    expected: FAIL
-
-  [.item 11]
-    expected: FAIL
-
-  [.item 12]
-    expected: FAIL
-
-  [.item 13]
-    expected: FAIL
-
-  [.item 14]
-    expected: FAIL
-
-  [.item 15]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/justify-self-text-align-2.html.ini b/tests/wpt/meta/css/css-align/blocks/justify-self-text-align-2.html.ini
deleted file mode 100644
index 53ddc48d986..00000000000
--- a/tests/wpt/meta/css/css-align/blocks/justify-self-text-align-2.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[justify-self-text-align-2.html]
-  [.item 2]
-    expected: FAIL
-
-  [.item 3]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/justify-self-text-align.html.ini b/tests/wpt/meta/css/css-align/blocks/justify-self-text-align.html.ini
deleted file mode 100644
index b36a5fb8ed4..00000000000
--- a/tests/wpt/meta/css/css-align/blocks/justify-self-text-align.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[justify-self-text-align.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/safe-justify-self-htb.html.ini b/tests/wpt/meta/css/css-align/blocks/safe-justify-self-htb.html.ini
deleted file mode 100644
index bafb7a7d2c2..00000000000
--- a/tests/wpt/meta/css/css-align/blocks/safe-justify-self-htb.html.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-[safe-justify-self-htb.html]
-  [.item 7]
-    expected: FAIL
-
-  [.item 8]
-    expected: FAIL
-
-  [.item 9]
-    expected: FAIL
-
-  [.item 10]
-    expected: FAIL
-
-  [.item 11]
-    expected: FAIL
-
-  [.item 12]
-    expected: FAIL
-
-  [.item 19]
-    expected: FAIL
-
-  [.item 20]
-    expected: FAIL
-
-  [.item 21]
-    expected: FAIL
-
-  [.item 22]
-    expected: FAIL
-
-  [.item 23]
-    expected: FAIL
-
-  [.item 24]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/content-distribution/place-content-shorthand-007.html.ini b/tests/wpt/meta/css/css-align/content-distribution/place-content-shorthand-007.html.ini
deleted file mode 100644
index 44072ffa642..00000000000
--- a/tests/wpt/meta/css/css-align/content-distribution/place-content-shorthand-007.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[place-content-shorthand-007.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/gaps/gap-normal-used-001.html.ini b/tests/wpt/meta/css/css-align/gaps/gap-normal-used-001.html.ini
deleted file mode 100644
index ee237180c71..00000000000
--- a/tests/wpt/meta/css/css-align/gaps/gap-normal-used-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[gap-normal-used-001.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/animate-with-background-color-oklch-001.html.ini b/tests/wpt/meta/css/css-animations/animate-with-background-color-oklch-001.html.ini
new file mode 100644
index 00000000000..18f732010f3
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/animate-with-background-color-oklch-001.html.ini
@@ -0,0 +1,2 @@
+[animate-with-background-color-oklch-001.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-animations/animate-with-background-color-oklch-002.html.ini b/tests/wpt/meta/css/css-animations/animate-with-background-color-oklch-002.html.ini
new file mode 100644
index 00000000000..6a465429bf8
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/animate-with-background-color-oklch-002.html.ini
@@ -0,0 +1,6 @@
+[animate-with-background-color-oklch-002.html]
+  [Animate from legacy rgb to oklch]
+    expected: FAIL
+
+  [Animate from legacy rgb to color-mix oklch]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/crashtests/chrome-bug-404743651.html.ini b/tests/wpt/meta/css/css-animations/crashtests/chrome-bug-404743651.html.ini
new file mode 100644
index 00000000000..d99d36b7a59
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/crashtests/chrome-bug-404743651.html.ini
@@ -0,0 +1,2 @@
+[chrome-bug-404743651.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html.ini
index 3e054c75da9..52cc6e10603 100644
--- a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html.ini
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html.ini
@@ -79,3 +79,6 @@
 
   [Property animation-trigger-exit-range-end value 'exit']
     expected: FAIL
+
+  [Property animation-trigger-exit-range-end value 'auto']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html.ini
index d7a2b6934f9..dcf9339c181 100644
--- a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html.ini
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html.ini
@@ -70,3 +70,6 @@
 
   [e.style['animation-trigger-exit-range-end'\] = "exit" should set the property value]
     expected: FAIL
+
+  [e.style['animation-trigger-exit-range-end'\] = "auto" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html.ini
index 27bdc461c08..74f3c9713b3 100644
--- a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html.ini
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html.ini
@@ -316,3 +316,54 @@
 
   [e.style['animation-trigger-exit-range'\] = "10%" should not set unrelated longhands]
     expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "auto auto" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "cover auto" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "cover 10% auto" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "auto cover" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "auto cover 90%" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal auto" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "auto normal" should set the property value]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "auto" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "auto" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "auto" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal auto" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal auto" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "normal auto" should not set unrelated longhands]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "auto normal" should set animation-trigger-exit-range-end]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "auto normal" should set animation-trigger-exit-range-start]
+    expected: FAIL
+
+  [e.style['animation-trigger-exit-range'\] = "auto normal" should not set unrelated longhands]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html.ini
index d8aa4b5aca5..1f631fd7158 100644
--- a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html.ini
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html.ini
@@ -79,3 +79,6 @@
 
   [Property animation-trigger-exit-range-start value 'exit']
     expected: FAIL
+
+  [Property animation-trigger-exit-range-start value 'auto']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html.ini b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html.ini
index fbac72e6ce1..fae3be352a7 100644
--- a/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html.ini
+++ b/tests/wpt/meta/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html.ini
@@ -73,3 +73,6 @@
 
   [e.style['animation-trigger-exit-range-start'\] = "cover calc(sign(100em - 1px) * 1%)" should set the property value]
     expected: FAIL
+
+  [e.style['animation-trigger-exit-range-start'\] = "auto" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-animations/parsing/keyframe-selectors.html.ini b/tests/wpt/meta/css/css-animations/parsing/keyframe-selectors.html.ini
new file mode 100644
index 00000000000..c8555cba39d
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/parsing/keyframe-selectors.html.ini
@@ -0,0 +1,6 @@
+[keyframe-selectors.html]
+  ['entry 10%' should be a valid keyframe selector]
+    expected: FAIL
+
+  ['exit 60%' should be a valid keyframe selector]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-backgrounds/background-image-shared-stylesheet.html.ini b/tests/wpt/meta/css/css-backgrounds/background-image-shared-stylesheet.html.ini
deleted file mode 100644
index c4d14766411..00000000000
--- a/tests/wpt/meta/css/css-backgrounds/background-image-shared-stylesheet.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-image-shared-stylesheet.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-any.html.ini b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-any.html.ini
deleted file mode 100644
index f1903acb386..00000000000
--- a/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-any.html.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-[corner-shape-any.html?corner-shape=superellipse(5.2)&border-radius=40%]
-  expected: FAIL
-
-[corner-shape-any.html?corner-bottom-right-shape=superellipse(1.9)&border-bottom-right-radius=50%]
-  expected: FAIL
-
-[corner-shape-any.html?corner-shape=squircle&border-radius=50%]
-  expected: FAIL
-
-[corner-shape-any.html?corner-shape=straight&border-bottom-leftradius=5px]
-  expected: FAIL
-
-[corner-shape-any.html?corner-bottom-left-shape=bevel&border-bottom-left-radius=30px]
-  expected: FAIL
-
-[corner-shape-any.html?corner-top-left-shape=scoop&corner-top-right-shape=scoop&border-radius=50%]
-  expected: FAIL
-
-[corner-shape-any.html?corner-shape=squircle&border-top-left-radius=30%]
-  expected: FAIL
-
-[corner-shape-any.html?corner-top-right-shape=superellipse(0.1)&border-top-right-radius=50px]
-  expected: FAIL
-
-[corner-shape-any.html?corner-shape=superellipse(8)&border-top-right-radius=33px]
-  expected: FAIL
-
-[corner-shape-any.html?corner-shape=squircle&border-top-right-radius=30px]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter-overflow.html.ini b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter-overflow.html.ini
new file mode 100644
index 00000000000..71b9b5bd6fd
--- /dev/null
+++ b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter-overflow.html.ini
@@ -0,0 +1,2 @@
+[corner-shape-backdrop-filter-overflow.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter.html.ini b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter.html.ini
new file mode 100644
index 00000000000..fc97efe37f1
--- /dev/null
+++ b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter.html.ini
@@ -0,0 +1,2 @@
+[corner-shape-backdrop-filter.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-inset-shadow.html.ini b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-inset-shadow.html.ini
new file mode 100644
index 00000000000..c07e175364d
--- /dev/null
+++ b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-inset-shadow.html.ini
@@ -0,0 +1,2 @@
+[corner-shape-inset-shadow.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-interpolation.html.ini b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-interpolation.html.ini
new file mode 100644
index 00000000000..7ef6ee39ddf
--- /dev/null
+++ b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-interpolation.html.ini
@@ -0,0 +1,1344 @@
+[corner-shape-interpolation.html]
+  [CSS Transitions: property <corner-top-left-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [round\] to [bevel\] at (-0.3) should be [superellipse(1.4)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [round\] to [bevel\] at (0) should be [round\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [round\] to [bevel\] at (0.6) should be [superellipse(0.36)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [round\] to [bevel\] at (1) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [round\] to [bevel\] at (1.5) should be [superellipse(-0.46)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (-0.3) should be [superellipse(1.91)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (0) should be [round\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (0.6) should be [superellipse(-0.18)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [initial\] to [scoop\] at (1.5) should be [superellipse(-2.95)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [inherit\] to [squircle\] at (-0.3) should be [superellipse(-0.45)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [inherit\] to [squircle\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [inherit\] to [squircle\] at (0.6) should be [superellipse(0.98)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [inherit\] to [squircle\] at (1) should be [squircle\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [inherit\] to [squircle\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [inherit\] to [squircle\] at (-0.3) should be [superellipse(-0.45)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [inherit\] to [squircle\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [inherit\] to [squircle\] at (0.6) should be [superellipse(0.98)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [inherit\] to [squircle\] at (1) should be [squircle\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [inherit\] to [squircle\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [inherit\] to [squircle\] at (-0.3) should be [superellipse(-0.45)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [inherit\] to [squircle\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [inherit\] to [squircle\] at (0.6) should be [superellipse(0.98)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [inherit\] to [squircle\] at (1) should be [squircle\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [inherit\] to [squircle\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [inherit\] to [squircle\] at (-0.3) should be [superellipse(-0.45)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [inherit\] to [squircle\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [inherit\] to [squircle\] at (0.6) should be [superellipse(0.98)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [inherit\] to [squircle\] at (1) should be [squircle\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [inherit\] to [squircle\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [inherit\] to [square\] at (-0.3) should be [superellipse(-0.69)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [inherit\] to [square\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [inherit\] to [square\] at (0.6) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [inherit\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [inherit\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [inherit\] to [square\] at (-0.3) should be [superellipse(-0.69)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [inherit\] to [square\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [inherit\] to [square\] at (0.6) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [inherit\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [inherit\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [inherit\] to [square\] at (-0.3) should be [superellipse(-0.69)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [inherit\] to [square\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [inherit\] to [square\] at (0.6) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [inherit\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [inherit\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [inherit\] to [square\] at (-0.3) should be [superellipse(-0.69)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [inherit\] to [square\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [inherit\] to [square\] at (0.6) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [inherit\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [inherit\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (-0.3) should be [superellipse(0.27)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (0.6) should be [superellipse(-0.56)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (1.5) should be [superellipse(-1.72)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (-0.3) should be [superellipse(0.27)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (0.6) should be [superellipse(-0.56)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (1.5) should be [superellipse(-1.72)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (-0.3) should be [superellipse(0.27)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (0.6) should be [superellipse(-0.56)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (1.5) should be [superellipse(-1.72)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (-0.3) should be [superellipse(0.27)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (0.6) should be [superellipse(-0.56)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (1) should be [scoop\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [inherit\] to [scoop\] at (1.5) should be [superellipse(-1.72)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (-0.3) should be [superellipse(0.69)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (0.6) should be [superellipse(-1.64)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (1) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (1.5) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (-0.3) should be [superellipse(0.69)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (0.6) should be [superellipse(-1.64)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (1) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (1.5) should be [notch\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (-0.3) should be [superellipse(0.69)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (0.6) should be [superellipse(-1.64)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (1) should be [notch\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (1.5) should be [notch\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (-0.3) should be [superellipse(0.69)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (0) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (0.6) should be [superellipse(-1.64)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (1) should be [notch\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [inherit\] to [notch\] at (1.5) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [notch\] to [square\] at (-0.3) should be [notch\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [notch\] to [square\] at (0) should be [notch\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [notch\] to [square\] at (0.5) should be [bevel\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [notch\] to [square\] at (0.8) should be [superellipse(1.64)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [notch\] to [square\] at (1) should be [square\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [notch\] to [square\] at (1.5) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-top-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-right-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [CSS Animations: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (-0.3) should be [square\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0) should be [superellipse(3)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.5) should be [superellipse(0.16)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (0.8) should be [superellipse(-0.9)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1) should be [superellipse(-2)\]]
+    expected: FAIL
+
+  [Web Animations: property <corner-bottom-left-shape> from [superellipse(3)\] to [superellipse(-2)\] at (1.1) should be [superellipse(-2.99)\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html.ini b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html.ini
new file mode 100644
index 00000000000..11dc161d87a
--- /dev/null
+++ b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html.ini
@@ -0,0 +1,80 @@
+[corner-shape-render-fuzzy.html?corner-shape=scoop&border-radius=20%&border-width=20px&border-top-color=rebeccapurple&border-bottom-color=blue]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-top-left-shape=superellipse(6)&border-radius=20%&border-width=10px]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-shape=superellipse(40)&border-radius=20%&border-width=20px]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-top-left-shape=superellipse(0.3)&border-radius=40%]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-top-left-shape=scoop&corner-top-right-shape=scoop&border-radius=50%]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-top-left-shape=notch&border-radius=40px&border-width=10px&border-color=blue&border-left-color=yellow]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-shape=superellipse(0.25)&border-radius=20%&border-width=20px]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-shape=scoop&border-radius=20%&border-width=20px]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-shape=squircle&border-radius=25%&border-width=20px]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-shape=squircle&border-radius=50%]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-top-left-shape=bevel&corner-bottom-right-shape=bevel&border-radius=40px&border-width=10px]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-top-right-shape=scoop&border-radius=20%&border-width=10px]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-shape=superellipse(1.8)&border-radius=40px&border-width=10px&border-left-color=purple]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-shape=superellipse(0.05)&border-radius=20%&border-width=20px]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-shape=squircle&border-radius=25%&box-shadow=10px 10px 0 10px black]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-top-left-shape=bevel&border-radius=40px&border-width=10px]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-shape=superellipse(3)&border-radius=40px&box-shadow=10px 10px 0 10px black]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-shape=superellipse(-7)&border-radius=20%&border-width=20px]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-top-left-shape=superellipse(-4)&border-radius=40%]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?border-radius=40%&corner-shape=notch&box-shadow=10px%2010px%200%2010px%20yellow]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-shape=superellipse(-2)&border-radius=20%&border-width=20px]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?border-radius=30%&corner-shape=superellipse(-1.5)&box-shadow=10px%2010px%200%2010px%20black]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-shape=superellipse(5)&border-radius=20%&border-width=20px]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-top-left-shape=superellipse(2.5)&border-radius=20%&border-width=10px]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?corner-shape=superellipse(0.8)&border-radius=40px&border-width=10px&border-left-color=purple]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?border-radius=50%&corner-top-left-shape=scoop&corner-bottom-right-shape=scoop&corner-top-right-shape=notch&corner-bottom-left-shape=notch&border-width=10px]
+  expected: FAIL
+
+[corner-shape-render-fuzzy.html?border-radius=50%&corner-top-right-shape=scoop&corner-bottom-left-shape=scoop&corner-top-left-shape=notch&corner-bottom-right-shape=notch&border-width=10px]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-render-precise.html.ini b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-render-precise.html.ini
new file mode 100644
index 00000000000..68682a3e807
--- /dev/null
+++ b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-render-precise.html.ini
@@ -0,0 +1,92 @@
+[corner-shape-render-precise.html?corner-top-left-shape=superellipse(0.8)&border-radius=40px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-shape=squircle&border-top-right-radius=30px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-shape=squircle&border-top-left-radius=30%]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-shape=superellipse(5.2)&border-radius=40%]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-top-right-shape=superellipse(0.1)&border-top-right-radius=50px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-top-left-shape=scoop&border-radius=40px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-shape=squircle&border-top-left-radius=25%&border-width=10px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-shape=straight&border-bottom-left-radius=5px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-bottom-right-shape=bevel&border-width=10px&border-radius=20px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-bottom-right-shape=superellipse(1.9)&border-bottom-right-radius=50%]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-bottom-left-shape=bevel&border-width=10px&border-radius=20px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-shape=superellipse(8)&border-top-right-radius=33px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-top-left-shape=bevel&border-width=10px&border-color=black]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-bottom-right-shape=bevel&corner-bottom-left-shape=bevel]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-shape=superellipse(8)&border-radius=10px&box-shadow=10px 10px 0 10px black]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-top-left-shape=superellipse(0.2)&border-radius=40px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-bottom-left-shape=bevel&border-bottom-left-radius=30px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-top-left-shape=superellipse(1.2)&border-radius=40px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-top-right-shape=bevel&border-width=10px&border-color=black]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-top-left-shape=bevel&border-radius=40px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-bottom-right-shape=superellipse(0.8)&border-bottom-right-radius=50%]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-top-left-shape=superellipse(0.5)&border-radius=40px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-shape=square&border-bottom-left-radius=5px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-top-left-shape=superellipse(-0.5)&border-radius=40px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-shape=superellipse(3)&border-top-right-radius=33px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-top-left-shape=superellipse(-4)&border-radius=40px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-shape=superellipse(2.3)&border-radius=40%]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-top-right-shape=superellipse(-4)&border-top-right-radius=50px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?border-radius=50%&corner-shape=bevel&box-shadow=10px%2010px%200%2010px%20black]
+  expected: FAIL
+
+[corner-shape-render-precise.html?border-top-left-radius=50%&corner-shape=superellipse(0.7)&border-left-width=30px&border-top-width=30px]
+  expected: FAIL
+
+[corner-shape-render-precise.html?corner-shape=superellipse(-2)&border-top-left-radius=40%&border-width=20px]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-render.html.ini b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-render.html.ini
deleted file mode 100644
index cdeb8243f40..00000000000
--- a/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-render.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[corner-shape-render.html?corner-bottom-left-shape=bevel]
-  expected: FAIL
-
-[corner-shape-render.html?corner-top-left-shape=bevel]
-  expected: FAIL
-
-[corner-shape-render.html?corner-bottom-right-shape=bevel&corner-bottom-left-shape=bevel]
-  expected: FAIL
-
-[corner-shape-render.html?corner-bottom-right-shape=bevel]
-  expected: FAIL
-
-[corner-shape-render.html?corner-top-right-shape=bevel&corner-bottom-right-shape=bevel&border-radius=80px]
-  expected: FAIL
-
-[corner-shape-render.html?corner-top-right-shape=bevel&corner-bottom-right-shape=bevel&border-bottom-right-radius=80px&border-width=32px]
-  expected: FAIL
-
-[corner-shape-render.html?corner-top-left-shape=bevel&border-radius=40px]
-  expected: FAIL
-
-[corner-shape-render.html?corner-shape=bevel]
-  expected: FAIL
-
-[corner-shape-render.html?corner-top-right-shape=bevel]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-square.html.ini b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-square.html.ini
new file mode 100644
index 00000000000..e9b1a330d2b
--- /dev/null
+++ b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-square.html.ini
@@ -0,0 +1,2 @@
+[corner-shape-square.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-straight.html.ini b/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-straight.html.ini
deleted file mode 100644
index 98a7e9f1256..00000000000
--- a/tests/wpt/meta/css/css-borders/tentative/corner-shape/corner-shape-straight.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[corner-shape-straight.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-borders/tentative/parsing/corner-shape-computed.html.ini b/tests/wpt/meta/css/css-borders/tentative/parsing/corner-shape-computed.html.ini
index 83214054c53..948a4ec2e2b 100644
--- a/tests/wpt/meta/css/css-borders/tentative/parsing/corner-shape-computed.html.ini
+++ b/tests/wpt/meta/css/css-borders/tentative/parsing/corner-shape-computed.html.ini
@@ -88,3 +88,27 @@
 
   [Property corner-shape value 'superellipse(0.5) superellipse(3) superellipse(1) superellipse(infinity)']
     expected: FAIL
+
+  [Property corner-top-left-shape value 'superellipse(-infinity)']
+    expected: FAIL
+
+  [Property corner-top-left-shape value 'superellipse( -1)']
+    expected: FAIL
+
+  [Property corner-shape value 'superellipse(-5) superellipse(3) superellipse(7) superellipse(-5.5)']
+    expected: FAIL
+
+  [Property corner-shape value 'bevel superellipse(1)']
+    expected: FAIL
+
+  [Property corner-shape value 'superellipse(-1) superellipse(3) square']
+    expected: FAIL
+
+  [Property corner-shape value 'superellipse(-1) superellipse(3) superellipse(0)']
+    expected: FAIL
+
+  [Property corner-shape value 'bevel superellipse(1) squircle     round']
+    expected: FAIL
+
+  [Property corner-shape value 'superellipse(-1) superellipse(3) superellipse(0) superellipse(infinity)']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-borders/tentative/parsing/corner-shape-valid.html.ini b/tests/wpt/meta/css/css-borders/tentative/parsing/corner-shape-valid.html.ini
index e26a4c8d4ab..42caaaf6781 100644
--- a/tests/wpt/meta/css/css-borders/tentative/parsing/corner-shape-valid.html.ini
+++ b/tests/wpt/meta/css/css-borders/tentative/parsing/corner-shape-valid.html.ini
@@ -376,3 +376,105 @@
 
   [e.style['corner-shape'\] = "superellipse(0.5) superellipse(3) superellipse(1) superellipse(infinity)" should set the property value]
     expected: FAIL
+
+  [e.style['corner-top-left-shape'\] = "square" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-top-left-shape'\] = "superellipse(-infinity)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-top-left-shape'\] = "superellipse(-0.5)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-top-left-shape'\] = "superellipse(-4)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-top-right-shape'\] = "square" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-top-right-shape'\] = "superellipse(-infinity)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-top-right-shape'\] = "superellipse(-0.5)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-top-right-shape'\] = "superellipse(-4)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-bottom-left-shape'\] = "square" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-bottom-left-shape'\] = "superellipse(-infinity)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-bottom-left-shape'\] = "superellipse(-0.5)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-bottom-left-shape'\] = "superellipse(-4)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-bottom-right-shape'\] = "square" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-bottom-right-shape'\] = "superellipse(-infinity)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-bottom-right-shape'\] = "superellipse(-0.5)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-bottom-right-shape'\] = "superellipse(-4)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-start-start-shape'\] = "square" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-start-start-shape'\] = "superellipse(-infinity)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-start-start-shape'\] = "superellipse(-0.5)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-start-start-shape'\] = "superellipse(-4)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-start-end-shape'\] = "square" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-start-end-shape'\] = "superellipse(-infinity)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-start-end-shape'\] = "superellipse(-0.5)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-start-end-shape'\] = "superellipse(-4)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-end-start-shape'\] = "square" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-end-start-shape'\] = "superellipse(-infinity)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-end-start-shape'\] = "superellipse(-0.5)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-end-start-shape'\] = "superellipse(-4)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-end-end-shape'\] = "square" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-end-end-shape'\] = "superellipse(-infinity)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-end-end-shape'\] = "superellipse(-0.5)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-end-end-shape'\] = "superellipse(-4)" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-shape'\] = "superellipse(0.5) superellipse(3) square" should set the property value]
+    expected: FAIL
+
+  [e.style['corner-shape'\] = "superellipse(-0.5) superellipse(3) square superellipse(-30)" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-box/parsing/margin-trim-computed.html.ini b/tests/wpt/meta/css/css-box/parsing/margin-trim-computed.html.ini
index 790872b29d0..ee2b86f6368 100644
--- a/tests/wpt/meta/css/css-box/parsing/margin-trim-computed.html.ini
+++ b/tests/wpt/meta/css/css-box/parsing/margin-trim-computed.html.ini
@@ -46,3 +46,21 @@
 
   [Property margin-trim value 'inline-start inline-end block-start']
     expected: FAIL
+
+  [Property margin-trim value 'block-start inline-start block-end inline-end']
+    expected: FAIL
+
+  [Property margin-trim value 'block-start block-end inline-end inline-start']
+    expected: FAIL
+
+  [Property margin-trim value 'block-start block-end inline-start inline-end']
+    expected: FAIL
+
+  [Property margin-trim value 'inline-start block-end block-start inline-end']
+    expected: FAIL
+
+  [Property margin-trim value 'inline-start inline-end block-start block-end']
+    expected: FAIL
+
+  [Property margin-trim value 'inline-end block-end inline-start block-start']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-box/parsing/margin-trim.html.ini b/tests/wpt/meta/css/css-box/parsing/margin-trim.html.ini
index cd977b53207..b75bfe7845a 100644
--- a/tests/wpt/meta/css/css-box/parsing/margin-trim.html.ini
+++ b/tests/wpt/meta/css/css-box/parsing/margin-trim.html.ini
@@ -43,3 +43,21 @@
 
   [e.style['margin-trim'\] = "inline-end block-end inline-start block-start" should set the property value]
     expected: FAIL
+
+  [e.style['margin-trim'\] = "block inline" should set the property value]
+    expected: FAIL
+
+  [e.style['margin-trim'\] = "inline block" should set the property value]
+    expected: FAIL
+
+  [e.style['margin-trim'\] = "block-start block-end inline-end inline-start" should set the property value]
+    expected: FAIL
+
+  [e.style['margin-trim'\] = "block-start block-end inline-start inline-end" should set the property value]
+    expected: FAIL
+
+  [e.style['margin-trim'\] = "inline-start block-end block-start inline-end" should set the property value]
+    expected: FAIL
+
+  [e.style['margin-trim'\] = "inline-start inline-end block-start block-end" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-cascade/at-scope-parsing.html.ini b/tests/wpt/meta/css/css-cascade/at-scope-parsing.html.ini
index b0d1c3d93e8..55c14a67536 100644
--- a/tests/wpt/meta/css/css-cascade/at-scope-parsing.html.ini
+++ b/tests/wpt/meta/css/css-cascade/at-scope-parsing.html.ini
@@ -76,87 +76,3 @@
 
   [@scope (> &) to (>>) is valid]
     expected: FAIL
-
-  [@scope div is not valid]
-    expected: FAIL
-
-  [@scope (.a) unknown (.c) is not valid]
-    expected: FAIL
-
-  [@scope (.a) to unknown (.c) is not valid]
-    expected: FAIL
-
-  [@scope (.a) 1px (.c) is not valid]
-    expected: FAIL
-
-  [@scope (.a) to unknown(c) is not valid]
-    expected: FAIL
-
-  [@scope unknown(.a) is not valid]
-    expected: FAIL
-
-  [@scope 1px is not valid]
-    expected: FAIL
-
-  [@scope creep is not valid]
-    expected: FAIL
-
-  [@scope ))) is not valid]
-    expected: FAIL
-
-  [@scope ( is not valid]
-    expected: FAIL
-
-  [@scope ( {} is not valid]
-    expected: FAIL
-
-  [@scope to is not valid]
-    expected: FAIL
-
-  [@scope } is not valid]
-    expected: FAIL
-
-  [@scope (.a is not valid]
-    expected: FAIL
-
-  [@scope (.a to (.b) is not valid]
-    expected: FAIL
-
-  [@scope ( to (.b) is not valid]
-    expected: FAIL
-
-  [@scope (.a) from (.c) is not valid]
-    expected: FAIL
-
-  [@scope (.c <> .d) is not valid]
-    expected: FAIL
-
-  [@scope (.a, .c <> .d) is not valid]
-    expected: FAIL
-
-  [@scope (.a <> .b, .c) is not valid]
-    expected: FAIL
-
-  [@scope (div::before) is not valid]
-    expected: FAIL
-
-  [@scope (div::after) is not valid]
-    expected: FAIL
-
-  [@scope (slotted(div)) is not valid]
-    expected: FAIL
-
-  [@scope (.a) to (div::before) is not valid]
-    expected: FAIL
-
-  [@scope (> &) to (>>) is not valid]
-    expected: FAIL
-
-  [@scope () is not valid]
-    expected: FAIL
-
-  [@scope to () is not valid]
-    expected: FAIL
-
-  [@scope () to () is not valid]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-color-hdr/computed.html.ini b/tests/wpt/meta/css/css-color-hdr/computed.html.ini
index 213629ecaad..90290faace4 100644
--- a/tests/wpt/meta/css/css-color-hdr/computed.html.ini
+++ b/tests/wpt/meta/css/css-color-hdr/computed.html.ini
@@ -115,3 +115,6 @@
 
   [Property dynamic-range-limit value 'dynamic-range-limit-mix(no-limit 10%, dynamic-range-limit-mix(standard 25%, constrained 75%) 20%, dynamic-range-limit-mix(constrained 10%, no-limit 30%) 20%)']
     expected: FAIL
+
+  [Property dynamic-range-limit value 'dynamic-range-limit-mix(standard calc(50% * sign(10em - 1px)), constrained 50%)']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-color-hdr/parsing.html.ini b/tests/wpt/meta/css/css-color-hdr/parsing.html.ini
index 0d7626461ee..e5d066f8c77 100644
--- a/tests/wpt/meta/css/css-color-hdr/parsing.html.ini
+++ b/tests/wpt/meta/css/css-color-hdr/parsing.html.ini
@@ -67,3 +67,6 @@
 
   [e.style['dynamic-range-limit'\] = "dynamic-range-limit-mix(dynamic-range-limit-mix(no-limit 1%, standard 2%) 3%, dynamic-range-limit-mix(constrained 5%, no-limit 5%) 6%)" should set the property value]
     expected: FAIL
+
+  [e.style['dynamic-range-limit'\] = "dynamic-range-limit-mix(standard calc(50% * sign(10em - 1px)), constrained 50%)" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/at-supports-selector-details-content-before.html.ini b/tests/wpt/meta/css/css-conditional/at-supports-selector-details-content-before.html.ini
new file mode 100644
index 00000000000..dfbeb3e7278
--- /dev/null
+++ b/tests/wpt/meta/css/css-conditional/at-supports-selector-details-content-before.html.ini
@@ -0,0 +1,2 @@
+[at-supports-selector-details-content-before.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/at-supports-selector-details-content.html.ini b/tests/wpt/meta/css/css-conditional/at-supports-selector-details-content.html.ini
new file mode 100644
index 00000000000..6e22bf2f1b6
--- /dev/null
+++ b/tests/wpt/meta/css/css-conditional/at-supports-selector-details-content.html.ini
@@ -0,0 +1,2 @@
+[at-supports-selector-details-content.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/at-supports-whitespace.html.ini b/tests/wpt/meta/css/css-conditional/at-supports-whitespace.html.ini
deleted file mode 100644
index f6785bccb2c..00000000000
--- a/tests/wpt/meta/css/css-conditional/at-supports-whitespace.html.ini
+++ /dev/null
@@ -1,48 +0,0 @@
-[at-supports-whitespace.html]
-  [@supports ((a)) {}]
-    expected: FAIL
-
-  [@supports ((a) ) {}]
-    expected: FAIL
-
-  [@supports ( (a)) {}]
-    expected: FAIL
-
-  [@supports ( (a) ) {}]
-    expected: FAIL
-
-  [@supports (not (a)) {}]
-    expected: FAIL
-
-  [@supports (not (a) ) {}]
-    expected: FAIL
-
-  [@supports ( not (a)) {}]
-    expected: FAIL
-
-  [@supports ( not (a) ) {}]
-    expected: FAIL
-
-  [@supports ((a) and (b)) {}]
-    expected: FAIL
-
-  [@supports ((a) and (b) ) {}]
-    expected: FAIL
-
-  [@supports ( (a) and (b)) {}]
-    expected: FAIL
-
-  [@supports ( (a) and (b) ) {}]
-    expected: FAIL
-
-  [@supports ((a) or (b)) {}]
-    expected: FAIL
-
-  [@supports ((a) or (b) ) {}]
-    expected: FAIL
-
-  [@supports ( (a) or (b)) {}]
-    expected: FAIL
-
-  [@supports ( (a) or (b) ) {}]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/animation-container-size.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/animation-container-size.html.ini
index 752af30b054..6cfab2a6592 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/animation-container-size.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/animation-container-size.html.ini
@@ -1,2 +1,3 @@
 [animation-container-size.html]
-  expected: ERROR
+  [Animation affects container query evaluation]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/animation-container-type-dynamic.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/animation-container-type-dynamic.html.ini
index 654f3e50001..61ed25e8026 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/animation-container-type-dynamic.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/animation-container-type-dynamic.html.ini
@@ -1,2 +1,3 @@
 [animation-container-type-dynamic.html]
-  expected: ERROR
+  [Animated container creating new container]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/animation-nested-animation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/animation-nested-animation.html.ini
index 3efa56c46ed..d2279442de4 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/animation-nested-animation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/animation-nested-animation.html.ini
@@ -1,2 +1,3 @@
 [animation-nested-animation.html]
-  expected: ERROR
+  [Animated container can create inner animation]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/animation-nested-transition.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/animation-nested-transition.html.ini
index 9f4156ea923..99bbd212ac2 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/animation-nested-transition.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/animation-nested-transition.html.ini
@@ -1,2 +1,3 @@
 [animation-nested-transition.html]
-  expected: ERROR
+  [Animated container size triggers transition]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/aspect-ratio-feature-evaluation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/aspect-ratio-feature-evaluation.html.ini
index 4d4382d75a2..97bfa5fb7c7 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/aspect-ratio-feature-evaluation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/aspect-ratio-feature-evaluation.html.ini
@@ -1,2 +1,6 @@
 [aspect-ratio-feature-evaluation.html]
-  expected: ERROR
+  [@container queries with aspect-ratio and size containment]
+    expected: FAIL
+
+  [@container query with aspect-ratio change after resize]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/at-container-parsing.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/at-container-parsing.html.ini
index 0174391e3e3..e11b7427c6f 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/at-container-parsing.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/at-container-parsing.html.ini
@@ -1,2 +1,255 @@
 [at-container-parsing.html]
-  expected: ERROR
+  [Query condition should be valid: (width)]
+    expected: FAIL
+
+  [Query condition should be valid: (min-width: 0px)]
+    expected: FAIL
+
+  [Query condition should be valid: (max-width: 0px)]
+    expected: FAIL
+
+  [Query condition should be valid: (height)]
+    expected: FAIL
+
+  [Query condition should be valid: (min-height: 0px)]
+    expected: FAIL
+
+  [Query condition should be valid: (max-height: 0px)]
+    expected: FAIL
+
+  [Query condition should be valid: (aspect-ratio)]
+    expected: FAIL
+
+  [Query condition should be valid: (min-aspect-ratio: 1/2)]
+    expected: FAIL
+
+  [Query condition should be valid: (max-aspect-ratio: 1/2)]
+    expected: FAIL
+
+  [Query condition should be valid: (orientation: portrait)]
+    expected: FAIL
+
+  [Query condition should be valid: (inline-size)]
+    expected: FAIL
+
+  [Query condition should be valid: (min-inline-size: 0px)]
+    expected: FAIL
+
+  [Query condition should be valid: (max-inline-size: 0px)]
+    expected: FAIL
+
+  [Query condition should be valid: (block-size)]
+    expected: FAIL
+
+  [Query condition should be valid: (min-block-size: 0px)]
+    expected: FAIL
+
+  [Query condition should be valid: (max-block-size: 0px)]
+    expected: FAIL
+
+  [Query condition should be valid: (width: 100px)]
+    expected: FAIL
+
+  [Query condition should be valid: ((width: 100px))]
+    expected: FAIL
+
+  [Query condition should be valid: (not (width: 100px))]
+    expected: FAIL
+
+  [Query condition should be valid: ((width: 100px) and (height: 100px))]
+    expected: FAIL
+
+  [Query condition should be valid: (((width: 40px) or (width: 50px)) and (height: 100px))]
+    expected: FAIL
+
+  [Query condition should be valid: ((width: 100px) and ((height: 40px) or (height: 50px)))]
+    expected: FAIL
+
+  [Query condition should be valid: (((width: 40px) and (height: 50px)) or (height: 100px))]
+    expected: FAIL
+
+  [Query condition should be valid: ((width: 50px) or ((width: 40px) and (height: 50px)))]
+    expected: FAIL
+
+  [Query condition should be valid: ((width: 100px) and (not (height: 100px)))]
+    expected: FAIL
+
+  [Query condition should be valid: (width < 100px)]
+    expected: FAIL
+
+  [Query condition should be valid: (width <= 100px)]
+    expected: FAIL
+
+  [Query condition should be valid: (width = 100px)]
+    expected: FAIL
+
+  [Query condition should be valid: (width > 100px)]
+    expected: FAIL
+
+  [Query condition should be valid: (width >= 100px)]
+    expected: FAIL
+
+  [Query condition should be valid: (100px < width)]
+    expected: FAIL
+
+  [Query condition should be valid: (100px <= width)]
+    expected: FAIL
+
+  [Query condition should be valid: (100px = width)]
+    expected: FAIL
+
+  [Query condition should be valid: (100px > width)]
+    expected: FAIL
+
+  [Query condition should be valid: (100px >= width)]
+    expected: FAIL
+
+  [Query condition should be valid: (100px < width < 200px)]
+    expected: FAIL
+
+  [Query condition should be valid: (100px < width <= 200px)]
+    expected: FAIL
+
+  [Query condition should be valid: (100px <= width < 200px)]
+    expected: FAIL
+
+  [Query condition should be valid: (100px > width > 200px)]
+    expected: FAIL
+
+  [Query condition should be valid: (100px > width >= 200px)]
+    expected: FAIL
+
+  [Query condition should be valid: (100px >= width > 200px)]
+    expected: FAIL
+
+  [Query condition should be valid: (width: calc(10px))]
+    expected: FAIL
+
+  [Query condition should be valid: (width: calc(10em))]
+    expected: FAIL
+
+  [Query condition should be valid: (width: calc(10px + 10em))]
+    expected: FAIL
+
+  [Query condition should be valid: (width < calc(10px + 10em))]
+    expected: FAIL
+
+  [Query condition should be valid: (width < max(10px, 10em))]
+    expected: FAIL
+
+  [Query condition should be valid: (calc(10px + 10em) < width)]
+    expected: FAIL
+
+  [Query condition should be valid: (calc(10px + 10em) < width < max(30px, 30em))]
+    expected: FAIL
+
+  [Query condition should be valid: (width: 100px) and (height: 100px)]
+    expected: FAIL
+
+  [Query condition should be valid: (width: 100px) or (height: 100px)]
+    expected: FAIL
+
+  [Query condition should be valid: not (width: 100px)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: foo(width)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: size(width)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (asdf)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (resolution > 100dpi)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (resolution: 150dpi)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (resolution: calc(2x))]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (color)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (min-color: 1)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (color-index >= 1)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: size(grid)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (grid)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (width == 100px)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (100px == width)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (100px = width = 200px)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (100px < width > 200px)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (100px <= width >= 200px)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (100px <= width > 200px)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (100px < width >= 200px)]
+    expected: FAIL
+
+  [Query condition should be valid but unknown: (100px : width : 200px)]
+    expected: FAIL
+
+  [@container rule should be valid: @container name not (width <= 500px) {} {}]
+    expected: FAIL
+
+  [@container rule should be valid: @container not (width <= 500px) {} {}]
+    expected: FAIL
+
+  [@container rule should be valid: @container (width: 100px), (height: 100px) {} {}]
+    expected: FAIL
+
+  [@container rule should be valid: @container (width),(height)  , (inline-size > 20px) {} {}]
+    expected: FAIL
+
+  [@container rule should be valid: @container (width), name (height) {} {}]
+    expected: FAIL
+
+  [@container rule should be valid: @container --foo {} {}]
+    expected: FAIL
+
+  [@container rule should be valid: @container container {} {}]
+    expected: FAIL
+
+  [@container rule should be valid: @container container, container2 {} {}]
+    expected: FAIL
+
+  [Container name: foo]
+    expected: FAIL
+
+  [Container name:  foo]
+    expected: FAIL
+
+  [Container name:  foo ]
+    expected: FAIL
+
+  [Container name: normal]
+    expected: FAIL
+
+  [Container name: Normal]
+    expected: FAIL
+
+  [Container name: auto]
+    expected: FAIL
+
+  [Container name: Auto]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/at-container-serialization.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/at-container-serialization.html.ini
index c5a746c5610..ba582f74fa4 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/at-container-serialization.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/at-container-serialization.html.ini
@@ -1,2 +1,51 @@
 [at-container-serialization.html]
-  expected: ERROR
+  [Serialization of conditionText]
+    expected: FAIL
+
+  [Serialization of inner @container rule]
+    expected: FAIL
+
+  [Serialization of nested @container rule]
+    expected: FAIL
+
+  [@container conditionText serialization: (  wiDTh  )]
+    expected: FAIL
+
+  [@container conditionText serialization: (width:100px)]
+    expected: FAIL
+
+  [@container conditionText serialization: (min-width:  100px)]
+    expected: FAIL
+
+  [@container conditionText serialization: (   MAX-WIDTH:100px  )]
+    expected: FAIL
+
+  [@container conditionText serialization: (width > 100px)]
+    expected: FAIL
+
+  [@container conditionText serialization: (width < 100px)]
+    expected: FAIL
+
+  [@container conditionText serialization: (widTH >= 100px)]
+    expected: FAIL
+
+  [@container conditionText serialization: (width <= 100px)]
+    expected: FAIL
+
+  [@container conditionText serialization: (10px < width < 100px)]
+    expected: FAIL
+
+  [@container conditionText serialization: (10px <=  width  <=  100px)]
+    expected: FAIL
+
+  [@container conditionText serialization: (100px>WIDTH>10px)]
+    expected: FAIL
+
+  [@container conditionText serialization: (  100px >= width >= 10px  )]
+    expected: FAIL
+
+  [@container conditionText serialization: (calc(1em + 1px) >= width >= max(10em, 10px))]
+    expected: FAIL
+
+  [@container conditionText serialization: (width),(height) ,--foo ,--bar]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/auto-scrollbars.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/auto-scrollbars.html.ini
deleted file mode 100644
index b3c3f5540c7..00000000000
--- a/tests/wpt/meta/css/css-conditional/container-queries/auto-scrollbars.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[auto-scrollbars.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/backdrop-invalidation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/backdrop-invalidation.html.ini
index 8b089b438d3..7fc5de28f63 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/backdrop-invalidation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/backdrop-invalidation.html.ini
@@ -1,2 +1,3 @@
 [backdrop-invalidation.html]
-  expected: ERROR
+  [Pseudo-element ::backdrop responds to container size changes]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/calc-evaluation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/calc-evaluation.html.ini
index 95db9d4fb1e..596b4a39a1a 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/calc-evaluation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/calc-evaluation.html.ini
@@ -1,2 +1,3 @@
 [calc-evaluation.html]
-  expected: ERROR
+  [em relative inline-size]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/canvas-as-container-005.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/canvas-as-container-005.html.ini
index fc391da5312..a25595e70d4 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/canvas-as-container-005.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/canvas-as-container-005.html.ini
@@ -1,2 +1,3 @@
 [canvas-as-container-005.html]
-  expected: ERROR
+  [Initially display:none, not focusable]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/canvas-as-container-006.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/canvas-as-container-006.html.ini
index 5fc52bb6346..2bec1da93ae 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/canvas-as-container-006.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/canvas-as-container-006.html.ini
@@ -1,2 +1,3 @@
 [canvas-as-container-006.html]
-  expected: ERROR
+  [Initially display:none, not focusable]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/chrome-legacy-skip-recalc.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/chrome-legacy-skip-recalc.html.ini
deleted file mode 100644
index 41721cec3c7..00000000000
--- a/tests/wpt/meta/css/css-conditional/container-queries/chrome-legacy-skip-recalc.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[chrome-legacy-skip-recalc.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/column-spanner-in-container.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/column-spanner-in-container.html.ini
index f5cdfb7f54c..4d16db18dc4 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/column-spanner-in-container.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/column-spanner-in-container.html.ini
@@ -1,2 +1,3 @@
 [column-spanner-in-container.html]
-  expected: ERROR
+  [Reducing #multicol width means #spanner no longer gets column-span:all]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/conditional-container-status.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/conditional-container-status.html.ini
index c0ee6c64a5b..ed8d459baac 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/conditional-container-status.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/conditional-container-status.html.ini
@@ -1,2 +1,3 @@
 [conditional-container-status.html]
-  expected: ERROR
+  [Conditionally applying container-type:initial]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-computed.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-computed.html.ini
index 5cfd149c490..2f55097f9e9 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-computed.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-computed.html.ini
@@ -1,2 +1,42 @@
 [container-computed.html]
-  expected: ERROR
+  [Property container value 'initial']
+    expected: FAIL
+
+  [Property container value 'inherit']
+    expected: FAIL
+
+  [Property container value 'unset']
+    expected: FAIL
+
+  [Property container value 'none / inline-size']
+    expected: FAIL
+
+  [Property container value 'none / size']
+    expected: FAIL
+
+  [Property container value 'inline-size / inline-size']
+    expected: FAIL
+
+  [Property container value 'block-size / size']
+    expected: FAIL
+
+  [Property container value 'foo / inline-size']
+    expected: FAIL
+
+  [Property container value 'foo /inline-size']
+    expected: FAIL
+
+  [Property container value 'foo/ inline-size']
+    expected: FAIL
+
+  [Property container value 'foo/inline-size']
+    expected: FAIL
+
+  [Property container value 'FoO / size']
+    expected: FAIL
+
+  [Property container value 'foo bar / size']
+    expected: FAIL
+
+  [Property container value 'foo / normal']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-for-shadow-dom.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-for-shadow-dom.html.ini
index 3efb9a4484d..7909095df86 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-for-shadow-dom.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-for-shadow-dom.html.ini
@@ -1,2 +1,51 @@
 [container-for-shadow-dom.html]
-  expected: ERROR
+  [Match container in outer tree]
+    expected: FAIL
+
+  [Match container in walking flat tree ancestors]
+    expected: FAIL
+
+  [Match container in ::slotted selector's originating element tree]
+    expected: FAIL
+
+  [Match container in outer tree for :host]
+    expected: FAIL
+
+  [Match container in ::part selector's originating element tree]
+    expected: FAIL
+
+  [Match container for ::before in ::slotted selector's originating element tree]
+    expected: FAIL
+
+  [Match container in outer tree for :host::before]
+    expected: FAIL
+
+  [Match container for ::before in ::part selector's originating element tree]
+    expected: FAIL
+
+  [Match container for ::part selector's originating element tree for exportparts]
+    expected: FAIL
+
+  [Match container for slot light tree child fallback]
+    expected: FAIL
+
+  [Should not match container inside shadow tree for ::part()]
+    expected: FAIL
+
+  [A :host::part rule should match containers in the originating element tree]
+    expected: FAIL
+
+  [Container name set inside a shadow tree should not match query using ::part on the outside]
+    expected: FAIL
+
+  [Container name set with a ::part should match query inside the shadow tree]
+    expected: FAIL
+
+  [Container name set inside a shadow tree should match query for a ::slotted() rule inside the tree]
+    expected: FAIL
+
+  [Container name set on :host from inside a shadow tree matching query inside the shadow tree]
+    expected: FAIL
+
+  [Container name set on :host from inside a shadow tree matching query for ::slotted inside the shadow tree]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-inheritance.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-inheritance.html.ini
deleted file mode 100644
index 7895da15473..00000000000
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-inheritance.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[container-inheritance.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-inner-at-rules.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-inner-at-rules.html.ini
index fe9df8888c4..68010d992c1 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-inner-at-rules.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-inner-at-rules.html.ini
@@ -1,2 +1,18 @@
 [container-inner-at-rules.html]
-  expected: ERROR
+  [@keyframes is defined regardless of evaluation]
+    expected: FAIL
+
+  [@property is defined regardless of evaluation]
+    expected: FAIL
+
+  [@layer order respected regardless of evaluation]
+    expected: FAIL
+
+  [@font-face is defined regardless of evaluation]
+    expected: FAIL
+
+  [@media works inside @container]
+    expected: FAIL
+
+  [@supports works inside @container]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-inside-multicol-with-table.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-inside-multicol-with-table.html.ini
index 45bac59ad68..0c297bf8284 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-inside-multicol-with-table.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-inside-multicol-with-table.html.ini
@@ -1,2 +1,6 @@
 [container-inside-multicol-with-table.html]
-  expected: ERROR
+  [Matching size container inside table inside multicol]
+    expected: FAIL
+
+  [Matching size container inside multicol with table sibling]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-longhand-animation-type.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-longhand-animation-type.html.ini
index 6fcb3d3d017..881296739ed 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-longhand-animation-type.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-longhand-animation-type.html.ini
@@ -1,2 +1,3 @@
 [container-longhand-animation-type.html]
-  expected: ERROR
+  [Reference variable is applied]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-name-computed.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-name-computed.html.ini
deleted file mode 100644
index 4c6f92ff91f..00000000000
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-name-computed.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[container-name-computed.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-name-invalidation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-name-invalidation.html.ini
index 9699d557f71..73183a4fdd7 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-name-invalidation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-name-invalidation.html.ini
@@ -1,2 +1,6 @@
 [container-name-invalidation.html]
-  expected: ERROR
+  [Changing a named container invalidates relevant descendants]
+    expected: FAIL
+
+  [Changing container-name invalidates relevant descendants]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-name-parsing.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-name-parsing.html.ini
deleted file mode 100644
index a1d910e8bc6..00000000000
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-name-parsing.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[container-name-parsing.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-name-tree-scoped.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-name-tree-scoped.html.ini
index 944100b2a6d..b9cf122cf15 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-name-tree-scoped.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-name-tree-scoped.html.ini
@@ -1,2 +1,6 @@
 [container-name-tree-scoped.html]
-  expected: ERROR
+  [Inner scope query should match container-name set by :host rule in shadow tree]
+    expected: FAIL
+
+  [Inner scope query containing ::slotted should match container-name set by :host rule in shadow tree]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-nested.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-nested.html.ini
index 270c4929976..af458226e9e 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-nested.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-nested.html.ini
@@ -1,2 +1,27 @@
 [container-nested.html]
-  expected: ERROR
+  [Implicit]
+    expected: FAIL
+
+  [Outer named, inner named]
+    expected: FAIL
+
+  [Outer named, inner named (reverse)]
+    expected: FAIL
+
+  [Outer named, inner implicit]
+    expected: FAIL
+
+  [Inner named, outer implicit]
+    expected: FAIL
+
+  [Inner named, outer implicit (reverse)]
+    expected: FAIL
+
+  [Three levels]
+    expected: FAIL
+
+  [Named inner invalidation]
+    expected: FAIL
+
+  [Implicit outer invalidation]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-parsing.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-parsing.html.ini
index 4a67b2a0bb4..568172c810a 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-parsing.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-parsing.html.ini
@@ -1,2 +1,63 @@
 [container-parsing.html]
-  expected: ERROR
+  [e.style['container'\] = "initial" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "inherit" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "unset" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "revert" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "none" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "none / normal" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "inline-size" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "none / inline-size" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "size" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "block-size / size" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "inline-size / inline-size" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "size / size" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "foo" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "foo / normal" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "foo bar / size" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "foo bar / normal" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "FOO / size" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "FOO/size" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "  FOO  /size" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "normal / size" should set the property value]
+    expected: FAIL
+
+  [e.style['container'\] = "auto / size" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-selection.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-selection.html.ini
index 078f5f5fca0..41697cff7ad 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-selection.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-selection.html.ini
@@ -1,2 +1,48 @@
 [container-selection.html]
-  expected: ERROR
+  [(width: 16px) for .size > .inline > span]
+    expected: FAIL
+
+  [(height: 16px) for .inline > .size > span]
+    expected: FAIL
+
+  [(width: 16px) for .inline > .size > span]
+    expected: FAIL
+
+  [(height: 32px) for .size > .inline > span]
+    expected: FAIL
+
+  [a (width: 32px) for .a-size > .b-size > span]
+    expected: FAIL
+
+  [b (width: 16px) for .a-size > .b-size > span]
+    expected: FAIL
+
+  [a (width: 16px) for .a-size > .a-size > span]
+    expected: FAIL
+
+  [a (width: 32px) for .a-size > .a > span]
+    expected: FAIL
+
+  [a (width: 32px) for .ab-size > .size > span]
+    expected: FAIL
+
+  [b (width: 32px) for .ab-size > .size > span]
+    expected: FAIL
+
+  [a (width: 8px) for .a-size > .b-size > .a-inline > span]
+    expected: FAIL
+
+  [b (width: 16px) for .a-size > .b-size > .a-inline > span]
+    expected: FAIL
+
+  [a (height: 32px) for .a-size > .b-size > .a-inline > span]
+    expected: FAIL
+
+  [a (inline-size: 8px) for .a-size > .b-size > .a-inline > span]
+    expected: FAIL
+
+  [b (inline-size: 16px) for .a-size > .b-size > .a-inline > span]
+    expected: FAIL
+
+  [a (block-size: 32px) for .a-size > .b-size > .a-inline > span]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-size-invalidation-after-load.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-size-invalidation-after-load.html.ini
index ac18a07d13d..489cdd6a8fe 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-size-invalidation-after-load.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-size-invalidation-after-load.html.ini
@@ -1,2 +1,3 @@
 [container-size-invalidation-after-load.html]
-  expected: ERROR
+  [@container: invalidation of container size after load event]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-size-invalidation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-size-invalidation.html.ini
index 2110c73f00a..66a82eea332 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-size-invalidation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-size-invalidation.html.ini
@@ -1,2 +1,6 @@
 [container-size-invalidation.html]
-  expected: ERROR
+  [Children respond to changes in container size]
+    expected: FAIL
+
+  [Descendants respond to changes in container size]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-size-nested-invalidation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-size-nested-invalidation.html.ini
index 6b313211a58..7b696e95c42 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-size-nested-invalidation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-size-nested-invalidation.html.ini
@@ -1,2 +1,3 @@
 [container-size-nested-invalidation.html]
-  expected: ERROR
+  [Queries that skip a container are invalidated correctly]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-size-shadow-invalidation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-size-shadow-invalidation.html.ini
index 36983f995f6..92cd79aba76 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-size-shadow-invalidation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-size-shadow-invalidation.html.ini
@@ -1,2 +1,6 @@
 [container-size-shadow-invalidation.html]
-  expected: ERROR
+  [Host container child invalidated with container in shadow tree]
+    expected: FAIL
+
+  [Non-host container child invalidated with container in shadow tree]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-type-computed.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-type-computed.html.ini
deleted file mode 100644
index 1c738ca9d2f..00000000000
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-type-computed.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[container-type-computed.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-type-containment.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-type-containment.html.ini
index 78eac66a53b..ded581cb320 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-type-containment.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-type-containment.html.ini
@@ -1,2 +1,9 @@
 [container-type-containment.html]
-  expected: ERROR
+  [container-type:inline-size turns on layout containment]
+    expected: FAIL
+
+  [container-type:inline-size turns on inline-size containment]
+    expected: FAIL
+
+  [container-type:size turns on full size containment]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-type-invalidation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-type-invalidation.html.ini
index ceeef89bc5e..2888c8c08d6 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-type-invalidation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-type-invalidation.html.ini
@@ -1,2 +1,3 @@
 [container-type-invalidation.html]
-  expected: ERROR
+  [Changing the container type invalidates relevant descendants]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-type-layout-invalidation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-type-layout-invalidation.html.ini
index 2ee85b9d254..c2c55430573 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-type-layout-invalidation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-type-layout-invalidation.html.ini
@@ -1,2 +1,3 @@
 [container-type-layout-invalidation.html]
-  expected: ERROR
+  [Changing container-type invalidates layout]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-type-parsing.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-type-parsing.html.ini
deleted file mode 100644
index 1c739f25052..00000000000
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-type-parsing.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[container-type-parsing.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-animation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-animation.html.ini
index 343a20cdded..8e6fbc83706 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-units-animation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-animation.html.ini
@@ -1,2 +1,36 @@
 [container-units-animation.html]
-  expected: ERROR
+  [Animation using cqw unit]
+    expected: FAIL
+
+  [Animation using cqw unit responds to changing container size]
+    expected: FAIL
+
+  [Animation using cqh unit]
+    expected: FAIL
+
+  [Animation using cqh unit responds to changing container size]
+    expected: FAIL
+
+  [Animation using cqi unit]
+    expected: FAIL
+
+  [Animation using cqi unit responds to changing container size]
+    expected: FAIL
+
+  [Animation using cqb unit]
+    expected: FAIL
+
+  [Animation using cqb unit responds to changing container size]
+    expected: FAIL
+
+  [Animation using cqmin unit]
+    expected: FAIL
+
+  [Animation using cqmin unit responds to changing container size]
+    expected: FAIL
+
+  [Animation using cqmax unit]
+    expected: FAIL
+
+  [Animation using cqmax unit responds to changing container size]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-basic.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-basic.html.ini
index be0e8789a85..cf2e406c430 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-units-basic.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-basic.html.ini
@@ -1,2 +1,6 @@
 [container-units-basic.html]
-  expected: ERROR
+  [Container relative units]
+    expected: FAIL
+
+  [Container relative units in math functions]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-computational-independence.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-computational-independence.html.ini
index 2d243ce7664..c515493b253 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-units-computational-independence.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-computational-independence.html.ini
@@ -1,2 +1,18 @@
 [container-units-computational-independence.html]
-  expected: ERROR
+  [Container relative unit cqw is not computationally independent]
+    expected: FAIL
+
+  [Container relative unit cqh is not computationally independent]
+    expected: FAIL
+
+  [Container relative unit cqi is not computationally independent]
+    expected: FAIL
+
+  [Container relative unit cqb is not computationally independent]
+    expected: FAIL
+
+  [Container relative unit cqmin is not computationally independent]
+    expected: FAIL
+
+  [Container relative unit cqmax is not computationally independent]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-content-box.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-content-box.html.ini
index 94994f5b988..aa3546cb891 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-units-content-box.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-content-box.html.ini
@@ -1,2 +1,6 @@
 [container-units-content-box.html]
-  expected: ERROR
+  [Container units are relative to the content box of the container]
+    expected: FAIL
+
+  [Container units are relative to the content box of the container (box-sizing: border-box)]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-in-at-container-dynamic.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-in-at-container-dynamic.html.ini
index 06ecbee89c8..6a6b6806270 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-units-in-at-container-dynamic.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-in-at-container-dynamic.html.ini
@@ -1,2 +1,3 @@
 [container-units-in-at-container-dynamic.html]
-  expected: ERROR
+  [Query with container-relative units are responsive to changes]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-in-at-container-fallback.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-in-at-container-fallback.html.ini
index 8e57c948e7d..57a54b9c12b 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-units-in-at-container-fallback.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-in-at-container-fallback.html.ini
@@ -1,2 +1,3 @@
 [container-units-in-at-container-fallback.html]
-  expected: ERROR
+  [Use small viewport size as fallback]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-in-at-container.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-in-at-container.html.ini
index 5c3e6915c56..ed50385d41a 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-units-in-at-container.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-in-at-container.html.ini
@@ -1,2 +1,54 @@
 [container-units-in-at-container.html]
-  expected: ERROR
+  [cqw unit resolves against appropriate container]
+    expected: FAIL
+
+  [cqh unit resolves against appropriate container]
+    expected: FAIL
+
+  [cqi unit resolves against appropriate container]
+    expected: FAIL
+
+  [cqb unit resolves against appropriate container]
+    expected: FAIL
+
+  [cqmin unit resolves against appropriate container]
+    expected: FAIL
+
+  [cqmax unit resolves against appropriate container]
+    expected: FAIL
+
+  [cqw unit resolves against appropriate container (vertical writing-mode on subject)]
+    expected: FAIL
+
+  [cqh unit resolves against appropriate container (vertical writing-mode on subject)]
+    expected: FAIL
+
+  [cqi unit resolves against appropriate container (vertical writing-mode on subject)]
+    expected: FAIL
+
+  [cqb unit resolves against appropriate container (vertical writing-mode on subject)]
+    expected: FAIL
+
+  [cqmin unit resolves against appropriate container (vertical writing-mode on subject)]
+    expected: FAIL
+
+  [cqmax unit resolves against appropriate container (vertical writing-mode on subject)]
+    expected: FAIL
+
+  [cqw unit resolves against appropriate container (vertical writing-mode on container)]
+    expected: FAIL
+
+  [cqh unit resolves against appropriate container (vertical writing-mode on container)]
+    expected: FAIL
+
+  [cqi unit resolves against appropriate container (vertical writing-mode on container)]
+    expected: FAIL
+
+  [cqb unit resolves against appropriate container (vertical writing-mode on container)]
+    expected: FAIL
+
+  [cqmin unit resolves against appropriate container (vertical writing-mode on container)]
+    expected: FAIL
+
+  [cqmax unit resolves against appropriate container (vertical writing-mode on container)]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-ineligible-container.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-ineligible-container.html.ini
index 344a8137596..795a6dec458 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-units-ineligible-container.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-ineligible-container.html.ini
@@ -1,2 +1,27 @@
 [container-units-ineligible-container.html]
-  expected: ERROR
+  [/* basic */]
+    expected: FAIL
+
+  [display: table]
+    expected: FAIL
+
+  [display: table-cell]
+    expected: FAIL
+
+  [display: inline]
+    expected: FAIL
+
+  [display: contents]
+    expected: FAIL
+
+  [display: none]
+    expected: FAIL
+
+  [container-type: normal]
+    expected: FAIL
+
+  [container-type: inline-size]
+    expected: FAIL
+
+  [container-type: inline-size; writing-mode: vertical-lr]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-invalidation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-invalidation.html.ini
index 7f82447127a..a29bf8d76ee 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-units-invalidation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-invalidation.html.ini
@@ -1,2 +1,15 @@
 [container-units-invalidation.html]
-  expected: ERROR
+  [cqi respond when selected container changes type (inline-size -> normal)]
+    expected: FAIL
+
+  [cqb respond when selected container changes type (size -> normal)]
+    expected: FAIL
+
+  [cqb respond when intermediate container changes type (inline-size -> size)]
+    expected: FAIL
+
+  [cqi respond when selected container changes inline-size]
+    expected: FAIL
+
+  [cqb respond when selected container changes block-size]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-media-queries.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-media-queries.html.ini
index 5732050c44b..70a3ecd9e8a 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-units-media-queries.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-media-queries.html.ini
@@ -1,2 +1,18 @@
 [container-units-media-queries.html]
-  expected: ERROR
+  [@media(width:100cqw) applies]
+    expected: FAIL
+
+  [@media(width:100cqi) applies]
+    expected: FAIL
+
+  [@media(width:100cqmax) applies]
+    expected: FAIL
+
+  [@media(height:100cqh) applies]
+    expected: FAIL
+
+  [@media(height:100cqb) applies]
+    expected: FAIL
+
+  [@media(height:100cqmin) applies]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-selection.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-selection.html.ini
index a0a35f1f266..a98da2282bd 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-units-selection.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-selection.html.ini
@@ -1,2 +1,6 @@
 [container-units-selection.html]
-  expected: ERROR
+  [Container units select the proper container]
+    expected: FAIL
+
+  [Units respond to the writing-mode of the element]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-shadow.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-shadow.html.ini
index 334c7ef1552..45124840471 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-units-shadow.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-shadow.html.ini
@@ -1,2 +1,6 @@
 [container-units-shadow.html]
-  expected: ERROR
+  [Direct slotted child queries flat tree]
+    expected: FAIL
+
+  [Nondirect slotted child queries flat tree ancestors]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-small-viewport-fallback.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-small-viewport-fallback.html.ini
index 2d628428bc9..a4d10255ae2 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-units-small-viewport-fallback.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-small-viewport-fallback.html.ini
@@ -1,2 +1,3 @@
 [container-units-small-viewport-fallback.html]
-  expected: ERROR
+  [Use small viewport size as fallback]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-svglength.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-svglength.html.ini
index ce5935891d8..0ed94e8185a 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-units-svglength.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-svglength.html.ini
@@ -1,2 +1,22 @@
 [container-units-svglength.html]
   expected: ERROR
+  [unitType with container-relative units]
+    expected: FAIL
+
+  [cqw,cqh can be resolved]
+    expected: FAIL
+
+  [cqi,cqb can be resolved]
+    expected: FAIL
+
+  [cqmin,cqmax can be resolved]
+    expected: FAIL
+
+  [calc() with container-relative units can be resolved]
+    expected: FAIL
+
+  [Can modify value with container-relative units]
+    expected: FAIL
+
+  [CSS Container Queries Test: container-relative units in SVGLength]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-typed-om.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-typed-om.html.ini
index dea0e2a76cd..3e09b9d710b 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-units-typed-om.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-typed-om.html.ini
@@ -1,2 +1,72 @@
 [container-units-typed-om.html]
-  expected: ERROR
+  [CSS.cqw function]
+    expected: FAIL
+
+  [Reify value with cqw unit]
+    expected: FAIL
+
+  [Set value with cqw unit (string)]
+    expected: FAIL
+
+  [Set value with cqw unit (CSS.cqw)]
+    expected: FAIL
+
+  [CSS.cqh function]
+    expected: FAIL
+
+  [Reify value with cqh unit]
+    expected: FAIL
+
+  [Set value with cqh unit (string)]
+    expected: FAIL
+
+  [Set value with cqh unit (CSS.cqh)]
+    expected: FAIL
+
+  [CSS.cqi function]
+    expected: FAIL
+
+  [Reify value with cqi unit]
+    expected: FAIL
+
+  [Set value with cqi unit (string)]
+    expected: FAIL
+
+  [Set value with cqi unit (CSS.cqi)]
+    expected: FAIL
+
+  [CSS.cqb function]
+    expected: FAIL
+
+  [Reify value with cqb unit]
+    expected: FAIL
+
+  [Set value with cqb unit (string)]
+    expected: FAIL
+
+  [Set value with cqb unit (CSS.cqb)]
+    expected: FAIL
+
+  [CSS.cqmin function]
+    expected: FAIL
+
+  [Reify value with cqmin unit]
+    expected: FAIL
+
+  [Set value with cqmin unit (string)]
+    expected: FAIL
+
+  [Set value with cqmin unit (CSS.cqmin)]
+    expected: FAIL
+
+  [CSS.cqmax function]
+    expected: FAIL
+
+  [Reify value with cqmax unit]
+    expected: FAIL
+
+  [Set value with cqmax unit (string)]
+    expected: FAIL
+
+  [Set value with cqmax unit (CSS.cqmax)]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/counters-flex-circular.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/counters-flex-circular.html.ini
index d306fb202be..bf5796c235c 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/counters-flex-circular.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/counters-flex-circular.html.ini
@@ -1,2 +1,3 @@
 [counters-flex-circular.html]
-  expected: ERROR
+  [The container query should match the layed out width]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/display-contents.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/display-contents.html.ini
index 218ccadd27e..3b16182c182 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/display-contents.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/display-contents.html.ini
@@ -1,2 +1,6 @@
 [display-contents.html]
-  expected: ERROR
+  [getComputedStyle when container becomes display:contents]
+    expected: FAIL
+
+  [getComputedStyle when intermediate container becomes display:contents]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/display-none.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/display-none.html.ini
index 30e7ac379eb..282e272d901 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/display-none.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/display-none.html.ini
@@ -1,2 +1,42 @@
 [display-none.html]
-  expected: ERROR
+  [getComputedStyle when element is display:none]
+    expected: FAIL
+
+  [getComputedStyle when parent is display:none]
+    expected: FAIL
+
+  [getComputedStyle when ancestor is display:none]
+    expected: FAIL
+
+  [getComputedStyle when element in nested container is display:none]
+    expected: FAIL
+
+  [getComputedStyle when element becomes display:none]
+    expected: FAIL
+
+  [getComputedStyle when parent becomes display:none]
+    expected: FAIL
+
+  [getComputedStyle when ancestor becomes display:none]
+    expected: FAIL
+
+  [getComputedStyle when container becomes display:none]
+    expected: FAIL
+
+  [getComputedStyle when intermediate container becomes display:none]
+    expected: FAIL
+
+  [getComputedStyle when ::before is display:none]
+    expected: FAIL
+
+  [getComputedStyle when originating element is display:none]
+    expected: FAIL
+
+  [getComputedStyle on ::before when ancestor element is display:none]
+    expected: FAIL
+
+  [getComputedStyle on ::before when container is display:none]
+    expected: FAIL
+
+  [getComputedStyle when in display:none with layout dirty outer element]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/font-relative-calc-dynamic.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/font-relative-calc-dynamic.html.ini
index 5b988b5dede..babd02f4d57 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/font-relative-calc-dynamic.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/font-relative-calc-dynamic.html.ini
@@ -1,2 +1,3 @@
 [font-relative-calc-dynamic.html]
-  expected: ERROR
+  [font-relative calc() is responsive to container font-size changes]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/font-relative-units-dynamic.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/font-relative-units-dynamic.html.ini
index bac1ca5c34b..8d670136d0e 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/font-relative-units-dynamic.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/font-relative-units-dynamic.html.ini
@@ -1,2 +1,36 @@
 [font-relative-units-dynamic.html]
-  expected: ERROR
+  [em units respond to changes]
+    expected: FAIL
+
+  [rem units respond to changes]
+    expected: FAIL
+
+  [ex units respond to changes]
+    expected: FAIL
+
+  [rex units respond to changes]
+    expected: FAIL
+
+  [ch units respond to changes]
+    expected: FAIL
+
+  [cap units respond to changes]
+    expected: FAIL
+
+  [rch units respond to changes]
+    expected: FAIL
+
+  [lh units respond to changes]
+    expected: FAIL
+
+  [rlh units respond to changes]
+    expected: FAIL
+
+  [ic units respond to changes]
+    expected: FAIL
+
+  [ric units respond to changes]
+    expected: FAIL
+
+  [rcap units respond to changes]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/font-relative-units.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/font-relative-units.html.ini
index e08fa7e3a64..70161235133 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/font-relative-units.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/font-relative-units.html.ini
@@ -1,2 +1,36 @@
 [font-relative-units.html]
-  expected: ERROR
+  [em relative inline-size]
+    expected: FAIL
+
+  [rem relative inline-size]
+    expected: FAIL
+
+  [ex relative inline-size]
+    expected: FAIL
+
+  [rex relative inline-size]
+    expected: FAIL
+
+  [ch relative inline-size]
+    expected: FAIL
+
+  [rch relative inline-size]
+    expected: FAIL
+
+  [ic relative inline-size]
+    expected: FAIL
+
+  [ric relative inline-size]
+    expected: FAIL
+
+  [lh relative inline-size]
+    expected: FAIL
+
+  [rlh relative inline-size]
+    expected: FAIL
+
+  [cap relative inline-size]
+    expected: FAIL
+
+  [rcap relative inline-size]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/fragmented-container-001.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/fragmented-container-001.html.ini
index 45e3fff97d5..06a25a08df2 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/fragmented-container-001.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/fragmented-container-001.html.ini
@@ -1,2 +1,3 @@
 [fragmented-container-001.html]
-  expected: ERROR
+  [Children of fragmented inline-size container should match inline-size of first fragment]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/get-animations.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/get-animations.html.ini
index 696dab96168..ffb89ef6626 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/get-animations.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/get-animations.html.ini
@@ -1,2 +1,3 @@
 [get-animations.html]
-  expected: ERROR
+  [Calling getAnimations updates layout of parent frame if needed]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/grid-container.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/grid-container.html.ini
index 7e24be270ac..9a910509cd1 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/grid-container.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/grid-container.html.ini
@@ -1,2 +1,3 @@
 [grid-container.html]
-  expected: ERROR
+  [Check that grid items can query grid container]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/grid-item-container.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/grid-item-container.html.ini
index 739a704af3b..e8749dd199b 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/grid-item-container.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/grid-item-container.html.ini
@@ -1,2 +1,3 @@
 [grid-item-container.html]
-  expected: ERROR
+  [Check that children can query grid item containers]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/iframe-in-container-invalidation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/iframe-in-container-invalidation.html.ini
index 320d3763208..2eb7a6a61c9 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/iframe-in-container-invalidation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/iframe-in-container-invalidation.html.ini
@@ -1,2 +1,3 @@
 [iframe-in-container-invalidation.html]
-  expected: ERROR
+  [@container-dependent elements respond to size changes of an @container-dependent iframe]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/iframe-invalidation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/iframe-invalidation.html.ini
index 40277008114..b8f6a62afe2 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/iframe-invalidation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/iframe-invalidation.html.ini
@@ -1,2 +1,3 @@
 [iframe-invalidation.html]
-  expected: ERROR
+  [@container-dependent elements respond to iframe size changes]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/ineligible-containment.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/ineligible-containment.html.ini
index fb675be1df6..1a6d08f1f00 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/ineligible-containment.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/ineligible-containment.html.ini
@@ -1,2 +1,3 @@
 [ineligible-containment.html]
-  expected: ERROR
+  [Changing containment eligibility invalidates style]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/inheritance-from-container.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/inheritance-from-container.html.ini
deleted file mode 100644
index 15b82349e6a..00000000000
--- a/tests/wpt/meta/css/css-conditional/container-queries/inheritance-from-container.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[inheritance-from-container.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/inline-size-and-min-width.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/inline-size-and-min-width.html.ini
index 2d5cb15bd9b..be23d278496 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/inline-size-and-min-width.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/inline-size-and-min-width.html.ini
@@ -1,2 +1,3 @@
 [inline-size-and-min-width.html]
-  expected: ERROR
+  [min-width of inline-size container affects container size]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/inline-size-containment-vertical-rl.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/inline-size-containment-vertical-rl.html.ini
index 65be79b6779..86c2ca29f21 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/inline-size-containment-vertical-rl.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/inline-size-containment-vertical-rl.html.ini
@@ -1,2 +1,3 @@
 [inline-size-containment-vertical-rl.html]
-  expected: ERROR
+  [inline-size containment only]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/inline-size-containment.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/inline-size-containment.html.ini
index d5f1b19aeef..976a458f91b 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/inline-size-containment.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/inline-size-containment.html.ini
@@ -1,2 +1,3 @@
 [inline-size-containment.html]
-  expected: ERROR
+  [inline-size containment only]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/layout-dependent-focus.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/layout-dependent-focus.html.ini
index 215241c0ac3..06618e1c412 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/layout-dependent-focus.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/layout-dependent-focus.html.ini
@@ -1,2 +1,3 @@
 [layout-dependent-focus.html]
-  expected: ERROR
+  [Verify that onblur is called on hidden input]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/multicol-container-001.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/multicol-container-001.html.ini
index 5e75ff3c653..f74fceae162 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/multicol-container-001.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/multicol-container-001.html.ini
@@ -1,2 +1,3 @@
 [multicol-container-001.html]
-  expected: ERROR
+  [Children of multicol inline-size container should match inline-size of the container]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/multiple-size-containers-comma-separated-queries.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/multiple-size-containers-comma-separated-queries.html.ini
index a7960864003..a29c3c6707d 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/multiple-size-containers-comma-separated-queries.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/multiple-size-containers-comma-separated-queries.html.ini
@@ -1,2 +1,3 @@
 [multiple-size-containers-comma-separated-queries.html]
-  expected: ERROR
+  [Should match the named outer container for width > 400px]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/nested-query-containers.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/nested-query-containers.html.ini
index 3ef3646b538..f3640e7a797 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/nested-query-containers.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/nested-query-containers.html.ini
@@ -1,97 +1,96 @@
 [nested-query-containers.html]
-  expected: ERROR
   [test1 - inline - 0b000]
-    expected: NOTRUN
+    expected: FAIL
 
   [test2 - inline - 0b001]
-    expected: NOTRUN
+    expected: FAIL
 
   [test3 - inline - 0b010]
-    expected: NOTRUN
+    expected: FAIL
 
   [test4 - inline - 0b011]
-    expected: NOTRUN
+    expected: FAIL
 
   [test5 - inline - 0b100]
-    expected: NOTRUN
+    expected: FAIL
 
   [test6 - inline - 0b101]
-    expected: NOTRUN
+    expected: FAIL
 
   [test7 - inline - 0b110]
-    expected: NOTRUN
+    expected: FAIL
 
   [test8 - inline - 0b111]
-    expected: NOTRUN
+    expected: FAIL
 
   [test9 - contents - 0b000]
-    expected: NOTRUN
+    expected: FAIL
 
   [test10 - contents - 0b001]
-    expected: NOTRUN
+    expected: FAIL
 
   [test11 - contents - 0b010]
-    expected: NOTRUN
+    expected: FAIL
 
   [test12 - contents - 0b011]
-    expected: NOTRUN
+    expected: FAIL
 
   [test13 - contents - 0b100]
-    expected: NOTRUN
+    expected: FAIL
 
   [test14 - contents - 0b101]
-    expected: NOTRUN
+    expected: FAIL
 
   [test15 - contents - 0b110]
-    expected: NOTRUN
+    expected: FAIL
 
   [test16 - contents - 0b111]
-    expected: NOTRUN
+    expected: FAIL
 
   [test17 - table-cell - 0b000]
-    expected: NOTRUN
+    expected: FAIL
 
   [test18 - table-cell - 0b001]
-    expected: NOTRUN
+    expected: FAIL
 
   [test19 - table-cell - 0b010]
-    expected: NOTRUN
+    expected: FAIL
 
   [test20 - table-cell - 0b011]
-    expected: NOTRUN
+    expected: FAIL
 
   [test21 - table-cell - 0b100]
-    expected: NOTRUN
+    expected: FAIL
 
   [test22 - table-cell - 0b101]
-    expected: NOTRUN
+    expected: FAIL
 
   [test23 - table-cell - 0b110]
-    expected: NOTRUN
+    expected: FAIL
 
   [test24 - table-cell - 0b111]
-    expected: NOTRUN
+    expected: FAIL
 
   [test25 - table - 0b000]
-    expected: NOTRUN
+    expected: FAIL
 
   [test26 - table - 0b001]
-    expected: NOTRUN
+    expected: FAIL
 
   [test27 - table - 0b010]
-    expected: NOTRUN
+    expected: FAIL
 
   [test28 - table - 0b011]
-    expected: NOTRUN
+    expected: FAIL
 
   [test29 - table - 0b100]
-    expected: NOTRUN
+    expected: FAIL
 
   [test30 - table - 0b101]
-    expected: NOTRUN
+    expected: FAIL
 
   [test31 - table - 0b110]
-    expected: NOTRUN
+    expected: FAIL
 
   [test32 - table - 0b111]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/never-match-container.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/never-match-container.html.ini
deleted file mode 100644
index bd76185e545..00000000000
--- a/tests/wpt/meta/css/css-conditional/container-queries/never-match-container.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[never-match-container.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/orthogonal-wm-container-query.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/orthogonal-wm-container-query.html.ini
index 5f5c04ee0f8..d49b0b0b1f6 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/orthogonal-wm-container-query.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/orthogonal-wm-container-query.html.ini
@@ -1,2 +1,3 @@
 [orthogonal-wm-container-query.html]
-  expected: ERROR
+  [Orthogonal width]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/percentage-padding-orthogonal.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/percentage-padding-orthogonal.html.ini
index 06ce1345089..e7bd33864c1 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/percentage-padding-orthogonal.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/percentage-padding-orthogonal.html.ini
@@ -1,2 +1,12 @@
 [percentage-padding-orthogonal.html]
-  expected: ERROR
+  [#container width 400px after padding is applied.]
+    expected: FAIL
+
+  [#container width 400px after padding is applied. #second is removed from the rendering]
+    expected: FAIL
+
+  [#container width 399px after padding is applied. #second is removed from the rendering]
+    expected: FAIL
+
+  [#container width 399x after padding is applied. #second is removed from the rendering]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-001.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-001.html.ini
index 8049e81a747..cabd72ec9cc 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-001.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-001.html.ini
@@ -1,2 +1,6 @@
 [pseudo-elements-001.html]
-  expected: ERROR
+  [Pseudo-elements ::before and ::after respond to container size changes]
+    expected: FAIL
+
+  [Pseudo-element ::marker responds to container size changes]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-003.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-003.html.ini
index 8ae4a2f4aa0..9a1dce29248 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-003.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-003.html.ini
@@ -1,2 +1,24 @@
 [pseudo-elements-003.html]
-  expected: ERROR
+  [Originating element container for ::before]
+    expected: FAIL
+
+  [Originating element container for ::after]
+    expected: FAIL
+
+  [Originating element container for ::marker]
+    expected: FAIL
+
+  [Originating element container for ::first-line]
+    expected: FAIL
+
+  [Originating element container for ::first-letter]
+    expected: FAIL
+
+  [Originating element container for outer ::first-line]
+    expected: FAIL
+
+  [Originating element container for outer ::first-letter]
+    expected: FAIL
+
+  [Originating element container for ::backdrop]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-004.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-004.html.ini
index a8ca0682f2b..f6634798250 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-004.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-004.html.ini
@@ -1,2 +1,36 @@
 [pseudo-elements-004.html]
-  expected: ERROR
+  [Initial color for ::before]
+    expected: FAIL
+
+  [Initial color for ::after]
+    expected: FAIL
+
+  [Initial color for ::marker]
+    expected: FAIL
+
+  [Initial color for ::first-line]
+    expected: FAIL
+
+  [Initial color for ::first-letter]
+    expected: FAIL
+
+  [Initial color for ::backdrop]
+    expected: FAIL
+
+  [Color for ::before depending on container]
+    expected: FAIL
+
+  [Color for ::after depending on container]
+    expected: FAIL
+
+  [Color for ::marker depending on container]
+    expected: FAIL
+
+  [Color for ::first-line depending on container]
+    expected: FAIL
+
+  [Color for ::first-letter depending on container]
+    expected: FAIL
+
+  [Color for ::backdrop depending on container]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-006.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-006.html.ini
index 56688ff7a14..fa2220836cf 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-006.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-006.html.ini
@@ -1,2 +1,24 @@
 [pseudo-elements-006.html]
-  expected: ERROR
+  [Originating element container for ::before]
+    expected: FAIL
+
+  [Originating element container for ::after]
+    expected: FAIL
+
+  [Originating element container for ::marker]
+    expected: FAIL
+
+  [Originating element container for ::first-line]
+    expected: FAIL
+
+  [Originating element container for ::first-letter]
+    expected: FAIL
+
+  [Originating element container for outer ::first-line]
+    expected: FAIL
+
+  [Originating element container for outer ::first-letter]
+    expected: FAIL
+
+  [Originating element container for ::backdrop]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-007.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-007.html.ini
index a2d2a17ce5c..9738635a269 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-007.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-007.html.ini
@@ -1,2 +1,36 @@
 [pseudo-elements-007.html]
-  expected: ERROR
+  [Initial font-size for ::before]
+    expected: FAIL
+
+  [Initial font-size for ::after]
+    expected: FAIL
+
+  [Initial font-size for ::marker]
+    expected: FAIL
+
+  [Initial font-size for ::first-line]
+    expected: FAIL
+
+  [Initial font-size for ::first-letter]
+    expected: FAIL
+
+  [Initial font-size for ::backdrop]
+    expected: FAIL
+
+  [font-size for ::before depending on container]
+    expected: FAIL
+
+  [font-size for ::after depending on container]
+    expected: FAIL
+
+  [font-size for ::marker depending on container]
+    expected: FAIL
+
+  [font-size for ::first-line depending on container]
+    expected: FAIL
+
+  [font-size for ::first-letter depending on container]
+    expected: FAIL
+
+  [font-size for ::backdrop depending on container]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-008.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-008.html.ini
index 2a832c4409e..6c2aa824ebb 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-008.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-008.html.ini
@@ -1,2 +1,27 @@
 [pseudo-elements-008.html]
-  expected: ERROR
+  [Originating element container for ::before]
+    expected: FAIL
+
+  [Originating element container for ::after]
+    expected: FAIL
+
+  [Originating element container for ::marker]
+    expected: FAIL
+
+  [Originating element container for ::first-line]
+    expected: FAIL
+
+  [Originating element container for ::first-letter]
+    expected: FAIL
+
+  [Originating element container  for ::highlight]
+    expected: FAIL
+
+  [Originating element container for outer ::first-line]
+    expected: FAIL
+
+  [Originating element container for outer ::first-letter]
+    expected: FAIL
+
+  [Originating element container for ::backdrop]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-013.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-013.html.ini
index 19dae0ed51f..c2167229c8f 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-013.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/pseudo-elements-013.html.ini
@@ -1,2 +1,9 @@
 [pseudo-elements-013.html]
-  expected: ERROR
+  [Initial text-decoration-thickness for highlight pseudo]
+    expected: FAIL
+
+  [text-decoration-thickness for highlight pseudo depending on container]
+    expected: FAIL
+
+  [text-decoration-thickness for highlight pseudo depending on container only defined in a query]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/query-content-box.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/query-content-box.html.ini
index 8d3aec97963..4021c9334df 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/query-content-box.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/query-content-box.html.ini
@@ -1,2 +1,18 @@
 [query-content-box.html]
-  expected: ERROR
+  [Size queries with content-box sizing]
+    expected: FAIL
+
+  [Size queries with border-box sizing]
+    expected: FAIL
+
+  [Size queries with content-box sizing and overflow:scroll]
+    expected: FAIL
+
+  [Size queries with border-box sizing and overflow:scroll]
+    expected: FAIL
+
+  [Size queries with content-box sizing and scrollbar-gutter:stable]
+    expected: FAIL
+
+  [Size queries with border-box sizing and scrollbar-gutter:stable]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/query-evaluation-style.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/query-evaluation-style.html.ini
index 249f397ea3e..51db33e8cbc 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/query-evaluation-style.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/query-evaluation-style.html.ini
@@ -1,2 +1,33 @@
 [query-evaluation-style.html]
-  expected: ERROR
+  [style((--foo: bar))]
+    expected: FAIL
+
+  [style(not (--baz: qux))]
+    expected: FAIL
+
+  [style((--foo: bar) and (--foo: bar))]
+    expected: FAIL
+
+  [style((--foo: bar) and (--foo: bar) and (--foo: bar))]
+    expected: FAIL
+
+  [style((--foo: bar) or (--foo: bar))]
+    expected: FAIL
+
+  [style((--foo: bar) or (--foo: bar) or (--foo: bar))]
+    expected: FAIL
+
+  [style((--baz: qux) or (--foo: bar) or (--foo: bar))]
+    expected: FAIL
+
+  [style((--foo: bar) or (--baz: qux) or (--foo: bar))]
+    expected: FAIL
+
+  [style((--foo: bar) or (--foo: bar) or (--baz: qux))]
+    expected: FAIL
+
+  [style(not ((--foo: bar) and (--baz: qux)))]
+    expected: FAIL
+
+  [style((--baz: qux) or (not ((--baz: qux) and (--foo: bar))))]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/query-evaluation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/query-evaluation.html.ini
index 45622b2e02b..38732e3eacf 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/query-evaluation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/query-evaluation.html.ini
@@ -1,2 +1,39 @@
 [query-evaluation.html]
-  expected: ERROR
+  [(width)]
+    expected: FAIL
+
+  [((width))]
+    expected: FAIL
+
+  [((((width))))]
+    expected: FAIL
+
+  [(not (height))]
+    expected: FAIL
+
+  [((width) and (width))]
+    expected: FAIL
+
+  [((width) and (width) and (width))]
+    expected: FAIL
+
+  [((width) or (width))]
+    expected: FAIL
+
+  [((width) or (width) or (width))]
+    expected: FAIL
+
+  [((height) or (width) or (width))]
+    expected: FAIL
+
+  [((width) or (height) or (width))]
+    expected: FAIL
+
+  [((width) or (width) or (height))]
+    expected: FAIL
+
+  [(not ((width) and (height)))]
+    expected: FAIL
+
+  [((height) or (not ((height) and (width))))]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/reattach-container-with-dirty-child.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/reattach-container-with-dirty-child.html.ini
index cf8a718cb42..2543bb66f8b 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/reattach-container-with-dirty-child.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/reattach-container-with-dirty-child.html.ini
@@ -1,2 +1,6 @@
 [reattach-container-with-dirty-child.html]
-  expected: ERROR
+  [Initially wider than 200px]
+    expected: FAIL
+
+  [Container query changed and inner.style applied]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/sibling-layout-dependency.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/sibling-layout-dependency.html.ini
index 0cb8fb94d65..6081977467a 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/sibling-layout-dependency.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/sibling-layout-dependency.html.ini
@@ -1,2 +1,12 @@
 [sibling-layout-dependency.html]
-  expected: ERROR
+  [Sibling style mutation]
+    expected: FAIL
+
+  [Sibling style mutation, parent is affected]
+    expected: FAIL
+
+  [Sibling style mutation, ancestor is affected]
+    expected: FAIL
+
+  [Sibling text mutation]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/size-container-no-principal-box.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/size-container-no-principal-box.html.ini
index e44c18a4a5d..e2dc245345a 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/size-container-no-principal-box.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/size-container-no-principal-box.html.ini
@@ -1,2 +1,6 @@
 [size-container-no-principal-box.html]
-  expected: ERROR
+  [(min-width: 0) can match a container with a principal box]
+    expected: FAIL
+
+  [not (max-width: 0) can match a container with a principal box]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/size-container-writing-mode-change.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/size-container-writing-mode-change.html.ini
index 7e0cf86879c..65e63c3e7c5 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/size-container-writing-mode-change.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/size-container-writing-mode-change.html.ini
@@ -1,2 +1,6 @@
 [size-container-writing-mode-change.html]
-  expected: ERROR
+  [Initial horizontal writing-mode]
+    expected: FAIL
+
+  [Vertical writing-mode changes logical query evaluation]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/size-feature-evaluation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/size-feature-evaluation.html.ini
index 7e1afb0335b..8ada0b1eb73 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/size-feature-evaluation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/size-feature-evaluation.html.ini
@@ -1,2 +1,84 @@
 [size-feature-evaluation.html]
-  expected: ERROR
+  [(width >= 100px) (.horizontal)]
+    expected: FAIL
+
+  [(min-width: 100px) (.horizontal)]
+    expected: FAIL
+
+  [(max-width: 100px) (.horizontal)]
+    expected: FAIL
+
+  [(height >= 200px) (.horizontal)]
+    expected: FAIL
+
+  [(min-height: 200px) (.horizontal)]
+    expected: FAIL
+
+  [(max-height: 200px) (.horizontal)]
+    expected: FAIL
+
+  [(inline-size >= 100px) (.horizontal)]
+    expected: FAIL
+
+  [(min-inline-size: 100px) (.horizontal)]
+    expected: FAIL
+
+  [(max-inline-size: 100px) (.horizontal)]
+    expected: FAIL
+
+  [(block-size >= 200px) (.horizontal)]
+    expected: FAIL
+
+  [(min-block-size: 200px) (.horizontal)]
+    expected: FAIL
+
+  [(max-block-size: 200px) (.horizontal)]
+    expected: FAIL
+
+  [(orientation: portrait) (.horizontal)]
+    expected: FAIL
+
+  [(aspect-ratio: 1/2) (.horizontal)]
+    expected: FAIL
+
+  [(width >= 100px) (.vertical)]
+    expected: FAIL
+
+  [(min-width: 100px) (.vertical)]
+    expected: FAIL
+
+  [(max-width: 100px) (.vertical)]
+    expected: FAIL
+
+  [(height >= 200px) (.vertical)]
+    expected: FAIL
+
+  [(min-height: 200px) (.vertical)]
+    expected: FAIL
+
+  [(max-height: 200px) (.vertical)]
+    expected: FAIL
+
+  [(block-size >= 100px) (.vertical)]
+    expected: FAIL
+
+  [(min-block-size: 100px) (.vertical)]
+    expected: FAIL
+
+  [(max-block-size: 100px) (.vertical)]
+    expected: FAIL
+
+  [(inline-size >= 200px) (.vertical)]
+    expected: FAIL
+
+  [(min-inline-size: 200px) (.vertical)]
+    expected: FAIL
+
+  [(max-inline-size: 200px) (.vertical)]
+    expected: FAIL
+
+  [(orientation: portrait) (.vertical)]
+    expected: FAIL
+
+  [(aspect-ratio: 1/2) (.vertical)]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/size-query-with-var.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/size-query-with-var.html.ini
index 01bd6446a91..5d3cc79175f 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/size-query-with-var.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/size-query-with-var.html.ini
@@ -1,2 +1,9 @@
 [size-query-with-var.html]
-  expected: ERROR
+  [Matching --match-unknown-fallback]
+    expected: FAIL
+
+  [Matching --match-unregistered]
+    expected: FAIL
+
+  [Matching --match-registered]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/style-change-in-container.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/style-change-in-container.html.ini
index 90db297fc71..a394a8ae697 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/style-change-in-container.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/style-change-in-container.html.ini
@@ -1,2 +1,3 @@
 [style-change-in-container.html]
-  expected: ERROR
+  [Basic test for container query evaluation stability]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/style-not-sharing-float.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/style-not-sharing-float.html.ini
index d0bccfa30c8..41c2fd7e627 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/style-not-sharing-float.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/style-not-sharing-float.html.ini
@@ -1,2 +1,3 @@
 [style-not-sharing-float.html]
-  expected: ERROR
+  [Check that style is not sharing in the case of Container Queries]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/svg-foreignobject-child-container.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/svg-foreignobject-child-container.html.ini
index ff3f6c92e7c..7dede6d4f55 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/svg-foreignobject-child-container.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/svg-foreignobject-child-container.html.ini
@@ -1,2 +1,3 @@
 [svg-foreignobject-child-container.html]
-  expected: ERROR
+  [#inner querying #container inside foreignObject]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/svg-root-size-container.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/svg-root-size-container.html.ini
index e7885ba7658..f9b04ee16b7 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/svg-root-size-container.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/svg-root-size-container.html.ini
@@ -1,2 +1,6 @@
 [svg-root-size-container.html]
-  expected: ERROR
+  [SVG text querying SVG root size container]
+    expected: FAIL
+
+  [div in foreignObject querying SVG root size container]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/table-inside-container-changing-display.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/table-inside-container-changing-display.html.ini
deleted file mode 100644
index dbb9c713fa6..00000000000
--- a/tests/wpt/meta/css/css-conditional/container-queries/table-inside-container-changing-display.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[table-inside-container-changing-display.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/top-layer-dialog-container.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/top-layer-dialog-container.html.ini
index ff2fa350ce4..8acade9d67c 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/top-layer-dialog-container.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/top-layer-dialog-container.html.ini
@@ -1,2 +1,3 @@
 [top-layer-dialog-container.html]
-  expected: ERROR
+  [#dialog sized by viewport]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/top-layer-dialog.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/top-layer-dialog.html.ini
index 41dcc8744af..35f0120c587 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/top-layer-dialog.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/top-layer-dialog.html.ini
@@ -1,2 +1,9 @@
 [top-layer-dialog.html]
-  expected: ERROR
+  [#container changed to 200px]
+    expected: FAIL
+
+  [Modal dialog still has parent as query container while in top layer]
+    expected: FAIL
+
+  [Container changes width while dialog is in top layer]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/top-layer-nested-dialog.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/top-layer-nested-dialog.html.ini
index 249dfb5daee..585df117f9d 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/top-layer-nested-dialog.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/top-layer-nested-dialog.html.ini
@@ -1,2 +1,6 @@
 [top-layer-nested-dialog.html]
-  expected: ERROR
+  [Dialogs still not matching after showModal]
+    expected: FAIL
+
+  [@container queries start matching]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/transition-scrollbars.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/transition-scrollbars.html.ini
index 47f71664131..4239d37f4d7 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/transition-scrollbars.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/transition-scrollbars.html.ini
@@ -1,2 +1,3 @@
 [transition-scrollbars.html]
-  expected: ERROR
+  [Scrollbars do not cause a transition of background-color]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/transition-style-change-event-002.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/transition-style-change-event-002.html.ini
deleted file mode 100644
index 41841cf9807..00000000000
--- a/tests/wpt/meta/css/css-conditional/container-queries/transition-style-change-event-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[transition-style-change-event-002.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/transition-style-change-event.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/transition-style-change-event.html.ini
index ea88c4c0f84..805e5ca57d5 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/transition-style-change-event.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/transition-style-change-event.html.ini
@@ -1,2 +1,3 @@
 [transition-style-change-event.html]
-  expected: ERROR
+  [Container Queries - Style Change Event for transitions]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/unsupported-axis.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/unsupported-axis.html.ini
index 9fbd827569b..ad941bc47c2 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/unsupported-axis.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/unsupported-axis.html.ini
@@ -1,2 +1,12 @@
 [unsupported-axis.html]
-  expected: ERROR
+  [(width > 0px)]
+    expected: FAIL
+
+  [(inline-size > 0px)]
+    expected: FAIL
+
+  [not (width < 0px)]
+    expected: FAIL
+
+  [not (inline-size < 0px)]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/var-evaluation.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/var-evaluation.html.ini
index 580c80cb741..8667a97a347 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/var-evaluation.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/var-evaluation.html.ini
@@ -1,2 +1,3 @@
 [var-evaluation.html]
-  expected: ERROR
+  [inline-size with var-substitution]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/viewport-units-dynamic.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/viewport-units-dynamic.html.ini
index 519f8fc8648..063911fb838 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/viewport-units-dynamic.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/viewport-units-dynamic.html.ini
@@ -1,2 +1,3 @@
 [viewport-units-dynamic.html]
-  expected: ERROR
+  [CSS Container Queries Test: @container-dependent elements respond to viewport unit changes]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/viewport-units.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/viewport-units.html.ini
index b33875ea11d..6663b20ea6e 100644
--- a/tests/wpt/meta/css/css-conditional/container-queries/viewport-units.html.ini
+++ b/tests/wpt/meta/css/css-conditional/container-queries/viewport-units.html.ini
@@ -1,2 +1,6 @@
 [viewport-units.html]
-  expected: ERROR
+  [Match width with vw]
+    expected: FAIL
+
+  [Match width with vh]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/whitespace-update-after-removal.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/whitespace-update-after-removal.html.ini
deleted file mode 100644
index 4d3034d71f7..00000000000
--- a/tests/wpt/meta/css/css-conditional/container-queries/whitespace-update-after-removal.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[whitespace-update-after-removal.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/js/CSS-supports-details-content-pseudo-parsing.html.ini b/tests/wpt/meta/css/css-conditional/js/CSS-supports-details-content-pseudo-parsing.html.ini
new file mode 100644
index 00000000000..ac733ce1164
--- /dev/null
+++ b/tests/wpt/meta/css/css-conditional/js/CSS-supports-details-content-pseudo-parsing.html.ini
@@ -0,0 +1,15 @@
+[CSS-supports-details-content-pseudo-parsing.html]
+  [selector() function accepts ::details-content]
+    expected: FAIL
+
+  [selector() function accepts ::details-content followed by ::before]
+    expected: FAIL
+
+  [selector() function accepts ::details-content followed by ::first-line]
+    expected: FAIL
+
+  [selector() function accepts ::details-content followed by a state pseudo-class]
+    expected: FAIL
+
+  [selector() function accepts ::details-content followed by :lang()]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-content/content-none-option.html.ini b/tests/wpt/meta/css/css-content/content-none-option.html.ini
new file mode 100644
index 00000000000..01e09de35f9
--- /dev/null
+++ b/tests/wpt/meta/css/css-content/content-none-option.html.ini
@@ -0,0 +1,2 @@
+[content-none-option.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-content/content-none-select-1.html.ini b/tests/wpt/meta/css/css-content/content-none-select-1.html.ini
new file mode 100644
index 00000000000..544eeccfe6a
--- /dev/null
+++ b/tests/wpt/meta/css/css-content/content-none-select-1.html.ini
@@ -0,0 +1,2 @@
+[content-none-select-1.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-content/content-none-select-2.html.ini b/tests/wpt/meta/css/css-content/content-none-select-2.html.ini
new file mode 100644
index 00000000000..c649634ad2a
--- /dev/null
+++ b/tests/wpt/meta/css/css-content/content-none-select-2.html.ini
@@ -0,0 +1,2 @@
+[content-none-select-2.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-display/display-contents-blockify-dynamic.html.ini b/tests/wpt/meta/css/css-display/display-contents-blockify-dynamic.html.ini
deleted file mode 100644
index a81f89d198b..00000000000
--- a/tests/wpt/meta/css/css-display/display-contents-blockify-dynamic.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[display-contents-blockify-dynamic.html]
-  [Dynamic changes to `display` causing blockification of children are handled correctly]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-display/parsing/display-computed.html.ini b/tests/wpt/meta/css/css-display/parsing/display-computed.html.ini
index 3d4fabda1b1..4268d41cb00 100644
--- a/tests/wpt/meta/css/css-display/parsing/display-computed.html.ini
+++ b/tests/wpt/meta/css/css-display/parsing/display-computed.html.ini
@@ -1,10 +1,4 @@
 [display-computed.html]
-  [Property display value 'grid']
-    expected: FAIL
-
-  [Property display value 'inline-grid']
-    expected: FAIL
-
   [Property display value 'run-in']
     expected: FAIL
 
@@ -23,12 +17,6 @@
   [Property display value 'list-item flow-root']
     expected: FAIL
 
-  [Property display value 'grid block']
-    expected: FAIL
-
-  [Property display value 'block grid']
-    expected: FAIL
-
   [Property display value 'block ruby']
     expected: FAIL
 
@@ -53,12 +41,6 @@
   [Property display value 'list-item flow-root block']
     expected: FAIL
 
-  [Property display value 'grid inline']
-    expected: FAIL
-
-  [Property display value 'inline grid']
-    expected: FAIL
-
   [Property display value 'inline ruby']
     expected: FAIL
 
@@ -160,15 +142,3 @@
 
   [Property display value 'list-item flow-root run-in']
     expected: FAIL
-
-  [position absolute affects computed display]
-    expected: FAIL
-
-  [position fixed affects computed display]
-    expected: FAIL
-
-  [float left affects computed display]
-    expected: FAIL
-
-  [float right affects computed display]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-display/parsing/display-valid.html.ini b/tests/wpt/meta/css/css-display/parsing/display-valid.html.ini
index 3295d2fbbfa..3115d7b45bb 100644
--- a/tests/wpt/meta/css/css-display/parsing/display-valid.html.ini
+++ b/tests/wpt/meta/css/css-display/parsing/display-valid.html.ini
@@ -1,10 +1,4 @@
 [display-valid.html]
-  [e.style['display'\] = "grid" should set the property value]
-    expected: FAIL
-
-  [e.style['display'\] = "inline-grid" should set the property value]
-    expected: FAIL
-
   [e.style['display'\] = "run-in" should set the property value]
     expected: FAIL
 
@@ -23,12 +17,6 @@
   [e.style['display'\] = "list-item flow-root" should set the property value]
     expected: FAIL
 
-  [e.style['display'\] = "grid block" should set the property value]
-    expected: FAIL
-
-  [e.style['display'\] = "block grid" should set the property value]
-    expected: FAIL
-
   [e.style['display'\] = "block ruby" should set the property value]
     expected: FAIL
 
@@ -53,12 +41,6 @@
   [e.style['display'\] = "list-item flow-root block" should set the property value]
     expected: FAIL
 
-  [e.style['display'\] = "grid inline" should set the property value]
-    expected: FAIL
-
-  [e.style['display'\] = "inline grid" should set the property value]
-    expected: FAIL
-
   [e.style['display'\] = "inline ruby" should set the property value]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-easing/timing-functions-syntax-valid.html.ini b/tests/wpt/meta/css/css-easing/timing-functions-syntax-valid.html.ini
index d697a8f8af9..4620f3f5070 100644
--- a/tests/wpt/meta/css/css-easing/timing-functions-syntax-valid.html.ini
+++ b/tests/wpt/meta/css/css-easing/timing-functions-syntax-valid.html.ini
@@ -25,3 +25,6 @@
 
   [e.style['animation-timing-function'\] = "steps(calc(1), jump-none)" should set the property value]
     expected: FAIL
+
+  [e.style['animation-timing-function'\] = "cubic-bezier(0, sibling-index(), 1, sign(2em - 20px))" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/__dir__.ini b/tests/wpt/meta/css/css-flexbox/__dir__.ini
deleted file mode 100644
index bd1bf899085..00000000000
--- a/tests/wpt/meta/css/css-flexbox/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-prefs: ["layout_columns_enabled:true", "layout_flexbox_enabled:true"]
diff --git a/tests/wpt/meta/css/css-flexbox/alignment/flex-align-baseline-grid-001.html.ini b/tests/wpt/meta/css/css-flexbox/alignment/flex-align-baseline-grid-001.html.ini
index f2825b6eab5..488da9e7b39 100644
--- a/tests/wpt/meta/css/css-flexbox/alignment/flex-align-baseline-grid-001.html.ini
+++ b/tests/wpt/meta/css/css-flexbox/alignment/flex-align-baseline-grid-001.html.ini
@@ -11,5 +11,8 @@
   [.target > * 7]
     expected: FAIL
 
+  [.target > * 9]
+    expected: FAIL
+
   [.target > * 11]
     expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/dynamic-grid-flex-abspos.html.ini b/tests/wpt/meta/css/css-flexbox/dynamic-grid-flex-abspos.html.ini
deleted file mode 100644
index 6205691956d..00000000000
--- a/tests/wpt/meta/css/css-flexbox/dynamic-grid-flex-abspos.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[dynamic-grid-flex-abspos.html]
-  [.relpos 4]
-    expected: FAIL
-
-  [.relpos 8]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/css/css-flexbox/empty-flex-box-and-margin-collapsing.html.ini b/tests/wpt/meta/css/css-flexbox/empty-flex-box-and-margin-collapsing.html.ini
deleted file mode 100644
index 69249f48f67..00000000000
--- a/tests/wpt/meta/css/css-flexbox/empty-flex-box-and-margin-collapsing.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[empty-flex-box-and-margin-collapsing.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/flex-shorthand-calc.html.ini b/tests/wpt/meta/css/css-flexbox/flex-shorthand-calc.html.ini
new file mode 100644
index 00000000000..4f43d0e7e64
--- /dev/null
+++ b/tests/wpt/meta/css/css-flexbox/flex-shorthand-calc.html.ini
@@ -0,0 +1,12 @@
+[flex-shorthand-calc.html]
+  [e.style['flex'\] = "sign(1em - 1px) sibling-index()" should set flex-basis]
+    expected: FAIL
+
+  [e.style['flex'\] = "sign(1em - 1px) sibling-index()" should set flex-grow]
+    expected: FAIL
+
+  [e.style['flex'\] = "sign(1em - 1px) sibling-index()" should set flex-shrink]
+    expected: FAIL
+
+  [e.style['flex'\] = "sign(1em - 1px) sibling-index()" should not set unrelated longhands]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-auto-size.html.ini b/tests/wpt/meta/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-auto-size.html.ini
deleted file mode 100644
index 2f1915e3b6f..00000000000
--- a/tests/wpt/meta/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-auto-size.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[flexbox_computedstyle_min-auto-size.html]
-  [Computed min-width/min-height of specified auto inside display:none which would otherwise have been a flex item.]
-    expected: FAIL
-
-  [Computed min-width/min-height of specified auto with display:none which would otherwise have been a flex item.]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/css/css-flexbox/grid-flex-item-002.html.ini b/tests/wpt/meta/css/css-flexbox/grid-flex-item-002.html.ini
deleted file mode 100644
index 60a9db07f7c..00000000000
--- a/tests/wpt/meta/css/css-flexbox/grid-flex-item-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-flex-item-002.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/grid-flex-item-005.html.ini b/tests/wpt/meta/css/css-flexbox/grid-flex-item-005.html.ini
deleted file mode 100644
index 3fe332060a7..00000000000
--- a/tests/wpt/meta/css/css-flexbox/grid-flex-item-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-flex-item-005.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/intrinsic-size/row-wrap-002.tentative.html.ini b/tests/wpt/meta/css/css-flexbox/intrinsic-size/row-wrap-002.tentative.html.ini
deleted file mode 100644
index f8a8e27c760..00000000000
--- a/tests/wpt/meta/css/css-flexbox/intrinsic-size/row-wrap-002.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[row-wrap-002.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/negative-overflow.html.ini b/tests/wpt/meta/css/css-flexbox/negative-overflow.html.ini
index 38100976826..e483189946d 100644
--- a/tests/wpt/meta/css/css-flexbox/negative-overflow.html.ini
+++ b/tests/wpt/meta/css/css-flexbox/negative-overflow.html.ini
@@ -5,21 +5,9 @@
   [.flexbox 11]
     expected: FAIL
 
-  [.flexbox 6]
-    expected: FAIL
-
-  [.flexbox 7]
-    expected: FAIL
-
-  [.flexbox 1]
-    expected: FAIL
-
   [.flexbox 2]
     expected: FAIL
 
-  [.flexbox 3]
-    expected: FAIL
-
   [.flexbox 8]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-flexbox/parsing/flex-computed.html.ini b/tests/wpt/meta/css/css-flexbox/parsing/flex-computed.html.ini
new file mode 100644
index 00000000000..961cc35e1fd
--- /dev/null
+++ b/tests/wpt/meta/css/css-flexbox/parsing/flex-computed.html.ini
@@ -0,0 +1,6 @@
+[flex-computed.html]
+  [Property flex value 'calc(10 + (sign(20cqw - 10px) * 5)) calc(10 + (sign(20cqw - 10px) * 5)) 1px']
+    expected: FAIL
+
+  [Property flex value '1 1 calc(10px + (sign(20cqw - 10px) * 5px))']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/parsing/flex-valid.html.ini b/tests/wpt/meta/css/css-flexbox/parsing/flex-valid.html.ini
new file mode 100644
index 00000000000..b41d365170c
--- /dev/null
+++ b/tests/wpt/meta/css/css-flexbox/parsing/flex-valid.html.ini
@@ -0,0 +1,6 @@
+[flex-valid.html]
+  [e.style['flex'\] = "calc(10 + (sign(20cqw - 10px) * 5)) calc(10 + (sign(20cqw - 10px) * 5)) 1px" should set the property value]
+    expected: FAIL
+
+  [e.style['flex'\] = "1 1 calc(10px + (sign(20cqw - 10px) * 5px))" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/quirks-auto-block-size-with-percentage-item.html.ini b/tests/wpt/meta/css/css-flexbox/quirks-auto-block-size-with-percentage-item.html.ini
deleted file mode 100644
index 2db27f1d053..00000000000
--- a/tests/wpt/meta/css/css-flexbox/quirks-auto-block-size-with-percentage-item.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[quirks-auto-block-size-with-percentage-item.html]
-  [#container 1]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/table-as-item-fixed-min-width-3.html.ini b/tests/wpt/meta/css/css-flexbox/table-as-item-fixed-min-width-3.html.ini
deleted file mode 100644
index d216a20f66b..00000000000
--- a/tests/wpt/meta/css/css-flexbox/table-as-item-fixed-min-width-3.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[table-as-item-fixed-min-width-3.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/table-as-item-min-content-height-1.tentative.html.ini b/tests/wpt/meta/css/css-flexbox/table-as-item-min-content-height-1.tentative.html.ini
deleted file mode 100644
index 17d5171d154..00000000000
--- a/tests/wpt/meta/css/css-flexbox/table-as-item-min-content-height-1.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[table-as-item-min-content-height-1.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/table-as-item-min-content-height-2.tentative.html.ini b/tests/wpt/meta/css/css-flexbox/table-as-item-min-content-height-2.tentative.html.ini
deleted file mode 100644
index b31200fbdb9..00000000000
--- a/tests/wpt/meta/css/css-flexbox/table-as-item-min-content-height-2.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[table-as-item-min-content-height-2.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/font-synthesis-08.html.ini b/tests/wpt/meta/css/css-fonts/font-synthesis-08.html.ini
deleted file mode 100644
index 20db075c10c..00000000000
--- a/tests/wpt/meta/css/css-fonts/font-synthesis-08.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[font-synthesis-08.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/font-variant-emoji-004.html.ini b/tests/wpt/meta/css/css-fonts/font-variant-emoji-004.html.ini
deleted file mode 100644
index 61006a4ff60..00000000000
--- a/tests/wpt/meta/css/css-fonts/font-variant-emoji-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[font-variant-emoji-004.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/font-variation-settings-calc.html.ini b/tests/wpt/meta/css/css-fonts/font-variation-settings-calc.html.ini
new file mode 100644
index 00000000000..3a095adab62
--- /dev/null
+++ b/tests/wpt/meta/css/css-fonts/font-variation-settings-calc.html.ini
@@ -0,0 +1,24 @@
+[font-variation-settings-calc.html]
+  [e.style['font-variation-settings'\] = "\\"wght\\" sign(1em - 1px)" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variation-settings'\] = "\\"wght\\" sibling-index()" should set the property value]
+    expected: FAIL
+
+  [Property font-variation-settings value '"wght" sign(1em - 1px)']
+    expected: FAIL
+
+  [Property font-variation-settings value '"wght" sibling-index()']
+    expected: FAIL
+
+  [e.style['font-variation-settings'\] = "\\"wght\\" calc(10)" should set the property value]
+    expected: FAIL
+
+  [e.style['font-variation-settings'\] = "\\"wght\\" sign(2px)" should set the property value]
+    expected: FAIL
+
+  [Property font-variation-settings value '"wght" calc(10)']
+    expected: FAIL
+
+  [Property font-variation-settings value '"wght" sign(2px)']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/parsing/font-palette-values-invalid.html.ini b/tests/wpt/meta/css/css-fonts/parsing/font-palette-values-invalid.html.ini
index 86c285fb78a..0d491bce6a4 100644
--- a/tests/wpt/meta/css/css-fonts/parsing/font-palette-values-invalid.html.ini
+++ b/tests/wpt/meta/css/css-fonts/parsing/font-palette-values-invalid.html.ini
@@ -73,3 +73,6 @@
 
   [CSS Fonts Module Level 4: parsing @font-palette-values 25]
     expected: FAIL
+
+  [sibling-index() is invalid in base-palette descriptor]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/parsing/font-stretch-computed.html.ini b/tests/wpt/meta/css/css-fonts/parsing/font-stretch-computed.html.ini
deleted file mode 100644
index 1e985cb770a..00000000000
--- a/tests/wpt/meta/css/css-fonts/parsing/font-stretch-computed.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[font-stretch-computed.html]
-  [Property font-stretch value 'calc(100% + (sign(20cqw - 10px) * 5%))']
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/parsing/font-stretch-valid.html.ini b/tests/wpt/meta/css/css-fonts/parsing/font-stretch-valid.html.ini
deleted file mode 100644
index 8d0d3962761..00000000000
--- a/tests/wpt/meta/css/css-fonts/parsing/font-stretch-valid.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[font-stretch-valid.html]
-  [e.style['font-stretch'\] = "calc(100% + (sign(20cqw - 10px) * 5%))" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/parsing/font-width-computed.html.ini b/tests/wpt/meta/css/css-fonts/parsing/font-width-computed.html.ini
new file mode 100644
index 00000000000..91776d4f230
--- /dev/null
+++ b/tests/wpt/meta/css/css-fonts/parsing/font-width-computed.html.ini
@@ -0,0 +1,48 @@
+[font-width-computed.html]
+  [Property font-width value 'ultra-condensed']
+    expected: FAIL
+
+  [Property font-width value 'extra-condensed']
+    expected: FAIL
+
+  [Property font-width value 'condensed']
+    expected: FAIL
+
+  [Property font-width value 'semi-condensed']
+    expected: FAIL
+
+  [Property font-width value 'normal']
+    expected: FAIL
+
+  [Property font-width value 'semi-expanded']
+    expected: FAIL
+
+  [Property font-width value 'expanded']
+    expected: FAIL
+
+  [Property font-width value 'extra-expanded']
+    expected: FAIL
+
+  [Property font-width value 'ultra-expanded']
+    expected: FAIL
+
+  [Property font-width value '234.5%']
+    expected: FAIL
+
+  [Property font-width value 'calc(100%)']
+    expected: FAIL
+
+  [Property font-width value 'calc(0%)']
+    expected: FAIL
+
+  [Property font-width value 'calc(-100%)']
+    expected: FAIL
+
+  [Property font-width value 'calc(100% + 100%)']
+    expected: FAIL
+
+  [Property font-width value 'calc(100% + (sign(20cqw - 10px) * 5%))']
+    expected: FAIL
+
+  [Property font-stretch value 'calc(100% + (sign(20cqw - 10px) * 5%))']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/parsing/font-width-valid.html.ini b/tests/wpt/meta/css/css-fonts/parsing/font-width-valid.html.ini
new file mode 100644
index 00000000000..02aa615b156
--- /dev/null
+++ b/tests/wpt/meta/css/css-fonts/parsing/font-width-valid.html.ini
@@ -0,0 +1,48 @@
+[font-width-valid.html]
+  [e.style['font-width'\] = "normal" should set the property value]
+    expected: FAIL
+
+  [e.style['font-width'\] = "ultra-condensed" should set the property value]
+    expected: FAIL
+
+  [e.style['font-width'\] = "extra-condensed" should set the property value]
+    expected: FAIL
+
+  [e.style['font-width'\] = "condensed" should set the property value]
+    expected: FAIL
+
+  [e.style['font-width'\] = "semi-condensed" should set the property value]
+    expected: FAIL
+
+  [e.style['font-width'\] = "semi-expanded" should set the property value]
+    expected: FAIL
+
+  [e.style['font-width'\] = "expanded" should set the property value]
+    expected: FAIL
+
+  [e.style['font-width'\] = "extra-expanded" should set the property value]
+    expected: FAIL
+
+  [e.style['font-width'\] = "ultra-expanded" should set the property value]
+    expected: FAIL
+
+  [e.style['font-width'\] = "234.5%" should set the property value]
+    expected: FAIL
+
+  [e.style['font-width'\] = "calc(100%)" should set the property value]
+    expected: FAIL
+
+  [e.style['font-width'\] = "calc(0%)" should set the property value]
+    expected: FAIL
+
+  [e.style['font-width'\] = "calc(-100%)" should set the property value]
+    expected: FAIL
+
+  [e.style['font-width'\] = "calc(100% + 100%)" should set the property value]
+    expected: FAIL
+
+  [e.style['font-width'\] = "calc(100% + (sign(20cqw - 10px) * 5%))" should set the property value]
+    expected: FAIL
+
+  [e.style['font-stretch'\] = "calc(100% + (sign(20cqw - 10px) * 5%))" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/test_font_feature_values_parsing.html.ini b/tests/wpt/meta/css/css-fonts/test_font_feature_values_parsing.html.ini
index 6b1969e3049..b0922321d1f 100644
--- a/tests/wpt/meta/css/css-fonts/test_font_feature_values_parsing.html.ini
+++ b/tests/wpt/meta/css/css-fonts/test_font_feature_values_parsing.html.ini
@@ -316,3 +316,6 @@
 
   [basic parse tests - @font-feature-values bongo { @styleset { complex\\  blah: 1; } }]
     expected: FAIL
+
+  [basic parse tests - @font-feature-values bongo { @stylistic { blah: sibling-index(); } }]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-001.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-001.html.ini
new file mode 100644
index 00000000000..7c470f39fc1
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-001.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-002.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-002.html.ini
new file mode 100644
index 00000000000..35e281db355
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-002.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-003.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-003.html.ini
new file mode 100644
index 00000000000..065750a2637
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-003.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-004.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-004.html.ini
new file mode 100644
index 00000000000..33a8389bbd0
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-004.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-005.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-005.html.ini
new file mode 100644
index 00000000000..44a99785f78
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-005.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-005.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-006.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-006.html.ini
new file mode 100644
index 00000000000..eb292ead119
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-006.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-006.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-007.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-007.html.ini
new file mode 100644
index 00000000000..3886670391a
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-007.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-007.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-008.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-008.html.ini
new file mode 100644
index 00000000000..e93e69af6ff
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-008.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-008.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-009.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-009.html.ini
new file mode 100644
index 00000000000..dad33643f33
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-009.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-009.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-010.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-010.html.ini
new file mode 100644
index 00000000000..f3e2ddf5b5f
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-010.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-010.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-011.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-011.html.ini
new file mode 100644
index 00000000000..bb03468b7da
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-011.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-011.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-012.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-012.html.ini
new file mode 100644
index 00000000000..ad9928fe9aa
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-012.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-012.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-013.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-013.html.ini
new file mode 100644
index 00000000000..e30d5b33be0
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-013.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-013.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-014.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-014.html.ini
new file mode 100644
index 00000000000..324e614ac6e
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-014.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-014.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-015.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-015.html.ini
new file mode 100644
index 00000000000..7abe6f62b5a
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-015.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-015.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-016.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-016.html.ini
new file mode 100644
index 00000000000..8b59b4a6052
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-016.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-016.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-019.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-019.html.ini
new file mode 100644
index 00000000000..609484e7af3
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-019.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-019.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-022.html.ini b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-022.html.ini
new file mode 100644
index 00000000000..1d8edacc4e1
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/flex/flex-gap-decorations-022.html.ini
@@ -0,0 +1,2 @@
+[flex-gap-decorations-022.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/tentative/grid/grid-gap-decorations-001.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-001.html.ini
similarity index 100%
rename from tests/wpt/meta/css/css-gaps/tentative/grid/grid-gap-decorations-001.html.ini
rename to tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-001.html.ini
diff --git a/tests/wpt/meta/css/css-gaps/tentative/grid/grid-gap-decorations-002.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-002.html.ini
similarity index 100%
rename from tests/wpt/meta/css/css-gaps/tentative/grid/grid-gap-decorations-002.html.ini
rename to tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-002.html.ini
diff --git a/tests/wpt/meta/css/css-gaps/tentative/grid/grid-gap-decorations-003.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-003.html.ini
similarity index 100%
rename from tests/wpt/meta/css/css-gaps/tentative/grid/grid-gap-decorations-003.html.ini
rename to tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-003.html.ini
diff --git a/tests/wpt/meta/css/css-gaps/tentative/grid/grid-gap-decorations-004.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-004.html.ini
similarity index 100%
rename from tests/wpt/meta/css/css-gaps/tentative/grid/grid-gap-decorations-004.html.ini
rename to tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-004.html.ini
diff --git a/tests/wpt/meta/css/css-gaps/tentative/grid/grid-gap-decorations-005.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-005.html.ini
similarity index 100%
rename from tests/wpt/meta/css/css-gaps/tentative/grid/grid-gap-decorations-005.html.ini
rename to tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-005.html.ini
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-006.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-006.html.ini
new file mode 100644
index 00000000000..c7b6f64746b
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-006.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-006.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-007.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-007.html.ini
new file mode 100644
index 00000000000..78c144577df
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-007.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-007.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-008.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-008.html.ini
new file mode 100644
index 00000000000..0d707b027b1
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-008.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-008.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-009.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-009.html.ini
new file mode 100644
index 00000000000..47829d9a1f4
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-009.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-009.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-010.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-010.html.ini
new file mode 100644
index 00000000000..3604969e91b
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-010.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-010.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-011.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-011.html.ini
new file mode 100644
index 00000000000..a19940da849
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-011.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-011.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-012.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-012.html.ini
new file mode 100644
index 00000000000..9d4c60da0ee
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-012.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-012.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-013.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-013.html.ini
new file mode 100644
index 00000000000..e8909f26d4b
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-013.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-013.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-014.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-014.html.ini
new file mode 100644
index 00000000000..c6bb632ecd6
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-014.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-014.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-015.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-015.html.ini
new file mode 100644
index 00000000000..82c738da9f5
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-015.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-015.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-016.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-016.html.ini
new file mode 100644
index 00000000000..d540ae8a7bd
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-016.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-016.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-017.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-017.html.ini
new file mode 100644
index 00000000000..4e579e8d253
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-017.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-017.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-018.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-018.html.ini
new file mode 100644
index 00000000000..66237ae937d
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-018.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-018.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-019.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-019.html.ini
new file mode 100644
index 00000000000..87433c54943
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-019.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-019.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-022.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-022.html.ini
new file mode 100644
index 00000000000..230b2658f27
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-022.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-022.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-023.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-023.html.ini
new file mode 100644
index 00000000000..bdb184d6539
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-023.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-023.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-024.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-024.html.ini
new file mode 100644
index 00000000000..af150778186
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-024.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-024.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-025.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-025.html.ini
new file mode 100644
index 00000000000..022f9b1d57a
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-025.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-025.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-026.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-026.html.ini
new file mode 100644
index 00000000000..9d9062851b2
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-026.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-026.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-027.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-027.html.ini
new file mode 100644
index 00000000000..2e6b48820cd
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-027.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-027.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-028.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-028.html.ini
new file mode 100644
index 00000000000..b851b19644a
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-028.html.ini
@@ -0,0 +1,3 @@
+[grid-gap-decorations-028.html]
+  [`column-rule-color` should be rgb(0, 255, 0)]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-029.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-029.html.ini
new file mode 100644
index 00000000000..6198f1bf534
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-029.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-029.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-030.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-030.html.ini
new file mode 100644
index 00000000000..76e055a6a0a
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-030.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-030.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-031.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-031.html.ini
new file mode 100644
index 00000000000..d9765648ea7
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-031.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-031.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-032.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-032.html.ini
new file mode 100644
index 00000000000..1e5a6bc2a68
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-032.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-032.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-033.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-033.html.ini
new file mode 100644
index 00000000000..aaeff2efe72
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-033.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-033.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-38.html.ini b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-38.html.ini
new file mode 100644
index 00000000000..eb1f89bfb6d
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/grid/grid-gap-decorations-38.html.ini
@@ -0,0 +1,2 @@
+[grid-gap-decorations-38.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-001.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-001.html.ini
new file mode 100644
index 00000000000..09b5c2407df
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-001.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-002.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-002.html.ini
new file mode 100644
index 00000000000..d3d6008a74d
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-002.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-003.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-003.html.ini
new file mode 100644
index 00000000000..be28f9f62c3
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-003.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-004.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-004.html.ini
new file mode 100644
index 00000000000..f2c19d9824a
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-004.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-005.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-005.html.ini
new file mode 100644
index 00000000000..e63a9af4a63
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-005.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-005.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-006.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-006.html.ini
new file mode 100644
index 00000000000..e9fd7c8f430
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-006.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-006.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-007.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-007.html.ini
new file mode 100644
index 00000000000..f0da110b11d
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-007.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-007.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-008.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-008.html.ini
new file mode 100644
index 00000000000..fecb739fed1
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-008.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-008.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-009.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-009.html.ini
new file mode 100644
index 00000000000..15809ab6be8
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-009.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-009.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-010.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-010.html.ini
new file mode 100644
index 00000000000..087a090d25e
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-010.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-010.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-011.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-011.html.ini
new file mode 100644
index 00000000000..39cd43f8d3f
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-011.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-011.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-012.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-012.html.ini
new file mode 100644
index 00000000000..c60637403c8
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-012.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-012.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-013.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-013.html.ini
new file mode 100644
index 00000000000..319ec1ea8c7
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-013.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-013.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-014.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-014.html.ini
new file mode 100644
index 00000000000..7baae0182e4
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-014.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-014.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-015.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-015.html.ini
new file mode 100644
index 00000000000..c5f1c0f943e
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-015.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-015.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-016.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-016.html.ini
new file mode 100644
index 00000000000..63d5d357009
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-016.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-016.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-017.html.ini b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-017.html.ini
new file mode 100644
index 00000000000..b4d67fce3e3
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/multicol/multicol-gap-decorations-017.html.ini
@@ -0,0 +1,2 @@
+[multicol-gap-decorations-017.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-bidirectional-shorthands.html.ini b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-bidirectional-shorthands.html.ini
new file mode 100644
index 00000000000..796cecfb56e
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-bidirectional-shorthands.html.ini
@@ -0,0 +1,9 @@
+[gap-decorations-bidirectional-shorthands.html]
+  [rule-color shorthand computed from longhand values]
+    expected: FAIL
+
+  [rule-width shorthand computed from longhand values]
+    expected: FAIL
+
+  [rule-style shorthand computed from longhand values]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-col-rule-width.html.ini b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-col-rule-width.html.ini
new file mode 100644
index 00000000000..02d385579b9
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-col-rule-width.html.ini
@@ -0,0 +1,9 @@
+[gap-decorations-col-rule-width.html]
+  [`column-rule-width` should be `0px` when `column-rule-style` is `none` with single value]
+    expected: FAIL
+
+  [`column-rule-width` should be as specified regardless of `column-rule-style` with multiple values]
+    expected: FAIL
+
+  [`column-rule-width` should be as specified regardless of `column-rule-style` with multiple (repeat) values]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-color-computed.html.ini b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-color-computed.html.ini
new file mode 100644
index 00000000000..5d5ffad0d95
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-color-computed.html.ini
@@ -0,0 +1,99 @@
+[gap-decorations-color-computed.html]
+  [Property column-rule-color value 'currentcolor']
+    expected: FAIL
+
+  [Property column-rule-color value 'red']
+    expected: FAIL
+
+  [Property column-rule-color value 'repeat(4, yellow)']
+    expected: FAIL
+
+  [Property column-rule-color value 'red green blue']
+    expected: FAIL
+
+  [Property column-rule-color value 'repeat(7, lime) repeat(3, red)']
+    expected: FAIL
+
+  [Property column-rule-color value 'repeat(auto, red)']
+    expected: FAIL
+
+  [Property column-rule-color value 'repeat(calc(5 + 3), salmon)']
+    expected: FAIL
+
+  [Property column-rule-color value 'color-mix(in srgb, red 50%, blue 50%)']
+    expected: FAIL
+
+  [Property column-rule-color value 'color-mix(in srgb, lime 25%, yellow 75%)']
+    expected: FAIL
+
+  [Property column-rule-color value 'repeat(auto, rgb(from lime r g b))']
+    expected: FAIL
+
+  [Property column-rule-color value 'rgb(from yellow calc(255 - r) calc(255 - g) calc(255 - b))']
+    expected: FAIL
+
+  [Property row-rule-color value 'currentcolor']
+    expected: FAIL
+
+  [Property row-rule-color value 'red']
+    expected: FAIL
+
+  [Property row-rule-color value 'repeat(4, yellow)']
+    expected: FAIL
+
+  [Property row-rule-color value 'red green blue']
+    expected: FAIL
+
+  [Property row-rule-color value 'repeat(7, lime) repeat(3, red)']
+    expected: FAIL
+
+  [Property row-rule-color value 'repeat(auto, red)']
+    expected: FAIL
+
+  [Property row-rule-color value 'repeat(calc(5 + 3), salmon)']
+    expected: FAIL
+
+  [Property row-rule-color value 'color-mix(in srgb, red 50%, blue 50%)']
+    expected: FAIL
+
+  [Property row-rule-color value 'color-mix(in srgb, lime 25%, yellow 75%)']
+    expected: FAIL
+
+  [Property row-rule-color value 'repeat(auto, rgb(from lime r g b))']
+    expected: FAIL
+
+  [Property row-rule-color value 'rgb(from yellow calc(255 - r) calc(255 - g) calc(255 - b))']
+    expected: FAIL
+
+  [Property rule-color value 'currentcolor']
+    expected: FAIL
+
+  [Property rule-color value 'red']
+    expected: FAIL
+
+  [Property rule-color value 'repeat(4, yellow)']
+    expected: FAIL
+
+  [Property rule-color value 'red green blue']
+    expected: FAIL
+
+  [Property rule-color value 'repeat(7, lime) repeat(3, red)']
+    expected: FAIL
+
+  [Property rule-color value 'repeat(auto, red)']
+    expected: FAIL
+
+  [Property rule-color value 'repeat(calc(5 + 3), salmon)']
+    expected: FAIL
+
+  [Property rule-color value 'color-mix(in srgb, red 50%, blue 50%)']
+    expected: FAIL
+
+  [Property rule-color value 'color-mix(in srgb, lime 25%, yellow 75%)']
+    expected: FAIL
+
+  [Property rule-color value 'repeat(auto, rgb(from lime r g b))']
+    expected: FAIL
+
+  [Property rule-color value 'rgb(from yellow calc(255 - r) calc(255 - g) calc(255 - b))']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-color-valid.html.ini b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-color-valid.html.ini
new file mode 100644
index 00000000000..8edf4d06199
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-color-valid.html.ini
@@ -0,0 +1,135 @@
+[gap-decorations-color-valid.html]
+  [e.style['column-rule-color'\] = "repeat(4, blue)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-color'\] = "repeat(3, red green blue)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-color'\] = "repeat(1, red green blue yellow)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-color'\] = "red" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-color'\] = "repeat(4, cyan)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-color'\] = "green blue" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-color'\] = "red blue green yellow pink" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-color'\] = "repeat(3, blue) repeat(4, red)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-color'\] = "red repeat(3, blue) blue repeat(4, red green cyan)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-color'\] = "repeat(4, red green cyan) repeat(5, yellow) blue" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-color'\] = "repeat(auto, red)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-color'\] = "repeat(auto, red green blue)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-color'\] = "repeat(auto, red green) red" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-color'\] = "repeat(4, blue red green) repeat(auto, red)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-color'\] = "blue repeat(auto, red green) repeat(4, blue red green)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-color'\] = "repeat(4, blue)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-color'\] = "repeat(3, red green blue)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-color'\] = "repeat(1, red green blue yellow)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-color'\] = "red" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-color'\] = "repeat(4, cyan)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-color'\] = "green blue" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-color'\] = "red blue green yellow pink" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-color'\] = "repeat(3, blue) repeat(4, red)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-color'\] = "red repeat(3, blue) blue repeat(4, red green cyan)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-color'\] = "repeat(4, red green cyan) repeat(5, yellow) blue" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-color'\] = "repeat(auto, red)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-color'\] = "repeat(auto, red green blue)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-color'\] = "repeat(auto, red green) red" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-color'\] = "repeat(4, blue red green) repeat(auto, red)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-color'\] = "blue repeat(auto, red green) repeat(4, blue red green)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-color'\] = "repeat(4, blue)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-color'\] = "repeat(3, red green blue)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-color'\] = "repeat(1, red green blue yellow)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-color'\] = "red" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-color'\] = "repeat(4, cyan)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-color'\] = "green blue" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-color'\] = "red blue green yellow pink" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-color'\] = "repeat(3, blue) repeat(4, red)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-color'\] = "red repeat(3, blue) blue repeat(4, red green cyan)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-color'\] = "repeat(4, red green cyan) repeat(5, yellow) blue" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-color'\] = "repeat(auto, red)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-color'\] = "repeat(auto, red green blue)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-color'\] = "repeat(auto, red green) red" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-color'\] = "repeat(4, blue red green) repeat(auto, red)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-color'\] = "blue repeat(auto, red green) repeat(4, blue red green)" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-style-computed.html.ini b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-style-computed.html.ini
new file mode 100644
index 00000000000..e0109319b93
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-style-computed.html.ini
@@ -0,0 +1,189 @@
+[gap-decorations-style-computed.html]
+  [Property column-rule-style value 'none']
+    expected: FAIL
+
+  [Property column-rule-style value 'hidden']
+    expected: FAIL
+
+  [Property column-rule-style value 'dotted']
+    expected: FAIL
+
+  [Property column-rule-style value 'dashed']
+    expected: FAIL
+
+  [Property column-rule-style value 'solid']
+    expected: FAIL
+
+  [Property column-rule-style value 'double']
+    expected: FAIL
+
+  [Property column-rule-style value 'groove']
+    expected: FAIL
+
+  [Property column-rule-style value 'ridge']
+    expected: FAIL
+
+  [Property column-rule-style value 'inset']
+    expected: FAIL
+
+  [Property column-rule-style value 'dotted dashed solid']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(10, double)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(3, groove) repeat(4, ridge)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(auto, solid)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(auto, dotted solid inset)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(4, none ridge solid) repeat(auto, hidden)']
+    expected: FAIL
+
+  [Property column-rule-style value 'inset repeat(auto, solid ridge) repeat(4, none groove hidden)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(calc(5 + 3), ridge)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(4, dotted double dashed) repeat(auto, solid) ridge']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(4, dotted double dashed) repeat(auto, solid) repeat(4, none groove hidden)']
+    expected: FAIL
+
+  [Property column-rule-style value 'ridge repeat(auto, solid)']
+    expected: FAIL
+
+  [Property column-rule-style value 'ridge repeat(auto, solid) ridge']
+    expected: FAIL
+
+  [Property row-rule-style value 'none']
+    expected: FAIL
+
+  [Property row-rule-style value 'hidden']
+    expected: FAIL
+
+  [Property row-rule-style value 'dotted']
+    expected: FAIL
+
+  [Property row-rule-style value 'dashed']
+    expected: FAIL
+
+  [Property row-rule-style value 'solid']
+    expected: FAIL
+
+  [Property row-rule-style value 'double']
+    expected: FAIL
+
+  [Property row-rule-style value 'groove']
+    expected: FAIL
+
+  [Property row-rule-style value 'ridge']
+    expected: FAIL
+
+  [Property row-rule-style value 'inset']
+    expected: FAIL
+
+  [Property row-rule-style value 'dotted dashed solid']
+    expected: FAIL
+
+  [Property row-rule-style value 'repeat(10, double)']
+    expected: FAIL
+
+  [Property row-rule-style value 'repeat(3, groove) repeat(4, ridge)']
+    expected: FAIL
+
+  [Property row-rule-style value 'repeat(auto, solid)']
+    expected: FAIL
+
+  [Property row-rule-style value 'repeat(auto, dotted solid inset)']
+    expected: FAIL
+
+  [Property row-rule-style value 'repeat(4, none ridge solid) repeat(auto, hidden)']
+    expected: FAIL
+
+  [Property row-rule-style value 'inset repeat(auto, solid ridge) repeat(4, none groove hidden)']
+    expected: FAIL
+
+  [Property row-rule-style value 'repeat(calc(5 + 3), ridge)']
+    expected: FAIL
+
+  [Property row-rule-style value 'repeat(4, dotted double dashed) repeat(auto, solid) ridge']
+    expected: FAIL
+
+  [Property row-rule-style value 'repeat(4, dotted double dashed) repeat(auto, solid) repeat(4, none groove hidden)']
+    expected: FAIL
+
+  [Property row-rule-style value 'ridge repeat(auto, solid)']
+    expected: FAIL
+
+  [Property row-rule-style value 'ridge repeat(auto, solid) ridge']
+    expected: FAIL
+
+  [Property rule-style value 'none']
+    expected: FAIL
+
+  [Property rule-style value 'hidden']
+    expected: FAIL
+
+  [Property rule-style value 'dotted']
+    expected: FAIL
+
+  [Property rule-style value 'dashed']
+    expected: FAIL
+
+  [Property rule-style value 'solid']
+    expected: FAIL
+
+  [Property rule-style value 'double']
+    expected: FAIL
+
+  [Property rule-style value 'groove']
+    expected: FAIL
+
+  [Property rule-style value 'ridge']
+    expected: FAIL
+
+  [Property rule-style value 'inset']
+    expected: FAIL
+
+  [Property rule-style value 'dotted dashed solid']
+    expected: FAIL
+
+  [Property rule-style value 'repeat(10, double)']
+    expected: FAIL
+
+  [Property rule-style value 'repeat(3, groove) repeat(4, ridge)']
+    expected: FAIL
+
+  [Property rule-style value 'repeat(auto, solid)']
+    expected: FAIL
+
+  [Property rule-style value 'repeat(auto, dotted solid inset)']
+    expected: FAIL
+
+  [Property rule-style value 'repeat(4, none ridge solid) repeat(auto, hidden)']
+    expected: FAIL
+
+  [Property rule-style value 'inset repeat(auto, solid ridge) repeat(4, none groove hidden)']
+    expected: FAIL
+
+  [Property rule-style value 'repeat(calc(5 + 3), ridge)']
+    expected: FAIL
+
+  [Property rule-style value 'repeat(4, dotted double dashed) repeat(auto, solid) ridge']
+    expected: FAIL
+
+  [Property rule-style value 'repeat(4, dotted double dashed) repeat(auto, solid) repeat(4, none groove hidden)']
+    expected: FAIL
+
+  [Property rule-style value 'ridge repeat(auto, solid)']
+    expected: FAIL
+
+  [Property rule-style value 'ridge repeat(auto, solid) ridge']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-style-valid.html.ini b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-style-valid.html.ini
new file mode 100644
index 00000000000..ca1d59405cf
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-style-valid.html.ini
@@ -0,0 +1,135 @@
+[gap-decorations-style-valid.html]
+  [e.style['column-rule-style'\] = "repeat(4, dotted)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(3, dashed double dotted)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(1, dashed double dotted solid)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "dashed" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(4, double)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "dotted ridge" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "dotted dashed solid groove ridge" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(3, groove) repeat(4, ridge)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "inset repeat(3, ridge) none repeat(4, groove hidden dashed)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(4, none ridge solid) repeat(5, hidden) double" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(auto, solid)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(auto, dotted solid inset)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(auto, dashed groove) ridge" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(4, dotted double dashed) repeat(auto, solid)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "inset repeat(auto, solid ridge) repeat(4, none groove hidden)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-style'\] = "repeat(4, dotted)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-style'\] = "repeat(3, dashed double dotted)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-style'\] = "repeat(1, dashed double dotted solid)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-style'\] = "dashed" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-style'\] = "repeat(4, double)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-style'\] = "dotted ridge" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-style'\] = "dotted dashed solid groove ridge" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-style'\] = "repeat(3, groove) repeat(4, ridge)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-style'\] = "inset repeat(3, ridge) none repeat(4, groove hidden dashed)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-style'\] = "repeat(4, none ridge solid) repeat(5, hidden) double" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-style'\] = "repeat(auto, solid)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-style'\] = "repeat(auto, dotted solid inset)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-style'\] = "repeat(auto, dashed groove) ridge" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-style'\] = "repeat(4, dotted double dashed) repeat(auto, solid)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-style'\] = "inset repeat(auto, solid ridge) repeat(4, none groove hidden)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-style'\] = "repeat(4, dotted)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-style'\] = "repeat(3, dashed double dotted)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-style'\] = "repeat(1, dashed double dotted solid)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-style'\] = "dashed" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-style'\] = "repeat(4, double)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-style'\] = "dotted ridge" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-style'\] = "dotted dashed solid groove ridge" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-style'\] = "repeat(3, groove) repeat(4, ridge)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-style'\] = "inset repeat(3, ridge) none repeat(4, groove hidden dashed)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-style'\] = "repeat(4, none ridge solid) repeat(5, hidden) double" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-style'\] = "repeat(auto, solid)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-style'\] = "repeat(auto, dotted solid inset)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-style'\] = "repeat(auto, dashed groove) ridge" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-style'\] = "repeat(4, dotted double dashed) repeat(auto, solid)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-style'\] = "inset repeat(auto, solid ridge) repeat(4, none groove hidden)" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-width-computed.html.ini b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-width-computed.html.ini
new file mode 100644
index 00000000000..9a94074889e
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-width-computed.html.ini
@@ -0,0 +1,72 @@
+[gap-decorations-width-computed.html]
+  [Property column-rule-width value 'calc(10px + 0.5em)']
+    expected: FAIL
+
+  [Property column-rule-width value 'calc(10px - 0.5em)']
+    expected: FAIL
+
+  [Property column-rule-width value '2px 4px 6px']
+    expected: FAIL
+
+  [Property column-rule-width value 'repeat(4, 2px)']
+    expected: FAIL
+
+  [Property column-rule-width value 'repeat(auto, 10px)']
+    expected: FAIL
+
+  [Property column-rule-width value 'repeat(calc(5 + 3), 10px)']
+    expected: FAIL
+
+  [Property column-rule-width value 'repeat(5, 10px calc(10px + 0.5em))']
+    expected: FAIL
+
+  [Property column-rule-width value 'repeat(auto, min(5px, 10px)) repeat(5, 10px) calc(10px + 0.5em)']
+    expected: FAIL
+
+  [Property row-rule-width value 'calc(10px + 0.5em)']
+    expected: FAIL
+
+  [Property row-rule-width value 'calc(10px - 0.5em)']
+    expected: FAIL
+
+  [Property row-rule-width value '2px 4px 6px']
+    expected: FAIL
+
+  [Property row-rule-width value 'repeat(4, 2px)']
+    expected: FAIL
+
+  [Property row-rule-width value 'repeat(auto, 10px)']
+    expected: FAIL
+
+  [Property row-rule-width value 'repeat(calc(5 + 3), 10px)']
+    expected: FAIL
+
+  [Property row-rule-width value 'repeat(5, 10px calc(10px + 0.5em))']
+    expected: FAIL
+
+  [Property row-rule-width value 'repeat(auto, min(5px, 10px)) repeat(5, 10px) calc(10px + 0.5em)']
+    expected: FAIL
+
+  [Property rule-width value 'calc(10px + 0.5em)']
+    expected: FAIL
+
+  [Property rule-width value 'calc(10px - 0.5em)']
+    expected: FAIL
+
+  [Property rule-width value '2px 4px 6px']
+    expected: FAIL
+
+  [Property rule-width value 'repeat(4, 2px)']
+    expected: FAIL
+
+  [Property rule-width value 'repeat(auto, 10px)']
+    expected: FAIL
+
+  [Property rule-width value 'repeat(calc(5 + 3), 10px)']
+    expected: FAIL
+
+  [Property rule-width value 'repeat(5, 10px calc(10px + 0.5em))']
+    expected: FAIL
+
+  [Property rule-width value 'repeat(auto, min(5px, 10px)) repeat(5, 10px) calc(10px + 0.5em)']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-width-valid.html.ini b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-width-valid.html.ini
new file mode 100644
index 00000000000..b70d55a67e8
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/parsing/gap-decorations-width-valid.html.ini
@@ -0,0 +1,135 @@
+[gap-decorations-width-valid.html]
+  [e.style['column-rule-width'\] = "repeat(4, thin)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-width'\] = "repeat(3, thin medium thick)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-width'\] = "repeat(1, 10px thin medium thick)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-width'\] = "10px" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-width'\] = "repeat(4, medium)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-width'\] = "10px 15px" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-width'\] = "10px 15px 20px 25px 30px" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-width'\] = "repeat(3, 10px) repeat(4, 15px)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-width'\] = "10px repeat(3, 20px) 30px repeat(4, thin medium thick)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-width'\] = "repeat(4, 10px 20px 30px) repeat(5, 40px) 50px" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-width'\] = "repeat(auto, thin)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-width'\] = "repeat(auto, 10px 20px 30px)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-width'\] = "repeat(auto, 10px 20px) 30px" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-width'\] = "repeat(4, 10px 20px 30px) repeat(auto, 40px)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-width'\] = "10px repeat(auto, 20px 30px) repeat(4, thin 50px 60px)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-width'\] = "repeat(4, thin)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-width'\] = "repeat(3, thin medium thick)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-width'\] = "repeat(1, 10px thin medium thick)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-width'\] = "10px" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-width'\] = "repeat(4, medium)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-width'\] = "10px 15px" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-width'\] = "10px 15px 20px 25px 30px" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-width'\] = "repeat(3, 10px) repeat(4, 15px)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-width'\] = "10px repeat(3, 20px) 30px repeat(4, thin medium thick)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-width'\] = "repeat(4, 10px 20px 30px) repeat(5, 40px) 50px" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-width'\] = "repeat(auto, thin)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-width'\] = "repeat(auto, 10px 20px 30px)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-width'\] = "repeat(auto, 10px 20px) 30px" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-width'\] = "repeat(4, 10px 20px 30px) repeat(auto, 40px)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-rule-width'\] = "10px repeat(auto, 20px 30px) repeat(4, thin 50px 60px)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-width'\] = "repeat(4, thin)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-width'\] = "repeat(3, thin medium thick)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-width'\] = "repeat(1, 10px thin medium thick)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-width'\] = "10px" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-width'\] = "repeat(4, medium)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-width'\] = "10px 15px" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-width'\] = "10px 15px 20px 25px 30px" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-width'\] = "repeat(3, 10px) repeat(4, 15px)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-width'\] = "10px repeat(3, 20px) 30px repeat(4, thin medium thick)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-width'\] = "repeat(4, 10px 20px 30px) repeat(5, 40px) 50px" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-width'\] = "repeat(auto, thin)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-width'\] = "repeat(auto, 10px 20px 30px)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-width'\] = "repeat(auto, 10px 20px) 30px" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-width'\] = "repeat(4, 10px 20px 30px) repeat(auto, 40px)" should set the property value]
+    expected: FAIL
+
+  [e.style['rule-width'\] = "10px repeat(auto, 20px 30px) repeat(4, thin 50px 60px)" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/tentative/parsing/rule-break-computed.html.ini b/tests/wpt/meta/css/css-gaps/parsing/rule-break-computed.html.ini
similarity index 100%
rename from tests/wpt/meta/css/css-gaps/tentative/parsing/rule-break-computed.html.ini
rename to tests/wpt/meta/css/css-gaps/parsing/rule-break-computed.html.ini
diff --git a/tests/wpt/meta/css/css-gaps/tentative/parsing/rule-break-valid.html.ini b/tests/wpt/meta/css/css-gaps/parsing/rule-break-valid.html.ini
similarity index 100%
rename from tests/wpt/meta/css/css-gaps/tentative/parsing/rule-break-valid.html.ini
rename to tests/wpt/meta/css/css-gaps/parsing/rule-break-valid.html.ini
diff --git a/tests/wpt/meta/css/css-gaps/tentative/parsing/rule-outset-computed.html.ini b/tests/wpt/meta/css/css-gaps/parsing/rule-outset-computed.html.ini
similarity index 100%
rename from tests/wpt/meta/css/css-gaps/tentative/parsing/rule-outset-computed.html.ini
rename to tests/wpt/meta/css/css-gaps/parsing/rule-outset-computed.html.ini
diff --git a/tests/wpt/meta/css/css-gaps/tentative/parsing/rule-outset-valid.html.ini b/tests/wpt/meta/css/css-gaps/parsing/rule-outset-valid.html.ini
similarity index 100%
rename from tests/wpt/meta/css/css-gaps/tentative/parsing/rule-outset-valid.html.ini
rename to tests/wpt/meta/css/css-gaps/parsing/rule-outset-valid.html.ini
diff --git a/tests/wpt/meta/css/css-gaps/tentative/parsing/rule-paint-order-computed.html.ini b/tests/wpt/meta/css/css-gaps/parsing/rule-paint-order-computed.html.ini
similarity index 100%
rename from tests/wpt/meta/css/css-gaps/tentative/parsing/rule-paint-order-computed.html.ini
rename to tests/wpt/meta/css/css-gaps/parsing/rule-paint-order-computed.html.ini
diff --git a/tests/wpt/meta/css/css-gaps/tentative/parsing/rule-paint-order-valid.html.ini b/tests/wpt/meta/css/css-gaps/parsing/rule-paint-order-valid.html.ini
similarity index 100%
rename from tests/wpt/meta/css/css-gaps/tentative/parsing/rule-paint-order-valid.html.ini
rename to tests/wpt/meta/css/css-gaps/parsing/rule-paint-order-valid.html.ini
diff --git a/tests/wpt/meta/css/css-gaps/serialization/gap-decorations-properties.html.ini b/tests/wpt/meta/css/css-gaps/serialization/gap-decorations-properties.html.ini
new file mode 100644
index 00000000000..bc4c6eb5666
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/serialization/gap-decorations-properties.html.ini
@@ -0,0 +1,189 @@
+[gap-decorations-properties.html]
+  [gap-rule-paint-order]
+    expected: FAIL
+
+  [gap-rule-paint-order.row-over-column]
+    expected: FAIL
+
+  [gap-rule-paint-order.column-over-row]
+    expected: FAIL
+
+  [column-rule-break]
+    expected: FAIL
+
+  [column-rule-break.none]
+    expected: FAIL
+
+  [column-rule-break.spanning-item]
+    expected: FAIL
+
+  [column-rule-break.intersection]
+    expected: FAIL
+
+  [column-rule-color]
+    expected: FAIL
+
+  [column-rule-color.red]
+    expected: FAIL
+
+  [column-rule-color.blue]
+    expected: FAIL
+
+  [column-rule-color.repeat(4, blue red green) repeat(auto, red)]
+    expected: FAIL
+
+  [column-rule-color.blue red]
+    expected: FAIL
+
+  [column-rule-outset]
+    expected: FAIL
+
+  [column-rule-outset.10px]
+    expected: FAIL
+
+  [column-rule-outset.50%]
+    expected: FAIL
+
+  [column-rule-style]
+    expected: FAIL
+
+  [column-rule-style.none]
+    expected: FAIL
+
+  [column-rule-style.hidden]
+    expected: FAIL
+
+  [column-rule-style.dotted]
+    expected: FAIL
+
+  [column-rule-style.dashed]
+    expected: FAIL
+
+  [column-rule-style.solid]
+    expected: FAIL
+
+  [column-rule-style.double]
+    expected: FAIL
+
+  [column-rule-style.groove]
+    expected: FAIL
+
+  [column-rule-style.ridge]
+    expected: FAIL
+
+  [column-rule-style.inset]
+    expected: FAIL
+
+  [column-rule-style.outset]
+    expected: FAIL
+
+  [column-rule-style.dotted dashed]
+    expected: FAIL
+
+  [column-rule-style.repeat(3, dotted)]
+    expected: FAIL
+
+  [column-rule-width]
+    expected: FAIL
+
+  [column-rule-width.10px]
+    expected: FAIL
+
+  [column-rule-width.thin]
+    expected: FAIL
+
+  [column-rule-width.medium]
+    expected: FAIL
+
+  [column-rule-width.thick]
+    expected: FAIL
+
+  [row-rule-break]
+    expected: FAIL
+
+  [row-rule-break.none]
+    expected: FAIL
+
+  [row-rule-break.spanning-item]
+    expected: FAIL
+
+  [row-rule-break.intersection]
+    expected: FAIL
+
+  [row-rule-color]
+    expected: FAIL
+
+  [row-rule-color.red]
+    expected: FAIL
+
+  [row-rule-color.blue]
+    expected: FAIL
+
+  [row-rule-color.repeat(4, blue red green) repeat(auto, red)]
+    expected: FAIL
+
+  [row-rule-color.blue red]
+    expected: FAIL
+
+  [row-rule-outset]
+    expected: FAIL
+
+  [row-rule-outset.10px]
+    expected: FAIL
+
+  [row-rule-outset.50%]
+    expected: FAIL
+
+  [row-rule-style]
+    expected: FAIL
+
+  [row-rule-style.none]
+    expected: FAIL
+
+  [row-rule-style.hidden]
+    expected: FAIL
+
+  [row-rule-style.dotted]
+    expected: FAIL
+
+  [row-rule-style.dashed]
+    expected: FAIL
+
+  [row-rule-style.solid]
+    expected: FAIL
+
+  [row-rule-style.double]
+    expected: FAIL
+
+  [row-rule-style.groove]
+    expected: FAIL
+
+  [row-rule-style.ridge]
+    expected: FAIL
+
+  [row-rule-style.inset]
+    expected: FAIL
+
+  [row-rule-style.outset]
+    expected: FAIL
+
+  [row-rule-style.dotted dashed]
+    expected: FAIL
+
+  [row-rule-style.repeat(3, dotted)]
+    expected: FAIL
+
+  [row-rule-width]
+    expected: FAIL
+
+  [row-rule-width.10px]
+    expected: FAIL
+
+  [row-rule-width.thin]
+    expected: FAIL
+
+  [row-rule-width.medium]
+    expected: FAIL
+
+  [row-rule-width.thick]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-color-computed.html.ini b/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-color-computed.html.ini
deleted file mode 100644
index cd5ffa3fb95..00000000000
--- a/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-color-computed.html.ini
+++ /dev/null
@@ -1,66 +0,0 @@
-[gap-decorations-color-computed.html]
-  [Property column-rule-color value 'currentcolor']
-    expected: FAIL
-
-  [Property column-rule-color value 'red']
-    expected: FAIL
-
-  [Property column-rule-color value 'repeat(4, yellow)']
-    expected: FAIL
-
-  [Property column-rule-color value 'red green blue']
-    expected: FAIL
-
-  [Property column-rule-color value 'repeat(7, lime) repeat(3, red)']
-    expected: FAIL
-
-  [Property column-rule-color value 'repeat(auto, red)']
-    expected: FAIL
-
-  [Property column-rule-color value 'repeat(calc(5 + 3), salmon)']
-    expected: FAIL
-
-  [Property column-rule-color value 'color-mix(in srgb, red 50%, blue 50%)']
-    expected: FAIL
-
-  [Property column-rule-color value 'color-mix(in srgb, lime 25%, yellow 75%)']
-    expected: FAIL
-
-  [Property column-rule-color value 'repeat(auto, rgb(from lime r g b))']
-    expected: FAIL
-
-  [Property column-rule-color value 'rgb(from yellow calc(255 - r) calc(255 - g) calc(255 - b))']
-    expected: FAIL
-
-  [Property row-rule-color value 'currentcolor']
-    expected: FAIL
-
-  [Property row-rule-color value 'red']
-    expected: FAIL
-
-  [Property row-rule-color value 'repeat(4, yellow)']
-    expected: FAIL
-
-  [Property row-rule-color value 'red green blue']
-    expected: FAIL
-
-  [Property row-rule-color value 'repeat(7, lime) repeat(3, red)']
-    expected: FAIL
-
-  [Property row-rule-color value 'repeat(auto, red)']
-    expected: FAIL
-
-  [Property row-rule-color value 'repeat(calc(5 + 3), salmon)']
-    expected: FAIL
-
-  [Property row-rule-color value 'color-mix(in srgb, red 50%, blue 50%)']
-    expected: FAIL
-
-  [Property row-rule-color value 'color-mix(in srgb, lime 25%, yellow 75%)']
-    expected: FAIL
-
-  [Property row-rule-color value 'repeat(auto, rgb(from lime r g b))']
-    expected: FAIL
-
-  [Property row-rule-color value 'rgb(from yellow calc(255 - r) calc(255 - g) calc(255 - b))']
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-color-valid.html.ini b/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-color-valid.html.ini
deleted file mode 100644
index 4c88c2d31e6..00000000000
--- a/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-color-valid.html.ini
+++ /dev/null
@@ -1,90 +0,0 @@
-[gap-decorations-color-valid.html]
-  [e.style['column-rule-color'\] = "repeat(4, blue)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-color'\] = "repeat(3, red green blue)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-color'\] = "repeat(1, red green blue yellow)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-color'\] = "red" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-color'\] = "repeat(4, cyan)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-color'\] = "green blue" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-color'\] = "red blue green yellow pink" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-color'\] = "repeat(3, blue) repeat(4, red)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-color'\] = "red repeat(3, blue) blue repeat(4, red green cyan)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-color'\] = "repeat(4, red green cyan) repeat(5, yellow) blue" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-color'\] = "repeat(auto, red)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-color'\] = "repeat(auto, red green blue)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-color'\] = "repeat(auto, red green) red" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-color'\] = "repeat(4, blue red green) repeat(auto, red)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-color'\] = "blue repeat(auto, red green) repeat(4, blue red green)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-color'\] = "repeat(4, blue)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-color'\] = "repeat(3, red green blue)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-color'\] = "repeat(1, red green blue yellow)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-color'\] = "red" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-color'\] = "repeat(4, cyan)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-color'\] = "green blue" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-color'\] = "red blue green yellow pink" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-color'\] = "repeat(3, blue) repeat(4, red)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-color'\] = "red repeat(3, blue) blue repeat(4, red green cyan)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-color'\] = "repeat(4, red green cyan) repeat(5, yellow) blue" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-color'\] = "repeat(auto, red)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-color'\] = "repeat(auto, red green blue)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-color'\] = "repeat(auto, red green) red" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-color'\] = "repeat(4, blue red green) repeat(auto, red)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-color'\] = "blue repeat(auto, red green) repeat(4, blue red green)" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html.ini b/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html.ini
deleted file mode 100644
index b8662e42336..00000000000
--- a/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html.ini
+++ /dev/null
@@ -1,126 +0,0 @@
-[gap-decorations-style-computed.html]
-  [Property column-rule-style value 'none']
-    expected: FAIL
-
-  [Property column-rule-style value 'hidden']
-    expected: FAIL
-
-  [Property column-rule-style value 'dotted']
-    expected: FAIL
-
-  [Property column-rule-style value 'dashed']
-    expected: FAIL
-
-  [Property column-rule-style value 'solid']
-    expected: FAIL
-
-  [Property column-rule-style value 'double']
-    expected: FAIL
-
-  [Property column-rule-style value 'groove']
-    expected: FAIL
-
-  [Property column-rule-style value 'ridge']
-    expected: FAIL
-
-  [Property column-rule-style value 'inset']
-    expected: FAIL
-
-  [Property column-rule-style value 'dotted dashed solid']
-    expected: FAIL
-
-  [Property column-rule-style value 'repeat(10, double)']
-    expected: FAIL
-
-  [Property column-rule-style value 'repeat(3, groove) repeat(4, ridge)']
-    expected: FAIL
-
-  [Property column-rule-style value 'repeat(auto, solid)']
-    expected: FAIL
-
-  [Property column-rule-style value 'repeat(auto, dotted solid inset)']
-    expected: FAIL
-
-  [Property column-rule-style value 'repeat(4, none ridge solid) repeat(auto, hidden)']
-    expected: FAIL
-
-  [Property column-rule-style value 'inset repeat(auto, solid ridge) repeat(4, none groove hidden)']
-    expected: FAIL
-
-  [Property column-rule-style value 'repeat(calc(5 + 3), ridge)']
-    expected: FAIL
-
-  [Property column-rule-style value 'repeat(4, dotted double dashed) repeat(auto, solid) ridge']
-    expected: FAIL
-
-  [Property column-rule-style value 'repeat(4, dotted double dashed) repeat(auto, solid) repeat(4, none groove hidden)']
-    expected: FAIL
-
-  [Property column-rule-style value 'ridge repeat(auto, solid)']
-    expected: FAIL
-
-  [Property column-rule-style value 'ridge repeat(auto, solid) ridge']
-    expected: FAIL
-
-  [Property row-rule-style value 'none']
-    expected: FAIL
-
-  [Property row-rule-style value 'hidden']
-    expected: FAIL
-
-  [Property row-rule-style value 'dotted']
-    expected: FAIL
-
-  [Property row-rule-style value 'dashed']
-    expected: FAIL
-
-  [Property row-rule-style value 'solid']
-    expected: FAIL
-
-  [Property row-rule-style value 'double']
-    expected: FAIL
-
-  [Property row-rule-style value 'groove']
-    expected: FAIL
-
-  [Property row-rule-style value 'ridge']
-    expected: FAIL
-
-  [Property row-rule-style value 'inset']
-    expected: FAIL
-
-  [Property row-rule-style value 'dotted dashed solid']
-    expected: FAIL
-
-  [Property row-rule-style value 'repeat(10, double)']
-    expected: FAIL
-
-  [Property row-rule-style value 'repeat(3, groove) repeat(4, ridge)']
-    expected: FAIL
-
-  [Property row-rule-style value 'repeat(auto, solid)']
-    expected: FAIL
-
-  [Property row-rule-style value 'repeat(auto, dotted solid inset)']
-    expected: FAIL
-
-  [Property row-rule-style value 'repeat(4, none ridge solid) repeat(auto, hidden)']
-    expected: FAIL
-
-  [Property row-rule-style value 'inset repeat(auto, solid ridge) repeat(4, none groove hidden)']
-    expected: FAIL
-
-  [Property row-rule-style value 'repeat(calc(5 + 3), ridge)']
-    expected: FAIL
-
-  [Property row-rule-style value 'repeat(4, dotted double dashed) repeat(auto, solid) ridge']
-    expected: FAIL
-
-  [Property row-rule-style value 'repeat(4, dotted double dashed) repeat(auto, solid) repeat(4, none groove hidden)']
-    expected: FAIL
-
-  [Property row-rule-style value 'ridge repeat(auto, solid)']
-    expected: FAIL
-
-  [Property row-rule-style value 'ridge repeat(auto, solid) ridge']
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-style-valid.html.ini b/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-style-valid.html.ini
deleted file mode 100644
index 17f6bc639cf..00000000000
--- a/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-style-valid.html.ini
+++ /dev/null
@@ -1,90 +0,0 @@
-[gap-decorations-style-valid.html]
-  [e.style['column-rule-style'\] = "repeat(4, dotted)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-style'\] = "repeat(3, dashed double dotted)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-style'\] = "repeat(1, dashed double dotted solid)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-style'\] = "dashed" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-style'\] = "repeat(4, double)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-style'\] = "dotted ridge" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-style'\] = "dotted dashed solid groove ridge" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-style'\] = "repeat(3, groove) repeat(4, ridge)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-style'\] = "inset repeat(3, ridge) none repeat(4, groove hidden dashed)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-style'\] = "repeat(4, none ridge solid) repeat(5, hidden) double" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-style'\] = "repeat(auto, solid)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-style'\] = "repeat(auto, dotted solid inset)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-style'\] = "repeat(auto, dashed groove) ridge" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-style'\] = "repeat(4, dotted double dashed) repeat(auto, solid)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-style'\] = "inset repeat(auto, solid ridge) repeat(4, none groove hidden)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-style'\] = "repeat(5, dashed)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-style'\] = "repeat(4, dashed dotted)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-style'\] = "repeat(1, dashed double dotted solid)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-style'\] = "ridge" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-style'\] = "repeat(5, solid)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-style'\] = "dotted" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-style'\] = "dotted dashed ridge" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-style'\] = "repeat(4, solid) repeat(5, double) repeat(6, dotted)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-style'\] = "ridge repeat(4, solid) double repeat(6, dotted)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-style'\] = "repeat(4, none ridge solid) solid repeat(5, hidden) double" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-style'\] = "repeat(auto, dotted)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-style'\] = "repeat(auto, dashed solid inset double)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-style'\] = "repeat(auto, dashed groove) repeat(4, solid) double" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-style'\] = "repeat(4, dotted double dashed) repeat(auto, solid) repeat(4, none groove hidden)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-style'\] = "dotted repeat(auto, solid ridge) solid" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-width-computed.html.ini b/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-width-computed.html.ini
deleted file mode 100644
index a95dbc9a917..00000000000
--- a/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-width-computed.html.ini
+++ /dev/null
@@ -1,48 +0,0 @@
-[gap-decorations-width-computed.html]
-  [Property column-rule-width value 'calc(10px + 0.5em)']
-    expected: FAIL
-
-  [Property column-rule-width value 'calc(10px - 0.5em)']
-    expected: FAIL
-
-  [Property column-rule-width value '2px 4px 6px']
-    expected: FAIL
-
-  [Property column-rule-width value 'repeat(4, 2px)']
-    expected: FAIL
-
-  [Property column-rule-width value 'repeat(auto, 10px)']
-    expected: FAIL
-
-  [Property column-rule-width value 'repeat(calc(5 + 3), 10px)']
-    expected: FAIL
-
-  [Property column-rule-width value 'repeat(5, 10px calc(10px + 0.5em))']
-    expected: FAIL
-
-  [Property column-rule-width value 'repeat(auto, min(5px, 10px)) repeat(5, 10px) calc(10px + 0.5em)']
-    expected: FAIL
-
-  [Property row-rule-width value 'calc(10px + 0.5em)']
-    expected: FAIL
-
-  [Property row-rule-width value 'calc(10px - 0.5em)']
-    expected: FAIL
-
-  [Property row-rule-width value '2px 4px 6px']
-    expected: FAIL
-
-  [Property row-rule-width value 'repeat(4, 2px)']
-    expected: FAIL
-
-  [Property row-rule-width value 'repeat(auto, 10px)']
-    expected: FAIL
-
-  [Property row-rule-width value 'repeat(calc(5 + 3), 10px)']
-    expected: FAIL
-
-  [Property row-rule-width value 'repeat(5, 10px calc(10px + 0.5em))']
-    expected: FAIL
-
-  [Property row-rule-width value 'repeat(auto, min(5px, 10px)) repeat(5, 10px) calc(10px + 0.5em)']
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-width-valid.html.ini b/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-width-valid.html.ini
deleted file mode 100644
index 5efa682891c..00000000000
--- a/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-width-valid.html.ini
+++ /dev/null
@@ -1,90 +0,0 @@
-[gap-decorations-width-valid.html]
-  [e.style['column-rule-width'\] = "repeat(4, thin)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-width'\] = "repeat(3, thin medium thick)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-width'\] = "repeat(1, 10px thin medium thick)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-width'\] = "10px" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-width'\] = "repeat(4, medium)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-width'\] = "10px 15px" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-width'\] = "10px 15px 20px 25px 30px" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-width'\] = "repeat(3, 10px) repeat(4, 15px)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-width'\] = "10px repeat(3, 20px) 30px repeat(4, thin medium thick)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-width'\] = "repeat(4, 10px 20px 30px) repeat(5, 40px) 50px" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-width'\] = "repeat(auto, thin)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-width'\] = "repeat(auto, 10px 20px 30px)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-width'\] = "repeat(auto, 10px 20px) 30px" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-width'\] = "repeat(4, 10px 20px 30px) repeat(auto, 40px)" should set the property value]
-    expected: FAIL
-
-  [e.style['column-rule-width'\] = "10px repeat(auto, 20px 30px) repeat(4, thin 50px 60px)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-width'\] = "repeat(4, thin)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-width'\] = "repeat(3, thin medium thick)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-width'\] = "repeat(1, 10px thin medium thick)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-width'\] = "10px" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-width'\] = "repeat(4, medium)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-width'\] = "10px 15px" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-width'\] = "10px 15px 20px 25px 30px" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-width'\] = "repeat(3, 10px) repeat(4, 15px)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-width'\] = "10px repeat(3, 20px) 30px repeat(4, thin medium thick)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-width'\] = "repeat(4, 10px 20px 30px) repeat(5, 40px) 50px" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-width'\] = "repeat(auto, thin)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-width'\] = "repeat(auto, 10px 20px 30px)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-width'\] = "repeat(auto, 10px 20px) 30px" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-width'\] = "repeat(4, 10px 20px 30px) repeat(auto, 40px)" should set the property value]
-    expected: FAIL
-
-  [e.style['row-rule-width'\] = "10px repeat(auto, 20px 30px) repeat(4, thin 50px 60px)" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/__dir__.ini b/tests/wpt/meta/css/css-grid/__dir__.ini
deleted file mode 100644
index 745da0bac0a..00000000000
--- a/tests/wpt/meta/css/css-grid/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-prefs: ["layout_columns_enabled:true", "layout_flexbox_enabled:true", "layout_grid_enabled:true"]
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-margin-border-padding.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-margin-border-padding.html.ini
index 1314f9be848..1f268abd52f 100644
--- a/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-margin-border-padding.html.ini
+++ b/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-margin-border-padding.html.ini
@@ -1,16 +1,10 @@
 [grid-align-justify-margin-border-padding.html]
-  [.grid 5]
-    expected: FAIL
-
   [.grid 6]
     expected: FAIL
 
   [.grid 7]
     expected: FAIL
 
-  [.grid 9]
-    expected: FAIL
-
   [.grid 10]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-align.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-align.html.ini
index 362cdf621ee..4ca7e52511d 100644
--- a/tests/wpt/meta/css/css-grid/alignment/grid-align.html.ini
+++ b/tests/wpt/meta/css/css-grid/alignment/grid-align.html.ini
@@ -1,19 +1,10 @@
 [grid-align.html]
-  [.grid 2]
-    expected: FAIL
-
-  [.grid 3]
-    expected: FAIL
-
   [.grid 5]
     expected: FAIL
 
   [.grid 6]
     expected: FAIL
 
-  [.grid 8]
-    expected: FAIL
-
   [.grid 9]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-column-axis-alignment-sticky-positioned-items-001.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-column-axis-alignment-sticky-positioned-items-001.html.ini
deleted file mode 100644
index 354579885d4..00000000000
--- a/tests/wpt/meta/css/css-grid/alignment/grid-column-axis-alignment-sticky-positioned-items-001.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[grid-column-axis-alignment-sticky-positioned-items-001.html]
-  [.grid 1]
-    expected: FAIL
-
-  [.grid 2]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-alignment-overflow-002.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-alignment-overflow-002.html.ini
index bad0d70b3b5..794226f82ac 100644
--- a/tests/wpt/meta/css/css-grid/alignment/grid-content-alignment-overflow-002.html.ini
+++ b/tests/wpt/meta/css/css-grid/alignment/grid-content-alignment-overflow-002.html.ini
@@ -11,20 +11,11 @@
   [.grid 4]
     expected: FAIL
 
-  [.grid 5]
-    expected: FAIL
-
-  [.grid 6]
-    expected: FAIL
-
   [.grid 7]
     expected: FAIL
 
   [.grid 8]
     expected: FAIL
 
-  [.grid 11]
-    expected: FAIL
-
   [.grid 12]
     expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-alignment-with-abspos-001.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-alignment-with-abspos-001.html.ini
new file mode 100644
index 00000000000..efff2a2620a
--- /dev/null
+++ b/tests/wpt/meta/css/css-grid/alignment/grid-content-alignment-with-abspos-001.html.ini
@@ -0,0 +1,3 @@
+[grid-content-alignment-with-abspos-001.html]
+  [.grid 1]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-gutters-015.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-gutters-015.html.ini
deleted file mode 100644
index 01fa5d5c83d..00000000000
--- a/tests/wpt/meta/css/css-grid/alignment/grid-gutters-015.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-gutters-015.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-gutters-and-alignment.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-gutters-and-alignment.html.ini
index 96c772addd3..0bc7df22bcc 100644
--- a/tests/wpt/meta/css/css-grid/alignment/grid-gutters-and-alignment.html.ini
+++ b/tests/wpt/meta/css/css-grid/alignment/grid-gutters-and-alignment.html.ini
@@ -1,7 +1,4 @@
 [grid-gutters-and-alignment.html]
-  [.grid 1]
-    expected: FAIL
-
   [.grid 2]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows.html.ini
index e764ab71db8..76893560457 100644
--- a/tests/wpt/meta/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows.html.ini
+++ b/tests/wpt/meta/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows.html.ini
@@ -11,9 +11,6 @@
   [.grid 4]
     expected: FAIL
 
-  [.grid 5]
-    expected: FAIL
-
   [.grid 6]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-row-axis-alignment-sticky-positioned-items-001.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-row-axis-alignment-sticky-positioned-items-001.html.ini
deleted file mode 100644
index cd685823cd5..00000000000
--- a/tests/wpt/meta/css/css-grid/alignment/grid-row-axis-alignment-sticky-positioned-items-001.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[grid-row-axis-alignment-sticky-positioned-items-001.html]
-  [.grid 1]
-    expected: FAIL
-
-  [.grid 2]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-self-alignment.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-self-alignment.html.ini
index 1df4c4398de..258442c0bf3 100644
--- a/tests/wpt/meta/css/css-grid/alignment/grid-self-alignment.html.ini
+++ b/tests/wpt/meta/css/css-grid/alignment/grid-self-alignment.html.ini
@@ -1,16 +1,10 @@
 [grid-self-alignment.html]
-  [.child 2]
-    expected: FAIL
-
   [.child 3]
     expected: FAIL
 
   [.child 4]
     expected: FAIL
 
-  [.child 6]
-    expected: FAIL
-
   [.child 7]
     expected: FAIL
 
@@ -26,15 +20,9 @@
   [.child 11]
     expected: FAIL
 
-  [.child 14]
-    expected: FAIL
-
   [.child 16]
     expected: FAIL
 
-  [.child 18]
-    expected: FAIL
-
   [.child 19]
     expected: FAIL
 
@@ -44,18 +32,12 @@
   [.child 23]
     expected: FAIL
 
-  [.child 26]
-    expected: FAIL
-
   [.child 27]
     expected: FAIL
 
   [.child 28]
     expected: FAIL
 
-  [.child 30]
-    expected: FAIL
-
   [.child 31]
     expected: FAIL
 
@@ -71,15 +53,9 @@
   [.child 35]
     expected: FAIL
 
-  [.child 38]
-    expected: FAIL
-
   [.child 40]
     expected: FAIL
 
-  [.child 42]
-    expected: FAIL
-
   [.child 43]
     expected: FAIL
 
@@ -89,18 +65,12 @@
   [.child 47]
     expected: FAIL
 
-  [.child 50]
-    expected: FAIL
-
   [.child 51]
     expected: FAIL
 
   [.child 52]
     expected: FAIL
 
-  [.child 54]
-    expected: FAIL
-
   [.child 55]
     expected: FAIL
 
@@ -116,15 +86,9 @@
   [.child 59]
     expected: FAIL
 
-  [.child 62]
-    expected: FAIL
-
   [.child 64]
     expected: FAIL
 
-  [.child 66]
-    expected: FAIL
-
   [.child 67]
     expected: FAIL
 
@@ -160,3 +124,21 @@
 
   [.child 69]
     expected: FAIL
+
+  [.child 12]
+    expected: FAIL
+
+  [.child 24]
+    expected: FAIL
+
+  [.child 36]
+    expected: FAIL
+
+  [.child 48]
+    expected: FAIL
+
+  [.child 60]
+    expected: FAIL
+
+  [.child 72]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-001.html.ini b/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-001.html.ini
deleted file mode 100644
index 4bf18d5d0b2..00000000000
--- a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-container-baseline-synthesized-001.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-002.html.ini b/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-002.html.ini
deleted file mode 100644
index b1f0ed70bf8..00000000000
--- a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-container-baseline-synthesized-002.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-003.html.ini b/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-003.html.ini
deleted file mode 100644
index 30e114170b9..00000000000
--- a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-container-baseline-synthesized-003.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-004.html.ini b/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-004.html.ini
deleted file mode 100644
index 6847ef99a24..00000000000
--- a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-container-baseline-synthesized-004.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-flex-spanning-items-001.html.ini b/tests/wpt/meta/css/css-grid/grid-flex-spanning-items-001.html.ini
new file mode 100644
index 00000000000..7a85a63d258
--- /dev/null
+++ b/tests/wpt/meta/css/css-grid/grid-flex-spanning-items-001.html.ini
@@ -0,0 +1,2 @@
+[grid-flex-spanning-items-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-items/grid-item-min-auto-size-001.html.ini b/tests/wpt/meta/css/css-grid/grid-items/grid-item-min-auto-size-001.html.ini
deleted file mode 100644
index 06161eb11d0..00000000000
--- a/tests/wpt/meta/css/css-grid/grid-items/grid-item-min-auto-size-001.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[grid-item-min-auto-size-001.html]
-  [Computed min-width/min-height of specified auto inside display:none which would otherwise have been a grid item.]
-    expected: FAIL
-
-  [Computed min-width/min-height of specified auto with display:none which would otherwise have been a grid item.]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-items/replaced-element-016.tentative.html.ini b/tests/wpt/meta/css/css-grid/grid-items/replaced-element-016.tentative.html.ini
new file mode 100644
index 00000000000..39f8cc21286
--- /dev/null
+++ b/tests/wpt/meta/css/css-grid/grid-items/replaced-element-016.tentative.html.ini
@@ -0,0 +1,2 @@
+[replaced-element-016.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-items/replaced-element-017.tentative.html.ini b/tests/wpt/meta/css/css-grid/grid-items/replaced-element-017.tentative.html.ini
new file mode 100644
index 00000000000..77a110a0e75
--- /dev/null
+++ b/tests/wpt/meta/css/css-grid/grid-items/replaced-element-017.tentative.html.ini
@@ -0,0 +1,2 @@
+[replaced-element-017.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-model/grid-container-scrollbars-sizing-002.html.ini b/tests/wpt/meta/css/css-grid/grid-model/grid-container-scrollbars-sizing-002.html.ini
deleted file mode 100644
index 65f447695c9..00000000000
--- a/tests/wpt/meta/css/css-grid/grid-model/grid-container-scrollbars-sizing-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-container-scrollbars-sizing-002.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/masonry/tentative/order/masonry-order-002.html.ini b/tests/wpt/meta/css/css-grid/masonry/tentative/order/masonry-order-002.html.ini
deleted file mode 100644
index 93e7786887e..00000000000
--- a/tests/wpt/meta/css/css-grid/masonry/tentative/order/masonry-order-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[masonry-order-002.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/parsing/grid-area-computed.html.ini b/tests/wpt/meta/css/css-grid/parsing/grid-area-computed.html.ini
new file mode 100644
index 00000000000..f4149d38b90
--- /dev/null
+++ b/tests/wpt/meta/css/css-grid/parsing/grid-area-computed.html.ini
@@ -0,0 +1,3 @@
+[grid-area-computed.html]
+  [Property grid-row-start value 'calc(10 + (sign(2cqw - 10px) * 5)) -a-']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/subgrid/independent-tracks-from-parent-grid.html.ini b/tests/wpt/meta/css/css-grid/subgrid/independent-tracks-from-parent-grid.html.ini
deleted file mode 100644
index 3797183cdbd..00000000000
--- a/tests/wpt/meta/css/css-grid/subgrid/independent-tracks-from-parent-grid.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[independent-tracks-from-parent-grid.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/subgrid/line-names-014.html.ini b/tests/wpt/meta/css/css-grid/subgrid/line-names-014.html.ini
new file mode 100644
index 00000000000..4c1cfd6bc3c
--- /dev/null
+++ b/tests/wpt/meta/css/css-grid/subgrid/line-names-014.html.ini
@@ -0,0 +1,2 @@
+[line-names-014.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/subgrid/line-names-015.html.ini b/tests/wpt/meta/css/css-grid/subgrid/line-names-015.html.ini
new file mode 100644
index 00000000000..d7cb6aaa099
--- /dev/null
+++ b/tests/wpt/meta/css/css-grid/subgrid/line-names-015.html.ini
@@ -0,0 +1,2 @@
+[line-names-015.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/subgrid/repeat-auto-fill-005.html.ini b/tests/wpt/meta/css/css-grid/subgrid/repeat-auto-fill-005.html.ini
new file mode 100644
index 00000000000..882d1cfda55
--- /dev/null
+++ b/tests/wpt/meta/css/css-grid/subgrid/repeat-auto-fill-005.html.ini
@@ -0,0 +1,2 @@
+[repeat-auto-fill-005.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/subgrid/subgrid-baseline-012.html.ini b/tests/wpt/meta/css/css-grid/subgrid/subgrid-baseline-012.html.ini
deleted file mode 100644
index 59602ca238f..00000000000
--- a/tests/wpt/meta/css/css-grid/subgrid/subgrid-baseline-012.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[subgrid-baseline-012.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/subgrid/subgrid-no-items-on-edges-001.html.ini b/tests/wpt/meta/css/css-grid/subgrid/subgrid-no-items-on-edges-001.html.ini
deleted file mode 100644
index f4d72c5c3f8..00000000000
--- a/tests/wpt/meta/css/css-grid/subgrid/subgrid-no-items-on-edges-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[subgrid-no-items-on-edges-001.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/conic-gradient-angle-negative.html.ini b/tests/wpt/meta/css/css-images/conic-gradient-angle-negative.html.ini
deleted file mode 100644
index 2d32aca2dd1..00000000000
--- a/tests/wpt/meta/css/css-images/conic-gradient-angle-negative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[conic-gradient-angle-negative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/conic-gradient-angle.html.ini b/tests/wpt/meta/css/css-images/conic-gradient-angle.html.ini
deleted file mode 100644
index f5905bc26fd..00000000000
--- a/tests/wpt/meta/css/css-images/conic-gradient-angle.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[conic-gradient-angle.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/conic-gradient-center.html.ini b/tests/wpt/meta/css/css-images/conic-gradient-center.html.ini
deleted file mode 100644
index 52c7e1636ef..00000000000
--- a/tests/wpt/meta/css/css-images/conic-gradient-center.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[conic-gradient-center.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/gradient/conic-gradient-001.html.ini b/tests/wpt/meta/css/css-images/gradient/conic-gradient-001.html.ini
new file mode 100644
index 00000000000..baebe61217c
--- /dev/null
+++ b/tests/wpt/meta/css/css-images/gradient/conic-gradient-001.html.ini
@@ -0,0 +1,2 @@
+[conic-gradient-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/gradient/gradient-analogous-missing-components-004.html.ini b/tests/wpt/meta/css/css-images/gradient/gradient-analogous-missing-components-004.html.ini
new file mode 100644
index 00000000000..5378b6b6110
--- /dev/null
+++ b/tests/wpt/meta/css/css-images/gradient/gradient-analogous-missing-components-004.html.ini
@@ -0,0 +1,2 @@
+[gradient-analogous-missing-components-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/gradient/gradient-infinity-001.html.ini b/tests/wpt/meta/css/css-images/gradient/gradient-infinity-001.html.ini
new file mode 100644
index 00000000000..4b3a2c8ee9d
--- /dev/null
+++ b/tests/wpt/meta/css/css-images/gradient/gradient-infinity-001.html.ini
@@ -0,0 +1,2 @@
+[gradient-infinity-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/gradient/gradient-infinity-002.html.ini b/tests/wpt/meta/css/css-images/gradient/gradient-infinity-002.html.ini
new file mode 100644
index 00000000000..2b9dad9b029
--- /dev/null
+++ b/tests/wpt/meta/css/css-images/gradient/gradient-infinity-002.html.ini
@@ -0,0 +1,2 @@
+[gradient-infinity-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-calc-x-rendering-2.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-calc-x-rendering-2.html.ini
deleted file mode 100644
index 67e228c5c71..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-calc-x-rendering-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-calc-x-rendering-2.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-calc-x-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-calc-x-rendering.html.ini
deleted file mode 100644
index 6acf49fb4cf..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-calc-x-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-calc-x-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-conic-gradient-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-conic-gradient-rendering.html.ini
deleted file mode 100644
index 95d9cf7bd8d..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-conic-gradient-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-conic-gradient-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-dpcm-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-dpcm-rendering.html.ini
deleted file mode 100644
index d454c16a88c..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-dpcm-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-dpcm-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-dpi-rendering-2.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-dpi-rendering-2.html.ini
deleted file mode 100644
index a5211dfef59..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-dpi-rendering-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-dpi-rendering-2.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-dpi-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-dpi-rendering.html.ini
deleted file mode 100644
index 5f8b0c91cfd..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-dpi-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-dpi-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-dppx-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-dppx-rendering.html.ini
deleted file mode 100644
index efd602a658c..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-dppx-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-dppx-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-empty-url-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-empty-url-rendering.html.ini
deleted file mode 100644
index 1d08d9a00db..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-empty-url-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-empty-url-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-first-match-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-first-match-rendering.html.ini
deleted file mode 100644
index dbe1af067b5..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-first-match-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-first-match-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-linear-gradient-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-linear-gradient-rendering.html.ini
deleted file mode 100644
index b58c2976a59..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-linear-gradient-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-linear-gradient-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-no-res-rendering-2.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-no-res-rendering-2.html.ini
deleted file mode 100644
index 08008d3f359..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-no-res-rendering-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-no-res-rendering-2.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-no-res-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-no-res-rendering.html.ini
deleted file mode 100644
index a41f43b3667..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-no-res-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-no-res-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-no-url-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-no-url-rendering.html.ini
deleted file mode 100644
index 02013c51fac..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-no-url-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-no-url-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-parsing.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-parsing.html.ini
index 82e2394b4cf..212d2366f4b 100644
--- a/tests/wpt/meta/css/css-images/image-set/image-set-parsing.html.ini
+++ b/tests/wpt/meta/css/css-images/image-set/image-set-parsing.html.ini
@@ -4,3 +4,15 @@
 
   [e.style['content'\] = "-webkit-image-set(linear-gradient(black, white) 1x, 'example.png' 4x)" should set the property value]
     expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(\\"example.png\\") calc(1dppx * sibling-index()))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(\\"example.png\\") calc(1dppx * sibling-index()))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(\\"example.png\\") calc(1dppx * sign(1em - 10px)))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(\\"example.png\\") calc(1dppx * sign(1em - 10px)))" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-radial-gradient-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-radial-gradient-rendering.html.ini
deleted file mode 100644
index 3fcaf7fed89..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-radial-gradient-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-radial-gradient-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-rendering-2.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-rendering-2.html.ini
deleted file mode 100644
index efe4a56ec9a..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-rendering-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-rendering-2.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-rendering.html.ini
deleted file mode 100644
index cac31096a81..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-repeating-conic-gradient-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-repeating-conic-gradient-rendering.html.ini
deleted file mode 100644
index f18e1ef9a00..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-repeating-conic-gradient-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-repeating-conic-gradient-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-repeating-linear-gradient-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-repeating-linear-gradient-rendering.html.ini
deleted file mode 100644
index be70642abe0..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-repeating-linear-gradient-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-repeating-linear-gradient-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-repeating-radial-gradient-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-repeating-radial-gradient-rendering.html.ini
deleted file mode 100644
index cfb95cb1d12..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-repeating-radial-gradient-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-repeating-radial-gradient-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-resolution-002.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-resolution-002.html.ini
deleted file mode 100644
index 4b5172849de..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-resolution-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-resolution-002.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-type-first-match-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-type-first-match-rendering.html.ini
deleted file mode 100644
index c2d57169c84..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-type-first-match-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-type-first-match-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering-2.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering-2.html.ini
deleted file mode 100644
index f480267c00c..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-type-rendering-2.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering-3.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering-3.html.ini
deleted file mode 100644
index 5fb71d1d469..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering-3.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-type-rendering-3.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering.html.ini
deleted file mode 100644
index 3122f4bfd04..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-type-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-type-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-type-skip-unsupported-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-type-skip-unsupported-rendering.html.ini
deleted file mode 100644
index b2c04c8932e..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-type-skip-unsupported-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-type-skip-unsupported-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/image-set/image-set-unordered-res-rendering.html.ini b/tests/wpt/meta/css/css-images/image-set/image-set-unordered-res-rendering.html.ini
deleted file mode 100644
index 38b95a653ec..00000000000
--- a/tests/wpt/meta/css/css-images/image-set/image-set-unordered-res-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-unordered-res-rendering.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/linear-gradient-body-sibling-index.html.ini b/tests/wpt/meta/css/css-images/linear-gradient-body-sibling-index.html.ini
new file mode 100644
index 00000000000..638b6c21891
--- /dev/null
+++ b/tests/wpt/meta/css/css-images/linear-gradient-body-sibling-index.html.ini
@@ -0,0 +1,2 @@
+[linear-gradient-body-sibling-index.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/linear-gradient-sibling-index.html.ini b/tests/wpt/meta/css/css-images/linear-gradient-sibling-index.html.ini
new file mode 100644
index 00000000000..d81ff383b17
--- /dev/null
+++ b/tests/wpt/meta/css/css-images/linear-gradient-sibling-index.html.ini
@@ -0,0 +1,2 @@
+[linear-gradient-sibling-index.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/multiple-position-color-stop-conic.html.ini b/tests/wpt/meta/css/css-images/multiple-position-color-stop-conic.html.ini
deleted file mode 100644
index 7897d70c1a1..00000000000
--- a/tests/wpt/meta/css/css-images/multiple-position-color-stop-conic.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[multiple-position-color-stop-conic.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/normalization-conic-2.html.ini b/tests/wpt/meta/css/css-images/normalization-conic-2.html.ini
deleted file mode 100644
index 712f51069c5..00000000000
--- a/tests/wpt/meta/css/css-images/normalization-conic-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[normalization-conic-2.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/normalization-conic-degenerate.html.ini b/tests/wpt/meta/css/css-images/normalization-conic-degenerate.html.ini
deleted file mode 100644
index 7348a8278d8..00000000000
--- a/tests/wpt/meta/css/css-images/normalization-conic-degenerate.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[normalization-conic-degenerate.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/normalization-conic.html.ini b/tests/wpt/meta/css/css-images/normalization-conic.html.ini
deleted file mode 100644
index a5ac414e610..00000000000
--- a/tests/wpt/meta/css/css-images/normalization-conic.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[normalization-conic.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/out-of-range-color-stop-conic.html.ini b/tests/wpt/meta/css/css-images/out-of-range-color-stop-conic.html.ini
deleted file mode 100644
index fa1a353540c..00000000000
--- a/tests/wpt/meta/css/css-images/out-of-range-color-stop-conic.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[out-of-range-color-stop-conic.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-images/tiled-conic-gradients.html.ini b/tests/wpt/meta/css/css-images/tiled-conic-gradients.html.ini
deleted file mode 100644
index e2b676b1315..00000000000
--- a/tests/wpt/meta/css/css-images/tiled-conic-gradients.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[tiled-conic-gradients.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-001.html.ini b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-001.html.ini
index 91b24d8c0e0..3343e6e422c 100644
--- a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-001.html.ini
+++ b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-001.html.ini
@@ -8,9 +8,6 @@
   [.target > * 13]
     expected: FAIL
 
-  [.target > * 14]
-    expected: FAIL
-
   [.target > * 15]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-002.html.ini b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-002.html.ini
index 11ab5916891..89efff05c21 100644
--- a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-002.html.ini
+++ b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-002.html.ini
@@ -58,3 +58,6 @@
 
   [.target > * 12]
     expected: FAIL
+
+  [.target > * 14]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-003.html.ini b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-003.html.ini
index 6a2e8d2d3dd..f4c610922d1 100644
--- a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-003.html.ini
+++ b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-003.html.ini
@@ -58,3 +58,6 @@
 
   [.target > * 12]
     expected: FAIL
+
+  [.target > * 14]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-textarea-001.tentative.html.ini b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-textarea-001.tentative.html.ini
index 33e8242e0ef..69fbdce4c26 100644
--- a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-textarea-001.tentative.html.ini
+++ b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-textarea-001.tentative.html.ini
@@ -2,8 +2,8 @@
   [.target > * 9]
     expected: FAIL
 
-  [.target > * 1]
-    expected: FAIL
-
   [.target > * 11]
     expected: FAIL
+
+  [.target > * 7]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-last-001.html.ini b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-last-001.html.ini
index ccf674a1f93..bcb5b2eb99b 100644
--- a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-last-001.html.ini
+++ b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-last-001.html.ini
@@ -17,9 +17,6 @@
   [.target > * 13]
     expected: FAIL
 
-  [.target > * 14]
-    expected: FAIL
-
   [.target > * 15]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-last-002.html.ini b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-last-002.html.ini
index 98c50898132..b7f857b522f 100644
--- a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-last-002.html.ini
+++ b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-last-002.html.ini
@@ -58,3 +58,6 @@
 
   [.target > * 12]
     expected: FAIL
+
+  [.target > * 14]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-last-003.html.ini b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-last-003.html.ini
index d4801e6eca1..002eb277af0 100644
--- a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-last-003.html.ini
+++ b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-last-003.html.ini
@@ -58,3 +58,6 @@
 
   [.target > * 12]
     expected: FAIL
+
+  [.target > * 14]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-logical/animation-004.html.ini b/tests/wpt/meta/css/css-logical/animation-004.html.ini
index c02b75269ad..7b5a3cc1f8a 100644
--- a/tests/wpt/meta/css/css-logical/animation-004.html.ini
+++ b/tests/wpt/meta/css/css-logical/animation-004.html.ini
@@ -16,6 +16,3 @@
 
   [Transitions update when the writing-mode is changed through a CSS variable]
     expected: FAIL
-
-  [Transitions from physical to logical update when the direction is changed]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-logical/inheritance.html.ini b/tests/wpt/meta/css/css-logical/inheritance.html.ini
deleted file mode 100644
index a632b2d8ca9..00000000000
--- a/tests/wpt/meta/css/css-logical/inheritance.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[inheritance.html]
-  [Property min-block-size has initial value 0px]
-    expected: FAIL
-
-  [Property min-inline-size has initial value 0px]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-logical/parsing/min-block-size-computed.html.ini b/tests/wpt/meta/css/css-logical/parsing/min-block-size-computed.html.ini
deleted file mode 100644
index 74cc74f72ea..00000000000
--- a/tests/wpt/meta/css/css-logical/parsing/min-block-size-computed.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-block-size-computed.html]
-  [Property min-block-size value 'auto']
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-logical/parsing/min-inline-size-computed.html.ini b/tests/wpt/meta/css/css-logical/parsing/min-inline-size-computed.html.ini
deleted file mode 100644
index 50598a7cf1d..00000000000
--- a/tests/wpt/meta/css/css-logical/parsing/min-inline-size-computed.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-inline-size-computed.html]
-  [Property min-inline-size value 'auto']
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-slack-computed.html.ini b/tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-slack-computed.html.ini
index 5bfdcbd90f4..38931f721ec 100644
--- a/tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-slack-computed.html.ini
+++ b/tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-slack-computed.html.ini
@@ -16,3 +16,21 @@
 
   [Property masonry-slack value 'calc(0.5em + 10px)']
     expected: FAIL
+
+  [Property item-tolerance value 'normal']
+    expected: FAIL
+
+  [Property item-tolerance value '10px']
+    expected: FAIL
+
+  [Property item-tolerance value '20%']
+    expected: FAIL
+
+  [Property item-tolerance value 'calc(20% + 10px)']
+    expected: FAIL
+
+  [Property item-tolerance value 'calc(-0.5em + 10px)']
+    expected: FAIL
+
+  [Property item-tolerance value 'calc(0.5em + 10px)']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-slack-valid.html.ini b/tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-slack-valid.html.ini
index 8401d20fa57..9487a73f212 100644
--- a/tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-slack-valid.html.ini
+++ b/tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-slack-valid.html.ini
@@ -16,3 +16,21 @@
 
   [e.style['masonry-slack'\] = "5vmin" should set the property value]
     expected: FAIL
+
+  [e.style['item-tolerance'\] = "normal" should set the property value]
+    expected: FAIL
+
+  [e.style['item-tolerance'\] = "0" should set the property value]
+    expected: FAIL
+
+  [e.style['item-tolerance'\] = "1px" should set the property value]
+    expected: FAIL
+
+  [e.style['item-tolerance'\] = "calc(2em + 3ex)" should set the property value]
+    expected: FAIL
+
+  [e.style['item-tolerance'\] = "4%" should set the property value]
+    expected: FAIL
+
+  [e.style['item-tolerance'\] = "5vmin" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-mixins/at-function-parsing.html.ini b/tests/wpt/meta/css/css-mixins/at-function-parsing.html.ini
index de4e8c0d888..439bfaf373b 100644
--- a/tests/wpt/meta/css/css-mixins/at-function-parsing.html.ini
+++ b/tests/wpt/meta/css/css-mixins/at-function-parsing.html.ini
@@ -11,12 +11,6 @@
   [@function --foo( --x ) is valid]
     expected: FAIL
 
-  [@function --foo () is invalid]
-    expected: FAIL
-
-  [@function --foo (--x) is invalid]
-    expected: FAIL
-
   [@function --foo(--x auto) is valid]
     expected: FAIL
 
@@ -113,9 +107,6 @@
   [@function --foo(--x <angle>: 10px) is valid]
     expected: FAIL
 
-  [@function --foo(--x: 10px !important) is invalid]
-    expected: FAIL
-
   [@function --foo(--x <length>#) is valid]
     expected: FAIL
 
@@ -131,30 +122,6 @@
   [@function --foo(--x <transform-function>+) is valid]
     expected: FAIL
 
-  [@function --foo(--x <transform-list>#) is invalid]
-    expected: FAIL
-
-  [@function --foo(--x <transform-list>+) is invalid]
-    expected: FAIL
-
-  [@function --foo(--x *) is invalid]
-    expected: FAIL
-
-  [@function --foo(--x !) is invalid]
-    expected: FAIL
-
-  [@function --foo(--x 50px) is invalid]
-    expected: FAIL
-
-  [@function --foo(--x <length> | auto) is invalid]
-    expected: FAIL
-
-  [@function --foo(--x none | auto) is invalid]
-    expected: FAIL
-
-  [@function --foo(--x <dino>) is invalid]
-    expected: FAIL
-
   [@function --foo(--x) returns type(*) is valid]
     expected: FAIL
 
@@ -173,71 +140,5 @@
   [@function --foo(--x) returns type(foo | bar) is valid]
     expected: FAIL
 
-  [@function --foo(--x) ! is invalid]
-    expected: FAIL
-
-  [@function --foo(--x) length is invalid]
-    expected: FAIL
-
-  [@function --foo(--x) returns is invalid]
-    expected: FAIL
-
-  [@function --foo(--x) returns  is invalid]
-    expected: FAIL
-
-  [@function --foo(--x) returns * is invalid]
-    expected: FAIL
-
-  [@function --foo(--x) returns <transform-list># is invalid]
-    expected: FAIL
-
-  [@function --foo(--x) returns <transform-list>+ is invalid]
-    expected: FAIL
-
-  [@function --foo(--x) returns auto | none is invalid]
-    expected: FAIL
-
-  [@function --foo(--x): <length> is invalid]
-    expected: FAIL
-
-  [@function --foo(--x): length is invalid]
-    expected: FAIL
-
-  [@function --foo(--x) returneth <length> is invalid]
-    expected: FAIL
-
   [@function --foo(--x:1px, --y, --z:2px) is valid]
     expected: FAIL
-
-  [@function --foo(!) is invalid]
-    expected: FAIL
-
-  [@function --foo(--x: !) is invalid]
-    expected: FAIL
-
-  [@function --foo(--x type(!)) is invalid]
-    expected: FAIL
-
-  [@function --foo(,) is invalid]
-    expected: FAIL
-
-  [@function --foo(,,,) is invalid]
-    expected: FAIL
-
-  [@function --foo(--x, ;) is invalid]
-    expected: FAIL
-
-  [@function --foo(;) is invalid]
-    expected: FAIL
-
-  [@function --foo(\]) is invalid]
-    expected: FAIL
-
-  [@function --foo(, --x\]) is invalid]
-    expected: FAIL
-
-  [@function --foo(--x) ! <length> is invalid]
-    expected: FAIL
-
-  [@function --foo(--x) returns <length>! is invalid]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-mixins/dashed-function-cycles.html.ini b/tests/wpt/meta/css/css-mixins/dashed-function-cycles.html.ini
new file mode 100644
index 00000000000..7faf9c2b2e4
--- /dev/null
+++ b/tests/wpt/meta/css/css-mixins/dashed-function-cycles.html.ini
@@ -0,0 +1,75 @@
+[dashed-function-cycles.html]
+  [Local with self-cycle]
+    expected: FAIL
+
+  [Cycle reference without fallback makes result invalid]
+    expected: FAIL
+
+  [Local with self-cycle in fallback]
+    expected: FAIL
+
+  [Local shadowing cyclic property --x]
+    expected: FAIL
+
+  [Local shadowing cyclic outer local --x]
+    expected: FAIL
+
+  [Argument shadowing cyclic outer local --x]
+    expected: FAIL
+
+  [Arguments shadowing cyclic properties]
+    expected: FAIL
+
+  [Observing property cycle locally]
+    expected: FAIL
+
+  [Using cyclic values with no fallback]
+    expected: FAIL
+
+  [Self-cycle in non-used local variable]
+    expected: FAIL
+
+  [Using cyclic value in unused fallback]
+    expected: FAIL
+
+  [Using cyclic value in unused fallback (local)]
+    expected: FAIL
+
+  [Dashed-function, self-cycle]
+    expected: FAIL
+
+  [Cycle through other function (--g)]
+    expected: FAIL
+
+  [Cycle through other function (--f)]
+    expected: FAIL
+
+  [Cycle through local, self]
+    expected: FAIL
+
+  [Cycle through unused local]
+    expected: FAIL
+
+  [Cycle through global, self]
+    expected: FAIL
+
+  [Cycle through local, other function]
+    expected: FAIL
+
+  [Cycle through local, other function, fallback in function]
+    expected: FAIL
+
+  [Cycle through various variables and other functions]
+    expected: FAIL
+
+  [Function in a cycle with its own default]
+    expected: FAIL
+
+  [Cyclic defaults]
+    expected: FAIL
+
+  [Cyclic outer --b shadows custom property]
+    expected: FAIL
+
+  [Locals are function specific]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-mixins/dashed-function-cycles.tentative.html.ini b/tests/wpt/meta/css/css-mixins/dashed-function-cycles.tentative.html.ini
deleted file mode 100644
index e16c79da6ad..00000000000
--- a/tests/wpt/meta/css/css-mixins/dashed-function-cycles.tentative.html.ini
+++ /dev/null
@@ -1,78 +0,0 @@
-[dashed-function-cycles.tentative.html]
-  [Local with self-cycle]
-    expected: FAIL
-
-  [Cycle reference without fallback makes result invalid]
-    expected: FAIL
-
-  [Local with self-cycle in fallback]
-    expected: FAIL
-
-  [Local shadowing cyclic property --x]
-    expected: FAIL
-
-  [Local shadowing cyclic outer local --x ]
-    expected: FAIL
-
-  [Arguments shadowing cyclic properties]
-    expected: FAIL
-
-  [Observing property cycle locally]
-    expected: FAIL
-
-  [Using cyclic values with no fallback]
-    expected: FAIL
-
-  [Self-cycle in non-used local variable]
-    expected: FAIL
-
-  [Using cyclic value in unused fallback]
-    expected: FAIL
-
-  [Using cyclic value in unused fallback (local)]
-    expected: FAIL
-
-  [Dashed-function, self-cycle]
-    expected: FAIL
-
-  [Cycle through other function (--g)]
-    expected: FAIL
-
-  [Cycle through other function (--f)]
-    expected: FAIL
-
-  [Cycle through local, self]
-    expected: FAIL
-
-  [Cycle through unused local]
-    expected: FAIL
-
-  [Cycle through global, self]
-    expected: FAIL
-
-  [Cycle through local, other function]
-    expected: FAIL
-
-  [Cycle through various variables and other functions]
-    expected: FAIL
-
-  [Function in a cycle with its own default]
-    expected: FAIL
-
-  [Cyclic defaults]
-    expected: FAIL
-
-  [Local shadowing cyclic outer local --x]
-    expected: FAIL
-
-  [Argument shadowing cyclic outer local --x]
-    expected: FAIL
-
-  [Cycle through local, other function, fallback in function]
-    expected: FAIL
-
-  [Cyclic outer --b shadows custom property]
-    expected: FAIL
-
-  [Locals are function specific]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-nesting/cssom.html.ini b/tests/wpt/meta/css/css-nesting/cssom.html.ini
new file mode 100644
index 00000000000..b91539e48ee
--- /dev/null
+++ b/tests/wpt/meta/css/css-nesting/cssom.html.ini
@@ -0,0 +1,6 @@
+[cssom.html]
+  [Simple CSSOM manipulation of subrules 7]
+    expected: FAIL
+
+  [Manipulation of nested declarations through CSSOM]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-nesting/has-nesting.html.ini b/tests/wpt/meta/css/css-nesting/has-nesting.html.ini
new file mode 100644
index 00000000000..85abf5ac7ae
--- /dev/null
+++ b/tests/wpt/meta/css/css-nesting/has-nesting.html.ini
@@ -0,0 +1,2 @@
+[has-nesting.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-nesting/host-nesting-003.html.ini b/tests/wpt/meta/css/css-nesting/host-nesting-003.html.ini
new file mode 100644
index 00000000000..367bd4facde
--- /dev/null
+++ b/tests/wpt/meta/css/css-nesting/host-nesting-003.html.ini
@@ -0,0 +1,2 @@
+[host-nesting-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-nesting/invalid-inner-rules.html.ini b/tests/wpt/meta/css/css-nesting/invalid-inner-rules.html.ini
new file mode 100644
index 00000000000..764e655d2f5
--- /dev/null
+++ b/tests/wpt/meta/css/css-nesting/invalid-inner-rules.html.ini
@@ -0,0 +1,3 @@
+[invalid-inner-rules.html]
+  [Simple CSSOM manipulation of subrules 1]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-nesting/invalidation-003.html.ini b/tests/wpt/meta/css/css-nesting/invalidation-003.html.ini
new file mode 100644
index 00000000000..f3570c0f645
--- /dev/null
+++ b/tests/wpt/meta/css/css-nesting/invalidation-003.html.ini
@@ -0,0 +1,3 @@
+[invalidation-003.html]
+  [CSS Selectors nested invalidation with :has()]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-nesting/nested-declarations-cssom-whitespace.html.ini b/tests/wpt/meta/css/css-nesting/nested-declarations-cssom-whitespace.html.ini
new file mode 100644
index 00000000000..49fac78706d
--- /dev/null
+++ b/tests/wpt/meta/css/css-nesting/nested-declarations-cssom-whitespace.html.ini
@@ -0,0 +1,6 @@
+[nested-declarations-cssom-whitespace.html]
+  [Empty CSSNestedDeclarations do not affect outer serialization]
+    expected: FAIL
+
+  [Empty CSSNestedDeclarations do not affect outer serialization (nested grouping rule)]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-nesting/nested-declarations-cssom.html.ini b/tests/wpt/meta/css/css-nesting/nested-declarations-cssom.html.ini
new file mode 100644
index 00000000000..28d16a619d3
--- /dev/null
+++ b/tests/wpt/meta/css/css-nesting/nested-declarations-cssom.html.ini
@@ -0,0 +1,3 @@
+[nested-declarations-cssom.html]
+  [Inserting a CSSNestedDeclaration rule into nested group rule]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-nesting/nested-declarations-matching.html.ini b/tests/wpt/meta/css/css-nesting/nested-declarations-matching.html.ini
new file mode 100644
index 00000000000..fda5085eedb
--- /dev/null
+++ b/tests/wpt/meta/css/css-nesting/nested-declarations-matching.html.ini
@@ -0,0 +1,6 @@
+[nested-declarations-matching.html]
+  [Bare declartaion in nested grouping rule can match pseudo-element]
+    expected: FAIL
+
+  [Nested declarations rule responds to parent selector text change]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-nesting/nested-rule-cssom-invalidation.html.ini b/tests/wpt/meta/css/css-nesting/nested-rule-cssom-invalidation.html.ini
new file mode 100644
index 00000000000..e2a3bda3751
--- /dev/null
+++ b/tests/wpt/meta/css/css-nesting/nested-rule-cssom-invalidation.html.ini
@@ -0,0 +1,3 @@
+[nested-rule-cssom-invalidation.html]
+  [Nested rule responds to parent selector text change]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-nesting/set-selector-text.html.ini b/tests/wpt/meta/css/css-nesting/set-selector-text.html.ini
new file mode 100644
index 00000000000..c664cf38b06
--- /dev/null
+++ b/tests/wpt/meta/css/css-nesting/set-selector-text.html.ini
@@ -0,0 +1,6 @@
+[set-selector-text.html]
+  [Outer selectorText text mutation with inner @container rule]
+    expected: FAIL
+
+  [Outer selectorText text mutation with inner @scope rule]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-nesting/top-level-is-scope.html.ini b/tests/wpt/meta/css/css-nesting/top-level-is-scope.html.ini
new file mode 100644
index 00000000000..52095f5fe1f
--- /dev/null
+++ b/tests/wpt/meta/css/css-nesting/top-level-is-scope.html.ini
@@ -0,0 +1,3 @@
+[top-level-is-scope.html]
+  [& matches scoped element only, not everything]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-012.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-012.tentative.html.ini
new file mode 100644
index 00000000000..1e8d1662575
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-012.tentative.html.ini
@@ -0,0 +1,2 @@
+[block-ellipsis-012.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-013.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-013.html.ini
new file mode 100644
index 00000000000..588e2afbb6c
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-013.html.ini
@@ -0,0 +1,2 @@
+[block-ellipsis-013.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-014.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-014.html.ini
new file mode 100644
index 00000000000..29753f9013a
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-014.html.ini
@@ -0,0 +1,2 @@
+[block-ellipsis-014.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-015.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-015.html.ini
new file mode 100644
index 00000000000..caf060b24ad
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-015.html.ini
@@ -0,0 +1,2 @@
+[block-ellipsis-015.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-016.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-016.html.ini
new file mode 100644
index 00000000000..5771ee535b5
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-016.html.ini
@@ -0,0 +1,2 @@
+[block-ellipsis-016.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-017.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-017.html.ini
new file mode 100644
index 00000000000..596140fc158
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-017.html.ini
@@ -0,0 +1,2 @@
+[block-ellipsis-017.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-018.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-018.html.ini
new file mode 100644
index 00000000000..57323fe2c16
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-018.html.ini
@@ -0,0 +1,2 @@
+[block-ellipsis-018.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-019.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-019.tentative.html.ini
new file mode 100644
index 00000000000..c10bca416a1
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-019.tentative.html.ini
@@ -0,0 +1,2 @@
+[block-ellipsis-019.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-020.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-020.tentative.html.ini
new file mode 100644
index 00000000000..fda5182ba31
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-020.tentative.html.ini
@@ -0,0 +1,2 @@
+[block-ellipsis-020.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-021.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-021.tentative.html.ini
new file mode 100644
index 00000000000..90627aef3b9
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-021.tentative.html.ini
@@ -0,0 +1,2 @@
+[block-ellipsis-021.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-022.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-022.html.ini
new file mode 100644
index 00000000000..4bbe85e1042
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/block-ellipsis-022.html.ini
@@ -0,0 +1,2 @@
+[block-ellipsis-022.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-010.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-010.tentative.html.ini
new file mode 100644
index 00000000000..1be7dc44f47
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-010.tentative.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-auto-010.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-025.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-025.tentative.html.ini
deleted file mode 100644
index c1786082c26..00000000000
--- a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-auto-025.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-clamp-auto-025.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-001.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-001.html.ini
new file mode 100644
index 00000000000..40c36b3c6f0
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-001.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-001.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-001.tentative.html.ini
deleted file mode 100644
index 96277819670..00000000000
--- a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-001.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-clamp-with-abspos-001.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-002.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-002.html.ini
new file mode 100644
index 00000000000..4d369b695f3
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-002.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-002.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-002.tentative.html.ini
deleted file mode 100644
index 21efb29c1f9..00000000000
--- a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-002.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-clamp-with-abspos-002.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-003.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-003.html.ini
new file mode 100644
index 00000000000..000eb27ddfd
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-003.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-003.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-003.tentative.html.ini
deleted file mode 100644
index 189ac0f3620..00000000000
--- a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-003.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-clamp-with-abspos-003.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-004.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-004.html.ini
new file mode 100644
index 00000000000..db488a0f5ef
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-004.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-004.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-004.tentative.html.ini
deleted file mode 100644
index 4e4d8534002..00000000000
--- a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-004.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-clamp-with-abspos-004.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-005.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-005.html.ini
new file mode 100644
index 00000000000..e669d29133f
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-005.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-005.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-005.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-005.tentative.html.ini
deleted file mode 100644
index 4a2b7b2ba98..00000000000
--- a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-005.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-clamp-with-abspos-005.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-006.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-006.html.ini
new file mode 100644
index 00000000000..a2f619fdde4
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-006.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-006.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-006.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-006.tentative.html.ini
deleted file mode 100644
index bd697fabf3f..00000000000
--- a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-006.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-clamp-with-abspos-006.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-007.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-007.html.ini
new file mode 100644
index 00000000000..45df20f22d9
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-007.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-007.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-007.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-007.tentative.html.ini
deleted file mode 100644
index b63c81cd54e..00000000000
--- a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-007.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-clamp-with-abspos-007.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-008.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-008.html.ini
new file mode 100644
index 00000000000..039fa6a2145
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-008.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-008.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-008.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-008.tentative.html.ini
deleted file mode 100644
index 834446721a7..00000000000
--- a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-008.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-clamp-with-abspos-008.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-009.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-009.html.ini
new file mode 100644
index 00000000000..e4fd4f2a7f8
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-009.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-009.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-009.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-009.tentative.html.ini
deleted file mode 100644
index 24f8b5bded3..00000000000
--- a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-009.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-clamp-with-abspos-009.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-010.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-010.html.ini
new file mode 100644
index 00000000000..613c6b90cfd
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-010.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-010.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-010.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-010.tentative.html.ini
deleted file mode 100644
index b4d85b57450..00000000000
--- a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-010.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-clamp-with-abspos-010.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-011.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-011.html.ini
new file mode 100644
index 00000000000..26644e02bb8
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-011.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-011.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-011.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-011.tentative.html.ini
deleted file mode 100644
index b399afd2326..00000000000
--- a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-011.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-clamp-with-abspos-011.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-012.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-012.html.ini
new file mode 100644
index 00000000000..4c8f049422c
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-012.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-012.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-012.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-012.tentative.html.ini
deleted file mode 100644
index 2f746ad56f3..00000000000
--- a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-012.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-clamp-with-abspos-012.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-013.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-013.html.ini
new file mode 100644
index 00000000000..c541770ea3f
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-013.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-013.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-013.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-013.tentative.html.ini
deleted file mode 100644
index f710874fa75..00000000000
--- a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-013.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-clamp-with-abspos-013.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-014.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-014.html.ini
new file mode 100644
index 00000000000..c97b27d5dab
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-014.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-014.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-014.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-014.tentative.html.ini
deleted file mode 100644
index a7e0e7a16ad..00000000000
--- a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-014.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-clamp-with-abspos-014.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-015.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-015.html.ini
new file mode 100644
index 00000000000..5d9f5c960a0
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-015.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-015.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-016.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-016.html.ini
new file mode 100644
index 00000000000..1c1e4761713
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-016.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-016.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-017.tentative.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-017.tentative.html.ini
new file mode 100644
index 00000000000..39d8ecfca89
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-017.tentative.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-017.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-018.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-018.html.ini
new file mode 100644
index 00000000000..9e1f2f984cc
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-018.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-018.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-019.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-019.html.ini
new file mode 100644
index 00000000000..93fb1dcbd7a
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-019.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-019.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-020.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-020.html.ini
new file mode 100644
index 00000000000..4196c262fb6
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-020.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-020.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-021.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-021.html.ini
new file mode 100644
index 00000000000..f49c1642115
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-021.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-021.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-022.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-022.html.ini
new file mode 100644
index 00000000000..2a41664d203
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-abspos-022.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-abspos-022.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-001.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-001.html.ini
new file mode 100644
index 00000000000..4d8f7292069
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-001.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-002.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-002.html.ini
new file mode 100644
index 00000000000..67cbf86b0b8
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-002.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-003.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-003.html.ini
new file mode 100644
index 00000000000..3af9a89c950
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-003.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-004.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-004.html.ini
new file mode 100644
index 00000000000..0d12a1bc36c
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-004.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-005.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-005.html.ini
new file mode 100644
index 00000000000..31e359cfb5f
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-005.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-005.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-006.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-006.html.ini
new file mode 100644
index 00000000000..807db673371
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-006.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-006.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-007.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-007.html.ini
new file mode 100644
index 00000000000..4d4c697e1f5
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-007.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-007.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-008.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-008.html.ini
new file mode 100644
index 00000000000..2934b89a2cf
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-008.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-008.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-009.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-009.html.ini
new file mode 100644
index 00000000000..bc33c225d01
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-009.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-009.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-010.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-010.html.ini
new file mode 100644
index 00000000000..2fc6d12eade
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-010.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-010.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-011.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-011.html.ini
new file mode 100644
index 00000000000..097bc0d8876
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-011.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-011.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-012.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-012.html.ini
new file mode 100644
index 00000000000..d9c19a6bbdb
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-012.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-012.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-013.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-013.html.ini
new file mode 100644
index 00000000000..4565a34841e
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-013.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-013.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-014.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-014.html.ini
new file mode 100644
index 00000000000..cabd27df9d6
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-014.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-014.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-015.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-015.html.ini
new file mode 100644
index 00000000000..8577c169df2
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-015.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-015.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-016.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-016.html.ini
new file mode 100644
index 00000000000..55bcad299ec
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-016.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-016.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-017.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-017.html.ini
new file mode 100644
index 00000000000..1ea3d4e7833
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-017.html.ini
@@ -0,0 +1,2 @@
+[line-clamp-with-fixed-pos-017.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/line-clamp/webkit-line-clamp-037.html.ini b/tests/wpt/meta/css/css-overflow/line-clamp/webkit-line-clamp-037.html.ini
new file mode 100644
index 00000000000..ea4c9b1cda3
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/line-clamp/webkit-line-clamp-037.html.ini
@@ -0,0 +1,2 @@
+[webkit-line-clamp-037.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/overflow-inline-transform-relative.html.ini b/tests/wpt/meta/css/css-overflow/overflow-inline-transform-relative.html.ini
deleted file mode 100644
index 0ba0b29e0f2..00000000000
--- a/tests/wpt/meta/css/css-overflow/overflow-inline-transform-relative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[overflow-inline-transform-relative.html]
-  [#target used transform when computing scroll overflow]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/root-scroll-button.html.ini b/tests/wpt/meta/css/css-overflow/root-scroll-button.html.ini
new file mode 100644
index 00000000000..12d581a2d25
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/root-scroll-button.html.ini
@@ -0,0 +1,2 @@
+[root-scroll-button.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/root-scroll-marker.html.ini b/tests/wpt/meta/css/css-overflow/root-scroll-marker.html.ini
new file mode 100644
index 00000000000..96283113085
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/root-scroll-marker.html.ini
@@ -0,0 +1,2 @@
+[root-scroll-marker.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scroll-marker-15.html.ini b/tests/wpt/meta/css/css-overflow/scroll-marker-15.html.ini
new file mode 100644
index 00000000000..02bf8170bc2
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scroll-marker-15.html.ini
@@ -0,0 +1,6 @@
+[scroll-marker-15.html]
+  [::scroll-marker is not activated when its originating element is not scrolled into the view]
+    expected: FAIL
+
+  [::scroll-marker is activated when its originating element is scrolled into the view]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scroll-marker-contain-001.tentative.html.ini b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-001.tentative.html.ini
new file mode 100644
index 00000000000..0d5590a9293
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-001.tentative.html.ini
@@ -0,0 +1,2 @@
+[scroll-marker-contain-001.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scroll-marker-contain-002.tentative.html.ini b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-002.tentative.html.ini
new file mode 100644
index 00000000000..fd0d2f5788e
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-002.tentative.html.ini
@@ -0,0 +1,2 @@
+[scroll-marker-contain-002.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scroll-marker-contain-003.tentative.html.ini b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-003.tentative.html.ini
new file mode 100644
index 00000000000..04e56713889
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-003.tentative.html.ini
@@ -0,0 +1,2 @@
+[scroll-marker-contain-003.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scroll-marker-contain-004.tentative.html.ini b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-004.tentative.html.ini
new file mode 100644
index 00000000000..908e3e40d04
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-004.tentative.html.ini
@@ -0,0 +1,2 @@
+[scroll-marker-contain-004.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scroll-marker-contain-005.tentative.html.ini b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-005.tentative.html.ini
new file mode 100644
index 00000000000..47c67ec0661
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-005.tentative.html.ini
@@ -0,0 +1,2 @@
+[scroll-marker-contain-005.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scroll-marker-contain-006.tentative.html.ini b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-006.tentative.html.ini
new file mode 100644
index 00000000000..d23cf1f17aa
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-006.tentative.html.ini
@@ -0,0 +1,2 @@
+[scroll-marker-contain-006.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scroll-marker-contain-007.tentative.html.ini b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-007.tentative.html.ini
new file mode 100644
index 00000000000..8d4a789ac8c
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-007.tentative.html.ini
@@ -0,0 +1,2 @@
+[scroll-marker-contain-007.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scroll-marker-contain-009.tentative.html.ini b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-009.tentative.html.ini
new file mode 100644
index 00000000000..795e1770941
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-009.tentative.html.ini
@@ -0,0 +1,2 @@
+[scroll-marker-contain-009.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scroll-marker-contain-010.tentative.html.ini b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-010.tentative.html.ini
new file mode 100644
index 00000000000..a753743341b
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-010.tentative.html.ini
@@ -0,0 +1,2 @@
+[scroll-marker-contain-010.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scroll-marker-contain-011.tentative.html.ini b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-011.tentative.html.ini
new file mode 100644
index 00000000000..79b26077e52
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scroll-marker-contain-011.tentative.html.ini
@@ -0,0 +1,2 @@
+[scroll-marker-contain-011.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scroll-overflow-padding-block-001.html.ini b/tests/wpt/meta/css/css-overflow/scroll-overflow-padding-block-001.html.ini
index b4b8f3830d9..1738329f50c 100644
--- a/tests/wpt/meta/css/css-overflow/scroll-overflow-padding-block-001.html.ini
+++ b/tests/wpt/meta/css/css-overflow/scroll-overflow-padding-block-001.html.ini
@@ -1,7 +1,4 @@
 [scroll-overflow-padding-block-001.html]
   expected: ERROR
-  [undefined block-end]
-    expected: FAIL
-
   [undefined block-start]
     expected: [PASS, FAIL]
diff --git a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-001.html.ini b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-001.html.ini
deleted file mode 100644
index e19232bb0b8..00000000000
--- a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-001.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[scrollable-overflow-transform-001.html]
-  [.container 1]
-    expected: FAIL
-
-  [.container 2]
-    expected: FAIL
-
-  [.container 3]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-002.html.ini b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-002.html.ini
deleted file mode 100644
index eae09f05def..00000000000
--- a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-002.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[scrollable-overflow-transform-002.html]
-  [.container 1]
-    expected: FAIL
-
-  [.container 2]
-    expected: FAIL
-
-  [.container 3]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-003.html.ini b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-003.html.ini
deleted file mode 100644
index 10ac7e63897..00000000000
--- a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-003.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[scrollable-overflow-transform-003.html]
-  [.container 1]
-    expected: FAIL
-
-  [.container 2]
-    expected: FAIL
-
-  [.container 3]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-005.tentative.html.ini b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-005.tentative.html.ini
new file mode 100644
index 00000000000..901184b8ed2
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-005.tentative.html.ini
@@ -0,0 +1,3 @@
+[scrollable-overflow-transform-005.tentative.html]
+  [.container 6]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-009.html.ini b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-009.html.ini
new file mode 100644
index 00000000000..cd8e986f634
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-009.html.ini
@@ -0,0 +1,6 @@
+[scrollable-overflow-transform-009.html]
+  [.container 2]
+    expected: FAIL
+
+  [.container 3]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-010.tentative.html.ini b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-010.tentative.html.ini
new file mode 100644
index 00000000000..94ff7fba3fb
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-010.tentative.html.ini
@@ -0,0 +1,6 @@
+[scrollable-overflow-transform-010.tentative.html]
+  [.container 1]
+    expected: FAIL
+
+  [.container 2]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-001.html.ini b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-001.html.ini
deleted file mode 100644
index c4639b846ba..00000000000
--- a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-001.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[scrollable-overflow-transform-dynamic-001.html]
-  [Check scrollWidth before and after transform chage]
-    expected: FAIL
-
-  [Check scrollHeight before and after transform chage]
-    expected: FAIL
-
-  [Check scrollWidth and scrollHeight before and after transform chage]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-002.html.ini b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-002.html.ini
deleted file mode 100644
index ff8be1e2e49..00000000000
--- a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-002.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[scrollable-overflow-transform-dynamic-002.html]
-  [Check scrollWidth before and after transform chage]
-    expected: FAIL
-
-  [Check scrollHeight before and after transform chage]
-    expected: FAIL
-
-  [Check scrollWidth and scrollHeight before and after transform chage]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-003.html.ini b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-003.html.ini
deleted file mode 100644
index 227a2451b5e..00000000000
--- a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-003.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[scrollable-overflow-transform-dynamic-003.html]
-  [Check scrollWidth before and after transform chage]
-    expected: FAIL
-
-  [Check scrollHeight before and after transform chage]
-    expected: FAIL
-
-  [Check scrollWidth and scrollHeight before and after transform chage]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-004.html.ini b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-004.html.ini
deleted file mode 100644
index d346a0658c9..00000000000
--- a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-004.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[scrollable-overflow-transform-dynamic-004.html]
-  [Check scrollWidth before and after position and transform chage]
-    expected: FAIL
-
-  [Check scrollHeight before and after position and transform chage]
-    expected: FAIL
-
-  [Check scrollWidth and scrollHeight after position and transform chage]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-005.html.ini b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-005.html.ini
deleted file mode 100644
index 3561e692dab..00000000000
--- a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-005.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[scrollable-overflow-transform-dynamic-005.html]
-  [Check scrollWidth before and after appendChild() and transform chage]
-    expected: FAIL
-
-  [Check scrollHeight before and after appendChild() and transform chage]
-    expected: FAIL
-
-  [Check scrollWidth and scrollHeight before and after appendChild() and transform chage]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-006.html.ini b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-006.html.ini
deleted file mode 100644
index f8a8cae0ae5..00000000000
--- a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-dynamic-006.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[scrollable-overflow-transform-dynamic-006.html]
-  [Check scrollWidth before and after removeChild() and transform chage]
-    expected: FAIL
-
-  [Check scrollHeight before and after removeChild() and transform chage]
-    expected: FAIL
-
-  [Check scrollWidth and scrollHeight before and after removeChild() and transform chage]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-unreachable-region.html.ini b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-unreachable-region.html.ini
new file mode 100644
index 00000000000..0a46e380a0b
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/scrollable-overflow-transform-unreachable-region.html.ini
@@ -0,0 +1,168 @@
+[scrollable-overflow-transform-unreachable-region.html]
+  [scrollWidth of display: flow-root; direction: ltr; writing-mode: vertical-rl; flex-direction: row; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollWidth of display: flow-root; direction: rtl; writing-mode: vertical-lr; flex-direction: row; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollHeight of display: flow-root; direction: rtl; writing-mode: vertical-lr; flex-direction: row; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollHeight of display: flow-root; direction: rtl; writing-mode: vertical-rl; flex-direction: row; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: ltr; writing-mode: vertical-rl; flex-direction: row; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: rtl; writing-mode: vertical-lr; flex-direction: row; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: rtl; writing-mode: vertical-lr; flex-direction: row; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: rtl; writing-mode: vertical-rl; flex-direction: row; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: ltr; writing-mode: horizontal-tb; flex-direction: row; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: ltr; writing-mode: vertical-lr; flex-direction: row; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: rtl; writing-mode: horizontal-tb; flex-direction: row; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: rtl; writing-mode: vertical-lr; flex-direction: row; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: rtl; writing-mode: vertical-rl; flex-direction: row; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: rtl; writing-mode: vertical-rl; flex-direction: row; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: ltr; writing-mode: horizontal-tb; flex-direction: row-reverse; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: ltr; writing-mode: vertical-lr; flex-direction: row-reverse; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: ltr; writing-mode: vertical-rl; flex-direction: row-reverse; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: ltr; writing-mode: vertical-rl; flex-direction: row-reverse; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: rtl; writing-mode: horizontal-tb; flex-direction: row-reverse; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: rtl; writing-mode: vertical-lr; flex-direction: row-reverse; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: ltr; writing-mode: horizontal-tb; flex-direction: row-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: ltr; writing-mode: horizontal-tb; flex-direction: row-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: ltr; writing-mode: vertical-lr; flex-direction: row-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: ltr; writing-mode: vertical-lr; flex-direction: row-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: ltr; writing-mode: vertical-rl; flex-direction: row-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: rtl; writing-mode: horizontal-tb; flex-direction: row-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: rtl; writing-mode: horizontal-tb; flex-direction: row-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: rtl; writing-mode: vertical-rl; flex-direction: row-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: ltr; writing-mode: vertical-rl; flex-direction: column; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: rtl; writing-mode: vertical-lr; flex-direction: column; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: rtl; writing-mode: vertical-lr; flex-direction: column; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: rtl; writing-mode: vertical-rl; flex-direction: column; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: ltr; writing-mode: horizontal-tb; flex-direction: column; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: ltr; writing-mode: vertical-lr; flex-direction: column; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: ltr; writing-mode: vertical-rl; flex-direction: column; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: ltr; writing-mode: vertical-rl; flex-direction: column; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: rtl; writing-mode: horizontal-tb; flex-direction: column; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: rtl; writing-mode: vertical-lr; flex-direction: column; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: ltr; writing-mode: horizontal-tb; flex-direction: column-reverse; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: ltr; writing-mode: vertical-lr; flex-direction: column-reverse; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: rtl; writing-mode: horizontal-tb; flex-direction: column-reverse; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: rtl; writing-mode: vertical-lr; flex-direction: column-reverse; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: rtl; writing-mode: vertical-rl; flex-direction: column-reverse; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: rtl; writing-mode: vertical-rl; flex-direction: column-reverse; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: ltr; writing-mode: horizontal-tb; flex-direction: column-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: ltr; writing-mode: horizontal-tb; flex-direction: column-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: ltr; writing-mode: vertical-lr; flex-direction: column-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: ltr; writing-mode: vertical-lr; flex-direction: column-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: ltr; writing-mode: vertical-rl; flex-direction: column-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: rtl; writing-mode: horizontal-tb; flex-direction: column-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollHeight of display: flex; direction: rtl; writing-mode: horizontal-tb; flex-direction: column-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollWidth of display: flex; direction: rtl; writing-mode: vertical-rl; flex-direction: column-reverse; flex-wrap: wrap-reverse;]
+    expected: FAIL
+
+  [scrollWidth of display: grid; direction: ltr; writing-mode: vertical-rl; flex-direction: row; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollWidth of display: grid; direction: rtl; writing-mode: vertical-lr; flex-direction: row; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollHeight of display: grid; direction: rtl; writing-mode: vertical-lr; flex-direction: row; flex-wrap: nowrap;]
+    expected: FAIL
+
+  [scrollHeight of display: grid; direction: rtl; writing-mode: vertical-rl; flex-direction: row; flex-wrap: nowrap;]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-overflow/targeted-scroll-marker-selection-with-transition.tentative.html.ini b/tests/wpt/meta/css/css-overflow/targeted-scroll-marker-selection-with-transition.tentative.html.ini
index f6dbf41c148..3a48407508a 100644
--- a/tests/wpt/meta/css/css-overflow/targeted-scroll-marker-selection-with-transition.tentative.html.ini
+++ b/tests/wpt/meta/css/css-overflow/targeted-scroll-marker-selection-with-transition.tentative.html.ini
@@ -1,6 +1,7 @@
 [targeted-scroll-marker-selection-with-transition.tentative.html]
+  expected: TIMEOUT
   [scroll-marker of target (idx 1) of scrollIntoView is selected]
-    expected: FAIL
+    expected: TIMEOUT
 
   [scroll-marker of target (idx 14) of scrollIntoView is selected]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/meta/css/css-overflow/text-overflow-ellipsis-editing-input.html.ini b/tests/wpt/meta/css/css-overflow/text-overflow-ellipsis-editing-input.html.ini
new file mode 100644
index 00000000000..ecad87f774b
--- /dev/null
+++ b/tests/wpt/meta/css/css-overflow/text-overflow-ellipsis-editing-input.html.ini
@@ -0,0 +1,2 @@
+[text-overflow-ellipsis-editing-input.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/position-absolute-dynamic-list-marker.html.ini b/tests/wpt/meta/css/css-position/position-absolute-dynamic-list-marker.html.ini
deleted file mode 100644
index 64d0ec15137..00000000000
--- a/tests/wpt/meta/css/css-position/position-absolute-dynamic-list-marker.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[position-absolute-dynamic-list-marker.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-cascade-007.html.ini b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-cascade-007.html.ini
index 99307641b90..7ddef835f02 100644
--- a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-cascade-007.html.ini
+++ b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-cascade-007.html.ini
@@ -16,3 +16,21 @@
 
   [U span::selection’s own text-decoration-thickness respects U span’s font-size]
     expected: FAIL
+
+  [M::selection’s font-size is the same as in M]
+    expected: FAIL
+
+  [M span::selection’s font-size is the same as in M span]
+    expected: FAIL
+
+  [W::selection’s line-height is the same as in W]
+    expected: FAIL
+
+  [W span::selection’s line-height is the same as in W span]
+    expected: FAIL
+
+  [U::selection’s font-size is the same as in U]
+    expected: FAIL
+
+  [U span::selection’s font-size is the same as in U span]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-cascade-009.html.ini b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-cascade-009.html.ini
deleted file mode 100644
index a22e265160c..00000000000
--- a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-cascade-009.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[highlight-cascade-009.html]
-  [body ::selection does not use its own custom property]
-    expected: FAIL
-
-  [div::selection does not use its own custom property]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-cascade-011.html.ini b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-cascade-011.html.ini
deleted file mode 100644
index aeec381e7bf..00000000000
--- a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-cascade-011.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[highlight-cascade-011.html]
-  [div::selection does not inherit custom properties from the highlight parent]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-currentcolor-computed-visited.html.ini b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-currentcolor-computed-visited.html.ini
new file mode 100644
index 00000000000..23fcc0b0dbe
--- /dev/null
+++ b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-currentcolor-computed-visited.html.ini
@@ -0,0 +1,36 @@
+[highlight-currentcolor-computed-visited.html]
+  [getComputedStyle() for ::selection at #target1]
+    expected: FAIL
+
+  [getComputedStyle() for ::selection at #target2]
+    expected: FAIL
+
+  [getComputedStyle() for ::target-text at #target1]
+    expected: FAIL
+
+  [getComputedStyle() for ::target-text at #target2]
+    expected: FAIL
+
+  [getComputedStyle() for ::search-text at #target1]
+    expected: FAIL
+
+  [getComputedStyle() for ::search-text at #target2]
+    expected: FAIL
+
+  [getComputedStyle() for ::spelling-error at #target1]
+    expected: FAIL
+
+  [getComputedStyle() for ::spelling-error at #target2]
+    expected: FAIL
+
+  [getComputedStyle() for ::grammar-error at #target1]
+    expected: FAIL
+
+  [getComputedStyle() for ::grammar-error at #target2]
+    expected: FAIL
+
+  [getComputedStyle() for ::highlight(foo) at #target1]
+    expected: FAIL
+
+  [getComputedStyle() for ::highlight(foo) at #target2]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-currentcolor-computed.html.ini b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-currentcolor-computed.html.ini
index 9fb9c49a30b..3fe08a6a0ec 100644
--- a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-currentcolor-computed.html.ini
+++ b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-currentcolor-computed.html.ini
@@ -1,10 +1,4 @@
 [highlight-currentcolor-computed.html]
-  [getComputedStyle() for ::selection at #target1]
-    expected: FAIL
-
-  [getComputedStyle() for ::selection at #target2]
-    expected: FAIL
-
   [getComputedStyle() for ::target-text at #target1]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-pseudos-computed-search-text.tentative.html.ini b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-pseudos-computed-search-text.tentative.html.ini
index 83fb225c6ac..c223e4e092f 100644
--- a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-pseudos-computed-search-text.tentative.html.ini
+++ b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-pseudos-computed-search-text.tentative.html.ini
@@ -1,24 +1,3 @@
 [highlight-pseudos-computed-search-text.tentative.html]
   [getComputedStyle() for ::search-text]
     expected: FAIL
-
-  [getComputedStyle() for ::search-text: should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::search-text) should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::search-text( should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::search-text(foo) should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::search-text() should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for :::search-text should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::search-text. should return an empty CSSStyleDeclaration]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-pseudos-computed.html.ini b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-pseudos-computed.html.ini
index 7c4acf428f7..196b4d3334a 100644
--- a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-pseudos-computed.html.ini
+++ b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-pseudos-computed.html.ini
@@ -1,123 +1,15 @@
 [highlight-pseudos-computed.html]
-  [getComputedStyle() for ::selection]
-    expected: FAIL
-
-  [getComputedStyle() for ::selection: should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::selection) should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::selection( should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::selection(foo) should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::selection() should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for :::selection should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::selection. should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
   [getComputedStyle() for ::target-text]
     expected: FAIL
 
-  [getComputedStyle() for ::target-text: should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::target-text) should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::target-text( should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::target-text(foo) should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::target-text() should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for :::target-text should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::target-text. should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
   [getComputedStyle() for ::spelling-error]
     expected: FAIL
 
-  [getComputedStyle() for ::spelling-error: should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::spelling-error) should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::spelling-error( should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::spelling-error(foo) should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::spelling-error() should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for :::spelling-error should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::spelling-error. should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
   [getComputedStyle() for ::grammar-error]
     expected: FAIL
 
-  [getComputedStyle() for ::grammar-error: should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::grammar-error) should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::grammar-error( should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::grammar-error(foo) should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::grammar-error() should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for :::grammar-error should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::grammar-error. should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
   [getComputedStyle() for ::highlight(foo)]
     expected: FAIL
 
-  [getComputedStyle() for ::highlight(foo): should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::highlight(foo)) should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::highlight(foo)( should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::highlight(foo)(foo) should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::highlight(foo)() should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for :::highlight(foo) should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
-  [getComputedStyle() for ::highlight(foo). should return an empty CSSStyleDeclaration]
-    expected: FAIL
-
   [Different getComputedStyle() for ::highlight(bar) and same element]
     expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-pseudos-visited-computed-001.html.ini b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-pseudos-visited-computed-001.html.ini
index 5e40d3bc896..3c11e2edae0 100644
--- a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-pseudos-visited-computed-001.html.ini
+++ b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-pseudos-visited-computed-001.html.ini
@@ -1,10 +1,4 @@
 [highlight-pseudos-visited-computed-001.html]
-  [getComputedStyle() for ::selection at #target1]
-    expected: FAIL
-
-  [getComputedStyle() for ::selection at #target2]
-    expected: FAIL
-
   [getComputedStyle() for ::target-text at #target1]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-pseudo/marker-animate-002.html.ini b/tests/wpt/meta/css/css-pseudo/marker-animate-002.html.ini
new file mode 100644
index 00000000000..3c24a5f44a2
--- /dev/null
+++ b/tests/wpt/meta/css/css-pseudo/marker-animate-002.html.ini
@@ -0,0 +1,2 @@
+[marker-animate-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/marker-color.html.ini b/tests/wpt/meta/css/css-pseudo/marker-color.html.ini
deleted file mode 100644
index 030347fc02d..00000000000
--- a/tests/wpt/meta/css/css-pseudo/marker-color.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[marker-color.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/marker-computed-content.html.ini b/tests/wpt/meta/css/css-pseudo/marker-computed-content.html.ini
deleted file mode 100644
index 96e7c1e6158..00000000000
--- a/tests/wpt/meta/css/css-pseudo/marker-computed-content.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[marker-computed-content.html]
-  [Computed 'content' for list-item ::marker, variant string]
-    expected: FAIL
-
-  [Computed 'content' for list-item ::marker, variant image]
-    expected: FAIL
-
-  [Computed 'content' for list-item ::marker, variant none]
-    expected: FAIL
-
-  [Computed 'content' for non-list-item ::marker, variant string]
-    expected: FAIL
-
-  [Computed 'content' for non-list-item ::marker, variant image]
-    expected: FAIL
-
-  [Computed 'content' for non-list-item ::marker, variant none]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/marker-computed-size.html.ini b/tests/wpt/meta/css/css-pseudo/marker-computed-size.html.ini
index 2f611246d69..69e9d816c12 100644
--- a/tests/wpt/meta/css/css-pseudo/marker-computed-size.html.ini
+++ b/tests/wpt/meta/css/css-pseudo/marker-computed-size.html.ini
@@ -8,9 +8,6 @@
   [String ::marker]
     expected: FAIL
 
-  [::marker with no box due to 'list-style']
-    expected: FAIL
-
   [::marker with custom string contents]
     expected: FAIL
 
@@ -19,6 +16,3 @@
 
   [::marker with custom string and image contents]
     expected: FAIL
-
-  [::marker with no box due to 'content']
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/marker-default-styles.html.ini b/tests/wpt/meta/css/css-pseudo/marker-default-styles.html.ini
index 2b46e3578f9..71470dd9983 100644
--- a/tests/wpt/meta/css/css-pseudo/marker-default-styles.html.ini
+++ b/tests/wpt/meta/css/css-pseudo/marker-default-styles.html.ini
@@ -2,71 +2,47 @@
   [Computed value of 'font-variant-numeric' for outside symbol]
     expected: FAIL
 
-  [Computed value of 'text-transform' for outside symbol]
-    expected: FAIL
-
   [Computed value of 'text-indent' for outside symbol]
     expected: FAIL
 
   [Computed value of 'font-variant-numeric' for outside decimal]
     expected: FAIL
 
-  [Computed value of 'text-transform' for outside decimal]
-    expected: FAIL
-
   [Computed value of 'text-indent' for outside decimal]
     expected: FAIL
 
   [Computed value of 'font-variant-numeric' for outside string]
     expected: FAIL
 
-  [Computed value of 'text-transform' for outside string]
-    expected: FAIL
-
   [Computed value of 'text-indent' for outside string]
     expected: FAIL
 
   [Computed value of 'font-variant-numeric' for outside marker]
     expected: FAIL
 
-  [Computed value of 'text-transform' for outside marker]
-    expected: FAIL
-
   [Computed value of 'text-indent' for outside marker]
     expected: FAIL
 
   [Computed value of 'font-variant-numeric' for inside symbol]
     expected: FAIL
 
-  [Computed value of 'text-transform' for inside symbol]
-    expected: FAIL
-
   [Computed value of 'text-indent' for inside symbol]
     expected: FAIL
 
   [Computed value of 'font-variant-numeric' for inside decimal]
     expected: FAIL
 
-  [Computed value of 'text-transform' for inside decimal]
-    expected: FAIL
-
   [Computed value of 'text-indent' for inside decimal]
     expected: FAIL
 
   [Computed value of 'font-variant-numeric' for inside string]
     expected: FAIL
 
-  [Computed value of 'text-transform' for inside string]
-    expected: FAIL
-
   [Computed value of 'text-indent' for inside string]
     expected: FAIL
 
   [Computed value of 'font-variant-numeric' for inside marker]
     expected: FAIL
 
-  [Computed value of 'text-transform' for inside marker]
-    expected: FAIL
-
   [Computed value of 'text-indent' for inside marker]
     expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/marker-display-computed.html.ini b/tests/wpt/meta/css/css-pseudo/marker-display-computed.html.ini
index 3e1830fb087..d300a2f0b6e 100644
--- a/tests/wpt/meta/css/css-pseudo/marker-display-computed.html.ini
+++ b/tests/wpt/meta/css/css-pseudo/marker-display-computed.html.ini
@@ -1,16 +1,4 @@
 [marker-display-computed.html]
-  [Computed 'display' for inside ::marker, variant default]
-    expected: FAIL
-
-  [Computed 'display' for inside ::marker, variant color]
-    expected: FAIL
-
-  [Computed 'display' for inside ::marker, variant string]
-    expected: FAIL
-
-  [Computed 'display' for inside ::marker, variant content]
-    expected: FAIL
-
   [Computed 'display' for outside ::marker, variant default]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-pseudo/marker-letter-spacing.html.ini b/tests/wpt/meta/css/css-pseudo/marker-letter-spacing.html.ini
new file mode 100644
index 00000000000..fc95d410898
--- /dev/null
+++ b/tests/wpt/meta/css/css-pseudo/marker-letter-spacing.html.ini
@@ -0,0 +1,2 @@
+[marker-letter-spacing.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/marker-line-height.html.ini b/tests/wpt/meta/css/css-pseudo/marker-line-height.html.ini
deleted file mode 100644
index 0099d3c8150..00000000000
--- a/tests/wpt/meta/css/css-pseudo/marker-line-height.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[marker-line-height.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/marker-variable-computed-style.html.ini b/tests/wpt/meta/css/css-pseudo/marker-variable-computed-style.html.ini
deleted file mode 100644
index a91b0c48adf..00000000000
--- a/tests/wpt/meta/css/css-pseudo/marker-variable-computed-style.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[marker-variable-computed-style.html]
-  [getComputedStyle() for opacity defined by variable in ::marker]
-    expected: FAIL
-
-  [getComputedStyle() for color defined by variable in ::marker]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/marker-word-spacing.html.ini b/tests/wpt/meta/css/css-pseudo/marker-word-spacing.html.ini
new file mode 100644
index 00000000000..4c6f4402bd5
--- /dev/null
+++ b/tests/wpt/meta/css/css-pseudo/marker-word-spacing.html.ini
@@ -0,0 +1,2 @@
+[marker-word-spacing.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/parsing/marker-supported-properties-in-animation.html.ini b/tests/wpt/meta/css/css-pseudo/parsing/marker-supported-properties-in-animation.html.ini
index 672f877b6d3..7fa1ec08034 100644
--- a/tests/wpt/meta/css/css-pseudo/parsing/marker-supported-properties-in-animation.html.ini
+++ b/tests/wpt/meta/css/css-pseudo/parsing/marker-supported-properties-in-animation.html.ini
@@ -1,2 +1,237 @@
 [marker-supported-properties-in-animation.html]
-  expected: ERROR
+  [Animation of font in ::marker]
+    expected: FAIL
+
+  [Animation of font-family in ::marker]
+    expected: FAIL
+
+  [Animation of font-feature-settings in ::marker]
+    expected: FAIL
+
+  [Animation of font-kerning in ::marker]
+    expected: FAIL
+
+  [Animation of font-size in ::marker]
+    expected: FAIL
+
+  [Animation of font-size-adjust in ::marker]
+    expected: FAIL
+
+  [Animation of font-stretch in ::marker]
+    expected: FAIL
+
+  [Animation of font-style in ::marker]
+    expected: FAIL
+
+  [Animation of font-synthesis in ::marker]
+    expected: FAIL
+
+  [Animation of font-synthesis-small-caps in ::marker]
+    expected: FAIL
+
+  [Animation of font-synthesis-style in ::marker]
+    expected: FAIL
+
+  [Animation of font-synthesis-weight in ::marker]
+    expected: FAIL
+
+  [Animation of font-variant in ::marker]
+    expected: FAIL
+
+  [Animation of font-variant-caps in ::marker]
+    expected: FAIL
+
+  [Animation of font-variant-east-asian in ::marker]
+    expected: FAIL
+
+  [Animation of font-variant-ligatures in ::marker]
+    expected: FAIL
+
+  [Animation of font-variant-numeric in ::marker]
+    expected: FAIL
+
+  [Animation of font-variant-position in ::marker]
+    expected: FAIL
+
+  [Animation of font-weight in ::marker]
+    expected: FAIL
+
+  [Animation of line-height in ::marker]
+    expected: FAIL
+
+  [Animation of white-space in ::marker]
+    expected: FAIL
+
+  [Animation of color in ::marker]
+    expected: FAIL
+
+  [Animation of text-combine-upright in ::marker]
+    expected: FAIL
+
+  [Animation of content in ::marker]
+    expected: FAIL
+
+  [Animation of hyphens in ::marker]
+    expected: FAIL
+
+  [Animation of letter-spacing in ::marker]
+    expected: FAIL
+
+  [Animation of line-break in ::marker]
+    expected: FAIL
+
+  [Animation of overflow-wrap in ::marker]
+    expected: FAIL
+
+  [Animation of tab-size in ::marker]
+    expected: FAIL
+
+  [Animation of text-transform in ::marker]
+    expected: FAIL
+
+  [Animation of word-break in ::marker]
+    expected: FAIL
+
+  [Animation of word-spacing in ::marker]
+    expected: FAIL
+
+  [Animation of text-decoration-skip-ink in ::marker]
+    expected: FAIL
+
+  [Animation of text-emphasis in ::marker]
+    expected: FAIL
+
+  [Animation of text-emphasis-color in ::marker]
+    expected: FAIL
+
+  [Animation of text-emphasis-position in ::marker]
+    expected: FAIL
+
+  [Animation of text-emphasis-style in ::marker]
+    expected: FAIL
+
+  [Animation of text-shadow in ::marker]
+    expected: FAIL
+
+  [Animation of cursor in ::marker]
+    expected: FAIL
+
+  [Animation of list-style in ::marker]
+    expected: FAIL
+
+  [Transition of font in ::marker]
+    expected: FAIL
+
+  [Transition of font-feature-settings in ::marker]
+    expected: FAIL
+
+  [Transition of font-kerning in ::marker]
+    expected: FAIL
+
+  [Transition of font-size in ::marker]
+    expected: FAIL
+
+  [Transition of font-size-adjust in ::marker]
+    expected: FAIL
+
+  [Transition of font-stretch in ::marker]
+    expected: FAIL
+
+  [Transition of font-synthesis in ::marker]
+    expected: FAIL
+
+  [Transition of font-synthesis-small-caps in ::marker]
+    expected: FAIL
+
+  [Transition of font-synthesis-style in ::marker]
+    expected: FAIL
+
+  [Transition of font-synthesis-weight in ::marker]
+    expected: FAIL
+
+  [Transition of font-variant in ::marker]
+    expected: FAIL
+
+  [Transition of font-variant-caps in ::marker]
+    expected: FAIL
+
+  [Transition of font-variant-east-asian in ::marker]
+    expected: FAIL
+
+  [Transition of font-variant-ligatures in ::marker]
+    expected: FAIL
+
+  [Transition of font-variant-numeric in ::marker]
+    expected: FAIL
+
+  [Transition of font-variant-position in ::marker]
+    expected: FAIL
+
+  [Transition of font-weight in ::marker]
+    expected: FAIL
+
+  [Transition of line-height in ::marker]
+    expected: FAIL
+
+  [Transition of color in ::marker]
+    expected: FAIL
+
+  [Transition of text-combine-upright in ::marker]
+    expected: FAIL
+
+  [Transition of hyphens in ::marker]
+    expected: FAIL
+
+  [Transition of letter-spacing in ::marker]
+    expected: FAIL
+
+  [Transition of line-break in ::marker]
+    expected: FAIL
+
+  [Transition of tab-size in ::marker]
+    expected: FAIL
+
+  [Transition of word-break in ::marker]
+    expected: FAIL
+
+  [Transition of word-spacing in ::marker]
+    expected: FAIL
+
+  [Transition of text-decoration-skip-ink in ::marker]
+    expected: FAIL
+
+  [Transition of text-emphasis in ::marker]
+    expected: FAIL
+
+  [Transition of text-emphasis-color in ::marker]
+    expected: FAIL
+
+  [Transition of text-emphasis-position in ::marker]
+    expected: FAIL
+
+  [Transition of text-emphasis-style in ::marker]
+    expected: FAIL
+
+  [Transition of text-shadow in ::marker]
+    expected: FAIL
+
+  [Transition of display in ::marker]
+    expected: FAIL
+
+  [Transition of position in ::marker]
+    expected: FAIL
+
+  [Transition of float in ::marker]
+    expected: FAIL
+
+  [Transition of list-style in ::marker]
+    expected: FAIL
+
+  [Transition of list-style-image in ::marker]
+    expected: FAIL
+
+  [Transition of list-style-position in ::marker]
+    expected: FAIL
+
+  [Transition of list-style-type in ::marker]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/parsing/marker-supported-properties.html.ini b/tests/wpt/meta/css/css-pseudo/parsing/marker-supported-properties.html.ini
index cb4247c08b9..91f55c091f7 100644
--- a/tests/wpt/meta/css/css-pseudo/parsing/marker-supported-properties.html.ini
+++ b/tests/wpt/meta/css/css-pseudo/parsing/marker-supported-properties.html.ini
@@ -1,28 +1,13 @@
 [marker-supported-properties.html]
-  [Property font value 'italic small-caps 900 expanded 25px / 50px Ahem' in ::marker]
-    expected: FAIL
-
-  [Property font-family value 'Ahem' in ::marker]
-    expected: FAIL
-
   [Property font-feature-settings value '"smcp"' in ::marker]
     expected: FAIL
 
   [Property font-kerning value 'none' in ::marker]
     expected: FAIL
 
-  [Property font-size value '25px' in ::marker]
-    expected: FAIL
-
   [Property font-size-adjust value '1' in ::marker]
     expected: FAIL
 
-  [Property font-stretch value 'expanded' in ::marker]
-    expected: FAIL
-
-  [Property font-style value 'italic' in ::marker]
-    expected: FAIL
-
   [Property font-synthesis value 'none' in ::marker]
     expected: FAIL
 
@@ -35,12 +20,6 @@
   [Property font-synthesis-weight value 'none' in ::marker]
     expected: FAIL
 
-  [Property font-variant value 'small-caps' in ::marker]
-    expected: FAIL
-
-  [Property font-variant-caps value 'small-caps' in ::marker]
-    expected: FAIL
-
   [Property font-variant-east-asian value 'full-width' in ::marker]
     expected: FAIL
 
@@ -53,99 +32,24 @@
   [Property font-variant-position value 'sub' in ::marker]
     expected: FAIL
 
-  [Property font-weight value '900' in ::marker]
-    expected: FAIL
-
-  [Property line-height value '50px' in ::marker]
-    expected: FAIL
-
-  [Property white-space value 'nowrap' in ::marker]
-    expected: FAIL
-
-  [Property color value 'rgb(0, 100, 200)' in ::marker]
-    expected: FAIL
-
   [Property text-combine-upright value 'all' in ::marker]
     expected: FAIL
 
-  [Property unicode-bidi value 'plaintext' in ::marker]
-    expected: FAIL
-
-  [Property direction value 'rtl' in ::marker]
-    expected: FAIL
-
-  [Property content value '"foo"' in ::marker]
-    expected: FAIL
-
-  [Property animation value '1s linear 2s infinite alternate forwards paused anim' in ::marker]
-    expected: FAIL
-
-  [Property animation-delay value '1s' in ::marker]
-    expected: FAIL
-
-  [Property animation-direction value 'alternate' in ::marker]
-    expected: FAIL
-
-  [Property animation-duration value '2s' in ::marker]
-    expected: FAIL
-
-  [Property animation-fill-mode value 'forwards' in ::marker]
-    expected: FAIL
-
-  [Property animation-iteration-count value 'infinite' in ::marker]
-    expected: FAIL
-
-  [Property animation-name value 'anim' in ::marker]
-    expected: FAIL
-
-  [Property animation-play-state value 'paused' in ::marker]
-    expected: FAIL
-
-  [Property animation-timing-function value 'linear' in ::marker]
-    expected: FAIL
-
   [Property animation-composition value 'add' in ::marker]
     expected: FAIL
 
-  [Property transition value 'display 1s linear 2s' in ::marker]
-    expected: FAIL
-
-  [Property transition-delay value '1s' in ::marker]
-    expected: FAIL
-
-  [Property transition-duration value '2s' in ::marker]
-    expected: FAIL
-
-  [Property transition-property value 'display' in ::marker]
-    expected: FAIL
-
-  [Property transition-timing-function value 'linear' in ::marker]
-    expected: FAIL
-
   [Property hyphens value 'none' in ::marker]
     expected: FAIL
 
-  [Property letter-spacing value '10px' in ::marker]
-    expected: FAIL
-
   [Property line-break value 'anywhere' in ::marker]
     expected: FAIL
 
-  [Property overflow-wrap value 'anywhere' in ::marker]
-    expected: FAIL
-
   [Property tab-size value '10px' in ::marker]
     expected: FAIL
 
-  [Property text-transform value 'uppercase' in ::marker]
-    expected: FAIL
-
   [Property word-break value 'break-word' in ::marker]
     expected: FAIL
 
-  [Property word-spacing value '10px' in ::marker]
-    expected: FAIL
-
   [Property text-decoration-skip-ink value 'none' in ::marker]
     expected: FAIL
 
@@ -161,9 +65,6 @@
   [Property text-emphasis-style value 'dot' in ::marker]
     expected: FAIL
 
-  [Property text-shadow value 'rgb(0, 255, 0) 1px 2px 3px' in ::marker]
-    expected: FAIL
-
   [Property display value 'none' in ::marker]
     expected: FAIL
 
@@ -184,6 +85,3 @@
 
   [Property list-style-type value 'decimal' in ::marker]
     expected: FAIL
-
-  [Property cursor value 'move' in ::marker]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/parsing/tree-abiding-pseudo-elements.html.ini b/tests/wpt/meta/css/css-pseudo/parsing/tree-abiding-pseudo-elements.html.ini
index bc76fcdd096..02c230e4e14 100644
--- a/tests/wpt/meta/css/css-pseudo/parsing/tree-abiding-pseudo-elements.html.ini
+++ b/tests/wpt/meta/css/css-pseudo/parsing/tree-abiding-pseudo-elements.html.ini
@@ -1,13 +1,4 @@
 [tree-abiding-pseudo-elements.html]
-  ["::marker" should be a valid selector]
-    expected: FAIL
-
-  ["*::marker" should be a valid selector]
-    expected: FAIL
-
-  ["foo.bar[baz\]::marker" should be a valid selector]
-    expected: FAIL
-
   ["::placeholder" should be a valid selector]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-pseudo/selection-universal-shadow-dom.html.ini b/tests/wpt/meta/css/css-pseudo/selection-universal-shadow-dom.html.ini
deleted file mode 100644
index 33e1ccb830e..00000000000
--- a/tests/wpt/meta/css/css-pseudo/selection-universal-shadow-dom.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[selection-universal-shadow-dom.html]
-  [getComputedStyle() for #target ::selection]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-001.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-001.html.ini
deleted file mode 100644
index 0c87aad2f92..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-001.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-002.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-002.html.ini
deleted file mode 100644
index a385532ec81..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-002.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-007.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-007.html.ini
deleted file mode 100644
index d3164fd188c..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-007.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-007.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-009.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-009.html.ini
deleted file mode 100644
index 1fa3a2d2b0e..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-009.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-009.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-010.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-010.html.ini
deleted file mode 100644
index 6f3f1fa4966..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-010.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-010.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-011.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-011.html.ini
deleted file mode 100644
index 180562e0108..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-011.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-011.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-012.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-012.html.ini
deleted file mode 100644
index 1a8778a21cf..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-012.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-012.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-014.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-014.html.ini
deleted file mode 100644
index a8c90ae4096..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-014.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-014.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-015.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-015.html.ini
deleted file mode 100644
index 8c4dc6fbb62..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-015.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-015.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-016.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-016.html.ini
deleted file mode 100644
index 0a6e31765a7..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-016.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-016.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-017.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-017.html.ini
deleted file mode 100644
index 5f923d3ef88..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-017.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-017.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-019.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-019.html.ini
deleted file mode 100644
index 9d6a4d70e0b..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-019.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-019.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-020.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-020.html.ini
deleted file mode 100644
index 064714960bf..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-020.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-020.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-021.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-021.html.ini
deleted file mode 100644
index e78f7347425..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-021.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-021.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-025.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-025.html.ini
deleted file mode 100644
index 0892c598edb..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-025.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-025.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-026.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-026.html.ini
deleted file mode 100644
index b8b29217f4a..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-026.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-026.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-027.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-027.html.ini
new file mode 100644
index 00000000000..c3ebe96ea39
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-027.html.ini
@@ -0,0 +1,2 @@
+[grid-aspect-ratio-027.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-030.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-030.html.ini
deleted file mode 100644
index 52f117fb974..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-030.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-030.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-031.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-031.html.ini
deleted file mode 100644
index 7e3f3c49acd..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-031.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-031.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-038.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-038.html.ini
deleted file mode 100644
index 9fd6221bf21..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-038.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-038.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-039.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-039.html.ini
new file mode 100644
index 00000000000..4db20639e44
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-039.html.ini
@@ -0,0 +1,2 @@
+[grid-aspect-ratio-039.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-040.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-040.html.ini
deleted file mode 100644
index 62ed4724885..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-040.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-040.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-042.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-042.html.ini
new file mode 100644
index 00000000000..38233b5286d
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-042.html.ini
@@ -0,0 +1,2 @@
+[grid-aspect-ratio-042.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/replaced-element-013.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/replaced-element-013.html.ini
deleted file mode 100644
index e31d7aaca38..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/replaced-element-013.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[replaced-element-013.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/replaced-element-014.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/replaced-element-014.html.ini
deleted file mode 100644
index 330d09977bd..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/replaced-element-014.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[replaced-element-014.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/grid-item-image-percentage-min-height-computes-as-0.html.ini b/tests/wpt/meta/css/css-sizing/grid-item-image-percentage-min-height-computes-as-0.html.ini
new file mode 100644
index 00000000000..bb271ce848b
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/grid-item-image-percentage-min-height-computes-as-0.html.ini
@@ -0,0 +1,2 @@
+[grid-item-image-percentage-min-height-computes-as-0.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-030.tentative.html.ini b/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-030.tentative.html.ini
new file mode 100644
index 00000000000..1a4d7b6af62
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-030.tentative.html.ini
@@ -0,0 +1,2 @@
+[intrinsic-percent-replaced-030.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/range-percent-intrinsic-size-2.html.ini b/tests/wpt/meta/css/css-sizing/range-percent-intrinsic-size-2.html.ini
deleted file mode 100644
index b497c729f0c..00000000000
--- a/tests/wpt/meta/css/css-sizing/range-percent-intrinsic-size-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[range-percent-intrinsic-size-2.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/range-percent-intrinsic-size-2a.html.ini b/tests/wpt/meta/css/css-sizing/range-percent-intrinsic-size-2a.html.ini
deleted file mode 100644
index 51f4e2b05d6..00000000000
--- a/tests/wpt/meta/css/css-sizing/range-percent-intrinsic-size-2a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[range-percent-intrinsic-size-2a.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/stretch-alias-block-size-001.tentative.html.ini b/tests/wpt/meta/css/css-sizing/stretch/stretch-alias-block-size-001.tentative.html.ini
index bda64cbe7b7..7a1f3a49750 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/stretch-alias-block-size-001.tentative.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/stretch-alias-block-size-001.tentative.html.ini
@@ -41,12 +41,6 @@
   [[data-expected-height\] 21]
     expected: FAIL
 
-  [[data-expected-height\] 22]
-    expected: FAIL
-
-  [[data-expected-height\] 23]
-    expected: FAIL
-
   [[data-expected-height\] 24]
     expected: FAIL
 
@@ -88,9 +82,3 @@
 
   [[data-expected-height\] 44]
     expected: FAIL
-
-  [[data-expected-height\] 45]
-    expected: FAIL
-
-  [[data-expected-height\] 46]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/stretch-alias-inline-size-001.tentative.html.ini b/tests/wpt/meta/css/css-sizing/stretch/stretch-alias-inline-size-001.tentative.html.ini
index 1cac73b24c2..9fe25d63a19 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/stretch-alias-inline-size-001.tentative.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/stretch-alias-inline-size-001.tentative.html.ini
@@ -38,9 +38,6 @@
   [[data-expected-width\] 21]
     expected: FAIL
 
-  [[data-expected-width\] 22]
-    expected: FAIL
-
   [[data-expected-width\] 25]
     expected: FAIL
 
@@ -79,6 +76,3 @@
 
   [[data-expected-width\] 44]
     expected: FAIL
-
-  [[data-expected-width\] 45]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/stretch-block-size-001.html.ini b/tests/wpt/meta/css/css-sizing/stretch/stretch-block-size-001.html.ini
index 5eacbff3ca9..193a93c2d0f 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/stretch-block-size-001.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/stretch-block-size-001.html.ini
@@ -2,11 +2,5 @@
   [[data-expected-height\] 14]
     expected: FAIL
 
-  [[data-expected-height\] 22]
-    expected: FAIL
-
   [[data-expected-height\] 37]
     expected: FAIL
-
-  [[data-expected-height\] 45]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/stretch-inline-size-001.html.ini b/tests/wpt/meta/css/css-sizing/stretch/stretch-inline-size-001.html.ini
index f179d0e051e..51d3f86f340 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/stretch-inline-size-001.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/stretch-inline-size-001.html.ini
@@ -2,11 +2,5 @@
   [[data-expected-width\] 14]
     expected: FAIL
 
-  [[data-expected-width\] 22]
-    expected: FAIL
-
   [[data-expected-width\] 37]
     expected: FAIL
-
-  [[data-expected-width\] 45]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/stretch-max-block-size-001.html.ini b/tests/wpt/meta/css/css-sizing/stretch/stretch-max-block-size-001.html.ini
index 4f5ae361ba4..971845440fc 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/stretch-max-block-size-001.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/stretch-max-block-size-001.html.ini
@@ -5,9 +5,6 @@
   [[data-expected-height\] 22]
     expected: FAIL
 
-  [[data-expected-height\] 23]
-    expected: FAIL
-
   [[data-expected-height\]:not([skip-second-pass\]) 37]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-sizing/stretch/stretch-max-inline-size-001.html.ini b/tests/wpt/meta/css/css-sizing/stretch/stretch-max-inline-size-001.html.ini
index 1f486fc8b86..ec488fde379 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/stretch-max-inline-size-001.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/stretch-max-inline-size-001.html.ini
@@ -5,9 +5,6 @@
   [[data-expected-width\] 22]
     expected: FAIL
 
-  [[data-expected-width\] 23]
-    expected: FAIL
-
   [[data-expected-width\]:not([skip-second-pass\]) 37]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-sizing/stretch/stretch-min-block-size-001.html.ini b/tests/wpt/meta/css/css-sizing/stretch/stretch-min-block-size-001.html.ini
index 6cfb9f77ad9..53d89a60a71 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/stretch-min-block-size-001.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/stretch-min-block-size-001.html.ini
@@ -5,8 +5,14 @@
   [[data-expected-height\] 22]
     expected: FAIL
 
+  [[data-expected-height\] 23]
+    expected: FAIL
+
   [[data-expected-height\] 37]
     expected: FAIL
 
   [[data-expected-height\] 45]
     expected: FAIL
+
+  [[data-expected-height\] 46]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/stretch-min-inline-size-001.html.ini b/tests/wpt/meta/css/css-sizing/stretch/stretch-min-inline-size-001.html.ini
index cf36e15f523..b623dbc8062 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/stretch-min-inline-size-001.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/stretch-min-inline-size-001.html.ini
@@ -5,8 +5,14 @@
   [[data-expected-width\] 22]
     expected: FAIL
 
+  [[data-expected-width\] 23]
+    expected: FAIL
+
   [[data-expected-width\] 37]
     expected: FAIL
 
   [[data-expected-width\] 45]
     expected: FAIL
+
+  [[data-expected-width\] 46]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-syntax/custom-property-rule-ambiguity.html.ini b/tests/wpt/meta/css/css-syntax/custom-property-rule-ambiguity.html.ini
deleted file mode 100644
index d0ceac7c522..00000000000
--- a/tests/wpt/meta/css/css-syntax/custom-property-rule-ambiguity.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[custom-property-rule-ambiguity.html]
-  [Rule that looks like a custom property declaration is ignored]
-    expected: FAIL
-
-  [Rule that looks like an invalid custom property declaration is ignored]
-    expected: FAIL
-
-  [Nested rule that looks like a custom property declaration]
-    expected: FAIL
-
-  [Nested rule that looks like an invalid custom property declaration]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-syntax/invalid-nested-rules.html.ini b/tests/wpt/meta/css/css-syntax/invalid-nested-rules.html.ini
deleted file mode 100644
index d311978e78c..00000000000
--- a/tests/wpt/meta/css/css-syntax/invalid-nested-rules.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[invalid-nested-rules.html]
-  [Continues parsing after block on invalid rule error]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-syntax/serialize-consecutive-tokens.html.ini b/tests/wpt/meta/css/css-syntax/serialize-consecutive-tokens.html.ini
index c6103b1a1f7..410ab98e1d5 100644
--- a/tests/wpt/meta/css/css-syntax/serialize-consecutive-tokens.html.ini
+++ b/tests/wpt/meta/css/css-syntax/serialize-consecutive-tokens.html.ini
@@ -4,3 +4,6 @@
 
   [Comments are handled correctly when computing var(--t1)b using t1:a/* comment */.]
     expected: FAIL
+
+  [Comments are handled correctly when computing var(--t1)b using t1:'a " '/* comment */.]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-syntax/trailing-braces.html.ini b/tests/wpt/meta/css/css-syntax/trailing-braces.html.ini
deleted file mode 100644
index b2950bf88b1..00000000000
--- a/tests/wpt/meta/css/css-syntax/trailing-braces.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[trailing-braces.html]
-  [Trailing braces are not valid]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-syntax/var-with-blocks.html.ini b/tests/wpt/meta/css/css-syntax/var-with-blocks.html.ini
deleted file mode 100644
index 59a5b3aca44..00000000000
--- a/tests/wpt/meta/css/css-syntax/var-with-blocks.html.ini
+++ /dev/null
@@ -1,42 +0,0 @@
-[var-with-blocks.html]
-  [Plain var()]
-    expected: FAIL
-
-  [Whole-value block with var()]
-    expected: FAIL
-
-  [Whole-value block with var() (spaces)]
-    expected: FAIL
-
-  [Trailing block, leading var()]
-    expected: FAIL
-
-  [Leading block, trailing var()]
-    expected: FAIL
-
-  [In-block var() with trailing token]
-    expected: FAIL
-
-  [In-block var() with leading token]
-    expected: FAIL
-
-  [Plain var() (custom property)]
-    expected: FAIL
-
-  [Whole-value block with var() (custom property)]
-    expected: FAIL
-
-  [Whole-value block with var() (spaces, custom property)]
-    expected: FAIL
-
-  [Trailing block, leading var() (custom property)]
-    expected: FAIL
-
-  [Leading block, trailing var() (custom property)]
-    expected: FAIL
-
-  [In-block var() with trailing token (custom property)]
-    expected: FAIL
-
-  [In-block var() with leading token (custom property)]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-tables/no-overflow-with-table-cell-margins.html.ini b/tests/wpt/meta/css/css-tables/no-overflow-with-table-cell-margins.html.ini
deleted file mode 100644
index bbb1bb66008..00000000000
--- a/tests/wpt/meta/css/css-tables/no-overflow-with-table-cell-margins.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[no-overflow-with-table-cell-margins.html]
-  [no-overflow-with-table-cell-margins]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/css3-text-line-break-opclns-201.html.ini b/tests/wpt/meta/css/css-text/i18n/css3-text-line-break-opclns-201.html.ini
new file mode 100644
index 00000000000..1506bb7b1ae
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/css3-text-line-break-opclns-201.html.ini
@@ -0,0 +1,2 @@
+[css3-text-line-break-opclns-201.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-loose.html.ini
new file mode 100644
index 00000000000..40989fbc344
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-loose.html.ini
@@ -0,0 +1,153 @@
+[css-text-line-break-ja-cj-loose.html]
+  [3041  HIRAGANA LETTER SMALL A may appear at line start if ja and loose]
+    expected: FAIL
+
+  [3043  HIRAGANA LETTER SMALL I may appear at line start if ja and loose]
+    expected: FAIL
+
+  [3045  HIRAGANA LETTER SMALL U may appear at line start if ja and loose]
+    expected: FAIL
+
+  [3047  HIRAGANA LETTER SMALL E may appear at line start if ja and loose]
+    expected: FAIL
+
+  [3049  HIRAGANA LETTER SMALL O may appear at line start if ja and loose]
+    expected: FAIL
+
+  [3063  HIRAGANA LETTER SMALL TU may appear at line start if ja and loose]
+    expected: FAIL
+
+  [3083  HIRAGANA LETTER SMALL YA may appear at line start if ja and loose]
+    expected: FAIL
+
+  [3085  HIRAGANA LETTER SMALL YU may appear at line start if ja and loose]
+    expected: FAIL
+
+  [3087  HIRAGANA LETTER SMALL YO may appear at line start if ja and loose]
+    expected: FAIL
+
+  [308E  HIRAGANA LETTER SMALL WA may appear at line start if ja and loose]
+    expected: FAIL
+
+  [3095  HIRAGANA LETTER SMALL KA may appear at line start if ja and loose]
+    expected: FAIL
+
+  [3096  HIRAGANA LETTER SMALL KE may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30A1  KATAKANA LETTER SMALL A may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30A3  KATAKANA LETTER SMALL I may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30A5  KATAKANA LETTER SMALL U may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30A7  KATAKANA LETTER SMALL E may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30A9  KATAKANA LETTER SMALL O may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30C3  KATAKANA LETTER SMALL TU may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30E3  KATAKANA LETTER SMALL YA may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30E5  KATAKANA LETTER SMALL YU may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30E7  KATAKANA LETTER SMALL YO may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30EE  KATAKANA LETTER SMALL WA may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30F5  KATAKANA LETTER SMALL KA may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30F6  KATAKANA LETTER SMALL KE may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30FC  KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31F0  KATAKANA LETTER SMALL KU may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31F1  KATAKANA LETTER SMALL SI may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31F2  KATAKANA LETTER SMALL SU may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31F3  KATAKANA LETTER SMALL TO may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31F4  KATAKANA LETTER SMALL NU may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31F5  KATAKANA LETTER SMALL HA may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31F6  KATAKANA LETTER SMALL HI may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31F7  KATAKANA LETTER SMALL HU may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31F8  KATAKANA LETTER SMALL HE may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31F9  KATAKANA LETTER SMALL HO may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31FA  KATAKANA LETTER SMALL MU may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31FB  KATAKANA LETTER SMALL RA may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31FC  KATAKANA LETTER SMALL RI may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31FD  KATAKANA LETTER SMALL RU may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31FE  KATAKANA LETTER SMALL RE may appear at line start if ja and loose]
+    expected: FAIL
+
+  [31FF  KATAKANA LETTER SMALL RO may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF67  HALFWIDTH KATAKANA LETTER SMALL A may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF68  HALFWIDTH KATAKANA LETTER SMALL I may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF69  HALFWIDTH KATAKANA LETTER SMALL U may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF6A  HALFWIDTH KATAKANA LETTER SMALL E may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF6B  HALFWIDTH KATAKANA LETTER SMALL O may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF6C  HALFWIDTH KATAKANA LETTER SMALL YA may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF6D  HALFWIDTH KATAKANA LETTER SMALL YU may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF6E  HALFWIDTH KATAKANA LETTER SMALL YO may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF6F  HALFWIDTH KATAKANA LETTER SMALL TU may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF70  HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if ja and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-normal.html.ini b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-normal.html.ini
new file mode 100644
index 00000000000..48bb441ece2
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-normal.html.ini
@@ -0,0 +1,153 @@
+[css-text-line-break-ja-cj-normal.html]
+  [3041  HIRAGANA LETTER SMALL A may appear at line start if ja and normal]
+    expected: FAIL
+
+  [3043  HIRAGANA LETTER SMALL I may appear at line start if ja and normal]
+    expected: FAIL
+
+  [3045  HIRAGANA LETTER SMALL U may appear at line start if ja and normal]
+    expected: FAIL
+
+  [3047  HIRAGANA LETTER SMALL E may appear at line start if ja and normal]
+    expected: FAIL
+
+  [3049  HIRAGANA LETTER SMALL O may appear at line start if ja and normal]
+    expected: FAIL
+
+  [3063  HIRAGANA LETTER SMALL TU may appear at line start if ja and normal]
+    expected: FAIL
+
+  [3083  HIRAGANA LETTER SMALL YA may appear at line start if ja and normal]
+    expected: FAIL
+
+  [3085  HIRAGANA LETTER SMALL YU may appear at line start if ja and normal]
+    expected: FAIL
+
+  [3087  HIRAGANA LETTER SMALL YO may appear at line start if ja and normal]
+    expected: FAIL
+
+  [308E  HIRAGANA LETTER SMALL WA may appear at line start if ja and normal]
+    expected: FAIL
+
+  [3095  HIRAGANA LETTER SMALL KA may appear at line start if ja and normal]
+    expected: FAIL
+
+  [3096  HIRAGANA LETTER SMALL KE may appear at line start if ja and normal]
+    expected: FAIL
+
+  [30A1  KATAKANA LETTER SMALL A may appear at line start if ja and normal]
+    expected: FAIL
+
+  [30A3  KATAKANA LETTER SMALL I may appear at line start if ja and normal]
+    expected: FAIL
+
+  [30A5  KATAKANA LETTER SMALL U may appear at line start if ja and normal]
+    expected: FAIL
+
+  [30A7  KATAKANA LETTER SMALL E may appear at line start if ja and normal]
+    expected: FAIL
+
+  [30A9  KATAKANA LETTER SMALL O may appear at line start if ja and normal]
+    expected: FAIL
+
+  [30C3  KATAKANA LETTER SMALL TU may appear at line start if ja and normal]
+    expected: FAIL
+
+  [30E3  KATAKANA LETTER SMALL YA may appear at line start if ja and normal]
+    expected: FAIL
+
+  [30E5  KATAKANA LETTER SMALL YU may appear at line start if ja and normal]
+    expected: FAIL
+
+  [30E7  KATAKANA LETTER SMALL YO may appear at line start if ja and normal]
+    expected: FAIL
+
+  [30EE  KATAKANA LETTER SMALL WA may appear at line start if ja and normal]
+    expected: FAIL
+
+  [30F5  KATAKANA LETTER SMALL KA may appear at line start if ja and normal]
+    expected: FAIL
+
+  [30F6  KATAKANA LETTER SMALL KE may appear at line start if ja and normal]
+    expected: FAIL
+
+  [30FC  KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31F0  KATAKANA LETTER SMALL KU may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31F1  KATAKANA LETTER SMALL SI may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31F2  KATAKANA LETTER SMALL SU may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31F3  KATAKANA LETTER SMALL TO may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31F4  KATAKANA LETTER SMALL NU may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31F5  KATAKANA LETTER SMALL HA may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31F6  KATAKANA LETTER SMALL HI may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31F7  KATAKANA LETTER SMALL HU may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31F8  KATAKANA LETTER SMALL HE may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31F9  KATAKANA LETTER SMALL HO may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31FA  KATAKANA LETTER SMALL MU may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31FB  KATAKANA LETTER SMALL RA may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31FC  KATAKANA LETTER SMALL RI may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31FD  KATAKANA LETTER SMALL RU may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31FE  KATAKANA LETTER SMALL RE may appear at line start if ja and normal]
+    expected: FAIL
+
+  [31FF  KATAKANA LETTER SMALL RO may appear at line start if ja and normal]
+    expected: FAIL
+
+  [FF67  HALFWIDTH KATAKANA LETTER SMALL A may appear at line start if ja and normal]
+    expected: FAIL
+
+  [FF68  HALFWIDTH KATAKANA LETTER SMALL I may appear at line start if ja and normal]
+    expected: FAIL
+
+  [FF69  HALFWIDTH KATAKANA LETTER SMALL U may appear at line start if ja and normal]
+    expected: FAIL
+
+  [FF6A  HALFWIDTH KATAKANA LETTER SMALL E may appear at line start if ja and normal]
+    expected: FAIL
+
+  [FF6B  HALFWIDTH KATAKANA LETTER SMALL O may appear at line start if ja and normal]
+    expected: FAIL
+
+  [FF6C  HALFWIDTH KATAKANA LETTER SMALL YA may appear at line start if ja and normal]
+    expected: FAIL
+
+  [FF6D  HALFWIDTH KATAKANA LETTER SMALL YU may appear at line start if ja and normal]
+    expected: FAIL
+
+  [FF6E  HALFWIDTH KATAKANA LETTER SMALL YO may appear at line start if ja and normal]
+    expected: FAIL
+
+  [FF6F  HALFWIDTH KATAKANA LETTER SMALL TU may appear at line start if ja and normal]
+    expected: FAIL
+
+  [FF70  HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if ja and normal]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-cpm-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-cpm-loose.html.ini
new file mode 100644
index 00000000000..f9d4305cbd9
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-cpm-loose.html.ini
@@ -0,0 +1,30 @@
+[css-text-line-break-ja-cpm-loose.html]
+  [30FB  KATAKANA MIDDLE DOT may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF1A  FULLWIDTH COLON may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF1B  FULLWIDTH SEMICOLON may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF65  HALFWIDTH KATAKANA MIDDLE DOT may appear at line start if ja and loose]
+    expected: FAIL
+
+  [203C  DOUBLE EXCLAMATION MARK may appear at line start if ja and loose]
+    expected: FAIL
+
+  [2047  DOUBLE QUESTION MARK may appear at line start if ja and loose]
+    expected: FAIL
+
+  [2048  QUESTION EXCLAMATION MARK may appear at line start if ja and loose]
+    expected: FAIL
+
+  [2049  EXCLAMATION QUESTION MARK may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF01  FULLWIDTH EXCLAMATION MARK may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF1F  FULLWIDTH QUESTION MARK may appear at line start if ja and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-loose.html.ini
new file mode 100644
index 00000000000..6a850e73619
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-loose.html.ini
@@ -0,0 +1,6 @@
+[css-text-line-break-ja-hyphens-loose.html]
+  [301C WAVE DASH may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30A0 KATAKANA-HIRAGANA DOUBLE HYPHEN may appear at line start if ja and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-normal.html.ini b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-normal.html.ini
new file mode 100644
index 00000000000..6fb84bd511d
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-normal.html.ini
@@ -0,0 +1,6 @@
+[css-text-line-break-ja-hyphens-normal.html]
+  [301C WAVE DASH may appear at line start if ja and normal]
+    expected: FAIL
+
+  [30A0 KATAKANA-HIRAGANA DOUBLE HYPHEN may appear at line start if ja and normal]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-in-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-in-loose.html.ini
new file mode 100644
index 00000000000..9d2773db369
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-in-loose.html.ini
@@ -0,0 +1,15 @@
+[css-text-line-break-ja-in-loose.html]
+  [2024  ONE DOT LEADER may appear at line start if ja and loose]
+    expected: FAIL
+
+  [2025  TWO DOT LEADER may appear at line start if ja and loose]
+    expected: FAIL
+
+  [2026  HORIZONTAL ELLIPSIS may appear at line start if ja and loose]
+    expected: FAIL
+
+  [22EF  MIDLINE HORIZONTAL ELLIPSIS may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FE19  PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS may appear at line start if ja and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-iteration-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-iteration-loose.html.ini
new file mode 100644
index 00000000000..48d0748fcc8
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-iteration-loose.html.ini
@@ -0,0 +1,18 @@
+[css-text-line-break-ja-iteration-loose.html]
+  [3005  IDEOGRAPHIC ITERATION MARK may appear at line start if ja and loose]
+    expected: FAIL
+
+  [303B  VERTICAL IDEOGRAPHIC ITERATION MARK may appear at line start if ja and loose]
+    expected: FAIL
+
+  [309D  HIRAGANA ITERATION MARK may appear at line start if ja and loose]
+    expected: FAIL
+
+  [309E  HIRAGANA VOICED ITERATION MARK may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30FD  KATAKANA ITERATION MARK may appear at line start if ja and loose]
+    expected: FAIL
+
+  [30FE  KATAKANA VOICED ITERATION MARK may appear at line start if ja and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-loose.html.ini
new file mode 100644
index 00000000000..698e8cb1ffb
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-loose.html.ini
@@ -0,0 +1,30 @@
+[css-text-line-break-ja-po-loose.html]
+  [00B0  DEGREE SIGN may appear at line start if ja and loose]
+    expected: FAIL
+
+  [2030  PER MILLE SIGN may appear at line start if ja and loose]
+    expected: FAIL
+
+  [2032  PRIME may appear at line start if ja and loose]
+    expected: FAIL
+
+  [2033  DOUBLE PRIME may appear at line start if ja and loose]
+    expected: FAIL
+
+  [2035  REVERSED PRIME may appear at line start if ja and loose]
+    expected: FAIL
+
+  [2103  DEGREE CELSIUS may appear at line start if ja and loose]
+    expected: FAIL
+
+  [2109  DEGREE FAHRENHEIT may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FE6A  SMALL PERCENT SIGN may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FF05  FULLWIDTH PERCENT SIGN may appear at line start if ja and loose]
+    expected: FAIL
+
+  [FFE0  FULLWIDTH CENT SIGN may appear at line start if ja and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-pr-normal.html.ini b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-pr-normal.html.ini
new file mode 100644
index 00000000000..3b4346b63d9
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-pr-normal.html.ini
@@ -0,0 +1,24 @@
+[css-text-line-break-ja-pr-normal.html]
+  [00B1  PLUS-MINUS SIGN may NOT appear at line start if ja and normal]
+    expected: FAIL
+
+  [20AC  EURO SIGN may NOT appear at line start if ja and normal]
+    expected: FAIL
+
+  [2116  NUMERO SIGN may NOT appear at line start if ja and normal]
+    expected: FAIL
+
+  [FE69  SMALL DOLLAR SIGN may NOT appear at line start if ja and normal]
+    expected: FAIL
+
+  [FF04  FULLWIDTH DOLLAR SIGN may NOT appear at line start if ja and normal]
+    expected: FAIL
+
+  [FFE1  FULLWIDTH POUND SIGN may NOT appear at line start if ja and normal]
+    expected: FAIL
+
+  [FFE5  FULLWIDTH YEN SIGN may NOT appear at line start if ja and normal]
+    expected: FAIL
+
+  [FFE6  FULLWIDTH WON SIGN may NOT appear at line start if ja and normal]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-pr-strict.html.ini b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-pr-strict.html.ini
new file mode 100644
index 00000000000..fc83b40c780
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/ja/css-text-line-break-ja-pr-strict.html.ini
@@ -0,0 +1,24 @@
+[css-text-line-break-ja-pr-strict.html]
+  [00B1  PLUS-MINUS SIGN may NOT appear at line start if ja and strict]
+    expected: FAIL
+
+  [20AC  EURO SIGN may NOT appear at line start if ja and strict]
+    expected: FAIL
+
+  [2116  NUMERO SIGN may NOT appear at line start if ja and strict]
+    expected: FAIL
+
+  [FE69  SMALL DOLLAR SIGN may NOT appear at line start if ja and strict]
+    expected: FAIL
+
+  [FF04  FULLWIDTH DOLLAR SIGN may NOT appear at line start if ja and strict]
+    expected: FAIL
+
+  [FFE1  FULLWIDTH POUND SIGN may NOT appear at line start if ja and strict]
+    expected: FAIL
+
+  [FFE5  FULLWIDTH YEN SIGN may NOT appear at line start if ja and strict]
+    expected: FAIL
+
+  [FFE6  FULLWIDTH WON SIGN may NOT appear at line start if ja and strict]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/other-lang/css-text-line-break-de-cj-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/other-lang/css-text-line-break-de-cj-loose.html.ini
new file mode 100644
index 00000000000..499053c915e
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/other-lang/css-text-line-break-de-cj-loose.html.ini
@@ -0,0 +1,153 @@
+[css-text-line-break-de-cj-loose.html]
+  [3041  HIRAGANA LETTER SMALL A may appear at line start if de and loose]
+    expected: FAIL
+
+  [3043  HIRAGANA LETTER SMALL I may appear at line start if de and loose]
+    expected: FAIL
+
+  [3045  HIRAGANA LETTER SMALL U may appear at line start if de and loose]
+    expected: FAIL
+
+  [3047  HIRAGANA LETTER SMALL E may appear at line start if de and loose]
+    expected: FAIL
+
+  [3049  HIRAGANA LETTER SMALL O may appear at line start if de and loose]
+    expected: FAIL
+
+  [3063  HIRAGANA LETTER SMALL TU may appear at line start if de and loose]
+    expected: FAIL
+
+  [3083  HIRAGANA LETTER SMALL YA may appear at line start if de and loose]
+    expected: FAIL
+
+  [3085  HIRAGANA LETTER SMALL YU may appear at line start if de and loose]
+    expected: FAIL
+
+  [3087  HIRAGANA LETTER SMALL YO may appear at line start if de and loose]
+    expected: FAIL
+
+  [308E  HIRAGANA LETTER SMALL WA may appear at line start if de and loose]
+    expected: FAIL
+
+  [3095  HIRAGANA LETTER SMALL KA may appear at line start if de and loose]
+    expected: FAIL
+
+  [3096  HIRAGANA LETTER SMALL KE may appear at line start if de and loose]
+    expected: FAIL
+
+  [30A1  KATAKANA LETTER SMALL A may appear at line start if de and loose]
+    expected: FAIL
+
+  [30A3  KATAKANA LETTER SMALL I may appear at line start if de and loose]
+    expected: FAIL
+
+  [30A5  KATAKANA LETTER SMALL U may appear at line start if de and loose]
+    expected: FAIL
+
+  [30A7  KATAKANA LETTER SMALL E may appear at line start if de and loose]
+    expected: FAIL
+
+  [30A9  KATAKANA LETTER SMALL O may appear at line start if de and loose]
+    expected: FAIL
+
+  [30C3  KATAKANA LETTER SMALL TU may appear at line start if de and loose]
+    expected: FAIL
+
+  [30E3  KATAKANA LETTER SMALL YA may appear at line start if de and loose]
+    expected: FAIL
+
+  [30E5  KATAKANA LETTER SMALL YU may appear at line start if de and loose]
+    expected: FAIL
+
+  [30E7  KATAKANA LETTER SMALL YO may appear at line start if de and loose]
+    expected: FAIL
+
+  [30EE  KATAKANA LETTER SMALL WA may appear at line start if de and loose]
+    expected: FAIL
+
+  [30F5  KATAKANA LETTER SMALL KA may appear at line start if de and loose]
+    expected: FAIL
+
+  [30F6  KATAKANA LETTER SMALL KE may appear at line start if de and loose]
+    expected: FAIL
+
+  [30FC  KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if de and loose]
+    expected: FAIL
+
+  [31F0  KATAKANA LETTER SMALL KU may appear at line start if de and loose]
+    expected: FAIL
+
+  [31F1  KATAKANA LETTER SMALL SI may appear at line start if de and loose]
+    expected: FAIL
+
+  [31F2  KATAKANA LETTER SMALL SU may appear at line start if de and loose]
+    expected: FAIL
+
+  [31F3  KATAKANA LETTER SMALL TO may appear at line start if de and loose]
+    expected: FAIL
+
+  [31F4  KATAKANA LETTER SMALL NU may appear at line start if de and loose]
+    expected: FAIL
+
+  [31F5  KATAKANA LETTER SMALL HA may appear at line start if de and loose]
+    expected: FAIL
+
+  [31F6  KATAKANA LETTER SMALL HI may appear at line start if de and loose]
+    expected: FAIL
+
+  [31F7  KATAKANA LETTER SMALL HU may appear at line start if de and loose]
+    expected: FAIL
+
+  [31F8  KATAKANA LETTER SMALL HE may appear at line start if de and loose]
+    expected: FAIL
+
+  [31F9  KATAKANA LETTER SMALL HO may appear at line start if de and loose]
+    expected: FAIL
+
+  [31FA  KATAKANA LETTER SMALL MU may appear at line start if de and loose]
+    expected: FAIL
+
+  [31FB  KATAKANA LETTER SMALL RA may appear at line start if de and loose]
+    expected: FAIL
+
+  [31FC  KATAKANA LETTER SMALL RI may appear at line start if de and loose]
+    expected: FAIL
+
+  [31FD  KATAKANA LETTER SMALL RU may appear at line start if de and loose]
+    expected: FAIL
+
+  [31FE  KATAKANA LETTER SMALL RE may appear at line start if de and loose]
+    expected: FAIL
+
+  [31FF  KATAKANA LETTER SMALL RO may appear at line start if de and loose]
+    expected: FAIL
+
+  [FF67  HALFWIDTH KATAKANA LETTER SMALL A may appear at line start if de and loose]
+    expected: FAIL
+
+  [FF68  HALFWIDTH KATAKANA LETTER SMALL I may appear at line start if de and loose]
+    expected: FAIL
+
+  [FF69  HALFWIDTH KATAKANA LETTER SMALL U may appear at line start if de and loose]
+    expected: FAIL
+
+  [FF6A  HALFWIDTH KATAKANA LETTER SMALL E may appear at line start if de and loose]
+    expected: FAIL
+
+  [FF6B  HALFWIDTH KATAKANA LETTER SMALL O may appear at line start if de and loose]
+    expected: FAIL
+
+  [FF6C  HALFWIDTH KATAKANA LETTER SMALL YA may appear at line start if de and loose]
+    expected: FAIL
+
+  [FF6D  HALFWIDTH KATAKANA LETTER SMALL YU may appear at line start if de and loose]
+    expected: FAIL
+
+  [FF6E  HALFWIDTH KATAKANA LETTER SMALL YO may appear at line start if de and loose]
+    expected: FAIL
+
+  [FF6F  HALFWIDTH KATAKANA LETTER SMALL TU may appear at line start if de and loose]
+    expected: FAIL
+
+  [FF70  HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if de and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/other-lang/css-text-line-break-de-cj-normal.html.ini b/tests/wpt/meta/css/css-text/i18n/other-lang/css-text-line-break-de-cj-normal.html.ini
new file mode 100644
index 00000000000..d05a1115674
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/other-lang/css-text-line-break-de-cj-normal.html.ini
@@ -0,0 +1,153 @@
+[css-text-line-break-de-cj-normal.html]
+  [3041  HIRAGANA LETTER SMALL A may appear at line start if de and normal]
+    expected: FAIL
+
+  [3043  HIRAGANA LETTER SMALL I may appear at line start if de and normal]
+    expected: FAIL
+
+  [3045  HIRAGANA LETTER SMALL U may appear at line start if de and normal]
+    expected: FAIL
+
+  [3047  HIRAGANA LETTER SMALL E may appear at line start if de and normal]
+    expected: FAIL
+
+  [3049  HIRAGANA LETTER SMALL O may appear at line start if de and normal]
+    expected: FAIL
+
+  [3063  HIRAGANA LETTER SMALL TU may appear at line start if de and normal]
+    expected: FAIL
+
+  [3083  HIRAGANA LETTER SMALL YA may appear at line start if de and normal]
+    expected: FAIL
+
+  [3085  HIRAGANA LETTER SMALL YU may appear at line start if de and normal]
+    expected: FAIL
+
+  [3087  HIRAGANA LETTER SMALL YO may appear at line start if de and normal]
+    expected: FAIL
+
+  [308E  HIRAGANA LETTER SMALL WA may appear at line start if de and normal]
+    expected: FAIL
+
+  [3095  HIRAGANA LETTER SMALL KA may appear at line start if de and normal]
+    expected: FAIL
+
+  [3096  HIRAGANA LETTER SMALL KE may appear at line start if de and normal]
+    expected: FAIL
+
+  [30A1  KATAKANA LETTER SMALL A may appear at line start if de and normal]
+    expected: FAIL
+
+  [30A3  KATAKANA LETTER SMALL I may appear at line start if de and normal]
+    expected: FAIL
+
+  [30A5  KATAKANA LETTER SMALL U may appear at line start if de and normal]
+    expected: FAIL
+
+  [30A7  KATAKANA LETTER SMALL E may appear at line start if de and normal]
+    expected: FAIL
+
+  [30A9  KATAKANA LETTER SMALL O may appear at line start if de and normal]
+    expected: FAIL
+
+  [30C3  KATAKANA LETTER SMALL TU may appear at line start if de and normal]
+    expected: FAIL
+
+  [30E3  KATAKANA LETTER SMALL YA may appear at line start if de and normal]
+    expected: FAIL
+
+  [30E5  KATAKANA LETTER SMALL YU may appear at line start if de and normal]
+    expected: FAIL
+
+  [30E7  KATAKANA LETTER SMALL YO may appear at line start if de and normal]
+    expected: FAIL
+
+  [30EE  KATAKANA LETTER SMALL WA may appear at line start if de and normal]
+    expected: FAIL
+
+  [30F5  KATAKANA LETTER SMALL KA may appear at line start if de and normal]
+    expected: FAIL
+
+  [30F6  KATAKANA LETTER SMALL KE may appear at line start if de and normal]
+    expected: FAIL
+
+  [30FC  KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if de and normal]
+    expected: FAIL
+
+  [31F0  KATAKANA LETTER SMALL KU may appear at line start if de and normal]
+    expected: FAIL
+
+  [31F1  KATAKANA LETTER SMALL SI may appear at line start if de and normal]
+    expected: FAIL
+
+  [31F2  KATAKANA LETTER SMALL SU may appear at line start if de and normal]
+    expected: FAIL
+
+  [31F3  KATAKANA LETTER SMALL TO may appear at line start if de and normal]
+    expected: FAIL
+
+  [31F4  KATAKANA LETTER SMALL NU may appear at line start if de and normal]
+    expected: FAIL
+
+  [31F5  KATAKANA LETTER SMALL HA may appear at line start if de and normal]
+    expected: FAIL
+
+  [31F6  KATAKANA LETTER SMALL HI may appear at line start if de and normal]
+    expected: FAIL
+
+  [31F7  KATAKANA LETTER SMALL HU may appear at line start if de and normal]
+    expected: FAIL
+
+  [31F8  KATAKANA LETTER SMALL HE may appear at line start if de and normal]
+    expected: FAIL
+
+  [31F9  KATAKANA LETTER SMALL HO may appear at line start if de and normal]
+    expected: FAIL
+
+  [31FA  KATAKANA LETTER SMALL MU may appear at line start if de and normal]
+    expected: FAIL
+
+  [31FB  KATAKANA LETTER SMALL RA may appear at line start if de and normal]
+    expected: FAIL
+
+  [31FC  KATAKANA LETTER SMALL RI may appear at line start if de and normal]
+    expected: FAIL
+
+  [31FD  KATAKANA LETTER SMALL RU may appear at line start if de and normal]
+    expected: FAIL
+
+  [31FE  KATAKANA LETTER SMALL RE may appear at line start if de and normal]
+    expected: FAIL
+
+  [31FF  KATAKANA LETTER SMALL RO may appear at line start if de and normal]
+    expected: FAIL
+
+  [FF67  HALFWIDTH KATAKANA LETTER SMALL A may appear at line start if de and normal]
+    expected: FAIL
+
+  [FF68  HALFWIDTH KATAKANA LETTER SMALL I may appear at line start if de and normal]
+    expected: FAIL
+
+  [FF69  HALFWIDTH KATAKANA LETTER SMALL U may appear at line start if de and normal]
+    expected: FAIL
+
+  [FF6A  HALFWIDTH KATAKANA LETTER SMALL E may appear at line start if de and normal]
+    expected: FAIL
+
+  [FF6B  HALFWIDTH KATAKANA LETTER SMALL O may appear at line start if de and normal]
+    expected: FAIL
+
+  [FF6C  HALFWIDTH KATAKANA LETTER SMALL YA may appear at line start if de and normal]
+    expected: FAIL
+
+  [FF6D  HALFWIDTH KATAKANA LETTER SMALL YU may appear at line start if de and normal]
+    expected: FAIL
+
+  [FF6E  HALFWIDTH KATAKANA LETTER SMALL YO may appear at line start if de and normal]
+    expected: FAIL
+
+  [FF6F  HALFWIDTH KATAKANA LETTER SMALL TU may appear at line start if de and normal]
+    expected: FAIL
+
+  [FF70  HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if de and normal]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/other-lang/css-text-line-break-de-in-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/other-lang/css-text-line-break-de-in-loose.html.ini
new file mode 100644
index 00000000000..3eaccad94f6
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/other-lang/css-text-line-break-de-in-loose.html.ini
@@ -0,0 +1,15 @@
+[css-text-line-break-de-in-loose.html]
+  [2024  ONE DOT LEADER may appear at line start if de and loose]
+    expected: FAIL
+
+  [2025  TWO DOT LEADER may appear at line start if de and loose]
+    expected: FAIL
+
+  [2026  HORIZONTAL ELLIPSIS may appear at line start if de and loose]
+    expected: FAIL
+
+  [22EF  MIDLINE HORIZONTAL ELLIPSIS may appear at line start if de and loose]
+    expected: FAIL
+
+  [FE19  PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS may appear at line start if de and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/other-lang/css-text-line-break-de-iteration-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/other-lang/css-text-line-break-de-iteration-loose.html.ini
new file mode 100644
index 00000000000..f8f8c563ad7
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/other-lang/css-text-line-break-de-iteration-loose.html.ini
@@ -0,0 +1,18 @@
+[css-text-line-break-de-iteration-loose.html]
+  [3005  IDEOGRAPHIC ITERATION MARK may appear at line start if de and loose]
+    expected: FAIL
+
+  [303B  VERTICAL IDEOGRAPHIC ITERATION MARK may appear at line start if de and loose]
+    expected: FAIL
+
+  [309D  HIRAGANA ITERATION MARK may appear at line start if de and loose]
+    expected: FAIL
+
+  [309E  HIRAGANA VOICED ITERATION MARK may appear at line start if de and loose]
+    expected: FAIL
+
+  [30FD  KATAKANA ITERATION MARK may appear at line start if de and loose]
+    expected: FAIL
+
+  [30FE  KATAKANA VOICED ITERATION MARK may appear at line start if de and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/unknown-lang/css-text-line-break-cj-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/unknown-lang/css-text-line-break-cj-loose.html.ini
new file mode 100644
index 00000000000..5593b3fc739
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/unknown-lang/css-text-line-break-cj-loose.html.ini
@@ -0,0 +1,153 @@
+[css-text-line-break-cj-loose.html]
+  [3041  HIRAGANA LETTER SMALL A may appear at line start if loose]
+    expected: FAIL
+
+  [3043  HIRAGANA LETTER SMALL I may appear at line start if loose]
+    expected: FAIL
+
+  [3045  HIRAGANA LETTER SMALL U may appear at line start if loose]
+    expected: FAIL
+
+  [3047  HIRAGANA LETTER SMALL E may appear at line start if loose]
+    expected: FAIL
+
+  [3049  HIRAGANA LETTER SMALL O may appear at line start if loose]
+    expected: FAIL
+
+  [3063  HIRAGANA LETTER SMALL TU may appear at line start if loose]
+    expected: FAIL
+
+  [3083  HIRAGANA LETTER SMALL YA may appear at line start if loose]
+    expected: FAIL
+
+  [3085  HIRAGANA LETTER SMALL YU may appear at line start if loose]
+    expected: FAIL
+
+  [3087  HIRAGANA LETTER SMALL YO may appear at line start if loose]
+    expected: FAIL
+
+  [308E  HIRAGANA LETTER SMALL WA may appear at line start if loose]
+    expected: FAIL
+
+  [3095  HIRAGANA LETTER SMALL KA may appear at line start if loose]
+    expected: FAIL
+
+  [3096  HIRAGANA LETTER SMALL KE may appear at line start if loose]
+    expected: FAIL
+
+  [30A1  KATAKANA LETTER SMALL A may appear at line start if loose]
+    expected: FAIL
+
+  [30A3  KATAKANA LETTER SMALL I may appear at line start if loose]
+    expected: FAIL
+
+  [30A5  KATAKANA LETTER SMALL U may appear at line start if loose]
+    expected: FAIL
+
+  [30A7  KATAKANA LETTER SMALL E may appear at line start if loose]
+    expected: FAIL
+
+  [30A9  KATAKANA LETTER SMALL O may appear at line start if loose]
+    expected: FAIL
+
+  [30C3  KATAKANA LETTER SMALL TU may appear at line start if loose]
+    expected: FAIL
+
+  [30E3  KATAKANA LETTER SMALL YA may appear at line start if loose]
+    expected: FAIL
+
+  [30E5  KATAKANA LETTER SMALL YU may appear at line start if loose]
+    expected: FAIL
+
+  [30E7  KATAKANA LETTER SMALL YO may appear at line start if loose]
+    expected: FAIL
+
+  [30EE  KATAKANA LETTER SMALL WA may appear at line start if loose]
+    expected: FAIL
+
+  [30F5  KATAKANA LETTER SMALL KA may appear at line start if loose]
+    expected: FAIL
+
+  [30F6  KATAKANA LETTER SMALL KE may appear at line start if loose]
+    expected: FAIL
+
+  [30FC  KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if loose]
+    expected: FAIL
+
+  [31F0  KATAKANA LETTER SMALL KU may appear at line start if loose]
+    expected: FAIL
+
+  [31F1  KATAKANA LETTER SMALL SI may appear at line start if loose]
+    expected: FAIL
+
+  [31F2  KATAKANA LETTER SMALL SU may appear at line start if loose]
+    expected: FAIL
+
+  [31F3  KATAKANA LETTER SMALL TO may appear at line start if loose]
+    expected: FAIL
+
+  [31F4  KATAKANA LETTER SMALL NU may appear at line start if loose]
+    expected: FAIL
+
+  [31F5  KATAKANA LETTER SMALL HA may appear at line start if loose]
+    expected: FAIL
+
+  [31F6  KATAKANA LETTER SMALL HI may appear at line start if loose]
+    expected: FAIL
+
+  [31F7  KATAKANA LETTER SMALL HU may appear at line start if loose]
+    expected: FAIL
+
+  [31F8  KATAKANA LETTER SMALL HE may appear at line start if loose]
+    expected: FAIL
+
+  [31F9  KATAKANA LETTER SMALL HO may appear at line start if loose]
+    expected: FAIL
+
+  [31FA  KATAKANA LETTER SMALL MU may appear at line start if loose]
+    expected: FAIL
+
+  [31FB  KATAKANA LETTER SMALL RA may appear at line start if loose]
+    expected: FAIL
+
+  [31FC  KATAKANA LETTER SMALL RI may appear at line start if loose]
+    expected: FAIL
+
+  [31FD  KATAKANA LETTER SMALL RU may appear at line start if loose]
+    expected: FAIL
+
+  [31FE  KATAKANA LETTER SMALL RE may appear at line start if loose]
+    expected: FAIL
+
+  [31FF  KATAKANA LETTER SMALL RO may appear at line start if loose]
+    expected: FAIL
+
+  [FF67  HALFWIDTH KATAKANA LETTER SMALL A may appear at line start if loose]
+    expected: FAIL
+
+  [FF68  HALFWIDTH KATAKANA LETTER SMALL I may appear at line start if loose]
+    expected: FAIL
+
+  [FF69  HALFWIDTH KATAKANA LETTER SMALL U may appear at line start if loose]
+    expected: FAIL
+
+  [FF6A  HALFWIDTH KATAKANA LETTER SMALL E may appear at line start if loose]
+    expected: FAIL
+
+  [FF6B  HALFWIDTH KATAKANA LETTER SMALL O may appear at line start if loose]
+    expected: FAIL
+
+  [FF6C  HALFWIDTH KATAKANA LETTER SMALL YA may appear at line start if loose]
+    expected: FAIL
+
+  [FF6D  HALFWIDTH KATAKANA LETTER SMALL YU may appear at line start if loose]
+    expected: FAIL
+
+  [FF6E  HALFWIDTH KATAKANA LETTER SMALL YO may appear at line start if loose]
+    expected: FAIL
+
+  [FF6F  HALFWIDTH KATAKANA LETTER SMALL TU may appear at line start if loose]
+    expected: FAIL
+
+  [FF70  HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/unknown-lang/css-text-line-break-cj-normal.html.ini b/tests/wpt/meta/css/css-text/i18n/unknown-lang/css-text-line-break-cj-normal.html.ini
new file mode 100644
index 00000000000..aaa832f38cc
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/unknown-lang/css-text-line-break-cj-normal.html.ini
@@ -0,0 +1,153 @@
+[css-text-line-break-cj-normal.html]
+  [3041  HIRAGANA LETTER SMALL A may appear at line start if normal]
+    expected: FAIL
+
+  [3043  HIRAGANA LETTER SMALL I may appear at line start if normal]
+    expected: FAIL
+
+  [3045  HIRAGANA LETTER SMALL U may appear at line start if normal]
+    expected: FAIL
+
+  [3047  HIRAGANA LETTER SMALL E may appear at line start if normal]
+    expected: FAIL
+
+  [3049  HIRAGANA LETTER SMALL O may appear at line start if normal]
+    expected: FAIL
+
+  [3063  HIRAGANA LETTER SMALL TU may appear at line start if normal]
+    expected: FAIL
+
+  [3083  HIRAGANA LETTER SMALL YA may appear at line start if normal]
+    expected: FAIL
+
+  [3085  HIRAGANA LETTER SMALL YU may appear at line start if normal]
+    expected: FAIL
+
+  [3087  HIRAGANA LETTER SMALL YO may appear at line start if normal]
+    expected: FAIL
+
+  [308E  HIRAGANA LETTER SMALL WA may appear at line start if normal]
+    expected: FAIL
+
+  [3095  HIRAGANA LETTER SMALL KA may appear at line start if normal]
+    expected: FAIL
+
+  [3096  HIRAGANA LETTER SMALL KE may appear at line start if normal]
+    expected: FAIL
+
+  [30A1  KATAKANA LETTER SMALL A may appear at line start if normal]
+    expected: FAIL
+
+  [30A3  KATAKANA LETTER SMALL I may appear at line start if normal]
+    expected: FAIL
+
+  [30A5  KATAKANA LETTER SMALL U may appear at line start if normal]
+    expected: FAIL
+
+  [30A7  KATAKANA LETTER SMALL E may appear at line start if normal]
+    expected: FAIL
+
+  [30A9  KATAKANA LETTER SMALL O may appear at line start if normal]
+    expected: FAIL
+
+  [30C3  KATAKANA LETTER SMALL TU may appear at line start if normal]
+    expected: FAIL
+
+  [30E3  KATAKANA LETTER SMALL YA may appear at line start if normal]
+    expected: FAIL
+
+  [30E5  KATAKANA LETTER SMALL YU may appear at line start if normal]
+    expected: FAIL
+
+  [30E7  KATAKANA LETTER SMALL YO may appear at line start if normal]
+    expected: FAIL
+
+  [30EE  KATAKANA LETTER SMALL WA may appear at line start if normal]
+    expected: FAIL
+
+  [30F5  KATAKANA LETTER SMALL KA may appear at line start if normal]
+    expected: FAIL
+
+  [30F6  KATAKANA LETTER SMALL KE may appear at line start if normal]
+    expected: FAIL
+
+  [30FC  KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if normal]
+    expected: FAIL
+
+  [31F0  KATAKANA LETTER SMALL KU may appear at line start if normal]
+    expected: FAIL
+
+  [31F1  KATAKANA LETTER SMALL SI may appear at line start if normal]
+    expected: FAIL
+
+  [31F2  KATAKANA LETTER SMALL SU may appear at line start if normal]
+    expected: FAIL
+
+  [31F3  KATAKANA LETTER SMALL TO may appear at line start if normal]
+    expected: FAIL
+
+  [31F4  KATAKANA LETTER SMALL NU may appear at line start if normal]
+    expected: FAIL
+
+  [31F5  KATAKANA LETTER SMALL HA may appear at line start if normal]
+    expected: FAIL
+
+  [31F6  KATAKANA LETTER SMALL HI may appear at line start if normal]
+    expected: FAIL
+
+  [31F7  KATAKANA LETTER SMALL HU may appear at line start if normal]
+    expected: FAIL
+
+  [31F8  KATAKANA LETTER SMALL HE may appear at line start if normal]
+    expected: FAIL
+
+  [31F9  KATAKANA LETTER SMALL HO may appear at line start if normal]
+    expected: FAIL
+
+  [31FA  KATAKANA LETTER SMALL MU may appear at line start if normal]
+    expected: FAIL
+
+  [31FB  KATAKANA LETTER SMALL RA may appear at line start if normal]
+    expected: FAIL
+
+  [31FC  KATAKANA LETTER SMALL RI may appear at line start if normal]
+    expected: FAIL
+
+  [31FD  KATAKANA LETTER SMALL RU may appear at line start if normal]
+    expected: FAIL
+
+  [31FE  KATAKANA LETTER SMALL RE may appear at line start if normal]
+    expected: FAIL
+
+  [31FF  KATAKANA LETTER SMALL RO may appear at line start if normal]
+    expected: FAIL
+
+  [FF67  HALFWIDTH KATAKANA LETTER SMALL A may appear at line start if normal]
+    expected: FAIL
+
+  [FF68  HALFWIDTH KATAKANA LETTER SMALL I may appear at line start if normal]
+    expected: FAIL
+
+  [FF69  HALFWIDTH KATAKANA LETTER SMALL U may appear at line start if normal]
+    expected: FAIL
+
+  [FF6A  HALFWIDTH KATAKANA LETTER SMALL E may appear at line start if normal]
+    expected: FAIL
+
+  [FF6B  HALFWIDTH KATAKANA LETTER SMALL O may appear at line start if normal]
+    expected: FAIL
+
+  [FF6C  HALFWIDTH KATAKANA LETTER SMALL YA may appear at line start if normal]
+    expected: FAIL
+
+  [FF6D  HALFWIDTH KATAKANA LETTER SMALL YU may appear at line start if normal]
+    expected: FAIL
+
+  [FF6E  HALFWIDTH KATAKANA LETTER SMALL YO may appear at line start if normal]
+    expected: FAIL
+
+  [FF6F  HALFWIDTH KATAKANA LETTER SMALL TU may appear at line start if normal]
+    expected: FAIL
+
+  [FF70  HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if normal]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/unknown-lang/css-text-line-break-in-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/unknown-lang/css-text-line-break-in-loose.html.ini
new file mode 100644
index 00000000000..6218479f773
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/unknown-lang/css-text-line-break-in-loose.html.ini
@@ -0,0 +1,15 @@
+[css-text-line-break-in-loose.html]
+  [2024  ONE DOT LEADER may appear at line start if loose]
+    expected: FAIL
+
+  [2025  TWO DOT LEADER may appear at line start if loose]
+    expected: FAIL
+
+  [2026  HORIZONTAL ELLIPSIS may appear at line start if loose]
+    expected: FAIL
+
+  [22EF  MIDLINE HORIZONTAL ELLIPSIS may appear at line start if loose]
+    expected: FAIL
+
+  [FE19  PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS may appear at line start if loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/unknown-lang/css-text-line-break-iteration-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/unknown-lang/css-text-line-break-iteration-loose.html.ini
new file mode 100644
index 00000000000..4a75a572643
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/unknown-lang/css-text-line-break-iteration-loose.html.ini
@@ -0,0 +1,18 @@
+[css-text-line-break-iteration-loose.html]
+  [3005  IDEOGRAPHIC ITERATION MARK may appear at line start if lang unknown and loose]
+    expected: FAIL
+
+  [303B  VERTICAL IDEOGRAPHIC ITERATION MARK may appear at line start if lang unknown and loose]
+    expected: FAIL
+
+  [309D  HIRAGANA ITERATION MARK may appear at line start if lang unknown and loose]
+    expected: FAIL
+
+  [309E  HIRAGANA VOICED ITERATION MARK may appear at line start if lang unknown and loose]
+    expected: FAIL
+
+  [30FD  KATAKANA ITERATION MARK may appear at line start if lang unknown and loose]
+    expected: FAIL
+
+  [30FE  KATAKANA VOICED ITERATION MARK may appear at line start if lang unknown and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-cj-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-cj-loose.html.ini
new file mode 100644
index 00000000000..3d74baf58e6
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-cj-loose.html.ini
@@ -0,0 +1,153 @@
+[css-text-line-break-zh-cj-loose.html]
+  [3041  HIRAGANA LETTER SMALL A may appear at line start if zh and loose]
+    expected: FAIL
+
+  [3043  HIRAGANA LETTER SMALL I may appear at line start if zh and loose]
+    expected: FAIL
+
+  [3045  HIRAGANA LETTER SMALL U may appear at line start if zh and loose]
+    expected: FAIL
+
+  [3047  HIRAGANA LETTER SMALL E may appear at line start if zh and loose]
+    expected: FAIL
+
+  [3049  HIRAGANA LETTER SMALL O may appear at line start if zh and loose]
+    expected: FAIL
+
+  [3063  HIRAGANA LETTER SMALL TU may appear at line start if zh and loose]
+    expected: FAIL
+
+  [3083  HIRAGANA LETTER SMALL YA may appear at line start if zh and loose]
+    expected: FAIL
+
+  [3085  HIRAGANA LETTER SMALL YU may appear at line start if zh and loose]
+    expected: FAIL
+
+  [3087  HIRAGANA LETTER SMALL YO may appear at line start if zh and loose]
+    expected: FAIL
+
+  [308E  HIRAGANA LETTER SMALL WA may appear at line start if zh and loose]
+    expected: FAIL
+
+  [3095  HIRAGANA LETTER SMALL KA may appear at line start if zh and loose]
+    expected: FAIL
+
+  [3096  HIRAGANA LETTER SMALL KE may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30A1  KATAKANA LETTER SMALL A may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30A3  KATAKANA LETTER SMALL I may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30A5  KATAKANA LETTER SMALL U may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30A7  KATAKANA LETTER SMALL E may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30A9  KATAKANA LETTER SMALL O may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30C3  KATAKANA LETTER SMALL TU may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30E3  KATAKANA LETTER SMALL YA may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30E5  KATAKANA LETTER SMALL YU may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30E7  KATAKANA LETTER SMALL YO may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30EE  KATAKANA LETTER SMALL WA may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30F5  KATAKANA LETTER SMALL KA may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30F6  KATAKANA LETTER SMALL KE may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30FC  KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31F0  KATAKANA LETTER SMALL KU may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31F1  KATAKANA LETTER SMALL SI may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31F2  KATAKANA LETTER SMALL SU may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31F3  KATAKANA LETTER SMALL TO may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31F4  KATAKANA LETTER SMALL NU may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31F5  KATAKANA LETTER SMALL HA may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31F6  KATAKANA LETTER SMALL HI may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31F7  KATAKANA LETTER SMALL HU may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31F8  KATAKANA LETTER SMALL HE may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31F9  KATAKANA LETTER SMALL HO may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31FA  KATAKANA LETTER SMALL MU may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31FB  KATAKANA LETTER SMALL RA may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31FC  KATAKANA LETTER SMALL RI may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31FD  KATAKANA LETTER SMALL RU may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31FE  KATAKANA LETTER SMALL RE may appear at line start if zh and loose]
+    expected: FAIL
+
+  [31FF  KATAKANA LETTER SMALL RO may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF67  HALFWIDTH KATAKANA LETTER SMALL A may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF68  HALFWIDTH KATAKANA LETTER SMALL I may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF69  HALFWIDTH KATAKANA LETTER SMALL U may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF6A  HALFWIDTH KATAKANA LETTER SMALL E may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF6B  HALFWIDTH KATAKANA LETTER SMALL O may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF6C  HALFWIDTH KATAKANA LETTER SMALL YA may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF6D  HALFWIDTH KATAKANA LETTER SMALL YU may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF6E  HALFWIDTH KATAKANA LETTER SMALL YO may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF6F  HALFWIDTH KATAKANA LETTER SMALL TU may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF70  HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if zh and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-cj-normal.html.ini b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-cj-normal.html.ini
new file mode 100644
index 00000000000..60253c2a0d4
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-cj-normal.html.ini
@@ -0,0 +1,153 @@
+[css-text-line-break-zh-cj-normal.html]
+  [3041  HIRAGANA LETTER SMALL A may appear at line start if zh and normal]
+    expected: FAIL
+
+  [3043  HIRAGANA LETTER SMALL I may appear at line start if zh and normal]
+    expected: FAIL
+
+  [3045  HIRAGANA LETTER SMALL U may appear at line start if zh and normal]
+    expected: FAIL
+
+  [3047  HIRAGANA LETTER SMALL E may appear at line start if zh and normal]
+    expected: FAIL
+
+  [3049  HIRAGANA LETTER SMALL O may appear at line start if zh and normal]
+    expected: FAIL
+
+  [3063  HIRAGANA LETTER SMALL TU may appear at line start if zh and normal]
+    expected: FAIL
+
+  [3083  HIRAGANA LETTER SMALL YA may appear at line start if zh and normal]
+    expected: FAIL
+
+  [3085  HIRAGANA LETTER SMALL YU may appear at line start if zh and normal]
+    expected: FAIL
+
+  [3087  HIRAGANA LETTER SMALL YO may appear at line start if zh and normal]
+    expected: FAIL
+
+  [308E  HIRAGANA LETTER SMALL WA may appear at line start if zh and normal]
+    expected: FAIL
+
+  [3095  HIRAGANA LETTER SMALL KA may appear at line start if zh and normal]
+    expected: FAIL
+
+  [3096  HIRAGANA LETTER SMALL KE may appear at line start if zh and normal]
+    expected: FAIL
+
+  [30A1  KATAKANA LETTER SMALL A may appear at line start if zh and normal]
+    expected: FAIL
+
+  [30A3  KATAKANA LETTER SMALL I may appear at line start if zh and normal]
+    expected: FAIL
+
+  [30A5  KATAKANA LETTER SMALL U may appear at line start if zh and normal]
+    expected: FAIL
+
+  [30A7  KATAKANA LETTER SMALL E may appear at line start if zh and normal]
+    expected: FAIL
+
+  [30A9  KATAKANA LETTER SMALL O may appear at line start if zh and normal]
+    expected: FAIL
+
+  [30C3  KATAKANA LETTER SMALL TU may appear at line start if zh and normal]
+    expected: FAIL
+
+  [30E3  KATAKANA LETTER SMALL YA may appear at line start if zh and normal]
+    expected: FAIL
+
+  [30E5  KATAKANA LETTER SMALL YU may appear at line start if zh and normal]
+    expected: FAIL
+
+  [30E7  KATAKANA LETTER SMALL YO may appear at line start if zh and normal]
+    expected: FAIL
+
+  [30EE  KATAKANA LETTER SMALL WA may appear at line start if zh and normal]
+    expected: FAIL
+
+  [30F5  KATAKANA LETTER SMALL KA may appear at line start if zh and normal]
+    expected: FAIL
+
+  [30F6  KATAKANA LETTER SMALL KE may appear at line start if zh and normal]
+    expected: FAIL
+
+  [30FC  KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31F0  KATAKANA LETTER SMALL KU may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31F1  KATAKANA LETTER SMALL SI may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31F2  KATAKANA LETTER SMALL SU may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31F3  KATAKANA LETTER SMALL TO may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31F4  KATAKANA LETTER SMALL NU may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31F5  KATAKANA LETTER SMALL HA may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31F6  KATAKANA LETTER SMALL HI may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31F7  KATAKANA LETTER SMALL HU may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31F8  KATAKANA LETTER SMALL HE may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31F9  KATAKANA LETTER SMALL HO may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31FA  KATAKANA LETTER SMALL MU may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31FB  KATAKANA LETTER SMALL RA may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31FC  KATAKANA LETTER SMALL RI may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31FD  KATAKANA LETTER SMALL RU may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31FE  KATAKANA LETTER SMALL RE may appear at line start if zh and normal]
+    expected: FAIL
+
+  [31FF  KATAKANA LETTER SMALL RO may appear at line start if zh and normal]
+    expected: FAIL
+
+  [FF67  HALFWIDTH KATAKANA LETTER SMALL A may appear at line start if zh and normal]
+    expected: FAIL
+
+  [FF68  HALFWIDTH KATAKANA LETTER SMALL I may appear at line start if zh and normal]
+    expected: FAIL
+
+  [FF69  HALFWIDTH KATAKANA LETTER SMALL U may appear at line start if zh and normal]
+    expected: FAIL
+
+  [FF6A  HALFWIDTH KATAKANA LETTER SMALL E may appear at line start if zh and normal]
+    expected: FAIL
+
+  [FF6B  HALFWIDTH KATAKANA LETTER SMALL O may appear at line start if zh and normal]
+    expected: FAIL
+
+  [FF6C  HALFWIDTH KATAKANA LETTER SMALL YA may appear at line start if zh and normal]
+    expected: FAIL
+
+  [FF6D  HALFWIDTH KATAKANA LETTER SMALL YU may appear at line start if zh and normal]
+    expected: FAIL
+
+  [FF6E  HALFWIDTH KATAKANA LETTER SMALL YO may appear at line start if zh and normal]
+    expected: FAIL
+
+  [FF6F  HALFWIDTH KATAKANA LETTER SMALL TU may appear at line start if zh and normal]
+    expected: FAIL
+
+  [FF70  HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if zh and normal]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-cpm-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-cpm-loose.html.ini
new file mode 100644
index 00000000000..bd10e72ae75
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-cpm-loose.html.ini
@@ -0,0 +1,30 @@
+[css-text-line-break-zh-cpm-loose.html]
+  [30FB  KATAKANA MIDDLE DOT may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF1A  FULLWIDTH COLON may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF1B  FULLWIDTH SEMICOLON may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF65  HALFWIDTH KATAKANA MIDDLE DOT may appear at line start if zh and loose]
+    expected: FAIL
+
+  [203C  DOUBLE EXCLAMATION MARK may appear at line start if zh and loose]
+    expected: FAIL
+
+  [2047  DOUBLE QUESTION MARK may appear at line start if zh and loose]
+    expected: FAIL
+
+  [2048  QUESTION EXCLAMATION MARK may appear at line start if zh and loose]
+    expected: FAIL
+
+  [2049  EXCLAMATION QUESTION MARK may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF01  FULLWIDTH EXCLAMATION MARK may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF1F  FULLWIDTH QUESTION MARK may appear at line start if zh and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-loose.html.ini
new file mode 100644
index 00000000000..d33cf4cfe5d
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-loose.html.ini
@@ -0,0 +1,6 @@
+[css-text-line-break-zh-hyphens-loose.html]
+  [301C WAVE DASH may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30A0 KATAKANA-HIRAGANA DOUBLE HYPHEN may appear at line start if zh and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-normal.html.ini b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-normal.html.ini
new file mode 100644
index 00000000000..f9ae2a796d7
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-normal.html.ini
@@ -0,0 +1,6 @@
+[css-text-line-break-zh-hyphens-normal.html]
+  [301C WAVE DASH may appear at line start if zh and normal]
+    expected: FAIL
+
+  [30A0 KATAKANA-HIRAGANA DOUBLE HYPHEN may appear at line start if zh and normal]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-in-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-in-loose.html.ini
new file mode 100644
index 00000000000..4a228cd4d65
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-in-loose.html.ini
@@ -0,0 +1,15 @@
+[css-text-line-break-zh-in-loose.html]
+  [2024  ONE DOT LEADER may appear at line start if zh and loose]
+    expected: FAIL
+
+  [2025  TWO DOT LEADER may appear at line start if zh and loose]
+    expected: FAIL
+
+  [2026  HORIZONTAL ELLIPSIS may appear at line start if zh and loose]
+    expected: FAIL
+
+  [22EF  MIDLINE HORIZONTAL ELLIPSIS may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FE19  PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS may appear at line start if zh and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-iteration-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-iteration-loose.html.ini
new file mode 100644
index 00000000000..3aaa935cebd
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-iteration-loose.html.ini
@@ -0,0 +1,18 @@
+[css-text-line-break-zh-iteration-loose.html]
+  [3005  IDEOGRAPHIC ITERATION MARK may appear at line start if zh and loose]
+    expected: FAIL
+
+  [303B  VERTICAL IDEOGRAPHIC ITERATION MARK may appear at line start if zh and loose]
+    expected: FAIL
+
+  [309D  HIRAGANA ITERATION MARK may appear at line start if zh and loose]
+    expected: FAIL
+
+  [309E  HIRAGANA VOICED ITERATION MARK may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30FD  KATAKANA ITERATION MARK may appear at line start if zh and loose]
+    expected: FAIL
+
+  [30FE  KATAKANA VOICED ITERATION MARK may appear at line start if zh and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-po-loose.html.ini b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-po-loose.html.ini
new file mode 100644
index 00000000000..d8c2a79489b
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-po-loose.html.ini
@@ -0,0 +1,30 @@
+[css-text-line-break-zh-po-loose.html]
+  [00B0  DEGREE SIGN may appear at line start if zh and loose]
+    expected: FAIL
+
+  [2030  PER MILLE SIGN may appear at line start if zh and loose]
+    expected: FAIL
+
+  [2032  PRIME may appear at line start if zh and loose]
+    expected: FAIL
+
+  [2033  DOUBLE PRIME may appear at line start if zh and loose]
+    expected: FAIL
+
+  [2035  REVERSED PRIME may appear at line start if zh and loose]
+    expected: FAIL
+
+  [2103  DEGREE CELSIUS may appear at line start if zh and loose]
+    expected: FAIL
+
+  [2109  DEGREE FAHRENHEIT may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FE6A  SMALL PERCENT SIGN may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FF05  FULLWIDTH PERCENT SIGN may appear at line start if zh and loose]
+    expected: FAIL
+
+  [FFE0  FULLWIDTH CENT SIGN may appear at line start if zh and loose]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-pr-normal.html.ini b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-pr-normal.html.ini
new file mode 100644
index 00000000000..5311fc568a5
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-pr-normal.html.ini
@@ -0,0 +1,24 @@
+[css-text-line-break-zh-pr-normal.html]
+  [00B1  PLUS-MINUS SIGN may NOT appear at line start if zh and normal]
+    expected: FAIL
+
+  [20AC  EURO SIGN may NOT appear at line start if zh and normal]
+    expected: FAIL
+
+  [2116  NUMERO SIGN may NOT appear at line start if zh and normal]
+    expected: FAIL
+
+  [FE69  SMALL DOLLAR SIGN may NOT appear at line start if zh and normal]
+    expected: FAIL
+
+  [FF04  FULLWIDTH DOLLAR SIGN may NOT appear at line start if zh and normal]
+    expected: FAIL
+
+  [FFE1  FULLWIDTH POUND SIGN may NOT appear at line start if zh and normal]
+    expected: FAIL
+
+  [FFE5  FULLWIDTH YEN SIGN may NOT appear at line start if zh and normal]
+    expected: FAIL
+
+  [FFE6  FULLWIDTH WON SIGN may NOT appear at line start if zh and normal]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-pr-strict.html.ini b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-pr-strict.html.ini
new file mode 100644
index 00000000000..287aa0ed2c3
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/i18n/zh/css-text-line-break-zh-pr-strict.html.ini
@@ -0,0 +1,24 @@
+[css-text-line-break-zh-pr-strict.html]
+  [00B1  PLUS-MINUS SIGN may NOT appear at line start if zh and strict]
+    expected: FAIL
+
+  [20AC  EURO SIGN may NOT appear at line start if zh and strict]
+    expected: FAIL
+
+  [2116  NUMERO SIGN may NOT appear at line start if zh and strict]
+    expected: FAIL
+
+  [FE69  SMALL DOLLAR SIGN may NOT appear at line start if zh and strict]
+    expected: FAIL
+
+  [FF04  FULLWIDTH DOLLAR SIGN may NOT appear at line start if zh and strict]
+    expected: FAIL
+
+  [FFE1  FULLWIDTH POUND SIGN may NOT appear at line start if zh and strict]
+    expected: FAIL
+
+  [FFE5  FULLWIDTH YEN SIGN may NOT appear at line start if zh and strict]
+    expected: FAIL
+
+  [FFE6  FULLWIDTH WON SIGN may NOT appear at line start if zh and strict]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-indent/anonymous-grid-item-001.html.ini b/tests/wpt/meta/css/css-text/text-indent/anonymous-grid-item-001.html.ini
deleted file mode 100644
index e3a33ce7895..00000000000
--- a/tests/wpt/meta/css/css-text/text-indent/anonymous-grid-item-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[anonymous-grid-item-001.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-transforms/parsing/transform-valid.html.ini b/tests/wpt/meta/css/css-transforms/parsing/transform-valid.html.ini
new file mode 100644
index 00000000000..b13de1bd254
--- /dev/null
+++ b/tests/wpt/meta/css/css-transforms/parsing/transform-valid.html.ini
@@ -0,0 +1,30 @@
+[transform-valid.html]
+  [e.style['transform'\] = "scaleX(7)" should set the property value]
+    expected: FAIL
+
+  [e.style['transform'\] = "scaleX(720%)" should set the property value]
+    expected: FAIL
+
+  [e.style['transform'\] = "scaleY(-8)" should set the property value]
+    expected: FAIL
+
+  [e.style['transform'\] = "scaleY(-85%)" should set the property value]
+    expected: FAIL
+
+  [e.style['transform'\] = "scaleZ(4)" should set the property value]
+    expected: FAIL
+
+  [e.style['transform'\] = "scaleZ(25%)" should set the property value]
+    expected: FAIL
+
+  [e.style['transform'\] = "skewX(0)" should set the property value]
+    expected: FAIL
+
+  [e.style['transform'\] = "skewX(90deg)" should set the property value]
+    expected: FAIL
+
+  [e.style['transform'\] = "skewY(0)" should set the property value]
+    expected: FAIL
+
+  [e.style['transform'\] = "skewY(-90deg)" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-transforms/transform-box/stroke-box-mutation-001.html.ini b/tests/wpt/meta/css/css-transforms/transform-box/stroke-box-mutation-001.html.ini
deleted file mode 100644
index ba18b73f813..00000000000
--- a/tests/wpt/meta/css/css-transforms/transform-box/stroke-box-mutation-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[stroke-box-mutation-001.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-transforms/transform-box/stroke-box-mutation-003.html.ini b/tests/wpt/meta/css/css-transforms/transform-box/stroke-box-mutation-003.html.ini
deleted file mode 100644
index 5cf203d0133..00000000000
--- a/tests/wpt/meta/css/css-transforms/transform-box/stroke-box-mutation-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[stroke-box-mutation-003.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-transforms/transform-box/value-changed.html.ini b/tests/wpt/meta/css/css-transforms/transform-box/value-changed.html.ini
index 0067c94bc23..40d233772a1 100644
--- a/tests/wpt/meta/css/css-transforms/transform-box/value-changed.html.ini
+++ b/tests/wpt/meta/css/css-transforms/transform-box/value-changed.html.ini
@@ -1,2 +1,2 @@
 [value-changed.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-transforms/transform-translate-background-001.html.ini b/tests/wpt/meta/css/css-transforms/transform-translate-background-001.html.ini
deleted file mode 100644
index abb0cf51515..00000000000
--- a/tests/wpt/meta/css/css-transforms/transform-translate-background-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[transform-translate-background-001.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-transforms/transform-translate-background-002.html.ini b/tests/wpt/meta/css/css-transforms/transform-translate-background-002.html.ini
deleted file mode 100644
index bd8e02d68f5..00000000000
--- a/tests/wpt/meta/css/css-transforms/transform-translate-background-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[transform-translate-background-002.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-transitions/non-rendered-element-004.tentative.html.ini b/tests/wpt/meta/css/css-transitions/non-rendered-element-004.tentative.html.ini
index 4f24c094b1e..490354e16b0 100644
--- a/tests/wpt/meta/css/css-transitions/non-rendered-element-004.tentative.html.ini
+++ b/tests/wpt/meta/css/css-transitions/non-rendered-element-004.tentative.html.ini
@@ -1,4 +1,4 @@
 [non-rendered-element-004.tentative.html]
+  expected: TIMEOUT
   [Transitions on ::marker pseudo-elements are canceled when the parent display type is no longer list-item]
-    expected: FAIL
-
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-transitions/parsing/starting-style-parsing.html.ini b/tests/wpt/meta/css/css-transitions/parsing/starting-style-parsing.html.ini
index bbaf0376001..1b1e0430b62 100644
--- a/tests/wpt/meta/css/css-transitions/parsing/starting-style-parsing.html.ini
+++ b/tests/wpt/meta/css/css-transitions/parsing/starting-style-parsing.html.ini
@@ -1,15 +1,3 @@
 [starting-style-parsing.html]
   [@starting-style is valid]
     expected: FAIL
-
-  [@starting-style div is not valid]
-    expected: FAIL
-
-  [@starting-style () is not valid]
-    expected: FAIL
-
-  [@starting-style ( {} is not valid]
-    expected: FAIL
-
-  [@starting-style } is not valid]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-transitions/parsing/transition-timing-function-computed.html.ini b/tests/wpt/meta/css/css-transitions/parsing/transition-timing-function-computed.html.ini
index bf542ffd182..d86408bb1a1 100644
--- a/tests/wpt/meta/css/css-transitions/parsing/transition-timing-function-computed.html.ini
+++ b/tests/wpt/meta/css/css-transitions/parsing/transition-timing-function-computed.html.ini
@@ -11,3 +11,14 @@
   [Property transition-timing-function value 'steps(2, jump-none)']
     expected: FAIL
 
+  [Property transition-timing-function value 'steps(calc(2 * sibling-index()), jump-none)']
+    expected: FAIL
+
+  [Property transition-timing-function value 'steps(sibling-index(), jump-none)']
+    expected: FAIL
+
+  [Property transition-timing-function value 'steps(calc(2 * sign(1em - 1000px)), jump-none)']
+    expected: FAIL
+
+  [Property transition-timing-function value 'steps(calc(2 * sign(1em - 1000px)), start)']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-transitions/parsing/transition-timing-function-valid.html.ini b/tests/wpt/meta/css/css-transitions/parsing/transition-timing-function-valid.html.ini
index ea8b877a25d..fbbded799a4 100644
--- a/tests/wpt/meta/css/css-transitions/parsing/transition-timing-function-valid.html.ini
+++ b/tests/wpt/meta/css/css-transitions/parsing/transition-timing-function-valid.html.ini
@@ -10,3 +10,6 @@
 
   [e.style['transition-timing-function'\] = "steps(2, jump-start)" should set the property value]
     expected: FAIL
+
+  [e.style['transition-timing-function'\] = "steps(sibling-index(), jump-none)" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-ui/cursor-calc-hotspot.html.ini b/tests/wpt/meta/css/css-ui/cursor-calc-hotspot.html.ini
new file mode 100644
index 00000000000..2c6132a8ab9
--- /dev/null
+++ b/tests/wpt/meta/css/css-ui/cursor-calc-hotspot.html.ini
@@ -0,0 +1,6 @@
+[cursor-calc-hotspot.html]
+  [cursor hotspot with sign() depending on font relative units]
+    expected: FAIL
+
+  [cursor hotspot depending on sibling-index()]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-ui/interactivity-inert-all.tentative.html.ini b/tests/wpt/meta/css/css-ui/interactivity-inert-all.tentative.html.ini
new file mode 100644
index 00000000000..a5eb92d53a8
--- /dev/null
+++ b/tests/wpt/meta/css/css-ui/interactivity-inert-all.tentative.html.ini
@@ -0,0 +1,3 @@
+[interactivity-inert-all.tentative.html]
+  [The 'all' shorthand should not set 'interactivity']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/acos-asin-atan-atan2-computed.html.ini b/tests/wpt/meta/css/css-values/acos-asin-atan-atan2-computed.html.ini
index f62e0c34b6a..e755dd98bcb 100644
--- a/tests/wpt/meta/css/css-values/acos-asin-atan-atan2-computed.html.ini
+++ b/tests/wpt/meta/css/css-values/acos-asin-atan-atan2-computed.html.ini
@@ -10,3 +10,12 @@
 
   [atan2(1vh + 0px, -1vh + 0px) should be used-value-equivalent to 135deg]
     expected: FAIL
+
+  [calc(asin(sin(180deg * sibling-index()))) should be used-value-equivalent to 0deg]
+    expected: FAIL
+
+  [calc(acos(cos(180deg * sibling-index()))) should be used-value-equivalent to 180deg]
+    expected: FAIL
+
+  [calc(atan(tan(180deg * sibling-index()))) should be used-value-equivalent to 0deg]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/calc-complex-unresolved-serialize.html.ini b/tests/wpt/meta/css/css-values/calc-complex-unresolved-serialize.html.ini
new file mode 100644
index 00000000000..519f4a685c9
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/calc-complex-unresolved-serialize.html.ini
@@ -0,0 +1,27 @@
+[calc-complex-unresolved-serialize.html]
+  ['calc(pow(2, sign(1em - 18px)))' as a computed value should serialize as '2'.]
+    expected: FAIL
+
+  ['calc(pow(sign(1em - 18px), 2))' as a computed value should serialize as '1'.]
+    expected: FAIL
+
+  ['calc(pow(sign(1em - 18px), sign(1em - 18px)))' as a computed value should serialize as '1'.]
+    expected: FAIL
+
+  ['calc(pow(2, sibling-index())' as a specified value should serialize as 'calc(pow(2, sibling-index()))'.]
+    expected: FAIL
+
+  ['calc(pow(2, sibling-index())' as a computed value should serialize as '2'.]
+    expected: FAIL
+
+  ['calc(pow(sibling-index(), 2)' as a specified value should serialize as 'calc(pow(sibling-index(), 2))'.]
+    expected: FAIL
+
+  ['calc(pow(sibling-index(), 2)' as a computed value should serialize as '1'.]
+    expected: FAIL
+
+  ['calc(pow(sibling-index(), sibling-index())' as a specified value should serialize as 'calc(pow(sibling-index(), sibling-index()))'.]
+    expected: FAIL
+
+  ['calc(pow(sibling-index(), sibling-index())' as a computed value should serialize as '1'.]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/calc-size/animation/calc-size-interpolation-expansion.html.ini b/tests/wpt/meta/css/css-values/calc-size/animation/calc-size-interpolation-expansion.html.ini
index c948860b7a6..a74533ee690 100644
--- a/tests/wpt/meta/css/css-values/calc-size/animation/calc-size-interpolation-expansion.html.ini
+++ b/tests/wpt/meta/css/css-values/calc-size/animation/calc-size-interpolation-expansion.html.ini
@@ -34,3 +34,24 @@
 
   [value at progress 0.75 in animation of "width" from "calc-size(80px, size)" to "calc-size(calc-size(any, 20px), size + 20px)"]
     expected: FAIL
+
+  [value at progress 0.75 in animation of "height" from "0px" to "calc-size(calc-size(min-content, size + 20px), 2 * size)"]
+    expected: FAIL
+
+  [value at progress 0.75 in animation of "height" from "calc-size(min-content, size * 4)" to "calc-size(calc-size(min-content, size + 20px), 2 * size)"]
+    expected: FAIL
+
+  [value at progress 0.75 in animation of "width" from "calc-size(fit-content, 20px)" to "calc-size(calc-size(fit-content, 3 * size + 10px), min(size + 20px, 2 * size - 30px) + 2 * size + 80px)"]
+    expected: FAIL
+
+  [value at progress 0.75 in animation of "width" from "calc-size(50%, size)" to "calc-size(calc-size(45%, (2 * size)), size + 20px)"]
+    expected: FAIL
+
+  [value at progress 0.75 in animation of "width" from "calc-size(40%, size)" to "calc-size(calc-size(10px, (2 * size)), size + 20px)"]
+    expected: FAIL
+
+  [value at progress 0.75 in animation of "width" from "calc-size(80px, size)" to "calc-size(calc-size(10px, (2 * size)), size + 20px)"]
+    expected: FAIL
+
+  [value at progress 0.75 in animation of "width" from "calc-size(fit-content, 20px)" to "calc-size(calc-size(fit-content, 3 * size + 10px), min(size + 20px, 2 * size - 30px) + ((2 * size) + 80px))"]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/calc-size/calc-size-grid-repeat.html.ini b/tests/wpt/meta/css/css-values/calc-size/calc-size-grid-repeat.html.ini
deleted file mode 100644
index 9c81daf1767..00000000000
--- a/tests/wpt/meta/css/css-values/calc-size/calc-size-grid-repeat.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[calc-size-grid-repeat.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/ch-pseudo-recalc-on-font-load.html.ini b/tests/wpt/meta/css/css-values/ch-pseudo-recalc-on-font-load.html.ini
index 53b82763175..167325f552a 100644
--- a/tests/wpt/meta/css/css-values/ch-pseudo-recalc-on-font-load.html.ini
+++ b/tests/wpt/meta/css/css-values/ch-pseudo-recalc-on-font-load.html.ini
@@ -10,6 +10,3 @@
 
   [ch in pseudo-element ::first-line should be recalculated after loading a web font]
     expected: FAIL
-
-  [ch in pseudo-element ::marker should be recalculated after loading a web font]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/exp-log-compute.html.ini b/tests/wpt/meta/css/css-values/exp-log-compute.html.ini
index 6e8f24dad15..edaecc48548 100644
--- a/tests/wpt/meta/css/css-values/exp-log-compute.html.ini
+++ b/tests/wpt/meta/css/css-values/exp-log-compute.html.ini
@@ -1,3 +1,9 @@
 [exp-log-compute.html]
   [calc(log(1) + exp(0)) should be used-value-equivalent to 2]
     expected: FAIL
+
+  [calc(e - exp(sibling-index())) should be used-value-equivalent to 0]
+    expected: FAIL
+
+  [calc(log(exp(2 * sibling-index()))) should be used-value-equivalent to 2]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/hypot-pow-sqrt-computed.html.ini b/tests/wpt/meta/css/css-values/hypot-pow-sqrt-computed.html.ini
index 28233a80012..fcb8199c11d 100644
--- a/tests/wpt/meta/css/css-values/hypot-pow-sqrt-computed.html.ini
+++ b/tests/wpt/meta/css/css-values/hypot-pow-sqrt-computed.html.ini
@@ -1,3 +1,12 @@
 [hypot-pow-sqrt-computed.html]
   [calc(3px * pow(200, 4)) should be used-value-equivalent to 33554428px]
     expected: FAIL
+
+  [sqrt(sibling-index()) should be used-value-equivalent to 2]
+    expected: FAIL
+
+  [calc(1px * sqrt(sibling-index())) should be used-value-equivalent to 2px]
+    expected: FAIL
+
+  [sqrt(pow(sibling-index(), 2)) should be used-value-equivalent to 4]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/if-cycle.html.ini b/tests/wpt/meta/css/css-values/if-cycle.html.ini
new file mode 100644
index 00000000000..174666bb97c
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/if-cycle.html.ini
@@ -0,0 +1,117 @@
+[if-cycle.html]
+  [CSS Values and Units Test: CSS if() function cycles 2]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 3]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 6]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 7]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 8]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 10]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 11]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 14]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 15]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 16]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 17]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 18]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 19]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 20]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 21]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 22]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 23]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 24]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 25]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 26]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 27]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 28]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 29]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 30]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 31]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 32]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 33]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 34]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 35]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 36]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 37]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 38]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 39]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 40]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 41]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 42]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 43]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 44]
+    expected: FAIL
+
+  [CSS Values and Units Test: CSS if() function cycles 45]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/if-cycle.tentative.html.ini b/tests/wpt/meta/css/css-values/if-cycle.tentative.html.ini
deleted file mode 100644
index d466b92f414..00000000000
--- a/tests/wpt/meta/css/css-values/if-cycle.tentative.html.ini
+++ /dev/null
@@ -1,117 +0,0 @@
-[if-cycle.tentative.html]
-  [CSS Values and Units Test: CSS if() function cycles 2]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 3]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 6]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 7]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 8]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 10]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 11]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 14]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 15]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 16]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 17]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 18]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 19]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 20]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 21]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 22]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 23]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 24]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 25]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 26]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 27]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 28]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 29]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 30]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 31]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 32]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 33]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 34]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 35]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 36]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 37]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 38]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 39]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 40]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 41]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 42]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 43]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 44]
-    expected: FAIL
-
-  [CSS Values and Units Test: CSS if() function cycles 45]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/progress-computed.html.ini b/tests/wpt/meta/css/css-values/progress-computed.html.ini
new file mode 100644
index 00000000000..02ddc38e82a
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/progress-computed.html.ini
@@ -0,0 +1,60 @@
+[progress-computed.html]
+  [progress(1, 0, 1) should be used-value-equivalent to 1]
+    expected: FAIL
+
+  [progress(progress(1, 0, 1), progress(0px, 0px, 1px), progress(1deg, 0deg, 1deg)) should be used-value-equivalent to 1]
+    expected: FAIL
+
+  [progress(sign(-10px) * 10px, (10px - 10px), 10px * progress(1deg, 0deg, 1deg)) should be used-value-equivalent to -1]
+    expected: FAIL
+
+  [calc(progress(100px, 0px, 50px) * 10px + 100px) should be used-value-equivalent to 120px]
+    expected: FAIL
+
+  [calc(progress(100, 0, sign(50px))) should be used-value-equivalent to 100]
+    expected: FAIL
+
+  [calc(progress(abs(5%), hypot(3%, 4%), 10%)) should be used-value-equivalent to 0]
+    expected: FAIL
+
+  [progress(1000em, 10em, 110em) should be used-value-equivalent to 9.9]
+    expected: FAIL
+
+  [scale(progress(1000em, 10rem, 110em)) should be used-value-equivalent to scale(9.9)]
+    expected: FAIL
+
+  [scale(progress(0em, 0rem, 0em)) should be used-value-equivalent to scale(0)]
+    expected: FAIL
+
+  [scale(progress(sign(1em - 1rem) * 1ex, 0rem, 0em)) should be used-value-equivalent to scale(0)]
+    expected: FAIL
+
+  [calc(progress(1, 0, 1) * 10px) should be used-value-equivalent to 10px]
+    expected: FAIL
+
+  [calc(progress(1, 0, 1) * 1s) should be used-value-equivalent to 1s]
+    expected: FAIL
+
+  [calc(progress(1, 0, 1) * 1deg) should be used-value-equivalent to 1deg]
+    expected: FAIL
+
+  [calc(progress(sign(1001em - 10lh * progress(100px, 2rex, 10ex)) * 10em, 2rem, 12em) / 2) should be used-value-equivalent to 0.4]
+    expected: FAIL
+
+  [calc(progress(sign(1001em - 10lh * progress(100px, 2rex, 10ex)) * 20em, 2rem, 12em) * 10) should be used-value-equivalent to 18]
+    expected: FAIL
+
+  [calc(progress(sign(1001em - 10lh * progress(100px, 2rex, 10ex)) * 20em, 2rem, 12em) * 30) should be used-value-equivalent to 54]
+    expected: FAIL
+
+  [calc(progress(sign(1001em - 10lh * progress(100px, 2rex, 10ex)) * 20em, 2rem, 12em) / 4) should be used-value-equivalent to 0.45]
+    expected: FAIL
+
+  [calc(progress(sign(1001em - 10lh * progress(100px, 2rex, 10ex)) * 20em, 2rem, 12em) * 4) should be used-value-equivalent to 7]
+    expected: FAIL
+
+  [calc(progress(sign(1001em - 10lh * progress(100px, 2rex, 10ex)) * 20em, 2rem, 12em) * 2) should be used-value-equivalent to 3.6]
+    expected: FAIL
+
+  [rotate3d(progress(21em, 1rem, 11em), progress(21em, 1rem, 11em), progress(21em, 1rem, 11em), calc(progress(11em, 1rem, 11em) * 2deg)) should be used-value-equivalent to rotate3d(2, 2, 2, 2deg)]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/progress-computed.tentative.html.ini b/tests/wpt/meta/css/css-values/progress-computed.tentative.html.ini
deleted file mode 100644
index 1c42528bac9..00000000000
--- a/tests/wpt/meta/css/css-values/progress-computed.tentative.html.ini
+++ /dev/null
@@ -1,147 +0,0 @@
-[progress-computed.tentative.html]
-  [progress(1 from 0 to 1) should be used-value-equivalent to 1]
-    expected: FAIL
-
-  [progress(progress(1 from 0 to 1) from progress(0px from 0px to 1px) to progress(1deg from 0deg to 1deg)) should be used-value-equivalent to 1]
-    expected: FAIL
-
-  [progress(sign(-10px) * 10px from (10px - 10px) to 10px * progress(1deg from 0deg to 1deg)) should be used-value-equivalent to -1]
-    expected: FAIL
-
-  [calc(progress(100px from 0px to 50px) * 10px + 100px) should be used-value-equivalent to 120px]
-    expected: FAIL
-
-  [calc(progress(100 from 0 to sign(50px))) should be used-value-equivalent to 100]
-    expected: FAIL
-
-  [calc(progress(abs(5%) from hypot(3%, 4%) to 10%)) should be used-value-equivalent to 1]
-    expected: FAIL
-
-  [calc(progress(1 from 0 to 1) * 10px) should be used-value-equivalent to 10px]
-    expected: FAIL
-
-  [calc(progress(1 from 0 to 1) * 1s) should be used-value-equivalent to 1s]
-    expected: FAIL
-
-  [calc(progress(1 from 0 to 1) * 1deg) should be used-value-equivalent to 1deg]
-    expected: FAIL
-
-  [progress(1000em from 10em to 110em) should be used-value-equivalent to 10]
-    expected: FAIL
-
-  [scale(progress(1000em from 10rem to 110em)) should be used-value-equivalent to scale(10)]
-    expected: FAIL
-
-  [scale(progress(0em from 0rem to 0em)) should be used-value-equivalent to scale(0)]
-    expected: FAIL
-
-  [scale(progress(sign(1em - 1rem) * 1ex from 0rem to 0em)) should be used-value-equivalent to scale(0)]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px from 2rex to 10ex)) * 10em from 2rem to 12em) / 2) should be used-value-equivalent to 0.5]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px from 2rex to 10ex)) * 20em from 2rem to 12em) * 10) should be used-value-equivalent to 20]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px from 2rex to 10ex)) * 20em from 2rem to 12em) * 30) should be used-value-equivalent to 60]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px from 2rex to 10ex)) * 20em from 2rem to 12em) / 4) should be used-value-equivalent to 0.5]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px from 2rex to 10ex)) * 20em from 2rem to 12em) * 4) should be used-value-equivalent to 8]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px from 2rex to 10ex)) * 20em from 2rem to 12em) * 2) should be used-value-equivalent to 4]
-    expected: FAIL
-
-  [calc(progress(abs(5%) from hypot(3%, 4%) to 10%)) should be used-value-equivalent to 0]
-    expected: FAIL
-
-  [progress(1000em from 10em to 110em) should be used-value-equivalent to 9.9]
-    expected: FAIL
-
-  [scale(progress(1000em from 10rem to 110em)) should be used-value-equivalent to scale(9.9)]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px from 2rex to 10ex)) * 10em from 2rem to 12em) / 2) should be used-value-equivalent to 0.4]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px from 2rex to 10ex)) * 20em from 2rem to 12em) * 10) should be used-value-equivalent to 18]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px from 2rex to 10ex)) * 20em from 2rem to 12em) * 30) should be used-value-equivalent to 54]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px from 2rex to 10ex)) * 20em from 2rem to 12em) / 4) should be used-value-equivalent to 0.45]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px from 2rex to 10ex)) * 20em from 2rem to 12em) * 4) should be used-value-equivalent to 7]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px from 2rex to 10ex)) * 20em from 2rem to 12em) * 2) should be used-value-equivalent to 3.6]
-    expected: FAIL
-
-  [rotate3d(progress(21em from 1rem to 11em), progress(21em from 1rem to 11em), progress(21em from 1rem to 11em), calc(progress(11em from 1rem to 11em) * 2deg)) should be used-value-equivalent to rotate3d(2, 2, 2, 2deg)]
-    expected: FAIL
-
-  [progress(1, 0, 1) should be used-value-equivalent to 1]
-    expected: FAIL
-
-  [progress(progress(1, 0, 1), progress(0px, 0px, 1px), progress(1deg, 0deg, 1deg)) should be used-value-equivalent to 1]
-    expected: FAIL
-
-  [progress(sign(-10px) * 10px, (10px - 10px), 10px * progress(1deg, 0deg, 1deg)) should be used-value-equivalent to -1]
-    expected: FAIL
-
-  [calc(progress(100px, 0px, 50px) * 10px + 100px) should be used-value-equivalent to 120px]
-    expected: FAIL
-
-  [calc(progress(100, 0, sign(50px))) should be used-value-equivalent to 100]
-    expected: FAIL
-
-  [calc(progress(abs(5%), hypot(3%, 4%), 10%)) should be used-value-equivalent to 0]
-    expected: FAIL
-
-  [progress(1000em, 10em, 110em) should be used-value-equivalent to 9.9]
-    expected: FAIL
-
-  [scale(progress(1000em, 10rem, 110em)) should be used-value-equivalent to scale(9.9)]
-    expected: FAIL
-
-  [scale(progress(0em, 0rem, 0em)) should be used-value-equivalent to scale(0)]
-    expected: FAIL
-
-  [scale(progress(sign(1em - 1rem) * 1ex, 0rem, 0em)) should be used-value-equivalent to scale(0)]
-    expected: FAIL
-
-  [calc(progress(1, 0, 1) * 10px) should be used-value-equivalent to 10px]
-    expected: FAIL
-
-  [calc(progress(1, 0, 1) * 1s) should be used-value-equivalent to 1s]
-    expected: FAIL
-
-  [calc(progress(1, 0, 1) * 1deg) should be used-value-equivalent to 1deg]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px, 2rex, 10ex)) * 10em, 2rem, 12em) / 2) should be used-value-equivalent to 0.4]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px, 2rex, 10ex)) * 20em, 2rem, 12em) * 10) should be used-value-equivalent to 18]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px, 2rex, 10ex)) * 20em, 2rem, 12em) * 30) should be used-value-equivalent to 54]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px, 2rex, 10ex)) * 20em, 2rem, 12em) / 4) should be used-value-equivalent to 0.45]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px, 2rex, 10ex)) * 20em, 2rem, 12em) * 4) should be used-value-equivalent to 7]
-    expected: FAIL
-
-  [calc(progress(sign(1001em - 10lh * progress(100px, 2rex, 10ex)) * 20em, 2rem, 12em) * 2) should be used-value-equivalent to 3.6]
-    expected: FAIL
-
-  [rotate3d(progress(21em, 1rem, 11em), progress(21em, 1rem, 11em), progress(21em, 1rem, 11em), calc(progress(11em, 1rem, 11em) * 2deg)) should be used-value-equivalent to rotate3d(2, 2, 2, 2deg)]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/progress-serialize.html.ini b/tests/wpt/meta/css/css-values/progress-serialize.html.ini
new file mode 100644
index 00000000000..d94efb7fb44
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/progress-serialize.html.ini
@@ -0,0 +1,66 @@
+[progress-serialize.html]
+  ['progress(100px, 0px, 100px)' as a specified value should serialize as 'calc(1)'.]
+    expected: FAIL
+
+  ['scale(progress(100px, 0px, 100px))' as a specified value should serialize as 'scale(calc(1))'.]
+    expected: FAIL
+
+  ['scale(progress(100px, 0px, 100px))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.]
+    expected: FAIL
+
+  ['progress(10em, 0px, 10em)' as a specified value should serialize as 'progress(10em, 0px, 10em)'.]
+    expected: FAIL
+
+  ['scale(progress(10em, 0px, 10em))' as a specified value should serialize as 'scale(progress(10em, 0px, 10em))'.]
+    expected: FAIL
+
+  ['scale(progress(10em, 0px, 10em))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.]
+    expected: FAIL
+
+  ['progress(10em, 0px, 10rem)' as a specified value should serialize as 'progress(10em, 0px, 10rem)'.]
+    expected: FAIL
+
+  ['scale(progress(10em, 0px, 10rem))' as a specified value should serialize as 'scale(progress(10em, 0px, 10rem))'.]
+    expected: FAIL
+
+  ['scale(progress(10em, 0px, 10rem))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.]
+    expected: FAIL
+
+  ['progress(100px, (10px - 10px), 100px)' as a specified value should serialize as 'calc(1)'.]
+    expected: FAIL
+
+  ['scale(progress(100px, (10px - 10px), 100px))' as a specified value should serialize as 'scale(calc(1))'.]
+    expected: FAIL
+
+  ['scale(progress(100px, (10px - 10px), 100px))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.]
+    expected: FAIL
+
+  ['progress(1%, (10% - 10%), 100%)' as a specified value should serialize as 'calc(0.01)'.]
+    expected: FAIL
+
+  ['scale(progress(1%, (10% - 10%), 100%))' as a specified value should serialize as 'scale(calc(0.01))'.]
+    expected: FAIL
+
+  ['progress(1%, (10% - 10%), 100%)' as a computed value should serialize as '0.01'.]
+    expected: FAIL
+
+  ['scale(progress(1%, (10% - 10%), 100%))' as a computed value should serialize as 'matrix(0.01, 0, 0, 0.01, 0, 0)'.]
+    expected: FAIL
+
+  ['calc(0.5 * progress(100px, 0px, 100px))' as a specified value should serialize as 'calc(0.5)'.]
+    expected: FAIL
+
+  ['scale(calc(0.5 * progress(100px, 0px, 100px)))' as a specified value should serialize as 'scale(calc(0.5))'.]
+    expected: FAIL
+
+  ['calc(0.5 * progress(100px, 0px, 100px))' as a computed value should serialize as '0.5'.]
+    expected: FAIL
+
+  ['scale(calc(0.5 * progress(100px, 0px, 100px)))' as a computed value should serialize as 'matrix(0.5, 0, 0, 0.5, 0, 0)'.]
+    expected: FAIL
+
+  ['calc(50px * progress(100px, 0px, 100px))' as a specified value should serialize as 'calc(50px)'.]
+    expected: FAIL
+
+  ['calc(1px * progress(abs(10%), (10% - 10%), 100% / 10))' as a computed value should serialize as '1px'.]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/progress-serialize.tentative.html.ini b/tests/wpt/meta/css/css-values/progress-serialize.tentative.html.ini
deleted file mode 100644
index 0adfe56c5b8..00000000000
--- a/tests/wpt/meta/css/css-values/progress-serialize.tentative.html.ini
+++ /dev/null
@@ -1,144 +0,0 @@
-[progress-serialize.tentative.html]
-  ['progress(100px from 0px to 100px)' as a specified value should serialize as 'calc(1)'.]
-    expected: FAIL
-
-  ['scale(progress(100px from 0px to 100px))' as a specified value should serialize as 'scale(calc(1))'.]
-    expected: FAIL
-
-  ['scale(progress(100px from 0px to 100px))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.]
-    expected: FAIL
-
-  ['progress(10em from 0px to 10em)' as a specified value should serialize as 'calc(progress(10em from 0px to 10em))'.]
-    expected: FAIL
-
-  ['scale(progress(10em from 0px to 10em))' as a specified value should serialize as 'scale(calc(progress(10em from 0px to 10em)))'.]
-    expected: FAIL
-
-  ['scale(progress(10em from 0px to 10em))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.]
-    expected: FAIL
-
-  ['progress(10em from 0px to 10rem)' as a specified value should serialize as 'calc(progress(10em from 0px to 10rem))'.]
-    expected: FAIL
-
-  ['scale(progress(10em from 0px to 10rem))' as a specified value should serialize as 'scale(calc(progress(10em from 0px to 10rem)))'.]
-    expected: FAIL
-
-  ['scale(progress(10em from 0px to 10rem))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.]
-    expected: FAIL
-
-  ['progress(100px from (10px - 10px) to 100px)' as a specified value should serialize as 'calc(1)'.]
-    expected: FAIL
-
-  ['scale(progress(100px from (10px - 10px) to 100px))' as a specified value should serialize as 'scale(calc(1))'.]
-    expected: FAIL
-
-  ['scale(progress(100px from (10px - 10px) to 100px))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.]
-    expected: FAIL
-
-  ['progress(1% from (10% - 10%) to 100%)' as a specified value should serialize as 'calc(0.01)'.]
-    expected: FAIL
-
-  ['scale(progress(1% from (10% - 10%) to 100%))' as a specified value should serialize as 'scale(calc(0.01))'.]
-    expected: FAIL
-
-  ['progress(1% from (10% - 10%) to 100%)' as a computed value should serialize as '0.01'.]
-    expected: FAIL
-
-  ['scale(progress(1% from (10% - 10%) to 100%))' as a computed value should serialize as 'matrix(0.01, 0, 0, 0.01, 0, 0)'.]
-    expected: FAIL
-
-  ['calc(0.5 * progress(100px from 0px to 100px))' as a specified value should serialize as 'calc(0.5)'.]
-    expected: FAIL
-
-  ['scale(calc(0.5 * progress(100px from 0px to 100px)))' as a specified value should serialize as 'scale(calc(0.5))'.]
-    expected: FAIL
-
-  ['calc(0.5 * progress(100px from 0px to 100px))' as a computed value should serialize as '0.5'.]
-    expected: FAIL
-
-  ['scale(calc(0.5 * progress(100px from 0px to 100px)))' as a computed value should serialize as 'matrix(0.5, 0, 0, 0.5, 0, 0)'.]
-    expected: FAIL
-
-  ['calc(50px * progress(100px from 0px to 100px))' as a specified value should serialize as 'calc(50px)'.]
-    expected: FAIL
-
-  ['calc(1px * progress(abs(10%) from (10% - 10%) to 100% / 10))' as a computed value should serialize as '1px'.]
-    expected: FAIL
-
-  ['progress(10em from 0px to 10em)' as a specified value should serialize as 'progress(10em from 0px to 10em)'.]
-    expected: FAIL
-
-  ['scale(progress(10em from 0px to 10em))' as a specified value should serialize as 'scale(progress(10em from 0px to 10em))'.]
-    expected: FAIL
-
-  ['progress(10em from 0px to 10rem)' as a specified value should serialize as 'progress(10em from 0px to 10rem)'.]
-    expected: FAIL
-
-  ['scale(progress(10em from 0px to 10rem))' as a specified value should serialize as 'scale(progress(10em from 0px to 10rem))'.]
-    expected: FAIL
-
-  ['progress(100px, 0px, 100px)' as a specified value should serialize as 'calc(1)'.]
-    expected: FAIL
-
-  ['scale(progress(100px, 0px, 100px))' as a specified value should serialize as 'scale(calc(1))'.]
-    expected: FAIL
-
-  ['scale(progress(100px, 0px, 100px))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.]
-    expected: FAIL
-
-  ['progress(10em, 0px, 10em)' as a specified value should serialize as 'progress(10em, 0px, 10em)'.]
-    expected: FAIL
-
-  ['scale(progress(10em, 0px, 10em))' as a specified value should serialize as 'scale(progress(10em, 0px, 10em))'.]
-    expected: FAIL
-
-  ['scale(progress(10em, 0px, 10em))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.]
-    expected: FAIL
-
-  ['progress(10em, 0px, 10rem)' as a specified value should serialize as 'progress(10em, 0px, 10rem)'.]
-    expected: FAIL
-
-  ['scale(progress(10em, 0px, 10rem))' as a specified value should serialize as 'scale(progress(10em, 0px, 10rem))'.]
-    expected: FAIL
-
-  ['scale(progress(10em, 0px, 10rem))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.]
-    expected: FAIL
-
-  ['progress(100px, (10px - 10px), 100px)' as a specified value should serialize as 'calc(1)'.]
-    expected: FAIL
-
-  ['scale(progress(100px, (10px - 10px), 100px))' as a specified value should serialize as 'scale(calc(1))'.]
-    expected: FAIL
-
-  ['scale(progress(100px, (10px - 10px), 100px))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.]
-    expected: FAIL
-
-  ['progress(1%, (10% - 10%), 100%)' as a specified value should serialize as 'calc(0.01)'.]
-    expected: FAIL
-
-  ['scale(progress(1%, (10% - 10%), 100%))' as a specified value should serialize as 'scale(calc(0.01))'.]
-    expected: FAIL
-
-  ['progress(1%, (10% - 10%), 100%)' as a computed value should serialize as '0.01'.]
-    expected: FAIL
-
-  ['scale(progress(1%, (10% - 10%), 100%))' as a computed value should serialize as 'matrix(0.01, 0, 0, 0.01, 0, 0)'.]
-    expected: FAIL
-
-  ['calc(0.5 * progress(100px, 0px, 100px))' as a specified value should serialize as 'calc(0.5)'.]
-    expected: FAIL
-
-  ['scale(calc(0.5 * progress(100px, 0px, 100px)))' as a specified value should serialize as 'scale(calc(0.5))'.]
-    expected: FAIL
-
-  ['calc(0.5 * progress(100px, 0px, 100px))' as a computed value should serialize as '0.5'.]
-    expected: FAIL
-
-  ['scale(calc(0.5 * progress(100px, 0px, 100px)))' as a computed value should serialize as 'matrix(0.5, 0, 0, 0.5, 0, 0)'.]
-    expected: FAIL
-
-  ['calc(50px * progress(100px, 0px, 100px))' as a specified value should serialize as 'calc(50px)'.]
-    expected: FAIL
-
-  ['calc(1px * progress(abs(10%), (10% - 10%), 100% / 10))' as a computed value should serialize as '1px'.]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/random-computed.tentative.html.ini b/tests/wpt/meta/css/css-values/random-computed.tentative.html.ini
index 1735b61c1c3..010c9699754 100644
--- a/tests/wpt/meta/css/css-values/random-computed.tentative.html.ini
+++ b/tests/wpt/meta/css/css-values/random-computed.tentative.html.ini
@@ -193,3 +193,138 @@
 
   [Uses of a style rule on multiple elements with 'random(per-element, ...)']
     expected: FAIL
+
+  [Property scale value 'random(--foo element-shared, 3, 13)']
+    expected: FAIL
+
+  [Property scale value 'random(element-shared --foo, 4, 14)']
+    expected: FAIL
+
+  [Property scale value 'random(0, 10, 5)']
+    expected: FAIL
+
+  [Property scale value 'random(--foo, 10, 20, 5)']
+    expected: FAIL
+
+  [Property scale value 'random(--foo element-shared, 20, 30, 5)']
+    expected: FAIL
+
+  [Property scale value 'random(element-shared --foo, 30, 40, 5)']
+    expected: FAIL
+
+  [Property scale value 'random(40, 50, -5)']
+    expected: FAIL
+
+  [Property scale value 'random(NaN, 100, 10)']
+    expected: FAIL
+
+  [Property scale value 'random(10, NaN, 10)']
+    expected: FAIL
+
+  [Property scale value 'random(NaN, NaN, 10)']
+    expected: FAIL
+
+  [Property scale value 'random(NaN, 100, NaN)']
+    expected: FAIL
+
+  [Property scale value 'random(10, NaN, NaN)']
+    expected: FAIL
+
+  [Property scale value 'random(NaN, NaN, NaN)']
+    expected: FAIL
+
+  [Property scale value 'random(10, 100, NaN)']
+    expected: FAIL
+
+  [Property scale value 'calc(10 + random(NaN, 100, 10))']
+    expected: FAIL
+
+  [Property scale value 'calc(10 + random(10, NaN, 10))']
+    expected: FAIL
+
+  [Property scale value 'calc(10 + random(NaN, NaN, 10))']
+    expected: FAIL
+
+  [Property scale value 'calc(10 + random(NaN, 100, NaN))']
+    expected: FAIL
+
+  [Property scale value 'calc(10 + random(10, NaN, NaN))']
+    expected: FAIL
+
+  [Property scale value 'calc(10 + random(NaN, NaN, NaN))']
+    expected: FAIL
+
+  [Property scale value 'calc(10 + random(10, 100, NaN))']
+    expected: FAIL
+
+  [Property scale value 'random(infinity, 100, 10)']
+    expected: FAIL
+
+  [Property scale value 'random(infinity, infinity, 10)']
+    expected: FAIL
+
+  [Property scale value 'random(infinity, 100, infinity)']
+    expected: FAIL
+
+  [Property scale value 'random(infinity, infinity, infinity)']
+    expected: FAIL
+
+  [Property scale value 'calc(10 + random(infinity, infinity, 10))']
+    expected: FAIL
+
+  [Property scale value 'calc(10 + random(infinity, 100, infinity))']
+    expected: FAIL
+
+  [Property scale value 'calc(10 + random(infinity, infinity, infinity))']
+    expected: FAIL
+
+  [Property scale value 'calc(10 + random(infinity, 100, 10))']
+    expected: FAIL
+
+  [Property scale value 'random(10, infinity, 10)']
+    expected: FAIL
+
+  [Property scale value 'random(10, infinity, infinity)']
+    expected: FAIL
+
+  [Property scale value 'calc(10 + random(10, infinity, 10))']
+    expected: FAIL
+
+  [Property scale value 'calc(10 + random(10, infinity, infinity))']
+    expected: FAIL
+
+  [Property scale value 'random(10, 100, infinity)']
+    expected: FAIL
+
+  [Property scale value 'calc(10 + random(10, 100, infinity))']
+    expected: FAIL
+
+  [Property scale value 'random(10, 100, -infinity)']
+    expected: FAIL
+
+  [Property scale value 'calc(10 + random(10, 100, -infinity))']
+    expected: FAIL
+
+  [Property scale value on pseudo element '::before' 'random(element-shared, 9, 19)']
+    expected: FAIL
+
+  [Property scale value on pseudo element '::before' 'random(element-shared --foo, 10, 20)']
+    expected: FAIL
+
+  [Property translate value 'random(10%, 100%)']
+    expected: FAIL
+
+  [Maximum random: 'random(a, b)']
+    expected: FAIL
+
+  [Maximum random - shorthand: random(a, b))]
+    expected: FAIL
+
+  [Shared by name within an element: 'random(--identifier, a, b)']
+    expected: FAIL
+
+  [Shared globally: random(--identifier element-shared, a, b)]
+    expected: FAIL
+
+  [Fixed: random(fixed <number>, a, b)]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/random-serialize.tentative.html.ini b/tests/wpt/meta/css/css-values/random-serialize.tentative.html.ini
index fd37a632766..69cd25283c3 100644
--- a/tests/wpt/meta/css/css-values/random-serialize.tentative.html.ini
+++ b/tests/wpt/meta/css/css-values/random-serialize.tentative.html.ini
@@ -61,3 +61,63 @@
 
   [e.style['transition-delay'\] = "random(25ms, 50s, by 5s)" should set the property value]
     expected: FAIL
+
+  [e.style['width'\] = "random(0px, 100px, 50px)" should set the property value]
+    expected: FAIL
+
+  [e.style['width'\] = "random(auto, 0px, 100px)" should set the property value]
+    expected: FAIL
+
+  [e.style['width'\] = "random(--foo element-shared, 0px, 100px)" should set the property value]
+    expected: FAIL
+
+  [e.style['width'\] = "random(auto element-shared, 0px, 100px)" should set the property value]
+    expected: FAIL
+
+  [e.style['width'\] = "random(element-shared --foo, 0px, 100px)" should set the property value]
+    expected: FAIL
+
+  [e.style['width'\] = "random(element-shared auto, 0px, 100px)" should set the property value]
+    expected: FAIL
+
+  [e.style['width'\] = "random(fixed 0.5, 0px, 100px)" should set the property value]
+    expected: FAIL
+
+  [e.style['width'\] = "random(--foo, 0px, 100px, 50px)" should set the property value]
+    expected: FAIL
+
+  [e.style['width'\] = "random(auto, 0px, 100px, 50px)" should set the property value]
+    expected: FAIL
+
+  [e.style['width'\] = "random(--foo element-shared, 0px, 100px, 50px)" should set the property value]
+    expected: FAIL
+
+  [e.style['width'\] = "random(auto element-shared, 0px, 100px, 50px)" should set the property value]
+    expected: FAIL
+
+  [e.style['width'\] = "random(element-shared --foo, 0px, 100px, 50px)" should set the property value]
+    expected: FAIL
+
+  [e.style['width'\] = "random(element-shared auto, 0px, 100px, 50px)" should set the property value]
+    expected: FAIL
+
+  [e.style['width'\] = "random(fixed 0.5, 0px, 100px, 50px)" should set the property value]
+    expected: FAIL
+
+  [e.style['width'\] = "random(-100px, -10px, -5px)" should set the property value]
+    expected: FAIL
+
+  [e.style['width'\] = "random(fixed calc(2 / 4), 0px, 100px)" should set the property value]
+    expected: FAIL
+
+  [e.style['max-lines'\] = "random(25, 50, 5)" should set the property value]
+    expected: FAIL
+
+  [e.style['scale'\] = "random(0.5, 2.5, 0.1)" should set the property value]
+    expected: FAIL
+
+  [e.style['rotate'\] = "random(25deg, 1turn, 5deg)" should set the property value]
+    expected: FAIL
+
+  [e.style['transition-delay'\] = "random(25ms, 50s, 5s)" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/sin-cos-tan-computed.html.ini b/tests/wpt/meta/css/css-values/sin-cos-tan-computed.html.ini
new file mode 100644
index 00000000000..1b9a2e265db
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/sin-cos-tan-computed.html.ini
@@ -0,0 +1,18 @@
+[sin-cos-tan-computed.html]
+  [calc(sin(pi * sibling-index()) should be used-value-equivalent to 0]
+    expected: FAIL
+
+  [calc(cos(pi * sibling-index()) should be used-value-equivalent to -1]
+    expected: FAIL
+
+  [calc(tan(pi * sibling-index()) should be used-value-equivalent to 0]
+    expected: FAIL
+
+  [calc(sin(180deg * sibling-index()) should be used-value-equivalent to 0]
+    expected: FAIL
+
+  [calc(cos(180deg * sibling-index()) should be used-value-equivalent to -1]
+    expected: FAIL
+
+  [calc(tan(180deg * sibling-index()) should be used-value-equivalent to 0]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/tree-counting/calc-sibling-function-in-shadow-dom.html.ini b/tests/wpt/meta/css/css-values/tree-counting/calc-sibling-function-in-shadow-dom.html.ini
index 078fc209a02..4616880e9d8 100644
--- a/tests/wpt/meta/css/css-values/tree-counting/calc-sibling-function-in-shadow-dom.html.ini
+++ b/tests/wpt/meta/css/css-values/tree-counting/calc-sibling-function-in-shadow-dom.html.ini
@@ -1,3 +1,6 @@
 [calc-sibling-function-in-shadow-dom.html]
   [Host children have sibling-index() and sibling-count() based on assignedNodes order]
     expected: FAIL
+
+  [Host children have sibling-index() and sibling-count() based on the DOM tree order]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/tree-counting/sibling-function-descriptors.tentative.html.ini b/tests/wpt/meta/css/css-values/tree-counting/sibling-function-descriptors.tentative.html.ini
index 287f1c19314..3c65d9bcf19 100644
--- a/tests/wpt/meta/css/css-values/tree-counting/sibling-function-descriptors.tentative.html.ini
+++ b/tests/wpt/meta/css/css-values/tree-counting/sibling-function-descriptors.tentative.html.ini
@@ -10,3 +10,15 @@
 
   [sibling-count() should not be allowed in @font-face descriptors]
     expected: FAIL
+
+  [sibling-index() should not be allowed in @font-palette-values descriptors]
+    expected: FAIL
+
+  [sibling-count() should not be allowed in @font-palette-values descriptors]
+    expected: FAIL
+
+  [sibling-index() should not be allowed in @counter-style descriptors]
+    expected: FAIL
+
+  [sibling-count() should not be allowed in @counter-style descriptors]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/tree-counting/sibling-index-keyframe-length-value-dynamic.html.ini b/tests/wpt/meta/css/css-values/tree-counting/sibling-index-keyframe-length-value-dynamic.html.ini
new file mode 100644
index 00000000000..f61a6205280
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/tree-counting/sibling-index-keyframe-length-value-dynamic.html.ini
@@ -0,0 +1,6 @@
+[sibling-index-keyframe-length-value-dynamic.html]
+  [Initially, the sibling-index() is 2 for #target]
+    expected: FAIL
+
+  [Removing a preceding sibling of #target reduces the sibling-index()]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/tree-counting/sibling-index-keyframe-value-dynamic.html.ini b/tests/wpt/meta/css/css-values/tree-counting/sibling-index-keyframe-value-dynamic.html.ini
new file mode 100644
index 00000000000..df16c83f839
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/tree-counting/sibling-index-keyframe-value-dynamic.html.ini
@@ -0,0 +1,6 @@
+[sibling-index-keyframe-value-dynamic.html]
+  [Initially, the sibling-index() is 3 for #target]
+    expected: FAIL
+
+  [Removing a preceding sibling of #target reduces the sibling-index()]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/cross-origin/url-image-crossorigin-anonymous.sub.html.ini b/tests/wpt/meta/css/css-values/urls/cross-origin/url-image-crossorigin-anonymous.sub.html.ini
new file mode 100644
index 00000000000..b61e7e43793
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/cross-origin/url-image-crossorigin-anonymous.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-crossorigin-anonymous.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/cross-origin/url-image-crossorigin-use-credentials.sub.html.ini b/tests/wpt/meta/css/css-values/urls/cross-origin/url-image-crossorigin-use-credentials.sub.html.ini
new file mode 100644
index 00000000000..0da9d8aefde
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/cross-origin/url-image-crossorigin-use-credentials.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-crossorigin-use-credentials.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/no-referrer-when-downgrade/url-image-referrerpolicy-cross-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/no-referrer-when-downgrade/url-image-referrerpolicy-cross-origin.sub.html.ini
new file mode 100644
index 00000000000..3b9d69761e7
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/no-referrer-when-downgrade/url-image-referrerpolicy-cross-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-cross-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/no-referrer-when-downgrade/url-image-referrerpolicy-same-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/no-referrer-when-downgrade/url-image-referrerpolicy-same-origin.sub.html.ini
new file mode 100644
index 00000000000..26917cf20d2
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/no-referrer-when-downgrade/url-image-referrerpolicy-same-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-same-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/no-referrer/url-image-referrerpolicy-cross-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/no-referrer/url-image-referrerpolicy-cross-origin.sub.html.ini
new file mode 100644
index 00000000000..3b9d69761e7
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/no-referrer/url-image-referrerpolicy-cross-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-cross-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/no-referrer/url-image-referrerpolicy-same-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/no-referrer/url-image-referrerpolicy-same-origin.sub.html.ini
new file mode 100644
index 00000000000..26917cf20d2
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/no-referrer/url-image-referrerpolicy-same-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-same-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/origin-when-cross-origin/url-image-referrerpolicy-cross-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/origin-when-cross-origin/url-image-referrerpolicy-cross-origin.sub.html.ini
new file mode 100644
index 00000000000..3b9d69761e7
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/origin-when-cross-origin/url-image-referrerpolicy-cross-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-cross-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/origin-when-cross-origin/url-image-referrerpolicy-same-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/origin-when-cross-origin/url-image-referrerpolicy-same-origin.sub.html.ini
new file mode 100644
index 00000000000..26917cf20d2
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/origin-when-cross-origin/url-image-referrerpolicy-same-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-same-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/origin/url-image-referrerpolicy-cross-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/origin/url-image-referrerpolicy-cross-origin.sub.html.ini
new file mode 100644
index 00000000000..3b9d69761e7
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/origin/url-image-referrerpolicy-cross-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-cross-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/origin/url-image-referrerpolicy-same-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/origin/url-image-referrerpolicy-same-origin.sub.html.ini
new file mode 100644
index 00000000000..26917cf20d2
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/origin/url-image-referrerpolicy-same-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-same-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/same-origin/url-image-referrerpolicy-cross-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/same-origin/url-image-referrerpolicy-cross-origin.sub.html.ini
new file mode 100644
index 00000000000..3b9d69761e7
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/same-origin/url-image-referrerpolicy-cross-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-cross-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/same-origin/url-image-referrerpolicy-same-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/same-origin/url-image-referrerpolicy-same-origin.sub.html.ini
new file mode 100644
index 00000000000..26917cf20d2
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/same-origin/url-image-referrerpolicy-same-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-same-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/strict-origin-when-cross-origin/url-image-referrerpolicy-cross-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/strict-origin-when-cross-origin/url-image-referrerpolicy-cross-origin.sub.html.ini
new file mode 100644
index 00000000000..3b9d69761e7
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/strict-origin-when-cross-origin/url-image-referrerpolicy-cross-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-cross-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/strict-origin-when-cross-origin/url-image-referrerpolicy-same-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/strict-origin-when-cross-origin/url-image-referrerpolicy-same-origin.sub.html.ini
new file mode 100644
index 00000000000..26917cf20d2
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/strict-origin-when-cross-origin/url-image-referrerpolicy-same-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-same-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/strict-origin/url-image-referrerpolicy-cross-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/strict-origin/url-image-referrerpolicy-cross-origin.sub.html.ini
new file mode 100644
index 00000000000..3b9d69761e7
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/strict-origin/url-image-referrerpolicy-cross-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-cross-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/strict-origin/url-image-referrerpolicy-same-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/strict-origin/url-image-referrerpolicy-same-origin.sub.html.ini
new file mode 100644
index 00000000000..26917cf20d2
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/strict-origin/url-image-referrerpolicy-same-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-same-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/unsafe-url/url-image-referrerpolicy-cross-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/unsafe-url/url-image-referrerpolicy-cross-origin.sub.html.ini
new file mode 100644
index 00000000000..3b9d69761e7
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/unsafe-url/url-image-referrerpolicy-cross-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-cross-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/referrer-policy/unsafe-url/url-image-referrerpolicy-same-origin.sub.html.ini b/tests/wpt/meta/css/css-values/urls/referrer-policy/unsafe-url/url-image-referrerpolicy-same-origin.sub.html.ini
new file mode 100644
index 00000000000..26917cf20d2
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/referrer-policy/unsafe-url/url-image-referrerpolicy-same-origin.sub.html.ini
@@ -0,0 +1,2 @@
+[url-image-referrerpolicy-same-origin.sub.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/url-request-modifiers-computed.sub.html.ini b/tests/wpt/meta/css/css-values/urls/url-request-modifiers-computed.sub.html.ini
new file mode 100644
index 00000000000..74e74468e0d
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/url-request-modifiers-computed.sub.html.ini
@@ -0,0 +1,66 @@
+[url-request-modifiers-computed.sub.html]
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" crossorigin(anonymous))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" crossorigin(use-credentials))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" integrity("sha384-foobar"))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" integrity(""))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" referrerpolicy(no-referrer))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" referrerpolicy(no-referrer-when-downgrade))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" referrerpolicy(same-origin))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" referrerpolicy(origin))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" referrerpolicy(strict-origin))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" referrerpolicy(origin-when-cross-origin))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" referrerpolicy(strict-origin-when-cross-origin))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" referrerpolicy(unsafe-url))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" crossorigin(anonymous) integrity("sha384-foobar"))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" integrity("sha384-foobar") crossorigin(anonymous))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" integrity("sha384-foobar") referrerpolicy(no-referrer))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" referrerpolicy(no-referrer) integrity("sha384-foobar"))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" crossorigin(anonymous) referrerpolicy(no-referrer))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" referrerpolicy(no-referrer) crossorigin(anonymous))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" crossorigin(anonymous) integrity("sha384-foobar") referrerpolicy(no-referrer))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" integrity("sha384-foobar") referrerpolicy(no-referrer) crossorigin(anonymous))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" referrerpolicy(no-referrer) crossorigin(anonymous) integrity("sha384-foobar"))']
+    expected: FAIL
+
+  [Property background-image value 'url("http://web-platform.test:8000/css/support/1x1-green.png" referrerpolicy(no-referrer) integrity("sha384-foobar") crossorigin(anonymous))']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/urls/url-request-modifiers-serialize.sub.html.ini b/tests/wpt/meta/css/css-values/urls/url-request-modifiers-serialize.sub.html.ini
new file mode 100644
index 00000000000..836bcf624e6
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/urls/url-request-modifiers-serialize.sub.html.ini
@@ -0,0 +1,66 @@
+[url-request-modifiers-serialize.sub.html]
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" crossorigin(anonymous))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" crossorigin(use-credentials))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" integrity(\\"sha384-foobar\\"))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" integrity(\\"\\"))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" referrerpolicy(no-referrer))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" referrerpolicy(no-referrer-when-downgrade))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" referrerpolicy(same-origin))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" referrerpolicy(origin))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" referrerpolicy(strict-origin))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" referrerpolicy(origin-when-cross-origin))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" referrerpolicy(strict-origin-when-cross-origin))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" referrerpolicy(unsafe-url))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" crossorigin(anonymous) integrity(\\"sha384-foobar\\"))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" integrity(\\"sha384-foobar\\") crossorigin(anonymous))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" integrity(\\"sha384-foobar\\") referrerpolicy(no-referrer))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" referrerpolicy(no-referrer) integrity(\\"sha384-foobar\\"))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" crossorigin(anonymous) referrerpolicy(no-referrer))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" referrerpolicy(no-referrer) crossorigin(anonymous))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" crossorigin(anonymous) integrity(\\"sha384-foobar\\") referrerpolicy(no-referrer))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" integrity(\\"sha384-foobar\\") referrerpolicy(no-referrer) crossorigin(anonymous))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" referrerpolicy(no-referrer) crossorigin(anonymous) integrity(\\"sha384-foobar\\"))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "url(\\"http://web-platform.test:8000/css/support/1x1-green.png\\" referrerpolicy(no-referrer) integrity(\\"sha384-foobar\\") crossorigin(anonymous))" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-variables/variable-first-letter.html.ini b/tests/wpt/meta/css/css-variables/variable-first-letter.html.ini
index a058a34b9b4..014c8007894 100644
--- a/tests/wpt/meta/css/css-variables/variable-first-letter.html.ini
+++ b/tests/wpt/meta/css/css-variables/variable-first-letter.html.ini
@@ -11,3 +11,8 @@
   [nested color]
     expected: FAIL
 
+  [position]
+    expected: FAIL
+
+  [abspos]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-variables/variable-first-line.html.ini b/tests/wpt/meta/css/css-variables/variable-first-line.html.ini
index 50a8fa83a5d..0c0ddbca478 100644
--- a/tests/wpt/meta/css/css-variables/variable-first-line.html.ini
+++ b/tests/wpt/meta/css/css-variables/variable-first-line.html.ini
@@ -11,3 +11,8 @@
   [nested color]
     expected: FAIL
 
+  [position]
+    expected: FAIL
+
+  [abspos]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-will-change/will-change-fixedpos-cb-003.html.ini b/tests/wpt/meta/css/css-will-change/will-change-fixedpos-cb-003.html.ini
deleted file mode 100644
index 77a5d26e728..00000000000
--- a/tests/wpt/meta/css/css-will-change/will-change-fixedpos-cb-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[will-change-fixedpos-cb-003.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-will-change/will-change-stacking-context-z-index-3.html.ini b/tests/wpt/meta/css/css-will-change/will-change-stacking-context-z-index-3.html.ini
deleted file mode 100644
index d0c021b9dd0..00000000000
--- a/tests/wpt/meta/css/css-will-change/will-change-stacking-context-z-index-3.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[will-change-stacking-context-z-index-3.html]
-  prefs: ["layout_grid_enabled:true"]
diff --git a/tests/wpt/meta/css/cssom-view/HTMLBody-ScrollArea_quirksmode.html.ini b/tests/wpt/meta/css/cssom-view/HTMLBody-ScrollArea_quirksmode.html.ini
index 4a680249460..0706a804437 100644
--- a/tests/wpt/meta/css/cssom-view/HTMLBody-ScrollArea_quirksmode.html.ini
+++ b/tests/wpt/meta/css/cssom-view/HTMLBody-ScrollArea_quirksmode.html.ini
@@ -1,13 +1,4 @@
 [HTMLBody-ScrollArea_quirksmode.html]
-  [document.scrollingElement should be body element in quirks.]
-    expected: FAIL
-
-  [scrollingElement in quirks should be null when body is potentially scrollable.]
-    expected: FAIL
-
-  [scrollingElement in quirks should be body if any of document and body has a visible overflow.]
-    expected: FAIL
-
   [When body potentially scrollable, document.body.scrollHeight changes when changing the height of the body content in quirks.]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/cssom-view/elementFromPoint-list-001.html.ini b/tests/wpt/meta/css/cssom-view/elementFromPoint-list-001.html.ini
deleted file mode 100644
index 1f892861935..00000000000
--- a/tests/wpt/meta/css/cssom-view/elementFromPoint-list-001.html.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[elementFromPoint-list-001.html]
-  [<li>Image Outside 2</li>]
-    expected: FAIL
-
-  [<li>Outside 2</li>]
-    expected: FAIL
-
-  [<li>Image Outside 1</li>]
-    expected: FAIL
-
-  [<li>Outside 3</li>]
-    expected: FAIL
-
-  [<li>Outside 1</li>]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/getBoundingClientRect-newline.html.ini b/tests/wpt/meta/css/cssom-view/getBoundingClientRect-newline.html.ini
new file mode 100644
index 00000000000..ffbf9b249a0
--- /dev/null
+++ b/tests/wpt/meta/css/cssom-view/getBoundingClientRect-newline.html.ini
@@ -0,0 +1,3 @@
+[getBoundingClientRect-newline.html]
+  [Range.getBoundingClientRect() should return the first position of the next line when the collapsed range is a newline character]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/getBoundingClientRect-shy.html.ini b/tests/wpt/meta/css/cssom-view/getBoundingClientRect-shy.html.ini
index 536f7aaacff..b8b7564f112 100644
--- a/tests/wpt/meta/css/cssom-view/getBoundingClientRect-shy.html.ini
+++ b/tests/wpt/meta/css/cssom-view/getBoundingClientRect-shy.html.ini
@@ -29,8 +29,5 @@
   [Rendered soft-hyphen should have a width.]
     expected: FAIL
 
-  [Collapsed soft-hyphen in a span should be 0 width.]
-    expected: FAIL
-
   [Rendered soft-hyphen in a span should have a width.]
     expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/idlharness.html.ini b/tests/wpt/meta/css/cssom-view/idlharness.html.ini
index 24583c6b095..497db91deed 100644
--- a/tests/wpt/meta/css/cssom-view/idlharness.html.ini
+++ b/tests/wpt/meta/css/cssom-view/idlharness.html.ini
@@ -38,9 +38,6 @@
   [Window interface: window must inherit property "screenTop" with the proper type]
     expected: FAIL
 
-  [Document interface: attribute scrollingElement]
-    expected: FAIL
-
   [CSSPseudoElement interface: operation convertRectFromNode(DOMRectReadOnly, GeometryNode, ConvertCoordinateOptions)]
     expected: FAIL
 
@@ -107,9 +104,6 @@
   [Document interface: document must inherit property "convertRectFromNode(DOMRectReadOnly, GeometryNode, ConvertCoordinateOptions)" with the proper type]
     expected: FAIL
 
-  [Document interface: document must inherit property "scrollingElement" with the proper type]
-    expected: FAIL
-
   [CaretPosition interface object name]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/cssom-view/offsetParent-block-in-inline.html.ini b/tests/wpt/meta/css/cssom-view/offsetParent-block-in-inline.html.ini
deleted file mode 100644
index aa1109f1600..00000000000
--- a/tests/wpt/meta/css/cssom-view/offsetParent-block-in-inline.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[offsetParent-block-in-inline.html]
-  [offsetParent-block-in-inline]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/scroll-behavior-main-frame-root.html.ini b/tests/wpt/meta/css/cssom-view/scroll-behavior-main-frame-root.html.ini
index cee83d041ad..c1f7e177f65 100644
--- a/tests/wpt/meta/css/cssom-view/scroll-behavior-main-frame-root.html.ini
+++ b/tests/wpt/meta/css/cssom-view/scroll-behavior-main-frame-root.html.ini
@@ -1,13 +1,4 @@
 [scroll-behavior-main-frame-root.html]
-  [Main frame with auto scroll-behavior ; scroll() with default behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scroll() with auto behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scroll() with instant behavior]
-    expected: FAIL
-
   [Main frame with auto scroll-behavior ; scroll() with smooth behavior]
     expected: FAIL
 
@@ -17,21 +8,9 @@
   [Main frame with smooth scroll-behavior ; scroll() with auto behavior]
     expected: FAIL
 
-  [Main frame with smooth scroll-behavior ; scroll() with instant behavior]
-    expected: FAIL
-
   [Main frame with smooth scroll-behavior ; scroll() with smooth behavior]
     expected: FAIL
 
-  [Main frame with auto scroll-behavior ; scrollTo() with default behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scrollTo() with auto behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scrollTo() with instant behavior]
-    expected: FAIL
-
   [Main frame with auto scroll-behavior ; scrollTo() with smooth behavior]
     expected: FAIL
 
@@ -41,21 +20,9 @@
   [Main frame with smooth scroll-behavior ; scrollTo() with auto behavior]
     expected: FAIL
 
-  [Main frame with smooth scroll-behavior ; scrollTo() with instant behavior]
-    expected: FAIL
-
   [Main frame with smooth scroll-behavior ; scrollTo() with smooth behavior]
     expected: FAIL
 
-  [Main frame with auto scroll-behavior ; scrollBy() with default behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scrollBy() with auto behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scrollBy() with instant behavior]
-    expected: FAIL
-
   [Main frame with auto scroll-behavior ; scrollBy() with smooth behavior]
     expected: FAIL
 
@@ -65,9 +32,6 @@
   [Main frame with smooth scroll-behavior ; scrollBy() with auto behavior]
     expected: FAIL
 
-  [Main frame with smooth scroll-behavior ; scrollBy() with instant behavior]
-    expected: FAIL
-
   [Main frame with smooth scroll-behavior ; scrollBy() with smooth behavior]
     expected: FAIL
 
@@ -95,23 +59,11 @@
   [Main frame with smooth scroll-behavior ; scrollIntoView() with smooth behavior]
     expected: FAIL
 
-  [Set scrollLeft to frame with auto scroll-behavior]
-    expected: FAIL
-
   [Set scrollLeft to frame with smooth scroll-behavior]
     expected: FAIL
 
-  [Set scrollTop to frame with auto scroll-behavior]
-    expected: FAIL
-
   [Set scrollTop to frame with smooth scroll-behavior]
     expected: FAIL
 
-  [Aborting an ongoing smooth scrolling on the main frame with another smooth scrolling]
-    expected: FAIL
-
-  [Aborting an ongoing smooth scrolling on the main frame with an instant scrolling]
-    expected: FAIL
-
   [Make sure the page is ready for animation.]
     expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/scroll-behavior-main-frame-window.html.ini b/tests/wpt/meta/css/cssom-view/scroll-behavior-main-frame-window.html.ini
index 3a6f134e005..9924a3618c7 100644
--- a/tests/wpt/meta/css/cssom-view/scroll-behavior-main-frame-window.html.ini
+++ b/tests/wpt/meta/css/cssom-view/scroll-behavior-main-frame-window.html.ini
@@ -1,13 +1,4 @@
 [scroll-behavior-main-frame-window.html]
-  [Main frame with auto scroll-behavior ; scroll() with default behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scroll() with auto behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scroll() with instant behavior]
-    expected: FAIL
-
   [Main frame with auto scroll-behavior ; scroll() with smooth behavior]
     expected: FAIL
 
@@ -17,21 +8,9 @@
   [Main frame with smooth scroll-behavior ; scroll() with auto behavior]
     expected: FAIL
 
-  [Main frame with smooth scroll-behavior ; scroll() with instant behavior]
-    expected: FAIL
-
   [Main frame with smooth scroll-behavior ; scroll() with smooth behavior]
     expected: FAIL
 
-  [Main frame with auto scroll-behavior ; scrollTo() with default behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scrollTo() with auto behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scrollTo() with instant behavior]
-    expected: FAIL
-
   [Main frame with auto scroll-behavior ; scrollTo() with smooth behavior]
     expected: FAIL
 
@@ -41,21 +20,9 @@
   [Main frame with smooth scroll-behavior ; scrollTo() with auto behavior]
     expected: FAIL
 
-  [Main frame with smooth scroll-behavior ; scrollTo() with instant behavior]
-    expected: FAIL
-
   [Main frame with smooth scroll-behavior ; scrollTo() with smooth behavior]
     expected: FAIL
 
-  [Main frame with auto scroll-behavior ; scrollBy() with default behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scrollBy() with auto behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scrollBy() with instant behavior]
-    expected: FAIL
-
   [Main frame with auto scroll-behavior ; scrollBy() with smooth behavior]
     expected: FAIL
 
@@ -65,17 +32,8 @@
   [Main frame with smooth scroll-behavior ; scrollBy() with auto behavior]
     expected: FAIL
 
-  [Main frame with smooth scroll-behavior ; scrollBy() with instant behavior]
-    expected: FAIL
-
   [Main frame with smooth scroll-behavior ; scrollBy() with smooth behavior]
     expected: FAIL
 
-  [Aborting an ongoing smooth scrolling on the main frame with another smooth scrolling]
-    expected: FAIL
-
-  [Aborting an ongoing smooth scrolling on the main frame with an instant scrolling]
-    expected: FAIL
-
   [Make sure the page is ready for animation.]
     expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/scroll-behavior-subframe-root.html.ini b/tests/wpt/meta/css/cssom-view/scroll-behavior-subframe-root.html.ini
index 16fec73ff53..5e78bd369ba 100644
--- a/tests/wpt/meta/css/cssom-view/scroll-behavior-subframe-root.html.ini
+++ b/tests/wpt/meta/css/cssom-view/scroll-behavior-subframe-root.html.ini
@@ -1,13 +1,4 @@
 [scroll-behavior-subframe-root.html]
-  [Subframe with auto scroll-behavior ; scroll() with default behavior]
-    expected: FAIL
-
-  [Subframe with auto scroll-behavior ; scroll() with auto behavior]
-    expected: FAIL
-
-  [Subframe with auto scroll-behavior ; scroll() with instant behavior]
-    expected: FAIL
-
   [Subframe with auto scroll-behavior ; scroll() with smooth behavior]
     expected: FAIL
 
@@ -17,21 +8,9 @@
   [Subframe with smooth scroll-behavior ; scroll() with auto behavior]
     expected: FAIL
 
-  [Subframe with smooth scroll-behavior ; scroll() with instant behavior]
-    expected: FAIL
-
   [Subframe with smooth scroll-behavior ; scroll() with smooth behavior]
     expected: FAIL
 
-  [Subframe with auto scroll-behavior ; scrollTo() with default behavior]
-    expected: FAIL
-
-  [Subframe with auto scroll-behavior ; scrollTo() with auto behavior]
-    expected: FAIL
-
-  [Subframe with auto scroll-behavior ; scrollTo() with instant behavior]
-    expected: FAIL
-
   [Subframe with auto scroll-behavior ; scrollTo() with smooth behavior]
     expected: FAIL
 
@@ -41,21 +20,9 @@
   [Subframe with smooth scroll-behavior ; scrollTo() with auto behavior]
     expected: FAIL
 
-  [Subframe with smooth scroll-behavior ; scrollTo() with instant behavior]
-    expected: FAIL
-
   [Subframe with smooth scroll-behavior ; scrollTo() with smooth behavior]
     expected: FAIL
 
-  [Subframe with auto scroll-behavior ; scrollBy() with default behavior]
-    expected: FAIL
-
-  [Subframe with auto scroll-behavior ; scrollBy() with auto behavior]
-    expected: FAIL
-
-  [Subframe with auto scroll-behavior ; scrollBy() with instant behavior]
-    expected: FAIL
-
   [Subframe with auto scroll-behavior ; scrollBy() with smooth behavior]
     expected: FAIL
 
@@ -65,9 +32,6 @@
   [Subframe with smooth scroll-behavior ; scrollBy() with auto behavior]
     expected: FAIL
 
-  [Subframe with smooth scroll-behavior ; scrollBy() with instant behavior]
-    expected: FAIL
-
   [Subframe with smooth scroll-behavior ; scrollBy() with smooth behavior]
     expected: FAIL
 
@@ -95,23 +59,11 @@
   [Subframe with smooth scroll-behavior ; scrollIntoView() with smooth behavior]
     expected: FAIL
 
-  [Subframe setting scrollLeft with auto scroll-behavior]
-    expected: FAIL
-
   [Subframe setting scrollLeft with smooth scroll-behavior]
     expected: FAIL
 
-  [Subframe setting scrollTop with auto scroll-behavior]
-    expected: FAIL
-
   [Subframe setting scrollTop with smooth scroll-behavior]
     expected: FAIL
 
-  [Aborting an ongoing smooth scrolling on a subframe with another smooth scrolling]
-    expected: FAIL
-
-  [Aborting an ongoing smooth scrolling on a subframe with an instant scrolling]
-    expected: FAIL
-
   [Make sure the page is ready for animation.]
     expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini b/tests/wpt/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini
index 3ad50289fd8..0b3cc1c39c0 100644
--- a/tests/wpt/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini
+++ b/tests/wpt/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini
@@ -1,13 +1,4 @@
 [scroll-behavior-subframe-window.html]
-  [Main frame with auto scroll-behavior ; scroll() with default behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scroll() with auto behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scroll() with instant behavior]
-    expected: FAIL
-
   [Main frame with auto scroll-behavior ; scroll() with smooth behavior]
     expected: FAIL
 
@@ -17,21 +8,9 @@
   [Main frame with smooth scroll-behavior ; scroll() with auto behavior]
     expected: FAIL
 
-  [Main frame with smooth scroll-behavior ; scroll() with instant behavior]
-    expected: FAIL
-
   [Main frame with smooth scroll-behavior ; scroll() with smooth behavior]
     expected: FAIL
 
-  [Main frame with auto scroll-behavior ; scrollTo() with default behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scrollTo() with auto behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scrollTo() with instant behavior]
-    expected: FAIL
-
   [Main frame with auto scroll-behavior ; scrollTo() with smooth behavior]
     expected: FAIL
 
@@ -41,21 +20,9 @@
   [Main frame with smooth scroll-behavior ; scrollTo() with auto behavior]
     expected: FAIL
 
-  [Main frame with smooth scroll-behavior ; scrollTo() with instant behavior]
-    expected: FAIL
-
   [Main frame with smooth scroll-behavior ; scrollTo() with smooth behavior]
     expected: FAIL
 
-  [Main frame with auto scroll-behavior ; scrollBy() with default behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scrollBy() with auto behavior]
-    expected: FAIL
-
-  [Main frame with auto scroll-behavior ; scrollBy() with instant behavior]
-    expected: FAIL
-
   [Main frame with auto scroll-behavior ; scrollBy() with smooth behavior]
     expected: FAIL
 
@@ -65,17 +32,8 @@
   [Main frame with smooth scroll-behavior ; scrollBy() with auto behavior]
     expected: FAIL
 
-  [Main frame with smooth scroll-behavior ; scrollBy() with instant behavior]
-    expected: FAIL
-
   [Main frame with smooth scroll-behavior ; scrollBy() with smooth behavior]
     expected: FAIL
 
-  [Aborting an ongoing smooth scrolling on the main frame with another smooth scrolling]
-    expected: FAIL
-
-  [Aborting an ongoing smooth scrolling on the main frame with an instant scrolling]
-    expected: FAIL
-
   [Make sure the page is ready for animation.]
     expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/scroll-overflow-clip-quirks-001.html.ini b/tests/wpt/meta/css/cssom-view/scroll-overflow-clip-quirks-001.html.ini
deleted file mode 100644
index 74a553beea5..00000000000
--- a/tests/wpt/meta/css/cssom-view/scroll-overflow-clip-quirks-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[scroll-overflow-clip-quirks-001.html]
-  [CSSOM scrollingElement reflects the propagated scroll to viewport correctly]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/css/cssom-view/scroll-overflow-clip-quirks-002.html.ini b/tests/wpt/meta/css/cssom-view/scroll-overflow-clip-quirks-002.html.ini
deleted file mode 100644
index 745bc5a05cc..00000000000
--- a/tests/wpt/meta/css/cssom-view/scroll-overflow-clip-quirks-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[scroll-overflow-clip-quirks-002.html]
-  [CSSOM scrollingElement reflects the propagated scroll to viewport correctly]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/css/cssom-view/scrollIntoView-container.html.ini b/tests/wpt/meta/css/cssom-view/scrollIntoView-container.html.ini
new file mode 100644
index 00000000000..0e9b4a98ac4
--- /dev/null
+++ b/tests/wpt/meta/css/cssom-view/scrollIntoView-container.html.ini
@@ -0,0 +1,15 @@
+[scrollIntoView-container.html]
+  [scrollIntoView() defaults to scrolling ancestors]
+    expected: FAIL
+
+  [scrollIntoView({container: 'all'}) scrolls ancestors]
+    expected: FAIL
+
+  [scrollIntoView({container: 'nearest'}) only scrolls nearest scroll container]
+    expected: FAIL
+
+  [scrollIntoView({container: 'nearest'}) doesn't stop at itself]
+    expected: FAIL
+
+  [scrollIntoView({container: 'nearest'}) doesn't propagate to outer frames]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/scrollWidthHeight-negative-margin-001.html.ini b/tests/wpt/meta/css/cssom-view/scrollWidthHeight-negative-margin-001.html.ini
deleted file mode 100644
index 01bd97ce10d..00000000000
--- a/tests/wpt/meta/css/cssom-view/scrollWidthHeight-negative-margin-001.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[scrollWidthHeight-negative-margin-001.html]
-  [scrollWidth/Height with negative margins: overflow: visible;]
-    expected: FAIL
-
-  [scrollWidth/Height with negative margins: overflow: hidden;]
-    expected: FAIL
-
-  [scrollWidth/Height with negative margins: overflow: auto;]
-    expected: FAIL
-
-  [scrollWidth/Height with negative margins: overflow: clip;]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/scrollWidthHeight-negative-margin-002.html.ini b/tests/wpt/meta/css/cssom-view/scrollWidthHeight-negative-margin-002.html.ini
index 2150921c5ea..531b67bb161 100644
--- a/tests/wpt/meta/css/cssom-view/scrollWidthHeight-negative-margin-002.html.ini
+++ b/tests/wpt/meta/css/cssom-view/scrollWidthHeight-negative-margin-002.html.ini
@@ -121,97 +121,97 @@
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: visible; direction: ltr; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: visible; direction: ltr; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: hidden; direction: ltr; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: hidden; direction: ltr; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: auto; direction: ltr; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: auto; direction: ltr; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: scroll; direction: ltr; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: scroll; direction: ltr; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: visible; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: visible; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: hidden; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: hidden; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: auto; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: auto; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: scroll; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: scroll; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: visible; direction: ltr; flex-flow: wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: visible; direction: ltr; flex-flow: wrap-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: hidden; direction: ltr; flex-flow: wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: hidden; direction: ltr; flex-flow: wrap-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: auto; direction: ltr; flex-flow: wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: auto; direction: ltr; flex-flow: wrap-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: scroll; direction: ltr; flex-flow: wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: scroll; direction: ltr; flex-flow: wrap-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: visible; direction: rtl; flex-flow: wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: visible; direction: rtl; flex-flow: wrap-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: hidden; direction: rtl; flex-flow: wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: hidden; direction: rtl; flex-flow: wrap-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: auto; direction: rtl; flex-flow: wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: auto; direction: rtl; flex-flow: wrap-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: scroll; direction: rtl; flex-flow: wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: scroll; direction: rtl; flex-flow: wrap-reverse;]
     expected: FAIL
@@ -220,49 +220,49 @@
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: visible; direction: ltr; flex-direction: row-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: hidden; direction: ltr; flex-direction: row-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: hidden; direction: ltr; flex-direction: row-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: auto; direction: ltr; flex-direction: row-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: auto; direction: ltr; flex-direction: row-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: scroll; direction: ltr; flex-direction: row-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: scroll; direction: ltr; flex-direction: row-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: visible; direction: rtl; flex-direction: row-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: visible; direction: rtl; flex-direction: row-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: hidden; direction: rtl; flex-direction: row-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: hidden; direction: rtl; flex-direction: row-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: auto; direction: rtl; flex-direction: row-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: auto; direction: rtl; flex-direction: row-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: scroll; direction: rtl; flex-direction: row-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: scroll; direction: rtl; flex-direction: row-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: visible; direction: ltr; flex-flow: row-reverse wrap-reverse;]
     expected: FAIL
@@ -313,145 +313,145 @@
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: visible; direction: ltr; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: visible; direction: ltr; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: hidden; direction: ltr; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: hidden; direction: ltr; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: auto; direction: ltr; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: auto; direction: ltr; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: scroll; direction: ltr; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: scroll; direction: ltr; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: visible; direction: rtl; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: visible; direction: rtl; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: hidden; direction: rtl; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: hidden; direction: rtl; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: auto; direction: rtl; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: auto; direction: rtl; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: scroll; direction: rtl; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: scroll; direction: rtl; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: visible; direction: ltr; flex-flow: column wrap-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: visible; direction: ltr; flex-flow: column wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: hidden; direction: ltr; flex-flow: column wrap-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: hidden; direction: ltr; flex-flow: column wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: auto; direction: ltr; flex-flow: column wrap-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: auto; direction: ltr; flex-flow: column wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: scroll; direction: ltr; flex-flow: column wrap-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: scroll; direction: ltr; flex-flow: column wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: visible; direction: rtl; flex-flow: column wrap-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: visible; direction: rtl; flex-flow: column wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: hidden; direction: rtl; flex-flow: column wrap-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: hidden; direction: rtl; flex-flow: column wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: auto; direction: rtl; flex-flow: column wrap-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: auto; direction: rtl; flex-flow: column wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: scroll; direction: rtl; flex-flow: column wrap-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: scroll; direction: rtl; flex-flow: column wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: visible; direction: ltr; flex-direction: column-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: visible; direction: ltr; flex-direction: column-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: hidden; direction: ltr; flex-direction: column-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: hidden; direction: ltr; flex-direction: column-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: auto; direction: ltr; flex-direction: column-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: auto; direction: ltr; flex-direction: column-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: scroll; direction: ltr; flex-direction: column-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: scroll; direction: ltr; flex-direction: column-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: visible; direction: rtl; flex-direction: column-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: visible; direction: rtl; flex-direction: column-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: hidden; direction: rtl; flex-direction: column-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: hidden; direction: rtl; flex-direction: column-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: auto; direction: rtl; flex-direction: column-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: auto; direction: rtl; flex-direction: column-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: scroll; direction: rtl; flex-direction: column-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: scroll; direction: rtl; flex-direction: column-reverse;]
     expected: FAIL
@@ -505,85 +505,70 @@
     expected: FAIL
 
   [scrollWidth with negative margins: display: flow-root; overflow: visible; direction: ltr; flex-direction: row;]
-    expected: FAIL
-
-  [scrollHeight with negative margins: display: flow-root; overflow: visible; direction: ltr; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flow-root; overflow: hidden; direction: ltr; flex-direction: row;]
-    expected: FAIL
-
-  [scrollHeight with negative margins: display: flow-root; overflow: hidden; direction: ltr; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flow-root; overflow: auto; direction: ltr; flex-direction: row;]
-    expected: FAIL
-
-  [scrollHeight with negative margins: display: flow-root; overflow: auto; direction: ltr; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flow-root; overflow: scroll; direction: ltr; flex-direction: row;]
-    expected: FAIL
-
-  [scrollHeight with negative margins: display: flow-root; overflow: scroll; direction: ltr; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flow-root; overflow: visible; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flow-root; overflow: visible; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flow-root; overflow: hidden; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flow-root; overflow: hidden; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flow-root; overflow: auto; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flow-root; overflow: auto; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flow-root; overflow: scroll; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flow-root; overflow: scroll; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flow-root; overflow: clip; direction: ltr; flex-direction: row;]
-    expected: FAIL
-
-  [scrollHeight with negative margins: display: flow-root; overflow: clip; direction: ltr; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flow-root; overflow: clip; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flow-root; overflow: clip; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: clip; direction: ltr; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: clip; direction: ltr; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: clip; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: clip; direction: rtl; flex-direction: row;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: clip; direction: ltr; flex-flow: wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: clip; direction: ltr; flex-flow: wrap-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: clip; direction: rtl; flex-flow: wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: clip; direction: rtl; flex-flow: wrap-reverse;]
     expected: FAIL
@@ -592,13 +577,13 @@
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: clip; direction: ltr; flex-direction: row-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: clip; direction: rtl; flex-direction: row-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: clip; direction: rtl; flex-direction: row-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: clip; direction: ltr; flex-flow: row-reverse wrap-reverse;]
     expected: FAIL
@@ -613,37 +598,37 @@
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: clip; direction: ltr; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: clip; direction: ltr; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: clip; direction: rtl; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: clip; direction: rtl; flex-direction: column;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: clip; direction: ltr; flex-flow: column wrap-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: clip; direction: ltr; flex-flow: column wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: clip; direction: rtl; flex-flow: column wrap-reverse;]
     expected: FAIL
 
   [scrollHeight with negative margins: display: flex; overflow: clip; direction: rtl; flex-flow: column wrap-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollWidth with negative margins: display: flex; overflow: clip; direction: ltr; flex-direction: column-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: clip; direction: ltr; flex-direction: column-reverse;]
     expected: FAIL
 
   [scrollWidth with negative margins: display: flex; overflow: clip; direction: rtl; flex-direction: column-reverse;]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [scrollHeight with negative margins: display: flex; overflow: clip; direction: rtl; flex-direction: column-reverse;]
     expected: FAIL
@@ -659,3 +644,48 @@
 
   [scrollHeight with negative margins: display: flex; overflow: clip; direction: rtl; flex-flow: column-reverse wrap-reverse;]
     expected: FAIL
+
+  [scrollWidth with negative margins: display: grid; overflow: visible; direction: ltr; flex-direction: row;]
+    expected: [FAIL, PASS]
+
+  [scrollWidth with negative margins: display: grid; overflow: hidden; direction: ltr; flex-direction: row;]
+    expected: [FAIL, PASS]
+
+  [scrollWidth with negative margins: display: grid; overflow: auto; direction: ltr; flex-direction: row;]
+    expected: [FAIL, PASS]
+
+  [scrollWidth with negative margins: display: grid; overflow: clip; direction: ltr; flex-direction: row;]
+    expected: [FAIL, PASS]
+
+  [scrollWidth with negative margins: display: grid; overflow: scroll; direction: ltr; flex-direction: row;]
+    expected: [FAIL, PASS]
+
+  [scrollWidth with negative margins: display: grid; overflow: visible; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: grid; overflow: visible; direction: rtl; flex-direction: row;]
+    expected: [FAIL, PASS]
+
+  [scrollWidth with negative margins: display: grid; overflow: hidden; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: grid; overflow: hidden; direction: rtl; flex-direction: row;]
+    expected: [FAIL, PASS]
+
+  [scrollWidth with negative margins: display: grid; overflow: auto; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: grid; overflow: auto; direction: rtl; flex-direction: row;]
+    expected: [FAIL, PASS]
+
+  [scrollWidth with negative margins: display: grid; overflow: clip; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: grid; overflow: clip; direction: rtl; flex-direction: row;]
+    expected: [FAIL, PASS]
+
+  [scrollWidth with negative margins: display: grid; overflow: scroll; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: grid; overflow: scroll; direction: rtl; flex-direction: row;]
+    expected: [FAIL, PASS]
diff --git a/tests/wpt/meta/css/cssom-view/scrolling-quirks-vs-nonquirks.html.ini b/tests/wpt/meta/css/cssom-view/scrolling-quirks-vs-nonquirks.html.ini
index ccfa50ad607..c8c740d957e 100644
--- a/tests/wpt/meta/css/cssom-view/scrolling-quirks-vs-nonquirks.html.ini
+++ b/tests/wpt/meta/css/cssom-view/scrolling-quirks-vs-nonquirks.html.ini
@@ -1,22 +1,10 @@
 [scrolling-quirks-vs-nonquirks.html]
-  [scrollingElement in non-quirks mode]
-    expected: FAIL
-
-  [scrollLeft/scrollRight of the content in quirks mode]
-    expected: FAIL
-
   [scrollWidth/scrollHeight on the root element in non-quirks mode]
     expected: FAIL
 
-  [scrollingElement in quirks mode]
-    expected: FAIL
-
   [scrollWidth/scrollHeight on the root element in quirks mode]
     expected: FAIL
 
-  [scrollLeft/scrollRight of the content in non-quirks mode]
-    expected: FAIL
-
   [scrollWidth/scrollHeight on the HTML body element in quirks mode]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/cssom-view/scrollingElement.html.ini b/tests/wpt/meta/css/cssom-view/scrollingElement.html.ini
deleted file mode 100644
index 2feec30bf75..00000000000
--- a/tests/wpt/meta/css/cssom-view/scrollingElement.html.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[scrollingElement.html]
-  [scrollingElement in quirks mode]
-    expected: FAIL
-
-  [scrollingElement in no-quirks mode]
-    expected: FAIL
-
-  [scrollingElement in quirks mode (body table)]
-    expected: FAIL
-
-  [scrollingElement in no-quirks mode ]
-    expected: FAIL
-
-  [scrollingElement in no-quirks mode  (root table)]
-    expected: FAIL
-
-  [scrollingElement in no-quirks mode  (body table)]
-    expected: FAIL
-
-  [scrollingElement in quirks mode (root table, body table)]
-    expected: FAIL
-
-  [scrollingElement in quirks mode (root table)]
-    expected: FAIL
-
-  [scrollingElement in no-quirks mode  (root table, body table)]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/css/cssom-view/table-scroll-props.html.ini b/tests/wpt/meta/css/cssom-view/table-scroll-props.html.ini
new file mode 100644
index 00000000000..745c51cd4c7
--- /dev/null
+++ b/tests/wpt/meta/css/cssom-view/table-scroll-props.html.ini
@@ -0,0 +1,6 @@
+[table-scroll-props.html]
+  [Table with separated border]
+    expected: FAIL
+
+  [Table with collapsed border]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/CSSStyleSheet-constructable-baseURL.html.ini b/tests/wpt/meta/css/cssom/CSSStyleSheet-constructable-baseURL.html.ini
index a9bad39b1da..f9b211c4a49 100644
--- a/tests/wpt/meta/css/cssom/CSSStyleSheet-constructable-baseURL.html.ini
+++ b/tests/wpt/meta/css/cssom/CSSStyleSheet-constructable-baseURL.html.ini
@@ -1,9 +1,3 @@
 [CSSStyleSheet-constructable-baseURL.html]
-  [Constructing sheet with custom base URL ueses that URL for CSS rules]
-    expected: FAIL
-
-  [Constructing sheet with relative URL adds to the constructor document's base URL]
-    expected: FAIL
-
   [Constructing sheet with invalid base URL throws a NotAllowedError]
     expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/CSSStyleSheet-constructable-disabled-regular-sheet-insertion.html.ini b/tests/wpt/meta/css/cssom/CSSStyleSheet-constructable-disabled-regular-sheet-insertion.html.ini
deleted file mode 100644
index d9dd9972f10..00000000000
--- a/tests/wpt/meta/css/cssom/CSSStyleSheet-constructable-disabled-regular-sheet-insertion.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CSSStyleSheet-constructable-disabled-regular-sheet-insertion.html]
-  [Shouldn't crash / assert when inserting a stylesheet after there are disabled constructable sheets]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/css/cssom/CSSStyleSheet-constructable-disallow-import.tentative.html.ini b/tests/wpt/meta/css/cssom/CSSStyleSheet-constructable-disallow-import.tentative.html.ini
index 99cec16c4ae..ac116f45da3 100644
--- a/tests/wpt/meta/css/cssom/CSSStyleSheet-constructable-disallow-import.tentative.html.ini
+++ b/tests/wpt/meta/css/cssom/CSSStyleSheet-constructable-disallow-import.tentative.html.ini
@@ -2,12 +2,8 @@
   [@import rules are not parsed in CSSStyleSheet.replaceSync]
     expected: FAIL
 
-  [Inserting an @import rule through insertRule on a constructed stylesheet throws an exception]
-    expected: FAIL
-
   [@import rules are not parsed in CSSStyleSheet.replace]
     expected: FAIL
 
   [@import rules should not trigger any loads.]
     expected: FAIL
-
diff --git a/tests/wpt/meta/css/cssom/CSSStyleSheet-constructable.html.ini b/tests/wpt/meta/css/cssom/CSSStyleSheet-constructable.html.ini
index 895b75dedf3..b8d885c47bd 100644
--- a/tests/wpt/meta/css/cssom/CSSStyleSheet-constructable.html.ini
+++ b/tests/wpt/meta/css/cssom/CSSStyleSheet-constructable.html.ini
@@ -5,9 +5,6 @@
   [new CSSStyleSheet produces empty CSSStyleSheet]
     expected: FAIL
 
-  [title can be set in the CSSStyleSheet constructor]
-    expected: FAIL
-
   [CSSStyleSheet.replace produces Promise<CSSStyleSheet>]
     expected: FAIL
 
@@ -44,9 +41,6 @@
   [Adding non-constructed stylesheet to AdoptedStyleSheets is not allowed when the owner document of the stylesheet and the AdoptedStyleSheets are in different document trees]
     expected: FAIL
 
-  [CSSStyleSheet.replaceSync replaces stylesheet text synchronously]
-    expected: FAIL
-
   [CSSStyleSheet.replaceSync correctly updates the style of its adopters synchronously]
     expected: FAIL
 
@@ -56,9 +50,6 @@
   [Adopted sheets are ordered after non-adopted sheets in the document]
     expected: FAIL
 
-  [Inserting an @import rule through insertRule on a constructed stylesheet throws an exception]
-    expected: FAIL
-
   [CSSStyleSheet.replaceSync should not trigger any loads from @import rules]
     expected: FAIL
 
@@ -68,29 +59,11 @@
   [CSSStyleSheet.replace ignores @import rule but still loads other rules]
     expected: FAIL
 
-  [CSSStyleSheet.replaceSync allows, but ignores, import rule inside]
-    expected: FAIL
-
   [CSSStyleSheet.replace does not reject on failed imports]
     expected: FAIL
 
-  [Cloning a shadow host will not clone shadow root, and also adoptedStyleSheets]
-    expected: FAIL
-
-  [Importing a shadow host will not copy shadow root, and also adoptedStyleSheets]
-    expected: FAIL
-
   [Adopting a shadow host will empty adoptedStyleSheets if adopting to a different document]
     expected: FAIL
 
   [Adopting a shadow host's ancestor will empty adoptedStyleSheets if adopting to a different document]
     expected: FAIL
-
-  [Forcing a style update after adding an adopted stylesheet on a disconnected shadow root should not crash.]
-    expected: FAIL
-
-  [Modifying an adopted stylesheet on a disconnected shadow root should not crash.]
-    expected: FAIL
-
-  [Constructing a sheet with the default base URL uses the constructor document's base URL for CSS rules]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/CSSStyleSheet-modify-after-removal.html.ini b/tests/wpt/meta/css/cssom/CSSStyleSheet-modify-after-removal.html.ini
deleted file mode 100644
index 9e173013bcb..00000000000
--- a/tests/wpt/meta/css/cssom/CSSStyleSheet-modify-after-removal.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[CSSStyleSheet-modify-after-removal.html]
-  [Modify constructed sheet from removed iframe]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/CSSStyleSheet.html.ini b/tests/wpt/meta/css/cssom/CSSStyleSheet.html.ini
deleted file mode 100644
index a23f10e20df..00000000000
--- a/tests/wpt/meta/css/cssom/CSSStyleSheet.html.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[CSSStyleSheet.html]
-  [addRule with no argument adds "undefined" selector]
-    expected: FAIL
-
-  [removeRule on empty style sheet throws]
-    expected: FAIL
-
-  [cssRules and rules are the same object]
-    expected: FAIL
-
-  [addRule with index greater than length throws]
-    expected: FAIL
-
-  [addRule with #foo selectors]
-    expected: FAIL
-
-  [removeRule(1)]
-    expected: FAIL
-
-  [removeRule with no argument removes first rule]
-    expected: FAIL
-
-  [addRule with @media rule]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/css/cssom/HTMLLinkElement-disabled-003.html.ini b/tests/wpt/meta/css/cssom/HTMLLinkElement-disabled-003.html.ini
deleted file mode 100644
index a63c586fd67..00000000000
--- a/tests/wpt/meta/css/cssom/HTMLLinkElement-disabled-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[HTMLLinkElement-disabled-003.html]
-  [HTMLLinkElement.disabled's explicitly enabled state persists when disconnected and connected again]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/css/cssom/HTMLLinkElement-disabled-004.html.ini b/tests/wpt/meta/css/cssom/HTMLLinkElement-disabled-004.html.ini
deleted file mode 100644
index 20462805942..00000000000
--- a/tests/wpt/meta/css/cssom/HTMLLinkElement-disabled-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[HTMLLinkElement-disabled-004.html]
-  [HTMLLinkElement.disabled's explicitly enabled state doesn't persist on clones]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/css/cssom/HTMLLinkElement-disabled-007.html.ini b/tests/wpt/meta/css/cssom/HTMLLinkElement-disabled-007.html.ini
deleted file mode 100644
index 62ef580305f..00000000000
--- a/tests/wpt/meta/css/cssom/HTMLLinkElement-disabled-007.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[HTMLLinkElement-disabled-007.html]
-  [HTMLLinkElement.disabled setter sets the explicitly enabled state if toggled back and forth.]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/css/cssom/HTMLLinkElement-disabled-alternate.html.ini b/tests/wpt/meta/css/cssom/HTMLLinkElement-disabled-alternate.html.ini
deleted file mode 100644
index eb0657d3a0a..00000000000
--- a/tests/wpt/meta/css/cssom/HTMLLinkElement-disabled-alternate.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[HTMLLinkElement-disabled-alternate.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/adoptedstylesheets-modify-array-and-sheet.html.ini b/tests/wpt/meta/css/cssom/adoptedstylesheets-modify-array-and-sheet.html.ini
index 97401f0fd7c..f3585fe7abf 100644
--- a/tests/wpt/meta/css/cssom/adoptedstylesheets-modify-array-and-sheet.html.ini
+++ b/tests/wpt/meta/css/cssom/adoptedstylesheets-modify-array-and-sheet.html.ini
@@ -1,2 +1,9 @@
 [adoptedstylesheets-modify-array-and-sheet.html]
-  expected: ERROR
+  [Add the two sheets. Text should be red.]
+    expected: FAIL
+
+  [Flip the two sheet. Still red.]
+    expected: FAIL
+
+  [Modify the color declaration. Should now be green.]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/cssom-fontfacerule-constructors.html.ini b/tests/wpt/meta/css/cssom/cssom-fontfacerule-constructors.html.ini
index 8362bc77717..4355f90dec9 100644
--- a/tests/wpt/meta/css/cssom/cssom-fontfacerule-constructors.html.ini
+++ b/tests/wpt/meta/css/cssom/cssom-fontfacerule-constructors.html.ini
@@ -2,3 +2,5 @@
   [The style attribute must return a CSSStyleDeclaration block]
     expected: FAIL
 
+  [The style attribute must return a CSSFontFaceDescriptors block]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/getComputedStyle-insets-grid.html.ini b/tests/wpt/meta/css/cssom/getComputedStyle-insets-grid.html.ini
deleted file mode 100644
index 5e6a587fc95..00000000000
--- a/tests/wpt/meta/css/cssom/getComputedStyle-insets-grid.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[getComputedStyle-insets-grid.html]
-  [Position absolute getComputedStyle left (for display: grid)]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/getComputedStyle-pseudo-checkmark.html.ini b/tests/wpt/meta/css/cssom/getComputedStyle-pseudo-checkmark.html.ini
index ee0051f3146..f6ff115aab0 100644
--- a/tests/wpt/meta/css/cssom/getComputedStyle-pseudo-checkmark.html.ini
+++ b/tests/wpt/meta/css/cssom/getComputedStyle-pseudo-checkmark.html.ini
@@ -1,6 +1,3 @@
 [getComputedStyle-pseudo-checkmark.html]
-  [Resolution of width is correct when pseudo-element argument is ignored (due to single-colon)]
-    expected: FAIL
-
   [Resolution of width is correct for pseudo-element (due to double-colon)]
     expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/getComputedStyle-pseudo-picker-icon.html.ini b/tests/wpt/meta/css/cssom/getComputedStyle-pseudo-picker-icon.html.ini
index 355d4e10051..3c1cd6fbb47 100644
--- a/tests/wpt/meta/css/cssom/getComputedStyle-pseudo-picker-icon.html.ini
+++ b/tests/wpt/meta/css/cssom/getComputedStyle-pseudo-picker-icon.html.ini
@@ -2,8 +2,5 @@
   [Resolution of width is correct when pseudo-element argument is ignored (due to no colon)]
     expected: FAIL
 
-  [Resolution of width is correct when pseudo-element argument is ignored (due to single-colon)]
-    expected: FAIL
-
   [Resolution of width is correct for pseudo-element (due to double-colon)]
     expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/getComputedStyle-pseudo-with-argument.html.ini b/tests/wpt/meta/css/cssom/getComputedStyle-pseudo-with-argument.html.ini
index a1903ed413d..2507753f7ef 100644
--- a/tests/wpt/meta/css/cssom/getComputedStyle-pseudo-with-argument.html.ini
+++ b/tests/wpt/meta/css/cssom/getComputedStyle-pseudo-with-argument.html.ini
@@ -13,54 +13,3 @@
 
   [This pseudo-element should parse: ::highlight( n\\61me )]
     expected: FAIL
-
-  [This pseudo-element should not parse: ::before(test)]
-    expected: FAIL
-
-  [This pseudo-element should not parse: ::highlight]
-    expected: FAIL
-
-  [This pseudo-element should not parse: ::highlight(]
-    expected: FAIL
-
-  [This pseudo-element should not parse: ::highlight()]
-    expected: FAIL
-
-  [This pseudo-element should not parse: ::highlight(1)]
-    expected: FAIL
-
-  [This pseudo-element should not parse: ::highlight($)]
-    expected: FAIL
-
-  [This pseudo-element should not parse: ::highlight (name)]
-    expected: FAIL
-
-  [This pseudo-element should not parse: ::highlight(name)a]
-    expected: FAIL
-
-  [This pseudo-element should not parse: ::view-transition-group(*)]
-    expected: FAIL
-
-  [This pseudo-element should not parse: :highlight(name)]
-    expected: FAIL
-
-  [This pseudo-element should not parse: ::view-transition-image-pair(*)]
-    expected: FAIL
-
-  [This pseudo-element should not parse: ::view-transition-old(*)]
-    expected: FAIL
-
-  [This pseudo-element should not parse: ::view-transition-new(*)]
-    expected: FAIL
-
-  [This pseudo-element should not parse: :view-transition-group(name)]
-    expected: FAIL
-
-  [This pseudo-element should not parse: :view-transition-image-pair(name)]
-    expected: FAIL
-
-  [This pseudo-element should not parse: :view-transition-old(name)]
-    expected: FAIL
-
-  [This pseudo-element should not parse: :view-transition-new(name)]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/getComputedStyle-pseudo.html.ini b/tests/wpt/meta/css/cssom/getComputedStyle-pseudo.html.ini
index d49f1cecfad..a53c62b49d5 100644
--- a/tests/wpt/meta/css/cssom/getComputedStyle-pseudo.html.ini
+++ b/tests/wpt/meta/css/cssom/getComputedStyle-pseudo.html.ini
@@ -8,9 +8,6 @@
   [Unknown pseudo-elements throw]
     expected: FAIL
 
-  [Unknown pseudo-elements]
-    expected: FAIL
-
   [Unknown pseudo-element with a known string (ex: marker)]
     expected: FAIL
 
@@ -29,9 +26,6 @@
   [Unknown pseudo-element with a known identifier: highlight(name)]
     expected: PRECONDITION_FAILED
 
-  [Unknown pseudo-element with a known identifier: marker]
-    expected: PRECONDITION_FAILED
-
   [Unknown pseudo-element with a known identifier: placeholder]
     expected: PRECONDITION_FAILED
 
@@ -52,6 +46,3 @@
 
   [Unknown pseudo-element with a known identifier: view-transition-new(name)]
     expected: PRECONDITION_FAILED
-
-  [Resolution of width is correct when pseudo-element argument is invalid (due to a trailing token)]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/idlharness.html.ini b/tests/wpt/meta/css/cssom/idlharness.html.ini
index cd4dfca45b1..e87e7a353d2 100644
--- a/tests/wpt/meta/css/cssom/idlharness.html.ini
+++ b/tests/wpt/meta/css/cssom/idlharness.html.ini
@@ -23,9 +23,6 @@
   [CSSRule interface: sheet.cssRules[2\].cssRules[0\] must inherit property "parentRule" with the proper type]
     expected: FAIL
 
-  [CSSStyleDeclaration interface: svg_element.style must inherit property "item(unsigned long)" with the proper type]
-    expected: FAIL
-
   [CSSStyleDeclaration interface: calling getPropertyPriority(CSSOMString) on sheet.cssRules[2\].cssRules[0\].style with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -47,30 +44,15 @@
   [CSSMarginRule interface: sheet.cssRules[2\].cssRules[0\] must inherit property "style" with the proper type]
     expected: FAIL
 
-  [CSSStyleDeclaration interface: svg_element.style must inherit property "getPropertyValue(CSSOMString)" with the proper type]
-    expected: FAIL
-
   [SVGStyleElement interface: attribute sheet]
     expected: FAIL
 
-  [CSSStyleSheet interface: attribute rules]
-    expected: FAIL
-
   [CSSStyleDeclaration interface: sheet.cssRules[2\].cssRules[0\].style must inherit property "setProperty(CSSOMString, CSSOMString, optional CSSOMString)" with the proper type]
     expected: FAIL
 
-  [SVGElement interface: attribute style]
-    expected: FAIL
-
   [CSSStyleDeclaration interface: sheet.cssRules[2\].style must inherit property "setProperty(CSSOMString, CSSOMString, optional CSSOMString)" with the proper type]
     expected: FAIL
 
-  [CSSStyleDeclaration interface: svg_element.style must inherit property "setProperty(CSSOMString, CSSOMString, optional CSSOMString)" with the proper type]
-    expected: FAIL
-
-  [CSSStyleDeclaration interface: svg_element.style must inherit property "getPropertyPriority(CSSOMString)" with the proper type]
-    expected: FAIL
-
   [StyleSheet interface: attribute type]
     expected: FAIL
 
@@ -101,9 +83,6 @@
   [CSSStyleDeclaration interface: svg_element.style must inherit property "cssFloat" with the proper type]
     expected: FAIL
 
-  [CSSStyleSheet interface: calling addRule(optional DOMString, optional DOMString, optional unsigned long) on sheet with too few arguments must throw TypeError]
-    expected: FAIL
-
   [CSSStyleDeclaration must be primary interface of sheet.cssRules[2\].cssRules[0\].style]
     expected: FAIL
 
@@ -161,9 +140,6 @@
   [CSSPageRule interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
-  [CSSStyleSheet interface: operation addRule(optional DOMString, optional DOMString, optional unsigned long)]
-    expected: FAIL
-
   [CSSRule interface: sheet.cssRules[1\] must inherit property "parentRule" with the proper type]
     expected: FAIL
 
@@ -173,9 +149,6 @@
   [CSSPageRule interface: existence and properties of interface object]
     expected: FAIL
 
-  [CSSStyleSheet interface: sheet must inherit property "rules" with the proper type]
-    expected: FAIL
-
   [CSSPageRule must be primary interface of sheet.cssRules[2\]]
     expected: FAIL
 
@@ -185,9 +158,6 @@
   [CSSStyleDeclaration interface: sheet.cssRules[4\].style must inherit property "cssText" with the proper type]
     expected: FAIL
 
-  [CSSStyleDeclaration interface: calling removeProperty(CSSOMString) on svg_element.style with too few arguments must throw TypeError]
-    expected: FAIL
-
   [CSSStyleDeclaration interface: calling item(unsigned long) on sheet.cssRules[2\].cssRules[0\].style with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -200,9 +170,6 @@
   [CSSStyleDeclaration must be primary interface of sheet.cssRules[2\].style]
     expected: FAIL
 
-  [CSSStyleDeclaration interface: calling getPropertyValue(CSSOMString) on svg_element.style with too few arguments must throw TypeError]
-    expected: FAIL
-
   [CSSMarginRule must be primary interface of sheet.cssRules[2\].cssRules[0\]]
     expected: FAIL
 
@@ -218,9 +185,6 @@
   [CSSImportRule interface: sheet.cssRules[0\] must inherit property "styleSheet" with the proper type]
     expected: FAIL
 
-  [CSSStyleDeclaration interface: svg_element.style must inherit property "removeProperty(CSSOMString)" with the proper type]
-    expected: FAIL
-
   [CSSPageRule interface: attribute selectorText]
     expected: FAIL
 
@@ -230,9 +194,6 @@
   [CSSPageRule interface: sheet.cssRules[2\] must inherit property "selectorText" with the proper type]
     expected: FAIL
 
-  [CSSStyleSheet interface: sheet must inherit property "addRule(optional DOMString, optional DOMString, optional unsigned long)" with the proper type]
-    expected: FAIL
-
   [CSSMarginRule interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
@@ -284,15 +245,9 @@
   [CSSStyleDeclaration interface: sheet.cssRules[2\].style must inherit property "cssText" with the proper type]
     expected: FAIL
 
-  [CSSStyleSheet interface: operation removeRule(optional unsigned long)]
-    expected: FAIL
-
   [Stringification of sheet.cssRules[4\]]
     expected: FAIL
 
-  [SVGElement interface: svg_element must inherit property "style" with the proper type]
-    expected: FAIL
-
   [CSSPageRule interface: attribute style]
     expected: FAIL
 
@@ -317,9 +272,6 @@
   [CSSStyleRule interface: sheet.cssRules[4\] must inherit property "style" with the proper type]
     expected: FAIL
 
-  [CSSStyleDeclaration interface: svg_element.style must inherit property "length" with the proper type]
-    expected: FAIL
-
   [CSSStyleDeclaration interface: sheet.cssRules[2\].style must inherit property "item(unsigned long)" with the proper type]
     expected: FAIL
 
@@ -332,9 +284,6 @@
   [CSSRule interface: sheet.cssRules[4\] must inherit property "FONT_FACE_RULE" with the proper type]
     expected: FAIL
 
-  [CSSStyleDeclaration interface: calling item(unsigned long) on svg_element.style with too few arguments must throw TypeError]
-    expected: FAIL
-
   [CSSStyleDeclaration interface: sheet.cssRules[4\].style must inherit property "cssFloat" with the proper type]
     expected: FAIL
 
@@ -347,9 +296,6 @@
   [CSSRule interface: sheet.cssRules[4\] must inherit property "cssText" with the proper type]
     expected: FAIL
 
-  [CSSStyleSheet interface: sheet must inherit property "removeRule(optional unsigned long)" with the proper type]
-    expected: FAIL
-
   [CSSMarginRule interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
 
@@ -368,9 +314,6 @@
   [CSSStyleDeclaration interface: calling setProperty(CSSOMString, CSSOMString, optional CSSOMString) on sheet.cssRules[2\].cssRules[0\].style with too few arguments must throw TypeError]
     expected: FAIL
 
-  [CSSStyleDeclaration interface: svg_element.style must inherit property "cssText" with the proper type]
-    expected: FAIL
-
   [CSSRule interface: sheet.cssRules[2\].cssRules[0\] must inherit property "type" with the proper type]
     expected: FAIL
 
@@ -407,9 +350,6 @@
   [CSSMarginRule interface: attribute style]
     expected: FAIL
 
-  [CSSStyleSheet interface: calling removeRule(optional unsigned long) on sheet with too few arguments must throw TypeError]
-    expected: FAIL
-
   [CSSStyleDeclaration interface: sheet.cssRules[2\].style must inherit property "getPropertyValue(CSSOMString)" with the proper type]
     expected: FAIL
 
@@ -422,12 +362,6 @@
   [CSSStyleDeclaration interface: attribute parentRule]
     expected: FAIL
 
-  [CSSStyleDeclaration interface: calling getPropertyPriority(CSSOMString) on svg_element.style with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [CSSStyleDeclaration interface: calling setProperty(CSSOMString, CSSOMString, optional CSSOMString) on svg_element.style with too few arguments must throw TypeError]
-    expected: FAIL
-
   [CSSStyleRule interface: sheet.cssRules[4\] must inherit property "selectorText" with the proper type]
     expected: FAIL
 
@@ -461,21 +395,12 @@
   [CSSStyleSheet interface: operation replace(USVString)]
     expected: FAIL
 
-  [CSSStyleSheet interface: operation replaceSync(USVString)]
-    expected: FAIL
-
   [CSSStyleSheet interface: sheet must inherit property "replace(USVString)" with the proper type]
     expected: FAIL
 
   [CSSStyleSheet interface: calling replace(USVString) on sheet with too few arguments must throw TypeError]
     expected: FAIL
 
-  [CSSStyleSheet interface: sheet must inherit property "replaceSync(USVString)" with the proper type]
-    expected: FAIL
-
-  [CSSStyleSheet interface: calling replaceSync(USVString) on sheet with too few arguments must throw TypeError]
-    expected: FAIL
-
   [Document interface: attribute adoptedStyleSheets]
     expected: FAIL
 
@@ -497,12 +422,6 @@
   [CSSImportRule interface: sheet.cssRules[0\] must inherit property "supportsText" with the proper type]
     expected: FAIL
 
-  [CSSStyleRule interface: existence and properties of interface object]
-    expected: FAIL
-
-  [CSSStyleRule interface: existence and properties of interface prototype object]
-    expected: FAIL
-
   [CSSGroupingRule interface: sheet.cssRules[4\] must inherit property "cssRules" with the proper type]
     expected: FAIL
 
@@ -601,3 +520,75 @@
 
   [CSSPageDescriptors interface: attribute page-orientation]
     expected: FAIL
+
+  [CSSPageDescriptors must be primary interface of sheet.cssRules[2\].style]
+    expected: FAIL
+
+  [CSSPageDescriptors interface: sheet.cssRules[2\].style must inherit property "margin" with the proper type]
+    expected: FAIL
+
+  [CSSPageDescriptors interface: sheet.cssRules[2\].style must inherit property "marginTop" with the proper type]
+    expected: FAIL
+
+  [CSSPageDescriptors interface: sheet.cssRules[2\].style must inherit property "marginRight" with the proper type]
+    expected: FAIL
+
+  [CSSPageDescriptors interface: sheet.cssRules[2\].style must inherit property "marginBottom" with the proper type]
+    expected: FAIL
+
+  [CSSPageDescriptors interface: sheet.cssRules[2\].style must inherit property "marginLeft" with the proper type]
+    expected: FAIL
+
+  [CSSPageDescriptors interface: sheet.cssRules[2\].style must inherit property "margin-top" with the proper type]
+    expected: FAIL
+
+  [CSSPageDescriptors interface: sheet.cssRules[2\].style must inherit property "margin-right" with the proper type]
+    expected: FAIL
+
+  [CSSPageDescriptors interface: sheet.cssRules[2\].style must inherit property "margin-bottom" with the proper type]
+    expected: FAIL
+
+  [CSSPageDescriptors interface: sheet.cssRules[2\].style must inherit property "margin-left" with the proper type]
+    expected: FAIL
+
+  [CSSPageDescriptors interface: sheet.cssRules[2\].style must inherit property "size" with the proper type]
+    expected: FAIL
+
+  [CSSPageDescriptors interface: sheet.cssRules[2\].style must inherit property "pageOrientation" with the proper type]
+    expected: FAIL
+
+  [CSSPageDescriptors interface: sheet.cssRules[2\].style must inherit property "page-orientation" with the proper type]
+    expected: FAIL
+
+  [CSSPageDescriptors interface: sheet.cssRules[2\].style must inherit property "marks" with the proper type]
+    expected: FAIL
+
+  [CSSPageDescriptors interface: sheet.cssRules[2\].style must inherit property "bleed" with the proper type]
+    expected: FAIL
+
+  [CSSStyleProperties must be primary interface of sheet.cssRules[4\].style]
+    expected: FAIL
+
+  [CSSStyleProperties interface: sheet.cssRules[4\].style must inherit property "cssFloat" with the proper type]
+    expected: FAIL
+
+  [CSSStyleProperties must be primary interface of sheet.cssRules[2\].cssRules[0\].style]
+    expected: FAIL
+
+  [CSSStyleProperties interface: sheet.cssRules[2\].cssRules[0\].style must inherit property "cssFloat" with the proper type]
+    expected: FAIL
+
+  [CSSStyleProperties must be primary interface of style_element.style]
+    expected: FAIL
+
+  [Stringification of style_element.style]
+    expected: FAIL
+
+  [CSSStyleProperties must be primary interface of svg_element.style]
+    expected: FAIL
+
+  [CSSStyleProperties must be primary interface of getComputedStyle(svg_element)]
+    expected: FAIL
+
+  [Stringification of getComputedStyle(svg_element)]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/insertRule-across-context.html.ini b/tests/wpt/meta/css/cssom/insertRule-across-context.html.ini
deleted file mode 100644
index 83f82072f63..00000000000
--- a/tests/wpt/meta/css/cssom/insertRule-across-context.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insertRule-across-context.html]
-  [The constructor of inserted rule object must be from iframe]
-    expected: FAIL
-
-  [The constructor of inserted rule object must be from iframe for new CSSStyleSheet()]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/filter-effects/backdrop-filter-edge-clipping-2.html.ini b/tests/wpt/meta/css/filter-effects/backdrop-filter-edge-clipping-2.html.ini
new file mode 100644
index 00000000000..4a08b41acc2
--- /dev/null
+++ b/tests/wpt/meta/css/filter-effects/backdrop-filter-edge-clipping-2.html.ini
@@ -0,0 +1,2 @@
+[backdrop-filter-edge-clipping-2.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/filter-effects/backdrop-filter-edge-mirror.html.ini b/tests/wpt/meta/css/filter-effects/backdrop-filter-edge-mirror.html.ini
new file mode 100644
index 00000000000..51318cbb1d2
--- /dev/null
+++ b/tests/wpt/meta/css/filter-effects/backdrop-filter-edge-mirror.html.ini
@@ -0,0 +1,2 @@
+[backdrop-filter-edge-mirror.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/filter-effects/backdrop-filter-edge-pixels-2.html.ini b/tests/wpt/meta/css/filter-effects/backdrop-filter-edge-pixels-2.html.ini
new file mode 100644
index 00000000000..19d53f587ad
--- /dev/null
+++ b/tests/wpt/meta/css/filter-effects/backdrop-filter-edge-pixels-2.html.ini
@@ -0,0 +1,2 @@
+[backdrop-filter-edge-pixels-2.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/filter-effects/backdrop-filter-scale-transform.html.ini b/tests/wpt/meta/css/filter-effects/backdrop-filter-scale-transform.html.ini
new file mode 100644
index 00000000000..128ff19f7aa
--- /dev/null
+++ b/tests/wpt/meta/css/filter-effects/backdrop-filter-scale-transform.html.ini
@@ -0,0 +1,2 @@
+[backdrop-filter-scale-transform.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/filter-effects/empty-element-with-filter-004.html.ini b/tests/wpt/meta/css/filter-effects/empty-element-with-filter-004.html.ini
new file mode 100644
index 00000000000..8c94e529496
--- /dev/null
+++ b/tests/wpt/meta/css/filter-effects/empty-element-with-filter-004.html.ini
@@ -0,0 +1,2 @@
+[empty-element-with-filter-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/filter-effects/feComposite-intersection-feTile-input-svg.html.ini b/tests/wpt/meta/css/filter-effects/feComposite-intersection-feTile-input-svg.html.ini
new file mode 100644
index 00000000000..4d79845c12c
--- /dev/null
+++ b/tests/wpt/meta/css/filter-effects/feComposite-intersection-feTile-input-svg.html.ini
@@ -0,0 +1,2 @@
+[feComposite-intersection-feTile-input-svg.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/filter-effects/feComposite-intersection-feTile-input.html.ini b/tests/wpt/meta/css/filter-effects/feComposite-intersection-feTile-input.html.ini
new file mode 100644
index 00000000000..6fff47b1875
--- /dev/null
+++ b/tests/wpt/meta/css/filter-effects/feComposite-intersection-feTile-input.html.ini
@@ -0,0 +1,2 @@
+[feComposite-intersection-feTile-input.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/filter-effects/filtered-html-is-not-container.html.ini b/tests/wpt/meta/css/filter-effects/filtered-html-is-not-container.html.ini
deleted file mode 100644
index b366310b98b..00000000000
--- a/tests/wpt/meta/css/filter-effects/filtered-html-is-not-container.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[filtered-html-is-not-container.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/filter-effects/tainting-fediffuselighting-dynamic.html.ini b/tests/wpt/meta/css/filter-effects/tainting-fediffuselighting-dynamic.html.ini
index 267277ae17e..8e5a61a7aef 100644
--- a/tests/wpt/meta/css/filter-effects/tainting-fediffuselighting-dynamic.html.ini
+++ b/tests/wpt/meta/css/filter-effects/tainting-fediffuselighting-dynamic.html.ini
@@ -1,2 +1,2 @@
 [tainting-fediffuselighting-dynamic.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/filter-effects/tainting-feflood-dynamic.html.ini b/tests/wpt/meta/css/filter-effects/tainting-feflood-dynamic.html.ini
index ecd011d67f6..494727ea66c 100644
--- a/tests/wpt/meta/css/filter-effects/tainting-feflood-dynamic.html.ini
+++ b/tests/wpt/meta/css/filter-effects/tainting-feflood-dynamic.html.ini
@@ -1,2 +1,2 @@
 [tainting-feflood-dynamic.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/geometry/DOMMatrix-001.html.ini b/tests/wpt/meta/css/geometry/DOMMatrix-001.html.ini
new file mode 100644
index 00000000000..cb607530097
--- /dev/null
+++ b/tests/wpt/meta/css/geometry/DOMMatrix-001.html.ini
@@ -0,0 +1,6 @@
+[DOMMatrix-001.html]
+  [new DOMMatrix("scale(sign(1em))")]
+    expected: FAIL
+
+  [new DOMMatrixReadOnly("scale(sign(1em))")]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/selectors/popover-open-with-has-sibling-selector.html.ini b/tests/wpt/meta/css/selectors/popover-open-with-has-sibling-selector.html.ini
new file mode 100644
index 00000000000..0e3b2c9605c
--- /dev/null
+++ b/tests/wpt/meta/css/selectors/popover-open-with-has-sibling-selector.html.ini
@@ -0,0 +1,2 @@
+[popover-open-with-has-sibling-selector.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/custom-elements/adopted-callback.html.ini b/tests/wpt/meta/custom-elements/adopted-callback.html.ini
deleted file mode 100644
index 0ab129693c0..00000000000
--- a/tests/wpt/meta/custom-elements/adopted-callback.html.ini
+++ /dev/null
@@ -1,39 +0,0 @@
-[adopted-callback.html]
-  [Moving the shadow host's shadow of a custom element from the owner document into the document of the template elements must enqueue and invoke adoptedCallback]
-    expected: FAIL
-
-  [Moving the shadow host's shadow of a custom element from the owner document into a new document must enqueue and invoke adoptedCallback]
-    expected: FAIL
-
-  [Moving the <template>'s content of a custom element from the owner document into a new document must enqueue and invoke adoptedCallback]
-    expected: FAIL
-
-  [Moving the shadow host's shadow of a custom element from the owner document into a cloned document must enqueue and invoke adoptedCallback]
-    expected: FAIL
-
-  [Moving the <template>'s content of a custom element from the owner document into a cloned document must enqueue and invoke adoptedCallback]
-    expected: FAIL
-
-  [Moving the shadow host's shadow of a custom element from the owner document into a document created by createHTMLDocument must enqueue and invoke adoptedCallback]
-    expected: FAIL
-
-  [Moving the <template>'s content of a custom element from the owner document into a document created by createHTMLDocument must enqueue and invoke adoptedCallback]
-    expected: FAIL
-
-  [Moving the shadow host's shadow of a custom element from the owner document into an HTML document created by createDocument must enqueue and invoke adoptedCallback]
-    expected: FAIL
-
-  [Moving the <template>'s content of a custom element from the owner document into an HTML document created by createDocument must enqueue and invoke adoptedCallback]
-    expected: FAIL
-
-  [Moving the shadow host's shadow of a custom element from the owner document into the document of an iframe must enqueue and invoke adoptedCallback]
-    expected: FAIL
-
-  [Moving the <template>'s content of a custom element from the owner document into the document of an iframe must enqueue and invoke adoptedCallback]
-    expected: FAIL
-
-  [Moving the shadow host's shadow of a custom element from the owner document into an HTML document fetched by XHR must enqueue and invoke adoptedCallback]
-    expected: FAIL
-
-  [Moving the <template>'s content of a custom element from the owner document into an HTML document fetched by XHR must enqueue and invoke adoptedCallback]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/parser/parser-custom-element-in-foreign-content.html.ini b/tests/wpt/meta/custom-elements/parser/parser-custom-element-in-foreign-content.html.ini
deleted file mode 100644
index 2708ea3711c..00000000000
--- a/tests/wpt/meta/custom-elements/parser/parser-custom-element-in-foreign-content.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[parser-custom-element-in-foreign-content.html]
-  [HTML parser should not create custom elements in non-HTML namespaces]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/parser/serializing-html-fragments-customized-builtins.html.ini b/tests/wpt/meta/custom-elements/parser/serializing-html-fragments-customized-builtins.html.ini
deleted file mode 100644
index 15f02f181e4..00000000000
--- a/tests/wpt/meta/custom-elements/parser/serializing-html-fragments-customized-builtins.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[serializing-html-fragments-customized-builtins.html]
-  ["is" value should be serialized if the custom element has no "is" content attribute]
-    expected: FAIL
-
-  ["is" value should be serialized even for an undefined element]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/Construct.html.ini b/tests/wpt/meta/custom-elements/registries/Construct.html.ini
new file mode 100644
index 00000000000..00901c2c5b4
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/Construct.html.ini
@@ -0,0 +1,9 @@
+[Construct.html]
+  [A constructor with only a scoped custom element registry definition should fail upon construction]
+    expected: FAIL
+
+  [A constructor uses the global registry to create an element]
+    expected: FAIL
+
+  [A constructor creating an element from another registry before or after super call should work]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/CustomElementRegistry-define.html.ini b/tests/wpt/meta/custom-elements/registries/CustomElementRegistry-define.html.ini
new file mode 100644
index 00000000000..f3a508799d7
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/CustomElementRegistry-define.html.ini
@@ -0,0 +1,9 @@
+[CustomElementRegistry-define.html]
+  [Create a CustomElementRegistry not identically equal to window.customElements]
+    expected: FAIL
+
+  [Defining an element in the global registry does not add a definition to a scoped CustomElementRegistry]
+    expected: FAIL
+
+  [Defining an element in a scoped global registry does not add a definition to the global registry]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/CustomElementRegistry-initialize.html.ini b/tests/wpt/meta/custom-elements/registries/CustomElementRegistry-initialize.html.ini
new file mode 100644
index 00000000000..6d81603246a
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/CustomElementRegistry-initialize.html.ini
@@ -0,0 +1,27 @@
+[CustomElementRegistry-initialize.html]
+  [initialize is a function on both global and scoped CustomElementRegistry]
+    expected: FAIL
+
+  [initialize sets element.customElementRegistry to the global registry]
+    expected: FAIL
+
+  [initialize does not set the registry of nested shadow tree to the global registry]
+    expected: FAIL
+
+  [initialize sets element.customElementRegistry to a scoped registry]
+    expected: FAIL
+
+  [initialize does not set the registry of nested shadow tree to a scoped registry]
+    expected: FAIL
+
+  [initialize sets element.customElementRegistry permantently]
+    expected: FAIL
+
+  [initialize is no-op on a subtree with a non-null registry]
+    expected: FAIL
+
+  [initialize works on Document]
+    expected: FAIL
+
+  [initialize works on DocumentFragment]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/CustomElementRegistry-multi-register.html.ini b/tests/wpt/meta/custom-elements/registries/CustomElementRegistry-multi-register.html.ini
new file mode 100644
index 00000000000..a3a9b97cef0
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/CustomElementRegistry-multi-register.html.ini
@@ -0,0 +1,6 @@
+[CustomElementRegistry-multi-register.html]
+  [Same constructor can be registered to different registries]
+    expected: FAIL
+
+  [Non-global registries still reject duplicate registrations of the same constructor]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/CustomElementRegistry-upgrade.html.ini b/tests/wpt/meta/custom-elements/registries/CustomElementRegistry-upgrade.html.ini
new file mode 100644
index 00000000000..8f5497a46ca
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/CustomElementRegistry-upgrade.html.ini
@@ -0,0 +1,12 @@
+[CustomElementRegistry-upgrade.html]
+  [upgrade is a function on both global and scoped CustomElementRegistry]
+    expected: FAIL
+
+  [upgrade is a no-op when called on a shadow root with no association]
+    expected: FAIL
+
+  [upgrade should upgrade a candidate element when called on a shadow root with an association]
+    expected: FAIL
+
+  [upgrade should not upgrade a candidate element not associated with the registry]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/Document-createElement.html.ini b/tests/wpt/meta/custom-elements/registries/Document-createElement.html.ini
new file mode 100644
index 00000000000..1867ea7e6b9
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/Document-createElement.html.ini
@@ -0,0 +1,2 @@
+[Document-createElement.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/custom-elements/registries/Document-createElementNS.html.ini b/tests/wpt/meta/custom-elements/registries/Document-createElementNS.html.ini
new file mode 100644
index 00000000000..44a90a38b12
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/Document-createElementNS.html.ini
@@ -0,0 +1,2 @@
+[Document-createElementNS.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/custom-elements/registries/Document-customElementRegistry.html.ini b/tests/wpt/meta/custom-elements/registries/Document-customElementRegistry.html.ini
new file mode 100644
index 00000000000..fc4c3a1d674
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/Document-customElementRegistry.html.ini
@@ -0,0 +1,12 @@
+[Document-customElementRegistry.html]
+  [customElementRegistry on a document should return window.customElements by default]
+    expected: FAIL
+
+  [customElementRegistry on a document without a browsing context should return null]
+    expected: FAIL
+
+  [customElementRegistry on a document of a connected iframe should return contentWindow.customElements]
+    expected: FAIL
+
+  [customElementRegistry on a document of a disconnected iframe should return contentWindow.customElements]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/Document-importNode.html.ini b/tests/wpt/meta/custom-elements/registries/Document-importNode.html.ini
new file mode 100644
index 00000000000..12d4cc44da9
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/Document-importNode.html.ini
@@ -0,0 +1,2 @@
+[Document-importNode.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/custom-elements/registries/Element-customElementRegistry-exceptions.html.ini b/tests/wpt/meta/custom-elements/registries/Element-customElementRegistry-exceptions.html.ini
new file mode 100644
index 00000000000..91d4fac698d
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/Element-customElementRegistry-exceptions.html.ini
@@ -0,0 +1,6 @@
+[Element-customElementRegistry-exceptions.html]
+  [customElementRegistry on a failed custom element created by calling createElement on CustomElementRegistry should return the registry]
+    expected: FAIL
+
+  [customElementRegistry on a failed custom element created by setting innerHTML should return the associated scoped registry]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/Element-customElementRegistry.html.ini b/tests/wpt/meta/custom-elements/registries/Element-customElementRegistry.html.ini
new file mode 100644
index 00000000000..e5a8d9736ea
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/Element-customElementRegistry.html.ini
@@ -0,0 +1,30 @@
+[Element-customElementRegistry.html]
+  [customElementRegistry on a newly constrcuted element should return window.customElements by default]
+    expected: FAIL
+
+  [customElementRegistry on an element inside a declarative shadow DOM should return window.customElements by default]
+    expected: FAIL
+
+  [customElementRegistry on an element inside a declarative shadow DOM with shadowrootcustomelementregistry should return null]
+    expected: FAIL
+
+  [customElementRegistry on a clone of a declarative shadow tree with shadowrootcustomelementregistry should return null]
+    expected: FAIL
+
+  [customElementRegistry on a clone of a declarative shadow tree with shadowrootcustomelementregistry should return the global registry after getting inserted into a document]
+    expected: FAIL
+
+  [customElementRegistry on an element inside a declarative shadow DOM with shadowrootcustomelementregistry should return the scoped registry after calling initialize]
+    expected: FAIL
+
+  [customElementRegistry on a builtin element created by calling createElement on CustomElementRegistry should return the registry]
+    expected: FAIL
+
+  [customElementRegistry on an upgarde candidate created by calling createElement on CustomElementRegistry should return the registry]
+    expected: FAIL
+
+  [customElementRegistry on an unknown element created by calling createElement on CustomElementRegistry should return the registry]
+    expected: FAIL
+
+  [customElementRegistry on a defined custom element created by calling createElement on CustomElementRegistry should return the registry]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/Element-innerHTML.html.ini b/tests/wpt/meta/custom-elements/registries/Element-innerHTML.html.ini
new file mode 100644
index 00000000000..00b7afc465a
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/Element-innerHTML.html.ini
@@ -0,0 +1,6 @@
+[Element-innerHTML.html]
+  [innerHTML on a disconnected element should use the scoped registry it was created with]
+    expected: FAIL
+
+  [innerHTML on an inserted element should continue to use the scoped registry it was created with]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/ShadowRoot-init-customElementRegistry.html.ini b/tests/wpt/meta/custom-elements/registries/ShadowRoot-init-customElementRegistry.html.ini
new file mode 100644
index 00000000000..816737280ed
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/ShadowRoot-init-customElementRegistry.html.ini
@@ -0,0 +1,15 @@
+[ShadowRoot-init-customElementRegistry.html]
+  [A newly attached disconnected ShadowRoot should use the global registry by default]
+    expected: FAIL
+
+  [A newly attached connected ShadowRoot should use the global registry by default]
+    expected: FAIL
+
+  [A newly attached disconnected ShadowRoot should use the scoped registry if explicitly specified in attachShadow]
+    expected: FAIL
+
+  [A newly attached connected ShadowRoot should use the scoped registry if explicitly specified in attachShadow]
+    expected: FAIL
+
+  [attachShadow() should throw for a null customElementRegistry value]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/ShadowRoot-innerHTML.html.ini b/tests/wpt/meta/custom-elements/registries/ShadowRoot-innerHTML.html.ini
new file mode 100644
index 00000000000..b0d227521cd
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/ShadowRoot-innerHTML.html.ini
@@ -0,0 +1,12 @@
+[ShadowRoot-innerHTML.html]
+  [innerHTML on a shadow root should use the scoped registry]
+    expected: FAIL
+
+  [innerHTML on a connected shadow root should use the associated scoped registry]
+    expected: FAIL
+
+  [innerHTML on a connected shadow root should not upgrade a custom element inside a template element]
+    expected: FAIL
+
+  [innerHTML on a connected shadow root should be able to create an unknown element]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/constructor-reentry-with-different-definition.html.ini b/tests/wpt/meta/custom-elements/registries/constructor-reentry-with-different-definition.html.ini
new file mode 100644
index 00000000000..2169b2e7f71
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/constructor-reentry-with-different-definition.html.ini
@@ -0,0 +1,12 @@
+[constructor-reentry-with-different-definition.html]
+  [Re-entry via upgrade before calling super()]
+    expected: FAIL
+
+  [Re-entry via upgrade after calling super()]
+    expected: FAIL
+
+  [Re-entry via direct constructor call before calling super()]
+    expected: FAIL
+
+  [Re-entry via direct constructor call after calling super()]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/initial-about-blank.window.js.ini b/tests/wpt/meta/custom-elements/registries/initial-about-blank.window.js.ini
new file mode 100644
index 00000000000..40b0c57028d
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/initial-about-blank.window.js.ini
@@ -0,0 +1,3 @@
+[initial-about-blank.window.html]
+  [Each navigable document has its own registry]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/custom-element-registry/per-global.html.ini b/tests/wpt/meta/custom-elements/registries/per-global.html.ini
similarity index 100%
rename from tests/wpt/meta/custom-elements/custom-element-registry/per-global.html.ini
rename to tests/wpt/meta/custom-elements/registries/per-global.html.ini
diff --git a/tests/wpt/meta/custom-elements/registries/pseudo-class-defined.window.js.ini b/tests/wpt/meta/custom-elements/registries/pseudo-class-defined.window.js.ini
new file mode 100644
index 00000000000..480bdb54402
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/pseudo-class-defined.window.js.ini
@@ -0,0 +1,9 @@
+[pseudo-class-defined.window.html]
+  ["uncustomized" :defined doesn't care about your registry']
+    expected: FAIL
+
+  ["custom" :defined doesn't care about your registry]
+    expected: FAIL
+
+  [pseudo-class-defined]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/scoped-registry-define-upgrade-criteria.html.ini b/tests/wpt/meta/custom-elements/registries/scoped-registry-define-upgrade-criteria.html.ini
new file mode 100644
index 00000000000..1e2293b249e
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/scoped-registry-define-upgrade-criteria.html.ini
@@ -0,0 +1,33 @@
+[scoped-registry-define-upgrade-criteria.html]
+  [Adding definition to global registry should not affect shadow roots using scoped registry]
+    expected: FAIL
+
+  [Adding definition to scoped registry should affect all associated shadow roots]
+    expected: FAIL
+
+  [Adding definition to scoped registry should not affect document tree scope]
+    expected: FAIL
+
+  [Adding definition to scoped registry should not affect shadow roots using other registries]
+    expected: FAIL
+
+  [Adding definition to global registry should not upgrade nodes no longer using the registry]
+    expected: FAIL
+
+  [Adding definition to scoped registry should not upgrade nodes no longer using the registry]
+    expected: FAIL
+
+  [Adding definition to scoped registry affects associated shadow roots in all iframes]
+    expected: FAIL
+
+  [Adding definition to scoped registry affects associated shadow roots in other frame trees]
+    expected: FAIL
+
+  [Adding definition to scoped registry should not upgrade disconnected elements]
+    expected: FAIL
+
+  [Adding definition to scoped registry should not upgrade nodes in constructed documents]
+    expected: FAIL
+
+  [Adding definition to scoped registry should not upgrade nodes in detached frames]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/scoped-registry-define-upgrade-order.html.ini b/tests/wpt/meta/custom-elements/registries/scoped-registry-define-upgrade-order.html.ini
new file mode 100644
index 00000000000..8fef8d0e42f
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/scoped-registry-define-upgrade-order.html.ini
@@ -0,0 +1,21 @@
+[scoped-registry-define-upgrade-order.html]
+  [Upgrade in tree order in the same tree scope]
+    expected: FAIL
+
+  [Upgrade in shadow-including tree order across tree scopes]
+    expected: FAIL
+
+  [Upgrade order does not depend on shadow root attach order]
+    expected: FAIL
+
+  [Upgrade in association order across documents, then tree order in each document]
+    expected: FAIL
+
+  [Upgrade order is not affected by DOM order between child frames]
+    expected: FAIL
+
+  [Upgrade order is affected by shadow tree adoption across documents]
+    expected: FAIL
+
+  [Elements in the "owner" window of a scoped registry are not always upgraded first]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/scoped-registry-registry-define-get-etc.html.ini b/tests/wpt/meta/custom-elements/registries/scoped-registry-registry-define-get-etc.html.ini
new file mode 100644
index 00000000000..df8446a2f98
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/scoped-registry-registry-define-get-etc.html.ini
@@ -0,0 +1,21 @@
+[scoped-registry-registry-define-get-etc.html]
+  [Custom element registries with a registered custom element return the class in their get method, and the name in their getName method]
+    expected: FAIL
+
+  [Scoped Custom element registries do not inherit names or classes from the global registry]
+    expected: FAIL
+
+  [Scoped Custom element registries return the same constructor when it is defined in both]
+    expected: FAIL
+
+  [Scoped Custom element registries allow registering name that exists in global registry]
+    expected: FAIL
+
+  [Custom element registries with a registered custom element resolve the class in their whenDefined method]
+    expected: FAIL
+
+  [Scoped Custom element registries resolve the same constructor from whenDefined when it is defined in both]
+    expected: FAIL
+
+  [Scoped Custom element registry getters do not resolve globally registered classes from whenDefined]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/registries/template.window.js.ini b/tests/wpt/meta/custom-elements/registries/template.window.js.ini
new file mode 100644
index 00000000000..9f97ee65f99
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/registries/template.window.js.ini
@@ -0,0 +1,9 @@
+[template.window.html]
+  [shadowRootCustomElementRegistry reflects as string]
+    expected: FAIL
+
+  [Serializing a ShadowRoot with a null registry]
+    expected: FAIL
+
+  [Serializing a ShadowRoot with a registry that differs from its host]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/revamped-scoped-registry/Construct.tentative.html.ini b/tests/wpt/meta/custom-elements/revamped-scoped-registry/Construct.tentative.html.ini
deleted file mode 100644
index b05c535fd9e..00000000000
--- a/tests/wpt/meta/custom-elements/revamped-scoped-registry/Construct.tentative.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[Construct.tentative.html]
-  [A constructor with only a scoped custom element registry definition should fail upon construction]
-    expected: FAIL
-
-  [A constructor uses the global registry to create an element]
-    expected: FAIL
-
-  [A constructor creating an element from another registry before or after super call should work]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/revamped-scoped-registry/CustomElementRegistry-define.tentative.html.ini b/tests/wpt/meta/custom-elements/revamped-scoped-registry/CustomElementRegistry-define.tentative.html.ini
deleted file mode 100644
index 9f82a56caf8..00000000000
--- a/tests/wpt/meta/custom-elements/revamped-scoped-registry/CustomElementRegistry-define.tentative.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[CustomElementRegistry-define.tentative.html]
-  [Create a CustomElementRegistry not identically equal to window.customElements]
-    expected: FAIL
-
-  [Defining an element in the global registry does not add a definition to a scoped CustomElementRegistry]
-    expected: FAIL
-
-  [Defining an element in a scoped global registry does not add a definition to the global registry]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/revamped-scoped-registry/CustomElementRegistry-initialize.tentative.html.ini b/tests/wpt/meta/custom-elements/revamped-scoped-registry/CustomElementRegistry-initialize.tentative.html.ini
deleted file mode 100644
index 8cd3cec7495..00000000000
--- a/tests/wpt/meta/custom-elements/revamped-scoped-registry/CustomElementRegistry-initialize.tentative.html.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[CustomElementRegistry-initialize.tentative.html]
-  [initialize is a function on both global and scoped CustomElementRegistry]
-    expected: FAIL
-
-  [initialize sets element.customElements to the global registry]
-    expected: FAIL
-
-  [initialize does not set the registry of nested shadow tree to the global registry]
-    expected: FAIL
-
-  [initialize sets element.customElements to a scoped registry]
-    expected: FAIL
-
-  [initialize does not set the registry of nested shadow tree to a scoped registry]
-    expected: FAIL
-
-  [initialize sets element.customElements permantently]
-    expected: FAIL
-
-  [initialize is no-op on a subtree with a non-null registry]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/revamped-scoped-registry/CustomElementRegistry-upgrade.tentative.html.ini b/tests/wpt/meta/custom-elements/revamped-scoped-registry/CustomElementRegistry-upgrade.tentative.html.ini
deleted file mode 100644
index 365618e2f81..00000000000
--- a/tests/wpt/meta/custom-elements/revamped-scoped-registry/CustomElementRegistry-upgrade.tentative.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[CustomElementRegistry-upgrade.tentative.html]
-  [upgrade is a function on both global and scoped CustomElementRegistry]
-    expected: FAIL
-
-  [upgrade is a no-op when called on a shadow root with no association]
-    expected: FAIL
-
-  [upgrade should upgrade a candidate element when called on a shadow root with an association]
-    expected: FAIL
-
-  [upgrade should not upgrade a candidate element not associated with the registry]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/revamped-scoped-registry/Document-createElement.tentative.html.ini b/tests/wpt/meta/custom-elements/revamped-scoped-registry/Document-createElement.tentative.html.ini
deleted file mode 100644
index 2ce6b5aec9a..00000000000
--- a/tests/wpt/meta/custom-elements/revamped-scoped-registry/Document-createElement.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Document-createElement.tentative.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/custom-elements/revamped-scoped-registry/Document-createElementNS.tentative.html.ini b/tests/wpt/meta/custom-elements/revamped-scoped-registry/Document-createElementNS.tentative.html.ini
deleted file mode 100644
index 80cb597dd8d..00000000000
--- a/tests/wpt/meta/custom-elements/revamped-scoped-registry/Document-createElementNS.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Document-createElementNS.tentative.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/custom-elements/revamped-scoped-registry/Document-importNode.tentative.html.ini b/tests/wpt/meta/custom-elements/revamped-scoped-registry/Document-importNode.tentative.html.ini
deleted file mode 100644
index f80dd2728f0..00000000000
--- a/tests/wpt/meta/custom-elements/revamped-scoped-registry/Document-importNode.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Document-importNode.tentative.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/custom-elements/revamped-scoped-registry/Element-customElements-exceptions.tentative.html.ini b/tests/wpt/meta/custom-elements/revamped-scoped-registry/Element-customElements-exceptions.tentative.html.ini
deleted file mode 100644
index cc6e13e2874..00000000000
--- a/tests/wpt/meta/custom-elements/revamped-scoped-registry/Element-customElements-exceptions.tentative.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[Element-customElements-exceptions.tentative.html]
-  [customElements on a failed custom element created by calling createElement on CustomElementRegistry should return the registry]
-    expected: FAIL
-
-  [customElements on a failed custom element created by setting innerHTML should return the associated scoped registry]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/revamped-scoped-registry/Element-customElements.tentative.html.ini b/tests/wpt/meta/custom-elements/revamped-scoped-registry/Element-customElements.tentative.html.ini
deleted file mode 100644
index 2c27f86fb4c..00000000000
--- a/tests/wpt/meta/custom-elements/revamped-scoped-registry/Element-customElements.tentative.html.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[Element-customElements.tentative.html]
-  [customElements on a newly constrcuted element should return window.customElements by default]
-    expected: FAIL
-
-  [customElements on an element inside a declarative shadow DOM should return window.customElements by default]
-    expected: FAIL
-
-  [customElements on an element inside a declarative shadow DOM with shadowrootcustomelements should return null]
-    expected: FAIL
-
-  [customElements on a clone of a declarative shadow tree with shadowrootcustomelements should return null]
-    expected: FAIL
-
-  [customElements on a clone of a declarative shadow tree with shadowrootcustomelements should return the global registry after getting inserted into a document]
-    expected: FAIL
-
-  [customElements on an element inside a declarative shadow DOM with shadowrootcustomelements should return the scoped registry after calling initialize]
-    expected: FAIL
-
-  [customElements on a builtin element created by calling createElement on CustomElementRegistry should return the registry]
-    expected: FAIL
-
-  [customElements on an upgarde candidate created by calling createElement on CustomElementRegistry should return the registry]
-    expected: FAIL
-
-  [customElements on an unknown element created by calling createElement on CustomElementRegistry should return the registry]
-    expected: FAIL
-
-  [customElements on a defined custom element created by calling createElement on CustomElementRegistry should return the registry]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/revamped-scoped-registry/Element-innerHTML.tentative.html.ini b/tests/wpt/meta/custom-elements/revamped-scoped-registry/Element-innerHTML.tentative.html.ini
deleted file mode 100644
index 838d726b586..00000000000
--- a/tests/wpt/meta/custom-elements/revamped-scoped-registry/Element-innerHTML.tentative.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[Element-innerHTML.tentative.html]
-  [innerHTML on a disconnected element should use the scoped registry it was created with]
-    expected: FAIL
-
-  [innerHTML on an inserted element should continue to use the scoped registry it was created with]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/revamped-scoped-registry/ShadowRoot-init-customElements.tentative.html.ini b/tests/wpt/meta/custom-elements/revamped-scoped-registry/ShadowRoot-init-customElements.tentative.html.ini
deleted file mode 100644
index 5f2579cdb40..00000000000
--- a/tests/wpt/meta/custom-elements/revamped-scoped-registry/ShadowRoot-init-customElements.tentative.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[ShadowRoot-init-customElements.tentative.html]
-  [A newly attached disconnected ShadowRoot should use the global registry by default]
-    expected: FAIL
-
-  [A newly attached connected ShadowRoot should use the global registry by default]
-    expected: FAIL
-
-  [A newly attached disconnected ShadowRoot should use the scoped registry if explicitly specified in attachShadow]
-    expected: FAIL
-
-  [A newly attached connected ShadowRoot should use the scoped registry if explicitly specified in attachShadow]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/revamped-scoped-registry/ShadowRoot-innerHTML.tentative.html.ini b/tests/wpt/meta/custom-elements/revamped-scoped-registry/ShadowRoot-innerHTML.tentative.html.ini
deleted file mode 100644
index 1d83cf7f2e0..00000000000
--- a/tests/wpt/meta/custom-elements/revamped-scoped-registry/ShadowRoot-innerHTML.tentative.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[ShadowRoot-innerHTML.tentative.html]
-  [innerHTML on a shadow root should use the scoped registry]
-    expected: FAIL
-
-  [innerHTML on a connected shadow root should use the associated scoped registry]
-    expected: FAIL
-
-  [innerHTML on a connected shadow root should not upgrade a custom element inside a template element]
-    expected: FAIL
-
-  [innerHTML on a connected shadow root should be able to create an unknown element]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/revamped-scoped-registry/idlharness.tentative.window.js.ini b/tests/wpt/meta/custom-elements/revamped-scoped-registry/idlharness.tentative.window.js.ini
new file mode 100644
index 00000000000..de769452cbf
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/revamped-scoped-registry/idlharness.tentative.window.js.ini
@@ -0,0 +1,42 @@
+[idlharness.tentative.window.html]
+  [idl_test setup]
+    expected: FAIL
+
+  [idl_test validation]
+    expected: FAIL
+
+  [Partial interface CustomElementRegistry: member names are unique]
+    expected: FAIL
+
+  [Partial interface HTMLTemplateElement: member names are unique]
+    expected: FAIL
+
+  [Partial interface Element: member names are unique]
+    expected: FAIL
+
+  [Partial dictionary ShadowRootInit: member names are unique]
+    expected: FAIL
+
+  [Partial dictionary ElementCreationOptions: member names are unique]
+    expected: FAIL
+
+  [Document includes DocumentOrShadowRoot: member names are unique]
+    expected: FAIL
+
+  [ShadowRoot includes DocumentOrShadowRoot: member names are unique]
+    expected: FAIL
+
+  [HTMLTemplateElement interface: attribute shadowRootCustomElementRegistry]
+    expected: FAIL
+
+  [CustomElementRegistry interface: operation initialize(Node)]
+    expected: FAIL
+
+  [Document interface: attribute customElementRegistry]
+    expected: FAIL
+
+  [ShadowRoot interface: attribute customElementRegistry]
+    expected: FAIL
+
+  [Element interface: attribute customElementRegistry]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/revamped-scoped-registry/template.tentative.window.js.ini b/tests/wpt/meta/custom-elements/revamped-scoped-registry/template.tentative.window.js.ini
deleted file mode 100644
index 8646a145051..00000000000
--- a/tests/wpt/meta/custom-elements/revamped-scoped-registry/template.tentative.window.js.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[template.tentative.window.html]
-  [shadowRootCustomElements reflects as string]
-    expected: FAIL
-
-  [Serializing a ShadowRoot with a null registry]
-    expected: FAIL
-
-  [Serializing a ShadowRoot with a registry that differs from its host]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/scoped-registry-initialize.html.ini b/tests/wpt/meta/custom-elements/scoped-registry-initialize.html.ini
new file mode 100644
index 00000000000..6d287fe1563
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/scoped-registry-initialize.html.ini
@@ -0,0 +1,2 @@
+[scoped-registry-initialize.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/custom-elements/scoped-registry/CustomElementRegistry-constructor.tentative.html.ini b/tests/wpt/meta/custom-elements/scoped-registry/CustomElementRegistry-constructor.tentative.html.ini
deleted file mode 100644
index f72d15f7403..00000000000
--- a/tests/wpt/meta/custom-elements/scoped-registry/CustomElementRegistry-constructor.tentative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[CustomElementRegistry-constructor.tentative.html]
-  [Create non-global CustomElementRegistry and add definitions]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/scoped-registry/CustomElementRegistry-multi-register.tentative.html.ini b/tests/wpt/meta/custom-elements/scoped-registry/CustomElementRegistry-multi-register.tentative.html.ini
deleted file mode 100644
index 6823e0597a6..00000000000
--- a/tests/wpt/meta/custom-elements/scoped-registry/CustomElementRegistry-multi-register.tentative.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[CustomElementRegistry-multi-register.tentative.html]
-  [Same constructor can be registered to different registries]
-    expected: FAIL
-
-  [Non-global registries still reject duplicate registrations of the same constructor]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-createElement.tentative.html.ini b/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-createElement.tentative.html.ini
deleted file mode 100644
index 47b3baabc52..00000000000
--- a/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-createElement.tentative.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[ShadowRoot-createElement.tentative.html]
-  [ShadowRoot.createElement() for autonomous custom element]
-    expected: FAIL
-
-  [ShadowRoot.createElementNS() for autonomous custom element]
-    expected: FAIL
-
-  [ShadowRoot.createElement() for customized built-in element]
-    expected: FAIL
-
-  [ShadowRoot.createElementNS() for customized built-in element]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-importNode.tentative.html.ini b/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-importNode.tentative.html.ini
deleted file mode 100644
index f4010b0a634..00000000000
--- a/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-importNode.tentative.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[ShadowRoot-importNode.tentative.html]
-  [ShadowRoot.importNode: an upgrade candidate from document]
-    expected: FAIL
-
-  [ShadowRoot.importNode: a custom element from another shadow tree]
-    expected: FAIL
-
-  [ShadowRoot.importNode: a template content from document]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-init-registry.tentative.html.ini b/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-init-registry.tentative.html.ini
deleted file mode 100644
index 99a20188739..00000000000
--- a/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-init-registry.tentative.html.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[ShadowRoot-init-registry.tentative.html]
-  [ShadowRoot.registry is null if not explicitly specified]
-    expected: FAIL
-
-  [Attach the global registry to a shadow root]
-    expected: FAIL
-
-  [Attach a non-global registry to a shadow root]
-    expected: FAIL
-
-  [Attach the same registry to multiple shadow roots]
-    expected: FAIL
-
-  [Attaching registry to shadow root can only be done during initialization]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-innerHTML-upgrade.tentative.html.ini b/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-innerHTML-upgrade.tentative.html.ini
deleted file mode 100644
index 17c5362cdbb..00000000000
--- a/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-innerHTML-upgrade.tentative.html.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[ShadowRoot-innerHTML-upgrade.tentative.html]
-  [Upgrade into autonomous custom element when inserted via innerHTML]
-    expected: FAIL
-
-  [Upgrade into autonomous custom element when definition is added]
-    expected: FAIL
-
-  [Upgrade into customized built-in element when inserted via innerHTML]
-    expected: FAIL
-
-  [Upgrade into customized built-in element when definition is added]
-    expected: FAIL
-
-  [Upgrade into autonomous custom element should not inherit from global registry for missing values]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-innerHTML.tentative.html.ini b/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-innerHTML.tentative.html.ini
deleted file mode 100644
index 5da135699ed..00000000000
--- a/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-innerHTML.tentative.html.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[ShadowRoot-innerHTML.tentative.html]
-  [innerHTML on a shadow root should use scoped custom element registry]
-    expected: FAIL
-
-  [innerHTML on a disconnected element should use the associated scoped custom element registry]
-    expected: FAIL
-
-  [innerHTML on a connected shadow root should use its scoped custom element]
-    expected: FAIL
-
-  [innerHTML on an inserted element should use the scoped custom element of the ancestor shadow root]
-    expected: FAIL
-
-  [innerHTML should not upgrade a custom element inside a template element]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/scoped-registry/constructor-call.tentative.html.ini b/tests/wpt/meta/custom-elements/scoped-registry/constructor-call.tentative.html.ini
deleted file mode 100644
index ff5133e8e77..00000000000
--- a/tests/wpt/meta/custom-elements/scoped-registry/constructor-call.tentative.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[constructor-call.tentative.html]
-  [Calling custom element constructor directly without global registration should fail]
-    expected: FAIL
-
-  [Calling custom element constructor directly uses global registration only]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/scoped-registry/constructor-reentry-with-different-definition.tentative.html.ini b/tests/wpt/meta/custom-elements/scoped-registry/constructor-reentry-with-different-definition.tentative.html.ini
deleted file mode 100644
index 5a9fc287227..00000000000
--- a/tests/wpt/meta/custom-elements/scoped-registry/constructor-reentry-with-different-definition.tentative.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[constructor-reentry-with-different-definition.tentative.html]
-  [Re-entry via upgrade before calling super()]
-    expected: FAIL
-
-  [Re-entry via upgrade after calling super()]
-    expected: FAIL
-
-  [Re-entry via direct constructor call before calling super()]
-    expected: FAIL
-
-  [Re-entry via direct constructor call after calling super()]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/scoped-registry/scoped-registry-define-upgrade-criteria.tentative.html.ini b/tests/wpt/meta/custom-elements/scoped-registry/scoped-registry-define-upgrade-criteria.tentative.html.ini
deleted file mode 100644
index 430c566a2aa..00000000000
--- a/tests/wpt/meta/custom-elements/scoped-registry/scoped-registry-define-upgrade-criteria.tentative.html.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-[scoped-registry-define-upgrade-criteria.tentative.html]
-  [Adding definition to global registry should not affect shadow roots using scoped registry]
-    expected: FAIL
-
-  [Adding definition to scoped registry should affect all associated shadow roots]
-    expected: FAIL
-
-  [Adding definition to scoped registry should not affect document tree scope]
-    expected: FAIL
-
-  [Adding definition to scoped registry should not affect shadow roots using other registries]
-    expected: FAIL
-
-  [Adding definition to global registry should not upgrade nodes no longer using the registry]
-    expected: FAIL
-
-  [Adding definition to scoped registry should not upgrade nodes no longer using the registry]
-    expected: FAIL
-
-  [Adding definition to scoped registry affects associated shadow roots in all iframes]
-    expected: FAIL
-
-  [Adding definition to scoped registry affects associated shadow roots in other frame trees]
-    expected: FAIL
-
-  [Adding definition to scoped registry should not upgrade disconnected elements]
-    expected: FAIL
-
-  [Adding definition to scoped registry should not upgrade nodes in constructed documents]
-    expected: FAIL
-
-  [Adding definition to scoped registry should not upgrade nodes in detached frames]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/scoped-registry/scoped-registry-define-upgrade-order.tentative.html.ini b/tests/wpt/meta/custom-elements/scoped-registry/scoped-registry-define-upgrade-order.tentative.html.ini
deleted file mode 100644
index 8a6ec8f3e04..00000000000
--- a/tests/wpt/meta/custom-elements/scoped-registry/scoped-registry-define-upgrade-order.tentative.html.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[scoped-registry-define-upgrade-order.tentative.html]
-  [Upgrade in tree order in the same tree scope]
-    expected: FAIL
-
-  [Upgrade in shadow-including tree order across tree scopes]
-    expected: FAIL
-
-  [Upgrade order does not depend on shadow root attach order]
-    expected: FAIL
-
-  [Upgrade in association order across documents, then tree order in each document]
-    expected: FAIL
-
-  [Upgrade order is not affected by DOM order between child frames]
-    expected: FAIL
-
-  [Upgrade order is affected by shadow tree adoption across documents]
-    expected: FAIL
-
-  [Elements in the "owner" window of a scoped registry are not always upgraded first]
-    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/scoped-registry/scoped-registry-registry-define-get-etc.tentative.html.ini b/tests/wpt/meta/custom-elements/scoped-registry/scoped-registry-registry-define-get-etc.tentative.html.ini
deleted file mode 100644
index ef885f7b00b..00000000000
--- a/tests/wpt/meta/custom-elements/scoped-registry/scoped-registry-registry-define-get-etc.tentative.html.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[scoped-registry-registry-define-get-etc.tentative.html]
-  [Custom element registries with a registered custom element return the class in their get method, and the name in their getName method]
-    expected: FAIL
-
-  [Scoped Custom element registries do not inherit names or classes from the global registry]
-    expected: FAIL
-
-  [Scoped Custom element registries return the same constructor when it is defined in both]
-    expected: FAIL
-
-  [Scoped Custom element registries allow registering name that exists in global registry]
-    expected: FAIL
-
-  [Custom element registries with a registered custom element resolve the class in their whenDefined method]
-    expected: FAIL
-
-  [Scoped Custom element registries resolve the same constructor from whenDefined when it is defined in both]
-    expected: FAIL
-
-  [Scoped Custom element registry getters do not resolve globally registered classes from whenDefined]
-    expected: FAIL
diff --git a/tests/wpt/meta/dom/events/Event-dispatch-listener-order.window.js.ini b/tests/wpt/meta/dom/events/Event-dispatch-listener-order.window.js.ini
deleted file mode 100644
index f8f179d9d62..00000000000
--- a/tests/wpt/meta/dom/events/Event-dispatch-listener-order.window.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[Event-dispatch-listener-order.window.html]
-  [Event-dispatch-listener-order]
-    expected: FAIL
diff --git a/tests/wpt/meta/dom/events/event-global.html.ini b/tests/wpt/meta/dom/events/event-global.html.ini
deleted file mode 100644
index 3b073f1a9d6..00000000000
--- a/tests/wpt/meta/dom/events/event-global.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[event-global.html]
-  [window.event is undefined inside window.onerror if the target is in a shadow tree (ErrorEvent dispatched inside shadow tree)]
-    expected: FAIL
diff --git a/tests/wpt/meta/dom/events/remove-all-listeners.html.ini b/tests/wpt/meta/dom/events/remove-all-listeners.html.ini
deleted file mode 100644
index c5607b3918d..00000000000
--- a/tests/wpt/meta/dom/events/remove-all-listeners.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[remove-all-listeners.html]
-  [Removing all listeners and then adding a new one should work.]
-    expected: FAIL
-
-  [Nested usage of once listeners should work.]
-    expected: FAIL
diff --git a/tests/wpt/meta/dom/events/webkit-animation-end-event.html.ini b/tests/wpt/meta/dom/events/webkit-animation-end-event.html.ini
index 3369a3a2a49..5750c2948be 100644
--- a/tests/wpt/meta/dom/events/webkit-animation-end-event.html.ini
+++ b/tests/wpt/meta/dom/events/webkit-animation-end-event.html.ini
@@ -1,28 +1,22 @@
 [webkit-animation-end-event.html]
   expected: TIMEOUT
-  [onanimationend and onwebkitanimationend are not aliases]
-    expected: FAIL
-
   [dispatchEvent of a webkitAnimationEnd event does trigger a prefixed event handler or listener]
     expected: FAIL
 
-  [dispatchEvent of an animationend event does not trigger a prefixed event handler or listener]
-    expected: FAIL
-
   [onwebkitanimationend event handler should trigger for an animation]
-    expected: FAIL
+    expected: TIMEOUT
 
   [onwebkitanimationend event handler should not trigger if an unprefixed event handler also exists]
-    expected: FAIL
+    expected: NOTRUN
 
   [onwebkitanimationend event handler should not trigger if an unprefixed listener also exists]
-    expected: FAIL
+    expected: NOTRUN
 
   [event types for prefixed and unprefixed animationend event handlers should be named appropriately]
-    expected: FAIL
+    expected: NOTRUN
 
   [webkitAnimationEnd event listener should trigger for an animation]
-    expected: TIMEOUT
+    expected: NOTRUN
 
   [webkitAnimationEnd event listener should not trigger if an unprefixed listener also exists]
     expected: NOTRUN
diff --git a/tests/wpt/meta/dom/events/webkit-animation-iteration-event.html.ini b/tests/wpt/meta/dom/events/webkit-animation-iteration-event.html.ini
index 880ef51e59d..233a98ed69b 100644
--- a/tests/wpt/meta/dom/events/webkit-animation-iteration-event.html.ini
+++ b/tests/wpt/meta/dom/events/webkit-animation-iteration-event.html.ini
@@ -1,28 +1,22 @@
 [webkit-animation-iteration-event.html]
   expected: TIMEOUT
-  [onanimationiteration and onwebkitanimationiteration are not aliases]
-    expected: FAIL
-
   [dispatchEvent of a webkitAnimationIteration event does trigger a prefixed event handler or listener]
     expected: FAIL
 
-  [dispatchEvent of an animationiteration event does not trigger a prefixed event handler or listener]
-    expected: FAIL
-
   [onwebkitanimationiteration event handler should trigger for an animation]
-    expected: FAIL
+    expected: TIMEOUT
 
   [onwebkitanimationiteration event handler should not trigger if an unprefixed event handler also exists]
-    expected: FAIL
+    expected: NOTRUN
 
   [onwebkitanimationiteration event handler should not trigger if an unprefixed listener also exists]
-    expected: FAIL
+    expected: NOTRUN
 
   [event types for prefixed and unprefixed animationiteration event handlers should be named appropriately]
-    expected: FAIL
+    expected: NOTRUN
 
   [webkitAnimationIteration event listener should trigger for an animation]
-    expected: TIMEOUT
+    expected: NOTRUN
 
   [webkitAnimationIteration event listener should not trigger if an unprefixed listener also exists]
     expected: NOTRUN
diff --git a/tests/wpt/meta/dom/events/webkit-animation-start-event.html.ini b/tests/wpt/meta/dom/events/webkit-animation-start-event.html.ini
index ca7e2b96918..6e3e5febb82 100644
--- a/tests/wpt/meta/dom/events/webkit-animation-start-event.html.ini
+++ b/tests/wpt/meta/dom/events/webkit-animation-start-event.html.ini
@@ -1,4 +1,5 @@
 [webkit-animation-start-event.html]
+  expected: TIMEOUT
   [onanimationstart and onwebkitanimationstart are not aliases]
     expected: FAIL
 
@@ -8,32 +9,29 @@
   [dispatchEvent of a webkitAnimationStart event does not trigger an unprefixed event handler or listener]
     expected: FAIL
 
-  [dispatchEvent of an animationstart event does not trigger a prefixed event handler or listener]
-    expected: FAIL
-
   [onwebkitanimationstart event handler should trigger for an animation]
-    expected: FAIL
+    expected: TIMEOUT
 
   [onwebkitanimationstart event handler should not trigger if an unprefixed event handler also exists]
-    expected: FAIL
+    expected: NOTRUN
 
   [onwebkitanimationstart event handler should not trigger if an unprefixed listener also exists]
-    expected: FAIL
+    expected: NOTRUN
 
   [event types for prefixed and unprefixed animationstart event handlers should be named appropriately]
-    expected: FAIL
+    expected: NOTRUN
 
   [webkitAnimationStart event listener should trigger for an animation]
-    expected: FAIL
+    expected: NOTRUN
 
   [webkitAnimationStart event listener should not trigger if an unprefixed listener also exists]
-    expected: FAIL
+    expected: NOTRUN
 
   [webkitAnimationStart event listener should not trigger if an unprefixed event handler also exists]
-    expected: FAIL
+    expected: NOTRUN
 
   [event types for prefixed and unprefixed animationstart event listeners should be named appropriately]
-    expected: FAIL
+    expected: NOTRUN
 
   [webkitAnimationStart event listener is case sensitive]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/meta/dom/events/webkit-transition-end-event.html.ini b/tests/wpt/meta/dom/events/webkit-transition-end-event.html.ini
index b7fe8688a23..d1d6814c761 100644
--- a/tests/wpt/meta/dom/events/webkit-transition-end-event.html.ini
+++ b/tests/wpt/meta/dom/events/webkit-transition-end-event.html.ini
@@ -1,27 +1,15 @@
 [webkit-transition-end-event.html]
-  [dispatchEvent of an transitionend event does not trigger a prefixed event handler or listener]
-    expected: FAIL
-
   [onwebkittransitionend event handler should trigger for an animation]
     expected: FAIL
 
-  [onwebkittransitionend event handler should not trigger if an unprefixed listener also exists]
-    expected: FAIL
-
   [event types for prefixed and unprefixed transitionend event handlers should be named appropriately]
     expected: FAIL
 
   [event types for prefixed and unprefixed transitionend event listeners should be named appropriately]
     expected: FAIL
 
-  [ontransitionend and onwebkittransitionend are not aliases]
-    expected: FAIL
-
   [webkitTransitionEnd event listener should trigger for an animation]
     expected: FAIL
 
   [dispatchEvent of a webkitTransitionEnd event does trigger a prefixed event handler or listener]
     expected: FAIL
-
-  [onwebkittransitionend event handler should not trigger if an unprefixed event handler also exists]
-    expected: FAIL
diff --git a/tests/wpt/meta/dom/idlharness.window.js.ini b/tests/wpt/meta/dom/idlharness.window.js.ini
index 0e40be437e7..f66b84985ad 100644
--- a/tests/wpt/meta/dom/idlharness.window.js.ini
+++ b/tests/wpt/meta/dom/idlharness.window.js.ini
@@ -436,3 +436,24 @@
 
   [Element interface: calling moveBefore(Node, Node?) on element with too few arguments must throw TypeError]
     expected: FAIL
+
+  [Document interface: attribute customElementRegistry]
+    expected: FAIL
+
+  [Document interface: new Document() must inherit property "customElementRegistry" with the proper type]
+    expected: FAIL
+
+  [Document interface: xmlDoc must inherit property "customElementRegistry" with the proper type]
+    expected: FAIL
+
+  [ShadowRoot interface: attribute customElementRegistry]
+    expected: FAIL
+
+  [Element interface: attribute customElementRegistry]
+    expected: FAIL
+
+  [Element interface: element must inherit property "customElementRegistry" with the proper type]
+    expected: FAIL
+
+
+[idlharness.window.html?include=Node]
diff --git a/tests/wpt/meta/dom/nodes/adoption.window.js.ini b/tests/wpt/meta/dom/nodes/adoption.window.js.ini
index c7e08cd7b75..e9460c5d5d5 100644
--- a/tests/wpt/meta/dom/nodes/adoption.window.js.ini
+++ b/tests/wpt/meta/dom/nodes/adoption.window.js.ini
@@ -1,12 +1,3 @@
 [adoption.window.html]
-  [appendChild() and DocumentFragment with host]
-    expected: FAIL
-
   [adoptNode() and DocumentFragment with host]
     expected: FAIL
-
-  [appendChild() and DocumentFragment]
-    expected: FAIL
-
-  [appendChild() and ShadowRoot]
-    expected: FAIL
diff --git a/tests/wpt/meta/dom/nodes/insertion-removing-steps/blur-event.window.js.ini b/tests/wpt/meta/dom/nodes/insertion-removing-steps/blur-event.window.js.ini
deleted file mode 100644
index 9b57360d600..00000000000
--- a/tests/wpt/meta/dom/nodes/insertion-removing-steps/blur-event.window.js.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[blur-event.window.html]
-  expected: CRASH
diff --git a/tests/wpt/meta/dom/nodes/moveBefore/tentative/focus-preserve.html.ini b/tests/wpt/meta/dom/nodes/moveBefore/focus-preserve.html.ini
similarity index 100%
rename from tests/wpt/meta/dom/nodes/moveBefore/tentative/focus-preserve.html.ini
rename to tests/wpt/meta/dom/nodes/moveBefore/focus-preserve.html.ini
diff --git a/tests/wpt/meta/dom/observable/tentative/observable-from.any.js.ini b/tests/wpt/meta/dom/observable/tentative/observable-from.any.js.ini
index 2d7096ed7cd..b5247a9905f 100644
--- a/tests/wpt/meta/dom/observable/tentative/observable-from.any.js.ini
+++ b/tests/wpt/meta/dom/observable/tentative/observable-from.any.js.ini
@@ -152,6 +152,9 @@
   [from(): Sync iterable multiple in-flight subscriptions]
     expected: FAIL
 
+  [No error is reported when aborting a subscription to a sync iterator that has no `return()` implementation]
+    expected: FAIL
+
 
 [observable-from.any.html]
   [from(): Observable.from() is a function]
@@ -306,3 +309,6 @@
 
   [from(): Sync iterable multiple in-flight subscriptions]
     expected: FAIL
+
+  [No error is reported when aborting a subscription to a sync iterator that has no `return()` implementation]
+    expected: FAIL
diff --git a/tests/wpt/meta/dom/ranges/Range-cloneContents.html.ini b/tests/wpt/meta/dom/ranges/Range-cloneContents.html.ini
new file mode 100644
index 00000000000..528ddab2bbd
--- /dev/null
+++ b/tests/wpt/meta/dom/ranges/Range-cloneContents.html.ini
@@ -0,0 +1,3 @@
+[Range-cloneContents.html]
+  bug: https://github.com/servo/servo/issues/36561
+  expected: ERROR
diff --git a/tests/wpt/meta/dom/ranges/Range-deleteContents.html.ini b/tests/wpt/meta/dom/ranges/Range-deleteContents.html.ini
new file mode 100644
index 00000000000..9bf099f962d
--- /dev/null
+++ b/tests/wpt/meta/dom/ranges/Range-deleteContents.html.ini
@@ -0,0 +1,3 @@
+[Range-deleteContents.html]
+  bug: https://github.com/servo/servo/issues/36561
+  expected: ERROR
diff --git a/tests/wpt/meta/dom/ranges/Range-extractContents.html.ini b/tests/wpt/meta/dom/ranges/Range-extractContents.html.ini
new file mode 100644
index 00000000000..c6044bf87ef
--- /dev/null
+++ b/tests/wpt/meta/dom/ranges/Range-extractContents.html.ini
@@ -0,0 +1,3 @@
+[Range-extractContents.html]
+  bug: https://github.com/servo/servo/issues/36561
+  expected: ERROR
diff --git a/tests/wpt/meta/dom/ranges/Range-insertNode.html.ini b/tests/wpt/meta/dom/ranges/Range-insertNode.html.ini
new file mode 100644
index 00000000000..365eb5089f0
--- /dev/null
+++ b/tests/wpt/meta/dom/ranges/Range-insertNode.html.ini
@@ -0,0 +1,3 @@
+[Range-insertNode.html]
+  bug: https://github.com/servo/servo/issues/36561
+  expected: ERROR
diff --git a/tests/wpt/meta/dom/ranges/Range-surroundContents.html.ini b/tests/wpt/meta/dom/ranges/Range-surroundContents.html.ini
new file mode 100644
index 00000000000..34eec4d1046
--- /dev/null
+++ b/tests/wpt/meta/dom/ranges/Range-surroundContents.html.ini
@@ -0,0 +1,3 @@
+[Range-surroundContents.html]
+  bug: https://github.com/servo/servo/issues/36561
+  expected: ERROR
diff --git a/tests/wpt/meta/dom/xslt/document-element.window.js.ini b/tests/wpt/meta/dom/xslt/document-element.window.js.ini
new file mode 100644
index 00000000000..b2f6ebba0e2
--- /dev/null
+++ b/tests/wpt/meta/dom/xslt/document-element.window.js.ini
@@ -0,0 +1,2 @@
+[document-element.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/domparsing/XMLSerializer-serializeToString.html.ini b/tests/wpt/meta/domparsing/XMLSerializer-serializeToString.html.ini
index 4aecd0edc6d..ad2c6663e6c 100644
--- a/tests/wpt/meta/domparsing/XMLSerializer-serializeToString.html.ini
+++ b/tests/wpt/meta/domparsing/XMLSerializer-serializeToString.html.ini
@@ -64,3 +64,9 @@
 
   [Check children were included for void elements]
     expected: FAIL
+
+  [Check if a prefix bound to an empty namespace URI ("no namespace") serialize]
+    expected: FAIL
+
+  [Drop inconsistent xmlns="..." by matching on local name]
+    expected: FAIL
diff --git a/tests/wpt/meta/domparsing/xml-parse-serialize-roundtrip.html.ini b/tests/wpt/meta/domparsing/xml-parse-serialize-roundtrip.html.ini
new file mode 100644
index 00000000000..5424089439f
--- /dev/null
+++ b/tests/wpt/meta/domparsing/xml-parse-serialize-roundtrip.html.ini
@@ -0,0 +1,6 @@
+[xml-parse-serialize-roundtrip.html]
+  [DOMParser and XMLSerializer should round trip with CDATA sections: large CDATA]
+    expected: FAIL
+
+  [DOMParser and XMLSerializer should round trip with CDATA sections: multiple CDATAs]
+    expected: FAIL
diff --git a/tests/wpt/meta/eventsource/eventsource-close.window.js.ini b/tests/wpt/meta/eventsource/eventsource-close.window.js.ini
deleted file mode 100644
index ea6c097a2d8..00000000000
--- a/tests/wpt/meta/eventsource/eventsource-close.window.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[eventsource-close.window.html]
-  [EventSource: close(), test events]
-    expected: FAIL
diff --git a/tests/wpt/meta/eventsource/format-field-id-null.window.js.ini b/tests/wpt/meta/eventsource/format-field-id-null.window.js.ini
deleted file mode 100644
index 30d62256c66..00000000000
--- a/tests/wpt/meta/eventsource/format-field-id-null.window.js.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[format-field-id-null.window.html]
-  [EventSource: id field set to %00%00]
-    expected: FAIL
-
-  [EventSource: id field set to x%00]
-    expected: FAIL
-
-  [EventSource: id field set to %00x]
-    expected: FAIL
-
-  [EventSource: id field set to x%00x]
-    expected: FAIL
-
-  [EventSource: id field set to %20%00]
-    expected: FAIL
diff --git a/tests/wpt/meta/eventsource/request-status-error.window.js.ini b/tests/wpt/meta/eventsource/request-status-error.window.js.ini
deleted file mode 100644
index 4ff23e5e5cd..00000000000
--- a/tests/wpt/meta/eventsource/request-status-error.window.js.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[request-status-error.window.html]
-  [EventSource: incorrect HTTP status code (204)]
-    expected: FAIL
-
-  [EventSource: incorrect HTTP status code (205)]
-    expected: FAIL
-
-  [EventSource: incorrect HTTP status code (210)]
-    expected: FAIL
-
-  [EventSource: incorrect HTTP status code (299)]
-    expected: FAIL
-
-  [EventSource: incorrect HTTP status code (404)]
-    expected: FAIL
-
-  [EventSource: incorrect HTTP status code (410)]
-    expected: FAIL
-
-  [EventSource: incorrect HTTP status code (503)]
-    expected: FAIL
diff --git a/tests/wpt/meta/fetch/api/abort/serviceworker-intercepted.https.html.ini b/tests/wpt/meta/fetch/api/abort/serviceworker-intercepted.https.html.ini
index febfa0998f4..a7aa89fab39 100644
--- a/tests/wpt/meta/fetch/api/abort/serviceworker-intercepted.https.html.ini
+++ b/tests/wpt/meta/fetch/api/abort/serviceworker-intercepted.https.html.ini
@@ -1,36 +1,37 @@
 [serviceworker-intercepted.https.html]
+  expected: TIMEOUT
   [Already aborted request does not land in service worker]
-    expected: FAIL
+    expected: TIMEOUT
 
   [response.arrayBuffer() rejects if already aborted]
-    expected: FAIL
+    expected: NOTRUN
 
   [response.blob() rejects if already aborted]
-    expected: FAIL
+    expected: NOTRUN
 
   [response.formData() rejects if already aborted]
-    expected: FAIL
+    expected: NOTRUN
 
   [response.json() rejects if already aborted]
-    expected: FAIL
+    expected: NOTRUN
 
   [response.text() rejects if already aborted]
-    expected: FAIL
+    expected: NOTRUN
 
   [Stream errors once aborted.]
-    expected: FAIL
+    expected: NOTRUN
 
   [fetch() rejects with abort reason]
-    expected: FAIL
+    expected: NOTRUN
 
   [fetch() response body has abort reason]
-    expected: FAIL
+    expected: NOTRUN
 
   [Service Worker can observe the fetch abort and associated abort reason]
-    expected: FAIL
+    expected: NOTRUN
 
   [Abort reason serialization happens on abort]
-    expected: FAIL
+    expected: NOTRUN
 
   [response.bytes() rejects if already aborted]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/api/basic/request-headers.any.js.ini b/tests/wpt/meta/fetch/api/basic/request-headers.any.js.ini
index e3b527a93a9..e9339a86d21 100644
--- a/tests/wpt/meta/fetch/api/basic/request-headers.any.js.ini
+++ b/tests/wpt/meta/fetch/api/basic/request-headers.any.js.ini
@@ -5,16 +5,10 @@
   expected: ERROR
 
 [request-headers.any.html]
-  [Fetch with POST with FormData body]
-    expected: FAIL
-
   [Fetch with POST with Float16Array body]
     expected: FAIL
 
 
 [request-headers.any.worker.html]
-  [Fetch with POST with FormData body]
-    expected: FAIL
-
   [Fetch with POST with Float16Array body]
     expected: FAIL
diff --git a/tests/wpt/meta/fetch/api/basic/text-utf8.any.js.ini b/tests/wpt/meta/fetch/api/basic/text-utf8.any.js.ini
index 4a8e2275aca..6f7d3185d2c 100644
--- a/tests/wpt/meta/fetch/api/basic/text-utf8.any.js.ini
+++ b/tests/wpt/meta/fetch/api/basic/text-utf8.any.js.ini
@@ -1,30 +1,6 @@
 [text-utf8.any.html]
-  [UTF-8 with BOM with Request.text()]
-    expected: FAIL
-
-  [UTF-8 with BOM with fetched data (UTF-16 charset)]
-    expected: FAIL
-
-  [UTF-8 with BOM with fetched data (UTF-8 charset)]
-    expected: FAIL
-
-  [UTF-8 with BOM with Response.text()]
-    expected: FAIL
-
 
 [text-utf8.any.worker.html]
-  [UTF-8 with BOM with Request.text()]
-    expected: FAIL
-
-  [UTF-8 with BOM with fetched data (UTF-16 charset)]
-    expected: FAIL
-
-  [UTF-8 with BOM with fetched data (UTF-8 charset)]
-    expected: FAIL
-
-  [UTF-8 with BOM with Response.text()]
-    expected: FAIL
-
 
 [text-utf8.any.serviceworker.html]
   expected: ERROR
diff --git a/tests/wpt/meta/fetch/api/cors/cors-preflight.any.js.ini b/tests/wpt/meta/fetch/api/cors/cors-preflight.any.js.ini
deleted file mode 100644
index 6cb85679e81..00000000000
--- a/tests/wpt/meta/fetch/api/cors/cors-preflight.any.js.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[cors-preflight.any.html]
-  [CORS [GET\] [several headers\], server allows]
-    expected: FAIL
-
-  [CORS [PUT\] [several headers\], server allows]
-    expected: FAIL
-
-
-[cors-preflight.any.worker.html]
-  [CORS [GET\] [several headers\], server allows]
-    expected: FAIL
-
-  [CORS [PUT\] [several headers\], server allows]
-    expected: FAIL
diff --git a/tests/wpt/meta/fetch/api/idlharness.any.js.ini b/tests/wpt/meta/fetch/api/idlharness.any.js.ini
index 44d299531ad..58df7ba3188 100644
--- a/tests/wpt/meta/fetch/api/idlharness.any.js.ini
+++ b/tests/wpt/meta/fetch/api/idlharness.any.js.ini
@@ -29,12 +29,6 @@
   [Request interface: new Request('about:blank') must inherit property "duplex" with the proper type]
     expected: FAIL
 
-  [Response interface: operation json(any, optional ResponseInit)]
-    expected: FAIL
-
-  [Response interface: calling json(any, optional ResponseInit) on new Response() with too few arguments must throw TypeError]
-    expected: FAIL
-
 
 [idlharness.any.sharedworker.html]
   expected: ERROR
@@ -70,12 +64,6 @@
   [Request interface: new Request('about:blank') must inherit property "duplex" with the proper type]
     expected: FAIL
 
-  [Response interface: operation json(any, optional ResponseInit)]
-    expected: FAIL
-
-  [Response interface: calling json(any, optional ResponseInit) on new Response() with too few arguments must throw TypeError]
-    expected: FAIL
-
 
 [idlharness.any.serviceworker.html]
   expected: ERROR
diff --git a/tests/wpt/meta/fetch/api/policies/csp-blocked-worker.html.ini b/tests/wpt/meta/fetch/api/policies/csp-blocked-worker.html.ini
deleted file mode 100644
index 4488e49c2e8..00000000000
--- a/tests/wpt/meta/fetch/api/policies/csp-blocked-worker.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[csp-blocked-worker.html]
-  [Fetch is blocked by CSP, got a TypeError]
-    expected: FAIL
diff --git a/tests/wpt/meta/fetch/api/request/request-init-contenttype.any.js.ini b/tests/wpt/meta/fetch/api/request/request-init-contenttype.any.js.ini
deleted file mode 100644
index b1565a4387a..00000000000
--- a/tests/wpt/meta/fetch/api/request/request-init-contenttype.any.js.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[request-init-contenttype.any.worker.html]
-  [Default Content-Type for Request with FormData body]
-    expected: FAIL
-
-
-[request-init-contenttype.any.html]
-  [Default Content-Type for Request with FormData body]
-    expected: FAIL
diff --git a/tests/wpt/meta/fetch/api/response/response-consume.html.ini b/tests/wpt/meta/fetch/api/response/response-consume.html.ini
index 0334fb9eab6..535ac79d5dc 100644
--- a/tests/wpt/meta/fetch/api/response/response-consume.html.ini
+++ b/tests/wpt/meta/fetch/api/response/response-consume.html.ini
@@ -16,3 +16,6 @@
 
   [Consume response's body: from multipart form data blob to formData]
     expected: FAIL
+
+  [Consume response's body: from FormData to blob]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/api/response/response-init-contenttype.any.js.ini b/tests/wpt/meta/fetch/api/response/response-init-contenttype.any.js.ini
deleted file mode 100644
index e33088cb4f4..00000000000
--- a/tests/wpt/meta/fetch/api/response/response-init-contenttype.any.js.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[response-init-contenttype.any.worker.html]
-  [Default Content-Type for Response with FormData body]
-    expected: FAIL
-
-
-[response-init-contenttype.any.html]
-  [Default Content-Type for Response with FormData body]
-    expected: FAIL
diff --git a/tests/wpt/meta/fetch/api/response/response-static-json.any.js.ini b/tests/wpt/meta/fetch/api/response/response-static-json.any.js.ini
index 580482226f0..830bfcd339c 100644
--- a/tests/wpt/meta/fetch/api/response/response-static-json.any.js.ini
+++ b/tests/wpt/meta/fetch/api/response/response-static-json.any.js.ini
@@ -1,73 +1,3 @@
-[response-static-json.any.worker.html]
-  [Check response returned by static json() with init undefined]
-    expected: FAIL
-
-  [Check response returned by static json() with init {"status":400}]
-    expected: FAIL
-
-  [Check response returned by static json() with init {"statusText":"foo"}]
-    expected: FAIL
-
-  [Check response returned by static json() with init {"headers":{}}]
-    expected: FAIL
-
-  [Check response returned by static json() with init {"headers":{"content-type":"foo/bar"}}]
-    expected: FAIL
-
-  [Check response returned by static json() with init {"headers":{"x-foo":"bar"}}]
-    expected: FAIL
-
-  [Check static json() encodes JSON objects correctly]
-    expected: FAIL
-
-  [Check static json() propagates JSON serializer errors]
-    expected: FAIL
-
-  [Check response returned by static json() with input 𝌆]
-    expected: FAIL
-
-  [Check response returned by static json() with input U+df06U+d834]
-    expected: FAIL
-
-  [Check response returned by static json() with input U+dead]
-    expected: FAIL
-
-
-[response-static-json.any.html]
-  [Check response returned by static json() with init undefined]
-    expected: FAIL
-
-  [Check response returned by static json() with init {"status":400}]
-    expected: FAIL
-
-  [Check response returned by static json() with init {"statusText":"foo"}]
-    expected: FAIL
-
-  [Check response returned by static json() with init {"headers":{}}]
-    expected: FAIL
-
-  [Check response returned by static json() with init {"headers":{"content-type":"foo/bar"}}]
-    expected: FAIL
-
-  [Check response returned by static json() with init {"headers":{"x-foo":"bar"}}]
-    expected: FAIL
-
-  [Check static json() encodes JSON objects correctly]
-    expected: FAIL
-
-  [Check static json() propagates JSON serializer errors]
-    expected: FAIL
-
-  [Check response returned by static json() with input 𝌆]
-    expected: FAIL
-
-  [Check response returned by static json() with input U+df06U+d834]
-    expected: FAIL
-
-  [Check response returned by static json() with input U+dead]
-    expected: FAIL
-
-
 [response-static-json.any.sharedworker.html]
   expected: ERROR
 
diff --git a/tests/wpt/meta/fetch/cross-origin-resource-policy/scheme-restriction.https.window.js.ini b/tests/wpt/meta/fetch/cross-origin-resource-policy/scheme-restriction.https.window.js.ini
new file mode 100644
index 00000000000..785342547b9
--- /dev/null
+++ b/tests/wpt/meta/fetch/cross-origin-resource-policy/scheme-restriction.https.window.js.ini
@@ -0,0 +1,3 @@
+[scheme-restriction.https.window.html]
+  [Cross-Origin-Resource-Policy does not block Mixed Content <img>]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/http-cache/no-vary-search.tentative.any.js.ini b/tests/wpt/meta/fetch/http-cache/no-vary-search.tentative.any.js.ini
new file mode 100644
index 00000000000..c72fab80f3d
--- /dev/null
+++ b/tests/wpt/meta/fetch/http-cache/no-vary-search.tentative.any.js.ini
@@ -0,0 +1,21 @@
+[no-vary-search.tentative.any.html]
+  [When params is set to true, URL differs only by their parameters (other than `dispatch` and `uuid`) should not be cached as different entries.]
+    expected: FAIL
+
+  [When key-order is set , URLs should be compared in an order-insensitive way. Matched cases:]
+    expected: FAIL
+
+
+[no-vary-search.tentative.any.sharedworker.html]
+  expected: ERROR
+
+[no-vary-search.tentative.any.worker.html]
+  [When params is set to true, URL differs only by their parameters (other than `dispatch` and `uuid`) should not be cached as different entries.]
+    expected: FAIL
+
+  [When key-order is set , URLs should be compared in an order-insensitive way. Matched cases:]
+    expected: FAIL
+
+
+[no-vary-search.tentative.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/fetch/http-cache/pragma-no-cache-with-cache-control.html.ini b/tests/wpt/meta/fetch/http-cache/pragma-no-cache-with-cache-control.html.ini
new file mode 100644
index 00000000000..5e3ad18d789
--- /dev/null
+++ b/tests/wpt/meta/fetch/http-cache/pragma-no-cache-with-cache-control.html.ini
@@ -0,0 +1,3 @@
+[pragma-no-cache-with-cache-control.html]
+  [Response with Cache-Control: max-age=2592000, public and Pragma: no-cache should be cached]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/css-font-face.https.sub.tentative.html.ini b/tests/wpt/meta/fetch/metadata/generated/css-font-face.https.sub.tentative.html.ini
index d471ef76873..12a2314e747 100644
--- a/tests/wpt/meta/fetch/metadata/generated/css-font-face.https.sub.tentative.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/css-font-face.https.sub.tentative.html.ini
@@ -44,9 +44,6 @@
   [sec-fetch-mode]
     expected: FAIL
 
-  [sec-fetch-user]
-    expected: FAIL
-
   [sec-fetch-dest]
     expected: FAIL
 
@@ -55,3 +52,6 @@
 
   [sec-fetch-storage-access - Cross-site]
     expected: FAIL
+
+  [sec-fetch-user]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/header-refresh.https.optional.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/header-refresh.https.optional.sub.html.ini
index b4aa17447bc..35af8ed67c7 100644
--- a/tests/wpt/meta/fetch/metadata/generated/header-refresh.https.optional.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/header-refresh.https.optional.sub.html.ini
@@ -1,61 +1,33 @@
 [header-refresh.https.optional.sub.html]
-  expected: TIMEOUT
-  [sec-fetch-site - Same origin]
-    expected: TIMEOUT
-
   [sec-fetch-site - Cross-site]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same site]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Cross-Site -> Same-Origin redirect]
-    expected: NOTRUN
-
-  [sec-fetch-site - Same-Origin -> Same-Site -> Same-Origin redirect]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Cross-Site -> Same Origin]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Cross-Site -> Same-Site]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Cross-Site -> Cross-Site]
-    expected: NOTRUN
-
-  [sec-fetch-site - Same-Origin -> Same Origin]
-    expected: NOTRUN
-
-  [sec-fetch-site - Same-Origin -> Same-Site]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Cross-Site]
-    expected: NOTRUN
-
-  [sec-fetch-site - Same-Site -> Same Origin]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Site -> Same-Site]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Site -> Cross-Site]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - HTTPS downgrade-upgrade]
-    expected: NOTRUN
-
-  [sec-fetch-mode]
-    expected: NOTRUN
-
-  [sec-fetch-dest]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-user]
-    expected: NOTRUN
-
-  [sec-fetch-storage-access - Cross-site]
-    expected: NOTRUN
-
-  [sec-fetch-storage-access - Same site]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/header-refresh.optional.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/header-refresh.optional.sub.html.ini
index deb8331cdf8..97d7fc206a3 100644
--- a/tests/wpt/meta/fetch/metadata/generated/header-refresh.optional.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/header-refresh.optional.sub.html.ini
@@ -1,55 +1,9 @@
 [header-refresh.optional.sub.html]
-  expected: TIMEOUT
-  [sec-fetch-site - Not sent to non-trustworthy same-origin destination]
-    expected: TIMEOUT
-
-  [sec-fetch-site - Not sent to non-trustworthy same-site destination]
-    expected: NOTRUN
-
-  [sec-fetch-site - Not sent to non-trustworthy cross-site destination]
-    expected: NOTRUN
-
-  [sec-fetch-mode - Not sent to non-trustworthy same-origin destination]
-    expected: NOTRUN
-
-  [sec-fetch-mode - Not sent to non-trustworthy same-site destination]
-    expected: NOTRUN
-
-  [sec-fetch-mode - Not sent to non-trustworthy cross-site destination]
-    expected: NOTRUN
-
-  [sec-fetch-dest - Not sent to non-trustworthy same-origin destination]
-    expected: NOTRUN
-
-  [sec-fetch-dest - Not sent to non-trustworthy same-site destination]
-    expected: NOTRUN
-
-  [sec-fetch-dest - Not sent to non-trustworthy cross-site destination]
-    expected: NOTRUN
-
-  [sec-fetch-user - Not sent to non-trustworthy same-origin destination]
-    expected: NOTRUN
-
-  [sec-fetch-user - Not sent to non-trustworthy same-site destination]
-    expected: NOTRUN
-
-  [sec-fetch-user - Not sent to non-trustworthy cross-site destination]
-    expected: NOTRUN
-
   [sec-fetch-site - HTTPS downgrade (header not sent)]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - HTTPS upgrade]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - HTTPS downgrade-upgrade]
-    expected: NOTRUN
-
-  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
-    expected: NOTRUN
-
-  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
-    expected: NOTRUN
-
-  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/serviceworker.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/serviceworker.https.sub.html.ini
index 9cc084c6449..107c1fb1a6c 100644
--- a/tests/wpt/meta/fetch/metadata/generated/serviceworker.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/serviceworker.https.sub.html.ini
@@ -1,30 +1,31 @@
 [serviceworker.https.sub.html]
-  [sec-fetch-site - Same origin, no options - registration]
-    expected: FAIL
-
+  expected: ERROR
   [sec-fetch-site - Same origin, no options - updating]
-    expected: FAIL
+    expected: NOTRUN
 
   [sec-fetch-mode - options: type=classic - registration]
-    expected: FAIL
+    expected: NOTRUN
 
   [sec-fetch-mode - options: type=classic - updating]
-    expected: FAIL
+    expected: NOTRUN
 
   [sec-fetch-mode - no options - registration]
-    expected: FAIL
+    expected: NOTRUN
 
   [sec-fetch-mode - no options - updating]
-    expected: FAIL
+    expected: NOTRUN
 
   [sec-fetch-dest - no options - registration]
-    expected: FAIL
+    expected: NOTRUN
 
   [sec-fetch-dest - no options - updating]
-    expected: FAIL
+    expected: NOTRUN
 
   [sec-fetch-user - no options - registration]
-    expected: FAIL
+    expected: NOTRUN
 
   [sec-fetch-user - no options - updating]
+    expected: NOTRUN
+
+  [sec-fetch-site - Same origin, no options - registration]
     expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/svg-image.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/svg-image.https.sub.html.ini
index 5d85add7f82..1e547ae5f21 100644
--- a/tests/wpt/meta/fetch/metadata/generated/svg-image.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/svg-image.https.sub.html.ini
@@ -1,70 +1,69 @@
 [svg-image.https.sub.html]
-  expected: TIMEOUT
   [sec-fetch-site - Same origin no attributes]
-    expected: TIMEOUT
+    expected: FAIL
 
   [sec-fetch-site - Cross-site no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same site no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Cross-Site -> Same-Origin redirect no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Same-Site -> Same-Origin redirect no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Cross-Site -> Same Origin no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Cross-Site -> Same-Site no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Cross-Site -> Cross-Site no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Same Origin no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Same-Site no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Cross-Site no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Site -> Same Origin no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Site -> Same-Site no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Site -> Cross-Site no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - HTTPS downgrade-upgrade no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-mode no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-mode attributes: crossorigin]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-mode attributes: crossorigin=anonymous]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-mode attributes: crossorigin=use-credentials]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-dest no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-user no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-storage-access - Cross-site no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-storage-access - Same site no attributes]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/svg-image.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/svg-image.sub.html.ini
index dc3a74db79c..cec7a0548b1 100644
--- a/tests/wpt/meta/fetch/metadata/generated/svg-image.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/svg-image.sub.html.ini
@@ -1,55 +1,54 @@
 [svg-image.sub.html]
-  expected: TIMEOUT
   [sec-fetch-site - Not sent to non-trustworthy same-origin destination no attributes]
-    expected: TIMEOUT
+    expected: FAIL
 
   [sec-fetch-site - Not sent to non-trustworthy same-site destination no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Not sent to non-trustworthy cross-site destination no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-mode - Not sent to non-trustworthy same-origin destination no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-mode - Not sent to non-trustworthy same-site destination no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-mode - Not sent to non-trustworthy cross-site destination no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-dest - Not sent to non-trustworthy same-origin destination no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-dest - Not sent to non-trustworthy same-site destination no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-dest - Not sent to non-trustworthy cross-site destination no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-user - Not sent to non-trustworthy same-origin destination no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-user - Not sent to non-trustworthy same-site destination no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-user - Not sent to non-trustworthy cross-site destination no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - HTTPS downgrade (header not sent) no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - HTTPS upgrade no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - HTTPS downgrade-upgrade no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination no attributes]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/report.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/report.https.sub.html.ini
index 058151d81ce..0348be9f384 100644
--- a/tests/wpt/meta/fetch/metadata/report.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/report.https.sub.html.ini
@@ -1,2 +1,10 @@
 [report.https.sub.html]
-  expected: TIMEOUT
+  expected: ERROR
+  [same-origin report]
+    expected: TIMEOUT
+
+  [same-site report]
+    expected: TIMEOUT
+
+  [cross-site report]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/fetch/metadata/trailing-dot.https.sub.any.js.ini b/tests/wpt/meta/fetch/metadata/trailing-dot.https.sub.any.js.ini
index c52790a949e..c1466f6ca10 100644
--- a/tests/wpt/meta/fetch/metadata/trailing-dot.https.sub.any.js.ini
+++ b/tests/wpt/meta/fetch/metadata/trailing-dot.https.sub.any.js.ini
@@ -8,36 +8,18 @@
   [Fetching a resource from the same origin, but spelled with a trailing dot.]
     expected: FAIL
 
-  [Fetching a resource from the same origin, but spelled with a trailing dot.: sec-fetch-dest]
-    expected: FAIL
-
-  [Fetching a resource from the same origin, but spelled with a trailing dot.: sec-fetch-mode]
-    expected: FAIL
-
   [Fetching a resource from the same origin, but spelled with a trailing dot.: sec-fetch-site]
     expected: FAIL
 
   [Fetching a resource from the same site, but spelled with a trailing dot.]
     expected: FAIL
 
-  [Fetching a resource from the same site, but spelled with a trailing dot.: sec-fetch-dest]
-    expected: FAIL
-
-  [Fetching a resource from the same site, but spelled with a trailing dot.: sec-fetch-mode]
-    expected: FAIL
-
   [Fetching a resource from the same site, but spelled with a trailing dot.: sec-fetch-site]
     expected: FAIL
 
   [Fetching a resource from a cross-site host, spelled with a trailing dot.]
     expected: FAIL
 
-  [Fetching a resource from a cross-site host, spelled with a trailing dot.: sec-fetch-dest]
-    expected: FAIL
-
-  [Fetching a resource from a cross-site host, spelled with a trailing dot.: sec-fetch-mode]
-    expected: FAIL
-
   [Fetching a resource from a cross-site host, spelled with a trailing dot.: sec-fetch-site]
     expected: FAIL
 
@@ -46,35 +28,17 @@
   [Fetching a resource from the same origin, but spelled with a trailing dot.]
     expected: FAIL
 
-  [Fetching a resource from the same origin, but spelled with a trailing dot.: sec-fetch-dest]
-    expected: FAIL
-
-  [Fetching a resource from the same origin, but spelled with a trailing dot.: sec-fetch-mode]
-    expected: FAIL
-
   [Fetching a resource from the same origin, but spelled with a trailing dot.: sec-fetch-site]
     expected: FAIL
 
   [Fetching a resource from the same site, but spelled with a trailing dot.]
     expected: FAIL
 
-  [Fetching a resource from the same site, but spelled with a trailing dot.: sec-fetch-dest]
-    expected: FAIL
-
-  [Fetching a resource from the same site, but spelled with a trailing dot.: sec-fetch-mode]
-    expected: FAIL
-
   [Fetching a resource from the same site, but spelled with a trailing dot.: sec-fetch-site]
     expected: FAIL
 
   [Fetching a resource from a cross-site host, spelled with a trailing dot.]
     expected: FAIL
 
-  [Fetching a resource from a cross-site host, spelled with a trailing dot.: sec-fetch-dest]
-    expected: FAIL
-
-  [Fetching a resource from a cross-site host, spelled with a trailing dot.: sec-fetch-mode]
-    expected: FAIL
-
   [Fetching a resource from a cross-site host, spelled with a trailing dot.: sec-fetch-site]
     expected: FAIL
diff --git a/tests/wpt/meta/fetch/private-network-access/fenced-frame-no-preflight-required.tentative.https.window.js.ini b/tests/wpt/meta/fetch/private-network-access/fenced-frame-no-preflight-required.tentative.https.window.js.ini
deleted file mode 100644
index be584798c00..00000000000
--- a/tests/wpt/meta/fetch/private-network-access/fenced-frame-no-preflight-required.tentative.https.window.js.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-[fenced-frame-no-preflight-required.tentative.https.window.html]
-  [local to local: no preflight required.]
-    expected: FAIL
-
-  [local to private: no preflight required.]
-    expected: FAIL
-
-  [local to public: no preflight required.]
-    expected: FAIL
-
-  [private to private: no preflight required.]
-    expected: FAIL
-
-  [private to public: no preflight required.]
-    expected: FAIL
-
-  [public to public: no preflight required.]
-    expected: FAIL
-
-  [treat-as-public-address to public: no preflight required.]
-    expected: FAIL
-
-  [treat-as-public-address to local: optional preflight]
-    expected: FAIL
diff --git a/tests/wpt/meta/fetch/private-network-access/fenced-frame-subresource-fetch.tentative.https.window.js.ini b/tests/wpt/meta/fetch/private-network-access/fenced-frame-subresource-fetch.tentative.https.window.js.ini
deleted file mode 100644
index 1f4659eeecf..00000000000
--- a/tests/wpt/meta/fetch/private-network-access/fenced-frame-subresource-fetch.tentative.https.window.js.ini
+++ /dev/null
@@ -1,120 +0,0 @@
-[fenced-frame-subresource-fetch.tentative.https.window.html?include=from-public]
-  [public to local: failed preflight.]
-    expected: FAIL
-
-  [public to local: missing CORS headers on preflight response.]
-    expected: FAIL
-
-  [public to local: missing PNA header on preflight response.]
-    expected: FAIL
-
-  [public to local: missing CORS headers on final response.]
-    expected: FAIL
-
-  [public to local: success.]
-    expected: FAIL
-
-  [public to local: PUT success.]
-    expected: FAIL
-
-  [public to local: no-CORS mode failed preflight.]
-    expected: FAIL
-
-  [public to local: no-CORS mode missing CORS headers on preflight response.]
-    expected: FAIL
-
-  [public to local: no-CORS mode missing PNA header on preflight response.]
-    expected: FAIL
-
-  [public to local: no-CORS mode success.]
-    expected: FAIL
-
-  [public to private: failed preflight.]
-    expected: FAIL
-
-  [public to private: missing CORS headers on preflight response.]
-    expected: FAIL
-
-  [public to private: missing PNA header on preflight response.]
-    expected: FAIL
-
-  [public to private: missing CORS headers on final response.]
-    expected: FAIL
-
-  [public to private: success.]
-    expected: FAIL
-
-  [public to private: PUT success.]
-    expected: FAIL
-
-  [public to private: no-CORS mode failed preflight.]
-    expected: FAIL
-
-  [public to private: no-CORS mode missing CORS headers on preflight response.]
-    expected: FAIL
-
-  [public to private: no-CORS mode missing PNA header on preflight response.]
-    expected: FAIL
-
-  [public to private: no-CORS mode success.]
-    expected: FAIL
-
-  [public to public: no preflight required.]
-    expected: FAIL
-
-
-[fenced-frame-subresource-fetch.tentative.https.window.html?include=baseline]
-  [local to public: PUT preflight failure.]
-    expected: FAIL
-
-  [local to public: PUT preflight success.]
-    expected: FAIL
-
-
-[fenced-frame-subresource-fetch.tentative.https.window.html?include=from-private]
-  [private to local: failed preflight.]
-    expected: FAIL
-
-  [private to local: missing CORS headers on preflight response.]
-    expected: FAIL
-
-  [private to local: missing PNA header on preflight response.]
-    expected: FAIL
-
-  [private to local: missing CORS headers on final response.]
-    expected: FAIL
-
-  [private to local: success.]
-    expected: FAIL
-
-  [private to local: PUT success.]
-    expected: FAIL
-
-  [private to local: no-CORS mode failed preflight.]
-    expected: FAIL
-
-  [private to local: no-CORS mode missing CORS headers on preflight response.]
-    expected: FAIL
-
-  [private to local: no-CORS mode missing PNA header on preflight response.]
-    expected: FAIL
-
-  [private to local: no-CORS mode success.]
-    expected: FAIL
-
-  [private to private: no preflight required.]
-    expected: FAIL
-
-  [private to public: no preflight required.]
-    expected: FAIL
-
-
-[fenced-frame-subresource-fetch.tentative.https.window.html?include=from-local]
-  [local to local: no preflight required.]
-    expected: FAIL
-
-  [local to private: no preflight required.]
-    expected: FAIL
-
-  [local to public: no preflight required.]
-    expected: FAIL
diff --git a/tests/wpt/meta/fetch/private-network-access/fenced-frame.tentative.https.window.js.ini b/tests/wpt/meta/fetch/private-network-access/fenced-frame.tentative.https.window.js.ini
deleted file mode 100644
index 0c683c9cbb7..00000000000
--- a/tests/wpt/meta/fetch/private-network-access/fenced-frame.tentative.https.window.js.ini
+++ /dev/null
@@ -1,63 +0,0 @@
-[fenced-frame.tentative.https.window.html]
-  [private to local: failed preflight.]
-    expected: FAIL
-
-  [private to local: missing CORS headers.]
-    expected: FAIL
-
-  [private to local: missing PNA header.]
-    expected: FAIL
-
-  [private to local: failed because fenced frames are incompatible with PNA.]
-    expected: FAIL
-
-  [public to local: failed preflight.]
-    expected: FAIL
-
-  [public to local: missing CORS headers.]
-    expected: FAIL
-
-  [public to local: missing PNA header.]
-    expected: FAIL
-
-  [public to local: failed because fenced frames are incompatible with PNA.]
-    expected: FAIL
-
-  [public to private: failed preflight.]
-    expected: FAIL
-
-  [public to private: missing CORS headers.]
-    expected: FAIL
-
-  [public to private: missing PNA header.]
-    expected: FAIL
-
-  [public to private: failed because fenced frames are incompatible with PNA.]
-    expected: FAIL
-
-  [treat-as-public-address to local: failed preflight.]
-    expected: FAIL
-
-  [treat-as-public-address to local: missing CORS headers.]
-    expected: FAIL
-
-  [treat-as-public-address to local: missing PNA header.]
-    expected: FAIL
-
-  [treat-as-public-address to local: failed because fenced frames are incompatible with PNA.]
-    expected: FAIL
-
-  [treat-as-public-address to local (same-origin): fenced frame embedder initiated navigation has opaque origin.]
-    expected: FAIL
-
-  [treat-as-public-address to private: failed preflight.]
-    expected: FAIL
-
-  [treat-as-public-address to private: missing CORS headers.]
-    expected: FAIL
-
-  [treat-as-public-address to private: missing PNA header.]
-    expected: FAIL
-
-  [treat-as-public-address to private: failed because fenced frames are incompatible with PNA.]
-    expected: FAIL
diff --git a/tests/wpt/meta/fetch/private-network-access/mixed-content-fetch.tentative.https.window.js.ini b/tests/wpt/meta/fetch/private-network-access/mixed-content-fetch.tentative.https.window.js.ini
index 061d0a797f4..695ae5a48a0 100644
--- a/tests/wpt/meta/fetch/private-network-access/mixed-content-fetch.tentative.https.window.js.ini
+++ b/tests/wpt/meta/fetch/private-network-access/mixed-content-fetch.tentative.https.window.js.ini
@@ -133,3 +133,24 @@
 
   [https-treat-as-public to http-private: success.]
     expected: FAIL
+
+  [https-private to http-local: PUT success.]
+    expected: FAIL
+
+  [https-private to http-local: no-cors success.]
+    expected: FAIL
+
+  [https-public to http-local: PUT success.]
+    expected: FAIL
+
+  [https-public to http-local: no-cors success.]
+    expected: FAIL
+
+  [https-public to http-private: PUT success.]
+    expected: FAIL
+
+  [https-public to http-private: no-cors success.]
+    expected: FAIL
+
+  [https-treat-as-public to http-local: success.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/private-network-access/service-worker-background-fetch.tentative.https.window.js.ini b/tests/wpt/meta/fetch/private-network-access/service-worker-background-fetch.tentative.https.window.js.ini
index b09cde66b85..2005387aadd 100644
--- a/tests/wpt/meta/fetch/private-network-access/service-worker-background-fetch.tentative.https.window.js.ini
+++ b/tests/wpt/meta/fetch/private-network-access/service-worker-background-fetch.tentative.https.window.js.ini
@@ -1,28 +1,27 @@
 [service-worker-background-fetch.tentative.https.window.html]
-  expected: TIMEOUT
   [local to local: success.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [private to local: success.]
-    expected: NOTRUN
+    expected: FAIL
 
   [private to private: success.]
-    expected: NOTRUN
+    expected: FAIL
 
   [public to local: success.]
-    expected: NOTRUN
+    expected: FAIL
 
   [public to private: success.]
-    expected: NOTRUN
+    expected: FAIL
 
   [public to public: success.]
-    expected: NOTRUN
+    expected: FAIL
 
   [treat-as-public to local: success.]
-    expected: NOTRUN
+    expected: FAIL
 
   [treat-as-public to private: success.]
-    expected: NOTRUN
+    expected: FAIL
 
   [treat-as-public to public: success.]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/private-network-access/service-worker.tentative.https.window.js.ini b/tests/wpt/meta/fetch/private-network-access/service-worker.tentative.https.window.js.ini
index 737a2af2272..56e39867a3e 100644
--- a/tests/wpt/meta/fetch/private-network-access/service-worker.tentative.https.window.js.ini
+++ b/tests/wpt/meta/fetch/private-network-access/service-worker.tentative.https.window.js.ini
@@ -1,10 +1,9 @@
 [service-worker.tentative.https.window.html]
-  expected: TIMEOUT
   [treat-as-public to local: success.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [treat-as-public to private: success.]
-    expected: NOTRUN
+    expected: FAIL
 
   [public to public: success.]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/security/dangling-markup/dangling-markup-mitigation-allowed-apis.https.html.ini b/tests/wpt/meta/fetch/security/dangling-markup/dangling-markup-mitigation-allowed-apis.https.html.ini
new file mode 100644
index 00000000000..0f7f7c420c2
--- /dev/null
+++ b/tests/wpt/meta/fetch/security/dangling-markup/dangling-markup-mitigation-allowed-apis.https.html.ini
@@ -0,0 +1,25 @@
+[dangling-markup-mitigation-allowed-apis.https.html]
+  expected: TIMEOUT
+  [Does not block window.open(`resources/empty.html?\n<`,'_self')]
+    expected: FAIL
+
+  [Setup controlled frame]
+    expected: TIMEOUT
+
+  [Does not block xhr]
+    expected: NOTRUN
+
+  [Does not block EventSource]
+    expected: NOTRUN
+
+  [Does not block fetch]
+    expected: NOTRUN
+
+  [Does not block Worker]
+    expected: NOTRUN
+
+  [Does not block importScripts]
+    expected: NOTRUN
+
+  [Clean up iframe]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/security/dangling-markup/dangling-markup-mitigation-allowed-apis.tentative.https.html.ini b/tests/wpt/meta/fetch/security/dangling-markup/dangling-markup-mitigation-allowed-apis.tentative.https.html.ini
deleted file mode 100644
index 631319418f5..00000000000
--- a/tests/wpt/meta/fetch/security/dangling-markup/dangling-markup-mitigation-allowed-apis.tentative.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[dangling-markup-mitigation-allowed-apis.tentative.https.html]
-  expected: ERROR
-  [Does not block window.open(`resources/empty.html?\n<`,'_self')]
-    expected: FAIL
diff --git a/tests/wpt/meta/fetch/security/dangling-markup/dangling-markup-mitigation.tentative.https.html.ini b/tests/wpt/meta/fetch/security/dangling-markup/dangling-markup-mitigation.tentative.https.html.ini
index b52eb8d2c55..84e1a1eb333 100644
--- a/tests/wpt/meta/fetch/security/dangling-markup/dangling-markup-mitigation.tentative.https.html.ini
+++ b/tests/wpt/meta/fetch/security/dangling-markup/dangling-markup-mitigation.tentative.https.html.ini
@@ -1,3 +1,4 @@
 [dangling-markup-mitigation.tentative.https.html]
+  expected: ERROR
   [Only blocks dangling markup requests]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/fetch/stale-while-revalidate/fetch-sw.https.html.ini b/tests/wpt/meta/fetch/stale-while-revalidate/fetch-sw.https.html.ini
index 55f313054e6..936c3ab00fa 100644
--- a/tests/wpt/meta/fetch/stale-while-revalidate/fetch-sw.https.html.ini
+++ b/tests/wpt/meta/fetch/stale-while-revalidate/fetch-sw.https.html.ini
@@ -1,4 +1,4 @@
 [fetch-sw.https.html]
-  expected: ERROR
+  expected: TIMEOUT
   [Second fetch returns same response]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/fetch/stale-while-revalidate/stale-image.html.ini b/tests/wpt/meta/fetch/stale-while-revalidate/stale-image.html.ini
index e95e391fd91..2a23c41e9d8 100644
--- a/tests/wpt/meta/fetch/stale-while-revalidate/stale-image.html.ini
+++ b/tests/wpt/meta/fetch/stale-while-revalidate/stale-image.html.ini
@@ -1,4 +1,3 @@
 [stale-image.html]
-  expected: TIMEOUT
   [Cache returns stale resource]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/meta/focus/activeelement-after-focusing-different-site-iframe-then-immediately-focusing-back.html.ini b/tests/wpt/meta/focus/activeelement-after-focusing-different-site-iframe-then-immediately-focusing-back.html.ini
deleted file mode 100644
index 8f3aec5177f..00000000000
--- a/tests/wpt/meta/focus/activeelement-after-focusing-different-site-iframe-then-immediately-focusing-back.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[activeelement-after-focusing-different-site-iframe-then-immediately-focusing-back.html]
-  [Check focus event and active element after focusing different site iframe then immediately focusing back]
-    expected: FAIL
diff --git a/tests/wpt/meta/focus/activeelement-after-focusing-different-site-iframe.html.ini b/tests/wpt/meta/focus/activeelement-after-focusing-different-site-iframe.html.ini
deleted file mode 100644
index b489ab52a39..00000000000
--- a/tests/wpt/meta/focus/activeelement-after-focusing-different-site-iframe.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[activeelement-after-focusing-different-site-iframe.html]
-  [Check trailing events]
-    expected: FAIL
diff --git a/tests/wpt/meta/focus/activeelement-after-focusing-same-site-iframe-contentwindow.html.ini b/tests/wpt/meta/focus/activeelement-after-focusing-same-site-iframe-contentwindow.html.ini
index 5864035c9e1..612b845c7e9 100644
--- a/tests/wpt/meta/focus/activeelement-after-focusing-same-site-iframe-contentwindow.html.ini
+++ b/tests/wpt/meta/focus/activeelement-after-focusing-same-site-iframe-contentwindow.html.ini
@@ -1,2 +1,3 @@
 [activeelement-after-focusing-same-site-iframe-contentwindow.html]
-  expected: TIMEOUT
+  [Check result]
+    expected: FAIL
diff --git a/tests/wpt/meta/focus/activeelement-after-focusing-same-site-iframe.html.ini b/tests/wpt/meta/focus/activeelement-after-focusing-same-site-iframe.html.ini
deleted file mode 100644
index 406e6a58324..00000000000
--- a/tests/wpt/meta/focus/activeelement-after-focusing-same-site-iframe.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[activeelement-after-focusing-same-site-iframe.html]
-  [Check trailing events]
-    expected: FAIL
diff --git a/tests/wpt/meta/focus/activeelement-after-immediately-focusing-different-site-iframe-contentwindow.html.ini b/tests/wpt/meta/focus/activeelement-after-immediately-focusing-different-site-iframe-contentwindow.html.ini
index 532cbcbabfe..a58db5d3146 100644
--- a/tests/wpt/meta/focus/activeelement-after-immediately-focusing-different-site-iframe-contentwindow.html.ini
+++ b/tests/wpt/meta/focus/activeelement-after-immediately-focusing-different-site-iframe-contentwindow.html.ini
@@ -1,2 +1,3 @@
 [activeelement-after-immediately-focusing-different-site-iframe-contentwindow.html]
-  expected: TIMEOUT
+  [Check result]
+    expected: FAIL
diff --git a/tests/wpt/meta/focus/activeelement-after-immediately-focusing-same-site-iframe-contentwindow.html.ini b/tests/wpt/meta/focus/activeelement-after-immediately-focusing-same-site-iframe-contentwindow.html.ini
index 8483775c0c1..d8b0d3212c9 100644
--- a/tests/wpt/meta/focus/activeelement-after-immediately-focusing-same-site-iframe-contentwindow.html.ini
+++ b/tests/wpt/meta/focus/activeelement-after-immediately-focusing-same-site-iframe-contentwindow.html.ini
@@ -1,2 +1,3 @@
 [activeelement-after-immediately-focusing-same-site-iframe-contentwindow.html]
-  expected: TIMEOUT
+  [Check result]
+    expected: FAIL
diff --git a/tests/wpt/meta/focus/focus-restoration-in-different-site-iframes-window.html.ini b/tests/wpt/meta/focus/focus-restoration-in-different-site-iframes-window.html.ini
index 8bdcea27053..1e3e377f307 100644
--- a/tests/wpt/meta/focus/focus-restoration-in-different-site-iframes-window.html.ini
+++ b/tests/wpt/meta/focus/focus-restoration-in-different-site-iframes-window.html.ini
@@ -1,2 +1,3 @@
 [focus-restoration-in-different-site-iframes-window.html]
-  expected: TIMEOUT
+  [Check result]
+    expected: FAIL
diff --git a/tests/wpt/meta/focus/focus-restoration-in-same-site-iframes-window.html.ini b/tests/wpt/meta/focus/focus-restoration-in-same-site-iframes-window.html.ini
index 53f4db35f7e..f19949138fa 100644
--- a/tests/wpt/meta/focus/focus-restoration-in-same-site-iframes-window.html.ini
+++ b/tests/wpt/meta/focus/focus-restoration-in-same-site-iframes-window.html.ini
@@ -1,2 +1,3 @@
 [focus-restoration-in-same-site-iframes-window.html]
-  expected: TIMEOUT
+  [Check result]
+    expected: FAIL
diff --git a/tests/wpt/meta/focus/iframe-focuses-parent-same-site.html.ini b/tests/wpt/meta/focus/iframe-focuses-parent-same-site.html.ini
deleted file mode 100644
index 8877baa8ac6..00000000000
--- a/tests/wpt/meta/focus/iframe-focuses-parent-same-site.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[iframe-focuses-parent-same-site.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/focus/nested-focus-within-iframe-focus-event.html.ini b/tests/wpt/meta/focus/nested-focus-within-iframe-focus-event.html.ini
new file mode 100644
index 00000000000..fb2988e26ee
--- /dev/null
+++ b/tests/wpt/meta/focus/nested-focus-within-iframe-focus-event.html.ini
@@ -0,0 +1,4 @@
+[nested-focus-within-iframe-focus-event.html]
+  expected: ERROR
+  [dialog.focus() in navigable's focus handler]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/html/anonymous-iframe/serviceworker-partitioning.tentative.https.window.js.ini b/tests/wpt/meta/html/anonymous-iframe/serviceworker-partitioning.tentative.https.window.js.ini
index 765e641a164..23cc60cec8d 100644
--- a/tests/wpt/meta/html/anonymous-iframe/serviceworker-partitioning.tentative.https.window.js.ini
+++ b/tests/wpt/meta/html/anonymous-iframe/serviceworker-partitioning.tentative.https.window.js.ini
@@ -1,6 +1,7 @@
 [serviceworker-partitioning.tentative.https.window.html]
+  expected: TIMEOUT
   [Anonymous iframes get partitioned service workers.]
     expected: FAIL
 
   [credentialless iframes get partitioned service workers.]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/html/anonymous-iframe/worker-cookies.tentative.https.window.js.ini b/tests/wpt/meta/html/anonymous-iframe/worker-cookies.tentative.https.window.js.ini
index 91aa477fcfa..fdd0e6988b3 100644
--- a/tests/wpt/meta/html/anonymous-iframe/worker-cookies.tentative.https.window.js.ini
+++ b/tests/wpt/meta/html/anonymous-iframe/worker-cookies.tentative.https.window.js.ini
@@ -13,9 +13,5 @@
 
 
 [worker-cookies.tentative.https.window.html?worker=service_worker]
-  expected: TIMEOUT
-  [Worker spawned from normal iframe can access global cookies]
-    expected: TIMEOUT
-
   [Worker spawned from credentialless iframe can't access global cookies]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/history-traversal/pagereveal/order-in-prerender-activation.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/history-traversal/pagereveal/order-in-prerender-activation.html.ini
deleted file mode 100644
index b6c1d6dbec6..00000000000
--- a/tests/wpt/meta/html/browsers/browsing-the-web/history-traversal/pagereveal/order-in-prerender-activation.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[order-in-prerender-activation.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/history-traversal/pagereveal/order-in-prerender-activation.https.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/history-traversal/pagereveal/order-in-prerender-activation.https.html.ini
new file mode 100644
index 00000000000..395289179f5
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/history-traversal/pagereveal/order-in-prerender-activation.https.html.ini
@@ -0,0 +1,2 @@
+[order-in-prerender-activation.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/008.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/008.html.ini
new file mode 100644
index 00000000000..c253f779d78
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/008.html.ini
@@ -0,0 +1,3 @@
+[008.html]
+  [Link with onclick form submit to javascript url and href navigation ]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-nosrc.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-nosrc.html.ini
index 2241163d563..6313c3e33dd 100644
--- a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-nosrc.html.ini
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-nosrc.html.ini
@@ -2,8 +2,5 @@
   [window.open]
     expected: FAIL
 
-  [form submission]
-    expected: FAIL
-
   [link click]
     expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment.html.ini
deleted file mode 100644
index 49cc2e16746..00000000000
--- a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[navigation-unload-same-origin-fragment.html]
-  [Tests that a fragment navigation in the unload handler will not block the initial navigation]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.js.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.js.ini
index e9ad5e19ad2..9d0d6c47dc1 100644
--- a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.js.ini
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.js.ini
@@ -1,7 +1,3 @@
 [navigate.window.html]
-  expected: TIMEOUT
   [When navigating the Refresh header needs to be followed]
-    expected: TIMEOUT
-
-  [When there's both a Refresh header and <meta> the Refresh header wins]
     expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/scroll-to-fragid/003.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/scroll-to-fragid/003.html.ini
deleted file mode 100644
index 1451a483f9d..00000000000
--- a/tests/wpt/meta/html/browsers/browsing-the-web/scroll-to-fragid/003.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[003.html]
-  [Fragment Navigation: Updating scroll position]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-top.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-top.html.ini
deleted file mode 100644
index 6e8c7d20d83..00000000000
--- a/tests/wpt/meta/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-top.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[scroll-to-top.html]
-  [Fragment Navigation: When fragid is TOP scroll to the top of the document]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/history/the-history-interface/history_pushstate_too_many_calls.optional.html.ini b/tests/wpt/meta/html/browsers/history/the-history-interface/history_pushstate_too_many_calls.optional.html.ini
new file mode 100644
index 00000000000..3a447593ff4
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/history/the-history-interface/history_pushstate_too_many_calls.optional.html.ini
@@ -0,0 +1,3 @@
+[history_pushstate_too_many_calls.optional.html]
+  [history pushState too many calls]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/history/the-history-interface/history_replacestate_too_many_calls.optional.html.ini b/tests/wpt/meta/html/browsers/history/the-history-interface/history_replacestate_too_many_calls.optional.html.ini
new file mode 100644
index 00000000000..afecb4e38a7
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/history/the-history-interface/history_replacestate_too_many_calls.optional.html.ini
@@ -0,0 +1,3 @@
+[history_replacestate_too_many_calls.optional.html]
+  [history replaceState too many calls]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/meta/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
deleted file mode 100644
index a03a8322165..00000000000
--- a/tests/wpt/meta/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[traverse_the_history_3.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/meta/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
new file mode 100644
index 00000000000..d6188c03424
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,3 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/meta/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..7a5fcb79165
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,3 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/history/the-location-interface/location-prototype-setting-same-origin-domain.sub.html.ini b/tests/wpt/meta/html/browsers/history/the-location-interface/location-prototype-setting-same-origin-domain.sub.html.ini
deleted file mode 100644
index e94f347f6ee..00000000000
--- a/tests/wpt/meta/html/browsers/history/the-location-interface/location-prototype-setting-same-origin-domain.sub.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[location-prototype-setting-same-origin-domain.sub.html]
-  [Same-origin-domain: setting the prototype to an empty object via __proto__ should throw a TypeError]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/history/the-location-interface/location-prototype-setting-same-origin.html.ini b/tests/wpt/meta/html/browsers/history/the-location-interface/location-prototype-setting-same-origin.html.ini
deleted file mode 100644
index 7bf488f91f7..00000000000
--- a/tests/wpt/meta/html/browsers/history/the-location-interface/location-prototype-setting-same-origin.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[location-prototype-setting-same-origin.html]
-  [Same-origin: setting the prototype to an empty object via __proto__ should throw a TypeError]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/history/the-location-interface/location_hash_set_empty_string.html.ini b/tests/wpt/meta/html/browsers/history/the-location-interface/location_hash_set_empty_string.html.ini
new file mode 100644
index 00000000000..0f38e817c9f
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/history/the-location-interface/location_hash_set_empty_string.html.ini
@@ -0,0 +1,3 @@
+[location_hash_set_empty_string.html]
+  [window.location.hash is an empty string]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/offline/browser-state/navigator_online_online.https.html.ini b/tests/wpt/meta/html/browsers/offline/browser-state/navigator_online_online.https.html.ini
deleted file mode 100644
index 19f382bec2f..00000000000
--- a/tests/wpt/meta/html/browsers/offline/browser-state/navigator_online_online.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[navigator_online_online.https.html]
-  [Offline Application Cache - navigator_online_online]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-caching.html.ini b/tests/wpt/meta/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-caching.html.ini
index 6720c0f77da..3e682215a0e 100644
--- a/tests/wpt/meta/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-caching.html.ini
+++ b/tests/wpt/meta/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-caching.html.ini
@@ -1,7 +1,4 @@
 [cross-origin-objects-function-caching.html]
-  [Cross-origin Window methods are cached]
-    expected: FAIL
-
   [Cross-origin Location `replace` method is cached]
     expected: FAIL
 
diff --git a/tests/wpt/meta/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_access_details.sub.html.ini b/tests/wpt/meta/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_access_details.sub.html.ini
index ac4a3af4b00..4db5975ba24 100644
--- a/tests/wpt/meta/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_access_details.sub.html.ini
+++ b/tests/wpt/meta/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_access_details.sub.html.ini
@@ -11,9 +11,6 @@
   [Access is revoked to Window object when we stop being same effective script origin due to document.domain.]
     expected: FAIL
 
-  [Access is revoked to Location object when we stop being same effective script origin due to document.domain.]
-    expected: FAIL
-
   [Access evolves correctly for non-cross-origin objects when we join up via document.domain and then diverge again.]
     expected: FAIL
 
diff --git a/tests/wpt/meta/html/browsers/the-window-object/focus.window.js.ini b/tests/wpt/meta/html/browsers/the-window-object/focus.window.js.ini
deleted file mode 100644
index 27a9640a02c..00000000000
--- a/tests/wpt/meta/html/browsers/the-window-object/focus.window.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[focus.window.html]
-  [focus]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/the-window-object/security-window/window-security.https.html.ini b/tests/wpt/meta/html/browsers/the-window-object/security-window/window-security.https.html.ini
index 8afe0888e4e..32cd3f302d4 100644
--- a/tests/wpt/meta/html/browsers/the-window-object/security-window/window-security.https.html.ini
+++ b/tests/wpt/meta/html/browsers/the-window-object/security-window/window-security.https.html.ini
@@ -328,9 +328,3 @@
 
   [A SecurityError exception must be thrown when window.stop is accessed from a different origin.]
     expected: FAIL
-
-  [A SecurityError exception should not be thrown when window.blur is accessed from a different origin.]
-    expected: FAIL
-
-  [A SecurityError exception should not be thrown when window.focus is accessed from a different origin.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/the-window-object/window-properties.https.html.ini b/tests/wpt/meta/html/browsers/the-window-object/window-properties.https.html.ini
index e9061d31d26..94ad9ce191c 100644
--- a/tests/wpt/meta/html/browsers/the-window-object/window-properties.https.html.ini
+++ b/tests/wpt/meta/html/browsers/the-window-object/window-properties.https.html.ini
@@ -1,9 +1,4 @@
 [window-properties.https.html]
-  [Window method: focus]
-    expected: FAIL
-
-  [Window method: blur]
-    expected: FAIL
 
   [Window method: print]
     expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/windows/auxiliary-browsing-contexts/named-lookup-noopener.html.ini b/tests/wpt/meta/html/browsers/windows/auxiliary-browsing-contexts/named-lookup-noopener.html.ini
new file mode 100644
index 00000000000..6907354e049
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/windows/auxiliary-browsing-contexts/named-lookup-noopener.html.ini
@@ -0,0 +1,7 @@
+[named-lookup-noopener.html]
+  expected: TIMEOUT
+  [Two noopener window.open() calls create separate windows]
+    expected: TIMEOUT
+
+  [Two rel=noopener <a href> clicks create separate windows]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/html/canvas/element/canvas-host/2d.canvas.host.size.large.html.ini b/tests/wpt/meta/html/canvas/element/canvas-host/2d.canvas.host.size.large.html.ini
deleted file mode 100644
index f6455f9bd76..00000000000
--- a/tests/wpt/meta/html/canvas/element/canvas-host/2d.canvas.host.size.large.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.canvas.host.size.large.html]
-  expected: CRASH
diff --git a/tests/wpt/meta/html/canvas/element/layers/2d.layer.global-states.ctx-filter.no-transform.html.ini b/tests/wpt/meta/html/canvas/element/layers/2d.layer.global-states.ctx-filter.no-transform.html.ini
new file mode 100644
index 00000000000..f910a046875
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/layers/2d.layer.global-states.ctx-filter.no-transform.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.global-states.ctx-filter.no-transform.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/layers/2d.layer.global-states.ctx-filter.rotation.html.ini b/tests/wpt/meta/html/canvas/element/layers/2d.layer.global-states.ctx-filter.rotation.html.ini
new file mode 100644
index 00000000000..f488bf2f8fb
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/layers/2d.layer.global-states.ctx-filter.rotation.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.global-states.ctx-filter.rotation.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/layers/2d.layer.global-states.no-cxt-filter.no-transform.html.ini b/tests/wpt/meta/html/canvas/element/layers/2d.layer.global-states.no-cxt-filter.no-transform.html.ini
new file mode 100644
index 00000000000..ade399e0192
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/layers/2d.layer.global-states.no-cxt-filter.no-transform.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.global-states.no-cxt-filter.no-transform.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/layers/2d.layer.global-states.no-cxt-filter.rotation.html.ini b/tests/wpt/meta/html/canvas/element/layers/2d.layer.global-states.no-cxt-filter.rotation.html.ini
new file mode 100644
index 00000000000..5c0ebc45ff9
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/layers/2d.layer.global-states.no-cxt-filter.rotation.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.global-states.no-cxt-filter.rotation.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-drawImage.html.ini b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-drawImage.html.ini
index c94490ae5ee..9cf5b2af86a 100644
--- a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-drawImage.html.ini
+++ b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-drawImage.html.ini
@@ -1,13 +1,13 @@
 [createImageBitmap-drawImage.html]
   expected: ERROR
   [createImageBitmap from an OffscreenCanvas resized, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a vector HTMLImageElement resized, and drawImage on the created ImageBitmap]
     expected: FAIL
 
   [createImageBitmap from an OffscreenCanvas, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an HTMLCanvasElement, and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -22,34 +22,34 @@
     expected: FAIL
 
   [createImageBitmap from an ImageData scaled down, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an OffscreenCanvas scaled down, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a bitmap SVGImageElement, and drawImage on the created ImageBitmap]
-    expected: TIMEOUT
+    expected: FAIL
 
   [createImageBitmap from a bitmap SVGImageElement resized, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an HTMLCanvasElement scaled down, and drawImage on the created ImageBitmap]
     expected: FAIL
 
   [createImageBitmap from a vector SVGImageElement, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an ImageData scaled up, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an HTMLVideoElement with negative sw/sh, and drawImage on the created ImageBitmap]
     expected: FAIL
 
   [createImageBitmap from a bitmap SVGImageElement scaled up, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a vector SVGImageElement resized, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a bitmap HTMLImageElement scaled up, and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -58,10 +58,10 @@
     expected: FAIL
 
   [createImageBitmap from a vector SVGImageElement scaled down, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a vector SVGImageElement with negative sw/sh, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a bitmap HTMLImageElement scaled down, and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -73,16 +73,16 @@
     expected: FAIL
 
   [createImageBitmap from a Blob scaled down, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an ImageData resized, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a vector HTMLImageElement scaled down, and drawImage on the created ImageBitmap]
     expected: FAIL
 
   [createImageBitmap from an ImageData, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an HTMLCanvasElement with negative sw/sh, and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -91,16 +91,16 @@
     expected: FAIL
 
   [createImageBitmap from a vector SVGImageElement scaled up, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an ImageBitmap, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a Blob scaled up, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a bitmap SVGImageElement scaled down, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an HTMLVideoElement scaled up, and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -109,7 +109,7 @@
     expected: FAIL
 
   [createImageBitmap from a Blob, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an HTMLVideoElement resized, and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -118,31 +118,31 @@
     expected: FAIL
 
   [createImageBitmap from an ImageBitmap scaled down, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a Blob with negative sw/sh, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a bitmap SVGImageElement with negative sw/sh, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an ImageData with negative sw/sh, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an ImageBitmap scaled up, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an ImageBitmap resized, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an OffscreenCanvas scaled up, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an HTMLCanvasElement scaled up, and drawImage on the created ImageBitmap]
     expected: FAIL
 
   [createImageBitmap from a Blob resized, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an HTMLVideoElement from a data URL, and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -154,10 +154,10 @@
     expected: FAIL
 
   [createImageBitmap from an ImageBitmap with negative sw/sh, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an OffscreenCanvas with negative sw/sh, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a vector HTMLImageElement with negative sw/sh, and drawImage on the created ImageBitmap]
     expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html.ini b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html.ini
index f08e8a2918a..0cb93c5abc9 100644
--- a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html.ini
+++ b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html.ini
@@ -4,7 +4,7 @@
     expected: NOTRUN
 
   [createImageBitmap from a vector SVGImageElement imageOrientation: "flipY", and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an HTMLCanvasElement imageOrientation: "none", and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -16,7 +16,7 @@
     expected: FAIL
 
   [createImageBitmap from an OffscreenCanvas imageOrientation: "flipY", and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a vector HTMLImageElement imageOrientation: "flipY", and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -25,7 +25,7 @@
     expected: FAIL
 
   [createImageBitmap from a Blob imageOrientation: "flipY", and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an HTMLCanvasElement imageOrientation: "flipY", and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -34,7 +34,7 @@
     expected: FAIL
 
   [createImageBitmap from an ImageData imageOrientation: "flipY", and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a bitmap HTMLImageElement imageOrientation: "flipY", and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -43,7 +43,7 @@
     expected: NOTRUN
 
   [createImageBitmap from an ImageBitmap imageOrientation: "flipY", and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a vector HTMLImageElement imageOrientation: "none", and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -61,7 +61,7 @@
     expected: FAIL
 
   [createImageBitmap from a bitmap SVGImageElement imageOrientation: "flipY", and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a bitmap SVGImageElement imageOrientation: "none", and drawImage on the created ImageBitmap]
     expected: TIMEOUT
@@ -82,19 +82,19 @@
     expected: FAIL
 
   [createImageBitmap from a bitmap SVGImageElement imageOrientation: "from-image", and drawImage on the created ImageBitmap]
-    expected: TIMEOUT
+    expected: FAIL
 
   [createImageBitmap from a vector SVGImageElement imageOrientation: "from-image", and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an OffscreenCanvas imageOrientation: "from-image", and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an ImageData imageOrientation: "from-image", and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from an ImageBitmap imageOrientation: "from-image", and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a Blob imageOrientation: "from-image", and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-invalid-args.html.ini b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-invalid-args.html.ini
index 673fc1e4ffd..aba246039a0 100644
--- a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-invalid-args.html.ini
+++ b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-invalid-args.html.ini
@@ -1,5 +1,5 @@
 [createImageBitmap-invalid-args.html]
-  expected: ERROR
+  expected: CRASH
   [createImageBitmap with a vector HTMLImageElement source and sw set to 0]
     expected: FAIL
 
diff --git a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-origin.sub.html.ini b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-origin.sub.html.ini
index 210d26f7740..d7226bfed74 100644
--- a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-origin.sub.html.ini
+++ b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-origin.sub.html.ini
@@ -1,34 +1,34 @@
 [createImageBitmap-origin.sub.html]
   expected: TIMEOUT
   [redirected to cross-origin HTMLVideoElement: origin unclear 2dContext.drawImage]
-    expected: NOTRUN
+    expected: FAIL
 
   [redirected to cross-origin HTMLVideoElement: origin unclear bitmaprenderer.transferFromImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [unclean HTMLCanvasElement: origin unclear bitmaprenderer.transferFromImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [unclean HTMLCanvasElement: origin unclear getImageData]
-    expected: NOTRUN
+    expected: FAIL
 
   [cross-origin HTMLVideoElement: origin unclear getImageData]
-    expected: NOTRUN
+    expected: FAIL
 
   [cross-origin SVGImageElement: origin unclear bitmaprenderer.transferFromImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [cross-origin HTMLVideoElement: origin unclear bitmaprenderer.transferFromImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [redirected to same-origin HTMLVideoElement: origin unclear getImageData]
-    expected: NOTRUN
+    expected: FAIL
 
   [cross-origin HTMLImageElement: origin unclear 2dContext.drawImage]
     expected: FAIL
 
   [cross-origin SVGImageElement: origin unclear 2dContext.drawImage]
-    expected: NOTRUN
+    expected: FAIL
 
   [cross-origin HTMLImageElement: origin unclear getImageData]
     expected: FAIL
@@ -37,28 +37,28 @@
     expected: FAIL
 
   [redirected to same-origin HTMLVideoElement: origin unclear 2dContext.drawImage]
-    expected: NOTRUN
+    expected: FAIL
 
   [unclean ImageBitmap: origin unclear bitmaprenderer.transferFromImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [redirected to same-origin HTMLVideoElement: origin unclear bitmaprenderer.transferFromImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [redirected to cross-origin HTMLVideoElement: origin unclear getImageData]
-    expected: NOTRUN
+    expected: FAIL
 
   [unclean ImageBitmap: origin unclear getImageData]
-    expected: NOTRUN
+    expected: FAIL
 
   [unclean HTMLCanvasElement: origin unclear 2dContext.drawImage]
-    expected: NOTRUN
+    expected: FAIL
 
   [cross-origin HTMLVideoElement: origin unclear 2dContext.drawImage]
-    expected: NOTRUN
+    expected: FAIL
 
   [unclean ImageBitmap: origin unclear 2dContext.drawImage]
-    expected: NOTRUN
+    expected: FAIL
 
   [cross-origin SVGImageElement: origin unclear getImageData]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-serializable.html.ini b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-serializable.html.ini
index 7616121487c..4234bcb2133 100644
--- a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-serializable.html.ini
+++ b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-serializable.html.ini
@@ -1,7 +1,6 @@
 [createImageBitmap-serializable.html]
-  expected: TIMEOUT
   [Serialize ImageBitmap created from a vector SVGImageElement]
-    expected: NOTRUN
+    expected: FAIL
 
   [Serialize ImageBitmap created from an HTMLVideoElement]
     expected: FAIL
@@ -13,25 +12,25 @@
     expected: FAIL
 
   [Serialize ImageBitmap created from an OffscreenCanvas]
-    expected: NOTRUN
+    expected: FAIL
 
   [Serialize ImageBitmap created from a vector HTMLImageElement]
     expected: FAIL
 
   [Serialize ImageBitmap created from a Blob]
-    expected: NOTRUN
+    expected: FAIL
 
   [Serialize ImageBitmap created from a bitmap HTMLImageElement]
     expected: FAIL
 
   [Serializing a non-origin-clean ImageBitmap throws.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Serialize ImageBitmap created from an ImageData]
-    expected: NOTRUN
+    expected: FAIL
 
   [Serialize ImageBitmap created from an ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [Serialize ImageBitmap created from a bitmap SVGImageElement]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html.ini b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html.ini
index 5d2657041d1..cff84fd3a26 100644
--- a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html.ini
+++ b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html.ini
@@ -1,22 +1,21 @@
 [createImageBitmap-transfer.html]
-  expected: ERROR
   [Transfer ImageBitmap created from a vector HTMLImageElement]
     expected: FAIL
 
   [Transfer ImageBitmap created from an ImageData]
-    expected: NOTRUN
+    expected: FAIL
 
   [Transfer ImageBitmap created from a vector SVGImageElement]
-    expected: NOTRUN
+    expected: FAIL
 
   [Transfer ImageBitmap created from a Blob]
-    expected: NOTRUN
+    expected: FAIL
 
   [Transfer ImageBitmap created from an HTMLCanvasElement]
     expected: FAIL
 
   [Transfer ImageBitmap created from an OffscreenCanvas]
-    expected: NOTRUN
+    expected: FAIL
 
   [Transfer ImageBitmap created from a bitmap HTMLImageElement]
     expected: FAIL
@@ -25,13 +24,13 @@
     expected: FAIL
 
   [Transfer ImageBitmap created from a bitmap SVGImageElement]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Transfer ImageBitmap created from an ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [Transfer ImageBitmap created from an HTMLVideoElement]
     expected: FAIL
 
   [Transferring a non-origin-clean ImageBitmap throws.]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/manual/line-styles/setLineDash.html.ini b/tests/wpt/meta/html/canvas/element/manual/line-styles/setLineDash.html.ini
deleted file mode 100644
index ec4caf8e050..00000000000
--- a/tests/wpt/meta/html/canvas/element/manual/line-styles/setLineDash.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[setLineDash.html]
-  [Invalid arguments to setLineDash()]
-    expected: FAIL
-
-  [setLineDash]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.disconnected.html.ini b/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.disconnected.html.ini
new file mode 100644
index 00000000000..5cdcce07c65
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/manual/text/canvas.2d.disconnected.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.disconnected.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.create2.nonfinite.html.ini b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.create2.nonfinite.html.ini
deleted file mode 100644
index 8e7dad6133e..00000000000
--- a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.create2.nonfinite.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.imageData.create2.nonfinite.html]
-  [createImageData() throws TypeError if arguments are not finite]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.html.ini b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.html.ini
new file mode 100644
index 00000000000..6503424e27f
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.html.ini
@@ -0,0 +1,3 @@
+[2d.imageData.createImageBitmap.p3.rgba.unorm8.html]
+  [Verify round-trip of 8-bit P3 data ImageData through ImageBitmap]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.html.ini b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.html.ini
new file mode 100644
index 00000000000..d8bd768f94b
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.html.ini
@@ -0,0 +1,3 @@
+[2d.imageData.createImageBitmap.srgb.rgba.float16.html]
+  [Verify round-trip of 16-bit float sRGB data ImageData through ImageBitmap]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.html.ini b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.html.ini
new file mode 100644
index 00000000000..4abcb90e1af
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.html.ini
@@ -0,0 +1,3 @@
+[2d.imageData.createImageBitmap.srgb.rgba.unorm8.html]
+  [Verify round-trip of 8-bit sRGB data ImageData through ImageBitmap]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.get.large.crash.html.ini b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.get.large.crash.html.ini
deleted file mode 100644
index 72b8407061c..00000000000
--- a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.get.large.crash.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.imageData.get.large.crash.html]
-  [Test that canvas crash when image data cannot be allocated.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.get.nonfinite.html.ini b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.get.nonfinite.html.ini
deleted file mode 100644
index 8ecd9e5dc7f..00000000000
--- a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.get.nonfinite.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.imageData.get.nonfinite.html]
-  [getImageData() throws TypeError if arguments are not finite]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.basics.html.ini b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.basics.html.ini
deleted file mode 100644
index 1a3c292f9f2..00000000000
--- a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.basics.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.imageData.object.ctor.basics.html]
-  [Testing different type of ImageData constructor]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.pixelFormat.html.ini b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.pixelFormat.html.ini
new file mode 100644
index 00000000000..b91071120e8
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.pixelFormat.html.ini
@@ -0,0 +1,3 @@
+[2d.imageData.object.ctor.pixelFormat.html]
+  [Testing ImageData constructor pixelFormat behaviors]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.object.properties.html.ini b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.object.properties.html.ini
new file mode 100644
index 00000000000..0d462440033
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.object.properties.html.ini
@@ -0,0 +1,3 @@
+[2d.imageData.object.properties.html]
+  [ImageData objects have the right properties]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.put.basic.rgba.float16.html.ini b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.put.basic.rgba.float16.html.ini
new file mode 100644
index 00000000000..2ba3259e95b
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.put.basic.rgba.float16.html.ini
@@ -0,0 +1,3 @@
+[2d.imageData.put.basic.rgba.float16.html]
+  [putImageData() puts 16-bit floating point image data from getImageData() onto the canvas]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.put.nonfinite.html.ini b/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.put.nonfinite.html.ini
deleted file mode 100644
index 025b8cfdc5d..00000000000
--- a/tests/wpt/meta/html/canvas/element/pixel-manipulation/2d.imageData.put.nonfinite.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.imageData.put.nonfinite.html]
-  [putImageData() throws TypeError if arguments are not finite]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.line.html.ini b/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.line.html.ini
deleted file mode 100644
index 46b6c887ca4..00000000000
--- a/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.line.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.reset.render.line.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/reset/2d.reset.state.line_dash.html.ini b/tests/wpt/meta/html/canvas/element/reset/2d.reset.state.line_dash.html.ini
deleted file mode 100644
index 61f771ded91..00000000000
--- a/tests/wpt/meta/html/canvas/element/reset/2d.reset.state.line_dash.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.reset.state.line_dash.html]
-  [check that the line dash is reset]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/reset/2d.reset.state.line_dash_offset.html.ini b/tests/wpt/meta/html/canvas/element/reset/2d.reset.state.line_dash_offset.html.ini
deleted file mode 100644
index 7a60aa8737e..00000000000
--- a/tests/wpt/meta/html/canvas/element/reset/2d.reset.state.line_dash_offset.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.reset.state.line_dash_offset.html]
-  [check that the state is reset]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/text/2d.text.measure.lang.html.ini b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.lang.html.ini
new file mode 100644
index 00000000000..069e5f18a03
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.lang.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.lang.html]
+  [Testing the lang attribute]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/text/2d.text.measure.lang.inherit.html.ini b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.lang.inherit.html.ini
new file mode 100644
index 00000000000..22dc67b5974
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.lang.inherit.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.lang.inherit.html]
+  [Testing the lang attribute]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang.html.ini b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang.html.ini
new file mode 100644
index 00000000000..1d927b88e05
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.offscreen.lang.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang.inherit.html.ini b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang.inherit.html.ini
new file mode 100644
index 00000000000..b89123e21a2
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang.inherit.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.offscreen.lang.inherit.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.html.ini b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.html.ini
new file mode 100644
index 00000000000..2303d27219f
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.offscreen.transferred.lang.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.inherit.document.html.ini b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.inherit.document.html.ini
new file mode 100644
index 00000000000..14cb2ad57df
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.inherit.document.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.offscreen.transferred.lang.inherit.document.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.inherit.html.ini b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.inherit.html.ini
new file mode 100644
index 00000000000..3c2d2b828f8
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.inherit.html.ini
@@ -0,0 +1,2 @@
+[canvas.2d.offscreen.transferred.lang.inherit.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html.ini
deleted file mode 100644
index 8e7dad6133e..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.imageData.create2.nonfinite.html]
-  [createImageData() throws TypeError if arguments are not finite]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js.ini
deleted file mode 100644
index e8ad049fd30..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.imageData.create2.nonfinite.worker.html]
-  [createImageData() throws TypeError if arguments are not finite]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.html.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.html.ini
new file mode 100644
index 00000000000..6503424e27f
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.html.ini
@@ -0,0 +1,3 @@
+[2d.imageData.createImageBitmap.p3.rgba.unorm8.html]
+  [Verify round-trip of 8-bit P3 data ImageData through ImageBitmap]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.worker.js.ini
new file mode 100644
index 00000000000..3a35aabc44c
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.imageData.createImageBitmap.p3.rgba.unorm8.worker.html]
+  [Verify round-trip of 8-bit P3 data ImageData through ImageBitmap]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.html.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.html.ini
new file mode 100644
index 00000000000..d8bd768f94b
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.html.ini
@@ -0,0 +1,3 @@
+[2d.imageData.createImageBitmap.srgb.rgba.float16.html]
+  [Verify round-trip of 16-bit float sRGB data ImageData through ImageBitmap]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.worker.js.ini
new file mode 100644
index 00000000000..6f0d3221100
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.imageData.createImageBitmap.srgb.rgba.float16.worker.html]
+  [Verify round-trip of 16-bit float sRGB data ImageData through ImageBitmap]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.html.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.html.ini
new file mode 100644
index 00000000000..4abcb90e1af
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.html.ini
@@ -0,0 +1,3 @@
+[2d.imageData.createImageBitmap.srgb.rgba.unorm8.html]
+  [Verify round-trip of 8-bit sRGB data ImageData through ImageBitmap]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.worker.js.ini
new file mode 100644
index 00000000000..d0a7ead7be5
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.imageData.createImageBitmap.srgb.rgba.unorm8.worker.html]
+  [Verify round-trip of 8-bit sRGB data ImageData through ImageBitmap]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.html.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.html.ini
deleted file mode 100644
index 72b8407061c..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.imageData.get.large.crash.html]
-  [Test that canvas crash when image data cannot be allocated.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.js.ini
deleted file mode 100644
index e4378518c9a..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.imageData.get.large.crash.worker.html]
-  [Test that canvas crash when image data cannot be allocated.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html.ini
deleted file mode 100644
index 8ecd9e5dc7f..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.imageData.get.nonfinite.html]
-  [getImageData() throws TypeError if arguments are not finite]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.js.ini
deleted file mode 100644
index 7a555682cf0..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.imageData.get.nonfinite.worker.html]
-  [getImageData() throws TypeError if arguments are not finite]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html.ini
new file mode 100644
index 00000000000..0d462440033
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html.ini
@@ -0,0 +1,3 @@
+[2d.imageData.object.properties.html]
+  [ImageData objects have the right properties]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.js.ini
new file mode 100644
index 00000000000..6d8a81b3580
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.imageData.object.properties.worker.html]
+  [ImageData objects have the right properties]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.rgba.float16.html.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.rgba.float16.html.ini
new file mode 100644
index 00000000000..2ba3259e95b
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.rgba.float16.html.ini
@@ -0,0 +1,3 @@
+[2d.imageData.put.basic.rgba.float16.html]
+  [putImageData() puts 16-bit floating point image data from getImageData() onto the canvas]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.rgba.float16.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.rgba.float16.worker.js.ini
new file mode 100644
index 00000000000..b2f6d4bb660
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.rgba.float16.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.imageData.put.basic.rgba.float16.worker.html]
+  [putImageData() puts 16-bit floating point image data from getImageData() onto the canvas]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html.ini
deleted file mode 100644
index 025b8cfdc5d..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.imageData.put.nonfinite.html]
-  [putImageData() throws TypeError if arguments are not finite]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.js.ini
deleted file mode 100644
index 5e961ea5b5a..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.imageData.put.nonfinite.worker.html]
-  [putImageData() throws TypeError if arguments are not finite]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.line.html.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.line.html.ini
deleted file mode 100644
index 46b6c887ca4..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.line.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.reset.render.line.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.state.line_dash.html.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.state.line_dash.html.ini
deleted file mode 100644
index 61f771ded91..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.state.line_dash.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.reset.state.line_dash.html]
-  [check that the line dash is reset]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.state.line_dash.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.state.line_dash.worker.js.ini
deleted file mode 100644
index e68cc6f1ea1..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.state.line_dash.worker.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.reset.state.line_dash.worker.html]
-  [check that the line dash is reset]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.html.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.html.ini
deleted file mode 100644
index 7a60aa8737e..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.reset.state.line_dash_offset.html]
-  [check that the state is reset]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.worker.js.ini
deleted file mode 100644
index a550b617421..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.worker.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.reset.state.line_dash_offset.worker.html]
-  [check that the state is reset]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.lang.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.lang.html.ini
new file mode 100644
index 00000000000..069e5f18a03
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.lang.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.lang.html]
+  [Testing the lang attribute]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.lang.inherit.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.lang.inherit.html.ini
new file mode 100644
index 00000000000..22dc67b5974
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.lang.inherit.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.lang.inherit.html]
+  [Testing the lang attribute]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.lang.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.lang.worker.js.ini
new file mode 100644
index 00000000000..39980cbd9b7
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.lang.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.lang.worker.html]
+  [Testing the lang attribute]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/document-isolation-policy/credentialless-cache-storage-from-credentialless.https.tentative.window.js.ini b/tests/wpt/meta/html/document-isolation-policy/credentialless-cache-storage-from-credentialless.https.tentative.window.js.ini
new file mode 100644
index 00000000000..2814e7ce699
--- /dev/null
+++ b/tests/wpt/meta/html/document-isolation-policy/credentialless-cache-storage-from-credentialless.https.tentative.window.js.ini
@@ -0,0 +1,54 @@
+[credentialless-cache-storage-from-credentialless.https.tentative.window.html?document]
+  [[document\] isolate-and-credentialless => none]
+    expected: FAIL
+
+  [[document\] isolate-and-credentialless => isolate-and-credentialless]
+    expected: FAIL
+
+  [[document\] isolate-and-credentialless => isolate-and-require-corp]
+    expected: FAIL
+
+  [[document\] isolate-and-credentialless => isolate-and-require-corp + CORP]
+    expected: FAIL
+
+
+[credentialless-cache-storage-from-credentialless.https.tentative.window.html?service_worker]
+  [[service_worker\] isolate-and-credentialless => none]
+    expected: FAIL
+
+  [[service_worker\] isolate-and-credentialless => isolate-and-credentialless]
+    expected: FAIL
+
+  [[service_worker\] isolate-and-credentialless => isolate-and-require-corp]
+    expected: FAIL
+
+  [[service_worker\] isolate-and-credentialless => isolate-and-require-corp + CORP]
+    expected: FAIL
+
+
+[credentialless-cache-storage-from-credentialless.https.tentative.window.html?dedicated_worker]
+  [[dedicated_worker\] isolate-and-credentialless => none]
+    expected: FAIL
+
+  [[dedicated_worker\] isolate-and-credentialless => isolate-and-credentialless]
+    expected: FAIL
+
+  [[dedicated_worker\] isolate-and-credentialless => isolate-and-require-corp]
+    expected: FAIL
+
+  [[dedicated_worker\] isolate-and-credentialless => isolate-and-require-corp + CORP]
+    expected: FAIL
+
+
+[credentialless-cache-storage-from-credentialless.https.tentative.window.html?shared_worker]
+  [[shared_worker\] isolate-and-credentialless => none]
+    expected: FAIL
+
+  [[shared_worker\] isolate-and-credentialless => isolate-and-credentialless]
+    expected: FAIL
+
+  [[shared_worker\] isolate-and-credentialless => isolate-and-require-corp]
+    expected: FAIL
+
+  [[shared_worker\] isolate-and-credentialless => isolate-and-require-corp + CORP]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/document-isolation-policy/credentialless-cache-storage-from-none.https.tentative.window.js.ini b/tests/wpt/meta/html/document-isolation-policy/credentialless-cache-storage-from-none.https.tentative.window.js.ini
new file mode 100644
index 00000000000..85857046975
--- /dev/null
+++ b/tests/wpt/meta/html/document-isolation-policy/credentialless-cache-storage-from-none.https.tentative.window.js.ini
@@ -0,0 +1,90 @@
+[credentialless-cache-storage-from-none.https.tentative.window.html?shared_worker]
+  [[shared_worker\] none => none]
+    expected: FAIL
+
+  [[shared_worker\] none => isolate-and-credentialless]
+    expected: FAIL
+
+  [[shared_worker\] none => isolate-and-credentialless (omit)]
+    expected: FAIL
+
+  [[shared_worker\] none => isolate-and-credentialless + CORP]
+    expected: FAIL
+
+  [[shared_worker\] none => isolate-and-require-corp]
+    expected: FAIL
+
+  [[shared_worker\] none => isolate-and-require-corp (omit)]
+    expected: FAIL
+
+  [[shared_worker\] none => isolate-and-require-corp + CORP]
+    expected: FAIL
+
+
+[credentialless-cache-storage-from-none.https.tentative.window.html?document]
+  [[document\] none => none]
+    expected: FAIL
+
+  [[document\] none => isolate-and-credentialless]
+    expected: FAIL
+
+  [[document\] none => isolate-and-credentialless (omit)]
+    expected: FAIL
+
+  [[document\] none => isolate-and-credentialless + CORP]
+    expected: FAIL
+
+  [[document\] none => isolate-and-require-corp]
+    expected: FAIL
+
+  [[document\] none => isolate-and-require-corp (omit)]
+    expected: FAIL
+
+  [[document\] none => isolate-and-require-corp + CORP]
+    expected: FAIL
+
+
+[credentialless-cache-storage-from-none.https.tentative.window.html?dedicated_worker]
+  [[dedicated_worker\] none => none]
+    expected: FAIL
+
+  [[dedicated_worker\] none => isolate-and-credentialless]
+    expected: FAIL
+
+  [[dedicated_worker\] none => isolate-and-credentialless (omit)]
+    expected: FAIL
+
+  [[dedicated_worker\] none => isolate-and-credentialless + CORP]
+    expected: FAIL
+
+  [[dedicated_worker\] none => isolate-and-require-corp]
+    expected: FAIL
+
+  [[dedicated_worker\] none => isolate-and-require-corp (omit)]
+    expected: FAIL
+
+  [[dedicated_worker\] none => isolate-and-require-corp + CORP]
+    expected: FAIL
+
+
+[credentialless-cache-storage-from-none.https.tentative.window.html?service_worker]
+  [[service_worker\] none => none]
+    expected: FAIL
+
+  [[service_worker\] none => isolate-and-credentialless]
+    expected: FAIL
+
+  [[service_worker\] none => isolate-and-credentialless (omit)]
+    expected: FAIL
+
+  [[service_worker\] none => isolate-and-credentialless + CORP]
+    expected: FAIL
+
+  [[service_worker\] none => isolate-and-require-corp]
+    expected: FAIL
+
+  [[service_worker\] none => isolate-and-require-corp (omit)]
+    expected: FAIL
+
+  [[service_worker\] none => isolate-and-require-corp + CORP]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/document-isolation-policy/credentialless-cache-storage-from-require-corp.https.tentative.window.js.ini b/tests/wpt/meta/html/document-isolation-policy/credentialless-cache-storage-from-require-corp.https.tentative.window.js.ini
new file mode 100644
index 00000000000..b116234c403
--- /dev/null
+++ b/tests/wpt/meta/html/document-isolation-policy/credentialless-cache-storage-from-require-corp.https.tentative.window.js.ini
@@ -0,0 +1,42 @@
+[credentialless-cache-storage-from-require-corp.https.tentative.window.html?dedicated_worker]
+  [[dedicated_worker\] isolate-and-require-corp => none]
+    expected: FAIL
+
+  [[dedicated_worker\] isolate-and-require-corp => isolate-and-credentialless]
+    expected: FAIL
+
+  [[dedicated_worker\] isolate-and-require-corp => isolate-and-require-corp]
+    expected: FAIL
+
+
+[credentialless-cache-storage-from-require-corp.https.tentative.window.html?document]
+  [[document\] isolate-and-require-corp => none]
+    expected: FAIL
+
+  [[document\] isolate-and-require-corp => isolate-and-credentialless]
+    expected: FAIL
+
+  [[document\] isolate-and-require-corp => isolate-and-require-corp]
+    expected: FAIL
+
+
+[credentialless-cache-storage-from-require-corp.https.tentative.window.html?shared_worker]
+  [[shared_worker\] isolate-and-require-corp => none]
+    expected: FAIL
+
+  [[shared_worker\] isolate-and-require-corp => isolate-and-credentialless]
+    expected: FAIL
+
+  [[shared_worker\] isolate-and-require-corp => isolate-and-require-corp]
+    expected: FAIL
+
+
+[credentialless-cache-storage-from-require-corp.https.tentative.window.html?service_worker]
+  [[service_worker\] isolate-and-require-corp => none]
+    expected: FAIL
+
+  [[service_worker\] isolate-and-require-corp => isolate-and-credentialless]
+    expected: FAIL
+
+  [[service_worker\] isolate-and-require-corp => isolate-and-require-corp]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/document-isolation-policy/credentialless-cache-storage.https.tentative.window.js.ini b/tests/wpt/meta/html/document-isolation-policy/credentialless-cache-storage.https.tentative.window.js.ini
deleted file mode 100644
index 17902443a95..00000000000
--- a/tests/wpt/meta/html/document-isolation-policy/credentialless-cache-storage.https.tentative.window.js.ini
+++ /dev/null
@@ -1,137 +0,0 @@
-[credentialless-cache-storage.https.tentative.window.html?document]
-  expected: TIMEOUT
-  [[document\] none => none]
-    expected: TIMEOUT
-
-  [[document\] none => isolate-and-credentialless]
-    expected: TIMEOUT
-
-  [[document\] none => isolate-and-credentialless (omit)]
-    expected: TIMEOUT
-
-  [[document\] none => isolate-and-credentialless + CORP]
-    expected: TIMEOUT
-
-  [[document\] none => isolate-and-require-corp]
-    expected: TIMEOUT
-
-  [[document\] none => isolate-and-require-corp (omit)]
-    expected: TIMEOUT
-
-  [[document\] none => isolate-and-require-corp + CORP]
-    expected: TIMEOUT
-
-  [[document\] isolate-and-credentialless => none]
-    expected: TIMEOUT
-
-  [[document\] isolate-and-credentialless => isolate-and-credentialless]
-    expected: TIMEOUT
-
-  [[document\] isolate-and-credentialless => isolate-and-require-corp]
-    expected: TIMEOUT
-
-  [[document\] isolate-and-credentialless => isolate-and-require-corp + CORP]
-    expected: TIMEOUT
-
-  [[document\] isolate-and-require-corp => none]
-    expected: TIMEOUT
-
-  [[document\] isolate-and-require-corp => isolate-and-credentialless]
-    expected: TIMEOUT
-
-  [[document\] isolate-and-require-corp => isolate-and-require-corp]
-    expected: TIMEOUT
-
-
-[credentialless-cache-storage.https.tentative.window.html?dedicated_worker]
-  expected: TIMEOUT
-  [[dedicated_worker\] none => none]
-    expected: TIMEOUT
-
-  [[dedicated_worker\] none => isolate-and-credentialless]
-    expected: TIMEOUT
-
-  [[dedicated_worker\] none => isolate-and-credentialless (omit)]
-    expected: TIMEOUT
-
-  [[dedicated_worker\] none => isolate-and-credentialless + CORP]
-    expected: TIMEOUT
-
-  [[dedicated_worker\] none => isolate-and-require-corp]
-    expected: TIMEOUT
-
-  [[dedicated_worker\] none => isolate-and-require-corp (omit)]
-    expected: TIMEOUT
-
-  [[dedicated_worker\] none => isolate-and-require-corp + CORP]
-    expected: TIMEOUT
-
-  [[dedicated_worker\] isolate-and-credentialless => none]
-    expected: TIMEOUT
-
-  [[dedicated_worker\] isolate-and-credentialless => isolate-and-credentialless]
-    expected: TIMEOUT
-
-  [[dedicated_worker\] isolate-and-credentialless => isolate-and-require-corp]
-    expected: TIMEOUT
-
-  [[dedicated_worker\] isolate-and-credentialless => isolate-and-require-corp + CORP]
-    expected: TIMEOUT
-
-  [[dedicated_worker\] isolate-and-require-corp => none]
-    expected: TIMEOUT
-
-  [[dedicated_worker\] isolate-and-require-corp => isolate-and-credentialless]
-    expected: TIMEOUT
-
-  [[dedicated_worker\] isolate-and-require-corp => isolate-and-require-corp]
-    expected: TIMEOUT
-
-
-[credentialless-cache-storage.https.tentative.window.html?service_worker]
-  expected: ERROR
-  [[service_worker\] none => none]
-    expected: TIMEOUT
-
-  [[service_worker\] none => isolate-and-credentialless]
-    expected: TIMEOUT
-
-  [[service_worker\] none => isolate-and-credentialless (omit)]
-    expected: TIMEOUT
-
-  [[service_worker\] none => isolate-and-credentialless + CORP]
-    expected: TIMEOUT
-
-  [[service_worker\] none => isolate-and-require-corp]
-    expected: TIMEOUT
-
-  [[service_worker\] none => isolate-and-require-corp (omit)]
-    expected: TIMEOUT
-
-  [[service_worker\] none => isolate-and-require-corp + CORP]
-    expected: TIMEOUT
-
-  [[service_worker\] isolate-and-credentialless => none]
-    expected: TIMEOUT
-
-  [[service_worker\] isolate-and-credentialless => isolate-and-credentialless]
-    expected: TIMEOUT
-
-  [[service_worker\] isolate-and-credentialless => isolate-and-require-corp]
-    expected: TIMEOUT
-
-  [[service_worker\] isolate-and-credentialless => isolate-and-require-corp + CORP]
-    expected: TIMEOUT
-
-  [[service_worker\] isolate-and-require-corp => none]
-    expected: TIMEOUT
-
-  [[service_worker\] isolate-and-require-corp => isolate-and-credentialless]
-    expected: TIMEOUT
-
-  [[service_worker\] isolate-and-require-corp => isolate-and-require-corp]
-    expected: TIMEOUT
-
-
-[credentialless-cache-storage.https.tentative.window.html?shared_worker]
-  expected: ERROR
diff --git a/tests/wpt/meta/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html.ini b/tests/wpt/meta/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html.ini
index e6e755c4126..7ee7b7caaaf 100644
--- a/tests/wpt/meta/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html.ini
+++ b/tests/wpt/meta/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html.ini
@@ -1,5 +1,4 @@
 [reporting-subresource-corp.tentative.https.html]
-  expected: ERROR
   [[document\] blocked due to DIP]
     expected: FAIL
 
@@ -9,9 +8,6 @@
   [destination: script]
     expected: FAIL
 
-  [[dedicated worker\] same-origin]
-    expected: FAIL
-
   [[dedicated worker\] blocked by CORP: same-origin]
     expected: FAIL
 
@@ -44,3 +40,12 @@
 
   [[between service worker and page\] blocked during redirect]
     expected: FAIL
+
+  [[document with service worker\] same-origin]
+    expected: FAIL
+
+  [[document with service worker\] blocked due to DIP]
+    expected: FAIL
+
+  [[document with service worker\] blocked during redirect]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/dom/documents/dom-tree-accessors/nameditem-01.html.ini b/tests/wpt/meta/html/dom/documents/dom-tree-accessors/nameditem-01.html.ini
new file mode 100644
index 00000000000..50950d2751b
--- /dev/null
+++ b/tests/wpt/meta/html/dom/documents/dom-tree-accessors/nameditem-01.html.ini
@@ -0,0 +1,9 @@
+[nameditem-01.html]
+  [img elements that have a name and id attribute with same value.]
+    expected: FAIL
+
+  [Dynamically updating the name attribute from img elements, should be accessible by values.]
+    expected: FAIL
+
+  [Dynamically updating the id attribute from img elements, should be accessible by values.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/dom/documents/dom-tree-accessors/nameditem-05.html.ini b/tests/wpt/meta/html/dom/documents/dom-tree-accessors/nameditem-05.html.ini
index 704c73f2085..bc9680580ee 100644
--- a/tests/wpt/meta/html/dom/documents/dom-tree-accessors/nameditem-05.html.ini
+++ b/tests/wpt/meta/html/dom/documents/dom-tree-accessors/nameditem-05.html.ini
@@ -13,3 +13,15 @@
 
   [An id shouldn't affect getting an embed by name]
     expected: FAIL
+
+  [Dynamically removing the name attribute from embed elements, should not be accessible.]
+    expected: FAIL
+
+  [Dynamically updating the name attribute from embed elements, should be accessible by its name.]
+    expected: FAIL
+
+  [Dynamically updating the id attribute from embed elements, should be accessible only by its name.]
+    expected: FAIL
+
+  [embed elements that is removed, should not be accessible.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/dom/documents/dom-tree-accessors/nameditem-07.html.ini b/tests/wpt/meta/html/dom/documents/dom-tree-accessors/nameditem-07.html.ini
index 2829186d845..b23c03a5a9b 100644
--- a/tests/wpt/meta/html/dom/documents/dom-tree-accessors/nameditem-07.html.ini
+++ b/tests/wpt/meta/html/dom/documents/dom-tree-accessors/nameditem-07.html.ini
@@ -22,3 +22,18 @@
 
   [An id shouldn't affect getting an object by name]
     expected: FAIL
+
+  [Dynamically removing the name attribute from object elements, should not be accessible.]
+    expected: FAIL
+
+  [Dynamically removing the id attribute from object elements, should not be accessible.]
+    expected: FAIL
+
+  [Dynamically updating the name attribute from object elements, should be accessible by its name and id.]
+    expected: FAIL
+
+  [Dynamically updating the id attribute from object elements, should be accessible by its name and id.]
+    expected: FAIL
+
+  [object elements that is removed, should not be accessible.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/dom/elements/the-innertext-and-outertext-properties/getter.html.ini b/tests/wpt/meta/html/dom/elements/the-innertext-and-outertext-properties/getter.html.ini
index 37d45a806a3..e9684d8cd7e 100644
--- a/tests/wpt/meta/html/dom/elements/the-innertext-and-outertext-properties/getter.html.ini
+++ b/tests/wpt/meta/html/dom/elements/the-innertext-and-outertext-properties/getter.html.ini
@@ -17,14 +17,29 @@
   [unopened <details> ignored ("<div><details><summary>abc</summary>123")]
     expected: FAIL
 
-  [Whitespace around inline-grid should not be collapsed ("<div>abc <span style='display:inline-grid'></span> def")]
-    expected: FAIL
-
-  [Leading/trailing space removal at display:inline-grid boundary ("<div>123<span style='display:inline-grid'> abc </span>def")]
-    expected: FAIL
-
   [::first-line styles applied ("<div class='first-line-uppercase'>abc")]
     expected: FAIL
 
   [opened <details> content shown ("<div><details open><summary>abc</summary>123")]
     expected: FAIL
+
+  [<select size='1'> contents of options preserved ("<select size='1'><option>abc</option><option>def")]
+    expected: FAIL
+
+  [<select size='2'> contents of options preserved ("<select size='2'><option>abc</option><option>def")]
+    expected: FAIL
+
+  [empty <optgroup> in <select> ("<div>a<select><optgroup></select>bc")]
+    expected: FAIL
+
+  [empty <option> in <select> ("<div>a<select><option></select>bc")]
+    expected: FAIL
+
+  [<optgroup> containing <option> ("<select><optgroup><option>abc</select>")]
+    expected: FAIL
+
+  [<select size='1'> contents of options preserved ("<div><select size='1'><option>abc</option><option>def")]
+    expected: FAIL
+
+  [<select size='2'> contents of options preserved ("<div><select size='2'><option>abc</option><option>def")]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/dom/idlharness.any.js.ini b/tests/wpt/meta/html/dom/idlharness.any.js.ini
index 1ffefa4d7d9..ad5e57e0759 100644
--- a/tests/wpt/meta/html/dom/idlharness.any.js.ini
+++ b/tests/wpt/meta/html/dom/idlharness.any.js.ini
@@ -71,15 +71,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation strokeText(DOMString, unrestricted double, unrestricted double, optional unrestricted double)]
     expected: FAIL
 
-  [OffscreenCanvasRenderingContext2D interface: operation setLineDash(sequence<unrestricted double>)]
-    expected: FAIL
-
-  [OffscreenCanvasRenderingContext2D interface: operation getLineDash()]
-    expected: FAIL
-
-  [OffscreenCanvasRenderingContext2D interface: attribute lineDashOffset]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: attribute letterSpacing]
     expected: FAIL
 
@@ -104,9 +95,6 @@
   [History interface: existence and properties of interface object]
     expected: FAIL
 
-  [MessagePort interface: attribute onclose]
-    expected: FAIL
-
   [WorkerGlobalScope interface: attribute onlanguagechange]
     expected: FAIL
 
@@ -194,21 +182,18 @@
   [WorkerNavigator interface: member taintEnabled]
     expected: FAIL
 
-  [WorkerNavigator interface: attribute onLine]
-    expected: FAIL
-
   [WorkerNavigator interface: self.navigator must not have property "taintEnabled"]
     expected: FAIL
 
-  [WorkerNavigator interface: self.navigator must inherit property "onLine" with the proper type]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation getContextAttributes()]
     expected: FAIL
 
   [OffscreenCanvasRenderingContext2D interface: attribute lang]
     expected: FAIL
 
+  [ImageData interface: attribute pixelFormat]
+    expected: FAIL
+
 
 [idlharness.any.shadowrealm-in-window.html]
   expected: ERROR
diff --git a/tests/wpt/meta/html/dom/idlharness.https.html.ini b/tests/wpt/meta/html/dom/idlharness.https.html.ini
index 92bcad853c6..981cd249aa6 100644
--- a/tests/wpt/meta/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/meta/html/dom/idlharness.https.html.ini
@@ -146,9 +146,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation commit()]
     expected: FAIL
 
-  [CanvasRenderingContext2D interface: operation setLineDash(sequence<unrestricted double>)]
-    expected: FAIL
-
   [DataTransferItemList interface object name]
     expected: FAIL
 
@@ -698,9 +695,6 @@
   [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "imageSmoothingQuality" with the proper type]
     expected: FAIL
 
-  [Navigator interface: attribute onLine]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation getLineDash()]
     expected: FAIL
 
@@ -1523,9 +1517,6 @@
   [SVGSVGElement interface: attribute onpagereveal]
     expected: FAIL
 
-  [MessagePort interface: attribute onclose]
-    expected: FAIL
-
   [NotRestoredReasonDetails interface: existence and properties of interface object]
     expected: FAIL
 
@@ -1652,12 +1643,6 @@
   [Element interface: calling setHTMLUnsafe((TrustedHTML or DOMString)) on document.createElement("noscript") with too few arguments must throw TypeError]
     expected: FAIL
 
-  [Element interface: document.createElement("noscript") must inherit property "innerHTML" with the proper type]
-    expected: FAIL
-
-  [Element interface: document.createElement("noscript") must inherit property "outerHTML" with the proper type]
-    expected: FAIL
-
   [ShadowRoot interface: operation setHTMLUnsafe((TrustedHTML or DOMString))]
     expected: FAIL
 
@@ -1672,48 +1657,27 @@
   [Window interface: window must inherit property "external" with the proper type]
     expected: FAIL
 
-  [Window interface: attribute onwebkitanimationstart]
-    expected: FAIL
-
   [Window interface: window must inherit property "statusbar" with the proper type]
     expected: FAIL
 
-  [Document interface: new Document() must inherit property "onwebkittransitionend" with the proper type]
-    expected: FAIL
-
   [Document interface: calling queryCommandEnabled(DOMString) on documentWithHandlers with too few arguments must throw TypeError]
     expected: FAIL
 
-  [Document interface: new Document() must inherit property "onwebkitanimationstart" with the proper type]
-    expected: FAIL
-
   [Document interface: calling queryCommandIndeterm(DOMString) on documentWithHandlers with too few arguments must throw TypeError]
     expected: FAIL
 
-  [Document interface: iframe.contentDocument must inherit property "onwebkitanimationend" with the proper type]
-    expected: FAIL
-
   [Document interface: iframe.contentDocument must inherit property "dir" with the proper type]
     expected: FAIL
 
-  [Window interface: window must inherit property "onwebkitanimationiteration" with the proper type]
-    expected: FAIL
-
   [Window interface: window must inherit property "applicationCache" with the proper type]
     expected: FAIL
 
-  [Document interface: attribute onauxclick]
-    expected: FAIL
-
   [Window interface: window must inherit property "menubar" with the proper type]
     expected: FAIL
 
   [Window interface: internal [[SetPrototypeOf\]\] method of interface prototype object - setting to a new value via Reflect.setPrototypeOf should return false]
     expected: FAIL
 
-  [Document interface: new Document() must inherit property "onwebkitanimationiteration" with the proper type]
-    expected: FAIL
-
   [Document interface: attribute designMode]
     expected: FAIL
 
@@ -1729,9 +1693,6 @@
   [Document interface: calling execCommand(DOMString, optional boolean, optional DOMString) on new Document() with too few arguments must throw TypeError]
     expected: FAIL
 
-  [Document interface: attribute onwebkitanimationiteration]
-    expected: FAIL
-
   [Document interface: operation queryCommandEnabled(DOMString)]
     expected: FAIL
 
@@ -1750,51 +1711,30 @@
   [Document interface: attribute all]
     expected: FAIL
 
-  [Window interface: operation focus()]
-    expected: FAIL
-
   [Window interface: attribute scrollbars]
     expected: FAIL
 
   [Document interface: iframe.contentDocument must inherit property "linkColor" with the proper type]
     expected: FAIL
 
-  [Document interface: documentWithHandlers must inherit property "onslotchange" with the proper type]
-    expected: FAIL
-
   [Document interface: documentWithHandlers must inherit property "alinkColor" with the proper type]
     expected: FAIL
 
   [Document interface: documentWithHandlers must inherit property "dir" with the proper type]
     expected: FAIL
 
-  [Window interface: window must inherit property "onslotchange" with the proper type]
-    expected: FAIL
-
   [SVGAElement includes HTMLHyperlinkElementUtils: member names are unique]
     expected: FAIL
 
   [Window interface: attribute applicationCache]
     expected: FAIL
 
-  [Document interface: iframe.contentDocument must inherit property "onwebkitanimationstart" with the proper type]
-    expected: FAIL
-
-  [Document interface: attribute onslotchange]
-    expected: FAIL
-
   [Document interface: calling queryCommandIndeterm(DOMString) on iframe.contentDocument with too few arguments must throw TypeError]
     expected: FAIL
 
   [Document interface: iframe.contentDocument must inherit property "queryCommandValue(DOMString)" with the proper type]
     expected: FAIL
 
-  [Document interface: iframe.contentDocument must inherit property "onwebkitanimationiteration" with the proper type]
-    expected: FAIL
-
-  [Document interface: attribute onwebkittransitionend]
-    expected: FAIL
-
   [Document interface: iframe.contentDocument must inherit property "all" with the proper type]
     expected: FAIL
 
@@ -1807,9 +1747,6 @@
   [Document interface: attribute linkColor]
     expected: FAIL
 
-  [Window interface: attribute onwebkitanimationiteration]
-    expected: FAIL
-
   [Window interface: window must inherit property "scrollbars" with the proper type]
     expected: FAIL
 
@@ -1825,18 +1762,12 @@
   [Document interface: iframe.contentDocument must inherit property "designMode" with the proper type]
     expected: FAIL
 
-  [Document interface: documentWithHandlers must inherit property "onwebkitanimationiteration" with the proper type]
-    expected: FAIL
-
   [Window interface: attribute toolbar]
     expected: FAIL
 
   [Window interface: attribute statusbar]
     expected: FAIL
 
-  [Window interface: window must inherit property "onwebkittransitionend" with the proper type]
-    expected: FAIL
-
   [Document interface: new Document() must inherit property "linkColor" with the proper type]
     expected: FAIL
 
@@ -1846,15 +1777,9 @@
   [Document interface: new Document() must inherit property "queryCommandState(DOMString)" with the proper type]
     expected: FAIL
 
-  [Window interface: attribute onwebkittransitionend]
-    expected: FAIL
-
   [Document interface: calling execCommand(DOMString, optional boolean, optional DOMString) on iframe.contentDocument with too few arguments must throw TypeError]
     expected: FAIL
 
-  [Document interface: new Document() must inherit property "onslotchange" with the proper type]
-    expected: FAIL
-
   [Document interface: documentWithHandlers must inherit property "designMode" with the proper type]
     expected: FAIL
 
@@ -1873,18 +1798,12 @@
   [Window interface: window must inherit property "personalbar" with the proper type]
     expected: FAIL
 
-  [Document interface: attribute onwebkitanimationend]
-    expected: FAIL
-
   [Window interface: internal [[SetPrototypeOf\]\] method of interface prototype object - setting to a new value via __proto__ should throw a TypeError]
     expected: FAIL
 
   [Document interface: new Document() must inherit property "dir" with the proper type]
     expected: FAIL
 
-  [Window interface: window must inherit property "blur()" with the proper type]
-    expected: FAIL
-
   [Document interface: operation execCommand(DOMString, optional boolean, optional DOMString)]
     expected: FAIL
 
@@ -1903,27 +1822,15 @@
   [Document interface: attribute vlinkColor]
     expected: FAIL
 
-  [Window interface: window must inherit property "onauxclick" with the proper type]
-    expected: FAIL
-
   [Document interface: iframe.contentDocument must inherit property "queryCommandEnabled(DOMString)" with the proper type]
     expected: FAIL
 
-  [Window interface: operation blur()]
-    expected: FAIL
-
-  [Document interface: iframe.contentDocument must inherit property "onslotchange" with the proper type]
-    expected: FAIL
-
   [Document interface: new Document() must inherit property "alinkColor" with the proper type]
     expected: FAIL
 
   [Document interface: new Document() must inherit property "queryCommandEnabled(DOMString)" with the proper type]
     expected: FAIL
 
-  [Window interface: attribute onslotchange]
-    expected: FAIL
-
   [Document interface: new Document() must inherit property "all" with the proper type]
     expected: FAIL
 
@@ -1933,27 +1840,6 @@
   [Window interface: window must inherit property "print()" with the proper type]
     expected: FAIL
 
-  [Document interface: documentWithHandlers must inherit property "onauxclick" with the proper type]
-    expected: FAIL
-
-  [Window interface: window must inherit property "focus()" with the proper type]
-    expected: FAIL
-
-  [Document interface: documentWithHandlers must inherit property "onwebkitanimationend" with the proper type]
-    expected: FAIL
-
-  [Document interface: new Document() must inherit property "onauxclick" with the proper type]
-    expected: FAIL
-
-  [Document interface: documentWithHandlers must inherit property "onwebkitanimationstart" with the proper type]
-    expected: FAIL
-
-  [Document interface: attribute onwebkitanimationstart]
-    expected: FAIL
-
-  [Document interface: iframe.contentDocument must inherit property "onauxclick" with the proper type]
-    expected: FAIL
-
   [Document interface: calling queryCommandValue(DOMString) on documentWithHandlers with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -1966,9 +1852,6 @@
   [Document interface: calling queryCommandState(DOMString) on new Document() with too few arguments must throw TypeError]
     expected: FAIL
 
-  [Window interface: attribute onauxclick]
-    expected: FAIL
-
   [Document interface: iframe.contentDocument must inherit property "queryCommandState(DOMString)" with the proper type]
     expected: FAIL
 
@@ -1981,48 +1864,30 @@
   [Document interface: new Document() must inherit property "queryCommandValue(DOMString)" with the proper type]
     expected: FAIL
 
-  [Window interface: window must inherit property "onwebkitanimationend" with the proper type]
-    expected: FAIL
-
   [Window interface: window must inherit property "toolbar" with the proper type]
     expected: FAIL
 
   [Document interface: documentWithHandlers must inherit property "linkColor" with the proper type]
     expected: FAIL
 
-  [Document interface: new Document() must inherit property "onwebkitanimationend" with the proper type]
-    expected: FAIL
-
   [Document interface: operation queryCommandIndeterm(DOMString)]
     expected: FAIL
 
-  [Document interface: iframe.contentDocument must inherit property "onwebkittransitionend" with the proper type]
-    expected: FAIL
-
   [Document interface: calling queryCommandIndeterm(DOMString) on new Document() with too few arguments must throw TypeError]
     expected: FAIL
 
-  [Window interface: attribute onwebkitanimationend]
-    expected: FAIL
-
   [Document interface: calling execCommand(DOMString, optional boolean, optional DOMString) on documentWithHandlers with too few arguments must throw TypeError]
     expected: FAIL
 
   [Document interface: documentWithHandlers must inherit property "queryCommandState(DOMString)" with the proper type]
     expected: FAIL
 
-  [Document interface: documentWithHandlers must inherit property "onwebkittransitionend" with the proper type]
-    expected: FAIL
-
   [Document interface: new Document() must inherit property "vlinkColor" with the proper type]
     expected: FAIL
 
   [Window interface: window must inherit property "locationbar" with the proper type]
     expected: FAIL
 
-  [Window interface: window must inherit property "onwebkitanimationstart" with the proper type]
-    expected: FAIL
-
   [Document interface: documentWithHandlers must inherit property "queryCommandIndeterm(DOMString)" with the proper type]
     expected: FAIL
 
@@ -2050,24 +1915,12 @@
   [Window interface: attribute clientInformation]
     expected: FAIL
 
-  [Window interface: attribute oncontextlost]
-    expected: FAIL
-
-  [Window interface: attribute oncontextrestored]
-    expected: FAIL
-
   [Window interface: operation reportError(any)]
     expected: FAIL
 
   [Window interface: window must inherit property "clientInformation" with the proper type]
     expected: FAIL
 
-  [Window interface: window must inherit property "oncontextlost" with the proper type]
-    expected: FAIL
-
-  [Window interface: window must inherit property "oncontextrestored" with the proper type]
-    expected: FAIL
-
   [Window interface: window must inherit property "reportError(any)" with the proper type]
     expected: FAIL
 
@@ -2077,129 +1930,15 @@
   [Document interface: attribute onvisibilitychange]
     expected: FAIL
 
-  [Document interface: attribute oncontextlost]
-    expected: FAIL
-
-  [Document interface: attribute oncontextrestored]
-    expected: FAIL
-
   [Document interface: iframe.contentDocument must inherit property "onvisibilitychange" with the proper type]
     expected: FAIL
 
-  [Document interface: iframe.contentDocument must inherit property "oncontextlost" with the proper type]
-    expected: FAIL
-
-  [Document interface: iframe.contentDocument must inherit property "oncontextrestored" with the proper type]
-    expected: FAIL
-
   [Document interface: new Document() must inherit property "onvisibilitychange" with the proper type]
     expected: FAIL
 
-  [Document interface: new Document() must inherit property "oncontextlost" with the proper type]
-    expected: FAIL
-
-  [Document interface: new Document() must inherit property "oncontextrestored" with the proper type]
-    expected: FAIL
-
   [Document interface: documentWithHandlers must inherit property "onvisibilitychange" with the proper type]
     expected: FAIL
 
-  [Document interface: documentWithHandlers must inherit property "oncontextlost" with the proper type]
-    expected: FAIL
-
-  [Document interface: documentWithHandlers must inherit property "oncontextrestored" with the proper type]
-    expected: FAIL
-
-  [Window interface: attribute onbeforeinput]
-    expected: FAIL
-
-  [Window interface: attribute onbeforematch]
-    expected: FAIL
-
-  [Window interface: attribute onscrollend]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onbeforeinput" with the proper type]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onbeforematch" with the proper type]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onscrollend" with the proper type]
-    expected: FAIL
-
-  [Document interface: attribute onbeforeinput]
-    expected: FAIL
-
-  [Document interface: attribute onbeforematch]
-    expected: FAIL
-
-  [Document interface: attribute onscrollend]
-    expected: FAIL
-
-  [Document interface: iframe.contentDocument must inherit property "onbeforeinput" with the proper type]
-    expected: FAIL
-
-  [Document interface: iframe.contentDocument must inherit property "onbeforematch" with the proper type]
-    expected: FAIL
-
-  [Document interface: iframe.contentDocument must inherit property "onscrollend" with the proper type]
-    expected: FAIL
-
-  [Document interface: new Document() must inherit property "onbeforeinput" with the proper type]
-    expected: FAIL
-
-  [Document interface: new Document() must inherit property "onbeforematch" with the proper type]
-    expected: FAIL
-
-  [Document interface: new Document() must inherit property "onscrollend" with the proper type]
-    expected: FAIL
-
-  [Document interface: documentWithHandlers must inherit property "onbeforeinput" with the proper type]
-    expected: FAIL
-
-  [Document interface: documentWithHandlers must inherit property "onbeforematch" with the proper type]
-    expected: FAIL
-
-  [Document interface: documentWithHandlers must inherit property "onscrollend" with the proper type]
-    expected: FAIL
-
-  [Window interface: attribute oncopy]
-    expected: FAIL
-
-  [Window interface: attribute oncut]
-    expected: FAIL
-
-  [Window interface: attribute onpaste]
-    expected: FAIL
-
-  [Window interface: window must inherit property "oncopy" with the proper type]
-    expected: FAIL
-
-  [Window interface: window must inherit property "oncut" with the proper type]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onpaste" with the proper type]
-    expected: FAIL
-
-  [Window interface: attribute onbeforetoggle]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onbeforetoggle" with the proper type]
-    expected: FAIL
-
-  [Document interface: attribute onbeforetoggle]
-    expected: FAIL
-
-  [Document interface: iframe.contentDocument must inherit property "onbeforetoggle" with the proper type]
-    expected: FAIL
-
-  [Document interface: new Document() must inherit property "onbeforetoggle" with the proper type]
-    expected: FAIL
-
-  [Document interface: documentWithHandlers must inherit property "onbeforetoggle" with the proper type]
-    expected: FAIL
-
   [Window interface: attribute navigation]
     expected: FAIL
 
@@ -2218,18 +1957,6 @@
   [Document interface: calling parseHTMLUnsafe(DOMString) on documentWithHandlers with too few arguments must throw TypeError]
     expected: FAIL
 
-  [Window interface: attribute onpagereveal]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onpagereveal" with the proper type]
-    expected: FAIL
-
-  [Window interface: attribute onpageswap]
-    expected: FAIL
-
-  [Window interface: window must inherit property "onpageswap" with the proper type]
-    expected: FAIL
-
   [Document interface: operation parseHTMLUnsafe(HTMLString)]
     expected: FAIL
 
@@ -2254,24 +1981,6 @@
   [Document interface: calling parseHTMLUnsafe((TrustedHTML or DOMString)) on documentWithHandlers with too few arguments must throw TypeError]
     expected: FAIL
 
-  [Window interface: attribute oncommand]
-    expected: FAIL
-
-  [Window interface: window must inherit property "oncommand" with the proper type]
-    expected: FAIL
-
-  [Document interface: attribute oncommand]
-    expected: FAIL
-
-  [Document interface: iframe.contentDocument must inherit property "oncommand" with the proper type]
-    expected: FAIL
-
-  [Document interface: new Document() must inherit property "oncommand" with the proper type]
-    expected: FAIL
-
-  [Document interface: documentWithHandlers must inherit property "oncommand" with the proper type]
-    expected: FAIL
-
 
 [idlharness.https.html?include=HTML.*]
   [HTMLTableSectionElement interface: document.createElement("tfoot") must inherit property "align" with the proper type]
@@ -2331,9 +2040,6 @@
   [HTMLSelectElement interface: document.createElement("select") must inherit property "autocomplete" with the proper type]
     expected: FAIL
 
-  [HTMLMediaElement interface: attribute seekable]
-    expected: FAIL
-
   [HTMLTableSectionElement interface: attribute align]
     expected: FAIL
 
@@ -2640,12 +2346,6 @@
   [HTMLImageElement interface: document.createElement("img") must inherit property "decoding" with the proper type]
     expected: FAIL
 
-  [HTMLElement interface: attribute onwebkitanimationiteration]
-    expected: FAIL
-
-  [HTMLElement interface: attribute onslotchange]
-    expected: FAIL
-
   [HTMLVideoElement interface: attribute width]
     expected: FAIL
 
@@ -2757,9 +2457,6 @@
   [HTMLAnchorElement interface: attribute type]
     expected: FAIL
 
-  [HTMLElement interface: attribute onwebkitanimationend]
-    expected: FAIL
-
   [HTMLInputElement interface: attribute height]
     expected: FAIL
 
@@ -2979,9 +2676,6 @@
   [HTMLElement interface: attribute tabIndex]
     expected: FAIL
 
-  [HTMLElement interface: attribute onwebkitanimationstart]
-    expected: FAIL
-
   [HTMLImageElement interface: new Image() must inherit property "loading" with the proper type]
     expected: FAIL
 
@@ -3669,9 +3363,6 @@
   [HTMLAllCollection interface: document.all must inherit property "namedItem(DOMString)" with the proper type]
     expected: FAIL
 
-  [HTMLElement interface: attribute onwebkittransitionend]
-    expected: FAIL
-
   [HTMLLinkElement interface: document.createElement("link") must inherit property "imageSrcset" with the proper type]
     expected: FAIL
 
@@ -3975,12 +3666,6 @@
   [HTMLSlotElement interface: calling assign((Element or Text)...) on document.createElement("slot") with too few arguments must throw TypeError]
     expected: FAIL
 
-  [HTMLElement interface: attribute oncontextlost]
-    expected: FAIL
-
-  [HTMLElement interface: attribute oncontextrestored]
-    expected: FAIL
-
   [HTMLElement interface: document.createElement("noscript") must inherit property "oncontextlost" with the proper type]
     expected: FAIL
 
@@ -4074,15 +3759,6 @@
   [HTMLElement interface: attribute inert]
     expected: FAIL
 
-  [HTMLElement interface: attribute onbeforeinput]
-    expected: FAIL
-
-  [HTMLElement interface: attribute onbeforematch]
-    expected: FAIL
-
-  [HTMLElement interface: attribute onscrollend]
-    expected: FAIL
-
   [HTMLElement interface: document.createElement("noscript") must inherit property "inert" with the proper type]
     expected: FAIL
 
@@ -4347,36 +4023,12 @@
   [HTMLSelectElement interface: document.createElement("select") must inherit property "showPicker()" with the proper type]
     expected: FAIL
 
-  [HTMLBodyElement interface: attribute onpagereveal]
-    expected: FAIL
-
-  [HTMLBodyElement interface: document.createElement("body") must inherit property "onpagereveal" with the proper type]
-    expected: FAIL
-
-  [HTMLFrameSetElement interface: attribute onpagereveal]
-    expected: FAIL
-
-  [HTMLFrameSetElement interface: document.createElement("frameset") must inherit property "onpagereveal" with the proper type]
-    expected: FAIL
-
   [HTMLTemplateElement interface: attribute shadowRootClonable]
     expected: FAIL
 
   [HTMLTemplateElement interface: document.createElement("template") must inherit property "shadowRootClonable" with the proper type]
     expected: FAIL
 
-  [HTMLBodyElement interface: attribute onpageswap]
-    expected: FAIL
-
-  [HTMLBodyElement interface: document.createElement("body") must inherit property "onpageswap" with the proper type]
-    expected: FAIL
-
-  [HTMLFrameSetElement interface: attribute onpageswap]
-    expected: FAIL
-
-  [HTMLFrameSetElement interface: document.createElement("frameset") must inherit property "onpageswap" with the proper type]
-    expected: FAIL
-
   [HTMLElement interface: attribute writingSuggestions]
     expected: FAIL
 
@@ -4565,12 +4217,6 @@
   [DOMStringList interface: calling contains(DOMString) on location.ancestorOrigins with too few arguments must throw TypeError]
     expected: FAIL
 
-  [Element interface: document.createElement("noscript") must inherit property "innerHTML" with the proper type]
-    expected: FAIL
-
-  [Element interface: document.createElement("noscript") must inherit property "outerHTML" with the proper type]
-    expected: FAIL
-
   [TextTrack interface: attribute inBandMetadataTrackDispatchType]
     expected: FAIL
 
@@ -4613,15 +4259,6 @@
   [CanvasRenderingContext2D interface: operation strokeText(DOMString, unrestricted double, unrestricted double, optional unrestricted double)]
     expected: FAIL
 
-  [CanvasRenderingContext2D interface: operation setLineDash(sequence<unrestricted double>)]
-    expected: FAIL
-
-  [CanvasRenderingContext2D interface: operation getLineDash()]
-    expected: FAIL
-
-  [CanvasRenderingContext2D interface: attribute lineDashOffset]
-    expected: FAIL
-
   [CanvasRenderingContext2D interface: attribute letterSpacing]
     expected: FAIL
 
@@ -4691,18 +4328,6 @@
   [CanvasRenderingContext2D interface: calling strokeText(DOMString, unrestricted double, unrestricted double, optional unrestricted double) on document.createElement("canvas").getContext("2d") with too few arguments must throw TypeError]
     expected: FAIL
 
-  [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "setLineDash(sequence<unrestricted double>)" with the proper type]
-    expected: FAIL
-
-  [CanvasRenderingContext2D interface: calling setLineDash(sequence<unrestricted double>) on document.createElement("canvas").getContext("2d") with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "getLineDash()" with the proper type]
-    expected: FAIL
-
-  [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "lineDashOffset" with the proper type]
-    expected: FAIL
-
   [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "letterSpacing" with the proper type]
     expected: FAIL
 
@@ -4802,15 +4427,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation strokeText(DOMString, unrestricted double, unrestricted double, optional unrestricted double)]
     expected: FAIL
 
-  [OffscreenCanvasRenderingContext2D interface: operation setLineDash(sequence<unrestricted double>)]
-    expected: FAIL
-
-  [OffscreenCanvasRenderingContext2D interface: operation getLineDash()]
-    expected: FAIL
-
-  [OffscreenCanvasRenderingContext2D interface: attribute lineDashOffset]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: attribute letterSpacing]
     expected: FAIL
 
@@ -5396,9 +5012,6 @@
   [Navigator interface: attribute oscpu]
     expected: FAIL
 
-  [Navigator interface: attribute onLine]
-    expected: FAIL
-
   [Navigator interface: operation registerProtocolHandler(DOMString, USVString)]
     expected: FAIL
 
@@ -5414,9 +5027,6 @@
   [Navigator interface: window.navigator must inherit property "oscpu" with the proper type]
     expected: FAIL
 
-  [Navigator interface: window.navigator must inherit property "onLine" with the proper type]
-    expected: FAIL
-
   [Navigator interface: window.navigator must inherit property "registerProtocolHandler(DOMString, USVString)" with the proper type]
     expected: FAIL
 
@@ -5432,9 +5042,6 @@
   [Navigator interface: window.navigator must inherit property "pdfViewerEnabled" with the proper type]
     expected: FAIL
 
-  [MessagePort interface: attribute onclose]
-    expected: FAIL
-
   [SharedWorker interface: existence and properties of interface object]
     expected: FAIL
 
@@ -5516,240 +5123,9 @@
   [External interface: window.external must inherit property "IsSearchProviderInstalled()" with the proper type]
     expected: FAIL
 
-  [SVGElement interface: attribute onabort]
-    expected: FAIL
-
-  [SVGElement interface: attribute onauxclick]
-    expected: FAIL
-
-  [SVGElement interface: attribute onbeforeinput]
-    expected: FAIL
-
-  [SVGElement interface: attribute onbeforematch]
-    expected: FAIL
-
-  [SVGElement interface: attribute onbeforetoggle]
-    expected: FAIL
-
-  [SVGElement interface: attribute onblur]
-    expected: FAIL
-
-  [SVGElement interface: attribute oncancel]
-    expected: FAIL
-
-  [SVGElement interface: attribute oncanplay]
-    expected: FAIL
-
-  [SVGElement interface: attribute oncanplaythrough]
-    expected: FAIL
-
-  [SVGElement interface: attribute onchange]
-    expected: FAIL
-
-  [SVGElement interface: attribute onclick]
-    expected: FAIL
-
-  [SVGElement interface: attribute onclose]
-    expected: FAIL
-
-  [SVGElement interface: attribute oncontextlost]
-    expected: FAIL
-
-  [SVGElement interface: attribute oncontextmenu]
-    expected: FAIL
-
-  [SVGElement interface: attribute oncontextrestored]
-    expected: FAIL
-
-  [SVGElement interface: attribute oncopy]
-    expected: FAIL
-
-  [SVGElement interface: attribute oncuechange]
-    expected: FAIL
-
-  [SVGElement interface: attribute oncut]
-    expected: FAIL
-
-  [SVGElement interface: attribute ondblclick]
-    expected: FAIL
-
-  [SVGElement interface: attribute ondrag]
-    expected: FAIL
-
-  [SVGElement interface: attribute ondragend]
-    expected: FAIL
-
-  [SVGElement interface: attribute ondragenter]
-    expected: FAIL
-
-  [SVGElement interface: attribute ondragleave]
-    expected: FAIL
-
-  [SVGElement interface: attribute ondragover]
-    expected: FAIL
-
-  [SVGElement interface: attribute ondragstart]
-    expected: FAIL
-
-  [SVGElement interface: attribute ondrop]
-    expected: FAIL
-
-  [SVGElement interface: attribute ondurationchange]
-    expected: FAIL
-
-  [SVGElement interface: attribute onemptied]
-    expected: FAIL
-
-  [SVGElement interface: attribute onended]
-    expected: FAIL
-
-  [SVGElement interface: attribute onerror]
-    expected: FAIL
-
-  [SVGElement interface: attribute onfocus]
-    expected: FAIL
-
-  [SVGElement interface: attribute onformdata]
-    expected: FAIL
-
-  [SVGElement interface: attribute oninput]
-    expected: FAIL
-
-  [SVGElement interface: attribute oninvalid]
-    expected: FAIL
-
-  [SVGElement interface: attribute onkeydown]
-    expected: FAIL
-
-  [SVGElement interface: attribute onkeypress]
-    expected: FAIL
-
-  [SVGElement interface: attribute onkeyup]
-    expected: FAIL
-
-  [SVGElement interface: attribute onload]
-    expected: FAIL
-
-  [SVGElement interface: attribute onloadeddata]
-    expected: FAIL
-
-  [SVGElement interface: attribute onloadedmetadata]
-    expected: FAIL
-
-  [SVGElement interface: attribute onloadstart]
-    expected: FAIL
-
-  [SVGElement interface: attribute onmousedown]
-    expected: FAIL
-
-  [SVGElement interface: attribute onmouseenter]
-    expected: FAIL
-
-  [SVGElement interface: attribute onmouseleave]
-    expected: FAIL
-
-  [SVGElement interface: attribute onmousemove]
-    expected: FAIL
-
-  [SVGElement interface: attribute onmouseout]
-    expected: FAIL
-
-  [SVGElement interface: attribute onmouseover]
-    expected: FAIL
-
-  [SVGElement interface: attribute onmouseup]
-    expected: FAIL
-
-  [SVGElement interface: attribute onpaste]
-    expected: FAIL
-
-  [SVGElement interface: attribute onpause]
-    expected: FAIL
-
-  [SVGElement interface: attribute onplay]
-    expected: FAIL
-
-  [SVGElement interface: attribute onplaying]
-    expected: FAIL
-
-  [SVGElement interface: attribute onprogress]
-    expected: FAIL
-
-  [SVGElement interface: attribute onratechange]
-    expected: FAIL
-
-  [SVGElement interface: attribute onreset]
-    expected: FAIL
-
-  [SVGElement interface: attribute onresize]
-    expected: FAIL
-
-  [SVGElement interface: attribute onscroll]
-    expected: FAIL
-
-  [SVGElement interface: attribute onscrollend]
-    expected: FAIL
-
-  [SVGElement interface: attribute onsecuritypolicyviolation]
-    expected: FAIL
-
-  [SVGElement interface: attribute onseeked]
-    expected: FAIL
-
-  [SVGElement interface: attribute onseeking]
-    expected: FAIL
-
-  [SVGElement interface: attribute onselect]
-    expected: FAIL
-
-  [SVGElement interface: attribute onslotchange]
-    expected: FAIL
-
-  [SVGElement interface: attribute onstalled]
-    expected: FAIL
-
-  [SVGElement interface: attribute onsubmit]
-    expected: FAIL
-
-  [SVGElement interface: attribute onsuspend]
-    expected: FAIL
-
-  [SVGElement interface: attribute ontimeupdate]
-    expected: FAIL
-
-  [SVGElement interface: attribute ontoggle]
-    expected: FAIL
-
-  [SVGElement interface: attribute onvolumechange]
-    expected: FAIL
-
-  [SVGElement interface: attribute onwaiting]
-    expected: FAIL
-
-  [SVGElement interface: attribute onwebkitanimationend]
-    expected: FAIL
-
-  [SVGElement interface: attribute onwebkitanimationiteration]
-    expected: FAIL
-
-  [SVGElement interface: attribute onwebkitanimationstart]
-    expected: FAIL
-
-  [SVGElement interface: attribute onwebkittransitionend]
-    expected: FAIL
-
-  [SVGElement interface: attribute onwheel]
-    expected: FAIL
-
   [SVGElement interface: attribute dataset]
     expected: FAIL
 
-  [SVGElement interface: attribute nonce]
-    expected: FAIL
-
-  [SVGElement interface: attribute autofocus]
-    expected: FAIL
-
   [SVGElement interface: attribute tabIndex]
     expected: FAIL
 
@@ -5813,9 +5189,6 @@
   [SVGSVGElement interface: attribute onunload]
     expected: FAIL
 
-  [ShadowRoot interface: operation setHTMLUnsafe((TrustedHTML or DOMString))]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation getContextAttributes()]
     expected: FAIL
 
@@ -5846,9 +5219,6 @@
   [CommandEvent interface: attribute command]
     expected: FAIL
 
-  [SVGElement interface: attribute oncommand]
-    expected: FAIL
-
   [CanvasRenderingContext2D interface: attribute lang]
     expected: FAIL
 
@@ -5858,10 +5228,13 @@
   [OffscreenCanvasRenderingContext2D interface: attribute lang]
     expected: FAIL
 
-  [Element interface: document.createElement("div") must inherit property "innerHTML" with the proper type]
+  [ImageData interface: attribute pixelFormat]
     expected: FAIL
 
-  [Element interface: document.createElement("div") must inherit property "outerHTML" with the proper type]
+  [ImageData interface: new ImageData(10, 10) must inherit property "pixelFormat" with the proper type]
+    expected: FAIL
+
+  [CustomElementRegistry interface: operation initialize(Node)]
     expected: FAIL
 
 
@@ -5947,42 +5320,6 @@
   [HTMLElement interface: attribute popover]
     expected: FAIL
 
-  [HTMLElement interface: attribute onauxclick]
-    expected: FAIL
-
-  [HTMLElement interface: attribute onbeforeinput]
-    expected: FAIL
-
-  [HTMLElement interface: attribute onbeforematch]
-    expected: FAIL
-
-  [HTMLElement interface: attribute onbeforetoggle]
-    expected: FAIL
-
-  [HTMLElement interface: attribute oncontextlost]
-    expected: FAIL
-
-  [HTMLElement interface: attribute oncontextrestored]
-    expected: FAIL
-
-  [HTMLElement interface: attribute onscrollend]
-    expected: FAIL
-
-  [HTMLElement interface: attribute onslotchange]
-    expected: FAIL
-
-  [HTMLElement interface: attribute onwebkitanimationend]
-    expected: FAIL
-
-  [HTMLElement interface: attribute onwebkitanimationiteration]
-    expected: FAIL
-
-  [HTMLElement interface: attribute onwebkitanimationstart]
-    expected: FAIL
-
-  [HTMLElement interface: attribute onwebkittransitionend]
-    expected: FAIL
-
   [HTMLElement interface: attribute enterKeyHint]
     expected: FAIL
 
@@ -6031,42 +5368,6 @@
   [HTMLElement interface: document.createElement("noscript") must inherit property "popover" with the proper type]
     expected: FAIL
 
-  [HTMLElement interface: document.createElement("noscript") must inherit property "onauxclick" with the proper type]
-    expected: FAIL
-
-  [HTMLElement interface: document.createElement("noscript") must inherit property "onbeforeinput" with the proper type]
-    expected: FAIL
-
-  [HTMLElement interface: document.createElement("noscript") must inherit property "onbeforematch" with the proper type]
-    expected: FAIL
-
-  [HTMLElement interface: document.createElement("noscript") must inherit property "onbeforetoggle" with the proper type]
-    expected: FAIL
-
-  [HTMLElement interface: document.createElement("noscript") must inherit property "oncontextlost" with the proper type]
-    expected: FAIL
-
-  [HTMLElement interface: document.createElement("noscript") must inherit property "oncontextrestored" with the proper type]
-    expected: FAIL
-
-  [HTMLElement interface: document.createElement("noscript") must inherit property "onscrollend" with the proper type]
-    expected: FAIL
-
-  [HTMLElement interface: document.createElement("noscript") must inherit property "onslotchange" with the proper type]
-    expected: FAIL
-
-  [HTMLElement interface: document.createElement("noscript") must inherit property "onwebkitanimationend" with the proper type]
-    expected: FAIL
-
-  [HTMLElement interface: document.createElement("noscript") must inherit property "onwebkitanimationiteration" with the proper type]
-    expected: FAIL
-
-  [HTMLElement interface: document.createElement("noscript") must inherit property "onwebkitanimationstart" with the proper type]
-    expected: FAIL
-
-  [HTMLElement interface: document.createElement("noscript") must inherit property "onwebkittransitionend" with the proper type]
-    expected: FAIL
-
   [HTMLElement interface: document.createElement("noscript") must inherit property "enterKeyHint" with the proper type]
     expected: FAIL
 
@@ -6103,9 +5404,6 @@
   [HTMLLinkElement interface: attribute blocking]
     expected: FAIL
 
-  [HTMLLinkElement interface: attribute disabled]
-    expected: FAIL
-
   [HTMLLinkElement interface: attribute fetchPriority]
     expected: FAIL
 
@@ -6124,9 +5422,6 @@
   [HTMLLinkElement interface: document.createElement("link") must inherit property "blocking" with the proper type]
     expected: FAIL
 
-  [HTMLLinkElement interface: document.createElement("link") must inherit property "disabled" with the proper type]
-    expected: FAIL
-
   [HTMLLinkElement interface: document.createElement("link") must inherit property "fetchPriority" with the proper type]
     expected: FAIL
 
@@ -6151,12 +5446,6 @@
   [HTMLBodyElement interface: attribute aLink]
     expected: FAIL
 
-  [HTMLBodyElement interface: attribute onpagereveal]
-    expected: FAIL
-
-  [HTMLBodyElement interface: attribute onpageswap]
-    expected: FAIL
-
   [HTMLBodyElement interface: document.createElement("body") must inherit property "link" with the proper type]
     expected: FAIL
 
@@ -6166,12 +5455,6 @@
   [HTMLBodyElement interface: document.createElement("body") must inherit property "aLink" with the proper type]
     expected: FAIL
 
-  [HTMLBodyElement interface: document.createElement("body") must inherit property "onpagereveal" with the proper type]
-    expected: FAIL
-
-  [HTMLBodyElement interface: document.createElement("body") must inherit property "onpageswap" with the proper type]
-    expected: FAIL
-
   [HTMLHeadingElement interface: attribute align]
     expected: FAIL
 
@@ -6346,9 +5629,6 @@
   [HTMLIFrameElement interface: attribute marginWidth]
     expected: FAIL
 
-  [HTMLIFrameElement interface: document.createElement("iframe") must inherit property "srcdoc" with the proper type]
-    expected: FAIL
-
   [HTMLIFrameElement interface: document.createElement("iframe") must inherit property "allow" with the proper type]
     expected: FAIL
 
@@ -6547,36 +5827,24 @@
   [HTMLMediaElement interface: document.createElement("video") must inherit property "preservesPitch" with the proper type]
     expected: FAIL
 
-  [HTMLMediaElement interface: document.createElement("video") must inherit property "seekable" with the proper type]
-    expected: FAIL
-
   [HTMLMediaElement interface: document.createElement("audio") must inherit property "getStartDate()" with the proper type]
     expected: FAIL
 
   [HTMLMediaElement interface: document.createElement("audio") must inherit property "preservesPitch" with the proper type]
     expected: FAIL
 
-  [HTMLMediaElement interface: document.createElement("audio") must inherit property "seekable" with the proper type]
-    expected: FAIL
-
   [HTMLMediaElement interface: new Audio() must inherit property "getStartDate()" with the proper type]
     expected: FAIL
 
   [HTMLMediaElement interface: new Audio() must inherit property "preservesPitch" with the proper type]
     expected: FAIL
 
-  [HTMLMediaElement interface: new Audio() must inherit property "seekable" with the proper type]
-    expected: FAIL
-
   [HTMLMediaElement interface: operation getStartDate()]
     expected: FAIL
 
   [HTMLMediaElement interface: attribute preservesPitch]
     expected: FAIL
 
-  [HTMLMediaElement interface: attribute seekable]
-    expected: FAIL
-
   [HTMLMapElement interface: attribute name]
     expected: FAIL
 
@@ -7783,24 +7051,12 @@
   [HTMLFrameSetElement interface: attribute rows]
     expected: FAIL
 
-  [HTMLFrameSetElement interface: attribute onpagereveal]
-    expected: FAIL
-
-  [HTMLFrameSetElement interface: attribute onpageswap]
-    expected: FAIL
-
   [HTMLFrameSetElement interface: document.createElement("frameset") must inherit property "cols" with the proper type]
     expected: FAIL
 
   [HTMLFrameSetElement interface: document.createElement("frameset") must inherit property "rows" with the proper type]
     expected: FAIL
 
-  [HTMLFrameSetElement interface: document.createElement("frameset") must inherit property "onpagereveal" with the proper type]
-    expected: FAIL
-
-  [HTMLFrameSetElement interface: document.createElement("frameset") must inherit property "onpageswap" with the proper type]
-    expected: FAIL
-
   [HTMLFrameElement interface: attribute name]
     expected: FAIL
 
@@ -7915,12 +7171,6 @@
   [HTMLDialogElement interface: operation requestClose(optional DOMString)]
     expected: FAIL
 
-  [HTMLElement interface: attribute oncommand]
-    expected: FAIL
-
-  [HTMLElement interface: document.createElement("noscript") must inherit property "oncommand" with the proper type]
-    expected: FAIL
-
   [HTMLButtonElement interface: attribute command]
     expected: FAIL
 
@@ -7932,3 +7182,9 @@
 
   [HTMLButtonElement interface: document.createElement("button") must inherit property "commandForElement" with the proper type]
     expected: FAIL
+
+  [HTMLTemplateElement interface: attribute shadowRootCustomElementRegistry]
+    expected: FAIL
+
+  [HTMLTemplateElement interface: document.createElement("template") must inherit property "shadowRootCustomElementRegistry" with the proper type]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/dom/reflection-tabular.html.ini b/tests/wpt/meta/html/dom/reflection-tabular.html.ini
index 7550e2dc15d..1aeec1b3ef7 100644
--- a/tests/wpt/meta/html/dom/reflection-tabular.html.ini
+++ b/tests/wpt/meta/html/dom/reflection-tabular.html.ini
@@ -1487,9 +1487,6 @@
   [colgroup.tabIndex: IDL set to -2147483648]
     expected: FAIL
 
-  [colgroup.span: setAttribute() to 2147483647]
-    expected: FAIL
-
   [colgroup.span: setAttribute() to 2147483648]
     expected: FAIL
 
@@ -1499,9 +1496,6 @@
   [colgroup.span: setAttribute() to 4294967296]
     expected: FAIL
 
-  [colgroup.span: setAttribute() to 1001]
-    expected: FAIL
-
   [colgroup.span: IDL set to 0]
     expected: FAIL
 
@@ -2276,9 +2270,6 @@
   [col.tabIndex: IDL set to -2147483648]
     expected: FAIL
 
-  [col.span: setAttribute() to 2147483647]
-    expected: FAIL
-
   [col.span: setAttribute() to 2147483648]
     expected: FAIL
 
@@ -2288,9 +2279,6 @@
   [col.span: setAttribute() to 4294967296]
     expected: FAIL
 
-  [col.span: setAttribute() to 1001]
-    expected: FAIL
-
   [col.span: IDL set to 0]
     expected: FAIL
 
@@ -5657,9 +5645,6 @@
   [td.tabIndex: IDL set to -2147483648]
     expected: FAIL
 
-  [td.colSpan: setAttribute() to 2147483647]
-    expected: FAIL
-
   [td.colSpan: setAttribute() to 2147483648]
     expected: FAIL
 
@@ -5669,9 +5654,6 @@
   [td.colSpan: setAttribute() to 4294967296]
     expected: FAIL
 
-  [td.colSpan: setAttribute() to 1001]
-    expected: FAIL
-
   [td.colSpan: IDL set to 0]
     expected: FAIL
 
@@ -5684,9 +5666,6 @@
   [td.colSpan: IDL set to 1001]
     expected: FAIL
 
-  [td.rowSpan: setAttribute() to 2147483647]
-    expected: FAIL
-
   [td.rowSpan: setAttribute() to 2147483648]
     expected: FAIL
 
@@ -5696,9 +5675,6 @@
   [td.rowSpan: setAttribute() to 4294967296]
     expected: FAIL
 
-  [td.rowSpan: setAttribute() to 65535]
-    expected: FAIL
-
   [td.rowSpan: IDL set to 2147483647]
     expected: FAIL
 
@@ -7157,9 +7133,6 @@
   [th.tabIndex: IDL set to -2147483648]
     expected: FAIL
 
-  [th.colSpan: setAttribute() to 2147483647]
-    expected: FAIL
-
   [th.colSpan: setAttribute() to 2147483648]
     expected: FAIL
 
@@ -7169,9 +7142,6 @@
   [th.colSpan: setAttribute() to 4294967296]
     expected: FAIL
 
-  [th.colSpan: setAttribute() to 1001]
-    expected: FAIL
-
   [th.colSpan: IDL set to 0]
     expected: FAIL
 
@@ -7184,9 +7154,6 @@
   [th.colSpan: IDL set to 1001]
     expected: FAIL
 
-  [th.rowSpan: setAttribute() to 2147483647]
-    expected: FAIL
-
   [th.rowSpan: setAttribute() to 2147483648]
     expected: FAIL
 
@@ -7196,9 +7163,6 @@
   [th.rowSpan: setAttribute() to 4294967296]
     expected: FAIL
 
-  [th.rowSpan: setAttribute() to 65535]
-    expected: FAIL
-
   [th.rowSpan: IDL set to 2147483647]
     expected: FAIL
 
diff --git a/tests/wpt/meta/html/dom/render-blocking/element-render-blocking-040.html.ini b/tests/wpt/meta/html/dom/render-blocking/element-render-blocking-040.html.ini
new file mode 100644
index 00000000000..0193f3ac3ab
--- /dev/null
+++ b/tests/wpt/meta/html/dom/render-blocking/element-render-blocking-040.html.ini
@@ -0,0 +1,3 @@
+[element-render-blocking-040.html]
+  [blocking defers frames until full parsing]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/dom/render-blocking/element-render-blocking-041.html.ini b/tests/wpt/meta/html/dom/render-blocking/element-render-blocking-041.html.ini
new file mode 100644
index 00000000000..34e1dea6d54
--- /dev/null
+++ b/tests/wpt/meta/html/dom/render-blocking/element-render-blocking-041.html.ini
@@ -0,0 +1,3 @@
+[element-render-blocking-041.html]
+  [blocking defers frames until full parsing]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/editing/the-hidden-attribute/beforematch-element-fragment-navigation.html.ini b/tests/wpt/meta/html/editing/the-hidden-attribute/beforematch-element-fragment-navigation.html.ini
index 2e8cf2714af..71e538c3416 100644
--- a/tests/wpt/meta/html/editing/the-hidden-attribute/beforematch-element-fragment-navigation.html.ini
+++ b/tests/wpt/meta/html/editing/the-hidden-attribute/beforematch-element-fragment-navigation.html.ini
@@ -22,3 +22,6 @@
 
   [Scrolling should still occur when beforematch sets visiblity:hidden on the target element.]
     expected: FAIL
+
+  [The hidden attribute should still be set inside the beforematch event handler.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/infrastructure/safe-passing-of-structured-data/messagechannel.any.js.ini b/tests/wpt/meta/html/infrastructure/safe-passing-of-structured-data/messagechannel.any.js.ini
index 54ea0f01c63..563d7e04f6d 100644
--- a/tests/wpt/meta/html/infrastructure/safe-passing-of-structured-data/messagechannel.any.js.ini
+++ b/tests/wpt/meta/html/infrastructure/safe-passing-of-structured-data/messagechannel.any.js.ini
@@ -5,9 +5,6 @@
   [A subclass instance will deserialize as its closest serializable superclass]
     expected: FAIL
 
-  [A subclass instance will be received as its closest transferable superclass]
-    expected: PRECONDITION_FAILED
-
   [Object with a getter that throws]
     expected: FAIL
 
@@ -73,9 +70,6 @@
   [A subclass instance will deserialize as its closest serializable superclass]
     expected: FAIL
 
-  [A subclass instance will be received as its closest transferable superclass]
-    expected: PRECONDITION_FAILED
-
   [Object with a getter that throws]
     expected: FAIL
 
diff --git a/tests/wpt/meta/html/infrastructure/safe-passing-of-structured-data/structured-cloning-error-stack-optional.sub.window.js.ini b/tests/wpt/meta/html/infrastructure/safe-passing-of-structured-data/structured-cloning-error-stack-optional.sub.window.js.ini
deleted file mode 100644
index c8a80140995..00000000000
--- a/tests/wpt/meta/html/infrastructure/safe-passing-of-structured-data/structured-cloning-error-stack-optional.sub.window.js.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[structured-cloning-error-stack-optional.sub.window.html]
-  [web API-created TypeError (structuredClone())]
-    expected: FAIL
-
-  [web API-created TypeError (worker)]
-    expected: FAIL
-
-  [web API-created TypeError (cross-site iframe)]
-    expected: FAIL
-
-  [web API-created TypeError (same-origin iframe)]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/infrastructure/safe-passing-of-structured-data/structuredclone_0.html.ini b/tests/wpt/meta/html/infrastructure/safe-passing-of-structured-data/structuredclone_0.html.ini
index 5321153d366..37a5e29351d 100644
--- a/tests/wpt/meta/html/infrastructure/safe-passing-of-structured-data/structuredclone_0.html.ini
+++ b/tests/wpt/meta/html/infrastructure/safe-passing-of-structured-data/structuredclone_0.html.ini
@@ -4,9 +4,3 @@
 
   [ImageData expandos are not cloned]
     expected: FAIL
-
-  [DOMException objects can be cloned]
-    expected: FAIL
-
-  [DOMException objects created by the UA can be cloned]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/infrastructure/safe-passing-of-structured-data/window-postmessage.window.js.ini b/tests/wpt/meta/html/infrastructure/safe-passing-of-structured-data/window-postmessage.window.js.ini
index a8346173c74..0987b09c0aa 100644
--- a/tests/wpt/meta/html/infrastructure/safe-passing-of-structured-data/window-postmessage.window.js.ini
+++ b/tests/wpt/meta/html/infrastructure/safe-passing-of-structured-data/window-postmessage.window.js.ini
@@ -50,9 +50,6 @@
   [A subclass instance will deserialize as its closest serializable superclass]
     expected: FAIL
 
-  [A subclass instance will be received as its closest transferable superclass]
-    expected: PRECONDITION_FAILED
-
   [Object with a getter that throws]
     expected: FAIL
 
diff --git a/tests/wpt/meta/html/infrastructure/urls/dynamic-changes-to-base-urls/dynamic-urls.sub.html.ini b/tests/wpt/meta/html/infrastructure/urls/dynamic-changes-to-base-urls/dynamic-urls.sub.html.ini
index e649c8fe2f0..37b9e7a9f82 100644
--- a/tests/wpt/meta/html/infrastructure/urls/dynamic-changes-to-base-urls/dynamic-urls.sub.html.ini
+++ b/tests/wpt/meta/html/infrastructure/urls/dynamic-changes-to-base-urls/dynamic-urls.sub.html.ini
@@ -8,8 +8,5 @@
   [The 'src' attribute of the 'embed' element]
     expected: FAIL
 
-  [The 'src' attribute of the 'source' element]
-    expected: FAIL
-
   [The 'data' attribute of the 'object' element]
     expected: FAIL
diff --git a/tests/wpt/meta/html/infrastructure/urls/dynamic-changes-to-base-urls/historical.sub.xhtml.ini b/tests/wpt/meta/html/infrastructure/urls/dynamic-changes-to-base-urls/historical.sub.xhtml.ini
index e2508bc182c..2bab2438435 100644
--- a/tests/wpt/meta/html/infrastructure/urls/dynamic-changes-to-base-urls/historical.sub.xhtml.ini
+++ b/tests/wpt/meta/html/infrastructure/urls/dynamic-changes-to-base-urls/historical.sub.xhtml.ini
@@ -8,8 +8,5 @@
   [The 'src' attribute of the 'embed' element]
     expected: FAIL
 
-  [The 'src' attribute of the 'source' element]
-    expected: FAIL
-
   [The 'data' attribute of the 'object' element]
     expected: FAIL
diff --git a/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index b3b91068b8d..2adc9aa86db 100644
--- a/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -4,7 +4,7 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: FAIL
+    expected: NOTRUN
 
   [Element with tabindex should support autofocus]
     expected: FAIL
@@ -13,4 +13,4 @@
     expected: NOTRUN
 
   [Host element with delegatesFocus should support autofocus]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/meta/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-with-trusted-types.html.ini b/tests/wpt/meta/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-with-trusted-types.html.ini
new file mode 100644
index 00000000000..ad3b45255f4
--- /dev/null
+++ b/tests/wpt/meta/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-with-trusted-types.html.ini
@@ -0,0 +1,2 @@
+[marquee-with-trusted-types.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/non-replaced-elements/form-controls/placeholder-opacity-default.tentative.html.ini b/tests/wpt/meta/html/rendering/non-replaced-elements/form-controls/placeholder-opacity-default.tentative.html.ini
new file mode 100644
index 00000000000..057575687c1
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/non-replaced-elements/form-controls/placeholder-opacity-default.tentative.html.ini
@@ -0,0 +1,3 @@
+[placeholder-opacity-default.tentative.html]
+  [Default opacity value is '1']
+    expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/non-replaced-elements/lists/lists-styles-quirks.html.ini b/tests/wpt/meta/html/rendering/non-replaced-elements/lists/lists-styles-quirks.html.ini
new file mode 100644
index 00000000000..9ac1f15f243
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/non-replaced-elements/lists/lists-styles-quirks.html.ini
@@ -0,0 +1,2 @@
+[lists-styles-quirks.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-grid.html.ini b/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-grid.html.ini
deleted file mode 100644
index 1bc0e7e8fcd..00000000000
--- a/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-grid.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[fieldset-grid.html]
-  [Grid]
-    expected: FAIL
-
-  [Inline grid]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/grid-template-propagation.html.ini b/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/grid-template-propagation.html.ini
deleted file mode 100644
index d32e6b1d3d2..00000000000
--- a/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/grid-template-propagation.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-template-propagation.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display.html.ini b/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display.html.ini
index 8e75c6f5c34..1211d0d9622 100644
--- a/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display.html.ini
+++ b/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display.html.ini
@@ -8,18 +8,12 @@
   [rendered legend with display: ruby]
     expected: FAIL
 
-  [rendered legend with display: grid; overflow:hidden]
-    expected: FAIL
-
   [rendered legend with display: ruby-base; columns:1]
     expected: FAIL
 
   [rendered legend with display: block ruby; overflow:hidden]
     expected: FAIL
 
-  [rendered legend with display: grid]
-    expected: FAIL
-
   [rendered legend with display: inline-block; columns:1]
     expected: FAIL
 
@@ -107,9 +101,6 @@
   [rendered legend with display: ruby-text-container; overflow:hidden;columns:1]
     expected: FAIL
 
-  [rendered legend with display: grid; overflow:hidden;columns:1]
-    expected: FAIL
-
   [rendered legend with display: ruby-text; columns:1]
     expected: FAIL
 
@@ -122,9 +113,6 @@
   [rendered legend with display: ruby-text]
     expected: FAIL
 
-  [rendered legend with display: grid; columns:1]
-    expected: FAIL
-
   [rendered legend with display: run-in; overflow:hidden;columns:1]
     expected: FAIL
 
diff --git a/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-grid-flex-multicol.html.ini b/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-grid-flex-multicol.html.ini
index 256f627d7cd..072678c9bc7 100644
--- a/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-grid-flex-multicol.html.ini
+++ b/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-grid-flex-multicol.html.ini
@@ -1,9 +1,3 @@
 [legend-grid-flex-multicol.html]
-  [grid]
-    expected: FAIL
-
-  [inline-grid]
-    expected: FAIL
-
   [multicol]
     expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/replaced-elements/images/blocked-by-csp.html.ini b/tests/wpt/meta/html/rendering/replaced-elements/images/blocked-by-csp.html.ini
new file mode 100644
index 00000000000..d734056b873
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/replaced-elements/images/blocked-by-csp.html.ini
@@ -0,0 +1,2 @@
+[blocked-by-csp.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html.ini b/tests/wpt/meta/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html.ini
index a0aaf59da7d..63376387316 100644
--- a/tests/wpt/meta/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html.ini
+++ b/tests/wpt/meta/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html.ini
@@ -1,5 +1,4 @@
 [svg-inline.html]
-  expected: TIMEOUT
   [(initial values)]
     expected: FAIL
 
@@ -23,3 +22,1923 @@
 
   [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', ]
     expected: FAIL
+
+  [svgWidthStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', ]
+    expected: FAIL
+
+  [svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', ]
+    expected: FAIL
+
+  [svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', ]
+    expected: FAIL
+
+  [svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', ]
+    expected: FAIL
+
+  [svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '200', ]
+    expected: FAIL
+
+  [svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '200', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '100px', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '100px', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
+
+  [containerWidthStyle: '400px', containerHeightStyle: '400px', svgViewBoxAttr: '0 0 100 200', svgWidthStyle: '50%', svgHeightStyle: '50%', svgWidthAttr: '25%', svgHeightAttr: '25%', ]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/replaced-elements/the-option-element/option-label-whitespace-2.html.ini b/tests/wpt/meta/html/rendering/replaced-elements/the-option-element/option-label-whitespace-2.html.ini
new file mode 100644
index 00000000000..d0b62d151b9
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/replaced-elements/the-option-element/option-label-whitespace-2.html.ini
@@ -0,0 +1,2 @@
+[option-label-whitespace-2.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/replaced-elements/the-option-element/option-label-whitespace.html.ini b/tests/wpt/meta/html/rendering/replaced-elements/the-option-element/option-label-whitespace.html.ini
deleted file mode 100644
index e2463ff1b33..00000000000
--- a/tests/wpt/meta/html/rendering/replaced-elements/the-option-element/option-label-whitespace.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[option-label-whitespace.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/replaced-elements/the-option-element/option-with-br.html.ini b/tests/wpt/meta/html/rendering/replaced-elements/the-option-element/option-with-br.html.ini
deleted file mode 100644
index c511e0c45c5..00000000000
--- a/tests/wpt/meta/html/rendering/replaced-elements/the-option-element/option-with-br.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[option-with-br.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/replaced-elements/the-select-element/select-1-block-size-001.html.ini b/tests/wpt/meta/html/rendering/replaced-elements/the-select-element/select-1-block-size-001.html.ini
new file mode 100644
index 00000000000..bb0fb8e3daf
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/replaced-elements/the-select-element/select-1-block-size-001.html.ini
@@ -0,0 +1,2 @@
+[select-1-block-size-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/replaced-elements/the-select-element/select-1-block-size.html.ini b/tests/wpt/meta/html/rendering/replaced-elements/the-select-element/select-1-block-size.html.ini
deleted file mode 100644
index 706aff5771a..00000000000
--- a/tests/wpt/meta/html/rendering/replaced-elements/the-select-element/select-1-block-size.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[select-1-block-size.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/replaced-elements/the-select-element/select-button-min-height-001.html.ini b/tests/wpt/meta/html/rendering/replaced-elements/the-select-element/select-button-min-height-001.html.ini
new file mode 100644
index 00000000000..f6264167495
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/replaced-elements/the-select-element/select-button-min-height-001.html.ini
@@ -0,0 +1,2 @@
+[select-button-min-height-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/replaced-elements/the-select-element/select-empty.html.ini b/tests/wpt/meta/html/rendering/replaced-elements/the-select-element/select-empty.html.ini
new file mode 100644
index 00000000000..06108e541fd
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/replaced-elements/the-select-element/select-empty.html.ini
@@ -0,0 +1,2 @@
+[select-empty.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/the-details-element/details-blockification.html.ini b/tests/wpt/meta/html/rendering/the-details-element/details-blockification.html.ini
deleted file mode 100644
index 762f8117445..00000000000
--- a/tests/wpt/meta/html/rendering/the-details-element/details-blockification.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[details-blockification.html]
-  [Summary and content should have display:block computed value]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/rendering/the-details-element/details-display-type-001-ref.html.ini b/tests/wpt/meta/html/rendering/the-details-element/details-display-type-001-ref.html.ini
new file mode 100644
index 00000000000..586cf2f4527
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/the-details-element/details-display-type-001-ref.html.ini
@@ -0,0 +1,2 @@
+[details-display-type-001-ref.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/the-details-element/details-display-type-001.html.ini b/tests/wpt/meta/html/rendering/the-details-element/details-display-type-001.html.ini
new file mode 100644
index 00000000000..b4e9f7de93b
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/the-details-element/details-display-type-001.html.ini
@@ -0,0 +1,2 @@
+[details-display-type-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/the-details-element/details-display.html.ini b/tests/wpt/meta/html/rendering/the-details-element/details-display.html.ini
deleted file mode 100644
index 288a0776a08..00000000000
--- a/tests/wpt/meta/html/rendering/the-details-element/details-display.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[details-display.html]
-  [display of details element can be changed]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/widgets/baseline-alignment-and-overflow.tentative.html.ini b/tests/wpt/meta/html/rendering/widgets/baseline-alignment-and-overflow.tentative.html.ini
index f13df0d7bbf..6a9cee7b1f0 100644
--- a/tests/wpt/meta/html/rendering/widgets/baseline-alignment-and-overflow.tentative.html.ini
+++ b/tests/wpt/meta/html/rendering/widgets/baseline-alignment-and-overflow.tentative.html.ini
@@ -1,220 +1,4 @@
 [baseline-alignment-and-overflow.tentative.html]
-  [<input type="text" value="x" style="overflow: visible; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="text" value="x" style="overflow: hidden; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="text" value="x" style="overflow: scroll; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="text" value="x" style="overflow: visible; appearance: none;">]
-    expected: FAIL
-
-  [<input type="text" value="x" style="overflow: hidden; appearance: none;">]
-    expected: FAIL
-
-  [<input type="text" value="x" style="overflow: scroll; appearance: none;">]
-    expected: FAIL
-
-  [<input type="search" value="x" style="overflow: visible; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="search" value="x" style="overflow: hidden; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="search" value="x" style="overflow: scroll; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="search" value="x" style="overflow: visible; appearance: none;">]
-    expected: FAIL
-
-  [<input type="search" value="x" style="overflow: hidden; appearance: none;">]
-    expected: FAIL
-
-  [<input type="search" value="x" style="overflow: scroll; appearance: none;">]
-    expected: FAIL
-
-  [<input type="tel" value="x" style="overflow: visible; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="tel" value="x" style="overflow: hidden; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="tel" value="x" style="overflow: scroll; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="tel" value="x" style="overflow: visible; appearance: none;">]
-    expected: FAIL
-
-  [<input type="tel" value="x" style="overflow: hidden; appearance: none;">]
-    expected: FAIL
-
-  [<input type="tel" value="x" style="overflow: scroll; appearance: none;">]
-    expected: FAIL
-
-  [<input type="url" value="data:,x" style="overflow: visible; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="url" value="data:,x" style="overflow: hidden; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="url" value="data:,x" style="overflow: scroll; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="url" value="data:,x" style="overflow: visible; appearance: none;">]
-    expected: FAIL
-
-  [<input type="url" value="data:,x" style="overflow: hidden; appearance: none;">]
-    expected: FAIL
-
-  [<input type="url" value="data:,x" style="overflow: scroll; appearance: none;">]
-    expected: FAIL
-
-  [<input type="email" value="x" style="overflow: visible; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="email" value="x" style="overflow: hidden; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="email" value="x" style="overflow: scroll; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="email" value="x" style="overflow: visible; appearance: none;">]
-    expected: FAIL
-
-  [<input type="email" value="x" style="overflow: hidden; appearance: none;">]
-    expected: FAIL
-
-  [<input type="email" value="x" style="overflow: scroll; appearance: none;">]
-    expected: FAIL
-
-  [<input type="password" value="x" style="overflow: visible; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="password" value="x" style="overflow: hidden; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="password" value="x" style="overflow: scroll; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="password" value="x" style="overflow: visible; appearance: none;">]
-    expected: FAIL
-
-  [<input type="password" value="x" style="overflow: hidden; appearance: none;">]
-    expected: FAIL
-
-  [<input type="password" value="x" style="overflow: scroll; appearance: none;">]
-    expected: FAIL
-
-  [<input type="date" value="2020-01-01" style="overflow: visible; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="date" value="2020-01-01" style="overflow: hidden; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="date" value="2020-01-01" style="overflow: scroll; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="date" value="2020-01-01" style="overflow: visible; appearance: none;">]
-    expected: FAIL
-
-  [<input type="date" value="2020-01-01" style="overflow: hidden; appearance: none;">]
-    expected: FAIL
-
-  [<input type="date" value="2020-01-01" style="overflow: scroll; appearance: none;">]
-    expected: FAIL
-
-  [<input type="month" value="2020-01" style="overflow: visible; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="month" value="2020-01" style="overflow: hidden; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="month" value="2020-01" style="overflow: scroll; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="month" value="2020-01" style="overflow: visible; appearance: none;">]
-    expected: FAIL
-
-  [<input type="month" value="2020-01" style="overflow: hidden; appearance: none;">]
-    expected: FAIL
-
-  [<input type="month" value="2020-01" style="overflow: scroll; appearance: none;">]
-    expected: FAIL
-
-  [<input type="week" value="2020-W01" style="overflow: visible; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="week" value="2020-W01" style="overflow: hidden; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="week" value="2020-W01" style="overflow: scroll; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="week" value="2020-W01" style="overflow: visible; appearance: none;">]
-    expected: FAIL
-
-  [<input type="week" value="2020-W01" style="overflow: hidden; appearance: none;">]
-    expected: FAIL
-
-  [<input type="week" value="2020-W01" style="overflow: scroll; appearance: none;">]
-    expected: FAIL
-
-  [<input type="time" value="00:00" style="overflow: visible; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="time" value="00:00" style="overflow: hidden; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="time" value="00:00" style="overflow: scroll; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="time" value="00:00" style="overflow: visible; appearance: none;">]
-    expected: FAIL
-
-  [<input type="time" value="00:00" style="overflow: hidden; appearance: none;">]
-    expected: FAIL
-
-  [<input type="time" value="00:00" style="overflow: scroll; appearance: none;">]
-    expected: FAIL
-
-  [<input type="datetime-local" value="2020-01-01T00:00" style="overflow: visible; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="datetime-local" value="2020-01-01T00:00" style="overflow: hidden; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="datetime-local" value="2020-01-01T00:00" style="overflow: scroll; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="datetime-local" value="2020-01-01T00:00" style="overflow: visible; appearance: none;">]
-    expected: FAIL
-
-  [<input type="datetime-local" value="2020-01-01T00:00" style="overflow: hidden; appearance: none;">]
-    expected: FAIL
-
-  [<input type="datetime-local" value="2020-01-01T00:00" style="overflow: scroll; appearance: none;">]
-    expected: FAIL
-
-  [<input type="number" value="0" style="overflow: visible; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="number" value="0" style="overflow: hidden; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="number" value="0" style="overflow: scroll; appearance: auto;">]
-    expected: FAIL
-
-  [<input type="number" value="0" style="overflow: visible; appearance: none;">]
-    expected: FAIL
-
-  [<input type="number" value="0" style="overflow: hidden; appearance: none;">]
-    expected: FAIL
-
-  [<input type="number" value="0" style="overflow: scroll; appearance: none;">]
-    expected: FAIL
-
   [<input type="checkbox" style="overflow: visible; appearance: auto;">]
     expected: FAIL
 
diff --git a/tests/wpt/meta/html/rendering/widgets/button-layout/computed-style.html.ini b/tests/wpt/meta/html/rendering/widgets/button-layout/computed-style.html.ini
index a34195c8788..2871fa5222d 100644
--- a/tests/wpt/meta/html/rendering/widgets/button-layout/computed-style.html.ini
+++ b/tests/wpt/meta/html/rendering/widgets/button-layout/computed-style.html.ini
@@ -11,21 +11,6 @@
   [computed display of <input type=color> with display: contents]
     expected: FAIL
 
-  [computed display of <input type=reset> with display: grid]
-    expected: FAIL
-
-  [computed display of <input type=button> with display: grid]
-    expected: FAIL
-
-  [computed display of <input type=submit> with display: grid]
-    expected: FAIL
-
-  [computed display of <input type=color> with display: grid]
-    expected: FAIL
-
-  [computed display of <button type=submit> with display: grid]
-    expected: FAIL
-
   [computed display of <input type=reset> with display: ruby]
     expected: FAIL
 
@@ -101,27 +86,9 @@
   [computed display of <button type=submit> with display: ruby-text-container]
     expected: FAIL
 
-  [computed display of <input type=reset> with display: inline-grid]
-    expected: FAIL
-
-  [computed display of <input type=button> with display: inline-grid]
-    expected: FAIL
-
-  [computed display of <input type=submit> with display: inline-grid]
-    expected: FAIL
-
-  [computed display of <input type=color> with display: inline-grid]
-    expected: FAIL
-
-  [computed display of <button type=submit> with display: inline-grid]
-    expected: FAIL
-
   [computed display of <input type=image> with display: contents]
     expected: FAIL
 
-  [computed display of <input type=image> with display: grid]
-    expected: FAIL
-
   [computed display of <input type=image> with display: ruby]
     expected: FAIL
 
@@ -137,9 +104,6 @@
   [computed display of <input type=image> with display: ruby-text-container]
     expected: FAIL
 
-  [computed display of <input type=image> with display: inline-grid]
-    expected: FAIL
-
   [<input type=color> overflow/overflow-clip-margin]
     expected: FAIL
 
diff --git a/tests/wpt/meta/html/rendering/widgets/button-layout/grid.html.ini b/tests/wpt/meta/html/rendering/widgets/button-layout/grid.html.ini
index 94a54826d4c..5377a2b08d8 100644
--- a/tests/wpt/meta/html/rendering/widgets/button-layout/grid.html.ini
+++ b/tests/wpt/meta/html/rendering/widgets/button-layout/grid.html.ini
@@ -1,6 +1,3 @@
 [grid.html]
-  [inline-grid]
-    expected: FAIL
-
   [grid]
     expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/widgets/button-layout/input-type-button-clip.html.ini b/tests/wpt/meta/html/rendering/widgets/button-layout/input-type-button-clip.html.ini
deleted file mode 100644
index 1a31628240b..00000000000
--- a/tests/wpt/meta/html/rendering/widgets/button-layout/input-type-button-clip.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[input-type-button-clip.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/widgets/field-sizing-textarea-relayout.html.ini b/tests/wpt/meta/html/rendering/widgets/field-sizing-textarea-relayout.html.ini
deleted file mode 100644
index 02d9bcc43ae..00000000000
--- a/tests/wpt/meta/html/rendering/widgets/field-sizing-textarea-relayout.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[field-sizing-textarea-relayout.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/widgets/select-wrap-no-spill.optional.html.ini b/tests/wpt/meta/html/rendering/widgets/select-wrap-no-spill.optional.html.ini
deleted file mode 100644
index eb6a7c01377..00000000000
--- a/tests/wpt/meta/html/rendering/widgets/select-wrap-no-spill.optional.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[select-wrap-no-spill.optional.html]
-  [Selected OPTION label with white-space:pre-wrap should not spill out.]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/rendering/widgets/the-select-element/option-add-label-quirks.html.ini b/tests/wpt/meta/html/rendering/widgets/the-select-element/option-add-label-quirks.html.ini
deleted file mode 100644
index 0d921218cae..00000000000
--- a/tests/wpt/meta/html/rendering/widgets/the-select-element/option-add-label-quirks.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[option-add-label-quirks.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/widgets/the-select-element/option-checked-styling.html.ini b/tests/wpt/meta/html/rendering/widgets/the-select-element/option-checked-styling.html.ini
deleted file mode 100644
index 0b235897f88..00000000000
--- a/tests/wpt/meta/html/rendering/widgets/the-select-element/option-checked-styling.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[option-checked-styling.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/document-metadata/the-link-element/link-load-error-events.https.html.ini b/tests/wpt/meta/html/semantics/document-metadata/the-link-element/link-load-error-events.https.html.ini
index e827806f81e..12f49d23c83 100644
--- a/tests/wpt/meta/html/semantics/document-metadata/the-link-element/link-load-error-events.https.html.ini
+++ b/tests/wpt/meta/html/semantics/document-metadata/the-link-element/link-load-error-events.https.html.ini
@@ -7,12 +7,3 @@
 
   [Import of import of non-CSS stylesheet]
     expected: FAIL
-
-  [Load of http:// stylesheet]
-    expected: FAIL
-
-  [Import of http:// stylesheet]
-    expected: FAIL
-
-  [Import of import of http:// stylesheet]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-1.html.ini b/tests/wpt/meta/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-1.html.ini
new file mode 100644
index 00000000000..20138204f6e
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-1.html.ini
@@ -0,0 +1,3 @@
+[allow-scripts-flag-changing-1.html]
+  [Meta refresh is blocked by the allow-scripts sandbox flag at its creation time, not when refresh comes due]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-2.html.ini b/tests/wpt/meta/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-2.html.ini
new file mode 100644
index 00000000000..c507ad411ec
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-2.html.ini
@@ -0,0 +1,3 @@
+[allow-scripts-flag-changing-2.html]
+  [Meta refresh of the original iframe is not blocked if moved into a sandboxed iframe]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/document-metadata/the-style-element/mutations.window.js.ini b/tests/wpt/meta/html/semantics/document-metadata/the-style-element/mutations.window.js.ini
index 8e9ebe9a3c2..b4d47b505cb 100644
--- a/tests/wpt/meta/html/semantics/document-metadata/the-style-element/mutations.window.js.ini
+++ b/tests/wpt/meta/html/semantics/document-metadata/the-style-element/mutations.window.js.ini
@@ -1,6 +1,3 @@
 [mutations.window.html]
   [Mutating the style element: mutating a Comment node]
     expected: FAIL
-
-  [Mutating the style element: inserting an empty DocumentFragment node]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/media-elements/error-sequence.html.ini b/tests/wpt/meta/html/semantics/embedded-content/media-elements/error-sequence.html.ini
new file mode 100644
index 00000000000..4faa017d9e5
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/embedded-content/media-elements/error-sequence.html.ini
@@ -0,0 +1,30 @@
+[error-sequence.html]
+  [empty src attribute]
+    expected: FAIL
+
+  [urlRecord failure]
+    expected: FAIL
+
+  [fetch resource]
+    expected: FAIL
+
+  [error event while HAVE_NOTHING]
+    expected: FAIL
+
+  [error attribute while HAVE_NOTHING]
+    expected: FAIL
+
+  [play() promise while HAVE_NOTHING]
+    expected: FAIL
+
+  [play() promise after error event while HAVE_NOTHING]
+    expected: FAIL
+
+  [error event while HAVE_METADATA]
+    expected: FAIL
+
+  [error event after HAVE_FUTURE_DATA]
+    expected: FAIL
+
+  [error attribute after DECODE_ERROR]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html.ini b/tests/wpt/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html.ini
deleted file mode 100644
index d90e5f052a2..00000000000
--- a/tests/wpt/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[resource-selection-candidate-insert-before.html]
-  [inserting another source before the candidate]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html.ini b/tests/wpt/meta/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html.ini
deleted file mode 100644
index 2508434e7e1..00000000000
--- a/tests/wpt/meta/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[currentSrc.html]
-  [audio.currentSrc after adding source element with src attribute " "]
-    expected: FAIL
-
-  [video.currentSrc after adding source element with src attribute "."]
-    expected: FAIL
-
-  [video.currentSrc after adding source element with src attribute "data:,"]
-    expected: FAIL
-
-  [audio.currentSrc after adding source element with src attribute "."]
-    expected: FAIL
-
-  [audio.currentSrc after adding source element with src attribute "data:,"]
-    expected: FAIL
-
-  [video.currentSrc after adding source element with src attribute " "]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/semantics/embedded-content/media-elements/seeking/seek-to-currentTime.html.ini b/tests/wpt/meta/html/semantics/embedded-content/media-elements/seeking/seek-to-currentTime.html.ini
deleted file mode 100644
index 589a58e234d..00000000000
--- a/tests/wpt/meta/html/semantics/embedded-content/media-elements/seeking/seek-to-currentTime.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[seek-to-currentTime.html]
-  [seek to currentTime]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/semantics/embedded-content/media-elements/seeking/seek-to-negative-time.htm.ini b/tests/wpt/meta/html/semantics/embedded-content/media-elements/seeking/seek-to-negative-time.htm.ini
index 3a23570ca3a..e0bef4ec8c6 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/media-elements/seeking/seek-to-negative-time.htm.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/media-elements/seeking/seek-to-negative-time.htm.ini
@@ -1,4 +1,3 @@
 [seek-to-negative-time.htm]
   [seek to negative time]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/semantics/embedded-content/media-elements/track/track-element/track-cues-sorted-before-dispatch.html.ini b/tests/wpt/meta/html/semantics/embedded-content/media-elements/track/track-element/track-cues-sorted-before-dispatch.html.ini
index d8b5fe6b0d1..5472f6d7f70 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/media-elements/track/track-element/track-cues-sorted-before-dispatch.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/media-elements/track/track-element/track-cues-sorted-before-dispatch.html.ini
@@ -2,4 +2,3 @@
   expected: TIMEOUT
   [All events are triggered in chronological order]
     expected: TIMEOUT
-
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-canvas-element/security.pattern.fillStyle.sub.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-canvas-element/security.pattern.fillStyle.sub.html.ini
index cacfdf56967..81329bc1635 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-canvas-element/security.pattern.fillStyle.sub.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-canvas-element/security.pattern.fillStyle.sub.html.ini
@@ -1,16 +1,16 @@
 [security.pattern.fillStyle.sub.html]
   expected: TIMEOUT
   [cross-origin SVGImageElement: Setting fillStyle to an origin-unclean pattern makes the canvas origin-unclean]
-    expected: TIMEOUT
+    expected: FAIL
 
   [cross-origin HTMLVideoElement: Setting fillStyle to an origin-unclean pattern makes the canvas origin-unclean]
-    expected: NOTRUN
+    expected: FAIL
 
   [redirected to cross-origin HTMLVideoElement: Setting fillStyle to an origin-unclean pattern makes the canvas origin-unclean]
-    expected: NOTRUN
+    expected: FAIL
 
   [redirected to same-origin HTMLVideoElement: Setting fillStyle to an origin-unclean pattern makes the canvas origin-unclean]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [unclean HTMLCanvasElement: Setting fillStyle to an origin-unclean pattern makes the canvas origin-unclean]
     expected: NOTRUN
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.html.ini
deleted file mode 100644
index 16ecb34bf33..00000000000
--- a/tests/wpt/meta/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[toDataURL.jpeg.alpha.html]
-  [toDataURL with JPEG composites onto black]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index b83d68ddd33..26704422bbe 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,3 +1,4 @@
 [iframe_sandbox_popups_escaping-2.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 96d866bf3cc..e8872b3585b 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,4 +1,4 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index d5fd800f09d..ff6467094b8 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,4 +1,3 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-img-element/image-loading-lazy-subframe-detached-crash.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-img-element/image-loading-lazy-subframe-detached-crash.html.ini
deleted file mode 100644
index 396e716c857..00000000000
--- a/tests/wpt/meta/html/semantics/embedded-content/the-img-element/image-loading-lazy-subframe-detached-crash.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-loading-lazy-subframe-detached-crash.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-img-element/list-of-available-images-matching.https.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-img-element/list-of-available-images-matching.https.html.ini
index 898a492d07a..b99e0340efd 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-img-element/list-of-available-images-matching.https.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-img-element/list-of-available-images-matching.https.html.ini
@@ -1,2 +1,6 @@
 [list-of-available-images-matching.https.html]
-  expected: ERROR
+  [registering service worker]
+    expected: FAIL
+
+  [unregistering service worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/constraints/form-validation-validity-patternMismatch.html.ini b/tests/wpt/meta/html/semantics/forms/constraints/form-validation-validity-patternMismatch.html.ini
deleted file mode 100644
index 58584e32f0d..00000000000
--- a/tests/wpt/meta/html/semantics/forms/constraints/form-validation-validity-patternMismatch.html.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[form-validation-validity-patternMismatch.html]
-  [[INPUT in TEXT status\] Invalid `v` regular expression gets ignored]
-    expected: FAIL
-
-  [[INPUT in SEARCH status\] Invalid `v` regular expression gets ignored]
-    expected: FAIL
-
-  [[INPUT in TEL status\] Invalid `v` regular expression gets ignored]
-    expected: FAIL
-
-  [[INPUT in URL status\] Invalid `v` regular expression gets ignored]
-    expected: FAIL
-
-  [[INPUT in EMAIL status\] Invalid `v` regular expression gets ignored]
-    expected: FAIL
-
-  [[INPUT in PASSWORD status\] Invalid `v` regular expression gets ignored]
-    expected: FAIL
-
-  [[INPUT in EMAIL status\] Invalid `v` regular expression gets ignored, if multiple is present]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/constraints/form-validation-validity-valueMissing.html.ini b/tests/wpt/meta/html/semantics/forms/constraints/form-validation-validity-valueMissing.html.ini
deleted file mode 100644
index af3b0df0e95..00000000000
--- a/tests/wpt/meta/html/semantics/forms/constraints/form-validation-validity-valueMissing.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[form-validation-validity-valueMissing.html]
-  type: testharness
-  [[INPUT in RADIO status\] The checked attribute is false and the name attribute is empty]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/semantics/forms/form-submission-0/jsurl-form-submit.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/form-submission-0/jsurl-form-submit.tentative.html.ini
index e3a06bc46d5..640bea3a8dd 100644
--- a/tests/wpt/meta/html/semantics/forms/form-submission-0/jsurl-form-submit.tentative.html.ini
+++ b/tests/wpt/meta/html/semantics/forms/form-submission-0/jsurl-form-submit.tentative.html.ini
@@ -1,4 +1,3 @@
 [jsurl-form-submit.tentative.html]
   [Verifies that form submissions scheduled inside javascript: urls take precedence over the javascript: url's return value.]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/semantics/forms/form-submission-0/text-plain.window.js.ini b/tests/wpt/meta/html/semantics/forms/form-submission-0/text-plain.window.js.ini
index 9158a253170..320f8cf856c 100644
--- a/tests/wpt/meta/html/semantics/forms/form-submission-0/text-plain.window.js.ini
+++ b/tests/wpt/meta/html/semantics/forms/form-submission-0/text-plain.window.js.ini
@@ -167,9 +167,6 @@
   [text/plain: \\n in name (normal form)]
     expected: FAIL
 
-  [text/plain: 0x00 in name (normal form)]
-    expected: FAIL
-
   [text/plain: double quote in value (normal form)]
     expected: FAIL
 
@@ -184,3 +181,6 @@
 
   [text/plain: non-ASCII in filename (formdata event)]
     expected: FAIL
+
+  [text/plain: 0x00 in name (normal form)]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-input-element/pattern_attribute_v_flag.html.ini b/tests/wpt/meta/html/semantics/forms/the-input-element/pattern_attribute_v_flag.html.ini
deleted file mode 100644
index 3d995d82235..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-input-element/pattern_attribute_v_flag.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[pattern_attribute_v_flag.html]
-  [<input pattern> supports set difference syntax]
-    expected: FAIL
-
-  [<input pattern> supports string literal syntax]
-    expected: FAIL
-
-  [<input pattern> enables the RegExp v flag]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-input-element/radio-disconnected-group-owner.html.ini b/tests/wpt/meta/html/semantics/forms/the-input-element/radio-disconnected-group-owner.html.ini
index 7d856ecad7b..6dfadc234e7 100644
--- a/tests/wpt/meta/html/semantics/forms/the-input-element/radio-disconnected-group-owner.html.ini
+++ b/tests/wpt/meta/html/semantics/forms/the-input-element/radio-disconnected-group-owner.html.ini
@@ -1,6 +1,3 @@
 [radio-disconnected-group-owner.html]
-  [Removed elements are moved into separate radio groups.]
-    expected: FAIL
-
-  [Appending input radio input into a disconnect form should update the other radio inputs in the same radio group.]
+  [Appending input radio input into a disconnect tree don't update the other radio inputs in the same radio group.]
     expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-input-element/radio.html.ini b/tests/wpt/meta/html/semantics/forms/the-input-element/radio.html.ini
deleted file mode 100644
index e6320078ac5..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-input-element/radio.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[radio.html]
-  [Radio buttons in an orphan tree should make a group]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-label-element/clicking-interactive-content.html.ini b/tests/wpt/meta/html/semantics/forms/the-label-element/clicking-interactive-content.html.ini
index 58d16f8fd0d..ce397450f85 100644
--- a/tests/wpt/meta/html/semantics/forms/the-label-element/clicking-interactive-content.html.ini
+++ b/tests/wpt/meta/html/semantics/forms/the-label-element/clicking-interactive-content.html.ini
@@ -5,15 +5,9 @@
   [interactive content <input> as first child of <label>]
     expected: FAIL
 
-  [interactive content <select></select> as second child under <label>]
-    expected: FAIL
-
   [interactive content <iframe></iframe> as second child under <label>]
     expected: FAIL
 
-  [interactive content <select></select> as first child of <label>]
-    expected: FAIL
-
   [interactive content <video tabindex=""></video> as second child under <label>]
     expected: FAIL
 
@@ -32,9 +26,6 @@
   [interactive content <object usemap=""></object> as second child under <label>]
     expected: FAIL
 
-  [interactive content <select></select> deeply nested under <label>]
-    expected: FAIL
-
   [interactive content <textarea></textarea> as first child of <label>]
     expected: FAIL
 
@@ -67,4 +58,3 @@
 
   [interactive content <textarea></textarea> as second child under <label>]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-appearance.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-appearance.tentative.html.ini
new file mode 100644
index 00000000000..8458e10e93e
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-appearance.tentative.html.ini
@@ -0,0 +1,2 @@
+[customizable-select-in-page-appearance.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/closed-listbox-rendering.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/closed-listbox-rendering.tentative.html.ini
deleted file mode 100644
index 39ab3cacbc3..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/closed-listbox-rendering.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[closed-listbox-rendering.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/option-computed-style.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/option-computed-style.tentative.html.ini
deleted file mode 100644
index 05aa7ddc17f..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/option-computed-style.tentative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[option-computed-style.tentative.html]
-  [appearance:base-select options should have a checkmark with empty alt text.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html.ini
index 43a361b7721..85f3d8d4da6 100644
--- a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html.ini
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html.ini
@@ -43,3 +43,6 @@
 
   [textarea tags should parse inside select instead of closing the select]
     expected: FAIL
+
+  [Input tags should parse inside select if nested in another tag]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/select-marker-end-aligned.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/select-marker-end-aligned.tentative.html.ini
deleted file mode 100644
index 8e0b14a73e7..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-select-element/select-marker-end-aligned.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[select-marker-end-aligned.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/permission-element/no-children-rendered.tentative.html.ini b/tests/wpt/meta/html/semantics/permission-element/no-children-rendered.tentative.html.ini
new file mode 100644
index 00000000000..a5e1c4dbbda
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/permission-element/no-children-rendered.tentative.html.ini
@@ -0,0 +1,3 @@
+[no-children-rendered.tentative.html]
+  [The permission element should have no end tag or contents]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/permission-element/no-end-tag-no-contents.tentative.html.ini b/tests/wpt/meta/html/semantics/permission-element/no-end-tag-no-contents.tentative.html.ini
deleted file mode 100644
index 74c49933101..00000000000
--- a/tests/wpt/meta/html/semantics/permission-element/no-end-tag-no-contents.tentative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[no-end-tag-no-contents.tentative.html]
-  [The permission element should have no end tag or contents]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/permission-element/type-supported-feature-detect.tentative.html.ini b/tests/wpt/meta/html/semantics/permission-element/type-supported-feature-detect.tentative.html.ini
new file mode 100644
index 00000000000..48398cb92be
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/permission-element/type-supported-feature-detect.tentative.html.ini
@@ -0,0 +1,39 @@
+[type-supported-feature-detect.tentative.html]
+  [Test HTMLPermissionElement and isTypeSupported existence]
+    expected: FAIL
+
+  [Test HTMLPermissionElement should support type geolocation]
+    expected: FAIL
+
+  [Test HTMLPermissionElement should support type camera]
+    expected: FAIL
+
+  [Test HTMLPermissionElement should support type microphone]
+    expected: FAIL
+
+  [Test HTMLPermissionElement should support type  camera  microphone ]
+    expected: FAIL
+
+  [Test HTMLPermissionElement should support type  microphone  camera   ]
+    expected: FAIL
+
+  [Test HTMLPermissionElement should support type  camera camera microphone]
+    expected: FAIL
+
+  [Test HTMLPermissionElement should support type microphone microphone camera ]
+    expected: FAIL
+
+  [Test HTMLPermissionElement should not support type invalid]
+    expected: FAIL
+
+  [Test HTMLPermissionElement should not support type cameraa]
+    expected: FAIL
+
+  [Test HTMLPermissionElement should not support type microphone geolocation]
+    expected: FAIL
+
+  [Test HTMLPermissionElement should not support type camera geolocation]
+    expected: FAIL
+
+  [Test HTMLPermissionElement should not support type camera geolocation microphone]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-external-module.html.ini b/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-external-module.html.ini
deleted file mode 100644
index 849c9b3e60d..00000000000
--- a/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-external-module.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[propagate-nonce-external-module.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-inline-module.html.ini b/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-inline-module.html.ini
deleted file mode 100644
index eb08f590857..00000000000
--- a/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-inline-module.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[propagate-nonce-inline-module.html]
-  [Dynamically imported module should eval when imported from script w/ a valid nonce.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-classic.html.ini b/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-classic.html.ini
index 6c4f4e4311b..8a3281def9e 100644
--- a/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-classic.html.ini
+++ b/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-classic.html.ini
@@ -1,6 +1,3 @@
 [string-compilation-nonce-classic.html]
-  [reflected inline event handlers must not inherit the nonce from the triggering script, thus fail]
-    expected: FAIL
-
-  [inline event handlers triggered via UA code must not inherit the nonce from the triggering script, thus fail]
+  [setTimeout must inherit the nonce from the triggering script, thus execute]
     expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-module.html.ini b/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-module.html.ini
index aef6f76d69e..98d0b640164 100644
--- a/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-module.html.ini
+++ b/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-module.html.ini
@@ -1,15 +1,3 @@
 [string-compilation-nonce-module.html]
-  [reflected inline event handlers must not inherit the nonce from the triggering script, thus fail]
-    expected: FAIL
-
-  [inline event handlers triggered via UA code must not inherit the nonce from the triggering script, thus fail]
-    expected: FAIL
-
-  [direct eval must inherit the nonce from the triggering script, thus execute]
-    expected: FAIL
-
-  [indirect eval must inherit the nonce from the triggering script, thus execute]
-    expected: FAIL
-
-  [the Function constructor must inherit the nonce from the triggering script, thus execute]
+  [setTimeout must inherit the nonce from the triggering script, thus execute]
     expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/the-button-element/command-and-commandfor/button-event-dispatch-content-attribute.html.ini b/tests/wpt/meta/html/semantics/the-button-element/command-and-commandfor/button-event-dispatch-content-attribute.html.ini
index bf4c7b0b9c9..3a75e5ee0ee 100644
--- a/tests/wpt/meta/html/semantics/the-button-element/command-and-commandfor/button-event-dispatch-content-attribute.html.ini
+++ b/tests/wpt/meta/html/semantics/the-button-element/command-and-commandfor/button-event-dispatch-content-attribute.html.ini
@@ -1,6 +1,3 @@
 [button-event-dispatch-content-attribute.html]
   [oncommand content attribute works]
     expected: FAIL
-
-  [oncommand content with a value of false prevents default]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/the-button-element/command-and-commandfor/on-popover-behavior.html.ini b/tests/wpt/meta/html/semantics/the-button-element/command-and-commandfor/on-popover-behavior.html.ini
index 4574b231ccd..050621e0a32 100644
--- a/tests/wpt/meta/html/semantics/the-button-element/command-and-commandfor/on-popover-behavior.html.ini
+++ b/tests/wpt/meta/html/semantics/the-button-element/command-and-commandfor/on-popover-behavior.html.ini
@@ -64,3 +64,6 @@
 
   [invoking (as show-popover) open popover is noop]
     expected: FAIL
+
+  [invoking (as show-popover) should create an implicit anchor reference for anchor positioning.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/the-button-element/interest-target/interesttarget-css-properties.tentative.html.ini b/tests/wpt/meta/html/semantics/the-button-element/interest-target/interesttarget-css-properties.tentative.html.ini
index 3b191e683e4..b547ce226da 100644
--- a/tests/wpt/meta/html/semantics/the-button-element/interest-target/interesttarget-css-properties.tentative.html.ini
+++ b/tests/wpt/meta/html/semantics/the-button-element/interest-target/interesttarget-css-properties.tentative.html.ini
@@ -196,3 +196,9 @@
 
   [Web Animations: property <interest-target-hide-delay> from [1s\] to [2000ms\] at (1.5) should be [2.5s\]]
     expected: FAIL
+
+  [e.style['interest-target-show-delay'\] = "calc(2s * sibling-index())" should set the property value]
+    expected: FAIL
+
+  [e.style['interest-target-hide-delay'\] = "calc(2s * sibling-index())" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/the-button-element/interest-target/interesttarget-outline-appearance.tentative.html.ini b/tests/wpt/meta/html/semantics/the-button-element/interest-target/interesttarget-outline-appearance.tentative.html.ini
deleted file mode 100644
index 45513bfcfe5..00000000000
--- a/tests/wpt/meta/html/semantics/the-button-element/interest-target/interesttarget-outline-appearance.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[interesttarget-outline-appearance.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/syntax/serializing-html-fragments/serializing-cdata-in-html-document.html.ini b/tests/wpt/meta/html/syntax/serializing-html-fragments/serializing-cdata-in-html-document.html.ini
new file mode 100644
index 00000000000..d8b897fb81f
--- /dev/null
+++ b/tests/wpt/meta/html/syntax/serializing-html-fragments/serializing-cdata-in-html-document.html.ini
@@ -0,0 +1,3 @@
+[serializing-cdata-in-html-document.html]
+  [Serializing CDATA in an HTML document]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/syntax/serializing-html-fragments/serializing-lt-gt.tentative.html.ini b/tests/wpt/meta/html/syntax/serializing-html-fragments/serializing-lt-gt.tentative.html.ini
new file mode 100644
index 00000000000..932fc486676
--- /dev/null
+++ b/tests/wpt/meta/html/syntax/serializing-html-fragments/serializing-lt-gt.tentative.html.ini
@@ -0,0 +1,6 @@
+[serializing-lt-gt.tentative.html]
+  [innerHTML]
+    expected: FAIL
+
+  [outerHTML]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/syntax/speculative-parsing/generated/document-write/meta-csp-img-src-none.tentative.sub.html.ini b/tests/wpt/meta/html/syntax/speculative-parsing/generated/document-write/meta-csp-img-src-none.tentative.sub.html.ini
deleted file mode 100644
index 96ef72ceae7..00000000000
--- a/tests/wpt/meta/html/syntax/speculative-parsing/generated/document-write/meta-csp-img-src-none.tentative.sub.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[meta-csp-img-src-none.tentative.sub.html]
-  [Speculative parsing, document.write(): meta-csp-img-src-none]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/html-unsafe-methods/setHTMLUnsafe-CEReactions.html.ini b/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/html-unsafe-methods/setHTMLUnsafe-CEReactions.html.ini
deleted file mode 100644
index d0b3986d561..00000000000
--- a/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/html-unsafe-methods/setHTMLUnsafe-CEReactions.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[setHTMLUnsafe-CEReactions.html]
-  [ShadowRoot.setHTMLUnsafe should trigger custom element reactions.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/html-unsafe-methods/setHTMLUnsafe.html.ini b/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/html-unsafe-methods/setHTMLUnsafe.html.ini
deleted file mode 100644
index 850b529ff76..00000000000
--- a/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/html-unsafe-methods/setHTMLUnsafe.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[setHTMLUnsafe.html]
-  [ShadowRoot: setHTMLUnsafe with no shadowdom.]
-    expected: FAIL
-
-  [ShadowRoot: setHTMLUnsafe with shadowdom.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js.ini b/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js.ini
index a373f3385ed..b229be268ec 100644
--- a/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js.ini
+++ b/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js.ini
@@ -1,15 +1,6 @@
 [event-listeners.window.html]
-  [Standard event listeners are to be removed from Window]
-    expected: FAIL
-
   [Standard event listeners are to be removed from Window for an active but not fully active document]
     expected: FAIL
 
-  [Standard event listeners are to be removed from Window for a non-active document that is the associated Document of a Window (frame is removed)]
-    expected: FAIL
-
   [Custom event listeners are to be removed from Window for an active but not fully active document]
     expected: FAIL
-
-  [Event listeners are to be removed with immediate effect]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/no-new-global.window.js.ini b/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/no-new-global.window.js.ini
index e71fd79e31e..38cbf536604 100644
--- a/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/no-new-global.window.js.ini
+++ b/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/no-new-global.window.js.ini
@@ -1,6 +1,3 @@
 [no-new-global.window.html]
   [BarProp maintains its prototype and properties through open()]
     expected: FAIL
-
-  [Location maintains its prototype and properties through open()]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/scripting/event-loops/new-scroll-event-dispatched-at-next-updating-rendering-time.html.ini b/tests/wpt/meta/html/webappapis/scripting/event-loops/new-scroll-event-dispatched-at-next-updating-rendering-time.html.ini
new file mode 100644
index 00000000000..dcc8d0052c0
--- /dev/null
+++ b/tests/wpt/meta/html/webappapis/scripting/event-loops/new-scroll-event-dispatched-at-next-updating-rendering-time.html.ini
@@ -0,0 +1,4 @@
+[new-scroll-event-dispatched-at-next-updating-rendering-time.html]
+  expected: TIMEOUT
+  [new-scroll-event-dispatched-at-next-updating-rendering-time]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/html/webappapis/scripting/events/event-handler-all-global-events.html.ini b/tests/wpt/meta/html/webappapis/scripting/events/event-handler-all-global-events.html.ini
index cd77f908ffb..5c286c73da4 100644
--- a/tests/wpt/meta/html/webappapis/scripting/events/event-handler-all-global-events.html.ini
+++ b/tests/wpt/meta/html/webappapis/scripting/events/event-handler-all-global-events.html.ini
@@ -1,520 +1,16 @@
 [event-handler-all-global-events.html]
-  [onabort: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onabort: the default value must be null]
-    expected: FAIL
-
-  [onauxclick: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onauxclick: the default value must be null]
-    expected: FAIL
-
-  [onauxclick: the content attribute must be compiled into a function as the corresponding property]
-    expected: FAIL
-
-  [onblur: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onblur: the default value must be null]
-    expected: FAIL
-
-  [oncancel: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [oncancel: the default value must be null]
-    expected: FAIL
-
-  [oncanplay: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [oncanplay: the default value must be null]
-    expected: FAIL
-
-  [oncanplaythrough: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [oncanplaythrough: the default value must be null]
-    expected: FAIL
-
-  [onchange: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onchange: the default value must be null]
-    expected: FAIL
-
-  [onclick: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onclick: the default value must be null]
-    expected: FAIL
-
-  [onclose: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onclose: the default value must be null]
-    expected: FAIL
-
-  [oncontextlost: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [oncontextlost: the default value must be null]
-    expected: FAIL
-
-  [oncontextlost: the content attribute must be compiled into a function as the corresponding property]
-    expected: FAIL
-
-  [oncontextmenu: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [oncontextmenu: the default value must be null]
-    expected: FAIL
-
-  [oncontextrestored: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [oncontextrestored: the default value must be null]
-    expected: FAIL
-
-  [oncontextrestored: the content attribute must be compiled into a function as the corresponding property]
-    expected: FAIL
-
-  [oncuechange: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [oncuechange: the default value must be null]
-    expected: FAIL
-
-  [ondblclick: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [ondblclick: the default value must be null]
-    expected: FAIL
-
-  [ondrag: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [ondrag: the default value must be null]
-    expected: FAIL
-
-  [ondragend: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [ondragend: the default value must be null]
-    expected: FAIL
-
-  [ondragenter: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [ondragenter: the default value must be null]
-    expected: FAIL
-
-  [ondragleave: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [ondragleave: the default value must be null]
-    expected: FAIL
-
-  [ondragover: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [ondragover: the default value must be null]
-    expected: FAIL
-
-  [ondragstart: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [ondragstart: the default value must be null]
-    expected: FAIL
-
-  [ondrop: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [ondrop: the default value must be null]
-    expected: FAIL
-
-  [ondurationchange: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [ondurationchange: the default value must be null]
-    expected: FAIL
-
-  [onemptied: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onemptied: the default value must be null]
-    expected: FAIL
-
-  [onended: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onended: the default value must be null]
-    expected: FAIL
-
-  [onfocus: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onfocus: the default value must be null]
-    expected: FAIL
-
-  [onformdata: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onformdata: the default value must be null]
-    expected: FAIL
-
-  [oninput: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [oninput: the default value must be null]
-    expected: FAIL
-
-  [oninvalid: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [oninvalid: the default value must be null]
-    expected: FAIL
-
-  [onkeydown: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onkeydown: the default value must be null]
-    expected: FAIL
-
-  [onkeypress: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onkeypress: the default value must be null]
-    expected: FAIL
-
-  [onkeyup: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onkeyup: the default value must be null]
-    expected: FAIL
-
-  [onload: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onload: the default value must be null]
-    expected: FAIL
-
-  [onloadeddata: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onloadeddata: the default value must be null]
-    expected: FAIL
-
-  [onloadedmetadata: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onloadedmetadata: the default value must be null]
-    expected: FAIL
-
-  [onloadstart: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onloadstart: the default value must be null]
-    expected: FAIL
-
-  [onmousedown: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onmousedown: the default value must be null]
-    expected: FAIL
-
-  [onmouseenter: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onmouseenter: the default value must be null]
-    expected: FAIL
-
-  [onmouseleave: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onmouseleave: the default value must be null]
-    expected: FAIL
-
-  [onmousemove: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onmousemove: the default value must be null]
-    expected: FAIL
-
-  [onmouseout: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onmouseout: the default value must be null]
-    expected: FAIL
-
-  [onmouseover: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onmouseover: the default value must be null]
-    expected: FAIL
-
-  [onmouseup: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onmouseup: the default value must be null]
-    expected: FAIL
-
-  [onpause: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onpause: the default value must be null]
-    expected: FAIL
-
-  [onplay: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onplay: the default value must be null]
-    expected: FAIL
-
-  [onplaying: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onplaying: the default value must be null]
-    expected: FAIL
-
-  [onprogress: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onprogress: the default value must be null]
-    expected: FAIL
-
-  [onratechange: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onratechange: the default value must be null]
-    expected: FAIL
-
-  [onreset: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onreset: the default value must be null]
-    expected: FAIL
-
-  [onresize: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onresize: the default value must be null]
-    expected: FAIL
-
-  [onscroll: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onscroll: the default value must be null]
-    expected: FAIL
-
-  [onsecuritypolicyviolation: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onsecuritypolicyviolation: the default value must be null]
-    expected: FAIL
-
-  [onseeked: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onseeked: the default value must be null]
-    expected: FAIL
-
-  [onseeking: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onseeking: the default value must be null]
-    expected: FAIL
-
-  [onselect: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onselect: the default value must be null]
-    expected: FAIL
-
-  [onslotchange: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onslotchange: the default value must be null]
-    expected: FAIL
-
-  [onslotchange: the content attribute must be compiled into a function as the corresponding property]
-    expected: FAIL
-
-  [onstalled: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onstalled: the default value must be null]
-    expected: FAIL
-
-  [onsubmit: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onsubmit: the default value must be null]
-    expected: FAIL
-
-  [onsuspend: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onsuspend: the default value must be null]
-    expected: FAIL
-
-  [ontimeupdate: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [ontimeupdate: the default value must be null]
-    expected: FAIL
-
-  [ontoggle: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [ontoggle: the default value must be null]
-    expected: FAIL
-
-  [onvolumechange: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onvolumechange: the default value must be null]
-    expected: FAIL
-
-  [onwaiting: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onwaiting: the default value must be null]
-    expected: FAIL
-
-  [onwebkitanimationend: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onwebkitanimationend: the default value must be null]
-    expected: FAIL
-
-  [onwebkitanimationend: the content attribute must be compiled into a function as the corresponding property]
-    expected: FAIL
-
   [onwebkitanimationend: the content attribute must execute when an event is dispatched]
     expected: FAIL
 
-  [onwebkitanimationiteration: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onwebkitanimationiteration: the default value must be null]
-    expected: FAIL
-
-  [onwebkitanimationiteration: the content attribute must be compiled into a function as the corresponding property]
-    expected: FAIL
-
   [onwebkitanimationiteration: the content attribute must execute when an event is dispatched]
     expected: FAIL
 
-  [onwebkitanimationstart: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onwebkitanimationstart: the default value must be null]
-    expected: FAIL
-
-  [onwebkitanimationstart: the content attribute must be compiled into a function as the corresponding property]
-    expected: FAIL
-
   [onwebkitanimationstart: the content attribute must execute when an event is dispatched]
     expected: FAIL
 
-  [onwebkittransitionend: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onwebkittransitionend: the default value must be null]
-    expected: FAIL
-
-  [onwebkittransitionend: the content attribute must be compiled into a function as the corresponding property]
-    expected: FAIL
-
   [onwebkittransitionend: the content attribute must execute when an event is dispatched]
     expected: FAIL
 
-  [onwheel: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onwheel: the default value must be null]
-    expected: FAIL
-
-  [onbeforeinput: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onbeforeinput: the default value must be null]
-    expected: FAIL
-
-  [onbeforeinput: the content attribute must be compiled into a function as the corresponding property]
-    expected: FAIL
-
-  [onbeforematch: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onbeforematch: the default value must be null]
-    expected: FAIL
-
-  [onbeforematch: the content attribute must be compiled into a function as the corresponding property]
-    expected: FAIL
-
-  [onscrollend: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onscrollend: the default value must be null]
-    expected: FAIL
-
-  [onscrollend: the content attribute must be compiled into a function as the corresponding property]
-    expected: FAIL
-
-  [oncopy: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [oncopy: the default value must be null]
-    expected: FAIL
-
-  [oncut: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [oncut: the default value must be null]
-    expected: FAIL
-
-  [onpaste: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onpaste: the default value must be null]
-    expected: FAIL
-
-  [onbeforetoggle: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [onbeforetoggle: the default value must be null]
-    expected: FAIL
-
-  [onbeforetoggle: the content attribute must be compiled into a function as the corresponding property]
-    expected: FAIL
-
-  [onauxclick: dispatching an Event at a <meta> element must trigger element.onauxclick]
-    expected: FAIL
-
-  [onbeforeinput: dispatching an Event at a <meta> element must trigger element.onbeforeinput]
-    expected: FAIL
-
-  [onbeforematch: dispatching an Event at a <meta> element must trigger element.onbeforematch]
-    expected: FAIL
-
-  [onbeforetoggle: dispatching an Event at a <meta> element must trigger element.onbeforetoggle]
-    expected: FAIL
-
-  [oncontextlost: dispatching an Event at a <meta> element must trigger element.oncontextlost]
-    expected: FAIL
-
-  [oncontextrestored: dispatching an Event at a <meta> element must trigger element.oncontextrestored]
-    expected: FAIL
-
-  [onscrollend: dispatching an Event at a <meta> element must trigger element.onscrollend]
-    expected: FAIL
-
-  [onslotchange: dispatching an Event at a <meta> element must trigger element.onslotchange]
-    expected: FAIL
-
   [onwebkitanimationend: dispatching an Event at a <meta> element must trigger element.onwebkitanimationend]
     expected: FAIL
 
@@ -526,15 +22,3 @@
 
   [onwebkittransitionend: dispatching an Event at a <meta> element must trigger element.onwebkittransitionend]
     expected: FAIL
-
-  [oncommand: must be on the appropriate locations for GlobalEventHandlers]
-    expected: FAIL
-
-  [oncommand: the default value must be null]
-    expected: FAIL
-
-  [oncommand: the content attribute must be compiled into a function as the corresponding property]
-    expected: FAIL
-
-  [oncommand: dispatching an Event at a <meta> element must trigger element.oncommand]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini b/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini
index deec7c5c132..3b3a37ff7c2 100644
--- a/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini
+++ b/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini
@@ -1,181 +1,19 @@
 [event-handler-attributes-body-window.html]
-  [not shadowed auxclick (document.body)]
-    expected: FAIL
-
-  [not shadowed contextlost (document.body)]
-    expected: FAIL
-
-  [not shadowed contextrestored (document.body)]
-    expected: FAIL
-
-  [not shadowed slotchange (document.body)]
-    expected: FAIL
-
-  [not shadowed webkitanimationend (document.body)]
-    expected: FAIL
-
-  [not shadowed webkitanimationiteration (document.body)]
-    expected: FAIL
-
-  [not shadowed webkitanimationstart (document.body)]
-    expected: FAIL
-
-  [not shadowed webkittransitionend (document.body)]
-    expected: FAIL
-
-  [not shadowed copy (document.body)]
-    expected: FAIL
-
-  [not shadowed cut (document.body)]
-    expected: FAIL
-
-  [not shadowed paste (document.body)]
-    expected: FAIL
-
-  [not shadowed auxclick (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed contextlost (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed contextrestored (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed slotchange (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed webkitanimationend (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed webkitanimationiteration (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed webkitanimationstart (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed webkittransitionend (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed copy (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed cut (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed paste (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed auxclick (window)]
-    expected: FAIL
-
-  [not shadowed contextlost (window)]
-    expected: FAIL
-
-  [not shadowed contextrestored (window)]
-    expected: FAIL
-
-  [not shadowed slotchange (window)]
-    expected: FAIL
-
-  [not shadowed webkitanimationend (window)]
-    expected: FAIL
-
-  [not shadowed webkitanimationiteration (window)]
-    expected: FAIL
-
-  [not shadowed webkitanimationstart (window)]
-    expected: FAIL
-
-  [not shadowed webkittransitionend (window)]
-    expected: FAIL
-
-  [not shadowed beforeinput (document.body)]
-    expected: FAIL
-
-  [not shadowed beforematch (document.body)]
-    expected: FAIL
-
-  [not shadowed scrollend (document.body)]
-    expected: FAIL
-
-  [not shadowed beforeinput (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed beforematch (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed scrollend (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed beforeinput (window)]
-    expected: FAIL
-
-  [not shadowed beforematch (window)]
-    expected: FAIL
-
-  [not shadowed scrollend (window)]
-    expected: FAIL
-
-  [not shadowed beforetoggle (document.body)]
-    expected: FAIL
-
-  [not shadowed beforetoggle (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed beforetoggle (window)]
-    expected: FAIL
-
-  [shadowed pagereveal (document.body)]
-    expected: FAIL
-
-  [shadowed pagereveal removal (document.body)]
-    expected: FAIL
-
-  [shadowed pagereveal (document.createElement("body"))]
-    expected: FAIL
-
   [shadowed pagereveal removal (document.createElement("body"))]
     expected: FAIL
 
-  [shadowed pagereveal (window)]
-    expected: FAIL
-
   [shadowed pagereveal removal (window)]
     expected: FAIL
 
-  [shadowed pageswap (document.body)]
-    expected: FAIL
-
-  [shadowed pageswap removal (document.body)]
-    expected: FAIL
-
-  [shadowed pageswap (document.createElement("body"))]
-    expected: FAIL
-
   [shadowed pageswap removal (document.createElement("body"))]
     expected: FAIL
 
-  [shadowed pageswap (window)]
-    expected: FAIL
-
   [shadowed pageswap removal (window)]
     expected: FAIL
 
   [shadowed blur on body fires when event dispatched on window]
     expected: FAIL
 
-  [shadowed messageerror on body fires when event dispatched on window]
-    expected: FAIL
-
-  [shadowed pagereveal on body fires when event dispatched on window]
-    expected: FAIL
-
-  [shadowed pageswap on body fires when event dispatched on window]
-    expected: FAIL
-
-  [shadowed rejectionhandled on body fires when event dispatched on window]
-    expected: FAIL
-
   [shadowed focus removal (document.createElement("body"))]
     expected: FAIL
 
@@ -206,6 +44,9 @@
   [shadowed message removal (document.createElement("body"))]
     expected: FAIL
 
+  [shadowed messageerror removal (document.createElement("body"))]
+    expected: FAIL
+
   [shadowed offline removal (document.createElement("body"))]
     expected: FAIL
 
@@ -233,6 +74,9 @@
   [shadowed load removal (window)]
     expected: FAIL
 
+  [shadowed rejectionhandled removal (document.createElement("body"))]
+    expected: FAIL
+
   [shadowed resize removal (window)]
     expected: FAIL
 
@@ -257,6 +101,9 @@
   [shadowed message removal (window)]
     expected: FAIL
 
+  [shadowed messageerror removal (window)]
+    expected: FAIL
+
   [shadowed offline removal (window)]
     expected: FAIL
 
@@ -272,17 +119,11 @@
   [shadowed popstate removal (window)]
     expected: FAIL
 
+  [shadowed rejectionhandled removal (window)]
+    expected: FAIL
+
   [shadowed storage removal (window)]
     expected: FAIL
 
   [shadowed unload removal (window)]
     expected: FAIL
-
-  [not shadowed command (document.body)]
-    expected: FAIL
-
-  [not shadowed command (document.createElement("body"))]
-    expected: FAIL
-
-  [not shadowed command (window)]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html.ini b/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html.ini
index 4484356912c..b18a8cf6d5b 100644
--- a/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html.ini
+++ b/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html.ini
@@ -1,166 +1,4 @@
 [event-handler-attributes-frameset-window.html]
-  [not shadowed auxclick (document.body)]
-    expected: FAIL
-
-  [not shadowed contextlost (document.body)]
-    expected: FAIL
-
-  [not shadowed contextrestored (document.body)]
-    expected: FAIL
-
-  [not shadowed slotchange (document.body)]
-    expected: FAIL
-
-  [not shadowed webkitanimationend (document.body)]
-    expected: FAIL
-
-  [not shadowed webkitanimationiteration (document.body)]
-    expected: FAIL
-
-  [not shadowed webkitanimationstart (document.body)]
-    expected: FAIL
-
-  [not shadowed webkittransitionend (document.body)]
-    expected: FAIL
-
-  [not shadowed copy (document.body)]
-    expected: FAIL
-
-  [not shadowed cut (document.body)]
-    expected: FAIL
-
-  [not shadowed paste (document.body)]
-    expected: FAIL
-
-  [not shadowed auxclick (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed contextlost (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed contextrestored (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed slotchange (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed webkitanimationend (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed webkitanimationiteration (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed webkitanimationstart (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed webkittransitionend (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed copy (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed cut (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed paste (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed auxclick (window)]
-    expected: FAIL
-
-  [not shadowed contextlost (window)]
-    expected: FAIL
-
-  [not shadowed contextrestored (window)]
-    expected: FAIL
-
-  [not shadowed slotchange (window)]
-    expected: FAIL
-
-  [not shadowed webkitanimationend (window)]
-    expected: FAIL
-
-  [not shadowed webkitanimationiteration (window)]
-    expected: FAIL
-
-  [not shadowed webkitanimationstart (window)]
-    expected: FAIL
-
-  [not shadowed webkittransitionend (window)]
-    expected: FAIL
-
-  [not shadowed beforeinput (document.body)]
-    expected: FAIL
-
-  [not shadowed beforematch (document.body)]
-    expected: FAIL
-
-  [not shadowed scrollend (document.body)]
-    expected: FAIL
-
-  [not shadowed beforeinput (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed beforematch (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed scrollend (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed beforeinput (window)]
-    expected: FAIL
-
-  [not shadowed beforematch (window)]
-    expected: FAIL
-
-  [not shadowed scrollend (window)]
-    expected: FAIL
-
-  [not shadowed beforetoggle (document.body)]
-    expected: FAIL
-
-  [not shadowed beforetoggle (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed beforetoggle (window)]
-    expected: FAIL
-
-  [shadowed pagereveal (document.body)]
-    expected: FAIL
-
-  [shadowed pagereveal removal (document.body)]
-    expected: FAIL
-
-  [shadowed pagereveal (document.createElement("frameset"))]
-    expected: FAIL
-
-  [shadowed pagereveal removal (document.createElement("frameset"))]
-    expected: FAIL
-
-  [shadowed pagereveal (window)]
-    expected: FAIL
-
-  [shadowed pagereveal removal (window)]
-    expected: FAIL
-
-  [shadowed pageswap (document.body)]
-    expected: FAIL
-
-  [shadowed pageswap removal (document.body)]
-    expected: FAIL
-
-  [shadowed pageswap (document.createElement("frameset"))]
-    expected: FAIL
-
-  [shadowed pageswap removal (document.createElement("frameset"))]
-    expected: FAIL
-
-  [shadowed pageswap (window)]
-    expected: FAIL
-
-  [shadowed pageswap removal (window)]
-    expected: FAIL
-
   [shadowed blur on body fires when event dispatched on window]
     expected: FAIL
 
@@ -226,12 +64,3 @@
 
   [shadowed unload on body fires when event dispatched on window]
     expected: FAIL
-
-  [not shadowed command (document.body)]
-    expected: FAIL
-
-  [not shadowed command (document.createElement("frameset"))]
-    expected: FAIL
-
-  [not shadowed command (window)]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-windowless-body.html.ini b/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-windowless-body.html.ini
deleted file mode 100644
index db4d6e3321d..00000000000
--- a/tests/wpt/meta/html/webappapis/scripting/events/event-handler-attributes-windowless-body.html.ini
+++ /dev/null
@@ -1,102 +0,0 @@
-[event-handler-attributes-windowless-body.html]
-  [auxclick is unaffected on a windowless body]
-    expected: FAIL
-
-  [contextlost is unaffected on a windowless body]
-    expected: FAIL
-
-  [contextrestored is unaffected on a windowless body]
-    expected: FAIL
-
-  [slotchange is unaffected on a windowless body]
-    expected: FAIL
-
-  [webkitanimationend is unaffected on a windowless body]
-    expected: FAIL
-
-  [webkitanimationiteration is unaffected on a windowless body]
-    expected: FAIL
-
-  [webkitanimationstart is unaffected on a windowless body]
-    expected: FAIL
-
-  [webkittransitionend is unaffected on a windowless body]
-    expected: FAIL
-
-  [auxclick is unaffected on a windowless frameset]
-    expected: FAIL
-
-  [contextlost is unaffected on a windowless frameset]
-    expected: FAIL
-
-  [contextrestored is unaffected on a windowless frameset]
-    expected: FAIL
-
-  [slotchange is unaffected on a windowless frameset]
-    expected: FAIL
-
-  [webkitanimationend is unaffected on a windowless frameset]
-    expected: FAIL
-
-  [webkitanimationiteration is unaffected on a windowless frameset]
-    expected: FAIL
-
-  [webkitanimationstart is unaffected on a windowless frameset]
-    expected: FAIL
-
-  [webkittransitionend is unaffected on a windowless frameset]
-    expected: FAIL
-
-  [beforeinput is unaffected on a windowless body]
-    expected: FAIL
-
-  [beforematch is unaffected on a windowless body]
-    expected: FAIL
-
-  [scrollend is unaffected on a windowless body]
-    expected: FAIL
-
-  [beforeinput is unaffected on a windowless frameset]
-    expected: FAIL
-
-  [beforematch is unaffected on a windowless frameset]
-    expected: FAIL
-
-  [scrollend is unaffected on a windowless frameset]
-    expected: FAIL
-
-  [beforetoggle is unaffected on a windowless body]
-    expected: FAIL
-
-  [beforetoggle is unaffected on a windowless frameset]
-    expected: FAIL
-
-  [Return null when getting the pagereveal event handler of a windowless body]
-    expected: FAIL
-
-  [Ignore setting of pagereveal window event handlers on windowless body]
-    expected: FAIL
-
-  [Return null when getting the pagereveal event handler of a windowless frameset]
-    expected: FAIL
-
-  [Ignore setting of pagereveal window event handlers on windowless frameset]
-    expected: FAIL
-
-  [Return null when getting the pageswap event handler of a windowless body]
-    expected: FAIL
-
-  [Ignore setting of pageswap window event handlers on windowless body]
-    expected: FAIL
-
-  [Return null when getting the pageswap event handler of a windowless frameset]
-    expected: FAIL
-
-  [Ignore setting of pageswap window event handlers on windowless frameset]
-    expected: FAIL
-
-  [command is unaffected on a windowless body]
-    expected: FAIL
-
-  [command is unaffected on a windowless frameset]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/structured-clone/structured-clone.any.js.ini b/tests/wpt/meta/html/webappapis/structured-clone/structured-clone.any.js.ini
index 37242452e1f..0b9d6c7223b 100644
--- a/tests/wpt/meta/html/webappapis/structured-clone/structured-clone.any.js.ini
+++ b/tests/wpt/meta/html/webappapis/structured-clone/structured-clone.any.js.ini
@@ -5,9 +5,6 @@
   [A subclass instance will deserialize as its closest serializable superclass]
     expected: FAIL
 
-  [A subclass instance will be received as its closest transferable superclass]
-    expected: PRECONDITION_FAILED
-
   [Object with a getter that throws]
     expected: FAIL
 
@@ -67,9 +64,6 @@
   [A subclass instance will deserialize as its closest serializable superclass]
     expected: FAIL
 
-  [A subclass instance will be received as its closest transferable superclass]
-    expected: PRECONDITION_FAILED
-
   [Object with a getter that throws]
     expected: FAIL
 
diff --git a/tests/wpt/meta/intersection-observer/cross-origin-iframe.sub.html.ini b/tests/wpt/meta/intersection-observer/cross-origin-iframe.sub.html.ini
index 39e6d266369..1dc79136c28 100644
--- a/tests/wpt/meta/intersection-observer/cross-origin-iframe.sub.html.ini
+++ b/tests/wpt/meta/intersection-observer/cross-origin-iframe.sub.html.ini
@@ -1,6 +1,12 @@
 [cross-origin-iframe.sub.html]
-  [Intersection observer test with no explicit root and target in a cross-origin iframe.]
-    expected: FAIL
-
   [First rAF]
     expected: FAIL
+
+  [topDocument.scrollingElement.scrollTop = 200]
+    expected: FAIL
+
+  [iframeDocument.scrollingElement.scrollTop = 250]
+    expected: FAIL
+
+  [topDocument.scrollingElement.scrollTop = 100]
+    expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/disconnect.html.ini b/tests/wpt/meta/intersection-observer/disconnect.html.ini
deleted file mode 100644
index 70b23aa0569..00000000000
--- a/tests/wpt/meta/intersection-observer/disconnect.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[disconnect.html]
-  [First rAF.]
-    expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/iframe-no-root-with-wrapping-scroller.html.ini b/tests/wpt/meta/intersection-observer/iframe-no-root-with-wrapping-scroller.html.ini
index ba933b6acf4..6487e5369be 100644
--- a/tests/wpt/meta/intersection-observer/iframe-no-root-with-wrapping-scroller.html.ini
+++ b/tests/wpt/meta/intersection-observer/iframe-no-root-with-wrapping-scroller.html.ini
@@ -1,3 +1,9 @@
 [iframe-no-root-with-wrapping-scroller.html]
   [First rAF.]
     expected: FAIL
+
+  [iframe.contentDocument.scrollingElement.scrollTop = 250]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = 100]
+    expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/iframe-no-root.html.ini b/tests/wpt/meta/intersection-observer/iframe-no-root.html.ini
index be9635ba685..ed3bea4c34d 100644
--- a/tests/wpt/meta/intersection-observer/iframe-no-root.html.ini
+++ b/tests/wpt/meta/intersection-observer/iframe-no-root.html.ini
@@ -1,3 +1,9 @@
 [iframe-no-root.html]
   [First rAF.]
     expected: FAIL
+
+  [iframe.contentDocument.scrollingElement.scrollTop = 250]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = 100]
+    expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/intersection-ratio-with-fractional-bounds-2.html.ini b/tests/wpt/meta/intersection-observer/intersection-ratio-with-fractional-bounds-2.html.ini
deleted file mode 100644
index 57199041d19..00000000000
--- a/tests/wpt/meta/intersection-observer/intersection-ratio-with-fractional-bounds-2.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[intersection-ratio-with-fractional-bounds-2.html]
-  [IntersectionObserver ratio with fractional bounds]
-    expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/multiple-targets.html.ini b/tests/wpt/meta/intersection-observer/multiple-targets.html.ini
index 9d26cd2fde2..bfead81117d 100644
--- a/tests/wpt/meta/intersection-observer/multiple-targets.html.ini
+++ b/tests/wpt/meta/intersection-observer/multiple-targets.html.ini
@@ -1,3 +1,9 @@
 [multiple-targets.html]
-  [First rAF.]
+  [document.scrollingElement.scrollTop = 150]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = 10000]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = 0]
     expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/multiple-thresholds.html.ini b/tests/wpt/meta/intersection-observer/multiple-thresholds.html.ini
index c5d1a5e1a88..89a8f635fa1 100644
--- a/tests/wpt/meta/intersection-observer/multiple-thresholds.html.ini
+++ b/tests/wpt/meta/intersection-observer/multiple-thresholds.html.ini
@@ -1,3 +1,21 @@
 [multiple-thresholds.html]
-  [First rAF.]
+  [document.scrollingElement.scrollTop = 120]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = 160]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = 200]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = 240]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = window.innerHeight + 140]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = window.innerHeight + 160]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = window.innerHeight + 200]
     expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/observer-without-js-reference.html.ini b/tests/wpt/meta/intersection-observer/observer-without-js-reference.html.ini
index 196dea7cff3..5edab7dcccc 100644
--- a/tests/wpt/meta/intersection-observer/observer-without-js-reference.html.ini
+++ b/tests/wpt/meta/intersection-observer/observer-without-js-reference.html.ini
@@ -1,3 +1,3 @@
 [observer-without-js-reference.html]
-  [First rAF]
+  [document.scrollingElement.scrollTop = 300]
     expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/root-margin-root-element.html.ini b/tests/wpt/meta/intersection-observer/root-margin-root-element.html.ini
index 28a499dc515..5c69cfd2345 100644
--- a/tests/wpt/meta/intersection-observer/root-margin-root-element.html.ini
+++ b/tests/wpt/meta/intersection-observer/root-margin-root-element.html.ini
@@ -1,3 +1,15 @@
 [root-margin-root-element.html]
   [First rAF]
     expected: FAIL
+
+  [root.scrollTop = 50, putting target into root margin]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = 0.]
+    expected: FAIL
+
+  [root.scrollTop = 0]
+    expected: FAIL
+
+  [root.scrollTop = 50 with root scrolled out of view.]
+    expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/root-margin.html.ini b/tests/wpt/meta/intersection-observer/root-margin.html.ini
index 6582614d5a2..788b5f1704b 100644
--- a/tests/wpt/meta/intersection-observer/root-margin.html.ini
+++ b/tests/wpt/meta/intersection-observer/root-margin.html.ini
@@ -1,3 +1,9 @@
 [root-margin.html]
-  [First rAF.]
+  [document.scrollingElement.scrollLeft = 100]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = document.documentElement.clientHeight + 200]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = document.documentElement.clientHeight + 300]
     expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/same-document-no-root.html.ini b/tests/wpt/meta/intersection-observer/same-document-no-root.html.ini
index 3d804678295..06e8519b1e8 100644
--- a/tests/wpt/meta/intersection-observer/same-document-no-root.html.ini
+++ b/tests/wpt/meta/intersection-observer/same-document-no-root.html.ini
@@ -1,3 +1,6 @@
 [same-document-no-root.html]
-  [First rAF.]
+  [document.scrollingElement.scrollTop = 300]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = 100]
     expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/same-document-root.html.ini b/tests/wpt/meta/intersection-observer/same-document-root.html.ini
index d5887744fb3..85bac42f7c5 100644
--- a/tests/wpt/meta/intersection-observer/same-document-root.html.ini
+++ b/tests/wpt/meta/intersection-observer/same-document-root.html.ini
@@ -1,3 +1,15 @@
 [same-document-root.html]
   [First rAF]
     expected: FAIL
+
+  [root.scrollTop = 150 with root scrolled into view.]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = 0.]
+    expected: FAIL
+
+  [root.scrollTop = 0]
+    expected: FAIL
+
+  [root.scrollTop = 150 with root scrolled out of view.]
+    expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/same-document-with-document-root.html.ini b/tests/wpt/meta/intersection-observer/same-document-with-document-root.html.ini
index 436759cb8a2..2875cd435bf 100644
--- a/tests/wpt/meta/intersection-observer/same-document-with-document-root.html.ini
+++ b/tests/wpt/meta/intersection-observer/same-document-with-document-root.html.ini
@@ -1,3 +1,3 @@
 [same-document-with-document-root.html]
-  [First rAF.]
+  [document.scrollingElement.scrollTop = 300]
     expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/same-document-zero-size-target.html.ini b/tests/wpt/meta/intersection-observer/same-document-zero-size-target.html.ini
index e178b0184da..6a06e9f9894 100644
--- a/tests/wpt/meta/intersection-observer/same-document-zero-size-target.html.ini
+++ b/tests/wpt/meta/intersection-observer/same-document-zero-size-target.html.ini
@@ -1,3 +1,6 @@
 [same-document-zero-size-target.html]
-  [First rAF]
+  [document.scrollingElement.scrollTop = 300]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = 100]
     expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/svg-clipped-rect-target.html.ini b/tests/wpt/meta/intersection-observer/svg-clipped-rect-target.html.ini
index 96836f858d7..918c4b3c999 100644
--- a/tests/wpt/meta/intersection-observer/svg-clipped-rect-target.html.ini
+++ b/tests/wpt/meta/intersection-observer/svg-clipped-rect-target.html.ini
@@ -1,3 +1,9 @@
 [svg-clipped-rect-target.html]
   [First rAF.]
     expected: FAIL
+
+  [document.scrollingElement.scrollTop = 300]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = 100]
+    expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/svg-group-target.html.ini b/tests/wpt/meta/intersection-observer/svg-group-target.html.ini
index 12408604c64..06e171e2f57 100644
--- a/tests/wpt/meta/intersection-observer/svg-group-target.html.ini
+++ b/tests/wpt/meta/intersection-observer/svg-group-target.html.ini
@@ -1,3 +1,9 @@
 [svg-group-target.html]
   [First rAF.]
     expected: FAIL
+
+  [descendant rect translated down by 150 units (out of SVG viewport)]
+    expected: FAIL
+
+  [descendant rect translated down by 100 units]
+    expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/svg-intersection-with-fractional-bounds.html.ini b/tests/wpt/meta/intersection-observer/svg-intersection-with-fractional-bounds.html.ini
index e5e86352686..dd78613c564 100644
--- a/tests/wpt/meta/intersection-observer/svg-intersection-with-fractional-bounds.html.ini
+++ b/tests/wpt/meta/intersection-observer/svg-intersection-with-fractional-bounds.html.ini
@@ -1,3 +1,9 @@
 [svg-intersection-with-fractional-bounds.html]
   [Initial Observation]
     expected: FAIL
+
+  [Intersection observation after scrolling 300]
+    expected: FAIL
+
+  [Intersection observation after scrolling 100]
+    expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/svg-rect-target.html.ini b/tests/wpt/meta/intersection-observer/svg-rect-target.html.ini
index 4479d819751..74b0f15ef50 100644
--- a/tests/wpt/meta/intersection-observer/svg-rect-target.html.ini
+++ b/tests/wpt/meta/intersection-observer/svg-rect-target.html.ini
@@ -1,3 +1,9 @@
 [svg-rect-target.html]
   [First rAF.]
     expected: FAIL
+
+  [document.scrollingElement.scrollTop = 300]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = 100]
+    expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/svg-transformed-rect-target.html.ini b/tests/wpt/meta/intersection-observer/svg-transformed-rect-target.html.ini
index c78b4d9abfa..8f22e4c8684 100644
--- a/tests/wpt/meta/intersection-observer/svg-transformed-rect-target.html.ini
+++ b/tests/wpt/meta/intersection-observer/svg-transformed-rect-target.html.ini
@@ -1,3 +1,9 @@
 [svg-transformed-rect-target.html]
   [First rAF.]
     expected: FAIL
+
+  [translated down by 150 units (out of SVG viewport)]
+    expected: FAIL
+
+  [translated down by 50 units]
+    expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/text-target.html.ini b/tests/wpt/meta/intersection-observer/text-target.html.ini
index 6429c79785f..f9386c6734a 100644
--- a/tests/wpt/meta/intersection-observer/text-target.html.ini
+++ b/tests/wpt/meta/intersection-observer/text-target.html.ini
@@ -1,3 +1,6 @@
 [text-target.html]
-  [First rAF.]
+  [document.scrollingElement.scrollTop = 300]
+    expected: FAIL
+
+  [document.scrollingElement.scrollTop = 100]
     expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/timestamp.html.ini b/tests/wpt/meta/intersection-observer/timestamp.html.ini
index 06830463612..505a56aaf94 100644
--- a/tests/wpt/meta/intersection-observer/timestamp.html.ini
+++ b/tests/wpt/meta/intersection-observer/timestamp.html.ini
@@ -1,3 +1,3 @@
 [timestamp.html]
-  [First rAF after iframe is loaded.]
+  [Generate notifications.]
     expected: FAIL
diff --git a/tests/wpt/meta/intersection-observer/visibility-hidden.html.ini b/tests/wpt/meta/intersection-observer/visibility-hidden.html.ini
index 44f86883791..63cf719796e 100644
--- a/tests/wpt/meta/intersection-observer/visibility-hidden.html.ini
+++ b/tests/wpt/meta/intersection-observer/visibility-hidden.html.ini
@@ -1,3 +1,3 @@
 [visibility-hidden.html]
-  [First rAF.]
+  [document.scrollingElement.scrollTop = 300]
     expected: FAIL
diff --git a/tests/wpt/meta/mimesniff/media/media-sniff.window.js.ini b/tests/wpt/meta/mimesniff/media/media-sniff.window.js.ini
new file mode 100644
index 00000000000..613306190b6
--- /dev/null
+++ b/tests/wpt/meta/mimesniff/media/media-sniff.window.js.ini
@@ -0,0 +1,3 @@
+[media-sniff.window.html]
+  bug: https://github.com/servo/servo/issues/36626
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/mimesniff/mime-types/charset-parameter.window.js.ini b/tests/wpt/meta/mimesniff/mime-types/charset-parameter.window.js.ini
index 6e917828ee0..82cfd1dfe2d 100644
--- a/tests/wpt/meta/mimesniff/mime-types/charset-parameter.window.js.ini
+++ b/tests/wpt/meta/mimesniff/mime-types/charset-parameter.window.js.ini
@@ -35,12 +35,6 @@
   [text/html;charset="gbk]
     expected: FAIL
 
-  [text/html;charset="\\ gbk"]
-    expected: FAIL
-
-  [text/html;charset="\\g\\b\\k"]
-    expected: FAIL
-
   [text/html;charset="gbk"x]
     expected: FAIL
 
diff --git a/tests/wpt/meta/mixed-content/blob.https.sub.html.ini b/tests/wpt/meta/mixed-content/blob.https.sub.html.ini
deleted file mode 100644
index c249fb7dec2..00000000000
--- a/tests/wpt/meta/mixed-content/blob.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[blob.https.sub.html]
-  expected: ERROR
-  [Mixed-Content: blob tests 1]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/csp.https.window.js.ini b/tests/wpt/meta/mixed-content/csp.https.window.js.ini
deleted file mode 100644
index bffe056ff1f..00000000000
--- a/tests/wpt/meta/mixed-content/csp.https.window.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[csp.https.window.html]
-  [Mixed content checks apply to fetches in sandboxed documents]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html.ini
index f137b6ba51c..e46ff8c1948 100644
--- a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html.ini
+++ b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html.ini
@@ -1,24 +1,25 @@
 [audio-tag.https.html]
+  expected: TIMEOUT
   [Mixed-Content: Expects blocked for audio-tag to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Mixed-Content: Expects blocked for audio-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Mixed-Content: Expects blocked for audio-tag to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Mixed-Content: Expects blocked for audio-tag to cross-https origin and swap-scheme redirection from https context.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Mixed-Content: Expects blocked for audio-tag to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Mixed-Content: Expects blocked for audio-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Mixed-Content: Expects blocked for audio-tag to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Mixed-Content: Expects blocked for audio-tag to same-https origin and swap-scheme redirection from https context.]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/fetch.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/fetch.https.html.ini
index c55cf7260f1..2a0c13004e3 100644
--- a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/fetch.https.html.ini
+++ b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/fetch.https.html.ini
@@ -1,24 +1,6 @@
 [fetch.https.html]
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context.]
     expected: FAIL
 
-  [Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context.]
     expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html.ini
index 8ca272db562..238c85ee615 100644
--- a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html.ini
+++ b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html.ini
@@ -1,24 +1,6 @@
 [img-tag.https.html]
-  [Mixed-Content: Expects blocked for img-tag to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for img-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for img-tag to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for img-tag to cross-https origin and swap-scheme redirection from https context.]
     expected: FAIL
 
-  [Mixed-Content: Expects blocked for img-tag to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for img-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for img-tag to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for img-tag to same-https origin and swap-scheme redirection from https context.]
     expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html.ini
index 86e943fc236..e06a5875699 100644
--- a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html.ini
+++ b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html.ini
@@ -1,24 +1,6 @@
 [link-css-tag.https.html]
-  [Mixed-Content: Expects blocked for link-css-tag to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-css-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-css-tag to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for link-css-tag to cross-https origin and swap-scheme redirection from https context.]
     expected: FAIL
 
-  [Mixed-Content: Expects blocked for link-css-tag to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-css-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-css-tag to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for link-css-tag to same-https origin and swap-scheme redirection from https context.]
     expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html.ini
index b5ae92ca34e..9808dfd2e07 100644
--- a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html.ini
+++ b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html.ini
@@ -1,24 +1,6 @@
 [link-prefetch-tag.https.html]
-  [Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for link-prefetch-tag to cross-https origin and swap-scheme redirection from https context.]
     expected: FAIL
 
-  [Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for link-prefetch-tag to same-https origin and swap-scheme redirection from https context.]
     expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html.ini
index 61363caf01b..d67a373c5ff 100644
--- a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html.ini
+++ b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html.ini
@@ -1,24 +1,6 @@
 [picture-tag.https.html]
-  [Mixed-Content: Expects blocked for picture-tag to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for picture-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for picture-tag to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for picture-tag to cross-https origin and swap-scheme redirection from https context.]
     expected: FAIL
 
-  [Mixed-Content: Expects blocked for picture-tag to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for picture-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for picture-tag to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for picture-tag to same-https origin and swap-scheme redirection from https context.]
     expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html.ini
index 640f3352878..898c7def7ea 100644
--- a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html.ini
+++ b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html.ini
@@ -1,24 +1,6 @@
 [script-tag.https.html]
-  [Mixed-Content: Expects blocked for script-tag to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for script-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for script-tag to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for script-tag to cross-https origin and swap-scheme redirection from https context.]
     expected: FAIL
 
-  [Mixed-Content: Expects blocked for script-tag to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for script-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for script-tag to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for script-tag to same-https origin and swap-scheme redirection from https context.]
     expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/xhr.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/xhr.https.html.ini
index 5fdedfb77f9..ef782113bed 100644
--- a/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/xhr.https.html.ini
+++ b/tests/wpt/meta/mixed-content/gen/top.http-rp/opt-in/xhr.https.html.ini
@@ -1,24 +1,6 @@
 [xhr.https.html]
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context.]
     expected: FAIL
 
-  [Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context.]
     expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/audio-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/audio-tag.https.html.ini
index 4a34e14cd71..46ae75cae28 100644
--- a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/audio-tag.https.html.ini
+++ b/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/audio-tag.https.html.ini
@@ -1,6 +1,7 @@
 [audio-tag.https.html]
+  expected: TIMEOUT
   [Mixed-Content: Expects blocked for audio-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Mixed-Content: Expects blocked for audio-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/fetch.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/fetch.https.html.ini
deleted file mode 100644
index 1c9b927041e..00000000000
--- a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/fetch.https.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[fetch.https.html]
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/img-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/img-tag.https.html.ini
deleted file mode 100644
index c0f944cd819..00000000000
--- a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/img-tag.https.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[img-tag.https.html]
-  [Mixed-Content: Expects blocked for img-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for img-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/link-css-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/link-css-tag.https.html.ini
deleted file mode 100644
index 7033f60ba17..00000000000
--- a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/link-css-tag.https.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[link-css-tag.https.html]
-  [Mixed-Content: Expects blocked for link-css-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-css-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/link-prefetch-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/link-prefetch-tag.https.html.ini
deleted file mode 100644
index 35eed4b893f..00000000000
--- a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/link-prefetch-tag.https.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[link-prefetch-tag.https.html]
-  [Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/picture-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/picture-tag.https.html.ini
deleted file mode 100644
index 2ca106c6f72..00000000000
--- a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/picture-tag.https.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[picture-tag.https.html]
-  [Mixed-Content: Expects blocked for picture-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for picture-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/script-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/script-tag.https.html.ini
deleted file mode 100644
index 4a169093c38..00000000000
--- a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/script-tag.https.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[script-tag.https.html]
-  [Mixed-Content: Expects blocked for script-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for script-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/xhr.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/xhr.https.html.ini
deleted file mode 100644
index ea11f370b4d..00000000000
--- a/tests/wpt/meta/mixed-content/gen/top.meta/opt-in/xhr.https.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[xhr.https.html]
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/unset/audio-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/unset/audio-tag.https.html.ini
new file mode 100644
index 00000000000..bc6c50c0d23
--- /dev/null
+++ b/tests/wpt/meta/mixed-content/gen/top.meta/unset/audio-tag.https.html.ini
@@ -0,0 +1,25 @@
+[audio-tag.https.html]
+  expected: TIMEOUT
+  [Mixed-Content: Expects allowed for audio-tag to cross-http origin and keep-scheme redirection from https context.]
+    expected: TIMEOUT
+
+  [Mixed-Content: Expects allowed for audio-tag to cross-http origin and no-redirect redirection from https context.]
+    expected: NOTRUN
+
+  [Mixed-Content: Expects allowed for audio-tag to cross-http origin and swap-scheme redirection from https context.]
+    expected: NOTRUN
+
+  [Mixed-Content: Expects allowed for audio-tag to same-http origin and keep-scheme redirection from https context.]
+    expected: NOTRUN
+
+  [Mixed-Content: Expects allowed for audio-tag to same-http origin and no-redirect redirection from https context.]
+    expected: NOTRUN
+
+  [Mixed-Content: Expects allowed for audio-tag to same-http origin and swap-scheme redirection from https context.]
+    expected: NOTRUN
+
+  [Mixed-Content: Expects allowed for audio-tag to same-https origin and keep-scheme redirection from https context.]
+    expected: NOTRUN
+
+  [Mixed-Content: Expects allowed for audio-tag to same-https origin and no-redirect redirection from https context.]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/unset/fetch.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/unset/fetch.https.html.ini
deleted file mode 100644
index c52c579cef2..00000000000
--- a/tests/wpt/meta/mixed-content/gen/top.meta/unset/fetch.https.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[fetch.https.html]
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/unset/img-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/unset/img-tag.https.html.ini
new file mode 100644
index 00000000000..21ce7728c79
--- /dev/null
+++ b/tests/wpt/meta/mixed-content/gen/top.meta/unset/img-tag.https.html.ini
@@ -0,0 +1,18 @@
+[img-tag.https.html]
+  [Mixed-Content: Expects allowed for img-tag to cross-http origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
+  [Mixed-Content: Expects allowed for img-tag to cross-http origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Mixed-Content: Expects allowed for img-tag to cross-http origin and swap-scheme redirection from https context.]
+    expected: FAIL
+
+  [Mixed-Content: Expects allowed for img-tag to same-http origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
+  [Mixed-Content: Expects allowed for img-tag to same-http origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Mixed-Content: Expects allowed for img-tag to same-http origin and swap-scheme redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/unset/link-css-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/unset/link-css-tag.https.html.ini
deleted file mode 100644
index ef780404771..00000000000
--- a/tests/wpt/meta/mixed-content/gen/top.meta/unset/link-css-tag.https.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[link-css-tag.https.html]
-  [Mixed-Content: Expects blocked for link-css-tag to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-css-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-css-tag to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-css-tag to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-css-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-css-tag to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/unset/link-prefetch-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/unset/link-prefetch-tag.https.html.ini
deleted file mode 100644
index b01983b7c15..00000000000
--- a/tests/wpt/meta/mixed-content/gen/top.meta/unset/link-prefetch-tag.https.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[link-prefetch-tag.https.html]
-  [Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/unset/picture-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/unset/picture-tag.https.html.ini
deleted file mode 100644
index c18678390c1..00000000000
--- a/tests/wpt/meta/mixed-content/gen/top.meta/unset/picture-tag.https.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[picture-tag.https.html]
-  [Mixed-Content: Expects blocked for picture-tag to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for picture-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for picture-tag to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for picture-tag to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for picture-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for picture-tag to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/unset/script-tag.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/unset/script-tag.https.html.ini
deleted file mode 100644
index efc5f8a60b7..00000000000
--- a/tests/wpt/meta/mixed-content/gen/top.meta/unset/script-tag.https.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[script-tag.https.html]
-  [Mixed-Content: Expects blocked for script-tag to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for script-tag to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for script-tag to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for script-tag to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for script-tag to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for script-tag to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/top.meta/unset/xhr.https.html.ini b/tests/wpt/meta/mixed-content/gen/top.meta/unset/xhr.https.html.ini
deleted file mode 100644
index 4f747045a94..00000000000
--- a/tests/wpt/meta/mixed-content/gen/top.meta/unset/xhr.https.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[xhr.https.html]
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html.ini b/tests/wpt/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html.ini
index c55cf7260f1..2a0c13004e3 100644
--- a/tests/wpt/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html.ini
+++ b/tests/wpt/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html.ini
@@ -1,24 +1,6 @@
 [fetch.https.html]
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context.]
     expected: FAIL
 
-  [Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context.]
     expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html.ini b/tests/wpt/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html.ini
index 5fdedfb77f9..ef782113bed 100644
--- a/tests/wpt/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html.ini
+++ b/tests/wpt/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html.ini
@@ -1,24 +1,6 @@
 [xhr.https.html]
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context.]
     expected: FAIL
 
-  [Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context.]
     expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/worker-classic-data.meta/opt-in/fetch.https.html.ini b/tests/wpt/meta/mixed-content/gen/worker-classic-data.meta/opt-in/fetch.https.html.ini
deleted file mode 100644
index 1c9b927041e..00000000000
--- a/tests/wpt/meta/mixed-content/gen/worker-classic-data.meta/opt-in/fetch.https.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[fetch.https.html]
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/worker-classic-data.meta/opt-in/xhr.https.html.ini b/tests/wpt/meta/mixed-content/gen/worker-classic-data.meta/opt-in/xhr.https.html.ini
deleted file mode 100644
index ea11f370b4d..00000000000
--- a/tests/wpt/meta/mixed-content/gen/worker-classic-data.meta/opt-in/xhr.https.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[xhr.https.html]
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch.https.html.ini b/tests/wpt/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch.https.html.ini
deleted file mode 100644
index c52c579cef2..00000000000
--- a/tests/wpt/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch.https.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[fetch.https.html]
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/worker-classic-data.meta/unset/xhr.https.html.ini b/tests/wpt/meta/mixed-content/gen/worker-classic-data.meta/unset/xhr.https.html.ini
deleted file mode 100644
index 4f747045a94..00000000000
--- a/tests/wpt/meta/mixed-content/gen/worker-classic-data.meta/unset/xhr.https.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[xhr.https.html]
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/worker-classic.http-rp/opt-in/fetch.https.html.ini b/tests/wpt/meta/mixed-content/gen/worker-classic.http-rp/opt-in/fetch.https.html.ini
index c55cf7260f1..2a0c13004e3 100644
--- a/tests/wpt/meta/mixed-content/gen/worker-classic.http-rp/opt-in/fetch.https.html.ini
+++ b/tests/wpt/meta/mixed-content/gen/worker-classic.http-rp/opt-in/fetch.https.html.ini
@@ -1,24 +1,6 @@
 [fetch.https.html]
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context.]
     expected: FAIL
 
-  [Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context.]
     expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/worker-classic.http-rp/opt-in/xhr.https.html.ini b/tests/wpt/meta/mixed-content/gen/worker-classic.http-rp/opt-in/xhr.https.html.ini
index 5fdedfb77f9..ef782113bed 100644
--- a/tests/wpt/meta/mixed-content/gen/worker-classic.http-rp/opt-in/xhr.https.html.ini
+++ b/tests/wpt/meta/mixed-content/gen/worker-classic.http-rp/opt-in/xhr.https.html.ini
@@ -1,24 +1,6 @@
 [xhr.https.html]
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context.]
     expected: FAIL
 
-  [Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
   [Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context.]
     expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/worker-classic.http-rp/unset/fetch.https.html.ini b/tests/wpt/meta/mixed-content/gen/worker-classic.http-rp/unset/fetch.https.html.ini
deleted file mode 100644
index c52c579cef2..00000000000
--- a/tests/wpt/meta/mixed-content/gen/worker-classic.http-rp/unset/fetch.https.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[fetch.https.html]
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/gen/worker-classic.http-rp/unset/xhr.https.html.ini b/tests/wpt/meta/mixed-content/gen/worker-classic.http-rp/unset/xhr.https.html.ini
deleted file mode 100644
index 4f747045a94..00000000000
--- a/tests/wpt/meta/mixed-content/gen/worker-classic.http-rp/unset/xhr.https.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[xhr.https.html]
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context.]
-    expected: FAIL
-
-  [Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context.]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/nested-iframes.window.js.ini b/tests/wpt/meta/mixed-content/nested-iframes.window.js.ini
deleted file mode 100644
index 3f580055707..00000000000
--- a/tests/wpt/meta/mixed-content/nested-iframes.window.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[nested-iframes.window.html]
-  [HTTP fetch]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini b/tests/wpt/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini
deleted file mode 100644
index 4fd74c351e1..00000000000
--- a/tests/wpt/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[audio-upgrade.https.sub.html]
-  [Audio autoupgraded]
-    expected: FAIL
-
-  [Audio of other host autoupgraded]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html.ini b/tests/wpt/meta/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html.ini
deleted file mode 100644
index 1ef1ffb348b..00000000000
--- a/tests/wpt/meta/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[image-upgrade.https.sub.html]
-  [Image autoupgraded]
-    expected: FAIL
-
-  [Image of other host autoupgraded]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html.ini b/tests/wpt/meta/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html.ini
deleted file mode 100644
index 11f8aa7ebb0..00000000000
--- a/tests/wpt/meta/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[mixed-content-cors.https.sub.html]
-  [Cross-Origin audio should get upgraded even if CORS is set]
-    expected: FAIL
-
-  [Cross-Origin image should get upgraded even if CORS is set]
-    expected: FAIL
-
-  [Cross-Origin video should get upgraded even if CORS is set]
-    expected: FAIL
diff --git a/tests/wpt/meta/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html.ini b/tests/wpt/meta/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html.ini
deleted file mode 100644
index 1a55d2c24f9..00000000000
--- a/tests/wpt/meta/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[video-upgrade.https.sub.html]
-  [Video autoupgraded]
-    expected: FAIL
-
-  [Video of other host autoupgraded]
-    expected: FAIL
diff --git a/tests/wpt/meta/navigation-timing/test-navigation-type-reload.html.ini b/tests/wpt/meta/navigation-timing/test-navigation-type-reload.html.ini
index 20d32f43049..fb5e4d1adbe 100644
--- a/tests/wpt/meta/navigation-timing/test-navigation-type-reload.html.ini
+++ b/tests/wpt/meta/navigation-timing/test-navigation-type-reload.html.ini
@@ -16,3 +16,9 @@
 
   [Reload fetchStart > Original fetchStart]
     expected: FAIL
+
+  [Reload domContentLoadedEventEnd > Original domContentLoadedEventEnd]
+    expected: FAIL
+
+  [Reload domComplete > Original domComplete]
+    expected: FAIL
diff --git a/tests/wpt/meta/notifications/getnotifications-across-processes.https.window.js.ini b/tests/wpt/meta/notifications/getnotifications-across-processes.https.window.js.ini
index feb4af8281c..e9d824cc981 100644
--- a/tests/wpt/meta/notifications/getnotifications-across-processes.https.window.js.ini
+++ b/tests/wpt/meta/notifications/getnotifications-across-processes.https.window.js.ini
@@ -1,2 +1,4 @@
 [getnotifications-across-processes.https.window.html]
   expected: ERROR
+  [Service worker test setup]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/old-tests/submission/Microsoft/foreigncontent/foreign_content_015.html.ini b/tests/wpt/meta/old-tests/submission/Microsoft/foreigncontent/foreign_content_015.html.ini
new file mode 100644
index 00000000000..4c68b8ce591
--- /dev/null
+++ b/tests/wpt/meta/old-tests/submission/Microsoft/foreigncontent/foreign_content_015.html.ini
@@ -0,0 +1,3 @@
+[foreign_content_015.html]
+  [HTML 5 Foreign Content SVG in HTML ]
+    expected: FAIL
diff --git a/tests/wpt/meta/old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm.ini b/tests/wpt/meta/old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm.ini
new file mode 100644
index 00000000000..0a2f7e8758f
--- /dev/null
+++ b/tests/wpt/meta/old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm.ini
@@ -0,0 +1,3 @@
+[insertNodeIntoSelection.htm]
+  [HTML5 Selection: Insert a new element and text node into an element that is currently selected]
+    expected: FAIL
diff --git a/tests/wpt/meta/old-tests/submission/Microsoft/selection/select.htm.ini b/tests/wpt/meta/old-tests/submission/Microsoft/selection/select.htm.ini
new file mode 100644
index 00000000000..40cd1233444
--- /dev/null
+++ b/tests/wpt/meta/old-tests/submission/Microsoft/selection/select.htm.ini
@@ -0,0 +1,3 @@
+[select.htm]
+  [HTML5 Selection: Call select() on a text field]
+    expected: FAIL
diff --git a/tests/wpt/meta/old-tests/submission/Microsoft/selection/selectionStartEnd.htm.ini b/tests/wpt/meta/old-tests/submission/Microsoft/selection/selectionStartEnd.htm.ini
new file mode 100644
index 00000000000..ad4bbdc41fc
--- /dev/null
+++ b/tests/wpt/meta/old-tests/submission/Microsoft/selection/selectionStartEnd.htm.ini
@@ -0,0 +1,3 @@
+[selectionStartEnd.htm]
+  [HTML5 Selection: Set selectionStart and selectionEnd on a text field]
+    expected: FAIL
diff --git a/tests/wpt/meta/old-tests/submission/Microsoft/selection/setSelectionRange.htm.ini b/tests/wpt/meta/old-tests/submission/Microsoft/selection/setSelectionRange.htm.ini
new file mode 100644
index 00000000000..82cde1314c9
--- /dev/null
+++ b/tests/wpt/meta/old-tests/submission/Microsoft/selection/setSelectionRange.htm.ini
@@ -0,0 +1,3 @@
+[setSelectionRange.htm]
+  [HTML5 Selection: Call setSelectionRange() on a text field]
+    expected: FAIL
diff --git a/tests/wpt/meta/permissions/all-permissions.html.ini b/tests/wpt/meta/permissions/all-permissions.html.ini
index 103ebfa3f74..27e7b03eb7c 100644
--- a/tests/wpt/meta/permissions/all-permissions.html.ini
+++ b/tests/wpt/meta/permissions/all-permissions.html.ini
@@ -28,30 +28,3 @@
 
   [Query "xr-spatial-tracking" permission]
     expected: FAIL
-
-  [Query "geolocation" permission]
-    expected: FAIL
-
-  [Query "notifications" permission]
-    expected: FAIL
-
-  [Query "persistent-storage" permission]
-    expected: FAIL
-
-  [Query "push" permission]
-    expected: FAIL
-
-  [Query "background-sync" permission]
-    expected: FAIL
-
-  [Query "bluetooth" permission]
-    expected: FAIL
-
-  [Query "midi" permission]
-    expected: FAIL
-
-  [Query "camera" permission]
-    expected: FAIL
-
-  [Query "microphone" permission]
-    expected: FAIL
diff --git a/tests/wpt/meta/permissions/idlharness.any.js.ini b/tests/wpt/meta/permissions/idlharness.any.js.ini
index 507819232d7..3191d0751c0 100644
--- a/tests/wpt/meta/permissions/idlharness.any.js.ini
+++ b/tests/wpt/meta/permissions/idlharness.any.js.ini
@@ -1,164 +1,14 @@
 [idlharness.any.worker.html]
-  [Permissions interface: operation query(object)]
-    expected: FAIL
-
-  [Permissions interface: calling query(object) on navigator.permissions with too few arguments must throw TypeError]
-    expected: FAIL
-
   [PermissionStatus interface: attribute name]
     expected: FAIL
 
   [PermissionStatus interface: permissionStatus must inherit property "name" with the proper type]
     expected: FAIL
 
-  [Permissions interface: existence and properties of interface object]
-    expected: FAIL
-
-  [Permissions interface object length]
-    expected: FAIL
-
-  [Permissions interface object name]
-    expected: FAIL
-
-  [Permissions interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [Permissions interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [Permissions interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [Permissions must be primary interface of navigator.permissions]
-    expected: FAIL
-
-  [Stringification of navigator.permissions]
-    expected: FAIL
-
-  [Permissions interface: navigator.permissions must inherit property "query(object)" with the proper type]
-    expected: FAIL
-
-  [PermissionStatus interface: existence and properties of interface object]
-    expected: FAIL
-
-  [PermissionStatus interface object length]
-    expected: FAIL
-
-  [PermissionStatus interface object name]
-    expected: FAIL
-
-  [PermissionStatus interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [PermissionStatus interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [PermissionStatus interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [PermissionStatus interface: attribute state]
-    expected: FAIL
-
-  [PermissionStatus interface: attribute onchange]
-    expected: FAIL
-
-  [PermissionStatus must be primary interface of permissionStatus]
-    expected: FAIL
-
-  [Stringification of permissionStatus]
-    expected: FAIL
-
-  [PermissionStatus interface: permissionStatus must inherit property "state" with the proper type]
-    expected: FAIL
-
-  [PermissionStatus interface: permissionStatus must inherit property "onchange" with the proper type]
-    expected: FAIL
-
-  [WorkerNavigator interface: attribute permissions]
-    expected: FAIL
-
-  [WorkerNavigator interface: navigator must inherit property "permissions" with the proper type]
-    expected: FAIL
-
 
 [idlharness.any.html]
-  [Permissions interface: operation query(object)]
-    expected: FAIL
-
-  [Permissions interface: calling query(object) on navigator.permissions with too few arguments must throw TypeError]
-    expected: FAIL
-
   [PermissionStatus interface: attribute name]
     expected: FAIL
 
   [PermissionStatus interface: permissionStatus must inherit property "name" with the proper type]
     expected: FAIL
-
-  [Permissions interface: existence and properties of interface object]
-    expected: FAIL
-
-  [Permissions interface object length]
-    expected: FAIL
-
-  [Permissions interface object name]
-    expected: FAIL
-
-  [Permissions interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [Permissions interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [Permissions interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [Permissions must be primary interface of navigator.permissions]
-    expected: FAIL
-
-  [Stringification of navigator.permissions]
-    expected: FAIL
-
-  [Permissions interface: navigator.permissions must inherit property "query(object)" with the proper type]
-    expected: FAIL
-
-  [PermissionStatus interface: existence and properties of interface object]
-    expected: FAIL
-
-  [PermissionStatus interface object length]
-    expected: FAIL
-
-  [PermissionStatus interface object name]
-    expected: FAIL
-
-  [PermissionStatus interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [PermissionStatus interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [PermissionStatus interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [PermissionStatus interface: attribute state]
-    expected: FAIL
-
-  [PermissionStatus interface: attribute onchange]
-    expected: FAIL
-
-  [PermissionStatus must be primary interface of permissionStatus]
-    expected: FAIL
-
-  [Stringification of permissionStatus]
-    expected: FAIL
-
-  [PermissionStatus interface: permissionStatus must inherit property "state" with the proper type]
-    expected: FAIL
-
-  [PermissionStatus interface: permissionStatus must inherit property "onchange" with the proper type]
-    expected: FAIL
-
-  [Navigator interface: attribute permissions]
-    expected: FAIL
-
-  [Navigator interface: navigator must inherit property "permissions" with the proper type]
-    expected: FAIL
diff --git a/tests/wpt/meta/permissions/permissions-query-feature-policy-attribute.https.sub.html.ini b/tests/wpt/meta/permissions/permissions-query-feature-policy-attribute.https.sub.html.ini
index a02439a8e9a..f2f5dc83956 100644
--- a/tests/wpt/meta/permissions/permissions-query-feature-policy-attribute.https.sub.html.ini
+++ b/tests/wpt/meta/permissions/permissions-query-feature-policy-attribute.https.sub.html.ini
@@ -1,12 +1,3 @@
 [permissions-query-feature-policy-attribute.https.sub.html]
-  [Permissions.state is "prompt" with allow="geolocation" in same-origin iframes.]
-    expected: FAIL
-
-  [Permissions.state is "prompt" with allow="geolocation" in cross-origin iframes.]
-    expected: FAIL
-
-  [Permission.state is "prompt" in same-origin iframes.]
-    expected: FAIL
-
   [Permission.state is "denied" in cross-origin iframes.]
     expected: FAIL
diff --git a/tests/wpt/meta/quirks/line-height-calculation.html.ini b/tests/wpt/meta/quirks/line-height-calculation.html.ini
index 248da212174..42e4c8c0007 100644
--- a/tests/wpt/meta/quirks/line-height-calculation.html.ini
+++ b/tests/wpt/meta/quirks/line-height-calculation.html.ini
@@ -7,3 +7,6 @@
 
   [The line height calculation quirk, <table><tr><td id=test><img src="{png}"> <img src="{png}"><tr><td id=ref>x<tr><td id=s_ref>x</table>]
     expected: FAIL
+
+  [The line height calculation quirk, #test img { padding:1px }<div id=test><img src="{png}"></div><img id=ref src="{png}" height=3><div id=s_ref>x</div>]
+    expected: FAIL
diff --git a/tests/wpt/meta/quirks/table-cell-width-calculation.html.ini b/tests/wpt/meta/quirks/table-cell-width-calculation.html.ini
index 3d66c4f26ac..8bdfbfb0a63 100644
--- a/tests/wpt/meta/quirks/table-cell-width-calculation.html.ini
+++ b/tests/wpt/meta/quirks/table-cell-width-calculation.html.ini
@@ -1,18 +1,3 @@
 [table-cell-width-calculation.html]
-  [The table cell width calculation quirk, basic]
-    expected: FAIL
-
-  [The table cell width calculation quirk, inline-block]
-    expected: FAIL
-
-  [The table cell width calculation quirk, img in span]
-    expected: FAIL
-
-  [The table cell width calculation quirk, the don't-wrap rule is only for the purpose of calculating the width of the cell]
-    expected: FAIL
-
-  [The table cell width calculation quirk, display:table-cell on span]
-    expected: FAIL
-
-  [The table cell width calculation quirk, display:table-cell on span, wbr]
+  [The table cell width calculation quirk, the quirk shouldn't apply for <video poster>]
     expected: FAIL
diff --git a/tests/wpt/meta/quirks/unitless-length/excluded-properties-002.html.ini b/tests/wpt/meta/quirks/unitless-length/excluded-properties-002.html.ini
index d1baec1fc5b..a633e24103b 100644
--- a/tests/wpt/meta/quirks/unitless-length/excluded-properties-002.html.ini
+++ b/tests/wpt/meta/quirks/unitless-length/excluded-properties-002.html.ini
@@ -2,8 +2,5 @@
   [Property background-blend-mode does not support quirky length]
     expected: FAIL
 
-  [Property column-span does not support quirky length]
-    expected: FAIL
-
   [Property mask does not support quirky length]
     expected: FAIL
diff --git a/tests/wpt/meta/referrer-policy/generic/first-meta-changed-after-second-added.http.html.ini b/tests/wpt/meta/referrer-policy/generic/first-meta-changed-after-second-added.http.html.ini
deleted file mode 100644
index e348a3023a8..00000000000
--- a/tests/wpt/meta/referrer-policy/generic/first-meta-changed-after-second-added.http.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[first-meta-changed-after-second-added.http.html]
-  [document referrer policy is the value of the most recently modified <meta name="referrer"]
-    expected: FAIL
diff --git a/tests/wpt/meta/referrer-policy/generic/meta-referrer-outofhead-fetch.http.html.ini b/tests/wpt/meta/referrer-policy/generic/meta-referrer-outofhead-fetch.http.html.ini
deleted file mode 100644
index 4b303057cc8..00000000000
--- a/tests/wpt/meta/referrer-policy/generic/meta-referrer-outofhead-fetch.http.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[meta-referrer-outofhead-fetch.http.html]
-  [Referer header was not send]
-    expected: FAIL
diff --git a/tests/wpt/meta/referrer-policy/generic/meta-referrer-removed-2.http.html.ini b/tests/wpt/meta/referrer-policy/generic/meta-referrer-removed-2.http.html.ini
deleted file mode 100644
index 21b5772d0d5..00000000000
--- a/tests/wpt/meta/referrer-policy/generic/meta-referrer-removed-2.http.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[meta-referrer-removed-2.http.html]
-  [referrer policy does not change when second <meta name="referrer"> is removed]
-    expected: FAIL
diff --git a/tests/wpt/meta/referrer-policy/generic/refresh-cross-origin.sub.html.ini b/tests/wpt/meta/referrer-policy/generic/refresh-cross-origin.sub.html.ini
deleted file mode 100644
index de37856ad35..00000000000
--- a/tests/wpt/meta/referrer-policy/generic/refresh-cross-origin.sub.html.ini
+++ /dev/null
@@ -1,52 +0,0 @@
-[refresh-cross-origin.sub.html]
-  expected: TIMEOUT
-  [cross-origin header refresh with referrer policy "no-referrer" refreshes with the empty string as referrer]
-    expected: TIMEOUT
-
-  [cross-origin meta refresh with referrer policy "no-referrer-when-downgrade" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [cross-origin header refresh with referrer policy "no-referrer-when-downgrade" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [cross-origin meta refresh with referrer policy "origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [cross-origin header refresh with referrer policy "origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [cross-origin meta refresh with referrer policy "origin-when-cross-origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [cross-origin header refresh with referrer policy "origin-when-cross-origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [cross-origin meta refresh with referrer policy "same-origin" refreshes with the empty string as referrer]
-    expected: NOTRUN
-
-  [cross-origin header refresh with referrer policy "same-origin" refreshes with the empty string as referrer]
-    expected: NOTRUN
-
-  [cross-origin meta refresh with referrer policy "strict-origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [cross-origin header refresh with referrer policy "strict-origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [cross-origin meta refresh with referrer policy "strict-origin-when-cross-origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [cross-origin header refresh with referrer policy "strict-origin-when-cross-origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [cross-origin meta refresh with referrer policy "unsafe-url" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [cross-origin header refresh with referrer policy "unsafe-url" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [cross-origin meta refresh with referrer policy "" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [cross-origin header refresh with referrer policy "" refreshes with origin as referrer]
-    expected: NOTRUN
diff --git a/tests/wpt/meta/referrer-policy/generic/refresh-same-origin.html.ini b/tests/wpt/meta/referrer-policy/generic/refresh-same-origin.html.ini
deleted file mode 100644
index 5f5b29769be..00000000000
--- a/tests/wpt/meta/referrer-policy/generic/refresh-same-origin.html.ini
+++ /dev/null
@@ -1,52 +0,0 @@
-[refresh-same-origin.html]
-  expected: TIMEOUT
-  [same-origin header refresh with referrer policy "no-referrer" refreshes with the empty string as referrer]
-    expected: TIMEOUT
-
-  [same-origin meta refresh with referrer policy "no-referrer-when-downgrade" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-origin header refresh with referrer policy "no-referrer-when-downgrade" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-origin meta refresh with referrer policy "origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [same-origin header refresh with referrer policy "origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [same-origin meta refresh with referrer policy "origin-when-cross-origin" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-origin header refresh with referrer policy "origin-when-cross-origin" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-origin meta refresh with referrer policy "same-origin" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-origin header refresh with referrer policy "same-origin" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-origin meta refresh with referrer policy "strict-origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [same-origin header refresh with referrer policy "strict-origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [same-origin meta refresh with referrer policy "strict-origin-when-cross-origin" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-origin header refresh with referrer policy "strict-origin-when-cross-origin" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-origin meta refresh with referrer policy "unsafe-url" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-origin header refresh with referrer policy "unsafe-url" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-origin meta refresh with referrer policy "" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-origin header refresh with referrer policy "" refreshes with full url as referrer]
-    expected: NOTRUN
diff --git a/tests/wpt/meta/referrer-policy/generic/refresh-same-url.html.ini b/tests/wpt/meta/referrer-policy/generic/refresh-same-url.html.ini
deleted file mode 100644
index abbca451ae5..00000000000
--- a/tests/wpt/meta/referrer-policy/generic/refresh-same-url.html.ini
+++ /dev/null
@@ -1,52 +0,0 @@
-[refresh-same-url.html]
-  expected: TIMEOUT
-  [same-URL header refresh with referrer policy "no-referrer" refreshes with the empty string as referrer]
-    expected: TIMEOUT
-
-  [same-URL meta refresh with referrer policy "no-referrer-when-downgrade" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-URL header refresh with referrer policy "no-referrer-when-downgrade" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-URL meta refresh with referrer policy "origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [same-URL header refresh with referrer policy "origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [same-URL meta refresh with referrer policy "origin-when-cross-origin" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-URL header refresh with referrer policy "origin-when-cross-origin" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-URL meta refresh with referrer policy "same-origin" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-URL header refresh with referrer policy "same-origin" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-URL meta refresh with referrer policy "strict-origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [same-URL header refresh with referrer policy "strict-origin" refreshes with origin as referrer]
-    expected: NOTRUN
-
-  [same-URL meta refresh with referrer policy "strict-origin-when-cross-origin" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-URL header refresh with referrer policy "strict-origin-when-cross-origin" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-URL meta refresh with referrer policy "unsafe-url" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-URL header refresh with referrer policy "unsafe-url" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-URL meta refresh with referrer policy "" refreshes with full url as referrer]
-    expected: NOTRUN
-
-  [same-URL header refresh with referrer policy "" refreshes with full url as referrer]
-    expected: NOTRUN
diff --git a/tests/wpt/meta/resize-observer/__dir__.ini b/tests/wpt/meta/resize-observer/__dir__.ini
deleted file mode 100644
index 19c126482f0..00000000000
--- a/tests/wpt/meta/resize-observer/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-prefs: ["dom_resize_observer_enabled:true"]
diff --git a/tests/wpt/meta/resize-observer/calculate-depth-for-node.html.ini b/tests/wpt/meta/resize-observer/calculate-depth-for-node.html.ini
deleted file mode 100644
index 4e3c57f9422..00000000000
--- a/tests/wpt/meta/resize-observer/calculate-depth-for-node.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[calculate-depth-for-node.html]
-  expected: ERROR
-
-  ["Calculate depth for node" algorithm with Shadow DOM]
-    expected: FAIL
diff --git a/tests/wpt/meta/secure-contexts/shared-worker-insecure-first.https.html.ini b/tests/wpt/meta/secure-contexts/shared-worker-insecure-first.https.html.ini
index 674fb0383ec..3304522317f 100644
--- a/tests/wpt/meta/secure-contexts/shared-worker-insecure-first.https.html.ini
+++ b/tests/wpt/meta/secure-contexts/shared-worker-insecure-first.https.html.ini
@@ -1,12 +1,13 @@
 [shared-worker-insecure-first.https.html]
+  expected: TIMEOUT
   [Shared worker in subframe]
-    expected: FAIL
+    expected: NOTRUN
 
   [Nested worker in shared worker in subframe]
-    expected: FAIL
+    expected: NOTRUN
 
   [Shared worker in popup]
-    expected: FAIL
+    expected: NOTRUN
 
   [Nested worker from shared worker in popup]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/meta/secure-contexts/shared-worker-secure-first.https.html.ini b/tests/wpt/meta/secure-contexts/shared-worker-secure-first.https.html.ini
index 621ac02f998..176e7589dc3 100644
--- a/tests/wpt/meta/secure-contexts/shared-worker-secure-first.https.html.ini
+++ b/tests/wpt/meta/secure-contexts/shared-worker-secure-first.https.html.ini
@@ -1,4 +1,5 @@
 [shared-worker-secure-first.https.html]
+  expected: TIMEOUT
   [Shared worker in subframe]
     expected: FAIL
 
@@ -6,7 +7,7 @@
     expected: FAIL
 
   [Shared worker in popup]
-    expected: FAIL
+    expected: NOTRUN
 
   [Nested worker from shared worker in popup]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/meta/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html.ini b/tests/wpt/meta/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html.ini
index 842fc01b392..08b5cda5aed 100644
--- a/tests/wpt/meta/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html.ini
+++ b/tests/wpt/meta/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html.ini
@@ -7,3 +7,27 @@
 
   [modify createRange() range added to selection before setStart/setEnd calls.]
     expected: FAIL
+
+  [modify getRangeAt() range: setStart() to disconnected node will collapse and remove the live range from the selection.]
+    expected: FAIL
+
+  [modify getRangeAt() range: setEnd() crosses shadow boundary into the shadow DOM and after start, which collapses live range. Composed selection range is not collapsed.]
+    expected: FAIL
+
+  [modify getRangeAt() range: setStart() crosses shadow boundary into the shadow DOM and before end, which collapses live range. Composed selection range is not collapsed.]
+    expected: FAIL
+
+  [modify getRangeAt() range: setStart() crosses shadow boundary into the shadow DOM and after end, which collapses both live range and composed selection range.]
+    expected: FAIL
+
+  [modify getRangeAt() range: selectNode() innerHost for all ranges.]
+    expected: FAIL
+
+  [modify getRangeAt() range: collapse() collapses all ranges.]
+    expected: FAIL
+
+  [modify createRange() range: adding to selection sets the selection]
+    expected: FAIL
+
+  [modify createRange() range: added to selection before setStart/setEnd calls.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/cache-storage/cache-abort.https.any.js.ini b/tests/wpt/meta/service-workers/cache-storage/cache-abort.https.any.js.ini
new file mode 100644
index 00000000000..3c15c869c83
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/cache-abort.https.any.js.ini
@@ -0,0 +1,65 @@
+[cache-abort.https.any.html]
+  expected: ERROR
+  [put() on an already-aborted request should reject with AbortError]
+    expected: FAIL
+
+  [put() synchronously followed by abort should reject with AbortError]
+    expected: NOTRUN
+
+  [put() followed by abort after headers received should reject with AbortError]
+    expected: NOTRUN
+
+  [add() on an already-aborted request should reject with AbortError]
+    expected: NOTRUN
+
+  [add() synchronously followed by abort should reject with AbortError]
+    expected: NOTRUN
+
+  [add() followed by abort after headers received should reject with AbortError]
+    expected: NOTRUN
+
+  [addAll() on an already-aborted request should reject with AbortError]
+    expected: NOTRUN
+
+  [addAll() synchronously followed by abort should reject with AbortError]
+    expected: NOTRUN
+
+  [addAll() followed by abort after headers received should reject with AbortError]
+    expected: NOTRUN
+
+
+[cache-abort.https.any.worker.html]
+  expected: ERROR
+  [put() on an already-aborted request should reject with AbortError]
+    expected: FAIL
+
+  [put() synchronously followed by abort should reject with AbortError]
+    expected: NOTRUN
+
+  [put() followed by abort after headers received should reject with AbortError]
+    expected: NOTRUN
+
+  [add() on an already-aborted request should reject with AbortError]
+    expected: NOTRUN
+
+  [add() synchronously followed by abort should reject with AbortError]
+    expected: NOTRUN
+
+  [add() followed by abort after headers received should reject with AbortError]
+    expected: NOTRUN
+
+  [addAll() on an already-aborted request should reject with AbortError]
+    expected: NOTRUN
+
+  [addAll() synchronously followed by abort should reject with AbortError]
+    expected: NOTRUN
+
+  [addAll() followed by abort after headers received should reject with AbortError]
+    expected: NOTRUN
+
+
+[cache-abort.https.any.sharedworker.html]
+  expected: ERROR
+
+[cache-abort.https.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/service-workers/cache-storage/cache-add.https.any.js.ini b/tests/wpt/meta/service-workers/cache-storage/cache-add.https.any.js.ini
new file mode 100644
index 00000000000..2de3c2dcb08
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/cache-add.https.any.js.ini
@@ -0,0 +1,142 @@
+[cache-add.https.any.worker.html]
+  expected: ERROR
+  [Cache.add called with no arguments]
+    expected: FAIL
+
+  [Cache.add called with relative URL specified as a string]
+    expected: NOTRUN
+
+  [Cache.add called with non-HTTP/HTTPS URL]
+    expected: NOTRUN
+
+  [Cache.add called with Request object]
+    expected: NOTRUN
+
+  [Cache.add called with POST request]
+    expected: NOTRUN
+
+  [Cache.add called twice with the same Request object]
+    expected: NOTRUN
+
+  [Cache.add with request with null body (not consumed)]
+    expected: NOTRUN
+
+  [Cache.add with 206 response]
+    expected: NOTRUN
+
+  [Cache.addAll with 206 response]
+    expected: NOTRUN
+
+  [Cache.addAll with opaque-filtered 206 response]
+    expected: NOTRUN
+
+  [Cache.add with request that results in a status of 404]
+    expected: NOTRUN
+
+  [Cache.add with request that results in a status of 500]
+    expected: NOTRUN
+
+  [Cache.addAll with no arguments]
+    expected: NOTRUN
+
+  [Cache.addAll with a mix of valid and undefined arguments]
+    expected: NOTRUN
+
+  [Cache.addAll with an empty array]
+    expected: NOTRUN
+
+  [Cache.addAll with string URL arguments]
+    expected: NOTRUN
+
+  [Cache.addAll with Request arguments]
+    expected: NOTRUN
+
+  [Cache.addAll with a mix of succeeding and failing requests]
+    expected: NOTRUN
+
+  [Cache.addAll called with the same Request object specified twice]
+    expected: NOTRUN
+
+  [Cache.addAll should succeed when entries differ by vary header]
+    expected: NOTRUN
+
+  [Cache.addAll should reject when entries are duplicate by vary header]
+    expected: NOTRUN
+
+  [Cache.addAll should reject when one entry has a vary header matching another entry]
+    expected: NOTRUN
+
+
+[cache-add.https.any.sharedworker.html]
+  expected: ERROR
+
+[cache-add.https.any.serviceworker.html]
+  expected: ERROR
+
+[cache-add.https.any.html]
+  expected: ERROR
+  [Cache.add called with no arguments]
+    expected: FAIL
+
+  [Cache.add called with relative URL specified as a string]
+    expected: NOTRUN
+
+  [Cache.add called with non-HTTP/HTTPS URL]
+    expected: NOTRUN
+
+  [Cache.add called with Request object]
+    expected: NOTRUN
+
+  [Cache.add called with POST request]
+    expected: NOTRUN
+
+  [Cache.add called twice with the same Request object]
+    expected: NOTRUN
+
+  [Cache.add with request with null body (not consumed)]
+    expected: NOTRUN
+
+  [Cache.add with 206 response]
+    expected: NOTRUN
+
+  [Cache.addAll with 206 response]
+    expected: NOTRUN
+
+  [Cache.addAll with opaque-filtered 206 response]
+    expected: NOTRUN
+
+  [Cache.add with request that results in a status of 404]
+    expected: NOTRUN
+
+  [Cache.add with request that results in a status of 500]
+    expected: NOTRUN
+
+  [Cache.addAll with no arguments]
+    expected: NOTRUN
+
+  [Cache.addAll with a mix of valid and undefined arguments]
+    expected: NOTRUN
+
+  [Cache.addAll with an empty array]
+    expected: NOTRUN
+
+  [Cache.addAll with string URL arguments]
+    expected: NOTRUN
+
+  [Cache.addAll with Request arguments]
+    expected: NOTRUN
+
+  [Cache.addAll with a mix of succeeding and failing requests]
+    expected: NOTRUN
+
+  [Cache.addAll called with the same Request object specified twice]
+    expected: NOTRUN
+
+  [Cache.addAll should succeed when entries differ by vary header]
+    expected: NOTRUN
+
+  [Cache.addAll should reject when entries are duplicate by vary header]
+    expected: NOTRUN
+
+  [Cache.addAll should reject when one entry has a vary header matching another entry]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/cache-storage/cache-delete.https.any.js.ini b/tests/wpt/meta/service-workers/cache-storage/cache-delete.https.any.js.ini
new file mode 100644
index 00000000000..3475d774371
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/cache-delete.https.any.js.ini
@@ -0,0 +1,58 @@
+[cache-delete.https.any.serviceworker.html]
+  expected: ERROR
+
+[cache-delete.https.any.worker.html]
+  expected: ERROR
+  [Cache.delete with no arguments]
+    expected: FAIL
+
+  [Cache.delete called with a string URL]
+    expected: NOTRUN
+
+  [Cache.delete called with a Request object]
+    expected: NOTRUN
+
+  [Cache.delete called with a HEAD request]
+    expected: NOTRUN
+
+  [Cache.delete supports ignoreVary]
+    expected: NOTRUN
+
+  [Cache.delete with a non-existent entry]
+    expected: NOTRUN
+
+  [Cache.delete with ignoreSearch option (request with search parameters)]
+    expected: NOTRUN
+
+  [Cache.delete with ignoreSearch option (when it is specified as false)]
+    expected: NOTRUN
+
+
+[cache-delete.https.any.sharedworker.html]
+  expected: ERROR
+
+[cache-delete.https.any.html]
+  expected: ERROR
+  [Cache.delete with no arguments]
+    expected: FAIL
+
+  [Cache.delete called with a string URL]
+    expected: NOTRUN
+
+  [Cache.delete called with a Request object]
+    expected: NOTRUN
+
+  [Cache.delete called with a HEAD request]
+    expected: NOTRUN
+
+  [Cache.delete supports ignoreVary]
+    expected: NOTRUN
+
+  [Cache.delete with a non-existent entry]
+    expected: NOTRUN
+
+  [Cache.delete with ignoreSearch option (request with search parameters)]
+    expected: NOTRUN
+
+  [Cache.delete with ignoreSearch option (when it is specified as false)]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/cache-storage/cache-keys-attributes-for-service-worker.https.html.ini b/tests/wpt/meta/service-workers/cache-storage/cache-keys-attributes-for-service-worker.https.html.ini
new file mode 100644
index 00000000000..3c36c91ba49
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/cache-keys-attributes-for-service-worker.https.html.ini
@@ -0,0 +1,6 @@
+[cache-keys-attributes-for-service-worker.https.html]
+  [Request.IsReloadNavigation should persist.]
+    expected: FAIL
+
+  [Request.IsHistoryNavigation should persist.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/cache-storage/cache-keys.https.any.js.ini b/tests/wpt/meta/service-workers/cache-storage/cache-keys.https.any.js.ini
new file mode 100644
index 00000000000..efa3e88ef46
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/cache-keys.https.any.js.ini
@@ -0,0 +1,106 @@
+[cache-keys.https.any.sharedworker.html]
+  expected: ERROR
+
+[cache-keys.https.any.serviceworker.html]
+  expected: ERROR
+
+[cache-keys.https.any.worker.html]
+  expected: ERROR
+  [Cache.keys() called on an empty cache]
+    expected: FAIL
+
+  [Cache.keys with no matching entries]
+    expected: NOTRUN
+
+  [Cache.keys with URL]
+    expected: NOTRUN
+
+  [Cache.keys with Request]
+    expected: NOTRUN
+
+  [Cache.keys with new Request]
+    expected: NOTRUN
+
+  [Cache.keys with ignoreSearch option (request with no search parameters)]
+    expected: NOTRUN
+
+  [Cache.keys with ignoreSearch option (request with search parameters)]
+    expected: NOTRUN
+
+  [Cache.keys supports ignoreMethod]
+    expected: NOTRUN
+
+  [Cache.keys supports ignoreVary]
+    expected: NOTRUN
+
+  [Cache.keys with URL containing fragment]
+    expected: NOTRUN
+
+  [Cache.keys with string fragment "http" as query]
+    expected: NOTRUN
+
+  [Cache.keys without parameters]
+    expected: NOTRUN
+
+  [Cache.keys with explicitly undefined request]
+    expected: NOTRUN
+
+  [Cache.keys with explicitly undefined request and empty options]
+    expected: NOTRUN
+
+  [Cache.keys without parameters and VARY entries]
+    expected: NOTRUN
+
+  [Cache.keys with a HEAD Request]
+    expected: NOTRUN
+
+
+[cache-keys.https.any.html]
+  expected: ERROR
+  [Cache.keys() called on an empty cache]
+    expected: FAIL
+
+  [Cache.keys with no matching entries]
+    expected: NOTRUN
+
+  [Cache.keys with URL]
+    expected: NOTRUN
+
+  [Cache.keys with Request]
+    expected: NOTRUN
+
+  [Cache.keys with new Request]
+    expected: NOTRUN
+
+  [Cache.keys with ignoreSearch option (request with no search parameters)]
+    expected: NOTRUN
+
+  [Cache.keys with ignoreSearch option (request with search parameters)]
+    expected: NOTRUN
+
+  [Cache.keys supports ignoreMethod]
+    expected: NOTRUN
+
+  [Cache.keys supports ignoreVary]
+    expected: NOTRUN
+
+  [Cache.keys with URL containing fragment]
+    expected: NOTRUN
+
+  [Cache.keys with string fragment "http" as query]
+    expected: NOTRUN
+
+  [Cache.keys without parameters]
+    expected: NOTRUN
+
+  [Cache.keys with explicitly undefined request]
+    expected: NOTRUN
+
+  [Cache.keys with explicitly undefined request and empty options]
+    expected: NOTRUN
+
+  [Cache.keys without parameters and VARY entries]
+    expected: NOTRUN
+
+  [Cache.keys with a HEAD Request]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/cache-storage/cache-match.https.any.js.ini b/tests/wpt/meta/service-workers/cache-storage/cache-match.https.any.js.ini
new file mode 100644
index 00000000000..38275d5181a
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/cache-match.https.any.js.ini
@@ -0,0 +1,160 @@
+[cache-match.https.any.sharedworker.html]
+  expected: ERROR
+
+[cache-match.https.any.serviceworker.html]
+  expected: ERROR
+
+[cache-match.https.any.html]
+  expected: ERROR
+  [Cache.match with no matching entries]
+    expected: FAIL
+
+  [Cache.match with URL]
+    expected: NOTRUN
+
+  [Cache.match with Request]
+    expected: NOTRUN
+
+  [Cache.match with multiple cache hits]
+    expected: NOTRUN
+
+  [Cache.match with new Request]
+    expected: NOTRUN
+
+  [Cache.match with HEAD]
+    expected: NOTRUN
+
+  [Cache.match with ignoreSearch option (request with no search parameters)]
+    expected: NOTRUN
+
+  [Cache.match with ignoreSearch option (request with search parameter)]
+    expected: NOTRUN
+
+  [Cache.match supports ignoreMethod]
+    expected: NOTRUN
+
+  [Cache.match supports ignoreVary]
+    expected: NOTRUN
+
+  [Cache.match does not support cacheName option]
+    expected: NOTRUN
+
+  [Cache.match with URL containing fragment]
+    expected: NOTRUN
+
+  [Cache.match with string fragment "http" as query]
+    expected: NOTRUN
+
+  [Cache.match with responses containing "Vary" header]
+    expected: NOTRUN
+
+  [Cache.match with Request and Response objects with different URLs]
+    expected: NOTRUN
+
+  [Cache.match invoked multiple times for the same Request/Response]
+    expected: NOTRUN
+
+  [Cache.match blob should be sliceable]
+    expected: NOTRUN
+
+  [Cache.match with POST Request]
+    expected: NOTRUN
+
+  [Cache.match with a non-2xx Response]
+    expected: NOTRUN
+
+  [Cache.match with a network error Response]
+    expected: NOTRUN
+
+  [Cache produces large Responses that can be cloned and read correctly.]
+    expected: NOTRUN
+
+  [cors-exposed header should be stored correctly.]
+    expected: NOTRUN
+
+  [MIME type should be set from content-header correctly.]
+    expected: NOTRUN
+
+  [MIME type should reflect Content-Type headers of response.]
+    expected: NOTRUN
+
+  [Cache.match ignores vary headers on opaque response.]
+    expected: NOTRUN
+
+
+[cache-match.https.any.worker.html]
+  expected: ERROR
+  [Cache.match with no matching entries]
+    expected: FAIL
+
+  [Cache.match with URL]
+    expected: NOTRUN
+
+  [Cache.match with Request]
+    expected: NOTRUN
+
+  [Cache.match with multiple cache hits]
+    expected: NOTRUN
+
+  [Cache.match with new Request]
+    expected: NOTRUN
+
+  [Cache.match with HEAD]
+    expected: NOTRUN
+
+  [Cache.match with ignoreSearch option (request with no search parameters)]
+    expected: NOTRUN
+
+  [Cache.match with ignoreSearch option (request with search parameter)]
+    expected: NOTRUN
+
+  [Cache.match supports ignoreMethod]
+    expected: NOTRUN
+
+  [Cache.match supports ignoreVary]
+    expected: NOTRUN
+
+  [Cache.match does not support cacheName option]
+    expected: NOTRUN
+
+  [Cache.match with URL containing fragment]
+    expected: NOTRUN
+
+  [Cache.match with string fragment "http" as query]
+    expected: NOTRUN
+
+  [Cache.match with responses containing "Vary" header]
+    expected: NOTRUN
+
+  [Cache.match with Request and Response objects with different URLs]
+    expected: NOTRUN
+
+  [Cache.match invoked multiple times for the same Request/Response]
+    expected: NOTRUN
+
+  [Cache.match blob should be sliceable]
+    expected: NOTRUN
+
+  [Cache.match with POST Request]
+    expected: NOTRUN
+
+  [Cache.match with a non-2xx Response]
+    expected: NOTRUN
+
+  [Cache.match with a network error Response]
+    expected: NOTRUN
+
+  [Cache produces large Responses that can be cloned and read correctly.]
+    expected: NOTRUN
+
+  [cors-exposed header should be stored correctly.]
+    expected: NOTRUN
+
+  [MIME type should be set from content-header correctly.]
+    expected: NOTRUN
+
+  [MIME type should reflect Content-Type headers of response.]
+    expected: NOTRUN
+
+  [Cache.match ignores vary headers on opaque response.]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/cache-storage/cache-matchAll.https.any.js.ini b/tests/wpt/meta/service-workers/cache-storage/cache-matchAll.https.any.js.ini
new file mode 100644
index 00000000000..cf9916386b1
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/cache-matchAll.https.any.js.ini
@@ -0,0 +1,106 @@
+[cache-matchAll.https.any.serviceworker.html]
+  expected: ERROR
+
+[cache-matchAll.https.any.worker.html]
+  expected: ERROR
+  [Cache.matchAll with no matching entries]
+    expected: FAIL
+
+  [Cache.matchAll with URL]
+    expected: NOTRUN
+
+  [Cache.matchAll with Request]
+    expected: NOTRUN
+
+  [Cache.matchAll with new Request]
+    expected: NOTRUN
+
+  [Cache.matchAll with HEAD]
+    expected: NOTRUN
+
+  [Cache.matchAll with ignoreSearch option (request with no search parameters)]
+    expected: NOTRUN
+
+  [Cache.matchAll with ignoreSearch option (request with search parameters)]
+    expected: NOTRUN
+
+  [Cache.matchAll supports ignoreMethod]
+    expected: NOTRUN
+
+  [Cache.matchAll supports ignoreVary]
+    expected: NOTRUN
+
+  [Cache.matchAll with URL containing fragment]
+    expected: NOTRUN
+
+  [Cache.matchAll with string fragment "http" as query]
+    expected: NOTRUN
+
+  [Cache.matchAll without parameters]
+    expected: NOTRUN
+
+  [Cache.matchAll with explicitly undefined request]
+    expected: NOTRUN
+
+  [Cache.matchAll with explicitly undefined request and empty options]
+    expected: NOTRUN
+
+  [Cache.matchAll with responses containing "Vary" header]
+    expected: NOTRUN
+
+  [Cache.matchAll with multiple vary pairs]
+    expected: NOTRUN
+
+
+[cache-matchAll.https.any.sharedworker.html]
+  expected: ERROR
+
+[cache-matchAll.https.any.html]
+  expected: ERROR
+  [Cache.matchAll with no matching entries]
+    expected: FAIL
+
+  [Cache.matchAll with URL]
+    expected: NOTRUN
+
+  [Cache.matchAll with Request]
+    expected: NOTRUN
+
+  [Cache.matchAll with new Request]
+    expected: NOTRUN
+
+  [Cache.matchAll with HEAD]
+    expected: NOTRUN
+
+  [Cache.matchAll with ignoreSearch option (request with no search parameters)]
+    expected: NOTRUN
+
+  [Cache.matchAll with ignoreSearch option (request with search parameters)]
+    expected: NOTRUN
+
+  [Cache.matchAll supports ignoreMethod]
+    expected: NOTRUN
+
+  [Cache.matchAll supports ignoreVary]
+    expected: NOTRUN
+
+  [Cache.matchAll with URL containing fragment]
+    expected: NOTRUN
+
+  [Cache.matchAll with string fragment "http" as query]
+    expected: NOTRUN
+
+  [Cache.matchAll without parameters]
+    expected: NOTRUN
+
+  [Cache.matchAll with explicitly undefined request]
+    expected: NOTRUN
+
+  [Cache.matchAll with explicitly undefined request and empty options]
+    expected: NOTRUN
+
+  [Cache.matchAll with responses containing "Vary" header]
+    expected: NOTRUN
+
+  [Cache.matchAll with multiple vary pairs]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/cache-storage/cache-put.https.any.js.ini b/tests/wpt/meta/service-workers/cache-storage/cache-put.https.any.js.ini
new file mode 100644
index 00000000000..f0967e6cd37
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/cache-put.https.any.js.ini
@@ -0,0 +1,172 @@
+[cache-put.https.any.sharedworker.html]
+  expected: ERROR
+
+[cache-put.https.any.html]
+  expected: ERROR
+  [Cache.put called with simple Request and Response]
+    expected: FAIL
+
+  [Cache.put called with Request and Response from fetch()]
+    expected: NOTRUN
+
+  [Cache.put with Request without a body]
+    expected: NOTRUN
+
+  [Cache.put with Response without a body]
+    expected: NOTRUN
+
+  [Cache.put with a Response containing an empty URL]
+    expected: NOTRUN
+
+  [Cache.put with an empty response body]
+    expected: NOTRUN
+
+  [Cache.put with synthetic 206 response]
+    expected: NOTRUN
+
+  [Cache.put with HTTP 206 response]
+    expected: NOTRUN
+
+  [Cache.put with opaque-filtered HTTP 206 response]
+    expected: NOTRUN
+
+  [Cache.put with HTTP 500 response]
+    expected: NOTRUN
+
+  [Cache.put called twice with matching Requests and different Responses]
+    expected: NOTRUN
+
+  [Cache.put called multiple times with request URLs that differ only by a fragment]
+    expected: NOTRUN
+
+  [Cache.put with a string request]
+    expected: NOTRUN
+
+  [Cache.put with an invalid response]
+    expected: NOTRUN
+
+  [Cache.put with a non-HTTP/HTTPS request]
+    expected: NOTRUN
+
+  [Cache.put with a relative URL]
+    expected: NOTRUN
+
+  [Cache.put with a non-GET request]
+    expected: NOTRUN
+
+  [Cache.put with a null response]
+    expected: NOTRUN
+
+  [Cache.put with a POST request]
+    expected: NOTRUN
+
+  [Cache.put with a used response body]
+    expected: NOTRUN
+
+  [getReader() after Cache.put]
+    expected: NOTRUN
+
+  [Cache.put with a VARY:* Response]
+    expected: NOTRUN
+
+  [Cache.put with an embedded VARY:* Response]
+    expected: NOTRUN
+
+  [Cache.put with a VARY:* opaque response should not reject]
+    expected: NOTRUN
+
+  [Cache.put should store Response.redirect() correctly]
+    expected: NOTRUN
+
+  [Cache.put called with simple Request and blob Response]
+    expected: NOTRUN
+
+  [Cache.put called with simple Request and form data Response]
+    expected: NOTRUN
+
+
+[cache-put.https.any.serviceworker.html]
+  expected: ERROR
+
+[cache-put.https.any.worker.html]
+  expected: ERROR
+  [Cache.put called with simple Request and Response]
+    expected: FAIL
+
+  [Cache.put called with Request and Response from fetch()]
+    expected: NOTRUN
+
+  [Cache.put with Request without a body]
+    expected: NOTRUN
+
+  [Cache.put with Response without a body]
+    expected: NOTRUN
+
+  [Cache.put with a Response containing an empty URL]
+    expected: NOTRUN
+
+  [Cache.put with an empty response body]
+    expected: NOTRUN
+
+  [Cache.put with synthetic 206 response]
+    expected: NOTRUN
+
+  [Cache.put with HTTP 206 response]
+    expected: NOTRUN
+
+  [Cache.put with opaque-filtered HTTP 206 response]
+    expected: NOTRUN
+
+  [Cache.put with HTTP 500 response]
+    expected: NOTRUN
+
+  [Cache.put called twice with matching Requests and different Responses]
+    expected: NOTRUN
+
+  [Cache.put called multiple times with request URLs that differ only by a fragment]
+    expected: NOTRUN
+
+  [Cache.put with a string request]
+    expected: NOTRUN
+
+  [Cache.put with an invalid response]
+    expected: NOTRUN
+
+  [Cache.put with a non-HTTP/HTTPS request]
+    expected: NOTRUN
+
+  [Cache.put with a relative URL]
+    expected: NOTRUN
+
+  [Cache.put with a non-GET request]
+    expected: NOTRUN
+
+  [Cache.put with a null response]
+    expected: NOTRUN
+
+  [Cache.put with a POST request]
+    expected: NOTRUN
+
+  [Cache.put with a used response body]
+    expected: NOTRUN
+
+  [getReader() after Cache.put]
+    expected: NOTRUN
+
+  [Cache.put with a VARY:* Response]
+    expected: NOTRUN
+
+  [Cache.put with an embedded VARY:* Response]
+    expected: NOTRUN
+
+  [Cache.put with a VARY:* opaque response should not reject]
+    expected: NOTRUN
+
+  [Cache.put should store Response.redirect() correctly]
+    expected: NOTRUN
+
+  [Cache.put called with simple Request and blob Response]
+    expected: NOTRUN
+
+  [Cache.put called with simple Request and form data Response]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/cache-storage/cache-storage-buckets.https.any.js.ini b/tests/wpt/meta/service-workers/cache-storage/cache-storage-buckets.https.any.js.ini
new file mode 100644
index 00000000000..7f01f7c74eb
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/cache-storage-buckets.https.any.js.ini
@@ -0,0 +1,20 @@
+[cache-storage-buckets.https.any.html]
+  [caches from different buckets have different contents]
+    expected: FAIL
+
+  [cache.open promise is rejected when bucket is gone]
+    expected: FAIL
+
+
+[cache-storage-buckets.https.any.sharedworker.html]
+  expected: ERROR
+
+[cache-storage-buckets.https.any.serviceworker.html]
+  expected: ERROR
+
+[cache-storage-buckets.https.any.worker.html]
+  [caches from different buckets have different contents]
+    expected: FAIL
+
+  [cache.open promise is rejected when bucket is gone]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/cache-storage/cache-storage-keys.https.any.js.ini b/tests/wpt/meta/service-workers/cache-storage/cache-storage-keys.https.any.js.ini
new file mode 100644
index 00000000000..bf25b42fa43
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/cache-storage-keys.https.any.js.ini
@@ -0,0 +1,15 @@
+[cache-storage-keys.https.any.serviceworker.html]
+  expected: ERROR
+
+[cache-storage-keys.https.any.html]
+  [CacheStorage keys]
+    expected: FAIL
+
+
+[cache-storage-keys.https.any.worker.html]
+  [CacheStorage keys]
+    expected: FAIL
+
+
+[cache-storage-keys.https.any.sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/service-workers/cache-storage/cache-storage-match.https.any.js.ini b/tests/wpt/meta/service-workers/cache-storage/cache-storage-match.https.any.js.ini
new file mode 100644
index 00000000000..b9d5519c068
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/cache-storage-match.https.any.js.ini
@@ -0,0 +1,76 @@
+[cache-storage-match.https.any.html]
+  expected: ERROR
+  [CacheStorageMatch with no cache name provided]
+    expected: FAIL
+
+  [CacheStorageMatch from one of many caches]
+    expected: NOTRUN
+
+  [CacheStorageMatch from one of many caches by name]
+    expected: NOTRUN
+
+  [CacheStorageMatch a string request]
+    expected: NOTRUN
+
+  [CacheStorageMatch a HEAD request]
+    expected: NOTRUN
+
+  [CacheStorageMatch with no cached entry]
+    expected: NOTRUN
+
+  [CacheStorageMatch with no caches available but name provided]
+    expected: NOTRUN
+
+  [CacheStorageMatch with empty cache name provided]
+    expected: NOTRUN
+
+  [CacheStorageMatch supports ignoreSearch]
+    expected: NOTRUN
+
+  [Cache.match supports ignoreMethod]
+    expected: NOTRUN
+
+  [CacheStorageMatch supports ignoreVary]
+    expected: NOTRUN
+
+
+[cache-storage-match.https.any.sharedworker.html]
+  expected: ERROR
+
+[cache-storage-match.https.any.serviceworker.html]
+  expected: ERROR
+
+[cache-storage-match.https.any.worker.html]
+  expected: ERROR
+  [CacheStorageMatch with no cache name provided]
+    expected: FAIL
+
+  [CacheStorageMatch from one of many caches]
+    expected: NOTRUN
+
+  [CacheStorageMatch from one of many caches by name]
+    expected: NOTRUN
+
+  [CacheStorageMatch a string request]
+    expected: NOTRUN
+
+  [CacheStorageMatch a HEAD request]
+    expected: NOTRUN
+
+  [CacheStorageMatch with no cached entry]
+    expected: NOTRUN
+
+  [CacheStorageMatch with no caches available but name provided]
+    expected: NOTRUN
+
+  [CacheStorageMatch with empty cache name provided]
+    expected: NOTRUN
+
+  [CacheStorageMatch supports ignoreSearch]
+    expected: NOTRUN
+
+  [Cache.match supports ignoreMethod]
+    expected: NOTRUN
+
+  [CacheStorageMatch supports ignoreVary]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/cache-storage/cache-storage.https.any.js.ini b/tests/wpt/meta/service-workers/cache-storage/cache-storage.https.any.js.ini
new file mode 100644
index 00000000000..c47eecaf8f0
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/cache-storage.https.any.js.ini
@@ -0,0 +1,69 @@
+[cache-storage.https.any.worker.html]
+  [CacheStorage.open]
+    expected: FAIL
+
+  [CacheStorage.delete dooms, but does not delete immediately]
+    expected: FAIL
+
+  [CacheStorage.open with an empty name]
+    expected: FAIL
+
+  [CacheStorage.open with no arguments]
+    expected: FAIL
+
+  [CacheStorage.has with existing cache]
+    expected: FAIL
+
+  [CacheStorage.has with nonexistent cache]
+    expected: FAIL
+
+  [CacheStorage.open with existing cache]
+    expected: FAIL
+
+  [CacheStorage.delete with existing cache]
+    expected: FAIL
+
+  [CacheStorage.delete with nonexistent cache]
+    expected: FAIL
+
+  [CacheStorage names are DOMStrings not USVStrings]
+    expected: FAIL
+
+
+[cache-storage.https.any.serviceworker.html]
+  expected: ERROR
+
+[cache-storage.https.any.html]
+  [CacheStorage.open]
+    expected: FAIL
+
+  [CacheStorage.delete dooms, but does not delete immediately]
+    expected: FAIL
+
+  [CacheStorage.open with an empty name]
+    expected: FAIL
+
+  [CacheStorage.open with no arguments]
+    expected: FAIL
+
+  [CacheStorage.has with existing cache]
+    expected: FAIL
+
+  [CacheStorage.has with nonexistent cache]
+    expected: FAIL
+
+  [CacheStorage.open with existing cache]
+    expected: FAIL
+
+  [CacheStorage.delete with existing cache]
+    expected: FAIL
+
+  [CacheStorage.delete with nonexistent cache]
+    expected: FAIL
+
+  [CacheStorage names are DOMStrings not USVStrings]
+    expected: FAIL
+
+
+[cache-storage.https.any.sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/service-workers/cache-storage/common.https.window.js.ini b/tests/wpt/meta/service-workers/cache-storage/common.https.window.js.ini
new file mode 100644
index 00000000000..842774ccff4
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/common.https.window.js.ini
@@ -0,0 +1,3 @@
+[common.https.window.html]
+  [Window sees cache puts by Worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/cache-storage/crashtests/cache-response-clone.https.html.ini b/tests/wpt/meta/service-workers/cache-storage/crashtests/cache-response-clone.https.html.ini
new file mode 100644
index 00000000000..e81716f7992
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/crashtests/cache-response-clone.https.html.ini
@@ -0,0 +1,2 @@
+[cache-response-clone.https.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/service-workers/cache-storage/credentials.https.html.ini b/tests/wpt/meta/service-workers/cache-storage/credentials.https.html.ini
new file mode 100644
index 00000000000..e7677b139da
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/credentials.https.html.ini
@@ -0,0 +1,3 @@
+[credentials.https.html]
+  [Cache API matching includes credentials]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/cache-storage/cross-partition.https.tentative.html.ini b/tests/wpt/meta/service-workers/cache-storage/cross-partition.https.tentative.html.ini
new file mode 100644
index 00000000000..22f0519edb8
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/cross-partition.https.tentative.html.ini
@@ -0,0 +1,13 @@
+[cross-partition.https.tentative.html]
+  expected: TIMEOUT
+  [CacheStorage caches shouldn't be shared with a cross-partition iframe]
+    expected: FAIL
+
+  [CacheStorage caches shouldn't be shared with a cross-partition dedicated worker]
+    expected: FAIL
+
+  [CacheStorage caches shouldn't be shared with a cross-partition shared worker]
+    expected: TIMEOUT
+
+  [CacheStorage caches shouldn't be shared with a cross-partition service worker]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/cache-storage/sandboxed-iframes.https.html.ini b/tests/wpt/meta/service-workers/cache-storage/sandboxed-iframes.https.html.ini
new file mode 100644
index 00000000000..36f1e8b88f7
--- /dev/null
+++ b/tests/wpt/meta/service-workers/cache-storage/sandboxed-iframes.https.html.ini
@@ -0,0 +1,6 @@
+[sandboxed-iframes.https.html]
+  [Sandboxed iframe with allow-same-origin is allowed access]
+    expected: FAIL
+
+  [Sandboxed iframe without allow-same-origin is denied access]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/idlharness.https.any.js.ini b/tests/wpt/meta/service-workers/idlharness.https.any.js.ini
new file mode 100644
index 00000000000..aba70ff3a35
--- /dev/null
+++ b/tests/wpt/meta/service-workers/idlharness.https.any.js.ini
@@ -0,0 +1,259 @@
+[idlharness.https.any.html]
+  expected: ERROR
+  [idl_test setup]
+    expected: FAIL
+
+  [ServiceWorkerRegistration interface: operation update()]
+    expected: FAIL
+
+  [ServiceWorkerRegistration interface: operation unregister()]
+    expected: FAIL
+
+  [ServiceWorkerRegistration interface: attribute onupdatefound]
+    expected: FAIL
+
+  [ServiceWorkerContainer interface: attribute ready]
+    expected: FAIL
+
+  [ServiceWorkerContainer interface: operation getRegistration(optional USVString)]
+    expected: FAIL
+
+  [ServiceWorkerContainer interface: operation getRegistrations()]
+    expected: FAIL
+
+  [ServiceWorkerContainer interface: operation startMessages()]
+    expected: FAIL
+
+  [ServiceWorkerContainer interface: attribute oncontrollerchange]
+    expected: FAIL
+
+  [ServiceWorkerContainer interface: attribute onmessage]
+    expected: FAIL
+
+  [ServiceWorkerContainer interface: attribute onmessageerror]
+    expected: FAIL
+
+  [Cache interface: existence and properties of interface object]
+    expected: FAIL
+
+  [Cache interface object length]
+    expected: FAIL
+
+  [Cache interface object name]
+    expected: FAIL
+
+  [Cache interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [Cache interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [Cache interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [Cache interface: operation match(RequestInfo, optional CacheQueryOptions)]
+    expected: FAIL
+
+  [Cache interface: operation matchAll(optional RequestInfo, optional CacheQueryOptions)]
+    expected: FAIL
+
+  [Cache interface: operation add(RequestInfo)]
+    expected: FAIL
+
+  [Cache interface: operation addAll(sequence<RequestInfo>)]
+    expected: FAIL
+
+  [Cache interface: operation put(RequestInfo, Response)]
+    expected: FAIL
+
+  [Cache interface: operation delete(RequestInfo, optional CacheQueryOptions)]
+    expected: FAIL
+
+  [Cache interface: operation keys(optional RequestInfo, optional CacheQueryOptions)]
+    expected: FAIL
+
+  [CacheStorage interface: existence and properties of interface object]
+    expected: FAIL
+
+  [CacheStorage interface object length]
+    expected: FAIL
+
+  [CacheStorage interface object name]
+    expected: FAIL
+
+  [CacheStorage interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [CacheStorage interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [CacheStorage interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [CacheStorage interface: operation match(RequestInfo, optional MultiCacheQueryOptions)]
+    expected: FAIL
+
+  [CacheStorage interface: operation has(DOMString)]
+    expected: FAIL
+
+  [CacheStorage interface: operation open(DOMString)]
+    expected: FAIL
+
+  [CacheStorage interface: operation delete(DOMString)]
+    expected: FAIL
+
+  [CacheStorage interface: operation keys()]
+    expected: FAIL
+
+  [Window interface: attribute caches]
+    expected: FAIL
+
+  [ServiceWorkerContainer interface: operation register((TrustedScriptURL or USVString), optional RegistrationOptions)]
+    expected: TIMEOUT
+
+  [NavigationPreloadManager interface: operation enable()]
+    expected: TIMEOUT
+
+  [NavigationPreloadManager interface: operation disable()]
+    expected: TIMEOUT
+
+  [NavigationPreloadManager interface: operation setHeaderValue(ByteString)]
+    expected: TIMEOUT
+
+  [NavigationPreloadManager interface: operation getState()]
+    expected: TIMEOUT
+
+
+[idlharness.https.any.serviceworker.html]
+  expected: ERROR
+
+[idlharness.https.any.sharedworker.html]
+  expected: ERROR
+
+[idlharness.https.any.worker.html]
+  expected: ERROR
+  [idl_test setup]
+    expected: FAIL
+
+  [ServiceWorkerRegistration interface: operation update()]
+    expected: FAIL
+
+  [ServiceWorkerRegistration interface: operation unregister()]
+    expected: FAIL
+
+  [ServiceWorkerRegistration interface: attribute onupdatefound]
+    expected: FAIL
+
+  [ServiceWorkerContainer interface: attribute ready]
+    expected: FAIL
+
+  [ServiceWorkerContainer interface: operation register((TrustedScriptURL or USVString), optional RegistrationOptions)]
+    expected: TIMEOUT
+
+  [ServiceWorkerContainer interface: operation getRegistration(optional USVString)]
+    expected: FAIL
+
+  [ServiceWorkerContainer interface: operation getRegistrations()]
+    expected: FAIL
+
+  [ServiceWorkerContainer interface: operation startMessages()]
+    expected: FAIL
+
+  [ServiceWorkerContainer interface: attribute oncontrollerchange]
+    expected: FAIL
+
+  [ServiceWorkerContainer interface: attribute onmessage]
+    expected: FAIL
+
+  [ServiceWorkerContainer interface: attribute onmessageerror]
+    expected: FAIL
+
+  [NavigationPreloadManager interface: operation enable()]
+    expected: TIMEOUT
+
+  [NavigationPreloadManager interface: operation disable()]
+    expected: TIMEOUT
+
+  [NavigationPreloadManager interface: operation setHeaderValue(ByteString)]
+    expected: TIMEOUT
+
+  [NavigationPreloadManager interface: operation getState()]
+    expected: TIMEOUT
+
+  [Cache interface: existence and properties of interface object]
+    expected: FAIL
+
+  [Cache interface object length]
+    expected: FAIL
+
+  [Cache interface object name]
+    expected: FAIL
+
+  [Cache interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [Cache interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [Cache interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [Cache interface: operation match(RequestInfo, optional CacheQueryOptions)]
+    expected: FAIL
+
+  [Cache interface: operation matchAll(optional RequestInfo, optional CacheQueryOptions)]
+    expected: FAIL
+
+  [Cache interface: operation add(RequestInfo)]
+    expected: FAIL
+
+  [Cache interface: operation addAll(sequence<RequestInfo>)]
+    expected: FAIL
+
+  [Cache interface: operation put(RequestInfo, Response)]
+    expected: FAIL
+
+  [Cache interface: operation delete(RequestInfo, optional CacheQueryOptions)]
+    expected: FAIL
+
+  [Cache interface: operation keys(optional RequestInfo, optional CacheQueryOptions)]
+    expected: FAIL
+
+  [CacheStorage interface: existence and properties of interface object]
+    expected: FAIL
+
+  [CacheStorage interface object length]
+    expected: FAIL
+
+  [CacheStorage interface object name]
+    expected: FAIL
+
+  [CacheStorage interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [CacheStorage interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [CacheStorage interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [CacheStorage interface: operation match(RequestInfo, optional MultiCacheQueryOptions)]
+    expected: FAIL
+
+  [CacheStorage interface: operation has(DOMString)]
+    expected: FAIL
+
+  [CacheStorage interface: operation open(DOMString)]
+    expected: FAIL
+
+  [CacheStorage interface: operation delete(DOMString)]
+    expected: FAIL
+
+  [CacheStorage interface: operation keys()]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: attribute caches]
+    expected: FAIL
+
+  [WorkerNavigator interface: attribute serviceWorker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/Service-Worker-Allowed-header.https.html.ini b/tests/wpt/meta/service-workers/service-worker/Service-Worker-Allowed-header.https.html.ini
new file mode 100644
index 00000000000..396b9b766e7
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/Service-Worker-Allowed-header.https.html.ini
@@ -0,0 +1,25 @@
+[Service-Worker-Allowed-header.https.html]
+  expected: ERROR
+  [Registering within Service-Worker-Allowed path]
+    expected: FAIL
+
+  [Registering within Service-Worker-Allowed path (absolute URL)]
+    expected: NOTRUN
+
+  [Registering within Service-Worker-Allowed path with parent reference]
+    expected: NOTRUN
+
+  [Registering outside Service-Worker-Allowed path]
+    expected: NOTRUN
+
+  [Registering outside Service-Worker-Allowed path with parent reference]
+    expected: NOTRUN
+
+  [Service-Worker-Allowed is cross-origin to script, registering on a normally allowed scope]
+    expected: NOTRUN
+
+  [Service-Worker-Allowed is cross-origin to script, registering on a normally disallowed scope]
+    expected: NOTRUN
+
+  [Service-Worker-Allowed is cross-origin to page, same-origin to script]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/close.https.html.ini b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/close.https.html.ini
new file mode 100644
index 00000000000..90a20fa4b92
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/close.https.html.ini
@@ -0,0 +1,3 @@
+[close.https.html]
+  [ServiceWorkerGlobalScope: close operation]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/error-message-event.https.html.ini b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/error-message-event.https.html.ini
new file mode 100644
index 00000000000..1ce8e090a3c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/error-message-event.https.html.ini
@@ -0,0 +1,4 @@
+[error-message-event.https.html]
+  expected: TIMEOUT
+  [Verify error event is received]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/extendable-message-event-constructor.https.html.ini b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/extendable-message-event-constructor.https.html.ini
new file mode 100644
index 00000000000..5faf185265f
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/extendable-message-event-constructor.https.html.ini
@@ -0,0 +1,3 @@
+[extendable-message-event-constructor.https.html]
+  [ServiceWorkerGlobalScope: ExtendableMessageEvent Constructor]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/extendable-message-event.https.html.ini b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/extendable-message-event.https.html.ini
new file mode 100644
index 00000000000..b5f91a40416
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/extendable-message-event.https.html.ini
@@ -0,0 +1,12 @@
+[extendable-message-event.https.html]
+  [Post an extendable message from a top-level client]
+    expected: FAIL
+
+  [Post an extendable message from a nested client]
+    expected: FAIL
+
+  [Post loopback extendable messages]
+    expected: FAIL
+
+  [Post extendable messages among service workers]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/fetch-on-the-right-interface.https.any.js.ini b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/fetch-on-the-right-interface.https.any.js.ini
new file mode 100644
index 00000000000..6afe79bb85e
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/fetch-on-the-right-interface.https.any.js.ini
@@ -0,0 +1,2 @@
+[fetch-on-the-right-interface.https.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/isSecureContext.https.html.ini b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/isSecureContext.https.html.ini
new file mode 100644
index 00000000000..19e98d7cc1f
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/isSecureContext.https.html.ini
@@ -0,0 +1,3 @@
+[isSecureContext.https.html]
+  [Setting up tests]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/message-event-ports.https.html.ini b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/message-event-ports.https.html.ini
new file mode 100644
index 00000000000..2ecf2de6c18
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/message-event-ports.https.html.ini
@@ -0,0 +1,4 @@
+[message-event-ports.https.html]
+  expected: TIMEOUT
+  [Verify MessageEvent.ports getter returns the same object]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/postmessage.https.html.ini b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/postmessage.https.html.ini
new file mode 100644
index 00000000000..11b38a65c55
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/postmessage.https.html.ini
@@ -0,0 +1,6 @@
+[postmessage.https.html]
+  [Post loopback messages]
+    expected: FAIL
+
+  [Post messages among service workers]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/registration-attribute.https.html.ini b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/registration-attribute.https.html.ini
new file mode 100644
index 00000000000..51fa00976cb
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/registration-attribute.https.html.ini
@@ -0,0 +1,6 @@
+[registration-attribute.https.html]
+  [Verify registration attributes on ServiceWorkerGlobalScope]
+    expected: FAIL
+
+  [Verify registration attributes on ServiceWorkerGlobalScope of the newer worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/service-worker-error-event.https.html.ini b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/service-worker-error-event.https.html.ini
new file mode 100644
index 00000000000..2a089737f36
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/service-worker-error-event.https.html.ini
@@ -0,0 +1,3 @@
+[service-worker-error-event.https.html]
+  [Error handlers inside serviceworker should see the attributes of ErrorEvent]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/unregister.https.html.ini b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/unregister.https.html.ini
new file mode 100644
index 00000000000..8130a381590
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/unregister.https.html.ini
@@ -0,0 +1,12 @@
+[unregister.https.html]
+  [Unregister on script evaluation]
+    expected: FAIL
+
+  [Unregister on installing event]
+    expected: FAIL
+
+  [Unregister on activate event]
+    expected: FAIL
+
+  [Unregister controlling service worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/update.https.html.ini b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/update.https.html.ini
new file mode 100644
index 00000000000..6d350725b7f
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/ServiceWorkerGlobalScope/update.https.html.ini
@@ -0,0 +1,3 @@
+[update.https.html]
+  [Update a registration on ServiceWorkerGlobalScope]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/about-blank-replacement.https.html.ini b/tests/wpt/meta/service-workers/service-worker/about-blank-replacement.https.html.ini
new file mode 100644
index 00000000000..fc450688304
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/about-blank-replacement.https.html.ini
@@ -0,0 +1,21 @@
+[about-blank-replacement.https.html]
+  [Initial about:blank is controlled, exposed to clients.matchAll(), and matches final Client.]
+    expected: FAIL
+
+  [Initial about:blank modified by parent is controlled, exposed to clients.matchAll(), and matches final Client.]
+    expected: FAIL
+
+  [Popup initial about:blank is controlled, exposed to clients.matchAll(), and matches final Client.]
+    expected: FAIL
+
+  [Initial about:blank is controlled, exposed to clients.matchAll(), and final Client is not controlled by a service worker.]
+    expected: FAIL
+
+  [Simple about:blank is controlled and is exposed to clients.matchAll().]
+    expected: FAIL
+
+  [Nested about:srcdoc is controlled and is exposed to clients.matchAll().]
+    expected: FAIL
+
+  [Dynamic about:blank is controlled and is exposed to clients.matchAll().]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/activate-event-after-install-state-change.https.html.ini b/tests/wpt/meta/service-workers/service-worker/activate-event-after-install-state-change.https.html.ini
new file mode 100644
index 00000000000..42d48e59608
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/activate-event-after-install-state-change.https.html.ini
@@ -0,0 +1,3 @@
+[activate-event-after-install-state-change.https.html]
+  [installed event should be fired before activating service worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/activation-after-registration.https.html.ini b/tests/wpt/meta/service-workers/service-worker/activation-after-registration.https.html.ini
new file mode 100644
index 00000000000..82f8a1ab5e5
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/activation-after-registration.https.html.ini
@@ -0,0 +1,3 @@
+[activation-after-registration.https.html]
+  [activation occurs after registration]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/activation.https.html.ini b/tests/wpt/meta/service-workers/service-worker/activation.https.html.ini
new file mode 100644
index 00000000000..27097e520b9
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/activation.https.html.ini
@@ -0,0 +1,12 @@
+[activation.https.html]
+  [loss of controllees triggers activation]
+    expected: FAIL
+
+  [finishing a request triggers activation]
+    expected: FAIL
+
+  [skipWaiting bypasses no controllee requirement]
+    expected: FAIL
+
+  [finishing a request triggers unregister]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/active.https.html.ini b/tests/wpt/meta/service-workers/service-worker/active.https.html.ini
new file mode 100644
index 00000000000..58a27d622a2
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/active.https.html.ini
@@ -0,0 +1,7 @@
+[active.https.html]
+  expected: ERROR
+  [active is set]
+    expected: FAIL
+
+  [The ServiceWorker objects returned from active attribute getter that represent the same service worker are the same objects]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/claim-affect-other-registration.https.html.ini b/tests/wpt/meta/service-workers/service-worker/claim-affect-other-registration.https.html.ini
new file mode 100644
index 00000000000..2662469d425
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/claim-affect-other-registration.https.html.ini
@@ -0,0 +1,4 @@
+[claim-affect-other-registration.https.html]
+  expected: TIMEOUT
+  [claim() should affect the originally controlling registration.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/service-workers/service-worker/claim-fetch.https.html.ini b/tests/wpt/meta/service-workers/service-worker/claim-fetch.https.html.ini
new file mode 100644
index 00000000000..f2488430f63
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/claim-fetch.https.html.ini
@@ -0,0 +1,3 @@
+[claim-fetch.https.html]
+  [fetch() should be intercepted after the client is claimed.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/claim-not-using-registration.https.html.ini b/tests/wpt/meta/service-workers/service-worker/claim-not-using-registration.https.html.ini
new file mode 100644
index 00000000000..2b76d45c023
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/claim-not-using-registration.https.html.ini
@@ -0,0 +1,7 @@
+[claim-not-using-registration.https.html]
+  expected: TIMEOUT
+  [Test claim client which is not using registration]
+    expected: FAIL
+
+  [Test claim client when there's a longer-matched registration not already used by the page]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/service-workers/service-worker/claim-shared-worker-fetch.https.html.ini b/tests/wpt/meta/service-workers/service-worker/claim-shared-worker-fetch.https.html.ini
new file mode 100644
index 00000000000..420d0e45d10
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/claim-shared-worker-fetch.https.html.ini
@@ -0,0 +1,3 @@
+[claim-shared-worker-fetch.https.html]
+  [fetch() in SharedWorker should be intercepted after the client is claimed.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/claim-using-registration.https.html.ini b/tests/wpt/meta/service-workers/service-worker/claim-using-registration.https.html.ini
new file mode 100644
index 00000000000..29f201e5f08
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/claim-using-registration.https.html.ini
@@ -0,0 +1,9 @@
+[claim-using-registration.https.html]
+  [Test worker claims client which is using another registration]
+    expected: FAIL
+
+  [Test for the waiting worker claims a client which is using the the same registration]
+    expected: FAIL
+
+  [Test for the waiting worker claims a client which is using the same registration]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/claim-with-redirect.https.html.ini b/tests/wpt/meta/service-workers/service-worker/claim-with-redirect.https.html.ini
new file mode 100644
index 00000000000..6f30610af70
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/claim-with-redirect.https.html.ini
@@ -0,0 +1,2 @@
+[claim-with-redirect.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/service-workers/service-worker/claim-worker-fetch.https.html.ini b/tests/wpt/meta/service-workers/service-worker/claim-worker-fetch.https.html.ini
new file mode 100644
index 00000000000..32a575549b7
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/claim-worker-fetch.https.html.ini
@@ -0,0 +1,18 @@
+[claim-worker-fetch.https.html]
+  [fetch() in Worker should be intercepted after the client is claimed.]
+    expected: FAIL
+
+  [fetch() in nested Worker should be intercepted after the client is claimed.]
+    expected: FAIL
+
+  [fetch() in blob URL Worker should be intercepted after the client is claimed.]
+    expected: FAIL
+
+  [fetch() in nested blob URL Worker created from a blob URL Worker should be intercepted after the client is claimed.]
+    expected: FAIL
+
+  [fetch() in nested Worker created from a blob URL Worker should be intercepted after the client is claimed.]
+    expected: FAIL
+
+  [fetch() in nested blob URL Worker created from a Worker should be intercepted after the client is claimed.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/client-id.https.html.ini b/tests/wpt/meta/service-workers/service-worker/client-id.https.html.ini
new file mode 100644
index 00000000000..d293152a146
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/client-id.https.html.ini
@@ -0,0 +1,3 @@
+[client-id.https.html]
+  [Client.id returns the client's ID.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/client-navigate.https.html.ini b/tests/wpt/meta/service-workers/service-worker/client-navigate.https.html.ini
new file mode 100644
index 00000000000..ed9f6eae936
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/client-navigate.https.html.ini
@@ -0,0 +1,15 @@
+[client-navigate.https.html]
+  [Frame location should update on successful navigation]
+    expected: FAIL
+
+  [Frame location should not be accessible after redirect]
+    expected: FAIL
+
+  [Frame location should not be accessible after cross-origin navigation]
+    expected: FAIL
+
+  [Frame location should not update on failed about:blank navigation]
+    expected: FAIL
+
+  [Frame location should not update on failed mixed-content navigation]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/client-url-creation-url.https.html.ini b/tests/wpt/meta/service-workers/service-worker/client-url-creation-url.https.html.ini
new file mode 100644
index 00000000000..520d0d38e71
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/client-url-creation-url.https.html.ini
@@ -0,0 +1,30 @@
+[client-url-creation-url.https.html]
+  [No navigation creation URL is same as window URL]
+    expected: FAIL
+
+  [Fragment only navigation doesn't change creation URL]
+    expected: FAIL
+
+  [Pushstate doesn't change creation URL]
+    expected: FAIL
+
+  [Replacestate doesn't change creation URL]
+    expected: FAIL
+
+  [Going back over pushstate to other pushstate via back]
+    expected: FAIL
+
+  [Query navigation changes creation URL]
+    expected: FAIL
+
+  [Reloading doesn't change creation URL]
+    expected: FAIL
+
+  [Reloading pushstate URL changes creation URL]
+    expected: FAIL
+
+  [Going back over pushstate to creation URL]
+    expected: FAIL
+
+  [Going back to new document changes creation URL]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/client-url-of-blob-url-worker.https.html.ini b/tests/wpt/meta/service-workers/service-worker/client-url-of-blob-url-worker.https.html.ini
new file mode 100644
index 00000000000..6ec39ae8d5c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/client-url-of-blob-url-worker.https.html.ini
@@ -0,0 +1,3 @@
+[client-url-of-blob-url-worker.https.html]
+  [Client.url of a blob URL worker should be a blob URL.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/clients-get-client-types.https.html.ini b/tests/wpt/meta/service-workers/service-worker/clients-get-client-types.https.html.ini
new file mode 100644
index 00000000000..32b4d1e14a2
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/clients-get-client-types.https.html.ini
@@ -0,0 +1,3 @@
+[clients-get-client-types.https.html]
+  [Test Clients.get() with window and worker clients]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/clients-get-cross-origin.https.html.ini b/tests/wpt/meta/service-workers/service-worker/clients-get-cross-origin.https.html.ini
new file mode 100644
index 00000000000..4fa88625ca5
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/clients-get-cross-origin.https.html.ini
@@ -0,0 +1,3 @@
+[clients-get-cross-origin.https.html]
+  [Test Clients.get() cross origin]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/clients-get-resultingClientId.https.html.ini b/tests/wpt/meta/service-workers/service-worker/clients-get-resultingClientId.https.html.ini
new file mode 100644
index 00000000000..e2bf7bcdc78
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/clients-get-resultingClientId.https.html.ini
@@ -0,0 +1,18 @@
+[clients-get-resultingClientId.https.html]
+  [global setup]
+    expected: FAIL
+
+  [get(resultingClientId) for same-origin document]
+    expected: FAIL
+
+  [get(resultingClientId) on cross-origin redirect]
+    expected: FAIL
+
+  [get(resultingClientId) for document sandboxed by CSP header]
+    expected: FAIL
+
+  [get(resultingClientId) for document sandboxed by CSP header with allow-same-origin]
+    expected: FAIL
+
+  [global cleanup]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/clients-get.https.html.ini b/tests/wpt/meta/service-workers/service-worker/clients-get.https.html.ini
new file mode 100644
index 00000000000..df4410b85bd
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/clients-get.https.html.ini
@@ -0,0 +1,9 @@
+[clients-get.https.html]
+  [Test Clients.get()]
+    expected: FAIL
+
+  [Test successful Clients.get(FetchEvent.resultingClientId)]
+    expected: FAIL
+
+  [Test unsuccessful Clients.get(FetchEvent.resultingClientId)]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/clients-matchall-blob-url-worker.https.html.ini b/tests/wpt/meta/service-workers/service-worker/clients-matchall-blob-url-worker.https.html.ini
new file mode 100644
index 00000000000..e311b4a42a3
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/clients-matchall-blob-url-worker.https.html.ini
@@ -0,0 +1,6 @@
+[clients-matchall-blob-url-worker.https.html]
+  [Test Clients.matchAll() with a blob URL worker client.]
+    expected: FAIL
+
+  [Test Clients.matchAll() with an uncontrolled blob URL worker client.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/clients-matchall-client-types.https.html.ini b/tests/wpt/meta/service-workers/service-worker/clients-matchall-client-types.https.html.ini
new file mode 100644
index 00000000000..ae433ef4df6
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/clients-matchall-client-types.https.html.ini
@@ -0,0 +1,6 @@
+[clients-matchall-client-types.https.html]
+  [Verify matchAll() with window client type]
+    expected: FAIL
+
+  [Verify matchAll() with {window, sharedworker, worker} client types]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/clients-matchall-exact-controller.https.html.ini b/tests/wpt/meta/service-workers/service-worker/clients-matchall-exact-controller.https.html.ini
new file mode 100644
index 00000000000..f9d0b681aaf
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/clients-matchall-exact-controller.https.html.ini
@@ -0,0 +1,3 @@
+[clients-matchall-exact-controller.https.html]
+  [Test Clients.matchAll() with exact controller]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/clients-matchall-frozen.https.html.ini b/tests/wpt/meta/service-workers/service-worker/clients-matchall-frozen.https.html.ini
new file mode 100644
index 00000000000..117ce75db9c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/clients-matchall-frozen.https.html.ini
@@ -0,0 +1,3 @@
+[clients-matchall-frozen.https.html]
+  [Test Clients.matchAll()]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html.ini b/tests/wpt/meta/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html.ini
new file mode 100644
index 00000000000..c81a6c81cfa
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html.ini
@@ -0,0 +1,6 @@
+[clients-matchall-include-uncontrolled.https.html]
+  [Verify matchAll() with windows respect includeUncontrolled]
+    expected: FAIL
+
+  [Verify matchAll() with shared workers respect includeUncontrolled]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/clients-matchall-on-evaluation.https.html.ini b/tests/wpt/meta/service-workers/service-worker/clients-matchall-on-evaluation.https.html.ini
new file mode 100644
index 00000000000..d41c7211a95
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/clients-matchall-on-evaluation.https.html.ini
@@ -0,0 +1,3 @@
+[clients-matchall-on-evaluation.https.html]
+  [Test Clients.matchAll() on script evaluation]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/clients-matchall-order.https.html.ini b/tests/wpt/meta/service-workers/service-worker/clients-matchall-order.https.html.ini
new file mode 100644
index 00000000000..787e4357e0e
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/clients-matchall-order.https.html.ini
@@ -0,0 +1,21 @@
+[clients-matchall-order.https.html]
+  [Clients.matchAll() returns non-focused controlled windows in creation order.]
+    expected: FAIL
+
+  [Clients.matchAll() returns controlled windows in focus order.  Case 1.]
+    expected: FAIL
+
+  [Clients.matchAll() returns controlled windows in focus order.  Case 2.]
+    expected: FAIL
+
+  [Clients.matchAll() returns non-focused uncontrolled windows in creation order.]
+    expected: FAIL
+
+  [Clients.matchAll() returns uncontrolled windows in focus order.  Case 1.]
+    expected: FAIL
+
+  [Clients.matchAll() returns uncontrolled windows in focus order.  Case 2.]
+    expected: FAIL
+
+  [Clients.matchAll() returns controlled windows and frames in focus order.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/clients-matchall.https.html.ini b/tests/wpt/meta/service-workers/service-worker/clients-matchall.https.html.ini
new file mode 100644
index 00000000000..dd9aa18986c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/clients-matchall.https.html.ini
@@ -0,0 +1,3 @@
+[clients-matchall.https.html]
+  [Test Clients.matchAll()]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/controlled-dedicatedworker-postMessage.https.html.ini b/tests/wpt/meta/service-workers/service-worker/controlled-dedicatedworker-postMessage.https.html.ini
new file mode 100644
index 00000000000..22e35d285f8
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/controlled-dedicatedworker-postMessage.https.html.ini
@@ -0,0 +1,10 @@
+[controlled-dedicatedworker-postMessage.https.html]
+  expected: TIMEOUT
+  [Register service worker]
+    expected: TIMEOUT
+
+  [Verify dedicated worker gets messages if setting event listener early]
+    expected: NOTRUN
+
+  [Verify dedicated worker does not get all messages if not setting event listener early]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/controlled-iframe-postMessage.https.html.ini b/tests/wpt/meta/service-workers/service-worker/controlled-iframe-postMessage.https.html.ini
new file mode 100644
index 00000000000..59ca01314a7
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/controlled-iframe-postMessage.https.html.ini
@@ -0,0 +1,13 @@
+[controlled-iframe-postMessage.https.html]
+  expected: TIMEOUT
+  [Register service worker]
+    expected: TIMEOUT
+
+  [Verify frame gets early messages if setting synchronously message event listener]
+    expected: NOTRUN
+
+  [Verify frame does not get all messages if not setting event listener early]
+    expected: NOTRUN
+
+  [Verify frame does get messages in order]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/controller-on-disconnect.https.html.ini b/tests/wpt/meta/service-workers/service-worker/controller-on-disconnect.https.html.ini
new file mode 100644
index 00000000000..7279ff354e4
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/controller-on-disconnect.https.html.ini
@@ -0,0 +1,3 @@
+[controller-on-disconnect.https.html]
+  [controller is cleared on disconnected window]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/controller-on-load.https.html.ini b/tests/wpt/meta/service-workers/service-worker/controller-on-load.https.html.ini
new file mode 100644
index 00000000000..5ae6a934c77
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/controller-on-load.https.html.ini
@@ -0,0 +1,3 @@
+[controller-on-load.https.html]
+  [controller is set for a controlled document]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/controller-on-reload.https.html.ini b/tests/wpt/meta/service-workers/service-worker/controller-on-reload.https.html.ini
new file mode 100644
index 00000000000..63568967b32
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/controller-on-reload.https.html.ini
@@ -0,0 +1,3 @@
+[controller-on-reload.https.html]
+  [controller is set upon reload after registration]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/controller-with-no-fetch-event-handler.https.html.ini b/tests/wpt/meta/service-workers/service-worker/controller-with-no-fetch-event-handler.https.html.ini
new file mode 100644
index 00000000000..fbd380632df
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/controller-with-no-fetch-event-handler.https.html.ini
@@ -0,0 +1,12 @@
+[controller-with-no-fetch-event-handler.https.html]
+  [global setup]
+    expected: FAIL
+
+  [cross-origin request, no-cors mode]
+    expected: FAIL
+
+  [cross-origin request, cors denied]
+    expected: FAIL
+
+  [cross-origin request, cors approved]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/credentials.https.html.ini b/tests/wpt/meta/service-workers/service-worker/credentials.https.html.ini
new file mode 100644
index 00000000000..e5e2f19e38c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/credentials.https.html.ini
@@ -0,0 +1,12 @@
+[credentials.https.html]
+  [Main script should have credentials]
+    expected: FAIL
+
+  [Imported script should have credentials]
+    expected: FAIL
+
+  [Module with an imported statement should not have credentials]
+    expected: FAIL
+
+  [Script with service worker served as modules should not have credentials]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/data-iframe.html.ini b/tests/wpt/meta/service-workers/service-worker/data-iframe.html.ini
new file mode 100644
index 00000000000..7a1d457cf90
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/data-iframe.html.ini
@@ -0,0 +1,3 @@
+[data-iframe.html]
+  [navigator.serviceWorker is not available in a data: iframe]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/data-transfer-files.https.html.ini b/tests/wpt/meta/service-workers/service-worker/data-transfer-files.https.html.ini
new file mode 100644
index 00000000000..5f096f739a4
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/data-transfer-files.https.html.ini
@@ -0,0 +1,3 @@
+[data-transfer-files.https.html]
+  [Posting a File in a navigation handled by a service worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/dedicated-worker-service-worker-interception.https.html.ini b/tests/wpt/meta/service-workers/service-worker/dedicated-worker-service-worker-interception.https.html.ini
new file mode 100644
index 00000000000..cdea0ceb767
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/dedicated-worker-service-worker-interception.https.html.ini
@@ -0,0 +1,9 @@
+[dedicated-worker-service-worker-interception.https.html]
+  [Top-level module loading should be intercepted by a service worker.]
+    expected: FAIL
+
+  [Static import should be intercepted by a service worker.]
+    expected: FAIL
+
+  [Dynamic import should be intercepted by a service worker.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/detached-context.https.html.ini b/tests/wpt/meta/service-workers/service-worker/detached-context.https.html.ini
new file mode 100644
index 00000000000..a00587ce5d6
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/detached-context.https.html.ini
@@ -0,0 +1,9 @@
+[detached-context.https.html]
+  [accessing a ServiceWorkerRegistration from a removed iframe]
+    expected: FAIL
+
+  [accessing a ServiceWorker object from a removed iframe]
+    expected: FAIL
+
+  [accessing navigator.serviceWorker on a detached iframe]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/detached-register-crash.https.html.ini b/tests/wpt/meta/service-workers/service-worker/detached-register-crash.https.html.ini
new file mode 100644
index 00000000000..bafd98b71e2
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/detached-register-crash.https.html.ini
@@ -0,0 +1,2 @@
+[detached-register-crash.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta/service-workers/service-worker/embed-and-object-are-not-intercepted.https.html.ini b/tests/wpt/meta/service-workers/service-worker/embed-and-object-are-not-intercepted.https.html.ini
new file mode 100644
index 00000000000..ea6b24124b2
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/embed-and-object-are-not-intercepted.https.html.ini
@@ -0,0 +1,22 @@
+[embed-and-object-are-not-intercepted.https.html]
+  expected: TIMEOUT
+  [initialize global state]
+    expected: FAIL
+
+  [requests for EMBED elements of embedded HTML content should not be intercepted by service workers]
+    expected: TIMEOUT
+
+  [requests for OBJECT elements of embedded HTML content should not be intercepted by service workers]
+    expected: NOTRUN
+
+  [requests for EMBED elements of an image should not be intercepted by service workers]
+    expected: NOTRUN
+
+  [requests for OBJECT elements of an image should not be intercepted by service workers]
+    expected: NOTRUN
+
+  [post-load navigation of OBJECT elements should not be intercepted by service workers]
+    expected: NOTRUN
+
+  [post-load navigation of EMBED elements should not be intercepted by service workers]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/extendable-event-async-waituntil.https.html.ini b/tests/wpt/meta/service-workers/service-worker/extendable-event-async-waituntil.https.html.ini
new file mode 100644
index 00000000000..a83d60e7a62
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/extendable-event-async-waituntil.https.html.ini
@@ -0,0 +1,42 @@
+[extendable-event-async-waituntil.https.html]
+  [Test calling waitUntil in a task at the end of the event handler without an existing extension throws]
+    expected: FAIL
+
+  [Test calling waitUntil in a microtask at the end of the event handler without an existing extension suceeds]
+    expected: FAIL
+
+  [Test calling waitUntil in a different task an existing extension succeeds]
+    expected: FAIL
+
+  [Test calling waitUntil at the end of an existing extension promise handler succeeds (event is still being dispatched)]
+    expected: FAIL
+
+  [Test calling waitUntil in a microtask at the end of an existing extension promise handler succeeds (event is still being dispatched)]
+    expected: FAIL
+
+  [Test calling waitUntil in an existing extension promise handler succeeds (event is not being dispatched)]
+    expected: FAIL
+
+  [Test calling waitUntil in a microtask at the end of an existing extension promise handler throws (event is not being dispatched)]
+    expected: FAIL
+
+  [Test calling waitUntil after the current extension expired in a different task fails]
+    expected: FAIL
+
+  [Test calling waitUntil on a script constructed ExtendableEvent throws exception]
+    expected: FAIL
+
+  [Test calling waitUntil asynchronously with pending respondWith promise.]
+    expected: FAIL
+
+  [Test calling waitUntil synchronously inside microtask of respondWith promise (event is being dispatched).]
+    expected: FAIL
+
+  [Test calling waitUntil asynchronously inside microtask of respondWith promise (event is being dispatched).]
+    expected: FAIL
+
+  [Test calling waitUntil synchronously inside microtask of respondWith promise (event is not being dispatched).]
+    expected: FAIL
+
+  [Test calling waitUntil asynchronously inside microtask of respondWith promise (event is not being dispatched).]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/extendable-event-waituntil.https.html.ini b/tests/wpt/meta/service-workers/service-worker/extendable-event-waituntil.https.html.ini
new file mode 100644
index 00000000000..a3e94920e86
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/extendable-event-waituntil.https.html.ini
@@ -0,0 +1,18 @@
+[extendable-event-waituntil.https.html]
+  [Test install event waitUntil fulfilled]
+    expected: FAIL
+
+  [Test ExtendableEvent multiple waitUntil fulfilled.]
+    expected: FAIL
+
+  [Test ExtendableEvent waitUntil reject precedence.]
+    expected: FAIL
+
+  [Test activate event waitUntil fulfilled]
+    expected: FAIL
+
+  [Test install event waitUntil rejected]
+    expected: FAIL
+
+  [Test activate event waitUntil rejected.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-audio-tainting.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-audio-tainting.https.html.ini
new file mode 100644
index 00000000000..6f25322e0c7
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-audio-tainting.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-audio-tainting.https.html]
+  [Verify CORS XHR of fetch() in a Service Worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-double-write.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-double-write.https.html.ini
new file mode 100644
index 00000000000..4be893e1aa1
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-double-write.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-canvas-tainting-double-write.https.html]
+  [canvas is tainted after writing both a non-opaque image and an opaque image from the same URL]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-image-cache.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-image-cache.https.html.ini
new file mode 100644
index 00000000000..743bf1ac0d0
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-image-cache.https.html.ini
@@ -0,0 +1,117 @@
+[fetch-canvas-tainting-image-cache.https.html]
+  [initialize global state]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&reject" with crossOrigin "" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&reject" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&reject" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&ignore" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&ignore" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&ignore" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&ACAOrigin=https://web-platform.test:8443&ignore" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&ACAOrigin=https://web-platform.test:8443&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&ACAOrigin=https://web-platform.test:8443&ACACredentials=true&ignore" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&Auth&ignore" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&Auth&ignore" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&Auth&ignore" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&Auth&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&Auth&ACAOrigin=https://web-platform.test:8443&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&Auth&ACAOrigin=https://web-platform.test:8443&ACACredentials=true&ignore" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=cors&credentials=same-origin&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue%26ACACredentials%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=cors&credentials=same-origin&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26cache%3Dtrue%26ACACredentials%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-image.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-image.https.html.ini
new file mode 100644
index 00000000000..74da303b974
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-image.https.html.ini
@@ -0,0 +1,117 @@
+[fetch-canvas-tainting-image.https.html]
+  [initialize global state]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&reject" with crossOrigin "" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&reject" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&reject" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&ignore" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&ignore" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&ignore" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&ACAOrigin=https://web-platform.test:8443&ignore" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&ACAOrigin=https://web-platform.test:8443&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&ACAOrigin=https://web-platform.test:8443&ACACredentials=true&ignore" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&Auth&ignore" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&Auth&ignore" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&Auth&ignore" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&Auth&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&Auth&ACAOrigin=https://web-platform.test:8443&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&Auth&ACAOrigin=https://web-platform.test:8443&ACACredentials=true&ignore" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=cors&credentials=same-origin&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26ACACredentials%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=cors&credentials=same-origin&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26ACACredentials%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-video-cache.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-video-cache.https.html.ini
new file mode 100644
index 00000000000..fab602fbc5a
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-video-cache.https.html.ini
@@ -0,0 +1,117 @@
+[fetch-canvas-tainting-video-cache.https.html]
+  [initialize global state]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&reject" with crossOrigin "" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&reject" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&reject" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&ignore" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&ignore" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&ignore" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&ACAOrigin=https://web-platform.test:8443&ignore" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&ACAOrigin=https://web-platform.test:8443&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&ACAOrigin=https://web-platform.test:8443&ACACredentials=true&ignore" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&Auth&ignore" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&Auth&ignore" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&Auth&ignore" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&Auth&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&Auth&ACAOrigin=https://web-platform.test:8443&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&Auth&ACAOrigin=https://web-platform.test:8443&ACACredentials=true&ignore" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=cors&credentials=same-origin&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue%26ACACredentials%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=cors&credentials=same-origin&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&cache=true&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26cache%3Dtrue%26ACACredentials%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html.ini
new file mode 100644
index 00000000000..eb9718f4ac9
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html.ini
@@ -0,0 +1,15 @@
+[fetch-canvas-tainting-video-with-range-request.https.html]
+  [range responses from single origin (same-origin)]
+    expected: FAIL
+
+  [range responses from multiple origins (cross-origin first)]
+    expected: FAIL
+
+  [range responses from single origin with both opaque and non-opaque responses]
+    expected: FAIL
+
+  [synth and same-origin fallback range responses]
+    expected: FAIL
+
+  [synth and cross-origin fallback range responses]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-video.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-video.https.html.ini
new file mode 100644
index 00000000000..d59b78391fb
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-canvas-tainting-video.https.html.ini
@@ -0,0 +1,117 @@
+[fetch-canvas-tainting-video.https.html]
+  [initialize global state]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&reject" with crossOrigin "" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&reject" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&reject" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&ignore" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&ignore" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&ignore" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&ACAOrigin=https://web-platform.test:8443&ignore" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&ACAOrigin=https://web-platform.test:8443&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&ACAOrigin=https://web-platform.test:8443&ACACredentials=true&ignore" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&Auth&ignore" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&Auth&ignore" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&Auth&ignore" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&Auth&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&Auth&ACAOrigin=https://web-platform.test:8443&ignore" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&Auth&ACAOrigin=https://web-platform.test:8443&ACACredentials=true&ignore" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=same-origin&url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO" with crossOrigin "" should be TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO" with crossOrigin "anonymous" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=no-cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=cors&credentials=same-origin&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26ACACredentials%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=cors&credentials=same-origin&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "anonymous" should be NOT_TAINTED]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be LOAD_ERROR]
+    expected: FAIL
+
+  [url "https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?VIDEO&mode=cors&url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FVIDEO%26ACACredentials%3Dtrue%26ACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443" with crossOrigin "use-credentials" should be NOT_TAINTED]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-cors-exposed-header-names.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-cors-exposed-header-names.https.html.ini
new file mode 100644
index 00000000000..df77ba60ff9
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-cors-exposed-header-names.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-cors-exposed-header-names.https.html]
+  [CORS-exposed header names for a response from sw]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-cors-xhr.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-cors-xhr.https.html.ini
new file mode 100644
index 00000000000..eddbc72d0c2
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-cors-xhr.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-cors-xhr.https.html]
+  [Verify CORS XHR of fetch() in a Service Worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-csp.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-csp.https.html.ini
new file mode 100644
index 00000000000..8932333f280
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-csp.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-csp.https.html]
+  [Verify CSP control of fetch() in a Service Worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-error.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-error.https.html.ini
new file mode 100644
index 00000000000..d154260c399
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-error.https.html.ini
@@ -0,0 +1,6 @@
+[fetch-error.https.html]
+  [Setup service worker]
+    expected: FAIL
+
+  [Make sure a load that makes progress does not time out]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-add-async.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-add-async.https.html.ini
new file mode 100644
index 00000000000..4907c8af2cf
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-add-async.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-event-add-async.https.html]
+  [Service Worker: Fetch event added asynchronously doesn't throw]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-after-navigation-within-page.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-after-navigation-within-page.https.html.ini
new file mode 100644
index 00000000000..fac62626fbc
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-after-navigation-within-page.https.html.ini
@@ -0,0 +1,6 @@
+[fetch-event-after-navigation-within-page.https.html]
+  [Service Worker should respond to fetch event after the hash changes]
+    expected: FAIL
+
+  [Service Worker should respond to fetch event after the pushState]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-async-respond-with.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-async-respond-with.https.html.ini
new file mode 100644
index 00000000000..838a0a8b668
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-async-respond-with.https.html.ini
@@ -0,0 +1,12 @@
+[fetch-event-async-respond-with.https.html]
+  [global setup]
+    expected: FAIL
+
+  [respondWith in a task throws InvalidStateError]
+    expected: FAIL
+
+  [respondWith in a microtask does not throw]
+    expected: FAIL
+
+  [global cleanup]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-handled.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-handled.https.html.ini
new file mode 100644
index 00000000000..0103fdc0899
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-handled.https.html.ini
@@ -0,0 +1,25 @@
+[fetch-event-handled.https.html]
+  expected: ERROR
+  [global setup]
+    expected: FAIL
+
+  [FetchEvent.handled should resolve when respondWith() is not called for a navigation request]
+    expected: TIMEOUT
+
+  [FetchEvent.handled should resolve when respondWith() is not called for a sub-resource request]
+    expected: NOTRUN
+
+  [FetchEvent.handled should reject when respondWith() is not called and the event is canceled]
+    expected: NOTRUN
+
+  [FetchEvent.handled should resolve when the promise provided to respondWith() is resolved]
+    expected: NOTRUN
+
+  [FetchEvent.handled should reject when the promise provided to respondWith() is resolved to an invalid response]
+    expected: NOTRUN
+
+  [FetchEvent.handled should reject when the promise provided to respondWith() is rejected]
+    expected: NOTRUN
+
+  [global cleanup]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-network-error.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-network-error.https.html.ini
new file mode 100644
index 00000000000..e7c42a7e73f
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-network-error.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-event-network-error.https.html]
+  [Rejecting the fetch event or using preventDefault() causes a network error]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-redirect.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-redirect.https.html.ini
new file mode 100644
index 00000000000..3e770762713
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-redirect.https.html.ini
@@ -0,0 +1,165 @@
+[fetch-event-redirect.https.html]
+  [initialize global state]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, cors mode Request redirected to same-origin without credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, cors mode Request redirected to no-cors without credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, cors mode Request redirected to cors without credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, same-origin mode Request redirected to same-origin without credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, same-origin mode Request redirected to no-cors without credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, same-origin mode Request redirected to cors without credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, no-cors mode Request redirected to same-origin without credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, no-cors mode Request redirected to no-cors without credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, no-cors mode Request redirected to cors without credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, cors mode Request redirected to same-origin with credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, cors mode Request redirected to no-cors with credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, cors mode Request redirected to cors with credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, same-origin mode Request redirected to same-origin with credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, same-origin mode Request redirected to no-cors with credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, same-origin mode Request redirected to cors with credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, no-cors mode Request redirected to same-origin with credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, no-cors mode Request redirected to no-cors with credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, manual redirect, no-cors mode Request redirected to cors with credentials should succeed opaqueredirect interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, cors mode Request redirected to same-origin without credentials should succeed interception and response should be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, cors mode Request redirected to no-cors without credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, cors mode Request redirected to cors without credentials should succeed interception and response should be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, same-origin mode Request redirected to same-origin without credentials should succeed interception and response should be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, same-origin mode Request redirected to no-cors without credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, same-origin mode Request redirected to cors without credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, no-cors mode Request redirected to same-origin without credentials should succeed interception and response should be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, no-cors mode Request redirected to no-cors without credentials should succeed interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, no-cors mode Request redirected to cors without credentials should succeed interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, cors mode Request redirected to same-origin with credentials should succeed interception and response should be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, cors mode Request redirected to no-cors with credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, cors mode Request redirected to cors with credentials should fail interception and response should be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, same-origin mode Request redirected to same-origin with credentials should succeed interception and response should be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, same-origin mode Request redirected to no-cors with credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, same-origin mode Request redirected to cors with credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, no-cors mode Request redirected to same-origin with credentials should succeed interception and response should be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, no-cors mode Request redirected to no-cors with credentials should succeed interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, follow redirect, no-cors mode Request redirected to cors with credentials should succeed interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, cors mode Request redirected to same-origin without credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, cors mode Request redirected to no-cors without credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, cors mode Request redirected to cors without credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, same-origin mode Request redirected to same-origin without credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, same-origin mode Request redirected to no-cors without credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, same-origin mode Request redirected to cors without credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, no-cors mode Request redirected to same-origin without credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, no-cors mode Request redirected to no-cors without credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, no-cors mode Request redirected to cors without credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, cors mode Request redirected to same-origin with credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, cors mode Request redirected to no-cors with credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, cors mode Request redirected to cors with credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, same-origin mode Request redirected to same-origin with credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, same-origin mode Request redirected to no-cors with credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, same-origin mode Request redirected to cors with credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, no-cors mode Request redirected to same-origin with credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, no-cors mode Request redirected to no-cors with credentials should fail interception and response should not be redirected]
+    expected: FAIL
+
+  [Non-navigation, error redirect, no-cors mode Request redirected to cors with credentials should fail interception and response should not be redirected]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-referrer-policy.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-referrer-policy.https.html.ini
new file mode 100644
index 00000000000..24eddd92b60
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-referrer-policy.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-event-referrer-policy.https.html]
+  [Service Worker responds to fetch event with the referrer policy]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-argument.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-argument.https.html.ini
new file mode 100644
index 00000000000..e024ad87564
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-argument.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-event-respond-with-argument.https.html]
+  [respondWith() takes either a Response or a promise that resolves with a Response. Other values should raise a network error.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-body-loaded-in-chunk.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-body-loaded-in-chunk.https.html.ini
new file mode 100644
index 00000000000..b157f0ab27f
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-body-loaded-in-chunk.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-event-respond-with-body-loaded-in-chunk.https.html]
+  [Respond by chunks with a Response being loaded]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-custom-response.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-custom-response.https.html.ini
new file mode 100644
index 00000000000..9d69f04f777
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-custom-response.https.html.ini
@@ -0,0 +1,33 @@
+[fetch-event-respond-with-custom-response.https.html]
+  [Subresource built from a string]
+    expected: FAIL
+
+  [Subresource built from a blob]
+    expected: FAIL
+
+  [Subresource built from a buffer]
+    expected: FAIL
+
+  [Subresource built from a buffer-view]
+    expected: FAIL
+
+  [Subresource built from form-data]
+    expected: FAIL
+
+  [Subresource built from search-params]
+    expected: FAIL
+
+  [Navigation resource built from a string]
+    expected: FAIL
+
+  [Navigation resource built from a blob]
+    expected: FAIL
+
+  [Navigation resource built from a buffer]
+    expected: FAIL
+
+  [Navigation resource built from a buffer-view]
+    expected: FAIL
+
+  [Navigation resource built from search-params]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-partial-stream.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-partial-stream.https.html.ini
new file mode 100644
index 00000000000..80bdc1cfaa6
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-partial-stream.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-event-respond-with-partial-stream.https.html]
+  [respondWith() streams data to an intercepted fetch()]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-readable-stream-chunk.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-readable-stream-chunk.https.html.ini
new file mode 100644
index 00000000000..5d49d4a76ba
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-readable-stream-chunk.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-event-respond-with-readable-stream-chunk.https.html]
+  [Respond by chunks with a Response built from a ReadableStream]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-readable-stream.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-readable-stream.https.html.ini
new file mode 100644
index 00000000000..2550adcb06f
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-readable-stream.https.html.ini
@@ -0,0 +1,30 @@
+[fetch-event-respond-with-readable-stream.https.html]
+  [Subresource built from a ReadableStream]
+    expected: FAIL
+
+  [Main resource built from a ReadableStream]
+    expected: FAIL
+
+  [Subresource built from a ReadableStream - delayed]
+    expected: FAIL
+
+  [Main resource built from a ReadableStream - delayed]
+    expected: FAIL
+
+  [Subresource built from a ReadableStream - fetch stream]
+    expected: FAIL
+
+  [Main resource built from a ReadableStream - fetch stream]
+    expected: FAIL
+
+  [Cancellation in the page should be observable in the service worker with nonempty stream]
+    expected: FAIL
+
+  [Abort in the page should be observable in the service worker with nonempty stream]
+    expected: FAIL
+
+  [Cancellation in the page should be observable in the service worker with empty stream]
+    expected: FAIL
+
+  [Abort in the page should be observable in the service worker with empty stream]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-response-body-with-invalid-chunk.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-response-body-with-invalid-chunk.https.html.ini
new file mode 100644
index 00000000000..cef31303880
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-response-body-with-invalid-chunk.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-event-respond-with-response-body-with-invalid-chunk.https.html]
+  [Response with a ReadableStream having non-Uint8Array chunks should be transferred as errored]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-stops-propagation.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-stops-propagation.https.html.ini
new file mode 100644
index 00000000000..6150509ab1c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-respond-with-stops-propagation.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-event-respond-with-stops-propagation.https.html]
+  [respondWith() invokes stopImmediatePropagation()]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-throws-after-respond-with.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-throws-after-respond-with.https.html.ini
new file mode 100644
index 00000000000..c4b8cd66f68
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-throws-after-respond-with.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-event-throws-after-respond-with.https.html]
+  [Fetch event handler throws after a successful respondWith()]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event-within-sw.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event-within-sw.https.html.ini
new file mode 100644
index 00000000000..950748be0d1
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event-within-sw.https.html.ini
@@ -0,0 +1,7 @@
+[fetch-event-within-sw.https.html]
+  expected: TIMEOUT
+  [Service worker intercepts requests from window]
+    expected: TIMEOUT
+
+  [Service worker does not intercept fetch/cache requests within service worker]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event.https.h2.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event.https.h2.html.ini
new file mode 100644
index 00000000000..e1b6f552679
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event.https.h2.html.ini
@@ -0,0 +1,15 @@
+[fetch-event.https.h2.html]
+  [global setup]
+    expected: FAIL
+
+  [The streaming request body is readable in the service worker.]
+    expected: FAIL
+
+  [Network fallback for streaming upload.]
+    expected: FAIL
+
+  [When the streaming request body is used, network fallback fails.]
+    expected: FAIL
+
+  [Running clone() in the service worker does not prevent network fallback.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-event.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-event.https.html.ini
new file mode 100644
index 00000000000..672ebb8f5e8
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-event.https.html.ini
@@ -0,0 +1,105 @@
+[fetch-event.https.html]
+  [global setup]
+    expected: FAIL
+
+  [Service Worker headers in the request of a fetch event]
+    expected: FAIL
+
+  [Service Worker responds to fetch event with string]
+    expected: FAIL
+
+  [Service Worker responds to fetch event using request fragment with string]
+    expected: FAIL
+
+  [Service Worker responds to fetch event with blob body]
+    expected: FAIL
+
+  [Service Worker responds to fetch event with the referrer URL]
+    expected: FAIL
+
+  [Service Worker responds to fetch event with an existing client id]
+    expected: FAIL
+
+  [Service Worker responds to fetch event with the correct resulting client id]
+    expected: FAIL
+
+  [Service Worker responds to fetch event with null response body]
+    expected: FAIL
+
+  [Service Worker fetches other file in fetch event]
+    expected: FAIL
+
+  [Service Worker responds to fetch event with POST form]
+    expected: FAIL
+
+  [Service Worker falls back to network in fetch event with POST form]
+    expected: FAIL
+
+  [Multiple calls of respondWith must throw InvalidStateErrors]
+    expected: FAIL
+
+  [Service Worker event.respondWith must set the used flag]
+    expected: FAIL
+
+  [Service Worker should expose FetchEvent URL fragments.]
+    expected: FAIL
+
+  [Service Worker responds to fetch event with the correct cache types]
+    expected: FAIL
+
+  [Service Worker should intercept EventSource]
+    expected: FAIL
+
+  [Service Worker responds to fetch event with the correct integrity_metadata]
+    expected: FAIL
+
+  [FetchEvent#body is a string]
+    expected: FAIL
+
+  [FetchEvent#body is a ReadableStream]
+    expected: FAIL
+
+  [FetchEvent#body is a blob]
+    expected: FAIL
+
+  [Service Worker responds to fetch event with the correct keepalive value]
+    expected: FAIL
+
+  [FetchEvent#request.isReloadNavigation is true (location.reload())]
+    expected: FAIL
+
+  [FetchEvent#request.isReloadNavigation is true (history.go(0))]
+    expected: FAIL
+
+  [FetchEvent#request.isReloadNavigation is true (POST + location.reload())]
+    expected: FAIL
+
+  [FetchEvent#request.isReloadNavigation is true (with history traversal)]
+    expected: FAIL
+
+  [FetchEvent#request.isHistoryNavigation is true (with history.go(-1))]
+    expected: FAIL
+
+  [FetchEvent#request.isHistoryNavigation is true (with history.go(1))]
+    expected: FAIL
+
+  [FetchEvent#request.isHistoryNavigation is false (with history.go(0))]
+    expected: FAIL
+
+  [FetchEvent#request.isHistoryNavigation is false (with location.reload)]
+    expected: FAIL
+
+  [FetchEvent#request.isHistoryNavigation is true (with history.go(-2))]
+    expected: FAIL
+
+  [FetchEvent#request.isHistoryNavigation is true (with history.go(2))]
+    expected: FAIL
+
+  [FetchEvent#request.isHistoryNavigation is true (POST + history.go(-1))]
+    expected: FAIL
+
+  [XHR upload progress events for response coming from SW]
+    expected: FAIL
+
+  [Fetch with POST with text on sw 421 response should not be retried.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-frame-resource.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-frame-resource.https.html.ini
new file mode 100644
index 00000000000..babaadae5a3
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-frame-resource.https.html.ini
@@ -0,0 +1,18 @@
+[fetch-frame-resource.https.html]
+  [Basic type response could be loaded in the iframe.]
+    expected: FAIL
+
+  [CORS type response could be loaded in the iframe.]
+    expected: FAIL
+
+  [Opaque type response could not be loaded in the iframe.]
+    expected: FAIL
+
+  [Basic type response could be loaded in the new window.]
+    expected: FAIL
+
+  [CORS type response could be loaded in the new window.]
+    expected: FAIL
+
+  [Opaque type response could not be loaded in the new window.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-header-visibility.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-header-visibility.https.html.ini
new file mode 100644
index 00000000000..c4430e33629
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-header-visibility.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-header-visibility.https.html]
+  [Visibility of defaulted headers during interception]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-mixed-content-to-inscope.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-mixed-content-to-inscope.https.html.ini
new file mode 100644
index 00000000000..46bc5e161a9
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-mixed-content-to-inscope.https.html.ini
@@ -0,0 +1,4 @@
+[fetch-mixed-content-to-inscope.https.html]
+  expected: TIMEOUT
+  [Verify Mixed content of fetch() in a Service Worker]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-mixed-content-to-outscope.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-mixed-content-to-outscope.https.html.ini
new file mode 100644
index 00000000000..70dded97e35
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-mixed-content-to-outscope.https.html.ini
@@ -0,0 +1,4 @@
+[fetch-mixed-content-to-outscope.https.html]
+  expected: TIMEOUT
+  [Verify Mixed content of fetch() in a Service Worker]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-request-css-base-url.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-request-css-base-url.https.html.ini
new file mode 100644
index 00000000000..08ce99e1ff2
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-request-css-base-url.https.html.ini
@@ -0,0 +1,12 @@
+[fetch-request-css-base-url.https.html]
+  [global setup]
+    expected: FAIL
+
+  [base URL when service worker does respondWith(fetch(responseUrl)).]
+    expected: FAIL
+
+  [base URL when service worker does respondWith(new Response()).]
+    expected: FAIL
+
+  [cleanup global state]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-request-css-cross-origin.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-request-css-cross-origin.https.html.ini
new file mode 100644
index 00000000000..1b10d11b1d7
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-request-css-cross-origin.https.html.ini
@@ -0,0 +1,9 @@
+[fetch-request-css-cross-origin.https.html]
+  [setup global state]
+    expected: FAIL
+
+  [MIME checking of CSS resources fetched via service worker when Content-Type is not set.]
+    expected: FAIL
+
+  [Same-origin policy for access to CSS resources fetched via service worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-request-css-images.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-request-css-images.https.html.ini
new file mode 100644
index 00000000000..32bf8b5bddd
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-request-css-images.https.html.ini
@@ -0,0 +1,12 @@
+[fetch-request-css-images.https.html]
+  [Verify FetchEvent for css image (backgroundImage).]
+    expected: FAIL
+
+  [Verify FetchEvent for css image (shapeOutside).]
+    expected: FAIL
+
+  [Verify FetchEvent for css image-set (backgroundImage).]
+    expected: FAIL
+
+  [Verify FetchEvent for css image-set (shapeOutside).]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-request-fallback.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-request-fallback.https.html.ini
new file mode 100644
index 00000000000..e606321e39c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-request-fallback.https.html.ini
@@ -0,0 +1,48 @@
+[fetch-request-fallback.https.html]
+  [initialize global state]
+    expected: FAIL
+
+  [The SW must intercept the request for a main resource.]
+    expected: FAIL
+
+  [The SW must intercept the request of same origin XHR.]
+    expected: FAIL
+
+  [The SW must intercept the request of CORS-unsupported other origin XHR.]
+    expected: FAIL
+
+  [The SW must intercept the request of CORS-supported other origin XHR.]
+    expected: FAIL
+
+  [The SW must intercept only the first request of redirected XHR.]
+    expected: FAIL
+
+  [The SW must intercept only the first request for XHR which is redirected to CORS-unsupported other origin.]
+    expected: FAIL
+
+  [The SW must intercept only the first request for XHR which is redirected to CORS-supported other origin.]
+    expected: FAIL
+
+  [The SW must intercept the request for image.]
+    expected: FAIL
+
+  [The SW must intercept the request for other origin image.]
+    expected: FAIL
+
+  [The SW must intercept the request for CORS-unsupported other origin image.]
+    expected: FAIL
+
+  [The SW must intercept the request for CORS-supported other origin image.]
+    expected: FAIL
+
+  [The SW must intercept only the first request for redirected image resource.]
+    expected: FAIL
+
+  [The SW must intercept only the first request for image resource which is redirected to other origin.]
+    expected: FAIL
+
+  [The SW must intercept only the first request for image resource which is redirected to CORS-unsupported other origin.]
+    expected: FAIL
+
+  [The SW must intercept only the first request for image resource which is redirected to CORS-supported other origin.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-request-no-freshness-headers.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-request-no-freshness-headers.https.html.ini
new file mode 100644
index 00000000000..4c6e377c62a
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-request-no-freshness-headers.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-request-no-freshness-headers.https.html]
+  [The headers of FetchEvent shouldn't contain freshness headers.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-request-redirect.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-request-redirect.https.html.ini
new file mode 100644
index 00000000000..858fa7ad1e2
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-request-redirect.https.html.ini
@@ -0,0 +1,9 @@
+[fetch-request-redirect.https.html]
+  [Verify redirect mode of Fetch API and ServiceWorker FetchEvent.]
+    expected: FAIL
+
+  [Verify redirected of Response(Fetch API) and ServiceWorker FetchEvent.]
+    expected: FAIL
+
+  [Verify redirected of Response(Fetch API), Cache API and ServiceWorker FetchEvent.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-request-resources.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-request-resources.https.html.ini
new file mode 100644
index 00000000000..e139355f301
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-request-resources.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-request-resources.https.html]
+  [Verify FetchEvent for resources.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-request-xhr-sync-error.https.window.js.ini b/tests/wpt/meta/service-workers/service-worker/fetch-request-xhr-sync-error.https.window.js.ini
new file mode 100644
index 00000000000..c57c2db1741
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-request-xhr-sync-error.https.window.js.ini
@@ -0,0 +1,3 @@
+[fetch-request-xhr-sync-error.https.window.html]
+  [Verify synchronous XMLHttpRequest always throws a NetworkError for ReadableStream errors]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-request-xhr-sync-on-worker.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-request-xhr-sync-on-worker.https.html.ini
new file mode 100644
index 00000000000..a09ca6b0141
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-request-xhr-sync-on-worker.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-request-xhr-sync-on-worker.https.html]
+  [Verify SyncXHR on Worker is intercepted]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-request-xhr-sync.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-request-xhr-sync.https.html.ini
new file mode 100644
index 00000000000..5bc8532669d
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-request-xhr-sync.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-request-xhr-sync.https.html]
+  [Verify SyncXHR is intercepted]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-request-xhr.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-request-xhr.https.html.ini
new file mode 100644
index 00000000000..32e8fe22c76
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-request-xhr.https.html.ini
@@ -0,0 +1,36 @@
+[fetch-request-xhr.https.html]
+  [initialize global state]
+    expected: FAIL
+
+  [event.request has the expected headers for same-origin GET.]
+    expected: FAIL
+
+  [event.request has the expected headers for same-origin POST.]
+    expected: FAIL
+
+  [event.request has the expected headers for cross-origin GET.]
+    expected: FAIL
+
+  [event.request has the expected headers for cross-origin POST.]
+    expected: FAIL
+
+  [FetchEvent#request.body contains XHR request data (string)]
+    expected: FAIL
+
+  [FetchEvent#request.body contains XHR request data (blob)]
+    expected: FAIL
+
+  [FetchEvent#request.method is set to XHR method]
+    expected: FAIL
+
+  [XHR using OPTIONS method]
+    expected: FAIL
+
+  [XHR with form data]
+    expected: FAIL
+
+  [XHR with mode/credentials set]
+    expected: FAIL
+
+  [XHR to data URL]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-response-taint.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-response-taint.https.html.ini
new file mode 100644
index 00000000000..29cea088903
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-response-taint.https.html.ini
@@ -0,0 +1,393 @@
+[fetch-response-taint.https.html]
+  [initialize global state]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"same-origin" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"same-origin" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"same-origin" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"no-cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"no-cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"no-cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"same-origin" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"same-origin" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"same-origin" credentials:"include" should fail.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"no-cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"no-cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"no-cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"cors" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"cors" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"cors" credentials:"include" should fail.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?ACAOrigin=*" mode:"cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?ACAOrigin=*" mode:"cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?ACAOrigin=*" mode:"cors" credentials:"include" should fail.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?ACAOrigin=https://web-platform.test:8443&ACACredentials=true" mode:"cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"same-origin" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"same-origin" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"same-origin" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"same-origin" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"same-origin" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"same-origin" credentials:"include" should fail.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"same-origin" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"same-origin" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"same-origin" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"no-cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"no-cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"no-cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"same-origin" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"same-origin" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"same-origin" credentials:"include" should fail.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"no-cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"no-cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"no-cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"same-origin" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"same-origin" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"same-origin" credentials:"include" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"include" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"cors" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"cors" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"cors" credentials:"include" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"same-origin" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"same-origin" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"same-origin" credentials:"include" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"include" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"cors" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"cors" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"cors" credentials:"include" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"same-origin" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"same-origin" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"same-origin" credentials:"include" should fail.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"no-cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"no-cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"no-cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"cors" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"cors" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"cors" credentials:"include" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"same-origin" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"same-origin" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"same-origin" credentials:"include" should fail.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"no-cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"no-cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"no-cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"cors" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"cors" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=no-cors&credentials=omit&" mode:"cors" credentials:"include" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"same-origin" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"same-origin" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"same-origin" credentials:"include" should fail.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"no-cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"no-cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"no-cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"same-origin" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"same-origin" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"same-origin" credentials:"include" should fail.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"no-cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"no-cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"no-cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"same-origin" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"same-origin" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"same-origin" credentials:"include" should fail.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"no-cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"no-cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"no-cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"same-origin" credentials:"omit" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"same-origin" credentials:"same-origin" should fail.]
+    expected: FAIL
+
+  [url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"same-origin" credentials:"include" should fail.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"no-cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"no-cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"no-cors" credentials:"include" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"cors" credentials:"omit" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"cors" credentials:"same-origin" should succeed.]
+    expected: FAIL
+
+  [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"cors" credentials:"include" should succeed.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-response-xhr.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-response-xhr.https.html.ini
new file mode 100644
index 00000000000..b5f0bbf8dcd
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-response-xhr.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-response-xhr.https.html]
+  [Verify the response of FetchEvent using XMLHttpRequest]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-waits-for-activate.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-waits-for-activate.https.html.ini
new file mode 100644
index 00000000000..893d3104687
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-waits-for-activate.https.html.ini
@@ -0,0 +1,6 @@
+[fetch-waits-for-activate.https.html]
+  [Navigation fetch events should wait for the activate event to complete.]
+    expected: FAIL
+
+  [Subresource fetch events should wait for the activate event to complete.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/fetch-with-body.https.html.ini b/tests/wpt/meta/service-workers/service-worker/fetch-with-body.https.html.ini
new file mode 100644
index 00000000000..38e18166397
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/fetch-with-body.https.html.ini
@@ -0,0 +1,3 @@
+[fetch-with-body.https.html]
+  [Validate body is preserved]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/getregistration.https.html.ini b/tests/wpt/meta/service-workers/service-worker/getregistration.https.html.ini
new file mode 100644
index 00000000000..a92ced0feab
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/getregistration.https.html.ini
@@ -0,0 +1,18 @@
+[getregistration.https.html]
+  [getRegistration]
+    expected: FAIL
+
+  [Register then getRegistration]
+    expected: FAIL
+
+  [Register then getRegistration with a URL having a fragment]
+    expected: FAIL
+
+  [getRegistration with a cross origin URL]
+    expected: FAIL
+
+  [Register then Unregister then getRegistration]
+    expected: FAIL
+
+  [Register then Unregister then getRegistration in controlled iframe]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/getregistrations.https.html.ini b/tests/wpt/meta/service-workers/service-worker/getregistrations.https.html.ini
new file mode 100644
index 00000000000..f9b92cb70f3
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/getregistrations.https.html.ini
@@ -0,0 +1,19 @@
+[getregistrations.https.html]
+  expected: ERROR
+  [registrations are not returned following unregister]
+    expected: FAIL
+
+  [Register then getRegistrations]
+    expected: FAIL
+
+  [Register multiple times then getRegistrations]
+    expected: FAIL
+
+  [Register then Unregister then getRegistrations]
+    expected: NOTRUN
+
+  [Register then Unregister with controlled frame then getRegistrations]
+    expected: NOTRUN
+
+  [getRegistrations promise resolves only with same origin registrations.]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/global-serviceworker.https.any.js.ini b/tests/wpt/meta/service-workers/service-worker/global-serviceworker.https.any.js.ini
new file mode 100644
index 00000000000..63026762360
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/global-serviceworker.https.any.js.ini
@@ -0,0 +1,2 @@
+[global-serviceworker.https.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/service-workers/service-worker/historical.https.any.js.ini b/tests/wpt/meta/service-workers/service-worker/historical.https.any.js.ini
new file mode 100644
index 00000000000..121b9ef349c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/historical.https.any.js.ini
@@ -0,0 +1,2 @@
+[historical.https.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/service-workers/service-worker/http-to-https-redirect-and-register.https.html.ini b/tests/wpt/meta/service-workers/service-worker/http-to-https-redirect-and-register.https.html.ini
new file mode 100644
index 00000000000..3beeaeaa9a1
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/http-to-https-redirect-and-register.https.html.ini
@@ -0,0 +1,7 @@
+[http-to-https-redirect-and-register.https.html]
+  expected: TIMEOUT
+  [register on a secure page after redirect from an non-secure url]
+    expected: TIMEOUT
+
+  [register on a non-secure page after redirect from an non-secure url]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/immutable-prototype-serviceworker.https.html.ini b/tests/wpt/meta/service-workers/service-worker/immutable-prototype-serviceworker.https.html.ini
new file mode 100644
index 00000000000..7d2c0c09a6f
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/immutable-prototype-serviceworker.https.html.ini
@@ -0,0 +1,4 @@
+[immutable-prototype-serviceworker.https.html]
+  expected: TIMEOUT
+  [worker prototype chain should be immutable]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/service-workers/service-worker/import-scripts-cross-origin.https.html.ini b/tests/wpt/meta/service-workers/service-worker/import-scripts-cross-origin.https.html.ini
new file mode 100644
index 00000000000..b1350b2e9db
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/import-scripts-cross-origin.https.html.ini
@@ -0,0 +1,3 @@
+[import-scripts-cross-origin.https.html]
+  [importScripts() supports cross-origin requests]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/import-scripts-data-url.https.html.ini b/tests/wpt/meta/service-workers/service-worker/import-scripts-data-url.https.html.ini
new file mode 100644
index 00000000000..d681e599f48
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/import-scripts-data-url.https.html.ini
@@ -0,0 +1,3 @@
+[import-scripts-data-url.https.html]
+  [importScripts() supports data URLs]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/import-scripts-mime-types.https.html.ini b/tests/wpt/meta/service-workers/service-worker/import-scripts-mime-types.https.html.ini
new file mode 100644
index 00000000000..76afbbd1eca
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/import-scripts-mime-types.https.html.ini
@@ -0,0 +1,6 @@
+[import-scripts-mime-types.https.html]
+  [Global setup]
+    expected: FAIL
+
+  [Fetch importScripts tests from service worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/import-scripts-redirect.https.html.ini b/tests/wpt/meta/service-workers/service-worker/import-scripts-redirect.https.html.ini
new file mode 100644
index 00000000000..b66d18cd943
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/import-scripts-redirect.https.html.ini
@@ -0,0 +1,9 @@
+[import-scripts-redirect.https.html]
+  [importScripts() supports redirects]
+    expected: FAIL
+
+  [an imported script redirects, and the body changes during the update check]
+    expected: FAIL
+
+  [an imported script doesn't redirect initially, then redirects during the update check and the body changes]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/import-scripts-resource-map.https.html.ini b/tests/wpt/meta/service-workers/service-worker/import-scripts-resource-map.https.html.ini
new file mode 100644
index 00000000000..83d9cd06f8f
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/import-scripts-resource-map.https.html.ini
@@ -0,0 +1,6 @@
+[import-scripts-resource-map.https.html]
+  [import the same script URL multiple times]
+    expected: FAIL
+
+  [call importScripts() with multiple arguments]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/import-scripts-updated-flag.https.html.ini b/tests/wpt/meta/service-workers/service-worker/import-scripts-updated-flag.https.html.ini
new file mode 100644
index 00000000000..bc4bafde45b
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/import-scripts-updated-flag.https.html.ini
@@ -0,0 +1,12 @@
+[import-scripts-updated-flag.https.html]
+  [initialize global state]
+    expected: FAIL
+
+  [import script previously imported at worker evaluation time]
+    expected: FAIL
+
+  [import script previously imported at worker install time]
+    expected: FAIL
+
+  [import script not previously imported]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/indexeddb.https.html.ini b/tests/wpt/meta/service-workers/service-worker/indexeddb.https.html.ini
new file mode 100644
index 00000000000..384b10c4f5c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/indexeddb.https.html.ini
@@ -0,0 +1,3 @@
+[indexeddb.https.html]
+  [Verify Indexed DB operation in a Service Worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/install-event-type.https.html.ini b/tests/wpt/meta/service-workers/service-worker/install-event-type.https.html.ini
new file mode 100644
index 00000000000..f1b3a5d8940
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/install-event-type.https.html.ini
@@ -0,0 +1,3 @@
+[install-event-type.https.html]
+  [install event type]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/installing.https.html.ini b/tests/wpt/meta/service-workers/service-worker/installing.https.html.ini
new file mode 100644
index 00000000000..19256236cd9
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/installing.https.html.ini
@@ -0,0 +1,7 @@
+[installing.https.html]
+  expected: ERROR
+  [installing is set]
+    expected: FAIL
+
+  [The ServiceWorker objects returned from installing attribute getter that represent the same service worker are the same objects]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/interface-requirements-sw.https.html.ini b/tests/wpt/meta/service-workers/service-worker/interface-requirements-sw.https.html.ini
new file mode 100644
index 00000000000..d1d3cac72a4
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/interface-requirements-sw.https.html.ini
@@ -0,0 +1,3 @@
+[interface-requirements-sw.https.html]
+  [Interfaces and attributes in ServiceWorkerGlobalScope]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/invalid-blobtype.https.html.ini b/tests/wpt/meta/service-workers/service-worker/invalid-blobtype.https.html.ini
new file mode 100644
index 00000000000..60f23940f99
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/invalid-blobtype.https.html.ini
@@ -0,0 +1,3 @@
+[invalid-blobtype.https.html]
+  [Verify the response of FetchEvent using XMLHttpRequest]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/invalid-header.https.html.ini b/tests/wpt/meta/service-workers/service-worker/invalid-header.https.html.ini
new file mode 100644
index 00000000000..99476be679d
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/invalid-header.https.html.ini
@@ -0,0 +1,3 @@
+[invalid-header.https.html]
+  [Verify the response of FetchEvent using XMLHttpRequest]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/iso-latin1-header.https.html.ini b/tests/wpt/meta/service-workers/service-worker/iso-latin1-header.https.html.ini
new file mode 100644
index 00000000000..a1be5923dbc
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/iso-latin1-header.https.html.ini
@@ -0,0 +1,3 @@
+[iso-latin1-header.https.html]
+  [Verify the response of FetchEvent using XMLHttpRequest]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/local-url-inherit-controller.https.html.ini b/tests/wpt/meta/service-workers/service-worker/local-url-inherit-controller.https.html.ini
new file mode 100644
index 00000000000..e38dd704270
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/local-url-inherit-controller.https.html.ini
@@ -0,0 +1,27 @@
+[local-url-inherit-controller.https.html]
+  [Same-origin blob URL iframe should inherit service worker controller.]
+    expected: FAIL
+
+  [Same-origin blob URL iframe should intercept fetch().]
+    expected: FAIL
+
+  [Same-origin blob URL worker should inherit service worker controller.]
+    expected: FAIL
+
+  [Same-origin blob URL worker should intercept fetch().]
+    expected: FAIL
+
+  [Same-origin blob URL sharedworker should inherit service worker controller.]
+    expected: FAIL
+
+  [Same-origin blob URL sharedworker should intercept fetch().]
+    expected: FAIL
+
+  [Data URL iframe should not intercept fetch().]
+    expected: FAIL
+
+  [Data URL worker should not inherit service worker controller.]
+    expected: FAIL
+
+  [Data URL worker should not intercept fetch().]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/mime-sniffing.https.html.ini b/tests/wpt/meta/service-workers/service-worker/mime-sniffing.https.html.ini
new file mode 100644
index 00000000000..3cd24bf52e3
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/mime-sniffing.https.html.ini
@@ -0,0 +1,3 @@
+[mime-sniffing.https.html]
+  [The response from service worker should be correctly MIME siniffed.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/multi-globals/url-parsing.https.html.ini b/tests/wpt/meta/service-workers/service-worker/multi-globals/url-parsing.https.html.ini
new file mode 100644
index 00000000000..43c574d0d03
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/multi-globals/url-parsing.https.html.ini
@@ -0,0 +1,10 @@
+[url-parsing.https.html]
+  expected: TIMEOUT
+  [register should use the relevant global of the object it was called on to resolve the script URL and the default scope URL]
+    expected: TIMEOUT
+
+  [register should use the relevant global of the object it was called on to resolve the script URL and the given scope URL]
+    expected: NOTRUN
+
+  [getRegistration should use the relevant global of the object it was called on to resolve the script URL]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/multipart-image.https.html.ini b/tests/wpt/meta/service-workers/service-worker/multipart-image.https.html.ini
new file mode 100644
index 00000000000..1d4d3421315
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/multipart-image.https.html.ini
@@ -0,0 +1,15 @@
+[multipart-image.https.html]
+  [initialize global state]
+    expected: FAIL
+
+  [same-origin multipart image via SW should be readable]
+    expected: FAIL
+
+  [cross-origin multipart image via SW with approved CORS should be readable]
+    expected: FAIL
+
+  [cross-origin multipart image with no-cors via SW should not be readable]
+    expected: FAIL
+
+  [cross-origin multipart image via SW with rejected CORS should fail to load]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/multiple-register.https.html.ini b/tests/wpt/meta/service-workers/service-worker/multiple-register.https.html.ini
new file mode 100644
index 00000000000..8469ad890f2
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/multiple-register.https.html.ini
@@ -0,0 +1,9 @@
+[multiple-register.https.html]
+  [Subsequent registrations resolve to the same registration object]
+    expected: FAIL
+
+  [Subsequent registrations from a different iframe resolve to the different registration object but they refer to the same registration and workers]
+    expected: FAIL
+
+  [Concurrent registrations resolve to the same registration object]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/multiple-update.https.html.ini b/tests/wpt/meta/service-workers/service-worker/multiple-update.https.html.ini
new file mode 100644
index 00000000000..6b208ea8f60
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/multiple-update.https.html.ini
@@ -0,0 +1,3 @@
+[multiple-update.https.html]
+  [Trigger multiple updates.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigate-window.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigate-window.https.html.ini
new file mode 100644
index 00000000000..ddbb3c791bc
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigate-window.https.html.ini
@@ -0,0 +1,6 @@
+[navigate-window.https.html]
+  [Clients.matchAll() should not show an old window as controlled after it navigates.]
+    expected: FAIL
+
+  [Clients.matchAll() should not show an old window after it navigates.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-headers.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-headers.https.html.ini
new file mode 100644
index 00000000000..4eb46bf8c90
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-headers.https.html.ini
@@ -0,0 +1,195 @@
+[navigation-headers.https.html]
+  [Setup service worker]
+    expected: FAIL
+
+  [GET Navigation, same-origin with navpreload service worker sets correct origin and referer headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with service worker that changes the request sets correct origin and referer headers.]
+    expected: FAIL
+
+  [POST Navigation, same-origin with service worker that changes the request sets correct origin and referer headers.]
+    expected: FAIL
+
+  [POST Navigation, same-site with no service worker sets correct origin and referer headers.]
+    expected: FAIL
+
+  [POST Navigation, same-site with passthrough service worker sets correct origin and referer headers.]
+    expected: FAIL
+
+  [POST Navigation, same-site with fallback service worker sets correct origin and referer headers.]
+    expected: FAIL
+
+  [GET Navigation, same-site with navpreload service worker sets correct origin and referer headers.]
+    expected: FAIL
+
+  [GET Navigation, same-site with service worker that changes the request sets correct origin and referer headers.]
+    expected: FAIL
+
+  [POST Navigation, same-site with service worker that changes the request sets correct origin and referer headers.]
+    expected: FAIL
+
+  [POST Navigation, cross-site with no service worker sets correct origin and referer headers.]
+    expected: FAIL
+
+  [POST Navigation, cross-site with passthrough service worker sets correct origin and referer headers.]
+    expected: FAIL
+
+  [POST Navigation, cross-site with fallback service worker sets correct origin and referer headers.]
+    expected: FAIL
+
+  [GET Navigation, cross-site with navpreload service worker sets correct origin and referer headers.]
+    expected: FAIL
+
+  [GET Navigation, cross-site with service worker that changes the request sets correct origin and referer headers.]
+    expected: FAIL
+
+  [POST Navigation, cross-site with service worker that changes the request sets correct origin and referer headers.]
+    expected: FAIL
+
+  [POST Navigation, same-origin with same-site redirect and change-request service worker sets correct origin and referer headers.]
+    expected: FAIL
+
+  [POST Navigation, same-origin with cross-site redirect and change-request service worker sets correct origin and referer headers.]
+    expected: FAIL
+
+  [POST Navigation, same-origin with cross-site redirect, same-origin redirect, and no service worker sets correct origin and referer headers.]
+    expected: FAIL
+
+  [POST Navigation, same-origin with cross-site redirect, same-origin redirect, and passthrough service worker sets correct origin and referer headers.]
+    expected: FAIL
+
+  [POST Navigation, same-origin with cross-site redirect, same-origin redirect, and fallback service worker sets correct origin and referer headers.]
+    expected: FAIL
+
+  [POST Navigation, same-origin with cross-site redirect, same-origin redirect, and change-request service worker sets correct origin and referer headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with no service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [POST Navigation, same-origin with no service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with passthrough service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [POST Navigation, same-origin with passthrough service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with fallback service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [POST Navigation, same-origin with fallback service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with navpreload service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with service worker that changes the request sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [POST Navigation, same-origin with service worker that changes the request sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-site with no service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [POST Navigation, same-site with no service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-site with passthrough service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [POST Navigation, same-site with passthrough service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-site with fallback service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [POST Navigation, same-site with fallback service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-site with navpreload service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-site with service worker that changes the request sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [POST Navigation, same-site with service worker that changes the request sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, cross-site with no service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [POST Navigation, cross-site with no service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, cross-site with passthrough service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [POST Navigation, cross-site with passthrough service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, cross-site with fallback service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [POST Navigation, cross-site with fallback service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, cross-site with navpreload service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, cross-site with service worker that changes the request sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [POST Navigation, cross-site with service worker that changes the request sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with same-site redirect and no service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with same-site redirect and passthrough service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with same-site redirect and fallback service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with same-site redirect and navpreload service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with same-site redirect and change-request service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with cross-site redirect and no service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with cross-site redirect and passthrough service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with cross-site redirect and fallback service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with cross-site redirect and navpreload service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with cross-site redirect and change-request service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with cross-site redirect, same-origin redirect, and no service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with cross-site redirect, same-origin redirect, and passthrough service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with cross-site redirect, same-origin redirect, and fallback service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with cross-site redirect, same-origin redirect, and navpreload service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [GET Navigation, same-origin with cross-site redirect, same-origin redirect, and change-request service worker sets correct sec-fetch headers.]
+    expected: FAIL
+
+  [Cleanup service worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-preload/broken-chunked-encoding.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-preload/broken-chunked-encoding.https.html.ini
new file mode 100644
index 00000000000..ebf2f63b858
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-preload/broken-chunked-encoding.https.html.ini
@@ -0,0 +1,6 @@
+[broken-chunked-encoding.https.html]
+  [FetchEvent#preloadResponse resolves even if the body is sent with broken chunked encoding.]
+    expected: FAIL
+
+  [FetchEvent#preloadResponse resolves even if the body is sent with broken chunked encoding with some delays]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-preload/chunked-encoding.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-preload/chunked-encoding.https.html.ini
new file mode 100644
index 00000000000..23bb64c4851
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-preload/chunked-encoding.https.html.ini
@@ -0,0 +1,3 @@
+[chunked-encoding.https.html]
+  [Navigation Preload must work with chunked encoding.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-preload/content-encoding.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-preload/content-encoding.https.html.ini
new file mode 100644
index 00000000000..f320da6ac2f
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-preload/content-encoding.https.html.ini
@@ -0,0 +1,3 @@
+[content-encoding.https.html]
+  [Navigation Preload must work with content encoding.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-preload/empty-preload-response-body.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-preload/empty-preload-response-body.https.html.ini
new file mode 100644
index 00000000000..e5f9d26f9f2
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-preload/empty-preload-response-body.https.html.ini
@@ -0,0 +1,3 @@
+[empty-preload-response-body.https.html]
+  [Navigation Preload empty response body.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-preload/get-state.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-preload/get-state.https.html.ini
new file mode 100644
index 00000000000..28b3d4f3356
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-preload/get-state.https.html.ini
@@ -0,0 +1,9 @@
+[get-state.https.html]
+  [getState]
+    expected: FAIL
+
+  [getState from a worker]
+    expected: FAIL
+
+  [no active worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-preload/navigationPreload.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-preload/navigationPreload.https.html.ini
new file mode 100644
index 00000000000..44b710acbaa
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-preload/navigationPreload.https.html.ini
@@ -0,0 +1,3 @@
+[navigationPreload.https.html]
+  [The navigationPreload attribute must return service worker registration's NavigationPreloadManager object.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-preload/redirect.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-preload/redirect.https.html.ini
new file mode 100644
index 00000000000..e38cdf43514
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-preload/redirect.https.html.ini
@@ -0,0 +1,12 @@
+[redirect.https.html]
+  [Navigation Preload redirect response.]
+    expected: FAIL
+
+  [Navigation Preload no-location redirect response.]
+    expected: FAIL
+
+  [Navigation Preload no-location redirect response with body.]
+    expected: FAIL
+
+  [Navigation Preload redirect to the same scope.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-preload/request-headers.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-preload/request-headers.https.html.ini
new file mode 100644
index 00000000000..de9e79c033b
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-preload/request-headers.https.html.ini
@@ -0,0 +1,3 @@
+[request-headers.https.html]
+  [Navigation Preload request headers.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-preload/resource-timing.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-preload/resource-timing.https.html.ini
new file mode 100644
index 00000000000..1aa62583858
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-preload/resource-timing.https.html.ini
@@ -0,0 +1,3 @@
+[resource-timing.https.html]
+  [Navigation Preload Resource Timing.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-preload/samesite-cookies.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-preload/samesite-cookies.https.html.ini
new file mode 100644
index 00000000000..6207d313a3f
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-preload/samesite-cookies.https.html.ini
@@ -0,0 +1,3 @@
+[samesite-cookies.https.html]
+  [Set up a service worker for navigation preload tests.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-preload/samesite-iframe.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-preload/samesite-iframe.https.html.ini
new file mode 100644
index 00000000000..ea83912ef08
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-preload/samesite-iframe.https.html.ini
@@ -0,0 +1,2 @@
+[samesite-iframe.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-redirect-body.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-redirect-body.https.html.ini
new file mode 100644
index 00000000000..c059f75b74b
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-redirect-body.https.html.ini
@@ -0,0 +1,3 @@
+[navigation-redirect-body.https.html]
+  [Navigation redirection must clear body]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-redirect-resolution.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-redirect-resolution.https.html.ini
new file mode 100644
index 00000000000..03dd7df86c8
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-redirect-resolution.https.html.ini
@@ -0,0 +1,9 @@
+[navigation-redirect-resolution.https.html]
+  [test relative opaqueredirect]
+    expected: FAIL
+
+  [test relative opaqueredirect with CacheStorage]
+    expected: FAIL
+
+  [test relative opaqueredirect with clone]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-redirect-to-http.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-redirect-to-http.https.html.ini
new file mode 100644
index 00000000000..ceec2a60689
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-redirect-to-http.https.html.ini
@@ -0,0 +1,4 @@
+[navigation-redirect-to-http.https.html]
+  expected: TIMEOUT
+  [Verify Service Worker can receive HTTP opaqueredirect response.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-redirect.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-redirect.https.html.ini
new file mode 100644
index 00000000000..8f8f90e9e41
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-redirect.https.html.ini
@@ -0,0 +1,236 @@
+[navigation-redirect.https.html?client]
+  [initialize global state]
+    expected: FAIL
+
+  [Normal redirect to same-origin scope.]
+    expected: FAIL
+
+  [Normal redirect to same-origin scope with a hash fragment.]
+    expected: FAIL
+
+  [Normal redirect to same-origin scope with different hash fragments.]
+    expected: FAIL
+
+  [Normal redirect to other-origin scope.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to same-origin out-scope.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to same-origin same-scope.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to same-origin same-scope with a hash fragment.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to same-origin same-scope with different hash fragments.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to same-origin other-scope.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to other-origin out-scope.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to other-origin in-scope.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to other-origin and back to same-origin.]
+    expected: FAIL
+
+  [SW-generated redirect to same-origin out-scope.]
+    expected: FAIL
+
+  [SW-generated redirect to same-origin out-scope with a hash fragment.]
+    expected: FAIL
+
+  [SW-generated redirect to same-origin out-scope with different hash fragments.]
+    expected: FAIL
+
+  [SW-generated redirect to same-origin same-scope.]
+    expected: FAIL
+
+  [SW-generated redirect to same-origin other-scope.]
+    expected: FAIL
+
+  [SW-generated redirect to other-origin out-scope.]
+    expected: FAIL
+
+  [SW-generated redirect to other-origin in-scope.]
+    expected: FAIL
+
+  [SW-fetched redirect to same-origin out-scope.]
+    expected: FAIL
+
+  [SW-fetched redirect to same-origin same-scope.]
+    expected: FAIL
+
+  [SW-fetched redirect to same-origin other-scope.]
+    expected: FAIL
+
+  [SW-fetched redirect to other-origin out-scope.]
+    expected: FAIL
+
+  [SW-fetched redirect to other-origin in-scope.]
+    expected: FAIL
+
+  [SW-fetched response from different URL, same-origin same-scope.]
+    expected: FAIL
+
+  [Redirect to same-origin out-scope with opaque redirect response.]
+    expected: FAIL
+
+  [Redirect to same-origin same-scope with opaque redirect response.]
+    expected: FAIL
+
+  [Redirect to same-origin other-scope with opaque redirect response.]
+    expected: FAIL
+
+  [Redirect to other-origin out-scope with opaque redirect response.]
+    expected: FAIL
+
+  [Redirect to other-origin in-scope with opaque redirect response.]
+    expected: FAIL
+
+  [No location redirect response.]
+    expected: FAIL
+
+  [Redirect to same-origin out-scope with opaque redirect response which is passed through Cache.]
+    expected: FAIL
+
+  [Redirect to same-origin same-scope with opaque redirect response which is passed through Cache.]
+    expected: FAIL
+
+  [Redirect to same-origin other-scope with opaque redirect response which is passed through Cache.]
+    expected: FAIL
+
+  [Redirect to other-origin out-scope with opaque redirect response which is passed through Cache.]
+    expected: FAIL
+
+  [Redirect to other-origin in-scope with opaque redirect response which is passed through Cache.]
+    expected: FAIL
+
+  [No location redirect response via Cache.]
+    expected: FAIL
+
+  [clean up global state]
+    expected: FAIL
+
+
+[navigation-redirect.https.html?default]
+  [initialize global state]
+    expected: FAIL
+
+  [Normal redirect to same-origin scope.]
+    expected: FAIL
+
+  [Normal redirect to same-origin scope with a hash fragment.]
+    expected: FAIL
+
+  [Normal redirect to same-origin scope with different hash fragments.]
+    expected: FAIL
+
+  [Normal redirect to other-origin scope.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to same-origin out-scope.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to same-origin same-scope.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to same-origin same-scope with a hash fragment.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to same-origin same-scope with different hash fragments.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to same-origin other-scope.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to other-origin out-scope.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to other-origin in-scope.]
+    expected: FAIL
+
+  [SW-fallbacked redirect to other-origin and back to same-origin.]
+    expected: FAIL
+
+  [SW-generated redirect to same-origin out-scope.]
+    expected: FAIL
+
+  [SW-generated redirect to same-origin out-scope with a hash fragment.]
+    expected: FAIL
+
+  [SW-generated redirect to same-origin out-scope with different hash fragments.]
+    expected: FAIL
+
+  [SW-generated redirect to same-origin same-scope.]
+    expected: FAIL
+
+  [SW-generated redirect to same-origin other-scope.]
+    expected: FAIL
+
+  [SW-generated redirect to other-origin out-scope.]
+    expected: FAIL
+
+  [SW-generated redirect to other-origin in-scope.]
+    expected: FAIL
+
+  [SW-fetched redirect to same-origin out-scope.]
+    expected: FAIL
+
+  [SW-fetched redirect to same-origin same-scope.]
+    expected: FAIL
+
+  [SW-fetched redirect to same-origin other-scope.]
+    expected: FAIL
+
+  [SW-fetched redirect to other-origin out-scope.]
+    expected: FAIL
+
+  [SW-fetched redirect to other-origin in-scope.]
+    expected: FAIL
+
+  [SW-fetched response from different URL, same-origin same-scope.]
+    expected: FAIL
+
+  [Redirect to same-origin out-scope with opaque redirect response.]
+    expected: FAIL
+
+  [Redirect to same-origin same-scope with opaque redirect response.]
+    expected: FAIL
+
+  [Redirect to same-origin other-scope with opaque redirect response.]
+    expected: FAIL
+
+  [Redirect to other-origin out-scope with opaque redirect response.]
+    expected: FAIL
+
+  [Redirect to other-origin in-scope with opaque redirect response.]
+    expected: FAIL
+
+  [No location redirect response.]
+    expected: FAIL
+
+  [Redirect to same-origin out-scope with opaque redirect response which is passed through Cache.]
+    expected: FAIL
+
+  [Redirect to same-origin same-scope with opaque redirect response which is passed through Cache.]
+    expected: FAIL
+
+  [Redirect to same-origin other-scope with opaque redirect response which is passed through Cache.]
+    expected: FAIL
+
+  [Redirect to other-origin out-scope with opaque redirect response which is passed through Cache.]
+    expected: FAIL
+
+  [Redirect to other-origin in-scope with opaque redirect response which is passed through Cache.]
+    expected: FAIL
+
+  [No location redirect response via Cache.]
+    expected: FAIL
+
+  [clean up global state]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-sets-cookie.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-sets-cookie.https.html.ini
new file mode 100644
index 00000000000..7edcb20eb5d
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-sets-cookie.https.html.ini
@@ -0,0 +1,49 @@
+[navigation-sets-cookie.https.html]
+  expected: TIMEOUT
+  [Setup service workers]
+    expected: TIMEOUT
+
+  [Same-site top-level navigation with fallback service worker should be able to set SameSite=* cookies.]
+    expected: NOTRUN
+
+  [Cross-site top-level navigation with fallback service worker should be able to set SameSite=* cookies.]
+    expected: NOTRUN
+
+  [Same-site top-level POST with fallback service worker should be able to set SameSite=* cookies.]
+    expected: NOTRUN
+
+  [Cross-site top-level with fallback service worker POST should be able to set SameSite=* cookies.]
+    expected: NOTRUN
+
+  [Same-site top-level navigation with passthrough service worker should be able to set SameSite=* cookies.]
+    expected: NOTRUN
+
+  [Cross-site top-level navigation with passthrough service worker should be able to set SameSite=* cookies.]
+    expected: NOTRUN
+
+  [Same-site top-level POST with passthrough service worker should be able to set SameSite=* cookies.]
+    expected: NOTRUN
+
+  [Cross-site top-level with passthrough service worker POST should be able to set SameSite=* cookies.]
+    expected: NOTRUN
+
+  [Same-site top-level navigation with navpreload service worker should be able to set SameSite=* cookies.]
+    expected: NOTRUN
+
+  [Cross-site top-level navigation with navpreload service worker should be able to set SameSite=* cookies.]
+    expected: NOTRUN
+
+  [Same-site top-level navigation with change-request service worker should be able to set SameSite=* cookies.]
+    expected: NOTRUN
+
+  [Cross-site top-level navigation with change-request service worker should be able to set SameSite=* cookies.]
+    expected: NOTRUN
+
+  [Same-site top-level POST with change-request service worker should be able to set SameSite=* cookies.]
+    expected: NOTRUN
+
+  [Cross-site top-level with change-request service worker POST should be able to set SameSite=* cookies.]
+    expected: NOTRUN
+
+  [Cleanup service workers]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-timing-extended.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-timing-extended.https.html.ini
new file mode 100644
index 00000000000..64173414865
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-timing-extended.https.html.ini
@@ -0,0 +1,3 @@
+[navigation-timing-extended.https.html]
+  [Service worker controlled navigation timing]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-timing-sizes.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-timing-sizes.https.html.ini
new file mode 100644
index 00000000000..32d6086e38c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-timing-sizes.https.html.ini
@@ -0,0 +1,9 @@
+[navigation-timing-sizes.https.html]
+  [Body sizes in a regular pass-through]
+    expected: FAIL
+
+  [Body sizes in a pass-through with non html content]
+    expected: FAIL
+
+  [Body sizes in a regular pass-through with gzip]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/navigation-timing.https.html.ini b/tests/wpt/meta/service-workers/service-worker/navigation-timing.https.html.ini
new file mode 100644
index 00000000000..95b516299ae
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/navigation-timing.https.html.ini
@@ -0,0 +1,9 @@
+[navigation-timing.https.html]
+  [Service worker controlled navigation timing]
+    expected: FAIL
+
+  [Service worker controlled navigation timing network fallback]
+    expected: FAIL
+
+  [Service worker controlled navigation timing redirect]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/nested-blob-url-workers.https.html.ini b/tests/wpt/meta/service-workers/service-worker/nested-blob-url-workers.https.html.ini
new file mode 100644
index 00000000000..d57324ec8b8
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/nested-blob-url-workers.https.html.ini
@@ -0,0 +1,9 @@
+[nested-blob-url-workers.https.html]
+  [Nested blob URL workers should be intercepted by a service worker.]
+    expected: FAIL
+
+  [Nested worker created from a blob URL worker should be intercepted by a service worker.]
+    expected: FAIL
+
+  [Nested blob URL worker created from a worker should be intercepted by a service worker.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/next-hop-protocol.https.html.ini b/tests/wpt/meta/service-workers/service-worker/next-hop-protocol.https.html.ini
new file mode 100644
index 00000000000..436678be64c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/next-hop-protocol.https.html.ini
@@ -0,0 +1,6 @@
+[next-hop-protocol.https.html]
+  [nextHopProtocol reports H1 correctly when routed via a service worker.]
+    expected: FAIL
+
+  [nextHopProtocol reports H2 correctly when routed via a service worker.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/no-dynamic-import-in-module.any.js.ini b/tests/wpt/meta/service-workers/service-worker/no-dynamic-import-in-module.any.js.ini
new file mode 100644
index 00000000000..f24b6dea491
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/no-dynamic-import-in-module.any.js.ini
@@ -0,0 +1,2 @@
+[no-dynamic-import-in-module.any.serviceworker-module.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/service-workers/service-worker/no-dynamic-import.any.js.ini b/tests/wpt/meta/service-workers/service-worker/no-dynamic-import.any.js.ini
new file mode 100644
index 00000000000..085fb7c04ed
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/no-dynamic-import.any.js.ini
@@ -0,0 +1,2 @@
+[no-dynamic-import.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/service-workers/service-worker/onactivate-script-error.https.html.ini b/tests/wpt/meta/service-workers/service-worker/onactivate-script-error.https.html.ini
new file mode 100644
index 00000000000..c9cd2e86c63
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/onactivate-script-error.https.html.ini
@@ -0,0 +1,15 @@
+[onactivate-script-error.https.html]
+  [activate handler throws an error]
+    expected: FAIL
+
+  [activate handler throws an error, error handler does not cancel]
+    expected: FAIL
+
+  [activate handler dispatches an event that throws an error]
+    expected: FAIL
+
+  [activate handler throws an error that is cancelled]
+    expected: FAIL
+
+  [activate handler throws an error and prevents default]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/oninstall-script-error.https.html.ini b/tests/wpt/meta/service-workers/service-worker/oninstall-script-error.https.html.ini
new file mode 100644
index 00000000000..49a0a57ce58
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/oninstall-script-error.https.html.ini
@@ -0,0 +1,18 @@
+[oninstall-script-error.https.html]
+  [install handler throws an error]
+    expected: FAIL
+
+  [install handler throws an error, error handler does not cancel]
+    expected: FAIL
+
+  [install handler dispatches an event that throws an error]
+    expected: FAIL
+
+  [install handler throws an error in the waitUntil]
+    expected: FAIL
+
+  [install handler throws an error that is cancelled]
+    expected: FAIL
+
+  [install handler throws an error and prevents default]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/opaque-response-preloaded.https.html.ini b/tests/wpt/meta/service-workers/service-worker/opaque-response-preloaded.https.html.ini
new file mode 100644
index 00000000000..1e25118877e
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/opaque-response-preloaded.https.html.ini
@@ -0,0 +1,6 @@
+[opaque-response-preloaded.https.html]
+  [Opaque responses should not be reused for XHRs, loading case]
+    expected: FAIL
+
+  [Opaque responses should not be reused for XHRs, done case]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/opaque-script.https.html.ini b/tests/wpt/meta/service-workers/service-worker/opaque-script.https.html.ini
new file mode 100644
index 00000000000..bafe70655f7
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/opaque-script.https.html.ini
@@ -0,0 +1,12 @@
+[opaque-script.https.html]
+  [Verify small same-origin cache_storage scripts are not opaque.]
+    expected: FAIL
+
+  [Verify large same-origin cache_storage scripts are not opaque.]
+    expected: FAIL
+
+  [Verify small cross-origin cache_storage scripts are opaque.]
+    expected: FAIL
+
+  [Verify large cross-origin cache_storage scripts are opaque.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/partitioned-claim.tentative.https.html.ini b/tests/wpt/meta/service-workers/service-worker/partitioned-claim.tentative.https.html.ini
new file mode 100644
index 00000000000..1ccd8c13206
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/partitioned-claim.tentative.https.html.ini
@@ -0,0 +1,3 @@
+[partitioned-claim.tentative.https.html]
+  [ServiceWorker's clients.claim() is partitioned]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/partitioned-cookies.tentative.https.html.ini b/tests/wpt/meta/service-workers/service-worker/partitioned-cookies.tentative.https.html.ini
new file mode 100644
index 00000000000..d111a73b618
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/partitioned-cookies.tentative.https.html.ini
@@ -0,0 +1,3 @@
+[partitioned-cookies.tentative.https.html]
+  [Service Worker: Partitioned Cookies]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/partitioned-getRegistrations.tentative.https.html.ini b/tests/wpt/meta/service-workers/service-worker/partitioned-getRegistrations.tentative.https.html.ini
new file mode 100644
index 00000000000..c980732a87d
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/partitioned-getRegistrations.tentative.https.html.ini
@@ -0,0 +1,3 @@
+[partitioned-getRegistrations.tentative.https.html]
+  [ServiceWorker's getRegistrations() is partitioned]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/partitioned-matchAll.tentative.https.html.ini b/tests/wpt/meta/service-workers/service-worker/partitioned-matchAll.tentative.https.html.ini
new file mode 100644
index 00000000000..7065504915c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/partitioned-matchAll.tentative.https.html.ini
@@ -0,0 +1,3 @@
+[partitioned-matchAll.tentative.https.html]
+  [ServiceWorker's matchAll() is partitioned]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/partitioned.tentative.https.html.ini b/tests/wpt/meta/service-workers/service-worker/partitioned.tentative.https.html.ini
new file mode 100644
index 00000000000..783172b1213
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/partitioned.tentative.https.html.ini
@@ -0,0 +1,6 @@
+[partitioned.tentative.https.html]
+  [Services workers under different top-level sites are partitioned.]
+    expected: FAIL
+
+  [Services workers with cross-site ancestors are partitioned.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/performance-timeline.https.html.ini b/tests/wpt/meta/service-workers/service-worker/performance-timeline.https.html.ini
new file mode 100644
index 00000000000..4e8a5795156
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/performance-timeline.https.html.ini
@@ -0,0 +1,6 @@
+[performance-timeline.https.html]
+  [Test Performance Timeline API in Service Worker]
+    expected: FAIL
+
+  [empty service worker fetch event included in performance timings]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/postmessage-blob-url.https.html.ini b/tests/wpt/meta/service-workers/service-worker/postmessage-blob-url.https.html.ini
new file mode 100644
index 00000000000..3fc4ea0277e
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/postmessage-blob-url.https.html.ini
@@ -0,0 +1,3 @@
+[postmessage-blob-url.https.html]
+  [postMessage Blob URL to a ServiceWorker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/postmessage-from-waiting-serviceworker.https.html.ini b/tests/wpt/meta/service-workers/service-worker/postmessage-from-waiting-serviceworker.https.html.ini
new file mode 100644
index 00000000000..c4c8360840b
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/postmessage-from-waiting-serviceworker.https.html.ini
@@ -0,0 +1,3 @@
+[postmessage-from-waiting-serviceworker.https.html]
+  [Client.postMessage() from waiting serviceworker.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/postmessage-msgport-to-client.https.html.ini b/tests/wpt/meta/service-workers/service-worker/postmessage-msgport-to-client.https.html.ini
new file mode 100644
index 00000000000..a822d98c1ba
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/postmessage-msgport-to-client.https.html.ini
@@ -0,0 +1,3 @@
+[postmessage-msgport-to-client.https.html]
+  [postMessage MessagePorts from ServiceWorker to Client]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/postmessage-to-client-message-queue.https.html.ini b/tests/wpt/meta/service-workers/service-worker/postmessage-to-client-message-queue.https.html.ini
new file mode 100644
index 00000000000..7e4ff038328
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/postmessage-to-client-message-queue.https.html.ini
@@ -0,0 +1,15 @@
+[postmessage-to-client-message-queue.https.html]
+  [Messages from ServiceWorker to Client only received after DOMContentLoaded event.]
+    expected: FAIL
+
+  [Messages from ServiceWorker to Client only received after calling startMessages().]
+    expected: FAIL
+
+  [Messages from ServiceWorker to Client only received after setting onmessage.]
+    expected: FAIL
+
+  [Microtasks run before dispatching messages after calling startMessages().]
+    expected: FAIL
+
+  [Microtasks run before dispatching messages after setting onmessage.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/postmessage-to-client.https.html.ini b/tests/wpt/meta/service-workers/service-worker/postmessage-to-client.https.html.ini
new file mode 100644
index 00000000000..2f08e10cc5d
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/postmessage-to-client.https.html.ini
@@ -0,0 +1,3 @@
+[postmessage-to-client.https.html]
+  [postMessage from ServiceWorker to Client.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/postmessage.https.html.ini b/tests/wpt/meta/service-workers/service-worker/postmessage.https.html.ini
new file mode 100644
index 00000000000..a9d2cad9501
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/postmessage.https.html.ini
@@ -0,0 +1,15 @@
+[postmessage.https.html]
+  [postMessage to a ServiceWorker (and back via MessagePort)]
+    expected: FAIL
+
+  [postMessage a transferable ArrayBuffer between ServiceWorker and Client]
+    expected: FAIL
+
+  [postMessage a transferable ArrayBuffer between ServiceWorker and Client over MessagePort]
+    expected: FAIL
+
+  [postMessage with dictionary a transferable ArrayBuffer between ServiceWorker and Client]
+    expected: FAIL
+
+  [postMessage to a redundant worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/ready.https.window.js.ini b/tests/wpt/meta/service-workers/service-worker/ready.https.window.js.ini
new file mode 100644
index 00000000000..223412348a4
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/ready.https.window.js.ini
@@ -0,0 +1,25 @@
+[ready.https.window.html]
+  expected: ERROR
+  [ready returns a Promise object in the context of the related document]
+    expected: FAIL
+
+  [ready on a controlled document]
+    expected: FAIL
+
+  [ready on a potential controlled document]
+    expected: FAIL
+
+  [ready on an iframe whose parent registers a new service worker]
+    expected: NOTRUN
+
+  [ready on an iframe that installs a new service worker]
+    expected: NOTRUN
+
+  [ready after a longer matched registration registered]
+    expected: NOTRUN
+
+  [access ready after it has been resolved]
+    expected: NOTRUN
+
+  [resolve ready after unregistering]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/redirected-response.https.html.ini b/tests/wpt/meta/service-workers/service-worker/redirected-response.https.html.ini
new file mode 100644
index 00000000000..014cea742e1
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/redirected-response.https.html.ini
@@ -0,0 +1,72 @@
+[redirected-response.https.html]
+  [initialize global state (service worker registration and caches)]
+    expected: FAIL
+
+  [mode: "follow", non-intercepted request, no server redirect]
+    expected: FAIL
+
+  [mode: "follow", non-intercepted request]
+    expected: FAIL
+
+  [mode: "manual", non-intercepted request]
+    expected: FAIL
+
+  [mode: "error", non-intercepted request]
+    expected: FAIL
+
+  [mode: "follow", no mode change, no server redirect]
+    expected: FAIL
+
+  [mode: "follow", no mode change]
+    expected: FAIL
+
+  [mode: "error", mode change: "follow"]
+    expected: FAIL
+
+  [mode: "manual", mode change: "follow"]
+    expected: FAIL
+
+  [mode: "follow", mode change: "manual"]
+    expected: FAIL
+
+  [mode: "error", mode change: "manual"]
+    expected: FAIL
+
+  [mode: "manual", no mode change]
+    expected: FAIL
+
+  [mode: "follow", generated redirect response]
+    expected: FAIL
+
+  [mode: "error", generated redirect response]
+    expected: FAIL
+
+  [mode: "manual", generated redirect response]
+    expected: FAIL
+
+  [mode: "follow", manually-generated redirect response]
+    expected: FAIL
+
+  [mode: "error", manually-generated redirect response]
+    expected: FAIL
+
+  [mode: "manual", manually-generated redirect response]
+    expected: FAIL
+
+  [mode: "follow", generated relative redirect response]
+    expected: FAIL
+
+  [mode: "error", generated relative redirect response]
+    expected: FAIL
+
+  [mode: "manual", generated relative redirect response]
+    expected: FAIL
+
+  [Fetch should follow the redirect response 20 times]
+    expected: FAIL
+
+  [Fetch should not follow the redirect response 21 times.]
+    expected: FAIL
+
+  [The URL for the service worker redirected request should be propagated to response.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/referer.https.html.ini b/tests/wpt/meta/service-workers/service-worker/referer.https.html.ini
new file mode 100644
index 00000000000..683244c318a
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/referer.https.html.ini
@@ -0,0 +1,3 @@
+[referer.https.html]
+  [Verify the referer]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/referrer-policy-header.https.html.ini b/tests/wpt/meta/service-workers/service-worker/referrer-policy-header.https.html.ini
new file mode 100644
index 00000000000..6dcd95a381c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/referrer-policy-header.https.html.ini
@@ -0,0 +1,9 @@
+[referrer-policy-header.https.html]
+  [Referrer for a main resource redirected with referrer-policy (origin) should only have origin.]
+    expected: FAIL
+
+  [Referrer for a main resource redirected with a module script with referrer-policy (origin) should only have origin.]
+    expected: FAIL
+
+  [Referrer for fetch requests initiated from a service worker with referrer-policy (origin) should only have origin.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/referrer-toplevel-script-fetch.https.html.ini b/tests/wpt/meta/service-workers/service-worker/referrer-toplevel-script-fetch.https.html.ini
new file mode 100644
index 00000000000..bf5ac8dc93e
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/referrer-toplevel-script-fetch.https.html.ini
@@ -0,0 +1,6 @@
+[referrer-toplevel-script-fetch.https.html]
+  [Referrer of the top-level script fetch should be the document URL]
+    expected: FAIL
+
+  [Referrer of the module script fetch should be the document URL]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/register-closed-window.https.html.ini b/tests/wpt/meta/service-workers/service-worker/register-closed-window.https.html.ini
new file mode 100644
index 00000000000..47d4ba62204
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/register-closed-window.https.html.ini
@@ -0,0 +1,4 @@
+[register-closed-window.https.html]
+  expected: TIMEOUT
+  [Call register() on ServiceWorkerContainer owned by closed window.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/service-workers/service-worker/register-default-scope.https.html.ini b/tests/wpt/meta/service-workers/service-worker/register-default-scope.https.html.ini
new file mode 100644
index 00000000000..6a396c27848
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/register-default-scope.https.html.ini
@@ -0,0 +1,9 @@
+[register-default-scope.https.html]
+  [default scope]
+    expected: FAIL
+
+  [undefined scope]
+    expected: FAIL
+
+  [null scope]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/register-same-scope-different-script-url.https.html.ini b/tests/wpt/meta/service-workers/service-worker/register-same-scope-different-script-url.https.html.ini
new file mode 100644
index 00000000000..f3eedf3c4db
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/register-same-scope-different-script-url.https.html.ini
@@ -0,0 +1,15 @@
+[register-same-scope-different-script-url.https.html]
+  [Register different scripts concurrently]
+    expected: FAIL
+
+  [Register then register new script URL]
+    expected: FAIL
+
+  [Register then register new script URL that 404s]
+    expected: FAIL
+
+  [Register then register new script that does not install]
+    expected: FAIL
+
+  [Register same-scope new script url effect on controller]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/register-wait-forever-in-install-worker.https.html.ini b/tests/wpt/meta/service-workers/service-worker/register-wait-forever-in-install-worker.https.html.ini
new file mode 100644
index 00000000000..4d8908bb261
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/register-wait-forever-in-install-worker.https.html.ini
@@ -0,0 +1,4 @@
+[register-wait-forever-in-install-worker.https.html]
+  expected: ERROR
+  [register worker that calls waitUntil with a promise that never resolves in oninstall]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/registration-basic.https.html.ini b/tests/wpt/meta/service-workers/service-worker/registration-basic.https.html.ini
new file mode 100644
index 00000000000..b4c29d0f519
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/registration-basic.https.html.ini
@@ -0,0 +1,7 @@
+[registration-basic.https.html]
+  expected: ERROR
+  [Registering scope with fragment]
+    expected: NOTRUN
+
+  [Registering same scope as the script directory]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/registration-end-to-end.https.html.ini b/tests/wpt/meta/service-workers/service-worker/registration-end-to-end.https.html.ini
new file mode 100644
index 00000000000..eac03d076f2
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/registration-end-to-end.https.html.ini
@@ -0,0 +1,3 @@
+[registration-end-to-end.https.html]
+  [Registration: end-to-end]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/registration-events.https.html.ini b/tests/wpt/meta/service-workers/service-worker/registration-events.https.html.ini
new file mode 100644
index 00000000000..d1ae6472786
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/registration-events.https.html.ini
@@ -0,0 +1,3 @@
+[registration-events.https.html]
+  [Registration: events]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/registration-iframe.https.html.ini b/tests/wpt/meta/service-workers/service-worker/registration-iframe.https.html.ini
new file mode 100644
index 00000000000..f96ac530867
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/registration-iframe.https.html.ini
@@ -0,0 +1,9 @@
+[registration-iframe.https.html]
+  [register method should use the "relevant global object" to parse its scriptURL and scope - normal case]
+    expected: FAIL
+
+  [register method should use the "relevant global object" to parse its scriptURL and scope - error case]
+    expected: FAIL
+
+  [A scope url should start with the given script url]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/registration-mime-types.https.html.ini b/tests/wpt/meta/service-workers/service-worker/registration-mime-types.https.html.ini
new file mode 100644
index 00000000000..65a74b931ea
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/registration-mime-types.https.html.ini
@@ -0,0 +1,108 @@
+[registration-mime-types.https.html]
+  [Registering script with no MIME type]
+    expected: FAIL
+
+  [Registering script with bad MIME type]
+    expected: FAIL
+
+  [Registering script that imports script with no MIME type]
+    expected: FAIL
+
+  [Registering script that imports script with bad MIME type]
+    expected: FAIL
+
+  [Registering script with good MIME type application/ecmascript]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type application/ecmascript]
+    expected: FAIL
+
+  [Registering script with good MIME type application/javascript]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type application/javascript]
+    expected: FAIL
+
+  [Registering script with good MIME type application/x-ecmascript]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type application/x-ecmascript]
+    expected: FAIL
+
+  [Registering script with good MIME type application/x-javascript]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type application/x-javascript]
+    expected: FAIL
+
+  [Registering script with good MIME type text/ecmascript]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type text/ecmascript]
+    expected: FAIL
+
+  [Registering script with good MIME type text/javascript]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type text/javascript]
+    expected: FAIL
+
+  [Registering script with good MIME type text/javascript1.0]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type text/javascript1.0]
+    expected: FAIL
+
+  [Registering script with good MIME type text/javascript1.1]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type text/javascript1.1]
+    expected: FAIL
+
+  [Registering script with good MIME type text/javascript1.2]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type text/javascript1.2]
+    expected: FAIL
+
+  [Registering script with good MIME type text/javascript1.3]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type text/javascript1.3]
+    expected: FAIL
+
+  [Registering script with good MIME type text/javascript1.4]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type text/javascript1.4]
+    expected: FAIL
+
+  [Registering script with good MIME type text/javascript1.5]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type text/javascript1.5]
+    expected: FAIL
+
+  [Registering script with good MIME type text/jscript]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type text/jscript]
+    expected: FAIL
+
+  [Registering script with good MIME type text/livescript]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type text/livescript]
+    expected: FAIL
+
+  [Registering script with good MIME type text/x-ecmascript]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type text/x-ecmascript]
+    expected: FAIL
+
+  [Registering script with good MIME type text/x-javascript]
+    expected: FAIL
+
+  [Registering script that imports script with good MIME type text/x-javascript]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/registration-schedule-job.https.html.ini b/tests/wpt/meta/service-workers/service-worker/registration-schedule-job.https.html.ini
new file mode 100644
index 00000000000..99213f8a72f
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/registration-schedule-job.https.html.ini
@@ -0,0 +1,9 @@
+[registration-schedule-job.https.html]
+  [different scriptURL]
+    expected: FAIL
+
+  [different updateViaCache]
+    expected: FAIL
+
+  [different type]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/registration-scope-module-static-import.https.html.ini b/tests/wpt/meta/service-workers/service-worker/registration-scope-module-static-import.https.html.ini
new file mode 100644
index 00000000000..00be2a4748f
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/registration-scope-module-static-import.https.html.ini
@@ -0,0 +1,9 @@
+[registration-scope-module-static-import.https.html]
+  [imported-module-script.js works when used as top-level]
+    expected: FAIL
+
+  [static imports to outside path restriction should be allowed]
+    expected: FAIL
+
+  [static imports redirecting to outside path restriction should be allowed]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/registration-scope.https.html.ini b/tests/wpt/meta/service-workers/service-worker/registration-scope.https.html.ini
new file mode 100644
index 00000000000..18fd421babb
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/registration-scope.https.html.ini
@@ -0,0 +1,15 @@
+[registration-scope.https.html]
+  [Scope including URL-encoded multibyte characters]
+    expected: FAIL
+
+  [Scope including non-escaped multibyte characters]
+    expected: FAIL
+
+  [Scope including self-reference]
+    expected: FAIL
+
+  [Scope including parent-reference]
+    expected: FAIL
+
+  [Scope including consecutive slashes]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/registration-script-module.https.html.ini b/tests/wpt/meta/service-workers/service-worker/registration-script-module.https.html.ini
new file mode 100644
index 00000000000..861452db107
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/registration-script-module.https.html.ini
@@ -0,0 +1,30 @@
+[registration-script-module.https.html]
+  [Registering invalid chunked encoding script]
+    expected: FAIL
+
+  [Registering invalid chunked encoding script with flush]
+    expected: FAIL
+
+  [Registering script including parse error]
+    expected: FAIL
+
+  [Registering script including undefined error]
+    expected: FAIL
+
+  [Registering script including uncaught exception]
+    expected: FAIL
+
+  [Registering script with top-level await]
+    expected: FAIL
+
+  [Registering script with module instantiation error]
+    expected: FAIL
+
+  [Registering script with module instantiation error and top-level await]
+    expected: FAIL
+
+  [Registering non-existent script]
+    expected: FAIL
+
+  [Registering script including caught exception]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/registration-script-url.https.html.ini b/tests/wpt/meta/service-workers/service-worker/registration-script-url.https.html.ini
new file mode 100644
index 00000000000..d4f660beff0
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/registration-script-url.https.html.ini
@@ -0,0 +1,6 @@
+[registration-script-url.https.html]
+  [Script URL including self-reference]
+    expected: FAIL
+
+  [Script URL including parent-reference]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/registration-script.https.html.ini b/tests/wpt/meta/service-workers/service-worker/registration-script.https.html.ini
new file mode 100644
index 00000000000..abf5ec06b27
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/registration-script.https.html.ini
@@ -0,0 +1,27 @@
+[registration-script.https.html]
+  [Registering invalid chunked encoding script]
+    expected: FAIL
+
+  [Registering invalid chunked encoding script with flush]
+    expected: FAIL
+
+  [Registering script including parse error]
+    expected: FAIL
+
+  [Registering script including undefined error]
+    expected: FAIL
+
+  [Registering script including uncaught exception]
+    expected: FAIL
+
+  [Registering script importing malformed script]
+    expected: FAIL
+
+  [Registering non-existent script]
+    expected: FAIL
+
+  [Registering script importing non-existent script]
+    expected: FAIL
+
+  [Registering script including caught exception]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/registration-security-error.https.html.ini b/tests/wpt/meta/service-workers/service-worker/registration-security-error.https.html.ini
new file mode 100644
index 00000000000..0b72e6a2b78
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/registration-security-error.https.html.ini
@@ -0,0 +1,25 @@
+[registration-security-error.https.html]
+  expected: TIMEOUT
+  [Registering same scope as the script directory without the last slash]
+    expected: FAIL
+
+  [Registration scope outside the script directory]
+    expected: FAIL
+
+  [Registering scope outside domain]
+    expected: TIMEOUT
+
+  [Registering script outside domain]
+    expected: NOTRUN
+
+  [Registering redirected script]
+    expected: NOTRUN
+
+  [Scope including parent-reference and not under the script directory]
+    expected: NOTRUN
+
+  [Script URL including consecutive slashes]
+    expected: NOTRUN
+
+  [Script URL is same-origin filesystem: URL]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/registration-service-worker-attributes.https.html.ini b/tests/wpt/meta/service-workers/service-worker/registration-service-worker-attributes.https.html.ini
new file mode 100644
index 00000000000..694c2468172
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/registration-service-worker-attributes.https.html.ini
@@ -0,0 +1,3 @@
+[registration-service-worker-attributes.https.html]
+  [installing/waiting/active after registration]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/registration-updateviacache.https.html.ini b/tests/wpt/meta/service-workers/service-worker/registration-updateviacache.https.html.ini
new file mode 100644
index 00000000000..0490f7fecb1
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/registration-updateviacache.https.html.ini
@@ -0,0 +1,75 @@
+[registration-updateviacache.https.html]
+  [register-with-updateViaCache-undefined]
+    expected: FAIL
+
+  [register-with-updateViaCache-imports]
+    expected: FAIL
+
+  [register-with-updateViaCache-all]
+    expected: FAIL
+
+  [register-with-updateViaCache-none]
+    expected: FAIL
+
+  [register-with-updateViaCache-undefined-then-undefined]
+    expected: FAIL
+
+  [register-with-updateViaCache-undefined-then-imports]
+    expected: FAIL
+
+  [register-with-updateViaCache-undefined-then-all]
+    expected: FAIL
+
+  [register-with-updateViaCache-undefined-then-none]
+    expected: FAIL
+
+  [register-with-updateViaCache-imports-then-undefined]
+    expected: FAIL
+
+  [register-with-updateViaCache-imports-then-imports]
+    expected: FAIL
+
+  [register-with-updateViaCache-imports-then-all]
+    expected: FAIL
+
+  [register-with-updateViaCache-imports-then-none]
+    expected: FAIL
+
+  [register-with-updateViaCache-all-then-undefined]
+    expected: FAIL
+
+  [register-with-updateViaCache-all-then-imports]
+    expected: FAIL
+
+  [register-with-updateViaCache-all-then-all]
+    expected: FAIL
+
+  [register-with-updateViaCache-all-then-none]
+    expected: FAIL
+
+  [register-with-updateViaCache-none-then-undefined]
+    expected: FAIL
+
+  [register-with-updateViaCache-none-then-imports]
+    expected: FAIL
+
+  [register-with-updateViaCache-none-then-all]
+    expected: FAIL
+
+  [register-with-updateViaCache-none-then-none]
+    expected: FAIL
+
+  [access-updateViaCache-after-unregister-undefined]
+    expected: FAIL
+
+  [access-updateViaCache-after-unregister-imports]
+    expected: FAIL
+
+  [access-updateViaCache-after-unregister-all]
+    expected: FAIL
+
+  [access-updateViaCache-after-unregister-none]
+    expected: FAIL
+
+  [updateViaCache is not updated if register() rejects]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/rejections.https.html.ini b/tests/wpt/meta/service-workers/service-worker/rejections.https.html.ini
new file mode 100644
index 00000000000..e07dd01ffda
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/rejections.https.html.ini
@@ -0,0 +1,4 @@
+[rejections.https.html]
+  expected: TIMEOUT
+  [Rejections are DOMExceptions]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/service-workers/service-worker/request-end-to-end.https.html.ini b/tests/wpt/meta/service-workers/service-worker/request-end-to-end.https.html.ini
new file mode 100644
index 00000000000..c219b15a1d4
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/request-end-to-end.https.html.ini
@@ -0,0 +1,3 @@
+[request-end-to-end.https.html]
+  [Test FetchEvent.request passed to onfetch]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/resource-timing-bodySize.https.html.ini b/tests/wpt/meta/service-workers/service-worker/resource-timing-bodySize.https.html.ini
new file mode 100644
index 00000000000..62de35874ff
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/resource-timing-bodySize.https.html.ini
@@ -0,0 +1,72 @@
+[resource-timing-bodySize.https.html]
+  [Response body size: constructed, cors, TAO pass]
+    expected: FAIL
+
+  [Response body size: forward, cors, TAO pass]
+    expected: FAIL
+
+  [Response body size: stream, cors, TAO pass]
+    expected: FAIL
+
+  [Response body size: passthrough, cors, TAO pass]
+    expected: FAIL
+
+  [Response body size: constructed, cors, TAO fail]
+    expected: FAIL
+
+  [Response body size: forward, cors, TAO fail]
+    expected: FAIL
+
+  [Response body size: stream, cors, TAO fail]
+    expected: FAIL
+
+  [Response body size: passthrough, cors, TAO fail]
+    expected: FAIL
+
+  [Response body size: constructed, no-cors, TAO pass]
+    expected: FAIL
+
+  [Response body size: forward, no-cors, TAO pass]
+    expected: FAIL
+
+  [Response body size: stream, no-cors, TAO pass]
+    expected: FAIL
+
+  [Response body size: passthrough, no-cors, TAO pass]
+    expected: FAIL
+
+  [Response body size: constructed, no-cors, TAO fail]
+    expected: FAIL
+
+  [Response body size: forward, no-cors, TAO fail]
+    expected: FAIL
+
+  [Response body size: stream, no-cors, TAO fail]
+    expected: FAIL
+
+  [Response body size: passthrough, no-cors, TAO fail]
+    expected: FAIL
+
+  [Response body size: constructed, same-origin, TAO pass]
+    expected: FAIL
+
+  [Response body size: forward, same-origin, TAO pass]
+    expected: FAIL
+
+  [Response body size: stream, same-origin, TAO pass]
+    expected: FAIL
+
+  [Response body size: passthrough, same-origin, TAO pass]
+    expected: FAIL
+
+  [Response body size: constructed, same-origin, TAO fail]
+    expected: FAIL
+
+  [Response body size: forward, same-origin, TAO fail]
+    expected: FAIL
+
+  [Response body size: stream, same-origin, TAO fail]
+    expected: FAIL
+
+  [Response body size: passthrough, same-origin, TAO fail]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/resource-timing-cross-origin.https.html.ini b/tests/wpt/meta/service-workers/service-worker/resource-timing-cross-origin.https.html.ini
new file mode 100644
index 00000000000..6b05678cd75
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/resource-timing-cross-origin.https.html.ini
@@ -0,0 +1,6 @@
+[resource-timing-cross-origin.https.html]
+  [Test that timing allow check fails when service worker changes origin from same to cross origin (cors).]
+    expected: FAIL
+
+  [Test that timing allow check fails when service worker changes origin from same to cross origin (no-cors).]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/resource-timing-fetch-variants.https.html.ini b/tests/wpt/meta/service-workers/service-worker/resource-timing-fetch-variants.https.html.ini
new file mode 100644
index 00000000000..4b56040ddde
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/resource-timing-fetch-variants.https.html.ini
@@ -0,0 +1,15 @@
+[resource-timing-fetch-variants.https.html]
+  [Redirects done from within a service-worker should not be exposed to client ResourceTiming]
+    expected: FAIL
+
+  [Connection info from within a service-worker should not be exposed to client ResourceTiming]
+    expected: FAIL
+
+  [requestStart should never be before fetchStart]
+    expected: FAIL
+
+  [Delay from within service-worker (after internal fetching) should be accessible through `responseStart`]
+    expected: FAIL
+
+  [Delay from within service-worker (before internal fetching) should be measured before responseStart in the client ResourceTiming entry]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/resource-timing.sub.https.html.ini b/tests/wpt/meta/service-workers/service-worker/resource-timing.sub.https.html.ini
new file mode 100644
index 00000000000..b0f78c0e9d0
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/resource-timing.sub.https.html.ini
@@ -0,0 +1,6 @@
+[resource-timing.sub.https.html]
+  [Controlled resource loads]
+    expected: FAIL
+
+  [Non-controlled resource loads]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/respond-with-body-accessed-response.https.html.ini b/tests/wpt/meta/service-workers/service-worker/respond-with-body-accessed-response.https.html.ini
new file mode 100644
index 00000000000..1bab9309bd6
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/respond-with-body-accessed-response.https.html.ini
@@ -0,0 +1,57 @@
+[respond-with-body-accessed-response.https.html]
+  [initialize global state]
+    expected: FAIL
+
+  [test: type=basic]
+    expected: FAIL
+
+  [test: type=opaque]
+    expected: FAIL
+
+  [test: type=default]
+    expected: FAIL
+
+  [test: type=basic&clone=1]
+    expected: FAIL
+
+  [test: type=opaque&clone=1]
+    expected: FAIL
+
+  [test: type=default&clone=1]
+    expected: FAIL
+
+  [test: type=basic&clone=2]
+    expected: FAIL
+
+  [test: type=opaque&clone=2]
+    expected: FAIL
+
+  [test: type=default&clone=2]
+    expected: FAIL
+
+  [test: type=basic&passThroughCache=true]
+    expected: FAIL
+
+  [test: type=opaque&passThroughCache=true]
+    expected: FAIL
+
+  [test: type=default&passThroughCache=true]
+    expected: FAIL
+
+  [test: type=basic&clone=1&passThroughCache=true]
+    expected: FAIL
+
+  [test: type=opaque&clone=1&passThroughCache=true]
+    expected: FAIL
+
+  [test: type=default&clone=1&passThroughCache=true]
+    expected: FAIL
+
+  [test: type=basic&clone=2&passThroughCache=true]
+    expected: FAIL
+
+  [test: type=opaque&clone=2&passThroughCache=true]
+    expected: FAIL
+
+  [test: type=default&clone=2&passThroughCache=true]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/same-site-cookies.https.html.ini b/tests/wpt/meta/service-workers/service-worker/same-site-cookies.https.html.ini
new file mode 100644
index 00000000000..f7d08527dc2
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/same-site-cookies.https.html.ini
@@ -0,0 +1,199 @@
+[same-site-cookies.https.html]
+  expected: TIMEOUT
+  [Setup service workers]
+    expected: TIMEOUT
+
+  [same-origin, window.open with no service worker]
+    expected: NOTRUN
+
+  [same-origin, window.open with fallback]
+    expected: NOTRUN
+
+  [same-origin, window.open with passthrough]
+    expected: NOTRUN
+
+  [same-origin, window.open with change-request]
+    expected: NOTRUN
+
+  [same-origin, window.open with navpreload]
+    expected: NOTRUN
+
+  [same-site, window.open with no service worker]
+    expected: NOTRUN
+
+  [same-site, window.open with fallback]
+    expected: NOTRUN
+
+  [same-site, window.open with passthrough]
+    expected: NOTRUN
+
+  [same-site, window.open with change-request]
+    expected: NOTRUN
+
+  [same-site, window.open with navpreload]
+    expected: NOTRUN
+
+  [cross-site, window.open with no service worker]
+    expected: NOTRUN
+
+  [cross-site, window.open with fallback]
+    expected: NOTRUN
+
+  [cross-site, window.open with passthrough]
+    expected: NOTRUN
+
+  [cross-site, window.open with change-request]
+    expected: NOTRUN
+
+  [cross-site, window.open with navpreload]
+    expected: NOTRUN
+
+  [same-origin, window.open with no service worker and same-site redirect]
+    expected: NOTRUN
+
+  [same-origin, window.open with fallback and same-site redirect]
+    expected: NOTRUN
+
+  [same-origin, window.open with passthrough and same-site redirect]
+    expected: NOTRUN
+
+  [same-origin, window.open with change-request and same-site redirect]
+    expected: NOTRUN
+
+  [same-origin, window.open with navpreload and same-site redirect]
+    expected: NOTRUN
+
+  [same-origin, window.open with no service worker and cross-site redirect]
+    expected: NOTRUN
+
+  [same-origin, window.open with fallback and cross-site redirect]
+    expected: NOTRUN
+
+  [same-origin, window.open with passthrough and cross-site redirect]
+    expected: NOTRUN
+
+  [same-origin, window.open with change-request and cross-site redirect]
+    expected: NOTRUN
+
+  [same-origin, window.open with navpreload and cross-site redirect]
+    expected: NOTRUN
+
+  [same-origin, window.open with no service worker, cross-site redirect, and same-origin redirect]
+    expected: NOTRUN
+
+  [same-origin, window.open with fallback, cross-site redirect, and same-origin redirect]
+    expected: NOTRUN
+
+  [same-origin, window.open with passthrough, cross-site redirect, and same-origin redirect]
+    expected: NOTRUN
+
+  [same-origin, window.open with change-request, cross-site redirect, and same-origin redirect]
+    expected: NOTRUN
+
+  [same-origin, window.open with navpreload, cross-site redirect, and same-origin redirect]
+    expected: NOTRUN
+
+  [same-origin, nested window.open with cross-site middle frame and no service worker]
+    expected: NOTRUN
+
+  [same-origin, nested window.open with cross-site middle frame and fallback service worker]
+    expected: NOTRUN
+
+  [same-origin, nested window.open with cross-site middle frame and passthrough service worker]
+    expected: NOTRUN
+
+  [same-origin, nested window.open with cross-site middle frame and change-request service worker]
+    expected: NOTRUN
+
+  [same-origin, nested window.open with cross-site middle frame and navpreload service worker]
+    expected: NOTRUN
+
+  [same-origin, nested set location with cross-site middle frame and no service worker]
+    expected: NOTRUN
+
+  [same-origin, nested set location with cross-site middle frame and fallback service worker]
+    expected: NOTRUN
+
+  [same-origin, nested set location with cross-site middle frame and passthrough service worker]
+    expected: NOTRUN
+
+  [same-origin, nested set location with cross-site middle frame and change-request service worker]
+    expected: NOTRUN
+
+  [same-origin, nested set location with cross-site middle frame and navpreload service worker]
+    expected: NOTRUN
+
+  [same-origin, form post with no service worker]
+    expected: NOTRUN
+
+  [same-origin, form post with fallback]
+    expected: NOTRUN
+
+  [same-origin, form post with passthrough]
+    expected: NOTRUN
+
+  [same-origin, form post with change-request]
+    expected: NOTRUN
+
+  [same-site, form post with no service worker]
+    expected: NOTRUN
+
+  [same-site, form post with fallback]
+    expected: NOTRUN
+
+  [same-site, form post with passthrough]
+    expected: NOTRUN
+
+  [same-site, form post with change-request]
+    expected: NOTRUN
+
+  [cross-site, form post with no service worker]
+    expected: NOTRUN
+
+  [cross-site, form post with fallback]
+    expected: NOTRUN
+
+  [cross-site, form post with passthrough]
+    expected: NOTRUN
+
+  [cross-site, form post with change-request]
+    expected: NOTRUN
+
+  [same-origin, form post with no service worker and same-site redirect]
+    expected: NOTRUN
+
+  [same-origin, form post with fallback and same-site redirect]
+    expected: NOTRUN
+
+  [same-origin, form post with passthrough and same-site redirect]
+    expected: NOTRUN
+
+  [same-origin, form post with change-request and same-site redirect]
+    expected: NOTRUN
+
+  [same-origin, form post with no service worker and cross-site redirect]
+    expected: NOTRUN
+
+  [same-origin, form post with fallback and cross-site redirect]
+    expected: NOTRUN
+
+  [same-origin, form post with passthrough and cross-site redirect]
+    expected: NOTRUN
+
+  [same-origin, form post with change-request and cross-site redirect]
+    expected: NOTRUN
+
+  [same-origin, form post with no service worker, cross-site redirect, and same-origin redirect]
+    expected: NOTRUN
+
+  [same-origin, form post with fallback, cross-site redirect, and same-origin redirect]
+    expected: NOTRUN
+
+  [same-origin, form post with passthrough, cross-site redirect, and same-origin redirect]
+    expected: NOTRUN
+
+  [same-origin, form post with change-request, cross-site redirect, and same-origin redirect]
+    expected: NOTRUN
+
+  [Cleanup service workers]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/sandboxed-iframe-fetch-event.https.html.ini b/tests/wpt/meta/service-workers/service-worker/sandboxed-iframe-fetch-event.https.html.ini
new file mode 100644
index 00000000000..560b73a41a3
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/sandboxed-iframe-fetch-event.https.html.ini
@@ -0,0 +1,87 @@
+[sandboxed-iframe-fetch-event.https.html]
+  [Prepare a service worker.]
+    expected: FAIL
+
+  [Prepare a normal iframe.]
+    expected: FAIL
+
+  [Prepare an iframe sandboxed by <iframe sandbox="allow-scripts">.]
+    expected: FAIL
+
+  [Prepare an iframe sandboxed by <iframe sandbox="allow-scripts allow-same-origin">.]
+    expected: FAIL
+
+  [Prepare an iframe sandboxed by CSP HTTP header with allow-scripts.]
+    expected: FAIL
+
+  [Prepare an iframe sandboxed by CSP HTTP header with allow-scripts and allow-same-origin.]
+    expected: FAIL
+
+  [Fetch request from a normal iframe]
+    expected: FAIL
+
+  [Fetch request from a worker in a normal iframe]
+    expected: FAIL
+
+  [Request for an iframe in the normal iframe]
+    expected: FAIL
+
+  [Request for an sandboxed iframe with allow-scripts flag in the normal iframe]
+    expected: FAIL
+
+  [Request for an sandboxed iframe with allow-scripts and allow-same-origin flag in the normal iframe]
+    expected: FAIL
+
+  [Fetch request from iframe sandboxed by an attribute with allow-scripts flag]
+    expected: FAIL
+
+  [Fetch request from a worker in iframe sandboxed by an attribute with allow-scripts flag]
+    expected: FAIL
+
+  [Request for an iframe in the iframe sandboxed by an attribute with allow-scripts flag]
+    expected: FAIL
+
+  [Request for an sandboxed iframe with allow-scripts flag in the iframe sandboxed by an attribute with allow-scripts flag]
+    expected: FAIL
+
+  [Request for an sandboxed iframe with allow-scripts and allow-same-origin flag in the iframe sandboxed by an attribute with allow-scripts flag]
+    expected: FAIL
+
+  [Fetch request from iframe sandboxed by an attribute with allow-scripts and allow-same-origin flag]
+    expected: FAIL
+
+  [Fetch request from a worker in iframe sandboxed by an attribute with allow-scripts and allow-same-origin flag]
+    expected: FAIL
+
+  [Request for an iframe in the iframe sandboxed by an attribute with allow-scripts and allow-same-origin flag]
+    expected: FAIL
+
+  [Request for an sandboxed iframe with allow-scripts flag in the iframe sandboxed by attribute with allow-scripts and allow-same-origin flag]
+    expected: FAIL
+
+  [Request for an sandboxed iframe with allow-scripts and allow-same-origin flag in the iframe sandboxed by attribute with allow-scripts and allow-same-origin flag]
+    expected: FAIL
+
+  [Fetch request from iframe sandboxed by CSP HTTP header with allow-scripts flag]
+    expected: FAIL
+
+  [Request for an iframe in the iframe sandboxed by CSP HTTP header with allow-scripts flag]
+    expected: FAIL
+
+  [Request for an sandboxed iframe with allow-scripts flag in the iframe sandboxed by CSP HTTP header with allow-scripts flag]
+    expected: FAIL
+
+  [Request for an sandboxed iframe with allow-scripts and allow-same-origin flag in the iframe sandboxed by CSP HTTP header with allow-scripts flag]
+    expected: FAIL
+
+  [Fetch request from iframe sandboxed by CSP HTTP header with allow-scripts and allow-same-origin flag]
+    expected: FAIL
+
+  [Request for an iframe in the iframe sandboxed by CSP HTTP header with allow-scripts and allow-same-origin flag]
+    expected: FAIL
+
+  [Request for an sandboxed iframe with allow-scripts flag in the iframe sandboxed by CSP HTTP header with allow-scripts and allow-same-origin flag]
+    expected: FAIL
+
+  [Request for an sandboxed iframe with allow-scripts and allow-same-origin flag in the iframe sandboxed by CSP HTTP header with allow-scripts and allow-same-origin flag]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/sandboxed-iframe-navigator-serviceworker.https.html.ini b/tests/wpt/meta/service-workers/service-worker/sandboxed-iframe-navigator-serviceworker.https.html.ini
new file mode 100644
index 00000000000..ef3c60c5476
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/sandboxed-iframe-navigator-serviceworker.https.html.ini
@@ -0,0 +1,9 @@
+[sandboxed-iframe-navigator-serviceworker.https.html]
+  [Accessing navigator.serviceWorker in normal iframe should not throw.]
+    expected: FAIL
+
+  [Accessing navigator.serviceWorker in sandboxed iframe should throw.]
+    expected: FAIL
+
+  [Accessing navigator.serviceWorker in sandboxed iframe with allow-same-origin flag should not throw.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/secure-context.https.html.ini b/tests/wpt/meta/service-workers/service-worker/secure-context.https.html.ini
new file mode 100644
index 00000000000..d45a23dfb4d
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/secure-context.https.html.ini
@@ -0,0 +1,3 @@
+[secure-context.https.html]
+  [Ensure service worker is bypassed in insecure contexts]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/service-worker-csp-connect.https.html.ini b/tests/wpt/meta/service-workers/service-worker/service-worker-csp-connect.https.html.ini
new file mode 100644
index 00000000000..9a785f587cd
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/service-worker-csp-connect.https.html.ini
@@ -0,0 +1,3 @@
+[service-worker-csp-connect.https.html]
+  [CSP test for connect-src in ServiceWorkerGlobalScope]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/service-worker-csp-default.https.html.ini b/tests/wpt/meta/service-workers/service-worker/service-worker-csp-default.https.html.ini
new file mode 100644
index 00000000000..744ce9648e5
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/service-worker-csp-default.https.html.ini
@@ -0,0 +1,3 @@
+[service-worker-csp-default.https.html]
+  [CSP test for default-src in ServiceWorkerGlobalScope]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/service-worker-csp-script.https.html.ini b/tests/wpt/meta/service-workers/service-worker/service-worker-csp-script.https.html.ini
new file mode 100644
index 00000000000..b320484dc1c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/service-worker-csp-script.https.html.ini
@@ -0,0 +1,3 @@
+[service-worker-csp-script.https.html]
+  [CSP test for script-src in ServiceWorkerGlobalScope]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/service-worker-header.https.html.ini b/tests/wpt/meta/service-workers/service-worker/service-worker-header.https.html.ini
new file mode 100644
index 00000000000..1932b8736a4
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/service-worker-header.https.html.ini
@@ -0,0 +1,3 @@
+[service-worker-header.https.html]
+  [A request to fetch service worker main script should have Service-Worker header and imported scripts should not have one]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/serviceworker-message-event-historical.https.html.ini b/tests/wpt/meta/service-workers/service-worker/serviceworker-message-event-historical.https.html.ini
new file mode 100644
index 00000000000..4733254131d
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/serviceworker-message-event-historical.https.html.ini
@@ -0,0 +1,3 @@
+[serviceworker-message-event-historical.https.html]
+  [Test MessageEvent supplants ServiceWorkerMessageEvent.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/serviceworkerobject-scripturl.https.html.ini b/tests/wpt/meta/service-workers/service-worker/serviceworkerobject-scripturl.https.html.ini
new file mode 100644
index 00000000000..2a83eda00b0
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/serviceworkerobject-scripturl.https.html.ini
@@ -0,0 +1,12 @@
+[serviceworkerobject-scripturl.https.html]
+  [Verify the scriptURL property: relative]
+    expected: FAIL
+
+  [Verify the scriptURL property: with-fragment]
+    expected: FAIL
+
+  [Verify the scriptURL property: with-query]
+    expected: FAIL
+
+  [Verify the scriptURL property: absolute]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/shadowrealm-promise-rejection.https.html.ini b/tests/wpt/meta/service-workers/service-worker/shadowrealm-promise-rejection.https.html.ini
new file mode 100644
index 00000000000..ae6c3a5ec5b
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/shadowrealm-promise-rejection.https.html.ini
@@ -0,0 +1,3 @@
+[shadowrealm-promise-rejection.https.html]
+  [Promise rejections within worker thread ShadowRealms are handled]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/skip-waiting-installed.https.html.ini b/tests/wpt/meta/service-workers/service-worker/skip-waiting-installed.https.html.ini
new file mode 100644
index 00000000000..bf518357c08
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/skip-waiting-installed.https.html.ini
@@ -0,0 +1,3 @@
+[skip-waiting-installed.https.html]
+  [Test skipWaiting when a installed worker is waiting]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/skip-waiting-using-registration.https.html.ini b/tests/wpt/meta/service-workers/service-worker/skip-waiting-using-registration.https.html.ini
new file mode 100644
index 00000000000..a0e61b6bfc0
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/skip-waiting-using-registration.https.html.ini
@@ -0,0 +1,3 @@
+[skip-waiting-using-registration.https.html]
+  [Test skipWaiting while a client is using the registration]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/skip-waiting-without-client.https.html.ini b/tests/wpt/meta/service-workers/service-worker/skip-waiting-without-client.https.html.ini
new file mode 100644
index 00000000000..432b604f9a8
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/skip-waiting-without-client.https.html.ini
@@ -0,0 +1,3 @@
+[skip-waiting-without-client.https.html]
+  [Test single skipWaiting() when no client attached]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/skip-waiting-without-using-registration.https.html.ini b/tests/wpt/meta/service-workers/service-worker/skip-waiting-without-using-registration.https.html.ini
new file mode 100644
index 00000000000..4ac85daa75d
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/skip-waiting-without-using-registration.https.html.ini
@@ -0,0 +1,3 @@
+[skip-waiting-without-using-registration.https.html]
+  [Test skipWaiting while a client is not being controlled]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/skip-waiting.https.html.ini b/tests/wpt/meta/service-workers/service-worker/skip-waiting.https.html.ini
new file mode 100644
index 00000000000..54b56479f96
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/skip-waiting.https.html.ini
@@ -0,0 +1,3 @@
+[skip-waiting.https.html]
+  [Test skipWaiting with both active and waiting workers]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/srcdoc-iframe.https.html.ini b/tests/wpt/meta/service-workers/service-worker/srcdoc-iframe.https.html.ini
new file mode 100644
index 00000000000..c2b87cd1a3f
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/srcdoc-iframe.https.html.ini
@@ -0,0 +1,15 @@
+[srcdoc-iframe.https.html]
+  [nested sandboxed srcdoc frame should not inherit controller]
+    expected: FAIL
+
+  [nested same origin sandboxed srcdoc frame should inherit controller]
+    expected: FAIL
+
+  [should be able to serve resource from controller for srcdoc frame]
+    expected: FAIL
+
+  [getRegistration should work in srcdoc iframe]
+    expected: FAIL
+
+  [controller.postMessage should work in srcdoc iframe]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/state.https.html.ini b/tests/wpt/meta/service-workers/service-worker/state.https.html.ini
new file mode 100644
index 00000000000..9fa4697c1e8
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/state.https.html.ini
@@ -0,0 +1,3 @@
+[state.https.html]
+  [Service Worker state property and "statechange" event]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/static-router-fetch-event.https.html.ini b/tests/wpt/meta/service-workers/service-worker/static-router-fetch-event.https.html.ini
new file mode 100644
index 00000000000..14abf4227aa
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/static-router-fetch-event.https.html.ini
@@ -0,0 +1,6 @@
+[static-router-fetch-event.https.html]
+  [Main resource matched the rule with fetch-event source]
+    expected: FAIL
+
+  [Subresource load matched the rule fetch-event source]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/static-router-invalid-rules.https.html.ini b/tests/wpt/meta/service-workers/service-worker/static-router-invalid-rules.https.html.ini
new file mode 100644
index 00000000000..7d7727f6709
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/static-router-invalid-rules.https.html.ini
@@ -0,0 +1,24 @@
+[static-router-invalid-rules.https.html]
+  [addRoutes should raise for invalid ByteString request method.]
+    expected: FAIL
+
+  [addRoutes should raise for invalid HTTP request method.]
+    expected: FAIL
+
+  [addRoutes should raise for forbidden request method.]
+    expected: FAIL
+
+  [addRoutes should raise if or condition exceeds the depth limit]
+    expected: FAIL
+
+  [addRoutes should raise if not condition exceeds the depth limit]
+    expected: FAIL
+
+  [addRoutes should raise if the number of router rules exceeds the length limit]
+    expected: FAIL
+
+  [addRoutes should raise if the conditon does not exist in the rule]
+    expected: FAIL
+
+  [addRoutes should raise if the source does not exiswt in the rule]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/static-router-main-resource.https.html.ini b/tests/wpt/meta/service-workers/service-worker/static-router-main-resource.https.html.ini
new file mode 100644
index 00000000000..771c8884af3
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/static-router-main-resource.https.html.ini
@@ -0,0 +1,27 @@
+[static-router-main-resource.https.html]
+  [Main resource load matched with the condition]
+    expected: FAIL
+
+  [Main resource load matched with the ignore case condition]
+    expected: FAIL
+
+  [Main resource load matched without the ignore case condition]
+    expected: FAIL
+
+  [Main resource load not matched with the condition]
+    expected: FAIL
+
+  [Main resource load matched with the cache source]
+    expected: FAIL
+
+  [Main resource fallback to the network when there is no cache entry]
+    expected: FAIL
+
+  [Main resource load matched with the cache source, with specifying the cache name]
+    expected: FAIL
+
+  [Main resource load should not match the condition with not]
+    expected: FAIL
+
+  [Main resource load should match the condition without not]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/static-router-multiple-router-registrations.https.html.ini b/tests/wpt/meta/service-workers/service-worker/static-router-multiple-router-registrations.https.html.ini
new file mode 100644
index 00000000000..fe175aff190
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/static-router-multiple-router-registrations.https.html.ini
@@ -0,0 +1,6 @@
+[static-router-multiple-router-registrations.https.html]
+  [Main reosurce load matched with the service worker having multiple rules]
+    expected: FAIL
+
+  [Resource load matched with the rule registered in the imported service worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/static-router-mutiple-conditions.https.html.ini b/tests/wpt/meta/service-workers/service-worker/static-router-mutiple-conditions.https.html.ini
new file mode 100644
index 00000000000..9761757cc0b
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/static-router-mutiple-conditions.https.html.ini
@@ -0,0 +1,6 @@
+[static-router-mutiple-conditions.https.html]
+  [Multiple conditions work with `and` operation]
+    expected: FAIL
+
+  [Multiple conditions including requestDestination work with `and` operation]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/static-router-no-fetch-handler.https.html.ini b/tests/wpt/meta/service-workers/service-worker/static-router-no-fetch-handler.https.html.ini
new file mode 100644
index 00000000000..acc3d60ef91
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/static-router-no-fetch-handler.https.html.ini
@@ -0,0 +1,9 @@
+[static-router-no-fetch-handler.https.html]
+  [The router rule is evaluated without fetch handlers in service worker]
+    expected: FAIL
+
+  [addRoutes should raise if the fetch-event source is used without onfetch]
+    expected: FAIL
+
+  [addRoutes should raise if the race-network-and-fetch-handler source is used without onfetch]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/static-router-race-network-and-fetch-handler.https.html.ini b/tests/wpt/meta/service-workers/service-worker/static-router-race-network-and-fetch-handler.https.html.ini
new file mode 100644
index 00000000000..4349c689c01
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/static-router-race-network-and-fetch-handler.https.html.ini
@@ -0,0 +1,18 @@
+[static-router-race-network-and-fetch-handler.https.html]
+  [Main resource load matched the rule with race-network-and-fetch-handler source, and the fetch handler response is faster than the server response]
+    expected: FAIL
+
+  [Main resource load matched the rule with race-network-and-fetch-handler source, and the server reseponse is faster than the fetch handler]
+    expected: FAIL
+
+  [Subresource load matched the rule with race-network-and-fetch-handler source, and the fetch handler response is faster than the server response]
+    expected: FAIL
+
+  [Subresource load matched the rule with race-network-and-fetch-handler source, and the server reseponse is faster than the fetch handler]
+    expected: FAIL
+
+  [Subresource load matched the rule with race-network-and-fetch-handler source, and the server reseponse with 204 response is faster than the fetch handler]
+    expected: FAIL
+
+  [Subresource load matched the rule with race-network-and-fetch-handler source, and the server reseponse is faster than the fetch handler, but not found]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/static-router-request-destination.https.html.ini b/tests/wpt/meta/service-workers/service-worker/static-router-request-destination.https.html.ini
new file mode 100644
index 00000000000..086df8793da
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/static-router-request-destination.https.html.ini
@@ -0,0 +1,6 @@
+[static-router-request-destination.https.html]
+  [Subreosurce load matched with the requestMethod script condition]
+    expected: FAIL
+
+  [Subreosurce load not matched with the requestMethod script condition]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/static-router-request-method.https.html.ini b/tests/wpt/meta/service-workers/service-worker/static-router-request-method.https.html.ini
new file mode 100644
index 00000000000..d5d0fa1fcb1
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/static-router-request-method.https.html.ini
@@ -0,0 +1,12 @@
+[static-router-request-method.https.html]
+  [Subresource load matched with the requestMethod GET condition]
+    expected: FAIL
+
+  [Subresource load matched with the requestMethod POST condition]
+    expected: FAIL
+
+  [Subresource load matched with the requestMethod PUT condition]
+    expected: FAIL
+
+  [Subresource load matched with the requestMethod DELETE condition]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/static-router-subresource.https.html.ini b/tests/wpt/meta/service-workers/service-worker/static-router-subresource.https.html.ini
new file mode 100644
index 00000000000..0c6ebda69fd
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/static-router-subresource.https.html.ini
@@ -0,0 +1,54 @@
+[static-router-subresource.https.html]
+  [Subresource load not matched with URLPattern condition]
+    expected: FAIL
+
+  [Subresource load matched with URLPattern condition]
+    expected: FAIL
+
+  [Subresource cross origin load matched with URLPattern condition via constructed object]
+    expected: FAIL
+
+  [Subresource load matched with ignoreCase URLPattern condition]
+    expected: FAIL
+
+  [Subresource load matched without ignoreCase URLPattern condition]
+    expected: FAIL
+
+  [Subresource load matched with URLPattern condition via URLPatternCompatible]
+    expected: FAIL
+
+  [Subresource cross origin load not matched with URLPattern condition via URLPatternCompatible]
+    expected: FAIL
+
+  [Subresource load matched with URLPattern condition via string]
+    expected: FAIL
+
+  [Subresource cross origin load not matched with URLPattern condition via string]
+    expected: FAIL
+
+  [Subresource load matched with RequestMode condition]
+    expected: FAIL
+
+  [Subresource load matched with the nested `or` condition]
+    expected: FAIL
+
+  [Subresource load matched with the next `or` condition]
+    expected: FAIL
+
+  [Subresource load not matched with `or` condition]
+    expected: FAIL
+
+  [Subresource load matched with the cache source rule]
+    expected: FAIL
+
+  [Subresource load did not match with the cache and fallback to the network]
+    expected: FAIL
+
+  [Subresource load matched with the cache source, with specifying the cache name]
+    expected: FAIL
+
+  [Subresource load should not match with the not condition]
+    expected: FAIL
+
+  [Subresource load should match with a file other than not]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/svg-target-reftest.https.html.ini b/tests/wpt/meta/service-workers/service-worker/svg-target-reftest.https.html.ini
new file mode 100644
index 00000000000..940ed6115ea
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/svg-target-reftest.https.html.ini
@@ -0,0 +1,2 @@
+[svg-target-reftest.https.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/service-workers/service-worker/synced-state.https.html.ini b/tests/wpt/meta/service-workers/service-worker/synced-state.https.html.ini
new file mode 100644
index 00000000000..7817c69583a
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/synced-state.https.html.ini
@@ -0,0 +1,3 @@
+[synced-state.https.html]
+  [worker objects for the same entity have the same state]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/tentative/static-router/static-router-resource-timing.https.html.ini b/tests/wpt/meta/service-workers/service-worker/tentative/static-router/static-router-resource-timing.https.html.ini
new file mode 100644
index 00000000000..92f33cf458c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/tentative/static-router/static-router-resource-timing.https.html.ini
@@ -0,0 +1,42 @@
+[static-router-resource-timing.https.html]
+  [Main resource matched the rule with fetch-event source]
+    expected: FAIL
+
+  [Main resource load matched with the condition and resource timing]
+    expected: FAIL
+
+  [Main resource load not matched with the condition and resource timing]
+    expected: FAIL
+
+  [Main resource load matched with the cache source and resource timing]
+    expected: FAIL
+
+  [Main resource fallback to the network when there is no cache entry and resource timing]
+    expected: FAIL
+
+  [Subresource load matched the rule fetch-event source]
+    expected: FAIL
+
+  [Subresource load not matched with URLPattern condition]
+    expected: FAIL
+
+  [Subresource load matched with URLPattern condition]
+    expected: FAIL
+
+  [Subresource load matched with the cache source rule]
+    expected: FAIL
+
+  [Subresource load did not match with the cache and fallback to the network]
+    expected: FAIL
+
+  [Main resource load matched the rule with race-network-and-fetch-handler source, and the fetch handler response is faster than the server response]
+    expected: FAIL
+
+  [Main resource load matched the rule with race-network-and-fetch-handler source, and the server reseponse is faster than the fetch handler]
+    expected: FAIL
+
+  [Subresource load matched the rule with race-network-and-fetch-handler source, and the fetch handler response is faster than the server response]
+    expected: FAIL
+
+  [Subresource load matched the rule with race-network-and-fetch-handler source, and the server reseponse is faster than the fetch handler]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/uncontrolled-page.https.html.ini b/tests/wpt/meta/service-workers/service-worker/uncontrolled-page.https.html.ini
new file mode 100644
index 00000000000..7d421ecb596
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/uncontrolled-page.https.html.ini
@@ -0,0 +1,3 @@
+[uncontrolled-page.https.html]
+  [Fetch events should not go through uncontrolled page.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/unregister-controller.https.html.ini b/tests/wpt/meta/service-workers/service-worker/unregister-controller.https.html.ini
new file mode 100644
index 00000000000..d0add67c447
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/unregister-controller.https.html.ini
@@ -0,0 +1,9 @@
+[unregister-controller.https.html]
+  [Unregister does not affect existing controller]
+    expected: FAIL
+
+  [Unregister prevents control of subsequent navigations]
+    expected: FAIL
+
+  [Unregister prevents new controllee even if registration is still in use]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/unregister-immediately-before-installed.https.html.ini b/tests/wpt/meta/service-workers/service-worker/unregister-immediately-before-installed.https.html.ini
new file mode 100644
index 00000000000..06b7555b42e
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/unregister-immediately-before-installed.https.html.ini
@@ -0,0 +1,6 @@
+[unregister-immediately-before-installed.https.html]
+  [Clear-Site-Data must abort service worker registration.]
+    expected: FAIL
+
+  [Clear-Site-Data must unregister a registration with a worker in the "installing" state.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/unregister-immediately-during-extendable-events.https.html.ini b/tests/wpt/meta/service-workers/service-worker/unregister-immediately-during-extendable-events.https.html.ini
new file mode 100644
index 00000000000..fe61e0de20b
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/unregister-immediately-during-extendable-events.https.html.ini
@@ -0,0 +1,3 @@
+[unregister-immediately-during-extendable-events.https.html]
+  [Clear-Site-Data must fail pending subresource fetch events.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/unregister-immediately.https.html.ini b/tests/wpt/meta/service-workers/service-worker/unregister-immediately.https.html.ini
new file mode 100644
index 00000000000..c5403b3b13c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/unregister-immediately.https.html.ini
@@ -0,0 +1,12 @@
+[unregister-immediately.https.html]
+  [Clear-Site-Data must unregister a registration with a worker in the "activating" state.]
+    expected: FAIL
+
+  [Clear-Site-Data must unregister an activated registration with an update waiting.]
+    expected: FAIL
+
+  [Clear-Site-Data must unregister an activated registration with controlled clients.]
+    expected: FAIL
+
+  [Clear-Site-Data must clear an unregistered registration waiting for  controlled clients to unload.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/unregister-then-register-new-script.https.html.ini b/tests/wpt/meta/service-workers/service-worker/unregister-then-register-new-script.https.html.ini
new file mode 100644
index 00000000000..5d77d96f71d
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/unregister-then-register-new-script.https.html.ini
@@ -0,0 +1,9 @@
+[unregister-then-register-new-script.https.html]
+  [Registering a new script URL while an unregistered registration is in use]
+    expected: FAIL
+
+  [Registering a new script URL that 404s does not resurrect unregistered registration]
+    expected: FAIL
+
+  [Registering a new script URL that fails to install does not resurrect unregistered registration]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/unregister-then-register.https.html.ini b/tests/wpt/meta/service-workers/service-worker/unregister-then-register.https.html.ini
new file mode 100644
index 00000000000..5413955f5b6
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/unregister-then-register.https.html.ini
@@ -0,0 +1,12 @@
+[unregister-then-register.https.html]
+  [Unregister then register resolves to a new value]
+    expected: FAIL
+
+  [Unregister then register does not resolve to the original value even if the registration is in use.]
+    expected: FAIL
+
+  [Unregister then register does not affect existing controllee]
+    expected: FAIL
+
+  [Unregister then register does not resurrect the registration]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/unregister.https.html.ini b/tests/wpt/meta/service-workers/service-worker/unregister.https.html.ini
new file mode 100644
index 00000000000..be75bfa2554
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/unregister.https.html.ini
@@ -0,0 +1,6 @@
+[unregister.https.html]
+  [Unregister twice]
+    expected: FAIL
+
+  [Register then unregister]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/update-after-navigation-fetch-event.https.html.ini b/tests/wpt/meta/service-workers/service-worker/update-after-navigation-fetch-event.https.html.ini
new file mode 100644
index 00000000000..aa5079fa623
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/update-after-navigation-fetch-event.https.html.ini
@@ -0,0 +1,9 @@
+[update-after-navigation-fetch-event.https.html]
+  [Update should be triggered after a navigation (no fetch event worker).]
+    expected: FAIL
+
+  [Update should be triggered after a navigation (fetch event worker).]
+    expected: FAIL
+
+  [Update should be triggered after a navigation (network error).]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/update-after-navigation-redirect.https.html.ini b/tests/wpt/meta/service-workers/service-worker/update-after-navigation-redirect.https.html.ini
new file mode 100644
index 00000000000..dc3db267ddd
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/update-after-navigation-redirect.https.html.ini
@@ -0,0 +1,3 @@
+[update-after-navigation-redirect.https.html]
+  [service workers are updated on redirects during navigation]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/update-after-oneday.https.html.ini b/tests/wpt/meta/service-workers/service-worker/update-after-oneday.https.html.ini
new file mode 100644
index 00000000000..7f540b36eb9
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/update-after-oneday.https.html.ini
@@ -0,0 +1,3 @@
+[update-after-oneday.https.html]
+  [Update should be triggered after a functional event when last update time is over 24 hours]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/update-bytecheck-cors-import.https.html.ini b/tests/wpt/meta/service-workers/service-worker/update-bytecheck-cors-import.https.html.ini
new file mode 100644
index 00000000000..41ae9d61988
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/update-bytecheck-cors-import.https.html.ini
@@ -0,0 +1,24 @@
+[update-bytecheck-cors-import.https.html]
+  [Test(main: default, imported: default)]
+    expected: FAIL
+
+  [Test(main: default, imported: time)]
+    expected: FAIL
+
+  [Test(main: time, imported: default)]
+    expected: FAIL
+
+  [Test(main: time, imported: time)]
+    expected: FAIL
+
+  [Test module script(main: default, imported: default)]
+    expected: FAIL
+
+  [Test module script(main: default, imported: time)]
+    expected: FAIL
+
+  [Test module script(main: time, imported: default)]
+    expected: FAIL
+
+  [Test module script(main: time, imported: time)]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/update-bytecheck.https.html.ini b/tests/wpt/meta/service-workers/service-worker/update-bytecheck.https.html.ini
new file mode 100644
index 00000000000..c359b866fa1
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/update-bytecheck.https.html.ini
@@ -0,0 +1,24 @@
+[update-bytecheck.https.html]
+  [Test(main: default, imported: default)]
+    expected: FAIL
+
+  [Test(main: default, imported: time)]
+    expected: FAIL
+
+  [Test(main: time, imported: default)]
+    expected: FAIL
+
+  [Test(main: time, imported: time)]
+    expected: FAIL
+
+  [Test module script(main: default, imported: default)]
+    expected: FAIL
+
+  [Test module script(main: default, imported: time)]
+    expected: FAIL
+
+  [Test module script(main: time, imported: default)]
+    expected: FAIL
+
+  [Test module script(main: time, imported: time)]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/update-import-scripts.https.html.ini b/tests/wpt/meta/service-workers/service-worker/update-import-scripts.https.html.ini
new file mode 100644
index 00000000000..b9b755dbb9f
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/update-import-scripts.https.html.ini
@@ -0,0 +1,15 @@
+[update-import-scripts.https.html]
+  [update() should fail when a new worker imports an unavailable script.]
+    expected: FAIL
+
+  [update() should succeed when the old imported script no longer exist but the new worker doesn't import it.]
+    expected: FAIL
+
+  [update() should treat 404 on imported scripts as no change.]
+    expected: FAIL
+
+  [update() should find an update in an imported script but update() should result in failure due to missing the other imported script.]
+    expected: FAIL
+
+  [update() should work with cross-origin importScripts.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/update-missing-import-scripts.https.html.ini b/tests/wpt/meta/service-workers/service-worker/update-missing-import-scripts.https.html.ini
new file mode 100644
index 00000000000..67593eb8578
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/update-missing-import-scripts.https.html.ini
@@ -0,0 +1,6 @@
+[update-missing-import-scripts.https.html]
+  [Initialize global state]
+    expected: FAIL
+
+  [Update service worker with new script that's missing importScripts()]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/update-module-request-mode.https.html.ini b/tests/wpt/meta/service-workers/service-worker/update-module-request-mode.https.html.ini
new file mode 100644
index 00000000000..fcb75c54185
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/update-module-request-mode.https.html.ini
@@ -0,0 +1,3 @@
+[update-module-request-mode.https.html]
+  [headers of a main module script]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/update-no-cache-request-headers.https.html.ini b/tests/wpt/meta/service-workers/service-worker/update-no-cache-request-headers.https.html.ini
new file mode 100644
index 00000000000..018d6b3e172
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/update-no-cache-request-headers.https.html.ini
@@ -0,0 +1,3 @@
+[update-no-cache-request-headers.https.html]
+  [headers in no-cache mode]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/update-not-allowed.https.html.ini b/tests/wpt/meta/service-workers/service-worker/update-not-allowed.https.html.ini
new file mode 100644
index 00000000000..0b71d56fb10
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/update-not-allowed.https.html.ini
@@ -0,0 +1,9 @@
+[update-not-allowed.https.html]
+  [ServiceWorkerRegistration.update() from client succeeds while installing service worker.]
+    expected: FAIL
+
+  [ServiceWorkerRegistration.update() from installing service worker throws.]
+    expected: FAIL
+
+  [ServiceWorkerRegistration.update() from active service worker succeeds while installing service worker.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/update-on-navigation.https.html.ini b/tests/wpt/meta/service-workers/service-worker/update-on-navigation.https.html.ini
new file mode 100644
index 00000000000..b5cce6b7212
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/update-on-navigation.https.html.ini
@@ -0,0 +1,3 @@
+[update-on-navigation.https.html]
+  [The active service worker in charge of a navigation load should not be terminated as part of updating the registration]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/update-recovery.https.html.ini b/tests/wpt/meta/service-workers/service-worker/update-recovery.https.html.ini
new file mode 100644
index 00000000000..69d624324c9
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/update-recovery.https.html.ini
@@ -0,0 +1,3 @@
+[update-recovery.https.html]
+  [Recover from a bad service worker by updating after a failed navigation.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/update-registration-with-type.https.html.ini b/tests/wpt/meta/service-workers/service-worker/update-registration-with-type.https.html.ini
new file mode 100644
index 00000000000..ed7e7d2212c
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/update-registration-with-type.https.html.ini
@@ -0,0 +1,21 @@
+[update-registration-with-type.https.html]
+  [Update the registration with a different script type (classic => module).]
+    expected: FAIL
+
+  [Update the registration with a different script type (module => classic).]
+    expected: FAIL
+
+  [Update the registration with a different script type (classic => module) and with a same main script.]
+    expected: FAIL
+
+  [Update the registration with a different script type (module => classic) and with a same main script.]
+    expected: FAIL
+
+  [Does not update the registration with the same script type and the same main script.]
+    expected: FAIL
+
+  [Update the registration with a different script type (classic => module) and with a same main script. Expect evaluation failed.]
+    expected: FAIL
+
+  [Update the registration with a different script type (module => classic) and with a same main script. Expect evaluation failed.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/update-result.https.html.ini b/tests/wpt/meta/service-workers/service-worker/update-result.https.html.ini
new file mode 100644
index 00000000000..b077506a783
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/update-result.https.html.ini
@@ -0,0 +1,4 @@
+[update-result.https.html]
+  expected: TIMEOUT
+  [ServiceWorkerRegistration.update() should resolve a registration object]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/service-workers/service-worker/update.https.html.ini b/tests/wpt/meta/service-workers/service-worker/update.https.html.ini
new file mode 100644
index 00000000000..07c708465d9
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/update.https.html.ini
@@ -0,0 +1,21 @@
+[update.https.html]
+  [update() should succeed when new script is available.]
+    expected: FAIL
+
+  [update() should fail when mime type is invalid.]
+    expected: FAIL
+
+  [update() should fail when a response for the main script is redirect.]
+    expected: FAIL
+
+  [update() should fail when a new script contains a syntax error.]
+    expected: FAIL
+
+  [update() should resolve when the install event throws.]
+    expected: FAIL
+
+  [update() should fail when the pending uninstall flag is set.]
+    expected: FAIL
+
+  [update() should succeed when the script shrinks.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/waiting.https.html.ini b/tests/wpt/meta/service-workers/service-worker/waiting.https.html.ini
new file mode 100644
index 00000000000..a67079acbcb
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/waiting.https.html.ini
@@ -0,0 +1,7 @@
+[waiting.https.html]
+  expected: ERROR
+  [waiting is set after installation]
+    expected: FAIL
+
+  [The ServiceWorker objects returned from waiting attribute getter that represent the same service worker are the same objects]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/service-workers/service-worker/websocket-in-service-worker.https.html.ini b/tests/wpt/meta/service-workers/service-worker/websocket-in-service-worker.https.html.ini
new file mode 100644
index 00000000000..7eb9d632e55
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/websocket-in-service-worker.https.html.ini
@@ -0,0 +1,3 @@
+[websocket-in-service-worker.https.html]
+  [Verify WebSockets can be created in a Service Worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/websocket.https.html.ini b/tests/wpt/meta/service-workers/service-worker/websocket.https.html.ini
new file mode 100644
index 00000000000..ec645e97ad5
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/websocket.https.html.ini
@@ -0,0 +1,3 @@
+[websocket.https.html]
+  [Verify WebSocket handshake channel does not get intercepted]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/webvtt-cross-origin.https.html.ini b/tests/wpt/meta/service-workers/service-worker/webvtt-cross-origin.https.html.ini
new file mode 100644
index 00000000000..42531ef94c3
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/webvtt-cross-origin.https.html.ini
@@ -0,0 +1,27 @@
+[webvtt-cross-origin.https.html]
+  [initialize global state]
+    expected: FAIL
+
+  [same-origin text track should load]
+    expected: FAIL
+
+  [cross-origin text track with no-cors request should not load]
+    expected: FAIL
+
+  [cross-origin text track with rejected cors request should not load]
+    expected: FAIL
+
+  [cross-origin text track with approved cors request should not load]
+    expected: FAIL
+
+  [same-origin text track that redirects same-origin should load]
+    expected: FAIL
+
+  [same-origin text track that redirects cross-origin should not load]
+    expected: FAIL
+
+  [same-origin text track that redirects to a cross-origin text track with rejected cors should not load]
+    expected: FAIL
+
+  [same-origin text track that redirects to a cross-origin text track with approved cors should not load]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/windowclient-navigate.https.html.ini b/tests/wpt/meta/service-workers/service-worker/windowclient-navigate.https.html.ini
new file mode 100644
index 00000000000..bbe9c280f98
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/windowclient-navigate.https.html.ini
@@ -0,0 +1,33 @@
+[windowclient-navigate.https.html]
+  [normal]
+    expected: FAIL
+
+  [blank url]
+    expected: FAIL
+
+  [in scope but not controlled test on installing worker]
+    expected: FAIL
+
+  [in scope but not controlled test on active worker]
+    expected: FAIL
+
+  [out of scope]
+    expected: FAIL
+
+  [cross orgin url]
+    expected: FAIL
+
+  [invalid url (http://[example.com\])]
+    expected: FAIL
+
+  [invalid url (view-source://example.com)]
+    expected: FAIL
+
+  [invalid url (file:///)]
+    expected: FAIL
+
+  [invalid url (about:blank)]
+    expected: FAIL
+
+  [navigate on a top-level window client]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/worker-client-id.https.html.ini b/tests/wpt/meta/service-workers/service-worker/worker-client-id.https.html.ini
new file mode 100644
index 00000000000..5fb7da52fb2
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/worker-client-id.https.html.ini
@@ -0,0 +1,4 @@
+[worker-client-id.https.html]
+  expected: TIMEOUT
+  [Verify workers have a unique client id separate from their owning documents window]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/service-workers/service-worker/worker-in-sandboxed-iframe-by-csp-fetch-event.https.html.ini b/tests/wpt/meta/service-workers/service-worker/worker-in-sandboxed-iframe-by-csp-fetch-event.https.html.ini
new file mode 100644
index 00000000000..867ede45e94
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/worker-in-sandboxed-iframe-by-csp-fetch-event.https.html.ini
@@ -0,0 +1,15 @@
+[worker-in-sandboxed-iframe-by-csp-fetch-event.https.html]
+  [Prepare a service worker.]
+    expected: FAIL
+
+  [Prepare an iframe sandboxed by CSP HTTP header with allow-scripts.]
+    expected: FAIL
+
+  [Prepare an iframe sandboxed by CSP HTTP header with allow-scripts and allow-same-origin.]
+    expected: FAIL
+
+  [Fetch request from a worker in iframe sandboxed by CSP HTTP header allow-scripts flag]
+    expected: FAIL
+
+  [Fetch request from a worker in iframe sandboxed by CSP HTTP header with allow-scripts and allow-same-origin flag]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/worker-interception-redirect.https.html.ini b/tests/wpt/meta/service-workers/service-worker/worker-interception-redirect.https.html.ini
new file mode 100644
index 00000000000..9766ecb6471
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/worker-interception-redirect.https.html.ini
@@ -0,0 +1,63 @@
+[worker-interception-redirect.https.html]
+  [initialize global state]
+    expected: FAIL
+
+  [Case #1: network scope1->scope2 (classic SharedWorker)]
+    expected: FAIL
+
+  [Case #1: network scope1->scope2 (module SharedWorker)]
+    expected: FAIL
+
+  [Case #2: network scope1->out-scope (classic SharedWorker)]
+    expected: FAIL
+
+  [Case #2: network scope1->out-scope (module SharedWorker)]
+    expected: FAIL
+
+  [Case #3: sw scope1->scope2 (classic DedicatedWorker)]
+    expected: FAIL
+
+  [Case #3: sw scope1->scope2 (module DedicatedWorker)]
+    expected: FAIL
+
+  [Case #3: sw scope1->scope2 (classic SharedWorker)]
+    expected: FAIL
+
+  [Case #3: sw scope1->scope2 (module SharedWorker)]
+    expected: FAIL
+
+  [Case #4: sw scope1->out-scope (classic DedicatedWorker)]
+    expected: FAIL
+
+  [Case #4: sw scope1->out-scope (module DedicatedWorker)]
+    expected: FAIL
+
+  [Case #4: sw scope1->out-scope (classic SharedWorker)]
+    expected: FAIL
+
+  [Case #4: sw scope1->out-scope (module SharedWorker)]
+    expected: FAIL
+
+  [Case #1: network scope1->scope2 (classic DedicatedWorker, importScripts())]
+    expected: FAIL
+
+  [Case #1: network scope1->scope2 (classic DedicatedWorker, fetch())]
+    expected: FAIL
+
+  [Case #1: network scope1->scope2 (module DedicatedWorker, importScripts())]
+    expected: FAIL
+
+  [Case #1: network scope1->scope2 (module DedicatedWorker, fetch())]
+    expected: FAIL
+
+  [Case #2: network scope1->out-scope (classic DedicatedWorker, importScripts())]
+    expected: FAIL
+
+  [Case #2: network scope1->out-scope (classic DedicatedWorker, fetch())]
+    expected: FAIL
+
+  [Case #2: network scope1->out-scope (module DedicatedWorker, importScripts())]
+    expected: FAIL
+
+  [Case #2: network scope1->out-scope (module DedicatedWorker, fetch())]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/worker-interception.https.html.ini b/tests/wpt/meta/service-workers/service-worker/worker-interception.https.html.ini
new file mode 100644
index 00000000000..55f8f0a5a14
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/worker-interception.https.html.ini
@@ -0,0 +1,48 @@
+[worker-interception.https.html]
+  [Verify a dedicated worker script request gets correct client Ids]
+    expected: FAIL
+
+  [Verify a dedicated worker script request issued from a uncontrolled document is intercepted by worker's own service worker.]
+    expected: FAIL
+
+  [Verify an out-of-scope dedicated worker script request issued from a controlled document should not be intercepted by document's service worker.]
+    expected: FAIL
+
+  [Verify a shared worker script request issued from a uncontrolled document is intercepted by worker's own service worker.]
+    expected: FAIL
+
+  [Verify a same-origin worker script served by a service worker succeeds in starting a dedicated worker.]
+    expected: FAIL
+
+  [Verify a same-origin worker script served by a service worker succeeds in starting a shared worker.]
+    expected: FAIL
+
+  [Verify a cors worker script served by a service worker fails dedicated worker start.]
+    expected: FAIL
+
+  [Verify a cors worker script served by a service worker fails shared worker start.]
+    expected: FAIL
+
+  [Verify a no-cors cross-origin worker script served by a service worker fails dedicated worker start.]
+    expected: FAIL
+
+  [Verify a no-cors cross-origin worker script served by a service worker fails shared worker start.]
+    expected: FAIL
+
+  [Register a service worker for worker subresource interception tests.]
+    expected: FAIL
+
+  [Requests on a dedicated worker controlled by a service worker.]
+    expected: FAIL
+
+  [Requests on a shared worker controlled by a service worker.]
+    expected: FAIL
+
+  [Requests on a dedicated worker nested in a dedicated worker and controlled by a service worker]
+    expected: FAIL
+
+  [Requests on a dedicated worker nested in a shared worker and controlled by a service worker]
+    expected: FAIL
+
+  [Unregister a service worker for subresource interception tests.]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/xhr-content-length.https.window.js.ini b/tests/wpt/meta/service-workers/service-worker/xhr-content-length.https.window.js.ini
new file mode 100644
index 00000000000..1ef3f56b7ec
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/xhr-content-length.https.window.js.ini
@@ -0,0 +1,15 @@
+[xhr-content-length.https.window.html]
+  [Setup]
+    expected: FAIL
+
+  [Synthetic response without Content-Length header]
+    expected: FAIL
+
+  [Synthetic response with Content-Length header with value larger than response body length]
+    expected: FAIL
+
+  [Synthetic response with two Content-Length headers value larger than response body length]
+    expected: FAIL
+
+  [Synthetic response with bogus Content-Length header]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/xhr-response-url.https.html.ini b/tests/wpt/meta/service-workers/service-worker/xhr-response-url.https.html.ini
new file mode 100644
index 00000000000..606f60eabe5
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/xhr-response-url.https.html.ini
@@ -0,0 +1,18 @@
+[xhr-response-url.https.html]
+  [global setup]
+    expected: FAIL
+
+  [XHR responseURL should be the response URL]
+    expected: FAIL
+
+  [XHR responseURL should be the response URL (generated response)]
+    expected: FAIL
+
+  [XHR Document should use the response URL]
+    expected: FAIL
+
+  [XHR Document should use the response URL (generated response)]
+    expected: FAIL
+
+  [global cleanup]
+    expected: FAIL
diff --git a/tests/wpt/meta/service-workers/service-worker/xsl-base-url.https.html.ini b/tests/wpt/meta/service-workers/service-worker/xsl-base-url.https.html.ini
new file mode 100644
index 00000000000..23f196e337e
--- /dev/null
+++ b/tests/wpt/meta/service-workers/service-worker/xsl-base-url.https.html.ini
@@ -0,0 +1,4 @@
+[xsl-base-url.https.html]
+  expected: ERROR
+  [base URL when service worker does respondWith(fetch(responseUrl))]
+    expected: FAIL
diff --git a/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-available-to-element-internals.html.ini b/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-available-to-element-internals.html.ini
deleted file mode 100644
index 1e5c4518079..00000000000
--- a/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-available-to-element-internals.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[declarative-shadow-dom-available-to-element-internals.html]
-  [Declarative Shadow DOM: shadow root should be available to element internals]
-    expected: FAIL
diff --git a/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-basic.html.ini b/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-basic.html.ini
deleted file mode 100644
index 9ea3d57e32a..00000000000
--- a/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-basic.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[declarative-shadow-dom-basic.html]
-  [Declarative Shadow DOM: Basic test]
-    expected: FAIL
-
-  [Declarative Shadow DOM: Fragment parser basic test]
-    expected: FAIL
diff --git a/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-repeats.html.ini b/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-repeats.html.ini
deleted file mode 100644
index 4fad73d8d8c..00000000000
--- a/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-repeats.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[declarative-shadow-dom-repeats.html]
-  [Calling attachShadow() on declarative shadow root must match all parameters]
-    expected: FAIL
diff --git a/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-write-to-iframe.html.ini b/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-write-to-iframe.html.ini
deleted file mode 100644
index 81cb59eb03e..00000000000
--- a/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-write-to-iframe.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[declarative-shadow-dom-write-to-iframe.html]
-  [`document.write` on inner iframe handles declarative shadow DOM]
-    expected: FAIL
diff --git a/tests/wpt/meta/shadow-dom/declarative/gethtml.html.ini b/tests/wpt/meta/shadow-dom/declarative/gethtml.html.ini
deleted file mode 100644
index 3a96cb5998d..00000000000
--- a/tests/wpt/meta/shadow-dom/declarative/gethtml.html.ini
+++ /dev/null
@@ -1,4896 +0,0 @@
-[gethtml.html]
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <article><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <aside><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <blockquote><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <div><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <footer><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h1><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h2><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h3><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h4><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h5><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <h6><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <header><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <main><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <nav><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <p><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <section><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=false, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=false, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=open, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=undefined, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=false, clonable=true, without shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, with shadow tree contents.]
-    expected: FAIL
-
-  [ShadowRoot.getHTML() on <span><span>light</span>, with declarative shadow, mode=closed, delegatesFocus=true, serializable=true, clonable=true, without shadow tree contents.]
-    expected: FAIL
diff --git a/tests/wpt/meta/shadow-dom/event-composed-path-with-related-target.html.ini b/tests/wpt/meta/shadow-dom/event-composed-path-with-related-target.html.ini
index 4e2feb09451..38fab916ff7 100644
--- a/tests/wpt/meta/shadow-dom/event-composed-path-with-related-target.html.ini
+++ b/tests/wpt/meta/shadow-dom/event-composed-path-with-related-target.html.ini
@@ -1,4 +1,10 @@
 [event-composed-path-with-related-target.html]
+  [Event path for an event with a relatedTarget. Event should stop at the shadow root]
+    expected: FAIL
+
+  [Event path for an event with a relatedTarget which is identical to target. Event should be dispatched and should stop at the shadow root.]
+    expected: FAIL
+
   [Event path for an event with a relatedTarget. target and relaterTarget do not share any shadow-including ancestor. target is in a shadow tree.]
     expected: FAIL
 
@@ -17,9 +23,6 @@
   [Event path for an event with a relatedTarget. target is assigned to a slot.]
     expected: FAIL
 
-  [Event path for an event with a relatedTarget. relatedTarget is assigned to a slot.]
-    expected: FAIL
-
   [Event path for an event with a relatedTarget. Event should be dispatched at every slots.]
     expected: FAIL
 
diff --git a/tests/wpt/meta/shadow-dom/event-composed.html.ini b/tests/wpt/meta/shadow-dom/event-composed.html.ini
deleted file mode 100644
index 73650923859..00000000000
--- a/tests/wpt/meta/shadow-dom/event-composed.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[event-composed.html]
-  [A synthetic MouseEvent with composed=true should not be scoped]
-    expected: FAIL
-
-  [A synthetic FocusEvent with composed=true should not be scoped]
-    expected: FAIL
-
-  [A UA click event should not be scoped]
-    expected: FAIL
diff --git a/tests/wpt/meta/shadow-dom/event-post-dispatch.html.ini b/tests/wpt/meta/shadow-dom/event-post-dispatch.html.ini
index b7ea654323c..40b8d027081 100644
--- a/tests/wpt/meta/shadow-dom/event-post-dispatch.html.ini
+++ b/tests/wpt/meta/shadow-dom/event-post-dispatch.html.ini
@@ -5,9 +5,6 @@
   [Event properties post dispatch with relatedTarget in the same shadow tree. (composed: false)]
     expected: FAIL
 
-  [Event properties post dispatch with relatedTarget in the document tree and the shadow tree. (composed: true)]
-    expected: FAIL
-
   [Event properties post dispatch with relatedTarget in the document tree and the shadow tree. (composed: false)]
     expected: FAIL
 
diff --git a/tests/wpt/meta/shadow-dom/event-with-related-target.html.ini b/tests/wpt/meta/shadow-dom/event-with-related-target.html.ini
index e40e5541cca..71e61882548 100644
--- a/tests/wpt/meta/shadow-dom/event-with-related-target.html.ini
+++ b/tests/wpt/meta/shadow-dom/event-with-related-target.html.ini
@@ -1,4 +1,10 @@
 [event-with-related-target.html]
+  [Firing an event at B1a with relatedNode at B1 with open mode shadow trees]
+    expected: FAIL
+
+  [Firing an event at B1a with relatedNode at B1 with closed mode shadow trees]
+    expected: FAIL
+
   [Firing an event at B1a with relatedNode at B1b1 with open mode shadow trees]
     expected: FAIL
 
diff --git a/tests/wpt/meta/shadow-dom/offsetParent-across-shadow-boundaries.html.ini b/tests/wpt/meta/shadow-dom/offsetParent-across-shadow-boundaries.html.ini
deleted file mode 100644
index afd8ee2cf06..00000000000
--- a/tests/wpt/meta/shadow-dom/offsetParent-across-shadow-boundaries.html.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-[offsetParent-across-shadow-boundaries.html]
-  [offsetParent must skip offset parents of an element when the context object is assigned to a slot in a shadow tree of open mode]
-    expected: FAIL
-
-  [offsetParent must skip offset parents of an element when the context object is assigned to a slot in a shadow tree of closed mode]
-    expected: FAIL
-
-  [offsetParent must skip multiple offset parents of an element when the context object is assigned to a slot in a shadow tree of open mode]
-    expected: FAIL
-
-  [offsetParent must skip multiple offset parents of an element when the context object is assigned to a slot in a shadow tree of closed mode]
-    expected: FAIL
-
-  [offsetParent must skip offset parents of an element when the context object is assigned to a slot in nested shadow trees of open mode]
-    expected: FAIL
-
-  [offsetParent must skip offset parents of an element when the context object is assigned to a slot in nested shadow trees of closed mode]
-    expected: FAIL
-
-  [offsetParent must find the first offset parent which is a shadow-including ancestor of the context object even some shadow tree of open mode did not have any offset parent]
-    expected: FAIL
-
-  [offsetParent must find the first offset parent which is a shadow-including ancestor of the context object even some shadow tree of closed mode did not have any offset parent]
-    expected: FAIL
diff --git a/tests/wpt/meta/shadow-dom/offsetTop-offsetLeft-across-shadow-boundaries.html.ini b/tests/wpt/meta/shadow-dom/offsetTop-offsetLeft-across-shadow-boundaries.html.ini
index 88f45f3b6a7..5ebeb149de3 100644
--- a/tests/wpt/meta/shadow-dom/offsetTop-offsetLeft-across-shadow-boundaries.html.ini
+++ b/tests/wpt/meta/shadow-dom/offsetTop-offsetLeft-across-shadow-boundaries.html.ini
@@ -4,6 +4,3 @@
 
   [Verifies that HTMLElement.offsetTop accounts for shadow boundaries when nested in multiple shadow roots.]
     expected: FAIL
-
-  [Verifies that HTMLElement.offsetLeft accounts for shadow boundaries.]
-    expected: FAIL
diff --git a/tests/wpt/meta/shadow-dom/scroll-restore-shadow.html.ini b/tests/wpt/meta/shadow-dom/scroll-restore-shadow.html.ini
new file mode 100644
index 00000000000..9b097aacc1a
--- /dev/null
+++ b/tests/wpt/meta/shadow-dom/scroll-restore-shadow.html.ini
@@ -0,0 +1,3 @@
+[scroll-restore-shadow.html]
+  [Scroll position restore on shadow tree]
+    expected: FAIL
diff --git a/tests/wpt/meta/streams/readable-streams/crashtests/garbage-collection.any.js.ini b/tests/wpt/meta/streams/readable-streams/crashtests/garbage-collection.any.js.ini
new file mode 100644
index 00000000000..0c16120d4d8
--- /dev/null
+++ b/tests/wpt/meta/streams/readable-streams/crashtests/garbage-collection.any.js.ini
@@ -0,0 +1,9 @@
+[garbage-collection.any.sharedworker.html]
+  expected: ERROR
+
+[garbage-collection.any.worker.html]
+
+[garbage-collection.any.html]
+
+[garbage-collection.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/transferable/deserialize-error.window.js.ini b/tests/wpt/meta/streams/transferable/deserialize-error.window.js.ini
new file mode 100644
index 00000000000..b0b08f08a86
--- /dev/null
+++ b/tests/wpt/meta/streams/transferable/deserialize-error.window.js.ini
@@ -0,0 +1,2 @@
+[deserialize-error.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/transferable/service-worker.https.html.ini b/tests/wpt/meta/streams/transferable/service-worker.https.html.ini
new file mode 100644
index 00000000000..0e283bf2ad5
--- /dev/null
+++ b/tests/wpt/meta/streams/transferable/service-worker.https.html.ini
@@ -0,0 +1,4 @@
+[service-worker.https.html]
+  expected: ERROR
+  [service-worker]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/streams/transferable/shared-worker.html.ini b/tests/wpt/meta/streams/transferable/shared-worker.html.ini
new file mode 100644
index 00000000000..7638a1c5ab9
--- /dev/null
+++ b/tests/wpt/meta/streams/transferable/shared-worker.html.ini
@@ -0,0 +1,6 @@
+[shared-worker.html]
+  [worker.postMessage should be able to transfer a ReadableStream]
+    expected: FAIL
+
+  [postMessage in a worker should be able to transfer a ReadableStream]
+    expected: FAIL
diff --git a/tests/wpt/meta/streams/transferable/transform-stream-members.any.js.ini b/tests/wpt/meta/streams/transferable/transform-stream-members.any.js.ini
new file mode 100644
index 00000000000..4414054a1cf
--- /dev/null
+++ b/tests/wpt/meta/streams/transferable/transform-stream-members.any.js.ini
@@ -0,0 +1,19 @@
+[transform-stream-members.any.shadowrealm-in-shadowrealm.html]
+  expected: ERROR
+
+[transform-stream-members.any.shadowrealm-in-sharedworker.html]
+  expected: ERROR
+
+[transform-stream-members.https.any.shadowrealm-in-audioworklet.html]
+  expected: ERROR
+
+[transform-stream-members.any.shadowrealm-in-window.html]
+  expected: ERROR
+
+
+[transform-stream-members.https.any.shadowrealm-in-serviceworker.html]
+  expected: ERROR
+
+
+[transform-stream-members.any.shadowrealm-in-dedicatedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/transferable/transform-stream.html.ini b/tests/wpt/meta/streams/transferable/transform-stream.html.ini
new file mode 100644
index 00000000000..a5097f80874
--- /dev/null
+++ b/tests/wpt/meta/streams/transferable/transform-stream.html.ini
@@ -0,0 +1,3 @@
+[transform-stream.html]
+  [piping through transferred transforms should work]
+    expected: FAIL
diff --git a/tests/wpt/meta/streams/transform-streams/backpressure.any.js.ini b/tests/wpt/meta/streams/transform-streams/backpressure.any.js.ini
new file mode 100644
index 00000000000..099d3a6f2e0
--- /dev/null
+++ b/tests/wpt/meta/streams/transform-streams/backpressure.any.js.ini
@@ -0,0 +1,23 @@
+[backpressure.any.shadowrealm-in-shadowrealm.html]
+  expected: ERROR
+
+[backpressure.any.shadowrealm-in-window.html]
+  expected: ERROR
+
+[backpressure.any.serviceworker.html]
+  expected: ERROR
+
+[backpressure.any.shadowrealm-in-dedicatedworker.html]
+  expected: ERROR
+
+[backpressure.any.sharedworker.html]
+  expected: ERROR
+
+[backpressure.https.any.shadowrealm-in-serviceworker.html]
+  expected: ERROR
+
+[backpressure.any.shadowrealm-in-sharedworker.html]
+  expected: ERROR
+
+[backpressure.https.any.shadowrealm-in-audioworklet.html]
+  expected: ERROR
\ No newline at end of file
diff --git a/tests/wpt/meta/streams/transform-streams/cancel.any.js.ini b/tests/wpt/meta/streams/transform-streams/cancel.any.js.ini
new file mode 100644
index 00000000000..7e5a1b9af50
--- /dev/null
+++ b/tests/wpt/meta/streams/transform-streams/cancel.any.js.ini
@@ -0,0 +1,32 @@
+[cancel.any.shadowrealm-in-dedicatedworker.html]
+  expected: ERROR
+
+[cancel.any.serviceworker.html]
+  expected: ERROR
+
+[cancel.https.any.shadowrealm-in-audioworklet.html]
+  expected: ERROR
+
+[cancel.any.shadowrealm-in-sharedworker.html]
+  expected: ERROR
+
+[cancel.any.sharedworker.html]
+  expected: ERROR
+
+[cancel.any.shadowrealm-in-window.html]
+  expected: ERROR
+
+[cancel.any.shadowrealm-in-shadowrealm.html]
+  expected: ERROR
+
+[cancel.https.any.shadowrealm-in-serviceworker.html]
+  expected: ERROR
+
+[cancel.any.worker.html]
+  [readable.cancel() and a parallel writable.close() should reject if a transformer.cancel() calls controller.error()]
+    expected: FAIL
+
+
+[cancel.any.html]
+  [readable.cancel() and a parallel writable.close() should reject if a transformer.cancel() calls controller.error()]
+    expected: FAIL
diff --git a/tests/wpt/meta/streams/transform-streams/errors.any.js.ini b/tests/wpt/meta/streams/transform-streams/errors.any.js.ini
new file mode 100644
index 00000000000..02eaa76ca8e
--- /dev/null
+++ b/tests/wpt/meta/streams/transform-streams/errors.any.js.ini
@@ -0,0 +1,32 @@
+[errors.any.sharedworker.html]
+  expected: ERROR
+
+[errors.https.any.shadowrealm-in-serviceworker.html]
+  expected: ERROR
+
+[errors.any.shadowrealm-in-sharedworker.html]
+  expected: ERROR
+
+[errors.any.shadowrealm-in-shadowrealm.html]
+  expected: ERROR
+
+[errors.any.serviceworker.html]
+  expected: ERROR
+
+[errors.https.any.shadowrealm-in-audioworklet.html]
+  expected: ERROR
+
+[errors.any.shadowrealm-in-dedicatedworker.html]
+  expected: ERROR
+
+[errors.any.shadowrealm-in-window.html]
+  expected: ERROR
+
+[errors.any.html]
+  [abort should set the close reason for the writable when it happens before cancel during start, and cancel should reject]
+    expected: FAIL
+
+
+[errors.any.worker.html]
+  [abort should set the close reason for the writable when it happens before cancel during start, and cancel should reject]
+    expected: FAIL
diff --git a/tests/wpt/meta/streams/transform-streams/flush.any.js.ini b/tests/wpt/meta/streams/transform-streams/flush.any.js.ini
new file mode 100644
index 00000000000..a2ee0101993
--- /dev/null
+++ b/tests/wpt/meta/streams/transform-streams/flush.any.js.ini
@@ -0,0 +1,23 @@
+[flush.any.shadowrealm-in-dedicatedworker.html]
+  expected: ERROR
+
+[flush.any.shadowrealm-in-window.html]
+  expected: ERROR
+
+[flush.https.any.shadowrealm-in-audioworklet.html]
+  expected: ERROR
+
+[flush.any.shadowrealm-in-sharedworker.html]
+  expected: ERROR
+
+[flush.any.shadowrealm-in-shadowrealm.html]
+  expected: ERROR
+
+[flush.any.sharedworker.html]
+  expected: ERROR
+
+[flush.https.any.shadowrealm-in-serviceworker.html]
+  expected: ERROR
+
+[flush.any.serviceworker.html]
+  expected: ERROR
\ No newline at end of file
diff --git a/tests/wpt/meta/streams/transform-streams/general.any.js.ini b/tests/wpt/meta/streams/transform-streams/general.any.js.ini
new file mode 100644
index 00000000000..11dfc7d4ece
--- /dev/null
+++ b/tests/wpt/meta/streams/transform-streams/general.any.js.ini
@@ -0,0 +1,23 @@
+[general.any.shadowrealm-in-sharedworker.html]
+  expected: ERROR
+
+[general.https.any.shadowrealm-in-serviceworker.html]
+  expected: ERROR
+
+[general.any.shadowrealm-in-shadowrealm.html]
+  expected: ERROR
+
+[general.any.shadowrealm-in-dedicatedworker.html]
+  expected: ERROR
+
+[general.https.any.shadowrealm-in-audioworklet.html]
+  expected: ERROR
+
+[general.any.serviceworker.html]
+  expected: ERROR
+
+[general.any.shadowrealm-in-window.html]
+  expected: ERROR
+
+[general.any.sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/transform-streams/lipfuzz.any.js.ini b/tests/wpt/meta/streams/transform-streams/lipfuzz.any.js.ini
new file mode 100644
index 00000000000..5af2be4a1ae
--- /dev/null
+++ b/tests/wpt/meta/streams/transform-streams/lipfuzz.any.js.ini
@@ -0,0 +1,23 @@
+[lipfuzz.any.shadowrealm-in-window.html]
+  expected: ERROR
+
+[lipfuzz.https.any.shadowrealm-in-serviceworker.html]
+  expected: ERROR
+
+[lipfuzz.any.serviceworker.html]
+  expected: ERROR
+
+[lipfuzz.any.shadowrealm-in-shadowrealm.html]
+  expected: ERROR
+
+[lipfuzz.any.shadowrealm-in-dedicatedworker.html]
+  expected: ERROR
+
+[lipfuzz.https.any.shadowrealm-in-audioworklet.html]
+  expected: ERROR
+
+[lipfuzz.any.sharedworker.html]
+  expected: ERROR
+
+[lipfuzz.any.shadowrealm-in-sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/transform-streams/patched-global.any.js.ini b/tests/wpt/meta/streams/transform-streams/patched-global.any.js.ini
new file mode 100644
index 00000000000..06a324cb060
--- /dev/null
+++ b/tests/wpt/meta/streams/transform-streams/patched-global.any.js.ini
@@ -0,0 +1,23 @@
+[patched-global.any.shadowrealm-in-dedicatedworker.html]
+  expected: ERROR
+
+[patched-global.any.shadowrealm-in-window.html]
+  expected: ERROR
+
+[patched-global.any.shadowrealm-in-sharedworker.html]
+  expected: ERROR
+
+[patched-global.https.any.shadowrealm-in-serviceworker.html]
+  expected: ERROR
+
+[patched-global.any.shadowrealm-in-shadowrealm.html]
+  expected: ERROR
+
+[patched-global.https.any.shadowrealm-in-audioworklet.html]
+  expected: ERROR
+
+[patched-global.any.sharedworker.html]
+  expected: ERROR
+
+[patched-global.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/transform-streams/properties.any.js.ini b/tests/wpt/meta/streams/transform-streams/properties.any.js.ini
new file mode 100644
index 00000000000..f5573ee57e4
--- /dev/null
+++ b/tests/wpt/meta/streams/transform-streams/properties.any.js.ini
@@ -0,0 +1,23 @@
+[properties.any.shadowrealm-in-shadowrealm.html]
+  expected: ERROR
+
+[properties.https.any.shadowrealm-in-serviceworker.html]
+  expected: ERROR
+
+[properties.any.shadowrealm-in-window.html]
+  expected: ERROR
+
+[properties.any.shadowrealm-in-dedicatedworker.html]
+  expected: ERROR
+
+[properties.any.sharedworker.html]
+  expected: ERROR
+
+[properties.https.any.shadowrealm-in-audioworklet.html]
+  expected: ERROR
+
+[properties.any.serviceworker.html]
+  expected: ERROR
+
+[properties.any.shadowrealm-in-sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/transform-streams/reentrant-strategies.any.js.ini b/tests/wpt/meta/streams/transform-streams/reentrant-strategies.any.js.ini
new file mode 100644
index 00000000000..1c6b9fd51da
--- /dev/null
+++ b/tests/wpt/meta/streams/transform-streams/reentrant-strategies.any.js.ini
@@ -0,0 +1,23 @@
+[reentrant-strategies.any.shadowrealm-in-window.html]
+  expected: ERROR
+
+[reentrant-strategies.https.any.shadowrealm-in-serviceworker.html]
+  expected: ERROR
+
+[reentrant-strategies.any.sharedworker.html]
+  expected: ERROR
+
+[reentrant-strategies.https.any.shadowrealm-in-audioworklet.html]
+  expected: ERROR
+
+[reentrant-strategies.any.shadowrealm-in-dedicatedworker.html]
+  expected: ERROR
+
+[reentrant-strategies.any.serviceworker.html]
+  expected: ERROR
+
+[reentrant-strategies.any.shadowrealm-in-sharedworker.html]
+  expected: ERROR
+
+[reentrant-strategies.any.shadowrealm-in-shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/transform-streams/strategies.any.js.ini b/tests/wpt/meta/streams/transform-streams/strategies.any.js.ini
new file mode 100644
index 00000000000..52c18b67fd4
--- /dev/null
+++ b/tests/wpt/meta/streams/transform-streams/strategies.any.js.ini
@@ -0,0 +1,24 @@
+[strategies.any.shadowrealm-in-shadowrealm.html]
+  expected: ERROR
+
+[strategies.any.serviceworker.html]
+  expected: ERROR
+
+[strategies.https.any.shadowrealm-in-serviceworker.html]
+  expected: ERROR
+
+[strategies.any.shadowrealm-in-window.html]
+  expected: ERROR
+
+[strategies.any.shadowrealm-in-sharedworker.html]
+  expected: ERROR
+
+[strategies.any.shadowrealm-in-dedicatedworker.html]
+  expected: ERROR
+
+[strategies.any.sharedworker.html]
+  expected: ERROR
+
+[strategies.https.any.shadowrealm-in-audioworklet.html]
+  expected: ERROR
+
diff --git a/tests/wpt/meta/streams/transform-streams/terminate.any.js.ini b/tests/wpt/meta/streams/transform-streams/terminate.any.js.ini
new file mode 100644
index 00000000000..c81b1e40d1e
--- /dev/null
+++ b/tests/wpt/meta/streams/transform-streams/terminate.any.js.ini
@@ -0,0 +1,23 @@
+[terminate.any.serviceworker.html]
+  expected: ERROR
+
+[terminate.any.shadowrealm-in-sharedworker.html]
+  expected: ERROR
+
+[terminate.https.any.shadowrealm-in-serviceworker.html]
+  expected: ERROR
+
+[terminate.any.shadowrealm-in-window.html]
+  expected: ERROR
+
+[terminate.any.shadowrealm-in-shadowrealm.html]
+  expected: ERROR
+
+[terminate.https.any.shadowrealm-in-audioworklet.html]
+  expected: ERROR
+
+[terminate.any.shadowrealm-in-dedicatedworker.html]
+  expected: ERROR
+
+[terminate.any.sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/writable-streams/crashtests/garbage-collection.any.js.ini b/tests/wpt/meta/streams/writable-streams/crashtests/garbage-collection.any.js.ini
new file mode 100644
index 00000000000..6204bdc21da
--- /dev/null
+++ b/tests/wpt/meta/streams/writable-streams/crashtests/garbage-collection.any.js.ini
@@ -0,0 +1,9 @@
+[garbage-collection.any.html]
+
+[garbage-collection.any.sharedworker.html]
+  expected: ERROR
+
+[garbage-collection.any.serviceworker.html]
+  expected: ERROR
+
+[garbage-collection.any.worker.html]
diff --git a/tests/wpt/meta/subresource-integrity/signatures/tentative/accept-signature.window.js.ini b/tests/wpt/meta/subresource-integrity/signatures/tentative/accept-signature.window.js.ini
index 68b6e50ddde..5e485daa4cb 100644
--- a/tests/wpt/meta/subresource-integrity/signatures/tentative/accept-signature.window.js.ini
+++ b/tests/wpt/meta/subresource-integrity/signatures/tentative/accept-signature.window.js.ini
@@ -10,3 +10,12 @@
 
   [ed25519-xDnP380zcL4rJ76rXYjeHlfMyPZEOqpJYjsjEppbuXE= malformed-thing ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=]
     expected: FAIL
+
+  [ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs= ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=]
+    expected: FAIL
+
+  [ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs= ed25519-xDnP380zcL4rJ76rXYjeHlfMyPZEOqpJYjsjEppbuXE=]
+    expected: FAIL
+
+  [ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs= malformed-thing ed25519-xDnP380zcL4rJ76rXYjeHlfMyPZEOqpJYjsjEppbuXE=]
+    expected: FAIL
diff --git a/tests/wpt/meta/subresource-integrity/signatures/tentative/scheme.window.js.ini b/tests/wpt/meta/subresource-integrity/signatures/tentative/scheme.window.js.ini
new file mode 100644
index 00000000000..23ca991ab0f
--- /dev/null
+++ b/tests/wpt/meta/subresource-integrity/signatures/tentative/scheme.window.js.ini
@@ -0,0 +1,12 @@
+[scheme.window.html]
+  [`fetch()`: Valid signature (signature=:WZp87p7X3ELfgIKL/qxsY/CT6XArMvZRaxcJ3uy1QklEcLf0c8tol2+W2pvaXX4jnd7hGevFVkzWE77rCOIzAA==:), matching integrity check: loads.]
+    expected: FAIL
+
+  [`fetch()`: Valid signature (signature=:WZp87p7X3ELfgIKL/qxsY/CT6XArMvZRaxcJ3uy1QklEcLf0c8tol2+W2pvaXX4jnd7hGevFVkzWE77rCOIzAA==:), mismatched integrity check: blocked.]
+    expected: FAIL
+
+  [`fetch()`: Valid signature (signature=:lMzR8lIXYG0Iz0MmTXcRTcBfNw6TgBAPfaNLAU1LzsxWC5dlez8SNe7aCW7avHTWKgaqTGBCMW1LgxkHlijgDA==:), matching integrity check: loads.]
+    expected: FAIL
+
+  [`fetch()`: Valid signature (signature=:lMzR8lIXYG0Iz0MmTXcRTcBfNw6TgBAPfaNLAU1LzsxWC5dlez8SNe7aCW7avHTWKgaqTGBCMW1LgxkHlijgDA==:), mismatched integrity check: blocked.]
+    expected: FAIL
diff --git a/tests/wpt/meta/subresource-integrity/signatures/tentative/unknown-parameter.window.js.ini b/tests/wpt/meta/subresource-integrity/signatures/tentative/unknown-parameter.window.js.ini
new file mode 100644
index 00000000000..8da42df9bbb
--- /dev/null
+++ b/tests/wpt/meta/subresource-integrity/signatures/tentative/unknown-parameter.window.js.ini
@@ -0,0 +1,18 @@
+[unknown-parameter.window.html]
+  [`fetch()`: Valid signature (signature=:eZ2DGIHUsTNMxFReOMkbOrTmn+CqDckCZ5/635x1Apl2ws0nA+qZcHqZFMdjBvcGw0WElh3zYD0ynkQ+cHiWCA==:), matching integrity check: loads.]
+    expected: FAIL
+
+  [`fetch()`: Valid signature (signature=:eZ2DGIHUsTNMxFReOMkbOrTmn+CqDckCZ5/635x1Apl2ws0nA+qZcHqZFMdjBvcGw0WElh3zYD0ynkQ+cHiWCA==:), mismatched integrity check: blocked.]
+    expected: FAIL
+
+  [`<script>`: Valid signature (signature=:eZ2DGIHUsTNMxFReOMkbOrTmn+CqDckCZ5/635x1Apl2ws0nA+qZcHqZFMdjBvcGw0WElh3zYD0ynkQ+cHiWCA==:), mismatched integrity check: blocked.]
+    expected: FAIL
+
+  [`fetch()`: Valid signature (signature=:YXQH8lkKBcGOMNSFbS56j3d5nK3j15HbFPIdsljzQVGFFd93T6FmXb2cLsoINYQbnMUOQBSROIzFZpgUQTBTBA==:), matching integrity check: loads.]
+    expected: FAIL
+
+  [`fetch()`: Valid signature (signature=:YXQH8lkKBcGOMNSFbS56j3d5nK3j15HbFPIdsljzQVGFFd93T6FmXb2cLsoINYQbnMUOQBSROIzFZpgUQTBTBA==:), mismatched integrity check: blocked.]
+    expected: FAIL
+
+  [`<script>`: Valid signature (signature=:YXQH8lkKBcGOMNSFbS56j3d5nK3j15HbFPIdsljzQVGFFd93T6FmXb2cLsoINYQbnMUOQBSROIzFZpgUQTBTBA==:), mismatched integrity check: blocked.]
+    expected: FAIL
diff --git a/tests/wpt/meta/subresource-integrity/subresource-integrity.html.ini b/tests/wpt/meta/subresource-integrity/subresource-integrity.html.ini
index df363f2b546..564fb9c3c97 100644
--- a/tests/wpt/meta/subresource-integrity/subresource-integrity.html.ini
+++ b/tests/wpt/meta/subresource-integrity/subresource-integrity.html.ini
@@ -1,7 +1,4 @@
 [subresource-integrity.html]
-  [Style: Same-origin with correct sha256 and sha512 hash, rel='alternate stylesheet' enabled]
-    expected: FAIL
-
   [Script: Same-origin with non-Base64 hash.]
     expected: FAIL
 
diff --git a/tests/wpt/meta/subresource-integrity/tentative/integrity-policy/parsing.https.html.ini b/tests/wpt/meta/subresource-integrity/tentative/integrity-policy/parsing.https.html.ini
new file mode 100644
index 00000000000..8634900f9c2
--- /dev/null
+++ b/tests/wpt/meta/subresource-integrity/tentative/integrity-policy/parsing.https.html.ini
@@ -0,0 +1,9 @@
+[parsing.https.html?type=enforce]
+  [Ensure that test is working with a valid destination]
+    expected: FAIL
+
+  [Ensure that test is working with a valid destination and source]
+    expected: FAIL
+
+
+[parsing.https.html?type=report]
diff --git a/tests/wpt/meta/subresource-integrity/tentative/integrity-policy/script.https.html.ini b/tests/wpt/meta/subresource-integrity/tentative/integrity-policy/script.https.html.ini
new file mode 100644
index 00000000000..3563393c660
--- /dev/null
+++ b/tests/wpt/meta/subresource-integrity/tentative/integrity-policy/script.https.html.ini
@@ -0,0 +1,15 @@
+[script.https.html]
+  [Ensure that a script without integrity did not run]
+    expected: FAIL
+
+  [Ensure that a script with unknown integrity algorithm did not run]
+    expected: FAIL
+
+  [Ensure that a script without integrity algorithm runs and gets reported in report-only mode]
+    expected: FAIL
+
+  [Ensure that a no-cors script gets blocked]
+    expected: FAIL
+
+  [Ensure that ReportingObserver gets called without endpoints]
+    expected: FAIL
diff --git a/tests/wpt/meta/touch-events/expose-legacy-touch-event-apis.html.ini b/tests/wpt/meta/touch-events/expose-legacy-touch-event-apis.html.ini
deleted file mode 100644
index 6a5af4522e2..00000000000
--- a/tests/wpt/meta/touch-events/expose-legacy-touch-event-apis.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[expose-legacy-touch-event-apis.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/DedicatedWorker-block-eval-function-constructor.html.ini b/tests/wpt/meta/trusted-types/DedicatedWorker-block-eval-function-constructor.html.ini
new file mode 100644
index 00000000000..21bc9787f45
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/DedicatedWorker-block-eval-function-constructor.html.ini
@@ -0,0 +1,18 @@
+[DedicatedWorker-block-eval-function-constructor.html]
+  [Blocked eval in DedicatedWorkerGlobalScope.]
+    expected: FAIL
+
+  [Blocked indirect eval in DedicatedWorkerGlobalScope.]
+    expected: FAIL
+
+  [Blocked Function constructor in DedicatedWorkerGlobalScope.]
+    expected: FAIL
+
+  [Blocked AsyncFunction constructor in DedicatedWorkerGlobalScope.]
+    expected: FAIL
+
+  [Blocked GeneratorFunction constructor in DedicatedWorkerGlobalScope.]
+    expected: FAIL
+
+  [Blocked AsyncGeneratorFunction constructor in DedicatedWorkerGlobalScope.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/DedicatedWorker-constructor-from-SharedWorker.html.ini b/tests/wpt/meta/trusted-types/DedicatedWorker-constructor-from-SharedWorker.html.ini
new file mode 100644
index 00000000000..b2ed881a617
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/DedicatedWorker-constructor-from-SharedWorker.html.ini
@@ -0,0 +1,2 @@
+[DedicatedWorker-constructor-from-SharedWorker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/DedicatedWorker-eval.html.ini b/tests/wpt/meta/trusted-types/DedicatedWorker-eval.html.ini
new file mode 100644
index 00000000000..87f7fc65af0
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/DedicatedWorker-eval.html.ini
@@ -0,0 +1,18 @@
+[DedicatedWorker-eval.html]
+  [eval(string) in dedicated worker]
+    expected: FAIL
+
+  [indirect eval(string) in dedicated worker]
+    expected: FAIL
+
+  [eval(TrustedScript) in dedicated worker]
+    expected: FAIL
+
+  [indirect eval(TrustedScript) in dedicated worker]
+    expected: FAIL
+
+  [eval(string) with default policy mutation in dedicated worker]
+    expected: FAIL
+
+  [indirect eval(string) with default policy mutation in dedicated worker]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/DedicatedWorker-setTimeout-setInterval.html.ini b/tests/wpt/meta/trusted-types/DedicatedWorker-setTimeout-setInterval.html.ini
new file mode 100644
index 00000000000..ae1a87b05b3
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/DedicatedWorker-setTimeout-setInterval.html.ini
@@ -0,0 +1,7 @@
+[DedicatedWorker-setTimeout-setInterval.html]
+  expected: TIMEOUT
+  [DedicatedWorkerGlobalScope.setTimeout assigned via default policy (successful Script transformation).]
+    expected: TIMEOUT
+
+  [DedicatedWorkerGlobalScope.setInterval assigned via default policy (successful Script transformation).]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/trusted-types/Document-execCommand.html.ini b/tests/wpt/meta/trusted-types/Document-execCommand.html.ini
new file mode 100644
index 00000000000..10089328ce9
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/Document-execCommand.html.ini
@@ -0,0 +1,6 @@
+[Document-execCommand.html]
+  [Document.execCommand("insertHTML") works as usual.]
+    expected: FAIL
+
+  [Document.execCommand("paste") works as usual.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/Document-write-appending-line-feed.html.ini b/tests/wpt/meta/trusted-types/Document-write-appending-line-feed.html.ini
new file mode 100644
index 00000000000..0c12db6f4ab
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/Document-write-appending-line-feed.html.ini
@@ -0,0 +1,18 @@
+[Document-write-appending-line-feed.html]
+  [document.write() with TrustedHTML arguments only.]
+    expected: FAIL
+
+  [document.write() with String arguments only.]
+    expected: FAIL
+
+  [document.write() with TrustedHTML for all but one argument.]
+    expected: FAIL
+
+  [document.writeln() with TrustedHTML arguments only.]
+    expected: FAIL
+
+  [document.writeln() with String arguments only.]
+    expected: FAIL
+
+  [document.writeln() with TrustedHTML for all but one argument.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-TT-realm.html.ini b/tests/wpt/meta/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-TT-realm.html.ini
new file mode 100644
index 00000000000..817ff569531
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-TT-realm.html.ini
@@ -0,0 +1,3 @@
+[Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-TT-realm.html]
+  [Trusted types are not enforced for setAttributeNode and\n              setAttributeNS after moving the target node from a TT-realm to a\n              non-TT realm for script.xlink:href]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-non-TT-realm.html.ini b/tests/wpt/meta/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-non-TT-realm.html.ini
new file mode 100644
index 00000000000..08050dcf00f
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-non-TT-realm.html.ini
@@ -0,0 +1,10 @@
+[Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-non-TT-realm.html]
+  expected: ERROR
+  [setAttribute and setAttributeNode respect the element's node document's global's CSP;\n Element=iframe; Parent=div; Attribute=srcdoc]
+    expected: FAIL
+
+  [setAttribute and setAttributeNode respect the element's node document's global's CSP;\n Element=script; Parent=div; Attribute=src]
+    expected: FAIL
+
+  [setAttribute and setAttributeNode respect the element's node document's global's CSP;\n Element=script; Parent=svg; Attribute=href]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/Element-setAttribute-setAttributeNS-sinks.tentative.html.ini b/tests/wpt/meta/trusted-types/Element-setAttribute-setAttributeNS-sinks.tentative.html.ini
new file mode 100644
index 00000000000..965d640d7b4
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/Element-setAttribute-setAttributeNS-sinks.tentative.html.ini
@@ -0,0 +1,21 @@
+[Element-setAttribute-setAttributeNS-sinks.tentative.html]
+  [HTMLIFrameElement.setAttribute('srcdoc', plain_string)]
+    expected: FAIL
+
+  [HTMLIFrameElement.setAttributeNS(null, 'srcdoc', plain_string)]
+    expected: FAIL
+
+  [HTMLScriptElement.setAttribute('src', plain_string)]
+    expected: FAIL
+
+  [HTMLScriptElement.setAttributeNS(null, 'src', plain_string)]
+    expected: FAIL
+
+  [SVGScriptElement.setAttribute('href', plain_string)]
+    expected: FAIL
+
+  [SVGScriptElement.setAttributeNS(null, 'href', plain_string)]
+    expected: FAIL
+
+  [SVGScriptElement.setAttributeNS(NSURI_XLINK, 'href', plain_string)]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/GlobalEventHandlers-onclick.html.ini b/tests/wpt/meta/trusted-types/GlobalEventHandlers-onclick.html.ini
new file mode 100644
index 00000000000..3d8e44fa31b
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/GlobalEventHandlers-onclick.html.ini
@@ -0,0 +1,6 @@
+[GlobalEventHandlers-onclick.html]
+  [a.setAttribute('onclick') sets an unsuitable trusted type.]
+    expected: FAIL
+
+  [a.setAttribute('click') sets a test string.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/HTMLScriptElement-internal-slot.html.ini b/tests/wpt/meta/trusted-types/HTMLScriptElement-internal-slot.html.ini
new file mode 100644
index 00000000000..f99a7f1c74d
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/HTMLScriptElement-internal-slot.html.ini
@@ -0,0 +1,3 @@
+[HTMLScriptElement-internal-slot.html]
+  [Test TT application when manipulating <script> elements during loading.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/SVGScriptElement-internal-slot.html.ini b/tests/wpt/meta/trusted-types/SVGScriptElement-internal-slot.html.ini
new file mode 100644
index 00000000000..64946e63290
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/SVGScriptElement-internal-slot.html.ini
@@ -0,0 +1,4 @@
+[SVGScriptElement-internal-slot.html]
+  expected: TIMEOUT
+  [Test TT application when manipulating <script> elements during loading.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/trusted-types/ServiceWorker-block-eval-function-constructor.https.html.ini b/tests/wpt/meta/trusted-types/ServiceWorker-block-eval-function-constructor.https.html.ini
new file mode 100644
index 00000000000..9383ec77095
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/ServiceWorker-block-eval-function-constructor.https.html.ini
@@ -0,0 +1,2 @@
+[ServiceWorker-block-eval-function-constructor.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/ServiceWorker-eval.https.html.ini b/tests/wpt/meta/trusted-types/ServiceWorker-eval.https.html.ini
new file mode 100644
index 00000000000..e17e41e3ec9
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/ServiceWorker-eval.https.html.ini
@@ -0,0 +1,2 @@
+[ServiceWorker-eval.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/ServiceWorker-importScripts.https.html.ini b/tests/wpt/meta/trusted-types/ServiceWorker-importScripts.https.html.ini
new file mode 100644
index 00000000000..2981335122a
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/ServiceWorker-importScripts.https.html.ini
@@ -0,0 +1,2 @@
+[ServiceWorker-importScripts.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/ServiceWorkerContainer-register-from-ServiceWorker.https.html.ini b/tests/wpt/meta/trusted-types/ServiceWorkerContainer-register-from-ServiceWorker.https.html.ini
new file mode 100644
index 00000000000..a23a080ab9a
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/ServiceWorkerContainer-register-from-ServiceWorker.https.html.ini
@@ -0,0 +1,2 @@
+[ServiceWorkerContainer-register-from-ServiceWorker.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/ServiceWorkerContainer-register-from-SharedWorker.https.html.ini b/tests/wpt/meta/trusted-types/ServiceWorkerContainer-register-from-SharedWorker.https.html.ini
new file mode 100644
index 00000000000..b8f26b3771f
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/ServiceWorkerContainer-register-from-SharedWorker.https.html.ini
@@ -0,0 +1,2 @@
+[ServiceWorkerContainer-register-from-SharedWorker.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/ServiceWorkerContainer-register.https.html.ini b/tests/wpt/meta/trusted-types/ServiceWorkerContainer-register.https.html.ini
new file mode 100644
index 00000000000..85f8b3676da
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/ServiceWorkerContainer-register.https.html.ini
@@ -0,0 +1,6 @@
+[ServiceWorkerContainer-register.https.html]
+  [Create ServiceWorker via ScriptTestUrl]
+    expected: FAIL
+
+  [Create ServiceWorker via string with default policy.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/SharedWorker-block-eval-function-constructor.html.ini b/tests/wpt/meta/trusted-types/SharedWorker-block-eval-function-constructor.html.ini
new file mode 100644
index 00000000000..6e6f7f6cc40
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/SharedWorker-block-eval-function-constructor.html.ini
@@ -0,0 +1,2 @@
+[SharedWorker-block-eval-function-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/SharedWorker-constructor.https.html.ini b/tests/wpt/meta/trusted-types/SharedWorker-constructor.https.html.ini
new file mode 100644
index 00000000000..d3f30c058d8
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/SharedWorker-constructor.https.html.ini
@@ -0,0 +1,9 @@
+[SharedWorker-constructor.https.html]
+  [Create SharedWorker via ScriptTestUrl]
+    expected: FAIL
+
+  [Block SharedWorker creation via string]
+    expected: FAIL
+
+  [Create SharedWorker via string with default policy.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/SharedWorker-eval.html.ini b/tests/wpt/meta/trusted-types/SharedWorker-eval.html.ini
new file mode 100644
index 00000000000..a6b5553db40
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/SharedWorker-eval.html.ini
@@ -0,0 +1,2 @@
+[SharedWorker-eval.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/SharedWorker-importScripts.html.ini b/tests/wpt/meta/trusted-types/SharedWorker-importScripts.html.ini
new file mode 100644
index 00000000000..30c5e0e0f9a
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/SharedWorker-importScripts.html.ini
@@ -0,0 +1,2 @@
+[SharedWorker-importScripts.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/SharedWorker-setTimeout-setInterval.html.ini b/tests/wpt/meta/trusted-types/SharedWorker-setTimeout-setInterval.html.ini
new file mode 100644
index 00000000000..3d1ebac63b1
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/SharedWorker-setTimeout-setInterval.html.ini
@@ -0,0 +1,2 @@
+[SharedWorker-setTimeout-setInterval.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/TrustedTypePolicyFactory-blocking.tentative.html.ini b/tests/wpt/meta/trusted-types/TrustedTypePolicyFactory-blocking.tentative.html.ini
new file mode 100644
index 00000000000..7453be794fc
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/TrustedTypePolicyFactory-blocking.tentative.html.ini
@@ -0,0 +1,12 @@
+[TrustedTypePolicyFactory-blocking.tentative.html]
+  [Block Trusted Type policy creation by event listener.]
+    expected: FAIL
+
+  [Trusted Type policy creation.]
+    expected: FAIL
+
+  [Block only default Trusted Type policy creation.]
+    expected: FAIL
+
+  [Policy creation called before addEventListener function will not reached the listener.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/TrustedTypePolicyFactory-getAttributeType-event-handler-content-attributes.tentative.html.ini b/tests/wpt/meta/trusted-types/TrustedTypePolicyFactory-getAttributeType-event-handler-content-attributes.tentative.html.ini
new file mode 100644
index 00000000000..9f3536bd6ab
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/TrustedTypePolicyFactory-getAttributeType-event-handler-content-attributes.tentative.html.ini
@@ -0,0 +1,2 @@
+[TrustedTypePolicyFactory-getAttributeType-event-handler-content-attributes.tentative.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/TrustedTypePolicyFactory-getAttributeType.html.ini b/tests/wpt/meta/trusted-types/TrustedTypePolicyFactory-getAttributeType.html.ini
new file mode 100644
index 00000000000..e442d6b4a42
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/TrustedTypePolicyFactory-getAttributeType.html.ini
@@ -0,0 +1,9 @@
+[TrustedTypePolicyFactory-getAttributeType.html]
+  [getAttributeType(\n          "DIV",\n          "onclick",\n          "http://www.w3.org/1999/xhtml",\n          "null") == "TrustedScript"]
+    expected: FAIL
+
+  [getAttributeType(\n          "g",\n          "ondblclick",\n          "http://www.w3.org/2000/svg",\n          "null") == "TrustedScript"]
+    expected: FAIL
+
+  [getAttributeType(\n          "mrow",\n          "onmousedown",\n          "http://www.w3.org/1998/Math/MathML",\n          "null") == "TrustedScript"]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/TrustedTypePolicyFactory-getPropertyType.tentative.html.ini b/tests/wpt/meta/trusted-types/TrustedTypePolicyFactory-getPropertyType.tentative.html.ini
new file mode 100644
index 00000000000..545aad66cfa
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/TrustedTypePolicyFactory-getPropertyType.tentative.html.ini
@@ -0,0 +1,9 @@
+[TrustedTypePolicyFactory-getPropertyType.tentative.html]
+  [sanity check trustedTypes.getAttributeType.]
+    expected: FAIL
+
+  [getAttributeType tests adapted from w3c/trusted-types polyfill]
+    expected: FAIL
+
+  [getPropertyType vs getAttributeType for event handler.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/Window-block-eval-function-constructor.html.ini b/tests/wpt/meta/trusted-types/Window-block-eval-function-constructor.html.ini
new file mode 100644
index 00000000000..529f46efb61
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/Window-block-eval-function-constructor.html.ini
@@ -0,0 +1,18 @@
+[Window-block-eval-function-constructor.html]
+  [Blocked eval in Window.]
+    expected: FAIL
+
+  [Blocked indirect eval in Window.]
+    expected: FAIL
+
+  [Blocked Function constructor in Window.]
+    expected: FAIL
+
+  [Blocked AsyncFunction constructor in Window.]
+    expected: FAIL
+
+  [Blocked GeneratorFunction constructor in Window.]
+    expected: FAIL
+
+  [Blocked AsyncGeneratorFunction constructor in Window.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/Window-setTimeout-setInterval.html.ini b/tests/wpt/meta/trusted-types/Window-setTimeout-setInterval.html.ini
new file mode 100644
index 00000000000..79f47cc8df2
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/Window-setTimeout-setInterval.html.ini
@@ -0,0 +1,7 @@
+[Window-setTimeout-setInterval.html]
+  expected: TIMEOUT
+  [Window.setTimeout assigned via default policy (successful Script transformation).]
+    expected: TIMEOUT
+
+  [Window.setInterval assigned via default policy (successful Script transformation).]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/trusted-types/block-Document-execCommand.html.ini b/tests/wpt/meta/trusted-types/block-Document-execCommand.html.ini
new file mode 100644
index 00000000000..5f5cff80d48
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/block-Document-execCommand.html.ini
@@ -0,0 +1,15 @@
+[block-Document-execCommand.html]
+  [Document.execCommand("insertHTML") works with a TrustedHTML argument.]
+    expected: FAIL
+
+  [Document.execCommand("paste") works as usual."]
+    expected: FAIL
+
+  [Document.execCommand("paste") works with a TrustedHTML argument.]
+    expected: FAIL
+
+  [Document.execCommand("insertHTML") works as usual with a default policy.]
+    expected: FAIL
+
+  [Document.execCommand("paste") works as usual with a default policy.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/block-string-assignment-to-DOMParser-parseFromString.html.ini b/tests/wpt/meta/trusted-types/block-string-assignment-to-DOMParser-parseFromString.html.ini
new file mode 100644
index 00000000000..e179b108038
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/block-string-assignment-to-DOMParser-parseFromString.html.ini
@@ -0,0 +1,9 @@
+[block-string-assignment-to-DOMParser-parseFromString.html]
+  [`document.innerText = string` throws.]
+    expected: FAIL
+
+  ['document.innerText = null' throws]
+    expected: FAIL
+
+  ['document.innerText = string' assigned via default policy (successful HTML transformation).]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/block-string-assignment-to-DedicatedWorker-setTimeout-setInterval.html.ini b/tests/wpt/meta/trusted-types/block-string-assignment-to-DedicatedWorker-setTimeout-setInterval.html.ini
new file mode 100644
index 00000000000..c2afecc1cb3
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/block-string-assignment-to-DedicatedWorker-setTimeout-setInterval.html.ini
@@ -0,0 +1,12 @@
+[block-string-assignment-to-DedicatedWorker-setTimeout-setInterval.html]
+  [`DedicatedWorkerGlobalScope.setTimeout(string)` throws.]
+    expected: FAIL
+
+  [`DedicatedWorkerGlobalScope.setTimeout(null)` throws.]
+    expected: FAIL
+
+  [`DedicatedWorkerGlobalScope.setInterval(string)` throws.]
+    expected: FAIL
+
+  [`DedicatedWorkerGlobalScope.setInterval(null)` throws.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/block-string-assignment-to-Document-parseHTMLUnsafe.html.ini b/tests/wpt/meta/trusted-types/block-string-assignment-to-Document-parseHTMLUnsafe.html.ini
new file mode 100644
index 00000000000..d13726af1de
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/block-string-assignment-to-Document-parseHTMLUnsafe.html.ini
@@ -0,0 +1,9 @@
+[block-string-assignment-to-Document-parseHTMLUnsafe.html]
+  [Document.parseHTMLUnsafe assigned via policy (successful HTML transformation).]
+    expected: FAIL
+
+  ['Document.parseHTMLUnsafe(string)' assigned via default policy (successful HTML transformation).]
+    expected: FAIL
+
+  ['Document.parseHTMLUnsafe(null)' assigned via default policy does not throw]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/block-string-assignment-to-Element-setAttribute.html.ini b/tests/wpt/meta/trusted-types/block-string-assignment-to-Element-setAttribute.html.ini
new file mode 100644
index 00000000000..0df917b86be
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/block-string-assignment-to-Element-setAttribute.html.ini
@@ -0,0 +1,27 @@
+[block-string-assignment-to-Element-setAttribute.html]
+  [script.src accepts only TrustedScriptURL]
+    expected: FAIL
+
+  [iframe.srcdoc accepts only TrustedHTML]
+    expected: FAIL
+
+  [div.onclick accepts only TrustedScript]
+    expected: FAIL
+
+  [`Script.prototype.setAttribute.SrC = string` throws.]
+    expected: FAIL
+
+  [script.src's mutationobservers receive the default policy's value.]
+    expected: FAIL
+
+  [iframe.srcdoc's mutationobservers receive the default policy's value.]
+    expected: FAIL
+
+  [div.onclick's mutationobservers receive the default policy's value.]
+    expected: FAIL
+
+  [div.onclick accepts string and null after default policy was created.]
+    expected: FAIL
+
+  [`script.src = setAttributeNode(embed.src)` with string works.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/block-string-assignment-to-Element-setAttributeNS.html.ini b/tests/wpt/meta/trusted-types/block-string-assignment-to-Element-setAttributeNS.html.ini
new file mode 100644
index 00000000000..c5bf59b26b1
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/block-string-assignment-to-Element-setAttributeNS.html.ini
@@ -0,0 +1,3 @@
+[block-string-assignment-to-Element-setAttributeNS.html]
+  [Blocking non-TrustedScriptURL assignment to <svg:script xlink:href=...> works]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/block-string-assignment-to-Range-createContextualFragment.html.ini b/tests/wpt/meta/trusted-types/block-string-assignment-to-Range-createContextualFragment.html.ini
new file mode 100644
index 00000000000..914c1989475
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/block-string-assignment-to-Range-createContextualFragment.html.ini
@@ -0,0 +1,9 @@
+[block-string-assignment-to-Range-createContextualFragment.html]
+  [`range.createContextualFragment(string)` throws.]
+    expected: FAIL
+
+  [`range.createContextualFragment(null)` throws.]
+    expected: FAIL
+
+  [`range.createContextualFragment(string)` assigned via default policy (successful HTML transformation).]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/block-string-assignment-to-ShadowRoot-innerHTML.html.ini b/tests/wpt/meta/trusted-types/block-string-assignment-to-ShadowRoot-innerHTML.html.ini
new file mode 100644
index 00000000000..57b499fd19c
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/block-string-assignment-to-ShadowRoot-innerHTML.html.ini
@@ -0,0 +1,9 @@
+[block-string-assignment-to-ShadowRoot-innerHTML.html]
+  [`shadowRoot.innerHTML = string` throws.]
+    expected: FAIL
+
+  [`shadowRoot.innerHTML = null` throws.]
+    expected: FAIL
+
+  [`shadowRoot.innerHTML = string` assigned via default policy (successful HTML transformation).]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/block-string-assignment-to-ShadowRoot-setHTMLUnsafe.html.ini b/tests/wpt/meta/trusted-types/block-string-assignment-to-ShadowRoot-setHTMLUnsafe.html.ini
new file mode 100644
index 00000000000..855ee5803f5
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/block-string-assignment-to-ShadowRoot-setHTMLUnsafe.html.ini
@@ -0,0 +1,9 @@
+[block-string-assignment-to-ShadowRoot-setHTMLUnsafe.html]
+  [`shadowRoot.setHTMLUnsafe(string)` assigned via default policy (successful HTML transformation).]
+    expected: FAIL
+
+  [`shadowRoot.setHTMLUnsafe(string)` throws.]
+    expected: FAIL
+
+  [`shadowRoot.setHTMLUnsafe(null)` throws.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/block-string-assignment-to-SharedWorker-setTimeout-setInterval.html.ini b/tests/wpt/meta/trusted-types/block-string-assignment-to-SharedWorker-setTimeout-setInterval.html.ini
new file mode 100644
index 00000000000..2222206c4dc
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/block-string-assignment-to-SharedWorker-setTimeout-setInterval.html.ini
@@ -0,0 +1,2 @@
+[block-string-assignment-to-SharedWorker-setTimeout-setInterval.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/block-string-assignment-to-Window-setTimeout-setInterval.html.ini b/tests/wpt/meta/trusted-types/block-string-assignment-to-Window-setTimeout-setInterval.html.ini
new file mode 100644
index 00000000000..972b54da7ba
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/block-string-assignment-to-Window-setTimeout-setInterval.html.ini
@@ -0,0 +1,13 @@
+[block-string-assignment-to-Window-setTimeout-setInterval.html]
+  expected: ERROR
+  [`Window.setTimeout(string)` throws.]
+    expected: FAIL
+
+  [`Window.setTimeout(null)` throws.]
+    expected: FAIL
+
+  [`Window.setInterval(string)` throws.]
+    expected: FAIL
+
+  [`Window.setInterval(null)` throws.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/block-string-assignment-to-attribute-via-attribute-node.html.ini b/tests/wpt/meta/trusted-types/block-string-assignment-to-attribute-via-attribute-node.html.ini
new file mode 100644
index 00000000000..24bc8faca55
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/block-string-assignment-to-attribute-via-attribute-node.html.ini
@@ -0,0 +1,18 @@
+[block-string-assignment-to-attribute-via-attribute-node.html]
+  [Set script.src via textContent]
+    expected: FAIL
+
+  [Set script.src via nodeValue]
+    expected: FAIL
+
+  [Set iframe.srcdoc via textContent]
+    expected: FAIL
+
+  [Set iframe.srcdoc via nodeValue]
+    expected: FAIL
+
+  [Set div.onclick via textContent]
+    expected: FAIL
+
+  [Set div.onclick via nodeValue]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/block-text-node-insertion-into-script-element.html.ini b/tests/wpt/meta/trusted-types/block-text-node-insertion-into-script-element.html.ini
new file mode 100644
index 00000000000..34f64b9ef70
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/block-text-node-insertion-into-script-element.html.ini
@@ -0,0 +1,19 @@
+[block-text-node-insertion-into-script-element.html]
+  expected: ERROR
+  [Regression test: Bypass via insertAdjacentText, initial comment.]
+    expected: FAIL
+
+  [Regression test: Bypass via insertAdjacentText, textContent.]
+    expected: FAIL
+
+  [Spot tests around script + innerHTML interaction.]
+    expected: FAIL
+
+  [Test that default policy applies.]
+    expected: FAIL
+
+  [Test a failing default policy.]
+    expected: FAIL
+
+  [Spot tests around script + innerHTML interaction with default policy.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/block-text-node-insertion-into-svg-script-element.html.ini b/tests/wpt/meta/trusted-types/block-text-node-insertion-into-svg-script-element.html.ini
new file mode 100644
index 00000000000..e0fbb2a6064
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/block-text-node-insertion-into-svg-script-element.html.ini
@@ -0,0 +1,12 @@
+[block-text-node-insertion-into-svg-script-element.html]
+  [Spot tests around script + innerHTML interaction.]
+    expected: FAIL
+
+  [Test that default policy applies. svg:script]
+    expected: FAIL
+
+  [Test a failing default policy. svg:script]
+    expected: FAIL
+
+  [Spot tests around script + innerHTML interaction with default policy.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/csp-block-eval.html.ini b/tests/wpt/meta/trusted-types/csp-block-eval.html.ini
new file mode 100644
index 00000000000..9ddd556ee01
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/csp-block-eval.html.ini
@@ -0,0 +1,3 @@
+[csp-block-eval.html]
+  [eval with TrustedScript throws (script-src blocks).]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/default-policy-report-only.html.ini b/tests/wpt/meta/trusted-types/default-policy-report-only.html.ini
new file mode 100644
index 00000000000..9e3da0bd494
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/default-policy-report-only.html.ini
@@ -0,0 +1,31 @@
+[default-policy-report-only.html]
+  expected: TIMEOUT
+  [Count SecurityPolicyViolation events.]
+    expected: TIMEOUT
+
+  [script.src default]
+    expected: FAIL
+
+  [script.src throw]
+    expected: FAIL
+
+  [script.src typeerror]
+    expected: FAIL
+
+  [div.innerHTML default]
+    expected: FAIL
+
+  [div.innerHTML throw]
+    expected: FAIL
+
+  [div.innerHTML typeerror]
+    expected: FAIL
+
+  [script.text default]
+    expected: FAIL
+
+  [script.text throw]
+    expected: FAIL
+
+  [script.text typeerror]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/empty-default-policy-report-only.html.ini b/tests/wpt/meta/trusted-types/empty-default-policy-report-only.html.ini
new file mode 100644
index 00000000000..4400ae8a1b3
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/empty-default-policy-report-only.html.ini
@@ -0,0 +1,4 @@
+[empty-default-policy-report-only.html]
+  expected: TIMEOUT
+  [Count SecurityPolicyViolation events.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/trusted-types/eval-csp-no-tt.html.ini b/tests/wpt/meta/trusted-types/eval-csp-no-tt.html.ini
new file mode 100644
index 00000000000..473c4131592
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/eval-csp-no-tt.html.ini
@@ -0,0 +1,6 @@
+[eval-csp-no-tt.html]
+  [eval of TrustedScript works.]
+    expected: FAIL
+
+  [indirect eval of TrustedScript works.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/eval-csp-tt-default-policy-mutate.html.ini b/tests/wpt/meta/trusted-types/eval-csp-tt-default-policy-mutate.html.ini
new file mode 100644
index 00000000000..f3fb6a4ce2b
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/eval-csp-tt-default-policy-mutate.html.ini
@@ -0,0 +1,18 @@
+[eval-csp-tt-default-policy-mutate.html]
+  [eval of string where default policy mutates value throws.]
+    expected: FAIL
+
+  [indirect eval of string where default policy mutates value throws.]
+    expected: FAIL
+
+  [Function constructor with string where default policy mutates value throws.]
+    expected: FAIL
+
+  [AsyncFunction constructor with string where default policy mutates value throws.]
+    expected: FAIL
+
+  [GeneratorFunction constructor with string where default policy mutates value throws.]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with string where default policy mutates value throws.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/eval-csp-tt-default-policy.html.ini b/tests/wpt/meta/trusted-types/eval-csp-tt-default-policy.html.ini
new file mode 100644
index 00000000000..8dfe5f644f6
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/eval-csp-tt-default-policy.html.ini
@@ -0,0 +1,6 @@
+[eval-csp-tt-default-policy.html]
+  [eval of TrustedScript works.]
+    expected: FAIL
+
+  [indirect eval of TrustedScript works.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/eval-csp-tt-no-default-policy.html.ini b/tests/wpt/meta/trusted-types/eval-csp-tt-no-default-policy.html.ini
new file mode 100644
index 00000000000..877f1b2ff92
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/eval-csp-tt-no-default-policy.html.ini
@@ -0,0 +1,30 @@
+[eval-csp-tt-no-default-policy.html]
+  [eval of TrustedScript works.]
+    expected: FAIL
+
+  [indirect eval of TrustedScript works.]
+    expected: FAIL
+
+  [eval of string fails.]
+    expected: FAIL
+
+  [indirect eval of string fails.]
+    expected: FAIL
+
+  [Function constructor of string fails.]
+    expected: FAIL
+
+  [Function constructor of all strings fails.]
+    expected: FAIL
+
+  [Function constructor of string and TrustedScript fails.]
+    expected: FAIL
+
+  [AsyncFunction constructor of string fails.]
+    expected: FAIL
+
+  [GeneratorFunction constructor of string fails.]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor of string fails.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/eval-function-constructor-untrusted-arguments-and-applying-default-policy.html.ini b/tests/wpt/meta/trusted-types/eval-function-constructor-untrusted-arguments-and-applying-default-policy.html.ini
new file mode 100644
index 00000000000..c7f3467cfcf
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/eval-function-constructor-untrusted-arguments-and-applying-default-policy.html.ini
@@ -0,0 +1,24 @@
+[eval-function-constructor-untrusted-arguments-and-applying-default-policy.html]
+  [plain string at index 0 (default policy modifying the function text).]
+    expected: FAIL
+
+  [plain string at index 1 (default policy modifying the function text).]
+    expected: FAIL
+
+  [plain string at index 2 (default policy modifying the function text).]
+    expected: FAIL
+
+  [plain string at index 3 (default policy modifying the function text).]
+    expected: FAIL
+
+  [TrustedScript with forged toString() at index 0 (default policy modifying the function text).]
+    expected: FAIL
+
+  [TrustedScript with forged toString() at index 1 (default policy modifying the function text).]
+    expected: FAIL
+
+  [TrustedScript with forged toString() at index 2 (default policy modifying the function text).]
+    expected: FAIL
+
+  [TrustedScript with forged toString() at index 3 (default policy modifying the function text).]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/eval-function-constructor-untrusted-arguments-and-default-policy-throwing.html.ini b/tests/wpt/meta/trusted-types/eval-function-constructor-untrusted-arguments-and-default-policy-throwing.html.ini
new file mode 100644
index 00000000000..e2c6e2ae7c5
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/eval-function-constructor-untrusted-arguments-and-default-policy-throwing.html.ini
@@ -0,0 +1,6 @@
+[eval-function-constructor-untrusted-arguments-and-default-policy-throwing.html]
+  [EvalError thrown if the callback of the default policy throws an error (eval).]
+    expected: FAIL
+
+  [EvalError thrown if the callback of the default policy throws an error (new Function).]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/eval-function-constructor.html.ini b/tests/wpt/meta/trusted-types/eval-function-constructor.html.ini
new file mode 100644
index 00000000000..e6887ccc219
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/eval-function-constructor.html.ini
@@ -0,0 +1,192 @@
+[eval-function-constructor.html]
+  [Function constructor with mixed plain and trusted strings, mask #0]
+    expected: FAIL
+
+  [AsyncFunction constructor with mixed plain and trusted strings, mask #0]
+    expected: FAIL
+
+  [GeneratorFunction constructor with mixed plain and trusted strings, mask #0]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with mixed plain and trusted strings, mask #0]
+    expected: FAIL
+
+  [Function constructor with mixed plain and trusted strings, mask #1]
+    expected: FAIL
+
+  [AsyncFunction constructor with mixed plain and trusted strings, mask #1]
+    expected: FAIL
+
+  [GeneratorFunction constructor with mixed plain and trusted strings, mask #1]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with mixed plain and trusted strings, mask #1]
+    expected: FAIL
+
+  [Function constructor with mixed plain and trusted strings, mask #2]
+    expected: FAIL
+
+  [AsyncFunction constructor with mixed plain and trusted strings, mask #2]
+    expected: FAIL
+
+  [GeneratorFunction constructor with mixed plain and trusted strings, mask #2]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with mixed plain and trusted strings, mask #2]
+    expected: FAIL
+
+  [Function constructor with mixed plain and trusted strings, mask #3]
+    expected: FAIL
+
+  [AsyncFunction constructor with mixed plain and trusted strings, mask #3]
+    expected: FAIL
+
+  [GeneratorFunction constructor with mixed plain and trusted strings, mask #3]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with mixed plain and trusted strings, mask #3]
+    expected: FAIL
+
+  [Function constructor with mixed plain and trusted strings, mask #4]
+    expected: FAIL
+
+  [AsyncFunction constructor with mixed plain and trusted strings, mask #4]
+    expected: FAIL
+
+  [GeneratorFunction constructor with mixed plain and trusted strings, mask #4]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with mixed plain and trusted strings, mask #4]
+    expected: FAIL
+
+  [Function constructor with mixed plain and trusted strings, mask #5]
+    expected: FAIL
+
+  [AsyncFunction constructor with mixed plain and trusted strings, mask #5]
+    expected: FAIL
+
+  [GeneratorFunction constructor with mixed plain and trusted strings, mask #5]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with mixed plain and trusted strings, mask #5]
+    expected: FAIL
+
+  [Function constructor with mixed plain and trusted strings, mask #6]
+    expected: FAIL
+
+  [AsyncFunction constructor with mixed plain and trusted strings, mask #6]
+    expected: FAIL
+
+  [GeneratorFunction constructor with mixed plain and trusted strings, mask #6]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with mixed plain and trusted strings, mask #6]
+    expected: FAIL
+
+  [Function constructor with mixed plain and trusted strings, mask #7]
+    expected: FAIL
+
+  [AsyncFunction constructor with mixed plain and trusted strings, mask #7]
+    expected: FAIL
+
+  [GeneratorFunction constructor with mixed plain and trusted strings, mask #7]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with mixed plain and trusted strings, mask #7]
+    expected: FAIL
+
+  [Function constructor with mixed plain and trusted strings, mask #8]
+    expected: FAIL
+
+  [AsyncFunction constructor with mixed plain and trusted strings, mask #8]
+    expected: FAIL
+
+  [GeneratorFunction constructor with mixed plain and trusted strings, mask #8]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with mixed plain and trusted strings, mask #8]
+    expected: FAIL
+
+  [Function constructor with mixed plain and trusted strings, mask #9]
+    expected: FAIL
+
+  [AsyncFunction constructor with mixed plain and trusted strings, mask #9]
+    expected: FAIL
+
+  [GeneratorFunction constructor with mixed plain and trusted strings, mask #9]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with mixed plain and trusted strings, mask #9]
+    expected: FAIL
+
+  [Function constructor with mixed plain and trusted strings, mask #10]
+    expected: FAIL
+
+  [AsyncFunction constructor with mixed plain and trusted strings, mask #10]
+    expected: FAIL
+
+  [GeneratorFunction constructor with mixed plain and trusted strings, mask #10]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with mixed plain and trusted strings, mask #10]
+    expected: FAIL
+
+  [Function constructor with mixed plain and trusted strings, mask #11]
+    expected: FAIL
+
+  [AsyncFunction constructor with mixed plain and trusted strings, mask #11]
+    expected: FAIL
+
+  [GeneratorFunction constructor with mixed plain and trusted strings, mask #11]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with mixed plain and trusted strings, mask #11]
+    expected: FAIL
+
+  [Function constructor with mixed plain and trusted strings, mask #12]
+    expected: FAIL
+
+  [AsyncFunction constructor with mixed plain and trusted strings, mask #12]
+    expected: FAIL
+
+  [GeneratorFunction constructor with mixed plain and trusted strings, mask #12]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with mixed plain and trusted strings, mask #12]
+    expected: FAIL
+
+  [Function constructor with mixed plain and trusted strings, mask #13]
+    expected: FAIL
+
+  [AsyncFunction constructor with mixed plain and trusted strings, mask #13]
+    expected: FAIL
+
+  [GeneratorFunction constructor with mixed plain and trusted strings, mask #13]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with mixed plain and trusted strings, mask #13]
+    expected: FAIL
+
+  [Function constructor with mixed plain and trusted strings, mask #14]
+    expected: FAIL
+
+  [AsyncFunction constructor with mixed plain and trusted strings, mask #14]
+    expected: FAIL
+
+  [GeneratorFunction constructor with mixed plain and trusted strings, mask #14]
+    expected: FAIL
+
+  [AsyncGeneratorFunction constructor with mixed plain and trusted strings, mask #14]
+    expected: FAIL
+
+  [Function constructor with trusted strings, and a forged toString() for the one at index 0]
+    expected: FAIL
+
+  [Function constructor with trusted strings, and a forged toString() for the one at index 1]
+    expected: FAIL
+
+  [Function constructor with trusted strings, and a forged toString() for the one at index 2]
+    expected: FAIL
+
+  [Function constructor with trusted strings, and a forged toString() for the one at index 3]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/eval-no-csp-no-tt-default-policy.html.ini b/tests/wpt/meta/trusted-types/eval-no-csp-no-tt-default-policy.html.ini
new file mode 100644
index 00000000000..228f3da636d
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/eval-no-csp-no-tt-default-policy.html.ini
@@ -0,0 +1,6 @@
+[eval-no-csp-no-tt-default-policy.html]
+  [eval of TrustedScript works.]
+    expected: FAIL
+
+  [indirect eval of TrustedScript works.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/eval-no-csp-no-tt.html.ini b/tests/wpt/meta/trusted-types/eval-no-csp-no-tt.html.ini
new file mode 100644
index 00000000000..00bc7a18dd6
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/eval-no-csp-no-tt.html.ini
@@ -0,0 +1,6 @@
+[eval-no-csp-no-tt.html]
+  [eval of TrustedScript works.]
+    expected: FAIL
+
+  [indirect eval of TrustedScript works.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/eval-with-permissive-csp.html.ini b/tests/wpt/meta/trusted-types/eval-with-permissive-csp.html.ini
new file mode 100644
index 00000000000..9091a3e7216
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/eval-with-permissive-csp.html.ini
@@ -0,0 +1,15 @@
+[eval-with-permissive-csp.html]
+  [eval with plain string with Trusted Types and permissive CSP throws (no type).]
+    expected: FAIL
+
+  [indirect eval with plain string with Trusted Types and permissive CSP throws (no type).]
+    expected: FAIL
+
+  [Function constructor with plain string with Trusted Types and permissive CSP throws (no type).]
+    expected: FAIL
+
+  [eval with TrustedScript and permissive CSP works.]
+    expected: FAIL
+
+  [indirect eval with TrustedScript and permissive CSP works.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/inheriting-csp-for-local-schemes.html.ini b/tests/wpt/meta/trusted-types/inheriting-csp-for-local-schemes.html.ini
new file mode 100644
index 00000000000..aae35695ee7
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/inheriting-csp-for-local-schemes.html.ini
@@ -0,0 +1,31 @@
+[inheriting-csp-for-local-schemes.html]
+  expected: TIMEOUT
+  [require-trusted-types-for directive should be inherited in local srcdoc frames]
+    expected: TIMEOUT
+
+  [trusted-types directive should be inherited in local srcdoc frames]
+    expected: NOTRUN
+
+  [require-trusted-types-for directive should be inherited in local data frames]
+    expected: NOTRUN
+
+  [trusted-types directive should be inherited in local data frames]
+    expected: NOTRUN
+
+  [require-trusted-types-for directive should be inherited in local blob frames]
+    expected: NOTRUN
+
+  [trusted-types directive should be inherited in local blob frames]
+    expected: NOTRUN
+
+  [require-trusted-types-for directive should be inherited in local about:blank frames]
+    expected: NOTRUN
+
+  [trusted-types directive should be inherited in local about:blank frames]
+    expected: NOTRUN
+
+  [require-trusted-types-for directive should not be inherited in local blank.html frames]
+    expected: NOTRUN
+
+  [trusted-types directive should not be inherited in local blank.html frames]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/trusted-types/modify-attributes-in-callback.html.ini b/tests/wpt/meta/trusted-types/modify-attributes-in-callback.html.ini
new file mode 100644
index 00000000000..6b7b2ea022d
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/modify-attributes-in-callback.html.ini
@@ -0,0 +1,6 @@
+[modify-attributes-in-callback.html]
+  [Ensure setAttributeNode throws InUseAttributeError when callback assigns attributes.]
+    expected: FAIL
+
+  [Ensure setAttributeNodeNS throws InUseAttributeError when callback assigns attributes.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/require-trusted-types-for-TypeError-belongs-to-the-global-object-realm.html.ini b/tests/wpt/meta/trusted-types/require-trusted-types-for-TypeError-belongs-to-the-global-object-realm.html.ini
new file mode 100644
index 00000000000..63099aaaaff
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/require-trusted-types-for-TypeError-belongs-to-the-global-object-realm.html.ini
@@ -0,0 +1,3 @@
+[require-trusted-types-for-TypeError-belongs-to-the-global-object-realm.html]
+  [Setting innerHTML on a node adopted from a subframe.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/set-attributes-mutations-in-callback.tentative.html.ini b/tests/wpt/meta/trusted-types/set-attributes-mutations-in-callback.tentative.html.ini
new file mode 100644
index 00000000000..07e55bdc199
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/set-attributes-mutations-in-callback.tentative.html.ini
@@ -0,0 +1,744 @@
+[set-attributes-mutations-in-callback.tentative.html]
+  [Element.setAttribute works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete other attribute before)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete other attribute before)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete other attribute before)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete other attribute before)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete other attribute before)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete other attribute before)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete other attribute before)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete other attribute before)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete other attribute before)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete other attribute before)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete other attribute before)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete other attribute before)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete other attribute before)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete other attribute before)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete other attribute before)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete other attribute before)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete other attribute before)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete other attribute before)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete other attribute before)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete other attribute before)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete other attribute before)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete other attribute before)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete other attribute before)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete other attribute before)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete other attribute before)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete other attribute before)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete attribute)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete attribute)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete attribute)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete attribute)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete attribute)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete attribute)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete attribute)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete attribute)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete attribute)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete attribute)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (delete attribute)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (delete attribute)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (delete attribute)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (delete attribute)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (delete attribute)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (delete attribute)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (modify attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (modify attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (modify attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (modify attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (modify attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (modify attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (modify attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (modify attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (modify attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (modify attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (modify attribute)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (modify attribute)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (modify attribute)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (modify attribute)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (modify attribute)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (modify attribute)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (modify attribute)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (modify attribute)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (modify attribute)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (modify attribute)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (modify attribute)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (modify attribute)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (modify attribute)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (modify attribute)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (modify attribute)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (modify attribute)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttribute works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNode works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (move attribute node to another element)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (move attribute node to another element)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (move attribute node to another element)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (move attribute node to another element)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (move attribute node to another element)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (move attribute node to another element)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (move attribute node to another element)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (move attribute node to another element)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (move attribute node to another element)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (move attribute node to another element)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (move attribute node to another element)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (move attribute node to another element)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (move attribute node to another element)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (move attribute node to another element)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (move attribute node to another element)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [Attr.value works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (move attribute node to another element)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (move attribute node to another element)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (move attribute node to another element)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (move attribute node to another element)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (move attribute node to another element)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [Node.nodeValue works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick (move attribute node to another element)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick (move attribute node to another element)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown (move attribute node to another element)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc (move attribute node to another element)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src (move attribute node to another element)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href (move attribute node to another element)]
+    expected: FAIL
+
+  [Node.textContent works for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href (move attribute node to another element)]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/set-attributes-require-trusted-types-default-policy.html.ini b/tests/wpt/meta/trusted-types/set-attributes-require-trusted-types-default-policy.html.ini
new file mode 100644
index 00000000000..ed7a3e60f80
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/set-attributes-require-trusted-types-default-policy.html.ini
@@ -0,0 +1,333 @@
+[set-attributes-require-trusted-types-default-policy.html]
+  [Element.setAttribute applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick]
+    expected: FAIL
+
+  [Element.setAttribute applies default policy for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick]
+    expected: FAIL
+
+  [Element.setAttribute applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown]
+    expected: FAIL
+
+  [Element.setAttribute applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc]
+    expected: FAIL
+
+  [Element.setAttribute applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src]
+    expected: FAIL
+
+  [Element.setAttribute applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href]
+    expected: FAIL
+
+  [Element.setAttributeNS applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick]
+    expected: FAIL
+
+  [Element.setAttributeNS applies default policy for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick]
+    expected: FAIL
+
+  [Element.setAttributeNS applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown]
+    expected: FAIL
+
+  [Element.setAttributeNS applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc]
+    expected: FAIL
+
+  [Element.setAttributeNS applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src]
+    expected: FAIL
+
+  [Element.setAttributeNS applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href]
+    expected: FAIL
+
+  [Element.setAttributeNS applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href]
+    expected: FAIL
+
+  [Element.setAttributeNode applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick]
+    expected: FAIL
+
+  [Element.setAttributeNode applies default policy for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick]
+    expected: FAIL
+
+  [Element.setAttributeNode applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown]
+    expected: FAIL
+
+  [Element.setAttributeNode applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc]
+    expected: FAIL
+
+  [Element.setAttributeNode applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src]
+    expected: FAIL
+
+  [Element.setAttributeNode applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href]
+    expected: FAIL
+
+  [Element.setAttributeNode applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS applies default policy for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem applies default policy for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS applies default policy for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href]
+    expected: FAIL
+
+  [Attr.value applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick]
+    expected: FAIL
+
+  [Attr.value applies default policy for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick]
+    expected: FAIL
+
+  [Attr.value applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown]
+    expected: FAIL
+
+  [Attr.value applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc]
+    expected: FAIL
+
+  [Attr.value applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src]
+    expected: FAIL
+
+  [Attr.value applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href]
+    expected: FAIL
+
+  [Attr.value applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href]
+    expected: FAIL
+
+  [Node.nodeValue applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick]
+    expected: FAIL
+
+  [Node.nodeValue applies default policy for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick]
+    expected: FAIL
+
+  [Node.nodeValue applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown]
+    expected: FAIL
+
+  [Node.nodeValue applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc]
+    expected: FAIL
+
+  [Node.nodeValue applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src]
+    expected: FAIL
+
+  [Node.nodeValue applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href]
+    expected: FAIL
+
+  [Node.nodeValue applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href]
+    expected: FAIL
+
+  [Node.textContent applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV, attrName=onclick]
+    expected: FAIL
+
+  [Node.textContent applies default policy for elementNS=http://www.w3.org/2000/svg, element=g, attrName=ondblclick]
+    expected: FAIL
+
+  [Node.textContent applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow, attrName=onmousedown]
+    expected: FAIL
+
+  [Node.textContent applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME, attrName=srcdoc]
+    expected: FAIL
+
+  [Node.textContent applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT, attrName=src]
+    expected: FAIL
+
+  [Node.textContent applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrName=href]
+    expected: FAIL
+
+  [Node.textContent applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink, attrName=href]
+    expected: FAIL
+
+  [Element.setAttributeNode applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick and a TrustedScript input.]
+    expected: FAIL
+
+  [Element.setAttributeNode applies default policy for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick and a TrustedScript input.]
+    expected: FAIL
+
+  [Element.setAttributeNode applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown and a TrustedScript input.]
+    expected: FAIL
+
+  [Element.setAttributeNode applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc and a TrustedHTML input.]
+    expected: FAIL
+
+  [Element.setAttributeNode applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Element.setAttributeNode applies default policy for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Element.setAttributeNode applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick and a TrustedScript input.]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS applies default policy for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick and a TrustedScript input.]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown and a TrustedScript input.]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc and a TrustedHTML input.]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS applies default policy for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick and a TrustedScript input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem applies default policy for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick and a TrustedScript input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown and a TrustedScript input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc and a TrustedHTML input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem applies default policy for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick and a TrustedScript input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS applies default policy for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick and a TrustedScript input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown and a TrustedScript input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc and a TrustedHTML input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS applies default policy for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Attr.value applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick and a TrustedScript input.]
+    expected: FAIL
+
+  [Attr.value applies default policy for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick and a TrustedScript input.]
+    expected: FAIL
+
+  [Attr.value applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown and a TrustedScript input.]
+    expected: FAIL
+
+  [Attr.value applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc and a TrustedHTML input.]
+    expected: FAIL
+
+  [Attr.value applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Attr.value applies default policy for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Attr.value applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Node.nodeValue applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick and a TrustedScript input.]
+    expected: FAIL
+
+  [Node.nodeValue applies default policy for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick and a TrustedScript input.]
+    expected: FAIL
+
+  [Node.nodeValue applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown and a TrustedScript input.]
+    expected: FAIL
+
+  [Node.nodeValue applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc and a TrustedHTML input.]
+    expected: FAIL
+
+  [Node.nodeValue applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Node.nodeValue applies default policy for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Node.nodeValue applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Node.textContent applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick and a TrustedScript input.]
+    expected: FAIL
+
+  [Node.textContent applies default policy for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick and a TrustedScript input.]
+    expected: FAIL
+
+  [Node.textContent applies default policy for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown and a TrustedScript input.]
+    expected: FAIL
+
+  [Node.textContent applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc and a TrustedHTML input.]
+    expected: FAIL
+
+  [Node.textContent applies default policy for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Node.textContent applies default policy for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href and a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Node.textContent applies default policy for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href and a TrustedScriptURL input.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/set-attributes-require-trusted-types-no-default-policy.html.ini b/tests/wpt/meta/trusted-types/set-attributes-require-trusted-types-no-default-policy.html.ini
new file mode 100644
index 00000000000..d909e5f1d16
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/set-attributes-require-trusted-types-no-default-policy.html.ini
@@ -0,0 +1,333 @@
+[set-attributes-require-trusted-types-no-default-policy.html]
+  [Element.setAttribute throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a plain string]
+    expected: FAIL
+
+  [Element.setAttribute throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a plain string]
+    expected: FAIL
+
+  [Element.setAttribute throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a plain string]
+    expected: FAIL
+
+  [Element.setAttribute throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a plain string]
+    expected: FAIL
+
+  [Element.setAttribute throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a plain string]
+    expected: FAIL
+
+  [Element.setAttribute throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNS throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNS throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNS throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNS throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNS throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNS throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNS throws for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNode throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNode throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNode throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNode throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNode throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNode throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNode throws for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS throws for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href with a plain string]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a plain string]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a plain string]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a plain string]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a plain string]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a plain string]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a plain string]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem throws for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href with a plain string]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a plain string]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a plain string]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a plain string]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a plain string]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a plain string]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a plain string]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS throws for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href with a plain string]
+    expected: FAIL
+
+  [Attr.value throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a plain string]
+    expected: FAIL
+
+  [Attr.value throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a plain string]
+    expected: FAIL
+
+  [Attr.value throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a plain string]
+    expected: FAIL
+
+  [Attr.value throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a plain string]
+    expected: FAIL
+
+  [Attr.value throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a plain string]
+    expected: FAIL
+
+  [Attr.value throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a plain string]
+    expected: FAIL
+
+  [Attr.value throws for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href with a plain string]
+    expected: FAIL
+
+  [Node.nodeValue throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a plain string]
+    expected: FAIL
+
+  [Node.nodeValue throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a plain string]
+    expected: FAIL
+
+  [Node.nodeValue throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a plain string]
+    expected: FAIL
+
+  [Node.nodeValue throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a plain string]
+    expected: FAIL
+
+  [Node.nodeValue throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a plain string]
+    expected: FAIL
+
+  [Node.nodeValue throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a plain string]
+    expected: FAIL
+
+  [Node.nodeValue throws for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href with a plain string]
+    expected: FAIL
+
+  [Node.textContent throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a plain string]
+    expected: FAIL
+
+  [Node.textContent throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a plain string]
+    expected: FAIL
+
+  [Node.textContent throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a plain string]
+    expected: FAIL
+
+  [Node.textContent throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a plain string]
+    expected: FAIL
+
+  [Node.textContent throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a plain string]
+    expected: FAIL
+
+  [Node.textContent throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a plain string]
+    expected: FAIL
+
+  [Node.textContent throws for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href with a plain string]
+    expected: FAIL
+
+  [Element.setAttributeNode throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a TrustedScript input.]
+    expected: FAIL
+
+  [Element.setAttributeNode throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a TrustedScript input.]
+    expected: FAIL
+
+  [Element.setAttributeNode throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a TrustedScript input.]
+    expected: FAIL
+
+  [Element.setAttributeNode throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a TrustedHTML input.]
+    expected: FAIL
+
+  [Element.setAttributeNode throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Element.setAttributeNode throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Element.setAttributeNode throws for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a TrustedScript input.]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a TrustedScript input.]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a TrustedScript input.]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a TrustedHTML input.]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Element.setAttributeNodeNS throws for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a TrustedScript input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a TrustedScript input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a TrustedScript input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a TrustedHTML input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItem throws for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a TrustedScript input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a TrustedScript input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a TrustedScript input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a TrustedHTML input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [NamedNodeMap.setNamedItemNS throws for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Attr.value throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a TrustedScript input.]
+    expected: FAIL
+
+  [Attr.value throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a TrustedScript input.]
+    expected: FAIL
+
+  [Attr.value throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a TrustedScript input.]
+    expected: FAIL
+
+  [Attr.value throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a TrustedHTML input.]
+    expected: FAIL
+
+  [Attr.value throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Attr.value throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Attr.value throws for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Node.nodeValue throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a TrustedScript input.]
+    expected: FAIL
+
+  [Node.nodeValue throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a TrustedScript input.]
+    expected: FAIL
+
+  [Node.nodeValue throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a TrustedScript input.]
+    expected: FAIL
+
+  [Node.nodeValue throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a TrustedHTML input.]
+    expected: FAIL
+
+  [Node.nodeValue throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Node.nodeValue throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Node.nodeValue throws for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Node.textContent throws for elementNS=http://www.w3.org/1999/xhtml, element=DIV,  attrName=onclick with a TrustedScript input.]
+    expected: FAIL
+
+  [Node.textContent throws for elementNS=http://www.w3.org/2000/svg, element=g,  attrName=ondblclick with a TrustedScript input.]
+    expected: FAIL
+
+  [Node.textContent throws for elementNS=http://www.w3.org/1998/Math/MathML, element=mrow,  attrName=onmousedown with a TrustedScript input.]
+    expected: FAIL
+
+  [Node.textContent throws for elementNS=http://www.w3.org/1999/xhtml, element=IFRAME,  attrName=srcdoc with a TrustedHTML input.]
+    expected: FAIL
+
+  [Node.textContent throws for elementNS=http://www.w3.org/1999/xhtml, element=SCRIPT,  attrName=src with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Node.textContent throws for elementNS=http://www.w3.org/2000/svg, element=script,  attrName=href with a TrustedScriptURL input.]
+    expected: FAIL
+
+  [Node.textContent throws for elementNS=http://www.w3.org/2000/svg, element=script, attrNS=http://www.w3.org/1999/xlink,  attrName=href with a TrustedScriptURL input.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/set-event-handlers-content-attributes.tentative.html.ini b/tests/wpt/meta/trusted-types/set-event-handlers-content-attributes.tentative.html.ini
new file mode 100644
index 00000000000..190d602c91a
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/set-event-handlers-content-attributes.tentative.html.ini
@@ -0,0 +1,2 @@
+[set-event-handlers-content-attributes.tentative.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-001.html.ini b/tests/wpt/meta/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-001.html.ini
new file mode 100644
index 00000000000..d3218647e91
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-001.html.ini
@@ -0,0 +1,31 @@
+[should-sink-type-mismatch-violation-be-blocked-by-csp-001.html]
+  expected: TIMEOUT
+  [directive "require-trusted-types-for 'script'%09'script'%0A'script'%0C'script'%0D'script'%20'script'" (required-ascii-whitespace)]
+    expected: TIMEOUT
+
+  [invalid directive "require-trusted-types-for 'script''script'" (no ascii-whitespace)]
+    expected: NOTRUN
+
+  [directive "require-trusted-types-for 'script' 'invalid'" (unknown sink group)]
+    expected: NOTRUN
+
+  [directive "require-trusted-types-for 'invalid' 'script'" (unknown sink group)]
+    expected: NOTRUN
+
+  [directive "require-trusted-types-for 'invalid' 'script' 'also-invalid" (unknown sink group)]
+    expected: NOTRUN
+
+  [directive "require-trusted-types-for unquoted-invalid 'script' also-unquoted-invalid (unknown sink group)]
+    expected: NOTRUN
+
+  [directive "require-trusted-types-for 'invalid'%0A%20'script'" (required-ascii-whitespace)]
+    expected: TIMEOUT
+
+  [directive "require-trusted-types-for 'invalid'%0C'script'" (required-ascii-whitespace)]
+    expected: NOTRUN
+
+  [directive "require-trusted-types-for 'invalid'%0D'script'" (required-ascii-whitespace)]
+    expected: NOTRUN
+
+  [directive "require-trusted-types-for 'invalid'%20'script'" (required-ascii-whitespace)]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker.html.ini b/tests/wpt/meta/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker.html.ini
new file mode 100644
index 00000000000..ee46bfc3d0e
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker.html.ini
@@ -0,0 +1,6 @@
+[should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker.html]
+  [Checking reported violations for setTimeout(';;;;;') from DedicatedWorker]
+    expected: FAIL
+
+  [Location of required-trusted-types-for violations.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-003.html.ini b/tests/wpt/meta/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-003.html.ini
new file mode 100644
index 00000000000..e1078e0d417
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-003.html.ini
@@ -0,0 +1,3 @@
+[should-sink-type-mismatch-violation-be-blocked-by-csp-003.html]
+  [Location of required-trusted-types-for violations.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-002.html.ini b/tests/wpt/meta/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-002.html.ini
new file mode 100644
index 00000000000..65aaf704101
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-002.html.ini
@@ -0,0 +1,25 @@
+[should-trusted-type-policy-creation-be-blocked-by-csp-002.html]
+  expected: TIMEOUT
+  [invalid tt-policy-name name "policy*name"]
+    expected: FAIL
+
+  [invalid tt-policy-name name "policy$name"]
+    expected: FAIL
+
+  [invalid tt-policy-name name "policy?name"]
+    expected: FAIL
+
+  [invalid tt-policy-name name "policy!name"]
+    expected: FAIL
+
+  [directive "trusted-type _TTP1_%09_TTP2_%0C_TTP3_%0D_TTP4_%20_TTP5_" (required-ascii-whitespace)]
+    expected: TIMEOUT
+
+  [invalid directive "trusted-type _TTP" (no ascii whitespace)]
+    expected: NOTRUN
+
+  [non-ASCII trusted-types directives are discarded ("política")]
+    expected: TIMEOUT
+
+  [directive "trusted-type _TTP1_%09_TTP2_%0A%20_TTP3_%0C_TTP4_%0D_TTP5_%20_TTP6_" (required-ascii-whitespace)]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.html.ini b/tests/wpt/meta/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.html.ini
new file mode 100644
index 00000000000..d3440d323c2
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.html.ini
@@ -0,0 +1,6 @@
+[trusted-types-eval-reporting-no-unsafe-eval.html]
+  [Trusted Type violation report: evaluating a string violates both script-src and trusted-types.]
+    expected: FAIL
+
+  [Trusted Type violation report: evaluating a Trusted Script violates script-src.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-eval-reporting-report-only.html.ini b/tests/wpt/meta/trusted-types/trusted-types-eval-reporting-report-only.html.ini
new file mode 100644
index 00000000000..2bca176a012
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-eval-reporting-report-only.html.ini
@@ -0,0 +1,6 @@
+[trusted-types-eval-reporting-report-only.html]
+  [Trusted Type violation report: evaluating a string.]
+    expected: FAIL
+
+  [Trusted Type violation report: evaluating a Trusted Script.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-event-handlers.html.ini b/tests/wpt/meta/trusted-types/trusted-types-event-handlers.html.ini
new file mode 100644
index 00000000000..205dd5886a8
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-event-handlers.html.ini
@@ -0,0 +1,270 @@
+[trusted-types-event-handlers.html]
+  [Event handler onclick should be blocked.]
+    expected: FAIL
+
+  [Event handler onchange should be blocked.]
+    expected: FAIL
+
+  [Event handler onfocus should be blocked.]
+    expected: FAIL
+
+  [Event handler oNclick should be blocked.]
+    expected: FAIL
+
+  [Event handler OnClIcK should be blocked.]
+    expected: FAIL
+
+  [Event handler div.oncopy should be blocked.]
+    expected: FAIL
+
+  [Event handler div.oncut should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onpaste should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onauxclick should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onabort should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onbeforeinput should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onbeforematch should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onbeforetoggle should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onblur should be blocked.]
+    expected: FAIL
+
+  [Event handler div.oncancel should be blocked.]
+    expected: FAIL
+
+  [Event handler div.oncanplay should be blocked.]
+    expected: FAIL
+
+  [Event handler div.oncanplaythrough should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onchange should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onclick should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onclose should be blocked.]
+    expected: FAIL
+
+  [Event handler div.oncommand should be blocked.]
+    expected: FAIL
+
+  [Event handler div.oncontextmenu should be blocked.]
+    expected: FAIL
+
+  [Event handler div.oncontextlost should be blocked.]
+    expected: FAIL
+
+  [Event handler div.oncontextrestored should be blocked.]
+    expected: FAIL
+
+  [Event handler div.oncuechange should be blocked.]
+    expected: FAIL
+
+  [Event handler div.ondblclick should be blocked.]
+    expected: FAIL
+
+  [Event handler div.ondrag should be blocked.]
+    expected: FAIL
+
+  [Event handler div.ondragend should be blocked.]
+    expected: FAIL
+
+  [Event handler div.ondragenter should be blocked.]
+    expected: FAIL
+
+  [Event handler div.ondragexit should be blocked.]
+    expected: FAIL
+
+  [Event handler div.ondragleave should be blocked.]
+    expected: FAIL
+
+  [Event handler div.ondragover should be blocked.]
+    expected: FAIL
+
+  [Event handler div.ondragstart should be blocked.]
+    expected: FAIL
+
+  [Event handler div.ondrop should be blocked.]
+    expected: FAIL
+
+  [Event handler div.ondurationchange should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onemptied should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onended should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onerror should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onfocus should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onformdata should be blocked.]
+    expected: FAIL
+
+  [Event handler div.oninput should be blocked.]
+    expected: FAIL
+
+  [Event handler div.oninvalid should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onkeydown should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onkeypress should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onkeyup should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onload should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onloadeddata should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onloadedmetadata should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onloadstart should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onmousedown should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onmouseenter should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onmouseleave should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onmousemove should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onmouseout should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onmouseover should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onmouseup should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onwheel should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onpause should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onplay should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onplaying should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onprogress should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onratechange should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onreset should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onresize should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onscroll should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onscrollend should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onsecuritypolicyviolation should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onseeked should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onseeking should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onselect should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onshow should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onslotchange should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onstalled should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onsubmit should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onsuspend should be blocked.]
+    expected: FAIL
+
+  [Event handler div.ontimeupdate should be blocked.]
+    expected: FAIL
+
+  [Event handler div.ontoggle should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onvolumechange should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onwaiting should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onanimationend should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onanimationiteration should be blocked.]
+    expected: FAIL
+
+  [Event handler div.ontransitionrun should be blocked.]
+    expected: FAIL
+
+  [Event handler div.ontransitionend should be blocked.]
+    expected: FAIL
+
+  [Event handler div.ontransitioncancel should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onselectstart should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onselectionchange should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onwebkitanimationend should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onwebkitanimationiteration should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onwebkitanimationstart should be blocked.]
+    expected: FAIL
+
+  [Event handler div.onwebkittransitionend should be blocked.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-from-literal.tentative.html.ini b/tests/wpt/meta/trusted-types/trusted-types-from-literal.tentative.html.ini
new file mode 100644
index 00000000000..dd1633b5b88
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-from-literal.tentative.html.ini
@@ -0,0 +1,63 @@
+[trusted-types-from-literal.tentative.html]
+  [TrustedHTML.fromLiteral is supported]
+    expected: FAIL
+
+  [TrustedHTML.fromLiteral: Basic string literal works.]
+    expected: FAIL
+
+  [TrustedHTML.fromLiteral: Empty string literal works.]
+    expected: FAIL
+
+  [TrustedHTML.fromLiteral: A very important emoji works.]
+    expected: FAIL
+
+  [TrustedHTML.fromLiteral: Multi-line string literal works.]
+    expected: FAIL
+
+  [TrustedHTML.fromLiteral: Bound method works.]
+    expected: FAIL
+
+  [TrustedScript.fromLiteral is supported]
+    expected: FAIL
+
+  [TrustedScript.fromLiteral: Basic string literal works.]
+    expected: FAIL
+
+  [TrustedScript.fromLiteral: Empty string literal works.]
+    expected: FAIL
+
+  [TrustedScript.fromLiteral: A very important emoji works.]
+    expected: FAIL
+
+  [TrustedScript.fromLiteral: Multi-line string literal works.]
+    expected: FAIL
+
+  [TrustedScript.fromLiteral: Bound method works.]
+    expected: FAIL
+
+  [TrustedScriptURL.fromLiteral is supported]
+    expected: FAIL
+
+  [TrustedScriptURL.fromLiteral: Basic string literal works.]
+    expected: FAIL
+
+  [TrustedScriptURL.fromLiteral: Empty string literal works.]
+    expected: FAIL
+
+  [TrustedScriptURL.fromLiteral: A very important emoji works.]
+    expected: FAIL
+
+  [TrustedScriptURL.fromLiteral: Multi-line string literal works.]
+    expected: FAIL
+
+  [TrustedScriptURL.fromLiteral: Bound method works.]
+    expected: FAIL
+
+  [TrustedHTML.fromLiteral: Normalization of value works.]
+    expected: FAIL
+
+  [TrustedScript.fromLiteral: No normalization of value occurs.]
+    expected: FAIL
+
+  [TrustedScriptURL.fromLiteral: No normalization of value occurs.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-navigation.html.ini b/tests/wpt/meta/trusted-types/trusted-types-navigation.html.ini
new file mode 100644
index 00000000000..8ca1c90bb2c
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-navigation.html.ini
@@ -0,0 +1,49 @@
+[trusted-types-navigation.html]
+  expected: CRASH
+  [Navigate a window via anchor with javascript:-urls in enforcing mode.]
+    expected: FAIL
+
+  [Navigate a window via anchor with javascript:-urls w/ default policy in enforcing mode.]
+    expected: FAIL
+
+  [Navigate a window via anchor with javascript:-urls in report-only mode.]
+    expected: TIMEOUT
+
+  [Navigate a window via anchor with javascript:-urls w/ default policy in report-only mode.]
+    expected: NOTRUN
+
+  [Navigate a frame via anchor with javascript:-urls in enforcing mode.]
+    expected: NOTRUN
+
+  [Navigate a frame via anchor with javascript:-urls w/ default policy in enforcing mode.]
+    expected: NOTRUN
+
+  [Navigate a frame via anchor with javascript:-urls in report-only mode.]
+    expected: NOTRUN
+
+  [Navigate a frame via anchor with javascript:-urls w/ default policy in report-only mode.]
+    expected: NOTRUN
+
+  [Navigate a window via form-submission with javascript:-urls in enforcing mode.]
+    expected: NOTRUN
+
+  [Navigate a window via form-submission with javascript:-urls w/ default policy in enforcing mode.]
+    expected: NOTRUN
+
+  [Navigate a window via form-submission with javascript:-urls in report-only mode.]
+    expected: NOTRUN
+
+  [Navigate a window via form-submission with javascript:-urls w/ default policy in report-only mode.]
+    expected: NOTRUN
+
+  [Navigate a frame via form-submission with javascript:-urls in enforcing mode.]
+    expected: NOTRUN
+
+  [Navigate a frame via form-submission with javascript:-urls w/ default policy in enforcing mode.]
+    expected: NOTRUN
+
+  [Navigate a frame via form-submission with javascript:-urls in report-only mode.]
+    expected: NOTRUN
+
+  [Navigate a frame via form-submission with javascript:-urls w/ default policy in report-only mode.]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-check-report-DedicatedWorker-create-policy.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-check-report-DedicatedWorker-create-policy.html.ini
new file mode 100644
index 00000000000..ae3da9755b3
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-check-report-DedicatedWorker-create-policy.html.ini
@@ -0,0 +1,6 @@
+[trusted-types-reporting-check-report-DedicatedWorker-create-policy.html]
+  [Test report-uri works with trusted-types violation.]
+    expected: FAIL
+
+  [Test number of sent reports.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-check-report-DedicatedWorker-sink-mismatch.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-check-report-DedicatedWorker-sink-mismatch.html.ini
new file mode 100644
index 00000000000..ab6655af205
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-check-report-DedicatedWorker-sink-mismatch.html.ini
@@ -0,0 +1,6 @@
+[trusted-types-reporting-check-report-DedicatedWorker-sink-mismatch.html]
+  [Test report-uri works with require-trusted-types-for violation.]
+    expected: FAIL
+
+  [Test number of sent reports.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-check-report-Window-create-policy.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-check-report-Window-create-policy.html.ini
new file mode 100644
index 00000000000..1e52ae28724
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-check-report-Window-create-policy.html.ini
@@ -0,0 +1,6 @@
+[trusted-types-reporting-check-report-Window-create-policy.html]
+  [Test report-uri works with trusted-types violation.]
+    expected: FAIL
+
+  [Test number of sent reports.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-check-report-Window-sink-mismatch.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-check-report-Window-sink-mismatch.html.ini
new file mode 100644
index 00000000000..88152900220
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-check-report-Window-sink-mismatch.html.ini
@@ -0,0 +1,6 @@
+[trusted-types-reporting-check-report-Window-sink-mismatch.html]
+  [Test report-uri works with require-trusted-types-for violation.]
+    expected: FAIL
+
+  [Test number of sent reports.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-clipping-of-sample.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-clipping-of-sample.html.ini
new file mode 100644
index 00000000000..f15d2be7761
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-clipping-of-sample.html.ini
@@ -0,0 +1,37 @@
+[trusted-types-reporting-clipping-of-sample.html]
+  expected: CRASH
+  [Clipping of violation sample for createPolicy(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA)]
+    expected: FAIL
+
+  [Clipping of violation sample for Element.innerHTML = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"]
+    expected: FAIL
+
+  [Clipping of violation sample for createPolicy(BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB)]
+    expected: FAIL
+
+  [Clipping of violation sample for Element.innerHTML = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"]
+    expected: FAIL
+
+  [Clipping of violation sample for createPolicy(CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)]
+    expected: FAIL
+
+  [Clipping of violation sample for Element.innerHTML = "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"]
+    expected: FAIL
+
+  [Clipping of violation sample for createPolicy(ÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐ)]
+    expected: FAIL
+
+  [Clipping of violation sample for Element.innerHTML = "ÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐ"]
+    expected: FAIL
+
+  [Clipping of violation sample for createPolicy(ÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉ)]
+    expected: FAIL
+
+  [Clipping of violation sample for Element.innerHTML = "ÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉ"]
+    expected: FAIL
+
+  [Clipping of violation sample for createPolicy(℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉)]
+    expected: FAIL
+
+  [Clipping of violation sample for Element.innerHTML = "℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉℉"]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-clipping-of-sample.tentative.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-clipping-of-sample.tentative.html.ini
new file mode 100644
index 00000000000..628ee2e4013
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-clipping-of-sample.tentative.html.ini
@@ -0,0 +1,25 @@
+[trusted-types-reporting-clipping-of-sample.tentative.html]
+  expected: CRASH
+  [Clipping of violation sample for createPolicy(𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆)]
+    expected: FAIL
+
+  [Clipping of violation sample for Element.innerHTML = "𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆𝐆"]
+    expected: FAIL
+
+  [Clipping of violation sample for createPolicy(H𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇)]
+    expected: FAIL
+
+  [Clipping of violation sample for Element.innerHTML = "H𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇𝐇"]
+    expected: FAIL
+
+  [Clipping of violation sample for createPolicy(𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈I)]
+    expected: FAIL
+
+  [Clipping of violation sample for Element.innerHTML = "𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈𝐈I"]
+    expected: FAIL
+
+  [Clipping of violation sample for createPolicy(𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉)]
+    expected: FAIL
+
+  [Clipping of violation sample for Element.innerHTML = "𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉𝐉"]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-DOMParser-parseFromString.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-DOMParser-parseFromString.html.ini
new file mode 100644
index 00000000000..90311696ac8
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-DOMParser-parseFromString.html.ini
@@ -0,0 +1,3 @@
+[trusted-types-reporting-for-DOMParser-parseFromString.html]
+  [Violation report for plain string.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-DedicatedWorker-ServiceWorkerContainer-register.https.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-DedicatedWorker-ServiceWorkerContainer-register.https.html.ini
new file mode 100644
index 00000000000..f8ed3f58819
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-DedicatedWorker-ServiceWorkerContainer-register.https.html.ini
@@ -0,0 +1,6 @@
+[trusted-types-reporting-for-DedicatedWorker-ServiceWorkerContainer-register.https.html]
+  [No violation reported for ServiceWorkerContainer register with TrustedScriptURL.]
+    expected: FAIL
+
+  [Violation report for ServiceWorkerContainer register with plain string.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-DedicatedWorker-eval.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-DedicatedWorker-eval.html.ini
new file mode 100644
index 00000000000..7416ede533c
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-DedicatedWorker-eval.html.ini
@@ -0,0 +1,6 @@
+[trusted-types-reporting-for-DedicatedWorker-eval.html]
+  [No violation reported for eval with TrustedScript.]
+    expected: FAIL
+
+  [Violation report for eval with plain string.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-DedicatedWorker-function-constructor.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-DedicatedWorker-function-constructor.html.ini
new file mode 100644
index 00000000000..bd23b64efec
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-DedicatedWorker-function-constructor.html.ini
@@ -0,0 +1,12 @@
+[trusted-types-reporting-for-DedicatedWorker-function-constructor.html]
+  [Violation report for Function with plain string.]
+    expected: FAIL
+
+  [Violation report for AsyncFunction with plain string.]
+    expected: FAIL
+
+  [Violation report for GeneratorFunction with plain string.]
+    expected: FAIL
+
+  [Violation report for AsyncGeneratorFunction with plain string.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-DedicatedWorker-setTimeout-setInterval.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-DedicatedWorker-setTimeout-setInterval.html.ini
new file mode 100644
index 00000000000..851dccf8dd1
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-DedicatedWorker-setTimeout-setInterval.html.ini
@@ -0,0 +1,6 @@
+[trusted-types-reporting-for-DedicatedWorker-setTimeout-setInterval.html]
+  [Violation report for setTimeout with plain string.]
+    expected: FAIL
+
+  [Violation report for setInterval with plain string.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Document-execCommand.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Document-execCommand.html.ini
new file mode 100644
index 00000000000..1b74e4dc848
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Document-execCommand.html.ini
@@ -0,0 +1,9 @@
+[trusted-types-reporting-for-Document-execCommand.html]
+  [No violation reported for TrustedHTML.]
+    expected: FAIL
+
+  [No violation reported (paste command).]
+    expected: FAIL
+
+  [Violation report for plain string (insertHTML command).]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Document-parseHTMLUnsafe.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Document-parseHTMLUnsafe.html.ini
new file mode 100644
index 00000000000..24fd1e22b6d
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Document-parseHTMLUnsafe.html.ini
@@ -0,0 +1,6 @@
+[trusted-types-reporting-for-Document-parseHTMLUnsafe.html]
+  [No violation reported for TrustedHTML.]
+    expected: FAIL
+
+  [Violation report for plain string.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Element-setAttribute.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Element-setAttribute.html.ini
new file mode 100644
index 00000000000..a8de55a3adf
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Element-setAttribute.html.ini
@@ -0,0 +1,27 @@
+[trusted-types-reporting-for-Element-setAttribute.html]
+  [Violation report for HTMLIFrameElement.setAttribute('srcdoc', plain_string)]
+    expected: FAIL
+
+  [Violation report for HTMLIFrameElement.setAttributeNS(null, 'srcdoc', plain_string)]
+    expected: FAIL
+
+  [Violation report for Element.setAttribute('onclick', plain_string)]
+    expected: FAIL
+
+  [Violation report for Element.setAttributeNS(null, 'onclick', plain_string)]
+    expected: FAIL
+
+  [Violation report for HTMLScriptElement.setAttribute('src', plain_string)]
+    expected: FAIL
+
+  [Violation report for HTMLScriptElement.setAttributeNS(null, 'src', plain_string)]
+    expected: FAIL
+
+  [Violation report for SVGScriptElement.setAttribute('href', plain_string)]
+    expected: FAIL
+
+  [Violation report for SVGScriptElement.setAttributeNS(null, 'href', plain_string)]
+    expected: FAIL
+
+  [Violation report for SVGScriptElement.setAttributeNS(http://www.w3.org/1999/xlink, 'href', plain_string)]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Range-createContextualFragment.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Range-createContextualFragment.html.ini
new file mode 100644
index 00000000000..b4230236e03
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Range-createContextualFragment.html.ini
@@ -0,0 +1,3 @@
+[trusted-types-reporting-for-Range-createContextualFragment.html]
+  [Violation report for plain string.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ServiceWorker-ServiceWorkerContainer-register.https.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ServiceWorker-ServiceWorkerContainer-register.https.html.ini
new file mode 100644
index 00000000000..018f08e40aa
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ServiceWorker-ServiceWorkerContainer-register.https.html.ini
@@ -0,0 +1,2 @@
+[trusted-types-reporting-for-ServiceWorker-ServiceWorkerContainer-register.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ServiceWorker-eval.https.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ServiceWorker-eval.https.html.ini
new file mode 100644
index 00000000000..208c2804a77
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ServiceWorker-eval.https.html.ini
@@ -0,0 +1,2 @@
+[trusted-types-reporting-for-ServiceWorker-eval.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ServiceWorker-function-constructor.https.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ServiceWorker-function-constructor.https.html.ini
new file mode 100644
index 00000000000..8bd29b44512
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ServiceWorker-function-constructor.https.html.ini
@@ -0,0 +1,2 @@
+[trusted-types-reporting-for-ServiceWorker-function-constructor.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ServiceWorker-importScripts.https.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ServiceWorker-importScripts.https.html.ini
new file mode 100644
index 00000000000..e8a18e7599b
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ServiceWorker-importScripts.https.html.ini
@@ -0,0 +1,2 @@
+[trusted-types-reporting-for-ServiceWorker-importScripts.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ServiceWorker-setTimeout-setInterval.https.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ServiceWorker-setTimeout-setInterval.https.html.ini
new file mode 100644
index 00000000000..700c94ae719
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ServiceWorker-setTimeout-setInterval.https.html.ini
@@ -0,0 +1,2 @@
+[trusted-types-reporting-for-ServiceWorker-setTimeout-setInterval.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ShadowRoot-innerHTML.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ShadowRoot-innerHTML.html.ini
new file mode 100644
index 00000000000..52801930783
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ShadowRoot-innerHTML.html.ini
@@ -0,0 +1,3 @@
+[trusted-types-reporting-for-ShadowRoot-innerHTML.html]
+  [Violation report for plain string.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ShadowRoot-setHTMLUnsafe.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ShadowRoot-setHTMLUnsafe.html.ini
new file mode 100644
index 00000000000..79d9d1805d8
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-ShadowRoot-setHTMLUnsafe.html.ini
@@ -0,0 +1,3 @@
+[trusted-types-reporting-for-ShadowRoot-setHTMLUnsafe.html]
+  [Violation report for plain string.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-DedicatedWorker-constructor.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-DedicatedWorker-constructor.html.ini
new file mode 100644
index 00000000000..e1b90939932
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-DedicatedWorker-constructor.html.ini
@@ -0,0 +1,2 @@
+[trusted-types-reporting-for-SharedWorker-DedicatedWorker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-ServiceWorkerContainer-register.https.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-ServiceWorkerContainer-register.https.html.ini
new file mode 100644
index 00000000000..13baac88eb5
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-ServiceWorkerContainer-register.https.html.ini
@@ -0,0 +1,2 @@
+[trusted-types-reporting-for-SharedWorker-ServiceWorkerContainer-register.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-eval.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-eval.html.ini
new file mode 100644
index 00000000000..accfbec1032
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-eval.html.ini
@@ -0,0 +1,2 @@
+[trusted-types-reporting-for-SharedWorker-eval.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-function-constructor.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-function-constructor.html.ini
new file mode 100644
index 00000000000..6f27aa242f0
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-function-constructor.html.ini
@@ -0,0 +1,2 @@
+[trusted-types-reporting-for-SharedWorker-function-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-importScripts.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-importScripts.html.ini
new file mode 100644
index 00000000000..5cc98ad7b87
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-importScripts.html.ini
@@ -0,0 +1,2 @@
+[trusted-types-reporting-for-SharedWorker-importScripts.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-setTimeout-setInterval.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-setTimeout-setInterval.html.ini
new file mode 100644
index 00000000000..4ce31e7b9bd
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-SharedWorker-setTimeout-setInterval.html.ini
@@ -0,0 +1,2 @@
+[trusted-types-reporting-for-SharedWorker-setTimeout-setInterval.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Window-ServiceWorkerContainer-register.https.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Window-ServiceWorkerContainer-register.https.html.ini
new file mode 100644
index 00000000000..a0bf1b679c5
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Window-ServiceWorkerContainer-register.https.html.ini
@@ -0,0 +1,6 @@
+[trusted-types-reporting-for-Window-ServiceWorkerContainer-register.https.html]
+  [No violation reported for ServiceWorkerContainer register with TrustedScriptURL.]
+    expected: FAIL
+
+  [Violation report for ServiceWorkerContainer register with plain string.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Window-SharedWorker-constructor.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Window-SharedWorker-constructor.html.ini
new file mode 100644
index 00000000000..8b1ab26f00f
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Window-SharedWorker-constructor.html.ini
@@ -0,0 +1,6 @@
+[trusted-types-reporting-for-Window-SharedWorker-constructor.html]
+  [No violation reported for SharedWorker constructor with TrustedScriptURL.]
+    expected: FAIL
+
+  [Violation report for SharedWorker constructor with plain string.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Window-eval.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Window-eval.html.ini
new file mode 100644
index 00000000000..06ca2eec582
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Window-eval.html.ini
@@ -0,0 +1,6 @@
+[trusted-types-reporting-for-Window-eval.html]
+  [No violation reported for eval with TrustedScript.]
+    expected: FAIL
+
+  [Violation report for eval with plain string.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Window-function-constructor.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Window-function-constructor.html.ini
new file mode 100644
index 00000000000..f6735c1a71a
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Window-function-constructor.html.ini
@@ -0,0 +1,12 @@
+[trusted-types-reporting-for-Window-function-constructor.html]
+  [Violation report for Function with plain string.]
+    expected: FAIL
+
+  [Violation report for AsyncFunction with plain string.]
+    expected: FAIL
+
+  [Violation report for GeneratorFunction with plain string.]
+    expected: FAIL
+
+  [Violation report for AsyncGeneratorFunction with plain string.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Window-setTimeout-setInterval.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Window-setTimeout-setInterval.html.ini
new file mode 100644
index 00000000000..22fa6709bbf
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting-for-Window-setTimeout-setInterval.html.ini
@@ -0,0 +1,6 @@
+[trusted-types-reporting-for-Window-setTimeout-setInterval.html]
+  [Violation report for setTimeout with plain string.]
+    expected: FAIL
+
+  [Violation report for setInterval with plain string.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-reporting.html.ini b/tests/wpt/meta/trusted-types/trusted-types-reporting.html.ini
new file mode 100644
index 00000000000..27c9a258d53
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-reporting.html.ini
@@ -0,0 +1,21 @@
+[trusted-types-reporting.html]
+  [Trusted Type violation report: creating a report-only-forbidden policy.]
+    expected: FAIL
+
+  [Trusted Type violation report: creating a forbidden-but-not-reported policy.]
+    expected: FAIL
+
+  [Trusted Type violation report: sample for SVGScriptElement href assignment]
+    expected: FAIL
+
+  [Trusted Type violation report: sample for SVGScriptElement href assignment by setAttribute]
+    expected: FAIL
+
+  [Trusted Type violation report: sample for eval]
+    expected: FAIL
+
+  [Trusted Type violation report: sample for custom element assignment]
+    expected: FAIL
+
+  [Trusted Type violation report: Worker constructor]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-sandbox-no-allow-scripts.html.ini b/tests/wpt/meta/trusted-types/trusted-types-sandbox-no-allow-scripts.html.ini
new file mode 100644
index 00000000000..b608e9999bc
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-sandbox-no-allow-scripts.html.ini
@@ -0,0 +1,3 @@
+[trusted-types-sandbox-no-allow-scripts.html]
+  [Trusted Types CSP directives don't affect the behavior of sandboxed page without allow-scripts.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/trusted-types-svg-script-set-href.html.ini b/tests/wpt/meta/trusted-types/trusted-types-svg-script-set-href.html.ini
new file mode 100644
index 00000000000..2a43867e2bf
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/trusted-types-svg-script-set-href.html.ini
@@ -0,0 +1,51 @@
+[trusted-types-svg-script-set-href.html]
+  [Assign string to SVGScriptElement.href.baseVal.]
+    expected: FAIL
+
+  [Assign TrustedScriptURL to SVGScriptElement.href.baseVal.]
+    expected: FAIL
+
+  [Assign string to non-attached SVGScriptElement.href via setAttribute.]
+    expected: FAIL
+
+  [Assign TrustedScriptURL to non-attached SVGScriptElement.href via setAttribute.]
+    expected: FAIL
+
+  [Assign string to attached SVGScriptElement.href via setAttribute.]
+    expected: FAIL
+
+  [Assign TrustedScriptURL to attached SVGScriptElement.href via setAttribute.]
+    expected: FAIL
+
+  [Assign string to SVGScriptElement.className.baseVal.]
+    expected: FAIL
+
+  [Assign TrustedScriptURL to SVGScriptElement.className.baseVal.]
+    expected: FAIL
+
+  [Assign string to SVGUseElement.href.baseVal.]
+    expected: FAIL
+
+  [Assign TrustedScriptURL to SVGUseElement.href.baseVal.]
+    expected: FAIL
+
+  [Assign string to SVGScriptElement.href.baseVal  w/ default policy.]
+    expected: FAIL
+
+  [Assign string to non-attached SVGScriptElement.href via setAttribute w/ default policy.]
+    expected: FAIL
+
+  [Assign string to attached SVGScriptElement.href via setAttribute w/ default policy.]
+    expected: FAIL
+
+  [Assign string to SVGScriptElement.className.baseVal w/ default policy.]
+    expected: FAIL
+
+  [Assign TrustedScriptURL to SVGScriptElement.className.baseVal w/ default policy.]
+    expected: FAIL
+
+  [Assign string to SVGUseElement.href.baseVal w/ default policy.]
+    expected: FAIL
+
+  [Assign TrustedScriptURL to SVGUseElement.href.baseVal w/ default policy.]
+    expected: FAIL
diff --git a/tests/wpt/meta/trusted-types/tt-block-eval.html.ini b/tests/wpt/meta/trusted-types/tt-block-eval.html.ini
new file mode 100644
index 00000000000..57de179878e
--- /dev/null
+++ b/tests/wpt/meta/trusted-types/tt-block-eval.html.ini
@@ -0,0 +1,3 @@
+[tt-block-eval.html]
+  [eval blocks if the default policy rejects a value.]
+    expected: FAIL
diff --git a/tests/wpt/meta/uievents/idlharness.window.js.ini b/tests/wpt/meta/uievents/idlharness.window.js.ini
index 8c338ad8ba1..55e71ccaf64 100644
--- a/tests/wpt/meta/uievents/idlharness.window.js.ini
+++ b/tests/wpt/meta/uievents/idlharness.window.js.ini
@@ -23,18 +23,12 @@
   [MouseEvent interface: calling getModifierState(DOMString) on new MouseEvent("event") with too few arguments must throw TypeError]
     expected: FAIL
 
-  [UIEvent interface: new MouseEvent("event") must inherit property "which" with the proper type]
-    expected: FAIL
-
   [MouseEvent interface: new WheelEvent("event") must inherit property "getModifierState(DOMString)" with the proper type]
     expected: FAIL
 
   [MouseEvent interface: calling getModifierState(DOMString) on new WheelEvent("event") with too few arguments must throw TypeError]
     expected: FAIL
 
-  [UIEvent interface: new WheelEvent("event") must inherit property "which" with the proper type]
-    expected: FAIL
-
   [InputEvent interface: attribute inputType]
     expected: FAIL
 
diff --git a/tests/wpt/meta/uievents/interface/click-event.htm.ini b/tests/wpt/meta/uievents/interface/click-event.htm.ini
deleted file mode 100644
index 146f6e339f5..00000000000
--- a/tests/wpt/meta/uievents/interface/click-event.htm.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[click-event.htm]
-  [synthetic click event is a PointerEvent]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag.https.html.ini b/tests/wpt/meta/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag.https.html.ini
new file mode 100644
index 00000000000..9fecd223b12
--- /dev/null
+++ b/tests/wpt/meta/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag.https.html.ini
@@ -0,0 +1,6 @@
+[img-tag.https.html]
+  [Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-http-downgrade origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Upgrade-Insecure-Requests: Expects blocked for img-tag to same-http-downgrade origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag.https.html.ini b/tests/wpt/meta/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag.https.html.ini
new file mode 100644
index 00000000000..9fecd223b12
--- /dev/null
+++ b/tests/wpt/meta/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag.https.html.ini
@@ -0,0 +1,6 @@
+[img-tag.https.html]
+  [Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-http-downgrade origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Upgrade-Insecure-Requests: Expects blocked for img-tag to same-http-downgrade origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/upgrade-insecure-requests/gen/top.meta/unset/img-tag.https.html.ini b/tests/wpt/meta/upgrade-insecure-requests/gen/top.meta/unset/img-tag.https.html.ini
new file mode 100644
index 00000000000..9fecd223b12
--- /dev/null
+++ b/tests/wpt/meta/upgrade-insecure-requests/gen/top.meta/unset/img-tag.https.html.ini
@@ -0,0 +1,6 @@
+[img-tag.https.html]
+  [Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-http-downgrade origin and no-redirect redirection from https context.]
+    expected: FAIL
+
+  [Upgrade-Insecure-Requests: Expects blocked for img-tag to same-http-downgrade origin and no-redirect redirection from https context.]
+    expected: FAIL
diff --git a/tests/wpt/meta/urlpattern/urlpattern-hasregexpgroups.any.js.ini b/tests/wpt/meta/urlpattern/urlpattern-hasregexpgroups.any.js.ini
index e2460908b9c..bfb9e6330a8 100644
--- a/tests/wpt/meta/urlpattern/urlpattern-hasregexpgroups.any.js.ini
+++ b/tests/wpt/meta/urlpattern/urlpattern-hasregexpgroups.any.js.ini
@@ -1,12 +1,6 @@
 [urlpattern-hasregexpgroups.any.worker.html]
-  [urlpattern-hasregexpgroups]
-    expected: FAIL
-
 
 [urlpattern-hasregexpgroups.any.html]
-  [urlpattern-hasregexpgroups]
-    expected: FAIL
-
 
 [urlpattern-hasregexpgroups.any.serviceworker.html]
   expected: ERROR
diff --git a/tests/wpt/meta/urlpattern/urlpattern.any.js.ini b/tests/wpt/meta/urlpattern/urlpattern.any.js.ini
index d310eb3d5e9..7248fced522 100644
--- a/tests/wpt/meta/urlpattern/urlpattern.any.js.ini
+++ b/tests/wpt/meta/urlpattern/urlpattern.any.js.ini
@@ -344,27 +344,6 @@
   [Pattern: [{"pathname":"/foo{/bar}*"}\] Inputs: [{"pathname":"/foo/"}\]]
     expected: FAIL
 
-  [Pattern: [{"protocol":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"username":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"password":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"pathname":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"search":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hash":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"protocol":":café"}\] Inputs: [{"protocol":"foo"}\]]
     expected: FAIL
 
@@ -464,27 +443,15 @@
   [Pattern: ["http://🚲.com/"\] Inputs: ["http://🚲.com/"\]]
     expected: FAIL
 
-  [Pattern: ["http://\\ud83d \\udeb2"\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"\\ud83d \\udeb2"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":"\\ud83d \\udeb2"}\] Inputs: [\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":":\\ud83d \\udeb2"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":":a󠄀b"}\] Inputs: [\]]
     expected: FAIL
 
   [Pattern: [{"pathname":"test/:a𐑐b"}\] Inputs: [{"pathname":"test/foo"}\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":":🚲"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"port":""}\] Inputs: [{"protocol":"http","port":"80"}\]]
     expected: FAIL
 
@@ -497,9 +464,6 @@
   [Pattern: [{"protocol":"http","port":"80 "}\] Inputs: [{"protocol":"http","port":"80"}\]]
     expected: FAIL
 
-  [Pattern: [{"protocol":"http","port":"100000"}\] Inputs: [{"protocol":"http","port":"100000"}\]]
-    expected: FAIL
-
   [Pattern: [{"port":"80"}\] Inputs: [{"protocol":"http","port":"80"}\]]
     expected: FAIL
 
@@ -584,9 +548,6 @@
   [Pattern: [{"protocol":"data","pathname":":number([0-9\]+)"}\] Inputs: ["data:8675309"\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":"/(\\\\m)"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":"/foo!"}\] Inputs: [{"pathname":"/foo!"}\]]
     expected: FAIL
 
@@ -620,21 +581,12 @@
   [Pattern: [{"pathname":"/foo/bar"}\] Inputs: ["./foo/bar","https://example.com"\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":"/foo/bar"}\] Inputs: [{"pathname":"/foo/bar"},"https://example.com"\]]
-    expected: FAIL
-
   [Pattern: ["https://example.com:8080/foo?bar#baz"\] Inputs: [{"pathname":"/foo","search":"bar","hash":"baz","baseURL":"https://example.com:8080"}\]]
     expected: FAIL
 
   [Pattern: ["/foo?bar#baz","https://example.com:8080"\] Inputs: [{"pathname":"/foo","search":"bar","hash":"baz","baseURL":"https://example.com:8080"}\]]
     expected: FAIL
 
-  [Pattern: ["/foo"\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: ["example.com/foo"\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: ["http{s}?://{*.}?example.com/:product/:endpoint"\] Inputs: ["https://sub.example.com/foo/bar"\]]
     expected: FAIL
 
@@ -683,33 +635,18 @@
   [Pattern: ["https://example.com/"\] Inputs: ["https://example.com:8080/"\]]
     expected: FAIL
 
-  [Pattern: ["data:foobar"\] Inputs: ["data:foobar"\]]
-    expected: FAIL
-
   [Pattern: ["data\\\\:foobar"\] Inputs: ["data:foobar"\]]
     expected: FAIL
 
   [Pattern: ["https://{sub.}?example.com/foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
-  [Pattern: ["https://{sub.}?example{.com/}foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
-  [Pattern: ["{https://}example.com/foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
   [Pattern: ["https://(sub.)?example.com/foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
   [Pattern: ["https://(sub.)?example(.com/)foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
-  [Pattern: ["(https://)example.com/foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
-  [Pattern: ["https://{sub{.}}example.com/foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
   [Pattern: ["https://(sub(?:.))?example.com/foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
@@ -722,9 +659,6 @@
   [Pattern: ["foo://bar"\] Inputs: ["foo://bad_url_browser_interop"\]]
     expected: FAIL
 
-  [Pattern: ["(café)://foo"\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: ["https://example.com/foo?bar#baz"\] Inputs: [{"protocol":"https:","search":"?bar","hash":"#baz","baseURL":"http://example.com/foo"}\]]
     expected: FAIL
 
@@ -791,48 +725,18 @@
   [Pattern: [{"hostname":"[\\\\:\\\\:AB\\\\::num\]"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"[\\\\:\\\\:xY\\\\::num\]"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"{[\\\\:\\\\:ab\\\\::num\]}"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"{[\\\\:\\\\:fé\\\\::num\]}"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"{[\\\\:\\\\::num\\\\:1\]}"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"{[\\\\:\\\\::num\\\\:fé\]}"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"[*\\\\:1\]"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"*\\\\:1\]"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: ["https://foo{{@}}example.com"\] Inputs: ["https://foo@example.com"\]]
-    expected: FAIL
-
-  [Pattern: ["https://foo{@example.com"\] Inputs: ["https://foo@example.com"\]]
-    expected: FAIL
-
   [Pattern: ["data\\\\:text/javascript,let x = 100/:tens?5;"\] Inputs: ["data:text/javascript,let x = 100/5;"\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":"/:id/:id"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"pathname":"/foo","baseURL":""}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: ["/foo",""\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"pathname":"/foo"},"https://example.com"\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":":name*"}\] Inputs: [{"pathname":"foobar"}\]]
     expected: FAIL
 
@@ -851,48 +755,15 @@
   [Pattern: [{"protocol":":name"}\] Inputs: [{"protocol":"foobar"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad#hostname"}\] Inputs: [{"hostname":"bad"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad%hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad/hostname"}\] Inputs: [{"hostname":"bad"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad\\\\:hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad<hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad>hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad?hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad@hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad[hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad\]hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad\\\\\\\\hostname"}\] Inputs: [{"hostname":"badhostname"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad^hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad|hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad\\nhostname"}\] Inputs: [{"hostname":"badhostname"}\]]
     expected: FAIL
 
@@ -1022,9 +893,6 @@
   [Pattern: ["/foo?bar#baz","https://example.com:8080",{"ignoreCase":true}\] Inputs: [{"pathname":"/FOO","search":"BAR","hash":"BAZ","baseURL":"https://example.com:8080"}\]]
     expected: FAIL
 
-  [Pattern: ["/foo?bar#baz",{"ignoreCase":true},"https://example.com:8080"\] Inputs: [{"pathname":"/FOO","search":"BAR","hash":"BAZ","baseURL":"https://example.com:8080"}\]]
-    expected: FAIL
-
   [Pattern: [{"search":"foo","baseURL":"https://example.com/a/+/b"}\] Inputs: [{"search":"foo","baseURL":"https://example.com/a/+/b"}\]]
     expected: FAIL
 
@@ -1046,6 +914,27 @@
   [Pattern: [{"pathname":"/([\\\\d&&[0-1\]\])"}\] Inputs: [{"pathname":"/3"}\]]
     expected: FAIL
 
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"8\\t0"}\]]
+    expected: FAIL
+
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"80x"}\]]
+    expected: FAIL
+
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"80?x"}\]]
+    expected: FAIL
+
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"80\\\\x"}\]]
+    expected: FAIL
+
+  [Pattern: ["https://{sub.}?example{.com/}foo"\] Inputs: ["https://example.com/foo"\]]
+    expected: FAIL
+
+  [Pattern: [{"hostname":"bad\\\\:hostname"}\] Inputs: undefined]
+    expected: FAIL
+
+  [Pattern: [{"pathname":"/foo","baseURL":""}\] Inputs: undefined]
+    expected: FAIL
+
 
 [urlpattern.any.sharedworker.html]
   expected: ERROR
@@ -1396,27 +1285,6 @@
   [Pattern: [{"pathname":"/foo{/bar}*"}\] Inputs: [{"pathname":"/foo/"}\]]
     expected: FAIL
 
-  [Pattern: [{"protocol":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"username":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"password":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"pathname":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"search":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hash":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"protocol":":café"}\] Inputs: [{"protocol":"foo"}\]]
     expected: FAIL
 
@@ -1516,27 +1384,15 @@
   [Pattern: ["http://🚲.com/"\] Inputs: ["http://🚲.com/"\]]
     expected: FAIL
 
-  [Pattern: ["http://\\ud83d \\udeb2"\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"\\ud83d \\udeb2"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":"\\ud83d \\udeb2"}\] Inputs: [\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":":\\ud83d \\udeb2"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":":a󠄀b"}\] Inputs: [\]]
     expected: FAIL
 
   [Pattern: [{"pathname":"test/:a𐑐b"}\] Inputs: [{"pathname":"test/foo"}\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":":🚲"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"port":""}\] Inputs: [{"protocol":"http","port":"80"}\]]
     expected: FAIL
 
@@ -1549,9 +1405,6 @@
   [Pattern: [{"protocol":"http","port":"80 "}\] Inputs: [{"protocol":"http","port":"80"}\]]
     expected: FAIL
 
-  [Pattern: [{"protocol":"http","port":"100000"}\] Inputs: [{"protocol":"http","port":"100000"}\]]
-    expected: FAIL
-
   [Pattern: [{"port":"80"}\] Inputs: [{"protocol":"http","port":"80"}\]]
     expected: FAIL
 
@@ -1636,9 +1489,6 @@
   [Pattern: [{"protocol":"data","pathname":":number([0-9\]+)"}\] Inputs: ["data:8675309"\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":"/(\\\\m)"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":"/foo!"}\] Inputs: [{"pathname":"/foo!"}\]]
     expected: FAIL
 
@@ -1672,21 +1522,12 @@
   [Pattern: [{"pathname":"/foo/bar"}\] Inputs: ["./foo/bar","https://example.com"\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":"/foo/bar"}\] Inputs: [{"pathname":"/foo/bar"},"https://example.com"\]]
-    expected: FAIL
-
   [Pattern: ["https://example.com:8080/foo?bar#baz"\] Inputs: [{"pathname":"/foo","search":"bar","hash":"baz","baseURL":"https://example.com:8080"}\]]
     expected: FAIL
 
   [Pattern: ["/foo?bar#baz","https://example.com:8080"\] Inputs: [{"pathname":"/foo","search":"bar","hash":"baz","baseURL":"https://example.com:8080"}\]]
     expected: FAIL
 
-  [Pattern: ["/foo"\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: ["example.com/foo"\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: ["http{s}?://{*.}?example.com/:product/:endpoint"\] Inputs: ["https://sub.example.com/foo/bar"\]]
     expected: FAIL
 
@@ -1735,33 +1576,18 @@
   [Pattern: ["https://example.com/"\] Inputs: ["https://example.com:8080/"\]]
     expected: FAIL
 
-  [Pattern: ["data:foobar"\] Inputs: ["data:foobar"\]]
-    expected: FAIL
-
   [Pattern: ["data\\\\:foobar"\] Inputs: ["data:foobar"\]]
     expected: FAIL
 
   [Pattern: ["https://{sub.}?example.com/foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
-  [Pattern: ["https://{sub.}?example{.com/}foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
-  [Pattern: ["{https://}example.com/foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
   [Pattern: ["https://(sub.)?example.com/foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
   [Pattern: ["https://(sub.)?example(.com/)foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
-  [Pattern: ["(https://)example.com/foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
-  [Pattern: ["https://{sub{.}}example.com/foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
   [Pattern: ["https://(sub(?:.))?example.com/foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
@@ -1774,9 +1600,6 @@
   [Pattern: ["foo://bar"\] Inputs: ["foo://bad_url_browser_interop"\]]
     expected: FAIL
 
-  [Pattern: ["(café)://foo"\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: ["https://example.com/foo?bar#baz"\] Inputs: [{"protocol":"https:","search":"?bar","hash":"#baz","baseURL":"http://example.com/foo"}\]]
     expected: FAIL
 
@@ -1843,48 +1666,18 @@
   [Pattern: [{"hostname":"[\\\\:\\\\:AB\\\\::num\]"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"[\\\\:\\\\:xY\\\\::num\]"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"{[\\\\:\\\\:ab\\\\::num\]}"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"{[\\\\:\\\\:fé\\\\::num\]}"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"{[\\\\:\\\\::num\\\\:1\]}"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"{[\\\\:\\\\::num\\\\:fé\]}"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"[*\\\\:1\]"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"*\\\\:1\]"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: ["https://foo{{@}}example.com"\] Inputs: ["https://foo@example.com"\]]
-    expected: FAIL
-
-  [Pattern: ["https://foo{@example.com"\] Inputs: ["https://foo@example.com"\]]
-    expected: FAIL
-
   [Pattern: ["data\\\\:text/javascript,let x = 100/:tens?5;"\] Inputs: ["data:text/javascript,let x = 100/5;"\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":"/:id/:id"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"pathname":"/foo","baseURL":""}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: ["/foo",""\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"pathname":"/foo"},"https://example.com"\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":":name*"}\] Inputs: [{"pathname":"foobar"}\]]
     expected: FAIL
 
@@ -1903,48 +1696,15 @@
   [Pattern: [{"protocol":":name"}\] Inputs: [{"protocol":"foobar"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad#hostname"}\] Inputs: [{"hostname":"bad"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad%hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad/hostname"}\] Inputs: [{"hostname":"bad"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad\\\\:hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad<hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad>hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad?hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad@hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad[hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad\]hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad\\\\\\\\hostname"}\] Inputs: [{"hostname":"badhostname"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad^hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad|hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad\\nhostname"}\] Inputs: [{"hostname":"badhostname"}\]]
     expected: FAIL
 
@@ -2074,9 +1834,6 @@
   [Pattern: ["/foo?bar#baz","https://example.com:8080",{"ignoreCase":true}\] Inputs: [{"pathname":"/FOO","search":"BAR","hash":"BAZ","baseURL":"https://example.com:8080"}\]]
     expected: FAIL
 
-  [Pattern: ["/foo?bar#baz",{"ignoreCase":true},"https://example.com:8080"\] Inputs: [{"pathname":"/FOO","search":"BAR","hash":"BAZ","baseURL":"https://example.com:8080"}\]]
-    expected: FAIL
-
   [Pattern: [{"search":"foo","baseURL":"https://example.com/a/+/b"}\] Inputs: [{"search":"foo","baseURL":"https://example.com/a/+/b"}\]]
     expected: FAIL
 
@@ -2098,6 +1855,27 @@
   [Pattern: [{"pathname":"/([\\\\d&&[0-1\]\])"}\] Inputs: [{"pathname":"/3"}\]]
     expected: FAIL
 
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"8\\t0"}\]]
+    expected: FAIL
+
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"80x"}\]]
+    expected: FAIL
+
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"80?x"}\]]
+    expected: FAIL
+
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"80\\\\x"}\]]
+    expected: FAIL
+
+  [Pattern: ["https://{sub.}?example{.com/}foo"\] Inputs: ["https://example.com/foo"\]]
+    expected: FAIL
+
+  [Pattern: [{"hostname":"bad\\\\:hostname"}\] Inputs: undefined]
+    expected: FAIL
+
+  [Pattern: [{"pathname":"/foo","baseURL":""}\] Inputs: undefined]
+    expected: FAIL
+
 
 [urlpattern.any.serviceworker.html]
   expected: ERROR
diff --git a/tests/wpt/meta/urlpattern/urlpattern.https.any.js.ini b/tests/wpt/meta/urlpattern/urlpattern.https.any.js.ini
index 8198da731ec..f1b0add7805 100644
--- a/tests/wpt/meta/urlpattern/urlpattern.https.any.js.ini
+++ b/tests/wpt/meta/urlpattern/urlpattern.https.any.js.ini
@@ -347,27 +347,6 @@
   [Pattern: [{"pathname":"/foo{/bar}*"}\] Inputs: [{"pathname":"/foo/"}\]]
     expected: FAIL
 
-  [Pattern: [{"protocol":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"username":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"password":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"pathname":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"search":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hash":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"protocol":":café"}\] Inputs: [{"protocol":"foo"}\]]
     expected: FAIL
 
@@ -467,27 +446,15 @@
   [Pattern: ["http://🚲.com/"\] Inputs: ["http://🚲.com/"\]]
     expected: FAIL
 
-  [Pattern: ["http://\\ud83d \\udeb2"\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"\\ud83d \\udeb2"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":"\\ud83d \\udeb2"}\] Inputs: [\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":":\\ud83d \\udeb2"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":":a󠄀b"}\] Inputs: [\]]
     expected: FAIL
 
   [Pattern: [{"pathname":"test/:a𐑐b"}\] Inputs: [{"pathname":"test/foo"}\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":":🚲"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"port":""}\] Inputs: [{"protocol":"http","port":"80"}\]]
     expected: FAIL
 
@@ -500,9 +467,6 @@
   [Pattern: [{"protocol":"http","port":"80 "}\] Inputs: [{"protocol":"http","port":"80"}\]]
     expected: FAIL
 
-  [Pattern: [{"protocol":"http","port":"100000"}\] Inputs: [{"protocol":"http","port":"100000"}\]]
-    expected: FAIL
-
   [Pattern: [{"port":"80"}\] Inputs: [{"protocol":"http","port":"80"}\]]
     expected: FAIL
 
@@ -587,9 +551,6 @@
   [Pattern: [{"protocol":"data","pathname":":number([0-9\]+)"}\] Inputs: ["data:8675309"\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":"/(\\\\m)"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":"/foo!"}\] Inputs: [{"pathname":"/foo!"}\]]
     expected: FAIL
 
@@ -623,21 +584,12 @@
   [Pattern: [{"pathname":"/foo/bar"}\] Inputs: ["./foo/bar","https://example.com"\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":"/foo/bar"}\] Inputs: [{"pathname":"/foo/bar"},"https://example.com"\]]
-    expected: FAIL
-
   [Pattern: ["https://example.com:8080/foo?bar#baz"\] Inputs: [{"pathname":"/foo","search":"bar","hash":"baz","baseURL":"https://example.com:8080"}\]]
     expected: FAIL
 
   [Pattern: ["/foo?bar#baz","https://example.com:8080"\] Inputs: [{"pathname":"/foo","search":"bar","hash":"baz","baseURL":"https://example.com:8080"}\]]
     expected: FAIL
 
-  [Pattern: ["/foo"\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: ["example.com/foo"\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: ["http{s}?://{*.}?example.com/:product/:endpoint"\] Inputs: ["https://sub.example.com/foo/bar"\]]
     expected: FAIL
 
@@ -686,33 +638,18 @@
   [Pattern: ["https://example.com/"\] Inputs: ["https://example.com:8080/"\]]
     expected: FAIL
 
-  [Pattern: ["data:foobar"\] Inputs: ["data:foobar"\]]
-    expected: FAIL
-
   [Pattern: ["data\\\\:foobar"\] Inputs: ["data:foobar"\]]
     expected: FAIL
 
   [Pattern: ["https://{sub.}?example.com/foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
-  [Pattern: ["https://{sub.}?example{.com/}foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
-  [Pattern: ["{https://}example.com/foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
   [Pattern: ["https://(sub.)?example.com/foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
   [Pattern: ["https://(sub.)?example(.com/)foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
-  [Pattern: ["(https://)example.com/foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
-  [Pattern: ["https://{sub{.}}example.com/foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
   [Pattern: ["https://(sub(?:.))?example.com/foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
@@ -725,9 +662,6 @@
   [Pattern: ["foo://bar"\] Inputs: ["foo://bad_url_browser_interop"\]]
     expected: FAIL
 
-  [Pattern: ["(café)://foo"\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: ["https://example.com/foo?bar#baz"\] Inputs: [{"protocol":"https:","search":"?bar","hash":"#baz","baseURL":"http://example.com/foo"}\]]
     expected: FAIL
 
@@ -794,48 +728,18 @@
   [Pattern: [{"hostname":"[\\\\:\\\\:AB\\\\::num\]"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"[\\\\:\\\\:xY\\\\::num\]"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"{[\\\\:\\\\:ab\\\\::num\]}"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"{[\\\\:\\\\:fé\\\\::num\]}"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"{[\\\\:\\\\::num\\\\:1\]}"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"{[\\\\:\\\\::num\\\\:fé\]}"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"[*\\\\:1\]"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"*\\\\:1\]"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: ["https://foo{{@}}example.com"\] Inputs: ["https://foo@example.com"\]]
-    expected: FAIL
-
-  [Pattern: ["https://foo{@example.com"\] Inputs: ["https://foo@example.com"\]]
-    expected: FAIL
-
   [Pattern: ["data\\\\:text/javascript,let x = 100/:tens?5;"\] Inputs: ["data:text/javascript,let x = 100/5;"\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":"/:id/:id"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"pathname":"/foo","baseURL":""}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: ["/foo",""\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"pathname":"/foo"},"https://example.com"\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":":name*"}\] Inputs: [{"pathname":"foobar"}\]]
     expected: FAIL
 
@@ -854,48 +758,15 @@
   [Pattern: [{"protocol":":name"}\] Inputs: [{"protocol":"foobar"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad#hostname"}\] Inputs: [{"hostname":"bad"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad%hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad/hostname"}\] Inputs: [{"hostname":"bad"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad\\\\:hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad<hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad>hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad?hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad@hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad[hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad\]hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad\\\\\\\\hostname"}\] Inputs: [{"hostname":"badhostname"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad^hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad|hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad\\nhostname"}\] Inputs: [{"hostname":"badhostname"}\]]
     expected: FAIL
 
@@ -1025,9 +896,6 @@
   [Pattern: ["/foo?bar#baz","https://example.com:8080",{"ignoreCase":true}\] Inputs: [{"pathname":"/FOO","search":"BAR","hash":"BAZ","baseURL":"https://example.com:8080"}\]]
     expected: FAIL
 
-  [Pattern: ["/foo?bar#baz",{"ignoreCase":true},"https://example.com:8080"\] Inputs: [{"pathname":"/FOO","search":"BAR","hash":"BAZ","baseURL":"https://example.com:8080"}\]]
-    expected: FAIL
-
   [Pattern: [{"search":"foo","baseURL":"https://example.com/a/+/b"}\] Inputs: [{"search":"foo","baseURL":"https://example.com/a/+/b"}\]]
     expected: FAIL
 
@@ -1049,6 +917,27 @@
   [Pattern: [{"pathname":"/([\\\\d&&[0-1\]\])"}\] Inputs: [{"pathname":"/3"}\]]
     expected: FAIL
 
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"8\\t0"}\]]
+    expected: FAIL
+
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"80x"}\]]
+    expected: FAIL
+
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"80?x"}\]]
+    expected: FAIL
+
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"80\\\\x"}\]]
+    expected: FAIL
+
+  [Pattern: ["https://{sub.}?example{.com/}foo"\] Inputs: ["https://example.com/foo"\]]
+    expected: FAIL
+
+  [Pattern: [{"hostname":"bad\\\\:hostname"}\] Inputs: undefined]
+    expected: FAIL
+
+  [Pattern: [{"pathname":"/foo","baseURL":""}\] Inputs: undefined]
+    expected: FAIL
+
 
 [urlpattern.https.any.worker.html]
   [Pattern: [{"pathname":"/foo/bar"}\] Inputs: [{"pathname":"/foo/bar"}\]]
@@ -1396,27 +1285,6 @@
   [Pattern: [{"pathname":"/foo{/bar}*"}\] Inputs: [{"pathname":"/foo/"}\]]
     expected: FAIL
 
-  [Pattern: [{"protocol":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"username":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"password":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"pathname":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"search":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hash":"(café)"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"protocol":":café"}\] Inputs: [{"protocol":"foo"}\]]
     expected: FAIL
 
@@ -1516,27 +1384,15 @@
   [Pattern: ["http://🚲.com/"\] Inputs: ["http://🚲.com/"\]]
     expected: FAIL
 
-  [Pattern: ["http://\\ud83d \\udeb2"\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"\\ud83d \\udeb2"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":"\\ud83d \\udeb2"}\] Inputs: [\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":":\\ud83d \\udeb2"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":":a󠄀b"}\] Inputs: [\]]
     expected: FAIL
 
   [Pattern: [{"pathname":"test/:a𐑐b"}\] Inputs: [{"pathname":"test/foo"}\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":":🚲"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"port":""}\] Inputs: [{"protocol":"http","port":"80"}\]]
     expected: FAIL
 
@@ -1549,9 +1405,6 @@
   [Pattern: [{"protocol":"http","port":"80 "}\] Inputs: [{"protocol":"http","port":"80"}\]]
     expected: FAIL
 
-  [Pattern: [{"protocol":"http","port":"100000"}\] Inputs: [{"protocol":"http","port":"100000"}\]]
-    expected: FAIL
-
   [Pattern: [{"port":"80"}\] Inputs: [{"protocol":"http","port":"80"}\]]
     expected: FAIL
 
@@ -1636,9 +1489,6 @@
   [Pattern: [{"protocol":"data","pathname":":number([0-9\]+)"}\] Inputs: ["data:8675309"\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":"/(\\\\m)"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":"/foo!"}\] Inputs: [{"pathname":"/foo!"}\]]
     expected: FAIL
 
@@ -1672,21 +1522,12 @@
   [Pattern: [{"pathname":"/foo/bar"}\] Inputs: ["./foo/bar","https://example.com"\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":"/foo/bar"}\] Inputs: [{"pathname":"/foo/bar"},"https://example.com"\]]
-    expected: FAIL
-
   [Pattern: ["https://example.com:8080/foo?bar#baz"\] Inputs: [{"pathname":"/foo","search":"bar","hash":"baz","baseURL":"https://example.com:8080"}\]]
     expected: FAIL
 
   [Pattern: ["/foo?bar#baz","https://example.com:8080"\] Inputs: [{"pathname":"/foo","search":"bar","hash":"baz","baseURL":"https://example.com:8080"}\]]
     expected: FAIL
 
-  [Pattern: ["/foo"\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: ["example.com/foo"\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: ["http{s}?://{*.}?example.com/:product/:endpoint"\] Inputs: ["https://sub.example.com/foo/bar"\]]
     expected: FAIL
 
@@ -1735,33 +1576,18 @@
   [Pattern: ["https://example.com/"\] Inputs: ["https://example.com:8080/"\]]
     expected: FAIL
 
-  [Pattern: ["data:foobar"\] Inputs: ["data:foobar"\]]
-    expected: FAIL
-
   [Pattern: ["data\\\\:foobar"\] Inputs: ["data:foobar"\]]
     expected: FAIL
 
   [Pattern: ["https://{sub.}?example.com/foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
-  [Pattern: ["https://{sub.}?example{.com/}foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
-  [Pattern: ["{https://}example.com/foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
   [Pattern: ["https://(sub.)?example.com/foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
   [Pattern: ["https://(sub.)?example(.com/)foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
-  [Pattern: ["(https://)example.com/foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
-  [Pattern: ["https://{sub{.}}example.com/foo"\] Inputs: ["https://example.com/foo"\]]
-    expected: FAIL
-
   [Pattern: ["https://(sub(?:.))?example.com/foo"\] Inputs: ["https://example.com/foo"\]]
     expected: FAIL
 
@@ -1774,9 +1600,6 @@
   [Pattern: ["foo://bar"\] Inputs: ["foo://bad_url_browser_interop"\]]
     expected: FAIL
 
-  [Pattern: ["(café)://foo"\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: ["https://example.com/foo?bar#baz"\] Inputs: [{"protocol":"https:","search":"?bar","hash":"#baz","baseURL":"http://example.com/foo"}\]]
     expected: FAIL
 
@@ -1843,48 +1666,18 @@
   [Pattern: [{"hostname":"[\\\\:\\\\:AB\\\\::num\]"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"[\\\\:\\\\:xY\\\\::num\]"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"{[\\\\:\\\\:ab\\\\::num\]}"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"{[\\\\:\\\\:fé\\\\::num\]}"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"{[\\\\:\\\\::num\\\\:1\]}"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"{[\\\\:\\\\::num\\\\:fé\]}"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"[*\\\\:1\]"}\] Inputs: [{"hostname":"[::ab:1\]"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"*\\\\:1\]"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: ["https://foo{{@}}example.com"\] Inputs: ["https://foo@example.com"\]]
-    expected: FAIL
-
-  [Pattern: ["https://foo{@example.com"\] Inputs: ["https://foo@example.com"\]]
-    expected: FAIL
-
   [Pattern: ["data\\\\:text/javascript,let x = 100/:tens?5;"\] Inputs: ["data:text/javascript,let x = 100/5;"\]]
     expected: FAIL
 
-  [Pattern: [{"pathname":"/:id/:id"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"pathname":"/foo","baseURL":""}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: ["/foo",""\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"pathname":"/foo"},"https://example.com"\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"pathname":":name*"}\] Inputs: [{"pathname":"foobar"}\]]
     expected: FAIL
 
@@ -1903,48 +1696,15 @@
   [Pattern: [{"protocol":":name"}\] Inputs: [{"protocol":"foobar"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad#hostname"}\] Inputs: [{"hostname":"bad"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad%hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad/hostname"}\] Inputs: [{"hostname":"bad"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad\\\\:hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad<hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad>hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad?hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad@hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad[hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad\]hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad\\\\\\\\hostname"}\] Inputs: [{"hostname":"badhostname"}\]]
     expected: FAIL
 
-  [Pattern: [{"hostname":"bad^hostname"}\] Inputs: undefined]
-    expected: FAIL
-
-  [Pattern: [{"hostname":"bad|hostname"}\] Inputs: undefined]
-    expected: FAIL
-
   [Pattern: [{"hostname":"bad\\nhostname"}\] Inputs: [{"hostname":"badhostname"}\]]
     expected: FAIL
 
@@ -2074,9 +1834,6 @@
   [Pattern: ["/foo?bar#baz","https://example.com:8080",{"ignoreCase":true}\] Inputs: [{"pathname":"/FOO","search":"BAR","hash":"BAZ","baseURL":"https://example.com:8080"}\]]
     expected: FAIL
 
-  [Pattern: ["/foo?bar#baz",{"ignoreCase":true},"https://example.com:8080"\] Inputs: [{"pathname":"/FOO","search":"BAR","hash":"BAZ","baseURL":"https://example.com:8080"}\]]
-    expected: FAIL
-
   [Pattern: [{"search":"foo","baseURL":"https://example.com/a/+/b"}\] Inputs: [{"search":"foo","baseURL":"https://example.com/a/+/b"}\]]
     expected: FAIL
 
@@ -2098,6 +1855,27 @@
   [Pattern: [{"pathname":"/([\\\\d&&[0-1\]\])"}\] Inputs: [{"pathname":"/3"}\]]
     expected: FAIL
 
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"8\\t0"}\]]
+    expected: FAIL
+
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"80x"}\]]
+    expected: FAIL
+
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"80?x"}\]]
+    expected: FAIL
+
+  [Pattern: [{"port":"80"}\] Inputs: [{"port":"80\\\\x"}\]]
+    expected: FAIL
+
+  [Pattern: ["https://{sub.}?example{.com/}foo"\] Inputs: ["https://example.com/foo"\]]
+    expected: FAIL
+
+  [Pattern: [{"hostname":"bad\\\\:hostname"}\] Inputs: undefined]
+    expected: FAIL
+
+  [Pattern: [{"pathname":"/foo","baseURL":""}\] Inputs: undefined]
+    expected: FAIL
+
 
 [urlpattern.https.any.serviceworker.html]
   expected: ERROR
diff --git a/tests/wpt/meta/user-timing/measure-l3.any.js.ini b/tests/wpt/meta/user-timing/measure-l3.any.js.ini
index 87c754baad1..1c69f43643e 100644
--- a/tests/wpt/meta/user-timing/measure-l3.any.js.ini
+++ b/tests/wpt/meta/user-timing/measure-l3.any.js.ini
@@ -8,6 +8,9 @@
   [When start and end mark are both given, the start time and end time of the measure entry should be the the marks' time, repectively]
     expected: FAIL
 
+  [When start and end mark are both given, the start time and end time of the measure entry should be the marks' time, repectively]
+    expected: FAIL
+
 
 [measure-l3.any.worker.html]
   [When the end mark is given and the start is unprovided, the end time of the measure entry should be the end mark's time, the start time should be 0.]
@@ -18,3 +21,6 @@
 
   [When start and end mark are both given, the start time and end time of the measure entry should be the the marks' time, repectively]
     expected: FAIL
+
+  [When start and end mark are both given, the start time and end time of the measure entry should be the marks' time, repectively]
+    expected: FAIL
diff --git a/tests/wpt/meta/wasm/webapi/esm-integration/script-src-blocks-wasm.tentative.sub.html.ini b/tests/wpt/meta/wasm/webapi/esm-integration/script-src-blocks-wasm.tentative.sub.html.ini
deleted file mode 100644
index c804530024c..00000000000
--- a/tests/wpt/meta/wasm/webapi/esm-integration/script-src-blocks-wasm.tentative.sub.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[script-src-blocks-wasm.tentative.sub.html]
-  [Importing a WebAssembly module should be guarded by script-src CSP.]
-    expected: FAIL
diff --git a/tests/wpt/meta/webaudio/idlharness.https.window.js.ini b/tests/wpt/meta/webaudio/idlharness.https.window.js.ini
index 63969725792..247f616edc2 100644
--- a/tests/wpt/meta/webaudio/idlharness.https.window.js.ini
+++ b/tests/wpt/meta/webaudio/idlharness.https.window.js.ini
@@ -23,9 +23,6 @@
   [AudioWorkletNode interface: worklet_node must inherit property "port" with the proper type]
     expected: FAIL
 
-  [AudioContext interface: operation suspend()]
-    expected: FAIL
-
   [StereoPannerNode interface: existence and properties of interface prototype object]
     expected: FAIL
 
@@ -65,9 +62,6 @@
   [AudioNode interface: calling disconnect(AudioParam) on context.createScriptProcessor() with too few arguments must throw TypeError]
     expected: FAIL
 
-  [AudioContext interface: operation close()]
-    expected: FAIL
-
   [AudioProcessingEvent interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
@@ -128,9 +122,6 @@
   [AudioNode interface: new DynamicsCompressorNode(context) must inherit property "context" with the proper type]
     expected: FAIL
 
-  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "disconnect()" with the proper type]
-    expected: FAIL
-
   [BaseAudioContext interface: new OfflineAudioContext(1, 1, sample_rate) must inherit property "createDelay(double)" with the proper type]
     expected: FAIL
 
@@ -149,9 +140,6 @@
   [BaseAudioContext interface: operation createPeriodicWave([object Object\], [object Object\], PeriodicWaveConstraints)]
     expected: FAIL
 
-  [AudioNode interface: calling disconnect(AudioNode, unsigned long) on new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) with too few arguments must throw TypeError]
-    expected: FAIL
-
   [ScriptProcessorNode interface: existence and properties of interface prototype object]
     expected: FAIL
 
@@ -203,9 +191,6 @@
   [AudioNode interface: new DynamicsCompressorNode(context) must inherit property "disconnect(AudioNode, unsigned long)" with the proper type]
     expected: FAIL
 
-  [IIRFilterNode interface: operation getFrequencyResponse(Float32Array, Float32Array, Float32Array)]
-    expected: FAIL
-
   [AudioNode interface: context.createScriptProcessor() must inherit property "connect(AudioParam, unsigned long)" with the proper type]
     expected: FAIL
 
@@ -218,24 +203,15 @@
   [AudioNode interface: calling connect(AudioParam, unsigned long) on context.createScriptProcessor() with too few arguments must throw TypeError]
     expected: FAIL
 
-  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "disconnect(AudioNode)" with the proper type]
-    expected: FAIL
-
   [ScriptProcessorNode interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
 
   [AudioNode interface: new WaveShaperNode(context) must inherit property "channelCountMode" with the proper type]
     expected: FAIL
 
-  [IIRFilterNode must be primary interface of new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]})]
-    expected: FAIL
-
   [DynamicsCompressorNode interface: attribute threshold]
     expected: FAIL
 
-  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "numberOfOutputs" with the proper type]
-    expected: FAIL
-
   [AudioNode interface: calling disconnect(unsigned long) on new DelayNode(context) with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -278,18 +254,12 @@
   [AudioNode interface: calling disconnect(AudioNode) on worklet_node with too few arguments must throw TypeError]
     expected: FAIL
 
-  [AudioNode interface: calling disconnect(AudioNode, unsigned long, unsigned long) on new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) with too few arguments must throw TypeError]
-    expected: FAIL
-
   [BaseAudioContext interface: context must inherit property "createIIRFilter([object Object\], [object Object\])" with the proper type]
     expected: FAIL
 
   [AudioNode interface: calling disconnect(unsigned long) on new ConvolverNode(context) with too few arguments must throw TypeError]
     expected: FAIL
 
-  [AudioNode interface: calling disconnect(AudioNode) on new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) with too few arguments must throw TypeError]
-    expected: FAIL
-
   [AudioNode interface: calling connect(AudioParam, unsigned long) on worklet_node with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -305,9 +275,6 @@
   [AudioNode interface: worklet_node must inherit property "connect(AudioNode, unsigned long, unsigned long)" with the proper type]
     expected: FAIL
 
-  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "channelCountMode" with the proper type]
-    expected: FAIL
-
   [AudioNode interface: worklet_node must inherit property "disconnect(AudioNode)" with the proper type]
     expected: FAIL
 
@@ -347,9 +314,6 @@
   [AudioNode interface: calling disconnect(AudioParam) on new DelayNode(context) with too few arguments must throw TypeError]
     expected: FAIL
 
-  [AudioNode interface: calling disconnect(unsigned long) on new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) with too few arguments must throw TypeError]
-    expected: FAIL
-
   [DelayNode interface: existence and properties of interface prototype object]
     expected: FAIL
 
@@ -386,9 +350,6 @@
   [DynamicsCompressorNode interface: new DynamicsCompressorNode(context) must inherit property "threshold" with the proper type]
     expected: FAIL
 
-  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "disconnect(unsigned long)" with the proper type]
-    expected: FAIL
-
   [AudioNode interface: new ConvolverNode(context) must inherit property "numberOfOutputs" with the proper type]
     expected: FAIL
 
@@ -401,9 +362,6 @@
   [DynamicsCompressorNode interface: attribute ratio]
     expected: FAIL
 
-  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "channelCount" with the proper type]
-    expected: FAIL
-
   [AudioWorkletNode interface: existence and properties of interface prototype object]
     expected: FAIL
 
@@ -413,9 +371,6 @@
   [AudioParamMap interface: existence and properties of interface prototype object]
     expected: FAIL
 
-  [IIRFilterNode interface: existence and properties of interface prototype object]
-    expected: FAIL
-
   [AudioNode interface: calling connect(AudioNode, unsigned long, unsigned long) on new WaveShaperNode(context) with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -428,9 +383,6 @@
   [AudioNode interface: worklet_node must inherit property "disconnect(unsigned long)" with the proper type]
     expected: FAIL
 
-  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "disconnect(AudioNode, unsigned long, unsigned long)" with the proper type]
-    expected: FAIL
-
   [AudioNode interface: worklet_node must inherit property "disconnect(AudioParam)" with the proper type]
     expected: FAIL
 
@@ -539,9 +491,6 @@
   [AudioNode interface: new DynamicsCompressorNode(context) must inherit property "connect(AudioNode, unsigned long, unsigned long)" with the proper type]
     expected: FAIL
 
-  [AudioNode interface: calling disconnect(AudioParam) on new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) with too few arguments must throw TypeError]
-    expected: FAIL
-
   [DynamicsCompressorNode interface: new DynamicsCompressorNode(context) must inherit property "ratio" with the proper type]
     expected: FAIL
 
@@ -554,9 +503,6 @@
   [DynamicsCompressorNode interface: attribute release]
     expected: FAIL
 
-  [AudioNode interface: calling disconnect(AudioParam, unsigned long) on new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) with too few arguments must throw TypeError]
-    expected: FAIL
-
   [ConvolverNode interface: attribute buffer]
     expected: FAIL
 
@@ -581,9 +527,6 @@
   [BaseAudioContext interface: new OfflineAudioContext(1, 1, sample_rate) must inherit property "createConvolver()" with the proper type]
     expected: FAIL
 
-  [IIRFilterNode interface object name]
-    expected: FAIL
-
   [AudioNode interface: worklet_node must inherit property "context" with the proper type]
     expected: FAIL
 
@@ -650,9 +593,6 @@
   [AudioNode interface: calling disconnect(AudioNode, unsigned long, unsigned long) on new DelayNode(context) with too few arguments must throw TypeError]
     expected: FAIL
 
-  [IIRFilterNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "getFrequencyResponse(Float32Array, Float32Array, Float32Array)" with the proper type]
-    expected: FAIL
-
   [AudioNode interface: new ConvolverNode(context) must inherit property "numberOfInputs" with the proper type]
     expected: FAIL
 
@@ -737,15 +677,9 @@
   [AudioNode interface: new WaveShaperNode(context) must inherit property "channelInterpretation" with the proper type]
     expected: FAIL
 
-  [IIRFilterNode interface object length]
-    expected: FAIL
-
   [AudioNode interface: new WaveShaperNode(context) must inherit property "connect(AudioParam, unsigned long)" with the proper type]
     expected: FAIL
 
-  [Stringification of new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]})]
-    expected: FAIL
-
   [AudioNode interface: new DelayNode(context) must inherit property "channelInterpretation" with the proper type]
     expected: FAIL
 
@@ -764,9 +698,6 @@
   [DynamicsCompressorNode interface: attribute knee]
     expected: FAIL
 
-  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "numberOfInputs" with the proper type]
-    expected: FAIL
-
   [AudioNode interface: calling disconnect(AudioParam, unsigned long) on worklet_node with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -779,9 +710,6 @@
   [WaveShaperNode interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
-  [IIRFilterNode interface: calling getFrequencyResponse(Float32Array, Float32Array, Float32Array) on new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) with too few arguments must throw TypeError]
-    expected: FAIL
-
   [AudioParamMap interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
 
@@ -809,12 +737,6 @@
   [DynamicsCompressorNode interface: existence and properties of interface object]
     expected: FAIL
 
-  [IIRFilterNode interface: existence and properties of interface object]
-    expected: FAIL
-
-  [OfflineAudioContext interface: operation startRendering()]
-    expected: FAIL
-
   [ScriptProcessorNode interface: context.createScriptProcessor() must inherit property "bufferSize" with the proper type]
     expected: FAIL
 
@@ -842,18 +764,12 @@
   [DelayNode interface object name]
     expected: FAIL
 
-  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "context" with the proper type]
-    expected: FAIL
-
   [BaseAudioContext interface: context must inherit property "createPeriodicWave([object Object\], [object Object\], PeriodicWaveConstraints)" with the proper type]
     expected: FAIL
 
   [ConvolverNode interface: existence and properties of interface object]
     expected: FAIL
 
-  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "disconnect(AudioParam, unsigned long)" with the proper type]
-    expected: FAIL
-
   [WaveShaperNode interface object name]
     expected: FAIL
 
@@ -875,15 +791,9 @@
   [AudioNode interface: new DynamicsCompressorNode(context) must inherit property "numberOfOutputs" with the proper type]
     expected: FAIL
 
-  [IIRFilterNode interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
   [AudioNode interface: new MediaStreamAudioDestinationNode(context) must inherit property "connect(AudioParam, unsigned long)" with the proper type]
     expected: FAIL
 
-  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "disconnect(AudioParam)" with the proper type]
-    expected: FAIL
-
   [AudioNode interface: calling disconnect(unsigned long) on context.createScriptProcessor() with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -902,9 +812,6 @@
   [ConvolverNode interface: existence and properties of interface prototype object]
     expected: FAIL
 
-  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "channelInterpretation" with the proper type]
-    expected: FAIL
-
   [AudioWorkletNode interface object length]
     expected: FAIL
 
@@ -935,9 +842,6 @@
   [BaseAudioContext interface: context must inherit property "createConvolver()" with the proper type]
     expected: FAIL
 
-  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "disconnect(AudioNode, unsigned long)" with the proper type]
-    expected: FAIL
-
   [AudioParamMap interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
@@ -1022,9 +926,6 @@
   [AudioNode interface: calling connect(AudioParam, unsigned long) on new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) with too few arguments must throw TypeError]
     expected: FAIL
 
-  [IIRFilterNode interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
   [AudioNode interface: new ConvolverNode(context) must inherit property "context" with the proper type]
     expected: FAIL
 
@@ -1043,12 +944,6 @@
   [BaseAudioContext interface: calling createPeriodicWave(sequence<float>, sequence<float>, optional PeriodicWaveConstraints) on new OfflineAudioContext(1, 1, sample_rate) with too few arguments must throw TypeError]
     expected: FAIL
 
-  [AudioNode interface: calling connect(AudioParam, optional unsigned long) on new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [BaseAudioContext interface: operation decodeAudioData(ArrayBuffer, optional DecodeSuccessCallback?, optional DecodeErrorCallback?)]
-    expected: FAIL
-
   [BaseAudioContext interface: context must inherit property "createDelay(optional double)" with the proper type]
     expected: FAIL
 
@@ -1067,9 +962,6 @@
   [AudioNode interface: new DynamicsCompressorNode(context) must inherit property "connect(AudioParam, optional unsigned long)" with the proper type]
     expected: FAIL
 
-  [BaseAudioContext interface: new OfflineAudioContext(1, 1, sample_rate) must inherit property "createIIRFilter(sequence<double>, sequence<double>)" with the proper type]
-    expected: FAIL
-
   [AudioNode interface: context.createScriptProcessor() must inherit property "connect(AudioParam, optional unsigned long)" with the proper type]
     expected: FAIL
 
@@ -1085,9 +977,6 @@
   [BaseAudioContext interface: operation createPeriodicWave(sequence<float>, sequence<float>, optional PeriodicWaveConstraints)]
     expected: FAIL
 
-  [BaseAudioContext interface: calling decodeAudioData(ArrayBuffer, optional DecodeSuccessCallback?, optional DecodeErrorCallback?) on context with too few arguments must throw TypeError]
-    expected: FAIL
-
   [AudioNode interface: calling connect(AudioNode, optional unsigned long, optional unsigned long) on new DelayNode(context) with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -1100,9 +989,6 @@
   [BaseAudioContext interface: calling createDelay(optional double) on context with too few arguments must throw TypeError]
     expected: FAIL
 
-  [BaseAudioContext interface: calling decodeAudioData(ArrayBuffer, optional DecodeSuccessCallback?, optional DecodeErrorCallback?) on new OfflineAudioContext(1, 1, sample_rate) with too few arguments must throw TypeError]
-    expected: FAIL
-
   [BaseAudioContext interface: new OfflineAudioContext(1, 1, sample_rate) must inherit property "createScriptProcessor(optional unsigned long, optional unsigned long, optional unsigned long)" with the proper type]
     expected: FAIL
 
@@ -1115,24 +1001,9 @@
   [BaseAudioContext interface: context must inherit property "createScriptProcessor(optional unsigned long, optional unsigned long, optional unsigned long)" with the proper type]
     expected: FAIL
 
-  [BaseAudioContext interface: calling createIIRFilter(sequence<double>, sequence<double>) on context with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [AudioNode interface: calling connect(AudioNode, optional unsigned long, optional unsigned long) on new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "connect(AudioNode, optional unsigned long, optional unsigned long)" with the proper type]
-    expected: FAIL
-
-  [BaseAudioContext interface: calling createIIRFilter(sequence<double>, sequence<double>) on new OfflineAudioContext(1, 1, sample_rate) with too few arguments must throw TypeError]
-    expected: FAIL
-
   [AudioNode interface: new ConvolverNode(context) must inherit property "connect(AudioParam, optional unsigned long)" with the proper type]
     expected: FAIL
 
-  [BaseAudioContext interface: operation createIIRFilter(sequence<double>, sequence<double>)]
-    expected: FAIL
-
   [AudioNode interface: calling connect(AudioParam, optional unsigned long) on new DynamicsCompressorNode(context) with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -1166,18 +1037,12 @@
   [AudioNode interface: new WaveShaperNode(context) must inherit property "connect(AudioNode, optional unsigned long, optional unsigned long)" with the proper type]
     expected: FAIL
 
-  [BaseAudioContext interface: context must inherit property "createIIRFilter(sequence<double>, sequence<double>)" with the proper type]
-    expected: FAIL
-
   [BaseAudioContext interface: calling createDelay(optional double) on new OfflineAudioContext(1, 1, sample_rate) with too few arguments must throw TypeError]
     expected: FAIL
 
   [AudioNode interface: new DelayNode(context) must inherit property "connect(AudioParam, optional unsigned long)" with the proper type]
     expected: FAIL
 
-  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "connect(AudioParam, optional unsigned long)" with the proper type]
-    expected: FAIL
-
   [AudioNode interface: new WaveShaperNode(context) must inherit property "connect(AudioParam, optional unsigned long)" with the proper type]
     expected: FAIL
 
@@ -1312,3 +1177,9 @@
 
   [BaseAudioContext interface: new OfflineAudioContext(1, 1, sample_rate) must inherit property "renderQuantumSize" with the proper type]
     expected: FAIL
+
+  [AudioContext interface: attribute onerror]
+    expected: FAIL
+
+  [AudioContext interface: context must inherit property "onerror" with the proper type]
+    expected: FAIL
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-analysernode-interface/test-analyser-resume-after-suspended.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-analysernode-interface/test-analyser-resume-after-suspended.html.ini
new file mode 100644
index 00000000000..d3d989a910b
--- /dev/null
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-analysernode-interface/test-analyser-resume-after-suspended.html.ini
@@ -0,0 +1,4 @@
+[test-analyser-resume-after-suspended.html]
+  expected: ERROR
+  [AnalyserNode resume after suspended]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-copy-channel.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-copy-channel.html.ini
index 65ff173a196..70cc5a7792f 100644
--- a/tests/wpt/meta/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-copy-channel.html.ini
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-copy-channel.html.ini
@@ -1,5 +1,4 @@
 [audiobuffer-copy-channel.html]
-  expected: CRASH
   [Executing "copyFrom-exceptions"]
     expected: FAIL
 
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-duration-loop.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-duration-loop.html.ini
index 3ad7dcbc89f..3f67e5d814b 100644
--- a/tests/wpt/meta/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-duration-loop.html.ini
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-duration-loop.html.ini
@@ -4,3 +4,9 @@
 
   [X audioBuffer.getChannelData expected to be equal to the array [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1...\] but differs in 2048 places:\n\tIndex\tActual\t\t\tExpected\n\t[0\]\t0.0000000000000000e+0\t1.0000000000000000e+0\n\t[1\]\t0.0000000000000000e+0\t1.0000000000000000e+0\n\t[2\]\t0.0000000000000000e+0\t1.0000000000000000e+0\n\t[3\]\t0.0000000000000000e+0\t1.0000000000000000e+0\n\t...and 2044 more errors.]
     expected: FAIL
+
+  [< [loop with duration\] 1 out of 1 assertions were failed.]
+    expected: FAIL
+
+  [# AUDIT TASK RUNNER FINISHED: 1 out of 1 tasks were failed.]
+    expected: FAIL
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index df741b972b5..c9d88fc368b 100644
--- a/tests/wpt/meta/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -712,3 +712,87 @@
 
   [X SNR (-681.943331526826 dB) is not greater than or equal to 65.737. Got -681.943331526826.]
     expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[14680\]\t-1.1776794772710311e-31\t2.0512369275093079e-1\t2.0512369275093079e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[14681\]\t1.1480505578219891e-2\t1.4340442419052124e-1\t1.3192391861230135e-1\t9.1994315626575540e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.0512369275093079e-1 at index of 14680.\n\tMax RelError of 1.0000000000000000e+0 at index of 14680.\n]
+    expected: FAIL
+
+  [X SNR (55.28431859691825 dB) is not greater than or equal to 65.737. Got 55.28431859691825.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[14680\]\t-3.8465124000000000e+7\t2.0512369275093079e-1\t3.8465124205123693e+7\t1.8752160557010618e+8\t3.8985999999999999e-3\n\t[14681\]\t1.1480505578219891e-2\t1.4340442419052124e-1\t1.3192391861230135e-1\t9.1994315626575540e-1\t3.8985999999999999e-3\n\tMax AbsError of 3.8465124205123693e+7 at index of 14680.\n\tMax RelError of 1.8752160557010618e+8 at index of 14680.\n]
+    expected: FAIL
+
+  [X SNR (-108.26725683849378 dB) is not greater than or equal to 65.737. Got -108.26725683849378.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[14680\]\t1.6520574524194816e+17\t2.0512369275093079e-1\t1.6520574524194816e+17\t8.0539572502015859e+17\t3.8985999999999999e-3\n\t[14681\]\t1.1480505578219891e-2\t1.4340442419052124e-1\t1.3192391861230135e-1\t9.1994315626575540e-1\t3.8985999999999999e-3\n\tMax AbsError of 1.6520574524194816e+17 at index of 14680.\n\tMax RelError of 8.0539572502015859e+17 at index of 14680.\n]
+    expected: FAIL
+
+  [X SNR (-300.92641698386234 dB) is not greater than or equal to 65.737. Got -300.92641698386234.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[14680\]\t-3.5695584067408217e-39\t2.0512369275093079e-1\t2.0512369275093079e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[14681\]\t1.1480505578219891e-2\t1.4340442419052124e-1\t1.3192391861230135e-1\t9.1994315626575540e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.0512369275093079e-1 at index of 14680.\n\tMax RelError of 1.0000000000000000e+0 at index of 14680.\n]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[14680\]\t-6.4557613160857600e+14\t2.0512369275093079e-1\t6.4557613160857625e+14\t3.1472528743545000e+15\t3.8985999999999999e-3\n\t[14681\]\t1.1480505578219891e-2\t1.4340442419052124e-1\t1.3192391861230135e-1\t9.1994315626575540e-1\t3.8985999999999999e-3\n\tMax AbsError of 6.4557613160857625e+14 at index of 14680.\n\tMax RelError of 3.1472528743545000e+15 at index of 14680.\n]
+    expected: FAIL
+
+  [X SNR (-252.76486335943366 dB) is not greater than or equal to 65.737. Got -252.76486335943366.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[14680\]\t1.3930612396961806e-7\t2.0512369275093079e-1\t2.0512355344480682e-1\t9.9999932086770615e-1\t3.8985999999999999e-3\n\t[14681\]\t1.1480505578219891e-2\t1.4340442419052124e-1\t1.3192391861230135e-1\t9.1994315626575540e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.0512355344480682e-1 at index of 14680.\n\tMax RelError of 9.9999932086770615e-1 at index of 14680.\n]
+    expected: FAIL
+
+  [X SNR (55.28432239726872 dB) is not greater than or equal to 65.737. Got 55.28432239726872.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[14680\]\t2.5208540364800000e+12\t2.0512369275093079e-1\t2.5208540364797949e+12\t1.2289433768827059e+13\t3.8985999999999999e-3\n\t[14681\]\t1.1480505578219891e-2\t1.4340442419052124e-1\t1.3192391861230135e-1\t9.1994315626575540e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.5208540364797949e+12 at index of 14680.\n\tMax RelError of 1.2289433768827059e+13 at index of 14680.\n]
+    expected: FAIL
+
+  [X SNR (-204.5968680501149 dB) is not greater than or equal to 65.737. Got -204.5968680501149.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[14680\]\t6.4559834464256000e+14\t2.0512369275093079e-1\t6.4559834464255975e+14\t3.1473611652773360e+15\t3.8985999999999999e-3\n\t[14681\]\t1.1480505578219891e-2\t1.4340442419052124e-1\t1.3192391861230135e-1\t9.1994315626575540e-1\t3.8985999999999999e-3\n\tMax AbsError of 6.4559834464255975e+14 at index of 14680.\n\tMax RelError of 3.1473611652773360e+15 at index of 14680.\n]
+    expected: FAIL
+
+  [X SNR (-252.7651622190615 dB) is not greater than or equal to 65.737. Got -252.7651622190615.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[14680\]\t1.7249685451109781e-36\t2.0512369275093079e-1\t2.0512369275093079e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[14681\]\t1.1480505578219891e-2\t1.4340442419052124e-1\t1.3192391861230135e-1\t9.1994315626575540e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.0512369275093079e-1 at index of 14680.\n\tMax RelError of 1.0000000000000000e+0 at index of 14680.\n]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[14680\]\t-2.7021871583080320e+24\t2.0512369275093079e-1\t2.7021871583080320e+24\t1.3173452184234677e+25\t3.8985999999999999e-3\n\t[14681\]\t1.1480505578219891e-2\t1.4340442419052124e-1\t1.3192391861230135e-1\t9.1994315626575540e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.7021871583080320e+24 at index of 14680.\n\tMax RelError of 1.3173452184234677e+25 at index of 14680.\n]
+    expected: FAIL
+
+  [X SNR (-445.2002225707384 dB) is not greater than or equal to 65.737. Got -445.2002225707384.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[14680\]\t-4.2315589002308092e+19\t2.0512369275093079e-1\t4.2315589002308092e+19\t2.0629303438725304e+20\t3.8985999999999999e-3\n\t[14681\]\t1.1480505578219891e-2\t1.4340442419052124e-1\t1.3192391861230135e-1\t9.1994315626575540e-1\t3.8985999999999999e-3\n\tMax AbsError of 4.2315589002308092e+19 at index of 14680.\n\tMax RelError of 2.0629303438725304e+20 at index of 14680.\n]
+    expected: FAIL
+
+  [X SNR (-349.0959218623025 dB) is not greater than or equal to 65.737. Got -349.0959218623025.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[14650\]\t-2.9403580000000000e+7\t8.6956524848937988e-1\t2.9403580869565248e+7\t3.3814116790712982e+7\t3.8985999999999999e-3\n\t[14651\]\t3.0547976493835449e-1\t8.9879405498504639e-1\t5.9331429004669189e-1\t6.6012262403823208e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.9403580869565248e+7 at index of 14650.\n\tMax RelError of 3.3814116790712982e+7 at index of 14650.\n]
+    expected: FAIL
+
+  [X SNR (-105.93391852623517 dB) is not greater than or equal to 65.737. Got -105.93391852623517.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[14650\]\t-2.5247278509648089e-39\t8.6956524848937988e-1\t8.6956524848937988e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[14651\]\t3.0547976493835449e-1\t8.9879405498504639e-1\t5.9331429004669189e-1\t6.6012262403823208e-1\t3.8985999999999999e-3\n\tMax AbsError of 8.6956524848937988e-1 at index of 14650.\n\tMax RelError of 1.0000000000000000e+0 at index of 14650.\n]
+    expected: FAIL
+
+  [X SNR (42.96525288004425 dB) is not greater than or equal to 65.737. Got 42.96525288004425.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[14650\]\t-2.7243524527875707e-5\t8.6956524848937988e-1\t8.6959249201390776e-1\t1.0000313300520867e+0\t3.8985999999999999e-3\n\t[14651\]\t3.0547976493835449e-1\t8.9879405498504639e-1\t5.9331429004669189e-1\t6.6012262403823208e-1\t3.8985999999999999e-3\n\tMax AbsError of 8.6959249201390776e-1 at index of 14650.\n\tMax RelError of 1.0000313300520867e+0 at index of 14650.\n]
+    expected: FAIL
+
+  [X SNR (42.96506816850161 dB) is not greater than or equal to 65.737. Got 42.96506816850161.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[14650\]\t-1.7532469034194946e+0\t8.6956524848937988e-1\t2.6228121519088745e+0\t3.0162338668262767e+0\t3.8985999999999999e-3\n\t[14651\]\t3.0547976493835449e-1\t8.9879405498504639e-1\t5.9331429004669189e-1\t6.6012262403823208e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.6228121519088745e+0 at index of 14650.\n\tMax RelError of 3.0162338668262767e+0 at index of 14650.\n]
+    expected: FAIL
+
+  [X SNR (34.8385032008375 dB) is not greater than or equal to 65.737. Got 34.8385032008375.]
+    expected: FAIL
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index b7537329068..eed03df37f3 100644
--- a/tests/wpt/meta/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,5 +1,4 @@
 [audiocontext-not-fully-active.html]
-  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-playoutstats.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-playoutstats.html.ini
new file mode 100644
index 00000000000..fca96d1eb2f
--- /dev/null
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-playoutstats.html.ini
@@ -0,0 +1,12 @@
+[audiocontext-playoutstats.html]
+  [Test that the stats increase during playout]
+    expected: FAIL
+
+  [Test that toJSON reflects the current stats]
+    expected: FAIL
+
+  [Test PlayoutStats.resetLatency()]
+    expected: FAIL
+
+  [Test that stats are unchanged within the same execution cycle.]
+    expected: FAIL
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html.ini
index d4b2efa1bd3..03757f49690 100644
--- a/tests/wpt/meta/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html.ini
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html.ini
@@ -10,3 +10,6 @@
 
   [< [test-audiocontextoptions-sampleRate\] 2 out of 4 assertions were failed.]
     expected: FAIL
+
+  [< [test-audiocontextoptions-sampleRate\] 2 out of 6 assertions were failed.]
+    expected: FAIL
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-audionode-interface/different-contexts.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-audionode-interface/different-contexts.html.ini
index 8b20c545429..5ab0f9c359d 100644
--- a/tests/wpt/meta/webaudio/the-audio-api/the-audionode-interface/different-contexts.html.ini
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-audionode-interface/different-contexts.html.ini
@@ -13,3 +13,6 @@
 
   [# AUDIT TASK RUNNER FINISHED: 2 out of 5 tasks were failed.]
     expected: FAIL
+
+  [X Test 4: g2.disconnect(g1.gain) did not throw an exception.]
+    expected: FAIL
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-audioparam-interface/audioparam-nominal-range.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-audioparam-interface/audioparam-nominal-range.html.ini
index 8b1ff72c667..ecb89815cdc 100644
--- a/tests/wpt/meta/webaudio/the-audio-api/the-audioparam-interface/audioparam-nominal-range.html.ini
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-audioparam-interface/audioparam-nominal-range.html.ini
@@ -5,9 +5,6 @@
   [Executing "Offline createDynamicsCompressor"]
     expected: FAIL
 
-  [Executing "Offline createIIRFilter"]
-    expected: FAIL
-
   [Executing "Offline createWaveShaper"]
     expected: FAIL
 
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-audioparam-interface/event-insertion.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-audioparam-interface/event-insertion.html.ini
index ebddfaabde5..53138d50e09 100644
--- a/tests/wpt/meta/webaudio/the-audio-api/the-audioparam-interface/event-insertion.html.ini
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-audioparam-interface/event-insertion.html.ini
@@ -40,3 +40,48 @@
 
   [# AUDIT TASK RUNNER FINISHED: 6 out of 6 tasks were failed.]
     expected: FAIL
+
+  [X Output at frame 640 (time 0.0390625) is not equal to 5. Got 1.]
+    expected: FAIL
+
+  [< [Insert same event at same time\] 2 out of 15 assertions were failed.]
+    expected: FAIL
+
+  [X Linear+Expo: At time 0.01556396484375 (frame 255) output is not close to 1.99609375 within a relative error of 0 (RelErr=0.49902152641878667). Got 1.]
+    expected: FAIL
+
+  [X Linear+Expo: At time 0.015625 (frame 256) and later, output: Expected 3 for all values but found 256 unexpected values: \n\tIndex\tActual\n\t[0\]\t99\n\t[1\]\t99\n\t[2\]\t99\n\t[3\]\t99\n\t...and 252 more errors.]
+    expected: FAIL
+
+  [< [Linear + Expo\] 2 out of 6 assertions were failed.]
+    expected: FAIL
+
+  [X Expo+Linear: At time 0.01556396484375 (frame 255) output is not close to 2.9871532226369792 within a relative error of 0.0000042533 (RelErr=0.6652331080903755). Got 1.]
+    expected: FAIL
+
+  [X Expo+Linear: At time 0.015625 (frame 256) and later, output: Expected 2 for all values but found 256 unexpected values: \n\tIndex\tActual\n\t[0\]\t99\n\t[1\]\t99\n\t[2\]\t99\n\t[3\]\t99\n\t...and 252 more errors.]
+    expected: FAIL
+
+  [< [Expo + Linear\] 2 out of 6 assertions were failed.]
+    expected: FAIL
+
+  [X Linear+SetTarget: At time 0.015625 (frame 256) and later does not equal [100,99.93898010253906,99.87800598144531,99.81706237792969,99.75615692138672,99.6952896118164,99.63446044921875,99.57366180419922,99.51290893554688,99.45218658447266,99.39151000976562,99.33086395263672,99.27025604248047,99.20968627929688,99.1491470336914,99.08865356445312...\] with an element-wise tolerance of {"absoluteThreshold":0,"relativeThreshold":2.6694e-7}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t1.0000000000000000e+2\t9.9938980102539063e+1\t6.1019897460937500e-2\t6.1057154473990094e-4\t2.6677711348571775e-5\n\t[2\]\t1.0000000000000000e+2\t9.9878005981445313e+1\t1.2199401855468750e-1\t1.2214302574017222e-3\t2.6661434916687009e-5\n\t[3\]\t1.0000000000000000e+2\t9.9817062377929688e+1\t1.8293762207031250e-1\t1.8327289715025855e-3\t2.6645166631164548e-5\n\t[4\]\t1.0000000000000000e+2\t9.9756156921386719e+1\t2.4384307861328125e-1\t2.4443912650468570e-3\t2.6628908528594970e-5\n\t[5\]\t1.0000000000000000e+2\t9.9695289611816406e+1\t3.0471038818359375e-1\t3.0564171022527216e-3\t2.6612660608978268e-5\n\t...and 250 more errors.\n\tMax AbsError of 1.4413246154785156e+1 at index of 255.\n\t[255\]\t1.0000000000000000e+2\t8.5586753845214844e+1\t1.4413246154785156e+1\t1.6840510367821365e-1\t2.2846528071441648e-5\n\tMax RelError of 1.6840510367821365e-1 at index of 255.\n\t[255\]\t1.0000000000000000e+2\t8.5586753845214844e+1\t1.4413246154785156e+1\t1.6840510367821365e-1\t2.2846528071441648e-5\n]
+    expected: FAIL
+
+  [X Multiple linear ramps: Output at frame 63 is not close to 1.984375 within a relative error of 0 (RelErr=2.4795649971548968). Got 6.904761791229248.]
+    expected: FAIL
+
+  [X Multiple linear ramps: Output at frame 64 (0.00390625 sec) is not equal to 10. Got 7.]
+    expected: FAIL
+
+  [< [Multiple linear ramps at the same time\] 2 out of 6 assertions were failed.]
+    expected: FAIL
+
+  [X Multiple exponential ramps: Output at frame 63 is not close to 1.978456026387951 within a relative error of 5.3924e-7 (RelErr=2.4304996397067242). Got 6.787092685699463.]
+    expected: FAIL
+
+  [X Multiple exponential ramps: Output at frame 64 (0.00390625 sec) is not equal to 10. Got 7.]
+    expected: FAIL
+
+  [< [Multiple exponential ramps at the same time\] 2 out of 6 assertions were failed.]
+    expected: FAIL
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-audioparam-range.https.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-audioparam-range.https.html.ini
new file mode 100644
index 00000000000..0b16a43b0f4
--- /dev/null
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-audioparam-range.https.html.ini
@@ -0,0 +1,6 @@
+[audioworklet-audioparam-range.https.html]
+  [Valid parameter descriptors should have successful registration.]
+    expected: FAIL
+
+  [Invalid parameter descriptors should fail registration.]
+    expected: FAIL
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworkletglobalscope-creation-time.https.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworkletglobalscope-creation-time.https.html.ini
new file mode 100644
index 00000000000..f518600392e
--- /dev/null
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworkletglobalscope-creation-time.https.html.ini
@@ -0,0 +1,3 @@
+[audioworkletglobalscope-creation-time.https.html]
+  [currentTime vs currentFrames in Audio Worklet global scope]
+    expected: FAIL
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-no-process-function.https.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-no-process-function.https.html.ini
new file mode 100644
index 00000000000..f5df17b7810
--- /dev/null
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-no-process-function.https.html.ini
@@ -0,0 +1,3 @@
+[audioworkletprocessor-no-process-function.https.html]
+  [Test an AudioWorkletProcessor with undefined process function.]
+    expected: FAIL
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-unconnected-outputs.https.window.js.ini b/tests/wpt/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-unconnected-outputs.https.window.js.ini
new file mode 100644
index 00000000000..4a0dc0523e4
--- /dev/null
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-unconnected-outputs.https.window.js.ini
@@ -0,0 +1,6 @@
+[audioworkletprocessor-unconnected-outputs.https.window.html]
+  [Test if unconnected outputs provides a non-zero length array for channels]
+    expected: FAIL
+
+  [Test if outputs connected to AudioParam provides a non-zero length array for channels]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/accept_alert/accept.py.ini b/tests/wpt/meta/webdriver/tests/classic/accept_alert/accept.py.ini
new file mode 100644
index 00000000000..00caf69c8d5
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/accept_alert/accept.py.ini
@@ -0,0 +1,27 @@
+[accept.py]
+  [test_null_response_value]
+    expected: FAIL
+
+  [test_no_top_level_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_no_user_prompt]
+    expected: FAIL
+
+  [test_accept_alert]
+    expected: FAIL
+
+  [test_accept_confirm]
+    expected: FAIL
+
+  [test_accept_prompt]
+    expected: FAIL
+
+  [test_unexpected_alert]
+    expected: FAIL
+
+  [test_accept_in_popup_window]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/add_cookie/add.py.ini b/tests/wpt/meta/webdriver/tests/classic/add_cookie/add.py.ini
new file mode 100644
index 00000000000..37610cfc8ee
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/add_cookie/add.py.ini
@@ -0,0 +1,42 @@
+[add.py]
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_cookie_unsupported_scheme[about\]]
+    expected: FAIL
+
+  [test_cookie_unsupported_scheme[blob\]]
+    expected: FAIL
+
+  [test_cookie_unsupported_scheme[data\]]
+    expected: FAIL
+
+  [test_cookie_unsupported_scheme[file\]]
+    expected: FAIL
+
+  [test_cookie_unsupported_scheme[ftp\]]
+    expected: FAIL
+
+  [test_cookie_unsupported_scheme[javascript\]]
+    expected: FAIL
+
+  [test_cookie_unsupported_scheme[websocket\]]
+    expected: FAIL
+
+  [test_cookie_unsupported_scheme[secure websocket\]]
+    expected: FAIL
+
+  [test_add_non_session_cookie]
+    expected: FAIL
+
+  [test_add_cookie_with_valid_samesite_flag[None\]]
+    expected: FAIL
+
+  [test_add_cookie_with_valid_samesite_flag[Lax\]]
+    expected: FAIL
+
+  [test_add_cookie_with_valid_samesite_flag[Strict\]]
+    expected: FAIL
+
+  [test_add_cookie_with_invalid_samesite_flag]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/add_cookie/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/add_cookie/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/add_cookie/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/back/back.py.ini b/tests/wpt/meta/webdriver/tests/classic/back/back.py.ini
new file mode 100644
index 00000000000..10d35cc69e3
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/back/back.py.ini
@@ -0,0 +1,19 @@
+[back.py]
+  disabled: consistent panic
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: ERROR
+
+  [test_seen_nodes[http\]]
+    expected: FAIL
+
+  [test_seen_nodes[https\]]
+    expected: FAIL
+
+  [test_seen_nodes[https coop\]]
+    expected: FAIL
+
+  [test_history_pushstate]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/back/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/back/user_prompts.py.ini
new file mode 100644
index 00000000000..fcf10a0526c
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/back/user_prompts.py.ini
@@ -0,0 +1,73 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-beforeunload\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-beforeunload\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-beforeunload\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[beforeunload-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/close_window/close.py.ini b/tests/wpt/meta/webdriver/tests/classic/close_window/close.py.ini
new file mode 100644
index 00000000000..b1f13cee75e
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/close_window/close.py.ini
@@ -0,0 +1,19 @@
+[close.py]
+  disabled: panic in test_close_browsing_context_with_accepted_beforeunload_prompt
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_close_browsing_context_with_accepted_beforeunload_prompt[tab\]]
+    expected: FAIL
+
+  [test_close_browsing_context_with_accepted_beforeunload_prompt[window\]]
+    expected: ERROR
+
+  [test_close_last_browsing_context]
+    expected: ERROR
+
+  [test_element_usage_after_closing_browsing_context]
+    expected: ERROR
diff --git a/tests/wpt/meta/webdriver/tests/classic/close_window/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/close_window/user_prompts.py.ini
new file mode 100644
index 00000000000..fcf10a0526c
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/close_window/user_prompts.py.ini
@@ -0,0 +1,73 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-beforeunload\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-beforeunload\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-beforeunload\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[beforeunload-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/delete_all_cookies/delete.py.ini b/tests/wpt/meta/webdriver/tests/classic/delete_all_cookies/delete.py.ini
new file mode 100644
index 00000000000..1a53a7bbaf5
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/delete_all_cookies/delete.py.ini
@@ -0,0 +1,3 @@
+[delete.py]
+  [test_no_browsing_context]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/delete_all_cookies/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/delete_all_cookies/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/delete_all_cookies/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/delete_cookie/delete.py.ini b/tests/wpt/meta/webdriver/tests/classic/delete_cookie/delete.py.ini
new file mode 100644
index 00000000000..1a53a7bbaf5
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/delete_cookie/delete.py.ini
@@ -0,0 +1,3 @@
+[delete.py]
+  [test_no_browsing_context]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/delete_cookie/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/delete_cookie/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/delete_cookie/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/delete_session/delete.py.ini b/tests/wpt/meta/webdriver/tests/classic/delete_session/delete.py.ini
new file mode 100644
index 00000000000..ee03ab08fe3
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/delete_session/delete.py.ini
@@ -0,0 +1,7 @@
+[delete.py]
+  expected: ERROR
+  [test_null_response_value]
+    expected: FAIL
+
+  [test_accepted_beforeunload_prompt]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/dismiss_alert/dismiss.py.ini b/tests/wpt/meta/webdriver/tests/classic/dismiss_alert/dismiss.py.ini
new file mode 100644
index 00000000000..cd2546ede8b
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/dismiss_alert/dismiss.py.ini
@@ -0,0 +1,24 @@
+[dismiss.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_no_user_prompt]
+    expected: FAIL
+
+  [test_dismiss_alert]
+    expected: FAIL
+
+  [test_dismiss_confirm]
+    expected: FAIL
+
+  [test_dismiss_prompt]
+    expected: FAIL
+
+  [test_unexpected_alert]
+    expected: FAIL
+
+  [test_dismiss_in_popup_window]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_clear/clear.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_clear/clear.py.ini
new file mode 100644
index 00000000000..541ffc25ca6
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_clear/clear.py.ini
@@ -0,0 +1,2 @@
+[clear.py]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_clear/disabled.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_clear/disabled.py.ini
new file mode 100644
index 00000000000..f6367167d66
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_clear/disabled.py.ini
@@ -0,0 +1,115 @@
+[disabled.py]
+  expected: TIMEOUT
+  [test_button[button\]]
+    expected: FAIL
+
+  [test_button[reset\]]
+    expected: FAIL
+
+  [test_button[submit\]]
+    expected: FAIL
+
+  [test_input[button\]]
+    expected: FAIL
+
+  [test_input[checkbox\]]
+    expected: FAIL
+
+  [test_input[color\]]
+    expected: FAIL
+
+  [test_input[date\]]
+    expected: FAIL
+
+  [test_input[datetime-local\]]
+    expected: FAIL
+
+  [test_input[email\]]
+    expected: FAIL
+
+  [test_input[file\]]
+    expected: FAIL
+
+  [test_input[image\]]
+    expected: FAIL
+
+  [test_input[month\]]
+    expected: FAIL
+
+  [test_input[number\]]
+    expected: FAIL
+
+  [test_input[password\]]
+    expected: FAIL
+
+  [test_input[radio\]]
+    expected: FAIL
+
+  [test_input[range\]]
+    expected: FAIL
+
+  [test_input[reset\]]
+    expected: FAIL
+
+  [test_input[search\]]
+    expected: FAIL
+
+  [test_input[submit\]]
+    expected: FAIL
+
+  [test_input[tel\]]
+    expected: FAIL
+
+  [test_input[text\]]
+    expected: FAIL
+
+  [test_input[time\]]
+    expected: FAIL
+
+  [test_input[url\]]
+    expected: FAIL
+
+  [test_input[week\]]
+    expected: FAIL
+
+  [test_textarea]
+    expected: FAIL
+
+  [test_fieldset_descendant]
+    expected: FAIL
+
+  [test_fieldset_descendant_first_legend]
+    expected: FAIL
+
+  [test_fieldset_descendant_not_first_legend]
+    expected: FAIL
+
+  [test_option]
+    expected: FAIL
+
+  [test_option_optgroup]
+    expected: FAIL
+
+  [test_option_select]
+    expected: FAIL
+
+  [test_optgroup_select]
+    expected: FAIL
+
+  [test_select]
+    expected: FAIL
+
+  [test_xhtml[button\]]
+    expected: FAIL
+
+  [test_xhtml[input\]]
+    expected: FAIL
+
+  [test_xhtml[select\]]
+    expected: FAIL
+
+  [test_xhtml[textarea\]]
+    expected: FAIL
+
+  [test_xml]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_clear/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_clear/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_clear/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_click/bubbling.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_click/bubbling.py.ini
new file mode 100644
index 00000000000..d99f3672ef6
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_click/bubbling.py.ini
@@ -0,0 +1,6 @@
+[bubbling.py]
+  [test_click_event_bubbles_to_parents]
+    expected: FAIL
+
+  [test_spin_event_loop]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_click/center_point.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_click/center_point.py.ini
new file mode 100644
index 00000000000..3e3bfa2708e
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_click/center_point.py.ini
@@ -0,0 +1,33 @@
+[center_point.py]
+  [test_entirely_in_view]
+    expected: FAIL
+
+  [test_css_pixel_rounding[1\]]
+    expected: FAIL
+
+  [test_css_pixel_rounding[2\]]
+    expected: FAIL
+
+  [test_css_pixel_rounding[3\]]
+    expected: FAIL
+
+  [test_css_pixel_rounding[4\]]
+    expected: FAIL
+
+  [test_css_pixel_rounding[5\]]
+    expected: FAIL
+
+  [test_css_pixel_rounding[6\]]
+    expected: FAIL
+
+  [test_css_pixel_rounding[7\]]
+    expected: FAIL
+
+  [test_css_pixel_rounding[8\]]
+    expected: FAIL
+
+  [test_css_pixel_rounding[9\]]
+    expected: FAIL
+
+  [test_css_pixel_rounding[10\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_click/click.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_click/click.py.ini
new file mode 100644
index 00000000000..9cdf1e0d0da
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_click/click.py.ini
@@ -0,0 +1,15 @@
+[click.py]
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_no_such_element_with_shadow_root]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[closed\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[closed\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_click/events.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_click/events.py.ini
new file mode 100644
index 00000000000..8f57d96cef8
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_click/events.py.ini
@@ -0,0 +1,3 @@
+[events.py]
+  [test_event_mousemove]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_click/interactability.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_click/interactability.py.ini
new file mode 100644
index 00000000000..982ea5ca753
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_click/interactability.py.ini
@@ -0,0 +1,33 @@
+[interactability.py]
+  [test_display_none]
+    expected: FAIL
+
+  [test_visibility_hidden]
+    expected: FAIL
+
+  [test_hidden]
+    expected: FAIL
+
+  [test_element_not_interactable_css_transform[translate(-100px, -100px)\]]
+    expected: FAIL
+
+  [test_element_not_interactable_css_transform[rotate(50deg)\]]
+    expected: FAIL
+
+  [test_element_not_interactable_out_of_view]
+    expected: FAIL
+
+  [test_zero_sized_element[div\]]
+    expected: FAIL
+
+  [test_zero_sized_element[span\]]
+    expected: FAIL
+
+  [test_element_intercepted]
+    expected: FAIL
+
+  [test_element_intercepted_no_pointer_events]
+    expected: FAIL
+
+  [test_element_not_visible_overflow_hidden]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_click/navigate.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_click/navigate.py.ini
new file mode 100644
index 00000000000..4811bba2d43
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_click/navigate.py.ini
@@ -0,0 +1,49 @@
+[navigate.py]
+  expected: TIMEOUT
+  [test_numbers_link]
+    expected: FAIL
+
+  [test_multi_line_link]
+    expected: FAIL
+
+  [test_navigation_retains_input_state]
+    expected: FAIL
+
+  [test_link_hash]
+    expected: FAIL
+
+  [test_link_from_toplevel_context_with_target[\]]
+    expected: FAIL
+
+  [test_link_from_toplevel_context_with_target[_blank\]]
+    expected: FAIL
+
+  [test_link_from_toplevel_context_with_target[_parent\]]
+    expected: FAIL
+
+  [test_link_from_toplevel_context_with_target[_self\]]
+    expected: FAIL
+
+  [test_link_from_toplevel_context_with_target[_top\]]
+    expected: FAIL
+
+  [test_link_from_nested_context_with_target[\]]
+    expected: FAIL
+
+  [test_link_from_nested_context_with_target[_blank\]]
+    expected: FAIL
+
+  [test_link_from_nested_context_with_target[_parent\]]
+    expected: FAIL
+
+  [test_link_from_nested_context_with_target[_self\]]
+    expected: FAIL
+
+  [test_link_from_nested_context_with_target[_top\]]
+    expected: FAIL
+
+  [test_link_cross_origin]
+    expected: FAIL
+
+  [test_link_closes_window]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_click/scroll_into_view.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_click/scroll_into_view.py.ini
new file mode 100644
index 00000000000..2627072cf91
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_click/scroll_into_view.py.ini
@@ -0,0 +1,30 @@
+[scroll_into_view.py]
+  [test_scroll_into_view]
+    expected: FAIL
+
+  [test_partially_visible_does_not_scroll[9\]]
+    expected: FAIL
+
+  [test_partially_visible_does_not_scroll[8\]]
+    expected: FAIL
+
+  [test_partially_visible_does_not_scroll[7\]]
+    expected: FAIL
+
+  [test_partially_visible_does_not_scroll[6\]]
+    expected: FAIL
+
+  [test_partially_visible_does_not_scroll[5\]]
+    expected: FAIL
+
+  [test_partially_visible_does_not_scroll[4\]]
+    expected: FAIL
+
+  [test_partially_visible_does_not_scroll[3\]]
+    expected: FAIL
+
+  [test_partially_visible_does_not_scroll[2\]]
+    expected: FAIL
+
+  [test_partially_visible_does_not_scroll[1\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_click/select.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_click/select.py.ini
new file mode 100644
index 00000000000..2bf7e5abac4
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_click/select.py.ini
@@ -0,0 +1,15 @@
+[select.py]
+  [test_click_option]
+    expected: FAIL
+
+  [test_click_preselected_option]
+    expected: FAIL
+
+  [test_click_deselects_others]
+    expected: FAIL
+
+  [test_click_selected_option]
+    expected: FAIL
+
+  [test_out_of_view_dropdown]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_click/shadow_dom.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_click/shadow_dom.py.ini
new file mode 100644
index 00000000000..92d8bfe9a3d
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_click/shadow_dom.py.ini
@@ -0,0 +1,15 @@
+[shadow_dom.py]
+  [test_shadow_element_click[host_element\]]
+    expected: FAIL
+
+  [test_shadow_element_click[checkbox_element\]]
+    expected: FAIL
+
+  [test_nested_shadow_element_click[outer_element\]]
+    expected: FAIL
+
+  [test_nested_shadow_element_click[inner_element\]]
+    expected: FAIL
+
+  [test_nested_shadow_element_click[checkbox\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_click/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_click/user_prompts.py.ini
new file mode 100644
index 00000000000..a050673119e
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_click/user_prompts.py.ini
@@ -0,0 +1,73 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-beforeunload\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[beforeunload-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_send_keys/content_editable.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/content_editable.py.ini
new file mode 100644
index 00000000000..3cf383a34ff
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/content_editable.py.ini
@@ -0,0 +1,9 @@
+[content_editable.py]
+  [test_sets_insertion_point_to_end]
+    expected: FAIL
+
+  [test_sets_insertion_point_to_after_last_text_node]
+    expected: FAIL
+
+  [test_no_move_caret_if_focused]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_send_keys/events.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/events.py.ini
new file mode 100644
index 00000000000..26b3aaa641b
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/events.py.ini
@@ -0,0 +1,9 @@
+[events.py]
+  [test_file_upload]
+    expected: FAIL
+
+  [test_form_control_send_text[input\]]
+    expected: FAIL
+
+  [test_form_control_send_text[textarea\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_send_keys/file_upload.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/file_upload.py.ini
new file mode 100644
index 00000000000..4fd4b29e87f
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/file_upload.py.ini
@@ -0,0 +1,55 @@
+[file_upload.py]
+  expected: TIMEOUT
+  [test_empty_text]
+    expected: FAIL
+
+  [test_multiple_files]
+    expected: FAIL
+
+  [test_multiple_files_last_path_not_found]
+    expected: FAIL
+
+  [test_multiple_files_without_multiple_attribute]
+    expected: FAIL
+
+  [test_multiple_files_send_twice]
+    expected: FAIL
+
+  [test_multiple_files_reset_with_element_clear]
+    expected: FAIL
+
+  [test_single_file]
+    expected: FAIL
+
+  [test_single_file_replaces_without_multiple_attribute]
+    expected: FAIL
+
+  [test_single_file_appends_with_multiple_attribute]
+    expected: FAIL
+
+  [test_transparent]
+    expected: FAIL
+
+  [test_obscured]
+    expected: FAIL
+
+  [test_outside_viewport]
+    expected: FAIL
+
+  [test_hidden]
+    expected: FAIL
+
+  [test_display_none]
+    expected: FAIL
+
+  [test_not_focused]
+    expected: FAIL
+
+  [test_focused]
+    expected: ERROR
+
+  [test_strict_hidden]
+    expected: ERROR
+
+  [test_strict_display_none]
+    expected: ERROR
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_send_keys/form_controls.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/form_controls.py.ini
new file mode 100644
index 00000000000..1dea194f9b2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/form_controls.py.ini
@@ -0,0 +1,9 @@
+[form_controls.py]
+  [test_input_append]
+    expected: FAIL
+
+  [test_textarea_append]
+    expected: FAIL
+
+  [test_date]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_send_keys/interactability.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/interactability.py.ini
new file mode 100644
index 00000000000..9510b686ea1
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/interactability.py.ini
@@ -0,0 +1,24 @@
+[interactability.py]
+  [test_document_element_is_interactable]
+    expected: FAIL
+
+  [test_iframe_is_interactable]
+    expected: FAIL
+
+  [test_readonly_element]
+    expected: FAIL
+
+  [test_not_a_focusable_element]
+    expected: FAIL
+
+  [test_display_none]
+    expected: FAIL
+
+  [test_visibility_hidden]
+    expected: FAIL
+
+  [test_hidden]
+    expected: FAIL
+
+  [test_disabled]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_send_keys/scroll_into_view.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/scroll_into_view.py.ini
new file mode 100644
index 00000000000..d141c6022db
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/scroll_into_view.py.ini
@@ -0,0 +1,24 @@
+[scroll_into_view.py]
+  [test_element_outside_of_scrollable_viewport]
+    expected: FAIL
+
+  [test_contenteditable_element_outside_of_scrollable_viewport]
+    expected: FAIL
+
+  [test_element_already_in_viewport[{block: 'start'}\]]
+    expected: FAIL
+
+  [test_element_already_in_viewport[{block: 'center'}\]]
+    expected: FAIL
+
+  [test_element_already_in_viewport[{block: 'end'}\]]
+    expected: FAIL
+
+  [test_element_already_in_viewport[{block: 'nearest'}\]]
+    expected: FAIL
+
+  [test_element_just_outside_viewport[Just above viewport\]]
+    expected: FAIL
+
+  [test_element_just_outside_viewport[Just below viewport\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_send_keys/send_keys.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/send_keys.py.ini
new file mode 100644
index 00000000000..10a5a86e3d2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/send_keys.py.ini
@@ -0,0 +1,15 @@
+[send_keys.py]
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_no_such_element_with_shadow_root]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[closed\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[closed\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_send_keys/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/execute_async_script/arguments.py.ini b/tests/wpt/meta/webdriver/tests/classic/execute_async_script/arguments.py.ini
new file mode 100644
index 00000000000..6bcbe1197f6
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/execute_async_script/arguments.py.ini
@@ -0,0 +1,2 @@
+[arguments.py]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/webdriver/tests/classic/execute_async_script/collections.py.ini b/tests/wpt/meta/webdriver/tests/classic/execute_async_script/collections.py.ini
new file mode 100644
index 00000000000..710ae93d053
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/execute_async_script/collections.py.ini
@@ -0,0 +1,6 @@
+[collections.py]
+  [test_file_list]
+    expected: FAIL
+
+  [test_html_all_collection]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/execute_async_script/execute_async.py.ini b/tests/wpt/meta/webdriver/tests/classic/execute_async_script/execute_async.py.ini
new file mode 100644
index 00000000000..6885d2e743e
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/execute_async_script/execute_async.py.ini
@@ -0,0 +1,21 @@
+[execute_async.py]
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_abort_by_user_prompt[alert\]]
+    expected: FAIL
+
+  [test_abort_by_user_prompt[confirm\]]
+    expected: FAIL
+
+  [test_abort_by_user_prompt[prompt\]]
+    expected: FAIL
+
+  [test_abort_by_user_prompt_twice[alert\]]
+    expected: FAIL
+
+  [test_abort_by_user_prompt_twice[confirm\]]
+    expected: FAIL
+
+  [test_abort_by_user_prompt_twice[prompt\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/execute_async_script/node.py.ini b/tests/wpt/meta/webdriver/tests/classic/execute_async_script/node.py.ini
new file mode 100644
index 00000000000..99dbcbef513
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/execute_async_script/node.py.ini
@@ -0,0 +1,33 @@
+[node.py]
+  [test_detached_shadow_root[top_context\]]
+    expected: FAIL
+
+  [test_detached_shadow_root[child_context\]]
+    expected: FAIL
+
+  [test_stale_element[top_context\]]
+    expected: FAIL
+
+  [test_stale_element[child_context\]]
+    expected: FAIL
+
+  [test_element_reference[shadow-root\]]
+    expected: FAIL
+
+  [test_not_supported_nodes[attribute\]]
+    expected: FAIL
+
+  [test_not_supported_nodes[text\]]
+    expected: FAIL
+
+  [test_not_supported_nodes[processing_instruction\]]
+    expected: FAIL
+
+  [test_not_supported_nodes[comment\]]
+    expected: FAIL
+
+  [test_not_supported_nodes[document\]]
+    expected: FAIL
+
+  [test_not_supported_nodes[doctype\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/execute_async_script/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/execute_async_script/user_prompts.py.ini
new file mode 100644
index 00000000000..a050673119e
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/execute_async_script/user_prompts.py.ini
@@ -0,0 +1,73 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-beforeunload\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[beforeunload-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/execute_async_script/window.py.ini b/tests/wpt/meta/webdriver/tests/classic/execute_async_script/window.py.ini
new file mode 100644
index 00000000000..5cd736463b1
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/execute_async_script/window.py.ini
@@ -0,0 +1,6 @@
+[window.py]
+  [test_web_reference[window\]]
+    expected: FAIL
+
+  [test_window_open]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/execute_script/arguments.py.ini b/tests/wpt/meta/webdriver/tests/classic/execute_script/arguments.py.ini
new file mode 100644
index 00000000000..8818990c5ef
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/execute_script/arguments.py.ini
@@ -0,0 +1,88 @@
+[arguments.py]
+  expected: TIMEOUT
+  [test_no_such_element_with_unknown_id]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[closed\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[closed\]]
+    expected: FAIL
+
+  [test_no_such_shadow_root_with_unknown_id]
+    expected: FAIL
+
+  [test_no_such_shadow_root_from_other_window_handle[open\]]
+    expected: FAIL
+
+  [test_no_such_shadow_root_from_other_window_handle[closed\]]
+    expected: FAIL
+
+  [test_no_such_shadow_root_from_other_frame[open\]]
+    expected: FAIL
+
+  [test_no_such_shadow_root_from_other_frame[closed\]]
+    expected: FAIL
+
+  [test_detached_shadow_root_reference[top_context\]]
+    expected: FAIL
+
+  [test_detached_shadow_root_reference[child_context\]]
+    expected: FAIL
+
+  [test_stale_element_reference[top_context\]]
+    expected: FAIL
+
+  [test_stale_element_reference[child_context\]]
+    expected: FAIL
+
+  [test_invalid_argument_for_window_with_invalid_type[None-frame\]]
+    expected: FAIL
+
+  [test_invalid_argument_for_window_with_invalid_type[None-window\]]
+    expected: FAIL
+
+  [test_invalid_argument_for_window_with_invalid_type[False-frame\]]
+    expected: FAIL
+
+  [test_invalid_argument_for_window_with_invalid_type[False-window\]]
+    expected: FAIL
+
+  [test_invalid_argument_for_window_with_invalid_type[42-frame\]]
+    expected: FAIL
+
+  [test_invalid_argument_for_window_with_invalid_type[42-window\]]
+    expected: FAIL
+
+  [test_invalid_argument_for_window_with_invalid_type[value3-frame\]]
+    expected: FAIL
+
+  [test_invalid_argument_for_window_with_invalid_type[value3-window\]]
+    expected: FAIL
+
+  [test_invalid_argument_for_window_with_invalid_type[value4-frame\]]
+    expected: FAIL
+
+  [test_invalid_argument_for_window_with_invalid_type[value4-window\]]
+    expected: FAIL
+
+  [test_no_such_window_for_window_with_invalid_value]
+    expected: FAIL
+
+  [test_element_reference[frame\]]
+    expected: FAIL
+
+  [test_element_reference[node\]]
+    expected: FAIL
+
+  [test_element_reference[shadow-root\]]
+    expected: FAIL
+
+  [test_element_reference[window\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/execute_script/collections.py.ini b/tests/wpt/meta/webdriver/tests/classic/execute_script/collections.py.ini
new file mode 100644
index 00000000000..710ae93d053
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/execute_script/collections.py.ini
@@ -0,0 +1,6 @@
+[collections.py]
+  [test_file_list]
+    expected: FAIL
+
+  [test_html_all_collection]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/execute_script/execute.py.ini b/tests/wpt/meta/webdriver/tests/classic/execute_script/execute.py.ini
new file mode 100644
index 00000000000..8a1571d1d7b
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/execute_script/execute.py.ini
@@ -0,0 +1,24 @@
+[execute.py]
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_opening_new_window_keeps_current_window_handle]
+    expected: FAIL
+
+  [test_abort_by_user_prompt[alert\]]
+    expected: FAIL
+
+  [test_abort_by_user_prompt[confirm\]]
+    expected: FAIL
+
+  [test_abort_by_user_prompt[prompt\]]
+    expected: FAIL
+
+  [test_abort_by_user_prompt_twice[alert\]]
+    expected: FAIL
+
+  [test_abort_by_user_prompt_twice[confirm\]]
+    expected: FAIL
+
+  [test_abort_by_user_prompt_twice[prompt\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/execute_script/node.py.ini b/tests/wpt/meta/webdriver/tests/classic/execute_script/node.py.ini
new file mode 100644
index 00000000000..dd95e12798a
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/execute_script/node.py.ini
@@ -0,0 +1,33 @@
+[node.py]
+  [test_detached_shadow_root[top_context\]]
+    expected: FAIL
+
+  [test_detached_shadow_root[child_context\]]
+    expected: FAIL
+
+  [test_stale_element[top_context\]]
+    expected: FAIL
+
+  [test_stale_element[child_context\]]
+    expected: FAIL
+
+  [test_web_reference[shadow-root\]]
+    expected: FAIL
+
+  [test_not_supported_nodes[attribute\]]
+    expected: FAIL
+
+  [test_not_supported_nodes[text\]]
+    expected: FAIL
+
+  [test_not_supported_nodes[processing_instruction\]]
+    expected: FAIL
+
+  [test_not_supported_nodes[comment\]]
+    expected: FAIL
+
+  [test_not_supported_nodes[document\]]
+    expected: ERROR
+
+  [test_not_supported_nodes[doctype\]]
+    expected: ERROR
diff --git a/tests/wpt/meta/webdriver/tests/classic/execute_script/promise.py.ini b/tests/wpt/meta/webdriver/tests/classic/execute_script/promise.py.ini
new file mode 100644
index 00000000000..d5d950aa7ac
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/execute_script/promise.py.ini
@@ -0,0 +1,27 @@
+[promise.py]
+  [test_promise_resolve]
+    expected: FAIL
+
+  [test_promise_resolve_delayed]
+    expected: FAIL
+
+  [test_promise_all_resolve]
+    expected: FAIL
+
+  [test_await_promise_resolve]
+    expected: FAIL
+
+  [test_promise_resolve_timeout]
+    expected: FAIL
+
+  [test_promise_reject]
+    expected: FAIL
+
+  [test_promise_reject_delayed]
+    expected: FAIL
+
+  [test_promise_all_reject]
+    expected: FAIL
+
+  [test_promise_reject_timeout]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/execute_script/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/execute_script/user_prompts.py.ini
new file mode 100644
index 00000000000..a050673119e
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/execute_script/user_prompts.py.ini
@@ -0,0 +1,73 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-beforeunload\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[beforeunload-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/execute_script/window.py.ini b/tests/wpt/meta/webdriver/tests/classic/execute_script/window.py.ini
new file mode 100644
index 00000000000..9de464ed4f0
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/execute_script/window.py.ini
@@ -0,0 +1,15 @@
+[window.py]
+  [test_web_reference[window\]]
+    expected: FAIL
+
+  [test_web_reference_in_array[window\]]
+    expected: FAIL
+
+  [test_web_reference_in_object[window\]]
+    expected: FAIL
+
+  [test_window_open]
+    expected: FAIL
+
+  [test_same_id_after_cross_origin_navigation]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/find_element/find.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_element/find.py.ini
new file mode 100644
index 00000000000..7564f644b10
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/find_element/find.py.ini
@@ -0,0 +1,34 @@
+[find.py]
+  expected: TIMEOUT
+  [test_no_browsing_context]
+    expected: ERROR
+
+  [test_no_such_element_with_unknown_selector[not-existent\]]
+    expected: FAIL
+
+  [test_no_such_element_with_unknown_selector[existent-other-frame\]]
+    expected: FAIL
+
+  [test_no_such_element_with_unknown_selector[existent-inside-shadow-root\]]
+    expected: FAIL
+
+  [test_find_element[xpath-//a\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[css selector-#linkText\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[link text-full link text\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[partial link text-link text\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[tag name-a\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[xpath-//*[name()='a'\]\]]
+    expected: FAIL
+
+  [test_htmldocument[xpath-/html\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/find_element/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_element/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/find_element/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/find_element_from_element/find.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_element_from_element/find.py.ini
new file mode 100644
index 00000000000..64a0652b75b
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/find_element_from_element/find.py.ini
@@ -0,0 +1,52 @@
+[find.py]
+  expected: TIMEOUT
+  [test_no_browsing_context]
+    expected: ERROR
+
+  [test_no_such_element_with_shadow_root]
+    expected: FAIL
+
+  [test_no_such_element_with_unknown_selector[not-existent\]]
+    expected: FAIL
+
+  [test_no_such_element_with_unknown_selector[existent-other-frame\]]
+    expected: FAIL
+
+  [test_no_such_element_with_unknown_selector[existent-inside-shadow-root\]]
+    expected: FAIL
+
+  [test_no_such_element_with_startnode_from_other_window_handle]
+    expected: FAIL
+
+  [test_no_such_element_with_startnode_from_other_frame]
+    expected: FAIL
+
+  [test_stale_element_reference[top_context\]]
+    expected: FAIL
+
+  [test_stale_element_reference[child_context\]]
+    expected: FAIL
+
+  [test_find_element[xpath-//a\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[css selector-#linkText\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[link text-full link text\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[partial link text-link text\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[tag name-a\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[xpath-//*[name()='a'\]\]]
+    expected: FAIL
+
+  [test_parent_htmldocument]
+    expected: FAIL
+
+  [test_parent_of_document_node_errors]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/find_element_from_element/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_element_from_element/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/find_element_from_element/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/find_element_from_shadow_root/find.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_element_from_shadow_root/find.py.ini
new file mode 100644
index 00000000000..dba98c7726b
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/find_element_from_shadow_root/find.py.ini
@@ -0,0 +1,157 @@
+[find.py]
+  expected: TIMEOUT
+  [test_null_parameter_value]
+    expected: FAIL
+
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: ERROR
+
+  [test_no_such_shadow_root_with_element]
+    expected: FAIL
+
+  [test_no_such_shadow_root_with_unknown_shadow_root]
+    expected: FAIL
+
+  [test_no_such_shadow_root_with_shadow_root_from_other_window_handle]
+    expected: FAIL
+
+  [test_no_such_shadow_root_with_shadow_root_from_other_frame]
+    expected: FAIL
+
+  [test_detached_shadow_root[top_context\]]
+    expected: FAIL
+
+  [test_detached_shadow_root[child_context\]]
+    expected: FAIL
+
+  [test_no_such_element_with_unknown_selector[not-existent\]]
+    expected: FAIL
+
+  [test_no_such_element_with_unknown_selector[existent-other-frame\]]
+    expected: FAIL
+
+  [test_no_such_element_with_unknown_selector[existent-outside-shadow-root\]]
+    expected: FAIL
+
+  [test_invalid_shadow_root_id_argument[True\]]
+    expected: FAIL
+
+  [test_invalid_shadow_root_id_argument[None\]]
+    expected: FAIL
+
+  [test_invalid_shadow_root_id_argument[1\]]
+    expected: FAIL
+
+  [test_invalid_shadow_root_id_argument[shadow_root_id3\]]
+    expected: FAIL
+
+  [test_invalid_shadow_root_id_argument[shadow_root_id4\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[a\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[True\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[None\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[1\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[using4\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[using5\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[None\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[value1\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[value2\]]
+    expected: FAIL
+
+  [test_found_element_equivalence]
+    expected: FAIL
+
+  [test_find_element[open-css selector-#linkText\]]
+    expected: FAIL
+
+  [test_find_element[open-link text-full link text\]]
+    expected: FAIL
+
+  [test_find_element[open-partial link text-link text\]]
+    expected: FAIL
+
+  [test_find_element[open-tag name-a\]]
+    expected: FAIL
+
+  [test_find_element[open-xpath-//a\]]
+    expected: FAIL
+
+  [test_find_element[closed-css selector-#linkText\]]
+    expected: FAIL
+
+  [test_find_element[closed-link text-full link text\]]
+    expected: FAIL
+
+  [test_find_element[closed-partial link text-link text\]]
+    expected: FAIL
+
+  [test_find_element[closed-tag name-a\]]
+    expected: FAIL
+
+  [test_find_element[closed-xpath-//a\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=#>link text</a>-link text\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=#>&nbsp;link text&nbsp;</a>-link text\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=#>link<br>text</a>-link\\ntext\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=#>link&amp;text</a>-link&text\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=#>LINK TEXT</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_find_element_link_text[<a href=# style='text-transform: uppercase'>link text</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>partial link text</a>-link\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>&nbsp;partial link text&nbsp;</a>-link\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>partial link text</a>-k t\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>partial link<br>text</a>-k\\nt\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>partial link&amp;text</a>-k&t\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=#>PARTIAL LINK TEXT</a>-LINK\]]
+    expected: FAIL
+
+  [test_find_element_partial_link_text[<a href=# style='text-transform: uppercase'>partial link text</a>-LINK\]]
+    expected: FAIL
+
+  [test_find_element_in_nested_shadow_root[open\]]
+    expected: FAIL
+
+  [test_find_element_in_nested_shadow_root[closed\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/find_element_from_shadow_root/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_element_from_shadow_root/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/find_element_from_shadow_root/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/find_elements/find.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_elements/find.py.ini
new file mode 100644
index 00000000000..44f232824bb
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/find_elements/find.py.ini
@@ -0,0 +1,76 @@
+[find.py]
+  expected: TIMEOUT
+  [test_no_browsing_context]
+    expected: ERROR
+
+  [test_find_elements[css selector-#linkText\]]
+    expected: FAIL
+
+  [test_find_elements[link text-full link text\]]
+    expected: FAIL
+
+  [test_find_elements[partial link text-link text\]]
+    expected: FAIL
+
+  [test_find_elements[tag name-a\]]
+    expected: FAIL
+
+  [test_find_elements[xpath-//a\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>link text</a>-link text\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>&nbsp;link text&nbsp;</a>-link text\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>link<br>text</a>-link\\ntext\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>link&amp;text</a>-link&text\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>LINK TEXT</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=# style='text-transform: uppercase'>link text</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link text</a>-link\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>&nbsp;partial link text&nbsp;</a>-link\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link text</a>-k t\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link<br>text</a>-k\\nt\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link&amp;text</a>-k&t\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>PARTIAL LINK TEXT</a>-LINK\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=# style='text-transform: uppercase'>partial link text</a>-LINK\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[css selector-#linkText\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[link text-full link text\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[partial link text-link text\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[tag name-a\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[xpath-//*[name()='a'\]\]]
+    expected: FAIL
+
+  [test_htmldocument[xpath-/html\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/find_elements/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_elements/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/find_elements/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/find_elements_from_element/find.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_elements_from_element/find.py.ini
new file mode 100644
index 00000000000..69ec1b4bbcc
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/find_elements_from_element/find.py.ini
@@ -0,0 +1,82 @@
+[find.py]
+  expected: TIMEOUT
+  [test_no_browsing_context]
+    expected: ERROR
+
+  [test_no_such_element_with_shadow_root]
+    expected: FAIL
+
+  [test_no_such_element_with_startnode_from_other_window_handle]
+    expected: FAIL
+
+  [test_no_such_element_with_startnode_from_other_frame]
+    expected: FAIL
+
+  [test_stale_element_reference[top_context\]]
+    expected: FAIL
+
+  [test_stale_element_reference[child_context\]]
+    expected: FAIL
+
+  [test_find_elements[xpath-//a\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>link text</a>-link text\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>&nbsp;link text&nbsp;</a>-link text\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>link<br>text</a>-link\\ntext\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>link&amp;text</a>-link&text\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>LINK TEXT</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=# style='text-transform: uppercase'>link text</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link text</a>-link\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>&nbsp;partial link text&nbsp;</a>-link\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link text</a>-k t\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link<br>text</a>-k\\nt\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link&amp;text</a>-k&t\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>PARTIAL LINK TEXT</a>-LINK\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=# style='text-transform: uppercase'>partial link text</a>-LINK\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[css selector-#linkText\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[link text-full link text\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[partial link text-link text\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[tag name-a\]]
+    expected: FAIL
+
+  [test_xhtml_namespace[xpath-//*[name()='a'\]\]]
+    expected: FAIL
+
+  [test_parent_htmldocument]
+    expected: FAIL
+
+  [test_parent_of_document_node_errors]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/find_elements_from_element/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_elements_from_element/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/find_elements_from_element/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/find_elements_from_shadow_root/find.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_elements_from_shadow_root/find.py.ini
new file mode 100644
index 00000000000..5328af1b701
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/find_elements_from_shadow_root/find.py.ini
@@ -0,0 +1,157 @@
+[find.py]
+  expected: TIMEOUT
+  [test_null_parameter_value]
+    expected: FAIL
+
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: ERROR
+
+  [test_no_such_shadow_root_with_element]
+    expected: FAIL
+
+  [test_no_such_shadow_root_with_unknown_shadow_root]
+    expected: FAIL
+
+  [test_no_such_shadow_root_with_shadow_root_from_other_window_handle]
+    expected: FAIL
+
+  [test_no_such_shadow_root_with_shadow_root_from_other_frame]
+    expected: FAIL
+
+  [test_detached_shadow_root[top_context\]]
+    expected: FAIL
+
+  [test_detached_shadow_root[child_context\]]
+    expected: FAIL
+
+  [test_no_elements_with_unknown_selector[not-existent\]]
+    expected: FAIL
+
+  [test_no_elements_with_unknown_selector[existent-other-frame\]]
+    expected: FAIL
+
+  [test_no_elements_with_unknown_selector[existent-outside-shadow-root\]]
+    expected: FAIL
+
+  [test_invalid_shadow_root_id_argument[True\]]
+    expected: FAIL
+
+  [test_invalid_shadow_root_id_argument[None\]]
+    expected: FAIL
+
+  [test_invalid_shadow_root_id_argument[1\]]
+    expected: FAIL
+
+  [test_invalid_shadow_root_id_argument[shadow_root_id3\]]
+    expected: FAIL
+
+  [test_invalid_shadow_root_id_argument[shadow_root_id4\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[a\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[True\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[None\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[1\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[using4\]]
+    expected: FAIL
+
+  [test_invalid_using_argument[using5\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[None\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[value1\]]
+    expected: FAIL
+
+  [test_invalid_selector_argument[value2\]]
+    expected: FAIL
+
+  [test_find_elements_equivalence]
+    expected: FAIL
+
+  [test_find_elements[open-css selector-#linkText\]]
+    expected: FAIL
+
+  [test_find_elements[open-link text-full link text\]]
+    expected: FAIL
+
+  [test_find_elements[open-partial link text-link text\]]
+    expected: FAIL
+
+  [test_find_elements[open-tag name-a\]]
+    expected: FAIL
+
+  [test_find_elements[open-xpath-//a\]]
+    expected: FAIL
+
+  [test_find_elements[closed-css selector-#linkText\]]
+    expected: FAIL
+
+  [test_find_elements[closed-link text-full link text\]]
+    expected: FAIL
+
+  [test_find_elements[closed-partial link text-link text\]]
+    expected: FAIL
+
+  [test_find_elements[closed-tag name-a\]]
+    expected: FAIL
+
+  [test_find_elements[closed-xpath-//a\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>link text</a>-link text\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>&nbsp;link text&nbsp;</a>-link text\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>link<br>text</a>-link\\ntext\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>link&amp;text</a>-link&text\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=#>LINK TEXT</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_find_elements_link_text[<a href=# style='text-transform: uppercase'>link text</a>-LINK TEXT\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link text</a>-link\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>&nbsp;partial link text&nbsp;</a>-link\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link text</a>-k t\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link<br>text</a>-k\\nt\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>partial link&amp;text</a>-k&t\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=#>PARTIAL LINK TEXT</a>-LINK\]]
+    expected: FAIL
+
+  [test_find_elements_partial_link_text[<a href=# style='text-transform: uppercase'>partial link text</a>-LINK\]]
+    expected: FAIL
+
+  [test_find_elements_in_nested_shadow_root[open\]]
+    expected: FAIL
+
+  [test_find_elements_in_nested_shadow_root[closed\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/find_elements_from_shadow_root/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_elements_from_shadow_root/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/find_elements_from_shadow_root/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/forward/forward.py.ini b/tests/wpt/meta/webdriver/tests/classic/forward/forward.py.ini
new file mode 100644
index 00000000000..12538247f27
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/forward/forward.py.ini
@@ -0,0 +1,34 @@
+[forward.py]
+  disabled: consistent panic
+  [test_no_top_browsing_context]
+    expected: ERROR
+
+  [test_no_browsing_context]
+    expected: ERROR
+
+  [test_basic]
+    expected: ERROR
+
+  [test_no_browsing_history]
+    expected: ERROR
+
+  [test_seen_nodes[http\]]
+    expected: ERROR
+
+  [test_seen_nodes[https\]]
+    expected: ERROR
+
+  [test_seen_nodes[https coop\]]
+    expected: ERROR
+
+  [test_history_pushstate]
+    expected: ERROR
+
+  [test_data_urls]
+    expected: ERROR
+
+  [test_fragments]
+    expected: ERROR
+
+  [test_removed_iframe]
+    expected: ERROR
diff --git a/tests/wpt/meta/webdriver/tests/classic/forward/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/forward/user_prompts.py.ini
new file mode 100644
index 00000000000..326fdd875ad
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/forward/user_prompts.py.ini
@@ -0,0 +1,3 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/webdriver/tests/classic/fullscreen_window/from_minimized_window.py.ini b/tests/wpt/meta/webdriver/tests/classic/fullscreen_window/from_minimized_window.py.ini
new file mode 100644
index 00000000000..99b10143b3e
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/fullscreen_window/from_minimized_window.py.ini
@@ -0,0 +1,3 @@
+[from_minimized_window.py]
+  [test_fullscreen_from_minimized_window]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/fullscreen_window/fullscreen.py.ini b/tests/wpt/meta/webdriver/tests/classic/fullscreen_window/fullscreen.py.ini
new file mode 100644
index 00000000000..d03f4481fba
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/fullscreen_window/fullscreen.py.ini
@@ -0,0 +1,18 @@
+[fullscreen.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_response_payload]
+    expected: FAIL
+
+  [test_fullscreen_from_normal_window]
+    expected: FAIL
+
+  [test_fullscreen_from_maximized_window]
+    expected: FAIL
+
+  [test_fullscreen_twice_is_idempotent]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/fullscreen_window/stress.py.ini b/tests/wpt/meta/webdriver/tests/classic/fullscreen_window/stress.py.ini
new file mode 100644
index 00000000000..a6c136ac885
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/fullscreen_window/stress.py.ini
@@ -0,0 +1,15 @@
+[stress.py]
+  [test_stress[0\]]
+    expected: FAIL
+
+  [test_stress[1\]]
+    expected: FAIL
+
+  [test_stress[2\]]
+    expected: FAIL
+
+  [test_stress[3\]]
+    expected: FAIL
+
+  [test_stress[4\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/fullscreen_window/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/fullscreen_window/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/fullscreen_window/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_active_element/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_active_element/get.py.ini
new file mode 100644
index 00000000000..2d7e863ee5b
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_active_element/get.py.ini
@@ -0,0 +1,6 @@
+[get.py]
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_no_such_element]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_active_element/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_active_element/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_active_element/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_alert_text/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_alert_text/get.py.ini
new file mode 100644
index 00000000000..fa50e27c0d1
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_alert_text/get.py.ini
@@ -0,0 +1,22 @@
+[get.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: ERROR
+
+  [test_no_user_prompt]
+    expected: FAIL
+
+  [test_get_alert_text]
+    expected: FAIL
+
+  [test_get_confirm_text]
+    expected: FAIL
+
+  [test_get_prompt_text]
+    expected: FAIL
+
+  [test_unexpected_alert]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_computed_label/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_computed_label/get.py.ini
new file mode 100644
index 00000000000..6f7cda2f119
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_computed_label/get.py.ini
@@ -0,0 +1,42 @@
+[get.py]
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_no_such_element_with_invalid_value]
+    expected: FAIL
+
+  [test_no_such_element_with_shadow_root]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[closed\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[closed\]]
+    expected: FAIL
+
+  [test_stale_element_reference[top_context\]]
+    expected: FAIL
+
+  [test_stale_element_reference[child_context\]]
+    expected: FAIL
+
+  [test_get_computed_label[<button>ok</button>-button-ok\]]
+    expected: FAIL
+
+  [test_get_computed_label[<button aria-labelledby="one two"></button><div id=one>ok</div><div id=two>go</div>-button-ok go\]]
+    expected: FAIL
+
+  [test_get_computed_label[<button aria-label=foo>bar</button>-button-foo\]]
+    expected: FAIL
+
+  [test_get_computed_label[<label><input> foo</label>-input-foo\]]
+    expected: FAIL
+
+  [test_get_computed_label[<label for=b>foo<label><input id=b>-input-foo\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_computed_label/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_computed_label/user_prompts.py.ini
new file mode 100644
index 00000000000..913351aaa55
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_computed_label/user_prompts.py.ini
@@ -0,0 +1,2 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
\ No newline at end of file
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_computed_role/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_computed_role/get.py.ini
new file mode 100644
index 00000000000..f00172fdc5a
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_computed_role/get.py.ini
@@ -0,0 +1,18 @@
+[get.py]
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_no_such_element_with_shadow_root]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[closed\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[closed\]]
+    expected: FAIL
+
+  [test_computed_roles[<article>foo</article>-article-article\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_computed_role/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_computed_role/user_prompts.py.ini
new file mode 100644
index 00000000000..b168410dab1
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_computed_role/user_prompts.py.ini
@@ -0,0 +1,2 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_current_url/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_current_url/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_current_url/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_attribute/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_attribute/get.py.ini
new file mode 100644
index 00000000000..69b4a4c7d0b
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_element_attribute/get.py.ini
@@ -0,0 +1,94 @@
+[get.py]
+  expected: TIMEOUT
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: ERROR
+
+  [test_no_such_element_with_shadow_root]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[closed\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[closed\]]
+    expected: FAIL
+
+  [test_stale_element_reference[top_context\]]
+    expected: FAIL
+
+  [test_stale_element_reference[child_context\]]
+    expected: FAIL
+
+  [test_normal]
+    expected: FAIL
+
+  [test_boolean_attribute[audio-attrs0\]]
+    expected: FAIL
+
+  [test_boolean_attribute[button-attrs1\]]
+    expected: FAIL
+
+  [test_boolean_attribute[details-attrs2\]]
+    expected: FAIL
+
+  [test_boolean_attribute[dialog-attrs3\]]
+    expected: FAIL
+
+  [test_boolean_attribute[fieldset-attrs4\]]
+    expected: FAIL
+
+  [test_boolean_attribute[form-attrs5\]]
+    expected: FAIL
+
+  [test_boolean_attribute[iframe-attrs6\]]
+    expected: FAIL
+
+  [test_boolean_attribute[img-attrs7\]]
+    expected: FAIL
+
+  [test_boolean_attribute[input-attrs8\]]
+    expected: FAIL
+
+  [test_boolean_attribute[menuitem-attrs9\]]
+    expected: FAIL
+
+  [test_boolean_attribute[ol-attrs10\]]
+    expected: FAIL
+
+  [test_boolean_attribute[optgroup-attrs11\]]
+    expected: FAIL
+
+  [test_boolean_attribute[option-attrs12\]]
+    expected: FAIL
+
+  [test_boolean_attribute[script-attrs13\]]
+    expected: FAIL
+
+  [test_boolean_attribute[select-attrs14\]]
+    expected: FAIL
+
+  [test_boolean_attribute[textarea-attrs15\]]
+    expected: FAIL
+
+  [test_boolean_attribute[track-attrs16\]]
+    expected: FAIL
+
+  [test_boolean_attribute[video-attrs17\]]
+    expected: FAIL
+
+  [test_global_boolean_attributes]
+    expected: FAIL
+
+  [test_anchor_href[relative\]]
+    expected: FAIL
+
+  [test_anchor_href[absolute\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_attribute/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_attribute/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_element_attribute/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_css_value/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_css_value/get.py.ini
new file mode 100644
index 00000000000..d55c5312a47
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_element_css_value/get.py.ini
@@ -0,0 +1,15 @@
+[get.py]
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_no_such_element_with_shadow_root]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[closed\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[closed\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_css_value/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_css_value/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_element_css_value/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_property/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_property/get.py.ini
new file mode 100644
index 00000000000..646e2846e18
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_element_property/get.py.ini
@@ -0,0 +1,94 @@
+[get.py]
+  expected: TIMEOUT
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: ERROR
+
+  [test_no_such_element_with_shadow_root]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[closed\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[closed\]]
+    expected: FAIL
+
+  [test_stale_element_reference[top_context\]]
+    expected: FAIL
+
+  [test_stale_element_reference[child_context\]]
+    expected: FAIL
+
+  [test_property_non_existent]
+    expected: FAIL
+
+  [test_content_attribute]
+    expected: FAIL
+
+  [test_idl_attribute]
+    expected: FAIL
+
+  [test_primitives["foobar"-foobar\]]
+    expected: FAIL
+
+  [test_primitives[42-42\]]
+    expected: FAIL
+
+  [test_primitives[js_primitive2-py_primitive2\]]
+    expected: FAIL
+
+  [test_primitives[js_primitive3-py_primitive3\]]
+    expected: FAIL
+
+  [test_primitives[null-None\]]
+    expected: FAIL
+
+  [test_primitives[undefined-None\]]
+    expected: FAIL
+
+  [test_collection_dom_token_list]
+    expected: FAIL
+
+  [test_primitives_set_by_execute_script["foobar"-foobar\]]
+    expected: FAIL
+
+  [test_primitives_set_by_execute_script[42-42\]]
+    expected: FAIL
+
+  [test_primitives_set_by_execute_script[js_primitive2-py_primitive2\]]
+    expected: FAIL
+
+  [test_primitives_set_by_execute_script[js_primitive3-py_primitive3\]]
+    expected: FAIL
+
+  [test_primitives_set_by_execute_script[null-None\]]
+    expected: FAIL
+
+  [test_primitives_set_by_execute_script[undefined-None\]]
+    expected: FAIL
+
+  [test_web_reference[frame-WebFrame\]]
+    expected: FAIL
+
+  [test_web_reference[shadowRoot-ShadowRoot\]]
+    expected: FAIL
+
+  [test_web_reference[window-WebWindow\]]
+    expected: FAIL
+
+  [test_mutated_element]
+    expected: FAIL
+
+  [test_anchor_href[relative\]]
+    expected: FAIL
+
+  [test_anchor_href[absolute\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_property/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_property/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_element_property/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_rect/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_rect/get.py.ini
new file mode 100644
index 00000000000..67875a58cd9
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_element_rect/get.py.ini
@@ -0,0 +1,18 @@
+[get.py]
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_no_such_element_with_shadow_root]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[closed\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[closed\]]
+    expected: FAIL
+
+  [test_basic]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_rect/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_rect/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_element_rect/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_shadow_root/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_shadow_root/get.py.ini
new file mode 100644
index 00000000000..1b3957f08c8
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_element_shadow_root/get.py.ini
@@ -0,0 +1,33 @@
+[get.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_no_such_element_with_invalid_value]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[closed\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[closed\]]
+    expected: FAIL
+
+  [test_stale_element_reference[top_context\]]
+    expected: FAIL
+
+  [test_stale_element_reference[child_context\]]
+    expected: FAIL
+
+  [test_get_shadow_root]
+    expected: FAIL
+
+  [test_no_shadow_root]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_shadow_root/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_shadow_root/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_element_shadow_root/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_tag_name/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_tag_name/get.py.ini
new file mode 100644
index 00000000000..0ac8ff98d59
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_element_tag_name/get.py.ini
@@ -0,0 +1,18 @@
+[get.py]
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_no_such_element_with_shadow_root]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[closed\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[closed\]]
+    expected: FAIL
+
+  [test_get_element_tag_name]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_tag_name/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_tag_name/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_element_tag_name/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_text/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_text/get.py.ini
new file mode 100644
index 00000000000..ad870f8f49b
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_element_text/get.py.ini
@@ -0,0 +1,36 @@
+[get.py]
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_no_such_element_with_shadow_root]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[closed\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[closed\]]
+    expected: FAIL
+
+  [test_transform_capitalize[space\]]
+    expected: FAIL
+
+  [test_transform_capitalize[dash\]]
+    expected: FAIL
+
+  [test_transform_capitalize[underscore\]]
+    expected: FAIL
+
+  [test_shadow_root_slot[custom outside\]]
+    expected: FAIL
+
+  [test_shadow_root_slot[default visible\]]
+    expected: FAIL
+
+  [test_shadow_root_slot[default outside\]]
+    expected: FAIL
+
+  [test_shadow_root_slot[default hidden\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_text/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_text/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_element_text/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_named_cookie/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_named_cookie/get.py.ini
new file mode 100644
index 00000000000..93b889d3a59
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_named_cookie/get.py.ini
@@ -0,0 +1,12 @@
+[get.py]
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_get_named_session_cookie]
+    expected: FAIL
+
+  [test_get_named_cookie]
+    expected: FAIL
+
+  [test_duplicated_cookie]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_named_cookie/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_named_cookie/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_named_cookie/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_page_source/source.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_page_source/source.py.ini
new file mode 100644
index 00000000000..f1326acbc2f
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_page_source/source.py.ini
@@ -0,0 +1,3 @@
+[source.py]
+  [test_no_browsing_context]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_page_source/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_page_source/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_page_source/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_title/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_title/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_title/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_window_handle/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_window_handle/get.py.ini
new file mode 100644
index 00000000000..0fb70be2b4d
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_window_handle/get.py.ini
@@ -0,0 +1,3 @@
+[get.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_window_handle/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_window_handle/user_prompts.py.ini
new file mode 100644
index 00000000000..0bc849b2704
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_window_handle/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert\]]
+    expected: FAIL
+
+  [test_default[confirm\]]
+    expected: FAIL
+
+  [test_default[prompt\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_window_handles/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_window_handles/user_prompts.py.ini
new file mode 100644
index 00000000000..0bc849b2704
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_window_handles/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert\]]
+    expected: FAIL
+
+  [test_default[confirm\]]
+    expected: FAIL
+
+  [test_default[prompt\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_window_rect/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_window_rect/get.py.ini
new file mode 100644
index 00000000000..3394ac22306
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_window_rect/get.py.ini
@@ -0,0 +1,6 @@
+[get.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_payload]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/get_window_rect/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_window_rect/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/get_window_rect/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/idlharness.window.js.ini b/tests/wpt/meta/webdriver/tests/classic/idlharness.window.js.ini
new file mode 100644
index 00000000000..ee8e266e35f
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/idlharness.window.js.ini
@@ -0,0 +1,6 @@
+[idlharness.window.html]
+  [Navigator interface: attribute webdriver]
+    expected: FAIL
+
+  [Navigator interface: navigator must inherit property "webdriver" with the proper type]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/interface/interface.py.ini b/tests/wpt/meta/webdriver/tests/classic/interface/interface.py.ini
new file mode 100644
index 00000000000..9efc2c79243
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/interface/interface.py.ini
@@ -0,0 +1,3 @@
+[interface.py]
+  [test_navigator_webdriver_active]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/is_element_enabled/enabled.py.ini b/tests/wpt/meta/webdriver/tests/classic/is_element_enabled/enabled.py.ini
new file mode 100644
index 00000000000..1f97f812861
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/is_element_enabled/enabled.py.ini
@@ -0,0 +1,2 @@
+[enabled.py]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/webdriver/tests/classic/is_element_enabled/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/is_element_enabled/user_prompts.py.ini
new file mode 100644
index 00000000000..913351aaa55
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/is_element_enabled/user_prompts.py.ini
@@ -0,0 +1,2 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
\ No newline at end of file
diff --git a/tests/wpt/meta/webdriver/tests/classic/is_element_selected/selected.py.ini b/tests/wpt/meta/webdriver/tests/classic/is_element_selected/selected.py.ini
new file mode 100644
index 00000000000..eb4c0299197
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/is_element_selected/selected.py.ini
@@ -0,0 +1,15 @@
+[selected.py]
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_no_such_element_with_shadow_root]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[closed\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[closed\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/is_element_selected/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/is_element_selected/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/is_element_selected/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/maximize_window/from_minimized_window.py.ini b/tests/wpt/meta/webdriver/tests/classic/maximize_window/from_minimized_window.py.ini
new file mode 100644
index 00000000000..5d3e1ccc1b2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/maximize_window/from_minimized_window.py.ini
@@ -0,0 +1,3 @@
+[from_minimized_window.py]
+  [test_restore_from_minimized]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/maximize_window/maximize.py.ini b/tests/wpt/meta/webdriver/tests/classic/maximize_window/maximize.py.ini
new file mode 100644
index 00000000000..83d5c2fcf84
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/maximize_window/maximize.py.ini
@@ -0,0 +1,21 @@
+[maximize.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_response_payload]
+    expected: FAIL
+
+  [test_fully_exit_fullscreen]
+    expected: FAIL
+
+  [test_maximize_from_normal_window]
+    expected: FAIL
+
+  [test_maximize_with_window_already_at_maximum_size]
+    expected: FAIL
+
+  [test_maximize_twice_is_idempotent]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/maximize_window/stress.py.ini b/tests/wpt/meta/webdriver/tests/classic/maximize_window/stress.py.ini
new file mode 100644
index 00000000000..a6c136ac885
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/maximize_window/stress.py.ini
@@ -0,0 +1,15 @@
+[stress.py]
+  [test_stress[0\]]
+    expected: FAIL
+
+  [test_stress[1\]]
+    expected: FAIL
+
+  [test_stress[2\]]
+    expected: FAIL
+
+  [test_stress[3\]]
+    expected: FAIL
+
+  [test_stress[4\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/maximize_window/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/maximize_window/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/maximize_window/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/minimize_window/minimize.py.ini b/tests/wpt/meta/webdriver/tests/classic/minimize_window/minimize.py.ini
new file mode 100644
index 00000000000..75af78405d0
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/minimize_window/minimize.py.ini
@@ -0,0 +1,21 @@
+[minimize.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_response_payload]
+    expected: FAIL
+
+  [test_restore_from_fullscreen]
+    expected: FAIL
+
+  [test_restore_from_maximized]
+    expected: FAIL
+
+  [test_minimize_from_normal_window]
+    expected: FAIL
+
+  [test_minimize_twice_is_idempotent]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/minimize_window/stress.py.ini b/tests/wpt/meta/webdriver/tests/classic/minimize_window/stress.py.ini
new file mode 100644
index 00000000000..a6c136ac885
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/minimize_window/stress.py.ini
@@ -0,0 +1,15 @@
+[stress.py]
+  [test_stress[0\]]
+    expected: FAIL
+
+  [test_stress[1\]]
+    expected: FAIL
+
+  [test_stress[2\]]
+    expected: FAIL
+
+  [test_stress[3\]]
+    expected: FAIL
+
+  [test_stress[4\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/minimize_window/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/minimize_window/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/minimize_window/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/navigate_to/navigate.py.ini b/tests/wpt/meta/webdriver/tests/classic/navigate_to/navigate.py.ini
new file mode 100644
index 00000000000..2464f4b2b4d
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/navigate_to/navigate.py.ini
@@ -0,0 +1,12 @@
+[navigate.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_seen_nodes[http\]]
+    expected: FAIL
+
+  [test_seen_nodes[https\]]
+    expected: FAIL
+
+  [test_seen_nodes[https coop\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/navigate_to/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/navigate_to/user_prompts.py.ini
new file mode 100644
index 00000000000..fcf10a0526c
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/navigate_to/user_prompts.py.ini
@@ -0,0 +1,73 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-beforeunload\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-beforeunload\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-beforeunload\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[beforeunload-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/new_session/create_alwaysMatch.py.ini b/tests/wpt/meta/webdriver/tests/classic/new_session/create_alwaysMatch.py.ini
new file mode 100644
index 00000000000..c837e638bb0
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/new_session/create_alwaysMatch.py.ini
@@ -0,0 +1,21 @@
+[create_alwaysMatch.py]
+  [test_valid[timeouts-value12\]]
+    expected: FAIL
+
+  [test_valid[strictFileInteractability-True\]]
+    expected: FAIL
+
+  [test_valid[test:extension-False\]]
+    expected: FAIL
+
+  [test_valid[test:extension-abc\]]
+    expected: FAIL
+
+  [test_valid[test:extension-123\]]
+    expected: FAIL
+
+  [test_valid[test:extension-value22\]]
+    expected: FAIL
+
+  [test_valid[test:extension-value23\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/new_session/create_firstMatch.py.ini b/tests/wpt/meta/webdriver/tests/classic/new_session/create_firstMatch.py.ini
new file mode 100644
index 00000000000..3752bebca7b
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/new_session/create_firstMatch.py.ini
@@ -0,0 +1,21 @@
+[create_firstMatch.py]
+  [test_valid[timeouts-value12\]]
+    expected: FAIL
+
+  [test_valid[strictFileInteractability-True\]]
+    expected: FAIL
+
+  [test_valid[test:extension-False\]]
+    expected: FAIL
+
+  [test_valid[test:extension-abc\]]
+    expected: FAIL
+
+  [test_valid[test:extension-123\]]
+    expected: FAIL
+
+  [test_valid[test:extension-value22\]]
+    expected: FAIL
+
+  [test_valid[test:extension-value23\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/new_session/response.py.ini b/tests/wpt/meta/webdriver/tests/classic/new_session/response.py.ini
new file mode 100644
index 00000000000..b5c5cede365
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/new_session/response.py.ini
@@ -0,0 +1,3 @@
+[response.py]
+  [test_capability_user_agent]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/new_session/unhandled_prompt_behavior.py.ini b/tests/wpt/meta/webdriver/tests/classic/new_session/unhandled_prompt_behavior.py.ini
new file mode 100644
index 00000000000..ff2e1c72126
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/new_session/unhandled_prompt_behavior.py.ini
@@ -0,0 +1,24 @@
+[unhandled_prompt_behavior.py]
+  [test_unhandled_prompt_behavior_as_object_default[handler0-expected_capability0-True-True\]]
+    expected: FAIL
+
+  [test_unhandled_prompt_behavior_as_object_default[handler1-expected_capability1-True-False\]]
+    expected: FAIL
+
+  [test_unhandled_prompt_behavior_as_object_default[handler2-expected_capability2-False-True\]]
+    expected: FAIL
+
+  [test_beforeunload_prompts_always_automatically_accepted[accept\]]
+    expected: FAIL
+
+  [test_beforeunload_prompts_always_automatically_accepted[accept and notify\]]
+    expected: FAIL
+
+  [test_beforeunload_prompts_always_automatically_accepted[dismiss\]]
+    expected: FAIL
+
+  [test_beforeunload_prompts_always_automatically_accepted[dismiss and notify\]]
+    expected: FAIL
+
+  [test_beforeunload_prompts_always_automatically_accepted[ignore\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/new_session/websocket_url.py.ini b/tests/wpt/meta/webdriver/tests/classic/new_session/websocket_url.py.ini
new file mode 100644
index 00000000000..76e42fd0ed0
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/new_session/websocket_url.py.ini
@@ -0,0 +1,3 @@
+[websocket_url.py]
+  [test_bidi_upgrade]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/new_window/new.py.ini b/tests/wpt/meta/webdriver/tests/classic/new_window/new.py.ini
new file mode 100644
index 00000000000..7288018eebf
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/new_window/new.py.ini
@@ -0,0 +1,6 @@
+[new.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: ERROR
diff --git a/tests/wpt/meta/webdriver/tests/classic/new_window/new_tab.py.ini b/tests/wpt/meta/webdriver/tests/classic/new_window/new_tab.py.ini
new file mode 100644
index 00000000000..db51a3496ae
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/new_window/new_tab.py.ini
@@ -0,0 +1,9 @@
+[new_tab.py]
+  [test_keeps_current_window_handle]
+    expected: FAIL
+
+  [test_opens_about_blank_in_new_tab]
+    expected: FAIL
+
+  [test_initial_selection_for_contenteditable]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/new_window/new_window.py.ini b/tests/wpt/meta/webdriver/tests/classic/new_window/new_window.py.ini
new file mode 100644
index 00000000000..5ea6fe581f7
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/new_window/new_window.py.ini
@@ -0,0 +1,12 @@
+[new_window.py]
+  [test_payload]
+    expected: FAIL
+
+  [test_keeps_current_window_handle]
+    expected: FAIL
+
+  [test_opens_about_blank_in_new_window]
+    expected: FAIL
+
+  [test_initial_selection_for_contenteditable]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/new_window/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/new_window/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/new_window/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/invalid.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/invalid.py.ini
new file mode 100644
index 00000000000..39649c5204a
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/invalid.py.ini
@@ -0,0 +1,91 @@
+[invalid.py]
+  expected: TIMEOUT
+  [test_input_source_action_sequence_actions_pause_duration_invalid_value[9007199254740992-none\]]
+    expected: FAIL
+
+  [test_input_source_action_sequence_actions_pause_duration_invalid_value[9007199254740992-key\]]
+    expected: FAIL
+
+  [test_input_source_action_sequence_actions_pause_duration_invalid_value[9007199254740992-pointer\]]
+    expected: FAIL
+
+  [test_input_source_action_sequence_actions_pause_duration_invalid_value[9007199254740992-wheel\]]
+    expected: FAIL
+
+  [test_pointer_action_up_down_button_invalid_value[9007199254740992-pointerDown\]]
+    expected: FAIL
+
+  [test_pointer_action_up_down_button_invalid_value[9007199254740992-pointerUp\]]
+    expected: FAIL
+
+  [test_pointer_action_common_properties_dimensions_invalid_value[9007199254740992-width-pointerDown\]]
+    expected: FAIL
+
+  [test_pointer_action_common_properties_dimensions_invalid_value[9007199254740992-width-pointerMove\]]
+    expected: FAIL
+
+  [test_pointer_action_common_properties_dimensions_invalid_value[9007199254740992-width-pointerUp\]]
+    expected: FAIL
+
+  [test_pointer_action_common_properties_dimensions_invalid_value[9007199254740992-height-pointerDown\]]
+    expected: FAIL
+
+  [test_pointer_action_common_properties_dimensions_invalid_value[9007199254740992-height-pointerMove\]]
+    expected: FAIL
+
+  [test_pointer_action_common_properties_dimensions_invalid_value[9007199254740992-height-pointerUp\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_coordinate_invalid_type[None-x\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_coordinate_invalid_type[None-y\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_coordinate_invalid_value[-9007199254740992-x\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_coordinate_invalid_value[-9007199254740992-y\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_coordinate_invalid_value[9007199254740992-x\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_coordinate_invalid_value[9007199254740992-y\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_delta_invalid_type[None-x\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_delta_invalid_type[None-y\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_delta_invalid_value[-9007199254740992-x\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_delta_invalid_value[-9007199254740992-y\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_delta_invalid_value[9007199254740992-x\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_delta_invalid_value[9007199254740992-y\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_origin_pointer_not_supported]
+    expected: FAIL
+
+  [test_wheel_action_scroll_origin_element_invalid_value]
+    expected: FAIL
+
+  [test_wheel_action_scroll_missing_property[x\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_missing_property[y\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_missing_property[deltaX\]]
+    expected: FAIL
+
+  [test_wheel_action_scroll_missing_property[deltaY\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/key.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/key.py.ini
new file mode 100644
index 00000000000..0a9efbca289
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/key.py.ini
@@ -0,0 +1,24 @@
+[key.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_key_down_closes_browsing_context]
+    expected: FAIL
+
+  [test_backspace_erases_keys]
+    expected: FAIL
+
+  [test_element_in_shadow_tree[outer-open\]]
+    expected: FAIL
+
+  [test_element_in_shadow_tree[outer-closed\]]
+    expected: FAIL
+
+  [test_element_in_shadow_tree[inner-open\]]
+    expected: FAIL
+
+  [test_element_in_shadow_tree[inner-closed\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/key_events.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/key_events.py.ini
new file mode 100644
index 00000000000..6dabfbb793f
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/key_events.py.ini
@@ -0,0 +1,273 @@
+[key_events.py]
+  [test_modifier_key_sends_correct_events[\\ue00a-ALT\]]
+    expected: FAIL
+
+  [test_modifier_key_sends_correct_events[\\ue009-CONTROL\]]
+    expected: FAIL
+
+  [test_modifier_key_sends_correct_events[\\ue03d-META\]]
+    expected: FAIL
+
+  [test_modifier_key_sends_correct_events[\\ue008-SHIFT\]]
+    expected: FAIL
+
+  [test_modifier_key_sends_correct_events[\\ue052-R_ALT\]]
+    expected: FAIL
+
+  [test_modifier_key_sends_correct_events[\\ue051-R_CONTROL\]]
+    expected: FAIL
+
+  [test_modifier_key_sends_correct_events[\\ue053-R_META\]]
+    expected: FAIL
+
+  [test_modifier_key_sends_correct_events[\\ue050-R_SHIFT\]]
+    expected: FAIL
+
+  [test_non_printable_key_sends_events[\\ue00c-ESCAPE\]]
+    expected: FAIL
+
+  [test_non_printable_key_sends_events[\\ue014-RIGHT\]]
+    expected: FAIL
+
+  [test_printable_key_sends_correct_events[a-KeyA0\]]
+    expected: FAIL
+
+  [test_printable_key_sends_correct_events[a-KeyA1\]]
+    expected: FAIL
+
+  [test_printable_key_sends_correct_events["-Quote\]]
+    expected: FAIL
+
+  [test_printable_key_sends_correct_events[,-Comma\]]
+    expected: FAIL
+
+  [test_printable_key_sends_correct_events[\\xe0-\]]
+    expected: FAIL
+
+  [test_printable_key_sends_correct_events[\\u0416-\]]
+    expected: FAIL
+
+  [test_printable_key_sends_correct_events[@-Digit2\]]
+    expected: FAIL
+
+  [test_printable_key_sends_correct_events[\\u2603-\]]
+    expected: FAIL
+
+  [test_printable_key_sends_correct_events[\\uf6c2-\]]
+    expected: FAIL
+
+  [test_sequence_of_keydown_printable_keys_sends_events]
+    expected: FAIL
+
+  [test_sequence_of_keydown_printable_characters_sends_events]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[ADD-expected0\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[ALT-expected1\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[BACKSPACE-expected2\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[CANCEL-expected3\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[CLEAR-expected4\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[CONTROL-expected5\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[DECIMAL-expected6\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[DELETE-expected7\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[DIVIDE-expected8\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[DOWN-expected9\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[END-expected10\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[ENTER-expected11\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[EQUALS-expected12\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[ESCAPE-expected13\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[F1-expected14\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[F10-expected15\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[F11-expected16\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[F12-expected17\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[F2-expected18\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[F3-expected19\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[F4-expected20\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[F5-expected21\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[F6-expected22\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[F7-expected23\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[F8-expected24\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[F9-expected25\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[HELP-expected26\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[HOME-expected27\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[INSERT-expected28\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[LEFT-expected29\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[META-expected30\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[MULTIPLY-expected31\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[NULL-expected32\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[NUMPAD0-expected33\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[NUMPAD1-expected34\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[NUMPAD2-expected35\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[NUMPAD3-expected36\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[NUMPAD4-expected37\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[NUMPAD5-expected38\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[NUMPAD6-expected39\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[NUMPAD7-expected40\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[NUMPAD8-expected41\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[NUMPAD9-expected42\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[PAGE_DOWN-expected43\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[PAGE_UP-expected44\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[PAUSE-expected45\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[RETURN-expected46\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[RIGHT-expected47\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[R_ALT-expected48\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[R_ARROWDOWN-expected49\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[R_ARROWLEFT-expected50\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[R_ARROWRIGHT-expected51\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[R_ARROWUP-expected52\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[R_CONTROL-expected53\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[R_DELETE-expected54\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[R_END-expected55\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[R_HOME-expected56\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[R_INSERT-expected57\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[R_META-expected58\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[R_PAGEDOWN-expected59\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[R_PAGEUP-expected60\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[R_SHIFT-expected61\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[SEMICOLON-expected62\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[SEPARATOR-expected63\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[SHIFT-expected64\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[SPACE-expected65\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[SUBTRACT-expected66\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[TAB-expected67\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[UP-expected68\]]
+    expected: FAIL
+
+  [test_special_key_sends_keydown[ZENKAKUHANKAKU-expected69\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/key_modifiers.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/key_modifiers.py.ini
new file mode 100644
index 00000000000..70b4b687388
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/key_modifiers.py.ini
@@ -0,0 +1,12 @@
+[key_modifiers.py]
+  [test_shift_modifier_and_non_printable_keys[\\ue008\]]
+    expected: FAIL
+
+  [test_shift_modifier_and_non_printable_keys[\\ue050\]]
+    expected: FAIL
+
+  [test_shift_modifier_generates_capital_letters[\\ue008\]]
+    expected: FAIL
+
+  [test_shift_modifier_generates_capital_letters[\\ue050\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/key_shortcuts.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/key_shortcuts.py.ini
new file mode 100644
index 00000000000..43e9ac6cf32
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/key_shortcuts.py.ini
@@ -0,0 +1,3 @@
+[key_shortcuts.py]
+  [test_mod_a_mod_c_right_mod_v_pastes_text]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/key_special_keys.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/key_special_keys.py.ini
new file mode 100644
index 00000000000..9f97050ec49
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/key_special_keys.py.ini
@@ -0,0 +1,12 @@
+[key_special_keys.py]
+  [test_codepoint_keys_behave_correctly[\\U0001f604\]]
+    expected: FAIL
+
+  [test_codepoint_keys_behave_correctly[\\U0001f60d\]]
+    expected: FAIL
+
+  [test_codepoint_keys_behave_correctly[\\u0ba8\\u0bbf\]]
+    expected: FAIL
+
+  [test_codepoint_keys_behave_correctly[\\u1100\\u1161\\u11a8\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/key_tentative.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/key_tentative.py.ini
new file mode 100644
index 00000000000..a16bb76d7c7
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/key_tentative.py.ini
@@ -0,0 +1,6 @@
+[key_tentative.py]
+  [test_grapheme_cluster[\\u0e01\\u0e33\]]
+    expected: FAIL
+
+  [test_grapheme_cluster[\\U0001f937\\U0001f3fd\\u200d\\u2640\\ufe0f\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/navigation.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/navigation.py.ini
new file mode 100644
index 00000000000..38af76d3cf4
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/navigation.py.ini
@@ -0,0 +1,6 @@
+[navigation.py]
+  [test_key]
+    expected: FAIL
+
+  [test_pointer]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/none.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/none.py.ini
new file mode 100644
index 00000000000..1dad7888c51
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/none.py.ini
@@ -0,0 +1,6 @@
+[none.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_contextmenu.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_contextmenu.py.ini
new file mode 100644
index 00000000000..e0fb2381634
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_contextmenu.py.ini
@@ -0,0 +1,9 @@
+[pointer_contextmenu.py]
+  [test_control_click[\\ue009-ctrlKey\]]
+    expected: ERROR
+
+  [test_control_click[\\ue051-ctrlKey\]]
+    expected: ERROR
+
+  [test_release_control_click]
+    expected: ERROR
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_dblclick.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_dblclick.py.ini
new file mode 100644
index 00000000000..523d8d29edb
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_dblclick.py.ini
@@ -0,0 +1,9 @@
+[pointer_dblclick.py]
+  [test_dblclick_at_coordinates[0\]]
+    expected: FAIL
+
+  [test_dblclick_at_coordinates[200\]]
+    expected: FAIL
+
+  [test_no_dblclick_when_mouse_moves]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_modifier_click.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_modifier_click.py.ini
new file mode 100644
index 00000000000..ebb9ef4dcc0
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_modifier_click.py.ini
@@ -0,0 +1,21 @@
+[pointer_modifier_click.py]
+  [test_modifier_click[\\ue00a-altKey\]]
+    expected: ERROR
+
+  [test_modifier_click[\\ue052-altKey\]]
+    expected: ERROR
+
+  [test_modifier_click[\\ue03d-metaKey\]]
+    expected: ERROR
+
+  [test_modifier_click[\\ue053-metaKey\]]
+    expected: ERROR
+
+  [test_modifier_click[\\ue008-shiftKey\]]
+    expected: ERROR
+
+  [test_modifier_click[\\ue050-shiftKey\]]
+    expected: ERROR
+
+  [test_many_modifiers_click]
+    expected: ERROR
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_mouse.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_mouse.py.ini
new file mode 100644
index 00000000000..4222966b349
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_mouse.py.ini
@@ -0,0 +1,54 @@
+[pointer_mouse.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_pointer_down_closes_browsing_context]
+    expected: FAIL
+
+  [test_click_at_coordinates]
+    expected: FAIL
+
+  [test_context_menu_at_coordinates]
+    expected: FAIL
+
+  [test_middle_click]
+    expected: FAIL
+
+  [test_click_element_center]
+    expected: FAIL
+
+  [test_click_element_in_shadow_tree[outer-open\]]
+    expected: FAIL
+
+  [test_click_element_in_shadow_tree[outer-closed\]]
+    expected: FAIL
+
+  [test_click_element_in_shadow_tree[inner-open\]]
+    expected: FAIL
+
+  [test_click_element_in_shadow_tree[inner-closed\]]
+    expected: FAIL
+
+  [test_move_to_position_in_viewport[x\]]
+    expected: FAIL
+
+  [test_move_to_position_in_viewport[y\]]
+    expected: FAIL
+
+  [test_move_to_fractional_position]
+    expected: FAIL
+
+  [test_move_to_origin_position_within_frame[viewport\]]
+    expected: FAIL
+
+  [test_move_to_origin_position_within_frame[pointer\]]
+    expected: FAIL
+
+  [test_move_to_origin_position_within_frame[element\]]
+    expected: FAIL
+
+  [test_params_actions_origin_outside_viewport[element\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_mouse_drag.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_mouse_drag.py.ini
new file mode 100644
index 00000000000..3fa735ac7ea
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_mouse_drag.py.ini
@@ -0,0 +1,63 @@
+[pointer_mouse_drag.py]
+  [test_drag_and_drop[20-0-0\]]
+    expected: FAIL
+
+  [test_drag_and_drop[20-0-300\]]
+    expected: FAIL
+
+  [test_drag_and_drop[20-0-800\]]
+    expected: FAIL
+
+  [test_drag_and_drop[0-15-0\]]
+    expected: FAIL
+
+  [test_drag_and_drop[0-15-300\]]
+    expected: FAIL
+
+  [test_drag_and_drop[0-15-800\]]
+    expected: FAIL
+
+  [test_drag_and_drop[10-15-0\]]
+    expected: FAIL
+
+  [test_drag_and_drop[10-15-300\]]
+    expected: FAIL
+
+  [test_drag_and_drop[10-15-800\]]
+    expected: FAIL
+
+  [test_drag_and_drop[-20-0-0\]]
+    expected: FAIL
+
+  [test_drag_and_drop[-20-0-300\]]
+    expected: FAIL
+
+  [test_drag_and_drop[-20-0-800\]]
+    expected: FAIL
+
+  [test_drag_and_drop[10--15-0\]]
+    expected: FAIL
+
+  [test_drag_and_drop[10--15-300\]]
+    expected: FAIL
+
+  [test_drag_and_drop[10--15-800\]]
+    expected: FAIL
+
+  [test_drag_and_drop[-10--15-0\]]
+    expected: FAIL
+
+  [test_drag_and_drop[-10--15-300\]]
+    expected: FAIL
+
+  [test_drag_and_drop[-10--15-800\]]
+    expected: FAIL
+
+  [test_drag_and_drop_with_draggable_element[0\]]
+    expected: FAIL
+
+  [test_drag_and_drop_with_draggable_element[300\]]
+    expected: FAIL
+
+  [test_drag_and_drop_with_draggable_element[800\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_origin.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_origin.py.ini
new file mode 100644
index 00000000000..8102334d66b
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_origin.py.ini
@@ -0,0 +1,18 @@
+[pointer_origin.py]
+  [test_viewport_inside]
+    expected: FAIL
+
+  [test_pointer_inside]
+    expected: FAIL
+
+  [test_element_center_point]
+    expected: FAIL
+
+  [test_element_center_point_with_offset]
+    expected: FAIL
+
+  [test_element_in_view_center_point_partly_visible]
+    expected: FAIL
+
+  [test_element_larger_than_viewport]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_pause_dblclick.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_pause_dblclick.py.ini
new file mode 100644
index 00000000000..106650cb70e
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_pause_dblclick.py.ini
@@ -0,0 +1,6 @@
+[pointer_pause_dblclick.py]
+  [test_dblclick_with_pause_after_second_pointerdown]
+    expected: FAIL
+
+  [test_no_dblclick]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_pen.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_pen.py.ini
new file mode 100644
index 00000000000..5c08076b7b2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_pen.py.ini
@@ -0,0 +1,27 @@
+[pointer_pen.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_pointer_down_closes_browsing_context]
+    expected: FAIL
+
+  [test_pen_pointer_in_shadow_tree[outer-open\]]
+    expected: FAIL
+
+  [test_pen_pointer_in_shadow_tree[outer-closed\]]
+    expected: FAIL
+
+  [test_pen_pointer_in_shadow_tree[inner-open\]]
+    expected: FAIL
+
+  [test_pen_pointer_in_shadow_tree[inner-closed\]]
+    expected: FAIL
+
+  [test_pen_pointer_properties]
+    expected: FAIL
+
+  [test_params_actions_origin_outside_viewport[element\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_touch.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_touch.py.ini
new file mode 100644
index 00000000000..2dd2ee19891
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_touch.py.ini
@@ -0,0 +1,36 @@
+[pointer_touch.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_pointer_down_closes_browsing_context]
+    expected: FAIL
+
+  [test_touch_pointer_in_shadow_tree[outer-open\]]
+    expected: FAIL
+
+  [test_touch_pointer_in_shadow_tree[outer-closed\]]
+    expected: FAIL
+
+  [test_touch_pointer_in_shadow_tree[inner-open\]]
+    expected: FAIL
+
+  [test_touch_pointer_in_shadow_tree[inner-closed\]]
+    expected: FAIL
+
+  [test_touch_pointer_properties]
+    expected: FAIL
+
+  [test_touch_pointer_properties_angle_twist]
+    expected: FAIL
+
+  [test_touch_pointer_properties_tilt_twist]
+    expected: FAIL
+
+  [test_move_to_fractional_position]
+    expected: FAIL
+
+  [test_params_actions_origin_outside_viewport[element\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_tripleclick.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_tripleclick.py.ini
new file mode 100644
index 00000000000..7e0523a6116
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_tripleclick.py.ini
@@ -0,0 +1,3 @@
+[pointer_tripleclick.py]
+  [test_tripleclick_at_coordinates]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/user_prompts.py.ini
new file mode 100644
index 00000000000..ca5401f5012
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/user_prompts.py.ini
@@ -0,0 +1,58 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: ERROR
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: ERROR
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: ERROR
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: ERROR
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: ERROR
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: ERROR
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: ERROR
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: ERROR
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: ERROR
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: ERROR
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: ERROR
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: ERROR
+
+  [test_ignore[capabilities0-alert\]]
+    expected: ERROR
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: ERROR
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: ERROR
+
+  [test_default[alert-None\]]
+    expected: ERROR
+
+  [test_default[confirm-False\]]
+    expected: ERROR
+
+  [test_default[prompt-None\]]
+    expected: ERROR
+
+  [test_dismissed_beforeunload]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/wheel.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/wheel.py.ini
new file mode 100644
index 00000000000..c8a0364b783
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/wheel.py.ini
@@ -0,0 +1,30 @@
+[wheel.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_scroll_not_scrollable]
+    expected: FAIL
+
+  [test_scroll_scrollable_overflow]
+    expected: FAIL
+
+  [test_scroll_iframe]
+    expected: FAIL
+
+  [test_scroll_shadow_tree[outer-open\]]
+    expected: FAIL
+
+  [test_scroll_shadow_tree[outer-closed\]]
+    expected: FAIL
+
+  [test_scroll_shadow_tree[inner-open\]]
+    expected: FAIL
+
+  [test_scroll_shadow_tree[inner-closed\]]
+    expected: FAIL
+
+  [test_scroll_with_key_pressed]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/permissions/set.py.ini b/tests/wpt/meta/webdriver/tests/classic/permissions/set.py.ini
new file mode 100644
index 00000000000..a97d40f6155
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/permissions/set.py.ini
@@ -0,0 +1,9 @@
+[set.py]
+  [test_set_to_state[granted\]]
+    expected: FAIL
+
+  [test_set_to_state[denied\]]
+    expected: FAIL
+
+  [test_set_to_state[prompt\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/print/background.py.ini b/tests/wpt/meta/webdriver/tests/classic/print/background.py.ini
new file mode 100644
index 00000000000..0d71e219071
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/print/background.py.ini
@@ -0,0 +1,9 @@
+[background.py]
+  [test_background[None-iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQIW2P4DwQACfsD/Z8fLAAAAAAASUVORK5CYII=\]]
+    expected: FAIL
+
+  [test_background[True-iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQIW2NgYGD4DwABBAEAwS2OUAAAAABJRU5ErkJggg==\]]
+    expected: FAIL
+
+  [test_background[False-iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQIW2P4DwQACfsD/Z8fLAAAAAAASUVORK5CYII=\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/print/orientation.py.ini b/tests/wpt/meta/webdriver/tests/classic/print/orientation.py.ini
new file mode 100644
index 00000000000..387ff60af8b
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/print/orientation.py.ini
@@ -0,0 +1,9 @@
+[orientation.py]
+  [test_orientation[default\]]
+    expected: FAIL
+
+  [test_orientation[portrait\]]
+    expected: FAIL
+
+  [test_orientation[landscape\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/print/printcmd.py.ini b/tests/wpt/meta/webdriver/tests/classic/print/printcmd.py.ini
new file mode 100644
index 00000000000..5d21a234610
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/print/printcmd.py.ini
@@ -0,0 +1,57 @@
+[printcmd.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_html_document]
+    expected: FAIL
+
+  [test_large_html_document]
+    expected: FAIL
+
+  [test_page_ranges_document[ranges0-expected0\]]
+    expected: FAIL
+
+  [test_page_ranges_document[ranges1-expected1\]]
+    expected: FAIL
+
+  [test_page_ranges_document[ranges2-expected2\]]
+    expected: FAIL
+
+  [test_page_ranges_document[ranges3-expected3\]]
+    expected: FAIL
+
+  [test_page_ranges_document[ranges4-expected4\]]
+    expected: FAIL
+
+  [test_page_ranges_document[ranges5-expected5\]]
+    expected: FAIL
+
+  [test_page_ranges_document[ranges6-expected6\]]
+    expected: FAIL
+
+  [test_page_ranges_document[ranges7-expected7\]]
+    expected: FAIL
+
+  [test_page_ranges_document[ranges8-expected8\]]
+    expected: FAIL
+
+  [test_page_ranges_document[ranges9-expected9\]]
+    expected: FAIL
+
+  [test_page_ranges_document[ranges10-expected10\]]
+    expected: FAIL
+
+  [test_page_ranges_invalid[options9\]]
+    expected: FAIL
+
+  [test_page_ranges_invalid[options10\]]
+    expected: FAIL
+
+  [test_page_ranges_invalid[options11\]]
+    expected: FAIL
+
+  [test_page_ranges_invalid[options12\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/print/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/print/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/print/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/refresh/refresh.py.ini b/tests/wpt/meta/webdriver/tests/classic/refresh/refresh.py.ini
new file mode 100644
index 00000000000..08528d08784
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/refresh/refresh.py.ini
@@ -0,0 +1,21 @@
+[refresh.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_seen_nodes[http\]]
+    expected: FAIL
+
+  [test_seen_nodes[https\]]
+    expected: FAIL
+
+  [test_seen_nodes[https coop\]]
+    expected: FAIL
+
+  [test_history_pushstate]
+    expected: FAIL
+
+  [test_refresh_switches_to_parent_browsing_context]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/refresh/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/refresh/user_prompts.py.ini
new file mode 100644
index 00000000000..fcf10a0526c
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/refresh/user_prompts.py.ini
@@ -0,0 +1,73 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-beforeunload\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-beforeunload\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-beforeunload-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-beforeunload\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[beforeunload-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/release_actions/release.py.ini b/tests/wpt/meta/webdriver/tests/classic/release_actions/release.py.ini
new file mode 100644
index 00000000000..7c5e73584b6
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/release_actions/release.py.ini
@@ -0,0 +1,6 @@
+[release.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/release_actions/sequence.py.ini b/tests/wpt/meta/webdriver/tests/classic/release_actions/sequence.py.ini
new file mode 100644
index 00000000000..6ba3814b563
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/release_actions/sequence.py.ini
@@ -0,0 +1,3 @@
+[sequence.py]
+  [test_release_char_sequence_sends_keyup_events_in_reverse]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/release_actions/sequence_tentative.py.ini b/tests/wpt/meta/webdriver/tests/classic/release_actions/sequence_tentative.py.ini
new file mode 100644
index 00000000000..aed5f673813
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/release_actions/sequence_tentative.py.ini
@@ -0,0 +1,6 @@
+[sequence_tentative.py]
+  [test_release_mouse_sequence_resets_dblclick_state[with release actions\]]
+    expected: FAIL
+
+  [test_release_mouse_sequence_resets_dblclick_state[without release actions\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/send_alert_text/send.py.ini b/tests/wpt/meta/webdriver/tests/classic/send_alert_text/send.py.ini
new file mode 100644
index 00000000000..fc3fe5245a3
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/send_alert_text/send.py.ini
@@ -0,0 +1,3 @@
+[send.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/webdriver/tests/classic/set_timeouts/set.py.ini b/tests/wpt/meta/webdriver/tests/classic/set_timeouts/set.py.ini
new file mode 100644
index 00000000000..bfc9d7723d9
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/set_timeouts/set.py.ini
@@ -0,0 +1,2 @@
+[set.py]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/webdriver/tests/classic/set_timeouts/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/set_timeouts/user_prompts.py.ini
new file mode 100644
index 00000000000..913351aaa55
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/set_timeouts/user_prompts.py.ini
@@ -0,0 +1,2 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
\ No newline at end of file
diff --git a/tests/wpt/meta/webdriver/tests/classic/set_window_rect/from_minimized_window.py.ini b/tests/wpt/meta/webdriver/tests/classic/set_window_rect/from_minimized_window.py.ini
new file mode 100644
index 00000000000..5d3e1ccc1b2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/set_window_rect/from_minimized_window.py.ini
@@ -0,0 +1,3 @@
+[from_minimized_window.py]
+  [test_restore_from_minimized]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/set_window_rect/set.py.ini b/tests/wpt/meta/webdriver/tests/classic/set_window_rect/set.py.ini
new file mode 100644
index 00000000000..6b28c2efdf8
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/set_window_rect/set.py.ini
@@ -0,0 +1,39 @@
+[set.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_restore_from_fullscreen]
+    expected: FAIL
+
+  [test_restore_from_maximized]
+    expected: FAIL
+
+  [test_x_y_floats]
+    expected: FAIL
+
+  [test_set_to_available_size]
+    expected: ERROR
+
+  [test_set_smaller_than_minimum_browser_size]
+    expected: FAIL
+
+  [test_x_y]
+    expected: FAIL
+
+  [test_x_as_current]
+    expected: FAIL
+
+  [test_y_as_current]
+    expected: FAIL
+
+  [test_negative_x_y]
+    expected: ERROR
+
+  [test_set_to_screen_size]
+    expected: ERROR
+
+  [test_set_larger_than_screen_size]
+    expected: ERROR
diff --git a/tests/wpt/meta/webdriver/tests/classic/set_window_rect/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/set_window_rect/user_prompts.py.ini
new file mode 100644
index 00000000000..913351aaa55
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/set_window_rect/user_prompts.py.ini
@@ -0,0 +1,2 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
\ No newline at end of file
diff --git a/tests/wpt/meta/webdriver/tests/classic/switch_to_frame/switch.py.ini b/tests/wpt/meta/webdriver/tests/classic/switch_to_frame/switch.py.ini
new file mode 100644
index 00000000000..ee73fbf4ce8
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/switch_to_frame/switch.py.ini
@@ -0,0 +1,21 @@
+[switch.py]
+  [test_no_top_browsing_context[None\]]
+    expected: FAIL
+
+  [test_no_top_browsing_context[0\]]
+    expected: FAIL
+
+  [test_no_browsing_context[0\]]
+    expected: FAIL
+
+  [test_no_browsing_context[id2\]]
+    expected: FAIL
+
+  [test_no_browsing_context_when_already_top_level]
+    expected: FAIL
+
+  [test_frame_id_shadow_root]
+    expected: FAIL
+
+  [test_frame_id_null]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/switch_to_frame/switch_number.py.ini b/tests/wpt/meta/webdriver/tests/classic/switch_to_frame/switch_number.py.ini
new file mode 100644
index 00000000000..408f2eb2568
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/switch_to_frame/switch_number.py.ini
@@ -0,0 +1,15 @@
+[switch_number.py]
+  [test_frame_id_number_index_out_of_bounds[1\]]
+    expected: FAIL
+
+  [test_frame_id_number_index_out_of_bounds[65535\]]
+    expected: FAIL
+
+  [test_frame_id_number_index[0-foo\]]
+    expected: FAIL
+
+  [test_frame_id_number_index[1-bar\]]
+    expected: FAIL
+
+  [test_frame_id_number_index_nested]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/switch_to_frame/switch_webelement.py.ini b/tests/wpt/meta/webdriver/tests/classic/switch_to_frame/switch_webelement.py.ini
new file mode 100644
index 00000000000..1f469cd85c3
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/switch_to_frame/switch_webelement.py.ini
@@ -0,0 +1,6 @@
+[switch_webelement.py]
+  [test_frame_id_webelement_frame[0-foo\]]
+    expected: FAIL
+
+  [test_frame_id_webelement_frame[1-bar\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/switch_to_parent_frame/switch.py.ini b/tests/wpt/meta/webdriver/tests/classic/switch_to_parent_frame/switch.py.ini
new file mode 100644
index 00000000000..ffd3d06f212
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/switch_to_parent_frame/switch.py.ini
@@ -0,0 +1,6 @@
+[switch.py]
+  [test_switch_from_iframe]
+    expected: FAIL
+
+  [test_switch_from_top_level]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/switch_to_window/alerts.py.ini b/tests/wpt/meta/webdriver/tests/classic/switch_to_window/alerts.py.ini
new file mode 100644
index 00000000000..3e6ad0c8af9
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/switch_to_window/alerts.py.ini
@@ -0,0 +1,3 @@
+[alerts.py]
+  [test_retain_tab_modal_status]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/switch_to_window/switch.py.ini b/tests/wpt/meta/webdriver/tests/classic/switch_to_window/switch.py.ini
new file mode 100644
index 00000000000..9b0ec38199b
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/switch_to_window/switch.py.ini
@@ -0,0 +1,12 @@
+[switch.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_finds_exising_user_prompt_after_tab_switch[alert\]]
+    expected: FAIL
+
+  [test_finds_exising_user_prompt_after_tab_switch[confirm\]]
+    expected: FAIL
+
+  [test_finds_exising_user_prompt_after_tab_switch[prompt\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/take_element_screenshot/iframe.py.ini b/tests/wpt/meta/webdriver/tests/classic/take_element_screenshot/iframe.py.ini
new file mode 100644
index 00000000000..dd77eca9d72
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/take_element_screenshot/iframe.py.ini
@@ -0,0 +1,9 @@
+[iframe.py]
+  [test_frame_element]
+    expected: FAIL
+
+  [test_source_origin[same_origin\]]
+    expected: FAIL
+
+  [test_source_origin[cross_origin\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/take_element_screenshot/screenshot.py.ini b/tests/wpt/meta/webdriver/tests/classic/take_element_screenshot/screenshot.py.ini
new file mode 100644
index 00000000000..981c68641a8
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/take_element_screenshot/screenshot.py.ini
@@ -0,0 +1,21 @@
+[screenshot.py]
+  [test_no_browsing_context]
+    expected: FAIL
+
+  [test_no_such_element_with_invalid_value]
+    expected: FAIL
+
+  [test_no_such_element_with_shadow_root]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_window_handle[closed\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[open\]]
+    expected: FAIL
+
+  [test_no_such_element_from_other_frame[closed\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/take_element_screenshot/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/take_element_screenshot/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/take_element_screenshot/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/take_screenshot/screenshot.py.ini b/tests/wpt/meta/webdriver/tests/classic/take_screenshot/screenshot.py.ini
new file mode 100644
index 00000000000..f2fac7a7fa1
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/take_screenshot/screenshot.py.ini
@@ -0,0 +1,6 @@
+[screenshot.py]
+  [test_no_top_browsing_context]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/take_screenshot/user_prompts.py.ini b/tests/wpt/meta/webdriver/tests/classic/take_screenshot/user_prompts.py.ini
new file mode 100644
index 00000000000..53b6399fdd2
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/classic/take_screenshot/user_prompts.py.ini
@@ -0,0 +1,55 @@
+[user_prompts.py]
+  disabled: https://github.com/servo/servo/issues/35734
+  [test_accept[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    expected: FAIL
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    expected: FAIL
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-alert\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-confirm\]]
+    expected: FAIL
+
+  [test_ignore[capabilities0-prompt\]]
+    expected: FAIL
+
+  [test_default[alert-None\]]
+    expected: FAIL
+
+  [test_default[confirm-False\]]
+    expected: FAIL
+
+  [test_default[prompt-None\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/interop/beforeunload_prompt.py.ini b/tests/wpt/meta/webdriver/tests/interop/beforeunload_prompt.py.ini
new file mode 100644
index 00000000000..8d9822802f0
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/interop/beforeunload_prompt.py.ini
@@ -0,0 +1,60 @@
+[beforeunload_prompt.py]
+  [test_accept[capabilities0-False\]]
+    expected: ERROR
+
+  [test_accept[capabilities0-True\]]
+    expected: ERROR
+
+  [test_accept_and_notify[capabilities0-False\]]
+    expected: ERROR
+
+  [test_accept_and_notify[capabilities0-True\]]
+    expected: ERROR
+
+  [test_dismiss[capabilities0-False\]]
+    expected: ERROR
+
+  [test_dismiss[capabilities0-True\]]
+    expected: ERROR
+
+  [test_dismiss_and_notify[capabilities0-False\]]
+    expected: ERROR
+
+  [test_dismiss_and_notify[capabilities0-True\]]
+    expected: ERROR
+
+  [test_ignore[capabilities0-False\]]
+    expected: ERROR
+
+  [test_ignore[capabilities0-True\]]
+    expected: ERROR
+
+  [test_accept[False\]]
+    expected: ERROR
+
+  [test_accept[True\]]
+    expected: ERROR
+
+  [test_accept_and_notify[False\]]
+    expected: ERROR
+
+  [test_accept_and_notify[True\]]
+    expected: ERROR
+
+  [test_dismiss[False\]]
+    expected: ERROR
+
+  [test_dismiss[True\]]
+    expected: ERROR
+
+  [test_dismiss_and_notify[False\]]
+    expected: ERROR
+
+  [test_dismiss_and_notify[True\]]
+    expected: ERROR
+
+  [test_ignore[False\]]
+    expected: ERROR
+
+  [test_ignore[True\]]
+    expected: ERROR
diff --git a/tests/wpt/meta/webdriver/tests/interop/frames.py.ini b/tests/wpt/meta/webdriver/tests/interop/frames.py.ini
new file mode 100644
index 00000000000..21819720ff1
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/interop/frames.py.ini
@@ -0,0 +1,3 @@
+[frames.py]
+  [test_classic_switch_to_parent_no_browsing_context]
+    expected: ERROR
diff --git a/tests/wpt/meta/webdriver/tests/interop/shared_id_node.py.ini b/tests/wpt/meta/webdriver/tests/interop/shared_id_node.py.ini
new file mode 100644
index 00000000000..07c51098229
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/interop/shared_id_node.py.ini
@@ -0,0 +1,18 @@
+[shared_id_node.py]
+  [test_web_element_reference_created_in_classic]
+    expected: ERROR
+
+  [test_web_element_reference_created_in_bidi]
+    expected: ERROR
+
+  [test_shadow_root_reference_created_in_classic[open\]]
+    expected: ERROR
+
+  [test_shadow_root_reference_created_in_classic[closed\]]
+    expected: ERROR
+
+  [test_shadow_root_reference_created_in_bidi[open\]]
+    expected: ERROR
+
+  [test_shadow_root_reference_created_in_bidi[closed\]]
+    expected: ERROR
diff --git a/tests/wpt/meta/webdriver/tests/interop/shared_id_window.py.ini b/tests/wpt/meta/webdriver/tests/interop/shared_id_window.py.ini
new file mode 100644
index 00000000000..7dc97d71d7e
--- /dev/null
+++ b/tests/wpt/meta/webdriver/tests/interop/shared_id_window.py.ini
@@ -0,0 +1,15 @@
+[shared_id_window.py]
+  [test_top_level_context_id_equals_window_handle]
+    expected: ERROR
+
+  [test_web_window_reference_created_in_classic]
+    expected: ERROR
+
+  [test_web_frame_reference_created_in_classic]
+    expected: ERROR
+
+  [test_web_window_reference_created_in_bidi]
+    expected: ERROR
+
+  [test_web_frame_reference_created_in_bidi]
+    expected: ERROR
diff --git a/tests/wpt/meta/webgl/idlharness.any.js.ini b/tests/wpt/meta/webgl/idlharness.any.js.ini
index 141402eab89..aab7517c7e5 100644
--- a/tests/wpt/meta/webgl/idlharness.any.js.ini
+++ b/tests/wpt/meta/webgl/idlharness.any.js.ini
@@ -8,3870 +8,12 @@
   [WebGL2RenderingContext includes WebGL2RenderingContextOverloads: member names are unique]
     expected: FAIL
 
-  [WebGLQuery interface: existence and properties of interface object]
-    expected: FAIL
-
-  [WebGLQuery interface object length]
-    expected: FAIL
-
-  [WebGLQuery interface object name]
-    expected: FAIL
-
-  [WebGLQuery interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [WebGLQuery interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [WebGLQuery interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [WebGLSampler interface: existence and properties of interface object]
-    expected: FAIL
-
-  [WebGLSampler interface object length]
-    expected: FAIL
-
-  [WebGLSampler interface object name]
-    expected: FAIL
-
-  [WebGLSampler interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [WebGLSampler interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [WebGLSampler interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [WebGLSync interface: existence and properties of interface object]
-    expected: FAIL
-
-  [WebGLSync interface object length]
-    expected: FAIL
-
-  [WebGLSync interface object name]
-    expected: FAIL
-
-  [WebGLSync interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [WebGLSync interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [WebGLSync interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [WebGLTransformFeedback interface: existence and properties of interface object]
-    expected: FAIL
-
-  [WebGLTransformFeedback interface object length]
-    expected: FAIL
-
-  [WebGLTransformFeedback interface object name]
-    expected: FAIL
-
-  [WebGLTransformFeedback interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [WebGLTransformFeedback interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [WebGLTransformFeedback interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [WebGLVertexArrayObject interface: existence and properties of interface object]
-    expected: FAIL
-
-  [WebGLVertexArrayObject interface object length]
-    expected: FAIL
-
-  [WebGLVertexArrayObject interface object name]
-    expected: FAIL
-
-  [WebGLVertexArrayObject interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [WebGLVertexArrayObject interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [WebGLVertexArrayObject interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: existence and properties of interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface object length]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface object name]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_BUFFER_BIT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_BUFFER_BIT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BUFFER_BIT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BUFFER_BIT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_BUFFER_BIT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_BUFFER_BIT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant POINTS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant POINTS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINES on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINES on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINE_LOOP on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINE_LOOP on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINE_STRIP on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINE_STRIP on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRIANGLES on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRIANGLES on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRIANGLE_STRIP on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRIANGLE_STRIP on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRIANGLE_FAN on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRIANGLE_FAN on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ZERO on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ZERO on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ONE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ONE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SRC_COLOR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SRC_COLOR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ONE_MINUS_SRC_COLOR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ONE_MINUS_SRC_COLOR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SRC_ALPHA on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SRC_ALPHA on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ONE_MINUS_SRC_ALPHA on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ONE_MINUS_SRC_ALPHA on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DST_ALPHA on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DST_ALPHA on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ONE_MINUS_DST_ALPHA on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ONE_MINUS_DST_ALPHA on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DST_COLOR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DST_COLOR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ONE_MINUS_DST_COLOR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ONE_MINUS_DST_COLOR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SRC_ALPHA_SATURATE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SRC_ALPHA_SATURATE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FUNC_ADD on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FUNC_ADD on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_EQUATION on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_EQUATION on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_EQUATION_RGB on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_EQUATION_RGB on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_EQUATION_ALPHA on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_EQUATION_ALPHA on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FUNC_SUBTRACT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FUNC_SUBTRACT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FUNC_REVERSE_SUBTRACT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FUNC_REVERSE_SUBTRACT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_DST_RGB on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_DST_RGB on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_SRC_RGB on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_SRC_RGB on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_DST_ALPHA on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_DST_ALPHA on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_SRC_ALPHA on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_SRC_ALPHA on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CONSTANT_COLOR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CONSTANT_COLOR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ONE_MINUS_CONSTANT_COLOR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ONE_MINUS_CONSTANT_COLOR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CONSTANT_ALPHA on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CONSTANT_ALPHA on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ONE_MINUS_CONSTANT_ALPHA on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ONE_MINUS_CONSTANT_ALPHA on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_COLOR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND_COLOR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ARRAY_BUFFER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ARRAY_BUFFER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ELEMENT_ARRAY_BUFFER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ELEMENT_ARRAY_BUFFER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ARRAY_BUFFER_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ARRAY_BUFFER_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ELEMENT_ARRAY_BUFFER_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ELEMENT_ARRAY_BUFFER_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STREAM_DRAW on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STREAM_DRAW on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STATIC_DRAW on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STATIC_DRAW on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DYNAMIC_DRAW on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DYNAMIC_DRAW on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BUFFER_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BUFFER_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BUFFER_USAGE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BUFFER_USAGE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CURRENT_VERTEX_ATTRIB on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CURRENT_VERTEX_ATTRIB on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRONT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRONT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BACK on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BACK on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRONT_AND_BACK on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRONT_AND_BACK on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CULL_FACE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CULL_FACE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLEND on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DITHER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DITHER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_TEST on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_TEST on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_TEST on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_TEST on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SCISSOR_TEST on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SCISSOR_TEST on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant POLYGON_OFFSET_FILL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant POLYGON_OFFSET_FILL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLE_ALPHA_TO_COVERAGE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLE_ALPHA_TO_COVERAGE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLE_COVERAGE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLE_COVERAGE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NO_ERROR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NO_ERROR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INVALID_ENUM on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INVALID_ENUM on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INVALID_VALUE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INVALID_VALUE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INVALID_OPERATION on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INVALID_OPERATION on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant OUT_OF_MEMORY on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant OUT_OF_MEMORY on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CW on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CW on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CCW on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CCW on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINE_WIDTH on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINE_WIDTH on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ALIASED_POINT_SIZE_RANGE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ALIASED_POINT_SIZE_RANGE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ALIASED_LINE_WIDTH_RANGE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ALIASED_LINE_WIDTH_RANGE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CULL_FACE_MODE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CULL_FACE_MODE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRONT_FACE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRONT_FACE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_RANGE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_RANGE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_WRITEMASK on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_WRITEMASK on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_CLEAR_VALUE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_CLEAR_VALUE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_FUNC on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_FUNC on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_CLEAR_VALUE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_CLEAR_VALUE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_FUNC on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_FUNC on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_FAIL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_FAIL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_PASS_DEPTH_FAIL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_PASS_DEPTH_FAIL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_PASS_DEPTH_PASS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_PASS_DEPTH_PASS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_REF on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_REF on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_VALUE_MASK on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_VALUE_MASK on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_WRITEMASK on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_WRITEMASK on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BACK_FUNC on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BACK_FUNC on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BACK_FAIL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BACK_FAIL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BACK_PASS_DEPTH_FAIL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BACK_PASS_DEPTH_FAIL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BACK_PASS_DEPTH_PASS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BACK_PASS_DEPTH_PASS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BACK_REF on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BACK_REF on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BACK_VALUE_MASK on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BACK_VALUE_MASK on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BACK_WRITEMASK on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BACK_WRITEMASK on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VIEWPORT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VIEWPORT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SCISSOR_BOX on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SCISSOR_BOX on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_CLEAR_VALUE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_CLEAR_VALUE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_WRITEMASK on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_WRITEMASK on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_ALIGNMENT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_ALIGNMENT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PACK_ALIGNMENT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PACK_ALIGNMENT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_TEXTURE_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_TEXTURE_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VIEWPORT_DIMS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VIEWPORT_DIMS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SUBPIXEL_BITS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SUBPIXEL_BITS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RED_BITS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RED_BITS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant GREEN_BITS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant GREEN_BITS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLUE_BITS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BLUE_BITS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ALPHA_BITS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ALPHA_BITS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_BITS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_BITS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BITS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_BITS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant POLYGON_OFFSET_UNITS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant POLYGON_OFFSET_UNITS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant POLYGON_OFFSET_FACTOR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant POLYGON_OFFSET_FACTOR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_BINDING_2D on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_BINDING_2D on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLE_BUFFERS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLE_BUFFERS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLES on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLES on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLE_COVERAGE_VALUE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLE_COVERAGE_VALUE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLE_COVERAGE_INVERT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLE_COVERAGE_INVERT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COMPRESSED_TEXTURE_FORMATS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COMPRESSED_TEXTURE_FORMATS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DONT_CARE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DONT_CARE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FASTEST on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FASTEST on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NICEST on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NICEST on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant GENERATE_MIPMAP_HINT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant GENERATE_MIPMAP_HINT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BYTE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BYTE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_BYTE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_BYTE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SHORT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SHORT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_SHORT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_SHORT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_COMPONENT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_COMPONENT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ALPHA on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ALPHA on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LUMINANCE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LUMINANCE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LUMINANCE_ALPHA on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LUMINANCE_ALPHA on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_SHORT_4_4_4_4 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_SHORT_4_4_4_4 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_SHORT_5_5_5_1 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_SHORT_5_5_5_1 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_SHORT_5_6_5 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_SHORT_5_6_5 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAGMENT_SHADER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAGMENT_SHADER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_SHADER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_SHADER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VERTEX_ATTRIBS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VERTEX_ATTRIBS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VERTEX_UNIFORM_VECTORS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VERTEX_UNIFORM_VECTORS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VARYING_VECTORS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VARYING_VECTORS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_COMBINED_TEXTURE_IMAGE_UNITS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_COMBINED_TEXTURE_IMAGE_UNITS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VERTEX_TEXTURE_IMAGE_UNITS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VERTEX_TEXTURE_IMAGE_UNITS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_TEXTURE_IMAGE_UNITS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_TEXTURE_IMAGE_UNITS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_FRAGMENT_UNIFORM_VECTORS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_FRAGMENT_UNIFORM_VECTORS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SHADER_TYPE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SHADER_TYPE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DELETE_STATUS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DELETE_STATUS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINK_STATUS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINK_STATUS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VALIDATE_STATUS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VALIDATE_STATUS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ATTACHED_SHADERS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ATTACHED_SHADERS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ACTIVE_UNIFORMS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ACTIVE_UNIFORMS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ACTIVE_ATTRIBUTES on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ACTIVE_ATTRIBUTES on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SHADING_LANGUAGE_VERSION on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SHADING_LANGUAGE_VERSION on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CURRENT_PROGRAM on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CURRENT_PROGRAM on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NEVER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NEVER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LESS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LESS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant EQUAL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant EQUAL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LEQUAL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LEQUAL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant GREATER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant GREATER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NOTEQUAL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NOTEQUAL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant GEQUAL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant GEQUAL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ALWAYS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ALWAYS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant KEEP on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant KEEP on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant REPLACE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant REPLACE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INCR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INCR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DECR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DECR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INVERT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INVERT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INCR_WRAP on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INCR_WRAP on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DECR_WRAP on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DECR_WRAP on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VENDOR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VENDOR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERSION on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERSION on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NEAREST on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NEAREST on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINEAR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINEAR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NEAREST_MIPMAP_NEAREST on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NEAREST_MIPMAP_NEAREST on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINEAR_MIPMAP_NEAREST on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINEAR_MIPMAP_NEAREST on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NEAREST_MIPMAP_LINEAR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NEAREST_MIPMAP_LINEAR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINEAR_MIPMAP_LINEAR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LINEAR_MIPMAP_LINEAR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_MAG_FILTER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_MAG_FILTER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_MIN_FILTER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_MIN_FILTER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_WRAP_S on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_WRAP_S on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_WRAP_T on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_WRAP_T on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_2D on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_2D on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_CUBE_MAP on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_CUBE_MAP on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_BINDING_CUBE_MAP on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_BINDING_CUBE_MAP on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_CUBE_MAP_POSITIVE_X on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_CUBE_MAP_POSITIVE_X on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_CUBE_MAP_NEGATIVE_X on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_CUBE_MAP_NEGATIVE_X on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_CUBE_MAP_POSITIVE_Y on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_CUBE_MAP_POSITIVE_Y on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_CUBE_MAP_NEGATIVE_Y on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_CUBE_MAP_NEGATIVE_Y on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_CUBE_MAP_POSITIVE_Z on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_CUBE_MAP_POSITIVE_Z on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_CUBE_MAP_NEGATIVE_Z on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_CUBE_MAP_NEGATIVE_Z on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_CUBE_MAP_TEXTURE_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_CUBE_MAP_TEXTURE_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE0 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE0 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE1 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE1 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE2 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE2 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE3 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE3 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE4 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE4 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE5 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE5 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE6 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE6 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE7 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE7 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE8 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE8 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE9 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE9 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE10 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE10 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE11 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE11 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE12 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE12 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE13 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE13 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE14 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE14 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE15 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE15 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE16 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE16 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE17 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE17 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE18 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE18 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE19 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE19 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE20 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE20 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE21 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE21 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE22 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE22 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE23 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE23 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE24 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE24 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE25 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE25 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE26 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE26 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE27 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE27 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE28 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE28 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE29 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE29 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE30 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE30 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE31 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE31 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ACTIVE_TEXTURE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ACTIVE_TEXTURE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant REPEAT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant REPEAT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CLAMP_TO_EDGE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CLAMP_TO_EDGE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MIRRORED_REPEAT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MIRRORED_REPEAT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_VEC2 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_VEC2 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_VEC3 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_VEC3 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_VEC4 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_VEC4 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_VEC2 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_VEC2 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_VEC3 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_VEC3 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_VEC4 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_VEC4 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BOOL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BOOL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BOOL_VEC2 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BOOL_VEC2 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BOOL_VEC3 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BOOL_VEC3 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BOOL_VEC4 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BOOL_VEC4 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT2 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT2 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT3 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT3 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT4 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT4 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_2D on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_2D on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_CUBE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_CUBE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_ENABLED on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_ENABLED on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_STRIDE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_STRIDE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_TYPE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_TYPE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_NORMALIZED on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_NORMALIZED on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_POINTER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_POINTER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_BUFFER_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_BUFFER_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant IMPLEMENTATION_COLOR_READ_TYPE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant IMPLEMENTATION_COLOR_READ_TYPE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant IMPLEMENTATION_COLOR_READ_FORMAT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant IMPLEMENTATION_COLOR_READ_FORMAT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COMPILE_STATUS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COMPILE_STATUS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LOW_FLOAT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LOW_FLOAT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MEDIUM_FLOAT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MEDIUM_FLOAT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant HIGH_FLOAT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant HIGH_FLOAT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LOW_INT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant LOW_INT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MEDIUM_INT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MEDIUM_INT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant HIGH_INT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant HIGH_INT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA4 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA4 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB5_A1 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB5_A1 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB565 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB565 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_COMPONENT16 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_COMPONENT16 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_INDEX8 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_INDEX8 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_STENCIL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_STENCIL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_WIDTH on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_WIDTH on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_HEIGHT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_HEIGHT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_INTERNAL_FORMAT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_INTERNAL_FORMAT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_RED_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_RED_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_GREEN_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_GREEN_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_BLUE_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_BLUE_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_ALPHA_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_ALPHA_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_DEPTH_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_DEPTH_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_STENCIL_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_STENCIL_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_OBJECT_NAME on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_OBJECT_NAME on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT0 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT0 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_ATTACHMENT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_ATTACHMENT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_ATTACHMENT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL_ATTACHMENT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_STENCIL_ATTACHMENT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_STENCIL_ATTACHMENT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NONE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant NONE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_COMPLETE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_COMPLETE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_INCOMPLETE_ATTACHMENT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_INCOMPLETE_ATTACHMENT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_INCOMPLETE_DIMENSIONS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_INCOMPLETE_DIMENSIONS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_UNSUPPORTED on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_UNSUPPORTED on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_RENDERBUFFER_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_RENDERBUFFER_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INVALID_FRAMEBUFFER_OPERATION on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INVALID_FRAMEBUFFER_OPERATION on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_FLIP_Y_WEBGL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_FLIP_Y_WEBGL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_PREMULTIPLY_ALPHA_WEBGL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_PREMULTIPLY_ALPHA_WEBGL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CONTEXT_LOST_WEBGL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CONTEXT_LOST_WEBGL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_COLORSPACE_CONVERSION_WEBGL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_COLORSPACE_CONVERSION_WEBGL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BROWSER_DEFAULT_WEBGL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant BROWSER_DEFAULT_WEBGL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: attribute canvas]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: attribute drawingBufferWidth]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: attribute drawingBufferHeight]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getContextAttributes()]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation isContextLost()]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getSupportedExtensions()]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getExtension(DOMString)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation activeTexture(GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation attachShader(WebGLProgram, WebGLShader)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation bindAttribLocation(WebGLProgram, GLuint, DOMString)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation bindBuffer(GLenum, WebGLBuffer?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation bindFramebuffer(GLenum, WebGLFramebuffer?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation bindRenderbuffer(GLenum, WebGLRenderbuffer?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation bindTexture(GLenum, WebGLTexture?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation blendColor(GLclampf, GLclampf, GLclampf, GLclampf)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation blendEquation(GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation blendEquationSeparate(GLenum, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation blendFunc(GLenum, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation blendFuncSeparate(GLenum, GLenum, GLenum, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation checkFramebufferStatus(GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation clear(GLbitfield)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation clearColor(GLclampf, GLclampf, GLclampf, GLclampf)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation clearDepth(GLclampf)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation clearStencil(GLint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation colorMask(GLboolean, GLboolean, GLboolean, GLboolean)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation compileShader(WebGLShader)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation copyTexImage2D(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation copyTexSubImage2D(GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation createBuffer()]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation createFramebuffer()]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation createProgram()]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation createRenderbuffer()]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation createShader(GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation createTexture()]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation cullFace(GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation deleteBuffer(WebGLBuffer?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation deleteFramebuffer(WebGLFramebuffer?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation deleteProgram(WebGLProgram?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation deleteRenderbuffer(WebGLRenderbuffer?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation deleteShader(WebGLShader?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation deleteTexture(WebGLTexture?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation depthFunc(GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation depthMask(GLboolean)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation depthRange(GLclampf, GLclampf)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation detachShader(WebGLProgram, WebGLShader)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation disable(GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation disableVertexAttribArray(GLuint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation drawArrays(GLenum, GLint, GLsizei)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation drawElements(GLenum, GLsizei, GLenum, GLintptr)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation enable(GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation enableVertexAttribArray(GLuint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation finish()]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation flush()]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation framebufferRenderbuffer(GLenum, GLenum, GLenum, WebGLRenderbuffer?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation framebufferTexture2D(GLenum, GLenum, GLenum, WebGLTexture?, GLint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation frontFace(GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation generateMipmap(GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getActiveAttrib(WebGLProgram, GLuint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getActiveUniform(WebGLProgram, GLuint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getAttachedShaders(WebGLProgram)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getAttribLocation(WebGLProgram, DOMString)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getBufferParameter(GLenum, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getParameter(GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getError()]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getFramebufferAttachmentParameter(GLenum, GLenum, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getProgramParameter(WebGLProgram, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getProgramInfoLog(WebGLProgram)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getRenderbufferParameter(GLenum, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getShaderParameter(WebGLShader, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getShaderPrecisionFormat(GLenum, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getShaderInfoLog(WebGLShader)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getShaderSource(WebGLShader)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getTexParameter(GLenum, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getUniform(WebGLProgram, WebGLUniformLocation)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getUniformLocation(WebGLProgram, DOMString)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getVertexAttrib(GLuint, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getVertexAttribOffset(GLuint, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation hint(GLenum, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation isBuffer(WebGLBuffer?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation isEnabled(GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation isFramebuffer(WebGLFramebuffer?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation isProgram(WebGLProgram?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation isRenderbuffer(WebGLRenderbuffer?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation isShader(WebGLShader?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation isTexture(WebGLTexture?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation lineWidth(GLfloat)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation linkProgram(WebGLProgram)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation pixelStorei(GLenum, GLint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation polygonOffset(GLfloat, GLfloat)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation renderbufferStorage(GLenum, GLenum, GLsizei, GLsizei)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation sampleCoverage(GLclampf, GLboolean)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation scissor(GLint, GLint, GLsizei, GLsizei)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation shaderSource(WebGLShader, DOMString)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation stencilFunc(GLenum, GLint, GLuint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation stencilFuncSeparate(GLenum, GLenum, GLint, GLuint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation stencilMask(GLuint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation stencilMaskSeparate(GLenum, GLuint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation stencilOp(GLenum, GLenum, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation stencilOpSeparate(GLenum, GLenum, GLenum, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation texParameterf(GLenum, GLenum, GLfloat)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation texParameteri(GLenum, GLenum, GLint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation uniform1f(WebGLUniformLocation?, GLfloat)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation uniform2f(WebGLUniformLocation?, GLfloat, GLfloat)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation uniform3f(WebGLUniformLocation?, GLfloat, GLfloat, GLfloat)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation uniform4f(WebGLUniformLocation?, GLfloat, GLfloat, GLfloat, GLfloat)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation uniform1i(WebGLUniformLocation?, GLint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation uniform2i(WebGLUniformLocation?, GLint, GLint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation uniform3i(WebGLUniformLocation?, GLint, GLint, GLint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation uniform4i(WebGLUniformLocation?, GLint, GLint, GLint, GLint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation useProgram(WebGLProgram?)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation validateProgram(WebGLProgram)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation vertexAttrib1f(GLuint, GLfloat)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation vertexAttrib2f(GLuint, GLfloat, GLfloat)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation vertexAttrib3f(GLuint, GLfloat, GLfloat, GLfloat)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation vertexAttrib4f(GLuint, GLfloat, GLfloat, GLfloat, GLfloat)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation vertexAttrib1fv(GLuint, Float32List)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation vertexAttrib2fv(GLuint, Float32List)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation vertexAttrib3fv(GLuint, Float32List)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation vertexAttrib4fv(GLuint, Float32List)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation vertexAttribPointer(GLuint, GLint, GLenum, GLboolean, GLsizei, GLintptr)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation viewport(GLint, GLint, GLsizei, GLsizei)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant READ_BUFFER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant READ_BUFFER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_ROW_LENGTH on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_ROW_LENGTH on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_SKIP_ROWS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_SKIP_ROWS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_SKIP_PIXELS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_SKIP_PIXELS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PACK_ROW_LENGTH on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PACK_ROW_LENGTH on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PACK_SKIP_ROWS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PACK_SKIP_ROWS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PACK_SKIP_PIXELS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PACK_SKIP_PIXELS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STENCIL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RED on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RED on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB8 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB8 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA8 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA8 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB10_A2 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB10_A2 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_BINDING_3D on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_BINDING_3D on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_SKIP_IMAGES on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_SKIP_IMAGES on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_IMAGE_HEIGHT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNPACK_IMAGE_HEIGHT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_3D on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_3D on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_WRAP_R on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_WRAP_R on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_3D_TEXTURE_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_3D_TEXTURE_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_2_10_10_10_REV on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_2_10_10_10_REV on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_ELEMENTS_VERTICES on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_ELEMENTS_VERTICES on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_ELEMENTS_INDICES on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_ELEMENTS_INDICES on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_MIN_LOD on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_MIN_LOD on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_MAX_LOD on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_MAX_LOD on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_BASE_LEVEL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_BASE_LEVEL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_MAX_LEVEL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_MAX_LEVEL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MIN on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MIN on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_COMPONENT24 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_COMPONENT24 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_TEXTURE_LOD_BIAS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_TEXTURE_LOD_BIAS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_COMPARE_MODE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_COMPARE_MODE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_COMPARE_FUNC on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_COMPARE_FUNC on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CURRENT_QUERY on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CURRENT_QUERY on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant QUERY_RESULT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant QUERY_RESULT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant QUERY_RESULT_AVAILABLE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant QUERY_RESULT_AVAILABLE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STREAM_READ on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STREAM_READ on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STREAM_COPY on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STREAM_COPY on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STATIC_READ on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STATIC_READ on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STATIC_COPY on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant STATIC_COPY on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DYNAMIC_READ on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DYNAMIC_READ on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DYNAMIC_COPY on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DYNAMIC_COPY on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_DRAW_BUFFERS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_DRAW_BUFFERS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER0 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER0 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER1 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER1 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER2 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER2 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER3 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER3 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER4 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER4 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER5 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER5 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER6 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER6 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER7 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER7 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER8 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER8 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER9 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER9 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER10 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER10 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER11 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER11 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER12 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER12 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER13 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER13 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER14 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER14 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER15 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_BUFFER15 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_FRAGMENT_UNIFORM_COMPONENTS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_FRAGMENT_UNIFORM_COMPONENTS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VERTEX_UNIFORM_COMPONENTS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VERTEX_UNIFORM_COMPONENTS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_3D on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_3D on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_2D_SHADOW on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_2D_SHADOW on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAGMENT_SHADER_DERIVATIVE_HINT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAGMENT_SHADER_DERIVATIVE_HINT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PIXEL_PACK_BUFFER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PIXEL_PACK_BUFFER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PIXEL_UNPACK_BUFFER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PIXEL_UNPACK_BUFFER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PIXEL_PACK_BUFFER_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PIXEL_PACK_BUFFER_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PIXEL_UNPACK_BUFFER_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant PIXEL_UNPACK_BUFFER_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT2x3 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT2x3 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT2x4 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT2x4 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT3x2 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT3x2 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT3x4 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT3x4 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT4x2 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT4x2 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT4x3 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_MAT4x3 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SRGB on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SRGB on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SRGB8 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SRGB8 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SRGB8_ALPHA8 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SRGB8_ALPHA8 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COMPARE_REF_TO_TEXTURE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COMPARE_REF_TO_TEXTURE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA32F on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA32F on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB32F on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB32F on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA16F on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA16F on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB16F on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB16F on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_INTEGER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_INTEGER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_ARRAY_TEXTURE_LAYERS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_ARRAY_TEXTURE_LAYERS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MIN_PROGRAM_TEXEL_OFFSET on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MIN_PROGRAM_TEXEL_OFFSET on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_PROGRAM_TEXEL_OFFSET on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_PROGRAM_TEXEL_OFFSET on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VARYING_COMPONENTS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VARYING_COMPONENTS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_2D_ARRAY on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_2D_ARRAY on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_BINDING_2D_ARRAY on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_BINDING_2D_ARRAY on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R11F_G11F_B10F on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R11F_G11F_B10F on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_10F_11F_11F_REV on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_10F_11F_11F_REV on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB9_E5 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB9_E5 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_5_9_9_9_REV on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_5_9_9_9_REV on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_BUFFER_MODE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_BUFFER_MODE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_VARYINGS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_VARYINGS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_BUFFER_START on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_BUFFER_START on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_BUFFER_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_BUFFER_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RASTERIZER_DISCARD on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RASTERIZER_DISCARD on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INTERLEAVED_ATTRIBS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INTERLEAVED_ATTRIBS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SEPARATE_ATTRIBS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SEPARATE_ATTRIBS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_BUFFER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_BUFFER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_BUFFER_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_BUFFER_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA32UI on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA32UI on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB32UI on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB32UI on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA16UI on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA16UI on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB16UI on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB16UI on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA8UI on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA8UI on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB8UI on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB8UI on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA32I on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA32I on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB32I on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB32I on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA16I on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA16I on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB16I on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB16I on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA8I on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA8I on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB8I on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB8I on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RED_INTEGER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RED_INTEGER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB_INTEGER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB_INTEGER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA_INTEGER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA_INTEGER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_2D_ARRAY on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_2D_ARRAY on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_2D_ARRAY_SHADOW on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_2D_ARRAY_SHADOW on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_CUBE_SHADOW on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_CUBE_SHADOW on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_VEC2 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_VEC2 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_VEC3 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_VEC3 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_VEC4 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_VEC4 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_SAMPLER_2D on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_SAMPLER_2D on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_SAMPLER_3D on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_SAMPLER_3D on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_SAMPLER_CUBE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_SAMPLER_CUBE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_SAMPLER_2D_ARRAY on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_SAMPLER_2D_ARRAY on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_SAMPLER_2D on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_SAMPLER_2D on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_SAMPLER_3D on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_SAMPLER_3D on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_SAMPLER_CUBE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_SAMPLER_CUBE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_SAMPLER_2D_ARRAY on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_SAMPLER_2D_ARRAY on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_COMPONENT32F on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH_COMPONENT32F on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH32F_STENCIL8 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH32F_STENCIL8 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_32_UNSIGNED_INT_24_8_REV on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FLOAT_32_UNSIGNED_INT_24_8_REV on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_RED_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_RED_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_GREEN_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_GREEN_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_BLUE_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_BLUE_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_DEFAULT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_DEFAULT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_24_8 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_INT_24_8 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH24_STENCIL8 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DEPTH24_STENCIL8 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_NORMALIZED on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNED_NORMALIZED on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_FRAMEBUFFER_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_FRAMEBUFFER_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant READ_FRAMEBUFFER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant READ_FRAMEBUFFER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_FRAMEBUFFER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant DRAW_FRAMEBUFFER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant READ_FRAMEBUFFER_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant READ_FRAMEBUFFER_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_SAMPLES on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RENDERBUFFER_SAMPLES on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_COLOR_ATTACHMENTS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_COLOR_ATTACHMENTS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT1 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT1 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT2 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT2 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT3 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT3 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT4 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT4 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT5 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT5 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT6 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT6 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT7 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT7 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT8 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT8 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT9 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT9 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT10 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT10 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT11 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT11 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT12 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT12 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT13 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT13 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT14 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT14 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT15 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COLOR_ATTACHMENT15 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_INCOMPLETE_MULTISAMPLE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant FRAMEBUFFER_INCOMPLETE_MULTISAMPLE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_SAMPLES on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_SAMPLES on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant HALF_FLOAT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant HALF_FLOAT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG_INTEGER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG_INTEGER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R8 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R8 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG8 on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG8 on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R16F on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R16F on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R32F on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R32F on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG16F on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG16F on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG32F on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG32F on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R8I on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R8I on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R8UI on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R8UI on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R16I on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R16I on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R16UI on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R16UI on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R32I on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R32I on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R32UI on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R32UI on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG8I on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG8I on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG8UI on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG8UI on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG16I on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG16I on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG16UI on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG16UI on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG32I on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG32I on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG32UI on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG32UI on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ARRAY_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ARRAY_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R8_SNORM on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant R8_SNORM on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG8_SNORM on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RG8_SNORM on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB8_SNORM on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB8_SNORM on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA8_SNORM on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGBA8_SNORM on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SIGNED_NORMALIZED on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SIGNED_NORMALIZED on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COPY_READ_BUFFER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COPY_READ_BUFFER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COPY_WRITE_BUFFER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COPY_WRITE_BUFFER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COPY_READ_BUFFER_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COPY_READ_BUFFER_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COPY_WRITE_BUFFER_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant COPY_WRITE_BUFFER_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BUFFER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BUFFER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BUFFER_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BUFFER_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BUFFER_START on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BUFFER_START on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BUFFER_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BUFFER_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VERTEX_UNIFORM_BLOCKS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VERTEX_UNIFORM_BLOCKS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_FRAGMENT_UNIFORM_BLOCKS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_FRAGMENT_UNIFORM_BLOCKS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_COMBINED_UNIFORM_BLOCKS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_COMBINED_UNIFORM_BLOCKS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_UNIFORM_BUFFER_BINDINGS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_UNIFORM_BUFFER_BINDINGS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_UNIFORM_BLOCK_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_UNIFORM_BLOCK_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BUFFER_OFFSET_ALIGNMENT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BUFFER_OFFSET_ALIGNMENT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ACTIVE_UNIFORM_BLOCKS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ACTIVE_UNIFORM_BLOCKS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_TYPE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_TYPE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BLOCK_INDEX on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BLOCK_INDEX on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_OFFSET on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_OFFSET on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_ARRAY_STRIDE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_ARRAY_STRIDE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_MATRIX_STRIDE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_MATRIX_STRIDE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_IS_ROW_MAJOR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_IS_ROW_MAJOR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BLOCK_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BLOCK_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BLOCK_DATA_SIZE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BLOCK_DATA_SIZE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BLOCK_ACTIVE_UNIFORMS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BLOCK_ACTIVE_UNIFORMS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INVALID_INDEX on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INVALID_INDEX on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VERTEX_OUTPUT_COMPONENTS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_VERTEX_OUTPUT_COMPONENTS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_FRAGMENT_INPUT_COMPONENTS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_FRAGMENT_INPUT_COMPONENTS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_SERVER_WAIT_TIMEOUT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_SERVER_WAIT_TIMEOUT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant OBJECT_TYPE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant OBJECT_TYPE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SYNC_CONDITION on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SYNC_CONDITION on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SYNC_STATUS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SYNC_STATUS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SYNC_FLAGS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SYNC_FLAGS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SYNC_FENCE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SYNC_FENCE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SYNC_GPU_COMMANDS_COMPLETE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SYNC_GPU_COMMANDS_COMPLETE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNALED on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant UNSIGNALED on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SIGNALED on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SIGNALED on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ALREADY_SIGNALED on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ALREADY_SIGNALED on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TIMEOUT_EXPIRED on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TIMEOUT_EXPIRED on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CONDITION_SATISFIED on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant CONDITION_SATISFIED on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant WAIT_FAILED on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant WAIT_FAILED on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SYNC_FLUSH_COMMANDS_BIT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SYNC_FLUSH_COMMANDS_BIT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_DIVISOR on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant VERTEX_ATTRIB_ARRAY_DIVISOR on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ANY_SAMPLES_PASSED on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ANY_SAMPLES_PASSED on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ANY_SAMPLES_PASSED_CONSERVATIVE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant ANY_SAMPLES_PASSED_CONSERVATIVE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant SAMPLER_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB10_A2UI on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant RGB10_A2UI on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_2_10_10_10_REV on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant INT_2_10_10_10_REV on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_PAUSED on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_PAUSED on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_ACTIVE on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_ACTIVE on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_BINDING on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TRANSFORM_FEEDBACK_BINDING on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_IMMUTABLE_FORMAT on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_IMMUTABLE_FORMAT on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_ELEMENT_INDEX on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_ELEMENT_INDEX on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_IMMUTABLE_LEVELS on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TEXTURE_IMMUTABLE_LEVELS on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TIMEOUT_IGNORED on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant TIMEOUT_IGNORED on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_CLIENT_WAIT_TIMEOUT_WEBGL on interface object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: constant MAX_CLIENT_WAIT_TIMEOUT_WEBGL on interface prototype object]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation copyBufferSubData(GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr)]
-    expected: FAIL
-
   [WebGL2RenderingContext interface: operation getBufferSubData(GLenum, GLintptr, ArrayBufferView, optional GLuint, optional GLuint)]
     expected: FAIL
 
-  [WebGL2RenderingContext interface: operation blitFramebuffer(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation framebufferTextureLayer(GLenum, GLenum, WebGLTexture?, GLint, GLint)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation invalidateFramebuffer(GLenum, sequence<GLenum>)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation invalidateSubFramebuffer(GLenum, sequence<GLenum>, GLint, GLint, GLsizei, GLsizei)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation readBuffer(GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation getInternalformatParameter(GLenum, GLenum, GLenum)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation renderbufferStorageMultisample(GLenum, GLsizei, GLenum, GLsizei, GLsizei)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation texStorage2D(GLenum, GLsizei, GLenum, GLsizei, GLsizei)]
-    expected: FAIL
-
-  [WebGL2RenderingContext interface: operation texStorage3D(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei)]
-    expected: FAIL
-
   [WebGL2RenderingContext interface: operation texImage3D(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, GLintptr)]
     expected: FAIL
 
-  [WebGL2RenderingContext interface: operation bufferData(GLenum, GLsizeiptr, GLenum)]
-    expected: FAIL
-
   [WebGLRenderingContext interface: attribute drawingBufferColorSpace]
     expected: FAIL
 
@@ -3884,9 +26,6 @@
   [WebGL2RenderingContext interface: attribute unpackColorSpace]
     expected: FAIL
 
-  [WebGL2RenderingContext interface: operation getBufferSubData(GLenum, GLintptr, ArrayBufferView, optional unsigned long long, optional GLuint)]
-    expected: FAIL
-
   [WebGLRenderingContext interface: constant RGBA8 on interface object]
     expected: FAIL
 
diff --git a/tests/wpt/meta/webidl/ecmascript-binding/global-object-implicit-this-value-cross-realm.html.ini b/tests/wpt/meta/webidl/ecmascript-binding/global-object-implicit-this-value-cross-realm.html.ini
index 492ba730948..b63c174f353 100644
--- a/tests/wpt/meta/webidl/ecmascript-binding/global-object-implicit-this-value-cross-realm.html.ini
+++ b/tests/wpt/meta/webidl/ecmascript-binding/global-object-implicit-this-value-cross-realm.html.ini
@@ -1,6 +1,3 @@
 [global-object-implicit-this-value-cross-realm.html]
-  [Cross-realm global object's operation throws when called on incompatible object]
-    expected: FAIL
-
   [Cross-realm global object's operation called on null / undefined]
     expected: FAIL
diff --git a/tests/wpt/meta/webidl/ecmascript-binding/sequence-conversion.html.ini b/tests/wpt/meta/webidl/ecmascript-binding/sequence-conversion.html.ini
deleted file mode 100644
index 059896ad46b..00000000000
--- a/tests/wpt/meta/webidl/ecmascript-binding/sequence-conversion.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[sequence-conversion.html]
-  [An array]
-    expected: FAIL
-
-  [A generator]
-    expected: FAIL
-
-  [An array with an overridden Symbol.iterator]
-    expected: FAIL
-
-  [An array with an overridden Symbol.iterator on the prototype]
-    expected: FAIL
-
-  [An array with an overridden %ArrayIterator%.prototype.next]
-    expected: FAIL
-
-  [A holey array with fallback to an accessor on the prototype]
-    expected: FAIL
diff --git a/tests/wpt/meta/webmessaging/broadcastchannel/service-worker.https.html.ini b/tests/wpt/meta/webmessaging/broadcastchannel/service-worker.https.html.ini
index 528ea797432..aea3da08f49 100644
--- a/tests/wpt/meta/webmessaging/broadcastchannel/service-worker.https.html.ini
+++ b/tests/wpt/meta/webmessaging/broadcastchannel/service-worker.https.html.ini
@@ -1,3 +1,2 @@
 [service-worker.https.html]
-  [BroadcastChannel works in service workers]
-    expected: FAIL
+  expected: ERROR
diff --git a/tests/wpt/meta/webmessaging/message-channels/close-event/explicitly-closed.tentative.window.js.ini b/tests/wpt/meta/webmessaging/message-channels/close-event/explicitly-closed.tentative.window.js.ini
deleted file mode 100644
index c625c16f713..00000000000
--- a/tests/wpt/meta/webmessaging/message-channels/close-event/explicitly-closed.tentative.window.js.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[explicitly-closed.tentative.window.html]
-  expected: TIMEOUT
-  [Close event on port2 is fired when port1 is explicitly closed]
-    expected: TIMEOUT
-
-  [Close event on port2 is fired when port1, which is in a different window, is explicitly closed.]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta/webmessaging/messageerror.html.ini b/tests/wpt/meta/webmessaging/messageerror.html.ini
deleted file mode 100644
index 9b875551f90..00000000000
--- a/tests/wpt/meta/webmessaging/messageerror.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[messageerror.html]
-  [The onmessageerror content attribute must be compiled into the onmessageerror property]
-    expected: FAIL
-
-  [The onmessageerror content attribute must execute when an event is dispatched on the window]
-    expected: FAIL
diff --git a/tests/wpt/meta/webxr/__dir__.ini b/tests/wpt/meta/webxr/__dir__.ini
index 2e3a5cdb659..04a3ad88f8c 100644
--- a/tests/wpt/meta/webxr/__dir__.ini
+++ b/tests/wpt/meta/webxr/__dir__.ini
@@ -1 +1 @@
-prefs: [dom_webxr_test: true, dom_webgl2_enabled: true, dom_webxr_layers_enabled: true]
\ No newline at end of file
+prefs: [dom_webxr_test: true, dom_webxr_layers_enabled: true]
diff --git a/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html.ini b/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html.ini
index bd9620affc4..7a87b24f90b 100644
--- a/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html.ini
+++ b/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html.ini
@@ -5,3 +5,9 @@
 
   [Ensures getDepthInformation() throws when not run in an active frame, `cpu-optimized` - webgl2]
     expected: FAIL
+
+  [Ensures appropriate depth methods and attributes throw when not run in an active frame, `cpu-optimized` - webgl]
+    expected: FAIL
+
+  [Ensures appropriate depth methods and attributes throw when not run in an active frame, `cpu-optimized` - webgl2]
+    expected: FAIL
diff --git a/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_matchDepthViewIdentity.https.html.ini b/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_matchDepthViewIdentity.https.html.ini
new file mode 100644
index 00000000000..ce3fb065178
--- /dev/null
+++ b/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_matchDepthViewIdentity.https.html.ini
@@ -0,0 +1,19 @@
+[depth_sensing_cpu_matchDepthViewIdentity.https.html]
+  expected: ERROR
+  [Ensures XRViewGeometry values are identity when matchDepthView is unset, `cpu-optimized` - webgl]
+    expected: TIMEOUT
+
+  [Ensures XRViewGeometry values are identity when matchDepthView is unset, `cpu-optimized` - webgl2]
+    expected: NOTRUN
+
+  [Ensures XRViewGeometry values are identity when matchDepthView=true, `cpu-optimized` - webgl]
+    expected: NOTRUN
+
+  [Ensures XRViewGeometry values are identity when matchDepthView=true, `cpu-optimized` - webgl2]
+    expected: NOTRUN
+
+  [Ensures session can be created when matchDepthView=false, `cpu-optimized` - webgl]
+    expected: NOTRUN
+
+  [Ensures session can be created when matchDepthView=false, `cpu-optimized` - webgl2]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_pauseResume.https.html.ini b/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_pauseResume.https.html.ini
new file mode 100644
index 00000000000..ca6a05243bf
--- /dev/null
+++ b/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_pauseResume.https.html.ini
@@ -0,0 +1,7 @@
+[depth_sensing_cpu_pauseResume.https.html]
+  expected: ERROR
+  [Ensures appropriate data availability with (pause|resume)DepthSensing, `cpu-optimized` - webgl]
+    expected: FAIL
+
+  [Ensures appropriate data availability with (pause|resume)DepthSensing, `cpu-optimized` - webgl2]
+    expected: FAIL
diff --git a/tests/wpt/meta/webxr/depth-sensing/depth_sensing_attributes_throw_not_enabled.https.html.ini b/tests/wpt/meta/webxr/depth-sensing/depth_sensing_attributes_throw_not_enabled.https.html.ini
new file mode 100644
index 00000000000..210402e756c
--- /dev/null
+++ b/tests/wpt/meta/webxr/depth-sensing/depth_sensing_attributes_throw_not_enabled.https.html.ini
@@ -0,0 +1,18 @@
+[depth_sensing_attributes_throw_not_enabled.https.html]
+  [XRSession.depthUsage rejects if depth sensing is not enabled on a session - webgl]
+    expected: FAIL
+
+  [XRSession.depthUsage rejects if depth sensing is not enabled on a session - webgl2]
+    expected: FAIL
+
+  [XRSession.depthDataFormat rejects if depth sensing is not enabled on a session - webgl]
+    expected: FAIL
+
+  [XRSession.depthDataFormat rejects if depth sensing is not enabled on a session - webgl2]
+    expected: FAIL
+
+  [XRSession.depthType rejects if depth sensing is not enabled on a session - webgl]
+    expected: FAIL
+
+  [XRSession.depthType rejects if depth sensing is not enabled on a session - webgl2]
+    expected: FAIL
diff --git a/tests/wpt/meta/webxr/depth-sensing/depth_type_request_respected.https.html.ini b/tests/wpt/meta/webxr/depth-sensing/depth_type_request_respected.https.html.ini
new file mode 100644
index 00000000000..65f6a3d5d38
--- /dev/null
+++ b/tests/wpt/meta/webxr/depth-sensing/depth_type_request_respected.https.html.ini
@@ -0,0 +1,24 @@
+[depth_type_request_respected.https.html]
+  [Can grant sessions that request a raw depth type - webgl]
+    expected: FAIL
+
+  [Can grant sessions that request a raw depth type - webgl2]
+    expected: FAIL
+
+  [Can grant sessions that request a smooth depth type - webgl]
+    expected: FAIL
+
+  [Can grant sessions that request a smooth depth type - webgl2]
+    expected: FAIL
+
+  [Can grant sessions that request empty depth type - webgl]
+    expected: FAIL
+
+  [Can grant sessions that request empty depth type - webgl2]
+    expected: FAIL
+
+  [Can grant sessions that don't request depth type - webgl]
+    expected: FAIL
+
+  [Can grant sessions that don't request depth type - webgl2]
+    expected: FAIL
diff --git a/tests/wpt/meta/webxr/depth-sensing/gpu/depth_sensing_gpu_matchDepthViewIdentity.https.html.ini b/tests/wpt/meta/webxr/depth-sensing/gpu/depth_sensing_gpu_matchDepthViewIdentity.https.html.ini
new file mode 100644
index 00000000000..54901a8468a
--- /dev/null
+++ b/tests/wpt/meta/webxr/depth-sensing/gpu/depth_sensing_gpu_matchDepthViewIdentity.https.html.ini
@@ -0,0 +1,19 @@
+[depth_sensing_gpu_matchDepthViewIdentity.https.html]
+  expected: ERROR
+  [Ensures XRViewGeometry values are identity when matchDepthView is unset, `gpu-optimized` - webgl]
+    expected: TIMEOUT
+
+  [Ensures XRViewGeometry values are identity when matchDepthView is unset, `gpu-optimized` - webgl2]
+    expected: NOTRUN
+
+  [Ensures XRViewGeometry values are identity when matchDepthView=true, `gpu-optimized` - webgl]
+    expected: NOTRUN
+
+  [Ensures XRViewGeometry values are identity when matchDepthView=true, `gpu-optimized` - webgl2]
+    expected: NOTRUN
+
+  [Ensures session can be created when matchDepthView=false, `gpu-optimized` - webgl]
+    expected: NOTRUN
+
+  [Ensures session can be created when matchDepthView=false, `gpu-optimized` - webgl2]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/webxr/depth-sensing/gpu/depth_sensing_gpu_pauseResume.https.html.ini b/tests/wpt/meta/webxr/depth-sensing/gpu/depth_sensing_gpu_pauseResume.https.html.ini
new file mode 100644
index 00000000000..1a75367f8bb
--- /dev/null
+++ b/tests/wpt/meta/webxr/depth-sensing/gpu/depth_sensing_gpu_pauseResume.https.html.ini
@@ -0,0 +1,7 @@
+[depth_sensing_gpu_pauseResume.https.html]
+  expected: ERROR
+  [Ensures appropriate data availability with (pause|resume)DepthSensing, `gpu-optimized` - webgl]
+    expected: FAIL
+
+  [Ensures appropriate data availability with (pause|resume)DepthSensing, `gpu-optimized` - webgl2]
+    expected: FAIL
diff --git a/tests/wpt/meta/webxr/idlharness.https.window.js.ini b/tests/wpt/meta/webxr/idlharness.https.window.js.ini
index 4ca151762fe..e8e048ea6ab 100644
--- a/tests/wpt/meta/webxr/idlharness.https.window.js.ini
+++ b/tests/wpt/meta/webxr/idlharness.https.window.js.ini
@@ -235,3 +235,9 @@
 
   [XRSession interface: xrSession must inherit property "trackedSources" with the proper type]
     expected: FAIL
+
+  [XRRenderState interface: attribute passthroughFullyObscured]
+    expected: FAIL
+
+  [XRRenderState interface: xrRenderState must inherit property "passthroughFullyObscured" with the proper type]
+    expected: FAIL
diff --git a/tests/wpt/meta/workers/WorkerNavigator.any.js.ini b/tests/wpt/meta/workers/WorkerNavigator.any.js.ini
index 9f6e56150ef..02500985497 100644
--- a/tests/wpt/meta/workers/WorkerNavigator.any.js.ini
+++ b/tests/wpt/meta/workers/WorkerNavigator.any.js.ini
@@ -3,7 +3,3 @@
 
 [WorkerNavigator.any.serviceworker.html]
   expected: ERROR
-
-[WorkerNavigator.any.worker.html]
-  [Testing Navigator properties on workers.]
-    expected: FAIL
diff --git a/tests/wpt/meta/workers/WorkerNavigator_userAgentData.https.tentative.html.ini b/tests/wpt/meta/workers/WorkerNavigator_userAgentData.https.tentative.html.ini
new file mode 100644
index 00000000000..76300218f64
--- /dev/null
+++ b/tests/wpt/meta/workers/WorkerNavigator_userAgentData.https.tentative.html.ini
@@ -0,0 +1,3 @@
+[WorkerNavigator_userAgentData.https.tentative.html]
+  [Platform version and wow64-ness on Linux should contain fixed values]
+    expected: FAIL
diff --git a/tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini
deleted file mode 100644
index 80f9a4f15b8..00000000000
--- a/tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/workers/semantics/structured-clone/dedicated.html.ini b/tests/wpt/meta/workers/semantics/structured-clone/dedicated.html.ini
index 377052e91ee..eb509b54b7d 100644
--- a/tests/wpt/meta/workers/semantics/structured-clone/dedicated.html.ini
+++ b/tests/wpt/meta/workers/semantics/structured-clone/dedicated.html.ini
@@ -55,6 +55,3 @@
 
   [Growable SharedArrayBuffer]
     expected: FAIL
-
-  [A subclass instance will be received as its closest transferable superclass]
-    expected: PRECONDITION_FAILED
diff --git a/tests/wpt/meta/xhr/access-control-preflight-request-header-sorted.htm.ini b/tests/wpt/meta/xhr/access-control-preflight-request-header-sorted.htm.ini
deleted file mode 100644
index e255515d6a8..00000000000
--- a/tests/wpt/meta/xhr/access-control-preflight-request-header-sorted.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[access-control-preflight-request-header-sorted.htm]
-  [Tests that Access-Control-Request-Headers are sorted.]
-    expected: FAIL
diff --git a/tests/wpt/meta/xhr/formdata/append.any.js.ini b/tests/wpt/meta/xhr/formdata/append.any.js.ini
new file mode 100644
index 00000000000..e727a77e38d
--- /dev/null
+++ b/tests/wpt/meta/xhr/formdata/append.any.js.ini
@@ -0,0 +1,8 @@
+[append.any.worker.html]
+  [testFormDataAppendEmptyBlob]
+    expected: FAIL
+
+
+[append.any.html]
+  [testFormDataAppendEmptyBlob]
+    expected: FAIL
diff --git a/tests/wpt/meta/xhr/formdata/set-blob.any.js.ini b/tests/wpt/meta/xhr/formdata/set-blob.any.js.ini
deleted file mode 100644
index aee33830031..00000000000
--- a/tests/wpt/meta/xhr/formdata/set-blob.any.js.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[set-blob.any.html]
-  [file with lastModified and custom name]
-    expected: FAIL
-
-
-[set-blob.any.worker.html]
-  [file with lastModified and custom name]
-    expected: FAIL
diff --git a/tests/wpt/meta/xhr/overridemimetype-blob.html.ini b/tests/wpt/meta/xhr/overridemimetype-blob.html.ini
index 3424d718dbb..42b0d19862a 100644
--- a/tests/wpt/meta/xhr/overridemimetype-blob.html.ini
+++ b/tests/wpt/meta/xhr/overridemimetype-blob.html.ini
@@ -2,137 +2,20 @@
   [2) MIME types need to be parsed and serialized: TEXT/HTML;CHARSET=GBK]
     expected: FAIL
 
-  [3) MIME types need to be parsed and serialized: text/html;charset=gbk(]
-    expected: FAIL
-
-  [4) MIME types need to be parsed and serialized: text/html;x=(;charset=gbk]
-    expected: FAIL
-
-  [5) MIME types need to be parsed and serialized: text/html;charset=gbk;charset=windows-1255]
-    expected: FAIL
-
-  [6) MIME types need to be parsed and serialized: text/html;charset=();charset=GBK]
-    expected: FAIL
-
-  [7) MIME types need to be parsed and serialized: text/html;charset =gbk]
-    expected: FAIL
-
-  [8) MIME types need to be parsed and serialized: text/html ;charset=gbk]
-    expected: FAIL
-
-  [9) MIME types need to be parsed and serialized: text/html; charset=gbk]
-    expected: FAIL
-
-  [10) MIME types need to be parsed and serialized: text/html;charset= gbk]
-    expected: FAIL
-
-  [11) MIME types need to be parsed and serialized: text/html;charset= "gbk"]
-    expected: FAIL
-
-  [12) MIME types need to be parsed and serialized: text/html;charset=\x0bgbk]
-    expected: FAIL
-
-  [13) MIME types need to be parsed and serialized: text/html;charset=\x0cgbk]
-    expected: FAIL
-
-  [14) MIME types need to be parsed and serialized: text/html;\x0bcharset=gbk]
-    expected: FAIL
-
-  [15) MIME types need to be parsed and serialized: text/html;\x0ccharset=gbk]
-    expected: FAIL
-
-  [19) MIME types need to be parsed and serialized: text/html;charset=';charset=GBK]
-    expected: FAIL
-
-  [20) MIME types need to be parsed and serialized: text/html;test;charset=gbk]
-    expected: FAIL
-
-  [21) MIME types need to be parsed and serialized: text/html;test=;charset=gbk]
-    expected: FAIL
-
-  [22) MIME types need to be parsed and serialized: text/html;';charset=gbk]
-    expected: FAIL
-
-  [23) MIME types need to be parsed and serialized: text/html;";charset=gbk]
-    expected: FAIL
-
-  [24) MIME types need to be parsed and serialized: text/html ; ; charset=gbk]
-    expected: FAIL
-
-  [25) MIME types need to be parsed and serialized: text/html;;;;charset=gbk]
-    expected: FAIL
-
   [26) MIME types need to be parsed and serialized: text/html;charset= ";charset=GBK]
     expected: FAIL
 
   [27) MIME types need to be parsed and serialized: text/html;charset=";charset=foo";charset=GBK]
     expected: FAIL
 
-  [28) MIME types need to be parsed and serialized: text/html;charset="gbk"]
-    expected: FAIL
-
-  [29) MIME types need to be parsed and serialized: text/html;charset="gbk]
-    expected: FAIL
-
-  [30) MIME types need to be parsed and serialized: text/html;charset=gbk"]
-    expected: FAIL
-
-  [33) MIME types need to be parsed and serialized: text/html;charset="\\ gbk"]
-    expected: FAIL
-
-  [34) MIME types need to be parsed and serialized: text/html;charset="\\g\\b\\k"]
-    expected: FAIL
-
-  [35) MIME types need to be parsed and serialized: text/html;charset="gbk"x]
-    expected: FAIL
-
-  [36) MIME types need to be parsed and serialized: text/html;charset="";charset=GBK]
-    expected: FAIL
-
   [37) MIME types need to be parsed and serialized: text/html;charset=";charset=GBK]
     expected: FAIL
 
-  [38) MIME types need to be parsed and serialized: text/html;charset={gbk}]
-    expected: FAIL
-
-  [41) MIME types need to be parsed and serialized: text/html;a\]=bar;b[=bar;c=bar]
-    expected: FAIL
-
-  [43) MIME types need to be parsed and serialized: text/html;in\]valid=";asd=foo";foo=bar]
-    expected: FAIL
-
   [44) MIME types need to be parsed and serialized: !#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz/!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz;!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz=!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz]
     expected: FAIL
 
   [45) MIME types need to be parsed and serialized: x/x;x="\t !\\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ"]
     expected: FAIL
 
-  [46) MIME types need to be parsed and serialized: x/x;test]
-    expected: FAIL
-
-  [47) MIME types need to be parsed and serialized: x/x;test="\\]
-    expected: FAIL
-
-  [48) MIME types need to be parsed and serialized: x/x;x= ]
-    expected: FAIL
-
-  [49) MIME types need to be parsed and serialized: x/x;x=\t]
-    expected: FAIL
-
-  [50) MIME types need to be parsed and serialized: x/x\n\r\t ;x=x]
-    expected: FAIL
-
-  [51) MIME types need to be parsed and serialized: \n\r\t x/x;x=x\n\r\t ]
-    expected: FAIL
-
-  [52) MIME types need to be parsed and serialized: x/x;\n\r\t x=x\n\r\t ;x=y]
-    expected: FAIL
-
   [53) MIME types need to be parsed and serialized: text/html;test=ÿ;charset=gbk]
     expected: FAIL
-
-  [54) MIME types need to be parsed and serialized: x/x;test=�;x=x]
-    expected: FAIL
-
-  [63) MIME types need to be parsed and serialized: bogus/]
-    expected: FAIL
diff --git a/tests/wpt/meta/xhr/progressevent-constructor.html.ini b/tests/wpt/meta/xhr/progressevent-constructor.html.ini
deleted file mode 100644
index 766a8c4a205..00000000000
--- a/tests/wpt/meta/xhr/progressevent-constructor.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[progressevent-constructor.html]
-  [Decimal number test.]
-    expected: FAIL
-
-  [Mixed integer and decimal number test.]
-    expected: FAIL
-
-  [Negative number.]
-    expected: FAIL
diff --git a/tests/wpt/meta/xhr/send-content-type-charset.htm.ini b/tests/wpt/meta/xhr/send-content-type-charset.htm.ini
index 50f0261fd52..b30fab0e927 100644
--- a/tests/wpt/meta/xhr/send-content-type-charset.htm.ini
+++ b/tests/wpt/meta/xhr/send-content-type-charset.htm.ini
@@ -2,9 +2,6 @@
   [charset given but wrong, fix it (unknown MIME, bogus charset)]
     expected: FAIL
 
-  [If charset= param is UTF-8 (case-insensitive), it should not be changed (bogus charset)]
-    expected: FAIL
-
   [charset given but wrong, fix it (known MIME, actual charset)]
     expected: FAIL
 
@@ -17,8 +14,5 @@
   [charset in double quotes with space]
     expected: FAIL
 
-  [charset in double quotes with backslashes that is UTF-8 does not change]
-    expected: FAIL
-
   [unknown parameters need to be preserved]
     expected: FAIL
diff --git a/tests/wpt/meta/xhr/setrequestheader-content-type.htm.ini b/tests/wpt/meta/xhr/setrequestheader-content-type.htm.ini
index 70476943add..35bb7bb2a51 100644
--- a/tests/wpt/meta/xhr/setrequestheader-content-type.htm.ini
+++ b/tests/wpt/meta/xhr/setrequestheader-content-type.htm.ini
@@ -8,8 +8,5 @@
   [HTML Document request keeps setRequestHeader() Content-Type, with charset adjusted to UTF-8]
     expected: FAIL
 
-  [FormData request has correct default Content-Type of "multipart/form-data; boundary=_"]
-    expected: FAIL
-
   [URLSearchParams request keeps setRequestHeader() Content-Type, with charset adjusted to UTF-8]
     expected: FAIL
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index d158393e162..2797b63f2ae 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -9,6 +9,22 @@
       {}
      ]
     ],
+    "canvas": {
+     "toblob-then-change-size-crash.html": [
+      "355474b4832dde985a73baad925702bbb0cbc73f",
+      [
+       null,
+       {}
+      ]
+     ],
+     "transfer-control-to-offscreencanvas-then-change-dimensions-crash.html": [
+      "bc0c7afd6ab2e1c313bb61ea4a5c68b402105f5d",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "datatransferitem-crash.html": [
      "d11355ab38c1e99e0ba3e10d7dfed18bf26af60b",
      [
@@ -16,6 +32,20 @@
       {}
      ]
     ],
+    "form_reset-crash.html": [
+     "b23cbf6aefdef8231e2cc4cb0e6416195d5bdf71",
+     [
+      null,
+      {}
+     ]
+    ],
+    "global-enumerate-crash.html": [
+     "a77e79b1465bf7555340dd5e9bf94a4c8caa85f2",
+     [
+      null,
+      {}
+     ]
+    ],
     "iframe_focus-crash.html": [
      "f991b1a563f3cc44870640ab194708fa239ad89d",
      [
@@ -23,12 +53,40 @@
       {}
      ]
     ],
+    "location-set-crash.html": [
+     "0b1695df79b0437fb644bfcb3ef09bc0eb906f1e",
+     [
+      null,
+      {}
+     ]
+    ],
+    "path2D_addPath-crash.html": [
+     "f913e6baf8340886c58f99609755ae061bf64f12",
+     [
+      null,
+      {}
+     ]
+    ],
+    "slice-blob-twice-crash.html": [
+     "94227dcc74d80dae19b39df025708ffc24ee78c5",
+     [
+      null,
+      {}
+     ]
+    ],
     "test-wait-crash.html": [
      "2419da6af0c278a17b9ff974d4418f9e386ef3e0",
      [
       null,
       {}
      ]
+    ],
+    "window_resizeTo_not_permitted-crash.html": [
+     "7b6a67ff81436a91048bdb627f303f7fab2762f7",
+     [
+      null,
+      {}
+     ]
     ]
    }
   },
@@ -12707,7 +12765,7 @@
      ]
     },
     "FocusEvent.html": [
-     "9e002c1088de060b5e7f94c4152bf9fb779c04cc",
+     "7fb7aebf2afbac7f68a16308b9cc5d4588b7022f",
      [
       null,
       {}
@@ -12741,6 +12799,13 @@
       {}
      ]
     ],
+    "background_image_csp.sub.html": [
+     "c326f54de52c6a36cbaf4871c947c5b785cac83d",
+     [
+      null,
+      {}
+     ]
+    ],
     "binding_keyword.html": [
      "818d2aa29471026c1b4215dfcd1b9939a052b1ea",
      [
@@ -12859,6 +12924,13 @@
       ]
      ]
     },
+    "css-image-batch-callbacks.html": [
+     "c449b8bab01d27a41bd1ba472ce6b38d0fa768b0",
+     [
+      null,
+      {}
+     ]
+    ],
     "custom_auto_rooter.html": [
      "3d6f04e85b27bcf957b273e04e4a80b75e714b2f",
      [
@@ -13227,6 +13299,13 @@
       {}
      ]
     ],
+    "focus_inter_documents.html": [
+     "5c759772367e844066d1df0081917c9e129d09ec",
+     [
+      null,
+      {}
+     ]
+    ],
     "follow-hyperlink.html": [
      "6ac9eaeb5814a663988ed8c664c113072e329dc5",
      [
@@ -13503,14 +13582,14 @@
      ]
     ],
     "interfaces.https.html": [
-     "ad0b03ac70483c152220978cee8b49e74b330fc6",
+     "eee8c799727b91e00b512795756b693a5f121f86",
      [
       null,
       {}
      ]
     ],
     "interfaces.worker.js": [
-     "f93f9c9f6c877e1915217b64591fe7e34fa7244c",
+     "e86f34f261442aeaa7074c525fb4b1206219769d",
      [
       "mozilla/interfaces.worker.html",
       {}
@@ -14157,6 +14236,13 @@
       {}
      ]
     ],
+    "video_poster_csp.sub.html": [
+     "cc5dfd54c1e39904d5c919f6bd6840d65dcc0fa8",
+     [
+      null,
+      {}
+     ]
+    ],
     "weakref.html": [
      "4deccbe1e26a3f921eea85a4395394a55cc88be4",
      [
@@ -14286,7 +14372,7 @@
      ]
     ],
     "window_resizeTo.html": [
-     "87d60498e80bcd01b5790feb3f9e104410cb6e1b",
+     "3f6c5a610d52b64bf4457d478b929e95d79e9ab8",
      [
       null,
       {}
diff --git a/tests/wpt/mozilla/meta/__dir__.ini b/tests/wpt/mozilla/meta/__dir__.ini
index 9a3f520ac80..e7a12669952 100644
--- a/tests/wpt/mozilla/meta/__dir__.ini
+++ b/tests/wpt/mozilla/meta/__dir__.ini
@@ -1 +1,5 @@
-prefs: ["dom_imagebitmap_enabled:true", "dom_offscreen_canvas_enabled:true", "dom_xpath_enabled:true", "dom_intersection_observer_enabled:true", "dom_resize_observer_enabled:true", "dom_notification_enabled:true", "dom_fontface_enabled:true"]
+prefs: [
+  "dom_serviceworker_enabled:true",
+  "dom_urlpattern_enabled:true",
+  "media_testing_enabled:true",
+]
diff --git a/tests/wpt/mozilla/meta/mozilla/calc.html.ini b/tests/wpt/mozilla/meta/mozilla/calc.html.ini
index b17af5d7f9c..ab87bc3c85b 100644
--- a/tests/wpt/mozilla/meta/mozilla/calc.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/calc.html.ini
@@ -1,9 +1,3 @@
 [calc.html]
-  [calc for column-width]
-    expected: FAIL
-
-  [calc for column-count]
-    expected: FAIL
-
   [calc for counter-increment]
     expected: FAIL
diff --git a/tests/wpt/mozilla/meta/mozilla/interfaces.https.html.ini b/tests/wpt/mozilla/meta/mozilla/interfaces.https.html.ini
index e5e4eea915d..e3cb7c66a14 100644
--- a/tests/wpt/mozilla/meta/mozilla/interfaces.https.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/interfaces.https.html.ini
@@ -1 +1 @@
-prefs: [dom_webxr_test: false, dom_notification_enabled: true]
+prefs: [dom_webxr_test: false, dom_testutils_enabled: false]
diff --git a/tests/wpt/mozilla/meta/mozilla/interfaces.worker.js.ini b/tests/wpt/mozilla/meta/mozilla/interfaces.worker.js.ini
index cfff165a9fd..4a68e67490f 100644
--- a/tests/wpt/mozilla/meta/mozilla/interfaces.worker.js.ini
+++ b/tests/wpt/mozilla/meta/mozilla/interfaces.worker.js.ini
@@ -1 +1 @@
-prefs: [dom_notification_enabled: true]
+prefs: [dom_testutils_enabled: false]
diff --git a/tests/wpt/mozilla/meta/mozilla/service-workers/service-worker-registration.https.html.ini b/tests/wpt/mozilla/meta/mozilla/service-workers/service-worker-registration.https.html.ini
index 222aa07e5c3..59676d4b1e9 100644
--- a/tests/wpt/mozilla/meta/mozilla/service-workers/service-worker-registration.https.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/service-workers/service-worker-registration.https.html.ini
@@ -1,11 +1,8 @@
 [service-worker-registration.https.html]
-  [Test: Asserts Installing Service Worker and its Registration]
+  [Test: Asserts Active Service Worker and its Registration]
     expected: FAIL
 
-  [Test: Installing Service Worker ScriptURL property]
-    expected: FAIL
-
-  [Test: Throws Error when Invalid Scope]
+  [Test: Active Service Worker ScriptURL property]
     expected: FAIL
 
   [Test: Asserts Active Service Worker and its Registration]
@@ -13,22 +10,3 @@
 
   [Test: Active Service Worker ScriptURL property]
     expected: FAIL
-
-  [Test: Asserts ServiceWorkerContainer in Navigator]
-    expected: FAIL
-
-  [Test: Throws Error when Invalid Url Path]
-    expected: FAIL
-
-  [Test: Service Worker Registration property scope Url when no scope]
-    expected: FAIL
-
-  [Test: Service Worker Registration property scope when provided a scope]
-    expected: FAIL
-
-  [Test: Asserts Active Service Worker and its Registration]
-    expected: FAIL
-
-  [Test: Active Service Worker ScriptURL property]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/video_poster_frame.html.ini b/tests/wpt/mozilla/meta/mozilla/video_poster_frame.html.ini
deleted file mode 100644
index a8b5c2da0c5..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/video_poster_frame.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[video_poster_frame.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas.html.ini b/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas.html.ini
deleted file mode 100644
index dc950fa7b63..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[tex_image_2d_canvas.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/tests/mozilla/FocusEvent.html b/tests/wpt/mozilla/tests/mozilla/FocusEvent.html
index 9e002c1088d..7fb7aebf2af 100644
--- a/tests/wpt/mozilla/tests/mozilla/FocusEvent.html
+++ b/tests/wpt/mozilla/tests/mozilla/FocusEvent.html
@@ -48,13 +48,6 @@
         ]
       },
 
-      {
-        element: document.body,
-        expected_events: [
-          {element: input3, event_name: "blur"},
-        ]
-      }
-
     ];
 
     var idx = 0;
diff --git a/tests/wpt/mozilla/tests/mozilla/background_image_csp.sub.html b/tests/wpt/mozilla/tests/mozilla/background_image_csp.sub.html
new file mode 100644
index 00000000000..c326f54de52
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/background_image_csp.sub.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<meta http-equiv="content-security-policy" content="img-src 'self'">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #target {
+    width: 100px;
+    height: 100px;
+    background-size: cover;
+  }
+</style>
+<div id="target"></div>
+<img id="control">
+<script>
+  // This test sets up a cross-origin background-image on a div and checks that it's blocked by CSP.
+  // It also uses a regular <img> to control when the test should end.
+  async_test(t => {
+      const pathparts = location.pathname.split('/');
+      const testfile = pathparts[pathparts.length - 1];
+      const url = location.href.replace(location.hostname, "{{hosts[alt][]}}").replace(testfile, "poster.png");
+
+      const target = document.getElementById("target");
+      target.style.backgroundImage = `url('${url}')`;
+
+      // control image load
+      const control = document.getElementById("control");
+      control.src = url;
+      control.onload = t.unreached_func("Control image should not load (CSP should block it)");
+      control.onerror = t.step_timeout(() => {
+          // No way to assert background-image load failure directly, just ensure no crash / test timeout
+          t.done();
+      }, 500);
+  });
+</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/toblob-then-change-size-crash.html b/tests/wpt/mozilla/tests/mozilla/canvas/toblob-then-change-size-crash.html
new file mode 100644
index 00000000000..355474b4832
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/canvas/toblob-then-change-size-crash.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<!-- https://github.com/servo/servo/issues/36702 -->
+<canvas id="canvas"></canvas>
+<script>
+  canvas.toBlob(() => {});
+  canvas.width = 0;
+</script>
+
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/transfer-control-to-offscreencanvas-then-change-dimensions-crash.html b/tests/wpt/mozilla/tests/mozilla/canvas/transfer-control-to-offscreencanvas-then-change-dimensions-crash.html
new file mode 100644
index 00000000000..bc0c7afd6ab
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/canvas/transfer-control-to-offscreencanvas-then-change-dimensions-crash.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+  let canvas = document.createElement("canvas");
+  let offscreenCanvas = canvas.transferControlToOffscreen();
+  offscreenCanvas.height = 0;
+</script>
+
diff --git a/tests/wpt/mozilla/tests/mozilla/css-image-batch-callbacks.html b/tests/wpt/mozilla/tests/mozilla/css-image-batch-callbacks.html
new file mode 100644
index 00000000000..c449b8bab01
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/css-image-batch-callbacks.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  .file_icon:before {
+content: url('data:image/gif;base64,R0lGODlhEgAWAKIAAP///8z//5mZmTMzMwAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAASABYAQANHOLq88W+ASSsVmEjLr+7UNg2BCFaCNmBs6w7fuZHRCRB4Htueyac+G9AmodVkoSNIw4QFOa0dDzCcTqpW7FT7k3YfurCYkAAAOw==');
+}
+</style>
+<div id="content"></div>
+<script>
+  async_test(t => {
+      let content = document.querySelector('#content');
+      for (let i = 0; i < 1000; i++) {
+          let elem = document.createElement("div");
+          elem.className = "file_icon"
+          content.appendChild(elem);
+      }
+      let elem = document.createElement("img");
+      elem.src = 'data:image/gif;base64,R0lGODlhEgAWAKIAAP///8z//5mZmTMzMwAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAASABYAQANHOLq88W+ASSsVmEjLr+7UNg2BCFaCNmBs6w7fuZHRCRB4Htueyac+G9AmodVkoSNIw4QFOa0dDzCcTqpW7FT7k3YfurCYkAAAOw==';
+      elem.onload = t.step_func_done();
+  }, "Large numbers of CSS images do not prevent other async tasks from executing");
+</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/focus_inter_documents.html b/tests/wpt/mozilla/tests/mozilla/focus_inter_documents.html
new file mode 100644
index 00000000000..5c759772367
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/focus_inter_documents.html
@@ -0,0 +1,207 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <iframe id="f1"></iframe>
+  <iframe id="f2"></iframe>
+  <input id="d0">
+  <script>
+
+  /** Wait for an `event` event to be fired on `element`. Resolves to a boolean
+   * value indicating whether the event was fired within a predetermined period. */
+  async function waitForEvent(element, event) {
+    let listener;
+    try {
+      return await new Promise(resolve => {
+        setTimeout(() => resolve(false), 1000);
+        listener = () => resolve(true);
+        element.addEventListener(event, listener);
+      });
+    } finally {
+      if (listener) {
+        element.removeEventListener(event, listener);
+      }
+    }
+  }
+
+  promise_test(async t => {
+    await new Promise(r => window.onload = r);
+
+    const d0 = document.getElementById("d0");
+
+    // This test requires the document to have focus as a starting condition.
+    if (!document.hasFocus() || document.activeElement !== d0) {
+      const p = new Promise(r => d0.onfocus = r);
+      d0.focus();
+      await p;
+    }
+
+    assert_true(document.hasFocus(), "Document has focus as starting condition.");
+    assert_equals(document.activeElement, d0, "`d0` has focus as starting condition.");
+  }, "Starting condition");
+
+  promise_test(async t => {
+    const d0 = document.getElementById("d0");
+    const f1 = document.getElementById("f1");
+    f1.contentDocument.body.innerHTML = '<input id=d1>';
+    const d1 = f1.contentDocument.getElementById("d1");
+
+    const p0 = waitForEvent(d1, 'focus');
+    const p1 = waitForEvent(f1, 'focus');
+    const p2 = waitForEvent(f1.contentWindow, 'focus');
+    const p3 = waitForEvent(d0, 'blur');
+
+    d1.focus();
+
+    assert_true(await p0, "`d1.focus` fires in time");
+    await p1;   // FIXME: doesn't fire on Firefox, Blink, Edge, and WebKit
+    assert_true(await p2, "`f1.contentWindow.focus` fires in time");
+    assert_true(await p3, "`d0.blur` fires in time");
+
+    assert_equals(document.activeElement, f1, "The top-level document's activeElement is `f1`");
+    assert_true(f1.contentDocument.hasFocus(), "f1's contentDocument has focus");
+    assert_equals(f1.contentDocument.activeElement, d1, "f1's contentDocument's activeElement is `d1`");
+  }, "Focusing an element in a nested browsing context also focuses the container");
+
+  promise_test(async t => {
+    const f1 = document.getElementById("f1");
+    const d1 = f1.contentDocument.getElementById("d1");
+
+    const f2 = document.getElementById("f2");
+    f2.contentDocument.body.innerHTML = '<input id=d2>';
+    const d2 = f2.contentDocument.getElementById("d2");
+
+    const p0 = waitForEvent(d1, 'blur');
+    const p1 = waitForEvent(f1, 'blur');
+    const p2 = waitForEvent(f1.contentWindow, 'blur');
+
+    d2.focus();
+
+    assert_true(await p0, "`d1.blur` fires in time");
+    await p1;    // FIXME: doesn't fire on Firefox, Blink, Edge, and WebKit
+    assert_true(await p2, "`f1.contentWindow.blur` fires in time");
+
+    // Wait for any ongoing execution of the focus update steps to complete
+    await new Promise(r => window.setTimeout(r, 0));
+
+    assert_equals(document.activeElement, f2, "The top-level document's activeElement is `f2`");
+    assert_true(f2.contentDocument.hasFocus(), "f2's contentDocument has focus");
+    assert_equals(f2.contentDocument.activeElement, d2, "f2's contentDocument's activeElement is `d2`");
+    assert_false(f1.contentDocument.hasFocus(), "f1's contentDocument does not have focus");
+    assert_equals(f1.contentDocument.activeElement, f1.contentDocument.body, "f1's contentDocument's activeElement is its body");
+  }, "Focusing an element in a different container also unfocuses the previously focused element and its container");
+
+  promise_test(async t => {
+    const d0 = document.getElementById("d0");
+
+    const f2 = document.getElementById("f2");
+    const d2 = f2.contentDocument.getElementById("d2");
+
+    const p0 = waitForEvent(d2, 'blur');
+    const p1 = waitForEvent(f2, 'blur');
+    const p2 = waitForEvent(f2.contentWindow, 'blur');
+    const p3 = waitForEvent(d0, 'focus');
+
+    d0.focus();
+
+    assert_true(await p0, "`d2.blur` fires in time");
+    await p1;    // FIXME: doesn't fire on Firefox, Blink, Edge, and WebKit
+    assert_true(await p2, "`f2.contentWindow.blur` fires in time");
+    assert_true(await p3, "`d0.focus` fires in time");
+
+    // Wait for any ongoing execution of the focus update steps to complete
+    await new Promise(r => window.setTimeout(r, 0));
+
+    assert_equals(document.activeElement, d0, "The top-level document's activeElement is `d0`");
+    assert_false(f2.contentDocument.hasFocus(), "f2's contentDocument does not have focus");
+    assert_equals(f2.contentDocument.activeElement, f2.contentDocument.body, "f2's contentDocument's activeElement is its body");
+  }, "Unfocusing a container also unfocuses any focused elements within");
+
+  promise_test(async t => {
+    const f1 = document.getElementById("f1");
+
+    const p0 = waitForEvent(f1, 'focus');
+    const p1 = waitForEvent(f1.contentWindow, 'focus');
+
+    f1.focus();
+
+    await p0;   // FIXME: doesn't fire on Firefox, Blink, Edge, and WebKit
+    assert_true(await p1, "`f1.contentWindow.focus` fires in time");
+
+    assert_equals(document.activeElement, f1, "The top-level document's activeElement is `f1`");
+    assert_true(f1.contentDocument.hasFocus(), "f1's contentDocument has focus");
+  }, "Focusing a container changes the contained document's 'has focus steps' result");
+
+  promise_test(async t => {
+    const f1 = document.getElementById("f1");
+
+    // `f1` should be focused because of the previous step
+    assert_equals(document.activeElement, f1, "The top-level document's activeElement is `f1`");
+
+    // Navigate the focused container
+    const pLoad = new Promise(resolve => window.subframeIsReady = resolve);
+    f1.srcdoc = "<script>window.parent.subframeIsReady();</" + "script>";
+    await pLoad;
+
+    // Allow some delay before the document finally receives focus
+    if (!f1.contentDocument.hasFocus()) {
+      await waitForEvent(f1.contentWindow, 'focus');
+    }
+
+    assert_true(f1.contentDocument.hasFocus(), "f1's contentDocument has focus");
+  }, "When a focused container navigates, the new document should receive focus");
+
+  promise_test(async t => {
+    const f2 = document.getElementById("f2");
+
+    const p0 = waitForEvent(f2, 'focus');
+    const p1 = waitForEvent(f2.contentWindow, 'focus');
+
+    f2.contentWindow.focus();
+
+    await p0;   // FIXME: doesn't fire on Firefox, Blink, Edge, and WebKit
+    assert_true(await p1, "`f2.contentWindow.focus` fires in time");
+
+    assert_equals(document.activeElement, f2, "The top-level document's activeElement is `f2`");
+    assert_true(f2.contentDocument.hasFocus(), "f2's contentDocument has focus");
+  }, "Focusing the window of a nested browsing context also focuses the container");
+
+  promise_test(async t => {
+    const f2 = document.getElementById("f2");
+    const d2 = f2.contentDocument.getElementById("d2");
+
+    {
+      const p = waitForEvent(d2, 'focus');
+      f2.focus();
+      d2.focus();
+      await p;
+    }
+
+    const p0 = waitForEvent(d2, 'blur');
+    d2.blur();
+    assert_true(await p0, "`d2.blur` fires in time");
+
+    // FIXME: This passes on Firefox, Blink, and WebKit but is not spec-
+    //        compliant. Per spec, the top-level document's viewport should be
+    //        focused instead.
+    //
+    // <https://html.spec.whatwg.org/multipage/#get-the-focusable-area>
+    //
+    // > The unfocusing steps for an object `old focus target`` that is either a
+    // > focusable area or an element that is not a focusable area are as
+    // > follows: [...]
+    // >
+    // >  7. If `topDocument`'s browsing context has system focus, then run the
+    // >     focusing steps for topDocument's viewport.
+
+    assert_equals(document.activeElement, f2, "The top-level document's activeElement is `f2`");
+    assert_equals(f2.contentDocument.activeElement, f2.contentDocument.body, "f2's contentDocument's activeElement is its body");
+    assert_true(f2.contentDocument.hasFocus(), "f2's contentDocument has focus");
+  }, "Blurring an element in a nested browsing context focuses its node document");
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/form_reset-crash.html b/tests/wpt/mozilla/tests/mozilla/form_reset-crash.html
new file mode 100644
index 00000000000..b23cbf6aefd
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/form_reset-crash.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<form id="form">
+  <output><textarea></textarea></output>
+</form>
+<script>
+form.reset();
+</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/global-enumerate-crash.html b/tests/wpt/mozilla/tests/mozilla/global-enumerate-crash.html
new file mode 100644
index 00000000000..a77e79b1465
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/global-enumerate-crash.html
@@ -0,0 +1,15 @@
+<html class=test-wait>
+  <body>
+    <iframe id="if"></iframe>
+    <script>
+          const frame = document.getElementById('if').contentWindow;
+          for (const i of Object.getOwnPropertyNames(frame)) {
+            try {
+              frame[i]['foo'];
+            } catch (e) {
+            }
+          }
+          document.documentElement.classList.remove("test-wait");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.https.html b/tests/wpt/mozilla/tests/mozilla/interfaces.https.html
index ad0b03ac704..eee8c799727 100644
--- a/tests/wpt/mozilla/tests/mozilla/interfaces.https.html
+++ b/tests/wpt/mozilla/tests/mozilla/interfaces.https.html
@@ -38,7 +38,9 @@ test_interfaces([
   "ChannelMergerNode",
   "ChannelSplitterNode",
   "CharacterData",
+  "Clipboard",
   "ClipboardEvent",
+  "ClipboardItem",
   "CloseEvent",
   "ConstantSourceNode",
   "CryptoKey",
@@ -53,6 +55,7 @@ test_interfaces([
   "CSSLayerStatementRule",
   "CSSMediaRule",
   "CSSNamespaceRule",
+  "CSSNestedDeclarations",
   "CSSRule",
   "CSSRuleList",
   "CSSStyleDeclaration",
@@ -103,6 +106,45 @@ test_interfaces([
   "GamepadEvent",
   "GamepadHapticActuator",
   "GamepadPose",
+  "GPU",
+  "GPUAdapter",
+  "GPUAdapterInfo",
+  "GPUBindGroup",
+  "GPUBindGroupLayout",
+  "GPUBuffer",
+  "GPUBufferUsage",
+  "GPUCanvasContext",
+  "GPUColorWrite",
+  "GPUCommandBuffer",
+  "GPUCommandEncoder",
+  "GPUCompilationInfo",
+  "GPUCompilationMessage",
+  "GPUComputePassEncoder",
+  "GPUComputePipeline",
+  "GPUDevice",
+  "GPUDeviceLostInfo",
+  "GPUError",
+  "GPUInternalError",
+  "GPUMapMode",
+  "GPUOutOfMemoryError",
+  "GPUPipelineError",
+  "GPUPipelineLayout",
+  "GPUQuerySet",
+  "GPUQueue",
+  "GPURenderBundle",
+  "GPURenderBundleEncoder",
+  "GPURenderPassEncoder",
+  "GPURenderPipeline",
+  "GPUSampler",
+  "GPUShaderModule",
+  "GPUShaderStage",
+  "GPUSupportedFeatures",
+  "GPUSupportedLimits",
+  "GPUTexture",
+  "GPUTextureUsage",
+  "GPUTextureView",
+  "GPUUncapturedErrorEvent",
+  "GPUValidationError",
   "HashChangeEvent",
   "Headers",
   "History",
@@ -210,6 +252,7 @@ test_interfaces([
   "MutationRecord",
   "NamedNodeMap",
   "Navigator",
+  "NavigationPreloadManager",
   "Node",
   "NodeFilter",
   "NodeIterator",
@@ -234,6 +277,8 @@ test_interfaces([
   "PerformanceObserverEntryList",
   "PerformancePaintTiming",
   "PerformanceResourceTiming",
+  "PermissionStatus",
+  "Permissions",
   "Plugin",
   "PluginArray",
   "PointerEvent",
@@ -256,6 +301,9 @@ test_interfaces([
   "Screen",
   "SecurityPolicyViolationEvent",
   "Selection",
+  "ServiceWorker",
+  "ServiceWorkerContainer",
+  "ServiceWorkerRegistration",
   "ShadowRoot",
   "StaticRange",
   "StereoPannerNode",
@@ -265,7 +313,11 @@ test_interfaces([
   "StyleSheetList",
   "SubmitEvent",
   "SubtleCrypto",
+  "SVGElement",
+  "SVGGraphicsElement",
+  "SVGImageElement",
   "SVGRect",
+  "SVGSVGElement",
   "Text",
   "TextTrack",
   "TextTrackCue",
@@ -280,14 +332,21 @@ test_interfaces([
   "TrackEvent",
   "TransitionEvent",
   "TreeWalker",
+  "TrustedHTML",
+  "TrustedScript",
+  "TrustedScriptURL",
+  "TrustedTypePolicy",
+  "TrustedTypePolicyFactory",
   "UIEvent",
   "URL",
+  "URLPattern",
   "URLSearchParams",
   "ValidityState",
   "VideoTrack",
   "VideoTrackList",
   "VisibilityStateEntry",
   "WebAssembly",
+  "WebGL2RenderingContext",
   "WebGLRenderingContext",
   "WebGLUniformLocation",
   "WebGLBuffer",
@@ -299,7 +358,12 @@ test_interfaces([
   "WebGLShader",
   "WebGLObject",
   "WebGLActiveInfo",
+  "WebGLQuery",
+  "WebGLSampler",
   "WebGLShaderPrecisionFormat",
+  "WebGLSync",
+  "WebGLTransformFeedback",
+  "WebGLVertexArrayObject",
   "WebKitCSSMatrix",
   "WebSocket",
   "WheelEvent",
@@ -308,6 +372,9 @@ test_interfaces([
   "WritableStream",
   "WritableStreamDefaultController",
   "WritableStreamDefaultWriter",
+  "TransformStream",
+  "TransformStreamDefaultController",
+  "WGSLLanguageFeatures",
   "XMLDocument",
   "XMLHttpRequest",
   "XMLHttpRequestEventTarget",
diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.worker.js b/tests/wpt/mozilla/tests/mozilla/interfaces.worker.js
index f93f9c9f6c8..e86f34f2614 100644
--- a/tests/wpt/mozilla/tests/mozilla/interfaces.worker.js
+++ b/tests/wpt/mozilla/tests/mozilla/interfaces.worker.js
@@ -14,6 +14,7 @@ test_interfaces([
   "CanvasPattern",
   "CloseEvent",
   "CountQueuingStrategy",
+  "CustomEvent",
   "DOMMatrix",
   "DOMMatrixReadOnly",
   "DOMPoint",
@@ -22,7 +23,6 @@ test_interfaces([
   "DOMRect",
   "DOMRectReadOnly",
   "DOMStringList",
-  "CustomEvent",
   "DedicatedWorkerGlobalScope",
   "DOMException",
   "ErrorEvent",
@@ -35,6 +35,45 @@ test_interfaces([
   "FileReaderSync",
   "FinalizationRegistry",
   "FormData",
+  "GPU",
+  "GPUAdapter",
+  "GPUAdapterInfo",
+  "GPUBindGroup",
+  "GPUBindGroupLayout",
+  "GPUBuffer",
+  "GPUBufferUsage",
+  "GPUCanvasContext",
+  "GPUColorWrite",
+  "GPUCommandBuffer",
+  "GPUCommandEncoder",
+  "GPUCompilationInfo",
+  "GPUCompilationMessage",
+  "GPUComputePassEncoder",
+  "GPUComputePipeline",
+  "GPUDevice",
+  "GPUDeviceLostInfo",
+  "GPUError",
+  "GPUInternalError",
+  "GPUMapMode",
+  "GPUOutOfMemoryError",
+  "GPUPipelineError",
+  "GPUPipelineLayout",
+  "GPUQuerySet",
+  "GPUQueue",
+  "GPURenderBundle",
+  "GPURenderBundleEncoder",
+  "GPURenderPassEncoder",
+  "GPURenderPipeline",
+  "GPUSampler",
+  "GPUShaderModule",
+  "GPUShaderStage",
+  "GPUSupportedFeatures",
+  "GPUSupportedLimits",
+  "GPUTexture",
+  "GPUTextureUsage",
+  "GPUTextureView",
+  "GPUUncapturedErrorEvent",
+  "GPUValidationError",
   "Headers",
   "History",
   "ImageBitmap",
@@ -54,6 +93,8 @@ test_interfaces([
   "PerformanceObserverEntryList",
   "PerformancePaintTiming",
   "PerformanceResourceTiming",
+  "PermissionStatus",
+  "Permissions",
   "ProgressEvent",
   "PromiseRejectionEvent",
   "ReadableStream",
@@ -65,9 +106,16 @@ test_interfaces([
   "Request",
   "Response",
   "SecurityPolicyViolationEvent",
+  "ServiceWorkerContainer",
   "TextDecoder",
   "TextEncoder",
+  "TrustedHTML",
+  "TrustedScript",
+  "TrustedScriptURL",
+  "TrustedTypePolicy",
+  "TrustedTypePolicyFactory",
   "URL",
+  "URLPattern",
   "URLSearchParams",
   "WebGLActiveInfo",
   "WebGLBuffer",
@@ -89,6 +137,9 @@ test_interfaces([
   "WritableStream",
   "WritableStreamDefaultController",
   "WritableStreamDefaultWriter",
+  "TransformStream",
+  "TransformStreamDefaultController",
+  "WGSLLanguageFeatures",
   "XMLHttpRequest",
   "XMLHttpRequestEventTarget",
   "XMLHttpRequestUpload",
diff --git a/tests/wpt/mozilla/tests/mozilla/location-set-crash.html b/tests/wpt/mozilla/tests/mozilla/location-set-crash.html
new file mode 100644
index 00000000000..0b1695df79b
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/location-set-crash.html
@@ -0,0 +1,5 @@
+<html>
+<script>
+  window.location.foo = () => {};
+</script>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/path2D_addPath-crash.html b/tests/wpt/mozilla/tests/mozilla/path2D_addPath-crash.html
new file mode 100644
index 00000000000..f913e6baf83
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/path2D_addPath-crash.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<script>
+let path2D = new Path2D();
+path2D.addPath(path2D);
+</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/slice-blob-twice-crash.html b/tests/wpt/mozilla/tests/mozilla/slice-blob-twice-crash.html
new file mode 100644
index 00000000000..94227dcc74d
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/slice-blob-twice-crash.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<script>
+  (new Blob()).slice().slice().size;
+</script>
+
diff --git a/tests/wpt/mozilla/tests/mozilla/video_poster_csp.sub.html b/tests/wpt/mozilla/tests/mozilla/video_poster_csp.sub.html
new file mode 100644
index 00000000000..cc5dfd54c1e
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/video_poster_csp.sub.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<meta http-equiv="content-security-policy" content="img-src 'self'">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<video></video>
+<img></img>
+<script>
+  // This test sets up a cross-origin image URL for the video poster
+  // and verifies that the poster image is not shown.
+  // It also uses a separate image load to control when to end the test,
+  // since Servo doesn't fire any event handler if a poster image has an
+  // error (https://github.com/whatwg/html/issues/8445).
+  async_test(t => {
+      const pathparts = location.pathname.split('/');
+      const testfile = pathparts[pathparts.length - 1];
+      const url = location.href.replace(location.hostname, "{{hosts[alt][]}}").replace(testfile, "poster.png");
+      let img = document.querySelector("img");
+      img.src = url;
+      img.onload = t.unreached_func();
+      img.onerror = t.step_timeout(() => t.done(), 500);
+      let video = document.querySelector("video");
+      video.onpostershown = t.unreached_func();
+      video.poster = url;
+  });
+</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/window_resizeTo.html b/tests/wpt/mozilla/tests/mozilla/window_resizeTo.html
index 87d60498e80..3f6c5a610d5 100644
--- a/tests/wpt/mozilla/tests/mozilla/window_resizeTo.html
+++ b/tests/wpt/mozilla/tests/mozilla/window_resizeTo.html
@@ -1,16 +1,21 @@
 <!doctype html>
 <meta charset="utf-8">
-<title>Verify that the resize event is fired when the window is resized (particularly in headless mode)</title>
+<title>Verify that the resize event is fired when the window is resized (in popup)</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
     async_test(function (t) {
-        window.onresize = t.step_func(function () {
-            assert_equals(window.innerWidth, 200);
-            assert_equals(window.innerHeight, 200);
-            t.done();
-        });
+        var popup = window.open("about:blank", "_blank", "width=100,height=100");
+        assert_not_equals(popup, null, "Popup must be successfully opened");
 
-        window.resizeTo(200, 200);
-    }, "onresize");
+        popup.onload = function () {
+            popup.onresize = t.step_func(function () {
+                assert_approx_equals(popup.innerWidth, 200, 10, "Popup width should be ~200");
+                assert_approx_equals(popup.innerHeight, 200, 10, "Popup height should be ~200");
+                t.done();
+            });
+
+            popup.resizeTo(200, 200);
+        };
+    }, "Popup onresize event fires after resizeTo");
 </script>
diff --git a/tests/wpt/mozilla/tests/mozilla/window_resizeTo_not_permitted-crash.html b/tests/wpt/mozilla/tests/mozilla/window_resizeTo_not_permitted-crash.html
new file mode 100644
index 00000000000..7b6a67ff814
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/window_resizeTo_not_permitted-crash.html
@@ -0,0 +1,6 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Test that calling resizeTo() on normal window does not crash</title>
+<script>
+    window.resizeTo(-1, -1);
+</script>
diff --git a/tests/wpt/tests/.azure-pipelines.yml b/tests/wpt/tests/.azure-pipelines.yml
index 56b67ef6057..5e37bc4d3f4 100644
--- a/tests/wpt/tests/.azure-pipelines.yml
+++ b/tests/wpt/tests/.azure-pipelines.yml
@@ -71,7 +71,7 @@ jobs:
   displayName: './wpt test-jobs'
   condition: eq(variables['Build.Reason'], 'PullRequest')
   pool:
-    vmImage: 'ubuntu-20.04'
+    vmImage: 'ubuntu-24.04'
   steps:
   - task: UsePythonVersion@0
     inputs:
diff --git a/tests/wpt/tests/.github/workflows/check-workflow-run.yml b/tests/wpt/tests/.github/workflows/check-workflow-run.yml
index 0487f03a592..7afc1678105 100644
--- a/tests/wpt/tests/.github/workflows/check-workflow-run.yml
+++ b/tests/wpt/tests/.github/workflows/check-workflow-run.yml
@@ -16,8 +16,7 @@ jobs:
   check-workflow-run:
     name: "Check for appropriate epochs"
     if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }}
-    runs-on:
-      - ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       actions: read
     outputs:
@@ -49,7 +48,6 @@ jobs:
   check-workflow-run-noop:
     name: "Check for appropriate epochs (noop)"
     if: ${{ github.event_name != 'workflow_run' }}
-    runs-on:
-      - ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - run: exit 0
diff --git a/tests/wpt/tests/.github/workflows/docker.yml b/tests/wpt/tests/.github/workflows/docker.yml
index 6d5c7c79a05..5de0cc4bcb1 100644
--- a/tests/wpt/tests/.github/workflows/docker.yml
+++ b/tests/wpt/tests/.github/workflows/docker.yml
@@ -14,7 +14,7 @@ on:
 jobs:
   docker-publish:
     name: Publish Docker image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       packages: write
@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       # Based on https://docs.github.com/en/actions/publishing-packages/publishing-docker-images.
       - name: Log in to the Container registry
-        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -40,7 +40,7 @@ jobs:
             latest
             type=raw,value=${{ inputs.tag }}
       - name: Build and push the Docker image
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
         with:
           context: ./tools/docker
           push: true
diff --git a/tests/wpt/tests/.github/workflows/documentation.yml b/tests/wpt/tests/.github/workflows/documentation.yml
index f7e9fb2e135..6c92e435c69 100644
--- a/tests/wpt/tests/.github/workflows/documentation.yml
+++ b/tests/wpt/tests/.github/workflows/documentation.yml
@@ -2,11 +2,7 @@ name: documentation
 on:
   push:
     branches:
-      - master
-    paths:
-      - 'docs/**'
-      - 'resources/**'
-      - 'tools/**'
+      - ubuntu-24.04
   pull_request:
     paths:
       - 'docs/**'
@@ -14,7 +10,7 @@ on:
       - 'tools/**'
 jobs:
   build-and-publish:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'web-platform-tests/wpt'
     steps:
       - name: Set up Python
@@ -34,4 +30,4 @@ jobs:
       - name: Run website_build.sh
         run: ./tools/ci/website_build.sh
         env:
-          DEPLOY_TOKEN: ${{ secrets.DEPLOY_TOKEN }}
+          DEPLOY_TOKEN: dummy
diff --git a/tests/wpt/tests/.github/workflows/epochs.yml b/tests/wpt/tests/.github/workflows/epochs.yml
index 8b2081364e5..fa88b50ff3f 100644
--- a/tests/wpt/tests/.github/workflows/epochs.yml
+++ b/tests/wpt/tests/.github/workflows/epochs.yml
@@ -6,7 +6,7 @@ on:
     - cron: 10 */3 * * *
 jobs:
   update:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'web-platform-tests/wpt'
     steps:
     - name: Checkout
diff --git a/tests/wpt/tests/.github/workflows/interfaces.yml b/tests/wpt/tests/.github/workflows/interfaces.yml
index 302e0a846d8..c3deb7c0b7d 100644
--- a/tests/wpt/tests/.github/workflows/interfaces.yml
+++ b/tests/wpt/tests/.github/workflows/interfaces.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 jobs:
   update:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'web-platform-tests/wpt'
     steps:
     - name: Checkout
diff --git a/tests/wpt/tests/.github/workflows/manifest.yml b/tests/wpt/tests/.github/workflows/manifest.yml
index a27fc2258de..4ac2c8b2700 100644
--- a/tests/wpt/tests/.github/workflows/manifest.yml
+++ b/tests/wpt/tests/.github/workflows/manifest.yml
@@ -8,7 +8,7 @@ on:
       - 'tools/**'
 jobs:
   build-and-tag:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'web-platform-tests/wpt'
     steps:
     - name: Set up Python
diff --git a/tests/wpt/tests/.github/workflows/regen_certs.yml b/tests/wpt/tests/.github/workflows/regen_certs.yml
index b66ba90065f..d60c6b04b30 100644
--- a/tests/wpt/tests/.github/workflows/regen_certs.yml
+++ b/tests/wpt/tests/.github/workflows/regen_certs.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 jobs:
   update:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'web-platform-tests/wpt'
     steps:
     - name: Set up Python
diff --git a/tests/wpt/tests/.github/workflows/update-wasm-tests.yml b/tests/wpt/tests/.github/workflows/update-wasm-tests.yml
index 283e6e72878..d1aafdcb124 100644
--- a/tests/wpt/tests/.github/workflows/update-wasm-tests.yml
+++ b/tests/wpt/tests/.github/workflows/update-wasm-tests.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build-wpt:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout WPT repo
         uses: actions/checkout@v4
diff --git a/tests/wpt/tests/.github/workflows/update_codeowners.yml b/tests/wpt/tests/.github/workflows/update_codeowners.yml
new file mode 100644
index 00000000000..9e3f23efa7d
--- /dev/null
+++ b/tests/wpt/tests/.github/workflows/update_codeowners.yml
@@ -0,0 +1,39 @@
+name: update codeowners
+on:
+  schedule:
+    - cron: 0 0 * * *
+  workflow_dispatch:
+jobs:
+  update:
+    runs-on: ubuntu-24.04
+    if: github.repository == 'web-platform-tests/wpt'
+    steps:
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+    - name: Checkout wpt
+      uses: actions/checkout@v4
+      with:
+        path: wpt
+    - name: Checkout wpt-metadata
+      uses: actions/checkout@v4
+      with:
+        path: wpt-metadata
+        repository: web-platform-tests/wpt-metadata
+    - name: Update codeowners
+      run: |
+        cd wpt
+        ./wpt update-codeowners ../wpt-metadata
+    - name: Commit and create pull request
+      uses: peter-evans/create-pull-request@v6
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        author: wpt-pr-bot <wpt-pr-bot@users.noreply.github.com>
+        commit-message: Automated update of CODEOWNERS
+        title: Update CODEOWNERS
+        body: |
+          This automated pull request updates CODEOWNERS
+
+          See the [workflow](https://github.com/web-platform-tests/wpt/blob/master/.github/workflows/update_codeowners.yml) for how this pull request was created.
+        branch: actions/update-codeowners
diff --git a/tests/wpt/tests/.github/workflows/wpt_fyi_notify.yml b/tests/wpt/tests/.github/workflows/wpt_fyi_notify.yml
index c0661366418..8e9a043f2c3 100644
--- a/tests/wpt/tests/.github/workflows/wpt_fyi_notify.yml
+++ b/tests/wpt/tests/.github/workflows/wpt_fyi_notify.yml
@@ -8,8 +8,7 @@ on:
 jobs:
   wpt-fyi-notify:
     name: "Notify wpt.fyi"
-    runs-on:
-      - ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: "wpt.fyi"
         uses: fjogeleit/http-request-action@v1
diff --git a/tests/wpt/tests/.taskcluster.yml b/tests/wpt/tests/.taskcluster.yml
index 18c82321f92..9ade5168bbb 100644
--- a/tests/wpt/tests/.taskcluster.yml
+++ b/tests/wpt/tests/.taskcluster.yml
@@ -57,7 +57,7 @@ tasks:
             owner: ${owner}
             source: ${event.repository.clone_url}
           payload:
-            image: ghcr.io/web-platform-tests/wpt:1
+            image: ghcr.io/web-platform-tests/wpt:2
             maxRunTime: 7200
             artifacts:
               public/results:
diff --git a/tests/wpt/tests/CODEOWNERS b/tests/wpt/tests/CODEOWNERS
index c5db991b400..da5b3f0d330 100644
--- a/tests/wpt/tests/CODEOWNERS
+++ b/tests/wpt/tests/CODEOWNERS
@@ -11,3 +11,3752 @@ tools/docker/Dockerfile @web-platform-tests/wpt-core-team @web-platform-tests/ad
 
 # Prevent accidentally touching wasm/core which is updated by a workflow
 wasm/core/ @web-platform-tests/wpt-core-team
+
+# GENERATED: interop-tests
+css/css-anchor-position/anchor-as-multicol-crash.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-composited-scrolling-001-crash.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-composited-scrolling-002-crash.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-composited-scrolling-003-crash.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-composited-scrolling-004-crash.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-composited-scrolling-005-crash.html @web-platform-tests/interop
+css/css-anchor-position/grid-anchor-center-crash.html @web-platform-tests/interop
+css/css-anchor-position/inline-grid-try-fallbacks-crash.html @web-platform-tests/interop
+css/css-anchor-position/position-try-invalid-anchor-crash.html @web-platform-tests/interop
+css/css-cascade/scope-declaration-list-crash.html @web-platform-tests/interop
+css/css-flexbox/contain-size-layout-abspos-flex-container-crash.html @web-platform-tests/interop
+css/css-flexbox/fixedpos-video-in-abspos-quirk-crash.html @web-platform-tests/interop
+css/css-flexbox/flex-shrink-large-value-crash.html @web-platform-tests/interop
+css/css-flexbox/frameset-crash.html @web-platform-tests/interop
+css/css-flexbox/inline-flex-editing-crash.html @web-platform-tests/interop
+css/css-flexbox/inline-flex-editing-with-updating-text-crash.html @web-platform-tests/interop
+css/css-flexbox/inline-flex-frameset-main-axis-crash.html @web-platform-tests/interop
+css/css-flexbox/negative-flex-margins-crash.html @web-platform-tests/interop
+css/css-flexbox/negative-flex-rounding-crash.html @web-platform-tests/interop
+css/css-flexbox/negative-item-margins-002-crash.html @web-platform-tests/interop
+css/css-flexbox/negative-item-margins-crash.html @web-platform-tests/interop
+css/css-flexbox/orthogonal-flex-item-crash.html @web-platform-tests/interop
+css/css-flexbox/position-relative-with-scrollable-with-abspos-crash.html @web-platform-tests/interop
+css/css-flexbox/remove-out-of-flow-child-crash.html @web-platform-tests/interop
+css/css-flexbox/zero-content-size-with-scrollbar-crash.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-crash.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-add-item-with-positioned-items-crash.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-add-positioned-block-item-after-inline-item-crash.html @web-platform-tests/interop
+css/css-grid/subgrid/crashtests/contain-strict-nested-subgrid.html @web-platform-tests/interop
+css/css-grid/subgrid/crashtests/contain-strict-subgrid.html @web-platform-tests/interop
+css/css-grid/subgrid/crashtests/subgrid-reflow-root.html @web-platform-tests/interop
+css/css-view-transitions/document-element-detached-crash.html @web-platform-tests/interop
+css/css-view-transitions/empty-render-target-crash.html @web-platform-tests/interop
+css/css-view-transitions/get-computed-style-crash.html @web-platform-tests/interop
+css/css-view-transitions/iframe-transition-destroyed-document-crash.html @web-platform-tests/interop
+css/css-view-transitions/list-style-position-style-change-crash.html @web-platform-tests/interop
+css/css-view-transitions/root-element-cv-hidden-crash.html @web-platform-tests/interop
+css/css-view-transitions/root-element-display-none-crash.html @web-platform-tests/interop
+css/css-view-transitions/root-element-display-none-during-transition-crash.html @web-platform-tests/interop
+css/css-viewport/zoom/perspective-small-effective-zoom-crash.html @web-platform-tests/interop
+css/css-viewport/zoom/scroll-corner-crash.html @web-platform-tests/interop
+css/css-viewport/zoom/scrollbar-crash.html @web-platform-tests/interop
+css/css-viewport/zoom/textarea-very-small-zoom-crash.html @web-platform-tests/interop
+css/css-writing-modes/link-writing-mode-dependency-crash.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-feimage-crash.html @web-platform-tests/interop
+html/rendering/the-details-element/details-autofocus-crash.html @web-platform-tests/interop
+html/rendering/the-details-element/empty-crash.html @web-platform-tests/interop
+html/rendering/the-details-element/two-summaries-removal-crash.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-005-print.html @web-platform-tests/interop
+css/css-cascade/scope-implicit-crash-print.html @web-platform-tests/interop
+css/css-anchor-position/anchor-center-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-center-scroll.html @web-platform-tests/interop
+css/css-anchor-position/anchor-in-css-min-max-function.html @web-platform-tests/interop
+css/css-anchor-position/anchor-name-005.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-circular.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-dynamic-005.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-multicol-007.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-multicol-008.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-multicol-011.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-top-layer-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-top-layer-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-top-layer-003.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-top-layer-004.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-top-layer-005.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-top-layer-006.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scope-scroll.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-chained-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-chained-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-chained-003.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-chained-004.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-chained-fallback.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-composited-scrolling-006.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-fixedpos-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-fixedpos.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-nested.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-overflow-hidden.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-position-try-012.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-scrollable-anchor.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-to-sticky-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-to-sticky-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-to-sticky-003.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-to-sticky-004.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-update-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-update-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-update-003.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-update-004.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-update-005.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-update-006.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-update-007.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-vlr.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-vrl.html @web-platform-tests/interop
+css/css-anchor-position/position-anchor-001.html @web-platform-tests/interop
+css/css-anchor-position/position-anchor-002.html @web-platform-tests/interop
+css/css-anchor-position/position-anchor-004.html @web-platform-tests/interop
+css/css-anchor-position/position-anchor-target-with-children.html @web-platform-tests/interop
+css/css-anchor-position/position-area-abs-inline-container.html @web-platform-tests/interop
+css/css-anchor-position/position-area-inline-container.html @web-platform-tests/interop
+css/css-anchor-position/position-area-scroll-adjust.html @web-platform-tests/interop
+css/css-anchor-position/position-try-switch-from-fixed-anchor.html @web-platform-tests/interop
+css/css-anchor-position/position-try-switch-to-fixed-anchor.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-add-no-overflow.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-anchors-visible-after-scroll-in.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-anchors-visible-after-scroll-out.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-anchors-visible-chained-001.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-anchors-visible-chained-002.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-anchors-visible-chained-003.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-anchors-visible-chained-004.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-anchors-visible-change-anchor.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-anchors-visible-change-css-visibility.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-anchors-visible-css-visibility.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-anchors-visible-non-intervening-container.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-anchors-visible-stacked-child.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-anchors-visible-with-position.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-anchors-visible.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-no-overflow-scroll.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-no-overflow-stacked-child.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-no-overflow.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-remove-anchors-visible.html @web-platform-tests/interop
+css/css-anchor-position/position-visibility-remove-no-overflow.html @web-platform-tests/interop
+css/css-anchor-position/sticky-anchor-position-invalid.html @web-platform-tests/interop
+css/css-break/transform-025.html @web-platform-tests/interop
+css/css-cascade/scope-featureless.html @web-platform-tests/interop
+css/css-cascade/scope-part.html @web-platform-tests/interop
+css/css-cascade/scope-pseudo-element.html @web-platform-tests/interop
+css/css-cascade/scope-shadow-sharing.html @web-platform-tests/interop
+css/css-cascade/scope-visited.html @web-platform-tests/interop
+css/css-flexbox/abspos/abspos-autopos-htb-ltr.html @web-platform-tests/interop
+css/css-flexbox/abspos/abspos-autopos-htb-rtl.html @web-platform-tests/interop
+css/css-flexbox/abspos/abspos-autopos-vlr-ltr.html @web-platform-tests/interop
+css/css-flexbox/abspos/abspos-autopos-vlr-rtl.html @web-platform-tests/interop
+css/css-flexbox/abspos/abspos-autopos-vrl-ltr.html @web-platform-tests/interop
+css/css-flexbox/abspos/abspos-autopos-vrl-rtl.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-001.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-margin-001.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-margin-002.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-margin-003.html @web-platform-tests/interop
+css/css-flexbox/abspos/flexbox-abspos-child-001a.html @web-platform-tests/interop
+css/css-flexbox/abspos/flexbox-abspos-child-001b.html @web-platform-tests/interop
+css/css-flexbox/abspos/flexbox-abspos-child-002.html @web-platform-tests/interop
+css/css-flexbox/abspos/flexbox_absolute-atomic.html @web-platform-tests/interop
+css/css-flexbox/abspos/flexbox_inline-abspos.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-005.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-006.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-007.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-008.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-009.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-010.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-011.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-containing-block-001.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-containing-block-002.html @web-platform-tests/interop
+css/css-flexbox/align-baseline.html @web-platform-tests/interop
+css/css-flexbox/align-content-001.htm @web-platform-tests/interop
+css/css-flexbox/align-content-002.htm @web-platform-tests/interop
+css/css-flexbox/align-content-003.htm @web-platform-tests/interop
+css/css-flexbox/align-content-004.htm @web-platform-tests/interop
+css/css-flexbox/align-content-005.htm @web-platform-tests/interop
+css/css-flexbox/align-content-006.htm @web-platform-tests/interop
+css/css-flexbox/align-content-wrap-004.html @web-platform-tests/interop
+css/css-flexbox/align-content_center.html @web-platform-tests/interop
+css/css-flexbox/align-content_flex-end.html @web-platform-tests/interop
+css/css-flexbox/align-content_flex-start.html @web-platform-tests/interop
+css/css-flexbox/align-content_space-around.html @web-platform-tests/interop
+css/css-flexbox/align-content_space-between.html @web-platform-tests/interop
+css/css-flexbox/align-content_stretch.html @web-platform-tests/interop
+css/css-flexbox/align-items-001.htm @web-platform-tests/interop
+css/css-flexbox/align-items-002.htm @web-platform-tests/interop
+css/css-flexbox/align-items-003.htm @web-platform-tests/interop
+css/css-flexbox/align-items-004.htm @web-platform-tests/interop
+css/css-flexbox/align-items-005.htm @web-platform-tests/interop
+css/css-flexbox/align-items-006.html @web-platform-tests/interop
+css/css-flexbox/align-items-007.html @web-platform-tests/interop
+css/css-flexbox/align-items-008.html @web-platform-tests/interop
+css/css-flexbox/align-items-009.html @web-platform-tests/interop
+css/css-flexbox/align-items-baseline-column-horz.html @web-platform-tests/interop
+css/css-flexbox/align-items-baseline-column-vert.html @web-platform-tests/interop
+css/css-flexbox/align-items-baseline-overflow-non-visible.html @web-platform-tests/interop
+css/css-flexbox/align-items-baseline-row-horz.html @web-platform-tests/interop
+css/css-flexbox/align-items-baseline-row-vert.html @web-platform-tests/interop
+css/css-flexbox/align-self-001.html @web-platform-tests/interop
+css/css-flexbox/align-self-002.html @web-platform-tests/interop
+css/css-flexbox/align-self-003.html @web-platform-tests/interop
+css/css-flexbox/align-self-004.html @web-platform-tests/interop
+css/css-flexbox/align-self-005.html @web-platform-tests/interop
+css/css-flexbox/align-self-007.html @web-platform-tests/interop
+css/css-flexbox/align-self-008.html @web-platform-tests/interop
+css/css-flexbox/align-self-009.html @web-platform-tests/interop
+css/css-flexbox/align-self-011.html @web-platform-tests/interop
+css/css-flexbox/align-self-012.html @web-platform-tests/interop
+css/css-flexbox/align-self-013.html @web-platform-tests/interop
+css/css-flexbox/align-self-015.html @web-platform-tests/interop
+css/css-flexbox/anonymous-block.html @web-platform-tests/interop
+css/css-flexbox/anonymous-flex-item-001.html @web-platform-tests/interop
+css/css-flexbox/anonymous-flex-item-002.html @web-platform-tests/interop
+css/css-flexbox/anonymous-flex-item-003.html @web-platform-tests/interop
+css/css-flexbox/anonymous-flex-item-004.html @web-platform-tests/interop
+css/css-flexbox/anonymous-flex-item-005.html @web-platform-tests/interop
+css/css-flexbox/anonymous-flex-item-006.html @web-platform-tests/interop
+css/css-flexbox/aspect-ratio-intrinsic-size-001.html @web-platform-tests/interop
+css/css-flexbox/aspect-ratio-intrinsic-size-002.html @web-platform-tests/interop
+css/css-flexbox/aspect-ratio-intrinsic-size-003.html @web-platform-tests/interop
+css/css-flexbox/aspect-ratio-intrinsic-size-004.html @web-platform-tests/interop
+css/css-flexbox/aspect-ratio-intrinsic-size-005.html @web-platform-tests/interop
+css/css-flexbox/aspect-ratio-intrinsic-size-006.html @web-platform-tests/interop
+css/css-flexbox/aspect-ratio-intrinsic-size-007.html @web-platform-tests/interop
+css/css-flexbox/auto-height-column-with-border-and-padding.html @web-platform-tests/interop
+css/css-flexbox/auto-height-with-flex.html @web-platform-tests/interop
+css/css-flexbox/auto-margins-001.html @web-platform-tests/interop
+css/css-flexbox/auto-margins-002.html @web-platform-tests/interop
+css/css-flexbox/auto-margins-003.html @web-platform-tests/interop
+css/css-flexbox/baseline-synthesis-001.html @web-platform-tests/interop
+css/css-flexbox/baseline-synthesis-002.html @web-platform-tests/interop
+css/css-flexbox/baseline-synthesis-003.html @web-platform-tests/interop
+css/css-flexbox/baseline-synthesis-004.html @web-platform-tests/interop
+css/css-flexbox/canvas-contain-size.html @web-platform-tests/interop
+css/css-flexbox/content-height-with-scrollbars.html @web-platform-tests/interop
+css/css-flexbox/cross-axis-scrollbar.html @web-platform-tests/interop
+css/css-flexbox/css-box-justify-content.html @web-platform-tests/interop
+css/css-flexbox/css-flexbox-img-expand-evenly.html @web-platform-tests/interop
+css/css-flexbox/css-flexbox-row-reverse-wrap-reverse.html @web-platform-tests/interop
+css/css-flexbox/css-flexbox-row-reverse-wrap.html @web-platform-tests/interop
+css/css-flexbox/css-flexbox-row-reverse.html @web-platform-tests/interop
+css/css-flexbox/css-flexbox-row-wrap-reverse.html @web-platform-tests/interop
+css/css-flexbox/css-flexbox-row-wrap.html @web-platform-tests/interop
+css/css-flexbox/css-flexbox-row.html @web-platform-tests/interop
+css/css-flexbox/css-flexbox-test1.html @web-platform-tests/interop
+css/css-flexbox/display-flex-001.htm @web-platform-tests/interop
+css/css-flexbox/dynamic-baseline-change-nested.html @web-platform-tests/interop
+css/css-flexbox/dynamic-baseline-change.html @web-platform-tests/interop
+css/css-flexbox/dynamic-bsize-change.html @web-platform-tests/interop
+css/css-flexbox/dynamic-change-simplified-layout-002.html @web-platform-tests/interop
+css/css-flexbox/dynamic-change-simplified-layout.html @web-platform-tests/interop
+css/css-flexbox/dynamic-isize-change-001.html @web-platform-tests/interop
+css/css-flexbox/dynamic-isize-change-002.html @web-platform-tests/interop
+css/css-flexbox/dynamic-isize-change-003.html @web-platform-tests/interop
+css/css-flexbox/dynamic-isize-change-004.html @web-platform-tests/interop
+css/css-flexbox/dynamic-stretch-change.html @web-platform-tests/interop
+css/css-flexbox/fieldset-as-item-dynamic.html @web-platform-tests/interop
+css/css-flexbox/fieldset-as-item-overflow.html @web-platform-tests/interop
+css/css-flexbox/fieldset-baseline-alignment.html @web-platform-tests/interop
+css/css-flexbox/fit-content-item-001.html @web-platform-tests/interop
+css/css-flexbox/fit-content-item-002.html @web-platform-tests/interop
+css/css-flexbox/fit-content-item-003.html @web-platform-tests/interop
+css/css-flexbox/fit-content-item-004.html @web-platform-tests/interop
+css/css-flexbox/fixed-table-layout-with-percentage-width-in-flex-item.html @web-platform-tests/interop
+css/css-flexbox/flex-001.htm @web-platform-tests/interop
+css/css-flexbox/flex-002.htm @web-platform-tests/interop
+css/css-flexbox/flex-003.htm @web-platform-tests/interop
+css/css-flexbox/flex-004.htm @web-platform-tests/interop
+css/css-flexbox/flex-align-content-center.html @web-platform-tests/interop
+css/css-flexbox/flex-align-content-end.html @web-platform-tests/interop
+css/css-flexbox/flex-align-content-space-around.html @web-platform-tests/interop
+css/css-flexbox/flex-align-content-space-between.html @web-platform-tests/interop
+css/css-flexbox/flex-align-content-start.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-001.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-002.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-003.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-004.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-005.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-006.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-007.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-008.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-009.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-010.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-012.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-013.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-014.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-015.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-016.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-018.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-001.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-002.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-003.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-004.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-006.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-007.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-008.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-009.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-010.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-011.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-012.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-014.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-015.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-016.html @web-platform-tests/interop
+css/css-flexbox/flex-basis-001.html @web-platform-tests/interop
+css/css-flexbox/flex-basis-002.html @web-platform-tests/interop
+css/css-flexbox/flex-basis-003.html @web-platform-tests/interop
+css/css-flexbox/flex-basis-004.html @web-platform-tests/interop
+css/css-flexbox/flex-basis-005.html @web-platform-tests/interop
+css/css-flexbox/flex-basis-006.html @web-platform-tests/interop
+css/css-flexbox/flex-basis-007.html @web-platform-tests/interop
+css/css-flexbox/flex-basis-008.html @web-platform-tests/interop
+css/css-flexbox/flex-basis-010.html @web-platform-tests/interop
+css/css-flexbox/flex-basis-011.html @web-platform-tests/interop
+css/css-flexbox/flex-basis-012.html @web-platform-tests/interop
+css/css-flexbox/flex-basis-item-margins-001.html @web-platform-tests/interop
+css/css-flexbox/flex-box-wrap.html @web-platform-tests/interop
+css/css-flexbox/flex-child-percent-basis-resize-1.html @web-platform-tests/interop
+css/css-flexbox/flex-container-margin.html @web-platform-tests/interop
+css/css-flexbox/flex-direction-column-reverse.html @web-platform-tests/interop
+css/css-flexbox/flex-direction-column.html @web-platform-tests/interop
+css/css-flexbox/flex-direction-modify.html @web-platform-tests/interop
+css/css-flexbox/flex-direction-row-reverse.html @web-platform-tests/interop
+css/css-flexbox/flex-direction-row-vertical.html @web-platform-tests/interop
+css/css-flexbox/flex-direction-with-element-insert.html @web-platform-tests/interop
+css/css-flexbox/flex-direction.html @web-platform-tests/interop
+css/css-flexbox/flex-flow-001.html @web-platform-tests/interop
+css/css-flexbox/flex-flow-002.html @web-platform-tests/interop
+css/css-flexbox/flex-flow-003.html @web-platform-tests/interop
+css/css-flexbox/flex-flow-004.html @web-platform-tests/interop
+css/css-flexbox/flex-flow-005.html @web-platform-tests/interop
+css/css-flexbox/flex-flow-006.html @web-platform-tests/interop
+css/css-flexbox/flex-flow-007.html @web-platform-tests/interop
+css/css-flexbox/flex-flow-008.html @web-platform-tests/interop
+css/css-flexbox/flex-flow-009.html @web-platform-tests/interop
+css/css-flexbox/flex-flow-010.html @web-platform-tests/interop
+css/css-flexbox/flex-flow-011.html @web-platform-tests/interop
+css/css-flexbox/flex-flow-012.html @web-platform-tests/interop
+css/css-flexbox/flex-grow-001.xht @web-platform-tests/interop
+css/css-flexbox/flex-grow-002.html @web-platform-tests/interop
+css/css-flexbox/flex-grow-003.html @web-platform-tests/interop
+css/css-flexbox/flex-grow-004.html @web-platform-tests/interop
+css/css-flexbox/flex-grow-005.html @web-platform-tests/interop
+css/css-flexbox/flex-grow-006.html @web-platform-tests/interop
+css/css-flexbox/flex-grow-007.html @web-platform-tests/interop
+css/css-flexbox/flex-grow-008.html @web-platform-tests/interop
+css/css-flexbox/flex-height-min-content.html @web-platform-tests/interop
+css/css-flexbox/flex-inline.html @web-platform-tests/interop
+css/css-flexbox/flex-item-and-percentage-abspos.html @web-platform-tests/interop
+css/css-flexbox/flex-item-contains-size-layout-001.html @web-platform-tests/interop
+css/css-flexbox/flex-item-transferred-sizes-padding-border-sizing.html @web-platform-tests/interop
+css/css-flexbox/flex-item-transferred-sizes-padding-content-sizing.html @web-platform-tests/interop
+css/css-flexbox/flex-item-vertical-align.html @web-platform-tests/interop
+css/css-flexbox/flex-item-z-ordering-001.html @web-platform-tests/interop
+css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse.html @web-platform-tests/interop
+css/css-flexbox/flex-lines/multi-line-wrap-reverse-row-reverse.html @web-platform-tests/interop
+css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse.html @web-platform-tests/interop
+css/css-flexbox/flex-lines/multi-line-wrap-with-row-reverse.html @web-platform-tests/interop
+css/css-flexbox/flex-margin-no-collapse.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-001.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-002.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-003.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-004.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-005.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-006.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-007.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-008.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-011.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-013.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-014.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-015.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-016.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-017.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-018.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-019.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-020.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-021.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-022.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-023.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-024.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-026.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-027.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-028.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-029.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-030.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-001.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-002.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-003.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-004.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-005.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-006.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-007.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-008.xht @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-009.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-010.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-011.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-012.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-013.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-015.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-016.html @web-platform-tests/interop
+css/css-flexbox/flex-order.html @web-platform-tests/interop
+css/css-flexbox/flex-shrink-001.html @web-platform-tests/interop
+css/css-flexbox/flex-shrink-002.html @web-platform-tests/interop
+css/css-flexbox/flex-shrink-003.html @web-platform-tests/interop
+css/css-flexbox/flex-shrink-004.html @web-platform-tests/interop
+css/css-flexbox/flex-shrink-005.html @web-platform-tests/interop
+css/css-flexbox/flex-shrink-006.html @web-platform-tests/interop
+css/css-flexbox/flex-shrink-007.html @web-platform-tests/interop
+css/css-flexbox/flex-shrink-008.html @web-platform-tests/interop
+css/css-flexbox/flex-vertical-align-effect.html @web-platform-tests/interop
+css/css-flexbox/flex-wrap-002.html @web-platform-tests/interop
+css/css-flexbox/flex-wrap-003.html @web-platform-tests/interop
+css/css-flexbox/flex-wrap-004.html @web-platform-tests/interop
+css/css-flexbox/flex-wrap-005.html @web-platform-tests/interop
+css/css-flexbox/flex-wrap-006.html @web-platform-tests/interop
+css/css-flexbox/flexbox-align-items-center-nested-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-baseline-horiz-001a.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-baseline-horiz-001b.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-baseline-horiz-002.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-baseline-horiz-004.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-baseline-horiz-005.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-baseline-horiz-006.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-baseline-horiz-007.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-baseline-horiz-008.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-horiz-001-block.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-horiz-001-table.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-horiz-002.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-horiz-003.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-horiz-004.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-horiz-005.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-stretch-vert-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-stretch-vert-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-vert-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-vert-002.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-vert-003.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-vert-004.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-vert-rtl-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-vert-rtl-002.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-vert-rtl-003.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-vert-rtl-004.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-anonymous-items-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-empty-001a.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-empty-001b.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-multi-item-horiz-001a.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-multi-item-horiz-001b.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-multi-line-horiz-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-multi-line-horiz-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-multi-line-horiz-003.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-multi-line-horiz-004.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-multi-line-vert-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-multi-line-vert-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-nested-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-single-item-001a.html @web-platform-tests/interop
+css/css-flexbox/flexbox-baseline-single-item-001b.html @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-block-horiz-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-block-horiz-001v.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-block-vert-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-block-vert-001v.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-canvas-horiz-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-canvas-horiz-001v.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-canvas-vert-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-canvas-vert-001v.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-fieldset-horiz-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-fieldset-vert-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-iframe-horiz-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-iframe-vert-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-img-horiz-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-img-vert-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-textarea-horiz-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-textarea-vert-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-video-horiz-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-basic-video-vert-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-break-request-horiz-001a.html @web-platform-tests/interop
+css/css-flexbox/flexbox-break-request-horiz-001b.html @web-platform-tests/interop
+css/css-flexbox/flexbox-break-request-horiz-002a.html @web-platform-tests/interop
+css/css-flexbox/flexbox-break-request-horiz-002b.html @web-platform-tests/interop
+css/css-flexbox/flexbox-break-request-vert-001a.html @web-platform-tests/interop
+css/css-flexbox/flexbox-break-request-vert-001b.html @web-platform-tests/interop
+css/css-flexbox/flexbox-break-request-vert-002a.html @web-platform-tests/interop
+css/css-flexbox/flexbox-break-request-vert-002b.html @web-platform-tests/interop
+css/css-flexbox/flexbox-column-row-gap-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-column-row-gap-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox-column-row-gap-003.html @web-platform-tests/interop
+css/css-flexbox/flexbox-column-row-gap-004.html @web-platform-tests/interop
+css/css-flexbox/flexbox-definite-cross-size-constrained-percentage.html @web-platform-tests/interop
+css/css-flexbox/flexbox-definite-sizes-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-definite-sizes-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox-definite-sizes-003.html @web-platform-tests/interop
+css/css-flexbox/flexbox-definite-sizes-004.html @web-platform-tests/interop
+css/css-flexbox/flexbox-definite-sizes-005.html @web-platform-tests/interop
+css/css-flexbox/flexbox-definite-sizes-006.html @web-platform-tests/interop
+css/css-flexbox/flexbox-dyn-resize-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-basis-content-001a.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-basis-content-001b.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-basis-content-002a.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-basis-content-002b.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-basis-content-003a.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-basis-content-003b.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-basis-content-004a.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-basis-content-004b.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-direction-column-percentage-ignored.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-direction-column-reverse.htm @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-direction-column.htm @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-direction-default.htm @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-direction-row-reverse.htm @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-direction-row.htm @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-flow-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-flow-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-wrap-default.htm @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-wrap-flexing.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-wrap-horiz-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-wrap-horiz-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-wrap-nowrap.htm @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-wrap-vert-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-wrap-vert-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-wrap-wrap-reverse.htm @web-platform-tests/interop
+css/css-flexbox/flexbox-flex-wrap-wrap.htm @web-platform-tests/interop
+css/css-flexbox/flexbox-gap-position-absolute.html @web-platform-tests/interop
+css/css-flexbox/flexbox-iframe-intrinsic-size-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-items-as-stacking-contexts-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-items-as-stacking-contexts-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox-items-as-stacking-contexts-003.html @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-horiz-001a.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-horiz-001b.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-horiz-002.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-horiz-003.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-horiz-004.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-horiz-005.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-horiz-006.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-vert-001a.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-vert-001b.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-vert-002.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-vert-003.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-vert-004.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-vert-005.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-vert-006.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-wmvert-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-margin-auto-horiz-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-margin-auto-horiz-002.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-mbp-horiz-001-reverse.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-mbp-horiz-001-rtl.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-mbp-horiz-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-mbp-horiz-002a.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-mbp-horiz-002b.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-mbp-horiz-002v.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-mbp-horiz-003-reverse.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-mbp-horiz-003.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-mbp-horiz-003v.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-mbp-horiz-004.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-min-height-auto-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-min-height-auto-002a.html @web-platform-tests/interop
+css/css-flexbox/flexbox-min-height-auto-002b.html @web-platform-tests/interop
+css/css-flexbox/flexbox-min-height-auto-002c.html @web-platform-tests/interop
+css/css-flexbox/flexbox-min-height-auto-003.html @web-platform-tests/interop
+css/css-flexbox/flexbox-min-height-auto-004.html @web-platform-tests/interop
+css/css-flexbox/flexbox-min-width-auto-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-min-width-auto-002a.html @web-platform-tests/interop
+css/css-flexbox/flexbox-min-width-auto-002b.html @web-platform-tests/interop
+css/css-flexbox/flexbox-min-width-auto-002c.html @web-platform-tests/interop
+css/css-flexbox/flexbox-min-width-auto-003.html @web-platform-tests/interop
+css/css-flexbox/flexbox-min-width-auto-004.html @web-platform-tests/interop
+css/css-flexbox/flexbox-min-width-auto-005.html @web-platform-tests/interop
+css/css-flexbox/flexbox-min-width-auto-006.html @web-platform-tests/interop
+css/css-flexbox/flexbox-order-only-flexitems.html @web-platform-tests/interop
+css/css-flexbox/flexbox-overflow-horiz-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-overflow-horiz-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox-overflow-horiz-003.html @web-platform-tests/interop
+css/css-flexbox/flexbox-overflow-horiz-004.html @web-platform-tests/interop
+css/css-flexbox/flexbox-overflow-horiz-005.html @web-platform-tests/interop
+css/css-flexbox/flexbox-overflow-padding-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-overflow-padding-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox-overflow-vert-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-overflow-vert-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox-overflow-vert-003.html @web-platform-tests/interop
+css/css-flexbox/flexbox-overflow-vert-004.html @web-platform-tests/interop
+css/css-flexbox/flexbox-overflow-vert-005.html @web-platform-tests/interop
+css/css-flexbox/flexbox-paint-ordering-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-paint-ordering-002.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-paint-ordering-003.html @web-platform-tests/interop
+css/css-flexbox/flexbox-root-node-001a.html @web-platform-tests/interop
+css/css-flexbox/flexbox-root-node-001b.html @web-platform-tests/interop
+css/css-flexbox/flexbox-safe-overflow-position-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-single-line-clamp-1.html @web-platform-tests/interop
+css/css-flexbox/flexbox-single-line-clamp-2.html @web-platform-tests/interop
+css/css-flexbox/flexbox-single-line-clamp-3.html @web-platform-tests/interop
+css/css-flexbox/flexbox-sizing-horiz-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-sizing-horiz-002.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-sizing-vert-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-sizing-vert-002.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-table-fixup-001.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-whitespace-handling-001a.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-whitespace-handling-001b.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-whitespace-handling-002.xhtml @web-platform-tests/interop
+css/css-flexbox/flexbox-with-multi-column-property.html @web-platform-tests/interop
+css/css-flexbox/flexbox-with-pseudo-elements-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-with-pseudo-elements-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox-with-pseudo-elements-003.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-003.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-004.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-005.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-006.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-007.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-008.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-009.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-010.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-011.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-012.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-013.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-014.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-015.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-016.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-slr-row-mix.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-slr-rtl.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-slr.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-srl-row-mix.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-srl-rtl.html @web-platform-tests/interop
+css/css-flexbox/flexbox-writing-mode-srl.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-content-center.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-content-flexend.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-content-flexstart.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-content-spacearound.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-content-spacebetween.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-content-stretch-2.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-content-stretch.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-items-baseline.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-items-center-2.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-items-center-3.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-items-center.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-items-flexend-2.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-items-flexend.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-items-flexstart-2.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-items-flexstart.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-items-stretch-2.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-items-stretch-3.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-items-stretch-4.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-items-stretch.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-self-auto.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-self-baseline.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-self-center.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-self-flexend.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-self-flexstart.html @web-platform-tests/interop
+css/css-flexbox/flexbox_align-self-stretch.html @web-platform-tests/interop
+css/css-flexbox/flexbox_block.html @web-platform-tests/interop
+css/css-flexbox/flexbox_box-clear.html @web-platform-tests/interop
+css/css-flexbox/flexbox_columns-flexitems-2.html @web-platform-tests/interop
+css/css-flexbox/flexbox_columns-flexitems.html @web-platform-tests/interop
+css/css-flexbox/flexbox_columns.html @web-platform-tests/interop
+css/css-flexbox/flexbox_direction-column-reverse.html @web-platform-tests/interop
+css/css-flexbox/flexbox_direction-column.html @web-platform-tests/interop
+css/css-flexbox/flexbox_direction-row-reverse.html @web-platform-tests/interop
+css/css-flexbox/flexbox_display.html @web-platform-tests/interop
+css/css-flexbox/flexbox_fbfc.html @web-platform-tests/interop
+css/css-flexbox/flexbox_fbfc2.html @web-platform-tests/interop
+css/css-flexbox/flexbox_first-line.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-0-0-unitless.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-0-0.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-0-1-unitless-basis.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-0-N-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-0-N-unitless-basis.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-0-N.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-0-Npercent-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-0-Npercent.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-0-auto-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-0-auto.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-0.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-1-0-unitless.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-1-0.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-1-1-unitless-basis.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-1-N-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-1-N-unitless-basis.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-1-N.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-1-Npercent-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-1-Npercent.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-1-auto-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-1-auto.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-1.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-N-0-unitless.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-N-0.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-N-N-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-N-N.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-N-Npercent-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-N-Npercent.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-N-auto-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-N-auto.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-N.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-0-auto.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-0-0-unitless.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-0-0.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-0-N-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-0-N.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-0-Npercent-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-0-Npercent.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-0-auto-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-0-auto.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-0.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-1-0-unitless.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-1-0.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-1-N-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-1-N.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-1-Npercent-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-1-Npercent.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-1-auto-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-1-auto.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-1.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-N-0-unitless.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-N-0.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-N-N-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-N-N.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-N-Npercent-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-N-Npercent.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-N-auto-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-N-auto.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-1-N.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-0-0-unitless.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-0-0.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-0-N-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-0-N.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-0-Npercent-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-0-Npercent.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-0-auto-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-0-auto.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-0.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-1-0-unitless.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-1-0.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-1-N-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-1-N.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-1-Npercent-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-1-Npercent.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-1-auto-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-1-auto.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-1.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-N-0-unitless.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-N-0.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-N-N-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-N-N.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-N-Npercent-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-N-Npercent.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-N-auto-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-N-auto.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-N-N.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-auto.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-basis-shrink.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-basis.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-formatting-interop.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-initial-2.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-initial.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-natural-mixed-basis.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-natural-variable-auto-basis.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-natural-variable-zero-basis.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-natural.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-none-wrappable-content.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flex-none.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flow-column-reverse-wrap-reverse.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flow-column-reverse-wrap.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flow-column-wrap-reverse.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flow-column-wrap.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flow-row-wrap-reverse.html @web-platform-tests/interop
+css/css-flexbox/flexbox_flow-row-wrap.html @web-platform-tests/interop
+css/css-flexbox/flexbox_generated-flex.html @web-platform-tests/interop
+css/css-flexbox/flexbox_generated-nested-flex.html @web-platform-tests/interop
+css/css-flexbox/flexbox_generated.html @web-platform-tests/interop
+css/css-flexbox/flexbox_inline-float.html @web-platform-tests/interop
+css/css-flexbox/flexbox_inline.html @web-platform-tests/interop
+css/css-flexbox/flexbox_item-bottom-float.html @web-platform-tests/interop
+css/css-flexbox/flexbox_item-clear.html @web-platform-tests/interop
+css/css-flexbox/flexbox_item-float.html @web-platform-tests/interop
+css/css-flexbox/flexbox_item-top-float.html @web-platform-tests/interop
+css/css-flexbox/flexbox_item-vertical-align.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-center.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-end-rtl.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-end.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-flex-end.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-flex-start.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-left-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-left-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-right-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-right-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-spacearound-negative.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-spacearound-only.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-spacearound.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-spacebetween-negative.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-spacebetween-only.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-spacebetween.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-start-rtl.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-start.html @web-platform-tests/interop
+css/css-flexbox/flexbox_margin-auto-overflow.html @web-platform-tests/interop
+css/css-flexbox/flexbox_margin-auto.html @web-platform-tests/interop
+css/css-flexbox/flexbox_margin-left-ex.html @web-platform-tests/interop
+css/css-flexbox/flexbox_margin.html @web-platform-tests/interop
+css/css-flexbox/flexbox_nested-flex.html @web-platform-tests/interop
+css/css-flexbox/flexbox_object.html @web-platform-tests/interop
+css/css-flexbox/flexbox_order-abspos-space-around.html @web-platform-tests/interop
+css/css-flexbox/flexbox_order-box.html @web-platform-tests/interop
+css/css-flexbox/flexbox_order-noninteger-invalid.html @web-platform-tests/interop
+css/css-flexbox/flexbox_order.html @web-platform-tests/interop
+css/css-flexbox/flexbox_quirks_body.html @web-platform-tests/interop
+css/css-flexbox/flexbox_rowspan-overflow-automatic.html @web-platform-tests/interop
+css/css-flexbox/flexbox_rowspan-overflow.html @web-platform-tests/interop
+css/css-flexbox/flexbox_rowspan.html @web-platform-tests/interop
+css/css-flexbox/flexbox_rtl-direction.html @web-platform-tests/interop
+css/css-flexbox/flexbox_rtl-flow-reverse.html @web-platform-tests/interop
+css/css-flexbox/flexbox_rtl-flow.html @web-platform-tests/interop
+css/css-flexbox/flexbox_rtl-order.html @web-platform-tests/interop
+css/css-flexbox/flexbox_stf-abspos.html @web-platform-tests/interop
+css/css-flexbox/flexbox_stf-fixpos.html @web-platform-tests/interop
+css/css-flexbox/flexbox_stf-float.html @web-platform-tests/interop
+css/css-flexbox/flexbox_stf-inline-block.html @web-platform-tests/interop
+css/css-flexbox/flexbox_stf-table-caption.html @web-platform-tests/interop
+css/css-flexbox/flexbox_stf-table-cell.html @web-platform-tests/interop
+css/css-flexbox/flexbox_stf-table-row-group.html @web-platform-tests/interop
+css/css-flexbox/flexbox_stf-table-row.html @web-platform-tests/interop
+css/css-flexbox/flexbox_stf-table-singleline-2.html @web-platform-tests/interop
+css/css-flexbox/flexbox_stf-table-singleline.html @web-platform-tests/interop
+css/css-flexbox/flexbox_stf-table.html @web-platform-tests/interop
+css/css-flexbox/flexbox_table-fixed-layout.html @web-platform-tests/interop
+css/css-flexbox/flexbox_width-overflow.html @web-platform-tests/interop
+css/css-flexbox/flexbox_wrap-long.html @web-platform-tests/interop
+css/css-flexbox/flexbox_wrap-reverse.html @web-platform-tests/interop
+css/css-flexbox/flexbox_wrap.html @web-platform-tests/interop
+css/css-flexbox/flexbox_writing_mode_vertical_lays_out_contents_from_top_to_bottom.html @web-platform-tests/interop
+css/css-flexbox/flexible-box-float.html @web-platform-tests/interop
+css/css-flexbox/flexible-order.html @web-platform-tests/interop
+css/css-flexbox/flexitem-stretch-range.html @web-platform-tests/interop
+css/css-flexbox/gap-001-lr.html @web-platform-tests/interop
+css/css-flexbox/gap-001-ltr.html @web-platform-tests/interop
+css/css-flexbox/gap-001-rl.html @web-platform-tests/interop
+css/css-flexbox/gap-001-rtl.html @web-platform-tests/interop
+css/css-flexbox/gap-002-lr.html @web-platform-tests/interop
+css/css-flexbox/gap-002-ltr.html @web-platform-tests/interop
+css/css-flexbox/gap-002-rl.html @web-platform-tests/interop
+css/css-flexbox/gap-002-rtl.html @web-platform-tests/interop
+css/css-flexbox/gap-003-lr.html @web-platform-tests/interop
+css/css-flexbox/gap-003-ltr.html @web-platform-tests/interop
+css/css-flexbox/gap-003-rl.html @web-platform-tests/interop
+css/css-flexbox/gap-003-rtl.html @web-platform-tests/interop
+css/css-flexbox/gap-004-lr.html @web-platform-tests/interop
+css/css-flexbox/gap-004-ltr.html @web-platform-tests/interop
+css/css-flexbox/gap-004-rl.html @web-platform-tests/interop
+css/css-flexbox/gap-004-rtl.html @web-platform-tests/interop
+css/css-flexbox/gap-005-lr.html @web-platform-tests/interop
+css/css-flexbox/gap-005-ltr.html @web-platform-tests/interop
+css/css-flexbox/gap-005-rl.html @web-platform-tests/interop
+css/css-flexbox/gap-005-rtl.html @web-platform-tests/interop
+css/css-flexbox/gap-006-lr.html @web-platform-tests/interop
+css/css-flexbox/gap-006-ltr.html @web-platform-tests/interop
+css/css-flexbox/gap-006-rl.html @web-platform-tests/interop
+css/css-flexbox/gap-006-rtl.html @web-platform-tests/interop
+css/css-flexbox/gap-007-lr.html @web-platform-tests/interop
+css/css-flexbox/gap-007-ltr.html @web-platform-tests/interop
+css/css-flexbox/gap-007-rl.html @web-platform-tests/interop
+css/css-flexbox/gap-007-rtl.html @web-platform-tests/interop
+css/css-flexbox/gap-008-ltr.html @web-platform-tests/interop
+css/css-flexbox/gap-009-ltr.html @web-platform-tests/interop
+css/css-flexbox/gap-010-ltr.html @web-platform-tests/interop
+css/css-flexbox/gap-011.html @web-platform-tests/interop
+css/css-flexbox/gap-012.html @web-platform-tests/interop
+css/css-flexbox/gap-013.html @web-platform-tests/interop
+css/css-flexbox/gap-014.html @web-platform-tests/interop
+css/css-flexbox/gap-015.html @web-platform-tests/interop
+css/css-flexbox/gap-016.html @web-platform-tests/interop
+css/css-flexbox/grid-flex-item-001.html @web-platform-tests/interop
+css/css-flexbox/grid-flex-item-002.html @web-platform-tests/interop
+css/css-flexbox/grid-flex-item-003.html @web-platform-tests/interop
+css/css-flexbox/grid-flex-item-004.html @web-platform-tests/interop
+css/css-flexbox/grid-flex-item-005.html @web-platform-tests/interop
+css/css-flexbox/grid-flex-item-006.html @web-platform-tests/interop
+css/css-flexbox/image-items-flake-001.html @web-platform-tests/interop
+css/css-flexbox/image-nested-within-definite-column-flexbox.html @web-platform-tests/interop
+css/css-flexbox/inline-flex-min-content-height.html @web-platform-tests/interop
+css/css-flexbox/item-with-max-height-and-scrollbar.html @web-platform-tests/interop
+css/css-flexbox/item-with-table-with-infinite-max-intrinsic-width.html @web-platform-tests/interop
+css/css-flexbox/justify-content-001.htm @web-platform-tests/interop
+css/css-flexbox/justify-content-002.htm @web-platform-tests/interop
+css/css-flexbox/justify-content-003.htm @web-platform-tests/interop
+css/css-flexbox/justify-content-004.htm @web-platform-tests/interop
+css/css-flexbox/justify-content-005.htm @web-platform-tests/interop
+css/css-flexbox/justify-content-sideways-001.html @web-platform-tests/interop
+css/css-flexbox/layout-algorithm_algo-cross-line-001.html @web-platform-tests/interop
+css/css-flexbox/layout-algorithm_algo-cross-line-002.html @web-platform-tests/interop
+css/css-flexbox/multiline-column-max-height.html @web-platform-tests/interop
+css/css-flexbox/multiline-reverse-wrap-baseline.html @web-platform-tests/interop
+css/css-flexbox/negative-margins-001.html @web-platform-tests/interop
+css/css-flexbox/nested-orthogonal-flexbox-relayout.html @web-platform-tests/interop
+css/css-flexbox/order/order-abs-children-painting-order.html @web-platform-tests/interop
+css/css-flexbox/order/order-with-column-reverse.html @web-platform-tests/interop
+css/css-flexbox/order/order-with-row-reverse.html @web-platform-tests/interop
+css/css-flexbox/order-painting.html @web-platform-tests/interop
+css/css-flexbox/ortho-table-item-001.html @web-platform-tests/interop
+css/css-flexbox/overflow-area-001.html @web-platform-tests/interop
+css/css-flexbox/overflow-area-002.html @web-platform-tests/interop
+css/css-flexbox/overflow-area-003.html @web-platform-tests/interop
+css/css-flexbox/overflow-auto-001.html @web-platform-tests/interop
+css/css-flexbox/overflow-auto-005.html @web-platform-tests/interop
+css/css-flexbox/overflow-auto-007.html @web-platform-tests/interop
+css/css-flexbox/overflow-top-left.html @web-platform-tests/interop
+css/css-flexbox/padding-overflow.html @web-platform-tests/interop
+css/css-flexbox/percentage-descendant-of-anonymous-flex-item.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-002.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-004.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-005.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-006.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-007.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-008.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-009.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-010.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-014.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-015.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-016.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-017.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-018.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-019.html @web-platform-tests/interop
+css/css-flexbox/percentage-max-height-001.html @web-platform-tests/interop
+css/css-flexbox/percentage-max-height-002.html @web-platform-tests/interop
+css/css-flexbox/percentage-max-height-003.html @web-platform-tests/interop
+css/css-flexbox/percentage-max-height-004.html @web-platform-tests/interop
+css/css-flexbox/percentage-padding-002.html @web-platform-tests/interop
+css/css-flexbox/percentage-size-subitems-001.html @web-platform-tests/interop
+css/css-flexbox/percentage-widths-001.html @web-platform-tests/interop
+css/css-flexbox/position-absolute-scrollbar-freeze.html @web-platform-tests/interop
+css/css-flexbox/position-fixed-001.html @web-platform-tests/interop
+css/css-flexbox/position-relative-percentage-top-002.html @web-platform-tests/interop
+css/css-flexbox/position-relative-percentage-top-003.html @web-platform-tests/interop
+css/css-flexbox/scrollbars-auto.html @web-platform-tests/interop
+css/css-flexbox/scrollbars-no-margin.html @web-platform-tests/interop
+css/css-flexbox/scrollbars.html @web-platform-tests/interop
+css/css-flexbox/select-element-zero-height-001.html @web-platform-tests/interop
+css/css-flexbox/select-element-zero-height-002.html @web-platform-tests/interop
+css/css-flexbox/stretch-flex-item-checkbox-input.html @web-platform-tests/interop
+css/css-flexbox/stretch-flex-item-radio-input.html @web-platform-tests/interop
+css/css-flexbox/stretch-input-in-column.html @web-platform-tests/interop
+css/css-flexbox/stretch-obeys-min-max-001.html @web-platform-tests/interop
+css/css-flexbox/stretch-obeys-min-max-002.html @web-platform-tests/interop
+css/css-flexbox/stretch-obeys-min-max-003.html @web-platform-tests/interop
+css/css-flexbox/stretching-orthogonal-flows.html @web-platform-tests/interop
+css/css-flexbox/svg-no-natural-size-grandchild.html @web-platform-tests/interop
+css/css-flexbox/svg-root-as-flex-item-001.html @web-platform-tests/interop
+css/css-flexbox/svg-root-as-flex-item-002.html @web-platform-tests/interop
+css/css-flexbox/svg-root-as-flex-item-003.html @web-platform-tests/interop
+css/css-flexbox/svg-root-as-flex-item-004.html @web-platform-tests/interop
+css/css-flexbox/svg-root-as-flex-item-005.html @web-platform-tests/interop
+css/css-flexbox/synthesize-vrl-baseline.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-auto-min-width.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-change-cell.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-fixed-min-width-2.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-fixed-min-width-3.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-fixed-min-width.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-flex-cross-size.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-inflexible-in-column-1.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-inflexible-in-column-2.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-inflexible-in-row-1.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-inflexible-in-row-2.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-large-intrinsic-size.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-min-content-height-1.tentative.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-min-content-height-2.tentative.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-min-height-1.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-narrow-content-2.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-narrow-content.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-percent-width-cell-001.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-specified-height.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-specified-width-vertical.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-specified-width.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-stretch-cross-size-2.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-stretch-cross-size-3.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-stretch-cross-size-4.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-stretch-cross-size-5.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-stretch-cross-size.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-wide-content.html @web-platform-tests/interop
+css/css-flexbox/table-item-flex-percentage-min-width.html @web-platform-tests/interop
+css/css-flexbox/table-item-flex-percentage-width.html @web-platform-tests/interop
+css/css-flexbox/table-with-float-paint.html @web-platform-tests/interop
+css/css-flexbox/table-with-infinite-max-intrinsic-width.html @web-platform-tests/interop
+css/css-flexbox/text-overflow-on-flexbox-001.html @web-platform-tests/interop
+css/css-flexbox/whitespace-in-flexitem-001.html @web-platform-tests/interop
+css/css-grid/abspos/absolute-positioning-changing-containing-block-001.html @web-platform-tests/interop
+css/css-grid/abspos/descendant-static-position-001.html @web-platform-tests/interop
+css/css-grid/abspos/descendant-static-position-002.html @web-platform-tests/interop
+css/css-grid/abspos/descendant-static-position-003.html @web-platform-tests/interop
+css/css-grid/abspos/descendant-static-position-004.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-img-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-003.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-004.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-safe-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-003.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-004.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-003.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-004.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-003.html @web-platform-tests/interop
+css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-004.html @web-platform-tests/interop
+css/css-grid/abspos/grid-item-absolute-positioning-dynamic-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-paint-positioned-children-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-children-writing-modes-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-item-dynamic-change-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-item-dynamic-change-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-item-dynamic-change-003.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-item-dynamic-change-004.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-item-dynamic-change-005.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-item-dynamic-change-006.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-item-dynamic-change-007.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-background-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-background-rtl-001.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-001.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-002.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-003.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-004.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-005.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-006.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-007.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-008.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-009.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-010.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-011.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-012.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-013.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-014.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-015.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-016.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-items-017.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-017.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-001.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-002.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-003.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-004.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-005.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-006.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-007.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-008.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-009.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-010.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-011.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-012.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-013.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-014.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-015.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-016.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-017.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-018.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-019.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-020.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-021.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-022.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-023.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-024.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-025.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-negative-indices-001.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-negative-indices-002.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-negative-indices-003.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-sizing-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-baseline-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-baseline-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-baseline-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-baseline-align-cycles-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-block-axis-alignment-auto-margins-008.html @web-platform-tests/interop
+css/css-grid/alignment/grid-container-auto-margins-scrollbars-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-006.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-007.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-008.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-009.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-010.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-011.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-012.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-013.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-014.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-015.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-016.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-017.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-018.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-019.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-020.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-021.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-022.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-023.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-024.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-025.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-026.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-027.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-028.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-006.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-007.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-008.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-009.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-010.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-011.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-012.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-013.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-014.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-015.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-016.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-017.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-018.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-019.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-020.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-021.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-022.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-023.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-024.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-006.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-007.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-008.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-009.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-010.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-011.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-012.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-013.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-014.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-015.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-016.html @web-platform-tests/interop
+css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-008.html @web-platform-tests/interop
+css/css-grid/alignment/grid-inline-baseline.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-aspect-ratio-stretch-1.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-aspect-ratio-stretch-2.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-aspect-ratio-stretch-3.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-aspect-ratio-stretch-4.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-auto-margins-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-auto-margins-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-1.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-2.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-3.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-4.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-5.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-6.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-self-baseline-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-justify-baseline-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-baseline-with-grid-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-baseline-with-grid-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-baseline-with-grid-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-baseline-with-grid-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-input-range.html @web-platform-tests/interop
+css/css-grid/alignment/replaced-alignment-with-aspect-ratio-001.html @web-platform-tests/interop
+css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.html @web-platform-tests/interop
+css/css-grid/alignment/replaced-alignment-with-aspect-ratio-003.tentative.html @web-platform-tests/interop
+css/css-grid/alignment/replaced-alignment-with-aspect-ratio-004.html @web-platform-tests/interop
+css/css-grid/alignment/replaced-alignment-with-aspect-ratio-005.html @web-platform-tests/interop
+css/css-grid/alignment/replaced-alignment-with-aspect-ratio-006.html @web-platform-tests/interop
+css/css-grid/alignment/replaced-alignment-with-aspect-ratio-007.html @web-platform-tests/interop
+css/css-grid/alignment/replaced-alignment-with-aspect-ratio-008.html @web-platform-tests/interop
+css/css-grid/alignment/replaced-alignment-with-aspect-ratio-009.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-001.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-002-b.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-002.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-003.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-004.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-005.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-006.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-007.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-008.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-002.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-003.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-004.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-005.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-006.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-007.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-008.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-009.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-010.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-011.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-012.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-001.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-002.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-003.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-004.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-005.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-006.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-007.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-001.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-002.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-003.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-004.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-005.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-006.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-007.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-001.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-002.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-003.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-004.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-005.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-006.html @web-platform-tests/interop
+css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-007.html @web-platform-tests/interop
+css/css-grid/animation/grid-template-columns-001.html @web-platform-tests/interop
+css/css-grid/animation/grid-template-rows-001.html @web-platform-tests/interop
+css/css-grid/anonymous-grid-items-001.html @web-platform-tests/interop
+css/css-grid/child-border-box-and-max-content-001.html @web-platform-tests/interop
+css/css-grid/child-border-box-and-max-content-002.html @web-platform-tests/interop
+css/css-grid/chrome-bug-001.html @web-platform-tests/interop
+css/css-grid/dynamic-grid-with-auto-fill.html @web-platform-tests/interop
+css/css-grid/dynamic-grid-within-flexbox.html @web-platform-tests/interop
+css/css-grid/empty-grid-within-flexbox.html @web-platform-tests/interop
+css/css-grid/grid-child-percent-basis-resize-1.html @web-platform-tests/interop
+css/css-grid/grid-container-baseline-synthesized-001.html @web-platform-tests/interop
+css/css-grid/grid-container-baseline-synthesized-002.html @web-platform-tests/interop
+css/css-grid/grid-container-baseline-synthesized-003.html @web-platform-tests/interop
+css/css-grid/grid-container-baseline-synthesized-004.html @web-platform-tests/interop
+css/css-grid/grid-definition/flex-item-grid-container-percentage-rows-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/fr-unit-with-percentage.html @web-platform-tests/interop
+css/css-grid/grid-definition/fr-unit.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-aspect-ratio-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-aspect-ratio-002.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-dynamic-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-dynamic-002.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-dynamic-003.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-minmax.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-multiple-values-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-multiple-values-002.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-multiple-values-003.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-multiple-values-004.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-multiple-values-005.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-layout-auto-tracks.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-layout-basic.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-layout-repeat-notation.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-repeat-max-width-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-support-named-grid-lines-002.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-support-named-grid-lines-003.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-template-columns-fit-content-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-template-rows-fit-content-001.html @web-platform-tests/interop
+css/css-grid/grid-item-non-auto-height-stretch-001.html @web-platform-tests/interop
+css/css-grid/grid-item-non-auto-height-stretch-002.html @web-platform-tests/interop
+css/css-grid/grid-item-non-auto-height-stretch-003.html @web-platform-tests/interop
+css/css-grid/grid-item-non-auto-height-stretch-004.html @web-platform-tests/interop
+css/css-grid/grid-item-percentage-quirk-001.html @web-platform-tests/interop
+css/css-grid/grid-item-percentage-quirk-002.html @web-platform-tests/interop
+css/css-grid/grid-items/anonymous-grid-item-001.html @web-platform-tests/interop
+css/css-grid/grid-items/aspect-ratio-001.html @web-platform-tests/interop
+css/css-grid/grid-items/aspect-ratio-002.html @web-platform-tests/interop
+css/css-grid/grid-items/aspect-ratio-003.html @web-platform-tests/interop
+css/css-grid/grid-items/aspect-ratio-004.html @web-platform-tests/interop
+css/css-grid/grid-items/aspect-ratio-005.html @web-platform-tests/interop
+css/css-grid/grid-items/explicitly-sized-grid-item-as-table.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-img-item-percent-max-height-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-items-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-items-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-items-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-items-inline-blocks-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-order-property-auto-placement-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-order-property-auto-placement-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-order-property-auto-placement-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-order-property-auto-placement-004.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-order-property-auto-placement-005.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-order-property-painting-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-order-property-painting-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-order-property-painting-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-order-property-painting-004.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-order-property-painting-005.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-z-axis-ordering-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-z-axis-ordering-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-z-axis-ordering-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-z-axis-ordering-004.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-z-axis-ordering-005.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-004.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-005.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-006.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-intrinsic-maximums.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-containing-block-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-containing-block-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-containing-block-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-containing-block-004.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-inline-contribution-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-inline-contribution-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-inline-contribution-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-margins-and-writing-modes-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-overflow-auto-max-height-percentage.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-percentage-sizes-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-percentage-sizes-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-percentage-sizes-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-rel-pos-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-rel-pos-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-script-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-contribution-negative-margins.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-inline-blocks-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-004.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-005.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-006.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-007.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-008.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-009.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-010.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-011.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-012.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-013.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-014.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-004.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-005.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-006.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-007.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-008.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-009.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-010.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-011.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-012.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-013.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-014.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-sizing-alignment-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-layout-grid-in-grid.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-layout-z-order-a.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-layout-z-order-b.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-004.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-005.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-006.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-007.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-008.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-009.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-010.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-011.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-012.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-013.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-014.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-015.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-016.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-017.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-018.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-019.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-020.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-order-property-auto-placement-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-order-property-auto-placement-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-order-property-auto-placement-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-order-property-auto-placement-004.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-order-property-auto-placement-005.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-order-property-painting-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-order-property-painting-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-order-property-painting-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-order-property-painting-004.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-order-property-painting-005.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-size-with-orthogonal-child-dynamic.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-z-axis-ordering-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-z-axis-ordering-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-z-axis-ordering-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-z-axis-ordering-004.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-z-axis-ordering-005.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-003.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-004.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-005.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-006.html @web-platform-tests/interop
+css/css-grid/grid-items/item-with-table-with-infinite-max-intrinsic-width.html @web-platform-tests/interop
+css/css-grid/grid-items/percentage-margin-dynamic.html @web-platform-tests/interop
+css/css-grid/grid-items/percentage-size-indefinite-replaced.html @web-platform-tests/interop
+css/css-grid/grid-items/percentage-size-replaced-subitems-001.html @web-platform-tests/interop
+css/css-grid/grid-items/percentage-size-subitems-001.html @web-platform-tests/interop
+css/css-grid/grid-items/percentage-size-subitems-002.html @web-platform-tests/interop
+css/css-grid/grid-items/remove-svg-grid-item-001.html @web-platform-tests/interop
+css/css-grid/grid-items/replaced-element-001.html @web-platform-tests/interop
+css/css-grid/grid-items/replaced-element-002.html @web-platform-tests/interop
+css/css-grid/grid-items/replaced-element-007.html @web-platform-tests/interop
+css/css-grid/grid-items/replaced-element-010.html @web-platform-tests/interop
+css/css-grid/grid-items/replaced-element-011.html @web-platform-tests/interop
+css/css-grid/grid-items/replaced-element-012.html @web-platform-tests/interop
+css/css-grid/grid-items/replaced-element-013.html @web-platform-tests/interop
+css/css-grid/grid-items/replaced-element-014.html @web-platform-tests/interop
+css/css-grid/grid-items/replaced-element-015.html @web-platform-tests/interop
+css/css-grid/grid-items/table-with-infinite-max-intrinsic-width.html @web-platform-tests/interop
+css/css-grid/grid-items/whitespace-in-grid-item-001.html @web-platform-tests/interop
+css/css-grid/grid-model/column-property-should-not-apply-on-grid-container-001.html @web-platform-tests/interop
+css/css-grid/grid-model/display-grid.html @web-platform-tests/interop
+css/css-grid/grid-model/display-inline-grid.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-areas-overflowing-grid-container-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-areas-overflowing-grid-container-002.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-areas-overflowing-grid-container-003.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-areas-overflowing-grid-container-004.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-areas-overflowing-grid-container-005.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-areas-overflowing-grid-container-006.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-areas-overflowing-grid-container-007.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-areas-overflowing-grid-container-008.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-areas-overflowing-grid-container-009.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-container-ignores-first-letter-002.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-container-scrollbar-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-container-scrollbars-sizing-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-container-scrollbars-sizing-002.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-display-grid-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-display-inline-grid-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-first-letter-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-first-letter-002.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-first-letter-003.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-first-line-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-first-line-002.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-first-line-003.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-float-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-floats-no-intrude-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-floats-no-intrude-002.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-inline-first-letter-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-inline-first-letter-002.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-inline-first-letter-003.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-inline-first-line-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-inline-first-line-002.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-inline-first-line-003.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-inline-float-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-inline-floats-no-intrude-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-inline-margins-no-collapse-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-inline-multicol-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-inline-vertical-align-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-layout-stale-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-layout-stale-002.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-margins-no-collapse-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-margins-no-collapse-002.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-multicol-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-overflow-padding-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-overflow-padding-002.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-vertical-align-001.html @web-platform-tests/interop
+css/css-grid/grid-with-content-dynamic-display-001.html @web-platform-tests/interop
+css/css-grid/grid-with-content-dynamic-display-002.html @web-platform-tests/interop
+css/css-grid/grid-with-dynamic-img.html @web-platform-tests/interop
+css/css-grid/grid-with-orthogonal-child-within-flexbox.html @web-platform-tests/interop
+css/css-grid/grid-within-flexbox-definite-change.html @web-platform-tests/interop
+css/css-grid/grid-within-flexbox-indefinite.html @web-platform-tests/interop
+css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-001.html @web-platform-tests/interop
+css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-002.html @web-platform-tests/interop
+css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-003.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/auto-margins-ignored-during-track-sizing-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-002.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/flex-sizing-rows-indefinite-height.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/flex-tracks-with-fractional-size.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-002.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-003.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-004.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-005.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-006.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-007.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-008.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-find-fr-size-restart-algorithm.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-intrinsic-size-dynamic-block-size.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-layout-free-space-unit.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-percent-cols-filled-shrinkwrap-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-percent-cols-spanned-shrinkwrap-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-percent-rows-filled-shrinkwrap-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-percent-rows-spanned-shrinkwrap-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-stretch-respects-min-size-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-template-flexible-rerun-track-sizing.html @web-platform-tests/interop
+css/css-grid/nested-grid-item-block-size-001.html @web-platform-tests/interop
+css/css-grid/placement/grid-layout-grid-span.html @web-platform-tests/interop
+css/css-grid/placement/grid-layout-lines-shorthands.html @web-platform-tests/interop
+css/css-grid/placement/grid-layout-lines.html @web-platform-tests/interop
+css/css-grid/placement/grid-layout-placement-shorthands.html @web-platform-tests/interop
+css/css-grid/placement/grid-placement-items-spanning-multiple-rows-001.html @web-platform-tests/interop
+css/css-grid/placement/grid-placement-items-spanning-multiple-rows-002.html @web-platform-tests/interop
+css/css-grid/placement/grid-placement-using-named-grid-lines-001.html @web-platform-tests/interop
+css/css-grid/placement/grid-placement-using-named-grid-lines-002.html @web-platform-tests/interop
+css/css-grid/placement/grid-placement-using-named-grid-lines-003.html @web-platform-tests/interop
+css/css-grid/placement/grid-placement-using-named-grid-lines-004.html @web-platform-tests/interop
+css/css-grid/placement/grid-placement-using-named-grid-lines-005.html @web-platform-tests/interop
+css/css-grid/placement/grid-placement-using-named-grid-lines-006.html @web-platform-tests/interop
+css/css-grid/placement/grid-placement-using-named-grid-lines-007.html @web-platform-tests/interop
+css/css-grid/placement/grid-placement-using-named-grid-lines-008.html @web-platform-tests/interop
+css/css-grid/placement/grid-placement-using-named-grid-lines-009.html @web-platform-tests/interop
+css/css-grid/placement/grid-template-areas-must-keep-named-columns-order-001.html @web-platform-tests/interop
+css/css-grid/relative-grandchild.html @web-platform-tests/interop
+css/css-grid/stretch-grid-item-checkbox-input.html @web-platform-tests/interop
+css/css-grid/stretch-grid-item-radio-input.html @web-platform-tests/interop
+css/css-grid/subgrid/abs-pos-001.html @web-platform-tests/interop
+css/css-grid/subgrid/abs-pos-002.html @web-platform-tests/interop
+css/css-grid/subgrid/auto-track-sizing-001.html @web-platform-tests/interop
+css/css-grid/subgrid/auto-track-sizing-002.html @web-platform-tests/interop
+css/css-grid/subgrid/auto-track-sizing-003.html @web-platform-tests/interop
+css/css-grid/subgrid/baseline-001.html @web-platform-tests/interop
+css/css-grid/subgrid/contribution-size-flex-tracks-001.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-gap-001.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-gap-002.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-gap-003.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-gap-004.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-gap-005.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-gap-006.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-gap-007.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-gap-008.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-gap-009.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-gap-010.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-gap-011.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-gap-larger-001.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-gap-larger-002.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-gap-normal-001.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-gap-smaller-001.html @web-platform-tests/interop
+css/css-grid/subgrid/independent-formatting-context.html @web-platform-tests/interop
+css/css-grid/subgrid/item-percentage-height-001.html @web-platform-tests/interop
+css/css-grid/subgrid/line-names-001.html @web-platform-tests/interop
+css/css-grid/subgrid/line-names-002.html @web-platform-tests/interop
+css/css-grid/subgrid/line-names-003.html @web-platform-tests/interop
+css/css-grid/subgrid/line-names-004.html @web-platform-tests/interop
+css/css-grid/subgrid/line-names-005.html @web-platform-tests/interop
+css/css-grid/subgrid/line-names-006.html @web-platform-tests/interop
+css/css-grid/subgrid/line-names-007.html @web-platform-tests/interop
+css/css-grid/subgrid/line-names-008.html @web-platform-tests/interop
+css/css-grid/subgrid/line-names-009.html @web-platform-tests/interop
+css/css-grid/subgrid/line-names-010.html @web-platform-tests/interop
+css/css-grid/subgrid/line-names-011.html @web-platform-tests/interop
+css/css-grid/subgrid/line-names-012.html @web-platform-tests/interop
+css/css-grid/subgrid/orthogonal-writing-mode-001.html @web-platform-tests/interop
+css/css-grid/subgrid/orthogonal-writing-mode-002.html @web-platform-tests/interop
+css/css-grid/subgrid/orthogonal-writing-mode-003.html @web-platform-tests/interop
+css/css-grid/subgrid/orthogonal-writing-mode-004.html @web-platform-tests/interop
+css/css-grid/subgrid/orthogonal-writing-mode-005.html @web-platform-tests/interop
+css/css-grid/subgrid/orthogonal-writing-mode-006.html @web-platform-tests/interop
+css/css-grid/subgrid/parent-repeat-auto-fit-001.html @web-platform-tests/interop
+css/css-grid/subgrid/parent-repeat-auto-fit-002.html @web-platform-tests/interop
+css/css-grid/subgrid/placement-implicit-001.html @web-platform-tests/interop
+css/css-grid/subgrid/repeat-auto-fill-001.html @web-platform-tests/interop
+css/css-grid/subgrid/repeat-auto-fill-002.html @web-platform-tests/interop
+css/css-grid/subgrid/repeat-auto-fill-003.html @web-platform-tests/interop
+css/css-grid/subgrid/repeat-auto-fill-004.html @web-platform-tests/interop
+css/css-grid/subgrid/repeat-auto-fill-005.html @web-platform-tests/interop
+css/css-grid/subgrid/repeat-auto-fill-006.html @web-platform-tests/interop
+css/css-grid/subgrid/repeat-auto-fill-007.html @web-platform-tests/interop
+css/css-grid/subgrid/repeat-auto-fill-008.html @web-platform-tests/interop
+css/css-grid/subgrid/subgrid-baseline-001.html @web-platform-tests/interop
+css/css-grid/subgrid/subgrid-baseline-002.html @web-platform-tests/interop
+css/css-grid/subgrid/subgrid-baseline-003.html @web-platform-tests/interop
+css/css-grid/subgrid/subgrid-baseline-004.html @web-platform-tests/interop
+css/css-grid/subgrid/subgrid-item-block-size-001.html @web-platform-tests/interop
+css/css-grid/subgrid/subgrid-no-items-on-edges-001.html @web-platform-tests/interop
+css/css-grid/subgrid/subgrid-no-items-on-edges-002.html @web-platform-tests/interop
+css/css-grid/subgrid/subgrid-stretch.html @web-platform-tests/interop
+css/css-grid/subgrid/writing-directions-001.html @web-platform-tests/interop
+css/css-grid/subgrid/writing-directions-002.html @web-platform-tests/interop
+css/css-grid/subgrid/writing-directions-003.html @web-platform-tests/interop
+css/css-grid/table-grid-item-dynamic-001.html @web-platform-tests/interop
+css/css-grid/table-grid-item-dynamic-002.html @web-platform-tests/interop
+css/css-grid/table-grid-item-dynamic-003.html @web-platform-tests/interop
+css/css-grid/table-grid-item-dynamic-004.html @web-platform-tests/interop
+css/css-grid/whitespace-reattach.html @web-platform-tests/interop
+css/css-lists/list-style-position-001.html @web-platform-tests/interop
+css/css-multicol/multicol-span-all-rule-002.html @web-platform-tests/interop
+css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-009.html @web-platform-tests/interop
+css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-010.html @web-platform-tests/interop
+css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-011.html @web-platform-tests/interop
+css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-012.html @web-platform-tests/interop
+css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-007.html @web-platform-tests/interop
+css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-008.html @web-platform-tests/interop
+css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-013.html @web-platform-tests/interop
+css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-014.html @web-platform-tests/interop
+css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-052.html @web-platform-tests/interop
+css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-053.html @web-platform-tests/interop
+css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-050.html @web-platform-tests/interop
+css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-051.html @web-platform-tests/interop
+css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-026.html @web-platform-tests/interop
+css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-027.html @web-platform-tests/interop
+css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-024.html @web-platform-tests/interop
+css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-025.html @web-platform-tests/interop
+css/css-text-decor/text-decoration-skip-ink-sidewayslr-001.html @web-platform-tests/interop
+css/css-text-decor/text-decoration-skip-ink-sidewayslr-002.html @web-platform-tests/interop
+css/css-text-decor/text-decoration-skip-ink-sidewaysrl-001.html @web-platform-tests/interop
+css/css-text-decor/text-decoration-skip-ink-sidewaysrl-002.html @web-platform-tests/interop
+css/css-text-decor/text-underline-offset-vertical-002.html @web-platform-tests/interop
+css/css-text-decor/text-underline-position-001a.html @web-platform-tests/interop
+css/css-text-decor/text-underline-position-001b.html @web-platform-tests/interop
+css/css-ui/compute-kind-widget-generated/grouped-kind-of-widget-fallback-background-attachment-001.html @web-platform-tests/interop
+css/css-ui/compute-kind-widget-generated/grouped-kind-of-widget-fallback-background-color-001.html @web-platform-tests/interop
+css/css-ui/compute-kind-widget-generated/grouped-kind-of-widget-fallback-border-block-start-color-001.html @web-platform-tests/interop
+css/css-ui/compute-kind-widget-generated/grouped-kind-of-widget-fallback-border-block-start-style-001.html @web-platform-tests/interop
+css/css-ui/compute-kind-widget-generated/grouped-kind-of-widget-fallback-border-block-start-width-001.html @web-platform-tests/interop
+css/css-ui/compute-kind-widget-generated/grouped-kind-of-widget-fallback-border-image-source-001.html @web-platform-tests/interop
+css/css-ui/compute-kind-widget-generated/grouped-kind-of-widget-fallback-border-top-color-001.html @web-platform-tests/interop
+css/css-ui/compute-kind-widget-generated/grouped-kind-of-widget-fallback-border-top-left-radius-001.html @web-platform-tests/interop
+css/css-ui/compute-kind-widget-generated/grouped-kind-of-widget-fallback-border-top-style-001.html @web-platform-tests/interop
+css/css-ui/compute-kind-widget-generated/grouped-kind-of-widget-fallback-border-top-width-001.html @web-platform-tests/interop
+css/css-view-transitions/3d-transform-incoming.html @web-platform-tests/interop
+css/css-view-transitions/3d-transform-outgoing.html @web-platform-tests/interop
+css/css-view-transitions/active-view-transition-on-non-root.html @web-platform-tests/interop
+css/css-view-transitions/active-view-transition-pseudo-class-match.html @web-platform-tests/interop
+css/css-view-transitions/active-view-transition-type-on-non-root.html @web-platform-tests/interop
+css/css-view-transitions/animating-new-content-subset.html @web-platform-tests/interop
+css/css-view-transitions/animating-new-content.html @web-platform-tests/interop
+css/css-view-transitions/auto-name-from-id-shadow.html @web-platform-tests/interop
+css/css-view-transitions/auto-name-from-id.html @web-platform-tests/interop
+css/css-view-transitions/auto-name.html @web-platform-tests/interop
+css/css-view-transitions/backdrop-filter-animated.html @web-platform-tests/interop
+css/css-view-transitions/backdrop-filter-captured.html @web-platform-tests/interop
+css/css-view-transitions/block-with-overflowing-text.html @web-platform-tests/interop
+css/css-view-transitions/break-inside-avoid-child.html @web-platform-tests/interop
+css/css-view-transitions/capture-old-state-error-flag-cleanup.html @web-platform-tests/interop
+css/css-view-transitions/capture-with-offscreen-child-translated.html @web-platform-tests/interop
+css/css-view-transitions/capture-with-offscreen-child.html @web-platform-tests/interop
+css/css-view-transitions/capture-with-opacity-zero-child.html @web-platform-tests/interop
+css/css-view-transitions/capture-with-visibility-hidden-child.html @web-platform-tests/interop
+css/css-view-transitions/capture-with-visibility-mixed-descendants.html @web-platform-tests/interop
+css/css-view-transitions/class-specificity.html @web-platform-tests/interop
+css/css-view-transitions/clip-path-larger-than-border-box-on-child-of-named-element.html @web-platform-tests/interop
+css/css-view-transitions/content-smaller-than-box-size.html @web-platform-tests/interop
+css/css-view-transitions/content-visibility-auto-shared-element.html @web-platform-tests/interop
+css/css-view-transitions/content-with-child-with-transparent-background.html @web-platform-tests/interop
+css/css-view-transitions/content-with-clip-root.html @web-platform-tests/interop
+css/css-view-transitions/content-with-clip.html @web-platform-tests/interop
+css/css-view-transitions/content-with-inline-child.html @web-platform-tests/interop
+css/css-view-transitions/content-with-transform-new-image.html @web-platform-tests/interop
+css/css-view-transitions/content-with-transform-old-image.html @web-platform-tests/interop
+css/css-view-transitions/content-with-transparent-background.html @web-platform-tests/interop
+css/css-view-transitions/css-tags-paint-order-with-entry.html @web-platform-tests/interop
+css/css-view-transitions/css-tags-paint-order.html @web-platform-tests/interop
+css/css-view-transitions/css-tags-shared-element.html @web-platform-tests/interop
+css/css-view-transitions/dialog-in-rtl-iframe.html @web-platform-tests/interop
+css/css-view-transitions/dialog-in-top-layer-during-transition-new.html @web-platform-tests/interop
+css/css-view-transitions/dialog-in-top-layer-during-transition-old.html @web-platform-tests/interop
+css/css-view-transitions/element-is-grouping-during-animation.html @web-platform-tests/interop
+css/css-view-transitions/element-stops-grouping-after-animation.html @web-platform-tests/interop
+css/css-view-transitions/element-with-overflow.html @web-platform-tests/interop
+css/css-view-transitions/exit-transition-with-anonymous-layout-object.html @web-platform-tests/interop
+css/css-view-transitions/far-away-capture.html @web-platform-tests/interop
+css/css-view-transitions/fractional-box-new.html @web-platform-tests/interop
+css/css-view-transitions/fractional-box-old.html @web-platform-tests/interop
+css/css-view-transitions/fractional-box-with-overflow-children-new.html @web-platform-tests/interop
+css/css-view-transitions/fractional-box-with-overflow-children-old.html @web-platform-tests/interop
+css/css-view-transitions/fractional-box-with-shadow-new.html @web-platform-tests/interop
+css/css-view-transitions/fractional-box-with-shadow-old.html @web-platform-tests/interop
+css/css-view-transitions/fractional-translation-from-position.html @web-platform-tests/interop
+css/css-view-transitions/fractional-translation-from-transform.html @web-platform-tests/interop
+css/css-view-transitions/fragmented-at-start-ignored.html @web-platform-tests/interop
+css/css-view-transitions/fragmented-during-transition-skips.html @web-platform-tests/interop
+css/css-view-transitions/hit-test-unpainted-element.html @web-platform-tests/interop
+css/css-view-transitions/hit-test-unrelated-element.html @web-platform-tests/interop
+css/css-view-transitions/iframe-and-main-frame-transition-new-main-new-iframe.html @web-platform-tests/interop
+css/css-view-transitions/iframe-and-main-frame-transition-new-main-old-iframe.html @web-platform-tests/interop
+css/css-view-transitions/iframe-and-main-frame-transition-old-main-new-iframe.html @web-platform-tests/interop
+css/css-view-transitions/iframe-and-main-frame-transition-old-main-old-iframe.html @web-platform-tests/interop
+css/css-view-transitions/iframe-and-main-frame-transition-old-main.html @web-platform-tests/interop
+css/css-view-transitions/iframe-and-main-frame-transition-with-name-on-iframe.html @web-platform-tests/interop
+css/css-view-transitions/iframe-new-has-scrollbar.html @web-platform-tests/interop
+css/css-view-transitions/iframe-old-has-scrollbar.html @web-platform-tests/interop
+css/css-view-transitions/iframe-transition.sub.html @web-platform-tests/interop
+css/css-view-transitions/inline-child-with-filter.html @web-platform-tests/interop
+css/css-view-transitions/inline-child-with-overflow-shadow.html @web-platform-tests/interop
+css/css-view-transitions/inline-element-size.html @web-platform-tests/interop
+css/css-view-transitions/inline-with-offset-from-containing-block.html @web-platform-tests/interop
+css/css-view-transitions/japanese-tag.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-below-and-on-top-of-viewport-partially-onscreen-new.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-below-and-on-top-of-viewport-partially-onscreen-old.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-below-viewport-offscreen-new.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-below-viewport-offscreen-old.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-below-viewport-partially-onscreen-new.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-below-viewport-partially-onscreen-old.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-left-of-viewport-offscreen-new.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-left-of-viewport-offscreen-old.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-left-of-viewport-partially-onscreen-new.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-left-of-viewport-partially-onscreen-old.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-on-top-of-viewport-offscreen-new.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-on-top-of-viewport-offscreen-old.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-on-top-of-viewport-partially-onscreen-new.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-on-top-of-viewport-partially-onscreen-old.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-right-and-left-of-viewport-partially-onscreen-new.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-right-and-left-of-viewport-partially-onscreen-old.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-right-of-viewport-offscreen-new.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-right-of-viewport-offscreen-old.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-right-of-viewport-partially-onscreen-new.html @web-platform-tests/interop
+css/css-view-transitions/massive-element-right-of-viewport-partially-onscreen-old.html @web-platform-tests/interop
+css/css-view-transitions/match-element-name.html @web-platform-tests/interop
+css/css-view-transitions/modify-style-via-cssom.html @web-platform-tests/interop
+css/css-view-transitions/multiline-span-with-overflowing-text-and-box-decorations.html @web-platform-tests/interop
+css/css-view-transitions/named-element-with-fix-pos-child-new.html @web-platform-tests/interop
+css/css-view-transitions/named-element-with-fix-pos-child-old.html @web-platform-tests/interop
+css/css-view-transitions/names-are-tree-scoped.html @web-platform-tests/interop
+css/css-view-transitions/nested-elements-in-overflow.html @web-platform-tests/interop
+css/css-view-transitions/new-and-old-sizes-match.html @web-platform-tests/interop
+css/css-view-transitions/new-content-ancestor-clipped-2.html @web-platform-tests/interop
+css/css-view-transitions/new-content-ancestor-clipped.html @web-platform-tests/interop
+css/css-view-transitions/new-content-captures-clip-path.html @web-platform-tests/interop
+css/css-view-transitions/new-content-captures-different-size.html @web-platform-tests/interop
+css/css-view-transitions/new-content-captures-opacity.html @web-platform-tests/interop
+css/css-view-transitions/new-content-captures-positioned-spans.html @web-platform-tests/interop
+css/css-view-transitions/new-content-captures-root.html @web-platform-tests/interop
+css/css-view-transitions/new-content-captures-spans.html @web-platform-tests/interop
+css/css-view-transitions/new-content-changes-overflow-left.html @web-platform-tests/interop
+css/css-view-transitions/new-content-changes-overflow.html @web-platform-tests/interop
+css/css-view-transitions/new-content-container-writing-modes.html @web-platform-tests/interop
+css/css-view-transitions/new-content-element-writing-modes.html @web-platform-tests/interop
+css/css-view-transitions/new-content-escapes-clip-with-abspos-child.html @web-platform-tests/interop
+css/css-view-transitions/new-content-flat-transform-ancestor.html @web-platform-tests/interop
+css/css-view-transitions/new-content-from-root-display-none.html @web-platform-tests/interop
+css/css-view-transitions/new-content-has-scrollbars.html @web-platform-tests/interop
+css/css-view-transitions/new-content-inline-with-offset-from-containing-block-clipped.html @web-platform-tests/interop
+css/css-view-transitions/new-content-intrinsic-aspect-ratio.html @web-platform-tests/interop
+css/css-view-transitions/new-content-is-empty-div.html @web-platform-tests/interop
+css/css-view-transitions/new-content-is-inline.html @web-platform-tests/interop
+css/css-view-transitions/new-content-object-fit-fill.html @web-platform-tests/interop
+css/css-view-transitions/new-content-object-fit-none.html @web-platform-tests/interop
+css/css-view-transitions/new-content-preserve-3d-ancestor.html @web-platform-tests/interop
+css/css-view-transitions/new-content-root-scrollbar-with-fixed-background.html @web-platform-tests/interop
+css/css-view-transitions/new-content-scaling.html @web-platform-tests/interop
+css/css-view-transitions/new-content-transform-position-fixed.html @web-platform-tests/interop
+css/css-view-transitions/new-content-with-overflow-zoomed.html @web-platform-tests/interop
+css/css-view-transitions/new-content-with-overflow.html @web-platform-tests/interop
+css/css-view-transitions/new-element-on-start.html @web-platform-tests/interop
+css/css-view-transitions/new-root-vertical-writing-mode.html @web-platform-tests/interop
+css/css-view-transitions/no-named-elements.html @web-platform-tests/interop
+css/css-view-transitions/no-painting-while-render-blocked.html @web-platform-tests/interop
+css/css-view-transitions/no-root-capture.html @web-platform-tests/interop
+css/css-view-transitions/no-white-flash-before-activation.html @web-platform-tests/interop
+css/css-view-transitions/nothing-captured.html @web-platform-tests/interop
+css/css-view-transitions/offscreen-element-modified-before-coming-onscreen.html @web-platform-tests/interop
+css/css-view-transitions/old-content-captures-clip-path.html @web-platform-tests/interop
+css/css-view-transitions/old-content-captures-different-size.html @web-platform-tests/interop
+css/css-view-transitions/old-content-captures-opacity.html @web-platform-tests/interop
+css/css-view-transitions/old-content-captures-root.html @web-platform-tests/interop
+css/css-view-transitions/old-content-container-writing-modes.html @web-platform-tests/interop
+css/css-view-transitions/old-content-element-writing-modes.html @web-platform-tests/interop
+css/css-view-transitions/old-content-escapes-clip-with-abspos-child.html @web-platform-tests/interop
+css/css-view-transitions/old-content-has-scrollbars.html @web-platform-tests/interop
+css/css-view-transitions/old-content-inline-with-offset-from-containing-block-clipped.html @web-platform-tests/interop
+css/css-view-transitions/old-content-intrinsic-aspect-ratio.html @web-platform-tests/interop
+css/css-view-transitions/old-content-is-empty-div.html @web-platform-tests/interop
+css/css-view-transitions/old-content-is-inline.html @web-platform-tests/interop
+css/css-view-transitions/old-content-object-fit-fill.html @web-platform-tests/interop
+css/css-view-transitions/old-content-object-fit-none.html @web-platform-tests/interop
+css/css-view-transitions/old-content-root-scrollbar-with-fixed-background.html @web-platform-tests/interop
+css/css-view-transitions/old-content-with-overflow-zoomed.html @web-platform-tests/interop
+css/css-view-transitions/old-content-with-overflow.html @web-platform-tests/interop
+css/css-view-transitions/old-root-vertical-writing-mode.html @web-platform-tests/interop
+css/css-view-transitions/outer-padding-inner-background.html @web-platform-tests/interop
+css/css-view-transitions/paint-holding-in-iframe.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-element-overflow-hidden.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-element-preserve-3d.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-rendering-invalidation.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-with-classes-entry.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-with-classes-exit.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-with-classes-match-ident.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-with-classes-match-multiple-wildcard.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-with-classes-match-multiple.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-with-classes-match-wildcard-no-star.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-with-classes-match-wildcard.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-with-classes-mismatch-ident.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-with-classes-mismatch-partial.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-with-classes-mismatch-wildcard.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-with-classes-multiple-vt-classes.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-with-classes-new-with-class-old-without.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-with-classes-old-with-class-new-without.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-with-classes-view-transition-group.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-with-classes-view-transition-image-pair.html @web-platform-tests/interop
+css/css-view-transitions/reset-state-after-scrolled-view-transition.html @web-platform-tests/interop
+css/css-view-transitions/root-captured-as-different-tag.html @web-platform-tests/interop
+css/css-view-transitions/root-style-change-during-animation.html @web-platform-tests/interop
+css/css-view-transitions/root-to-shared-animation-end.html @web-platform-tests/interop
+css/css-view-transitions/root-to-shared-animation-incoming.html @web-platform-tests/interop
+css/css-view-transitions/root-to-shared-animation-start.html @web-platform-tests/interop
+css/css-view-transitions/rotated-cat-off-top-edge.html @web-platform-tests/interop
+css/css-view-transitions/rtl-with-scrollbar.html @web-platform-tests/interop
+css/css-view-transitions/scroller-child-abspos.html @web-platform-tests/interop
+css/css-view-transitions/scroller-child.html @web-platform-tests/interop
+css/css-view-transitions/scroller.html @web-platform-tests/interop
+css/css-view-transitions/set-current-time-transform.html @web-platform-tests/interop
+css/css-view-transitions/set-current-time.html @web-platform-tests/interop
+css/css-view-transitions/set-universal-specificity.html @web-platform-tests/interop
+css/css-view-transitions/shadow-part-with-class-inside-shadow-important.html @web-platform-tests/interop
+css/css-view-transitions/shadow-part-with-class-inside-shadow.html @web-platform-tests/interop
+css/css-view-transitions/shadow-part-with-class.html @web-platform-tests/interop
+css/css-view-transitions/shadow-part-with-name-nested.html @web-platform-tests/interop
+css/css-view-transitions/shadow-part-with-name-overridden-by-important.html @web-platform-tests/interop
+css/css-view-transitions/shadow-part-with-name.html @web-platform-tests/interop
+css/css-view-transitions/sibling-frames-transition.html @web-platform-tests/interop
+css/css-view-transitions/snapshot-containing-block-absolute.html @web-platform-tests/interop
+css/css-view-transitions/snapshot-containing-block-includes-scrollbar-gutter.html @web-platform-tests/interop
+css/css-view-transitions/snapshot-containing-block-static.html @web-platform-tests/interop
+css/css-view-transitions/span-with-overflowing-text-and-box-decorations.html @web-platform-tests/interop
+css/css-view-transitions/span-with-overflowing-text-hidden.html @web-platform-tests/interop
+css/css-view-transitions/span-with-overflowing-text.html @web-platform-tests/interop
+css/css-view-transitions/transform-origin-view-transition-group.html @web-platform-tests/interop
+css/css-view-transitions/transformed-element-scroll-transform.html @web-platform-tests/interop
+css/css-view-transitions/transition-in-empty-iframe.html @web-platform-tests/interop
+css/css-view-transitions/update-callback-called-once.html @web-platform-tests/interop
+css/css-view-transitions/view-transition-name-is-backdrop-filter-root.html @web-platform-tests/interop
+css/css-view-transitions/view-transition-name-is-grouping.html @web-platform-tests/interop
+css/css-view-transitions/view-transition-name-on-document-root.html @web-platform-tests/interop
+css/css-view-transitions/view-transition-name-removed-mid-transition.html @web-platform-tests/interop
+css/css-view-transitions/web-animations-api-parse-pseudo-argument.html @web-platform-tests/interop
+css/css-view-transitions/web-animations-api.html @web-platform-tests/interop
+css/css-view-transitions/writing-mode-container-resize.html @web-platform-tests/interop
+css/css-viewport/zoom/background-image.html @web-platform-tests/interop
+css/css-viewport/zoom/basic.html @web-platform-tests/interop
+css/css-viewport/zoom/border-spacing.html @web-platform-tests/interop
+css/css-viewport/zoom/canvas.html @web-platform-tests/interop
+css/css-viewport/zoom/container-queries.html @web-platform-tests/interop
+css/css-viewport/zoom/font-size.html @web-platform-tests/interop
+css/css-viewport/zoom/iframe-zoom-nested.html @web-platform-tests/interop
+css/css-viewport/zoom/iframe-zoom.sub.html @web-platform-tests/interop
+css/css-viewport/zoom/image-intrinsic-size.html @web-platform-tests/interop
+css/css-viewport/zoom/inherited-length.html @web-platform-tests/interop
+css/css-viewport/zoom/inherited.html @web-platform-tests/interop
+css/css-viewport/zoom/letter-spacing.html @web-platform-tests/interop
+css/css-viewport/zoom/line-height.html @web-platform-tests/interop
+css/css-viewport/zoom/list-style-image.html @web-platform-tests/interop
+css/css-viewport/zoom/relative-units-from-parent.html @web-platform-tests/interop
+css/css-viewport/zoom/stroke.html @web-platform-tests/interop
+css/css-viewport/zoom/svg-path-simple.html @web-platform-tests/interop
+css/css-viewport/zoom/svg-path.html @web-platform-tests/interop
+css/css-viewport/zoom/svg-transform.html @web-platform-tests/interop
+css/css-viewport/zoom/svg-viewBox.html @web-platform-tests/interop
+css/css-viewport/zoom/svg.html @web-platform-tests/interop
+css/css-viewport/zoom/text-indent.html @web-platform-tests/interop
+css/css-viewport/zoom/text-shadow.html @web-platform-tests/interop
+css/css-viewport/zoom/text-stroke-width.html @web-platform-tests/interop
+css/css-viewport/zoom/text-underline-offset.html @web-platform-tests/interop
+css/css-viewport/zoom/word-spacing.html @web-platform-tests/interop
+css/css-writing-modes/abs-pos-border-offset-002.html @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-slr-043.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-slr-047.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-slr-048.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-slr-050.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-slr-054.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-slr-055.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-slr-056.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-slr-058.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-slr-060.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-slr-062.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-slr-063.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-slr-066.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-srl-042.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-srl-045.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-srl-046.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-srl-049.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-srl-051.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-srl-052.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-srl-053.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-srl-057.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-srl-059.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-srl-061.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-srl-064.xht @web-platform-tests/interop
+css/css-writing-modes/block-flow-direction-srl-065.xht @web-platform-tests/interop
+css/css-writing-modes/inline-block-alignment-slr-009.xht @web-platform-tests/interop
+css/css-writing-modes/inline-block-alignment-srl-008.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-slr-043.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-slr-047.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-slr-048.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-slr-050.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-slr-053.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-slr-054.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-slr-056.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-slr-058.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-slr-060.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-srl-042.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-srl-045.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-srl-046.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-srl-049.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-srl-051.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-srl-052.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-srl-055.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-srl-057.xht @web-platform-tests/interop
+css/css-writing-modes/line-box-direction-srl-059.xht @web-platform-tests/interop
+css/css-writing-modes/logical-physical-mapping-001.html @web-platform-tests/interop
+css/css-writing-modes/row-progression-slr-023.xht @web-platform-tests/interop
+css/css-writing-modes/row-progression-slr-029.xht @web-platform-tests/interop
+css/css-writing-modes/row-progression-srl-022.xht @web-platform-tests/interop
+css/css-writing-modes/row-progression-srl-028.xht @web-platform-tests/interop
+css/css-writing-modes/row-progression-vlr-009.xht @web-platform-tests/interop
+css/css-writing-modes/slr-alongside-vlr-floats.html @web-platform-tests/interop
+css/css-writing-modes/srl-alongside-vrl-floats.html @web-platform-tests/interop
+css/css-writing-modes/table-column-order-slr-007.xht @web-platform-tests/interop
+css/css-writing-modes/table-column-order-srl-006.xht @web-platform-tests/interop
+css/css-writing-modes/table-progression-slr-001.html @web-platform-tests/interop
+css/css-writing-modes/table-progression-slr-002.html @web-platform-tests/interop
+css/css-writing-modes/table-progression-srl-001.html @web-platform-tests/interop
+css/css-writing-modes/table-progression-srl-002.html @web-platform-tests/interop
+css/css-writing-modes/text-baseline-slr-009.xht @web-platform-tests/interop
+css/css-writing-modes/text-baseline-srl-008.xht @web-platform-tests/interop
+css/css-writing-modes/text-combine-upright-sideways-001.html @web-platform-tests/interop
+css/css-writing-modes/text-combine-upright-sideways-002.html @web-platform-tests/interop
+css/css-writing-modes/text-orientation-mixed-srl-016.xht @web-platform-tests/interop
+css/css-writing-modes/text-orientation-upright-directionality-001.html @web-platform-tests/interop
+css/css-writing-modes/text-orientation-upright-srl-018.xht @web-platform-tests/interop
+css/css-writing-modes/vertical-alignment-slr-029.xht @web-platform-tests/interop
+css/css-writing-modes/vertical-alignment-slr-031.xht @web-platform-tests/interop
+css/css-writing-modes/vertical-alignment-slr-033.xht @web-platform-tests/interop
+css/css-writing-modes/vertical-alignment-slr-035.xht @web-platform-tests/interop
+css/css-writing-modes/vertical-alignment-slr-041.xht @web-platform-tests/interop
+css/css-writing-modes/vertical-alignment-srl-028.xht @web-platform-tests/interop
+css/css-writing-modes/vertical-alignment-srl-030.xht @web-platform-tests/interop
+css/css-writing-modes/vertical-alignment-srl-032.xht @web-platform-tests/interop
+css/css-writing-modes/vertical-alignment-srl-034.xht @web-platform-tests/interop
+css/css-writing-modes/vertical-alignment-srl-040.xht @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-032.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-033.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-034.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-035.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-036.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-037.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-038.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-039.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-040.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-041.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-043.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-044.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-045.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-046.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-048.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-050.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-051.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-052.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-053.html @web-platform-tests/interop
+css/css-writing-modes/wm-propagation-body-055.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-backdrop-root-backdrop-filter.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-backdrop-root-clip-path.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-backdrop-root-filter.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-backdrop-root-mix-blend-mode.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-backdrop-root-opacity.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-basic-blur.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-basic-opacity-2.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-basic-opacity.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-basic.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-boundary.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-clip-radius-zoom.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-clip-rect-2.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-clip-rect-zoom.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-clip-rect.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-clip-rounded-clip.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-clipped.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-containing-block.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-edge-behavior.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-edge-clipping-2.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-edge-clipping.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-edge-mirror.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-edge-pixels-2.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-edge-pixels.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-fixed-clip.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-invalid.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-isolation-fixed.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-isolation-isolate.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-opacity-rounded-clip.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-paint-order.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-plus-filter.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-plus-mask-large.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-plus-mask.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-plus-opacity.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-plus-will-change-opacity.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-reference-filter-mutated.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-reference-filter.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-root-element.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-svg-background-image-blur.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-svg-foreignObject.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-svg.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-transform.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-update.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-zero-size.html @web-platform-tests/interop
+css/filter-effects/backdrop-filters-brightness.html @web-platform-tests/interop
+css/filter-effects/backdrop-filters-contrast.html @web-platform-tests/interop
+css/filter-effects/backdrop-filters-grayscale-001.html @web-platform-tests/interop
+css/filter-effects/backdrop-filters-grayscale-002.html @web-platform-tests/interop
+css/filter-effects/backdrop-filters-grayscale-003.html @web-platform-tests/interop
+css/filter-effects/backdrop-filters-hue-rotate.html @web-platform-tests/interop
+css/filter-effects/backdrop-filters-invert.html @web-platform-tests/interop
+css/filter-effects/backdrop-filters-opacity.html @web-platform-tests/interop
+css/filter-effects/backdrop-filters-saturate.html @web-platform-tests/interop
+css/filter-effects/backdrop-filters-sepia.html @web-platform-tests/interop
+css/filter-effects/css-backdrop-filters-animation-blur.html @web-platform-tests/interop
+css/filter-effects/css-backdrop-filters-animation-brightness.html @web-platform-tests/interop
+css/filter-effects/css-backdrop-filters-animation-combined.html @web-platform-tests/interop
+css/filter-effects/css-backdrop-filters-animation-contrast.html @web-platform-tests/interop
+css/filter-effects/css-backdrop-filters-animation-drop-shadow.html @web-platform-tests/interop
+css/filter-effects/css-backdrop-filters-animation-grayscale.html @web-platform-tests/interop
+css/filter-effects/css-backdrop-filters-animation-hue-rotate.html @web-platform-tests/interop
+css/filter-effects/css-backdrop-filters-animation-invert.html @web-platform-tests/interop
+css/filter-effects/css-backdrop-filters-animation-opacity.html @web-platform-tests/interop
+css/filter-effects/css-backdrop-filters-animation-saturate.html @web-platform-tests/interop
+css/filter-effects/css-backdrop-filters-animation-sepia.html @web-platform-tests/interop
+css/filter-effects/repaint-added-backdrop-filter.html @web-platform-tests/interop
+html/editing/the-hidden-attribute/hidden-until-found-001.html @web-platform-tests/interop
+html/editing/the-hidden-attribute/hidden-until-found-004.html @web-platform-tests/interop
+html/editing/the-hidden-attribute/hidden-until-found-005.html @web-platform-tests/interop
+html/editing/the-hidden-attribute/hidden-until-found-007.html @web-platform-tests/interop
+html/rendering/the-details-element/details-after.html @web-platform-tests/interop
+html/rendering/the-details-element/details-before.html @web-platform-tests/interop
+html/rendering/the-details-element/details-display-type-001-ref.html @web-platform-tests/interop
+html/rendering/the-details-element/details-display-type-001.html @web-platform-tests/interop
+html/rendering/the-details-element/details-display-type-002.html @web-platform-tests/interop
+html/rendering/the-details-element/details-pseudo-elements-001.html @web-platform-tests/interop
+html/rendering/the-details-element/details-pseudo-elements-002.html @web-platform-tests/interop
+html/rendering/the-details-element/details-pseudo-elements-003.html @web-platform-tests/interop
+html/rendering/the-details-element/details-pseudo-elements-004.html @web-platform-tests/interop
+html/rendering/the-details-element/details-pseudo-elements-005.html @web-platform-tests/interop
+html/rendering/the-details-element/details-revert.html @web-platform-tests/interop
+html/rendering/the-details-element/details-summary-display-inline-001.html @web-platform-tests/interop
+html/rendering/the-details-element/details-summary-display-inline-002.html @web-platform-tests/interop
+html/rendering/the-details-element/summary-display-flex.html @web-platform-tests/interop
+html/rendering/the-details-element/summary-display-grid.html @web-platform-tests/interop
+html/rendering/the-details-element/summary-display-inline-flex.html @web-platform-tests/interop
+html/rendering/the-details-element/summary-display-inline-grid.html @web-platform-tests/interop
+html/rendering/the-details-element/summary-display-list-item-001.html @web-platform-tests/interop
+html/rendering/the-details-element/summary-display-list-item-002.html @web-platform-tests/interop
+html/rendering/the-details-element/summary-in-ol.html @web-platform-tests/interop
+html/rendering/the-details-element/summary-text-decoration.html @web-platform-tests/interop
+css/css-anchor-position/anchor-center-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-center-htb-htb.html @web-platform-tests/interop
+css/css-anchor-position/anchor-center-htb-vrl.html @web-platform-tests/interop
+css/css-anchor-position/anchor-center-offset-change.html @web-platform-tests/interop
+css/css-anchor-position/anchor-center-vrl-htb.html @web-platform-tests/interop
+css/css-anchor-position/anchor-center-vrl-vrl.html @web-platform-tests/interop
+css/css-anchor-position/anchor-fallback-invalidation.html @web-platform-tests/interop
+css/css-anchor-position/anchor-getComputedStyle-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-getComputedStyle-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-getComputedStyle-003.html @web-platform-tests/interop
+css/css-anchor-position/anchor-inherited.html @web-platform-tests/interop
+css/css-anchor-position/anchor-inside-outside.html @web-platform-tests/interop
+css/css-anchor-position/anchor-invalid-fallback.html @web-platform-tests/interop
+css/css-anchor-position/anchor-name-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-name-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-name-003.html @web-platform-tests/interop
+css/css-anchor-position/anchor-name-004.html @web-platform-tests/interop
+css/css-anchor-position/anchor-name-basics.html @web-platform-tests/interop
+css/css-anchor-position/anchor-name-cross-shadow.html @web-platform-tests/interop
+css/css-anchor-position/anchor-name-in-shadow-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-name-in-shadow.html @web-platform-tests/interop
+css/css-anchor-position/anchor-name-inline-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-name-multicol-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-name-multicol-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-name-multicol-003.html @web-platform-tests/interop
+css/css-anchor-position/anchor-name-multicol-004.html @web-platform-tests/interop
+css/css-anchor-position/anchor-parse-invalid.html @web-platform-tests/interop
+css/css-anchor-position/anchor-parse-valid.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-003.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-004.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-borders-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-borders-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-dynamic-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-dynamic-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-dynamic-003.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-dynamic-004.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-grid-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-inline-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-inline-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-inline-003.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-inline-004.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-multicol-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-multicol-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-multicol-003.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-multicol-004.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-multicol-005.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-multicol-006.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-multicol-colspan-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-multicol-colspan-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-multicol-fixed-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-multicol-nested-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-principal-box.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-top-layer-007.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-writing-modes-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-position-writing-modes-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-query-custom-property-registration.html @web-platform-tests/interop
+css/css-anchor-position/anchor-query-fallback.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scope-basic.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scope-dynamic.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scope-shadow-all.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scope-shadow-flat-tree.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scope-shadow-names.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-003.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-004.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-005.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-006.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-007.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-cleanup.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-js-expose.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-position-try-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-position-try-002.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-position-try-003.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-position-try-004.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-position-try-005.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-position-try-006.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-position-try-007.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-position-try-008.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-position-try-009.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-position-try-010.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-position-try-011.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-position-try-013.html @web-platform-tests/interop
+css/css-anchor-position/anchor-scroll-position-try-014.html @web-platform-tests/interop
+css/css-anchor-position/anchor-size-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-size-minmax-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-size-parse-invalid.html @web-platform-tests/interop
+css/css-anchor-position/anchor-size-parse-valid.html @web-platform-tests/interop
+css/css-anchor-position/anchor-size-replaced-001.html @web-platform-tests/interop
+css/css-anchor-position/anchor-size-writing-modes-001.html @web-platform-tests/interop
+css/css-anchor-position/at-position-try-allowed-declarations.html @web-platform-tests/interop
+css/css-anchor-position/at-position-try-cssom.html @web-platform-tests/interop
+css/css-anchor-position/at-position-try-invalidation-shadow-dom.html @web-platform-tests/interop
+css/css-anchor-position/at-position-try-invalidation.html @web-platform-tests/interop
+css/css-anchor-position/at-position-try-parse.html @web-platform-tests/interop
+css/css-anchor-position/auto-margins-position-area.html @web-platform-tests/interop
+css/css-anchor-position/base-style-invalidation.html @web-platform-tests/interop
+css/css-anchor-position/idlharness.html @web-platform-tests/interop
+css/css-anchor-position/last-successful-basic.html @web-platform-tests/interop
+css/css-anchor-position/last-successful-change-fallbacks.html @web-platform-tests/interop
+css/css-anchor-position/last-successful-change-try-rule.html @web-platform-tests/interop
+css/css-anchor-position/last-successful-iframe.html @web-platform-tests/interop
+css/css-anchor-position/last-successful-intermediate-ignored.html @web-platform-tests/interop
+css/css-anchor-position/parsing/anchor-scope-computed.html @web-platform-tests/interop
+css/css-anchor-position/parsing/anchor-scope-parsing.html @web-platform-tests/interop
+css/css-anchor-position/parsing/position-try-computed.html @web-platform-tests/interop
+css/css-anchor-position/parsing/position-try-fallbacks-computed.html @web-platform-tests/interop
+css/css-anchor-position/parsing/position-try-fallbacks-parsing.html @web-platform-tests/interop
+css/css-anchor-position/parsing/position-try-order-computed.html @web-platform-tests/interop
+css/css-anchor-position/parsing/position-try-order-parsing.html @web-platform-tests/interop
+css/css-anchor-position/parsing/position-try-parsing.html @web-platform-tests/interop
+css/css-anchor-position/popover-implicit-anchor.html @web-platform-tests/interop
+css/css-anchor-position/position-anchor-003.html @web-platform-tests/interop
+css/css-anchor-position/position-anchor-basics.html @web-platform-tests/interop
+css/css-anchor-position/position-area-align-justify-wm-dir.html @web-platform-tests/interop
+css/css-anchor-position/position-area-align-justify.html @web-platform-tests/interop
+css/css-anchor-position/position-area-anchor-outside.html @web-platform-tests/interop
+css/css-anchor-position/position-area-anchor-partially-outside.html @web-platform-tests/interop
+css/css-anchor-position/position-area-basic.html @web-platform-tests/interop
+css/css-anchor-position/position-area-computed-insets.html @web-platform-tests/interop
+css/css-anchor-position/position-area-computed.html @web-platform-tests/interop
+css/css-anchor-position/position-area-in-grid.html @web-platform-tests/interop
+css/css-anchor-position/position-area-in-position-try.html @web-platform-tests/interop
+css/css-anchor-position/position-area-interpolation.html @web-platform-tests/interop
+css/css-anchor-position/position-area-parsing.html @web-platform-tests/interop
+css/css-anchor-position/position-area-value.html @web-platform-tests/interop
+css/css-anchor-position/position-area-with-insets.html @web-platform-tests/interop
+css/css-anchor-position/position-area-wm-dir.html @web-platform-tests/interop
+css/css-anchor-position/position-try-001.html @web-platform-tests/interop
+css/css-anchor-position/position-try-002.html @web-platform-tests/interop
+css/css-anchor-position/position-try-003.html @web-platform-tests/interop
+css/css-anchor-position/position-try-004.html @web-platform-tests/interop
+css/css-anchor-position/position-try-backdrop.html @web-platform-tests/interop
+css/css-anchor-position/position-try-cascade-layer-reorder.html @web-platform-tests/interop
+css/css-anchor-position/position-try-cascade.html @web-platform-tests/interop
+css/css-anchor-position/position-try-container-query.html @web-platform-tests/interop
+css/css-anchor-position/position-try-custom-property.html @web-platform-tests/interop
+css/css-anchor-position/position-try-dynamic.html @web-platform-tests/interop
+css/css-anchor-position/position-try-fallbacks-limit.html @web-platform-tests/interop
+css/css-anchor-position/position-try-grid-001.html @web-platform-tests/interop
+css/css-anchor-position/position-try-order-basic.html @web-platform-tests/interop
+css/css-anchor-position/position-try-order-position-area.html @web-platform-tests/interop
+css/css-anchor-position/position-try-position-anchor.html @web-platform-tests/interop
+css/css-anchor-position/position-try-pseudo-element.html @web-platform-tests/interop
+css/css-anchor-position/position-try-tree-scoped.html @web-platform-tests/interop
+css/css-anchor-position/property-interpolations.html @web-platform-tests/interop
+css/css-anchor-position/pseudo-element-anchor-dynamic.html @web-platform-tests/interop
+css/css-anchor-position/pseudo-element-anchor.html @web-platform-tests/interop
+css/css-anchor-position/remove-anchor-dirty-layout.html @web-platform-tests/interop
+css/css-anchor-position/try-tactic-alignment.html @web-platform-tests/interop
+css/css-anchor-position/try-tactic-anchor.html @web-platform-tests/interop
+css/css-anchor-position/try-tactic-back-to-base.html @web-platform-tests/interop
+css/css-anchor-position/try-tactic-base.html @web-platform-tests/interop
+css/css-anchor-position/try-tactic-basic.html @web-platform-tests/interop
+css/css-anchor-position/try-tactic-margin.html @web-platform-tests/interop
+css/css-anchor-position/try-tactic-percentage.html @web-platform-tests/interop
+css/css-anchor-position/try-tactic-position-area.html @web-platform-tests/interop
+css/css-anchor-position/try-tactic-sizing.html @web-platform-tests/interop
+css/css-anchor-position/try-tactic-wm.html @web-platform-tests/interop
+css/css-cascade/at-scope-parsing.html @web-platform-tests/interop
+css/css-cascade/at-scope-relative-syntax.html @web-platform-tests/interop
+css/css-cascade/scope-container.html @web-platform-tests/interop
+css/css-cascade/scope-cssom.html @web-platform-tests/interop
+css/css-cascade/scope-declarations.html @web-platform-tests/interop
+css/css-cascade/scope-deep.html @web-platform-tests/interop
+css/css-cascade/scope-evaluation.html @web-platform-tests/interop
+css/css-cascade/scope-focus.html @web-platform-tests/interop
+css/css-cascade/scope-hover.html @web-platform-tests/interop
+css/css-cascade/scope-implicit-external.html @web-platform-tests/interop
+css/css-cascade/scope-implicit.html @web-platform-tests/interop
+css/css-cascade/scope-invalidation.html @web-platform-tests/interop
+css/css-cascade/scope-layer.html @web-platform-tests/interop
+css/css-cascade/scope-media.html @web-platform-tests/interop
+css/css-cascade/scope-name-defining-rules.html @web-platform-tests/interop
+css/css-cascade/scope-nesting.html @web-platform-tests/interop
+css/css-cascade/scope-overlapping-has.html @web-platform-tests/interop
+css/css-cascade/scope-proximity.html @web-platform-tests/interop
+css/css-cascade/scope-shadow.html @web-platform-tests/interop
+css/css-cascade/scope-specificity.html @web-platform-tests/interop
+css/css-cascade/scope-starting-style.html @web-platform-tests/interop
+css/css-cascade/scope-style-sharing-001.html @web-platform-tests/interop
+css/css-cascade/scope-style-sharing-002.html @web-platform-tests/interop
+css/css-cascade/scope-supports.html @web-platform-tests/interop
+css/css-cascade/scope-visited-cssom.html @web-platform-tests/interop
+css/css-flexbox/abspos/abspos-descendent-001.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001.html @web-platform-tests/interop
+css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-001.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-002.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-003.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-004.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-012.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-013.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-014.html @web-platform-tests/interop
+css/css-flexbox/abspos/position-absolute-015.html @web-platform-tests/interop
+css/css-flexbox/align-content-horiz-001a.html @web-platform-tests/interop
+css/css-flexbox/align-content-horiz-001b.html @web-platform-tests/interop
+css/css-flexbox/align-content-horiz-002.html @web-platform-tests/interop
+css/css-flexbox/align-content-vert-001a.html @web-platform-tests/interop
+css/css-flexbox/align-content-vert-001b.html @web-platform-tests/interop
+css/css-flexbox/align-content-vert-002.html @web-platform-tests/interop
+css/css-flexbox/align-content-wmvert-001.html @web-platform-tests/interop
+css/css-flexbox/align-content-wrap-001.html @web-platform-tests/interop
+css/css-flexbox/align-content-wrap-002.html @web-platform-tests/interop
+css/css-flexbox/align-content-wrap-003.html @web-platform-tests/interop
+css/css-flexbox/align-content-wrap-005.html @web-platform-tests/interop
+css/css-flexbox/align-self-014.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-001.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-002.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-003.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-004.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-005.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-006.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-007.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-fieldset-001.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-fieldset-002.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-fieldset-003.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-flex-001.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-flex-002.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-flex-003.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-flex-004.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-grid-001.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-grid-002.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-grid-003.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-multicol-001.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-multicol-002.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-multicol-003.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-overflow-001.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-overflow-002.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-overflow-003.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-table-001.html @web-platform-tests/interop
+css/css-flexbox/alignment/flex-align-baseline-table-003.html @web-platform-tests/interop
+css/css-flexbox/animation/flex-basis-composition.html @web-platform-tests/interop
+css/css-flexbox/animation/flex-basis-interpolation.html @web-platform-tests/interop
+css/css-flexbox/animation/flex-grow-interpolation.html @web-platform-tests/interop
+css/css-flexbox/animation/flex-shrink-interpolation.html @web-platform-tests/interop
+css/css-flexbox/animation/order-interpolation.html @web-platform-tests/interop
+css/css-flexbox/box-sizing-001.html @web-platform-tests/interop
+css/css-flexbox/box-sizing-min-max-sizes-001.html @web-platform-tests/interop
+css/css-flexbox/canvas-dynamic-change-001.html @web-platform-tests/interop
+css/css-flexbox/change-column-flex-width.html @web-platform-tests/interop
+css/css-flexbox/column-flex-child-with-overflow-scroll.html @web-platform-tests/interop
+css/css-flexbox/column-reverse-gap.html @web-platform-tests/interop
+css/css-flexbox/columns-height-set-via-top-bottom.html @web-platform-tests/interop
+css/css-flexbox/dynamic-grid-flex-abspos.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-011.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-column-017.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-005.html @web-platform-tests/interop
+css/css-flexbox/flex-aspect-ratio-img-row-013.html @web-platform-tests/interop
+css/css-flexbox/flex-basis-009.html @web-platform-tests/interop
+css/css-flexbox/flex-basis-intrinsics-001.html @web-platform-tests/interop
+css/css-flexbox/flex-column-relayout-assert.html @web-platform-tests/interop
+css/css-flexbox/flex-direction-column-overlap-001.html @web-platform-tests/interop
+css/css-flexbox/flex-factor-less-than-one.html @web-platform-tests/interop
+css/css-flexbox/flex-flow-013.html @web-platform-tests/interop
+css/css-flexbox/flex-item-compressible-001.html @web-platform-tests/interop
+css/css-flexbox/flex-item-compressible-002.html @web-platform-tests/interop
+css/css-flexbox/flex-item-contains-strict.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-009.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-010.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-012.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-025.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-height-flex-items-031.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-size-001.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-size-002.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-size-003.html @web-platform-tests/interop
+css/css-flexbox/flex-minimum-width-flex-items-014.html @web-platform-tests/interop
+css/css-flexbox/flex-one-sets-flex-basis-to-zero-px.html @web-platform-tests/interop
+css/css-flexbox/flex-outer-flexbox-column-recalculate-height-on-resize-001.html @web-platform-tests/interop
+css/css-flexbox/flex-shorthand-flex-basis-middle.html @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-wmvert-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox-justify-content-wmvert-003.html @web-platform-tests/interop
+css/css-flexbox/flexbox-lines-must-be-stretched-by-default.html @web-platform-tests/interop
+css/css-flexbox/flexbox_first-letter.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-center-overflow.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-rtl-001.html @web-platform-tests/interop
+css/css-flexbox/flexbox_justifycontent-rtl-002.html @web-platform-tests/interop
+css/css-flexbox/flexbox_width-change-and-relayout-children.html @web-platform-tests/interop
+css/css-flexbox/flexbox_width-wrapping-column.html @web-platform-tests/interop
+css/css-flexbox/flexitem-no-margin-collapsing.html @web-platform-tests/interop
+css/css-flexbox/flexitem-stretch-image.html @web-platform-tests/interop
+css/css-flexbox/gap-017.html @web-platform-tests/interop
+css/css-flexbox/gap-018.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-center.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-flex-end.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-flex-start.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-space-around.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-space-between.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-baseline.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-center.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-end.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-start.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-invalid.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-stretch.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-baseline.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-center.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-end.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-start.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-invalid.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-stretch.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display-inline.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0percent.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-auto.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-percent.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column-reverse.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-invalid.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row-reverse.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-nowrap.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-nowrap.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-wrap.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap-reverse.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-nowrap.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-nowrap.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-nowrap.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap-reverse.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-wrap.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-0.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-invalid.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-number.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-0-auto.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-auto.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-initial.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-invalid.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-none.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-number.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-0.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-invalid.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-number.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-invalid.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-nowrap.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap-reverse.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-center.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-flex-end.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-flex-start.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-space-around.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-space-between.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-auto-size.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-height-auto.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-width-auto.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-inherit.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-integer.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-invalid.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-negative.html @web-platform-tests/interop
+css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order.html @web-platform-tests/interop
+css/css-flexbox/height-percentage-with-dynamic-container-size.html @web-platform-tests/interop
+css/css-flexbox/hittest-anonymous-box.html @web-platform-tests/interop
+css/css-flexbox/hittest-before-pseudo.html @web-platform-tests/interop
+css/css-flexbox/hittest-overlapping-margin.html @web-platform-tests/interop
+css/css-flexbox/hittest-overlapping-order.html @web-platform-tests/interop
+css/css-flexbox/hittest-overlapping-relative.html @web-platform-tests/interop
+css/css-flexbox/image-as-flexitem-size-001.html @web-platform-tests/interop
+css/css-flexbox/image-as-flexitem-size-001v.html @web-platform-tests/interop
+css/css-flexbox/image-as-flexitem-size-002.html @web-platform-tests/interop
+css/css-flexbox/image-as-flexitem-size-002v.html @web-platform-tests/interop
+css/css-flexbox/image-as-flexitem-size-003.html @web-platform-tests/interop
+css/css-flexbox/image-as-flexitem-size-003v.html @web-platform-tests/interop
+css/css-flexbox/image-as-flexitem-size-004.html @web-platform-tests/interop
+css/css-flexbox/image-as-flexitem-size-004v.html @web-platform-tests/interop
+css/css-flexbox/image-as-flexitem-size-005.html @web-platform-tests/interop
+css/css-flexbox/image-as-flexitem-size-005v.html @web-platform-tests/interop
+css/css-flexbox/image-as-flexitem-size-006.html @web-platform-tests/interop
+css/css-flexbox/image-as-flexitem-size-006v.html @web-platform-tests/interop
+css/css-flexbox/image-as-flexitem-size-007.html @web-platform-tests/interop
+css/css-flexbox/image-as-flexitem-size-007v.html @web-platform-tests/interop
+css/css-flexbox/inheritance.html @web-platform-tests/interop
+css/css-flexbox/inline-flex.html @web-platform-tests/interop
+css/css-flexbox/intrinsic-width-orthogonal-writing-mode.html @web-platform-tests/interop
+css/css-flexbox/justify-content-006.html @web-platform-tests/interop
+css/css-flexbox/justify-content_space-between-002.html @web-platform-tests/interop
+css/css-flexbox/layout-with-inline-svg-001.html @web-platform-tests/interop
+css/css-flexbox/max-width-violation.html @web-platform-tests/interop
+css/css-flexbox/multiline-min-max.html @web-platform-tests/interop
+css/css-flexbox/multiline-min-preferred-width.html @web-platform-tests/interop
+css/css-flexbox/negative-overflow-002.html @web-platform-tests/interop
+css/css-flexbox/negative-overflow-003.html @web-platform-tests/interop
+css/css-flexbox/negative-overflow.html @web-platform-tests/interop
+css/css-flexbox/order_value.html @web-platform-tests/interop
+css/css-flexbox/orthogonal-writing-modes-and-intrinsic-sizing.html @web-platform-tests/interop
+css/css-flexbox/overflow-auto-002.html @web-platform-tests/interop
+css/css-flexbox/overflow-auto-003.html @web-platform-tests/interop
+css/css-flexbox/overflow-auto-004.html @web-platform-tests/interop
+css/css-flexbox/overflow-auto-006.html @web-platform-tests/interop
+css/css-flexbox/overflow-auto-008.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-basis-computed.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-basis-invalid.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-basis-valid.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-computed.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-direction-computed.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-direction-invalid.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-direction-valid.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-flow-computed.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-flow-invalid.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-flow-shorthand.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-flow-valid.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-grow-computed.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-grow-invalid.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-grow-valid.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-invalid.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-shorthand.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-shrink-computed.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-shrink-invalid.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-shrink-valid.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-valid.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-wrap-computed.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-wrap-invalid.html @web-platform-tests/interop
+css/css-flexbox/parsing/flex-wrap-valid.html @web-platform-tests/interop
+css/css-flexbox/parsing/order-computed.html @web-platform-tests/interop
+css/css-flexbox/parsing/order-invalid.html @web-platform-tests/interop
+css/css-flexbox/parsing/order-valid.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-000.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-001.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-003.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-011.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-012.html @web-platform-tests/interop
+css/css-flexbox/percentage-heights-013.html @web-platform-tests/interop
+css/css-flexbox/percentage-margins-001.html @web-platform-tests/interop
+css/css-flexbox/percentage-max-width-cross-axis.html @web-platform-tests/interop
+css/css-flexbox/percentage-padding-001.html @web-platform-tests/interop
+css/css-flexbox/percentage-size-quirks-002.html @web-platform-tests/interop
+css/css-flexbox/percentage-size-quirks.html @web-platform-tests/interop
+css/css-flexbox/percentage-size.html @web-platform-tests/interop
+css/css-flexbox/position-relative-percentage-top-001.html @web-platform-tests/interop
+css/css-flexbox/quirks-auto-block-size-with-percentage-item.html @web-platform-tests/interop
+css/css-flexbox/radiobutton-min-size.html @web-platform-tests/interop
+css/css-flexbox/relayout-align-items.html @web-platform-tests/interop
+css/css-flexbox/relayout-image-load.html @web-platform-tests/interop
+css/css-flexbox/relayout-input.html @web-platform-tests/interop
+css/css-flexbox/scrollbars-auto-min-content-sizing.html @web-platform-tests/interop
+css/css-flexbox/shrinking-column-flexbox.html @web-platform-tests/interop
+css/css-flexbox/stretch-after-sibling-size-change.html @web-platform-tests/interop
+css/css-flexbox/stretched-child-shrink-on-relayout.html @web-platform-tests/interop
+css/css-flexbox/svg-root-as-flex-item-006.html @web-platform-tests/interop
+css/css-flexbox/table-as-item-cross-size.html @web-platform-tests/interop
+css/css-flexbox/table-with-percent-intrinsic-width.html @web-platform-tests/interop
+css/css-flexbox/text-as-flexitem-size-001.html @web-platform-tests/interop
+css/css-grid/abspos/absolute-positioning-definite-sizes-001.html @web-platform-tests/interop
+css/css-grid/abspos/absolute-positioning-grid-container-containing-block-001.html @web-platform-tests/interop
+css/css-grid/abspos/absolute-positioning-grid-container-parent-001.html @web-platform-tests/interop
+css/css-grid/abspos/empty-grid-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-003.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-004.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-005.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-006.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-007.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-content-alignment-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-content-alignment-rtl-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-gaps-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-gaps-002-rtl.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-gaps-002.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-gaps-rtl-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-implicit-grid-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-implicit-grid-line-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-padding-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-unknown-named-grid-line-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-positioned-items-within-grid-implicit-track-001.html @web-platform-tests/interop
+css/css-grid/abspos/grid-sizing-positioned-items-001.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-001.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-002.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-003.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-004.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-005.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-006.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-007.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-008.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-009.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-010.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-011.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-012.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-013.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-014.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-015.html @web-platform-tests/interop
+css/css-grid/abspos/orthogonal-positioned-grid-descendants-016.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-001.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-002.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-003.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-004.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-005.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-006.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-007.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-008.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-009.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-010.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-011.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-012.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-013.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-014.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-015.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-descendants-016.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html @web-platform-tests/interop
+css/css-grid/abspos/positioned-grid-items-should-not-take-up-space-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-fieldset-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-fieldset-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-fieldset-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-flex-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-flex-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-flex-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-flex-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-grid-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-grid-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-grid-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-multicol-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-multicol-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-multicol-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-overflow-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-overflow-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-overflow-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-table-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-table-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline-vertical.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-baseline.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-content-distribution-vertical-lr.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-content-distribution-vertical-rl.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-content-distribution.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-content-vertical-lr.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-content-vertical-rl.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-content.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-justify-margin-border-padding-vertical-lr.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-justify-margin-border-padding-vertical-rl.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-justify-margin-border-padding.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-justify-overflow.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-justify-stretch-with-orthogonal-flows.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-justify-stretch.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align-stretching-replaced-items.html @web-platform-tests/interop
+css/css-grid/alignment/grid-align.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-006.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-007.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-008.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-009.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-010.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-011.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-012.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-013.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-014.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-015.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-016.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-017.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-018.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-019.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-020.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-021.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-022.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-023.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-024.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-025.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-026.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-027.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-028.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-029.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-030.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-031.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-032.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-033.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-034.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-035.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-implies-size-change-036.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-style-changes-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-style-changes-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-style-changes-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-style-changes-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-style-changes-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-style-changes-006.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-style-changes-007.html @web-platform-tests/interop
+css/css-grid/alignment/grid-alignment-style-changes-008.html @web-platform-tests/interop
+css/css-grid/alignment/grid-baseline-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-block-axis-alignment-auto-margins-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-block-axis-alignment-auto-margins-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-block-axis-alignment-auto-margins-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-block-axis-alignment-auto-margins-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-block-axis-alignment-auto-margins-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-block-axis-alignment-auto-margins-006.html @web-platform-tests/interop
+css/css-grid/alignment/grid-block-axis-alignment-auto-margins-007.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-006.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-007.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-008.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-009.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-010.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-011.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-012.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-013.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-014.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-015.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-016.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-positioned-items-017.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-sticky-positioned-items-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-alignment-sticky-positioned-items-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-container-baseline-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-alignment-and-self-alignment-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-alignment-and-self-alignment-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-alignment-auto-sized-tracks-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-alignment-overflow-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-alignment-overflow-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-alignment-second-pass-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-alignment-second-pass-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-alignment-with-abspos-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-alignment-with-span-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-alignment-with-span-vertical-lr-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-content-alignment-with-span-vertical-rl-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-fit-content-tracks-dont-stretch-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-gutters-and-alignment.html @web-platform-tests/interop
+css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-006.html @web-platform-tests/interop
+css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-007.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows-vertical-lr.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows-vertical-rl.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl.html @web-platform-tests/interop
+css/css-grid/alignment/grid-item-auto-margins-alignment.html @web-platform-tests/interop
+css/css-grid/alignment/grid-justify-baseline-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-justify-baseline-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-justify-baseline-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-justify-baseline-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-place-content-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-006.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-007.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-008.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-009.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-010.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-011.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-012.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-013.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-014.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-015.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-016.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-positioned-items-017.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-sticky-positioned-items-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-alignment-sticky-positioned-items-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-006.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-007.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-008.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-009.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-010.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-011.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-012.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-006.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-007.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-008.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-009.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-010.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-011.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-012.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-013.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-014.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-015.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-016.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-006.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-007.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-008.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-009.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-010.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-011.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-012.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-013.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-014.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-015.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-016.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-006.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-007.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-008.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-009.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-010.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-011.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-012.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-013.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-014.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-015.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-016.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-003.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-004.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-005.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-006.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-007.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-008.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-009.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-010.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-011.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-012.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-013.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-014.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-015.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-016.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-alignment.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-002.html @web-platform-tests/interop
+css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-003.html @web-platform-tests/interop
+css/css-grid/animation/grid-template-columns-composition.html @web-platform-tests/interop
+css/css-grid/animation/grid-template-columns-interpolation.html @web-platform-tests/interop
+css/css-grid/animation/grid-template-columns-neutral-keyframe-001.html @web-platform-tests/interop
+css/css-grid/animation/grid-template-columns-neutral-keyframe-002.html @web-platform-tests/interop
+css/css-grid/animation/grid-template-columns-neutral-keyframe-003.html @web-platform-tests/interop
+css/css-grid/animation/grid-template-columns-neutral-keyframe-004.html @web-platform-tests/interop
+css/css-grid/animation/grid-template-rows-composition.html @web-platform-tests/interop
+css/css-grid/animation/grid-template-rows-interpolation.html @web-platform-tests/interop
+css/css-grid/animation/grid-template-rows-neutral-keyframe-001.html @web-platform-tests/interop
+css/css-grid/animation/grid-template-rows-neutral-keyframe-002.html @web-platform-tests/interop
+css/css-grid/animation/grid-template-rows-neutral-keyframe-003.html @web-platform-tests/interop
+css/css-grid/animation/grid-template-rows-neutral-keyframe-004.html @web-platform-tests/interop
+css/css-grid/chrome-crash-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/explicit-grid-size-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/flex-content-distribution-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/flex-content-resolution-columns-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/flex-content-resolution-columns-002.html @web-platform-tests/interop
+css/css-grid/grid-definition/flex-content-resolution-rows-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/flex-content-resolution-rows-002.html @web-platform-tests/interop
+css/css-grid/grid-definition/flex-factor-sum-less-than-1-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-explicit-rows-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-fill-columns-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-fill-rows-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-fit-columns-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-fit-rows-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-intrinsic-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-max-size-001.tentative.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-min-size-003.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-auto-repeat-min-size-004.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-change-auto-repeat-tracks.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-change-fit-content-argument-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-change-intrinsic-size-with-auto-repeat-tracks-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-inline-auto-repeat-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-inline-support-flexible-lengths-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-inline-support-grid-template-areas-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-inline-support-grid-template-columns-rows-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-inline-support-named-grid-lines-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-inline-support-repeat-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-inline-template-columns-rows-resolved-values-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-limits-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-minimum-contribution-with-percentages.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-002.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-shorthand-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-support-flexible-lengths-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-support-grid-template-areas-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-support-grid-template-columns-rows-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-support-named-grid-lines-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-support-repeat-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-support-repeat-002.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-template-columns-rows-changes-001.html @web-platform-tests/interop
+css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-automatic-minimum-intrinsic-aspect-ratio-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-dynamic-min-contribution-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-flex-container-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-item-min-auto-size-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-minimum-height-orthogonal-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-minimum-width-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-minimum-width-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-015.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-relative-offsets-001.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-items-relative-offsets-002.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-021.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-022.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-023.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-024.html @web-platform-tests/interop
+css/css-grid/grid-items/grid-minimum-size-grid-items-025.html @web-platform-tests/interop
+css/css-grid/grid-layout-properties.html @web-platform-tests/interop
+css/css-grid/grid-model/compute-intrinsic-widths-scrollbar-001.html @web-platform-tests/interop
+css/css-grid/grid-model/fixed-width-intrinsic-width-should-exclude-scrollbar-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-box-sizing-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-button-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-computed-value-display-floated-items-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-container-ignores-first-letter-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-container-ignores-first-line-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-container-margin-border-padding-scrollbar-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-container-sizing-constraints-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-float-002.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-gutters-and-flex-content-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-gutters-and-tracks-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-gutters-as-percentage-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-item-accepts-first-letter-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-item-accepts-first-line-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-item-hit-test.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-min-max-height-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-size-shrink-to-fit-001.html @web-platform-tests/interop
+css/css-grid/grid-model/grid-support-display-001.html @web-platform-tests/interop
+css/css-grid/grid-tracks-stretched-with-different-flex-factors-sum.html @web-platform-tests/interop
+css/css-grid/inheritance.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-002.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-003.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-004.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-005.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-006.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/flex-sizing-columns-min-max-width-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/flex-sizing-rows-min-max-height-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-automatic-minimum-for-auto-columns-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-container-percentage-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-container-percentage-002.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-002.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-003.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-004.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-find-fr-size-gutters-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-find-fr-size-gutters-002.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-fit-content-percentage.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-002.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-003.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-intrinsic-size-with-orthogonal-items.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-intrinsic-track-sizes-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-vertical-lr-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-vertical-rl-001.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-lr.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-rl.html @web-platform-tests/interop
+css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim.html @web-platform-tests/interop
+css/css-grid/parsing/grid-area-computed.html @web-platform-tests/interop
+css/css-grid/parsing/grid-area-invalid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-area-shorthand.html @web-platform-tests/interop
+css/css-grid/parsing/grid-area-valid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-auto-columns-computed.html @web-platform-tests/interop
+css/css-grid/parsing/grid-auto-columns-invalid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-auto-columns-valid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-auto-flow-computed.html @web-platform-tests/interop
+css/css-grid/parsing/grid-auto-flow-invalid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-auto-flow-valid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-auto-rows-computed.html @web-platform-tests/interop
+css/css-grid/parsing/grid-auto-rows-invalid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-auto-rows-valid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-columns-rows-get-set-multiple.html @web-platform-tests/interop
+css/css-grid/parsing/grid-content-sized-columns-resolution.html @web-platform-tests/interop
+css/css-grid/parsing/grid-shorthand-invalid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-shorthand-serialization.html @web-platform-tests/interop
+css/css-grid/parsing/grid-shorthand-valid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-shorthand.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-areas-computed.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-areas-invalid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-areas-one-cell.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-areas-valid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-columns-computed-implicit-track.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-columns-computed-nogrid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-columns-computed-withcontent.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-columns-computed.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-columns-invalid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-columns-valid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-repeat-auto-computed-withcontent-001.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-repeat-auto-computed-withcontent-002.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-rows-computed-implicit-track.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-rows-computed-nogrid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-rows-computed-withcontent.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-rows-computed.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-rows-invalid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-rows-valid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-shorthand-areas-valid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-shorthand-invalid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-shorthand-valid.html @web-platform-tests/interop
+css/css-grid/parsing/grid-template-shorthand.html @web-platform-tests/interop
+css/css-grid/placement/grid-auto-flow-sparse-001.html @web-platform-tests/interop
+css/css-grid/placement/grid-auto-placement-implicit-tracks-001.html @web-platform-tests/interop
+css/css-grid/placement/grid-container-change-grid-tracks-recompute-child-positions-001.html @web-platform-tests/interop
+css/css-grid/placement/grid-container-change-named-grid-recompute-child-positions-001.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-template-computed-nogrid.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-template-invalid.html @web-platform-tests/interop
+css/css-grid/subgrid/grid-template-valid.html @web-platform-tests/interop
+css/css-grid/subgrid/subgrid-baseline-005.html @web-platform-tests/interop
+css/css-grid/subgrid/subgrid-baseline-006.html @web-platform-tests/interop
+css/css-grid/subgrid/subgrid-baseline-007.html @web-platform-tests/interop
+css/css-grid/subgrid/subgrid-baseline-008.html @web-platform-tests/interop
+css/css-grid/subgrid/subgrid-baseline-009.html @web-platform-tests/interop
+css/css-grid/table-grid-item-005.html @web-platform-tests/interop
+css/css-logical/logical-box-border-color.html @web-platform-tests/interop
+css/css-logical/logical-box-border-radius.html @web-platform-tests/interop
+css/css-logical/logical-box-border-shorthands.html @web-platform-tests/interop
+css/css-logical/logical-box-border-style.html @web-platform-tests/interop
+css/css-logical/logical-box-border-width.html @web-platform-tests/interop
+css/css-logical/logical-box-inset.html @web-platform-tests/interop
+css/css-logical/logical-box-margin.html @web-platform-tests/interop
+css/css-logical/logical-box-padding.html @web-platform-tests/interop
+css/css-logical/logical-box-size.html @web-platform-tests/interop
+css/css-multicol/getclientrects-001.html @web-platform-tests/interop
+css/css-overflow/logical-overflow-001.html @web-platform-tests/interop
+css/css-overflow/overflow-shorthand-002.html @web-platform-tests/interop
+css/css-overflow/parsing/overflow-computed.html @web-platform-tests/interop
+css/css-overflow/parsing/overflow-invalid.html @web-platform-tests/interop
+css/css-overflow/parsing/overflow-valid.html @web-platform-tests/interop
+css/css-overscroll-behavior/overscroll-behavior-root.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-color-computed.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-color-invalid.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-color-valid.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-computed.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-invalid.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-line-computed.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-line-invalid.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-line-valid.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-shorthand.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-skip-ink-computed.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-skip-ink-invalid.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-skip-ink-valid.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-style-computed.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-style-invalid.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-style-valid.html @web-platform-tests/interop
+css/css-text-decor/parsing/text-decoration-valid.html @web-platform-tests/interop
+css/css-view-transitions/auto-name-get-animations.html @web-platform-tests/interop
+css/css-view-transitions/duplicate-tag-rejects-capture.html @web-platform-tests/interop
+css/css-view-transitions/duplicate-tag-rejects-start.html @web-platform-tests/interop
+css/css-view-transitions/dynamic-stylesheet-animations.html @web-platform-tests/interop
+css/css-view-transitions/event-pseudo-name.html @web-platform-tests/interop
+css/css-view-transitions/group-animation-for-root-transition.html @web-platform-tests/interop
+css/css-view-transitions/hit-test-pseudo-element-element-from-point.html @web-platform-tests/interop
+css/css-view-transitions/hit-test-unpainted-element-from-point.html @web-platform-tests/interop
+css/css-view-transitions/input-targets-root-while-render-blocked.html @web-platform-tests/interop
+css/css-view-transitions/mix-blend-mode-only-on-transition.html @web-platform-tests/interop
+css/css-view-transitions/no-crash-set-exception.html @web-platform-tests/interop
+css/css-view-transitions/no-crash-view-transition-in-massive-iframe.html @web-platform-tests/interop
+css/css-view-transitions/no-css-animation-while-render-blocked.html @web-platform-tests/interop
+css/css-view-transitions/no-raf-while-render-blocked.html @web-platform-tests/interop
+css/css-view-transitions/only-child-group.html @web-platform-tests/interop
+css/css-view-transitions/only-child-image-pair.html @web-platform-tests/interop
+css/css-view-transitions/only-child-new.html @web-platform-tests/interop
+css/css-view-transitions/only-child-no-transition.html @web-platform-tests/interop
+css/css-view-transitions/only-child-old.html @web-platform-tests/interop
+css/css-view-transitions/only-child-on-root-element-with-view-transition.html @web-platform-tests/interop
+css/css-view-transitions/only-child-view-transition.html @web-platform-tests/interop
+css/css-view-transitions/parsing/pseudo-elements-invalid-with-classes.html @web-platform-tests/interop
+css/css-view-transitions/parsing/pseudo-elements-invalid.html @web-platform-tests/interop
+css/css-view-transitions/parsing/pseudo-elements-valid-with-classes.html @web-platform-tests/interop
+css/css-view-transitions/parsing/pseudo-elements-valid.html @web-platform-tests/interop
+css/css-view-transitions/parsing/view-transition-class-computed.html @web-platform-tests/interop
+css/css-view-transitions/parsing/view-transition-class-invalid.html @web-platform-tests/interop
+css/css-view-transitions/parsing/view-transition-class-valid.html @web-platform-tests/interop
+css/css-view-transitions/parsing/view-transition-name-computed.html @web-platform-tests/interop
+css/css-view-transitions/parsing/view-transition-name-invalid.html @web-platform-tests/interop
+css/css-view-transitions/parsing/view-transition-name-valid.html @web-platform-tests/interop
+css/css-view-transitions/paused-animation-at-end.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-computed-style-stays-in-sync-with-new-element.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-element-animations-rerun.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-element-animations.html @web-platform-tests/interop
+css/css-view-transitions/pseudo-get-computed-style.html @web-platform-tests/interop
+css/css-view-transitions/ready_resolves_after_dom_before_raf.html @web-platform-tests/interop
+css/css-view-transitions/style-inheritance.html @web-platform-tests/interop
+css/css-view-transitions/synchronous-callback-skipped-before-run.html @web-platform-tests/interop
+css/css-view-transitions/transition-in-hidden-page.html @web-platform-tests/interop
+css/css-view-transitions/transition-skipped-after-animation-started.html @web-platform-tests/interop
+css/css-view-transitions/transition-skipped-from-invalid-callback.html @web-platform-tests/interop
+css/css-view-transitions/unset-and-initial-view-transition-name.html @web-platform-tests/interop
+css/css-view-transitions/update-callback-timeout.html @web-platform-tests/interop
+css/css-view-transitions/view-transition-name-on-removed-element.html @web-platform-tests/interop
+css/css-view-transitions/web-animation-pseudo-incorrect-name.html @web-platform-tests/interop
+css/css-view-transitions/window-resize-aborts-transition-before-ready.html @web-platform-tests/interop
+css/css-view-transitions/window-resize-aborts-transition.html @web-platform-tests/interop
+css/css-viewport/zoom/parsing/zoom-computed.html @web-platform-tests/interop
+css/css-viewport/zoom/parsing/zoom-valid.html @web-platform-tests/interop
+css/css-viewport/zoom/relative-units.html @web-platform-tests/interop
+css/css-viewport/zoom/scroll-top-test-with-zoom.html @web-platform-tests/interop
+css/css-viewport/zoom/widget.html @web-platform-tests/interop
+css/css-writing-modes/forms/select-multiple-keyboard-selection.optional.html @web-platform-tests/interop
+css/css-writing-modes/forms/select-multiple-options-visual-order.html @web-platform-tests/interop
+css/css-writing-modes/forms/select-multiple-scrolling.optional.html @web-platform-tests/interop
+css/css-writing-modes/forms/select-size-scrolling-and-sizing.optional.html @web-platform-tests/interop
+css/css-writing-modes/forms/text-input-block-size.optional.html @web-platform-tests/interop
+css/css-writing-modes/forms/text-input-vertical-overflow-no-scroll.html @web-platform-tests/interop
+css/css-writing-modes/forms/textarea-rows-cols-sizing.html @web-platform-tests/interop
+css/css-writing-modes/writing-mode-parsing-sideways-lr-001.html @web-platform-tests/interop
+css/css-writing-modes/writing-mode-parsing-sideways-rl-001.html @web-platform-tests/interop
+css/cssom/caretPositionFromPoint-with-transformation.html @web-platform-tests/interop
+css/cssom/caretPositionFromPoint.html @web-platform-tests/interop
+css/cssom-view/scrollIntoView-sideways-lr-writing-mode-and-rtl-direction.html @web-platform-tests/interop
+css/cssom-view/scrollIntoView-sideways-lr-writing-mode.html @web-platform-tests/interop
+css/cssom-view/scrollIntoView-sideways-rl-writing-mode-and-rtl-direction.html @web-platform-tests/interop
+css/cssom-view/scrollIntoView-sideways-rl-writing-mode.html @web-platform-tests/interop
+css/filter-effects/animation/backdrop-filter-interpolation-001.html @web-platform-tests/interop
+css/filter-effects/animation/backdrop-filter-interpolation-002.html @web-platform-tests/interop
+css/filter-effects/animation/backdrop-filter-interpolation-003.html @web-platform-tests/interop
+css/filter-effects/animation/backdrop-filter-interpolation-004.html @web-platform-tests/interop
+css/filter-effects/backdrop-filter-important.html @web-platform-tests/interop
+css/filter-effects/parsing/backdrop-filter-computed.html @web-platform-tests/interop
+css/filter-effects/parsing/backdrop-filter-parsing-invalid.html @web-platform-tests/interop
+css/filter-effects/parsing/backdrop-filter-parsing-valid.html @web-platform-tests/interop
+dom/events/scrolling/scrollend-event-fired-for-mandatory-snap-point-after-load.html @web-platform-tests/interop
+dom/events/scrolling/scrollend-event-fired-for-programmatic-scroll.html @web-platform-tests/interop
+dom/events/scrolling/scrollend-event-fired-for-scroll-attr-change.html @web-platform-tests/interop
+dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html @web-platform-tests/interop
+dom/events/scrolling/scrollend-event-fired-to-document.html @web-platform-tests/interop
+dom/events/scrolling/scrollend-event-fired-to-window.html @web-platform-tests/interop
+dom/events/scrolling/scrollend-event-handler-content-attributes.html @web-platform-tests/interop
+dom/events/scrolling/scrollend-event-not-fired-on-no-scroll.html @web-platform-tests/interop
+dom/events/scrolling/scrollend-fires-to-text-input.html @web-platform-tests/interop
+dom/events/scrolling/scrollend-with-snap-on-fractional-offset.html @web-platform-tests/interop
+dom/historical-mutation-events.html @web-platform-tests/interop
+event-timing/auxclick.html @web-platform-tests/interop
+event-timing/buffered-and-duration-threshold.html @web-platform-tests/interop
+event-timing/buffered-flag.html @web-platform-tests/interop
+event-timing/click-timing.html @web-platform-tests/interop
+event-timing/click.html @web-platform-tests/interop
+event-timing/contextmenu.html @web-platform-tests/interop
+event-timing/crossiframe.html @web-platform-tests/interop
+event-timing/dblclick.html @web-platform-tests/interop
+event-timing/disconnect-target.html @web-platform-tests/interop
+event-timing/duration-with-target-low.html @web-platform-tests/interop
+event-timing/event-click-counts.html @web-platform-tests/interop
+event-timing/event-click-visibilitychange.html @web-platform-tests/interop
+event-timing/event-counts-zero.html @web-platform-tests/interop
+event-timing/event-retarget.html @web-platform-tests/interop
+event-timing/first-input-interactionid-click.html @web-platform-tests/interop
+event-timing/first-input-interactionid-key.html @web-platform-tests/interop
+event-timing/first-input-interactionid-tap.html @web-platform-tests/interop
+event-timing/first-input-shadow-dom.html @web-platform-tests/interop
+event-timing/idlharness.any.js @web-platform-tests/interop
+event-timing/interaction-count-click.html @web-platform-tests/interop
+event-timing/interaction-count-press-key.html @web-platform-tests/interop
+event-timing/interaction-count-tap.html @web-platform-tests/interop
+event-timing/interactionid-aux-pointerdown-and-pointerdown.html @web-platform-tests/interop
+event-timing/interactionid-aux-pointerdown.html @web-platform-tests/interop
+event-timing/interactionid-auxclick.html @web-platform-tests/interop
+event-timing/interactionid-click.html @web-platform-tests/interop
+event-timing/interactionid-keyboard-event-simulated-click-button-space.html @web-platform-tests/interop
+event-timing/interactionid-keyboard-event-simulated-click-checkbox-space.html @web-platform-tests/interop
+event-timing/interactionid-keyboard-event-simulated-click-link-enter.html @web-platform-tests/interop
+event-timing/interactionid-keypress.html @web-platform-tests/interop
+event-timing/interactionid-orphan-pointerup.html @web-platform-tests/interop
+event-timing/interactionid-press-key-as-input.html @web-platform-tests/interop
+event-timing/interactionid-press-key-no-effect.html @web-platform-tests/interop
+event-timing/interactionid-tap.html @web-platform-tests/interop
+event-timing/keydown.html @web-platform-tests/interop
+event-timing/keyup.html @web-platform-tests/interop
+event-timing/large-duration-threshold.html @web-platform-tests/interop
+event-timing/medium-duration-threshold.html @web-platform-tests/interop
+event-timing/min-duration-threshold.html @web-platform-tests/interop
+event-timing/modal-dialog-interrupt-paint.html @web-platform-tests/interop
+event-timing/mousedown.html @web-platform-tests/interop
+event-timing/mouseenter.html @web-platform-tests/interop
+event-timing/mouseleave.html @web-platform-tests/interop
+event-timing/mouseout.html @web-platform-tests/interop
+event-timing/mouseover.html @web-platform-tests/interop
+event-timing/mouseup.html @web-platform-tests/interop
+event-timing/only-observe-firstInput.html @web-platform-tests/interop
+event-timing/pointerdown.html @web-platform-tests/interop
+event-timing/pointerenter.html @web-platform-tests/interop
+event-timing/pointerleave.html @web-platform-tests/interop
+event-timing/pointerout.html @web-platform-tests/interop
+event-timing/pointerover.html @web-platform-tests/interop
+event-timing/pointerup.html @web-platform-tests/interop
+event-timing/programmatic-click-not-observed.html @web-platform-tests/interop
+event-timing/retrievability.html @web-platform-tests/interop
+event-timing/retrieve-firstInput.html @web-platform-tests/interop
+event-timing/selection-autoscroll.html @web-platform-tests/interop
+event-timing/shadow-dom-null-target.html @web-platform-tests/interop
+event-timing/supported-types-consistent-with-self.html @web-platform-tests/interop
+event-timing/supported-types.window.js @web-platform-tests/interop
+event-timing/timingconditions.html @web-platform-tests/interop
+event-timing/toJSON.html @web-platform-tests/interop
+html/editing/the-hidden-attribute/beforematch-element-fragment-navigation.html @web-platform-tests/interop
+html/editing/the-hidden-attribute/beforematch-scroll-to-text-fragment.html @web-platform-tests/interop
+html/editing/the-hidden-attribute/hidden-idl.html @web-platform-tests/interop
+html/editing/the-hidden-attribute/hidden-ua-stylesheet.html @web-platform-tests/interop
+html/editing/the-hidden-attribute/hidden-until-found-002.html @web-platform-tests/interop
+html/editing/the-hidden-attribute/hidden-until-found-text-fragment.html @web-platform-tests/interop
+html/rendering/the-details-element/auto-expand-details-text-fragment.html @web-platform-tests/interop
+html/rendering/the-details-element/details-blockification.html @web-platform-tests/interop
+html/rendering/the-details-element/details-display.html @web-platform-tests/interop
+html/rendering/the-details-element/details-pseudo-elements-006.html @web-platform-tests/interop
+html/semantics/disabled-elements/disabled-event-dispatch.tentative.html @web-platform-tests/interop
+html/semantics/disabled-elements/event-propagate-disabled.tentative.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/import-attributes/dynamic-import-with-attributes-argument.any.js @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/import-attributes/empty-attributes-clause.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/import-attributes/invalid-import-errors-order.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/import-attributes/invalid-type-attribute-error.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/import-attributes/unsupported-attribute.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/charset-2.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/charset-bom.any.js @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/charset.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/cors-crossorigin-requests.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/credentials.sub.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/integrity.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/invalid-content-type.any.js @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/json-module-service-worker-test.https.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/load-error-events.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/module.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/non-object.any.js @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/parse-error.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/referrer-policies.sub.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/repeated-imports.any.js @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/script-element-json-src.html @web-platform-tests/interop
+html/semantics/scripting-1/the-script-element/json-module/valid-content-type.html @web-platform-tests/interop
+html/user-activation/activation-trigger-pointerevent.html @web-platform-tests/interop
+largest-contentful-paint/background-image-set-image.html @web-platform-tests/interop
+largest-contentful-paint/broken-image-icon.html @web-platform-tests/interop
+largest-contentful-paint/contracted-image.html @web-platform-tests/interop
+largest-contentful-paint/cross-origin-image.sub.html @web-platform-tests/interop
+largest-contentful-paint/element-only-when-fully-active.html @web-platform-tests/interop
+largest-contentful-paint/expanded-image.html @web-platform-tests/interop
+largest-contentful-paint/first-letter-background.html @web-platform-tests/interop
+largest-contentful-paint/first-paint-equals-lcp-text.html @web-platform-tests/interop
+largest-contentful-paint/idlharness.html @web-platform-tests/interop
+largest-contentful-paint/iframe-content-not-observed.html @web-platform-tests/interop
+largest-contentful-paint/image-TAO.sub.html @web-platform-tests/interop
+largest-contentful-paint/image-full-viewport.html @web-platform-tests/interop
+largest-contentful-paint/image-inside-svg.html @web-platform-tests/interop
+largest-contentful-paint/image-not-fully-visible.html @web-platform-tests/interop
+largest-contentful-paint/image-removed-before-load.html @web-platform-tests/interop
+largest-contentful-paint/image-src-change.html @web-platform-tests/interop
+largest-contentful-paint/image-sw-same-origin.https.html @web-platform-tests/interop
+largest-contentful-paint/image-upscaling.html @web-platform-tests/interop
+largest-contentful-paint/initially-invisible-images.html @web-platform-tests/interop
+largest-contentful-paint/invisible-images-composited-1.html @web-platform-tests/interop
+largest-contentful-paint/invisible-images-composited-2.html @web-platform-tests/interop
+largest-contentful-paint/invisible-images.html @web-platform-tests/interop
+largest-contentful-paint/larger-image.html @web-platform-tests/interop
+largest-contentful-paint/larger-text.html @web-platform-tests/interop
+largest-contentful-paint/loadTime-after-appendChild.html @web-platform-tests/interop
+largest-contentful-paint/multiple-image-same-src.html @web-platform-tests/interop
+largest-contentful-paint/multiple-redirects-TAO.html @web-platform-tests/interop
+largest-contentful-paint/observe-after-untrusted-scroll.html @web-platform-tests/interop
+largest-contentful-paint/observe-css-generated-image.html @web-platform-tests/interop
+largest-contentful-paint/observe-css-generated-text.html @web-platform-tests/interop
+largest-contentful-paint/observe-image.html @web-platform-tests/interop
+largest-contentful-paint/observe-mathml.html @web-platform-tests/interop
+largest-contentful-paint/observe-random-namespace.html @web-platform-tests/interop
+largest-contentful-paint/observe-svg-background-image.html @web-platform-tests/interop
+largest-contentful-paint/observe-svg-data-uri-background-image.html @web-platform-tests/interop
+largest-contentful-paint/observe-svg-data-uri-image.html @web-platform-tests/interop
+largest-contentful-paint/observe-svg-image.html @web-platform-tests/interop
+largest-contentful-paint/observe-text.html @web-platform-tests/interop
+largest-contentful-paint/placeholder-image.html @web-platform-tests/interop
+largest-contentful-paint/progressively-loaded-image.html @web-platform-tests/interop
+largest-contentful-paint/redirects-tao-star.html @web-platform-tests/interop
+largest-contentful-paint/repeated-image.html @web-platform-tests/interop
+largest-contentful-paint/resized-image-not-reconsidered.html @web-platform-tests/interop
+largest-contentful-paint/same-origin-redirects.html @web-platform-tests/interop
+largest-contentful-paint/supported-lcp-type.html @web-platform-tests/interop
+largest-contentful-paint/text-with-display-style.html @web-platform-tests/interop
+largest-contentful-paint/toJSON.html @web-platform-tests/interop
+largest-contentful-paint/transparent-text-with-shadow.html @web-platform-tests/interop
+largest-contentful-paint/transparent-text-with-text-stroke.html @web-platform-tests/interop
+largest-contentful-paint/transparent-text.html @web-platform-tests/interop
+largest-contentful-paint/update-on-style-change.html @web-platform-tests/interop
+largest-contentful-paint/video-data-uri.html @web-platform-tests/interop
+largest-contentful-paint/video-play-after-poster.html @web-platform-tests/interop
+largest-contentful-paint/video-poster.html @web-platform-tests/interop
+largest-contentful-paint/web-font-styled-text-resize-block.html @web-platform-tests/interop
+largest-contentful-paint/web-font-styled-text-resize-swap-after-interaction.html @web-platform-tests/interop
+navigation-api/currententrychange-event/anchor-click.html @web-platform-tests/interop
+navigation-api/currententrychange-event/constructor.html @web-platform-tests/interop
+navigation-api/currententrychange-event/history-back-same-doc.html @web-platform-tests/interop
+navigation-api/currententrychange-event/history-pushState.html @web-platform-tests/interop
+navigation-api/currententrychange-event/history-replaceState.html @web-platform-tests/interop
+navigation-api/currententrychange-event/location-api.html @web-platform-tests/interop
+navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc-popup.html @web-platform-tests/interop
+navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc.html @web-platform-tests/interop
+navigation-api/currententrychange-event/navigate-from-initial-about-blank.html @web-platform-tests/interop
+navigation-api/currententrychange-event/navigation-back-forward-cross-doc.html @web-platform-tests/interop
+navigation-api/currententrychange-event/navigation-back-forward-same-doc.html @web-platform-tests/interop
+navigation-api/currententrychange-event/navigation-navigate-cross-doc.html @web-platform-tests/interop
+navigation-api/currententrychange-event/navigation-navigate-intercept.html @web-platform-tests/interop
+navigation-api/currententrychange-event/navigation-navigate-preventDefault.html @web-platform-tests/interop
+navigation-api/currententrychange-event/navigation-navigate-replace-cross-doc.html @web-platform-tests/interop
+navigation-api/currententrychange-event/navigation-navigate-replace-intercept.html @web-platform-tests/interop
+navigation-api/currententrychange-event/navigation-navigate-replace-same-doc.html @web-platform-tests/interop
+navigation-api/currententrychange-event/navigation-navigate-same-doc.html @web-platform-tests/interop
+navigation-api/currententrychange-event/navigation-reload-cross-doc.html @web-platform-tests/interop
+navigation-api/currententrychange-event/navigation-reload-intercept.html @web-platform-tests/interop
+navigation-api/currententrychange-event/navigation-updateCurrentEntry.html @web-platform-tests/interop
+navigation-api/currententrychange-event/not-on-load.html @web-platform-tests/interop
+navigation-api/currententrychange-event/properties.html @web-platform-tests/interop
+navigation-api/focus-reset/autofocus.html @web-platform-tests/interop
+navigation-api/focus-reset/basic.html @web-platform-tests/interop
+navigation-api/focus-reset/change-focus-again-in-blur-during-intercept.html @web-platform-tests/interop
+navigation-api/focus-reset/change-focus-back-to-origial-during-intercept.html @web-platform-tests/interop
+navigation-api/focus-reset/change-focus-during-intercept.html @web-platform-tests/interop
+navigation-api/focus-reset/change-focus-then-remove-during-intercept.html @web-platform-tests/interop
+navigation-api/focus-reset/focus-reset-timing.html @web-platform-tests/interop
+navigation-api/focus-reset/multiple-intercept.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-origin-traversal-does-not-fire-navigate.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-origin-traversal-redirect.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/click-crossdocument-crossorigin-sameorigindomain.sub.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/click-crossdocument-crossorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/click-crossdocument-sameorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/click-samedocument-crossorigin-sameorigindomain.sub.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/click-samedocument-crossorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/click-samedocument-sameorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/location-crossdocument-crossorigin-sameorigindomain.sub.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/location-crossdocument-crossorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/location-crossdocument-sameorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/location-samedocument-crossorigin-sameorigindomain.sub.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/location-samedocument-crossorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/location-samedocument-sameorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/open-crossdocument-crossorigin-sameorigindomain.sub.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/open-crossdocument-crossorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/open-crossdocument-sameorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/open-samedocument-crossorigin-sameorigindomain.sub.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/open-samedocument-crossorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/open-samedocument-sameorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/submit-crossdocument-crossorigin-sameorigindomain.sub.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/submit-crossdocument-crossorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/submit-crossdocument-sameorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/submit-samedocument-crossorigin-sameorigindomain.sub.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/submit-samedocument-crossorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/cross-window/submit-samedocument-sameorigin.html @web-platform-tests/interop
+navigation-api/navigate-event/defaultPrevented-navigation-preempted.html @web-platform-tests/interop
+navigation-api/navigate-event/defaultPrevented-window-stop-after-dispatch.html @web-platform-tests/interop
+navigation-api/navigate-event/event-constructor.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-after-dispatch.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-and-navigate.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-canceled-event.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-cross-document-same-origin.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-cross-origin.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-detach-multiple.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-detach.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-handler-null-or-undefined.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-handler-returns-non-promise.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-handler-throws.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-history-pushState.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-history-replaceState.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-multiple-times-reject.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-multiple-times.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-navigation-back.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-on-synthetic-event.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-popstate.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-reject.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-resolve.html @web-platform-tests/interop
+navigation-api/navigate-event/intercept-same-document-history-back.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-anchor-cross-origin.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-anchor-download-userInitiated.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-anchor-download.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-anchor-fragment.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-anchor-same-origin-cross-document.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-anchor-userInitiated.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-anchor-with-target.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-destination-after-detach.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-destination-dynamic-index.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-destination-getState-back-forward.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-destination-getState-navigate.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-destination-getState-reload.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-form-get.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-form-reload.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-form-requestSubmit.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-form-traverse.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-form-userInitiated.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-form-with-target.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-form.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-history-back-after-fragment.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-history-back-after-pushState.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-history-back-bfcache.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-history-back-cross-document.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-history-back-noop.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-history-go-0.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-history-pushState.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-history-replaceState.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-iframe-location.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-location.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-meta-refresh.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-navigation-back-cross-document.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-navigation-back-same-document-in-iframe.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-navigation-back-same-document.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-navigation-navigate.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-svg-anchor-fragment.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-to-javascript.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-to-srcdoc.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-window-open-self.html @web-platform-tests/interop
+navigation-api/navigate-event/navigate-window-open.html @web-platform-tests/interop
+navigation-api/navigate-event/navigatesuccess-cross-document.html @web-platform-tests/interop
+navigation-api/navigate-event/navigatesuccess-same-document.html @web-platform-tests/interop
+navigation-api/navigate-event/navigation-back-cross-document-preventDefault.html @web-platform-tests/interop
+navigation-api/navigate-event/navigation-back-same-document-preventDefault.html @web-platform-tests/interop
+navigation-api/navigate-event/navigation-traverseTo-in-iframe-same-document-preventDefault.html @web-platform-tests/interop
+navigation-api/navigate-event/navigation-traverseTo-navigates-top-and-same-doc-child-and-cross-doc-child.html @web-platform-tests/interop
+navigation-api/navigate-event/navigation-traverseTo-same-document-preventDefault-multiple-windows.html @web-platform-tests/interop
+navigation-api/navigate-event/navigation-traverseTo-top-cancels-cross-document-child.html @web-platform-tests/interop
+navigation-api/navigate-event/replaceState-inside-back-handler.html @web-platform-tests/interop
+navigation-api/navigate-event/same-url-replace-cross-document.html @web-platform-tests/interop
+navigation-api/navigate-event/same-url-replace-same-document.html @web-platform-tests/interop
+navigation-api/navigate-event/signal-abort-detach-in-onnavigate.html @web-platform-tests/interop
+navigation-api/navigate-event/signal-abort-intercept.html @web-platform-tests/interop
+navigation-api/navigate-event/signal-abort-preventDefault.html @web-platform-tests/interop
+navigation-api/navigate-event/signal-abort-window-stop-after-intercept.html @web-platform-tests/interop
+navigation-api/navigate-event/signal-abort-window-stop-in-onnavigate.html @web-platform-tests/interop
+navigation-api/navigate-event/signal-abort-window-stop.html @web-platform-tests/interop
+navigation-api/navigation-activation/activation-after-bfcache-cross-origin.html @web-platform-tests/interop
+navigation-api/navigation-activation/activation-after-bfcache.html @web-platform-tests/interop
+navigation-api/navigation-activation/activation-history-pushState.html @web-platform-tests/interop
+navigation-api/navigation-activation/activation-history-replaceState.html @web-platform-tests/interop
+navigation-api/navigation-activation/activation-initial-about-blank.html @web-platform-tests/interop
+navigation-api/navigation-activation/activation-push-cross-origin.html @web-platform-tests/interop
+navigation-api/navigation-activation/activation-push.html @web-platform-tests/interop
+navigation-api/navigation-activation/activation-reload.html @web-platform-tests/interop
+navigation-api/navigation-activation/activation-replace-cross-origin.html @web-platform-tests/interop
+navigation-api/navigation-activation/activation-replace.html @web-platform-tests/interop
+navigation-api/navigation-activation/activation-same-document-then-cross-document.html @web-platform-tests/interop
+navigation-api/navigation-activation/activation-traverse-not-in-entries.html @web-platform-tests/interop
+navigation-api/navigation-activation/activation-traverse-then-clobber.html @web-platform-tests/interop
+navigation-api/navigation-activation/activation-traverse.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/after-detach.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/current-basic.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/entries-across-origins.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/entries-after-bfcache-in-iframe.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/entries-after-bfcache.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/entries-after-blank-navigation-from-cross-origin.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/entries-after-blank-navigation.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/entries-after-blob-navigation.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/entries-after-cross-document-forward-pruning.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/entries-after-javascript-url-navigation.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/entries-after-navigations-in-multiple-windows.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/entries-after-srcdoc-navigation.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/entries-array-equality.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/entries-in-new-javascript-url-iframe.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/entries-in-new-srcdoc-iframe.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/entries-when-inactive.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/entry-after-detach.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/index-not-in-entries.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/key-id-back-cross-document.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/key-id-back-same-document.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/key-id-location-reload-intercept.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/key-id-location-reload.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/key-id-location-replace-cross-origin.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/key-id-location-replace.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/no-referrer-dynamic-url-censored.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/no-referrer-from-meta-url-censored.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/no-referrer-url-censored.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/opaque-origin-data-url.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/opaque-origin.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/sameDocument-after-fragment-navigate.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/sameDocument-after-navigate-restore.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/sameDocument-after-navigate.html @web-platform-tests/interop
+navigation-api/navigation-history-entry/state-after-navigate-restore.html @web-platform-tests/interop
+navigation-api/navigation-methods/back-forward-multiple-frames.html @web-platform-tests/interop
+navigation-api/navigation-methods/disambigaute-back.html @web-platform-tests/interop
+navigation-api/navigation-methods/disambigaute-forward.html @web-platform-tests/interop
+navigation-api/navigation-methods/disambigaute-traverseTo-back-multiple.html @web-platform-tests/interop
+navigation-api/navigation-methods/disambigaute-traverseTo-forward-multiple.html @web-platform-tests/interop
+navigation-api/navigation-methods/forward-to-pruned-entry.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-base-url.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-from-initial-about-blank-gc.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-from-initial-about-blank-src.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-from-initial-about-blank.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-history-push-not-loaded.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-history-push-same-url-cross-document.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-history-push-same-url.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-history-state-replace.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-history-state.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-info-and-state.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-intercept-history-state.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-relative-url-utf8.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-relative-url.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-replace-cross-document.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-replace-same-document.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-same-document.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-state-repeated-await.html @web-platform-tests/interop
+navigation-api/navigation-methods/navigate-state-repeated.html @web-platform-tests/interop
+navigation-api/navigation-methods/reload-base-url.html @web-platform-tests/interop
+navigation-api/navigation-methods/reload-info.html @web-platform-tests/interop
+navigation-api/navigation-methods/reload-navigation-timing.html @web-platform-tests/interop
+navigation-api/navigation-methods/reload-no-args.html @web-platform-tests/interop
+navigation-api/navigation-methods/reload-service-worker-fetch-event.html @web-platform-tests/interop
+navigation-api/navigation-methods/reload-state-and-info.html @web-platform-tests/interop
+navigation-api/navigation-methods/reload-state-undefined.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/back-204-205-download.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/back-already-detached.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/back-beforeunload.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/back-forward-initial-about-blank.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/back-forward-opaque-origin.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/back-forward-out-of-bounds.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/back-intercept-rejected.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/back-intercept.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/back.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/forward-already-detached.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/forward-beforeunload.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/forward-intercept-rejected.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/forward-intercept.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/forward.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-204-205-download.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-already-detached.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-beforeunload.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-cross-document.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-detach-in-onnavigate.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-detach-in-serialization.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-file-url.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-initial-about-blank-cross-document.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-initial-about-blank.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-intercept-interrupted.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-intercept-rejected.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-intercept.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-interrupted-within-onnavigate.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-interrupted.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-invalid-url.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-opaque-origin.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-pagehide.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-preventDefault.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-push-initial-about-blank.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-push-javascript-url.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-rejection-order-beforeunload-unserializablestate.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-rejection-order-detached-unserializablestate.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-beforeunload.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-detached.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-pagehide.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-unserializablestate.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-rejection-order-pagehide-unserializablestate.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate-unserializable-state.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/navigate.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/reload-already-detached.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/reload-beforeunload.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/reload-detach-in-onnavigate.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/reload-detach-in-serialization.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/reload-initial-about-blank.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/reload-intercept-rejected.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/reload-intercept.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/reload-pagehide.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/reload-preventDefault.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/reload-rejection-order-beforeunload-unserializablestate.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/reload-rejection-order-detached-unserializablestate.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/reload-rejection-order-pagehide-unserializablestate.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/reload-unserializable-state.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/reload.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/traverseTo-already-detached.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/traverseTo-beforeunload.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/traverseTo-cross-document-preventDefault.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/traverseTo-current.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/traverseTo-detach-cross-document-before-navigate-event.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/traverseTo-detach-cross-document.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/traverseTo-detach-same-document-before-navigate-event.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/traverseTo-detach-same-document.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/traverseTo-intercept-rejected.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/traverseTo-intercept.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/traverseTo-invalid-key.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/traverseTo-repeated.html @web-platform-tests/interop
+navigation-api/navigation-methods/return-value/traverseTo.html @web-platform-tests/interop
+navigation-api/navigation-methods/sandboxing-back-parent.html @web-platform-tests/interop
+navigation-api/navigation-methods/sandboxing-back-sibling.html @web-platform-tests/interop
+navigation-api/navigation-methods/sandboxing-navigate-parent.html @web-platform-tests/interop
+navigation-api/navigation-methods/sandboxing-navigate-sibling.html @web-platform-tests/interop
+navigation-api/navigation-methods/traverseTo-after-adding-iframe.html @web-platform-tests/interop
+navigation-api/navigation-methods/traverseTo-after-data-url.html @web-platform-tests/interop
+navigation-api/navigation-methods/traverseTo-cross-document.html @web-platform-tests/interop
+navigation-api/navigation-methods/traverseTo-detach-between-navigate-and-navigatesuccess.html @web-platform-tests/interop
+navigation-api/navigation-methods/traverseTo-multiple-steps.html @web-platform-tests/interop
+navigation-api/navigation-methods/traverseTo-navigates-multiple-iframes.html @web-platform-tests/interop
+navigation-api/navigation-methods/traverseTo-same-document.html @web-platform-tests/interop
+navigation-api/navigation-methods/traverseTo-with-cross-origin-in-history.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/anchor-download-intercept-reject.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/anchor-download-intercept.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/anchor-download.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/back-cross-document-event-order.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/back-same-document-intercept-reject.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/back-same-document-intercept.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/back-same-document.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/currententrychange-before-popstate-intercept.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/currententrychange-dispose-ordering.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/intercept-async.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/location-href-canceled.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/location-href-double-intercept.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/location-href-intercept-reentrant.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/location-href-intercept-reject.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/location-href-intercept.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/navigate-204-205-download-then-same-document.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/navigate-canceled.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/navigate-cross-document-double.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/navigate-cross-document-event-order.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/navigate-double-intercept.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/navigate-in-transition-finished.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/navigate-intercept-stop.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/navigate-intercept.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/navigate-same-document-intercept-reentrant.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/navigate-same-document-intercept-reject.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/navigate-same-document.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/reload-canceled.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/reload-intercept-reject.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/reload-intercept.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/transition-cross-document.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/transition-finished-mark-as-handled.html @web-platform-tests/interop
+navigation-api/ordering-and-transition/transition-realms-and-identity.html @web-platform-tests/interop
+navigation-api/per-entry-events/dispose-after-bfcache.html @web-platform-tests/interop
+navigation-api/per-entry-events/dispose-cross-document.html @web-platform-tests/interop
+navigation-api/per-entry-events/dispose-for-navigation-in-child.html @web-platform-tests/interop
+navigation-api/per-entry-events/dispose-same-document-intercept.html @web-platform-tests/interop
+navigation-api/per-entry-events/dispose-same-document-navigate-during.html @web-platform-tests/interop
+navigation-api/per-entry-events/dispose-same-document-reload-with-intercept.html @web-platform-tests/interop
+navigation-api/per-entry-events/dispose-same-document-replace-with-intercept.html @web-platform-tests/interop
+navigation-api/per-entry-events/dispose-same-document-replaceState.html @web-platform-tests/interop
+navigation-api/per-entry-events/dispose-same-document.html @web-platform-tests/interop
+navigation-api/per-entry-events/dispose-skip-current-on-truncate.html @web-platform-tests/interop
+navigation-api/scroll-behavior/after-transition-basic.html @web-platform-tests/interop
+navigation-api/scroll-behavior/after-transition-change-history-scroll-restoration-during-promise.html @web-platform-tests/interop
+navigation-api/scroll-behavior/after-transition-explicit-scroll.html @web-platform-tests/interop
+navigation-api/scroll-behavior/after-transition-intercept-handler-modifies.html @web-platform-tests/interop
+navigation-api/scroll-behavior/after-transition-push.html @web-platform-tests/interop
+navigation-api/scroll-behavior/after-transition-reject.html @web-platform-tests/interop
+navigation-api/scroll-behavior/after-transition-reload.html @web-platform-tests/interop
+navigation-api/scroll-behavior/after-transition-replace.html @web-platform-tests/interop
+navigation-api/scroll-behavior/after-transition-timing.html @web-platform-tests/interop
+navigation-api/scroll-behavior/manual-basic.html @web-platform-tests/interop
+navigation-api/scroll-behavior/manual-immediate-scroll.html @web-platform-tests/interop
+navigation-api/scroll-behavior/manual-scroll-after-dispatch.html @web-platform-tests/interop
+navigation-api/scroll-behavior/manual-scroll-after-resolve.html @web-platform-tests/interop
+navigation-api/scroll-behavior/manual-scroll-fragment-does-not-exist.html @web-platform-tests/interop
+navigation-api/scroll-behavior/manual-scroll-push.html @web-platform-tests/interop
+navigation-api/scroll-behavior/manual-scroll-reload.html @web-platform-tests/interop
+navigation-api/scroll-behavior/manual-scroll-repeated.html @web-platform-tests/interop
+navigation-api/scroll-behavior/manual-scroll-replace.html @web-platform-tests/interop
+navigation-api/scroll-behavior/manual-scroll-resets-when-no-fragment.html @web-platform-tests/interop
+navigation-api/scroll-behavior/scroll-after-preventDefault.html @web-platform-tests/interop
+navigation-api/scroll-behavior/scroll-on-synthetic-event.html @web-platform-tests/interop
+navigation-api/scroll-behavior/scroll-without-intercept.html @web-platform-tests/interop
+navigation-api/state/cross-document-away-and-back.html @web-platform-tests/interop
+navigation-api/state/cross-document-getState-undefined.html @web-platform-tests/interop
+navigation-api/state/cross-document-getState.html @web-platform-tests/interop
+navigation-api/state/cross-document-location-api.html @web-platform-tests/interop
+navigation-api/state/history-pushState.html @web-platform-tests/interop
+navigation-api/state/history-replaceState.html @web-platform-tests/interop
+navigation-api/state/location-reload.html @web-platform-tests/interop
+navigation-api/state/same-document-away-and-back-location-api.html @web-platform-tests/interop
+navigation-api/state/same-document-away-and-back-navigation-api.html @web-platform-tests/interop
+navigation-api/updateCurrentEntry-method/basic.html @web-platform-tests/interop
+navigation-api/updateCurrentEntry-method/exception-order-initial-about-blank-unserializablestate.html @web-platform-tests/interop
+navigation-api/updateCurrentEntry-method/exception-order-not-fully-active-unserializablestate.html @web-platform-tests/interop
+navigation-api/updateCurrentEntry-method/initial-about-blank.html @web-platform-tests/interop
+navigation-api/updateCurrentEntry-method/no-args.html @web-platform-tests/interop
+navigation-api/updateCurrentEntry-method/not-fully-active.html @web-platform-tests/interop
+navigation-api/updateCurrentEntry-method/opaque-origin.html @web-platform-tests/interop
+navigation-api/updateCurrentEntry-method/same-document-away-and-back-location-api.html @web-platform-tests/interop
+navigation-api/updateCurrentEntry-method/unserializable.html @web-platform-tests/interop
+performance-timeline/buffered-flag-with-entryTypes-observer.tentative.any.js @web-platform-tests/interop
+pointerevents/capturing_boundary_event_handler_at_ua_shadowdom.html @web-platform-tests/interop
+pointerevents/coalesced_events_attributes.https.html @web-platform-tests/interop
+pointerevents/idlharness.https.window.js @web-platform-tests/interop
+pointerevents/mouse-pointer-boundary-events-for-shadowdom.html @web-platform-tests/interop
+pointerevents/pointerevent_after_target_appended.html @web-platform-tests/interop
+pointerevents/pointerevent_after_target_removed.html @web-platform-tests/interop
+pointerevents/pointerevent_attributes.html @web-platform-tests/interop
+pointerevents/pointerevent_auxclick_is_a_pointerevent.html @web-platform-tests/interop
+pointerevents/pointerevent_boundary_events_at_implicit_release_hoverable_pointers.html @web-platform-tests/interop
+pointerevents/pointerevent_capture_suppressing_mouse.html @web-platform-tests/interop
+pointerevents/pointerevent_click_during_capture.html @web-platform-tests/interop
+pointerevents/pointerevent_click_is_a_pointerevent.html @web-platform-tests/interop
+pointerevents/pointerevent_click_is_a_pointerevent_multiple_clicks.html @web-platform-tests/interop
+pointerevents/pointerevent_constructor.html @web-platform-tests/interop
+pointerevents/pointerevent_contextmenu_is_a_pointerevent.html @web-platform-tests/interop
+pointerevents/pointerevent_disabled_form_control.html @web-platform-tests/interop
+pointerevents/pointerevent_fractional_coordinates.html @web-platform-tests/interop
+pointerevents/pointerevent_hit_test_scroll_visible_descendant.html @web-platform-tests/interop
+pointerevents/pointerevent_lostpointercapture_for_disconnected_node.html @web-platform-tests/interop
+pointerevents/pointerevent_lostpointercapture_remove_setcapture_node.html @web-platform-tests/interop
+pointerevents/pointerevent_mouse_capture_change_hover.html @web-platform-tests/interop
+pointerevents/pointerevent_mouse_pointercapture_inactivate_pointer.html @web-platform-tests/interop
+pointerevents/pointerevent_movementxy.html @web-platform-tests/interop
+pointerevents/pointerevent_pointer_boundary_events_after_removing_last_over_element.html @web-platform-tests/interop
+pointerevents/pointerevent_pointercapture_in_frame.html @web-platform-tests/interop
+pointerevents/pointerevent_pointermove_on_chorded_mouse_button.html @web-platform-tests/interop
+pointerevents/pointerevent_pointerout_no_pointer_movement.html @web-platform-tests/interop
+pointerevents/pointerevent_pointerrawupdate.html @web-platform-tests/interop
+pointerevents/pointerevent_releasepointercapture_events_to_original_target.html @web-platform-tests/interop
+pointerevents/pointerevent_sequence_at_implicit_release_on_click.html @web-platform-tests/interop
+pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html @web-platform-tests/interop
+pointerevents/pointerevent_touch-action-keyboard.html @web-platform-tests/interop
+pointerevents/pointerup_after_pointerdown_target_removed.html @web-platform-tests/interop
+pointerevents/predicted_events_attributes.html @web-platform-tests/interop
+shadow-dom/Document-caretPositionFromPoint.tentative.html @web-platform-tests/interop
+storage-access-api/hasStorageAccess-ABA.sub.https.window.js @web-platform-tests/interop
+storage-access-api/hasStorageAccess-insecure.sub.window.js @web-platform-tests/interop
+storage-access-api/hasStorageAccess.sub.https.window.js @web-platform-tests/interop
+storage-access-api/idlharness.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess-ABA.sub.https.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess-cross-origin-iframe-navigation-relax.sub.https.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess-cross-site-iframe.sub.https.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess-dedicated-worker.sub.https.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess-insecure.sub.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess-nested-cross-origin-iframe.sub.https.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess-nested-cross-site-iframe.sub.https.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess-nested-same-origin-iframe.sub.https.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess-non-fully-active.sub.https.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess-same-site-iframe.sub.https.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess-sandboxed-iframe-allow-storage-access.sub.https.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess-sandboxed-iframe-no-storage-access.sub.https.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess-web-socket.sub.https.window.js @web-platform-tests/interop
+storage-access-api/requestStorageAccess.sub.https.window.js @web-platform-tests/interop
+storage-access-api/storage-access-permission.sub.https.window.js @web-platform-tests/interop
+storage-access-api/storageAccess.testdriver.sub.html @web-platform-tests/interop
+uievents/mouse/attributes.html @web-platform-tests/interop
+uievents/mouse/cancel-mousedown-in-subframe.html @web-platform-tests/interop
+uievents/mouse/mousemove_after_mouseover_target_removed.html @web-platform-tests/interop
+uievents/mouse/mousemove_prevent_default_action.html @web-platform-tests/interop
+urlpattern/urlpattern-hasregexpgroups.any.js @web-platform-tests/interop
+urlpattern/urlpattern.any.js @web-platform-tests/interop
+urlpattern/urlpattern.https.any.js @web-platform-tests/interop
+wasm/jsapi/js-string/basic.any.js @web-platform-tests/interop
+wasm/jsapi/js-string/constants.any.js @web-platform-tests/interop
+wasm/jsapi/js-string/imports.any.js @web-platform-tests/interop
+wasm/jsapi/memory/to-fixed-length-buffer.any.js @web-platform-tests/interop
+wasm/jsapi/memory/to-resizable-buffer-shared.any.js @web-platform-tests/interop
+wasm/jsapi/memory/to-resizable-buffer.any.js @web-platform-tests/interop
+webrtc/transfer-datachannel.html @web-platform-tests/interop
+webrtc-encoded-transform/RTCRtpScriptTransform-bad-chunk.https.html @web-platform-tests/interop
+webrtc-encoded-transform/RTCRtpScriptTransform-encoded-transform.https.html @web-platform-tests/interop
+webrtc-encoded-transform/RTCRtpScriptTransform-sender-worker-single-frame.https.html @web-platform-tests/interop
+webrtc-encoded-transform/idlharness.https.window.js @web-platform-tests/interop
+webrtc-encoded-transform/script-audio-transform.https.html @web-platform-tests/interop
+webrtc-encoded-transform/script-change-transform.https.html @web-platform-tests/interop
+webrtc-encoded-transform/script-metadata-transform.https.html @web-platform-tests/interop
+webrtc-encoded-transform/script-transform-generateKeyFrame-simulcast.https.html @web-platform-tests/interop
+webrtc-encoded-transform/script-transform-generateKeyFrame.https.html @web-platform-tests/interop
+webrtc-encoded-transform/script-transform-sendKeyFrameRequest.https.html @web-platform-tests/interop
+webrtc-encoded-transform/script-transform.https.html @web-platform-tests/interop
+webrtc-encoded-transform/script-write-twice-transform.https.html @web-platform-tests/interop
+workers/constructors/SharedWorker/same-origin.html @web-platform-tests/interop
+workers/constructors/Worker/same-origin.html @web-platform-tests/interop
diff --git a/tests/wpt/tests/IndexedDB/idbcursor-request-source.any.js b/tests/wpt/tests/IndexedDB/idbcursor-request-source.any.js
index 2fe8c66f2e5..8e1b34ee798 100644
--- a/tests/wpt/tests/IndexedDB/idbcursor-request-source.any.js
+++ b/tests/wpt/tests/IndexedDB/idbcursor-request-source.any.js
@@ -6,21 +6,111 @@
 
 'use strict';
 
-[cursor => cursor.update(0), cursor => cursor.delete()].forEach(
-    func => indexeddb_test(
-        (t, db) => {
-          db.createObjectStore('store', {autoIncrement: true});
-        },
-        (t, db) => {
-          const tx = db.transaction('store', 'readwrite');
-          const store = tx.objectStore('store');
-          store.put('value');
-          store.openCursor().onsuccess = t.step_func(e => {
-            const cursor = e.target.result;
-            assert_equals(
-                func(cursor).source, cursor,
-                `${func}.source should be the cursor itself`);
+// Setup each test by populating an object store with an index for the cursor to
+// iterate and manipulate.
+function initializeDatabase(db) {
+  const store = db.createObjectStore('store', {autoIncrement: true});
+  store.createIndex('index', /*keypath=*/ 'value');
+  store.put({value: 'z'});
+  store.put({value: 'y'});
+  store.put({value: 'x'});
+  store.put({value: 'w'});
+}
+
+function isIndex(cursorSourceType) {
+  return cursorSourceType === 'IDBIndex';
+}
+
+// Return the object store or index, depending on the test's `cursorSourceType`.
+function getCursorSource(transaction, cursorSourceType) {
+  let cursorSource = transaction.objectStore('store');
+  if (isIndex(cursorSourceType)) {
+    cursorSource = cursorSource.index('index');
+  }
+  return cursorSource;
+}
+
+// Verify the request source after calling delete() or update() on the cursor.
+function cursor_request_source_test(
+    cursorSourceType, createRequestFunctionName, createRequestFunctionArgs) {
+  indexeddb_test(
+      (t, db) => initializeDatabase(db),
+      (t, db) => {
+        const tx = db.transaction('store', 'readwrite');
+        const cursorSource = getCursorSource(tx, cursorSourceType);
+
+        // Open the cursor.
+        const openCursorRequest = cursorSource.openCursor();
+        openCursorRequest.onerror =
+            t.unreached_func('The cursor must not fail to open.');
+
+        openCursorRequest.onsuccess = t.step_func(e => {
+          // Use the cursor to create a new request.
+          const cursor = e.target.result;
+          const request =
+              cursor[createRequestFunctionName](...createRequestFunctionArgs);
+          assert_equals(
+              request.source, cursor,
+              `The request's source must be the cursor itself.`);
+          t.done();
+        });
+      },
+      `The source of the request from ${cursorSourceType}::${
+          createRequestFunctionName}() is the cursor itself`);
+}
+
+// Verify the request source after calling openCursor() or openKeyCursor() and
+// then using the cursor to iterate.
+function open_cursor_request_source_test(
+    cursorSourceType, openCursorFunctionName) {
+  indexeddb_test(
+      (t, db) => initializeDatabase(db),
+      (t, db) => {
+        const tx = db.transaction('store', 'readonly');
+        const cursorSource = getCursorSource(tx, cursorSourceType);
+
+        // Open the cursor.
+        const openCursorRequest = cursorSource[openCursorFunctionName]();
+        openCursorRequest.onerror =
+            t.unreached_func('The cursor must not fail to open or iterate.');
+
+        assert_equals(
+            openCursorRequest.source, cursorSource,
+            'The request source must be the opener of the cursor.');
+
+        // Verify the cursor's `request.source` after iterating with
+        // `advance()`, `continue()`, and `continuePrimaryKey()`.
+        let iterationCount = 0;
+        openCursorRequest.onsuccess = t.step_func(e => {
+          assert_equals(
+              openCursorRequest.source, cursorSource,
+              'The request source must be the opener of the cursor after iterating.');
+
+          const cursor = e.target.result;
+          ++iterationCount;
+
+          if (iterationCount == 1) {
+            cursor.advance(1);
+          } else if (iterationCount == 2) {
+            cursor.continue();
+          } else if (iterationCount == 3 && isIndex(cursorSourceType)) {
+            cursor.continuePrimaryKey('z', 0);
+          } else {
             t.done();
-          });
-        },
-        `The source of the request from ${func} is the cursor itself`));
+          }
+        });
+      },
+      `${cursorSourceType}::${
+          openCursorFunctionName}'s request source must be the ${
+          cursorSourceType} instance that opened the cursor`);
+}
+
+open_cursor_request_source_test('IDBObjectStore', 'openCursor');
+open_cursor_request_source_test('IDBObjectStore', 'openKeyCursor');
+open_cursor_request_source_test('IDBIndex', 'openCursor');
+open_cursor_request_source_test('IDBIndex', 'openKeyCursor');
+
+cursor_request_source_test('IDBObjectStore', 'update', /*args=*/[0]);
+cursor_request_source_test('IDBObjectStore', 'delete', /*args=*/[]);
+cursor_request_source_test('IDBIndex', 'update', /*args=*/[0]);
+cursor_request_source_test('IDBIndex', 'delete', /*args=*/[]);
diff --git a/tests/wpt/tests/IndexedDB/key-conversion-exceptions.any.js b/tests/wpt/tests/IndexedDB/key-conversion-exceptions.any.js
new file mode 100644
index 00000000000..08b99946c01
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/key-conversion-exceptions.any.js
@@ -0,0 +1,207 @@
+// META: global=window,worker
+// META: title=IndexedDB: Exceptions thrown during key conversion
+// META: script=resources/support.js
+// META: timeout=long
+
+'use strict';
+
+// Convenience function for tests that only need to run code in onupgradeneeded.
+function indexeddb_upgrade_only_test(upgrade_callback, description) {
+  indexeddb_test(upgrade_callback, t => t.done(), description);
+}
+
+// Key that throws during conversion.
+function throwing_key(name) {
+  const throws = [];
+  throws.length = 1;
+  const err = new Error('throwing from getter');
+  err.name = name;
+  Object.defineProperty(throws, '0', {
+    get: function() {
+      throw err;
+    },
+    enumerable: true,
+  });
+  return [throws, err];
+}
+
+const valid_key = [];
+const invalid_key = {};
+
+// Calls method on receiver with the specified number of args (default 1)
+// and asserts that the method fails appropriately (rethrowing if
+// conversion throws, or DataError if not a valid key), and that
+// the first argument is fully processed before the second argument
+// (if appropriate).
+function check_method(receiver, method, args) {
+  args = args || 1;
+  if (args < 2) {
+    const [key, err] = throwing_key('getter');
+    assert_throws_exactly(err, () => {
+      receiver[method](key);
+    }, 'key conversion with throwing getter should rethrow');
+
+    assert_throws_dom('DataError', () => {
+      receiver[method](invalid_key);
+    }, 'key conversion with invalid key should throw DataError');
+  } else {
+    const [key1, err1] = throwing_key('getter 1');
+    const [key2, err2] = throwing_key('getter 2');
+    assert_throws_exactly(err1, () => {
+      receiver[method](key1, key2);
+    }, 'first key conversion with throwing getter should rethrow');
+
+    assert_throws_dom('DataError', () => {
+      receiver[method](invalid_key, key2);
+    }, 'first key conversion with invalid key should throw DataError');
+
+    assert_throws_exactly(err2, () => {
+      receiver[method](valid_key, key2);
+    }, 'second key conversion with throwing getter should rethrow');
+
+    assert_throws_dom('DataError', () => {
+      receiver[method](valid_key, invalid_key);
+    }, 'second key conversion with invalid key should throw DataError');
+  }
+}
+
+// Static key comparison utility on IDBFactory.
+test(
+    t => check_method(indexedDB, 'cmp', 2),
+    'IDBFactory cmp() static with throwing/invalid keys');
+
+// Continue methods on IDBCursor.
+indexeddb_upgrade_only_test((t, db) => {
+  const store = db.createObjectStore('store');
+  store.put('a', 1).onerror = t.unreached_func('put should succeed');
+
+  const request = store.openCursor();
+  request.onerror = t.unreached_func('openCursor should succeed');
+  request.onsuccess = t.step_func(() => {
+    const cursor = request.result;
+    assert_not_equals(cursor, null, 'cursor should find a value');
+    check_method(cursor, 'continue');
+  });
+}, 'IDBCursor continue() method with throwing/invalid keys');
+
+indexeddb_upgrade_only_test((t, db) => {
+  const store = db.createObjectStore('store');
+  const index = store.createIndex('index', 'prop');
+  store.put({prop: 'a'}, 1).onerror = t.unreached_func('put should succeed');
+
+  const request = index.openCursor();
+  request.onerror = t.unreached_func('openCursor should succeed');
+  request.onsuccess = t.step_func(() => {
+    const cursor = request.result;
+    assert_not_equals(cursor, null, 'cursor should find a value');
+
+    check_method(cursor, 'continuePrimaryKey', 2);
+  });
+}, null, 'IDBCursor continuePrimaryKey() method with throwing/invalid keys');
+
+// Mutation methods on IDBCursor.
+indexeddb_upgrade_only_test((t, db) => {
+  const store = db.createObjectStore('store', {keyPath: 'prop'});
+  store.put({prop: 1}).onerror = t.unreached_func('put should succeed');
+
+  const request = store.openCursor();
+  request.onerror = t.unreached_func('openCursor should succeed');
+  request.onsuccess = t.step_func(() => {
+    const cursor = request.result;
+    assert_not_equals(cursor, null, 'cursor should find a value');
+
+    const value = {};
+    let err;
+    [value.prop, err] = throwing_key('getter');
+    assert_throws_exactly(err, () => {
+      cursor.update(value);
+    }, 'throwing getter should rethrow during clone');
+
+    // Throwing from the getter during key conversion is
+    // not possible since (1) a clone is used, (2) only own
+    // properties are cloned, and (3) only own properties
+    // are used for key path evaluation.
+
+    value.prop = invalid_key;
+    assert_throws_dom('DataError', () => {
+      cursor.update(value);
+    }, 'key conversion with invalid key should throw DataError');
+  });
+}, 'IDBCursor update() method with throwing/invalid keys');
+
+// Static constructors on IDBKeyRange
+['only', 'lowerBound', 'upperBound'].forEach((method) => {
+  test(
+      t => check_method(IDBKeyRange, method),
+      'IDBKeyRange ' + method + '() static with throwing/invalid keys');
+});
+
+test(
+    t => check_method(IDBKeyRange, 'bound', 2),
+    'IDBKeyRange bound() static with throwing/invalid keys');
+
+// Insertion methods on IDBObjectStore.
+['add', 'put'].forEach((method) => {
+  indexeddb_upgrade_only_test((t, db) => {
+    const out_of_line = db.createObjectStore('out-of-line keys');
+    const in_line = db.createObjectStore('in-line keys', {keyPath: 'prop'});
+    let [key, err] = throwing_key('getter');
+    assert_throws_exactly(err, () => {
+      out_of_line[method]('value', key);
+    }, 'key conversion with throwing getter should rethrow');
+
+    assert_throws_dom('DataError', () => {
+      out_of_line[method]('value', invalid_key);
+    }, 'key conversion with invalid key should throw DataError');
+
+    const value = {};
+    [value.prop, err] = throwing_key('getter');
+    assert_throws_exactly(err, () => {
+      in_line[method](value);
+    }, 'throwing getter should rethrow during clone');
+
+    // Throwing from the getter during key conversion is
+    // not possible since (1) a clone is used, (2) only own
+    // properties are cloned, and (3) only own properties
+    // are used for key path evaluation.
+
+    value.prop = invalid_key;
+    assert_throws_dom('DataError', () => {
+      in_line[method](value);
+    }, 'key conversion with invalid key should throw DataError');
+  }, `IDBObjectStore ${method}() method with throwing/invalid keys`);
+});
+
+// Generic (key-or-key-path) methods on IDBObjectStore.
+['delete',
+ 'get',
+ 'getKey',
+ 'getAll',
+ 'getAllKeys',
+ 'count',
+ 'openCursor',
+ 'openKeyCursor',
+].forEach(method => {
+  indexeddb_upgrade_only_test((t, db) => {
+    const store = db.createObjectStore('store');
+
+    check_method(store, method);
+  }, `IDBObjectStore ${method}() method with throwing/invalid keys`);
+});
+
+// Generic (key-or-key-path) methods on IDBIndex.
+['get',
+ 'getKey',
+ 'getAll',
+ 'getAllKeys',
+ 'count',
+ 'openCursor',
+ 'openKeyCursor',
+].forEach((method) => {
+  indexeddb_upgrade_only_test((t, db) => {
+    const store = db.createObjectStore('store');
+    const index = store.createIndex('index', 'keyPath');
+
+    check_method(index, method);
+  }, `IDBIndex ${method}() method with throwing/invalid keys`);
+});
diff --git a/tests/wpt/tests/IndexedDB/key-conversion-exceptions.htm b/tests/wpt/tests/IndexedDB/key-conversion-exceptions.htm
deleted file mode 100644
index 9fdab58eb12..00000000000
--- a/tests/wpt/tests/IndexedDB/key-conversion-exceptions.htm
+++ /dev/null
@@ -1,199 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>IndexedDB: Exceptions thrown during key conversion</title>
-<meta name=timeout content=long>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/support.js"></script>
-<script>
-
-// Convenience function for tests that only need to run code in onupgradeneeded.
-function indexeddb_upgrade_only_test(upgrade_callback, description) {
-  indexeddb_test(upgrade_callback, t => { t.done(); }, description);
-}
-
-// Key that throws during conversion.
-function throwing_key(name) {
-    var throws = [];
-    throws.length = 1;
-    const err = new Error('throwing from getter');
-    err.name = name;
-    Object.defineProperty(throws, '0', {get: function() {
-        throw err;
-    }, enumerable: true});
-    return [throws, err];
-}
-
-var valid_key = [];
-var invalid_key = {};
-
-// Calls method on receiver with the specified number of args (default 1)
-// and asserts that the method fails appropriately (rethrowing if
-// conversion throws, or DataError if not a valid key), and that
-// the first argument is fully processed before the second argument
-// (if appropriate).
-function check_method(receiver, method, args) {
-    args = args || 1;
-    if (args < 2) {
-        const [key, err] = throwing_key('getter');
-        assert_throws_exactly(err, () => {
-            receiver[method](key);
-        }, 'key conversion with throwing getter should rethrow');
-
-        assert_throws_dom('DataError', () => {
-            receiver[method](invalid_key);
-        }, 'key conversion with invalid key should throw DataError');
-    } else {
-        const [key1, err1] = throwing_key('getter 1');
-        const [key2, err2] = throwing_key('getter 2');
-        assert_throws_exactly(err1, () => {
-            receiver[method](key1, key2);
-        }, 'first key conversion with throwing getter should rethrow');
-
-        assert_throws_dom('DataError', () => {
-            receiver[method](invalid_key, key2);
-        }, 'first key conversion with invalid key should throw DataError');
-
-        assert_throws_exactly(err2, () => {
-            receiver[method](valid_key, key2);
-        }, 'second key conversion with throwing getter should rethrow');
-
-        assert_throws_dom('DataError', () => {
-            receiver[method](valid_key, invalid_key);
-        }, 'second key conversion with invalid key should throw DataError');
-    }
-}
-
-// Static key comparison utility on IDBFactory.
-test(t => {
-    check_method(indexedDB, 'cmp', 2);
-}, 'IDBFactory cmp() static with throwing/invalid keys');
-
-// Continue methods on IDBCursor.
-indexeddb_upgrade_only_test((t, db) => {
-    var store = db.createObjectStore('store');
-    store.put('a', 1).onerror = t.unreached_func('put should succeed');
-
-    var request = store.openCursor();
-    request.onerror = t.unreached_func('openCursor should succeed');
-    request.onsuccess = t.step_func(() => {
-        var cursor = request.result;
-        assert_not_equals(cursor, null, 'cursor should find a value');
-        check_method(cursor, 'continue');
-    });
-}, 'IDBCursor continue() method with throwing/invalid keys');
-
-indexeddb_upgrade_only_test((t, db) => {
-    var store = db.createObjectStore('store');
-    var index = store.createIndex('index', 'prop');
-    store.put({prop: 'a'}, 1).onerror = t.unreached_func('put should succeed');
-
-    var request = index.openCursor();
-    request.onerror = t.unreached_func('openCursor should succeed');
-    request.onsuccess = t.step_func(() => {
-        var cursor = request.result;
-        assert_not_equals(cursor, null, 'cursor should find a value');
-
-        check_method(cursor, 'continuePrimaryKey', 2);
-    });
-}, null, 'IDBCursor continuePrimaryKey() method with throwing/invalid keys');
-
-// Mutation methods on IDBCursor.
-indexeddb_upgrade_only_test((t, db) => {
-    var store = db.createObjectStore('store', {keyPath: 'prop'});
-    store.put({prop: 1}).onerror = t.unreached_func('put should succeed');
-
-    var request = store.openCursor();
-    request.onerror = t.unreached_func('openCursor should succeed');
-    request.onsuccess = t.step_func(() => {
-        var cursor = request.result;
-        assert_not_equals(cursor, null, 'cursor should find a value');
-
-        var value = {};
-        var err;
-        [value.prop, err] = throwing_key('getter');
-        assert_throws_exactly(err, () => {
-            cursor.update(value);
-        }, 'throwing getter should rethrow during clone');
-
-        // Throwing from the getter during key conversion is
-        // not possible since (1) a clone is used, (2) only own
-        // properties are cloned, and (3) only own properties
-        // are used for key path evaluation.
-
-        value.prop = invalid_key;
-        assert_throws_dom('DataError', () => {
-            cursor.update(value);
-        }, 'key conversion with invalid key should throw DataError');
-    });
-}, 'IDBCursor update() method with throwing/invalid keys');
-
-// Static constructors on IDBKeyRange
-['only', 'lowerBound', 'upperBound'].forEach(method => {
-    test(t => {
-        check_method(IDBKeyRange, method);
-    }, 'IDBKeyRange ' + method + '() static with throwing/invalid keys');
-});
-
-test(t => {
-    check_method(IDBKeyRange, 'bound', 2);
-}, 'IDBKeyRange bound() static with throwing/invalid keys');
-
-// Insertion methods on IDBObjectStore.
-['add', 'put'].forEach(method => {
-    indexeddb_upgrade_only_test((t, db) => {
-        var out_of_line = db.createObjectStore('out-of-line keys');
-        var in_line = db.createObjectStore('in-line keys', {keyPath: 'prop'});
-        var [key, err] = throwing_key('getter');
-        assert_throws_exactly(err, () => {
-            out_of_line[method]('value', key);
-        }, 'key conversion with throwing getter should rethrow');
-
-        assert_throws_dom('DataError', () => {
-            out_of_line[method]('value', invalid_key);
-        }, 'key conversion with invalid key should throw DataError');
-
-        var value = {};
-        [value.prop, err] = throwing_key('getter');
-        assert_throws_exactly(err, () => {
-            in_line[method](value);
-        }, 'throwing getter should rethrow during clone');
-
-        // Throwing from the getter during key conversion is
-        // not possible since (1) a clone is used, (2) only own
-        // properties are cloned, and (3) only own properties
-        // are used for key path evaluation.
-
-        value.prop = invalid_key;
-        assert_throws_dom('DataError', () => {
-            in_line[method](value);
-        }, 'key conversion with invalid key should throw DataError');
-    }, `IDBObjectStore ${method}() method with throwing/invalid keys`);
-});
-
-// Generic (key-or-key-path) methods on IDBObjectStore.
-[
-    'delete', 'get', 'getKey', 'getAll', 'getAllKeys', 'count', 'openCursor',
-    'openKeyCursor'
-].forEach(method => {
-    indexeddb_upgrade_only_test((t, db) => {
-        var store = db.createObjectStore('store');
-
-        check_method(store, method);
-    }, `IDBObjectStore ${method}() method with throwing/invalid keys`);
-});
-
-// Generic (key-or-key-path) methods on IDBIndex.
-[
-    'get', 'getKey', 'getAll', 'getAllKeys', 'count', 'openCursor',
-    'openKeyCursor'
-].forEach(method => {
-    indexeddb_upgrade_only_test((t, db) => {
-        var store = db.createObjectStore('store');
-        var index = store.createIndex('index', 'keyPath');
-
-        check_method(index, method);
-    }, `IDBIndex ${method}() method with throwing/invalid keys`);
-});
-
-</script>
diff --git a/tests/wpt/tests/IndexedDB/key_invalid.any.js b/tests/wpt/tests/IndexedDB/key_invalid.any.js
new file mode 100644
index 00000000000..2d673ed5e91
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/key_invalid.any.js
@@ -0,0 +1,134 @@
+// META: global=window,worker
+// META: title=Invalid key
+// META: script=resources/support.js
+
+// Spec: https://w3c.github.io/IndexedDB/#key-construct
+
+'use strict';
+
+const invalid_key = (desc, key) => {
+  async_test(t => {
+    const db = createdb_for_multiple_tests();
+    let objStore = null;
+    let objStore2 = null;
+
+    const is_cloneable = o => {
+      try {
+        self.postMessage(o, '*');
+        return true;
+      } catch (ex) {
+        return false;
+      }
+    };
+
+    db.setTest(t).onupgradeneeded = t.step_func(e => {
+      objStore = objStore || e.target.result.createObjectStore('store');
+      assert_throws_dom('DataError', () => {
+        objStore.add('value', key);
+      });
+
+      if (is_cloneable(key)) {
+        objStore2 = objStore2 || e.target.result.createObjectStore('store2', {
+          keyPath: ['x', 'keypath'],
+        });
+        assert_throws_dom('DataError', () => {
+          objStore.add('value', key);
+        });
+      }
+      t.done();
+    });
+  }, 'Invalid key - ' + desc);
+};
+
+const fake_array = {
+  length: 0,
+  constructor: Array,
+};
+
+const ArrayClone = function() {};
+ArrayClone.prototype = Array;
+const ArrayClone_instance = new ArrayClone();
+
+// booleans
+invalid_key('true', true);
+invalid_key('false', false);
+
+// null/NaN/undefined
+invalid_key('null', null);
+invalid_key('NaN', NaN);
+invalid_key('undefined', undefined);
+invalid_key('undefined2');
+
+// functions
+invalid_key('function() {}', function() {});
+
+// objects
+invalid_key('{}', {});
+invalid_key('{ obj: 1 }', {obj: 1});
+invalid_key('Math', Math);
+invalid_key('self', self);
+invalid_key('{length:0,constructor:Array}', fake_array);
+invalid_key('Array clone’s instance', ArrayClone_instance);
+invalid_key('Array (object)', Array);
+invalid_key('String (object)', String);
+invalid_key('new String()', new String());
+invalid_key('new Number()', new Number());
+invalid_key('new Boolean()', new Boolean());
+
+// arrays
+invalid_key('[{}]', [{}]);
+invalid_key('[[], [], [], [[ Date ]]]', [[], [], [], [[Date]]]);
+invalid_key('[undefined]', [undefined]);
+invalid_key('[,1]', [, 1]);
+
+if (typeof document !== 'undefined') {
+  invalid_key(
+      'document.getElementsByTagName("script")',
+      document.getElementsByTagName('script'));
+}
+
+//  dates
+invalid_key('new Date(NaN)', new Date(NaN));
+invalid_key('new Date(Infinity)', new Date(Infinity));
+
+// regexes
+invalid_key('/foo/', /foo/);
+invalid_key('new RegExp()', new RegExp());
+
+const sparse = [];
+sparse[10] = 'hei';
+invalid_key('sparse array', sparse);
+
+const sparse2 = [];
+sparse2[0] = 1;
+sparse2[''] = 2;
+sparse2[2] = 3;
+invalid_key('sparse array 2', sparse2);
+
+invalid_key('[[1], [3], [7], [[ sparse array ]]]', [
+  [1],
+  [3],
+  [7],
+  [[sparse2]],
+]);
+
+// sparse3
+invalid_key('[1,2,3,,]', [
+  1,
+  2,
+  3,
+  ,
+]);
+
+const recursive = [];
+recursive.push(recursive);
+invalid_key('array directly contains self', recursive);
+
+const recursive2 = [];
+recursive2.push([recursive2]);
+invalid_key('array indirectly contains self', recursive2);
+
+const recursive3 = [recursive];
+invalid_key('array member contains self', recursive3);
+
+invalid_key('proxy of an array', new Proxy([1, 2, 3], {}));
diff --git a/tests/wpt/tests/IndexedDB/key_invalid.htm b/tests/wpt/tests/IndexedDB/key_invalid.htm
deleted file mode 100644
index cf649b07d05..00000000000
--- a/tests/wpt/tests/IndexedDB/key_invalid.htm
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE html>
-<!-- Submitted from TestTWF Paris -->
-<meta charset=utf-8">
-<title>Invalid key</title>
-<link rel=help href="http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#key-construct">
-<link rel=assert title="A value is said to be a valid key if it is one of the following types: Array JavaScript objects [ECMA-262], DOMString [WEBIDL], Date [ECMA-262] or float [WEBIDL]. However Arrays are only valid keys if every item in the array is defined and is a valid key (i.e. sparse arrays can not be valid keys) and if the Array doesn't directly or indirectly contain itself. Any non-numeric properties are ignored, and thus does not affect whether the Array is a valid key. Additionally, if the value is of type float, it is only a valid key if it is not NaN, and if the value is of type Date it is only a valid key if its [[PrimitiveValue]] internal property, as defined by [ECMA-262], is not NaN. Conforming user agents must support all valid keys as keys.">
-<!-- original author -->
-<link rel=author href="mailto:odinho@opera.com" title="Odin Hørthe Omdal">
-<!-- some additions by Baptiste Fontaine (batifon@yahoo.fr) -->
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=resources/support.js></script>
-
-<script>
-    var db        = createdb_for_multiple_tests(),
-        // cache for ObjectStores
-        objStore  = null,
-        objStore2 = null;
-
-    function is_cloneable(o) {
-        try {
-            self.postMessage(o, '*');
-            return true;
-        } catch (ex) {
-            return false;
-        }
-    }
-
-    function invalid_key(desc, key) {
-        var t = async_test(document.title + " - " + desc);
-
-        // set the current test, and run it
-        db.setTest(t).onupgradeneeded = function(e) {
-            objStore = objStore || e.target.result.createObjectStore("store");
-            assert_throws_dom('DataError', function() {
-                objStore.add("value", key);
-            });
-
-            if (is_cloneable(key)) {
-                objStore2 = objStore2 || e.target.result.createObjectStore("store2", { keyPath: ["x", "keypath"] });
-                assert_throws_dom('DataError', function() {
-                    objStore2.add({ x: "value", keypath: key });
-                });
-            }
-            this.done();
-        };
-    }
-
-    var fake_array = {
-        length      : 0,
-        constructor : Array
-    };
-
-    var ArrayClone = function(){};
-    ArrayClone.prototype = Array;
-    var ArrayClone_instance = new ArrayClone();
-
-    // booleans
-    invalid_key( 'true'  , true );
-    invalid_key( 'false' , false );
-
-    // null/NaN/undefined
-    invalid_key( 'null'      , null );
-    invalid_key( 'NaN'       , NaN );
-    invalid_key( 'undefined' , undefined );
-    invalid_key( 'undefined2');
-
-    // functions
-    invalid_key( 'function() {}', function(){} );
-
-    // objects
-    invalid_key( '{}'                           , {} );
-    invalid_key( '{ obj: 1 }'                   , { obj: 1 });
-    invalid_key( 'Math'                         , Math );
-    invalid_key( 'window'                       , window );
-    invalid_key( '{length:0,constructor:Array}' , fake_array );
-    invalid_key( 'Array clone’s instance'       , ArrayClone_instance );
-    invalid_key( 'Array (object)'               , Array );
-    invalid_key( 'String (object)'              , String );
-    invalid_key( 'new String()'                 , new String() );
-    invalid_key( 'new Number()'                 , new Number() );
-    invalid_key( 'new Boolean()'                , new Boolean() );
-
-    // arrays
-    invalid_key( '[{}]'                     , [{}] );
-    invalid_key( '[[], [], [], [[ Date ]]]' , [ [], [], [], [[ Date ]] ] );
-    invalid_key( '[undefined]'              , [undefined] );
-    invalid_key( '[,1]'                     , [,1] );
-
-    invalid_key( 'document.getElements'
-                +'ByTagName("script")'      , document.getElementsByTagName("script") );
-
-    //  dates
-    invalid_key( 'new Date(NaN)'      , new Date(NaN) );
-    invalid_key( 'new Date(Infinity)' , new Date(Infinity) );
-
-    // regexes
-    invalid_key( '/foo/'        , /foo/ );
-    invalid_key( 'new RegExp()' , new RegExp() );
-
-    var sparse = [];
-    sparse[10] = "hei";
-    invalid_key('sparse array', sparse);
-
-    var sparse2 = [];
-    sparse2[0]  = 1;
-    sparse2[""] = 2;
-    sparse2[2]  = 3;
-    invalid_key('sparse array 2', sparse2);
-
-    invalid_key('[[1], [3], [7], [[ sparse array ]]]', [ [1], [3], [7], [[ sparse2 ]] ]);
-
-    // sparse3
-    invalid_key( '[1,2,3,,]', [1,2,3,,] );
-
-    var recursive = [];
-    recursive.push(recursive);
-    invalid_key('array directly contains self', recursive);
-
-    var recursive2 = [];
-    recursive2.push([recursive2]);
-    invalid_key('array indirectly contains self', recursive2);
-
-    var recursive3 = [recursive];
-    invalid_key('array member contains self', recursive3);
-
-    invalid_key('proxy of an array', new Proxy([1,2,3], {}));
-
-</script>
-
-<div id=log></div>
diff --git a/tests/wpt/tests/IndexedDB/key_valid.any.js b/tests/wpt/tests/IndexedDB/key_valid.any.js
new file mode 100644
index 00000000000..8c015d331ba
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/key_valid.any.js
@@ -0,0 +1,68 @@
+// META: global=window,worker
+// META: title=Valid key
+// META: script=resources/support.js
+
+// Spec: https://w3c.github.io/IndexedDB/#key-construct
+
+'use strict';
+
+const valid_key = (desc, key) => {
+  async_test(t => {
+    let db;
+    const open_rq = createdb(t);
+    open_rq.onupgradeneeded = t.step_func(e => {
+      db = e.target.result;
+      const store = db.createObjectStore('store');
+      assert_true(store.add('value', key) instanceof IDBRequest);
+
+      const store2 = db.createObjectStore('store2', {
+        keyPath: ['x', 'keypath'],
+      });
+      assert_true(store2.add({x: 'v', keypath: key}) instanceof IDBRequest);
+    });
+
+    open_rq.onsuccess = t.step_func(e => {
+      const rq =
+          db.transaction('store', 'readonly').objectStore('store').get(key);
+      rq.onsuccess = t.step_func(e => {
+        assert_equals(e.target.result, 'value');
+        const rq2 =
+            db.transaction('store2', 'readonly').objectStore('store2').get([
+              'v', key
+            ]);
+        rq2.onsuccess = t.step_func(e => {
+          assert_equals(e.target.result.x, 'v');
+          assert_key_equals(e.target.result.keypath, key);
+          t.done();
+        });
+      });
+    });
+  }, 'Valid key - ' + desc);
+};
+
+// Date
+valid_key('new Date()', new Date());
+valid_key('new Date(0)', new Date(0));
+
+// Array
+valid_key('[]', []);
+valid_key('new Array()', new Array());
+
+valid_key('["undefined"]', ['undefined']);
+
+// Float
+valid_key('Infinity', Infinity);
+valid_key('-Infinity', -Infinity);
+valid_key('0', 0);
+valid_key('1.5', 1.5);
+valid_key('3e38', 3e38);
+valid_key('3e-38', 3e38);
+
+// String
+valid_key('"foo"', 'foo');
+valid_key('"\\n"', '\n');
+valid_key('""', '');
+valid_key('"\\""', '"');
+valid_key('"\\u1234"', '\u1234');
+valid_key('"\\u0000"', '\u0000');
+valid_key('"NaN"', 'NaN');
diff --git a/tests/wpt/tests/IndexedDB/key_valid.html b/tests/wpt/tests/IndexedDB/key_valid.html
deleted file mode 100644
index 0cca54cdbb3..00000000000
--- a/tests/wpt/tests/IndexedDB/key_valid.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE html>
-<!-- Submitted from TestTWF Paris -->
-<meta charset=utf-8">
-<meta name="timeout" content="long">
-<title>Valid key</title>
-<link rel=help href="http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#key-construct">
-<link rel=assert title="A value is said to be a valid key if it is one of the following types: Array JavaScript objects [ECMA-262], DOMString [WEBIDL], Date [ECMA-262] or float [WEBIDL]. However Arrays are only valid keys if every item in the array is defined and is a valid key (i.e. sparse arrays can not be valid keys) and if the Array doesn't directly or indirectly contain itself. Any non-numeric properties are ignored, and thus does not affect whether the Array is a valid key. Additionally, if the value is of type float, it is only a valid key if it is not NaN, and if the value is of type Date it is only a valid key if its [[PrimitiveValue]] internal property, as defined by [ECMA-262], is not NaN. Conforming user agents must support all valid keys as keys.">
-<link rel=author href="mailto:batifon@yahoo.fr" title="Baptiste Fontaine">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=resources/support.js></script>
-
-<script>
-    function valid_key(desc, key) {
-        var db;
-        var t = async_test(document.title + " - " + desc);
-        var open_rq = createdb(t);
-
-        open_rq.onupgradeneeded = function(e) {
-            db = e.target.result;
-
-            store = db.createObjectStore("store");
-            assert_true(store.add('value', key) instanceof IDBRequest);
-
-            store2 = db.createObjectStore("store2", { keyPath: ["x", "keypath"] });
-            assert_true(store2.add({ x: 'v', keypath: key }) instanceof IDBRequest);
-        };
-        open_rq.onsuccess = function(e) {
-            var rq = db.transaction("store", "readonly")
-                       .objectStore("store")
-                       .get(key)
-            rq.onsuccess = t.step_func(function(e) {
-                assert_equals(e.target.result, 'value')
-                var rq = db.transaction("store2", "readonly")
-                           .objectStore("store2")
-                           .get(['v', key])
-                rq.onsuccess = t.step_func(function(e) {
-                    assert_equals(e.target.result.x, 'v');
-                    assert_key_equals(e.target.result.keypath, key);
-                    t.done()
-                })
-            })
-        }
-    }
-
-    // Date
-    valid_key( 'new Date()'    , new Date() );
-    valid_key( 'new Date(0)'   , new Date(0) );
-
-    // Array
-    valid_key( '[]'            , [] );
-    valid_key( 'new Array()'   , new Array() );
-
-    valid_key( '["undefined"]' , ['undefined'] );
-
-    // Float
-    valid_key( 'Infinity'      , Infinity );
-    valid_key( '-Infinity'     , -Infinity );
-    valid_key( '0'             , 0 );
-    valid_key( '1.5'           , 1.5 );
-    valid_key( '3e38'          , 3e38 );
-    valid_key( '3e-38'         , 3e38 );
-
-    // String
-    valid_key( '"foo"'         , "foo" );
-    valid_key( '"\\n"'         , "\n" );
-    valid_key( '""'            , "" );
-    valid_key( '"\\""'         , "\"" );
-    valid_key( '"\\u1234"'     , "\u1234" );
-    valid_key( '"\\u0000"'     , "\u0000" );
-    valid_key( '"NaN"'         , "NaN" );
-
-</script>
-
-<div id=log></div>
diff --git a/tests/wpt/tests/IndexedDB/keyorder.any.js b/tests/wpt/tests/IndexedDB/keyorder.any.js
new file mode 100644
index 00000000000..fe3eb11fa92
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/keyorder.any.js
@@ -0,0 +1,169 @@
+// META: global=window,worker
+// META: title=Key sort order
+// META: script=resources/support.js
+
+// Spec: https://w3c.github.io/IndexedDB/#key-construct
+
+'use strict';
+
+const global_db = createdb_for_multiple_tests();
+
+const keysort = (desc, unsorted, expected) => {
+  async_test(t => {
+    const store_name = 'store-' + Date.now() + Math.random();
+
+    // The database test
+    const open_rq = global_db.setTest(t);
+    open_rq.onupgradeneeded = t.step_func(e => {
+      const db = e.target.result;
+      const objStore = db.createObjectStore(store_name);
+
+      for (let i = 0; i < unsorted.length; i++)
+        objStore.add('value', unsorted[i]);
+    });
+
+    open_rq.onsuccess = t.step_func(e => {
+      const db = e.target.result;
+      const actual_keys = [];
+      const rq =
+          db.transaction(store_name).objectStore(store_name).openCursor();
+
+      rq.onsuccess = t.step_func(e => {
+        const cursor = e.target.result;
+
+        if (cursor) {
+          actual_keys.push(cursor.key);
+          cursor.continue();
+        } else {
+          assert_key_equals(actual_keys, expected, 'keyorder array');
+          assert_equals(actual_keys.length, expected.length, 'array length');
+
+          t.done();
+        }
+      });
+    });
+  }, `Database readback sort - ${desc}`);
+
+  // The IDBKey.cmp test
+  test(() => {
+    const sorted = unsorted.slice(0).sort((a, b) => indexedDB.cmp(a, b));
+    assert_key_equals(sorted, expected, 'sorted array');
+  }, `IDBKey.cmp sort - ${desc}`);
+};
+
+const now = new Date();
+const one_sec_ago = new Date(now - 1000);
+const one_min_future = new Date(now.getTime() + 1000 * 60);
+
+keysort('String < Array', [[0], 'yo', '', []], ['', 'yo', [], [0]]);
+
+keysort(
+    'float < String', [Infinity, 'yo', 0, '', 100],
+    [0, 100, Infinity, '', 'yo']);
+
+keysort(
+    'float < Date', [now, 0, 9999999999999, -0.22],
+    [-0.22, 0, 9999999999999, now]);
+
+keysort(
+    'float < Date < String < Array', [[], '', now, [0], '-1', 0, 9999999999999],
+    [0, 9999999999999, now, '', '-1', [], [0]]);
+
+keysort(
+    'Date(1 sec ago) < Date(now) < Date(1 minute in future)',
+    [now, one_sec_ago, one_min_future], [one_sec_ago, now, one_min_future]);
+
+keysort(
+    '-1.1 < 1 < 1.01337 < 1.013373 < 2', [1.013373, 2, 1.01337, -1.1, 1],
+    [-1.1, 1, 1.01337, 1.013373, 2]);
+
+keysort(
+    '-Infinity < -0.01 < 0 < Infinity', [0, -0.01, -Infinity, Infinity],
+    [-Infinity, -0.01, 0, Infinity]);
+
+keysort(
+    '"" < "a" < "ab" < "b" < "ba"', ['a', 'ba', '', 'b', 'ab'],
+    ['', 'a', 'ab', 'b', 'ba']);
+
+keysort(
+    'Arrays', [[[0]], [0], [], [0, 0], [0, [0]]],
+    [[], [0], [0, 0], [0, [0]], [[0]]]);
+
+const big_array = [];
+const bigger_array = [];
+for (let i = 0; i < 10000; i++) {
+  big_array.push(i);
+  bigger_array.push(i);
+}
+bigger_array.push(0);
+
+keysort(
+    'Array.length: 10,000 < Array.length: 10,001',
+    [bigger_array, [0, 2, 3], [0], [9], big_array],
+    [[0], big_array, bigger_array, [0, 2, 3], [9]]);
+
+keysort(
+    'Infinity inside arrays',
+    [
+      [Infinity, 1],
+      [Infinity, Infinity],
+      [1, 1],
+      [1, Infinity],
+      [1, -Infinity],
+      [-Infinity, Infinity],
+    ],
+    [
+      [-Infinity, Infinity],
+      [1, -Infinity],
+      [1, 1],
+      [1, Infinity],
+      [Infinity, 1],
+      [Infinity, Infinity],
+    ]);
+
+keysort(
+    'Test different stuff at once',
+    [
+      now,
+      [0, []],
+      'test',
+      1,
+      ['a', [1, [-1]]],
+      ['b', 'a'],
+      [0, 2, 'c'],
+      ['a', [1, 2]],
+      [],
+      [0, [], 3],
+      ['a', 'b'],
+      [1, 2],
+      ['a', 'b', 'c'],
+      one_sec_ago,
+      [0, 'b', 'c'],
+      Infinity,
+      -Infinity,
+      2.55,
+      [0, now],
+      [1],
+    ],
+    [
+      -Infinity,
+      1,
+      2.55,
+      Infinity,
+      one_sec_ago,
+      now,
+      'test',
+      [],
+      [0, 2, 'c'],
+      [0, now],
+      [0, 'b', 'c'],
+      [0, []],
+      [0, [], 3],
+      [1],
+      [1, 2],
+      ['a', 'b'],
+      ['a', 'b', 'c'],
+      ['a', [1, 2]],
+      ['a', [1, [-1]]],
+      ['b', 'a'],
+    ]);
diff --git a/tests/wpt/tests/IndexedDB/keyorder.htm b/tests/wpt/tests/IndexedDB/keyorder.htm
deleted file mode 100644
index 7e8b3d41264..00000000000
--- a/tests/wpt/tests/IndexedDB/keyorder.htm
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html>
-<!-- Submitted from TestTWF Paris -->
-<meta charset="utf-8">
-<title>Key sort order</title>
-<link rel=help href="http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#key-construct">
-<link rel=assert title="For purposes of comparison, all Arrays are greater than all DOMString, Date and float values; all DOMString values are greater than all Date and float values; and all Date values are greater than all float values. Values of type float are compared to other float values numerically. Values of type Date are compared to other Date values chronologically. Values of type DOMString are compared to other values of type DOMString by using the algorithm defined by step 4 of section 11.8.5, The Abstract Relational Comparison Algorithm, of the ECMAScript Language Specification [ECMA-262]. Values of type Array are compared to other values of type Array as follows:
-
-1. Let A be the first Array value and B be the second Array value.
-2. Let length be the lesser of A's length and B's length.
-3. Let i be 0.
-4. If the ith value of A is less than the ith value of B, then A is less than B. Skip the remaining steps.
-5. If the ith value of A is greater than the ith value of B, then A is greater than B. Skip the remaining steps.
-6. Increase i by 1.
-7. If i is not equal to length, go back to step 4. Otherwise continue to next step.
-8. If A's length is less than B's length, then A is less than B. If A's length is greater than B's length, then A is greater than B. Otherwise A and B are equal.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/support.js"></script>
-
-<script>
-    var global_db = createdb_for_multiple_tests();
-
-    function keysort(desc, unsorted, expected) {
-        var db,
-            t = async_test("Database readback sort - " + desc),
-            store_name = 'store-' + Date.now() + Math.random();
-
-        // The database test
-        var open_rq = global_db.setTest(t);
-        open_rq.onupgradeneeded = function(e) {
-            db = e.target.result;
-            var objStore = db.createObjectStore(store_name);
-
-            for (var i = 0; i < unsorted.length; i++)
-                objStore.add("value", unsorted[i]);
-        };
-
-        open_rq.onsuccess = function(e) {
-            var actual_keys = [],
-              rq = db.transaction(store_name)
-                     .objectStore(store_name)
-                     .openCursor();
-
-            rq.onsuccess = t.step_func(function(e) {
-                var cursor = e.target.result;
-
-                if (cursor) {
-                    actual_keys.push(cursor.key);
-                    cursor.continue();
-                }
-                else {
-                    assert_key_equals(actual_keys, expected, "keyorder array");
-                    assert_equals(actual_keys.length, expected.length, "array length");
-
-                    t.done();
-                }
-            });
-        };
-
-        // The IDBKey.cmp test
-        test(function () {
-            var sorted = unsorted.slice(0).sort(function(a, b) { return indexedDB.cmp(a, b)});
-            assert_key_equals(sorted, expected, "sorted array");
-
-        }, "IDBKey.cmp sorted - " + desc);
-    }
-
-    var now = new Date(),
-        one_sec_ago = new Date(now - 1000),
-        one_min_future = new Date(now.getTime() + (1000*60));
-
-    keysort('String < Array',
-        [ [0], "yo", "", [] ],
-        [ "", "yo", [], [0] ]);
-
-    keysort('float < String',
-        [ Infinity, "yo", 0, "", 100 ],
-        [ 0, 100, Infinity, "", "yo" ]);
-
-    keysort('float < Date',
-        [ now, 0, 9999999999999, -0.22 ],
-        [ -0.22, 0, 9999999999999, now ]);
-
-    keysort('float < Date < String < Array',
-        [ [], "", now, [0], "-1", 0, 9999999999999, ],
-        [ 0, 9999999999999, now, "", "-1", [], [0] ]);
-
-
-    keysort('Date(1 sec ago) < Date(now) < Date(1 minute in future)',
-        [ now, one_sec_ago, one_min_future ],
-        [ one_sec_ago, now, one_min_future ]);
-
-    keysort('-1.1 < 1 < 1.01337 < 1.013373 < 2',
-        [ 1.013373, 2, 1.01337, -1.1, 1 ],
-        [ -1.1, 1, 1.01337, 1.013373, 2 ]);
-
-    keysort('-Infinity < -0.01 < 0 < Infinity',
-        [ 0, -0.01, -Infinity, Infinity ],
-        [ -Infinity, -0.01, 0, Infinity ]);
-
-    keysort('"" < "a" < "ab" < "b" < "ba"',
-        [ "a", "ba", "", "b", "ab" ],
-        [ "", "a", "ab", "b", "ba" ]);
-
-    keysort('Arrays',
-        [ [[0]], [0], [], [0, 0], [0, [0]] ],
-        [ [], [0], [0, 0], [0, [0]], [[0]] ]);
-
-    var big_array = [], bigger_array = [];
-    for (var i=0; i < 10000; i++) {
-        big_array.push(i);
-        bigger_array.push(i);
-    }
-    bigger_array.push(0);
-
-    keysort('Array.length: 10,000 < Array.length: 10,001',
-        [ bigger_array, [0, 2, 3], [0], [9], big_array ],
-        [ [0], big_array, bigger_array, [0, 2, 3], [9] ]);
-
-    keysort('Infinity inside arrays',
-        [ [Infinity, 1], [Infinity, Infinity], [1, 1],
-            [1, Infinity], [1, -Infinity], [-Infinity, Infinity] ],
-        [ [-Infinity, Infinity], [1, -Infinity], [1, 1],
-            [1, Infinity], [Infinity, 1], [Infinity, Infinity] ]);
-
-
-    keysort('Test different stuff at once',
-        [
-          now,
-          [0, []],
-          "test",
-          1,
-          ["a", [1, [-1]]],
-          ["b", "a"],
-          [ 0, 2, "c"],
-          ["a", [1, 2]],
-          [],
-          [0, [], 3],
-          ["a", "b"],
-          [ 1, 2 ],
-          ["a", "b", "c"],
-          one_sec_ago,
-          [ 0, "b", "c"],
-          Infinity,
-          -Infinity,
-          2.55,
-          [ 0, now ],
-          [1]
-        ],
-        [
-          -Infinity,
-          1,
-          2.55,
-          Infinity,
-          one_sec_ago,
-          now,
-          "test",
-          [],
-          [0 ,2, "c"],
-          [0, now],
-          [0, "b", "c"],
-          [0, []],
-          [0, [], 3],
-          [1],
-          [1, 2],
-          ["a", "b"],
-          ["a", "b", "c"],
-          ["a", [1, 2]],
-          ["a", [1, [-1]]],
-          ["b", "a"]
-        ]);
-
-</script>
-
-<div id="log"></div>
diff --git a/tests/wpt/tests/IndexedDB/worker-termination-aborts-upgrade.window.js b/tests/wpt/tests/IndexedDB/worker-termination-aborts-upgrade.window.js
index e84ca2c2a64..c2d8d91787e 100644
--- a/tests/wpt/tests/IndexedDB/worker-termination-aborts-upgrade.window.js
+++ b/tests/wpt/tests/IndexedDB/worker-termination-aborts-upgrade.window.js
@@ -50,7 +50,7 @@ promise_test(async t => {
 
   // At this point we know that the open request was issued on the worker
   // worker thread.  An ordering concern at this point is that IDB only
-  // specifies that the the connection opening algorithm is run in parallel and
+  // specifies that the connection opening algorithm is run in parallel and
   // we are not guaranteed that when we go "in parallel" here that our operation
   // won't run first.  As such, it may be necessary to add some kind of
   // arbitrary delay in the future if implementations do not effectively
diff --git a/tests/wpt/tests/WebCryptoAPI/idlharness.https.any.js b/tests/wpt/tests/WebCryptoAPI/idlharness.https.any.js
index ae65eb49f21..5ddf7eab6db 100644
--- a/tests/wpt/tests/WebCryptoAPI/idlharness.https.any.js
+++ b/tests/wpt/tests/WebCryptoAPI/idlharness.https.any.js
@@ -5,7 +5,7 @@
 // https://w3c.github.io/webcrypto/Overview.html
 
 idl_test(
-  ['WebCryptoAPI'],
+  ['webcrypto'],
   ['html', 'dom'],
   idl_array => {
     idl_array.add_objects({
diff --git a/tests/wpt/tests/WebCryptoAPI/import_export/importKey_failures.js b/tests/wpt/tests/WebCryptoAPI/import_export/importKey_failures.js
index 453461a8771..39c70a85470 100644
--- a/tests/wpt/tests/WebCryptoAPI/import_export/importKey_failures.js
+++ b/tests/wpt/tests/WebCryptoAPI/import_export/importKey_failures.js
@@ -213,7 +213,7 @@ function run_test(algorithmNames) {
         allAlgorithmSpecifiersFor(name).forEach(function(algorithm) {
             getValidKeyData(algorithm).forEach(function(test) {
                 if (test.format === "jwk") {
-                    var data = {crv: test.data.crv, kty: test.data.kty, d: test.data.d, x: test.data.x, d: test.data.d};
+                    var data = {crv: test.data.crv, kty: test.data.kty, d: test.data.d, x: test.data.x, y: test.data.y};
                     data.kty = getMismatchedKtyField(algorithm);
                     var usages =  validUsages(vector, 'jwk', test.data);
                     testError('jwk', algorithm, data, name, usages, true, "DataError", "Invalid 'kty' field");
@@ -228,7 +228,7 @@ function run_test(algorithmNames) {
         allAlgorithmSpecifiersFor(name).forEach(function(algorithm) {
             getValidKeyData(algorithm).forEach(function(test) {
                 if (test.format === "jwk") {
-                    var data = {crv: test.data.crv, kty: test.data.kty, d: test.data.d, x: test.data.x, d: test.data.d};
+                    var data = {crv: test.data.crv, kty: test.data.kty, d: test.data.d, x: test.data.x, y: test.data.y};
                     data.ext = false;
                     var usages =  validUsages(vector, 'jwk', test.data);
                     testError('jwk', algorithm, data, name, usages, true, "DataError", "Import from a non-extractable");
@@ -259,7 +259,7 @@ function run_test(algorithmNames) {
         allAlgorithmSpecifiersFor(name).forEach(function(algorithm) {
             getValidKeyData(algorithm).forEach(function(test) {
                 if (test.format === "jwk") {
-                    var data = {crv: test.data.crv, kty: test.data.kty, d: test.data.d, x: test.data.x, d: test.data.d};
+                    var data = {crv: test.data.crv, kty: test.data.kty, d: test.data.d, x: test.data.x, y: test.data.y};
                     data.crv = getMismatchedCrvField(algorithm)
                     var usages =  validUsages(vector, 'jwk', test.data);
                     testError('jwk', algorithm, data, name, usages, true, "DataError", "Invalid 'crv' field");
@@ -267,4 +267,23 @@ function run_test(algorithmNames) {
             });
         });
     });
+
+    // Use an 'alg' field with incorrect casing.
+    testVectors.forEach(function(vector) {
+        var name = vector.name;
+        if (name !== "Ed25519" && name !== "Ed448")
+            return; // The rest ignore the 'alg' field.
+        allAlgorithmSpecifiersFor(name).forEach(function(algorithm) {
+            getValidKeyData(algorithm).forEach(function(test) {
+                if (test.format === "jwk") {
+                    var data = {crv: test.data.crv, kty: test.data.kty, d: test.data.d, x: test.data.x, y: test.data.y};
+                    var usages =  validUsages(vector, 'jwk', test.data);
+                    [name.toLowerCase(), name.toUpperCase()].forEach(function(algName) {
+                        data.alg = algName;
+                        testError('jwk', algorithm, data, name, usages, true, "DataError", "Invalid 'alg' field '" + data.alg + "'");
+                    });
+                }
+            });
+        });
+    });
 }
diff --git a/tests/wpt/tests/accname/META.yml b/tests/wpt/tests/accname/META.yml
index 7f538628e8c..77520928494 100644
--- a/tests/wpt/tests/accname/META.yml
+++ b/tests/wpt/tests/accname/META.yml
@@ -4,3 +4,4 @@ suggested_reviewers:
   - spectranaut
   - jnurthen
   - melsumner
+  - sideshowbarker
diff --git a/tests/wpt/tests/accname/manual/description_test_case_557-manual.html b/tests/wpt/tests/accname/manual/description_test_case_557-manual.html
index 1294baf6571..e228f857ac4 100644
--- a/tests/wpt/tests/accname/manual/description_test_case_557-manual.html
+++ b/tests/wpt/tests/accname/manual/description_test_case_557-manual.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Description test case 557</title>
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
+    <meta charset="utf-8">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/tests/accname/name/comp_labeledby_non_standard.html b/tests/wpt/tests/accname/name/comp_labeledby_non_standard.html
new file mode 100644
index 00000000000..f86a62b34ef
--- /dev/null
+++ b/tests/wpt/tests/accname/name/comp_labeledby_non_standard.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<html>
+<head>
+  <title>Name Comp: aria-labeledby (non-standard)</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<body>
+
+<p>Tests that the non-standard (misspelled) attribute name <code>aria-labeledby</code> is not supported.</p>
+
+<h2>Tests for <code>aria-labeledby</code></h2>
+
+<div role="group" aria-labeledby="h" class="ex" data-expectedlabel="" data-testname="div group with aria-labeledby">
+  <h2 id="h">first heading</h2>
+  <p>text inside div group</p>
+</div>
+
+<div role="group" aria-label="self label" id="g2" aria-labeledby="g2 h2" class="ex" data-expectedlabel="self label" data-testname="div group with aria-label and aria-labeledby">
+  <h2 id="h2">+ first heading</h2>
+  <p>text inside div group</p>
+</div>
+
+<div role="group" aria-labeledby="h2" aria-labelledby="p3" class="ex" data-expectedlabel="text inside div group" data-testname="div group with aria-labeledby and aria-labelledby">
+  <h2 id="h3">+ first heading</h2>
+  <p id="p3">text inside div group</p>
+</div>
+
+<script>
+AriaUtils.verifyLabelsBySelector(".ex");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/ai/language_detection/availability-detached-crash.https.html b/tests/wpt/tests/ai/language_detection/availability-detached-crash.https.html
new file mode 100644
index 00000000000..ee5e27e35b6
--- /dev/null
+++ b/tests/wpt/tests/ai/language_detection/availability-detached-crash.https.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<title>Assures no crash upon call of LanguageDetector.availability() on a detached document</title>
+<link rel="author" href="mailto:christinesm@chromium.org">
+<link rel="help" href="https://issues.chromium.org/issues/384233287">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<body>
+<iframe src="about:blank"></iframe>
+<script>
+const iframe = frames[0];
+await test_driver.bless('Create LanguageDetector', null, iframe);
+
+const factory = iframe.LanguageDetector;
+const detectorPromise = await factory.create();
+document.getElementsByTagName("iframe")[0].remove();
+
+factory.availability();
+detectorPromise.then(detector => detector.detect());
+</script>
+</body>
diff --git a/tests/wpt/tests/ai/language_detection/availability-detached-crash.tentative.https.html b/tests/wpt/tests/ai/language_detection/availability-detached-crash.tentative.https.html
deleted file mode 100644
index 8dd685d990a..00000000000
--- a/tests/wpt/tests/ai/language_detection/availability-detached-crash.tentative.https.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<title>Assures no crash upon call of LanguageDetector.availability() on a detached document</title>
-<link rel="author" href="mailto:christinesm@chromium.org">
-<link rel="help" href="https://issues.chromium.org/issues/384233287">
-<body>
-<iframe src="about:blank"></iframe>
-<script>
-const factory = frames[0].ai.languageDetector;
-const detector = factory.create();
-document.getElementsByTagName("iframe")[0].remove();
-detector.availability();
-</script>
-</body>
diff --git a/tests/wpt/tests/ai/language_detection/detector-iframe.https.html b/tests/wpt/tests/ai/language_detection/detector-iframe.https.html
new file mode 100644
index 00000000000..9dc39d44a00
--- /dev/null
+++ b/tests/wpt/tests/ai/language_detection/detector-iframe.https.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<meta name="timeout" content="long">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<body></body>
+<script>
+'use strict';
+
+const { HTTPS_ORIGIN, HTTPS_NOTSAMESITE_ORIGIN } = get_host_info();
+const PATH = location.pathname.substring(0, location.pathname.lastIndexOf('/') + 1);
+const IFRAME_PATH = PATH + 'resources/iframe-helper.html';
+
+const getId = (() => {
+  let idCount = 0;
+  return () => idCount++;
+})();
+
+function run_iframe_test(iframe, test_name) {
+  const id = getId();
+  iframe.contentWindow.postMessage({id, type: test_name}, '*');
+  const {promise, resolve, reject} = Promise.withResolvers();
+
+  window.onmessage = message => {
+    if (message.data.id !== id){
+      return;
+    }
+
+    if (message.data.success) {
+      resolve(message.data.success);
+    } else {
+      reject(message.data.err)
+    }
+  }
+
+  return promise;
+}
+
+function load_iframe(src, permission_policy) {
+  let iframe = document.createElement('iframe');
+  const {promise, resolve} = Promise.withResolvers();
+
+  iframe.onload = () => {
+    resolve(iframe);
+  }
+  iframe.src = src;
+  iframe.allow = permission_policy;
+  document.body.appendChild(iframe);
+
+  return promise;
+}
+
+promise_test(async t => {
+  const src = HTTPS_NOTSAMESITE_ORIGIN + IFRAME_PATH;
+  const iframe = await load_iframe(src, /*permission_policy=*/"");
+  await promise_rejects_dom(t, 'NotAllowedError',
+    run_iframe_test(iframe, "LanguageDetectorCreate"));
+}, "Throw a 'NotAllowedError' when creating Language Detector within cross-origin iframe");
+
+promise_test(async t => {
+  const src = HTTPS_NOTSAMESITE_ORIGIN + IFRAME_PATH;
+  const iframe = await load_iframe(src, "language-detector");
+
+  assert_equals(
+    await run_iframe_test(iframe, "LanguageDetectorCreate"), 'Success');
+}, "Language Detector can be created within cross-origin iframe with permission policy");
+
+promise_test(async t => {
+  const src = HTTPS_ORIGIN + IFRAME_PATH;
+  const iframe = await load_iframe(src, /*permission_policy=*/"");
+
+  assert_equals(
+    await run_iframe_test(iframe, "LanguageDetectorCreate"), 'Success');
+}, "Language Detector can be used within same-origin iframe");
+
+promise_test(async t => {
+  const src = HTTPS_NOTSAMESITE_ORIGIN + IFRAME_PATH;
+  const iframe = await load_iframe(src, /*permission_policy=*/"");
+
+  assert_equals(
+    await run_iframe_test(iframe, "LanguageDetectorAvailability"), 'unavailable');
+}, "Language Detector is unavailable within cross-origin iframe");
+
+promise_test(async t => {
+  const src = HTTPS_NOTSAMESITE_ORIGIN + IFRAME_PATH;
+  const iframe = await load_iframe(src, "language-detector");
+
+  assert_in_array(
+  await run_iframe_test(iframe, "LanguageDetectorAvailability"),
+    ['downloadable', 'downloading', 'available']);
+}, "Language Detector is available within cross-origin iframe with permission policy");
+
+promise_test(async t => {
+  const src = HTTPS_ORIGIN + IFRAME_PATH;
+  const iframe = await load_iframe(src, /*permission_policy=*/"");
+
+  assert_in_array(
+    await run_iframe_test(iframe, "LanguageDetectorAvailability"),
+      ['downloadable', 'downloading', 'available']);
+}, "LanguageDetector is available within same-origin iframe");
+
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/ai/language_detection/detector-locale.https.window.js b/tests/wpt/tests/ai/language_detection/detector-locale.https.window.js
new file mode 100644
index 00000000000..80cbfa485e3
--- /dev/null
+++ b/tests/wpt/tests/ai/language_detection/detector-locale.https.window.js
@@ -0,0 +1,113 @@
+// META: title=Detect english
+// META: global=window
+// META: timeout=long
+// META: script=resources/util.js
+// META: script=/resources/testdriver.js
+// META: script=../resources/util.js
+// META: script=../resources/locale-util.js
+
+'use strict';
+
+function getAvailability(expectedInputLanguages) {
+  return LanguageDetector.availability({expectedInputLanguages});
+}
+
+function assert_availability_consistent(
+    language_subtag_availability, base_availability) {
+  if (base_availability == 'unavailable') {
+    // If the language subtag is not available then no variation of it should
+    // be available.
+    assert_equals(language_subtag_availability, 'unavailable');
+  } else {
+    // If the language subtag is available, then it definitely shouldn't be
+    // unavailable since whatever backing it has could support any variation of
+    // it. A variation could have a different availability if a more specific
+    // backing is required.
+    assert_in_array(
+        language_subtag_availability,
+        ['downloadable', 'downloading', 'available']);
+  }
+}
+
+promise_test(async t => {
+  for (const [languageSubtag, variations] of Object.entries(
+           valid_language_tags)) {
+    const languageSubtagAvailability = await getAvailability([languageSubtag]);
+
+    // Test each variation individually.
+    for (const variation of variations) {
+      assert_availability_consistent(
+          await getAvailability([variation]), languageSubtagAvailability);
+    }
+
+    // Test all variations.
+    assert_availability_consistent(
+        await getAvailability(variations), languageSubtagAvailability);
+  }
+}, 'LanguageDetector.availability() is consistent between language tag variations');
+
+
+async function getExpectedInputLanguages(expectedInputLanguages) {
+  return (await createLanguageDetector({expectedInputLanguages}))
+      .expectedInputLanguages;
+}
+
+async function assert_valid_expected_input_languages(language) {
+  const expectedInputLanguages = await getExpectedInputLanguages([language]);
+  assert_equals(expectedInputLanguages.length, 1);
+  assert_is_variation(language, expectedInputLanguages[0]);
+  assert_is_canonical(expectedInputLanguages[0]);
+}
+
+function uniqueCount(array) {
+  return (new Set(array)).size;
+}
+
+promise_test(async t => {
+  for (const [languageSubtag, variations] of Object.entries(
+           valid_language_tags)) {
+    if (await getAvailability([languageSubtag]) === 'unavailable') {
+      continue;
+    }
+
+    await assert_valid_expected_input_languages(languageSubtag);
+
+    for (const variation of variations) {
+      await assert_valid_expected_input_languages(variation);
+    }
+
+    const expectedInputLanguages = await getExpectedInputLanguages(variations);
+
+    // There should be no duplicates.
+    assert_equals(
+        expectedInputLanguages.length, uniqueCount(expectedInputLanguages));
+
+    for (const language of expectedInputLanguages) {
+      assert_is_canonical(language);
+      assert_is_variation(language, languageSubtag);
+    }
+  }
+}, 'LanguageDetector has valid expectedInputLanguages');
+
+function assert_rejects_invalid_expected_input_languages(
+    t, method, expectedInputLanguages) {
+  return promise_rejects_js(t, RangeError, method({expectedInputLanguages}));
+}
+
+promise_test(async t => {
+  for (const languageTag of invalid_language_tags) {
+    assert_rejects_invalid_expected_input_languages(
+        t, createLanguageDetector, [languageTag]);
+  }
+  assert_rejects_invalid_expected_input_languages(
+      t, createLanguageDetector, invalid_language_tags);
+}, 'LanguageDetector.create() throws RangeError for invalid language tags');
+
+promise_test(async t => {
+  for (const languageTag of invalid_language_tags) {
+    assert_rejects_invalid_expected_input_languages(
+        t, LanguageDetector.availability, [languageTag]);
+  }
+  assert_rejects_invalid_expected_input_languages(
+      t, LanguageDetector.availability, invalid_language_tags);
+}, 'LanguageDetector.availability() throws RangeError for invalid language tags');
diff --git a/tests/wpt/tests/ai/language_detection/detector.https.tentative.any.js b/tests/wpt/tests/ai/language_detection/detector.https.tentative.any.js
deleted file mode 100644
index 337f11d338d..00000000000
--- a/tests/wpt/tests/ai/language_detection/detector.https.tentative.any.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// META: title=Detect english
-// META: global=window,worker
-// META: script=../resources/util.js
-
-'use strict';
-
-promise_test(async t => {
-  // Language detection is available after call to `create()`.
-  await ai.languageDetector.create();
-  const availability = await ai.languageDetector.availability();
-  assert_equals(availability, 'available');
-}, 'Simple AILanguageDetector.availability() call');
-
-promise_test(async t => {
-  const detector = await ai.languageDetector.create();
-  const results = await detector.detect('this string is in English');
-  // "en" should be highest confidence.
-  assert_equals(results[0].detectedLanguage, 'en');
-  // Results should be from high to low confidence.
-  for (let i = 0; i < results.length - 1; i++) {
-    assert_greater_than_equal(results[i].confidence, results[i + 1].confidence);
-  }
-}, 'Simple AILanguageDetector.detect() call');
-
-promise_test(async t => {
-  const controller = new AbortController();
-  controller.abort();
-
-  const createPromise = ai.languageDetector.create({signal: controller.signal});
-
-  await promise_rejects_dom(t, 'AbortError', createPromise);
-}, 'AILanguageDetectorFactory.create() call with an aborted signal.');
-
-promise_test(async t => {
-  const controller = new AbortController();
-  controller.abort();
-
-  const detector = await ai.languageDetector.create();
-  const detectPromise =
-      detector.detect('this string is in English', {signal: controller.signal});
-
-  await promise_rejects_dom(t, 'AbortError', detectPromise);
-}, 'AILanguageDetector.detect() call with an aborted signal.');
-
-promise_test(async t => {
-  const detector = await ai.languageDetector.create();
-  await testAbortPromise(t, signal => {
-    return detector.detect('this string is in English', {signal});
-  });
-}, 'Aborting AILanguageDetector.detect().');
diff --git a/tests/wpt/tests/ai/language_detection/detector.https.window.js b/tests/wpt/tests/ai/language_detection/detector.https.window.js
new file mode 100644
index 00000000000..379b8741534
--- /dev/null
+++ b/tests/wpt/tests/ai/language_detection/detector.https.window.js
@@ -0,0 +1,199 @@
+// META: title=Detect english
+// META: global=window
+// META: timeout=long
+// META: script=resources/util.js
+// META: script=/resources/testdriver.js
+// META: script=../resources/util.js
+// META: script=../resources/locale-util.js
+
+'use strict';
+
+promise_test(async t => {
+  // Creating the language detector without user activation rejects with
+  // NotAllowedError.
+  const createPromise = LanguageDetector.create();
+  await promise_rejects_dom(t, 'NotAllowedError', createPromise);
+
+  // Creating the translator with user activation succeeds.
+  await createLanguageDetector();
+
+  // Creating it should have switched it to available.
+  const availability = await LanguageDetector.availability();
+  assert_equals(availability, 'available');
+
+  // Now that it is available, we should no longer need user activation.
+  await LanguageDetector.create();
+}, 'LanguageDetector.create() requires user activation when availability is "downloadable.');
+
+promise_test(async t => {
+  const detector = await createLanguageDetector();
+  const results = await detector.detect('Hello world!');
+
+  // must at least have the 'und' result.
+  assert_greater_than_equal(results.length, 1);
+
+  // The last result should be 'und'.
+  const undResult = results.pop();
+  assert_equals(undResult.detectedLanguage, 'und');
+  assert_greater_than(undResult.confidence, 0);
+
+  let total_confidence_without_und = 0;
+  let last_confidence = 1;
+  for (const {detectedLanguage, confidence} of results) {
+    // All results must be in canonical form.
+    assert_is_canonical(detectedLanguage);
+
+    assert_greater_than(confidence, 0);
+    assert_greater_than(confidence, undResult.confidence);
+
+    total_confidence_without_und += confidence;
+
+    // Except for 'und', results must be from high to low confidence.
+    assert_greater_than_equal(last_confidence, confidence);
+    last_confidence = confidence;
+  }
+
+  // If we have non-und results, their confidences, excluding the last non-'und'
+  // result, must be less than 0.99.
+  if (results.length > 0) {
+    assert_less_than(
+        total_confidence_without_und - results.at(-1).confidence, 0.99);
+  }
+
+  // Confidences, including 'und', should be less than or equal to one.
+  assert_less_than_equal(
+      total_confidence_without_und + undResult.confidence, 1);
+}, 'LanguageDetector.detect() returns valid results');
+
+promise_test(async t => {
+  const error = new Error('CreateMonitorCallback threw an error');
+  function monitor(m) {
+    m.addEventListener('downloadprogress', e => {
+      assert_unreached(
+          'This should never be reached since monitor throws an error.');
+    });
+    throw error;
+  }
+
+  await promise_rejects_exactly(t, error, createLanguageDetector({monitor}));
+}, 'If monitor throws an error, LanguageDetector.create() rejects with that error');
+
+promise_test(async t => {
+  testMonitor(createLanguageDetector);
+}, 'LanguageDetector.create() notifies its monitor on downloadprogress');
+
+promise_test(async t => {
+  const controller = new AbortController();
+  controller.abort();
+
+  const createPromise = createLanguageDetector({signal: controller.signal});
+
+  await promise_rejects_dom(t, 'AbortError', createPromise);
+}, 'LanguageDetector.create() call with an aborted signal.');
+
+promise_test(async t => {
+  await testAbortPromise(t, signal => {
+    return createLanguageDetector({signal});
+  });
+}, 'Aborting createLanguageDetector().');
+
+promise_test(async t => {
+  const detector = await createLanguageDetector();
+
+  const text = 'Hello world!';
+  const promises = [detector.detect(text), detector.measureInputUsage(text)];
+
+  detector.destroy();
+
+  promises.push(detector.detect(text), detector.measureInputUsage(text));
+
+  for (const promise of promises) {
+    await promise_rejects_dom(t, 'AbortError', promise);
+  }
+}, 'Calling LanguageDetector.destroy() aborts calls to detect and measureInputUsage.');
+
+promise_test(async t => {
+  const controller = new AbortController();
+  const detector = await createLanguageDetector({signal: controller.signal});
+
+  const text = 'Hello world!';
+  const promises = [detector.detect(text), detector.measureInputUsage(text)];
+
+  const error = new Error('The create abort signal was aborted.');
+  controller.abort(error);
+
+  promises.push(detector.detect(text), detector.measureInputUsage(text));
+
+  for (const promise of promises) {
+    await promise_rejects_exactly(t, error, promise);
+  }
+}, 'LanguageDetector.create()\'s abort signal destroys its LanguageDetector after creation.');
+
+promise_test(async t => {
+  const controller = new AbortController();
+  controller.abort();
+
+  const detector = await createLanguageDetector();
+  const detectPromise =
+      detector.detect('Hello world!', {signal: controller.signal});
+
+  await promise_rejects_dom(t, 'AbortError', detectPromise);
+}, 'LanguageDetector.detect() call with an aborted signal.');
+
+promise_test(async t => {
+  const detector = await createLanguageDetector();
+  await testAbortPromise(t, signal => {
+    return detector.detect('Hello world!', {signal});
+  });
+}, 'Aborting LanguageDetector.detect().');
+
+promise_test(async t => {
+  const detector = await createLanguageDetector();
+
+  const text = 'Hello world!';
+  const largeText = text.repeat(10000);
+  const inputUsage = await detector.measureInputUsage(largeText);
+
+  assert_greater_than_equal(detector.inputQuota, 0);
+  assert_greater_than_equal(inputUsage, 0);
+
+  const detectPromise = detector.detect(text);
+
+  if (inputUsage >= detector.inputQuota) {
+    await promise_rejects_dom(t, 'QuotaExceededError', detectPromise);
+  } else {
+    await detectPromise;
+  }
+}, 'LanguageDetector.measureInputUsage() and inputQuota basic usage.');
+
+promise_test(async t => {
+  const controller = new AbortController();
+  controller.abort();
+
+  const detector = await createLanguageDetector();
+  const measureInputUsagePromise =
+      detector.measureInputUsage('hello', {signal: controller.signal});
+
+  await promise_rejects_dom(t, 'AbortError', measureInputUsagePromise);
+}, 'LanguageDetector.measureInputUsage() call with an aborted signal.');
+
+promise_test(async t => {
+  const detector = await createLanguageDetector();
+  await testAbortPromise(t, signal => {
+    return detector.measureInputUsage('hello', {signal});
+  });
+}, 'Aborting LanguageDetector.measureInputUsage().');
+
+promise_test(async () => {
+  const detector = await createLanguageDetector({expectedInputLanguages: []});
+  assert_equals(detector.expectedInputLanguages, null);
+}, 'Creating LanguageDetector with empty expectedInputLanguages array');
+
+promise_test(async () => {
+  const detector = await createLanguageDetector();
+  assert_equals(detector.expectedInputLanguages, null);
+}, 'Creating LanguageDetector without expectedInputLanguages');
+
+promise_test(async t => {
+  await testCreateMonitorWithAbort(t, createLanguageDetector);
+}, 'Progress events are not emitted after aborted.');
diff --git a/tests/wpt/tests/ai/language_detection/detector.optional.https.window.js b/tests/wpt/tests/ai/language_detection/detector.optional.https.window.js
new file mode 100644
index 00000000000..1dd248a9eca
--- /dev/null
+++ b/tests/wpt/tests/ai/language_detection/detector.optional.https.window.js
@@ -0,0 +1,54 @@
+// META: title=Detect english
+// META: global=window
+// META: timeout=long
+// META: script=resources/util.js
+// META: script=/resources/testdriver.js
+// META: script=../resources/util.js
+
+'use strict';
+
+async function assert_detects_correct_language(
+    detector, input, expectedLanguage) {
+  const results = await detector.detect(input);
+  // The highest confidence language should be
+  assert_equals(results[0].detectedLanguage, expectedLanguage);
+}
+
+promise_test(async t => {
+  const testInput = {
+    af: 'Dit is \'n voorbeeldsin.',
+    el: 'Αυτή είναι μια παραδειγματική πρόταση.',
+    'el-Latn': 'Aete einai mia paratheiymatike protase.',
+    en: 'This is an example sentence.',
+    es: 'Esta es una oración de ejemplo.',
+    fr: 'Ceci est un exemple de phrase.',
+    hi: 'यह एक उदाहरण वाक्य है.',
+    'hi-Latn': 'yh ek udaahrn vaaky hai.',
+    it: 'Questa è una frase di esempio.',
+    ja: 'これは例文です。',
+    'ja-Latn': 'Kore wa reibundesu.',
+    ko: '이것은 예문입니다.',
+    mi: 'He tauira rerenga korero tenei.',
+    nl: 'Dit is een voorbeeldzin.',
+    ru: 'Это пример предложения.',
+    sr: 'Ово је пример реченице.',
+    tr: 'Bu bir örnek cümledir.',
+    zh: '这是一个例句。',
+    zu: 'Lona umusho oyisibonelo.',
+  }
+
+  const expectedInputLanguages = Object.keys(testInput);
+
+  const detector = await createLanguageDetector({expectedInputLanguages});
+
+  for (const [language, input] of Object.entries(testInput)) {
+    await assert_detects_correct_language(detector, input, language);
+  }
+}, 'LanguageDetector.detect() detects the correct language');
+
+promise_test(async () => {
+  const expectedInputLanguages = ['en', 'es'];
+  const detector = await createLanguageDetector({expectedInputLanguages});
+  assert_array_equals(detector.expectedInputLanguages, expectedInputLanguages);
+  assert_true(Object.isFrozen(detector.expectedInputLanguages));
+}, 'Creating LanguageDetector with expectedInputLanguages');
diff --git a/tests/wpt/tests/ai/language_detection/resources/iframe-helper.html b/tests/wpt/tests/ai/language_detection/resources/iframe-helper.html
new file mode 100644
index 00000000000..35ba8525587
--- /dev/null
+++ b/tests/wpt/tests/ai/language_detection/resources/iframe-helper.html
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML>
+<meta charset="utf-8">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<body></body>
+<script>
+test_driver.set_test_context(parent);
+
+window.onmessage = async message => {
+  const {id, type} = message.data;
+  try {
+    switch (type) {
+      case 'LanguageDetectorCreate':
+        await test_driver.bless("Create LanguageDetector", null, window);
+        await LanguageDetector.create();
+        parent.postMessage({id, success: 'Success'}, '*');
+        break;
+      case 'LanguageDetectorAvailability':
+        await test_driver.bless("Check LanguageDetector Availability", null, window);
+        const availability = await LanguageDetector.availability();
+        parent.postMessage({id, success: availability}, '*');
+        break;
+    }
+  } catch (err) {
+    parent.postMessage({id, err: err}, '*');
+  }
+};
+</script>
diff --git a/tests/wpt/tests/ai/language_detection/resources/util.js b/tests/wpt/tests/ai/language_detection/resources/util.js
new file mode 100644
index 00000000000..7cb3e7c2e13
--- /dev/null
+++ b/tests/wpt/tests/ai/language_detection/resources/util.js
@@ -0,0 +1,4 @@
+async function createLanguageDetector(options = {}) {
+  await test_driver.bless();
+  return await LanguageDetector.create(options);
+}
diff --git a/tests/wpt/tests/ai/resources/locale-util.js b/tests/wpt/tests/ai/resources/locale-util.js
new file mode 100644
index 00000000000..cacb11f4f25
--- /dev/null
+++ b/tests/wpt/tests/ai/resources/locale-util.js
@@ -0,0 +1,44 @@
+const valid_language_tags = {
+  en: [
+    'en-Latn',
+    'en-Latn-GB',
+    'en-GB',
+    'en-fonipa-scouse',
+    'en-Latn-fonipa-scouse',
+    'en-Latn-GB-fonipa-scouse',
+    'en-Latn-x-this-is-a-private-use-extensio-n',
+    'EN',
+    'en-lATN',
+    'EN-lATN-gb',
+    'EN-gb',
+    'EN-scouse-fonipa',
+    'EN-lATN-scouse-fonipa',
+    'EN-lATN-gb-scouse-fonipa',
+  ],
+  es: [
+    'es-419',
+    'es-ES',
+    'es-ES-1979',
+  ],
+};
+
+const invalid_language_tags = [
+  'e',
+  'Latn',
+  'enLatnGBfonipa',
+  '11',
+  'en_Latn',
+  'en-Lat',
+  'en-A999',
+];
+
+function assert_is_canonical(language_tag) {
+  const locale = new Intl.Locale(language_tag);
+  assert_equals(locale.toString(), language_tag);
+}
+
+function assert_is_variation(variation_language_tag, expected_language_tag) {
+  const variation_locale = new Intl.Locale(variation_language_tag);
+  const expected_locale = new Intl.Locale(expected_language_tag);
+  assert_equals(variation_locale.language, expected_locale.language);
+}
diff --git a/tests/wpt/tests/ai/resources/util.js b/tests/wpt/tests/ai/resources/util.js
index 49d677edae2..3e95a936304 100644
--- a/tests/wpt/tests/ai/resources/util.js
+++ b/tests/wpt/tests/ai/resources/util.js
@@ -1,5 +1,49 @@
+const kValidAvailabilities =
+    ['unavailable', 'downloadable', 'downloading', 'available'];
+const kAvailableAvailabilities = ['downloadable', 'downloading', 'available'];
+
+const kTestPrompt = 'Please write a sentence in English.';
+
+// Takes an array of dictionaries mapping keys to value arrays, e.g.:
+//   [ {Shape: ["Square", "Circle", undefined]}, {Count: [1, 2]} ]
+// Returns an array of dictionaries with all value combinations, i.e.:
+//  [ {Shape: "Square", Count: 1}, {Shape: "Square", Count: 2},
+//    {Shape: "Circle", Count: 1}, {Shape: "Circle", Count: 2},
+//    {Shape: undefined, Count: 1}, {Shape: undefined, Count: 2} ]
+// Omits dictionary members when the value is undefined; supports array values.
+function generateOptionCombinations(optionsSpec) {
+  // 1. Extract keys from the input specification.
+  const keys = optionsSpec.map(o => Object.keys(o)[0]);
+  // 2. Extract the arrays of possible values for each key.
+  const valueArrays = optionsSpec.map(o => Object.values(o)[0]);
+  // 3. Compute the Cartesian product of the value arrays using reduce.
+  const valueCombinations = valueArrays.reduce((accumulator, currentValues) => {
+    // Init the empty accumulator (first iteration), with single-element
+    // arrays.
+    if (accumulator.length === 0) {
+      return currentValues.map(value => [value]);
+    }
+    // Otherwise, expand existing combinations with current values.
+    return accumulator.flatMap(
+        existingCombo => currentValues.map(
+            currentValue => [...existingCombo, currentValue]));
+  }, []);
+
+  // 4. Map each value combination to a result dictionary, skipping
+  // undefined.
+  return valueCombinations.map(combination => {
+    const result = {};
+    keys.forEach((key, index) => {
+      if (combination[index] !== undefined) {
+        result[key] = combination[index];
+      }
+    });
+    return result;
+  });
+}
+
 // The method should take the AbortSignal as an option and return a promise.
-const testAbortPromise = async (t, method) => {
+async function testAbortPromise(t, method) {
   // Test abort signal without custom error.
   {
     const controller = new AbortController();
@@ -25,3 +69,109 @@ const testAbortPromise = async (t, method) => {
     await promise_rejects_exactly(t, err, anotherPromise);
   }
 };
+
+async function testCreateMonitorWithAbortAt(
+    t, loadedToAbortAt, method, options = {}) {
+  const {promise: eventPromise, resolve} = Promise.withResolvers();
+  let hadEvent = false;
+  function monitor(m) {
+    m.addEventListener('downloadprogress', e => {
+      if (e.loaded != loadedToAbortAt) {
+        return;
+      }
+
+      if (hadEvent) {
+        assert_unreached(
+            'This should never be reached since LanguageDetector.create() was aborted.');
+        return;
+      }
+
+      resolve();
+      hadEvent = true;
+    });
+  }
+
+  const controller = new AbortController();
+
+  const createPromise =
+      method({...options, monitor, signal: controller.signal});
+
+  await eventPromise;
+
+  const err = new Error('test');
+  controller.abort(err);
+  await promise_rejects_exactly(t, err, createPromise);
+}
+
+async function testCreateMonitorWithAbort(t, method, options = {}) {
+  await testCreateMonitorWithAbortAt(t, 0, method, options);
+  await testCreateMonitorWithAbortAt(t, 1, method, options);
+}
+
+// The method should take the AbortSignal as an option and return a
+// ReadableStream.
+async function testAbortReadableStream(t, method) {
+  // Test abort signal without custom error.
+  {
+    const controller = new AbortController();
+    const stream = method(controller.signal);
+    controller.abort();
+    let writableStream = new WritableStream();
+    await promise_rejects_dom(t, 'AbortError', stream.pipeTo(writableStream));
+
+    // Using the same aborted controller will get the `AbortError` as well.
+    await promise_rejects_dom(t, 'AbortError', new Promise(() => {
+                                method(controller.signal);
+                              }));
+  }
+
+  // Test abort signal with custom error.
+  {
+    const error = new DOMException('test', 'VersionError');
+    const controller = new AbortController();
+    const stream = method(controller.signal);
+    controller.abort(error);
+    let writableStream = new WritableStream();
+    await promise_rejects_exactly(t, error, stream.pipeTo(writableStream));
+
+    // Using the same aborted controller will get the same error.
+    await promise_rejects_exactly(t, error, new Promise(() => {
+                                    method(controller.signal);
+                                  }));
+  }
+};
+
+async function testMonitor(createFunc, options = {}) {
+  let created = false;
+  const progressEvents = [];
+  function monitor(m) {
+    m.addEventListener('downloadprogress', e => {
+      // No progress events should be fired after `createFunc` resolves.
+      assert_false(created);
+
+      progressEvents.push(e);
+    });
+  }
+
+  result = await createFunc({...options, monitor});
+  created = true;
+
+  assert_greater_than_equal(progressEvents.length, 2);
+  assert_equals(progressEvents.at(0).loaded, 0);
+  assert_equals(progressEvents.at(-1).loaded, 1);
+
+  let lastProgressEventLoaded = -1;
+  for (const progressEvent of progressEvents) {
+    assert_equals(progressEvent.lengthComputable, true);
+    assert_equals(progressEvent.total, 1);
+    assert_less_than_equal(progressEvent.loaded, progressEvent.total);
+
+    // `loaded` must be rounded to the nearest 0x10000th.
+    assert_equals(progressEvent.loaded % (1 / 0x10000), 0);
+
+    // Progress events should have monotonically increasing `loaded` values.
+    assert_greater_than(progressEvent.loaded, lastProgressEventLoaded);
+    lastProgressEventLoaded = progressEvent.loaded;
+  }
+  return result;
+}
diff --git a/tests/wpt/tests/ai/summarizer/resources/iframe-helper.html b/tests/wpt/tests/ai/summarizer/resources/iframe-helper.html
new file mode 100644
index 00000000000..8db84705a2b
--- /dev/null
+++ b/tests/wpt/tests/ai/summarizer/resources/iframe-helper.html
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML>
+<meta charset="utf-8">
+<script>
+window.onmessage = async message => {
+  switch (message.data.type) {
+    case 'SummarizerCreate':
+      Summarizer.create()
+        .then(t => parent.postMessage('Success', '*'))
+        .catch(err => parent.postMessage('Failure: ' + err.name, '*'));
+      break;
+    case 'SummarizerAvailability':
+        Summarizer.availability({
+          type: "tl;dr",
+          format: "plain-text",
+          length: "medium"})
+        .then(availability => parent.postMessage(availability, '*'))
+        .catch(err => parent.postMessage('Failure: ' + err.name, '*'));
+      break;
+  };
+};
+</script>
diff --git a/tests/wpt/tests/ai/summarizer/summarizer-abort.tentative.https.window.js b/tests/wpt/tests/ai/summarizer/summarizer-abort.tentative.https.window.js
new file mode 100644
index 00000000000..64595ea930c
--- /dev/null
+++ b/tests/wpt/tests/ai/summarizer/summarizer-abort.tentative.https.window.js
@@ -0,0 +1,25 @@
+// META: title=Summarizer Abort
+// META: global=window,worker
+// META: script=../resources/util.js
+
+'use strict';
+
+promise_test(async t => {
+  await testAbortPromise(t, signal => {
+    return Summarizer.create({ signal: signal });
+  });
+}, "Aborting Summarizer.create().");
+
+promise_test(async t => {
+  const session = await Summarizer.create();
+  await testAbortPromise(t, signal => {
+    return session.summarize(kTestPrompt, { signal: signal });
+  });
+}, "Aborting Summarizer.summarize().");
+
+promise_test(async t => {
+  const session = await Summarizer.create();
+  await testAbortReadableStream(t, signal => {
+    return session.summarizeStreaming(kTestPrompt, { signal: signal });
+  });
+}, "Aborting Summarizer.summarizeStreaming().");
diff --git a/tests/wpt/tests/ai/summarizer/summarizer-availability-available.tentative.https.window.js b/tests/wpt/tests/ai/summarizer/summarizer-availability-available.tentative.https.window.js
new file mode 100644
index 00000000000..31c21ca777f
--- /dev/null
+++ b/tests/wpt/tests/ai/summarizer/summarizer-availability-available.tentative.https.window.js
@@ -0,0 +1,34 @@
+// META: title=Summarizer Availability Available
+// META: script=../resources/util.js
+// META: timeout=long
+
+'use strict';
+
+promise_test(async () => {
+  const availability = await Summarizer.availability();
+  assert_in_array(availability, kAvailableAvailabilities);
+}, 'Summarizer.availability() is available with no options');
+
+promise_test(async () => {
+  const availability = await Summarizer.availability({
+    type: 'tl;dr',
+    format: 'plain-text',
+    length: 'medium',
+    expectedInputLanguages: ['en-GB'],
+    expectedContextLanguages: ['en'],
+    outputLanguage: 'en',
+  });
+  assert_in_array(availability, kAvailableAvailabilities);
+}, 'Summarizer.availability() returns available with supported options');
+
+promise_test(async () => {
+  const availability = await Summarizer.availability({
+    type: 'tl;dr',
+    format: 'plain-text',
+    length: 'medium',
+    expectedInputLanguages: ['es'], // not supported
+    expectedContextLanguages: ['en'],
+    outputLanguage: 'es', // not supported
+  });
+  assert_equals(availability, 'unavailable');
+}, 'Summarizer.availability() returns unavailable for unsupported languages');
diff --git a/tests/wpt/tests/ai/summarizer/summarizer-availability.tentative.https.window.js b/tests/wpt/tests/ai/summarizer/summarizer-availability.tentative.https.window.js
new file mode 100644
index 00000000000..8691765f693
--- /dev/null
+++ b/tests/wpt/tests/ai/summarizer/summarizer-availability.tentative.https.window.js
@@ -0,0 +1,31 @@
+// META: title=Summarizer Availability
+// META: script=../resources/util.js
+// META: timeout=long
+
+'use strict';
+
+promise_test(async () => {
+  assert_true(!!Summarizer);
+  assert_equals(typeof Summarizer.availability, 'function');
+}, 'Summarizer.availability() is defined');
+
+promise_test(async () => {
+  const availability = await Summarizer.availability();
+  assert_in_array(availability, kValidAvailabilities);
+}, 'Summarizer.availability() returns a valid value with no options');
+
+promise_test(async () => {
+  // An array of plausible test option values.
+  const kCreateOptionsSpec = [
+    {type: [undefined, 'tl;dr', 'teaser', 'key-points', 'headline']},
+    {format: [undefined, 'plain-text', 'markdown']},
+    {length: [undefined, 'short', 'medium', 'long']},
+    {expectedInputLanguages: [[], ['en'], ['es'], ['jp', 'fr']]},
+    {expectedContextLanguages: [[], ['en'], ['es'], ['jp', 'fr']]},
+    {outputLanguage: [undefined, 'en', 'es', 'jp', 'fr']}
+  ];
+  for (const options of generateOptionCombinations(kCreateOptionsSpec)) {
+    const availability = await Summarizer.availability(options);
+    assert_in_array(availability, kValidAvailabilities, options);
+  }
+}, 'Summarizer.availability() returns a valid value with plausible options');
diff --git a/tests/wpt/tests/ai/summarizer/summarizer-create-available.tentative.https.window.js b/tests/wpt/tests/ai/summarizer/summarizer-create-available.tentative.https.window.js
new file mode 100644
index 00000000000..c7e27d9766b
--- /dev/null
+++ b/tests/wpt/tests/ai/summarizer/summarizer-create-available.tentative.https.window.js
@@ -0,0 +1,83 @@
+// META: title=Summarizer Create Available
+// META: script=../resources/util.js
+// META: timeout=long
+
+'use strict';
+
+promise_test(async () => {
+  const summarizer = await Summarizer.create();
+  assert_equals(typeof summarizer, 'object');
+
+  assert_equals(typeof summarizer.summarize, 'function');
+  assert_equals(typeof summarizer.summarizeStreaming, 'function');
+  assert_equals(typeof summarizer.measureInputUsage, 'function');
+  assert_equals(typeof summarizer.destroy, 'function');
+
+  assert_equals(typeof summarizer.expectedContextLanguages, 'object');
+  assert_equals(typeof summarizer.expectedInputLanguages, 'object');
+  assert_equals(typeof summarizer.inputQuota, 'number');
+  assert_equals(typeof summarizer.outputLanguage, 'object');
+  assert_equals(typeof summarizer.sharedContext, 'string');
+
+  assert_equals(typeof summarizer.type, 'string');
+  assert_equals(typeof summarizer.format, 'string');
+  assert_equals(typeof summarizer.length, 'string');
+
+  assert_equals(summarizer.type, 'key-points');
+  assert_equals(summarizer.format, 'markdown');
+  assert_equals(summarizer.length, 'short');
+}, 'Summarizer.create() returns a valid object with default options');
+
+promise_test(async () => {
+  const summarizer = await testMonitor(Summarizer.create);
+  assert_equals(typeof summarizer, 'object');
+}, 'Summarizer.create() notifies its monitor on downloadprogress');
+
+promise_test(async () => {
+  const sharedContext = 'This is a shared context string';
+  const summarizer = await Summarizer.create({sharedContext: sharedContext});
+  assert_equals(summarizer.sharedContext, sharedContext);
+}, 'Summarizer.sharedContext');
+
+promise_test(async () => {
+  const summarizer = await Summarizer.create({type: 'headline'});
+  assert_equals(summarizer.type, 'headline');
+}, 'Summarizer.type');
+
+promise_test(async () => {
+  const summarizer = await Summarizer.create({format: 'plain-text'});
+  assert_equals(summarizer.format, 'plain-text');
+}, 'Summarizer.format');
+
+promise_test(async () => {
+  const summarizer = await Summarizer.create({length: 'medium'});
+  assert_equals(summarizer.length, 'medium');
+}, 'Summarizer.length');
+
+promise_test(async () => {
+  const summarizer = await Summarizer.create({
+    expectedInputLanguages: ['en']
+  });
+  assert_array_equals(summarizer.expectedInputLanguages, ['en']);
+}, 'Summarizer.expectedInputLanguages');
+
+promise_test(async () => {
+  const summarizer = await Summarizer.create({
+    expectedContextLanguages: ['en']
+  });
+  assert_array_equals(summarizer.expectedContextLanguages, ['en']);
+}, 'Summarizer.expectedContextLanguages');
+
+promise_test(async () => {
+  const summarizer = await Summarizer.create({
+    outputLanguage: 'en'
+  });
+  assert_equals(summarizer.outputLanguage, 'en');
+}, 'Summarizer.outputLanguage');
+
+promise_test(async () => {
+  const summarizer = await Summarizer.create();
+  assert_equals(summarizer.expectedInputLanguages, null);
+  assert_equals(summarizer.expectedContextLanguages, null);
+  assert_equals(summarizer.outputLanguage, null);
+}, 'Summarizer optional attributes return null');
diff --git a/tests/wpt/tests/ai/summarizer/summarizer-create.tentative.https.window.js b/tests/wpt/tests/ai/summarizer/summarizer-create.tentative.https.window.js
new file mode 100644
index 00000000000..328cceefefb
--- /dev/null
+++ b/tests/wpt/tests/ai/summarizer/summarizer-create.tentative.https.window.js
@@ -0,0 +1,10 @@
+// META: title=Summarizer Create
+// META: script=../resources/util.js
+// META: timeout=long
+
+'use strict';
+
+promise_test(async () => {
+  assert_true(!!Summarizer);
+  assert_equals(typeof Summarizer.create, 'function');
+}, 'Summarizer.create() is defined');
diff --git a/tests/wpt/tests/ai/summarizer/summarizer-iframe.tentative.https.html b/tests/wpt/tests/ai/summarizer/summarizer-iframe.tentative.https.html
new file mode 100644
index 00000000000..219811c8831
--- /dev/null
+++ b/tests/wpt/tests/ai/summarizer/summarizer-iframe.tentative.https.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<body></body>
+<script>
+'use strict';
+
+const { HTTPS_ORIGIN, HTTPS_NOTSAMESITE_ORIGIN } = get_host_info();
+const PATH = location.pathname.substring(0, location.pathname.lastIndexOf('/') + 1);
+const IFRAME_PATH = PATH + 'resources/iframe-helper.html';
+
+function load_iframe(src, permission_policy, test_name) {
+  let iframe = document.createElement('iframe');
+  return new Promise((resolve, reject) => {
+    iframe.onload = () => {
+      iframe.contentWindow.postMessage({type: test_name}, '*');
+      resolve(iframe);
+    }
+    iframe.src = src;
+    iframe.allow = permission_policy;
+    document.body.appendChild(iframe);
+  });
+}
+
+promise_test(async t => {
+  const src = HTTPS_NOTSAMESITE_ORIGIN + IFRAME_PATH;
+  await load_iframe(src, /*permission_policy=*/"", "SummarizerCreate");
+  return new Promise((resolve, reject) => {
+    window.onmessage = message => {
+      if (message.data == 'Failure: NotAllowedError') {
+        resolve();
+      } else {
+        reject(message.data)
+      }
+    }
+  });
+}, "Throw a 'NotAllowedError' when creating Summarizer within cross-origin iframe");
+
+promise_test(async t => {
+  const src = HTTPS_NOTSAMESITE_ORIGIN + IFRAME_PATH;
+  load_iframe(src, "summarizer", "SummarizerCreate");
+
+  return new Promise((resolve, reject) => {
+    window.onmessage = message => {
+      if (message.data == 'Success') {
+        resolve();
+      } else {
+        reject(message.data)
+      }
+    }
+  });
+}, "Summarizer can be created within cross-origin iframe with permission policy");
+
+promise_test(async t => {
+  const src = HTTPS_ORIGIN + IFRAME_PATH;
+  load_iframe(src, /*permission_policy=*/"", "SummarizerCreate");
+
+  return new Promise((resolve, reject) => {
+    window.onmessage = message => {
+      if (message.data == 'Success') {
+        resolve();
+      } else {
+        reject(message.data)
+      }
+    }
+  });
+}, "Summarizer can be used within same-origin iframe");
+
+promise_test(async t => {
+  const src = HTTPS_NOTSAMESITE_ORIGIN + IFRAME_PATH;
+  load_iframe(src, /*permission_policy=*/"", "SummarizerAvailability");
+
+  return new Promise((resolve, reject) => {
+    window.onmessage = message => {
+      if (message.data == 'unavailable') {
+        resolve();
+      } else {
+        reject(message.data)
+      }
+    }
+  });
+}, "Summarizer is unavailable within cross-origin iframe");
+
+promise_test(async t => {
+  const src = HTTPS_NOTSAMESITE_ORIGIN + IFRAME_PATH;
+  load_iframe(src, "summarizer", "SummarizerAvailability");
+
+  return new Promise((resolve, reject) => {
+    window.onmessage = message => {
+      if (message.data != 'unavailable') {
+        resolve();
+      } else {
+        reject(message.data)
+      }
+    }
+  });
+}, "Summarizer is available within cross-origin iframe with permission policy");
+
+promise_test(async t => {
+  const src = HTTPS_ORIGIN + IFRAME_PATH;
+  load_iframe(src, /*permission_policy=*/"", "SummarizerAvailability");
+
+  return new Promise((resolve, reject) => {
+    window.onmessage = message => {
+      if (message.data != 'unavailable') {
+        resolve();
+      } else {
+        reject(message.data)
+      }
+    }
+  });
+}, "Summarizer is available within same-origin iframe");
+
+</script>
diff --git a/tests/wpt/tests/ai/summarizer/summarizer-measureInputUsage.tentative.https.window.js b/tests/wpt/tests/ai/summarizer/summarizer-measureInputUsage.tentative.https.window.js
new file mode 100644
index 00000000000..ce9745acf17
--- /dev/null
+++ b/tests/wpt/tests/ai/summarizer/summarizer-measureInputUsage.tentative.https.window.js
@@ -0,0 +1,12 @@
+// META: title=Summarizer measureInputUsage
+// META: script=../resources/util.js
+// META: timeout=long
+
+'use strict';
+
+promise_test(async () => {
+  const summarizer = await Summarizer.create();
+  const result = await summarizer.measureInputUsage(kTestPrompt);
+  assert_equals(typeof result, 'number');
+  assert_greater_than(result, 0);
+}, 'Summarizer.measureInputUsage() returns non-empty result');
diff --git a/tests/wpt/tests/ai/summarizer/summarizer-summarize-streaming.tentative.https.window.js b/tests/wpt/tests/ai/summarizer/summarizer-summarize-streaming.tentative.https.window.js
new file mode 100644
index 00000000000..dbf41cdadbc
--- /dev/null
+++ b/tests/wpt/tests/ai/summarizer/summarizer-summarize-streaming.tentative.https.window.js
@@ -0,0 +1,44 @@
+// META: title=Summarizer Summarize Streaming
+// META: script=../resources/util.js
+// META: timeout=long
+
+'use strict';
+
+promise_test(async t => {
+  const summarizer = await Summarizer.create();
+  const streamingResponse = summarizer.summarizeStreaming(
+    "The web-platform-tests Project is a cross-browser test suite for the Web-platform stack. Writing tests in a way that allows them to be run in all browsers gives browser projects confidence that they are shipping software that is compatible with other implementations, and that later implementations will be compatible with their implementations. This in turn gives Web authors/developers confidence that they can actually rely on the Web platform to deliver on the promise of working across browsers and devices without needing extra layers of abstraction to paper over the gaps left by specification editors and implementors.");
+  assert_equals(
+    Object.prototype.toString.call(streamingResponse),
+    "[object ReadableStream]"
+  );
+  const reader = streamingResponse.getReader();
+  let result = "";
+  while (true) {
+    const { value, done } = await reader.read();
+    if (done) {
+      break;
+    }
+    result = value;
+  }
+  assert_greater_than(result.length, 0);
+}, 'Summarizer.summarizeStreaming() returns ReadableStream with a non-empty text.');
+
+promise_test(async t => {
+  const summarizer = await Summarizer.create();
+  const streamingResponse = summarizer.summarizeStreaming("");
+  assert_equals(
+    Object.prototype.toString.call(streamingResponse),
+    "[object ReadableStream]"
+  );
+  const { result, done } = await streamingResponse.getReader().read();
+  assert_true(done);
+}, 'Summarizer.summarizeStreaming() returns a ReadableStream without any chunk on an empty input.');
+
+promise_test(async () => {
+  const summarizer = await Summarizer.create();
+  await Promise.all([
+    summarizer.summarizeStreaming(kTestPrompt),
+    summarizer.summarizeStreaming(kTestPrompt)
+  ]);
+}, 'Multiple Summarizer.summarizeStreaming() calls are resolved successfully.');
diff --git a/tests/wpt/tests/ai/summarizer/summarizer-summarize.tentative.https.window.js b/tests/wpt/tests/ai/summarizer/summarizer-summarize.tentative.https.window.js
new file mode 100644
index 00000000000..62a780a3fc7
--- /dev/null
+++ b/tests/wpt/tests/ai/summarizer/summarizer-summarize.tentative.https.window.js
@@ -0,0 +1,20 @@
+// META: title=Summarizer Create Available
+// META: script=../resources/util.js
+// META: timeout=long
+
+'use strict';
+
+promise_test(async () => {
+  const summarizer = await Summarizer.create();
+  const result = await summarizer.summarize(kTestPrompt);
+  assert_equals(typeof result, 'string');
+  assert_greater_than(result.length, 0);
+}, 'Summarizer.summarize() returns non-empty result.');
+
+promise_test(async () => {
+  const summarizer = await Summarizer.create();
+  await Promise.all([
+    summarizer.summarize(kTestPrompt),
+    summarizer.summarize(kTestPrompt)
+  ]);
+}, 'Multiple Summarizer.summarize() calls are resolved successfully.');
diff --git a/tests/wpt/tests/ai/translator/ai_translator_bad_input.tentative.https.any.js b/tests/wpt/tests/ai/translator/ai_translator_bad_input.tentative.https.any.js
deleted file mode 100644
index 980d3c0f697..00000000000
--- a/tests/wpt/tests/ai/translator/ai_translator_bad_input.tentative.https.any.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// META: title=translator.create without options do not crash
-// META: global=window,worker
-// META: timeout=long
-//
-// Setting `timeout=long` as this test may require downloading the translation
-// library and the language models.
-
-'use strict';
-
-promise_test(async t => {
-  await promise_rejects_js(
-      t, TypeError, ai.translator.create(/*empty options*/));
-}, 'AITranslatorFactory.create rejects with TypeError if no options are passed.');
-
-promise_test(async t => {
-  await promise_rejects_js(
-      t, TypeError, ai.translator.create({sourceLanguage: 'en'}));
-}, 'AITranslatorFactory.create rejects with TypeError targetLanguage is not provided.');
-
-promise_test(async t => {
-  await promise_rejects_js(
-      t, TypeError, ai.translator.create({targetLanguage: 'en'}));
-}, 'AITranslatorFactory.create rejects with TypeError sourceLanguage is not provided.');
diff --git a/tests/wpt/tests/ai/translator/ai_translator_translate.tentative.https.any.js b/tests/wpt/tests/ai/translator/ai_translator_translate.tentative.https.any.js
deleted file mode 100644
index 729cb04fb76..00000000000
--- a/tests/wpt/tests/ai/translator/ai_translator_translate.tentative.https.any.js
+++ /dev/null
@@ -1,168 +0,0 @@
-// META: title=Translate from English to Japanese
-// META: global=window
-// META: timeout=long
-// META: script=../resources/util.js
-// META: script=../resources/language_codes.js
-// META: script=/resources/testdriver.js
-//
-// Setting `timeout=long` as this test may require downloading the translation
-// library and the language models.
-
-'use strict';
-
-async function createTranslator(options) {
-  return await test_driver.bless('Create translator', async () => {
-    return await ai.translator.create(options);
-  });
-}
-
-promise_test(async t => {
-  const languagePair = {sourceLanguage: 'en', targetLanguage: 'ja'};
-
-  // Creating the translator without user activation rejects with
-  // NotAllowedError.
-  const createPromise = ai.translator.create(languagePair);
-  await promise_rejects_dom(t, 'NotAllowedError', createPromise);
-
-  // Creating the translator with user activation succeeds.
-  await createTranslator(languagePair);
-
-  // Creating it should have switched it to available.
-  const availability = await ai.translator.availability(languagePair);
-  assert_equals(availability, 'available');
-
-  // Now that it is available, we should no longer need user activation.
-  await ai.translator.create(languagePair);
-}, 'AITranslator.create() requires user activation when availability is "downloadable.');
-
-promise_test(async t => {
-  const translator =
-      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
-  assert_equals(await translator.translate('hello'), 'こんにちは');
-}, 'Simple AITranslator.translate() call');
-
-promise_test(async () => {
-  const translator =
-      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
-  const streamingResponse = translator.translateStreaming('hello');
-  assert_equals(
-      Object.prototype.toString.call(streamingResponse),
-      '[object ReadableStream]');
-  let result = '';
-  for await (const chunk of streamingResponse) {
-    result += chunk;
-  }
-  assert_equals(await translator.translate('hello'), 'こんにちは');
-}, 'Simple AITranslator.translateStreaming() call');
-
-promise_test(async t => {
-  const translator =
-      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
-  assert_equals(translator.sourceLanguage, 'en');
-  assert_equals(translator.targetLanguage, 'ja');
-}, 'AITranslator: sourceLanguage and targetLanguage are equal to their respective option passed in to AITranslatorFactory.create.')
-
-promise_test(async (t) => {
-  const translator =
-      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
-  translator.destroy();
-  await promise_rejects_dom(
-      t, 'InvalidStateError', translator.translate('hello'));
-}, 'AITranslator.translate() fails after destroyed');
-
-promise_test(async t => {
-  const controller = new AbortController();
-  controller.abort();
-
-  const createPromise = createTranslator(
-      {signal: controller.signal, sourceLanguage: 'en', targetLanguage: 'ja'});
-
-  await promise_rejects_dom(t, 'AbortError', createPromise);
-}, 'AITranslatorFactory.create() call with an aborted signal.');
-
-promise_test(async t => {
-  await testAbortPromise(t, signal => {
-    return createTranslator(
-        {signal, sourceLanguage: 'en', targetLanguage: 'ja'});
-  });
-}, 'Aborting AITranslatorFactory.create().');
-
-promise_test(async t => {
-  const controller = new AbortController();
-  controller.abort();
-
-  const translator =
-      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
-  const translatePromise =
-      translator.translate('hello', {signal: controller.signal});
-
-  await promise_rejects_dom(t, 'AbortError', translatePromise);
-}, 'AITranslator.translate() call with an aborted signal.');
-
-promise_test(async t => {
-  const translator =
-      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
-  await testAbortPromise(t, signal => {
-    return translator.translate('hello', {signal});
-  });
-}, 'Aborting AITranslator.translate().');
-
-promise_test(async t => {
-  let monitorCalled = false;
-  const progressEvents = [];
-  function monitor(m) {
-    monitorCalled = true;
-
-    m.addEventListener('downloadprogress', e => {
-      progressEvents.push(e);
-    });
-  }
-
-  await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja', monitor});
-
-  // Monitor callback must be called.
-  assert_true(monitorCalled);
-
-  // Must have at least 2 progress events, one for 0 and one for 1.
-  assert_greater_than_equal(progressEvents.length, 2);
-
-  // 0 should be the first event and 1 should be the last event.
-  assert_equals(progressEvents.at(0).loaded, 0);
-  assert_equals(progressEvents.at(-1).loaded, 1);
-
-  // All progress events must have a total of 1.
-  for (const progressEvent of progressEvents) {
-    assert_equals(progressEvent.total, 1);
-  }
-}, 'AITranslatorFactory.create() monitor option is called correctly.');
-
-promise_test(async t => {
-  const translator =
-      await ai.translator.create({sourceLanguage: 'en', targetLanguage: 'ja'});
-
-  // Strings containing only white space are not translatable.
-  const nonTranslatableStrings = ['', ' ', '     ', ' \r\n\t\f'];
-
-  // Strings containing only control characters are not translatable.
-  for (let c = 0; c < 0x1F; c++) {
-    nonTranslatableStrings.push(String.fromCharCode(c));
-  }
-
-  const translatedNonTranslatableString = await Promise.all(
-      nonTranslatableStrings.map(str => translator.translate(str)));
-
-  // Non translatable strings should be echoed back
-  assert_array_equals(translatedNonTranslatableString, nonTranslatableStrings);
-
-  // Adding translatable text makes it translatable.
-  const translatableStrings =
-      nonTranslatableStrings.map(str => `Hello ${str} world`);
-
-  const translatedTranslatableString = await Promise.all(
-      translatableStrings.map(str => translator.translate(str)));
-
-  // All the strings should have been translated in some way.
-  for (let i = 0; i < translatableStrings.length; i++) {
-    assert_not_equals(translatedTranslatableString[i], translatableStrings[i]);
-  }
-}, 'AITranslator.translate() echos non-translatable content');
diff --git a/tests/wpt/tests/ai/translator/resources/util.js b/tests/wpt/tests/ai/translator/resources/util.js
new file mode 100644
index 00000000000..ad06086a123
--- /dev/null
+++ b/tests/wpt/tests/ai/translator/resources/util.js
@@ -0,0 +1,4 @@
+async function createTranslator(options) {
+  await test_driver.bless();
+  return await Translator.create(options);
+}
diff --git a/tests/wpt/tests/ai/translator/translator-bad-input.https.window.js b/tests/wpt/tests/ai/translator/translator-bad-input.https.window.js
new file mode 100644
index 00000000000..db8905a61f6
--- /dev/null
+++ b/tests/wpt/tests/ai/translator/translator-bad-input.https.window.js
@@ -0,0 +1,22 @@
+// META: title=translator.create without options do not crash
+// META: global=window
+// META: timeout=long
+//
+// Setting `timeout=long` as this test may require downloading the translation
+// library and the language models.
+
+'use strict';
+
+promise_test(async t => {
+  await promise_rejects_js(t, TypeError, Translator.create(/*empty options*/));
+}, 'Translator.create rejects with TypeError if no options are passed.');
+
+promise_test(async t => {
+  await promise_rejects_js(
+      t, TypeError, Translator.create({sourceLanguage: 'en'}));
+}, 'Translator.create rejects with TypeError targetLanguage is not provided.');
+
+promise_test(async t => {
+  await promise_rejects_js(
+      t, TypeError, Translator.create({targetLanguage: 'en'}));
+}, 'Translator.create rejects with TypeError sourceLanguage is not provided.');
diff --git a/tests/wpt/tests/ai/translator/translator.optional.https.window.js b/tests/wpt/tests/ai/translator/translator.optional.https.window.js
new file mode 100644
index 00000000000..96eca09d28b
--- /dev/null
+++ b/tests/wpt/tests/ai/translator/translator.optional.https.window.js
@@ -0,0 +1,177 @@
+// META: title=Translator Translate
+// META: global=window
+// META: timeout=long
+// META: script=../resources/util.js
+// META: script=../resources/language_codes.js
+// META: script=/resources/testdriver.js
+// META: script=resources/util.js
+//
+// Setting `timeout=long` as this test may require downloading the translation
+// library and the language models.
+
+'use strict';
+
+promise_test(async t => {
+  const languagePair = {sourceLanguage: 'en', targetLanguage: 'ja'};
+
+  // Creating the translator without user activation rejects with
+  // NotAllowedError.
+  const createPromise = Translator.create(languagePair);
+  await promise_rejects_dom(t, 'NotAllowedError', createPromise);
+
+  // Creating the translator with user activation succeeds.
+  await createTranslator(languagePair);
+
+  // Creating it should have switched it to available.
+  const availability = await Translator.availability(languagePair);
+  assert_equals(availability, 'available');
+
+  // Now that it is available, we should no longer need user activation.
+  await Translator.create(languagePair);
+}, 'Translator.create() requires user activation when availability is "downloadable.');
+
+promise_test(async t => {
+  const translator =
+      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
+  assert_equals(await translator.translate('hello'), 'こんにちは');
+}, 'Simple Translator.translate() call');
+
+promise_test(async () => {
+  const translator =
+      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
+  const streamingResponse = translator.translateStreaming('hello');
+  assert_equals(
+      Object.prototype.toString.call(streamingResponse),
+      '[object ReadableStream]');
+  let result = '';
+  for await (const chunk of streamingResponse) {
+    result += chunk;
+  }
+  assert_equals(await translator.translate('hello'), 'こんにちは');
+}, 'Simple Translator.translateStreaming() call');
+
+promise_test(async t => {
+  const translator =
+      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
+  assert_equals(translator.sourceLanguage, 'en');
+  assert_equals(translator.targetLanguage, 'ja');
+}, 'Translator: sourceLanguage and targetLanguage are equal to their respective option passed in to Translator.create.');
+
+promise_test(async (t) => {
+  const translator =
+      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
+  translator.destroy();
+  await promise_rejects_dom(
+      t, 'InvalidStateError', translator.translate('hello'));
+}, 'Translator.translate() fails after destroyed');
+
+promise_test(async t => {
+  const controller = new AbortController();
+  controller.abort();
+
+  const createPromise = createTranslator(
+      {signal: controller.signal, sourceLanguage: 'en', targetLanguage: 'ja'});
+
+  await promise_rejects_dom(t, 'AbortError', createPromise);
+}, 'Translator.create() call with an aborted signal.');
+
+promise_test(async t => {
+  await testAbortPromise(t, signal => {
+    return createTranslator(
+        {signal, sourceLanguage: 'en', targetLanguage: 'ja'});
+  });
+}, 'Aborting Translator.create().');
+
+promise_test(async t => {
+  const controller = new AbortController();
+  controller.abort();
+
+  const translator =
+      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
+  const translatePromise =
+      translator.translate('hello', {signal: controller.signal});
+
+  await promise_rejects_dom(t, 'AbortError', translatePromise);
+}, 'Translator.translate() call with an aborted signal.');
+
+promise_test(async t => {
+  const translator =
+      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
+  await testAbortPromise(t, signal => {
+    return translator.translate('hello', {signal});
+  });
+}, 'Aborting Translator.translate().');
+
+promise_test(async t => {
+  await testMonitor(
+      createTranslator, {sourceLanguage: 'en', targetLanguage: 'ja'});
+}, 'Translator.create() notifies its monitor on downloadprogress');
+
+promise_test(async t => {
+  const translator =
+      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
+
+  // Strings containing only white space are not translatable.
+  const nonTranslatableStrings = ['', ' ', '     ', ' \r\n\t\f'];
+
+  // Strings containing only control characters are not translatable.
+  for (let c = 0; c < 0x1F; c++) {
+    nonTranslatableStrings.push(String.fromCharCode(c));
+  }
+
+  const translatedNonTranslatableString = await Promise.all(
+      nonTranslatableStrings.map(str => translator.translate(str)));
+
+  // Non translatable strings should be echoed back
+  assert_array_equals(translatedNonTranslatableString, nonTranslatableStrings);
+
+  // Adding translatable text makes it translatable.
+  const translatableStrings =
+      nonTranslatableStrings.map(str => `Hello ${str} world`);
+
+  const translatedTranslatableString = await Promise.all(
+      translatableStrings.map(str => translator.translate(str)));
+
+  // All the strings should have been translated in some way.
+  for (let i = 0; i < translatableStrings.length; i++) {
+    assert_not_equals(translatedTranslatableString[i], translatableStrings[i]);
+  }
+}, 'Translator.translate() echoes non-translatable content');
+
+promise_test(async t => {
+  const translator =
+      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
+
+  const text = 'hello';
+  const inputUsage = await translator.measureInputUsage(text);
+
+  assert_greater_than_equal(translator.inputQuota, 0);
+  assert_greater_than_equal(inputUsage, 0);
+
+  if (inputUsage < translator.inputQuota) {
+    assert_equals(await translator.translate(text), 'こんにちは');
+  } else {
+    await promise_rejects_dom(
+        t, 'QuotaExceededError', translator.translate(text));
+  }
+}, 'Translator.measureInputUsage() and inputQuota basic usage.');
+
+promise_test(async t => {
+  const controller = new AbortController();
+  controller.abort();
+
+  const translator =
+      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
+  const measureInputUsagePromise =
+      translator.measureInputUsage('hello', {signal: controller.signal});
+
+  await promise_rejects_dom(t, 'AbortError', measureInputUsagePromise);
+}, 'Translator.measureInputUsage() call with an aborted signal.');
+
+promise_test(async t => {
+  const translator =
+      await createTranslator({sourceLanguage: 'en', targetLanguage: 'ja'});
+  await testAbortPromise(t, signal => {
+    return translator.measureInputUsage('hello', {signal});
+  });
+}, 'Aborting Translator.measureInputUsage().');
diff --git a/tests/wpt/tests/audio-output/setSinkId.https.html b/tests/wpt/tests/audio-output/setSinkId.https.html
index be65f0ac81b..662596910ee 100644
--- a/tests/wpt/tests/audio-output/setSinkId.https.html
+++ b/tests/wpt/tests/audio-output/setSinkId.https.html
@@ -26,14 +26,8 @@ promise_test(async t => {
   const list = await navigator.mediaDevices.enumerateDevices();
   assert_greater_than(list.length, 0,
                       "media device list includes at least one device");
-  const audioInputList = list.filter(({kind}) => kind == "audioinput");
   const outputDevicesList = list.filter(({kind}) => kind == "audiooutput");
-  // List of exposed microphone groupIds
-  const exposedGroupIds = new Set(audioInputList.map(device => device.groupId));
-
   for (const { deviceId, groupId } of outputDevicesList) {
-    assert_true(exposedGroupIds.has(groupId),
-                "audiooutput device groupId must match an exposed microphone");
     assert_greater_than(deviceId.length, 0, "deviceId.length");
 
     const p1 = audio.setSinkId(deviceId);
diff --git a/tests/wpt/tests/badging/WEB_FEATURES.yml b/tests/wpt/tests/badging/WEB_FEATURES.yml
new file mode 100644
index 00000000000..3c4f69200f6
--- /dev/null
+++ b/tests/wpt/tests/badging/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: badging
+  files: "**"
diff --git a/tests/wpt/tests/bluetooth/resources/bluetooth-test.js b/tests/wpt/tests/bluetooth/resources/bluetooth-test.js
index bd597efd01b..05981c07e15 100644
--- a/tests/wpt/tests/bluetooth/resources/bluetooth-test.js
+++ b/tests/wpt/tests/bluetooth/resources/bluetooth-test.js
@@ -370,7 +370,7 @@ function assert_promise_resolves_after_event(
 }
 
 /**
- * Returns a promise that resolves after 100ms unless the the event is fired on
+ * Returns a promise that resolves after 100ms unless the event is fired on
  * the object in which case the promise rejects.
  * @param {EventTarget} object The target object to listen for events.
  * @param {string} event_name The event type to listen for.
diff --git a/tests/wpt/tests/clear-site-data/WEB_FEATURES.yml b/tests/wpt/tests/clear-site-data/WEB_FEATURES.yml
new file mode 100644
index 00000000000..d55b5faaf11
--- /dev/null
+++ b/tests/wpt/tests/clear-site-data/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: clear-site-data
+  files: "**"
diff --git a/tests/wpt/tests/clear-site-data/clear-cache-bfcache.sub.https.html b/tests/wpt/tests/clear-site-data/clear-cache-bfcache.sub.https.html
new file mode 100644
index 00000000000..61d810f453b
--- /dev/null
+++ b/tests/wpt/tests/clear-site-data/clear-cache-bfcache.sub.https.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title>Clear-Site-Data: cache for bfcache</title>
+<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="support/clear-cache-helper.sub.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/html/browsers/browsing-the-web/back-forward-cache/resources/helper.sub.js"></script>
+<script type="module">
+
+const sameOrigin =
+  'https://{{host}}:{{ports[https][0]}}';
+const subdomainOrigin =
+  'https://{{hosts[][www2]}}:{{ports[https][0]}}';
+const crossSiteOrigin =
+  'https://{{hosts[alt][]}}:{{ports[https][0]}}';
+
+// The tests are built on top of the back-forward-cache test harness.
+// Here is the steps for the tests:
+// 1. Open a new window and navigate to a test URL.
+// 2. Navigate the window to a second page.
+// 3. Trigger the clear-site-data header either by window.open() or loading an
+//    iframe from the second page.
+// 4. Navigate back to the first page.
+// 5. Assert that the first page is or is not cached.
+
+function runBfCacheClearTest(params, description) {
+  runBfcacheTest(
+    {
+      targetOrigin: sameOrigin,
+      scripts: ["/clear-site-data/support/clear-cache-helper.sub.js"],
+      funcBeforeBackNavigation: async (getUrlParams, mode) => {
+
+        const cacheHelper = self.crypto.randomUUID();
+        const testUrl = getUrl(cacheHelper, getUrlParams);
+
+        let clearingPromise;
+        if (mode === "window") {
+          clearingPromise = new Promise(resolve => {
+            window.addEventListener("message", resolve, {once: true});
+            window.open(testUrl);
+          });
+        } else if (mode === "iframe") {
+          clearingPromise = new Promise(resolve => {
+            const iframe = document.createElement("iframe");
+            iframe.src = testUrl;
+            document.body.appendChild(iframe);
+            iframe.onload = resolve;
+          });
+        } else {
+          throw new Error("Unsupported mode");
+        }
+
+        await clearingPromise;
+      },
+      argsBeforeBackNavigation: [params.getUrlParams, params.mode],
+      ...params,
+    },
+    description
+  );
+}
+
+runBfCacheClearTest(
+  {
+    getUrlParams: {
+      clear: "cache",
+    },
+    mode: "iframe",
+    shouldBeCached: false,
+  },
+  "BfCached document shouldn't be cached after receiving clear-cache header from the same origin."
+);
+
+runBfCacheClearTest(
+  {
+    targetOrigin: subdomainOrigin,
+    getUrlParams: {
+      subdomain: true,
+      clear: "cache",
+    },
+    mode: "iframe",
+    shouldBeCached: true,
+  },
+  "BfCached document should be cached after receiving clear-cache header from a subdomain."
+);
+
+runBfCacheClearTest(
+  {
+    targetOrigin: crossSiteOrigin,
+    getUrlParams: {
+      secondOrigin: true,
+      clear: "cache",
+    },
+    mode: "iframe",
+    shouldBeCached: true,
+  },
+  "BfCached document should be cached after receiving clear-cache header from another site."
+);
+
+runBfCacheClearTest(
+  {
+    getUrlParams: {
+      clear: "cache",
+    },
+    mode: "window",
+    shouldBeCached: false,
+  },
+  "BfCached document shouldn't be cached after receiving clear-cache header from another window."
+);
+
+</script>
diff --git a/tests/wpt/tests/clear-site-data/clear-cache-partitioning.sub.https.html b/tests/wpt/tests/clear-site-data/clear-cache-partitioning.sub.https.html
deleted file mode 100644
index b3841450b5a..00000000000
--- a/tests/wpt/tests/clear-site-data/clear-cache-partitioning.sub.https.html
+++ /dev/null
@@ -1,271 +0,0 @@
-<!DOCTYPE html>
-<body>
-<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>
-
-/**
- * Constructs a url for an intermediate "bounce" hop which represents a tracker.
- * @param {string} cacheHelper - Unique uuid for this test
- * @param {*} options - URL generation options.
- * @param {boolean} [options.second_origin = true] - whether domain should be a different origin
- * @param {boolean} [options.subdomain = false] - whether the domain should start with
- *        a different subdomain
- * @param {boolean} [options.cache = false] - whether the resource should be cacheable
- * @param {(null|'cache'|'all')} [options.clear] - whether to send the
- *        Clear-Site-Data header.
- * @param {(null|'cache'|'all')} [options.clear_first] - whether to send the
- *        Clear-Site-Data header on first response
- * @param {*} [options.iframe] - iframe same parameters as options (recursive)
- */
-function getUrl(cacheHelper, {
-    subdomain = false,
-    secondOrigin = false,
-    cache = false,
-    clear = null,
-    clearFirst = null,
-    iframe = null,
-}) {
-    let url = "https://";
-    if (subdomain && secondOrigin) {
-        url += "{{hosts[alt][www2]}}";
-    } else if (subdomain) { // && !second_origin
-        url += "{{hosts[][www2]}}";
-    } else if (secondOrigin) { // && !subdomain
-        url += "{{hosts[alt][]}}";
-    } else { // !second_origin && !subdomain
-        url += "{{hosts[][]}}";
-    }
-    url += ":{{ports[https][1]}}";
-    url += "/clear-site-data/support/clear-site-data-cache.py";
-    url = new URL(url);
-    let params = new URLSearchParams();
-    params.append("cache_helper", cacheHelper);
-    params.append("response", "single_html")
-    if (clear !== null) {
-        params.append("clear", clear);
-    }
-    if (clearFirst != null) {
-        params.append("clear_first", clearFirst);
-    }
-    if (cache) {
-        params.append("cache", "");
-    }
-    if (iframe != null) {
-        let iframeUrl = getUrl(cacheHelper, iframe);
-        params.append("iframe", iframeUrl);
-    }
-    url.search = params;
-    return url.toString();
-}
-
-/**
- * Opens test pages sequentially, compares first and last uuid. Makes sure test cleans up properly
- * @param test - test clean up
- * @param {string} firstUuid - uuid returned by first url
- * @param {array[string]} testUrls - array of all urls that should be visited
- * @param {integer} curIdx - index in testUrls that is visited in the current function call
- * @param {function assert_not_equal|assert_equal} assert - function that gets passed first and last
- *        uuid and determines the success of the test case
- * @param {function} resolve - function to call when test case is complete
- * @param {*} options - URL generation options.
- */
-function openTestPageHelper(test, firstUuid, testUrls, curIdx, assert, resolve) {
-    window.addEventListener("message", test.step_func(e => {
-        let curUuid = e.data;
-        if (firstUuid === null) {
-            firstUuid = curUuid;
-        }
-
-        if (curIdx + 1 < testUrls.length) {
-            openTestPageHelper(test, firstUuid, testUrls, curIdx + 1, assert, resolve);
-        } else {
-            // Last Step
-            assert(firstUuid, curUuid);
-            resolve();
-        }
-    }), {once: true});
-
-    window.open(testUrls[curIdx]);
-}
-
-// Here's the set-up for this test: Step 1 and Step 2 are repeated for each param in params
-// Step 1 (main window) Open popup window with url generated with `getUrl`
-// Step 2 (first window) Message main window with potentially cached uuid and close popup
-// Last Step (main window): Assert first and last uuid not equal due to `clear-site-data: "cache"` header
-//
-// Basic diagram visualizing how the test works:
-//
-//     main window opens sequentially:
-//             (1)                  (2)                (last) = (1)
-//              | Step 1             | Step 3                | Step 4
-//              |                    |                       |
-//     +--------v---------+   +------v----------+     +------v-----------+
-//     | first / second   |   |  Clear Data?    |     |                  |
-//     | origin           |   |                 |     |                  |
-//     |                  |   |                 |     |                  |
-//     | +-iframe-------+ |   | +-(iframe?)---+ | ... | +-iframe-------+ |
-//     | | first/second | |   | | Clear Data? | |     | |              | |
-//     | | origin       | |   | |             | |     | |              | |
-//     | +-----------+--+ |   | +-------------+ |     | +-+------------+ |
-//     +-------------+----+   +-----------------+     +---+--------------+
-//                   |                                    |
-//                   | Step 2            +----------------+ Step 5
-//                   |                   |
-//                   v                   v
-//     Last Step: is uuid from (1) different from (last)?
-function testCacheClear(test, params, assert) {
-    if (params.length < 2) {
-        // fail test case
-        return new Promise((resolve, reject) => reject());
-    }
-
-    const cacheHelper = self.crypto.randomUUID();
-    const testUrls = params.map((param) => getUrl(cacheHelper, param));
-
-    return new Promise(resolve => {
-        openTestPageHelper(test, null, testUrls, 0, assert, resolve)
-    });
-}
-
-const CLEAR_ORIGIN_CACHE = {
-    clear: "cache",
-}
-
-promise_test(test => {
-    const TEST_SITE = {
-        iframe: {
-            cache: true,
-        }
-    }
-    return testCacheClear(test, [TEST_SITE, CLEAR_ORIGIN_CACHE, TEST_SITE], assert_not_equals);
-}, "same site data also gets cleared in iframe");
-
-promise_test(test => {
-    const TEST_SITE = {
-        iframe: {
-            cache: true,
-            secondOrigin: true,
-        }
-    }
-    return testCacheClear(test, [TEST_SITE, CLEAR_ORIGIN_CACHE, TEST_SITE], assert_equals);
-}, "cross origin iframe data doesn't get cleared");
-
-promise_test(test => {
-    const TEST_SITE = {
-        cache: true,
-    }
-    const CLEAR_ORIGIN_CACHE = {
-        iframe: {
-            clear: "cache",
-            secondOrigin: true,
-        }
-    }
-    return testCacheClear(test, [TEST_SITE, CLEAR_ORIGIN_CACHE, TEST_SITE], assert_equals);
-}, "clear in cross origin iframe doesn't affect embedder");
-
-promise_test(test => {
-    const TEST_SITE = {
-        cache: true,
-        subdomain: true,
-    }
-    return testCacheClear(test, [TEST_SITE, CLEAR_ORIGIN_CACHE, TEST_SITE], assert_equals);
-}, "clearing cache doesn't affect subdomain");
-
-promise_test(test => {
-    const TEST_SITE = {
-        iframe: {
-            secondOrigin: true,
-            cache: true,
-        }
-    }
-    const TEST_SITE_CLEAR_IFRAME = {
-        iframe: {
-            secondOrigin: true,
-            clear: "all",
-        }
-    }
-    return testCacheClear(test, [TEST_SITE, TEST_SITE_CLEAR_IFRAME, TEST_SITE], assert_not_equals);
-}, "clear in cross origin iframe clears data from that iframe");
-
-promise_test(test => {
-    const TEST_SITE = {
-        cache: true
-    };
-    const TEST_SITE_CLEAR_IFRAME = {
-        secondOrigin: true,
-        iframe: {
-            clear: "cache",
-        }
-    }
-    return testCacheClear(test, [TEST_SITE, TEST_SITE_CLEAR_IFRAME, TEST_SITE], assert_equals);
-}, "clear in cross origin iframe doesn't clear unpartitioned data from that cross origin");
-
-promise_test(test => {
-    const TEST_SITE = {
-        secondOrigin: true,
-        iframe: {
-            cache: true,
-        }
-    }
-
-    const TEST_SITE_CLEAR_IFRAME = {
-        clear: "cache"
-    };
-    return testCacheClear(test, [TEST_SITE, TEST_SITE_CLEAR_IFRAME, TEST_SITE], assert_equals);
-}, "clear in unpartitioned context doesn't clear partitioned data");
-
-promise_test(test => {
-    const TEST_SITE = {
-        iframe: {
-            secondOrigin: true,
-            iframe: {
-                cache: true,
-            }
-        }
-    }
-    return testCacheClear(test, [TEST_SITE, CLEAR_ORIGIN_CACHE, TEST_SITE], assert_equals);
-}, "clear in unpartitioned context doesn't clear double partitioned data with intermediate cross origin");
-
-promise_test(test => {
-    const TEST_SITE = {
-        cache: true,
-    };
-
-    const TEST_CLEAR_IFRAME_IFRAME = {
-        iframe: {
-            secondOrigin: true,
-            iframe: {
-                clear: "cache",
-            }
-        }
-    }
-    return testCacheClear(test, [TEST_SITE, TEST_CLEAR_IFRAME_IFRAME, TEST_SITE], assert_equals);
-}, "clear in double partitioned with intermediate cross origin context doesn't clear unpartitioned data");
-
-promise_test(test => {
-    const TEST_SITE = {
-        iframe: {
-            secondOrigin: true,
-            iframe: {
-                cache: true,
-            }
-        }
-    }
-
-    const TEST_CLEAR_IFRAME_IFRAME = {
-        iframe: {
-            secondOrigin: true,
-            iframe: {
-                clear: "cache",
-            }
-        }
-    }
-    return testCacheClear(test, [TEST_SITE, TEST_CLEAR_IFRAME_IFRAME, TEST_SITE], assert_not_equals);
-}, "clear double partitioned context with intermediate cross origin clears that partitioned data");
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/clear-site-data/clear-cache-partitioning.tentative.https.html b/tests/wpt/tests/clear-site-data/clear-cache-partitioning.tentative.https.html
new file mode 100644
index 00000000000..2deadeef2d0
--- /dev/null
+++ b/tests/wpt/tests/clear-site-data/clear-cache-partitioning.tentative.https.html
@@ -0,0 +1,149 @@
+<!DOCTYPE html>
+<body>
+<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="support/clear-cache-helper.sub.js"></script>
+<script>
+"use strict";
+
+const CLEAR_ORIGIN_CACHE = {
+    clear: "cache",
+}
+
+promise_test(test => {
+    const TEST_SITE = {
+        iframe: {
+            cache: true,
+        }
+    }
+    return testCacheClear(test, [TEST_SITE, CLEAR_ORIGIN_CACHE, TEST_SITE], assert_not_equals);
+}, "same site data also gets cleared in iframe");
+
+promise_test(test => {
+    const TEST_SITE = {
+        iframe: {
+            cache: true,
+            secondOrigin: true,
+        }
+    }
+    return testCacheClear(test, [TEST_SITE, CLEAR_ORIGIN_CACHE, TEST_SITE], assert_equals);
+}, "cross origin iframe data doesn't get cleared");
+
+promise_test(test => {
+    const TEST_SITE = {
+        cache: true,
+    }
+    const CLEAR_ORIGIN_CACHE = {
+        iframe: {
+            clear: "cache",
+            secondOrigin: true,
+        }
+    }
+    return testCacheClear(test, [TEST_SITE, CLEAR_ORIGIN_CACHE, TEST_SITE], assert_equals);
+}, "clear in cross origin iframe doesn't affect embedder");
+
+promise_test(test => {
+    const TEST_SITE = {
+        cache: true,
+        subdomain: true,
+    }
+    return testCacheClear(test, [TEST_SITE, CLEAR_ORIGIN_CACHE, TEST_SITE], assert_equals);
+}, "clearing cache doesn't affect subdomain");
+
+promise_test(test => {
+    const TEST_SITE = {
+        iframe: {
+            secondOrigin: true,
+            cache: true,
+        }
+    }
+    const TEST_SITE_CLEAR_IFRAME = {
+        iframe: {
+            secondOrigin: true,
+            clear: "all",
+        }
+    }
+    return testCacheClear(test, [TEST_SITE, TEST_SITE_CLEAR_IFRAME, TEST_SITE], assert_not_equals);
+}, "clear in cross origin iframe clears data from that iframe");
+
+promise_test(test => {
+    const TEST_SITE = {
+        cache: true
+    };
+    const TEST_SITE_CLEAR_IFRAME = {
+        secondOrigin: true,
+        iframe: {
+            clear: "cache",
+        }
+    }
+    return testCacheClear(test, [TEST_SITE, TEST_SITE_CLEAR_IFRAME, TEST_SITE], assert_equals);
+}, "clear in cross origin iframe doesn't clear unpartitioned data from that cross origin");
+
+promise_test(test => {
+    const TEST_SITE = {
+        secondOrigin: true,
+        iframe: {
+            cache: true,
+        }
+    }
+
+    const TEST_SITE_CLEAR_IFRAME = {
+        clear: "cache"
+    };
+    return testCacheClear(test, [TEST_SITE, TEST_SITE_CLEAR_IFRAME, TEST_SITE], assert_equals);
+}, "clear in unpartitioned context doesn't clear partitioned data");
+
+promise_test(test => {
+    const TEST_SITE = {
+        iframe: {
+            secondOrigin: true,
+            iframe: {
+                cache: true,
+            }
+        }
+    }
+    return testCacheClear(test, [TEST_SITE, CLEAR_ORIGIN_CACHE, TEST_SITE], assert_equals);
+}, "clear in unpartitioned context doesn't clear double partitioned data with intermediate cross origin");
+
+promise_test(test => {
+    const TEST_SITE = {
+        cache: true,
+    };
+
+    const TEST_CLEAR_IFRAME_IFRAME = {
+        iframe: {
+            secondOrigin: true,
+            iframe: {
+                clear: "cache",
+            }
+        }
+    }
+    return testCacheClear(test, [TEST_SITE, TEST_CLEAR_IFRAME_IFRAME, TEST_SITE], assert_equals);
+}, "clear in double partitioned with intermediate cross origin context doesn't clear unpartitioned data");
+
+promise_test(test => {
+    const TEST_SITE = {
+        iframe: {
+            secondOrigin: true,
+            iframe: {
+                cache: true,
+            }
+        }
+    }
+
+    const TEST_CLEAR_IFRAME_IFRAME = {
+        iframe: {
+            secondOrigin: true,
+            iframe: {
+                clear: "cache",
+            }
+        }
+    }
+    return testCacheClear(test, [TEST_SITE, TEST_CLEAR_IFRAME_IFRAME, TEST_SITE], assert_not_equals);
+}, "clear double partitioned context with intermediate cross origin clears that partitioned data");
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/clear-site-data/clear-cache.https.html b/tests/wpt/tests/clear-site-data/clear-cache.https.html
index e356001d0c8..c75c2e16bec 100644
--- a/tests/wpt/tests/clear-site-data/clear-cache.https.html
+++ b/tests/wpt/tests/clear-site-data/clear-cache.https.html
@@ -4,100 +4,111 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
+<script src="support/clear-cache-helper.sub.js"></script>
 <script>
 
-// Here's the set-up for this test:
-// Step 1 (main window) Open first window with first url putting some resource
-//                      into the cache and maybe receiving clear-site-data header
-// Step 2 (first window) Message main window with uuid
-// Step 3 (main window) Open second window with second url
-// Step 4 (second window) Message main window with uuid (either cached or non-cached)
-// Optional Step 5 (main window) Open third window with third url
-// Optional Step 6 (third window) Message main window with uuid (either cached or non-cached)
-// Step 7 (main window): Assert first and last uuid not equal due to `clear-site-data: "cache"` header
-function test_cache_clear(test, params1, params2, params3) {
-    let cache_helper = "cache_helper=" + self.crypto.randomUUID() + "&";
-    let firstUrl = "/clear-site-data/support/clear-site-data-cache.py?" + cache_helper + params1
-    let secondUrl = "/clear-site-data/support/clear-site-data-cache.py?" + cache_helper + params2;
-    let thirdUrl = params3 ? "/clear-site-data/support/clear-site-data-cache.py?" + cache_helper + params3 : null;
-
-    return new Promise(resolve => {
-        window.addEventListener("message", test.step_func(e => {
-            // Result Step 2
-            let firstUuid = e.data;
-
-            window.addEventListener("message", test.step_func(e => {
-                // Result Step 4
-                let secondUuid = e.data;
-
-                if (thirdUrl === null) {
-                    // Step 7, skipping the optional step 5 and 6
-                    assert_not_equals(firstUuid, secondUuid);
-                    resolve();
-                } else {
-                    window.addEventListener("message", test.step_func(e => {
-                        // Result Step 6
-                        let thirdUuid = e.data;
-
-                        // Step 7
-                        assert_not_equals(firstUuid, thirdUuid);
-                        resolve();
-
-                    }), {once: true});
-
-                    // Step 5
-                    window.open(thirdUrl);
-                }
-
-            }), {once: true});
-
-            // Step 3
-            window.open(secondUrl);
-        }), {once: true});
-
-        // Step 1
-        window.open(firstUrl);
-    });
-}
-
-promise_test(t => {
-    return test_cache_clear(t, "response=single_html&cache&clear_first=cache", "response=single_html&cache&clear_first=cache");
+promise_test(test => {
+    const TEST_SITE = {
+        cache: true,
+        clearFirst: "cache",
+    };
+    return testCacheClear(test, [TEST_SITE, TEST_SITE], assert_not_equals);
 }, "clear cache: Document with clear-cache header doesn't get cached");
 
-promise_test(t => {
-    return test_cache_clear(t, "response=single_html&cache&clear_first=all", "response=single_html&cache&clear_first=all");
+promise_test(test => {
+    const TEST_SITE = {
+        cache: true,
+        clearFirst: "all",
+    };
+    return testCacheClear(test, [TEST_SITE, TEST_SITE], assert_not_equals);
 }, "clear all: Document with clear-cache header doesn't get cached");
 
-promise_test(t => {
-    return test_cache_clear(t, "response=html_embed_json&clear=cache", "response=html_embed_json&clear=cache");
-}, "clear cache: Fetch on docment with clear-cache header doesn't get cached");
+promise_test(test => {
+    const TEST_SITE_INITAL = {
+        response: "html_embed_json",
+        clear: "cache",
+    };
+    const TEST_SITE_FINAL = {
+        response: "html_embed_json",
+    };
+    // Clear-Cache header doesn't affect fetch on document due to clear-cache
+    // being initiated in a point of time. The fetch happens later and stays
+    // in the cache.
+    return testCacheClear(test, [TEST_SITE_INITAL, TEST_SITE_FINAL], assert_equals);
+}, "clear cache: Fetch on docment with clear-cache header is unaffected");
 
-promise_test(t => {
-    return test_cache_clear(t, "response=html_embed_json&clear=all", "response=html_embed_json&clear=all");
-}, "clear all: Fetch on docment with clear-cache header doesn't get cached");
+promise_test(test => {
+    const TEST_SITE_INITAL = {
+        response: "html_embed_json",
+        clear: "all",
+    };
+    const TEST_SITE_FINAL = {
+        response: "html_embed_json",
+    };
+    // same as above
+    return testCacheClear(test, [TEST_SITE_INITAL, TEST_SITE_FINAL], assert_equals);
+}, "clear all: Fetch on docment with clear-cache header is unaffected");
 
-promise_test(t => {
-    return test_cache_clear(t, "response=html_embed_json", "response=html_embed_json&clear=cache");
+promise_test(test => {
+    const TEST_SITE_INITAL = {
+        response: "html_embed_json",
+    };
+    const TEST_SITE_FINAL = {
+        response: "html_embed_json",
+        clear: "cache",
+    };
+    return testCacheClear(test, [TEST_SITE_INITAL, TEST_SITE_FINAL], assert_not_equals);
 }, "clear cache: Previously cached fetch gets cleared");
 
-promise_test(t => {
-    return test_cache_clear(t, "response=html_embed_json", "response=html_embed_json&clear=all");
+promise_test(test => {
+    const TEST_SITE_INITAL = {
+        response: "html_embed_json",
+    };
+    const TEST_SITE_FINAL = {
+        response: "html_embed_json",
+        clear: "all",
+    };
+    return testCacheClear(test, [TEST_SITE_INITAL, TEST_SITE_FINAL], assert_not_equals);
 }, "clear all: Previously cached fetch gets cleared");
 
-promise_test(t => {
-    return test_cache_clear(t, "response=html_embed_json", "response=single_html&clear=cache", "response=html_embed_json");
+promise_test(test => {
+    const TEST_SITE = {
+        response: "html_embed_json",
+    };
+    const TEST_SITE_CLEAR = {
+        clear: "cache",
+    };
+    return testCacheClear(test, [TEST_SITE, TEST_SITE_CLEAR, TEST_SITE], assert_not_equals);
 }, "clear cache: Clear fetch on intermediate navigation");
 
-promise_test(t => {
-    return test_cache_clear(t, "response=html_embed_json", "response=single_html&clear=all", "response=html_embed_json");
+promise_test(test => {
+    const TEST_SITE = {
+        response: "html_embed_json",
+    };
+    const TEST_SITE_CLEAR = {
+        clear: "all",
+    };
+    return testCacheClear(test, [TEST_SITE, TEST_SITE_CLEAR, TEST_SITE], assert_not_equals);
 }, "clear all: Clear fetch on intermediate navigation");
 
-promise_test(t => {
-    return test_cache_clear(t, "response=single_html&cache", "response=single_html&clear=cache", "response=single_html&cache");
+promise_test(test => {
+    const TEST_SITE = {
+        cache: true,
+    };
+    const TEST_SITE_CLEAR = {
+        clear: "cache",
+    };
+    return testCacheClear(test, [TEST_SITE, TEST_SITE_CLEAR, TEST_SITE], assert_not_equals);
 }, "clear cache: Clear document in intermediate load");
 
-promise_test(t => {
-    return test_cache_clear(t, "response=single_html&cache", "response=single_html&clear=all", "response=single_html&cache");
+promise_test(test => {
+    const TEST_SITE = {
+        cache: true,
+    };
+    const TEST_SITE_CLEAR = {
+        clear: "all",
+    };
+    return testCacheClear(test, [TEST_SITE, TEST_SITE_CLEAR, TEST_SITE], assert_not_equals);
 }, "clear all: Clear document in intermediate load");
 
 </script>
diff --git a/tests/wpt/tests/clear-site-data/support/clear-cache-helper.sub.js b/tests/wpt/tests/clear-site-data/support/clear-cache-helper.sub.js
new file mode 100644
index 00000000000..5db0caf834c
--- /dev/null
+++ b/tests/wpt/tests/clear-site-data/support/clear-cache-helper.sub.js
@@ -0,0 +1,132 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict"
+
+/**
+ * Constructs a url for an intermediate "bounce" hop which represents a tracker.
+ * @param {string} cacheHelper - Unique uuid for this test
+ * @param {*} options - URL generation options.
+ * @param {boolean} [options.second_origin = true] - whether domain should be a different origin
+ * @param {boolean} [options.subdomain = false] - whether the domain should start with
+ *        a different subdomain
+ * @param {boolean} [options.cache = false] - whether the resource should be cacheable
+ * @param {(null|'cache'|'all')} [options.clear] - whether to send the
+ *        Clear-Site-Data header.
+ * @param {(null|'cache'|'all')} [options.clear_first] - whether to send the
+ *        Clear-Site-Data header on first response
+ * @param {string} [response] - which response to elict - defaults to "single_html". Other
+ *        options can be found in "clear-site-data-cache.py" server helper.
+ * @param {*} [options.iframe] - iframe same parameters as options (recursive). Only works on
+ *        "single_html" variation of response
+ */
+function getUrl(cacheHelper, {
+    subdomain = false,
+    secondOrigin = false,
+    cache = false,
+    clear = null,
+    clearFirst = null,
+    response = "single_html",
+    iframe = null,
+}) {
+    let url = "https://";
+    if (subdomain && secondOrigin) {
+        url += "{{hosts[alt][www2]}}";
+    } else if (subdomain) { // && !second_origin
+        url += "{{hosts[][www2]}}";
+    } else if (secondOrigin) { // && !subdomain
+        url += "{{hosts[alt][]}}";
+    } else { // !second_origin && !subdomain
+        url += "{{hosts[][]}}";
+    }
+    url += ":{{ports[https][0]}}";
+    url += "/clear-site-data/support/clear-site-data-cache.py";
+    url = new URL(url);
+    let params = new URLSearchParams();
+    params.append("cache_helper", cacheHelper);
+    params.append("response", response)
+    if (clear !== null) {
+        params.append("clear", clear);
+    }
+    if (clearFirst != null) {
+        params.append("clear_first", clearFirst);
+    }
+    if (cache) {
+        params.append("cache", "");
+    }
+    if (iframe != null) {
+        let iframeUrl = getUrl(cacheHelper, iframe);
+        params.append("iframe", iframeUrl);
+    }
+    url.search = params;
+    return url.toString();
+}
+
+/**
+ * Opens test pages sequentially, compares first and last uuid. Makes sure test cleans up properly
+ * @param test - test clean up
+ * @param {string} firstUuid - uuid returned by first url
+ * @param {array[string]} testUrls - array of all urls that should be visited
+ * @param {integer} curIdx - index in testUrls that is visited in the current function call
+ * @param {function assert_not_equal|assert_equal} assert - function that gets passed first and last
+ *        uuid and determines the success of the test case
+ * @param {function} resolve - function to call when test case is complete
+ * @param {*} options - URL generation options.
+ */
+function openTestPageHelper(test, firstUuid, testUrls, curIdx, assert, resolve) {
+    window.addEventListener("message", test.step_func(e => {
+        let curUuid = e.data;
+        if (firstUuid === null) {
+            firstUuid = curUuid;
+        }
+
+        if (curIdx + 1 < testUrls.length) {
+            openTestPageHelper(test, firstUuid, testUrls, curIdx + 1, assert, resolve);
+        } else {
+            // Last Step
+            assert(firstUuid, curUuid);
+            resolve();
+        }
+    }), {once: true});
+
+    window.open(testUrls[curIdx]);
+}
+
+// Here's the set-up for this test: Step 1 and Step 2 are repeated for each param in params
+// Step 1 (main window) Open popup window with url generated with `getUrl`
+// Step 2 (first window) Message main window with potentially cached uuid and close popup
+// Last Step (main window): Assert first and last uuid not equal due to `clear-site-data: "cache"` header
+//
+// Basic diagram visualizing how the test works:
+//
+//     main window opens sequentially:
+//             (1)                  (2)                (last) = (1)
+//              | Step 1             | Step 3                | Step 4
+//              |                    |                       |
+//     +--------v---------+   +------v----------+     +------v-----------+
+//     | first / second   |   |  Clear Data?    |     |                  |
+//     | origin           |   |                 |     |                  |
+//     |                  |   |                 |     |                  |
+//     | +-iframe-------+ |   | +-(iframe?)---+ | ... | +-iframe-------+ |
+//     | | first/second | |   | | Clear Data? | |     | |              | |
+//     | | origin       | |   | |             | |     | |              | |
+//     | +-----------+--+ |   | +-------------+ |     | +-+------------+ |
+//     +-------------+----+   +-----------------+     +---+--------------+
+//                   |                                    |
+//                   | Step 2            +----------------+ Step 5
+//                   |                   |
+//                   v                   v
+//     Last Step: is uuid from (1) different from (last)?
+function testCacheClear(test, params, assert) {
+    if (params.length < 2) {
+        // fail test case
+        return new Promise((resolve, reject) => reject());
+    }
+
+    const cacheHelper = self.crypto.randomUUID();
+    const testUrls = params.map((param) => getUrl(cacheHelper, param));
+
+    return new Promise(resolve => {
+        openTestPageHelper(test, null, testUrls, 0, assert, resolve)
+    });
+}
diff --git a/tests/wpt/tests/clear-site-data/support/clear-site-data-prefetchCache.py b/tests/wpt/tests/clear-site-data/support/clear-site-data-prefetchCache.py
new file mode 100644
index 00000000000..3a332dd58b2
--- /dev/null
+++ b/tests/wpt/tests/clear-site-data/support/clear-site-data-prefetchCache.py
@@ -0,0 +1,18 @@
+def main(request, response):
+    headers = [(b"Content-Type", b"text/html")]
+    headers += [(b"Clear-Site-Data", b'"prefetchCache"')]
+    content = f'''
+        <script>
+            setTimeout(() => {{
+                if(window.opener) {{
+                    window.opener.postMessage("message", "*");
+                }} else {{
+                    window.parent.postMessage("message", "*");
+                }}
+                window.close();
+            }}, 1000);
+        </script>
+        <body>
+            {request.url}
+        </body>'''
+    return 200, headers, content
diff --git a/tests/wpt/tests/clear-site-data/support/clear-site-data-prerenderCache.py b/tests/wpt/tests/clear-site-data/support/clear-site-data-prerenderCache.py
new file mode 100644
index 00000000000..bf845cfb699
--- /dev/null
+++ b/tests/wpt/tests/clear-site-data/support/clear-site-data-prerenderCache.py
@@ -0,0 +1,18 @@
+def main(request, response):
+    headers = [(b"Content-Type", b"text/html")]
+    headers += [(b"Clear-Site-Data", b'"prerenderCache"')]
+    content = f'''
+        <script>
+            setTimeout(() => {{
+                if(window.opener) {{
+                    window.opener.postMessage("message", "*");
+                }} else {{
+                    window.parent.postMessage("message", "*");
+                }}
+                window.close();
+            }}, 1000);
+        </script>
+        <body>
+            {request.url}
+        </body>'''
+    return 200, headers, content
diff --git a/tests/wpt/tests/compat/webkit-box-ignores-flex-wrap.tentative.html b/tests/wpt/tests/compat/webkit-box-ignores-flex-wrap.tentative.html
new file mode 100644
index 00000000000..98086f83570
--- /dev/null
+++ b/tests/wpt/tests/compat/webkit-box-ignores-flex-wrap.tentative.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<link rel="help" href="https://compat.spec.whatwg.org/#valdef-flex--webkit-box">
+<link rel="match" href="green-ref.html">
+<div style="display: -webkit-box; flex-wrap: wrap; width: 50px;">
+  <div style="width: 50px; height: 100px; background: green;"></div>
+  <div style="width: 50px; height: 100px; background: green;"></div>
+</div>
diff --git a/tests/wpt/tests/container-timing/META.yml b/tests/wpt/tests/container-timing/META.yml
new file mode 100644
index 00000000000..b7869607899
--- /dev/null
+++ b/tests/wpt/tests/container-timing/META.yml
@@ -0,0 +1,2 @@
+spec: https://github.com/bloomberg/container-timing/
+
diff --git a/tests/wpt/tests/container-timing/resources/container-timing-helpers.js b/tests/wpt/tests/container-timing/resources/container-timing-helpers.js
new file mode 100644
index 00000000000..a80ad964fef
--- /dev/null
+++ b/tests/wpt/tests/container-timing/resources/container-timing-helpers.js
@@ -0,0 +1,22 @@
+function checkContainerEntry(entry, identifier, last_element_id, beforeRender) {
+  assert_equals(entry.entryType, 'container');
+  assert_equals(entry.name, 'container-paints');
+  assert_equals(entry.identifier, identifier, 'identifier does not match');
+  if (last_element_id != null) {
+    assert_equals(entry.lastPaintedElement.id, last_element_id);
+  }
+
+  assert_equals(entry.duration, 0, 'duration should be 0');
+  assert_greater_than_equal(
+      entry.firstRenderTime, beforeRender,
+      'firstRenderTime greater than beforeRender');
+  assert_greater_than_equal(
+      entry.startTime, entry.firstRenderTime,
+      'startTime greater than beforeRender');
+  assert_greater_than_equal(
+      performance.now(), entry.startTime, 'startTime bound by now()')
+}
+
+function checkContainerSize(entry, size) {
+  assert_equals(entry.size, size);
+}
diff --git a/tests/wpt/tests/container-timing/resources/square100.png b/tests/wpt/tests/container-timing/resources/square100.png
new file mode 100644
index 00000000000..567babb96d1
Binary files /dev/null and b/tests/wpt/tests/container-timing/resources/square100.png differ
diff --git a/tests/wpt/tests/container-timing/tentative/containertiming-body-with-child-img.html b/tests/wpt/tests/container-timing/tentative/containertiming-body-with-child-img.html
new file mode 100644
index 00000000000..53e9bc55074
--- /dev/null
+++ b/tests/wpt/tests/container-timing/tentative/containertiming-body-with-child-img.html
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Container Timing: observe with body node with containertiming and image children</title>
+<body containertiming='body_ct'>
+<style>
+body {
+  margin: 0;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/container-timing/resources/container-timing-helpers.js"></script>
+<script src="/element-timing/resources/element-timing-helpers.js"></script>
+<script>
+  let beforeRender;
+  let img;
+  async_test(function (t) {
+    assert_implements(window.PerformanceContainerTiming, "PerformanceContainerTiming is not implemented");
+    const observer = new PerformanceObserver(
+      t.step_func_done(function(entryList) {
+        assert_equals(entryList.getEntries().length, 1);
+        const entry = entryList.getEntries()[0];
+        checkContainerEntry(entry, 'body_ct', 'img_id', beforeRender)
+        checkRect(entry, [0, 100, 0, 100])
+        checkContainerSize(entry, 10000);
+      })
+    );
+    observer.observe({entryTypes: ['container']});
+    // Add the image during onload to be sure that the observer is registered
+    // in time.
+    window.onload = () => {
+      // Add image of width equal to 100 and height equal to 100.
+      const img = document.createElement('img');
+      img.src = '/container-timing/resources/square100.png';
+      img.setAttribute('id', 'img_id');
+      document.body.appendChild(img);
+      beforeRender = performance.now();
+    };
+  }, 'Body with containertiming observed reports children image paints.');
+</script>
+
+</body>
diff --git a/tests/wpt/tests/container-timing/tentative/containertiming-img-itself.html b/tests/wpt/tests/container-timing/tentative/containertiming-img-itself.html
new file mode 100644
index 00000000000..6d55532a419
--- /dev/null
+++ b/tests/wpt/tests/container-timing/tentative/containertiming-img-itself.html
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Container Timing: observe an image with containertiming attribute</title>
+<body>
+<style>
+body {
+  margin: 0;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/container-timing/resources/container-timing-helpers.js"></script>
+<script src="/element-timing/resources/element-timing-helpers.js"></script>
+<script>
+  let beforeRender;
+  async_test(function (t) {
+    assert_implements(window.PerformanceContainerTiming, "PerformanceContainerTiming is not implemented");
+    const observer = new PerformanceObserver(
+      t.step_func_done(function(entryList) {
+        assert_equals(entryList.getEntries().length, 1);
+        const entry = entryList.getEntries()[0];
+        checkContainerEntry(entry, 'image_ct', 'my_id', beforeRender);
+        checkRect(entry, [0, 100, 0, 100])
+        checkContainerSize(entry, 10000);
+      })
+    );
+    observer.observe({entryTypes: ['container']});
+    // Add the image during onload to be sure that the observer is registered
+    // in time.
+    window.onload = () => {
+      // Add image of width equal to 100 and height equal to 100.
+      const img = document.createElement('img');
+      img.src = '/container-timing/resources/square100.png';
+      img.setAttribute('containertiming', 'image_ct');
+      img.setAttribute('id', 'my_id');
+      document.body.appendChild(img);
+      beforeRender = performance.now();
+    };
+  }, 'Element with containertiming attribute is observable and reports the image paint.');
+</script>
+
+</body>
diff --git a/tests/wpt/tests/container-timing/tentative/containertiming-observe-after-paint-with-buffering.html b/tests/wpt/tests/container-timing/tentative/containertiming-observe-after-paint-with-buffering.html
new file mode 100644
index 00000000000..4ceb38afd7d
--- /dev/null
+++ b/tests/wpt/tests/container-timing/tentative/containertiming-observe-after-paint-with-buffering.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Container Timing: starting observation after image paint, with buffering, reports paint.</title>
+<body>
+<style>
+body {
+  margin: 0;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/container-timing/resources/container-timing-helpers.js"></script>
+<script src="/element-timing/resources/element-timing-helpers.js"></script>
+<script>
+  let beforeRender;
+  async_test(function (t) {
+    assert_implements(window.PerformanceContainerTiming, "PerformanceContainerTiming is not implemented");
+    t.step_timeout(() => {
+      const observer = new PerformanceObserver(
+        t.step_func_done(function(entryList) {
+          assert_equals(entryList.getEntries().length, 1);
+          const entry = entryList.getEntries()[0];
+          checkContainerEntry(entry, 'image_ct', 'my_id', beforeRender);
+          checkRect(entry, [0, 100, 0, 100])
+          checkContainerSize(entry, 10000);
+        })
+      );
+      observer.observe({type: 'container', buffered: true });
+    }, 2000);
+    // Add the image during onload to be sure that the observer is registered
+    // in time.
+    window.onload = () => {
+      // Add image of width equal to 100 and height equal to 100.
+      const img = document.createElement('img');
+      img.src = '/container-timing/resources/square100.png';
+      img.setAttribute('containertiming', 'image_ct');
+      img.setAttribute('id', 'my_id');
+      document.body.appendChild(img);
+      beforeRender = performance.now();
+    };
+  }, 'Paint is reported when observation starts after image paint if buffering is enabled.');
+</script>
+
+</body>
diff --git a/tests/wpt/tests/container-timing/tentative/containertiming-observe-after-paint-without-buffering.html b/tests/wpt/tests/container-timing/tentative/containertiming-observe-after-paint-without-buffering.html
new file mode 100644
index 00000000000..0191b2ee758
--- /dev/null
+++ b/tests/wpt/tests/container-timing/tentative/containertiming-observe-after-paint-without-buffering.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Container Timing: observe after painting happened without buffering</title>
+<body>
+<style>
+body {
+  margin: 0;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/container-timing/resources/container-timing-helpers.js"></script>
+<script src="/element-timing/resources/element-timing-helpers.js"></script>
+<script>
+  let beforeRender;
+  async_test(function (t) {
+    assert_implements(window.PerformanceContainerTiming, "PerformanceContainerTiming is not implemented");
+    t.step_timeout(() => {
+      const observer = new PerformanceObserver(
+        t.step_func_done(function(entryList) {
+          assert_unreached("Painting happened before observing, it should not create a containertiming entry");
+        })
+      );
+      observer.observe({type: 'container', buffered: false });
+      t.step_timeout(() => {
+        t.done();
+      }, 2000);
+    }, 2000);
+    // Add the image during onload to be sure that the observer is registered
+    // in time.
+    window.onload = () => {
+      // Add image of width equal to 100 and height equal to 100.
+      const img = document.createElement('img');
+      img.src = '/container-timing/resources/square100.png';
+      img.setAttribute('containertiming', 'image_ct');
+      img.setAttribute('id', 'my_id');
+      document.body.appendChild(img);
+      beforeRender = performance.now();
+    };
+  }, 'containertiming does not report paints before observing if buffering is disabled.');
+</script>
+
+</body>
diff --git a/tests/wpt/tests/container-timing/tentative/containertiming-observe-no-paint.html b/tests/wpt/tests/container-timing/tentative/containertiming-observe-no-paint.html
new file mode 100644
index 00000000000..f2384248255
--- /dev/null
+++ b/tests/wpt/tests/container-timing/tentative/containertiming-observe-no-paint.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Container Timing: if no paint happens, observer is not called</title>
+<body>
+<style>
+body {
+  margin: 0;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/container-timing/resources/container-timing-helpers.js"></script>
+<script src="/element-timing/resources/element-timing-helpers.js"></script>
+<script>
+  async_test(function (t) {
+    assert_implements(window.PerformanceContainerTiming, "PerformanceContainerTiming is not implemented");
+    const observer = new PerformanceObserver(
+      function(entryList) {
+        assert_unreached("No entry is expected with nothing to paint");
+      }
+    );
+    observer.observe({entryTypes: ['container']});
+    t.step_timeout(() => {
+      t.done();
+    }, 2000);
+    // Add the image during onload to be sure that the observer is registered
+    // in time.
+    window.onload = () => {
+      const div = document.createElement('div');
+      div.setAttribute('containertiming', 'div_ct');
+      document.body.appendChild(div);
+      beforeRender = performance.now();
+    };
+  }, 'Container timing did not report paints when there was nothing to paint.');
+</script>
+
+</body>
diff --git a/tests/wpt/tests/container-timing/tentative/containertiming-text-itself.html b/tests/wpt/tests/container-timing/tentative/containertiming-text-itself.html
new file mode 100644
index 00000000000..bead4d1724b
--- /dev/null
+++ b/tests/wpt/tests/container-timing/tentative/containertiming-text-itself.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Container Timing: observe a paragraph with containertiming attribute</title>
+<body>
+<style>
+body {
+  margin: 0;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/container-timing/resources/container-timing-helpers.js"></script>
+<script src="/element-timing/resources/element-timing-helpers.js"></script>
+<script>
+  let beforeRender;
+  async_test(function (t) {
+    assert_implements(window.PerformanceContainerTiming, "PerformanceContainerTiming is not implemented");
+    const observer = new PerformanceObserver(
+      t.step_func_done(function(entryList) {
+        assert_equals(entryList.getEntries().length, 1);
+        const entry = entryList.getEntries()[0];
+        checkContainerEntry(entry, 'p_ct', 'my_id', beforeRender);
+      })
+    );
+    observer.observe({entryTypes: ['container']});
+    // Add the text during onload to be sure that the observer is registered
+    // in time.
+    window.onload = () => {
+      const p = document.createElement('p');
+      p.setAttribute('containertiming', 'p_ct');
+      p.id = 'my_id';
+      p.innerText = "This is a text";
+      document.body.appendChild(p);
+      beforeRender = performance.now();
+    };
+  }, 'Element with containertiming attribute is observable and reports the text paint.');
+</script>
+
+</body>
diff --git a/tests/wpt/tests/container-timing/tentative/containertiming-two-overlapping-imgs.html b/tests/wpt/tests/container-timing/tentative/containertiming-two-overlapping-imgs.html
new file mode 100644
index 00000000000..1a36c6f2532
--- /dev/null
+++ b/tests/wpt/tests/container-timing/tentative/containertiming-two-overlapping-imgs.html
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Container Timing: observe containertiming in a containertiming tree overlapping image children</title>
+<body>
+<style>
+body {
+  margin: 0;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/container-timing/resources/container-timing-helpers.js"></script>
+<script src="/element-timing/resources/element-timing-helpers.js"></script>
+<script>
+  let beforeRender;
+  async_test(function (t) {
+    assert_implements(window.PerformanceContainerTiming, "PerformanceContainerTiming is not implemented");
+    const observer = new PerformanceObserver(
+      t.step_func_done(function(entryList) {
+        assert_equals(entryList.getEntries().length, 1);
+        const entry = entryList.getEntries()[0];
+        checkContainerEntry(entry, 'div_ct', null, beforeRender)
+        checkRect(entry, [0, 150, 0, 150])
+        // size is the total area that has been painted, so the more intersection, the less area painted.
+        checkContainerSize(entry, 17500);
+      })
+    );
+    observer.observe({entryTypes: ['container']});
+    // Add the image during onload to be sure that the observer is registered
+    // in time.
+    window.onload = () => {
+      // Add a div that is the container timing root
+      const div = document.createElement('div');
+      div.setAttribute('containertiming', 'div_ct');
+      document.body.appendChild(div);
+
+      // Add two overlapping images
+      const img1 = document.createElement('img');
+      img1.src = '/container-timing/resources/square100.png';
+      img1.setAttribute('id', 'img1_id');
+      img1.style.position = 'absolute';
+      div.appendChild(img1);
+
+      const img2 = document.createElement('img');
+      img2.src = '/container-timing/resources/square100.png';
+      img2.setAttribute('id', 'img2_id');
+      img2.style.marginLeft = '50px';
+      img2.style.marginTop = '50px';
+      img2.style.position = 'absolute';
+      div.appendChild(img2);
+
+      beforeRender = performance.now();
+    };
+  }, 'Overlapping images report to containertiming.');
+</script>
+
+</body>
diff --git a/tests/wpt/tests/container-timing/tentative/containertiming-with-child-img.html b/tests/wpt/tests/container-timing/tentative/containertiming-with-child-img.html
new file mode 100644
index 00000000000..03f0e113902
--- /dev/null
+++ b/tests/wpt/tests/container-timing/tentative/containertiming-with-child-img.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Container Timing: observe with a node with containertiming and an image child</title>
+<body>
+<style>
+body {
+  margin: 0;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/container-timing/resources/container-timing-helpers.js"></script>
+<script src="/element-timing/resources/element-timing-helpers.js"></script>
+<script>
+  let beforeRender;
+  async_test(function (t) {
+    assert_implements(window.PerformanceContainerTiming, "PerformanceContainerTiming is not implemented");
+    const observer = new PerformanceObserver(
+      t.step_func_done(function(entryList) {
+        assert_equals(entryList.getEntries().length, 1);
+        const entry = entryList.getEntries()[0];
+        checkContainerEntry(entry, 'div_ct', 'img_id', beforeRender)
+        checkRect(entry, [0, 100, 0, 100])
+        checkContainerSize(entry, 10000);
+      })
+    );
+    observer.observe({entryTypes: ['container']});
+    // Add the image during onload to be sure that the observer is registered
+    // in time.
+    window.onload = () => {
+      // Add a div that is the container timing root
+      const div = document.createElement('div');
+      div.setAttribute('containertiming', 'div_ct');
+      document.body.appendChild(div);
+      // Add image of width equal to 100 and height equal to 100.
+      const img = document.createElement('img');
+      img.src = '/container-timing/resources/square100.png';
+      img.setAttribute('id', 'img_id');
+      div.appendChild(img);
+      beforeRender = performance.now();
+    };
+  }, 'Paint of the image child of container timing is reported.');
+</script>
+
+</body>
diff --git a/tests/wpt/tests/container-timing/tentative/containertiming-with-child-text.html b/tests/wpt/tests/container-timing/tentative/containertiming-with-child-text.html
new file mode 100644
index 00000000000..1efc189c34e
--- /dev/null
+++ b/tests/wpt/tests/container-timing/tentative/containertiming-with-child-text.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Container Timing: observe with a node with containertiming and a text child</title>
+<body>
+<style>
+body {
+  margin: 0;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/container-timing/resources/container-timing-helpers.js"></script>
+<script src="/element-timing/resources/element-timing-helpers.js"></script>
+<script>
+  let beforeRender;
+  async_test(function (t) {
+    assert_implements(window.PerformanceContainerTiming, "PerformanceContainerTiming is not implemented");
+    const observer = new PerformanceObserver(
+      t.step_func_done(function(entryList) {
+        assert_equals(entryList.getEntries().length, 1);
+        const entry = entryList.getEntries()[0];
+        checkContainerEntry(entry, 'div_ct', 'p_id', beforeRender)
+      })
+    );
+    observer.observe({entryTypes: ['container']});
+    // Add the text during onload to be sure that the observer is registered
+    // in time.
+    window.onload = () => {
+      // Add a div that is the container timing root
+      const div = document.createElement('div');
+      div.setAttribute('containertiming', 'div_ct');
+      document.body.appendChild(div);
+
+      const p = document.createElement('p');
+      p.id = 'p_id';
+      p.innerText = "This is a text";
+      div.appendChild(p);
+      beforeRender = performance.now();
+    };
+  }, 'Paint of the text child of container timing is reported.');
+</script>
+
+</body>
diff --git a/tests/wpt/tests/container-timing/tentative/img-not-child-of-container-timing.html b/tests/wpt/tests/container-timing/tentative/img-not-child-of-container-timing.html
new file mode 100644
index 00000000000..751342a7ceb
--- /dev/null
+++ b/tests/wpt/tests/container-timing/tentative/img-not-child-of-container-timing.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Container Timing: observe containertiming attribute with an image that is not its child</title>
+<body>
+<style>
+body {
+  margin: 0;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/container-timing/resources/container-timing-helpers.js"></script>
+<script src="/element-timing/resources/element-timing-helpers.js"></script>
+<script>
+  async_test(function (t) {
+    assert_implements(window.PerformanceContainerTiming, "PerformanceContainerTiming is not implemented");
+    const observer = new PerformanceObserver(
+      function(entryList) {
+        assert_unreached("No entry is expected with nothing to paint");
+      }
+    );
+    observer.observe({entryTypes: ['container']});
+
+    // Wait 2 seconds for observations, then finish successfully
+    t.step_timeout(() => {
+      t.done();
+    }, 2000);
+    // Add the image during onload to be sure that the observer is registered
+    // in time.
+    window.onload = () => {
+      // Add a div that is the container timing root
+      const div = document.createElement('div');
+      div.setAttribute('containertiming', 'div_ct');
+      document.body.appendChild(div);
+      // Add image of width equal to 100 and height equal to 100.
+      const img = document.createElement('img');
+      img.src = '/container-timing/resources/square100.png';
+      img.setAttribute('id', 'img_id');
+      document.body.appendChild(img);
+    };
+  }, 'Containertiming observed without paintable contents and an image outside does not report observations.');
+</script>
+
+</body>
diff --git a/tests/wpt/tests/container-timing/tentative/nested-containertiming-child-img.html b/tests/wpt/tests/container-timing/tentative/nested-containertiming-child-img.html
new file mode 100644
index 00000000000..3f830fe7863
--- /dev/null
+++ b/tests/wpt/tests/container-timing/tentative/nested-containertiming-child-img.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Container Timing: two nested containertiming nodes, with a child img inside of the inner</title>
+<body>
+<style>
+body {
+  margin: 0;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/container-timing/resources/container-timing-helpers.js"></script>
+<script src="/element-timing/resources/element-timing-helpers.js"></script>
+<script>
+  let beforeRender;
+  async_test(function (t) {
+    assert_implements(window.PerformanceContainerTiming, "PerformanceContainerTiming is not implemented");
+    const observer = new PerformanceObserver(
+      t.step_func_done(function(entryList) {
+        assert_equals(entryList.getEntries().length, 1, 'one entry expected for the image, for the inner containertiming');
+        const entry = entryList.getEntries()[0];
+        checkContainerEntry(entry, 'div2_ct', 'img_id', beforeRender)
+        checkRect(entry, [0, 100, 0, 100])
+        checkContainerSize(entry, 10000);
+      })
+    );
+    observer.observe({entryTypes: ['container']});
+    // Add the image during onload to be sure that the observer is registered
+    // in time.
+    window.onload = () => {
+      // Add a div that is the container timing root
+      const div1 = document.createElement('div');
+      div1.setAttribute('containertiming', 'div1_ct');
+      document.body.appendChild(div1);
+
+      // Add another div, child of the first, that is also a container root
+      const div2 = document.createElement('div');
+      div2.setAttribute('containertiming', 'div2_ct');
+      div1.appendChild(div2);
+
+      // Add image of width equal to 100 and height equal to 100.
+      img = document.createElement('img');
+      img.src = '/container-timing/resources/square100.png';
+      img.setAttribute('id', 'img_id');
+      div2.appendChild(img);
+      beforeRender = performance.now();
+    };
+  }, 'A parent containertiming root does not get paints from children containertiming roots.');
+</script>
+
+</body>
diff --git a/tests/wpt/tests/content-security-policy/connect-src/connect-src-websocket-allowed.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-websocket-allowed.sub.html
index 4263d97fe2d..1d83bdd18e3 100644
--- a/tests/wpt/tests/content-security-policy/connect-src/connect-src-websocket-allowed.sub.html
+++ b/tests/wpt/tests/content-security-policy/connect-src/connect-src-websocket-allowed.sub.html
@@ -3,7 +3,7 @@
 
 <head>
     <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncraciws.-->
-    <meta http-equiv="Content-Security-Policy" content="connect-src 'self' ws://{{domains[www1]}}:{{ports[http][0]}}/echo; script-src 'self' 'unsafe-inline';">
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self' ws://{{domains[www1]}}:{{ports[ws][0]}}/echo; script-src 'self' 'unsafe-inline';">
     <title>connect-src-websocket-blocked</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
@@ -18,9 +18,14 @@
         });
 
         try {
-            var ws = new WebSocket("ws://{{domains[www1]}}:{{ports[http][0]}}/echo");
+            var ws = new WebSocket("ws://{{domains[www1]}}:{{ports[ws][0]}}/echo");
 
-            if (ws.readyState == WebSocket.CLOSING || ws.readyState == WebSocket.CLOSED) {
+            // Not all browsers fail the connection in a synchronous fashion.
+            if (ws.readyState == WebSocket.CONNECTING) {
+                setTimeout( function() {
+                    ws.readyState != WebSocket.CLOSED ? log("allowed") : log("blocked");
+                }, 1000);
+            } else if (ws.readyState == WebSocket.CLOSED) {
                 log("blocked");
             } else {
                 log("allowed");
diff --git a/tests/wpt/tests/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html
index 02c52837bb8..2cc3f1b5a05 100644
--- a/tests/wpt/tests/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html
+++ b/tests/wpt/tests/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html
@@ -18,9 +18,14 @@
         });
 
         try {
-            var ws = new WebSocket("ws://{{domains[www1]}}:{{ports[http][0]}}/echo");
+            var ws = new WebSocket("ws://{{domains[www1]}}:{{ports[ws][0]}}/echo");
 
-            if (ws.readyState == WebSocket.CLOSING || ws.readyState == WebSocket.CLOSED) {
+            // Not all browsers fail the connection in a synchronous fashion.
+            if (ws.readyState == WebSocket.CONNECTING) {
+                setTimeout( function() {
+                    ws.readyState != WebSocket.CLOSED ? log("allowed") : log("blocked");
+                }, 1000);
+            } else if (ws.readyState == WebSocket.CLOSED) {
                 log("blocked");
             } else {
                 log("allowed");
diff --git a/tests/wpt/tests/content-security-policy/img-src/icon-blocked.sub.html b/tests/wpt/tests/content-security-policy/img-src/icon-blocked.sub.html
index cc882347a1a..4c39e5dec73 100644
--- a/tests/wpt/tests/content-security-policy/img-src/icon-blocked.sub.html
+++ b/tests/wpt/tests/content-security-policy/img-src/icon-blocked.sub.html
@@ -12,6 +12,7 @@
     var t_spv = async_test("Test that spv event is fired");
     window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
       assert_equals(e.violatedDirective, 'img-src');
+      assert_equals(e.target, document);
       assert_true(e.blockedURI.endsWith('/support/fail.png'));
     }));
 
diff --git a/tests/wpt/tests/content-security-policy/img-src/img-src-targeting.html b/tests/wpt/tests/content-security-policy/img-src/img-src-targeting.html
new file mode 100644
index 00000000000..3b4fe7c690b
--- /dev/null
+++ b/tests/wpt/tests/content-security-policy/img-src/img-src-targeting.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="Content-Security-Policy" content="img-src 'none';">
+  <script src='/resources/testharness.js'></script>
+  <script src='/resources/testharnessreport.js'></script>
+</head>
+<body>
+<p>Check that img-src sets correct target</p>
+  <script>
+    var t = async_test("Test that image does not load");
+    var t_spv = async_test("Test that spv event is fired");
+    window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
+      assert_equals(e.violatedDirective, 'img-src');
+      assert_equals(e.target, document);
+      assert_true(e.blockedURI.endsWith('/support/fail.png'));
+    }));
+  </script>
+  <img src='/content-security-policy/support/fail.png'
+       onload='t.step(function() { assert_unreached("Image should not have loaded"); t.done(); });'
+       onerror='t.done();'>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html b/tests/wpt/tests/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html
index 41945fa460f..41c57c6e046 100644
--- a/tests/wpt/tests/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html
+++ b/tests/wpt/tests/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html
@@ -24,7 +24,7 @@
 
   const kIframeURLPath = "support/frame-with-csp.sub.html";
 
-  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/Sources#unsafe-inline
+  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Content-Security-Policy#unsafe-inline
   document.getElementById("iframeWithScriptSrcUnsafeInline").src =
     encodeURIWithApostrophes(kIframeURLPath + "?csp=script-src 'unsafe-inline'");
   document.getElementById("iframeWithScriptSrcNone").src =
diff --git a/tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-with-csstext.html b/tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-with-csstext.html
new file mode 100644
index 00000000000..5e812b4aee9
--- /dev/null
+++ b/tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-with-csstext.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html>
+<head>
+    <meta http-equiv="Content-Security-Policy" content="style-src 'self';">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+
+    <script>
+      var t = async_test("Manipulating cssText should be allowed with 'self'");
+      document.addEventListener("securitypolicyviolation", t.unreached_func("Should not trigger a security policy violation"));
+    </script>
+</head>
+<body>
+    <div id='log'></div>
+
+    <div id="content">Lorem ipsum</div>
+
+    <script>
+      t.step(function() {
+        var contentEl = document.getElementById("content");
+        contentEl.style.cssText = 'margin-left: 2px;';
+        var marginLeftVal = getComputedStyle(contentEl).getPropertyValue('margin-left');
+        assert_equals(marginLeftVal, "2px");
+        t.done();
+      });
+    </script>
+
+</body>
+</html>
diff --git a/tests/wpt/tests/content-security-policy/tentative/require-sri-for/script-allowed-meta.https.html b/tests/wpt/tests/content-security-policy/tentative/require-sri-for/script-allowed-meta.https.html
deleted file mode 100644
index 087498f0c57..00000000000
--- a/tests/wpt/tests/content-security-policy/tentative/require-sri-for/script-allowed-meta.https.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<meta http-equiv="Content-Security-Policy" content="require-sri-for 'script'">
-<script>
-  window.executed_test = async_test("Script that requires integrity executes and does not generate a violation report.");
-  document.addEventListener('securitypolicyviolation', executed_test.unreached_func("No report should be generated."));
-</script>
-<script crossorigin integrity="sha384-tqyFpeo21WFM8HDeUtLqH20GUq/q3D1R6mqTzW3RtyTZ3dAYZJhC1wUcnkgOE2ak"
-        src="/content-security-policy/resources/ran.js"></script>
-<script>
-  assert_true(window.ran);
-  window.executed_test.done();
-</script>
diff --git a/tests/wpt/tests/content-security-policy/tentative/require-sri-for/script-blocked-meta.https.html b/tests/wpt/tests/content-security-policy/tentative/require-sri-for/script-blocked-meta.https.html
deleted file mode 100644
index fe69c61f5b6..00000000000
--- a/tests/wpt/tests/content-security-policy/tentative/require-sri-for/script-blocked-meta.https.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<meta http-equiv="Content-Security-Policy" content="require-sri-for 'script'">
-<script src="/content-security-policy/resources/ran.js"></script>
-<script>
-promise_test(async t => {
-  const watcher = new EventWatcher(t, document, ['securitypolicyviolation']);
-  const e = await watcher.wait_for('securitypolicyviolation');
-  assert_equals(e.blockedURI, `${location.origin}/content-security-policy/resources/ran.js`);
-  assert_true(typeof(window.ran) == "undefined", "Script did not ran");
-}, "Test that meta require-sri-for blocks scripts with no SRI");
-</script>
diff --git a/tests/wpt/tests/content-security-policy/tentative/require-sri-for/script.https.html b/tests/wpt/tests/content-security-policy/tentative/require-sri-for/script.https.html
deleted file mode 100644
index 65553e523cc..00000000000
--- a/tests/wpt/tests/content-security-policy/tentative/require-sri-for/script.https.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/common/utils.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-
-<body>
-<script>
-  const {ORIGIN} = get_host_info();
-
-  const run_test = async (test_case) => {
-    promise_test(async () => {
-      const REMOTE_EXECUTOR =
-        `/common/dispatcher/remote-executor.html?pipe=`;
-      const iframe_uuid = token();
-
-      const csp_header = test_case.report_only ?
-                         "header(Content-Security-Policy-Report-Only,require-sri-for 'script')" :
-                         "header(Content-Security-Policy,require-sri-for 'script')";
-      const iframe_url = REMOTE_EXECUTOR + encodeURIComponent(csp_header);
-
-      const iframe = document.createElement('iframe');
-      iframe.src = iframe_url + `&uuid=${iframe_uuid}`;
-      document.body.appendChild(iframe);
-
-      // Execute code directly from the iframe.
-      const ctx = new RemoteContext(iframe_uuid);
-      const result = await ctx.execute_script(async (test_case) => {
-        let blockedURI;
-        if (test_case.should_block) {
-          window.addEventListener("securitypolicyviolation", e => {
-            blockedURI = e.blockedURI;
-          });
-        }
-
-        // Load the script
-        await new Promise(resolve => {
-          const script = document.createElement('script');
-          if (test_case.cross_origin) {
-            script.crossOrigin="anonymous";
-          }
-          if (test_case.integrity) {
-            script.integrity = test_case.integrity;
-          }
-          script.onload = resolve;
-          script.onerror = resolve;
-          script.src = test_case.url;
-          document.body.appendChild(script);
-        });
-
-        return { blocked: blockedURI, ran: window.ran };
-      }, [test_case]);
-      for (const [key, value] of Object.entries(result)) {
-        assert_equals(result[key], test_case.expected[key]);
-      }
-    }, test_case.description);
-  };
-
-  const blob = new Blob([`window.ran=true;`],
-                        { type: 'application/javascript' });
-
-  const blob_url = URL.createObjectURL(blob);
-
-  // Generated using https://sha2.it/ed25519.html (In Chrome Canary, with Experimental Web Platform Features enabled)
-  const signature = encodeURIComponent(
-    'header(Unencoded-Digest, sha-384=:tqyFpeo21WFM8HDeUtLqH20GUq\/q3D1R6mqTzW3RtyTZ3dAYZJhC1wUcnkgOE2ak:)' +
-    '|header(Signature-Input, signature=\\("unencoded-digest";sf\\); keyid="JrQLj5P\/89iXES9+vFgrIy29clF9CC\/oPPsw3c5D0bs="; tag="sri")' +
-    '|header(Signature, signature=:qM19uLskHm2TQG5LJcH/hY0n0BWWzYOJztVWYlwk0cZb3u0JdgUMre1J4Jn8Tma0x2u5/kPBfbXRMbB+X+vTBw==:)');
-
-  const test_cases = [
-    {
-      description: "Ensure that a script without integrity did not run",
-      url: "/content-security-policy/resources/ran.js",
-      cross_origin: true,
-      integrity: "",
-      should_block: true,
-      report_only: false,
-      expected: {blocked: ORIGIN + "/content-security-policy/resources/ran.js", ran: false },
-    },
-    {
-      description: "Ensure that a script with unknown integrity algorithm did not run",
-      url: "/content-security-policy/resources/ran.js",
-      cross_origin: true,
-      integrity: "foobar-AAAAAAAAAAAAAAAAAAAa",
-      should_block: true,
-      report_only: false,
-      expected: {blocked: ORIGIN + "/content-security-policy/resources/ran.js", ran: false },
-    },
-    {
-      description: "Ensure that a script without integrity algorithm runs and gets reported in report-only mode",
-      url: "/content-security-policy/resources/ran.js",
-      cross_origin: true,
-      integrity: "",
-      should_block: true,
-      report_only: true,
-      expected: {blocked: ORIGIN + "/content-security-policy/resources/ran.js", ran: true },
-    },
-    {
-      description: "Ensure that a no-cors script gets blocked",
-      url: "/content-security-policy/resources/ran.js",
-      cross_origin: false,
-      integrity: "sha384-tqyFpeo21WFM8HDeUtLqH20GUq/q3D1R6mqTzW3RtyTZ3dAYZJhC1wUcnkgOE2ak",
-      should_block: true,
-      report_only: false,
-      expected: {blocked: ORIGIN + "/content-security-policy/resources/ran.js", ran: false },
-    },
-    {
-      description: "Ensure that a script with integrity runs",
-      url: "/content-security-policy/resources/ran.js",
-      cross_origin: true,
-      integrity: "sha384-tqyFpeo21WFM8HDeUtLqH20GUq/q3D1R6mqTzW3RtyTZ3dAYZJhC1wUcnkgOE2ak",
-      should_block: false,
-      report_only: false,
-      expected: {blocked: "", ran: true },
-    },
-    {
-      description: "Ensure that a script with signature integrity runs",
-      url: "/content-security-policy/resources/ran.js?pipe=" + signature,
-      cross_origin: true,
-      integrity: "ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=",
-      should_block: false,
-      report_only: false,
-      expected: {blocked: "", ran: true },
-    },
-    {
-      description: "Ensure that a data URI script with no integrity runs",
-      url: "data:application/javascript,window.ran=true",
-      cross_origin: true,
-      integrity: "",
-      should_block: false,
-      report_only: false,
-      expected: {blocked: "", ran: true },
-    },
-    {
-      description: "Ensure that a no-CORS data URI script with no integrity runs",
-      url: "data:application/javascript,window.ran=true",
-      cross_origin: false,
-      integrity: "",
-      should_block: false,
-      report_only: false,
-      expected: {blocked: "", ran: true },
-    },
-    {
-      description: "Ensure that a blob URL script with no integrity runs",
-      url: blob_url,
-      cross_origin: true,
-      integrity: "",
-      should_block: false,
-      report_only: false,
-      expected: {blocked: "", ran: true },
-    },
-    {
-      description: "Ensure that a no-CORS blob URL script with no integrity runs",
-      url: blob_url,
-      cross_origin: false,
-      integrity: "",
-      should_block: false,
-      report_only: false,
-      expected: {blocked: "", ran: true },
-    }
-  ];
-  test_cases.map(run_test);
-</script>
diff --git a/tests/wpt/tests/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.html b/tests/wpt/tests/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.html
index 054e75b5274..b2286f56a23 100644
--- a/tests/wpt/tests/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.html
+++ b/tests/wpt/tests/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.html
@@ -19,18 +19,27 @@
     const document_loaded = new Promise(resolve => window.onload = resolve);
     await document_loaded;
 
-    const eval_error = new Promise(resolve => {
-      window.addEventListener('message', function(e) {
-        assert_not_equals(e.data, 'FAIL', 'eval was executed in the frame');
-        if (e.data === 'PASS')
-          resolve();
+    const eval_error = new Promise((resolve, reject) => {
+      window.addEventListener('message', function(event) {
+        try {
+          assert_not_equals(event.data, 'FAIL', 'eval was executed in the frame');
+          if (event.data === 'PASS') {
+            resolve();
+          }
+        } catch (e) {
+          reject(e);
+        }
       });
     });
-    const csp_violation_report = new Promise(resolve => {
-      window.addEventListener('message', function(e) {
-        if (e.data["violated-directive"]) {
-          assert_equals(e.data["violated-directive"], "script-src");
-          resolve();
+    const csp_violation_report = new Promise((resolve, reject) => {
+      window.addEventListener('message', function(event) {
+        try {
+          if (event.data["violated-directive"]) {
+            assert_equals(event.data["violated-directive"], "script-src");
+            resolve();
+          }
+        } catch (e) {
+          reject(e);
         }
       });
     });
diff --git a/tests/wpt/tests/cookie-store/change_eventhandler_for_already_expired.https.window.js b/tests/wpt/tests/cookie-store/change_eventhandler_for_already_expired.https.window.js
new file mode 100644
index 00000000000..f3bbe0ea560
--- /dev/null
+++ b/tests/wpt/tests/cookie-store/change_eventhandler_for_already_expired.https.window.js
@@ -0,0 +1,41 @@
+// META: title=Cookie Store API: Test that setting an already-expired cookie does not trigger an event.
+// META: script=resources/cookie-test-helpers.js
+
+'use strict';
+
+cookie_test(async t => {
+  const eventPromise = observeNextCookieChangeEvent();
+  await cookieStore.set({
+    name: 'cookie',
+    value: 'ALREADY-EXPIRED',
+    expires: new Date(new Date() - 10_000),
+  });
+  await cookieStore.set('alt-cookie', 'IGNORE');
+  assert_equals(
+    await getCookieString(),
+    'alt-cookie=IGNORE',
+    'Already-expired cookie not included in CookieStore');
+  await verifyCookieChangeEvent(
+    eventPromise,
+    {deleted: [], changed: [{name: 'alt-cookie', value: 'IGNORE'}]},
+    'Deletion not observed after document.cookie sets already-expired cookie');
+}, 'CookieStore setting already-expired cookie should not be observed');
+
+cookie_test(async t => {
+  const eventPromise = observeNextCookieChangeEvent();
+  await cookieStore.set({
+    name: 'cookie',
+    value: 'ALREADY-EXPIRED',
+    expires: new Date(new Date() - 10_000),
+    partitioned: true,
+  });
+  await cookieStore.set('alt-cookie', 'IGNORE');
+  assert_equals(
+    await getCookieString(),
+    'alt-cookie=IGNORE',
+    'Already-expired cookie not included in CookieStore');
+  await verifyCookieChangeEvent(
+    eventPromise,
+    {deleted: [], changed: [{name: 'alt-cookie', value: 'IGNORE'}]},
+    'Deletion not observed after document.cookie sets already-expired cookie');
+}, 'CookieStore setting already-expired partitioned cookie should not be observed');
diff --git a/tests/wpt/tests/cookie-store/change_eventhandler_for_document_cookie.https.window.js b/tests/wpt/tests/cookie-store/change_eventhandler_for_document_cookie.https.window.js
index 0a8b1bd21ef..1937ebdae35 100644
--- a/tests/wpt/tests/cookie-store/change_eventhandler_for_document_cookie.https.window.js
+++ b/tests/wpt/tests/cookie-store/change_eventhandler_for_document_cookie.https.window.js
@@ -63,6 +63,37 @@ cookie_test(async t => {
         ' using max-age=0');
 }, 'document.cookie set/overwrite/delete observed by CookieStore');
 
+
+cookie_test(async t => {
+  const eventPromise = observeNextCookieChangeEvent();
+  await setCookieStringDocument('DOCUMENT-cookie=ALREADY-EXPIRED; path=/; max-age=0');
+  await setCookieStringDocument('DOCUMENT-alt-cookie=IGNORE; path=/; max-age=10');
+  assert_equals(
+    await getCookieStringDocument(),
+    'DOCUMENT-alt-cookie=IGNORE',
+    'Already-expired cookie not included in document.cookie');
+  await verifyCookieChangeEvent(
+    eventPromise,
+    {deleted: [], changed: [{name: 'DOCUMENT-alt-cookie', value: 'IGNORE'}]},
+    'Deletion not observed after document.cookie sets already-expired cookie');
+}, 'document.cookie set already-expired cookie should not be observed by CookieStore');
+
+cookie_test(async t => {
+  let eventPromise = observeNextCookieChangeEvent();
+  await setCookieStringDocument('DOCUMENT-cookie=VALUE; path=/');
+  await verifyCookieChangeEvent(
+    eventPromise, {changed: [{name: 'DOCUMENT-cookie', value: 'VALUE'}]},
+      'Original cookie is observed.');
+
+  eventPromise = observeNextCookieChangeEvent();
+  // Overwrite the original cookie with a duplicate, this should not dispatch an event.
+  await setCookieStringDocument('DOCUMENT-cookie=VALUE; path=/');
+  await setCookieStringDocument('DOCUMENT-alt-cookie=IGNORE; path=/');
+  await verifyCookieChangeEvent(
+    eventPromise, {changed: [{name: 'DOCUMENT-alt-cookie', value: 'IGNORE'}]},
+    'Duplicate cookie is not observed.');
+}, 'document.cookie duplicate cookie should not be observed by CookieStore');
+
 cookie_test(async t => {
   let eventPromise = observeNextCookieChangeEvent();
   await cookieStore.set('DOCUMENT-cookie', 'value');
diff --git a/tests/wpt/tests/cookie-store/change_eventhandler_for_http_cookie_and_set_cookie_headers.https.window.js b/tests/wpt/tests/cookie-store/change_eventhandler_for_http_cookie_and_set_cookie_headers.https.window.js
index 2028df5b4bf..8517995acfe 100644
--- a/tests/wpt/tests/cookie-store/change_eventhandler_for_http_cookie_and_set_cookie_headers.https.window.js
+++ b/tests/wpt/tests/cookie-store/change_eventhandler_for_http_cookie_and_set_cookie_headers.https.window.js
@@ -48,6 +48,37 @@ cookie_test(async t => {
 }, 'HTTP set/overwrite/delete observed in CookieStore');
 
 
+cookie_test(async t => {
+  const eventPromise = observeNextCookieChangeEvent();
+  await setCookieStringHttp('HTTP-cookie=ALREADY-EXPIRED; path=/; max-age=0');
+  await setCookieStringHttp('HTTP-alt-cookie=IGNORE; path=/; max-age=10');
+  assert_equals(
+    await getCookieStringHttp(),
+    'HTTP-alt-cookie=IGNORE',
+    'Already-expired cookie not included in HTTP');
+  await verifyCookieChangeEvent(
+    eventPromise,
+    {deleted: [], changed: [{name: 'HTTP-alt-cookie', value: 'IGNORE'}]},
+    'Deletion not observed after HTTP sets already-expired cookie');
+}, 'HTTP set already-expired cookie should not be observed by CookieStore');
+
+cookie_test(async t => {
+  let eventPromise = observeNextCookieChangeEvent();
+  await setCookieStringHttp('HTTP-cookie=VALUE; path=/');
+  await verifyCookieChangeEvent(
+    eventPromise, {changed: [{name: 'HTTP-cookie', value: 'VALUE'}]},
+    'Original cookie is observed.');
+
+  eventPromise = observeNextCookieChangeEvent();
+  // Overwrite the original cookie with a duplicate, this should not dispatch an event.
+  await setCookieStringHttp('HTTP-cookie=VALUE; path=/');
+  await setCookieStringHttp('HTTP-alt-cookie=IGNORE; path=/');
+  await verifyCookieChangeEvent(
+    eventPromise, {changed: [{name: 'HTTP-alt-cookie', value: 'IGNORE'}]},
+    'Duplicate cookie is not observed.');
+}, 'HTTP duplicate cookie should not be observed by CookieStore');
+
+
 cookie_test(async t => {
   let eventPromise = observeNextCookieChangeEvent();
   await setCookieStringHttp('HTTP-🍪=🔵; path=/');
diff --git a/tests/wpt/tests/cookie-store/change_eventhandler_for_no_change.https.window.js b/tests/wpt/tests/cookie-store/change_eventhandler_for_no_change.https.window.js
new file mode 100644
index 00000000000..5f9c2927433
--- /dev/null
+++ b/tests/wpt/tests/cookie-store/change_eventhandler_for_no_change.https.window.js
@@ -0,0 +1,43 @@
+// META: title=Cookie Store API: Test that setting a duplicate cookie does not fire a second event.
+// META: script=resources/cookie-test-helpers.js
+
+'use strict';
+
+cookie_test(async t => {
+  let eventPromise = observeNextCookieChangeEvent();
+  await cookieStore.set('cookie', 'VALUE');
+  await verifyCookieChangeEvent(
+    eventPromise, {changed: [{name: 'cookie', value: 'VALUE'}]},
+    'Original cookie is observed.');
+
+  eventPromise = observeNextCookieChangeEvent();
+  await cookieStore.set('cookie', 'VALUE');
+  await cookieStore.set('alt-cookie', 'IGNORE');
+  await verifyCookieChangeEvent(
+    eventPromise, {changed: [{name: 'alt-cookie', value: 'IGNORE'}]},
+    'Duplicate cookie is not observed.');
+}, 'CookieStore duplicate cookie should not be observed');
+
+cookie_test(async t => {
+  let eventPromise = observeNextCookieChangeEvent();
+  await cookieStore.set({
+    name: 'cookie',
+    value: 'VALUE',
+    partitioned: true,
+  });
+  await verifyCookieChangeEvent(
+    eventPromise,
+    {changed: [{name: 'cookie', value: 'VALUE', partitioned: true}]},
+    'Original cookie is observed.');
+
+  eventPromise = observeNextCookieChangeEvent();
+  await cookieStore.set({
+    name: 'cookie',
+    value: 'VALUE',
+    partitioned: true,
+  });
+  await cookieStore.set('alt-cookie', 'IGNORE');
+  await verifyCookieChangeEvent(
+    eventPromise, {changed: [{name: 'alt-cookie', value: 'IGNORE'}]},
+    'Duplicate cookie is not observed.');
+}, 'CookieStore duplicate partitioned cookie should not be observed');
diff --git a/tests/wpt/tests/cookie-store/cookieListItem_attributes.https.any.js b/tests/wpt/tests/cookie-store/cookieListItem_attributes.https.any.js
index 6716d91788d..542bd6c5387 100644
--- a/tests/wpt/tests/cookie-store/cookieListItem_attributes.https.any.js
+++ b/tests/wpt/tests/cookie-store/cookieListItem_attributes.https.any.js
@@ -207,3 +207,20 @@ promise_test(async testCase => {
   const cookie = await cookieStore.get('cookie-name');
   assert_equals(cookie.secure, true);
 }, 'CookieListItem - secure defaults to true');
+
+promise_test(async testCase => {
+  await cookieStore.delete('cookie-name');
+  testCase.add_cleanup(async () => {
+    await cookieStore.delete('cookie-name');
+  });
+
+  let encodedCookie = encodeURIComponent(JSON.stringify("cookie-name=1; max-age=99999999999999999999999999999; path=/"));
+  await fetch(`/cookies/resources/cookie.py?set=${encodedCookie}`);
+
+  assert_equals(document.cookie, "cookie-name=1", 'The cookie was set as expected.');
+
+  const cookie = await cookieStore.get('cookie-name');
+  assert_equals(cookie.name, 'cookie-name');
+  assert_equals(cookie.value, '1');
+  assert_approx_equals(cookie.expires, kFourHundredDaysFromNow, kOneDay);
+}, "Test max-age attribute over the 400 days");
diff --git a/tests/wpt/tests/cookie-store/cookieStore_delete.sub.https.html b/tests/wpt/tests/cookie-store/cookieStore_delete.sub.https.html
new file mode 100644
index 00000000000..8cdfae6776d
--- /dev/null
+++ b/tests/wpt/tests/cookie-store/cookieStore_delete.sub.https.html
@@ -0,0 +1,65 @@
+<!doctype html>
+<meta charset='utf-8'>
+<title>Async Cookies: cookieStore basic API across origins</title>
+<link rel='help' href='https://github.com/WICG/cookie-store'>
+<link rel='author' href='jarrydg@chromium.org' title='Jarryd Goodman'>
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<script src='resources/helpers.js'></script>
+<style>iframe { display: none; }</style>
+
+<script>
+'use strict';
+
+const kPath = '/cookie-store/resources/helper_iframe.sub.html';
+const kCorsBase = `https://{{domains[www1]}}:{{ports[https][0]}}`;
+const kCorsUrl = `${kCorsBase}${kPath}`;
+
+promise_test(async t => {
+  const iframe = await createIframe(kCorsUrl, t);
+  assert_true(iframe != null);
+
+  iframe.contentWindow.postMessage({
+    opname: 'set-cookie-without-domain-attr',
+    name: 'cookie-name',
+    value: 'cookie-value',
+  }, kCorsBase);
+  t.add_cleanup(async () => {
+    await cookieStore.delete({ name: 'cookie-name', domain: '{{host}}' });
+  });
+  await waitForMessage();
+
+  iframe.contentWindow.postMessage({
+    opname: 'get-cookie',
+    name: 'cookie-name',
+    options: {}
+  }, '*');
+
+  {
+    const message = await waitForMessage();
+    const { frameCookie } = message;
+    assert_not_equals(frameCookie, null);
+    assert_equals(frameCookie.name, 'cookie-name');
+    assert_equals(frameCookie.value, 'cookie-value');
+  }
+
+  iframe.contentWindow.postMessage({
+    opname: 'delete-cookie-without-domain-attr',
+    name: 'cookie-name',
+  }, kCorsBase);
+
+  await waitForMessage();
+
+  iframe.contentWindow.postMessage({
+    opname: 'get-cookie',
+    name: 'cookie-name',
+    options: {}
+  }, '*');
+
+  {
+    const message = await waitForMessage();
+    const { frameCookie } = message;
+    assert_equals(frameCookie, null);
+  }
+});
+</script>
diff --git a/tests/wpt/tests/cookie-store/cookieStore_special_names.https.any.js b/tests/wpt/tests/cookie-store/cookieStore_special_names.https.any.js
index 6b18c4f0668..e2a3df7fe33 100644
--- a/tests/wpt/tests/cookie-store/cookieStore_special_names.https.any.js
+++ b/tests/wpt/tests/cookie-store/cookieStore_special_names.https.any.js
@@ -62,3 +62,33 @@ promise_test(async testCase => {
     }
     assert_true(exceptionThrown, "No exception thrown.");
 }, 'cookieStore.set with malformed name.');
+
+promise_test(async testCase => {
+  // Nameless cookies cannot have a __Host- prefix
+  await cookieStore.delete('');
+
+  const currentUrl = new URL(self.location.href);
+  const currentDomain = currentUrl.hostname;
+
+  await promise_rejects_js(testCase, TypeError, cookieStore.set(
+      { name: '',
+        value: '__Host-nameless-cookie',
+        domain: `.${currentDomain}` }));
+  const cookie = await cookieStore.get('');
+  assert_equals(cookie, null);
+}, 'cookieStore.set a nameless cookie cannot have __Host- prefix');
+
+promise_test(async testCase => {
+  // Nameless cookies cannot have a __Secure- prefix
+  await cookieStore.delete('');
+
+  const currentUrl = new URL(self.location.href);
+  const currentDomain = currentUrl.hostname;
+
+  await promise_rejects_js(testCase, TypeError, cookieStore.set(
+      { name: '',
+        value: '__Secure-nameless-cookie',
+        domain: `.${currentDomain}` }));
+  const cookie = await cookieStore.get('');
+  assert_equals(cookie, null);
+}, 'cookieStore.set a nameless cookie cannot have __Secure- prefix');
diff --git a/tests/wpt/tests/cookie-store/httponly_cookies.https.window.js b/tests/wpt/tests/cookie-store/httponly_cookies.https.window.js
index 8a10e358ef6..605e94e6744 100644
--- a/tests/wpt/tests/cookie-store/httponly_cookies.https.window.js
+++ b/tests/wpt/tests/cookie-store/httponly_cookies.https.window.js
@@ -67,3 +67,33 @@ cookie_test(async t => {
     'cookie1=value1; cookie2=value2; cookie3=value3',
     'httpOnly is not an option for CookieStore.set()');
 }, 'HttpOnly cookies can not be set by CookieStore');
+
+cookie_test(async t => {
+  await setCookieStringHttp('HTTPONLY-cookie=value; path=/; httponly');
+  assert_equals(
+      await getCookieString(),
+      undefined,
+      'HttpOnly cookie we wrote using HTTP in cookie jar' +
+        ' is invisible to script');
+  assert_equals(
+      await getCookieStringHttp(),
+      'HTTPONLY-cookie=value',
+    'HttpOnly cookie we wrote using HTTP in HTTP cookie jar');
+
+  try {
+    await cookieStore.set('HTTPONLY-cookie', 'dummy');
+  } catch(e) {}
+
+  assert_equals(
+      await getCookieString(),
+      undefined,
+      'HttpOnly cookie is not overwritten');
+
+  try {
+    await cookieStore.delete('HTTPONLY-cookie');
+  } catch(e) {}
+
+  assert_equals(await getCookieString(), undefined, 'HttpOnly cookie is not overwritten');
+
+  assert_equals(await getCookieStringHttp(), 'HTTPONLY-cookie=value', 'HttpOnly cookie is not deleted');
+}, 'HttpOnly cookies are not deleted/overwritten');
diff --git a/tests/wpt/tests/cookie-store/resources/helper_iframe.sub.html b/tests/wpt/tests/cookie-store/resources/helper_iframe.sub.html
index 750f19b56d3..3bd1843d574 100644
--- a/tests/wpt/tests/cookie-store/resources/helper_iframe.sub.html
+++ b/tests/wpt/tests/cookie-store/resources/helper_iframe.sub.html
@@ -22,10 +22,21 @@
         domain: '{{host}}',
       });
       event.source.postMessage('Cookie has been set', event.origin);
+    } else if (opname === 'set-cookie-without-domain-attr') {
+      const { name, value } = event.data
+      await cookieStore.set({
+        name,
+        value,
+      });
+      event.source.postMessage('Cookie has been set', event.origin);
     } else if (opname === 'get-cookie') {
       const { name, options } = event.data
       const frameCookie = await cookieStore.get(name, options);
       event.source.postMessage({frameCookie}, event.origin);
+    } else if (opname === 'delete-cookie-without-domain-attr') {
+      const { name } = event.data
+      await cookieStore.delete({name});
+      event.source.postMessage('Cookie has been deleted', event.origin);
     } else if (opname === 'push-state') {
       history.pushState("foo", null, "some/path");
       event.source.postMessage('pushState called');
diff --git a/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_already_expired.https.any.js b/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_already_expired.https.any.js
new file mode 100644
index 00000000000..c40fdbeb6f1
--- /dev/null
+++ b/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_already_expired.https.any.js
@@ -0,0 +1,86 @@
+// META: title=Cookie Store API: cookiechange event in ServiceWorker with already-expired cookie.
+// META: global=serviceworker
+
+'use strict';
+
+const kScope = '/cookie-store/does/not/exist';
+
+function WorkerActivationPromise() {
+  return new Promise((resolve) => {
+    if (registration.active) {
+      resolve();
+      return;
+    }
+    self.addEventListener('activate', () => { resolve(); });
+  });
+}
+
+function RunOnceCookieChangeReceivedPromise() {
+  return new Promise(resolve => {
+    const listener = ev => {
+      resolve(ev);
+      self.removeEventListener('cookiechange', listener);
+    };
+    self.addEventListener('cookiechange', listener);
+  });
+}
+
+promise_test(async t => {
+  await WorkerActivationPromise();
+
+  const subscriptions = [{url: `${kScope}/path`}];
+  await registration.cookies.subscribe(subscriptions);
+  t.add_cleanup(() => registration.cookies.unsubscribe(subscriptions));
+
+  const eventPromise = RunOnceCookieChangeReceivedPromise();
+
+  await cookieStore.set({
+    name: 'cookie-name',
+    value: 'already-expired',
+    expires: new Date(new Date() - 10_000),
+  });
+
+  await cookieStore.set('another-cookie-name', 'ignore');
+  t.add_cleanup(() => cookieStore.delete('another-cookie-name'));
+
+  const event = await eventPromise;
+  assert_equals(event.type, 'cookiechange');
+  assert_equals(event.changed.length, 1);
+  assert_equals(event.changed[0].name, 'another-cookie-name');
+  assert_equals(event.changed[0].value, 'ignore');
+  assert_equals(event.deleted.length, 0);
+});
+
+promise_test(async t => {
+  await WorkerActivationPromise();
+
+  const subscriptions = [{url: `${kScope}/path`}];
+  await registration.cookies.subscribe(subscriptions);
+  t.add_cleanup(() => registration.cookies.unsubscribe(subscriptions));
+
+  const eventPromise = RunOnceCookieChangeReceivedPromise();
+
+  await cookieStore.set({
+    name: 'cookie-name',
+    value: 'already-expired',
+    expires: new Date(new Date() - 10_000),
+    partitioned: true,
+  });
+
+  await cookieStore.set({
+    name: 'another-cookie-name',
+    value: 'ignore',
+    partitioned: true,
+  });
+  t.add_cleanup(() => cookieStore.delete({
+    name: 'another-cookie-name',
+    partitioned: true,
+  }));
+
+  const event = await eventPromise;
+  assert_equals(event.type, 'cookiechange');
+  assert_equals(event.changed.length, 1);
+  assert_equals(event.changed[0].name, 'another-cookie-name');
+  assert_equals(event.changed[0].value, 'ignore');
+  assert_equals(event.deleted.length, 0);
+});
diff --git a/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_multiple_subscriptions.https.any.js b/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_multiple_subscriptions.https.any.js
index cd0657c0bcd..ef7cadf4c9e 100644
--- a/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_multiple_subscriptions.https.any.js
+++ b/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_multiple_subscriptions.https.any.js
@@ -15,7 +15,6 @@ let g_cookie_changes = [];
 
 // Resolved when a cookiechange event is received. Rearmed by
 // RearmCookieChangeReceivedPromise().
-let g_cookie_change_received_promise = null;
 let g_cookie_change_received_promise_resolver = null;
 self.addEventListener('cookiechange', (event) => {
   g_cookie_changes.push(event);
@@ -24,11 +23,10 @@ self.addEventListener('cookiechange', (event) => {
   }
 });
 function RearmCookieChangeReceivedPromise() {
-  g_cookie_change_received_promise = new Promise((resolve) => {
+  return new Promise((resolve) => {
     g_cookie_change_received_promise_resolver = resolve;
   });
 }
-RearmCookieChangeReceivedPromise();
 
 promise_test(async testCase => {
   await kServiceWorkerActivatedPromise;
@@ -47,14 +45,15 @@ promise_test(async testCase => {
     testCase.add_cleanup(() => registration.cookies.unsubscribe(subscriptions));
   }
 
+  const cookie_change_received_promise = RearmCookieChangeReceivedPromise();
+
   await cookieStore.set('cookie-name', 'cookie-value');
   testCase.add_cleanup(async () => {
     await cookieStore.delete('cookie-name');
   });
   testCase.add_cleanup(() => { g_cookie_changes = []; });
 
-  await g_cookie_change_received_promise;
-  testCase.add_cleanup(() => RearmCookieChangeReceivedPromise());
+  await cookie_change_received_promise;
 
   assert_equals(g_cookie_changes.length, 1);
   const event = g_cookie_changes[0];
diff --git a/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_no_change.https.any.js b/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_no_change.https.any.js
new file mode 100644
index 00000000000..fb2e2db7381
--- /dev/null
+++ b/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_no_change.https.any.js
@@ -0,0 +1,128 @@
+// META: title=Cookie Store API: cookiechange event in ServiceWorker with already-expired cookie.
+// META: global=serviceworker
+
+'use strict';
+
+const kScope = '/cookie-store/does/not/exist';
+
+// Resolves when the service worker receives the 'activate' event.
+function WorkerActivationPromise() {
+  return new Promise((resolve) => {
+    if (registration.active) {
+      resolve();
+      return;
+    }
+    self.addEventListener('activate', () => { resolve(); });
+  });
+}
+
+// Resolves when a cookiechange event is received.
+function RunOnceCookieChangeReceivedPromise() {
+  return new Promise(resolve => {
+    const listener = ev => {
+      resolve(ev);
+      self.removeEventListener('cookiechange', listener);
+    };
+    self.addEventListener('cookiechange', listener);
+  });
+}
+
+promise_test(async t => {
+  await WorkerActivationPromise();
+
+  const subscriptions = [{url: `${kScope}/path`}];
+  await registration.cookies.subscribe(subscriptions);
+  t.add_cleanup(() => registration.cookies.unsubscribe(subscriptions));
+
+  let cookie_change_promise = RunOnceCookieChangeReceivedPromise();
+
+  await cookieStore.set('cookie-name', 'value');
+  t.add_cleanup(async () => {
+    await cookieStore.delete('cookie-name');
+  });
+
+  // Observes original cookie.
+  let event = await cookie_change_promise;
+  assert_equals(event.type, 'cookiechange');
+  assert_equals(event.changed.length, 1);
+  assert_equals(event.changed[0].name, 'cookie-name');
+  assert_equals(event.changed[0].value, 'value');
+  assert_equals(event.deleted.length, 0);
+
+  cookie_change_promise = RunOnceCookieChangeReceivedPromise();
+
+  // Duplicate overwrite should not be observed.
+  await cookieStore.set('cookie-name', 'value');
+
+  // This cookie should be observed instead.
+  await cookieStore.set('alternate-cookie-name', 'ignore');
+  t.add_cleanup(async () => {
+    await cookieStore.delete('alternate-cookie-name');
+  });
+
+  event = await cookie_change_promise;
+  assert_equals(event.type, 'cookiechange');
+  assert_equals(event.changed.length, 1);
+  assert_equals(event.changed[0].name, 'alternate-cookie-name');
+  assert_equals(event.changed[0].value, 'ignore');
+  assert_equals(event.deleted.length, 0);
+});
+
+promise_test(async t => {
+  await WorkerActivationPromise();
+
+  const subscriptions = [{url: `${kScope}/path`}];
+  await registration.cookies.subscribe(subscriptions);
+  t.add_cleanup(() => registration.cookies.unsubscribe(subscriptions));
+
+  let cookie_change_promise = RunOnceCookieChangeReceivedPromise();
+
+  await cookieStore.set({
+    name: 'cookie-name',
+    value: 'value',
+    partitioned: true,
+  });
+  t.add_cleanup(async () => {
+    await cookieStore.delete({
+      name: 'cookie-name',
+      partitioned: true,
+    });
+  });
+
+  // Observes original cookie.
+  let event = await cookie_change_promise;
+  assert_equals(event.type, 'cookiechange');
+  assert_equals(event.changed.length, 1);
+  assert_equals(event.changed[0].name, 'cookie-name');
+  assert_equals(event.changed[0].value, 'value');
+  assert_equals(event.deleted.length, 0);
+
+  cookie_change_promise = RunOnceCookieChangeReceivedPromise();
+
+  // Duplicate overwrite should not be observed.
+  await cookieStore.set({
+    name: 'cookie-name',
+    value: 'value',
+    partitioned: true,
+  });
+
+  // This cookie should instead.
+  await cookieStore.set({
+    name: 'alternate-cookie-name',
+    value: 'ignore',
+    partitioned: true,
+  });
+  t.add_cleanup(async () => {
+    await cookieStore.delete({
+      name: 'alternate-cookie-name',
+      partitioned: true,
+    });
+  });
+
+  event = await cookie_change_promise;
+  assert_equals(event.type, 'cookiechange');
+  assert_equals(event.changed.length, 1);
+  assert_equals(event.changed[0].name, 'alternate-cookie-name');
+  assert_equals(event.changed[0].value, 'ignore');
+  assert_equals(event.deleted.length, 0);
+});
diff --git a/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_overlapping_subscriptions.https.any.js b/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_overlapping_subscriptions.https.any.js
index 1f433aeb947..f8b1c1b7aa9 100644
--- a/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_overlapping_subscriptions.https.any.js
+++ b/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_overlapping_subscriptions.https.any.js
@@ -15,21 +15,18 @@ let g_cookie_changes = [];
 
 // Resolved when a cookiechange event is received. Rearmed by
 // RearmCookieChangeReceivedPromise().
-let g_cookie_change_received_promise = null;
 let g_cookie_change_received_promise_resolver = null;
 self.addEventListener('cookiechange', (event) => {
   g_cookie_changes.push(event);
   if (g_cookie_change_received_promise_resolver) {
     g_cookie_change_received_promise_resolver();
-    RearmCookieChangeReceivedPromise();
   }
 });
 function RearmCookieChangeReceivedPromise() {
-  g_cookie_change_received_promise = new Promise((resolve) => {
+  return new Promise((resolve) => {
     g_cookie_change_received_promise_resolver = resolve;
   });
 }
-RearmCookieChangeReceivedPromise();
 
 promise_test(async testCase => {
   await kServiceWorkerActivatedPromise;
@@ -41,14 +38,16 @@ promise_test(async testCase => {
   await registration.cookies.subscribe(subscriptions);
   testCase.add_cleanup(() => registration.cookies.unsubscribe(subscriptions));
 
+  let cookie_change_received_promise = RearmCookieChangeReceivedPromise();
+
   await cookieStore.set('cookie-name', 'cookie-value');
   testCase.add_cleanup(async () => {
     await cookieStore.delete('cookie-name');
   });
   testCase.add_cleanup(() => { g_cookie_changes = []; });
 
-  await g_cookie_change_received_promise;
-  testCase.add_cleanup(() => RearmCookieChangeReceivedPromise());
+  await cookie_change_received_promise;
+  cookie_change_received_promise = RearmCookieChangeReceivedPromise();
 
   // To ensure that we are accounting for all events dispatched by the first
   // cookie change, we initiate and listen for a final cookie change that we
@@ -59,8 +58,7 @@ promise_test(async testCase => {
   });
   testCase.add_cleanup(() => { g_cookie_changes = []; });
 
-  await g_cookie_change_received_promise;
-  testCase.add_cleanup(() => RearmCookieChangeReceivedPromise());
+  await cookie_change_received_promise;
 
   assert_equals(g_cookie_changes.length, 2);
   {
diff --git a/tests/wpt/tests/cookies/partitioned-cookies/partitioned-cookies-parallel-iframes.embed.tentative.https.html b/tests/wpt/tests/cookies/partitioned-cookies/partitioned-cookies-parallel-iframes.embed.tentative.https.html
index 68de567afee..e92a15bcc29 100644
--- a/tests/wpt/tests/cookies/partitioned-cookies/partitioned-cookies-parallel-iframes.embed.tentative.https.html
+++ b/tests/wpt/tests/cookies/partitioned-cookies/partitioned-cookies-parallel-iframes.embed.tentative.https.html
@@ -102,6 +102,9 @@ promise_test( async() => {
   assert_false(iframe2.contentWindow.document.cookie.includes(partitionedCookie),
       iframe2.contentWindow.document.cookie);
 
+  erase_cookie_from_js("partitionedCookie", "Secure; Path=/; SameSite=None; Partitioned");
+  erase_cookie_from_js("second", "Secure; Path=/; SameSite=None; Partitioned");
+
 }, "Partitioned cookies set in same-site contexts are available in other same-site documents.");
 </script>
 </body>
diff --git a/tests/wpt/tests/cookies/partitioned-cookies/partitioned-cookies-samesite-attribute.https.html b/tests/wpt/tests/cookies/partitioned-cookies/partitioned-cookies-samesite-attribute.https.html
new file mode 100644
index 00000000000..323fb08236e
--- /dev/null
+++ b/tests/wpt/tests/cookies/partitioned-cookies/partitioned-cookies-samesite-attribute.https.html
@@ -0,0 +1,59 @@
+<!doctype html>
+<head>
+  <meta charset="utf-8" />
+  <meta name="timeout" content="long" />
+  <meta
+    name="help"
+    href="https://github.com/WICG/CHIPS#chips-cookies-having-independent-partitioned-state"
+  />
+  <script src="/common/get-host-info.sub.js"></script>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/cookies/resources/testharness-helpers.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <title>Test SameSite attribute behavior for partitioned cookies</title>
+</head>
+<body>
+  <script>
+    document.body.onload = async () => {
+      const iframe = document.createElement("iframe");
+      iframe.src = new URL(
+        "resources/partitioned-cookies-samesite-attributes-embed.html",
+        get_host_info().HTTPS_NOTSAMESITE_ORIGIN + self.location.pathname,
+      );
+      document.body.appendChild(iframe);
+      await new Promise(r => iframe.onload = r);
+      await fetch_tests_from_window(iframe.contentWindow);
+    };
+
+    promise_test(async (t) => {
+      t.add_cleanup(test_driver.delete_all_cookies);
+
+      document.cookie = "testPartitioned=0; Secure; Partitioned;";
+      document.cookie = "testUnpartitioned=1; Secure;";
+      const partitionedCookie = await test_driver.get_named_cookie("testPartitioned");
+      const unpartitionedCookie = await test_driver.get_named_cookie("testUnpartitioned");
+
+      // Browsers have not aligned on a common SameSite attribute default yet.
+      assert_any(assert_equals, partitionedCookie["sameSite"], ["Strict", "Lax", "None"]);
+      assert_equals(partitionedCookie["sameSite"], unpartitionedCookie["sameSite"]);
+    }, "In top-level contexts, partitioned cookies default to the same SameSite attribute as unpartitioned cookies.");
+
+    promise_test(async (t) => {
+      t.add_cleanup(test_driver.delete_all_cookies);
+
+      document.cookie = "testStrict=0; Secure; Partitioned; SameSite=Strict;";
+      let cookie = await test_driver.get_named_cookie("testStrict");
+      assert_equals(cookie["sameSite"], "Strict");
+
+      document.cookie = "testLax=0; Secure; Partitioned; SameSite=Lax;";
+      cookie = await test_driver.get_named_cookie("testLax");
+      assert_equals(cookie["sameSite"], "Lax");
+
+      document.cookie = "testNone=0; Secure; Partitioned; SameSite=None;";
+      cookie = await test_driver.get_named_cookie("testNone");
+      assert_equals(cookie["sameSite"], "None");
+    }, "In top-level contexts, partitioned cookies can be set with all SameSite attributes.");
+  </script>
+</body>
diff --git a/tests/wpt/tests/cookies/partitioned-cookies/resources/partitioned-cookies-samesite-attributes-embed.html b/tests/wpt/tests/cookies/partitioned-cookies/resources/partitioned-cookies-samesite-attributes-embed.html
new file mode 100644
index 00000000000..c6f64639eac
--- /dev/null
+++ b/tests/wpt/tests/cookies/partitioned-cookies/resources/partitioned-cookies-samesite-attributes-embed.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<meta name="timeout" content="long" />
+<title>Partitioned cookie SameSite test site embedded in a cross-site context</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<body>
+<script>
+promise_test(async t => {
+  test_driver.set_test_context(window.top);
+  t.add_cleanup(test_driver.delete_all_cookies);
+
+  document.cookie = "testUnset=0; Secure; Partitioned;";
+  document.cookie = "testStrict=0; Secure; Partitioned; SameSite=Strict;";
+  document.cookie = "testLax=0; Secure; Partitioned; SameSite=Lax;";
+  let cookies = await test_driver.get_all_cookies();
+  assert_equals(cookies.length, 0);
+
+  document.cookie = "testNone=0; Secure; Partitioned; SameSite=None;";
+  cookies = await test_driver.get_all_cookies();
+  assert_equals(cookies.length, 1);
+  const cookie = cookies[0];
+  assert_equals(cookie["name"], "testNone");
+  assert_equals(cookie["value"], "0");
+  assert_equals(cookie["sameSite"], "None");
+
+}, "In embedded cross-site contexts, partitioned cookies can only be set with explicit SameSite=None");
+</script>
+</body>
diff --git a/tests/wpt/tests/cookies/third-party-cookies/resources/third-party-cookies-cross-site-embedder-opener.html b/tests/wpt/tests/cookies/third-party-cookies/resources/third-party-cookies-cross-site-embedder-opener.html
new file mode 100644
index 00000000000..f7458f8be16
--- /dev/null
+++ b/tests/wpt/tests/cookies/third-party-cookies/resources/third-party-cookies-cross-site-embedder-opener.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<meta name="timeout" content="long">
+<title>Test third-party cookies</title>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script src="/cookies/third-party-cookies/resources/test-helpers.js"></script>
+
+<body>
+  <script>
+
+    document.body.onload = async () => {
+      // Set SameSite=None cookie in a 1P context using HTTP.
+      const attributes = "Secure;Path=/;SameSite=None";
+      const httpCookieName = "1P_http";
+      await credFetch(
+        `${self.origin}/cookies/resources/set.py?${httpCookieName}=foobar;${attributes}`);
+
+      // Set another cookie using document.cookie.
+      const domCookieName = "1P_dom";
+      document.cookie = `${domCookieName}=foobar;${attributes}`;
+
+      const cookieNames = [httpCookieName, domCookieName];
+
+      // Set another cookie using the CookieStore API, if supported.
+      if (window.cookieStore) {
+        const cookieStoreCookieName = "1P_cs";
+        await cookieStore.set({
+          name: cookieStoreCookieName,
+          value: "foobar",
+          path: "/",
+          sameSite: "none",
+        });
+        cookieNames.push(cookieStoreCookieName);
+      }
+
+      // Test that the cookie is available in a first-party context via HTTP.
+      testHttpCookies({
+        desc: get_host_info().HTTPS_ORIGIN + " " + get_host_info().HTTPS_REMOTE_ORIGIN + " " + get_host_info().HTTPS_NOTSAMESITE_ORIGIN + " " + get_host_info().HTTPS_AUTHENTICATED_ORIGIN,
+        origin: self.origin,
+        cookieNames,
+        expectsCookie: true,
+      });
+
+      // // Verify that the cookies are available to the DOM as well.
+      testDomCookies({
+        desc: "1P window",
+        cookieNames,
+        expectsCookie: true,
+      });
+      testCookieStoreCookies({
+        desc: "1P window",
+        cookieNames,
+        expectsCookie: true,
+      });
+
+      // Open a cross-site window which will embed the current origin in a
+      // third-party context.
+      const crossSiteUrl = new URL(
+        `/cookies/third-party-cookies/resources/third-party-cookies-cross-site-embedder.html?origin=${encodeURIComponent(self.origin)}`,
+        get_host_info().HTTPS_ORIGIN + self.location.pathname);
+      const popup = window.open(crossSiteUrl);
+      fetch_tests_from_window(popup);
+    };
+
+  </script>
+</body>
diff --git a/tests/wpt/tests/cookies/third-party-cookies/third-party-cookies.tentative.https.html b/tests/wpt/tests/cookies/third-party-cookies/third-party-cookies.tentative.https.html
index 018849c8279..decf6419281 100644
--- a/tests/wpt/tests/cookies/third-party-cookies/third-party-cookies.tentative.https.html
+++ b/tests/wpt/tests/cookies/third-party-cookies/third-party-cookies.tentative.https.html
@@ -2,7 +2,8 @@
 <meta charset="utf-8"/>
 <meta name="timeout" content="long">
 <title>Test third-party cookies</title>
-<title>Test partitioned cookies</title>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
@@ -13,57 +14,10 @@
 <script>
 
 document.body.onload = async () => {
-  // Set SameSite=None cookie in a 1P context using HTTP.
-  const attributes = "Secure;Path=/;SameSite=None";
-  const httpCookieName = "1P_http";
-  await credFetch(
-      `${self.origin}/cookies/resources/set.py?${httpCookieName}=foobar;${
-          attributes}`);
-
-  // Set another cookie using document.cookie.
-  const domCookieName = "1P_dom";
-  document.cookie = `${domCookieName}=foobar;${attributes}`;
-
-  const cookieNames = [httpCookieName, domCookieName];
-
-  // Set another cookie using the CookieStore API, if supported.
-  if (window.cookieStore) {
-    const cookieStoreCookieName = "1P_cs";
-    await cookieStore.set({
-      name: cookieStoreCookieName,
-      value: "foobar",
-      path: "/",
-      sameSite: "none",
-    });
-    cookieNames.push(cookieStoreCookieName);
-  }
-
-  // Test that the cookie is available in a first-party context via HTTP.
-  testHttpCookies({
-    desc: "1P window",
-    origin: self.origin,
-    cookieNames,
-    expectsCookie: true,
-  });
-
-  // // Verify that the cookies are available to the DOM as well.
-  testDomCookies({
-    desc: "1P window",
-    cookieNames,
-    expectsCookie: true,
-  });
-  testCookieStoreCookies({
-    desc: "1P window",
-    cookieNames,
-    expectsCookie: true,
-  });
-
-  // Open a cross-site window which will embed the current origin in a
-  // third-party context.
+  // Open a cross-site window.
   const crossSiteUrl = new URL(
-      `./resources/third-party-cookies-cross-site-embedder.html?origin=${
-          encodeURIComponent(self.origin)}`,
-      get_host_info().HTTPS_NOTSAMESITE_ORIGIN + self.location.pathname);
+    `./resources/third-party-cookies-cross-site-embedder-opener.html`,
+    get_host_info().HTTPS_NOTSAMESITE_ORIGIN + self.location.pathname);
   const popup = window.open(crossSiteUrl);
   fetch_tests_from_window(popup);
 };
diff --git a/tests/wpt/tests/core-aam/META.yml b/tests/wpt/tests/core-aam/META.yml
index dfce961fa8a..f150c4fe065 100644
--- a/tests/wpt/tests/core-aam/META.yml
+++ b/tests/wpt/tests/core-aam/META.yml
@@ -3,3 +3,4 @@ suggested_reviewers:
   - jnurthen
   - michael-n-cooper
   - spectranaut
+  - sideshowbarker
diff --git a/tests/wpt/tests/credential-management/non-fully-active.https.html b/tests/wpt/tests/credential-management/non-fully-active.https.html
index 508b4325d78..a0a76f0fce1 100644
--- a/tests/wpt/tests/credential-management/non-fully-active.https.html
+++ b/tests/wpt/tests/credential-management/non-fully-active.https.html
@@ -26,7 +26,7 @@
     const iframe = document.querySelector("iframe");
 
     // The signal check happens after the fully active check.
-    // This allows us to confirm the the right error is thrown
+    // This allows us to confirm the right error is thrown
     // and in the right order.
     const controller = new iframe.contentWindow.AbortController();
     const signal = controller.signal;
diff --git a/tests/wpt/tests/css/CSS2/css1/c414-flt-ln-002.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-ln-002.xht
index 99965439661..ef5448c4893 100644
--- a/tests/wpt/tests/css/CSS2/css1/c414-flt-ln-002.xht
+++ b/tests/wpt/tests/css/CSS2/css1/c414-flt-ln-002.xht
@@ -30,7 +30,7 @@
   <p>Test passes if for each matching pair of colored boxes either:</p>
   <ul>
     <li>the top of the small box is level with the top of the big box <em>or</em></li>
-    <li>the top of the big box is level with the bottom of the the small box
+    <li>the top of the big box is level with the bottom of the small box
       and either
       <ul>
         <li>the small box crosses into the righthand region marked by the yellow box or</li>
diff --git a/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-007.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-007.xht
index d7f00230f9d..ff45a8cb230 100644
--- a/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-007.xht
+++ b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-007.xht
@@ -6,7 +6,7 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/visuren.html#direction' />
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-direction-unicode-bidi/generate?test=7' />
-<meta name="assert" content="In a RTL context, if direction:ltr and unicode-bidi:embed are applied to an inline element containing mixed direction text, the the inline element will interact with surrounding ltr text as a LTR directional run." />
+<meta name="assert" content="In a RTL context, if direction:ltr and unicode-bidi:embed are applied to an inline element containing mixed direction text, the inline element will interact with surrounding ltr text as a LTR directional run." />
 <style type='text/css'>
 .test { direction: rtl; } .test span { direction: ltr; unicode-bidi: embed; }
 
diff --git a/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-008.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-008.xht
index 3b5e7299fea..53c0318839b 100644
--- a/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-008.xht
+++ b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-008.xht
@@ -6,7 +6,7 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/visuren.html#direction' />
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-direction-unicode-bidi/generate?test=8' />
-<meta name="assert" content="In a LTR context, if direction:rtl and unicode-bidi:embed are applied to an inline element containing mixed direction text, the the inline element will interact with surrounding rtl text as a RTL directional run." />
+<meta name="assert" content="In a LTR context, if direction:rtl and unicode-bidi:embed are applied to an inline element containing mixed direction text, the inline element will interact with surrounding rtl text as a RTL directional run." />
 <style type='text/css'>
 .test { direction: ltr; } .test span { direction: rtl; unicode-bidi: embed; }
 
diff --git a/tests/wpt/tests/css/CSS2/linebox/animations/line-height-interpolation.html b/tests/wpt/tests/css/CSS2/linebox/animations/line-height-interpolation.html
index a0570f82a90..39b768541d7 100644
--- a/tests/wpt/tests/css/CSS2/linebox/animations/line-height-interpolation.html
+++ b/tests/wpt/tests/css/CSS2/linebox/animations/line-height-interpolation.html
@@ -183,4 +183,21 @@ test_no_interpolation({
   from: '14q',
   to: 'normal',
 });
+
+test_no_interpolation({
+  property: 'line-height',
+  from: '1',
+  to: '200%',
+});
+
+test_interpolation({
+  property: 'line-height',
+  from: '100%',
+  to: '200%',
+}, [
+  {at: 0, expect: '100%'},
+  {at: 0.3, expect: '130%'},
+  {at: 0.6, expect: '160%'},
+  {at: 1, expect: '200%'},
+]);
 </script>
diff --git a/tests/wpt/tests/css/CSS2/stacking-context/root-element-creates-stacking-context-ref.html b/tests/wpt/tests/css/CSS2/stacking-context/root-element-creates-stacking-context-ref.html
new file mode 100644
index 00000000000..9bb42041498
--- /dev/null
+++ b/tests/wpt/tests/css/CSS2/stacking-context/root-element-creates-stacking-context-ref.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<body style="width: 100px; margin: 0">
+  <div style="height: 100px; background: green"></div>
+</body>
diff --git a/tests/wpt/tests/css/CSS2/stacking-context/root-element-creates-stacking-context.html b/tests/wpt/tests/css/CSS2/stacking-context/root-element-creates-stacking-context.html
new file mode 100644
index 00000000000..be7b027ee79
--- /dev/null
+++ b/tests/wpt/tests/css/CSS2/stacking-context/root-element-creates-stacking-context.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html style="width: 0; height: 0; border: 50px solid red">
+  <link rel="help" href="https://drafts.csswg.org/css2/#stacking-context">
+  <link rel="match" href="root-element-creates-stacking-context-ref.html">
+  <link rel="author" title="Michael Rees" href="mailto:mrees@noeontheend.com">
+  <meta name="assert" content="root element forms the root stacking context">
+  <body style="border: 50px solid green; margin: -50px; position: relative; z-index: -1">
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/compositing/root-element-background-contain-hidden-crash.html b/tests/wpt/tests/css/compositing/root-element-background-contain-hidden-crash.html
new file mode 100644
index 00000000000..da07de5bf51
--- /dev/null
+++ b/tests/wpt/tests/css/compositing/root-element-background-contain-hidden-crash.html
@@ -0,0 +1,11 @@
+<style>
+* {
+  background-color: red;
+  contain: layout;
+}
+*:first-child {
+  visibility: hidden;
+  background-image: url(data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAIAAABt+uBvAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wDGhYvCNVA1EIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAjklEQVR42u3QIQEAMAgAsHNNVspTgARY1BZh0ZWP3VcgSJAgQYIECRKEIEGCBAkSJEgQggQJEiRIkCBBCBIkSJAgQYIECUKQIEGCBAkSJAhBggQJEiRIkCAECRIkSJAgQYIEIUiQIEGCBAkShCBBggQJEiRIEIIECRIkSJAgQYIQJEiQIEGCBAlCkCBBdwaeugIthHvZ+AAAAABJRU5ErkJggg==)
+}
+</style>
+<object data="x">
diff --git a/tests/wpt/tests/css/compositing/root-element-background-image-opaque-crash.html b/tests/wpt/tests/css/compositing/root-element-background-image-opaque-crash.html
new file mode 100644
index 00000000000..d380310d096
--- /dev/null
+++ b/tests/wpt/tests/css/compositing/root-element-background-image-opaque-crash.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<style>
+  :root {
+    background-color: rgba(255, 255, 255, 0.98);
+    background-image: url(/images/computer.jpg); /* opaque */
+    background-position: top left;
+    background-repeat: repeat;
+  }
+</style>
diff --git a/tests/wpt/tests/css/compositing/root-element-background-margin-opacity-ref.html b/tests/wpt/tests/css/compositing/root-element-background-margin-opacity-ref.html
new file mode 100644
index 00000000000..afe543029d8
--- /dev/null
+++ b/tests/wpt/tests/css/compositing/root-element-background-margin-opacity-ref.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<div style="position: absolute; top: 100px; left: 100px; width: 100px; height: 100px;
+            background: green; opacity: 0.5"></div>
diff --git a/tests/wpt/tests/css/compositing/root-element-background-margin-opacity.html b/tests/wpt/tests/css/compositing/root-element-background-margin-opacity.html
new file mode 100644
index 00000000000..e1e7fed5a66
--- /dev/null
+++ b/tests/wpt/tests/css/compositing/root-element-background-margin-opacity.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="help" href="https://www.w3.org/TR/compositing-1/#pagebackdrop">
+<link rel="help" href="https://crbug.com/40904650">
+<link rel="match" href="root-element-background-margin-opacity-ref.html">
+<meta name="fuzzy" content="maxDifference=0-1;totalPixels=0-10000">
+<style>
+html {
+  margin: 100px;
+  width: 100px;
+  height: 100px;
+  background: linear-gradient(green, green) top left no-repeat;
+  opacity: 0.5;
+}
+</style>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-items-static-position-001-ref.tentative.html b/tests/wpt/tests/css/css-align/abspos/align-items-static-position-001-ref.tentative.html
new file mode 100644
index 00000000000..22c1fd03e38
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-items-static-position-001-ref.tentative.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<style>
+.block {
+  display: block;
+  width: 75%;
+  height: 75%;
+  border: 5px dotted blue;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+  justify-self: center;
+}
+</style>
+<div class="container"><div class="block">
+  <div class="abs"></div>
+</div></div>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-items-static-position-001.tentative.html b/tests/wpt/tests/css/css-align/abspos/align-items-static-position-001.tentative.html
new file mode 100644
index 00000000000..06c11e6cdb6
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-items-static-position-001.tentative.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<title>Align-items only applies to OOF elements of block elements when statically positioned if it would apply if not OOF.</title>
+<link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-align-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-position-3/#abspos-alignment">
+<link rel="help" href="https://issues.chromium.org/issues/409806799">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/12121">
+<link rel="match" href="align-items-static-position-001-ref.tentative.html">
+<style>
+.block {
+  display: block;
+  width: 75%;
+  height: 75%;
+  border: 5px dotted blue;
+  align-items: center;
+  justify-items: center;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+</style>
+<div class="container"><div class="block">
+  <div class="abs"></div>
+</div></div>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-items-static-position-002-ref.tentative.html b/tests/wpt/tests/css/css-align/abspos/align-items-static-position-002-ref.tentative.html
new file mode 100644
index 00000000000..6f53b041787
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-items-static-position-002-ref.tentative.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.inline {
+  display: inline;
+  color: transparent;
+  font: 10px Ahem;
+  line-height: 25px;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+</style>
+<div class="container"><div class="inline">text
+  <div class="abs"></div>
+  <br>text
+</div></div>
+
diff --git a/tests/wpt/tests/css/css-align/abspos/align-items-static-position-002.tentative.html b/tests/wpt/tests/css/css-align/abspos/align-items-static-position-002.tentative.html
new file mode 100644
index 00000000000..f90004b5672
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-items-static-position-002.tentative.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<title>Align-items doesn't apply to OOF elements of inline elements when statically positioned because they would apply if not OOF.</title>
+<link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-align-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-position-3/#abspos-alignment">
+<link rel="help" href="https://issues.chromium.org/issues/409806799">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/12121">
+<link rel="match" href="align-items-static-position-002-ref.tentative.html">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.inline {
+  display: inline;
+  color: transparent;
+  font: 10px Ahem;
+  line-height: 25px;
+  align-items: center;
+  justify-items: center;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+</style>
+<div class="container"><div class="inline">text
+  <div class="abs"></div>
+  <br>text
+</div></div>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-items-static-position-ref.html b/tests/wpt/tests/css/css-align/abspos/align-items-static-position-ref.html
index 1b36d26bbe1..fd7093f9874 100644
--- a/tests/wpt/tests/css/css-align/abspos/align-items-static-position-ref.html
+++ b/tests/wpt/tests/css/css-align/abspos/align-items-static-position-ref.html
@@ -53,21 +53,21 @@
 </style>
 <div class="container"><div class="flex">
   <div class="abs left center-block"></div>
-</div></div
-><div class="container"><div class="flex">
+</div></div>
+<div class="container"><div class="flex">
   <div class="abs left top"></div>
-</div></div
-><br>
+</div></div>
+<br>
 <div class="container"><div class="grid">
   <div class="abs center-inline center-block"></div>
-</div></div
-><div class="container"><div class="grid">
+</div></div>
+<div class="container"><div class="grid">
   <div class="abs center-inline top"></div>
-</div></div
-><div class="container"><div class="grid">
+</div></div>
+<div class="container"><div class="grid">
   <div class="abs left center-block"></div>
-</div></div
-><div class="container"><div class="grid">
+</div></div>
+<div class="container"><div class="grid">
   <div class="abs left top"></div>
-</div></div
-><br>
+</div></div>
+<br>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-items-static-position.html b/tests/wpt/tests/css/css-align/abspos/align-items-static-position.html
index 8f3dbb7ae41..0b653ca5d6c 100644
--- a/tests/wpt/tests/css/css-align/abspos/align-items-static-position.html
+++ b/tests/wpt/tests/css/css-align/abspos/align-items-static-position.html
@@ -59,21 +59,21 @@
 </style>
 <div class="container"><div class="flex">
   <div class="abs static-positioned-inline static-positioned-block"></div>
-</div></div
-><div class="container"><div class="flex">
+</div></div>
+<div class="container"><div class="flex">
   <div class="abs static-positioned-inline positioned-block"></div>
-</div></div
-><br>
+</div></div>
+<br>
 <div class="container"><div class="grid">
   <div class="abs static-positioned-inline static-positioned-block"></div>
-</div></div
-><div class="container"><div class="grid">
+</div></div>
+<div class="container"><div class="grid">
   <div class="abs static-positioned-inline positioned-block"></div>
-</div></div
-><div class="container"><div class="grid">
+</div></div>
+<div class="container"><div class="grid">
   <div class="abs positioned-inline static-positioned-block"></div>
-</div></div
-><div class="container"><div class="grid">
+</div></div>
+<div class="container"><div class="grid">
   <div class="abs positioned-inline positioned-block"></div>
-</div></div
-><br>
+</div></div>
+<br>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-001-ref.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-001-ref.html
new file mode 100644
index 00000000000..94d0b43b212
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-001-ref.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<style>
+.block {
+  width: 75px;
+  height: 50px;
+  z-index: -1;
+  border: 5px dotted blue;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+</style>
+<!-- start aligned -->
+<div class="container"><div class="block">
+  <div class="abs"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="top: 0px;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="left: 0px;"></div>
+</div></div>
+<br>
+<!-- end aligned -->
+<div class="container"><div class="block">
+  <div class="abs" style="top: -45px; left: 30px;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="top: 50px; left: 30px;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="top: -45px; left: 50px;"></div>
+</div></div>
+<br>
+<!-- center aligned -->
+<div class="container"><div class="block">
+  <div class="abs" style="top: -20px; left: 17.5px;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="top: 25px; left: 17.5px;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="top: -20px; left: 25px;"></div>
+</div></div>
+<br>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-001.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-001.html
new file mode 100644
index 00000000000..1ff73ef116d
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-001.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<title>Align-self applies to OOF elements of block elements when statically positioned.</title>
+<link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-align-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-position-3/#abspos-alignment">
+<link rel="help" href="https://issues.chromium.org/issues/409806799">
+<link rel="match" href="align-self-static-position-001-ref.html">
+<style>
+.block {
+  display: block;
+  width: 75%;
+  height: 50%;
+  border: 5px dotted blue;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+
+.static-positioned-inline {
+  left: auto;
+  right: auto;
+}
+
+.static-positioned-block {
+  top: auto;
+  bottom: auto;
+}
+
+.positioned-inline {
+  left: 0;
+  right: 0;
+}
+
+.positioned-block {
+  top: 0;
+  bottom: 0;
+}
+
+.center {
+  justify-self: center;
+  align-self: center;
+}
+
+.end {
+  justify-self: end;
+  align-self: end;
+}
+
+.start {
+  justify-self: start;
+  align-self: start;
+}
+</style>
+<!-- start aligned -->
+<div class="container"><div class="block">
+  <div class="abs static-positioned-inline static-positioned-block start"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs static-positioned-inline positioned-block start"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs positioned-inline static-positioned-block start"></div>
+</div></div>
+<br>
+<!-- end aligned -->
+<div class="container"><div class="block">
+  <div class="abs static-positioned-inline static-positioned-block end"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs static-positioned-inline positioned-block end"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs positioned-inline static-positioned-block end"></div>
+</div></div>
+<br>
+<!-- center aligned -->
+<div class="container"><div class="block">
+  <div class="abs static-positioned-inline static-positioned-block center"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs static-positioned-inline positioned-block center"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs positioned-inline static-positioned-block center"></div>
+</div></div>
+<br>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-002-ref.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-002-ref.html
new file mode 100644
index 00000000000..d8bef63aa29
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-002-ref.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<style>
+.block {
+  width: 75px;
+  height: 50px;
+  z-index: -1;
+  border: 5px dotted blue;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+</style>
+<!-- start aligned -->
+<div class="container"><div class="block" style="margin-left: 15px;">
+  <div class="abs" style="left: 45px;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="top: 0px;"></div>
+</div></div>
+<div class="container"><div class="block" style="margin-left: 15px;">
+  <div class="abs" style="right: 0px;"></div>
+</div></div>
+<br>
+<!-- end aligned -->
+<div class="container"><div class="block">
+  <div class="abs" style="left: -45px;"></div>
+</div></div>
+<div class="container"><div class="block" style="margin-left: 15px;">
+  <div class="abs" style="top: 50px; right: -45px;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="left: 50px;"></div>
+</div></div>
+<br>
+<!-- center aligned -->
+<div class="container"><div class="block" style="margin-left: 15px;">
+  <div class="abs" style="right: -20px;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="top: 25px; left: -20px;"></div>
+</div></div>
+<div class="container"><div class="block" style="margin-left: 15px;">
+  <div class="abs" style="left: 25px;"></div>
+</div></div>
+<br>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-002.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-002.html
new file mode 100644
index 00000000000..4c794bac287
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-002.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<title>Align-self applies to OOF elements of block elements when statically positioned with different writing modes.</title>
+<link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-align-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-position-3/#abspos-alignment">
+<link rel="help" href="https://issues.chromium.org/issues/409806799">
+<link rel="match" href="align-self-static-position-002-ref.html">
+<style>
+.block {
+  display: block;
+  width: 75%;
+  height: 50%;
+  border: 5px dotted blue;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+
+.static-positioned-inline {
+  left: auto;
+  right: auto;
+}
+
+.static-positioned-block {
+  top: auto;
+  bottom: auto;
+}
+
+.positioned-inline {
+  left: 0;
+  right: 0;
+}
+
+.positioned-block {
+  top: 0;
+  bottom: 0;
+}
+
+.center {
+  justify-self: center;
+  align-self: center;
+}
+
+.end {
+  justify-self: end;
+  align-self: end;
+}
+
+.start {
+  justify-self: start;
+  align-self: start;
+}
+
+.vertRL {
+  writing-mode: vertical-rl;
+}
+
+.vertLR {
+  writing-mode: vertical-lr;
+}
+</style>
+<!-- start aligned -->
+<div class="container vertRL"><div class="block">
+  <div class="abs static-positioned-inline static-positioned-block start"></div>
+</div></div>
+<div class="container vertLR"><div class="block">
+  <div class="abs static-positioned-inline positioned-block start"></div>
+</div></div>
+<div class="container vertRL"><div class="block">
+  <div class="abs positioned-inline static-positioned-block start"></div>
+</div></div>
+<br>
+<!-- end aligned -->
+<div class="container vertLR"><div class="block">
+  <div class="abs static-positioned-inline static-positioned-block end"></div>
+</div></div>
+<div class="container vertRL"><div class="block">
+  <div class="abs static-positioned-inline positioned-block end"></div>
+</div></div>
+<div class="container vertLR"><div class="block">
+  <div class="abs positioned-inline static-positioned-block end"></div>
+</div></div>
+<br>
+<!-- center aligned -->
+<div class="container vertRL"><div class="block">
+  <div class="abs static-positioned-inline static-positioned-block center"></div>
+</div></div>
+<div class="container vertLR"><div class="block">
+  <div class="abs static-positioned-inline positioned-block center"></div>
+</div></div>
+<div class="container vertRL"><div class="block">
+  <div class="abs positioned-inline static-positioned-block center"></div>
+</div></div>
+<br>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-003-ref.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-003-ref.html
new file mode 100644
index 00000000000..132bbb7360f
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-003-ref.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.inline {
+  display: inline;
+  color: transparent;
+  font: 10px Ahem;
+  line-height: 25px;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+</style>
+<!-- start aligned -->
+<div class="container"><div class="inline">text
+  <div class="abs" style="top: 25px;"></div>
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs" style="top: 0px;"></div>
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs" style="top: 25px;"></div>
+</div></div>
+<br>
+<!-- end aligned -->
+<div class="container"><div class="inline">text
+  <div class="abs" style="bottom: 50px; left: -50px"></div>
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs" style="bottom: 0px; left: -50px;"></div>
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs" style="bottom: 50px; left: 50px;"></div>
+</div></div>
+<br>
+<!-- center aligned -->
+<div class="container"><div class="inline">text
+  <div class="abs" style="top: 12.5px; left: -25px;"></div>
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs" style="top: 25px; left: -25px;"></div>
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs" style="top: 12.5px; left: 25px;"></div>
+</div></div>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-003.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-003.html
new file mode 100644
index 00000000000..39f871f4c2b
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-003.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<title>Align-self applies to OOF elements of inline elements when statically positioned.</title>
+<link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-align-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-position-3/#abspos-alignment">
+<link rel="help" href="https://issues.chromium.org/issues/409806799">
+<link rel="match" href="align-self-static-position-003-ref.html">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.inline {
+  display: inline;
+  color: transparent;
+  font: 10px Ahem;
+  line-height: 25px;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+
+.static-positioned-inline {
+  left: auto;
+  right: auto;
+}
+
+.static-positioned-block {
+  top: auto;
+  bottom: auto;
+}
+
+.positioned-inline {
+  left: 0;
+  right: 0;
+}
+
+.positioned-block {
+  top: 0;
+  bottom: 0;
+}
+
+.center {
+  justify-self: center;
+  align-self: center;
+}
+
+.end {
+  justify-self: end;
+  align-self: end;
+}
+
+.start {
+  justify-self: start;
+  align-self: start;
+}
+</style>
+<!-- start aligned -->
+<div class="container"><div class="inline">text
+  <div class="abs static-positioned-inline static-positioned-block start"></div>
+  <br>text
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs static-positioned-inline positioned-block start"></div>
+  <br>text
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs positioned-inline static-positioned-block start"></div>
+  <br>text
+</div></div>
+<br>
+<!-- end aligned -->
+<div class="container"><div class="inline">text
+  <div class="abs static-positioned-inline static-positioned-block end"></div>
+  <br>text
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs static-positioned-inline positioned-block end"></div>
+  <br>text
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs positioned-inline static-positioned-block end"></div>
+  <br>text
+</div></div>
+<br>
+<!-- center aligned -->
+<div class="container"><div class="inline">text
+  <div class="abs static-positioned-inline static-positioned-block center"></div>
+  <br>text
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs static-positioned-inline positioned-block center"></div>
+  <br>text
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs positioned-inline static-positioned-block center"></div>
+  <br>text
+</div></div>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-004-ref.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-004-ref.html
new file mode 100644
index 00000000000..68130ee1d7e
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-004-ref.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.inline {
+  display: inline;
+  color: transparent;
+  font: 10px Ahem;
+  line-height: 25px;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+
+.vertRL {
+  writing-mode: vertical-rl;
+}
+
+.vertLR {
+  writing-mode: vertical-lr;
+}
+</style>
+<!-- start aligned -->
+<div class="container vertRL"><div class="inline">text
+  <div class="abs" style="top: 0px; right: 25px;"></div>
+</div></div>
+<div class="container vertLR"><div class="inline">text
+  <div class="abs" style="top: 0px; left: 25px;"></div>
+</div></div>
+<div class="container vertRL"><div class="inline">text
+  <div class="abs" style="top: 0px; right: 0px;"></div>
+</div></div>
+<br>
+<!-- end aligned -->
+<div class="container vertLR"><div class="inline">text
+  <div class="abs" style="top: -50px; right: 50px"></div>
+</div></div>
+<div class="container vertRL"><div class="inline">text
+  <div class="abs" style="bottom: 0px; left: 50px;"></div>
+</div></div>
+<div class="container vertLR"><div class="inline">text
+  <div class="abs" style="top: -50px; right: 0px;"></div>
+</div></div>
+<br>
+<!-- center aligned -->
+<div class="container vertLR"><div class="inline">text
+  <div class="abs" style="right: 12.5px; top: -25px;"></div>
+</div></div>
+<div class="container vertRL"><div class="inline">text
+  <div class="abs" style="top: 25px; left: 12.5px;"></div>
+</div></div>
+<div class="container vertLR"><div class="inline">text
+  <div class="abs" style="top: -25px; left: 25px;"></div>
+</div></div>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-004.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-004.html
new file mode 100644
index 00000000000..afba7215b11
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-004.html
@@ -0,0 +1,118 @@
+<!DOCTYPE html>
+<title>Align-self applies to OOF elements of inline elements when statically positioned with different writing modes.</title>
+<link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-align-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-position-3/#abspos-alignment">
+<link rel="help" href="https://issues.chromium.org/issues/409806799">
+<link rel="match" href="align-self-static-position-004-ref.html">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.inline {
+  display: inline;
+  color: transparent;
+  font: 10px Ahem;
+  line-height: 25px;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+
+.static-positioned-inline {
+  left: auto;
+  right: auto;
+}
+
+.static-positioned-block {
+  top: auto;
+  bottom: auto;
+}
+
+.positioned-inline {
+  left: 0;
+  right: 0;
+}
+
+.positioned-block {
+  top: 0;
+  bottom: 0;
+}
+
+.center {
+  justify-self: center;
+  align-self: center;
+}
+
+.end {
+  justify-self: end;
+  align-self: end;
+}
+
+.start {
+  justify-self: start;
+  align-self: start;
+}
+
+.vertRL {
+  writing-mode: vertical-rl;
+}
+
+.vertLR {
+  writing-mode: vertical-lr;
+}
+</style>
+<!-- start aligned -->
+<div class="container vertRL"><div class="inline">text
+  <div class="abs static-positioned-inline static-positioned-block start"></div>
+  <br>text
+</div></div>
+<div class="container vertLR"><div class="inline">text
+  <div class="abs static-positioned-inline positioned-block start"></div>
+  <br>text
+</div></div>
+<div class="container vertRL"><div class="inline">text
+  <div class="abs positioned-inline static-positioned-block start"></div>
+  <br>text
+</div></div>
+<br>
+<!-- end aligned -->
+<div class="container vertLR"><div class="inline">text
+  <div class="abs static-positioned-inline static-positioned-block end"></div>
+  <br>text
+</div></div>
+<div class="container vertRL"><div class="inline">text
+  <div class="abs static-positioned-inline positioned-block end"></div>
+  <br>text
+</div></div>
+<div class="container vertLR"><div class="inline">text
+  <div class="abs positioned-inline static-positioned-block end"></div>
+  <br>text
+</div></div>
+<br>
+<!-- center aligned -->
+<div class="container vertRL"><div class="inline">text
+  <div class="abs static-positioned-inline static-positioned-block center"></div>
+  <br>text
+</div></div>
+<div class="container vertLR"><div class="inline">text
+  <div class="abs static-positioned-inline positioned-block center"></div>
+  <br>text
+</div></div>
+<div class="container vertRL"><div class="inline">text
+  <div class="abs positioned-inline static-positioned-block center"></div>
+  <br>text
+</div></div>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-005-ref.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-005-ref.html
new file mode 100644
index 00000000000..62597fba605
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-005-ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.container {
+  position: relative;
+  border: 1px solid;
+}
+
+.abs {
+  position: absolute;
+  background: purple;
+  opacity: 0.5;
+  bottom: 0px;
+}
+</style>
+<div class="container">
+  <span style="font: 20px/1 Ahem;">hello
+    <span class="abs">hello</span>
+    <span style="vertical-align: top; font-size: 50px;">world</span>
+  </span>
+</div>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-005.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-005.html
new file mode 100644
index 00000000000..207a5443331
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-005.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<title>Align-self applies to OOF elements of inline elements when statically positioned.</title>
+<link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-align-self-normal">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-normal">
+<link rel="help" href="https://drafts.csswg.org/css-position-3/#abspos-alignment">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#align-abspos">
+<link rel="help" href="https://issues.chromium.org/issues/409806799">
+<link rel="match" href="align-self-static-position-005-ref.html">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.container {
+  position: relative;
+  border: 1px solid;
+}
+
+.abs {
+  position: absolute;
+  background: purple;
+  align-self: end;
+  opacity: 0.5;
+}
+</style>
+<div class="container">
+  <span style="font: 20px/1 Ahem;">hello
+    <span class="abs">hello</span>
+    <span style="vertical-align: top; font-size: 50px;">world</span>
+  </span>
+</div>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-006-ref.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-006-ref.html
new file mode 100644
index 00000000000..5bbafc64845
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-006-ref.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<style>
+.block {
+  width: 75px;
+  height: 75px;
+  z-index: -1;
+  border: 5px dotted blue;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+</style>
+<!-- start aligned -->
+<div class="container"><div class="block">
+  <div class="abs"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="left: 30px;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs"></div>
+</div></div>
+<br>
+<!-- end aligned -->
+<div class="container"><div class="block">
+  <div class="abs" style="top: -45px; left: 30px;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="top: -45px;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="top: -45px; left: 30px;"></div>
+</div></div>
+<br>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-006.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-006.html
new file mode 100644
index 00000000000..253b2a52f61
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-006.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<title>Align-self:self-start/end applies to OOF elements of block elements when statically positioned.</title>
+<link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-align-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-position-3/#abspos-alignment">
+<link rel="help" href="https://issues.chromium.org/issues/409806799">
+<link rel="match" href="align-self-static-position-006-ref.html">
+<style>
+.block {
+  display: block;
+  width: 75%;
+  height: 75%;
+  border: 5px dotted blue;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  display: inline-block;
+  width: 100px;
+  height: 100px;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+
+.end {
+  justify-self: self-end;
+  align-self: self-end;
+}
+
+.start {
+  justify-self: self-start;
+  align-self: self-start;
+}
+</style>
+<!-- self-start aligned -->
+<div class="container"><div class="block">
+  <div class="abs start"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs start" style="direction: rtl;"></div>
+</div></div>
+<div class="container"><div class="block" style="direction: rtl;">
+  <div class="abs start" style="direction: ltr;"></div>
+</div></div>
+<br>
+<!-- self-end aligned -->
+<div class="container"><div class="block">
+  <div class="abs end"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs end" style="direction: rtl;"></div>
+</div></div>
+<div class="container"><div class="block" style="direction: rtl;">
+  <div class="abs end" style="direction: ltr;"></div>
+</div></div>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-007-ref.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-007-ref.html
new file mode 100644
index 00000000000..bc9b5f4f650
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-007-ref.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.inline {
+  display: inline;
+  color: transparent;
+  font: 10px Ahem;
+  line-height: 25px;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+</style>
+<!-- start aligned -->
+<div class="container"><div class="inline">text
+  <div class="abs" style="top: 25px;"></div>
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs" style="left: -50px;"></div>
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs" style="top: 0px;"></div>
+</div></div>
+<br>
+<!-- end aligned -->
+<div class="container"><div class="inline">text
+  <div class="abs" style="bottom: 50px; left: -50px"></div>
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs" style="top: 0px;"></div>
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs" style="top: -25px; left: -50px;"></div>
+</div></div>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-007.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-007.html
new file mode 100644
index 00000000000..ebe872aaab9
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-007.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<title>Align-self:self-start/end applies to OOF elements of inline elements when statically positioned.</title>
+<link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-align-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-position-3/#abspos-alignment">
+<link rel="help" href="https://issues.chromium.org/issues/409806799">
+<link rel="match" href="align-self-static-position-007-ref.html">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+.inline {
+  display: inline;
+  color: transparent;
+  font: 10px Ahem;
+  line-height: 25px;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+
+.end {
+  justify-self: self-end;
+  align-self: self-end;
+}
+
+.start {
+  justify-self: self-start;
+  align-self: self-start;
+}
+</style>
+<!-- self-start aligned -->
+<div class="container"><div class="inline">text
+  <div class="abs start"></div>
+  <br>text
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs start" style="direction: rtl;"></div>
+  <br>text
+</div></div>
+<div class="container"><div class="inline" style="direction: rtl;">text
+  <div class="abs start" style="direction: ltr;"></div>
+  <br>text
+</div></div>
+<br>
+<!-- self-end aligned -->
+<div class="container"><div class="inline">text
+  <div class="abs end"></div>
+  <br>text
+</div></div>
+<div class="container"><div class="inline">text
+  <div class="abs end" style="direction: rtl;"></div>
+  <br>text
+</div></div>
+<div class="container"><div class="inline" style="direction: rtl;">text
+  <div class="abs end" style="direction: ltr;"></div>
+  <br>text
+</div></div>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-008-ref.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-008-ref.html
new file mode 100644
index 00000000000..79cf612b8f8
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-008-ref.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<style>
+.block {
+  display: block;
+  width: 75%;
+  height: 75%;
+  border: 5px dotted blue;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  display: inline-block;
+  width: 100px;
+  height: 100px;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+</style>
+<!-- justify-self -->
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: end;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: end;"></div>
+</div></div>
+<br>
+<div class="container"><div class="block">
+  <div class="abs" style="left: 25px;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: end;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: start;"></div>
+</div></div>
+<br>
+<!-- align-self -->
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: end;"></div>
+</div></div>
+<br>
+<div class="container"><div class="block">
+  <div class="abs" style="top: 25px;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: end;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: start;"></div>
+</div></div>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-static-position-008.html b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-008.html
new file mode 100644
index 00000000000..187974884b4
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-static-position-008.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<title>Align-self applies to OOF elements of block elements when statically positioned.</title>
+<link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-align-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-auto">
+<link rel="help" href="https://drafts.csswg.org/css-position-3/#abspos-alignment">
+<link rel="help" href="https://issues.chromium.org/issues/409806799">
+<link rel="match" href="align-self-static-position-008-ref.html">
+<style>
+.block {
+  display: block;
+  width: 75%;
+  height: 75%;
+  border: 5px dotted blue;
+}
+
+.container {
+  border: 1px solid;
+  position: relative;
+  display: inline-block;
+  width: 100px;
+  height: 100px;
+  margin-left: 50px;
+  margin-bottom: 50px;
+}
+
+.abs {
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  background: purple;
+}
+</style>
+<!-- justify-self -->
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: auto;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: normal;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: right;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: left;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: flex-start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: flex-end;"></div>
+</div></div>
+<br>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: anchor-center;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: baseline;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: first baseline;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: last baseline;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: legacy;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="justify-self: stretch;"></div>
+</div></div>
+<br>
+<!-- align-self -->
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: auto;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: normal;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: right;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: left;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: flex-start;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: flex-end;"></div>
+</div></div>
+<br>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: anchor-center;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: baseline;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: first baseline;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: last baseline;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: legacy;"></div>
+</div></div>
+<div class="container"><div class="block">
+  <div class="abs" style="align-self: stretch;"></div>
+</div></div>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-stretch-auto-margins-aspect-ratio.html b/tests/wpt/tests/css/css-align/abspos/align-self-stretch-auto-margins-aspect-ratio.html
new file mode 100644
index 00000000000..4eaa9d2f3a6
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-stretch-auto-margins-aspect-ratio.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11195#issuecomment-2824879710">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<style>
+.container {
+  position: relative;
+  width: 200px;
+  height: 200px;
+  top: -50px;
+  left: -50px;
+}
+.abspos {
+  position: absolute;
+  inset: 10px auto 10px 50px;
+  margin: auto 0 auto 0;
+  align-self: stretch;
+  background: green;
+}
+.abspos::before {
+  content: '';
+  min-width: 100px;
+  height: 100%;
+  aspect-ratio: 1;
+  display: block;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="container">
+  <div class="abspos"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/abspos/align-self-stretch-auto-margins.html b/tests/wpt/tests/css/css-align/abspos/align-self-stretch-auto-margins.html
new file mode 100644
index 00000000000..9d1b6454c84
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/align-self-stretch-auto-margins.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11195#issuecomment-2824879710">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<style>
+.container {
+  position: relative;
+  width: 200px;
+  height: 200px;
+  top: -50px;
+  left: -50px;
+}
+.abspos {
+  position: absolute;
+  inset: 10px 50px 10px 50px;
+  margin: auto 0 auto 0;
+  align-self: stretch;
+  background: green;
+}
+.abspos::before {
+  content: '';
+  width: 100px;
+  height: 100px;
+  display: block;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="container">
+  <div class="abspos"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/abspos/justify-self-stretch-auto-margins-aspect-ratio.html b/tests/wpt/tests/css/css-align/abspos/justify-self-stretch-auto-margins-aspect-ratio.html
new file mode 100644
index 00000000000..c50b32f089b
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/justify-self-stretch-auto-margins-aspect-ratio.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11195#issuecomment-2824879710">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<style>
+.container {
+  position: relative;
+  width: 200px;
+  height: 200px;
+  top: -50px;
+  left: -50px;
+}
+.abspos {
+  position: absolute;
+  inset: 50px 10px auto 10px;
+  margin: 0 auto 0 auto;
+  justify-self: stretch;
+  background: green;
+}
+.abspos::before {
+  content: '';
+  width: 100%;
+  min-height: 100px;
+  aspect-ratio: 1;
+  display: block;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="container">
+  <div class="abspos"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/abspos/justify-self-stretch-auto-margins.html b/tests/wpt/tests/css/css-align/abspos/justify-self-stretch-auto-margins.html
new file mode 100644
index 00000000000..7d7b4bfc857
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/abspos/justify-self-stretch-auto-margins.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11195#issuecomment-2824879710">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<style>
+.container {
+  position: relative;
+  width: 200px;
+  height: 200px;
+  top: -50px;
+  left: -50px;
+}
+.abspos {
+  position: absolute;
+  inset: 50px 10px 50px 10px;
+  margin: 0 auto 0 auto;
+  justify-self: stretch;
+  background: green;
+}
+.abspos::before {
+  content: '';
+  width: 100px;
+  height: 100px;
+  display: block;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="container">
+  <div class="abspos"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/blocks/WEB_FEATURES.yml b/tests/wpt/tests/css/css-align/blocks/WEB_FEATURES.yml
new file mode 100644
index 00000000000..c5493f75956
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: align-content-block
+  files:
+  - align-content-block-*
diff --git a/tests/wpt/tests/css/css-align/blocks/justify-items-anonymous.tentative.html b/tests/wpt/tests/css/css-align/blocks/justify-items-anonymous.tentative.html
new file mode 100644
index 00000000000..641dea1f54b
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/justify-items-anonymous.tentative.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11461">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: 100px; background: red;">
+  <div style="width: 200px; justify-items: right;">
+    <span style="display: inline-block; width: 100px; height: 100px; background: green;"></span>
+    <div></div> <!-- Forces an anonymous block around <span> in most browsers. -->
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-center-htb-htb.html b/tests/wpt/tests/css/css-anchor-position/anchor-center-htb-htb.html
index 50fc0906107..88e01619caf 100644
--- a/tests/wpt/tests/css/css-anchor-position/anchor-center-htb-htb.html
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-center-htb-htb.html
@@ -59,7 +59,7 @@
 
 <div class="container">
   <div class="anchor"></div>
-  <div class="target" style="right: 20px;" data-expected-width="80" data-offset-x="20"></div>
+  <div class="target" style="right: 20px;" data-expected-width="80" data-offset-x="0"></div>
 </div>
 
 <div class="container">
@@ -80,7 +80,7 @@
 <!-- both insets -->
 <div class="container">
   <div class="anchor"></div>
-  <div class="target" style="left: 10px; right: 20px;" data-expected-width="70" data-offset-x="30"></div>
+  <div class="target" style="left: 10px; right: 20px;" data-expected-width="70" data-offset-x="10"></div>
 </div>
 
 <div class="container">
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-center-htb-vrl.html b/tests/wpt/tests/css/css-anchor-position/anchor-center-htb-vrl.html
index eba72d64913..f777a2caf88 100644
--- a/tests/wpt/tests/css/css-anchor-position/anchor-center-htb-vrl.html
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-center-htb-vrl.html
@@ -60,7 +60,7 @@
 
 <div class="container">
   <div class="anchor"></div>
-  <div class="target" style="bottom: 20px;" data-expected-height="80" data-offset-y="20"></div>
+  <div class="target" style="bottom: 20px;" data-expected-height="80" data-offset-y="0"></div>
 </div>
 
 <div class="container">
@@ -81,7 +81,7 @@
 <!-- both insets -->
 <div class="container">
   <div class="anchor"></div>
-  <div class="target" style="top: 10px; bottom: 20px;" data-expected-height="70" data-offset-y="30"></div>
+  <div class="target" style="top: 10px; bottom: 20px;" data-expected-height="70" data-offset-y="10"></div>
 </div>
 
 <div class="container">
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-center-visibility-change-ref.html b/tests/wpt/tests/css/css-anchor-position/anchor-center-visibility-change-ref.html
new file mode 100644
index 00000000000..66bf9083c3a
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-center-visibility-change-ref.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<style>
+.container {
+  width: 100px;
+  height: 100px;
+  border: solid 3px;
+  position: relative;
+  margin: 50px;
+}
+
+.anchor {
+  position: relative;
+  width: 50px;
+  height: 50px;
+  left: 40px;
+  top: 5px;
+  background: lime;
+}
+
+.target {
+  position: fixed;
+  background: cyan;
+  left: 111px;
+}
+</style>
+
+<div class="container">
+  <div class="anchor"></div>
+  <div class="target">
+    <div style="width:30px;height:20px;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-center-visibility-change.html b/tests/wpt/tests/css/css-anchor-position/anchor-center-visibility-change.html
new file mode 100644
index 00000000000..0f7d805844f
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-center-visibility-change.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>Tests 'anchor-center' value when target visibility changes</title>
+<link rel="help" href="https://drafts.csswg.org/css-anchor-position-1/#valdef-justify-self-anchor-center">
+<link rel="author" href="mailto:plampe@igalia.com">
+<link rel="match" href="anchor-center-visibility-change-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/rendering-utils.js"></script>
+<style>
+.container {
+  width: 100px;
+  height: 100px;
+  border: solid 3px;
+  position: relative;
+  margin: 50px;
+}
+
+.anchor {
+  anchor-name: --anchor;
+  position: relative;
+  width: 50px;
+  height: 50px;
+  left: 40px;
+  top: 5px;
+  background: lime;
+}
+
+.target {
+  position-anchor: --anchor;
+  position: fixed;
+  background: cyan;
+  justify-self: anchor-center;
+  display: none;
+}
+</style>
+
+<div class="container">
+  <div class="anchor"></div>
+  <div id="target" class="target">
+    <div style="width:30px;height:20px;"></div>
+  </div>
+</div>
+
+<script>
+  // #target should be invisible initially.
+  waitForAtLeastOneFrame().then(() => {
+    // Change #target to be visible.
+    document.getElementById('target').style.display = 'flow';
+    waitForAtLeastOneFrame().then(() => {
+      // #target should be visible and anchor-centered now.
+      takeScreenshot();
+    });
+  });
+</script>
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-center-vrl-htb.html b/tests/wpt/tests/css/css-anchor-position/anchor-center-vrl-htb.html
index 8f7af0414ed..595f7ea1ecd 100644
--- a/tests/wpt/tests/css/css-anchor-position/anchor-center-vrl-htb.html
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-center-vrl-htb.html
@@ -61,7 +61,7 @@
 
 <div class="container">
   <div class="anchor"></div>
-  <div class="target" style="right: 20px;" data-expected-width="80" data-offset-x="20"></div>
+  <div class="target" style="right: 20px;" data-expected-width="80" data-offset-x="0"></div>
 </div>
 
 <div class="container">
@@ -82,7 +82,7 @@
 <!-- both insets -->
 <div class="container">
   <div class="anchor"></div>
-  <div class="target" style="left: 10px; right: 20px;" data-expected-width="70" data-offset-x="30"></div>
+  <div class="target" style="left: 10px; right: 20px;" data-expected-width="70" data-offset-x="10"></div>
 </div>
 
 <div class="container">
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-center-vrl-vrl.html b/tests/wpt/tests/css/css-anchor-position/anchor-center-vrl-vrl.html
index d8e90057dc3..e22391a8192 100644
--- a/tests/wpt/tests/css/css-anchor-position/anchor-center-vrl-vrl.html
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-center-vrl-vrl.html
@@ -60,7 +60,7 @@
 
 <div class="container">
   <div class="anchor"></div>
-  <div class="target" style="bottom: 20px;" data-expected-height="80" data-offset-y="20"></div>
+  <div class="target" style="bottom: 20px;" data-expected-height="80" data-offset-y="0"></div>
 </div>
 
 <div class="container">
@@ -81,7 +81,7 @@
 <!-- both insets -->
 <div class="container">
   <div class="anchor"></div>
-  <div class="target" style="top: 10px; bottom: 20px;" data-expected-height="70" data-offset-y="30"></div>
+  <div class="target" style="top: 10px; bottom: 20px;" data-expected-height="70" data-offset-y="10"></div>
 </div>
 
 <div class="container">
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-css-zoom.html b/tests/wpt/tests/css/css-anchor-position/anchor-css-zoom.html
new file mode 100644
index 00000000000..2fab3f2e562
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-css-zoom.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+
+<title>CSS Anchor Positioning: tests that anchor() works with CSS zoom property</title>
+<link rel="help" href="https://drafts.csswg.org/css-anchor-position-1/#anchor-pos">
+<link rel="help" href="https://drafts.csswg.org/css-viewport/#zoom-property">
+<link rel="author" href="mailto:kiet.ho@apple.com">
+<link rel="match" href="reference/anchor-css-zoom-ref.html">
+
+<style>
+    .containing-block {
+        position: relative;
+        width: 150px;
+        height: 150px;
+
+        zoom: 2;
+    }
+
+    .cell {
+        width: 50px;
+        height: 50px;
+    }
+
+    #anchor-cell {
+        position: absolute;
+        top: 50px;
+        left: 50px;
+
+        anchor-name: --anchor;
+
+        background: green;
+    }
+
+    .anchor-positioned-cell {
+        position: absolute;
+        position-anchor: --anchor;
+    }
+
+    #top-left {
+        top: 0;
+        right: anchor(left);
+
+        background: cyan;
+    }
+
+    #top-right {
+        top: 0;
+        left: anchor(right);
+
+        background: magenta;
+    }
+
+    #bottom-left {
+        bottom: 0;
+        right: anchor(left);
+
+        background: yellow;
+    }
+
+    #bottom-right {
+        bottom: 0;
+        left: anchor(right);
+
+        background: black;
+    }
+</style>
+
+<body>
+    <!--
+        The boxes below are arranged like this:
+        (the outside box is .containing-block)
+
+        -------------
+        | 1 |   | 2 |
+        |---|---|---|
+        |   | A |   |
+        |---|---|---|
+        | 3 |   | 4 |
+        -------------
+    -->
+
+    <div class="containing-block">
+        <!-- Box A -->
+        <div class="cell" id="anchor-cell"></div>
+
+        <!-- Box 1 -->
+        <div class="cell anchor-positioned-cell" id="top-left"></div>
+
+        <!-- Box 2 -->
+        <div class="cell anchor-positioned-cell" id="top-right"></div>
+
+        <!-- Box 3 -->
+        <div class="cell anchor-positioned-cell" id="bottom-left"></div>
+
+        <!-- Box 4 -->
+        <div class="cell anchor-positioned-cell" id="bottom-right"></div>
+    </div>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-display-none-crash.html b/tests/wpt/tests/css/css-anchor-position/anchor-display-none-crash.html
new file mode 100644
index 00000000000..bf513e39147
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-display-none-crash.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://issues.chromium.org/issues/406054648">
+<html class="reftest-wait">
+  <style>
+    @position-try --pf {
+      position-anchor: --b;
+    }
+  </style>
+  <div id="elm" style="anchor-name:--a;"></div>
+  <div style="anchor-name:--b; width:40%;"></div>
+  <div style="position:absolute; left:anchor(right); width:40%; position-anchor:--a; position-try-fallbacks:--pf;"></div>
+  <script>
+    requestAnimationFrame(()=> {
+      requestAnimationFrame(()=> {
+        elm.style.display = "none";
+        document.documentElement.classList.remove("reftest-wait");
+      });
+    });
+  </script>
+</html>
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-invalid-fallback.html b/tests/wpt/tests/css/css-anchor-position/anchor-invalid-fallback.html
index 254ba185c62..b1a4770de53 100644
--- a/tests/wpt/tests/css/css-anchor-position/anchor-invalid-fallback.html
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-invalid-fallback.html
@@ -93,6 +93,46 @@ test((t) => {
   assert_equals(cs.height, '43px');
 }, 'Element can use <length> fallback if present');
 
+test((t) => {
+  let target = createTarget(t, main);
+  target.style = `
+    /* No position-anchor here */
+    left:anchor(right, 8.5%);
+    top:calc(8.5% + anchor(top, 1px));
+    width:anchor-size(width, 21%);
+    height:calc(21% + anchor-size(height, 1px));
+  `;
+  let cs = getComputedStyle(target);
+  assert_equals(cs.left, '17px');
+  assert_equals(cs.top, '18px');
+  assert_equals(cs.width, '42px');
+  assert_equals(cs.height, '43px');
+}, 'Element can use <length> fallback with percentage');
+
+test((t) => {
+  let target = createTarget(t, main);
+  target.style = `
+    /* No position-anchor here */
+    max-width:anchor-size(width, 28%);
+    max-height:calc(28% + anchor-size(height, 1px));
+  `;
+  let cs = getComputedStyle(target);
+  assert_equals(cs.maxWidth, '28%');
+  assert_equals(cs.maxHeight, 'calc(28% + 1px)');
+}, 'Element can use <length> fallback for max size with percentage');
+
+test((t) => {
+  let target = createTarget(t, main);
+  target.style = `
+    /* No position-anchor here */
+    margin-left:anchor-size(width, 6%);
+    margin-top:calc(6% + anchor-size(height, 1px));
+  `;
+  let cs = getComputedStyle(target);
+  assert_equals(cs.marginLeft, '12px');
+  assert_equals(cs.marginTop, '13px');
+}, 'Element can use <length> fallback for margin with percentage');
+
 // Now test that any invalid anchor*() behaves as invalid at computed-value
 // time if there's no fallback specified.
 
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-position-005-print-ref.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-005-print-ref.html
index 94a1f8e55d3..2c8824bbc35 100644
--- a/tests/wpt/tests/css/css-anchor-position/anchor-position-005-print-ref.html
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-position-005-print-ref.html
@@ -1,5 +1,10 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <p>There should be a green square below, and no red.</p>
 <div style="width:100px; height:100px; background:green;"></div>
 
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-position-005-print.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-005-print.html
index eeae841405a..98c663e3918 100644
--- a/tests/wpt/tests/css/css-anchor-position/anchor-position-005-print.html
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-position-005-print.html
@@ -3,6 +3,11 @@
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-anchor-1/#anchor-pos">
 <link rel="match" href="anchor-position-005-print-ref.html">
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <p>There should be a green square below, and no red.</p>
 <div style="width:100px; height:100px; background:red;">
   <div style="anchor-name:--first; width:50px; height:100px; background:green;"></div>
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-position-flip-sibling-index.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-flip-sibling-index.html
new file mode 100644
index 00000000000..5fa17dc057a
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-position-flip-sibling-index.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<title>CSS Anchor Positioning Test: flip anchor function with sibling-index()</title>
+<link rel="help" href="https://drafts.csswg.org/css-anchor-position-1/#typedef-position-try-fallbacks-try-tactic">
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#funcdef-sibling-index">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  body { margin: 0; }
+  #anchor {
+    anchor-name: --a;
+    width: 100px;
+    height: 100px;
+  }
+  #abs {
+    position-anchor: --a;
+    position-try-fallbacks: flip-block;
+    position: absolute;
+    bottom: anchor(calc(20% * sibling-index()));
+    width: 100px;
+    height: 100px;
+    background: teal;
+  }
+</style>
+<div>
+  <div id="anchor"></div>
+  <div id="abs"></div>
+</div>
+<script>
+  test(() => {
+    assert_equals(getComputedStyle(abs).top, "60px", "100% - (20% multiplied by 2 (sibling-index())) of 100px")
+  }, "Percentage based top anchor() position with sibling-index() flipped to bottom");
+</script>
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-position-grid-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-grid-001.html
index 92fb4d275b8..7bd389b39d8 100644
--- a/tests/wpt/tests/css/css-anchor-position/anchor-position-grid-001.html
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-position-grid-001.html
@@ -75,8 +75,8 @@
 
         <div class="target target1-l" data-offset-x=100 data-expected-height=100></div>
         <div class="target target1-r" data-offset-x=404 data-expected-height=100></div>
-        <div class="target target1-t" data-offset-y=0 data-expected-width=310></div>
-        <div class="target target1-b" data-offset-y=95 data-expected-width=310></div>
+        <div class="target target1-t" data-offset-y=-10 data-expected-width=310></div>
+        <div class="target target1-b" data-offset-y=85 data-expected-width=310></div>
       </div>
     </div>
   </div>
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-002.html
index 7b2691a2b90..1e1f0a5c95b 100644
--- a/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-002.html
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-002.html
@@ -71,15 +71,15 @@
 
         <!-- The containing block of querying elements is block-fragmented. -->
         <div class="target target1"
-             data-offset-x=18 data-offset-y=65
+             data-offset-x=128 data-offset-y=-35
              data-expected-width=160 data-expected-height=100></div>
         <div class="target target1-rb"
-             data-offset-x=168 data-offset-y=155></div>
+             data-offset-x=278 data-offset-y=55></div>
         <div class="target fixed target1"
-             data-offset-x=26 data-offset-y=70
+             data-offset-x=136 data-offset-y=-30
              data-expected-width=160 data-expected-height=100></div>
         <div class="target fixed target1-rb"
-             data-offset-x=176 data-offset-y=160></div>
+             data-offset-x=286 data-offset-y=60></div>
       </div>
 
       <!-- The containing block of querying elements is a multi-column.  -->
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-004.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-004.html
index 399494120ea..8f7a3dad129 100644
--- a/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-004.html
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-004.html
@@ -69,16 +69,16 @@
         <div class="anchor1" style="width: 20px"></div>
 
         <div class="target target1"
-             data-offset-x=18 data-offset-y=65
+             data-offset-x=128 data-offset-y=-35
              data-expected-width=130 data-expected-height=100></div>
         <div class="target target1-rb"
-              data-offset-x=138 data-offset-y=155></div>
+              data-offset-x=248 data-offset-y=55></div>
       </div>
 
       <div class="target target1"
-            data-offset-x=34 data-offset-y=225
+            data-offset-x=364 data-offset-y=-75
             data-expected-width=130 data-expected-height=100></div>
       <div class="target target1-rb"
-            data-offset-x=154 data-offset-y=315></div>
+            data-offset-x=484 data-offset-y=15></div>
     </div>
 </body>
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-nested-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-nested-001.html
index 35ab2cfc15c..c5ce41299af 100644
--- a/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-nested-001.html
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-nested-001.html
@@ -68,8 +68,8 @@
                  data-expected-width=180 data-expected-height=100></div>
           </div>
         </div>
-        <div class="target"
-             data-offset-x=13 data-offset-y=97
+        <div class="target" style="background:hotpink;"
+             data-offset-x=173 data-offset-y=-3
              data-expected-width=180 data-expected-height=100></div>
       </div>
     </div>
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-position-sibling-index.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-sibling-index.html
new file mode 100644
index 00000000000..ade6b4a0e01
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-position-sibling-index.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<title>CSS Anchor Positioning Test: anchor function with sibling-index()</title>
+<link rel="help" href="https://drafts.csswg.org/css-anchor-position-1/#anchor-pos">
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#funcdef-sibling-index">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  body { margin: 0; }
+  #anchor {
+    anchor-name: --a;
+    width: 100px;
+    height: 100px;
+  }
+  #abs {
+    position-anchor: --a;
+    position: absolute;
+    top: anchor(calc(25% * sibling-index()));
+    width: 100px;
+    height: 100px;
+    background: teal;
+  }
+</style>
+<div>
+  <div id="anchor"></div>
+  <div id="abs"></div>
+</div>
+<script>
+  test(() => {
+    assert_equals(getComputedStyle(abs).top, "50px", "25% multiplied by 2 (sibling-index()) of 100px")
+  }, "Percentage based anchor() position with sibling-index()");
+</script>
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-size-css-zoom.html b/tests/wpt/tests/css/css-anchor-position/anchor-size-css-zoom.html
new file mode 100644
index 00000000000..7bd9b799dfe
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-size-css-zoom.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+
+<title>CSS Anchor Positioning: tests that anchor-size() works with CSS zoom property</title>
+<link rel="help" href="https://drafts.csswg.org/css-anchor-position-1/#anchor-size-fn">
+<link rel="help" href="https://drafts.csswg.org/css-viewport/#zoom-property">
+<link rel="author" href="mailto:kiet.ho@apple.com">
+<link rel="match" href="reference/anchor-size-css-zoom-ref.html">
+
+<style>
+    #containing-block {
+        position: relative;
+
+        zoom: 2;
+    }
+
+    #anchor {
+        position: absolute;
+
+        width: 200px;
+        height: 100px;
+
+        anchor-name: --anchor;
+
+        background: red;
+    }
+
+    #anchor-positioned {
+        position: absolute;
+
+        width: anchor-size(--anchor width);
+        height: anchor-size(--anchor height);
+
+        background: green;
+
+        z-index: 1;
+    }
+</style>
+
+Test passes if no red is visible.
+
+<div id="containing-block">
+    <!--
+        Both rectangles below overlaps.
+        #anchor is red, #anchor-positioned is green and above #anchor in Z order.
+        If no red is visible then #anchor-positioned has fully covered #anchor.
+    -->
+    <div id="anchor"></div>
+    <div id="anchor-positioned"></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-size-parse-valid.html b/tests/wpt/tests/css/css-anchor-position/anchor-size-parse-valid.html
index 8e69476512b..312d3c71801 100644
--- a/tests/wpt/tests/css/css-anchor-position/anchor-size-parse-valid.html
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-size-parse-valid.html
@@ -102,7 +102,7 @@ test_valid_value('width', 'anchor-size(10px)');
 for (const prop of ['width', 'max-width', 'margin-left']) {
   test_valid_value(prop, 'calc((anchor-size(--foo width) + anchor-size(--bar height)) / 2)', 'calc(0.5 * (anchor-size(--foo width) + anchor-size(--bar height)))');
   test_valid_value(prop, 'calc(0.5 * (anchor-size(--foo width) + anchor-size(--bar height)))');
-  test_valid_value(prop, 'anchor-size(--foo width, calc(anchor-size(--bar height) * 0.5))');
+  test_valid_value(prop, 'anchor-size(--foo width, calc(0.5 * anchor-size(--bar height)))');
   test_valid_value(prop, 'min(100px, 10%, anchor-size(--foo width), anchor-size(--bar height))');
 }
 </script>
diff --git a/tests/wpt/tests/css/css-anchor-position/position-area-align-justify-wm-dir.html b/tests/wpt/tests/css/css-anchor-position/position-area-align-justify-wm-dir.html
index 25b53d44f78..82a11a8868a 100644
--- a/tests/wpt/tests/css/css-anchor-position/position-area-align-justify-wm-dir.html
+++ b/tests/wpt/tests/css/css-anchor-position/position-area-align-justify-wm-dir.html
@@ -22,7 +22,7 @@
     position: absolute;
     width: 10px;
     height: 10px;
-    inset: 10px;
+    inset: 10px 15px 20px 25px;
     position-anchor: --anchor;
   }
 </style>
@@ -41,10 +41,10 @@
     }, "Offsets for: " + position_area + " with writing-mode / direction: " + writing_direction);
   }
 
-  const top_left = {left:80, top:80, width:10, height:10};
-  const top_right = {left:210, top:80, width:10, height:10};
-  const bottom_left = {left:80, top:210, width:10, height:10};
-  const bottom_right = {left:210, top:210, width:10, height:10};
+  const top_left = {left:75, top:70, width:10, height:10};
+  const top_right = {left:225, top:70, width:10, height:10};
+  const bottom_left = {left:75, top:210, width:10, height:10};
+  const bottom_right = {left:225, top:210, width:10, height:10};
 
   anchored.style.writingMode = "horizontal-tb";
   anchored.style.direction = "ltr";
diff --git a/tests/wpt/tests/css/css-anchor-position/position-area-align-justify.html b/tests/wpt/tests/css/css-anchor-position/position-area-align-justify.html
index e0bce2c8268..483a9d6ec0a 100644
--- a/tests/wpt/tests/css/css-anchor-position/position-area-align-justify.html
+++ b/tests/wpt/tests/css/css-anchor-position/position-area-align-justify.html
@@ -22,7 +22,7 @@
     position: absolute;
     width: 10px;
     height: 10px;
-    inset: 10px;
+    inset: 10px 15px 20px 25px;
     position-anchor: --anchor;
   }
 </style>
@@ -46,20 +46,20 @@
   test_position_area("span-all", {left:145, top:145, width:10, height:10});
 
   // Single region spans
-  test_position_area("top left", {left:80, top:80, width:10, height:10});
-  test_position_area("top center", {left:145, top:80, width:10, height:10});
-  test_position_area("top right", {left:210, top:80, width:10, height:10});
-  test_position_area("center left", {left:80, top:145, width:10, height:10});
-  test_position_area("center center", {left:145, top:145, width:10, height:10});
-  test_position_area("center right", {left:210, top:145, width:10, height:10});
-  test_position_area("bottom left", {left:80, top:210, width:10, height:10});
-  test_position_area("bottom center", {left:145, top:210, width:10, height:10});
-  test_position_area("bottom right", {left:210, top:210, width:10, height:10});
+  test_position_area("top left", {left:75, top:70, width:10, height:10});
+  test_position_area("top center", {left:150, top:70, width:10, height:10});
+  test_position_area("top right", {left:225, top:70, width:10, height:10});
+  test_position_area("center left", {left:75, top:140, width:10, height:10});
+  test_position_area("center center", {left:150, top:140, width:10, height:10});
+  test_position_area("center right", {left:225, top:140, width:10, height:10});
+  test_position_area("bottom left", {left:75, top:210, width:10, height:10});
+  test_position_area("bottom center", {left:150, top:210, width:10, height:10});
+  test_position_area("bottom right", {left:225, top:210, width:10, height:10});
 
   // Multi-region spans
-  test_position_area("top span-left", {left:180, top:80, width:10, height:10});
-  test_position_area("top span-right", {left:110, top:80, width:10, height:10});
-  test_position_area("span-top left", {left:80, top:180, width:10, height:10});
-  test_position_area("span-bottom left", {left:80, top:110, width:10, height:10});
+  test_position_area("top span-left", {left:175, top:70, width:10, height:10});
+  test_position_area("top span-right", {left:125, top:70, width:10, height:10});
+  test_position_area("span-top left", {left:75, top:170, width:10, height:10});
+  test_position_area("span-bottom left", {left:75, top:110, width:10, height:10});
 
 </script>
diff --git a/tests/wpt/tests/css/css-anchor-position/position-area-anchor-outside.html b/tests/wpt/tests/css/css-anchor-position/position-area-anchor-outside.html
index d8fb5dbc98f..9b0c74170aa 100644
--- a/tests/wpt/tests/css/css-anchor-position/position-area-anchor-outside.html
+++ b/tests/wpt/tests/css/css-anchor-position/position-area-anchor-outside.html
@@ -8,6 +8,9 @@
     position: relative;
     width: 400px;
     height: 400px;
+    margin: 0 auto;
+    border: 2px solid;
+    background: #eee;
   }
   #anchor {
     position: absolute;
@@ -16,12 +19,15 @@
     width: 100px;
     height: 100px;
     anchor-name: --anchor;
+    background: blue;
   }
   #anchored {
     position: absolute;
     align-self: stretch;
     justify-self: stretch;
     position-anchor: --anchor;
+    background: #FA08;
+    outline: 1px solid orange;
   }
 </style>
 <div id="container">
@@ -40,17 +46,17 @@
     }, "Offsets for position-area: " + position_area);
   }
 
-  test_position_area("span-all", {left:0, top:0, width:400, height:400});
+  test_position_area("span-all", {left:-200, top:0, width:600, height:600});
 
-  test_position_area("left span-all", {left:-200, top:0, width:0, height:400});
-  test_position_area("span-left span-all", {left:-100, top:0, width:0, height:400});
-  test_position_area("span-all center", {left:-200, top:0, width:100, height:400});
-  test_position_area("span-right span-all", {left:-200, top:0, width:600, height:400});
-  test_position_area("right span-all", {left:-100, top:0, width:500, height:400});
+  test_position_area("left span-all", {left:-200, top:0, width:0, height:600});
+  test_position_area("span-left span-all", {left:-200, top:0, width:100, height:600});
+  test_position_area("span-all center", {left:-200, top:0, width:100, height:600});
+  test_position_area("span-right span-all", {left:-200, top:0, width:600, height:600});
+  test_position_area("right span-all", {left:-100, top:0, width:500, height:600});
 
-  test_position_area("top span-all", {left:0, top:0, width:400, height:500});
-  test_position_area("span-top span-all", {left:0, top:0, width:400, height:600});
-  test_position_area("center span-all", {left:0, top:500, width:400, height:100});
-  test_position_area("span-bottom span-all", {left:0, top:500, width:400, height:0});
-  test_position_area("bottom span-all", {left:0, top:600, width:400, height:0});
+  test_position_area("top span-all", {left:-200, top:0, width:600, height:500});
+  test_position_area("span-top span-all", {left:-200, top:0, width:600, height:600});
+  test_position_area("center span-all", {left:-200, top:500, width:600, height:100});
+  test_position_area("span-bottom span-all", {left:-200, top:500, width:600, height:100});
+  test_position_area("bottom span-all", {left:-200, top:600, width:600, height:0});
 </script>
diff --git a/tests/wpt/tests/css/css-anchor-position/position-area-anchor-partially-outside.html b/tests/wpt/tests/css/css-anchor-position/position-area-anchor-partially-outside.html
index e23cea47478..3dd537d26e0 100644
--- a/tests/wpt/tests/css/css-anchor-position/position-area-anchor-partially-outside.html
+++ b/tests/wpt/tests/css/css-anchor-position/position-area-anchor-partially-outside.html
@@ -8,6 +8,9 @@
     position: relative;
     width: 400px;
     height: 400px;
+    margin: 100px auto;
+    border: 2px solid;
+    background: #eee;
   }
   #anchor {
     position: absolute;
@@ -16,12 +19,15 @@
     width: 100px;
     height: 100px;
     anchor-name: --anchor;
+    background: blue;
   }
   #anchored {
     position: absolute;
     align-self: stretch;
     justify-self: stretch;
     position-anchor: --anchor;
+    background: #FA08;
+    outline: 1px solid orange;
   }
 </style>
 <div id="container">
@@ -40,17 +46,17 @@
     }, "Offsets for position-area: " + position_area);
   }
 
-  test_position_area("span-all", {left:0, top:0, width:400, height:400});
+  test_position_area("span-all", {left:0, top:-50, width:450, height:450});
 
-  test_position_area("left span-all", {left:0, top:0, width:350, height:400});
-  test_position_area("span-left span-all", {left:0, top:0, width:450, height:400});
-  test_position_area("span-all center", {left:350, top:0, width:100, height:400});
-  test_position_area("span-right span-all", {left:350, top:0, width:50, height:400});
-  test_position_area("right span-all", {left:450, top:0, width:0, height:400});
+  test_position_area("left span-all", {left:0, top:-50, width:350, height:450});
+  test_position_area("span-left span-all", {left:0, top:-50, width:450, height:450});
+  test_position_area("span-all center", {left:350, top:-50, width:100, height:450});
+  test_position_area("span-right span-all", {left:350, top:-50, width:100, height:450});
+  test_position_area("right span-all", {left:450, top:-50, width:0, height:450});
 
-  test_position_area("top span-all", {left:0, top:-50, width:400, height:0});
-  test_position_area("span-top span-all", {left:0, top:0, width:400, height:50});
-  test_position_area("center span-all", {left:0, top:-50, width:400, height:100});
-  test_position_area("span-bottom span-all", {left:0, top:-50, width:400, height:450});
-  test_position_area("bottom span-all", {left:0, top:50, width:400, height:350});
+  test_position_area("top span-all", {left:0, top:-50, width:450, height:0});
+  test_position_area("span-top span-all", {left:0, top:-50, width:450, height:100});
+  test_position_area("center span-all", {left:0, top:-50, width:450, height:100});
+  test_position_area("span-bottom span-all", {left:0, top:-50, width:450, height:450});
+  test_position_area("bottom span-all", {left:0, top:50, width:450, height:350});
 </script>
diff --git a/tests/wpt/tests/css/css-anchor-position/position-area-basic.html b/tests/wpt/tests/css/css-anchor-position/position-area-basic.html
index 6cbaf8e5014..2a568cc8028 100644
--- a/tests/wpt/tests/css/css-anchor-position/position-area-basic.html
+++ b/tests/wpt/tests/css/css-anchor-position/position-area-basic.html
@@ -26,12 +26,17 @@
     position: absolute;
     width: 400px;
     height: 400px;
+    margin: 0 auto;
+    border: 2px solid;
+    background: #eee;
   }
   #anchored {
     position: absolute;
     align-self: stretch;
     justify-self: stretch;
     position-anchor: --anchor;
+    background: #FA08;
+    outline: 1px solid orange;
   }
   #anchor {
     margin-top: 150px;
@@ -39,6 +44,7 @@
     width: 150px;
     height: 75px;
     anchor-name: --anchor;
+    background: blue;
   }
 </style>
 <div id="container">
diff --git a/tests/wpt/tests/css/css-anchor-position/position-area-in-grid.html b/tests/wpt/tests/css/css-anchor-position/position-area-in-grid.html
index 85dd4f48306..3407fcbc351 100644
--- a/tests/wpt/tests/css/css-anchor-position/position-area-in-grid.html
+++ b/tests/wpt/tests/css/css-anchor-position/position-area-in-grid.html
@@ -56,6 +56,7 @@
     position: relative;
     width: 400px;
     height: 400px;
+    outline: 1px solid;
   }
 
   #anchor {
@@ -65,6 +66,7 @@
     width: 150px;
     height: 75px;
     anchor-name: --anchor;
+    background: blue;
   }
 
   #anchored {
@@ -76,6 +78,7 @@
     align-self: stretch;
     justify-self: stretch;
     position-anchor: --anchor;
+    border: solid orange;
   }
 </style>
 
@@ -99,8 +102,8 @@
   }
 
   test_position_area("span-bottom span-left", {left:"auto", right:"auto", top:"auto", bottom:"auto"},
-                  {left:200, top:150, width:50, height:150});
+                  {left:100, top:150, width:150, height:150});
 
   test_position_area("span-bottom span-left", {left:"10px", right:"10px", top:"10px", bottom:"10px"},
-                  {left:210, top:160, width:30, height:130});
+                  {left:110, top:160, width:130, height:130});
 </script>
diff --git a/tests/wpt/tests/css/css-anchor-position/position-area-scrolling-006.html b/tests/wpt/tests/css/css-anchor-position/position-area-scrolling-006.html
index 0d49a030359..fb478385ef3 100644
--- a/tests/wpt/tests/css/css-anchor-position/position-area-scrolling-006.html
+++ b/tests/wpt/tests/css/css-anchor-position/position-area-scrolling-006.html
@@ -16,16 +16,11 @@
     height: 50%;
     background: cyan;
   }
-  #container.thicker > .pos {
-    border-width: thick;
-  }
 </style>
 <div id="scrollable" style="position:relative; overflow:scroll; scrollbar-width:none; width:500px; height:500px; background:yellow;">
-  <div style="width:2000px; height:2000px;">
-    <div id="container">
-      <div style="anchor-name:--anchor; margin:200px; width:50px; height:1000px; background:gray;"></div>
-      <div id="anchored" style="position-area:top left;"></div>
-    </div>
+  <div style="display: flow-root; width:2000px; height:2000px;">
+    <div style="anchor-name:--anchor; margin:200px; width:50px; height:1000px; background:gray;"></div>
+    <div id="anchored" style="position-area:top left;"></div>
   </div>
 </div>
 <script>
diff --git a/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-both-position-fixed-ref.html b/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-both-position-fixed-ref.html
index 7a9d69a9e3b..3af597aee65 100644
--- a/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-both-position-fixed-ref.html
+++ b/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-both-position-fixed-ref.html
@@ -1,5 +1,18 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
+<style>
+  #target {
+    width: 100px;
+    height: 100px;
+    background: green;
+    position: fixed;
+    top: 0;
+    left: 100px;
+  }
 
-<!-- This test passes if both the anchor and anchored elements are hidden. -->
-<div style="height: 200vh;"></div>
+  #spacer {
+    height: 200vh;
+  }
+</style>
+<div id="target">target</div>
+<div id="spacer"></div>
diff --git a/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-both-position-fixed.html b/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-both-position-fixed.html
new file mode 100644
index 00000000000..c5e8e839ded
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-both-position-fixed.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<meta name="assert" content="position-visibility: anchors-visible should work with a fixed-position anchored element." />
+<title>CSS Anchor Positioning Test: position-visibility: anchors-visible</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/7758">
+<link rel="match" href="position-visibility-anchors-visible-both-position-fixed-ref.html">
+<style>
+  #anchor {
+    anchor-name: --a1;
+    position: fixed;
+    top: -100px;
+    left: 0;
+    width: 100px;
+    height: 100px;
+    background: orange;
+  }
+
+  #target {
+    position-anchor: --a1;
+    position-visibility: anchors-visible;
+    position-area: bottom right;
+    width: 100px;
+    height: 100px;
+    background: green;
+    position: fixed;
+    top: 0;
+    left: 0;
+  }
+
+  #spacer {
+    height: 200vh;
+  }
+</style>
+
+<!-- Test passes if #target is visible because there are no intervening clips. -->
+<div id="anchor">anchor</div>
+<div id="target">target</div>
+<div id="spacer"></div>
diff --git a/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-both-position-fixed.tentative.html b/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-both-position-fixed.tentative.html
deleted file mode 100644
index c603288f0a7..00000000000
--- a/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-both-position-fixed.tentative.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<meta name="assert" content="position-visibility: anchors-visible should work with a fixed-position anchored element." />
-<title>CSS Anchor Positioning Test: position-visibility: anchors-visible</title>
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/7758">
-<link rel="match" href="position-visibility-anchors-visible-both-position-fixed-ref.html">
-<style>
-  #anchor {
-    anchor-name: --a1;
-    position: fixed;
-    top: -100px;
-    left: 0;
-    width: 100px;
-    height: 100px;
-    background: orange;
-  }
-
-  #target {
-    position-anchor: --a1;
-    position-visibility: anchors-visible;
-    position-area: bottom right;
-    width: 100px;
-    height: 100px;
-    background: red;
-    position: fixed;
-    top: 0;
-    left: 0;
-  }
-
-  #spacer {
-    height: 200vh;
-  }
-</style>
-
-<!-- Test passes if #target is not visible, due to #anchor being off-screen. -->
-<div id="anchor">anchor</div>
-<div id="target">target</div>
-<div id="spacer"></div>
diff --git a/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-position-fixed-ref.html b/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-position-fixed-ref.html
deleted file mode 100644
index e24992fd5ea..00000000000
--- a/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-position-fixed-ref.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-
-<!-- This test passes if both the anchor and anchored elements are hidden. -->
-<div style="height: 200vh;"></div>
-
-<script>
-  window.scrollTo(0, 100);
-</script>
diff --git a/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-position-fixed.html b/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-position-fixed.html
new file mode 100644
index 00000000000..5107823efd9
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-position-fixed.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<meta name="assert" content="Position-visibility: anchors-visible should hide an element with a fixed-position anchored element." />
+<title>CSS Anchor Positioning Test: position-visibility: anchors-visible</title>
+<link rel="help" href="https://drafts.csswg.org/css-anchor-position-1/#position-visibility">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/7758">
+<link rel="match" href="position-visibility-anchors-visible-ref.html">
+<style>
+  #scroll-container {
+    overflow: hidden scroll;
+    width: 300px;
+    height: 100px;
+  }
+
+  #anchor {
+    anchor-name: --a1;
+    width: 100px;
+    height: 100px;
+    background: orange;
+  }
+
+  #spacer {
+    height: 100px;
+  }
+
+  #target {
+    position-anchor: --a1;
+    position-visibility: anchors-visible;
+    position-area: bottom right;
+    width: 100px;
+    height: 100px;
+    background: red;
+    position: fixed;
+    top: 0;
+    left: 0;
+  }
+</style>
+
+<!-- Test passes if #target is not visible, due to #anchor being off-screen. -->
+<div id="scroll-container">
+  <div id="anchor">anchor</div>
+  <div id="spacer"></div>
+  <div id="target">target</div>
+</div>
+
+<script>
+  const scroller = document.getElementById('scroll-container');
+  scroller.scrollTop = 100;
+  // #target should not be visible because #anchor is scrolled out of view.
+</script>
diff --git a/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-position-fixed.tentative.html b/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-position-fixed.tentative.html
deleted file mode 100644
index 9c3495a635d..00000000000
--- a/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-position-fixed.tentative.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<meta name="assert" content="position-visibility: anchors-visible should work with a fixed-position anchored element." />
-<title>CSS Anchor Positioning Test: position-visibility: anchors-visible</title>
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/7758">
-<link rel="match" href="position-visibility-anchors-visible-position-fixed-ref.html">
-<style>
-  #anchor {
-    anchor-name: --a1;
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100px;
-    height: 100px;
-    background: orange;
-  }
-
-  #target {
-    position-anchor: --a1;
-    position-visibility: anchors-visible;
-    position-area: bottom right;
-    width: 100px;
-    height: 100px;
-    background: red;
-    position: fixed;
-    top: 0;
-    left: 0;
-  }
-
-  #spacer {
-    height: 200vh;
-  }
-</style>
-
-<!-- Test passes if #target is not visible, due to #anchor being off-screen. -->
-<div id="anchor">anchor</div>
-<div id="target">target</div>
-<div id="spacer"></div>
-
-<script>
-  window.scrollTo(0, 100);
-</script>
diff --git a/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-with-position-ref.html b/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-with-position-ref.html
new file mode 100644
index 00000000000..5a364aa7847
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-with-position-ref.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<style>
+  #scroll-container {
+    overflow: hidden scroll;
+    width: 300px;
+    height: 100px;
+  }
+
+  #spacer {
+    height: 100px;
+  }
+
+  #target {
+    position: relative;
+    width: 100px;
+    height: 100px;
+    left: 100px;
+    background: green;
+  }
+</style>
+
+<div id="scroll-container">
+  <div id="spacer"></div>
+  <div id="target">target</div>
+</div>
+
+<script>
+  const scroller = document.getElementById('scroll-container');
+  scroller.scrollTop = 100;
+</script>
diff --git a/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-with-position.html b/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-with-position.html
index 8ad3eb7e310..32eede4f088 100644
--- a/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-with-position.html
+++ b/tests/wpt/tests/css/css-anchor-position/position-visibility-anchors-visible-with-position.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<meta name="assert" content="Position-visibility: anchors-visible should hide an element with an out-of-view anchor and a relpos scroller." />
+<meta name="assert" content="Position-visibility: anchors-visible should not hide an element with an out-of-view anchor and a relpos scroller." />
 <title>CSS Anchor Positioning Test: position-visibility: anchors-visible</title>
 <link rel="help" href="https://drafts.csswg.org/css-anchor-position-1/#position-visibility">
-<link rel="match" href="position-visibility-anchors-visible-ref.html">
+<link rel="match" href="position-visibility-anchors-visible-with-position-ref.html">
 <style>
   #scroll-container {
     overflow: hidden scroll;
@@ -30,7 +30,7 @@
     position-area: bottom right;
     width: 100px;
     height: 100px;
-    background: red;
+    background: green;
     position: absolute;
     top: 0;
     left: 0;
@@ -46,5 +46,5 @@
 <script>
   const scroller = document.getElementById('scroll-container');
   scroller.scrollTop = 100;
-  // #target should not be visible because #anchor is scrolled out of view.
+  // #target should be visible because there are no intervening clips.
 </script>
diff --git a/tests/wpt/tests/css/css-anchor-position/reference/anchor-css-zoom-ref.html b/tests/wpt/tests/css/css-anchor-position/reference/anchor-css-zoom-ref.html
new file mode 100644
index 00000000000..9ec7e06aa85
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/reference/anchor-css-zoom-ref.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+
+<style>
+    .containing-block {
+        position: relative;
+        width: 150px;
+        height: 150px;
+
+        zoom: 2;
+    }
+
+    .cell {
+        width: 50px;
+        height: 50px;
+    }
+
+    #anchor-cell {
+        position: absolute;
+        top: 50px;
+        left: 50px;
+
+        background: green;
+    }
+
+    .anchor-positioned-cell {
+        position: absolute;
+    }
+
+    #top-left {
+        top: 0;
+        left: 0;
+
+        background: cyan;
+    }
+
+    #top-right {
+        top: 0;
+        right: 0;
+
+        background: magenta;
+    }
+
+    #bottom-left {
+        bottom: 0;
+        left: 0;
+
+        background: yellow;
+    }
+
+    #bottom-right {
+        bottom: 0;
+        right: 0;
+
+        background: black;
+    }
+</style>
+
+<body>
+    <div class="containing-block">
+        <div class="cell" id="anchor-cell"></div>
+
+        <div class="cell anchor-positioned-cell" id="top-left"></div>
+        <div class="cell anchor-positioned-cell" id="top-right"></div>
+        <div class="cell anchor-positioned-cell" id="bottom-left"></div>
+        <div class="cell anchor-positioned-cell" id="bottom-right"></div>
+    </div>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-anchor-position/reference/anchor-size-css-zoom-ref.html b/tests/wpt/tests/css/css-anchor-position/reference/anchor-size-css-zoom-ref.html
new file mode 100644
index 00000000000..a4feab487c5
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/reference/anchor-size-css-zoom-ref.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+
+<style>
+    #containing-block {
+        position: relative;
+
+        zoom: 2;
+    }
+
+    #anchor {
+        position: absolute;
+
+        width: 200px;
+        height: 100px;
+
+        background: red;
+    }
+
+    #anchor-positioned {
+        position: absolute;
+
+        width: 200px;
+        height: 100px;
+
+        background: green;
+
+        z-index: 1;
+    }
+</style>
+
+Test passes if no red is visible.
+
+<div id="containing-block">
+    <div id="anchor"></div>
+    <div id="anchor-positioned"></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-anchor-position/remove-position-try-rules-001.html b/tests/wpt/tests/css/css-anchor-position/remove-position-try-rules-001.html
new file mode 100644
index 00000000000..56ad5cf7b32
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/remove-position-try-rules-001.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<title>Remove current fallback @position-try rules</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://issues.chromium.org/issues/411170230">
+<style id="removeme">
+  @position-try --pf1 {
+    left: auto;
+    right: anchor(left);
+    top: 200px;
+  }
+</style>
+<style id="removemetoo">
+  @position-try --pf2 {
+    left: auto;
+    right: anchor(left);
+    top: 300px;
+  }
+</style>
+<style>
+  #anchor {
+    anchor-name: --a;
+    margin-left: 100px;
+    height: 100px;
+    background: hotpink;
+  }
+  #box {
+    position: absolute;
+    position-anchor: --a;
+    top: 100px;
+    left: anchor(right);
+    position-try-fallbacks: --pf1,--pf2;
+    width: 50px;
+    height: 50px;
+    background: cyan;
+  }
+</style>
+<div id="anchor"></div>
+<div id="box"></div>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/test-common.js"></script>
+<script>
+promise_test(async () => {
+  // The base style option doesn't fit. The two others do fit.
+  // Remove them one by one.
+  await waitUntilNextAnimationFrame();
+  await waitUntilNextAnimationFrame();
+  assert_equals(box.offsetTop, 200);
+  removeme.remove();
+  await waitUntilNextAnimationFrame();
+  await waitUntilNextAnimationFrame();
+  assert_equals(box.offsetTop, 300);
+  removemetoo.remove();
+  await waitUntilNextAnimationFrame();
+  await waitUntilNextAnimationFrame();
+  assert_equals(box.offsetTop, 100);
+}, "Remove fallback rules");
+</script>
diff --git a/tests/wpt/tests/css/css-anchor-position/vertical-aligned-table-cell.html b/tests/wpt/tests/css/css-anchor-position/vertical-aligned-table-cell.html
new file mode 100644
index 00000000000..9b16621b713
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/vertical-aligned-table-cell.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<title>Anchor inside table cell with non-top alignment</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-anchor-position-1/#positioning">
+<link rel="help" href="https://www.w3.org/TR/css-inline-3/#transverse-alignment">
+<link rel="help" href="https://issues.chromium.org/issues/406288652">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; height:100px; position:relative; overflow:clip; background:red;">
+  <div style="display:table-cell;">
+    <div id="anchor" style="anchor-name:--a; width:50px; height:100px;"></div>
+  </div>
+  <div style="display:table-cell;">
+    <div style="width:10px; height:200px;"></div>
+  </div>
+  <div style="position:absolute; position-anchor:--a; bottom:anchor(top); width:100px; height:100px; background:green;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-anchor-position/viewport-overflow-hidden-invisible-anchor-crash.html b/tests/wpt/tests/css/css-anchor-position/viewport-overflow-hidden-invisible-anchor-crash.html
new file mode 100644
index 00000000000..b2fa5255b5e
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/viewport-overflow-hidden-invisible-anchor-crash.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-anchor-position-1/">
+<link rel="help" href="https://crbug.com/391903229">
+<style>
+html {
+  overflow: hidden;
+}
+.anchor, .element {
+  background: green;
+  width: 100px;
+  height: 100px;
+}
+.anchor {
+  background: red;
+  anchor-name: --anchor;
+}
+.element {
+  position: absolute;
+  position-anchor: --anchor;
+  bottom: anchor(top);
+  left: 50px;
+}
+</style>
+<div style="height: 1000px"></div>
+<div class="element"></div>
+<div style="overflow: auto; width: 50px">
+  <div class="anchor"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-animations/animate-with-background-color-oklch-001-ref.html b/tests/wpt/tests/css/css-animations/animate-with-background-color-oklch-001-ref.html
new file mode 100644
index 00000000000..92b91077f3f
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/animate-with-background-color-oklch-001-ref.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>CSS Animations Test: animation with background-color "oklch"</title>
+<link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+<link rel="help" href="https://www.w3.org/TR/css-animations-2/">
+<meta name="assert" content="Check that the background-color is animated with oklch correctly">
+<style>
+#box {
+  block-size: 200px;
+  inline-size: 200px;
+  background-color: oklch(45% 0.2 264);
+}
+</style>
+<div id="box"></div>
+</html>
diff --git a/tests/wpt/tests/css/css-animations/animate-with-background-color-oklch-001.html b/tests/wpt/tests/css/css-animations/animate-with-background-color-oklch-001.html
new file mode 100644
index 00000000000..37d10e07cdb
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/animate-with-background-color-oklch-001.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<html class="reftest-wait">
+<meta charset="utf-8">
+<title>CSS Animations Test: animation with background-color "oklch"</title>
+<link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+<link rel="help" href="https://www.w3.org/TR/css-animations-2/">
+<link rel="match" href="animate-with-background-color-oklch-001-ref.html">
+<meta name="assert" content="Check that the background-color is animated with oklch correctly">
+<style>
+@keyframes bg-color-oklch {
+  to {
+    background-color: oklch(45% 0.2 264); /*  blue */
+  }
+}
+#box {
+  block-size: 200px;
+  inline-size: 200px;
+  background-color: #ff0000;
+  animation: linear 1s forwards bg-color-oklch;
+}
+</style>
+<div id="box"></div>
+<script>
+window.onload = () => {
+  requestAnimationFrame(() => {
+    const anim = document.getAnimations()[0];
+    anim.finish();
+    requestAnimationFrame(() => {
+      document.documentElement.classList.remove("reftest-wait");
+    });
+  });
+};
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-animations/animate-with-background-color-oklch-002.html b/tests/wpt/tests/css/css-animations/animate-with-background-color-oklch-002.html
new file mode 100644
index 00000000000..ee6847c11bf
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/animate-with-background-color-oklch-002.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>CSS animations with background-color from legacy rgb to oklch</title>
+  <link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+  <link rel="help" href="https://www.w3.org/TR/css-animations-2/">
+</head>
+<style>
+  @keyframes bg-color-oklch {
+    to {
+      background-color: oklch(45% 0.2 264); /*  blue */
+    }
+  }
+  @keyframes bg-mix-color-oklch {
+    to {
+      background-color: color-mix(in oklch, oklch(45% 0.2 264), oklch(45% 0.2 264));
+    }
+  }
+
+  #target {
+    background: #ff0000;
+    animation-duration: 1s;
+    animation-timing-function: linear;
+    animation-play-state: paused;
+    animation-fill-mode: forwards;
+    height: 100px;
+    width: 100px;
+  }
+  .bg-color-oklch {
+    animation-name: bg-color-oklch;
+  }
+  .bg-mix-color-oklch {
+    animation-name: bg-mix-color-oklch;
+  }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<script src="/css/support/color-testcommon.js"></script>
+
+<body>
+  <div id="target"></div>
+  <div id="test"></div>
+</body>
+<script>
+  'use strict';
+
+  async function runAnimationTest(t, name, expected_colors) {
+    const target = document.getElementById('target');
+    target.classList.add(name);
+    t.add_cleanup(() => {
+      target.classList.remove(name);
+    });
+    const anim = document.getAnimations()[0];
+    await anim.ready;
+    expected_colors.forEach(data => {
+      anim.currentTime = 1000 * data.at;
+      const actual = getComputedStyle(target).backgroundColor;
+      const expected = data.value;
+      assert_equals(actual, expected, `Background color at ${100*data.at}% animation progress`);
+    });
+  }
+
+  const bg_color_legacy_rgb_to_oklch = [
+    { at: 0, value: 'rgb(255, 0, 0)' },
+    { at: 0.25, value: 'oklab(0.583475 0.163433 0.0446685)' },
+    { at: 0.5, value: 'oklab(0.538983 0.101987 -0.0365225)' },
+    { at: 0.75, value: 'oklab(0.494492 0.0405407 -0.117713)' },
+    { at: 1, value: 'oklab(0.45 -0.0209057 -0.198904)' }
+  ];
+
+  window.onload = async () => {
+    promise_test(t => {
+      return runAnimationTest(t, 'bg-color-oklch', bg_color_legacy_rgb_to_oklch);
+    }, 'Animate from legacy rgb to oklch');
+
+    promise_test(t => {
+      return runAnimationTest(t, 'bg-mix-color-oklch', bg_color_legacy_rgb_to_oklch);
+    }, 'Animate from legacy rgb to color-mix oklch');
+  };
+
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-animations/crashtests/chrome-bug-404743651.html b/tests/wpt/tests/css/css-animations/crashtests/chrome-bug-404743651.html
new file mode 100644
index 00000000000..23886237402
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/crashtests/chrome-bug-404743651.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<title>CSS Animations: Chrome crash for getKeyframes() when animating background-image</title>
+<link rel="help" href="https://crbug.com/404743651">
+<style>
+  @keyframes animate {
+    to { background-image: url(foo.jpg); }
+  }
+  #target {
+    animation: animate 100s;
+  }
+</style>
+<div id="target"></div>
+<script>
+  for (let anim of document.getAnimations()) {
+    anim.effect.getKeyframes();
+  }
+</script>
diff --git a/tests/wpt/tests/css/css-animations/crashtests/chrome-bug-405795970.html b/tests/wpt/tests/css/css-animations/crashtests/chrome-bug-405795970.html
new file mode 100644
index 00000000000..5b45527fd9c
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/crashtests/chrome-bug-405795970.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<link rel="help" href="https://crbug.com/405795970">
+<style>
+  @keyframes --anim {
+    from {
+      width: calc(10px * sibling-index());
+    }
+    to {
+      width: calc(50px);
+    }
+  }
+  #target {
+    animation: --anim 2s;
+  }
+</style>
+<p>Pass if no crash</p>
+<div id="target"></div>
diff --git a/tests/wpt/tests/css/css-animations/crashtests/chrome-bug-415627003.html b/tests/wpt/tests/css/css-animations/crashtests/chrome-bug-415627003.html
new file mode 100644
index 00000000000..af942fbcc97
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/crashtests/chrome-bug-415627003.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<link rel="help" href="https://crbug.com/415627003">
+<style>
+  @keyframes --anim {
+    from {
+      text-size-adjust: calc(50% * sibling-index());
+    }
+    to {
+      text-size-adjust: calc(50%);
+    }
+  }
+  #target {
+    animation: --anim 2s;
+  }
+</style>
+<p>Pass if no crash</p>
+<div id="target"></div>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-range-start-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-range-start-valid.html
index bb1dbe35c04..311df59b51b 100644
--- a/tests/wpt/tests/css/css-animations/parsing/animation-range-start-valid.html
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-range-start-valid.html
@@ -29,5 +29,5 @@ test_valid_value("animation-range-start", "cover");
 test_valid_value("animation-range-start", "contain");
 test_valid_value("animation-range-start", "entry");
 test_valid_value("animation-range-start", "exit");
-test_valid_value("animation-range-start", "cover calc(sign(100em - 1px) * 1%)");
+test_valid_value("animation-range-start", "cover calc(sign(100em - 1px) * 1%)", "cover calc(1% * sign(100em - 1px))");
 </script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html
index d2baab5b2a5..c1aa5d16c5a 100644
--- a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-computed.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
-<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942 ">
+<link rel="help" href="https://drafts.csswg.org/css-animations-2/#animation-trigger-exit-range">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/computed-testcommon.js"></script>
 <div id="target" style="font-size:10px;"></div>
 <script>
-test_computed_value("animation-trigger-exit-range-end", "initial", "normal");
+test_computed_value("animation-trigger-exit-range-end", "initial", "auto");
+test_computed_value("animation-trigger-exit-range-end", "auto");
 test_computed_value("animation-trigger-exit-range-end", "normal");
 test_computed_value("animation-trigger-exit-range-end", "cover 0%");
 test_computed_value("animation-trigger-exit-range-end", "cover 100%", "cover");
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-invalid.html
index 111847151ef..db4aefef17a 100644
--- a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-invalid.html
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-invalid.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
-<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942">
+<link rel="help" href="https://drafts.csswg.org/css-animations-2/#animation-trigger-exit-range-end">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
@@ -18,4 +17,5 @@ test_invalid_value("animation-trigger-exit-range-end", "50% exit");
 test_invalid_value("animation-trigger-exit-range-end", "contain contain");
 test_invalid_value("animation-trigger-exit-range-end", "none");
 test_invalid_value("animation-trigger-exit-range-end", "cover 50% enter 50%");
+test_invalid_value("animation-trigger-exit-range-end", "auto contain");
 </script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html
index 9a41889d339..04ea80de236 100644
--- a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-end-valid.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
-<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942">
+<link rel="help" href="https://drafts.csswg.org/css-animations-2/#animation-trigger-exit-range-endß">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
 <script>
 // https://drafts.csswg.org/scroll-animations-1/#view-timelines-ranges
+test_valid_value("animation-trigger-exit-range-end", "auto");
 test_valid_value("animation-trigger-exit-range-end", "normal");
 test_valid_value("animation-trigger-exit-range-end", "cover 0%");
 test_valid_value("animation-trigger-exit-range-end", "cover 100%", "cover");
@@ -30,4 +30,4 @@ test_valid_value("animation-trigger-exit-range-end", "cover");
 test_valid_value("animation-trigger-exit-range-end", "contain");
 test_valid_value("animation-trigger-exit-range-end", "entry");
 test_valid_value("animation-trigger-exit-range-end", "exit");
-</script>trigger-
+</script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html
index 5ddc0682ea8..1f1c9496c0d 100644
--- a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-shorthand.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <title>animation-trigger-exit-range shorthand</title>
-<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942">
+<link rel="help" href="https://drafts.csswg.org/css-animations-2/#animation-trigger-exit-range">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/shorthand-testcommon.js"></script>
@@ -18,6 +17,14 @@ test_valid_value("animation-trigger-exit-range", "entry-crossing");
 test_valid_value("animation-trigger-exit-range", "exit");
 test_valid_value("animation-trigger-exit-range", "exit-crossing");
 test_valid_value("animation-trigger-exit-range", "entry, exit");
+test_valid_value("animation-trigger-exit-range", "auto");
+test_valid_value("animation-trigger-exit-range", "auto auto", "auto");
+test_valid_value("animation-trigger-exit-range", "cover auto");
+test_valid_value("animation-trigger-exit-range", "cover 10% auto");
+test_valid_value("animation-trigger-exit-range", "auto cover");
+test_valid_value("animation-trigger-exit-range", "auto cover 90%");
+test_valid_value("animation-trigger-exit-range", "normal auto", "normal");
+test_valid_value("animation-trigger-exit-range", "auto normal", "auto");
 
 test_valid_value("animation-trigger-exit-range", "entry 0% entry 100%", "entry");
 test_valid_value("animation-trigger-exit-range", "entry-crossing 0% entry-crossing 100%",
@@ -110,9 +117,14 @@ test_invalid_value("animation-trigger-exit-range", "thing 100%");
 test_invalid_value("animation-trigger-exit-range", "thing 100px");
 test_invalid_value("animation-trigger-exit-range", "100% thing");
 
+test_shorthand_value('animation-trigger-exit-range', 'auto', {
+  'animation-trigger-exit-range-start': 'auto',
+  'animation-trigger-exit-range-end': 'auto',
+});
+
 test_shorthand_value('animation-trigger-exit-range', 'normal', {
   'animation-trigger-exit-range-start': 'normal',
-  'animation-trigger-exit-range-end': 'normal',
+  'animation-trigger-exit-range-end': 'auto',
 });
 
 test_shorthand_value('animation-trigger-exit-range', 'normal normal', {
@@ -120,6 +132,16 @@ test_shorthand_value('animation-trigger-exit-range', 'normal normal', {
   'animation-trigger-exit-range-end': 'normal',
 });
 
+test_shorthand_value('animation-trigger-exit-range', 'normal auto', {
+  'animation-trigger-exit-range-start': 'normal',
+  'animation-trigger-exit-range-end': 'auto',
+});
+
+test_shorthand_value('animation-trigger-exit-range', 'auto normal', {
+  'animation-trigger-exit-range-start': 'auto',
+  'animation-trigger-exit-range-end': 'normal',
+});
+
 test_shorthand_value('animation-trigger-exit-range', 'normal entry 100%', {
   'animation-trigger-exit-range-start': 'normal',
   'animation-trigger-exit-range-end': 'entry',
@@ -171,10 +193,10 @@ test_shorthand_value('animation-trigger-exit-range', 'exit calc(10% + 50px)', {
 });
 test_shorthand_value('animation-trigger-exit-range', '100px', {
   'animation-trigger-exit-range-start': '100px',
-  'animation-trigger-exit-range-end': 'normal',
+  'animation-trigger-exit-range-end': 'auto',
 });
 test_shorthand_value('animation-trigger-exit-range', '10%', {
   'animation-trigger-exit-range-start': '10%',
-  'animation-trigger-exit-range-end': 'normal',
+  'animation-trigger-exit-range-end': 'auto',
 });
 </script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html
index a48e15a578d..b8f5bd87738 100644
--- a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-computed.html
@@ -6,7 +6,9 @@
 <script src="/css/support/computed-testcommon.js"></script>
 <div id="target" style="font-size:10px;"></div>
 <script>
-test_computed_value("animation-trigger-exit-range-start", "initial", "normal");
+// https://drafts.csswg.org/css-animations-2/#animation-trigger-exit-range-start
+test_computed_value("animation-trigger-exit-range-start", "initial", "auto");
+test_computed_value("animation-trigger-exit-range-start", "auto");
 test_computed_value("animation-trigger-exit-range-start", "normal");
 test_computed_value("animation-trigger-exit-range-start", "cover 0%", "cover");
 test_computed_value("animation-trigger-exit-range-start", "cover 100%");
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-invalid.html
index 220b8028dd3..f8a38fc21d7 100644
--- a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-invalid.html
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-invalid.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
-<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942 ">
+<link rel="help" href="https://drafts.csswg.org/css-animations-2/#animation-trigger-exit-range-start">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
@@ -14,4 +13,5 @@ test_invalid_value("animation-trigger-exit-range-start", "50% exit");
 test_invalid_value("animation-trigger-exit-range-start", "contain contain");
 test_invalid_value("animation-trigger-exit-range-start", "none");
 test_invalid_value("animation-trigger-exit-range-start", "cover 50% enter 50%");
+test_invalid_value("animation-trigger-exit-range-start", "auto contain");
 </script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html
index 11d1adb26f8..881ad833c4b 100644
--- a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-exit-range-start-valid.html
@@ -6,6 +6,7 @@
 <script src="/css/support/parsing-testcommon.js"></script>
 <script>
 // https://drafts.csswg.org/scroll-animations-1/#view-timelines-ranges
+test_valid_value("animation-trigger-exit-range-start", "auto");
 test_valid_value("animation-trigger-exit-range-start", "normal");
 test_valid_value("animation-trigger-exit-range-start", "cover 0%", "cover");
 test_valid_value("animation-trigger-exit-range-start", "cover 100%");
@@ -30,5 +31,5 @@ test_valid_value("animation-trigger-exit-range-start", "cover");
 test_valid_value("animation-trigger-exit-range-start", "contain");
 test_valid_value("animation-trigger-exit-range-start", "entry");
 test_valid_value("animation-trigger-exit-range-start", "exit");
-test_valid_value("animation-trigger-exit-range-start", "cover calc(sign(100em - 1px) * 1%)");
+test_valid_value("animation-trigger-exit-range-start", "cover calc(sign(100em - 1px) * 1%)", "cover calc(1% * sign(100em - 1px))");
 </script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-invalid.html
index 8d66ac661d5..30924969482 100644
--- a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-invalid.html
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-invalid.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
-<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942">
+<link rel="help" href="https://drafts.csswg.org/css-animations-2/#animation-trigger-exit-range-end">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-valid.html
index 6d9533e2648..1b72ef2b60d 100644
--- a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-valid.html
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-end-valid.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
-<!-- TODO(crbug.com/390314945): Replace with spec link when the spec lands. -->
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8942">
+<link rel="help" href="https://drafts.csswg.org/css-animations-2/#animation-trigger-range">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-valid.html
index d48151b6db0..6a091fa4d07 100644
--- a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-valid.html
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-range-start-valid.html
@@ -30,5 +30,5 @@ test_valid_value("animation-trigger-range-start", "cover");
 test_valid_value("animation-trigger-range-start", "contain");
 test_valid_value("animation-trigger-range-start", "entry");
 test_valid_value("animation-trigger-range-start", "exit");
-test_valid_value("animation-trigger-range-start", "cover calc(sign(100em - 1px) * 1%)");
+test_valid_value("animation-trigger-range-start", "cover calc(sign(100em - 1px) * 1%)", "cover calc(1% * sign(100em - 1px))");
 </script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-shorthand.tentative.html b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-shorthand.tentative.html
index d0b6befea8e..784790e750c 100644
--- a/tests/wpt/tests/css/css-animations/parsing/animation-trigger-shorthand.tentative.html
+++ b/tests/wpt/tests/css/css-animations/parsing/animation-trigger-shorthand.tentative.html
@@ -66,8 +66,8 @@
       'animation-trigger-timeline': 'view()',
       'animation-trigger-range-start': 'contain',
       'animation-trigger-range-end': 'contain',
-      'animation-trigger-exit-range-start': 'normal',
-      'animation-trigger-exit-range-end': 'normal',
+      'animation-trigger-exit-range-start': 'auto',
+      'animation-trigger-exit-range-end': 'auto',
     });
   test_shorthand_value('animation-trigger',
     'view() alternate contain 20% contain 80%',
@@ -76,8 +76,8 @@
       'animation-trigger-timeline': 'view()',
       'animation-trigger-range-start': 'contain 20%',
       'animation-trigger-range-end': 'contain 80%',
-      'animation-trigger-exit-range-start': 'normal',
-      'animation-trigger-exit-range-end': 'normal',
+      'animation-trigger-exit-range-start': 'auto',
+      'animation-trigger-exit-range-end': 'auto',
     });
   test_shorthand_value('animation-trigger',
     'view() alternate contain 0%',
@@ -86,8 +86,8 @@
       'animation-trigger-timeline': 'view()',
       'animation-trigger-range-start': 'contain',
       'animation-trigger-range-end': 'contain',
-      'animation-trigger-exit-range-start': 'normal',
-      'animation-trigger-exit-range-end': 'normal',
+      'animation-trigger-exit-range-start': 'auto',
+      'animation-trigger-exit-range-end': 'auto',
     });
   test_shorthand_value('animation-trigger',
     'view() alternate contain 10%',
@@ -96,8 +96,8 @@
       'animation-trigger-timeline': 'view()',
       'animation-trigger-range-start': 'contain 10%',
       'animation-trigger-range-end': 'contain',
-      'animation-trigger-exit-range-start': 'normal',
-      'animation-trigger-exit-range-end': 'normal',
+      'animation-trigger-exit-range-start': 'auto',
+      'animation-trigger-exit-range-end': 'auto',
     });
   test_shorthand_value('animation-trigger',
     'view() alternate contain',
@@ -106,8 +106,8 @@
       'animation-trigger-timeline': 'view()',
       'animation-trigger-range-start': 'contain',
       'animation-trigger-range-end': 'contain',
-      'animation-trigger-exit-range-start': 'normal',
-      'animation-trigger-exit-range-end': 'normal',
+      'animation-trigger-exit-range-start': 'auto',
+      'animation-trigger-exit-range-end': 'auto',
     });
   test_shorthand_value('animation-trigger', 'view() alternate',
     {
@@ -115,8 +115,8 @@
       'animation-trigger-timeline': 'view()',
       'animation-trigger-range-start': 'normal',
       'animation-trigger-range-end': 'normal',
-      'animation-trigger-exit-range-start': 'normal',
-      'animation-trigger-exit-range-end': 'normal',
+      'animation-trigger-exit-range-start': 'auto',
+      'animation-trigger-exit-range-end': 'auto',
     });
   test_shorthand_value('animation-trigger', 'repeat',
     {
@@ -124,8 +124,8 @@
       'animation-trigger-timeline': 'auto',
       'animation-trigger-range-start': 'normal',
       'animation-trigger-range-end': 'normal',
-      'animation-trigger-exit-range-start': 'normal',
-      'animation-trigger-exit-range-end': 'normal',
+      'animation-trigger-exit-range-start': 'auto',
+      'animation-trigger-exit-range-end': 'auto',
     });
   test_computed_value('animation-trigger',
     'view() once contain 0% contain 100% cover 0% cover 100%',
@@ -140,8 +140,8 @@
     'view() once contain 20% contain 80% cover 10% cover');
   test_computed_value('animation-trigger',
       'view() once contain 0% contain 100%',
-      'view() once contain contain normal normal');
+      'view() once contain contain auto auto');
   test_computed_value('animation-trigger',
       'view() once',
-      'view() once normal normal normal normal');
+      'view() once normal normal auto auto');
 </script>
diff --git a/tests/wpt/tests/css/css-animations/parsing/keyframe-selectors.html b/tests/wpt/tests/css/css-animations/parsing/keyframe-selectors.html
new file mode 100644
index 00000000000..900cba5a05a
--- /dev/null
+++ b/tests/wpt/tests/css/css-animations/parsing/keyframe-selectors.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<title>CSS Animations Test: Parse tests for keyframe selectors</title>
+<link rel="help" href="https://drafts.csswg.org/css-animations-1/#keyframes">
+<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#typedef-timeline-range-name">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style id="test_sheet">
+</style>
+<script>
+  function isValidKeyFrameSelector(selector_text) {
+    let sheet = test_sheet.sheet;
+    sheet.insertRule(`@keyframes --foo { ${selector_text} {} }`);
+    let keyframe_rule = sheet.cssRules[0].cssRules[0];
+    sheet.deleteRule(0);
+    return keyframe_rule != undefined;
+  }
+
+  function test_valid_keyframe_selector(selector_text) {
+    test(() => {
+      assert_true(isValidKeyFrameSelector(selector_text));
+    }, `'${selector_text}' should be a valid keyframe selector`);
+  }
+
+  function test_invalid_keyframe_selector(selector_text) {
+    test(() => {
+      assert_false(isValidKeyFrameSelector(selector_text));
+    }, `'${selector_text}' should not be a valid keyframe selector`);
+  }
+
+  test_valid_keyframe_selector("0%");
+  test_valid_keyframe_selector("10%");
+  test_valid_keyframe_selector("100%");
+  test_valid_keyframe_selector("from");
+  test_valid_keyframe_selector("to");
+  test_valid_keyframe_selector("entry 10%");
+  test_valid_keyframe_selector("exit 60%");
+
+  test_invalid_keyframe_selector("-10%");
+  test_invalid_keyframe_selector("120%");
+  test_invalid_keyframe_selector("calc(10%)");
+  test_invalid_keyframe_selector("calc(10% * sibling-index())");
+  test_invalid_keyframe_selector("calc(10% * sign(1em - 1px))");
+  test_invalid_keyframe_selector("entry calc(10%)");
+  test_invalid_keyframe_selector("exit calc(60%)");
+</script>
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-width-005.xht b/tests/wpt/tests/css/css-backgrounds/border-image-width-005.xht
index eeceedef90e..1e93b7219d4 100644
--- a/tests/wpt/tests/css/css-backgrounds/border-image-width-005.xht
+++ b/tests/wpt/tests/css/css-backgrounds/border-image-width-005.xht
@@ -34,7 +34,7 @@
       border-width: 0px; /* so the border belt (or border area) of the element is 0px tall and 0px wide */
       border-image-source: url("support/outline-5px-10px-15px-20px-green.png");
       border-image-slice: 5% 10% 15% 20%; /* <number> Percentages are relative to the size of the image: the width of the image for the horizontal offsets, the height for vertical offsets. */
-      border-image-width: 50px; /* The four values of ‘border-image-width’ specify offsets that are used to divide the border image area into nine parts. They represent inward distances from the the top, right, bottom, and left sides of the area, respectively. */
+      border-image-width: 50px; /* The four values of ‘border-image-width’ specify offsets that are used to divide the border image area into nine parts. They represent inward distances from the top, right, bottom, and left sides of the area, respectively. */
       border-image-outset: 25px 25px 25px 25px; /* The border-image-outset values specify the amount by which the border image area *_ extends beyond the border box_*. */
       height: 20px;
       margin-left: 25px; /* == border-image-outset . This margin-left value is just to position the rendered layout to accurately match the reference file . */
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-width-006.xht b/tests/wpt/tests/css/css-backgrounds/border-image-width-006.xht
index aa487b76c53..bd046c25876 100644
--- a/tests/wpt/tests/css/css-backgrounds/border-image-width-006.xht
+++ b/tests/wpt/tests/css/css-backgrounds/border-image-width-006.xht
@@ -34,7 +34,7 @@
       border-width: 0px; /* so the border belt (or border area) of the element is 0px tall and 0px wide */
       border-image-source: url("support/outline-5px-10px-15px-20px-green.png");
       border-image-slice: 5% 10% 15% 20%; /* <number> Percentages are relative to the size of the image: the width of the image for the horizontal offsets, the height for vertical offsets. */
-      border-image-width: 50px; /* The four values of ‘border-image-width’ specify offsets that are used to divide the border image area into nine parts. They represent inward distances from the the top, right, bottom, and left sides of the area, respectively. */
+      border-image-width: 50px; /* The four values of ‘border-image-width’ specify offsets that are used to divide the border image area into nine parts. They represent inward distances from the top, right, bottom, and left sides of the area, respectively. */
       border-image-outset: 25px 25px 25px 25px; /* The border-image-outset values specify the amount by which the border image area *_ extends beyond the border box_*. */
       height: 0px;
       margin-left: 25px; /* == border-image-outset . This margin-left value is just to position the rendered layout to accurately match the reference file . */
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-width-007.xht b/tests/wpt/tests/css/css-backgrounds/border-image-width-007.xht
index 61726c00873..6c4647dd87f 100644
--- a/tests/wpt/tests/css/css-backgrounds/border-image-width-007.xht
+++ b/tests/wpt/tests/css/css-backgrounds/border-image-width-007.xht
@@ -28,7 +28,7 @@
       border-width: 0px; /* so the border belt (or border area) of the element is 0px tall and 0px wide */
       border-image-source: url("support/outline-5px-10px-15px-20px-green.png");
       border-image-slice: 5% 10% 15% 20%; /* <number> Percentages are relative to the size of the image: the width of the image for the horizontal offsets, the height for vertical offsets. */
-      border-image-width: 50px; /* The four values of ‘border-image-width’ specify offsets that are used to divide the border image area into nine parts. They represent inward distances from the the top, right, bottom, and left sides of the area, respectively. */
+      border-image-width: 50px; /* The four values of ‘border-image-width’ specify offsets that are used to divide the border image area into nine parts. They represent inward distances from the top, right, bottom, and left sides of the area, respectively. */
       border-image-outset: 50px 50px 50px 50px; /* The border-image-outset values specify the amount by which the border image area !_ extends beyond the border box_!. */
       height: 0px;
       margin: 66px 50px 50px 50px;
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-width-009.html b/tests/wpt/tests/css/css-backgrounds/border-image-width-009.html
index 112c2a485ac..109f34fe9fd 100644
--- a/tests/wpt/tests/css/css-backgrounds/border-image-width-009.html
+++ b/tests/wpt/tests/css/css-backgrounds/border-image-width-009.html
@@ -39,7 +39,7 @@
       /*
       The four values of 'border-image-width' specify offsets
       that are used to divide the border image area into nine
-      parts. They represent inward distances from the the top,
+      parts. They represent inward distances from the top,
       right, bottom, and left sides of the area, respectively.
       In this sub-test1, the border-image-width divide the border
       image area into four (4) parts, not nine parts. The center
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html
index 688f01c8668..36fc7a88825 100644
--- a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-any-ref.html
@@ -5,6 +5,11 @@
 <script src="resources/resolve-corner-style.js"></script>
 <script src="resources/corner-utils.js"></script>
 <script src="resources/corner-shape.js"></script>
+<style>
+  body {
+    margin: 0;
+  }
+</style>
 <script>
 const canvas = document.getElementById("target");
 const params = new URLSearchParams(location.search);
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-any.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-any.html
deleted file mode 100644
index 9c256eb8977..00000000000
--- a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-any.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Borders and Box Decorations 4: 'corner-shape' parametric rendering</title>
-<link rel="help" href="https://drafts.csswg.org/css-borders-4/#corner-shaping">
-<link rel="match" href="corner-shape-any-ref.html">
-<meta name="variant" content="?corner-shape=squircle&border-radius=50%">
-<meta name="variant" content="?corner-shape=squircle&border-top-left-radius=30%">
-<meta name="variant" content="?corner-shape=squircle&border-top-right-radius=30px">
-<meta name="variant" content="?corner-shape=straight&border-bottom-leftradius=5px">
-<meta name="variant" content="?corner-shape=superellipse(5.2)&border-radius=40%">
-<meta name="variant" content="?corner-top-left-shape=scoop&corner-top-right-shape=scoop&border-radius=50%">
-<meta name="variant" content="?corner-shape=superellipse(8)&border-top-right-radius=33px">
-<meta name="variant" content="?corner-top-right-shape=superellipse(0.1)&border-top-right-radius=50px">
-<meta name="variant" content="?corner-bottom-left-shape=bevel&border-bottom-left-radius=30px">
-<meta name="variant" content="?corner-bottom-right-shape=superellipse(1.9)&border-bottom-right-radius=50%">
-<meta name="fuzzy" content="maxDifference=0-180;totalPixels=0-520">
-<style>
-  #target {
-    width: 200px;
-    height: 100px;
-    box-sizing: border-box;
-    background: green;
-  }
-</style>
-<div id="target"></div>
-<script>
-  const target = document.getElementById("target");
-  const params = new URLSearchParams(location.search);
-  for (const [k, v] of params) {
-    target.style[k] = v;
-  }
-</script>
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter-overflow-ref.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter-overflow-ref.html
new file mode 100644
index 00000000000..4aabd7e8e35
--- /dev/null
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter-overflow-ref.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<head>
+<style>
+    .target {
+        width: 200px;
+        height: 200px;
+        corner-shape: superellipse(1.8) scoop superellipse(-5) bevel;
+        border-radius: 25%;
+        position: relative;
+    }
+
+    .ref {
+        background: rgb(0 64 0);
+    }
+    .overflow {
+        position: absolute;
+        left: 100px;
+        top: 100px;
+        width: 200px;
+        height: 200px;
+        background: rebeccapurple;
+    }
+</style>
+</head>
+<body>
+    <div class="target ref"><div class="overflow"></div></div>
+</body>
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter-overflow.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter-overflow.html
new file mode 100644
index 00000000000..550428a37e3
--- /dev/null
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter-overflow.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<head>
+<link rel="match" href="corner-shape-backdrop-filter-overflow-ref.html">
+<meta name="fuzzy" content="maxDifference=0-64;totalPixels=0-360">
+<style>
+    .target {
+        width: 200px;
+        height: 200px;
+        corner-shape: superellipse(1.8) scoop superellipse(-5) bevel;
+        border-radius: 25%;
+        position: relative;
+    }
+
+    .backdrop {
+        background: rgba(0 128 0 / 50%);
+        backdrop-filter: brightness(0);
+    }
+
+    .overflow {
+        position: absolute;
+        left: 100px;
+        top: 100px;
+        width: 200px;
+        height: 200px;
+        background: rebeccapurple;
+    }
+</style>
+</head>
+<body>
+    <div class="target backdrop"><div class=overflow></div></div>
+</body>
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter-ref.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter-ref.html
new file mode 100644
index 00000000000..165f93e6be1
--- /dev/null
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<head>
+<style>
+    .target {
+        width: 200px;
+        height: 200px;
+        corner-shape: squircle scoop notch bevel;
+        border-radius: 40%;
+    }
+
+    .ref {
+        background: rgb(0 64 0);
+    }
+</style>
+</head>
+<body>
+    <div class="target ref"></div>
+</body>
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter.html
new file mode 100644
index 00000000000..c4a2523b1f8
--- /dev/null
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-backdrop-filter.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<head>
+<link rel="match" href="corner-shape-backdrop-filter-ref.html">
+<meta name="fuzzy" content="maxDifference=0-64;totalPixels=0-360">
+<style>
+    .target {
+        width: 200px;
+        height: 200px;
+        corner-shape: squircle scoop notch bevel;
+        border-radius: 40%;
+    }
+
+    .backdrop {
+        background: rgba(0 128 0 / 50%);
+        backdrop-filter: brightness(0);
+    }
+
+</style>
+</head>
+<body>
+    <div class="target backdrop"></div>
+</body>
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-bevel-overflow.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-bevel-overflow.html
index df604db8d13..5a18e11af61 100644
--- a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-bevel-overflow.html
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-bevel-overflow.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>CSS Borders and Box Decorations 4: 'corner-shape' rendering with overflow</title>
 <link rel="match" href="corner-shape-bevel-overflow-ref.html">
-<meta name="fuzzy" content="maxDifference=0-32;totalPixels=0-32">
+<meta name="fuzzy" content="maxDifference=0-32;totalPixels=0-256">
 <style>
     .bevel {
         background: red;
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-fill.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-fill.html
index 6e5df8364c5..b8c8bc0ad2e 100644
--- a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-fill.html
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-fill.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <head>
 <link rel="match" href="corner-shape-fill-ref.html">
-<meta name="fuzzy" content="maxDifference=0-32;totalPixels=0-32">
+<meta name="fuzzy" content="maxDifference=0-32;totalPixels=0-256">
 <style>
     .target {
         background: green;
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-gallery.manual.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-gallery.manual.html
new file mode 100644
index 00000000000..1eb6cbd8df3
--- /dev/null
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-gallery.manual.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<title>Displays all the corner-shape-any.html variants side by side</title>
+<style>
+section {
+    display: flex;
+    flex-direction: column;
+    padding: 10px;
+    margin: 10px;
+    border: 2px solid grey;
+    border-radius: 2px;
+    background: lightgray;
+}
+
+label {
+    overflow-y: auto;
+    max-width: 250px;
+    max-height: 40px;
+    font-size: 10px;
+}
+
+iframe {
+    overflow: clip;
+    width: 250px;
+    height: 150px;
+    border: none;
+}
+
+main {
+    display: flex;
+    flex-wrap: wrap;
+}
+</style>
+<template id="scenario">
+    <section>
+        <label class="variant"></label>
+        Test:
+        <iframe class="test" frameborder="0" scrolling="no"></iframe>
+        Ref:
+        <iframe class="ref" frameborder="0" scrolling="no"></iframe>
+    </section>
+</template>
+<script>
+    addEventListener("DOMContentLoaded", async () => {
+        const test_files = ["corner-shape-render-precise.html", "corner-shape-render-fuzzy.html"]
+        const dom_parser = new DOMParser();
+        for (const test_file of test_files) {
+            const test_html = await (await fetch(test_file)).text();
+            const test_doc = dom_parser.parseFromString(test_html, "text/html");
+            const variants = Array.from(test_doc.querySelectorAll("meta[name=variant]")).map(m => m.content);
+            for (const variant of variants) {
+                const scenario = document.getElementById("scenario").content.cloneNode(true);
+                scenario.querySelector(".variant").innerText = variant;
+                scenario.querySelector(".test").src = `${test_file}${variant}`;
+                scenario.querySelector(".ref").src = `corner-shape-any-ref.html${variant}`;
+                document.querySelector("main").append(scenario);
+            }
+        }
+    });
+</script>
+<main></main>
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-inset-shadow-ref.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-inset-shadow-ref.html
new file mode 100644
index 00000000000..fa36c9d6ecc
--- /dev/null
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-inset-shadow-ref.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<head>
+<style>
+    .target {
+        --spread: 7px;
+        --offset-x: 10px;
+        --offset-y: 12px;
+        --width: 200px;
+        --height: 200px;
+        --border-width: 5px;
+        width: var(--width);
+        height: var(--height);
+        box-sizing: border-box;
+        corner-shape: bevel square scoop;
+        border-radius: 30%;
+        border: var(--border-width) solid purple;
+        overflow: clip;
+        background: blue;
+        position: relative;
+    }
+
+    .target::after {
+        content: " ";
+        display: block;
+        background: green;
+        corner-shape: inherit;
+        border-radius: inherit;
+        position: relative;
+        box-sizing: inherit;
+        left: calc(var(--offset-x) + var(--spread));
+        top: calc(var(--offset-y) + var(--spread));
+        width: calc(var(--width) - var(--spread) * 2 - var(--border-width) * 2);
+        height: calc(var(--height) - var(--spread) * 2 - var(--border-width) * 2);
+    }
+</style>
+</head>
+<body>
+    <div class="target"></div>
+</body>
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-inset-shadow.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-inset-shadow.html
new file mode 100644
index 00000000000..7a83caff70c
--- /dev/null
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-inset-shadow.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<head>
+<link rel="match" href="corner-shape-inset-shadow-ref.html">
+<meta name="fuzzy" content="maxDifference=0-255;totalPixels=0-360">
+<style>
+    .target {
+        width: 200px;
+        height: 200px;
+        box-sizing: border-box;
+        corner-shape: bevel square scoop;
+        border-radius: 30%;
+        background: green;
+        border: 5px solid purple;
+        box-shadow: 10px 12px 0 7px blue inset;
+    }
+</style>
+</head>
+<body>
+    <div class="target"></div>
+</body>
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-interpolation.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-interpolation.html
new file mode 100644
index 00000000000..2ba9d43cb1f
--- /dev/null
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-interpolation.html
@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>corner-shape interpolation</title>
+<link rel="help" href="https://drafts.csswg.org/css-borders-4/#corner-shape-interpolation">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/interpolation-testcommon.js"></script>
+
+<style>
+.parent {
+  corner-shape: bevel;
+  padding: 10px;
+}
+
+.target {
+  display: inline-block;
+  width: 100px;
+  height: 100px;
+  background-color: black;
+  corner-shape: bevel superellipse(3) superellipse(-2.5) square;
+}
+
+.expected {
+  background-color: green;
+}
+</style>
+<body>
+<script>
+
+function test_corner_shape_interpolation({from, to}, expected) {
+  for (const corner of ['top-left', 'top-right', 'bottom-right', 'bottom-left']) {
+    test_interpolation({property: `corner-${corner}-shape`, from, to}, expected);
+  }
+}
+
+test_corner_shape_interpolation({
+  from: 'round',
+  to: 'bevel',
+}, [
+  {at: -0.3, expect: 'superellipse(1.4)'},
+  {at: 0, expect: 'round'},
+  {at: 0.6, expect: 'superellipse(0.36)'},
+  {at: 1, expect: 'bevel'},
+  {at: 1.5, expect: 'superellipse(-0.46)'},
+]);
+test_corner_shape_interpolation({
+  from: 'initial',
+  to: 'scoop',
+}, [
+  {at: -0.3, expect: 'superellipse(1.91)'},
+  {at: 0, expect: 'round'},
+  {at: 0.5, expect: 'bevel'},
+  {at: 0.6, expect: 'superellipse(-0.18)'},
+  {at: 1, expect: 'scoop'},
+  {at: 1.5, expect: 'superellipse(-2.95)'},
+]);
+
+test_interpolation({
+  property: 'corner-top-left-shape',
+  from: 'inherit',
+  to: 'squircle',
+}, [
+  {at: -0.3, expect: 'superellipse(-0.45)'},
+  {at: 0, expect: 'bevel'},
+  {at: 0.6, expect: 'superellipse(0.98)'},
+  {at: 1, expect: 'squircle'},
+  {at: 1.5, expect: 'square'},
+]);
+test_interpolation({
+  property: 'corner-top-right-shape',
+  from: 'inherit',
+  to: 'square',
+}, [
+  {at: -0.3, expect: 'superellipse(-0.69)'},
+  {at: 0, expect: 'bevel'},
+  {at: 0.6, expect: 'superellipse(1.64)'},
+  {at: 1, expect: 'square'},
+  {at: 1.5, expect: 'square'},
+]);
+test_interpolation({
+  property: 'corner-bottom-right-shape',
+  from: 'inherit',
+  to: 'scoop',
+}, [
+  {at: -0.3, expect: 'superellipse(0.27)'},
+  {at: 0, expect: 'bevel'},
+  {at: 0.6, expect: 'superellipse(-0.56)'},
+  {at: 1, expect: 'scoop'},
+  {at: 1.5, expect: 'superellipse(-1.72)'},
+]);
+test_interpolation({
+  property: 'corner-bottom-left-shape',
+  from: 'inherit',
+  to: 'notch',
+}, [
+  {at: -0.3, expect: 'superellipse(0.69)'},
+  {at: 0, expect: 'bevel'},
+  {at: 0.6, expect: 'superellipse(-1.64)'},
+  {at: 1, expect: 'notch'},
+  {at: 1.5, expect: 'notch'},
+]);
+
+test_corner_shape_interpolation({
+  from: 'notch',
+  to: 'square',
+}, [
+  {at: -0.3, expect: 'notch'},
+  {at: 0, expect: 'notch'},
+  {at: 0.5, expect: 'bevel'},
+  {at: 0.8, expect: 'superellipse(1.64)'},
+  {at: 1, expect: 'square'},
+  {at: 1.5, expect: 'square'},
+]);
+
+
+test_corner_shape_interpolation({
+  from: 'superellipse(3)',
+  to: 'superellipse(-2)',
+}, [
+  {at: -0.3, expect: 'square'},
+  {at: 0, expect: 'superellipse(3)'},
+  {at: 0.5, expect: 'superellipse(0.16)'},
+  {at: 0.8, expect: 'superellipse(-0.9)'},
+  {at: 1, expect: 'superellipse(-2)'},
+  {at: 1.1, expect: 'superellipse(-2.99)'},
+]);
+
+</script>
+</body>
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-notch.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-notch.html
index 79f64070bd8..30acefe527f 100644
--- a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-notch.html
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-notch.html
@@ -10,7 +10,7 @@
         height: 100px;
         border-radius: 25px;
         box-sizing: border-box;
-        corner-shape: notch superellipse(0.00001) round superellipse(0);
+        corner-shape: notch superellipse(-100) round superellipse(-infinity);
     }
 </style>
 <div class=target></div>
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html
new file mode 100644
index 00000000000..590e960830f
--- /dev/null
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-render-fuzzy.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Borders and Box Decorations 4: 'corner-shape' parametric rendering</title>
+<link rel="help" href="https://drafts.csswg.org/css-borders-4/#corner-shaping">
+<link rel="match" href="corner-shape-any-ref.html">
+<meta name="fuzzy" content="maxDifference=0-200;totalPixels=0-550">
+<meta name="variant" content="?corner-shape=scoop&border-radius=20%&border-width=20px&border-top-color=rebeccapurple&border-bottom-color=blue">
+<meta name="variant" content="?corner-shape=scoop&border-radius=20%&border-width=20px">
+<meta name="variant" content="?corner-top-left-shape=notch&border-radius=40px&border-width=10px&border-color=blue&border-left-color=yellow">
+<meta name="variant" content="?corner-shape=superellipse(-2)&border-radius=20%&border-width=20px">
+<meta name="variant" content="?corner-top-left-shape=bevel&border-radius=40px&border-width=10px">
+<meta name="variant" content="?corner-top-left-shape=scoop&corner-top-right-shape=scoop&border-radius=50%">
+<meta name="variant" content="?corner-shape=squircle&border-radius=25%&border-width=20px">
+<meta name="variant" content="?corner-shape=squircle&border-radius=25%&box-shadow=10px 10px 0 10px black">
+<meta name="variant" content="?corner-shape=squircle&border-radius=50%">
+<meta name="variant" content="?corner-shape=superellipse(-7)&border-radius=20%&border-width=20px">
+<meta name="variant" content="?corner-shape=superellipse(5)&border-radius=20%&border-width=20px">
+<meta name="variant" content="?corner-top-left-shape=bevel&corner-bottom-right-shape=bevel&border-radius=40px&border-width=10px">
+<meta name="variant" content="?corner-top-left-shape=superellipse(-4)&border-radius=40%">
+<meta name="variant" content="?corner-top-left-shape=superellipse(2.5)&border-radius=20%&border-width=10px">
+<meta name="variant" content="?corner-top-right-shape=scoop&border-radius=20%&border-width=10px">
+<meta name="variant" content="?corner-shape=superellipse(0.8)&border-radius=40px&border-width=10px&border-left-color=purple">
+<meta name="variant" content="?corner-shape=superellipse(3)&border-radius=40px&box-shadow=10px 10px 0 10px black">
+<meta name="variant" content="?border-radius=30%&corner-shape=superellipse(-1.5)&box-shadow=10px%2010px%200%2010px%20black">
+<meta name="variant" content="?border-radius=40%&corner-shape=notch&box-shadow=10px%2010px%200%2010px%20yellow">
+<meta name="variant" content="?border-radius=50%&corner-top-left-shape=scoop&corner-bottom-right-shape=scoop&corner-top-right-shape=notch&corner-bottom-left-shape=notch&border-width=10px">
+<meta name="variant" content="?border-radius=50%&corner-top-right-shape=scoop&corner-bottom-left-shape=scoop&corner-top-left-shape=notch&corner-bottom-right-shape=notch&border-width=10px">
+<style>
+  body {
+    margin: 0;
+  }
+  #target {
+    width: 200px;
+    height: 100px;
+    box-sizing: border-box;
+    background: green;
+    border-style: solid;
+    border-color: black;
+    border-width: 0;
+  }
+</style>
+<div id="target"></div>
+<script>
+  const target = document.getElementById("target");
+  const params = new URLSearchParams(location.search);
+  for (const [k, v] of params) {
+    target.style[k] = v;
+  }
+</script>
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-render-precise.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-render-precise.html
new file mode 100644
index 00000000000..5293589222a
--- /dev/null
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-render-precise.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Borders and Box Decorations 4: 'corner-shape' parametric rendering</title>
+<link rel="help" href="https://drafts.csswg.org/css-borders-4/#corner-shaping">
+<link rel="match" href="corner-shape-any-ref.html">
+<meta name="fuzzy" content="maxDifference=0-180;totalPixels=0-350">
+<meta name="variant" content="?corner-shape=squircle&border-top-left-radius=30%">
+<meta name="variant" content="?corner-shape=superellipse(-2)&border-top-left-radius=40%&border-width=20px">
+<meta name="variant" content="?corner-shape=squircle&border-top-right-radius=30px">
+<meta name="variant" content="?corner-shape=square&border-bottom-left-radius=5px">
+<meta name="variant" content="?corner-shape=superellipse(2.3)&border-radius=40%">
+<meta name="variant" content="?corner-shape=superellipse(3)&border-top-right-radius=33px">
+<meta name="variant" content="?corner-top-right-shape=superellipse(-4)&border-top-right-radius=50px">
+<meta name="variant" content="?corner-bottom-right-shape=superellipse(0.8)&border-bottom-right-radius=50%">
+<meta name="variant" content="?corner-top-left-shape=bevel&border-radius=40px">
+<meta name="variant" content="?corner-top-left-shape=scoop&border-radius=40px">
+<meta name="variant" content="?corner-top-left-shape=superellipse(-4)&border-radius=40px">
+<meta name="variant" content="?corner-top-left-shape=superellipse(0.5)&border-radius=40px">
+<meta name="variant" content="?corner-top-left-shape=superellipse(-0.5)&border-radius=40px">
+<meta name="variant" content="?corner-shape=squircle&border-top-left-radius=25%&border-width=10px">
+<meta name="variant" content="?corner-bottom-left-shape=bevel&border-bottom-left-radius=30px">
+<meta name="variant" content="?corner-top-left-shape=bevel&border-width=10px&border-color=black">
+<meta name="variant" content="?corner-top-right-shape=bevel&border-width=10px&border-color=black">
+<meta name="variant" content="?corner-bottom-left-shape=bevel&border-width=10px&border-radius=20px">
+<meta name="variant" content="?corner-bottom-right-shape=bevel&border-width=10px&border-radius=20px">
+<meta name="variant" content="?corner-bottom-right-shape=bevel&corner-bottom-left-shape=bevel">
+<meta name="variant" content="?border-top-left-radius=50%&corner-shape=superellipse(0.7)&border-left-width=30px&border-top-width=30px">
+<meta name="variant" content="?border-radius=50%&corner-shape=bevel&box-shadow=10px%2010px%200%2010px%20black">
+<style>
+  body {
+    margin: 0;
+  }
+  #target {
+    width: 200px;
+    height: 100px;
+    box-sizing: border-box;
+    background: green;
+    border-style: solid;
+    border-color: black;
+    border-width: 0;
+  }
+</style>
+<div id="target"></div>
+<script>
+  const target = document.getElementById("target");
+  const params = new URLSearchParams(location.search);
+  for (const [k, v] of params) {
+    target.style[k] = v;
+  }
+</script>
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-render-ref.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-render-ref.html
deleted file mode 100644
index 1a9043cbc82..00000000000
--- a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-render-ref.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html>
-<head>
-<meta charset="utf-8">
-<title>CSS Borders and Box Decorations 4: 'corner-shape' rendering</title>
-</head>
-<body>
-<canvas width="200" height="200" id="canvas"></canvas>
-<style>
-  canvas {
-    width: 200px;
-    height: 200px;
-  }
-</style>
-<script>
-const canvas = document.getElementById("canvas");
-const params = new URLSearchParams(location.search);
-const style = Object.fromEntries(params.entries());
-const { width, height } = canvas;
-
-// Populate defaults and constraints.
-for (const vSide of ["top", "bottom"]) {
-  for (const hSide of ["left", "right"]) {
-    let shape =
-      style[`corner-${vSide}-${hSide}-shape`] ||
-      style["corner-shape"] ||
-      "round";
-    const hWidth = parseFloat(
-      style[`border-${hSide}-width`] || style["border-width"] || "10px"
-    );
-    const vWidth = parseFloat(
-      style[`border-${vSide}-width`] || style["border-width"] || "10px"
-    );
-    let radius = (
-      style[`border-${vSide}-${hSide}-radius`] ||
-      style["border-radius"] ||
-      "20px"
-    ).match(/[0-9]*(\.[0-9]+)?/)?.[0];
-
-   radius = [
-      Math.min(parseFloat(radius), width / 2),
-      Math.min(parseFloat(radius), height / 2)
-    ];
-    style[`corner-${vSide}-${hSide}-shape`] = shape;
-    style[`border-${vSide}-${hSide}-radius`] = radius;
-    style[`border-${hSide}-width`] = hWidth;
-    style[`border-${vSide}-width`] = vWidth;
-  }
-}
-
-const ctx = canvas.getContext("2d");
-const keywords = {bevel: 1, round: 2};
-// Adjust outer width for curvature
-const outer_width = ["top", "bottom"].flatMap((vSide) =>
-  ["left", "right"].map((hSide) => {
-    const corner = `${vSide}-${hSide}`;
-    let shape = style[`corner-${corner}-shape`];
-    shape = keywords[shape] || shape;
-    const radius = style[`border-${corner}-radius`];
-    const hWidth = style[`border-${hSide}-width`];
-    const vWidth = style[`border-${vSide}-width`];
-    if (shape >= 2.)
-      return radius;
-    if (shape <= 0.5)
-      return [radius[0] - vWidth, radius[1] - hWidth];
-    const offset = Math.sqrt(2. / shape) - 1;
-    return [radius[0] - vWidth * offset, radius[1] - hWidth * offset];
-  })
-);
-let cursor = [];
-function lineTo(x, y) {
-  ctx.lineTo(x, y);
-  cursor = [x, y];
-}
-function moveTo(x, y) {
-  ctx.moveTo(x, y);
-  cursor = [x, y];
-}
-
-function cornerTo(x, y, corner) {
-  if (x == cursor[0] && y === cursor[1]) return;
-  const shape = style[`corner-${corner}-shape`];
-
-  // TODO: add other curves.
-  if (shape === "bevel")
-    lineTo(x, y);
-  else {
-    ctx.arcTo(
-      corner === "top-left" || corner === "bottom-right" ? cursor[0] : x,
-      corner === "top-left" || corner === "bottom-right" ? y : cursor[1],
-      x,
-      y,
-      Math.abs(x - cursor[0])
-    );
-    cursor = [x, y];
-  }
-}
-
-ctx.clearRect(0, 0, width, height);
-ctx.beginPath();
-
-
-moveTo(width - outer_width[1][0], 0);
-cornerTo(width, outer_width[1][1], "top-right");
-lineTo(width, height - outer_width[3][1]);
-cornerTo(width - outer_width[3][0], height, "bottom-right");
-lineTo(outer_width[2][0], height);
-cornerTo(0, height - outer_width[2][1], "bottom-left");
-lineTo(0, outer_width[0][1]);
-cornerTo(outer_width[0][0], 0, "top-left");
-lineTo(width - outer_width[1][0], 0);
-
-// Inner path
-moveTo(
-  Math.max(style["border-top-left-radius"][0], style["border-left-width"]),
-  style["border-top-width"]
-);
-
-lineTo(width - style["border-top-right-radius"][0], style["border-top-width"]);
-cornerTo(
-  width - style["border-right-width"],
-  Math.max(style["border-top-width"], style["border-top-right-radius"][1]),
-  "top-right"
-);
-
-lineTo(
-  width - style["border-right-width"],
-  height -
-    Math.max(
-      style["border-bottom-width"],
-      style["border-bottom-right-radius"][1]
-    )
-);
-
-cornerTo(
-  width -
-    Math.max(
-      style["border-right-width"],
-      style["border-bottom-right-radius"][0]
-    ),
-  height - style["border-bottom-width"],
-  "bottom-right"
-);
-
-lineTo(
-  Math.max(style["border-left-width"], style["border-bottom-left-radius"][0]),
-  height - style["border-bottom-width"]
-);
-
-cornerTo(
-  style["border-left-width"],
-  height -
-    Math.max(style["border-top-width"], style["border-bottom-left-radius"][1]),
-  "bottom-left"
-);
-
-lineTo(
-  style["border-left-width"],
-  Math.max(style["border-top-width"], style["border-top-left-radius"][1])
-);
-cornerTo(
-  Math.max(style["border-left-width"], style["border-top-left-radius"][0]),
-  style["border-top-width"],
-  "top-left"
-);
-
-if ("background-color" in style) {
-  ctx.fillStyle = style["background-color"];
-  ctx.fill("nonzero");
-}
-ctx.fillStyle = "black";
-ctx.fill("evenodd");
-</script>
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-render.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-render.html
deleted file mode 100644
index 6b9acb3447f..00000000000
--- a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-render.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<head>
-<meta charset="utf-8">
-<title>CSS Borders and Box Decorations 4: 'corner-shape' rendering</title>
-<link rel="help" href="https://drafts.csswg.org/css-borders-4/#corner-shaping">
-<link rel="match" href="corner-shape-render-ref.html">
-<meta name="variant" content="?corner-shape=bevel">
-<meta name="variant" content="?corner-top-left-shape=bevel">
-<meta name="variant" content="?corner-top-right-shape=bevel">
-<meta name="variant" content="?corner-bottom-left-shape=bevel">
-<meta name="variant" content="?corner-bottom-right-shape=bevel">
-<meta name="variant" content="?corner-bottom-right-shape=bevel&corner-bottom-left-shape=bevel">
-<meta name="variant" content="?corner-top-left-shape=bevel&border-radius=40px">
-<meta name="variant" content="?corner-top-right-shape=bevel&corner-bottom-right-shape=bevel&border-radius=80px">
-<meta name="variant" content="?corner-top-right-shape=bevel&corner-bottom-right-shape=bevel&border-bottom-right-radius=80px&border-width=32px">
-<meta name="fuzzy" content="maxDifference=0-82;totalPixels=0-800">
-</head>
-<body>
-  <style>
-    #target {
-      width: 200px;
-      height: 200px;
-      border-width: 10px;
-      border-radius: 20px;
-      border-style: solid;
-      box-sizing: border-box;
-    }
-  </style>
-<div id="target"></div>
-<script>
-  const target = document.getElementById("target");
-  const params = new URLSearchParams(location.search);
-  for (const [key, value] of params.entries()) {
-    target.style[key] = value;
-  }
-</script>
-</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-straight-ref.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-square-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-straight-ref.html
rename to tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-square-ref.html
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-square.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-square.html
new file mode 100644
index 00000000000..13ab05cc7f6
--- /dev/null
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-square.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<head>
+<title>CSS Borders and Box Decorations 4: 'corner-shape: square'</title>
+<link rel="match" href="corner-shape-square-ref.html">
+<meta name="fuzzy" content="maxDifference=0-60;totalPixels=0-80">
+<style>
+    .target {
+        background: green;
+        width: 100px;
+        height: 100px;
+        border-radius: 25px;
+        border: 10px solid black;
+        box-sizing: border-box;
+        corner-shape: square superellipse(24) round square;
+    }
+</style>
+<div class=target></div>
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-straight.html b/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-straight.html
deleted file mode 100644
index 04cd37b5a31..00000000000
--- a/tests/wpt/tests/css/css-borders/tentative/corner-shape/corner-shape-straight.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<head>
-<title>CSS Borders and Box Decorations 4: 'corner-shape: straight'</title>
-<link rel="match" href="corner-shape-straight-ref.html">
-<meta name="fuzzy" content="maxDifference=0-32;totalPixels=0-32">
-<style>
-    .target {
-        background: green;
-        width: 100px;
-        height: 100px;
-        border-radius: 25px;
-        border: 10px solid black;
-        box-sizing: border-box;
-        corner-shape: straight superellipse(1200) round straight;
-    }
-</style>
-<div class=target></div>
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/resources/corner-shape.js b/tests/wpt/tests/css/css-borders/tentative/corner-shape/resources/corner-shape.js
index 2aaaf5ed289..4757a43ad05 100644
--- a/tests/wpt/tests/css/css-borders/tentative/corner-shape/resources/corner-shape.js
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/resources/corner-shape.js
@@ -95,6 +95,7 @@ function add_corner(ctx, ax, ay, bx, by, curvature) {
  *  'border-right-width': number,
  *  'border-bottom-width': number,
  *  'border-left-width': number,
+ *  'shadow': { blur: number, offset: [number, number], spread: number, color: string }
  * }} style
  * @param {CanvasRenderingContext2D} ctx
  * @param {number} width
@@ -103,27 +104,58 @@ function add_corner(ctx, ax, ay, bx, by, curvature) {
 function render_rect_with_corner_shapes(style, ctx, width, height) {
   const corner_params = resolve_corner_params(style, width, height);
 
-  function draw_outer_corner(corner, phase = "both", direction) {
+  function draw_outer_corner(corner) {
     const params = corner_params[corner];
-    add_corner(ctx, ...params.outer_rect, params.shape, phase, direction);
+    add_corner(ctx, ...params.outer_rect, params.shape);
   }
 
-  function draw_inner_corner_from_params(params, phase = "both", direction) {
-    add_corner(ctx, ...params.inner_rect, params.shape, phase, direction);
+  function draw_inner_corner_from_params(params) {
+    add_corner(ctx, ...params.inner_rect, params.shape);
   }
 
-  function draw_inner_corner(corner, phase = "both", direction) {
-    draw_inner_corner_from_params(corner_params[corner], phase, direction);
+  function draw_inner_corner(corner) {
+    draw_inner_corner_from_params(corner_params[corner]);
   }
 
-  ctx.beginPath();
+  function draw_shadow() {
+    if (!style.shadow || !style.shadow.length) {
+      return;
+    }
 
-  draw_outer_corner("top-right");
-  draw_outer_corner("bottom-right");
-  draw_outer_corner("bottom-left");
-  draw_outer_corner("top-left");
-  ctx.closePath();
-  ctx.clip("nonzero");
+    for (const {spread, offset, color} of style.shadow) {
+      const params = resolve_corner_params(style, width, height, spread);
+      ctx.save();
+      ctx.translate(...offset);
+      ctx.beginPath();
+      ctx.lineTo(params['top-right'].inner_rect[0], params['top-right'].inner_rect[1]);
+      draw_inner_corner_from_params(params['top-right']);
+      ctx.lineTo(params['top-right'].inner_rect[2], params['top-right'].inner_rect[3])
+      ctx.lineTo(params['bottom-right'].inner_rect[0], params['bottom-right'].inner_rect[1])
+      draw_inner_corner_from_params(params['bottom-right']);
+      ctx.lineTo(params['bottom-right'].inner_rect[2], params['bottom-right'].inner_rect[3]);
+      ctx.lineTo(params['bottom-left'].inner_rect[0], params['bottom-left'].inner_rect[1]);
+      draw_inner_corner_from_params(params['bottom-left']);
+      ctx.lineTo(params['bottom-left'].inner_rect[2], params['bottom-left'].inner_rect[3])
+      ctx.lineTo(params['top-left'].inner_rect[0], params['top-left'].inner_rect[1])
+      draw_inner_corner_from_params(params['top-left']);
+      ctx.lineTo(params['top-left'].inner_rect[2], params['top-left'].inner_rect[3]);
+      ctx.lineTo(params['top-right'].inner_rect[0], params['top-right'].inner_rect[1]);
+      ctx.fillStyle = color;
+      ctx.closePath();
+      ctx.fill("nonzero");
+      ctx.restore();
+    }
+  }
+
+  function draw_outer_path() {
+    ctx.beginPath();
+    draw_outer_corner("top-right");
+    draw_outer_corner("bottom-right");
+    draw_outer_corner("bottom-left");
+    draw_outer_corner("top-left");
+    ctx.closePath();
+    ctx.fill("nonzero");
+  }
 
   const inner_rect = [
     style["border-left-width"],
@@ -131,6 +163,72 @@ function render_rect_with_corner_shapes(style, ctx, width, height) {
     width - style["border-right-width"],
     height - style["border-bottom-width"],
   ];
+
+  draw_shadow();
+  {
+    ctx.save();
+    ctx.beginPath();
+    ctx.moveTo(0, 0);
+    ctx.lineTo(corner_params['top-left'].inner_rect[2], corner_params['top-left'].inner_rect[1])
+    ctx.lineTo(corner_params['top-left'].inner_rect[2], inner_rect[1]);
+    ctx.lineTo(corner_params['top-right'].inner_rect[0], inner_rect[1]);
+    ctx.lineTo(corner_params['top-right'].inner_rect[0], corner_params['top-right'].inner_rect[3]);
+    ctx.lineTo(width, 0);
+    ctx.closePath();
+    ctx.clip();
+    ctx.fillStyle = style['border-top-color'];
+    draw_outer_path();
+    ctx.restore();
+  }
+
+  {
+    ctx.save();
+    ctx.beginPath();
+    ctx.moveTo(width, 0);
+    ctx.lineTo(corner_params['top-right'].inner_rect[0], corner_params['top-right'].inner_rect[3]);
+    ctx.lineTo(inner_rect[2], corner_params['top-right'].inner_rect[3]);
+    ctx.lineTo(inner_rect[2], corner_params['bottom-right'].inner_rect[1]);
+    ctx.lineTo(corner_params['bottom-right'].inner_rect[2], corner_params['bottom-right'].inner_rect[1]);
+    ctx.lineTo(width, height);
+    ctx.closePath();
+    ctx.clip();
+    ctx.fillStyle = style['border-right-color'];
+    draw_outer_path();
+    ctx.restore();
+  }
+
+  {
+    ctx.save();
+    ctx.beginPath();
+    ctx.lineTo(width, height);
+    ctx.lineTo(corner_params['bottom-right'].inner_rect[2], corner_params['bottom-right'].inner_rect[1]);
+    ctx.lineTo(corner_params['bottom-right'].inner_rect[2], inner_rect[3]);
+    ctx.lineTo(corner_params['bottom-left'].inner_rect[0], inner_rect[3]);
+    ctx.lineTo(corner_params['bottom-left'].inner_rect[0], corner_params['bottom-left'].inner_rect[3]);
+    ctx.lineTo(0, height);
+    ctx.closePath();
+    ctx.clip();
+    ctx.fillStyle = style['border-bottom-color'];
+    draw_outer_path();
+    ctx.restore();
+  }
+
+  {
+    ctx.save();
+    ctx.beginPath();
+    ctx.lineTo(0, height);
+    ctx.lineTo(corner_params['bottom-left'].inner_rect[0], corner_params['bottom-left'].inner_rect[3]);
+    ctx.lineTo(inner_rect[0], corner_params['bottom-left'].inner_rect[3]);
+    ctx.lineTo(inner_rect[0], corner_params['top-left'].inner_rect[1]);
+    ctx.lineTo(corner_params['top-left'].inner_rect[2], corner_params['top-left'].inner_rect[1])
+    ctx.lineTo(0, 0);
+    ctx.closePath();
+    ctx.clip();
+    ctx.fillStyle = style['border-left-color'];
+    draw_outer_path();
+    ctx.restore();
+  }
+
   ctx.save();
   ctx.beginPath();
   draw_inner_corner("top-right");
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/resources/corner-utils.js b/tests/wpt/tests/css/css-borders/tentative/corner-shape/resources/corner-utils.js
index 39203aefc67..ad3b235addf 100644
--- a/tests/wpt/tests/css/css-borders/tentative/corner-shape/resources/corner-utils.js
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/resources/corner-utils.js
@@ -7,8 +7,9 @@ function offset_for_curvature(curvature) {
   // Find the superellipse's control point.
   // we do that by approximating the superellipse as a quadratic
   // curve that has the same point at t = 0.5.
-  if (curvature <= 0.001) return [1, -1];
-  const { x } = superellipse(curvature);
+  if (curvature <= 0.001)
+    return [1, -1];
+  const {x} = superellipse(Math.min(2, Math.max(0.5, curvature)));
   const [a, b] = [x, 1 - x].map((m) => 2 * m - 0.5);
   const magnitude = Math.hypot(a, b);
   // Normalize a & b
@@ -91,36 +92,53 @@ function resolve_corner_params(style, width, height, outset = null) {
   };
 
   return Object.fromEntries(
-    Object.entries(params).map(([corner, { outer, inset }]) => {
-      if (outset !== null) inset = [-outset, -outset];
-      const shape = style[`corner-${corner}-shape`];
-      const s1 = Math.sign(outer[2] - outer[0]);
-      const s2 = Math.sign(outer[3] - outer[1]);
-      const [sw1, sw2] = inset;
-      const inner_offset = [s1 * sw1, s2 * sw1, -s1 * sw2, -s2 * sw2];
+      Object.entries(params).map(([corner, {outer, inset}]) => {
+        const outer_rect = outer;
+        const shape = style[`corner-${corner}-shape`];
+        const s1 = Math.sign(outer[2] - outer[0]);
+        const s2 = Math.sign(outer[3] - outer[1]);
+        const [sw1, sw2] = inset;
+        const inner_offset = [s1 * sw1, s2 * sw1, -s1 * sw2, -s2 * sw2];
 
-      const offset = offset_for_curvature(shape);
-      if (Math.sign(inner_offset[0]) === Math.sign(inner_offset[1])) {
-        offset.reverse();
-      }
+        const offset = offset_for_curvature(shape);
+        if (Math.sign(inner_offset[0]) === Math.sign(inner_offset[1])) {
+          offset.reverse();
+        }
 
-      const inner_rect = [
-        outer[0] + inner_offset[0] * offset[0],
-        outer[1] + inner_offset[1] * offset[1],
-        outer[2] + inner_offset[2] * offset[1],
-        outer[3] + inner_offset[3] * offset[0],
-      ];
+        let inner_rect = [
+          outer_rect[0] + inner_offset[0] * offset[0],
+          outer_rect[1] + inner_offset[1] * offset[1],
+          outer_rect[2] + inner_offset[2] * offset[1],
+          outer_rect[3] + inner_offset[3] * offset[0],
+        ];
 
-      return [
-        corner,
-        {
-          outer_rect: outer,
-          shape,
-          inset,
-          inner_rect,
-          inner_offset,
-        },
-      ];
-    })
-  );
+        let inner_shape = shape;
+        if (outset) {
+          const new_width = width + outset * 2;
+          const new_height = height + outset * 2;
+          inner_rect = [
+            (outer_rect[0] / width) * new_width - outset,
+            (outer_rect[1] / height) * new_height - outset,
+            (outer_rect[2] / width) * new_width - outset,
+            (outer_rect[3] / height) * new_height - outset
+          ]
+        } else if (shape > 2 || shape < 0.5) {
+          const outer_length = Math.hypot(
+            outer_rect[2] - outer_rect[0], outer_rect[3] - outer_rect[1]);
+          const inner_length = Math.hypot(
+            inner_rect[2] - inner_rect[0], inner_rect[3] - inner_rect[1])
+        }
+
+        return [
+          corner,
+          {
+            outer_rect,
+            shape,
+            inner_shape,
+            inset,
+            inner_rect,
+            inner_offset,
+          },
+        ];
+      }));
 }
diff --git a/tests/wpt/tests/css/css-borders/tentative/corner-shape/resources/resolve-corner-style.js b/tests/wpt/tests/css/css-borders/tentative/corner-shape/resources/resolve-corner-style.js
index ea065f577e0..a890c57b868 100644
--- a/tests/wpt/tests/css/css-borders/tentative/corner-shape/resources/resolve-corner-style.js
+++ b/tests/wpt/tests/css/css-borders/tentative/corner-shape/resources/resolve-corner-style.js
@@ -3,28 +3,33 @@
 // found in the LICENSE file.
 
 const keywords = {
-  notch: 0,
-  scoop: 0.5,
-  bevel: 1,
-  round: 2,
-  squircle: 4,
-  straight: 1000,
+  notch: -16,
+  scoop: -1,
+  bevel: 0,
+  round: 1,
+  squircle: 2,
+  square: 16,
 };
 
 function resolve_corner_style(style, w, h) {
   ['top', 'bottom'].forEach((vSide) => ['left', 'right'].forEach((hSide) => {
-    let shape = style[`corner-${vSide}-${hSide}-shape`] ||
+    let shape_param = style[`corner-${vSide}-${hSide}-shape`] ||
         style['corner-shape'] || 'round';
-    const match = shape.match(/superellipse\((\.?[0-9]+(.[0-9]+)?)\)/);
-    shape = match ? +match[1] : keywords[shape];
-    const hWidth = style[`border-${hSide}-width`] || style['border-width'] || 0;
-    const vWidth = style[`border-${vSide}-width`] || style['border-width'] || 0;
+    const match = shape_param.match(/superellipse\((-?(infinity|[0-9]*(\.[0-9]+)?))\)/i);
+    shape_param = match ? match[1] : keywords[shape_param];
+    const hWidth = parseFloat(style[`border-${hSide}-width`] || style['border-width'] || 0);
+    const vWidth = parseFloat(style[`border-${vSide}-width`] || style['border-width'] || 0);
     let radius =
         style[`border-${vSide}-${hSide}-radius`] || style['border-radius'] || 0;
     if (!Array.isArray(radius))
       radius = [radius, radius];
-    if (shape > 1000)
+    let shape = 0;
+    if (shape_param >= keywords["square"] || shape_param == "infinity")
       shape = 1000;
+    else if (shape_param <= keywords["notch"] || shape_param == "-infinity")
+      shape = 0;
+    else
+     shape = Math.pow(2, shape_param);
     if (String(radius[0]).endsWith('%'))
       radius[0] = (parseFloat(radius[0]) * w) / 100;
     if (String(radius[1]).endsWith('%'))
@@ -34,6 +39,18 @@ function resolve_corner_style(style, w, h) {
     style[`border-${vSide}-${hSide}-radius`] = radius;
     style[`border-${hSide}-width`] = hWidth;
     style[`border-${vSide}-width`] = vWidth;
+    style[`border-${hSide}-color`] = style[`border-${hSide}-color`] || style[`border-color`];
+    style[`border-${vSide}-color`] = style[`border-${vSide}-color`] || style[`border-color`];
+    if ('box-shadow' in style) {
+      const shadows = style['box-shadow'].split(",");
+      style.shadow = [];
+      const boxShadowRegex = /(?:(-?\d+(?:\.\d+)?)px)\s+(?:(-?\d+(?:\.\d+)?)px)\s+(?:(-?\d+(?:\.\d+)?)(?:px)?)?(?:\s+(?:(-?\d+(?:\.\d+)?)px))?\s+([^\$\s]*(\s+inset)?)/i;
+      for (const shadow of shadows.toReversed()) {
+        const parsed = shadow.match(boxShadowRegex)
+        if (parsed)
+          style.shadow.push({offset: [parseFloat(parsed[1]), parseFloat(parsed[2])], blur: parsed[3], spread: parsed[4], color: parsed[5] || "black", inset: !!parsed[6] });
+      }
+    }
   }));
   return style;
 }
diff --git a/tests/wpt/tests/css/css-borders/tentative/parsing/corner-shape-computed.html b/tests/wpt/tests/css/css-borders/tentative/parsing/corner-shape-computed.html
index 1d084e23397..e1b458fd06e 100644
--- a/tests/wpt/tests/css/css-borders/tentative/parsing/corner-shape-computed.html
+++ b/tests/wpt/tests/css/css-borders/tentative/parsing/corner-shape-computed.html
@@ -15,12 +15,12 @@ test_computed_value("corner-top-left-shape", "round");
 test_computed_value("corner-top-left-shape", "scoop");
 test_computed_value("corner-top-left-shape", "superellipse(5)");
 test_computed_value("corner-top-left-shape", "superellipse(0.2)");
-test_computed_value("corner-top-left-shape", "superellipse(0)", "notch");
-test_computed_value("corner-top-left-shape", "superellipse(infinity)", "straight");
-test_computed_value("corner-top-left-shape", "superellipse(2)", "round");
-test_computed_value("corner-top-left-shape", "superellipse(1)", "bevel");
-test_computed_value("corner-top-left-shape", "superellipse(4)", "squircle");
-test_computed_value("corner-top-left-shape", "superellipse( .5)", "scoop");
+test_computed_value("corner-top-left-shape", "superellipse(-infinity)", "notch");
+test_computed_value("corner-top-left-shape", "superellipse(infinity)", "square");
+test_computed_value("corner-top-left-shape", "superellipse(1)", "round");
+test_computed_value("corner-top-left-shape", "superellipse(0)", "bevel");
+test_computed_value("corner-top-left-shape", "superellipse(2)", "squircle");
+test_computed_value("corner-top-left-shape", "superellipse( -1)", "scoop");
 test_computed_value("corner-top-right-shape", "round");
 test_computed_value("corner-top-right-shape", "superellipse(5)");
 test_computed_value("corner-bottom-right-shape", "scoop");
@@ -28,14 +28,14 @@ test_computed_value("corner-bottom-left-shape", "superellipse(5)");
 test_computed_value("corner-shape", "superellipse(5) round");
 test_computed_value("corner-shape", "round");
 test_computed_value("corner-shape", "bevel superellipse(0.1) round squircle");
-test_computed_value("corner-shape", "superellipse(0.1) superellipse(3) superellipse(7) superellipse(0.1)");
+test_computed_value("corner-shape", "superellipse(-5) superellipse(3) superellipse(7) superellipse(-5.5)");
 test_computed_value("corner-shape", "round round round round", "round");
 test_computed_value("corner-shape", "round scoop");
 test_computed_value("corner-shape", "round scoop round scoop", "round scoop");
-test_computed_value("corner-shape", "bevel superellipse(2)", "bevel round");
-test_computed_value("corner-shape", "superellipse(0.5) superellipse(3) straight", "scoop superellipse(3) straight");
-test_computed_value("corner-shape", "superellipse(0.5) superellipse(3) superellipse(1)", "scoop superellipse(3) bevel");
-test_computed_value("corner-shape", "bevel superellipse(2) squircle     round", "bevel round squircle");
-test_computed_value("corner-shape", "superellipse(0.5) superellipse(3) superellipse(1) superellipse(infinity)", "scoop superellipse(3) bevel straight");
+test_computed_value("corner-shape", "bevel superellipse(1)", "bevel round");
+test_computed_value("corner-shape", "superellipse(-1) superellipse(3) square", "scoop superellipse(3) square");
+test_computed_value("corner-shape", "superellipse(-1) superellipse(3) superellipse(0)", "scoop superellipse(3) bevel");
+test_computed_value("corner-shape", "bevel superellipse(1) squircle     round", "bevel round squircle");
+test_computed_value("corner-shape", "superellipse(-1) superellipse(3) superellipse(0) superellipse(infinity)", "scoop superellipse(3) bevel square");
 
 </script>
diff --git a/tests/wpt/tests/css/css-borders/tentative/parsing/corner-shape-invalid.html b/tests/wpt/tests/css/css-borders/tentative/parsing/corner-shape-invalid.html
index 582617a634a..6aee773f4a4 100644
--- a/tests/wpt/tests/css/css-borders/tentative/parsing/corner-shape-invalid.html
+++ b/tests/wpt/tests/css/css-borders/tentative/parsing/corner-shape-invalid.html
@@ -17,6 +17,8 @@ test_invalid_value("corner-shape", "round round round round round");
 test_invalid_value("corner-shape", "superellipse(8 8)");
 test_invalid_value("corner-shape", "superellipse(,)");
 test_invalid_value("corner-shape", "superellipse(4,0.1)");
+test_invalid_value("corner-shape", "straight");
+test_invalid_value("corner-shape", "nonsense");
 test_invalid_value("corner-shape", "superellipse(foo)");
 test_invalid_value("corner-shape", "superellipse(1 abc)");
 test_invalid_value("corner-shape", "superellipse(1) / bevel");
diff --git a/tests/wpt/tests/css/css-borders/tentative/parsing/corner-shape-valid.html b/tests/wpt/tests/css/css-borders/tentative/parsing/corner-shape-valid.html
index 32aaa89fc5b..0ad14c81a74 100644
--- a/tests/wpt/tests/css/css-borders/tentative/parsing/corner-shape-valid.html
+++ b/tests/wpt/tests/css/css-borders/tentative/parsing/corner-shape-valid.html
@@ -15,7 +15,7 @@
         test_valid_value(prop, "notch");
         test_valid_value(prop, "bevel");
         test_valid_value(prop, "squircle");
-        test_valid_value(prop, "straight");
+        test_valid_value(prop, "square");
         test_valid_value(prop, "superellipse(2)");
         test_valid_value(prop, "superellipse(.5)", "superellipse(0.5)");
         test_valid_value(prop, "superellipse(7)");
@@ -23,6 +23,9 @@
         test_valid_value(prop, "superellipse(  0)", "superellipse(0)");
         test_valid_value(prop, "superellipse(2 )", "superellipse(2)");
         test_valid_value(prop, "superellipse(infinity)");
+        test_valid_value(prop, "superellipse(-infinity)");
+        test_valid_value(prop, "superellipse(-0.5)");
+        test_valid_value(prop, "superellipse(-4)");
         test_valid_value(prop, "superellipse(calc(0.5 * 4))", "superellipse(calc(2))");
     }
 
@@ -40,7 +43,8 @@
     test_valid_value("corner-shape", "round scoop");
     test_valid_value("corner-shape", "round scoop round scoop", "round scoop");
     test_valid_value("corner-shape", "bevel superellipse(2)");
-    test_valid_value("corner-shape", "superellipse(0.5) superellipse(3) straight");
+    test_valid_value("corner-shape", "superellipse(0.5) superellipse(3) square");
+    test_valid_value("corner-shape", "superellipse(-0.5) superellipse(3) square superellipse(-30)");
     test_valid_value("corner-shape", "superellipse(0.5) superellipse(3) superellipse(1)");
     test_valid_value("corner-shape", "bevel superellipse(2) squircle     round", "bevel superellipse(2) squircle round");
     test_valid_value("corner-shape", "superellipse(0.5) superellipse(3) superellipse(1) superellipse(infinity)");
diff --git a/tests/wpt/tests/css/css-box/parsing/margin-trim-computed.html b/tests/wpt/tests/css/css-box/parsing/margin-trim-computed.html
index ad2d17f2ef0..c38adea9a68 100644
--- a/tests/wpt/tests/css/css-box/parsing/margin-trim-computed.html
+++ b/tests/wpt/tests/css/css-box/parsing/margin-trim-computed.html
@@ -27,8 +27,13 @@ test_computed_value("margin-trim", "inline-start block-start", "block-start inli
 test_computed_value("margin-trim", "inline-end block-start", "block-start inline-end");
 test_computed_value("margin-trim", "inline-end block-end", "block-end inline-end");
 test_computed_value("margin-trim", "block-start block-end inline-start", "block-start inline-start block-end");
-test_computed_value("margin-trim", "inline-start block-start inline-end block-end", "block-start inline-start block-end inline-end");
-test_computed_value("margin-trim", "inline-start inline-end block-start", "block-start inline-start inline-end");
+
+test_computed_value("margin-trim", "block-start inline-start block-end inline-end", "block inline");
+test_computed_value("margin-trim", "block-start block-end inline-end inline-start", "block inline");
+test_computed_value("margin-trim", "block-start block-end inline-start inline-end", "block inline");
+test_computed_value("margin-trim", "inline-start block-end block-start inline-end", "block inline");
+test_computed_value("margin-trim", "inline-start inline-end block-start block-end", "block inline");
+test_computed_value("margin-trim", "inline-end block-end inline-start block-start", "block inline");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-box/parsing/margin-trim.html b/tests/wpt/tests/css/css-box/parsing/margin-trim.html
index 0d92f80b9b9..e8679f9cbf3 100644
--- a/tests/wpt/tests/css/css-box/parsing/margin-trim.html
+++ b/tests/wpt/tests/css/css-box/parsing/margin-trim.html
@@ -21,6 +21,9 @@ test_valid_value("margin-trim", "block-end");
 test_valid_value("margin-trim", "inline-start");
 test_valid_value("margin-trim", "inline-end");
 
+test_valid_value("margin-trim", "block inline");
+test_valid_value("margin-trim", "inline block");
+
 // Serialize values into either block or inline
 test_valid_value("margin-trim", "block-start block-end", "block");
 test_valid_value("margin-trim", "inline-start inline-end", "inline");
@@ -29,10 +32,15 @@ test_valid_value("margin-trim", "inline-end inline-start", "inline");
 test_valid_value("margin-trim", "inline-start block-start");
 
 test_valid_value("margin-trim", "inline-end block-start block-end");
-test_valid_value("margin-trim", "block-start inline-start block-end inline-end");
-test_valid_value("margin-trim", "inline-end block-end inline-start block-start");
 
-test_invalid_value("margin-trim", "block inline");
+// Serialize 4 values into "block inline"
+test_valid_value("margin-trim", "block-start inline-start block-end inline-end", "block inline");
+test_valid_value("margin-trim", "block-start block-end inline-end inline-start", "block inline");
+test_valid_value("margin-trim", "block-start block-end inline-start inline-end", "block inline");
+test_valid_value("margin-trim", "inline-start block-end block-start inline-end", "block inline");
+test_valid_value("margin-trim", "inline-start inline-end block-start block-end", "block inline");
+test_valid_value("margin-trim", "inline-end block-end inline-start block-start", "block inline");
+
 test_invalid_value("margin-trim", "block block");
 test_invalid_value("margin-trim", "inline inline");
 test_invalid_value("margin-trim", "block inline-start inline-end");
diff --git a/tests/wpt/tests/css/css-break/block-001-wm-vlr-print.html b/tests/wpt/tests/css/css-break/block-001-wm-vlr-print.html
index 6cd5ea07c7b..bfb48428dd5 100644
--- a/tests/wpt/tests/css/css-break/block-001-wm-vlr-print.html
+++ b/tests/wpt/tests/css/css-break/block-001-wm-vlr-print.html
@@ -11,6 +11,10 @@
   margin: 0.5in;
 }
 
+:root {
+  print-color-adjust: exact;
+}
+
 html,body {
   color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
   writing-mode: vertical-lr;
diff --git a/tests/wpt/tests/css/css-break/block-001-wm-vrl-print.html b/tests/wpt/tests/css/css-break/block-001-wm-vrl-print.html
index 6e073121c6a..60ee504dd77 100644
--- a/tests/wpt/tests/css/css-break/block-001-wm-vrl-print.html
+++ b/tests/wpt/tests/css/css-break/block-001-wm-vrl-print.html
@@ -11,6 +11,10 @@
   margin: 0.5in;
 }
 
+:root {
+  print-color-adjust: exact;
+}
+
 html,body {
   color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
   writing-mode: vertical-rl;
diff --git a/tests/wpt/tests/css/css-break/block-002-wm-vlr-print.html b/tests/wpt/tests/css/css-break/block-002-wm-vlr-print.html
index 99949623c39..d427242dc40 100644
--- a/tests/wpt/tests/css/css-break/block-002-wm-vlr-print.html
+++ b/tests/wpt/tests/css/css-break/block-002-wm-vlr-print.html
@@ -11,6 +11,10 @@
   margin: 0.5in;
 }
 
+:root {
+  print-color-adjust: exact;
+}
+
 html,body {
   color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
   writing-mode: vertical-lr;
diff --git a/tests/wpt/tests/css/css-break/block-002-wm-vrl-print.html b/tests/wpt/tests/css/css-break/block-002-wm-vrl-print.html
index 084b5325b7a..0ca2b73012f 100644
--- a/tests/wpt/tests/css/css-break/block-002-wm-vrl-print.html
+++ b/tests/wpt/tests/css/css-break/block-002-wm-vrl-print.html
@@ -11,6 +11,10 @@
   margin: 0.5in;
 }
 
+:root {
+  print-color-adjust: exact;
+}
+
 html,body {
   color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
   writing-mode: vertical-rl;
diff --git a/tests/wpt/tests/css/css-break/break-inside-avoid-multicol-001-print-ref.html b/tests/wpt/tests/css/css-break/break-inside-avoid-multicol-001-print-ref.html
index baf114d35c9..0e6f2500d92 100644
--- a/tests/wpt/tests/css/css-break/break-inside-avoid-multicol-001-print-ref.html
+++ b/tests/wpt/tests/css/css-break/break-inside-avoid-multicol-001-print-ref.html
@@ -10,6 +10,9 @@
     size: 5in 3in;
     margin: 0.5in;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-break/break-inside-avoid-multicol-001-print.html b/tests/wpt/tests/css/css-break/break-inside-avoid-multicol-001-print.html
index a97ac9f5cda..0398110fe3d 100644
--- a/tests/wpt/tests/css/css-break/break-inside-avoid-multicol-001-print.html
+++ b/tests/wpt/tests/css/css-break/break-inside-avoid-multicol-001-print.html
@@ -13,6 +13,9 @@
     size: 5in 3in;
     margin: 0.5in;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-break/break-nested-float-in-table-001-print-ref.html b/tests/wpt/tests/css/css-break/break-nested-float-in-table-001-print-ref.html
index 3459e25edd6..ffd4196708f 100644
--- a/tests/wpt/tests/css/css-break/break-nested-float-in-table-001-print-ref.html
+++ b/tests/wpt/tests/css/css-break/break-nested-float-in-table-001-print-ref.html
@@ -10,6 +10,10 @@
   <style>
   @page { size:5in 3in; margin:0.5in; }
 
+  :root {
+    print-color-adjust: exact;
+  }
+
   html, body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-break/break-nested-float-in-table-001-print.html b/tests/wpt/tests/css/css-break/break-nested-float-in-table-001-print.html
index e4e0a578e9a..320f28687a7 100644
--- a/tests/wpt/tests/css/css-break/break-nested-float-in-table-001-print.html
+++ b/tests/wpt/tests/css/css-break/break-nested-float-in-table-001-print.html
@@ -13,6 +13,9 @@
   <style>
   @page { size:5in 3in; margin:0.5in; }
 
+  :root {
+    print-color-adjust: exact;
+  }
   html, body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print-ref.html
index 4eeea8dcb59..a1fd5f401e8 100644
--- a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print-ref.html
+++ b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print-ref.html
@@ -6,6 +6,11 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+
+  :root {
+    print-color-adjust: exact;
+  }
+
   body { margin: 0; }
 
   .flexbox {
diff --git a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print.html
index 1225792abac..aa83978be20 100644
--- a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print.html
+++ b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print.html
@@ -8,6 +8,9 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 
   .flexbox {
diff --git a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print-ref.html
index bc659553edd..2ea14e37d1e 100644
--- a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print-ref.html
+++ b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print-ref.html
@@ -6,6 +6,11 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+
+  :root {
+    print-color-adjust: exact;
+  }
+
   body { margin: 0; }
 
   .flexbox {
diff --git a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print.html
index 969c3a3010b..67f52d85d64 100644
--- a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print.html
+++ b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print.html
@@ -8,6 +8,11 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+
+  :root {
+    print-color-adjust: exact;
+  }
+
   body { margin: 0; }
 
   .flexbox {
diff --git a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print-ref.html
index 65b68b27e5f..fb211111e51 100644
--- a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print-ref.html
+++ b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print-ref.html
@@ -6,6 +6,11 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+
+  :root {
+    print-color-adjust: exact;
+  }
+
   body { margin: 0; }
 
   .flexbox {
diff --git a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print.html
index f1f3c79377b..92ecefb3f47 100644
--- a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print.html
+++ b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print.html
@@ -10,6 +10,11 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+
+  :root {
+    print-color-adjust: exact;
+  }
+
   body { margin: 0; }
 
   .flexbox {
diff --git a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print-ref.html
index a14e3ed0162..454c5973b01 100644
--- a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print-ref.html
+++ b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print-ref.html
@@ -6,6 +6,11 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+
+  :root {
+    print-color-adjust: exact;
+  }
+
   body { margin: 0; }
 
   .flexbox {
diff --git a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print.html
index a6caab736b5..74c74262445 100644
--- a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print.html
+++ b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print.html
@@ -10,6 +10,11 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+
+  :root {
+    print-color-adjust: exact;
+  }
+
   body { margin: 0; }
 
   .flexbox {
diff --git a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-080-print-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-080-print-ref.html
index de6bd49c922..127ac1730fb 100644
--- a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-080-print-ref.html
+++ b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-080-print-ref.html
@@ -8,6 +8,11 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+
+  :root {
+    print-color-adjust: exact;
+  }
+
   body { margin: 0; }
 
   .flexbox {
diff --git a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-080-print.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-080-print.html
index 4fd577cc421..31fd4a25113 100644
--- a/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-080-print.html
+++ b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-080-print.html
@@ -10,6 +10,11 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+
+  :root {
+    print-color-adjust: exact;
+  }
+
   body { margin: 0; }
 
   .flexbox {
diff --git a/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print-ref.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print-ref.html
index 56c38817e42..88ab65eda66 100644
--- a/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print-ref.html
+++ b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print-ref.html
@@ -6,6 +6,11 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+
+  :root {
+    print-color-adjust: exact;
+  }
+
   body { margin: 0; }
 
   .flexbox {
diff --git a/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print.html
index 15890801979..ea1f2d690e1 100644
--- a/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print.html
+++ b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print.html
@@ -8,6 +8,11 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+
+  :root {
+    print-color-adjust: exact;
+  }
+
   body { margin: 0; }
 
   .flexbox {
diff --git a/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-065-print-ref.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-065-print-ref.html
index 07d0c637667..86746d05c25 100644
--- a/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-065-print-ref.html
+++ b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-065-print-ref.html
@@ -8,6 +8,9 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-065-print.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-065-print.html
index 14a5dc6ac0c..99997a6e4e9 100644
--- a/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-065-print.html
+++ b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-065-print.html
@@ -10,6 +10,11 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+
+  :root {
+    print-color-adjust: exact;
+  }
+
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print-ref.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print-ref.html
index 5f65fbaf687..80d3923e233 100644
--- a/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print-ref.html
+++ b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print-ref.html
@@ -6,6 +6,11 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+
+  :root {
+    print-color-adjust: exact;
+  }
+
   body { margin: 0; }
 
   .flexbox {
diff --git a/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print.html
index f8a2934ac5a..6762604e534 100644
--- a/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print.html
+++ b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print.html
@@ -8,6 +8,11 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+
+  :root {
+    print-color-adjust: exact;
+  }
+
   body { margin: 0; }
 
   .flexbox {
diff --git a/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-045-print-ref.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-045-print-ref.html
index 07d0c637667..86746d05c25 100644
--- a/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-045-print-ref.html
+++ b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-045-print-ref.html
@@ -8,6 +8,9 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-045-print.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-045-print.html
index f51d0d161f8..c6da1a7e4e0 100644
--- a/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-045-print.html
+++ b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-045-print.html
@@ -10,6 +10,9 @@
 
   <style>
   @page { size: 5in 3in; margin: 0.5in; }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print-ref.html b/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print-ref.html
index dd78a266f42..e48009315de 100644
--- a/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print-ref.html
+++ b/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print-ref.html
@@ -8,6 +8,10 @@
 <style>
 @page { size:5in 3in; margin:0.5in; }
 
+:root {
+  print-color-adjust: exact;
+}
+
 html, body {
   margin: 0;
   font: 20px/1 Ahem;
diff --git a/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print.html b/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print.html
index cd1026faf64..94517e917ca 100644
--- a/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print.html
+++ b/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print.html
@@ -11,6 +11,10 @@
 <style>
 @page { size:5in 3in; margin:0.5in; }
 
+:root {
+  print-color-adjust: exact;
+}
+
 html, body {
   margin: 0;
   font: 20px/1 Ahem;
diff --git a/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print-ref.html b/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print-ref.html
index cb1701418d0..205e73b6b8b 100644
--- a/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print-ref.html
+++ b/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print-ref.html
@@ -7,6 +7,10 @@
 <style>
 @page { size:5in 3in; margin:0.5in; }
 
+:root {
+  print-color-adjust: exact;
+}
+
 html, body {
   margin: 0;
 }
diff --git a/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print.html b/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print.html
index e2c6b7711ae..9692dde778d 100644
--- a/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print.html
+++ b/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print.html
@@ -10,6 +10,10 @@
 <style>
 @page { size:5in 3in; margin:0.5in; }
 
+:root {
+  print-color-adjust: exact;
+}
+
 html, body {
   margin: 0;
 }
diff --git a/tests/wpt/tests/css/css-break/grid/monolithic-overflow-print-ref.html b/tests/wpt/tests/css/css-break/grid/monolithic-overflow-print-ref.html
index 58cc0828d2c..d4b5629d243 100644
--- a/tests/wpt/tests/css/css-break/grid/monolithic-overflow-print-ref.html
+++ b/tests/wpt/tests/css/css-break/grid/monolithic-overflow-print-ref.html
@@ -1,5 +1,10 @@
 <!DOCTYPE html>
 <link rel="author" title="Psychpsyo" href="mailto:psychpsyo@gmail.com" />
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <p style="height: 50vh">Test passes if there is two purple rectangles at the start of both page 2 and 3 when printing the page (Ctrl+P, with "print backgrounds" enabled).</p>
 <div style="display:grid; grid-template-columns:1fr 1fr; break-before:page;">
   <div style="contain:size; height:75vh;">
diff --git a/tests/wpt/tests/css/css-break/grid/monolithic-overflow-print.html b/tests/wpt/tests/css/css-break/grid/monolithic-overflow-print.html
index 9b174caf96c..11ce95a34e7 100644
--- a/tests/wpt/tests/css/css-break/grid/monolithic-overflow-print.html
+++ b/tests/wpt/tests/css/css-break/grid/monolithic-overflow-print.html
@@ -2,6 +2,11 @@
 <link rel="author" title="Psychpsyo" href="mailto:psychpsyo@gmail.com">
 <link rel="help" href="https://issues.chromium.org/issues/327643792">
 <link rel="match" href="./monolithic-overflow-print-ref.html">
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <p style="height: 50vh">Test passes if there is two purple rectangles at the start of both page 2 and 3 when printing the page (Ctrl+P, with "print backgrounds" enabled).</p>
 <div style="display:grid; grid-template-columns:1fr 1fr;">
   <div style="contain:size; height:75vh;">
diff --git a/tests/wpt/tests/css/css-break/ink-overflow-001-print.html b/tests/wpt/tests/css/css-break/ink-overflow-001-print.html
index 495153d3d42..7d7e8518999 100644
--- a/tests/wpt/tests/css/css-break/ink-overflow-001-print.html
+++ b/tests/wpt/tests/css/css-break/ink-overflow-001-print.html
@@ -9,6 +9,10 @@
   margin: 0.5in;
 }
 
+:root {
+  print-color-adjust: exact;
+}
+
 html,body {
   color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
 }
diff --git a/tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-003-crash.html b/tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-003-crash.html
new file mode 100644
index 00000000000..88a04288464
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-003-crash.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel="help" href="https://issuetracker.google.com/issues/406053621">
+<div style="column-count: 1;">
+  <div style="filter: blur(0px); display: inline;">
+    <div style="filter: blur(0px); display: inline">
+      <div style="position: relative;">
+        <div style="position: absolute;">
+          <div style="position: fixed;"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-break/root-margin-001-print-ref.html b/tests/wpt/tests/css/css-break/root-margin-001-print-ref.html
new file mode 100644
index 00000000000..320da2e0f55
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/root-margin-001-print-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<div style="height:1px;"></div>
+<div style="break-before:page; margin-top:8px;"></div>
+This text should be on the second page.
+The first page should be blank.
diff --git a/tests/wpt/tests/css/css-break/root-margin-001-print.html b/tests/wpt/tests/css/css-break/root-margin-001-print.html
new file mode 100644
index 00000000000..b2ec34fe079
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/root-margin-001-print.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<title>Root block-start margin taller than the page</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-break/#break-margins">
+<link rel="match" href="root-margin-001-print-ref.html">
+<style>
+  html { margin-top: 10in; }
+</style>
+This text should be on the second page.
+The first page should be blank.
diff --git a/tests/wpt/tests/css/css-break/table/border-spacing.html b/tests/wpt/tests/css/css-break/table/border-spacing.html
index fc5e87e35dd..9fd94760681 100644
--- a/tests/wpt/tests/css/css-break/table/border-spacing.html
+++ b/tests/wpt/tests/css/css-break/table/border-spacing.html
@@ -5,7 +5,7 @@
   .cell > div { background:white; }
 </style>
 <p>No red should be seen below.</p>
-<div id="multicol" style="columns:2; column-fill:auto; height:70px; width:200px; line-height:20px;">
+<div id="multicol" style="columns:2; column-fill:auto; gap:0; height:70px; width:200px; line-height:20px;">
   <div style="position:relative; display:table; border-spacing:10px;">
     <div class="cell" style="display:table-cell; width:30px; background:red;">
       <div id="child1">1<br></div>
@@ -20,15 +20,20 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
   test(() => {
+    assert_equals(document.getElementById("child1").offsetLeft, 10);
     assert_equals(document.getElementById("child1").offsetTop, 10);
     assert_equals(document.getElementById("child1").offsetHeight, 20);
+    assert_equals(document.getElementById("child2").offsetLeft, 10);
     assert_equals(document.getElementById("child2").offsetTop, 30);
     assert_equals(document.getElementById("child2").offsetHeight, 20);
+    assert_equals(document.getElementById("child3").offsetLeft, 10);
     assert_equals(document.getElementById("child3").offsetTop, 50);
     assert_equals(document.getElementById("child3").offsetHeight, 20);
-    assert_equals(document.getElementById("child4").offsetTop, 70);
+    assert_equals(document.getElementById("child4").offsetLeft, 110);
+    assert_equals(document.getElementById("child4").offsetTop, 0);
     assert_equals(document.getElementById("child4").offsetHeight, 20);
-    assert_equals(document.getElementById("child5").offsetTop, 90);
+    assert_equals(document.getElementById("child5").offsetLeft, 110);
+    assert_equals(document.getElementById("child5").offsetTop, 20);
     assert_equals(document.getElementById("child5").offsetHeight, 20);
   }, "Table with border spacing");
 </script>
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-001a-print-ref.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-001a-print-ref.html
index d4229ebb873..dd0e61badef 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-001a-print-ref.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-001a-print-ref.html
@@ -5,6 +5,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 .table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-001a-print.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-001a-print.html
index 4f2123b6487..c7300590ff1 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-001a-print.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-001a-print.html
@@ -7,6 +7,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-001b-print.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-001b-print.html
index d445206a2b8..193a222f039 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-001b-print.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-001b-print.html
@@ -7,6 +7,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-001c-print-ref.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-001c-print-ref.html
index d7778e340ab..60f4e1b9203 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-001c-print-ref.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-001c-print-ref.html
@@ -5,6 +5,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 .table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-001c-print.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-001c-print.html
index 4615270c400..1bf8c68ff78 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-001c-print.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-001c-print.html
@@ -7,6 +7,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-001d-print.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-001d-print.html
index ad120c24818..27c07c87818 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-001d-print.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-001d-print.html
@@ -7,6 +7,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-002a-print-ref.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-002a-print-ref.html
index d7272352a15..94777453f42 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-002a-print-ref.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-002a-print-ref.html
@@ -5,6 +5,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 .table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-002a-print.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-002a-print.html
index 88ea8cd6977..f7e0d4b612b 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-002a-print.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-002a-print.html
@@ -7,6 +7,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-002b-print.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-002b-print.html
index 97e102e3cd7..a483e72a2b8 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-002b-print.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-002b-print.html
@@ -7,6 +7,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-002c-print-ref.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-002c-print-ref.html
index 18c1e0d5a9b..427791d8418 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-002c-print-ref.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-002c-print-ref.html
@@ -5,6 +5,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 .table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-002c-print.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-002c-print.html
index 29fccdef999..183a0f7e9a5 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-002c-print.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-002c-print.html
@@ -7,6 +7,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-002d-print.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-002d-print.html
index 67aa7624b76..66b870333f6 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-002d-print.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-002d-print.html
@@ -7,6 +7,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-003a-print-ref.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-003a-print-ref.html
index bf99e5b41e2..bfd817a9411 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-003a-print-ref.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-003a-print-ref.html
@@ -5,6 +5,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 .table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-003a-print.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-003a-print.html
index c6190855b01..e2451f8bab9 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-003a-print.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-003a-print.html
@@ -7,6 +7,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-003b-print.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-003b-print.html
index a1d3b21298e..451c7c81502 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-003b-print.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-003b-print.html
@@ -7,6 +7,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-003c-print-ref.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-003c-print-ref.html
index 50738fbaa8a..793880e203f 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-003c-print-ref.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-003c-print-ref.html
@@ -5,6 +5,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 .table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-003c-print.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-003c-print.html
index 9c4f8d3873a..d907f904d60 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-003c-print.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-003c-print.html
@@ -7,6 +7,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 table {
diff --git a/tests/wpt/tests/css/css-break/table/table-fragmentation-003d-print.html b/tests/wpt/tests/css/css-break/table/table-fragmentation-003d-print.html
index 1903a68c58d..009ea5a97e8 100644
--- a/tests/wpt/tests/css/css-break/table/table-fragmentation-003d-print.html
+++ b/tests/wpt/tests/css/css-break/table/table-fragmentation-003d-print.html
@@ -7,6 +7,9 @@
 
 <style>
 @page { size: 5in 3in; margin: 0.5in; }
+:root {
+  print-color-adjust: exact;
+}
 body { margin: 0; }
 
 table {
diff --git a/tests/wpt/tests/css/css-break/table/table-parts-offsets-vertical-rl.tentative.html b/tests/wpt/tests/css/css-break/table/table-parts-offsets-vertical-rl.tentative.html
index 9d4a472d438..1eb751032ca 100644
--- a/tests/wpt/tests/css/css-break/table/table-parts-offsets-vertical-rl.tentative.html
+++ b/tests/wpt/tests/css/css-break/table/table-parts-offsets-vertical-rl.tentative.html
@@ -37,104 +37,104 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
   test(() => {
-    assert_equals(table.offsetTop, 408, "offsetTop");
-    assert_equals(table.offsetLeft, 41, "offsetLeft");
+    assert_equals(table.offsetTop, 8, "offsetTop");
+    assert_equals(table.offsetLeft, 8, "offsetLeft");
     assert_equals(table.offsetWidth, 177, "offsetWidth");
     assert_equals(table.offsetHeight, 184, "offsetHeight");
   }, "table");
   test(() => {
-    assert_equals(colgroup.offsetTop, 418, "offsetTop");
-    assert_equals(colgroup.offsetLeft, 51, "offsetLeft");
+    assert_equals(colgroup.offsetTop, 18, "offsetTop");
+    assert_equals(colgroup.offsetLeft, 8, "offsetLeft");
     assert_equals(colgroup.offsetWidth, 157, "offsetWidth");
     assert_equals(colgroup.offsetHeight, 107, "offsetHeight");
   }, "colgroup");
   test(() => {
-    assert_equals(col.offsetTop, 418, "offsetTop");
-    assert_equals(col.offsetLeft, 51, "offsetLeft");
+    assert_equals(col.offsetTop, 18, "offsetTop");
+    assert_equals(col.offsetLeft, 8, "offsetLeft");
     assert_equals(col.offsetWidth, 157, "offsetWidth");
     assert_equals(col.offsetHeight, 50, "offsetHeight");
   }, "col");
   test(() => {
-    assert_equals(col2.offsetTop, 475, "offsetTop");
-    assert_equals(col2.offsetLeft, 51, "offsetLeft");
+    assert_equals(col2.offsetTop, 75, "offsetTop");
+    assert_equals(col2.offsetLeft, 8, "offsetLeft");
     assert_equals(col2.offsetWidth, 157, "offsetWidth");
     assert_equals(col2.offsetHeight, 50, "offsetHeight");
   }, "col2");
   test(() => {
-    assert_equals(colgroup2.offsetTop, 532, "offsetTop");
-    assert_equals(colgroup2.offsetLeft, 51, "offsetLeft");
+    assert_equals(colgroup2.offsetTop, 132, "offsetTop");
+    assert_equals(colgroup2.offsetLeft, 8, "offsetLeft");
     assert_equals(colgroup2.offsetWidth, 157, "offsetWidth");
     assert_equals(colgroup2.offsetHeight, 50, "offsetHeight");
   }, "colgroup2");
   test(() => {
-    assert_equals(col3.offsetTop, 532, "offsetTop");
-    assert_equals(col3.offsetLeft, 51, "offsetLeft");
+    assert_equals(col3.offsetTop, 132, "offsetTop");
+    assert_equals(col3.offsetLeft, 8, "offsetLeft");
     assert_equals(col3.offsetWidth, 157, "offsetWidth");
     assert_equals(col3.offsetHeight, 50, "offsetHeight");
   }, "col3");
   test(() => {
-    assert_equals(rowgroup.offsetTop, 418, "offsetTop");
-    assert_equals(rowgroup.offsetLeft, 51, "offsetLeft");
+    assert_equals(rowgroup.offsetTop, 18, "offsetTop");
+    assert_equals(rowgroup.offsetLeft, 8, "offsetLeft");
     assert_equals(rowgroup.offsetWidth, 157, "offsetWidth");
     assert_equals(rowgroup.offsetHeight, 164, "offsetHeight");
   }, "rowgroup");
   test(() => {
-    assert_equals(row.offsetTop, 218, "offsetTop");
-    assert_equals(row.offsetLeft, 38, "offsetLeft");
+    assert_equals(row.offsetTop, 18, "offsetTop");
+    assert_equals(row.offsetLeft, 8, "offsetLeft");
     assert_equals(row.offsetWidth, 100, "offsetWidth");
     assert_equals(row.offsetHeight, 164, "offsetHeight");
   }, "row");
   test(() => {
-    assert_equals(cell.offsetTop, 218, "offsetTop");
-    assert_equals(cell.offsetLeft, 38, "offsetLeft");
+    assert_equals(cell.offsetTop, 18, "offsetTop");
+    assert_equals(cell.offsetLeft, 8, "offsetLeft");
     assert_equals(cell.offsetWidth, 100, "offsetWidth");
     assert_equals(cell.offsetHeight, 50, "offsetHeight");
   }, "cell");
   test(() => {
-    assert_equals(content.offsetTop, 218, "offsetTop");
-    assert_equals(content.offsetLeft, 38, "offsetLeft");
+    assert_equals(content.offsetTop, 18, "offsetTop");
+    assert_equals(content.offsetLeft, 8, "offsetLeft");
     assert_equals(content.offsetWidth, 100, "offsetWidth");
     assert_equals(content.offsetHeight, 50, "offsetHeight");
   }, "content");
   test(() => {
-    assert_equals(cell2.offsetTop, 275, "offsetTop");
-    assert_equals(cell2.offsetLeft, 38, "offsetLeft");
+    assert_equals(cell2.offsetTop, 75, "offsetTop");
+    assert_equals(cell2.offsetLeft, 8, "offsetLeft");
     assert_equals(cell2.offsetWidth, 100, "offsetWidth");
     assert_equals(cell2.offsetHeight, 50, "offsetHeight");
   }, "cell2");
   test(() => {
-    assert_equals(content2.offsetTop, 275, "offsetTop");
-    assert_equals(content2.offsetLeft, 38, "offsetLeft");
+    assert_equals(content2.offsetTop, 75, "offsetTop");
+    assert_equals(content2.offsetLeft, 8, "offsetLeft");
     assert_equals(content2.offsetWidth, 100, "offsetWidth");
     assert_equals(content2.offsetHeight, 50, "offsetHeight");
   }, "content2");
   test(() => {
-    assert_equals(cell3.offsetTop, 332, "offsetTop");
-    assert_equals(cell3.offsetLeft, 38, "offsetLeft");
+    assert_equals(cell3.offsetTop, 132, "offsetTop");
+    assert_equals(cell3.offsetLeft, 8, "offsetLeft");
     assert_equals(cell3.offsetWidth, 100, "offsetWidth");
     assert_equals(cell3.offsetHeight, 50, "offsetHeight");
   }, "cell3");
   test(() => {
-    assert_equals(content3.offsetTop, 332, "offsetTop");
-    assert_equals(content3.offsetLeft, 38, "offsetLeft");
+    assert_equals(content3.offsetTop, 132, "offsetTop");
+    assert_equals(content3.offsetLeft, 8, "offsetLeft");
     assert_equals(content3.offsetWidth, 100, "offsetWidth");
     assert_equals(content3.offsetHeight, 50, "offsetHeight");
   }, "content3");
   test(() => {
-    assert_equals(row2.offsetTop, 418, "offsetTop");
-    assert_equals(row2.offsetLeft, 51, "offsetLeft");
+    assert_equals(row2.offsetTop, 218, "offsetTop");
+    assert_equals(row2.offsetLeft, 8, "offsetLeft");
     assert_equals(row2.offsetWidth, 50, "offsetWidth");
     assert_equals(row2.offsetHeight, 164, "offsetHeight");
   }, "row2");
   test(() => {
-    assert_equals(cell4.offsetTop, 418, "offsetTop");
-    assert_equals(cell4.offsetLeft, 51, "offsetLeft");
+    assert_equals(cell4.offsetTop, 218, "offsetTop");
+    assert_equals(cell4.offsetLeft, 8, "offsetLeft");
     assert_equals(cell4.offsetWidth, 50, "offsetWidth");
     assert_equals(cell4.offsetHeight, 50, "offsetHeight");
   }, "cell4");
   test(() => {
-    assert_equals(content4.offsetTop, 418, "offsetTop");
-    assert_equals(content4.offsetLeft, 51, "offsetLeft");
+    assert_equals(content4.offsetTop, 218, "offsetTop");
+    assert_equals(content4.offsetLeft, 8, "offsetLeft");
     assert_equals(content4.offsetWidth, 50, "offsetWidth");
     assert_equals(content4.offsetHeight, 50, "offsetHeight");
   }, "content4");
diff --git a/tests/wpt/tests/css/css-break/transform-023-print-ref.html b/tests/wpt/tests/css/css-break/transform-023-print-ref.html
index 7204e1d6571..856e6435fb8 100644
--- a/tests/wpt/tests/css/css-break/transform-023-print-ref.html
+++ b/tests/wpt/tests/css/css-break/transform-023-print-ref.html
@@ -1,4 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <p>There should be a green square on the second page, and no red.</p>
 <div style="break-before:page; width:100px; height:100px; background:green;"></div>
diff --git a/tests/wpt/tests/css/css-break/transform-023-print.html b/tests/wpt/tests/css/css-break/transform-023-print.html
index 7650571abe1..53abb1939bb 100644
--- a/tests/wpt/tests/css/css-break/transform-023-print.html
+++ b/tests/wpt/tests/css/css-break/transform-023-print.html
@@ -2,6 +2,11 @@
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1371426">
 <link rel="match" href="transform-023-print-ref.html">
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <p>There should be a green square on the second page, and no red.</p>
 <div style="break-before:page; width:100px; height:100px; background:red;">
   <div style="position:absolute; width:0; height:0; transform:translateX(49px);">
diff --git a/tests/wpt/tests/css/css-break/transform-024-print-ref.html b/tests/wpt/tests/css/css-break/transform-024-print-ref.html
index 766c415a1be..582794ca046 100644
--- a/tests/wpt/tests/css/css-break/transform-024-print-ref.html
+++ b/tests/wpt/tests/css/css-break/transform-024-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="height:100vh; background:yellow;">
diff --git a/tests/wpt/tests/css/css-break/transform-024-print.html b/tests/wpt/tests/css/css-break/transform-024-print.html
index 510b4c2e44f..22b6cd12075 100644
--- a/tests/wpt/tests/css/css-break/transform-024-print.html
+++ b/tests/wpt/tests/css/css-break/transform-024-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1371426">
 <link rel="match" href="transform-024-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="position:relative; z-index:1; height:100vh;">
diff --git a/tests/wpt/tests/css/css-cascade/inline-style-background.html b/tests/wpt/tests/css/css-cascade/inline-style-background.html
new file mode 100644
index 00000000000..11451f8cefd
--- /dev/null
+++ b/tests/wpt/tests/css/css-cascade/inline-style-background.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<head>
+  <link rel="help" href="https://crbug.com/40934009">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <div id="d" style="background:revert">Test passes if it does not crash.</div>
+  <script>
+    test(() => {
+      d.offsetTop;
+      d.style.background = "url(dummy.png)";
+      d.offsetLeft;
+    });
+  </script>
+</body>
diff --git a/tests/wpt/tests/css/css-color-hdr/computed.html b/tests/wpt/tests/css/css-color-hdr/computed.html
index 47021144087..38a540bd66a 100644
--- a/tests/wpt/tests/css/css-color-hdr/computed.html
+++ b/tests/wpt/tests/css/css-color-hdr/computed.html
@@ -43,4 +43,6 @@ test_computed_value("dynamic-range-limit", "dynamic-range-limit-mix(dynamic-rang
                                            "dynamic-range-limit-mix(standard 15%, constrained 40%, no-limit 45%)");
 test_computed_value("dynamic-range-limit", "dynamic-range-limit-mix(no-limit 10%, dynamic-range-limit-mix(standard 25%, constrained 75%) 20%, dynamic-range-limit-mix(constrained 10%, no-limit 30%) 20%)",
                                            "dynamic-range-limit-mix(standard 10%, constrained 40%, no-limit 50%)");
+test_computed_value("dynamic-range-limit", "dynamic-range-limit-mix(standard calc(50% * sign(10em - 1px)), constrained 50%)",
+                                           "dynamic-range-limit-mix(standard 50%, constrained 50%)");
 </script>
diff --git a/tests/wpt/tests/css/css-color-hdr/parsing.html b/tests/wpt/tests/css/css-color-hdr/parsing.html
index e165a60d7ed..2447891f2c4 100644
--- a/tests/wpt/tests/css/css-color-hdr/parsing.html
+++ b/tests/wpt/tests/css/css-color-hdr/parsing.html
@@ -20,6 +20,8 @@
   test_valid_value("dynamic-range-limit", "dynamic-range-limit-mix(dynamic-range-limit-mix(constrained 90%, no-limit 10%) 1%, no-limit 80%)");
   test_valid_value("dynamic-range-limit", "dynamic-range-limit-mix(no-limit 1%, dynamic-range-limit-mix(constrained 2%, no-limit 10%) 80%)");
   test_valid_value("dynamic-range-limit", "dynamic-range-limit-mix(dynamic-range-limit-mix(no-limit 1%, standard 2%) 3%, dynamic-range-limit-mix(constrained 5%, no-limit 5%) 6%)");
+  test_valid_value("dynamic-range-limit", "dynamic-range-limit-mix(standard calc(50% * sign(10em - 1px)), constrained 50%)");
+
   test_invalid_value("dynamic-range-limit", "dynamic-range-limit-mix(no-limit 80%, standard 20%, )");
   test_invalid_value("dynamic-range-limit", "dynamic-range-limit-mix(no-limit, standard 20%)");
   test_invalid_value("dynamic-range-limit", "dynamic-range-limit-mix(constrained, no-limit, 80%)");
diff --git a/tests/wpt/tests/css/css-color/WEB_FEATURES.yml b/tests/wpt/tests/css/css-color/WEB_FEATURES.yml
index a7e2044aeaa..275611f531e 100644
--- a/tests/wpt/tests/css/css-color/WEB_FEATURES.yml
+++ b/tests/wpt/tests/css/css-color/WEB_FEATURES.yml
@@ -26,3 +26,6 @@ features:
 - name: hwb
   files:
   - hwb-*
+- name: relative-color
+  files:
+  - relative-*
diff --git a/tests/wpt/tests/css/css-color/parsing/WEB_FEATURES.yml b/tests/wpt/tests/css/css-color/parsing/WEB_FEATURES.yml
index cc8273c2adc..0bb97b1e1d9 100644
--- a/tests/wpt/tests/css/css-color/parsing/WEB_FEATURES.yml
+++ b/tests/wpt/tests/css/css-color/parsing/WEB_FEATURES.yml
@@ -3,3 +3,7 @@ features:
   files:
   - "*-color-mix-*"
   - color-mix-out-of-gamut.html
+- name: relative-color
+  files:
+  - "relative-*"
+  - "*-relative-*"
diff --git a/tests/wpt/tests/css/css-color/parsing/color-computed-relative-color.html b/tests/wpt/tests/css/css-color/parsing/color-computed-relative-color.html
index 23ee07d177a..9bb87459623 100644
--- a/tests/wpt/tests/css/css-color/parsing/color-computed-relative-color.html
+++ b/tests/wpt/tests/css/css-color/parsing/color-computed-relative-color.html
@@ -527,6 +527,8 @@
   fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) calc(l) calc(c) calc(h) / calc(alpha))`, `lch(0.7 45 30 / 0.4)`);
   fuzzy_test_computed_color(`lch(from lch(50 5 10 / 0.8) calc(l + 1) calc(c + 1) calc(h + 1) / calc(alpha + 0.01))`, `lch(51 6 11 / 0.81)`);
   fuzzy_test_computed_color(`lch(from lch(0.7 45 30) calc((l / 100) * 100%) calc((c / 150) * 100%) calc((h / 360) * 360deg) / calc(alpha * 100%))`, `lch(0.7 45 30)`);
+  fuzzy_test_computed_color(`lch(from red calc((49.44 - l) * infinity) 0 0)`, `lch(0 0 0)`);
+  fuzzy_test_computed_color(`lch(from blue calc((49.44 - l) * infinity) 0 0)`, `lch(100 0 0)`);
 
   // Alpha is clamped to [0,1]
   fuzzy_test_computed_color(`lch(from lch(from lch(0.7 45 30) l c h / calc(alpha + 0.5)) l c h / calc(alpha - 0.5))`, `lch(0.7 45 30 / 0.5)`);
diff --git a/tests/wpt/tests/css/css-conditional/at-supports-selector-details-content-before.html b/tests/wpt/tests/css/css-conditional/at-supports-selector-details-content-before.html
new file mode 100644
index 00000000000..731b2c4d6d2
--- /dev/null
+++ b/tests/wpt/tests/css/css-conditional/at-supports-selector-details-content-before.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<html>
+  <head>
+    <title>CSS Test (Conditional Rules): In @supports, ::details-content::before can be parsed successfully</title>
+    <link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com">
+    <link rel="help" href="https://drafts.csswg.org/css-conditional-3/#at-supports">
+    <link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#details-content-pseudo">
+    <link rel="match" href="at-supports-001-ref.html">
+    <style>
+      div {
+        background: red;
+        height: 100px;
+        width: 100px;
+      }
+      @supports selector(input::details-content::before) {
+        div { background-color:green; }
+      }
+    </style>
+  </head>
+  <body>
+    <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+    <div></div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/css-conditional/at-supports-selector-details-content.html b/tests/wpt/tests/css/css-conditional/at-supports-selector-details-content.html
new file mode 100644
index 00000000000..89e7606de5b
--- /dev/null
+++ b/tests/wpt/tests/css/css-conditional/at-supports-selector-details-content.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<html>
+  <head>
+    <title>CSS Test (Conditional Rules): In @supports, ::details-content can be parsed successfully</title>
+    <link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com">
+    <link rel="help" href="https://drafts.csswg.org/css-conditional-3/#at-supports">
+    <link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#details-content-pseudo">
+    <link rel="match" href="at-supports-001-ref.html">
+    <style>
+      div {
+        background: red;
+        height: 100px;
+        width: 100px;
+      }
+      @supports selector(input::details-content) {
+        div { background-color:green; }
+      }
+    </style>
+  </head>
+  <body>
+    <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+    <div></div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/WEB_FEATURES.yml b/tests/wpt/tests/css/css-conditional/container-queries/WEB_FEATURES.yml
index 445ceb373f0..7e15715f583 100644
--- a/tests/wpt/tests/css/css-conditional/container-queries/WEB_FEATURES.yml
+++ b/tests/wpt/tests/css/css-conditional/container-queries/WEB_FEATURES.yml
@@ -1,3 +1,144 @@
 features:
+# Note: container-queries in web-features is container size queries.
 - name: container-queries
-  files: "**"
+  files:
+  - animation-container-size.html
+  - animation-container-type-dynamic.html
+  - animation-nested-animation.html
+  - animation-nested-transition.html
+  - aspect-ratio-feature-evaluation.html
+  - at-container-parsing.html
+  - at-container-serialization.html
+  - auto-scrollbars.html
+  - backdrop-invalidation.html
+  - calc-evaluation.html
+  - canvas-as-container-001.html
+  - canvas-as-container-002.html
+  - canvas-as-container-003.html
+  - canvas-as-container-004.html
+  - canvas-as-container-005.html
+  - canvas-as-container-006.html
+  - change-display-in-container.html
+  - chrome-legacy-skip-recalc.html
+  - column-spanner-in-container.html
+  - conditional-container-status.html
+  - container-computed.html
+  - container-for-cue.html
+  - container-for-shadow-dom.html
+  - container-inheritance.html
+  - container-inner-at-rules.html
+  - container-inside-multicol-with-table.html
+  - container-longhand-animation-type.html
+  - container-name-computed.html
+  - container-name-invalidation.html
+  - container-name-parsing.html
+  - container-name-tree-scoped.html
+  - container-nested.html
+  - container-parsing.html
+  - container-selection.html
+  - container-size-*
+  - container-type-computed.html
+  - container-type-containment.html
+  - container-type-invalidation.html
+  - container-type-layout-invalidation.html
+  - container-type-parsing.html
+  - container-units-*
+  - counters-flex-circular.html
+  - counters-in-container-dynamic.html
+  - counters-in-container.html
+  - custom-layout-container-001.https.html
+  - deep-nested-inline-size-containers.html
+  - dialog-backdrop-create.html
+  - dialog-backdrop-remove.html
+  - display-contents.html
+  - display-in-container.html
+  - display-none.html
+  - fieldset-legend-change.html
+  - flex-basis-with-container-type.html
+  - font-relative-calc-dynamic.html
+  - font-relative-units-dynamic.html
+  - font-relative-units.html
+  - fragmented-container-001.html
+  - get-animations.html
+  - grid-container.html
+  - grid-item-container.html
+  - idlharness.html
+  - iframe-in-container-invalidation.html
+  - iframe-invalidation.html
+  - ineligible-containment.html
+  - inheritance-from-container.html
+  - inline-size-and-min-width.html
+  - inline-size-bfc-floats.html
+  - inline-size-containment-vertical-rl.html
+  - inline-size-containment.html
+  - inner-first-line-non-matching.html
+  - layout-dependent-focus.html
+  - multicol-container-001.html
+  - multicol-inside-container.html
+  - multiple-size-containers-comma-separated-queries.html
+  - nested-query-containers.html
+  - never-match-container.html
+  - no-layout-containment-abspos-dynamic.html
+  - no-layout-containment-abspos.html
+  - no-layout-containment-baseline.html
+  - no-layout-containment-fixedpos-dynamic.html
+  - no-layout-containment-fixedpos.html
+  - no-layout-containment-scroll.html
+  - no-layout-containment-subgrid-crash.html
+  - orthogonal-wm-container-query.html
+  - percentage-padding-orthogonal.html
+  - pseudo-elements-001.html
+  - pseudo-elements-002.html
+  - pseudo-elements-002b.html
+  - pseudo-elements-003.html
+  - pseudo-elements-004.html
+  - pseudo-elements-006.html
+  - pseudo-elements-007.html
+  - pseudo-elements-008.html
+  - pseudo-elements-009.html
+  - pseudo-elements-010.html
+  - pseudo-elements-011.html
+  - pseudo-elements-012.html
+  - pseudo-elements-013.html
+  - query-container-name.html
+  - query-content-box.html
+  - query-evaluation.html
+  - reattach-container-with-dirty-child.html
+  - resize-while-content-visibility-hidden.html
+  - scrollbar-container-units-block.html
+  - scrollbar-container-units-inline.html
+  - sibling-layout-dependency.html
+  - size-container-*
+  - size-feature-evaluation.html
+  - size-query-with-var.html
+  - style-change-in-container.html
+  - style-not-sharing-float.html
+  - svg-foreignobject-child-container.html
+  - svg-foreignobject-no-size-container.html
+  - svg-g-no-size-container.html
+  - svg-root-size-container.html
+  - table-inside-container-changing-display.html
+  - top-layer-dialog-backdrop.html
+  - top-layer-dialog-container.html
+  - top-layer-dialog.html
+  - top-layer-nested-dialog.html
+  - transition-scrollbars.html
+  - transition-style-change-event-002.html
+  - transition-style-change-event.html
+  - unsupported-axis.html
+  - var-evaluation.html
+  - viewport-units-dynamic.html
+  - viewport-units.html
+  - whitespace-update-after-removal.html
+- name: container-style-queries
+  files:
+  - at-container-style-*
+  - custom-property-style-*
+  - display-contents-dynamic-style-queries.html
+  - multiple-style-containers-comma-separated-queries.html
+  - nested-size-style-container-invalidation.html
+  - pseudo-elements-005.html
+  - query-evaluation-style.html
+  - registered-color-style-queries.html
+  - style-container-*
+  - style-query-*
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/multiple-style-containers-comma-separated-queries.html b/tests/wpt/tests/css/css-conditional/container-queries/multiple-style-containers-comma-separated-queries.html
index 23ea471c417..daa64aaa42f 100644
--- a/tests/wpt/tests/css/css-conditional/container-queries/multiple-style-containers-comma-separated-queries.html
+++ b/tests/wpt/tests/css/css-conditional/container-queries/multiple-style-containers-comma-separated-queries.html
@@ -6,7 +6,7 @@
 <script src="support/cq-testcommon.js"></script>
 <style>
   #combined {
-    container-type: inline-size:
+    container-type: inline-size;
     --foo: qux;
   }
   #outer {
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/position-sticky-crash.html b/tests/wpt/tests/css/css-conditional/container-queries/position-sticky-crash.html
new file mode 100644
index 00000000000..aebebbdc7ac
--- /dev/null
+++ b/tests/wpt/tests/css/css-conditional/container-queries/position-sticky-crash.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<link rel="help" href="https://issues.chromium.org/issues/399689229">
+<style>
+.container {
+  min-width: 30px;
+  container-type: inline-size;
+}
+
+.scroller {
+  overflow: scroll;
+  width: 100px;
+  height: 100px;
+}
+
+@container (width = 100px) {
+  .scroller { display: none; }
+}
+
+.float {
+  background: cyan;
+  float: left;
+}
+</style>
+<div style="display: flow-root; width: 100px;">
+  <!-- The floats create a situation where it needs to perform layout twice, first with 50px, then 100px. -->
+  <div class="float" style="width: 50px; height: 50px;"></div>
+  <div class="float" style="width: 100px; height: 50px;"></div>
+
+  <div class="container">
+    <div class="scroller">
+      <div style="position: sticky; top: 0;"></div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-conditional/js/CSS-supports-details-content-pseudo-parsing.html b/tests/wpt/tests/css/css-conditional/js/CSS-supports-details-content-pseudo-parsing.html
new file mode 100644
index 00000000000..67a46fe82a2
--- /dev/null
+++ b/tests/wpt/tests/css/css-conditional/js/CSS-supports-details-content-pseudo-parsing.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS.supports() ::details-content parsing</title>
+<link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com">
+<link rel="help" href="https://www.w3.org/TR/css-conditional-4/#the-css-namespace">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#element-like">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  test(function() {
+    assert_equals(CSS.supports("selector(::details-content)"), true);
+  }, "selector() function accepts ::details-content");
+
+  test(function() {
+    assert_equals(CSS.supports("selector(::details-content::before)"), true);
+  }, "selector() function accepts ::details-content followed by ::before");
+
+  test(function() {
+    assert_equals(CSS.supports("selector(::details-content::first-line)"), true);
+  }, "selector() function accepts ::details-content followed by ::first-line");
+
+  test(function() {
+    assert_equals(CSS.supports("selector(::details-content:hover"), true);
+  }, "selector() function accepts ::details-content followed by a state pseudo-class");
+
+  test(function() {
+    assert_equals(CSS.supports("selector(::details-content:lang(en)"), true);
+  }, "selector() function accepts ::details-content followed by :lang()");
+
+  test(function() {
+    assert_equals(CSS.supports("selector(::details-content:nth-of-type(slot)"), false);
+  }, "selector() function doesn't accept ::details-content followed by a tree-structural pseudo-class");
+
+  test(function() {
+    assert_equals(CSS.supports("selector(::details-content:has(a)"), false);
+  }, "selector() function doesn't accept ::details-content followed by :has()");
+
+  test(function() {
+    assert_equals(CSS.supports("selector(::details-content::part(a)"), false);
+  }, "selector() function doesn't accept ::details-content followed by a part");
+</script>
diff --git a/tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001-ref.html
index c7553716ab6..e2516f3d378 100644
--- a/tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001-ref.html
+++ b/tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001-ref.html
@@ -1,62 +1,13 @@
 <!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>CSS Reftest Reference</title>
-  <link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
-  <style>
-    div {
-      position: relative;
-      width: 100px;
-    }
-    #div1,
-    #div3 {
-      background-color: #cfc;
-    }
-    #div1 {
-      z-index: 5;
-    }
-    #div2 {
-      z-index: 1;
-      background-color: #fdd;
-      height: 100px;
-      top: -20px;
-    }
-    #div2_1 {
-      background-color: #ffc;
-      z-index: 6;
-      top: -10px;
-    }
-    #div2_2 {
-      z-index: 3;
-      position: absolute;
-      top: -15px;
-      width: 40px;
-      height: 100px;
-      background-color: #ddf;
-    }
-    #div3 {
-      z-index: 2;
-      top: -50px;
-    }
-  </style>
-</head>
-<body>
-  <div id="div1">
-    <br/><br/>
-  </div>
-
-  <div id="div2">
-    <div id="div2_1">
-      <br/><br/>
-    </div>
-
-    <div id="div2_2">
-    </div>
-  </div>
-
-  <div id="div3">
-    <br/><br/>
-  </div>
-</body>
-</html>
+<meta charset="utf-8">
+<title>Paint Containment Stacking Context Reference</title>
+<link rel="author" title="Psychpsyo" href="mailto:psychpsyo@gmail.com">
+<style>
+  div {
+    width: 100px;
+    height: 100px;
+    background-color: green;
+  }
+</style>
+<div></div>
+Test succeeds if there is no red.
diff --git a/tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001a.html b/tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001a.html
index 71102b6c73a..5e588cb6174 100644
--- a/tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001a.html
+++ b/tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001a.html
@@ -1,66 +1,32 @@
 <!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>CSS Test: 'contain: paint' with stacking contents. Z-index is defined only for siblings and children.</title>
-  <link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
-
-  <link rel="help" href="https://drafts.csswg.org/css2/visuren.html#x43">
-  <link rel="help" href="https://drafts.csswg.org/css-contain/#containment-paint">
-  <link rel="match" href="contain-paint-stacking-context-001-ref.html">
-  <style>
-    div {
-      position: relative;
-      width: 100px;
-    }
-    #div1,
-    #div3 {
-      background-color: #cfc;
-    }
-    #div1 {
-      z-index: 5;
-    }
-    #div2 {
-      contain: paint;
-      background-color: #fdd;
-      height: 100px;
-      top: -20px;
-    }
-    #div2_1 {
-      background-color: #ffc;
-      z-index: 6;
-      top: -10px;
-    }
-    #div2_2 {
-      z-index: 3;
-      position: absolute;
-      top: -15px;
-      width: 40px;
-      height: 100px;
-      background-color: #ddf;
-    }
-    #div3 {
-      z-index: 2;
-      top: -50px;
-    }
-  </style>
-</head>
-<body>
-  <div id="div1">
-    <br/><br/>
-  </div>
-
-  <div id="div2">
-    <div id="div2_1">
-      <br/><br/>
-    </div>
-
-    <div id="div2_2">
-    </div>
-  </div>
-
-  <div id="div3">
-    <br/><br/>
-  </div>
-</body>
-</html>
+<title>'contain: paint' establishes stacking context.</title>
+<link rel="author" title="Psychpsyo" href="mailto:psychpsyo@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css2/visuren.html#x43">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#containment-paint">
+<link rel="match" href="contain-paint-stacking-context-001-ref.html">
+<style>
+  div {
+    width: 100px;
+    height: 100px;
+  }
+  #front {
+    background-color: green;
+    /* makes a stacking context and puts this on top */
+    position: absolute;
+    z-index: 10;
+  }
+  #back {
+    contain: paint;
+  }
+  #notOnTop {
+    background-color: red;
+    /* z-index is higher than on #front, but this should still be covered up because it is inside #back, which has 'contain: paint' */
+    position: absolute;
+    z-index: 1000;
+  }
+</style>
+<div id="front"></div>
+<div id="back">
+  <div id="notOnTop"></div>
+</div>
+Test succeeds if there is no red.
diff --git a/tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001b.html b/tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001b.html
index 0c4d3323bf7..e03323782a7 100644
--- a/tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001b.html
+++ b/tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001b.html
@@ -1,66 +1,32 @@
 <!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>CSS Test: 'will-change: contain' with stacking contents. Z-index is defined only for siblings and children.</title>
-  <link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
-
-  <link rel="help" href="https://drafts.csswg.org/css2/visuren.html#x43">
-  <link rel="help" href="https://drafts.csswg.org/css-contain/#containment-paint">
-  <link rel="match" href="contain-paint-stacking-context-001-ref.html">
-  <style>
-    div {
-      position: relative;
-      width: 100px;
-    }
-    #div1,
-    #div3 {
-      background-color: #cfc;
-    }
-    #div1 {
-      z-index: 5;
-    }
-    #div2 {
-      will-change: contain;
-      background-color: #fdd;
-      height: 100px;
-      top: -20px;
-    }
-    #div2_1 {
-      background-color: #ffc;
-      z-index: 6;
-      top: -10px;
-    }
-    #div2_2 {
-      z-index: 3;
-      position: absolute;
-      top: -15px;
-      width: 40px;
-      height: 100px;
-      background-color: #ddf;
-    }
-    #div3 {
-      z-index: 2;
-      top: -50px;
-    }
-  </style>
-</head>
-<body>
-  <div id="div1">
-    <br/><br/>
-  </div>
-
-  <div id="div2">
-    <div id="div2_1">
-      <br/><br/>
-    </div>
-
-    <div id="div2_2">
-    </div>
-  </div>
-
-  <div id="div3">
-    <br/><br/>
-  </div>
-</body>
-</html>
+<title>'will-change: contain' establishes stacking context.</title>
+<link rel="author" title="Psychpsyo" href="mailto:psychpsyo@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css2/visuren.html#x43">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#containment-paint">
+<link rel="match" href="contain-paint-stacking-context-001-ref.html">
+<style>
+  div {
+    width: 100px;
+    height: 100px;
+  }
+  #front {
+    background-color: green;
+    /* makes a stacking context and puts this on top */
+    position: absolute;
+    z-index: 10;
+  }
+  #back {
+    will-change: contain;
+  }
+  #notOnTop {
+    background-color: red;
+    /* z-index is higher than on #front, but this should still be covered up because it is inside #back, which has 'will-change: contain' */
+    position: absolute;
+    z-index: 1000;
+  }
+</style>
+<div id="front"></div>
+<div id="back">
+  <div id="notOnTop"></div>
+</div>
+Test succeeds if there is no red.
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-img-001-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-img-001-ref.html
new file mode 100644
index 00000000000..d47ced1c33d
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-img-001-ref.html
@@ -0,0 +1,5 @@
+<!doctype HTML>
+<meta charset="utf8">
+<title>CSS Reference Case</title>
+<link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+<img id="myImg" src="resources/dice.png">
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-img-001.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-img-001.html
new file mode 100644
index 00000000000..ba6fdd316dc
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-img-001.html
@@ -0,0 +1,49 @@
+<!doctype HTML>
+<html class="reftest-wait">
+<meta charset="utf8">
+<title>CSS Test: img with content-visibility:auto honors its object-fit (restoring its aspect ratio) when coming back from offscreen</title>
+<link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain-2/#content-visibility">
+<link rel="help" href="https://drafts.csswg.org/css-contain-2/#containment-size">
+<link rel="match" href="content-visibility-auto-img-001-ref.html">
+<meta name="assert" content="img elements honor their aspect-ratio and object-fit even after briefly having their aspect-ratio suppressed by content-visibility:auto">
+
+<script src="/common/reftest-wait.js"></script>
+
+<style>
+body {
+  /* body needs to be tall enough so that we can programmatically scroll.  Use
+     'overflow:hidden' to suppress scrollbars so they don't interfere with the
+     reftest snapshot. */
+    height: 400vh;
+    overflow: hidden;
+}
+img {
+  width: 500px;  /* Much wider than the image's actual intrinsic width. */
+  height: 210px; /* The image's actual intrinsic height. */
+  object-fit: contain;
+  object-position: 0 0;
+  content-visibility: auto;
+}
+</style>
+<img id="myImg" src="resources/dice.png">
+
+<script>
+
+function runTest() {
+  // Scroll to the very end:
+  document.documentElement.scrollTop = document.documentElement.scrollHeight;
+
+  // Double-rAF to flush paints, and then scroll back to top
+  // and take screenshot:
+  requestAnimationFrame(()=>{
+    requestAnimationFrame(()=>{
+      document.documentElement.scrollTop = 0;
+      takeScreenshot();
+    });
+  });
+}
+
+window.onload = runTest;
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-text-fragment.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-text-fragment.html
index d5184d72a4e..923c5af04f4 100644
--- a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-text-fragment.html
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-text-fragment.html
@@ -3,7 +3,7 @@
 <meta charset="utf8">
 <title>Content Visibility: navigating to a text fragment.</title>
 <link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://github.com/WICG/display-locking">
+<link rel="help" href="https://www.w3.org/TR/css-contain-2/#content-visibility">
 <meta name="timeout" content="long">
 <meta name="assert" content="content-visibility: auto subtrees are 'searchable' by text fragment links">
 
diff --git a/tests/wpt/tests/css/css-display/display-contents-inline-002.html b/tests/wpt/tests/css/css-display/display-contents-inline-002.html
new file mode 100644
index 00000000000..f40a34129f3
--- /dev/null
+++ b/tests/wpt/tests/css/css-display/display-contents-inline-002.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Display: display:contents in inline layout should affect style of descendants</title>
+<link rel="author" title="Martin Robinson" href="mailto:mrobinson@igalia.com">
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-display-3/#valdef-display-contents">
+<link rel="match" href="display-contents-pass-no-red-ref.html">
+<style>
+    #contents {
+        display: contents;
+        color: black;
+    }
+    .red { color: red; }
+</style>
+<p>You should see the word PASS and no red below.</p>
+<span>
+    P<span class="red"><div id="contents">AS</div></span>S
+</span>
diff --git a/tests/wpt/tests/css/css-display/display-contents-pseudo-click-target.html b/tests/wpt/tests/css/css-display/display-contents-pseudo-click-target.html
new file mode 100644
index 00000000000..2620c97312f
--- /dev/null
+++ b/tests/wpt/tests/css/css-display/display-contents-pseudo-click-target.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<title>Clicking a display: contents pseudo-element targets that element</title>
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://mozilla.org" title="Mozilla">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1959364">
+<link rel="help" href="https://drafts.csswg.org/css-display-4/#valdef-display-contents">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<style>
+  div {
+    width: 100px;
+    height: 100px;
+    background-color: green;
+    position: relative;
+  }
+  a {
+    display: contents;
+
+    &::after {
+      content: "";
+      position: absolute;
+      inset: 0;
+    }
+  }
+</style>
+<div>
+  <a href="#"></a>
+</div>
+<script>
+promise_test(async function() {
+  let target = document.querySelector("a");
+  let hitLink = false;
+  target.addEventListener("click", function(e) {
+    hitLink = true;
+    e.preventDefault();
+  });
+  await test_driver.click(target.parentElement);
+  assert_true(hitLink, "Link should've been clicked");
+});
+</script>
diff --git a/tests/wpt/tests/css/css-easing/linear-timing-functions-chrome-406926307-crash.html b/tests/wpt/tests/css/css-easing/linear-timing-functions-chrome-406926307-crash.html
new file mode 100644
index 00000000000..32d48dca76b
--- /dev/null
+++ b/tests/wpt/tests/css/css-easing/linear-timing-functions-chrome-406926307-crash.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<title>Chrome crash bug 406926307</title>
+<link rel="help" href="https://crbug.com/406926307">
+<style>
+  div {
+    transition-timing-function: linear(0, 0.25, sibling-index());
+    transition-timing-function: linear(0, 0.25, sign(2em - 20px));
+  }
+</style>
+<p>Passes if test does not fail any CHECKs or DCHECKs.</p>
diff --git a/tests/wpt/tests/css/css-easing/linear-timing-functions-syntax.html b/tests/wpt/tests/css/css-easing/linear-timing-functions-syntax.html
index 0c949e9ea7d..408264b58df 100644
--- a/tests/wpt/tests/css/css-easing/linear-timing-functions-syntax.html
+++ b/tests/wpt/tests/css/css-easing/linear-timing-functions-syntax.html
@@ -26,6 +26,7 @@ test_valid_value("animation-timing-function", "linear(0, 0.5 25% 75%, 1 100% 100
 test_valid_value("animation-timing-function", "linear(0, 1.3, 1, 0.92, 1, 0.99, 1, 0.998, 1 100% 100%)");
 test_valid_value("animation-timing-function", "linear(0, 0 40%, 1, 0.5, 1)");
 test_valid_value("animation-timing-function", "linear(0, 1.3, 1, 0.92, 1, 0.99, 1, 1.004, 0.998, 1 100% 100%)");
+test_valid_value("animation-timing-function", "linear(calc(0/0), 1)", "linear(0 0%, 1 100%)");
 
 test_invalid_value("animation-timing-function", "linear()");
 test_invalid_value("animation-timing-function", "linear(0)");
diff --git a/tests/wpt/tests/css/css-easing/step-timing-functions-syntax.html b/tests/wpt/tests/css/css-easing/step-timing-functions-syntax.html
index 4e8b21e4413..e8465ff7a33 100644
--- a/tests/wpt/tests/css/css-easing/step-timing-functions-syntax.html
+++ b/tests/wpt/tests/css/css-easing/step-timing-functions-syntax.html
@@ -29,6 +29,7 @@ test_invalid_value("animation-timing-function", "steps(0, jump-start)");
 test_invalid_value("animation-timing-function", "steps(0, jump-end)");
 test_invalid_value("animation-timing-function", "steps(0, jump-both)");
 test_invalid_value("animation-timing-function", "steps(1, jump-none)");
+test_invalid_value("animation-timing-function", "steps(calc(0/0), jump-none)");
 
 </script>
 </body>
diff --git a/tests/wpt/tests/css/css-easing/timing-functions-syntax-valid.html b/tests/wpt/tests/css/css-easing/timing-functions-syntax-valid.html
index b858f45f4a4..3ebe1f513be 100644
--- a/tests/wpt/tests/css/css-easing/timing-functions-syntax-valid.html
+++ b/tests/wpt/tests/css/css-easing/timing-functions-syntax-valid.html
@@ -21,6 +21,7 @@ test_valid_value("animation-timing-function", "cubic-bezier(0.1, 0.2, 0.8, 0.9)"
 test_valid_value("animation-timing-function", "cubic-bezier(0, -2, 1, 3)");
 test_valid_value("animation-timing-function", "cubic-bezier(0, 0.7, 1, 1.3)");
 test_valid_value("animation-timing-function", "cubic-bezier(calc(-2), calc(0.7 / 2), calc(1.5), calc(0))", "cubic-bezier(calc(-2), calc(0.35), calc(1.5), calc(0))");
+test_valid_value("animation-timing-function", "cubic-bezier(0, sibling-index(), 1, sign(2em - 20px))");
 
 test_valid_value("animation-timing-function", "steps(4, start)");
 test_valid_value("animation-timing-function", "steps(2, end)", "steps(2)");
diff --git a/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-002-ref.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-002-ref.html
new file mode 100644
index 00000000000..59db32c67a9
--- /dev/null
+++ b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-002-ref.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Reference: Testing safe overflow-position for align-self in absolutely positioned boxes in reverse flex containers w/ item margin</title>
+  <link rel="author" title="Mihir Iyer" href="mailto:miyer@mozilla.com">
+  <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com">
+  <meta charset="utf-8">
+  <style>
+    .flex {
+      display: flex;
+      height: 50px;
+      width: 50px;
+      border: 3px solid black;
+      vertical-align: top;
+      margin: 20px;
+      position: relative;
+    }
+    .child {
+      border: 2px dotted purple;
+      background: teal;
+      width: 65px;
+      height: 65px;
+      align-self: start;
+      position: absolute;
+      background: yellow;
+      margin: 5px;
+    }
+    .rowDir {
+      flex-direction: row-reverse;
+    }
+    .colDir {
+      flex-direction: column-reverse;
+    }
+    .vertRL {
+      writing-mode: vertical-rl;
+    }
+  </style>
+</head>
+<body>
+  <div class="flex rowDir"><div class="child"></div></div>
+  <div class="flex colDir"><div class="child"></div></div>
+  <div class="flex rowDir vertRL"><div class="child"></div></div>
+  <div class="flex colDir vertRL"><div class="child"></div></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-002.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-002.html
new file mode 100644
index 00000000000..a474254fbd2
--- /dev/null
+++ b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-002.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>CSS Test: Testing safe overflow-position for align-self in absolutely positioned boxes in reverse flex containers w/ item margin</title>
+  <link rel="author" title="Mihir Iyer" href="mailto:miyer@mozilla.com">
+  <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
+  <link rel="match" href="flex-abspos-staticpos-align-self-safe-002-ref.html">
+  <meta charset="utf-8">
+  <style>
+    .flex {
+      display: flex;
+      height: 50px;
+      width: 50px;
+      border: 3px solid black;
+      vertical-align: top;
+      margin: 20px;
+      position: relative;
+    }
+    .child {
+      border: 2px dotted purple;
+      background: teal;
+      width: 65px;
+      height: 65px;
+      align-self: safe center;
+      position: absolute;
+      background: yellow;
+      margin: 5px;
+    }
+    .rowDir {
+      flex-direction: row-reverse;
+    }
+    .colDir {
+      flex-direction: column-reverse;
+    }
+    .vertRL {
+      writing-mode: vertical-rl;
+    }
+  </style>
+</head>
+<body>
+  <div class="flex rowDir"><div class="child"></div></div>
+  <div class="flex colDir"><div class="child"></div></div>
+  <div class="flex rowDir vertRL"><div class="child"></div></div>
+  <div class="flex colDir vertRL"><div class="child"></div></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-003-ref.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-003-ref.html
new file mode 100644
index 00000000000..d0499adcf0f
--- /dev/null
+++ b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-003-ref.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Reference: Testing safe overflow-position for align-self in absolutely positioned boxes in flex containers when item doesn't overflow</title>
+  <link rel="author" title="Mihir Iyer" href="mailto:miyer@mozilla.com">
+  <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com">
+  <meta charset="utf-8">
+  <style>
+    .flex {
+      display: flex;
+      height: 50px;
+      width: 50px;
+      border: 3px solid black;
+      vertical-align: top;
+      margin: 20px;
+      position: relative;
+    }
+    .child {
+      border: 2px dotted purple;
+      background: teal;
+      width: 25px;
+      height: 25px;
+      align-self: end;
+      position: absolute;
+      background: yellow;
+    }
+    .rowDir {
+      flex-direction: row;
+    }
+    .colDir {
+      flex-direction: column;
+    }
+    .vertRL {
+      writing-mode: vertical-rl;
+    }
+  </style>
+</head>
+<body>
+  <div class="flex rowDir"><div class="child"></div></div>
+  <div class="flex colDir"><div class="child"></div></div>
+  <div class="flex rowDir vertRL"><div class="child"></div></div>
+  <div class="flex colDir vertRL"><div class="child"></div></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-003.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-003.html
new file mode 100644
index 00000000000..cfcc8b58fdf
--- /dev/null
+++ b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-003.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>CSS Test: Testing safe overflow-position for align-self in absolutely positioned boxes in flex containers when item doesn't overflow</title>
+  <link rel="author" title="Mihir Iyer" href="mailto:miyer@mozilla.com">
+  <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-flexbox/#abspos-items">
+  <link rel="match" href="flex-abspos-staticpos-align-self-safe-003-ref.html">
+  <meta charset="utf-8">
+  <style>
+    .flex {
+      display: flex;
+      height: 50px;
+      width: 50px;
+      border: 3px solid black;
+      vertical-align: top;
+      margin: 20px;
+      position: relative;
+    }
+    .child {
+      border: 2px dotted purple;
+      background: teal;
+      width: 25px;
+      height: 25px;
+      align-self: safe end;
+      position: absolute;
+      background: yellow;
+    }
+    .rowDir {
+      flex-direction: row;
+    }
+    .colDir {
+      flex-direction: column;
+    }
+    .vertRL {
+      writing-mode: vertical-rl;
+    }
+  </style>
+</head>
+<body>
+  <div class="flex rowDir"><div class="child"></div></div>
+  <div class="flex colDir"><div class="child"></div></div>
+  <div class="flex rowDir vertRL"><div class="child"></div></div>
+  <div class="flex colDir vertRL"><div class="child"></div></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-flexbox/alignment/flex-content-alignment-with-abspos-001.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-content-alignment-with-abspos-001.html
new file mode 100644
index 00000000000..1a70500f2c5
--- /dev/null
+++ b/tests/wpt/tests/css/css-flexbox/alignment/flex-content-alignment-with-abspos-001.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>CSS Flex Layout Test: dynamic content alignment with abspos elements.</title>
+<link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#alignment">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#content-distribution">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-align-content">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-justify-content">
+<meta name="assert" content="Test that dynamically changing alignment for abspos flex items works as expected." />
+
+<style>
+body {
+  margin: 0px;
+  width: 800px;
+}
+
+.flex {
+  display: flex;
+  width: 100%;
+  height: 600px;
+  background: gray;
+  position: relative;
+}
+
+#item {
+  width: 140px;
+  height: 60px;
+  border: 1px solid purple;
+  position: absolute;
+}
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<script>
+  function updateAlignmentAndCheckLayout() {
+    let item = document.getElementById("item");
+    item.style.alignSelf = "center";
+    let container = document.getElementById("container");
+    container.style.justifyContent = "center";
+    checkLayout('.flex');
+  }
+</script>
+</head>
+
+<body onload="updateAlignmentAndCheckLayout()">
+
+  <div class="flex" id="container" data-expected-width="800" data-expected-height="600">
+    <div id="item" data-offset-x="329" data-offset-y="269" data-expected-width="142" data-expected-height="62"></div>
+  </div>
+
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-001-print.html b/tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-001-print.html
index 2fbf939f6a5..29796771451 100644
--- a/tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-001-print.html
+++ b/tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-001-print.html
@@ -13,6 +13,10 @@
   <style>
   @page { size:5in 3in; margin:0.5in; }
 
+  :root {
+    print-color-adjust: exact;
+  }
+
   html, body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-002-print.html b/tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-002-print.html
index cc6037a8713..06daebec289 100644
--- a/tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-002-print.html
+++ b/tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-002-print.html
@@ -13,6 +13,10 @@
   <style>
   @page { size:5in 3in; margin:0.5in; }
 
+  :root {
+    print-color-adjust: exact;
+  }
+
   html, body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-print-ref.html b/tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-print-ref.html
index d4a678d0746..6b32a2066ab 100644
--- a/tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-print-ref.html
+++ b/tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-print-ref.html
@@ -10,6 +10,10 @@
   <style>
   @page { size:5in 3in; margin:0.5in; }
 
+  :root {
+    print-color-adjust: exact;
+  }
+
   html, body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-flexbox/fixed-table-layout-with-percentage-width-in-flex-item.html b/tests/wpt/tests/css/css-flexbox/fixed-table-layout-with-percentage-width-in-flex-item.html
index 507e0e9fcef..66cefc8f23c 100644
--- a/tests/wpt/tests/css/css-flexbox/fixed-table-layout-with-percentage-width-in-flex-item.html
+++ b/tests/wpt/tests/css/css-flexbox/fixed-table-layout-with-percentage-width-in-flex-item.html
@@ -7,7 +7,7 @@
   <link rel="author" title="Mozilla" href="https://www.mozilla.org">
   <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1469649">
   <link rel="match" href="fixed-table-layout-with-percentage-width-in-flex-item-ref.html">
-  <meta name="assert" content="This test verifies that each flex item with a table descendant should have the the same definite post-flexing main size.">
+  <meta name="assert" content="This test verifies that each flex item with a table descendant should have the same definite post-flexing main size.">
 
   <style>
   .container {
diff --git a/tests/wpt/tests/css/css-flexbox/flex-direction.html b/tests/wpt/tests/css/css-flexbox/flex-direction.html
index 709b1b036a2..01c6778a122 100644
--- a/tests/wpt/tests/css/css-flexbox/flex-direction.html
+++ b/tests/wpt/tests/css/css-flexbox/flex-direction.html
@@ -5,7 +5,7 @@
 <link rel="author" title="houzhenyu" href="http://www.github.com/sskyy" />
 <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-direction">
 <link rel="match" href="reference/flex-direction.html">
-<meta name="assert" content="The flow of flex items in the the flex container should observe the flex-direction property." />
+<meta name="assert" content="The flow of flex items in the flex container should observe the flex-direction property." />
 <style>
     .flex-container{
         display: flex;
diff --git a/tests/wpt/tests/css/css-flexbox/flex-shorthand-calc.html b/tests/wpt/tests/css/css-flexbox/flex-shorthand-calc.html
new file mode 100644
index 00000000000..2cbd1c20c28
--- /dev/null
+++ b/tests/wpt/tests/css/css-flexbox/flex-shorthand-calc.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<title>CSS Flexbox Test: Allow complex calc expressions in flex shorthand</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#flex-property">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/shorthand-testcommon.js"></script>
+<div>
+  <div id="target"></div>
+</div>
+<script>
+  test_shorthand_value('flex', 'sign(1em - 1px) sibling-index()', {
+    'flex-grow': 'sign(1em - 1px)',
+    'flex-shrink': 'sibling-index()',
+    'flex-basis': '0%'
+  });
+</script>
diff --git a/tests/wpt/tests/css/css-flexbox/gap-007-lr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-007-lr-ref.html
index a3b461fa127..6000deb6243 100644
--- a/tests/wpt/tests/css/css-flexbox/gap-007-lr-ref.html
+++ b/tests/wpt/tests/css/css-flexbox/gap-007-lr-ref.html
@@ -14,6 +14,7 @@
     display: inline-flex;
     flex-direction: column;
     flex-wrap: wrap;
+    line-height: 18px;
   }
   section > div{
     background-color: grey;
diff --git a/tests/wpt/tests/css/css-flexbox/gap-007-lr.html b/tests/wpt/tests/css/css-flexbox/gap-007-lr.html
index 9d0a3717816..567dad749da 100644
--- a/tests/wpt/tests/css/css-flexbox/gap-007-lr.html
+++ b/tests/wpt/tests/css/css-flexbox/gap-007-lr.html
@@ -20,6 +20,7 @@
     flex-direction: column;
     flex-wrap: wrap;
     gap: 20px;
+    line-height: 18px;
   }
   section > div{
     background-color: grey;
diff --git a/tests/wpt/tests/css/css-flexbox/gap-007-ltr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-007-ltr-ref.html
index 13741eb9bd3..9972a8c5ccf 100644
--- a/tests/wpt/tests/css/css-flexbox/gap-007-ltr-ref.html
+++ b/tests/wpt/tests/css/css-flexbox/gap-007-ltr-ref.html
@@ -10,6 +10,7 @@
     display: inline-flex;
     flex-direction: column;
     flex-wrap: wrap;
+    line-height: 18px;
   }
   section > div{
     background-color: grey;
diff --git a/tests/wpt/tests/css/css-flexbox/gap-007-ltr.html b/tests/wpt/tests/css/css-flexbox/gap-007-ltr.html
index 6b24fc44eea..e0dfc48f788 100644
--- a/tests/wpt/tests/css/css-flexbox/gap-007-ltr.html
+++ b/tests/wpt/tests/css/css-flexbox/gap-007-ltr.html
@@ -16,6 +16,7 @@
     flex-direction: column;
     flex-wrap: wrap;
     gap: 20px;
+    line-height: 18px;
   }
   section > div{
     background-color: grey;
diff --git a/tests/wpt/tests/css/css-flexbox/gap-007-rl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-007-rl-ref.html
index 1ca3b5cea98..9dfc1860b52 100644
--- a/tests/wpt/tests/css/css-flexbox/gap-007-rl-ref.html
+++ b/tests/wpt/tests/css/css-flexbox/gap-007-rl-ref.html
@@ -14,6 +14,7 @@
     display: inline-flex;
     flex-direction: column;
     flex-wrap: wrap;
+    line-height: 18px;
   }
   section > div{
     background-color: grey;
diff --git a/tests/wpt/tests/css/css-flexbox/gap-007-rl.html b/tests/wpt/tests/css/css-flexbox/gap-007-rl.html
index 1461416abe9..dd0af032bad 100644
--- a/tests/wpt/tests/css/css-flexbox/gap-007-rl.html
+++ b/tests/wpt/tests/css/css-flexbox/gap-007-rl.html
@@ -20,6 +20,7 @@
     flex-direction: column;
     flex-wrap: wrap;
     gap: 20px;
+    line-height: 18px;
   }
   section > div{
     background-color: grey;
diff --git a/tests/wpt/tests/css/css-flexbox/gap-007-rtl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-007-rtl-ref.html
index 9e329cc0a44..8c16fbdb22c 100644
--- a/tests/wpt/tests/css/css-flexbox/gap-007-rtl-ref.html
+++ b/tests/wpt/tests/css/css-flexbox/gap-007-rtl-ref.html
@@ -14,6 +14,7 @@
     display: inline-flex;
     flex-direction: column;
     flex-wrap: wrap;
+    line-height: 18px;
   }
   section > div{
     background-color: grey;
diff --git a/tests/wpt/tests/css/css-flexbox/gap-007-rtl.html b/tests/wpt/tests/css/css-flexbox/gap-007-rtl.html
index cff3440a760..d043f03a8da 100644
--- a/tests/wpt/tests/css/css-flexbox/gap-007-rtl.html
+++ b/tests/wpt/tests/css/css-flexbox/gap-007-rtl.html
@@ -20,6 +20,7 @@
     flex-direction: column;
     flex-wrap: wrap;
     gap: 20px;
+    line-height: 18px;
   }
   section > div{
     background-color: grey;
diff --git a/tests/wpt/tests/css/css-flexbox/overflow-area-001.html b/tests/wpt/tests/css/css-flexbox/overflow-area-001.html
index 10685c6e84a..ac0573a7282 100644
--- a/tests/wpt/tests/css/css-flexbox/overflow-area-001.html
+++ b/tests/wpt/tests/css/css-flexbox/overflow-area-001.html
@@ -15,7 +15,7 @@
   overflow: scroll;
   border: solid blue;
   background: aqua;
-  margin: 1em 0.5em;
+  margin: 0.5em;
   float: left;
 }
 div {
diff --git a/tests/wpt/tests/css/css-flexbox/overflow-area-002.html b/tests/wpt/tests/css/css-flexbox/overflow-area-002.html
index 1287270f1ef..24fb312397d 100644
--- a/tests/wpt/tests/css/css-flexbox/overflow-area-002.html
+++ b/tests/wpt/tests/css/css-flexbox/overflow-area-002.html
@@ -16,7 +16,7 @@
   overflow: scroll;
   border: solid blue;
   background: aqua;
-  margin: 1em 0.5em;
+  margin: 0.5em;
   float: left;
 }
 div {
diff --git a/tests/wpt/tests/css/css-flexbox/overflow-area-003.html b/tests/wpt/tests/css/css-flexbox/overflow-area-003.html
index ff86dea30f1..382fb886339 100644
--- a/tests/wpt/tests/css/css-flexbox/overflow-area-003.html
+++ b/tests/wpt/tests/css/css-flexbox/overflow-area-003.html
@@ -22,7 +22,7 @@
     width: 60px;
     height: 60px;
     background: teal;
-    margin: 1em 0.5em;
+    margin: 0.5em;
     float: left;
   }
 
diff --git a/tests/wpt/tests/css/css-flexbox/parsing/flex-computed.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-computed.html
index ea1f4f6fa45..074d0f7395c 100644
--- a/tests/wpt/tests/css/css-flexbox/parsing/flex-computed.html
+++ b/tests/wpt/tests/css/css-flexbox/parsing/flex-computed.html
@@ -9,13 +9,19 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/computed-testcommon.js"></script>
 <style>
+  #container {
+    container-type: inline-size;
+    width: 10px;
+  }
   #target {
     font-size: 40px;
   }
 </style>
 </head>
 <body>
-<div id="target"></div>
+<div id="container">
+    <div id="target"></div>
+</div>
 <script>
 test_computed_value("flex", "none", "0 0 auto");
 test_computed_value("flex", "1", "1 1 0%");
@@ -25,6 +31,12 @@ test_computed_value("flex", "7% 8", "8 1 7%");
 test_computed_value("flex", "8 auto", "8 1 auto");
 test_computed_value("flex", "calc(10px + 0.5em)", "1 1 30px");
 test_computed_value("flex", "calc(10px - 0.5em)", "1 1 0px");
+test_computed_value("flex", "1 1 calc(10em)", "1 1 400px");
+test_computed_value("flex", "1 1 calc(-10em)", "1 1 0px");
+test_computed_value("flex", "calc(10 + (sign(20cqw - 10px) * 5)) calc(10 + (sign(20cqw - 10px) * 5)) 1px", "5 5 1px");
+test_computed_value("flex", "1 1 calc(10px + (sign(20cqw - 10px) * 5px))", "1 1 5px");
+test_computed_value("flex", "calc(1) calc(2 + 1) calc(3px)", "1 3 3px");
+test_computed_value("flex", "calc(-1) calc(-1) 0", "0 0 0px");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-flexbox/parsing/flex-invalid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-invalid.html
index ae010d7b4b4..d47f8b67930 100644
--- a/tests/wpt/tests/css/css-flexbox/parsing/flex-invalid.html
+++ b/tests/wpt/tests/css/css-flexbox/parsing/flex-invalid.html
@@ -16,6 +16,8 @@ test_invalid_value("flex", "none 1");
 test_invalid_value("flex", "2 3 4");
 test_invalid_value("flex", "5px 7%");
 test_invalid_value("flex", "9 none");
+test_invalid_value("flex", "1 2 calc(0)");
+test_invalid_value("flex", "1 2 calc(3 - 3)");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-flexbox/parsing/flex-valid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-valid.html
index f3eaf118da6..4c57fe4e253 100644
--- a/tests/wpt/tests/css/css-flexbox/parsing/flex-valid.html
+++ b/tests/wpt/tests/css/css-flexbox/parsing/flex-valid.html
@@ -9,15 +9,37 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
+<style>
+  #container {
+    container-type: inline-size;
+    width: 10px;
+  }
+  #target {
+    font-size: 40px;
+  }
+</style>
 </head>
 <body>
+<div id="container">
+    <div id="target"></div>
+</div>
 <script>
 test_valid_value("flex", "none", "0 0 auto");
 test_valid_value("flex", "1", "1 1 0%");
 test_valid_value("flex", "2 3", "2 3 0%");
 test_valid_value("flex", "4 5 6px");
+test_valid_value("flex", "6px 4 5", "4 5 6px");
+test_valid_value("flex", "6px 4", "4 1 6px");
+test_valid_value("flex", "6px", "1 1 6px");
 test_valid_value("flex", "7% 8", "8 1 7%");
 test_valid_value("flex", "8 auto", "8 1 auto");
+test_valid_value("flex", "1 1 10em", "1 1 10em");
+test_valid_value("flex", "1 1 calc(10em)", "1 1 calc(10em)");
+test_valid_value("flex", "1 1 calc(-10em)", "1 1 calc(-10em)");
+test_valid_value("flex", "calc(10 + (sign(20cqw - 10px) * 5)) calc(10 + (sign(20cqw - 10px) * 5)) 1px", "calc(10 + (5 * sign(20cqw - 10px))) calc(10 + (5 * sign(20cqw - 10px))) 1px");
+test_valid_value("flex", "1 1 calc(10px + (sign(20cqw - 10px) * 5px))", "1 1 calc(10px + (5px * sign(20cqw - 10px)))");
+test_valid_value("flex", "calc(1) calc(2 + 1) calc(3px)", "calc(1) calc(3) calc(3px)");
+test_valid_value("flex", "calc(-1) calc(-1) 0", "calc(-1) calc(-1) 0px");
 
 // The following is not yet supported by browsers:
 // test_valid_value("flex", "content");
diff --git a/tests/wpt/tests/css/css-flexbox/percent-height-flex-items-cross-sizes-with-mutations.html b/tests/wpt/tests/css/css-flexbox/percent-height-flex-items-cross-sizes-with-mutations.html
new file mode 100644
index 00000000000..87f20000f1f
--- /dev/null
+++ b/tests/wpt/tests/css/css-flexbox/percent-height-flex-items-cross-sizes-with-mutations.html
@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#layout-algorithm">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<meta name="assert" content="Tests that the cross size of flexboxes and flex items with % height are computed correctly with various mutations.">
+<style>
+.flexbox {
+  display: flex;
+  font: 10px/1 Ahem;
+  outline: 1px solid black;
+}
+.grid {
+  display: grid;
+  outline: 1px solid magenta;
+}
+.flexbox > div {
+  width: min-content;
+  outline: 1px solid blue;
+}
+.percent-height {
+  min-height: 100%;
+}
+.fixed-height {
+  height: 100px;
+}
+.align-start {
+  align-items: start;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+function mutateContent() {
+  document.querySelectorAll("#one, #two, #three").forEach((element) => {
+    element.innerHTML += " a";
+  });
+
+  document.querySelector("#four").style.width = "auto";
+  document.querySelector("#five").style.height = "auto";
+  document.querySelector("#six").style.height = "100px";
+
+  document.querySelectorAll("#seven, #eight").forEach((element) => {
+    element.style.alignItems = "start";
+  });
+}
+</script>
+</head>
+<body>
+
+<!-- Non-percent height flex item is mutated and percent height flex item should be
+     stretched up. -->
+<div class="flexbox test" data-expected-height="40">
+  <div id="one" class="test" data-expected-height="40">a a a</div>
+  <div class="percent-height test" data-expected-height="40">a</div>
+</div>
+
+<!-- Non-percent height flex item content is mutated and should be stretched to percent
+     height flex item's size. -->
+<div class="flexbox test" data-expected-height="40">
+  <div id="two" class="min-content percent-height test" data-expected-height="40">a a a</div>
+  <div class="test" data-expected-height="40">a</div>
+</div>
+
+<!-- Percent height flex item content is mutated and increased flexbox's cross axis size. -->
+<div class="flexbox test" data-expected-height="30">
+  <div class="min-content percent-height test" data-expected-height="30">a a a</div>
+  <div id="three" data-expected-height="30">a</div>
+</div>
+
+<!-- Percent height flex item's main axis size changes from min-content to auto which
+     should result in different cross size. -->
+<div class="flexbox test" data-expected-height="10">
+  <div class="min-content percent-height test" id="four" data-expected-height="10">a a a</div>
+</div>
+
+<!-- Flexbox with align-items: flex-start changes from definite to indefinite cross size
+     which results in different hypothetical cross size for flex item.-->
+<div class="flexbox fixed-height align-start test" id="five" data-expected-height="30">
+  <div class="min-content percent-height test" data-expected-height="30">a a a</div>
+  <div class="test" data-expected-height="10">a</div>
+</div>
+
+
+<!-- Flexbox with align-items: flex-start changes from indefinite to definite cross size
+     which results in different hypothetical cross size for the flex item. -->
+<div class="flexbox align-start test" id="six" data-expected-height="100">
+  <div class="min-content percent-height test" data-expected-height="100">a a a</div>
+</div>
+
+<!-- Outer flexbox goes from stretching its content to no longer stretching with a
+     definite cross size. The inner flexbox is no longer stretching which affects the
+     hypothetical cross axis size of its flex item. -->
+<div class="flexbox fixed-height test" id="seven" data-expected-height="100"">
+  <div class="flexbox align-start test" data-expected-height="30">
+    <div class="min-content percent-height test" data-expected-height="30">a a a</div>
+  </div>
+</div>
+
+<!-- Grid goes from stretching its content to no longer stretching with a definite cross
+     size. The flexbox is no longer stretching which affects the hypothetical cross axis
+     size of tis flex item.-->
+<div class="grid fixed-height test" id="eight" data-expected-height="100">
+  <div class="flexbox align-start test" data-expected-height="30">
+    <div class="min-content percent-height test" data-expected-height="30">a a a</div>
+  </div>
+</div>
+
+</body>
+<script>
+document.body.offsetHeight;
+mutateContent();
+document.body.offsetHeight;
+
+let tests = document.querySelectorAll(".test");
+tests.forEach((element) => {
+  test(function() {
+    let expectedHeight = element.getAttribute("data-expected-height");
+    assert_equals(element.offsetHeight, Number(expectedHeight), "height");
+  });
+});
+</script>
+</html>
+
diff --git a/tests/wpt/tests/css/css-flexbox/reference/overflow-area-001-ref.html b/tests/wpt/tests/css/css-flexbox/reference/overflow-area-001-ref.html
index 2c2a825f41e..cd13c7e0915 100644
--- a/tests/wpt/tests/css/css-flexbox/reference/overflow-area-001-ref.html
+++ b/tests/wpt/tests/css/css-flexbox/reference/overflow-area-001-ref.html
@@ -12,7 +12,7 @@
   overflow: scroll;
   border: solid blue;
   background: aqua;
-  margin: 1em 0.5em;
+  margin: 0.5em;
   float: left;
   width: 80px;
   height: 80px;
diff --git a/tests/wpt/tests/css/css-flexbox/reference/overflow-area-002-ref.html b/tests/wpt/tests/css/css-flexbox/reference/overflow-area-002-ref.html
index f5d06c6cf3e..6422d4f7dfb 100644
--- a/tests/wpt/tests/css/css-flexbox/reference/overflow-area-002-ref.html
+++ b/tests/wpt/tests/css/css-flexbox/reference/overflow-area-002-ref.html
@@ -13,7 +13,7 @@
   overflow: scroll;
   border: solid blue;
   background: aqua;
-  margin: 1em 0.5em;
+  margin: 0.5em;
   float: left;
   width: 80px;
   height: 80px;
diff --git a/tests/wpt/tests/css/css-flexbox/reference/overflow-area-003-ref.html b/tests/wpt/tests/css/css-flexbox/reference/overflow-area-003-ref.html
index 2d9bf19922c..40df8cb5a8b 100644
--- a/tests/wpt/tests/css/css-flexbox/reference/overflow-area-003-ref.html
+++ b/tests/wpt/tests/css/css-flexbox/reference/overflow-area-003-ref.html
@@ -17,7 +17,7 @@
      width: 60px;
      height: 60px;
      background: teal;
-     margin: 1em 0.5em;
+     margin: 0.5em;
      float: left;
    }
   </style>
diff --git a/tests/wpt/tests/css/css-flexbox/stretch-requires-computed-auto-size.html b/tests/wpt/tests/css/css-flexbox/stretch-requires-computed-auto-size.html
new file mode 100644
index 00000000000..01bc822af2a
--- /dev/null
+++ b/tests/wpt/tests/css/css-flexbox/stretch-requires-computed-auto-size.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<title>Stretch alignment with percentage that behaves as auto</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#valdef-align-items-stretch">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/4525">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="
+  Stretch alignment requires a computed cross size of `auto`.
+  So a cyclic percentage that only behaves as `auto` doesn't stretch.
+">
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="display: flex">
+  <div style="width: 100px; height: 100px; background: green"></div>
+  <div style="width: 100px; height: 50%; background: red"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-font-loading/WEB_FEATURES.yml b/tests/wpt/tests/css/css-font-loading/WEB_FEATURES.yml
new file mode 100644
index 00000000000..22137bf8279
--- /dev/null
+++ b/tests/wpt/tests/css/css-font-loading/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: font-metric-overrides
+  files:
+  - fontface-override-descriptor-getter-setter.sub.html
diff --git a/tests/wpt/tests/css/css-fonts/WEB_FEATURES.yml b/tests/wpt/tests/css/css-fonts/WEB_FEATURES.yml
index dd313f81ed6..856ded1a75b 100644
--- a/tests/wpt/tests/css/css-fonts/WEB_FEATURES.yml
+++ b/tests/wpt/tests/css/css-fonts/WEB_FEATURES.yml
@@ -31,3 +31,8 @@ features:
 - name: font-variant-position
   files:
   - font-variant-position-*
+- name: font-metric-overrides
+  files:
+  - ascent-descent-override.html
+  - line-gap-override.html
+  - metrics-override-normal-keyword.html
diff --git a/tests/wpt/tests/css/css-fonts/font-shorthand-serialization-font-stretch.html b/tests/wpt/tests/css/css-fonts/font-shorthand-serialization-font-stretch.html
index 3079cc06e7e..7bc591ec73d 100644
--- a/tests/wpt/tests/css/css-fonts/font-shorthand-serialization-font-stretch.html
+++ b/tests/wpt/tests/css/css-fonts/font-shorthand-serialization-font-stretch.html
@@ -94,7 +94,7 @@ test(function() {
     assert_equals(div.style.font, "ultra-condensed medium serif");
 
     div.style.fontStretch = "calc(50% + 25% * sign(100em - 1px))";
-    assert_equals(div.style.fontStretch, "calc(50% + 25% * sign(100em - 1px))");
+    assert_equals(div.style.fontStretch, "calc(50% + (25% * sign(100em - 1px)))");
     assert_equals(div.style.font, "");
 }, "calc() transformation into keywords");
 
diff --git a/tests/wpt/tests/css/css-fonts/font-variant-emoji-003-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-emoji-003-ref.html
index 1e8cdb89cfa..f14584c1323 100644
--- a/tests/wpt/tests/css/css-fonts/font-variant-emoji-003-ref.html
+++ b/tests/wpt/tests/css/css-fonts/font-variant-emoji-003-ref.html
@@ -3,6 +3,11 @@
 <title>CSS Fonts: font-variant-emoji web font test</title>
 <link rel="stylesheet" type="text/css" href="support/css/variation-sequences.css" />
 <style>
+  div {
+    height: 2em;
+    font: 24px/1.5 serif;
+  }
+
   .color {
     font-family: "ColorEmojiFont";
   }
@@ -15,13 +20,13 @@
 <p>Emoji Default</p>
 <div>
   <span class="color">&#x1fae8;</span>
-  <span class="mono">&#x1fae8;</span>
+  <span class="mono">&#x1fae8;&#xfe0e;</span>
   <span class="color">&#x1fae8;</span>
 </div>
 
 <p>Text Default</p>
 <div>
-  <span class="color">&#x2139;</span>
+  <span class="color">&#x2139;&#xfe0f;</span>
   <span class="mono">&#x2139;</span>
   <span class="mono">&#x2139;</span>
 </div>
diff --git a/tests/wpt/tests/css/css-fonts/font-variant-emoji-003.html b/tests/wpt/tests/css/css-fonts/font-variant-emoji-003.html
index e197afa7c40..a8f3f15e19b 100644
--- a/tests/wpt/tests/css/css-fonts/font-variant-emoji-003.html
+++ b/tests/wpt/tests/css/css-fonts/font-variant-emoji-003.html
@@ -7,6 +7,19 @@
 <meta name="assert" content="font-variant-emoji sets an emoji's presentation for the emoji default and text default emoji codepoints and affects the fallback font selection."/>
 <link rel="stylesheet" type="text/css" href="support/css/variation-sequences.css" />
 <style>
+    div {
+      height: 2em;
+      font: 24px/1.5 serif;
+    }
+
+    .color-first span {
+      font-family: ColorEmojiFont, MonoEmojiFont;
+    }
+
+    .mono-first span {
+      font-family: MonoEmojiFont, ColorEmojiFont;
+    }
+
     .emoji {
       font-variant-emoji: emoji;
     }
@@ -26,7 +39,7 @@
 See https://www.unicode.org/Public/15.1.0/ucd/emoji/emoji-data.txt.
 So when font-variant-emoji is set to `unicode`, the codepoint
 should be displayed in color. -->
-<div style="font-family: MonoEmojiFont, ColorEmojiFont;">
+<div class="mono-first">
   <span class="emoji">&#x1fae8;</span>
   <span class="text">&#x1fae8;</span>
   <span class="unicode">&#x1fae8;</span>
@@ -38,7 +51,7 @@ should be displayed in color. -->
 See https://www.unicode.org/Public/15.1.0/ucd/emoji/emoji-data.txt.
 So when font-variant-emoji is set to `unicode`, the codepoint
 should be displayed in monochrome. -->
-<div style="font-family: ColorEmojiFont, MonoEmojiFont;">
+<div class="color-first">
   <span class="emoji">&#x2139;</span>
   <span class="text">&#x2139;</span>
   <span class="unicode">&#x2139;</span>
diff --git a/tests/wpt/tests/css/css-fonts/font-variant-emoji-004-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-emoji-004-ref.html
index b15c8227cc4..633a94c4e51 100644
--- a/tests/wpt/tests/css/css-fonts/font-variant-emoji-004-ref.html
+++ b/tests/wpt/tests/css/css-fonts/font-variant-emoji-004-ref.html
@@ -3,6 +3,11 @@
 <title>CSS Fonts: font-variant-emoji web font test</title>
 <link rel="stylesheet" type="text/css" href="support/css/variation-sequences.css" />
 <style>
+  div {
+    height: 2em;
+    font: 24px/1.5 serif;
+  }
+
   .color {
     font-family: "ColorEmojiFont";
   }
@@ -13,17 +18,17 @@
 </style>
 
 <p>Variation Selector 15</p>
-<div class="mono">
-  <span>&#x1fae8;</span>
-  <span>&#x1fae8;</span>
-  <span>&#x1fae8;</span>
-  <span>&#x2139;</span>
+<div>
+  <span class="mono">&#x1fae8;&#xfe0e;</span>
+  <span class="mono">&#x1fae8;&#xfe0e;</span>
+  <span class="mono">&#x1fae8;&#xfe0e;</span>
+  <span class="mono">&#x2139;</span>
 </div>
 
 <p>Variation Selector 16</p>
-<div class="color">
-  <span>&#x1fae8;</span>
-  <span>&#x1fae8;</span>
-  <span>&#x1fae8;</span>
-  <span>&#x2139;</span>
-</div>
\ No newline at end of file
+<div>
+  <span class="color">&#x1fae8;</span>
+  <span class="color">&#x1fae8;</span>
+  <span class="color">&#x1fae8;</span>
+  <span class="color">&#x2139;&#xfe0f;</span>
+</div>
diff --git a/tests/wpt/tests/css/css-fonts/font-variant-emoji-004.html b/tests/wpt/tests/css/css-fonts/font-variant-emoji-004.html
index d76828dff01..39a910f03de 100644
--- a/tests/wpt/tests/css/css-fonts/font-variant-emoji-004.html
+++ b/tests/wpt/tests/css/css-fonts/font-variant-emoji-004.html
@@ -7,6 +7,19 @@
 <meta name="assert" content="Variation Selector 15 (U+FE0E) or Variation Selector 16 (U+FE0F) in the contents of an element override the rendering specified by font-variant-emoji property."/>
 <link rel="stylesheet" type="text/css" href="support/css/variation-sequences.css" />
 <style>
+    div {
+      height: 2em;
+      font: 24px/1.5 serif;
+    }
+
+    .color-first span {
+      font-family: ColorEmojiFont, MonoEmojiFont;
+    }
+
+    .mono-first span {
+      font-family: MonoEmojiFont, ColorEmojiFont;
+    }
+
     .emoji {
       font-variant-emoji: emoji;
     }
@@ -21,7 +34,7 @@
 </style>
 
 <p>Variation Selector 15</p>
-<div style="font-family: ColorEmojiFont, MonoEmojiFont;">
+<div class="color-first">
   <span class="text">&#x1fae8;&#xfe0e;</span>
   <span class="emoji">&#x1fae8;&#xfe0e;</span>
   <span class="unicode">&#x1fae8;&#xfe0e;</span>
@@ -29,7 +42,7 @@
 </div>
 
 <p>Variation Selector 16</p>
-<div style="font-family: MonoEmojiFont, ColorEmojiFont;">
+<div class="mono-first">
   <span class="text">&#x1fae8;&#xfe0f;</span>
   <span class="emoji">&#x1fae8;&#xfe0f;</span>
   <span class="unicode">&#x1fae8;&#xfe0f;</span>
diff --git a/tests/wpt/tests/css/css-fonts/font-variant-emoji-005-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-emoji-005-ref.html
new file mode 100644
index 00000000000..d4275b5c951
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/font-variant-emoji-005-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="UTF-8" />
+<title>CSS Fonts reference</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+body { background: white; }
+p { font: 16px/3 serif; }
+span { color: white; font: 25px Ahem; }
+span span { color: initial; font-variant-emoji: emoji; }
+</style>
+
+<h4>Only lines 3 and 4 should show a keycap numeral:</h4>
+
+<p>1. text: <span>X</span></p>
+
+<p>2. unicode: <span>X</span></p>
+
+<p>3. emoji: <span>X<span>3&#xfe0f;&#x20e3;</span>X</span></p>
+
+<p>4. with VS16: <span>X<span>4&#xfe0f;&#x20e3;</span>X</span></p>
+
+<p>5. emoji, with VS15: <span>X</span></p>
diff --git a/tests/wpt/tests/css/css-fonts/font-variant-emoji-005.html b/tests/wpt/tests/css/css-fonts/font-variant-emoji-005.html
new file mode 100644
index 00000000000..0f5c2d7a98a
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/font-variant-emoji-005.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="UTF-8" />
+<title>CSS Fonts: font-variant-emoji web font test</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-variant-emoji-prop" />
+<link rel="help" href="https://www.unicode.org/reports/tr51/tr51-25.html#Emoji_Properties_and_Data_Files" />
+<link rel="match" href="font-variant-emoji-005-ref.html"/>
+<meta name="assert" content="Digit-keycap sequences render as emoji if required, in preference to using the named font"/>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+body { background: white; }
+p { font: 16px/3 serif; }
+/* A color-emoji glyph in the span will be visible despite the white color;
+ * if color-emoji presentation is not used, the span will be invisible.
+ */
+span { color: white; font: 25px Ahem; }
+</style>
+
+<h4>Only lines 3 and 4 should show a keycap numeral:</h4>
+
+<p>1. text: <span style="font-variant-emoji: text">X1&#x20e3;X</span></p>
+
+<p>2. unicode: <span style="font-variant-emoji: unicode">X2&#x20e3;X</span></p>
+
+<p>3. emoji: <span style="font-variant-emoji: emoji">X3&#x20e3;X</span></p>
+
+<p>4. with VS16: <span style="font-variant-emoji: normal">X4&#xfe0f;&#x20e3;X</span></p>
+
+<p>5. emoji, with VS15: <span style="font-variant-emoji: emoji">X5&#xfe0e;&#x20e3;X</span></p>
diff --git a/tests/wpt/tests/css/css-fonts/font-variation-settings-calc.html b/tests/wpt/tests/css/css-fonts/font-variation-settings-calc.html
new file mode 100644
index 00000000000..f9ecbfe1941
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/font-variation-settings-calc.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<title>CSS Fonts Test: Allow complex calc expressions in font-variation-settings</title>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#propdef-font-variation-settings">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<div>
+  <div id="target"></div>
+</div>
+<script>
+  test_valid_value('font-variation-settings', '"wght" sign(1em - 1px)');
+  test_valid_value('font-variation-settings', '"wght" sibling-index()');
+  test_valid_value('font-variation-settings', '"wght" calc(10)');
+  test_valid_value('font-variation-settings', '"wght" sign(2px)', '"wght" calc(1)');
+  test_computed_value('font-variation-settings', '"wght" sign(1em - 1px)', '"wght" 1');
+  test_computed_value('font-variation-settings', '"wght" sibling-index()', '"wght" 1');
+  test_computed_value('font-variation-settings', '"wght" calc(10)', '"wght" 10');
+  test_computed_value('font-variation-settings', '"wght" sign(2px)', '"wght" 1');
+</script>
diff --git a/tests/wpt/tests/css/css-fonts/parsing/font-palette-values-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-palette-values-invalid.html
index a3a0a88ba68..32c9c4c5efe 100644
--- a/tests/wpt/tests/css/css-fonts/parsing/font-palette-values-invalid.html
+++ b/tests/wpt/tests/css/css-fonts/parsing/font-palette-values-invalid.html
@@ -140,13 +140,18 @@
 @font-palette-values --A {
     override-colors: 0 color-mix(in lch, red, color-mix(in lch, currentcolor, black));
 }
+
+/* 24 */
+@font-palette-values --A {
+    base-palette: sibling-index();
+}
 </style>
 </head>
 <body>
 <script>
 let rules = document.getElementById("style").sheet.cssRules;
 test(function() {
-    assert_equals(rules.length, 24);
+    assert_equals(rules.length, 25);
 });
 
 test(function() {
@@ -343,6 +348,13 @@ test(function() {
     assert_equals(text.indexOf("override-colors"), -1);
     assert_equals(rule.overrideColors, "");
 });
+
+test(function() {
+    let text = rules[24].cssText;
+    let rule = rules[24];
+    assert_equals(text.indexOf("base-palette"), -1);
+    assert_equals(rule.basePalette, "");
+}, "sibling-index() is invalid in base-palette descriptor");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-fonts/parsing/font-stretch-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-stretch-computed.html
deleted file mode 100644
index 42e1989b1ae..00000000000
--- a/tests/wpt/tests/css/css-fonts/parsing/font-stretch-computed.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS Fonts Module Level 4: getComputedStyle().fontStretch</title>
-<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-stretch-prop">
-<meta name="assert" content="font-stretch computed value is a percentage.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/computed-testcommon.js"></script>
-<style>
-  #container {
-    container-type: inline-size;
-    width: 10px;
-  }
-</style>
-</head>
-<body>
-<div id="container">
-  <div id="target"></div>
-</div>
-<script>
-test_computed_value('font-stretch', 'ultra-condensed', '50%');
-test_computed_value('font-stretch', 'extra-condensed', '62.5%');
-test_computed_value('font-stretch', 'condensed', '75%');
-test_computed_value('font-stretch', 'semi-condensed', '87.5%');
-test_computed_value('font-stretch', 'normal', '100%');
-test_computed_value('font-stretch', 'semi-expanded', '112.5%');
-test_computed_value('font-stretch', 'expanded', '125%');
-test_computed_value('font-stretch', 'extra-expanded', '150%');
-test_computed_value('font-stretch', 'ultra-expanded', '200%');
-
-test_computed_value('font-stretch', '234.5%');
-test_computed_value('font-stretch', 'calc(100%)', '100%');
-test_computed_value('font-stretch', 'calc(0%)', '0%');
-test_computed_value('font-stretch', 'calc(-100%)', '0%');
-test_computed_value('font-stretch', 'calc(100% + 100%)', '200%');
-test_computed_value('font-stretch', 'calc(100% + (sign(20cqw - 10px) * 5%))', '95%');
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-fonts/parsing/font-stretch-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-stretch-invalid.html
deleted file mode 100644
index 0f7f7c88975..00000000000
--- a/tests/wpt/tests/css/css-fonts/parsing/font-stretch-invalid.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS Fonts Module Level 4: parsing font-stretch with invalid values</title>
-<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-stretch-prop">
-<meta name="assert" content="font-stretch supports only the grammar 'normal | <percentage [0,∞]> | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra-expanded'.">
-<meta name="assert" content="Values less than 0% are invalid.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-</head>
-<body>
-<script>
-test_invalid_value('font-stretch', 'auto');
-test_invalid_value('font-stretch', 'normal, ultra-condensed');
-test_invalid_value('font-stretch', 'condensed expanded');
-test_invalid_value('font-stretch', '-50%');
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-fonts/parsing/font-stretch-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-stretch-valid.html
deleted file mode 100644
index 90cde603133..00000000000
--- a/tests/wpt/tests/css/css-fonts/parsing/font-stretch-valid.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS Fonts Module Level 4: parsing font-stretch with valid values</title>
-<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-stretch-prop">
-<meta name="assert" content="font-stretch supports the full grammar 'normal | <percentage [0,∞]> | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra-expanded'.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-</head>
-<body>
-<script>
-test_valid_value('font-stretch', 'normal');
-test_valid_value('font-stretch', 'ultra-condensed');
-test_valid_value('font-stretch', 'extra-condensed');
-test_valid_value('font-stretch', 'condensed');
-test_valid_value('font-stretch', 'semi-condensed');
-test_valid_value('font-stretch', 'semi-expanded');
-test_valid_value('font-stretch', 'expanded');
-test_valid_value('font-stretch', 'extra-expanded');
-test_valid_value('font-stretch', 'ultra-expanded');
-
-test_valid_value('font-stretch', '234.5%');
-test_valid_value('font-stretch', 'calc(100%)');
-test_valid_value('font-stretch', 'calc(0%)');
-test_valid_value('font-stretch', 'calc(-100%)');
-test_valid_value('font-stretch', 'calc(100% + 100%)', 'calc(200%)');
-test_valid_value('font-stretch', 'calc(100% + (sign(20cqw - 10px) * 5%))', 'calc(100% + (5% * sign(20cqw - 10px)))');
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-fonts/parsing/font-width-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-width-computed.html
new file mode 100644
index 00000000000..4e38a5d5e9a
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/parsing/font-width-computed.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 4: getComputedStyle().fontWidth</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-width-prop">
+<meta name="assert" content="font-width computed value is a percentage.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #container {
+    container-type: inline-size;
+    width: 10px;
+  }
+</style>
+</head>
+<body>
+<div id="container">
+  <div id="target"></div>
+</div>
+<script>
+for (const property of ['font-width','font-stretch']) {
+  test_computed_value(property, 'ultra-condensed', '50%');
+  test_computed_value(property, 'extra-condensed', '62.5%');
+  test_computed_value(property, 'condensed', '75%');
+  test_computed_value(property, 'semi-condensed', '87.5%');
+  test_computed_value(property, 'normal', '100%');
+  test_computed_value(property, 'semi-expanded', '112.5%');
+  test_computed_value(property, 'expanded', '125%');
+  test_computed_value(property, 'extra-expanded', '150%');
+  test_computed_value(property, 'ultra-expanded', '200%');
+
+  test_computed_value(property, '234.5%');
+  test_computed_value(property, 'calc(100%)', '100%');
+  test_computed_value(property, 'calc(0%)', '0%');
+  test_computed_value(property, 'calc(-100%)', '0%');
+  test_computed_value(property, 'calc(100% + 100%)', '200%');
+  test_computed_value(property, 'calc(100% + (sign(20cqw - 10px) * 5%))', '95%');
+}
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-fonts/parsing/font-width-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-width-invalid.html
new file mode 100644
index 00000000000..7f30eab3e5b
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/parsing/font-width-invalid.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 4: parsing font-width with invalid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-width-prop">
+<meta name="assert" content="font-width supports only the grammar 'normal | <percentage [0,∞]> | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra-expanded'.">
+<meta name="assert" content="Values less than 0% are invalid.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+for (const property of ['font-width','font-stretch']) {
+    test_invalid_value(property, 'auto');
+    test_invalid_value(property, 'normal, ultra-condensed');
+    test_invalid_value(property, 'condensed expanded');
+    test_invalid_value(property, '-50%');
+}
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-fonts/parsing/font-width-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-width-valid.html
new file mode 100644
index 00000000000..44cbb37fd60
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/parsing/font-width-valid.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 4: parsing font-width with valid values</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-width-prop">
+<meta name="assert" content="font-width supports the full grammar 'normal | <percentage [0,∞]> | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra-expanded'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+for (const property of ['font-width','font-stretch']) {
+    test_valid_value(property, 'normal');
+    test_valid_value(property, 'ultra-condensed');
+    test_valid_value(property, 'extra-condensed');
+    test_valid_value(property, 'condensed');
+    test_valid_value(property, 'semi-condensed');
+    test_valid_value(property, 'semi-expanded');
+    test_valid_value(property, 'expanded');
+    test_valid_value(property, 'extra-expanded');
+    test_valid_value(property, 'ultra-expanded');
+
+    test_valid_value(property, '234.5%');
+    test_valid_value(property, 'calc(100%)');
+    test_valid_value(property, 'calc(0%)');
+    test_valid_value(property, 'calc(-100%)');
+    test_valid_value(property, 'calc(100% + 100%)', 'calc(200%)');
+    test_valid_value(property, 'calc(100% + (sign(20cqw - 10px) * 5%))', 'calc(100% + (5% * sign(20cqw - 10px)))');
+}
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-fonts/test_font_feature_values_parsing.html b/tests/wpt/tests/css/css-fonts/test_font_feature_values_parsing.html
index 7a5844d5600..08c20142449 100644
--- a/tests/wpt/tests/css/css-fonts/test_font_feature_values_parsing.html
+++ b/tests/wpt/tests/css/css-fonts/test_font_feature_values_parsing.html
@@ -81,6 +81,7 @@ var testrules = [
   { rule: _("@styleset { ok-1: 1; }"), serializationSame: true },
   { rule: _("@annotation { ok-1: 3; }"), serializationSame: true },
   { rule: _("@stylistic { blah: 3; }"), serializationSame: true },
+  { rule: _("@stylistic { blah: sibling-index(); }"), serializationNoValueDefn: true },
   { rule: makeRule("bongo", "\n@styleset\n  { blah: 3; super-blah: 4 5;\n  more-blah: 5 6 7;\n }"), serializationSame: true },
   { rule: makeRule("bongo", "\n@styleset\n  {\n blah:\n 3\n;\n super-blah:\n 4\n 5\n;\n  more-blah:\n 5 6\n 7;\n }"), serializationSame: true },
 
diff --git a/tests/wpt/tests/css/css-gaps/agnostic/gap-decorations-001-ref.html b/tests/wpt/tests/css/css-gaps/agnostic/gap-decorations-001-ref.html
new file mode 100644
index 00000000000..a7314fc7dca
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/agnostic/gap-decorations-001-ref.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+  .container {
+    display: flex;
+    width: 110px;
+    height: 110px;
+    column-gap: 10px;
+    row-gap: 10px;
+    flex-wrap: wrap;
+  }
+
+  .item {
+    background: skyblue;
+    height: 50px;
+    width: 50px;
+    margin: 0;
+  }
+
+  .row-gap {
+    position: absolute;
+    top: 50px;
+    background: green;
+    width: 110px;
+    height: 10px;
+  }
+
+  .column-gap {
+    position: absolute;
+    top: 0px;
+    left: 50px;
+    background: pink;
+    height: 110px;
+    width: 10px;
+  }
+
+</style>
+<div class="container">
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+</div>
+
+<div class="column-gap"></div>
+<div class="row-gap"></div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-gaps/agnostic/gap-decorations-002-ref.html b/tests/wpt/tests/css/css-gaps/agnostic/gap-decorations-002-ref.html
new file mode 100644
index 00000000000..42c5ef128b4
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/agnostic/gap-decorations-002-ref.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+  .container {
+    display: flex;
+    width: 120px;
+    height: 110px;
+    column-gap: 20px;
+    row-gap: 10px;
+    flex-wrap: wrap;
+  }
+
+  .item {
+    background: skyblue;
+    height: 50px;
+    width: 50px;
+    margin: 0;
+  }
+
+  .row-gap {
+    position: absolute;
+    top: 50px;
+    background: gold;
+    width: 120px;
+    height: 10px;
+  }
+
+  .column-gap {
+    position: absolute;
+    top: 0px;
+    left: 50px;
+    background: blue;
+    height: 110px;
+    width: 20px;
+  }
+
+</style>
+<div class="container">
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+</div>
+
+<div class="row-gap"></div>
+<div class="column-gap"></div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-001.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-001.html
new file mode 100644
index 00000000000..b32e2f13d8c
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-001.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: column and row gaps are painted.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+  .flex-container {
+    display: flex;
+    column-gap: 10px;
+    row-gap: 10px;
+    height: 100px;
+    width: 100px;
+    background: red;
+    column-rule-color: green;
+    column-rule-style: solid;
+    column-rule-width: 10px;
+    row-rule-color: green;
+    row-rule-style: solid;
+    row-rule-width: 10px;
+
+    flex-wrap: wrap;
+  }
+
+  .flex-item {
+    background: green;
+    width: 45px;
+  }
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="flex-container">
+    <div class="flex-item"></div>
+    <div class="flex-item"></div>
+    <div class="flex-item"></div>
+    <div class="flex-item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-002.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-002.html
new file mode 100644
index 00000000000..58740200d4a
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-002.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: flex column gaps are painted with solid styling.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="../agnostic/gap-decorations-001-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .flex-container {
+    height: 110px;
+    width: 110px;
+
+    display: flex;
+
+    column-gap: 10px;
+    row-gap: 10px;
+
+    column-rule-color: pink;
+    column-rule-style: solid;
+    column-rule-width: 10px;
+
+    row-rule-color: green;
+    row-rule-style: solid;
+    row-rule-width: 10px;
+
+    flex-wrap: wrap;
+  }
+
+  .flex-item {
+    background: skyblue;
+    width: 50px;
+  }
+</style>
+<div class="flex-container">
+    <div class="flex-item"></div>
+    <div class="flex-item"></div>
+    <div class="flex-item"></div>
+    <div class="flex-item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-003-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-003-ref.html
new file mode 100644
index 00000000000..137a63474b8
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-003-ref.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+
+    .row-gap {
+        margin: 0px;
+        padding: 0px;
+        height: 10px;
+        background: blue;
+        width: 170px;
+        position: absolute;
+    }
+
+    .column-gap {
+        display: flex;
+        flex-direction: column;
+        row-gap: 60px;
+        height: 170px;
+        top: 2px;
+        width: 10px;
+        position: absolute;
+    }
+
+    .column {
+        background: red;
+        width: 10px;
+        height: 55px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
+
+<div id="columns1" style="left: 52px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns2" style="left: 112px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns3" style="left: 102px; position:absolute; top: 57px; height:60px;" class="column"></div>
+
+<div id="row1" class="row-gap" style="top: 52px; left: 2px;"></div>
+<div id="row2" class="row-gap" style="top: 112px; left: 2px;"></div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-003.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-003.html
new file mode 100644
index 00000000000..effab7fee24
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-003.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: flex column and row gaps are painted with solid styling.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="flex-gap-decorations-003-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        row-rule-style: solid;
+        row-rule-color: blue;
+        row-rule-width: 10px;
+        column-rule-style: solid;
+        column-rule-color: red;
+        column-rule-width: 10px;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-004-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-004-ref.html
new file mode 100644
index 00000000000..f77dd318db7
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-004-ref.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+
+    .row-gap {
+        margin: 0px;
+        padding: 0px;
+        height: 0px;
+        width: 170px;
+        border-bottom: 10px double;
+      border-color:blue;
+        position: absolute;
+    }
+
+    .column-gap {
+        display: flex;
+        flex-direction: column;
+        row-gap: 60px;
+        height: 170px;
+        top: 2px;
+        width: 10px;
+        position: absolute;
+    }
+
+    .column {
+        width: 0px;
+        border-left: 10px double red;
+        height: 55px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
+
+<div id="columns1" style="left: 52px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns2" style="left: 112px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="column3" style="left: 102px; position:absolute; top: 57px; height:60px;" class="column"></div>
+
+<div id="row1" class="row-gap" style="top: 52px; left: 2px;"></div>
+<div id="row2" class="row-gap" style="top: 112px; left: 2px;"></div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-004.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-004.html
new file mode 100644
index 00000000000..a5c0698e7fa
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-004.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: flex column and row gaps are painted with double styling.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="flex-gap-decorations-004-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        row-rule-style: double;
+        row-rule-color: blue;
+        row-rule-width: 10px;
+        column-rule-style: double;
+        column-rule-color: red;
+        column-rule-width: 10px;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-005-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-005-ref.html
new file mode 100644
index 00000000000..04b3e8d1af4
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-005-ref.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+
+    .row-gap {
+        margin: 0px;
+        padding: 0px;
+        height: 0px;
+        width: 170px;
+        left: 2px;
+        position: absolute;
+        border-bottom: 10px dotted blue;
+    }
+
+    .column-gap {
+        display: flex;
+        flex-direction: column;
+        row-gap: 60px;
+        height: 170px;
+        top: 2px;
+        width: 10px;
+        position: absolute;
+    }
+
+    .column {
+        width: 0px;
+        border-left: 10px dotted red;
+        height: 55px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
+
+<div id="columns1" style="left: 52px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns2" style="left: 112px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="column3" style="left: 102px; position:absolute; top: 57px; height:60px;" class="column"></div>
+
+<div class="row-gap" style="top: 52px"></div>
+<div class="row-gap" style="top: 112px"></div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-005.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-005.html
new file mode 100644
index 00000000000..1688d447d50
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-005.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: flex column and row gaps are painted with dotted styling.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="flex-gap-decorations-005-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        row-rule-style: dotted;
+        row-rule-color: blue;
+        row-rule-width: 10px;
+        column-rule-style: dotted;
+        column-rule-color: red;
+        column-rule-width: 10px;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-006-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-006-ref.html
new file mode 100644
index 00000000000..46c4fd49e39
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-006-ref.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox>* {
+        background-color: rgb(96 139 168 / 0.2);
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        border-width: 2px;
+        display: flex;
+        column-gap: 10px;
+        row-gap: 30px;
+        height: 300px;
+        width: 300px;
+        flex-wrap: wrap;
+        align-content: center;
+        writing-mode: vertical-lr;
+    }
+
+    .items {
+        width: 70px;
+        height: 70px;
+    }
+
+    .row-gap {
+        background-color: blue;
+        margin: 0px;
+        padding: 0px;
+        height: 300px;
+        width: 30px;
+        top: 2px;
+        left: 137px;
+        position: absolute;
+    }
+
+    .column-gap {
+        background-color: red;
+        margin: 0px;
+        padding: 0px;
+        height: 10px;
+        width: 170px;
+        left: 67px;
+        position: absolute;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+</div>
+
+<div id="column1" class="column-gap" style="top:72px;"></div>
+<div id="column2" class="column-gap" style="top: 152px;"></div>
+
+<div id="row1" class="row-gap"></div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-006.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-006.html
new file mode 100644
index 00000000000..3d7dbfd9fed
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-006.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: flex column and row gaps are painted in vertical-lr and center aligned.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="flex-gap-decorations-006-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox>* {
+        background-color: rgb(96 139 168 / 0.2);
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        border-width: 2px;
+        display: flex;
+        column-gap: 10px;
+        column-rule-style: solid;
+        column-rule-width: 10px;
+        column-rule-color: red;
+        row-gap: 30px;
+        row-rule-style: solid;
+        row-rule-width: 30px;
+        row-rule-color: blue;
+        height: 300px;
+        width: 300px;
+        flex-wrap: wrap;
+        align-content: center;
+        writing-mode: vertical-lr;
+    }
+
+    .items {
+        width: 70px;
+        height: 70px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-007-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-007-ref.html
new file mode 100644
index 00000000000..8511c66acf4
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-007-ref.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox>* {
+        background-color: rgb(96 139 168 / 0.2);
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        border-width: 2px;
+        display: flex;
+        column-gap: 10px;
+        width: 170px;
+        flex-wrap: wrap;
+        align-items: flex-end;
+    }
+
+    .items {
+        width: 50px;
+    }
+
+    .column-gap {
+        background-color: red;
+        margin: 0px;
+        padding: 0px;
+        height: 10px;
+        width: 10px;
+        position: absolute;
+        top:2px;
+        height: 40px;
+    }
+
+    #three {
+        height: 40px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items" id="three">Three</div>
+</div>
+
+<div id="column1" class="column-gap" style="left: 52px;"></div>
+<div id="column2" class="column-gap" style="left: 112px;"></div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-007.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-007.html
new file mode 100644
index 00000000000..34853bb3206
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-007.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: flex column and row gaps are painted align-items.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="flex-gap-decorations-007-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox>* {
+        background-color: rgb(96 139 168 / 0.2);
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        border-width: 2px;
+        display: flex;
+        column-gap: 10px;
+        column-rule-style: solid;
+        column-rule-width: 10px;
+        column-rule-color: red;
+        width: 170px;
+        flex-wrap: wrap;
+        align-items: flex-end;
+    }
+
+    .items {
+        width: 50px;
+    }
+
+    #three {
+        height: 40px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items" id="three">Three</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-008-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-008-ref.html
new file mode 100644
index 00000000000..8ca5749417f
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-008-ref.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox>* {
+        background-color: rgb(96 139 168 / 0.2);
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        border-width: 2px;
+        display: flex;
+        column-gap: 10px;
+        width: 200px;
+        flex-wrap: nowrap;
+    }
+
+    .items {
+        width: 50px;
+        height: 50px;
+        flex-shrink: 0;
+    }
+
+    .column-gap {
+        display: flex;
+        margin: 0px;
+        padding: 0px;
+        height: 10px;
+        width: 300px;
+        position: absolute;
+        top:2px;
+        height: 50px;
+        left: 52px;
+        column-gap: 50px;
+    }
+
+    .columns {
+        background-color: red;
+        width: 10px;
+        height: 50px;
+    }
+</style>
+
+<div id="flexbox">
+  <div class="items">One</div>
+  <div class="items">Two</div>
+  <div class="items">Three</div>
+  <div class="items">Four</div>
+  <div class="items">Five</div>
+  <div class="items">Six</div>
+</div>
+
+<div class="column-gap">
+  <div class="columns"></div>
+  <div class="columns"></div>
+  <div class="columns"></div>
+  <div class="columns"></div>
+  <div class="columns"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-008.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-008.html
new file mode 100644
index 00000000000..bd4e73c158c
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-008.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: flex column gaps are painted on overflowing items.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="flex-gap-decorations-008-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox>* {
+        background-color: rgb(96 139 168 / 0.2);
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        border-width: 2px;
+        display: flex;
+        column-gap: 10px;
+        column-rule-style: solid;
+        column-rule-width: 10px;
+        column-rule-color: red;
+        width: 200px;
+        flex-wrap: nowrap;
+    }
+
+    .items {
+        width: 50px;
+        height: 50px;
+        flex-shrink: 0;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-009-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-009-ref.html
new file mode 100644
index 00000000000..0adb9af6994
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-009-ref.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+
+    .row-gap {
+        display: flex;
+        margin: 0px;
+        padding: 0px;
+        height: 10px;
+        width: 170px;
+        position: absolute;
+      column-gap: 10px
+    }
+
+  .row {
+    background: blue;
+    width: 50px;
+    height: 10px;
+  }
+
+    .column-gap {
+        display: flex;
+        flex-direction: column;
+        row-gap: 70px;
+        height: 170px;
+        top: 2px;
+        width: 10px;
+        position: absolute;
+    }
+
+    .column {
+        background: red;
+        width: 10px;
+        height: 50px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
+
+<div id="columns1" style="left: 52px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns2" style="left: 112px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns3" style="left: 102px; position:absolute; top: 62px; height:50px;" class="column"></div>
+
+<div id="row1" class="row-gap" style="top: 52px; left: 2px;">
+  <div id="r1" class="row"></div>
+  <div id="r2" style="width: 40px" class="row"></div>
+  <div id="r2" style="margin-left: auto" class="row"></div>
+</div>
+
+<div id="row2" class="row-gap" style="top: 112px; left: 2px;">
+  <div id="r3" class="row"></div>
+  <div id="r4" style="width: 40px" class="row"></div>
+  <div id="r5" style="margin-left: auto" class="row"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-009.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-009.html
new file mode 100644
index 00000000000..6bb406c5b01
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-009.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: flex column and row gaps are painted with intersection rule break.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="flex-gap-decorations-009-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        row-rule-style: solid;
+        row-rule-color: blue;
+        row-rule-width: 10px;
+        row-rule-break: intersection;
+        row-rule-outset: 0;
+        column-rule-break: intersection;
+        column-rule-style: solid;
+        column-rule-color: red;
+        column-rule-width: 10px;
+        column-rule-outset: 0;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-010-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-010-ref.html
new file mode 100644
index 00000000000..8756c5d038c
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-010-ref.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+
+    .row-gap {
+        margin: 0px;
+        padding: 0px;
+        height: 10px;
+        width: 170px;
+        position: absolute;
+        background: blue;
+    }
+
+    .column-gap {
+        display: flex;
+        flex-direction: column;
+        row-gap: 70px;
+        height: 170px;
+        top: 2px;
+        width: 10px;
+        position: absolute;
+    }
+
+    .column {
+        background: red;
+        width: 10px;
+        height: 50px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
+
+<div id="columns1" style="left: 52px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns2" style="left: 112px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns3" style="left: 102px; position:absolute; top: 62px; height:50px;" class="column"></div>
+
+<div id="row1" class="row-gap" style="top: 52px; left: 2px;">
+</div>
+
+<div id="row2" class="row-gap" style="top: 112px; left: 2px;">
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-010.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-010.html
new file mode 100644
index 00000000000..49f6ec962ad
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-010.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: flex column and row gaps are painted with intersection column rule break.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="flex-gap-decorations-010-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        row-rule-style: solid;
+        row-rule-color: blue;
+        row-rule-width: 10px;
+        column-rule-break: intersection;
+        column-rule-style: solid;
+        column-rule-color: red;
+        column-rule-width: 10px;
+        column-rule-outset: 0;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-011-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-011-ref.html
new file mode 100644
index 00000000000..082be2875a4
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-011-ref.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+
+    .row-gap {
+        margin: 0px;
+        padding: 0px;
+        height: 2px;
+        background: blue;
+        width: 170px;
+        position: absolute;
+    }
+
+    .column-gap {
+        display: flex;
+        flex-direction: column;
+        row-gap: 66px;
+        height: 174px;
+        top: 0px;
+        width: 10px;
+        position: absolute;
+    }
+
+    .column {
+        background: red;
+        width: 2px;
+        height: 54px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
+
+<div id="columns1" style="left: 56px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns2" style="left: 116px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns3" style="left: 106px; position:absolute; top: 60px; height:54px;" class="column"></div>
+
+<div id="row1" class="row-gap" style="top: 56px; left: 2px;"></div>
+<div id="row2" class="row-gap" style="top: 116px; left: 2px;"></div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-011.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-011.html
new file mode 100644
index 00000000000..7b142e54ec7
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-011.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: flex column and row gaps are painted column break intersection and 2px outset.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="flex-gap-decorations-011-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        row-rule-style: solid;
+        row-rule-color: blue;
+        row-rule-width: 2px;
+        column-rule-style: solid;
+        column-rule-color: red;
+        column-rule-width: 2px;
+        column-rule-break: intersection;
+        column-rule-outset: 2px;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-012-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-012-ref.html
new file mode 100644
index 00000000000..33be4b76212
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-012-ref.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+
+    .row-gap {
+        margin: 0px;
+        padding: 0px;
+        height: 2px;
+        background: blue;
+        width: 170px;
+        position: absolute;
+    }
+
+    .column-gap {
+        display: flex;
+        flex-direction: column;
+        row-gap: 60px;
+        height: 174px;
+        top: 2px;
+        width: 10px;
+        position: absolute;
+    }
+
+    .column {
+        background: red;
+        width: 2px;
+        height: 55px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
+
+<div id="row1" class="row-gap" style="top: 56px; left: 2px;"></div>
+<div id="row2" class="row-gap" style="top: 116px; left: 2px;"></div>
+
+<div id="columns1" style="left: 56px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns2" style="left: 116px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns3" style="left: 106px; position:absolute; top: 57px; height:60px;" class="column"></div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-012.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-012.html
new file mode 100644
index 00000000000..2f1f95c00c8
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-012.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: flex column and are painted with column over rows.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="flex-gap-decorations-012-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        row-rule-style: solid;
+        row-rule-color: blue;
+        row-rule-width: 2px;
+        column-rule-style: solid;
+        column-rule-color: red;
+        column-rule-width: 2px;
+        gap-rule-paint-order: column-over-row;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-013-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-013-ref.html
new file mode 100644
index 00000000000..3d999788023
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-013-ref.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+
+    .row-gap {
+        margin: 0px;
+        padding: 0px;
+        height: 2px;
+        background: blue;
+        width: 170px;
+        position: absolute;
+    }
+
+    .column-gap {
+        display: flex;
+        flex-direction: column;
+        row-gap: 74px;
+        height: 174px;
+        top: 4px;
+        width: 10px;
+        position: absolute;
+    }
+
+    .column {
+        background: red;
+        width: 2px;
+        height: 46px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
+
+<div id="row1" class="row-gap" style="top: 56px; left: 2px;"></div>
+<div id="row2" class="row-gap" style="top: 116px; left: 2px;"></div>
+
+<div id="columns1" style="left: 56px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns2" style="left: 116px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns3" style="left: 106px; position:absolute; top: 64px; height:46px;" class="column"></div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-013.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-013.html
new file mode 100644
index 00000000000..1cdf1c27496
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-013.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: flex column and row gaps are painted column break intersection and -2px outset.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="flex-gap-decorations-013-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        row-rule-style: solid;
+        row-rule-color: blue;
+        row-rule-width: 2px;
+        column-rule-style: solid;
+        column-rule-color: red;
+        column-rule-width: 2px;
+        column-rule-break: intersection;
+        column-rule-outset: -2px;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-014-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-014-ref.html
new file mode 100644
index 00000000000..59ce37deaec
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-014-ref.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+
+    .row-gap {
+        margin: 0px;
+        padding: 0px;
+        height: 2px;
+        background: blue;
+        width: 170px;
+        position: absolute;
+    }
+
+    .column-gap {
+        display: flex;
+        flex-direction: column;
+        row-gap: 50px;
+        height: 174px;
+        top: 2px;
+        width: 10px;
+        position: absolute;
+    }
+
+    .column {
+        background: red;
+        width: 2px;
+        height: 60px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
+
+<div id="columns1" style="left: 56px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns2" style="left: 116px;" class="column-gap">
+    <div id="c1" class="column"></div>
+    <div id="c2" class="column"></div>
+</div>
+
+<div id="columns3" style="left: 106px; position:absolute; top: 52px; height:70px;" class="column"></div>
+
+<div id="row1" class="row-gap" style="top: 56px; left: 2px;"></div>
+<div id="row2" class="row-gap" style="top: 116px; left: 2px;"></div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-014.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-014.html
new file mode 100644
index 00000000000..b7d19549e03
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-014.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: flex column and row gaps are painted column break intersection and 100% outset.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="flex-gap-decorations-014-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 10px;
+        row-gap: 10px;
+        row-rule-style: solid;
+        row-rule-color: blue;
+        row-rule-width: 2px;
+        column-rule-style: solid;
+        column-rule-color: red;
+        column-rule-width: 2px;
+        column-rule-break: intersection;
+        column-rule-outset: 100%;
+        width: 170px;
+        flex-wrap: wrap;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    #four {
+        width: 100px;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items" id="four">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+    <div class="items">Seven</div>
+    <div class="items">Eight</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-015-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-015-ref.html
new file mode 100644
index 00000000000..48745eff931
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-015-ref.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 20px;
+        row-gap: 10px;
+        width: 120px;
+        height: 170px;
+        flex-wrap: wrap;
+        flex-direction: column;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    .row-1 {
+        display: flex;
+        position: absolute;
+        left: 2px;
+        top: 52px;
+        column-gap: 20px;
+    }
+
+    .row-2 {
+        display: flex;
+        position: absolute;
+        left: 2px;
+        top: 112px;
+        column-gap: 20px;
+    }
+
+    .row-gap {
+        height: 10px;
+        width: 50px;
+        background: blue;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+</div>
+
+<div class="column-gap" style="top: 2px; height: 170px; position: absolute; width: 20px; left: 52px; background: red;">
+</div>
+
+<div class="row-1">
+    <div class="row-gap">
+    </div>
+    <div class="row-gap">
+    </div>
+</div>
+
+<div class="row-2">
+    <div class="row-gap">
+    </div>
+    <div class="row-gap">
+    </div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-015.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-015.html
new file mode 100644
index 00000000000..8d100978205
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-015.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: flex column and row gaps are painted column flex direction.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="flex-gap-decorations-015-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 20px;
+        row-gap: 10px;
+        width: 120px;
+        height: 170px;
+        flex-wrap: wrap;
+        flex-direction: column;
+        column-rule-style: solid;
+        column-rule-color: red;
+        column-rule-width: 20px;
+        row-rule-style: solid;
+        row-rule-color: blue;
+        row-rule-width: 10px;
+        gap-rule-paint-order: column-over-row;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-016-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-016-ref.html
new file mode 100644
index 00000000000..155e0bfac7b
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-016-ref.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 20px;
+        row-gap: 10px;
+        width: 120px;
+        height: 170px;
+        flex-wrap: wrap;
+        flex-direction: column-reverse;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+    .row-1 {
+        display: flex;
+        position: absolute;
+        left: 2px;
+        top: 52px;
+        column-gap: 20px;
+    }
+
+    .row-2 {
+        display: flex;
+        position: absolute;
+        left: 2px;
+        top: 112px;
+        column-gap: 20px;
+    }
+
+    .row-gap {
+        height: 10px;
+        width: 50px;
+        background: blue;
+    }
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+</div>
+
+<div class="column-gap" style="top: 2px; height: 170px; position: absolute; width: 20px; left: 52px; background: red;">
+</div>
+
+<div class="row-1">
+    <div class="row-gap">
+    </div>
+    <div class="row-gap">
+    </div>
+</div>
+
+<div class="row-2">
+    <div class="row-gap">
+    </div>
+    <div class="row-gap">
+    </div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-016.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-016.html
new file mode 100644
index 00000000000..9f956369d48
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-016.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: flex column and row gaps are painted in the column-reverse flex direction.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="flex-gap-decorations-016-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 20px;
+        row-gap: 10px;
+        width: 120px;
+        height: 170px;
+        flex-wrap: wrap;
+        flex-direction: column-reverse;
+        column-rule-style: solid;
+        column-rule-color: red;
+        column-rule-width: 20px;
+        row-rule-style: solid;
+        row-rule-color: blue;
+        row-rule-width: 10px;
+        gap-rule-paint-order: column-over-row;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+    <div class="items">Four</div>
+    <div class="items">Five</div>
+    <div class="items">Six</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-017-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-017-ref.html
new file mode 100644
index 00000000000..031be2abaf1
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-017-ref.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 20px;
+        width: 120px;
+        height: 170px;
+        flex-wrap: wrap;
+        flex-direction: column;
+        column-rule-style: solid;
+        column-rule-color: red;
+        column-rule-width: 20px;
+        column-rule-style: ridge;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-017.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-017.html
new file mode 100644
index 00000000000..21fb643a241
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-017.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: column-rule-style inset should paint as ridge.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#column-row-rule-style">
+<link rel="match" href="flex-gap-decorations-017-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 20px;
+        width: 120px;
+        height: 170px;
+        flex-wrap: wrap;
+        flex-direction: column;
+        column-rule-style: solid;
+        column-rule-color: red;
+        column-rule-width: 20px;
+        column-rule-style: inset;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-018-ref.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-018-ref.html
new file mode 100644
index 00000000000..644a409bd97
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-018-ref.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 20px;
+        width: 120px;
+        height: 170px;
+        flex-wrap: wrap;
+        flex-direction: column;
+        column-rule-style: solid;
+        column-rule-color: red;
+        column-rule-width: 20px;
+        column-rule-style: groove;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-018.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-018.html
new file mode 100644
index 00000000000..073fa1b9af7
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-018.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: column-rule-style outset should paint as groove.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#column-row-rule-style">
+<link rel="match" href="flex-gap-decorations-018-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #flexbox {
+        border: 2px solid rgb(96 139 168);
+        display: flex;
+        column-gap: 20px;
+        width: 120px;
+        height: 170px;
+        flex-wrap: wrap;
+        flex-direction: column;
+        column-rule-style: solid;
+        column-rule-color: red;
+        column-rule-width: 20px;
+        column-rule-style: outset;
+    }
+
+    .items {
+        background-color: rgb(96 139 168 / 0.2);
+        flex-shrink: 1;
+        width: 50px;
+        height: 50px;
+    }
+
+</style>
+
+<div id="flexbox">
+    <div class="items">One</div>
+    <div class="items">Two</div>
+    <div class="items">Three</div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-019.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-019.html
new file mode 100644
index 00000000000..5bad5f00d49
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-019.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Painting flex gaps with bi-directional `rule-color` shorthand.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+  .flex-container {
+    display: flex;
+    gap: 10px;
+    height: 100px;
+    width: 100px;
+    background: red;
+    rule-color: green;
+    rule-width: 10px;
+    rule-style: solid;
+
+    flex-wrap: wrap;
+  }
+
+  .flex-item {
+    background: green;
+    width: 45px;
+  }
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="flex-container">
+    <div class="flex-item"></div>
+    <div class="flex-item"></div>
+    <div class="flex-item"></div>
+    <div class="flex-item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-022.html b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-022.html
new file mode 100644
index 00000000000..5f3b512ef76
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/flex/flex-gap-decorations-022.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: flex column gaps are painted with different sized gaps and row-rule-outset 0.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="../agnostic/gap-decorations-002-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .flex-container {
+    height: 110px;
+    width: 120px;
+
+    display: flex;
+
+    column-gap: 20px;
+    row-gap: 10px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 20px;
+
+    row-rule-color: gold;
+    row-rule-style: solid;
+    row-rule-width: 10px;
+
+    row-rule-break: intersection;
+    row-rule-outset: 0;
+
+    flex-wrap: wrap;
+  }
+
+  .flex-item {
+    background: skyblue;
+    width: 50px;
+  }
+</style>
+<div class="flex-container">
+    <div class="flex-item"></div>
+    <div class="flex-item"></div>
+    <div class="flex-item"></div>
+    <div class="flex-item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-001.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-001.html
similarity index 92%
rename from tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-001.html
rename to tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-001.html
index 5fe13a11bbf..648f3f26e56 100644
--- a/tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-001.html
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-001.html
@@ -3,7 +3,7 @@
   CSS Gap Decorations: column and row gaps are painted.
 </title>
 <link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
-<link rel="match" href="../../../reference/ref-filled-green-100px-square.xht">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
 <link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
 <style>
   .grid-container {
diff --git a/tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-002.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-002.html
similarity index 89%
rename from tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-002.html
rename to tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-002.html
index 429798d0fe7..7e7e0e4d325 100644
--- a/tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-002.html
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-002.html
@@ -3,9 +3,13 @@
   CSS Gap Decorations: grid column gaps are painted with solid styling.
 </title>
 <link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
-<link rel="match" href="grid-gap-decorations-002-ref.html">
+<link rel="match" href="../agnostic/gap-decorations-001-ref.html">
 <link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
 <style>
+  body {
+    margin: 0px;
+  }
+
   .grid-container {
     height: 110px;
     width: 110px;
diff --git a/tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-003-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-003-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-003-ref.html
rename to tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-003-ref.html
diff --git a/tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-003.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-003.html
similarity index 100%
rename from tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-003.html
rename to tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-003.html
diff --git a/tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-004-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-004-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-004-ref.html
rename to tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-004-ref.html
diff --git a/tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-004.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-004.html
similarity index 100%
rename from tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-004.html
rename to tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-004.html
diff --git a/tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-005-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-005-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-005-ref.html
rename to tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-005-ref.html
diff --git a/tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-005.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-005.html
similarity index 100%
rename from tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-005.html
rename to tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-005.html
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-006-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-006-ref.html
new file mode 100644
index 00000000000..94d455c1d86
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-006-ref.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#break">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    gap: 10px;
+    width: 430px;
+    height: 430px;
+  }
+
+  .grid-item {
+    background-color: gray;
+    opacity: 0.5;
+    border: 1px solid #000;
+  }
+
+  .col-gap {
+    width: 0;
+    border-left: solid 5px blue;
+  }
+
+  .col-gap1 {
+
+    position: absolute;
+    top: 105px;
+    left: 102.5px;
+    height: 220px;
+  }
+
+  .col-gap2 {
+    position: absolute;
+    top: 0px;
+    left: 212.5px;
+    height: 215px;
+  }
+
+  .col-gap3 {
+    position: absolute;
+    top: 0px;
+    left: 322.5px;
+    height: 430px;
+  }
+
+  .row-gap {
+    height: 0px;
+    border-bottom: solid 5px red;
+  }
+
+  .row-gap1 {
+    position: absolute;
+    top: 102.5px;
+    left: 0px;
+    width: 215px;
+  }
+
+  .row-gap2 {
+    position: absolute;
+    top: 212.5px;
+    left: 105px;
+    width: 220px;
+  }
+
+  .row-gap3 {
+    position: absolute;
+    top: 322.5px;
+    left: 0px;
+    width: 430px;
+  }
+</style>
+
+<div class="grid-container">
+  <div class="grid-item" style="grid-column: 1 / 3; grid-row: 1 / 2;"></div>
+  <div class="grid-item" style="grid-column: 3 / 4; grid-row: 1 / 3;"></div>
+  <div class="grid-item" style="grid-row: 2 / 4;"></div>
+  <div class="grid-item" style="grid-column: 2 / 4; grid-row: 3 / 4;"></div>
+  <div class="grid-item" style="grid-column: 2 / 3; grid-row: 2 / 3;"></div>
+  <div class="grid-item" style="grid-column: 4 / 5; grid-row: 1 / 4;"></div>
+  <div class="grid-item" style="grid-column: 1 / 4; grid-row: 4 / 5;"></div>
+  <div class="grid-item" style="grid-column: 4 / 5; grid-row: 4 / 5;"></div>
+</div>
+
+<div class="col-gap col-gap1"> </div>
+<div class="col-gap col-gap2"> </div>
+<div class="col-gap col-gap3"> </div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
+<div class="row-gap row-gap3"> </div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-006.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-006.html
new file mode 100644
index 00000000000..7b1187c4e44
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-006.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: *rule-break defaults to spanning-item and avoids painting behind spanners.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#break">
+<link rel="match" href="grid-gap-decorations-006-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+    .grid-container {
+        display: grid;
+        grid-template-columns: repeat(4, 1fr);
+        gap: 10px;
+
+        width: 430px;
+        height: 430px;
+
+        column-rule-color: blue;
+        column-rule-style: solid;
+        column-rule-width: 5px;
+
+        row-rule-color: red;
+        row-rule-style: solid;
+        row-rule-width: 5px;
+    }
+
+    .grid-item {
+        background-color: gray;
+        opacity: 0.5;
+        border: 1px solid #000;
+    }
+
+</style>
+<div class="grid-container">
+    <div class="grid-item" style="grid-column: 1 / 3; grid-row: 1 / 2;"></div>
+    <div class="grid-item" style="grid-column: 3 / 4; grid-row: 1 / 3;"></div>
+    <div class="grid-item" style="grid-row: 2 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 4; grid-row: 3 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 3; grid-row: 2 / 3;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 1 / 4;"></div>
+    <div class="grid-item" style="grid-column: 1 / 4; grid-row: 4 / 5;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 4 / 5;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-007-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-007-ref.html
new file mode 100644
index 00000000000..5d89f414ed5
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-007-ref.html
@@ -0,0 +1,188 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#break">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .grid-container {
+        display: grid;
+        grid-template-columns: repeat(4, 1fr);
+        gap: 10px;
+
+        width: 430px;
+        height: 430px;
+    }
+
+    .grid-item {
+        background-color: gray;
+        opacity: 0.5;
+        border: 1px solid #000;
+    }
+
+    .row-gap1 {
+        position: absolute;
+        height: 0px;
+        display: flex;
+        gap: 10px;
+        top: 102.5px;
+        left: 0px;
+    }
+
+    .row-gap1a {
+        width: 100px;
+        border-bottom: solid 5px red;
+    }
+
+    .row-gap1b {
+        width: 100px;
+        border-bottom: solid 5px red;
+    }
+
+    .row-gap2 {
+        position: absolute;
+        height: 0px;
+        display: flex;
+        gap: 10px;
+        top: 212.5px;
+        left: 110px;
+    }
+
+    .row-gap2a {
+        width: 100px;
+        border-bottom: solid 5px red;
+    }
+
+    .row-gap2b {
+        width: 100px;
+        border-bottom: solid 5px red;
+    }
+
+    .row-gap3 {
+        position: absolute;
+        height: 0px;
+        display: flex;
+        gap: 10px;
+        top: 322.5px;
+        left: 0px;
+    }
+
+    .row-gap3a {
+        width: 100px;
+        border-bottom: solid 5px red;
+    }
+
+    .row-gap3b {
+        width: 210px;
+        border-bottom: solid 5px red;
+    }
+
+    .row-gap3c {
+        width: 100px;
+        border-bottom: solid 5px red;
+    }
+
+    .col-gap1 {
+        position: absolute;
+        width: 0;
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+        top: 110px;
+        left: 102.5px;
+    }
+
+    .col-gap1a {
+        height: 100px;
+        border-left: solid 5px blue;
+    }
+
+    .col-gap1b {
+        height: 100px;
+        border-left: solid 5px blue;
+    }
+
+    .col-gap2 {
+        position: absolute;
+        width: 0;
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+        top: 0px;
+        left: 212.5px;
+    }
+
+    .col-gap2a {
+        height: 100px;
+        border-left: solid 5px blue;
+    }
+
+    .col-gap2b {
+        height: 100px;
+        border-left: solid 5px blue;
+    }
+
+    .col-gap3 {
+        position: absolute;
+        width: 0;
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+        top: 0px;
+        left: 322.5px;
+    }
+
+    .col-gap3a {
+        height: 210px;
+        border-left: solid 5px blue;
+    }
+
+    .col-gap3b {
+        height: 100px;
+        border-left: solid 5px blue;
+    }
+
+    .col-gap3c {
+        height: 100px;
+        border-left: solid 5px blue;
+    }
+</style>
+<div class="grid-container">
+    <div class="grid-item" style="grid-column: 1 / 3; grid-row: 1 / 2;"></div>
+    <div class="grid-item" style="grid-column: 3 / 4; grid-row: 1 / 3;"></div>
+    <div class="grid-item" style="grid-row: 2 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 4; grid-row: 3 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 3; grid-row: 2 / 3;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 1 / 4;"></div>
+    <div class="grid-item" style="grid-column: 1 / 4; grid-row: 4 / 5;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 4 / 5;"></div>
+</div>
+
+<div class="col-gap1">
+    <div class="col-gap1a"></div>
+    <div class="col-gap1b"></div>
+</div>
+<div class="col-gap2">
+    <div class="col-gap2a"></div>
+    <div class="col-gap2b"></div>
+</div>
+<div class="col-gap3">
+    <div class="col-gap3a"></div>
+    <div class="col-gap3b"></div>
+    <div class="col-gap3c"></div>
+</div>
+
+<div class="row-gap1">
+    <div class="row-gap1a"></div>
+    <div class="row-gap1b"></div>
+</div>
+<div class="row-gap2">
+    <div class="row-gap2a"></div>
+    <div class="row-gap2b"></div>
+</div>
+<div class="row-gap3">
+    <div class="row-gap3a"></div>
+    <div class="row-gap3b"></div>
+    <div class="row-gap3c"></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-007.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-007.html
new file mode 100644
index 00000000000..adc98e4bc03
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-007.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: setting *rule-break to intersection stops painting decorations at each intersection.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#break">
+<link rel="match" href="grid-gap-decorations-007-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+    .grid-container {
+        display: grid;
+        grid-template-columns: repeat(4, 1fr);
+        gap: 10px;
+
+        width: 430px;
+        height: 430px;
+
+        column-rule-color: blue;
+        column-rule-style: solid;
+        column-rule-width: 5px;
+
+        row-rule-color: red;
+        row-rule-style: solid;
+        row-rule-width: 5px;
+
+        column-rule-break: intersection;
+        column-rule-outset: 0px;
+
+        row-rule-break: intersection;
+        row-rule-outset: 0px;
+    }
+
+    .grid-item {
+        background-color: gray;
+        opacity: 0.5;
+        border: 1px solid #000;
+    }
+</style>
+<div class="grid-container">
+    <div class="grid-item" style="grid-column: 1 / 3; grid-row: 1 / 2;"></div>
+    <div class="grid-item" style="grid-column: 3 / 4; grid-row: 1 / 3;"></div>
+    <div class="grid-item" style="grid-row: 2 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 4; grid-row: 3 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 3; grid-row: 2 / 3;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 1 / 4;"></div>
+    <div class="grid-item" style="grid-column: 1 / 4; grid-row: 4 / 5;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 4 / 5;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-008-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-008-ref.html
new file mode 100644
index 00000000000..3e2562cfccb
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-008-ref.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#break">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .grid-container {
+        display: grid;
+        grid-template-columns: repeat(4, 1fr);
+        gap: 10px;
+
+        width: 430px;
+        height: 430px;
+    }
+
+    .grid-container>div {
+        z-index: 2
+    }
+
+    .grid-item {
+        background-color: gray;
+        opacity: 0.5;
+        border: 1px solid #000;
+    }
+
+    .row-gap1 {
+        position: absolute;
+        height: 0px;
+        top: 102.5px;
+        left: 0px;
+        width: 430px;
+        border-bottom: solid 5px red;
+    }
+
+    .row-gap2 {
+        position: absolute;
+        height: 0px;
+
+        top: 212.5px;
+        left: 0px;
+        width: 430px;
+        border-bottom: solid 5px red;
+    }
+
+    .row-gap3 {
+        position: absolute;
+        height: 0px;
+        display: flex;
+        top: 322.5px;
+        left: 0px;
+        border-bottom: solid 5px red;
+        width: 430px;
+    }
+
+    .col-gap1 {
+        position: absolute;
+        width: 0;
+        height: 430px;
+        border-left: solid 5px blue;
+        top: 0px;
+        left: 102.5px;
+    }
+
+    .col-gap2 {
+        position: absolute;
+        width: 0;
+        height: 430px;
+        top: 0px;
+        left: 212.5px;
+        border-left: solid 5px blue;
+    }
+
+    .col-gap3 {
+        position: absolute;
+        width: 0;
+        height: 430px;
+        top: 0px;
+        left: 322.5px;
+        border-left: solid 5px blue;
+
+    }
+</style>
+<div class="grid-container">
+    <div class="grid-item" style="grid-column: 1 / 3; grid-row: 1 / 2;"></div>
+    <div class="grid-item" style="grid-column: 3 / 4; grid-row: 1 / 3;"></div>
+    <div class="grid-item" style="grid-row: 2 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 4; grid-row: 3 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 3; grid-row: 2 / 3;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 1 / 4;"></div>
+    <div class="grid-item" style="grid-column: 1 / 4; grid-row: 4 / 5;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 4 / 5;"></div>
+</div>
+
+<div class="col-gap1"></div>
+<div class="col-gap2"></div>
+<div class="col-gap3"></div>
+
+<div class="row-gap1"></div>
+<div class="row-gap2"></div>
+<div class="row-gap3"></div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-008.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-008.html
new file mode 100644
index 00000000000..f8dc0df36e2
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-008.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: setting *rule-break to none paints decorations from first grid line to last grid line.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#break">
+<link rel="match" href="grid-gap-decorations-008-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .grid-container {
+        display: grid;
+        grid-template-columns: repeat(4, 1fr);
+        gap: 10px;
+
+        width: 430px;
+        height: 430px;
+
+        column-rule-color: blue;
+        column-rule-style: solid;
+        column-rule-width: 5px;
+
+        row-rule-color: red;
+        row-rule-style: solid;
+        row-rule-width: 5px;
+
+        column-rule-break: none;
+        row-rule-break: none;
+    }
+
+    .grid-item {
+        background-color: gray;
+        opacity: 0.5;
+        border: 1px solid #000;
+    }
+</style>
+<div class="grid-container">
+    <div class="grid-item" style="grid-column: 1 / 3; grid-row: 1 / 2;"></div>
+    <div class="grid-item" style="grid-column: 3 / 4; grid-row: 1 / 3;"></div>
+    <div class="grid-item" style="grid-row: 2 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 4; grid-row: 3 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 3; grid-row: 2 / 3;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 1 / 4;"></div>
+    <div class="grid-item" style="grid-column: 1 / 4; grid-row: 4 / 5;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 4 / 5;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-009-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-009-ref.html
new file mode 100644
index 00000000000..964f2111eb8
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-009-ref.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#break">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+
+  .col-gap1 {
+    position: absolute;
+    width: 0;
+    height: 215px;
+    border-left: solid 5px blue;
+    top: 105px;
+    left: 102.5px;
+  }
+
+
+  .col-gap2 {
+    position: absolute;
+    width: 0;
+    height: 105px;
+    top: 0px;
+    left: 212.5px;
+    border-left: solid 5px blue;
+  }
+
+  .row-gap1 {
+    position: absolute;
+    height: 0px;
+    top: 102.5px;
+    left: 0px;
+    width: 320px;
+    border-bottom: solid 5px red;
+  }
+
+  .row-gap2 {
+    position: absolute;
+    height: 0px;
+    top: 212.5px;
+    left: 0px;
+    width: 105px;
+    border-bottom: solid 5px red;
+
+  }
+</style>
+<div class="grid-container">
+  <div class="item" style="grid-column: 1 / 3; grid-row: 1 / 2;"></div>
+  <div class="item" style=" grid-column: 3 / 4;"></div>
+  <div class="item"></div>
+  <div class="item" style="grid-column: 2 / 4; grid-row: 2 / 4;"></div>
+  <div class="item"></div>
+</div>
+
+<div class="col-gap1"></div>
+<div class="col-gap2"></div>
+<div class="col-gap3"></div>
+
+<div class="row-gap1"></div>
+<div class="row-gap2"></div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-009.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-009.html
new file mode 100644
index 00000000000..0756b9294be
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-009.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Grid with 2x2 item, decorations are not painted within item when *-rule-break is spanning-item.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-009-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 5px;
+
+    row-rule-color: red;
+    row-rule-style: solid;
+    row-rule-width: 5px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+<div class="grid-container">
+  <div class="item" style="grid-column: 1 / 3; grid-row: 1 / 2;"></div>
+  <div class="item" style=" grid-column: 3 / 4;"></div>
+  <div class="item"></div>
+  <div class="item" style="grid-column: 2 / 4; grid-row: 2 / 4;"></div>
+  <div class="item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-010-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-010-ref.html
new file mode 100644
index 00000000000..0c07124b086
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-010-ref.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#outset">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+
+  .row-gap {
+    width: 320px;
+    height: 0px;
+    border-bottom: solid 5px red;
+  }
+
+  .row-gap1 {
+    position: absolute;
+    top: 102.5px;
+  }
+
+  .row-gap2 {
+    position: absolute;
+    top: 212.5px;
+  }
+
+  .col-gap1 {
+    position: absolute;
+    width: 0;
+    display: flex;
+    gap: 10px;
+    flex-direction: column;
+    top: 0px;
+    left: 102.5px;
+  }
+
+  .col-gap1>div {
+    height: 100px;
+    border-left: solid 5px blue;
+  }
+
+  .col-gap2 {
+    position: absolute;
+    width: 0;
+    display: flex;
+    gap: 10px;
+    flex-direction: column;
+    top: 0px;
+    left: 212.5px;
+  }
+
+  .col-gap2>div {
+    height: 100px;
+    border-left: solid 5px blue;
+  }
+</style>
+
+<body>
+  <div class="grid-container">
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+  </div>
+</body>
+
+<div class="col-gap1">
+  <div class="col-gap1a"></div>
+  <div class="col-gap1b"></div>
+  <div class="col-gap1c"></div>
+</div>
+<div class="col-gap2">
+  <div class="col-gap2a"></div>
+  <div class="col-gap2b"></div>
+  <div class="col-gap2c"></div>
+</div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-010.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-010.html
new file mode 100644
index 00000000000..d9201b51cea
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-010.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: An outset of 0px aligns the ends of gap decorations with adjacent item.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-010-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 5px;
+
+    row-rule-color: red;
+    row-rule-style: solid;
+    row-rule-width: 5px;
+
+    column-rule-outset: 0px;
+    column-rule-break: intersection;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-011-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-011-ref.html
new file mode 100644
index 00000000000..c8824a5296e
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-011-ref.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#outset">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+
+  .row-gap {
+    position: absolute;
+    width: 320px;
+    height: 0px;
+    border-bottom: solid 5px red;
+  }
+
+  .row-gap1 {
+    top: 102.5px;
+  }
+
+  .row-gap2 {
+    top: 212.5px;
+  }
+
+  .col-gap {
+    position: absolute;
+    top: 0px;
+    width: 0px;
+    height: 320px;
+    border-left: solid 5px blue;
+  }
+
+  .col-gap1 {
+    left: 102.5px;
+  }
+
+  .col-gap2 {
+    left: 212.5px;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
+
+<div class="col-gap col-gap1"> </div>
+<div class="col-gap col-gap2"> </div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-011.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-011.html
new file mode 100644
index 00000000000..c0540398d05
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-011.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: *rule-outset defaults to 50% and extends each decoration end halfway into its intersection.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-011-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+    body {
+      margin: 0px;
+    }
+    .grid-container {
+      display: grid;
+      grid-gap: 10px;
+      grid-template-columns: 100px 100px 100px;
+      height: 320px;
+
+      column-rule-color: blue;
+      column-rule-style: solid;
+      column-rule-width: 5px;
+
+      row-rule-color: red;
+      row-rule-style: solid;
+      row-rule-width: 5px;
+
+      column-rule-break: intersection;
+    }
+    .item {
+      background: gray;
+      opacity: 0.5;
+    }
+  </style>
+<div class="grid-container">
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-012-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-012-ref.html
new file mode 100644
index 00000000000..51ca67dd6a2
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-012-ref.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#outset">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 5px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+
+  .row-gap {
+    position: absolute;
+    width: 320px;
+    height: 0px;
+    border-bottom: solid 5px red;
+  }
+
+  .row-gap1 {
+    top: 110.5px;
+  }
+
+  .row-gap2 {
+    top: 220.5px;
+  }
+
+  .col-gap {
+    position: absolute;
+    top: 3px;
+    width: 0px;
+    height: 330px;
+    border-left: solid 5px blue;
+  }
+
+  .col-gap1 {
+    left: 110.5px;
+  }
+
+  .col-gap2 {
+    left: 220.5px;
+  }
+</style>
+
+<body>
+  <div class="grid-container">
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+  </div>
+</body>
+
+<div class="col-gap col-gap1"> </div>
+<div class="col-gap col-gap2"> </div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-012.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-012.html
new file mode 100644
index 00000000000..26ba45a14ff
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-012.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations:  An outset of 5px extends decorations slightly beyond the edges of adjacent items.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-012-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 5px;
+
+    row-rule-color: red;
+    row-rule-style: solid;
+    row-rule-width: 5px;
+
+    column-rule-outset: 5px;
+    column-rule-break: intersection;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+
+<body>
+  <div class="grid-container">
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+  </div>
+</body>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-013-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-013-ref.html
new file mode 100644
index 00000000000..7ebf7c00b18
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-013-ref.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#outset">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+
+  .row-gap {
+    width: 320px;
+    height: 0px;
+    border-bottom: solid 5px red;
+  }
+
+  .row-gap1 {
+    position: absolute;
+    top: 102.5px;
+  }
+
+  .row-gap2 {
+    position: absolute;
+    top: 212.5px;
+  }
+
+  .col-gap1 {
+    position: absolute;
+    width: 0;
+    display: flex;
+    gap: 20px;
+    flex-direction: column;
+    top: 5px;
+    left: 102.5px;
+  }
+
+  .col-gap1>div {
+    height: 90px;
+    border-left: solid 5px blue;
+  }
+
+  .col-gap2 {
+    position: absolute;
+    width: 0;
+    display: flex;
+    gap: 20px;
+    flex-direction: column;
+    top: 5px;
+    left: 212.5px;
+  }
+
+  .col-gap2>div {
+    height: 90px;
+    border-left: solid 5px blue;
+  }
+</style>
+
+<body>
+  <div class="grid-container">
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+  </div>
+</body>
+
+<div class="col-gap1">
+  <div class="col-gap1a"></div>
+  <div class="col-gap1b"></div>
+  <div class="col-gap1c"></div>
+</div>
+<div class="col-gap2">
+  <div class="col-gap2a"></div>
+  <div class="col-gap2b"></div>
+  <div class="col-gap2c"></div>
+</div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-013.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-013.html
new file mode 100644
index 00000000000..4a056134089
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-013.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: An outset of -5px shortens the ends of decorations relative to the edges of adjacent items.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-013-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 5px;
+
+    row-rule-color: red;
+    row-rule-style: solid;
+    row-rule-width: 5px;
+
+    column-rule-outset: -5px;
+    column-rule-break: intersection;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+
+<body>
+  <div class="grid-container">
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+  </div>
+</body>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-014-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-014-ref.html
new file mode 100644
index 00000000000..7631d5287a8
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-014-ref.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#outset">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 5px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+
+  .row-gap {
+    position: absolute;
+    width: 320px;
+    height: 0px;
+    border-bottom: solid 5px red;
+  }
+
+  .row-gap1 {
+    top: 110.5px;
+  }
+
+  .row-gap2 {
+    top: 220.5px;
+  }
+
+  .col-gap {
+    position: absolute;
+    top: 3px;
+    width: 0px;
+    height: 330px;
+    border-left: solid 5px blue;
+  }
+
+  .col-gap1 {
+    left: 110.5px;
+  }
+
+  .col-gap2 {
+    left: 220.5px;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
+
+<div class="col-gap col-gap1"> </div>
+<div class="col-gap col-gap2"> </div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-014.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-014.html
new file mode 100644
index 00000000000..97ad626e1f2
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-014.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: An outset of 5px with rule-break: `none` extends decorations outside edge track lines.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-014-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 5px;
+
+    row-rule-color: red;
+    row-rule-style: solid;
+    row-rule-width: 5px;
+
+    column-rule-outset: 5px;
+    column-rule-break: none;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-015-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-015-ref.html
new file mode 100644
index 00000000000..f95324d3320
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-015-ref.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#outset">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin-top: 20px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    gap: 10px;
+    width: 430px;
+    height: 430px;
+  }
+
+  .grid-item {
+    background-color: gray;
+    opacity: 0.5;
+    border: 1px solid #000;
+    z-index: 2;
+  }
+
+  .col-gap {
+    width: 0;
+    border-left: solid 5px blue;
+  }
+
+  .col-gap1 {
+
+    position: absolute;
+    top: 110px;
+    left: 110.5px;
+    height: 250px;
+  }
+
+  .col-gap2 {
+    position: absolute;
+    top: 0px;
+    left: 220.5px;
+    height: 250px;
+  }
+
+  .col-gap3 {
+    position: absolute;
+    top: 0px;
+    left: 330.5px;
+    height: 470px;
+  }
+
+  .row-gap {
+    height: 0px;
+    border-bottom: solid 5px red;
+  }
+
+  .row-gap1 {
+    position: absolute;
+    top: 122.5px;
+    left: 8px;
+    width: 215px;
+  }
+
+  .row-gap2 {
+    position: absolute;
+    top: 232.5px;
+    left: 113px;
+    width: 220px;
+  }
+
+  .row-gap3 {
+    position: absolute;
+    top: 342.5px;
+    left: 8px;
+    width: 430px;
+  }
+</style>
+
+<div class="grid-container">
+  <div class="grid-item" style="grid-column: 1 / 3; grid-row: 1 / 2;"></div>
+  <div class="grid-item" style="grid-column: 3 / 4; grid-row: 1 / 3;"></div>
+  <div class="grid-item" style="grid-row: 2 / 4;"></div>
+  <div class="grid-item" style="grid-column: 2 / 4; grid-row: 3 / 4;"></div>
+  <div class="grid-item" style="grid-column: 2 / 3; grid-row: 2 / 3;"></div>
+  <div class="grid-item" style="grid-column: 4 / 5; grid-row: 1 / 4;"></div>
+  <div class="grid-item" style="grid-column: 1 / 4; grid-row: 4 / 5;"></div>
+  <div class="grid-item" style="grid-column: 4 / 5; grid-row: 4 / 5;"></div>
+</div>
+
+<div class="col-gap col-gap1"> </div>
+<div class="col-gap col-gap2"> </div>
+<div class="col-gap col-gap3"> </div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
+<div class="row-gap row-gap3"> </div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-015.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-015.html
new file mode 100644
index 00000000000..e575c134353
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-015.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: An outset of 20px with rule-break: `spanning-item` extends decorations into spanning items and outside edge track lines.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#break">
+<link rel="match" href="grid-gap-decorations-015-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+    body {
+        margin-top: 20px;
+    }
+
+    .grid-container {
+        display: grid;
+        grid-template-columns: repeat(4, 1fr);
+        gap: 10px;
+
+        width: 430px;
+        height: 430px;
+
+        column-rule-color: blue;
+        column-rule-style: solid;
+        column-rule-width: 5px;
+
+        row-rule-color: red;
+        row-rule-style: solid;
+        row-rule-width: 5px;
+
+        column-rule-break: spanning-item;
+        row-rule-break: spanning-item;
+        column-rule-outset: 20px;
+    }
+
+    .grid-item {
+        background-color: gray;
+        opacity: 0.5;
+        border: 1px solid #000;
+    }
+</style>
+<div class="grid-container">
+    <div class="grid-item" style="grid-column: 1 / 3; grid-row: 1 / 2;"></div>
+    <div class="grid-item" style="grid-column: 3 / 4; grid-row: 1 / 3;"></div>
+    <div class="grid-item" style="grid-row: 2 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 4; grid-row: 3 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 3; grid-row: 2 / 3;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 1 / 4;"></div>
+    <div class="grid-item" style="grid-column: 1 / 4; grid-row: 4 / 5;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 4 / 5;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-016-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-016-ref.html
new file mode 100644
index 00000000000..c11380a68aa
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-016-ref.html
@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#lists-repeat">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: repeat(5, 100px);
+    height: 540px;
+    width: 540px;
+  }
+
+  .row-gap {
+    height: 0px;
+    width: 540px;
+    position: absolute;
+  }
+
+  .row-gap1 {
+    border-bottom: 5px dashed red;
+    top: 102.5px;
+  }
+
+  .row-gap2 {
+    border-bottom: 5px groove red;
+    top: 212.5px;
+  }
+
+  .row-gap3 {
+    border-bottom: 5px ridge red;
+    top: 322.5px;
+  }
+
+  .row-gap4 {
+    border-bottom: 5px dashed red;
+    top: 432.5px;
+  }
+
+  .col-gap {
+    width: 0px;
+    height: 540px;
+    position: absolute;
+    top: 0px;
+  }
+
+  .col-gap1 {
+    border-left: 5px solid blue;
+    left: 102.5px;
+  }
+
+  .col-gap2 {
+    border-left: 5px dotted blue;
+    left: 212.5px;
+  }
+
+  .col-gap3 {
+    border-left: 5px double blue;
+    left: 322.5px;
+  }
+
+  .col-gap4 {
+    border-left: 5px solid blue;
+    left: 432.5px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
+
+<div class="col-gap col-gap1"> </div>
+<div class="col-gap col-gap2"> </div>
+<div class="col-gap col-gap3"> </div>
+<div class="col-gap col-gap4"> </div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
+<div class="row-gap row-gap3"> </div>
+<div class="row-gap row-gap4"> </div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-016.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-016.html
new file mode 100644
index 00000000000..a0618e44b56
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-016.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Grid gaps are painted with multiple line-style values for *-rule-style.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#lists-repeat">
+<link rel="match" href="grid-gap-decorations-016-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: repeat(5, 100px);
+    height: 540px;
+    width: 540px;
+
+    column-rule-color: blue;
+    column-rule-style: solid dotted double;
+    column-rule-width: 5px;
+
+    row-rule-color: red;
+    row-rule-style: dashed groove ridge;
+    row-rule-width: 5px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-017-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-017-ref.html
new file mode 100644
index 00000000000..ac0bbd1f1e1
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-017-ref.html
@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#lists-repeat">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: repeat(6, 100px);
+    height: 650px;
+    width: 650px;
+  }
+
+  .row-gap {
+    height: 0px;
+    width: 650px;
+    position: absolute;
+
+  }
+
+  .row-gap1 {
+    border-bottom: 5px double red;
+    top: 102.5px;
+  }
+
+  .row-gap2 {
+    border-bottom: 5px solid red;
+    top: 212.5px;
+  }
+
+  .row-gap3 {
+    border-bottom: 5px dotted red;
+    top: 322.5px;
+  }
+
+  .row-gap4 {
+    border-bottom: 5px ridge red;
+    top: 432.5px;
+  }
+
+  .row-gap5 {
+    border-bottom: 5px ridge red;
+    top: 542.5px;
+  }
+
+  .col-gap {
+    width: 0px;
+    height: 650px;
+    position: absolute;
+    top: 0px;
+  }
+
+  .col-gap1 {
+    border-left: 5px solid blue;
+    left: 102.5px;
+  }
+
+  .col-gap2 {
+    border-left: 5px groove blue;
+    left: 212.5px;
+  }
+
+  .col-gap3 {
+    border-left: 5px double blue;
+    left: 322.5px;
+  }
+
+  .col-gap4 {
+    border-left: 5px dotted blue;
+    left: 432.5px;
+  }
+
+  .col-gap5 {
+    border-left: 5px dotted blue;
+    left: 542.5px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
+
+<div class="col-gap col-gap1"> </div>
+<div class="col-gap col-gap2"> </div>
+<div class="col-gap col-gap3"> </div>
+<div class="col-gap col-gap4"> </div>
+<div class="col-gap col-gap5"> </div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
+<div class="row-gap row-gap3"> </div>
+<div class="row-gap row-gap4"> </div>
+<div class="row-gap row-gap5"> </div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-017.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-017.html
new file mode 100644
index 00000000000..be0f7fc2751
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-017.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Grid gaps are painted with multiple line-style values for *-rule-style.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#lists-repeat">
+<link rel="match" href="grid-gap-decorations-017-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: repeat(6, 100px);
+    height: 650px;
+    width: 650px;
+
+    column-rule-color: blue;
+    column-rule-style: solid repeat(auto, groove double) repeat(2, dotted);
+    column-rule-width: 5px;
+
+    row-rule-color: red;
+    row-rule-style: repeat(auto, double solid) dotted repeat(2, ridge);
+    row-rule-width: 5px;
+  }
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-018-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-018-ref.html
new file mode 100644
index 00000000000..072dc508ea3
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-018-ref.html
@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#lists-repeat">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: repeat(6, 100px);
+    height: 650px;
+    width: 650px;
+  }
+
+  .row-gap {
+    height: 0px;
+    width: 650px;
+    position: absolute;
+  }
+
+  .row-gap1 {
+    border-bottom: 8px solid red;
+    top: 101px;
+  }
+
+  .row-gap2 {
+    border-bottom: 5px solid red;
+    top: 212.5px;
+  }
+
+  .row-gap3 {
+    border-bottom: 2px solid red;
+    top: 324px;
+  }
+
+  .row-gap4 {
+    border-bottom: 8px solid red;
+    top: 431px;
+  }
+
+  .row-gap5 {
+    border-bottom: 5px solid red;
+    top: 542.5px;
+  }
+
+  .col-gap {
+    width: 0px;
+    height: 650px;
+    position: absolute;
+    top: 0px;
+  }
+
+  .col-gap1 {
+    border-left: 2px solid blue;
+    left: 104px;
+  }
+
+  .col-gap2 {
+    border-left: 5px solid blue;
+    left: 212.5px;
+  }
+
+  .col-gap3 {
+    border-left: 8px solid blue;
+    left: 321px;
+  }
+
+  .col-gap4 {
+    border-left: 2px solid blue;
+    left: 434px;
+  }
+
+  .col-gap5 {
+    border-left: 5px solid blue;
+    left: 542.5px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
+
+<div class="col-gap col-gap1"> </div>
+<div class="col-gap col-gap2"> </div>
+<div class="col-gap col-gap3"> </div>
+<div class="col-gap col-gap4"> </div>
+<div class="col-gap col-gap5"> </div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
+<div class="row-gap row-gap3"> </div>
+<div class="row-gap row-gap4"> </div>
+<div class="row-gap row-gap5"> </div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-018.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-018.html
new file mode 100644
index 00000000000..dc5e2e38e0b
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-018.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Grid gaps are painted with multiple line-width values for *-rule-width.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#lists-repeat">
+<link rel="match" href="grid-gap-decorations-018-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: repeat(6, 100px);
+    height: 650px;
+    width: 650px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 2px 5px 8px;
+
+    row-rule-color: red;
+    row-rule-style: solid;
+    row-rule-width: 8px 5px 2px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-019-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-019-ref.html
new file mode 100644
index 00000000000..e9f8a87979d
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-019-ref.html
@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#lists-repeat">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: repeat(6, 100px);
+    height: 650px;
+    width: 650px;
+  }
+
+  .row-gap {
+    height: 0px;
+    width: 650px;
+    position: absolute;
+
+  }
+
+  .row-gap1 {
+    border-bottom: 10px solid red;
+    top: 100px;
+  }
+
+  .row-gap2 {
+    border-bottom: 8px solid red;
+    top: 211px;
+  }
+
+  .row-gap3 {
+    border-bottom: 2px solid red;
+    top: 324px;
+  }
+
+  .row-gap4 {
+    border-bottom: 2px solid red;
+    top: 434px;
+  }
+
+  .row-gap5 {
+    border-bottom: 5px solid red;
+    top: 542.5px;
+  }
+
+  .col-gap {
+    width: 0px;
+    height: 650px;
+    position: absolute;
+    top: 0px;
+  }
+
+  .col-gap1 {
+    border-left: 2px solid blue;
+    left: 104px;
+  }
+
+  .col-gap2 {
+    border-left: 5px solid blue;
+    left: 212.5px;
+  }
+
+  .col-gap3 {
+    border-left: 2px solid blue;
+    left: 324px;
+  }
+
+  .col-gap4 {
+    border-left: 10px solid blue;
+    left: 430px;
+  }
+
+  .col-gap5 {
+    border-left: 10px solid blue;
+    left: 540px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
+
+<div class="col-gap col-gap1"> </div>
+<div class="col-gap col-gap2"> </div>
+<div class="col-gap col-gap3"> </div>
+<div class="col-gap col-gap4"> </div>
+<div class="col-gap col-gap5"> </div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
+<div class="row-gap row-gap3"> </div>
+<div class="row-gap row-gap4"> </div>
+<div class="row-gap row-gap5"> </div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-019.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-019.html
new file mode 100644
index 00000000000..637e0467a80
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-019.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Grid gaps are painted with multiple line-width values for *-rule-width.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-019-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: repeat(6, 100px);
+    height: 650px;
+    width: 650px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 2px repeat(auto, 5px 2px) repeat(2, 10px);
+
+    row-rule-color: red;
+    row-rule-style: solid;
+    row-rule-width: repeat(auto, 10px 8px) repeat(2, 2px) 5px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-020-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-020-ref.html
new file mode 100644
index 00000000000..6f31b5a09fc
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-020-ref.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .grid-container {
+        height: 110px;
+        width: 110px;
+
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+
+        column-gap: 10px;
+        row-gap: 10px;
+
+        column-rule-color: pink;
+        column-rule-style: dotted;
+        column-rule-width: 10px;
+
+        row-rule-color: green;
+        row-rule-style: ridge;
+        row-rule-width: 10px;
+    }
+
+    .grid-item {
+        background: skyblue;
+    }
+</style>
+<div class="grid-container">
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-020.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-020.html
new file mode 100644
index 00000000000..eb91644053f
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-020.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: row-rule-style inset should paint as ridge.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-020-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .grid-container {
+        height: 110px;
+        width: 110px;
+
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+
+        column-gap: 10px;
+        row-gap: 10px;
+
+        column-rule-color: pink;
+        column-rule-style: dotted;
+        column-rule-width: 10px;
+
+        row-rule-color: green;
+        row-rule-style: inset;
+        row-rule-width: 10px;
+    }
+
+    .grid-item {
+        background: skyblue;
+    }
+</style>
+<div class="grid-container">
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-021-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-021-ref.html
new file mode 100644
index 00000000000..de36d206606
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-021-ref.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .grid-container {
+        height: 110px;
+        width: 110px;
+
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+
+        column-gap: 10px;
+        row-gap: 10px;
+
+        column-rule-color: pink;
+        column-rule-style: dotted;
+        column-rule-width: 10px;
+
+        row-rule-color: green;
+        row-rule-style: groove;
+        row-rule-width: 10px;
+    }
+
+    .grid-item {
+        background: skyblue;
+    }
+</style>
+<div class="grid-container">
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-021.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-021.html
new file mode 100644
index 00000000000..63db3b4e048
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-021.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: row-rule-style outset should paint as groove.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-021-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .grid-container {
+        height: 110px;
+        width: 110px;
+
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+
+        column-gap: 10px;
+        row-gap: 10px;
+
+        column-rule-color: pink;
+        column-rule-style: dotted;
+        column-rule-width: 10px;
+
+        row-rule-color: green;
+        row-rule-style: outset;
+        row-rule-width: 10px;
+    }
+
+    .grid-item {
+        background: skyblue;
+    }
+</style>
+<div class="grid-container">
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-022.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-022.html
new file mode 100644
index 00000000000..ad73239bade
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-022.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Painting grid gaps with bi-directional `rule-color` shorthand.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#propdef-rule-color">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  .grid-container {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 10px;
+    height: 100px;
+    width: 100px;
+    background: red;
+    rule-color: green;
+    rule-width: 10px;
+    rule-style: solid;
+  }
+
+  .grid-item {
+    background: green;
+  }
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="grid-container">
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-023-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-023-ref.html
new file mode 100644
index 00000000000..e630694c6a5
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-023-ref.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#break">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+    .grid-container {
+        display: grid;
+        grid-template-columns: repeat(4, 1fr);
+        gap: 10px;
+        width: 430px;
+        height: 430px;
+    }
+    .grid-container>div {
+        z-index: 2
+    }
+    .grid-item {
+        background-color: gray;
+        opacity: 0.5;
+        border: 1px solid #000;
+    }
+    .row-gap1 {
+        position: absolute;
+        height: 0px;
+        top: 102.5px;
+        left: 0px;
+        width: 430px;
+        border-bottom: solid 5px red;
+    }
+    .row-gap2 {
+        position: absolute;
+        height: 0px;
+        top: 212.5px;
+        left: 0px;
+        width: 430px;
+        border-bottom: solid 5px red;
+    }
+    .row-gap3 {
+        position: absolute;
+        height: 0px;
+        display: flex;
+        top: 322.5px;
+        left: 0px;
+        border-bottom: solid 5px red;
+        width: 430px;
+    }
+    .col-gap1 {
+        position: absolute;
+        width: 0;
+        height: 430px;
+        border-left: solid 5px blue;
+        top: 0px;
+        left: 102.5px;
+    }
+    .col-gap2 {
+        position: absolute;
+        width: 0;
+        height: 430px;
+        top: 0px;
+        left: 212.5px;
+        border-left: solid 5px blue;
+    }
+    .col-gap3 {
+        position: absolute;
+        width: 0;
+        height: 430px;
+        top: 0px;
+        left: 322.5px;
+        border-left: solid 5px blue;
+    }
+</style>
+<div class="grid-container">
+    <div class="grid-item" style="grid-column: 1 / 3; grid-row: 1 / 2;"></div>
+    <div class="grid-item" style="grid-column: 3 / 4; grid-row: 1 / 3;"></div>
+    <div class="grid-item" style="grid-row: 2 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 4; grid-row: 3 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 3; grid-row: 2 / 3;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 1 / 4;"></div>
+    <div class="grid-item" style="grid-column: 1 / 4; grid-row: 4 / 5;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 4 / 5;"></div>
+</div>
+<div class="row-gap1"></div>
+<div class="row-gap2"></div>
+<div class="row-gap3"></div>
+<div class="col-gap1"></div>
+<div class="col-gap2"></div>
+<div class="col-gap3"></div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-023.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-023.html
new file mode 100644
index 00000000000..706f66ebcfa
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-023.html
@@ -0,0 +1,45 @@
+
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Painting column over rows.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#break">
+<link rel="match" href="grid-gap-decorations-023-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+
+<style>
+    body {
+        margin: 0px;
+    }
+    .grid-container {
+        display: grid;
+        grid-template-columns: repeat(4, 1fr);
+        gap: 10px;
+        width: 430px;
+        height: 430px;
+        column-rule-color: blue;
+        column-rule-style: solid;
+        column-rule-width: 5px;
+        row-rule-color: red;
+        row-rule-style: solid;
+        row-rule-width: 5px;
+        column-rule-break: none;
+        row-rule-break: none;
+        gap-rule-paint-order: column-over-row;
+    }
+    .grid-item {
+        background-color: gray;
+        opacity: 0.5;
+        border: 1px solid #000;
+    }
+</style>
+<div class="grid-container">
+    <div class="grid-item" style="grid-column: 1 / 3; grid-row: 1 / 2;"></div>
+    <div class="grid-item" style="grid-column: 3 / 4; grid-row: 1 / 3;"></div>
+    <div class="grid-item" style="grid-row: 2 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 4; grid-row: 3 / 4;"></div>
+    <div class="grid-item" style="grid-column: 2 / 3; grid-row: 2 / 3;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 1 / 4;"></div>
+    <div class="grid-item" style="grid-column: 1 / 4; grid-row: 4 / 5;"></div>
+    <div class="grid-item" style="grid-column: 4 / 5; grid-row: 4 / 5;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-024-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-024-ref.html
new file mode 100644
index 00000000000..94b1eccd747
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-024-ref.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#outset">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+
+  .row-gap {
+    position: absolute;
+    width: 320px;
+    height: 0px;
+    border-bottom: solid 5px red;
+  }
+
+  .row-gap1 {
+    top: 102.5px;
+  }
+
+  .row-gap2 {
+    top: 212.5px;
+  }
+
+  .col-gap {
+    position: absolute;
+    top: 0px;
+    width: 0px;
+    height: 320px;
+    border-left: solid 5px yellow;
+  }
+
+  .col-gap1 {
+    left: 102.5px;
+  }
+
+  .col-gap2 {
+    left: 212.5px;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
+<div class="col-gap col-gap1"> </div>
+<div class="col-gap col-gap2"> </div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-024.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-024.html
new file mode 100644
index 00000000000..104df87c7e2
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-024.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Grid column gaps are painted with :visited styles when a single color is used.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-024-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 5px;
+
+    row-rule-color: red;
+    row-rule-style: solid;
+    row-rule-width: 5px;
+
+  }
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+  .grid-link:visited .grid-container {
+    column-rule-color: yellow;
+  }
+</style>
+<a href="" class="grid-link">
+  <div class="grid-container">
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+  </div>
+</a>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-025-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-025-ref.html
new file mode 100644
index 00000000000..3834da46a5d
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-025-ref.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#outset">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+  }
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+  .row-gap {
+    position: absolute;
+    width: 320px;
+    height: 0px;
+    border-bottom: solid 5px red;
+  }
+  .row-gap1 {
+    top: 102.5px;
+  }
+  .row-gap2 {
+    top: 212.5px;
+  }
+  .col-gap {
+    position: absolute;
+    top: 0px;
+    width: 0px;
+    height: 320px;
+    border-left: solid 5px;
+  }
+  .gap-link:visited .col-gap {
+    border-color: currentcolor;
+  }
+  .col-gap1 {
+    left: 102.5px;
+  }
+  .col-gap2 {
+    left: 212.5px;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
+<a class="gap-link" href="">
+  <div class="col-gap col-gap1"> </div>
+  <div class="col-gap col-gap2"> </div>
+</a>
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-025.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-025.html
new file mode 100644
index 00000000000..fc48f15f5c2
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-025.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Grid column gaps are painted with default :visited styles when multiple colors are used.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-025-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 5px;
+
+    row-rule-color: red;
+    row-rule-style: solid;
+    row-rule-width: 5px;
+
+  }
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+  .grid-link:visited .grid-container {
+    column-rule-color: red lime blue;
+  }
+</style>
+<a href="" class="grid-link">
+  <div class="grid-container">
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+  </div>
+</a>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-026-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-026-ref.html
new file mode 100644
index 00000000000..d57c622810d
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-026-ref.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#outset">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+  }
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+  .row-gap {
+    position: absolute;
+    width: 320px;
+    height: 0px;
+    border-bottom: solid 5px green;
+  }
+  .row-gap1 {
+    top: 102.5px;
+  }
+  .row-gap2 {
+    top: 212.5px;
+  }
+  .col-gap {
+    position: absolute;
+    top: 0px;
+    width: 0px;
+    height: 320px;
+    border-left: solid 5px green;
+
+  }
+  .col-gap1 {
+    left: 102.5px;
+  }
+  .col-gap2 {
+    left: 212.5px;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
+<div class="col-gap col-gap1"> </div>
+<div class="col-gap col-gap2"> </div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-026.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-026.html
new file mode 100644
index 00000000000..17e0a99dd84
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-026.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Grid gaps are painted properly when currentColor is used.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-026-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+    color: green;
+  }
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+
+    column-rule-color: currentColor;
+    column-rule-style: solid;
+    column-rule-width: 5px;
+
+    row-rule-color: currentColor;
+    row-rule-style: solid;
+    row-rule-width: 5px;
+
+  }
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-027-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-027-ref.html
new file mode 100644
index 00000000000..7e0d9cbcd6f
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-027-ref.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#outset">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+  }
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+  .row-gap {
+    position: absolute;
+    width: 320px;
+    height: 0px;
+    border-bottom: solid 5px green;
+  }
+  .row-gap1 {
+    top: 102.5px;
+  }
+  .row-gap2 {
+    top: 212.5px;
+  }
+  .col-gap {
+    position: absolute;
+    top: 0px;
+    width: 0px;
+    height: 320px;
+    border-left: solid 5px;
+
+  }
+  .gap-link:visited .col-gap {
+    border-left-color: currentColor;
+  }
+  .col-gap1 {
+    left: 102.5px;
+  }
+  .col-gap2 {
+    left: 212.5px;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
+<a href="" class="gap-link">
+  <div class="col-gap col-gap1"> </div>
+  <div class="col-gap col-gap2"> </div>
+</a>
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-027.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-027.html
new file mode 100644
index 00000000000..e39305f74b8
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-027.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Grid gaps are painted properly when currentColor is used in :visited styles.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-027-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    height: 320px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 5px;
+
+    row-rule-color: green;
+    row-rule-style: solid;
+    row-rule-width: 5px;
+  }
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+  .grid-link:visited .grid-container {
+    column-rule-color: currentColor;
+  }
+</style>
+<a href="" class="grid-link">
+  <div class="grid-container">
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+  </div>
+</a>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-028.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-028.html
new file mode 100644
index 00000000000..125a34ca966
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-028.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Gap Decoration: :visited column-rule-color style is not leaked via getComputedStyle</title>
+<link rel="help" href="https://tabatkins.github.io/specs/css-masonry/">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<script src="/resources/testharness.js" type="text/javascript"></script>
+<script src="/resources/testharnessreport.js" type="text/javascript"></script>
+</head>
+<body>
+<a class="grid-link">
+  <div id="target1"></div>
+</a>
+<style>
+  #target1 {
+    display: grid;
+    column-rule-color: lime;
+  }
+
+  grid:link:visited #target1 {
+    column-rule-color: blue;
+  }
+</style>
+<script>
+  test(function() {
+    const gridContainerStyle = window.getComputedStyle(document.querySelector('#target1'));
+    const columnRuleColor = gridContainerStyle.getPropertyValue('column-rule-color');
+    assert_equals(columnRuleColor, 'rgb(0, 255, 0)');
+
+  }, "`column-rule-color` should be rgb(0, 255, 0)");
+
+  test(function() {
+    const gridContainerStyle = window.getComputedStyle(document.querySelector('#target1'));
+    const columnRuleColor = gridContainerStyle.getPropertyValue('column-rule-color', ':visited');
+    assert_not_equals(columnRuleColor, 'rgb(0, 0, 255)');
+
+  }, "Visited `column-rule-color` should not be blue but it is");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-029-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-029-ref.html
new file mode 100644
index 00000000000..35450e07ae5
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-029-ref.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    grid-template-rows: 100px 100px 100px;
+    width: 120px;
+    height: 120px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+
+  .row-gap {
+    position: absolute;
+    width: 320px;
+    height: 0px;
+    border-bottom: solid 5px red;
+  }
+
+  .row-gap1 {
+    top: 102.5px;
+  }
+
+  .row-gap2 {
+    top: 212.5px;
+  }
+
+  .col-gap {
+    position: absolute;
+    top: 0px;
+    width: 0px;
+    height: 320px;
+    border-left: solid 5px blue;
+  }
+
+  .col-gap1 {
+    left: 102.5px;
+  }
+
+  .col-gap2 {
+    left: 212.5px;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
+
+<div class="col-gap col-gap1"> </div>
+<div class="col-gap col-gap2"> </div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-029.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-029.html
new file mode 100644
index 00000000000..6da75548d94
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-029.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Gaps are painted when items overflow container.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-029-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    grid-template-rows: 100px 100px 100px;
+    width: 120px;
+    height: 120px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 5px;
+
+    row-rule-color: red;
+    row-rule-style: solid;
+    row-rule-width: 5px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+
+<body>
+  <div class="grid-container">
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+  </div>
+</body>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-030-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-030-ref.html
new file mode 100644
index 00000000000..d4953ae2ddd
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-030-ref.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    width: 120px;
+    height: 120px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+
+  .col-gap {
+    position: absolute;
+    top: 0px;
+    width: 0px;
+    height: 120px;
+    border-left: solid 5px blue;
+  }
+
+  .col-gap1 {
+    left: 102.5px;
+  }
+
+  .col-gap2 {
+    left: 212.5px;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
+
+<div class="col-gap col-gap1"> </div>
+<div class="col-gap col-gap2"> </div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-030.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-030.html
new file mode 100644
index 00000000000..ef4507ef926
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-030.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Gaps are painted when items overflow container - no row gaps.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-030-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    width: 120px;
+    height: 120px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 5px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+
+<body>
+  <div class="grid-container">
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+  </div>
+</body>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-031-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-031-ref.html
new file mode 100644
index 00000000000..0615305bc9f
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-031-ref.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-rows: 100px 100px 100px;
+    grid-auto-flow: column;
+    width: 120px;
+    height: 120px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+
+  .row-gap {
+    position: absolute;
+    width: 120px;
+    height: 0px;
+    border-bottom: solid 5px red;
+  }
+
+  .row-gap1 {
+    top: 102.5px;
+  }
+
+  .row-gap2 {
+    top: 212.5px;
+  }
+</style>
+<div class="grid-container">
+  <div class="item"></div>
+  <div class="item"></div>
+  <div class="item"></div>
+</div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-031.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-031.html
new file mode 100644
index 00000000000..530b661bfe3
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-031.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Gaps are painted when items overflow container - no column gaps.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-031-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-rows: 100px 100px 100px;
+    grid-auto-flow: column;
+    width: 120px;
+    height: 120px;
+
+    row-rule-color: red;
+    row-rule-style: solid;
+    row-rule-width: 5px;
+  }
+
+  .item {
+    background: gray;
+    opacity: 0.5;
+  }
+</style>
+
+<body>
+  <div class="grid-container">
+    <div class="item"></div>
+    <div class="item"></div>
+    <div class="item"></div>
+  </div>
+</body>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-032-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-032-ref.html
new file mode 100644
index 00000000000..f90e3dd6813
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-032-ref.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+    overflow: hidden;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    grid-template-rows: repeat(6, 100px);
+    width: 120px;
+    height: 120px;
+  }
+
+  .row-gap {
+    position: absolute;
+    width: 320px;
+    height: 0px;
+    border-bottom: solid 5px red;
+  }
+
+  .row-gap1 {
+    top: 102.5px;
+  }
+
+  .row-gap2 {
+    top: 212.5px;
+  }
+
+  .row-gap3 {
+    top: 322.5px;
+  }
+
+  .row-gap4 {
+    top: 432.5px;
+  }
+
+  .row-gap5 {
+    top: 542.5px;
+  }
+
+  .col-gap {
+    position: absolute;
+    top: 0px;
+    width: 0px;
+    height: 650px;
+    border-left: solid 10px blue;
+  }
+
+  .col-gap1 {
+    left: 100px;
+  }
+
+  .col-gap2 {
+    left: 210px;
+  }
+</style>
+<div class="grid-container"></div>
+
+<div class="col-gap col-gap1"> </div>
+<div class="col-gap col-gap2"> </div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
+<div class="row-gap row-gap3"> </div>
+<div class="row-gap row-gap4"> </div>
+<div class="row-gap row-gap5"> </div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-032.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-032.html
new file mode 100644
index 00000000000..ac2d38fdda0
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-032.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Gaps are painted when rows are dynamically added and overflow container.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-032-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+    overflow: hidden;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 100px 100px 100px;
+    grid-template-rows: 100px;
+    width: 120px;
+    height: 120px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 10px;
+  }
+
+</style>
+
+<body>
+  <div class="grid-container"></div>
+<script>
+  const grid = document.querySelector('.grid-container');
+  grid.style.gridTemplateRows = 'repeat(6, 100px)';
+
+  grid.style.rowRuleColor =  'red';
+  grid.style.rowRuleStyle = 'solid';
+  grid.style.rowRuleWidth = '5px';
+</script>
+</body>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-033-ref.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-033-ref.html
new file mode 100644
index 00000000000..e26143a6b93
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-033-ref.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+    overflow: hidden;
+  }
+
+  .grid-container {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: repeat(3, 50px);
+    grid-template-rows: repeat(6, 50px);
+    width: 50px;
+    height: 50px;
+  }
+
+  .row-gap {
+    position: absolute;
+    width: 170px;
+    height: 0px;
+    border-bottom: solid 5px red;
+  }
+
+  .row-gap1 {
+    top: 52.5px;
+  }
+
+  .row-gap2 {
+    top: 112.5px;
+  }
+
+  .row-gap3 {
+    top: 172.5px;
+  }
+
+  .row-gap4 {
+    top: 232.5px;
+  }
+
+  .row-gap5 {
+    top: 195px;
+    border-bottom: solid 200px red; /*expand the last row gap's height*/
+  }
+
+  .col-gap {
+    position: absolute;
+    top: 0px;
+    width: 0px;
+    height: 350px;
+    border-left: solid 10px blue;
+  }
+
+  .col-gap1 {
+    left: 50px;
+  }
+
+  .col-gap2 {
+    left: 110px;
+  }
+</style>
+<div class="grid-container"></div>
+
+<div class="col-gap col-gap1"> </div>
+<div class="col-gap col-gap2"> </div>
+
+<div class="row-gap row-gap1"> </div>
+<div class="row-gap row-gap2"> </div>
+<div class="row-gap row-gap3"> </div>
+<div class="row-gap row-gap4"> </div>
+<div class="row-gap row-gap5"> </div>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-033.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-033.html
new file mode 100644
index 00000000000..47ef35cc368
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-033.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: Decorations are painted when rule thickness is greater than gap size.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="grid-gap-decorations-033-ref.html">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+    overflow: hidden;
+  }
+
+  .grid-container {
+    display: grid;
+    gap: 10px;
+    grid-template-columns: repeat(3, 50px);
+    grid-template-rows: repeat(6, 50px);
+    width: 50px;
+    height: 50px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 10px;
+  }
+
+</style>
+
+<body>
+  <div class="grid-container"></div>
+<script>
+  const grid = document.querySelector('.grid-container');
+
+  grid.style.rowRuleColor =  'red';
+  grid.style.rowRuleStyle = 'solid';
+  grid.style.rowRuleWidth = 'repeat(4, 5px) 200px';
+</script>
+</body>
diff --git a/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-38.html b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-38.html
new file mode 100644
index 00000000000..8b87bcd4860
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/grid/grid-gap-decorations-38.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<title>
+  CSS Gap Decorations: grid column gaps are painted with different sized gaps and column-rule-outset 0.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="../agnostic/gap-decorations-002-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+  body {
+    margin: 0px;
+  }
+
+  .grid-container {
+    height: 110px;
+    width: 120px;
+
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+
+    column-gap: 20px;
+    row-gap: 10px;
+
+    column-rule-color: blue;
+    column-rule-style: solid;
+    column-rule-width: 20px;
+
+    row-rule-color: gold;
+    row-rule-style: solid;
+    row-rule-width: 10px;
+
+    row-rule-break: intersection;
+    row-rule-outset: 0;
+  }
+
+  .grid-item {
+    background: skyblue;
+  }
+</style>
+<div class="grid-container">
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+    <div class="grid-item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-001-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-001-ref.html
new file mode 100644
index 00000000000..834c96ccd39
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-001-ref.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .container {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 130px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items {
+        background: rgb(96 139 168 / 0.2);
+        height: 130px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .row-gap {
+        position: absolute;
+        height: 10px;
+        width: 200px;
+        background: gold;
+        left: 2px;
+        top: 62px;
+    }
+
+    .column-gap {
+        position: absolute;
+        height: 130px;
+        width: 10px;
+        background: blue;
+        top: 2px;
+    }
+</style>
+
+<div class="container">
+    <div class="items"></div>
+    <div class="items"></div>
+    <div class="items"></div>
+</div>
+<div class="column-gap" style="left:62px;"></div>
+<div class="column-gap" style="left:132px;"></div>
+<div class="row-gap"></div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-001.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-001.html
new file mode 100644
index 00000000000..c3752156c7d
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-001.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted with column-wrap.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-001-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .container {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 130px;
+        column-count: 3;
+        column-width: 60px;
+        column-height: 60px;
+        column-gap: 10px;
+        row-gap: 10px;
+        column-rule-width: 10px;
+        column-rule-style: solid;
+        column-rule-color: blue;
+        row-rule-width: 10px;
+        row-rule-style: solid;
+        row-rule-color: gold;
+        column-wrap: wrap;
+    }
+
+    p {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+    }
+</style>
+
+<div class="container">
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-002-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-002-ref.html
new file mode 100644
index 00000000000..d132f0ca677
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-002-ref.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .outer {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 200px;
+    }
+
+    .container1 {
+        position: absolute;
+        top: 2px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items1 {
+        background: rgb(96 139 168 / 0.2);
+        height: 40px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .container2 {
+        position: absolute;
+        top: 60px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items2 {
+        background: rgb(96 139 168 / 0.2);
+        height: 130px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .row-gap {
+        position: absolute;
+        height: 10px;
+        width: 200px;
+        background: gold;
+        left: 2px;
+        top: 120px;
+    }
+
+    .column-gap1 {
+        position: absolute;
+        height: 40px;
+        width: 10px;
+        background: blue;
+        top: 2px;
+    }
+
+    .column-gap2 {
+        position: absolute;
+        height: 142px;
+        width: 10px;
+        background: blue;
+        top: 60px;
+    }
+
+    .spanner {
+        position: absolute;
+        background: cyan;
+        width: 200px;
+        height: 18px;
+        top: 42px;
+        left: 2px;
+        opacity: 0.5;
+    }
+</style>
+
+<div class="outer">
+    <div class="container1">
+        <div class="items1"></div>
+        <div class="items1"></div>
+        <div class="items1"></div>
+    </div>
+    <div class="container2">
+        <div class="items2"></div>
+        <div class="items2"></div>
+        <div class="items2"></div>
+    </div>
+    <div class="column-gap1" style="left:62px;"></div>
+    <div class="column-gap1" style="left:132px;"></div>
+    <div class="column-gap2" style="left:62px;"></div>
+    <div class="column-gap2" style="left:132px;"></div>
+    <div class="row-gap"></div>
+    <div class="spanner"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-002.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-002.html
new file mode 100644
index 00000000000..0b632fa94ac
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-002.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted with column-wrap and a spanner.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-002-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .container {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 200px;
+        column-height: 60px;
+        column-gap: 10px;
+        row-gap: 10px;
+        column-rule-width: 10px;
+        column-rule-style: solid;
+        column-rule-color: blue;
+        row-rule-width: 10px;
+        row-rule-style: solid;
+        row-rule-color: gold;
+        column-wrap: wrap;
+        column-width: 60px;
+        column-count: 3;
+        column-fill: auto;
+    }
+
+    p {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+    }
+
+    h2 {
+        column-span: all;
+        background-color: cyan;
+        color: #fff;
+        margin: 0px;
+        opacity: 0.5;
+        height: 18px;
+    }
+</style>
+
+<div class="container">
+    <p></p>
+    <p></p>
+    <h2></h2>
+
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-003-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-003-ref.html
new file mode 100644
index 00000000000..cd26da24389
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-003-ref.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .outer {
+
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 200px;
+
+    }
+
+    .container1 {
+        position: absolute;
+        top: 2px;
+        column-gap: 10px;
+        display: flex;
+        height: 200px;
+    }
+
+    .items1 {
+        background: rgb(96 139 168 / 0.2);
+        height: 40px;
+        margin: 0px;
+        width: 60px;
+        height: 200px;
+    }
+
+    .column-gap1 {
+        position: absolute;
+        height: 200px;
+        width: 10px;
+        background: blue;
+        top: 2px;
+    }
+
+    .spanner {
+        position: absolute;
+        background: cyan;
+        width: 200px;
+        height: 18px;
+        top: 42px;
+        left: 2px;
+        opacity: 0.5;
+    }
+</style>
+<div class="outer">
+    <div class="container1">
+        <div class="items1"></div>
+        <div class="items1"></div>
+        <div class="items1"></div>
+    </div>
+    <div class="column-gap1" style="left:62px;"></div>
+    <div class="column-gap1" style="left:132px;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-003.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-003.html
new file mode 100644
index 00000000000..2f2473fd046
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-003.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted basic case.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-003-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #container {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        column-count: 3;
+        column-width: 60px;
+        column-gap: 10px;
+        column-rule-width: 10px;
+        column-rule-style: solid;
+        column-rule-color: blue;
+    }
+
+    p {
+        background: rgb(96 139 168 / 0.2);
+        height: 200px;
+        margin: 0px;
+    }
+</style>
+
+<div id="container">
+    <p></p>
+    <p></p>
+    <p></p>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-004-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-004-ref.html
new file mode 100644
index 00000000000..002b1f2b594
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-004-ref.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .outer {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 130px;
+    }
+
+    .container1 {
+        width: 200px;
+        height: 130px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items1 {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .container2 {
+        position: absolute;
+        top: 72px;
+        left: 2px;
+        width: 200px;
+        height: 60px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items2 {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .row-gap {
+        position: absolute;
+        height: 4px;
+        width: 200px;
+        background: gold;
+        left: 2px;
+        top: 65px;
+    }
+
+    .column-gap {
+        position: absolute;
+        height: 130px;
+        width: 4px;
+        background: blue;
+        top: 2px;
+    }
+</style>
+
+<div class="outer">
+    <div class="container1">
+        <div class="items1"></div>
+        <div class="items1"></div>
+        <div class="items1"></div>
+    </div>
+    <div class="container2">
+        <div class="items2"></div>
+        <div class="items2"></div>
+        <div class="items2"></div>
+    </div>
+    <div class="column-gap" style="left:65px;"></div>
+    <div class="column-gap" style="left:135px;"></div>
+    <div class="row-gap"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-004.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-004.html
new file mode 100644
index 00000000000..0dcbeef4df8
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-004.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted with smaller width than gap and column-wrap.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-004-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .container {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 130px;
+        column-count: 3;
+        column-width: 60px;
+        column-height: 60px;
+        column-gap: 10px;
+        row-gap: 10px;
+        column-rule-width: 4px;
+        column-rule-style: solid;
+        column-rule-color: blue;
+        row-rule-width: 4px;
+        row-rule-style: solid;
+        row-rule-color: gold;
+        column-wrap: wrap;
+        column-fill: auto;
+    }
+
+    p {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+    }
+</style>
+
+<div class="container">
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-005-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-005-ref.html
new file mode 100644
index 00000000000..6543021c979
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-005-ref.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .outer {
+        display: flex;
+        border: 1px solid #ccc;
+        height: 50px;
+        width: 210px;
+        column-gap: 10px;
+    }
+
+    .outer-items {
+        background: rgb(96 139 168 / 0.2);
+        height 50px;
+        width: 100px;
+    }
+
+    .inner {
+        display: flex;
+        height: 50px;
+        column-gap: 10px;
+        width: 100px;
+    }
+
+    .inner-items {
+        height: 50px;
+        width: 45px;
+        background: black;
+    }
+
+    .column-gap {
+        position: absolute;
+        height: 50px;
+        top: 1px;
+        left: 101px;
+        width: 10px;
+    }
+
+    .row-gap {
+        position: absolute;
+        background: purple;
+        height: 10px;
+        top: 21px;
+        left: 111px;
+        width: 100px;
+    }
+</style>
+<div class="outer">
+    <div class="outer-items"></div>
+    <div class="outer-items" id="nested">
+        <div class="inner">
+            <div class="inner-items"></div>
+            <div class="inner-items"></div>
+        </div>
+    </div>
+</div>
+<div class="column-gap" style="background: blue;"></div>
+<div class="column-gap" style="background: gold; left: 156px"></div>
+<div class="row-gap"></div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-005.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-005.html
new file mode 100644
index 00000000000..daa65e904e7
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-005.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted with nested multicol with column wrap.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-005-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .outer-container {
+        column-count: 2;
+        column-gap: 10px;
+        column-rule-width: 10px;
+        column-rule-style: solid;
+        column-rule-color: blue;
+        border: 1px solid #ccc;
+        width: 210px;
+        height: 50px;
+    }
+
+    .nested-container {
+        column-count: 2;
+        column-gap: 10px;
+        width: 100px;
+        column-rule-width: 10px;
+        column-rule-style: solid;
+        column-rule-color: gold;
+        row-gap: 10px;
+        row-rule-width: 10px;
+        row-rule-style: solid;
+        row-rule-color: purple;
+        column-wrap: wrap;
+        column-fill: auto;
+        column-height: 20px;
+    }
+
+    .column1 {
+        background: rgb(96 139 168 / 0.2);
+        width: 100px;
+        height: 50px
+    }
+
+    .nested-column {
+        background: black;
+        width: 45px;
+        height: 20px;
+    }
+</style>
+
+<div class="outer-container">
+    <div class="column1">
+    </div>
+    <div class="column2">
+        <div class="nested-container">
+            <div class="nested-column"></div>
+            <div class="nested-column"></div>
+            <div class="nested-column"></div>
+            <div class="nested-column"></div>
+        </div>
+    </div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-006-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-006-ref.html
new file mode 100644
index 00000000000..4cb56d207fe
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-006-ref.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    .outer-container {
+        columns: 3;
+        column-fill: auto;
+        height: 100px;
+        width: 600px;
+        gap: 10px;
+        background: yellow;
+    }
+
+    .nested-container {
+        columns: 2;
+        box-decoration-break: clone;
+        padding: 10px;
+        gap: 10px;
+        background: cyan;
+    }
+
+    .inner-column {
+        height: 250px;
+        background: hotpink;
+        width: 80px;
+    }
+
+    #col-gap1 {
+        position: absolute;
+        height: 80px;
+        width: 1px;
+        background: green;
+        top: 18px;
+        left: 104px;
+    }
+
+    #col-gap2 {
+        position: absolute;
+        width: 1px;
+        background: green;
+        top: 18px;
+        left: 307px;
+        height: 45px;
+    }
+</style>
+<div class="outer-container">
+    <div class="nested-container">
+        <div class="inner-column"></div>
+    </div>
+</div>
+<div id="col-gap1"></div>
+<div id="col-gap2"></div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-006.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-006.html
new file mode 100644
index 00000000000..64b3b007ab5
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-006.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted with nested fragmented multicol.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-006-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    .outer-container {
+        columns: 3;
+        column-fill: auto;
+        height: 100px;
+        width: 600px;
+        gap: 10px;
+        background: yellow;
+    }
+
+    .nested-container {
+        columns: 2;
+        box-decoration-break: clone;
+        padding: 10px;
+        column-rule: solid;
+        column-rule-color: green;
+        column-rule-width: 1px;
+        background: cyan;
+        gap: 10px;
+    }
+
+    .inner-column {
+        height: 250px;
+        background: hotpink;
+        width: 80px;
+    }
+</style>
+<div class="outer-container">
+    <div class="nested-container">
+        <div class="inner-column"></div>
+    </div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-007-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-007-ref.html
new file mode 100644
index 00000000000..09973ddc690
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-007-ref.html
@@ -0,0 +1,133 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #outer {
+        width: 620px;
+        height: 200px;
+        background: yellow;
+    }
+
+    .inner1 {
+        border-top: 2px solid;
+        border-left: 2px solid;
+        border-right: 2px solid;
+        background: cyan;
+        height: 198px;
+        width: 296px;
+    }
+
+    .inner2 {
+        border-bottom: 2px solid;
+        border-left: 2px solid;
+        border-right: 2px solid;
+        position: absolute;
+        left: 320px;
+        top: 0px;
+        height: 130px;
+        width: 296px;
+        background: cyan
+    }
+
+    .inner-flex {
+        display: flex;
+        column-gap: 20px;
+    }
+
+    .inner-items {
+        background: hotpink;
+        width: 85.333px;
+    }
+
+    .column-gap1 {
+        width: 10px;
+        background: blue;
+        position: absolute;
+        top: 2px;
+    }
+
+    .column-gap2 {
+        width: 10px;
+        background: blue;
+        position: absolute;
+        top: 40px;
+    }
+
+    .spanner {
+        background: grey;
+        opacity: 0.5;
+        height: 18px;
+        width: 296px;
+    }
+
+    .row-gap1 {
+        height: 10px;
+        background: green;
+        position: relative;
+        width: 296px;
+        top: 105px;
+    }
+
+    .row-gap2 {
+        height: 10px;
+        background: green;
+        position: absolute;
+        width: 296px;
+        top: 105px;
+    }
+
+    .column-gap3 {
+        background: blue;
+        height: 130px;
+        position: absolute;
+        width: 10px;
+        top: 0px;
+    }
+</style>
+
+<div id="outer">
+    <div class="inner1">
+        <div class="inner-flex">
+            <div class="inner-items" style="height:20px;"></div>
+            <div class="inner-items" style="height:20px" ;></div>
+            <div class="inner-items" style="height:20px;"></div>
+        </div>
+        <div class="inner-flex" style="position: absolute; left:2px; top:40px">
+            <div class="inner-items" style="height:100px;"></div>
+            <div class="inner-items" style="height:100px" ;></div>
+            <div class="inner-items" style="height:100px;"></div>
+        </div>
+        <div class="inner-flex" style="position: absolute; left:2px; top:160px">
+            <div class="inner-items" style="height:40px;"></div>
+            <div class="inner-items" style="height:40px" ;></div>
+            <div class="inner-items" style="height:40px;"></div>
+        </div>
+        <div class="spanner"></div>
+        <div class="column-gap1" style="height: 20px; left:calc(2px + 85.333px + 5px)"></div>
+        <div class="column-gap1" style="height: 20px; left:calc(2px + 85.333px + 5px + 10px + 5px + 85.333px + 5px)">
+        </div>
+        <div class="column-gap2" style="height: 160px; left:calc(2px + 85.333px + 5px)"></div>
+        <div class="column-gap2" style="height: 160px; left:calc(2px + 85.333px + 5px + 10px + 5px + 85.333px + 5px)">
+        </div>
+        <div class="row-gap1"></div>
+    </div>
+    <div class="inner2">
+        <div class="inner-flex">
+            <div class="inner-items" style="height:100px"></div>
+            <div class="inner-items" style="height:100px"></div>
+            <div class="inner-items" style="height:100px"></div>
+        </div>
+        <div class="inner-flex" style="position: absolute; top:120px;">
+            <div class="inner-items" style="height:10px"></div>
+            <div class="inner-items" style="height:10px"></div>
+            <div class="inner-items" style="height:10px"></div>
+        </div>
+        <div class="column-gap3" style="left:calc(85.333px + 5px);"></div>
+        <div class="column-gap3" style="left:calc(85.333px + 5px + 10px + 5px + 85.333px + 5px);"></div>
+        <div class="row-gap2"></div>
+    </div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-007.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-007.html
new file mode 100644
index 00000000000..1f23ed7f7ca
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-007.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted with nested fragmented multicol.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-007-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    #outer {
+        width: 620px;
+        columns: 2;
+        column-fill: auto;
+        gap: 20px;
+        height: 200px;
+        background: yellow;
+    }
+
+    #inner {
+        columns: 3;
+        border: 2px solid;
+        gap: 20px;
+        column-height: 100px;
+        column-rule-style: solid;
+        column-rule-color: blue;
+        column-rule-width: 10px;
+        row-rule-style: solid;
+        row-rule-color: green;
+        row-rule-width: 10px;
+        column-wrap: wrap;
+        background: cyan;
+    }
+</style>
+
+<div id="outer">
+    <div id="inner">
+        <div style="height:60px; background:hotpink;"></div>
+        <div style="column-span:all; background: grey; opacity: 0.5; height:18px"></div>
+        <div style="height:750px; background:hotpink;"></div>
+    </div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-008-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-008-ref.html
new file mode 100644
index 00000000000..d49c2f50f19
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-008-ref.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .outer {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 200px;
+    }
+
+    .container1 {
+        position: absolute;
+        top: 2px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items1 {
+        background: rgb(96 139 168 / 0.2);
+        height: 40px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .container2 {
+        position: absolute;
+        top: 60px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items2 {
+        background: rgb(96 139 168 / 0.2);
+        height: 130px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .row-gap {
+        position: absolute;
+        height: 10px;
+        width: 200px;
+        left: 2px;
+        top: 120px;
+        display: flex;
+        column-gap: 10px;
+    }
+
+    .row-gap-items {
+        width: 60px;
+        background: gold;
+    }
+
+    .column-gap1 {
+        position: absolute;
+        height: 40px;
+        width: 10px;
+        background: blue;
+        top: 2px;
+    }
+
+    .column-gap2 {
+        position: absolute;
+        height: 60px;
+        width: 10px;
+        background: blue;
+        top: 60px;
+    }
+
+    .spanner {
+        position: absolute;
+        background: cyan;
+        width: 200px;
+        height: 18px;
+        top: 42px;
+        left: 2px;
+        opacity: 0.5;
+    }
+
+    .column-gap3 {
+        position: absolute;
+        height: 72px;
+        width: 10px;
+        background: blue;
+        top: 130px;
+    }
+</style>
+<div class="outer">
+    <div class="container1">
+        <div class="items1"></div>
+        <div class="items1"></div>
+        <div class="items1"></div>
+    </div>
+    <div class="container2">
+        <div class="items2"></div>
+        <div class="items2"></div>
+        <div class="items2"></div>
+    </div>
+    <div class="row-gap">
+        <div class="row-gap-items"></div>
+        <div class="row-gap-items"></div>
+        <div class="row-gap-items"></div>
+    </div>
+    <div class="spanner"></div>
+    <div class="column-gap1" style="left:62px;"></div>
+    <div class="column-gap1" style="left:132px;"></div>
+    <div class="column-gap2" style="left:62px;"></div>
+    <div class="column-gap2" style="left:132px;"></div>
+    <div class="column-gap3" style="left:62px;"></div>
+    <div class="column-gap3" style="left:132px;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-008.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-008.html
new file mode 100644
index 00000000000..ed299b5d9f6
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-008.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted with 0px outset and rule-break intersection.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-008-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .container {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 200px;
+        column-height: 60px;
+        column-gap: 10px;
+        row-gap: 10px;
+        column-rule-width: 10px;
+        column-rule-style: solid;
+        column-rule-color: blue;
+        row-rule-width: 10px;
+        row-rule-style: solid;
+        row-rule-color: gold;
+        row-rule-break: intersection;
+        column-rule-break: intersection;
+        column-rule-outset: 0px;
+        row-rule-outset: 0px;
+        column-wrap: wrap;
+        column-width: 60px;
+        column-count: 3;
+        column-fill: auto;
+    }
+
+    p {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+    }
+
+    h2 {
+        column-span: all;
+        background-color: cyan;
+        color: #fff;
+        margin: 0px;
+        opacity: 0.5;
+        height: 18px;
+    }
+</style>
+
+<div class="container">
+    <p></p>
+    <p></p>
+    <h2></h2>
+
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-009-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-009-ref.html
new file mode 100644
index 00000000000..124bf7eaeb1
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-009-ref.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .outer {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 200px;
+    }
+
+    .container1 {
+        position: absolute;
+        top: 2px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items1 {
+        background: rgb(96 139 168 / 0.2);
+        height: 40px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .container2 {
+        position: absolute;
+        top: 60px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items2 {
+        background: rgb(96 139 168 / 0.2);
+        height: 130px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .row-gap {
+        position: absolute;
+        height: 10px;
+        width: 204px;
+        left: 0px;
+        top: 120px;
+        display: flex;
+        column-gap: 6px;
+    }
+
+    .row-gap-items {
+        width: 64px;
+        background: gold;
+    }
+
+    .column-gap1 {
+        position: absolute;
+        height: 44px;
+        width: 10px;
+        background: blue;
+        top: 0px;
+    }
+
+    .column-gap2 {
+        position: absolute;
+        height: 64px;
+        width: 10px;
+        background: blue;
+        top: 58px;
+    }
+
+    .spanner {
+        position: absolute;
+        background: cyan;
+        width: 200px;
+        height: 18px;
+        top: 42px;
+        left: 2px;
+        opacity: 0.5;
+    }
+
+    .column-gap3 {
+        position: absolute;
+        height: 76px;
+        width: 10px;
+        background: blue;
+        top: 128px;
+    }
+</style>
+
+<div class="outer">
+    <div class="container1">
+        <div class="items1"></div>
+        <div class="items1"></div>
+        <div class="items1"></div>
+    </div>
+    <div class="container2">
+        <div class="items2"></div>
+        <div class="items2"></div>
+        <div class="items2"></div>
+    </div>
+    <div class="column-gap1" style="left:62px;"></div>
+    <div class="column-gap1" style="left:132px;"></div>
+    <div class="column-gap2" style="left:62px;"></div>
+    <div class="column-gap2" style="left:132px;"></div>
+    <div class="spanner"></div>
+    <div class="column-gap3" style="left:62px;"></div>
+    <div class="column-gap3" style="left:132px;"></div>
+    <div class="row-gap">
+        <div class="row-gap-items"></div>
+        <div class="row-gap-items"></div>
+        <div class="row-gap-items"></div>
+    </div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-009.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-009.html
new file mode 100644
index 00000000000..b00c6a70f8a
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-009.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted with 2px outset and rule-break intersection.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-009-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .container {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 200px;
+        column-height: 60px;
+        column-gap: 10px;
+        row-gap: 10px;
+        column-rule-width: 10px;
+        column-rule-style: solid;
+        column-rule-color: blue;
+        row-rule-width: 10px;
+        row-rule-style: solid;
+        row-rule-color: gold;
+        row-rule-break: intersection;
+        column-rule-break: intersection;
+        column-rule-outset: 2px;
+        row-rule-outset: 2px;
+        column-wrap: wrap;
+        column-width: 60px;
+        column-count: 3;
+        column-fill: auto;
+    }
+
+    p {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+    }
+
+    h2 {
+        column-span: all;
+        background-color: cyan;
+        color: #fff;
+        margin: 0px;
+        opacity: 0.5;
+        height: 18px;
+    }
+</style>
+
+<div class="container">
+    <p></p>
+    <p></p>
+    <h2></h2>
+
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-010-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-010-ref.html
new file mode 100644
index 00000000000..9582ab4103d
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-010-ref.html
@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .outer {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 200px;
+    }
+
+    .container1 {
+        position: absolute;
+        top: 2px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items1 {
+        background: rgb(96 139 168 / 0.2);
+        height: 40px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .container2 {
+        position: absolute;
+        top: 60px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items2 {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .container3 {
+        position: absolute;
+        top: 130px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items3 {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .row-gap {
+        position: absolute;
+        height: 10px;
+        width: 204px;
+        left: 4px;
+        top: 120px;
+        display: flex;
+        column-gap: 14px;
+    }
+
+    .row-gap-items {
+        width: 56px;
+        background: gold;
+    }
+
+    .column-gap1 {
+        position: absolute;
+        height: 36px;
+        width: 10px;
+        background: blue;
+        top: 4px;
+    }
+
+    .column-gap2 {
+        position: absolute;
+        height: 56px;
+        width: 10px;
+        background: blue;
+        top: 62px;
+    }
+
+    .spanner {
+        position: absolute;
+        background: cyan;
+        width: 200px;
+        height: 18px;
+        top: 42px;
+        left: 2px;
+        opacity: 0.5;
+    }
+
+    .column-gap3 {
+        position: absolute;
+        height: 68px;
+        width: 10px;
+        background: blue;
+        top: 132px;
+    }
+</style>
+
+<div class="outer">
+    <div class="container1">
+        <div class="items1"></div>
+        <div class="items1"></div>
+        <div class="items1"></div>
+    </div>
+    <div class="container2">
+        <div class="items2"></div>
+        <div class="items2"></div>
+        <div class="items2"></div>
+    </div>
+    <div class="container3">
+        <div class="items3"></div>
+        <div class="items3"></div>
+        <div class="items3"></div>
+    </div>
+    <div class="row-gap">
+        <div class="row-gap-items"></div>
+        <div class="row-gap-items"></div>
+        <div class="row-gap-items"></div>
+    </div>
+    <div class="column-gap1" style="left:62px;"></div>
+    <div class="column-gap1" style="left:132px;"></div>
+    <div class="column-gap2" style="left:62px;"></div>
+    <div class="column-gap2" style="left:132px;"></div>
+    <div class="spanner"></div>
+    <div class="column-gap3" style="left:62px;"></div>
+    <div class="column-gap3" style="left:132px;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-010.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-010.html
new file mode 100644
index 00000000000..61bb4a9b933
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-010.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted with -2px outset and rule-break intersection.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-010-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .container {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 200px;
+        column-height: 60px;
+        column-gap: 10px;
+        row-gap: 10px;
+        column-rule-width: 10px;
+        column-rule-style: solid;
+        column-rule-color: blue;
+        row-rule-width: 10px;
+        row-rule-style: solid;
+        row-rule-color: gold;
+        row-rule-break: intersection;
+        column-rule-break: intersection;
+        column-rule-outset: -2px;
+        row-rule-outset: -2px;
+        column-wrap: wrap;
+        column-width: 60px;
+        column-count: 3;
+        column-fill: auto;
+    }
+
+    p {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+    }
+
+    h2 {
+        column-span: all;
+        background-color: cyan;
+        color: #fff;
+        margin: 0px;
+        opacity: 0.5;
+        height: 18px;
+    }
+</style>
+
+<div class="container">
+    <p></p>
+    <p></p>
+    <h2></h2>
+
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-011-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-011-ref.html
new file mode 100644
index 00000000000..3387918d399
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-011-ref.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .outer {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 200px;
+    }
+
+    .container1 {
+        position: absolute;
+        top: 2px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items1 {
+        background: rgb(96 139 168 / 0.2);
+        height: 40px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .container2 {
+        position: absolute;
+        top: 60px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items2 {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .container3 {
+        position: absolute;
+        top: 130px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items3 {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .row-gap {
+        position: absolute;
+        height: 2px;
+        width: 200px;
+        background: gold;
+        left: 2px;
+        top: 124px;
+    }
+
+    .column-gap1 {
+        position: absolute;
+        height: 40px;
+        width: 2px;
+        background: blue;
+        top: 2px;
+    }
+
+    .column-gap2 {
+        position: absolute;
+        height: 142px;
+        width: 2px;
+        background: blue;
+        top: 60px;
+    }
+
+    .spanner {
+        position: absolute;
+        background: cyan;
+        width: 200px;
+        height: 18px;
+        top: 42px;
+        left: 2px;
+        opacity: 0.5;
+    }
+</style>
+
+<div class="outer">
+    <div class="container1">
+        <div class="items1"></div>
+        <div class="items1"></div>
+        <div class="items1"></div>
+    </div>
+    <div class="container2">
+        <div class="items2"></div>
+        <div class="items2"></div>
+        <div class="items2"></div>
+    </div>
+    <div class="container3">
+        <div class="items3"></div>
+        <div class="items3"></div>
+        <div class="items3"></div>
+    </div>
+    <div class="column-gap1" style="left:66px;"></div>
+    <div class="column-gap1" style="left:136px;"></div>
+    <div class="column-gap2" style="left:66px;"></div>
+    <div class="column-gap2" style="left:136px;"></div>
+    <div class="row-gap"></div>
+    <div class="spanner"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-011.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-011.html
new file mode 100644
index 00000000000..cf588ded41e
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-011.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted with 100% outset and rule-break intersection.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-011-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .container {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 200px;
+        column-height: 60px;
+        column-gap: 10px;
+        row-gap: 10px;
+        column-rule-width: 2px;
+        column-rule-style: solid;
+        column-rule-color: blue;
+        row-rule-width: 2px;
+        row-rule-style: solid;
+        row-rule-color: gold;
+        row-rule-break: intersection;
+        column-rule-break: intersection;
+        column-rule-outset: 100%;
+        row-rule-outset: 100%;
+        column-wrap: wrap;
+        column-width: 60px;
+        column-count: 3;
+        column-fill: auto;
+    }
+
+    p {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+    }
+
+    h2 {
+        column-span: all;
+        background-color: cyan;
+        color: #fff;
+        margin: 0px;
+        opacity: 0.5;
+        height: 18px;
+    }
+</style>
+
+<div class="container">
+    <p></p>
+    <p></p>
+    <h2></h2>
+
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-012-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-012-ref.html
new file mode 100644
index 00000000000..9fb5e85e920
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-012-ref.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .outer {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 200px;
+    }
+
+    .container1 {
+        position: absolute;
+        top: 2px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items1 {
+        background: rgb(96 139 168 / 0.2);
+        height: 40px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .container2 {
+        position: absolute;
+        top: 60px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items2 {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .container3 {
+        position: absolute;
+        top: 130px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items3 {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .row-gap {
+        position: absolute;
+        height: 2px;
+        width: 200px;
+        background: gold;
+        left: 2px;
+        top: 124px;
+    }
+
+    .column-gap1 {
+        position: absolute;
+        height: 200px;
+        width: 2px;
+        background: blue;
+        top: 2px;
+    }
+
+    .spanner {
+        position: absolute;
+        background: cyan;
+        width: 200px;
+        height: 18px;
+        top: 42px;
+        left: 2px;
+        opacity: 0.5;
+    }
+</style>
+<div class="outer">
+    <div class="container1">
+        <div class="items1"></div>
+        <div class="items1"></div>
+        <div class="items1"></div>
+    </div>
+    <div class="container2">
+        <div class="items2"></div>
+        <div class="items2"></div>
+        <div class="items2"></div>
+    </div>
+    <div class="container3">
+        <div class="items3"></div>
+        <div class="items3"></div>
+        <div class="items3"></div>
+    </div>
+    <div class="column-gap1" style="left:66px;"></div>
+    <div class="column-gap1" style="left:136px;"></div>
+    <div class="row-gap"></div>
+    <div class="spanner"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-012.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-012.html
new file mode 100644
index 00000000000..078b810cf8e
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-012.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted with 2px width and rule-break none.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-012-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .container {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 200px;
+        column-height: 60px;
+        column-gap: 10px;
+        row-gap: 10px;
+        column-rule-width: 2px;
+        column-rule-style: solid;
+        column-rule-color: blue;
+        row-rule-width: 2px;
+        row-rule-style: solid;
+        row-rule-color: gold;
+        row-rule-break: none;
+        column-rule-break: none;
+        column-wrap: wrap;
+        column-width: 60px;
+        column-count: 3;
+        column-fill: auto;
+    }
+
+    p {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+    }
+
+    h2 {
+        column-span: all;
+        background-color: cyan;
+        color: #fff;
+        margin: 0px;
+        opacity: 0.5;
+        height: 18px;
+    }
+</style>
+<div class="container">
+    <p></p>
+    <p></p>
+    <h2></h2>
+
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-013-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-013-ref.html
new file mode 100644
index 00000000000..8e426d8ed32
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-013-ref.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<style>
+     body {
+        margin: 0px;
+    }
+
+    .mc {
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        width: 100px;
+        height: 100px;
+        columns: 2;
+        column-fill: auto;
+        column-gap: 10px;
+    }
+
+    .fake-column-gaps {
+        position: absolute;
+        top: 4px;
+        left: 45px;
+        display: flex;
+        height: 92px;
+        column-gap: 45px;
+    }
+
+    .column-gap {
+        width: 10px;
+        background: gold;
+    }
+</style>
+
+<div class="fake-column-gaps">
+    <div class="column-gap"></div>
+    <div class="column-gap"></div>
+    <div class="column-gap"></div>
+</div>
+<div class="mc">
+    <div style="height: 400px; background: cyan;">
+    </div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-013.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-013.html
new file mode 100644
index 00000000000..d4170084f06
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-013.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-013-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+     body {
+        margin: 0px;
+    }
+
+    .mc {
+        position: absolute;
+        top: 0px;
+        width: 100px;
+        height: 100px;
+        columns: 2;
+        column-fill: auto;
+        column-gap: 10px;
+        column-rule-color: gold;
+        column-rule-width: 10px;
+        column-rule-style: solid;
+        column-rule-outset: -4px;
+    }
+</style>
+
+<div class="mc">
+    <div style="height: 400px; background: cyan;">
+    </div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-014-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-014-ref.html
new file mode 100644
index 00000000000..9d9674bd476
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-014-ref.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .container {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 130px;
+        column-gap: 10px;
+        display: flex;
+    }
+
+    .items {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .last-item {
+        position: absolute;
+        left: 2px;
+        top: 72px;
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+        width: 60px;
+    }
+
+    .row-gap {
+        position: absolute;
+        height: 2px;
+        width: 200px;
+        background: gold;
+        left: 2px;
+        top: 66px;
+    }
+
+    .column-gap {
+        position: absolute;
+        height: 60px;
+        width: 10px;
+        background: blue;
+        top: 2px;
+    }
+</style>
+
+<div class="container">
+    <div class="items"></div>
+    <div class="items"></div>
+    <div class="items"></div>
+</div>
+<div class="last-item"></div>
+<div class="column-gap" style="left:62px;"></div>
+<div class="column-gap" style="left:132px;"></div>
+<div class="column-gap" style="left:62px; top: 72px;"></div>
+<div class="column-gap" style="left:132px; top: 72px;"></div>
+<div class="row-gap"></div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-014.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-014.html
new file mode 100644
index 00000000000..1dcd393d99a
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-014.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted with column-wrap, rule-break-intersection, and fewer
+    columns in last row.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-014-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .container {
+        border: 2px solid rgb(96 139 168);
+        width: 200px;
+        height: 130px;
+        column-count: 3;
+        column-width: 60px;
+        column-height: 60px;
+        column-gap: 10px;
+        row-gap: 10px;
+        column-rule-width: 10px;
+        column-rule-style: solid;
+        column-rule-color: blue;
+        row-rule-width: 2px;
+        row-rule-style: solid;
+        row-rule-color: gold;
+        column-wrap: wrap;
+        column-fill: auto;
+        column-rule-break: intersection;
+        column-rule-outset: 0;
+    }
+
+    p {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+    }
+</style>
+
+<div class="container">
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-015-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-015-ref.html
new file mode 100644
index 00000000000..2fee77be84c
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-015-ref.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .outer {
+        columns: 4;
+        orphans: 1;
+        widows: 1;
+        border: dotted 2px black;
+        width: 500px;
+    }
+
+    .col-box {
+        background: cyan;
+        height: 20px;
+        /* keep each box whole */
+        break-inside: avoid;
+    }
+
+    .spanner {
+        column-span: all;
+        background: grey;
+        opacity: 0.5;
+        height: 20px;
+    }
+
+    .pink-box {
+        column-span: all;
+        background: hotpink;
+        height: 20px;
+        width: 100px;
+    }
+
+    .first-column-gaps {
+        position: absolute;
+        top: 82px;
+        display: flex;
+        height: 20px;
+        left: 123px;
+        column-gap: 128px;
+    }
+
+    .column-gap {
+        background: black;
+        width: 1px;
+    }
+</style>
+<div class="first-column-gaps">
+    <div class="column-gap"></div>
+    <div class="column-gap"></div>
+    <div class="column-gap"></div>
+</div>
+<div class="column-gap" style="position: absolute; left: 123px; height: 20px; top:2px;"></div>
+<div class="outer">
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+
+    <div class="spanner"></div>
+    <div class="pink-box"></div>
+    <div class="spanner"></div>
+
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-015.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-015.html
new file mode 100644
index 00000000000..65af5112097
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-015.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted with different num of columns per row.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-015-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .outer {
+        columns: 4;
+        column-rule: solid 1px black;
+        orphans: 1;
+        widows: 1;
+        border: dotted 2px black;
+        width: 500px;
+    }
+
+    .col-box {
+        background: cyan;
+        height: 20px;
+        /* keep each box whole */
+        break-inside: avoid;
+    }
+
+    .spanner {
+        column-span: all;
+        background: grey;
+        opacity: 0.5;
+        height: 20px;
+    }
+
+    .pink-box {
+        column-span: all;
+        background: hotpink;
+        height: 20px;
+        width: 100px;
+    }
+</style>
+<div class="outer">
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+
+    <div class="spanner"></div>
+    <div class="pink-box"></div>
+    <div class="spanner"></div>
+
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-016-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-016-ref.html
new file mode 100644
index 00000000000..8b2458fccce
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-016-ref.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .outer {
+        columns: 4;
+        orphans: 1;
+        widows: 1;
+        border: dotted 2px black;
+        width: 500px;
+    }
+
+    .col-box {
+        background: cyan;
+        height: 20px;
+        /* keep each box whole */
+        break-inside: avoid;
+    }
+
+    .spanner {
+        column-span: all;
+        background: grey;
+        opacity: 0.5;
+        height: 20px;
+    }
+
+    .pink-box {
+        column-span: all;
+        background: hotpink;
+        height: 20px;
+        width: 100px;
+    }
+
+    .first-column-gaps {
+        position: absolute;
+        top: 2px;
+        display: flex;
+        height: 20px;
+        left: 123px;
+        column-gap: 128px;
+    }
+
+    .column-gap {
+        background: black;
+        width: 1px;
+    }
+</style>
+<div class="first-column-gaps">
+    <div class="column-gap"></div>
+    <div class="column-gap"></div>
+    <div class="column-gap"></div>
+</div>
+<div class="column-gap" style="position: absolute; left: 123px; height: 20px; top:82px;"></div>
+<div class="outer">
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+
+    <div class="spanner"></div>
+    <div class="pink-box"></div>
+    <div class="spanner"></div>
+
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-016.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-016.html
new file mode 100644
index 00000000000..da205e0b88b
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-016.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted with different num of columns per row.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-016-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .outer {
+        columns: 4;
+        column-rule: solid 1px black;
+        orphans: 1;
+        widows: 1;
+        border: dotted 2px black;
+        width: 500px;
+    }
+
+    .col-box {
+        background: cyan;
+        height: 20px;
+        /* keep each box whole */
+        break-inside: avoid;
+    }
+
+    .spanner {
+        column-span: all;
+        background: grey;
+        opacity: 0.5;
+        height: 20px;
+    }
+
+    .pink-box {
+        column-span: all;
+        background: hotpink;
+        height: 20px;
+        width: 100px;
+    }
+</style>
+<div class="outer">
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+
+    <div class="spanner"></div>
+    <div class="pink-box"></div>
+    <div class="spanner"></div>
+
+    <div class="col-box"></div>
+    <div class="col-box"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-017-ref.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-017-ref.html
new file mode 100644
index 00000000000..23fd089ac8e
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-017-ref.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .container {
+        border: 2px solid rgb(96 139 168);
+        width: 210px;
+        height: 130px;
+        column-gap: 20px;
+        display: flex;
+    }
+
+    .items {
+        background: rgb(96 139 168 / 0.2);
+        height: 130px;
+        margin: 0px;
+        width: 56.666px;
+    }
+
+    .row-gap {
+        position: absolute;
+        height: 10px;
+        width: 210px;
+        background: gold;
+        left: 2px;
+        top: 62px;
+    }
+
+    .column-gap {
+        position: absolute;
+        height: 130px;
+        width: 20px;
+        background: blue;
+        top: 2px;
+    }
+</style>
+
+<div class="container">
+    <div class="items"></div>
+    <div class="items"></div>
+    <div class="items"></div>
+</div>
+<div class="row-gap"></div>
+<div class="column-gap" style="left:58.666px;"></div>
+<div class="column-gap" style="left:135.332px;"></div>
diff --git a/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-017.html b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-017.html
new file mode 100644
index 00000000000..c7d1fe42584
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/multicol/multicol-gap-decorations-017.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<title>
+    CSS Gap Decorations: Multicolumn gap decorations painted with column-wrap and with different sized gaps and row-rule-outset 0.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+<link rel="match" href="multicol-gap-decorations-017-ref.html">
+<link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+<style>
+    body {
+        margin: 0px;
+    }
+
+    .container {
+        border: 2px solid rgb(96 139 168);
+        width: 210px;
+        height: 130px;
+        column-count: 3;
+        column-width: 56.666px;
+        column-height: 60px;
+        column-gap: 20px;
+        row-gap: 10px;
+        column-rule-width: 20px;
+        column-rule-style: solid;
+        column-rule-color: blue;
+        row-rule-width: 10px;
+        row-rule-style: solid;
+        row-rule-color: gold;
+        column-wrap: wrap;
+
+        row-rule-break: intersection;
+        row-rule-outset: 0;
+    }
+
+    p {
+        background: rgb(96 139 168 / 0.2);
+        height: 60px;
+        margin: 0px;
+    }
+</style>
+
+<div class="container">
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+    <p></p>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-bidirectional-shorthands.html b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-bidirectional-shorthands.html
new file mode 100644
index 00000000000..9ff3815c21f
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-bidirectional-shorthands.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Gap Decoration: shorthand rule-* computed style values from longhands</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#rule-bi-directional">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<script src="/resources/testharness.js" type="text/javascript"></script>
+<script src="/resources/testharnessreport.js" type="text/javascript"></script>
+</head>
+<body>
+<div id="target1"></div>
+<div id="target2"></div>
+<style>
+  #target1 {
+    column-rule-color: lime;
+    row-rule-color: lime;
+
+    column-rule-width: 10px;
+    row-rule-width: 10px;
+
+    column-rule-style: solid;
+    row-rule-style: solid;
+  }
+
+  #target2 {
+    column-rule-color: blue;
+    row-rule-color: red;
+
+    column-rule-width: 15px;
+    row-rule-width: 20px;
+
+    column-rule-style: double;
+    row-rule-style: dotted;
+  }
+</style>
+<script>
+  test(function() {
+    assert_equals(window.getComputedStyle(document.getElementById('target1')).getPropertyValue('rule-color'), 'rgb(0, 255, 0)');
+  }, "rule-color shorthand computed from longhand values");
+  test(function() {
+    assert_equals(window.getComputedStyle(document.getElementById('target1')).getPropertyValue('rule-width'), '10px');
+  }, "rule-width shorthand computed from longhand values");
+  test(function() {
+    assert_equals(window.getComputedStyle(document.getElementById('target1')).getPropertyValue('rule-style'), 'solid');
+  }, "rule-style shorthand computed from longhand values");
+
+  test(function() {
+    assert_equals(window.getComputedStyle(document.getElementById('target2')).getPropertyValue('rule-color'), '');
+  }, "rule-color shorthand cannot be computed from longhand values so expect an empty string");
+  test(function() {
+    assert_equals(window.getComputedStyle(document.getElementById('target2')).getPropertyValue('rule-width'), '');
+  }, "rule-width shorthand cannot be computed from longhand values so expect an empty string");
+  test(function() {
+    assert_equals(window.getComputedStyle(document.getElementById('target2')).getPropertyValue('rule-style'), '');
+  }, "rule-style shorthand cannot be computed from longhand values so expect an empty string");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-col-rule-width.html b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-col-rule-width.html
new file mode 100644
index 00000000000..db7b97e74a5
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-col-rule-width.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Gap Decorations: Ensure getComputedStyle for column-rule-width is as specified with multiple values</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#column-row-rule-width">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<script src="/resources/testharness.js" type="text/javascript"></script>
+<script src="/resources/testharnessreport.js" type="text/javascript"></script>
+</head>
+<body>
+<div id="target1"></div>
+<div id="target2"></div>
+<div id="target3"></div>
+<style>
+  #target1 {
+    column-rule-width: thin;
+  }
+
+  #target2 {
+    column-rule-width: 5px 10px 15px;
+  }
+
+  #target3 {
+    column-rule-width: repeat(auto, 5px);
+  }
+</style>
+<script>
+  test(function() {
+    const containerStyle = window.getComputedStyle(document.querySelector('#target1'));
+    const columnRuleWidth = containerStyle.getPropertyValue('column-rule-width');
+    assert_equals(columnRuleWidth, '0px');
+
+  }, "`column-rule-width` should be `0px` when `column-rule-style` is `none` with single value");
+
+  test(function() {
+    const containerStyle = window.getComputedStyle(document.querySelector('#target2'));
+    const columnRuleWidth = containerStyle.getPropertyValue('column-rule-width');
+    assert_equals(columnRuleWidth, '5px 10px 15px');
+
+  }, "`column-rule-width` should be as specified regardless of `column-rule-style` with multiple values");
+
+  test(function() {
+    const containerStyle = window.getComputedStyle(document.querySelector('#target3'));
+    const columnRuleWidth = containerStyle.getPropertyValue('column-rule-width');
+    assert_equals(columnRuleWidth, 'repeat(auto, 5px)');
+
+  }, "`column-rule-width` should be as specified regardless of `column-rule-style` with multiple (repeat) values");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-computed.html b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-color-computed.html
similarity index 95%
rename from tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-computed.html
rename to tests/wpt/tests/css/css-gaps/parsing/gap-decorations-color-computed.html
index 3ef68de7392..fbc3c3f4c97 100644
--- a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-computed.html
+++ b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-color-computed.html
@@ -18,7 +18,7 @@
   }
 </style>
 <script>
-const properties = ["column-rule-color", "row-rule-color"];
+const properties = ["column-rule-color", "row-rule-color", "rule-color"];
 for (let property of properties) {
   test_computed_value(property, "currentcolor", "rgb(0, 255, 0)");
   test_computed_value(property, "red", "rgb(255, 0, 0)");
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-invalid.html b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-color-invalid.html
similarity index 93%
rename from tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-invalid.html
rename to tests/wpt/tests/css/css-gaps/parsing/gap-decorations-color-invalid.html
index e553d24ea7b..5a0128e2303 100644
--- a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-invalid.html
+++ b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-color-invalid.html
@@ -12,7 +12,7 @@
 </head>
 <body>
 <script>
-const properties = ["column-rule-color", "row-rule-color"];
+const properties = ["column-rule-color", "row-rule-color", "rule-color"];
 for (let property of properties) {
     test_invalid_value(property, "auto");
 
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-valid.html b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-color-valid.html
similarity index 96%
rename from tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-valid.html
rename to tests/wpt/tests/css/css-gaps/parsing/gap-decorations-color-valid.html
index af24afc3c98..f4cc0156e3f 100644
--- a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-valid.html
+++ b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-color-valid.html
@@ -12,7 +12,7 @@
 </head>
 <body>
 <script>
-const properties = ["column-rule-color", "row-rule-color"];
+const properties = ["column-rule-color", "row-rule-color", "rule-color"];
 for (let property of properties) {
     // <repeat-line-color>  = repeat( [ <integer [1,∞]> ] , [ <color> ]+ )
     test_valid_value(property, "repeat(4, blue)");
diff --git a/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-style-computed.html b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-style-computed.html
new file mode 100644
index 00000000000..8c78bf618e3
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-style-computed.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Gap Decoration: column-rule-style getComputedStyle()</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#column-row-rule-style">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<meta name="assert" content="*-rule-style computed value is as specified.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+const properties = ["column-rule-style", "row-rule-style", "rule-style"];
+for (let property of properties) {
+    test_computed_value(property, "none");
+    test_computed_value(property, "hidden");
+    test_computed_value(property, "dotted");
+    test_computed_value(property, "dashed");
+    test_computed_value(property, "solid");
+    test_computed_value(property, "double");
+    test_computed_value(property, "groove");
+    test_computed_value(property, "ridge");
+    test_computed_value(property, "inset");
+
+    test_computed_value(property, "dotted dashed solid");
+    test_computed_value(property, "repeat(10, double)");
+    test_computed_value(property, "repeat(3, groove) repeat(4, ridge)");
+    test_computed_value(property, "repeat(auto, solid)");
+    test_computed_value(property, "repeat(auto, dotted solid inset)");
+    test_computed_value(property, "repeat(4, none ridge solid) repeat(auto, hidden)");
+    test_computed_value(property, "inset repeat(auto, solid ridge) repeat(4, none groove hidden)");
+    test_computed_value(property, "repeat(calc(5 + 3), ridge)", "repeat(8, ridge)");
+    test_computed_value(property, "repeat(4, dotted double dashed) repeat(auto, solid) ridge");
+    test_computed_value(property, "repeat(4, dotted double dashed) repeat(auto, solid) repeat(4, none groove hidden)");
+    test_computed_value(property, "ridge repeat(auto, solid)");
+    test_computed_value(property, "ridge repeat(auto, solid) ridge");
+}
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-style-invalid.html b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-style-invalid.html
new file mode 100644
index 00000000000..48ac0680338
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-style-invalid.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Gap Decorations: column-rule-style parsing</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#column-row-rule-style">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<meta name="assert" content="*-rule-style supports only the grammar '[ <line-style-list> | <auto-line-style-list> ]'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+const properties = ["column-rule-style", "row-rule-style", "rule-style"];
+for (let property of properties) {
+    test_invalid_value(property, "auto");
+    test_invalid_value(property, "dashed, dotted, solid");
+    test_invalid_value(property, "repeat(auto, groove, dotted, ridge)");
+    test_invalid_value(property, "repeat(0, dotted, solid, double)");
+    test_invalid_value(property, "repeat(-1, dotted, dashed, double)");
+    test_invalid_value(property, "repeat(auto, dotted) red repeat(auto, ridge)");
+}
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-style-valid.html b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-style-valid.html
new file mode 100644
index 00000000000..1eb259a82bc
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-style-valid.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Gap Decorations: parsing column-rule-style with valid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#column-row-rule-style">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<meta name="assert" content="*-rule-style supports the full grammar '[ <line-style-list> | <auto-line-style-list> ]'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+
+const properties = ["column-rule-style", "row-rule-style", "rule-style"];
+for (let property of properties) {
+    // <repeat-line-style>  = repeat( [ <integer [1,∞]> ] , [ <style> ]+ )
+    test_valid_value(property, "repeat(4, dotted)");
+    test_valid_value(property, "repeat(3, dashed double dotted)");
+    test_valid_value(property, "repeat(1, dashed double dotted solid)");
+
+    // <line-style-or-repeat> = [ <style> | <repeat-line-style> ]
+    test_valid_value(property, "dashed");
+    test_valid_value(property, "repeat(4, double)");
+
+    // <line-style-list> = [ <line-style-or-repeat> ]+
+    test_valid_value(property, "dotted ridge");
+    test_valid_value(property, "dotted dashed solid groove ridge");
+    test_valid_value(property, "repeat(3, groove) repeat(4, ridge)");
+    test_valid_value(property, "inset repeat(3, ridge) none repeat(4, groove hidden dashed)");
+    test_valid_value(property, "repeat(4, none ridge solid) repeat(5, hidden) double");
+
+    // <auto-repeat-line-style>   = repeat( auto , [ <style> ]+ )
+    test_valid_value(property, "repeat(auto, solid)");
+    test_valid_value(property, "repeat(auto, dotted solid inset)");
+
+    // <auto-line-style-list>    = [ <line-style-or-repeat> ]*
+    //                              <auto-repeat-line-style>
+    //                              [ <line-style-or-repeat> ]*
+    test_valid_value(property, "repeat(auto, dashed groove) ridge");
+    test_valid_value(property, "repeat(4, dotted double dashed) repeat(auto, solid)");
+    test_valid_value(property, "inset repeat(auto, solid ridge) repeat(4, none groove hidden)");
+}
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-width-computed.html b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-width-computed.html
similarity index 95%
rename from tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-width-computed.html
rename to tests/wpt/tests/css/css-gaps/parsing/gap-decorations-width-computed.html
index f24565ba5ee..299cbe0f3bb 100644
--- a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-width-computed.html
+++ b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-width-computed.html
@@ -21,7 +21,7 @@
 </style>
 <script>
 
-const properties = ["column-rule-width", "row-rule-width"];
+const properties = ["column-rule-width", "row-rule-width", "rule-width"];
 for (let property of properties) {
   test_computed_value(property, "calc(10px + 0.5em)", "30px");
   test_computed_value(property, "calc(10px - 0.5em)", "0px");
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-width-invalid.html b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-width-invalid.html
similarity index 94%
rename from tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-width-invalid.html
rename to tests/wpt/tests/css/css-gaps/parsing/gap-decorations-width-invalid.html
index 902c619affb..025d5263626 100644
--- a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-width-invalid.html
+++ b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-width-invalid.html
@@ -12,7 +12,7 @@
 </head>
 <body>
 <script>
-const properties = ["column-rule-width", "row-rule-width"];
+const properties = ["column-rule-width", "row-rule-width", "rule-width"];
 for (let property of properties) {
     test_invalid_value(property, "auto");
 
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-width-valid.html b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-width-valid.html
similarity index 96%
rename from tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-width-valid.html
rename to tests/wpt/tests/css/css-gaps/parsing/gap-decorations-width-valid.html
index 05d45123fce..bd42d835623 100644
--- a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-width-valid.html
+++ b/tests/wpt/tests/css/css-gaps/parsing/gap-decorations-width-valid.html
@@ -12,7 +12,7 @@
 </head>
 <body>
 <script>
-const properties = ["column-rule-width", "row-rule-width"];
+const properties = ["column-rule-width", "row-rule-width", "rule-width"];
 for (let property of properties) {
     // <repeat-line-width>  = repeat( [ <integer [1,∞]> ] , [ <line-width> ]+ )
     test_valid_value(property, "repeat(4, thin)");
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/rule-break-computed.html b/tests/wpt/tests/css/css-gaps/parsing/rule-break-computed.html
similarity index 100%
rename from tests/wpt/tests/css/css-gaps/tentative/parsing/rule-break-computed.html
rename to tests/wpt/tests/css/css-gaps/parsing/rule-break-computed.html
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/rule-break-invalid.html b/tests/wpt/tests/css/css-gaps/parsing/rule-break-invalid.html
similarity index 100%
rename from tests/wpt/tests/css/css-gaps/tentative/parsing/rule-break-invalid.html
rename to tests/wpt/tests/css/css-gaps/parsing/rule-break-invalid.html
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/rule-break-valid.html b/tests/wpt/tests/css/css-gaps/parsing/rule-break-valid.html
similarity index 100%
rename from tests/wpt/tests/css/css-gaps/tentative/parsing/rule-break-valid.html
rename to tests/wpt/tests/css/css-gaps/parsing/rule-break-valid.html
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/rule-outset-computed.html b/tests/wpt/tests/css/css-gaps/parsing/rule-outset-computed.html
similarity index 100%
rename from tests/wpt/tests/css/css-gaps/tentative/parsing/rule-outset-computed.html
rename to tests/wpt/tests/css/css-gaps/parsing/rule-outset-computed.html
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/rule-outset-invalid.html b/tests/wpt/tests/css/css-gaps/parsing/rule-outset-invalid.html
similarity index 100%
rename from tests/wpt/tests/css/css-gaps/tentative/parsing/rule-outset-invalid.html
rename to tests/wpt/tests/css/css-gaps/parsing/rule-outset-invalid.html
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/rule-outset-valid.html b/tests/wpt/tests/css/css-gaps/parsing/rule-outset-valid.html
similarity index 100%
rename from tests/wpt/tests/css/css-gaps/tentative/parsing/rule-outset-valid.html
rename to tests/wpt/tests/css/css-gaps/parsing/rule-outset-valid.html
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/rule-paint-order-computed.html b/tests/wpt/tests/css/css-gaps/parsing/rule-paint-order-computed.html
similarity index 100%
rename from tests/wpt/tests/css/css-gaps/tentative/parsing/rule-paint-order-computed.html
rename to tests/wpt/tests/css/css-gaps/parsing/rule-paint-order-computed.html
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/rule-paint-order-invalid.html b/tests/wpt/tests/css/css-gaps/parsing/rule-paint-order-invalid.html
similarity index 100%
rename from tests/wpt/tests/css/css-gaps/tentative/parsing/rule-paint-order-invalid.html
rename to tests/wpt/tests/css/css-gaps/parsing/rule-paint-order-invalid.html
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/rule-paint-order-valid.html b/tests/wpt/tests/css/css-gaps/parsing/rule-paint-order-valid.html
similarity index 100%
rename from tests/wpt/tests/css/css-gaps/tentative/parsing/rule-paint-order-valid.html
rename to tests/wpt/tests/css/css-gaps/parsing/rule-paint-order-valid.html
diff --git a/tests/wpt/tests/css/css-gaps/serialization/gap-decorations-properties.html b/tests/wpt/tests/css/css-gaps/serialization/gap-decorations-properties.html
new file mode 100644
index 00000000000..4985b5550f2
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/serialization/gap-decorations-properties.html
@@ -0,0 +1,300 @@
+<!DOCTYPE HTML>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <title>CSS Test: Gap Decorations - Properties exist</title>
+    <link rel="author" title="Javier Contreras" href="mailto:javiercon@microsoft.com">
+    <link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
+    <meta name="flags" content="ahem dom">
+    <meta name="assert" content="Test checks that css properties of gap decorations exist.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+    <style>
+        #container {
+            width: 800px;
+            height: 600px;
+        }
+
+        #myDiv {
+            font: 50px/1 Ahem;
+            justify-content: start;
+            align-content: start;
+        }
+    </style>
+</head>
+
+<body>
+    <div id="log"></div>
+    <div id="container">
+        <div id="myDiv">
+            <div>I T</div>
+            <div>IT</div>
+            <div>I</div>
+        </div>
+    </div>
+
+    <script>
+        setup({ explicit_done: true });
+        document.fonts.ready.then(() => {
+            var myDiv = document.getElementById('myDiv')
+
+            void function (data) {
+
+                myDiv.style.display = 'grid'
+
+                Object.keys(data).forEach(function (prop) {
+                    test(function () {
+                        assert_true(prop in myDiv.style)
+                    }, prop)
+
+                    var syntaxTests = data[prop]
+                    Object.keys(syntaxTests).forEach(function (testcase) {
+                        test(function () {
+                            assert_true(prop in myDiv.style)
+                            myDiv.style[prop] = syntaxTests[testcase][0]
+                            assert_equals(myDiv.style[prop], syntaxTests[testcase][0], testcase)
+                            assert_equals(getComputedStyle(myDiv)[prop], syntaxTests[testcase][1], testcase)
+                        }, prop + '.' + testcase)
+                    })
+                })
+
+            }({
+                'gap-rule-paint-order': {
+                    'row-over-column': [
+                        'row-over-column',
+                        'row-over-column'
+                    ],
+                    'column-over-row': [
+                        'column-over-row',
+                        'column-over-row'
+                    ],
+                },
+                'column-rule-break': {
+                    'none': [
+                        'none',
+                        'none'
+                    ],
+                    'spanning-item': [
+                        'spanning-item',
+                        'spanning-item'
+                    ],
+                    'intersection': [
+                        'intersection',
+                        'intersection'
+                    ],
+                },
+                'column-rule-color': {
+                    'red': [
+                        'red',
+                        'rgb(255, 0, 0)'
+                    ],
+                    'blue': [
+                        'blue',
+                        'rgb(0, 0, 255)'
+                    ],
+                    'repeat(4, blue red green) repeat(auto, red)': [
+                        'repeat(4, blue red green) repeat(auto, red)',
+                        'repeat(4, rgb(0, 0, 255) rgb(255, 0, 0) rgb(0, 128, 0)) repeat(auto, rgb(255, 0, 0))'
+                    ],
+                    'blue red': [
+                        'blue red',
+                        'rgb(0, 0, 255) rgb(255, 0, 0)'
+                    ],
+                },
+                'column-rule-outset': {
+                    '10px': [
+                        '10px',
+                        '10px'
+                    ],
+                    '50%': [
+                        '50%',
+                        '50%'
+                    ],
+                },
+                'column-rule-style': {
+                    'none': [
+                        'none',
+                        'none'
+                    ],
+                    'hidden': [
+                        'hidden',
+                        'hidden'
+                    ],
+                    'dotted': [
+                        'dotted',
+                        'dotted'
+                    ],
+                    'dashed': [
+                        'dashed',
+                        'dashed'
+                    ],
+                    'solid': [
+                        'solid',
+                        'solid'
+                    ],
+                    'double': [
+                        'double',
+                        'double'
+                    ],
+                    'groove': [
+                        'groove',
+                        'groove'
+                    ],
+                    'ridge': [
+                        'ridge',
+                        'ridge'
+                    ],
+                    'inset': [
+                        'inset',
+                        'inset'
+                    ],
+                    'outset': [
+                        'outset',
+                        'outset'
+                    ],
+                    'dotted dashed': [
+                        'dotted dashed',
+                        'dotted dashed'
+                    ],
+                    'repeat(3, dotted)': [
+                        'repeat(3, dotted)',
+                        'repeat(3, dotted)'
+                    ],
+                },
+                'column-rule-width': {
+                    '10px': [
+                        '10px',
+                        '10px'
+                    ],
+                    'thin': [
+                        'thin',
+                        '1px'
+                    ],
+                    'medium': [
+                        'medium',
+                        '3px'
+                    ],
+                    'thick': [
+                        'thick',
+                        '5px'
+                    ],
+                },
+                'row-rule-break': {
+                    'none': [
+                        'none',
+                        'none'
+                    ],
+                    'spanning-item': [
+                        'spanning-item',
+                        'spanning-item'
+                    ],
+                    'intersection': [
+                        'intersection',
+                        'intersection'
+                    ],
+                },
+                'row-rule-color': {
+                    'red': [
+                        'red',
+                        'rgb(255, 0, 0)'
+                    ],
+                    'blue': [
+                        'blue',
+                        'rgb(0, 0, 255)'
+                    ],
+                    'repeat(4, blue red green) repeat(auto, red)': [
+                        'repeat(4, blue red green) repeat(auto, red)',
+                        'repeat(4, rgb(0, 0, 255) rgb(255, 0, 0) rgb(0, 128, 0)) repeat(auto, rgb(255, 0, 0))'
+                    ],
+                    'blue red': [
+                        'blue red',
+                        'rgb(0, 0, 255) rgb(255, 0, 0)'
+                    ],
+                },
+                'row-rule-outset': {
+                    '10px': [
+                        '10px',
+                        '10px'
+                    ],
+                    '50%': [
+                        '50%',
+                        '50%'
+                    ],
+                },
+                'row-rule-style': {
+                    'none': [
+                        'none',
+                        'none'
+                    ],
+                    'hidden': [
+                        'hidden',
+                        'hidden'
+                    ],
+                    'dotted': [
+                        'dotted',
+                        'dotted'
+                    ],
+                    'dashed': [
+                        'dashed',
+                        'dashed'
+                    ],
+                    'solid': [
+                        'solid',
+                        'solid'
+                    ],
+                    'double': [
+                        'double',
+                        'double'
+                    ],
+                    'groove': [
+                        'groove',
+                        'groove'
+                    ],
+                    'ridge': [
+                        'ridge',
+                        'ridge'
+                    ],
+                    'inset': [
+                        'inset',
+                        'inset'
+                    ],
+                    'outset': [
+                        'outset',
+                        'outset'
+                    ],
+                    'dotted dashed': [
+                        'dotted dashed',
+                        'dotted dashed'
+                    ],
+                    'repeat(3, dotted)': [
+                        'repeat(3, dotted)',
+                        'repeat(3, dotted)'
+                    ],
+                },
+                'row-rule-width': {
+                    '10px': [
+                        '10px',
+                        '10px'
+                    ],
+                    'thin': [
+                        'thin',
+                        '1px'
+                    ],
+                    'medium': [
+                        'medium',
+                        '3px'
+                    ],
+                    'thick': [
+                        'thick',
+                        '5px'
+                    ],
+                },
+            })
+            done();
+        });
+    </script>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-002-ref.html b/tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-002-ref.html
deleted file mode 100644
index f21be425243..00000000000
--- a/tests/wpt/tests/css/css-gaps/tentative/grid/grid-gap-decorations-002-ref.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css-gaps-1/">
-<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
-<style>
-  .container {
-    width: 110px;
-    height: 110px;
-
-    column-count: 2;
-    column-gap: 10px;
-    column-rule-color: pink;
-    column-rule-style: solid;
-    column-rule-width: 10px;
-
-    background-color: green;
-
-    overflow: hidden;
-  }
-
-  .item {
-    background: skyblue;
-    height: 50px;
-    width: 100%;
-    margin: 0;
-  }
-
-  /* For 2x2 grid-like layout, add a 10px bottom margin to
-    odd children(#1 & #3) to simulate a horizontal row gap.*/
-  .item:nth-child(odd) {
-    margin-bottom: 10px;
-  }
-</style>
-<div class="container">
-    <div class="item"></div>
-    <div class="item"></div>
-    <div class="item"></div>
-    <div class="item"></div>
-</div>
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html b/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html
deleted file mode 100644
index 4de870c0984..00000000000
--- a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS Gap Decoration: column-rule-style getComputedStyle()</title>
-<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#column-row-rule-style">
-<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
-<meta name="assert" content="*-rule-style computed value is as specified.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/computed-testcommon.js"></script>
-</head>
-<body>
-<div id="target"></div>
-<script>
-test_computed_value("column-rule-style", "none");
-test_computed_value("column-rule-style", "hidden");
-test_computed_value("column-rule-style", "dotted");
-test_computed_value("column-rule-style", "dashed");
-test_computed_value("column-rule-style", "solid");
-test_computed_value("column-rule-style", "double");
-test_computed_value("column-rule-style", "groove");
-test_computed_value("column-rule-style", "ridge");
-test_computed_value("column-rule-style", "inset");
-test_computed_value("row-rule-style", "none");
-test_computed_value("row-rule-style", "hidden");
-test_computed_value("row-rule-style", "dotted");
-test_computed_value("row-rule-style", "dashed");
-test_computed_value("row-rule-style", "solid");
-test_computed_value("row-rule-style", "double");
-test_computed_value("row-rule-style", "groove");
-test_computed_value("row-rule-style", "ridge");
-test_computed_value("row-rule-style", "inset");
-
-test_computed_value("column-rule-style", "dotted dashed solid");
-test_computed_value("column-rule-style", "repeat(10, double)");
-test_computed_value("column-rule-style", "repeat(3, groove) repeat(4, ridge)");
-test_computed_value("column-rule-style", "repeat(auto, solid)");
-test_computed_value("column-rule-style", "repeat(auto, dotted solid inset)");
-test_computed_value("column-rule-style", "repeat(4, none ridge solid) repeat(auto, hidden)");
-test_computed_value("column-rule-style", "inset repeat(auto, solid ridge) repeat(4, none groove hidden)");
-test_computed_value("column-rule-style", "repeat(calc(5 + 3), ridge)", "repeat(8, ridge)");
-test_computed_value("column-rule-style", "repeat(4, dotted double dashed) repeat(auto, solid) ridge");
-test_computed_value("column-rule-style", "repeat(4, dotted double dashed) repeat(auto, solid) repeat(4, none groove hidden)");
-test_computed_value("column-rule-style", "ridge repeat(auto, solid)");
-test_computed_value("column-rule-style", "ridge repeat(auto, solid) ridge");
-test_computed_value("row-rule-style", "dotted dashed solid");
-test_computed_value("row-rule-style", "repeat(10, double)");
-test_computed_value("row-rule-style", "repeat(3, groove) repeat(4, ridge)");
-test_computed_value("row-rule-style", "repeat(auto, solid)");
-test_computed_value("row-rule-style", "repeat(auto, dotted solid inset)");
-test_computed_value("row-rule-style", "repeat(4, none ridge solid) repeat(auto, hidden)");
-test_computed_value("row-rule-style", "inset repeat(auto, solid ridge) repeat(4, none groove hidden)");
-test_computed_value("row-rule-style", "repeat(calc(5 + 3), ridge)", "repeat(8, ridge)");
-test_computed_value("row-rule-style", "repeat(4, dotted double dashed) repeat(auto, solid) ridge");
-test_computed_value("row-rule-style", "repeat(4, dotted double dashed) repeat(auto, solid) repeat(4, none groove hidden)");
-test_computed_value("row-rule-style", "ridge repeat(auto, solid)");
-test_computed_value("row-rule-style", "ridge repeat(auto, solid) ridge");
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-invalid.html b/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-invalid.html
deleted file mode 100644
index af1d5ccae57..00000000000
--- a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-invalid.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS Gap Decorations: column-rule-style parsing</title>
-<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#column-row-rule-style">
-<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
-<meta name="assert" content="*-rule-style supports only the grammar '[ <line-style-list> | <auto-line-style-list> ]'.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-</head>
-<body>
-<script>
-test_invalid_value("column-rule-style", "auto");
-test_invalid_value("row-rule-style", "auto");
-
-test_invalid_value("column-rule-style", "dashed, dotted, solid");
-test_invalid_value("row-rule-style", "dotted, dashed");
-test_invalid_value("column-rule-style", "repeat(auto, groove, dotted, ridge)");
-test_invalid_value("row-rule-style", "repeat(auto, solid, dashed, double)");
-test_invalid_value("column-rule-style", "repeat(0, dotted, solid, double)");
-test_invalid_value("row-rule-style", "repeat(0, dotted)");
-test_invalid_value("column-rule-style", "repeat(-1, dotted, dashed, double)");
-test_invalid_value("row-rule-style", "repeat(-1 dotted)");
-test_invalid_value("column-rule-style", "repeat(auto, dotted) red repeat(auto, ridge)");
-test_invalid_value("row-rule-style", "dotted repeat(auto, solid) blue repeat(auto, ridge)");
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-valid.html b/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-valid.html
deleted file mode 100644
index 1f41238345c..00000000000
--- a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-valid.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS Gap Decorations: parsing column-rule-style with valid values</title>
-<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#column-row-rule-style">
-<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
-<meta name="assert" content="*-rule-style supports the full grammar '[ <line-style-list> | <auto-line-style-list> ]'.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-</head>
-<body>
-<script>
-// <repeat-line-style>  = repeat( [ <integer [1,∞]> ] , [ <style> ]+ )
-test_valid_value("column-rule-style", "repeat(4, dotted)");
-test_valid_value("column-rule-style", "repeat(3, dashed double dotted)");
-test_valid_value("column-rule-style", "repeat(1, dashed double dotted solid)");
-test_valid_value("row-rule-style",  "repeat(5, dashed)");
-test_valid_value("row-rule-style",  "repeat(4, dashed dotted)");
-test_valid_value("row-rule-style",  "repeat(1, dashed double dotted solid)");
-
-// <line-style-or-repeat> = [ <style> | <repeat-line-style> ]
-test_valid_value("column-rule-style", "dashed");
-test_valid_value("column-rule-style", "repeat(4, double)");
-test_valid_value("row-rule-style", "ridge");
-test_valid_value("row-rule-style", "repeat(5, solid)");
-
-// <line-style-list> = [ <line-style-or-repeat> ]+
-test_valid_value("column-rule-style", "dotted ridge");
-test_valid_value("column-rule-style", "dotted dashed solid groove ridge");
-test_valid_value("column-rule-style", "repeat(3, groove) repeat(4, ridge)");
-test_valid_value("column-rule-style", "inset repeat(3, ridge) none repeat(4, groove hidden dashed)");
-test_valid_value("column-rule-style", "repeat(4, none ridge solid) repeat(5, hidden) double");
-test_valid_value("row-rule-style", "dotted");
-test_valid_value("row-rule-style", "dotted dashed ridge");
-test_valid_value("row-rule-style", "repeat(4, solid) repeat(5, double) repeat(6, dotted)");
-test_valid_value("row-rule-style", "ridge repeat(4, solid) double repeat(6, dotted)");
-test_valid_value("row-rule-style", "repeat(4, none ridge solid) solid repeat(5, hidden) double");
-
-// <auto-repeat-line-style>   = repeat( auto , [ <style> ]+ )
-test_valid_value("column-rule-style", "repeat(auto, solid)");
-test_valid_value("column-rule-style", "repeat(auto, dotted solid inset)");
-test_valid_value("row-rule-style", "repeat(auto, dotted)");
-test_valid_value("row-rule-style", "repeat(auto, dashed solid inset double)");
-
-// <auto-line-style-list>    = [ <line-style-or-repeat> ]*
-//                              <auto-repeat-line-style>
-//                              [ <line-style-or-repeat> ]*
-test_valid_value("column-rule-style", "repeat(auto, dashed groove) ridge");
-test_valid_value("column-rule-style", "repeat(4, dotted double dashed) repeat(auto, solid)");
-test_valid_value("column-rule-style", "inset repeat(auto, solid ridge) repeat(4, none groove hidden)");
-test_valid_value("row-rule-style", "repeat(auto, dashed groove) repeat(4, solid) double");
-test_valid_value("row-rule-style", "repeat(4, dotted double dashed) repeat(auto, solid) repeat(4, none groove hidden)");
-test_valid_value("row-rule-style", "dotted repeat(auto, solid ridge) solid");
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-grid/abspos/abspos-in-flexbox-in-grid-crash.html b/tests/wpt/tests/css/css-grid/abspos/abspos-in-flexbox-in-grid-crash.html
new file mode 100644
index 00000000000..a2f71fb78e7
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/abspos/abspos-in-flexbox-in-grid-crash.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<link rel="help" href="https://github.com/servo/servo/issues/36696">
+
+<div style="display: flex; position: relative">
+  <div style="display:grid">
+    <div>
+      <div style="display: flex">
+        <div style="position: absolute"></div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4-ref.html
index 8d7fc870fae..8c251a9d9f0 100644
--- a/tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4-ref.html
+++ b/tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4-ref.html
@@ -39,7 +39,7 @@
   <img class="justify">
 </div>
 <div>
-  <img style="width:20px; height:0px">
+  <img style="width:20px; height:40px">
 </div>
 
 <script>
diff --git a/tests/wpt/tests/css/css-grid/firefox-bug-1958131-crash.html b/tests/wpt/tests/css/css-grid/firefox-bug-1958131-crash.html
new file mode 100644
index 00000000000..6cfb2069f4d
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/firefox-bug-1958131-crash.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1958131">
+<body style="display: grid">
+<div></div>
+<div style="order:-17014118346"></div>
diff --git a/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-fit-with-calc.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-fit-with-calc.html
new file mode 100644
index 00000000000..4b655c1e121
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-fit-with-calc.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#auto-repeat">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<style>
+  .grid {
+    display: grid;
+    width: 100px;
+    grid-template-columns: repeat(auto-fit, minmax(calc(100% - 10px), calc(100% - 100px)));
+    background-color: green;
+  }
+</style>
+</head>
+<body>
+<p>Test passes if there is a filled green square.</p>
+<div class="grid">
+  <div style="height: 50px;"></div>
+  <div style="height: 50px;"></div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-grid/grid-extrinsically-sized-mutations.html b/tests/wpt/tests/css/css-grid/grid-extrinsically-sized-mutations.html
new file mode 100644
index 00000000000..75600046e82
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/grid-extrinsically-sized-mutations.html
@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#layout-algorithm">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<meta name="assert" content="Tests that an extrinsically sized grid responds to various changes to both the grid and its constraints.">
+<style>
+.container {
+  width: 50px;
+}
+.grid {
+  display: grid;
+  grid-template-columns: 100%;
+  grid-template-rows: 50px;
+  height: 50px;
+  outline: 1px solid blue;
+  font: 10px/1 Ahem;
+}
+
+.alignStart {
+  align-items: start;
+}
+
+.fixedHeight {
+  height: 100px;
+}
+
+.percentHeight {
+  height: 100%;
+}
+
+.percentRow {
+  grid-template-rows: 100%;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+function mutateContent() {
+  document.getElementById("one").style.width = "10px";
+  document.getElementById("two").style.alignItems = "stretch";
+  document.getElementById("three").style.gridTemplateRows = "30px";
+  document.getElementById("four").style.height = "10px";
+  document.getElementById("five").innerHTML += " x x x x x x";
+  document.getElementById("six").style.height = "50px";
+  document.getElementById("seven").style.gridTemplateColumns = "20%";
+
+  document.getElementById("eight").innerHTML += "<div class='test' data-expected-height='40'>x x x x</div>";
+}
+</script>
+</head>
+<body>
+
+<!-- Inline constraint on the grid changes -->
+<div class="container" id="one">
+  <div class="grid alignStart">
+    <div class="test" data-expected-height="40">x x x x</div>
+  </div>
+</div>
+
+<!-- Alignment of grid items changes -->
+<div class="container">
+  <div id="two" class="grid alignStart">
+    <div class="test" data-expected-height="50">x x x</div>
+  </div>
+</div>
+
+<!-- grid-template-rows changes to different fixed size. -->
+<div id="three" class="grid">
+  <div class="test" data-expected-height="30">xx</div>
+</div>
+
+<!-- Grid block size changes with % based rows -->
+<div id="four" class="grid percentRow">
+  <div class="test" data-expected-height="10">xx</div>
+</div>
+
+<!-- Grid item content changes -->
+<div class="container">
+  <div class="grid alignStart">
+    <div id="five" class="test" data-expected-height="30">x x x</div>
+  </div>
+</div>
+
+<!-- Grid with % height and rows has fixed block constraint changed -->
+<div class="container fixedHeight" id="six">
+  <div class="grid percentRow percentHeight">
+    <div class="test" data-expected-height="50">xx</div>
+  </div>
+</div>
+
+<!-- grid-template-columns changes to different % value -->
+<div class="container">
+  <div id="seven" class="grid alignStart">
+    <div class="test" data-expected-height="30">x x x</div>
+  </div>
+</div>
+
+<!-- Grid has new item added -->
+<div class="container">
+  <div id="eight" class="grid alignStart" style="grid-template-columns: 50% 50%;">
+    <div>xx xx</div>
+  </div>
+</div>
+</body>
+<script>
+document.body.offsetHeight;
+mutateContent();
+document.body.offsetHeight;
+
+let tests = document.querySelectorAll(".test");
+tests.forEach((element) => {
+  test(function() {
+    let expectedHeight = element.getAttribute("data-expected-height");
+    assert_equals(element.offsetHeight, Number(expectedHeight), "height");
+  });
+});
+</script>
+</html>
+
diff --git a/tests/wpt/tests/css/css-grid/grid-flex-spanning-items-001-ref.html b/tests/wpt/tests/css/css-grid/grid-flex-spanning-items-001-ref.html
new file mode 100644
index 00000000000..ec65437e8f3
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/grid-flex-spanning-items-001-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Reference Case</title>
+<link rel="author" title="Emily McDonough" href="mailto:emcdonough@mozilla.com"/>
+<style>
+#holder {
+    height: 50px;
+    width: 30px;
+    border: 10px solid fuchsia;
+}
+#item {
+    width: 300px;
+    height: 50px;
+    background: aqua;
+}
+</style>
+<div id="holder">
+  <div id="item"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-grid/grid-flex-spanning-items-001.html b/tests/wpt/tests/css/css-grid/grid-flex-spanning-items-001.html
new file mode 100644
index 00000000000..f9358b65db9
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/grid-flex-spanning-items-001.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Intrinsic sizing of grid with spanning flex items in a min-content container</title>
+<link rel="match" href="grid-flex-spanning-items-001-ref.html"/>
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#intrinsic-sizes"/>
+<link rel="author" title="Emily McDonough" href="mailto:emcdonough@mozilla.com"/>
+<style>
+#mygrid {
+    display: grid;
+    grid-template-columns: 1fr 30px;
+    border: 10px solid fuchsia;
+    width: min-content;
+}
+#item {
+    grid-column: 1 / span 2;
+}
+#filler {
+    width: 300px;
+    height: 50px;
+    background: aqua;
+}
+</style>
+<div id="mygrid">
+  <div id="item">
+    <div id="filler"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-grid/grid-fragmentation-between-rows-001-print-ref.tentative.html b/tests/wpt/tests/css/css-grid/grid-fragmentation-between-rows-001-print-ref.tentative.html
index 78464712c5c..ba97d33c8b6 100644
--- a/tests/wpt/tests/css/css-grid/grid-fragmentation-between-rows-001-print-ref.tentative.html
+++ b/tests/wpt/tests/css/css-grid/grid-fragmentation-between-rows-001-print-ref.tentative.html
@@ -1,4 +1,9 @@
 <!DOCTYPE html>
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <div style="height:40vh">
   Test passes if there is two purple boxes on both page 1 and page 2 in print mode. (Ctrl+P, with "print backgrounds" enabled)
 </div>
diff --git a/tests/wpt/tests/css/css-grid/grid-fragmentation-between-rows-001-print.tentative.html b/tests/wpt/tests/css/css-grid/grid-fragmentation-between-rows-001-print.tentative.html
index 01fd97528fc..af345718e6e 100644
--- a/tests/wpt/tests/css/css-grid/grid-fragmentation-between-rows-001-print.tentative.html
+++ b/tests/wpt/tests/css/css-grid/grid-fragmentation-between-rows-001-print.tentative.html
@@ -2,6 +2,11 @@
 <link rel="author" title="Psychpsyo" href="mailto:psychpsyo@gmail.com">
 <link rel="help" href="https://www.w3.org/TR/css-grid-1/#pagination">
 <link rel="match" href="./grid-fragmentation-between-rows-001-print-ref.tentative.html">
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <div style="height: 40vh">
   Test passes if there is two purple boxes on both page 1 and page 2 in print mode. (Ctrl+P, with "print backgrounds" enabled)
 </div>
diff --git a/tests/wpt/tests/css/css-grid/grid-items/replaced-element-016.tentative.html b/tests/wpt/tests/css/css-grid/grid-items/replaced-element-016.tentative.html
new file mode 100644
index 00000000000..2d5b401b8d2
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/grid-items/replaced-element-016.tentative.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#min-content-zero">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1308929">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/12133">
+<meta name="assert" content="A replaced element with a percentage block-size doesn't compress the min-content contribution on its block axis to zero.">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+
+<p>Test passes if there is a filled green square.</p>
+<div style="display: grid; grid-template-rows: min-content;">
+  <canvas width="100" height="100" style="background: green; block-size: 100%"></canvas>
+</div>
diff --git a/tests/wpt/tests/css/css-grid/grid-items/replaced-element-017.tentative.html b/tests/wpt/tests/css/css-grid/grid-items/replaced-element-017.tentative.html
new file mode 100644
index 00000000000..575fa8c7817
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/grid-items/replaced-element-017.tentative.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#min-content-zero">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1308929">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/12133">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="A replaced element with a percentage max-block-size doesn't compress the min-content contribution on its block axis to zero.">
+
+<p>Test passes if there is a filled green square.</p>
+<div style="display: grid; grid-template-rows: min-content;">
+  <canvas width="200" height="200" style="background: green; max-block-size: 50%"></canvas>
+</div>
diff --git a/tests/wpt/tests/css/css-grid/layout-algorithm/grid-intrinsic-track-sizes-min-size-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-intrinsic-track-sizes-min-size-001.html
new file mode 100644
index 00000000000..d2c8f504bac
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-intrinsic-track-sizes-min-size-001.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Test that spanning grid items with auto size that should not have content-based automatic minimum size.</title>
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#intrinsic-sizes"/>
+<link rel="author" title="Emily McDonough" href="mailto:emcdonough@mozilla.com"/>
+<style>
+.grid{
+  display: inline-grid;
+  grid-template-columns: minmax(auto,0) minmax(auto,0);
+  background: red;
+  height: 100px;
+}
+.t{
+  grid-column: 1 / span 2;
+  border-inline: 50px solid green;
+  min-width: 0;
+}
+.inner{
+  display: inline-block;
+  width: 100px;
+  height: 10px;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="grid">
+  <div class="t"><div class="inner"></div></div>
+</div>
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002a.html b/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002a.html
index 6708e583328..4ece8d754d3 100644
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002a.html
+++ b/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002a.html
@@ -23,7 +23,6 @@ body { width:600px; height:600px; border:1px solid; box-sizing:border-box; }
   padding-block-start: 1px;
   margin-left: 1px;
   border:1px solid;
-  masonry-auto-flow: next;
   height: 100px;
   width: 100px;
 }
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002b.html b/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002b.html
index 34911b7c9fa..cc0eaaa9cc2 100644
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002b.html
+++ b/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002b.html
@@ -23,7 +23,6 @@ body { width:600px; height:600px; border:1px solid; box-sizing:border-box; }
   padding-block-start: 1px;
   margin-left: 1px;
   border:1px solid;
-  masonry-auto-flow: next;
   height: 100px;
   width: 100px;
 }
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-003-fr-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-003-fr-ref.html
index ca2aaef482d..41a032712a2 100644
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-003-fr-ref.html
+++ b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-003-fr-ref.html
@@ -83,51 +83,51 @@ grid > item:nth-child(6) {
   <item class="hidden" style="grid-area: 4/2">0 0</item>
 </grid>
 
-  <grid>
-    <item>1</item>
-    <item>2 2</item>
-    <item style="grid-column: span 2">3 3</item>
-    <item>4</item>
-    <item style="height:2ch; grid-row:2">5 5</item>
+<grid>
+  <item>1</item>
+  <item>2 2</item>
+  <item style="grid-column: span 2">3 3</item>
+  <item>4</item>
+  <item style="height:2ch; grid-row:2">5 5</item>
 
-    <item class="hidden" style="grid-column: 2; grid-row: 1">0 0</item>
-    <item class="hidden" style="grid-column: 2; grid-row: 4">0 0</item>
-  </grid>
+  <item class="hidden" style="grid-column: 2; grid-row: 1">0 0</item>
+  <item class="hidden" style="grid-column: 2; grid-row: 4">0 0</item>
+</grid>
 
-  <grid>
-    <item>1</item>
-    <item>2 2</item>
-    <item>3 3</item>
-    <item>4</item>
-    <item style="height:4ch; grid-row:2/span 2">5 5</item>
+<grid>
+  <item>1</item>
+  <item>2 2</item>
+  <item>3 3</item>
+  <item>4</item>
+  <item style="height:4ch; grid-row:2/span 2">5 5</item>
 
-    <item class="hidden" style="grid-column: 2; grid-row: 1">0 0</item>
-    <item class="hidden" style="grid-column: 2; grid-row: 4">0 0</item>
-  </grid>
+  <item class="hidden" style="grid-column: 2; grid-row: 1">0 0</item>
+  <item class="hidden" style="grid-column: 2; grid-row: 4">0 0</item>
+</grid>
 
-  <grid>
-    <item>1</item>
-    <item>2 2</item>
-    <item>3 3</item>
-    <item>4</item>
-    <item style="grid-row:2/span 2">5 5</item>
-    <item style="height:5ch; grid-row:span 3/4">6</item>
+<grid>
+  <item>1</item>
+  <item>2 2</item>
+  <item>3 3</item>
+  <item>4</item>
+  <item style="grid-row:2/span 2">5 5</item>
+  <item style="height:5ch; grid-row:span 3/4">6</item>
 
-    <item class="hidden" style="grid-column: 2; grid-row: 1">0 0</item>
-    <item class="hidden" style="grid-column: 2; grid-row: 4">0 0</item>
-  </grid>
+  <item class="hidden" style="grid-column: 2; grid-row: 1">0 0</item>
+  <item class="hidden" style="grid-column: 2; grid-row: 4">0 0</item>
+</grid>
 
-  <grid>
-    <item>1</item>
-    <item>2 2</item>
-    <item>3 3</item>
-    <item>4</item>
-    <item style="height:3ch; grid-row:span 2/4">5</item>
-    <item style="height:5ch; grid-row:1/span 3">6</item>
+<grid>
+  <item>1</item>
+  <item>2 2</item>
+  <item>3 3</item>
+  <item>4</item>
+  <item style="height:3ch; grid-row:span 2/4">5</item>
+  <item style="height:5ch; grid-row:1/span 3">6</item>
 
-    <item class="hidden" style="grid-column: 2; grid-row: 1">0 0</item>
-    <item class="hidden" style="grid-column: 2; grid-row: 4">0 0</item>
-  </grid>
+  <item class="hidden" style="grid-column: 2; grid-row: 1">0 0</item>
+  <item class="hidden" style="grid-column: 2; grid-row: 4">0 0</item>
+</grid>
 
 <grid>
   <item>1</item>
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-004-mix2-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-004-mix2-ref.html
index 97e6b3ea292..4d1470896c8 100644
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-004-mix2-ref.html
+++ b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-rows-004-mix2-ref.html
@@ -4,36 +4,36 @@
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html>
-<meta charset="utf-8">
-<title>Reference: Masonry layout max-content sizing</title>
-<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+  <meta charset="utf-8">
+  <title>Reference: Masonry layout max-content sizing</title>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
 <style>
 
-  @import "support/masonry-intrinsic-sizing-visual.css";
+@import "support/masonry-intrinsic-sizing-visual.css";
 
-  grid {
-    display: inline-grid;
-    gap: 1px 2px;
-    /* keep fixed values small enough for spanners to have an effect */
-    grid-template-rows: 1.1ch auto 1.4ch 1fr;
-    grid-auto-flow: column;
-    border: 1px solid;
-    padding: 1px 0 2px 0;
-    vertical-align: top;
-    height: max-content;
-  }
+grid {
+  display: inline-grid;
+  gap: 1px 2px;
+  /* keep fixed values small enough for spanners to have an effect */
+  grid-template-rows: 1.1ch auto 1.4ch 1fr;
+  grid-auto-flow: column;
+  border: 1px solid;
+  padding: 1px 0 2px 0;
+  vertical-align: top;
+  height: max-content;
+}
 
-  item {
-    justify-self: start;
-    writing-mode: vertical-rl;
-    text-orientation: sideways;
-  }
+item {
+  justify-self: start;
+  writing-mode: vertical-rl;
+  text-orientation: sideways;
+}
 
-  .hidden {
-    visibility: hidden;
-    opacity: 0.5;
-    width: 1em;
-  }
+.hidden {
+  visibility: hidden;
+  opacity: 0.5;
+  width: 1em;
+}
 </style>
 
 <body>
@@ -111,12 +111,12 @@
   <item class="hidden" style="grid-area: 4/3">0 0</item>
 </grid>
 
-  <grid>
-    <item>1</item>
-    <item>2 2</item>
-    <item style="grid-column: span 2">3 3</item>
-    <item>4</item>
-    <item style="height:6ch; grid-area: 1/3/5/4">5 5</item>
+<grid>
+  <item>1</item>
+  <item>2 2</item>
+  <item style="grid-column: span 2">3 3</item>
+  <item>4</item>
+  <item style="height:6ch; grid-area: 1/3/5/4">5 5</item>
 
   <item class="hidden" style="grid-area: 4/3">0 0</item>
 </grid>
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004-ref.html
index 75d6b741c2f..ba9c72f2925 100644
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004-ref.html
+++ b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004-ref.html
@@ -31,36 +31,9 @@ item {
 <body>
 
 <grid>
-  <item style="grid-column:1/2">3</item>
+  <item style="grid-column:1/2; grid-row: 1;">2</item>
   <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
-  <item style="grid-column:2/1">5</item>
-  <item style="grid-column:2/3">6</item>
-  <item style="grid-column:3/span 2">4</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">3</item>
-  <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
-  <item style="grid-column:2/3">5</item>
-  <item style="grid-column:3/span 2">4</item>
-  <item style="grid-column:3/4">6</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">3</item>
-  <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
-  <item style="grid-column:2/1">5</item>
-  <item style="grid-column:2/3">6</item>
-  <item style="grid-column:3/span 2">4</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">3</item>
-  <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
+  <item style="grid-column:4/5; grid-row: 1;">3</item>
   <item style="grid-column:2/1">5</item>
   <item style="grid-column:2/3">6</item>
   <item style="grid-column:3/span 2">4</item>
@@ -68,36 +41,9 @@ item {
 
 <div style="direction:rtl">
 <grid>
-  <item style="grid-column:1/2">3</item>
+  <item style="grid-column:1/2">2</item>
   <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
-  <item style="grid-column:2/1">5</item>
-  <item style="grid-column:2/3">6</item>
-  <item style="grid-column:3/span 2">4</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">3</item>
-  <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
-  <item style="grid-column:2/3">5</item>
-  <item style="grid-column:3/span 2">4</item>
-  <item style="grid-column:3/4">6</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">3</item>
-  <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
-  <item style="grid-column:2/1">5</item>
-  <item style="grid-column:2/3">6</item>
-  <item style="grid-column:3/span 2">4</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">3</item>
-  <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
+  <item style="grid-column:4/5">3</item>
   <item style="grid-column:2/1">5</item>
   <item style="grid-column:2/3">6</item>
   <item style="grid-column:3/span 2">4</item>
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004.html
index 52867cd4a21..92741f4b115 100644
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004.html
+++ b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004.html
@@ -41,33 +41,6 @@ item {
   <item>6</item>
 </grid>
 
-<grid style="masonry-auto-flow: next">
-  <item style="grid-column:2/span 2">1</item>
-  <item>2</item>
-  <item>3</item>
-  <item style="grid-column:3/span 2">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid style="masonry-auto-flow: ordered">
-  <item style="grid-column:2/span 2">1</item>
-  <item>2</item>
-  <item>3</item>
-  <item style="grid-column:3/span 2">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid style="masonry-auto-flow: next ordered">
-  <item style="grid-column:2/span 2">1</item>
-  <item>2</item>
-  <item>3</item>
-  <item style="grid-column:3/span 2">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
 <div style="direction:rtl">
 <grid>
   <item style="grid-column:2/span 2">1</item>
@@ -77,33 +50,6 @@ item {
   <item>5</item>
   <item>6</item>
 </grid>
-
-<grid style="masonry-auto-flow: next">
-  <item style="grid-column:2/span 2">1</item>
-  <item>2</item>
-  <item>3</item>
-  <item style="grid-column:3/span 2">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid style="masonry-auto-flow: ordered">
-  <item style="grid-column:2/span 2">1</item>
-  <item>2</item>
-  <item>3</item>
-  <item style="grid-column:3/span 2">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid style="masonry-auto-flow: next ordered">
-  <item style="grid-column:2/span 2">1</item>
-  <item>2</item>
-  <item>3</item>
-  <item style="grid-column:3/span 2">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
 </div>
 
 </body></html>
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005-ref.html
index 806f314300d..bd5d55262a3 100644
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005-ref.html
+++ b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005-ref.html
@@ -32,76 +32,22 @@ item {
 
 <grid>
   <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
-  <item style="grid-column:1/span 2">4</item>
-  <item style="grid-column:3/4">3</item>
-  <item style="grid-column:4/5">5</item>
-  <item style="grid-column:1/2">6</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">3</item>
-  <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
+  <item style="grid-column:1/2; grid-row: 1;">2</item>
   <item style="grid-column:1/span 2">4</item>
+  <item style="grid-column:4/5; grid-row: 1;">3</item>
   <item style="grid-column:3/4">5</item>
   <item style="grid-column:4/5">6</item>
 </grid>
 
-<grid>
-  <item style="grid-column:1/2">3</item>
-  <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
-  <item style="grid-column:1/span 2">4</item>
-  <item style="grid-column:3/4">5</item>
-  <item style="grid-column:4/5">6</item>
-</grid>
-
-<grid>
-  <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
-  <item style="grid-column:1/span 2">4</item>
-  <item style="grid-column:3/4">3</item>
-  <item style="grid-column:4/5">5</item>
-  <item style="grid-column:1/2">6</item>
-</grid>
-
 <div style="direction:rtl">
 <grid>
   <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
-  <item style="grid-column:1/span 2">4</item>
-  <item style="grid-column:3/4">3</item>
-  <item style="grid-column:4/5">5</item>
-  <item style="grid-column:1/2">6</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">3</item>
-  <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
+  <item style="grid-column:1/2; grid-row: 1;">2</item>
   <item style="grid-column:1/span 2">4</item>
+  <item style="grid-column:4/5; grid-row: 1;">3</item>
   <item style="grid-column:3/4">5</item>
   <item style="grid-column:4/5">6</item>
 </grid>
-
-<grid>
-  <item style="grid-column:1/2">3</item>
-  <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
-  <item style="grid-column:1/span 2">4</item>
-  <item style="grid-column:3/4">5</item>
-  <item style="grid-column:4/5">6</item>
-</grid>
-
-<grid>
-  <item style="grid-column:2/span 2">1</item>
-  <item style="grid-column:4/5">2</item>
-  <item style="grid-column:1/span 2">4</item>
-  <item style="grid-column:3/4">3</item>
-  <item style="grid-column:4/5">5</item>
-  <item style="grid-column:1/2">6</item>
-</grid>
 </div>
 
 </body></html>
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005.html
index 7d4993fb3a6..f879ddce562 100644
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005.html
+++ b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005.html
@@ -41,33 +41,6 @@ item {
   <item>6</item>
 </grid>
 
-<grid style="masonry-auto-flow: ordered">
-  <item style="grid-column:2/span 2">1</item>
-  <item>2</item>
-  <item>3</item>
-  <item style="grid-column:1/span 2">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid style="masonry-auto-flow: ordered next">
-  <item style="grid-column:2/span 2">1</item>
-  <item>2</item>
-  <item>3</item>
-  <item style="grid-column:1/span 2">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid style="masonry-auto-flow: next">
-  <item style="grid-column:2/span 2">1</item>
-  <item>2</item>
-  <item>3</item>
-  <item style="grid-column:1/span 2">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
 <div style="direction:rtl">
 <grid>
   <item style="grid-column:2/span 2">1</item>
@@ -77,33 +50,6 @@ item {
   <item>5</item>
   <item>6</item>
 </grid>
-
-<grid style="masonry-auto-flow: ordered">
-  <item style="grid-column:2/span 2">1</item>
-  <item>2</item>
-  <item>3</item>
-  <item style="grid-column:1/span 2">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid style="masonry-auto-flow: ordered next">
-  <item style="grid-column:2/span 2">1</item>
-  <item>2</item>
-  <item>3</item>
-  <item style="grid-column:1/span 2">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid style="masonry-auto-flow: next">
-  <item style="grid-column:2/span 2">1</item>
-  <item>2</item>
-  <item>3</item>
-  <item style="grid-column:1/span 2">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
 </div>
 
 </body></html>
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006-ref.html
index a6e9b75d0e6..a54476a6ba8 100644
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006-ref.html
+++ b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006-ref.html
@@ -84,61 +84,5 @@ item {
   <item style="grid-column:2/3">6</item>
 </grid>
 
-<span class="next">
-<grid>
-  <item style="padding-top:30px; grid-column:1/2">1</item>
-  <item style="grid-column:2/3">2</item>
-  <item style="grid-column:3/4">3</item>
-  <item style="grid-column:4/5">4</item>
-  <item style="grid-column:1/2">5</item>
-  <item style="grid-column:2/3">6</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">1</item>
-  <item style="padding-top:30px; grid-column:2/3">2</item>
-  <item style="grid-column:3/4">3</item>
-  <item style="grid-column:4/5">4</item>
-  <item style="grid-column:1/2">5</item>
-  <item style="grid-column:2/3">6</item>
-</grid>
-
-<grid>
-  <item style="padding-top:30px; grid-column:1/2">1</item>
-  <item style="padding-top:30px; grid-column:2/3">2</item>
-  <item style="padding-top:10px; grid-column:3/4">3</item>
-  <item style="grid-column:4/5">4</item>
-  <item style="grid-column:1/2">5</item>
-  <item style="grid-column:2/3">6</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">1</item>
-  <item style="padding-top:30px; grid-column:2/3">2</item>
-  <item style="padding-top:10px; grid-column:3/4">3</item>
-  <item style="grid-column:1/span 2">4</item>
-  <item style="grid-column:3/4">5</item>
-  <item style="grid-column:4/5">6</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">1</item>
-  <item style="padding-top:30px; grid-column:2/3">2</item>
-  <item style="padding-top:10px; grid-column:3/4">3</item>
-  <item style="grid-column:1/span 3">4</item>
-  <item style="grid-column:4/5">5</item>
-  <item style="grid-column:1/2">6</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">1</item>
-  <item style="padding-top:30px; grid-column:2/3">2</item>
-  <item style="padding-top:10px; grid-column:3/4">3</item>
-  <item style="grid-column:1/span 4">4</item>
-  <item style="grid-column:1/2">5</item>
-  <item style="grid-column:2/3">6</item>
-</grid>
-</span>
-
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006.html
index 467e313d339..0f963762af5 100644
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006.html
+++ b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006.html
@@ -28,9 +28,6 @@ item {
   background-color: #444;
   color: #fff;
 }
-.next > grid {
-  masonry-auto-flow: next;
-}
 </style>
 </head>
 <body>
@@ -89,61 +86,5 @@ item {
   <item>6</item>
 </grid>
 
-<span class="next">
-<grid>
-  <item style="padding-top:30px">1</item>
-  <item>2</item>
-  <item>3</item>
-  <item>4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid>
-  <item>1</item>
-  <item style="padding-top:30px">2</item>
-  <item>3</item>
-  <item>4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid>
-  <item style="padding-top:30px">1</item>
-  <item style="padding-top:30px">2</item>
-  <item style="padding-top:10px">3</item>
-  <item>4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid>
-  <item>1</item>
-  <item style="padding-top:30px">2</item>
-  <item style="padding-top:10px">3</item>
-  <item style="grid-column:span 2">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid>
-  <item>1</item>
-  <item style="padding-top:30px">2</item>
-  <item style="padding-top:10px">3</item>
-  <item style="grid-column:span 3">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid>
-  <item>1</item>
-  <item style="padding-top:30px">2</item>
-  <item style="padding-top:10px">3</item>
-  <item style="grid-column:span 4">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-</span>
-
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007-ref.html
index 50236046fb0..5c1fd18b3d1 100644
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007-ref.html
+++ b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007-ref.html
@@ -85,61 +85,5 @@ item {
   <item style="grid-column:2/3">6</item>
 </grid>
 
-<span class="next">
-<grid>
-  <item style="padding-top:30px; grid-column:1/2">1</item>
-  <item style="grid-column:2/3">2</item>
-  <item style="grid-column:3/4">3</item>
-  <item style="grid-column:4/5">4</item>
-  <item style="grid-column:1/2">5</item>
-  <item style="grid-column:2/3">6</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">1</item>
-  <item style="padding-top:30px; grid-column:2/3">2</item>
-  <item style="grid-column:3/4">3</item>
-  <item style="grid-column:4/5">4</item>
-  <item style="grid-column:1/2">5</item>
-  <item style="grid-column:2/3">6</item>
-</grid>
-
-<grid>
-  <item style="padding-top:30px; grid-column:1/2">1</item>
-  <item style="padding-top:30px; grid-column:2/3">2</item>
-  <item style="padding-top:10px; grid-column:3/4">3</item>
-  <item style="grid-column:4/5">4</item>
-  <item style="grid-column:1/2">5</item>
-  <item style="grid-column:2/3">6</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">1</item>
-  <item style="padding-top:30px; grid-column:2/3">2</item>
-  <item style="padding-top:10px; grid-column:3/4">3</item>
-  <item style="grid-column:1/span 2">4</item>
-  <item style="grid-column:3/4">5</item>
-  <item style="grid-column:4/5">6</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">1</item>
-  <item style="padding-top:30px; grid-column:2/3">2</item>
-  <item style="padding-top:10px; grid-column:3/4">3</item>
-  <item style="grid-column:1/span 3">4</item>
-  <item style="grid-column:4/5">5</item>
-  <item style="grid-column:1/2">6</item>
-</grid>
-
-<grid>
-  <item style="grid-column:1/2">1</item>
-  <item style="padding-top:30px; grid-column:2/3">2</item>
-  <item style="padding-top:10px; grid-column:3/4">3</item>
-  <item style="grid-column:1/span 4">4</item>
-  <item style="grid-column:1/2">5</item>
-  <item style="grid-column:2/3">6</item>
-</grid>
-</span>
-
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007.html
index 4c8053ba666..ebbed114a11 100644
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007.html
+++ b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007.html
@@ -29,9 +29,6 @@ item {
   background-color: #444;
   color: #fff;
 }
-.next > grid {
-  masonry-auto-flow: next;
-}
 </style>
 </head>
 <body>
@@ -90,61 +87,5 @@ item {
   <item>6</item>
 </grid>
 
-<span class="next">
-<grid>
-  <item style="padding-top:30px">1</item>
-  <item>2</item>
-  <item>3</item>
-  <item>4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid>
-  <item>1</item>
-  <item style="padding-top:30px">2</item>
-  <item>3</item>
-  <item>4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid>
-  <item style="padding-top:30px">1</item>
-  <item style="padding-top:30px">2</item>
-  <item style="padding-top:10px">3</item>
-  <item>4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid>
-  <item>1</item>
-  <item style="padding-top:30px">2</item>
-  <item style="padding-top:10px">3</item>
-  <item style="grid-column:span 2">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid>
-  <item>1</item>
-  <item style="padding-top:30px">2</item>
-  <item style="padding-top:10px">3</item>
-  <item style="grid-column:span 3">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-
-<grid>
-  <item>1</item>
-  <item style="padding-top:30px">2</item>
-  <item style="padding-top:10px">3</item>
-  <item style="grid-column:span 4">4</item>
-  <item>5</item>
-  <item>6</item>
-</grid>
-</span>
-
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-item-placement-auto-flow-next-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-item-placement-auto-flow-next-001-ref.html
deleted file mode 100644
index cbb3e825a4b..00000000000
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-item-placement-auto-flow-next-001-ref.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html><head>
-  <meta charset="utf-8">
-  <title>CSS Grid masonry rows masonry-auto-flow next</title>
-  <link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
-  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-auto-flow">
-  <meta name="assert" content="Placing item that would span outside the grid using masonry-auto-flow-next should place the item at the first grid axis track" />
-  <style>
-html,body {
-  color:black; background-color:white; font:25px/1 monospace; padding:0; margin:0;
-}
-
-grid {
-  display: inline-grid;
-  gap: 10px 20px;
-  grid-template-columns: repeat(4,80px);
-  grid-template-rows: auto;
-  color: #444;
-  border: 1px solid;
-  padding: 2px;
-}
-
-item {
-  background-color: #444;
-  color: #fff;
-  padding: 20px;
-  margin: 3px;
-  border: 5px solid blue;
-}
-</style>
-</head>
-<body>
-
-<grid>
-  <item>1</item>
-  <item style="grid-column: span 3">2</item>
-  <item>3</item>
-  <item style="grid-column: span 4">4</item>
-</grid>
-
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-item-placement-auto-flow-next-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-item-placement-auto-flow-next-001.html
deleted file mode 100644
index c425490d2d8..00000000000
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-item-placement-auto-flow-next-001.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html><head>
-  <meta charset="utf-8">
-  <title>CSS Grid masonry rows masonry-auto-flow next</title>
-  <link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
-  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-auto-flow">
-  <link rel="match" href="masonry-rows-item-placement-auto-flow-next-001-ref.html">
-  <meta name="assert" content="Placing item that would span outside the grid using masonry-auto-flow-next should place the item at the first grid axis track" />
-  <style>
-html,body {
-  color:black; background-color:white; font:25px/1 monospace; padding:0; margin:0;
-}
-
-grid {
-  display: inline-grid;
-  gap: 10px 20px;
-  grid-template-columns: repeat(4,80px);
-  grid-template-rows: masonry;
-  color: #444;
-  border: 1px solid;
-  padding: 2px;
-  masonry-auto-flow: next;
-}
-
-item {
-  background-color: #444;
-  color: #fff;
-  padding: 20px;
-  margin: 3px;
-  border: 5px solid blue;
-}
-</style>
-</head>
-<body>
-
-<grid>
-  <item>1</item>
-  <item style="grid-column: span 3">2</item>
-  <item>3</item>
-  <item style="grid-column: span 4">4</item>
-</grid>
-
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/order/masonry-order-002-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/order/masonry-order-002-ref.html
deleted file mode 100644
index 15be3fde837..00000000000
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/order/masonry-order-002-ref.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html><head>
-  <meta charset="utf-8">
-  <title>Reference: Masonry layout using `order` and `masonry-auto-flow: next`</title>
-  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
-  <style>
-    html,body {
-      color:black; background-color:white; font:25px/1 monospace; padding:0; margin:0;
-    }
-
-    grid {
-      display: inline-grid;
-      gap: 10px 20px;
-      grid-template-columns:  repeat(4,auto);
-      grid-template-rows: masonry;
-      color: #444;
-      border: 1px solid;
-      padding: 2px;
-    }
-
-    item {
-      background-color: #444;
-      color: #fff;
-      padding: 20px;
-      margin: 3px;
-      border: 5px solid blue;
-    }
-  </style>
-</head>
-<body>
-
-<grid>
-  <item style="grid-column: 1">1</item>
-  <item style="margin-top:10px; grid-column: 2;">4</item>
-  <item style="grid-column: 3">6</item>
-  <item style="grid-column: 4">2</item>
-  <item style="grid-column: 2/span 2">5</item>
-  <item>3</item>
-</grid>
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/order/masonry-order-002.html b/tests/wpt/tests/css/css-grid/masonry/tentative/order/masonry-order-002.html
deleted file mode 100644
index 5ebdec27193..00000000000
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/order/masonry-order-002.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html><head>
-  <meta charset="utf-8">
-  <title>CSS Grid Test: Masonry layout using `order` and `masonry-auto-flow: next`</title>
-  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
-  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-layout-algorithm">
-  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-auto-flow">
-  <link rel="match" href="masonry-order-002-ref.html">
-  <style>
-    html,body {
-      color:black; background-color:white; font:25px/1 monospace; padding:0; margin:0;
-    }
-
-    grid {
-      display: inline-grid;
-      gap: 10px 20px;
-      grid-template-columns:  repeat(4,auto);
-      grid-template-rows: masonry;
-      masonry-auto-flow: next;
-      color: #444;
-      border: 1px solid;
-      padding: 2px;
-    }
-
-    item {
-      background-color: #444;
-      color: #fff;
-      padding: 20px;
-      margin: 3px;
-      border: 5px solid blue;
-    }
-  </style>
-</head>
-<body>
-
-<grid>
-  <item>1</item>
-  <item style="order:1">2</item>
-  <item style="order:1">3</item>
-  <item style="margin-top:10px">4</item>
-  <item style="order:2; grid-column:span 2">5</item>
-  <item>6</item>
-</grid>
diff --git a/tests/wpt/tests/css/css-grid/masonry/tentative/parsing/masonry-parsing.html b/tests/wpt/tests/css/css-grid/masonry/tentative/parsing/masonry-parsing.html
index 2204c06f72b..64af83b316c 100644
--- a/tests/wpt/tests/css/css-grid/masonry/tentative/parsing/masonry-parsing.html
+++ b/tests/wpt/tests/css/css-grid/masonry/tentative/parsing/masonry-parsing.html
@@ -4,7 +4,6 @@
 <meta charset="utf-8">
 <title>CSS Masonry Test: parsing properties and shortands</title>
 <link rel="help" href="https://drafts.csswg.org/css-grid-3/#grid-template-masonry">
-<link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-auto-flow">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
@@ -74,17 +73,6 @@ test_shorthand_value("grid", '10px / masonry', {
   'grid-auto-flow': 'row'
 });
 
-test_valid_value("masonry-auto-flow", 'pack');
-test_valid_value("masonry-auto-flow", 'pack ordered', 'ordered');
-test_valid_value("masonry-auto-flow", 'ordered next', 'next ordered');
-test_valid_value("masonry-auto-flow", 'next definite-first', 'next');
-test_valid_value("masonry-auto-flow", 'definite-first pack', 'pack');
-test_invalid_value("masonry-auto-flow", 'auto');
-test_invalid_value("masonry-auto-flow", 'none');
-test_invalid_value("masonry-auto-flow", '10px');
-test_invalid_value("masonry-auto-flow", 'row');
-test_invalid_value("masonry-auto-flow", 'dense');
-
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-grid/parsing/grid-area-computed.html b/tests/wpt/tests/css/css-grid/parsing/grid-area-computed.html
index d1ae78c7023..9b31e2b23c6 100644
--- a/tests/wpt/tests/css/css-grid/parsing/grid-area-computed.html
+++ b/tests/wpt/tests/css/css-grid/parsing/grid-area-computed.html
@@ -7,9 +7,17 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #container {
+    container-type: inline-size;
+    width: 100px;
+  }
+</style>
 </head>
 <body>
-<div id="target"></div>
+<div id="container">
+  <div id="target"></div>
+</div>
 <script>
 // auto
 test_computed_value("grid-area", "auto / auto / auto / auto",
@@ -34,6 +42,9 @@ test_computed_value("grid-row-start", "9 -Z_");
 test_computed_value("grid-column-start", "-44 Z");
 test_computed_value("grid-row-end", "1 -πA");
 test_computed_value("grid-column-end", "5 π_");
+test_computed_value("grid-row-start", "calc(1.1) -a-", "1 -a-");
+test_computed_value("grid-row-start", "calc(10) -a-", "10 -a-");
+test_computed_value("grid-row-start", "calc(10 + (sign(2cqw - 10px) * 5)) -a-", "5 -a-");
 
 // span && [ <integer> || <custom-ident> ]
 test_computed_value("grid-area", "span 2 i / auto / auto / auto",
diff --git a/tests/wpt/tests/css/css-grid/parsing/grid-columns-rows-get-set-multiple.html b/tests/wpt/tests/css/css-grid/parsing/grid-columns-rows-get-set-multiple.html
index 99af0110be7..c08290af9d5 100644
--- a/tests/wpt/tests/css/css-grid/parsing/grid-columns-rows-get-set-multiple.html
+++ b/tests/wpt/tests/css/css-grid/parsing/grid-columns-rows-get-set-multiple.html
@@ -268,7 +268,6 @@ setup({ explicit_done: true });
 document.fonts.ready.then(() => {
     testGridDefinitionsValues("gridWithFixedElement", "7px 11px", "17px 2px");
     testGridDefinitionsValues("gridWithPercentElement", "400px 800px", "150px 450px");
-    // This test failing in Firefox is caused by https://bugzilla.mozilla.org/show_bug.cgi?id=1481876
     testGridDefinitionsValues("gridWithPercentWithoutSize", "3.5px 7px", "4px 12px");
     testGridDefinitionsValues("gridWithAutoElement", "0px 17px", "0px 3px");
     testGridDefinitionsValues("gridWithEMElement", "100px 120px", "150px 170px");
diff --git a/tests/wpt/tests/css/css-grid/subgrid/line-names-014.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-014.html
new file mode 100644
index 00000000000..fe1d5d46633
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/subgrid/line-names-014.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Test: Clamping a nested subgrid's grid-template-areas</title>
+<link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#grid-template-areas-property">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<style>
+.grid {
+  background: red;
+  display: grid;
+  height: 100px;
+  width: 100px;
+  grid-template: 50px 50px / 50px 50px;
+}
+.subgrid {
+  display: grid;
+  grid-template-columns: subgrid;
+  grid-template-rows: 50px 50px;
+  grid-column: span 2;
+  grid-row: span 2;
+  grid-template-areas: "item item"
+                       "item item";
+}
+.item {
+  background: green;
+  grid-area: item;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="grid">
+  <div class="subgrid">
+    <div class="subgrid ">
+      <div class="item"></div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-grid/subgrid/line-names-015.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-015.html
new file mode 100644
index 00000000000..6f5479abf89
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/subgrid/line-names-015.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Test: Clamping a nested subgrid's grid-template-areas in one dimension</title>
+<link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#grid-template-areas-property">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<style>
+.grid {
+  background: green;
+  display: grid;
+  height: 100px;
+  width: 100px;
+  grid-template: 50px 50px / 50px 50px;
+  grid-template-areas: "item item"
+                       "item item";
+}
+.subgrid {
+  display: grid;
+  grid-template-columns: subgrid;
+  grid-template-rows: 50px 50px;
+  grid-column: span 2;
+  grid-row: span 2;
+}
+.item {
+  background: red;
+  grid-area: item;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="grid">
+  <div class="subgrid">
+    <div class="item"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-images/conic-gradient-angle-negative.html b/tests/wpt/tests/css/css-images/conic-gradient-angle-negative.html
index 5a7030d0ff0..faf9a2d2033 100644
--- a/tests/wpt/tests/css/css-images/conic-gradient-angle-negative.html
+++ b/tests/wpt/tests/css/css-images/conic-gradient-angle-negative.html
@@ -3,7 +3,7 @@
 <title>Conic gradient with negative angle parameter</title>
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#conic-gradients">
 <meta name="assert" content="Rendering of conic-gradient with negative center parameter">
-<meta name="fuzzy" content="maxDifference=1;totalPixels=40000">
+<meta name="fuzzy" content="maxDifference=0-1;totalPixels=0-40000">
 <link rel="match" href="reference/200x200-blue-black-green-red.html">
 <style>
   #gradient {
diff --git a/tests/wpt/tests/css/css-images/conic-gradient-angle.html b/tests/wpt/tests/css/css-images/conic-gradient-angle.html
index ba37ec15e1e..500d39366c9 100644
--- a/tests/wpt/tests/css/css-images/conic-gradient-angle.html
+++ b/tests/wpt/tests/css/css-images/conic-gradient-angle.html
@@ -3,7 +3,7 @@
 <title>Conic gradient with custom angle parameter</title>
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#conic-gradients">
 <meta name="assert" content="Rendering of conic-gradient with custom center parameter">
-<meta name="fuzzy" content="maxDifference=1;totalPixels=40000">
+<meta name="fuzzy" content="maxDifference=0-1;totalPixels=0-40000">
 <link rel="match" href="reference/200x200-blue-black-green-red.html">
 <style>
   #gradient {
diff --git a/tests/wpt/tests/css/css-images/conic-gradient-center.html b/tests/wpt/tests/css/css-images/conic-gradient-center.html
index 7e810270567..fb2fcd994c4 100644
--- a/tests/wpt/tests/css/css-images/conic-gradient-center.html
+++ b/tests/wpt/tests/css/css-images/conic-gradient-center.html
@@ -3,7 +3,7 @@
 <title>Conic gradient with custom center parameter</title>
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#conic-gradients">
 <meta name="assert" content="Rendering of conic-gradient with custom center parameter">
-<meta name="fuzzy" content="maxDifference=1;totalPixels=40000">
+<meta name="fuzzy" content="maxDifference=0-1;totalPixels=0-40000">
 <link rel="match" href="conic-gradient-center-ref.html">
 <style>
   #gradient {
diff --git a/tests/wpt/tests/css/css-images/gradient/conic-gradient-001-ref.html b/tests/wpt/tests/css/css-images/gradient/conic-gradient-001-ref.html
new file mode 100644
index 00000000000..2f12c01bb5f
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/conic-gradient-001-ref.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>Tests the maximum value of color stops in conic-gradient().</title>
+<style>
+    body {
+        background-color: lightblue;
+    }
+
+    .test {
+        display: flex;
+        flex-wrap: wrap;
+    }
+
+    li {
+        width: 100px;
+        height: 100px;
+        margin-right: 30px;
+        margin-bottom: 30px;
+        outline: 1px solid black;
+        font-size: 14px;
+        text-align: center;
+        background: lime;
+    }
+</style>
+<p>Should be lime in the background of all boxes.</p>
+<ol class="test">
+    <li>0 999999999%</li>
+    <li>0 calc(Infinity * 0%)</li>
+    <li>0 calc(Infinity * 1%)</li>
+    <li>calc(Infinity * 0%) 100%</li>
+    <li>calc(Infinity * 1%) 100%</li>
+    <li>calc(Infinity * -1%) 100%</li>
+    <li>0% calc(Infinity * 1%)</li>
+    <li>from calc(Infinity * 1deg)</li>
+    <li>from calc(Infinity * 0deg)</li>
+</ol>
diff --git a/tests/wpt/tests/css/css-images/gradient/conic-gradient-001.html b/tests/wpt/tests/css/css-images/gradient/conic-gradient-001.html
new file mode 100644
index 00000000000..37e41094fb2
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/conic-gradient-001.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+<link rel="author" title="一丝" href="mailto:yiorsi@gmail.com">
+<link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+<link rel="match" href="conic-gradient-001-ref.html">
+<title>Tests the maximum value of color stops in conic-gradient().</title>
+<style>
+    body {
+        background-color: lightblue;
+    }
+
+    .test {
+        display: flex;
+        flex-wrap: wrap;
+    }
+
+    li {
+        width: 100px;
+        height: 100px;
+        margin-right: 30px;
+        margin-bottom: 30px;
+        outline: 1px solid black;
+        font-size: 14px;
+        text-align: center;
+        background: red;
+    }
+
+    li:nth-child(1) {
+        background: conic-gradient(lime 0 999999999%);
+    }
+
+    li:nth-child(2) {
+        background: conic-gradient(in hsl, lime 0 calc(Infinity * 0%));
+    }
+
+    li:nth-child(3) {
+        background: conic-gradient(in lch, lime 0 calc(Infinity * 1%));
+    }
+
+    li:nth-child(4) {
+        background: conic-gradient(in oklab, lime calc(Infinity * 0%) 100%);
+    }
+
+    li:nth-child(5) {
+        background: conic-gradient(in srgb, lime calc(Infinity * 1%) 100%);
+    }
+
+    li:nth-child(6) {
+        background: conic-gradient(in srgb, lime calc(Infinity * -1%) 100%);
+    }
+
+    li:nth-child(7) {
+        background: conic-gradient(in srgb, lime 0 calc(Infinity * 1%));
+    }
+
+    li:nth-child(8) {
+        background: conic-gradient(from calc(Infinity * 1deg), lime 0 100%);
+    }
+
+    li:nth-child(9) {
+        background: conic-gradient(from calc(Infinity * 0deg), lime 0 100%);
+    }
+</style>
+
+<p>Should be lime in the background of all boxes.</p>
+<ol class="test">
+    <li>0 999999999%</li>
+    <li>0 calc(Infinity * 0%)</li>
+    <li>0 calc(Infinity * 1%)</li>
+    <li>calc(Infinity * 0%) 100%</li>
+    <li>calc(Infinity * 1%) 100%</li>
+    <li>calc(Infinity * -1%) 100%</li>
+    <li>0% calc(Infinity * 1%)</li>
+    <li>from calc(Infinity * 1deg)</li>
+    <li>from calc(Infinity * 0deg)</li>
+</ol>
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-analogous-missing-components-004-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-analogous-missing-components-004-ref.html
new file mode 100644
index 00000000000..09f168115be
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-analogous-missing-components-004-ref.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Gradient analogous missing components carry forward logic tests</title>
+    <link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+    <link rel="author" title="一丝" href="mailto:yiorsi@gmail.com">
+    <link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+    <meta name="assert" content="Tests that analogous missing components logic works.">
+    <style>
+        div {
+            display: flex;
+            align-items: center;
+            width: 200px;
+            height: 50px;
+            /* lime to red  */
+            background: linear-gradient(to right in oklab, rgb(0, 255, 0), rgb(255, 0, 0));
+        }
+    </style>
+</head>
+<body>
+    <p>The background of all boxes should use the oklab color space, with a gradient from lime to red.</p>
+    <div class="test1">rgb() contains none</div>
+    <div class="test2">rgb() contains none</div>
+    <div class="test3">rgb() contains none</div>
+    <div class="test4">rgb() contains none</div>
+    <div class="test5">rgb() contains none</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-analogous-missing-components-004.html b/tests/wpt/tests/css/css-images/gradient/gradient-analogous-missing-components-004.html
new file mode 100644
index 00000000000..286caa0226a
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-analogous-missing-components-004.html
@@ -0,0 +1,44 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Gradient analogous missing components carry forward logic tests</title>
+    <link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+    <link rel="author" title="一丝" href="mailto:yiorsi@gmail.com">
+    <link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+    <meta name="assert" content="Tests that analogous missing components logic works.">
+    <link rel="match" href="gradient-analogous-missing-components-004-ref.html">
+    <style>
+        div {
+            display: flex;
+            align-items: center;
+            width: 200px;
+            height: 50px;
+            background: red;
+        }
+        .test1 {
+            background: linear-gradient(to right in oklab, rgb(none 255 0), rgb(255, 0, 0) );
+        }
+        .test2 {
+            background: linear-gradient(to right in oklab, rgb(none 255 0), rgb(255 none 0) );
+        }
+        .test3 {
+            background: linear-gradient(to right, rgb(none 255 0), rgb(255 none 0) );
+        }
+        .test4 {
+            background: linear-gradient(to right, rgb(none 255 0), rgb(255, 0, 0) );
+        }
+        .test5 {
+            background: linear-gradient(to right in oklab, rgb(0 255 0), rgb(255 0 0) );
+        }
+    </style>
+</head>
+<body>
+    <p>The background of all boxes should use the oklab color space, with a gradient from lime to red.</p>
+    <div class="test1">rgb() contains none</div>
+    <div class="test2">rgb() contains none</div>
+    <div class="test3">rgb() contains none</div>
+    <div class="test4">rgb() contains none</div>
+    <div class="test5">rgb() contains none</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-eval-004-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-004-ref.html
index f197386bcfb..f28b30137cd 100644
--- a/tests/wpt/tests/css/css-images/gradient/gradient-eval-004-ref.html
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-eval-004-ref.html
@@ -3,11 +3,12 @@
  <head>
   <title>Gradient interpolation</title>
   <link rel="author" title="Mike Bremford" href="mailto:mike@bfo.com">
+  <link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
   <style>
    .test {
        width: 100px;
        height: 100px;
-       background: rgb(0% 50% 50%);
+       background: rgb(0, 0, 99);
    }
  </style>
  </head>
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-eval-004.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-004.html
index ada406fd2a0..1a9c43610f4 100644
--- a/tests/wpt/tests/css/css-images/gradient/gradient-eval-004.html
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-eval-004.html
@@ -2,16 +2,17 @@
 <html>
  <head>
   <title>Gradient interpolation</title>
-  <meta name="fuzzy" content="maxDifference=1-2;totalPixels=0-10000">
+  <meta name="fuzzy" content="maxDifference=1-2;totalPixels=0-2000">
   <link rel="author" title="Mike Bremford" href="mailto:mike@bfo.com">
+  <link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
   <link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
   <link rel="help" href="https://www.w3.org/TR/css-color-4/#missing">
   <meta name="assert" content="Gradient evaluation when one of the components is none works as specified"/>
   <link rel="match" href="gradient-eval-004-ref.html">
   <style>
    :root {
-       --start: rgb(0% 0% 50%);
-       --end: rgb(0% 100% none);
+       --start: rgb(0% 0% 100%);
+       --end: rgb(0% 0% none); /* none should resolve to 0  as rgb don't have analogous components with oklab */
        --t: 0.5;
        --big: 131070000px;
    }
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-infinity-001-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-infinity-001-ref.html
new file mode 100644
index 00000000000..b15e7fcae69
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-infinity-001-ref.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+<link rel="author" title="一丝" href="mailto:yiorsi@gmail.com">
+<title>All the boxes below should have the lime background.</title>
+<style>
+.box {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+.box > div {
+  width: 100px;
+  height: 100px;
+  border: solid 1px black;
+  background-color: lime;
+}
+
+</style>
+<div class="box">
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-infinity-001.html b/tests/wpt/tests/css/css-images/gradient/gradient-infinity-001.html
new file mode 100644
index 00000000000..73b9ac1bd1b
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-infinity-001.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<link rel="match" href="gradient-infinity-001-ref.html">
+<link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+<link rel="author" title="一丝" href="mailto:yiorsi@gmail.com">
+<link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+<title>All the boxes below should have the lime background.</title>
+<style>
+.box {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+.box > div {
+  width: 100px;
+  height: 100px;
+  border: solid 1px black;
+}
+.test1 {
+  background: linear-gradient(to right in srgb, lime 100px, red calc(1px / 0));
+}
+.test2 {
+  background: linear-gradient(to right in srgb, lime 100px, red calc(Infinity * 1px));
+}
+.test3 {
+  background: linear-gradient(to left in srgb, lime 100px, red calc(Infinity * 1px));
+}
+.test4 {
+  background: linear-gradient(to top in srgb, lime 100px, red calc(1px / 0));
+}
+.test5 {
+  background: linear-gradient(to bottom in srgb, lime 100px, red calc(Infinity * 1px));
+}
+</style>
+<div class="box">
+  <div class="test1"></div>
+  <div class="test2"></div>
+  <div class="test3"></div>
+  <div class="test4"></div>
+  <div class="test5"></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-infinity-002-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-infinity-002-ref.html
new file mode 100644
index 00000000000..30857abd9a1
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-infinity-002-ref.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+<link rel="author" title="一丝" href="mailto:yiorsi@gmail.com">
+<title>All boxes should have a lime background.</title>
+<style>
+.box {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+.box > div {
+  width: 100px;
+  height: 100px;
+  border: solid 1px black;
+  padding: 1px;
+  background-color: lime;
+}
+</style>
+<div class="box">
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-infinity-002.html b/tests/wpt/tests/css/css-images/gradient/gradient-infinity-002.html
new file mode 100644
index 00000000000..0f482492590
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-infinity-002.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<link rel="match" href="gradient-infinity-002-ref.html">
+<link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+<link rel="author" title="一丝" href="mailto:yiorsi@gmail.com">
+<link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+<title>All boxes should have a lime background.</title>
+<style>
+.box {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+.box > div {
+  width: 100px;
+  height: 100px;
+  border: solid 1px black;
+  padding: 1px;
+}
+.test1 {
+  background: linear-gradient(to right in srgb, lime 100px, red calc(1px / 0));
+}
+.test2 {
+  background: linear-gradient(to right in srgb, lime 100px, red calc(Infinity * 1px));
+}
+.test3 {
+  background: linear-gradient(to left in srgb, lime 100px, red calc(Infinity * 1px));
+}
+.test4 {
+  background: linear-gradient(to top in srgb, lime 100px, red calc(1px / 0));
+}
+.test5 {
+  background: linear-gradient(to bottom in srgb, lime 100px, red calc(Infinity * 1px));
+}
+</style>
+<div class="box">
+  <div class="test1"></div>
+  <div class="test2"></div>
+  <div class="test3"></div>
+  <div class="test4"></div>
+  <div class="test5"></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-infinity-003-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-infinity-003-ref.html
new file mode 100644
index 00000000000..798df7bbbb6
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-infinity-003-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<title>All boxes should have a lime background.</title>
+<style>
+  div {
+    width: 100px;
+    height: 100px;
+    background: radial-gradient(circle at 0% 100%, lime 100%, red 0);
+  }
+</style>
+<div>This should be a lime background.</div>
+<div>This should be a lime background.</div>
+<div>This should be a lime background.</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-infinity-003.html b/tests/wpt/tests/css/css-images/gradient/gradient-infinity-003.html
new file mode 100644
index 00000000000..74008e41691
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-infinity-003.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<link rel="match" href="gradient-infinity-003-ref.html">
+<link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+<link rel="author" title="一丝" href="mailto:yiorsi@gmail.com">
+<link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+<title>All boxes should have a lime background.</title>
+<style>
+  div {
+    width: 100px;
+    height: 100px;
+  }
+  .test1 {
+    --size1: calc(Infinity * 1px);
+    background: radial-gradient(circle at 0% var(--size1), lime var(--size1), red 0);
+  }
+  .test2 {
+    --size2: calc(Infinity * 1%);
+    background: radial-gradient(circle at 0% var(--size2), lime var(--size2), red 0);
+  }
+  .test3 {
+    --size3: calc(16777200px * 150);
+    background: radial-gradient(circle at 0% var(--size3), lime var(--size3), red 0);
+  }
+</style>
+<div class="test1">This should be a lime background.</div>
+<div class="test2">This should be a lime background.</div>
+<div class="test3">This should be a lime background.</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-hsl-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-hsl-ref.html
new file mode 100644
index 00000000000..b6ce2a32d1d
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-hsl-ref.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Gradient powerless hue component converting tests</title>
+    <link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+    <style>
+       .test {
+            display: flex;
+            align-items: center;
+            width: 200px;
+            height: 50px;
+            position: relative;
+            border: 1px solid black;
+            margin: 10px;
+            background-image: linear-gradient(to right in hsl, red, hsl(120deg 100% 50% / 0%) );
+        }
+
+        .info {
+            position: absolute;
+            right: -10px;
+            transform: translateX(100%);
+        }
+    </style>
+</head>
+<p>They should be the same as the first box.</p>
+<ol>
+  <li class="test"><div class="info">hsl() Expected</div></li>
+  <li class="test"><div class="info">rgba()</div></li>
+  <li class="test"><div class="info">hwb()</div></li>
+  <li class="test"><div class="info">color()</div></li>
+</ol>
+</html>
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-hsl.html b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-hsl.html
new file mode 100644
index 00000000000..7b37596bfac
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-hsl.html
@@ -0,0 +1,49 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Gradient powerless hue component converting tests - hsl</title>
+    <link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+    <link rel="author" title="一丝" href="mailto:yiorsi@gmail.com">
+    <link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+    <meta name="assert" content="Tests that powerless hue component logic works.">
+    <link rel="match" href="gradient-powerless-hue-hsl-ref.html">
+    <style>
+       .test {
+            display: flex;
+            align-items: center;
+            width: 200px;
+            height: 50px;
+            position: relative;
+            border: 1px solid black;
+            margin: 10px;
+        }
+
+        .info {
+            position: absolute;
+            right: -10px;
+            transform: translateX(100%);
+        }
+        .hsl {
+            /* Expected */
+            background-image: linear-gradient(to right in hsl, red, hsl(120deg 100% 50% / 0%) );
+        }
+        .rgba {
+            background-image: linear-gradient(to right in hsl, red, rgba(0, 255, 0, 0) );
+        }
+        .hwb {
+            background-image: linear-gradient(to right in hsl, red, hwb(120deg 0% 0% / 0%) );
+        }
+        .color {
+            background-image: linear-gradient(90deg in hsl, red, color(srgb 0 1 0 / 0) );
+        }
+    </style>
+</head>
+<p>They should be the same as the first box.</p>
+<ol>
+  <li class="test hsl"><div class="info">hsl() Expected</div></li>
+  <li class="test rgba"><div class="info">rgba()</div></li>
+  <li class="test hwb"><div class="info">hwb()</div></li>
+  <li class="test color"><div class="info">color()</div></li>
+</ol>
+</html>
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-hwb-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-hwb-ref.html
new file mode 100644
index 00000000000..6bb79ddf419
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-hwb-ref.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Gradient powerless hue component converting tests - hwb</title>
+    <link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+    <link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+    <style>
+       .test {
+            display: flex;
+            align-items: center;
+            width: 200px;
+            height: 50px;
+            position: relative;
+            border: 1px solid black;
+            margin: 10px;
+            background-image: linear-gradient(to right in hwb, red, hwb(120deg 0% 0% / 0%) );
+        }
+
+        .info {
+            position: absolute;
+            right: -10px;
+            transform: translateX(100%);
+        }
+    </style>
+</head>
+<p>They should be the same as the first box.</p>
+<ol>
+  <li class="test hwb"><div class="info">hwb() Expected</div></li>
+  <li class="test rgba"><div class="info">rgba()</div></li>
+  <li class="test hsl"><div class="info">hsl()</div></li>
+  <li class="test color"><div class="info">color()</div></li>
+</ol>
+</html>
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-hwb.html b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-hwb.html
new file mode 100644
index 00000000000..e04e5f1bffc
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-hwb.html
@@ -0,0 +1,49 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Gradient powerless hue component converting tests - hwb</title>
+    <link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+    <link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+    <meta name="assert" content="Tests that powerless hue component logic works.">
+    <link rel="match" href="gradient-powerless-hue-hwb-ref.html">
+    <style>
+       .test {
+            display: flex;
+            align-items: center;
+            width: 200px;
+            height: 50px;
+            position: relative;
+            border: 1px solid black;
+            margin: 10px;
+        }
+
+        .info {
+            position: absolute;
+            right: -10px;
+            transform: translateX(100%);
+        }
+        .hwb {
+            /* Expected */
+            background-image: linear-gradient(to right in hwb, red, hwb(120deg 0% 0% / 0%) );
+
+        }
+        .rgba {
+            background-image: linear-gradient(to right in hwb, red, rgba(0, 255, 0, 0) );
+        }
+        .hsl {
+            background-image: linear-gradient(to right in hwb, red, hsl(120deg 100% 50% / 0%) );
+        }
+        .color {
+            background-image: linear-gradient(90deg in hwb, red, color(srgb 0 1 0 / 0) );
+        }
+    </style>
+</head>
+<p>They should be the same as the first box.</p>
+<ol>
+  <li class="test hwb"><div class="info">hwb() Expected</div></li>
+  <li class="test rgba"><div class="info">rgba()</div></li>
+  <li class="test hsl"><div class="info">hsl()</div></li>
+  <li class="test color"><div class="info">color()</div></li>
+</ol>
+</html>
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-lch-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-lch-ref.html
new file mode 100644
index 00000000000..ca383a9857d
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-lch-ref.html
@@ -0,0 +1,38 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Gradient powerless hue component converting tests - lch</title>
+    <link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+    <link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+    <meta name="assert" content="Tests that powerless hue component logic works.">
+    <style>
+       .test {
+            display: flex;
+            align-items: center;
+            width: 200px;
+            height: 50px;
+            position: relative;
+            border: 1px solid black;
+            margin: 10px;
+
+            /* Expected */
+            background-image: linear-gradient(90deg in lch, red, lch(87.82 113.33 134.38 / 0) );
+        }
+
+        .info {
+            position: absolute;
+            right: -10px;
+            transform: translateX(100%);
+        }
+    </style>
+</head>
+<p>They should be the same as the first box.</p>
+<ol>
+  <li class="test lch"><div class="info">lch() Expected</div></li>
+  <li class="test hwb"><div class="info">hwb()</div></li>
+  <li class="test rgba"><div class="info">rgba()</div></li>
+  <li class="test hsl"><div class="info">hsl()</div></li>
+  <li class="test color"><div class="info">color()</div></li>
+</ol>
+</html>
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-lch.html b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-lch.html
new file mode 100644
index 00000000000..b0485869d1d
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-lch.html
@@ -0,0 +1,54 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Gradient powerless hue component converting tests - hwb</title>
+    <link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+    <link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+    <meta name="assert" content="Tests that powerless hue component logic works.">
+    <link rel="match" href="gradient-powerless-hue-lch-ref.html">
+    <meta name=fuzzy content="maxDifference=1;totalPixels=0-1500">
+    <style>
+       .test {
+            display: flex;
+            align-items: center;
+            width: 200px;
+            height: 50px;
+            position: relative;
+            border: 1px solid black;
+            margin: 10px;
+        }
+
+        .info {
+            position: absolute;
+            right: -10px;
+            transform: translateX(100%);
+        }
+
+        .lch {
+            /* Expected */
+            background-image: linear-gradient(90deg in lch, red, lch(87.82 113.33 134.38 / 0) );
+        }
+        .hwb {
+            background-image: linear-gradient(to right in lch, red, hwb(120deg 0% 0% / 0%) );
+        }
+        .rgba {
+            background-image: linear-gradient(to right in lch, red, rgba(0, 255, 0, 0) );
+        }
+        .hsl {
+            background-image: linear-gradient(to right in lch, red, hsl(120deg 100% 50% / 0%) );
+        }
+        .color {
+            background-image: linear-gradient(90deg in lch, red, color(srgb 0 1 0 / 0) );
+        }
+    </style>
+</head>
+<p>They should be the same as the first box.</p>
+<ol>
+  <li class="test lch"><div class="info">lch() Expected</div></li>
+  <li class="test hwb"><div class="info">hwb()</div></li>
+  <li class="test rgba"><div class="info">rgba()</div></li>
+  <li class="test hsl"><div class="info">hsl()</div></li>
+  <li class="test color"><div class="info">color()</div></li>
+</ol>
+</html>
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-oklch-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-oklch-ref.html
new file mode 100644
index 00000000000..4e25773f280
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-oklch-ref.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Gradient powerless hue component converting tests - hwb</title>
+    <link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+    <link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+    <style>
+       .test {
+            display: flex;
+            align-items: center;
+            width: 200px;
+            height: 50px;
+            position: relative;
+            border: 1px solid black;
+            margin: 10px;
+
+            /* Expected */
+            background-image: linear-gradient(to right in oklch, red, oklch(86.64396175234369% 0.295 142.4953450414439 / 0) );
+        }
+
+        .info {
+            position: absolute;
+            right: -10px;
+            transform: translateX(100%);
+        }
+    </style>
+</head>
+<p>They should be the same as the first box.</p>
+<ol>
+  <li class="test"><div class="info">oklch() Expected</div></li>
+  <li class="test"><div class="info">hwb()</div></li>
+  <li class="test"><div class="info">rgba()</div></li>
+  <li class="test"><div class="info">hsl()</div></li>
+  <li class="test"><div class="info">color()</div></li>
+</ol>
+</html>
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-oklch.html b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-oklch.html
new file mode 100644
index 00000000000..68c4e120279
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-powerless-hue-oklch.html
@@ -0,0 +1,54 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Gradient powerless hue component converting tests - hwb</title>
+    <link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+    <link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+    <meta name="assert" content="Tests that powerless hue component logic works.">
+    <link rel="match" href="gradient-powerless-hue-oklch-ref.html">
+    <meta name=fuzzy content="maxDifference=1;totalPixels=0-500">
+    <style>
+       .test {
+            display: flex;
+            align-items: center;
+            width: 200px;
+            height: 50px;
+            position: relative;
+            border: 1px solid black;
+            margin: 10px;
+        }
+
+        .info {
+            position: absolute;
+            right: -10px;
+            transform: translateX(100%);
+        }
+
+        .oklch {
+            /* Expected */
+            background-image: linear-gradient(to right in oklch, red, oklch(86.64396175234369% 0.295 142.4953450414439 / 0) );
+        }
+        .hwb {
+            background-image: linear-gradient(to right in oklch, red, hwb(120deg 0% 0% / 0%) );
+        }
+        .rgba {
+            background-image: linear-gradient(to right in oklch, red, rgba(0, 255, 0, 0) );
+        }
+        .hsl {
+            background-image: linear-gradient(to right in oklch, red, hsl(120deg 100% 50% / 0%) );
+        }
+        .color {
+            background-image: linear-gradient(90deg in oklch, red, color(srgb 0 1 0 / 0) );
+        }
+    </style>
+</head>
+<p>They should be the same as the first box.</p>
+<ol>
+  <li class="test oklch"><div class="info">oklch() Expected</div></li>
+  <li class="test hwb"><div class="info">hwb()</div></li>
+  <li class="test rgba"><div class="info">rgba()</div></li>
+  <li class="test hsl"><div class="info">hsl()</div></li>
+  <li class="test color"><div class="info">color()</div></li>
+</ol>
+</html>
diff --git a/tests/wpt/tests/css/css-images/image-set/image-set-parsing.html b/tests/wpt/tests/css/css-images/image-set/image-set-parsing.html
index 83c0d73ab95..ee57c8599eb 100644
--- a/tests/wpt/tests/css/css-images/image-set/image-set-parsing.html
+++ b/tests/wpt/tests/css/css-images/image-set/image-set-parsing.html
@@ -119,6 +119,19 @@ function test_resolution_units_parsing() {
     'image-set(url("example.png") calc(1 * 96dpi))',
     'image-set(url("example.png") calc(1dppx))'
   );
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url("example.png") calc(1dppx * sibling-index()))',
+  );
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url("example.png") calc(1dppx * sign(1em - 10px)))',
+  );
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url("example.png") calc(1dppx * sign(10px)))',
+    'image-set(url("example.png") calc(1dppx))',
+  );
 
   test_invalid_value_variants(
     'background-image',
diff --git a/tests/wpt/tests/css/css-images/linear-gradient-body-sibling-index-ref.html b/tests/wpt/tests/css/css-images/linear-gradient-body-sibling-index-ref.html
new file mode 100644
index 00000000000..7325685511a
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/linear-gradient-body-sibling-index-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<title>CSS Test Reference</title>
+<style>
+  body {
+    background-position: top left;
+    background-repeat: no-repeat;
+    background-size: 100px 100px;
+    background-image: linear-gradient(blue 40px, yellow);
+  }
+</style>
+<body>
diff --git a/tests/wpt/tests/css/css-images/linear-gradient-body-sibling-index.html b/tests/wpt/tests/css/css-images/linear-gradient-body-sibling-index.html
new file mode 100644
index 00000000000..299b86d464a
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/linear-gradient-body-sibling-index.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<title>CSS Images Test: Linear gradient with sibling-index()</title>
+<link rel="help" href="https://drafts.csswg.org/css-images/#linear-gradients">
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#tree-counting">
+<link rel="match" href="linear-gradient-body-sibling-index-ref.html">
+<link rel="assert" content"sibling-index() is 2 for body">
+<style>
+  body {
+    background-position: top left;
+    background-repeat: no-repeat;
+    background-size: 100px 100px;
+    background-image: linear-gradient(blue calc(20px * sibling-index()), yellow);
+  }
+</style>
+<body>
diff --git a/tests/wpt/tests/css/css-images/linear-gradient-calc-em-units-ref.html b/tests/wpt/tests/css/css-images/linear-gradient-calc-em-units-ref.html
new file mode 100644
index 00000000000..be13be8e260
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/linear-gradient-calc-em-units-ref.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<title>CSS Test Reference</title>
+<style>
+  div { width: 100px; height: 100px; }
+</style>
+<div style="background: linear-gradient(blue 20px, yellow)"></div>
+<div style="background: linear-gradient(blue 60px, yellow)"></div>
diff --git a/tests/wpt/tests/css/css-images/linear-gradient-calc-em-units.html b/tests/wpt/tests/css/css-images/linear-gradient-calc-em-units.html
new file mode 100644
index 00000000000..e764e62890d
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/linear-gradient-calc-em-units.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<title>CSS Images Test: Linear gradient with em in calc()</title>
+<link rel="help" href="https://drafts.csswg.org/css-images/#linear-gradients">
+<link rel="match" href="linear-gradient-calc-em-units-ref.html">
+<style>
+  div {
+    width: 100px;
+    height: 100px;
+    background: linear-gradient(blue calc(2em), yellow);
+  }
+  #em1 {
+    font-size: 10px;
+  }
+  #em2 {
+    font-size: 30px;
+  }
+</style>
+<div id="em1"></div>
+<div id="em2"></div>
diff --git a/tests/wpt/tests/css/css-images/linear-gradient-sibling-index-ref.html b/tests/wpt/tests/css/css-images/linear-gradient-sibling-index-ref.html
new file mode 100644
index 00000000000..eea8518d95b
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/linear-gradient-sibling-index-ref.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<title>CSS Test Reference</title>
+<style>
+  div { width: 100px; height: 100px; }
+</style>
+<div style="background: linear-gradient(blue 20px, yellow)"></div>
+<div style="background: linear-gradient(blue 50px, yellow)"></div>
diff --git a/tests/wpt/tests/css/css-images/linear-gradient-sibling-index.html b/tests/wpt/tests/css/css-images/linear-gradient-sibling-index.html
new file mode 100644
index 00000000000..b92897e0697
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/linear-gradient-sibling-index.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<title>CSS Images Test: Linear gradient with sibling-index()</title>
+<link rel="help" href="https://drafts.csswg.org/css-images/#linear-gradients">
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#tree-counting">
+<link rel="match" href="linear-gradient-sibling-index-ref.html">
+<style>
+  .grad {
+    width: 100px;
+    height: 100px;
+    background: linear-gradient(blue calc(10px * sibling-index()), yellow);
+  }
+</style>
+<div>
+  <div></div>
+  <div class="grad"></div>
+  <div></div>
+  <div></div>
+  <div class="grad"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-images/multiple-position-color-stop-conic.html b/tests/wpt/tests/css/css-images/multiple-position-color-stop-conic.html
index 41aa505c879..50ec959e221 100644
--- a/tests/wpt/tests/css/css-images/multiple-position-color-stop-conic.html
+++ b/tests/wpt/tests/css/css-images/multiple-position-color-stop-conic.html
@@ -2,7 +2,7 @@
 <title>Conic gradient with a two position color stop</title>
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#color-stop-syntax">
 <meta name="assert" content="A color stop with two positions create a hard transition">
-<meta name="fuzzy" content="maxDifference=1;totalPixels=10000">
+<meta name="fuzzy" content="maxDifference=0-1;totalPixels=0-10000">
 <link rel="match" href="reference/100x100-blue-green.html">
 <style>
 #target {
diff --git a/tests/wpt/tests/css/css-images/normalization-conic-2.html b/tests/wpt/tests/css/css-images/normalization-conic-2.html
index 9856f6b8f2c..a42829537ad 100644
--- a/tests/wpt/tests/css/css-images/normalization-conic-2.html
+++ b/tests/wpt/tests/css/css-images/normalization-conic-2.html
@@ -3,7 +3,7 @@
 <title>Conic gradient stop normalization</title>
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#conic-gradients">
 <meta name="assert" content="Rendering of conic-gradient with normalized color stops">
-<meta name="fuzzy" content="maxDifference=1;totalPixels=10000">
+<meta name="fuzzy" content="maxDifference=0-1;totalPixels=0-10000">
 <link rel="match" href="reference/100x100-blue.html">
 <style>
   #gradient {
diff --git a/tests/wpt/tests/css/css-images/normalization-conic-degenerate.html b/tests/wpt/tests/css/css-images/normalization-conic-degenerate.html
index 6905c39ef9d..047aaecd46f 100644
--- a/tests/wpt/tests/css/css-images/normalization-conic-degenerate.html
+++ b/tests/wpt/tests/css/css-images/normalization-conic-degenerate.html
@@ -3,7 +3,7 @@
 <title>Conic gradient stop normalization</title>
 <link rel="help" href="https://www.w3.org/TR/css-images-3/#repeating-gradients">
 <meta name="assert" content="Rendering of repeating-conic-gradient w/ stops at the same place">
-<meta name="fuzzy" content="maxDifference=1;totalPixels=10000">
+<meta name="fuzzy" content="maxDifference=0-1;totalPixels=0-10000">
 <link rel="match" href="reference/100x100-blue.html">
 <style>
   #gradient {
diff --git a/tests/wpt/tests/css/css-images/normalization-conic.html b/tests/wpt/tests/css/css-images/normalization-conic.html
index 21fb8bae8a6..3631c8e0df3 100644
--- a/tests/wpt/tests/css/css-images/normalization-conic.html
+++ b/tests/wpt/tests/css/css-images/normalization-conic.html
@@ -3,7 +3,7 @@
 <title>Conic gradient stop normalization</title>
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#conic-gradients">
 <meta name="assert" content="Rendering of conic-gradient with normalized color stops">
-<meta name="fuzzy" content="maxDifference=1;totalPixels=10000">
+<meta name="fuzzy" content="maxDifference=0-1;totalPixels=0-10000">
 <link rel="match" href="reference/100x100-blue.html">
 <style>
   #gradient {
diff --git a/tests/wpt/tests/css/css-images/object-fit-containcontainintrinsicsize-png-001c.tentative.html b/tests/wpt/tests/css/css-images/object-fit-containcontainintrinsicsize-png-001c.tentative.html
index b17f59f887f..dd1bf249a55 100644
--- a/tests/wpt/tests/css/css-images/object-fit-containcontainintrinsicsize-png-001c.tentative.html
+++ b/tests/wpt/tests/css/css-images/object-fit-containcontainintrinsicsize-png-001c.tentative.html
@@ -17,6 +17,7 @@
         float: left;
         object-position: top left;
         contain: size;
+        aspect-ratio: auto;
       }
       br {
         clear: both;
diff --git a/tests/wpt/tests/css/css-images/object-fit-containsize-png-001c.tentative.html b/tests/wpt/tests/css/css-images/object-fit-containsize-png-001c.tentative.html
index 43a50adcedc..733b7592f3b 100644
--- a/tests/wpt/tests/css/css-images/object-fit-containsize-png-001c.tentative.html
+++ b/tests/wpt/tests/css/css-images/object-fit-containsize-png-001c.tentative.html
@@ -16,6 +16,7 @@
         image-rendering: pixelated;
         float: left;
         contain: size;
+        aspect-ratio: auto;
         object-position: top left;
       }
       br {
diff --git a/tests/wpt/tests/css/css-images/out-of-range-color-stop-conic.html b/tests/wpt/tests/css/css-images/out-of-range-color-stop-conic.html
index 1fe59a5a6b9..16bdccb948c 100644
--- a/tests/wpt/tests/css/css-images/out-of-range-color-stop-conic.html
+++ b/tests/wpt/tests/css/css-images/out-of-range-color-stop-conic.html
@@ -3,7 +3,7 @@
 <title>Conic gradient with out-of-range stops</title>
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#conic-gradients">
 <meta name="assert" content="Rendering of conic-gradient with stops positioned outside of [0, 1]">
-<meta name="fuzzy" content="maxDifference=1;totalPixels=40000">
+<meta name="fuzzy" content="maxDifference=0-1;totalPixels=0-40000">
 <link rel="match" href="reference/200x200-blue-black-green-red.html">
 <style>
   #gradient {
diff --git a/tests/wpt/tests/css/css-images/parsing/WEB_FEATURES.yml b/tests/wpt/tests/css/css-images/parsing/WEB_FEATURES.yml
index 023eb5f6e05..d60ed3efd4c 100644
--- a/tests/wpt/tests/css/css-images/parsing/WEB_FEATURES.yml
+++ b/tests/wpt/tests/css/css-images/parsing/WEB_FEATURES.yml
@@ -2,7 +2,6 @@ features:
 - name: image-orientation
   files:
   - image-orientation-*
-features:
 - name: gradient-interpolation
   files:
   - "gradient-interpolation-*"
diff --git a/tests/wpt/tests/css/css-images/tiled-conic-gradients.html b/tests/wpt/tests/css/css-images/tiled-conic-gradients.html
index eab48b83e92..c5902c07c9a 100644
--- a/tests/wpt/tests/css/css-images/tiled-conic-gradients.html
+++ b/tests/wpt/tests/css/css-images/tiled-conic-gradients.html
@@ -3,7 +3,7 @@
 <title>Checkerboard using conic gradients</title>
 <link rel="help" href="https://drafts.csswg.org/css-backgrounds-3/#propdef-background-size">
 <meta name="assert" content="Gradients are correctly repeated.">
-<meta name="fuzzy" content="maxDifference=1;totalPixels=40000">
+<meta name="fuzzy" content="maxDifference=0-1;totalPixels=0-40000">
 <link rel="match" href="tiled-conic-gradients-ref.html">
 <style>
   #gradient {
diff --git a/tests/wpt/tests/css/css-inline/animation/WEB_FEATURES.yml b/tests/wpt/tests/css/css-inline/animation/WEB_FEATURES.yml
new file mode 100644
index 00000000000..45a7bc89e0f
--- /dev/null
+++ b/tests/wpt/tests/css/css-inline/animation/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: alignment-baseline
+  files:
+  - alignment-baseline-*
diff --git a/tests/wpt/tests/css/css-inline/parsing/WEB_FEATURES.yml b/tests/wpt/tests/css/css-inline/parsing/WEB_FEATURES.yml
new file mode 100644
index 00000000000..1bf846df2aa
--- /dev/null
+++ b/tests/wpt/tests/css/css-inline/parsing/WEB_FEATURES.yml
@@ -0,0 +1,7 @@
+features:
+- name: alignment-baseline
+  files:
+  - alignment-baseline-*
+- name: baseline-shift
+  files:
+  - baseline-shift-*
diff --git a/tests/wpt/tests/css/css-inline/text-box-trim/WEB_FEATURES.yml b/tests/wpt/tests/css/css-inline/text-box-trim/WEB_FEATURES.yml
index e9a2fc218b3..f08cd6aa7fc 100644
--- a/tests/wpt/tests/css/css-inline/text-box-trim/WEB_FEATURES.yml
+++ b/tests/wpt/tests/css/css-inline/text-box-trim/WEB_FEATURES.yml
@@ -1,3 +1,3 @@
 features:
-- name: text-box-trim
+- name: text-box
   files: "**"
diff --git a/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-001-print-ref.html b/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-001-print-ref.html
index f142aeec84d..301ed7d76e7 100644
--- a/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-001-print-ref.html
+++ b/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-001-print-ref.html
@@ -6,6 +6,9 @@
     size: 400px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-001-print.html b/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-001-print.html
index c565ac7cc86..3fc6c24bf54 100644
--- a/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-001-print.html
+++ b/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-001-print.html
@@ -10,6 +10,9 @@
     size: 400px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-002-print-ref.html b/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-002-print-ref.html
index 0d73c1675aa..86d7ddfedda 100644
--- a/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-002-print-ref.html
+++ b/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-002-print-ref.html
@@ -6,6 +6,9 @@
     size: 400px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-002-print.html b/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-002-print.html
index 50a370dbee2..b58c0db64b0 100644
--- a/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-002-print.html
+++ b/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-002-print.html
@@ -10,6 +10,9 @@
     size: 400px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-003-print-ref.html b/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-003-print-ref.html
index 77fbb2630bf..5b0d41404bd 100644
--- a/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-003-print-ref.html
+++ b/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-003-print-ref.html
@@ -6,6 +6,9 @@
     size: 400px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-003-print.html b/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-003-print.html
index 9707412fa7d..ac5ffc32617 100644
--- a/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-003-print.html
+++ b/tests/wpt/tests/css/css-inline/text-box-trim/not-at-page-edges-003-print.html
@@ -10,6 +10,9 @@
     size: 400px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-not-ignore-nested-text-box-edge.html b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-not-ignore-nested-text-box-edge.html
index 067281d893a..4f8568acf8a 100644
--- a/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-not-ignore-nested-text-box-edge.html
+++ b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-not-ignore-nested-text-box-edge.html
@@ -17,7 +17,7 @@
 }
 .inner {
   text-box-edge: auto;
-  /* auto keyword uses the value of line-fit-edge on the root inline box of the the affected line box,
+  /* auto keyword uses the value of line-fit-edge on the root inline box of the affected line box,
   interpreting leading (the initial value) as text. */
 }
 </style>
diff --git a/tests/wpt/tests/css/css-masking/clip-path-svg-content/WEB_FEATURES.yml b/tests/wpt/tests/css/css-masking/clip-path-svg-content/WEB_FEATURES.yml
new file mode 100644
index 00000000000..a694bbb9907
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path-svg-content/WEB_FEATURES.yml
@@ -0,0 +1,8 @@
+features:
+- name: clip-path-boxes
+  files:
+  - clip-path-inset-stroke-001.svg
+  - clip-path-inset-stroke-002.svg
+  - clip-path-shape-circle-003.svg
+  - clip-path-shape-circle-004.svg
+  - clip-path-shape-circle-005.svg
diff --git a/tests/wpt/tests/css/css-masking/clip-path/WEB_FEATURES.yml b/tests/wpt/tests/css/css-masking/clip-path/WEB_FEATURES.yml
new file mode 100644
index 00000000000..b098d35ca73
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/WEB_FEATURES.yml
@@ -0,0 +1,12 @@
+features:
+- name: clip-path-boxes
+  files:
+  - clip-path-fillBox-1a.html
+  - clip-path-fillBox-1b.html
+  - clip-path-strokeBox-1a.html
+  - clip-path-strokeBox-1b.html
+  - clip-path-strokeBox-1c.html
+  - clip-path-viewBox-1a.html
+  - clip-path-viewBox-1b.html
+  - clip-path-viewBox-1c.html
+  - clip-path-viewBox-1d.html
diff --git a/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-geometry-box-delay.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-geometry-box-delay.html
new file mode 100644
index 00000000000..a6040d445a9
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-geometry-box-delay.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#basic-shape-interpolation">
+<link rel="match" href="clip-path-animation-non-shape-delay-ref.html">
+<style>
+  .container {
+    width: 100px;
+    height: 100px;
+    background-color: green;
+    animation: clippath 1s 10s;
+    animation-fill-mode: none;
+    clip-path: border-box;
+    position: absolute;
+    left: 10px;
+    top: 10px;
+  }
+
+  .child {
+    width: 10px;
+    height: 10px;
+    background-color: blue;
+    left: 150px;
+    position: absolute;
+  }
+
+  @keyframes clippath {
+    0% {
+      clip-path: circle(50% at 50% 50%);
+    }
+
+    100% {
+      clip-path: circle(35% at 35% 35%);
+    }
+  }
+</style>
+<script src="/common/reftest-wait.js"></script>
+<script src="../../../../web-animations/resources/timing-utils.js"></script>
+
+<body>
+  This test passes if the blue child is occluded by the clip-path during the animation delay.
+  <div class="container">
+    <div class="child"></div>
+  </div>
+
+  <script>
+    document.getAnimations()[0].ready.then(() => requestAnimationFrame(takeScreenshot));
+  </script>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-non-shape-delay-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-non-shape-delay-ref.html
new file mode 100644
index 00000000000..1bd7107cbbd
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-non-shape-delay-ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<style>
+.container {
+  width: 100px;
+  height: 100px;
+  background-color: green;
+  position: absolute;
+  left: 10px;
+  top: 10px;
+}
+</style>
+<body>
+  This test passes if the blue child is occluded by the clip-path during the animation delay.
+  <div class="container">
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-reference-delay.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-reference-delay.html
new file mode 100644
index 00000000000..4afecbbf987
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-reference-delay.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#basic-shape-interpolation">
+<link rel="match" href="clip-path-animation-non-shape-delay-ref.html">
+<style>
+  .container {
+    width: 100px;
+    height: 100px;
+    background-color: green;
+    animation: clippath 1s 10s;
+    animation-fill-mode: none;
+    clip-path: url(#path);
+    position: absolute;
+    left: 10px;
+    top: 10px;
+  }
+
+  .child {
+    width: 10px;
+    height: 10px;
+    background-color: blue;
+    left: 150px;
+    position: absolute;
+  }
+
+  @keyframes clippath {
+    0% {
+      clip-path: circle(50% at 50% 50%);
+    }
+
+    100% {
+      clip-path: circle(35% at 35% 35%);
+    }
+  }
+</style>
+<script src="/common/reftest-wait.js"></script>
+<script src="../../../../web-animations/resources/timing-utils.js"></script>
+
+<body>
+  This test passes if the blue child is occluded by the clip-path during the animation delay.
+  <svg style="position:absolute; left: 0">
+    <defs>
+      <clipPath id="path">
+        <rect x="0" y="0" width="100" height="100"/>
+        <!-- Adding an empty text node to force mask-based clipping. -->
+        <text></text>
+      </clipPath>
+    </defs>
+  </svg>
+  <div class="container">
+    <div class="child"></div>
+  </div>
+
+  <script>
+    document.getAnimations()[0].ready.then(() => requestAnimationFrame(takeScreenshot));
+  </script>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-svg-zoom.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-svg-zoom.html
index f7be6d25324..0accfd2102b 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-svg-zoom.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-svg-zoom.html
@@ -2,6 +2,7 @@
 <html class="reftest-wait">
 <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#basic-shape-interpolation">
 <link rel="match" href="clip-path-animation-svg-zoom-ref.html">
+<meta name="fuzzy" content="maxDifference=0-10; totalPixels=0-2">
 <style>
   .clipped {
     background-color: green;
diff --git a/tests/wpt/tests/css/css-masking/hit-test/WEB_FEATURES.yml b/tests/wpt/tests/css/css-masking/hit-test/WEB_FEATURES.yml
new file mode 100644
index 00000000000..360c013a2bd
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/hit-test/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: clip-path-boxes
+  files:
+  - clip-path-svg-geometry-box.html
diff --git a/tests/wpt/tests/css/css-masking/mask-image/mask-under-border-radius.html b/tests/wpt/tests/css/css-masking/mask-image/mask-under-border-radius.html
new file mode 100644
index 00000000000..a33e71ae121
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/mask-image/mask-under-border-radius.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-mask-image">
+<link rel="help" href="https://crbug.com/368562242">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<html style="overflow: hidden">
+  <div style="margin: 0 -20px; overflow: hidden; border-radius: 5px">
+    <div style="overflow: auto; scrollbar-width: none;
+                mask-image: linear-gradient(to right, transparent 20px, red 20px 120px, transparent 120px 100%)">
+      <div style="margin: -20px; height: 140px; background: green">
+        <div style="position: absolute"></div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-slack-computed.html b/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-slack-computed.html
index abe20d543c7..57f36c9f4a1 100644
--- a/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-slack-computed.html
+++ b/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-slack-computed.html
@@ -2,10 +2,10 @@
 <html>
 <head>
 <meta charset="utf-8">
-<title>CSS Masonry: masonry-slack getComputedStyle()</title>
+<title>CSS Masonry: item-tolerance getComputedStyle()</title>
 <link rel="help" href="https://drafts.csswg.org/css-grid-3">
 <link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
-<meta name="assert" content="masonry-slack computed value is as specified.">
+<meta name="assert" content="item-tolerance computed value is as specified.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/computed-testcommon.js"></script>
@@ -18,14 +18,14 @@
   }
 </style>
 <script>
-test_computed_value("masonry-slack", "normal");
+test_computed_value("item-tolerance", "normal");
 
-test_computed_value("masonry-slack", "10px");
-test_computed_value("masonry-slack", "20%");
-test_computed_value("masonry-slack", "calc(20% + 10px)");
+test_computed_value("item-tolerance", "10px");
+test_computed_value("item-tolerance", "20%");
+test_computed_value("item-tolerance", "calc(20% + 10px)");
 
-test_computed_value("masonry-slack", "calc(-0.5em + 10px)", "0px");
-test_computed_value("masonry-slack", "calc(0.5em + 10px)", "30px");
+test_computed_value("item-tolerance", "calc(-0.5em + 10px)", "0px");
+test_computed_value("item-tolerance", "calc(0.5em + 10px)", "30px");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-slack-invalid.html b/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-slack-invalid.html
index 75bae04011a..6cdd0bd270c 100644
--- a/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-slack-invalid.html
+++ b/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-slack-invalid.html
@@ -2,23 +2,23 @@
 <html>
 <head>
 <meta charset="utf-8">
-<title>CSS Masonry: masonry-slack parsing</title>
+<title>CSS Masonry: item-tolerance parsing</title>
 <link rel="help" href="https://drafts.csswg.org/css-grid-3">
 <link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
-<meta name="assert" content="masonry-slack supports only the grammar 'normal | <length-percentage>'.">
-<meta name="assert" content="masonry-slack rejects negative <length-percentage>.">
+<meta name="assert" content="item-tolerance supports only the grammar 'normal | <length-percentage>'.">
+<meta name="assert" content="item-tolerance rejects negative <length-percentage>.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
 </head>
 <body>
 <script>
-test_invalid_value("masonry-slack", "auto");
+test_invalid_value("item-tolerance", "auto");
 
-test_invalid_value("masonry-slack", "10");
-test_invalid_value("masonry-slack", "10px 20px");
-test_invalid_value("masonry-slack", "-1px");
-test_invalid_value("masonry-slack", "-10%");
+test_invalid_value("item-tolerance", "10");
+test_invalid_value("item-tolerance", "10px 20px");
+test_invalid_value("item-tolerance", "-1px");
+test_invalid_value("item-tolerance", "-10%");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-slack-valid.html b/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-slack-valid.html
index 55044a98f6b..9dc6721541e 100644
--- a/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-slack-valid.html
+++ b/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-slack-valid.html
@@ -2,23 +2,23 @@
 <html>
 <head>
 <meta charset="utf-8">
-<title>CSS Masonry: masonry-slack parsing</title>
+<title>CSS Masonry: item-tolerance parsing</title>
 <link rel="help" href="https://drafts.csswg.org/css-grid-3">
 <link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
-<meta name="assert" content="masonry-slack supports the full grammar 'normal | <length-percentage>'.">
+<meta name="assert" content="item-tolerance supports the full grammar 'normal | <length-percentage>'.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
 </head>
 <body>
 <script>
-test_valid_value("masonry-slack", "normal");
+test_valid_value("item-tolerance", "normal");
 
-test_valid_value("masonry-slack", "0", "0px");
-test_valid_value("masonry-slack", "1px");
-test_valid_value("masonry-slack", "calc(2em + 3ex)");
-test_valid_value("masonry-slack", "4%");
-test_valid_value("masonry-slack", "5vmin");
+test_valid_value("item-tolerance", "0", "0px");
+test_valid_value("item-tolerance", "1px");
+test_valid_value("item-tolerance", "calc(2em + 3ex)");
+test_valid_value("item-tolerance", "4%");
+test_valid_value("item-tolerance", "5vmin");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-mixins/dashed-function-cycles.html b/tests/wpt/tests/css/css-mixins/dashed-function-cycles.html
new file mode 100644
index 00000000000..15305be2b28
--- /dev/null
+++ b/tests/wpt/tests/css/css-mixins/dashed-function-cycles.html
@@ -0,0 +1,408 @@
+<!DOCTYPE html>
+<title>Custom Functions: Handling cycles</title>
+<link rel="help" href="https://drafts.csswg.org/css-mixins-1/#evaluating-custom-functions">
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#cyclic-substitution-contexts">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+
+<div id=target></div>
+<div id=main></div>
+
+<!-- To pass, a test must produce matching computed values for --actual and
+     --expected on #target. -->
+
+<!-- Locals / Arguments -->
+
+<template data-name="Local with self-cycle">
+  <style>
+    @function --f() {
+      --x: var(--x);
+      result: var(--x, PASS);
+    }
+    #target {
+      --actual: --f();
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Cycle reference without fallback makes result invalid">
+  <style>
+    @function --f() {
+      --x: var(--x);
+      result: var(--x);
+    }
+    #target {
+      --actual: --f();
+      /* --expected: <guaranteed-invalid> */
+    }
+  </style>
+</template>
+
+<template data-name="Local with self-cycle in fallback">
+  <style>
+    @function --f() {
+      --y: FAIL;
+      --x: var(--y, var(--x));
+      result: var(--x, PASS);
+    }
+    #target {
+      --actual: --f();
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Local shadowing cyclic property --x">
+  <style>
+    /* The _properties_ --x and --y are in a cycle.
+      However, the _local_ --x is not a cycle with anything. */
+    @function --f() {
+      --x: var(--y, PASS);
+      result: var(--x);
+    }
+    #target {
+      --x: var(--y);
+      --y: var(--x);
+      --actual: --f();
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Local shadowing cyclic outer local --x">
+  <style>
+    /* The locals --x and --y are in a cycle within --f(). */
+    @function --f() {
+      --x: var(--y);
+      --y: var(--x);
+      result: --g();
+    }
+    @function --g() {
+      --x: var(--y, PASS); /* Shadows outer --x. */
+      result: var(--x);
+    }
+    #target {
+      --actual: --f();
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Argument shadowing cyclic outer local --x">
+  <style>
+    @function --f() {
+      --x: var(--x); /* Cycle */
+      result: --g(10px);
+    }
+    @function --g(--x) {
+      result: var(--x);
+    }
+    #target {
+      --actual: --f();
+      --expected: 10px;
+    }
+  </style>
+</template>
+
+<template data-name="Arguments shadowing cyclic properties">
+  <style>
+    @function --f(--x, --y) {
+      result: var(--x) var(--y);
+    }
+    #target {
+      --x: var(--y);
+      --y: var(--x);
+      --actual: --f(PASS-x, PASS-y);
+      --expected: PASS-x PASS-y;
+    }
+  </style>
+</template>
+
+<template data-name="Observing property cycle locally">
+  <style>
+    @function --f() {
+      result: var(--x, PASS-x) var(--x, PASS-y);
+    }
+    #target {
+      --x: var(--y);
+      --y: var(--x);
+      --actual: --f();
+      --expected: PASS-x PASS-y;
+    }
+  </style>
+</template>
+
+<template data-name="Using cyclic values with no fallback">
+  <style>
+    @function --f() {
+        --y: var(--x, 1);
+        --x: var(--y, 3);
+        result: var(--x) var(--y);
+    }
+    #target {
+      --actual: --f();
+      /* --expected: <guaranteed-invalid> */
+    }
+  </style>
+</template>
+
+<template data-name="Self-cycle in non-used local variable">
+  <style>
+    @function --f() {
+      --x: var(--x);
+      result: PASS;
+    }
+    #target {
+      --actual: --f();
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Using cyclic value in unused fallback">
+  <style>
+    @function --f() {
+      --x: PASS;
+      result: var(--x, var(--y));
+    }
+    #target {
+      --y: var(--y);
+      --actual: --f();
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Using cyclic value in unused fallback (local)">
+  <style>
+    @function --f() {
+      --x: PASS;
+      --y: var(--y);
+      result: var(--x, var(--y));
+    }
+    #target {
+      --actual: --f();
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<!-- Between <dashed-functions> -->
+
+<!--
+  Note that several of these tests call functions via a "--tmp" custom property.
+  This is to be able to trigger a fallback when the function is in a cycle.
+-->
+
+<template data-name="Dashed-function, self-cycle">
+  <style>
+    @function --f() {
+      result: --f();
+    }
+    #target {
+      --tmp: --f();
+      --actual: var(--tmp, PASS);
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Cycle through other function (--g)">
+  <style>
+    @function --f() {
+      result: --g();
+    }
+    @function --g() {
+      result: --f();
+    }
+    #target {
+      --tmp: --g();
+      --actual: var(--tmp, PASS);
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Cycle through other function (--f)">
+  <style>
+    @function --f() {
+      result: --g();
+    }
+    @function --g() {
+      result: --f();
+    }
+    #target {
+      --tmp: --f();
+      --actual: var(--tmp, PASS);
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Cycle through local, self">
+  <style>
+    @function --f() {
+      --local: --f();
+      result: var(--local);
+    }
+    #target {
+      --local: FAIL;
+      --tmp: --f();
+      --actual: var(--tmp, PASS);
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Cycle through unused local">
+  <style>
+    @function --f() {
+      --unused: --f();
+      result: FAIL-result;
+    }
+    #target {
+      --local: FAIL;
+      --tmp: --f();
+      --actual: var(--tmp, PASS);
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Cycle through global, self">
+  <style>
+    @function --f() {
+      result: var(--global);
+    }
+    #target {
+      --global: --f();
+      --tmp: --f();
+      --actual: var(--tmp, PASS);
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Cycle through local, other function">
+  <style>
+    @function --f() {
+      result: --g();
+    }
+    @function --g() {
+      --local: --f();
+      result: var(--local);
+    }
+    #target {
+      --local: FAIL;
+      --tmp: --g();
+      --actual: var(--tmp, PASS);
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Cycle through local, other function, fallback in function">
+  <style>
+    @function --f() {
+      --a: --g();
+      result: var(--a, PASS);
+    }
+
+    @function --g() {
+      result: var(--a);
+    }
+    #target {
+      --actual: --f();
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Cycle through various variables and other functions">
+  <style>
+    @function --f() {
+      --local: --g();
+      result: var(--local);
+    }
+    @function --g() {
+      --local: FAIL;
+      result: var(--global);
+    }
+    #target {
+      --local: FAIL;
+      --global: --f();
+      --tmp: --g();
+      --actual: var(--tmp, PASS);
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Function in a cycle with its own default">
+  <style>
+    @function --f(--x, --y: --f(13px)) {
+      result: 10px;
+    }
+    #target {
+      --tmp: --f(42px);
+      --actual: var(--tmp, PASS);
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Cyclic defaults">
+  <style>
+    @function --f(--x, --y: var(--z), --z: var(--y)) {
+      result: var(--x, FAIL) var(--y, PASS-y) var(--z, PASS-z);
+    }
+    #target {
+      --actual: --f(42px);
+      --expected: 42px PASS-y PASS-z;
+    }
+  </style>
+</template>
+
+<template data-name="Cyclic outer --b shadows custom property">
+  <style>
+    @function --f() {
+      --b: var(--b);
+      --a: --g();
+      result: var(--a);
+    }
+
+    @function --g(--a: var(--b)) {
+      result: var(--a, PASS);
+    }
+    #target {
+      --b: FAIL;
+      --actual: --f();
+      --expected: PASS;
+    }
+  </style>
+</template>
+
+<template data-name="Locals are function specific">
+  <style>
+    @function --f() {
+      --a: --g();
+      result: var(--a);
+    }
+
+    @function --g() {
+      --a: 10px;
+      result: var(--a);
+    }
+    #target {
+      /* Nothing is in a cycle here. */
+      --actual: --f();
+      --expected: 10px;
+    }
+  </style>
+</template>
+
+<script>
+  test_all_templates();
+</script>
diff --git a/tests/wpt/tests/css/css-mixins/dashed-function-cycles.tentative.html b/tests/wpt/tests/css/css-mixins/dashed-function-cycles.tentative.html
deleted file mode 100644
index 11e653e9b7d..00000000000
--- a/tests/wpt/tests/css/css-mixins/dashed-function-cycles.tentative.html
+++ /dev/null
@@ -1,408 +0,0 @@
-<!DOCTYPE html>
-<title>Custom Functions: Handling cycles</title>
-<link rel="help" href="https://drafts.csswg.org/css-mixins-1/#cycles">
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11500">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/utils.js"></script>
-
-<div id=target></div>
-<div id=main></div>
-
-<!-- To pass, a test must produce matching computed values for --actual and
-     --expected on #target. -->
-
-<!-- Locals / Arguments -->
-
-<template data-name="Local with self-cycle">
-  <style>
-    @function --f() {
-      --x: var(--x);
-      result: var(--x, PASS);
-    }
-    #target {
-      --actual: --f();
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Cycle reference without fallback makes result invalid">
-  <style>
-    @function --f() {
-      --x: var(--x);
-      result: var(--x);
-    }
-    #target {
-      --actual: --f();
-      /* --expected: <guaranteed-invalid> */
-    }
-  </style>
-</template>
-
-<template data-name="Local with self-cycle in fallback">
-  <style>
-    @function --f() {
-      --y: FAIL;
-      --x: var(--y, var(--x));
-      result: var(--x, PASS);
-    }
-    #target {
-      --actual: --f();
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Local shadowing cyclic property --x">
-  <style>
-    /* The _properties_ --x and --y are in a cycle.
-      However, the _local_ --x is not a cycle with anything. */
-    @function --f() {
-      --x: var(--y, PASS);
-      result: var(--x);
-    }
-    #target {
-      --x: var(--y);
-      --y: var(--x);
-      --actual: --f();
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Local shadowing cyclic outer local --x">
-  <style>
-    /* The locals --x and --y are in a cycle within --f(). */
-    @function --f() {
-      --x: var(--y);
-      --y: var(--x);
-      result: --g();
-    }
-    @function --g() {
-      --x: var(--y, PASS); /* Shadows outer --x. */
-      result: var(--x);
-    }
-    #target {
-      --actual: --f();
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Argument shadowing cyclic outer local --x">
-  <style>
-    @function --f() {
-      --x: var(--x); /* Cycle */
-      result: --g(10px);
-    }
-    @function --g(--x) {
-      result: var(--x);
-    }
-    #target {
-      --actual: --f();
-      --expected: 10px;
-    }
-  </style>
-</template>
-
-<template data-name="Arguments shadowing cyclic properties">
-  <style>
-    @function --f(--x, --y) {
-      result: var(--x) var(--y);
-    }
-    #target {
-      --x: var(--y);
-      --y: var(--x);
-      --actual: --f(PASS-x, PASS-y);
-      --expected: PASS-x PASS-y;
-    }
-  </style>
-</template>
-
-<template data-name="Observing property cycle locally">
-  <style>
-    @function --f() {
-      result: var(--x, PASS-x) var(--x, PASS-y);
-    }
-    #target {
-      --x: var(--y);
-      --y: var(--x);
-      --actual: --f();
-      --expected: PASS-x PASS-y;
-    }
-  </style>
-</template>
-
-<template data-name="Using cyclic values with no fallback">
-  <style>
-    @function --f() {
-        --y: var(--x, 1);
-        --x: var(--y, 3);
-        result: var(--x) var(--y);
-    }
-    #target {
-      --actual: --f();
-      /* --expected: <guaranteed-invalid> */
-    }
-  </style>
-</template>
-
-<template data-name="Self-cycle in non-used local variable">
-  <style>
-    @function --f() {
-      --x: var(--x);
-      result: PASS;
-    }
-    #target {
-      --actual: --f();
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Using cyclic value in unused fallback">
-  <style>
-    @function --f() {
-      --x: PASS;
-      result: var(--x, var(--y));
-    }
-    #target {
-      --y: var(--y);
-      --actual: --f();
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Using cyclic value in unused fallback (local)">
-  <style>
-    @function --f() {
-      --x: PASS;
-      --y: var(--y);
-      result: var(--x, var(--y));
-    }
-    #target {
-      --actual: --f();
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<!-- Between <dashed-functions> -->
-
-<!--
-  Note that several of these tests call functions via a "--tmp" custom property.
-  This is to be able to trigger a fallback when the function is in a cycle.
--->
-
-<template data-name="Dashed-function, self-cycle">
-  <style>
-    @function --f() {
-      result: --f();
-    }
-    #target {
-      --tmp: --f();
-      --actual: var(--tmp, PASS);
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Cycle through other function (--g)">
-  <style>
-    @function --f() {
-      result: --g();
-    }
-    @function --g() {
-      result: --f();
-    }
-    #target {
-      --tmp: --g();
-      --actual: var(--tmp, PASS);
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Cycle through other function (--f)">
-  <style>
-    @function --f() {
-      result: --g();
-    }
-    @function --g() {
-      result: --f();
-    }
-    #target {
-      --tmp: --f();
-      --actual: var(--tmp, PASS);
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Cycle through local, self">
-  <style>
-    @function --f() {
-      --local: --f();
-      result: var(--local);
-    }
-    #target {
-      --local: FAIL;
-      --tmp: --f();
-      --actual: var(--tmp, PASS);
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Cycle through unused local">
-  <style>
-    @function --f() {
-      --unused: --f();
-      result: FAIL-result;
-    }
-    #target {
-      --local: FAIL;
-      --tmp: --f();
-      --actual: var(--tmp, PASS);
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Cycle through global, self">
-  <style>
-    @function --f() {
-      result: var(--global);
-    }
-    #target {
-      --global: --f();
-      --tmp: --f();
-      --actual: var(--tmp, PASS);
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Cycle through local, other function">
-  <style>
-    @function --f() {
-      result: --g();
-    }
-    @function --g() {
-      --local: --f();
-      result: var(--local);
-    }
-    #target {
-      --local: FAIL;
-      --tmp: --g();
-      --actual: var(--tmp, PASS);
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Cycle through local, other function, fallback in function">
-  <style>
-    @function --f() {
-      --a: --g();
-      result: var(--a, PASS);
-    }
-
-    @function --g() {
-      result: var(--a);
-    }
-    #target {
-      --actual: --f();
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Cycle through various variables and other functions">
-  <style>
-    @function --f() {
-      --local: --g();
-      result: var(--local);
-    }
-    @function --g() {
-      --local: FAIL;
-      result: var(--global);
-    }
-    #target {
-      --local: FAIL;
-      --global: --f();
-      --tmp: --g();
-      --actual: var(--tmp, PASS);
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Function in a cycle with its own default">
-  <style>
-    @function --f(--x, --y: --f(13px)) {
-      result: 10px;
-    }
-    #target {
-      --tmp: --f(42px);
-      --actual: var(--tmp, PASS);
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Cyclic defaults">
-  <style>
-    @function --f(--x, --y: var(--z), --z: var(--y)) {
-      result: var(--x, FAIL) var(--y, PASS-y) var(--z, PASS-z);
-    }
-    #target {
-      --actual: --f(42px);
-      --expected: 42px PASS-y PASS-z;
-    }
-  </style>
-</template>
-
-<template data-name="Cyclic outer --b shadows custom property">
-  <style>
-    @function --f() {
-      --b: var(--b);
-      --a: --g();
-      result: var(--a);
-    }
-
-    @function --g(--a: var(--b)) {
-      result: var(--a, PASS);
-    }
-    #target {
-      --b: FAIL;
-      --actual: --f();
-      --expected: PASS;
-    }
-  </style>
-</template>
-
-<template data-name="Locals are function specific">
-  <style>
-    @function --f() {
-      --a: --g();
-      result: var(--a);
-    }
-
-    @function --g() {
-      --a: 10px;
-      result: var(--a);
-    }
-    #target {
-      /* Nothing is in a cycle here. */
-      --actual: --f();
-      --expected: 10px;
-    }
-  </style>
-</template>
-
-<script>
-  test_all_templates();
-</script>
diff --git a/tests/wpt/tests/css/css-multicol/column-balancing-paged-001-print-ref.html b/tests/wpt/tests/css/css-multicol/column-balancing-paged-001-print-ref.html
index f0ee4df8c9d..f832a0cf70a 100644
--- a/tests/wpt/tests/css/css-multicol/column-balancing-paged-001-print-ref.html
+++ b/tests/wpt/tests/css/css-multicol/column-balancing-paged-001-print-ref.html
@@ -6,6 +6,9 @@
   <link rel="author" title="Mozilla" href="https://www.mozilla.org/">
 
   <style>
+  :root {
+    print-color-adjust: exact;
+  }
   .inner {
     column-count: 2;
     column-rule: 3px solid green;
diff --git a/tests/wpt/tests/css/css-multicol/column-balancing-paged-001-print.html b/tests/wpt/tests/css/css-multicol/column-balancing-paged-001-print.html
index 933519ab5b0..1d6f6e87f02 100644
--- a/tests/wpt/tests/css/css-multicol/column-balancing-paged-001-print.html
+++ b/tests/wpt/tests/css/css-multicol/column-balancing-paged-001-print.html
@@ -9,6 +9,9 @@
   <link rel="help" href="https://drafts.csswg.org/css-break/#breaking-rules">
 
   <style>
+  :root {
+    print-color-adjust: exact;
+  }
   .outer {
     column-count: 1;
     column-rule: 6px solid black;
diff --git a/tests/wpt/tests/css/css-multicol/column-height-001.html b/tests/wpt/tests/css/css-multicol/column-height-001.html
new file mode 100644
index 00000000000..cb7cb6323f5
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/column-height-001.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<title>column-height and column-wrap, auto height</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#ch">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#cwr">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="columns:2; column-fill:auto; width:100px; gap:0; column-height:50px; column-wrap:wrap; background:red;">
+  <div style="height:200px; background:green;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/column-height-002.html b/tests/wpt/tests/css/css-multicol/column-height-002.html
new file mode 100644
index 00000000000..902076a65a8
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/column-height-002.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<title>column-height and column-wrap, with gaps, auto height</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#ch">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#cwr">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="position:relative; columns:2; column-fill:auto; width:100px; gap:10px 20px; column-height:45px; column-wrap:wrap; background:red;">
+  <div style="position:absolute; left:0; top:45px; width:100%; height:10px; background:green;"></div>
+  <div style="position:absolute; left:40px; top:0; width:20px; height:100px; background:green;"></div>
+  <div style="height:180px; background:green;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/column-height-003.html b/tests/wpt/tests/css/css-multicol/column-height-003.html
new file mode 100644
index 00000000000..879358c1803
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/column-height-003.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<title>auto column-height and column-wrap, fixed height, balanced</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#ch">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#cwr">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="position:relative; width:100px; height:100px; background:red;">
+  <div style="columns:2; height:50px; gap:10px 0; column-wrap:wrap;">
+    <div style="height:180px; background:green;"></div>
+    <div style="position:absolute; left:0; top:50px; width:100px; height:10px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/column-height-004.html b/tests/wpt/tests/css/css-multicol/column-height-004.html
new file mode 100644
index 00000000000..07107f3c369
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/column-height-004.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>auto column-height and column-wrap, fixed height</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#ch">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#cwr">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="position:relative; width:100px; height:100px; background:red;">
+  <div style="columns:2; column-fill:auto; height:30px; gap:5px 0; column-wrap:wrap;">
+    <div style="height:180px; background:green;"></div>
+    <div style="position:absolute; left:0; top:30px; width:100px; height:5px; background:green;"></div>
+    <div style="position:absolute; left:0; top:65px; width:100px; height:5px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/column-height-005.html b/tests/wpt/tests/css/css-multicol/column-height-005.html
new file mode 100644
index 00000000000..73303e275a8
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/column-height-005.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<title>column-height and no column-wrap</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#ch">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#cwr">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; height:100px; background:red;">
+  <div style="columns:2; column-fill:auto; column-height:100px; column-wrap:nowrap; width:50px; height:400px; gap:20px 0;">
+    <div style="height:400px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/column-height-006.html b/tests/wpt/tests/css/css-multicol/column-height-006.html
new file mode 100644
index 00000000000..773f25edd5c
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/column-height-006.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>column-height, column-wrap, spanner</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#ch">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#cwr">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="position:relative; width:100px; height:100px; background:red;">
+  <div style="columns:2; column-fill:auto; column-height:10px; column-wrap:wrap; gap:10px 0;">
+    <div style="background:green;">
+      <div style="height:40px;"></div>
+      <div style="column-span:all; height:10px; background:green;"></div>
+      <div style="height:20px;"></div>
+      <div style="column-span:all; height:10px; background:green;"></div>
+      <div style="height:40px;"></div>
+      <div style="column-span:all; height:10px; background:green;"></div>
+    </div>
+  </div>
+  <div style="position:absolute; top:10px; left:0; width:100px; height:10px; background:green;"></div>
+  <div style="position:absolute; top:70px; left:0; width:100px; height:10px; background:green;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/column-height-007.html b/tests/wpt/tests/css/css-multicol/column-height-007.html
new file mode 100644
index 00000000000..4e7308dbd12
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/column-height-007.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<title>column-height and column-wrap in inner multicol, nested multicol</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#ch">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#cwr">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="position:relative; width:100px; height:100px; background:red;">
+  <div style="columns:2; column-fill:auto; height:100px; gap:0;">
+    <div style="columns:2; column-fill:auto; column-height:60px; column-wrap:wrap; gap:10px 0;">
+      <div style="height:360px; background:green;"></div>
+    </div>
+  </div>
+  <div style="position:absolute; top:60px; left:0; width:100px; height:10px; background:green;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/column-height-008.html b/tests/wpt/tests/css/css-multicol/column-height-008.html
new file mode 100644
index 00000000000..f8ef2b1477f
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/column-height-008.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<title>column-height and column-wrap in outer multicol, nested multicol</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#ch">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#cwr">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="position:relative; width:100px; height:100px; background:red;">
+  <div style="columns:2; height:100px; gap:10px 0; column-height:60px; column-wrap:wrap;">
+    <div style="columns:2; gap:0;">
+      <div style="height:360px; background:green;"></div>
+    </div>
+  </div>
+  <div style="position:absolute; top:60px; left:0; width:100px; height:10px; background:green;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/column-height-009-ref.html b/tests/wpt/tests/css/css-multicol/column-height-009-ref.html
new file mode 100644
index 00000000000..034440ebd5c
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/column-height-009-ref.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  .item {
+    display: block;
+    width: 50px;
+    height: 40px;
+    margin-bottom: 20px;
+    background: cyan;
+  }
+  .column {
+    float: left;
+    width: 100px;
+  }
+  .rule {
+    float: left;
+    width: 2px;
+    margin-left: 9px;
+    margin-right: 9px;
+    background: black;
+  }
+</style>
+<div style="width:340px; height:160px; line-height:20px; background:yellow;">
+  <div class="column">
+    <div class="item">a<br>b</div>
+    <div class="item">g<br>h</div>
+    <div class="item">m<br>n</div>
+  </div>
+  <div class="rule" style="height:160px;"></div>
+  <div class="column">
+    <div class="item">c<br>d</div>
+    <div class="item">i<br>j</div>
+    <div class="item">o<br>p</div>
+  </div>
+  <div class="rule" style="height:100px;"></div>
+  <div class="column">
+    <div class="item">e<br>f</div>
+    <div class="item">k<br>l</div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/column-height-009.html b/tests/wpt/tests/css/css-multicol/column-height-009.html
new file mode 100644
index 00000000000..1e08242e0f9
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/column-height-009.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<title>column-height, column-wrap, and column-rule</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#ch">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#cwr">
+<link rel="match" href="column-height-009-ref.html">
+<div style="width:340px; orphans:1; widows:1; line-height:20px;">
+  <div style="columns:3; gap:20px; column-rule:2px solid; column-height:40px; column-wrap:wrap; background:yellow;">
+    <div style="width:50px; background:cyan;">
+      a<br>
+      b<br>
+      c<br>
+      d<br>
+      e<br>
+      f<br>
+      g<br>
+      h<br>
+      i<br>
+      j<br>
+      k<br>
+      l<br>
+      m<br>
+      n<br>
+      o<br>
+      p<br>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/column-height-010.html b/tests/wpt/tests/css/css-multicol/column-height-010.html
new file mode 100644
index 00000000000..8c7e8d5b0f1
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/column-height-010.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<title>column-wrap:auto - should wrap</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#ch">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#cwr">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="columns:2; column-fill:auto; width:100px; gap:0; column-height:50px; column-wrap:auto; background:red;">
+  <div style="height:200px; background:green;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/column-height-011.html b/tests/wpt/tests/css/css-multicol/column-height-011.html
new file mode 100644
index 00000000000..37495a15a09
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/column-height-011.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<title>column-wrap:auto - should not wrap</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#ch">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#cwr">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; height:100px; background:red;">
+  <div style="columns:1; column-fill:auto; width:50px; gap:0; height:100px; column-wrap:auto; background:red;">
+    <div style="height:200px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/column-height-012.html b/tests/wpt/tests/css/css-multicol/column-height-012.html
new file mode 100644
index 00000000000..b663ea981ce
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/column-height-012.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>Non-auto column-height should turn it into a multicol</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#ch">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#cwr">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="position:relative; width:100px; height:100px; background:red;">
+  <div style="column-height:40px; row-gap:20px;">
+    <div style="height:80px; background:green;"></div>
+  </div>
+  <!-- Fill the gap. -->
+  <div style="position:absolute; top:40px; width:100%; height:20px; background:green;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/getclientrects-005.html b/tests/wpt/tests/css/css-multicol/getclientrects-005.html
new file mode 100644
index 00000000000..ee60a607dcc
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/getclientrects-005.html
@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<title>getClientRects on fragmented table-column and table-column-group</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-getclientrects">
+<link rel="help" href="https://drafts.csswg.org/css-multicol/">
+<style>
+  body {
+    margin: 8px;
+  }
+</style>
+<div style="columns:6; gap:20px; inline-size:580px; column-rule:solid; column-fill:auto; block-size:100px; background:yellow;">
+  <div style="block-size:110px;"></div>
+  <div style="display:table; inline-size:100%; border-spacing:5px; border:2px solid; background:pink;">
+    <div style="display:table-caption; block-size:100px;"></div>
+    <div style="display:table-caption; caption-side:bottom; block-size:100px;"></div>
+    <div id="col1" style="display:table-column; inline-size:15px; background:blue;"></div>
+    <div id="col2" style="display:table-column; background:lime;"></div>
+    <div id="group" style="display:table-column-group;">
+      <div id="col3" style="display:table-column; inline-size:20px; background:hotpink;"></div>
+      <div id="col4" style="display:table-column; inline-size:10px; background:cyan;" id="col2"></div>
+    </div>
+    <div style="display:table-row-group;">
+      <div style="display:table-cell;">
+        <div style="block-size:5px;"></div>
+      </div>
+    </div>
+    <div style="display:table-row-group;">
+      <div style="display:table-cell;">
+        <div style="block-size:240px;"></div>
+      </div>
+      <div style="display:table-cell;"></div>
+      <div style="display:table-cell;"></div>
+      <div style="display:table-cell;"></div>
+    </div>
+  </div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  test(()=> {
+    let rects = col1.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].left, 215);
+    assert_equals(rects[0].top, 25);
+    assert_equals(rects[0].width, 15);
+    assert_equals(rects[0].height, 83);
+
+    assert_equals(rects[1].left, 315);
+    assert_equals(rects[1].top, 8);
+    assert_equals(rects[1].width, 15);
+    assert_equals(rects[1].height, 100);
+
+    assert_equals(rects[2].left, 415);
+    assert_equals(rects[2].top, 8);
+    assert_equals(rects[2].width, 15);
+    assert_equals(rects[2].height, 67);
+  }, "#col1");
+
+  test(()=> {
+    let rects = col2.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].left, 235);
+    assert_equals(rects[0].top, 25);
+    assert_equals(rects[0].width, 10);
+    assert_equals(rects[0].height, 83);
+
+    assert_equals(rects[1].left, 335);
+    assert_equals(rects[1].top, 8);
+    assert_equals(rects[1].width, 10);
+    assert_equals(rects[1].height, 100);
+
+    assert_equals(rects[2].left, 435);
+    assert_equals(rects[2].top, 8);
+    assert_equals(rects[2].width, 10);
+    assert_equals(rects[2].height, 67);
+  }, "#col2");
+
+  test(()=> {
+    let rects = col3.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].left, 250);
+    assert_equals(rects[0].top, 25);
+    assert_equals(rects[0].width, 20);
+    assert_equals(rects[0].height, 83);
+
+    assert_equals(rects[1].left, 350);
+    assert_equals(rects[1].top, 8);
+    assert_equals(rects[1].width, 20);
+    assert_equals(rects[1].height, 100);
+
+    assert_equals(rects[2].left, 450);
+    assert_equals(rects[2].top, 8);
+    assert_equals(rects[2].width, 20);
+    assert_equals(rects[2].height, 67);
+  }, "#col3");
+
+  test(()=> {
+    let rects = col4.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].left, 275);
+    assert_equals(rects[0].top, 25);
+    assert_equals(rects[0].width, 10);
+    assert_equals(rects[0].height, 83);
+
+    assert_equals(rects[1].left, 375);
+    assert_equals(rects[1].top, 8);
+    assert_equals(rects[1].width, 10);
+    assert_equals(rects[1].height, 100);
+
+    assert_equals(rects[2].left, 475);
+    assert_equals(rects[2].top, 8);
+    assert_equals(rects[2].width, 10);
+    assert_equals(rects[2].height, 67);
+  }, "#col4");
+
+  test(()=> {
+    let rects = group.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].left, 250);
+    assert_equals(rects[0].top, 25);
+    assert_equals(rects[0].width, 35);
+    assert_equals(rects[0].height, 83);
+
+    assert_equals(rects[1].left, 350);
+    assert_equals(rects[1].top, 8);
+    assert_equals(rects[1].width, 35);
+    assert_equals(rects[1].height, 100);
+
+    assert_equals(rects[2].left, 450);
+    assert_equals(rects[2].top, 8);
+    assert_equals(rects[2].width, 35);
+    assert_equals(rects[2].height, 67);
+  }, "#group");
+</script>
diff --git a/tests/wpt/tests/css/css-multicol/getclientrects-006.html b/tests/wpt/tests/css/css-multicol/getclientrects-006.html
new file mode 100644
index 00000000000..9f07a7de744
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/getclientrects-006.html
@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<title>getClientRects on fragmented table-column and table-column-group, vertical-rl</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-getclientrects">
+<link rel="help" href="https://drafts.csswg.org/css-multicol/">
+<style>
+  body {
+    margin: 8px;
+  }
+</style>
+<div style="writing-mode:vertical-rl; columns:6; gap:20px; inline-size:580px; column-rule:solid; column-fill:auto; block-size:100px; background:yellow;">
+  <div style="block-size:110px;"></div>
+  <div style="display:table; inline-size:100%; border-spacing:5px; border:2px solid; background:pink;">
+    <div style="display:table-caption; block-size:100px;"></div>
+    <div style="display:table-caption; caption-side:bottom; block-size:100px;"></div>
+    <div id="col1" style="display:table-column; inline-size:15px; background:blue;"></div>
+    <div id="col2" style="display:table-column; background:lime;"></div>
+    <div id="group" style="display:table-column-group;">
+      <div id="col3" style="display:table-column; inline-size:20px; background:hotpink;"></div>
+      <div id="col4" style="display:table-column; inline-size:10px; background:cyan;" id="col2"></div>
+    </div>
+    <div style="display:table-row-group;">
+      <div style="display:table-cell;">
+        <div style="block-size:5px;"></div>
+      </div>
+    </div>
+    <div style="display:table-row-group;">
+      <div style="display:table-cell;">
+        <div style="block-size:240px;"></div>
+      </div>
+      <div style="display:table-cell;"></div>
+      <div style="display:table-cell;"></div>
+      <div style="display:table-cell;"></div>
+    </div>
+  </div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  test(()=> {
+    let rects = col1.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].left, 8);
+    assert_equals(rects[0].top, 215);
+    assert_equals(rects[0].width, 83);
+    assert_equals(rects[0].height, 15);
+
+    assert_equals(rects[1].left, 8);
+    assert_equals(rects[1].top, 315);
+    assert_equals(rects[1].width, 100);
+    assert_equals(rects[1].height, 15);
+
+    assert_equals(rects[2].left, 41);
+    assert_equals(rects[2].top, 415);
+    assert_equals(rects[2].width, 67);
+    assert_equals(rects[2].height, 15);
+  }, "#col1");
+
+  test(()=> {
+    let rects = col2.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].left, 8);
+    assert_equals(rects[0].top, 235);
+    assert_equals(rects[0].width, 83);
+    assert_equals(rects[0].height, 10);
+
+    assert_equals(rects[1].left, 8);
+    assert_equals(rects[1].top, 335);
+    assert_equals(rects[1].width, 100);
+    assert_equals(rects[1].height, 10);
+
+    assert_equals(rects[2].left, 41);
+    assert_equals(rects[2].top, 435);
+    assert_equals(rects[2].width, 67);
+    assert_equals(rects[2].height, 10);
+  }, "#col2");
+
+  test(()=> {
+    let rects = col3.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].left, 8);
+    assert_equals(rects[0].top, 250);
+    assert_equals(rects[0].width, 83);
+    assert_equals(rects[0].height, 20);
+
+    assert_equals(rects[1].left, 8);
+    assert_equals(rects[1].top, 350);
+    assert_equals(rects[1].width, 100);
+    assert_equals(rects[1].height, 20);
+
+    assert_equals(rects[2].left, 41);
+    assert_equals(rects[2].top, 450);
+    assert_equals(rects[2].width, 67);
+    assert_equals(rects[2].height, 20);
+  }, "#col3");
+
+  test(()=> {
+    let rects = col4.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].left, 8);
+    assert_equals(rects[0].top, 275);
+    assert_equals(rects[0].width, 83);
+    assert_equals(rects[0].height, 10);
+
+    assert_equals(rects[1].left, 8);
+    assert_equals(rects[1].top, 375);
+    assert_equals(rects[1].width, 100);
+    assert_equals(rects[1].height, 10);
+
+    assert_equals(rects[2].left, 41);
+    assert_equals(rects[2].top, 475);
+    assert_equals(rects[2].width, 67);
+    assert_equals(rects[2].height, 10);
+  }, "#col4");
+
+  test(()=> {
+    let rects = group.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].left, 8);
+    assert_equals(rects[0].top, 250);
+    assert_equals(rects[0].width, 83);
+    assert_equals(rects[0].height, 35);
+
+    assert_equals(rects[1].left, 8);
+    assert_equals(rects[1].top, 350);
+    assert_equals(rects[1].width, 100);
+    assert_equals(rects[1].height, 35);
+
+    assert_equals(rects[2].left, 41);
+    assert_equals(rects[2].top, 450);
+    assert_equals(rects[2].width, 67);
+    assert_equals(rects[2].height, 35);
+  }, "#group");
+</script>
diff --git a/tests/wpt/tests/css/css-multicol/getclientrects-007.html b/tests/wpt/tests/css/css-multicol/getclientrects-007.html
new file mode 100644
index 00000000000..0791c5b931f
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/getclientrects-007.html
@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<title>getClientRects on fragmented table-column and table-column-group, vertical-lr</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-getclientrects">
+<link rel="help" href="https://drafts.csswg.org/css-multicol/">
+<style>
+  body {
+    margin: 8px;
+  }
+</style>
+<div style="float:left; writing-mode:vertical-lr; columns:6; gap:20px; inline-size:580px; column-rule:solid; column-fill:auto; block-size:100px; background:yellow;">
+  <div style="block-size:110px;"></div>
+  <div style="display:table; inline-size:100%; border-spacing:5px; border:2px solid; background:pink;">
+    <div style="display:table-caption; block-size:100px;"></div>
+    <div style="display:table-caption; caption-side:bottom; block-size:100px;"></div>
+    <div id="col1" style="display:table-column; inline-size:15px; background:blue;"></div>
+    <div id="col2" style="display:table-column; background:lime;"></div>
+    <div id="group" style="display:table-column-group;">
+      <div id="col3" style="display:table-column; inline-size:20px; background:hotpink;"></div>
+      <div id="col4" style="display:table-column; inline-size:10px; background:cyan;" id="col2"></div>
+    </div>
+    <div style="display:table-row-group;">
+      <div style="display:table-cell;">
+        <div style="block-size:5px;"></div>
+      </div>
+    </div>
+    <div style="display:table-row-group;">
+      <div style="display:table-cell;">
+        <div style="block-size:240px;"></div>
+      </div>
+      <div style="display:table-cell;"></div>
+      <div style="display:table-cell;"></div>
+      <div style="display:table-cell;"></div>
+    </div>
+  </div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  test(()=> {
+    let rects = col1.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].top, 215);
+    assert_equals(rects[0].left, 25);
+    assert_equals(rects[0].height, 15);
+    assert_equals(rects[0].width, 83);
+
+    assert_equals(rects[1].top, 315);
+    assert_equals(rects[1].left, 8);
+    assert_equals(rects[1].height, 15);
+    assert_equals(rects[1].width, 100);
+
+    assert_equals(rects[2].top, 415);
+    assert_equals(rects[2].left, 8);
+    assert_equals(rects[2].height, 15);
+    assert_equals(rects[2].width, 67);
+  }, "#col1");
+
+  test(()=> {
+    let rects = col2.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].top, 235);
+    assert_equals(rects[0].left, 25);
+    assert_equals(rects[0].height, 10);
+    assert_equals(rects[0].width, 83);
+
+    assert_equals(rects[1].top, 335);
+    assert_equals(rects[1].left, 8);
+    assert_equals(rects[1].height, 10);
+    assert_equals(rects[1].width, 100);
+
+    assert_equals(rects[2].top, 435);
+    assert_equals(rects[2].left, 8);
+    assert_equals(rects[2].height, 10);
+    assert_equals(rects[2].width, 67);
+  }, "#col2");
+
+  test(()=> {
+    let rects = col3.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].top, 250);
+    assert_equals(rects[0].left, 25);
+    assert_equals(rects[0].height, 20);
+    assert_equals(rects[0].width, 83);
+
+    assert_equals(rects[1].top, 350);
+    assert_equals(rects[1].left, 8);
+    assert_equals(rects[1].height, 20);
+    assert_equals(rects[1].width, 100);
+
+    assert_equals(rects[2].top, 450);
+    assert_equals(rects[2].left, 8);
+    assert_equals(rects[2].height, 20);
+    assert_equals(rects[2].width, 67);
+  }, "#col3");
+
+  test(()=> {
+    let rects = col4.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].top, 275);
+    assert_equals(rects[0].left, 25);
+    assert_equals(rects[0].height, 10);
+    assert_equals(rects[0].width, 83);
+
+    assert_equals(rects[1].top, 375);
+    assert_equals(rects[1].left, 8);
+    assert_equals(rects[1].height, 10);
+    assert_equals(rects[1].width, 100);
+
+    assert_equals(rects[2].top, 475);
+    assert_equals(rects[2].left, 8);
+    assert_equals(rects[2].height, 10);
+    assert_equals(rects[2].width, 67);
+  }, "#col4");
+
+  test(()=> {
+    let rects = group.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].top, 250);
+    assert_equals(rects[0].left, 25);
+    assert_equals(rects[0].height, 35);
+    assert_equals(rects[0].width, 83);
+
+    assert_equals(rects[1].top, 350);
+    assert_equals(rects[1].left, 8);
+    assert_equals(rects[1].height, 35);
+    assert_equals(rects[1].width, 100);
+
+    assert_equals(rects[2].top, 450);
+    assert_equals(rects[2].left, 8);
+    assert_equals(rects[2].height, 35);
+    assert_equals(rects[2].width, 67);
+  }, "#group");
+</script>
diff --git a/tests/wpt/tests/css/css-multicol/getclientrects-008.html b/tests/wpt/tests/css/css-multicol/getclientrects-008.html
new file mode 100644
index 00000000000..21505a7e48a
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/getclientrects-008.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<title>getClientRects on monolithic elements and their container</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-getclientrects">
+<link rel="help" href="https://drafts.csswg.org/css-multicol/">
+<style>
+  body {
+    margin: 8px;
+  }
+</style>
+<div style="columns:3; column-fill:auto; gap:10px; width:320px; height:100px; background:yellow;">
+  <div id="container" style="background:gray;">
+    <div id="monolith1" style="contain:size; width:50%; height:250px; background:cyan;"></div>
+    <div id="monolith2" style="contain:size; width:50%; height:50px; background:black;"></div>
+    <div id="monolith3" style="contain:size; width:50%; height:250px; background:hotpink;"></div>
+  </div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  test(()=> {
+    let rects = monolith1.getClientRects();
+    assert_equals(rects.length, 1);
+    assert_equals(rects[0].left, 8);
+    assert_equals(rects[0].top, 8);
+    assert_equals(rects[0].width, 50);
+    assert_equals(rects[0].height, 250);
+  }, "#monolith1");
+
+  test(()=> {
+    let rects = monolith2.getClientRects();
+    assert_equals(rects.length, 1);
+    assert_equals(rects[0].left, 118);
+    assert_equals(rects[0].top, 8);
+    assert_equals(rects[0].width, 50);
+    assert_equals(rects[0].height, 50);
+  }, "#monolith2");
+
+  test(()=> {
+    let rects = monolith3.getClientRects();
+    assert_equals(rects.length, 1);
+    assert_equals(rects[0].left, 228);
+    assert_equals(rects[0].top, 8);
+    assert_equals(rects[0].width, 50);
+    assert_equals(rects[0].height, 250);
+  }, "#monolith3");
+
+  test(()=> {
+    let rects = container.getClientRects();
+    assert_equals(rects.length, 3);
+
+    assert_equals(rects[0].left, 8);
+    assert_equals(rects[0].top, 8);
+    assert_equals(rects[0].width, 100);
+    assert_equals(rects[0].height, 250);
+
+    assert_equals(rects[1].left, 118);
+    assert_equals(rects[1].top, 8);
+    assert_equals(rects[1].width, 100);
+    assert_equals(rects[1].height, 100);
+
+    assert_equals(rects[2].left, 228);
+    assert_equals(rects[2].top, 8);
+    assert_equals(rects[2].width, 100);
+    assert_equals(rects[2].height, 250);
+  }, "#container");
+</script>
diff --git a/tests/wpt/tests/css/css-multicol/multicol-nested-016.html b/tests/wpt/tests/css/css-multicol/multicol-nested-016.html
index ad4b6a5aaaf..2f428957da4 100644
--- a/tests/wpt/tests/css/css-multicol/multicol-nested-016.html
+++ b/tests/wpt/tests/css/css-multicol/multicol-nested-016.html
@@ -18,7 +18,7 @@
   <div style="break-before:avoid; columns:5; column-fill:auto; column-gap:0;">
     <div style="background:green;">
       <div style="height:60px;"></div>
-      <!-- These lines should be pushed to a column in the the next outer
+      <!-- These lines should be pushed to a column in the next outer
            fragmentainer, or we'd violate orphans and widows settings (which
            would otherwise be the only (and unnecessary) violation inside the
            inner multicol container). -->
diff --git a/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-001.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-001.html
index 3226e81c320..64c04c868d9 100644
--- a/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-001.html
+++ b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-001.html
@@ -6,7 +6,7 @@
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
   <link rel="match" href="multicol-span-all-children-height-001-ref.html">
-  <meta name="assert" content="This test checks the the percentage height children under multicol container is rendered correctly.">
+  <meta name="assert" content="This test checks the percentage height children under multicol container is rendered correctly.">
 
   <style>
   article {
diff --git a/tests/wpt/tests/css/css-multicol/resize-multicol-with-fixed-size-children-002.html b/tests/wpt/tests/css/css-multicol/resize-multicol-with-fixed-size-children-002.html
new file mode 100644
index 00000000000..9a582bf5177
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/resize-multicol-with-fixed-size-children-002.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+  <link rel="help" href="https://www.w3.org/TR/css-multicol-1/#columns">
+  <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+  <div style="width:100px; height:100px; background:red;">
+    <div id="multicol" style="columns:2; gap:0; column-fill:auto; width:60px; height:100px;">
+      <div style="width:50px;">
+        <div>
+          <div>
+            <div style="height:200px; background:green;"></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <script>
+    requestAnimationFrame(()=> {
+      requestAnimationFrame(()=> {
+        multicol.style.width = "100px";
+        document.documentElement.classList.remove("reftest-wait");
+      });
+    });
+  </script>
+</html>
diff --git a/tests/wpt/tests/css/css-multicol/resize-multicol-with-fixed-size-children-003.html b/tests/wpt/tests/css/css-multicol/resize-multicol-with-fixed-size-children-003.html
new file mode 100644
index 00000000000..7e73c8373ed
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/resize-multicol-with-fixed-size-children-003.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<title>Resize multicol with fixed-width child</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#columns">
+<div id="multicol" style="position:relative; columns:2; column-fill:auto; gap:20px; width:220px; height:100px;">
+  <div style="width:50px;">
+    <div>
+      <div>
+        <div style="height:150px;"></div>
+        <div id="target"></div>
+      </div>
+    </div>
+  </div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  test(() => {
+    document.body.offsetTop;
+
+    // Increasing multicol width won't affect the layout of anything inside (the
+    // child has a fixed width), except for the columns themselves, which will
+    // become wider.
+    multicol.style.width = "320px";
+
+    // Check something in the second column.
+    assert_equals(target.offsetLeft, 170);
+    assert_equals(target.offsetTop, 50);
+  }, "Resize multicol with fixed-width child");
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/column-scroll-marker-focus-002.html b/tests/wpt/tests/css/css-overflow/column-scroll-marker-focus-002.html
new file mode 100644
index 00000000000..cd26b8aca85
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/column-scroll-marker-focus-002.html
@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<title>Tab focus and ::colum::scroll-marker, wrapped column rows</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-marker-next-focus">
+<style>
+  body {
+    margin: 0;
+  }
+  #container {
+    scroll-marker-group: before;
+    overflow: hidden;
+    columns: 3;
+    column-wrap: wrap;
+    column-height: 100px;
+    column-fill: auto;
+    column-rule: solid;
+    height: 150px;
+    line-height: 20px;
+  }
+  #container::scroll-marker-group {
+    display: flex;
+    height: 20px;
+    background: hotpink;
+  }
+  #container::column::scroll-marker {
+    content: "";
+    width: 20px;
+    height: 20px;
+    margin-right: 5px;
+    background: blue;
+  }
+  #container::column::scroll-marker:focus {
+    background: cyan;
+  }
+</style>
+<div id="container">
+  <!-- Column #0 -->
+  <div tabindex="0" id="c0" style="height:100px;">First</div>
+
+  <!-- Column #1 -->
+  <div tabindex="0" id="c1first">line</div>
+  <div tabindex="0" id="c1second" style="height:100px; background:red;">line</div>
+
+  <!-- Column #2 -->
+
+  <div tabindex="0" id="inlineBlock" style="display:inline-block; box-sizing:border-box; width:100%; height:70px; border:solid;"></div>
+
+  <!-- Column #3 -->
+  <div>
+    <div style="display:flex; flex-flow:wrap row-reverse;">
+      <div tabindex="0" id="flex1" style="width:30%; height:100px;">A</div>
+      <div tabindex="0" id="flex2" style="width:30%;">B</div>
+      <div tabindex="0" id="flex3" style="width:30%;">C</div>
+    </div>
+
+    <!-- Column #4 -->
+    <div tabindex="0" id="flex4" style="width:30%;">D</div>
+    <div tabindex="0" id="flex5" style="width:30%;">E</div>
+    <div tabindex="0" id="flex6" style="width:30%;">F</div>
+  </div>
+</div>
+
+<div tabindex="0" id="after">after</div>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script>
+  async function activateMarker(idx) {
+    await new test_driver.Actions()
+      .pointerMove(5 + idx*25, 5)
+      .pointerDown()
+      .pointerUp()
+      .send();
+  }
+
+  async function focusNext() {
+    // https://w3c.github.io/webdriver/#keyboard-actions
+    const kTab = '\uE004';
+
+    await new test_driver.Actions()
+      .keyDown(kTab)
+      .keyUp(kTab)
+      .send();
+  }
+
+  promise_test(async t => {
+    await activateMarker(1);
+    await focusNext();
+    assert_equals(document.activeElement, c1first);
+    await focusNext();
+    assert_equals(document.activeElement, c1second);
+    await focusNext();
+    assert_equals(document.activeElement, inlineBlock);
+  }, "Column #1");
+
+  promise_test(async t => {
+    await activateMarker(2);
+    await focusNext();
+    assert_equals(document.activeElement, inlineBlock);
+    await focusNext();
+    assert_equals(document.activeElement, flex1);
+  }, "Column #2");
+
+  promise_test(async t => {
+    await activateMarker(0);
+    await focusNext();
+    assert_equals(document.activeElement, c0);
+    await focusNext();
+    assert_equals(document.activeElement, c1first);
+  }, "Column #0");
+
+  promise_test(async t => {
+    await activateMarker(4);
+    await focusNext();
+    assert_equals(document.activeElement, flex4);
+    await focusNext();
+    assert_equals(document.activeElement, flex5);
+    await focusNext();
+    assert_equals(document.activeElement, flex6);
+    await focusNext();
+    assert_equals(document.activeElement, after);
+  }, "Column #4");
+
+  promise_test(async t => {
+    await activateMarker(3);
+    await focusNext();
+    assert_equals(document.activeElement, flex1);
+    await focusNext();
+    assert_equals(document.activeElement, flex2);
+    await focusNext();
+    assert_equals(document.activeElement, flex3);
+    await focusNext();
+    assert_equals(document.activeElement, flex4);
+  }, "Column #3");
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/column-scroll-marker-focus-003.html b/tests/wpt/tests/css/css-overflow/column-scroll-marker-focus-003.html
new file mode 100644
index 00000000000..bb3868066e3
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/column-scroll-marker-focus-003.html
@@ -0,0 +1,142 @@
+<!DOCTYPE html>
+<title>Tab focus from ::colum::scroll-marker to non-atomic inline</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-marker-next-focus">
+<style>
+  body {
+    margin: 0;
+  }
+  #container {
+    scroll-marker-group: before;
+    overflow: scroll;
+    columns: 7;
+    column-gap: 10px;
+    column-fill: auto;
+    column-rule: solid;
+    height: 100px;
+    line-height: 20px;
+    orphans: 1;
+    widows: 1;
+  }
+  #container::scroll-marker-group {
+    display: flex;
+    height: 20px;
+    background: hotpink;
+  }
+  #container::column::scroll-marker {
+    content: "";
+    width: 20px;
+    height: 20px;
+    margin-right: 5px;
+    background: blue;
+  }
+  #container::column::scroll-marker:focus {
+    background: cyan;
+  }
+</style>
+<div id="container">
+  <div id="wrapper">
+    <div tabindex="0" style="display:inline-block; width:100%; height:85px;"></div>
+    <span tabindex="0" id="inlineElm1">
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      <span tabindex="0" id="inlineElm2">inline2</span>
+    </span>
+    <div tabindex="0" id="inlineBlock1" style="display:inline-block; width:100%; height:85px; background:brown;"></div>
+    <span tabindex="0" id="inlineElm3" style="border:1px solid;">
+      inline3<br>
+      <div tabindex="0" id="inlineBlock2" style="display:inline-block; width:100%; height:15px; background:brown;"></div>
+      inline3<br>
+      inline3<br>
+      inline3<br>
+      inline3<br>
+    </span>
+    <span tabindex="0" id="inlineElm4" style="border:1px solid;">
+      inline4<br>
+    </span>
+  </div>
+</div>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script>
+  async function activateMarker(idx) {
+    await new test_driver.Actions()
+      .pointerMove(5 + idx*25, 5)
+      .pointerDown()
+      .pointerUp()
+      .send();
+  }
+
+  // Redisplay an element, to reset state. This makes the test harder to pass
+  // with Blink's "culled inlines" concept.
+  function redisplay(elm) {
+    let old_display = elm.style.display;
+    elm.style.display = "none";
+    document.body.offsetTop;
+    elm.style.display = old_display;
+  }
+
+  async function focusNext() {
+    // https://w3c.github.io/webdriver/#keyboard-actions
+    const kTab = '\uE004';
+
+    await new test_driver.Actions()
+      .keyDown(kTab)
+      .keyUp(kTab)
+      .send();
+  }
+
+  promise_test(async t => {
+    await activateMarker(1);
+    await focusNext();
+    assert_equals(document.activeElement, inlineElm1);
+    await focusNext();
+    assert_equals(document.activeElement, inlineElm2);
+    redisplay(wrapper);
+  }, "Focus second column");
+
+  promise_test(async t => {
+    await activateMarker(2);
+    await focusNext();
+    assert_equals(document.activeElement, inlineElm2);
+    await focusNext();
+    assert_equals(document.activeElement, inlineBlock1);
+    redisplay(wrapper);
+  }, "Focus third column");
+
+  promise_test(async t => {
+    await activateMarker(3);
+    await focusNext();
+    assert_equals(document.activeElement, inlineBlock1);
+    await focusNext();
+    let collection = document.activeElement;
+    assert_equals(document.activeElement, inlineElm3);
+    redisplay(wrapper);
+  }, "Focus fourth column");
+
+  promise_test(async t => {
+    await activateMarker(4);
+    await focusNext();
+    assert_equals(document.activeElement, inlineElm3);
+    await focusNext();
+    assert_equals(document.activeElement, inlineBlock2);
+    await focusNext();
+    assert_equals(document.activeElement, inlineElm4);
+    redisplay(wrapper);
+  }, "Focus fifth column");
+
+  promise_test(async t => {
+    await activateMarker(5);
+    await focusNext();
+    assert_equals(document.activeElement, inlineElm4);
+    redisplay(wrapper);
+  }, "Focus sixth column");
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/column-scroll-marker-focus-004.html b/tests/wpt/tests/css/css-overflow/column-scroll-marker-focus-004.html
new file mode 100644
index 00000000000..fa6adbb15d0
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/column-scroll-marker-focus-004.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<title>Tab focus from ::colum::scroll-marker, some columns with no elements</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-marker-next-focus">
+<style>
+  body {
+    margin: 0;
+  }
+  #scrollable {
+    scroll-marker-group: after;
+    overflow: hidden;
+    height: 100px;
+    line-height: 20px;
+  }
+  #multicol {
+    columns: 11;
+    column-gap: 10px;
+    column-fill: auto;
+    column-rule: solid;
+    height: 100%;
+    orphans: 1;
+    widows: 1;
+  }
+  #scrollable::scroll-marker-group {
+    display: flex;
+    height: 20px;
+    background: hotpink;
+  }
+  #multicol::column::scroll-marker {
+    content: "";
+    width: 20px;
+    height: 20px;
+    margin-right: 5px;
+    background: blue;
+  }
+  #multicol::column::scroll-marker:focus {
+    background: cyan;
+  }
+</style>
+<div id="scrollable">
+  <div id="multicol">
+    <div tabindex="0" id="block1" style="height:85px; background:#ccc;"></div>
+    <div tabindex="0" id="block2">
+      block<br>
+      block<br>
+      block<br>
+      block<br>
+      block<br>
+      block<br>
+    </div>
+    <div tabindex="0" id="inlineBlock1" style="display:inline-block; width:100%; height:81px; background:#ccc;"></div>
+    <span tabindex="0" id="inlineElm1">
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+    </span>
+    <div tabindex="0" id="inlineBlock2" style="display:inline-block; width:100%; height:81px; background:#ccc;"></div>
+    <span tabindex="0" id="inlineElm2">
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+      inline<br>
+    </span>
+  </div>
+</div>
+<div id="after" tabindex="0">after</div>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script>
+  async function activateMarker(idx) {
+    await new test_driver.Actions()
+      .pointerMove(5 + idx*25, 105)
+      .pointerDown()
+      .pointerUp()
+      .send();
+  }
+
+  async function focusNext() {
+    // https://w3c.github.io/webdriver/#keyboard-actions
+    const kTab = '\uE004';
+
+    await new test_driver.Actions()
+      .keyDown(kTab)
+      .keyUp(kTab)
+      .send();
+  }
+
+  promise_test(async t => {
+    await activateMarker(1);
+    await focusNext();
+    assert_equals(document.activeElement, block2);
+  }, "Focus column #1");
+
+  promise_test(async t => {
+    await activateMarker(10);
+    await focusNext();
+    assert_equals(document.activeElement, after);
+  }, "Focus column #10");
+
+  promise_test(async t => {
+    await activateMarker(2);
+    await focusNext();
+    assert_equals(document.activeElement, inlineBlock1);
+  }, "Focus column #2");
+
+  promise_test(async t => {
+    await activateMarker(9);
+    await focusNext();
+    assert_equals(document.activeElement, after);
+  }, "Focus column #9");
+
+  promise_test(async t => {
+    await activateMarker(8);
+    await focusNext();
+    assert_equals(document.activeElement, inlineElm2);
+  }, "Focus column #8");
+
+  promise_test(async t => {
+    await activateMarker(7);
+    await focusNext();
+    assert_equals(document.activeElement, inlineBlock2);
+  }, "Focus column #7");
+
+  promise_test(async t => {
+    await activateMarker(6);
+    await focusNext();
+    assert_equals(document.activeElement, inlineBlock2);
+  }, "Focus column #6");
+
+  promise_test(async t => {
+    await activateMarker(5);
+    await focusNext();
+    assert_equals(document.activeElement, inlineBlock2);
+  }, "Focus column #5");
+
+  promise_test(async t => {
+    await activateMarker(4);
+    await focusNext();
+    assert_equals(document.activeElement, inlineElm1);
+  }, "Focus column #4");
+
+  promise_test(async t => {
+    await activateMarker(3);
+    await focusNext();
+    assert_equals(document.activeElement, inlineBlock1);
+  }, "Focus column #3");
+
+  promise_test(async t => {
+    await activateMarker(0);
+    await focusNext();
+    assert_equals(document.activeElement, block1);
+  }, "Focus column #0");
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-011.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-011.tentative.html
new file mode 100644
index 00000000000..9ee25208239
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-011.tentative.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: the ellipsis is not placed on the last line of the line-clamp container</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#block-ellipsis">
+<link rel="match" href="reference/block-ellipsis-011-ref.html">
+<meta name="assert" content="block-ellipsis will insert an ellipsis immediately before a region break, and there can be no region break after the last line of the line-clamp container. If a line would be the last if the ellipsis was not inserted, then it must not be inserted.">
+<style>
+.clamp {
+  line-clamp: 2;
+  width: 31.1ch;
+  border: 1px solid black;
+  font-family: monospace;
+}
+p {
+  margin: 0;
+}
+</style>
+<div class="clamp">
+  <p>
+    There should not be an ellipsis
+    at the end of this line of text
+  </p>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-012.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-012.tentative.html
new file mode 100644
index 00000000000..54dd4df5141
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-012.tentative.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: the ellipsis can be placed in the last line of an inline formatting context</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#block-ellipsis">
+<link rel="match" href="reference/block-ellipsis-012-ref.html">
+<meta name="assert" content="block-ellipsis will insert an ellipsis immediately before a region break, and there can be no region break after the last line of the line-clamp container. However, there can be one after the last line in an IFC, if there is content after it.">
+<style>
+.clamp {
+  line-clamp: 1;
+  width: 38.1ch;
+  border: 1px solid black;
+  font-family: monospace;
+}
+p {
+  margin: 0;
+}
+</style>
+<div class="clamp">
+  <p>This line should have an ellipsis here</p>
+  <p>After all, it is not the last line in the line-clamp container</p>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-013.html b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-013.html
new file mode 100644
index 00000000000..576ec3aec54
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-013.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: block-ellipsis are placed at soft wrap opportunities, even if the line would not break</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#block-ellipsis">
+<link rel="match" href="reference/block-ellipsis-001-ref.html">
+<meta name="assert" content="The block-ellipsis is placed after the last soft wrap opportunity in the line box that fits the ellipsis. This happens even with text-wrap: nowrap, since that only prevents line wrapping, rather than removing wrap opportunities.">
+<style>
+.clamp {
+  line-clamp: 2;
+  width: 63.1ch;
+  border: 1px solid black;
+  font-family: monospace;
+  white-space: pre;
+}
+</style>
+<div class="clamp">This time, Mark, who had always been the center of attention in
+any social gathering, walked into the room uncharacteristically quietly, barely speaking as he settled into a chair.
+
+When asked, he said that he was fine, when he wasn't really fine.</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-014.html b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-014.html
new file mode 100644
index 00000000000..3fa55ddde4d
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-014.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: the block-ellipsis can be placed at hyphenation opportunities, even if the line would not break</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#block-ellipsis">
+<link rel="match" href="reference/block-ellipsis-014-ref.html">
+<meta name="assert" content="The block-ellipsis is placed after the last soft wrap opportunity in the line box that fits the ellipsis. This happens even with text-wrap: nowrap, since that only prevents line wrapping, rather than removing wrap opportunities.">
+<style>
+.clamp {
+  line-clamp: 2;
+  width: 63.1ch;
+  border: 1px solid black;
+  font-family: monospace;
+  white-space: pre;
+}
+</style>
+<div class="clamp">This time, Mark, who had always been the center of attention in
+any social gathering, walked into the room uncharacteristi&shy;cally quietly, barely speaking as he settled into a chair.
+
+When asked, he said that he was fine, when he wasn't really fine.</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-015.html b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-015.html
new file mode 100644
index 00000000000..22b125f0f50
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-015.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: the block-ellipsis can be inserted at wbr, even if the line would not break there</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#block-ellipsis">
+<link rel="match" href="reference/block-ellipsis-015-ref.html">
+<meta name="assert" content="The block-ellipsis is placed after the last soft wrap opportunity in the line box that fits the ellipsis. This happens even with text-wrap: nowrap, since that only prevents line wrapping, rather than removing wrap opportunities.">
+<style>
+.clamp {
+  line-clamp: 2;
+  width: 63.1ch;
+  border: 1px solid black;
+  font-family: monospace;
+  white-space: pre;
+}
+</style>
+<div class="clamp">This time, Mark, who had always been the center of attention in
+any social gathering, walked into the room uncharacteristi<wbr>cally quietly, barely speaking as he settled into a chair.
+
+When asked, he said that he was fine, when he wasn't really fine.</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-016.html b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-016.html
new file mode 100644
index 00000000000..7c7256a953a
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-016.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: soft wrap opportunities created by overflow-wrap are ignored for inserting block-ellipsis</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#block-ellipsis">
+<link rel="match" href="reference/block-ellipsis-001-ref.html">
+<meta name="assert" content="The block-ellipsis is placed after the last soft wrap opportunity in the line box that fits the ellipsis. This happens even with text-wrap: nowrap, since that only prevents line wrapping, rather than removing wrap opportunities.">
+<style>
+.clamp {
+  line-clamp: 2;
+  width: 63.1ch;
+  border: 1px solid black;
+  font-family: monospace;
+  white-space: pre;
+  overflow-wrap: anywhere;
+}
+</style>
+<div class="clamp">This time, Mark, who had always been the center of attention in
+any social gathering, walked into the room uncharacteristically quietly, barely speaking as he settled into a chair.
+
+When asked, he said that he was fine, when he wasn't really fine.</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-017.html b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-017.html
new file mode 100644
index 00000000000..9c84673e9e8
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-017.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: soft wrap opportunities created by word-break are not ignored for inserting block-ellipsis</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#block-ellipsis">
+<link rel="match" href="reference/block-ellipsis-017-ref.html">
+<meta name="assert" content="The block-ellipsis is placed after the last soft wrap opportunity in the line box that fits the ellipsis. This happens even with text-wrap: nowrap, since that only prevents line wrapping, rather than removing wrap opportunities.">
+<style>
+.clamp {
+  line-clamp: 2;
+  width: 63.1ch;
+  border: 1px solid black;
+  font-family: monospace;
+  white-space: pre;
+  word-break: break-all;
+}
+</style>
+<div class="clamp">This time, Mark, who had always been the center of attention in
+any social gathering, walked into the room uncharacteristically quietly, barely speaking as he settled into a chair.
+
+When asked, he said that he was fine, when he wasn't really fine.</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-018.html b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-018.html
new file mode 100644
index 00000000000..9c4ae82d003
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-018.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: block-ellipsis effect on a fully displaced line's height</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#block-ellipsis">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<meta name="assert" content="If the block-ellipsis results in the entire contents of a line box being displaced, the line box is considered to contain a strut. The line box's height will not depend on the height of the displaced content.">
+<style>
+.container {
+  position: relative;
+  height: 100px;
+  width: 100px;
+  font: 25px Ahem;
+}
+.bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  color: green;
+  line-height: 25px;
+}
+.red {
+  color: red;
+}
+.large {
+  font-size: 1.5em;
+}
+.clamp {
+  position: absolute;
+  width: 100px;
+  bottom: 0;
+  left: 0;
+  line-clamp: 1;
+
+  color: transparent;
+  background: linear-gradient(to top, green 0, green 1lh, red 1lh);
+  background-position: left bottom;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div class="container">
+  <div class="bg">
+    XXXX<br>
+    XXXX<br>
+    XXXX<br>
+    <span class="red">XXXX</span>
+  </div>
+  <div class="clamp">
+    <span class="red large">XXXXXXXXX XXX</span>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-019.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-019.tentative.html
new file mode 100644
index 00000000000..afee5d6eddc
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-019.tentative.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: block-ellipsis and ::first-letter</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="The block overflow ellipsis must not be included in the ::first-letter pseudoelement of the line-clamp container.">
+<style>
+.container {
+  position: relative;
+  font: 25px/25px Ahem;
+}
+.bg, .clamp {
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+.bg {
+  height: 100px;
+  width: 100px;
+  color: red;
+  background-color: green;
+}
+.clamp {
+  max-width: 100px;
+  line-clamp: 1;
+  color: green;
+}
+.red, .clamp::first-letter {
+  color: red;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div class="container">
+  <div class="bg">X</div>
+
+  <div class="clamp">
+    <span class="red">
+      0000000000<br>
+      0000000000
+    </span>
+  </div>
+
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-020.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-020.tentative.html
new file mode 100644
index 00000000000..473aad392c1
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-020.tentative.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: block-ellipsis and ::first-letter</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="The block overflow ellipsis must not be included in the ::first-letter pseudoelement of a parent of the line-clamp container.">
+<style>
+.container {
+  position: relative;
+  font: 25px/25px Ahem;
+}
+.bg, .parent {
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+.bg {
+  height: 100px;
+  width: 100px;
+  color: red;
+  background-color: green;
+}
+.parent::first-line, .red {
+  color: red;
+}
+.clamp {
+  max-width: 100px;
+  line-clamp: 1;
+  color: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div class="container">
+  <div class="bg">X</div>
+
+  <div class="parent">
+    <div class="clamp">
+      <span class="red">
+        0000000000<br>
+        0000000000
+      </span>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-021.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-021.tentative.html
new file mode 100644
index 00000000000..517245ac8b0
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-021.tentative.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: block-ellipsis and ::first-line</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="The block overflow ellipsis must not be included in the ::first-line pseudoelement of a child of the line-clamp container.">
+<style>
+.relative {
+  position: relative;
+  font: 25px/25px Ahem;
+}
+.bg, .clamp {
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+.bg {
+  height: 100px;
+  width: 100px;
+  color: red;
+  background-color: green;
+}
+.clamp {
+  line-clamp: 3;
+  color: green;
+  max-width: 100px;
+}
+.child::first-letter, .red {
+  color: red;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div class="relative">
+  <div class="bg">XXXX<br>XXXX<br>X</div>
+
+  <div class="clamp">
+    XXXX<br>
+    XXXX
+    <div class="child">
+      <span class="red">
+        XXXXXXXXXXXXX<br>
+        XXXXXXXXXXXXX
+      </span>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-022.html b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-022.html
new file mode 100644
index 00000000000..caa3489e6c5
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/block-ellipsis-022.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: line-clamp ellipsis</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#block-ellipsis">
+<link rel="match" href="reference/block-ellipsis-022-ref.html">
+<style>
+.clamp {
+  line-clamp: 2;
+  width: 29.1ch;
+  border: 1px solid black;
+  font-family: monospace;
+}
+.atomic {
+  display: inline-block;
+}
+</style>
+<div class="clamp">
+  There should be an ellipsis
+  at the end of this text line
+  <span class="atomic">hidden</span>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-002-crash.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-002-crash.html
new file mode 100644
index 00000000000..be5693c7045
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-002-crash.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: `line-clamp: auto` box containing float after margins should not crash</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://crbug.com/404288146">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<style>
+  .parent {
+    line-height: 1.2em;
+    line-clamp: auto;
+    max-height: 3lh;
+  }
+  .float {
+    float: left;
+  }
+  .margins {
+    margin-block-start: 1em;
+    margin-block-end: 1em;
+  }
+</style>
+<div class="parent">
+  <div class="margins">A</div>
+  <div>
+    <div class="float"></div>
+    B
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-009.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-009.tentative.html
index 44d111056c6..33d4a9abbae 100644
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-009.tentative.html
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-009.tentative.html
@@ -4,10 +4,10 @@
 <link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
 <link rel="match" href="reference/webkit-line-clamp-036-ref.html">
-<meta name="assert" content="text-overflow: ellipsis doesn't apply in a line-clamp: auto context">
+<meta name="assert" content="text-overflow: ellipsis does apply in a line-clamp: auto context">
 <style>
 .clamp {
-  width: 10ch;
+  width: 10.1ch;
   max-height: 80px;
   font: 16px / 32px monospace;
   background-color: yellow;
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-010.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-010.tentative.html
index cb706bba08e..6b69dc0030a 100644
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-010.tentative.html
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-010.tentative.html
@@ -4,10 +4,10 @@
 <link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
 <link rel="match" href="reference/webkit-line-clamp-037-ref.html">
-<meta name="assert" content="text-overflow: ellipsis doesn't apply in a line-clamp: auto context, even if it doesn't have a max-height">
+<meta name="assert" content="text-overflow: ellipsis does apply in a line-clamp: auto context, even if it doesn't have a max-height">
 <style>
 .clamp {
-  width: 150px;
+  width: 15.1ch;
   font: 16px / 32px monospace;
   background-color: yellow;
   padding: 4px;
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-025.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-025.tentative.html
deleted file mode 100644
index ab741d3df4d..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-025.tentative.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Overflow: abspos exactly at the clamp point is hidden</title>
-<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
-<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
-<meta name="assert" content="The chosen clamp point with line-clamp: auto is at the last line where the box size doesn't overflow. An immediately following box, even if it's an abspos that takes up no block size, should still be hidden.">
-<style>
-.clamp {
-  line-clamp: auto;
-  max-height: 4lh;
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  background-color: yellow;
-}
-.inner {
-  white-space: pre-wrap;
-}
-.abspos {
-  position: absolute;
-  width: 100px;
-  height: 100px;
-  background-color: skyblue;
-}
-</style>
-
-<div class="clamp">
-<div class="inner">Line 1
-Line 2
-Line 3
-Line 4
-</div>
-<div class="abspos"></div>
-<div class="inner">Line 5
-Line 6</div>
-</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-031.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-031.tentative.html
index a723430c83e..737caff7775 100644
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-031.tentative.html
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-auto-031.tentative.html
@@ -20,6 +20,9 @@
 .collapse-through {
   margin: 10px;
 }
+.rel {
+  position: relative;
+}
 .abspos {
   position: absolute;
   right: 0;
@@ -32,7 +35,8 @@
 <!--
   The bottom margin of the first `.inner` ends at the clamp boundary, and the
   bottom margin of `.collapse-through` ends after it. The clamp point therefore
-  is before `.collapse-through`, and so `.abpos` won't be visible.
+  is before `.collapse-through`, so `.rel` will be after the clamp point and
+  `.abpos` won't be visible.
 -->
 
 <div class="clamp">
@@ -41,7 +45,7 @@ Line 2
 Line 3
 Line 4</div>
 <div class="collapse-through"></div>
-<div class="abspos"></div>
+<div class="rel"><div class="abspos"></div></div>
 <div class="inner">Line 5
 Line 6
 Line 7
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-001.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-001.html
new file mode 100644
index 00000000000..fd261493f06
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-001.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block is outside the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-001-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block is the initial containing block, so the abspos gets shown.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp"><div class="abspos"></div>Line 1
+Line 2
+Line 3
+Line 4
+Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-001.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-001.tentative.html
deleted file mode 100644
index 79667f23fbd..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-001.tentative.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Overflow: abspos at the start of a line-clamp</title>
-<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
-<link rel="match" href="reference/line-clamp-with-abspos-001-ref.html">
-<meta name="assert" content="Absolute positioned boxes in an inline formatting context inside a line-clamp container are not hidden if they are in the box tree before the clamp point.">
-<style>
-.clamp {
-  line-clamp: 4;
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  white-space: pre;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  right: 0;
-  width: 50px;
-  height: 50px;
-  margin: 4px;
-  background-color: skyblue;
-}
-</style>
-<div class="clamp"><div class="abspos"></div>Line 1
-Line 2
-Line 3
-Line 4
-Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-002.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-002.html
new file mode 100644
index 00000000000..233a345c927
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-002.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block is outside the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-001-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block is the initial containing block, so the abspos gets shown.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+.pre {
+  white-space: pre;
+}
+</style>
+<div class="clamp">
+<div class="abspos"></div>
+<div class="pre">Line 1
+Line 2
+Line 3
+Line 4
+Line 5</div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-002.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-002.tentative.html
deleted file mode 100644
index cecb9d52bc6..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-002.tentative.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Overflow: abspos at the start of a line-clamp</title>
-<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
-<link rel="match" href="reference/line-clamp-with-abspos-001-ref.html">
-<meta name="assert" content="Absolute positioned boxes in a block formatting context inside a line-clamp container are not hidden if they are in the box tree before the clamp point.">
-<style>
-.clamp {
-  line-clamp: 4;
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  right: 0;
-  width: 50px;
-  height: 50px;
-  margin: 4px;
-  background-color: skyblue;
-}
-.pre {
-  white-space: pre;
-}
-</style>
-<div class="clamp">
-<div class="abspos"></div>
-<div class="pre">Line 1
-Line 2
-Line 3
-Line 4
-Line 5</div>
-</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-003.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-003.html
new file mode 100644
index 00000000000..8b5d681d97c
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-003.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block is outside the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-001-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block is the initial containing block, so the abspos gets shown, even if its static position is after the clamp point.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+Line 4
+<div class="abspos"></div>Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-003.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-003.tentative.html
deleted file mode 100644
index e4bd1de222e..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-003.tentative.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Overflow: abspos in line-clamp after clamp point</title>
-<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
-<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
-<meta name="assert" content="Absolute positioned boxes in an inline formatting context inside a line-clamp container are always hidden if they are in the box tree after the clamp point.">
-<style>
-.clamp {
-  line-clamp: 4;
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  white-space: pre;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  right: 0;
-  width: 50px;
-  height: 50px;
-  margin: 4px;
-  background-color: skyblue;
-}
-</style>
-<div class="clamp">Line 1
-Line 2
-Line 3
-Line 4
-<div class="abspos"></div>Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-004.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-004.html
new file mode 100644
index 00000000000..c079974ac5c
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-004.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block is outside the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-001-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block is the initial containing block, so the abspos gets shown, even if its static position is after the clamp point.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+.pre {
+  white-space: pre;
+}
+</style>
+<div class="clamp">
+<div class="pre">Line 1
+Line 2
+Line 3
+Line 4</div>
+<div class="abspos"></div>
+<div>Line 5</div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-004.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-004.tentative.html
deleted file mode 100644
index 483e6d1da6d..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-004.tentative.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Overflow: abspos in line-clamp after clamp point</title>
-<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
-<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
-<meta name="assert" content="Absolute positioned boxes in a block formatting context inside a line-clamp container are always hidden if they are in the box tree after the clamp point.">
-<style>
-.clamp {
-  line-clamp: 4;
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  right: 0;
-  width: 50px;
-  height: 50px;
-  margin: 4px;
-  background-color: skyblue;
-}
-.pre {
-  white-space: pre;
-}
-</style>
-<div class="clamp">
-<div class="pre">Line 1
-Line 2
-Line 3
-Line 4</div>
-<div class="abspos"></div>
-<div>Line 5</div>
-</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-005.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-005.html
new file mode 100644
index 00000000000..58656135cf0
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-005.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block is the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-005-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block is the line-clamp container, so the abspos gets shown.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp"><div class="abspos"></div>Line 1
+Line 2
+Line 3
+Line 4
+Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-005.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-005.tentative.html
deleted file mode 100644
index 3dc77831a06..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-005.tentative.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Overflow: abspos in line-clamp before clamp point which overflows</title>
-<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
-<link rel="match" href="reference/line-clamp-with-abspos-005-ref.html">
-<meta name="assert" content="Absolute positioned boxes in an inline formatting context inside a line-clamp container are not hidden if they are in the box tree before the clamp point, even if they visually extend beyond that point">
-<style>
-.clamp {
-  line-clamp: 4;
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  white-space: pre;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  right: 0;
-  width: 50px;
-  height: 50px;
-  margin: 4px;
-  background-color: skyblue;
-}
-</style>
-<div class="clamp">Line 1
-Line 2
-Line 3
-Line 4<div class="abspos"></div>
-Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-006.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-006.html
new file mode 100644
index 00000000000..39f1758fa18
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-006.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block is the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-005-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block is the line-clamp container, so the abspos gets shown.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+.pre {
+  white-space: pre;
+}
+</style>
+<div class="clamp">
+<div class="abspos"></div>
+<div class="pre">Line 1
+Line 2
+Line 3
+Line 4
+Line 5</div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-006.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-006.tentative.html
deleted file mode 100644
index f18fed6c2da..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-006.tentative.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Overflow: abspos in line-clamp before clamp point which overflows</title>
-<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
-<link rel="match" href="reference/line-clamp-with-abspos-006-ref.html">
-<meta name="assert" content="Absolute positioned boxes in a block formatting context inside a line-clamp container are not hidden if they are in the box tree before the clamp point, even if they visually extend beyond that point">
-<style>
-.clamp {
-  line-clamp: 4;
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  right: 0;
-  width: 50px;
-  height: 75px;
-  margin: 4px;
-  background-color: skyblue;
-}
-.pre {
-  white-space: pre;
-}
-</style>
-<div class="clamp">
-<div class="pre">Line 1
-Line 2
-Line 3</div>
-<div class="abspos"></div>
-<div class="pre">Line 4
-Line 5</div>
-</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-007.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-007.html
new file mode 100644
index 00000000000..f5b4e6ce291
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-007.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block is the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-005-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block is the line-clamp container, so the abspos gets shown, even if its static position is after the clamp point.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+Line 4
+<div class="abspos"></div>Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-007.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-007.tentative.html
deleted file mode 100644
index f0a1f58c8d3..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-007.tentative.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Overflow: abspos in line-clamp before clamp point positioned after it</title>
-<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
-<link rel="match" href="reference/line-clamp-with-abspos-007-ref.html">
-<meta name="assert" content="Absolute positioned boxes inside a line-clamp container are not hidden if they are in the box tree before the clamp point, even if they are positioned after that point">
-<style>
-.clamp {
-  line-clamp: 4;
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  white-space: pre;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  top: 148px;
-  right: 0;
-  width: 50px;
-  height: 50px;
-  margin: 4px;
-  background-color: skyblue;
-}
-</style>
-<div class="clamp"><div class="abspos"></div>Line 1
-Line 2
-Line 3
-Line 4
-Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-008.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-008.html
new file mode 100644
index 00000000000..cd619d51538
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-008.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block is the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-005-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block is the line-clamp container, so the abspos gets shown, even if its static position is after the clamp point.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+.pre {
+  white-space: pre;
+}
+</style>
+<div class="clamp">
+<div class="pre">Line 1
+Line 2
+Line 3
+Line 4</div>
+<div class="abspos"></div>
+<div>Line 5</div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-008.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-008.tentative.html
deleted file mode 100644
index 9c62e44f389..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-008.tentative.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Overflow: bottom: 0 abspos in line-clamp before clamp point</title>
-<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
-<link rel="match" href="reference/line-clamp-with-abspos-008-ref.html">
-<meta name="assert" content="Absolute positioned boxes inside a line-clamp container are not hidden if they are in the box tree before the clamp point.">
-<style>
-.clamp {
-  line-clamp: 4;
-  position: relative;
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  white-space: pre;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  bottom: 0;
-  right: 0;
-  width: 50px;
-  height: 50px;
-  margin: 4px;
-  background-color: skyblue;
-}
-</style>
-<div class="clamp"><div class="abspos"></div>Line 1
-Line 2
-Line 3
-Line 4
-Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-009.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-009.html
new file mode 100644
index 00000000000..b3d332811d6
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-009.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block is fully before the clamp point gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-009-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block is fully before the clamp point, so the abspos gets painted.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.rel {
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+<div class="rel"><div class="abspos"></div>Line 2
+Line 3</div>Line 4
+Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-009.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-009.tentative.html
deleted file mode 100644
index dce04d720cf..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-009.tentative.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Overflow: abspos in line-clamp after clamp point positioned before it</title>
-<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
-<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
-<meta name="assert" content="Absolute positioned boxes inside a line-clamp container are hidden if they are in the box tree after the clamp point, even if they are positioned before that point">
-<style>
-.clamp {
-  line-clamp: 4;
-  position: relative;
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  white-space: pre;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 50px;
-  height: 50px;
-  margin: 4px;
-  background-color: skyblue;
-}
-</style>
-<div class="clamp">Line 1
-Line 2
-Line 3
-Line 4
-Line 5<div class="abspos"></div></div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-010.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-010.html
new file mode 100644
index 00000000000..8a7c2790d6c
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-010.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block is fully before the clamp point gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-009-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block is fully before the clamp point, so the abspos gets painted.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.rel {
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">
+  <div>Line 1</div>
+  <div class="rel">
+    <div class="abspos"></div>
+    <div>Line 2</div>
+    <div>Line 3</div>
+  </div>
+  <div>Line 4</div>
+  <div>Line 5</div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-010.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-010.tentative.html
deleted file mode 100644
index 325278b3a0b..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-010.tentative.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Overflow: line-clamp doesn't propagate to abspos</title>
-<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
-<link rel="match" href="reference/line-clamp-with-abspos-010-ref.html">
-<meta name="assert" content="Absolute positioned boxes create a new BFC, and line-clamp does not propagate into independent BFCs">
-<style>
-.clamp {
-  line-clamp: 4;
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  white-space: pre;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  right: 0;
-  margin: 4px;
-  white-space: pre;
-  background-color: skyblue;
-}
-</style>
-<div class="clamp">Line 1
-Line 2
-Line 3
-Line 4<div class="abspos">Line A
-Line B
-Line C
-Line D
-Line E</div>
-Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-011.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-011.html
new file mode 100644
index 00000000000..cb4ab051480
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-011.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block is fully after the clamp point is hidden</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block is fully after the clamp point, so the abspos is hidden.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.rel {
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+Line 4
+<div class="rel"><div class="abspos"></div>Line 5
+Line 6</div></div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-011.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-011.tentative.html
deleted file mode 100644
index ab5102a7cf2..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-011.tentative.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Overflow: line-clamp hidden abspos should count as ink overflow</title>
-<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
-<link rel="match" href="reference/line-clamp-with-abspos-011-ref.html">
-<meta name="assert" content="Any overflowing content hidden from paint by line-clamp is treated as ink overflow, including absolute positioned boxes, and therefore doesn't cause the scrollable overflow rectangle to grow. Meanwhile, non-hidden abspos count as scrollable overflow.">
-<style>
-#scrollContainer {
-  overflow: scroll;
-  position: relative;
-  font: 16px / 32px serif;
-  height: 4lh;
-  border: 1px solid black;
-}
-.clamp {
-  line-clamp: 4;
-  padding: 0 4px;
-  white-space: pre;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  right: 0;
-  width: 50px;
-  height: 50px;
-  margin: 4px;
-  background-color: skyblue;
-}
-#abspos1 {
-  top: 4.5lh;
-}
-#abspos2 {
-  top: 6lh;
-}
-</style>
-
-<div id="scrollContainer">
-<div class="clamp">Line 1
-Line 2
-Line 3
-Line 4<div class="abspos" id="abspos1"></div>
-Line 5
-Line 6<div class="abspos" id="abspos2"></div></div>
-</div>
-
-<script>
-  window.addEventListener("load", () => {
-    const scrollContainer = document.getElementById("scrollContainer");
-    scrollContainer.scrollTop = scrollContainer.scrollHeight;
-  });
-</script>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-012.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-012.html
new file mode 100644
index 00000000000..ae2f0364f39
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-012.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block is fully after the clamp point gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block is fully after the clamp point, so the abspos is hidden.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.rel {
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">
+  <div>Line 1</div>
+    <div>Line 2</div>
+    <div>Line 3</div>
+    <div>Line 4</div>
+    <div class="rel">
+      <div class="abspos"></div>
+      <div>Line 5</div>
+      <div>Line 6</div>
+    </div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-012.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-012.tentative.html
deleted file mode 100644
index bed065f3838..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-012.tentative.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Overflow: line-clamp: auto hidden block-level abspos</title>
-<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
-<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
-<meta name="assert" content="Block-level abspos should still be hidden if it is after the clamp point with line-clamp: auto">
-<style>
-.clamp {
-  line-clamp: auto;
-  max-height: 4lh;
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  background-color: yellow;
-}
-.inner {
-  white-space: pre;
-}
-.abspos {
-  position: absolute;
-  width: 100px;
-  height: 100px;
-  background-color: skyblue;
-}
-</style>
-
-<div class="clamp">
-<div class="inner">Line 1
-Line 2
-Line 3
-Line 4
-Line 5</div>
-<div class="inner">Line 6</div>
-<div class="abspos"></div>
-</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-013.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-013.html
new file mode 100644
index 00000000000..66a615ddd1c
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-013.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block contains the clamp point gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-013-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block contains the clamp point, so the abspos gets painted, even if its static position is after the clamp point.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.rel {
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+<div class="rel">Line 4
+Line 5<div class="abspos"></div></div></div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-013.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-013.tentative.html
deleted file mode 100644
index ccea125f724..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-013.tentative.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Overflow: line-clamp: auto hidden block-level abspos</title>
-<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
-<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
-<meta name="assert" content="Block-level abspos should still be hidden if it is after the clamp point with line-clamp: auto, even if it lies on the boundary because the automatic size of previous boxes was adjusted.">
-<style>
-.clamp {
-  line-clamp: auto;
-  max-height: 4lh;
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  background-color: yellow;
-}
-.inner {
-  white-space: pre;
-}
-.abspos {
-  position: absolute;
-  width: 100px;
-  height: 100px;
-  background-color: skyblue;
-}
-</style>
-
-<div class="clamp">
-<div class="inner">Line 1
-Line 2
-Line 3
-Line 4
-Line 5
-Line 6
-</div>
-<div class="abspos"></div>
-</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-014.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-014.html
new file mode 100644
index 00000000000..e8257d1d402
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-014.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block contains the clamp point gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-013-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block contains the clamp point, so the abspos gets painted, even if its static position is after the clamp point.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.rel {
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">
+  <div>Line 1</div>
+  <div>Line 2</div>
+  <div>Line 3</div>
+  <div class="rel">
+    <div>Line 4</div>
+    <div>Line 5</div>
+    <div class="abspos"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-014.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-014.tentative.html
deleted file mode 100644
index ea2f5312070..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-014.tentative.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Overflow: abspos in line-clamp after clamp point</title>
-<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
-<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
-<meta name="assert" content="Absolute positioned boxes in an inline formatting context inside a line-clamp container are always hidden if they are in the box tree after the clamp point. This test specifically tests that this is the case even when they don't have a set height.">
-<style>
-.clamp {
-  line-clamp: 4;
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  white-space: pre;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  right: 0;
-  width: 100px;
-  /* No height! */
-  margin: 4px;
-  white-space: normal;
-  background-color: red;
-}
-</style>
-<div class="clamp">Line 1
-Line 2
-Line 3
-Line 4
-<div class="abspos">This abspos shouldn't be visible</div>Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-015.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-015.html
new file mode 100644
index 00000000000..273610e071d
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-015.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block is an inline fully after the clamp point is hidden</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block is fully after the clamp point, so the abspos is hidden. This happens even when the containing block is an inline.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.rel {
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+Line 4
+<span class="rel"><div class="abspos"></div>Line 5</span></div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-016.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-016.html
new file mode 100644
index 00000000000..0b329a7d734
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-016.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block is an inline that contains the clamp point gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-016-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block contains the clamp point, so the abspos gets painted. This happens even when the containing block is an inline, and even when the static position of the abspos is after the clamp point.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.rel {
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+<span class="rel">Line 4
+<div class="abspos"></div>Line 5</span></div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-017.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-017.tentative.html
new file mode 100644
index 00000000000..8ae9cc949c6
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-017.tentative.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos whose containing block is an inline that gets displaced by the ellipsis</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/webkit-line-clamp-030-ref.html">
+<meta name="assert" content="Absolute positioned boxes in a line-clamp container are hidden if and only if their containing block precedes or contains the clamp point. In this case, the containing block is an inline whose start gets displaced by the ellipsis. Therefore, it counts as being all after the clamp point, and the abspos is hidden.">
+<style>
+.clamp {
+  line-clamp: 3;
+  background-color: yellow;
+}
+.child {
+  font: 16px / 32px monospace;
+  white-space: pre;
+  width: 7.1ch;
+}
+.rel {
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">
+<div class="child">Line 1
+Line 2
+Line 3 <span class="rel">hidden
+fdgdgjldsfg
+<div class="abspos"></div></span></div>
+</div>
+<p>Following content.</p>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-018.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-018.html
new file mode 100644
index 00000000000..27139b18b8d
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-018.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: line-clamp doesn't propagate to abspos</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-018-ref.html">
+<meta name="assert" content="Absolute positioned boxes create a new BFC, and line-clamp does not propagate into independent BFCs">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.abspos {
+  position: absolute;
+  right: 0;
+  margin: 4px;
+  white-space: pre;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+Line 4<div class="abspos">Line A
+Line B
+Line C
+Line D
+Line E</div>
+Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-019.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-019.html
new file mode 100644
index 00000000000..237ed69b67d
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-019.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: line-clamp hidden abspos should count as ink overflow</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-019-ref.html">
+<meta name="assert" content="Any overflowing content hidden from paint by line-clamp is treated as ink overflow, including absolute positioned boxes, and therefore doesn't cause the scrollable overflow rectangle to grow. Meanwhile, non-hidden abspos count as scrollable overflow.">
+<style>
+#scrollContainer {
+  overflow: scroll;
+  position: relative;
+  font: 16px / 32px serif;
+  height: 4lh;
+  border: 1px solid black;
+}
+.clamp {
+  line-clamp: 4;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.abspos {
+  position: absolute;
+  right: 0;
+  width: 50px;
+  height: 50px;
+  margin: 4px;
+  background-color: skyblue;
+}
+.rel {
+  position: relative;
+}
+#abspos1 {
+  top: 1lh;
+}
+#abspos2 {
+  top: 2lh;
+}
+</style>
+
+<div id="scrollContainer">
+  <div class="clamp">
+    <div>Line 1</div>
+    <div>Line 2</div>
+    <div>Line 3</div>
+    <div class="rel">Line 4<div class="abspos" id="abspos1"></div></div>
+    <div>Line 5</div>
+    <div class="rel">Line 6<div class="abspos" id="abspos2"></div></div>
+  </div>
+</div>
+
+<script>
+  window.addEventListener("load", () => {
+    const scrollContainer = document.getElementById("scrollContainer");
+    scrollContainer.scrollTop = scrollContainer.scrollHeight;
+  });
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-020.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-020.html
new file mode 100644
index 00000000000..55fb07c2061
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-020.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: line-clamp: auto hidden block-level abspos</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
+<meta name="assert" content="Block-level abspos should be hidden if its containing block is after the clamp point with line-clamp: auto">
+<style>
+.clamp {
+  line-clamp: auto;
+  max-height: 4lh;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.rel {
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  width: 100px;
+  height: 100px;
+  background-color: skyblue;
+}
+</style>
+
+<div class="clamp">
+  <div>Line 1</div>
+  <div>Line 2</div>
+  <div>Line 3</div>
+  <div>Line 4</div>
+  <div>Line 5</div>
+  <div class="rel">
+    <div>Line 6</div>
+    <div class="abspos"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-021.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-021.html
new file mode 100644
index 00000000000..21a0e96eee3
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-021.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: line-clamp: auto hidden block-level abspos</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
+<meta name="assert" content="Block-level abspos should still be hidden if its containing block is after the clamp point with line-clamp: auto, even if it lies on the boundary because the automatic size of previous boxes was adjusted.">
+<style>
+.clamp {
+  line-clamp: auto;
+  max-height: 4lh;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.inner {
+  white-space: pre;
+}
+.rel {
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  width: 100px;
+  height: 100px;
+  background-color: skyblue;
+}
+</style>
+
+<div class="clamp">
+<div class="inner">Line 1
+Line 2
+Line 3
+Line 4
+Line 5
+Line 6</div>
+<div class="rel"><div class="abspos"></div></div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-022.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-022.html
new file mode 100644
index 00000000000..6599365883b
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-abspos-022.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: abspos in line-clamp after clamp point</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
+<meta name="assert" content="Absolute positioned boxes inside a line-clamp container are always hidden if their containing block is after the clamp point. This test specifically tests that this is the case even when they don't have a set height.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.rel {
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  right: 0;
+  width: 100px;
+  /* No height! */
+  margin: 4px;
+  white-space: normal;
+  background-color: red;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+Line 4
+<div class="rel"><div class="abspos">This abspos shouldn't be visible</div>Line 5</div></div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-001.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-001.html
new file mode 100644
index 00000000000..7f69c970baa
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-001.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: fixed pos whose containing block is outside the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-001-ref.html">
+<meta name="assert" content="Fixed positioned boxes in a line-clamp container are hidden if and only if their fixed positioning containing block precedes or contains the clamp point. In this case, the containing block is the layout viewport, so the fixed-pos gets shown.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.fixed {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp"><div class="fixed"></div>Line 1
+Line 2
+Line 3
+Line 4
+Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-002.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-002.html
new file mode 100644
index 00000000000..90eecbd6af6
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-002.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: fixed pos whose containing block is outside the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-001-ref.html">
+<meta name="assert" content="Fixed positioned boxes in a line-clamp container are hidden if and only if their fixed positioning containing block precedes or contains the clamp point. In this case, the containing block is the layout viewport, so the fixed-pos gets shown.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.fixed {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+.pre {
+  white-space: pre;
+}
+</style>
+<div class="clamp">
+<div class="fixed"></div>
+<div class="pre">Line 1
+Line 2
+Line 3
+Line 4
+Line 5</div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-003.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-003.html
new file mode 100644
index 00000000000..c4bc8a64784
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-003.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: fixed pos whose containing block is outside the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-001-ref.html">
+<meta name="assert" content="Fixed positioned boxes in a line-clamp container are hidden if and only if their fixed positioning containing block precedes or contains the clamp point. In this case, the containing block is the layout viewport, so the fixed-pos gets shown, even if its static position is after the clamp point.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.fixed {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+Line 4
+<div class="fixed"></div>Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-004.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-004.html
new file mode 100644
index 00000000000..673b7d8c9d8
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-004.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: fixed pos whose containing block is outside the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-001-ref.html">
+<meta name="assert" content="Fixed positioned boxes in a line-clamp container are hidden if and only if their fixed positioning containing block precedes or contains the clamp point. In this case, the containing block is the layout viewport, so the fixed-pos gets shown, even if its static position is after the clamp point.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.fixed {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+.pre {
+  white-space: pre;
+}
+</style>
+<div class="clamp">
+<div class="pre">Line 1
+Line 2
+Line 3
+Line 4</div>
+<div class="fixed"></div>
+<div>Line 5</div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-005.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-005.html
new file mode 100644
index 00000000000..22cf7e0c132
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-005.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: fixed pos whose containing block is the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-005-ref.html">
+<meta name="assert" content="Fixed positioned boxes in a line-clamp container are hidden if and only if their fixed positioning containing block precedes or contains the clamp point. In this case, the containing block is the line-clamp container, so the fixed-pos gets shown.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+  transform: scale(1); /* Makes it a fixed-pos containing block */
+}
+.fixed {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp"><div class="fixed"></div>Line 1
+Line 2
+Line 3
+Line 4
+Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-006.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-006.html
new file mode 100644
index 00000000000..46f2e0b2b39
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-006.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: fixed pos whose containing block is the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-005-ref.html">
+<meta name="assert" content="Fixed positioned boxes in a line-clamp container are hidden if and only if their fixed positioning containing block precedes or contains the clamp point. In this case, the containing block is the line-clamp container, so the fixed-pos gets shown.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+  transform: scale(1); /* Makes it a fixed-pos containing block */
+}
+.fixed {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+.pre {
+  white-space: pre;
+}
+</style>
+<div class="clamp">
+<div class="fixed"></div>
+<div class="pre">Line 1
+Line 2
+Line 3
+Line 4
+Line 5</div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-007.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-007.html
new file mode 100644
index 00000000000..0197ecb6d4a
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-007.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: fixed pos whose containing block is the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-005-ref.html">
+<meta name="assert" content="Fixed positioned boxes in a line-clamp container are hidden if and only if their fixed positioning containing block precedes or contains the clamp point. In this case, the containing block is the line-clamp container, so the fixed-pos gets shown, even if its static position is after the clamp point.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+  transform: scale(1); /* Makes it a fixed-pos containing block */
+}
+.fixed {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+Line 4
+<div class="fixed"></div>Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-008.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-008.html
new file mode 100644
index 00000000000..b14856a417f
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-008.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: fixed pos whose containing block is the line-clamp container gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-005-ref.html">
+<meta name="assert" content="Fixed positioned boxes in a line-clamp container are hidden if and only if their fixed positioning containing block precedes or contains the clamp point. In this case, the containing block is the line-clamp container, so the fixed-pos gets shown, even if its static position is after the clamp point.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+  transform: scale(1); /* Makes it a fixed-pos containing block */
+}
+.fixed {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+.pre {
+  white-space: pre;
+}
+</style>
+<div class="clamp">
+<div class="pre">Line 1
+Line 2
+Line 3
+Line 4</div>
+<div class="fixed"></div>
+<div>Line 5</div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-009.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-009.html
new file mode 100644
index 00000000000..93faeed3bb1
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-009.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: fixed pos whose containing block is fully before the clamp point gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-009-ref.html">
+<meta name="assert" content="Fixed positioned boxes in a line-clamp container are hidden if and only if their fixed positioning containing block precedes or contains the clamp point. In this case, the containing block is fully before the clamp point, so the fixed-pos gets painted.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.transformed {
+  transform: scale(1); /* Makes it a fixed-pos containing block */
+}
+.fixed {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+<div class="transformed"><div class="fixed"></div>Line 2
+Line 3</div>Line 4
+Line 5</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-010.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-010.html
new file mode 100644
index 00000000000..8bd64fee615
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-010.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: fixed pos whose containing block is fully before the clamp point gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-009-ref.html">
+<meta name="assert" content="Fixed positioned boxes in a line-clamp container are hidden if and only if their fixed positioning containing block precedes or contains the clamp point. In this case, the containing block is fully before the clamp point, so the fixed-pos gets painted.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.transformed {
+  transform: scale(1); /* Makes it a fixed-pos containing block */
+}
+.fixed {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">
+  <div>Line 1</div>
+  <div class="transformed">
+    <div class="fixed"></div>
+    <div>Line 2</div>
+    <div>Line 3</div>
+  </div>
+  <div>Line 4</div>
+  <div>Line 5</div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-011.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-011.html
new file mode 100644
index 00000000000..70273b36cda
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-011.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: fixed pos whose containing block is fully after the clamp point is hidden</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
+<meta name="assert" content="Fixed positioned boxes in a line-clamp container are hidden if and only if their fixed positioning containing block precedes or contains the clamp point. In this case, the containing block is fully after the clamp point, so the fixed-pos is hidden.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.transformed {
+  transform: scale(1); /* Makes it a fixed-pos containing block */
+}
+.fixed {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+Line 4
+<div class="transformed"><div class="fixed"></div>Line 5
+Line 6</div></div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-012.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-012.html
new file mode 100644
index 00000000000..0e5584db10b
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-012.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: fixed pos whose containing block is fully after the clamp point gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
+<meta name="assert" content="Fixed positioned boxes in a line-clamp container are hidden if and only if their fixed positioning containing block precedes or contains the clamp point. In this case, the containing block is fully after the clamp point, so the fixed-pos is hidden.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.transformed {
+  transform: scale(1); /* Makes it a fixed-pos containing block */
+}
+.fixed {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">
+  <div>Line 1</div>
+    <div>Line 2</div>
+    <div>Line 3</div>
+    <div>Line 4</div>
+    <div class="transformed">
+      <div class="fixed"></div>
+      <div>Line 5</div>
+      <div>Line 6</div>
+    </div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-013.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-013.html
new file mode 100644
index 00000000000..580619be41e
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-013.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: fixed pos whose containing block contains the clamp point gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-013-ref.html">
+<meta name="assert" content="Fixed positioned boxes in a line-clamp container are hidden if and only if their fixed positioning containing block precedes or contains the clamp point. In this case, the containing block contains the clamp point, so the fixed-pos gets painted, even if its static position is after the clamp point.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.transformed {
+  transform: scale(1); /* Makes it a fixed-pos containing block */
+}
+.fixed {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+<div class="transformed">Line 4
+Line 5<div class="fixed"></div></div></div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-014.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-014.html
new file mode 100644
index 00000000000..371fb595702
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-014.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: fixed pos whose containing block contains the clamp point gets painted</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/line-clamp-with-abspos-013-ref.html">
+<meta name="assert" content="Fixed positioned boxes in a line-clamp container are hidden if and only if their fixed positioning containing block precedes or contains the clamp point. In this case, the containing block contains the clamp point, so the fixed-pos gets painted, even if its static position is after the clamp point.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.transformed {
+  transform: scale(1); /* Makes it a fixed-pos containing block */
+}
+.fixed {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">
+  <div>Line 1</div>
+  <div>Line 2</div>
+  <div>Line 3</div>
+  <div class="transformed">
+    <div>Line 4</div>
+    <div>Line 5</div>
+    <div class="fixed"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-015.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-015.html
new file mode 100644
index 00000000000..a458c11c04e
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-015.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: line-clamp: auto hidden block-level fixed pos</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
+<meta name="assert" content="Block-level fixed-pos should be hidden if its fixed positioning containing block is after the clamp point with line-clamp: auto">
+<style>
+.clamp {
+  line-clamp: auto;
+  max-height: 4lh;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.transformed {
+  transform: scale(1); /* Makes it a fixed-pos containing block */
+}
+.fixed {
+  position: fixed;
+  width: 100px;
+  height: 100px;
+  background-color: skyblue;
+}
+</style>
+
+<div class="clamp">
+  <div>Line 1</div>
+  <div>Line 2</div>
+  <div>Line 3</div>
+  <div>Line 4</div>
+  <div>Line 5</div>
+  <div class="transformed">
+    <div>Line 6</div>
+    <div class="fixed"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-016.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-016.html
new file mode 100644
index 00000000000..07a6f4e4f0d
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-016.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: line-clamp: auto hidden block-level fixed pos</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
+<meta name="assert" content="Block-level fixed-pos should still be hidden if its fixed positioning containing block is after the clamp point with line-clamp: auto, even if it lies on the boundary because the automatic size of previous boxes was adjusted.">
+<style>
+.clamp {
+  line-clamp: auto;
+  max-height: 4lh;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  background-color: yellow;
+}
+.inner {
+  white-space: pre;
+}
+.transformed {
+  transform: scale(1); /* Makes it a fixed-pos containing block */
+}
+.fixed {
+  position: fixed;
+  width: 100px;
+  height: 100px;
+  background-color: skyblue;
+}
+</style>
+
+<div class="clamp">
+<div class="inner">Line 1
+Line 2
+Line 3
+Line 4
+Line 5
+Line 6</div>
+<div class="transformed"><div class="fixed"></div></div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-017.html b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-017.html
new file mode 100644
index 00000000000..97c77429ee4
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/line-clamp-with-fixed-pos-017.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: fixed pos in line-clamp after clamp point</title>
+<link rel="author" title="Andreu Botella" href="mailto:abotella@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#line-clamp">
+<link rel="match" href="reference/webkit-line-clamp-005-ref.html">
+<meta name="assert" content="Fixed positioned boxes inside a line-clamp container are always hidden if their fixed positioning containing block is after the clamp point. This test specifically tests that this is the case even when they don't have a set height.">
+<style>
+.clamp {
+  line-clamp: 4;
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.transformed {
+  transform: scale(1); /* Makes it a fixed-pos containing block */
+}
+.fixed {
+  position: fixed;
+  right: 0;
+  width: 100px;
+  /* No height! */
+  margin: 4px;
+  white-space: normal;
+  background-color: red;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+Line 4
+<div class="transformed"><div class="fixed">This fixed pos shouldn't be visible</div>Line 5</div></div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-011-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-011-ref.html
new file mode 100644
index 00000000000..379cf974f64
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-011-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+.clamp {
+  width: 31.1ch;
+  border: 1px solid black;
+  font-family: monospace;
+}
+</style>
+<div class="clamp">
+  There should not be an ellipsis
+  at the end of this line of text
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-012-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-012-ref.html
new file mode 100644
index 00000000000..7f9c44293e8
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-012-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+.clamp {
+  width: 38.1ch;
+  border: 1px solid black;
+  font-family: monospace;
+}
+</style>
+<div class="clamp">
+  This line should have an ellipsis…
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-014-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-014-ref.html
new file mode 100644
index 00000000000..d135a74cfad
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-014-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+.clamp {
+  width: 63.1ch;
+  border: 1px solid black;
+  font-family: monospace;
+  white-space: pre
+}
+</style>
+<div class="clamp">This time, Mark, who had always been the center of attention in
+any social gathering, walked into the room uncharacteristi-…</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-015-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-015-ref.html
new file mode 100644
index 00000000000..baa8dd1a8d7
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-015-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+.clamp {
+  width: 63.1ch;
+  border: 1px solid black;
+  font-family: monospace;
+  white-space: pre
+}
+</style>
+<div class="clamp">This time, Mark, who had always been the center of attention in
+any social gathering, walked into the room uncharacteristi…</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-017-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-017-ref.html
new file mode 100644
index 00000000000..7a801508e2e
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-017-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+.clamp {
+  width: 63.1ch;
+  border: 1px solid black;
+  font-family: monospace;
+  white-space: pre
+}
+</style>
+<div class="clamp">This time, Mark, who had always been the center of attention in
+any social gathering, walked into the room uncharacteristicall…</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-022-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-022-ref.html
new file mode 100644
index 00000000000..1e89789852b
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/block-ellipsis-022-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+.clamp {
+  width: 29.1ch;
+  border: 1px solid black;
+  font-family: monospace;
+  white-space: pre
+}
+</style>
+<div class="clamp">There should be an ellipsis
+at the end of this text line…</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-001-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-001-ref.html
index d756162dde0..ffa463369c1 100644
--- a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-001-ref.html
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-001-ref.html
@@ -10,10 +10,10 @@
 }
 .abspos {
   position: absolute;
-  right: 0;
-  width: 50px;
-  height: 50px;
-  margin: 4px;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
   background-color: skyblue;
 }
 </style>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-005-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-005-ref.html
index 3b1f9218e88..9825838e7b4 100644
--- a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-005-ref.html
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-005-ref.html
@@ -7,17 +7,18 @@
   padding: 0 4px;
   white-space: pre;
   background-color: yellow;
+  position: relative;
 }
 .abspos {
   position: absolute;
-  right: 0;
-  width: 50px;
-  height: 50px;
-  margin: 4px;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
   background-color: skyblue;
 }
 </style>
-<div class="clamp">Line 1
+<div class="clamp"><div class="abspos"></div>Line 1
 Line 2
 Line 3
-Line 4…<div class="abspos"></div></div>
+Line 4…</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-006-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-006-ref.html
deleted file mode 100644
index 4b55c37a033..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-006-ref.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Reference</title>
-<style>
-.clamp {
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  right: 0;
-  width: 50px;
-  height: 75px;
-  margin: 4px;
-  background-color: skyblue;
-}
-.pre {
-  white-space: pre;
-}
-</style>
-<div class="clamp">
-<div class="pre">Line 1
-Line 2
-Line 3</div>
-<div class="abspos"></div>
-<div class="pre">Line 4…</div>
-</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-007-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-007-ref.html
deleted file mode 100644
index e3dcc696e39..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-007-ref.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Reference</title>
-<style>
-.clamp {
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  white-space: pre;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  top: 148px;
-  right: 0;
-  width: 50px;
-  height: 50px;
-  margin: 4px;
-  background-color: skyblue;
-}
-</style>
-<div class="clamp"><div class="abspos"></div>Line 1
-Line 2
-Line 3
-Line 4…</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-008-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-008-ref.html
deleted file mode 100644
index 373b2755c1d..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-008-ref.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Reference</title>
-<style>
-.clamp {
-  position: relative;
-  font: 16px / 32px serif;
-  padding: 0 4px;
-  white-space: pre;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  bottom: 0;
-  right: 0;
-  width: 50px;
-  height: 50px;
-  margin: 4px;
-  background-color: skyblue;
-}
-</style>
-<div class="clamp"><div class="abspos"></div>Line 1
-Line 2
-Line 3
-Line 4…</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-009-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-009-ref.html
new file mode 100644
index 00000000000..cc3a43df238
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-009-ref.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+.clamp {
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.rel {
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+<div class="rel"><div class="abspos"></div>Line 2
+Line 3</div>Line 4…</div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-011-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-011-ref.html
deleted file mode 100644
index f08b0270e8d..00000000000
--- a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-011-ref.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Reference</title>
-<style>
-#scrollContainer {
-  overflow: scroll;
-  position: relative;
-  font: 16px / 32px serif;
-  height: 4lh;
-  border: 1px solid black;
-}
-.clamp {
-  padding: 0 4px;
-  white-space: pre;
-  background-color: yellow;
-}
-.abspos {
-  position: absolute;
-  top: 4.5lh;
-  right: 0;
-  width: 50px;
-  height: 50px;
-  margin: 4px;
-  background-color: skyblue;
-}
-</style>
-
-<div id="scrollContainer">
-<div class="clamp">Line 1
-Line 2
-Line 3
-Line 4…<div class="abspos"></div></div>
-
-<script>
-  window.addEventListener("load", () => {
-    const scrollContainer = document.getElementById("scrollContainer");
-    scrollContainer.scrollTop = scrollContainer.scrollHeight;
-  });
-</script>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-013-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-013-ref.html
new file mode 100644
index 00000000000..cae83ecc37c
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-013-ref.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+.clamp {
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.rel {
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+<div class="rel"><div class="abspos"></div>Line 4…</div></div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-016-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-016-ref.html
new file mode 100644
index 00000000000..3c8011394d2
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-016-ref.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+.clamp {
+  font: 16px / 32px serif;
+  padding: 0 4px;
+  white-space: pre;
+  background-color: yellow;
+}
+.rel {
+  position: relative;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: skyblue;
+}
+</style>
+<div class="clamp">Line 1
+Line 2
+Line 3
+<span class="rel"><div class="abspos"></div>Line 4…</span></div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-010-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-018-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-010-ref.html
rename to tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-018-ref.html
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-019-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-019-ref.html
new file mode 100644
index 00000000000..f97a9725325
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/line-clamp-with-abspos-019-ref.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+#scrollContainer {
+  overflow: scroll;
+  position: relative;
+  font: 16px / 32px serif;
+  height: 4lh;
+  border: 1px solid black;
+}
+.clamp {
+  padding: 0 4px;
+  background-color: yellow;
+}
+.abspos {
+  position: absolute;
+  top: 1lh;
+  right: 0;
+  width: 50px;
+  height: 50px;
+  margin: 4px;
+  background-color: skyblue;
+}
+.rel {
+  position: relative;
+}
+</style>
+
+<div id="scrollContainer">
+  <div class="clamp">
+    <div>Line 1</div>
+    <div>Line 2</div>
+    <div>Line 3</div>
+    <div class="rel">Line 4…<div class="abspos"></div></div>
+  </div>
+</div>
+
+<script>
+  window.addEventListener("load", () => {
+    const scrollContainer = document.getElementById("scrollContainer");
+    scrollContainer.scrollTop = scrollContainer.scrollHeight;
+  });
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/webkit-line-clamp-036-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/webkit-line-clamp-036-ref.html
index 0de35e98ab3..321cce96bb3 100644
--- a/tests/wpt/tests/css/css-overflow/line-clamp/reference/webkit-line-clamp-036-ref.html
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/webkit-line-clamp-036-ref.html
@@ -4,7 +4,7 @@
 .clamp {
   display: -webkit-box;
   -webkit-box-orient: vertical;
-  width: 10ch;
+  width: 10.1ch;
   font: 16px / 32px monospace;
   background-color: yellow;
   padding: 4px;
@@ -12,6 +12,6 @@
 }
 </style>
 <div class="clamp">
-  supercalifragilisticexpialidocious
   supercali…
+  …
 </div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/reference/webkit-line-clamp-037-ref.html b/tests/wpt/tests/css/css-overflow/line-clamp/reference/webkit-line-clamp-037-ref.html
index 2927716d76d..c5050d5d414 100644
--- a/tests/wpt/tests/css/css-overflow/line-clamp/reference/webkit-line-clamp-037-ref.html
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/reference/webkit-line-clamp-037-ref.html
@@ -4,7 +4,7 @@
 .clamp {
   display: -webkit-box;
   -webkit-box-orient: vertical;
-  width: 150px;
+  width: 15.1ch;
   font: 16px / 32px monospace;
   background-color: yellow;
   padding: 4px;
@@ -12,6 +12,6 @@
 }
 </style>
 <div class="clamp">
-  supercalifragilisticexpialidocious
-  supercalifragilisticexpialidocious
+  supercalifragi…
+  supercalifragi…
 </div>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-036.html b/tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-036.html
index b8d7b194f05..437a93a711d 100644
--- a/tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-036.html
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-036.html
@@ -2,13 +2,13 @@
 <meta charset="utf-8">
 <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#webkit-line-clamp">
 <link rel="match" href="reference/webkit-line-clamp-036-ref.html">
-<meta name="assert" content="text-overflow: ellipsis shouldn't apply within a -webkit-line-clamp context.">
+<meta name="assert" content="text-overflow: ellipsis does apply within a -webkit-line-clamp context.">
 <style>
 .clamp {
   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
-  width: 10ch;
+  width: 10.1ch;
   font: 16px / 32px monospace;
   background-color: yellow;
   padding: 4px;
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-037.html b/tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-037.html
index 86015228f88..70c33f75d11 100644
--- a/tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-037.html
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-037.html
@@ -2,13 +2,13 @@
 <meta charset="utf-8">
 <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#webkit-line-clamp">
 <link rel="match" href="reference/webkit-line-clamp-037-ref.html">
-<meta name="assert" content="text-overflow: ellipsis shouldn't apply within a -webkit-line-clamp context.">
+<meta name="assert" content="text-overflow: ellipsis should apply within a -webkit-line-clamp context.">
 <style>
 .clamp {
   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
-  width: 150px;
+  width: 15.1ch;
   font: 16px / 32px monospace;
   background-color: yellow;
   padding: 4px;
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-abspos-001.tentative.html b/tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-abspos-001.html
similarity index 100%
rename from tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-abspos-001.tentative.html
rename to tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-abspos-001.html
diff --git a/tests/wpt/tests/css/css-overflow/nested-scroll-markers-under-content-visibility-auto-ref.html b/tests/wpt/tests/css/css-overflow/nested-scroll-markers-under-content-visibility-auto-ref.html
new file mode 100644
index 00000000000..afb2d5d65a2
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/nested-scroll-markers-under-content-visibility-auto-ref.html
@@ -0,0 +1,65 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>::scroll-markers with content-visibility: auto ancestors and subscrollers (ref)</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-marker-pseudo">
+<link rel="author" href="mailto:vmpstr@chromium.org">
+<style>
+  #scroller {
+    width: 600px;
+    height: 300px;
+    overflow: scroll;
+    scroll-marker-group: after;
+  }
+
+  .subscroller {
+    scroll-marker-group: after;
+    overflow: scroll;
+    width: 600px;
+    height: 100px;
+  }
+
+  .cv-placeholder {
+    contain: strict;
+    width: 100px;
+    height: 100px;
+  }
+
+  #scroller::scroll-marker-group {
+    border: 3px solid black;
+    padding: 5px;
+    height: 20px;
+    display: block;
+  }
+
+  .item {
+    height: 200px;
+  }
+
+  .item::scroll-marker {
+    content: "";
+    width: 10px;
+    height: 10px;
+    background-color: blue;
+    border-radius: 50%;
+    display: inline-block;
+  }
+
+  .spacer {
+    height: 10000px;
+  }
+</style>
+<div id="scroller">
+  <div class=cv-placeholder>
+    <div class=subscroller>
+      <div class=item></div> <div class=item></div> <div class=item></div>
+    </div>
+  </div>
+  <div class=item></div> <div class=item></div> <div class=item></div>
+  <div class=spacer></div>
+  <div class=cv-placeholder>
+    <div class=subscroller>
+      <div class=item></div> <div class=item></div> <div class=item></div>
+    </div>
+  </div>
+</div>
+
diff --git a/tests/wpt/tests/css/css-overflow/nested-scroll-markers-under-content-visibility-auto.html b/tests/wpt/tests/css/css-overflow/nested-scroll-markers-under-content-visibility-auto.html
new file mode 100644
index 00000000000..0cb62fec70e
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/nested-scroll-markers-under-content-visibility-auto.html
@@ -0,0 +1,67 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>::scroll-markers with content-visibility: auto ancestors and subscrollers</title>
+<link rel="match" href="nested-scroll-markers-under-content-visibility-auto-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-marker-pseudo">
+<link rel="author" href="mailto:vmpstr@chromium.org">
+<link rel="assert" content="::scroll-markers should be captured by subscrollers when in content-visibility-auto">
+<style>
+  #scroller {
+    width: 600px;
+    height: 300px;
+    overflow: scroll;
+    scroll-marker-group: after;
+  }
+
+  .subscroller {
+    scroll-marker-group: after;
+    overflow: scroll;
+    width: 600px;
+    height: 100px;
+  }
+
+  .cv {
+    content-visibility: auto;
+    width: 100px;
+    height: 100px;
+  }
+
+  #scroller::scroll-marker-group {
+    border: 3px solid black;
+    padding: 5px;
+    height: 20px;
+    display: block;
+  }
+
+  .item {
+    height: 200px;
+  }
+
+  .item::scroll-marker {
+    content: "";
+    width: 10px;
+    height: 10px;
+    background-color: blue;
+    border-radius: 50%;
+    display: inline-block;
+  }
+
+  .spacer {
+    height: 10000px;
+  }
+</style>
+<div id="scroller">
+  <div class=cv>
+    <div class=subscroller>
+      <div class=item></div> <div class=item></div> <div class=item></div>
+    </div>
+  </div>
+  <div class=item></div> <div class=item></div> <div class=item></div>
+  <div class=spacer></div>
+  <div class=cv>
+    <div class=subscroller>
+      <div class=item></div> <div class=item></div> <div class=item></div>
+    </div>
+  </div>
+</div>
+
diff --git a/tests/wpt/tests/css/css-overflow/resizer-no-size-change.tentative.html b/tests/wpt/tests/css/css-overflow/resizer-no-size-change.tentative.html
index a8c659dc48d..61b149e1da1 100644
--- a/tests/wpt/tests/css/css-overflow/resizer-no-size-change.tentative.html
+++ b/tests/wpt/tests/css/css-overflow/resizer-no-size-change.tentative.html
@@ -4,6 +4,7 @@
 <link rel=author href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
 <link rel=author href="https://mozilla.org" title="Mozilla">
 <link rel=help href="https://bugzilla.mozilla.org/show_bug.cgi?id=1795536">
+<link rel="help" href="https://www.w3.org/TR/css-ui-4/#resize">
 <style>
 body {
   margin: 0;
diff --git a/tests/wpt/tests/css/css-overflow/resizer-transform.tentative.html b/tests/wpt/tests/css/css-overflow/resizer-transform.tentative.html
index 7b1af7f8f90..8dfeac2d35b 100644
--- a/tests/wpt/tests/css/css-overflow/resizer-transform.tentative.html
+++ b/tests/wpt/tests/css/css-overflow/resizer-transform.tentative.html
@@ -4,6 +4,7 @@
 <link rel=author href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
 <link rel=author href="https://mozilla.org" title="Mozilla">
 <link rel=help href="https://bugzilla.mozilla.org/show_bug.cgi?id=1775797">
+<link rel="help" href="https://www.w3.org/TR/css-ui-4/#resize">
 <style>
 #resizeme {
   position: absolute;
diff --git a/tests/wpt/tests/css/css-overflow/resources/root-scroll-marker-activation-iframe.html b/tests/wpt/tests/css/css-overflow/resources/root-scroll-marker-activation-iframe.html
new file mode 100644
index 00000000000..1724f9c56ea
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/resources/root-scroll-marker-activation-iframe.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: ::scroll-marker with ::scroll-marker-group doesn't propagate scroll from frame</title>
+<style>
+  :root {
+    scroll-marker-group: before;
+  }
+
+  .item {
+    height: 100vh;
+  }
+
+  .item::scroll-marker {
+    content: '';
+    background-color: blue;
+    width: 20px;
+    height: 20px;
+    display: inline-block;
+    margin-left: 10px;
+  }
+</style>
+<div class=item></div>
+<div class=item></div>
+<div class=item></div>
+<div class=item></div>
+<div class=item></div>
diff --git a/tests/wpt/tests/css/css-overflow/root-scroll-button-activation.html b/tests/wpt/tests/css/css-overflow/root-scroll-button-activation.html
new file mode 100644
index 00000000000..bb377e52fde
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/root-scroll-button-activation.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: ::scroll-button on root element activation</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-buttons">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  body {
+    margin: 0;
+  }
+
+  :root::scroll-button(block-end) {
+    content: "down";
+    position: absolute;
+    top: 0;
+  }
+
+  div {
+    width: 600px;
+    height: 300px;
+    margin-bottom: 20px;
+    background: green;
+  }
+</style>
+<div></div>
+<div></div>
+<div></div>
+<script>
+  promise_test(async t => {
+    await new test_driver.Actions()
+    .pointerMove(10, 10)
+    .pointerDown()
+    .pointerUp()
+    .pointerDown()
+    .pointerUp()
+    .send();
+    assert_equals(window.scrollY, 360);
+  });
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/root-scroll-button-ref.html b/tests/wpt/tests/css/css-overflow/root-scroll-button-ref.html
new file mode 100644
index 00000000000..28fc31b7ca5
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/root-scroll-button-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: ::scroll-button on root element</title>
+<style>
+  body {
+    margin: 0;
+  }
+
+  .item {
+    width: 600px;
+    height: 300px;
+    margin-bottom: 20px;
+    background: green;
+  }
+</style>
+<button style="position: absolute;">down</button>
+<div id="first" class="item"></div>
+<div class="item"></div>
+<div class="item"></div>
diff --git a/tests/wpt/tests/css/css-overflow/root-scroll-button.html b/tests/wpt/tests/css/css-overflow/root-scroll-button.html
new file mode 100644
index 00000000000..a4f96f45cbc
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/root-scroll-button.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: ::scroll-button on root element</title>
+<link rel="match" href="root-scroll-button-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-buttons">
+<style>
+  body {
+    margin: 0;
+  }
+
+  :root::scroll-button(block-end) {
+    content: "down";
+    position: absolute;
+    top: 0;
+  }
+
+  div {
+    width: 600px;
+    height: 300px;
+    margin-bottom: 20px;
+    background: green;
+  }
+</style>
+<div></div>
+<div></div>
+<div></div>
diff --git a/tests/wpt/tests/css/css-overflow/root-scroll-marker-activation-and-scroll-tracking.html b/tests/wpt/tests/css/css-overflow/root-scroll-marker-activation-and-scroll-tracking.html
new file mode 100644
index 00000000000..524e5399022
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/root-scroll-marker-activation-and-scroll-tracking.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: ::scroll-marker with ::scroll-marker-group on root element scroll tracking</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-marker-pseudo">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  body {
+    margin: 0;
+  }
+
+  :root {
+    scroll-marker-group: before;
+  }
+
+  :root::scroll-marker-group {
+    border: 3px solid black;
+    padding: 5px;
+    height: 20px;
+    display: block;
+    position: fixed;
+    top: 0;
+  }
+
+  div {
+    width: 600px;
+    height: 300px;
+    margin-bottom: 20px;
+    background: blue;
+  }
+
+  div:first-of-type {
+    margin-top: 40px;
+  }
+
+  div::scroll-marker {
+    content: "";
+    width: 20px;
+    height: 20px;
+    background-color: red;
+    display: inline-block;
+    margin-right: 4px;
+  }
+
+  div::scroll-marker:target-current {
+    background-color: green;
+  }
+
+  div:last-of-type::scroll-marker {
+    margin-right: 0px;
+  }
+</style>
+<div></div>
+<div></div>
+<div id="target"></div>
+<script>
+  promise_test(async t => {
+    await new test_driver.Actions()
+    .pointerMove(65, 20)
+    .pointerDown()
+    .pointerUp()
+    .pointerDown()
+    .pointerUp()
+    .send();
+    assert_equals(window.scrollY, 380);
+    assert_equals(getComputedStyle(target, "::scroll-marker").backgroundColor, "rgb(0, 128, 0)");
+  });
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/root-scroll-marker-activation-in-iframe.html b/tests/wpt/tests/css/css-overflow/root-scroll-marker-activation-in-iframe.html
new file mode 100644
index 00000000000..4aee04eac20
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/root-scroll-marker-activation-in-iframe.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<html class="reftest-wait">
+<title>CSS Overflow: ::scroll-marker with ::scroll-marker-group on root element doesn't propagate scrolling</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-marker-pseudo">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/dom/events/scrolling/scroll_support.js"></script>
+<style>
+  body {
+    margin: 0;
+  }
+
+  #container {
+    overflow: auto;
+    height: 600px;
+    position: relative;
+  }
+
+  iframe {
+    width: 600px;
+    height: 400px;
+    position: absolute;
+    top: 500px;
+    border: 2px solid black;
+  }
+</style>
+<div id="container">
+  <iframe id="target" onload="run_test()" src="resources/root-scroll-marker-activation-iframe.html"></iframe>
+</div>
+<script>
+  function run_test() {
+    promise_test(async t => {
+      const iframe = document.getElementById("target");
+      const container = document.getElementById("container");
+      const target = iframe.contentWindow;
+      const scrollEndPromise = waitForScrollEndFallbackToDelayWithoutScrollEvent(target);
+      await new test_driver.Actions()
+        .pointerMove(140, 510)
+        .pointerDown()
+        .pointerUp()
+        .send();
+      await scrollEndPromise;
+      assert_equals(container.scrollTop, 0, "scrolling is not propagated from iframe to the main frame");
+      assert_greater_than(target.scrollY, 0, "scroll marker activation scrolls iframe");
+      document.documentElement.classList.remove("reftest-wait");
+    });
+  }
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-overflow/root-scroll-marker-ref.html b/tests/wpt/tests/css/css-overflow/root-scroll-marker-ref.html
new file mode 100644
index 00000000000..24d3fab4ef1
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/root-scroll-marker-ref.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: ::scroll-marker with ::scroll-marker-group on root element</title>
+<style>
+  body {
+    margin: 0;
+  }
+
+  #scroll-marker-group {
+    border: 3px solid black;
+    padding: 5px;
+    height: 20px;
+    display: block;
+    position: fixed;
+    top: 0;
+  }
+
+  .item {
+    width: 600px;
+    height: 300px;
+    margin-bottom: 20px;
+    background: green;
+  }
+
+  #first {
+    margin-top: 40px;
+  }
+
+  .scroll-marker {
+    width: 10px;
+    height: 10px;
+    background-color: blue;
+    border-radius: 100%;
+    display: inline-block;
+  }
+</style>
+<div id="scroll-marker-group">
+  <div class="scroll-marker"></div>
+  <div class="scroll-marker"></div>
+  <div class="scroll-marker"></div>
+</div>
+<div id="first" class="item"></div>
+<div class="item"></div>
+<div class="item"></div>
diff --git a/tests/wpt/tests/css/css-overflow/root-scroll-marker.html b/tests/wpt/tests/css/css-overflow/root-scroll-marker.html
new file mode 100644
index 00000000000..48f3a81338a
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/root-scroll-marker.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: ::scroll-marker with ::scroll-marker-group on root element</title>
+<link rel="match" href="root-scroll-marker-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-marker-pseudo">
+<style>
+  body {
+    margin: 0;
+  }
+
+  :root {
+    scroll-marker-group: before;
+  }
+
+  :root::scroll-marker-group {
+    border: 3px solid black;
+    padding: 5px;
+    height: 20px;
+    display: block;
+    position: fixed;
+    top: 0;
+  }
+
+  div {
+    width: 600px;
+    height: 300px;
+    margin-bottom: 20px;
+    background: green;
+  }
+
+  div:first-of-type {
+    margin-top: 40px;
+  }
+
+  div::scroll-marker {
+    content: "";
+    width: 10px;
+    height: 10px;
+    background-color: blue;
+    border-radius: 100%;
+    display: inline-block;
+    margin-right: 4px;
+  }
+
+  div:last-of-type::scroll-marker {
+    margin-right: 0px;
+  }
+</style>
+<div></div>
+<div></div>
+<div></div>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-button-activation-without-scroller.html b/tests/wpt/tests/css/css-overflow/scroll-button-activation-without-scroller.html
new file mode 100644
index 00000000000..f5951efc419
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-button-activation-without-scroller.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: ::scroll-button() activation without scroller shouldn't crash</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-buttons">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+div::scroll-button(inline-start) {
+  content: "";
+  height: 100px;
+  width: 100px;
+}
+</style>
+<div></div>
+<script>
+  promise_test(async t => {
+    await new test_driver.Actions()
+      .pointerMove(50, 50)
+      .pointerDown()
+      .pointerUp()
+      .pointerDown()
+      .pointerUp()
+      .send();
+    const kTab = '\uE004';
+    const kEnter = '\uE007';
+    await new test_driver.Actions()
+      .keyDown(kTab)
+      .keyUp(kTab)
+      .keyDown(kEnter)
+      .keyUp(kEnter)
+      .send();
+  });
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-button-disabled-no-focus.html b/tests/wpt/tests/css/css-overflow/scroll-button-disabled-no-focus.html
new file mode 100644
index 00000000000..a8897706874
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-button-disabled-no-focus.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: disabled ::scroll-button() shouldn't be focusable</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-buttons">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+div::scroll-button(inline-start) {
+  content: "";
+  background-color: green;
+}
+
+div::scroll-button(inline-start):focus {
+  background-color: red;
+}
+</style>
+<div id="target"></div>
+<script>
+  promise_test(async t => {
+    const kTab = '\uE004';
+    await new test_driver.Actions()
+      .keyDown(kTab)
+      .keyUp(kTab)
+      .send();
+    assert_equals(getComputedStyle(target, "::scroll-button(inline-start)").backgroundColor, "rgb(0, 128, 0)");
+  });
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-button-display-none.html b/tests/wpt/tests/css/css-overflow/scroll-button-display-none.html
new file mode 100644
index 00000000000..8b3068be6da
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-button-display-none.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test: focused ::scroll-button() does not crash after becoming display none</title>
+<link rel="help" href="http://crbug.com/402673873">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  #scroller::scroll-button(left) {
+    content: "";
+    background-color: red;
+    height: 100px;
+    width: 100px;
+    top: 0;
+    left: 0;
+    position: absolute;
+  }
+
+  #scroller.hide::scroll-button(left) {
+    display: none;
+  }
+
+  #scroller {
+    width: 300px;
+    height: 300px;
+    overflow: auto;
+  }
+
+  #filler {
+    height: 20000x;
+  }
+</style>
+<div id="scroller">
+  <div id="filler"></div>
+</div>
+<script>
+  promise_test(async t => {
+    await new test_driver.Actions()
+      .pointerMove(15, 15)
+      .pointerDown()
+      .pointerUp()
+      .send();
+    scroller.className = "hide";
+    document.documentElement.offsetTop;
+    await new test_driver.Actions()
+      .pointerMove(15, 15)
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_true(true);
+  });
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-buttons-appearance-ref.html b/tests/wpt/tests/css/css-overflow/scroll-buttons-appearance-ref.html
index 462186407d5..c382f738a6f 100644
--- a/tests/wpt/tests/css/css-overflow/scroll-buttons-appearance-ref.html
+++ b/tests/wpt/tests/css/css-overflow/scroll-buttons-appearance-ref.html
@@ -7,4 +7,4 @@
 <p>Test passes if there are two buttons, the first one using appearance auto
 and the second using appearance: none.</p>
 <div></div>
-<button>appearance: auto</button><button class="none">appearance: none</button>
+<button disabled="true">appearance: auto</button><button disabled="true" class="none">appearance: none</button>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-15.html b/tests/wpt/tests/css/css-overflow/scroll-marker-15.html
new file mode 100644
index 00000000000..764e56b5543
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-15.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Test: scroll tracking for ::scroll-marker with overflow: hidden</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-container-scroll">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/css-transitions/support/helper.js"></script>
+<style>
+  #scroller {
+    overflow: scroll;
+    scroll-marker-group: before;
+    height: 100px;
+  }
+
+  #scroller::scroll-marker-group {
+    border: 3px solid black;
+    display: flex;
+    width: 100px;
+    height: 20px;
+  }
+
+  #scroller div {
+    width: 100px;
+    height: 100px;
+  }
+
+  #scroller div::scroll-marker {
+    overflow: hidden;
+    content: '';
+    background-color: red;
+    display: inline-flex;
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+  }
+
+  #scroller div::scroll-marker:target-current {
+    background-color: green;
+  }
+</style>
+<div id='scroller'>
+  <div></div>
+  <div id='target'></div>
+</div>
+<script>
+  function assertPseudoElementProperty(originatingElement, pseudoType, backgroundColor) {
+    const pseudoStyle = getComputedStyle(originatingElement, pseudoType);
+    const pseudoBackgroundColor = pseudoStyle.getPropertyValue('background-color');
+    assert_equals(pseudoBackgroundColor, backgroundColor, pseudoType +
+      " background-color should be " + backgroundColor.toString() +
+      " but was " + pseudoBackgroundColor.toString());
+  }
+  promise_test(async () => {
+    await waitForAnimationFrames(2);
+    assertPseudoElementProperty(target, "::scroll-marker", "rgb(255, 0, 0)");
+  }, "::scroll-marker is not activated when its originating element is not scrolled into the view");
+  promise_test(async () => {
+    scroller.scrollTop = 150;
+    await waitForAnimationFrames(2);
+    assertPseudoElementProperty(target, "::scroll-marker", "rgb(0, 128, 0)");
+  }, "::scroll-marker is activated when its originating element is scrolled into the view");
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-activation-crash.html b/tests/wpt/tests/css/css-overflow/scroll-marker-activation-crash.html
new file mode 100644
index 00000000000..1f2360a1943
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-activation-crash.html
@@ -0,0 +1,77 @@
+<!doctype html>
+<html class=test-wait>
+<meta charset="utf-8">
+<title>CSS Test: ::scroll-marker crash regression test</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-marker-activation">
+<script src="/dom/events/scrolling/scroll_support.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  body {
+    margin: 0;
+  }
+
+  #marker-scroller {
+    height: 300px;
+    overflow: auto;
+    scroll-snap-type: x mandatory;
+    position: relative;
+    scroll-marker-group: before;
+    white-space: nowrap;
+  }
+
+  #marker-scroller div {
+    scroll-snap-align: start;
+    box-sizing: border-box;
+    border-radius: 5px;
+    background: lightgray;
+    border: 1px solid black;
+    display: inline-block;
+    width: 500px;
+    height: 100%;
+  }
+
+  #marker-scroller::scroll-marker-group {
+    display: flex;
+    height: 100px;
+  }
+
+  #marker-scroller div::scroll-marker {
+    content: "";
+    width: 100px;
+    height: 100px;
+    box-sizing: border-box;
+    border-radius: 5px;
+    border: 1px solid black;
+    display: inline-block;
+  }
+  #marker-scroller div::scroll-marker:target-current {
+    background: blue;
+  }
+</style>
+<fakeelement>
+  <div id="marker-scroller">
+    <div>1</div>
+    <div id="target">2</div>
+    <div>3</div>
+  </div>
+</fakeelement>
+<script>
+  async function crash() {
+    const target = document.querySelector('#target');
+    const scroller = document.querySelector('#marker-scroller');
+    const scrollEndPromise = waitForScrollEndFallbackToDelayWithoutScrollEvent(scroller);
+    /* Crash regression test for https://issues.chromium.org/407958134 */
+    actions_promise = new test_driver.Actions()
+      .pointerMove(150, 50)
+      .pointerDown()
+      .pointerUp()
+      .send();
+    await actions_promise;
+    await scrollEndPromise;
+    document.documentElement.classList.remove('test-wait');
+  };
+  crash();
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-active-unreached-target.html b/tests/wpt/tests/css/css-overflow/scroll-marker-active-unreached-target.html
new file mode 100644
index 00000000000..6a6bcc2891f
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-active-unreached-target.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: test that the scroll-marker of a target whose target position
+    has not been reached only gets selected when it is within half a scroll
+    port's distance from the current scroll offset</title>
+  <link rel="help" href="https://drafts.csswg.org/css-overflow-5/#example-d2ca6884">
+  <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="support/scroll-marker-support.js"></script>
+  <script src="/dom/events/scrolling/scroll_support.js"></script>
+</head>
+
+<body>
+  <style>
+  .wrapper {
+    display: grid;
+    justify-content: center;
+    position: relative;
+  }
+
+  .carousel {
+    width: 600px;
+    height: 512px;
+    overflow-x: scroll;
+    scroll-snap-type: x mandatory;
+    list-style-type: none;
+    scroll-behavior: smooth;
+    border: solid 2px grey;
+    padding-left: 0px;
+    white-space: nowrap;
+    position: relative;
+
+    &>.item {
+      height: 80%;
+      width: 120px;
+      border: 1px solid;
+      place-content: center;
+      background-color: white;
+      margin-right: 1200px;
+      display: inline-block;
+
+      &::scroll-marker {
+        content: ' ';
+        width: 35px;
+        height: 35px;
+        border: 3px solid gray;
+        border-radius: 50%;
+        margin: 3px;
+        background-color:red;
+      }
+
+      &::scroll-marker:target-current {
+        background-color: green;
+      }
+    }
+
+    scroll-marker-group: after;
+    &::scroll-marker-group {
+      height: 45px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border: solid 1px black;
+      border-radius: 30px;
+    }
+  }
+
+  </style>
+  <div id="wrapper" class="wrapper">
+    <div class="carousel" id="carousel">
+      <div class="item" id="item1" tabindex=0>1</div>
+      <div class="item" id="item2" tabindex=0>2</div>
+    </div>
+  </div>
+  <script>
+    RED = "rgb(255, 0, 0)";
+    GREEN = "rgb(0, 128, 0)";
+
+    promise_test(async (t) => {
+      await waitForCompositorCommit();
+      const items = carousel.querySelectorAll(".item");
+
+      assert_equals(carousel.scrollLeft, 0,  "carousel is not scrolled");
+      verifySelectedMarker(0, items, GREEN, RED);
+
+      // Scroll a bit, but not enough to bring item2 into view. Item1 should
+      // still be selected.
+      let pos = item2.offsetLeft - carousel.clientWidth - 10;
+      await waitForScrollReset(t, carousel, pos);
+      verifySelectedMarker(0, items, GREEN, RED);
+
+      // Scroll a bit more; bring item2 into view but only into the second half
+      // of the scroll port. Item1 should still be selected.
+      pos = item2.offsetLeft - carousel.clientWidth + item2.offsetWidth;
+      await waitForScrollReset(t, carousel, pos);
+      verifySelectedMarker(0, items, GREEN, RED);
+
+      // Scroll to place item2 within the half a scroll port's width from the
+      // current scroll offset. Item2 should now be selected.
+      pos += carousel.clientWidth / 2;
+      await waitForScrollReset(t, carousel, pos);
+      verifySelectedMarker(1, items, GREEN, RED);
+    }, "target whose target position is not yet reached only get selected " +
+       "when its less than half a scroll port away.");
+  </script>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-001-ref.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-001-ref.tentative.html
new file mode 100644
index 00000000000..69e9167cc33
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-001-ref.tentative.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test Reference: scroll-marker-contain property makes anchor elements scroll markers</title>
+<style>
+  #scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+  }
+
+  #scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+  }
+
+  a {
+    color: red;
+  }
+
+  a:first-of-type {
+    color: green;
+  }
+</style>
+<div>
+  <a href="#target1">t1</a>
+  <a href="#target2">t2</a>
+  <a href="#target3">t3</a>
+  <a href="#target4">t4</a>
+</div>
+<div id="scroller">
+  <div id="target1"></div>
+  <div id="target2"></div>
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
+
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-001.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-001.tentative.html
new file mode 100644
index 00000000000..93d7df72508
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-001.tentative.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test: scroll-marker-contain property makes anchor elements scroll markers</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10916">
+<link rel="match" href="scroll-marker-contain-001-ref.tentative.html">
+<style>
+  #wrapper {
+    scroll-marker-contain: auto;
+  }
+
+  #scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+  }
+
+  #scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+  }
+
+  a {
+    color: red;
+  }
+
+  a:target-current {
+    color: green;
+  }
+</style>
+<div id="wrapper">
+  <a href="#target1">t1</a>
+  <a href="#target2">t2</a>
+  <a href="#target3">t3</a>
+  <a href="#target4">t4</a>
+</div>
+<div id="scroller">
+  <div id="target1"></div>
+  <div id="target2"></div>
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
+
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-002-ref.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-002-ref.tentative.html
new file mode 100644
index 00000000000..3fa777f7863
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-002-ref.tentative.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test Reference: scroll-marker-contain property makes anchor elements scroll markers and does scroll tracking</title>
+<style>
+  #scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+  }
+
+  #scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+  }
+
+  a {
+    color: red;
+  }
+
+  a:last-of-type {
+    color: green;
+  }
+</style>
+<div>
+  <a href="#target1">t1</a>
+  <a href="#target2">t2</a>
+  <a href="#target3">t3</a>
+  <a href="#target4">t4</a>
+</div>
+<div id="scroller">
+  <div id="target1"></div>
+  <div id="target2"></div>
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
+<script>
+  scroller.scrollTop = 400;
+</script>
+
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-002.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-002.tentative.html
new file mode 100644
index 00000000000..af2a5e668be
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-002.tentative.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test: scroll-marker-contain property makes anchor elements scroll markers and does scroll tracking</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10916">
+<link rel="match" href="scroll-marker-contain-002-ref.tentative.html">
+<style>
+  #wrapper {
+    scroll-marker-contain: auto;
+  }
+
+  #scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+  }
+
+  #scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+  }
+
+  a {
+    color: red;
+  }
+
+  a:target-current {
+    color: green;
+  }
+</style>
+<div id="wrapper">
+  <a href="#target1">t1</a>
+  <a href="#target2">t2</a>
+  <a href="#target3">t3</a>
+  <a id="link4" href="#target4">t4</a>
+</div>
+<div id="scroller">
+  <div id="target1"></div>
+  <div id="target2"></div>
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
+<script>
+  scroller.scrollTop = 400;
+  assert_equals(getComputedStyle(link4).color, "rgb(0, 128, 0)", "link4 should be :target-current");
+</script>
+
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-003-ref.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-003-ref.tentative.html
new file mode 100644
index 00000000000..09bb93d4ebc
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-003-ref.tentative.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test Reference: anchor scroll markers and pseudo element scroll markers</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  :root {
+    font-family: "Ahem";
+  }
+
+  #scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+  }
+
+  #scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+  }
+
+  a {
+    color: red;
+  }
+
+  a:last-of-type {
+    color: green;
+  }
+</style>
+<div>
+  <a href="#target1">t1</a>
+  <a href="#target2">t2</a>
+  <a href="#target3">t3</a>
+  <a href="#target4">t4</a>
+</div>
+<div id="scroller">
+  <div id="target1"></div>
+  <div id="target2"></div>
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
+<div>
+  <a href="#target1">t1</a><a href="#target2">t2</a><a href="#target3">t3</a><a href="#target4">t4</a>
+</div>
+<script>
+  scroller.scrollTop = 400;
+</script>
+
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-003.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-003.tentative.html
new file mode 100644
index 00000000000..59daa5cf5ce
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-003.tentative.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test: anchor scroll markers and pseudo element scroll markers</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10916">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-marker">
+<link rel="match" href="scroll-marker-contain-003-ref.tentative.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  :root {
+    font-family: "Ahem";
+  }
+
+  #wrapper {
+    scroll-marker-contain: auto;
+  }
+
+  #scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+    scroll-marker-group: after;
+    counter-reset: t;
+  }
+
+  #scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+    counter-increment: t;
+  }
+
+  #scroller div::scroll-marker {
+    content: "t" counter(t);
+    color: red;
+  }
+
+  #scroller div::scroll-marker:target-current {
+    color: green;
+  }
+
+  a {
+    color: red;
+  }
+
+  a:target-current {
+    color: green;
+  }
+</style>
+<div id="wrapper">
+  <a href="#target1">t1</a>
+  <a href="#target2">t2</a>
+  <a href="#target3">t3</a>
+  <a id="link4" href="#target4">t4</a>
+</div>
+<div id="scroller">
+  <div id="target1"></div>
+  <div id="target2"></div>
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
+<script>
+  scroller.scrollTop = 400;
+  assert_equals(getComputedStyle(link4).color, "rgb(0, 128, 0)", "link4 should be :target-current");
+</script>
+
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-004.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-004.tentative.html
new file mode 100644
index 00000000000..2ec6f6bde76
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-004.tentative.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test: scroll-marker-contain property makes anchor elements scroll markers inside size containers</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10916">
+<link rel="match" href="scroll-marker-contain-001-ref.tentative.html">
+<style>
+  html {
+    container: my-container / size;
+  }
+
+  #wrapper {
+    scroll-marker-contain: auto;
+  }
+
+  #scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+  }
+
+  #scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+  }
+
+  a {
+    color: red;
+  }
+
+  a:target-current {
+    color: green;
+  }
+</style>
+<div id="wrapper">
+  <a href="#target1">t1</a>
+  <a href="#target2">t2</a>
+  <a href="#target3">t3</a>
+  <a href="#target4">t4</a>
+</div>
+<div id="scroller">
+  <div id="target1"></div>
+  <div id="target2"></div>
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-005.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-005.tentative.html
new file mode 100644
index 00000000000..3d435bf74cb
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-005.tentative.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test: scroll-marker-contain property invalidation - reparenting nested anchors</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10916">
+<link rel="match" href="scroll-marker-contain-001-ref.tentative.html">
+<style>
+  .wrapper {
+    scroll-marker-contain: auto;
+  }
+
+  #scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+  }
+
+  #scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+  }
+
+  a {
+    color: red;
+  }
+
+  a:target-current {
+    color: green;
+  }
+</style>
+<div class="wrapper">
+  <div id="target" class="wrapper">
+    <a href="#target1">t1</a>
+    <a href="#target2">t2</a>
+    <a href="#target3">t3</a>
+    <a href="#target4">t4</a>
+  </div>
+</div>
+<div id="scroller">
+  <div id="target1"></div>
+  <div id="target2"></div>
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
+<script>
+  scroller.scrollTop = 400;
+  document.documentElement.offsetTop;
+  target.classList.remove('wrapper');
+  document.documentElement.offsetTop;
+  scroller.scrollTop = 0;
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-006.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-006.tentative.html
new file mode 100644
index 00000000000..234b57e5bbe
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-006.tentative.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test: scroll-marker-contain property invalidation - anchor and target removal and addition</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10916">
+<link rel="match" href="scroll-marker-contain-001-ref.tentative.html">
+<style>
+  .wrapper {
+    scroll-marker-contain: auto;
+  }
+
+  #scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+  }
+
+  #scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+  }
+
+  a {
+    color: red;
+  }
+
+  a:target-current {
+    color: green;
+  }
+</style>
+<div id="target" class="wrapper">
+  <a id="link1" href="#target1">t1</a>
+  <a href="#target2">t2</a>
+  <a href="#target3">t3</a>
+  <a href="#target4">t4</a>
+</div>
+<div id="scroller">
+  <div id="target1"></div>
+  <div id="target2"></div>
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
+<script>
+  const newLink1 = link1.cloneNode(true);
+  const newTarget1 = target1.cloneNode();
+  target.removeChild(link1);
+  scroller.removeChild(target1);
+  document.documentElement.offsetTop;
+  target.prepend(newLink1);
+  scroller.prepend(newTarget1);
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-007.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-007.tentative.html
new file mode 100644
index 00000000000..5f15c85819a
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-007.tentative.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test: scroll-marker-contain property invalidation - dynamic creation</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10916">
+<link rel="match" href="scroll-marker-contain-001-ref.tentative.html">
+<style>
+  .wrapper {
+    scroll-marker-contain: auto;
+  }
+
+  #scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+  }
+
+  #scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+  }
+
+  a {
+    color: red;
+  }
+
+  a:target-current {
+    color: green;
+  }
+</style>
+<div id="target">
+  <a href="#target1">t1</a>
+  <a href="#target2">t2</a>
+  <a href="#target3">t3</a>
+  <a href="#target4">t4</a>
+</div>
+<div id="scroller">
+  <div id="target1"></div>
+  <div id="target2"></div>
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
+<script>
+  document.documentElement.offsetTop;
+  target.classList.add("wrapper");
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-008-ref.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-008-ref.tentative.html
new file mode 100644
index 00000000000..d74777d3bbf
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-008-ref.tentative.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test Reference: scroll-marker-contain property makes anchor elements scroll markers - </title>
+<style>
+  #scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+  }
+
+  #scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+  }
+
+  a {
+    color: red;
+  }
+</style>
+<div>
+  <a href="#target1">t1</a>
+  <a href="#target2">t2</a>
+  <a href="#target3">t3</a>
+  <a href="#target4">t4</a>
+</div>
+<div id="scroller">
+  <div id="target1"></div>
+  <div id="target2"></div>
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-008.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-008.tentative.html
new file mode 100644
index 00000000000..80801854a0f
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-008.tentative.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test: scroll-marker-contain property invalidation - dynamic removal</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10916">
+<link rel="match" href="scroll-marker-contain-008-ref.tentative.html">
+<style>
+  .wrapper {
+    scroll-marker-contain: auto;
+  }
+
+  #scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+  }
+
+  #scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+  }
+
+  a {
+    color: red;
+  }
+
+  a:target-current {
+    color: green;
+  }
+</style>
+<div id="target" class="wrapper">
+  <a href="#target1">t1</a>
+  <a href="#target2">t2</a>
+  <a href="#target3">t3</a>
+  <a href="#target4">t4</a>
+</div>
+<div id="scroller">
+  <div id="target1"></div>
+  <div id="target2"></div>
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
+<script>
+  document.documentElement.offsetTop;
+  target.classList.remove("wrapper");
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-009-ref.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-009-ref.tentative.html
new file mode 100644
index 00000000000..07b797ff789
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-009-ref.tentative.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test Reference: scroll-marker-contain property invalidation - dynamic change of href</title>
+<style>
+  .scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+  }
+
+  .scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+  }
+
+  a {
+    color: red;
+  }
+
+  #target-current {
+    color: green;
+  }
+</style>
+<div>
+  <a href="#target3">t1</a>
+  <a id="target-current" href="#target4">t2</a>
+</div>
+<div class="scroller">
+  <div></div>
+  <div></div>
+</div>
+<div id="scroller2" class="scroller">
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
+<script>
+  scroller2.scrollTop = 200;
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-009.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-009.tentative.html
new file mode 100644
index 00000000000..8037adf8441
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-009.tentative.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test: scroll-marker-contain property invalidation - dynamic change of href</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10916">
+<link rel="match" href="scroll-marker-contain-009-ref.tentative.html">
+<style>
+  #wrapper {
+    scroll-marker-contain: auto;
+  }
+
+  .scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+  }
+
+  .scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+  }
+
+  a {
+    color: red;
+  }
+
+  a:target-current {
+    color: green;
+  }
+</style>
+<div id="wrapper">
+  <a id="link1" href="#target1">t1</a>
+  <a id="link2" href="#target2">t2</a>
+</div>
+<div id="scroller1" class="scroller">
+  <div id="target1"></div>
+  <div id="target2"></div>
+</div>
+<div id="scroller2" class="scroller">
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
+<script>
+  scroller2.scrollTop = 200;
+  document.documentElement.offsetTop;
+  link1.href = "#target3";
+  link2.href = "#target4";
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-010.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-010.tentative.html
new file mode 100644
index 00000000000..fbdad62f846
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-010.tentative.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test: scroll-marker-contain property invalidation - dynamic addition of href</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10916">
+<link rel="match" href="scroll-marker-contain-009-ref.tentative.html">
+<style>
+  #wrapper {
+    scroll-marker-contain: auto;
+  }
+
+  .scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+  }
+
+  .scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+  }
+
+  a {
+    color: red;
+  }
+
+  a:target-current {
+    color: green;
+  }
+</style>
+<div id="wrapper">
+  <a id="link1">t1</a>
+  <a id="link2">t2</a>
+</div>
+<div id="scroller1" class="scroller">
+  <div id="target1"></div>
+  <div id="target2"></div>
+</div>
+<div id="scroller2" class="scroller">
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
+<script>
+  scroller2.scrollTop = 200;
+  document.documentElement.offsetTop;
+  link1.href = "#target3";
+  link2.href = "#target4";
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-contain-011.tentative.html b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-011.tentative.html
new file mode 100644
index 00000000000..8cfc78130e0
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-contain-011.tentative.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow Test: scroll-marker-contain property invalidation - dynamic removal of href</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10916">
+<link rel="match" href="scroll-marker-contain-009-ref.tentative.html">
+<style>
+  #wrapper {
+    scroll-marker-contain: auto;
+  }
+
+  .scroller {
+    overflow: auto;
+    height: 130px;
+    width: 100px;
+  }
+
+  .scroller div {
+    width: 100px;
+    height: 100px;
+    background-color: blue;
+    margin: 5px;
+  }
+
+  a {
+    color: red;
+  }
+
+  a:target-current {
+    color: green;
+  }
+</style>
+<div id="wrapper">
+  <a id="link1" href="#target1">t1</a>
+  <a id="link2" href="#target2">t2</a>
+</div>
+<div id="scroller1" class="scroller">
+  <div id="target1"></div>
+  <div id="target2"></div>
+</div>
+<div id="scroller2" class="scroller">
+  <div id="target3"></div>
+  <div id="target4"></div>
+</div>
+<script>
+  scroller2.scrollTop = 200;
+  document.documentElement.offsetTop;
+  link1.href = "";
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-inert-001.html b/tests/wpt/tests/css/css-overflow/scroll-marker-inert-001.html
new file mode 100644
index 00000000000..612a4cb9f4b
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-inert-001.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<title>CSS Overflow Test: ::scroll-marker-group inertness applied to ::scroll-marker</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-markers">
+<link rel="help" href="https://drafts.csswg.org/css-ui/#inertness">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11746">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  body { margin: 0; }
+  #scroller {
+    width: 100px;
+    height: 100px;
+    overflow-y: scroll;
+    scroll-marker-group: before;
+  }
+  #scroller::scroll-marker-group {
+    interactivity: inert;
+    height: 100px;
+  }
+  .item {
+    height: 100px;
+    background-color: lime;
+  }
+  .item::scroll-marker {
+    content: "X";
+    display: block;
+    width: 20px;
+    height: 20px;
+  }
+  #filler {
+    height: 400px;
+  }
+</style>
+<div id="scroller">
+  <div class="item"></div>
+  <div id="filler"></div>
+  <div id="target" class="item"></div>
+</div>
+<script>
+  promise_test(async t => {
+    await new test_driver.Actions()
+      .pointerMove(10, 30)
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_equals(scroller.scrollTop, 0);
+  }, "::scroll-marker is inert because its ::scroll-marker-group is");
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scroll-marker-inert-002.html b/tests/wpt/tests/css/css-overflow/scroll-marker-inert-002.html
new file mode 100644
index 00000000000..bf56426dea3
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scroll-marker-inert-002.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<title>CSS Overflow Test: Originating element inertness not applied to ::scroll-marker</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-markers">
+<link rel="help" href="https://drafts.csswg.org/css-ui/#inertness">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11746">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  body { margin: 0; }
+  #scroller {
+    width: 100px;
+    height: 100px;
+    overflow-y: scroll;
+    scroll-marker-group: before;
+  }
+  #scroller::scroll-marker-group {
+    height: 100px;
+  }
+  .item {
+    height: 100px;
+    background-color: lime;
+    interactivity: inert;
+  }
+  .item::scroll-marker {
+    content: "X";
+    display: block;
+    width: 20px;
+    height: 20px;
+  }
+  #filler {
+    height: 400px;
+  }
+</style>
+<div id="scroller">
+  <div class="item"></div>
+  <div id="filler"></div>
+  <div id="target" class="item"></div>
+</div>
+<script>
+  promise_test(async t => {
+    await new test_driver.Actions()
+      .pointerMove(10, 30)
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_equals(scroller.scrollTop, 500);
+  }, "::scroll-marker is not inert because its ::scroll-marker-group isn't");
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-004.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-004.html
new file mode 100644
index 00000000000..b398167fa30
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-004.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: Scrollable Overflow Transform Scroll Container</title>
+<link rel="author" title="Jo Steven Novaryo" href="mailto:steven.novaryo@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-3/#scrollable" />
+<meta name="assert" content="Checks that the box of scroll container with transform contribute to the scrollable overflow.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<style>
+  .container {
+    width: 100px;
+    height: 100px;
+    overflow: auto;
+    background: silver;
+    border: solid thick;
+    scrollbar-width: none;
+  }
+
+  .element {
+    width: 50px;
+    height: 50px;
+    overflow: scroll;
+    background: lime;
+  }
+
+  .element-content {
+    width: 500px;
+    height: 500px;
+    background: aqua;
+  }
+</style>
+<body onload="checkLayout('.container')">
+
+  <div class="container" data-expected-scroll-width="250">
+    <div style="transform: translateX(200px);" class="element">
+      <div class="element-content"></div>
+    </div>
+  </div>
+
+  <div class="container" data-expected-scroll-height="350">
+    <div style="transform: translateY(300px);" class="element">
+      <div class="element-content"></div>
+    </div>
+  </div>
+
+  <div class="container" data-expected-scroll-width="250" data-expected-scroll-height="350">
+    <div style="transform: translate(200px, 300px);" class="element">
+      <div class="element-content"></div>
+    </div>
+  </div>
+
+</body>
diff --git a/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-005.tentative.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-005.tentative.html
new file mode 100644
index 00000000000..837b95ba96d
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-005.tentative.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: Scrollable Overflow Transform Exclusion of Untransformed Child Box</title>
+<link rel="author" title="Jo Steven Novaryo" href="mailto:steven.novaryo@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-3/#scrollable"/>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/12113"/>
+<meta name="assert" content="Checks that the untransformed child box is not included in scrollable overflow.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<style>
+  .container {
+    width: 100px;
+    height: 100px;
+    overflow: scroll;
+    background: silver;
+    border: solid thick;
+    scrollbar-width: none;
+  }
+
+  .element {
+    width: 200px;
+    height: 200px;
+    background: lime;
+  }
+
+  .element-2 {
+    width: 100px;
+    height: 100px;
+  }
+</style>
+<body onload="checkLayout('.container')">
+
+  <div class="container" data-expected-scroll-width="100" data-expected-scroll-height="100">
+    <div style="transform: translate(-200px, -200px);" class="element">
+    </div>
+  </div>
+
+  <div class="container" data-expected-scroll-width="150" data-expected-scroll-height="150">
+    <div style="transform: translate(-25%, -25%);" class="element">
+    </div>
+  </div>
+
+  <div class="container" data-expected-scroll-height="100" data-expected-scroll-height="100">
+    <div style="width: 100px; height: 100px;">
+      <div style="transform: translate(-200px, -200px);" class="element">
+      </div>
+    </div>
+  </div>
+
+  <div class="container" data-expected-scroll-width="150" data-expected-scroll-height="150">
+    <div style="width: 100px; height: 100px;">
+      <div style="transform: translate(-25%, -25%);" class="element">
+      </div>
+    </div>
+  </div>
+
+  <div class="container" style="position: relative;" data-expected-scroll-width="100" data-expected-scroll-height="100">
+    <div style="transform: translate(-200px, -200px); position: absolute;" class="element">
+    </div>
+  </div>
+
+  <div class="container" style="position: relative;" data-expected-scroll-width="150" data-expected-scroll-height="150">
+    <div style="transform: translate(-25%, -25%); position: absolute;" class="element">
+    </div>
+  </div>
+
+</body>
diff --git a/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-006.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-006.html
new file mode 100644
index 00000000000..2eea759da6a
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-006.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: Scrollable Overflow Transform Rotate</title>
+<link rel="author" title="Jo Steven Novaryo" href="mailto:steven.novaryo@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-3/#scrollable" />
+<meta name="assert" content="Checks that the bounding rectangle of rotated element is included correctly in scrollable overflow.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<style>
+  .container {
+    width: 100px;
+    height: 100px;
+    overflow: scroll;
+    background: silver;
+    border: solid thick;
+    scrollbar-width: none;
+  }
+
+  .element {
+    width: 200px;
+    height: 200px;
+    background: lime;
+  }
+
+  .element-2 {
+    width: 200px;
+    height: 200px;
+    background: aqua;
+  }
+</style>
+<body onload="checkLayout('.container')">
+
+  <div class="container" data-expected-scroll-width="241" data-expected-scroll-height="241">
+    <div style="transform: rotate(45deg);" class="element">
+    </div>
+  </div>
+
+  <div class="container" data-expected-scroll-width="241" data-expected-scroll-height="241">
+    <div style="transform: rotate(-45deg);" class="element">
+    </div>
+  </div>
+
+</body>
diff --git a/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-007.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-007.html
new file mode 100644
index 00000000000..8aa6e5f17d8
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-007.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: Scrollable Overflow Transform Scale</title>
+<link rel="author" title="Jo Steven Novaryo" href="mailto:steven.novaryo@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-3/#scrollable" />
+<meta name="assert" content="Checks that the bounding rectangle of scaled element is included correctly in scrollable overflow.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<style>
+  .container {
+    width: 100px;
+    height: 100px;
+    overflow: scroll;
+    background: silver;
+    border: solid thick;
+    scrollbar-width: none;
+  }
+
+  .element {
+    width: 200px;
+    height: 200px;
+    background: lime;
+  }
+
+  .element-2 {
+    width: 200px;
+    height: 200px;
+    background: aqua;
+  }
+</style>
+<body onload="checkLayout('.container')">
+
+  <div class="container" data-expected-scroll-width="300" data-expected-scroll-height="300">
+    <div style="transform: scale(2);" class="element">
+    </div>
+  </div>
+
+  <div class="container" data-expected-scroll-height="250" data-expected-scroll-height="250">
+    <div style="transform: scale(0.5);" class="element">
+      <div style="transform: scale(3);" class="element-2">
+      </div>
+    </div>
+  </div>
+
+</body>
diff --git a/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-008.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-008.html
new file mode 100644
index 00000000000..df1daeb8424
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-008.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: Scrollable Overflow Transform Skew</title>
+<link rel="author" title="Jo Steven Novaryo" href="mailto:steven.novaryo@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-3/#scrollable" />
+<meta name="assert" content="Checks that the bounding rectangle of skewed element is included correctly in scrollable overflow.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<style>
+  .container {
+    width: 100px;
+    height: 100px;
+    overflow: scroll;
+    background: silver;
+    border: solid thick;
+    scrollbar-width: none;
+  }
+
+  .element {
+    width: 200px;
+    height: 200px;
+    background: lime;
+  }
+
+  .element-2 {
+    width: 200px;
+    height: 200px;
+    background: aqua;
+  }
+</style>
+<body onload="checkLayout('.container')">
+
+  <div class="container" data-expected-scroll-width="227" data-expected-scroll-height="227">
+    <div style="transform: skew(-15deg, -15deg);" class="element">
+    </div>
+  </div>
+
+  <div class="container" data-expected-scroll-width="227" data-expected-scroll-height="227">
+    <div style="transform: skew(15deg, 15deg);" class="element">
+    </div>
+  </div>
+
+</body>
diff --git a/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-009.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-009.html
new file mode 100644
index 00000000000..aca1b28418a
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-009.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: Scrollable Overflow Transform Unreachable Scrollable Overflow</title>
+<link rel="author" title="Jo Steven Novaryo" href="mailto:steven.novaryo@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-3/#scrollable" />
+<meta name="assert" content="Checks that the box in unreachable scrollable overflow region with transform is not included in the calculation.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<style>
+  .container {
+    width: 100px;
+    height: 100px;
+    overflow: scroll;
+    background: silver;
+    border: solid thick;
+    scrollbar-width: none;
+  }
+
+  .relative {
+    position: relative;
+  }
+
+  .absolute {
+    position: absolute;
+  }
+
+  .element {
+    width: 100px;
+    height: 100px;
+    background: lime;
+  }
+</style>
+<body onload="checkLayout('.container')">
+  <div class="container" data-expected-scroll-width="100" data-expected-scroll-height="100">
+    <div style="transform: translate(-300px, -300px);" class="element">
+    </div>
+  </div>
+
+  <div class="container" data-expected-scroll-width="100" data-expected-scroll-height="100">
+    <div style="transform: translate(300px, -300px);" class="element">
+    </div>
+  </div>
+
+  <div class="container" data-expected-scroll-width="100" data-expected-scroll-height="100">
+    <div style="transform: translate(-300px, 300px);" class="element">
+    </div>
+  </div>
+
+  <div class="container relative" data-expected-scroll-width="100" data-expected-scroll-height="100">
+    <div style="transform: translate(-300px, -300px);" class="element absolute">
+    </div>
+  </div>
+
+  <div class="container relative" data-expected-scroll-width="100" data-expected-scroll-height="100">
+    <div style="transform: translate(300px, -300px);" class="element absolute">
+    </div>
+  </div>
+
+  <div class="container relative" data-expected-scroll-width="100" data-expected-scroll-height="100">
+    <div style="transform: translate(-300px, 300px);" class="element absolute">
+    </div>
+  </div>
+
+</body>
diff --git a/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-010.tentative.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-010.tentative.html
new file mode 100644
index 00000000000..e2c62cb4474
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-010.tentative.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Overflow: Scrollable Overflow Transform Rotate Nested Element</title>
+<link rel="author" title="Jo Steven Novaryo" href="mailto:steven.novaryo@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-3/#scrollable"/>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/12112"/>
+<meta name="assert" content="Checks that the bounding rectangle of nested rotated element is included correctly in scrollable overflow.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<style>
+  .container {
+    width: 100px;
+    height: 100px;
+    overflow: scroll;
+    background: silver;
+    border: solid thick;
+    scrollbar-width: none;
+  }
+
+  .element {
+    width: 200px;
+    height: 200px;
+    background: lime;
+  }
+
+  .element-2 {
+    width: 200px;
+    height: 200px;
+    background: aqua;
+  }
+</style>
+<body onload="checkLayout('.container')">
+
+  <div class="container" data-expected-scroll-height="241" data-expected-scroll-height="241">
+    <div style="transform: rotate(-45deg);" class="element">
+      <div style="transform: rotate(45deg);" class="element-2">
+      </div>
+    </div>
+  </div>
+
+  <div class="container" data-expected-scroll-height="222" data-expected-scroll-height="222">
+    <div style="transform: rotate(30deg) rotate(-15deg);" class="element">
+      <div style="transform: rotate(-30deg) rotate(105deg);" class="element-2">
+      </div>
+    </div>
+  </div>
+
+</body>
diff --git a/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-unreachable-region.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-unreachable-region.html
new file mode 100644
index 00000000000..91e987bf826
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-unreachable-region.html
@@ -0,0 +1,95 @@
+<!doctype html>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<title>Scrollable Overflow of a Scroll Container with Transformed Child in Unreachable Scrollable Overflow Region.</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-3/#unreachable-scrollable-overflow-region">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-3/#scrollable">
+<link rel="author" title="Jo Steven Novaryo" href="mailto:steven.novaryo@gmail.com">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<style>
+body { margin: 0 }
+.wrapper {
+  width: 100px;
+  height: 200px;
+  overflow: scroll;
+}
+.inner {
+  width: 100px;
+  height: 200px;
+  background-color: lime;
+  transform: translate(-3px, -6px) scale(1.10);
+}
+</style>
+<div class="wrapper">
+  <div class="inner"></div>
+</div>
+<script>
+const wrapper = document.querySelector(".wrapper");
+const contentBox = {
+  width: 100,
+  height: 200,
+};
+
+function getCurrentTestName(display, direction, writingMode, flexDirection, flexWrap) {
+  return `display: ${display}; ` +
+         `direction: ${direction}; ` +
+         `writing-mode: ${writingMode}; ` +
+         `flex-direction: ${flexDirection}; ` +
+         `flex-wrap: ${flexWrap};`;
+}
+
+for (let display of ["flow-root", "flex", "grid"]) {
+  for (let flexDirection of ["row", "row-reverse", "column", "column-reverse"]) {
+    if (flexDirection != "row" && display != "flex") {
+      // Don't bother retesting with all flexDirection values unless we're actually a flex container
+      continue;
+    }
+    for (let flexWrap of ["nowrap", "wrap-reverse"]) {
+      if (flexWrap != "nowrap" && display != "flex") {
+        // Don't bother retesting with all flexWrap values unless we're actually a flex container
+        continue;
+      }
+      for (let direction of ["ltr", "rtl"]) {
+        for (let writingMode of ["horizontal-tb", "vertical-lr", "vertical-rl"]) {
+          wrapper.style.display = display;
+          wrapper.style.direction = direction;
+          wrapper.style.writingMode = writingMode;
+          wrapper.style.flexDirection = flexDirection;
+          wrapper.style.flexWrap = flexWrap;
+          // Suppress scrollbars because they get added to the padding are
+          // and would need to account for them in flexbox.
+          wrapper.style.scrollbarWidth = display == "flex" ? "none" : "";
+          let vertical = writingMode.startsWith("vertical");
+          let scrollToTop = vertical && direction == "rtl";
+          let scrollToLeft = (!vertical && direction == "rtl") || writingMode == "vertical-rl";
+          let flexMainAxisIsVertical = flexDirection.startsWith("row") == vertical;
+          if (display == "flex") {
+            if (flexDirection.endsWith("-reverse")) {
+              if (flexMainAxisIsVertical) {
+                scrollToTop = !scrollToTop;
+              } else {
+                scrollToLeft = !scrollToLeft;
+              }
+            }
+            if (flexWrap == "wrap-reverse") {
+              if (flexMainAxisIsVertical) {
+                scrollToLeft = !scrollToLeft;
+              } else {
+                scrollToTop = !scrollToTop;
+              }
+            }
+          }
+          currentTestName = getCurrentTestName(display, direction, writingMode, flexDirection, flexWrap);
+          test(function() {
+            assert_equals(wrapper.scrollWidth, (scrollToLeft ? 108 : 102), "scrollWidth");
+          }, "scrollWidth of " + currentTestName);
+          test(function() {
+            assert_equals(wrapper.scrollHeight, (scrollToTop ? 216 : 204), "scrollHeight");
+          }, "scrollHeight of " + currentTestName);
+        }
+      }
+    }
+  }
+}
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/scrollbar-gutter-with-background-gradient-ref.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-with-background-gradient-ref.html
new file mode 100644
index 00000000000..1af00bae87d
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-with-background-gradient-ref.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Overflow: test scrollbar-gutter with background gradient</title>
+<link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#scrollbar-gutter-property">
+<style>
+  html {
+    scrollbar-gutter: stable both-edges;
+    background-image: linear-gradient(to right, green, blue);
+    position: fixed;
+    inset: 0;
+  }
+</style>
diff --git a/tests/wpt/tests/css/css-overflow/scrollbar-gutter-with-background-gradient.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-with-background-gradient.html
new file mode 100644
index 00000000000..0b392446c20
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-with-background-gradient.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Overflow: test scrollbar-gutter with background gradient</title>
+<link rel="author" title="CGQAQ" href="mailto:m.jason.liu@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#scrollbar-gutter-property">
+<link rel="match" href="scrollbar-gutter-with-background-gradient-ref.html">
+<meta name=fuzzy content="maxDifference=0-1;totalPixels=0-70000">
+<style>
+  html {
+    scrollbar-gutter: stable both-edges;
+    background-image: linear-gradient(to right, green, blue);
+  }
+</style>
diff --git a/tests/wpt/tests/css/css-overscroll-behavior/overscroll-behavior-root.html b/tests/wpt/tests/css/css-overscroll-behavior/overscroll-behavior-root.html
index 18c172b40a1..71c5f6573d6 100644
--- a/tests/wpt/tests/css/css-overscroll-behavior/overscroll-behavior-root.html
+++ b/tests/wpt/tests/css/css-overscroll-behavior/overscroll-behavior-root.html
@@ -29,9 +29,14 @@ promise_test(async function() {
   assert_not_equals(originalScrollPos, 0, "Should have scrolled to get the iframe into view");
 
   await new test_driver.Actions()
-    .scroll(bounds.left + bounds.width / 2, bounds.top + bounds.height / 2, 0, -100)
+    .scroll(Math.round(bounds.left + bounds.width / 2),
+            Math.round(bounds.top + bounds.height / 2), 0, -100)
     .send();
 
+  // Await two animation frames to give a chance to scroll.
+  await new Promise(resolve => requestAnimationFrame(resolve));
+  await new Promise(resolve => requestAnimationFrame(resolve));
+
   assert_equals(window.scrollY, originalScrollPos, "overscroll-behavior should work on the root");
 });
 </script>
diff --git a/tests/wpt/tests/css/css-page/WEB_FEATURES.yml b/tests/wpt/tests/css/css-page/WEB_FEATURES.yml
index ab327a89b24..e19befe8e24 100644
--- a/tests/wpt/tests/css/css-page/WEB_FEATURES.yml
+++ b/tests/wpt/tests/css/css-page/WEB_FEATURES.yml
@@ -2,3 +2,7 @@ features:
 - name: page-orientation
   files:
   - page-orientation*
+- name: page-selectors
+  files:
+  - page-left-right-*
+  - pseudo-first-*
diff --git a/tests/wpt/tests/css/css-page/background-image-only-for-print-ref.html b/tests/wpt/tests/css/css-page/background-image-only-for-print-ref.html
index c3e5d8d1c5e..3271ab98ec6 100644
--- a/tests/wpt/tests/css/css-page/background-image-only-for-print-ref.html
+++ b/tests/wpt/tests/css/css-page/background-image-only-for-print-ref.html
@@ -1,4 +1,9 @@
 <!DOCTYPE html>
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <p>
   Should print a green rectangle but not display it on screen.
 </p>
diff --git a/tests/wpt/tests/css/css-page/background-image-only-for-print.html b/tests/wpt/tests/css/css-page/background-image-only-for-print.html
index f100f7eaeed..cb931a99302 100644
--- a/tests/wpt/tests/css/css-page/background-image-only-for-print.html
+++ b/tests/wpt/tests/css/css-page/background-image-only-for-print.html
@@ -13,6 +13,10 @@
     }
   }
 
+  :root {
+    print-color-adjust: exact;
+  }
+
   #target {
     background-image: url("/images/green.png");
     height: 50px;
diff --git a/tests/wpt/tests/css/css-page/basic-pagination-001-print-ref.html b/tests/wpt/tests/css/css-page/basic-pagination-001-print-ref.html
index 3487aa6eabb..df3da84637b 100644
--- a/tests/wpt/tests/css/css-page/basic-pagination-001-print-ref.html
+++ b/tests/wpt/tests/css/css-page/basic-pagination-001-print-ref.html
@@ -5,6 +5,9 @@
     size: 293px;
     margin: 5px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/basic-pagination-001-print.html b/tests/wpt/tests/css/css-page/basic-pagination-001-print.html
index 4bdf2ac6fdb..93293ff4879 100644
--- a/tests/wpt/tests/css/css-page/basic-pagination-001-print.html
+++ b/tests/wpt/tests/css/css-page/basic-pagination-001-print.html
@@ -7,6 +7,9 @@
     size: 293px;
     margin: 5px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   div {
     break-after: page;
   }
diff --git a/tests/wpt/tests/css/css-page/basic-pagination-002-print-ref.html b/tests/wpt/tests/css/css-page/basic-pagination-002-print-ref.html
index 90e0e26502b..cf040af63d7 100644
--- a/tests/wpt/tests/css/css-page/basic-pagination-002-print-ref.html
+++ b/tests/wpt/tests/css/css-page/basic-pagination-002-print-ref.html
@@ -5,6 +5,9 @@
     size: 293px;
     margin: 5px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/basic-pagination-002-print.html b/tests/wpt/tests/css/css-page/basic-pagination-002-print.html
index 4cf0de750da..f2d07730e1c 100644
--- a/tests/wpt/tests/css/css-page/basic-pagination-002-print.html
+++ b/tests/wpt/tests/css/css-page/basic-pagination-002-print.html
@@ -7,6 +7,9 @@
     size: 293px;
     margin: 5px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     break-before: page;
     break-after: page;
diff --git a/tests/wpt/tests/css/css-page/basic-pagination-003-print-ref.html b/tests/wpt/tests/css/css-page/basic-pagination-003-print-ref.html
index 6fd7ef2d453..9d3810213a5 100644
--- a/tests/wpt/tests/css/css-page/basic-pagination-003-print-ref.html
+++ b/tests/wpt/tests/css/css-page/basic-pagination-003-print-ref.html
@@ -5,6 +5,9 @@
     size: 293px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/basic-pagination-003-print.html b/tests/wpt/tests/css/css-page/basic-pagination-003-print.html
index 56f10d2dc72..6a133059f99 100644
--- a/tests/wpt/tests/css/css-page/basic-pagination-003-print.html
+++ b/tests/wpt/tests/css/css-page/basic-pagination-003-print.html
@@ -7,6 +7,9 @@
     size: 293px;
     margin: 5px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/basic-pagination-004-print-ref.html b/tests/wpt/tests/css/css-page/basic-pagination-004-print-ref.html
index 3487aa6eabb..df3da84637b 100644
--- a/tests/wpt/tests/css/css-page/basic-pagination-004-print-ref.html
+++ b/tests/wpt/tests/css/css-page/basic-pagination-004-print-ref.html
@@ -5,6 +5,9 @@
     size: 293px;
     margin: 5px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/basic-pagination-004-print.html b/tests/wpt/tests/css/css-page/basic-pagination-004-print.html
index 0d6f989b185..15e0a7eaf06 100644
--- a/tests/wpt/tests/css/css-page/basic-pagination-004-print.html
+++ b/tests/wpt/tests/css/css-page/basic-pagination-004-print.html
@@ -9,6 +9,9 @@
     size: 293px;
     margin: 5px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/basic-pagination-005-print.html b/tests/wpt/tests/css/css-page/basic-pagination-005-print.html
index 03c04a41c4d..1429f05f464 100644
--- a/tests/wpt/tests/css/css-page/basic-pagination-005-print.html
+++ b/tests/wpt/tests/css/css-page/basic-pagination-005-print.html
@@ -9,6 +9,9 @@
     size: 293px;
     margin: 5px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/body-background-slr-print-ref.html b/tests/wpt/tests/css/css-page/body-background-slr-print-ref.html
index d47a59af4d3..ca55f669e27 100644
--- a/tests/wpt/tests/css/css-page/body-background-slr-print-ref.html
+++ b/tests/wpt/tests/css/css-page/body-background-slr-print-ref.html
@@ -1,5 +1,8 @@
 <!DOCTYPE html>
 <style>
+:root {
+  print-color-adjust: exact;
+}
 body {
   margin: 20px;
   background: linear-gradient(lightgray 0%, lightgray 50%, white 50%, white 100%)
diff --git a/tests/wpt/tests/css/css-page/body-background-slr-print.html b/tests/wpt/tests/css/css-page/body-background-slr-print.html
index d7c1e91db7c..a99ea9e26bf 100644
--- a/tests/wpt/tests/css/css-page/body-background-slr-print.html
+++ b/tests/wpt/tests/css/css-page/body-background-slr-print.html
@@ -3,7 +3,10 @@
 <meta name="assert" content="Body's background is fragmented correctly in sideways-lr writing mode.">
 <link rel="match" href="body-background-slr-print-ref.html">
 <style>
-html { writing-mode: sideways-lr; }
+:root {
+  print-color-adjust: exact;
+  writing-mode: sideways-lr;
+}
 body {
   margin: 20px;
   background: linear-gradient(90deg, lightgray 0%, lightgray 50%, white 50%, white 100%)
diff --git a/tests/wpt/tests/css/css-page/body-background-srl-print-ref.html b/tests/wpt/tests/css/css-page/body-background-srl-print-ref.html
index 293bcbae7d5..81ff9e23925 100644
--- a/tests/wpt/tests/css/css-page/body-background-srl-print-ref.html
+++ b/tests/wpt/tests/css/css-page/body-background-srl-print-ref.html
@@ -1,5 +1,8 @@
 <!DOCTYPE html>
 <style>
+:root {
+  print-color-adjust: exact;
+}
 body {
   margin: 20px;
   background: linear-gradient(to bottom, white 0%, white 50%, lightgray 50%, lightgray 100%);
diff --git a/tests/wpt/tests/css/css-page/body-background-srl-print.html b/tests/wpt/tests/css/css-page/body-background-srl-print.html
index 1c5f1c33622..ebf5adb821b 100644
--- a/tests/wpt/tests/css/css-page/body-background-srl-print.html
+++ b/tests/wpt/tests/css/css-page/body-background-srl-print.html
@@ -3,7 +3,10 @@
 <meta name="assert" content="Body's background is fragmented correctly in sideways-rl writing mode.">
 <link rel="match" href="body-background-srl-print-ref.html">
 <style>
-html { writing-mode: sideways-rl; }
+:root {
+  print-color-adjust: exact;
+  writing-mode: sideways-rl;
+}
 body {
   margin: 20px;
   background: linear-gradient(to left, lightgray 0%, lightgray 50%, white 50%, white 100%);
diff --git a/tests/wpt/tests/css/css-page/body-background-vlr-print-ref.html b/tests/wpt/tests/css/css-page/body-background-vlr-print-ref.html
index 7b966a5b3d5..4c2f5438760 100644
--- a/tests/wpt/tests/css/css-page/body-background-vlr-print-ref.html
+++ b/tests/wpt/tests/css/css-page/body-background-vlr-print-ref.html
@@ -1,5 +1,8 @@
 <!DOCTYPE html>
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/body-background-vlr-print.html b/tests/wpt/tests/css/css-page/body-background-vlr-print.html
index 505e74400d5..eec1914ea02 100644
--- a/tests/wpt/tests/css/css-page/body-background-vlr-print.html
+++ b/tests/wpt/tests/css/css-page/body-background-vlr-print.html
@@ -3,7 +3,10 @@
 <meta name="assert" content="Body's background is fragmented correctly in vertical-lr writing mode.">
 <link rel="match" href="body-background-vlr-print-ref.html">
 <style>
-  html { writing-mode: vertical-lr; }
+  :root {
+    print-color-adjust: exact;
+    writing-mode: vertical-lr;
+  }
   body {
     margin: 0;
     background: linear-gradient(90deg, lightgray 0%, lightgray 50%, white 50%, white 100%)
diff --git a/tests/wpt/tests/css/css-page/body-background-vrl-print-ref.html b/tests/wpt/tests/css/css-page/body-background-vrl-print-ref.html
index bbc265e6cfa..77c12e92653 100644
--- a/tests/wpt/tests/css/css-page/body-background-vrl-print-ref.html
+++ b/tests/wpt/tests/css/css-page/body-background-vrl-print-ref.html
@@ -1,5 +1,8 @@
 <!DOCTYPE html>
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/body-background-vrl-print.html b/tests/wpt/tests/css/css-page/body-background-vrl-print.html
index 6f9df91c5dc..48ec7a70a5c 100644
--- a/tests/wpt/tests/css/css-page/body-background-vrl-print.html
+++ b/tests/wpt/tests/css/css-page/body-background-vrl-print.html
@@ -3,7 +3,10 @@
 <meta name="assert" content="Body's background is fragmented correctly in vertical-rl writing mode.">
 <link rel="match" href="body-background-vrl-print-ref.html">
 <style>
-  html { writing-mode: vertical-rl; }
+  :root {
+    print-color-adjust: exact;
+    writing-mode: vertical-rl;
+  }
   body {
     margin: 0;
     background: linear-gradient(90deg, lightgray 0%, lightgray 50%, white 50%, white 100%)
diff --git a/tests/wpt/tests/css/css-page/crashtests/counter-containment-001.html b/tests/wpt/tests/css/css-page/crashtests/counter-containment-001.html
new file mode 100644
index 00000000000..2672bfffb5b
--- /dev/null
+++ b/tests/wpt/tests/css/css-page/crashtests/counter-containment-001.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://issues.chromium.org/issues/400087471">
+<style>
+  :root {
+    counter-increment: a1 9;
+    container-type: inline-size;
+  }
+</style>
+<script>
+  window.print();
+</script>
diff --git a/tests/wpt/tests/css/css-page/crashtests/counter-containment-002.html b/tests/wpt/tests/css/css-page/crashtests/counter-containment-002.html
new file mode 100644
index 00000000000..04b4710ab28
--- /dev/null
+++ b/tests/wpt/tests/css/css-page/crashtests/counter-containment-002.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://issues.chromium.org/issues/400087476">
+<style>
+  :root {
+    contain: style;
+    counter-increment: a1;
+  }
+</style>
+<script>
+  window.print();
+</script>
diff --git a/tests/wpt/tests/css/css-page/crashtests/match-media-listener-relayout-inside-fixed-size-overflow-hidden-print.html b/tests/wpt/tests/css/css-page/crashtests/match-media-listener-relayout-inside-fixed-size-overflow-hidden-print.html
index 77f9dc335fd..c749535875a 100644
--- a/tests/wpt/tests/css/css-page/crashtests/match-media-listener-relayout-inside-fixed-size-overflow-hidden-print.html
+++ b/tests/wpt/tests/css/css-page/crashtests/match-media-listener-relayout-inside-fixed-size-overflow-hidden-print.html
@@ -1,6 +1,11 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1507840">
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <div style="position:relative; overflow:hidden; width:100px; height:100px;">
   <div style="position:absolute; width:100px; height:100px; background:green;">
     <div id="trouble"></div>
diff --git a/tests/wpt/tests/css/css-page/cssom/dynamic-001-print-ref.html b/tests/wpt/tests/css/css-page/cssom/dynamic-001-print-ref.html
index e697d8e23db..850bf80b720 100644
--- a/tests/wpt/tests/css/css-page/cssom/dynamic-001-print-ref.html
+++ b/tests/wpt/tests/css/css-page/cssom/dynamic-001-print-ref.html
@@ -5,6 +5,9 @@
     size: 700px 150px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/cssom/dynamic-001-print.html b/tests/wpt/tests/css/css-page/cssom/dynamic-001-print.html
index 90799d3a721..5cdf26454c1 100644
--- a/tests/wpt/tests/css/css-page/cssom/dynamic-001-print.html
+++ b/tests/wpt/tests/css/css-page/cssom/dynamic-001-print.html
@@ -5,6 +5,9 @@
 <link rel="match" href="dynamic-001-print-ref.html">
 <style id="sheet">
   @page { }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     background: green;
   }
diff --git a/tests/wpt/tests/css/css-page/cssom/margin-001.html b/tests/wpt/tests/css/css-page/cssom/margin-001.html
index 29c38b2f98e..a9fdb24caf7 100644
--- a/tests/wpt/tests/css/css-page/cssom/margin-001.html
+++ b/tests/wpt/tests/css/css-page/cssom/margin-001.html
@@ -67,8 +67,6 @@
     var pageRule = sheet.rules[2];
     var style = pageRule.style;
     assert_equals(style.length, 3);
-    assert_equals(style.color, "inherit");
-    assert_equals(style.columnCount, "7");
     assert_equals(style.marginLeft, "111px");
 
     assert_equals(pageRule.cssRules.length, 18);
diff --git a/tests/wpt/tests/css/css-page/cssom/page-002.html b/tests/wpt/tests/css/css-page/cssom/page-002.html
index 0060d295b4a..4669ec84a78 100644
--- a/tests/wpt/tests/css/css-page/cssom/page-002.html
+++ b/tests/wpt/tests/css/css-page/cssom/page-002.html
@@ -13,23 +13,18 @@
   var style = pageRule.style;
   test(()=> {
     assert_equals(style.length, 0);
-    style.setProperty("widows", "7");
-    assert_equals(style.length, 1);
-    assert_equals(style.widows, "7");
     style.setProperty("margin-left", "50%");
-    assert_equals(style.length, 2);
+    assert_equals(style.length, 1);
     assert_equals(style.marginLeft, "50%");
     style.setProperty("margin-left", "100px");
-    assert_equals(style.length, 2);
+    assert_equals(style.length, 1);
     assert_equals(style.marginLeft, "100px");
     style.setProperty("margin", "auto");
-    assert_equals(style.length, 5);
+    assert_equals(style.length, 4);
     assert_equals(style.marginLeft, "auto");
   }, "Add declarations");
 
   test(()=> {
-    assert_equals(style.length, 5);
-    style.removeProperty("widows");
     assert_equals(style.length, 4);
     style.removeProperty("margin");
     assert_equals(style.length, 0);
diff --git a/tests/wpt/tests/css/css-page/fixedpos-009-print-ref.html b/tests/wpt/tests/css/css-page/fixedpos-009-print-ref.html
index 31a6a6724fa..970308cfbbc 100644
--- a/tests/wpt/tests/css/css-page/fixedpos-009-print-ref.html
+++ b/tests/wpt/tests/css/css-page/fixedpos-009-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/fixedpos-009-print.html b/tests/wpt/tests/css/css-page/fixedpos-009-print.html
index 803a077c0a7..3b784670074 100644
--- a/tests/wpt/tests/css/css-page/fixedpos-009-print.html
+++ b/tests/wpt/tests/css/css-page/fixedpos-009-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="http://crbug.com/337791467">
 <link rel="match" href="fixedpos-009-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/fixedpos-010-print-ref.html b/tests/wpt/tests/css/css-page/fixedpos-010-print-ref.html
index 90bd5e7fc31..8eb61333a83 100644
--- a/tests/wpt/tests/css/css-page/fixedpos-010-print-ref.html
+++ b/tests/wpt/tests/css/css-page/fixedpos-010-print-ref.html
@@ -8,6 +8,9 @@
   @page large {
     size: 500px 400px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/fixedpos-010-print.html b/tests/wpt/tests/css/css-page/fixedpos-010-print.html
index cdd50828d86..d333f7279cd 100644
--- a/tests/wpt/tests/css/css-page/fixedpos-010-print.html
+++ b/tests/wpt/tests/css/css-page/fixedpos-010-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://drafts.csswg.org/css-position-3/#valdef-position-fixed">
 <link rel="match" href="fixedpos-010-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     size: 400px;
     margin: 0;
diff --git a/tests/wpt/tests/css/css-page/fixedpos-011-print-ref.html b/tests/wpt/tests/css/css-page/fixedpos-011-print-ref.html
index 8f0be4ea2fa..ba741eb940a 100644
--- a/tests/wpt/tests/css/css-page/fixedpos-011-print-ref.html
+++ b/tests/wpt/tests/css/css-page/fixedpos-011-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/fixedpos-011-print.html b/tests/wpt/tests/css/css-page/fixedpos-011-print.html
index 556965138cc..89154296dc4 100644
--- a/tests/wpt/tests/css/css-page/fixedpos-011-print.html
+++ b/tests/wpt/tests/css/css-page/fixedpos-011-print.html
@@ -7,6 +7,9 @@
   body {
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   .cover-me {
     position: absolute;
     z-index: -1;
diff --git a/tests/wpt/tests/css/css-page/fixedpos-with-iframe-print-ref.html b/tests/wpt/tests/css/css-page/fixedpos-with-iframe-print-ref.html
index 5c171404508..718d15dfee0 100644
--- a/tests/wpt/tests/css/css-page/fixedpos-with-iframe-print-ref.html
+++ b/tests/wpt/tests/css/css-page/fixedpos-with-iframe-print-ref.html
@@ -1,5 +1,10 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <p>The word "PASS" should be seen below.</p>
 <div style="position:absolute; background:blue;">
   <iframe src="data:text/html,PASS" style="width:8em; height:3em; background:yellow;"></iframe>
diff --git a/tests/wpt/tests/css/css-page/fixedpos-with-iframe-print.html b/tests/wpt/tests/css/css-page/fixedpos-with-iframe-print.html
index 5102d045c42..215643601b2 100644
--- a/tests/wpt/tests/css/css-page/fixedpos-with-iframe-print.html
+++ b/tests/wpt/tests/css/css-page/fixedpos-with-iframe-print.html
@@ -2,6 +2,11 @@
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1414873">
 <link rel="match" href="fixedpos-with-iframe-print-ref.html">
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <p>The word "PASS" should be seen below.</p>
 <div style="position:fixed; background:blue;">
   <iframe src="data:text/html,PASS" style="width:8em; height:3em; background:yellow;"></iframe>
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/auto-margins-002-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/auto-margins-002-print-ref.html
index 56adf2a5401..57d966fc46d 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/auto-margins-002-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/auto-margins-002-print-ref.html
@@ -5,6 +5,9 @@
     margin: 0;
     size: 500px 440px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     display: grid;
     grid-template-columns: 100px auto 100px;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/auto-margins-002-print.html b/tests/wpt/tests/css/css-page/margin-boxes/auto-margins-002-print.html
index 5b424941cad..28d091ffa1a 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/auto-margins-002-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/auto-margins-002-print.html
@@ -106,6 +106,9 @@
       background: green;
     }
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     background: white;
   }
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/background-001-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/background-001-print-ref.html
index d43af0ca4bf..af1215c88eb 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/background-001-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/background-001-print-ref.html
@@ -4,6 +4,9 @@
   @page {
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/background-001-print.html b/tests/wpt/tests/css/css-page/margin-boxes/background-001-print.html
index 66560fce099..0e6db527320 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/background-001-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/background-001-print.html
@@ -12,6 +12,9 @@
       background: url(/images/green.png);
     }
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/content-001-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/content-001-print-ref.html
index 00c44928daa..ac79c15cc05 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/content-001-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/content-001-print-ref.html
@@ -5,6 +5,9 @@
     size: 400px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/content-001-print.html b/tests/wpt/tests/css/css-page/margin-boxes/content-001-print.html
index 11b5bd6f44d..cf61311491d 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/content-001-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/content-001-print.html
@@ -4,6 +4,9 @@
 <meta name="assert" content="Basic content property test, with just text, and various ways of expressing nothingness.">
 <link rel="match" href="content-001-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     size: 400px;
     margin: 100px;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/content-003-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/content-003-print-ref.html
index ba45b88cd4d..25390c7f3ca 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/content-003-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/content-003-print-ref.html
@@ -4,6 +4,9 @@
   @page {
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-003-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-003-print-ref.html
index c491cdde98e..fd761a19429 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-003-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-003-print-ref.html
@@ -3,7 +3,8 @@
 <meta name="flags" content="ahem">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
-  html {
+  :root {
+    print-color-adjust: exact;
     font: 16px/1 Ahem;
   }
   @page {
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-003-print.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-003-print.html
index fe9f26da5d7..ed0d62f9530 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-003-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-003-print.html
@@ -6,6 +6,9 @@
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="dimensions-003-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     margin: 6em;
     width: 20em;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-004-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-004-print-ref.html
index 3f45190e330..4ce84aacf1f 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-004-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-004-print-ref.html
@@ -11,6 +11,9 @@
     width: 32em;
     height: 27em;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     display: grid;
     grid-template-columns: 7em auto 5em;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-004-print.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-004-print.html
index 80bcc43fb39..c45732790df 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-004-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-004-print.html
@@ -6,6 +6,9 @@
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="dimensions-004-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     margin: 4em 5em 8em 7em;
     width: 20em;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-005-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-005-print-ref.html
index 1749b1c7147..79774b8bc4d 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-005-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-005-print-ref.html
@@ -3,7 +3,8 @@
 <meta name="flags" content="ahem">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
-  html {
+  :root {
+    print-color-adjust: exact;
     font: 16px/1 Ahem;
   }
   @page {
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-005-print.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-005-print.html
index 2823424f39a..6aafaf98a66 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-005-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-005-print.html
@@ -6,6 +6,9 @@
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="dimensions-005-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     margin: 6em;
     width: 20em;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-006-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-006-print-ref.html
index f6aa9e60f48..bd989f0d982 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-006-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-006-print-ref.html
@@ -3,7 +3,8 @@
 <meta name="flags" content="ahem">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
-  html {
+  :root {
+    print-color-adjust: exact;
     font: 16px/1 Ahem;
   }
   @page {
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-006-print.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-006-print.html
index 6ea477f2c84..b06c41fae68 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-006-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-006-print.html
@@ -6,6 +6,9 @@
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="dimensions-006-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     margin: 6em;
     width: 20em;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-007-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-007-print-ref.html
index b91c086879a..bd67f064e89 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-007-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-007-print-ref.html
@@ -3,7 +3,8 @@
 <meta name="flags" content="ahem">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
-  html {
+  :root {
+    print-color-adjust: exact;
     font: 16px/1 Ahem;
   }
   @page {
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-007-print.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-007-print.html
index cf7e5f50754..1f7edb53766 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-007-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-007-print.html
@@ -6,6 +6,9 @@
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="dimensions-007-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     margin: 12em 6em;
     width: 20em;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-008-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-008-print-ref.html
index 5bd141a28e1..fb96506d4d5 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-008-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-008-print-ref.html
@@ -3,7 +3,8 @@
 <meta name="flags" content="ahem">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
-  html {
+  :root {
+    print-color-adjust: exact;
     font: 16px/1 Ahem;
   }
   @page {
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-008-print.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-008-print.html
index 8bdf0cdac0b..5d25535aa1e 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-008-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-008-print.html
@@ -6,6 +6,9 @@
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="dimensions-008-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     margin: 6em;
     width: 20em;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-009-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-009-print-ref.html
index 922d165efa1..b946f1eaaff 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-009-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-009-print-ref.html
@@ -3,7 +3,8 @@
 <meta name="flags" content="ahem">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
-  html {
+  :root {
+    print-color-adjust: exact;
     font: 16px/1 Ahem;
   }
   @page {
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-009-print.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-009-print.html
index 602cc5680ec..10f796913f5 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-009-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-009-print.html
@@ -6,6 +6,9 @@
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="dimensions-009-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     margin: 6em;
     width: 20em;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-010-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-010-print-ref.html
index a4c0b4702d5..c2c98dd6d1a 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-010-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-010-print-ref.html
@@ -5,6 +5,9 @@
     size: 650px 500px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-010-print.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-010-print.html
index 1ebaa6d9288..28e8f87736c 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-010-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-010-print.html
@@ -4,6 +4,9 @@
 <meta name="assert" content="Zero min/max content min/max size.">
 <link rel="match" href="dimensions-010-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     margin: 100px;
     size: 650px 500px;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-011-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-011-print-ref.html
index 54983175e3d..dc84a0e6c87 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-011-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-011-print-ref.html
@@ -3,7 +3,8 @@
 <meta name="flags" content="ahem">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
-  html {
+  :root {
+    print-color-adjust: exact;
     font: 16px/1 Ahem;
   }
   @page {
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-011-print.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-011-print.html
index e51d1fbd75e..9dbbae94a6f 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-011-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-011-print.html
@@ -6,6 +6,9 @@
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="dimensions-011-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     margin: 6em;
     width: 20em;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-012-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-012-print-ref.html
index e62880031a1..6dfa80b4406 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-012-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-012-print-ref.html
@@ -3,7 +3,8 @@
 <meta name="flags" content="ahem">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
-  html {
+  :root {
+    print-color-adjust: exact;
     font: 16px/1 Ahem;
   }
   @page {
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-012-print.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-012-print.html
index 6b4ac2c28c7..1536312f85f 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-012-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-012-print.html
@@ -6,6 +6,9 @@
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="dimensions-012-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     margin: 4em 5em 8em 7em;
     width: 20em;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-013-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-013-print-ref.html
index a131b564fd6..1b7dfed8f70 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-013-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-013-print-ref.html
@@ -3,7 +3,8 @@
 <meta name="flags" content="ahem">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
-  html {
+  :root {
+    print-color-adjust: exact;
     font: 16px/1 Ahem;
   }
   @page {
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-013-print.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-013-print.html
index 4540b071906..d8fd801d147 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-013-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-013-print.html
@@ -6,6 +6,9 @@
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="dimensions-013-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     margin: 6em;
     width: 20em;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-014-print.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-014-print.html
index d126f2d0c91..0a31e8f3665 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-014-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-014-print.html
@@ -7,7 +7,8 @@
 <!-- Note: Using the ref from the preceding test here. -->
 <link rel="match" href="dimensions-013-print-ref.html">
 <style>
-  html {
+  :root {
+    print-color-adjust: exact;
     writing-mode: vertical-rl;
   }
   @page {
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-015-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-015-print-ref.html
index d61359f8aae..d834df34ae3 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-015-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-015-print-ref.html
@@ -6,6 +6,9 @@
     height: 8in;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-015-print.tentative.html b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-015-print.tentative.html
index 1f7bf1fdc09..14905102014 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/dimensions-015-print.tentative.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/dimensions-015-print.tentative.html
@@ -21,6 +21,9 @@
       content: "";
     }
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/inapplicable-properties-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/inapplicable-properties-print-ref.html
index 157cb8effa4..a3cfc9cdca6 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/inapplicable-properties-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/inapplicable-properties-print-ref.html
@@ -5,6 +5,9 @@
     size: 400px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/inapplicable-properties-print.html b/tests/wpt/tests/css/css-page/margin-boxes/inapplicable-properties-print.html
index 9ca4087a164..df5d8acfea9 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/inapplicable-properties-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/inapplicable-properties-print.html
@@ -4,6 +4,9 @@
 <meta name="assert" content="Test that inapplicable properties are ignored.">
 <link rel="match" href="inapplicable-properties-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     size: 400px;
     margin: 100px;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/paint-order-001-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/paint-order-001-print-ref.html
index 2677aee123c..a3a889697ce 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/paint-order-001-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/paint-order-001-print-ref.html
@@ -5,6 +5,9 @@
     margin: 0;
     size: 500px 400px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     display: grid;
     grid-template-columns: 100px auto 100px;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/paint-order-001-print.html b/tests/wpt/tests/css/css-page/margin-boxes/paint-order-001-print.html
index 839762f0b9a..6b99a79ff16 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/paint-order-001-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/paint-order-001-print.html
@@ -4,6 +4,9 @@
 <meta name="assert" content="Test default vertical and horizontal alignment for all 16 margin boxes">
 <link rel="match" href="paint-order-001-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     margin: 100px;
     size: 500px 400px;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/paint-order-002-print.html b/tests/wpt/tests/css/css-page/margin-boxes/paint-order-002-print.html
index ac00e154fac..a5d687f879e 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/paint-order-002-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/paint-order-002-print.html
@@ -7,6 +7,9 @@
      difference. -->
 <link rel="match" href="paint-order-001-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     margin: 100px;
     size: 500px 400px;
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/paint-order-003-print-ref.html b/tests/wpt/tests/css/css-page/margin-boxes/paint-order-003-print-ref.html
index 92bfe8757f6..ef6b859e215 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/paint-order-003-print-ref.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/paint-order-003-print-ref.html
@@ -5,6 +5,9 @@
     size: 500px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/margin-boxes/paint-order-003-print.html b/tests/wpt/tests/css/css-page/margin-boxes/paint-order-003-print.html
index 0ce4618a148..4cdc4d5b4f6 100644
--- a/tests/wpt/tests/css/css-page/margin-boxes/paint-order-003-print.html
+++ b/tests/wpt/tests/css/css-page/margin-boxes/paint-order-003-print.html
@@ -4,6 +4,9 @@
 <meta name="assert" content="Test margin boxes with z-index.">
 <link rel="match" href="paint-order-003-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     size: 500px;
     margin: 50px;
diff --git a/tests/wpt/tests/css/css-page/media-queries-001-print-ref.html b/tests/wpt/tests/css/css-page/media-queries-001-print-ref.html
index 35af04dc3c4..d84d9ee8e88 100644
--- a/tests/wpt/tests/css/css-page/media-queries-001-print-ref.html
+++ b/tests/wpt/tests/css/css-page/media-queries-001-print-ref.html
@@ -5,6 +5,9 @@
     size: 10in;
     margin: 2in;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: green;
diff --git a/tests/wpt/tests/css/css-page/media-queries-001-print.html b/tests/wpt/tests/css/css-page/media-queries-001-print.html
index 01b2a00e470..61dae2a0243 100644
--- a/tests/wpt/tests/css/css-page/media-queries-001-print.html
+++ b/tests/wpt/tests/css/css-page/media-queries-001-print.html
@@ -7,6 +7,9 @@
     size: 10in;
     margin: 2in;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     width: 4in;
diff --git a/tests/wpt/tests/css/css-page/media-queries-003-print-ref.html b/tests/wpt/tests/css/css-page/media-queries-003-print-ref.html
index 99642ca5674..f1f901b85c8 100644
--- a/tests/wpt/tests/css/css-page/media-queries-003-print-ref.html
+++ b/tests/wpt/tests/css/css-page/media-queries-003-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin-right: 108px; }
 </style>
 <div style="position:absolute; right:0; bottom:0; width:100px; height:100px; background:green;"></div>
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-003-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-003-print.html
index 76905b180a1..c6bbefddc63 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-003-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-003-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="reference/monolithic-overflow-4-pages-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-004-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-004-print.html
index ea5a659bd84..e1c492a4220 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-004-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-004-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="reference/monolithic-overflow-4-pages-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="height:390vh;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-005-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-005-print.html
index bb0fc212fc0..d690fc3b834 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-005-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-005-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="reference/monolithic-overflow-4-pages-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="display:flex; flex-flow:column; background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-006-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-006-print.html
index 1cbcdbbe1e5..416617ebc65 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-006-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-006-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="reference/monolithic-overflow-4-pages-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="display:flex; flex-flow:column; background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-007-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-007-print.html
index 14a6f051fec..34fa065bb3c 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-007-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-007-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="reference/monolithic-overflow-4-pages-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="display:grid; background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-008-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-008-print.html
index ff302dc30ca..576ced54595 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-008-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-008-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="reference/monolithic-overflow-4-pages-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="display:grid; background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-009-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-009-print.html
index bdff66e791c..0a62f821178 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-009-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-009-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="reference/monolithic-overflow-4-pages-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="display:table; width:100%; background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-010-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-010-print.html
index a75c932d30b..325d714e031 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-010-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-010-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="reference/monolithic-overflow-4-pages-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="display:table; width:100%; background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-011-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-011-print.html
index 973a3aff4dc..b3388892cb9 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-011-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-011-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="reference/monolithic-overflow-4-pages-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="display:table; width:100%; background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-012-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-012-print-ref.html
index e47ca880f93..2dd7adc644c 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-012-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-012-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-012-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-012-print.html
index 53ed74bc728..fb307d60ff6 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-012-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-012-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="monolithic-overflow-012-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="float:left; width:100%; background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-013-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-013-print-ref.html
index e47ca880f93..2dd7adc644c 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-013-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-013-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-013-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-013-print.html
index b9a174879d7..3c16293c19e 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-013-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-013-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="monolithic-overflow-013-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="position:absolute; width:100%; background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-014-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-014-print-ref.html
index a74e0d19a55..0aca6e03a48 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-014-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-014-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="display:flow-root; background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-014-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-014-print.html
index d12ddf4c684..d993acc58d0 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-014-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-014-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="monolithic-overflow-014-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-015-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-015-print-ref.html
index db44a3ee21e..aa26df11c32 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-015-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-015-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="width:50px; height:350vh; background:hotpink;"></div>
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-015-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-015-print.html
index d52605605c9..a1b975df3bf 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-015-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-015-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="monolithic-overflow-015-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="display:inline-block; vertical-align:top; width:50px; height:350vh; background:hotpink;"></div><br>
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-016-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-016-print-ref.html
index a675fb966c5..62ce80590d1 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-016-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-016-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     line-height: 20px;
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-016-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-016-print.html
index 029523e924a..639296e6189 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-016-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-016-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="monolithic-overflow-016-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     line-height: 20px;
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-017-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-017-print-ref.html
index 45f839787e0..3fe43748594 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-017-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-017-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="line-height:20px;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-017-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-017-print.html
index c8ce9060fff..0183c82bf62 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-017-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-017-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="monolithic-overflow-017-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="display:table; width:100%; line-height:20px;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-018-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-018-print-ref.html
index cf31737d6c3..3e4d6c99564 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-018-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-018-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="width:20px; height:280vh; background:blue;"></div>
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-018-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-018-print.html
index 93da11dc62e..fb3164395c9 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-018-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-018-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="monolithic-overflow-018-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="contain:size; width:20px; height:280vh; background:blue;"></div>
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-019-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-019-print-ref.html
index f37740ae7e6..501a8b6a961 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-019-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-019-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="height:50vh; border:solid; background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-019-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-019-print.html
index 3740b5d5b0b..af5ba41bfa6 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-019-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-019-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="monolithic-overflow-019-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="height:50vh; border:solid; background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-020-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-020-print-ref.html
index 528c4980de5..6b40bcae957 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-020-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-020-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="float:right; width:20%; border:3px solid;">
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-020-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-020-print.html
index 403d932d643..a296ba4d3d7 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-020-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-020-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1402540">
 <link rel="match" href="monolithic-overflow-020-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <!-- Check that monolithic overflow doesn't disrupt layout of a sibling
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-021-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-021-print-ref.html
index 112b1ebdccf..e1dc3792df6 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-021-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-021-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-021-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-021-print.html
index 584c4943dcf..01355f5686b 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-021-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-021-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1451760">
 <link rel="match" href="monolithic-overflow-021-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-022-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-022-print-ref.html
index 64572dd6392..d70edf98fda 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-022-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-022-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-022-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-022-print.html
index d37c74ad8ac..a7bfc5a3477 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-022-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-022-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://www.w3.org/TR/css-break-3/#possible-breaks">
 <link rel="match" href="monolithic-overflow-022-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-023-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-023-print-ref.html
index bdc4eb1ab0e..4f841b3cc4e 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-023-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-023-print-ref.html
@@ -5,6 +5,9 @@
     size: 600px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-023-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-023-print.html
index c047d486575..4ccecf0c37b 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-023-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-023-print.html
@@ -7,6 +7,9 @@
     size: 600px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-024-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-024-print-ref.html
index fc964fde32d..4812447034f 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-024-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-024-print-ref.html
@@ -5,6 +5,9 @@
     size: 100px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-025-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-025-print-ref.html
index edbb9ac011a..cebca7e8381 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-025-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-025-print-ref.html
@@ -5,6 +5,9 @@
     size: 100px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-027-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-027-print-ref.html
index 560f137bf52..f18233d7ad0 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-027-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-027-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     color: white;
     margin: 0;
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-027-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-027-print.html
index c7cfd37e2e8..0713b2061f9 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-027-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-027-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://issues.chromium.org/41496759">
 <link rel="match" href="monolithic-overflow-027-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     color: white;
     margin: 0;
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-028-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-028-print-ref.html
index 560f137bf52..f18233d7ad0 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-028-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-028-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     color: white;
     margin: 0;
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-028-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-028-print.html
index c549db6410d..195110a0bec 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-028-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-028-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://issues.chromium.org/41496759">
 <link rel="match" href="monolithic-overflow-028-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     color: white;
     margin: 0;
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-029-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-029-print-ref.html
index 560f137bf52..f18233d7ad0 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-029-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-029-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     color: white;
     margin: 0;
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-029-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-029-print.html
index c869d87d683..b201533ac94 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-029-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-029-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://issues.chromium.org/41496759">
 <link rel="match" href="monolithic-overflow-029-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     color: white;
     margin: 0;
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-030-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-030-print-ref.html
index d8468e3b14d..ec371d46976 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-030-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-030-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-030-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-030-print.html
index e36f25434df..7915ec2995c 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-030-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-030-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://issues.chromium.org/41496759">
 <link rel="match" href="monolithic-overflow-030-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-031-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-031-print-ref.html
index c2d8b7ea5ff..22f144beb9f 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-031-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-031-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-031-print.html b/tests/wpt/tests/css/css-page/monolithic-overflow-031-print.html
index c1784900622..7cb16ffebc5 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-031-print.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-031-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://issues.chromium.org/40415661">
 <link rel="match" href="monolithic-overflow-031-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-032-print-ref.html b/tests/wpt/tests/css/css-page/monolithic-overflow-032-print-ref.html
index 36724ac929d..18b1a5a5303 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-032-print-ref.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-032-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/monolithic-overflow-032-print.tentative.html b/tests/wpt/tests/css/css-page/monolithic-overflow-032-print.tentative.html
index ad7ccf029f6..390276127b5 100644
--- a/tests/wpt/tests/css/css-page/monolithic-overflow-032-print.tentative.html
+++ b/tests/wpt/tests/css/css-page/monolithic-overflow-032-print.tentative.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://issues.chromium.org/40415661">
 <link rel="match" href="monolithic-overflow-032-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-background-001-print.html b/tests/wpt/tests/css/css-page/page-background-001-print.html
index e1bc2196940..354dc48a490 100644
--- a/tests/wpt/tests/css/css-page/page-background-001-print.html
+++ b/tests/wpt/tests/css/css-page/page-background-001-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="http://crbug.com/351332645">
 <link rel="match" href="page-background-001-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin-left: 100px;
     background: url(support/cat.png) no-repeat;
diff --git a/tests/wpt/tests/css/css-page/page-background-002-print.html b/tests/wpt/tests/css/css-page/page-background-002-print.html
index 240d468ce44..10bb6cab7fa 100644
--- a/tests/wpt/tests/css/css-page/page-background-002-print.html
+++ b/tests/wpt/tests/css/css-page/page-background-002-print.html
@@ -7,6 +7,9 @@
     size: 300px 50px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin-left: 100px;
     background: url(support/cat.png) no-repeat;
diff --git a/tests/wpt/tests/css/css-page/page-background-003-print.html b/tests/wpt/tests/css/css-page/page-background-003-print.html
index fbc72ecd7d7..e796400cdd1 100644
--- a/tests/wpt/tests/css/css-page/page-background-003-print.html
+++ b/tests/wpt/tests/css/css-page/page-background-003-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="http://crbug.com/351332645">
 <link rel="match" href="page-background-003-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     size: 500px 250px;
     margin: 0;
diff --git a/tests/wpt/tests/css/css-page/page-background-004-print-ref.html b/tests/wpt/tests/css/css-page/page-background-004-print-ref.html
index 0a93dfc0452..1b7ae5f7a4b 100644
--- a/tests/wpt/tests/css/css-page/page-background-004-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-background-004-print-ref.html
@@ -5,6 +5,9 @@
     size: 500px 300px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/page-background-004-print.html b/tests/wpt/tests/css/css-page/page-background-004-print.html
index dcf14565628..a700e1d32de 100644
--- a/tests/wpt/tests/css/css-page/page-background-004-print.html
+++ b/tests/wpt/tests/css/css-page/page-background-004-print.html
@@ -5,6 +5,9 @@
 <meta name="assert" content="The root element has a different background painting area and thus the background-clip property has no effect when specified on it.">
 <link rel="match" href="page-background-004-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     size: 500px 300px;
     margin: 50px;
diff --git a/tests/wpt/tests/css/css-page/page-background-005-print-ref.html b/tests/wpt/tests/css/css-page/page-background-005-print-ref.html
index c80558f2f8e..b39f9c90875 100644
--- a/tests/wpt/tests/css/css-page/page-background-005-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-background-005-print-ref.html
@@ -5,6 +5,9 @@
     size: 600px 300px;
     margin: 20px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-background-005-print.html b/tests/wpt/tests/css/css-page/page-background-005-print.html
index 9070564bdde..1b5d227fd5a 100644
--- a/tests/wpt/tests/css/css-page/page-background-005-print.html
+++ b/tests/wpt/tests/css/css-page/page-background-005-print.html
@@ -21,6 +21,9 @@
   @page content {
     background-origin: content-box;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-background-image-print-ref.html b/tests/wpt/tests/css/css-page/page-background-image-print-ref.html
index f38cc898380..44ade6ec4c0 100644
--- a/tests/wpt/tests/css/css-page/page-background-image-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-background-image-print-ref.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   html {
     background-color: lime;
   }
diff --git a/tests/wpt/tests/css/css-page/page-background-image-print.html b/tests/wpt/tests/css/css-page/page-background-image-print.html
index 633cd4ec6c9..f9fe83a9d0c 100644
--- a/tests/wpt/tests/css/css-page/page-background-image-print.html
+++ b/tests/wpt/tests/css/css-page/page-background-image-print.html
@@ -7,6 +7,9 @@
 <link rel="match" href="page-background-image-print-ref.html">
 
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     background-image: url("/images/green.png");
     margin: 0px;
diff --git a/tests/wpt/tests/css/css-page/page-box-001-print-ref.html b/tests/wpt/tests/css/css-page/page-box-001-print-ref.html
index d9ab323877f..dc71c9ed673 100644
--- a/tests/wpt/tests/css/css-page/page-box-001-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-box-001-print-ref.html
@@ -4,6 +4,9 @@
   @page {
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 100px;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/page-box-001-print.html b/tests/wpt/tests/css/css-page/page-box-001-print.html
index 35c2f06c93b..f87dbe3ca38 100644
--- a/tests/wpt/tests/css/css-page/page-box-001-print.html
+++ b/tests/wpt/tests/css/css-page/page-box-001-print.html
@@ -7,6 +7,9 @@
     margin: 0;
     background: yellow;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 100px;
   }
diff --git a/tests/wpt/tests/css/css-page/page-box-002-print-ref.html b/tests/wpt/tests/css/css-page/page-box-002-print-ref.html
index e1ee4ab5d14..ab858280bc5 100644
--- a/tests/wpt/tests/css/css-page/page-box-002-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-box-002-print-ref.html
@@ -4,6 +4,9 @@
   @page {
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: #00f;
diff --git a/tests/wpt/tests/css/css-page/page-box-002-print.html b/tests/wpt/tests/css/css-page/page-box-002-print.html
index 3b87b6903dd..5557796a96e 100644
--- a/tests/wpt/tests/css/css-page/page-box-002-print.html
+++ b/tests/wpt/tests/css/css-page/page-box-002-print.html
@@ -3,6 +3,9 @@
 <link rel="help" href="https://drafts.csswg.org/css-page-3/#page-properties">
 <link rel="match" href="page-box-002-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   @page {
     margin: 0;
     background: #00f;
diff --git a/tests/wpt/tests/css/css-page/page-box-003-print-ref.html b/tests/wpt/tests/css/css-page/page-box-003-print-ref.html
index e1ee4ab5d14..ab858280bc5 100644
--- a/tests/wpt/tests/css/css-page/page-box-003-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-box-003-print-ref.html
@@ -4,6 +4,9 @@
   @page {
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: #00f;
diff --git a/tests/wpt/tests/css/css-page/page-box-003-print.html b/tests/wpt/tests/css/css-page/page-box-003-print.html
index 44cc13555b5..ff6c95cc54f 100644
--- a/tests/wpt/tests/css/css-page/page-box-003-print.html
+++ b/tests/wpt/tests/css/css-page/page-box-003-print.html
@@ -7,6 +7,9 @@
     margin: 0;
     background: #00f;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     background: linear-gradient(#f008, #f008);
   }
diff --git a/tests/wpt/tests/css/css-page/page-box-004-print-ref.html b/tests/wpt/tests/css/css-page/page-box-004-print-ref.html
index ab2fda9afb6..efae5d72693 100644
--- a/tests/wpt/tests/css/css-page/page-box-004-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-box-004-print-ref.html
@@ -11,6 +11,9 @@
   @page smaller {
     size: 400px 300px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-box-004-print.html b/tests/wpt/tests/css/css-page/page-box-004-print.html
index 91ea66090da..d2fd44db0a5 100644
--- a/tests/wpt/tests/css/css-page/page-box-004-print.html
+++ b/tests/wpt/tests/css/css-page/page-box-004-print.html
@@ -19,6 +19,9 @@
   @page smaller {
     size: 400px 300px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-box-005-print-ref.html b/tests/wpt/tests/css/css-page/page-box-005-print-ref.html
index 69e0061271d..f36320e247a 100644
--- a/tests/wpt/tests/css/css-page/page-box-005-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-box-005-print-ref.html
@@ -5,6 +5,9 @@
     size: 400px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-box-005-print.html b/tests/wpt/tests/css/css-page/page-box-005-print.html
index 02811b38fea..3636d878f5a 100644
--- a/tests/wpt/tests/css/css-page/page-box-005-print.html
+++ b/tests/wpt/tests/css/css-page/page-box-005-print.html
@@ -22,6 +22,9 @@
     color: black;
     background: cyan;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-box-006-print-ref.html b/tests/wpt/tests/css/css-page/page-box-006-print-ref.html
index c5081a41c48..f2806372b2a 100644
--- a/tests/wpt/tests/css/css-page/page-box-006-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-box-006-print-ref.html
@@ -5,6 +5,9 @@
     size: 400px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-box-006-print.html b/tests/wpt/tests/css/css-page/page-box-006-print.html
index eb6c2098978..208a0d6124e 100644
--- a/tests/wpt/tests/css/css-page/page-box-006-print.html
+++ b/tests/wpt/tests/css/css-page/page-box-006-print.html
@@ -11,6 +11,9 @@
   @page :first {
     background: white;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/page-box-007-print-ref.html b/tests/wpt/tests/css/css-page/page-box-007-print-ref.html
index 9f5550f8f58..68553d2d35a 100644
--- a/tests/wpt/tests/css/css-page/page-box-007-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-box-007-print-ref.html
@@ -5,6 +5,9 @@
     size: 400px 800px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-box-007-print.html b/tests/wpt/tests/css/css-page/page-box-007-print.html
index 2ed198b32ef..da8f79a9ad4 100644
--- a/tests/wpt/tests/css/css-page/page-box-007-print.html
+++ b/tests/wpt/tests/css/css-page/page-box-007-print.html
@@ -10,6 +10,9 @@
     padding: 5% 20% 15% 40%;
     background: red;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: hotpink;
diff --git a/tests/wpt/tests/css/css-page/page-box-008-print-ref.html b/tests/wpt/tests/css/css-page/page-box-008-print-ref.html
index 91ed0cec3fa..a0ec17f5c06 100644
--- a/tests/wpt/tests/css/css-page/page-box-008-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-box-008-print-ref.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
-  html {
+  :root {
+    print-color-adjust: exact;
     writing-mode: vertical-rl;
   }
   @page {
diff --git a/tests/wpt/tests/css/css-page/page-box-008-print.html b/tests/wpt/tests/css/css-page/page-box-008-print.html
index c05f0e24af0..34ab16ba424 100644
--- a/tests/wpt/tests/css/css-page/page-box-008-print.html
+++ b/tests/wpt/tests/css/css-page/page-box-008-print.html
@@ -19,6 +19,9 @@
     padding-block-end: 20%;
     background: blue;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: hotpink;
diff --git a/tests/wpt/tests/css/css-page/page-box-009-print-ref.html b/tests/wpt/tests/css/css-page/page-box-009-print-ref.html
index 3c034171d3b..0c61bd205ad 100644
--- a/tests/wpt/tests/css/css-page/page-box-009-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-box-009-print-ref.html
@@ -5,6 +5,9 @@
     size: 400px 800px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-box-009-print.html b/tests/wpt/tests/css/css-page/page-box-009-print.html
index dc9ced3bdf9..6d0766f71ea 100644
--- a/tests/wpt/tests/css/css-page/page-box-009-print.html
+++ b/tests/wpt/tests/css/css-page/page-box-009-print.html
@@ -17,6 +17,9 @@
     padding-block-end: 20%;
     background: blue;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: hotpink;
diff --git a/tests/wpt/tests/css/css-page/page-box-011-print-ref.html b/tests/wpt/tests/css/css-page/page-box-011-print-ref.html
index 7a961619275..c54855df242 100644
--- a/tests/wpt/tests/css/css-page/page-box-011-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-box-011-print-ref.html
@@ -4,6 +4,9 @@
   @page {
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     box-sizing: border-box;
     height: 100vh;
diff --git a/tests/wpt/tests/css/css-page/page-box-011-print.html b/tests/wpt/tests/css/css-page/page-box-011-print.html
index d6e51736d3a..548f5e165d6 100644
--- a/tests/wpt/tests/css/css-page/page-box-011-print.html
+++ b/tests/wpt/tests/css/css-page/page-box-011-print.html
@@ -11,6 +11,9 @@
     padding: 10px;
     background: yellow;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-left-right-001-print-ref.html b/tests/wpt/tests/css/css-page/page-left-right-001-print-ref.html
index 1eb011bed8a..7544f7d254f 100644
--- a/tests/wpt/tests/css/css-page/page-left-right-001-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-left-right-001-print-ref.html
@@ -5,6 +5,9 @@
     size: 600px 300px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-left-right-001-print.html b/tests/wpt/tests/css/css-page/page-left-right-001-print.html
index 044696fcca2..6026e75cfe2 100644
--- a/tests/wpt/tests/css/css-page/page-left-right-001-print.html
+++ b/tests/wpt/tests/css/css-page/page-left-right-001-print.html
@@ -15,6 +15,9 @@
     margin-right: 500px;
     margin-top: 200px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/page-left-right-002-print-ref.html b/tests/wpt/tests/css/css-page/page-left-right-002-print-ref.html
index 3480039046a..69e377b45aa 100644
--- a/tests/wpt/tests/css/css-page/page-left-right-002-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-left-right-002-print-ref.html
@@ -5,7 +5,8 @@
     size: 600px 300px;
     margin: 0;
   }
-  html {
+  :root {
+    print-color-adjust: exact;
     direction: rtl;
   }
   body {
diff --git a/tests/wpt/tests/css/css-page/page-left-right-002-print.html b/tests/wpt/tests/css/css-page/page-left-right-002-print.html
index 59e23479e6f..02f1f513b9e 100644
--- a/tests/wpt/tests/css/css-page/page-left-right-002-print.html
+++ b/tests/wpt/tests/css/css-page/page-left-right-002-print.html
@@ -15,7 +15,8 @@
     margin-left: 500px;
     margin-top: 200px;
   }
-  html {
+  :root {
+    print-color-adjust: exact;
     direction: rtl;
   }
   body {
diff --git a/tests/wpt/tests/css/css-page/page-margin-001-print-ref.html b/tests/wpt/tests/css/css-page/page-margin-001-print-ref.html
index 12ebd76dc91..6e98f8cd9e5 100644
--- a/tests/wpt/tests/css/css-page/page-margin-001-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-margin-001-print-ref.html
@@ -4,6 +4,9 @@
   @page {
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-margin-001-print.html b/tests/wpt/tests/css/css-page/page-margin-001-print.html
index c59b3c64276..0d6c8ce95c4 100644
--- a/tests/wpt/tests/css/css-page/page-margin-001-print.html
+++ b/tests/wpt/tests/css/css-page/page-margin-001-print.html
@@ -6,6 +6,9 @@
   @page {
     margin: 10px 20px 30px 40px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-margin-002-print-ref.html b/tests/wpt/tests/css/css-page/page-margin-002-print-ref.html
index 2b565048558..d925856597a 100644
--- a/tests/wpt/tests/css/css-page/page-margin-002-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-margin-002-print-ref.html
@@ -4,7 +4,8 @@
   @page {
     margin: 0;
   }
-  html {
+  :root {
+    print-color-adjust: exact;
     writing-mode: vertical-rl;
   }
   body {
diff --git a/tests/wpt/tests/css/css-page/page-margin-002-print.html b/tests/wpt/tests/css/css-page/page-margin-002-print.html
index 944d7efcfd0..42d0f0bc147 100644
--- a/tests/wpt/tests/css/css-page/page-margin-002-print.html
+++ b/tests/wpt/tests/css/css-page/page-margin-002-print.html
@@ -6,7 +6,8 @@
   @page {
     margin: 10px 20px 30px 40px;
   }
-  html {
+  :root {
+    print-color-adjust: exact;
     writing-mode: vertical-rl;
   }
   body {
diff --git a/tests/wpt/tests/css/css-page/page-margin-003-print-ref.html b/tests/wpt/tests/css/css-page/page-margin-003-print-ref.html
index 52bf7360908..64a2482fd3b 100644
--- a/tests/wpt/tests/css/css-page/page-margin-003-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-margin-003-print-ref.html
@@ -4,7 +4,8 @@
   @page {
     margin: 0;
   }
-  html {
+  :root {
+    print-color-adjust: exact;
     writing-mode: vertical-lr;
   }
   body {
diff --git a/tests/wpt/tests/css/css-page/page-margin-003-print.html b/tests/wpt/tests/css/css-page/page-margin-003-print.html
index e7410c02e09..93c6a1dca64 100644
--- a/tests/wpt/tests/css/css-page/page-margin-003-print.html
+++ b/tests/wpt/tests/css/css-page/page-margin-003-print.html
@@ -6,7 +6,8 @@
   @page {
     margin: 10px 20px 30px 40px;
   }
-  html {
+  :root {
+    print-color-adjust: exact;
     writing-mode: vertical-lr;
   }
   body {
diff --git a/tests/wpt/tests/css/css-page/page-margin-004-print-ref.html b/tests/wpt/tests/css/css-page/page-margin-004-print-ref.html
index 24549d49542..d36d4862b3b 100644
--- a/tests/wpt/tests/css/css-page/page-margin-004-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-margin-004-print-ref.html
@@ -6,6 +6,9 @@
     size: 300px;
     margin: 10px 20px 30px 40px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-margin-004-print.html b/tests/wpt/tests/css/css-page/page-margin-004-print.html
index cb9343dcf17..c621d4063a9 100644
--- a/tests/wpt/tests/css/css-page/page-margin-004-print.html
+++ b/tests/wpt/tests/css/css-page/page-margin-004-print.html
@@ -9,6 +9,9 @@
     size: 300px;
     margin: 10px 20px 30px 40px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-margin-005-print-ref.html b/tests/wpt/tests/css/css-page/page-margin-005-print-ref.html
index bd1829be383..e710123bf6f 100644
--- a/tests/wpt/tests/css/css-page/page-margin-005-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-margin-005-print-ref.html
@@ -5,6 +5,9 @@
     size: 600px 300px;
     margin: 30px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: cyan;
diff --git a/tests/wpt/tests/css/css-page/page-margin-005-print.html b/tests/wpt/tests/css/css-page/page-margin-005-print.html
index 8ca80bc6972..3c888422eef 100644
--- a/tests/wpt/tests/css/css-page/page-margin-005-print.html
+++ b/tests/wpt/tests/css/css-page/page-margin-005-print.html
@@ -8,6 +8,9 @@
     size: 600px 300px;
     margin: 10% 5%;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: cyan;
diff --git a/tests/wpt/tests/css/css-page/page-margin-006-print-ref.html b/tests/wpt/tests/css/css-page/page-margin-006-print-ref.html
index fe7a2c66db2..09f782d056e 100644
--- a/tests/wpt/tests/css/css-page/page-margin-006-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-margin-006-print-ref.html
@@ -5,7 +5,8 @@
     size: 6in;
     margin: 0.5in;
   }
-  html {
+  :root {
+    print-color-adjust: exact;
     background: yellow;
     margin: 0.5in;
   }
diff --git a/tests/wpt/tests/css/css-page/page-margin-006-print.html b/tests/wpt/tests/css/css-page/page-margin-006-print.html
index 43621acf809..0526d058ae6 100644
--- a/tests/wpt/tests/css/css-page/page-margin-006-print.html
+++ b/tests/wpt/tests/css/css-page/page-margin-006-print.html
@@ -9,7 +9,8 @@
     margin: 13px;
     margin: inherit;
   }
-  html {
+  :root {
+    print-color-adjust: exact;
     background: yellow;
     margin: 0.5in;
   }
diff --git a/tests/wpt/tests/css/css-page/page-margin-007-print-ref.html b/tests/wpt/tests/css/css-page/page-margin-007-print-ref.html
index 20d16df19de..ea1314d5380 100644
--- a/tests/wpt/tests/css/css-page/page-margin-007-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-margin-007-print-ref.html
@@ -5,6 +5,9 @@
     size: 400px 200px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-margin-007-print.html b/tests/wpt/tests/css/css-page/page-margin-007-print.html
index c2045d0dac2..2f6432b36fb 100644
--- a/tests/wpt/tests/css/css-page/page-margin-007-print.html
+++ b/tests/wpt/tests/css/css-page/page-margin-007-print.html
@@ -13,6 +13,9 @@
   @page :left {
     margin: 50px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-margin-auto-and-non-zero-print-ref.html b/tests/wpt/tests/css/css-page/page-margin-auto-and-non-zero-print-ref.html
index 5f9be531886..bb23bbb2aff 100644
--- a/tests/wpt/tests/css/css-page/page-margin-auto-and-non-zero-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-margin-auto-and-non-zero-print-ref.html
@@ -5,6 +5,9 @@
     size: 20em 7em;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   .pagebox {
     break-before: page;
     display: flex;
diff --git a/tests/wpt/tests/css/css-page/page-margin-auto-and-non-zero-print.html b/tests/wpt/tests/css/css-page/page-margin-auto-and-non-zero-print.html
index 6287c2a1032..634bc12616f 100644
--- a/tests/wpt/tests/css/css-page/page-margin-auto-and-non-zero-print.html
+++ b/tests/wpt/tests/css/css-page/page-margin-auto-and-non-zero-print.html
@@ -27,6 +27,9 @@
     margin-bottom: auto;
     margin-right: auto;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/page-margin-auto-negative-print-ref.tentative.html b/tests/wpt/tests/css/css-page/page-margin-auto-negative-print-ref.tentative.html
index 9e816c12fb7..63a32ea9d07 100644
--- a/tests/wpt/tests/css/css-page/page-margin-auto-negative-print-ref.tentative.html
+++ b/tests/wpt/tests/css/css-page/page-margin-auto-negative-print-ref.tentative.html
@@ -5,6 +5,9 @@
     size: 300px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: green;
diff --git a/tests/wpt/tests/css/css-page/page-margin-auto-negative-print.tentative.html b/tests/wpt/tests/css/css-page/page-margin-auto-negative-print.tentative.html
index 452056a1003..64efb19bccb 100644
--- a/tests/wpt/tests/css/css-page/page-margin-auto-negative-print.tentative.html
+++ b/tests/wpt/tests/css/css-page/page-margin-auto-negative-print.tentative.html
@@ -10,6 +10,9 @@
     height: 340px;
     margin: auto;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/page-margin-auto-print-ref.html b/tests/wpt/tests/css/css-page/page-margin-auto-print-ref.html
index d7fda4ab6d9..e27de9353ff 100644
--- a/tests/wpt/tests/css/css-page/page-margin-auto-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-margin-auto-print-ref.html
@@ -5,6 +5,9 @@
     size: 20em 7em;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   .pagebox {
     break-before: page;
     display: flex;
diff --git a/tests/wpt/tests/css/css-page/page-margin-auto-print.html b/tests/wpt/tests/css/css-page/page-margin-auto-print.html
index 1c94ec4e498..14a23a31db2 100644
--- a/tests/wpt/tests/css/css-page/page-margin-auto-print.html
+++ b/tests/wpt/tests/css/css-page/page-margin-auto-print.html
@@ -28,6 +28,9 @@
     margin-bottom: 0;
     margin-right: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/page-margin-negative-print-ref.tentative.html b/tests/wpt/tests/css/css-page/page-margin-negative-print-ref.tentative.html
index 9e816c12fb7..63a32ea9d07 100644
--- a/tests/wpt/tests/css/css-page/page-margin-negative-print-ref.tentative.html
+++ b/tests/wpt/tests/css/css-page/page-margin-negative-print-ref.tentative.html
@@ -5,6 +5,9 @@
     size: 300px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: green;
diff --git a/tests/wpt/tests/css/css-page/page-margin-negative-print.tentative.html b/tests/wpt/tests/css/css-page/page-margin-negative-print.tentative.html
index 205a13f7a58..e8d48bccde5 100644
--- a/tests/wpt/tests/css/css-page/page-margin-negative-print.tentative.html
+++ b/tests/wpt/tests/css/css-page/page-margin-negative-print.tentative.html
@@ -8,6 +8,9 @@
     size: 300px;
     margin: -20px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/page-name-unnamed-trailing-001-print-ref.html b/tests/wpt/tests/css/css-page/page-name-unnamed-trailing-001-print-ref.html
index 6cb29e1c7c6..b6da8ba1aae 100644
--- a/tests/wpt/tests/css/css-page/page-name-unnamed-trailing-001-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-name-unnamed-trailing-001-print-ref.html
@@ -16,6 +16,9 @@
     margin: 20px;
     page-orientation: rotate-left;
 }
+:root {
+  print-color-adjust: exact;
+}
 body{
     margin: 0;
 }
diff --git a/tests/wpt/tests/css/css-page/page-name-unnamed-trailing-001-print.html b/tests/wpt/tests/css/css-page/page-name-unnamed-trailing-001-print.html
index 61baa23603f..7e78a9e3b21 100644
--- a/tests/wpt/tests/css/css-page/page-name-unnamed-trailing-001-print.html
+++ b/tests/wpt/tests/css/css-page/page-name-unnamed-trailing-001-print.html
@@ -16,6 +16,9 @@
     margin: 20px;
     page-orientation: rotate-left;
 }
+:root {
+  print-color-adjust: exact;
+}
 body{
     margin: 0;
 }
diff --git a/tests/wpt/tests/css/css-page/page-rule-declarations-000.html b/tests/wpt/tests/css/css-page/page-rule-declarations-000.html
index cbe53855a0a..a1a63c9f38c 100644
--- a/tests/wpt/tests/css/css-page/page-rule-declarations-000.html
+++ b/tests/wpt/tests/css/css-page/page-rule-declarations-000.html
@@ -8,6 +8,9 @@
 <script src="/resources/testharnessreport.js"></script>
 
 <style type="text/css">
+    :root {
+      print-color-adjust: exact;
+    }
 
     @page :visited { /* :visited is invalid for @page */
         color: red;
diff --git a/tests/wpt/tests/css/css-page/page-size-004-print-ref.html b/tests/wpt/tests/css/css-page/page-size-004-print-ref.html
index 0468a745b23..30a4e25ff36 100644
--- a/tests/wpt/tests/css/css-page/page-size-004-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-size-004-print-ref.html
@@ -8,6 +8,9 @@
   @page :first {
     size: 100px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-004-print.html b/tests/wpt/tests/css/css-page/page-size-004-print.html
index 125d7636d26..05fb8ba0978 100644
--- a/tests/wpt/tests/css/css-page/page-size-004-print.html
+++ b/tests/wpt/tests/css/css-page/page-size-004-print.html
@@ -10,6 +10,9 @@
   @page :first {
     size: 100px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-005-print-ref.html b/tests/wpt/tests/css/css-page/page-size-005-print-ref.html
index c2e07daa295..40127909c2b 100644
--- a/tests/wpt/tests/css/css-page/page-size-005-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-size-005-print-ref.html
@@ -8,6 +8,9 @@
   @page :first {
     size: 500px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-005-print.html b/tests/wpt/tests/css/css-page/page-size-005-print.html
index 37876ae230e..a3909f944a3 100644
--- a/tests/wpt/tests/css/css-page/page-size-005-print.html
+++ b/tests/wpt/tests/css/css-page/page-size-005-print.html
@@ -10,6 +10,9 @@
   @page :first {
     size: 500px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-007-print-ref.html b/tests/wpt/tests/css/css-page/page-size-007-print-ref.html
index 9498e2c17b2..a669ba05029 100644
--- a/tests/wpt/tests/css/css-page/page-size-007-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-size-007-print-ref.html
@@ -11,6 +11,9 @@
   @page larger {
     size: 640px 400px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-007-print.html b/tests/wpt/tests/css/css-page/page-size-007-print.html
index 50ab2f4d109..1a7b823fbfe 100644
--- a/tests/wpt/tests/css/css-page/page-size-007-print.html
+++ b/tests/wpt/tests/css/css-page/page-size-007-print.html
@@ -14,6 +14,9 @@
   @page larger {
     size: 640px 400px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-008-print-ref.html b/tests/wpt/tests/css/css-page/page-size-008-print-ref.html
index f50ad3531e4..19742482c6c 100644
--- a/tests/wpt/tests/css/css-page/page-size-008-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-size-008-print-ref.html
@@ -11,6 +11,9 @@
   @page larger {
     size: 640px 400px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-008-print.html b/tests/wpt/tests/css/css-page/page-size-008-print.html
index 683bdc3a50a..63600bf5ef7 100644
--- a/tests/wpt/tests/css/css-page/page-size-008-print.html
+++ b/tests/wpt/tests/css/css-page/page-size-008-print.html
@@ -14,6 +14,9 @@
   @page larger {
     size: 640px 400px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-009-print-ref.html b/tests/wpt/tests/css/css-page/page-size-009-print-ref.html
index 86ffa278c93..0157c5a68e7 100644
--- a/tests/wpt/tests/css/css-page/page-size-009-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-size-009-print-ref.html
@@ -8,6 +8,9 @@
   @page :first {
     size: 200px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-009-print.html b/tests/wpt/tests/css/css-page/page-size-009-print.html
index 48ead4eab38..b362ad58cdb 100644
--- a/tests/wpt/tests/css/css-page/page-size-009-print.html
+++ b/tests/wpt/tests/css/css-page/page-size-009-print.html
@@ -11,6 +11,9 @@
   @page smaller {
     size: 200px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-012-print-ref.html b/tests/wpt/tests/css/css-page/page-size-012-print-ref.html
index e85e5f07850..dd5e2288461 100644
--- a/tests/wpt/tests/css/css-page/page-size-012-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-size-012-print-ref.html
@@ -5,6 +5,9 @@
     size: 600px 400px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0; }
 </style>
 <div style="margin-left:auto; margin-right:50px; writing-mode:vertical-rl; height:400px; background:yellow;">
diff --git a/tests/wpt/tests/css/css-page/page-size-012-print.html b/tests/wpt/tests/css/css-page/page-size-012-print.html
index 737b37cbc3d..d4ddd996514 100644
--- a/tests/wpt/tests/css/css-page/page-size-012-print.html
+++ b/tests/wpt/tests/css/css-page/page-size-012-print.html
@@ -14,7 +14,8 @@
     margin-inline-start: 0;
     margin-block-start: 50px;
   }
-  html {
+  :root {
+    print-color-adjust: exact;
     writing-mode: vertical-rl;
   }
   body { margin: 0; }
diff --git a/tests/wpt/tests/css/css-page/page-size-013-print-ref.html b/tests/wpt/tests/css/css-page/page-size-013-print-ref.html
index 23c93e5c47a..3f2f3113693 100644
--- a/tests/wpt/tests/css/css-page/page-size-013-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-size-013-print-ref.html
@@ -5,6 +5,9 @@
     size: 300px 400px;
     margin: 50px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-013-print.html b/tests/wpt/tests/css/css-page/page-size-013-print.html
index 5768e2d54cb..a2fd9fe9993 100644
--- a/tests/wpt/tests/css/css-page/page-size-013-print.html
+++ b/tests/wpt/tests/css/css-page/page-size-013-print.html
@@ -10,6 +10,9 @@
     width: 200px;
     height: 300px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-014-print-ref.html b/tests/wpt/tests/css/css-page/page-size-014-print-ref.html
index 23c93e5c47a..3f2f3113693 100644
--- a/tests/wpt/tests/css/css-page/page-size-014-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-size-014-print-ref.html
@@ -5,6 +5,9 @@
     size: 300px 400px;
     margin: 50px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-014-print.html b/tests/wpt/tests/css/css-page/page-size-014-print.html
index f224bafaa87..4188e59cf61 100644
--- a/tests/wpt/tests/css/css-page/page-size-014-print.html
+++ b/tests/wpt/tests/css/css-page/page-size-014-print.html
@@ -10,6 +10,9 @@
     width: 40%;
     height: 60%;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-016-print-ref.html b/tests/wpt/tests/css/css-page/page-size-016-print-ref.html
index c9818f3af12..accd468bba8 100644
--- a/tests/wpt/tests/css/css-page/page-size-016-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-size-016-print-ref.html
@@ -5,6 +5,9 @@
     size: 7.5in 7in;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-016-print.tentative.html b/tests/wpt/tests/css/css-page/page-size-016-print.tentative.html
index 0fd12954c66..7c410a3cd28 100644
--- a/tests/wpt/tests/css/css-page/page-size-016-print.tentative.html
+++ b/tests/wpt/tests/css/css-page/page-size-016-print.tentative.html
@@ -16,6 +16,9 @@
        using viewport units. */
     size: 1234px;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/page-size-017-print-ref.html b/tests/wpt/tests/css/css-page/page-size-017-print-ref.html
index 72508e3d030..589460ef2b8 100644
--- a/tests/wpt/tests/css/css-page/page-size-017-print-ref.html
+++ b/tests/wpt/tests/css/css-page/page-size-017-print-ref.html
@@ -6,6 +6,9 @@
     size: 6in 5in;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
   }
diff --git a/tests/wpt/tests/css/css-page/page-size-017-print.tentative.html b/tests/wpt/tests/css/css-page/page-size-017-print.tentative.html
index e036e83f717..a63eac3052e 100644
--- a/tests/wpt/tests/css/css-page/page-size-017-print.tentative.html
+++ b/tests/wpt/tests/css/css-page/page-size-017-print.tentative.html
@@ -10,6 +10,9 @@
     size: 200vh 100vw; /* 6 by 5 inches */
     margin: 10vw; /* 0.5in */
   }
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     margin: 0;
     background: yellow;
diff --git a/tests/wpt/tests/css/css-page/reference/filled-green-100px-square-print-ref.html b/tests/wpt/tests/css/css-page/reference/filled-green-100px-square-print-ref.html
index d4834d1358a..52a58045776 100644
--- a/tests/wpt/tests/css/css-page/reference/filled-green-100px-square-print-ref.html
+++ b/tests/wpt/tests/css/css-page/reference/filled-green-100px-square-print-ref.html
@@ -1,4 +1,9 @@
 <!DOCTYPE html>
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 <div style="width:100px; height:100px; background:green;"></div>
diff --git a/tests/wpt/tests/css/css-page/reference/monolithic-overflow-4-pages-print-ref.html b/tests/wpt/tests/css/css-page/reference/monolithic-overflow-4-pages-print-ref.html
index c115782d6ad..0a93575d028 100644
--- a/tests/wpt/tests/css/css-page/reference/monolithic-overflow-4-pages-print-ref.html
+++ b/tests/wpt/tests/css/css-page/reference/monolithic-overflow-4-pages-print-ref.html
@@ -2,6 +2,9 @@
 <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
 <style>
   body { margin: 0; }
+  :root {
+    print-color-adjust: exact;
+  }
 </style>
 <div style="background:yellow;">
   <div style="width:50px; height:350vh; background:hotpink;"></div>
diff --git a/tests/wpt/tests/css/css-page/resources/mq-frame-100px.html b/tests/wpt/tests/css/css-page/resources/mq-frame-100px.html
index ed823c09e89..48ee9e390a3 100644
--- a/tests/wpt/tests/css/css-page/resources/mq-frame-100px.html
+++ b/tests/wpt/tests/css/css-page/resources/mq-frame-100px.html
@@ -1,5 +1,8 @@
 <!DOCTYPE html>
 <style>
+:root {
+  print-color-adjust: exact;
+}
 body {
   margin: 0;
 }
diff --git a/tests/wpt/tests/css/css-page/root-element-display-none-print.html b/tests/wpt/tests/css/css-page/root-element-display-none-print.html
index d6802f62251..d7cc3062759 100644
--- a/tests/wpt/tests/css/css-page/root-element-display-none-print.html
+++ b/tests/wpt/tests/css/css-page/root-element-display-none-print.html
@@ -8,6 +8,9 @@
     border: solid red;
     background: hotpink;
   }
+  :root {
+    print-color-adjust: exact;
+  }
   html {
     display: none;
   }
diff --git a/tests/wpt/tests/css/css-page/subpixel-page-size-001-print.html b/tests/wpt/tests/css/css-page/subpixel-page-size-001-print.html
index 9054cd4513f..4108d9bdd28 100644
--- a/tests/wpt/tests/css/css-page/subpixel-page-size-001-print.html
+++ b/tests/wpt/tests/css/css-page/subpixel-page-size-001-print.html
@@ -9,6 +9,9 @@
     size: 400px 123.9px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
 </style>
 <div style="height:123.9px; background:red;">
   This page should not be printed.
diff --git a/tests/wpt/tests/css/css-page/subpixel-page-size-002-print.html b/tests/wpt/tests/css/css-page/subpixel-page-size-002-print.html
index 463cb21f25d..d71da40fa5e 100644
--- a/tests/wpt/tests/css/css-page/subpixel-page-size-002-print.html
+++ b/tests/wpt/tests/css/css-page/subpixel-page-size-002-print.html
@@ -9,6 +9,9 @@
     size: 400px 123.1px;
     margin: 0;
   }
+  :root {
+    print-color-adjust: exact;
+  }
 </style>
 <div style="height:123.1px; background:red;">
   This page should not be printed.
diff --git a/tests/wpt/tests/css/css-position/position-fixed-overflow-print-ref.html b/tests/wpt/tests/css/css-position/position-fixed-overflow-print-ref.html
index 0fb21d47f54..e97d667764a 100644
--- a/tests/wpt/tests/css/css-position/position-fixed-overflow-print-ref.html
+++ b/tests/wpt/tests/css/css-position/position-fixed-overflow-print-ref.html
@@ -1,6 +1,9 @@
 <!doctype html>
 <title>Test reference</title>
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0 }
 
   #outer, #inner {
diff --git a/tests/wpt/tests/css/css-position/position-fixed-overflow-print.html b/tests/wpt/tests/css/css-position/position-fixed-overflow-print.html
index cf5cf2ea530..497556bd9b9 100644
--- a/tests/wpt/tests/css/css-position/position-fixed-overflow-print.html
+++ b/tests/wpt/tests/css/css-position/position-fixed-overflow-print.html
@@ -6,6 +6,9 @@
 <link rel="help" href="https://drafts.csswg.org/css-position/#abspos-insets">
 <link rel="match" href="position-fixed-overflow-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body { margin: 0 }
 
   #outer, #inner {
diff --git a/tests/wpt/tests/css/css-position/sticky/position-sticky-offset-print.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-offset-print.html
index 3954bbcf441..f74a30c7a98 100644
--- a/tests/wpt/tests/css/css-position/sticky/position-sticky-offset-print.html
+++ b/tests/wpt/tests/css/css-position/sticky/position-sticky-offset-print.html
@@ -1,6 +1,11 @@
 <!DOCTYPE html>
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1485969">
-<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-print-ref.html">
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 <div id="scroller" style="position:relative; width:200px; height:100px; overflow:hidden;">
   <div style="position:absolute; width:1000px;">
diff --git a/tests/wpt/tests/css/css-position/sticky/position-sticky-table-pixel-rounding-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-pixel-rounding-ref.html
new file mode 100644
index 00000000000..83313e0ad10
--- /dev/null
+++ b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-pixel-rounding-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+  <style>
+      table {
+        border-spacing: 0;
+      }
+      td {
+          padding: 0px 9.6px;
+          background-color: #fff;
+      }
+      .sticky {
+          position: sticky;
+          left: 0px;
+          background-color: #c3c3c3;
+      }
+  </style>
+  <table>
+    <tr>
+      <td class="sticky" style="width: 64px"></td>
+      <td class="sticky" style="width: 10px"></td>
+      <td class="sticky">Content</td>
+    </tr>
+  </table>
+
diff --git a/tests/wpt/tests/css/css-position/sticky/position-sticky-table-pixel-rounding.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-pixel-rounding.html
new file mode 100644
index 00000000000..3bda20efc9d
--- /dev/null
+++ b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-pixel-rounding.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+  <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
+  <link rel="match" href="position-sticky-table-pixel-rounding-ref.html" />
+  <link rel="author" title="Chris Harrelson" href="mailto:chrishtr@chromium.org" />
+  <meta name="assert" content="Passes if there is no gap between the second and third column">
+  <style>
+      table {
+        border-spacing: 0;
+      }
+      td {
+          padding: 0px 9.6px;
+          background-color: #fff;
+      }
+      .sticky {
+          position: sticky;
+          left: 0px;
+          background-color: #c3c3c3;
+      }
+  </style>
+  <table>
+    <tr>
+      <td class="sticky" style="width: 64.138px"></td>
+      <td class="sticky" style="width: 10px"></td>
+      <td class="sticky">Content</td>
+    </tr>
+  </table>
+
diff --git a/tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-subpixel-zoom-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-subpixel-zoom-ref.html
new file mode 100644
index 00000000000..719319b4da9
--- /dev/null
+++ b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-subpixel-zoom-ref.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- Passes if a black transparent rectangle is painted with 1px borders. -->
+<html style="zoom: 1.5625; overflow:hidden;">
+  <style>
+    table {
+      border-spacing: 0; width:200px;}
+    td {
+      border: 1px solid black;
+      width: 100px;
+      height: 20px;
+    }
+    div::-webkit-scrollbar {
+      display: none;
+    }
+    div {
+      height:100px;
+      overflow:auto;
+    }
+  </style>
+
+  <div style="">
+    <table>
+      <tr>
+        <td style="";></td>
+      </tr>
+    </table>
+    <div style="height: 1000px;"></div>
+  </div>
+</html>
diff --git a/tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-subpixel-zoom.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-subpixel-zoom.html
new file mode 100644
index 00000000000..ecdda37c39a
--- /dev/null
+++ b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-subpixel-zoom.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!-- Passes if a black transparent rectangle is painted with 1px borders. -->
+<html style="zoom: 1.5625; overflow:hidden;">
+  <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
+  <meta name="assert" content="Position sticky pixel-snaps correctly under zoom" />
+  <link rel="match" href="position-sticky-table-td-subpixel-zoom-ref.html" />
+
+  <style>
+    table {
+      border-spacing: 0; width:200px;}
+    tr {
+      top: 0; position: sticky;
+    }
+    td {
+      border: 1px solid black;
+      width: 100px;
+      height: 20px;
+    }
+    div::-webkit-scrollbar {
+      display: none;
+    }
+    div {
+      height:100px;
+      overflow:auto;
+    }
+  </style>
+
+  <div style="">
+    <table>
+      <tr>
+        <td style="";></td>
+      </tr>
+    </table>
+    <div style="height: 1000px;"></div>
+  </div>
+</html>
diff --git a/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-number-percentage.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-number-percentage.html
new file mode 100644
index 00000000000..5ec938182ee
--- /dev/null
+++ b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-number-percentage.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<title>CSS Properties and Values API Test: Transitions between percentages and numbers are discrete</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+  transition_test({
+    syntax: "<number>|<percentage>",
+    from: "100",
+    to: "200%",
+    expected: "200%",
+    behavior: 'allow-discrete',
+  }, 'A custom property with <number>|<percentage> syntax should not transition between values of the different types');
+</script>
diff --git a/tests/wpt/tests/css/css-pseudo/WEB_FEATURES.yml b/tests/wpt/tests/css/css-pseudo/WEB_FEATURES.yml
index ac89c2b7313..780cca251d6 100644
--- a/tests/wpt/tests/css/css-pseudo/WEB_FEATURES.yml
+++ b/tests/wpt/tests/css/css-pseudo/WEB_FEATURES.yml
@@ -2,16 +2,25 @@ features:
 - name: target-text
   files:
   - target-text-*
-features:
 - name: spelling-grammar-error
   files:
   - spelling-error-*
   - grammar-spelling-errors-*
-features:
 - name: marker
   files:
   - marker-*
-features:
+  - first-letter-exclude-block-child-marker.html
+  - first-letter-exclude-inline-child-marker.html
+  - first-letter-exclude-inline-marker.html
+  - first-letter-skip-marker.html
+  - first-line-and-marker.html
+  - outside-marker-paint-order.html
 - name: file-selector-button
   files:
   - file-selector-button-*
+- name: first-letter
+  files:
+  - first-letter-*
+- name: first-line
+  files:
+  - first-line-*
diff --git a/tests/wpt/tests/css/css-pseudo/focus-visible-originating-element.html b/tests/wpt/tests/css/css-pseudo/focus-visible-originating-element.html
new file mode 100644
index 00000000000..05fc8232491
--- /dev/null
+++ b/tests/wpt/tests/css/css-pseudo/focus-visible-originating-element.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Test: ::before matches when originating element has :focus-visible selector</title>
+<link rel="help" href="https://drafts.csswg.org/css-pseudo/#generated-content">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  input {
+    outline: none;
+
+    &:not(:disabled):focus-visible::before {
+      background-color: green;
+    }
+  }
+
+  input::before {
+    content: "";
+    background-color: red;
+    display: inline-block;
+    height: 50px;
+    width: 50px;
+  }
+</style>
+<input type="checkbox" id="target"/>
+<script>
+  promise_test(async t => {
+    const kTab = '\uE004';
+    await new test_driver.Actions()
+      .keyDown(kTab)
+      .keyUp(kTab)
+      .send();
+    assert_equals(getComputedStyle(target, "::before").backgroundColor, "rgb(0, 128, 0)");
+  });
+</script>
diff --git a/tests/wpt/tests/css/css-pseudo/parsing/WEB_FEATURES.yml b/tests/wpt/tests/css/css-pseudo/parsing/WEB_FEATURES.yml
new file mode 100644
index 00000000000..2a5edba05a1
--- /dev/null
+++ b/tests/wpt/tests/css/css-pseudo/parsing/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: marker
+  files:
+  - marker-*
diff --git a/tests/wpt/tests/css/css-ruby/ruby-inlinize-fieldset-crash.html b/tests/wpt/tests/css/css-ruby/ruby-inlinize-fieldset-crash.html
new file mode 100644
index 00000000000..09ad1821bad
--- /dev/null
+++ b/tests/wpt/tests/css/css-ruby/ruby-inlinize-fieldset-crash.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>crbug.com/402200344</title>
+<ruby><i>
+<object classid="5Ygt" name="NEefr" type="text/javascript"><fieldset style="display:contents;"><header></header>
+</object>
+</i>
+<rt>ô6Ì9ºÍ¶æ</ruby>
+
+<!-- The following is a testcase for a regression by the fix for the above.
+     crbug.com/406999114 -->
+<svg style="display:none" id="ref-parent"><path id="ref"></path></svg>
+<ruby><svg><use xlink:href="#ref"/></svg></ruby>
diff --git a/tests/wpt/tests/css/css-scoping/WEB_FEATURES.yml b/tests/wpt/tests/css/css-scoping/WEB_FEATURES.yml
new file mode 100644
index 00000000000..88e56feb543
--- /dev/null
+++ b/tests/wpt/tests/css/css-scoping/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: has-slotted
+  files:
+  - has-slotted-*
diff --git a/tests/wpt/tests/css/css-scoping/has-slotted-001.html b/tests/wpt/tests/css/css-scoping/has-slotted-001.html
index e750d97a180..4e3de3f6adb 100644
--- a/tests/wpt/tests/css/css-scoping/has-slotted-001.html
+++ b/tests/wpt/tests/css/css-scoping/has-slotted-001.html
@@ -1,6 +1,5 @@
 <!doctype html>
 <meta charset="utf-8">
-<title>:has-slotted</title>
 <link rel="help" href="https://github.com/w3c/csswg-drafts/pull/10586">
 <link rel="match" href="/css/reference/ref-filled-green-100px-square-only.html">
 <p>Test passes if there is a filled green square.</p>
diff --git a/tests/wpt/tests/css/css-scoping/has-slotted-003.html b/tests/wpt/tests/css/css-scoping/has-slotted-003.html
index 7578413ff39..d13911e96b7 100644
--- a/tests/wpt/tests/css/css-scoping/has-slotted-003.html
+++ b/tests/wpt/tests/css/css-scoping/has-slotted-003.html
@@ -1,6 +1,5 @@
 <!doctype html>
 <meta charset="utf-8">
-<title>:has-slotted</title>
 <link rel="help" href="https://github.com/w3c/csswg-drafts/pull/10586">
 <link rel="match" href="/css/reference/ref-filled-green-100px-square-only.html">
 <p>Test passes if there is a filled green square.</p>
diff --git a/tests/wpt/tests/css/css-scoping/host-has-internal-004.html b/tests/wpt/tests/css/css-scoping/host-has-internal-004.html
new file mode 100644
index 00000000000..fe51186f59f
--- /dev/null
+++ b/tests/wpt/tests/css/css-scoping/host-has-internal-004.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>:has(...):host internal descendent</title>
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#host-selector">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<div id="host">
+    <template shadowrootmode="open">
+      <style>
+        div {
+          width: 100px;
+          height: 100px;
+          background-color: red;
+        }
+        :has(section):host div {
+          background-color: green;
+        }
+      </style>
+      <span><div></div></span>
+      <section></section>
+    </template>
+</div>
diff --git a/tests/wpt/tests/css/css-scoping/slotted-has-001.html b/tests/wpt/tests/css/css-scoping/slotted-has-001.html
index f70bac7eca3..dcb11ec32ea 100644
--- a/tests/wpt/tests/css/css-scoping/slotted-has-001.html
+++ b/tests/wpt/tests/css/css-scoping/slotted-has-001.html
@@ -1,6 +1,5 @@
 <!doctype html>
 <meta charset="utf-8">
-<title>:has-slotted</title>
 <link rel="help" href="https://github.com/w3c/csswg-drafts/pull/10586">
 <link rel="match" href="/css/reference/ref-filled-green-100px-square-only.html">
 <p>Test passes if there is a filled green square.</p>
diff --git a/tests/wpt/tests/css/css-scoping/slotted-has-002.html b/tests/wpt/tests/css/css-scoping/slotted-has-002.html
index 9ecbea5d413..5e709a96961 100644
--- a/tests/wpt/tests/css/css-scoping/slotted-has-002.html
+++ b/tests/wpt/tests/css/css-scoping/slotted-has-002.html
@@ -1,6 +1,5 @@
 <!doctype html>
 <meta charset="utf-8">
-<title>:has-slotted</title>
 <link rel="help" href="https://github.com/w3c/csswg-drafts/pull/10586">
 <link rel="match" href="/css/reference/ref-filled-green-100px-square-only.html">
 <p>Test passes if there is a filled green square.</p>
diff --git a/tests/wpt/tests/css/css-scoping/slotted-has-003.html b/tests/wpt/tests/css/css-scoping/slotted-has-003.html
index 1ea412492c5..548f2c5d421 100644
--- a/tests/wpt/tests/css/css-scoping/slotted-has-003.html
+++ b/tests/wpt/tests/css/css-scoping/slotted-has-003.html
@@ -1,6 +1,5 @@
 <!doctype html>
 <meta charset="utf-8">
-<title>:has-slotted</title>
 <link rel="help" href="https://github.com/w3c/csswg-drafts/pull/10586">
 <link rel="match" href="/css/reference/ref-filled-green-100px-square-only.html">
 <p>Test passes if there is a filled green square.</p>
diff --git a/tests/wpt/tests/css/css-scoping/slotted-has-004.html b/tests/wpt/tests/css/css-scoping/slotted-has-004.html
index adf50da13a9..7e76b1b6de6 100644
--- a/tests/wpt/tests/css/css-scoping/slotted-has-004.html
+++ b/tests/wpt/tests/css/css-scoping/slotted-has-004.html
@@ -1,6 +1,5 @@
 <!doctype html>
 <meta charset="utf-8">
-<title>:has-slotted</title>
 <link rel="help" href="https://github.com/w3c/csswg-drafts/pull/10586">
 <link rel="match" href="/css/reference/ref-filled-green-100px-square-only.html">
 <p>Test passes if there is a filled green square.</p>
diff --git a/tests/wpt/tests/css/css-scroll-anchoring/table-col-and-dead-row-group-crash.html b/tests/wpt/tests/css/css-scroll-anchoring/table-col-and-dead-row-group-crash.html
new file mode 100644
index 00000000000..e6e90a63a34
--- /dev/null
+++ b/tests/wpt/tests/css/css-scroll-anchoring/table-col-and-dead-row-group-crash.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://issues.chromium.org/issues/416061199">
+<div style="display:table;">
+  <div style="display:table-column-group;"></div>
+  <div id="e13" style="display:table-row-group;">
+    <div style="height:200vh;"></div>
+    x
+  </div>
+</div>
+<script>
+  window.scroll(0, 100);
+  e13.style.display = "none";
+</script>
diff --git a/tests/wpt/tests/css/css-scroll-snap/input/snap-area-overflow-boundary-viewport-covering.tentative.html b/tests/wpt/tests/css/css-scroll-snap/input/snap-area-overflow-boundary-viewport-covering.tentative.html
index 1c6caf224ac..5c03c049a01 100644
--- a/tests/wpt/tests/css/css-scroll-snap/input/snap-area-overflow-boundary-viewport-covering.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap/input/snap-area-overflow-boundary-viewport-covering.tentative.html
@@ -118,8 +118,8 @@ promise_test(async t => {
 }, "Keyboard scrolling with vertical snap-area overflow");
 
 promise_test(async t => {
+  await waitForScrollReset(t, scroller);
   await waitForCompositorCommit();
-  scroller.scrollTo(0, 0);
   assert_equals(scroller.scrollTop, 0, "verify test pre-condition");
 
   // Ensure we can freely scroll in an oversized element.
diff --git a/tests/wpt/tests/css/css-scroll-snap/scroll-start/scroll-start-overflow-toggled.tentative.html b/tests/wpt/tests/css/css-scroll-snap/scroll-start/scroll-start-overflow-toggled.tentative.html
index 8829519024a..8c0f2a45177 100644
--- a/tests/wpt/tests/css/css-scroll-snap/scroll-start/scroll-start-overflow-toggled.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap/scroll-start/scroll-start-overflow-toggled.tentative.html
@@ -44,7 +44,7 @@
       scroller.scrollLeft = 100;
       // Allow for an animation frame that might be needed for the update to take
       // place.
-      await requestAnimationFrame(() => { });
+      await new Promise(r => requestAnimationFrame(r));
       assert_equals(scroller.scrollTop, 200,
         "vertical scroll position is programmatically adjusted");
       assert_equals(scroller.scrollLeft, 100,
@@ -64,4 +64,4 @@
         "toggle.");
     }, "scroll-start sets scroller position if overflow is not visible");
   </script>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/resnap-on-oveflow-hidden-container.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/resnap-on-oveflow-hidden-container.html
new file mode 100644
index 00000000000..41e454b2789
--- /dev/null
+++ b/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/resnap-on-oveflow-hidden-container.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-scroll-snap/#re-snap" />
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1946375">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+#scroller {
+  display: flex;
+  overflow-x: hidden;
+  scroll-snap-align: start;
+  scroll-snap-type: x mandatory;
+  width: 500px;
+  height: 200px;
+  position: absolute;
+}
+.child {
+  display: flex;
+  flex: 0 0 500px;
+  scroll-snap-align: start;
+  width: 500px;
+  height: 100%;
+  align-items: center;
+  justify-content: center;
+  font-size: 30px;
+}
+</style>
+<div id="scroller">
+  <div class="child" style="background-color: blue;">1</div>
+  <div class="child" style="background-color: green;">2</div>
+  <div class="child" style="background-color: yellow;">3</div>
+</div>
+<script>
+promise_test(async () => {
+  assert_equals(scroller.scrollLeft, 0, "The initial scroll position");
+
+  const scrollPromise = new Promise(resolve => {
+    scroller.addEventListener("scroll", resolve);
+  });
+  // Do an async scroll operation to the second child.
+  scroller.scrollTo({ left: 500, behavior: "smooth" });
+
+  // Wait a scroll event.
+  await scrollPromise;
+
+  // Assuming that the current scroll position is not yet the scroll
+  // destination, i.e. during the async scroll is runnig try to do
+  // a new async scroll operation to the third child.
+  const scrollendPromise = new Promise(resolve => {
+    scroller.addEventListener("scrollend", resolve);
+  });
+  scroller.scrollTo({ left: 1000, behavior: "smooth" });
+  await scrollendPromise;
+
+  assert_equals(scroller.scrollLeft, 1000,
+    "Now the scroll position should be 1000px");
+
+  // Change a child element width so that re-snapping will happen.
+  document.querySelectorAll(".child")[0].style.width = "501px";
+
+  assert_equals(scroller.scrollLeft, 1000, "The scroll position should stay");
+});
+</script>
diff --git a/tests/wpt/tests/css/css-scrollbars/WEB_FEATURES.yml b/tests/wpt/tests/css/css-scrollbars/WEB_FEATURES.yml
new file mode 100644
index 00000000000..e3040abd869
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/WEB_FEATURES.yml
@@ -0,0 +1,13 @@
+features:
+- name: scrollbar-color
+  files:
+  - input-scrollbar-color.html
+  - scrollbar-color-*
+  - scrollbar-width-paint-003.html
+  - transparent-on-root.html
+  - viewport-scrollbar-body.html
+  - viewport-scrollbar.html
+- name: scrollbar-width
+  files:
+  - scrollbar-width-*
+  - textarea-scrollbar-width-none.html
diff --git a/tests/wpt/tests/css/css-shadow-parts/host-part-nesting.html b/tests/wpt/tests/css/css-shadow-parts/host-part-nesting.html
new file mode 100644
index 00000000000..c0dc8e20eee
--- /dev/null
+++ b/tests/wpt/tests/css/css-shadow-parts/host-part-nesting.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<title>CSS Shadow Parts - :host::part() in nesting</title>
+<link rel="help" href="https://drafts.csswg.org/css-shadow-parts/#part">
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#host-selector">
+<link rel="help" href="https://crbug.com/326526716">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="host"></div>
+<script>
+test(function() {
+  let host = document.getElementById("host");
+  host.attachShadow({ mode: "open" }).innerHTML = `
+    <style>
+      :host {
+        &::part(mypart) {
+          color: lime;
+        }
+      }
+    </style>
+    <div part="mypart">This text should be green.</div>
+  `;
+
+  let part = host.shadowRoot.querySelector("[part]");
+
+  assert_equals(
+    window.getComputedStyle(part).color,
+    "rgb(0, 255, 0)",
+    ":host::part() works in nesting",
+  );
+}, ":host::part works in nesting");
+</script>
diff --git a/tests/wpt/tests/css/css-shapes/parsing/shape-outside-computed.html b/tests/wpt/tests/css/css-shapes/parsing/shape-outside-computed.html
index 19d69ee7388..97ac87e1e61 100644
--- a/tests/wpt/tests/css/css-shapes/parsing/shape-outside-computed.html
+++ b/tests/wpt/tests/css/css-shapes/parsing/shape-outside-computed.html
@@ -15,7 +15,9 @@
     font-size: 40px;
   }
 </style>
-<div id="target"></div>
+<div>
+  <div id="target"></div>
+</div>
 <script>
 // TODO: Add inset() tests
 
@@ -23,14 +25,16 @@ test_computed_value("shape-outside", "circle(at 10% 20%)");
 test_computed_value("shape-outside", "circle(at calc(75% + 0px) calc(75% + 0px))", "circle(at 75% 75%)");
 test_computed_value("shape-outside", "circle(calc(10px + 0.5em) at -50% 50%) border-box", "circle(30px at -50% 50%) border-box");
 test_computed_value("shape-outside", "circle(calc(10px - 0.5em) at 50% -50%) border-box", "circle(0px at 50% -50%) border-box");
+test_computed_value("shape-outside", "circle(at top 0% right calc(10% * sign(1em - 1px)))", "circle(at 90% 0%)");
+test_computed_value("shape-outside", "circle(at top 0% right calc(10% * sibling-index()))", "circle(at 90% 0%)");
 
 test_computed_value("shape-outside", "ellipse(60% closest-side at 50% 50%)");
 test_computed_value("shape-outside", "ellipse(calc(10px + 0.5em) calc(10px - 0.5em) at -50% 50%) padding-box", "ellipse(30px 0px at -50% 50%) padding-box");
 test_computed_value("shape-outside", "ellipse(calc(10px - 0.5em) calc(10px + 0.5em) at 50% -50%) border-box", "ellipse(0px 30px at 50% -50%) border-box");
 
-test_computed_value("polygon(evenodd, -10px, -20px, -30px, -40px, -50px, -60px) margin-box");
-test_computed_value("polygon(10%, 20%, 30%, 40%, 50%, 60%) content-box");
-test_computed_value("polygon(calc(10px - 0.5em), 20%, 30%, 40%, 50%, calc(10px - 0.5em))", "polygon(-10px, 20%, 30%, 40%, 50%, -10px)");
+test_computed_value("shape-outside", "polygon(evenodd, -10px, -20px, -30px, -40px, -50px, -60px) margin-box");
+test_computed_value("shape-outside", "polygon(10%, 20%, 30%, 40%, 50%, 60%) content-box");
+test_computed_value("shape-outside", "polygon(calc(10px - 0.5em), 20%, 30%, 40%, 50%, calc(10px - 0.5em))", "polygon(-10px, 20%, 30%, 40%, 50%, -10px)");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-shapes/parsing/shape-outside-valid-position.html b/tests/wpt/tests/css/css-shapes/parsing/shape-outside-valid-position.html
index 07b82ddda64..5a23d4f5986 100644
--- a/tests/wpt/tests/css/css-shapes/parsing/shape-outside-valid-position.html
+++ b/tests/wpt/tests/css/css-shapes/parsing/shape-outside-valid-position.html
@@ -31,6 +31,8 @@ test_valid_value("shape-outside", "circle(at right 40%)", "circle(at 100% 40%)")
 test_valid_value("shape-outside", "circle(at right 30% top 60px)", "circle(at calc(70%) 60px)");
 test_valid_value("shape-outside", "circle(at top)", "circle(at 50% 0%)");
 test_valid_value("shape-outside", "circle(at top center)","circle(at 50% 0%)");
+test_valid_value("shape-outside", "circle(at top 0% right calc(10% * sign(1em - 1px)))", "circle(at calc(100% - (10% * sign(1em - 1px))) 0%)");
+test_valid_value("shape-outside", "circle(at top 0% right calc(10% * sibling-index()))", "circle(at calc(100% - (10% * sibling-index())) 0%)");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside-infinite-crash.html b/tests/wpt/tests/css/css-shapes/shape-outside-infinite-crash.html
new file mode 100644
index 00000000000..b2dfd4fad51
--- /dev/null
+++ b/tests/wpt/tests/css/css-shapes/shape-outside-infinite-crash.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<link rel="help" href="https://issues.chromium.org/issues/379143305">
+<style>
+.test {
+  width: 200px; overflow: hidden; line-height: 0;
+}
+.float {
+  float: left;
+  width: 100px;
+  height: 100px;
+  background: orange;
+  shape-outside: polygon(0 0, 100% 100%, 0 100%);
+  clip-path: polygon(0 0, 100% 100%, 0 100%);
+}
+span {
+  display: inline-block;
+  width: 90px;
+  background: rebeccapurple;
+}
+</style>
+<div class="test">
+  <div class="float"></div>
+  <span style="height: 20px;"></span><span style="height: 22px;"></span>
+</div>
+
diff --git a/tests/wpt/tests/css/css-size-adjust/parsing/text-size-adjust-computed.html b/tests/wpt/tests/css/css-size-adjust/parsing/text-size-adjust-computed.html
index 2d80b861723..5646f149d80 100644
--- a/tests/wpt/tests/css/css-size-adjust/parsing/text-size-adjust-computed.html
+++ b/tests/wpt/tests/css/css-size-adjust/parsing/text-size-adjust-computed.html
@@ -18,6 +18,7 @@ test_computed_value("text-size-adjust", 'none', '100%');
 test_computed_value("text-size-adjust", '200%');
 test_computed_value("text-size-adjust", '100%');
 test_computed_value("text-size-adjust", '0%');
+test_computed_value("text-size-adjust", 'calc(10% * sibling-index())', '10%');
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-size-adjust/parsing/text-size-adjust-valid.html b/tests/wpt/tests/css/css-size-adjust/parsing/text-size-adjust-valid.html
index bd58ae5f699..a9835da3ab4 100644
--- a/tests/wpt/tests/css/css-size-adjust/parsing/text-size-adjust-valid.html
+++ b/tests/wpt/tests/css/css-size-adjust/parsing/text-size-adjust-valid.html
@@ -17,6 +17,8 @@ test_valid_value("text-size-adjust", 'none');
 test_valid_value("text-size-adjust", '200%');
 test_valid_value("text-size-adjust", '100%');
 test_valid_value("text-size-adjust", '0%');
+test_valid_value("text-size-adjust", 'calc(10% + 5%)', 'calc(15%)');
+test_valid_value("text-size-adjust", 'calc(10% * sibling-index())');
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-013.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-013.html
index bcbf653d68a..564858e360e 100644
--- a/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-013.html
+++ b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-013.html
@@ -2,11 +2,11 @@
 <title>CSS aspect-ratio: img</title>
 <link rel="author" title="Google LLC" href="https://www.google.com/">
 <link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11236">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
 
 <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
-<!-- Replaced elements should always use content-box sizing for the purpose of
-     aspect ratio. -->
-<img src="support/20x50-green.png" style="aspect-ratio: 20/50; background: green; padding-right: 80px; padding-bottom: 50px; box-sizing: border-box;">
+<!-- When coercing the natural-size and aspect-ratio to be consistent, it should use the correct box-sizing. -->
+<img src="support/20x50-green.png" style="aspect-ratio: 1; background: green; padding-right: 80px; padding-bottom: 50px; box-sizing: border-box;">
 
diff --git a/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-014.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-014.html
index 4c1ad16ce86..8b7bdafc107 100644
--- a/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-014.html
+++ b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-014.html
@@ -2,11 +2,11 @@
 <title>CSS aspect-ratio: img</title>
 <link rel="author" title="Google LLC" href="https://www.google.com/">
 <link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11236">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
 
 <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
-<!-- Replaced elements should always use content-box sizing for the purpose of
-     aspect ratio. -->
-<img src="support/20x50-green.png" style="aspect-ratio: 20/50; background: green; padding-right: 80px; padding-bottom: 50px; box-sizing: border-box; max-height: 100px;">
+<!-- When coercing the natural-size and aspect-ratio to be consistent, it should use the correct box-sizing. -->
+<img src="support/20x50-green.png" style="aspect-ratio: 1; background: green; padding-right: 80px; padding-bottom: 50px; box-sizing: border-box; max-height: 100px;">
 
diff --git a/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-045.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-045.html
new file mode 100644
index 00000000000..3339de4cb7d
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-045.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11236">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<!-- The coerced natural-size should be 40px by 40px. -->
+<canvas width="40" height="10" style="aspect-ratio: 1; background: green; padding-right: 60px; padding-bottom: 60px; box-sizing: border-box;">
+
diff --git a/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-046.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-046.html
new file mode 100644
index 00000000000..13a9fd99513
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-046.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11236">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<!-- The coerced natural-size should be 10px by 10px. -->
+<canvas width="10" height="40" style="aspect-ratio: 1; background: green; padding-right: 90px; padding-bottom: 90px; box-sizing: border-box; max-height: 110px;">
+
diff --git a/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-028.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-028.html
index 15e8e0e8910..da31a1efead 100644
--- a/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-028.html
+++ b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-028.html
@@ -31,6 +31,9 @@
 .vertical {
   writing-mode: vertical-lr;
 }
+canvas {
+  aspect-ratio: auto;
+}
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-003.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-003.html
index 48fedb11483..9ee60268d60 100644
--- a/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-003.html
+++ b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-003.html
@@ -35,6 +35,9 @@
 .vertical {
   writing-mode: vertical-lr;
 }
+canvas {
+  aspect-ratio: auto;
+}
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-029.tentative.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-029.tentative.html
new file mode 100644
index 00000000000..feff03bbe2e
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-029.tentative.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#min-content-zero">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1308929">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/12133">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="A replaced element with a percentage block-size doesn't compress the min-content contribution on its block axis to zero.">
+
+<p>Test passes if there is a filled green square.</p>
+<div style="inline-size: min-content">
+  <canvas width="100" height="100"
+          style="writing-mode:vertical-rl; background: green; block-size: 100%"></canvas>
+</div>
diff --git a/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-030.tentative.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-030.tentative.html
new file mode 100644
index 00000000000..5a6b103c22e
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-030.tentative.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#min-content-zero">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1308929">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/12133">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="A replaced element with a percentage max-block-size doesn't compress the min-content contribution on its block axis to zero.">
+
+<p>Test passes if there is a filled green square.</p>
+<div style="inline-size: min-content">
+  <canvas width="200" height="200"
+          style="writing-mode:vertical-rl; background: green; max-block-size: 50%"></canvas>
+</div>
diff --git a/tests/wpt/tests/css/css-sizing/margin-collapse-with-indefinite-block-size-001.html b/tests/wpt/tests/css/css-sizing/margin-collapse-with-indefinite-block-size-001.html
new file mode 100644
index 00000000000..47d2a0a043d
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/margin-collapse-with-indefinite-block-size-001.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Oriol Brufau" href="obrufau@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css2/#collapsing-margins">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#behave-auto">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#cyclic-percentage-contribution">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="
+  According to CSS2, the bottom margin of a block container can collapse
+  with the bottom margin of its last in-flow child if `height` computes
+  to `auto`.
+
+  However, according to CSS Sizing, that was 'legacy spec prose' and
+  should be interpreted as 'behaves as `auto`'.
+
+  Therefore, a cyclic percentage in the preferred block size property
+  shouldn't prevent margin collapse, because it behaves as `auto`.
+">
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: 100%; background: red">
+  <div style="height: 100px; margin-bottom: 100px; background: green"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-sizing/margin-collapse-with-indefinite-block-size-002.html b/tests/wpt/tests/css/css-sizing/margin-collapse-with-indefinite-block-size-002.html
new file mode 100644
index 00000000000..eb401c92b5e
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/margin-collapse-with-indefinite-block-size-002.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Oriol Brufau" href="obrufau@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css2/#collapsing-margins">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#behave-auto">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#valdef-width-min-content">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="
+  According to CSS2, the bottom margin of a block container can collapse
+  with the bottom margin of its last in-flow child if `height` computes
+  to `auto`.
+
+  However, according to CSS Sizing, that was 'legacy spec prose' and
+  should be interpreted as 'behaves as `auto`'.
+
+  Therefore, a `min-content` value in the preferred block size property
+  shouldn't prevent margin collapse, because it behaves as `auto`.
+">
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: min-content; background: red">
+  <div style="height: 100px; margin-bottom: 100px; background: green"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-sizing/margin-collapse-with-indefinite-block-size-003.html b/tests/wpt/tests/css/css-sizing/margin-collapse-with-indefinite-block-size-003.html
new file mode 100644
index 00000000000..51f16f68e69
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/margin-collapse-with-indefinite-block-size-003.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Oriol Brufau" href="obrufau@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css2/#collapsing-margins">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#behave-auto">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#valdef-width-max-content">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="
+  According to CSS2, the bottom margin of a block container can collapse
+  with the bottom margin of its last in-flow child if `height` computes
+  to `auto`.
+
+  However, according to CSS Sizing, that was 'legacy spec prose' and
+  should be interpreted as 'behaves as `auto`'.
+
+  Therefore, a `max-content` value in the preferred block size property
+  shouldn't prevent margin collapse, because it behaves as `auto`.
+">
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: max-content; background: red">
+  <div style="height: 100px; margin-bottom: 100px; background: green"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-sizing/margin-collapse-with-indefinite-block-size-004.html b/tests/wpt/tests/css/css-sizing/margin-collapse-with-indefinite-block-size-004.html
new file mode 100644
index 00000000000..c393560d6c6
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/margin-collapse-with-indefinite-block-size-004.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Oriol Brufau" href="obrufau@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css2/#collapsing-margins">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#behave-auto">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#valdef-width-fit-content">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="
+  According to CSS2, the bottom margin of a block container can collapse
+  with the bottom margin of its last in-flow child if `height` computes
+  to `auto`.
+
+  However, according to CSS Sizing, that was 'legacy spec prose' and
+  should be interpreted as 'behaves as `auto`'.
+
+  Therefore, a `fit-content` value in the preferred block size property
+  shouldn't prevent margin collapse, because it behaves as `auto`.
+">
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: fit-content; background: red">
+  <div style="height: 100px; margin-bottom: 100px; background: green"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-sizing/margin-collapse-with-indefinite-block-size-005.html b/tests/wpt/tests/css/css-sizing/margin-collapse-with-indefinite-block-size-005.html
new file mode 100644
index 00000000000..27814994aaa
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/margin-collapse-with-indefinite-block-size-005.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Oriol Brufau" href="obrufau@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css2/#collapsing-margins">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#behave-auto">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="
+  According to CSS2, the bottom margin of a block container can collapse
+  with the bottom margin of its last in-flow child if `height` computes
+  to `auto`.
+
+  However, according to CSS Sizing, that was 'legacy spec prose' and
+  should be interpreted as 'behaves as `auto`'.
+
+  Therefore, an indefinite `stretch` in the preferred block size property
+  shouldn't prevent margin collapse, because it behaves as `auto`.
+">
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width: 100px; height: stretch; background: red">
+  <div style="height: 100px; margin-bottom: 100px; background: green"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-sizing/min-content-le-max-content.tentative.html b/tests/wpt/tests/css/css-sizing/min-content-le-max-content.tentative.html
new file mode 100644
index 00000000000..81bc6969d50
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/min-content-le-max-content.tentative.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>min-content ≤ max-content</title>
+<link rel="author" title="Oriol Brufau" href="obrufau@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic-sizes">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/12076">
+<meta assert="The max-content size is floored to not be smaller than the min-content.">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+
+<style>
+main {
+  width: 100px;
+  height: 100px;
+  font-size: 0;
+  background: red;
+}
+div {
+  background: green
+}
+span {
+  display: inline-block;
+  vertical-align: top;
+  height: 50px;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<main>
+  <div style="width: min-content">
+    <span style="width: 100px"></span>
+    <span style="margin-right: -50px"></span>
+  </div>
+  <div style="width: max-content">
+    <span style="width: 100px"></span>
+    <span style="margin-right: -50px"></span>
+  </div>
+</main>
diff --git a/tests/wpt/tests/css/css-syntax/serialize-consecutive-tokens.html b/tests/wpt/tests/css/css-syntax/serialize-consecutive-tokens.html
index f6e220de64b..0b9015050b3 100644
--- a/tests/wpt/tests/css/css-syntax/serialize-consecutive-tokens.html
+++ b/tests/wpt/tests/css/css-syntax/serialize-consecutive-tokens.html
@@ -118,4 +118,9 @@ testComments("a/* comment */b", "", "a/* comment */b");
 testComments("a/* comment */var(--t1)", "b", "a/**/b");
 testComments("var(--t1)b", "a/* comment */", "a/**/b");
 
+// Test comments within quotes.
+testComments("var(--t1)b", "'a/* unfinished '", "'a/* unfinished 'b");
+testComments("var(--t1)b", "\"a/* unfinished \"", "\"a/* unfinished \"b");
+testComments("var(--t1)b", "'a \" '/* comment */", "'a \" 'b");
+
 </script>
diff --git a/tests/wpt/tests/css/css-tables/collapsed-border-remove-row-group.html b/tests/wpt/tests/css/css-tables/collapsed-border-remove-row-group.html
index 39b89956c54..44e7cabd7e9 100644
--- a/tests/wpt/tests/css/css-tables/collapsed-border-remove-row-group.html
+++ b/tests/wpt/tests/css/css-tables/collapsed-border-remove-row-group.html
@@ -5,6 +5,7 @@
 <link rel="author" href="https://mozilla.org" title="Mozilla">
 <link rel="help" href="https://drafts.csswg.org/css-tables/#border-collapse-property">
 <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1907289">
+<link rel="help" href="https://bugs.webkit.org/show_bug.cgi?id=291728">
 <link rel="match" href="collapsed-border-remove-row-group-ref.html">
 <style>
   table {
diff --git a/tests/wpt/tests/css/css-tables/colspan-zero-crash.html b/tests/wpt/tests/css/css-tables/colspan-zero-crash.html
new file mode 100644
index 00000000000..a50586a5bfa
--- /dev/null
+++ b/tests/wpt/tests/css/css-tables/colspan-zero-crash.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="help" href="https://github.com/servo/servo/issues/36699">
+<link rel="author" href="mailto:fwang@igalia.com" title="Frédéric Wang">
+<span id="span"></span>
+<script>
+  let th = document.createElement("th");
+  span.replaceWith(th);
+  th.colSpan = 0;
+</script>
+
diff --git a/tests/wpt/tests/css/css-tables/crashtests/cell-contents-with-negative-outer-size.html b/tests/wpt/tests/css/css-tables/crashtests/cell-contents-with-negative-outer-size.html
new file mode 100644
index 00000000000..c9cd275ad9e
--- /dev/null
+++ b/tests/wpt/tests/css/css-tables/crashtests/cell-contents-with-negative-outer-size.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Oriol Brufau" href="obrufau@igalia.com">
+<link rel="help" href="https://github.com/servo/servo/issues/36481">
+<style>span { display: inline-block; margin-right: -1px; }</style>
+<table><td>a<span></span></td></table>
diff --git a/tests/wpt/tests/css/css-text-decor/crashtests/text-decoration-animation-crash.html b/tests/wpt/tests/css/css-text-decor/crashtests/text-decoration-animation-crash.html
new file mode 100644
index 00000000000..a20f166c427
--- /dev/null
+++ b/tests/wpt/tests/css/css-text-decor/crashtests/text-decoration-animation-crash.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<style>
+* {
+  text-decoration-line: underline blink;
+  -webkit-appearance: progress-bar;
+  columns: 11px;
+}
+
+#x4 {
+  -webkit-user-modify: read-write;
+  animation: keyframes4 2s;
+}
+</style>
+<style>
+@keyframes keyframes0 {
+  20% {
+    scroll-padding-left: 1em
+  }
+}
+
+@keyframes keyframes3 {
+  20% {
+    scroll-padding-block-end: auto
+  }
+}
+
+@keyframes keyframes4 {
+  60% {
+    background-position: 65%
+  }
+}
+</style>
+
+<script>
+function main() {
+  const sheet1 = document.styleSheets[1];
+  sheet1.deleteRule(2);
+  x4.hspace;
+  sheet1.deleteRule(1);
+  x4.checkValidity();
+  sheet1.deleteRule(0);
+}
+</script>
+
+<body onload="main()">
+  <object id="x4"> A </object>
+</body>
diff --git a/tests/wpt/tests/css/css-text-decor/text-shadow/decorations-multiple-zorder.html b/tests/wpt/tests/css/css-text-decor/text-shadow/decorations-multiple-zorder.html
index 22406534b68..b221092252b 100644
--- a/tests/wpt/tests/css/css-text-decor/text-shadow/decorations-multiple-zorder.html
+++ b/tests/wpt/tests/css/css-text-decor/text-shadow/decorations-multiple-zorder.html
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML>
 <link rel="help" href="https://drafts.csswg.org/css-text-decor-3/#text-shadow-property">
 <link rel="match" href="decorations-multiple-zorder-ref.html">
+<meta name="fuzzy" content="0-45;0-5">
 <style>
 div {
     text-decoration-skip-ink: none;
diff --git a/tests/wpt/tests/css/css-text-decor/text-shadow/standards-decor-noblur-2.html b/tests/wpt/tests/css/css-text-decor/text-shadow/standards-decor-noblur-2.html
index 75d95b578dc..3d1a834ab34 100644
--- a/tests/wpt/tests/css/css-text-decor/text-shadow/standards-decor-noblur-2.html
+++ b/tests/wpt/tests/css/css-text-decor/text-shadow/standards-decor-noblur-2.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <link rel="help" href="https://drafts.csswg.org/css-text-decor-3/#text-shadow-property">
 <link rel="match" href="standards-decor-noblur-2-ref.html">
-<meta name="fuzzy" content="0-40;0-14">
+<meta name="fuzzy" content="0-1;0-8">
 <!-- Shadows are painted below text AND its decorations -->
 <style>
 #target {
diff --git a/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-cursive-001.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-cursive-001.html
new file mode 100644
index 00000000000..5700c600981
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-cursive-001.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<head>
+<meta charset="utf-8">
+<title>
+CSS Text Test - Letter-spacing should not be applied for Cursive Scripts.
+</title>
+<link rel="author" title="Sejal Anand" href="mailto:sejalanand@microsoft.com">
+<link rel="help" href="https://www.w3.org/TR/css-text-3/#cursive-tracking">
+<link rel="match" href="reference/letter-spacing-cursive-001-ref.html">
+<meta name="assert" content="Letter-spacing must not be applied to Arabic text,
+ preserving cursive connections.">
+<style>
+div {
+  margin: 1em;
+  font: 24px serif;
+  white-space: nowrap;
+  display: inline-block;
+  outline: 1px solid gray;
+}
+.letterspacing {
+  letter-spacing: 10px; /* Should NOT affect Arabic text */
+}
+</style>
+</head>
+<body>
+<p>
+The following test will pass if no spacing appears between letters within
+Arabic words. Both Arabic texts should display identically.
+</p>
+<div class="letterspacing">
+<span>مرحباً</span>
+</div>
+<br>
+<div>
+<span>مرحباً</span>
+</div>
+<br>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-cursive-001-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-cursive-001-ref.html
new file mode 100644
index 00000000000..720c9491b4d
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-cursive-001-ref.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<head>
+<meta charset="utf-8">
+<title>
+CSS Text Test - Letter-spacing should not be applied for Cursive Scripts.
+</title>
+<link rel="author" title="Sejal Anand" href="mailto:sejalanand@microsoft.com">
+<style>
+div {
+  margin: 1em;
+  font: 24px serif;
+  white-space: nowrap;
+  display: inline-block;
+  outline: 1px solid gray;
+}
+</style>
+</head>
+<body>
+<p>
+The following test will pass if no spacing appears between letters within
+Arabic words. Both Arabic texts should display identically.
+</p>
+<div>
+<span>مرحباً</span>
+</div>
+<br>
+<div>
+<span>مرحباً</span>
+</div>
+<br>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-022.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-022.html
index 3591f46534a..dc7a3c28786 100644
--- a/tests/wpt/tests/css/css-text/line-breaking/line-breaking-022.html
+++ b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-022.html
@@ -6,7 +6,7 @@
 <link rel="match" href="reference/line-reabking-022.html">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
 <meta name="flags" content="ahem" >
-<meta name=assert content="Any Unicode character with the the BK and NL line breaking class must be treated as forced line breaks">
+<meta name=assert content="Any Unicode character with the BK and NL line breaking class must be treated as forced line breaks">
 <style>
 div {
   font: 25px/1 Ahem;
diff --git a/tests/wpt/tests/css/css-text/parsing/WEB_FEATURES.yml b/tests/wpt/tests/css/css-text/parsing/WEB_FEATURES.yml
index 8fa38638f17..b8da9745265 100644
--- a/tests/wpt/tests/css/css-text/parsing/WEB_FEATURES.yml
+++ b/tests/wpt/tests/css/css-text/parsing/WEB_FEATURES.yml
@@ -13,6 +13,10 @@ features:
   - white-space-collapse-*
 - name: text-wrap
   files:
+  # No wildcard here to avoid capturing text-wrap-mode-*.
   - text-wrap-computed.html
   - text-wrap-invalid.html
-  - text-wrap-pretty.html
+  - text-wrap-valid.html
+- name: text-wrap-mode
+  files:
+  - text-wrap-mode-*
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-break-001.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-break-001.html
index fd843bc6636..6e540d8f1e1 100644
--- a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-break-001.html
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-break-001.html
@@ -7,7 +7,7 @@
 .test-container {
   font-family: Ahem;
   font-size: 40px;
-  width: 4em;
+  width: 4.1em;
   text-autospace: normal;
 }
 .test > span {
diff --git a/tests/wpt/tests/css/css-text/text-justify/reference/text-justify-006-ref.html b/tests/wpt/tests/css/css-text/text-justify/reference/text-justify-006-ref.html
index 595485c5f4e..a017f7a8e6b 100644
--- a/tests/wpt/tests/css/css-text/text-justify/reference/text-justify-006-ref.html
+++ b/tests/wpt/tests/css/css-text/text-justify/reference/text-justify-006-ref.html
@@ -21,7 +21,7 @@ div {
 a { color: white; }
 </style>
 
-<p>Test passes if the the blue and orange boxes are aligned.
+<p>Test passes if the blue and orange boxes are aligned.
 
 <div id=ref>X   X X   X</div>
 <div id=test>X   X X   X</div>
diff --git a/tests/wpt/tests/css/css-text/text-justify/text-justify-006.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-006.html
index 7744f52afea..80c574d28cb 100644
--- a/tests/wpt/tests/css/css-text/text-justify/text-justify-006.html
+++ b/tests/wpt/tests/css/css-text/text-justify/text-justify-006.html
@@ -29,7 +29,7 @@ span {
 a { color: white; }
 </style>
 
-<p>Test passes if the the blue and orange boxes are aligned.
+<p>Test passes if the blue and orange boxes are aligned.
 
 <div id=ref>X   X X   X</div>
 <div id=test>X <span>X X</span> X <a>###########</a></div>
diff --git a/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-before-after-001.html b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-before-after-001.html
index 9f5741e2349..7176768b8df 100644
--- a/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-before-after-001.html
+++ b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-before-after-001.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#valdef-text-wrap-balance">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#valdef-text-wrap-style-balance">
 <link rel="match" href="reference/text-wrap-balance-before-after-001-ref.html">
 <style>
 .container {
diff --git a/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-before-after-002.html b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-before-after-002.html
index e9d08953fac..60e3a777df3 100644
--- a/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-before-after-002.html
+++ b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-before-after-002.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#valdef-text-wrap-balance">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#valdef-text-wrap-style-balance">
 <link rel="match" href="reference/text-wrap-balance-before-after-002-ref.html">
 <style>
 .container {
diff --git a/tests/wpt/tests/css/css-text/word-break/word-break-break-all-ethiopic.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-ethiopic.html
index 1fa7f9054a9..ef45231d359 100644
--- a/tests/wpt/tests/css/css-text/word-break/word-break-break-all-ethiopic.html
+++ b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-ethiopic.html
@@ -4,7 +4,7 @@
 <title>break-all Ethiopic word breaking</title>
 <meta name="assert" content="word-break: break-all means Ethiopid words break according to the older rules (letter by letter).
 Nevertheless, the breaking prohibition before the Ethiopic word space (U+1361)
-which belongs the the BA line breaking class,
+which belongs the BA line breaking class,
 is honored.">
 <link rel='help' href='https://drafts.csswg.org/css-text-3/#word-break-property'>
 <link rel='match' href='reference/word-break-break-all-ethiopic-ref.html'>
diff --git a/tests/wpt/tests/css/css-transforms/3d-point-mapping-coplanar.html b/tests/wpt/tests/css/css-transforms/3d-point-mapping-coplanar.html
new file mode 100644
index 00000000000..0ae0ab1ee48
--- /dev/null
+++ b/tests/wpt/tests/css/css-transforms/3d-point-mapping-coplanar.html
@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<title>Hit test coplanar elements</title>
+<link rel="help" href="https://svgwg.org/svg2-draft/interact.html#hit-testing">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style type="text/css" media="screen">
+  body {
+    margin: 0;
+  }
+
+  .test {
+    display: inline-block;
+    height: 300px;
+    width: 300px;
+    margin: 20px;
+  }
+
+  .container {
+    position: relative;
+    height: 260px;
+    width: 260px;
+    margin: 20px;
+  }
+
+  .box {
+    position: absolute;
+    top: 20px;
+    left: 30px;
+    height: 100px;
+    width: 200px;
+    transform: translateZ(20px);
+  }
+
+  #box1 {
+    background-color: #DDD;
+  }
+
+  #box2 {
+    background-color: #CCC;
+  }
+
+  #box3 {
+    background-color: #BBB;
+    top: 60px;
+  }
+
+  #box4 {
+    background-color: #AAA;
+    top: 100px;
+  }
+</style>
+
+<body>
+  <div class="test">
+    <div class="container" id="box1">
+      <div class="box" id="box2"></div>
+      <div class="box" id="box3"></div>
+      <div class="box" id="box4"></div>
+    </div>
+  </div>
+</body>
+
+<script>
+  class Point {
+    constructor(x, y) {
+      this.x = x;
+      this.y = y;
+    }
+  };
+  const tests = [{
+      expectedElemId: 'box1',
+      points: [
+        new Point(59, 52),
+        new Point(278, 59),
+        new Point(58, 260),
+        new Point(281, 269),
+      ],
+    },
+    {
+      expectedElemId: 'box2',
+      points: [
+        new Point(82, 68),
+        new Point(109, 80),
+        new Point(189, 71),
+        new Point(268, 98)
+      ],
+    },
+    {
+      expectedElemId: 'box3',
+      points: [
+        new Point(73, 101),
+        new Point(128, 136),
+        new Point(206, 102),
+        new Point(268, 138),
+      ]
+    },
+    {
+      expectedElemId: 'box4',
+      points: [
+        new Point(73, 144),
+        new Point(72, 232),
+        new Point(265, 146),
+        new Point(264, 232),
+      ]
+    },
+  ];
+
+  tests.forEach(testcase => {
+    test(t => {
+      const expectedElem = document.getElementById(testcase.expectedElemId);
+      for (const point of testcase.points) {
+        const hitElem = document.elementFromPoint(point.x, point.y);
+        assert_equals(hitElem, expectedElem,
+          `point (${point.x}, ${point.y}) is inside element ${testcase.expectedElemId}`);
+      }
+    }, `${document.title}, hittesting ${testcase.expectedElemId})`);
+  });
+</script>
+
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-transforms/3d-point-mapping-overlapping.html b/tests/wpt/tests/css/css-transforms/3d-point-mapping-overlapping.html
new file mode 100644
index 00000000000..ffcfc1ae042
--- /dev/null
+++ b/tests/wpt/tests/css/css-transforms/3d-point-mapping-overlapping.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<title>Hit test overlapping elements</title>
+<link rel="help" href="https://svgwg.org/svg2-draft/interact.html#hit-testing">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style type="text/css" media="screen">
+  body {
+    margin: 0;
+  }
+
+  #box1 {
+    position: absolute;
+    height: 300px;
+    width: 300px;
+    background-color: #DDD;
+  }
+
+  #box2 {
+    position: absolute;
+    top: 50px;
+    left: 50px;
+    height: 200px;
+    width: 200px;
+    background-color: #AAA;
+    transform: translateZ(50px);
+  }
+
+  #box3 {
+    position: relative;
+    background-color: blue;
+    height: 100px;
+    width: 100px;
+    margin: 50px;
+  }
+
+  #overlay {
+    position: absolute;
+    height: 310px;
+    width: 150px;
+    background-color: rgba(0, 128, 0, 0.3);
+    transform: translateZ(100px);
+  }
+</style>
+
+<body>
+  <div id="box1">
+    <div id="box2">
+      <div id="box3"></div>
+    </div>
+    <div id="overlay"></div>
+  </div>
+</body>
+
+<script>
+  class Point {
+    constructor(x, y) {
+      this.x = x;
+      this.y = y;
+    }
+  };
+  const tests = [{
+      expectedElemId: 'box1',
+      points: [
+        new Point(151, 254),
+        new Point(152, 47),
+        new Point(288, 13),
+        new Point(289, 283),
+      ]
+    },
+    {
+      expectedElemId: 'box2',
+      points: [
+        new Point(158, 229),
+        new Point(206, 220),
+        new Point(223, 158),
+        new Point(157, 57),
+      ]
+    },
+    {
+      expectedElemId: 'box3',
+      points: [
+        new Point(157, 191),
+        new Point(193, 190),
+        new Point(196, 103),
+        new Point(152, 108),
+      ]
+    },
+    {
+      // Two points over every box.
+      expectedElemId: 'overlay',
+      points: [
+        new Point(132, 178),
+        new Point(125, 113),
+        new Point(81, 67),
+        new Point(92, 223),
+        new Point(32, 270),
+        new Point(28, 21),
+      ]
+    }
+  ];
+
+  tests.forEach(testcase => {
+    test(t => {
+      const expectedElem = document.getElementById(testcase.expectedElemId);
+      for (const point of testcase.points) {
+        const hitElem = document.elementFromPoint(point.x, point.y);
+        assert_equals(hitElem, expectedElem,
+          `point (${point.x}, ${point.y}) is inside element ${testcase.expectedElemId}`);
+      }
+    }, `${document.title}, hittesting ${testcase.expectedElemId})`);
+  });
+</script>
+
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-transforms/css-scale-of-clip-path-ref.html b/tests/wpt/tests/css/css-transforms/css-scale-of-clip-path-ref.html
new file mode 100644
index 00000000000..d6fa480b040
--- /dev/null
+++ b/tests/wpt/tests/css/css-transforms/css-scale-of-clip-path-ref.html
@@ -0,0 +1,20 @@
+<!doctype HTML>
+<style>
+.tile {
+  width: 620px;
+  height: 671px;
+  position: absolute;
+  clip-path: circle(50%);
+  background-color: lightblue;
+}
+#container {
+  transform: scale(0.25);
+  position: relative;
+  left: -200px;
+  will-change: transform;
+}
+</style>
+<div id=container>
+  <div class="tile" style="top: 520px;"></div>
+  <div class="tile" style="top: 688px; left: 390px;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-transforms/css-scale-of-clip-path.html b/tests/wpt/tests/css/css-transforms/css-scale-of-clip-path.html
new file mode 100644
index 00000000000..dda72c0d139
--- /dev/null
+++ b/tests/wpt/tests/css/css-transforms/css-scale-of-clip-path.html
@@ -0,0 +1,23 @@
+<!doctype HTML>
+<link rel="author" title="Chris Harrelson">
+<link rel="help" href="https://drafts.csswg.org/css-transforms-2/">
+<link rel="match" href="css-scale-of-clip-path-ref.html">
+<meta name=fuzzy content="maxDifference=0-40;totalPixels=0-3000">
+<style>
+.tile {
+  width: 620px;
+  height: 671px;
+  position: absolute;
+  clip-path: circle(50%);
+  background-color: lightblue;
+}
+#container {
+  transform: scale(0.25);
+  position: relative;
+  left: -200px;
+}
+</style>
+<div id=container>
+  <div class="tile" style="top: 520px;"></div>
+  <div class="tile" style="top: 688px; left: 390px;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-019.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-019.html
index 4bb658d2f9c..319c2e28631 100644
--- a/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-019.html
+++ b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-019.html
@@ -6,7 +6,7 @@
     <link rel="help" href="http://www.w3.org/TR/css-transforms-1/#svg-transform">
     <link rel="help" href="http://www.w3.org/TR/css-transforms-1/#two-d-transform-functions">
     <link rel="match" href="reference/svg-green-square-250x250-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-1;totalPixels=0-299">
+    <meta name="fuzzy" content="maxDifference=0-2;totalPixels=0-400">
     <meta name="flags" content="svg">
     <meta name="assert" content="Transforms on a parent element should be pre-multiplied to transforms on a child element.  The group of elements should be skewed vertically.  Additionally, the child rect should be translated.">
     <style type="text/css">
diff --git a/tests/wpt/tests/css/css-transforms/individual-transform/stacking-context-002.html b/tests/wpt/tests/css/css-transforms/individual-transform/stacking-context-002.html
new file mode 100644
index 00000000000..ff1d06dcc11
--- /dev/null
+++ b/tests/wpt/tests/css/css-transforms/individual-transform/stacking-context-002.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<title>CSS Test: Individual transform properties create stacking context</title>
+<link rel="author" title="Oriol Brufau" href="obrufau@igalia.com">
+<link rel="help" href="https://www.w3.org/TR/css-transforms-2/#individual-transforms">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="
+  Setting `rotate` to a value different than `none` establishes a stacking context.
+">
+
+<style>
+.transform {
+  width: 100px;
+  height: 100px;
+  background: red;
+  rotate: 0deg;
+}
+.child {
+  width: 100px;
+  height: 100px;
+  background: green;
+  position: relative;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="transform">
+  <div class="child"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-transforms/individual-transform/stacking-context-003.html b/tests/wpt/tests/css/css-transforms/individual-transform/stacking-context-003.html
new file mode 100644
index 00000000000..6852722ed79
--- /dev/null
+++ b/tests/wpt/tests/css/css-transforms/individual-transform/stacking-context-003.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<title>CSS Test: Individual transform properties create stacking context</title>
+<link rel="author" title="Oriol Brufau" href="obrufau@igalia.com">
+<link rel="help" href="https://www.w3.org/TR/css-transforms-2/#individual-transforms">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="
+  Setting `scale` to a value different than `none` establishes a stacking context.
+">
+
+<style>
+.transform {
+  width: 100px;
+  height: 100px;
+  background: red;
+  scale: 1;
+}
+.child {
+  width: 100px;
+  height: 100px;
+  background: green;
+  position: relative;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="transform">
+  <div class="child"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-transforms/individual-transform/stacking-context-004.html b/tests/wpt/tests/css/css-transforms/individual-transform/stacking-context-004.html
new file mode 100644
index 00000000000..6d7ec896736
--- /dev/null
+++ b/tests/wpt/tests/css/css-transforms/individual-transform/stacking-context-004.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<title>CSS Test: Individual transform properties create stacking context</title>
+<link rel="author" title="Oriol Brufau" href="obrufau@igalia.com">
+<link rel="help" href="https://www.w3.org/TR/css-transforms-2/#individual-transforms">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="
+  Setting `translate` to a value different than `none` establishes a stacking context.
+">
+
+<style>
+.transform {
+  width: 100px;
+  height: 100px;
+  background: red;
+  translate: 0px;
+}
+.child {
+  width: 100px;
+  height: 100px;
+  background: green;
+  position: relative;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="transform">
+  <div class="child"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-transforms/parsing/transform-valid.html b/tests/wpt/tests/css/css-transforms/parsing/transform-valid.html
index 89a8b519b1b..b436fbdea30 100644
--- a/tests/wpt/tests/css/css-transforms/parsing/transform-valid.html
+++ b/tests/wpt/tests/css/css-transforms/parsing/transform-valid.html
@@ -38,14 +38,14 @@ test_valid_value("transform", "scale(1, 200%)", "scale(1, 2)");
 test_valid_value("transform", "scale(-250%)", "scale(-2.5)");
 test_valid_value("transform", "scale(-500%, -620%)", "scale(-5, -6.2)");
 
-test_valid_value("transform", "scaleX(7)");
-test_valid_value("transform", "scaleX(720%)", "scaleX(7.2)");
+test_valid_value("transform", "scaleX(7)", "scalex(7)");
+test_valid_value("transform", "scaleX(720%)", "scalex(7.2)");
 
-test_valid_value("transform", "scaleY(-8)");
-test_valid_value("transform", "scaleY(-85%)", "scaleY(-0.85)");
+test_valid_value("transform", "scaleY(-8)", "scaley(-8)");
+test_valid_value("transform", "scaleY(-85%)", "scaley(-0.85)");
 
-test_valid_value("transform", "scaleZ(4)");
-test_valid_value("transform", "scaleZ(25%)", "scaleZ(0.25)");
+test_valid_value("transform", "scaleZ(4)", "scalez(4)");
+test_valid_value("transform", "scaleZ(25%)", "scalez(0.25)");
 
 test_valid_value("transform", "scale3d(0.5, 2.5, 3)");
 test_valid_value("transform", "scale3d(50%, 250%, 300%)", "scale3d(0.5, 2.5, 3)");
@@ -62,11 +62,11 @@ test_valid_value("transform", "skew(90deg)");
 test_valid_value("transform", "skew(0, -90deg)", "skew(0deg, -90deg)");
 test_valid_value("transform", "skew(90deg, 0)", ["skew(90deg)", "skew(90deg, 0deg)"]);
 
-test_valid_value("transform", "skewX(0)", "skewX(0deg)");
-test_valid_value("transform", "skewX(90deg)");
+test_valid_value("transform", "skewX(0)", "skewx(0deg)");
+test_valid_value("transform", "skewX(90deg)", "skewx(90deg)");
 
-test_valid_value("transform", "skewY(0)", "skewY(0deg)");
-test_valid_value("transform", "skewY(-90deg)");
+test_valid_value("transform", "skewY(0)", "skewy(0deg)");
+test_valid_value("transform", "skewY(-90deg)", "skewy(-90deg)");
 
 test_valid_value("transform", "perspective(10px)");
 test_valid_value("transform", "perspective(none)");
diff --git a/tests/wpt/tests/css/css-transforms/scale-transform-filtered-text-ref.html b/tests/wpt/tests/css/css-transforms/scale-transform-filtered-text-ref.html
new file mode 100644
index 00000000000..e8b564ce3dd
--- /dev/null
+++ b/tests/wpt/tests/css/css-transforms/scale-transform-filtered-text-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<style>
+  #container {
+    transform: scale(0.5);
+    background-color: lightblue;
+    font-size: 80px;
+  }
+  #animated, #content {
+    will-change: transform;
+  }
+</style>
+<div id=container>
+  <div id=content>
+    <div id=animated>Text</div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-transforms/scale-transform-filtered-text.html b/tests/wpt/tests/css/css-transforms/scale-transform-filtered-text.html
new file mode 100644
index 00000000000..a479b12528a
--- /dev/null
+++ b/tests/wpt/tests/css/css-transforms/scale-transform-filtered-text.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<link rel="author" href="mailto:chrishtr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-transforms-2/">
+<meta name="assert" content="Text is not blurry under w/filter and animation.">
+<link rel="match" href="scale-transform-filtered-text-ref.html">
+<meta name=fuzzy content="maxDifference=0-25;totalPixels=0-500">
+<style>
+  #container {
+    transform: scale(0.5);
+    background-color: lightblue;
+    font-size: 80px;
+  }
+  #content {
+    filter: blur(0px);
+  }
+  #animated {
+    will-change: transform;
+  }
+</style>
+<div id=container>
+  <div id=content>
+    <div id=animated>Text</div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-transitions/parsing/transition-timing-function-computed.html b/tests/wpt/tests/css/css-transitions/parsing/transition-timing-function-computed.html
index cb110549d0b..3bf1e818e77 100644
--- a/tests/wpt/tests/css/css-transitions/parsing/transition-timing-function-computed.html
+++ b/tests/wpt/tests/css/css-transitions/parsing/transition-timing-function-computed.html
@@ -10,7 +10,7 @@
 <script src="/css/support/computed-testcommon.js"></script>
 </head>
 <body>
-<div id="target"></div>
+<div id="target" style="font-size: 16px;"></div>
 <script>
 test_computed_value("transition-timing-function", "linear");
 
@@ -31,6 +31,10 @@ test_computed_value("transition-timing-function", "steps(2, jump-start)");
 test_computed_value("transition-timing-function", "steps(2, jump-end)", "steps(2)");
 test_computed_value("transition-timing-function", "steps(2, jump-both)");
 test_computed_value("transition-timing-function", "steps(2, jump-none)");
+test_computed_value("transition-timing-function", "steps(calc(2 * sibling-index()), jump-none)", "steps(2, jump-none)");
+test_computed_value("transition-timing-function", "steps(sibling-index(), jump-none)", "steps(2, jump-none)");
+test_computed_value("transition-timing-function", "steps(calc(2 * sign(1em - 1000px)), jump-none)", "steps(2, jump-none)");
+test_computed_value("transition-timing-function", "steps(calc(2 * sign(1em - 1000px)), start)", "steps(1, start)");
 
 test_computed_value("transition-timing-function", "linear, ease, linear");
 </script>
diff --git a/tests/wpt/tests/css/css-transitions/parsing/transition-timing-function-valid.html b/tests/wpt/tests/css/css-transitions/parsing/transition-timing-function-valid.html
index 658ef76bbe8..5c7214e4041 100644
--- a/tests/wpt/tests/css/css-transitions/parsing/transition-timing-function-valid.html
+++ b/tests/wpt/tests/css/css-transitions/parsing/transition-timing-function-valid.html
@@ -34,6 +34,7 @@ test_valid_value("transition-timing-function", "steps(2, jump-start)");
 test_valid_value("transition-timing-function", "steps(2, jump-end)", "steps(2)");
 test_valid_value("transition-timing-function", "steps(2, jump-both)");
 test_valid_value("transition-timing-function", "steps(2, jump-none)");
+test_valid_value("transition-timing-function", "steps(sibling-index(), jump-none)");
 
 test_valid_value("transition-timing-function", "linear, ease, linear");
 </script>
diff --git a/tests/wpt/tests/css/css-transitions/support/helper.js b/tests/wpt/tests/css/css-transitions/support/helper.js
index a37aae91830..0ccfe2648ea 100644
--- a/tests/wpt/tests/css/css-transitions/support/helper.js
+++ b/tests/wpt/tests/css/css-transitions/support/helper.js
@@ -323,4 +323,17 @@ root.supportsStartingStyle = () => {
   return sheet.cssRules.length == 1;
 };
 
+/**
+ * Waits for a 'transitionend' event to fire on the given element.
+ *
+ * @param element  The DOM element to listen for the transitionend event on.
+ * @returns {Promise<void>} A promise that resolves when the transitionend event is fired.
+ */
+root.waitForTransitionEnd = function(element) {
+  return new Promise(resolve => {
+    element.addEventListener('transitionend', resolve, { once: true });
+  });
+};
+
+
 })(window);
diff --git a/tests/wpt/tests/css/css-transitions/support/properties.js b/tests/wpt/tests/css/css-transitions/support/properties.js
index 81cf9d46d5f..e4502083890 100644
--- a/tests/wpt/tests/css/css-transitions/support/properties.js
+++ b/tests/wpt/tests/css/css-transitions/support/properties.js
@@ -265,6 +265,7 @@ var unspecified_properties = {
     'column-rule-color': ['color'],
     'column-rule-width': ['length'],
     'column-width': ['length'],
+    'column-height': ['length'],
     'transform': ['transform'],
     'transform-origin': ['horizontal'],
     'display': ['display'],
diff --git a/tests/wpt/tests/css/css-transitions/transition-remove-and-change-immediate.html b/tests/wpt/tests/css/css-transitions/transition-remove-and-change-immediate.html
new file mode 100644
index 00000000000..71743643630
--- /dev/null
+++ b/tests/wpt/tests/css/css-transitions/transition-remove-and-change-immediate.html
@@ -0,0 +1,51 @@
+<!doctype html>
+<html>
+<head>
+<meta charset=utf-8>
+<title>CSS Transitions Test: Removing transition and changing width applies change immediately</title>
+<meta name="assert" content="When a transition is removed and a width is changed after a previous transition completes, the change is immediate.">
+<link rel="help" href="https://drafts.csswg.org/css-transitions/#starting">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./support/helper.js"></script>
+
+</head>
+<body>
+<div id="log"></div>
+
+<script>
+promise_test(async t => {
+  const div = addDiv(t, {
+    style: 'transition: width 0.02s; width: 0px;'
+  });
+
+  // Flush initial state
+  getComputedStyle(div).width;
+  div.style.width = '100px';
+
+  // Wait for transition to complete
+  await waitForTransitionEnd(div);
+
+  // Verify the width after first transition
+  const afterFirst = getComputedStyle(div).width;
+  assert_equals(afterFirst, '100px', 'width should be 100px after first transition');
+
+  // Set width back to 0 and remove transition
+  div.style.width = '0px';
+  div.style.transition = '';
+
+  // Force layout update to ensure style computation
+  const afterSecond = getComputedStyle(div).width;
+  // Check width is immediately updated
+  assert_equals(
+    afterSecond,
+    '0px',
+    'width should reset to 0 immediately'
+  );
+
+}, 'Removing transition and changing width applies change immediately');
+</script>
+
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-transitions/transition-test.html b/tests/wpt/tests/css/css-transitions/transition-test.html
index 10700abf9bc..79094cee61c 100644
--- a/tests/wpt/tests/css/css-transitions/transition-test.html
+++ b/tests/wpt/tests/css/css-transitions/transition-test.html
@@ -5,7 +5,7 @@
     <link rel="author" title="Oleg Janeiko" href="mailto:oleg@the-incredible.me">
     <link rel="help" href="http://www.w3.org/TR/css3-transitions/#transition-property-property">
     <link rel="match" href="reference/transition-test-ref.html">
-    <meta name="assert" content="When an invalid value is specified as one of the transition properties, it causes the the transition-property to change to 'all'. Instead of leaving the invalid property in and animating the valid properites with matching durations.">
+    <meta name="assert" content="When an invalid value is specified as one of the transition properties, it causes the transition-property to change to 'all'. Instead of leaving the invalid property in and animating the valid properites with matching durations.">
     <style type="text/css">
         .container {
             background-color: red;
diff --git a/tests/wpt/tests/css/css-transitions/transition-zero-duration-with-delay.html b/tests/wpt/tests/css/css-transitions/transition-zero-duration-with-delay.html
new file mode 100644
index 00000000000..0b6b9c37a9b
--- /dev/null
+++ b/tests/wpt/tests/css/css-transitions/transition-zero-duration-with-delay.html
@@ -0,0 +1,58 @@
+<!doctype html>
+<html>
+<head>
+<meta charset=utf-8>
+<title>CSS Transitions Test: 0-duration transition with delay applies after delay</title>
+<meta name="assert" content="Transition with 0s duration and 0.3s delay applies property change after delay period">
+<link rel="help" href="https://drafts.csswg.org/css-transitions/#starting">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./support/helper.js"></script>
+
+</head>
+<body>
+<div id="log"></div>
+
+<script>
+promise_test(async t => {
+  const div = addDiv(t, {
+    style: 'transition: width 0.1s; width: 0px;'
+  });
+
+  // Flush initial state
+  getComputedStyle(div).width;
+  // First transition to 100px
+  div.style.width = '100px';
+  await waitForTransitionEnd(div);
+
+  // Change transition to 0s duration with 300ms delay
+  div.style.transition = 'width 0s linear 0.3s';
+
+  // Set width back to 0
+  const startTime = performance.now();
+  div.style.width = '0px';
+  // Immediate check - should NOT have changed yet
+  const computedStart = getComputedStyle(div).width;
+  assert_equals(
+    computedStart,
+    '100px',
+    'Width should remain at 100px initially'
+  );
+  // Wait for transitionend (should trigger after 300ms delay)
+  await waitForTransitionEnd(div);
+
+  // Verify final state
+  const finalWidth = getComputedStyle(div).width;
+
+  assert_equals(
+    finalWidth,
+    '0px',
+    'Width should reset to 0 after delay'
+  );
+
+}, '0-duration transition with delay applies change after delay period');
+</script>
+
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-transitions/transitioncancel-003.html b/tests/wpt/tests/css/css-transitions/transitioncancel-003.html
new file mode 100644
index 00000000000..1c47b3084d4
--- /dev/null
+++ b/tests/wpt/tests/css/css-transitions/transitioncancel-003.html
@@ -0,0 +1,61 @@
+<!doctype html>
+<html>
+<head>
+<meta charset=utf-8>
+<title>CSS Transitions Test: Changing transition properties mid-transition</title>
+<meta name="assert" content="When transition properties are changed mid-transition, the original transition completes and new transition parameters apply to subsequent changes">
+<link rel="help" href="https://drafts.csswg.org/css-transitions/#starting">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./support/helper.js"></script>
+
+</head>
+<body>
+<div id="log"></div>
+
+<script>
+promise_test(async t => {
+  const div = addDiv(t, {
+    style: 'transition: width 100ms; width: 0px;'
+  });
+
+  // Flush initial state
+  getComputedStyle(div).width;
+  // Start first transition to 100px
+  div.style.width = '100px';
+  // Wait until transition starts running
+  await new Promise(resolve => {
+    div.addEventListener('transitionrun', resolve, { once: true });
+  });
+
+  // MID-TRANSITION CHANGE: Switch to 0s duration + 100ms delay
+  div.style.transition = 'width 0s 100ms';
+  assert_not_equals(
+    getComputedStyle(div).width,
+    '100px',
+    'Width should not reach 100px yet'
+  );
+
+  // Trigger new width change mid-transition
+  div.style.width = '0px';
+
+  assert_not_equals(
+    getComputedStyle(div).width,
+    '0px',
+    'Width should not changed to 0px immediately'
+  );
+
+  await waitForTransitionEnd(div);
+
+  // Final computed style
+  assert_equals(
+    getComputedStyle(div).width,
+    '0px',
+    'Final width should be 0px'
+  );
+}, 'Mid-transition transition changes affect subsequent transitions');
+</script>
+
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-typed-om/WEB_FEATURES.yml b/tests/wpt/tests/css/css-typed-om/WEB_FEATURES.yml
new file mode 100644
index 00000000000..13ff52f5092
--- /dev/null
+++ b/tests/wpt/tests/css/css-typed-om/WEB_FEATURES.yml
@@ -0,0 +1,6 @@
+features:
+- name: css-typed-om
+  files: "**"
+- name: numeric-factory-functions
+  files:
+  - factory-*
diff --git a/tests/wpt/tests/css/css-typed-om/background-image-gradient-ref.html b/tests/wpt/tests/css/css-typed-om/background-image-gradient-ref.html
new file mode 100644
index 00000000000..588b934c7e8
--- /dev/null
+++ b/tests/wpt/tests/css/css-typed-om/background-image-gradient-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<style>
+  div {
+    width: 100px;
+    height: 100px;
+    background-color: green;
+  }
+</style>
+<div id="target">
+</div>
+<p>
+  There should be a green rect above.
+</p>
diff --git a/tests/wpt/tests/css/css-typed-om/background-image-gradient.html b/tests/wpt/tests/css/css-typed-om/background-image-gradient.html
new file mode 100644
index 00000000000..00d7de91fb8
--- /dev/null
+++ b/tests/wpt/tests/css/css-typed-om/background-image-gradient.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>Set gradient to background-image</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om/#the-stylepropertymap">
+<link rel="author" title="CGQAQ" href="mailto:cgqaq@chromium.org">
+<link rel="match" href="background-image-gradient-ref.html">
+<meta name="assert" content="Should show as green rect.">
+<style>
+  div {
+    width: 100px;
+    height: 100px;
+  }
+</style>
+<div id="target">
+</div>
+<script>
+  target.attributeStyleMap.set('background-image', 'linear-gradient(green, green)');
+  target.attributeStyleMap.set('background-color', 'red');
+</script>
+<p>
+  There should be a green rect above.
+</p>
diff --git a/tests/wpt/tests/css/css-typed-om/stylevalue-objects/parseAll-invalid.html b/tests/wpt/tests/css/css-typed-om/stylevalue-objects/parseAll-invalid.html
index 45fad409bbf..1f66f448425 100644
--- a/tests/wpt/tests/css/css-typed-om/stylevalue-objects/parseAll-invalid.html
+++ b/tests/wpt/tests/css/css-typed-om/stylevalue-objects/parseAll-invalid.html
@@ -30,4 +30,8 @@ test(() => {
   assert_throws_js(TypeError, () => CSSStyleValue.parseAll('--foo', ''));
 }, 'CSSStyleValue.parseAll() with invalid value for custom property throws TypeError');
 
+test(() => {
+  assert_throws_js(TypeError, () => CSSStyleValue.parseAll('width', ''));
+}, 'CSSStyleValue.parseAll() with invalid value for property throws TypeError');
+
 </script>
diff --git a/tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssTransformValue.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssTransformValue.tentative.html
index 89330b8e1c0..db877b52642 100644
--- a/tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssTransformValue.tentative.html
+++ b/tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssTransformValue.tentative.html
@@ -107,7 +107,7 @@ const gTestCases = [
         new CSSMathProduct(CSS.number(3))
       ),
     ]),
-    cssText: 'translate(calc(1em + 1px), 0px) rotate(calc(90deg + 360deg)) perspective(calc(1em + 1px)) skew(calc(90deg * 2), calc(360deg * 2)) scale3d(calc(1 * 2), calc(1 + 1), calc(3))',
+    cssText: 'translate(calc(1em + 1px), 0px) rotate(calc(90deg + 360deg)) perspective(calc(1em + 1px)) skew(calc(2 * 90deg), calc(2 * 360deg)) scale3d(calc(1 * 2), calc(1 + 1), calc(3))',
     desc: 'CSSTransformValue containing CSSMathValues'
   },
   {
@@ -129,7 +129,7 @@ const gTestCases = [
               new CSSUnitValue(0, 'number')))
         )
       ]),
-    cssText:'rotate3d(0, 0, 0, calc(1deg / 0))',
+    cssText:'rotate3d(0, 0, 0, calc(1deg * (1 / 0)))',
     desc: 'CSSMathInvert with 0 parameter and nested'
   },
   {
diff --git a/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/append.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/append.tentative.html
index f8087562236..fa23071c4f2 100644
--- a/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/append.tentative.html
+++ b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/append.tentative.html
@@ -19,6 +19,7 @@ const gInvalidTestCases = [
   { property: 'transition-duration', values: [CSS.s(1), '10px', CSS.px(10)], desc: 'a mix of valid and invalid values' },
   { property: 'transition-duration', values: [new CSSUnparsedValue([])], desc: 'a CSSUnparsedValue' },
   { property: 'transition-duration', values: ['var(--A)'], desc: 'a var ref' },
+  { property: 'background-size', values: [document.getElementsByTagName('title')[0].computedStyleMap().get('mask-position')], desc: 'a CSSVariableReferenceValue property' },
 ];
 
 for (const {property, values, desc} of gInvalidTestCases) {
diff --git a/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/column-height.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/column-height.html
new file mode 100644
index 00000000000..f9986221f48
--- /dev/null
+++ b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/column-height.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>'column-height' property</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om/#dom-stylepropertymapreadonly-get">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om/#dom-stylepropertymap-set">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om/#reify-stylevalue">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/testhelper.js"></script>
+<script src="resources/testsuite.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+runPropertyTests('column-height', [
+  { syntax: 'auto' },
+  {
+    syntax: '<length>',
+    specified: assert_is_equal_with_range_handling
+  },
+]);
+
+</script>
diff --git a/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transform.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transform.html
index 7a852545a74..d12714a499c 100644
--- a/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transform.html
+++ b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transform.html
@@ -18,4 +18,8 @@ runPropertyTests('transform', [
   { syntax: '<transform>' },
 ]);
 
+runUnsupportedPropertyTests('transform', [
+  'matrix(sibling-index(), 2, 3, 4, 5 ,6)'
+]);
+
 </script>
diff --git a/tests/wpt/tests/css/css-ui/appearance-auto-001.html b/tests/wpt/tests/css/css-ui/appearance-auto-001.html
index deef1c5d0b5..60f90c58736 100644
--- a/tests/wpt/tests/css/css-ui/appearance-auto-001.html
+++ b/tests/wpt/tests/css/css-ui/appearance-auto-001.html
@@ -3,6 +3,7 @@
 <title>CSS Basic User Interface Test: appearance: auto</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="auto is supported.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/appearance-button-001.html b/tests/wpt/tests/css/css-ui/appearance-button-001.html
index 317f56b18ae..92e24c69113 100644
--- a/tests/wpt/tests/css/css-ui/appearance-button-001.html
+++ b/tests/wpt/tests/css/css-ui/appearance-button-001.html
@@ -3,6 +3,7 @@
 <title>CSS Basic User Interface Test: appearance: button</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="button is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/appearance-checkbox-001.html b/tests/wpt/tests/css/css-ui/appearance-checkbox-001.html
index 54ebef94f24..69df5739d79 100644
--- a/tests/wpt/tests/css/css-ui/appearance-checkbox-001.html
+++ b/tests/wpt/tests/css/css-ui/appearance-checkbox-001.html
@@ -3,6 +3,7 @@
 <title>CSS Basic User Interface Test: appearance: checkbox</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="checkbox is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/appearance-listbox-001.html b/tests/wpt/tests/css/css-ui/appearance-listbox-001.html
index b391754b749..dd5b0018889 100644
--- a/tests/wpt/tests/css/css-ui/appearance-listbox-001.html
+++ b/tests/wpt/tests/css/css-ui/appearance-listbox-001.html
@@ -3,6 +3,7 @@
 <title>CSS Basic User Interface Test: appearance: listbox</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="listbox is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/appearance-menulist-001.html b/tests/wpt/tests/css/css-ui/appearance-menulist-001.html
index b4586870e3d..40892b14b7b 100644
--- a/tests/wpt/tests/css/css-ui/appearance-menulist-001.html
+++ b/tests/wpt/tests/css/css-ui/appearance-menulist-001.html
@@ -3,6 +3,7 @@
 <title>CSS Basic User Interface Test: appearance: menulist</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="menulist is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/appearance-menulist-button-001.html b/tests/wpt/tests/css/css-ui/appearance-menulist-button-001.html
index a170eb31264..3f9cc6b6a56 100644
--- a/tests/wpt/tests/css/css-ui/appearance-menulist-button-001.html
+++ b/tests/wpt/tests/css/css-ui/appearance-menulist-button-001.html
@@ -3,6 +3,7 @@
 <title>CSS Basic User Interface Test: appearance: menulist-button</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="menulist-button is an alias to auto except on drop-down select.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/appearance-meter-001.html b/tests/wpt/tests/css/css-ui/appearance-meter-001.html
index da6f1ffa6ca..bdcf886a0fa 100644
--- a/tests/wpt/tests/css/css-ui/appearance-meter-001.html
+++ b/tests/wpt/tests/css/css-ui/appearance-meter-001.html
@@ -3,6 +3,7 @@
 <title>CSS Basic User Interface Test: appearance: meter</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="meter is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/appearance-progress-bar-001.html b/tests/wpt/tests/css/css-ui/appearance-progress-bar-001.html
index 1573f699115..3d1d626ea78 100644
--- a/tests/wpt/tests/css/css-ui/appearance-progress-bar-001.html
+++ b/tests/wpt/tests/css/css-ui/appearance-progress-bar-001.html
@@ -3,6 +3,7 @@
 <title>CSS Basic User Interface Test: appearance: progress-bar</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="progress-bar is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/appearance-radio-001.html b/tests/wpt/tests/css/css-ui/appearance-radio-001.html
index 5a64ba7b013..bf6f103191c 100644
--- a/tests/wpt/tests/css/css-ui/appearance-radio-001.html
+++ b/tests/wpt/tests/css/css-ui/appearance-radio-001.html
@@ -3,6 +3,7 @@
 <title>CSS Basic User Interface Test: appearance: radio</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="radio is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/appearance-searchfield-001.html b/tests/wpt/tests/css/css-ui/appearance-searchfield-001.html
index 78741411551..9ed4110ee03 100644
--- a/tests/wpt/tests/css/css-ui/appearance-searchfield-001.html
+++ b/tests/wpt/tests/css/css-ui/appearance-searchfield-001.html
@@ -3,6 +3,7 @@
 <title>CSS Basic User Interface Test: appearance: searchfield</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="searchfield is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/appearance-textarea-001.html b/tests/wpt/tests/css/css-ui/appearance-textarea-001.html
index 5c55ff9fbf6..890f2b20f9a 100644
--- a/tests/wpt/tests/css/css-ui/appearance-textarea-001.html
+++ b/tests/wpt/tests/css/css-ui/appearance-textarea-001.html
@@ -3,6 +3,7 @@
 <title>CSS Basic User Interface Test: appearance: textarea</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="textarea is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/box-sizing-003.html b/tests/wpt/tests/css/css-ui/box-sizing-003.html
index 4aefec66566..c9a7effd7eb 100644
--- a/tests/wpt/tests/css/css-ui/box-sizing-003.html
+++ b/tests/wpt/tests/css/css-ui/box-sizing-003.html
@@ -6,7 +6,7 @@
 <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width">
 <link rel="match" href="reference/box-sizing-001-ref.html">
 <meta name="assert" content="When box-sizing is border-box, the content width, rather than the computed value of the width property,
-                             should be used in the the constraint that determines the used values of sizing and positioning properties
+                             should be used in the constraint that determines the used values of sizing and positioning properties
 			     of absolutely positioned elements.">
 <style>
 #cb {
diff --git a/tests/wpt/tests/css/css-ui/box-sizing-005.html b/tests/wpt/tests/css/css-ui/box-sizing-005.html
index 64267da8528..c75265fbccf 100644
--- a/tests/wpt/tests/css/css-ui/box-sizing-005.html
+++ b/tests/wpt/tests/css/css-ui/box-sizing-005.html
@@ -6,7 +6,7 @@
 <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-height">
 <link rel="match" href="reference/box-sizing-001-ref.html">
 <meta name="assert" content="When box-sizing is border-box, the content height, rather than the computed value of the height property,
-                             should be used in the the constraint that determines the used values of sizing and positioning properties
+                             should be used in the constraint that determines the used values of sizing and positioning properties
 			     of absolutely positioned elements.">
 <style>
 #cb {
diff --git a/tests/wpt/tests/css/css-ui/cursor-calc-hotspot.html b/tests/wpt/tests/css/css-ui/cursor-calc-hotspot.html
new file mode 100644
index 00000000000..825d9571271
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/cursor-calc-hotspot.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<title>CSS UI Test: Allow complex calc expressions in cursor hotspot</title>
+<link rel="help" href="https://drafts.csswg.org/css-ui/#cursor">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #t1 {
+    font-size: 20px;
+    cursor: url(data:image/x-icon,) calc(7 * sign(1em - 18px)) 0, auto;
+  }
+  #t2 {
+    cursor: url(data:image/x-icon,) calc(4 * sibling-index()) 0, auto;
+  }
+  #t3 {
+    cursor: url(data:image/x-icon,) calc(9) 0, auto;
+  }
+  #t4 {
+    cursor: url(data:image/x-icon,) calc(10 * sign(2px)) 0, auto;
+  }
+</style>
+<div>
+  <div id="t1"></div>
+  <div id="t2"></div>
+  <div id="t3"></div>
+  <div id="t4"></div>
+</div>
+<script>
+  test(() => {
+    assert_equals(getComputedStyle(t1).cursor, 'url("data:image/x-icon,") 7 0, auto');
+  }, "cursor hotspot with sign() depending on font relative units");
+
+  test(() => {
+    assert_equals(getComputedStyle(t2).cursor, 'url("data:image/x-icon,") 8 0, auto');
+  }, "cursor hotspot depending on sibling-index()");
+
+  test(() => {
+    assert_equals(getComputedStyle(t3).cursor, 'url("data:image/x-icon,") 9 0, auto');
+  }, "cursor hotspot depending on simplified numeric calc()");
+
+  test(() => {
+    assert_equals(getComputedStyle(t4).cursor, 'url("data:image/x-icon,") 10 0, auto');
+  }, "cursor hotspot depending on simplified numeric calc() with sign()");
+</script>
diff --git a/tests/wpt/tests/css/css-ui/interactivity-inert-all.tentative.html b/tests/wpt/tests/css/css-ui/interactivity-inert-all.tentative.html
new file mode 100644
index 00000000000..e0bfe76db64
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/interactivity-inert-all.tentative.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS UI Test: The 'all' shorthand does not include 'interactivity'</title>
+<link rel="help" href="https://drafts.csswg.org/css-ui-4/#inertness">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/12049">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #inert {
+    interactivity: inert;
+  }
+  #child {
+    all: initial;
+  }
+</style>
+<div id="inert">
+  <span id="child"></span>
+</div>
+<script>
+  test(() => {
+    assert_equals(getComputedStyle(child).interactivity, "inert");
+  }, "The 'all' shorthand should not set 'interactivity'");
+</script>
diff --git a/tests/wpt/tests/css/css-ui/interactivity-inert-animated.html b/tests/wpt/tests/css/css-ui/interactivity-inert-animated.html
new file mode 100644
index 00000000000..8fc86dabbfd
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/interactivity-inert-animated.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<title>CSS Basic User Interface Test: animated interactivity:auto should not block click events</title>
+<link rel="help" href="https://drafts.csswg.org/css-ui-4/#inertness">
+<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>
+<style>
+  @keyframes --anim {
+    0% { interactivity: auto; }
+  }
+  #inert {
+    animation: --anim 10000s step-end;
+    interactivity: inert;
+    width: 100px;
+    height: 100px;
+    background: lime;
+  }
+</style>
+<div id="inert"></div>
+<script>
+  let clicked = false;
+  inert.addEventListener('click', () => clicked = true);
+
+  promise_test(async () => {
+    await test_driver.click(inert);
+    assert_true(clicked);
+  }, "Click event should work for interactivity:auto animation");
+
+</script>
diff --git a/tests/wpt/tests/css/css-ui/native-appearance-disabled-for-value-unset.html b/tests/wpt/tests/css/css-ui/native-appearance-disabled-for-value-unset.html
new file mode 100644
index 00000000000..c720d04bf23
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/native-appearance-disabled-for-value-unset.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Native appearance disabled when appearance-disabling property has author-specified value unset</title>
+    <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-disabling-properties">
+    <link rel="match" href="reference/native-appearance-disabled-for-value-unset-ref.html">
+    <meta name="assert" content="Widgets with background and border set to `unset` should display the same as if they had background and border set to `initial`">
+    <style>
+      body * {
+        display: block;
+        background: unset;
+        border: unset;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Test passes if the following widgets display the same with their background and border set to 'unset' as they do with background and border set to 'initial'</h1>
+    <button>Button</button>
+    <meter value='10' min='0' max='100'></meter>
+    <progress></progress>
+    <select></select>
+    <textarea></textarea>
+    <input type=button>
+    <input type=checkbox>
+    <input type=checkbox switch>
+    <input type=color>
+    <input type=date>
+    <input type=datetime-local>
+    <input type=file>
+    <input type=month>
+    <input type=number>
+    <input type=radio>
+    <input type=range>
+    <input type=search>
+    <input type=submit>
+    <input type=text>
+    <input type=time>
+    <input type=week>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/css-ui/reference/native-appearance-disabled-for-value-unset-ref.html b/tests/wpt/tests/css/css-ui/reference/native-appearance-disabled-for-value-unset-ref.html
new file mode 100644
index 00000000000..f3f8a11ed88
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/reference/native-appearance-disabled-for-value-unset-ref.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Native appearance disabled when appearance-disabling property has author-specified value unset (reference)</title>
+    <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-disabling-properties">
+    <meta name="assert" content="Widgets with background and border set to `unset` should display the same as if they had background and border set to `initial`">
+    <style>
+      body * {
+        display: block;
+        background: initial;
+        border: initial;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Test passes if the following widgets display the same with their background and border set to 'unset' as they do with background and border set to 'initial'</h1>
+    <button>Button</button>
+    <meter value='10' min='0' max='100'></meter>
+    <progress></progress>
+    <select></select>
+    <textarea></textarea>
+    <input type=button>
+    <input type=checkbox>
+    <input type=checkbox switch>
+    <input type=color>
+    <input type=date>
+    <input type=datetime-local>
+    <input type=file>
+    <input type=month>
+    <input type=number>
+    <input type=radio>
+    <input type=range>
+    <input type=search>
+    <input type=submit>
+    <input type=text>
+    <input type=time>
+    <input type=week>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/css-ui/resize-iframe-3d-transform.tentative.html b/tests/wpt/tests/css/css-ui/resize-iframe-3d-transform.tentative.html
new file mode 100644
index 00000000000..50c894084c7
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/resize-iframe-3d-transform.tentative.html
@@ -0,0 +1,105 @@
+<!DOCTYPE HTML>
+<title>Test of resizing interaction</title>
+<link rel="author" title="L. David Baron" href="https://dbaron.org/">
+<link rel="author" title="Google" href="http://www.google.com/">
+<link rel="help" href="https://www.w3.org/TR/css-ui-4/#resize">
+<link rel="help" href="https://issues.chromium.org/issues/40697767">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<!--
+  This test uses .tentative. because it depends on unspecified user
+  interface characteristics (the position of the resizer UI and how it
+  works), although those user interface characteristics are likely common
+  across implementations.
+-->
+
+<style>
+
+html, body, iframe { margin: 0; padding: 0; }
+
+/**
+ * The top left corner of the iframe is translated by 300px left and
+ * 300px towards the user.  This is inside a 60deg rotation around the
+ * left edge of the page, which means that that rotation moves the left
+ * edge of the iframe back into the viewport.  The iframe's width is
+ * squashed in half, so it's visually 150x150 content box with 2px
+ * top/bottom borders and 1px left/right borders.
+ *
+ * This test is using 3D transforms to test correct use of project
+ * versus map for the event handling.
+ */
+
+#outer {
+  transform: rotateY(60deg);
+  transform-origin: top left;
+  transform-style: preserve-3d;
+}
+
+#middle {
+  transform: translateZ(300px);
+  transform-style: preserve-3d;
+}
+
+#inner {
+  transform: translateX(-304px);
+  resize: both;
+  border: 2px solid;
+}
+
+</style>
+
+<div id="outer">
+  <div id="middle">
+    <iframe id="inner" srcdoc="hello world"></iframe>
+  </div>
+</div>
+
+<script>
+
+promise_test(async t => {
+  let e = document.getElementById("inner");
+
+  let w = e.getBoundingClientRect().width;
+  let h = e.getBoundingClientRect().height;
+
+  assert_equals(w, 152, "iframe width");
+  assert_equals(h, 154, "iframe height");
+
+  let x = e.getBoundingClientRect().right - 2; /* everything squashed in half */
+  let y = e.getBoundingClientRect().bottom - 4;
+
+  assert_approx_equals(x, Math.sin(Math.PI/3) * 300 - 2, 0.1, "iframe right");
+  assert_equals(y, 150, "iframe bottom");
+
+  x = Math.round(x); // Actions expects integers
+
+  let move1 = new test_driver.Actions()
+    .pointerMove(x, y)
+    .pointerDown()
+    .pointerMove(x-2, y-3);
+  await move1.send();
+
+  assert_equals(e.getBoundingClientRect().width, w - 2, "width after move 1");
+  assert_equals(e.getBoundingClientRect().height, h - 3, "height after move 1");
+  assert_equals(e.style.width, "296px", "width style after move 1");
+  assert_equals(e.style.height, "147px", "height style after move 1");
+
+  // It's odd that we have to send pointerMove and pointerDown again here.
+  let move2 = new test_driver.Actions()
+    .pointerMove(x-2, y-3)
+    .pointerDown()
+    .pointerMove(x-9, y-1)
+    .pointerUp();
+  await move2.send();
+
+  assert_equals(e.getBoundingClientRect().width, w - 9, "width after move 2");
+  assert_equals(e.getBoundingClientRect().height, h - 1, "height after move 2");
+  assert_equals(e.style.width, "282px", "width style after move 2");
+  assert_equals(e.style.height, "149px", "height style after move 2");
+}, "resizing of iframe in 3D transform");
+
+</script>
diff --git a/tests/wpt/tests/css/css-ui/resize-textarea-relative-to-right-001.tentative.html b/tests/wpt/tests/css/css-ui/resize-textarea-relative-to-right-001.tentative.html
new file mode 100644
index 00000000000..95a0bf189ec
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/resize-textarea-relative-to-right-001.tentative.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<title>Test of resizing interaction</title>
+<link rel="author" title="L. David Baron" href="https://dbaron.org/">
+<link rel="author" title="Google" href="http://www.google.com/">
+<link rel="help" href="https://www.w3.org/TR/css-ui-4/#resize">
+<link rel="help" href="https://issues.chromium.org/issues/40697767">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<!--
+  This test uses .tentative. because it depends on unspecified user
+  interface characteristics (the position of the resizer UI and how it
+  works), although those user interface characteristics are likely common
+  across implementations.
+-->
+
+<div style="float: right">
+  <textarea id="text"></textarea>
+</div>
+
+<script>
+
+promise_test(async t => {
+  let e = document.getElementById("text");
+
+  let w = e.getBoundingClientRect().width;
+  let h = e.getBoundingClientRect().height;
+
+  let startX = e.getBoundingClientRect().left;
+
+  let x = e.getBoundingClientRect().right - 3;
+  let y = e.getBoundingClientRect().bottom - 3;
+  let move1 = new test_driver.Actions()
+    .pointerMove(x, y)
+    .pointerDown()
+    .pointerMove(x-2, y-3);
+  await move1.send();
+
+  assert_equals(e.getBoundingClientRect().width, w - 2, "width after move 1");
+  assert_equals(e.getBoundingClientRect().height, h - 3, "height after move 1");
+  assert_equals(e.getBoundingClientRect().left, startX + 2, "left after move 1");
+
+  // It's odd that we have to send pointerMove and pointerDown again here.
+  let move2 = new test_driver.Actions()
+    .pointerMove(x-2, y-3)
+    .pointerDown()
+    .pointerMove(x-9, y-1)
+    .pointerUp();
+  await move2.send();
+
+  assert_equals(e.getBoundingClientRect().width, w - 9, "width after move 2");
+  assert_equals(e.getBoundingClientRect().height, h - 1, "height after move 2");
+  assert_equals(e.getBoundingClientRect().left, startX + 9, "left after move 2");
+}, "resizing of textarea whose position is anchored to the right side");
+
+</script>
diff --git a/tests/wpt/tests/css/css-ui/resize-textarea-rtl-001.tentative.html b/tests/wpt/tests/css/css-ui/resize-textarea-rtl-001.tentative.html
new file mode 100644
index 00000000000..dab08fb7514
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/resize-textarea-rtl-001.tentative.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html dir="rtl">
+<title>Test of resizing interaction</title>
+<link rel="author" title="L. David Baron" href="https://dbaron.org/">
+<link rel="author" title="Google" href="http://www.google.com/">
+<link rel="help" href="https://www.w3.org/TR/css-ui-4/#resize">
+<link rel="help" href="https://issues.chromium.org/issues/41236895">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<!--
+  This test uses .tentative. because it depends on unspecified user
+  interface characteristics (the position of the resizer UI and how it
+  works), although those user interface characteristics are likely common
+  across implementations.
+-->
+
+<textarea id="text"></textarea>
+
+<script>
+
+promise_test(async t => {
+  let e = document.getElementById("text");
+
+  let w = e.getBoundingClientRect().width;
+  let h = e.getBoundingClientRect().height;
+
+  let startX = e.getBoundingClientRect().left;
+
+  let x = e.getBoundingClientRect().left + 3; // resizer at lower left
+  let y = e.getBoundingClientRect().bottom - 3;
+  let move1 = new test_driver.Actions()
+    .pointerMove(x, y)
+    .pointerDown()
+    .pointerMove(x+2, y-3);
+  await move1.send();
+
+  assert_equals(e.getBoundingClientRect().width, w - 2, "width after move 1");
+  assert_equals(e.getBoundingClientRect().height, h - 3, "height after move 1");
+  assert_equals(e.getBoundingClientRect().left, startX + 2, "left after move 1");
+
+  // It's odd that we have to send pointerMove and pointerDown again here.
+  let move2 = new test_driver.Actions()
+    .pointerMove(x+2, y-3)
+    .pointerDown()
+    .pointerMove(x-9, y-1)
+    .pointerUp();
+  await move2.send();
+
+  assert_equals(e.getBoundingClientRect().width, w + 9, "width after move 2");
+  assert_equals(e.getBoundingClientRect().height, h - 1, "height after move 2");
+  assert_equals(e.getBoundingClientRect().left, startX - 9, "left after move 2");
+}, "resizing of RTL textarea in RTL context");
+
+</script>
diff --git a/tests/wpt/tests/css/css-ui/resize-textarea-rtl-002.tentative.html b/tests/wpt/tests/css/css-ui/resize-textarea-rtl-002.tentative.html
new file mode 100644
index 00000000000..1715df3bb47
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/resize-textarea-rtl-002.tentative.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<title>Test of resizing interaction</title>
+<link rel="author" title="L. David Baron" href="https://dbaron.org/">
+<link rel="author" title="Google" href="http://www.google.com/">
+<link rel="help" href="https://www.w3.org/TR/css-ui-4/#resize">
+<link rel="help" href="https://issues.chromium.org/issues/41236895">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<!--
+  This test uses .tentative. because it depends on unspecified user
+  interface characteristics (the position of the resizer UI and how it
+  works), although those user interface characteristics are likely common
+  across implementations.
+-->
+
+<textarea id="text" dir="rtl"></textarea>
+
+<script>
+
+promise_test(async t => {
+  let e = document.getElementById("text");
+
+  let w = e.getBoundingClientRect().width;
+  let h = e.getBoundingClientRect().height;
+
+  let startX = e.getBoundingClientRect().left;
+
+  let x = e.getBoundingClientRect().left + 3; // resizer at lower left
+  let y = e.getBoundingClientRect().bottom - 3;
+  let move1 = new test_driver.Actions()
+    .pointerMove(x, y)
+    .pointerDown()
+    .pointerMove(x+2, y-3);
+  await move1.send();
+
+  assert_equals(e.getBoundingClientRect().width, w - 2, "width after move 1");
+  assert_equals(e.getBoundingClientRect().height, h - 3, "height after move 1");
+  assert_equals(e.getBoundingClientRect().left, startX, "left after move 1");
+
+  // It's odd that we have to send pointerMove and pointerDown again here.
+  let move2 = new test_driver.Actions()
+    .pointerMove(x+2, y-3)
+    .pointerDown()
+    .pointerMove(x-9, y-1)
+    .pointerUp();
+  await move2.send();
+
+  assert_equals(e.getBoundingClientRect().width, w + 9, "width after move 2");
+  assert_equals(e.getBoundingClientRect().height, h - 1, "height after move 2");
+  assert_equals(e.getBoundingClientRect().left, startX, "left after move 2");
+}, "resizing of RTL textarea whose position is anchored to the left side");
+
+</script>
diff --git a/tests/wpt/tests/css/css-ui/webkit-appearance-auto-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-auto-001.html
index fb0261b020f..df73cba1334 100644
--- a/tests/wpt/tests/css/css-ui/webkit-appearance-auto-001.html
+++ b/tests/wpt/tests/css/css-ui/webkit-appearance-auto-001.html
@@ -7,6 +7,7 @@ Edit the appearance-* file instead and then run:
 <title>CSS Basic User Interface Test: -webkit-appearance: auto</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="auto is supported.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/webkit-appearance-button-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-button-001.html
index cf36b42384a..ac30091901a 100644
--- a/tests/wpt/tests/css/css-ui/webkit-appearance-button-001.html
+++ b/tests/wpt/tests/css/css-ui/webkit-appearance-button-001.html
@@ -7,6 +7,7 @@ Edit the appearance-* file instead and then run:
 <title>CSS Basic User Interface Test: -webkit-appearance: button</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="button is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/webkit-appearance-checkbox-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-checkbox-001.html
index 09dd3d76cd6..a0dea650255 100644
--- a/tests/wpt/tests/css/css-ui/webkit-appearance-checkbox-001.html
+++ b/tests/wpt/tests/css/css-ui/webkit-appearance-checkbox-001.html
@@ -7,6 +7,7 @@ Edit the appearance-* file instead and then run:
 <title>CSS Basic User Interface Test: -webkit-appearance: checkbox</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="checkbox is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/webkit-appearance-listbox-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-listbox-001.html
index 2a33758e2b5..189286b8c71 100644
--- a/tests/wpt/tests/css/css-ui/webkit-appearance-listbox-001.html
+++ b/tests/wpt/tests/css/css-ui/webkit-appearance-listbox-001.html
@@ -7,6 +7,7 @@ Edit the appearance-* file instead and then run:
 <title>CSS Basic User Interface Test: -webkit-appearance: listbox</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="listbox is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/webkit-appearance-menulist-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-menulist-001.html
index b9826c4bd27..c5dac6920ff 100644
--- a/tests/wpt/tests/css/css-ui/webkit-appearance-menulist-001.html
+++ b/tests/wpt/tests/css/css-ui/webkit-appearance-menulist-001.html
@@ -7,6 +7,7 @@ Edit the appearance-* file instead and then run:
 <title>CSS Basic User Interface Test: -webkit-appearance: menulist</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="menulist is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/webkit-appearance-menulist-button-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-menulist-button-001.html
index ba4016a495a..78d41248ed5 100644
--- a/tests/wpt/tests/css/css-ui/webkit-appearance-menulist-button-001.html
+++ b/tests/wpt/tests/css/css-ui/webkit-appearance-menulist-button-001.html
@@ -7,6 +7,7 @@ Edit the appearance-* file instead and then run:
 <title>CSS Basic User Interface Test: -webkit-appearance: menulist-button</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="menulist-button is an alias to auto except on drop-down select.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/webkit-appearance-meter-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-meter-001.html
index 05fb5ce25f2..496024d0505 100644
--- a/tests/wpt/tests/css/css-ui/webkit-appearance-meter-001.html
+++ b/tests/wpt/tests/css/css-ui/webkit-appearance-meter-001.html
@@ -7,6 +7,7 @@ Edit the appearance-* file instead and then run:
 <title>CSS Basic User Interface Test: -webkit-appearance: meter</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="meter is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/webkit-appearance-progress-bar-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-progress-bar-001.html
index b989502902d..47db33234da 100644
--- a/tests/wpt/tests/css/css-ui/webkit-appearance-progress-bar-001.html
+++ b/tests/wpt/tests/css/css-ui/webkit-appearance-progress-bar-001.html
@@ -7,6 +7,7 @@ Edit the appearance-* file instead and then run:
 <title>CSS Basic User Interface Test: -webkit-appearance: progress-bar</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="progress-bar is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/webkit-appearance-radio-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-radio-001.html
index 52d9fb22ac1..e10de4aca62 100644
--- a/tests/wpt/tests/css/css-ui/webkit-appearance-radio-001.html
+++ b/tests/wpt/tests/css/css-ui/webkit-appearance-radio-001.html
@@ -7,6 +7,7 @@ Edit the appearance-* file instead and then run:
 <title>CSS Basic User Interface Test: -webkit-appearance: radio</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="radio is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/webkit-appearance-searchfield-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-searchfield-001.html
index 8abd91e3c8f..af56298d4e4 100644
--- a/tests/wpt/tests/css/css-ui/webkit-appearance-searchfield-001.html
+++ b/tests/wpt/tests/css/css-ui/webkit-appearance-searchfield-001.html
@@ -7,6 +7,7 @@ Edit the appearance-* file instead and then run:
 <title>CSS Basic User Interface Test: -webkit-appearance: searchfield</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="searchfield is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-ui/webkit-appearance-textarea-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-textarea-001.html
index cf3a15f4db6..eba4d3044be 100644
--- a/tests/wpt/tests/css/css-ui/webkit-appearance-textarea-001.html
+++ b/tests/wpt/tests/css/css-ui/webkit-appearance-textarea-001.html
@@ -7,6 +7,7 @@ Edit the appearance-* file instead and then run:
 <title>CSS Basic User Interface Test: -webkit-appearance: textarea</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
 <meta name="assert" content="textarea is an alias to auto.">
+<meta name="fuzzy" content="totalPixels=0-2;maxDifference=0-1">
 <link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
diff --git a/tests/wpt/tests/css/css-values/acos-asin-atan-atan2-computed.html b/tests/wpt/tests/css/css-values/acos-asin-atan-atan2-computed.html
index 76033289a2c..cacee588f3c 100644
--- a/tests/wpt/tests/css/css-values/acos-asin-atan-atan2-computed.html
+++ b/tests/wpt/tests/css/css-values/acos-asin-atan-atan2-computed.html
@@ -39,6 +39,11 @@ test_math_used('calc(atan2(0,-1) / 4)', '45deg', {type:'angle', approx:0.1}); //
 test_math_used('calc(atan2(1,-1))', '135deg', {type:'angle', approx:0.1});
 test_math_used('calc(atan2(-1,1))', '-45deg', {type:'angle', approx:0.1});
 
+// Test unresolved at parse time
+test_math_used('calc(asin(sin(180deg * sibling-index())))', '0deg', {type:'angle', approx:0.1});
+test_math_used('calc(acos(cos(180deg * sibling-index())))', '180deg', {type:'angle', approx:0.1});
+test_math_used('calc(atan(tan(180deg * sibling-index())))', '0deg', {type:'angle', approx:0.1});
+
 // Test nesting
 test_math_used('calc(cos(sin(acos(cos(pi)))))', '1', {type:'number', approx:0.1});
 
diff --git a/tests/wpt/tests/css/css-values/calc-complex-unresolved-serialize.html b/tests/wpt/tests/css/css-values/calc-complex-unresolved-serialize.html
new file mode 100644
index 00000000000..64bccd216ab
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/calc-complex-unresolved-serialize.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<title>CSS Values and Units Test: Serialization of non-simplified calc() expressions</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-4/#calc-simplification">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../support/serialize-testcommon.js"></script>
+<style>
+  #target { font-size: 20px; }
+</style>
+<div>
+  <div id="target"></div>
+</div>
+<script>
+  function test_serialization(value, specified, computed) {
+    test_specified_serialization("orphans", value, specified);
+    test_computed_serialization("orphans", value, computed);
+  }
+
+  test_serialization("calc(pow(2, sign(1em - 18px)))", "calc(pow(2, sign(1em - 18px)))", "2");
+  test_serialization("calc(pow(sign(1em - 18px), 2))", "calc(pow(sign(1em - 18px), 2))", "1");
+  test_serialization("calc(pow(sign(1em - 18px), sign(1em - 18px)))", "calc(pow(sign(1em - 18px), sign(1em - 18px)))", "1");
+
+  test_serialization("calc(pow(2, sibling-index())", "calc(pow(2, sibling-index()))", "2");
+  test_serialization("calc(pow(sibling-index(), 2)", "calc(pow(sibling-index(), 2))", "1");
+  test_serialization("calc(pow(sibling-index(), sibling-index())", "calc(pow(sibling-index(), sibling-index()))", "1");
+</script>
diff --git a/tests/wpt/tests/css/css-values/calc-size/animation/calc-size-interpolation-expansion.html b/tests/wpt/tests/css/css-values/calc-size/animation/calc-size-interpolation-expansion.html
index 354d108f1da..0b2a60cde7f 100644
--- a/tests/wpt/tests/css/css-values/calc-size/animation/calc-size-interpolation-expansion.html
+++ b/tests/wpt/tests/css/css-values/calc-size/animation/calc-size-interpolation-expansion.html
@@ -32,8 +32,6 @@
  * not fully specified.  Once we have multiple implementations that
  * implement all of the necessary features for this test, we should
  * probably look at improving that interoperability.
- *
- * TODO: The sorting of the nodes in a multiplication seems wrong.
  */
 
 var TESTS = [
@@ -42,23 +40,23 @@ var TESTS = [
     start: "auto",
     end: "calc-size(any, 0px)",
     expected: {
-      0.75: "calc-size(auto, 0px + size * 0.25)",
+      0.75: "calc-size(auto, 0px + (0.25 * size))",
     },
   },
   {
     property: "height",
     start: "0px",
-    end: "calc-size(calc-size(min-content, size + 20px), size * 2)",
+    end: "calc-size(calc-size(min-content, size + 20px), 2 * size)",
     expected: {
-      0.75: "calc-size(calc-size(min-content, 20px + size), 0px + size * 2 * 0.75)",
+      0.75: "calc-size(calc-size(min-content, 20px + size), 0px + (1.5 * size))",
     },
   },
   {
     property: "height",
     start: "calc-size(min-content, size * 4)",
-    end: "calc-size(calc-size(min-content, size + 20px), size * 2)",
+    end: "calc-size(calc-size(min-content, size + 20px), 2 * size)",
     expected: {
-      0.75: "calc-size(min-content, size * 4 * 0.25 + (20px + size) * 2 * 0.75)",
+      0.75: "calc-size(min-content, size + (1.5 * (20px + size)))",
     },
   },
   {
@@ -89,32 +87,32 @@ var TESTS = [
   {
     property: "width",
     start: "calc-size(fit-content, 20px)",
-    end: "calc-size(calc-size(fit-content, 3 * size + 10px), min(size + 20px, size * 2 - 30px) + size * 2 + 80px)",
+    end: "calc-size(calc-size(fit-content, 3 * size + 10px), min(size + 20px, 2 * size - 30px) + ((2 * size) + 80px))",
     expected: {
-      0.75: "calc-size(fit-content, 5px + min(30px + 3 * size, 30px + 2 * 0.75 * (3 * size + 10px)) + (10px + 3 * size) * 2 * 0.75)",
-      0.75: "calc-size(fit-content, 5px + (80px + min(10px + 20px + size * 3, -30px + (10px + size * 3) * 2) + (10px + size * 3) * 2) * 0.75)",
+      0.75: "calc-size(fit-content, 5px + min(30px + (3 * size), 30px + (2 * 0.75 * (3 * size + 10px)) + (0.75 * 2 * (10px + (3 * size)))))",
+      0.75: "calc-size(fit-content, 5px + (0.75 * (80px + min(30px + (3 * size), -30px + (2 * (10px + (3 * size)))) + (2 * (10px + (3 * size))))))",
     },
   },
   {
     property: "width",
     start: "calc-size(50%, size)",
-    end: "calc-size(calc-size(45%, (size * 2)), size + 20px)",
+    end: "calc-size(calc-size(45%, (2 * size)), size + 20px)",
     expected: {
-      0.75: "calc-size(100%, size * 0.5 * 0.25 + (20px + size * 0.45 * 2) * 0.75)",
+      0.75: "calc-size(100%, (0.125 * size) + (0.75 * (20px + (0.9 * size))))",
     },
   },
   {
     property: "width",
     start: "calc-size(40%, size)",
-    end: "calc-size(calc-size(10px, (size * 2)), size + 20px)",
+    end: "calc-size(calc-size(10px, (2 * size)), size + 20px)",
     expected: {
-      0.75: "calc-size(100%, 30px + size * 0.4 * 0.25)",
+      0.75: "calc-size(100%, 30px + (0.1 * size))",
     },
   },
   {
     property: "width",
     start: "calc-size(80px, size)",
-    end: "calc-size(calc-size(10px, (size * 2)), size + 20px)",
+    end: "calc-size(calc-size(10px, (2 * size)), size + 20px)",
     expected: {
       0.75: "calc-size(any, 50px)",
     },
diff --git a/tests/wpt/tests/css/css-values/calc-size/calc-size-no-body-height-quirk-001-ref.html b/tests/wpt/tests/css/css-values/calc-size/calc-size-no-body-height-quirk-001-ref.html
new file mode 100644
index 00000000000..0c0d6b3607b
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/calc-size/calc-size-no-body-height-quirk-001-ref.html
@@ -0,0 +1,11 @@
+<!-- This test is intentionally in quirks mode. -->
+<title>calc-size() and the body fills html quirk</title>
+<style>
+
+div {
+  border: medium solid;
+}
+
+</style>
+
+<div>The bottom border of this box should be close to the text, not at the bottom of the viewport.</div>
diff --git a/tests/wpt/tests/css/css-values/calc-size/calc-size-no-body-height-quirk-001.html b/tests/wpt/tests/css/css-values/calc-size/calc-size-no-body-height-quirk-001.html
new file mode 100644
index 00000000000..70a2670ab87
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/calc-size/calc-size-no-body-height-quirk-001.html
@@ -0,0 +1,15 @@
+<!-- This test is intentionally in quirks mode. -->
+<title>calc-size() and the body fills html quirk</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#calc-size">
+<link rel="help" href="https://quirks.spec.whatwg.org/#the-body-element-fills-the-html-element-quirk">
+<link rel="match" href="calc-size-no-body-height-quirk-001-ref.html">
+<style>
+
+body {
+  height: calc-size(auto, size);
+  border: medium solid;
+}
+
+</style>
+
+<body>The bottom border of this box should be close to the text, not at the bottom of the viewport.</body>
diff --git a/tests/wpt/tests/css/css-values/calc-size/calc-size-parsing.html b/tests/wpt/tests/css/css-values/calc-size/calc-size-parsing.html
index 6db2635e5ef..a7e948497e7 100644
--- a/tests/wpt/tests/css/css-values/calc-size/calc-size-parsing.html
+++ b/tests/wpt/tests/css/css-values/calc-size/calc-size-parsing.html
@@ -35,10 +35,10 @@ test_valid_value("min-block-size",  "calc-size(max-content, size)");
 test_valid_value("min-inline-size", "calc-size(max-content, size)");
 
 test_valid_value("width",      "calc-size(fit-content, size)");
-test_valid_value("height",     "calc-size(min-content, size * 2)");
-test_valid_value("max-width",  "calc-size(max-content, size / 2)");
-test_valid_value("max-height", "calc-size(fit-content, 30px + size / 2)");
-test_valid_value("width",      "calc-size(fit-content, 50% + size / 2)");
+test_valid_value("height",     "calc-size(min-content, size * 2)", "calc-size(min-content, 2 * size)");
+test_valid_value("max-width",  "calc-size(max-content, size / 2)", "calc-size(max-content, 0.5 * size)");
+test_valid_value("max-height", "calc-size(fit-content, 30px + size / 2)", "calc-size(fit-content, 30px + (0.5 * size))");
+test_valid_value("width",      "calc-size(fit-content, 50% + size / 2)", "calc-size(fit-content, 50% + (0.5 * size))");
 
 test_valid_value("width",      "calc-size(any, 25em)");
 test_valid_value("width",      "calc-size(any, 40%)");
diff --git a/tests/wpt/tests/css/css-values/calc-size/calc-size-svg-001-crash.html b/tests/wpt/tests/css/css-values/calc-size/calc-size-svg-001-crash.html
new file mode 100644
index 00000000000..ec1e09a4315
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/calc-size/calc-size-svg-001-crash.html
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML>
+<style>
+
+image {
+  height: calc-size(auto, size * 0.5);
+}
+
+</style>
+
+<svg><image></image></svg>
diff --git a/tests/wpt/tests/css/css-values/calc-size/calc-size-typed-om.html b/tests/wpt/tests/css/css-values/calc-size/calc-size-typed-om.html
index 8f9600e26a9..606de7f5060 100644
--- a/tests/wpt/tests/css/css-values/calc-size/calc-size-typed-om.html
+++ b/tests/wpt/tests/css/css-values/calc-size/calc-size-typed-om.html
@@ -25,10 +25,10 @@ function test_typed_om_string(property, value, expected) {
 
 test_typed_om_string("width", "calc-size(auto, size)");
 test_typed_om_string("width", "calc-size(fit-content, size)");
-test_typed_om_string("height", "calc-size(min-content, size * 2)");
-test_typed_om_string("max-width", "calc-size(max-content, size / 2)", "calc-size(max-content, size * 0.5)");
-test_typed_om_string("max-height", "calc-size(fit-content, 30px + size / 2)", "calc-size(fit-content, 30px + size * 0.5)");
-test_typed_om_string("width", "calc-size(fit-content, 50% + size / 2)", "calc-size(fit-content, 50% + size * 0.5)");
+test_typed_om_string("height", "calc-size(min-content, size * 2)", "calc-size(min-content, 2 * size)");
+test_typed_om_string("max-width", "calc-size(max-content, size / 2)", "calc-size(max-content, (0.5 * size))");
+test_typed_om_string("max-height", "calc-size(fit-content, 30px + size / 2)", "calc-size(fit-content, 30px + (0.5 * size))");
+test_typed_om_string("width", "calc-size(fit-content, 50% + size / 2)", "calc-size(fit-content, 50% + (0.5 * size))");
 test_typed_om_string("width", "calc-size(any, 30px)");
 test_typed_om_string("width", "calc-size(any, 25em)", "calc-size(any, 400px)");
 test_typed_om_string("width", "calc-size(any, 40%)");
@@ -41,6 +41,6 @@ test_typed_om_string("width", "calc-size(calc-size(any, 30px), 25em)", "calc-siz
 test_typed_om_string("width", "calc-size(calc-size(2in, 30px), 25em)", "calc-size(calc-size(192px, 30px), 400px)");
 test_typed_om_string("width", "calc-size(calc-size(min-content, 30px), 25em)", "calc-size(calc-size(min-content, 30px), 400px)");
 test_typed_om_string("width", "calc-size(calc-size(min-content, size), size)");
-test_typed_om_string("width", "calc-size(calc-size(fit-content, size * 2), size)");
+test_typed_om_string("width", "calc-size(calc-size(fit-content, size * 2), size)", "calc-size(calc-size(fit-content, 2 * size), size)");
 
 </script>
diff --git a/tests/wpt/tests/css/css-values/crashtests/chrome-405422528-crash.html b/tests/wpt/tests/css/css-values/crashtests/chrome-405422528-crash.html
new file mode 100644
index 00000000000..fcf7407b5f7
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/crashtests/chrome-405422528-crash.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<link rel="help" href="https://crbug.com/405422528">
+<div data-crash="sibling-index()" style="width: attr(data-crash px)"></div>
+<div data-crash="sign(1em - 1px)" style="width: attr(data-crash px)"></div>
diff --git a/tests/wpt/tests/css/css-values/exp-log-compute.html b/tests/wpt/tests/css/css-values/exp-log-compute.html
index 9efc1a7721c..9b11fe25b32 100644
--- a/tests/wpt/tests/css/css-values/exp-log-compute.html
+++ b/tests/wpt/tests/css/css-values/exp-log-compute.html
@@ -29,6 +29,10 @@ test_math_used('calc(log((3 + 1) /2, 2)  / log(e) + exp(0*1)*2 * log(e))', '3',
 test_math_used('calc(log((3 + 1) /2, 2)  / log(e, e) + exp(0*1)*2 * log(e, e))', '3', {type:'number', approx:0.1});
 test_math_used('calc(exp(0) + 1)', '2', {type:'number', approx:0.1});
 
+// Test unresolved at parse time
+test_math_used('calc(e - exp(sibling-index()))', '0', {type:'number', approx:0.1});
+test_math_used('calc(log(exp(2 * sibling-index())))', '2', {type:'number', approx:0.1});
+
 // Test nesting
 test_math_used('calc(log(exp(1)))', '1', {type:'number', approx:0.1});
 test_math_used('calc(log(exp(log(e))))', '1', {type:'number', approx:0.1});
diff --git a/tests/wpt/tests/css/css-values/hypot-pow-sqrt-computed.html b/tests/wpt/tests/css/css-values/hypot-pow-sqrt-computed.html
index 6ac416c0f5b..19ce1c2d49d 100644
--- a/tests/wpt/tests/css/css-values/hypot-pow-sqrt-computed.html
+++ b/tests/wpt/tests/css/css-values/hypot-pow-sqrt-computed.html
@@ -6,7 +6,12 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="../support/numeric-testcommon.js"></script>
-<div id="target"></div>
+<div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div id="target"></div>
+</div>
 <script>
 
 // Identity tests
@@ -38,6 +43,11 @@ test_math_used('hypot(0% + 772.333px)', 'calc(0% + 772.333px)');
 test_math_used('hypot(0% + 772.35px)', 'calc(0% + 772.35px)');
 test_math_used('hypot(0% + 600px, 0% + 800px)', '1000px');
 
+//Test unresolved at parse time
+test_math_used('sqrt(sibling-index())', '2', {type: 'integer'});
+test_math_used('calc(1px * sqrt(sibling-index()))', '2px');
+test_math_used('sqrt(pow(sibling-index(), 2))', '4', {type: 'integer'});
+
 //Type checking hypot
 test_math_used('hypot(1px)', '1px');
 test_math_used('hypot(1cm)', '1cm');
diff --git a/tests/wpt/tests/css/css-values/hypot-pow-sqrt-invalid.html b/tests/wpt/tests/css/css-values/hypot-pow-sqrt-invalid.html
index edecfceb13a..3e298895883 100644
--- a/tests/wpt/tests/css/css-values/hypot-pow-sqrt-invalid.html
+++ b/tests/wpt/tests/css/css-values/hypot-pow-sqrt-invalid.html
@@ -49,6 +49,8 @@ test_invalid_number('pow(1 * )');
 test_invalid_number('pow(1 / )');
 test_invalid_number('pow(1 2)');
 test_invalid_number('pow(1, , 2)');
+test_invalid_number('pow(2px, 2)');
+test_invalid_number('pow(10, 1px)');
 
 // General tests
 test_invalid_length('calc(1px * pow(1))');
@@ -64,4 +66,5 @@ test_invalid_length('pow())');
 test_invalid_length('pow(1, 2)');
 test_invalid_length('calc(sqrt())');
 test_invalid_length('calc(sqrt(100, 200))');
+test_invalid_length('pow(10px, 1)');
 </script>
diff --git a/tests/wpt/tests/css/css-values/if-cycle.tentative.html b/tests/wpt/tests/css/css-values/if-cycle.html
similarity index 100%
rename from tests/wpt/tests/css/css-values/if-cycle.tentative.html
rename to tests/wpt/tests/css/css-values/if-cycle.html
diff --git a/tests/wpt/tests/css/css-values/minmax-length-serialize.html b/tests/wpt/tests/css/css-values/minmax-length-serialize.html
index bd00ee05885..1ab6f846379 100644
--- a/tests/wpt/tests/css/css-values/minmax-length-serialize.html
+++ b/tests/wpt/tests/css/css-values/minmax-length-serialize.html
@@ -70,6 +70,12 @@ test_serialization(
 	'calc(2px + max(1em + 100px, 106px))',
 	'118px');
 
+// https://crbug.com/411359798
+test_serialization(
+	'calc(2 * (.2 * min(1em, 1px)) + 1px)',
+	'calc(1px + (0.4 * min(1em, 1px)))',
+	'1.4px');
+
 // Can't test that min()/max() are preserved in computed values with just lengths;
 // see minmax-length-percentage-serialize for tests of that.
 </script>
diff --git a/tests/wpt/tests/css/css-values/progress-computed.tentative.html b/tests/wpt/tests/css/css-values/progress-computed.html
similarity index 100%
rename from tests/wpt/tests/css/css-values/progress-computed.tentative.html
rename to tests/wpt/tests/css/css-values/progress-computed.html
diff --git a/tests/wpt/tests/css/css-values/progress-invalid.tentative.html b/tests/wpt/tests/css/css-values/progress-invalid.html
similarity index 100%
rename from tests/wpt/tests/css/css-values/progress-invalid.tentative.html
rename to tests/wpt/tests/css/css-values/progress-invalid.html
diff --git a/tests/wpt/tests/css/css-values/progress-serialize.tentative.html b/tests/wpt/tests/css/css-values/progress-serialize.html
similarity index 100%
rename from tests/wpt/tests/css/css-values/progress-serialize.tentative.html
rename to tests/wpt/tests/css/css-values/progress-serialize.html
diff --git a/tests/wpt/tests/css/css-values/random-computed.tentative.html b/tests/wpt/tests/css/css-values/random-computed.tentative.html
index c6a408040ce..b0539acf593 100644
--- a/tests/wpt/tests/css/css-values/random-computed.tentative.html
+++ b/tests/wpt/tests/css/css-values/random-computed.tentative.html
@@ -1,88 +1,114 @@
 <!DOCTYPE html>
 <link rel="help" href="https://drafts.csswg.org/css-values-5/#random">
 <link rel="author" title="sam@webkit.org">
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="../support/computed-testcommon.js"></script>
-<div id="container" style="font-size: 20">
+<div id="container">
   <div id="target"></div>
 </div>
-<div id="noIdentifier1" class="randomNoIdentifier"></div>
-<div id="noIdentifier2" class="randomNoIdentifier"></div>
-<div id="identifier1" class="randomIdentifier"></div>
-<div id="identifier2" class="randomIdentifier"></div>
-<div id="identicalArguments1"></div>
-<div id="identicalArguments2"></div>
-<div id="identicalArgumentsAfterMath1"></div>
-<div id="identicalArgumentsAfterMath2"></div>
-<div id="identicalArgumentsAfterUnitResolution1"></div>
-<div id="identicalArgumentsAfterUnitResolution2"></div>
-<div id="identicalTwoProperties"></div>
-<div id="identicalTwoPropertiesWithIdentifier"></div>
-<div id="identicalTwoPropertiesWithPerElement"></div>
-<div id="identicalTwoPropertiesWithPerElementAndIdentifier"></div>
 <style>
-  .randomPerElement { width: random(per-element, 0px, 100000px); }
-  .randomNoIdentifier { width: random(10px, 110px); }
-  .randomIdentifier { width: random(--identifier, 20px, 120px); }
-
-  #identicalArguments1 { width: random(30px, 130px); }
-  #identicalArguments2 { width: random(30px, 130px); }
-
-  #identicalArgumentsAfterMath1 { width: random(5 * 10px, 2 * 75px); }
-  #identicalArgumentsAfterMath2 { width: random(100px / 2, 300px / 2); }
-
-  #identicalArgumentsAfterUnitResolution1 { width: random(160px, 320px); }
-  #identicalArgumentsAfterUnitResolution2 { font-size: 16px; width: random(10em, 20em); }
-
-  #identicalTwoProperties {
-    width: random(60px, 160px);
-    height: random(60px, 160px);
+  .randomNoIdentifier {
+    width: random(0px, 100px);
+    height: random(0px, 100px);
+    left: random(0px, 100000px);
+    right: random(0px, 100000px);
+    margin: random(0px, 100000px) random(0px, 100000px);
   }
-
-  #identicalTwoPropertiesWithIdentifier {
-    width: random(--another-identifier, 70px, 170px);
-    height: random(--another-identifier, 70px, 170px);
+  .randomMatchElement {
+    width: random(element-shared, 0px, 100px);
+    height: random(element-shared, 0px, 100px);
+    left: random(element-shared, 0px, 100000px);
+    right: random(element-shared, 0px, 100000px);
+    margin: random(element-shared 0px, 100000px) random(element-shared 0px, 100000px);
   }
-
-  #identicalTwoPropertiesWithPerElement {
-    width: random(per-element, 80px, 180px);
-    height: random(per-element, 80px, 180px);
+  .randomIdentifier {
+    width: random(--identifier, 0px, 100px);
+    height: random(--identifier, 0px, 100px);
+    left: random(--identifier, 0px, 100000px);
+    right: random(--identifier, 0px, 100000px);
+    margin: random(--identifier 0px, 100000px) random(--identifier 0px, 100000px);
   }
-
-  #identicalTwoPropertiesWithPerElementAndIdentifier {
-    width: random(per-element --yet-another-identifier, 90px, 190px);
-    height: random(--yet-another-identifier per-element, 90px, 190px);
+  .randomMatchElementAndIdentifier {
+    width: random(element-shared --other-identifier, 0px, 100px);
+    height: random(element-shared --other-identifier, 0px, 100px);
+    left: random(element-shared --other-identifier, 0px, 100000px);
+    right: random(element-shared --other-identifier, 0px, 100000px);
+    margin: random(element-shared --other-identifier 0px, 100000px) random(element-shared --other-identifier 0px, 100000px);
+  }
+  .randomFixed {
+    width: random(fixed 0.5, 10px, 100px);
+    height: random(fixed 0.5, 10px, 100px);
+    left: random(fixed 0.5, 0px, 100000px);
+    right: random(fixed 0.5, 0px, 100000px);
+    margin: random(fixed 0.5 0px, 100000px) random(fixed 0.5 0px, 100000px);
   }
 </style>
 <script>
-function test_computed_value_in_range(property, specified, computedMin, computedMax, titleExtra) {
+
+// Run each test a number of times to increase the likelyhood that failure is not the cause of random chance.
+const iterations = 5;
+
+function test_random_computed_value(property, specified, computed, titleExtra, options = {}) {
+  if (!computed)
+    computed = specified;
+
   test(() => {
-    const target = document.getElementById('target');
-    assert_true(property in getComputedStyle(target), property + " doesn't seem to be supported in the computed style");
-    assert_true(CSS.supports(property, specified), "'" + specified + "' is a supported value for " + property + ".");
-    target.style[property] = '';
-    target.style[property] = specified;
+    for (i = 0; i < iterations; ++i) {
+      const target = document.getElementById('target');
+      assert_true(property in getComputedStyle(target), property + " doesn't seem to be supported in the computed style");
+      assert_true(CSS.supports(property, specified), "'" + specified + "' is a supported value for " + property + ".");
+      target.style[property] = '';
+      target.style[property] = specified;
 
-    let readValue = getComputedStyle(target)[property];
-
-    let readValueNumber = parseFloat(readValue);
-    let computedMinNumber = parseFloat(computedMin);
-    let computedMaxNumber = parseFloat(computedMax);
-
-    assert_greater_than_equal(readValueNumber, computedMinNumber, specified);
-    assert_less_than_equal(readValueNumber, computedMaxNumber, specified);
+      let readValue = getComputedStyle(target)[property];
+      if (options.comparisonFunction) {
+        options.comparisonFunction(readValue, computed);
+      } else if (Array.isArray(computed)) {
+        assert_in_array(readValue, computed);
+      } else {
+        assert_equals(readValue, computed);
+      }
+      if (readValue !== specified) {
+        target.style[property] = '';
+        target.style[property] = readValue;
+        assert_equals(getComputedStyle(target)[property], readValue,
+                      'computed value should round-trip');
+      }
+    }
   }, `Property ${property} value '${specified}'${titleExtra ? ' ' + titleExtra : ''}`);
 }
 
-function test_pseudo_element_computed_value_in_range(property, pseudo_element, specified, computedMin, computedMax, titleExtra) {
+function test_random_computed_value_greater_or_lower_than(property, specified, expected, titleExtra) {
   test(() => {
-    const styleEl = document.head.appendChild(document.createElement("style"));
-    styleEl.innerHTML = `#target${pseudo_element} \{ ${property}: ${specified}; \}`;
+    for (i = 0; i < iterations; ++i) {
+      const target = document.getElementById('target');
+      assert_true(property in getComputedStyle(target), property + " doesn't seem to be supported in the computed style");
+      assert_true(CSS.supports(property, specified), "'" + specified + "' is a supported value for " + property + ".");
+      target.style[property] = '';
+      target.style[property] = specified;
+      let readValue = parseFloat(getComputedStyle(target)[property]);
+      assert_true(isFinite(readValue), specified + " expected finite value but got " + readValue)
+      assert_false(isNaN(readValue),   specified + " expected finite value but got " + readValue)
+      if (expected > 0)
+        assert_greater_than_equal(readValue, expected, specified);
+      else
+        assert_less_than_equal(readValue, expected, specified);
+    }
+  }, `Property ${property} value '${specified}'${titleExtra ? ' ' + titleExtra : ''}`);
+}
 
-    try {
-      const target = document.getElementById("target");
-      let readValue = getComputedStyle(target, pseudo_element)[property];
+function test_random_computed_value_in_range(property, specified, computedMin, computedMax, titleExtra) {
+  test(() => {
+    for (i = 0; i < iterations; ++i) {
+      const target = document.getElementById('target');
+      assert_true(property in getComputedStyle(target), property + " doesn't seem to be supported in the computed style");
+      assert_true(CSS.supports(property, specified), "'" + specified + "' is a supported value for " + property + ".");
+      target.style[property] = '';
+      target.style[property] = specified;
+
+      let readValue = getComputedStyle(target)[property];
 
       let readValueNumber = parseFloat(readValue);
       let computedMinNumber = parseFloat(computedMin);
@@ -90,214 +116,359 @@ function test_pseudo_element_computed_value_in_range(property, pseudo_element, s
 
       assert_greater_than_equal(readValueNumber, computedMinNumber, specified);
       assert_less_than_equal(readValueNumber, computedMaxNumber, specified);
-    } finally {
-      document.head.removeChild(styleEl);
+    }
+  }, `Property ${property} value '${specified}'${titleExtra ? ' ' + titleExtra : ''}`);
+}
+
+function test_pseudo_element_random_computed_value_in_range(property, pseudo_element, specified, computedMin, computedMax, titleExtra) {
+  test(() => {
+    for (i = 0; i < iterations; ++i) {
+      const styleEl = document.head.appendChild(document.createElement("style"));
+      styleEl.innerHTML = `#target${pseudo_element} \{ ${property}: ${specified}; \}`;
+
+      try {
+        const target = document.getElementById("target");
+        let readValue = getComputedStyle(target, pseudo_element)[property];
+
+        let readValueNumber = parseFloat(readValue);
+        let computedMinNumber = parseFloat(computedMin);
+        let computedMaxNumber = parseFloat(computedMax);
+
+        assert_greater_than_equal(readValueNumber, computedMinNumber, specified);
+        assert_less_than_equal(readValueNumber, computedMaxNumber, specified);
+      } finally {
+        document.head.removeChild(styleEl);
+      }
     }
   }, `Property ${property} value on pseudo element '${pseudo_element}' '${specified}'${titleExtra ? ' ' + titleExtra : ''}`);
 }
 
+function test_random_computed_value_has_fixed(property, specified, minPercentage, maxPercentage, titleExtra) {
+  test(() => {
+    for (i = 0; i < iterations; ++i) {
+      const target = document.getElementById('target');
+      assert_true(property in getComputedStyle(target), property + " doesn't seem to be supported in the computed style");
+      assert_true(CSS.supports(property, specified), "'" + specified + "' is a supported value for " + property + ".");
+      target.style[property] = '';
+      target.style[property] = specified;
+
+      let readValue = getComputedStyle(target)[property];
+
+      // strip 'random(' and ')'.
+      let stippedReadValue = readValue.replace('random(', '').replace(')', '');
+
+      // split into the three main components
+      let [fixedComponent, minComponent, maxComponent] = stippedReadValue.split(', ');
+
+      // split fixed component into its two components
+      let [fixedString, fixedValue] = fixedComponent.split(' ');
+
+      assert_equals(fixedString, 'fixed', specified);
+      assert_greater_than_equal(parseFloat(fixedValue), '0', specified);
+      assert_less_than_equal(parseFloat(fixedValue), '1', specified);
+      assert_equals(minComponent, minPercentage, specified);
+      assert_equals(maxComponent, maxPercentage, specified);
+    }
+  }, `Property ${property} value '${specified}'${titleExtra ? ' ' + titleExtra : ''}`);
+}
+
 const property = 'scale';
 
-test_computed_value_in_range(property, 'random(1, 11)', '1', '11');
-test_computed_value_in_range(property, 'random(--foo, 2, 12)', '2', '12');
-test_computed_value_in_range(property, 'random(--foo per-element, 3, 13)', '3', '13');
-test_computed_value_in_range(property, 'random(per-element --foo, 4, 14)', '4', '14');
+test_random_computed_value_in_range(property, 'random(1, 11)', '1', '11');
+test_random_computed_value_in_range(property, 'random(--foo, 2, 12)', '2', '12');
+test_random_computed_value_in_range(property, 'random(--foo element-shared, 3, 13)', '3', '13');
+test_random_computed_value_in_range(property, 'random(element-shared --foo, 4, 14)', '4', '14');
 
-test_computed_value(property, 'random(0, 10, by 5)', ['0', '5', '10']);
-test_computed_value(property, 'random(--foo, 10, 20, by 5)', ['10', '15', '20']);
-test_computed_value(property, 'random(--foo per-element, 20, 30, by 5)', ['20', '25', '30']);
-test_computed_value(property, 'random(per-element --foo, 30, 40, by 5)', ['30', '35', '40']);
+test_random_computed_value(property, 'random(0, 10, 5)', ['0', '5', '10']);
+test_random_computed_value(property, 'random(--foo, 10, 20, 5)', ['10', '15', '20']);
+test_random_computed_value(property, 'random(--foo element-shared, 20, 30, 5)', ['20', '25', '30']);
+test_random_computed_value(property, 'random(element-shared --foo, 30, 40, 5)', ['30', '35', '40']);
 
 // Test out of order.
-test_computed_value(property, 'random(100, 10)', '100');
-test_computed_value(property, 'random(-10, -100)', '-10');
+test_random_computed_value(property, 'random(100, 10)', '100');
+test_random_computed_value(property, 'random(-10, -100)', '-10');
 
-// Test negative values
-test_computed_value_in_range(property, 'random(-100, -10)', '-100', '-10');
-test_computed_value(property, 'random(40, 50, by -5)', '40');
+// Test negative range values
+test_random_computed_value_in_range(property, 'random(-100, -10)', '-100', '-10');
+
+// Test negative step values (treated as if step is not there)
+test_random_computed_value_in_range(property, 'random(40, 50, -5)', '40', '50');
 
 // Test nested expressions
-test_computed_value_in_range(property, 'random(5 * 1, 30 / 2)', '5', '15');
+test_random_computed_value_in_range(property, 'random(5 * 1, 30 / 2)', '5', '15');
 
 // Test nested in expressions
-test_computed_value_in_range(property, 'calc(2 * random(6, 16))', '12', '32');
+test_random_computed_value_in_range(property, 'calc(2 * random(6, 16))', '12', '32');
 
 // Test NaN
-test_computed_value(property, 'random(NaN, 100)', '0');
-test_computed_value(property, 'random(10, NaN)', '0');
-test_computed_value(property, 'random(NaN, NaN)', '0');
-test_computed_value(property, 'random(NaN, 100, by 10)', '0');
-test_computed_value(property, 'random(10, NaN, by 10)', '0');
-test_computed_value(property, 'random(NaN, NaN, by 10)', '0');
-test_computed_value(property, 'random(NaN, 100, by NaN)', '0');
-test_computed_value(property, 'random(10, NaN, by NaN)', '0');
-test_computed_value(property, 'random(NaN, NaN, by NaN)', '0');
-test_computed_value(property, 'random(10, 100, by NaN)', '0');
-test_computed_value(property, 'calc(10 + random(NaN, 100))', '0');
-test_computed_value(property, 'calc(10 + random(10, NaN))', '0');
-test_computed_value(property, 'calc(10 + random(NaN, NaN))', '0');
-test_computed_value(property, 'calc(10 + random(NaN, 100, by 10))', '0');
-test_computed_value(property, 'calc(10 + random(10, NaN, by 10))', '0');
-test_computed_value(property, 'calc(10 + random(NaN, NaN, by 10))', '0');
-test_computed_value(property, 'calc(10 + random(NaN, 100, by NaN))', '0');
-test_computed_value(property, 'calc(10 + random(10, NaN, by NaN))', '0');
-test_computed_value(property, 'calc(10 + random(NaN, NaN, by NaN))', '0');
-test_computed_value(property, 'calc(10 + random(10, 100, by NaN))', '0');
+test_random_computed_value(property, 'random(NaN, 100)', '0');
+test_random_computed_value(property, 'random(10, NaN)', '0');
+test_random_computed_value(property, 'random(NaN, NaN)', '0');
+test_random_computed_value(property, 'random(NaN, 100, 10)', '0');
+test_random_computed_value(property, 'random(10, NaN, 10)', '0');
+test_random_computed_value(property, 'random(NaN, NaN, 10)', '0');
+test_random_computed_value(property, 'random(NaN, 100, NaN)', '0');
+test_random_computed_value(property, 'random(10, NaN, NaN)', '0');
+test_random_computed_value(property, 'random(NaN, NaN, NaN)', '0');
+test_random_computed_value(property, 'random(10, 100, NaN)', '0');
+test_random_computed_value(property, 'calc(10 + random(NaN, 100))', '0');
+test_random_computed_value(property, 'calc(10 + random(10, NaN))', '0');
+test_random_computed_value(property, 'calc(10 + random(NaN, NaN))', '0');
+test_random_computed_value(property, 'calc(10 + random(NaN, 100, 10))', '0');
+test_random_computed_value(property, 'calc(10 + random(10, NaN, 10))', '0');
+test_random_computed_value(property, 'calc(10 + random(NaN, NaN, 10))', '0');
+test_random_computed_value(property, 'calc(10 + random(NaN, 100, NaN))', '0');
+test_random_computed_value(property, 'calc(10 + random(10, NaN, NaN))', '0');
+test_random_computed_value(property, 'calc(10 + random(NaN, NaN, NaN))', '0');
+test_random_computed_value(property, 'calc(10 + random(10, 100, NaN))', '0');
 
 // Test infinity
-test_computed_value(property, 'random(infinity, 100)', '0');
-test_computed_value(property, 'random(10, infinity)', '0');
-test_computed_value(property, 'random(infinity, infinity)', '0');
-test_computed_value(property, 'random(infinity, 100, by 10)', '0');
-test_computed_value(property, 'random(10, infinity, by 10)', '0');
-test_computed_value(property, 'random(infinity, infinity, by 10)', '0');
-test_computed_value(property, 'random(infinity, 100, by infinity)', '0');
-test_computed_value(property, 'random(10, infinity, by infinity)', '0');
-test_computed_value(property, 'random(infinity, infinity, by infinity)', '0');
-test_computed_value(property, 'calc(10 + random(infinity, 100))', '0');
-test_computed_value(property, 'calc(10 + random(10, infinity))', '0');
-test_computed_value(property, 'calc(10 + random(infinity, infinity))', '0');
-test_computed_value(property, 'calc(10 + random(infinity, 100, by 10))', '0');
-test_computed_value(property, 'calc(10 + random(10, infinity, by 10))', '0');
-test_computed_value(property, 'calc(10 + random(infinity, infinity, by 10))', '0');
-test_computed_value(property, 'calc(10 + random(infinity, 100, by infinity))', '0');
-test_computed_value(property, 'calc(10 + random(10, infinity, by infinity))', '0');
-test_computed_value(property, 'calc(10 + random(infinity, infinity, by infinity))', '0');
-// If only step is infinite, min is used.
-test_computed_value(property, 'random(10, 100, by infinity)', '10');
-test_computed_value(property, 'random(10, 100, by -infinity)', '10');
-test_computed_value(property, 'calc(10 + random(10, 100, by infinity))', '20');
-test_computed_value(property, 'calc(10 + random(10, 100, by -infinity))', '20');
+
+const REALLY_LARGE = 1e6;
+const REALLY_LARGE_NEGATIVE = -REALLY_LARGE;
+
+test_random_computed_value_greater_or_lower_than(property, 'random(infinity, 100)', REALLY_LARGE);
+test_random_computed_value_greater_or_lower_than(property, 'random(infinity, infinity)', REALLY_LARGE);
+test_random_computed_value_greater_or_lower_than(property, 'random(infinity, 100, 10)', REALLY_LARGE);
+test_random_computed_value_greater_or_lower_than(property, 'random(infinity, infinity, 10)', REALLY_LARGE);
+test_random_computed_value_greater_or_lower_than(property, 'random(infinity, 100, infinity)', REALLY_LARGE);
+test_random_computed_value_greater_or_lower_than(property, 'random(infinity, infinity, infinity)', REALLY_LARGE);
+test_random_computed_value_greater_or_lower_than(property, 'calc(10 + random(infinity, 100))', REALLY_LARGE);
+test_random_computed_value_greater_or_lower_than(property, 'calc(10 + random(infinity, infinity))', REALLY_LARGE);
+test_random_computed_value_greater_or_lower_than(property, 'calc(10 + random(infinity, infinity, 10))', REALLY_LARGE);
+test_random_computed_value_greater_or_lower_than(property, 'calc(10 + random(infinity, 100, infinity))', REALLY_LARGE);
+test_random_computed_value_greater_or_lower_than(property, 'calc(10 + random(infinity, infinity, infinity))', REALLY_LARGE);
+test_random_computed_value_greater_or_lower_than(property, 'calc(10 + random(infinity, 100, 10))', REALLY_LARGE);
+test_random_computed_value(property, 'random(10, infinity)', '0');
+test_random_computed_value(property, 'random(10, infinity, 10)', '0');
+test_random_computed_value(property, 'random(10, infinity, infinity)', '0');
+test_random_computed_value(property, 'calc(10 + random(10, infinity))', '0');
+test_random_computed_value(property, 'calc(10 + random(10, infinity, 10))', '0');
+test_random_computed_value(property, 'calc(10 + random(10, infinity, infinity))', '0');
+test_random_computed_value(property, 'random(10, 100, infinity)', '0');
+test_random_computed_value(property, 'calc(10 + random(10, 100, infinity))', '0');
+// Negative steps, even infinitely negative steps, are ignored.
+test_random_computed_value_in_range(property, 'random(10, 100, -infinity)', '10', '100');
+test_random_computed_value_in_range(property, 'calc(10 + random(10, 100, -infinity))', '20', '110');
 
 // Test pseudo on psuedo elements
-test_pseudo_element_computed_value_in_range('scale', '::before', 'random(7, 17)', '7', '17');
-test_pseudo_element_computed_value_in_range('scale', '::before', 'random(--bar, 8, 18)', '8', '18');
-test_pseudo_element_computed_value_in_range('scale', '::before', 'random(per-element, 9, 19)', '9', '19');
-test_pseudo_element_computed_value_in_range('scale', '::before', 'random(per-element --foo, 10, 20)', '10', '20');
+test_pseudo_element_random_computed_value_in_range(property, '::before', 'random(7, 17)', '7', '17');
+test_pseudo_element_random_computed_value_in_range(property, '::before', 'random(--bar, 8, 18)', '8', '18');
+test_pseudo_element_random_computed_value_in_range(property, '::before', 'random(element-shared, 9, 19)', '9', '19');
+test_pseudo_element_random_computed_value_in_range(property, '::before', 'random(element-shared --foo, 10, 20)', '10', '20');
 
-// Test identifier caching
+// Test unresolvable percentage values
+test_random_computed_value_has_fixed('translate', 'random(10%, 100%)', '10%', '100%');
+
+// Test random value sharing
 test(() => {
-  const t1 = document.getElementById('noIdentifier1');
-  const t2 = document.getElementById('noIdentifier2');
+  const holder = document.createElement('div');
+  document.body.appendChild(holder);
 
-  let t1Computed = getComputedStyle(t1)['width'];
-  let t2Computed = getComputedStyle(t2)['width'];
+  try {
+    const el = document.createElement('div');
+    el.className = 'randomNoIdentifier';
+    holder.appendChild(el);
+    const elComputedLeft = getComputedStyle(el)['left'];
 
-  assert_equals(t1Computed, t2Computed);
-}, `Uses of a style rule on two elements with 'random(...)'`);
-
-test(() => {
-  const t1 = document.getElementById('identifier1');
-  const t2 = document.getElementById('identifier2');
-
-  let t1Computed = getComputedStyle(t1)['width'];
-  let t2Computed = getComputedStyle(t2)['width'];
-
-  assert_equals(t1Computed, t2Computed);
-}, `Uses of a style rule on two elements with 'random(--identifier, ...)'`);
-
-test(() => {
-  const t1 = document.getElementById('identicalArguments1');
-  const t2 = document.getElementById('identicalArguments2');
-
-  let t1Computed = getComputedStyle(t1)['width'];
-  let t2Computed = getComputedStyle(t2)['width'];
-
-  assert_equals(t1Computed, t2Computed);
-}, `Uses of two style rules on two elements with identical arguments`);
-
-test(() => {
-  const t1 = document.getElementById('identicalArgumentsAfterMath1');
-  const t2 = document.getElementById('identicalArgumentsAfterMath2');
-
-  let t1Computed = getComputedStyle(t1)['width'];
-  let t2Computed = getComputedStyle(t2)['width'];
-
-  assert_equals(t1Computed, t2Computed);
-}, `Uses of two style rules on two elements with identical arguments after math has been resolved`);
-
-test(() => {
-  const t1 = document.getElementById('identicalArgumentsAfterUnitResolution1');
-  const t2 = document.getElementById('identicalArgumentsAfterUnitResolution2');
-
-  let t1Computed = getComputedStyle(t1)['width'];
-  let t2Computed = getComputedStyle(t2)['width'];
-
-  assert_equals(t1Computed, t2Computed);
-}, `Uses of two style rules on two elements with identical arguments after unit resolution`);
-
-test(() => {
-  const style = 'width: calc(410px, 500px)';
-
-  const el1 = document.createElement('div');
-  el1.style = style;
-  document.body.appendChild(el1);
-  const el1Computed = getComputedStyle(el1)['width'];
-
-  const el2 = document.createElement('div');
-  el2.style = style;
-  document.body.appendChild(el2);
-  const el2Computed = getComputedStyle(el2)['width'];
-
-  assert_equals(el1Computed, el2Computed);
-}, `Uses of two style rules on two elements with identical arguments accross two different style resolutions`);
-
-test(() => {
-  const el = document.getElementById('identicalTwoProperties');
-
-  let widthComputed = getComputedStyle(el)['width'];
-  let heightComputed = getComputedStyle(el)['height'];
-
-  assert_equals(widthComputed, heightComputed);
-}, `Uses of a style rule for two properies on an element with identical uses of random(...).`);
-
-test(() => {
-  const el = document.getElementById('identicalTwoPropertiesWithIdentifier');
-
-  let widthComputed = getComputedStyle(el)['width'];
-  let heightComputed = getComputedStyle(el)['height'];
-
-  assert_equals(widthComputed, heightComputed);
-}, `Uses of a style rule for two properies on an element with identical uses of random(--identifier, ...).`);
-
-test(() => {
-  const el = document.getElementById('identicalTwoPropertiesWithPerElement');
-
-  let widthComputed = getComputedStyle(el)['width'];
-  let heightComputed = getComputedStyle(el)['height'];
-
-  assert_equals(widthComputed, heightComputed);
-}, `Uses of a style rule for two properies on an element with identical uses of random(per-elemnent, ...).`);
-
-test(() => {
-  const el = document.getElementById('identicalTwoPropertiesWithPerElementAndIdentifier');
-
-  let widthComputed = getComputedStyle(el)['width'];
-  let heightComputed = getComputedStyle(el)['height'];
-
-  assert_equals(widthComputed, heightComputed);
-}, `Uses of a style rule for two properies on an element with identical uses of random(per-elemnent --identifier, ...).`);
-
-test(() => {
-  const el = document.createElement('div');
-  el.className = 'randomPerElement';
-  document.body.appendChild(el);
-  const elComputed = getComputedStyle(el)['width'];
-
-  // It is statistically improbable that all 100 elements will have
-  // the same width when picked as a random number between 0 and 100000.
-  var allSame = true;
-  for (i = 0; i < 100; ++i) {
-    const other = document.createElement('div');
-    other.className = 'randomPerElement';
-    document.body.appendChild(other);
-    const otherComputed = getComputedStyle(other)['width'];
-    if (elComputed != otherComputed) {
-      allSame = false;
+    var allSame = true;
+    var allHaveSameLeftAndRight = true;
+    for (i = 0; i < iterations; ++i) {
+      const other = document.createElement('div');
+      other.className = 'randomNoIdentifier';
+      holder.appendChild(other);
+      const otherComputedLeft = getComputedStyle(other)['left'];
+      if (elComputedLeft != otherComputedLeft) {
+        allSame = false;
+      }
+      const otherComputedRight = getComputedStyle(other)['right'];
+      if (elComputedLeft != otherComputedRight) {
+        allHaveSameLeftAndRight = false;
+      }
     }
-  }
 
-  assert_false(allSame);
-}, `Uses of a style rule on multiple elements with 'random(per-element, ...)'`);
+    assert_false(allSame);
+    assert_false(allHaveSameLeftAndRight);
+  } finally {
+    document.body.removeChild(holder);
+  }
+}, `Maximum random: 'random(a, b)'`);
+
+test(() => {
+  const holder = document.createElement('div');
+  document.body.appendChild(holder);
+
+  try {
+    var allHaveSameMarginTopAndMarginLeft = true;
+    for (i = 0; i < iterations; ++i) {
+      const other = document.createElement('div');
+      other.className = 'randomNoIdentifier';
+      holder.appendChild(other);
+      const otherComputedMarginLeft = getComputedStyle(other)['margin-left'];
+      const otherComputedMarginTop = getComputedStyle(other)['margin-top'];
+      if (otherComputedMarginLeft != otherComputedMarginTop) {
+        allHaveSameMarginTopAndMarginLeft = false;
+      }
+    }
+
+    assert_false(allHaveSameMarginTopAndMarginLeft);
+  } finally {
+    document.body.removeChild(holder);
+  }
+}, `Maximum random - shorthand: random(a, b))`);
+
+test(() => {
+  const holder = document.createElement('div');
+  document.body.appendChild(holder);
+
+  try {
+    for (i = 0; i < iterations; ++i) {
+      const el = document.createElement('div');
+      el.className = 'randomIdentifier';
+      holder.appendChild(el);
+
+      let elComputedWidth = getComputedStyle(el)['width'];
+      let elComputedHeight = getComputedStyle(el)['height'];
+
+      assert_equals(elComputedWidth, elComputedHeight);
+    }
+  } finally {
+    document.body.removeChild(holder);
+  }
+}, `Shared by name within an element: 'random(--identifier, a, b)'`);
+
+test(() => {
+  const holder = document.createElement('div');
+  document.body.appendChild(holder);
+
+  try {
+    var allHaveSameMarginTopAndMarginLeft = true;
+    for (i = 0; i < iterations; ++i) {
+      const other = document.createElement('div');
+      other.className = 'randomIdentifier';
+      holder.appendChild(other);
+      const otherComputedMarginLeft = getComputedStyle(other)['margin-left'];
+      const otherComputedMarginTop = getComputedStyle(other)['margin-top'];
+      if (otherComputedMarginLeft != otherComputedMarginTop) {
+        allHaveSameMarginTopAndMarginLeft = false;
+      }
+    }
+
+    assert_true(allHaveSameMarginTopAndMarginLeft);
+  } finally {
+    document.body.removeChild(holder);
+  }
+}, `Shared by name within an element - shorthand: random(--identifier, a, b))`);
+
+test(() => {
+  const holder = document.createElement('div');
+  document.body.appendChild(holder);
+
+  try {
+    for (i = 0; i < iterations; ++i) {
+      const t1 = document.createElement('div');
+      t1.className = 'randomMatchElement';
+      holder.appendChild(t1);
+      const t2 = document.createElement('div');
+      t2.className = 'randomMatchElement';
+      holder.appendChild(t2);
+
+      let t1ComputedWidth = getComputedStyle(t1)['width'];
+      let t2ComputedWidth = getComputedStyle(t2)['width'];
+
+      assert_equals(t1ComputedWidth, t2ComputedWidth);
+    }
+  } finally {
+    document.body.removeChild(holder);
+  }
+}, `Shared between elements within a property: random(element-shared, a, b)`);
+
+test(() => {
+  const holder = document.createElement('div');
+  document.body.appendChild(holder);
+
+  try {
+    var allHaveSameMarginTopAndMarginLeft = true;
+    for (i = 0; i < iterations; ++i) {
+      const other = document.createElement('div');
+      other.className = 'randomMatchElement';
+      holder.appendChild(other);
+      const otherComputedMarginLeft = getComputedStyle(other)['margin-left'];
+      const otherComputedMarginTop = getComputedStyle(other)['margin-top'];
+      if (otherComputedMarginLeft != otherComputedMarginTop) {
+        allHaveSameMarginTopAndMarginLeft = false;
+      }
+    }
+
+    assert_true(allHaveSameMarginTopAndMarginLeft);
+  } finally {
+    document.body.removeChild(holder);
+  }
+}, `Shared between elements within a property - shorthand: random(element-shared, a, b))`);
+
+test(() => {
+  const holder = document.createElement('div');
+  document.body.appendChild(holder);
+
+  try {
+    for (i = 0; i < iterations; ++i) {
+      const t1 = document.createElement('div');
+      t1.className = 'randomMatchElementAndIdentifier';
+      holder.appendChild(t1);
+      const t2 = document.createElement('div');
+      t2.className = 'randomMatchElementAndIdentifier';
+      holder.appendChild(t2);
+
+      let t1ComputedWidth = getComputedStyle(t1)['width'];
+      let t2ComputedHeight = getComputedStyle(t2)['height'];
+
+      assert_equals(t1ComputedWidth, t2ComputedHeight);
+    }
+  } finally {
+    document.body.removeChild(holder);
+  }
+}, `Shared globally: random(--identifier element-shared, a, b)`);
+
+test(() => {
+  const holder = document.createElement('div');
+  document.body.appendChild(holder);
+
+  try {
+    var allHaveSameMarginTopAndMarginLeft = true;
+    for (i = 0; i < iterations; ++i) {
+      const other = document.createElement('div');
+      other.className = 'randomMatchElementAndIdentifier';
+      holder.appendChild(other);
+      const otherComputedMarginLeft = getComputedStyle(other)['margin-left'];
+      const otherComputedMarginTop = getComputedStyle(other)['margin-top'];
+      if (otherComputedMarginLeft != otherComputedMarginTop) {
+        allHaveSameMarginTopAndMarginLeft = false;
+      }
+    }
+
+    assert_true(allHaveSameMarginTopAndMarginLeft);
+  } finally {
+    document.body.removeChild(holder);
+  }
+}, `Shared globally - shorthand: random(element-shared, a, b))`);
+
+test(() => {
+  const holder = document.createElement('div');
+  document.body.appendChild(holder);
+
+  try {
+    for (i = 0; i < iterations; ++i) {
+      const t1 = document.createElement('div');
+      t1.className = 'randomFixed';
+      holder.appendChild(t1);
+
+      let t1ComputedWidth = getComputedStyle(t1)['width'];
+
+      assert_equals(t1ComputedWidth, "55px");
+    }
+  } finally {
+    document.body.removeChild(holder);
+  }
+}, `Fixed: random(fixed <number>, a, b)`);
 
 </script>
diff --git a/tests/wpt/tests/css/css-values/random-invalid.tentative.html b/tests/wpt/tests/css/css-values/random-invalid.tentative.html
index f21d36077dc..dd428868a2d 100644
--- a/tests/wpt/tests/css/css-values/random-invalid.tentative.html
+++ b/tests/wpt/tests/css/css-values/random-invalid.tentative.html
@@ -13,16 +13,22 @@ test_invalid_value('width', 'random(1px, )');
 test_invalid_value('width', 'random(,1px)');
 test_invalid_value('width', 'random(1px)');
 test_invalid_value('width', 'random(1px,2px,)');
-test_invalid_value('width', 'random(1px,2px,by 1px,)');
-test_invalid_value('width', 'random(1px,2px,by 1px foo)');
+test_invalid_value('width', 'random(1px,2px,1px,)');
+test_invalid_value('width', 'random(1px,2px,1px foo)');
 test_invalid_value('width', 'random(foo, 1px, 2px)');
 test_invalid_value('width', 'random("foo", 1px, 2px)');
 test_invalid_value('width', 'random("--foo", 1px, 2px)');
-test_invalid_value('width', 'random(per-element foo, 1px, 2px)');
-test_invalid_value('width', 'random(per-element 1px, 2px)');
-test_invalid_value('width', 'random(1px, 2px, by 1px, per-element)');
+test_invalid_value('width', 'random(element-shared foo, 1px, 2px)');
+test_invalid_value('width', 'random(element-shared 1px, 2px)');
+test_invalid_value('width', 'random(1px, 2px, 1px, element-shared)');
 test_invalid_value('width', 'random(--foo --bar, 1px, 2px)');
-
+test_invalid_value('width', 'random(fixed random(1, 2), 1px, 2px)');
+test_invalid_value('width', 'random(fixed 0.5 element-shared, 1px, 2px)');
+test_invalid_value('width', 'random(fixed 0.5 auto, 1px, 2px)');
+test_invalid_value('width', 'random(fixed 0.5 --foo, 1px, 2px)');
+test_invalid_value('width', 'random(fixed 0.5px, 1px, 2px)');
+test_invalid_value('width', 'random(fixed 0.5%, 1px, 2px)');
+test_invalid_value('width', 'random(fixed -1, 1px, 2px)');
 test_invalid_value('width', 'random(10deg, 20deg)');
 test_invalid_value('width', 'random(10px, 20%)');
 
diff --git a/tests/wpt/tests/css/css-values/random-serialize.tentative.html b/tests/wpt/tests/css/css-values/random-serialize.tentative.html
index 43dc3a3f677..5c0b9601da0 100644
--- a/tests/wpt/tests/css/css-values/random-serialize.tentative.html
+++ b/tests/wpt/tests/css/css-values/random-serialize.tentative.html
@@ -8,37 +8,47 @@
 <script>
 
 test_valid_value('width', 'random(0px, 100px)');
-test_valid_value('width', 'random(0px, 100px, by 50px)');
+test_valid_value('width', 'random(0px, 100px, 50px)');
 test_valid_value('width', 'random(--foo, 0px, 100px)');
-test_valid_value('width', 'random(--foo per-element, 0px, 100px)');
-test_valid_value('width', 'random(per-element --foo, 0px, 100px)', 'random(--foo per-element, 0px, 100px)');
-test_valid_value('width', 'random(--foo, 0px, 100px, by 50px)');
-test_valid_value('width', 'random(--foo per-element, 0px, 100px, by 50px)');
-test_valid_value('width', 'random(per-element --foo, 0px, 100px, by 50px)', 'random(--foo per-element, 0px, 100px, by 50px)');
+test_valid_value('width', 'random(auto, 0px, 100px)', 'random(0px, 100px)');
+test_valid_value('width', 'random(--foo element-shared, 0px, 100px)');
+test_valid_value('width', 'random(auto element-shared, 0px, 100px)', 'random(element-shared, 0px, 100px)');
+test_valid_value('width', 'random(element-shared --foo, 0px, 100px)', 'random(--foo element-shared, 0px, 100px)');
+test_valid_value('width', 'random(element-shared auto, 0px, 100px)', 'random(element-shared, 0px, 100px)');
+test_valid_value('width', 'random(fixed 0.5, 0px, 100px)');
+test_valid_value('width', 'random(--foo, 0px, 100px, 50px)');
+test_valid_value('width', 'random(auto, 0px, 100px, 50px)', 'random(0px, 100px, 50px)');
+test_valid_value('width', 'random(--foo element-shared, 0px, 100px, 50px)');
+test_valid_value('width', 'random(auto element-shared, 0px, 100px, 50px)', 'random(element-shared, 0px, 100px, 50px)');
+test_valid_value('width', 'random(element-shared --foo, 0px, 100px, 50px)', 'random(--foo element-shared, 0px, 100px, 50px)');
+test_valid_value('width', 'random(element-shared auto, 0px, 100px, 50px)', 'random(element-shared, 0px, 100px, 50px)');
+test_valid_value('width', 'random(fixed 0.5, 0px, 100px, 50px)');
 
 // Test out of order.
 test_valid_value('width', 'random(100px, 0px)');
 
 // Test negative values
 test_valid_value('width', 'random(-100px, -10px)');
+test_valid_value('width', 'random(-100px, -10px, -5px)');
 
 // Test mixed units.
 test_valid_value('width', 'random(1em, 200rem)');
 
 // Test nested expressions
 test_valid_value('width', 'random(10 * 100px, 200em / 2)', 'random(1000px, 100em)');
+test_valid_value('width', 'random(fixed calc(2 / 4), 0px, 100px)', 'random(fixed calc(0.5), 0px, 100px)');
 
 // Test nested in expressions
 test_valid_value('width', 'calc(2 * random(0px, 100px))');
 
 // Test other types
 test_valid_value('max-lines', 'random(25, 50)');
-test_valid_value('max-lines', 'random(25, 50, by 5)');
+test_valid_value('max-lines', 'random(25, 50, 5)');
 test_valid_value('scale', 'random(0.5, 2.5)');
-test_valid_value('scale', 'random(0.5, 2.5, by 0.1)');
+test_valid_value('scale', 'random(0.5, 2.5, 0.1)');
 test_valid_value('rotate', 'random(25deg, 1turn)', 'random(25deg, 360deg)');
-test_valid_value('rotate', 'random(25deg, 1turn, by 5deg)', 'random(25deg, 360deg, by 5deg)');
+test_valid_value('rotate', 'random(25deg, 1turn, 5deg)', 'random(25deg, 360deg, 5deg)');
 test_valid_value('transition-delay', 'random(25ms, 50s)', 'random(0.025s, 50s)');
-test_valid_value('transition-delay', 'random(25ms, 50s, by 5s)', 'random(0.025s, 50s, by 5s)');
+test_valid_value('transition-delay', 'random(25ms, 50s, 5s)', 'random(0.025s, 50s, 5s)');
 
 </script>
diff --git a/tests/wpt/tests/css/css-values/sin-cos-tan-computed.html b/tests/wpt/tests/css/css-values/sin-cos-tan-computed.html
index a19b118f754..80b4d1972f6 100644
--- a/tests/wpt/tests/css/css-values/sin-cos-tan-computed.html
+++ b/tests/wpt/tests/css/css-values/sin-cos-tan-computed.html
@@ -38,4 +38,12 @@ test_math_used('calc(sin(0.25turn) )', '1', {type:'number', approx:0.1});
 //Test nesting
 test_math_used('calc(cos(sin(cos(pi) + 1)))', '1', {type:'number', approx:0.1});
 test_math_used('calc(sin(tan(pi/4)*pi/2) )', '1', {type:'number', approx:0.1});
+
+//Test unresolved at parse time
+test_math_used('calc(sin(pi * sibling-index())', '0', {type:'number', approx:0.1});
+test_math_used('calc(cos(pi * sibling-index())', '-1', {type:'number', approx:0.1});
+test_math_used('calc(tan(pi * sibling-index())', '0', {type:'number', approx:0.1});
+test_math_used('calc(sin(180deg * sibling-index())', '0', {type:'number', approx:0.1});
+test_math_used('calc(cos(180deg * sibling-index())', '-1', {type:'number', approx:0.1});
+test_math_used('calc(tan(180deg * sibling-index())', '0', {type:'number', approx:0.1});
 </script>
diff --git a/tests/wpt/tests/css/css-values/tree-counting/calc-sibling-function-in-shadow-dom.html b/tests/wpt/tests/css/css-values/tree-counting/calc-sibling-function-in-shadow-dom.html
index 92fb6ce3351..ca8eb560ba1 100644
--- a/tests/wpt/tests/css/css-values/tree-counting/calc-sibling-function-in-shadow-dom.html
+++ b/tests/wpt/tests/css/css-values/tree-counting/calc-sibling-function-in-shadow-dom.html
@@ -33,9 +33,9 @@
          <slot></slot>
        </div>
       `;
-      assert_equals(getComputedStyle(target).zIndex, '3');
-      assert_equals(getComputedStyle(target).order, '3');
-      assert_equals(getComputedStyle(target).orphans, '3');
-      assert_equals(getComputedStyle(target).widows, '3');
-    }, 'Host children have sibling-index() and sibling-count() based on assignedNodes order');
+      assert_equals(getComputedStyle(target).zIndex, '4');
+      assert_equals(getComputedStyle(target).order, '4');
+      assert_equals(getComputedStyle(target).orphans, '4');
+      assert_equals(getComputedStyle(target).widows, '4');
+    }, 'Host children have sibling-index() and sibling-count() based on the DOM tree order');
 </script>
diff --git a/tests/wpt/tests/css/css-values/tree-counting/sibling-function-descriptors.tentative.html b/tests/wpt/tests/css/css-values/tree-counting/sibling-function-descriptors.tentative.html
index d31d4acf499..76d2ff8ee4d 100644
--- a/tests/wpt/tests/css/css-values/tree-counting/sibling-function-descriptors.tentative.html
+++ b/tests/wpt/tests/css/css-values/tree-counting/sibling-function-descriptors.tentative.html
@@ -4,7 +4,7 @@
 <link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10982">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<style id="test_sheet">
+<style id="page_sheet">
   @page {
     margin: 100px;
     margin: calc(0px * sibling-index());
@@ -13,33 +13,131 @@
     margin: 100px;
     margin: calc(0px * sibling-count());
   }
+</style>
+<style id="font_face_sheet">
   @font-face {
     font-family: my-font;
     font-weight: 300;
     font-weight: calc(max(0 * sibling-index(), 400));
+    font-feature-settings: "vert" 2;
+    font-feature-settings: "vert" calc(max(sibling-index(), 1));
   }
   @font-face {
     font-family: my-font;
     font-weight: 300;
     font-weight: calc(max(0 * sibling-count(), 400));
+    font-feature-settings: "vert" 2;
+    font-feature-settings: "vert" calc(max(sibling-count(), 1));
+  }
+</style>
+<style id="font_palette_sheet">
+  @font-palette-values --foo {
+    font-family: my-font;
+    base-palette: 1;
+    base-palette: calc(max(sibling-index(), 2));
+    override-colors: 1 green;
+    override-colors: sibling-index() red;
+  }
+  @font-palette-values --foo {
+    font-family: my-font;
+    base-palette: 1;
+    base-palette: calc(max(sibling-count(), 2));
+    override-colors: 1 green;
+    override-colors: sibling-count() red;
+  }
+</style>
+<style id="counter_style_sheet">
+  @counter-style --foo {
+    system: fixed 1;
+    system: fixed calc(max(sibling-index(), 2));
+    negative: --pass;
+    negative: linear-gradient(red calc(20px * sibling-index()), pink);
+    prefix: --pass;
+    prefix: linear-gradient(red calc(20px * sibling-index()), pink);
+    suffix: --pass;
+    suffix: linear-gradient(red calc(20px * sibling-index()), pink);
+    range: 1 infinite;
+    range: calc(max(sibling-index(), 2)) infinite;
+    pad: 1 --pass;
+    pad: 1 linear-gradient(red calc(20px * sibling-index()), pink);
+    pad: calc(max(sibling-index(), 2)) --fail;
+    symbols: --pass;
+    symbols: linear-gradient(red calc(20px * sibling-index()), pink);
+  }
+  @counter-style --foo {
+    system: fixed 1;
+    system: fixed calc(max(sibling-count(), 2));
+    negative: --pass;
+    negative: linear-gradient(green, green);
+    negative: linear-gradient(red calc(20px * sibling-count()), pink);
+    prefix: --pass;
+    prefix: linear-gradient(red calc(20px * sibling-count()), pink);
+    suffix: --pass;
+    suffix: linear-gradient(red calc(20px * sibling-count()), pink);
+    range: 1 infinite;
+    range: calc(max(sibling-count(), 2)) infinite;
+    pad: 1 --pass;
+    pad: 1 linear-gradient(red calc(20px * sibling-count()), pink);
+    pad: calc(max(sibling-count(), 2)) --fail;
+    symbols: --pass;
+    symbols: linear-gradient(red calc(20px * sibling-count()), pink);
   }
 </style>
 <script>
-  const rules = test_sheet.sheet.cssRules;
+  const page_rules = page_sheet.sheet.cssRules;
 
   test(() => {
-    assert_equals(rules[0].style.margin, "100px");
+    assert_equals(page_rules[0].style.margin, "100px");
   }, "sibling-index() should not be allowed in @page properties");
 
   test(() => {
-    assert_equals(rules[1].style.margin, "100px");
+    assert_equals(page_rules[1].style.margin, "100px");
   }, "sibling-count() should not be allowed in @page properties");
 
+  const font_face_rules = font_face_sheet.sheet.cssRules;
+
   test(() => {
-    assert_equals(rules[2].style.fontWeight, "300");
+    assert_equals(font_face_rules[0].style.fontWeight, "300");
+    assert_equals(font_face_rules[0].style.fontFeatureSettings, "\"vert\" 2");
   }, "sibling-index() should not be allowed in @font-face descriptors");
 
   test(() => {
-    assert_equals(rules[3].style.fontWeight, "300");
+    assert_equals(font_face_rules[1].style.fontWeight, "300");
+    assert_equals(font_face_rules[1].style.fontFeatureSettings, "\"vert\" 2");
   }, "sibling-count() should not be allowed in @font-face descriptors");
+
+  const font_palette_rules = font_palette_sheet.sheet.cssRules;
+
+  test(() => {
+    assert_equals(font_palette_rules[0].basePalette, "1");
+    assert_equals(font_palette_rules[0].overrideColors, "1 green");
+  }, "sibling-index() should not be allowed in @font-palette-values descriptors");
+
+  test(() => {
+    assert_equals(font_palette_rules[1].basePalette, "1");
+    assert_equals(font_palette_rules[1].overrideColors, "1 green");
+  }, "sibling-count() should not be allowed in @font-palette-values descriptors");
+
+  const counter_style_rules = counter_style_sheet.sheet.cssRules;
+
+  test(() => {
+    assert_equals(counter_style_rules[0].system, "fixed 1");
+    assert_equals(counter_style_rules[0].negative, "--pass");
+    assert_equals(counter_style_rules[0].prefix, "--pass");
+    assert_equals(counter_style_rules[0].suffix, "--pass");
+    assert_equals(counter_style_rules[0].range, "1 infinite");
+    assert_equals(counter_style_rules[0].pad, "1 --pass");
+    assert_equals(counter_style_rules[0].symbols, "--pass");
+  }, "sibling-index() should not be allowed in @counter-style descriptors");
+
+  test(() => {
+    assert_equals(counter_style_rules[1].system, "fixed 1");
+    assert_equals(counter_style_rules[1].negative, "--pass");
+    assert_equals(counter_style_rules[1].prefix, "--pass");
+    assert_equals(counter_style_rules[1].suffix, "--pass");
+    assert_equals(counter_style_rules[1].range, "1 infinite");
+    assert_equals(counter_style_rules[1].pad, "1 --pass");
+    assert_equals(counter_style_rules[1].symbols, "--pass");
+  }, "sibling-count() should not be allowed in @counter-style descriptors");
+
 </script>
diff --git a/tests/wpt/tests/css/css-values/tree-counting/sibling-function-invalidation.html b/tests/wpt/tests/css/css-values/tree-counting/sibling-function-invalidation.html
index 3c75c78530d..74f4995f5f7 100644
--- a/tests/wpt/tests/css/css-values/tree-counting/sibling-function-invalidation.html
+++ b/tests/wpt/tests/css/css-values/tree-counting/sibling-function-invalidation.html
@@ -48,55 +48,3 @@
     assert_equals(t2.offsetHeight, 50);
   }, "5 siblings after removal");
 </script>
-
-<style>
-  #t3 {
-    width: calc(10px * sibling-index());
-    height: 50px;
-    background: teal;
-  }
-</style>
-<div>
-  <template shadowrootmode="open">
-    <slot></slot>
-  </template>
-  <div id="rm3"></div>
-  <div></div>
-  <div></div>
-  <div></div>
-  <div></div>
-  <div id="t3"></div>
-</div>
-<script>
-  test(() => assert_equals(t3.offsetWidth, 60), "Initially 6th slotted sibling");
-  test(() => {
-    rm3.slot = "null";
-    assert_equals(t3.offsetWidth, 50);
-  }, "5th sibling after slot change");
-</script>
-
-<style>
-  #t4 {
-    width: 50px;
-    height: calc(10px * sibling-count());
-    background: teal;
-  }
-</style>
-<div>
-  <template shadowrootmode="open">
-    <slot></slot>
-  </template>
-  <div id="t4"></div>
-  <div></div>
-  <div></div>
-  <div></div>
-  <div></div>
-  <div id="rm4"></div>
-</div>
-<script>
-  test(() => assert_equals(t4.offsetHeight, 60), "Initially 6 slotted siblings");
-  test(() => {
-    rm4.slot = "null";
-    assert_equals(t4.offsetHeight, 50);
-  }, "5 siblings after slot change");
-</script>
diff --git a/tests/wpt/tests/css/css-values/tree-counting/sibling-index-keyframe-length-value-dynamic.html b/tests/wpt/tests/css/css-values/tree-counting/sibling-index-keyframe-length-value-dynamic.html
new file mode 100644
index 00000000000..cbd34602fb3
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/tree-counting/sibling-index-keyframe-length-value-dynamic.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>CSS Values and Units Test: sibling-index() changing length value during @keyframes animation</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#tree-counting">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  @keyframes --anim {
+    from {
+      top: calc(100px * sibling-index());
+    }
+    to {
+      top: 0px;
+    }
+  }
+  #target {
+    animation: --anim 1000s step-end;
+    position: absolute;
+    top: 13px;
+    width: 100px;
+    height: 100px;
+  }
+</style>
+<div>
+  <div id="rm"></div>
+  <div id="target"></div>
+</div>
+<script>
+  test(() => {
+    assert_equals(getComputedStyle(target).top, "200px");
+  }, "Initially, the sibling-index() is 2 for #target");
+
+  test(() => {
+    rm.remove();
+    assert_equals(getComputedStyle(target).top, "100px");
+  }, "Removing a preceding sibling of #target reduces the sibling-index()");
+
+</script>
diff --git a/tests/wpt/tests/css/css-values/tree-counting/sibling-index-keyframe-value-dynamic.html b/tests/wpt/tests/css/css-values/tree-counting/sibling-index-keyframe-value-dynamic.html
new file mode 100644
index 00000000000..286e0d3d3e2
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/tree-counting/sibling-index-keyframe-value-dynamic.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<title>CSS Values and Units Test: sibling-index() changing value during @keyframes animation</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#tree-counting">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  @keyframes --anim {
+    from {
+      z-index: sibling-index();
+    }
+    to {
+      z-index: 1;
+    }
+  }
+  #target {
+    animation: --anim 1000s step-end;
+    position: relative;
+    width: 100px;
+    height: 100px;
+    background: red;
+  }
+  #abs {
+    position: absolute;
+    width: 100px;
+    height: 100px;
+    z-index: 3;
+    background: green;
+  }
+</style>
+<p>You should see a green square below.</p>
+<div>
+  <div id="rm"></div>
+  <div id="abs"></div>
+  <div id="target"></div>
+</div>
+<script>
+  test(() => {
+    assert_equals(getComputedStyle(target).zIndex, "3");
+  }, "Initially, the sibling-index() is 3 for #target");
+
+  test(() => {
+    rm.remove();
+    assert_equals(getComputedStyle(target).zIndex, "2");
+  }, "Removing a preceding sibling of #target reduces the sibling-index()");
+
+</script>
diff --git a/tests/wpt/tests/css/css-values/urls/cross-origin/url-image-crossorigin-anonymous-negative.sub.html b/tests/wpt/tests/css/css-values/urls/cross-origin/url-image-crossorigin-anonymous-negative.sub.html
new file mode 100644
index 00000000000..f5066a55d2b
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/cross-origin/url-image-crossorigin-anonymous-negative.sub.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: crossorigin(anonymous)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-crossorigin-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../url-image-ref.html">
+<meta name="assert" content="A url with the request URL modifier crossorigin(anonymous) requires a response with the appropriate headers.">
+<style>
+  .test {
+    width: 200px;
+    height: 200px;
+    background-color: green;
+    background-image: url("http://{{hosts[][]}}:{{ports[http][1]}}/css/support/1x1-red.png" crossorigin(anonymous));
+  }
+</style>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/cross-origin/url-image-crossorigin-anonymous.sub.html b/tests/wpt/tests/css/css-values/urls/cross-origin/url-image-crossorigin-anonymous.sub.html
new file mode 100644
index 00000000000..0a45eda33d7
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/cross-origin/url-image-crossorigin-anonymous.sub.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: crossorigin(anonymous)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-crossorigin-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../url-image-ref.html">
+<meta name="assert" content="A url with the request URL modifier crossorigin(anonymous) requires a response with the appropriate headers.">
+<style>
+  .test {
+    width: 200px;
+    height: 200px;
+    background-color: red;
+    background-image: url("http://{{hosts[][]}}:{{ports[http][1]}}/css/support/1x1-green.png?pipe=header(Access-Control-Allow-Origin,*)" crossorigin(anonymous));
+  }
+</style>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/cross-origin/url-image-crossorigin-use-credentials-negative.sub.html b/tests/wpt/tests/css/css-values/urls/cross-origin/url-image-crossorigin-use-credentials-negative.sub.html
new file mode 100644
index 00000000000..952f953d844
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/cross-origin/url-image-crossorigin-use-credentials-negative.sub.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: crossorigin(use-credentials)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-crossorigin-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../url-image-ref.html">
+<meta name="assert" content="A url with the request URL modifier crossorigin(use-credentials) requires a response with the appropriate headers.">
+<style>
+  .test {
+    width: 200px;
+    height: 200px;
+    background-color: green;
+    background-image: url("http://{{hosts[][]}}:{{ports[http][1]}}/css/support/1x1-green.png" crossorigin(use-credentials));
+  }
+</style>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/cross-origin/url-image-crossorigin-use-credentials.sub.html b/tests/wpt/tests/css/css-values/urls/cross-origin/url-image-crossorigin-use-credentials.sub.html
new file mode 100644
index 00000000000..f592a02c486
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/cross-origin/url-image-crossorigin-use-credentials.sub.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: crossorigin(use-credentials)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-crossorigin-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../url-image-ref.html">
+<meta name="assert" content="A url with the request URL modifier crossorigin(use-credentials) requires a response with the appropriate headers.">
+<style>
+  .test {
+    width: 200px;
+    height: 200px;
+    background-color: red;
+    background-image: url("http://{{hosts[][]}}:{{ports[http][1]}}/css/support/1x1-green.png?pipe=header(Access-Control-Allow-Origin,http://{{hosts[][]}}:{{ports[http][0]}})|header(Access-Control-Allow-Credentials,true)" crossorigin(use-credentials));
+  }
+</style>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/no-referrer-when-downgrade/url-image-referrerpolicy-cross-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/no-referrer-when-downgrade/url-image-referrerpolicy-cross-origin.sub.html
new file mode 100644
index 00000000000..ce51df67c02
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/no-referrer-when-downgrade/url-image-referrerpolicy-cross-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(no-referrer-when-downgrade)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A cross origin url with the request URL modifier referrerpolicy(no-referrer-when-downgrade) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`cross-origin`, referrer_policy:`no-referrer-when-downgrade`, expected_referrer:`url`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/no-referrer-when-downgrade/url-image-referrerpolicy-same-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/no-referrer-when-downgrade/url-image-referrerpolicy-same-origin.sub.html
new file mode 100644
index 00000000000..6860e7386bf
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/no-referrer-when-downgrade/url-image-referrerpolicy-same-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(no-referrer-when-downgrade)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A same origin url with the request URL modifier referrerpolicy(no-referrer-when-downgrade) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`same-origin`, referrer_policy:`no-referrer-when-downgrade`, expected_referrer:`url`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/no-referrer/url-image-referrerpolicy-cross-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/no-referrer/url-image-referrerpolicy-cross-origin.sub.html
new file mode 100644
index 00000000000..30a52a848a4
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/no-referrer/url-image-referrerpolicy-cross-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(no-referrer)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A cross origin url with the request URL modifier referrerpolicy(no-referrer) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`cross-origin`, referrer_policy:`no-referrer`, expected_referrer:`none`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/no-referrer/url-image-referrerpolicy-same-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/no-referrer/url-image-referrerpolicy-same-origin.sub.html
new file mode 100644
index 00000000000..ebbff834b92
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/no-referrer/url-image-referrerpolicy-same-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(no-referrer)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A same origin url with the request URL modifier referrerpolicy(no-referrer) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`same-origin`, referrer_policy:`no-referrer`, expected_referrer:`none`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/origin-when-cross-origin/url-image-referrerpolicy-cross-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/origin-when-cross-origin/url-image-referrerpolicy-cross-origin.sub.html
new file mode 100644
index 00000000000..6285f2f0e5d
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/origin-when-cross-origin/url-image-referrerpolicy-cross-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(origin-when-cross-origin)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A cross origin url with the request URL modifier referrerpolicy(origin-when-cross-origin) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`cross-origin`, referrer_policy:`origin-when-cross-origin`, expected_referrer:`origin`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/origin-when-cross-origin/url-image-referrerpolicy-same-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/origin-when-cross-origin/url-image-referrerpolicy-same-origin.sub.html
new file mode 100644
index 00000000000..eb4e081e940
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/origin-when-cross-origin/url-image-referrerpolicy-same-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(origin-when-cross-origin)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A same origin url with the request URL modifier referrerpolicy(origin-when-cross-origin) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`same-origin`, referrer_policy:`origin-when-cross-origin`, expected_referrer:`url`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/origin/url-image-referrerpolicy-cross-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/origin/url-image-referrerpolicy-cross-origin.sub.html
new file mode 100644
index 00000000000..14a8172d6e3
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/origin/url-image-referrerpolicy-cross-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(origin)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A cross origin url with the request URL modifier referrerpolicy(origin) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`cross-origin`, referrer_policy:`origin`, expected_referrer:`origin`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/origin/url-image-referrerpolicy-same-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/origin/url-image-referrerpolicy-same-origin.sub.html
new file mode 100644
index 00000000000..1cc6f011c12
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/origin/url-image-referrerpolicy-same-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(origin)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A same origin url with the request URL modifier referrerpolicy(origin) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`same-origin`, referrer_policy:`origin`, expected_referrer:`origin`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/same-origin/url-image-referrerpolicy-cross-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/same-origin/url-image-referrerpolicy-cross-origin.sub.html
new file mode 100644
index 00000000000..de23eb1f095
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/same-origin/url-image-referrerpolicy-cross-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(same-origin)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A cross origin url with the request URL modifier referrerpolicy(same-origin) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`cross-origin`, referrer_policy:`same-origin`, expected_referrer:`none`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/same-origin/url-image-referrerpolicy-same-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/same-origin/url-image-referrerpolicy-same-origin.sub.html
new file mode 100644
index 00000000000..866affc6d9f
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/same-origin/url-image-referrerpolicy-same-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(same-origin)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A same origin url with the request URL modifier referrerpolicy(same-origin) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`same-origin`, referrer_policy:`same-origin`, expected_referrer:`url`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/strict-origin-when-cross-origin/url-image-referrerpolicy-cross-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/strict-origin-when-cross-origin/url-image-referrerpolicy-cross-origin.sub.html
new file mode 100644
index 00000000000..1e66fbf659f
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/strict-origin-when-cross-origin/url-image-referrerpolicy-cross-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(strict-origin-when-cross-origin)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A cross origin url with the request URL modifier referrerpolicy(strict-origin-when-cross-origin) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`cross-origin`, referrer_policy:`strict-origin-when-cross-origin`, expected_referrer:`origin`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/strict-origin-when-cross-origin/url-image-referrerpolicy-same-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/strict-origin-when-cross-origin/url-image-referrerpolicy-same-origin.sub.html
new file mode 100644
index 00000000000..57f5351a5a1
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/strict-origin-when-cross-origin/url-image-referrerpolicy-same-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(strict-origin-when-cross-origin)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A same origin url with the request URL modifier referrerpolicy(strict-origin-when-cross-origin) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`same-origin`, referrer_policy:`strict-origin-when-cross-origin`, expected_referrer:`url`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/strict-origin/url-image-referrerpolicy-cross-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/strict-origin/url-image-referrerpolicy-cross-origin.sub.html
new file mode 100644
index 00000000000..b17ac4b4ef7
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/strict-origin/url-image-referrerpolicy-cross-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(strict-origin)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A cross origin url with the request URL modifier referrerpolicy(strict-origin) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`cross-origin`, referrer_policy:`strict-origin`, expected_referrer:`origin`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/strict-origin/url-image-referrerpolicy-same-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/strict-origin/url-image-referrerpolicy-same-origin.sub.html
new file mode 100644
index 00000000000..dadf1c58d52
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/strict-origin/url-image-referrerpolicy-same-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(strict-origin)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A same origin url with the request URL modifier referrerpolicy(strict-origin) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`same-origin`, referrer_policy:`strict-origin`, expected_referrer:`origin`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/unsafe-url/url-image-referrerpolicy-cross-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/unsafe-url/url-image-referrerpolicy-cross-origin.sub.html
new file mode 100644
index 00000000000..dc5a3d51435
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/unsafe-url/url-image-referrerpolicy-cross-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(unsafe-url)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A cross origin url with the request URL modifier referrerpolicy(unsafe-url) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`cross-origin`, referrer_policy:`unsafe-url`, expected_referrer:`url`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/referrer-policy/unsafe-url/url-image-referrerpolicy-same-origin.sub.html b/tests/wpt/tests/css/css-values/urls/referrer-policy/unsafe-url/url-image-referrerpolicy-same-origin.sub.html
new file mode 100644
index 00000000000..7eaba535f14
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/referrer-policy/unsafe-url/url-image-referrerpolicy-same-origin.sub.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Request URL Modifiers: referrerpolicy(unsafe-url)</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#typedef-request-url-modifier-referrerpolicy-modifier">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<link rel="match" href="../../url-image-ref.html">
+<meta name="assert" content="A same origin url with the request URL modifier referrerpolicy(unsafe-url) sends the appropriate referrer header.">
+<script src="../../support/image-referrerpolicy.sub.js"></script>
+<script>
+  test_image_referrer_policy({ load_type:`same-origin`, referrer_policy:`unsafe-url`, expected_referrer:`url`});
+</script>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/support/1x1-green.png b/tests/wpt/tests/css/css-values/urls/support/1x1-green.png
new file mode 100644
index 00000000000..b98ca0ba0a0
Binary files /dev/null and b/tests/wpt/tests/css/css-values/urls/support/1x1-green.png differ
diff --git a/tests/wpt/tests/css/css-values/urls/support/1x1-navy.png b/tests/wpt/tests/css/css-values/urls/support/1x1-navy.png
new file mode 100644
index 00000000000..9b9a03955ba
Binary files /dev/null and b/tests/wpt/tests/css/css-values/urls/support/1x1-navy.png differ
diff --git a/tests/wpt/tests/css/css-values/urls/support/1x1-red.png b/tests/wpt/tests/css/css-values/urls/support/1x1-red.png
new file mode 100644
index 00000000000..6bd73ac1018
Binary files /dev/null and b/tests/wpt/tests/css/css-values/urls/support/1x1-red.png differ
diff --git a/tests/wpt/tests/css/css-values/urls/support/image-referrerpolicy.py b/tests/wpt/tests/css/css-values/urls/support/image-referrerpolicy.py
new file mode 100644
index 00000000000..cff09165f10
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/support/image-referrerpolicy.py
@@ -0,0 +1,41 @@
+import os.path
+
+from wptserve.utils import isomorphic_decode
+
+def main(request, response):
+    origin = request.GET[b'origin']
+    url = request.GET[b'url']
+    expected_referrer = request.GET[b'expected_referrer']
+    actual_referrer = request.headers.get(b'referer', b'')
+
+    if expected_referrer == b'none':
+        if actual_referrer == b'':
+            body = open(os.path.join(os.path.dirname(isomorphic_decode(__file__)), u"1x1-green.png"), u"rb").read()
+        else:
+            body = open(os.path.join(os.path.dirname(isomorphic_decode(__file__)), u"1x1-red.png"), u"rb").read()
+    elif expected_referrer == b'origin':
+        if actual_referrer == origin:
+            body = open(os.path.join(os.path.dirname(isomorphic_decode(__file__)), u"1x1-green.png"), u"rb").read()
+        else:
+            body = open(os.path.join(os.path.dirname(isomorphic_decode(__file__)), u"1x1-red.png"), u"rb").read()
+    elif expected_referrer == b'url':
+        if actual_referrer == url:
+            body = open(os.path.join(os.path.dirname(isomorphic_decode(__file__)), u"1x1-green.png"), u"rb").read()
+        else:
+            body = open(os.path.join(os.path.dirname(isomorphic_decode(__file__)), u"1x1-red.png"), u"rb").read()
+    else:
+        # Return neither red nor green if there is an unexpected "expected_referrer".
+        body = open(os.path.join(os.path.dirname(isomorphic_decode(__file__)), u"1x1-navy.png"), u"rb").read()
+
+    response.add_required_headers = False
+    response.writer.write_status(200)
+
+    if b'corp' in request.GET:
+        response.writer.write_header(b"cross-origin-resource-policy", request.GET[b'corp'])
+    if b'acao' in request.GET:
+        response.writer.write_header(b"access-control-allow-origin", request.GET[b'acao'])
+    response.writer.write_header(b"content-length", len(body))
+    response.writer.write_header(b"cache-control", b"no-cache; must-revalidate")
+    response.writer.end_headers()
+
+    response.writer.write(body)
diff --git a/tests/wpt/tests/css/css-values/urls/support/image-referrerpolicy.sub.js b/tests/wpt/tests/css/css-values/urls/support/image-referrerpolicy.sub.js
new file mode 100644
index 00000000000..4fc9d46218f
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/support/image-referrerpolicy.sub.js
@@ -0,0 +1,19 @@
+function make_test_url(type, policy, expected) {
+  if (type == "cross-origin")
+    return `url("http://{{hosts[][]}}:{{ports[http][1]}}/css/css-values/urls/support/image-referrerpolicy.py?expected_referrer=${expected}&origin=${location.origin}/&url=${document.URL}"${policy ? ` referrerpolicy(${policy})` : ``})`;
+  if (type == "same-origin")
+    return `url("http://{{hosts[][]}}:{{ports[http][0]}}/css/css-values/urls/support/image-referrerpolicy.py?expected_referrer=${expected}&origin=${location.origin}/&url=${document.URL}"${policy ? ` referrerpolicy(${policy})` : ``})`;
+  throw `Unknown type: ${type}`;
+}
+
+function test_image_referrer_policy(descriptor) {
+  var style = document.createElement("style");
+  style.innerHTML = `
+  .test {
+    width: 200px;
+    height: 200px;
+    background-color: blue;
+    background-image: ${make_test_url(descriptor.load_type, descriptor.referrer_policy, descriptor.expected_referrer)};
+  };`;
+  document.head.append(style);
+}
diff --git a/tests/wpt/tests/css/css-values/urls/url-image-ref.html b/tests/wpt/tests/css/css-values/urls/url-image-ref.html
new file mode 100644
index 00000000000..a56c789f147
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/url-image-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+  .test {
+    width: 200px;
+    height: 200px;
+    background-color: green;
+  }
+</style>
+</head>
+<body>
+<p>Test passes if there is a green square.</p>
+<div class="test"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-values/urls/url-request-modifiers-computed.sub.html b/tests/wpt/tests/css/css-values/urls/url-request-modifiers-computed.sub.html
new file mode 100644
index 00000000000..bc8c4ad95df
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/url-request-modifiers-computed.sub.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#request-url-modifiers">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<div id="container" style="font-size: 20">
+  <div id="target"></div>
+</div>
+<script>
+
+// No modifiers
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png")');
+
+// <crossorigin-modifier> = crossorigin(anonymous | use-credentials)
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(use-credentials))');
+
+// <integrity-modifier> = integrity(<string>)
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity("sha384-foobar"))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity(""))');
+
+// <referrerpolicy-modifier> = referrerpolicy(no-referrer | no-referrer-when-downgrade | same-origin | origin | strict-origin | origin-when-cross-origin | strict-origin-when-cross-origin | unsafe-url)
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer-when-downgrade))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(same-origin))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(origin))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(strict-origin))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(origin-when-cross-origin))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(strict-origin-when-cross-origin))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(unsafe-url))');
+
+// Multiple modifiers
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) integrity("sha384-foobar"))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity("sha384-foobar") crossorigin(anonymous))', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) integrity("sha384-foobar"))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity("sha384-foobar") referrerpolicy(no-referrer))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer) integrity("sha384-foobar"))', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity("sha384-foobar") referrerpolicy(no-referrer))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) referrerpolicy(no-referrer))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer) crossorigin(anonymous))', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) referrerpolicy(no-referrer))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) integrity("sha384-foobar") referrerpolicy(no-referrer))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity("sha384-foobar") referrerpolicy(no-referrer) crossorigin(anonymous))', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) integrity("sha384-foobar") referrerpolicy(no-referrer))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer) crossorigin(anonymous) integrity("sha384-foobar"))', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) integrity("sha384-foobar") referrerpolicy(no-referrer))');
+test_computed_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer) integrity("sha384-foobar") crossorigin(anonymous))', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) integrity("sha384-foobar") referrerpolicy(no-referrer))');
+
+</script>
diff --git a/tests/wpt/tests/css/css-values/urls/url-request-modifiers-invalid.sub.html b/tests/wpt/tests/css/css-values/urls/url-request-modifiers-invalid.sub.html
new file mode 100644
index 00000000000..c30edfbaeaa
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/url-request-modifiers-invalid.sub.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#request-url-modifiers">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script>
+
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin())');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(,))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous,))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(,anonymous))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous foobar))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) cross-origin(anonymous))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) cross-origin(use-credentials))');
+test_invalid_value('background-image', 'url(crossorigin(anonymous) "http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png")');
+test_invalid_value('background-image', '"http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous)');
+
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity())');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity(,))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity("sha384-foobar",))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity(,"sha384-foobar"))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity("sha384-foobar" foobar))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity(sha384-foobar))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity("sha384-foobar") integrity("sha384-foobar"))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity("sha384-foobar") integrity("sha384-barbaz"))');
+test_invalid_value('background-image', 'url(integrity("sha384-foobar") "http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png")');
+test_invalid_value('background-image', '"http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity("sha384-foobar")');
+
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy())');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(,))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer,))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(,no-referrer))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer foobar))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer same-origin))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer) referrerpolicy(no-referrer))');
+test_invalid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer) referrerpolicy(same-origin))');
+test_invalid_value('background-image', 'url(referrerpolicy(no-referrer) "http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png")');
+test_invalid_value('background-image', '"http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer)');
+
+</script>
diff --git a/tests/wpt/tests/css/css-values/urls/url-request-modifiers-serialize.sub.html b/tests/wpt/tests/css/css-values/urls/url-request-modifiers-serialize.sub.html
new file mode 100644
index 00000000000..cca9f2ccf9b
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/urls/url-request-modifiers-serialize.sub.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#request-url-modifiers">
+<link rel="author" title="Sam Weinig" href="mailto:weinig@webkit.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<div id=target></div>
+<script>
+
+// No modifiers
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png")');
+
+// <crossorigin-modifier> = crossorigin(anonymous | use-credentials)
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(use-credentials))');
+
+// <integrity-modifier> = integrity(<string>)
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity("sha384-foobar"))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity(""))');
+
+// <referrerpolicy-modifier> = referrerpolicy(no-referrer | no-referrer-when-downgrade | same-origin | origin | strict-origin | origin-when-cross-origin | strict-origin-when-cross-origin | unsafe-url)
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer-when-downgrade))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(same-origin))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(origin))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(strict-origin))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(origin-when-cross-origin))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(strict-origin-when-cross-origin))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(unsafe-url))');
+
+// Multiple modifiers
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) integrity("sha384-foobar"))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity("sha384-foobar") crossorigin(anonymous))', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) integrity("sha384-foobar"))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity("sha384-foobar") referrerpolicy(no-referrer))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer) integrity("sha384-foobar"))', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity("sha384-foobar") referrerpolicy(no-referrer))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) referrerpolicy(no-referrer))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer) crossorigin(anonymous))', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) referrerpolicy(no-referrer))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) integrity("sha384-foobar") referrerpolicy(no-referrer))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" integrity("sha384-foobar") referrerpolicy(no-referrer) crossorigin(anonymous))', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) integrity("sha384-foobar") referrerpolicy(no-referrer))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer) crossorigin(anonymous) integrity("sha384-foobar"))', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) integrity("sha384-foobar") referrerpolicy(no-referrer))');
+test_valid_value('background-image', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" referrerpolicy(no-referrer) integrity("sha384-foobar") crossorigin(anonymous))', 'url("http://{{hosts[][]}}:{{ports[http][0]}}/css/support/1x1-green.png" crossorigin(anonymous) integrity("sha384-foobar") referrerpolicy(no-referrer))');
+
+</script>
diff --git a/tests/wpt/tests/css/css-view-transitions/WEB_FEATURES.yml b/tests/wpt/tests/css/css-view-transitions/WEB_FEATURES.yml
index e1df1b8c670..cbdc654b1d6 100644
--- a/tests/wpt/tests/css/css-view-transitions/WEB_FEATURES.yml
+++ b/tests/wpt/tests/css/css-view-transitions/WEB_FEATURES.yml
@@ -1,3 +1,7 @@
 features:
 - name: view-transitions
   files: "**"
+- name: view-transition-class
+  files:
+  - class-specificity.html
+  - pseudo-with-classes-*
diff --git a/tests/wpt/tests/css/css-view-transitions/active-view-transition-on-non-root.html b/tests/wpt/tests/css/css-view-transitions/active-view-transition-on-non-root.html
index 9870b15cca9..d8699d3a2c7 100644
--- a/tests/wpt/tests/css/css-view-transitions/active-view-transition-on-non-root.html
+++ b/tests/wpt/tests/css/css-view-transitions/active-view-transition-on-non-root.html
@@ -21,7 +21,10 @@ main:active-view-transition #target {
   background: red;
 }
 
-::view-transition-group(*) {
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-old(*),
+::view-transition-new(*) {
   animation-play-state: paused;
 }
 </style>
diff --git a/tests/wpt/tests/css/css-view-transitions/active-view-transition-type-on-non-root.html b/tests/wpt/tests/css/css-view-transitions/active-view-transition-type-on-non-root.html
index f4225485b86..4569af04fff 100644
--- a/tests/wpt/tests/css/css-view-transitions/active-view-transition-type-on-non-root.html
+++ b/tests/wpt/tests/css/css-view-transitions/active-view-transition-type-on-non-root.html
@@ -21,7 +21,10 @@ main:active-view-transition-type(type-name) #target {
   background: red;
 }
 
-::view-transition-group(*) {
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-old(*),
+::view-transition-new(*) {
   animation-play-state: paused;
 }
 </style>
diff --git a/tests/wpt/tests/css/css-view-transitions/auto-name-from-id.html b/tests/wpt/tests/css/css-view-transitions/auto-name-from-id.html
index 9a04d431dfd..d3430c93a1d 100644
--- a/tests/wpt/tests/css/css-view-transitions/auto-name-from-id.html
+++ b/tests/wpt/tests/css/css-view-transitions/auto-name-from-id.html
@@ -17,6 +17,7 @@ main {
 
 .item {
   view-transition-name: auto;
+  view-transition-class: item;
 }
 
 main.switch #item1 {
@@ -38,8 +39,7 @@ html::view-transition {
 }
 
 :root { view-transition-name: none; }
-html::view-transition-group(item1),
-html::view-transition-group(item2) {
+html::view-transition-group(*.item) {
   animation-timing-function: steps(2, start);
   animation-play-state: paused;
 }
@@ -51,7 +51,7 @@ html::view-transition-new(*) { animation: unset; opacity: 1 }
 
 </style>
 
-<main>
+<main id=main>
   <div class="item" id="item1"></div>
   <div class="item" id="item2"></div>
 </main>
@@ -61,10 +61,19 @@ failIfNot(document.startViewTransition, "Missing document.startViewTransition");
 
 function runTest() {
   document.startViewTransition(() => {
-    document.querySelector("main").classList.toggle("switch");
+    main.classList.toggle("switch");
+    let div1 = document.createElement("div");
+    div1.classList.add("item");
+    div1.id = "item1";
+
+    let div2 = document.createElement("div");
+    div2.classList.add("item");
+    div2.id = "item2";
+
+    main.replaceChildren(div1, div2);
   }).ready.then(takeScreenshot);
 }
 onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
 </script>
 
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/capture-with-offscreen-child-translated.html b/tests/wpt/tests/css/css-view-transitions/capture-with-offscreen-child-translated.html
index 925bb8dbc45..d7f4f2b122a 100644
--- a/tests/wpt/tests/css/css-view-transitions/capture-with-offscreen-child-translated.html
+++ b/tests/wpt/tests/css/css-view-transitions/capture-with-offscreen-child-translated.html
@@ -30,6 +30,17 @@
   visibility: hidden;
   animation-duration: 500s;
 }
+
+::view-transtion-old(*) {
+  animation: unset;
+  opacity: 1;
+}
+
+::view-transtion-new(*) {
+  animation: unset;
+  opacity: 0;
+}
+
 ::view-transition {
   background: pink;
 }
diff --git a/tests/wpt/tests/css/css-view-transitions/capture-with-offscreen-child.html b/tests/wpt/tests/css/css-view-transitions/capture-with-offscreen-child.html
index 7f8085cae2d..576c1a0a4ad 100644
--- a/tests/wpt/tests/css/css-view-transitions/capture-with-offscreen-child.html
+++ b/tests/wpt/tests/css/css-view-transitions/capture-with-offscreen-child.html
@@ -26,6 +26,22 @@
   visibility: hidden;
   animation-duration: 500s;
 }
+
+::view-transtion-group(*),
+::view-transtion-image-pair(*) {
+  animation-play-state: paused;
+}
+
+::view-transition-old(*) {
+  animation: unset;
+  opacity: 1;
+}
+
+::view-transition-new(*) {
+  animation: unset;
+  opacity: 0;
+}
+
 ::view-transition {
   background: pink;
 }
@@ -44,4 +60,5 @@ function runTest() {
 }
 
 onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
+
 </script>
diff --git a/tests/wpt/tests/css/css-view-transitions/capture-with-opacity-zero-child.html b/tests/wpt/tests/css/css-view-transitions/capture-with-opacity-zero-child.html
index 2b0563ea31b..78bd49f24a2 100644
--- a/tests/wpt/tests/css/css-view-transitions/capture-with-opacity-zero-child.html
+++ b/tests/wpt/tests/css/css-view-transitions/capture-with-opacity-zero-child.html
@@ -24,6 +24,22 @@
   visibility: hidden;
   animation-duration: 500s;
 }
+
+::view-transtion-group(*),
+::view-transtion-image-pair(*) {
+  animation-play-state: paused;
+}
+
+::view-transition-old(*) {
+  animation: unset;
+  opacity: 1;
+}
+
+::view-transition-new(*) {
+  animation: unset;
+  opacity: 0;
+}
+
 ::view-transition {
   background: pink;
 }
diff --git a/tests/wpt/tests/css/css-view-transitions/capture-with-visibility-hidden-child.html b/tests/wpt/tests/css/css-view-transitions/capture-with-visibility-hidden-child.html
index 2d176124996..ba49933390f 100644
--- a/tests/wpt/tests/css/css-view-transitions/capture-with-visibility-hidden-child.html
+++ b/tests/wpt/tests/css/css-view-transitions/capture-with-visibility-hidden-child.html
@@ -23,6 +23,23 @@
   visibility: hidden;
   animation-duration: 500s;
 }
+
+::view-transtion-group(*),
+::view-transtion-image-pair(*) {
+  animation-play-state: paused;
+}
+
+::view-transition-old(*) {
+  animation: unset;
+  opacity: 1;
+}
+
+::view-transition-new(*) {
+  animation: unset;
+  opacity: 0;
+}
+
+
 ::view-transition {
   background: pink;
 }
diff --git a/tests/wpt/tests/css/css-view-transitions/capture-with-visibility-mixed-descendants.html b/tests/wpt/tests/css/css-view-transitions/capture-with-visibility-mixed-descendants.html
index 3a4811ada10..45776052491 100644
--- a/tests/wpt/tests/css/css-view-transitions/capture-with-visibility-mixed-descendants.html
+++ b/tests/wpt/tests/css/css-view-transitions/capture-with-visibility-mixed-descendants.html
@@ -34,6 +34,22 @@
   visibility: hidden;
   animation-duration: 500s;
 }
+
+::view-transtion-group(*),
+::view-transtion-image-pair(*) {
+  animation-play-state: paused;
+}
+
+::view-transition-old(*) {
+  animation: unset;
+  opacity: 1;
+}
+
+::view-transition-new(*) {
+  animation: unset;
+  opacity: 0;
+}
+
 ::view-transition {
   background: pink;
 }
diff --git a/tests/wpt/tests/css/css-view-transitions/empty-render-target-capture-ref.html b/tests/wpt/tests/css/css-view-transitions/empty-render-target-capture-ref.html
new file mode 100644
index 00000000000..a8c2732cd85
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/empty-render-target-capture-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<title>View transitions: empty render surface capture (ref)</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-1/">
+<link rel="author" href="mailto:vmpstr@chromium.org">
+<style>
+
+.container {
+  width: 0px;
+  height: 0px;
+}
+.child {
+  width: 100px;
+  height: 100px;
+  background: green;
+  will-change: opacity;
+}
+
+</style>
+
+<div class=container>
+  <div class=child></div>
+</div>
diff --git a/tests/wpt/tests/css/css-view-transitions/empty-render-target-capture.html b/tests/wpt/tests/css/css-view-transitions/empty-render-target-capture.html
new file mode 100644
index 00000000000..f0be6019a39
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/empty-render-target-capture.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>View transitions: empty render surface capture</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-1/">
+<link rel="author" href="mailto:vmpstr@chromium.org">
+<link rel="match" href="empty-render-target-capture-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/dom/events/scrolling/scroll_support.js"></script>
+<style>
+
+:root {
+  view-transition-name: none;
+}
+.container {
+  view-transition-name: container;
+  width: 0px;
+  height: 0px;
+}
+.child {
+  view-transition-name: child;
+  width: 100px;
+  height: 100px;
+  background: green;
+  will-change: opacity;
+}
+
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-old(*),
+::view-transition-new(*) {
+  animation-play-state: paused;
+}
+</style>
+
+<div class=container>
+  <div class=child></div>
+</div>
+
+<script>
+function runTest() {
+  document.startViewTransition().ready.then(takeScreenshot);
+}
+
+onload = async () => {
+  await waitForCompositorReady();
+  runTest();
+}
+
+</script>
diff --git a/tests/wpt/tests/css/css-view-transitions/inline-child-with-filter.html b/tests/wpt/tests/css/css-view-transitions/inline-child-with-filter.html
index 2c4a8b85ec1..61f0f1f6a8c 100644
--- a/tests/wpt/tests/css/css-view-transitions/inline-child-with-filter.html
+++ b/tests/wpt/tests/css/css-view-transitions/inline-child-with-filter.html
@@ -4,6 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-view-transitions-1/">
 <link rel="author" href="mailto:vmpstr@chromium.org">
 <link rel="match" href="inline-child-with-filter-ref.html">
+<meta name=fuzzy content="maxDifference=0-2;totalPixels=0-2400">
 <script src="/common/reftest-wait.js"></script>
 
 <style>
diff --git a/tests/wpt/tests/css/css-view-transitions/inline-with-offset-from-containing-block.html b/tests/wpt/tests/css/css-view-transitions/inline-with-offset-from-containing-block.html
index 6bbb8b49392..31f8449ff63 100644
--- a/tests/wpt/tests/css/css-view-transitions/inline-with-offset-from-containing-block.html
+++ b/tests/wpt/tests/css/css-view-transitions/inline-with-offset-from-containing-block.html
@@ -31,6 +31,12 @@
     margin: -10px 0 0 -10px;
     animation-play-state: paused;
   }
+  html::view-transition-image-pair(text),
+  html::view-transition-old(text),
+  html::view-transition-new(text) {
+    animation-play-state: paused;
+  }
+
 </style>
 
 <div class="outer">
diff --git a/tests/wpt/tests/css/css-view-transitions/navigation/WEB_FEATURES.yml b/tests/wpt/tests/css/css-view-transitions/navigation/WEB_FEATURES.yml
new file mode 100644
index 00000000000..1b95bc2b45b
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/navigation/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: cross-document-view-transitions
+  files: "**"
diff --git a/tests/wpt/tests/css/css-view-transitions/navigation/pageswap-in-hidden-doc-should-skip-transition.html b/tests/wpt/tests/css/css-view-transitions/navigation/pageswap-in-hidden-doc-should-skip-transition.html
index aceced0dded..2fddb7e17a4 100644
--- a/tests/wpt/tests/css/css-view-transitions/navigation/pageswap-in-hidden-doc-should-skip-transition.html
+++ b/tests/wpt/tests/css/css-view-transitions/navigation/pageswap-in-hidden-doc-should-skip-transition.html
@@ -9,7 +9,14 @@
   promise_test(async t => {
     let popup;
     onload = () => {
+      // Need to restore this browser window once after the window got minimized.
+      window.set_original_window_rect = rect => {
+        t.add_cleanup(async () => {
+          await test_driver.set_window_rect(rect);
+        });
+      };
       popup = window.open("resources/navigate-after-hide.html");
+
       t.add_cleanup(() => popup.close());
     };
 
diff --git a/tests/wpt/tests/css/css-view-transitions/navigation/resources/at-rule-types-shared-elements.html b/tests/wpt/tests/css/css-view-transitions/navigation/resources/at-rule-types-shared-elements.html
new file mode 100644
index 00000000000..c9cff7f4734
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/navigation/resources/at-rule-types-shared-elements.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>View Transitions: @view-transition opt in with types and elements</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
+<script src="/common/reftest-wait.js"></script>
+
+<link rel=expect href="#target">
+
+<style>
+@view-transition {
+  navigation:auto;
+  types:mode;
+}
+
+:root { view-transition-name: none }
+html:active-view-transition-type(mode) {
+  .target {
+    view-transition-name: target;
+  }
+}
+
+.target {
+  width: 100px;
+  height: 100px;
+  position: relative;
+  background: green;
+  left: 200px;
+}
+
+::view-transition-group(target) {
+  animation-play-state: paused;
+}
+
+::view-transition-old(target) {
+  animation: unset;
+  opacity: 1;
+}
+::view-transition-new(target) {
+  animation: unset;
+  opacity: 0;
+}
+</style>
+</head>
+
+<div id=target class=target></div>
+
+<script>
+  onload = takeScreenshot;
+</script>
+
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/navigation/resources/auto-name-from-id.html b/tests/wpt/tests/css/css-view-transitions/navigation/resources/auto-name-from-id.html
index f1fd1e48a68..71ea52a273e 100644
--- a/tests/wpt/tests/css/css-view-transitions/navigation/resources/auto-name-from-id.html
+++ b/tests/wpt/tests/css/css-view-transitions/navigation/resources/auto-name-from-id.html
@@ -23,7 +23,7 @@ html::view-transition-group(root) {
   display: none;
 }
 
-html::view-transition-group(green) {
+html::view-transition-group(*) {
   animation-play-state: paused;
   animation-duration: 3s;
   animation-timing-function: steps(2, start);
diff --git a/tests/wpt/tests/css/css-view-transitions/navigation/resources/navigate-after-hide.html b/tests/wpt/tests/css/css-view-transitions/navigation/resources/navigate-after-hide.html
index 0b6a3d669e8..9bed19eda2a 100644
--- a/tests/wpt/tests/css/css-view-transitions/navigation/resources/navigate-after-hide.html
+++ b/tests/wpt/tests/css/css-view-transitions/navigation/resources/navigate-after-hide.html
@@ -4,7 +4,8 @@
 <script>
   onload = async () => {
     test_driver.set_test_context(window.opener);
-    await test_driver.minimize_window();
+    const original_rect = await test_driver.minimize_window();
+    window.opener.set_original_window_rect(original_rect);
     if (document.visibilityState !== "hidden" || !document.hidden) {
       window.opener.popup_error("popup isn't hidden");
     } else {
diff --git a/tests/wpt/tests/css/css-view-transitions/navigation/with-types/at-rule-types-shared-elements-ref.html b/tests/wpt/tests/css/css-view-transitions/navigation/with-types/at-rule-types-shared-elements-ref.html
new file mode 100644
index 00000000000..2fc574c0f79
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/navigation/with-types/at-rule-types-shared-elements-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>View Transitions: @view-transition opt in with types and elements (ref)</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
+
+<style>
+.target {
+  width: 100px;
+  height: 100px;
+  position: relative;
+  background: blue;
+}
+</style>
+
+<div class=target></div>
diff --git a/tests/wpt/tests/css/css-view-transitions/navigation/with-types/at-rule-types-shared-elements.html b/tests/wpt/tests/css/css-view-transitions/navigation/with-types/at-rule-types-shared-elements.html
new file mode 100644
index 00000000000..50dc5ba1f43
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/navigation/with-types/at-rule-types-shared-elements.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>View Transitions: @view-transition opt in with types and elements</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
+<link rel="match" href="at-rule-types-shared-elements-ref.html">
+<script src="/common/reftest-wait.js"></script>
+
+<style>
+@view-transition {
+  navigation:auto;
+  types:mode;
+}
+
+:root { view-transition-name: none }
+html:active-view-transition-type(mode) {
+  .target {
+    view-transition-name: target;
+  }
+}
+
+.target {
+  width: 100px;
+  height: 100px;
+  position: relative;
+  background: blue;
+}
+</style>
+
+<div class=target></div>
+<script>
+  function runTest() {
+    const url = "../resources/at-rule-types-shared-elements.html";
+    window.location.replace(new URL(url, window.location));
+  }
+  onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
+</script>
+
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/adjust-transform-with-scale.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/adjust-transform-with-scale.tentative.html
index e58a7f36300..a1177e7801d 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/adjust-transform-with-scale.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/adjust-transform-with-scale.tentative.html
@@ -4,6 +4,7 @@
 <meta name=fuzzy content="maxDifference=0-255; totalPixels=0-1250">
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref-100.html">
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <style>
@@ -36,4 +37,4 @@
     <div class="parent">
         <div class="child"></div>
     </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/adjust-transform.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/adjust-transform.tentative.html
index 915bd22e420..54b5f494419 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/adjust-transform.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/adjust-transform.tentative.html
@@ -4,6 +4,7 @@
 <meta name=fuzzy content="maxDifference=0-255; totalPixels=0-515">
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref-100.html">
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <style>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-direct.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-direct.tentative.html
index d0b3e0f16d6..31f49979e8e 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-direct.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-direct.tentative.html
@@ -5,10 +5,11 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
 <link rel=stylesheet href="resources/compute-common.css"></link>
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <body>
     <div class="green">
         <div class="test green-ref"></div>
     </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-nested-vt-names.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-nested-vt-names.tentative.html
index dcf56b500f4..0be0f3c56aa 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-nested-vt-names.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-nested-vt-names.tentative.html
@@ -5,6 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
 <link rel=stylesheet href="resources/compute-common.css"></link>
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <style>
@@ -24,4 +25,4 @@
             <div class="test green-ref"></div>
         </div>
     </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-nested.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-nested.tentative.html
index ad47461b142..f455210cce2 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-nested.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-nested.tentative.html
@@ -5,6 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
 <link rel=stylesheet href="resources/compute-common.css"></link>
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <body>
@@ -13,4 +14,4 @@
             <div class="test green-ref"></div>
         </div>
     </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-non-ancestor.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-non-ancestor.tentative.html
index 8a2c69147ad..f16628908d2 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-non-ancestor.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-non-ancestor.tentative.html
@@ -5,10 +5,11 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
 <link rel=stylesheet href="resources/compute-common.css"></link>
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <body>
     <div class="red"></div>
     <!-- this would appear as green because it inherits from the ::view-transition-group -->
     <div class="test red-ref"></div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-non-existent.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-non-existent.tentative.html
index 2e3d71f96d1..090637b8e63 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-non-existent.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-non-existent.tentative.html
@@ -5,9 +5,10 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
 <link rel=stylesheet href="resources/compute-common.css"></link>
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <body>
     <!-- this would appear as green because it inherits from the ::view-transition-group -->
     <div class="test red-ref"></div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-self.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-self.tentative.html
index 09aa0f65331..63f3a3523e3 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-self.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/compute-explicit-name-self.tentative.html
@@ -5,8 +5,9 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
 <link rel=stylesheet href="resources/compute-common.css"></link>
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <body>
     <div class="test test-ref"></div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/contain-direct.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/contain-direct.tentative.html
index 8cc856883df..a90a843b5ee 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/contain-direct.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/contain-direct.tentative.html
@@ -5,6 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
 <link rel=stylesheet href="resources/compute-common.css"></link>
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <body>
@@ -13,4 +14,4 @@
             <div class="test"></div>
         </div>
     </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/contain-nested.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/contain-nested.tentative.html
index 643aad7b6db..b995d11c997 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/contain-nested.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/contain-nested.tentative.html
@@ -5,6 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
 <link rel=stylesheet href="resources/compute-common.css"></link>
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <body>
@@ -13,4 +14,4 @@
             <div class="test"></div>
         </div>
     </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/contain-on-self.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/contain-on-self.tentative.html
index f8662850bb9..a0a63188d3e 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/contain-on-self.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/contain-on-self.tentative.html
@@ -5,6 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
 <link rel=stylesheet href="resources/compute-common.css"></link>
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <body>
@@ -13,4 +14,4 @@
             <div class="test contain-ref"></div>
         </div>
     </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/custom-ident-implies-contain.html b/tests/wpt/tests/css/css-view-transitions/nested/custom-ident-implies-contain.html
index 6524d2c2680..545e98bc171 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/custom-ident-implies-contain.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/custom-ident-implies-contain.html
@@ -5,6 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
 <link rel=stylesheet href="resources/compute-common.css"></link>
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <body>
@@ -13,4 +14,4 @@
             <div class="test"></div>
         </div>
     </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/nearest-direct.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/nearest-direct.tentative.html
index a42e5a847c0..9bfd2e29c83 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/nearest-direct.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/nearest-direct.tentative.html
@@ -5,6 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
 <link rel=stylesheet href="resources/compute-common.css"></link>
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <body>
@@ -13,4 +14,4 @@
             <div class="test nearest-ref"></div>
         </div>
     </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/nearest-ignores-nearest-name.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/nearest-ignores-nearest-name.tentative.html
index ddae634f87a..3c904f3abb4 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/nearest-ignores-nearest-name.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/nearest-ignores-nearest-name.tentative.html
@@ -5,6 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
 <link rel=stylesheet href="resources/compute-common.css"></link>
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <body>
@@ -15,4 +16,4 @@
             </div>
         </div>
     </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/nearest-implies-contain.html b/tests/wpt/tests/css/css-view-transitions/nested/nearest-implies-contain.html
index 94f8b8d1b7e..378d2ebcdc1 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/nearest-implies-contain.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/nearest-implies-contain.html
@@ -5,6 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
 <link rel=stylesheet href="resources/compute-common.css"></link>
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <body>
@@ -13,4 +14,4 @@
             <div class="test"></div>
         </div>
     </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/nearest-nested.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/nearest-nested.tentative.html
index 9ec3e8f95ff..3e445c6bfcf 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/nearest-nested.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/nearest-nested.tentative.html
@@ -5,6 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
 <link rel=stylesheet href="resources/compute-common.css"></link>
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <body>
@@ -15,4 +16,4 @@
             </div>
         </div>
     </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/nested-exit.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/nested-exit.tentative.html
index dd1d6562280..83570762061 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/nested-exit.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/nested-exit.tentative.html
@@ -4,6 +4,7 @@
 <meta name=fuzzy content="maxDifference=0-255; totalPixels=0-515">
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref-100.html">
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <body>
@@ -51,4 +52,4 @@
     <div class="parent">
         <div class="child"></div>
     </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/nested-group-display-none.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/nested-group-display-none.tentative.html
index 08434873254..a4aad5aeee6 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/nested-group-display-none.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/nested-group-display-none.tentative.html
@@ -3,6 +3,7 @@
 <title>Nested view-transition-group with display:none</title>
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <meta name=fuzzy content="maxDifference=0-255; totalPixels=0-515">
 <script src="/common/reftest-wait.js"></script>
 <style>
@@ -41,4 +42,4 @@ async function runTest() {
 }
 onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
 </script>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/nested-group-in-pseudo-basic.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/nested-group-in-pseudo-basic.tentative.html
index 77241d06b73..f2a228144e2 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/nested-group-in-pseudo-basic.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/nested-group-in-pseudo-basic.tentative.html
@@ -3,6 +3,7 @@
 <title>Basic hierarchy of view-transition-group</title>
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <meta name=fuzzy content="maxDifference=0-255; totalPixels=0-515">
 <script src="/common/reftest-wait.js"></script>
 <style>
@@ -57,4 +58,4 @@ async function runTest() {
 }
 onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
 </script>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/nested-root-capture-with-clip-ref.html b/tests/wpt/tests/css/css-view-transitions/nested/nested-root-capture-with-clip-ref.html
new file mode 100644
index 00000000000..b598df17a0e
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/nested/nested-root-capture-with-clip-ref.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<title>Nested View Transitions root capture with border radius (ref)</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
+<link rel="author" href="mailto:vmpstr@chromium.org">
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
+
+<style>
+body { background: lightgreen; }
+#clipper {
+  overflow: clip;
+  height: 200px;
+  width: 100px;
+  border-radius: 50%;
+  background: rebeccapurple;
+}
+
+#i0 {
+  background: pink;
+  margin-bottom: 10px;
+  height: 20px;
+}
+</style>
+
+<div id=clipper>
+  <div id=i0 class=item></div>
+</div>
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/nested-root-capture-with-clip.html b/tests/wpt/tests/css/css-view-transitions/nested/nested-root-capture-with-clip.html
new file mode 100644
index 00000000000..4a063b57ba1
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/nested/nested-root-capture-with-clip.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>Nested View Transitions root capture with border radius</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
+<link rel="author" href="mailto:vmpstr@chromium.org">
+<link rel="match" href="nested-root-capture-with-clip-ref.html">
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
+<meta name=fuzzy content="maxDifference=0-40; totalPixels=0-500">
+<script src="/common/reftest-wait.js"></script>
+<script src="/dom/events/scrolling/scroll_support.js"></script>
+
+<style>
+:root { view-transition-name: none }
+#clipper {
+  view-transition-group: contain;
+  view-transition-name: clipper;
+  overflow: clip;
+  height: 200px;
+  width: 100px;
+  border-radius: 50%;
+  background: rebeccapurple;
+}
+
+.item {
+  view-transition-name: match-element;
+  view-transition-class: item;
+  background: pink;
+  margin-bottom: 10px;
+  height: 20px;
+}
+#i0 {
+  view-transition-name: none;
+  will-change: transform;
+}
+::view-transition-group(clipper) {
+  animation-play-state: paused;
+}
+::view-transition-new(clipper) {
+  animation: unset;
+  opacity: 0;
+}
+::view-transition-old(clipper) {
+  animation: unset;
+  opacity: 1;
+}
+::view-transition-group(*.item) {
+  display: none;
+}
+::view-transition {
+  background: lightgreen;
+}
+</style>
+
+<div id=clipper>
+  <div id=i0 class=item></div>
+  <div id=i1 class=item></div>
+  <div id=i2 class=item></div>
+  <div id=i3 class=item></div>
+</div>
+
+<script>
+function runTest() {
+  document.startViewTransition().ready.then(takeScreenshot);
+}
+
+onload = async () => {
+  await waitForCompositorReady();
+  runTest();
+}
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/normal-goes-up.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/normal-goes-up.tentative.html
index f68c93d4744..b027e36672f 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/normal-goes-up.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/normal-goes-up.tentative.html
@@ -5,6 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref.html">
 <link rel=stylesheet href="resources/compute-common.css"></link>
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <body>
@@ -13,4 +14,4 @@
             <div class="test normal-ref"></article>
         </div>
     </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/render-element.tentative.html b/tests/wpt/tests/css/css-view-transitions/nested/render-element.tentative.html
index 59a5a108314..4b74290279b 100644
--- a/tests/wpt/tests/css/css-view-transitions/nested/render-element.tentative.html
+++ b/tests/wpt/tests/css/css-view-transitions/nested/render-element.tentative.html
@@ -4,6 +4,7 @@
 <meta name=fuzzy content="maxDifference=0-255; totalPixels=0-515">
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
 <link rel="match" href="nested-ref-100.html">
+<link rel=stylesheet href="resources/pause-view-transitions.css"></link>
 <script src="/common/reftest-wait.js"></script>
 <script src="resources/compute-test.js"></script>
 <style>
@@ -34,4 +35,4 @@
     <div class="parent">
         <div class="child"></div>
     </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/tests/css/css-view-transitions/nested/resources/pause-view-transitions.css b/tests/wpt/tests/css/css-view-transitions/nested/resources/pause-view-transitions.css
new file mode 100644
index 00000000000..823235f3fbb
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/nested/resources/pause-view-transitions.css
@@ -0,0 +1,7 @@
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-new(*),
+::view-transition-old(*) {
+  animation-play-state: paused;
+}
+
diff --git a/tests/wpt/tests/css/css-view-transitions/only-child-group.html b/tests/wpt/tests/css/css-view-transitions/only-child-group.html
index 551e8816116..970a5a50114 100644
--- a/tests/wpt/tests/css/css-view-transitions/only-child-group.html
+++ b/tests/wpt/tests/css/css-view-transitions/only-child-group.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-wait foo">
+<html class="foo">
 <title>View transitions: ensure :only-child is supported on view-transition-group</title>
 <link rel="help" href="https://drafts.csswg.org/css-view-transitions-1/">
 <link rel="author" href="mailto:khushalsagar@chromium.org">
@@ -49,11 +49,20 @@ html:only-child {
 <div id="target2"></div>
 
 <script>
-promise_test(() => {
+function resetState() {
+  if (window.transition)
+    window.transition.skipTransition();
+  document.documentElement.style.viewTransitionName = "";
+  target.style.viewTransitionName = "";
+  target2.style.viewTransitionName = "";
+}
+
+promise_test((t) => {
   assert_implements(document.startViewTransition, "Missing document.startViewTransition");
+  t.add_cleanup(resetState);
   return new Promise(async (resolve, reject) => {
-    let transition = document.startViewTransition();
-    transition.ready.then(() => {
+    window.transition = document.startViewTransition();
+    window.transition.ready.then(() => {
       let style = getComputedStyle(document.documentElement, "::view-transition-group(root)");
       if (style.backgroundColor == "rgb(255, 0, 0)" && style.color == "rgb(255, 0, 0)")
         resolve();
@@ -63,12 +72,13 @@ promise_test(() => {
   });
 }, ":only-child should match because ::view-transition-group is generated for root element only");
 
-promise_test(() => {
+promise_test((t) => {
   assert_implements(document.startViewTransition, "Missing document.startViewTransition");
+  t.add_cleanup(resetState);
   return new Promise(async (resolve, reject) => {
     target.style.viewTransitionName = "target";
-    let transition = document.startViewTransition();
-    transition.ready.then(() => {
+    window.transition = document.startViewTransition();
+    window.transition.ready.then(() => {
       let style = getComputedStyle(document.documentElement, "::view-transition-group(root)");
       if (style.backgroundColor == "rgb(0, 0, 255)" && style.color == "rgb(0, 0, 255)")
         resolve();
@@ -78,13 +88,14 @@ promise_test(() => {
   });
 }, ":only-child should not match because ::view-transition-group is generated for multiple elements");
 
-promise_test(() => {
+promise_test((t) => {
   assert_implements(document.startViewTransition, "Missing document.startViewTransition");
+  t.add_cleanup(resetState);
   return new Promise(async (resolve, reject) => {
     document.documentElement.style.viewTransitionName = "none";
     target.style.viewTransitionName = "target";
-    let transition = document.startViewTransition();
-    transition.ready.then(() => {
+    window.transition = document.startViewTransition();
+    window.transition.ready.then(() => {
       let style = getComputedStyle(document.documentElement, "::view-transition-group(target)");
       if (style.backgroundColor == "rgb(255, 0, 0)" && style.color == "rgb(255, 0, 0)")
         resolve();
@@ -94,14 +105,15 @@ promise_test(() => {
   });
 }, ":only-child should match because ::view-transition-group is generated for sub element only");
 
-promise_test(() => {
+promise_test((t) => {
   assert_implements(document.startViewTransition, "Missing document.startViewTransition");
+  t.add_cleanup(resetState);
   return new Promise(async (resolve, reject) => {
     document.documentElement.style.viewTransitionName = "none";
     target.style.viewTransitionName = "target";
     target2.style.viewTransitionName = "target2";
-    let transition = document.startViewTransition();
-    transition.ready.then(() => {
+    window.transition = document.startViewTransition();
+    window.transition.ready.then(() => {
       let style = getComputedStyle(document.documentElement, "::view-transition-group(target)");
       if (style.backgroundColor == "rgb(0, 0, 255)" && style.color == "rgb(0, 0, 255)")
         resolve();
diff --git a/tests/wpt/tests/css/css-view-transitions/parsing/WEB_FEATURES.yml b/tests/wpt/tests/css/css-view-transitions/parsing/WEB_FEATURES.yml
new file mode 100644
index 00000000000..e011b34e2a0
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/parsing/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: view-transition-class
+  files:
+  - view-transition-class-*
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-rendering-invalidation.html b/tests/wpt/tests/css/css-view-transitions/pseudo-rendering-invalidation.html
index 4d492c40d87..9624137e754 100644
--- a/tests/wpt/tests/css/css-view-transitions/pseudo-rendering-invalidation.html
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-rendering-invalidation.html
@@ -28,8 +28,11 @@ div {
   background: darkseagreen;
 }
 
-::view-transition-group(*) {
-  animation-duration: 50s;
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-old(*),
+::view-transition-new(*) {
+  animation-play-state: paused;
 }
 
 ::view-transition {
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-ident.html b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-ident.html
index 9cfc3f12ce8..51705ccdeac 100644
--- a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-ident.html
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-ident.html
@@ -20,7 +20,10 @@ div {
   view-transition-class: cls;
 }
 
-::view-transition-group(*) {
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-old(*),
+::view-transition-new(*) {
   animation-play-state: paused;
 }
 
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-multiple-wildcard.html b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-multiple-wildcard.html
index 261c00f0875..c0f077a4250 100644
--- a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-multiple-wildcard.html
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-multiple-wildcard.html
@@ -20,7 +20,10 @@ div {
   view-transition-class: cls some-div;
 }
 
-::view-transition-group(*) {
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-old(*),
+::view-transition-new(*) {
   animation-play-state: paused;
 }
 
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-multiple.html b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-multiple.html
index 7ff42edf366..f5c060c2095 100644
--- a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-multiple.html
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-multiple.html
@@ -20,7 +20,10 @@ div {
   view-transition-name: target;
 }
 
-::view-transition-group(*) {
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-old(*),
+::view-transition-new(*) {
   animation-play-state: paused;
 }
 
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-wildcard-no-star.html b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-wildcard-no-star.html
index 96186cd8784..123168310b8 100644
--- a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-wildcard-no-star.html
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-wildcard-no-star.html
@@ -28,6 +28,17 @@
   ::view-transition-old(.cls) {
     left: 100px;
   }
+
+::view-transition-old(*) {
+  animation: unset;
+  opacity: 1;
+}
+
+::view-transition-new(*) {
+  animation: unset;
+  opacity: 0;
+}
+
 </style>
 <div id=target></div>
 
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-wildcard.html b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-wildcard.html
index f777e245ba6..11bdcbc12cb 100644
--- a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-wildcard.html
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-match-wildcard.html
@@ -20,7 +20,10 @@ div {
   view-transition-class: cls;
 }
 
-::view-transition-group(*) {
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-old(*),
+::view-transition-new(*) {
   animation-play-state: paused;
 }
 
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-mismatch-ident.html b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-mismatch-ident.html
index 107f388b388..493127b86b3 100644
--- a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-mismatch-ident.html
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-mismatch-ident.html
@@ -20,7 +20,10 @@ div {
   view-transition-class: cls;
 }
 
-::view-transition-group(*) {
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-old(*),
+::view-transition-new(*) {
   animation-play-state: paused;
 }
 
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-mismatch-partial.html b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-mismatch-partial.html
index ddb9b2535f2..d4a6e0a4f15 100644
--- a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-mismatch-partial.html
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-mismatch-partial.html
@@ -20,7 +20,10 @@ div {
   view-transition-class: cls;
 }
 
-::view-transition-group(*) {
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-old(*),
+::view-transition-new(*) {
   animation-play-state: paused;
 }
 
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-mismatch-wildcard.html b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-mismatch-wildcard.html
index 1e27dc2c05c..bdf51161447 100644
--- a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-mismatch-wildcard.html
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-mismatch-wildcard.html
@@ -20,7 +20,10 @@ div {
   view-transition-class: cls;
 }
 
-::view-transition-group(*) {
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-old(*),
+::view-transition-new(*) {
   animation-play-state: paused;
 }
 
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-multiple-vt-classes.html b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-multiple-vt-classes.html
index fa7ae4eeb15..c28d6f90dfe 100644
--- a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-multiple-vt-classes.html
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-multiple-vt-classes.html
@@ -20,7 +20,10 @@ div {
   view-transition-name: target;
 }
 
-::view-transition-group(*) {
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-old(*),
+::view-transition-new(*) {
   animation-play-state: paused;
 }
 
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-new-with-class-old-without.html b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-new-with-class-old-without.html
index 225ed1cb7f3..5adb88f143f 100644
--- a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-new-with-class-old-without.html
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-new-with-class-old-without.html
@@ -23,7 +23,10 @@ div {
   view-transition-class: cls;
 }
 
-::view-transition-group(*) {
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-old(*),
+::view-transition-new(*) {
   animation-play-state: paused;
 }
 
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-old-with-class-new-without.html b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-old-with-class-new-without.html
index f9ef100ef7e..17d03f8fcfc 100644
--- a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-old-with-class-new-without.html
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-old-with-class-new-without.html
@@ -23,7 +23,10 @@ div {
   view-transition-class: cls;
 }
 
-::view-transition-group(*) {
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-old(*),
+::view-transition-new(*) {
   animation-play-state: paused;
 }
 
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-view-transition-image-pair.html b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-view-transition-image-pair.html
index 0473742260c..5cc971b9446 100644
--- a/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-view-transition-image-pair.html
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-with-classes-view-transition-image-pair.html
@@ -23,8 +23,20 @@
 
 ::view-transition-image-pair(target.cls) {
   transform: translateX(100px);
+  animation-play-state: paused;
 }
 
+::view-transition-old(*) {
+  animation: unset;
+  opacity: 1;
+}
+
+::view-transition-new(*) {
+  animation: unset;
+  opacity: 0;
+}
+
+
 </style>
 <div id=target></div>
 
diff --git a/tests/wpt/tests/css/css-view-transitions/root-preserve3d-crash.html b/tests/wpt/tests/css/css-view-transitions/root-preserve3d-crash.html
new file mode 100644
index 00000000000..11232801875
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/root-preserve3d-crash.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1963368">
+<style>
+  * {
+      border-style: double !important;
+      -webkit-transform-style: preserve-3d !important;
+  }
+</style>
+<script>
+  document.addEventListener("DOMContentLoaded", async () => {
+    document.startViewTransition(undefined)
+  })
+</script>
diff --git a/tests/wpt/tests/css/css-view-transitions/root-replace-crash.html b/tests/wpt/tests/css/css-view-transitions/root-replace-crash.html
new file mode 100644
index 00000000000..165eec41b6b
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/root-replace-crash.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+  <script>
+    document.addEventListener("DOMContentLoaded", async () => {
+      const tt = document.createElementNS("http://www.w3.org/1999/xhtml", "tt")
+      tt.popover = "manual"
+      const viewTransition = document.startViewTransition(undefined)
+      await viewTransition.updateCallbackDone
+      for (let i = 0; i < 2; i++) {
+        document.replaceChild(tt, document.childNodes[(2324524876 % document.childNodes.length)])
+      }
+    })
+  </script>
+  <head>
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/rotated-cat-off-top-edge.html b/tests/wpt/tests/css/css-view-transitions/rotated-cat-off-top-edge.html
index f61b916caa5..34979361429 100644
--- a/tests/wpt/tests/css/css-view-transitions/rotated-cat-off-top-edge.html
+++ b/tests/wpt/tests/css/css-view-transitions/rotated-cat-off-top-edge.html
@@ -16,7 +16,19 @@
 }
 ::view-transition-group(root) {
   animation-duration: 500s;
+  animation-play-state: paused;
 }
+
+::view-transition-old(*) {
+  animation: unset;
+  opacity: 1;
+}
+
+::view-transition-new(*) {
+  animation: unset;
+  opacity: 0;
+}
+
 </style>
 <body>
 <img class="target" src="support/cat.png">
diff --git a/tests/wpt/tests/css/css-view-transitions/scoped/auto-name-on-descendant.html b/tests/wpt/tests/css/css-view-transitions/scoped/auto-name-on-descendant.html
new file mode 100644
index 00000000000..01d570e8bfc
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/scoped/auto-name-on-descendant.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <!-- TODO update link -->
+  <link rel="help" href="https://www.w3.org/TR/css-view-transitions-2/">
+  <title>Scoped element with name auto on descendant</title>
+</head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #container {
+    display: flex;
+    flex-direction: row;
+    position: relative;
+    /* Currently needed to force a stacking context in the absence of an
+       animation-name.
+    */
+    will-change: opacity;
+  }
+
+  .item {
+    background-color: teal;
+    color: white;
+    text-align: center;
+    line-height: 50px;
+    width: 50px;
+    height: 50px;
+    margin: 5px;
+    position: relative;
+    will-change: opacity;
+    view-transition-name: auto;
+  }
+
+  #item1.active {
+    background-color: orange;
+    transform: scale(1.2);
+  }
+
+  #item2.active {
+    background-color: salmon;
+    transform: scale(0.9);
+  }
+
+  #item3.active {
+    background-color: hotpink;
+    transform: scale(0.8) translateX(-10px);
+  }
+
+  ::view-transition-group(*) {
+    animation-duration: 2s;
+  }
+
+  ::view-transition-old(*) {
+    animation-name: -ua-view-transition-fade-out;
+  }
+
+  ::view-transition-new(*) {
+    animation-name: -ua-view-transition-fade-in;
+  }
+
+</style>
+<body>
+  <div id="container">
+    <div id="item1" class="item">A</div>
+    <div id="item2" class="item">B</div>
+    <div id="item3" class="item">C</div>
+  </div>
+</body>
+<script>
+  function assert_has_animations_with_name(name, count, message) {
+    const results =
+        document.getAnimations().filter(a => a.animationName == name);
+    assert_equals(results.length, count, message);
+  }
+
+  promise_test(async t => {
+    const element = document.getElementById("container");
+    const vt = element.startViewTransition(() => {
+      element.querySelectorAll('.item').forEach(el => {
+        el.classList.toggle('active');
+      });
+    });
+    await vt.ready;
+    const results =
+        document.getAnimations().map((a) => {
+          return `${a.effect.target.id}${a.effect.pseudoElement}`;
+      }).sort();
+    const expected = [
+      'container::view-transition-group(match-element)',
+      'container::view-transition-group(match-element)',
+      'container::view-transition-group(match-element)',
+      'container::view-transition-new(match-element)',
+      'container::view-transition-new(match-element)',
+      'container::view-transition-new(match-element)',
+      'container::view-transition-old(match-element)',
+      'container::view-transition-old(match-element)',
+      'container::view-transition-old(match-element)',
+    ];
+
+    assert_array_equals(results, expected, 'Matched pseudo-elements');
+
+    assert_has_animations_with_name('-ua-view-transition-fade-in', 3,
+                                    'Fade in animation');
+    assert_has_animations_with_name('-ua-view-transition-fade-out', 3,
+                                    'Fade out animation');
+  }, 'Scoped view transition with name auto on the scoped element');
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/scoped/auto-name.html b/tests/wpt/tests/css/css-view-transitions/scoped/auto-name.html
new file mode 100644
index 00000000000..2d11985b398
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/scoped/auto-name.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <!-- TODO update link -->
+  <link rel="help" href="https://www.w3.org/TR/css-view-transitions-2/">
+  <title>Scoped element with name auto</title>
+</head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #container {
+    display: flex;
+    flex-direction: row;
+    view-transition-name: auto;
+    position: relative;
+  }
+
+  .item {
+    background-color: teal;
+    color: white;
+    text-align: center;
+    line-height: 50px;
+    width: 50px;
+    height: 50px;
+    margin: 5px;
+    display: inline-block;
+  }
+
+  ::view-transition-group(*) {
+    animation-duration: 2s;
+  }
+
+  ::view-transition-old(*) {
+    animation-name: -ua-view-transition-fade-out;
+  }
+
+  ::view-transition-new(*) {
+    animation-name: -ua-view-transition-fade-in;
+  }
+</style>
+<body>
+  <div id="container">
+    <div class="item">A</div>
+    <div class="item">B</div>
+    <div class="item">C</div>
+  </div>
+</body>
+<script>
+  function assert_has_animation_with_name(name, message) {
+    const results =
+        document.getAnimations().filter(a => a.animationName == name);
+    assert_equals(results.length, 1, message);
+  }
+
+  promise_test(async t => {
+    const element = document.getElementById("container");
+    const vt = element.startViewTransition(() => {
+      element.style.flexDirection = 'column';
+    });
+    await vt.ready;
+    const results =
+        document.getAnimations().map((a) => {
+          return `${a.effect.target.id}${a.effect.pseudoElement}`;
+      }).sort();
+    const expected = [
+      'container::view-transition-group(match-element)',
+      'container::view-transition-new(match-element)',
+      'container::view-transition-old(match-element)',
+    ];
+
+    assert_array_equals(results, expected, 'Matched pseudo-elements');
+
+    assert_has_animation_with_name('-ua-view-transition-fade-in',
+                                   'Fade in animation');
+    assert_has_animation_with_name('-ua-view-transition-fade-out',
+                                   'Fade out animation');
+  }, 'Scoped view transition with name auto on the scoped element');
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/scoped/capture.html b/tests/wpt/tests/css/css-view-transitions/scoped/capture.html
new file mode 100644
index 00000000000..06f848d2de1
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/scoped/capture.html
@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <!-- TODO update link -->
+  <link rel="help" href="https://www.w3.org/TR/css-view-transitions-2/">
+  <title>Scope view transition capture</title>
+</head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style type="text/css">
+  .parent {
+    background-color: lightblue;
+    height: 200px;
+    width: 200px;
+    view-transition-name: parent;
+    position: relative;
+  }
+
+  .child {
+    background-color: blue;
+    height: 100px;
+    width: 100px;
+    view-transition-name: child;
+    position: absolute;
+    left: 50px;
+    top: 50px;
+  }
+
+  .sibling {
+    background-color: gray;
+    margin-top: 20px;
+    height: 200px;
+    width: 200px;
+    view-transition-name: sibling;
+  }
+
+  /* view transition pseudos */
+  ::view-transition-group(*),
+  ::view-transition-image-pair(*) {
+    animation: unset;
+  }
+
+  ::view-transition-old(*) {
+    animation: -ua-view-transition-fade-out 1s paused;
+  }
+
+  ::view-transition-new(*) {
+    animation: -ua-view-transition-fade-in 1s paused;
+  }
+
+</style>
+<body>
+  <div id="container"></div>
+</body>
+<script>
+  function createDiv(test, id, className) {
+    const element = document.createElement('div');
+    element.id = id;
+    element.className = className;
+    test.add_cleanup(() => {
+      element.remove();
+    });
+    return element;
+  }
+
+  function setupCaptureTest(test) {
+    const container = document.getElementById('container');
+    container.innerHTML = '';
+    const target1 = createDiv(test, 'target1', 'parent');
+    const target2 = createDiv(test, 'target2', 'child');
+    const target3 = createDiv(test, 'target3', 'sibling');
+    container.appendChild(target1);
+    target1.appendChild(target2);
+    container.appendChild(target3);
+    test.add_cleanup(() => {
+      document.getAnimations().forEach(a => a.cancel());
+    });
+  }
+
+  function assert_animations(target, filterFn, mappingFn, expected, message) {
+    const values = document.getAnimations()
+          .filter(filterFn)
+          .map(mappingFn)
+          .sort();
+
+    const format = entries => entries.join(", ");
+    assert_equals(format(values), format(expected), message);
+  }
+
+  function assert_animation_pseudos(element, expected, message) {
+    const filterFn = a => a.effect.target == element;
+    const mappingFn = a => a.effect.pseudoElement;
+    return assert_animations(element, filterFn, mappingFn, expected, message);
+  }
+
+  function assert_animation_names(target, expected, message) {
+    const filterFn = a => a.effect.pseudoElement == target;
+    const mappingFn = a => a.animationName;
+    return assert_animations(target, filterFn, mappingFn, expected, message);
+  }
+
+  promise_test(async t => {
+    setupCaptureTest(t);
+    const target = document.querySelector('.parent');
+    assert_true(!!target.startViewTransition,
+                'Missing scoped view transition support');
+
+    await target.startViewTransition({}).ready;
+
+    const expected_pseudos = [
+      '::view-transition-new(child)',
+      '::view-transition-new(parent)',
+      '::view-transition-old(child)',
+      '::view-transition-old(parent)'
+    ];
+    assert_animation_pseudos(target, expected_pseudos,
+                             'animations on target element pseudos');
+    assert_animation_pseudos(document.documentElement, [],
+                             'no animations targeting pseudos on root');
+    assert_animation_pseudos(document.querySelector('.sibling'), [],
+                             'no animations targetting pseudos on sibling');
+    assert_animation_pseudos(document.querySelector('.child'), [],
+                             'no animations targetting pseudos on child');
+
+    assert_animation_names('::view-transition-old(child)',
+                           ['-ua-view-transition-fade-out'],
+                           'fade out animation on old child');
+    assert_animation_names('::view-transition-old(parent)',
+                           ['-ua-view-transition-fade-out'],
+                           'fade out animation on old parent');
+    assert_animation_names('::view-transition-new(child)',
+                           ['-ua-view-transition-fade-in'],
+                           'fade in animation on new child');
+    assert_animation_names('::view-transition-new(parent)',
+                           ['-ua-view-transition-fade-in'],
+                           'fade in animation on new parent');
+  }, 'View-transition pseudo elements created for correct element');
+
+  promise_test(async t => {
+    setupCaptureTest(t);
+    const parent = document.querySelector('.parent');
+    const sibling = document.querySelector('.sibling');
+    assert_true(!!parent.startViewTransition,
+                'Missing scoped view transition support');
+
+    await parent.startViewTransition({}).ready;
+    await sibling.startViewTransition({}).ready;
+
+    const expected_parent_pseudos = [
+      '::view-transition-new(child)',
+      '::view-transition-new(parent)',
+      '::view-transition-old(child)',
+      '::view-transition-old(parent)'
+    ];
+    const expected_sibling_pseudos = [
+      '::view-transition-new(sibling)',
+      '::view-transition-old(sibling)'
+    ];
+    assert_animation_pseudos(parent, expected_parent_pseudos,
+                             'animations on parent element pseudos');
+    assert_animation_pseudos(sibling, expected_sibling_pseudos,
+                             'animations on sibling element pseudos');
+  }, 'Capture with concurrent scoped view-transitions');
+
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/scoped/content-ref.html b/tests/wpt/tests/css/css-view-transitions/scoped/content-ref.html
new file mode 100644
index 00000000000..1216fdfa850
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/scoped/content-ref.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+
+body { margin: 20px }
+#scope {
+  position: relative; z-index: 0; background: pink;
+  border: 5px dashed purple; padding: 5px;
+  width: 180px; height: 120px;
+}
+#part {
+  position: relative; z-index: 0; background: lightgrey;
+  border: 5px solid blue; padding: 5px;
+  width: 120px; height: 60px;
+  left: 20px; top: 20px;
+  view-transition-name: foo;
+}
+
+#scope-client-area {
+  position: absolute; inset: 0; padding: 5px;
+  background: yellow;
+}
+
+</style>
+</head>
+<body>
+<div id=scope>
+  <div id=scope-client-area>
+    <div id=part>
+      PARTICIPANT
+    </div>
+  </div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/scoped/crashtests/shadow-dom.html b/tests/wpt/tests/css/css-view-transitions/scoped/crashtests/shadow-dom.html
new file mode 100644
index 00000000000..a2faafc1694
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/scoped/crashtests/shadow-dom.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html class="test-wait">
+<body>
+<meter><div id="node1"></div></meter>
+<div>
+  <template shadowrootmode="open"></template>
+  <div id="node2"></div>
+</div>
+<div style="display:none">
+  <div id="node3"></div>
+</div>
+<script>
+  const tr1 = node1.startViewTransition();
+  const tr2 = node2.startViewTransition();
+  const tr3 = node3.startViewTransition();
+  onload = async () => {
+    await tr1.finished;
+    await tr2.finished;
+    await tr3.finished;
+    document.documentElement.classList.remove('test-wait');
+  }
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/scoped/display-none-during-transition.html b/tests/wpt/tests/css/css-view-transitions/scoped/display-none-during-transition.html
new file mode 100644
index 00000000000..f94d6f7fd76
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/scoped/display-none-during-transition.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <!-- TODO update link -->
+  <link rel="help" href="https://www.w3.org/TR/css-view-transitions-2/">
+  <title>Display none during transition</title>
+</head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #target {
+    background-color: teal;
+    height: 100px;
+    width: 100px;
+    position: relative;
+    view-transition-name: target;
+  }
+
+  .hidden {
+    display: none;
+  }
+
+  ::view-transition-group(*) {
+    animation: unset;
+  }
+
+  ::view-transition-old(target) {
+    animation: -ua-view-transition-fade-out 300s;
+  }
+
+  ::view-transition-new(target) {
+    animation: -ua-view-transition-fade-in 300s;
+  }
+
+</style>
+<body>
+  <div id="target")></div>
+</body>
+<script>
+  function animationsCanceledPromise() {
+    const animations = document.getAnimations();
+    const promises = animations.map(a => a.finished);
+    return new Promise(async (resolve) => {
+      const values = await Promise.allSettled(promises);
+      values.forEach((result) => {
+        assert_equals(result.status, 'rejected');
+      });
+      resolve();
+    });
+  }
+
+  promise_test(async t => {
+    const target = document.getElementById('target');
+    const vt = target.startViewTransition(() => {
+      target.style.backgroundColor = 'orange';
+    });
+    await vt.ready;
+    const animations = document.getAnimations();
+    assert_equals(animations.length, 2,
+                  'View transition has running animations');
+    // wait for all animations to start running before hiding target.
+    await Promise.all([...animations.map(a => a.ready)]);
+    target.classList.toggle('hidden');
+    // Verify that the finished promise is rejected for each of the started
+    // animations.
+    await animationsCanceledPromise();
+    // Verify finished promise is resolved even though the transition did not
+    // run to completion.
+    return vt.finished;
+  }, 'Display none during a view transition skips the transition.');
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/scoped/document-element-start-view-transition.html b/tests/wpt/tests/css/css-view-transitions/scoped/document-element-start-view-transition.html
new file mode 100644
index 00000000000..42f87f93a07
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/scoped/document-element-start-view-transition.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <!-- TODO update link -->
+  <link rel="help" href="https://www.w3.org/TR/css-view-transitions-2/">
+  <title>startViewTransition on document.documentElement</title>
+  <link rel="help" href="https://www.w3.org/TR/css-view-transitions-1/">
+</head>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style>
+  :root {
+    view-transition-name: none;
+  }
+  #target {
+    width: 100px;
+    height: 100px;
+    background: blue;
+    contain: paint;
+    view-transition-name: target;
+  }
+  #target.update-1 {
+    height: 150px;
+  }
+  #target.update-2 {
+    height: 200px;
+  }
+</style>
+
+<body>
+  <div id="target"></div>
+</body>
+<script>
+  function run_view_transtiion_test(scope1, scope2, message) {
+    promise_test(async t => {
+      let rejected_promise_tally = 0;
+      const target = document.getElementById("target");
+      assert_implements(document.startViewTransition,
+                        "Missing document.startViewTransition");
+
+      const verifyAbortedTransition = (promise) => {
+        return promise.then(
+          () => { assert_not_reached('transition aborted') },
+          (reason) => {
+            assert_true(reason instanceof DOMException);
+            assert_equals(reason.code, DOMException.ABORT_ERR);
+            rejected_promise_tally++;
+          });
+      };
+
+      const vt1 = scope1.startViewTransition(() => {
+        target.className = 'update-1';
+      });
+      const vt2 = scope2.startViewTransition(() => {
+        assert_equals(target.className, 'update-1');
+        target.className = 'update-2';
+      });
+
+      await verifyAbortedTransition(vt1.ready);
+      await vt2.ready;
+
+      assert_equals(rejected_promise_tally, 1,
+                    'first transition is skipped');
+      const sizeTransformAnimations = document.getAnimations().filter(a => {
+        return 'height' in a.effect.getKeyframes()[0];
+      });
+      assert_equals(sizeTransformAnimations.length, 1);
+      const startingHeight =
+          sizeTransformAnimations[0].effect.getKeyframes()[0].height;
+
+      assert_equals(startingHeight, '150px',
+                    'Height change applied before capture');
+    }, message);
+  }
+
+  run_view_transtiion_test(
+      document, document.documentElement,
+      'Synchronously starting a view transition on document.documentElement ' +
+      'skips the previously active document view transition.');
+
+  run_view_transtiion_test(
+      document.documentElement, document,
+      'Synchronously starting a view transition on document skips the ' +
+      'previously active view transition on document.documentElement.');
+
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/scoped/new-content.html b/tests/wpt/tests/css/css-view-transitions/scoped/new-content.html
new file mode 100644
index 00000000000..7302f7c4f8e
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/scoped/new-content.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<head>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
+<link rel="match" href="content-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<style>
+
+body { margin: 20px }
+#scope {
+  position: relative; z-index: 0; background: pink;
+  border: 5px dashed purple; padding: 5px;
+  width: 180px; height: 120px;
+}
+#part {
+  position: relative; z-index: 0; background: lightgrey;
+  border: 5px solid blue; padding: 5px;
+  width: 120px; height: 60px;
+  left: 20px; top: 20px;
+  view-transition-name: foo;
+}
+
+/* TODO(crbug.com/405117185): This shouldn't be necessary. */
+:root { view-transition-name: none; }
+
+#scope::view-transition { background: yellow; }
+#scope::view-transition-group(foo) { animation-play-state: paused; }
+#scope::view-transition-new(foo) { animation: unset; opacity: 1; }
+#scope::view-transition-old(foo) { animation: unset; opacity: 0; }
+
+</style>
+</head>
+<body>
+<div id=scope>
+  <div id=part>
+    PARTICIPANT
+  </div>
+</div>
+<script>
+
+const scope = document.querySelector("#scope");
+failIfNot(scope.startViewTransition, "Missing element.startViewTransition");
+
+async function runTest() {
+  await waitForCompositorReady();
+  scope.startViewTransition(() => requestAnimationFrame(takeScreenshot));
+}
+onload = () => runTest();
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/scoped/old-content.html b/tests/wpt/tests/css/css-view-transitions/scoped/old-content.html
new file mode 100644
index 00000000000..82b45eb75f4
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/scoped/old-content.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<head>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/">
+<link rel="match" href="content-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<style>
+
+body { margin: 20px }
+#scope {
+  position: relative; z-index: 0; background: pink;
+  border: 5px dashed purple; padding: 5px;
+  width: 180px; height: 120px;
+}
+#part {
+  position: relative; z-index: 0; background: lightgrey;
+  border: 5px solid blue; padding: 5px;
+  width: 120px; height: 60px;
+  left: 20px; top: 20px;
+  view-transition-name: foo;
+}
+
+/* TODO(crbug.com/405117185): This shouldn't be necessary. */
+:root { view-transition-name: none; }
+
+#scope::view-transition { background: yellow; }
+#scope::view-transition-group(foo) { animation-play-state: paused; }
+#scope::view-transition-new(foo) { animation: unset; opacity: 0; }
+#scope::view-transition-old(foo) { animation: unset; opacity: 1; }
+
+</style>
+</head>
+<body>
+<div id=scope>
+  <div id=part>
+    PARTICIPANT
+  </div>
+</div>
+<script>
+
+const scope = document.querySelector("#scope");
+failIfNot(scope.startViewTransition, "Missing element.startViewTransition");
+
+async function runTest() {
+  await waitForCompositorReady();
+  scope.startViewTransition(() => requestAnimationFrame(takeScreenshot));
+}
+onload = () => runTest();
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/scoped/run_in_parallel.html b/tests/wpt/tests/css/css-view-transitions/scoped/run_in_parallel.html
new file mode 100644
index 00000000000..1afdae2be9d
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/scoped/run_in_parallel.html
@@ -0,0 +1,128 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <!-- TODO update link -->
+  <link rel="help" href="https://www.w3.org/TR/css-view-transitions-2/">
+  <title>Scope view transitions run in parallel</title>
+</head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style type="text/css">
+  .block {
+    background-color: blue;
+    position: relative;
+    height: 100px;
+    width: 100px;
+    margin: 50px;
+  }
+
+  #target1 {
+    view-transition-name: a;
+  }
+
+  #target2 {
+    view-transition-name: b;
+  }
+
+  ::view-transition-group(*),
+  ::view-transition-image-pair(*),
+  ::view-transition-old(*) {
+    animation: unset;
+  }
+
+  ::view-transition-old(*) {
+    opacity: 0;
+  }
+
+  @keyframes stylize {
+    from {
+      opacity: 0.5;
+    }
+    to {
+      opacity: 1.0;
+    }
+  }
+  ::view-transition-new(*) {
+    animation: stylize 1s paused;
+  }
+
+</style>
+<body>
+  <div id="target1" class="block"></div>
+  <div id="target2" class="block"></div>
+</body>
+<script type="text/javascript">
+
+  async function run_parallel_scoped_view_transition_test(
+      transition_update_callback,
+      message) {
+    promise_test(async t => {
+      const vt1 = target1.startViewTransition(() => {});
+      const vt2 = target2.startViewTransition(() => {});
+      await Promise.all([vt1.ready, vt2.ready]);
+
+      let list = document.getAnimations().map(a => {
+        return `${a.effect.pseudoElement}:${a.animationName}`;
+      });
+      let expected = [
+        '::view-transition-new(a):stylize',
+        '::view-transition-new(b):stylize'
+      ];
+      assert_array_equals(list, expected, 'Before callback');
+      assert_equals(
+        getComputedStyle(target1, "::view-transition-new(a)")
+                             .getPropertyValue("opacity"),
+                         "0.5");
+      assert_equals(
+        getComputedStyle(target2, "::view-transition-new(b)")
+                             .getPropertyValue("opacity"),
+                         "0.5");
+
+      transition_update_callback(vt1);
+      await vt1.finished.then(
+        () => {},
+        () => {
+          // The only case where the finished promise should not be resolved is
+          // when the DOM update callback returns a rejected promise.
+          assert_unreached('Finished promise should have been resolved');
+        });
+
+      list = document.getAnimations().map(a => {
+        return `${a.effect.pseudoElement}:${a.animationName}`;
+      });
+      assert_array_equals(list, [`::view-transition-new(b):stylize`],
+                          'After callback');
+      assert_equals(
+        getComputedStyle(target2, "::view-transition-new(b)")
+                             .getPropertyValue("opacity"),
+                         "0.5");
+    }, message);
+  }
+
+  run_parallel_scoped_view_transition_test(
+      (vt) => {
+        vt.skipTransition();
+      },
+      'Concurrent transition keeps running after transition skipped');
+
+  run_parallel_scoped_view_transition_test(
+      () => {
+        document.getAnimations().filter(a => {
+          return a.effect.target.id == 'target1';
+        }).forEach(a => {
+          a.finish();
+        });
+      }, 'Concurrent transition keeps running after transition finished');
+
+  run_parallel_scoped_view_transition_test(
+      () => {
+        document.getAnimations().filter(a => {
+          return a.effect.target.id == 'target1';
+        }).forEach(a => {
+          a.cancel();
+        });
+      }, 'Concurrent transition keeps running after transition canceled');
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-absolute.html b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-absolute.html
index 91b71f7eec9..a8a03b62e19 100644
--- a/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-absolute.html
+++ b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-absolute.html
@@ -35,6 +35,7 @@ body {
 
 ::view-transition-group(target) {
   animation-duration: 50s;
+  animation-play-state: paused;
   top: unset;
   left: unset;
   right: 0px;
@@ -50,6 +51,16 @@ body {
   background-color: limegreen;
 }
 
+::view-transition-old(*) {
+  animation: unset;
+  opacity: 1;
+}
+
+::view-transition-new(*) {
+  animation: unset;
+  opacity: 0;
+}
+
 </style>
 
 <div id="target">TARGET</div>
diff --git a/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-static-iframe-ref.html b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-static-iframe-ref.html
new file mode 100644
index 00000000000..188cefecd3d
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-static-iframe-ref.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<title>View transitions: use snapshot containing block for static position in iframe (ref)</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-1/#snapshot-containing-block-concept/">
+
+<style>
+#inner {
+  width: 400px;
+  height: 200px;
+}
+</style>
+<iframe id="inner" srcdoc="
+  <style>
+  body {
+    height: 200vh;
+    background: limegreen;
+    overflow: hidden;
+  }
+  </style>
+  <body></body>
+"></iframe>
+
+<script>
+onload = () => {
+  inner.contentWindow.scrollTo(0, 100);
+};
+</script>
diff --git a/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-static-iframe.html b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-static-iframe.html
new file mode 100644
index 00000000000..1903b9cacbd
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-static-iframe.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>View transitions: use snapshot containing block for static position in iframe</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-1/#snapshot-containing-block-concept/">
+<link rel="match" href="snapshot-containing-block-static-iframe-ref.html">
+
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/rendering-utils.js"></script>
+
+<style>
+#inner {
+  width: 400px;
+  height: 200px;
+}
+</style>
+<iframe id="inner" srcdoc="
+  <style>
+  body {
+    height: 200vh;
+    overflow: hidden;
+  }
+  ::view-transition {
+    position: static;
+    display: block;
+    width: 100%;
+    height: 100%;
+    background: limegreen;
+  }
+  ::view-transition-group(*),
+  ::view-transition-image-pair(*),
+  ::view-transition-old(*),
+  ::view-transition-new(*) {
+    animation-play-state: paused;
+  }
+
+  </style>
+  <body></body>
+"></iframe>
+<script>
+failIfNot(document.startViewTransition, "Missing document.startViewTransition");
+
+async function runTest() {
+  // Start the view transition at a scroll offset so that the snapshot
+  // containing block differs from the initial containing block.
+  inner.contentWindow.scrollTo(0, 100);
+  await waitForAtLeastOneFrame();
+
+  const contentDocument = inner.contentDocument;
+  let vt = inner.contentDocument.startViewTransition();
+  await vt.ready;
+  takeScreenshot();
+}
+
+onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
+</script>
diff --git a/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-static.html b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-static.html
index 44fe4cfc5e6..fcea95e6efd 100644
--- a/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-static.html
+++ b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-static.html
@@ -33,8 +33,11 @@ div {
   view-transition-name: target;
 }
 
-::view-transition-group(target) {
-  animation-duration: 50s;
+::view-transition-group(target),
+::view-transition-image-pair(target),
+::view-transition-old(target),
+::view-transition-new(target) {
+  animation-play-state: paused;
 }
 
 ::view-transition {
diff --git a/tests/wpt/tests/css/css-view-transitions/start-skip-start.html b/tests/wpt/tests/css/css-view-transitions/start-skip-start.html
new file mode 100644
index 00000000000..e04979472f1
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/start-skip-start.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Test start skip and then start on a view transition</title>
+  <link rel="help" href="https://www.w3.org/TR/css-view-transitions-1/">
+</head>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style>
+  :root {
+    view-transition-name: none;
+  }
+  #target {
+    width: 100px;
+    height: 100px;
+    background: blue;
+    contain: paint;
+    view-transition-name: target;
+  }
+  #target.update-1 {
+    height: 150px;
+  }
+  #target.update-2 {
+    height: 200px;
+  }
+</style>
+
+<body>
+  <div id="target"></div>
+</body>
+<script>
+  promise_test(async t => {
+    let rejected_promise_tally = 0;
+    const target = document.getElementById("target");
+    assert_implements(document.startViewTransition,
+                      "Missing document.startViewTransition");
+
+    const verifyAbortedTransition = (promise) => {
+      return promise.then(
+        () => { assert_not_reached('transition aborted') },
+        (reason) => {
+          assert_true(reason instanceof DOMException);
+          assert_equals(reason.code, DOMException.ABORT_ERR);
+          rejected_promise_tally++;
+        });
+    };
+
+    const vt1 = document.startViewTransition(() => {
+      target.className = 'update-1';
+    });
+
+    vt1.skipTransition();
+    const vt2 = document.startViewTransition(() => {
+      assert_equals(target.className, 'update-1');
+      target.className = 'update-2';
+    });
+
+    vt2.skipTransition();
+    const vt3 = document.startViewTransition(() => {
+      assert_equals(target.className, 'update-2');
+    });
+
+    await verifyAbortedTransition(vt1.ready);
+    await verifyAbortedTransition(vt2.ready);
+    await vt3.ready;
+
+    assert_equals(rejected_promise_tally, 2,
+                  'first 2 transitions were skipped');
+    const sizeTransformAnimations = document.getAnimations().filter(a => {
+      return 'height' in a.effect.getKeyframes()[0];
+    });
+    assert_equals(sizeTransformAnimations.length, 1);
+    const startingHeight =
+        sizeTransformAnimations[0].effect.getKeyframes()[0].height;
+
+    assert_equals(startingHeight, '200px',
+                  'Height change applied before capture');
+
+  }, 'Synchronously starting a view transition blocks on DOM callback for ' +
+     'previously skipped transitions');
+
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/to-keyframe-values.html b/tests/wpt/tests/css/css-view-transitions/to-keyframe-values.html
new file mode 100644
index 00000000000..f50cf993ee8
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/to-keyframe-values.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<title>CSS View Transitions: Verify to keyframe values</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-1/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+:root { view-transition-name: none }
+#item {
+  view-transition-name: item;
+  width: 10px;
+  height: 10px;
+  position: relative;
+}
+.shifted {
+  left: 20px;
+}
+::view-transition-group(*) {
+  animation-play-state: paused;
+}
+</style>
+<div id=item></div>
+
+<script>
+async_test((t) => {
+  document.startViewTransition(() => item.classList.add("shifted")).ready.then(() => {
+    let anims = document.getAnimations().filter(a => {
+      return a.effect.pseudoElement == '::view-transition-group(item)';
+    });
+
+    t.step(() => {
+      assert_equals(anims.length, 1);
+      assert_equals(anims[0].effect.getKeyframes().length, 2);
+      assert_true(anims[0].effect.getKeyframes()[0].transform.startsWith("matrix"),
+        `keyframe[0] should be matrix, not ${anims[0].effect.getKeyframes()[0].transform}`);
+      assert_true(anims[0].effect.getKeyframes()[1].transform.startsWith("matrix"),
+        `keyframe[1] should be matrix, not ${anims[0].effect.getKeyframes()[1].transform}`);
+    });
+    t.done();
+  });
+});
+</script>
diff --git a/tests/wpt/tests/css/css-view-transitions/update-callback-called-once.html b/tests/wpt/tests/css/css-view-transitions/update-callback-called-once.html
index c84368c95c4..cd27df6dafd 100644
--- a/tests/wpt/tests/css/css-view-transitions/update-callback-called-once.html
+++ b/tests/wpt/tests/css/css-view-transitions/update-callback-called-once.html
@@ -11,6 +11,13 @@
         height: 100px;
         background-color: red;
     }
+
+    ::view-transition-group(*),
+    ::view-transition-image-pair(*),
+    ::view-transition-old(*),
+    ::view-transition-new(*) {
+      animation-play-state: paused;
+    }
 </style>
 <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 <div id="target"></div>
diff --git a/tests/wpt/tests/css/css-view-transitions/view-transition-name-stacking-context-dynamic.html b/tests/wpt/tests/css/css-view-transitions/view-transition-name-stacking-context-dynamic.html
new file mode 100644
index 00000000000..1a908e6f659
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/view-transition-name-stacking-context-dynamic.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<meta charset="utf-8">
+<title>CSS will-change: 'will-change: view-transition-name' creates a stacking context dynamically</title>
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1962862">
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-1/#named-and-transitioning">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square-only.html">
+<style>
+div { width: 100px; height: 100px }
+#wc { background: red; position: relative; }
+#child { position: absolute; top: 0; left: 0; z-index: -1; background: green }
+</style>
+<p>Test passes if there is a filled green square.</p>
+<div id="wc">
+  <div id="child"></div>
+</div>
+<script>
+window.addEventListener("TestRendered", function() {
+  wc.style.viewTransitionName = "something";
+  document.documentElement.removeAttribute("class");
+});
+</script>
diff --git a/tests/wpt/tests/css/css-view-transitions/view-transition-types-matches-case-sensitive-ref.html b/tests/wpt/tests/css/css-view-transitions/view-transition-types-matches-case-sensitive-ref.html
new file mode 100644
index 00000000000..6a9af3f8286
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/view-transition-types-matches-case-sensitive-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+
+<style>
+.test {
+  width: 100px;
+  height: 100px;
+  background: green;
+}
+
+#container {
+  display: flex;
+  flex-direction: row;
+  gap: 10px;
+}
+
+body { background: lightpink; }
+</style>
+
+<div id="container">
+  <div class="test"></div>
+  <div class="test"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-view-transitions/view-transition-types-matches-case-sensitive.html b/tests/wpt/tests/css/css-view-transitions/view-transition-types-matches-case-sensitive.html
new file mode 100644
index 00000000000..411c73c607a
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/view-transition-types-matches-case-sensitive.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+
+<html class="reftest-wait">
+
+<title>View transitions: active-view-transition-type should treat types as case-sensitive</title>
+
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-2/#the-active-view-transition-type-pseudo">
+<link rel="author" href="mailto:kiet.ho@apple.com">
+<link rel="match" href="view-transition-types-matches-case-sensitive-ref.html">
+
+<script src="/common/reftest-wait.js"></script>
+
+<style>
+html:active-view-transition-type(foo) #positive1 { background: green; }
+html:active-view-transition-type(Foo) #positive1 { background: red; }
+html:active-view-transition-type(FoO) #positive1 { background: magenta; }
+html:active-view-transition-type(FOo) #positive1 { background: black; }
+
+html:active-view-transition-type(Bar) #positive2 { background: green; }
+html:active-view-transition-type(bar) #positive2 { background: red; }
+html:active-view-transition-type(bAr) #positive2 { background: magenta; }
+html:active-view-transition-type(baR) #positive2 { background: black; }
+
+#positive1 { view-transition-name: positive1; background: yellow; }
+#positive2 { view-transition-name: positive2; background: yellow; }
+
+.test {
+  width: 100px;
+  height: 100px;
+}
+
+#container {
+  display: flex;
+  flex-direction: row;
+  gap: 10px;
+}
+
+html::view-transition-group(*) {
+  animation-play-state: paused;
+}
+
+html::view-transition-new(*) {
+  animation: unset;
+  opacity: 0;
+}
+
+html::view-transition-old(*) {
+  animation: unset;
+  opacity: 1;
+}
+
+html::view-transition-group(root) {
+  display: none;
+}
+
+html::view-transition { background: lightpink; }
+</style>
+
+<div id="container">
+  <div class="test" id="positive1"></div>
+  <div class="test" id="positive2"></div>
+</div>
+
+<script>
+failIfNot(document.startViewTransition, "Missing document.startViewTransition");
+
+function runTest() {
+  let transition = document.startViewTransition({
+    types: ["foo", "Bar"]
+  });
+  transition.ready.then(takeScreenshot);
+}
+onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
+</script>
+
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/view-transition-types-mutable-no-document-element-crashtest.html b/tests/wpt/tests/css/css-view-transitions/view-transition-types-mutable-no-document-element-crashtest.html
index f1940c39869..3ac946b273b 100644
--- a/tests/wpt/tests/css/css-view-transitions/view-transition-types-mutable-no-document-element-crashtest.html
+++ b/tests/wpt/tests/css/css-view-transitions/view-transition-types-mutable-no-document-element-crashtest.html
@@ -3,16 +3,30 @@
 <link rel="help" href="https://www.w3.org/TR/css-transitions-2/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/dom/events/scrolling/scroll_support.js"></script>
+
+<style>
+::view-transition-group(*),
+::view-transition-image-pair(*),
+::view-transition-old(*),
+::view-transition-new(*) {
+  animation-play-state: paused;
+}
+</style>
 <script>
 
-  test(() => {
-    assert_implements(document.startViewTransition);
+promise_test(async () => {
+  assert_implements(document.startViewTransition);
 
-    const { types } = document.startViewTransition();
-    document.documentElement.remove();
-    types.add("a");
-    assert_array_equals([...types], ["a"]);
-  }, "ViewTransitionTypeSet should not crash when documentElement is null");
+  await new Promise((r) => requestAnimationFrame(() => {
+    waitForCompositorReady().then(r);
+  }));
+
+  const { types } = document.startViewTransition();
+  document.documentElement.remove();
+  types.add("a");
+  assert_array_equals([...types], ["a"]);
+}, "ViewTransitionTypeSet should not crash when documentElement is null");
 </script>
 
 </html>
diff --git a/tests/wpt/tests/css/css-view-transitions/window-resize-aborts-transition-before-ready.html b/tests/wpt/tests/css/css-view-transitions/window-resize-aborts-transition-before-ready.html
index 3c4ba37b26b..09e6e6cc1c9 100644
--- a/tests/wpt/tests/css/css-view-transitions/window-resize-aborts-transition-before-ready.html
+++ b/tests/wpt/tests/css/css-view-transitions/window-resize-aborts-transition-before-ready.html
@@ -37,9 +37,11 @@ promise_test(async t => {
 
   // Wait until the popup window is loaded to make sure the document we start
   // the view transitions is the right one.
-  await new Promise(resolve => {
-    popup_win.addEventListener('load', resolve, { once: true });
-  });
+  if (!popup_win.document || popup_win.document.readyState != 'complete') {
+    await new Promise(resolve => {
+      popup_win.addEventListener('load', resolve, { once: true });
+    });
+  }
 
   if (popup_win.document.visibilityState == "hidden") {
     await new Promise((resolve) => {
diff --git a/tests/wpt/tests/css/css-view-transitions/window-resize-aborts-transition.html b/tests/wpt/tests/css/css-view-transitions/window-resize-aborts-transition.html
index 8d61a3e3c53..966f23c0fdf 100644
--- a/tests/wpt/tests/css/css-view-transitions/window-resize-aborts-transition.html
+++ b/tests/wpt/tests/css/css-view-transitions/window-resize-aborts-transition.html
@@ -37,9 +37,11 @@ promise_test(async t => {
 
   // Wait until the popup window is loaded to make sure the document we update
   // below is the right one.
-  await new Promise(resolve => {
-    popupWin.addEventListener('load', resolve, { once: true });
-  });
+  if (!popupWin.document || popupWin.document.readyState != 'complete') {
+    await new Promise(resolve => {
+      popupWin.addEventListener('load', resolve, { once: true });
+    });
+  }
 
   let popupDoc = popupWin.document;
   popupDoc.documentElement.innerHTML = `
diff --git a/tests/wpt/tests/css/css-viewport/zoom/font-size-keyword-specified-ref.html b/tests/wpt/tests/css/css-viewport/zoom/font-size-keyword-specified-ref.html
new file mode 100644
index 00000000000..3395465c5d5
--- /dev/null
+++ b/tests/wpt/tests/css/css-viewport/zoom/font-size-keyword-specified-ref.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<title>CSS zoom applies to font-size when specified by keywords</title>
+<div style="font-size: medium">
+    <div style="zoom: 2">This is some zoomed medium text</div>
+</div>
diff --git a/tests/wpt/tests/css/css-viewport/zoom/font-size-keyword-specified.html b/tests/wpt/tests/css/css-viewport/zoom/font-size-keyword-specified.html
new file mode 100644
index 00000000000..fc724307f46
--- /dev/null
+++ b/tests/wpt/tests/css/css-viewport/zoom/font-size-keyword-specified.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<title>CSS zoom applies to font-size when specified by keywords</title>
+<link rel="help" href="https://drafts.csswg.org/css-viewport/">
+<link rel="match" href="font-size-keyword-specified-ref.html">
+<div style="zoom: 2">
+    <div style="font-size: medium">This is some zoomed medium text</div>
+</div>
diff --git a/tests/wpt/tests/css/css-viewport/zoom/iframe-very-small-zoom-001-crash.html b/tests/wpt/tests/css/css-viewport/zoom/iframe-very-small-zoom-001-crash.html
new file mode 100644
index 00000000000..05369040456
--- /dev/null
+++ b/tests/wpt/tests/css/css-viewport/zoom/iframe-very-small-zoom-001-crash.html
@@ -0,0 +1,4 @@
+<style>
+* { zoom: 13% }
+</style>
+<iframe>
diff --git a/tests/wpt/tests/css/css-viewport/zoom/zoom-iframe-dynamic.html b/tests/wpt/tests/css/css-viewport/zoom/zoom-iframe-dynamic.html
new file mode 100644
index 00000000000..1836408fb33
--- /dev/null
+++ b/tests/wpt/tests/css/css-viewport/zoom/zoom-iframe-dynamic.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Mozilla" href="https://mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-viewport/">
+<title>Dynamic CSS zoom change on iframe</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<iframe srcdoc="Child frame"></iframe>
+<script>
+const iframe = document.querySelector("iframe");
+
+function promiseDpiChange(win, expected) {
+  // There might be multiple resize events, wait for the one that changes the device pixel ratio to the expected value.
+  return new Promise(resolve => {
+    win.addEventListener("resize", function listener() {
+      if (win.devicePixelRatio == expected) {
+        win.removeEventListener("resize", listener);
+        resolve();
+      }
+    });
+  });
+}
+
+promise_test(async function(t) {
+  if (document.readyState != "complete") {
+    await new Promise(r => addEventListener("load", r, { once: true }));
+  }
+
+  let parentDpi = window.devicePixelRatio;
+  let origSize = iframe.getBoundingClientRect();
+  assert_equals(parentDpi, iframe.contentWindow.devicePixelRatio, "DPI should match between frame and parent");
+  iframe.style.zoom = 2;
+  await promiseDpiChange(iframe.contentWindow, 2 * parentDpi);
+  assert_equals(iframe.contentWindow.devicePixelRatio, 2 * parentDpi, "DPI should have doubled on the frame");
+  assert_equals(iframe.getBoundingClientRect().width, origSize.width * 2, "Width should have doubled as well");
+  assert_equals(iframe.getBoundingClientRect().height, origSize.height * 2, "Height should have doubled as well");
+});
+</script>
diff --git a/tests/wpt/tests/css/css-viewport/zoom/zoom-revert-layer-crash.html b/tests/wpt/tests/css/css-viewport/zoom/zoom-revert-layer-crash.html
new file mode 100644
index 00000000000..c75b792e6de
--- /dev/null
+++ b/tests/wpt/tests/css/css-viewport/zoom/zoom-revert-layer-crash.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<title>Don't crash when zooming revert-layer</title>
+<link rel="help" href="https://issues.chromium.org/issues/398060133">
+<span style="zoom: 101%; line-height: revert-layer">PASS if no crash</span>
diff --git a/tests/wpt/tests/css/css-writing-modes/available-size-020.html b/tests/wpt/tests/css/css-writing-modes/available-size-020.html
index bf09886f30a..f20dfe1199a 100644
--- a/tests/wpt/tests/css/css-writing-modes/available-size-020.html
+++ b/tests/wpt/tests/css/css-writing-modes/available-size-020.html
@@ -28,7 +28,9 @@ aside   { writing-mode: vertical-rl; width: 2em; overflow: hidden; color: blue;
 html { overflow: hidden; /* avoid scrollbar variance */ }
 </style>
 
-<p style="transform-origin: top right; transform: rotate(-90deg); height: max-content">Test passes if the first five boxes are identical, and the last four boxes are identical.
+<p style="transform-origin: top right; transform: rotate(-90deg); height: max-content">
+Test passes if the first five boxes are identical, the next three boxes are identical,
+and the last one is taller.
 
 <article class="fixed">
   <div>
@@ -60,12 +62,6 @@ html { overflow: hidden; /* avoid scrollbar variance */ }
   </div>
 </article>
 
-<article class="large-parent">
-  <div>
-    <aside>abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde</aside>
-  </div>
-</article>
-
 <article class="min-large-parent">
   <div>
     <aside>abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde</aside>
@@ -78,9 +74,15 @@ html { overflow: hidden; /* avoid scrollbar variance */ }
   </div>
 </article>
 
-
 <article class="full">
   <div>
     <aside>abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde</aside>
   </div>
 </article>
+
+<article class="large-parent">
+  <div>
+    <aside>abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde</aside>
+  </div>
+</article>
+
diff --git a/tests/wpt/tests/css/css-writing-modes/available-size-021.html b/tests/wpt/tests/css/css-writing-modes/available-size-021.html
index 4547ba1934f..63c50fd07d8 100644
--- a/tests/wpt/tests/css/css-writing-modes/available-size-021.html
+++ b/tests/wpt/tests/css/css-writing-modes/available-size-021.html
@@ -36,7 +36,9 @@ div {
 }
 </style>
 
-<p style="transform-origin: top right; transform: rotate(-90deg); height: max-content">Test passes if the first five boxes are identical, and the last four boxes are identical.
+<p style="transform-origin: top right; transform: rotate(-90deg); height: max-content">
+Test passes if the first five boxes are identical, the next three boxes are identical,
+and the last one is taller.
 
 <article class="fixed">
   <div>
@@ -68,12 +70,6 @@ div {
   </div>
 </article>
 
-<article class="large-parent">
-  <div>
-    <aside>abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde</aside>
-  </div>
-</article>
-
 <article class="min-large-parent">
   <div>
     <aside>abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde</aside>
@@ -86,9 +82,14 @@ div {
   </div>
 </article>
 
-
 <article class="full">
   <div>
     <aside>abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde</aside>
   </div>
 </article>
+
+<article class="large-parent">
+  <div>
+    <aside>abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde</aside>
+  </div>
+</article>
diff --git a/tests/wpt/tests/css/css-writing-modes/orthogonal-dynamic-size-001.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-dynamic-size-001.html
new file mode 100644
index 00000000000..add7f1fc2aa
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/orthogonal-dynamic-size-001.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com" />
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1954866" />
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="container" style="width: 100px; height: 50px; background-color: red">
+  <div style="height: 100%; width: 100px; writing-mode: vertical-lr; background-color: green;">
+  </div>
+</div>
+
+<script>
+container.offsetHeight;
+container.style.height = "100px";
+</script>
diff --git a/tests/wpt/tests/css/css-writing-modes/reference/available-size-020-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/available-size-020-ref.html
index ecd3ac273a2..07eb33e3ec1 100644
--- a/tests/wpt/tests/css/css-writing-modes/reference/available-size-020-ref.html
+++ b/tests/wpt/tests/css/css-writing-modes/reference/available-size-020-ref.html
@@ -11,10 +11,13 @@ aside   { width: 2em; overflow: hidden; color: blue; writing-mode: vertical-rl;
 html, body, article, div { height: 100%; }
 .fixed aside { height: calc(50% - 10em - 8px); }
 .full  aside { height: calc(100% - 10em - 8px); }
+.tall  aside { height: calc(120vh - 10em - 8px); }
 html { overflow: hidden; /* avoid scrollbar variance */ }
 </style>
 
-<p style="transform-origin: top right; transform: rotate(-90deg); height: max-content">Test passes if the first five boxes are identical, and the last four boxes are identical.
+<p style="transform-origin: top right; transform: rotate(-90deg); height: max-content">
+Test passes if the first five boxes are identical, the next three boxes are identical,
+and the last one is taller.
 
 <article class="fixed">
   <div>
@@ -64,8 +67,7 @@ html { overflow: hidden; /* avoid scrollbar variance */ }
   </div>
 </article>
 
-
-<article class="full">
+<article class="tall">
   <div>
     <aside>abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde fghijk lmnop qrstu vwxyz abcde</aside>
   </div>
diff --git a/tests/wpt/tests/css/css-writing-modes/reference/table-cell-align-001-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/table-cell-align-001-ref.html
new file mode 100644
index 00000000000..b324e3c3083
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/reference/table-cell-align-001-ref.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes reference: text-align in orthogonal table cell</title>
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 20px/1 Ahem;
+  border: 1px solid gray;
+}
+
+td {
+  width: 2em;
+  padding: 0;
+  color: green;
+}
+
+td > div {
+  position: relative;
+}
+
+.left {
+  left: 0;
+}
+.center {
+  left: 0.5em;
+}
+.right {
+  left: 1em;
+}
+</style>
+
+<table>
+ <tr>
+  <td><div class=left>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=center>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=right>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=left>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=right>X</div></td>
+ </tr>
+</table>
+<br>
+<table>
+ <tr>
+  <td><div class=left>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=center>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=right>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=right>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=left>X</div></td>
+ </tr>
+</table>
diff --git a/tests/wpt/tests/css/css-writing-modes/reference/table-cell-align-002-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/table-cell-align-002-ref.html
new file mode 100644
index 00000000000..eaacb7786ba
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/reference/table-cell-align-002-ref.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes reference: text-align in orthogonal table cell</title>
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 20px/1 Ahem;
+  border: 1px solid gray;
+}
+
+td {
+  width: 3.5em;
+  height: 1.75em;
+  padding: 0;
+  color: green;
+  vertical-align: top;
+}
+
+td > div {
+  position: relative;
+  top: 0.5em;
+}
+
+.left {
+  left: 0.5em;
+}
+.center {
+  left: 1em;
+}
+.right {
+  left: 1.5em;
+}
+</style>
+
+<table>
+ <tr>
+  <td><div class=left>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=center>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=right>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=left>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=right>X</div></td>
+ </tr>
+</table>
+<br>
+<table>
+ <tr>
+  <td><div class=left>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=center>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=right>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=right>X</div></td>
+ </tr>
+ <tr>
+  <td><div class=left>X</div></td>
+ </tr>
+</table>
diff --git a/tests/wpt/tests/css/css-writing-modes/reference/table-cell-align-005-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/table-cell-align-005-ref.html
new file mode 100644
index 00000000000..c5cd6fe28a9
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/reference/table-cell-align-005-ref.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes reference: text-align in orthogonal table cell</title>
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 40px/1 Ahem;
+  border: 1px solid gray;
+}
+
+td {
+  height: 2em;
+  padding: 0;
+  color: green;
+  vertical-align: top;
+}
+
+td div {
+  position: relative;
+}
+
+.t {
+  top: 0;
+}
+.m {
+  top: 0.5em;
+}
+.b {
+  top: 1em;
+}
+</style>
+
+<table>
+ <tr>
+  <td><div class=t>X</div></td>
+  <td><div class=m>X</div></td>
+  <td><div class=b>X</div></td>
+  <td><div class=t>X</div></td>
+  <td><div class=b>X</div></td>
+ </tr>
+</table>
+<br>
+<table>
+ <tr>
+  <td><div class=t>X</div></td>
+  <td><div class=m>X</div></td>
+  <td><div class=b>X</div></td>
+  <td><div class=b>X</div></td>
+  <td><div class=t>X</div></td>
+ </tr>
+</table>
+<br>
+<table>
+ <tr>
+  <td><div class=t>X</div></td>
+  <td><div class=m>X</div></td>
+  <td><div class=b>X</div></td>
+  <td><div class=t>X</div></td>
+  <td><div class=b>X</div></td>
+ </tr>
+</table>
+<br>
+<table>
+ <tr>
+  <td><div class=t>X</div></td>
+  <td><div class=m>X</div></td>
+  <td><div class=b>X</div></td>
+  <td><div class=b>X</div></td>
+  <td><div class=t>X</div></td>
+ </tr>
+</table>
diff --git a/tests/wpt/tests/css/css-writing-modes/reference/table-cell-align-006-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/table-cell-align-006-ref.html
new file mode 100644
index 00000000000..c5b52346fc0
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/reference/table-cell-align-006-ref.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes reference: text-align in orthogonal table cell</title>
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 20px/1 Ahem;
+  border: 1px solid gray;
+  display: inline-table;
+  margin: 1em;
+}
+
+td {
+  padding: 0;
+  color: green;
+  vertical-align: top;
+}
+
+td div {
+  position: relative;
+}
+
+.t {
+  top: 0;
+}
+.m {
+  top: 2em;
+}
+.b {
+  top: 4em;
+}
+</style>
+
+<div>
+<table>
+ <tr>
+  <td>X<br>X<br>X<br>X<br>X</td>
+  <td><div class=t>X</div></td>
+  <td><div class=m>X</div></td>
+  <td><div class=b>X</div></td>
+  <td><div class=t>X</div></td>
+  <td><div class=b>X</div></td>
+  <td>X<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>X</td>
+ </tr>
+</table>
+<table>
+ <tr>
+  <td>X<br>X<br>X<br>X<br>X</td>
+  <td><div class=t>X</div></td>
+  <td><div class=m>X</div></td>
+  <td><div class=b>X</div></td>
+  <td><div class=b>X</div></td>
+  <td><div class=t>X</div></td>
+  <td>X<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>X</td>
+ </tr>
+</table>
+</div>
+
+<div>
+<table>
+ <tr>
+  <td>X<br>X<br>X<br>X<br>X</td>
+  <td><div class=b>X</div></td>
+  <td><div class=m>X</div></td>
+  <td><div class=t>X</div></td>
+  <td><div class=b>X</div></td>
+  <td><div class=t>X</div></td>
+  <td>X<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>X</td>
+ </tr>
+</table>
+<table>
+ <tr>
+  <td>X<br>X<br>X<br>X<br>X</td>
+  <td><div class=b>X</div></td>
+  <td><div class=m>X</div></td>
+  <td><div class=t>X</div></td>
+  <td><div class=t>X</div></td>
+  <td><div class=b>X</div></td>
+  <td>X<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>X</td>
+ </tr>
+</table>
+</div>
+
+<div>
+<table>
+ <tr><td>XXXXX</td></tr>
+ <tr><td>X&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>
+ <tr><td>&nbsp;&nbsp;X&nbsp;&nbsp;</td></tr>
+ <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;X</td></tr>
+ <tr><td>X&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>
+ <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;X</td></tr>
+ <tr><td>X&nbsp;&nbsp;&nbsp;X</td></tr>
+</table>
+<table>
+ <tr><td>XXXXX</td></tr>
+ <tr><td>X&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>
+ <tr><td>&nbsp;&nbsp;X&nbsp;&nbsp;</td></tr>
+ <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;X</td></tr>
+ <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;X</td></tr>
+ <tr><td>X&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>
+ <tr><td>X&nbsp;&nbsp;&nbsp;X</td></tr>
+</table>
+</div>
diff --git a/tests/wpt/tests/css/css-writing-modes/reference/table-cell-valign-001-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/table-cell-valign-001-ref.html
new file mode 100644
index 00000000000..03cb9ec9e4c
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/reference/table-cell-valign-001-ref.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes reference: vertical-align in orthogonal table cell</title>
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 50px/1 Ahem;
+}
+
+td {
+  block-size: 2em;
+  padding: 0;
+  color: green;
+}
+
+.t {
+  vertical-align: top;
+}
+.m {
+  vertical-align: middle;
+}
+.b {
+  vertical-align: bottom;
+}
+</style>
+
+<table border=1>
+ <tr>
+  <td class=t>XX</td>
+ </tr>
+ <tr>
+  <td class=m>XX</td>
+ </tr>
+ <tr>
+  <td class=b>XX</td>
+ </tr>
+</table>
diff --git a/tests/wpt/tests/css/css-writing-modes/reference/table-cell-valign-003-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/table-cell-valign-003-ref.html
new file mode 100644
index 00000000000..f649110965a
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/reference/table-cell-valign-003-ref.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes reference: vertical-align in orthogonal table cell</title>
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 50px/1 Ahem;
+}
+
+td {
+  width: 2em;
+  padding: 0;
+  color: green;
+}
+
+.l {
+  text-align: left;
+}
+.c {
+  text-align: center;
+}
+.r {
+  text-align: right;
+}
+</style>
+
+<table border=1>
+ <tr>
+  <td class=l>X<br>X</td>
+  <td class=c>X<br>X</td>
+  <td class=r>X<br>X</td>
+ </tr>
+</table>
diff --git a/tests/wpt/tests/css/css-writing-modes/reference/text-orientation-020-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/text-orientation-020-ref.html
new file mode 100644
index 00000000000..c5f83ef92a3
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/reference/text-orientation-020-ref.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang=en>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<style>
+.ref ol {
+  text-orientation: upright;
+}
+.ref span {
+  text-orientation: mixed;
+}
+figure {
+  writing-mode: vertical-rl;
+  border: solid 1px black;
+  padding: 1em 0 1ch;
+  margin: 0 1ch;
+  float: left;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<figure class=ref>
+    <ol><li><span>hello世界</span></ol>
+</figure>
+<figure class=ref>
+    <ol><li><span>hello世界</span></ol>
+</figure>
diff --git a/tests/wpt/tests/css/css-writing-modes/reference/text-orientation-021-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/text-orientation-021-ref.html
new file mode 100644
index 00000000000..3ff53e3da4a
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/reference/text-orientation-021-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang=en>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<style>
+body > div {
+  border: solid 1px black;
+  padding: 10px;
+  margin:  10px;
+  float: left;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div style="writing-mode: vertical-rl; text-orientation: upright">
+  AB
+</div>
+
+<div style="writing-mode: vertical-rl; text-orientation: upright">
+  AB
+</div>
diff --git a/tests/wpt/tests/css/css-writing-modes/table-cell-align-001.html b/tests/wpt/tests/css/css-writing-modes/table-cell-align-001.html
new file mode 100644
index 00000000000..046dc96e8f2
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/table-cell-align-001.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes test: text-align in orthogonal table cell</title>
+
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#line-mappings">
+<meta assert="text-align values respect line-relative mappings of the table cell">
+<link rel="match" href="reference/table-cell-align-001-ref.html">
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 20px/1 Ahem;
+  border: 1px solid gray;
+  writing-mode: vertical-lr;
+}
+
+td {
+  inline-size: 2em;
+  padding: 0;
+  color: green;
+  writing-mode: horizontal-tb;
+}
+
+/* If text-align works correctly on the cells, their green Ahem glyphs
+   should cover the red part of each background. */
+.left {
+  text-align: left;
+  background: linear-gradient(to right, red 50%, transparent 50%);
+}
+.center {
+  text-align: center;
+  background: linear-gradient(to right, transparent 25%, red 25%, red 75%, transparent 75%);
+}
+.right {
+  text-align: right;
+  background: linear-gradient(to right, transparent 50%, red 50%);
+}
+.start {
+  text-align: start;
+  background: linear-gradient(to right, red 50%, transparent 50%);
+}
+.start:dir(rtl) {
+  background: linear-gradient(to left, red 50%, transparent 50%);
+}
+.end {
+  text-align: end;
+  background: linear-gradient(to right, transparent 50%, red 50%);
+}
+.end:dir(rtl) {
+  background: linear-gradient(to left, transparent 50%, red 50%);
+}
+</style>
+
+<table>
+ <tr>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+ </tr>
+</table>
+<br>
+<table>
+ <tr dir=rtl>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+ </tr>
+</table>
diff --git a/tests/wpt/tests/css/css-writing-modes/table-cell-align-002.html b/tests/wpt/tests/css/css-writing-modes/table-cell-align-002.html
new file mode 100644
index 00000000000..14c201d937d
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/table-cell-align-002.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes test: text-align in orthogonal table cell</title>
+
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#line-mappings">
+<meta assert="text-align values respect line-relative mappings of the table cell with padding included">
+<link rel="match" href="reference/table-cell-align-002-ref.html">
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 20px/1 Ahem;
+  border: 1px solid gray;
+  writing-mode: vertical-lr;
+}
+
+td {
+  inline-size: 2em;
+  padding: .5em 1em .25em .5em;
+  color: green;
+  writing-mode: horizontal-tb;
+  background-size: 2em 1em;
+  background-position: .5em .5em;
+  background-repeat: no-repeat;
+}
+
+/* If text-align works correctly on the cells, their green Ahem glyphs
+   should cover the red part of each background. */
+.left {
+  text-align: left;
+  background-image: linear-gradient(to right, red 50%, transparent 50%);
+}
+.center {
+  text-align: center;
+  background-image: linear-gradient(to right, transparent 25%, red 25%, red 75%, transparent 75%);
+}
+.right {
+  text-align: right;
+  background-image: linear-gradient(to right, transparent 50%, red 50%);
+}
+.start {
+  text-align: start;
+  background-image: linear-gradient(to right, red 50%, transparent 50%);
+}
+.start:dir(rtl) {
+  background-image: linear-gradient(to left, red 50%, transparent 50%);
+}
+.end {
+  text-align: end;
+  background-image: linear-gradient(to right, transparent 50%, red 50%);
+}
+.end:dir(rtl) {
+  background-image: linear-gradient(to left, transparent 50%, red 50%);
+}
+</style>
+
+<table>
+ <tr>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+ </tr>
+</table>
+<br>
+<table>
+ <tr dir=rtl>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+ </tr>
+</table>
diff --git a/tests/wpt/tests/css/css-writing-modes/table-cell-align-003.html b/tests/wpt/tests/css/css-writing-modes/table-cell-align-003.html
new file mode 100644
index 00000000000..c32f535c546
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/table-cell-align-003.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes test: text-align in orthogonal table cell</title>
+
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#line-mappings">
+<meta assert="text-align values respect line-relative mappings of the table cell">
+<link rel="match" href="reference/table-cell-align-001-ref.html">
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 20px/1 Ahem;
+  border: 1px solid gray;
+  writing-mode: vertical-rl;
+}
+
+td {
+  inline-size: 2em;
+  padding: 0;
+  color: green;
+  writing-mode: horizontal-tb;
+}
+
+/* If text-align works correctly on the cells, their green Ahem glyphs
+   should cover the red part of each background. */
+.left {
+  text-align: left;
+  background: linear-gradient(to right, red 50%, transparent 50%);
+}
+.center {
+  text-align: center;
+  background: linear-gradient(to right, transparent 25%, red 25%, red 75%, transparent 75%);
+}
+.right {
+  text-align: right;
+  background: linear-gradient(to right, transparent 50%, red 50%);
+}
+.start {
+  text-align: start;
+  background: linear-gradient(to right, red 50%, transparent 50%);
+}
+.start:dir(rtl) {
+  background: linear-gradient(to left, red 50%, transparent 50%);
+}
+.end {
+  text-align: end;
+  background: linear-gradient(to right, transparent 50%, red 50%);
+}
+.end:dir(rtl) {
+  background: linear-gradient(to left, transparent 50%, red 50%);
+}
+</style>
+
+<table>
+ <tr>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+ </tr>
+</table>
+<br>
+<table>
+ <tr dir=rtl>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+ </tr>
+</table>
diff --git a/tests/wpt/tests/css/css-writing-modes/table-cell-align-004.html b/tests/wpt/tests/css/css-writing-modes/table-cell-align-004.html
new file mode 100644
index 00000000000..d9b31bf6f94
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/table-cell-align-004.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes test: text-align in orthogonal table cell</title>
+
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#line-mappings">
+<meta assert="text-align values respect line-relative mappings of the table cell with padding included">
+<link rel="match" href="reference/table-cell-align-002-ref.html">
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 20px/1 Ahem;
+  border: 1px solid gray;
+  writing-mode: vertical-rl;
+}
+
+td {
+  inline-size: 2em;
+  padding: .5em 1em .25em .5em;
+  color: green;
+  writing-mode: horizontal-tb;
+  background-size: 2em 1em;
+  background-position: .5em .5em;
+  background-repeat: no-repeat;
+}
+
+/* If text-align works correctly on the cells, their green Ahem glyphs
+   should cover the red part of each background. */
+.left {
+  text-align: left;
+  background-image: linear-gradient(to right, red 50%, transparent 50%);
+}
+.center {
+  text-align: center;
+  background-image: linear-gradient(to right, transparent 25%, red 25%, red 75%, transparent 75%);
+}
+.right {
+  text-align: right;
+  background-image: linear-gradient(to right, transparent 50%, red 50%);
+}
+.start {
+  text-align: start;
+  background-image: linear-gradient(to right, red 50%, transparent 50%);
+}
+.start:dir(rtl) {
+  background-image: linear-gradient(to left, red 50%, transparent 50%);
+}
+.end {
+  text-align: end;
+  background-image: linear-gradient(to right, transparent 50%, red 50%);
+}
+.end:dir(rtl) {
+  background-image: linear-gradient(to left, transparent 50%, red 50%);
+}
+</style>
+
+<table>
+ <tr>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+ </tr>
+</table>
+<br>
+<table>
+ <tr dir=rtl>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+ </tr>
+</table>
diff --git a/tests/wpt/tests/css/css-writing-modes/table-cell-align-005.html b/tests/wpt/tests/css/css-writing-modes/table-cell-align-005.html
new file mode 100644
index 00000000000..569a59db08c
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/table-cell-align-005.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes test: text-align in orthogonal table cell</title>
+
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#line-mappings">
+<meta assert="text-align values respect line-relative mappings of the table cell">
+<link rel="match" href="reference/table-cell-align-005-ref.html">
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 40px/1 Ahem;
+  border: 1px solid gray;
+}
+
+td {
+  inline-size: 2em;
+  padding: 0;
+  color: green;
+}
+
+table.vlr td {
+  writing-mode: vertical-lr;
+}
+
+table.vrl td {
+  writing-mode: vertical-rl;
+}
+
+/* If text-align works correctly on the cells, their green Ahem glyphs
+   should cover the red part of each background. */
+.left {
+  text-align: left;
+  background: linear-gradient(to bottom, red 50%, transparent 50%);
+}
+.center {
+  text-align: center;
+  background: linear-gradient(to bottom, transparent 25%, red 25%, red 75%, transparent 75%);
+}
+.right {
+  text-align: right;
+  background: linear-gradient(to bottom, transparent 50%, red 50%);
+}
+.start {
+  text-align: start;
+  background: linear-gradient(to bottom, red 50%, transparent 50%);
+}
+.start:dir(rtl) {
+  background: linear-gradient(to top, red 50%, transparent 50%);
+}
+.end {
+  text-align: end;
+  background: linear-gradient(to bottom, transparent 50%, red 50%);
+}
+.end:dir(rtl) {
+  background: linear-gradient(to top, transparent 50%, red 50%);
+}
+</style>
+
+<table class=vlr>
+ <tr>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+ </tr>
+</table>
+<br>
+<table class=vlr>
+ <tr dir=rtl>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+ </tr>
+</table>
+<br>
+<table class=vrl>
+ <tr>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+ </tr>
+</table>
+<br>
+<table class=vrl>
+ <tr dir=rtl>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+ </tr>
+</table>
diff --git a/tests/wpt/tests/css/css-writing-modes/table-cell-align-006.html b/tests/wpt/tests/css/css-writing-modes/table-cell-align-006.html
new file mode 100644
index 00000000000..a8d33f281fd
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/table-cell-align-006.html
@@ -0,0 +1,187 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes test: text-align in orthogonal table cell</title>
+
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#line-mappings">
+<meta assert="text-align values respect line-relative mappings of the table cell">
+<link rel="match" href="reference/table-cell-align-006-ref.html">
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 20px/1 Ahem;
+  border: 1px solid gray;
+  display: inline-table;
+  margin: 1em;
+}
+
+td {
+  padding: 0;
+  color: green;
+}
+
+table.vrl td {
+  writing-mode: vertical-rl;
+}
+
+table.slr td {
+  writing-mode: sideways-lr;
+}
+
+table.h {
+  writing-mode: vertical-lr;
+}
+
+table.h td {
+  writing-mode: initial;
+}
+
+/* If text-align works correctly on the cells, their green Ahem glyphs
+   should cover the red part of each background. */
+.left {
+  text-align: left;
+  background: linear-gradient(to bottom, red 20%, transparent 20%);
+}
+.slr .left {
+  background: linear-gradient(to top, red 20%, transparent 20%);
+}
+.center {
+  text-align: center;
+  background: linear-gradient(to bottom, transparent 40%, red 40%, red 60%, transparent 60%);
+}
+.right {
+  text-align: right;
+  background: linear-gradient(to bottom, transparent 80%, red 80%);
+}
+.slr .right {
+  background: linear-gradient(to top, transparent 80%, red 80%);
+}
+.start,
+.slr .start:dir(rtl)
+ {
+  text-align: start;
+  background: linear-gradient(to bottom, red 20%, transparent 20%);
+}
+.start:dir(rtl),
+.slr .start  {
+  background: linear-gradient(to top, red 20%, transparent 20%);
+}
+.end,
+.slr .end:dir(rtl)
+ {
+  text-align: end;
+  background: linear-gradient(to bottom, transparent 80%, red 80%);
+}
+.end:dir(rtl),
+.slr .end
+ {
+  background: linear-gradient(to top, transparent 80%, red 80%);
+}
+.justify {
+  text-align-last: justify;
+  background: linear-gradient(to bottom, red 20%, transparent 20% 80%, red 80% );
+}
+
+.h .left {
+  background: linear-gradient(to right, red 20%, transparent 20%);
+}
+.h .center {
+  background: linear-gradient(to right, transparent 40%, red 40%, red 60%, transparent 60%);
+}
+.h .right {
+  background: linear-gradient(to right, transparent 80%, red 80%);
+}
+.h .start {
+  background: linear-gradient(to right, red 20%, transparent 20%);
+}
+.h .start:dir(rtl) {
+  background: linear-gradient(to left, red 20%, transparent 20%);
+}
+.h .end {
+  background: linear-gradient(to right, transparent 80%, red 80%);
+}
+.h .end:dir(rtl) {
+  background: linear-gradient(to left, transparent 80%, red 80%);
+}
+.h .justify {
+  background: linear-gradient(to right, red 20%, transparent 20% 80%, red 80% );
+}
+</style>
+
+</div>
+<table class=vrl>
+ <tr>
+  <td>XXXXX</td>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+  <td class=justify>X X</td>
+ </tr>
+</table>
+<table class=vrl>
+ <tr dir=rtl>
+  <td>XXXXX</td>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+  <td class=justify>X X</td>
+ </tr>
+</table>
+</div>
+
+<div>
+<table class=slr>
+ <tr>
+  <td>XXXXX</td>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+  <td class=justify>X X</td>
+ </tr>
+</table>
+<table class=slr>
+ <tr dir=rtl>
+  <td>XXXXX</td>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+  <td class=justify>X X</td>
+ </tr>
+</table>
+</div>
+
+<div>
+<table class=h>
+ <tr>
+  <td>XXXXX</td>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+  <td class=justify>X X</td>
+ </tr>
+</table>
+<table class=h>
+ <tr dir=rtl>
+  <td>XXXXX</td>
+  <td class=left>X</td>
+  <td class=center>X</td>
+  <td class=right>X</td>
+  <td class=start>X</td>
+  <td class=end>X</td>
+  <td class=justify>X X</td>
+ </tr>
+</table>
+</div>
diff --git a/tests/wpt/tests/css/css-writing-modes/table-cell-valign-001.html b/tests/wpt/tests/css/css-writing-modes/table-cell-valign-001.html
new file mode 100644
index 00000000000..f3026810dd5
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/table-cell-valign-001.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes test: vertical-align in orthogonal table cell</title>
+
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#line-mappings">
+<meta assert="For the vertical-align property, the 'top' of the line box is its over edge; the 'bottom' of the line box is its under edge.">
+<link rel="match" href="reference/table-cell-valign-001-ref.html">
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 50px/1 Ahem;
+}
+
+.v {
+  writing-mode: vertical-lr;
+}
+
+.h {
+  writing-mode: horizontal-tb;
+}
+
+td {
+  block-size: 2em;
+  padding: 0;
+  color: green;
+}
+
+/* If vertical-align works correctly on the cells, their green Ahem glyphs
+   should cover the red part of each background. */
+td:nth-child(1) {
+  vertical-align: top;
+  background: linear-gradient(to bottom, red 50%, transparent 50%);
+}
+td:nth-child(2) {
+  vertical-align: middle;
+  background: linear-gradient(to bottom, transparent 25%, red 25%, red 75%, transparent 75%);
+}
+td:nth-child(3) {
+  vertical-align: bottom;
+  background: linear-gradient(to bottom, transparent 50%, red 50%);
+}
+</style>
+
+<table class=v border=1>
+ <tr>
+  <td class=h>XX</td>
+  <td class=h>XX</td>
+  <td class=h>XX</td>
+ </tr>
+</table>
diff --git a/tests/wpt/tests/css/css-writing-modes/table-cell-valign-002.html b/tests/wpt/tests/css/css-writing-modes/table-cell-valign-002.html
new file mode 100644
index 00000000000..d9440e4b299
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/table-cell-valign-002.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes test: vertical-align in orthogonal table cell</title>
+
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#line-mappings">
+<meta assert="For the vertical-align property, the 'top' of the line box is its over edge; the 'bottom' of the line box is its under edge.">
+<link rel="match" href="reference/table-cell-valign-001-ref.html">
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 50px/1 Ahem;
+}
+
+.v {
+  writing-mode: vertical-rl;
+}
+
+.h {
+  writing-mode: horizontal-tb;
+}
+
+td {
+  block-size: 2em;
+  padding: 0;
+  color: green;
+}
+
+/* If vertical-align works correctly on the cells, their green Ahem glyphs
+   should cover the red part of each background. */
+td:nth-child(1) {
+  vertical-align: top;
+  background: linear-gradient(to bottom, red 50%, transparent 50%);
+}
+td:nth-child(2) {
+  vertical-align: middle;
+  background: linear-gradient(to bottom, transparent 25%, red 25%, red 75%, transparent 75%);
+}
+td:nth-child(3) {
+  vertical-align: bottom;
+  background: linear-gradient(to bottom, transparent 50%, red 50%);
+}
+</style>
+
+<table class=v border=1>
+ <tr>
+  <td class=h>XX</td>
+  <td class=h>XX</td>
+  <td class=h>XX</td>
+ </tr>
+</table>
diff --git a/tests/wpt/tests/css/css-writing-modes/table-cell-valign-003.html b/tests/wpt/tests/css/css-writing-modes/table-cell-valign-003.html
new file mode 100644
index 00000000000..aaaea9bd0fe
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/table-cell-valign-003.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes test: vertical-align in orthogonal table cell</title>
+
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#line-mappings">
+<meta assert="For the vertical-align property, the 'top' of the line box is its over edge; the 'bottom' of the line box is its under edge.">
+<link rel="match" href="reference/table-cell-valign-003-ref.html">
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 50px/1 Ahem;
+}
+
+.v {
+  writing-mode: vertical-lr;
+}
+
+td {
+  block-size: 2em;
+  padding: 0;
+  color: green;
+}
+
+/* If vertical-align works correctly on the cells, their green Ahem glyphs
+   should cover the red part of each background. */
+td:nth-child(1) {
+  vertical-align: top;
+  background: linear-gradient(to right, red 50%, transparent 50%);
+}
+td:nth-child(2) {
+  vertical-align: middle;
+  background: linear-gradient(to right, transparent 25%, red 25%, red 75%, transparent 75%);
+}
+td:nth-child(3) {
+  vertical-align: bottom;
+  background: linear-gradient(to right, transparent 50%, red 50%);
+}
+</style>
+
+<table border=1>
+ <tr>
+  <td class=v>XX</td>
+  <td class=v>XX</td>
+  <td class=v>XX</td>
+ </tr>
+</table>
diff --git a/tests/wpt/tests/css/css-writing-modes/table-cell-valign-004.html b/tests/wpt/tests/css/css-writing-modes/table-cell-valign-004.html
new file mode 100644
index 00000000000..9ccf09b6fb4
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/table-cell-valign-004.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Writing Modes test: vertical-align in orthogonal table cell</title>
+
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#line-mappings">
+<meta assert="For the vertical-align property, the 'top' of the line box is its over edge; the 'bottom' of the line box is its under edge.">
+<link rel="match" href="reference/table-cell-valign-003-ref.html">
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<meta name="flags" content="ahem" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+table {
+  font: 50px/1 Ahem;
+}
+
+.v {
+  writing-mode: vertical-rl;
+}
+
+td {
+  block-size: 2em;
+  padding: 0;
+  color: green;
+}
+
+/* If vertical-align works correctly on the cells, their green Ahem glyphs
+   should cover the red part of each background. */
+td:nth-child(1) {
+  vertical-align: bottom;
+  background: linear-gradient(to right, red 50%, transparent 50%);
+}
+td:nth-child(2) {
+  vertical-align: middle;
+  background: linear-gradient(to right, transparent 25%, red 25%, red 75%, transparent 75%);
+}
+td:nth-child(3) {
+  vertical-align: top;
+  background: linear-gradient(to right, transparent 50%, red 50%);
+}
+</style>
+
+<table border=1>
+ <tr>
+  <td class=v>XX</td>
+  <td class=v>XX</td>
+  <td class=v>XX</td>
+ </tr>
+</table>
diff --git a/tests/wpt/tests/css/css-writing-modes/test-plan/req-tcu-font.html b/tests/wpt/tests/css/css-writing-modes/test-plan/req-tcu-font.html
index d329eea041c..16414a1b2b1 100644
--- a/tests/wpt/tests/css/css-writing-modes/test-plan/req-tcu-font.html
+++ b/tests/wpt/tests/css/css-writing-modes/test-plan/req-tcu-font.html
@@ -372,7 +372,7 @@ OpenType implementations must use width-specific variants (OpenType features hwi
 <h3>Glyphs to check the optional processing regarding U+6C34</h3>
 <p>The last paragraph in <a href="https://drafts.csswg.org/css-writing-modes/#text-combine-compression">9.1.3 Compression Rules</a> says:
 <blockquote>
-In some fonts, the ideographic glyphs are given a compressed design such that they are 1em wide but shorter than 1em tall. To accommodate such fonts, the UA may vertically scale the the composition to match the advance height of 水 U+6C34.
+In some fonts, the ideographic glyphs are given a compressed design such that they are 1em wide but shorter than 1em tall. To accommodate such fonts, the UA may vertically scale the composition to match the advance height of 水 U+6C34.
 </blockquote>
 <p>We need two glyphs:
 <ul>
diff --git a/tests/wpt/tests/css/css-writing-modes/text-orientation-020.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-020.html
new file mode 100644
index 00000000000..84f4e62e573
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/text-orientation-020.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang=en>
+<meta charset="utf-8">
+<title>CSS Writing-Modes test: text-orientation on list markers</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#text-orientation">
+<link rel="help" href="https://drafts.csswg.org/css-lists-3/#marker-properties">
+<link rel=match href="reference/text-orientation-020-ref.html">
+<meta name="assert" content="text-orientation applies to text, and thus to the text in ::marker pseudos">
+<style>
+.test ol {
+  text-orientation: mixed; /*the default*/
+}
+.test ol li::marker {
+  text-orientation: upright;
+}
+.ref ol {
+  text-orientation: upright;
+}
+.ref span {
+  text-orientation: mixed;
+}
+figure {
+  writing-mode: vertical-rl;
+  border: solid 1px black;
+  padding: 1em 0 1ch;
+  margin: 0 1ch;
+  float: left;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<figure class=test>
+    <ol><li>hello世界</ol>
+</figure>
+<figure class=ref>
+    <ol><li><span>hello世界</span></ol>
+</figure>
diff --git a/tests/wpt/tests/css/css-writing-modes/text-orientation-021.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-021.html
new file mode 100644
index 00000000000..27fae03dddc
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/text-orientation-021.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang=en>
+<meta charset="utf-8">
+<title>CSS Writing-Modes test: text-orientation on text</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#text-orientation">
+<link rel="help" href="https://drafts.csswg.org/css-lists-3/#marker-properties">
+<link rel=match href="reference/text-orientation-021-ref.html">
+<meta name="assert" content="text-orientation applies to text, and thus works even if there is no parent box with that same value">
+<style>
+body > div {
+  border: solid 1px black;
+  padding: 10px;
+  margin:  10px;
+  float: left;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div style="writing-mode: vertical-rl; text-orientation: upright">
+  AB
+</div>
+
+<div style="writing-mode: vertical-rl">
+  <div style="display: contents; text-orientation: upright">AB</div>
+</div>
diff --git a/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-044-ref.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-044-ref.html
index 9cf46c0b214..f61f97c9a1d 100644
--- a/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-044-ref.html
+++ b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-044-ref.html
@@ -7,7 +7,10 @@
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
 
   <style>
-
+  body
+    {
+      margin-bottom: 0;
+    }
   img#orange-square
     {
       padding-right: 16px;
diff --git a/tests/wpt/tests/css/cssom-view/getBoundingClientRect-newline.html b/tests/wpt/tests/css/cssom-view/getBoundingClientRect-newline.html
new file mode 100644
index 00000000000..ce82b7237d0
--- /dev/null
+++ b/tests/wpt/tests/css/cssom-view/getBoundingClientRect-newline.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-range-getboundingclientrect">
+<link rel="author" title="Peng Zhou" href="mailto:zhoupeng.1996@bytedance.com">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+div[contenteditable] {
+  white-space: pre;
+  font: 10px/1 Ahem;
+  width: 10ch;
+}
+</style>
+<body>
+<div contenteditable></div>
+<script>
+function getBoundingClientRect(node, offset) {
+  const range = document.createRange();
+  range.setStart(node, offset);
+  range.setEnd(node, offset);
+  const rect = range.getBoundingClientRect();
+  return rect;
+}
+
+test(function() {
+  const editable = document.querySelector('div[contenteditable]');
+  editable.innerHTML = '123456\n789012';
+  const rect0 = getBoundingClientRect(editable.firstChild, 0);
+  const rect6 = getBoundingClientRect(editable.firstChild, 6);
+  const rect7 = getBoundingClientRect(editable.firstChild, 7);
+  assert_equals(rect0.x, rect7.x);
+  assert_greater_than(rect6.x, rect7.x);
+  assert_equals(rect0.y, rect6.y);
+  assert_less_than(rect6.y, rect7.y);
+}, 'Range.getBoundingClientRect() should return the first position of the next line when the collapsed range is a newline character');
+</script>
+</body>
diff --git a/tests/wpt/tests/css/cssom-view/resources/scrollIntoView-frame.html b/tests/wpt/tests/css/cssom-view/resources/scrollIntoView-frame.html
new file mode 100644
index 00000000000..ee2be2fd3ab
--- /dev/null
+++ b/tests/wpt/tests/css/cssom-view/resources/scrollIntoView-frame.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<meta name="viewport" content="initial-scale=1">
+<style>
+body {
+  height: 600px;
+}
+#target {
+  position: absolute;
+  top: 400px;
+  height: 200px;
+}
+</style>
+<body>
+<div id="target"></div>
+</body>
diff --git a/tests/wpt/tests/css/cssom-view/scrollIntoView-container.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-container.html
new file mode 100644
index 00000000000..3b241ea2251
--- /dev/null
+++ b/tests/wpt/tests/css/cssom-view/scrollIntoView-container.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<title>CSSOM View - scrollIntoView container option</title>
+<meta charset="utf-8">
+<meta name="viewport" content="initial-scale=1">
+<link rel="author" title="Rob Flack" href="mailto:flackr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-scrollintoview">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+.scroller {
+  overflow: auto;
+  height: 200px;
+}
+.spacer {
+  height: 400px;
+}
+#target {
+  height: 200px;
+}
+</style>
+<script>
+let setFrameLoaded = null;
+let frameLoaded = new Promise(resolve => {
+  setFrameLoaded = resolve;
+});
+</script>
+<div id="outer" class="scroller">
+  <div class="spacer"></div>
+  <div id="inner" class="scroller">
+    <div class="spacer"></div>
+    <div id="target"></div>
+    <iframe id="frame" height="200" src="resources/scrollIntoView-frame.html" onload="setFrameLoaded()"></iframe>
+  </div>
+</div>
+<script>
+const outer = document.getElementById('outer');
+const inner = document.getElementById('inner');
+const target = document.getElementById('target');
+
+function reset() {
+  outer.scrollTop = 0;
+  inner.scrollTop = 0;
+}
+
+test(() => {
+  reset();
+  target.scrollIntoView();
+  assert_equals(inner.scrollTop, 400, '#inner scrollTop');
+  assert_equals(outer.scrollTop, 400, '#outer scrollTop');
+}, `scrollIntoView() defaults to scrolling ancestors`);
+
+test(() => {
+  reset();
+  target.scrollIntoView({container: 'all'});
+  assert_equals(inner.scrollTop, 400, '#inner scrollTop');
+  assert_equals(outer.scrollTop, 400, '#outer scrollTop');
+}, `scrollIntoView({container: 'all'}) scrolls ancestors`);
+
+test(() => {
+  reset();
+  target.scrollIntoView({container: 'nearest'});
+  assert_equals(inner.scrollTop, 400, '#inner scrollTop');
+  assert_equals(outer.scrollTop, 0, '#outer scrollTop');
+}, `scrollIntoView({container: 'nearest'}) only scrolls nearest scroll container`);
+
+test(() => {
+  reset();
+  inner.scrollIntoView({container: 'nearest'});
+  assert_equals(outer.scrollTop, 400, '#outer scrollTop');
+  assert_equals(inner.scrollTop, 0, '#inner scrollTop');
+}, `scrollIntoView({container: 'nearest'}) doesn't stop at itself`);
+
+promise_test(async () => {
+  reset();
+  await frameLoaded;
+  const frameDoc = document.getElementById("frame").contentDocument;
+  const frameTarget = frameDoc.getElementById("target");
+  frameTarget.scrollIntoView({container: 'nearest'});
+  assert_equals(frameDoc.scrollingElement.scrollTop, 400, 'frame scrollingElement scrollTop');
+  assert_equals(inner.scrollTop, 0, '#inner scrollTop');
+  assert_equals(outer.scrollTop, 0, '#outer scrollTop');
+}, `scrollIntoView({container: 'nearest'}) doesn't propagate to outer frames`);
+
+</script>
diff --git a/tests/wpt/tests/css/cssom-view/scrollingElement.html b/tests/wpt/tests/css/cssom-view/scrollingElement.html
index 408fa47be9a..093c016da55 100644
--- a/tests/wpt/tests/css/cssom-view/scrollingElement.html
+++ b/tests/wpt/tests/css/cssom-view/scrollingElement.html
@@ -35,6 +35,18 @@ function quirksTest(rootDisplay, bodyDisplay) {
       assert_equals(quirksDoc.scrollingElement, quirksDoc.body,
         "scrollingElement in quirks mode should default to body element.");
 
+      quirksDoc.documentElement.style.overflow = "clip";
+      quirksDoc.body.style.overflow = "auto";
+      assert_equals(quirksDoc.scrollingElement, null);
+      quirksDoc.body.style.overflow = "hidden";
+      assert_equals(quirksDoc.scrollingElement, null);
+      quirksDoc.body.style.overflow = "scroll";
+      assert_equals(quirksDoc.scrollingElement, null);
+      quirksDoc.body.style.overflow = "visible";
+      assert_equals(quirksDoc.scrollingElement, quirksDoc.body);
+      quirksDoc.body.style.overflow = "clip";
+      assert_equals(quirksDoc.scrollingElement, quirksDoc.body);
+
       quirksDoc.documentElement.style.overflow = "scroll";
       quirksDoc.body.style.overflow = "scroll";
       assert_equals(quirksDoc.scrollingElement, null,
diff --git a/tests/wpt/tests/css/cssom-view/support/action-utils.js b/tests/wpt/tests/css/cssom-view/support/action-utils.js
new file mode 100644
index 00000000000..c3ab5272da6
--- /dev/null
+++ b/tests/wpt/tests/css/cssom-view/support/action-utils.js
@@ -0,0 +1,23 @@
+async function pinch_zoom_action(targetWindow = window) {
+  // Pinch zoom in this document.
+  await new test_driver.Actions()
+    .addPointer("finger1", "touch")
+    .addPointer("finger2", "touch")
+    .pointerMove(parseInt(targetWindow.innerWidth / 2),
+                 parseInt(targetWindow.innerHeight / 2),
+                 {origin: "viewport", sourceName: "finger1"})
+    .pointerMove(parseInt(targetWindow.innerWidth / 2),
+                 parseInt(targetWindow.innerHeight / 2),
+                 {origin: "viewport", sourceName: "finger2"})
+    .pointerDown({sourceName: "finger1"})
+    .pointerDown({sourceName: "finger2"})
+    .pointerMove(parseInt(targetWindow.innerWidth / 3),
+                 parseInt(targetWindow.innerHeight / 3),
+                 {origin: "viewport", sourceName: "finger1"})
+    .pointerMove(parseInt(targetWindow.innerWidth / 3 * 2),
+                 parseInt(targetWindow.innerHeight / 3 * 2),
+                 {origin: "viewport", sourceName: "finger2"})
+    .pointerUp({sourceName: "finger1"})
+    .pointerUp({sourceName: "finger2"})
+    .send();
+}
diff --git a/tests/wpt/tests/css/cssom-view/table-client-props.html b/tests/wpt/tests/css/cssom-view/table-client-props.html
index 4af06d6bf71..2895bebebbf 100644
--- a/tests/wpt/tests/css/cssom-view/table-client-props.html
+++ b/tests/wpt/tests/css/cssom-view/table-client-props.html
@@ -43,6 +43,19 @@
            <tr><td>`,
         26, 34,
         "Table with collapsed border" ],
+      [ `<div style="display: flex">
+           <table style="width: 20px; height: 30px;
+                         border-width: 1px 2px 3px 4px; border-style: solid;
+                         border-collapse: separate; box-sizing: content-box">`,
+        26, 34,
+        "Flex-level table with separated border" ],
+      [ `<div style="display: flex">
+           <table style="width: 20px; height: 30px;
+                         border-width: 2px 4px 6px 8px; border-style: solid;
+                         border-collapse: collapse; box-sizing: content-box">
+             <tr><td>`,
+        26, 34,
+        "Flex-level table with collapsed border" ],
       [ `<table>
            <caption style="width: 40px; height: 50px; padding: 1px 2px 3px 4px">`,
         46, 54,
diff --git a/tests/wpt/tests/css/cssom-view/visual-scrollIntoView-001.html b/tests/wpt/tests/css/cssom-view/visual-scrollIntoView-001.html
new file mode 100644
index 00000000000..825556be969
--- /dev/null
+++ b/tests/wpt/tests/css/cssom-view/visual-scrollIntoView-001.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="support/action-utils.js"></script>
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1943865">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1943053">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#perform-a-scroll">
+<style>
+body {
+  margin: 0px;
+  padding: 0px;
+}
+</style>
+<div id="anchor"></div>
+<div style="position: fixed; bottom: 0;">
+  <div style="position: absolute; bottom: 0;">
+    <input type="text" id="name" />
+  </div>
+</div>
+<script>
+promise_test(async t => {
+  assert_equals(window.scrollY, 0);
+  assert_equals(visualViewport.scale, 1.0);
+  assert_equals(visualViewport.pageTop, 0);
+
+  // Pinch zoom in this document.
+  await pinch_zoom_action();
+
+  assert_greater_than(visualViewport.scale, 1.0);
+
+  // Suppose that the pinch zoom-in gesture at the center of the document did
+  // move the visual viewport offset.
+  assert_greater_than(visualViewport.pageTop, 0);
+
+  // Move to zero offset of the visual viewport.
+  let scrollPromise =
+      new Promise(resolve => visualViewport.addEventListener("scroll", resolve));
+  document.querySelector('#anchor').scrollIntoView({ behavior: "instant" });
+  await scrollPromise;
+
+  assert_equals(visualViewport.pageTop, 0);
+
+  // Now trigger a scrollIntoView call to an element inside a position:fixed element.
+  scrollPromise =
+      new Promise(resolve => visualViewport.addEventListener("scroll", resolve));
+  document.querySelector('#name').scrollIntoView({ behavior: "instant" });
+  await scrollPromise;
+
+  assert_greater_than(visualViewport.pageTop, 0);
+}, "Element.scrollIntoView scrolls visually");
+</script>
diff --git a/tests/wpt/tests/css/cssom-view/visual-scrollIntoView-002.html b/tests/wpt/tests/css/cssom-view/visual-scrollIntoView-002.html
new file mode 100644
index 00000000000..7f9170654e3
--- /dev/null
+++ b/tests/wpt/tests/css/cssom-view/visual-scrollIntoView-002.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="support/action-utils.js"></script>
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1947470">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#perform-a-scroll">
+<style>
+html {
+  height: 10000px;
+}
+body {
+  margin: 0px;
+  padding: 0px;
+}
+#fixed {
+  position: fixed;
+  bottom: 0px;
+  height: 50vh;
+  width: 100vw;
+  overflow: scroll;
+  background-color: gray;
+}
+input {
+  height: 20px;
+}
+</style>
+<div id="fixed">
+  <div style="height: calc(80vh - 40px)"></div>
+  <input type="text" id="name" />
+</div>
+<script>
+promise_test(async t => {
+  assert_equals(window.scrollY, 0);
+  assert_equals(visualViewport.scale, 1.0);
+  assert_equals(visualViewport.pageTop, 0);
+
+  // Pinch zoom in this document.
+  await pinch_zoom_action();
+
+  assert_greater_than(visualViewport.scale, 1.0);
+
+  // Scroll the root scroll container.
+  window.scrollTo(0, 1000);
+  assert_equals(window.scrollY, 1000);
+
+  const expectedPageTop = visualViewport.pageTop;
+
+  // Now trigger a scrollIntoView call to an element inside a position:fixed element.
+  scrollPromise =
+      new Promise(resolve => visualViewport.addEventListener("scroll", resolve));
+  document.querySelector('#name').scrollIntoView({ behavior: "instant" });
+  await scrollPromise;
+
+  assert_greater_than(visualViewport.pageTop, expectedPageTop);
+}, "Element.scrollIntoView scrolls visually to a position: fixed element with non-zero layout scroll offset");
+</script>
diff --git a/tests/wpt/tests/css/cssom-view/visual-scrollIntoView-003.html b/tests/wpt/tests/css/cssom-view/visual-scrollIntoView-003.html
new file mode 100644
index 00000000000..c0592098a90
--- /dev/null
+++ b/tests/wpt/tests/css/cssom-view/visual-scrollIntoView-003.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="support/action-utils.js"></script>
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1951021">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#perform-a-scroll">
+<style>
+body {
+  margin: 0px;
+  padding: 0px;
+}
+#container {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0px;
+  left: 0px;
+}
+#banner {
+  position: fixed;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+  background-color: blue;
+}
+</style>
+<div id="anchor"></div>
+<div id="container">
+  <aside id="banner"></aside>
+</div>
+<script>
+promise_test(async t => {
+  assert_equals(window.scrollY, 0);
+  assert_equals(visualViewport.scale, 1.0);
+  assert_equals(visualViewport.pageTop, 0);
+
+  // Pinch zoom in this document.
+  await pinch_zoom_action();
+
+  assert_greater_than(visualViewport.scale, 1.0);
+
+  // Suppose that the pinch zoom-in gesture at the center of the document did
+  // move the visual viewport offset.
+  assert_greater_than(visualViewport.pageTop, 0);
+
+  // Move to zero offset of the visual viewport.
+  let scrollPromise =
+      new Promise(resolve => visualViewport.addEventListener("scroll", resolve));
+  document.querySelector('#anchor').scrollIntoView({ behavior: "instant" });
+  await scrollPromise;
+
+  assert_equals(visualViewport.pageTop, 0);
+
+  // Now trigger a scrollIntoView call to an element inside nested position:fixed elements.
+  scrollPromise =
+      new Promise(resolve => visualViewport.addEventListener("scroll", resolve));
+  document.querySelector("#banner").scrollIntoView({ behavior: "instant" });
+  await scrollPromise;
+
+  assert_greater_than(visualViewport.pageTop, 0);
+}, "Element.scrollIntoView scrolls visually to an element in nested position: fixed elements");
+</script>
diff --git a/tests/wpt/tests/css/cssom-view/visual-scrollIntoView.html b/tests/wpt/tests/css/cssom-view/visual-scrollIntoView.html
deleted file mode 100644
index 78a3203c585..00000000000
--- a/tests/wpt/tests/css/cssom-view/visual-scrollIntoView.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE html>
-<html>
-<meta name="viewport" content="width=device-width,initial-scale=1">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-actions.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1943865">
-<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1943053">
-<link rel="help" href="https://drafts.csswg.org/cssom-view/#perform-a-scroll">
-<style>
-body {
-  margin: 0px;
-  padding: 0px;
-}
-</style>
-<div id="anchor"></div>
-<div style="position: fixed; bottom: 0;">
-  <div style="position: absolute; bottom: 0;">
-    <input type="text" id="name" />
-  </div>
-</div>
-<script>
-promise_test(async t => {
-  assert_equals(window.scrollY, 0);
-  assert_equals(visualViewport.scale, 1.0);
-  assert_equals(visualViewport.pageTop, 0);
-
-  // Pinch zoom in this document.
-  await new test_driver.Actions()
-    .addPointer("finger1", "touch")
-    .addPointer("finger2", "touch")
-    .pointerMove(parseInt(window.innerWidth / 2),
-                 parseInt(window.innerHeight / 2),
-                 {origin: "viewport", sourceName: "finger1"})
-    .pointerMove(parseInt(window.innerWidth / 2),
-                 parseInt(window.innerHeight / 2),
-                 {origin: "viewport", sourceName: "finger2"})
-    .pointerDown({sourceName: "finger1"})
-    .pointerDown({sourceName: "finger2"})
-    .pointerMove(parseInt(window.innerWidth / 3),
-                 parseInt(window.innerHeight / 3),
-                 {origin: "viewport", sourceName: "finger1"})
-    .pointerMove(parseInt(window.innerWidth / 3 * 2),
-                 parseInt(window.innerHeight / 3 * 2),
-                 {origin: "viewport", sourceName: "finger2"})
-    .pointerUp({sourceName: "finger1"})
-    .pointerUp({sourceName: "finger2"})
-    .send();
-
-  assert_greater_than(visualViewport.scale, 1.0);
-
-  // Suppose that the pinch zoom-in gesture at the center of the document did
-  // move the visual viewport offset.
-  assert_greater_than(visualViewport.pageTop, 0);
-
-  // Move to zero offset of the visual viewport.
-  let scrollPromise =
-      new Promise(resolve => visualViewport.addEventListener("scroll", resolve));
-  document.querySelector('#anchor').scrollIntoView({ behavior: "instant" });
-  await scrollPromise;
-
-  assert_equals(visualViewport.pageTop, 0);
-
-  // Now trigger a scrollIntoView call to an element inside a position:fixed element.
-  scrollPromise =
-      new Promise(resolve => visualViewport.addEventListener("scroll", resolve));
-  document.querySelector('#name').scrollIntoView({ behavior: "instant" });
-  await scrollPromise;
-
-  assert_greater_than(visualViewport.pageTop, 0);
-}, "Element.scrollIntoView scrolls visually");
-</script>
diff --git a/tests/wpt/tests/css/cssom/WEB_FEATURES.yml b/tests/wpt/tests/css/cssom/WEB_FEATURES.yml
index def314c45c7..cabaad6760c 100644
--- a/tests/wpt/tests/css/cssom/WEB_FEATURES.yml
+++ b/tests/wpt/tests/css/cssom/WEB_FEATURES.yml
@@ -5,3 +5,7 @@ features:
   - CSSStyleSheet-constructable-*
   - CSSStyleSheet-constructable.html
   - CSSStyleSheet-template-adoption.html
+- name: document-caretpositionfrompoint
+  files:
+  - caretPositionFromPoint-with-transformation.html
+  - caretPositionFromPoint.html
diff --git a/tests/wpt/tests/css/cssom/cssom-fontfacerule-constructors.html b/tests/wpt/tests/css/cssom/cssom-fontfacerule-constructors.html
index ed1cab257df..7068b822a1c 100644
--- a/tests/wpt/tests/css/cssom/cssom-fontfacerule-constructors.html
+++ b/tests/wpt/tests/css/cssom/cssom-fontfacerule-constructors.html
@@ -52,9 +52,9 @@
 
             test(function(){
                 for (var i = 0; i < validRules.length; ++i) {
-                    assert_equals(validRules.item(i).style.toString(), '[object CSSStyleDeclaration]');
+                    assert_equals(validRules.item(i).style.toString(), '[object CSSFontFaceDescriptors]');
                 }
-            }, 'The style attribute must return a CSSStyleDeclaration block')
+            }, 'The style attribute must return a CSSFontFaceDescriptors block')
 
         </script>
 
diff --git a/tests/wpt/tests/css/cssom/cssstyledeclaration-cssfontrule.tentative.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-cssfontrule.tentative.html
index 2efab276c5b..f56d23e553b 100644
--- a/tests/wpt/tests/css/cssom/cssstyledeclaration-cssfontrule.tentative.html
+++ b/tests/wpt/tests/css/cssom/cssstyledeclaration-cssfontrule.tentative.html
@@ -19,9 +19,4 @@ test(() => {
 }, "a CSSStyleDeclaration for a CSSFontRule contains a unicode-range attribute");
 
 
-test(() => {
-  assert_true("flex-direction" in fontFaceRule.style);
-  assert_idl_attribute(fontFaceRule.style, "flex-direction");
-}, "a CSSStyleDeclaration for a CSSFontRule contains a flex-direction attribute");
-
 </script>
diff --git a/tests/wpt/tests/css/cssom/cssstyledeclaration-csstext-all-shorthand.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-csstext-all-shorthand.html
index 3b408f4cd67..1e224200649 100644
--- a/tests/wpt/tests/css/cssom/cssstyledeclaration-csstext-all-shorthand.html
+++ b/tests/wpt/tests/css/cssom/cssstyledeclaration-csstext-all-shorthand.html
@@ -33,7 +33,11 @@ test(function() {
     cssText += longhand + ": inherit; ";
   }
   style.cssText = cssText;
-  assert_equals(style.cssText, "all: inherit; direction: inherit; unicode-bidi: inherit;");
+  if (CSS.supports("interactivity:inert")) {
+    assert_equals(style.cssText, "all: inherit; direction: inherit; interactivity: inherit; unicode-bidi: inherit;");
+  } else {
+    assert_equals(style.cssText, "all: inherit; direction: inherit; unicode-bidi: inherit;");
+  }
 }, "'all' shorthand with all longhands");
 
 test(function() {
diff --git a/tests/wpt/tests/css/cssom/getComputedStyle-resolved-min-size-auto.html b/tests/wpt/tests/css/cssom/getComputedStyle-resolved-min-size-auto.html
new file mode 100644
index 00000000000..be6010d1999
--- /dev/null
+++ b/tests/wpt/tests/css/cssom/getComputedStyle-resolved-min-size-auto.html
@@ -0,0 +1,96 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSSOM: resolved value of min-width and min-height:auto should be 0 except in certain defined cases</title>
+<link rel="help" href="https://drafts.csswg.org/cssom/#resolved-value">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#valdef-width-auto">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11716">
+<link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<!-- OVERVIEW:
+     * Elements to be tested here must include an 'id'.
+     * We use a "preservesAuto" attribute to tag the elements
+       are expected to preserve "auto" in the resolved value of
+       min-width and min-height.
+  -->
+
+<!-- The test content is in a scrollable div for cosmetic reasons, so that it
+     can be inspected but also doesn't push the testharness output off the
+     bottom of the screen: -->
+<div style="overflow: scroll; width: 300px; height: 200px">
+  <div id="block-box"></div>
+  <div id="inline-box"></div>
+
+  <!-- Elements with a nondefault aspect-ratio preserve 'auto': -->
+  <div id="block-with-valid-aspect-ratio" style="aspect-ratio: 1/1"
+       preservesAuto></div>
+  <div id="block-with-degenerate-aspect-ratio" style="aspect-ratio: 0/1"
+     preservesAuto></div>
+  <div id="block-with-two-part-valid-aspect-ratio"
+       style="aspect-ratio: auto 1/1" preservesAuto></div>
+  <div id="block-with-two-part-degenerate-aspect-ratio"
+       style="aspect-ratio: auto 0/1" preservesAuto></div>
+
+  <!-- Note: aspect-ratio doesn't apply to inline boxes, but we treat it as
+       toggling getComputedStyle to return the true 'min-width:auto' value
+       regardless. -->
+  <span id="inline-with-valid-aspect-ratio" style="aspect-ratio: 1/1"
+        preservesAuto></span>
+  <span id="inline-with-degenerate-aspect-ratio" style="aspect-ratio: 0/1"
+        preservesAuto></span>
+
+  <!-- flex and grid items should preserve 'auto': -->
+  <div style="display: flex">
+    <div id="flex-item-row" preservesAuto></div>
+  </div>
+  <div style="display: flex; flex-direction: column;">
+  <div id="flex-item-column" preservesAuto></div>
+  </div>
+  <div style="display: grid">
+    <div id="grid-item" preservesAuto></div>
+  </div>
+
+  <!-- Per https://drafts.csswg.org/css-sizing/#valdef-width-auto
+       the min-width/min-height:auto value "resolves to zero when no box is
+       generated" (regardless of aspect-ratio & flex/grid-item special cases)
+       -->
+  <div id="display-none" style="display: none"></div>
+  <div id="display-none-valid-aspect-ratio"
+       style="display: none; aspect-ratio:2/1"></div>
+  <div style="display:none">
+    <div id="display-none-subtree-valid-aspect-ratio"
+         style="aspect-ratio:2/1"></div>
+  </div>
+  <div style="display: none">
+    <div style="display: flex">
+      <div id="display-none-subtree-flex-item"></div>
+    </div>
+  </div>
+  <div style="display: none">
+    <div style="display: grid">
+      <div id="display-none-subtree-grid-item"></div>
+    </div>
+  </div>
+</div>
+
+<script>
+for (const e of document.querySelectorAll("[id]")) {
+  test(function() {
+    const cs = getComputedStyle(e);
+    const doesPreserveAuto = e.hasAttribute("preservesAuto");
+    const expectedVal = doesPreserveAuto ?  "auto" : "0px";
+    const expectationMessage = doesPreserveAuto ?
+          "should round-trip through getComputedStyle" :
+          `should be converted to ${expectedVal} in getComputedStyle`;
+
+    for (const prop of ["min-width", "min-height"]) {
+      assert_equals(cs[prop], expectedVal, `${e.id}: '${prop}:auto' ${expectationMessage} (as initial value)`);
+      e.style.setProperty(prop, "auto");
+      assert_equals(cs[prop], expectedVal, `${e.id}: '${prop}:auto' ${expectationMessage} (as specified value)`);
+      e.style.removeProperty(prop);
+    }
+  }, `Resolved value of min-width & min-height 'auto' keyword behaves as expected on element with id="${e.id}"`);
+}
+</script>
diff --git a/tests/wpt/tests/css/cssom/idlharness.html b/tests/wpt/tests/css/cssom/idlharness.html
index e27629c03b1..a54b77a3b94 100644
--- a/tests/wpt/tests/css/cssom/idlharness.html
+++ b/tests/wpt/tests/css/cssom/idlharness.html
@@ -49,14 +49,16 @@ idl_test(
       CSSMarginRule: ['sheet.cssRules[2].cssRules[0]'],
       CSSMediaRule: ['sheet.cssRules[3]'],
       CSSStyleRule: ['sheet.cssRules[4]'],
-      CSSStyleDeclaration: [
+      CSSStyleProperties: [
         'sheet.cssRules[4].style', // CSSStyleRule
-        'sheet.cssRules[2].style', // CSSPageRule
         'sheet.cssRules[2].cssRules[0].style', // CSSMarginRule
         'style_element.style', // ElementCSSInlineStyle for HTMLElement
         'svg_element.style', // ElementCSSInlineStyle for SVGElement
         'getComputedStyle(svg_element)'
       ],
+      CSSPageDescriptors: [
+        'sheet.cssRules[2].style', // CSSPageRule
+      ],
       ProcessingInstruction: ['xmlss_pi'],
       Window: ['window'],
       HTMLElement: [
diff --git a/tests/wpt/tests/css/filter-effects/backdrop-filter-scale-transform-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-scale-transform-ref.html
new file mode 100644
index 00000000000..d7faa0e97a1
--- /dev/null
+++ b/tests/wpt/tests/css/filter-effects/backdrop-filter-scale-transform-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<style>
+  #container {
+    position: relative;
+    width: 200px;
+    height: 200px;
+    transform: scale(1.1);
+  }
+
+  #backdropfilter {
+    background: black;
+    position: relative;
+    width: 100%;
+    height: 100%;
+  }
+</style>
+<div id=container>
+  <div id=backdropfilter></div>
+</div>
+
diff --git a/tests/wpt/tests/css/filter-effects/backdrop-filter-scale-transform.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-scale-transform.html
new file mode 100644
index 00000000000..813fb95d5ad
--- /dev/null
+++ b/tests/wpt/tests/css/filter-effects/backdrop-filter-scale-transform.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<link rel="author" href="mailto:chrishtr@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects-2/#BackdropFilterProperty">
+<link rel="match" href="backdrop-filter-scale-transform-ref.html">
+<style>
+  #container {
+    position: relative;
+    width: 200px;
+    height: 200px;
+    transform: scale(1.1);
+  }
+
+  #backdropfilter {
+    backdrop-filter: invert(100%);
+    position: relative;
+    width: 100%;
+    height: 100%;
+  }
+</style>
+<div id=container>
+  <div id=backdropfilter></div>
+</div>
+
diff --git a/tests/wpt/tests/css/filter-effects/backdrop-filter-transform-popover-crash.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-transform-popover-crash.html
new file mode 100644
index 00000000000..582f0c11965
--- /dev/null
+++ b/tests/wpt/tests/css/filter-effects/backdrop-filter-transform-popover-crash.html
@@ -0,0 +1,17 @@
+<lijnk rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1845184">
+<style>
+* {
+  min-width: 1952643579% !important;
+  transform: skew(0, 1.8turn) scale(1.5794431017420837e+38) translate(215mm, 62%) scaleY(55498.5);
+  border-top-left-radius: 98779902.05ch;
+  backdrop-filter: sepia() invert(870236770%) drop-shadow(16Q -79.35pc 125vw hsla(-1.93deg, 66%, 84%));
+}
+</style>
+<script>
+window.addEventListener("load", () => {
+  let a = document.createElementNS("http://www.w3.org/1999/xhtml", "canvas")
+  document.documentElement.appendChild(a)
+  a.popover = "a"
+  a.togglePopover(true)
+})
+</script>
diff --git a/tests/wpt/tests/css/filter-effects/css-filters-opacity-hit-testing.html b/tests/wpt/tests/css/filter-effects/css-filters-opacity-hit-testing.html
new file mode 100644
index 00000000000..3b288fca4df
--- /dev/null
+++ b/tests/wpt/tests/css/filter-effects/css-filters-opacity-hit-testing.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<title>Elements with 'opacity: 0' should respond to hit testing.</title>
+<link rel="author" title="Psychpsyo" href="psychpsyo@gmail.com">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects/#FilterProperty">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  div {
+    width: 100px;
+    height: 100px;
+    opacity: 0;
+  }
+</style>
+<div></div>
+<script>
+  test(() => {
+    assert_equals(document.elementFromPoint(50, 50).tagName, "DIV", "element with 'opacity: 0' doesn't respond to hit testing");
+  });
+</script>
diff --git a/tests/wpt/tests/css/filter-effects/empty-element-with-filter-004.html b/tests/wpt/tests/css/filter-effects/empty-element-with-filter-004.html
new file mode 100644
index 00000000000..38f746ff405
--- /dev/null
+++ b/tests/wpt/tests/css/filter-effects/empty-element-with-filter-004.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>CSS Filter Effects: ref filters on zero-sized block elements with 'will-change: transform' and no visible content</title>
+<link rel="help" href="https://drafts.fxtf.org/filter-effects/#FilterProperty">
+<link rel="match" href="reference/green-100x100.html">
+<meta name="assert" content="This test ensures we properly render filters on block elements with 'will-change: transform' that are zero-sized with no visible content.">
+<style>
+  .flood {
+    width: 0px;
+    height: 0px;
+    filter: url(#f_flood);
+    will-change: transform;
+  }
+</style>
+<div class="flood"></div>
+<svg xmlns="http://www.w3.org/2000/svg" width="0" height="0" version="1.1">
+  <defs>
+    <filter id="f_flood" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" x="0" y="0" width="100" height="100">
+      <feFlood flood-color="green"/>
+    </filter>
+  </defs>
+</svg>
diff --git a/tests/wpt/tests/css/filter-effects/feComposite-intersection-feTile-input-ref.html b/tests/wpt/tests/css/filter-effects/feComposite-intersection-feTile-input-ref.html
new file mode 100644
index 00000000000..4345e3d8ac1
--- /dev/null
+++ b/tests/wpt/tests/css/filter-effects/feComposite-intersection-feTile-input-ref.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<div style="position: absolute; top: 20px; left: 20px;
+            width: 100px; height: 100px; background: black">
+</div>
diff --git a/tests/wpt/tests/css/filter-effects/feComposite-intersection-feTile-input-svg.html b/tests/wpt/tests/css/filter-effects/feComposite-intersection-feTile-input-svg.html
new file mode 100644
index 00000000000..7c9fd6a6f4d
--- /dev/null
+++ b/tests/wpt/tests/css/filter-effects/feComposite-intersection-feTile-input-svg.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://crbug.com/373759987">
+<link rel="match"  href="feComposite-intersection-feTile-input-ref.html">
+<style>body { margin: 0; }</style>
+<svg>
+  <filter id="test" filterUnits="userSpaceOnUse"
+          color-interpolation-filters="sRGB" x="0" y="0">
+    <feColorMatrix width="5" height="5"></feColorMatrix>
+    <feTile result="fill"></feTile>
+    <feColorMatrix in="SourceGraphic" values="0 0 0 0 0
+                                              0 0 0 0 0
+                                              0 0 0 0 0
+                                              0 1 0 0 0">
+    </feColorMatrix>
+    <feComposite in="fill" operator="in"></feComposite>
+  </filter>
+    <g filter="url(#test)">
+    <rect fill="none" stroke="black" stroke-width="20" x="10" y="10" width="120" height="120"/>
+    <rect fill="#0f0" x="20" y="20" width="100" height="100" opacity="0.5"/>
+  </g>
+</svg>
diff --git a/tests/wpt/tests/css/filter-effects/feComposite-intersection-feTile-input.html b/tests/wpt/tests/css/filter-effects/feComposite-intersection-feTile-input.html
new file mode 100644
index 00000000000..1bf1f4b8fba
--- /dev/null
+++ b/tests/wpt/tests/css/filter-effects/feComposite-intersection-feTile-input.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://crbug.com/373759987">
+<link rel="match"  href="feComposite-intersection-feTile-input-ref.html">
+<svg width="0" height="0">
+  <filter id="test" color-interpolation-filters="sRGB" x="0" y="0">
+    <feColorMatrix width="5" height="5"></feColorMatrix>
+    <feTile result="fill"></feTile>
+    <feColorMatrix in="SourceGraphic" values="0 0 0 0 0
+                                              0 0 0 0 0
+                                              0 0 0 0 0
+                                              0 1 0 0 0">
+    </feColorMatrix>
+    <feComposite in="fill" operator="in"></feComposite>
+  </filter>
+</svg>
+<div></div>
+<style>
+body {
+  margin: 0;
+}
+div {
+  position: absolute;
+  top: 0;
+  border: solid 20px;
+  width: 100px; height: 100px;
+  filter: url(#test);
+}
+div::after {
+  opacity: 0.5;
+  position: absolute;
+  inset: 0;
+  background: #0f0;
+  content: '';
+}
+</style>
diff --git a/tests/wpt/tests/css/filter-effects/parsing/flood-opacity-computed.svg b/tests/wpt/tests/css/filter-effects/parsing/flood-opacity-computed.svg
index a395eda22e3..9024aaa4f3f 100644
--- a/tests/wpt/tests/css/filter-effects/parsing/flood-opacity-computed.svg
+++ b/tests/wpt/tests/css/filter-effects/parsing/flood-opacity-computed.svg
@@ -19,6 +19,8 @@ test_computed_value("flood-opacity", "3", "1");
 test_computed_value("flood-opacity", "-100%", "0");
 test_computed_value("flood-opacity", "50%", "0.5");
 test_computed_value("flood-opacity", "300%", "1");
+test_computed_value("flood-opacity", "calc(0.5 * sign(10em - 1px))", "0.5");
+test_computed_value("flood-opacity", "calc(50% * sign(10em - 1px))", "0.5");
 
   ]]></script>
 </svg>
diff --git a/tests/wpt/tests/css/filter-effects/parsing/flood-opacity-valid.svg b/tests/wpt/tests/css/filter-effects/parsing/flood-opacity-valid.svg
index 67eb37fad5e..7c11b26bc92 100644
--- a/tests/wpt/tests/css/filter-effects/parsing/flood-opacity-valid.svg
+++ b/tests/wpt/tests/css/filter-effects/parsing/flood-opacity-valid.svg
@@ -19,6 +19,7 @@ test_valid_value("flood-opacity", "3");
 test_valid_value("flood-opacity", "-100%", "-1");
 test_valid_value("flood-opacity", "50%", "0.5");
 test_valid_value("flood-opacity", "300%", "3");
+test_valid_value("flood-opacity", "calc(0.5 * sign(10em - 1px))");
 
   ]]></script>
 </svg>
diff --git a/tests/wpt/tests/css/filter-effects/svg-feimage-005.html b/tests/wpt/tests/css/filter-effects/svg-feimage-005.html
index 21846db376b..52ecaac3ffd 100644
--- a/tests/wpt/tests/css/filter-effects/svg-feimage-005.html
+++ b/tests/wpt/tests/css/filter-effects/svg-feimage-005.html
@@ -7,6 +7,7 @@
   filter: url(#f);
   width: 100px;
   height: 100px;
+  background-color: red;
 }
 </style>
 <div id="target"></div>
diff --git a/tests/wpt/tests/css/geometry/DOMMatrix-001.html b/tests/wpt/tests/css/geometry/DOMMatrix-001.html
index f578da076cb..3436e17ced0 100644
--- a/tests/wpt/tests/css/geometry/DOMMatrix-001.html
+++ b/tests/wpt/tests/css/geometry/DOMMatrix-001.html
@@ -113,6 +113,8 @@
             ['translateX    (5px)',
              'scale(2 2) translateX(5) translateY(5)',
              'scale(2, 2), translateX(5)  ,translateY(5)',
+             'scale(sign(1em))',
+             'scale(sibling-index())',
              'translateX(5em)',
              'translateX(5ex)',
              'translateX(5ch)',
@@ -130,10 +132,14 @@
              'translateX(5vmin)',
              'translateX(5vmax)',
              'translateX(5%)',
+             'translateX(calc(10px * sign(1em - 10px)))',
+             'translateX(calc(10px * sibling-index()))',
              'rotate(5)',
              'rotate(5, 5, 5)',
              'rotate(5, 5px, 5px)',
              'rotate(5deg, 5px, 5px)',
+             'rotate(calc(5deg * sign(1em - 10px)))',
+             'rotate(calc(5deg * sibling-index()))',
              ' ',
              '/**/',
              '\0',
diff --git a/tests/wpt/tests/css/mediaqueries/WEB_FEATURES.yml b/tests/wpt/tests/css/mediaqueries/WEB_FEATURES.yml
index cc952ac2009..7f15b7fa475 100644
--- a/tests/wpt/tests/css/mediaqueries/WEB_FEATURES.yml
+++ b/tests/wpt/tests/css/mediaqueries/WEB_FEATURES.yml
@@ -3,28 +3,29 @@ features:
   files:
   - prefers-color-scheme.html
   - prefers-color-scheme-*
-features:
 - name: forced-colors
   files:
   - forced-colors.html
-features:
 - name: prefers-contrast
   files:
   - prefers-contrast.html
-features:
 - name: prefers-reduced-transparency
   files:
   - prefers-reduced-transparency.html
-features:
 - name: overflow
   files:
   - overflow-media-features.html
-features:
 - name: dynamic-range
   files:
   - dynamic-range.html
-features:
 - name: display-mode
   files:
   - display-mode.html
   - display-mode.tentative.html
+- name: update
+  files:
+  - update-media-feature.html
+- name: scripting
+  files:
+  - scripting.html
+  - scripting-*
diff --git a/tests/wpt/tests/css/motion/animation/offset-path-interpolation-008.html b/tests/wpt/tests/css/motion/animation/offset-path-interpolation-008.html
index 2af20f78d1f..5fb7c7c333c 100644
--- a/tests/wpt/tests/css/motion/animation/offset-path-interpolation-008.html
+++ b/tests/wpt/tests/css/motion/animation/offset-path-interpolation-008.html
@@ -251,9 +251,9 @@
         from: 'path("M 5 5 A 10,20 0 0,0 15,-15 a 30,30 30 1,1 15,-5 A 10,5 0 0,0 25 20")',
         to: 'shape(from 15px 15px, arc to 5px -25px of 20px 30px, arc by 25px -15px of 20px cw rotate 270deg small, arc to 25px 20px of 10px 5px small cw)'
       }, [
-        {at: -0.3, expect: 'shape(from 2px 2px, arc to 18px -12px of 7px 17px ccw small, arc by 12px -2px of 33px 33px rotate -42deg cw large , arc to 25px 20px of 10px 5px ccw small)'},
+        {at: -0.3, expect: 'shape(from 2px 2px, arc to 18px -12px of  7px 17px ccw small, arc by 12px -2px of 33px 33px rotate -42deg cw large, arc to 25px 20px of 10px 5px ccw small)'},
         {at: 0, expect: 'shape(from 5px 5px, arc to 15px -15px of 10px 20px, arc by 15px -5px of 30px cw rotate 30deg large, arc to 25px 20px of 10px 5px small)'},
-        {at: 0.3, expect: 'shape(from 8px 8px, arc to 12px -18px of 13px 23px ccw small, arc by 18px -8px of 27px 27px rotate 102deg cw large, arc to 25px 20px of 10px 5px ccw small )'},
+        {at: 0.3, expect: 'shape(from 8px 8px, arc to 12px -18px of 13px 23px ccw small, arc by 18px -8px of 27px 27px rotate 102deg cw large, arc to 25px 20px of 10px 5px cw small)'},
         {at: 0.5, expect: 'shape(from 10px 10px, arc to 10px -20px of 15px 25px ccw small, arc by 20px -10px of 25px rotate 150deg cw large, arc to 25px 20px of 10px 5px cw small)'},
         {at: 1, expect: 'shape(from 15px 15px, arc to 5px -25px of 20px 30px, arc by 25px -15px of 20px rotate 270deg cw small, arc to 25px 20px of 10px 5px cw small)'},
         {at: 1.5, expect: 'shape(from 20px 20px, arc to 0px -30px of 25px 35px ccw small, arc by 30px -20px of 15px rotate 390deg cw small, arc to 25px 20px of 10px 5px cw small)'},
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-shape-001.html b/tests/wpt/tests/css/motion/offset-path-shape-shape-001.html
index 4cca1744d06..dd2fc6327b8 100644
--- a/tests/wpt/tests/css/motion/offset-path-shape-shape-001.html
+++ b/tests/wpt/tests/css/motion/offset-path-shape-shape-001.html
@@ -14,6 +14,7 @@
   width: 600px;
   height: 400px;
 }
+
 #box {
   width: 100px;
   height: 100px;
diff --git a/tests/wpt/tests/css/motion/parsing/offset-path-shape-computed.html b/tests/wpt/tests/css/motion/parsing/offset-path-shape-computed.html
index 8904eaf16a2..c9ecc3acb06 100644
--- a/tests/wpt/tests/css/motion/parsing/offset-path-shape-computed.html
+++ b/tests/wpt/tests/css/motion/parsing/offset-path-shape-computed.html
@@ -23,9 +23,9 @@ test_computed_value("offset-path", "shape(from 1em 50px, line to 10rem 10%)", "s
 test_computed_value("offset-path", "shape(from 10px 10px, move by 10px 5px, line by 20px 40%, close)");
 test_computed_value("offset-path", "shape(from 10px 10px, hline by 10px, vline to 5rem)", "shape(from 10px 10px, hline by 10px, vline to 80px)");
 test_computed_value("offset-path", "shape(from 10px 10px, vline by 5%, hline to 1px)");
-test_computed_value("offset-path", "shape(from 10px 10px, curve to 50px 20px via 10rem 1%)", "shape(from 10px 10px, curve to 50px 20px via 160px 1%)");
-test_computed_value("offset-path", "shape(from 10px 10px, curve to 50px 20px via 10rem 1px 20% 1em)", "shape(from 10px 10px, curve to 50px 20px via 160px 1px 20% 16px)");
-test_computed_value("offset-path", "shape(from 10px 10px, smooth to 50px 20px via 10rem 1%)", "shape(from 10px 10px, smooth to 50px 20px via 160px 1%)");
+test_computed_value("offset-path", "shape(from 10px 10px, curve to 50px 20px with 10rem 1%)", "shape(from 10px 10px, curve to 50px 20px with 160px 1%)");
+test_computed_value("offset-path", "shape(from 10px 10px, curve to 50px 20px with 10rem 1px / 20% 1em)", "shape(from 10px 10px, curve to 50px 20px with 160px 1px / 20% 16px)");
+test_computed_value("offset-path", "shape(from 10px 10px, smooth to 50px 20px with 10rem 1%)", "shape(from 10px 10px, smooth to 50px 20px with 160px 1%)");
 test_computed_value("offset-path", "shape(from 10px 10px, smooth to 50px 3pt)", "shape(from 10px 10px, smooth to 50px 4px)");
 test_computed_value("offset-path", "shape(from 10px 10px, arc to 50px 3pt of 10px 10px)", "shape(from 10px 10px, arc to 50px 4px of 10px)");
 test_computed_value("offset-path", "shape(from 10px 10px, arc to 50px 3pt of 10px 10px small rotate 0deg)", "shape(from 10px 10px, arc to 50px 4px of 10px)");
diff --git a/tests/wpt/tests/css/motion/parsing/offset-path-shape-parsing.html b/tests/wpt/tests/css/motion/parsing/offset-path-shape-parsing.html
index 6ca288b660e..013cea2c821 100644
--- a/tests/wpt/tests/css/motion/parsing/offset-path-shape-parsing.html
+++ b/tests/wpt/tests/css/motion/parsing/offset-path-shape-parsing.html
@@ -23,26 +23,26 @@ test_valid_value("offset-path", "shape(from 1ch -50px, line to -10% 12px)");
 test_valid_value("offset-path", "shape(from 10px 10px, move by 10px 5px, line by 20px 40%, close)");
 test_valid_value("offset-path", "shape(from 10px 10px, hline by 10px, vline to 5rem)");
 test_valid_value("offset-path", "shape(from 10px 10px, vline by 5%, hline to 1vw)");
-test_valid_value("offset-path", "shape(from 10px 10px, curve to 50px 20px via 10rem 1%)");
-test_valid_value("offset-path", "shape(from 10px 10px, curve to 50px 20px via 10rem 1px 20vh 1ch)");
-test_valid_value("offset-path", "shape(from 10px 10px, curve by 50px 20px via 10rem 1px 20vh 1ch)");
-test_valid_value("offset-path", "shape(from 10px 10px, smooth to 50px 20px via 10rem 1%)");
+test_valid_value("offset-path", "shape(from 10px 10px, curve to 50px 20px with 10rem 1%)");
+test_valid_value("offset-path", "shape(from 10px 10px, curve to 50px 20px with 10rem 1px / 20vh 1ch)");
+test_valid_value("offset-path", "shape(from 10px 10px, curve by 50px 20px with 10rem 1px / 20vh 1ch)");
+test_valid_value("offset-path", "shape(from 10px 10px, smooth to 50px 20px with 10rem 1%)");
 test_valid_value("offset-path", "shape(from 10px 10px, smooth to 50px 1pt)");
 test_valid_value("offset-path", "shape(from 10px 10px, arc to 50px 1pt of 10px 10px)", "shape(from 10px 10px, arc to 50px 1pt of 10px)");
 test_valid_value("offset-path", "shape(from 10px 10px, arc to 50px 1pt of 10px 10px small rotate 0deg)", "shape(from 10px 10px, arc to 50px 1pt of 10px)");
 test_valid_value("offset-path", "shape(from 10% 1rem, arc to 50px 1pt of 20% cw large rotate 25deg)", "shape(from 10% 1rem, arc to 50px 1pt of 20% cw large rotate 25deg)");
+test_valid_value("offset-path", "shape(evenodd from 0px 0px, line to 10px 10px)");
+test_valid_value("offset-path", "shape(nonzero from 0px 0px, line to 10px 10px)", "shape(from 0px 0px, line to 10px 10px)");
+test_valid_value("offset-path", "shape(evenodd from 0px 0px, close)");
+test_valid_value("offset-path", "shape(from 10px 10px, curve to 50px 20px with  10rem center)", "shape(from 10px 10px, curve to 50px 20px with 10rem center)");
 
 // nonsense
-test_invalid_value("offset-path", "shape(evenodd from 0px 0px, line to 10px 10px)");
-test_invalid_value("offset-path", "shape(nonzero from 0px 0px, line to 10px 10px)");
-test_invalid_value("offset-path", "shape(evenodd from 0px 0px, close)");
 test_invalid_value("offset-path", "shape(from 0px 0px, close path)");
-test_invalid_value("offset-path", "shape(from 10px 10px, curve to 50px 20px via 10rem)");
-test_invalid_value("offset-path", "shape(from 10px 10px, curve to 50px 20px via 10rem 1% 12px)");
+test_invalid_value("offset-path", "shape(from 10px 10px, curve to 50px 20px with  10rem 1% 12px)");
 test_invalid_value("offset-path", "shape(from 10px 10px, hline byy 10px, vline to 5rem)");
 test_invalid_value("offset-path", "shape(from 10px 10px, vline by 5% hline by 1vw");
-test_invalid_value("offset-path", "shape(from 10px 10px, smooth to 50px 20px via 10rem)");
-test_invalid_value("offset-path", "shape(from 10px 10px, smooth to 50px 20px via 10rem 2px 2pt)");
+test_invalid_value("offset-path", "shape(from 10px 10px, smooth to 50px 20px via  10rem)");
+test_invalid_value("offset-path", "shape(from 10px 10px, smooth to 50px 20px via  10rem 2px 2pt)");
 test_invalid_value("offset-path", "shape()");
 test_invalid_value("offset-path", "shape(from)");
 test_invalid_value("offset-path", "shape(from 0px)");
diff --git a/tests/wpt/tests/css/printing/background-image-print-ref.html b/tests/wpt/tests/css/printing/background-image-print-ref.html
index 305aa2fce2f..8fb1b3998f0 100644
--- a/tests/wpt/tests/css/printing/background-image-print-ref.html
+++ b/tests/wpt/tests/css/printing/background-image-print-ref.html
@@ -4,6 +4,9 @@
 <meta charset="utf-8">
 <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1769429">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     font-family: century;
     font-weight: bold;
diff --git a/tests/wpt/tests/css/printing/background-image-print.html b/tests/wpt/tests/css/printing/background-image-print.html
index 8d294107406..2119f6952a4 100644
--- a/tests/wpt/tests/css/printing/background-image-print.html
+++ b/tests/wpt/tests/css/printing/background-image-print.html
@@ -7,6 +7,9 @@
 <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1769429">
 <meta name="fuzzy" content="maxDifference=0-3;totalPixels=0-400">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   body {
     font-family: century;
     font-weight: bold;
diff --git a/tests/wpt/tests/css/reference/ref-filled-green-100px-square-print-ref.html b/tests/wpt/tests/css/reference/ref-filled-green-100px-square-print-ref.html
new file mode 100644
index 00000000000..f55a4cf12ec
--- /dev/null
+++ b/tests/wpt/tests/css/reference/ref-filled-green-100px-square-print-ref.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; height:100px; print-color-adjust:exact; background-color:green;"></div>
diff --git a/tests/wpt/tests/css/selectors/dir-selector-auto-direction-change-001.html b/tests/wpt/tests/css/selectors/dir-selector-auto-direction-change-001.html
index f6c6393b08a..f376e33e2ba 100644
--- a/tests/wpt/tests/css/selectors/dir-selector-auto-direction-change-001.html
+++ b/tests/wpt/tests/css/selectors/dir-selector-auto-direction-change-001.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
 <head>
-    <title>CSS Selectors Level 4 Test: Check for correctly updating :dir=auto when the the directionality is changed in a display:none subtree </title>
+    <title>CSS Selectors Level 4 Test: Check for correctly updating :dir=auto when the directionality is changed in a display:none subtree </title>
     <meta charset="utf8">
     <link rel="author" title="Miyoung Shin" href="mailto:myid.shin@igalia.com">
     <link rel="help" href="http://www.w3.org/TR/selectors4/#dir-pseudo">
diff --git a/tests/wpt/tests/css/selectors/open-pseudo.html b/tests/wpt/tests/css/selectors/open-pseudo.html
index 0f3b9f3c379..c215bf18645 100644
--- a/tests/wpt/tests/css/selectors/open-pseudo.html
+++ b/tests/wpt/tests/css/selectors/open-pseudo.html
@@ -5,51 +5,85 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
+<style>
+
+dialog:open + #afterdialog,
+details:open + #afterdetails,
+select:open + #afterselect {
+  will-change: text-decoration;
+}
+
+</style>
 
 <dialog>dialog</dialog>
+<p id="afterdialog"></p>
 
 <details>details</details>
+<p id="afterdetails"></p>
 
 <select>
   <option>one</option>
 </select>
+<p id="afterselect"></p>
 
 <script>
 test(() => {
   const dialog = document.querySelector('dialog');
+  const after = document.getElementById("afterdialog");
   assert_false(dialog.matches(':open'),
     ':open should not match when the dialog is closed.');
+  assert_equals(getComputedStyle(after).willChange, "auto",
+                ":open style should not be applied when the dialog is closed");
 
   dialog.show();
   assert_true(dialog.matches(':open'),
-    ':open should match after dialog.open().');
+    ':open should match after dialog.show().');
+  assert_equals(getComputedStyle(after).willChange, "text-decoration",
+                ":open style should be applied after dialog.show()");
 
   dialog.close();
+  assert_equals(getComputedStyle(after).willChange, "auto",
+                ":open style should not be applied when the dialog is closed (2)");
+
   dialog.showModal();
   assert_true(dialog.matches(':open'),
     ':open should match after dialog.showModal().');
+  assert_equals(getComputedStyle(after).willChange, "text-decoration",
+                ":open style should be applied after dialog.showModal()");
 
   dialog.close();
+  assert_equals(getComputedStyle(after).willChange, "auto",
+                ":open style should not be applied when the dialog is closed (3)");
 }, 'The dialog element should support :open.');
 
 test(() => {
   const details = document.querySelector('details');
+  const after = document.getElementById("afterdetails");
   assert_false(details.matches(':open'),
     ':open should not match when the details is closed.');
+  assert_equals(getComputedStyle(after).willChange, "auto",
+                ":open style should not be applied when the details is closed");
 
   details.open = true;
   assert_true(details.matches(':open'),
     ':open should match when the details is open.');
+  assert_equals(getComputedStyle(after).willChange, "text-decoration",
+                ":open style should be applied when the details is open");
 }, 'The details element should support :open.');
 
 promise_test(async () => {
   const select = document.querySelector('select');
+  const after = document.getElementById("afterselect");
   assert_false(select.matches(':open'),
     ':open should not match when the select is closed.');
+  assert_equals(getComputedStyle(after).willChange, "auto",
+                ":open style should not be applied when the select is closed");
 
   await test_driver.click(select);
   await new Promise(requestAnimationFrame);
   assert_true(select.matches(':open'),
     ':open should match when the select is open.');
+  assert_equals(getComputedStyle(after).willChange, "text-decoration",
+                ":open style should be applied when the select is open");
 }, 'The select element should support :open.');
 </script>
diff --git a/tests/wpt/tests/css/selectors/parsing/WEB_FEATURES.yml b/tests/wpt/tests/css/selectors/parsing/WEB_FEATURES.yml
index f3453b29162..ab1fe19e4d1 100644
--- a/tests/wpt/tests/css/selectors/parsing/WEB_FEATURES.yml
+++ b/tests/wpt/tests/css/selectors/parsing/WEB_FEATURES.yml
@@ -9,3 +9,6 @@ features:
 - name: state
   files:
   - parse-state.html
+- name: has-slotted
+  files:
+  - parse-has-slotted.tentative.html
diff --git a/tests/wpt/tests/css/selectors/popover-open-with-has-sibling-selector.html b/tests/wpt/tests/css/selectors/popover-open-with-has-sibling-selector.html
new file mode 100644
index 00000000000..85f433e1791
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/popover-open-with-has-sibling-selector.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
+<link rel="help" href="https://drafts.csswg.org/selectors/#selectordef-popover-open">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<style>
+    .half-square {
+        width: 100px;
+        height: 50px;
+        background-color: red;
+    }
+    #p1-sibling:not(:has(+:popover-open)) {
+        background-color: green;
+    }
+    #p2-sibling:has(+:popover-open) {
+        background-color: green;
+    }
+    [popover] {
+        visibility: hidden;
+    }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div>
+    <div id="p1-sibling" class="half-square"></div>
+    <div popover id="p1">Popover 1</div>
+</div>
+
+<div>
+    <div id="p2-sibling" class="half-square"></div>
+    <div popover id="p2">Popover 2</div>
+</div>
+
+<script>
+    addEventListener("load", async () => {
+        p1.showPopover();
+        await new Promise(r => requestAnimationFrame(r));
+        p1.hidePopover();
+        await new Promise(r => requestAnimationFrame(r));
+        p2.showPopover();
+        document.documentElement.classList.remove("reftest-wait");
+    });
+</script>
+</html>
diff --git a/tests/wpt/tests/custom-elements/historical.html b/tests/wpt/tests/custom-elements/historical.html
index 5a961b13ad7..a2713ad57c5 100644
--- a/tests/wpt/tests/custom-elements/historical.html
+++ b/tests/wpt/tests/custom-elements/historical.html
@@ -1,35 +1,22 @@
 <!doctype html>
-<title>Custom Elements v0 features</title>
+<title>Custom Elements historical features</title>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script>
 test(() => {
-  assert_false('registerElement' in document)
-}, 'document.registerElement should not exist')
+  assert_false('registerElement' in document);
+}, 'document.registerElement should not exist');
 
-// These tests should pass as long as v0 isn't supported:
-// v0: a 2nd string argument for createElement.
-// v1: a ElementCreationOptions (dictionary) argument.
 test(() => {
-  try {
-    const element = document.createElement('x', 'string')
-    // If neither v0/v1 are supported, then there should be no is attribute.
-    assert_false(element.hasAttribute('is'))
-  } catch (e) {
-    // If v1 is supported, then converting string to dictionary should throw.
-    assert_throws_js(TypeError, function() { throw e })
-  }
-}, 'document.createElement(localName, "string") should not work')
+  const dummy = document.createElement("div");
+  const shadowRoot = dummy.attachShadow({ mode: "closed" });
+  assert_equals(shadowRoot.importNode, undefined);
+  assert_equals(shadowRoot.createElement, undefined);
+  assert_equals(shadowRoot.createElementNS, undefined);
+}, "ShadowRoot doesn't have importNode or createElement[NS]");
 
-// createElementNS is analagous, but for the 3rd argument
 test(() => {
-  try {
-    const element = document.createElementNS(null, 'x', 'string')
-    // If neither v0/v1 are supported, then there should be no is attribute.
-    assert_false(element.hasAttribute('is'))
-  } catch (e) {
-    // If v1 is supported, then converting string to dictionary should throw.
-    assert_throws_js(TypeError, function() { throw e })
-  }
-}, 'document.createElementNS(namespace, qualifiedName, "string") should not work')
+  const dummy = document.createElement("div");
+  dummy.attachShadow({ mode: "closed", get registry() { throw "FAIL" } });
+}, "attachShadow() does not recognize a registry member");
 </script>
diff --git a/tests/wpt/tests/custom-elements/pseudo-class-defined-print-ref.html b/tests/wpt/tests/custom-elements/pseudo-class-defined-print-ref.html
index 1ed6da59582..903f3f7d8dd 100644
--- a/tests/wpt/tests/custom-elements/pseudo-class-defined-print-ref.html
+++ b/tests/wpt/tests/custom-elements/pseudo-class-defined-print-ref.html
@@ -1,5 +1,8 @@
 <!doctype html>
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   div {
     width: 100px;
     height: 100px;
diff --git a/tests/wpt/tests/custom-elements/pseudo-class-defined-print.html b/tests/wpt/tests/custom-elements/pseudo-class-defined-print.html
index 24e1bb7b03f..a6b87bb0bb9 100644
--- a/tests/wpt/tests/custom-elements/pseudo-class-defined-print.html
+++ b/tests/wpt/tests/custom-elements/pseudo-class-defined-print.html
@@ -1,6 +1,9 @@
 <!doctype html>
 <link rel="match" href="pseudo-class-defined-print-ref.html">
 <style>
+  :root {
+    print-color-adjust: exact;
+  }
   custom-element {
     display: block;
     width: 100px;
diff --git a/tests/wpt/tests/custom-elements/registries/Construct.html b/tests/wpt/tests/custom-elements/registries/Construct.html
new file mode 100644
index 00000000000..a5e825f439a
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/Construct.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<link rel="help" href="https://github.com/whatwg/html/issues/10854">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+
+test(() => {
+    class ABElement extends HTMLElement { };
+    const scopedRegistry = new CustomElementRegistry;
+    scopedRegistry.define('a-b', ABElement);
+    assert_throws_js(TypeError, () => new ABElement);
+}, 'A constructor with only a scoped custom element registry definition should fail upon construction');
+
+test(() => {
+    class CElement extends HTMLElement { };
+    const scopedRegistry = new CustomElementRegistry;
+    scopedRegistry.define('scoped-c', CElement);
+    customElements.define('global-c', CElement);
+    const cElement = new CElement;
+    assert_equals(cElement.localName, 'global-c');
+}, 'A constructor uses the global registry to create an element');
+
+test(() => {
+    let fgElement;
+    let hiElement;
+    class DEElement extends HTMLElement {
+        constructor() {
+            fgElement = document.createElement('f-g', {customElementRegistry: scopedRegistry2});
+            super();
+            hiElement = document.createElement('h-i', {customElementRegistry: scopedRegistry2});
+        }
+    };
+    class FGElement extends HTMLElement { }
+    class HIElement extends HTMLElement { }
+    const scopedRegistry1 = new CustomElementRegistry;
+    scopedRegistry1.define('d-e', DEElement);
+    const scopedRegistry2 = new CustomElementRegistry;
+    scopedRegistry2.define('f-g', FGElement);
+    scopedRegistry2.define('h-i', HIElement);
+
+    const deElement = document.createElement('d-e', {customElementRegistry: scopedRegistry1});
+    assert_true(deElement instanceof DEElement);
+    assert_equals(deElement.customElementRegistry, scopedRegistry1);
+    assert_true(fgElement instanceof FGElement);
+    assert_equals(fgElement.customElementRegistry, scopedRegistry2);
+    assert_true(hiElement instanceof HIElement);
+    assert_equals(hiElement.customElementRegistry, scopedRegistry2);
+}, 'A constructor creating an element from another registry before or after super call should work');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/custom-elements/revamped-scoped-registry/CustomElementRegistry-define.tentative.html b/tests/wpt/tests/custom-elements/registries/CustomElementRegistry-define.html
similarity index 100%
rename from tests/wpt/tests/custom-elements/revamped-scoped-registry/CustomElementRegistry-define.tentative.html
rename to tests/wpt/tests/custom-elements/registries/CustomElementRegistry-define.html
diff --git a/tests/wpt/tests/custom-elements/registries/CustomElementRegistry-initialize.html b/tests/wpt/tests/custom-elements/registries/CustomElementRegistry-initialize.html
new file mode 100644
index 00000000000..c4b291751ec
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/CustomElementRegistry-initialize.html
@@ -0,0 +1,141 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<link rel="help" href="https://github.com/whatwg/html/issues/10854">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="host">
+    <template shadowrootmode="open" shadowrootclonable="true" shadowrootcustomelementregistry>
+        <a-b>
+            <template shadowrootmode="open" shadowrootclonable="true" shadowrootcustomelementregistry>
+                <c-d/><c-d>
+            </template>
+        </a-b>
+        <ef></ef>
+    </template>
+</div>
+<div id="host-with-registry">
+    <template shadowrootmode="open" shadowrootclonable="true">
+        <a-b></a-b>
+        <ef></ef>
+    </template>
+</div>
+<script>
+
+test(() => {
+    assert_equals(typeof(window.customElements.initialize), 'function');
+    assert_equals(typeof((new CustomElementRegistry).initialize), 'function');
+}, 'initialize is a function on both global and scoped CustomElementRegistry');
+
+test(() => {
+    const clone = host.cloneNode(true);
+    const shadowRoot = clone.shadowRoot;
+    assert_equals(shadowRoot.customElementRegistry, null);
+    assert_equals(shadowRoot.querySelector('a-b').customElementRegistry, null);
+    assert_equals(shadowRoot.querySelector('ef').customElementRegistry, null);
+    window.customElements.initialize(shadowRoot);
+    assert_equals(shadowRoot.customElementRegistry, window.customElements);
+    assert_equals(shadowRoot.querySelector('a-b').customElementRegistry, window.customElements);
+    assert_equals(shadowRoot.querySelector('ef').customElementRegistry, window.customElements);
+}, 'initialize sets element.customElementRegistry to the global registry');
+
+test(() => {
+    const clone = host.cloneNode(true);
+    const shadowRoot = clone.shadowRoot;
+    assert_equals(shadowRoot.customElementRegistry, null);
+    assert_equals(shadowRoot.querySelector('a-b').customElementRegistry, null);
+    assert_equals(shadowRoot.querySelector('ef').customElementRegistry, null);
+    window.customElements.initialize(shadowRoot);
+    assert_equals(shadowRoot.customElementRegistry, window.customElements);
+    assert_equals(shadowRoot.querySelector('a-b').customElementRegistry, window.customElements);
+    assert_equals(shadowRoot.querySelector('ef').customElementRegistry, window.customElements);
+    assert_equals(shadowRoot.querySelector('a-b').shadowRoot.customElementRegistry, null);
+    assert_equals(shadowRoot.querySelector('a-b').shadowRoot.querySelector('c-d').customElementRegistry, null);
+}, 'initialize does not set the registry of nested shadow tree to the global registry');
+
+
+test(() => {
+    const clone = host.cloneNode(true);
+    const shadowRoot = clone.shadowRoot;
+    assert_equals(shadowRoot.customElementRegistry, null);
+    assert_equals(shadowRoot.querySelector('a-b').customElementRegistry, null);
+    assert_equals(shadowRoot.querySelector('ef').customElementRegistry, null);
+    const registry = new CustomElementRegistry;
+    registry.initialize(shadowRoot);
+    assert_equals(shadowRoot.customElementRegistry, registry);
+    assert_equals(shadowRoot.querySelector('a-b').customElementRegistry, registry);
+    assert_equals(shadowRoot.querySelector('ef').customElementRegistry, registry);
+}, 'initialize sets element.customElementRegistry to a scoped registry');
+
+test(() => {
+    const clone = host.cloneNode(true);
+    const shadowRoot = clone.shadowRoot;
+    assert_equals(shadowRoot.customElementRegistry, null);
+    assert_equals(shadowRoot.querySelector('a-b').customElementRegistry, null);
+    assert_equals(shadowRoot.querySelector('ef').customElementRegistry, null);
+    const registry = new CustomElementRegistry;
+    registry.initialize(shadowRoot);
+    assert_equals(shadowRoot.customElementRegistry, registry);
+    assert_equals(shadowRoot.querySelector('a-b').customElementRegistry, registry);
+    assert_equals(shadowRoot.querySelector('ef').customElementRegistry, registry);
+    assert_equals(shadowRoot.querySelector('a-b').shadowRoot.customElementRegistry, null);
+    assert_equals(shadowRoot.querySelector('a-b').shadowRoot.querySelector('c-d').customElementRegistry, null);
+}, 'initialize does not set the registry of nested shadow tree to a scoped registry');
+
+test(() => {
+    const clone = host.cloneNode(true);
+    const shadowRoot = clone.shadowRoot;
+    assert_equals(shadowRoot.customElementRegistry, null);
+    assert_equals(shadowRoot.querySelector('a-b').customElementRegistry, null);
+    assert_equals(shadowRoot.querySelector('ef').customElementRegistry, null);
+    const registry = new CustomElementRegistry;
+    registry.initialize(shadowRoot);
+    assert_equals(shadowRoot.customElementRegistry, registry);
+    assert_equals(shadowRoot.querySelector('a-b').customElementRegistry, registry);
+    assert_equals(shadowRoot.querySelector('ef').customElementRegistry, registry);
+    document.body.appendChild(clone);
+    assert_equals(shadowRoot.customElementRegistry, registry);
+    assert_equals(shadowRoot.querySelector('a-b').customElementRegistry, registry);
+    assert_equals(shadowRoot.querySelector('ef').customElementRegistry, registry);
+}, 'initialize sets element.customElementRegistry permantently');
+
+test(() => {
+    const clone = document.getElementById('host-with-registry').cloneNode(true);
+    const shadowRoot = clone.shadowRoot;
+    assert_equals(shadowRoot.customElementRegistry, window.customElements);
+    assert_equals(shadowRoot.querySelector('a-b').customElementRegistry, window.customElements);
+    assert_equals(shadowRoot.querySelector('ef').customElementRegistry, window.customElements);
+    const registry = new CustomElementRegistry;
+    registry.initialize(shadowRoot);
+    assert_equals(shadowRoot.customElementRegistry, window.customElements);
+    assert_equals(shadowRoot.querySelector('a-b').customElementRegistry, window.customElements);
+    assert_equals(shadowRoot.querySelector('ef').customElementRegistry, window.customElements);
+}, 'initialize is no-op on a subtree with a non-null registry');
+
+test(() => {
+    const doc = new Document();
+    assert_equals(doc.customElementRegistry, null);
+    const registry = new CustomElementRegistry();
+    registry.initialize(doc);
+    assert_equals(doc.customElementRegistry, registry);
+}, 'initialize works on Document');
+
+test(() => {
+    const doc = new Document();
+    const df = doc.createDocumentFragment();
+    const dummy = doc.createElement("dummy");
+    df.append(dummy);
+    assert_equals(dummy.customElementRegistry, null);
+    assert_equals(df.customElementRegistry, undefined);
+    const registry = new CustomElementRegistry();
+    registry.initialize(df);
+    assert_equals(dummy.customElementRegistry, registry);
+    assert_equals(df.customElementRegistry, undefined);
+}, 'initialize works on DocumentFragment');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/custom-elements/scoped-registry/CustomElementRegistry-multi-register.tentative.html b/tests/wpt/tests/custom-elements/registries/CustomElementRegistry-multi-register.html
similarity index 100%
rename from tests/wpt/tests/custom-elements/scoped-registry/CustomElementRegistry-multi-register.tentative.html
rename to tests/wpt/tests/custom-elements/registries/CustomElementRegistry-multi-register.html
diff --git a/tests/wpt/tests/custom-elements/registries/CustomElementRegistry-upgrade.html b/tests/wpt/tests/custom-elements/registries/CustomElementRegistry-upgrade.html
new file mode 100644
index 00000000000..0f7a7a835be
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/CustomElementRegistry-upgrade.html
@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<link rel="help" href="https://github.com/whatwg/html/issues/10854">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<some-host id="host">
+    <template shadowrootmode="closed" shadowrootclonable="true" shadowrootcustomelementregistry>
+        <a-b>
+            <template shadowrootmode="closed" shadowrootclonable="true" shadowrootcustomelementregistry>
+                <c-d/>
+                    <template shadowrootmode="closed" shadowrootclonable="true">
+                        <a-b></a-b>
+                    </template>
+                <c-d>
+            </template>
+        </a-b>
+    </template>
+</some-host>
+<script>
+
+customElements.define('some-host', class SomeHost extends HTMLElement {
+    elementInternals;
+
+    constructor() {
+        super();
+        this.elementInternals = this.attachInternals();
+    }
+});
+customElements.define('a-b', class GlobalABElement extends HTMLElement { });
+customElements.define('c-d', class GlobalCDElement extends HTMLElement { });
+
+test(() => {
+    assert_equals(typeof(window.customElements.upgrade), 'function');
+    assert_equals(typeof((new CustomElementRegistry).upgrade), 'function');
+}, 'upgrade is a function on both global and scoped CustomElementRegistry');
+
+test(() => {
+    const registry = new CustomElementRegistry;
+    registry.define('a-b', class ABElement extends HTMLElement { });
+
+    const clone = host.cloneNode(true);
+    registry.upgrade(clone.elementInternals.shadowRoot);
+    assert_equals(clone.elementInternals.shadowRoot.querySelector('a-b').__proto__.constructor.name, 'HTMLElement');
+}, 'upgrade is a no-op when called on a shadow root with no association');
+
+test(() => {
+    const registry = new CustomElementRegistry;
+    registry.define('a-b', class ABElement extends HTMLElement {
+        elementInternals;
+
+        constructor() {
+            super();
+            this.elementInternals = this.attachInternals();
+        }
+    });
+
+    const clone = host.cloneNode(true);
+    registry.initialize(clone.elementInternals.shadowRoot);
+    registry.upgrade(clone.elementInternals.shadowRoot);
+    const abElement = clone.elementInternals.shadowRoot.querySelector('a-b');
+    assert_equals(abElement.__proto__.constructor.name, 'ABElement');
+    assert_equals(abElement.elementInternals.shadowRoot.customElementRegistry, null);
+    const cdElement = abElement.elementInternals.shadowRoot.querySelector('c-d');
+    assert_equals(cdElement.__proto__.constructor.name, 'HTMLElement');
+    assert_equals(cdElement.customElementRegistry, null);
+}, 'upgrade should upgrade a candidate element when called on a shadow root with an association');
+
+test(() => {
+    const registry = new CustomElementRegistry;
+    registry.define('a-b', class ScopedABElement extends HTMLElement {
+        elementInternals;
+
+        constructor() {
+            super();
+            this.elementInternals = this.attachInternals();
+        }
+    });
+
+    const clone = host.cloneNode(true);
+    registry.initialize(clone.elementInternals.shadowRoot);
+    registry.upgrade(clone.elementInternals.shadowRoot);
+    const abElement = clone.elementInternals.shadowRoot.querySelector('a-b');
+    assert_equals(abElement.__proto__.constructor.name, 'ScopedABElement');
+    registry.initialize(abElement.elementInternals.shadowRoot);
+    assert_equals(abElement.elementInternals.shadowRoot.customElementRegistry, registry);
+    const cdElement = abElement.elementInternals.shadowRoot.querySelector('c-d');
+    assert_equals(cdElement.customElementRegistry, registry);
+
+    registry.define('c-d', class ScopedCDElement extends HTMLElement {
+        elementInternals;
+
+        constructor() {
+            super();
+            this.elementInternals = this.attachInternals();
+        }
+    });
+    assert_equals(cdElement.__proto__.constructor.name, 'HTMLElement');
+    registry.upgrade(abElement.elementInternals.shadowRoot);
+    assert_equals(cdElement.__proto__.constructor.name, 'ScopedCDElement');
+    assert_equals(cdElement.customElementRegistry, registry);
+
+    assert_equals(cdElement.elementInternals.shadowRoot.customElementRegistry, window.customElements);
+    const innerAB = cdElement.elementInternals.shadowRoot.querySelector('a-b');
+    assert_equals(innerAB.customElementRegistry, window.customElements);
+    assert_equals(innerAB.__proto__.constructor.name, 'HTMLElement');
+}, 'upgrade should not upgrade a candidate element not associated with the registry');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/custom-elements/registries/Document-createElement.html b/tests/wpt/tests/custom-elements/registries/Document-createElement.html
new file mode 100644
index 00000000000..c3dd6d9b857
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/Document-createElement.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<link rel="help" href="https://github.com/whatwg/html/issues/10854">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+// Keep this ~synchronized with Document-createElementNS
+"use strict";
+
+const scopedRegistry = new CustomElementRegistry();
+const otherScopedRegistry = new CustomElementRegistry();
+class GlobalABElement extends HTMLElement {};
+class ScopedABElement extends HTMLElement {};
+customElements.define('a-b', GlobalABElement);
+scopedRegistry.define('a-b', ScopedABElement);
+
+test(() => {
+    assert_true(document.createElement('a-b') instanceof GlobalABElement);
+}, 'createElement should use the global registry by default');
+
+test(() => {
+    assert_true(document.createElement('a-b', {customElementRegistry: scopedRegistry}) instanceof ScopedABElement);
+}, 'createElement should use the specified scoped registry');
+
+test(() => {
+    const elements = {
+        div: HTMLDivElement,
+        form: HTMLFormElement,
+        span: HTMLSpanElement,
+        table: HTMLTableElement,
+        unknown: HTMLUnknownElement,
+    };
+    for (const localName in elements) {
+        const scopedElement = document.createElement(localName, {customElementRegistry: scopedRegistry});
+        assert_true(scopedElement instanceof elements[localName], localName);
+        assert_equals(scopedElement.customElementRegistry, scopedRegistry);
+
+        const globalExplicitElement = document.createElement(localName, {customElementRegistry: window.customElements});
+        assert_true(globalExplicitElement instanceof elements[localName], localName);
+        assert_equals(globalExplicitElement.customElementRegistry, window.customElements);
+
+        const globalImplicitElement = document.createElement(localName);
+        assert_true(globalImplicitElement instanceof elements[localName], localName);
+        assert_equals(globalImplicitElement.customElementRegistry, window.customElements);
+    }
+}, 'createElement should create a builtin element regardless of a custom element registry specified');
+
+test(() => {
+    assert_true(document.createElement('a-b', {customElementRegistry: window.customElements}) instanceof GlobalABElement);
+}, 'createElement should use the specified global registry');
+
+test(() => {
+    const element = document.createElement('a-b', {customElementRegistry: otherScopedRegistry});
+    assert_equals(element.__proto__.constructor.name, 'HTMLElement');
+}, 'createElement should create an upgrade candidate when there is no matching definition in the specified registry');
+
+test(() => {
+    class CDElement extends HTMLElement { }
+    const registry = new CustomElementRegistry;
+    const cdElement = document.createElement('c-d', {customElementRegistry: registry});
+    assert_false(cdElement instanceof CDElement);
+    assert_equals(cdElement.__proto__.constructor.name, 'HTMLElement');
+    registry.define('c-d', CDElement);
+    assert_false(cdElement instanceof CDElement); // Not yet upgraded since it's disconnected.
+    assert_equals(cdElement.__proto__.constructor.name, 'HTMLElement');
+    document.body.appendChild(cdElement);
+    assert_true(cdElement instanceof CDElement);
+}, 'createElement should create an upgrade candidate and the candidate should be upgraded when the element is defined');
+
+test(() => {
+    const doc = new Document();
+    const scopedElement = doc.createElement("time", {customElementRegistry: scopedRegistry});
+    assert_equals(scopedElement.namespaceURI, null);
+    assert_equals(scopedElement.customElementRegistry, scopedRegistry);
+
+    const abElement = doc.createElement("a-b", {customElementRegistry: scopedRegistry});
+    assert_equals(abElement.namespaceURI, null);
+    assert_equals(abElement.customElementRegistry, scopedRegistry);
+    assert_false(abElement instanceof ScopedABElement);
+}, 'createElement on a non-HTML document should still handle registries correctly');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/custom-elements/registries/Document-createElementNS.html b/tests/wpt/tests/custom-elements/registries/Document-createElementNS.html
new file mode 100644
index 00000000000..d9b21113339
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/Document-createElementNS.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="help" href="https://github.com/whatwg/html/issues/10854">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+// Keep this ~synchronized with Document-createElement
+"use strict";
+
+const scopedRegistry = new CustomElementRegistry();
+const otherScopedRegistry = new CustomElementRegistry();
+class GlobalABElement extends HTMLElement {};
+class ScopedABElement extends HTMLElement {};
+customElements.define('a-b', GlobalABElement);
+scopedRegistry.define('a-b', ScopedABElement);
+
+test(() => {
+    assert_true(document.createElementNS('http://www.w3.org/1999/xhtml', 'a-b') instanceof GlobalABElement);
+}, 'createElementNS should use the global registry by default');
+
+test(() => {
+    assert_true(document.createElementNS('http://www.w3.org/1999/xhtml', 'a-b', {customElementRegistry: scopedRegistry}) instanceof ScopedABElement);
+}, 'createElementNS should use the specified scoped registry');
+
+test(() => {
+    const elements = {
+        div: HTMLDivElement,
+        form: HTMLFormElement,
+        span: HTMLSpanElement,
+        table: HTMLTableElement,
+        unknown: HTMLUnknownElement,
+    };
+    for (const localName in elements) {
+        const scopedElement = document.createElementNS('http://www.w3.org/1999/xhtml', localName, {customElementRegistry: scopedRegistry});
+        assert_true(scopedElement instanceof elements[localName], localName);
+        assert_equals(scopedElement.customElementRegistry, scopedRegistry);
+
+        const globalExplicitElement = document.createElementNS('http://www.w3.org/1999/xhtml', localName, {customElementRegistry: window.customElements});
+        assert_true(globalExplicitElement instanceof elements[localName], localName);
+        assert_equals(globalExplicitElement.customElementRegistry, window.customElements);
+
+        const globalImplicitElement = document.createElementNS('http://www.w3.org/1999/xhtml', localName);
+        assert_true(globalImplicitElement instanceof elements[localName], localName);
+        assert_equals(globalImplicitElement.customElementRegistry, window.customElements);
+    }
+}, 'createElementNS should create a builtin element regardless of a custom element registry specified');
+
+test(() => {
+    assert_true(document.createElementNS('http://www.w3.org/1999/xhtml', 'a-b', {customElementRegistry: window.customElements}) instanceof GlobalABElement);
+}, 'createElementNS should use the specified global registry');
+
+test(() => {
+    const element = document.createElementNS('http://www.w3.org/1999/xhtml', 'a-b', {customElementRegistry: otherScopedRegistry});
+    assert_equals(element.__proto__.constructor.name, 'HTMLElement');
+}, 'createElementNS should create an upgrade candidate when there is no matching definition in the specified registry');
+
+test(() => {
+    class CDElement extends HTMLElement { }
+    const registry = new CustomElementRegistry;
+    const cdElement = document.createElementNS('http://www.w3.org/1999/xhtml', 'c-d', {customElementRegistry: registry});
+    assert_false(cdElement instanceof CDElement);
+    assert_equals(cdElement.__proto__.constructor.name, 'HTMLElement');
+    registry.define('c-d', CDElement);
+    assert_false(cdElement instanceof CDElement); // Not yet upgraded since it's disconnected.
+    assert_equals(cdElement.__proto__.constructor.name, 'HTMLElement');
+    document.body.appendChild(cdElement);
+    assert_true(cdElement instanceof CDElement);
+}, 'createElementNS should create an upgrade candidate and the candidate should be upgraded when the element is defined');
+
+test(() => {
+    const doc = new Document();
+    const scopedElement = doc.createElementNS(null, "time", {customElementRegistry: scopedRegistry});
+    assert_equals(scopedElement.namespaceURI, null);
+    assert_equals(scopedElement.customElementRegistry, scopedRegistry);
+
+    const abElement = doc.createElementNS(null, "a-b", {customElementRegistry: scopedRegistry});
+    assert_equals(abElement.namespaceURI, null);
+    assert_equals(abElement.customElementRegistry, scopedRegistry);
+    assert_false(abElement instanceof ScopedABElement);
+}, 'createElementNS on a non-HTML document should still handle registries correctly');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/custom-elements/registries/Document-customElementRegistry.html b/tests/wpt/tests/custom-elements/registries/Document-customElementRegistry.html
new file mode 100644
index 00000000000..ba062aa3cfc
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/Document-customElementRegistry.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<link rel="help" href="https://github.com/whatwg/html/issues/10854">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+
+test(() => {
+    assert_equals(document.customElementRegistry, window.customElements);
+}, 'customElementRegistry on a document should return window.customElements by default');
+
+test(() => {
+    const doc = document.implementation.createHTMLDocument('foo')
+    assert_equals(doc.customElementRegistry, null);
+}, 'customElementRegistry on a document without a browsing context should return null');
+
+test((t) => {
+    const frame = document.createElement('iframe');
+    t.add_cleanup(() => frame.remove());
+    document.body.appendChild(frame);
+    assert_equals(frame.contentDocument.customElementRegistry, frame.contentWindow.customElements);
+}, 'customElementRegistry on a document of a connected iframe should return contentWindow.customElements');
+
+test((t) => {
+    const frame = document.createElement('iframe');
+    document.body.appendChild(frame);
+    const doc = frame.contentDocument;
+    const registry = frame.contentWindow.customElements;
+    frame.remove();
+    assert_equals(doc.customElementRegistry, registry);
+}, 'customElementRegistry on a document of a disconnected iframe should return contentWindow.customElements');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/custom-elements/registries/Document-importNode.html b/tests/wpt/tests/custom-elements/registries/Document-importNode.html
new file mode 100644
index 00000000000..149a135c41c
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/Document-importNode.html
@@ -0,0 +1,184 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<link rel="help" href="https://github.com/whatwg/html/issues/10854">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="host">
+    <template shadowrootmode="open" shadowrootclonable="true" shadowrootcustomelementregistry>
+        <div>
+            <some-element></some-element>
+            <other-element></other-element>
+        </div>
+    </template>
+</div>
+<template id="template">
+    <some-element>
+        <template shadowrootmode="closed" shadowrootclonable="true" shadowrootcustomelementregistry>
+            <div>
+                <some-element></some-element>
+                <other-element></other-element>
+            </div>
+        </template>
+    </some-element>
+</template>
+<div id="root">
+    <span></span>
+</div>
+<script>
+
+const scopedRegistry = new CustomElementRegistry();
+const emptyRegistry = new CustomElementRegistry();
+class GlobalSomeElement extends HTMLElement {
+    elementInternals;
+
+    constructor() {
+        super();
+        this.elementInternals = this.attachInternals();
+        if (this.elementInternals.shadowRoot)
+            scopedRegistry.initialize(this.elementInternals.shadowRoot);
+    }
+};
+class GlobalOtherElement extends HTMLElement {};
+class ScopedSomeElement extends HTMLElement {};
+customElements.define('some-element', GlobalSomeElement);
+customElements.define('other-element', GlobalOtherElement);
+scopedRegistry.define('some-element', ScopedSomeElement);
+
+test(() => {
+    assert_true(document.importNode(document.createElement('some-element')) instanceof GlobalSomeElement);
+}, 'importNode should clone using the global regsitry by default');
+
+test(() => {
+    assert_true(document.importNode(document.createElement('some-element'), {customElementRegistry: scopedRegistry}) instanceof ScopedSomeElement);
+}, 'importNode should clone using the specified scoped regsitry');
+
+test(() => {
+    const clone = document.importNode(host, {selfOnly: false, customElementRegistry: scopedRegistry});
+    assert_equals(clone.shadowRoot.querySelector('some-element').__proto__.constructor.name, 'HTMLElement');
+    assert_false(clone.shadowRoot.querySelector('some-element') instanceof GlobalSomeElement);
+    assert_false(clone.shadowRoot.querySelector('some-element') instanceof ScopedSomeElement);
+    assert_true(clone.shadowRoot.querySelector('other-element') instanceof HTMLElement);
+    assert_false(clone.shadowRoot.querySelector('other-element') instanceof GlobalOtherElement);
+}, 'importNode should preserve null-ness of custom element registry');
+
+test(() => {
+    const clone = document.importNode(host.shadowRoot.querySelector('div'), {selfOnly: false});
+    assert_equals(clone.customElementRegistry, window.customElements);
+    assert_true(clone.querySelector('some-element') instanceof GlobalSomeElement);
+    assert_true(clone.querySelector('other-element') instanceof GlobalOtherElement);
+}, 'importNode should clone a shadow host with a declarative shadow DOM using the global registry by default');
+
+test(() => {
+    const clone = document.importNode(host.shadowRoot.querySelector('div'), {selfOnly: false, customElementRegistry: scopedRegistry});
+    assert_equals(clone.customElementRegistry, scopedRegistry);
+    assert_true(clone.querySelector('some-element') instanceof ScopedSomeElement);
+    assert_false(clone.querySelector('other-element') instanceof GlobalOtherElement);
+}, 'importNode should clone a shadow host with a declarative shadow DOM using a specified scoped registry');
+
+test(() => {
+    const element = document.createElement('div', {customElementRegistry: emptyRegistry});
+    element.innerHTML = '<some-element></some-element><other-element></other-element>';
+    const clone = document.importNode(element, {selfOnly: false, customElementRegistry: scopedRegistry});
+    assert_equals(clone.customElementRegistry, scopedRegistry);
+    assert_true(clone.querySelector('some-element') instanceof ScopedSomeElement);
+    assert_false(clone.querySelector('other-element') instanceof GlobalOtherElement);
+}, 'importNode should clone an element originating from a scoped registry using another scoped registry');
+
+test(() => {
+    const template = document.createElement('template');
+    template.innerHTML = '<div><some-element>hello</some-element><other-element>world</other-element></div>';
+    assert_equals(template.content.querySelector('some-element').__proto__.constructor.name, 'HTMLElement');
+    assert_equals(template.content.querySelector('other-element').__proto__.constructor.name, 'HTMLElement');
+    const clone = document.importNode(template.content, {selfOnly: false});
+    assert_equals(clone.querySelector('some-element').customElementRegistry, window.customElements);
+    assert_equals(clone.querySelector('some-element').__proto__.constructor.name, 'GlobalSomeElement');
+    assert_equals(clone.querySelector('other-element').__proto__.constructor.name, 'GlobalOtherElement');
+}, 'importNode should clone a template content using the global registry by default');
+
+test(() => {
+    const template = document.createElement('template');
+    template.innerHTML = '<div><some-element>hello</some-element><other-element>world</other-element></div>';
+    assert_equals(template.content.querySelector('some-element').__proto__.constructor.name, 'HTMLElement');
+    assert_equals(template.content.querySelector('other-element').__proto__.constructor.name, 'HTMLElement');
+    const clone = document.importNode(template.content, {selfOnly: false, customElementRegistry: scopedRegistry});
+    assert_equals(clone.querySelector('some-element').customElementRegistry, scopedRegistry);
+    assert_equals(clone.querySelector('some-element').__proto__.constructor.name, 'ScopedSomeElement');
+    assert_equals(clone.querySelector('other-element').__proto__.constructor.name, 'HTMLElement');
+}, 'importNode should clone a template content using a specified scoped registry');
+
+test(() => {
+    const template = document.createElement('template');
+    template.innerHTML = `
+<div>
+    <some-element>
+        <template>
+            <other-element>
+                hello
+            </other-element>
+        </template>
+    </some-element>
+    <other-element>
+        world
+    </other-element>
+</div>`;
+    assert_equals(template.content.querySelector('some-element').__proto__.constructor.name, 'HTMLElement');
+    assert_equals(template.content.querySelector('other-element').__proto__.constructor.name, 'HTMLElement');
+    const clone = document.importNode(template.content, {selfOnly: false});
+    assert_equals(clone.querySelector('some-element').customElementRegistry, window.customElements);
+    assert_equals(clone.querySelector('some-element').__proto__.constructor.name, 'GlobalSomeElement');
+    const otherElementInTemplate = clone.querySelector('template').content.querySelector('other-element');
+    assert_equals(otherElementInTemplate.__proto__.constructor.name, 'HTMLElement');
+    assert_equals(clone.querySelector('other-element').__proto__.constructor.name, 'GlobalOtherElement');
+}, 'importNode should clone a template content with a nested template element using a scoped registry');
+
+test(() => {
+    const clone = document.importNode(root);
+    assert_false(clone.hasChildNodes());
+}, "importNode: don't pass options argument");
+
+test(() => {
+    const clone = document.importNode(root, false);
+    assert_false(clone.hasChildNodes());
+}, "importNode: pass options argument with value false");
+
+test(() => {
+    const clone = document.importNode(root, true);
+    assert_true(clone.hasChildNodes());
+}, "importNode: pass options argument with value true");
+
+test(() => {
+    const clone = document.importNode(root, undefined);
+    assert_false(clone.hasChildNodes());
+}, "importNode: pass options argument with value undefined");
+
+test(() => {
+    const clone = document.importNode(root, { });
+    assert_true(clone.hasChildNodes());
+}, "importNode: pass options argument with value { }");
+
+test(() => {
+    const clone = document.importNode(root, { selfOnly: false });
+    assert_true(clone.hasChildNodes());
+}, "importNode: pass options argument with value { selfOnly: false }");
+
+test(() => {
+    const clone = document.importNode(root, { selfOnly: true });
+    assert_false(clone.hasChildNodes());
+}, "importNode: pass options argument with value { selfOnly: true }");
+
+test(() => {
+    const clone = document.importNode(root, { customElementRegistry: scopedRegistry });
+    assert_true(clone.hasChildNodes());
+}, "importNode: pass options argument with value { customElementRegistry: scopedRegistry }");
+
+test(() => {
+    assert_throws_js(TypeError, () => document.importNode(root, { customElementRegistry: null }));
+}, "importNode: pass options argument with value { customElementRegistry: null }");
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/custom-elements/registries/Element-customElementRegistry-exceptions.html b/tests/wpt/tests/custom-elements/registries/Element-customElementRegistry-exceptions.html
new file mode 100644
index 00000000000..fb213b1d15a
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/Element-customElementRegistry-exceptions.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<link rel="help" href="https://github.com/whatwg/html/issues/10854">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="host-window"><template shadowrootmode="open"><a-b></a-b></template></div>
+<div id="host-null"><template shadowrootmode="open" shadowrootcustomelementregistry=""><a-b></a-b></template></div>
+<script>
+
+setup({allow_uncaught_exception : true});
+
+test(() => {
+    const registry = new CustomElementRegistry;
+    registry.define('constructor-throws-exception', class extends HTMLElement { constructor() { super(); throw TypeError; } });
+    registry.define('constructor-returns-different-element', class extends HTMLElement { constructor() { super(); return document.createElement('span'); } });
+    assert_equals(document.createElement('constructor-throws-exception', {customElementRegistry: registry}).customElementRegistry, registry);
+    assert_equals(document.createElement('constructor-returns-different-element', {customElementRegistry: registry}).customElementRegistry, registry);
+}, 'customElementRegistry on a failed custom element created by calling createElement on CustomElementRegistry should return the registry');
+
+test(() => {
+    const registry = new CustomElementRegistry;
+    registry.define('constructor-throws-exception', class extends HTMLElement { constructor() { super(); throw TypeError; } });
+    registry.define('constructor-returns-different-element', class extends HTMLElement { constructor() { super(); return document.createElement('span'); } });
+    const container = document.createElement('div', {customElementRegistry: registry});
+    container.innerHTML = '<constructor-throws-exception></constructor-throws-exception><constructor-returns-different-element></constructor-returns-different-element>';
+    assert_equals(container.querySelector('constructor-throws-exception').customElementRegistry, registry);
+    assert_equals(container.querySelector('constructor-returns-different-element').customElementRegistry, registry);
+}, 'customElementRegistry on a failed custom element created by setting innerHTML should return the associated scoped registry');
+
+function insideDeclarativeShadowTreeWithNullRegistry(test, script, markup, check) {
+    const frame = document.body.appendChild(document.createElement('iframe'));
+    test.add_cleanup(() => frame.remove());
+
+    frame.contentDocument.open();
+    frame.contentDocument.write(`<!DOCTYPE html><html><body><div id="host"><template shadowrootmode="open" shadowrootcustomelementregistry><script>`
+        + script + `</` + 'script>' + markup + '</template></div></body></html>');
+    frame.contentDocument.close();
+    check(frame.contentDocument, frame.contentWindow);
+}
+
+test((t) => {
+    insideDeclarativeShadowTreeWithNullRegistry(t, `
+        window.registry = new CustomElementRegistry;
+        registry.initialize(host.shadowRoot);
+        registry.define('constructor-throws-exception', class extends HTMLElement { constructor() { super(); throw TypeError; } });
+        registry.define('constructor-returns-different-element', class extends HTMLElement { constructor() { super(); return document.createElement('span'); } });`,
+        '<constructor-throws-exception></constructor-throws-exception><constructor-returns-different-element></constructor-returns-different-element>',
+        (doc, win) => {
+            assert_equals(win.host.shadowRoot.querySelector('constructor-throws-exception').customElementRegistry, win.registry);
+            assert_equals(win.host.shadowRoot.querySelector('constructor-returns-different-element').customElementRegistry, win.registry);
+        });
+}, 'customElementRegistry on a failed custom element created by parser should return the specified custom regsitry');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/custom-elements/registries/Element-customElementRegistry.html b/tests/wpt/tests/custom-elements/registries/Element-customElementRegistry.html
new file mode 100644
index 00000000000..72e54bdbaab
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/Element-customElementRegistry.html
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<link rel="help" href="https://github.com/whatwg/html/issues/10854">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="host-window"><template shadowrootmode="open" shadowrootclonable="true"><a-b></a-b></template></div>
+<div id="host-null"><template shadowrootmode="open" shadowrootclonable="true" shadowrootcustomelementregistry=""><a-b></a-b></template></div>
+<script>
+
+test(() => {
+    assert_equals(document.createElement('div').customElementRegistry, window.customElements);
+}, 'customElementRegistry on a newly constrcuted element should return window.customElements by default');
+
+test(() => {
+    const sr = document.getElementById('host-window').shadowRoot;
+    const ab = sr.querySelector('a-b');
+    assert_equals(sr.customElementRegistry, window.customElements);
+    assert_equals(ab.customElementRegistry, window.customElements);
+}, 'customElementRegistry on an element inside a declarative shadow DOM should return window.customElements by default');
+
+test(() => {
+    const sr = document.getElementById('host-null').shadowRoot;
+    const ab = sr.querySelector('a-b');
+    assert_equals(sr.customElementRegistry, null);
+    assert_equals(ab.customElementRegistry, null);
+}, 'customElementRegistry on an element inside a declarative shadow DOM with shadowrootcustomelementregistry should return null');
+
+test(() => {
+    const clone = document.getElementById('host-null').cloneNode(true);
+    const sr = clone.shadowRoot;
+    const ab = sr.querySelector('a-b');
+    assert_equals(sr.customElementRegistry, null);
+    assert_equals(ab.customElementRegistry, null);
+}, 'customElementRegistry on a clone of a declarative shadow tree with shadowrootcustomelementregistry should return null');
+
+test((t) => {
+    const clone = document.getElementById('host-null').cloneNode(true);
+    const ab = clone.shadowRoot.querySelector('a-b');
+    document.body.appendChild(ab);
+    assert_equals(ab.customElementRegistry, window.customElements);
+
+    const frame = document.createElement('iframe');
+    t.add_cleanup(() => frame.remove());
+    document.body.appendChild(frame);
+    frame.contentDocument.body.append(ab);
+    assert_equals(ab.customElementRegistry, frame.contentWindow.customElements);
+
+}, 'customElementRegistry on a clone of a declarative shadow tree with shadowrootcustomelementregistry should return the global registry after getting inserted into a document');
+
+test(() => {
+    const sr = document.getElementById('host-null').shadowRoot;
+    const ab = sr.querySelector('a-b');
+    const registry = new CustomElementRegistry;
+    registry.initialize(sr);
+    assert_equals(sr.customElementRegistry, registry);
+    assert_equals(ab.customElementRegistry, registry);
+}, 'customElementRegistry on an element inside a declarative shadow DOM with shadowrootcustomelementregistry should return the scoped registry after calling initialize');
+
+test(() => {
+    const registry = new CustomElementRegistry;
+    element = document.createElement('div', {customElementRegistry: registry});
+    assert_equals(element.customElementRegistry, registry);
+}, 'customElementRegistry on a builtin element created by calling createElement on CustomElementRegistry should return the registry');
+
+test(() => {
+    const registry = new CustomElementRegistry;
+    element = document.createElement('non-existent', {customElementRegistry: registry});
+    assert_equals(element.customElementRegistry, registry);
+}, 'customElementRegistry on an upgarde candidate created by calling createElement on CustomElementRegistry should return the registry');
+
+test(() => {
+    const registry = new CustomElementRegistry;
+    element = document.createElement('nonexistent', {customElementRegistry: registry});
+    assert_equals(element.customElementRegistry, registry);
+}, 'customElementRegistry on an unknown element created by calling createElement on CustomElementRegistry should return the registry');
+
+test(() => {
+    const registry = new CustomElementRegistry;
+    registry.define('custom-element', class extends HTMLElement { })
+    element = document.createElement('custom-element', {customElementRegistry: registry});
+    assert_equals(element.customElementRegistry, registry);
+}, 'customElementRegistry on a defined custom element created by calling createElement on CustomElementRegistry should return the registry');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/custom-elements/registries/Element-innerHTML.html b/tests/wpt/tests/custom-elements/registries/Element-innerHTML.html
new file mode 100644
index 00000000000..c4f3ad34ddf
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/Element-innerHTML.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<link rel="help" href="https://github.com/whatwg/html/issues/10854">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+
+function createConnectedShadowTree(test, customElementRegistry) {
+    const host = document.createElement('div');
+    const shadowRoot = host.attachShadow({mode: 'closed', customElementRegistry});
+    document.body.appendChild(host);
+    test.add_cleanup(() => host.remove());
+    return shadowRoot;
+}
+
+class GlobalSomeElement extends HTMLElement { };
+customElements.define('some-element', GlobalSomeElement);
+
+class GlobalOtherElement extends HTMLElement { };
+customElements.define('other-element', GlobalOtherElement);
+
+test((test) => {
+    const registry = new CustomElementRegistry;
+
+    class ScopedSomeElement extends HTMLElement { };
+    registry.define('some-element', ScopedSomeElement);
+
+    class ScopedOtherElement extends HTMLElement { };
+    registry.define('other-element', ScopedOtherElement);
+
+    const shadowRoot = createConnectedShadowTree(test, registry);
+    const someElement = document.createElement('some-element', {customElementRegistry: registry});
+    assert_true(someElement instanceof ScopedSomeElement);
+    someElement.innerHTML = '<other-element></other-element>';
+    assert_true(someElement.querySelector('other-element') instanceof ScopedOtherElement);
+}, 'innerHTML on a disconnected element should use the scoped registry it was created with');
+
+test((test) => {
+    const registry1 = new CustomElementRegistry;
+    const registry2 = new CustomElementRegistry;
+
+    class ScopedSomeElement extends HTMLElement { };
+    registry1.define('some-element', ScopedSomeElement);
+
+    class ScopedOtherElement1 extends HTMLElement { };
+    registry1.define('other-element', ScopedOtherElement1);
+    class ScopedOtherElement2 extends HTMLElement { };
+    registry2.define('other-element', ScopedOtherElement2);
+
+    const shadowRoot1 = createConnectedShadowTree(test, registry1);
+    const shadowRoot2 = createConnectedShadowTree(test, registry2);
+    const someElement = document.createElement('some-element', {customElementRegistry: registry1});
+    someElement.innerHTML = '<other-element></other-element>';
+    assert_true(someElement.querySelector('other-element') instanceof ScopedOtherElement1);
+    shadowRoot2.appendChild(someElement);
+    someElement.innerHTML = '<other-element></other-element>';
+    assert_true(someElement.querySelector('other-element') instanceof ScopedOtherElement1);
+    someElement.remove();
+    someElement.innerHTML = '<other-element></other-element>';
+    assert_true(someElement.querySelector('other-element') instanceof ScopedOtherElement1);
+}, 'innerHTML on an inserted element should continue to use the scoped registry it was created with');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/custom-elements/registries/ShadowRoot-init-customElementRegistry.html b/tests/wpt/tests/custom-elements/registries/ShadowRoot-init-customElementRegistry.html
new file mode 100644
index 00000000000..bbf1b414aa0
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/ShadowRoot-init-customElementRegistry.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<link rel="help" href="https://github.com/whatwg/html/issues/10854">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+
+test(() => {
+    const shadowRoot = document.createElement('div').attachShadow({mode: 'closed'});
+    assert_equals(shadowRoot.customElementRegistry, window.customElements);
+}, 'A newly attached disconnected ShadowRoot should use the global registry by default');
+
+test(() => {
+    const host = document.body.appendChild(document.createElement('div'));
+    const shadowRoot = host.attachShadow({mode: 'closed'});
+    assert_equals(shadowRoot.customElementRegistry, window.customElements);
+}, 'A newly attached connected ShadowRoot should use the global registry by default');
+
+test(() => {
+    const registry = new CustomElementRegistry;
+    const shadowRoot = document.createElement('div').attachShadow({mode: 'closed', customElementRegistry: registry});
+    assert_equals(shadowRoot.customElementRegistry, registry);
+}, 'A newly attached disconnected ShadowRoot should use the scoped registry if explicitly specified in attachShadow');
+
+test(() => {
+    const registry = new CustomElementRegistry;
+    const host = document.body.appendChild(document.createElement('div'));
+    const shadowRoot = host.attachShadow({mode: 'closed', customElementRegistry: registry});
+    assert_equals(shadowRoot.customElementRegistry, registry);
+}, 'A newly attached connected ShadowRoot should use the scoped registry if explicitly specified in attachShadow');
+
+test(() => {
+    const host = document.body.appendChild(document.createElement('div'));
+    assert_throws_js(TypeError, () => host.attachShadow({mode: 'closed', customElementRegistry: null}))
+}, 'attachShadow() should throw for a null customElementRegistry value');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/custom-elements/registries/ShadowRoot-innerHTML.html b/tests/wpt/tests/custom-elements/registries/ShadowRoot-innerHTML.html
new file mode 100644
index 00000000000..0d4be665440
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/ShadowRoot-innerHTML.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<link rel="help" href="https://github.com/whatwg/html/issues/10854">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+
+function createConnectedShadowTree(test, customElementRegistry) {
+    const host = document.createElement('div');
+    const shadowRoot = host.attachShadow({mode: 'closed', customElementRegistry});
+    document.body.appendChild(host);
+    test.add_cleanup(() => host.remove());
+    return shadowRoot;
+}
+
+test((test) => {
+    const registry = new CustomElementRegistry;
+
+    class SomeElement extends HTMLElement { };
+    registry.define('some-element', SomeElement);
+
+    class OtherElement extends HTMLElement { };
+    registry.define('other-element', OtherElement);
+
+    const shadowRoot = createConnectedShadowTree(test, registry);
+    assert_true(document.createElement('some-element', {customElementRegistry: registry}) instanceof SomeElement);
+    assert_true(document.createElement('other-element', {customElementRegistry: registry}) instanceof OtherElement);
+    shadowRoot.innerHTML = '<some-element></some-element><other-element></other-element>';
+
+    assert_true(shadowRoot.querySelector('some-element') instanceof SomeElement);
+    assert_equals(shadowRoot.querySelector('some-element').customElementRegistry, registry);
+    assert_true(shadowRoot.querySelector('other-element') instanceof OtherElement);
+    assert_equals(shadowRoot.querySelector('other-element').customElementRegistry, registry);
+}, 'innerHTML on a shadow root should use the scoped registry');
+
+test((test) => {
+    class SomeElement1 extends HTMLElement { };
+    customElements.define('some-element', SomeElement1);
+
+    const registry = new CustomElementRegistry;
+    class SomeElement2 extends HTMLElement { };
+    registry.define('some-element', SomeElement2);
+
+    const shadowRoot = createConnectedShadowTree(test, registry);
+    shadowRoot.innerHTML = '<some-element></some-element>';
+    assert_true(shadowRoot.querySelector('some-element') instanceof SomeElement2);
+    assert_equals(shadowRoot.querySelector('some-element').customElementRegistry, registry);
+}, 'innerHTML on a connected shadow root should use the associated scoped registry');
+
+test((test) => {
+    const registry = new CustomElementRegistry;
+    class SomeElement extends HTMLElement { };
+    registry.define('some-element', SomeElement);
+    const shadowRoot = createConnectedShadowTree(test, registry);
+
+    shadowRoot.innerHTML = '<some-element></some-element><template><some-element></some-element></template>';
+    assert_equals(shadowRoot.querySelector('some-element').__proto__.constructor.name, 'SomeElement');
+    assert_equals(shadowRoot.querySelector('some-element').customElementRegistry, registry);
+    assert_equals(shadowRoot.querySelector('template').content.querySelector('some-element').__proto__.constructor.name, 'HTMLElement');
+    assert_equals(shadowRoot.querySelector('template').content.querySelector('some-element').customElementRegistry, null);
+}, 'innerHTML on a connected shadow root should not upgrade a custom element inside a template element');
+
+test((test) => {
+    const registry = new CustomElementRegistry;
+    const shadowRoot = createConnectedShadowTree(test, registry);
+    shadowRoot.innerHTML = '<someelement></someelement>';
+    assert_equals(shadowRoot.querySelector('someelement').__proto__.constructor.name, 'HTMLUnknownElement');
+    assert_equals(shadowRoot.querySelector('someelement').customElementRegistry, registry);
+}, 'innerHTML on a connected shadow root should be able to create an unknown element');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/custom-elements/custom-element-registry/WEB_FEATURES.yml b/tests/wpt/tests/custom-elements/registries/WEB_FEATURES.yml
similarity index 100%
rename from tests/wpt/tests/custom-elements/custom-element-registry/WEB_FEATURES.yml
rename to tests/wpt/tests/custom-elements/registries/WEB_FEATURES.yml
diff --git a/tests/wpt/tests/custom-elements/registries/constructor-reentry-with-different-definition.html b/tests/wpt/tests/custom-elements/registries/constructor-reentry-with-different-definition.html
new file mode 100644
index 00000000000..ef104ebe4c1
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/constructor-reentry-with-different-definition.html
@@ -0,0 +1,137 @@
+<!DOCTYPE html>
+<meta name="author" title="Xiaocheng Hu" href="mailto:xiaochengh@chromium.org">
+<meta name="assert" content="Custom element constructors can re-enter with different definitions">
+<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
+<link rel="help" href="https://github.com/WICG/webcomponents/issues/969">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id='test-container-1'></div>
+<div id='test-container-2'></div>
+
+<script>
+setup({allow_uncaught_exception : true});
+
+function createShadowForTest(t, customElementRegistry) {
+  const host = document.createElement('div');
+  const shadow = host.attachShadow({mode: 'open', customElementRegistry});
+  document.body.appendChild(host);
+  t.add_cleanup(() => host.remove());
+  return shadow;
+}
+
+test(t => {
+  let needsTest = true;
+  class ReentryBeforeSuper extends HTMLElement {
+    constructor() {
+      if (needsTest) {
+        needsTest = false;
+        document.getElementById('test-container-1').innerHTML =
+            '<test-element-1></test-element-1>';
+      }
+      super();
+    }
+  };
+  window.customElements.define('test-element-1', ReentryBeforeSuper);
+
+  let registry = new CustomElementRegistry;
+  registry.define('shadow-test-element-1', ReentryBeforeSuper);
+
+  let shadow = createShadowForTest(t, registry);
+  shadow.innerHTML = '<shadow-test-element-1></shadow-test-element-1>';
+
+  let shadowElement = shadow.firstChild;
+  assert_true(shadowElement instanceof ReentryBeforeSuper);
+  assert_equals(shadowElement.localName, 'shadow-test-element-1');
+
+  let mainDocElement = document.getElementById('test-container-1').firstChild;
+  assert_true(mainDocElement instanceof ReentryBeforeSuper);
+  assert_equals(mainDocElement.localName, 'test-element-1');
+}, 'Re-entry via upgrade before calling super()');
+
+test(t => {
+  let needsTest = true;
+  class ReentryAfterSuper extends HTMLElement {
+    constructor() {
+      super();
+      if (needsTest) {
+        needsTest = false;
+        document.getElementById('test-container-2').innerHTML =
+            '<test-element-2></test-element-2>';
+      }
+    }
+  };
+  window.customElements.define('test-element-2', ReentryAfterSuper);
+
+  let registry = new CustomElementRegistry;
+  registry.define('shadow-test-element-2', ReentryAfterSuper);
+
+  let shadow = createShadowForTest(t, registry);
+  shadow.innerHTML = '<shadow-test-element-2></shadow-test-element-2>';
+
+  let shadowElement = shadow.firstChild;
+  assert_true(shadowElement instanceof ReentryAfterSuper);
+  assert_equals(shadowElement.localName, 'shadow-test-element-2');
+
+  let mainDocElement = document.getElementById('test-container-2').firstChild;
+  assert_true(mainDocElement instanceof ReentryAfterSuper);
+  assert_equals(mainDocElement.localName, 'test-element-2');
+}, 'Re-entry via upgrade after calling super()');
+
+test(t => {
+  let needsTest = true;
+  let elementByNestedCall;
+  class ReentryByDirectCall extends HTMLElement {
+    constructor() {
+      if (needsTest) {
+        needsTest = false;
+        elementByNestedCall = new ReentryByDirectCall;
+      }
+      super();
+    }
+  }
+  window.customElements.define('test-element-3', ReentryByDirectCall);
+
+  let registry = new CustomElementRegistry;
+  registry.define('shadow-test-element-3', ReentryByDirectCall);
+
+  let shadow = createShadowForTest(t, registry);
+  shadow.innerHTML = '<shadow-test-element-3></shadow-test-element-3>';
+
+  let shadowElement = shadow.firstChild;
+  assert_true(shadowElement instanceof ReentryByDirectCall);
+  assert_equals(shadowElement.localName, 'shadow-test-element-3');
+
+  // Nested constructor call makes the following `super()` fail, and we should
+  // end up creating only one element.
+  assert_equals(elementByNestedCall, shadowElement);
+}, 'Re-entry via direct constructor call before calling super()');
+
+test(t => {
+  let needsTest = true;
+  let elementByNestedCall;
+  class ReentryByDirectCall extends HTMLElement {
+    constructor() {
+      super();
+      if (needsTest) {
+        needsTest = false;
+        elementByNestedCall = new ReentryByDirectCall;
+      }
+    }
+  }
+  window.customElements.define('test-element-4', ReentryByDirectCall);
+
+  let registry = new CustomElementRegistry;
+  registry.define('shadow-test-element-4', ReentryByDirectCall);
+
+  let shadow = createShadowForTest(t, registry);
+  shadow.innerHTML = '<shadow-test-element-4></shadow-test-element-4>';
+
+  let shadowElement = shadow.firstChild;
+  assert_true(shadowElement instanceof ReentryByDirectCall);
+  assert_equals(shadowElement.localName, 'shadow-test-element-4');
+
+  // Nested constructor call should be blocked.
+  assert_false(elementByNestedCall instanceof ReentryByDirectCall);
+}, 'Re-entry via direct constructor call after calling super()');
+</script>
diff --git a/tests/wpt/tests/custom-elements/custom-element-registry/define-customized-builtins.html b/tests/wpt/tests/custom-elements/registries/define-customized-builtins.html
similarity index 100%
rename from tests/wpt/tests/custom-elements/custom-element-registry/define-customized-builtins.html
rename to tests/wpt/tests/custom-elements/registries/define-customized-builtins.html
diff --git a/tests/wpt/tests/custom-elements/custom-element-registry/define.html b/tests/wpt/tests/custom-elements/registries/define.html
similarity index 100%
rename from tests/wpt/tests/custom-elements/custom-element-registry/define.html
rename to tests/wpt/tests/custom-elements/registries/define.html
diff --git a/tests/wpt/tests/custom-elements/registries/initial-about-blank.window.js b/tests/wpt/tests/custom-elements/registries/initial-about-blank.window.js
new file mode 100644
index 00000000000..b3bb7e139b5
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/initial-about-blank.window.js
@@ -0,0 +1,23 @@
+async_test(t => {
+  const frame = document.createElement("iframe");
+  document.body.append(frame);
+  frame.contentWindow.eval(`
+    class AA extends HTMLElement { };
+    self.globalAA = AA;
+    customElements.define("a-a", AA);
+    document.body.innerHTML = "<a-a>";
+  `);
+  assert_equals(frame.contentDocument.body.firstChild.localName, "a-a");
+  assert_true(frame.contentDocument.body.firstChild instanceof frame.contentWindow.globalAA);
+
+  const blankDocumentURL = new URL("/common/blank.html", location).href;
+  frame.src = blankDocumentURL;
+  frame.onload = t.step_func_done(t => {
+    assert_equals(frame.contentDocument.URL, blankDocumentURL);
+    assert_equals(frame.contentDocument.body.innerHTML, "");
+    frame.contentDocument.body.innerHTML = "<a-a>";
+    assert_equals(frame.contentDocument.body.firstChild.localName, "a-a");
+    assert_equals(frame.contentWindow.customElements.get("a-a"), undefined);
+    assert_not_equals(frame.contentWindow.globalAA, undefined);
+  });
+}, "Each navigable document has its own registry");
diff --git a/tests/wpt/tests/custom-elements/custom-element-registry/per-global.html b/tests/wpt/tests/custom-elements/registries/per-global.html
similarity index 100%
rename from tests/wpt/tests/custom-elements/custom-element-registry/per-global.html
rename to tests/wpt/tests/custom-elements/registries/per-global.html
diff --git a/tests/wpt/tests/custom-elements/registries/pseudo-class-defined.window.js b/tests/wpt/tests/custom-elements/registries/pseudo-class-defined.window.js
new file mode 100644
index 00000000000..71c0459e39c
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/pseudo-class-defined.window.js
@@ -0,0 +1,29 @@
+test(() => {
+  const otherDocument = new Document();
+  const element = otherDocument.createElement("blah");
+  assert_true(element.matches(":defined"));
+  const registry = new CustomElementRegistry();
+  registry.initialize(element);
+  assert_equals(element.customElementRegistry, registry);
+  assert_true(element.matches(":defined"));
+}, `"uncustomized" :defined doesn't care about your registry'`);
+
+test(() => {
+  const registry = new CustomElementRegistry();
+  registry.define("sw-r2d2", class extends HTMLElement {});
+  const element = document.createElement("sw-r2d2", { customElementRegistry: registry });
+  assert_equals(element.customElementRegistry, registry);
+  assert_true(element.matches(":defined"));
+}, `"custom" :defined doesn't care about your registry`);
+
+test(() => {
+  const otherDocument = new Document();
+  const element = otherDocument.createElementNS("http://www.w3.org/1999/xhtml", "sw-r2d2");
+  assert_false(element.matches(":defined"));
+  const registry = new CustomElementRegistry();
+  registry.define("sw-r2d2", class extends HTMLElement {});
+  registry.initialize(element);
+  assert_false(element.matches(":defined"));
+  registry.upgrade(element);
+  assert_true(element.matches(":defined"));
+});
diff --git a/tests/wpt/tests/custom-elements/registries/scoped-registry-define-upgrade-criteria.html b/tests/wpt/tests/custom-elements/registries/scoped-registry-define-upgrade-criteria.html
new file mode 100644
index 00000000000..9c9b076aa8d
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/scoped-registry-define-upgrade-criteria.html
@@ -0,0 +1,255 @@
+<!DOCTYPE html>
+<title>Tests which nodes are upgraded after adding a scoped custom element definition</title>
+<meta name="author" title="Xiaocheng Hu" href="mailto:xiaochengh@chromium.org">
+<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
+<link rel="help" href="https://github.com/WICG/webcomponents/issues/923">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<body>
+
+<script>
+function attachShadowForTest(t, customElementRegistry) {
+  const host = document.createElement('div');
+  const shadow = host.attachShadow({mode: 'open', customElementRegistry});
+  document.body.appendChild(host);
+  t.add_cleanup(() => host.remove());
+  return shadow;
+}
+
+function createIFrameForTest(t) {
+  const iframe = document.createElement('iframe');
+  document.body.appendChild(iframe);
+  if (!iframe.contentDocument.body) {
+    iframe.contentDocument.body = iframe.contentDocument.createElement('body');
+  }
+  t.add_cleanup(() => iframe.remove());
+  return iframe;
+}
+
+let definitionCount = 0;
+function nextCustomElementName() {
+  return `test-element-${++definitionCount}`;
+}
+
+test(t => {
+  const name = nextCustomElementName();
+  document.body.appendChild(document.createElement(name));
+
+  const registry = new CustomElementRegistry;
+  const shadow = attachShadowForTest(t, registry);
+  shadow.appendChild(document.createElement(name));
+
+  class TestElement extends HTMLElement {};
+  customElements.define(name, TestElement);
+
+  assert_true(document.querySelector(name) instanceof TestElement);
+  assert_false(shadow.querySelector(name) instanceof TestElement);
+}, 'Adding definition to global registry should not affect shadow roots using scoped registry');
+
+test(t => {
+  const name = nextCustomElementName();
+
+  const shadow1 = attachShadowForTest(t, customElements);
+  shadow1.appendChild(document.createElement(name));
+
+  const shadow2 = attachShadowForTest(t);
+  shadow2.appendChild(document.createElement(name));
+
+  class TestElement extends HTMLElement {};
+  customElements.define(name, TestElement);
+
+  assert_true(shadow1.querySelector(name) instanceof TestElement);
+  assert_true(shadow2.querySelector(name) instanceof TestElement);
+}, 'Adding definition to global registry should affect shadow roots also using global registry');
+
+test(t => {
+  const name = nextCustomElementName();
+
+  const registry = new CustomElementRegistry;
+  const shadow1 = attachShadowForTest(t, registry);
+  shadow1.appendChild(document.createElement(name));
+
+  const shadow2 = attachShadowForTest(t, registry);
+  shadow2.appendChild(document.createElement(name));
+
+  class TestElement extends HTMLElement {};
+  registry.define(name, TestElement);
+
+  assert_true(shadow1.querySelector(name) instanceof TestElement);
+  assert_true(shadow2.querySelector(name) instanceof TestElement);
+}, 'Adding definition to scoped registry should affect all associated shadow roots');
+
+test(t => {
+  const name = nextCustomElementName();
+  document.body.appendChild(document.createElement(name));
+
+  const registry = new CustomElementRegistry;
+  const shadow = attachShadowForTest(t, registry);
+  shadow.appendChild(document.createElement(name));
+
+  class TestElement extends HTMLElement {};
+  registry.define(name, TestElement);
+
+  assert_false(document.querySelector(name) instanceof TestElement);
+  assert_true(shadow.querySelector(name) instanceof TestElement);
+}, 'Adding definition to scoped registry should not affect document tree scope');
+
+test(t => {
+  const name = nextCustomElementName();
+
+  const registry = new CustomElementRegistry;
+  const shadow1 = attachShadowForTest(t, registry);
+  shadow1.appendChild(document.createElement(name));
+
+  const shadow2 = attachShadowForTest(t, new CustomElementRegistry);
+  shadow2.appendChild(document.createElement(name));
+
+  const shadow3 = attachShadowForTest(t);
+  shadow3.appendChild(document.createElement(name));
+
+  class TestElement extends HTMLElement {};
+  registry.define(name, TestElement);
+
+  assert_true(shadow1.querySelector(name) instanceof TestElement);
+  assert_false(shadow2.querySelector(name) instanceof TestElement);
+  assert_false(shadow3.querySelector(name) instanceof TestElement);
+}, 'Adding definition to scoped registry should not affect shadow roots using other registries');
+
+test(t => {
+  const name = nextCustomElementName();
+  const node = document.body.appendChild(document.createElement(name));
+
+  const registry = new CustomElementRegistry;
+  const shadow = attachShadowForTest(t, registry);
+  shadow.appendChild(node);
+
+  class TestElement extends HTMLElement {};
+  customElements.define(name, TestElement);
+
+  assert_false(node instanceof TestElement);
+}, 'Adding definition to global registry should not upgrade nodes no longer using the registry');
+
+test(t => {
+  const name = nextCustomElementName();
+
+  const registry = new CustomElementRegistry;
+  const shadow1 = attachShadowForTest(t, registry);
+  const node = shadow1.appendChild(document.createElement(name));
+
+  const shadow2 = attachShadowForTest(t, new CustomElementRegistry);
+  shadow2.appendChild(node);
+
+  class TestElement extends HTMLElement {};
+  registry.define(name, TestElement);
+
+  assert_false(node instanceof TestElement);
+}, 'Adding definition to scoped registry should not upgrade nodes no longer using the registry');
+
+test(t => {
+  const name = nextCustomElementName();
+
+  const registry = new CustomElementRegistry;
+  const shadow1 = attachShadowForTest(t, registry);
+  const node1 = shadow1.appendChild(document.createElement(name));
+
+  const iframe = createIFrameForTest(t);
+  const host2 = iframe.contentDocument.createElement('div');
+  const shadow2 = host2.attachShadow({mode: 'open', customElementRegistry: registry});
+  const node2 = shadow2.appendChild(iframe.contentDocument.createElement(name));
+  iframe.contentDocument.body.appendChild(host2);
+
+  class TestElement extends HTMLElement {};
+  registry.define(name, TestElement);
+
+  assert_true(node1 instanceof TestElement);
+  assert_true(node2 instanceof TestElement);
+}, 'Adding definition to scoped registry affects associated shadow roots in all iframes');
+
+test(t => {
+  const name = nextCustomElementName();
+
+  const newWindow = window.open('about:blank');
+  t.add_cleanup(() => newWindow.close());
+
+  const host = newWindow.document.createElement('div');
+  const shadow = host.attachShadow({mode: 'open', customElementRegistry: window.customElements});
+  const node = shadow.appendChild(newWindow.document.createElement(name));
+  newWindow.document.body.appendChild(host);
+
+  class TestElement extends HTMLElement {};
+  window.customElements.define(name, TestElement);
+
+  assert_true(node instanceof TestElement);
+}, 'Adding definition to scoped registry affects associated shadow roots in other frame trees');
+
+test(t => {
+  const name = nextCustomElementName();
+
+  const registry = new CustomElementRegistry;
+  const shadow = attachShadowForTest(t, registry);
+  const node = shadow.appendChild(document.createElement(name));
+  shadow.host.remove();
+
+  class TestElement extends HTMLElement {};
+  registry.define(name, TestElement);
+
+  assert_false(node instanceof TestElement);
+}, 'Adding definition to scoped registry should not upgrade disconnected elements');
+
+test(t => {
+  const name = nextCustomElementName();
+
+  const registry = new CustomElementRegistry;
+  const doc = document.implementation.createHTMLDocument();
+  const host = doc.createElement('div');
+  const shadow = host.attachShadow({mode: 'open', registry});
+  const node = shadow.appendChild(doc.createElement(name));
+  doc.body.appendChild(host);
+
+  class TestElement extends HTMLElement {};
+  registry.define(name, TestElement);
+
+  assert_false(node instanceof TestElement);
+}, 'Adding definition to scoped registry should not upgrade nodes in constructed documents');
+
+test(t => {
+  const name = nextCustomElementName();
+
+  const iframe = createIFrameForTest(t);
+  const registry = new CustomElementRegistry;
+  const host = iframe.contentDocument.createElement('div');
+  const shadow = host.attachShadow({mode: 'open', registry});
+  const node = shadow.appendChild(iframe.contentDocument.createElement(name));
+  iframe.contentDocument.body.appendChild(host);
+
+  iframe.remove();
+
+  class TestElement extends HTMLElement {};
+  registry.define(name, TestElement);
+
+  assert_false(node instanceof TestElement);
+}, 'Adding definition to scoped registry should not upgrade nodes in detached frames');
+
+promise_test(async t => {
+  const name = nextCustomElementName();
+
+  const newWindow = window.open('about:blank');
+  t.add_cleanup(() => newWindow.close());
+
+  const host = newWindow.document.createElement('div');
+  const shadow = host.attachShadow({mode: 'open', registry: window.customElements});
+  const node = shadow.appendChild(newWindow.document.createElement(name));
+  newWindow.document.body.appendChild(host);
+
+  newWindow.close();
+
+  // `window.close()` is async. Wait a while until it's fully closed
+  await new Promise(resolve => t.step_timeout(resolve, 500));
+
+  class TestElement extends HTMLElement {};
+  window.customElements.define(name, TestElement);
+
+  assert_false(node instanceof TestElement);
+}, 'Adding definition to scoped registry should not upgrade nodes in closed windows');
+</script>
diff --git a/tests/wpt/tests/custom-elements/registries/scoped-registry-define-upgrade-order.html b/tests/wpt/tests/custom-elements/registries/scoped-registry-define-upgrade-order.html
new file mode 100644
index 00000000000..d115522a7b8
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/scoped-registry-define-upgrade-order.html
@@ -0,0 +1,216 @@
+<!DOCTYPE html>
+<title>Tests element upgrade order after adding a scoped custom element definition</title>
+<meta name="author" title="Xiaocheng Hu" href="mailto:xiaochengh@chromium.org">
+<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
+<link rel="help" href="https://github.com/WICG/webcomponents/issues/923">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<body>
+
+<script>
+let definitionCount = 0;
+function nextCustomElementDefinition() {
+  const log = [];
+  const name = `test-element-${++definitionCount}`;
+  const constructor = class extends HTMLElement {
+    constructor() {
+      super();
+      log.push(this.id);
+    }
+  };
+  return {name, constructor, log};
+}
+
+function attachShadowForTest(t, {parent, registry}) {
+  parent = parent || document.body;
+  const host = parent.ownerDocument.createElement('div');
+  const shadow = host.attachShadow({mode: 'open', customElementRegistry: registry});
+  parent.appendChild(host);
+  t.add_cleanup(() => host.remove());
+  return shadow;
+}
+
+function createIFrameForTest(t, {parent, nextSibling}) {
+  parent = parent || document.body;
+  const iframe = parent.ownerDocument.createElement('iframe');
+  parent.insertBefore(iframe, nextSibling);
+  if (!iframe.contentDocument.body) {
+    iframe.contentDocument.body = iframe.contentDocument.createElement('body');
+  }
+  t.add_cleanup(() => iframe.remove());
+  return iframe;
+}
+
+test(t => {
+  const {name, constructor, log} = nextCustomElementDefinition();
+
+  const registry = new CustomElementRegistry;
+  const shadow = attachShadowForTest(t, {registry});
+  shadow.innerHTML = `
+    <${name} id="a"></${name}>
+    <${name} id="b"></${name}>
+    <${name} id="c"></${name}>
+  `;
+
+  registry.define(name, constructor);
+  assert_array_equals(log, ['a', 'b', 'c']);
+}, 'Upgrade in tree order in the same tree scope');
+
+test(t => {
+  // document
+  // +- shadow1
+  // |  +- a
+  // |  +- shadow2
+  // |     +- b
+  // +- shadow3
+  //    +- c
+
+  const {name, constructor, log} = nextCustomElementDefinition();
+  const registry = new CustomElementRegistry;
+
+  const shadow1 = attachShadowForTest(t, {registry});
+  shadow1.innerHTML = `<${name} id="a"></${name}>`;
+
+  const shadow2 = attachShadowForTest(t, {registry, parent: shadow1});
+  shadow2.innerHTML = `<${name} id="b"></${name}>`;
+
+  const shadow3 = attachShadowForTest(t, {registry});
+  shadow3.innerHTML = `<${name} id="c"></${name}>`;
+
+  registry.define(name, constructor);
+  assert_array_equals(log, ['a', 'b', 'c']);
+}, 'Upgrade in shadow-including tree order across tree scopes');
+
+test(t => {
+  // document
+  // +- shadow1
+  // |  +- a
+  // |  +- shadow3
+  // |     +- c
+  // +- shadow2
+  //    +- b
+
+  const {name, constructor, log} = nextCustomElementDefinition();
+  const registry = new CustomElementRegistry;
+
+  const shadow1 = attachShadowForTest(t, {registry});
+  shadow1.innerHTML = `<${name} id="a"></${name}>`;
+
+  const shadow2 = attachShadowForTest(t, {registry});
+  shadow2.innerHTML = `<${name} id="b"></${name}>`;
+
+  const shadow3 = attachShadowForTest(t, {registry, parent: shadow1});
+  shadow3.innerHTML = `<${name} id="c"></${name}>`;
+
+  registry.define(name, constructor);
+  assert_array_equals(log, ['a', 'c', 'b']);
+}, 'Upgrade order does not depend on shadow root attach order');
+
+test(t => {
+  // document
+  // +- iframe1
+  // |   +- shadow1
+  // |   |  +- a
+  // |   +- iframe2
+  // |      +- shadow2
+  // |         +- b
+  // +- shadow3
+  //    +- c
+
+  const {name, constructor, log} = nextCustomElementDefinition();
+  const registry = new CustomElementRegistry;
+
+  const iframe1 = createIFrameForTest(t, {});
+  const shadow1 = attachShadowForTest(t, {registry, parent: iframe1.contentDocument.body});
+  shadow1.innerHTML = `<${name} id="a"></${name}>`;
+
+  const iframe2 = createIFrameForTest(t, {parent: iframe1.contentDocument.body});
+  const shadow2 = attachShadowForTest(t, {registry, parent: iframe2.contentDocument.body});
+  shadow2.innerHTML = `<${name} id="b"></${name}>`;
+
+  const shadow3 = attachShadowForTest(t, {registry});
+  shadow3.innerHTML = `<${name} id="c"></${name}>`;
+
+  registry.define(name, constructor);
+  assert_array_equals(log, ['a', 'b', 'c']);
+}, 'Upgrade in association order across documents, then tree order in each document');
+
+test(t => {
+  // document
+  // +- iframe2
+  // |  +- shadow2
+  // |     +- b
+  // +- iframe1
+  // |  +- shadow1
+  // |     +- a
+
+  const {name, constructor, log} = nextCustomElementDefinition();
+  const registry = new CustomElementRegistry;
+
+  const iframe1 = createIFrameForTest(t, {});
+  const shadow1 = attachShadowForTest(t, {registry, parent: iframe1.contentDocument.body});
+  shadow1.innerHTML = `<${name} id="a"></${name}>`;
+
+  const iframe2 = createIFrameForTest(t, {nextSibling: iframe1});
+  const shadow2 = attachShadowForTest(t, {registry, parent: iframe2.contentDocument.body});
+  shadow2.innerHTML = `<${name} id="b"></${name}>`;
+
+  registry.define(name, constructor);
+  assert_array_equals(log, ['a', 'b']);
+}, 'Upgrade order is not affected by DOM order between child frames');
+
+test(t => {
+  // document
+  // +- iframe1
+  // |  +- shadow2
+  // |     +- b
+  // +- iframe2
+  // |  +- shadow1
+  // |     +- a
+
+  const {name, constructor, log} = nextCustomElementDefinition();
+  const registry = new CustomElementRegistry;
+
+  const iframe1 = createIFrameForTest(t, {});
+  const iframe2 = createIFrameForTest(t, {});
+
+  const shadow1 = attachShadowForTest(t, {registry});
+  const host1 = shadow1.host;
+  shadow1.innerHTML = `<${name} id="a"></${name}>`;
+
+  const shadow2 = attachShadowForTest(t, {registry});
+  const host2 = shadow2.host;
+  shadow2.innerHTML = `<${name} id="b"></${name}>`;
+
+  iframe1.contentDocument.body.appendChild(host2);
+  iframe2.contentDocument.body.appendChild(host1);
+
+  registry.define(name, constructor);
+  assert_array_equals(log, ['b', 'a']);
+}, 'Upgrade order is affected by shadow tree adoption across documents');
+
+test(t => {
+  // Create a registry in one window, but associate it with another document first
+  // document
+  // +- iframe1
+  // |   +- shadow1
+  // |      +- a
+  // +- shadowr2
+  //    +- b
+
+  const {name, constructor, log} = nextCustomElementDefinition();
+  const registry = new CustomElementRegistry;
+
+  const iframe1 = createIFrameForTest(t, {});
+  const shadow1 = attachShadowForTest(t, {registry, parent: iframe1.contentDocument.body});
+  shadow1.innerHTML = `<${name} id="a"></${name}>`;
+
+  const shadow2 = attachShadowForTest(t, {registry});
+  shadow2.innerHTML = `<${name} id="b"></${name}>`;
+
+  registry.define(name, constructor);
+  assert_array_equals(log, ['a', 'b']);
+}, 'Elements in the "owner" window of a scoped registry are not always upgraded first');
+
+</script>
diff --git a/tests/wpt/tests/custom-elements/registries/scoped-registry-registry-define-get-etc.html b/tests/wpt/tests/custom-elements/registries/scoped-registry-registry-define-get-etc.html
new file mode 100644
index 00000000000..29e11d97052
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/scoped-registry-registry-define-get-etc.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<title>Tests scoped custom element registry methods which get custom element definitions or metadata</title>
+<meta name="author" title="Benny Powers" href="mailto:bennyp@redhat.com">
+<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
+<link rel="help" href="https://github.com/WICG/webcomponents/issues/923">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<body>
+
+<script>
+let definitionCount = 0;
+function nextCustomElementDefinition() {
+  const log = [];
+  const name = `test-element-${++definitionCount}`;
+  const constructor = class extends HTMLElement {
+    constructor() {
+      super();
+      log.push(this.id);
+    }
+  };
+  return {name, constructor, log};
+}
+
+test(t => {
+  const {name, constructor, log} = nextCustomElementDefinition();
+  const registry = new CustomElementRegistry;
+  registry.define(name, constructor);
+  assert_equals(registry.get(name), constructor);
+  assert_equals(registry.getName(constructor), name);
+}, 'Custom element registries with a registered custom element return the class in their get method, and the name in their getName method');
+
+test(t => {
+  const {name, constructor, log} = nextCustomElementDefinition();
+  const registry = new CustomElementRegistry;
+  customElements.define(name, constructor)
+  assert_equals(customElements.get(name), constructor);
+  assert_equals(customElements.getName(constructor), name);
+  assert_equals(registry.get(name), undefined);
+  assert_equals(registry.getName(constructor), null);
+  const scopedName = name + '-scoped';
+  registry.define(scopedName, class extends constructor {});
+  assert_not_equals(registry.get(scopedName), constructor)
+}, 'Scoped Custom element registries do not inherit names or classes from the global registry');
+
+test(t => {
+  const {name, constructor, log} = nextCustomElementDefinition();
+  const registry = new CustomElementRegistry;
+  customElements.define(name, constructor)
+  registry.define(name, constructor);
+  assert_equals(customElements.get(name), constructor);
+  assert_equals(customElements.getName(constructor), name);
+  assert_equals(registry.get(name), constructor);
+  assert_equals(registry.getName(constructor), name);
+}, 'Scoped Custom element registries return the same constructor when it is defined in both');
+
+test(t => {
+  const {name, constructor, log} = nextCustomElementDefinition();
+  const {name:name2, constructor: constructor2} = nextCustomElementDefinition();
+  const registry = new CustomElementRegistry;
+  customElements.define(name, constructor)
+  registry.define(name, constructor2);
+  assert_equals(customElements.get(name), constructor);
+  assert_equals(customElements.get(name2), undefined);
+  assert_equals(customElements.getName(constructor), name);
+  assert_equals(customElements.getName(constructor2), null);
+  assert_equals(registry.get(name), constructor2);
+  assert_equals(registry.get(name2), undefined);
+  assert_equals(registry.getName(constructor), null);
+  assert_equals(registry.getName(constructor2), name);
+}, 'Scoped Custom element registries allow registering name that exists in global registry');
+
+promise_test(async t => {
+  const {name, constructor, log} = nextCustomElementDefinition();
+  const registry = new CustomElementRegistry;
+  registry.define(name, constructor);
+  assert_equals(await registry.whenDefined(name), constructor);
+}, 'Custom element registries with a registered custom element resolve the class in their whenDefined method');
+
+promise_test(async t => {
+  const {name, constructor, log} = nextCustomElementDefinition();
+  const registry = new CustomElementRegistry;
+  customElements.define(name, constructor)
+  registry.define(name, constructor);
+  assert_equals(await customElements.whenDefined(name), constructor);
+  assert_equals(await registry.whenDefined(name), constructor);
+}, 'Scoped Custom element registries resolve the same constructor from whenDefined when it is defined in both');
+
+promise_test(async t => {
+  const {name, constructor, log} = nextCustomElementDefinition();
+  const registry = new CustomElementRegistry;
+  customElements.define(name, constructor)
+  const scopedName = name + '-scoped';
+  registry.define(scopedName , class extends constructor {});
+  const sym = Symbol();
+  const testPromise = await Promise.race([
+    registry.whenDefined(name),
+    new Promise(r => requestAnimationFrame(() => r(sym))),
+  ]);
+  assert_equals(testPromise, sym);
+}, 'Scoped Custom element registry getters do not resolve globally registered classes from whenDefined');
+
+</script>
diff --git a/tests/wpt/tests/custom-elements/registries/template.window.js b/tests/wpt/tests/custom-elements/registries/template.window.js
new file mode 100644
index 00000000000..7d442a618f8
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/registries/template.window.js
@@ -0,0 +1,25 @@
+test(() => {
+  const template = document.createElement("template");
+  assert_false(template.hasAttribute("shadowrootcustomelementregistry"));
+  assert_equals(template.shadowRootCustomElementRegistry, "");
+
+  template.shadowRootCustomElementRegistry = "blah";
+  assert_equals(template.getAttribute("shadowrootcustomelementregistry"), "blah");
+  assert_equals(template.shadowRootCustomElementRegistry, "blah");
+}, "shadowRootCustomElementRegistry reflects as string");
+
+test(() => {
+  const div = document.createElement("div");
+  div.setHTMLUnsafe(`<div><template shadowrootmode=open shadowrootcustomelementregistry shadowrootserializable></template></div>`);
+  assert_equals(div.firstChild.firstChild, null);
+  assert_equals(div.getHTML({ serializableShadowRoots: true }), "<div><template shadowrootmode=\"open\" shadowrootserializable=\"\" shadowrootcustomelementregistry=\"\"></template></div>");
+}, "Serializing a ShadowRoot with a null registry");
+
+test(() => {
+  const div = document.createElement("div");
+  div.setHTMLUnsafe(`<div><template shadowrootmode=open shadowrootcustomelementregistry shadowrootserializable></template></div>`);
+  const registry = new CustomElementRegistry();
+  registry.initialize(div.firstChild.shadowRoot);
+  assert_equals(div.firstChild.shadowRoot.customElementRegistry, registry);
+  assert_equals(div.getHTML({ serializableShadowRoots: true }), "<div><template shadowrootmode=\"open\" shadowrootserializable=\"\" shadowrootcustomelementregistry=\"\"></template></div>");
+}, "Serializing a ShadowRoot with a registry that differs from its host");
diff --git a/tests/wpt/tests/custom-elements/custom-element-registry/upgrade.html b/tests/wpt/tests/custom-elements/registries/upgrade.html
similarity index 100%
rename from tests/wpt/tests/custom-elements/custom-element-registry/upgrade.html
rename to tests/wpt/tests/custom-elements/registries/upgrade.html
diff --git a/tests/wpt/tests/custom-elements/revamped-scoped-registry/Construct.tentative.html b/tests/wpt/tests/custom-elements/revamped-scoped-registry/Construct.tentative.html
deleted file mode 100644
index 8233e6832eb..00000000000
--- a/tests/wpt/tests/custom-elements/revamped-scoped-registry/Construct.tentative.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
-<link rel="help" href="https://github.com/whatwg/html/issues/10854">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<script>
-
-test(() => {
-    class ABElement extends HTMLElement { };
-    const scopedRegistry = new CustomElementRegistry;
-    scopedRegistry.define('a-b', ABElement);
-    assert_throws_js(TypeError, () => new ABElement);
-}, 'A constructor with only a scoped custom element registry definition should fail upon construction');
-
-test(() => {
-    class CElement extends HTMLElement { };
-    const scopedRegistry = new CustomElementRegistry;
-    scopedRegistry.define('scoped-c', CElement);
-    customElements.define('global-c', CElement);
-    const cElement = new CElement;
-    assert_equals(cElement.localName, 'global-c');
-}, 'A constructor uses the global registry to create an element');
-
-test(() => {
-    let fgElement;
-    let hiElement;
-    class DEElement extends HTMLElement {
-        constructor() {
-            fgElement = document.createElement('f-g', {customElements: scopedRegistry2});
-            super();
-            hiElement = document.createElement('h-i', {customElements: scopedRegistry2});
-        }
-    };
-    class FGElement extends HTMLElement { }
-    class HIElement extends HTMLElement { }
-    const scopedRegistry1 = new CustomElementRegistry;
-    scopedRegistry1.define('d-e', DEElement);
-    const scopedRegistry2 = new CustomElementRegistry;
-    scopedRegistry2.define('f-g', FGElement);
-    scopedRegistry2.define('h-i', HIElement);
-
-    const deElement = document.createElement('d-e', {customElements: scopedRegistry1});
-    assert_true(deElement instanceof DEElement);
-    assert_equals(deElement.customElements, scopedRegistry1);
-    assert_true(fgElement instanceof FGElement);
-    assert_equals(fgElement.customElements, scopedRegistry2);
-    assert_true(hiElement instanceof HIElement);
-    assert_equals(hiElement.customElements, scopedRegistry2);
-}, 'A constructor creating an element from another registry before or after super call should work');
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/custom-elements/revamped-scoped-registry/CustomElementRegistry-initialize.tentative.html b/tests/wpt/tests/custom-elements/revamped-scoped-registry/CustomElementRegistry-initialize.tentative.html
deleted file mode 100644
index 7ccc63e2077..00000000000
--- a/tests/wpt/tests/custom-elements/revamped-scoped-registry/CustomElementRegistry-initialize.tentative.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
-<link rel="help" href="https://github.com/whatwg/html/issues/10854">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id="host">
-    <template shadowrootmode="open" shadowrootclonable="true" shadowrootcustomelements>
-        <a-b>
-            <template shadowrootmode="open" shadowrootclonable="true" shadowrootcustomelements>
-                <c-d/><c-d>
-            </template>
-        </a-b>
-        <ef></ef>
-    </template>
-</div>
-<div id="host-with-registry">
-    <template shadowrootmode="open" shadowrootclonable="true">
-        <a-b></a-b>
-        <ef></ef>
-    </template>
-</div>
-<script>
-
-test(() => {
-    assert_equals(typeof(window.customElements.initialize), 'function');
-    assert_equals(typeof((new CustomElementRegistry).initialize), 'function');
-}, 'initialize is a function on both global and scoped CustomElementRegistry');
-
-test(() => {
-    const clone = host.cloneNode(true);
-    const shadowRoot = clone.shadowRoot;
-    assert_equals(shadowRoot.customElements, null);
-    assert_equals(shadowRoot.querySelector('a-b').customElements, null);
-    assert_equals(shadowRoot.querySelector('ef').customElements, null);
-    window.customElements.initialize(shadowRoot);
-    assert_equals(shadowRoot.customElements, window.customElements);
-    assert_equals(shadowRoot.querySelector('a-b').customElements, window.customElements);
-    assert_equals(shadowRoot.querySelector('ef').customElements, window.customElements);
-}, 'initialize sets element.customElements to the global registry');
-
-test(() => {
-    const clone = host.cloneNode(true);
-    const shadowRoot = clone.shadowRoot;
-    assert_equals(shadowRoot.customElements, null);
-    assert_equals(shadowRoot.querySelector('a-b').customElements, null);
-    assert_equals(shadowRoot.querySelector('ef').customElements, null);
-    window.customElements.initialize(shadowRoot);
-    assert_equals(shadowRoot.customElements, window.customElements);
-    assert_equals(shadowRoot.querySelector('a-b').customElements, window.customElements);
-    assert_equals(shadowRoot.querySelector('ef').customElements, window.customElements);
-    assert_equals(shadowRoot.querySelector('a-b').shadowRoot.customElements, null);
-    assert_equals(shadowRoot.querySelector('a-b').shadowRoot.querySelector('c-d').customElements, null);
-}, 'initialize does not set the registry of nested shadow tree to the global registry');
-
-
-test(() => {
-    const clone = host.cloneNode(true);
-    const shadowRoot = clone.shadowRoot;
-    assert_equals(shadowRoot.customElements, null);
-    assert_equals(shadowRoot.querySelector('a-b').customElements, null);
-    assert_equals(shadowRoot.querySelector('ef').customElements, null);
-    const registry = new CustomElementRegistry;
-    registry.initialize(shadowRoot);
-    assert_equals(shadowRoot.customElements, registry);
-    assert_equals(shadowRoot.querySelector('a-b').customElements, registry);
-    assert_equals(shadowRoot.querySelector('ef').customElements, registry);
-}, 'initialize sets element.customElements to a scoped registry');
-
-test(() => {
-    const clone = host.cloneNode(true);
-    const shadowRoot = clone.shadowRoot;
-    assert_equals(shadowRoot.customElements, null);
-    assert_equals(shadowRoot.querySelector('a-b').customElements, null);
-    assert_equals(shadowRoot.querySelector('ef').customElements, null);
-    const registry = new CustomElementRegistry;
-    registry.initialize(shadowRoot);
-    assert_equals(shadowRoot.customElements, registry);
-    assert_equals(shadowRoot.querySelector('a-b').customElements, registry);
-    assert_equals(shadowRoot.querySelector('ef').customElements, registry);
-    assert_equals(shadowRoot.querySelector('a-b').shadowRoot.customElements, null);
-    assert_equals(shadowRoot.querySelector('a-b').shadowRoot.querySelector('c-d').customElements, null);
-}, 'initialize does not set the registry of nested shadow tree to a scoped registry');
-
-test(() => {
-    const clone = host.cloneNode(true);
-    const shadowRoot = clone.shadowRoot;
-    assert_equals(shadowRoot.customElements, null);
-    assert_equals(shadowRoot.querySelector('a-b').customElements, null);
-    assert_equals(shadowRoot.querySelector('ef').customElements, null);
-    const registry = new CustomElementRegistry;
-    registry.initialize(shadowRoot);
-    assert_equals(shadowRoot.customElements, registry);
-    assert_equals(shadowRoot.querySelector('a-b').customElements, registry);
-    assert_equals(shadowRoot.querySelector('ef').customElements, registry);
-    document.body.appendChild(clone);
-    assert_equals(shadowRoot.customElements, registry);
-    assert_equals(shadowRoot.querySelector('a-b').customElements, registry);
-    assert_equals(shadowRoot.querySelector('ef').customElements, registry);
-}, 'initialize sets element.customElements permantently');
-
-test(() => {
-    const clone = document.getElementById('host-with-registry').cloneNode(true);
-    const shadowRoot = clone.shadowRoot;
-    assert_equals(shadowRoot.customElements, window.customElements);
-    assert_equals(shadowRoot.querySelector('a-b').customElements, window.customElements);
-    assert_equals(shadowRoot.querySelector('ef').customElements, window.customElements);
-    const registry = new CustomElementRegistry;
-    registry.initialize(shadowRoot);
-    assert_equals(shadowRoot.customElements, window.customElements);
-    assert_equals(shadowRoot.querySelector('a-b').customElements, window.customElements);
-    assert_equals(shadowRoot.querySelector('ef').customElements, window.customElements);
-}, 'initialize is no-op on a subtree with a non-null registry');
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/custom-elements/revamped-scoped-registry/CustomElementRegistry-upgrade.tentative.html b/tests/wpt/tests/custom-elements/revamped-scoped-registry/CustomElementRegistry-upgrade.tentative.html
deleted file mode 100644
index 575b23e0ee4..00000000000
--- a/tests/wpt/tests/custom-elements/revamped-scoped-registry/CustomElementRegistry-upgrade.tentative.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
-<link rel="help" href="https://github.com/whatwg/html/issues/10854">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<some-host id="host">
-    <template shadowrootmode="closed" shadowrootclonable="true" shadowrootcustomelements>
-        <a-b>
-            <template shadowrootmode="closed" shadowrootclonable="true" shadowrootcustomelements>
-                <c-d/>
-                    <template shadowrootmode="closed" shadowrootclonable="true">
-                        <a-b></a-b>
-                    </template>
-                <c-d>
-            </template>
-        </a-b>
-    </template>
-</some-host>
-<script>
-
-customElements.define('some-host', class SomeHost extends HTMLElement {
-    elementInternals;
-
-    constructor() {
-        super();
-        this.elementInternals = this.attachInternals();
-    }
-});
-customElements.define('a-b', class GlobalABElement extends HTMLElement { });
-customElements.define('c-d', class GlobalCDElement extends HTMLElement { });
-
-test(() => {
-    assert_equals(typeof(window.customElements.upgrade), 'function');
-    assert_equals(typeof((new CustomElementRegistry).upgrade), 'function');
-}, 'upgrade is a function on both global and scoped CustomElementRegistry');
-
-test(() => {
-    const registry = new CustomElementRegistry;
-    registry.define('a-b', class ABElement extends HTMLElement { });
-
-    const clone = host.cloneNode(true);
-    registry.upgrade(clone.elementInternals.shadowRoot);
-    assert_equals(clone.elementInternals.shadowRoot.querySelector('a-b').__proto__.constructor.name, 'HTMLElement');
-}, 'upgrade is a no-op when called on a shadow root with no association');
-
-test(() => {
-    const registry = new CustomElementRegistry;
-    registry.define('a-b', class ABElement extends HTMLElement {
-        elementInternals;
-
-        constructor() {
-            super();
-            this.elementInternals = this.attachInternals();
-        }
-    });
-
-    const clone = host.cloneNode(true);
-    registry.initialize(clone.elementInternals.shadowRoot);
-    registry.upgrade(clone.elementInternals.shadowRoot);
-    const abElement = clone.elementInternals.shadowRoot.querySelector('a-b');
-    assert_equals(abElement.__proto__.constructor.name, 'ABElement');
-    assert_equals(abElement.elementInternals.shadowRoot.customElements, null);
-    const cdElement = abElement.elementInternals.shadowRoot.querySelector('c-d');
-    assert_equals(cdElement.__proto__.constructor.name, 'HTMLElement');
-    assert_equals(cdElement.customElements, null);
-}, 'upgrade should upgrade a candidate element when called on a shadow root with an association');
-
-test(() => {
-    const registry = new CustomElementRegistry;
-    registry.define('a-b', class ScopedABElement extends HTMLElement {
-        elementInternals;
-
-        constructor() {
-            super();
-            this.elementInternals = this.attachInternals();
-        }
-    });
-
-    const clone = host.cloneNode(true);
-    registry.initialize(clone.elementInternals.shadowRoot);
-    registry.upgrade(clone.elementInternals.shadowRoot);
-    const abElement = clone.elementInternals.shadowRoot.querySelector('a-b');
-    assert_equals(abElement.__proto__.constructor.name, 'ScopedABElement');
-    registry.initialize(abElement.elementInternals.shadowRoot);
-    assert_equals(abElement.elementInternals.shadowRoot.customElements, registry);
-    const cdElement = abElement.elementInternals.shadowRoot.querySelector('c-d');
-    assert_equals(cdElement.customElements, registry);
-
-    registry.define('c-d', class ScopedCDElement extends HTMLElement {
-        elementInternals;
-
-        constructor() {
-            super();
-            this.elementInternals = this.attachInternals();
-        }
-    });
-    assert_equals(cdElement.__proto__.constructor.name, 'HTMLElement');
-    registry.upgrade(abElement.elementInternals.shadowRoot);
-    assert_equals(cdElement.__proto__.constructor.name, 'ScopedCDElement');
-    assert_equals(cdElement.customElements, registry);
-
-    assert_equals(cdElement.elementInternals.shadowRoot.customElements, window.customElements);
-    const innerAB = cdElement.elementInternals.shadowRoot.querySelector('a-b');
-    assert_equals(innerAB.customElements, window.customElements);
-    assert_equals(innerAB.__proto__.constructor.name, 'HTMLElement');
-}, 'upgrade should not upgrade a candidate element not associated with the registry');
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/custom-elements/revamped-scoped-registry/Document-createElement.tentative.html b/tests/wpt/tests/custom-elements/revamped-scoped-registry/Document-createElement.tentative.html
deleted file mode 100644
index 23a8ba5b06d..00000000000
--- a/tests/wpt/tests/custom-elements/revamped-scoped-registry/Document-createElement.tentative.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
-<link rel="help" href="https://github.com/whatwg/html/issues/10854">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<script>
-// Keep this ~synchronized with Document-createElementNS
-"use strict";
-
-const scopedRegistry = new CustomElementRegistry();
-const otherScopedRegistry = new CustomElementRegistry();
-class GlobalABElement extends HTMLElement {};
-class ScopedABElement extends HTMLElement {};
-customElements.define('a-b', GlobalABElement);
-scopedRegistry.define('a-b', ScopedABElement);
-
-test(() => {
-    assert_true(document.createElement('a-b') instanceof GlobalABElement);
-}, 'createElement should use the global registry by default');
-
-test(() => {
-    assert_true(document.createElement('a-b', {customElements: scopedRegistry}) instanceof ScopedABElement);
-}, 'createElement should use the specified scoped registry');
-
-test(() => {
-    const elements = {
-        div: HTMLDivElement,
-        form: HTMLFormElement,
-        span: HTMLSpanElement,
-        table: HTMLTableElement,
-        unknown: HTMLUnknownElement,
-    };
-    for (const localName in elements) {
-        const scopedElement = document.createElement(localName, {customElements: scopedRegistry});
-        assert_true(scopedElement instanceof elements[localName], localName);
-        assert_equals(scopedElement.customElements, scopedRegistry);
-
-        const globalExplicitElement = document.createElement(localName, {customElements: window.customElements});
-        assert_true(globalExplicitElement instanceof elements[localName], localName);
-        assert_equals(globalExplicitElement.customElements, window.customElements);
-
-        const globalImplicitElement = document.createElement(localName);
-        assert_true(globalImplicitElement instanceof elements[localName], localName);
-        assert_equals(globalImplicitElement.customElements, window.customElements);
-    }
-}, 'createElement should create a builtin element regardless of a custom element registry specified');
-
-test(() => {
-    assert_true(document.createElement('a-b', {customElements: window.customElements}) instanceof GlobalABElement);
-}, 'createElement should use the specified global registry');
-
-test(() => {
-    const element = document.createElement('a-b', {customElements: otherScopedRegistry});
-    assert_equals(element.__proto__.constructor.name, 'HTMLElement');
-}, 'createElement should create an upgrade candidate when there is no matching definition in the specified registry');
-
-test(() => {
-    class CDElement extends HTMLElement { }
-    const registry = new CustomElementRegistry;
-    const cdElement = document.createElement('c-d', {customElements: registry});
-    assert_false(cdElement instanceof CDElement);
-    assert_equals(cdElement.__proto__.constructor.name, 'HTMLElement');
-    registry.define('c-d', CDElement);
-    assert_false(cdElement instanceof CDElement); // Not yet upgraded since it's disconnected.
-    assert_equals(cdElement.__proto__.constructor.name, 'HTMLElement');
-    document.body.appendChild(cdElement);
-    assert_true(cdElement instanceof CDElement);
-}, 'createElement should create an upgrade candidate and the candidate should be upgraded when the element is defined');
-
-test(() => {
-    const doc = new Document();
-    const scopedElement = doc.createElement("time", {customElements: scopedRegistry});
-    assert_equals(scopedElement.namespaceURI, null);
-    assert_equals(scopedElement.customElements, scopedRegistry);
-
-    const abElement = doc.createElement("a-b", {customElements: scopedRegistry});
-    assert_equals(abElement.namespaceURI, null);
-    assert_equals(abElement.customElements, scopedRegistry);
-    assert_false(abElement instanceof ScopedABElement);
-}, 'createElement on a non-HTML document should still handle registries correctly');
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/custom-elements/revamped-scoped-registry/Document-createElementNS.tentative.html b/tests/wpt/tests/custom-elements/revamped-scoped-registry/Document-createElementNS.tentative.html
deleted file mode 100644
index 35a30999ce7..00000000000
--- a/tests/wpt/tests/custom-elements/revamped-scoped-registry/Document-createElementNS.tentative.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link rel="help" href="https://github.com/whatwg/html/issues/10854">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<script>
-// Keep this ~synchronized with Document-createElement
-"use strict";
-
-const scopedRegistry = new CustomElementRegistry();
-const otherScopedRegistry = new CustomElementRegistry();
-class GlobalABElement extends HTMLElement {};
-class ScopedABElement extends HTMLElement {};
-customElements.define('a-b', GlobalABElement);
-scopedRegistry.define('a-b', ScopedABElement);
-
-test(() => {
-    assert_true(document.createElementNS('http://www.w3.org/1999/xhtml', 'a-b') instanceof GlobalABElement);
-}, 'createElementNS should use the global registry by default');
-
-test(() => {
-    assert_true(document.createElementNS('http://www.w3.org/1999/xhtml', 'a-b', {customElements: scopedRegistry}) instanceof ScopedABElement);
-}, 'createElementNS should use the specified scoped registry');
-
-test(() => {
-    const elements = {
-        div: HTMLDivElement,
-        form: HTMLFormElement,
-        span: HTMLSpanElement,
-        table: HTMLTableElement,
-        unknown: HTMLUnknownElement,
-    };
-    for (const localName in elements) {
-        const scopedElement = document.createElementNS('http://www.w3.org/1999/xhtml', localName, {customElements: scopedRegistry});
-        assert_true(scopedElement instanceof elements[localName], localName);
-        assert_equals(scopedElement.customElements, scopedRegistry);
-
-        const globalExplicitElement = document.createElementNS('http://www.w3.org/1999/xhtml', localName, {customElements: window.customElements});
-        assert_true(globalExplicitElement instanceof elements[localName], localName);
-        assert_equals(globalExplicitElement.customElements, window.customElements);
-
-        const globalImplicitElement = document.createElementNS('http://www.w3.org/1999/xhtml', localName);
-        assert_true(globalImplicitElement instanceof elements[localName], localName);
-        assert_equals(globalImplicitElement.customElements, window.customElements);
-    }
-}, 'createElementNS should create a builtin element regardless of a custom element registry specified');
-
-test(() => {
-    assert_true(document.createElementNS('http://www.w3.org/1999/xhtml', 'a-b', {customElements: window.customElements}) instanceof GlobalABElement);
-}, 'createElementNS should use the specified global registry');
-
-test(() => {
-    const element = document.createElementNS('http://www.w3.org/1999/xhtml', 'a-b', {customElements: otherScopedRegistry});
-    assert_equals(element.__proto__.constructor.name, 'HTMLElement');
-}, 'createElementNS should create an upgrade candidate when there is no matching definition in the specified registry');
-
-test(() => {
-    class CDElement extends HTMLElement { }
-    const registry = new CustomElementRegistry;
-    const cdElement = document.createElementNS('http://www.w3.org/1999/xhtml', 'c-d', {customElements: registry});
-    assert_false(cdElement instanceof CDElement);
-    assert_equals(cdElement.__proto__.constructor.name, 'HTMLElement');
-    registry.define('c-d', CDElement);
-    assert_false(cdElement instanceof CDElement); // Not yet upgraded since it's disconnected.
-    assert_equals(cdElement.__proto__.constructor.name, 'HTMLElement');
-    document.body.appendChild(cdElement);
-    assert_true(cdElement instanceof CDElement);
-}, 'createElementNS should create an upgrade candidate and the candidate should be upgraded when the element is defined');
-
-test(() => {
-    const doc = new Document();
-    const scopedElement = doc.createElementNS(null, "time", {customElements: scopedRegistry});
-    assert_equals(scopedElement.namespaceURI, null);
-    assert_equals(scopedElement.customElements, scopedRegistry);
-
-    const abElement = doc.createElementNS(null, "a-b", {customElements: scopedRegistry});
-    assert_equals(abElement.namespaceURI, null);
-    assert_equals(abElement.customElements, scopedRegistry);
-    assert_false(abElement instanceof ScopedABElement);
-}, 'createElementNS on a non-HTML document should still handle registries correctly');
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/custom-elements/revamped-scoped-registry/Document-importNode.tentative.html b/tests/wpt/tests/custom-elements/revamped-scoped-registry/Document-importNode.tentative.html
deleted file mode 100644
index 989dea0b263..00000000000
--- a/tests/wpt/tests/custom-elements/revamped-scoped-registry/Document-importNode.tentative.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
-<link rel="help" href="https://github.com/whatwg/html/issues/10854">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id="host">
-    <template shadowrootmode="open" shadowrootclonable="true" shadowrootcustomelements>
-        <div>
-            <some-element></some-element>
-            <other-element></other-element>
-        </div>
-    </template>
-</div>
-<template id="template">
-    <some-element>
-        <template shadowrootmode="closed" shadowrootclonable="true" shadowrootcustomelements>
-            <div>
-                <some-element></some-element>
-                <other-element></other-element>
-            </div>
-        </template>
-    </some-element>
-</template>
-<div id="root">
-    <span></span>
-</div>
-<script>
-
-const scopedRegistry = new CustomElementRegistry();
-const emptyRegistry = new CustomElementRegistry();
-class GlobalSomeElement extends HTMLElement {
-    elementInternals;
-
-    constructor() {
-        super();
-        this.elementInternals = this.attachInternals();
-        if (this.elementInternals.shadowRoot)
-            scopedRegistry.initialize(this.elementInternals.shadowRoot);
-    }
-};
-class GlobalOtherElement extends HTMLElement {};
-class ScopedSomeElement extends HTMLElement {};
-customElements.define('some-element', GlobalSomeElement);
-customElements.define('other-element', GlobalOtherElement);
-scopedRegistry.define('some-element', ScopedSomeElement);
-
-test(() => {
-    assert_true(document.importNode(document.createElement('some-element')) instanceof GlobalSomeElement);
-}, 'importNode should clone using the global regsitry by default');
-
-test(() => {
-    assert_true(document.importNode(document.createElement('some-element'), {customElements: scopedRegistry}) instanceof ScopedSomeElement);
-}, 'importNode should clone using the specified scoped regsitry');
-
-test(() => {
-    const clone = document.importNode(host, {selfOnly: false, customElements: scopedRegistry});
-    assert_equals(clone.shadowRoot.querySelector('some-element').__proto__.constructor.name, 'HTMLElement');
-    assert_false(clone.shadowRoot.querySelector('some-element') instanceof GlobalSomeElement);
-    assert_false(clone.shadowRoot.querySelector('some-element') instanceof ScopedSomeElement);
-    assert_true(clone.shadowRoot.querySelector('other-element') instanceof HTMLElement);
-    assert_false(clone.shadowRoot.querySelector('other-element') instanceof GlobalOtherElement);
-}, 'importNode should preserve null-ness of custom element registry');
-
-test(() => {
-    const clone = document.importNode(host.shadowRoot.querySelector('div'), {selfOnly: false});
-    assert_equals(clone.customElements, window.customElements);
-    assert_true(clone.querySelector('some-element') instanceof GlobalSomeElement);
-    assert_true(clone.querySelector('other-element') instanceof GlobalOtherElement);
-}, 'importNode should clone a shadow host with a declarative shadow DOM using the global registry by default');
-
-test(() => {
-    const clone = document.importNode(host.shadowRoot.querySelector('div'), {selfOnly: false, customElements: scopedRegistry});
-    assert_equals(clone.customElements, scopedRegistry);
-    assert_true(clone.querySelector('some-element') instanceof ScopedSomeElement);
-    assert_false(clone.querySelector('other-element') instanceof GlobalOtherElement);
-}, 'importNode should clone a shadow host with a declarative shadow DOM using a specified scoped registry');
-
-test(() => {
-    const element = document.createElement('div', {customElements: emptyRegistry});
-    element.innerHTML = '<some-element></some-element><other-element></other-element>';
-    const clone = document.importNode(element, {selfOnly: false, customElements: scopedRegistry});
-    assert_equals(clone.customElements, scopedRegistry);
-    assert_true(clone.querySelector('some-element') instanceof ScopedSomeElement);
-    assert_false(clone.querySelector('other-element') instanceof GlobalOtherElement);
-}, 'importNode should clone an element originating from a scoped registry using another scoped registry');
-
-test(() => {
-    const template = document.createElement('template');
-    template.innerHTML = '<div><some-element>hello</some-element><other-element>world</other-element></div>';
-    assert_equals(template.content.querySelector('some-element').__proto__.constructor.name, 'HTMLElement');
-    assert_equals(template.content.querySelector('other-element').__proto__.constructor.name, 'HTMLElement');
-    const clone = document.importNode(template.content, {selfOnly: false});
-    assert_equals(clone.querySelector('some-element').customElements, window.customElements);
-    assert_equals(clone.querySelector('some-element').__proto__.constructor.name, 'GlobalSomeElement');
-    assert_equals(clone.querySelector('other-element').__proto__.constructor.name, 'GlobalOtherElement');
-}, 'importNode should clone a template content using the global registry by default');
-
-test(() => {
-    const template = document.createElement('template');
-    template.innerHTML = '<div><some-element>hello</some-element><other-element>world</other-element></div>';
-    assert_equals(template.content.querySelector('some-element').__proto__.constructor.name, 'HTMLElement');
-    assert_equals(template.content.querySelector('other-element').__proto__.constructor.name, 'HTMLElement');
-    const clone = document.importNode(template.content, {selfOnly: false, customElements: scopedRegistry});
-    assert_equals(clone.querySelector('some-element').customElements, scopedRegistry);
-    assert_equals(clone.querySelector('some-element').__proto__.constructor.name, 'ScopedSomeElement');
-    assert_equals(clone.querySelector('other-element').__proto__.constructor.name, 'HTMLElement');
-}, 'importNode should clone a template content using a specified scoped registry');
-
-test(() => {
-    const template = document.createElement('template');
-    template.innerHTML = `
-<div>
-    <some-element>
-        <template>
-            <other-element>
-                hello
-            </other-element>
-        </template>
-    </some-element>
-    <other-element>
-        world
-    </other-element>
-</div>`;
-    assert_equals(template.content.querySelector('some-element').__proto__.constructor.name, 'HTMLElement');
-    assert_equals(template.content.querySelector('other-element').__proto__.constructor.name, 'HTMLElement');
-    const clone = document.importNode(template.content, {selfOnly: false});
-    assert_equals(clone.querySelector('some-element').customElements, window.customElements);
-    assert_equals(clone.querySelector('some-element').__proto__.constructor.name, 'GlobalSomeElement');
-    const otherElementInTemplate = clone.querySelector('template').content.querySelector('other-element');
-    assert_equals(otherElementInTemplate.__proto__.constructor.name, 'HTMLElement');
-    assert_equals(clone.querySelector('other-element').__proto__.constructor.name, 'GlobalOtherElement');
-}, 'importNode should clone a template content with a nested template element using a scoped registry');
-
-test(() => {
-    const clone = document.importNode(root);
-    assert_false(clone.hasChildNodes());
-}, "importNode: don't pass options argument");
-
-test(() => {
-    const clone = document.importNode(root, false);
-    assert_false(clone.hasChildNodes());
-}, "importNode: pass options argument with value false");
-
-test(() => {
-    const clone = document.importNode(root, true);
-    assert_true(clone.hasChildNodes());
-}, "importNode: pass options argument with value true");
-
-test(() => {
-    const clone = document.importNode(root, undefined);
-    assert_false(clone.hasChildNodes());
-}, "importNode: pass options argument with value undefined");
-
-test(() => {
-    const clone = document.importNode(root, { });
-    assert_true(clone.hasChildNodes());
-}, "importNode: pass options argument with value { }");
-
-test(() => {
-    const clone = document.importNode(root, { selfOnly: false });
-    assert_true(clone.hasChildNodes());
-}, "importNode: pass options argument with value { selfOnly: false }");
-
-test(() => {
-    const clone = document.importNode(root, { selfOnly: true });
-    assert_false(clone.hasChildNodes());
-}, "importNode: pass options argument with value { selfOnly: true }");
-
-test(() => {
-    const clone = document.importNode(root, { customElements: scopedRegistry });
-    assert_true(clone.hasChildNodes());
-}, "importNode: pass options argument with value { customElements: scopedRegistry }");
-
-test(() => {
-    assert_throws_js(TypeError, () => document.importNode(root, { customElements: null }));
-}, "importNode: pass options argument with value { customElements: null }");
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/custom-elements/revamped-scoped-registry/Element-customElements-exceptions.tentative.html b/tests/wpt/tests/custom-elements/revamped-scoped-registry/Element-customElements-exceptions.tentative.html
deleted file mode 100644
index 4442c04c53d..00000000000
--- a/tests/wpt/tests/custom-elements/revamped-scoped-registry/Element-customElements-exceptions.tentative.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
-<link rel="help" href="https://github.com/whatwg/html/issues/10854">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id="host-window"><template shadowrootmode="open"><a-b></a-b></template></div>
-<div id="host-null"><template shadowrootmode="open" shadowrootcustomelements=""><a-b></a-b></template></div>
-<script>
-
-setup({allow_uncaught_exception : true});
-
-test(() => {
-    const registry = new CustomElementRegistry;
-    registry.define('constructor-throws-exception', class extends HTMLElement { constructor() { super(); throw TypeError; } });
-    registry.define('constructor-returns-different-element', class extends HTMLElement { constructor() { super(); return document.createElement('span'); } });
-    assert_equals(document.createElement('constructor-throws-exception', {customElements: registry}).customElements, registry);
-    assert_equals(document.createElement('constructor-returns-different-element', {customElements: registry}).customElements, registry);
-}, 'customElements on a failed custom element created by calling createElement on CustomElementRegistry should return the registry');
-
-test(() => {
-    const registry = new CustomElementRegistry;
-    registry.define('constructor-throws-exception', class extends HTMLElement { constructor() { super(); throw TypeError; } });
-    registry.define('constructor-returns-different-element', class extends HTMLElement { constructor() { super(); return document.createElement('span'); } });
-    const container = document.createElement('div', {customElements: registry});
-    container.innerHTML = '<constructor-throws-exception></constructor-throws-exception><constructor-returns-different-element></constructor-returns-different-element>';
-    assert_equals(container.querySelector('constructor-throws-exception').customElements, registry);
-    assert_equals(container.querySelector('constructor-returns-different-element').customElements, registry);
-}, 'customElements on a failed custom element created by setting innerHTML should return the associated scoped registry');
-
-function insideDeclarativeShadowTreeWithNullRegistry(test, script, markup, check) {
-    const frame = document.body.appendChild(document.createElement('iframe'));
-    test.add_cleanup(() => frame.remove());
-
-    frame.contentDocument.open();
-    frame.contentDocument.write(`<!DOCTYPE html><html><body><div id="host"><template shadowrootmode="open" shadowrootcustomelements><script>`
-        + script + `</` + 'script>' + markup + '</template></div></body></html>');
-    frame.contentDocument.close();
-    check(frame.contentDocument, frame.contentWindow);
-}
-
-test((t) => {
-    insideDeclarativeShadowTreeWithNullRegistry(t, `
-        window.registry = new CustomElementRegistry;
-        registry.initialize(host.shadowRoot);
-        registry.define('constructor-throws-exception', class extends HTMLElement { constructor() { super(); throw TypeError; } });
-        registry.define('constructor-returns-different-element', class extends HTMLElement { constructor() { super(); return document.createElement('span'); } });`,
-        '<constructor-throws-exception></constructor-throws-exception><constructor-returns-different-element></constructor-returns-different-element>',
-        (doc, win) => {
-            assert_equals(win.host.shadowRoot.querySelector('constructor-throws-exception').customElements, win.registry);
-            assert_equals(win.host.shadowRoot.querySelector('constructor-returns-different-element').customElements, win.registry);
-        });
-}, 'customElements on a failed custom element created by parser should return the specified custom regsitry');
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/custom-elements/revamped-scoped-registry/Element-customElements.tentative.html b/tests/wpt/tests/custom-elements/revamped-scoped-registry/Element-customElements.tentative.html
deleted file mode 100644
index e27074d5eb6..00000000000
--- a/tests/wpt/tests/custom-elements/revamped-scoped-registry/Element-customElements.tentative.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
-<link rel="help" href="https://github.com/whatwg/html/issues/10854">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id="host-window"><template shadowrootmode="open" shadowrootclonable="true"><a-b></a-b></template></div>
-<div id="host-null"><template shadowrootmode="open" shadowrootclonable="true" shadowrootcustomelements=""><a-b></a-b></template></div>
-<script>
-
-test(() => {
-    assert_equals(document.createElement('div').customElements, window.customElements);
-}, 'customElements on a newly constrcuted element should return window.customElements by default');
-
-test(() => {
-    const sr = document.getElementById('host-window').shadowRoot;
-    const ab = sr.querySelector('a-b');
-    assert_equals(sr.customElements, window.customElements);
-    assert_equals(ab.customElements, window.customElements);
-}, 'customElements on an element inside a declarative shadow DOM should return window.customElements by default');
-
-test(() => {
-    const sr = document.getElementById('host-null').shadowRoot;
-    const ab = sr.querySelector('a-b');
-    assert_equals(sr.customElements, null);
-    assert_equals(ab.customElements, null);
-}, 'customElements on an element inside a declarative shadow DOM with shadowrootcustomelements should return null');
-
-test(() => {
-    const clone = document.getElementById('host-null').cloneNode(true);
-    const sr = clone.shadowRoot;
-    const ab = sr.querySelector('a-b');
-    assert_equals(sr.customElements, null);
-    assert_equals(ab.customElements, null);
-}, 'customElements on a clone of a declarative shadow tree with shadowrootcustomelements should return null');
-
-test((t) => {
-    const clone = document.getElementById('host-null').cloneNode(true);
-    const ab = clone.shadowRoot.querySelector('a-b');
-    document.body.appendChild(ab);
-    assert_equals(ab.customElements, window.customElements);
-
-    const frame = document.createElement('iframe');
-    t.add_cleanup(() => frame.remove());
-    document.body.appendChild(frame);
-    frame.contentDocument.body.append(ab);
-    assert_equals(ab.customElements, frame.contentWindow.customElements);
-
-}, 'customElements on a clone of a declarative shadow tree with shadowrootcustomelements should return the global registry after getting inserted into a document');
-
-test(() => {
-    const sr = document.getElementById('host-null').shadowRoot;
-    const ab = sr.querySelector('a-b');
-    const registry = new CustomElementRegistry;
-    registry.initialize(sr);
-    assert_equals(sr.customElements, registry);
-    assert_equals(ab.customElements, registry);
-}, 'customElements on an element inside a declarative shadow DOM with shadowrootcustomelements should return the scoped registry after calling initialize');
-
-test(() => {
-    const registry = new CustomElementRegistry;
-    element = document.createElement('div', {customElements: registry});
-    assert_equals(element.customElements, registry);
-}, 'customElements on a builtin element created by calling createElement on CustomElementRegistry should return the registry');
-
-test(() => {
-    const registry = new CustomElementRegistry;
-    element = document.createElement('non-existent', {customElements: registry});
-    assert_equals(element.customElements, registry);
-}, 'customElements on an upgarde candidate created by calling createElement on CustomElementRegistry should return the registry');
-
-test(() => {
-    const registry = new CustomElementRegistry;
-    element = document.createElement('nonexistent', {customElements: registry});
-    assert_equals(element.customElements, registry);
-}, 'customElements on an unknown element created by calling createElement on CustomElementRegistry should return the registry');
-
-test(() => {
-    const registry = new CustomElementRegistry;
-    registry.define('custom-element', class extends HTMLElement { })
-    element = document.createElement('custom-element', {customElements: registry});
-    assert_equals(element.customElements, registry);
-}, 'customElements on a defined custom element created by calling createElement on CustomElementRegistry should return the registry');
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/custom-elements/revamped-scoped-registry/Element-innerHTML.tentative.html b/tests/wpt/tests/custom-elements/revamped-scoped-registry/Element-innerHTML.tentative.html
deleted file mode 100644
index dcbbbdcd673..00000000000
--- a/tests/wpt/tests/custom-elements/revamped-scoped-registry/Element-innerHTML.tentative.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
-<link rel="help" href="https://github.com/whatwg/html/issues/10854">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<script>
-
-function createConnectedShadowTree(test, customElements) {
-    const host = document.createElement('div');
-    const shadowRoot = host.attachShadow({mode: 'closed', customElements});
-    document.body.appendChild(host);
-    test.add_cleanup(() => host.remove());
-    return shadowRoot;
-}
-
-class GlobalSomeElement extends HTMLElement { };
-customElements.define('some-element', GlobalSomeElement);
-
-class GlobalOtherElement extends HTMLElement { };
-customElements.define('other-element', GlobalOtherElement);
-
-test((test) => {
-    const registry = new CustomElementRegistry;
-
-    class ScopedSomeElement extends HTMLElement { };
-    registry.define('some-element', ScopedSomeElement);
-
-    class ScopedOtherElement extends HTMLElement { };
-    registry.define('other-element', ScopedOtherElement);
-
-    const shadowRoot = createConnectedShadowTree(test, registry);
-    const someElement = document.createElement('some-element', {customElements: registry});
-    assert_true(someElement instanceof ScopedSomeElement);
-    someElement.innerHTML = '<other-element></other-element>';
-    assert_true(someElement.querySelector('other-element') instanceof ScopedOtherElement);
-}, 'innerHTML on a disconnected element should use the scoped registry it was created with');
-
-test((test) => {
-    const registry1 = new CustomElementRegistry;
-    const registry2 = new CustomElementRegistry;
-
-    class ScopedSomeElement extends HTMLElement { };
-    registry1.define('some-element', ScopedSomeElement);
-
-    class ScopedOtherElement1 extends HTMLElement { };
-    registry1.define('other-element', ScopedOtherElement1);
-    class ScopedOtherElement2 extends HTMLElement { };
-    registry2.define('other-element', ScopedOtherElement2);
-
-    const shadowRoot1 = createConnectedShadowTree(test, registry1);
-    const shadowRoot2 = createConnectedShadowTree(test, registry2);
-    const someElement = document.createElement('some-element', {customElements: registry1});
-    someElement.innerHTML = '<other-element></other-element>';
-    assert_true(someElement.querySelector('other-element') instanceof ScopedOtherElement1);
-    shadowRoot2.appendChild(someElement);
-    someElement.innerHTML = '<other-element></other-element>';
-    assert_true(someElement.querySelector('other-element') instanceof ScopedOtherElement1);
-    someElement.remove();
-    someElement.innerHTML = '<other-element></other-element>';
-    assert_true(someElement.querySelector('other-element') instanceof ScopedOtherElement1);
-}, 'innerHTML on an inserted element should continue to use the scoped registry it was created with');
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/custom-elements/revamped-scoped-registry/ShadowRoot-init-customElements.tentative.html b/tests/wpt/tests/custom-elements/revamped-scoped-registry/ShadowRoot-init-customElements.tentative.html
deleted file mode 100644
index 6169bfff116..00000000000
--- a/tests/wpt/tests/custom-elements/revamped-scoped-registry/ShadowRoot-init-customElements.tentative.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
-<link rel="help" href="https://github.com/whatwg/html/issues/10854">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<script>
-
-test(() => {
-    const shadowRoot = document.createElement('div').attachShadow({mode: 'closed'});
-    assert_equals(shadowRoot.customElements, window.customElements);
-}, 'A newly attached disconnected ShadowRoot should use the global registry by default');
-
-test(() => {
-    const host = document.body.appendChild(document.createElement('div'));
-    const shadowRoot = host.attachShadow({mode: 'closed'});
-    assert_equals(shadowRoot.customElements, window.customElements);
-}, 'A newly attached connected ShadowRoot should use the global registry by default');
-
-test(() => {
-    const registry = new CustomElementRegistry;
-    const shadowRoot = document.createElement('div').attachShadow({mode: 'closed', customElements: registry});
-    assert_equals(shadowRoot.customElements, registry);
-}, 'A newly attached disconnected ShadowRoot should use the scoped registry if explicitly specified in attachShadow');
-
-test(() => {
-    const registry = new CustomElementRegistry;
-    const host = document.body.appendChild(document.createElement('div'));
-    const shadowRoot = host.attachShadow({mode: 'closed', customElements: registry});
-    assert_equals(shadowRoot.customElements, registry);
-}, 'A newly attached connected ShadowRoot should use the scoped registry if explicitly specified in attachShadow');
-
-test(() => {
-    const host = document.body.appendChild(document.createElement('div'));
-    host.attachShadow({mode: 'closed', customElements: null});
-}, 'attachShadow() should not throw for a null customElements value');
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/custom-elements/revamped-scoped-registry/ShadowRoot-innerHTML.tentative.html b/tests/wpt/tests/custom-elements/revamped-scoped-registry/ShadowRoot-innerHTML.tentative.html
deleted file mode 100644
index 9cfa1759d39..00000000000
--- a/tests/wpt/tests/custom-elements/revamped-scoped-registry/ShadowRoot-innerHTML.tentative.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
-<link rel="help" href="https://github.com/whatwg/html/issues/10854">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<script>
-
-function createConnectedShadowTree(test, customElements) {
-    const host = document.createElement('div');
-    const shadowRoot = host.attachShadow({mode: 'closed', customElements});
-    document.body.appendChild(host);
-    test.add_cleanup(() => host.remove());
-    return shadowRoot;
-}
-
-test((test) => {
-    const registry = new CustomElementRegistry;
-
-    class SomeElement extends HTMLElement { };
-    registry.define('some-element', SomeElement);
-
-    class OtherElement extends HTMLElement { };
-    registry.define('other-element', OtherElement);
-
-    const shadowRoot = createConnectedShadowTree(test, registry);
-    assert_true(document.createElement('some-element', {customElements: registry}) instanceof SomeElement);
-    assert_true(document.createElement('other-element', {customElements: registry}) instanceof OtherElement);
-    shadowRoot.innerHTML = '<some-element></some-element><other-element></other-element>';
-
-    assert_true(shadowRoot.querySelector('some-element') instanceof SomeElement);
-    assert_equals(shadowRoot.querySelector('some-element').customElements, registry);
-    assert_true(shadowRoot.querySelector('other-element') instanceof OtherElement);
-    assert_equals(shadowRoot.querySelector('other-element').customElements, registry);
-}, 'innerHTML on a shadow root should use the scoped registry');
-
-test((test) => {
-    class SomeElement1 extends HTMLElement { };
-    customElements.define('some-element', SomeElement1);
-
-    const registry = new CustomElementRegistry;
-    class SomeElement2 extends HTMLElement { };
-    registry.define('some-element', SomeElement2);
-
-    const shadowRoot = createConnectedShadowTree(test, registry);
-    shadowRoot.innerHTML = '<some-element></some-element>';
-    assert_true(shadowRoot.querySelector('some-element') instanceof SomeElement2);
-    assert_equals(shadowRoot.querySelector('some-element').customElements, registry);
-}, 'innerHTML on a connected shadow root should use the associated scoped registry');
-
-test((test) => {
-    const registry = new CustomElementRegistry;
-    class SomeElement extends HTMLElement { };
-    registry.define('some-element', SomeElement);
-    const shadowRoot = createConnectedShadowTree(test, registry);
-
-    shadowRoot.innerHTML = '<some-element></some-element><template><some-element></some-element></template>';
-    assert_equals(shadowRoot.querySelector('some-element').__proto__.constructor.name, 'SomeElement');
-    assert_equals(shadowRoot.querySelector('some-element').customElements, registry);
-    assert_equals(shadowRoot.querySelector('template').content.querySelector('some-element').__proto__.constructor.name, 'HTMLElement');
-    assert_equals(shadowRoot.querySelector('template').content.querySelector('some-element').customElements, null);
-}, 'innerHTML on a connected shadow root should not upgrade a custom element inside a template element');
-
-test((test) => {
-    const registry = new CustomElementRegistry;
-    const shadowRoot = createConnectedShadowTree(test, registry);
-    shadowRoot.innerHTML = '<someelement></someelement>';
-    assert_equals(shadowRoot.querySelector('someelement').__proto__.constructor.name, 'HTMLUnknownElement');
-    assert_equals(shadowRoot.querySelector('someelement').customElements, registry);
-}, 'innerHTML on a connected shadow root should be able to create an unknown element');
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/custom-elements/revamped-scoped-registry/idlharness.tentative.window.js b/tests/wpt/tests/custom-elements/revamped-scoped-registry/idlharness.tentative.window.js
new file mode 100644
index 00000000000..1f5c776cc25
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/revamped-scoped-registry/idlharness.tentative.window.js
@@ -0,0 +1,21 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+// META: global=window,dedicatedworker,shadowrealm-in-window
+
+idl_test(
+  ["scoped-custom-elements-registry.tentative"],
+  ["html", "dom"],
+  (idl_array) => {
+    let element = document.createElement("div");
+    let shadowRoot = element.attachShadow({ mode: "open" });
+    let customElementRegistry = new CustomElementRegistry();
+    let templateElement = document.createElement("template");
+    idl_array.add_objects({
+      document,
+      element,
+      shadowRoot,
+      customElementRegistry,
+      templateElement,
+    });
+  },
+);
diff --git a/tests/wpt/tests/custom-elements/revamped-scoped-registry/polymer-polyfill-regression.tentative.html b/tests/wpt/tests/custom-elements/revamped-scoped-registry/polymer-polyfill-regression.tentative.html
deleted file mode 100644
index d3d56c8125e..00000000000
--- a/tests/wpt/tests/custom-elements/revamped-scoped-registry/polymer-polyfill-regression.tentative.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
-<link rel="help" href="https://github.com/whatwg/html/issues/10854">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<script>
-
-test(() => {
-    document.createElement('div').attachShadow({mode: 'closed', customElements: { }});
-}, 'attachShadow should not throw an exception when an arbitrary type is passed to customElements');
-
-test(() => {
-    document.createElement('div').attachShadow({mode: 'closed'}).customElements = { };
-}, 'The setter of customElements IDL attribute should not throw an exception when assigned of an arbitrary type');
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/custom-elements/revamped-scoped-registry/template.tentative.window.js b/tests/wpt/tests/custom-elements/revamped-scoped-registry/template.tentative.window.js
deleted file mode 100644
index 68a247d346d..00000000000
--- a/tests/wpt/tests/custom-elements/revamped-scoped-registry/template.tentative.window.js
+++ /dev/null
@@ -1,25 +0,0 @@
-test(() => {
-  const template = document.createElement("template");
-  assert_false(template.hasAttribute("shadowrootcustomelements"));
-  assert_equals(template.shadowRootCustomElements, "");
-
-  template.shadowRootCustomElements = "blah";
-  assert_equals(template.getAttribute("shadowrootcustomelements"), "blah");
-  assert_equals(template.shadowRootCustomElements, "blah");
-}, "shadowRootCustomElements reflects as string");
-
-test(() => {
-  const div = document.createElement("div");
-  div.setHTMLUnsafe(`<div><template shadowrootmode=open shadowrootcustomelements shadowrootserializable></template></div>`);
-  assert_equals(div.firstChild.firstChild, null);
-  assert_equals(div.getHTML({ serializableShadowRoots: true }), "<div><template shadowrootmode=\"open\" shadowrootserializable=\"\" shadowrootcustomelements=\"\"></template></div>");
-}, "Serializing a ShadowRoot with a null registry");
-
-test(() => {
-  const div = document.createElement("div");
-  div.setHTMLUnsafe(`<div><template shadowrootmode=open shadowrootcustomelements shadowrootserializable></template></div>`);
-  const registry = new CustomElementRegistry();
-  registry.initialize(div.firstChild.shadowRoot);
-  assert_equals(div.firstChild.shadowRoot.customElements, registry);
-  assert_equals(div.getHTML({ serializableShadowRoots: true }), "<div><template shadowrootmode=\"open\" shadowrootserializable=\"\" shadowrootcustomelements=\"\"></template></div>");
-}, "Serializing a ShadowRoot with a registry that differs from its host");
diff --git a/tests/wpt/tests/custom-elements/scoped-registry-initialize.html b/tests/wpt/tests/custom-elements/scoped-registry-initialize.html
new file mode 100644
index 00000000000..18dbd0ebedd
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/scoped-registry-initialize.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/custom-elements.html#dom-customelementregistry-initialize">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+
+function runTest(title, makeDocument, customElementRegistry) {
+    test(() => {
+        assert_equals(makeDocument().createElement('a-b').customElementRegistry, null);
+    }, `${title}: customElementRegistry of an upgrade candidate created with a document without a browsing context uses null regsitry by default`);
+
+    test(() => {
+        const element = makeDocument().createElement('a-b');
+        customElementRegistry.initialize(element);
+        assert_equals(element.customElementRegistry, customElementRegistry);
+    }, `${title}: customElementRegistry of an upgrade candidate after calling CustomElementRegistry.prototype.initialize should return the registry`);
+
+    test(() => {
+        const element = makeDocument().createElement('a-b', {customElementRegistry});
+        customElementRegistry.initialize(element);
+        assert_equals(element.customElementRegistry, customElementRegistry);
+    }, `${title}: customElementRegistry of an upgrade candidate created with an explicit customElementRegistry argument should return the registry`);
+
+    test(() => {
+        const element = makeDocument().createElement('foo');
+        assert_equals(element.customElementRegistry, null);
+    }, `${title}: customElementRegistry of an unknown element created with a document without a browsing context uses null regsitry by default`);
+
+    test(() => {
+        const element = makeDocument().createElement('foo');
+        customElementRegistry.initialize(element);
+        assert_equals(element.customElementRegistry, customElementRegistry);
+    }, `${title}: customElementRegistry of an unknown element after calling CustomElementRegistry.prototype.initialize should return the registry`);
+
+    test(() => {
+        const element = makeDocument().createElement('foo', {customElementRegistry});
+        assert_equals(element.customElementRegistry, customElementRegistry);
+    }, `${title}: customElementRegistry of an unknown element created with an explicit customElementRegistry argument should return the registry`);
+
+    const addElement = (doc) => {
+        const element = doc.createElement('b-c');
+        if (doc.body)
+            doc.body.appendChild(element);
+        else if (doc.documentElement)
+            doc.documentElement.appendChild(element);
+        else
+            doc.appendChild(element);
+        return element;
+    }
+
+    test(() => {
+        assert_equals(addElement(makeDocument()).customElementRegistry, null);
+    }, `${title}: customElementRegistry of an upgrade candidate connected to a document without a browsing context uses null regsitry by default`);
+
+    test(() => {
+        const doc = makeDocument();
+        const element = addElement(doc);
+        customElementRegistry.initialize(doc);
+        assert_equals(doc.customElementRegistry, customElementRegistry);
+        assert_equals(element.customElementRegistry, customElementRegistry);
+    }, `${title}: customElementRegistry of document and an upgrade candidate after calling CustomElementRegistry.prototype.initialize should return the registry`);
+
+    test(() => {
+        const doc = makeDocument();
+        const element = addElement(doc);
+        customElementRegistry.initialize(doc);
+        assert_equals(doc.customElementRegistry, customElementRegistry);
+        assert_equals(element.customElementRegistry, customElementRegistry);
+        element.innerHTML = '<a-b></a-b>';
+        assert_equals(element.querySelector('a-b').customElementRegistry, customElementRegistry);
+    }, `${title}: customElementRegistry of an element created after calling CustomElementRegistry.prototype.initialize should return the registry`);
+}
+
+runTest('Document', () => new Document, new CustomElementRegistry);
+runTest('HTMLDocument', () => document.implementation.createHTMLDocument(), new CustomElementRegistry);
+runTest('XHTMLDocument', () => document.implementation.createDocument('http://www.w3.org/1999/xhtml', 'html', null), new CustomElementRegistry);
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/custom-elements/scoped-registry/CustomElementRegistry-constructor.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/CustomElementRegistry-constructor.tentative.html
deleted file mode 100644
index d80a1fbe6c8..00000000000
--- a/tests/wpt/tests/custom-elements/scoped-registry/CustomElementRegistry-constructor.tentative.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<meta name="author" title="Xiaocheng Hu" href="mailto:xiaochengh@chromium.org">
-<meta name="assert" content="User code can create non-global CustomElementRegistry instances and add definitions">
-<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-test(() => {
-  let registry = new CustomElementRegistry();
-  assert_not_equals(registry, window.customElements);
-
-  // Define an autonomous element with the new registry. It should not become a
-  // global definition.
-  class MyAutonomous extends HTMLElement {};
-  registry.define('my-autonomous', MyAutonomous);
-  assert_equals(registry.get('my-autonomous'), MyAutonomous);
-  assert_equals(window.customElements.get('my-autonomous'), undefined);
-  assert_false(document.createElement('my-autonomous') instanceof MyAutonomous);
-
-  // Do the same for a customized built-in element.
-  class MyCustomizedBuiltIn extends HTMLParagraphElement {};
-  registry.define('my-customized-builtin', MyCustomizedBuiltIn, {extends: 'p'});
-  assert_equals(registry.get('my-customized-builtin'), MyCustomizedBuiltIn);
-  assert_equals(window.customElements.get('my-customized-builtin'), undefined);
-  assert_false(document.createElement('p', {is: 'my-customized-builtin'}) instanceof MyCustomizedBuiltIn);
-}, 'Create non-global CustomElementRegistry and add definitions');
-</script>
diff --git a/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-createElement.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-createElement.tentative.html
deleted file mode 100644
index 335773f9c6d..00000000000
--- a/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-createElement.tentative.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html>
-<title>Tests ShadowRoot.createElement APIs work with scoped custom element registries</title>
-<meta name="author" title="Xiaocheng Hu" href="mailto:xiaochengh@chromium.org">
-<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<body>
-<script>
-class TestAutonomous extends HTMLElement {};
-class TestCustomizedBuiltIn extends HTMLParagraphElement {};
-
-function attachShadowForTest(t, registry) {
-  const host = document.createElement('div');
-  const shadow = host.attachShadow({mode: 'open', registry});
-  document.body.appendChild(host);
-  t.add_cleanup(() => host.remove());
-  return shadow;
-}
-
-test(t => {
-  const registry = new CustomElementRegistry;
-  registry.define('test-element', TestAutonomous);
-
-  const shadow = attachShadowForTest(t, registry);
-  assert_true(shadow.createElement('test-element') instanceof TestAutonomous);
-
-  // Verify that it doesn't pollute other tree scopes.
-  const shadow2 = attachShadowForTest(t);
-  assert_false(shadow2.createElement('test-element') instanceof TestAutonomous);
-
-  const shadow3 = attachShadowForTest(t, new CustomElementRegistry);
-  assert_false(shadow3.createElement('test-element') instanceof TestAutonomous);
-
-  assert_false(document.createElement('test-element') instanceof TestAutonomous);
-}, 'ShadowRoot.createElement() for autonomous custom element');
-
-test(t => {
-  const html = 'http://www.w3.org/1999/xhtml';
-
-  const registry = new CustomElementRegistry;
-  registry.define('test-element', TestAutonomous);
-
-  const shadow = attachShadowForTest(t, registry);
-  assert_true(shadow.createElementNS(html, 'test-element') instanceof TestAutonomous);
-
-  // Verify that it doesn't pollute other tree scopes.
-  const shadow2 = attachShadowForTest(t);
-  assert_false(shadow2.createElementNS(html, 'test-element') instanceof TestAutonomous);
-
-  const shadow3 = attachShadowForTest(t, new CustomElementRegistry);
-  assert_false(shadow3.createElementNS(html, 'test-element') instanceof TestAutonomous);
-
-  assert_false(document.createElementNS(html, 'test-element') instanceof TestAutonomous);
-}, 'ShadowRoot.createElementNS() for autonomous custom element');
-
-test(t => {
-  const registry = new CustomElementRegistry;
-  registry.define('test-element', TestCustomizedBuiltIn, {extends: 'p'});
-
-  const shadow = attachShadowForTest(t, registry);
-  assert_true(shadow.createElement('p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
-
-  // Verify that it doesn't pollute other tree scopes.
-  const shadow2 = attachShadowForTest(t);
-  assert_false(shadow2.createElement('p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
-
-  const shadow3 = attachShadowForTest(t, new CustomElementRegistry);
-  assert_false(shadow3.createElement('p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
-
-  assert_false(document.createElement('p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
-}, 'ShadowRoot.createElement() for customized built-in element');
-
-test(t => {
-  const html = 'http://www.w3.org/1999/xhtml';
-
-  const registry = new CustomElementRegistry;
-  registry.define('test-element', TestCustomizedBuiltIn, {extends: 'p'});
-
-  const shadow = attachShadowForTest(t, registry);
-  assert_true(shadow.createElementNS(html, 'p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
-
-  // Verify that it doesn't pollute other tree scopes.
-  const shadow2 = attachShadowForTest(t);
-  assert_false(shadow2.createElementNS(html, 'p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
-
-  const shadow3 = attachShadowForTest(t, new CustomElementRegistry);
-  assert_false(shadow3.createElementNS(html, 'p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
-
-  assert_false(document.createElementNS(html, 'p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
-}, 'ShadowRoot.createElementNS() for customized built-in element');
-
-</script>
-</body>
-
diff --git a/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-importNode.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-importNode.tentative.html
deleted file mode 100644
index dc5ef24bd80..00000000000
--- a/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-importNode.tentative.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Tests ShadowRoot.importNode APIs work with scoped custom element registries</title>
-<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
-<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<script>
-function createConnectedShadowTree(test, registry) {
-    const host = document.createElement('div');
-    const shadowRoot = host.attachShadow({mode: 'closed', registry});
-    document.body.appendChild(host);
-    test.add_cleanup(() => host.remove());
-    return shadowRoot;
-}
-
-test((test) => {
-    const registry = new CustomElementRegistry;
-    class SomeElement extends HTMLElement { };
-    registry.define('some-element', SomeElement);
-    const shadowRoot = createConnectedShadowTree(test, registry);
-    assert_true(shadowRoot.createElement('some-element') instanceof SomeElement);
-
-    const someElement = document.createElement('some-element');
-    assert_false(someElement instanceof SomeElement);
-    const clone = shadowRoot.importNode(someElement);
-    assert_true(clone instanceof SomeElement);
-}, 'ShadowRoot.importNode: an upgrade candidate from document');
-
-test((test) => {
-    const registry1 = new CustomElementRegistry;
-    class SomeElement1 extends HTMLElement { };
-    registry1.define('some-element', SomeElement1);
-    const shadowRoot1 = createConnectedShadowTree(test, registry1);
-    const someElement = shadowRoot1.createElement('some-element');
-    assert_true(someElement instanceof SomeElement1);
-
-    const registry2 = new CustomElementRegistry;
-    const shadowRoot2 = createConnectedShadowTree(test, registry2);
-    class SomeElement2 extends HTMLElement { }
-    registry2.define('some-element', SomeElement2);
-    assert_true(shadowRoot2.createElement('some-element') instanceof SomeElement2);
-
-    assert_true(shadowRoot2.importNode(someElement) instanceof SomeElement2);
-}, 'ShadowRoot.importNode: a custom element from another shadow tree');
-
-test((test) => {
-    const registry = new CustomElementRegistry;
-    const logs = [];
-    class SomeElement extends HTMLElement {
-        constructor() {
-            super();
-            logs.push('some-element');
-        }
-    };
-    class OtherElement extends HTMLElement {
-        constructor() {
-            super();
-            logs.push('other-element');
-        }
-    };
-    registry.define('some-element', SomeElement);
-    registry.define('other-element', OtherElement);
-
-    const template = document.createElement('template');
-    template.innerHTML = '<div><some-element>hello</some-element><other-element>world</other-element></div>';
-    assert_false(template.content.querySelector('some-element') instanceof SomeElement);
-    assert_false(template.content.querySelector('other-element') instanceof OtherElement);
-
-    const shadowRoot = createConnectedShadowTree(test, registry);
-    const clone = shadowRoot.importNode(template.content, /* deep */ true);
-    assert_true(clone.querySelector('some-element') instanceof SomeElement);
-    assert_true(clone.querySelector('other-element') instanceof OtherElement);
-    assert_array_equals(logs, ['some-element', 'other-element']);
-}, 'ShadowRoot.importNode: a template content from document');
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-init-registry.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-init-registry.tentative.html
deleted file mode 100644
index f9bc5b5b568..00000000000
--- a/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-init-registry.tentative.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<meta name="author" title="Xiaocheng Hu" href="mailto:xiaochengh@chromium.org">
-<meta name="assert" content="User code can attach CustomElementRegistry to ShadowRoot">
-<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-<script>
-function createShadowHost(testObject) {
-  let element = document.createElement('div');
-  testObject.add_cleanup(() => element.remove());
-  document.body.appendChild(element);
-  return element;
-}
-
-test(function() {
-  let host = createShadowHost(this);
-  let shadow = host.attachShadow({mode: 'open'});
-  assert_equals(shadow.registry, null);
-}, 'ShadowRoot.registry is null if not explicitly specified');
-
-test(function() {
-  let host = createShadowHost(this);
-  let shadow = host.attachShadow({mode: 'open', registry: window.customElements});
-  assert_equals(shadow.registry, window.customElements);
-}, 'Attach the global registry to a shadow root');
-
-test(function() {
-  let host = createShadowHost(this);
-  let registry = new CustomElementRegistry();
-  let shadow = host.attachShadow({mode: 'open', registry});
-  assert_equals(shadow.registry, registry);
-}, 'Attach a non-global registry to a shadow root');
-
-test(function() {
-  let registry = new CustomElementRegistry();
-  let host1 = createShadowHost(this);
-  let shadow1 = host1.attachShadow({mode: 'open', registry});
-  let host2 = createShadowHost(this);
-  let shadow2 = host2.attachShadow({mode: 'open', registry});
-  assert_equals(shadow1.registry, registry);
-  assert_equals(shadow2.registry, registry);
-}, 'Attach the same registry to multiple shadow roots');
-
-test(function() {
-  let host = createShadowHost(this);
-  let shadow = host.attachShadow({mode: 'open'});
-  shadow.registry = new CustomElementRegistry();
-  assert_equals(shadow.registry, null);
-}, 'Attaching registry to shadow root can only be done during initialization');
-</script>
-</body>
diff --git a/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-innerHTML-upgrade.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-innerHTML-upgrade.tentative.html
deleted file mode 100644
index 11cecb1533b..00000000000
--- a/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-innerHTML-upgrade.tentative.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<meta name="author" title="Xiaocheng Hu" href="mailto:xiaochengh@chromium.org">
-<meta name="assert" content="Custom element constructors can re-enter with different definitions">
-<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
-<link rel="help" href="https://github.com/WICG/webcomponents/issues/969">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<div id="testdiv"></div>
-
-<script>
-class GloballyScopedElement extends HTMLElement {};
-customElements.define('globally-scoped', GloballyScopedElement);
-
-class TestAutonomous extends HTMLElement {};
-class TestCustomizedBuiltIn extends HTMLParagraphElement {};
-
-function attachShadowForTest(t, registry) {
-  const host = document.createElement('div');
-  const shadow = host.attachShadow({mode: 'open', registry});
-  document.body.appendChild(host);
-  t.add_cleanup(() => host.remove());
-  return shadow;
-}
-
-test(t => {
-  const registry = new CustomElementRegistry;
-  registry.define('test-element', TestAutonomous);
-
-  const shadow = attachShadowForTest(t, registry);
-  shadow.innerHTML = '<test-element></test-element>';
-  assert_true(shadow.firstChild instanceof TestAutonomous, 'target tree scope');
-
-  // Verify that it doesn't pollute other tree scopes.
-  const shadow2 = attachShadowForTest(t);
-  shadow2.innerHTML = '<test-element></test-element>';
-  assert_false(shadow2.firstChild instanceof TestAutonomous, 'tree scope without registry');
-
-  const shadow3 = attachShadowForTest(t, new CustomElementRegistry);
-  shadow3.innerHTML = '<test-element></test-element>';
-  assert_false(shadow3.firstChild instanceof TestAutonomous, 'tree scope with different registry');
-
-  t.add_cleanup(() => testdiv.firstChild.remove());
-  testdiv.innerHTML = '<test-element></test-element>';
-  assert_false(testdiv.firstChild instanceof TestAutonomous, 'main document');
-}, 'Upgrade into autonomous custom element when inserted via innerHTML');
-
-test(t => {
-  const registry = new CustomElementRegistry;
-  const shadow = attachShadowForTest(t, registry);
-  shadow.innerHTML = '<test-element></test-element>';
-
-  const shadow2 = attachShadowForTest(t);
-  shadow2.innerHTML = '<test-element></test-element>';
-
-  const shadow3 = attachShadowForTest(t, new CustomElementRegistry);
-  shadow3.innerHTML = '<test-element></test-element>';
-
-  t.add_cleanup(() => testdiv.firstChild.remove());
-  testdiv.innerHTML = '<test-element></test-element>';
-
-  registry.define('test-element', TestAutonomous);
-
-  // Elements in the target tree scope should be upgraded.
-  assert_true(shadow.firstChild instanceof TestAutonomous, 'target tree scope');
-
-  // Verify that it doesn't pollute other tree scopes.
-  assert_false(shadow2.firstChild instanceof TestAutonomous, 'tree scope without registry');
-  assert_false(shadow3.firstChild instanceof TestAutonomous, 'tree scope with different registry');
-  assert_false(testdiv.firstChild instanceof TestAutonomous, 'main document');
-}, 'Upgrade into autonomous custom element when definition is added');
-
-test(t => {
-  const registry = new CustomElementRegistry;
-  registry.define('test-element', TestCustomizedBuiltIn, {extends: 'p'});
-
-  const shadow = attachShadowForTest(t, registry);
-  shadow.innerHTML = '<p is="test-element"></p>';
-  assert_true(shadow.firstChild instanceof TestCustomizedBuiltIn, 'target tree scope');
-
-  // Verify that it doesn't pollute other tree scopes.
-  const shadow2 = attachShadowForTest(t);
-  shadow2.innerHTML = '<p is="test-element"></p>';
-  assert_false(shadow2.firstChild instanceof TestCustomizedBuiltIn, 'tree scope without registry');
-
-  const shadow3 = attachShadowForTest(t, new CustomElementRegistry);
-  shadow3.innerHTML = '<p is="test-element"></p>';
-  assert_false(shadow3.firstChild instanceof TestCustomizedBuiltIn, 'tree scope with different registry');
-
-  t.add_cleanup(() => testdiv.firstChild.remove());
-  testdiv.innerHTML = '<p is="test-element"></p>';
-  assert_false(testdiv.firstChild instanceof TestCustomizedBuiltIn, 'main document');
-}, 'Upgrade into customized built-in element when inserted via innerHTML');
-
-test(t => {
-  const registry = new CustomElementRegistry;
-  const shadow = attachShadowForTest(t, registry);
-  shadow.innerHTML = '<p is="test-element"></p>';
-
-  const shadow2 = attachShadowForTest(t);
-  shadow2.innerHTML = '<p is="test-element"></p>';
-
-  const shadow3 = attachShadowForTest(t, new CustomElementRegistry);
-  shadow3.innerHTML = '<p is="test-element"></p>';
-
-  t.add_cleanup(() => testdiv.firstChild.remove());
-  testdiv.innerHTML = '<p is="test-element"></p>';
-
-  registry.define('test-element', TestCustomizedBuiltIn, {extends: 'p'});
-
-  // Elements in the target tree scope should be upgraded.
-  assert_true(shadow.firstChild instanceof TestCustomizedBuiltIn, 'target tree scope');
-
-  // Verify that it doesn't pollute other tree scopes.
-  assert_false(shadow2.firstChild instanceof TestCustomizedBuiltIn, 'tree scope without registry');
-  assert_false(shadow3.firstChild instanceof TestCustomizedBuiltIn, 'tree scope with different registry');
-  assert_false(testdiv.firstChild instanceof TestCustomizedBuiltIn, 'main document');
-}, 'Upgrade into customized built-in element when definition is added');
-
-test(t => {
-  const registry = new CustomElementRegistry;
-
-  const shadow = attachShadowForTest(t, registry);
-  shadow.innerHTML = '<globally-scoped></globally-scoped>';
-  assert_false(shadow.firstChild instanceof GloballyScopedElement, 'is not GloballyScoped');
-
-}, 'Upgrade into autonomous custom element should not inherit from global registry for missing values');
-</script>
diff --git a/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-innerHTML.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-innerHTML.tentative.html
deleted file mode 100644
index bee3f18a96d..00000000000
--- a/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-innerHTML.tentative.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Tests innerHTML should use the scoped custom element registry used to create the context object</title>
-<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
-<link rel="help" href="https://github.com/WICG/webcomponents/issues/1078">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<script>
-function createConnectedShadowTree(test, registry) {
-    const host = document.createElement('div');
-    const shadowRoot = host.attachShadow({mode: 'closed', registry});
-    document.body.appendChild(host);
-    test.add_cleanup(() => host.remove());
-    return shadowRoot;
-}
-
-test((test) => {
-    const registry = new CustomElementRegistry;
-
-    class SomeElement extends HTMLElement { };
-    registry.define('some-element', SomeElement);
-
-    class OtherElement extends HTMLElement { };
-    registry.define('other-element', OtherElement);
-
-    const shadowRoot = createConnectedShadowTree(test, registry);
-    assert_true(shadowRoot.createElement('some-element') instanceof SomeElement);
-    assert_true(shadowRoot.createElement('other-element') instanceof OtherElement);
-    shadowRoot.innerHTML = '<some-element></some-element><other-element></other-element>';
-
-    assert_true(shadowRoot.querySelector('some-element') instanceof SomeElement);
-    assert_true(shadowRoot.querySelector('other-element') instanceof OtherElement);
-}, 'innerHTML on a shadow root should use scoped custom element registry');
-
-test((test) => {
-    const registry = new CustomElementRegistry;
-
-    class SomeElement extends HTMLElement { };
-    registry.define('some-element', SomeElement);
-
-    class OtherElement extends HTMLElement { };
-    registry.define('other-element', OtherElement);
-
-    const shadowRoot = createConnectedShadowTree(test, registry);
-    const someElement = shadowRoot.createElement('some-element');
-    assert_true(someElement instanceof SomeElement);
-    someElement.innerHTML = '<other-element></other-element>';
-    assert_true(someElement.querySelector('other-element') instanceof OtherElement);
-}, 'innerHTML on a disconnected element should use the associated scoped custom element registry');
-
-test((test) => {
-    class SomeElement1 extends HTMLElement { };
-    customElements.define('some-element', SomeElement1);
-
-    const registry = new CustomElementRegistry;
-    class SomeElement2 extends HTMLElement { };
-    registry.define('some-element', SomeElement2);
-
-    const shadowRoot = createConnectedShadowTree(test, registry);
-    shadowRoot.innerHTML = '<some-element></some-element>';
-    assert_true(shadowRoot.querySelector('some-element') instanceof SomeElement2);
-}, 'innerHTML on a connected shadow root should use its scoped custom element');
-
-test((test) => {
-    class OtherElement1 extends HTMLElement { };
-    customElements.define('other-element', OtherElement1);
-
-    const registry1 = new CustomElementRegistry;
-    class SomeElement extends HTMLElement { };
-    registry1.define('some-element', SomeElement);
-    class OtherElement2 extends HTMLElement { };
-    registry1.define('other-element', OtherElement2);
-
-    const registry2 = new CustomElementRegistry;
-    class OtherElement3 extends HTMLElement { };
-    registry2.define('other-element', OtherElement3);
-
-    const shadowRoot1 = createConnectedShadowTree(test, registry1);
-    const shadowRoot2 = createConnectedShadowTree(test, registry2);
-    const someElement = shadowRoot1.createElement('some-element');
-    someElement.innerHTML = '<other-element></other-element>';
-    assert_true(someElement.querySelector('other-element') instanceof OtherElement2);
-    shadowRoot2.appendChild(someElement);
-    someElement.innerHTML = '<other-element>b</other-element>';
-    assert_true(someElement.querySelector('other-element') instanceof OtherElement3);
-    someElement.remove();
-    someElement.innerHTML = '<other-element></other-element>';
-    assert_true(someElement.querySelector('other-element') instanceof OtherElement3);
-}, 'innerHTML on an inserted element should use the scoped custom element of the ancestor shadow root');
-
-test((test) => {
-    const registry = new CustomElementRegistry;
-    class SomeElement extends HTMLElement { };
-    registry.define('some-element', SomeElement);
-    const shadowRoot = createConnectedShadowTree(test, registry);
-
-    shadowRoot.innerHTML = '<some-element></some-element><template><some-element></some-element></template>';
-    assert_equals(shadowRoot.querySelector('some-element').__proto__.constructor.name, 'SomeElement');
-    assert_equals(shadowRoot.querySelector('template').content.querySelector('some-element').__proto__.constructor.name, 'HTMLElement');
-}, 'innerHTML should not upgrade a custom element inside a template element');
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/custom-elements/scoped-registry/constructor-call.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/constructor-call.tentative.html
deleted file mode 100644
index 19a8e3f4d8a..00000000000
--- a/tests/wpt/tests/custom-elements/scoped-registry/constructor-call.tentative.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<meta name="author" title="Xiaocheng Hu" href="mailto:xiaochengh@chromium.org">
-<meta name="assert" content="Direct calls of custom element constructor use the global registry only">
-<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<body>
-<script>
-function attachShadowForTest(t, registry) {
-  const host = document.createElement('div');
-  const shadow = host.attachShadow({mode: 'open', registry});
-  document.body.appendChild(host);
-  t.add_cleanup(() => host.remove());
-  return shadow;
-}
-
-test(t => {
-  class TestElement extends HTMLElement {};
-  let registry = new CustomElementRegistry()
-  registry.define('test-element', TestElement);
-
-  let shadow = attachShadowForTest(t, registry);
-
-  assert_throws_js(TypeError, () => new TestElement);
-}, 'Calling custom element constructor directly without global registration should fail');
-
-test(t => {
-  class TestElement extends HTMLElement {};
-
-  window.customElements.define('global-test-element', TestElement);
-
-  let registry = new CustomElementRegistry()
-  registry.define('shadow-test-element', TestElement);
-  let shadow = attachShadowForTest(t, registry);
-
-  let element = new TestElement;
-  assert_equals(element.localName, 'global-test-element');
-}, 'Calling custom element constructor directly uses global registration only');
-
-</script>
-</body>
diff --git a/tests/wpt/tests/custom-elements/scoped-registry/constructor-reentry-with-different-definition.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/constructor-reentry-with-different-definition.tentative.html
deleted file mode 100644
index dc93e3c702d..00000000000
--- a/tests/wpt/tests/custom-elements/scoped-registry/constructor-reentry-with-different-definition.tentative.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<meta name="author" title="Xiaocheng Hu" href="mailto:xiaochengh@chromium.org">
-<meta name="assert" content="Custom element constructors can re-enter with different definitions">
-<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
-<link rel="help" href="https://github.com/WICG/webcomponents/issues/969">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<div id='test-container-1'></div>
-<div id='test-container-2'></div>
-
-<script>
-setup({allow_uncaught_exception : true});
-
-function createShadowForTest(t, registry) {
-  const host = document.createElement('div');
-  const shadow = host.attachShadow({mode: 'open', registry});
-  document.body.appendChild(host);
-  t.add_cleanup(() => host.remove());
-  return shadow;
-}
-
-test(t => {
-  let needsTest = true;
-  class ReentryBeforeSuper extends HTMLElement {
-    constructor() {
-      if (needsTest) {
-        needsTest = false;
-        document.getElementById('test-container-1').innerHTML =
-            '<test-element-1></test-element-1>';
-      }
-      super();
-    }
-  };
-  window.customElements.define('test-element-1', ReentryBeforeSuper);
-
-  let registry = new CustomElementRegistry;
-  registry.define('shadow-test-element-1', ReentryBeforeSuper);
-
-  let shadow = createShadowForTest(t, registry);
-  shadow.innerHTML = '<shadow-test-element-1></shadow-test-element-1>';
-
-  let shadowElement = shadow.firstChild;
-  assert_true(shadowElement instanceof ReentryBeforeSuper);
-  assert_equals(shadowElement.localName, 'shadow-test-element-1');
-
-  let mainDocElement = document.getElementById('test-container-1').firstChild;
-  assert_true(mainDocElement instanceof ReentryBeforeSuper);
-  assert_equals(mainDocElement.localName, 'test-element-1');
-}, 'Re-entry via upgrade before calling super()');
-
-test(t => {
-  let needsTest = true;
-  class ReentryAfterSuper extends HTMLElement {
-    constructor() {
-      super();
-      if (needsTest) {
-        needsTest = false;
-        document.getElementById('test-container-2').innerHTML =
-            '<test-element-2></test-element-2>';
-      }
-    }
-  };
-  window.customElements.define('test-element-2', ReentryAfterSuper);
-
-  let registry = new CustomElementRegistry;
-  registry.define('shadow-test-element-2', ReentryAfterSuper);
-
-  let shadow = createShadowForTest(t, registry);
-  shadow.innerHTML = '<shadow-test-element-2></shadow-test-element-2>';
-
-  let shadowElement = shadow.firstChild;
-  assert_true(shadowElement instanceof ReentryAfterSuper);
-  assert_equals(shadowElement.localName, 'shadow-test-element-2');
-
-  let mainDocElement = document.getElementById('test-container-2').firstChild;
-  assert_true(mainDocElement instanceof ReentryAfterSuper);
-  assert_equals(mainDocElement.localName, 'test-element-2');
-}, 'Re-entry via upgrade after calling super()');
-
-test(t => {
-  let needsTest = true;
-  let elementByNestedCall;
-  class ReentryByDirectCall extends HTMLElement {
-    constructor() {
-      if (needsTest) {
-        needsTest = false;
-        elementByNestedCall = new ReentryByDirectCall;
-      }
-      super();
-    }
-  }
-  window.customElements.define('test-element-3', ReentryByDirectCall);
-
-  let registry = new CustomElementRegistry;
-  registry.define('shadow-test-element-3', ReentryByDirectCall);
-
-  let shadow = createShadowForTest(t, registry);
-  shadow.innerHTML = '<shadow-test-element-3></shadow-test-element-3>';
-
-  let shadowElement = shadow.firstChild;
-  assert_true(shadowElement instanceof ReentryByDirectCall);
-  assert_equals(shadowElement.localName, 'shadow-test-element-3');
-
-  // Nested constructor call makes the following `super()` fail, and we should
-  // end up creating only one element.
-  assert_equals(elementByNestedCall, shadowElement);
-}, 'Re-entry via direct constructor call before calling super()');
-
-test(t => {
-  let needsTest = true;
-  let elementByNestedCall;
-  class ReentryByDirectCall extends HTMLElement {
-    constructor() {
-      super();
-      if (needsTest) {
-        needsTest = false;
-        elementByNestedCall = new ReentryByDirectCall;
-      }
-    }
-  }
-  window.customElements.define('test-element-4', ReentryByDirectCall);
-
-  let registry = new CustomElementRegistry;
-  registry.define('shadow-test-element-4', ReentryByDirectCall);
-
-  let shadow = createShadowForTest(t, registry);
-  shadow.innerHTML = '<shadow-test-element-4></shadow-test-element-4>';
-
-  let shadowElement = shadow.firstChild;
-  assert_true(shadowElement instanceof ReentryByDirectCall);
-  assert_equals(shadowElement.localName, 'shadow-test-element-4');
-
-  // Nested constructor call should be blocked.
-  assert_false(elementByNestedCall instanceof ReentryByDirectCall);
-}, 'Re-entry via direct constructor call after calling super()');
-</script>
diff --git a/tests/wpt/tests/custom-elements/scoped-registry/scoped-registry-define-upgrade-criteria.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/scoped-registry-define-upgrade-criteria.tentative.html
deleted file mode 100644
index d3d5d4fb969..00000000000
--- a/tests/wpt/tests/custom-elements/scoped-registry/scoped-registry-define-upgrade-criteria.tentative.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html>
-<title>Tests which nodes are upgraded after adding a scoped custom element definition</title>
-<meta name="author" title="Xiaocheng Hu" href="mailto:xiaochengh@chromium.org">
-<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
-<link rel="help" href="https://github.com/WICG/webcomponents/issues/923">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<body>
-
-<script>
-function attachShadowForTest(t, registry) {
-  const host = document.createElement('div');
-  const shadow = host.attachShadow({mode: 'open', registry});
-  document.body.appendChild(host);
-  t.add_cleanup(() => host.remove());
-  return shadow;
-}
-
-function createIFrameForTest(t) {
-  const iframe = document.createElement('iframe');
-  document.body.appendChild(iframe);
-  if (!iframe.contentDocument.body) {
-    iframe.contentDocument.body = iframe.contentDocument.createElement('body');
-  }
-  t.add_cleanup(() => iframe.remove());
-  return iframe;
-}
-
-let definitionCount = 0;
-function nextCustomElementName() {
-  return `test-element-${++definitionCount}`;
-}
-
-test(t => {
-  const name = nextCustomElementName();
-  document.body.appendChild(document.createElement(name));
-
-  const registry = new CustomElementRegistry;
-  const shadow = attachShadowForTest(t, registry);
-  shadow.appendChild(document.createElement(name));
-
-  class TestElement extends HTMLElement {};
-  customElements.define(name, TestElement);
-
-  assert_true(document.querySelector(name) instanceof TestElement);
-  assert_false(shadow.querySelector(name) instanceof TestElement);
-}, 'Adding definition to global registry should not affect shadow roots using scoped registry');
-
-test(t => {
-  const name = nextCustomElementName();
-
-  const shadow1 = attachShadowForTest(t, customElements);
-  shadow1.appendChild(document.createElement(name));
-
-  const shadow2 = attachShadowForTest(t);
-  shadow2.appendChild(document.createElement(name));
-
-  class TestElement extends HTMLElement {};
-  customElements.define(name, TestElement);
-
-  assert_true(shadow1.querySelector(name) instanceof TestElement);
-  assert_true(shadow2.querySelector(name) instanceof TestElement);
-}, 'Adding definition to global registry should affect shadow roots also using global registry');
-
-test(t => {
-  const name = nextCustomElementName();
-
-  const registry = new CustomElementRegistry;
-  const shadow1 = attachShadowForTest(t, registry);
-  shadow1.appendChild(document.createElement(name));
-
-  const shadow2 = attachShadowForTest(t, registry);
-  shadow2.appendChild(document.createElement(name));
-
-  class TestElement extends HTMLElement {};
-  registry.define(name, TestElement);
-
-  assert_true(shadow1.querySelector(name) instanceof TestElement);
-  assert_true(shadow2.querySelector(name) instanceof TestElement);
-}, 'Adding definition to scoped registry should affect all associated shadow roots');
-
-test(t => {
-  const name = nextCustomElementName();
-  document.body.appendChild(document.createElement(name));
-
-  const registry = new CustomElementRegistry;
-  const shadow = attachShadowForTest(t, registry);
-  shadow.appendChild(document.createElement(name));
-
-  class TestElement extends HTMLElement {};
-  registry.define(name, TestElement);
-
-  assert_false(document.querySelector(name) instanceof TestElement);
-  assert_true(shadow.querySelector(name) instanceof TestElement);
-}, 'Adding definition to scoped registry should not affect document tree scope');
-
-test(t => {
-  const name = nextCustomElementName();
-
-  const registry = new CustomElementRegistry;
-  const shadow1 = attachShadowForTest(t, registry);
-  shadow1.appendChild(document.createElement(name));
-
-  const shadow2 = attachShadowForTest(t, new CustomElementRegistry);
-  shadow2.appendChild(document.createElement(name));
-
-  const shadow3 = attachShadowForTest(t);
-  shadow3.appendChild(document.createElement(name));
-
-  class TestElement extends HTMLElement {};
-  registry.define(name, TestElement);
-
-  assert_true(shadow1.querySelector(name) instanceof TestElement);
-  assert_false(shadow2.querySelector(name) instanceof TestElement);
-  assert_false(shadow3.querySelector(name) instanceof TestElement);
-}, 'Adding definition to scoped registry should not affect shadow roots using other registries');
-
-test(t => {
-  const name = nextCustomElementName();
-  const node = document.body.appendChild(document.createElement(name));
-
-  const registry = new CustomElementRegistry;
-  const shadow = attachShadowForTest(t, registry);
-  shadow.appendChild(node);
-
-  class TestElement extends HTMLElement {};
-  customElements.define(name, TestElement);
-
-  assert_false(node instanceof TestElement);
-}, 'Adding definition to global registry should not upgrade nodes no longer using the registry');
-
-test(t => {
-  const name = nextCustomElementName();
-
-  const registry = new CustomElementRegistry;
-  const shadow1 = attachShadowForTest(t, registry);
-  const node = shadow1.appendChild(document.createElement(name));
-
-  const shadow2 = attachShadowForTest(t, new CustomElementRegistry);
-  shadow2.appendChild(node);
-
-  class TestElement extends HTMLElement {};
-  registry.define(name, TestElement);
-
-  assert_false(node instanceof TestElement);
-}, 'Adding definition to scoped registry should not upgrade nodes no longer using the registry');
-
-test(t => {
-  const name = nextCustomElementName();
-
-  const registry = new CustomElementRegistry;
-  const shadow1 = attachShadowForTest(t, registry);
-  const node1 = shadow1.appendChild(document.createElement(name));
-
-  const iframe = createIFrameForTest(t);
-  const host2 = iframe.contentDocument.createElement('div');
-  const shadow2 = host2.attachShadow({mode: 'open', registry});
-  const node2 = shadow2.appendChild(iframe.contentDocument.createElement(name));
-  iframe.contentDocument.body.appendChild(host2);
-
-  class TestElement extends HTMLElement {};
-  registry.define(name, TestElement);
-
-  assert_true(node1 instanceof TestElement);
-  assert_true(node2 instanceof TestElement);
-}, 'Adding definition to scoped registry affects associated shadow roots in all iframes');
-
-test(t => {
-  const name = nextCustomElementName();
-
-  const newWindow = window.open('about:blank');
-  t.add_cleanup(() => newWindow.close());
-
-  const host = newWindow.document.createElement('div');
-  const shadow = host.attachShadow({mode: 'open', registry: window.customElements});
-  const node = shadow.appendChild(newWindow.document.createElement(name));
-  newWindow.document.body.appendChild(host);
-
-  class TestElement extends HTMLElement {};
-  window.customElements.define(name, TestElement);
-
-  assert_true(node instanceof TestElement);
-}, 'Adding definition to scoped registry affects associated shadow roots in other frame trees');
-
-test(t => {
-  const name = nextCustomElementName();
-
-  const registry = new CustomElementRegistry;
-  const shadow = attachShadowForTest(t, registry);
-  const node = shadow.appendChild(document.createElement(name));
-  shadow.host.remove();
-
-  class TestElement extends HTMLElement {};
-  registry.define(name, TestElement);
-
-  assert_false(node instanceof TestElement);
-}, 'Adding definition to scoped registry should not upgrade disconnected elements');
-
-test(t => {
-  const name = nextCustomElementName();
-
-  const registry = new CustomElementRegistry;
-  const doc = document.implementation.createHTMLDocument();
-  const host = doc.createElement('div');
-  const shadow = host.attachShadow({mode: 'open', registry});
-  const node = shadow.appendChild(doc.createElement(name));
-  doc.body.appendChild(host);
-
-  class TestElement extends HTMLElement {};
-  registry.define(name, TestElement);
-
-  assert_false(node instanceof TestElement);
-}, 'Adding definition to scoped registry should not upgrade nodes in constructed documents');
-
-test(t => {
-  const name = nextCustomElementName();
-
-  const iframe = createIFrameForTest(t);
-  const registry = new CustomElementRegistry;
-  const host = iframe.contentDocument.createElement('div');
-  const shadow = host.attachShadow({mode: 'open', registry});
-  const node = shadow.appendChild(iframe.contentDocument.createElement(name));
-  iframe.contentDocument.body.appendChild(host);
-
-  iframe.remove();
-
-  class TestElement extends HTMLElement {};
-  registry.define(name, TestElement);
-
-  assert_false(node instanceof TestElement);
-}, 'Adding definition to scoped registry should not upgrade nodes in detached frames');
-
-promise_test(async t => {
-  const name = nextCustomElementName();
-
-  const newWindow = window.open('about:blank');
-  t.add_cleanup(() => newWindow.close());
-
-  const host = newWindow.document.createElement('div');
-  const shadow = host.attachShadow({mode: 'open', registry: window.customElements});
-  const node = shadow.appendChild(newWindow.document.createElement(name));
-  newWindow.document.body.appendChild(host);
-
-  newWindow.close();
-
-  // `window.close()` is async. Wait a while until it's fully closed
-  await new Promise(resolve => setTimeout(resolve, 500));
-
-  class TestElement extends HTMLElement {};
-  window.customElements.define(name, TestElement);
-
-  assert_false(node instanceof TestElement);
-}, 'Adding definition to scoped registry should not upgrade nodes in closed windows');
-
-</script>
-
-</body>
diff --git a/tests/wpt/tests/custom-elements/scoped-registry/scoped-registry-define-upgrade-order.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/scoped-registry-define-upgrade-order.tentative.html
deleted file mode 100644
index 4fb0f49f9f0..00000000000
--- a/tests/wpt/tests/custom-elements/scoped-registry/scoped-registry-define-upgrade-order.tentative.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE html>
-<title>Tests element upgrade order after adding a scoped custom element definition</title>
-<meta name="author" title="Xiaocheng Hu" href="mailto:xiaochengh@chromium.org">
-<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
-<link rel="help" href="https://github.com/WICG/webcomponents/issues/923">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<body>
-
-<script>
-let definitionCount = 0;
-function nextCustomElementDefinition() {
-  const log = [];
-  const name = `test-element-${++definitionCount}`;
-  const constructor = class extends HTMLElement {
-    constructor() {
-      super();
-      log.push(this.id);
-    }
-  };
-  return {name, constructor, log};
-}
-
-function attachShadowForTest(t, {parent, registry}) {
-  parent = parent || document.body;
-  const host = parent.ownerDocument.createElement('div');
-  const shadow = host.attachShadow({mode: 'open', registry});
-  parent.appendChild(host);
-  t.add_cleanup(() => host.remove());
-  return shadow;
-}
-
-function createIFrameForTest(t, {parent, nextSibling}) {
-  parent = parent || document.body;
-  const iframe = parent.ownerDocument.createElement('iframe');
-  parent.insertBefore(iframe, nextSibling);
-  if (!iframe.contentDocument.body) {
-    iframe.contentDocument.body = iframe.contentDocument.createElement('body');
-  }
-  t.add_cleanup(() => iframe.remove());
-  return iframe;
-}
-
-test(t => {
-  const {name, constructor, log} = nextCustomElementDefinition();
-
-  const registry = new CustomElementRegistry;
-  const shadow = attachShadowForTest(t, {registry});
-  shadow.innerHTML = `
-    <${name} id="a"></${name}>
-    <${name} id="b"></${name}>
-    <${name} id="c"></${name}>
-  `;
-
-  registry.define(name, constructor);
-  assert_array_equals(log, ['a', 'b', 'c']);
-}, 'Upgrade in tree order in the same tree scope');
-
-test(t => {
-  // document
-  // +- shadow1
-  // |  +- a
-  // |  +- shadow2
-  // |     +- b
-  // +- shadow3
-  //    +- c
-
-  const {name, constructor, log} = nextCustomElementDefinition();
-  const registry = new CustomElementRegistry;
-
-  const shadow1 = attachShadowForTest(t, {registry});
-  shadow1.innerHTML = `<${name} id="a"></${name}>`;
-
-  const shadow2 = attachShadowForTest(t, {registry, parent: shadow1});
-  shadow2.innerHTML = `<${name} id="b"></${name}>`;
-
-  const shadow3 = attachShadowForTest(t, {registry});
-  shadow3.innerHTML = `<${name} id="c"></${name}>`;
-
-  registry.define(name, constructor);
-  assert_array_equals(log, ['a', 'b', 'c']);
-}, 'Upgrade in shadow-including tree order across tree scopes');
-
-test(t => {
-  // document
-  // +- shadow1
-  // |  +- a
-  // |  +- shadow3
-  // |     +- c
-  // +- shadow2
-  //    +- b
-
-  const {name, constructor, log} = nextCustomElementDefinition();
-  const registry = new CustomElementRegistry;
-
-  const shadow1 = attachShadowForTest(t, {registry});
-  shadow1.innerHTML = `<${name} id="a"></${name}>`;
-
-  const shadow2 = attachShadowForTest(t, {registry});
-  shadow2.innerHTML = `<${name} id="b"></${name}>`;
-
-  const shadow3 = attachShadowForTest(t, {registry, parent: shadow1});
-  shadow3.innerHTML = `<${name} id="c"></${name}>`;
-
-  registry.define(name, constructor);
-  assert_array_equals(log, ['a', 'c', 'b']);
-}, 'Upgrade order does not depend on shadow root attach order');
-
-test(t => {
-  // document
-  // +- iframe1
-  // |   +- shadow1
-  // |   |  +- a
-  // |   +- iframe2
-  // |      +- shadow2
-  // |         +- b
-  // +- shadow3
-  //    +- c
-
-  const {name, constructor, log} = nextCustomElementDefinition();
-  const registry = new CustomElementRegistry;
-
-  const iframe1 = createIFrameForTest(t, {});
-  const shadow1 = attachShadowForTest(t, {registry, parent: iframe1.contentDocument.body});
-  shadow1.innerHTML = `<${name} id="a"></${name}>`;
-
-  const iframe2 = createIFrameForTest(t, {parent: iframe1.contentDocument.body});
-  const shadow2 = attachShadowForTest(t, {registry, parent: iframe2.contentDocument.body});
-  shadow2.innerHTML = `<${name} id="b"></${name}>`;
-
-  const shadow3 = attachShadowForTest(t, {registry});
-  shadow3.innerHTML = `<${name} id="c"></${name}>`;
-
-  registry.define(name, constructor);
-  assert_array_equals(log, ['a', 'b', 'c']);
-}, 'Upgrade in association order across documents, then tree order in each document');
-
-test(t => {
-  // document
-  // +- iframe2
-  // |  +- shadow2
-  // |     +- b
-  // +- iframe1
-  // |  +- shadow1
-  // |     +- a
-
-  const {name, constructor, log} = nextCustomElementDefinition();
-  const registry = new CustomElementRegistry;
-
-  const iframe1 = createIFrameForTest(t, {});
-  const shadow1 = attachShadowForTest(t, {registry, parent: iframe1.contentDocument.body});
-  shadow1.innerHTML = `<${name} id="a"></${name}>`;
-
-  const iframe2 = createIFrameForTest(t, {nextSibling: iframe1});
-  const shadow2 = attachShadowForTest(t, {registry, parent: iframe2.contentDocument.body});
-  shadow2.innerHTML = `<${name} id="b"></${name}>`;
-
-  registry.define(name, constructor);
-  assert_array_equals(log, ['a', 'b']);
-}, 'Upgrade order is not affected by DOM order between child frames');
-
-test(t => {
-  // document
-  // +- iframe1
-  // |  +- shadow2
-  // |     +- b
-  // +- iframe2
-  // |  +- shadow1
-  // |     +- a
-
-  const {name, constructor, log} = nextCustomElementDefinition();
-  const registry = new CustomElementRegistry;
-
-  const iframe1 = createIFrameForTest(t, {});
-  const iframe2 = createIFrameForTest(t, {});
-
-  const shadow1 = attachShadowForTest(t, {registry});
-  const host1 = shadow1.host;
-  shadow1.innerHTML = `<${name} id="a"></${name}>`;
-
-  const shadow2 = attachShadowForTest(t, {registry});
-  const host2 = shadow2.host;
-  shadow2.innerHTML = `<${name} id="b"></${name}>`;
-
-  iframe1.contentDocument.body.appendChild(host2);
-  iframe2.contentDocument.body.appendChild(host1);
-
-  registry.define(name, constructor);
-  assert_array_equals(log, ['b', 'a']);
-}, 'Upgrade order is affected by shadow tree adoption across documents');
-
-test(t => {
-  // Create a registry in one window, but associate it with another document first
-  // document
-  // +- iframe1
-  // |   +- shadow1
-  // |      +- a
-  // +- shadowr2
-  //    +- b
-
-  const {name, constructor, log} = nextCustomElementDefinition();
-  const registry = new CustomElementRegistry;
-
-  const iframe1 = createIFrameForTest(t, {});
-  const shadow1 = attachShadowForTest(t, {registry, parent: iframe1.contentDocument.body});
-  shadow1.innerHTML = `<${name} id="a"></${name}>`;
-
-  const shadow2 = attachShadowForTest(t, {registry});
-  shadow2.innerHTML = `<${name} id="b"></${name}>`;
-
-  registry.define(name, constructor);
-  assert_array_equals(log, ['a', 'b']);
-}, 'Elements in the "owner" window of a scoped registry are not always upgraded first');
-
-</script>
-</body>
diff --git a/tests/wpt/tests/custom-elements/scoped-registry/scoped-registry-registry-define-get-etc.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/scoped-registry-registry-define-get-etc.tentative.html
deleted file mode 100644
index c37f27ba023..00000000000
--- a/tests/wpt/tests/custom-elements/scoped-registry/scoped-registry-registry-define-get-etc.tentative.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-<title>Tests scoped custom element registry methods which get custom element definitions or metadata</title>
-<meta name="author" title="Benny Powers" href="mailto:bennyp@redhat.com">
-<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
-<link rel="help" href="https://github.com/WICG/webcomponents/issues/923">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<body>
-
-<script>
-let definitionCount = 0;
-function nextCustomElementDefinition() {
-  const log = [];
-  const name = `test-element-${++definitionCount}`;
-  const constructor = class extends HTMLElement {
-    constructor() {
-      super();
-      log.push(this.id);
-    }
-  };
-  return {name, constructor, log};
-}
-
-test(t => {
-  const {name, constructor, log} = nextCustomElementDefinition();
-  const registry = new CustomElementRegistry;
-  registry.define(name, constructor);
-  assert_equals(registry.get(name), constructor);
-  assert_equals(registry.getName(constructor), name);
-}, 'Custom element registries with a registered custom element return the class in their get method, and the name in their getName method');
-
-test(t => {
-  const {name, constructor, log} = nextCustomElementDefinition();
-  const registry = new CustomElementRegistry;
-  customElements.define(name, constructor)
-  assert_equals(customElements.get(name), constructor);
-  assert_equals(customElements.getName(constructor), name);
-  assert_equals(registry.get(name), undefined);
-  assert_equals(registry.getName(constructor), null);
-  const scopedName = name + '-scoped';
-  registry.define(scopedName, class extends constructor {});
-  assert_not_equals(registry.get(scopedName), constructor)
-}, 'Scoped Custom element registries do not inherit names or classes from the global registry');
-
-test(t => {
-  const {name, constructor, log} = nextCustomElementDefinition();
-  const registry = new CustomElementRegistry;
-  customElements.define(name, constructor)
-  registry.define(name, constructor);
-  assert_equals(customElements.get(name), constructor);
-  assert_equals(customElements.getName(constructor), name);
-  assert_equals(registry.get(name), constructor);
-  assert_equals(registry.getName(constructor), name);
-}, 'Scoped Custom element registries return the same constructor when it is defined in both');
-
-test(t => {
-  const {name, constructor, log} = nextCustomElementDefinition();
-  const {name:name2, constructor: constructor2} = nextCustomElementDefinition();
-  const registry = new CustomElementRegistry;
-  customElements.define(name, constructor)
-  registry.define(name, constructor2);
-  assert_equals(customElements.get(name), constructor);
-  assert_equals(customElements.get(name2), undefined);
-  assert_equals(customElements.getName(constructor), name);
-  assert_equals(customElements.getName(constructor2), null);
-  assert_equals(registry.get(name), constructor2);
-  assert_equals(registry.get(name2), undefined);
-  assert_equals(registry.getName(constructor), null);
-  assert_equals(registry.getName(constructor2), name);
-}, 'Scoped Custom element registries allow registering name that exists in global registry');
-
-promise_test(async t => {
-  const {name, constructor, log} = nextCustomElementDefinition();
-  const registry = new CustomElementRegistry;
-  registry.define(name, constructor);
-  assert_equals(await registry.whenDefined(name), constructor);
-}, 'Custom element registries with a registered custom element resolve the class in their whenDefined method');
-
-promise_test(async t => {
-  const {name, constructor, log} = nextCustomElementDefinition();
-  const registry = new CustomElementRegistry;
-  customElements.define(name, constructor)
-  registry.define(name, constructor);
-  assert_equals(await customElements.whenDefined(name), constructor);
-  assert_equals(await registry.whenDefined(name), constructor);
-}, 'Scoped Custom element registries resolve the same constructor from whenDefined when it is defined in both');
-
-promise_test(async t => {
-  const {name, constructor, log} = nextCustomElementDefinition();
-  const registry = new CustomElementRegistry;
-  customElements.define(name, constructor)
-  const scopedName = name + '-scoped';
-  registry.define(scopedName , class extends constructor {});
-  const sym = Symbol();
-  const testPromise = await Promise.race([
-    registry.whenDefined(name),
-    new Promise(r => requestAnimationFrame(() => r(sym))),
-  ]);
-  assert_equals(testPromise, sym);
-}, 'Scoped Custom element registry getters do not resolve globally registered classes from whenDefined');
-
-</script>
-</body>
diff --git a/tests/wpt/tests/device-bound-session-credentials/fetch-no-credentials.https.html b/tests/wpt/tests/device-bound-session-credentials/fetch-no-credentials.https.html
new file mode 100644
index 00000000000..4cac685727a
--- /dev/null
+++ b/tests/wpt/tests/device-bound-session-credentials/fetch-no-credentials.https.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>DBSC does not refresh cross-site fetch without credentials</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="helper.js" type="module"></script>
+
+<script type="module">
+  import { documentHasCookie, expireCookie, waitForCookie, addCookieAndSessionCleanup, setupShardedServerState, configureServer } from "./helper.js";
+
+  promise_test(async t => {
+    const testId = await setupShardedServerState();
+    const expectedCookieAndValue = "auth_cookie=abcdef0123";
+    const expectedCookieAndAttributes = `${expectedCookieAndValue};Domain=${location.hostname};Path=/device-bound-session-credentials`;
+    addCookieAndSessionCleanup(t);
+
+    // Prompt starting a session, and wait until registration completes.
+    const loginResponse = await fetch('login.py');
+    assert_equals(loginResponse.status, 200);
+    await waitForCookie(expectedCookieAndValue, /*expectCookie=*/true);
+
+    // Expire the cookies
+    expireCookie(expectedCookieAndAttributes);
+
+    // Setup for receiving messages
+    let messageCallbacks = [];
+    function messageListener(event) {
+      if (messageCallbacks.length > 0) {
+          messageCallbacks[0](event.data);
+          messageCallbacks.shift();
+      }
+    };
+    window.addEventListener("message", messageListener);
+    t.add_cleanup(() => {
+      window.removeEventListener("message", messageListener);
+    });
+
+    function getMessage() {
+        return new Promise((resolve, reject) => {
+            messageCallbacks.push(resolve);
+        });
+    }
+
+    // Create a cross-site iframe that's going to try to fetch without credentials
+    let iframe = document.createElement('iframe');
+    iframe.src = `${get_host_info().HTTPS_NOTSAMESITE_ORIGIN}/device-bound-session-credentials/fetch-verify-authenticated.https.html`;
+    document.body.appendChild(iframe);
+
+    let statusCode = await getMessage();
+    assert_equals(statusCode, 401);
+
+    // We should not have refreshed.
+    assert_false(documentHasCookie(expectedCookieAndValue));
+  }, "A cross-site fetch without credentials should not refresh");
+</script>
diff --git a/tests/wpt/tests/device-bound-session-credentials/fetch-verify-authenticated.https.html b/tests/wpt/tests/device-bound-session-credentials/fetch-verify-authenticated.https.html
new file mode 100644
index 00000000000..d9e3df9f5c6
--- /dev/null
+++ b/tests/wpt/tests/device-bound-session-credentials/fetch-verify-authenticated.https.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<script src="/common/get-host-info.sub.js"></script>
+<body>
+  <script>
+    async function onload() {
+      let base_origin = get_host_info().ORIGIN;
+      let response = await fetch(`${base_origin}/device-bound-session-credentials/verify_authenticated.py`, {credentials: "omit"});
+      window.parent.postMessage(response.status, base_origin);
+    }
+    onload();
+  </script>
+</body>
diff --git a/tests/wpt/tests/digital-credentials/allow-attribute-with-create.https.html b/tests/wpt/tests/digital-credentials/allow-attribute-with-create.https.html
new file mode 100644
index 00000000000..4b1e96fec4c
--- /dev/null
+++ b/tests/wpt/tests/digital-credentials/allow-attribute-with-create.https.html
@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>
+            Test allow attribute with "digital-credentials-create" and
+            CredentialsContainer's .create() method
+        </title>
+        <script src="/common/get-host-info.sub.js"></script>
+        <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>
+            const hostInfo = get_host_info();
+            const iframeDetails = [
+                {
+                    policy: null,
+                    crossOrigin: false,
+                    expectIsAllowed: true,
+                },
+                {
+                    policy: null,
+                    crossOrigin: true,
+                    expectIsAllowed: false,
+                },
+                {
+                    policy: "digital-credentials-create",
+                    crossOrigin: false,
+                    expectIsAllowed: true,
+                },
+                {
+                    policy: "digital-credentials-create",
+                    crossOrigin: true,
+                    expectIsAllowed: true,
+                },
+                {
+                    policy: "digital-credentials-create *",
+                    crossOrigin: false,
+                    expectIsAllowed: true,
+                },
+                {
+                    policy: "digital-credentials-create *",
+                    crossOrigin: true,
+                    expectIsAllowed: true,
+                },
+                {
+                    policy: "digital-credentials-create 'none'",
+                    crossOrigin: false,
+                    expectIsAllowed: false,
+                },
+                {
+                    policy: "digital-credentials-create 'none'",
+                    crossOrigin: true,
+                    expectIsAllowed: false,
+                },
+                {
+                    policy: "digital-credentials-create 'self'",
+                    crossOrigin: false,
+                    expectIsAllowed: true,
+                },
+                {
+                    policy: "digital-credentials-create 'self'",
+                    crossOrigin: true,
+                    expectIsAllowed: false,
+                },
+                {
+                    policy: `digital-credentials-create ${hostInfo.HTTPS_REMOTE_ORIGIN}`,
+                    crossOrigin: false,
+                    expectIsAllowed: false,
+                },
+                {
+                    policy: `digital-credentials-create ${hostInfo.HTTPS_REMOTE_ORIGIN}`,
+                    crossOrigin: true,
+                    expectIsAllowed: true,
+                },
+            ];
+
+            async function loadIframe({ policy, crossOrigin, expectIsAllowed }) {
+                const iframe = document.createElement("iframe");
+                if (policy !== null) {
+                    iframe.allow = policy;
+                }
+
+                await new Promise((resolve) => {
+                    iframe.onload = resolve;
+                    iframe.src = new URL(
+                        "/digital-credentials/support/iframe.html",
+                        crossOrigin
+                            ? hostInfo.HTTPS_REMOTE_ORIGIN
+                            : location.origin
+                    ).href;
+                    iframe.dataset.expectIsAllowed = expectIsAllowed;
+                    document.body.appendChild(iframe);
+                });
+                iframe.focus();
+                return iframe;
+            }
+
+            function runTests() {
+                for (const details of iframeDetails) {
+                    promise_test(async (test) => {
+                        const iframe = await loadIframe(details);
+                        const { expectIsAllowed } = details;
+                        const action = "create";
+                        const options = {
+                            digital: {
+                                // Results in TypeError when allowed, NotAllowedError when disallowed
+                                requests: [],
+                            },
+                            mediation: "required",
+                        };
+                        const { data } = await new Promise((resolve) => {
+                            window.addEventListener("message", resolve, {
+                                once: true,
+                            });
+                            iframe.contentWindow.postMessage(
+                                { action, options, needsActivation: true },
+                                "*"
+                            );
+                        });
+                        const { name, message } = data;
+                        const fullMessage = `${iframe.outerHTML} - ${message}`;
+                        if (expectIsAllowed) {
+                            assert_true(
+                                name == "TypeError" || name == "NotAllowedError",
+                                fullMessage
+                            );
+                        } else {
+                            assert_equals(name, "NotAllowedError", fullMessage);
+                        }
+                        iframe.remove();
+                    }, `With Create: Policy to use: ${details.policy}, is cross-origin: ${details.crossOrigin}, is allowed by policy: ${details.expectIsAllowed}`);
+                }
+            }
+        </script>
+    </head>
+    <body onload="runTests()"></body>
+</html>
diff --git a/tests/wpt/tests/digital-credentials/allow-attribute-with-get.https.html b/tests/wpt/tests/digital-credentials/allow-attribute-with-get.https.html
new file mode 100644
index 00000000000..15601d891f2
--- /dev/null
+++ b/tests/wpt/tests/digital-credentials/allow-attribute-with-get.https.html
@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>
+            Test allow attribute with "digital-credentials-get" and
+            CredentialsContainer's .get() method
+        </title>
+        <script src="/common/get-host-info.sub.js"></script>
+        <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>
+            const hostInfo = get_host_info();
+            const iframeDetails = [
+                {
+                    policy: null,
+                    crossOrigin: false,
+                    expectIsAllowed: true,
+                },
+                {
+                    policy: null,
+                    crossOrigin: true,
+                    expectIsAllowed: false,
+                },
+                {
+                    policy: "digital-credentials-get",
+                    crossOrigin: false,
+                    expectIsAllowed: true,
+                },
+                {
+                    policy: "digital-credentials-get",
+                    crossOrigin: true,
+                    expectIsAllowed: true,
+                },
+                {
+                    policy: "digital-credentials-get *",
+                    crossOrigin: false,
+                    expectIsAllowed: true,
+                },
+                {
+                    policy: "digital-credentials-get *",
+                    crossOrigin: true,
+                    expectIsAllowed: true,
+                },
+                {
+                    policy: "digital-credentials-get 'none'",
+                    crossOrigin: false,
+                    expectIsAllowed: false,
+                },
+                {
+                    policy: "digital-credentials-get 'none'",
+                    crossOrigin: true,
+                    expectIsAllowed: false,
+                },
+                {
+                    policy: "digital-credentials-get 'self'",
+                    crossOrigin: false,
+                    expectIsAllowed: true,
+                },
+                {
+                    policy: "digital-credentials-get 'self'",
+                    crossOrigin: true,
+                    expectIsAllowed: false,
+                },
+                {
+                    policy: `digital-credentials-get ${hostInfo.HTTPS_REMOTE_ORIGIN}`,
+                    crossOrigin: false,
+                    expectIsAllowed: false,
+                },
+                {
+                    policy: `digital-credentials-get ${hostInfo.HTTPS_REMOTE_ORIGIN}`,
+                    crossOrigin: true,
+                    expectIsAllowed: true,
+                },
+            ];
+
+            async function loadIframe({ policy, crossOrigin, expectIsAllowed }) {
+                const iframe = document.createElement("iframe");
+                if (policy !== null) {
+                    iframe.allow = policy;
+                }
+
+                await new Promise((resolve) => {
+                    iframe.onload = resolve;
+                    iframe.src = new URL(
+                        "/digital-credentials/support/iframe.html",
+                        crossOrigin
+                            ? hostInfo.HTTPS_REMOTE_ORIGIN
+                            : location.origin
+                    ).href;
+                    iframe.dataset.expectIsAllowed = expectIsAllowed;
+                    document.body.appendChild(iframe);
+                });
+                iframe.focus();
+                return iframe;
+            }
+
+            function runTests() {
+                for (const details of iframeDetails) {
+                    promise_test(async (test) => {
+                        const iframe = await loadIframe(details);
+                        const { expectIsAllowed } = details;
+                        const action = "get";
+                        const options = {
+                            digital: {
+                                // Results in TypeError when allowed, NotAllowedError when disallowed
+                                requests: [],
+                            },
+                            mediation: "required",
+                        };
+                        const { data } = await new Promise((resolve) => {
+                            window.addEventListener("message", resolve, {
+                                once: true,
+                            });
+                            iframe.contentWindow.postMessage(
+                                { action, options, needsActivation: true },
+                                "*"
+                            );
+                        });
+                        const { name, message } = data;
+                        const fullMessage = `${iframe.outerHTML} - ${message}`;
+                        if (expectIsAllowed) {
+                            assert_true(
+                                name == "TypeError" || name == "NotAllowedError",
+                                fullMessage
+                            );
+                        } else {
+                            assert_equals(name, "NotAllowedError", fullMessage);
+                        }
+                        iframe.remove();
+                    }, `With Get: Policy to use: ${details.policy}, is cross-origin: ${details.crossOrigin}, is allowed by policy: ${details.expectIsAllowed}`);
+                }
+            }
+        </script>
+    </head>
+    <body onload="runTests()"></body>
+</html>
diff --git a/tests/wpt/tests/digital-credentials/allow-attribute.https.html b/tests/wpt/tests/digital-credentials/allow-attribute.https.html
deleted file mode 100644
index 667b84bc704..00000000000
--- a/tests/wpt/tests/digital-credentials/allow-attribute.https.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>
-            Test allow attribute with "digital-credentials-get" and
-            CredentialsContainer's .get() method
-        </title>
-        <script src="/common/get-host-info.sub.js"></script>
-        <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>
-            const hostInfo = get_host_info();
-            const iframeDetails = [
-                {
-                    policy: null,
-                    crossOrigin: false,
-                    expectIsAllowed: true,
-                },
-                {
-                    policy: null,
-                    crossOrigin: true,
-                    expectIsAllowed: false,
-                },
-                {
-                    policy: "digital-credentials-get",
-                    crossOrigin: false,
-                    expectIsAllowed: true,
-                },
-                {
-                    policy: "digital-credentials-get",
-                    crossOrigin: true,
-                    expectIsAllowed: true,
-                },
-                {
-                    policy: "digital-credentials-get *",
-                    crossOrigin: false,
-                    expectIsAllowed: true,
-                },
-                {
-                    policy: "digital-credentials-get *",
-                    crossOrigin: true,
-                    expectIsAllowed: true,
-                },
-                {
-                    policy: "digital-credentials-get 'none'",
-                    crossOrigin: false,
-                    expectIsAllowed: false,
-                },
-                {
-                    policy: "digital-credentials-get 'none'",
-                    crossOrigin: true,
-                    expectIsAllowed: false,
-                },
-                {
-                    policy: "digital-credentials-get 'self'",
-                    crossOrigin: false,
-                    expectIsAllowed: true,
-                },
-                {
-                    policy: "digital-credentials-get 'self'",
-                    crossOrigin: true,
-                    expectIsAllowed: false,
-                },
-                {
-                    policy: `digital-credentials-get ${hostInfo.HTTPS_REMOTE_ORIGIN}`,
-                    crossOrigin: false,
-                    expectIsAllowed: false,
-                },
-                {
-                    policy: `digital-credentials-get ${hostInfo.HTTPS_REMOTE_ORIGIN}`,
-                    crossOrigin: true,
-                    expectIsAllowed: true,
-                },
-            ];
-
-            async function loadIframe({ policy, crossOrigin, expectIsAllowed }) {
-                const iframe = document.createElement("iframe");
-                if (policy !== null) {
-                    iframe.allow = policy;
-                }
-
-                await new Promise((resolve) => {
-                    iframe.onload = resolve;
-                    iframe.src = new URL(
-                        "/digital-credentials/support/iframe.html",
-                        crossOrigin
-                            ? hostInfo.HTTPS_REMOTE_ORIGIN
-                            : location.origin
-                    ).href;
-                    iframe.dataset.expectIsAllowed = expectIsAllowed;
-                    document.body.appendChild(iframe);
-                });
-                iframe.focus();
-                return iframe;
-            }
-
-            function runTests() {
-                for (const details of iframeDetails) {
-                    promise_test(async (test) => {
-                        const iframe = await loadIframe(details);
-                        const { expectIsAllowed } = details;
-                        const action = "get";
-                        const options = {
-                            digital: {
-                                // Results in TypeError when allowed, NotAllowedError when disallowed
-                                requests: [],
-                            },
-                            mediation: "required",
-                        };
-                        const { data } = await new Promise((resolve) => {
-                            window.addEventListener("message", resolve, {
-                                once: true,
-                            });
-                            iframe.contentWindow.postMessage(
-                                { action, options, needsActivation: true },
-                                "*"
-                            );
-                        });
-                        const { name, message } = data;
-                        const fullMessage = `${iframe.outerHTML} - ${message}`;
-                        if (expectIsAllowed) {
-                            assert_true(
-                                name == "TypeError" || name == "NotAllowedError",
-                                fullMessage
-                            );
-                        } else {
-                            assert_equals(name, "NotAllowedError", fullMessage);
-                        }
-                        iframe.remove();
-                    }, `Policy to use: ${details.policy}, is cross-origin: ${details.crossOrigin}, is allowed by policy: ${details.expectIsAllowed}`);
-                }
-            }
-        </script>
-    </head>
-    <body onload="runTests()"></body>
-</html>
diff --git a/tests/wpt/tests/digital-credentials/create.disabled-by-permissions-policy.https.sub.html b/tests/wpt/tests/digital-credentials/create.disabled-by-permissions-policy.https.sub.html
new file mode 100644
index 00000000000..52db2373f09
--- /dev/null
+++ b/tests/wpt/tests/digital-credentials/create.disabled-by-permissions-policy.https.sub.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<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="/permissions-policy/resources/permissions-policy.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<body></body>
+<script type="module">
+    import { makeCreateOptions } from "/digital-credentials/support/helper.js";
+    const { HTTPS_REMOTE_ORIGIN } = get_host_info();
+    const same_origin_src =
+        "/permissions-policy/resources/digital-credentials-create.html";
+    const cross_origin_src = new URL(same_origin_src, HTTPS_REMOTE_ORIGIN).href;
+
+    promise_test(async (test) => {
+        await test_driver.bless("user activation");
+        await promise_rejects_dom(
+            test,
+            "NotAllowedError",
+            navigator.credentials.create(makeCreateOptions([]))
+        );
+    }, "Permissions-Policy header digital-credentials-create=() disallows the top-level document.");
+
+    promise_test(async (test) => {
+        await test_feature_availability({
+            feature_description: "Digital Credential API",
+            test,
+            src: same_origin_src,
+            expect_feature_available: expect_feature_unavailable_default,
+            is_promise_test: true,
+            needs_focus: true,
+        });
+    }, "Permissions-Policy header digital-credentials-create=() disallows same-origin iframes.");
+
+    promise_test(async (test) => {
+        await test_feature_availability({
+            feature_description: "Digital Credential API",
+            test,
+            src: cross_origin_src,
+            expect_feature_available: expect_feature_unavailable_default,
+            feature_name: "digital-credentials-create",
+            is_promise_test: true,
+            needs_focus: true,
+        });
+    }, "Permissions-Policy header digital-credentials-create=() cannot be overridden using the allow attribute.");
+
+</script>
diff --git a/tests/wpt/tests/digital-credentials/create.disabled-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/digital-credentials/create.disabled-by-permissions-policy.https.sub.html.headers
new file mode 100644
index 00000000000..9847d173eb6
--- /dev/null
+++ b/tests/wpt/tests/digital-credentials/create.disabled-by-permissions-policy.https.sub.html.headers
@@ -0,0 +1 @@
+Permissions-Policy: digital-credentials-create=()
diff --git a/tests/wpt/tests/digital-credentials/create.tentative.https.html b/tests/wpt/tests/digital-credentials/create.tentative.https.html
index 299a240ced1..3e17d5b0853 100644
--- a/tests/wpt/tests/digital-credentials/create.tentative.https.html
+++ b/tests/wpt/tests/digital-credentials/create.tentative.https.html
@@ -13,7 +13,7 @@
 </body>
 
 <script type="module">
-  import { sendMessage, loadIframe } from "./support/helper.js";
+  import { makeCreateOptions, sendMessage, loadIframe } from "./support/helper.js";
 
   const iframeSameOrigin = document.querySelector("iframe#same-origin");
   const iframeCrossOrigin = document.querySelector("iframe#cross-origin");
@@ -31,83 +31,170 @@
   });
 
   promise_test(async (t) => {
-    const result = await navigator.credentials.create();
-    assert_equals(result, null);
-  }, "navigator.credentials.create() frame just returns null.");
+    iframeSameOrigin.focus();
+    for (const global of [window, iframeSameOrigin.contentWindow]) {
+      await promise_rejects_dom(
+        t,
+        "NotSupportedError",
+        global.DOMException,
+        global.navigator.credentials.create()
+      );
+
+      await promise_rejects_dom(
+        t,
+        "NotSupportedError",
+        global.DOMException,
+        global.navigator.credentials.create({})
+      );
+
+      await promise_rejects_dom(
+        t,
+        "NotSupportedError",
+        global.DOMException,
+        global.navigator.credentials.create({ x: "y" })
+      );
+
+      await promise_rejects_dom(
+        t,
+        "NotSupportedError",
+        global.DOMException,
+        global.navigator.credentials.create({ x: "y", y: "z" })
+      );
+
+      await promise_rejects_dom(
+        t,
+        "NotSupportedError",
+        global.DOMException,
+        global.navigator.credentials.create({ mediation: "required" })
+      );
+
+      const abortController = new AbortController();
+      const { signal } = abortController;
+
+      await promise_rejects_dom(
+        t,
+        "NotSupportedError",
+        global.DOMException,
+        global.navigator.credentials.create({ signal })
+      );
+
+      await promise_rejects_dom(
+        t,
+        "NotSupportedError",
+        global.DOMException,
+        global.navigator.credentials.create({ signal, mediation: "required" })
+      );
+    }
+  }, "Calling navigator.credentials.create() without a digital member same origin.");
 
   promise_test(async (t) => {
+    for (const request of [undefined, []]) {
+      const options = makeCreateOptions(request);
+      await test_driver.bless("user activation");
+      await promise_rejects_js(t, TypeError, navigator.credentials.create(options));
+    }
+  }, "navigator.credentials.create() API rejects if there are no credential request.");
+
+  promise_test(async (t) => {
+    iframeSameOrigin.focus();
     const { contentWindow: iframeWindow } = iframeSameOrigin;
-    const result = await iframeWindow.navigator.credentials.create();
-    assert_equals(result, null);
-  }, "navigator.credentials.create() same-origin iframe just returns null.");
+    for (const request of [undefined, []]) {
+      const options = makeCreateOptions(request);
+      await test_driver.bless("user activation");
+      await promise_rejects_js(
+        t,
+        iframeWindow.TypeError,
+        iframeWindow.navigator.credentials.create(options)
+      );
+    }
+  }, "navigator.credentials.create() API rejects if there are no credential request for same-origin iframe.");
 
   promise_test(async (t) => {
-    const result = await sendMessage(iframeCrossOrigin, {
-      action: "create",
-    });
-    assert_equals(result, null);
-  }, "navigator.credentials.create() cross-origin iframe results in null.");
-
-  promise_test(async () => {
-    for (const mediation of mediations) {
-      const result = await navigator.credentials.create({ mediation });
-      assert_equals(result, null);
-    }
-  }, "navigator.credentials.create() ignores mediations.");
-
-  promise_test(async () => {
-    for (const mediation of mediations) {
-      const result = await navigator.credentials.create({ mediation });
-      assert_equals(result, null);
-    }
-  }, "navigator.credentials.create() ignores mediations in same-origin iframe.");
-
-  promise_test(async () => {
-    for (const mediation of mediations) {
+    iframeCrossOrigin.focus();
+    for (const request of [undefined, []]) {
+      const options = makeCreateOptions(request);
       const result = await sendMessage(iframeCrossOrigin, {
         action: "create",
-        request: { mediation },
+        options,
       });
-      assert_equals(result, null);
+      assert_equals(result.constructor, "TypeError");
     }
-  }, "navigator.credentials.create() ignores mediations in cross-origin iframe.");
+  }, "navigator.credentials.create() API rejects if there are no credential request in cross-origin iframe.");
 
   promise_test(async (t) => {
     const abortController = new AbortController();
     const { signal } = abortController;
     abortController.abort();
-    await promise_rejects_dom(
-      t,
-      "AbortError",
-      navigator.credentials.create({
-        signal,
-      })
-    );
-  }, "navigator.credentials.create() rejects if called with an aborted controller.");
+    for (const options of [{ signal }, { signal, ...makeCreateOptions([]) }]) {
+      await promise_rejects_dom(
+        t,
+        "AbortError",
+        navigator.credentials.create(options)
+      );
+    }
+  }, "navigator.credentials.create() promise is rejected if called with an aborted controller.");
 
   promise_test(async (t) => {
+    iframeSameOrigin.focus();
     const { contentWindow: iframeWindow } = iframeSameOrigin;
     const abortController = new iframeWindow.AbortController();
     const { signal } = abortController;
     abortController.abort();
-    await promise_rejects_dom(
-      t,
-      "AbortError",
-      iframeWindow.DOMException,
-      iframeWindow.navigator.credentials.create({
-        signal,
-      })
-    );
-  }, "navigator.credentials.create() rejects if called with an aborted controller in same-origin iframe.");
+    for (const options of [{ signal }, { signal, ...makeCreateOptions([]) }]) {
+      await test_driver.bless("user activation");
+      await promise_rejects_dom(
+        t,
+        "AbortError",
+        iframeWindow.DOMException,
+        iframeWindow.navigator.credentials.create(options)
+      );
+      assert_true(
+        navigator.userActivation.isActive,
+        "User activation is still active."
+      );
+    }
+  }, "navigator.credentials.create() promise is rejected if called with an aborted controller in same-origin iframe.");
 
   promise_test(async (t) => {
+    iframeCrossOrigin.focus();
+    for (const options of [undefined, {}, makeCreateOptions([])]) {
+      const result = await sendMessage(iframeCrossOrigin, {
+        abort: "before",
+        action: "create",
+        options,
+      });
+      assert_equals(result.constructor, "DOMException");
+      assert_equals(result.name, "AbortError");
+    }
+  }, "navigator.credentials.create() promise is rejected if called with an aborted signal in cross-origin iframe.");
+
+  promise_test(async (t) => {
+    const abortController = new AbortController();
+    const { signal } = abortController;
+    const options = makeCreateOptions("openid4vci");
+    options.signal = signal;
+    await test_driver.bless("user activation");
+    const promise = promise_rejects_dom(
+      t,
+      "AbortError",
+      DOMException,
+      navigator.credentials.create(options)
+    );
+    abortController.abort();
+    await promise;
+  }, "navigator.credentials.create() promise is rejected if abort controller is aborted after call to create().");
+
+  promise_test(async (t) => {
+    iframeCrossOrigin.focus();
     const result = await sendMessage(iframeCrossOrigin, {
+      abort: "after",
       action: "create",
-      abort: "before",
+      needsActivation: true,
+      options: makeCreateOptions("openid4vci"),
     });
     assert_equals(result.constructor, "DOMException");
     assert_equals(result.name, "AbortError");
-  }, "navigator.credentials.create() rejects if called with an aborted controller in cross-origin iframe.");
+  }, "navigator.credentials.create() promise is rejected if abort controller is aborted after call to create() in cross-origin iframe.");
 
   promise_test(async (t) => {
     const abortController = new AbortController();
@@ -121,4 +208,13 @@
       await promise_rejects_dom(t, "AbortError", requestPromise);
     }
   }, "Adding mediations together with abort signal respects the abort signal.");
+
+  promise_test(async (t) => {
+    /** @type sequence<CredentialMediationRequirement> */
+    const disallowedMediations = [ "conditional", "optional", "silent"];
+    for (const mediation of disallowedMediations) {
+      const options = makeCreateOptions("default", mediation);
+      await promise_rejects_js(t, TypeError, navigator.credentials.create(options));
+    }
+  }, "Mediation is required to create a DigitalCredential.");
 </script>
diff --git a/tests/wpt/tests/digital-credentials/dc-types.ts b/tests/wpt/tests/digital-credentials/dc-types.ts
index 30284e7fad6..83168f8a343 100644
--- a/tests/wpt/tests/digital-credentials/dc-types.ts
+++ b/tests/wpt/tests/digital-credentials/dc-types.ts
@@ -1,4 +1,6 @@
-export type Protocol = "default" | "openid4vp";
+export type GetProtocol = "default" | "openid4vp";
+export type CreateProtocol = "default" | "openid4vci";
+
 export type CredentialMediationRequirement =
   | "conditional"
   | "optional"
@@ -8,7 +10,7 @@ export type CredentialMediationRequirement =
 /**
  * @see https://wicg.github.io/digital-credentials/#dom-digitalcredentialrequest
  */
-export interface DigitalCredentialRequest {
+export interface DigitalCredentialGetRequest {
   protocol: string;
   data: object;
 }
@@ -20,7 +22,7 @@ export interface DigitalCredentialRequestOptions {
   /**
    * The list of credential requests.
    */
-  requests: DigitalCredentialRequest[] | any;
+  requests: DigitalCredentialGetRequest[] | any;
 }
 
 /**
@@ -31,6 +33,23 @@ export interface CredentialRequestOptions {
   mediation: CredentialMediationRequirement;
 }
 
+export interface DigitalCredentialCreateRequest {
+  protocol: string;
+  data: object;
+}
+
+export interface DigitalCredentialCreationOptions {
+  /**
+   * The list of credential requests.
+   */
+  requests: DigitalCredentialCreateRequest[] | any;
+}
+
+export interface CredentialCreationOptions {
+  digital: DigitalCredentialCreationOptions;
+  mediation: CredentialMediationRequirement;
+}
+
 /**
  * The actions that can be performed on the API via the iframe.
  */
diff --git a/tests/wpt/tests/digital-credentials/default-permissions-policy.https.sub.html b/tests/wpt/tests/digital-credentials/default-permissions-policy.https.sub.html
index 742a94ec4eb..8041e25d33b 100644
--- a/tests/wpt/tests/digital-credentials/default-permissions-policy.https.sub.html
+++ b/tests/wpt/tests/digital-credentials/default-permissions-policy.https.sub.html
@@ -8,11 +8,15 @@
 <script src="/common/get-host-info.sub.js"></script>
 <body></body>
 <script type="module">
-    import { makeGetOptions } from "./support/helper.js";
+    import { makeGetOptions, makeCreateOptions } from "./support/helper.js";
     const { HTTPS_REMOTE_ORIGIN } = get_host_info();
-    const same_origin_src =
+    const get_same_origin_src =
         "/permissions-policy/resources/digital-credentials-get.html";
-    const cross_origin_src = new URL(same_origin_src, HTTPS_REMOTE_ORIGIN).href;
+    const get_cross_origin_src = new URL(get_same_origin_src, HTTPS_REMOTE_ORIGIN).href;
+
+    const create_same_origin_src =
+        "/permissions-policy/resources/digital-credentials-create.html";
+    const create_cross_origin_src = new URL(create_same_origin_src, HTTPS_REMOTE_ORIGIN).href;
 
     promise_test(async (test) => {
         await test_driver.bless("user activation");
@@ -25,7 +29,7 @@
         await test_feature_availability({
             feature_description: "Digital Credential API",
             test,
-            src: same_origin_src,
+            src: get_same_origin_src,
             expect_feature_available: expect_feature_available_default,
             is_promise_test: true,
         });
@@ -33,10 +37,36 @@
         await test_feature_availability({
             feature_description: "Digital Credential API",
             test,
-            src: cross_origin_src,
+            src: get_cross_origin_src,
             expect_feature_available: expect_feature_unavailable_default,
             feature_name: "digital-credentials-get",
             is_promise_test: true,
         });
-    }, "Permissions-Policy is by default 'self'.");
+    }, "Permissions-Policy is by default 'self' for get().");
+
+    promise_test(async (test) => {
+        await test_driver.bless("user activation");
+        await promise_rejects_js(
+            test,
+            TypeError,
+            navigator.credentials.create(makeCreateOptions([]))
+        );
+
+        await test_feature_availability({
+            feature_description: "Digital Credential API",
+            test,
+            src: create_same_origin_src,
+            expect_feature_available: expect_feature_available_default,
+            is_promise_test: true,
+        });
+
+        await test_feature_availability({
+            feature_description: "Digital Credential API",
+            test,
+            src: create_cross_origin_src,
+            expect_feature_available: expect_feature_unavailable_default,
+            feature_name: "digital-credentials-create",
+            is_promise_test: true,
+        });
+    }, "Permissions-Policy is by default 'self' for create().");
 </script>
diff --git a/tests/wpt/tests/digital-credentials/disabled-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/digital-credentials/disabled-by-permissions-policy.https.sub.html.headers
deleted file mode 100644
index 02a76b7c3f2..00000000000
--- a/tests/wpt/tests/digital-credentials/disabled-by-permissions-policy.https.sub.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Permissions-Policy: digital-credentials-get=()
diff --git a/tests/wpt/tests/digital-credentials/enabled-on-self-origin-by-permissions-policy.https.sub.html b/tests/wpt/tests/digital-credentials/enabled-on-self-origin-by-permissions-policy.https.sub.html
index d530f4920a3..261ebb0ce70 100644
--- a/tests/wpt/tests/digital-credentials/enabled-on-self-origin-by-permissions-policy.https.sub.html
+++ b/tests/wpt/tests/digital-credentials/enabled-on-self-origin-by-permissions-policy.https.sub.html
@@ -10,9 +10,13 @@
 <script type="module">
     import { makeGetOptions } from "./support/helper.js";
     const { HTTPS_REMOTE_ORIGIN } = get_host_info();
-    const same_origin_src =
+    const get_same_origin_src =
         "/permissions-policy/resources/digital-credentials-get.html";
-    const cross_origin_src = new URL(same_origin_src, HTTPS_REMOTE_ORIGIN).href;
+    const get_cross_origin_src = new URL(get_same_origin_src, HTTPS_REMOTE_ORIGIN).href;
+
+    const create_same_origin_src =
+        "/permissions-policy/resources/digital-credentials-create.html";
+    const create_cross_origin_src = new URL(create_same_origin_src, HTTPS_REMOTE_ORIGIN).href;
 
     promise_test(async (test) => {
         await test_driver.bless("user activation");
@@ -27,7 +31,7 @@
         await test_feature_availability({
             feature_description: "Digital Credential API",
             test,
-            src: same_origin_src,
+            src: get_same_origin_src,
             expect_feature_available: expect_feature_available_default,
             is_promise_test: true,
             needs_focus: true,
@@ -38,7 +42,7 @@
         await test_feature_availability({
             feature_description: "Digital Credential API",
             test,
-            src: cross_origin_src,
+            src: get_cross_origin_src,
             expect_feature_available: expect_feature_unavailable_default,
             is_promise_test: true,
             needs_focus: true,
@@ -49,11 +53,54 @@
         await test_feature_availability({
             feature_description: "Digital Credential API",
             test,
-            src: cross_origin_src,
+            src: get_cross_origin_src,
             expect_feature_available: expect_feature_unavailable_default,
             feature_name: "digital-credentials-get",
             is_promise_test: true,
             needs_focus: true,
         });
     }, "Permissions-Policy header explicitly set to digital-credentials-get=(self) cannot be overridden by allow attribute.");
+
+    promise_test(async (test) => {
+        await test_driver.bless("user activation");
+        await promise_rejects_js(
+            test,
+            TypeError,
+            navigator.credentials.create(makeCreateOptions([]))
+        );
+    }, "Permissions-Policy header digital-credentials-create=(self) allows the top-level document.");
+
+    promise_test(async (test) => {
+        await test_feature_availability({
+            feature_description: "Digital Credential API",
+            test,
+            src: create_same_origin_src,
+            expect_feature_available: expect_feature_available_default,
+            is_promise_test: true,
+            needs_focus: true,
+        });
+    }, "Permissions-Policy header digital-credentials-create=(self) allows same-origin iframes.");
+
+    promise_test(async (test) => {
+        await test_feature_availability({
+            feature_description: "Digital Credential API",
+            test,
+            src: create_cross_origin_src,
+            expect_feature_available: expect_feature_unavailable_default,
+            is_promise_test: true,
+            needs_focus: true,
+        });
+    }, "Permissions-Policy header digital-credentials-create=(self) disallows cross-origin iframes.");
+
+    promise_test(async (test) => {
+        await test_feature_availability({
+            feature_description: "Digital Credential API",
+            test,
+            src: create_cross_origin_src,
+            expect_feature_available: expect_feature_unavailable_default,
+            feature_name: "digital-credentials-create",
+            is_promise_test: true,
+            needs_focus: true,
+        });
+    }, "Permissions-Policy header explicitly set to digital-credentials-create=(self) cannot be overridden by allow attribute.");
 </script>
diff --git a/tests/wpt/tests/digital-credentials/enabled-on-self-origin-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/digital-credentials/enabled-on-self-origin-by-permissions-policy.https.sub.html.headers
index 1207d9e29a1..4de358e6a44 100644
--- a/tests/wpt/tests/digital-credentials/enabled-on-self-origin-by-permissions-policy.https.sub.html.headers
+++ b/tests/wpt/tests/digital-credentials/enabled-on-self-origin-by-permissions-policy.https.sub.html.headers
@@ -1 +1 @@
-Permissions-Policy: digital-credentials-get=(self)
+Permissions-Policy: digital-credentials-get=(self), digital-credentials-create=(self)
diff --git a/tests/wpt/tests/digital-credentials/get-user-activation.https.html b/tests/wpt/tests/digital-credentials/get-user-activation.https.html
deleted file mode 100644
index fbf2099dad3..00000000000
--- a/tests/wpt/tests/digital-credentials/get-user-activation.https.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<title>Digital Credential API: get() consumes user activation.</title>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.js" type="module"></script>
-<body></body>
-<script type="module">
-  import { makeGetOptions } from "./support/helper.js";
-
-  promise_test(async (t) => {
-    assert_false(
-      navigator.userActivation.isActive,
-      "User activation should not be active"
-    );
-    const options = makeGetOptions([]);
-    await promise_rejects_dom(
-      t,
-      "NotAllowedError",
-      navigator.credentials.get(options)
-    );
-  }, "navigator.credentials.get() calling the API without user activation should reject with NotAllowedError.");
-
-  promise_test(async (t) => {
-    await test_driver.bless();
-    assert_true(
-      navigator.userActivation.isActive,
-      "User activation should be active after test_driver.bless()."
-    );
-    const options = makeGetOptions([]);
-    await promise_rejects_js(t, TypeError, navigator.credentials.get(options));
-    assert_false(
-      navigator.userActivation.isActive,
-      "User activation should be consumed after navigator.credentials.get()."
-    );
-  }, "navigator.credentials.get() consumes user activation.");
-</script>
diff --git a/tests/wpt/tests/digital-credentials/disabled-by-permissions-policy.https.sub.html b/tests/wpt/tests/digital-credentials/get.disabled-by-permissions-policy.https.sub.html
similarity index 100%
rename from tests/wpt/tests/digital-credentials/disabled-by-permissions-policy.https.sub.html
rename to tests/wpt/tests/digital-credentials/get.disabled-by-permissions-policy.https.sub.html
diff --git a/tests/wpt/tests/digital-credentials/get.disabled-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/digital-credentials/get.disabled-by-permissions-policy.https.sub.html.headers
new file mode 100644
index 00000000000..5672154a423
--- /dev/null
+++ b/tests/wpt/tests/digital-credentials/get.disabled-by-permissions-policy.https.sub.html.headers
@@ -0,0 +1 @@
+Permissions-Policy: digital-credentials-get=()
\ No newline at end of file
diff --git a/tests/wpt/tests/digital-credentials/get.tentative.https.html b/tests/wpt/tests/digital-credentials/get.tentative.https.html
index a090e1b1432..b04a6e3a713 100644
--- a/tests/wpt/tests/digital-credentials/get.tentative.https.html
+++ b/tests/wpt/tests/digital-credentials/get.tentative.https.html
@@ -83,7 +83,7 @@
         global.navigator.credentials.get({ signal, mediation: "required" })
       );
     }
-  }, "Calling navigator.credentials.get() without an digital member same origin.");
+  }, "Calling navigator.credentials.get() without a digital member same origin.");
 
   promise_test(async (t) => {
     for (const request of [undefined, []]) {
diff --git a/tests/wpt/tests/digital-credentials/non-fully-active.https.html b/tests/wpt/tests/digital-credentials/non-fully-active.https.html
index 9e617827f64..3c09b132daf 100644
--- a/tests/wpt/tests/digital-credentials/non-fully-active.https.html
+++ b/tests/wpt/tests/digital-credentials/non-fully-active.https.html
@@ -26,7 +26,7 @@
     const iframe = document.querySelector("iframe");
 
     // The signal check happens after the fully active check.
-    // This allows us to confirm the the right error is thrown
+    // This allows us to confirm the right error is thrown
     // and in the right order.
     const controller = new iframe.contentWindow.AbortController();
     const signal = controller.signal;
diff --git a/tests/wpt/tests/digital-credentials/support/helper.js b/tests/wpt/tests/digital-credentials/support/helper.js
index 71022432652..5a9cda34788 100644
--- a/tests/wpt/tests/digital-credentials/support/helper.js
+++ b/tests/wpt/tests/digital-credentials/support/helper.js
@@ -1,49 +1,129 @@
 // @ts-check
 // Import the types from the TypeScript file
 /**
- * @typedef {import('../dc-types').Protocol} protocol
- * @typedef {import('../dc-types').DigitalCredentialRequest} DigitalCredentialRequest
+ * @typedef {import('../dc-types').GetProtocol} GetProtocol
+ * @typedef {import('../dc-types').DigitalCredentialGetRequest} DigitalCredentialGetRequest
  * @typedef {import('../dc-types').DigitalCredentialRequestOptions} DigitalCredentialRequestOptions
  * @typedef {import('../dc-types').CredentialRequestOptions} CredentialRequestOptions
+ * @typedef {import('../dc-types').CreateProtocol} CreateProtocol
+ * @typedef {import('../dc-types').DigitalCredentialCreateRequest} DigitalCredentialCreateRequest
+ * @typedef {import('../dc-types').CredentialCreationOptions} CredentialCreationOptions
+ * @typedef {import('../dc-types').DigitalCredentialCreationOptions} DigitalCredentialCreationOptions
  * @typedef {import('../dc-types').SendMessageData} SendMessageData
  */
 
 /**
- * @param {protocol | protocol[]} [requestsToUse=["default"]]
- * @param {CredentialMediationRequirement} [mediation="required"]
- * @returns {CredentialRequestOptions}
+ * Internal helper to build the request array from validated input.
+ * Assumes requestsInputArray is a non-empty array of strings.
+ * @private
+ * @param {string[]} requestsInputArray - An array of request type strings.
+ * @param {string} mediation - The mediation requirement.
+ * @param {object} requestMapping - The specific mapping object for the operation type.
+ * @returns {{ digital: { requests: any[] }, mediation: string }} - The final options structure.
+ * @throws {Error} If an unknown request type string is encountered within the array.
  */
-export function makeGetOptions(requestsToUse, mediation = "required") {
-  if (typeof requestsToUse === "string") {
-    if (requestsToUse === "default" || requestsToUse === "openid4vp") {
-      return makeGetOptions([requestsToUse], mediation);
-    }
-  }
-  if (!Array.isArray(requestsToUse) || !requestsToUse?.length) {
-    return { digital: { requests: requestsToUse }, mediation };
-  }
+function _makeOptionsInternal(requestsInputArray, mediation, requestMapping) {
   const requests = [];
-  for (const request of requestsToUse) {
-    switch (request) {
-      case "openid4vp":
-        requests.push(makeOID4VPDict());
-        break;
-      case "default":
-        requests.push(makeDigitalCredentialRequest(undefined, undefined));
-        break;
-      default:
-        throw new Error(`Unknown request type: ${request}`);
+  for (const request of requestsInputArray) {
+    const factoryFunction = requestMapping[request];
+    if (factoryFunction) {
+      requests.push(factoryFunction()); // Call the mapped function
+    } else {
+      // This error means a string *within the array* was unknown
+      throw new Error(`Unknown request type within array: ${request}`);
     }
   }
   return { digital: { requests }, mediation };
 }
+
+const allMappings = {
+  get: {
+    "openid4vp": () => makeOID4VPDict(),
+    "default": () => makeDigitalCredentialGetRequest(undefined, undefined),
+  },
+  create: {
+    "openid4vci": () => makeOID4VCIDict(),
+    "default": () => makeDigitalCredentialCreateRequest(),
+  },
+};
+
+/**
+ * Internal unified function to handle option creation logic.
+ * Routes calls from specific public functions.
+ * @private
+ * @param {'get' | 'create'} type - The type of operation.
+ * @param {string | string[]} [requestsToUse] - Raw input for request types from public function.
+ * @param {string} mediation - Mediation requirement (default handled by public function).
+ * @returns {{ digital: { requests: any[] }, mediation: string }}
+ * @throws {Error} If type is invalid internally, or input strings are invalid.
+ */
+function _makeOptionsUnified(type, requestsToUse, mediation) {
+  // 1. Get mapping (Type validation primarily happens via caller)
+  const mapping = allMappings[type];
+   // Added safety check, though public functions should prevent this.
+  if (!mapping) {
+    throw new Error(`Internal error: Invalid options type specified: ${type}`);
+  }
+
+  // 2. Handle default for requestsToUse
+  const actualRequestsToUse = requestsToUse === undefined ? ["default"] : requestsToUse;
+
+  // 3. Handle single string input
+  if (typeof actualRequestsToUse === 'string') {
+    if (mapping[actualRequestsToUse]) {
+      // Valid single string: Pass as array to the core array helper
+      return _makeOptionsInternal([actualRequestsToUse], mediation, mapping);
+    } else {
+      // Invalid single string for this type
+      throw new Error(`Unknown request type string '${actualRequestsToUse}' provided for operation type '${type}'`);
+    }
+  }
+
+  // 4. Handle array input
+  if (Array.isArray(actualRequestsToUse)) {
+    if (actualRequestsToUse.length === 0) {
+      // Handle empty array explicitly
+      return { digital: { requests: [] }, mediation };
+    }
+    // Pass valid non-empty array to the core array helper
+    return _makeOptionsInternal(actualRequestsToUse, mediation, mapping);
+  }
+
+  // 5. Handle invalid input types (neither string nor array)
+  return { digital: { requests: [] }, mediation };
+}
+
+/**
+ * Creates options for getting credentials.
+ * @export
+ * @param {string | string[]} [requestsToUse] - Request types ('default', 'openid4vp', or an array). Defaults to ['default'].
+ * @param {string} [mediation="required"] - Credential mediation requirement ("required", "optional", "silent").
+ * @returns {{ digital: { requests: any[] }, mediation: string }}
+ */
+export function makeGetOptions(requestsToUse, mediation = "required") {
+  // Pass type 'get', the user's input, and the final mediation value
+  return _makeOptionsUnified('get', requestsToUse, mediation);
+}
+
+/**
+ * Creates options for creating credentials.
+ * @export
+ * @param {string | string[]} [requestsToUse] - Request types ('default', 'openid4vci', or an array). Defaults to ['default'].
+ * @param {string} [mediation="required"] - Credential mediation requirement ("required", "optional", "silent").
+ * @returns {{ digital: { requests: any[] }, mediation: string }} // Adjust inner array type if known
+ */
+export function makeCreateOptions(requestsToUse, mediation = "required") {
+  // Pass type 'create', the user's input, and the final mediation value
+  return _makeOptionsUnified('create', requestsToUse, mediation);
+}
+
 /**
  *
  * @param {string} protocol
  * @param {object} data
- * @returns {DigitalCredentialRequest}
+ * @returns {DigitalCredentialGetRequest}
  */
-function makeDigitalCredentialRequest(protocol = "protocol", data = {}) {
+function makeDigitalCredentialGetRequest(protocol = "protocol", data = {}) {
   return {
     protocol,
     data,
@@ -53,14 +133,38 @@ function makeDigitalCredentialRequest(protocol = "protocol", data = {}) {
 /**
  * Representation of an OpenID4VP request.
  *
- * @returns {DigitalCredentialRequest}
+ * @returns {DigitalCredentialGetRequest}
  **/
 function makeOID4VPDict() {
-  return makeDigitalCredentialRequest("openid4vp", {
+  return makeDigitalCredentialGetRequest("openid4vp", {
     // Canonical example of an OpenID4VP request coming soon.
   });
 }
 
+/**
+ *
+ * @param {string} protocol
+ * @param {object} data
+ * @returns {DigitalCredentialCreateRequest}
+ */
+function makeDigitalCredentialCreateRequest(protocol = "protocol", data = {}) {
+  return {
+    protocol,
+    data,
+  };
+}
+
+/**
+ * Representation of an OpenID4VCI request.
+ *
+ * @returns {DigitalCredentialCreateRequest}
+ **/
+function makeOID4VCIDict() {
+  return makeDigitalCredentialCreateRequest("openid4vci", {
+    // Canonical example of an OpenID4VCI request coming soon.
+  });
+}
+
 /**
  * Sends a message to an iframe and return the response.
  *
diff --git a/tests/wpt/tests/digital-credentials/user-activation.https.html b/tests/wpt/tests/digital-credentials/user-activation.https.html
new file mode 100644
index 00000000000..facaf7bddbb
--- /dev/null
+++ b/tests/wpt/tests/digital-credentials/user-activation.https.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<title>Digital Credential API: get() consumes user activation.</title>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/helper.js" type="module"></script>
+<body></body>
+<script type="module">
+  import { makeGetOptions, makeCreateOptions } from "./support/helper.js";
+
+  promise_test(async (t) => {
+    assert_false(
+      navigator.userActivation.isActive,
+      "User activation should not be active"
+    );
+    const options = makeGetOptions([]);
+    await promise_rejects_dom(
+      t,
+      "NotAllowedError",
+      navigator.credentials.get(options)
+    );
+  }, "navigator.credentials.get() calling the API without user activation should reject with NotAllowedError.");
+
+  promise_test(async (t) => {
+    await test_driver.bless();
+    assert_true(
+      navigator.userActivation.isActive,
+      "User activation should be active after test_driver.bless()."
+    );
+    const options = makeGetOptions([]);
+    await promise_rejects_js(t, TypeError, navigator.credentials.get(options));
+    assert_false(
+      navigator.userActivation.isActive,
+      "User activation should be consumed after navigator.credentials.get()."
+    );
+  }, "navigator.credentials.get() consumes user activation.");
+
+  promise_test(async (t) => {
+    assert_false(
+      navigator.userActivation.isActive,
+      "User activation should not be active"
+    );
+    const options = makeCreateOptions([]);
+    await promise_rejects_dom(
+      t,
+      "NotAllowedError",
+      navigator.credentials.create(options)
+    );
+  }, "navigator.credentials.create() calling the API without user activation should reject with NotAllowedError.");
+
+  promise_test(async (t) => {
+    await test_driver.bless();
+    assert_true(
+      navigator.userActivation.isActive,
+      "User activation should be active after test_driver.bless()."
+    );
+    const options = makeCreateOptions([]);
+    await promise_rejects_js(t, TypeError, navigator.credentials.create(options));
+    assert_false(
+      navigator.userActivation.isActive,
+      "User activation should be consumed after navigator.credentials.create()."
+    );
+  }, "navigator.credentials.create() consumes user activation.");
+</script>
diff --git a/tests/wpt/tests/docs/running-tests/webkitgtk_minibrowser.md b/tests/wpt/tests/docs/running-tests/webkitgtk_minibrowser.md
index 55bcbf1bd6a..6af2da94406 100644
--- a/tests/wpt/tests/docs/running-tests/webkitgtk_minibrowser.md
+++ b/tests/wpt/tests/docs/running-tests/webkitgtk_minibrowser.md
@@ -16,7 +16,7 @@ to run it manually you can find it on any of this paths:
 * Debian or Ubuntu: `/usr/lib/${TRIPLET}/webkitgtk-${APIVERSION}/MiniBrowser`
   * Note: `${TRIPLET}` is the output of the command `gcc -dumpmachine`
 
-# Nightly universal bundle
+## Nightly universal bundle
 
 Alternatively you can pass to `wpt` the flags `--install-browser --channel=nightly`
 and then `wpt` will automatically download the last bundle and unpack it on the
@@ -32,7 +32,7 @@ issues with this bundle then a possible workaround is to try to run the tests he
 inside a virtualized display like `Xvfb` (see command `xvfb-run -a` on Debian/Ubuntu).
 You can do this also from inside a virtual machine or Docker container.
 
-# Headless mode
+## Headless mode
 
 WebKitGTK does not have a native headless mode, but you can workaround that
 by running the tests inside a virtualized display. For example you can use
@@ -44,7 +44,7 @@ Example:
     xvfb-run -a ./wpt run [more-options] webkitgtk_minibrowser [tests-to-run]
 
 
-# Using a custom WebKitGTK build
+## Using a custom WebKitGTK build
 
 If you want to test with a custom WebKitGTK build the easiest way is that you
 install this build in a temporary directory (`/tmp/wkgtktest` in this example),
@@ -68,7 +68,7 @@ Note: It is important that you build WebKitGTK against the libraries of your sys
 Do not build WebKitGTK inside Flatpak or other container unless you run `wpt` also
 from inside this container.
 
-# Running tests locally
+## Running tests locally
 
 Is a good idea that you increase the verbosity of `wpt` by passing to it the flag `--log-mach=-`
 Also, please check the documentation about [Running Tests from the Local System](from-local-system).
diff --git a/tests/wpt/tests/docs/running-tests/wpewebkit_minibrowser.md b/tests/wpt/tests/docs/running-tests/wpewebkit_minibrowser.md
index 7721279b041..6f9328633a1 100644
--- a/tests/wpt/tests/docs/running-tests/wpewebkit_minibrowser.md
+++ b/tests/wpt/tests/docs/running-tests/wpewebkit_minibrowser.md
@@ -15,7 +15,7 @@ to run it manually you can find it on any of this paths:
 * Debian or Ubuntu: `/usr/lib/${TRIPLET}/wpe-webkit-${APIVERSION}/MiniBrowser`
   * Note: `${TRIPLET}` is the output of the command `gcc -dumpmachine`
 
-# Nightly universal bundle
+## Nightly universal bundle
 
 Alternatively you can pass to `wpt` the flags `--install-browser --channel=nightly`
 and then `wpt` will automatically download the last bundle and unpack it on the
@@ -30,7 +30,7 @@ If you are using proprietary graphics drivers (NVIDIA, AMDGPU PRO, etc) and you
 issues with this bundle then a possible workaround is to try to run the tests in
 headless mode, for that pass the flag `--headless` to `wpt`
 
-# Headless mode
+## Headless mode
 
 The WPE MiniBrowser needs a Wayland display to run, but if you don't have one
 or you want to enable headless mode you can pass the flag `--headless` to `wpt`.
@@ -40,7 +40,7 @@ Example:
 ./wpt run [more-options] --headless wpewebkit_minibrowser [tests-to-run]
 ```
 
-# Using a custom WPE WebKit build
+## Using a custom WPE WebKit build
 
 If you want to test with a custom WPE WebKit build the easiest way is that you
 install this build in a temporary directory (`/tmp/wpetest` in this example),
@@ -64,7 +64,7 @@ Note: It is important that you build WPE WebKit against the libraries of your sy
 Do not build WPE WebKit inside Flatpak or other container unless you run `wpt` also
 from inside this container.
 
-# Running tests locally
+## Running tests locally
 
 Is a good idea that you increase the verbosity of `wpt` by passing to it the flag `--log-mach=-`
 Also, please check the documentation about [Running Tests from the Local System](from-local-system).
diff --git a/tests/wpt/tests/docs/writing-tests/testdriver.md b/tests/wpt/tests/docs/writing-tests/testdriver.md
index 537b3c01976..e0fae529875 100644
--- a/tests/wpt/tests/docs/writing-tests/testdriver.md
+++ b/tests/wpt/tests/docs/writing-tests/testdriver.md
@@ -186,6 +186,12 @@ the global scope.
 .. js:autofunction:: test_driver.remove_virtual_pressure_source
 ```
 
+### Viewport Segments ###
+```eval_rst
+.. js:autofunction:: test_driver.set_display_features
+.. js:autofunction:: test_driver.clear_display_features
+```
+
 ### Using test_driver in other browsing contexts ###
 
 Testdriver can be used in browsing contexts (i.e. windows or frames)
@@ -307,3 +313,11 @@ The module provides access to [Web Bluetooth](https://webbluetoothcg.github.io/w
 .. js:autofunction:: test_driver.bidi.bluetooth.simulate_preconnected_peripheral
 .. js:autofunction:: test_driver.bidi.bluetooth.request_device_prompt_updated
 ```
+
+### Emulation ###
+
+Emulation of browser APIs via [WebDriver BiDi Emulation](https://www.w3.org/TR/webdriver-bidi/#module-emulation).
+
+```eval_rst
+.. js:autofunction:: test_driver.bidi.emulation.set_geolocation_override
+```
diff --git a/tests/wpt/tests/dom/events/non-cancelable-when-passive/generic-events-stay-cancelable.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/generic-events-stay-cancelable.html
new file mode 100644
index 00000000000..961794728d3
--- /dev/null
+++ b/tests/wpt/tests/dom/events/non-cancelable-when-passive/generic-events-stay-cancelable.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<meta charset=utf-8>
+<title></title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+async_test((t) => {
+    const et = new EventTarget();
+    et.addEventListener('test', t.step_func_done((e) => {
+        assert_true(e.cancelable);
+    }), {passive: true});
+    et.dispatchEvent(new Event('test', {cancelable: true}));
+}, "A generic event with only passive listeners remains cancelable");
+</script>
diff --git a/tests/wpt/tests/dom/events/scrolling/overscroll-deltas.html b/tests/wpt/tests/dom/events/scrolling/overscroll-deltas.tentative.html
similarity index 100%
rename from tests/wpt/tests/dom/events/scrolling/overscroll-deltas.html
rename to tests/wpt/tests/dom/events/scrolling/overscroll-deltas.tentative.html
diff --git a/tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-document.html b/tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-document.tentative.html
similarity index 100%
rename from tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-document.html
rename to tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-document.tentative.html
diff --git a/tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-element-with-overscroll-behavior.html b/tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-element-with-overscroll-behavior.tentative.html
similarity index 100%
rename from tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-element-with-overscroll-behavior.html
rename to tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-element-with-overscroll-behavior.tentative.html
diff --git a/tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html b/tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-scrolled-element.tentative.html
similarity index 100%
rename from tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html
rename to tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-scrolled-element.tentative.html
diff --git a/tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-window.html b/tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-window.tentative.html
similarity index 100%
rename from tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-window.html
rename to tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-window.tentative.html
diff --git a/tests/wpt/tests/dom/events/scrolling/scroll-cross-origin-iframes.html b/tests/wpt/tests/dom/events/scrolling/scroll-cross-origin-iframes.html
new file mode 100644
index 00000000000..4c873139965
--- /dev/null
+++ b/tests/wpt/tests/dom/events/scrolling/scroll-cross-origin-iframes.html
@@ -0,0 +1,77 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Verify that two sibling cross-origin iframes both correctly scroll on MouseWheel events, as per https://crbug.com/675695.</title>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="scroll_support.js"></script>
+<body>
+  <iframe id="target-iframe1"
+      style="height: 100px; width: 100px; overflow-y: scroll; position: absolute; left: 50px; top: 50px">
+  </iframe>
+  <iframe id="target-iframe2"
+      style="height: 100px; width: 100px; overflow-y: scroll; position: absolute; left: 50px; top: 200px">
+  </iframe>
+  <script>
+    "use strict";
+
+    function waitForFrameLoadAsync(frame) {
+      return new Promise(async (resolve) => {
+        frame.addEventListener('load', resolve, { once: true });
+      });
+    }
+
+    function waitForMessageAsync(expected_frame_id, expected_command) {
+      return new Promise((resolve) => {
+        window.addEventListener('message', (event) => {
+          assert_equals(event.data.command, expected_command);
+          assert_equals(event.data.frame_id, expected_frame_id);
+          resolve(event.data.scrollTop);
+        }, { once: true });
+      });
+    }
+
+    function waitForCrossOriginFrameSetupAsync(frame) {
+      return new Promise(async (resolve) => {
+        const setup_ack_waiter = waitForMessageAsync(frame.id, 'setup');
+        const load_ack_waiter = waitForFrameLoadAsync(frame);
+
+        const host = get_host_info();
+        frame.src = host.HTTP_NOTSAMESITE_ORIGIN +
+            "/dom/events/scrolling/scroll-cross-origin-iframes.sub.html";
+        await load_ack_waiter;
+        await frame.contentWindow.postMessage({
+          command: 'setup',
+          frame_id: frame.id
+        }, "*");
+        const scroll_top = await setup_ack_waiter;
+        resolve(scroll_top);
+      });
+    }
+
+    promise_test(async () => {
+      var frame_map = new Map();
+      for (const frame of document.querySelectorAll('iframe')) {
+        const scroll_top_before = await waitForCrossOriginFrameSetupAsync(frame);
+        frame_map.set(frame.id, scroll_top_before);
+      }
+      assert_equals(frame_map.size, 2);
+
+      for (const [frame_id, scroll_top_before] of frame_map) {
+        const frame = document.getElementById(frame_id);
+        const scrollend_ack_waiter = waitForMessageAsync(frame_id, 'onscrollend');
+        await new test_driver.Actions()
+            .scroll(/*cursor_x=*/0, /*cursor_y=*/0,
+                    /*delta_x=*/0, /*delta_y=*/50,
+                    {origin: frame})
+            .send();
+        const scroll_top_after = await scrollend_ack_waiter;
+        assert_greater_than(scroll_top_after, scroll_top_before,
+                            'Failed to advance scrollTop target');
+      }
+    }, "Verify sibling cross-origin iframes can wheel-scroll.");
+  </script>
+</body>
diff --git a/tests/wpt/tests/dom/events/scrolling/scroll-cross-origin-iframes.sub.html b/tests/wpt/tests/dom/events/scrolling/scroll-cross-origin-iframes.sub.html
new file mode 100644
index 00000000000..e6d12794e3f
--- /dev/null
+++ b/tests/wpt/tests/dom/events/scrolling/scroll-cross-origin-iframes.sub.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<div style="height: 300px"></div>
+<script>
+var is_setup = false;
+var port;
+var frame_id;
+
+function postReplyMessage(command) {
+  const message_target = (port ? port : parent);
+  message_target.postMessage({
+    command: command,
+    frame_id: frame_id,
+    scrollTop: document.documentElement.scrollTop
+  }, "*");
+}
+
+function handleMessage(event) {
+  switch (event.data.command) {
+    case 'setup':
+      is_setup = false;
+      port = event.source;
+      frame_id = event.data.frame_id;
+      if (document.scrollingElement.scrollLeft != 0 ||
+          document.scrollingElement.scrollTop != 0) {
+        document.scrollingElement.scrollTo(0, 0);
+      } else {
+        is_setup = true;
+        postReplyMessage('setup');
+      }
+      break;
+    default:
+      break;
+  }
+}
+
+function handleScrollend() {
+  var command = 'onscrollend';
+
+  if (!is_setup &&
+      document.scrollingElement.scrollTop == 0 &&
+      document.scrollingElement.scrollLeft == 0) {
+    is_setup = true;
+    command = 'setup';
+  }
+
+  postReplyMessage(command);
+}
+
+window.addEventListener('message', handleMessage);
+window.addEventListener('scrollend', handleScrollend);
+</script>
diff --git a/tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html b/tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html
index 40aa77f4764..e3e63f28201 100644
--- a/tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html
+++ b/tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html
@@ -6,6 +6,12 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-actions.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
+<script src="/common/subset-tests-by-key.js"></script>
+<meta name="variant" content="?include=subframe-inline-end-block-end-behavior-auto"/>
+<meta name="variant" content="?include=subframe-inline-start-block-start-behavior-smooth"/>
+<meta name="variant" content="?include=root-inline-end-block-end-behavior-auto"/>
+<meta name="variant" content="?include=root-inline-start-block-start-behavior-smooth"/>
+<meta name="variant" content="?include=nested-scrollIntoView"/>
 <script src="scroll_support.js"></script>
 <style>
 html {
@@ -31,8 +37,8 @@ html {
 </div>
 </body>
 <script>
-var element_scrollend_arrived = false;
-var document_scrollend_arrived = false;
+let element_scrollend_arrived = false;
+let document_scrollend_arrived = false;
 
 function onElementScrollEnd(event) {
   assert_false(event.cancelable);
@@ -47,80 +53,147 @@ function onDocumentScrollEnd(event) {
   document_scrollend_arrived = true;
 }
 
-function callScrollFunction([scrollTarget, scrollFunction, args]) {
-  scrollTarget[scrollFunction](args);
-}
+let root_element = document.scrollingElement;
+let target_div = document.getElementById("targetDiv");
+let inner_div = document.getElementById("innerDiv");
+
+// Get expected position for root_element scrollIntoView.
+root_element.scrollTo(10000, 10000);
+let max_root_x = root_element.scrollLeft;
+let max_root_y = root_element.scrollTop;
+root_element.scrollTo(0, 0);
+
+target_div.scrollTo(10000, 10000);
+let max_element_x = target_div.scrollLeft;
+let max_element_y = target_div.scrollTop;
+target_div.scrollTo(0, 0);
+
+let test_cases = [
+  {
+    key: "subframe-inline-end-block-end-behavior-auto",
+    args: { inline: "end", block: "end", behavior: "smooth" },
+    target: target_div,
+    scroll_target: inner_div,
+    expected: {
+      pos: { x: max_element_x, y: max_element_y },
+    },
+    title: "Tests scrollend event for scrollIntoView with behavior 'auto' on subframe.",
+  },
+  {
+    key: "subframe-inline-start-block-start-behavior-smooth",
+    args: { inline: "start", block: "start", behavior: "auto" },
+    target: target_div,
+    scroll_target: inner_div,
+    expected: {
+      pos: { x: 0, y: 0 },
+    },
+    title: "Tests scrollend event for scrollIntoView with behavior 'smooth' on subframe.",
+  },
+  {
+    key: "root-inline-end-block-end-behavior-auto",
+    args: { inline: "end", block: "end", behavior: "smooth" },
+    target: document.scrollingElement,
+    scroll_target: document.scrollingElement,
+    expected: {
+      pos: { x: max_root_x, y: max_root_y },
+    },
+    title: "Tests scrollend event for scrollIntoView with behavior 'auto' on root.",
+  },
+  {
+    key: "root-inline-start-block-start-behavior-smooth",
+    args: { inline: "start", block: "start", behavior: "auto" },
+    target: document.scrollingElement,
+    scroll_target: document.scrollingElement,
+    expected: {
+      pos: { x: 0, y: 0 },
+    },
+    title: "Tests scrollend event for scrollIntoView with behavior 'smooth' on root.",
+  },
+];
 
 function runTest() {
-  let root_element = document.scrollingElement;
-  let target_div = document.getElementById("targetDiv");
-  let inner_div = document.getElementById("innerDiv");
+  async function testScrollIntoView(testInfo, t) {
+    let test_start = { x: 0, y: 0 };
+    if (testInfo.args.inline == "start") {
+      test_start.x = 10000;
+    }
+    if (testInfo.args.block == "start") {
+      test_start.y = 10000;
+    }
 
-  // Get expected position for root_element scrollIntoView.
-  root_element.scrollTo(10000, 10000);
-  let max_root_x = root_element.scrollLeft;
-  let max_root_y = root_element.scrollTop;
-  root_element.scrollTo(0, 0);
+    if (test_start.x != 0 || test_start.y != 0) {
+      testInfo.target.scrollTo(test_start.x, test_start.y);
+    }
 
-  target_div.scrollTo(10000, 10000);
-  let max_element_x = target_div.scrollLeft;
-  let max_element_y = target_div.scrollTop;
-  target_div.scrollTo(0, 0);
-
-  promise_test (async (t) => {
     await waitForCompositorCommit();
-    target_div.addEventListener("scrollend", onElementScrollEnd);
+
+    targetDiv.addEventListener("scrollend", onElementScrollEnd);
     document.addEventListener("scrollend", onDocumentScrollEnd);
 
-    let test_cases = [
-      [target_div, max_element_x, max_element_y, [inner_div, "scrollIntoView", { inline: "end", block: "end", behavior: "auto" }]],
-      [target_div, 0, 0, [inner_div, "scrollIntoView", { inline: "start", block: "start", behavior: "smooth" }]],
-      [root_element, max_root_x, max_root_y, [root_element, "scrollIntoView", { inline: "end", block: "end", behavior: "smooth" }]],
-      [root_element, 0, 0, [root_element, "scrollIntoView", { inline: "start", block: "start", behavior: "smooth" }]]
-    ];
-
-    for(i = 0; i < test_cases.length; i++) {
-      let t = test_cases[i];
-      let target = t[0];
-      let expected_x = t[1];
-      let expected_y = t[2];
-      let scroll_datas = t[3];
-
-      callScrollFunction(scroll_datas);
-      await waitFor(() => { return element_scrollend_arrived || document_scrollend_arrived; }, target.tagName + ".scrollIntoView  did not receive scrollend event.");
-      if (target == root_element)
-        assert_false(element_scrollend_arrived);
-      else
-        assert_false(document_scrollend_arrived);
-      assert_equals(target.scrollLeft, expected_x, target.tagName + ".scrollIntoView scrollLeft");
-      assert_equals(target.scrollTop, expected_y, target.tagName + ".scrollIntoView scrollTop");
-
-      element_scrollend_arrived = false;
-      document_scrollend_arrived = false;
-    }
-  }, "Tests scrollend event for scrollIntoView.");
-
-  promise_test(async (t) => {
-    document.body.removeChild(target_div);
-    let out_div = document.createElement("div");
-    out_div.style = "width: 100px; height:100px; overflow:scroll; scroll-behavior:smooth;";
-    out_div.appendChild(target_div);
-    document.body.appendChild(out_div);
     await waitForCompositorCommit();
 
-    inner_div.scrollIntoView({ inline: "end", block: "end", behavior: "auto" });
-    const scrollend_events = [
-      waitForScrollendEventNoTimeout(out_div),
-      waitForScrollendEventNoTimeout(target_div)
-    ];
-    await Promise.all(scrollend_events);
-    assert_equals(root_element.scrollLeft, 0, "Nested scrollIntoView root_element scrollLeft");
-    assert_equals(root_element.scrollTop, 0, "Nested scrollIntoView root_element scrollTop");
-    assert_equals(out_div.scrollLeft, 100, "Nested scrollIntoView out_div scrollLeft");
-    assert_equals(out_div.scrollTop, 100, "Nested scrollIntoView out_div scrollTop");
-    assert_equals(target_div.scrollLeft, max_element_x, "Nested scrollIntoView target_div scrollLeft");
-    assert_equals(target_div.scrollTop, max_element_y, "Nested scrollIntoView target_div scrollTop");
-    assert_false(document_scrollend_arrived);
-  }, "Tests scrollend event for nested scrollIntoView.");
+    testInfo.scroll_target.scrollIntoView({ inline: testInfo.args.inline,
+                                            block: testInfo.args.block,
+                                            behavior: testInfo.args.behavior });
+
+    await waitFor(
+      () => { return element_scrollend_arrived || document_scrollend_arrived; },
+      testInfo.target.tagName + ".scrollIntoView  did not receive scrollend event."
+    );
+
+    assert_equals(testInfo.target.scrollLeft, testInfo.expected.pos.x,
+                  testInfo.target.tagName + ".scrollIntoView scrollLeft");
+    assert_equals(testInfo.target.scrollTop, testInfo.expected.pos.y,
+                  testInfo.target.tagName + ".scrollIntoView scrollTop");
+
+    if (testInfo.target == root_element) {
+      assert_false(element_scrollend_arrived,
+                   "root element targetted, but element scrollend arrived");
+    } else {
+      assert_false(document_scrollend_arrived,
+                   "subframe targetted, but document scrollend arrived");
+    }
+  }
+
+  test_cases.forEach((test_info) => {
+    subsetTestByKey(test_info.key, promise_test,
+                    async (t) => testScrollIntoView(test_info, t), test_info.title);
+  });
+
+  subsetTestByKey(
+    "nested-scrollIntoView",
+    promise_test,
+    async (t) => {
+      await waitForCompositorCommit();
+
+      document.addEventListener("scrollend", onDocumentScrollEnd);
+      target_div.addEventListener("scrollend", onElementScrollEnd);
+
+      await waitForCompositorCommit();
+
+      document.body.removeChild(target_div);
+      let out_div = document.createElement("div");
+      out_div.style = "width: 100px; height:100px; overflow:scroll; scroll-behavior:smooth;";
+      out_div.appendChild(target_div);
+      document.body.appendChild(out_div);
+      await waitForCompositorCommit();
+
+      inner_div.scrollIntoView({ inline: "end", block: "end", behavior: "auto" });
+      const scrollend_events = [
+        waitForScrollendEventNoTimeout(out_div),
+        waitForScrollendEventNoTimeout(target_div)
+      ];
+      await Promise.all(scrollend_events);
+      assert_equals(root_element.scrollLeft, 0, "Nested scrollIntoView root_element scrollLeft");
+      assert_equals(root_element.scrollTop, 0, "Nested scrollIntoView root_element scrollTop");
+      assert_equals(out_div.scrollLeft, 100, "Nested scrollIntoView out_div scrollLeft");
+      assert_equals(out_div.scrollTop, 100, "Nested scrollIntoView out_div scrollTop");
+      assert_equals(target_div.scrollLeft, max_element_x, "Nested scrollIntoView target_div scrollLeft");
+      assert_equals(target_div.scrollTop, max_element_y, "Nested scrollIntoView target_div scrollTop");
+      assert_false(document_scrollend_arrived);
+    },
+    "Tests scrollend event for nested scrollIntoView.",
+  );
 }
+
 </script>
diff --git a/tests/wpt/tests/dom/nodes/Node-childNodes-cache-2.html b/tests/wpt/tests/dom/nodes/Node-childNodes-cache-2.html
new file mode 100644
index 00000000000..9079fc6ea7a
--- /dev/null
+++ b/tests/wpt/tests/dom/nodes/Node-childNodes-cache-2.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Node.childNodes caching bug with replaceChild</title>
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-childnodes">
+<link rel=author title="Xiaocheng Hu" href="mailto:xiaochengh.work@gmail.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="target"><div id="first"></div><div id="second"></div><div id="third"></div><div id="last"></div></div>
+<script>
+test(function() {
+  let target = document.getElementById("target");
+  assert_array_equals(Array.from(target.childNodes).map(node => node.id), ["first", "second", "third", "last"]);
+  target.replaceChild(target.childNodes[2], target.childNodes[1]);
+  assert_array_equals(Array.from(target.childNodes).map(node => node.id), ["first", "third", "last"]);
+});
+</script>
diff --git a/tests/wpt/tests/dom/nodes/attributes-namednodemap.html b/tests/wpt/tests/dom/nodes/attributes-namednodemap.html
index 96f9d30703b..0b631c1fb93 100644
--- a/tests/wpt/tests/dom/nodes/attributes-namednodemap.html
+++ b/tests/wpt/tests/dom/nodes/attributes-namednodemap.html
@@ -115,6 +115,6 @@ test(() => {
 
   assert_equals(element.attributes.length, 1, "one attribute");
 
-}, "setting an attribute should not overwrite the the length property of an `NamedNodeMap` object");
+}, "setting an attribute should not overwrite the length property of an `NamedNodeMap` object");
 
 </script>
diff --git a/tests/wpt/tests/dom/nodes/moveBefore/custom-element-move-reactions.html b/tests/wpt/tests/dom/nodes/moveBefore/custom-element-move-reactions.html
index a561180f945..c5702eb7bc1 100644
--- a/tests/wpt/tests/dom/nodes/moveBefore/custom-element-move-reactions.html
+++ b/tests/wpt/tests/dom/nodes/moveBefore/custom-element-move-reactions.html
@@ -9,10 +9,14 @@
 <body>
   <section id="section"></section>
   <script>
+    let index = 0;
+    function unique_element_name() {
+        return `ce-${++index}`;
+    }
     promise_test(async t => {
         const ce = document.getElementById("ce");
         let reactions = [];
-        const element_name = `ce-${performance.now()}`;
+        const element_name = unique_element_name();
         customElements.define(element_name,
             class MockCustomElement extends HTMLElement {
                 connectedCallback() { reactions.push("connected"); }
@@ -31,7 +35,7 @@
     promise_test(async t => {
         const ce = document.getElementById("ce");
         let reactions = [];
-        const element_name = `ce-${performance.now()}`;
+        const element_name = unique_element_name();
         customElements.define(element_name,
             class MockCustomElement extends HTMLElement {
                 connectedCallback() { reactions.push(this.isConnected); }
@@ -50,7 +54,7 @@
     promise_test(async t => {
         const ce = document.getElementById("ce");
         let reactions = [];
-        const element_name = `ce-${performance.now()}`;
+        const element_name = unique_element_name();
         customElements.define(element_name,
             class MockCustomElement extends HTMLElement {
               connectedMoveCallback() { reactions.push("connectedMove"); }
@@ -70,8 +74,8 @@
     promise_test(async t => {
         const ce = document.getElementById("ce");
         let reactions = [];
-        const outer_element_name = `ce-${performance.now()}-outer`;
-        const inner_element_name = `ce-${performance.now()}-inner`;
+        const outer_element_name = unique_element_name();
+        const inner_element_name = unique_element_name();
         customElements.define(outer_element_name,
             class MockCustomElement extends HTMLElement {
               connectedCallback() { reactions.push("outer connected"); }
@@ -97,7 +101,7 @@
     promise_test(async t => {
         const ce = document.getElementById("ce");
         let reactions = [];
-        const element_name = `ce-${performance.now()}`;
+        const element_name = unique_element_name();
         customElements.define(element_name,
             class MockCustomElement extends HTMLElement {
                 disconnectedCallback() { reactions.push("disconnected"); }
@@ -115,7 +119,7 @@
     promise_test(async t => {
         const ce = document.getElementById("ce");
         let reactions = [];
-        const element_name = `ce-${performance.now()}`;
+        const element_name = unique_element_name();
         customElements.define(element_name,
             class MockCustomElement extends HTMLElement {
                 connectedCallback() { reactions.push("connected"); }
diff --git a/tests/wpt/tests/dom/nodes/moveBefore/tentative/focus-preserve.html b/tests/wpt/tests/dom/nodes/moveBefore/focus-preserve.html
similarity index 100%
rename from tests/wpt/tests/dom/nodes/moveBefore/tentative/focus-preserve.html
rename to tests/wpt/tests/dom/nodes/moveBefore/focus-preserve.html
diff --git a/tests/wpt/tests/dom/observable/WEB_FEATURES.yml b/tests/wpt/tests/dom/observable/WEB_FEATURES.yml
new file mode 100644
index 00000000000..3e872791165
--- /dev/null
+++ b/tests/wpt/tests/dom/observable/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: observable
+  files: "**"
diff --git a/tests/wpt/tests/dom/observable/tentative/observable-from.any.js b/tests/wpt/tests/dom/observable/tentative/observable-from.any.js
index b5fcb5ed1fc..20b2c8010cc 100644
--- a/tests/wpt/tests/dom/observable/tentative/observable-from.any.js
+++ b/tests/wpt/tests/dom/observable/tentative/observable-from.any.js
@@ -866,7 +866,7 @@ test(() => {
 }, "from(): Errors thrown in Symbol.asyncIterator() are propagated synchronously");
 
 // AsyncIterable: next() throws exception instead of return Promise. Any errors
-// that occur during the the retrieval of `next()` always result in a rejected
+// that occur during the retrieval of `next()` always result in a rejected
 // Promise. Therefore, the error makes it to the Observer with microtask timing.
 promise_test(async () => {
   const nextError = new Error('next error');
@@ -1728,3 +1728,14 @@ test(() => {
   assert_not_equals(reportedError, null, "Protocol error is reported to the global");
   assert_true(reportedError instanceof TypeError);
 }, "Invalid iterator protocol error is surfaced before Subscriber#signal is consulted");
+
+// Regression test for https://github.com/WICG/observable/issues/208.
+promise_test(async () => {
+  let errorReported = false;
+  self.onerror = e => errorReported = true;
+
+  // `first()` aborts the subscription after the first item is encountered.
+  const value = await Observable.from([1, 2, 3]).first();
+  assert_false(errorReported);
+}, "No error is reported when aborting a subscription to a sync iterator " +
+   "that has no `return()` implementation");
diff --git a/tests/wpt/tests/dom/ranges/Range-compareBoundaryPoints-crash.html b/tests/wpt/tests/dom/ranges/Range-compareBoundaryPoints-crash.html
new file mode 100644
index 00000000000..673eeb61828
--- /dev/null
+++ b/tests/wpt/tests/dom/ranges/Range-compareBoundaryPoints-crash.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<title>Range.compareBoundaryPoints() crash test</title>
+<link rel=help href="crbug.com/410996563">
+
+<table id="table">
+<thead>
+<tr id="row"></tr>
+
+<script>
+const selection = document.getSelection();
+const range = new Range();
+const cell = row.insertCell();
+range.setEndBefore(cell);
+selection.addRange(range);
+selection.removeRange(range);
+table.tHead = null;
+range.compareBoundaryPoints(Range.START_TO_END, range);
+</script>
diff --git a/tests/wpt/tests/dom/xslt/document-element.window.js b/tests/wpt/tests/dom/xslt/document-element.window.js
new file mode 100644
index 00000000000..4079533c1e0
--- /dev/null
+++ b/tests/wpt/tests/dom/xslt/document-element.window.js
@@ -0,0 +1,26 @@
+const xmlString = `
+<items>
+  <item>Item 1</item>
+  <item>Item 2</item>
+</items>
+`;
+const xsltString = `
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:template match="*">
+    <xsl:value-of select="name(.)"/>
+  </xsl:template>
+</xsl:stylesheet>
+`;
+const parser = new DOMParser();
+
+const xmlDoc = parser.parseFromString(xmlString, "application/xml");
+const xsltDoc = parser.parseFromString(xsltString, "application/xml");
+const xsltProcessor = new XSLTProcessor();
+
+xsltProcessor.importStylesheet(xsltDoc);
+
+test(() => {
+  const resultFragment = xsltProcessor.transformToFragment(xmlDoc.documentElement, document);
+  assert_equals(resultFragment.childNodes.length, 1);
+  assert_equals(resultFragment.firstChild.nodeValue, "items");
+}, `'*' should match the documentElement`);
diff --git a/tests/wpt/tests/domparsing/XMLSerializer-serializeToString.html b/tests/wpt/tests/domparsing/XMLSerializer-serializeToString.html
index ad65c9fafb3..352a62c7d5d 100644
--- a/tests/wpt/tests/domparsing/XMLSerializer-serializeToString.html
+++ b/tests/wpt/tests/domparsing/XMLSerializer-serializeToString.html
@@ -80,6 +80,25 @@ test(function() {
   assert_equals(serialize(root), '<root xmlns="uri1"><child xmlns=""/><child2 xmlns="uri2"/><child3/><child4 xmlns="uri4"/><child5 xmlns=""/></root>');
 }, 'Check if inconsistent xmlns="..." is dropped.');
 
+test(function() {
+  const root1 = parse('<package></package>');
+  root1.setAttribute('xmlns', 'http://www.idpf.org/2007/opf');
+  const manifest1 = root1.appendChild(root1.ownerDocument.createElement('manifest'));
+  manifest1.setAttribute('xmlns', 'http://www.idpf.org/2007/opf');
+  assert_equals(serialize(root1), '<package><manifest/></package>');
+
+  const root2 = parse('<package xmlns="http://www.idpf.org/2007/opf"></package>');
+  const manifest2 = root2.appendChild(root2.ownerDocument.createElement('manifest'));
+  manifest2.setAttribute('xmlns', 'http://www.idpf.org/2007/opf');
+  assert_equals(serialize(root2),
+                '<package xmlns="http://www.idpf.org/2007/opf"><manifest xmlns=""/></package>');
+
+  const root3 = parse('<package xmlns="http://www.idpf.org/2007/opf"></package>');
+  const manifest3 = root3.appendChild(root3.ownerDocument.createElement('manifest'));
+  assert_equals(serialize(root3),
+                '<package xmlns="http://www.idpf.org/2007/opf"><manifest xmlns=""/></package>');
+}, 'Drop inconsistent xmlns="..." by matching on local name');
+
 test(function() {
   let root = parse('<r xmlns:xx="uri"></r>');
   root.setAttributeNS('uri', 'name', 'v');
@@ -230,8 +249,17 @@ test(function () {
   root.append(document.createElement("style"));
   root.append(document.createElement("style"));
   assert_equals(serialize(root), '<img xmlns=\"http://www.w3.org/1999/xhtml\"><style></style><style></style></img>');
-}, 'Check children were included for void elements')
+}, 'Check children were included for void elements');
 
+test(function () {
+  const root = parse('<root xmlns="" xmlns:foo="urn:bar"/>');
+  root.setAttributeNS(XMLNS_URI, 'xmlns:foo', '');
+  assert_equals(serialize(root), '<root xmlns="" xmlns:foo=""/>');
+}, 'Check if a prefix bound to an empty namespace URI ("no namespace") serialize');
+
+test(function() {
+  assert_equals(serialize(document.createAttribute("foobar")), "")
+}, 'Attribute nodes are serialized as the empty string')
 </script>
  </body>
 </html>
diff --git a/tests/wpt/tests/domparsing/xml-parse-serialize-roundtrip.html b/tests/wpt/tests/domparsing/xml-parse-serialize-roundtrip.html
new file mode 100644
index 00000000000..5195b9f04b5
--- /dev/null
+++ b/tests/wpt/tests/domparsing/xml-parse-serialize-roundtrip.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://issues.chromium.org/issues/327273585">
+<link rel=help href="https://issues.chromium.org/issues/41101979">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+function runTest(xmlString, testName) {
+  test(() => {
+    const xmlDoc = (new DOMParser()).parseFromString(xmlString, 'text/xml');
+    const result = (new XMLSerializer()).serializeToString(xmlDoc);
+    assert_equals(result, xmlString);
+  }, `DOMParser and XMLSerializer should round trip with CDATA sections: ${testName}`);
+}
+
+runTest(
+  `<root><![CDATA[
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+]]></root>`,
+  'large CDATA');
+
+runTest(
+  '<root><htmlDefn><![CDATA[<div><![CDATA[  Just Rubbish Data $#$^#^$ ]]]]><![CDATA[></div><div></div>]]></htmlDefn></root>',
+  'multiple CDATAs');
+</script>
diff --git a/tests/wpt/tests/ecmascript/locale-compat.html b/tests/wpt/tests/ecmascript/locale-compat.html
index 74806987879..1f863b21ecb 100644
--- a/tests/wpt/tests/ecmascript/locale-compat.html
+++ b/tests/wpt/tests/ecmascript/locale-compat.html
@@ -44,7 +44,10 @@ test(t => { // https://bugs.chromium.org/p/chromium/issues/detail?id=1418727
 }, '`Date.prototype.toLocaleString` produces `yyyy-mm-dd` instead of `m/d/yyyy` for `en-CA` locale');
 
 test(t => { // https://bugzilla.mozilla.org/show_bug.cgi?id=1864612
-  assert_true(new Intl.DateTimeFormat('sv-SE', {}).format(0).endsWith('-01-01'));
-});
+  const date = new Date('1970-01-01T00:00:00');
+  const formatter = new Intl.DateTimeFormat('sv-SE')
+
+  assert_equals(formatter.format(date), '1970-01-01');
+}, '`Intl.DateTimeFormat.prototype.format` produces `yyyy-mm-dd` instead of `yyyy-m-d` for `sv-SE` locale');
 
 </script>
diff --git a/tests/wpt/tests/editing/crashtests/inserthorizontalrule-to-replace-selection-containing-comment.html b/tests/wpt/tests/editing/crashtests/inserthorizontalrule-to-replace-selection-containing-comment.html
new file mode 100644
index 00000000000..5db139351cd
--- /dev/null
+++ b/tests/wpt/tests/editing/crashtests/inserthorizontalrule-to-replace-selection-containing-comment.html
@@ -0,0 +1,21 @@
+<head>
+<meta charset="utf-8">
+<script>
+addEventListener("DOMContentLoaded", () => {
+  document.execCommand("selectAll");
+  document.designMode = "on";
+  document.execCommand("insertHorizontalRule");
+});
+</script>
+</head>
+<body>
+<audio></audio>
+<ins contenteditable>
+<q dir="ltr">
+<button>A</button>
+<dialog dir="rtl" open>
+<canvas></canvas>
+<fieldset>
+<!-- The following white-space is important -->
+</fieldset></dialog></q></ins></body>
+</html>
diff --git a/tests/wpt/tests/editing/include/editor-test-utils.js b/tests/wpt/tests/editing/include/editor-test-utils.js
index f88a9bac3b4..f0c4f583992 100644
--- a/tests/wpt/tests/editing/include/editor-test-utils.js
+++ b/tests/wpt/tests/editing/include/editor-test-utils.js
@@ -81,6 +81,26 @@ class EditorTestUtils {
     return this.sendKey(kArrowRight, modifier);
   }
 
+  sendMoveWordLeftKey(modifier) {
+    const kArrowLeft = "\uE012";
+    return this.sendKey(
+      kArrowLeft,
+      this.window.navigator.platform.includes("Mac")
+        ? this.kAlt
+        : this.kControl
+    );
+  }
+
+  sendMoveWordRightKey(modifier) {
+    const kArrowRight = "\uE014";
+    return this.sendKey(
+      kArrowRight,
+      this.window.navigator.platform.includes("Mac")
+        ? this.kAlt
+        : this.kControl
+    );
+  }
+
   sendHomeKey(modifier) {
     const kHome = "\uE011";
     return this.sendKey(kHome, modifier);
@@ -548,5 +568,8 @@ class EditorTestUtils {
         }) - (${EditorTestUtils.getNodeDescription(range.endContainer)}, ${range.endOffset})`;
   }
 
+  static waitForRender() {
+    return new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve)));
+  }
 
 }
diff --git a/tests/wpt/tests/editing/other/delete-at-end-boundary-of-div-followed-by-inline-element-containing-hidden-select-element-with-non-editable-node.html b/tests/wpt/tests/editing/other/delete-at-end-boundary-of-div-followed-by-inline-element-containing-hidden-select-element-with-non-editable-node.html
new file mode 100644
index 00000000000..5c362d4963f
--- /dev/null
+++ b/tests/wpt/tests/editing/other/delete-at-end-boundary-of-div-followed-by-inline-element-containing-hidden-select-element-with-non-editable-node.html
@@ -0,0 +1,48 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Delete at end boundary of div followed by inline element containing hidden
+select element with non editable node</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+</head>
+<body>
+<div contenteditable="true" id="editableDiv"><div id="first">First block</div>
+<span id="second">Second block<select style="visibility:hidden"></select></span></div>
+<script>
+"use strict";
+
+const kDeleteKey = "\uE017";
+
+function sendDeleteKey() {
+  return new test_driver.Actions()
+    .keyDown(kDeleteKey)
+    .keyUp(kDeleteKey)
+    .send();
+}
+
+promise_test(async () => {
+  const firstDiv = document.getElementById("first");
+  await new test_driver.click(document.querySelector('#first'));
+  const range = document.createRange();
+  const selection = window.getSelection();
+  range.setStart(firstDiv.firstChild, 11);
+  range.collapse(true);
+  selection.removeAllRanges();
+  selection.addRange(range);
+  await sendDeleteKey();
+  const expected= "<div id=\"first\">First blockSecond block</div>"
+    + "<span id=\"second\"><select style=\"visibility:hidden\"></select></span>";
+  assert_equals(
+    editableDiv.innerHTML,
+    expected,
+    "The test should not crash and Second block should be merged with First block"
+  );
+}, "waiting for command to execute");
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/editing/other/delete-at-start-boundary-of-div-containing-hidden-select-element-with-non-editable-node.html b/tests/wpt/tests/editing/other/delete-at-start-boundary-of-div-containing-hidden-select-element-with-non-editable-node.html
new file mode 100644
index 00000000000..0ed42e57292
--- /dev/null
+++ b/tests/wpt/tests/editing/other/delete-at-start-boundary-of-div-containing-hidden-select-element-with-non-editable-node.html
@@ -0,0 +1,48 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Delete at start boundary of div containing hidden select element
+with non editable node</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+</head>
+<body>
+<div contenteditable="true" id="editableDiv"><div id="first">First block</div>
+<div id="second">Second block<select style="visibility:hidden"></select></div></div>
+<script>
+"use strict";
+
+const kBackspaceKey = "\uE003";
+
+function sendBackspaceKey() {
+  return new test_driver.Actions()
+    .keyDown(kBackspaceKey)
+    .keyUp(kBackspaceKey)
+    .send();
+}
+
+promise_test(async () => {
+  const secondDiv = document.getElementById("second");
+  await new test_driver.click(document.querySelector('#second'));
+  const range = document.createRange();
+  const selection = window.getSelection();
+  range.setStart(secondDiv.firstChild, 0);
+  range.collapse(true);
+  selection.removeAllRanges();
+  selection.addRange(range);
+  await sendBackspaceKey();
+  const expected = "<div id=\"first\">First blockSecond block</div>"
+    + "<div id=\"second\"><select style=\"visibility:hidden\"></select></div>";
+  assert_equals(
+    editableDiv.innerHTML,
+    expected,
+    "The test should not crash and Second block should be merged with First block"
+  );
+}, "waiting for command to execute");
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/editing/other/insert-space-at-beginning-of-wrapped-line.html b/tests/wpt/tests/editing/other/insert-space-at-beginning-of-wrapped-line.html
new file mode 100644
index 00000000000..6afedff12b5
--- /dev/null
+++ b/tests/wpt/tests/editing/other/insert-space-at-beginning-of-wrapped-line.html
@@ -0,0 +1,58 @@
+<!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="/resources/testdriver-actions.js"></script>
+<script src="../include/editor-test-utils.js"></script>
+<style>
+  #textarea,
+  #plaintext,
+  #richedit {
+    font-family: "Courier", monospace;
+    width: 10ch;
+  }
+  #plaintext,
+  #richedit {
+    border: 1px solid black;
+    white-space: pre-wrap;
+  }
+</style>
+<textarea id="textarea"></textarea>
+<div id="plaintext" contenteditable="plaintext-only"></div>
+<div id="richedit" contenteditable></div>
+<script>
+  async function runInElement(element, before, after) {
+    promise_test(async () => {
+      const utils = new EditorTestUtils(element);
+      let offset = before.length;
+      let acutal;
+      if (element.tagName === "TEXTAREA") {
+        element.value = before + after;
+        element.focus();
+        element.setSelectionRange(offset, offset);
+        await utils.sendKey(" ");
+        actual = element.value;
+      } else {
+        element.textContent = before + after;
+        let textNode = element.firstChild;
+        window
+          .getSelection()
+          .setBaseAndExtent(textNode, offset, textNode, offset);
+        await utils.sendKey(" ");
+        actual = element.textContent;
+      }
+      assert_equals(actual, before + " " + after);
+    }, `Typing space at "${before}|${after}" should insert a space in ${element.id}`);
+  }
+
+  function run(before, after) {
+    runInElement(textarea, before, after);
+    runInElement(plaintext, before, after);
+    runInElement(richedit, before, after);
+  }
+  run("123456789 ", "XY");
+  run("12345     ", "XY");
+  run("12345        ", "XY");
+  run("123456789-", "XY");
+</script>
diff --git a/tests/wpt/tests/editing/other/insertparagraph-in-non-splittable-element.html b/tests/wpt/tests/editing/other/insertparagraph-in-non-splittable-element.html
index c77862fecb2..5ee72175830 100644
--- a/tests/wpt/tests/editing/other/insertparagraph-in-non-splittable-element.html
+++ b/tests/wpt/tests/editing/other/insertparagraph-in-non-splittable-element.html
@@ -42,7 +42,7 @@ const tests = [
     selector: "colgroup",
     initial: "<div><table><colgroup><col></colgroup><tbody><tr><td>abc</td></tr></tbody></table></div>",
     // <colgroup> and its table parents cannot have paragraphs nor <br>,
-    // therefore, it should be handled outside <table> or the the first cell
+    // therefore, it should be handled outside <table> or the first cell
     // in the table.
     expected: [
       "<div><table><colgroup><col></colgroup><tbody><tr><td><br>abc</td></tr></tbody></table></div>", // handled with the first cell case
diff --git a/tests/wpt/tests/editing/other/selection-change-not-fired-if-selection-set-to-root.html b/tests/wpt/tests/editing/other/selection-change-not-fired-if-selection-set-to-root.html
index 39e8b46e69b..cac621ad3cd 100644
--- a/tests/wpt/tests/editing/other/selection-change-not-fired-if-selection-set-to-root.html
+++ b/tests/wpt/tests/editing/other/selection-change-not-fired-if-selection-set-to-root.html
@@ -3,6 +3,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
+<script src="../include/editor-test-utils.js"></script>
 
 <body>
   <div contenteditable="true" id="target">
@@ -11,13 +12,13 @@
     // Selectionchange event should not get fired if the selection is already set to the beginning of the root
     promise_test(async () => {
         let selectionChangeCount = 0;
-        document.getElementById("target").focus();
-        await new Promise(resolve => step_timeout(resolve, 50));
+        const target = document.getElementById("target");
+        await new test_driver.click(target);
+        await EditorTestUtils.waitForRender();
         document.addEventListener("selectionchange", () => ++selectionChangeCount);
-        test_driver.send_keys(target, "\uE003");
-        // Waits a short time to allow any events to be processed.
-        await new Promise(resolve => step_timeout(resolve, 50));
+        await new test_driver.send_keys(target, "\uE003");
+        await EditorTestUtils.waitForRender();
         assert_equals(selectionChangeCount, 0, "Selectionchange event should not get fired");
-    }, "Selectionchange event not get fired when the selection is already set to the beginning of the root ");
+    }, "Selectionchange event should not get fired when the selection is already set to the beginning of the root ");
   </script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/editing/other/shadow_root_iteration_in_block_style.html b/tests/wpt/tests/editing/other/shadow_root_iteration_in_block_style.html
new file mode 100644
index 00000000000..2a7d8ac178e
--- /dev/null
+++ b/tests/wpt/tests/editing/other/shadow_root_iteration_in_block_style.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<script src='/resources/testdriver-vendor.js'></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+  <div id="container" contenteditable></div>
+  <div id="div" contenteditable>hello<span id="span" contenteditable style="color:red">world</span></div>
+</body>
+<script>
+  test(() => {
+    const shadowRoot = container.attachShadow({ mode: "open" });
+    shadowRoot.innerHTML =
+      `<span contenteditable>shadow root</span>`;
+    const span = document.getElementById('span');
+    const div = document.getElementById('div');
+    const range = document.createRange();
+    const selection = window.getSelection();
+    range.selectNodeContents(span);
+    selection.removeAllRanges();
+    selection.addRange(range);
+    document.execCommand("RemoveFormat");
+    assert_equals(
+      div.innerHTML,
+      'hello<span id="span" contenteditable="" style="">world</span>'
+    );
+  }, "RemoveFormat should remove CSS styles of selected node");
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/editing/whitespaces/delete-word-around-span.html b/tests/wpt/tests/editing/whitespaces/delete-word-around-span.html
new file mode 100644
index 00000000000..6250e9aec21
--- /dev/null
+++ b/tests/wpt/tests/editing/whitespaces/delete-word-around-span.html
@@ -0,0 +1,75 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="variant" content="?white-space=normal">
+<meta name="variant" content="?white-space=pre">
+<meta name="variant" content="?white-space=pre-wrap">
+<meta name="variant" content="?white-space=pre-line">
+<title>Delete per word should not change the deleting range whether the surrounding word is wrapped in an inline element</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="../include/editor-test-utils.js"></script>
+<script>
+"use strict";
+
+const searchParams = new URLSearchParams(document.location.search);
+const whiteSpace = searchParams.get("white-space");
+
+document.addEventListener("DOMContentLoaded", () => {
+  const editingHost = document.querySelector("div[contenteditable]");
+  editingHost.style.whiteSpace = whiteSpace;
+  const utils = new EditorTestUtils(editingHost);
+  /**
+   * How to delete per word may depend on the browser and the platform. On the
+   * other hand, the result (at least in the plaintext point of view) should be
+   * same even if surrounding word is wrapped in a <span>.
+   */
+  for (const data of [
+    {
+      innerHTML: `abc <span>def</span> ghi[]`,
+      referenceInnerHTML: `abc def ghi[]`,
+    },
+    {
+      innerHTML: `abc <span>def</span>[] ghi`,
+      referenceInnerHTML: `abc def[] ghi`,
+    },
+    {
+      innerHTML: `abc <span>def[]</span> ghi`,
+      referenceInnerHTML: `abc def[] ghi`,
+    },
+    {
+      innerHTML: `abc <span>[]def</span> ghi`,
+      referenceInnerHTML: `abc []def ghi`,
+    },
+    {
+      innerHTML: `abc []<span>def</span> ghi`,
+      referenceInnerHTML: `abc []def ghi`,
+    },
+    {
+      innerHTML: `abc[] <span>def</span> ghi`,
+      referenceInnerHTML: `abc[] def ghi`,
+    },
+  ]) {
+    promise_test(async () => {
+      utils.setupEditingHost(data.referenceInnerHTML);
+      await utils.sendBackspaceKey(utils.deleteWordModifier);
+      const expectedInnerText = editingHost.innerText;
+      utils.setupEditingHost(data.innerHTML);
+      await utils.sendBackspaceKey(utils.deleteWordModifier);
+      assert_equals(
+        editingHost.innerText.replaceAll("\u00A0", " "),
+        expectedInnerText.replaceAll("\u00A0", " ")
+      );
+    }, `Ctrl/Cmd - Backspace when "${data.innerHTML}" should get same innerText as when "${data.referenceInnerHTML}"`);
+  }
+}, {once: true});
+</script>
+</head>
+<body>
+  <div contenteditable></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/editing/whitespaces/forwarddelete-word-around-span.html b/tests/wpt/tests/editing/whitespaces/forwarddelete-word-around-span.html
new file mode 100644
index 00000000000..ac7cbaee186
--- /dev/null
+++ b/tests/wpt/tests/editing/whitespaces/forwarddelete-word-around-span.html
@@ -0,0 +1,75 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="variant" content="?white-space=normal">
+<meta name="variant" content="?white-space=pre">
+<meta name="variant" content="?white-space=pre-wrap">
+<meta name="variant" content="?white-space=pre-line">
+<title>Forward-delete per word should not change the deleting range whether the surrounding word is wrapped in an inline element</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="../include/editor-test-utils.js"></script>
+<script>
+"use strict";
+
+const searchParams = new URLSearchParams(document.location.search);
+const whiteSpace = searchParams.get("white-space");
+
+document.addEventListener("DOMContentLoaded", () => {
+  const editingHost = document.querySelector("div[contenteditable]");
+  editingHost.style.whiteSpace = whiteSpace;
+  const utils = new EditorTestUtils(editingHost);
+  /**
+   * How to delete per word may depend on the browser and the platform. On the
+   * other hand, the result (at least in the plaintext point of view) should be
+   * same even if surrounding word is wrapped in a <span>.
+   */
+  for (const data of [
+    {
+      innerHTML: `[]abc <span>def</span> ghi`,
+      referenceInnerHTML: `[]abc def ghi`,
+    },
+    {
+      innerHTML: `abc[] <span>def</span> ghi`,
+      referenceInnerHTML: `abc[] def ghi`,
+    },
+    {
+      innerHTML: `abc []<span>def</span> ghi`,
+      referenceInnerHTML: `abc []def ghi`,
+    },
+    {
+      innerHTML: `abc <span>[]def</span> ghi`,
+      referenceInnerHTML: `abc []def ghi`,
+    },
+    {
+      innerHTML: `abc <span>def</span>[] ghi`,
+      referenceInnerHTML: `abc def[] ghi`,
+    },
+    {
+      innerHTML: `abc <span>def</span> []ghi`,
+      referenceInnerHTML: `abc def []ghi`,
+    },
+  ]) {
+    promise_test(async () => {
+      utils.setupEditingHost(data.referenceInnerHTML);
+      await utils.sendDeleteKey(utils.deleteWordModifier);
+      const expectedInnerText = editingHost.innerText;
+      utils.setupEditingHost(data.innerHTML);
+      await utils.sendDeleteKey(utils.deleteWordModifier);
+      assert_equals(
+        editingHost.innerText.replaceAll("\u00A0", " "),
+        expectedInnerText.replaceAll("\u00A0", " ")
+      );
+    }, `Ctrl/Cmd - Delete when "${data.innerHTML}" should get same innerText as when "${data.referenceInnerHTML}"`);
+  }
+}, {once: true});
+</script>
+</head>
+<body>
+  <div contenteditable></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/element-timing/resources/element-timing-helpers.js b/tests/wpt/tests/element-timing/resources/element-timing-helpers.js
index 2c1bd195ea7..5ff01bfa120 100644
--- a/tests/wpt/tests/element-timing/resources/element-timing-helpers.js
+++ b/tests/wpt/tests/element-timing/resources/element-timing-helpers.js
@@ -19,7 +19,7 @@ function checkElementInternal(entry, expectedUrl, expectedIdentifier, expectedID
   assert_greater_than_equal(entry.paintTime, beforeRender, 'paintTime should represent the time when the UA started painting');
 
   // PaintTimingMixin
-  if ("presentationTime" in entry) {
+  if ("presentationTime" in entry && entry.presentationTime !== null) {
     assert_greater_than(entry.presentationTime, entry.paintTime);
     assert_equals(entry.presentationTime, entry.renderTime);
   } else {
diff --git a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-destroy-persistent-license.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-destroy-persistent-license.https.html
deleted file mode 100644
index 2fb1db4dccf..00000000000
--- a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-destroy-persistent-license.https.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>Encrypted Media Extensions: persistent-license, playback, destroy license with Clear Key, mp4</title>
-    <link rel="help" href="https://w3c.github.io/encrypted-media/">
-
-    <!-- Web Platform Test Harness scripts -->
-    <script src=/resources/testharness.js></script>
-    <script src=/resources/testharnessreport.js></script>
-
-    <!-- Helper scripts for Encrypted Media Extensions tests  -->
-    <script src=/encrypted-media/util/utils.js></script>
-    <script src=/encrypted-media/util/testmediasource.js></script>
-    <script src=/encrypted-media/util/utf8.js></script>
-
-    <!-- Content metadata -->
-    <script src=/encrypted-media/content/content-metadata.js></script>
-
-    <!-- Message handler for Clear Key keysystem -->
-    <script src=/encrypted-media/util/clearkey-messagehandler.js></script>
-
-    <!-- The script for this specific test -->
-    <script src=/encrypted-media/scripts/playback-destroy-persistent-license.js></script>
-
-  </head>
-  <body>
-    <div id='log'></div>
-
-    <div id='video'>
-      <video id="videoelement" width="200px"></video>
-    </div>
-
-    <script>
-        var contentitem = content['mp4-basic'],
-            handler = new MessageHandler( 'org.w3.clearkey', contentitem ),
-            config = {  video:              document.getElementById('videoelement'),
-                        keysystem:          'org.w3.clearkey',
-                        messagehandler:     handler.messagehandler,
-                        audioPath:          contentitem.audio.path,
-                        videoPath:          contentitem.video.path,
-                        audioType:          contentitem.audio.type,
-                        videoType:          contentitem.video.type,
-                        initDataType:       'keyids',
-                        initData:           getInitData(contentitem,'keyids')
-                    };
-
-        runTest(config);
-    </script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-license-events.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-license-events.https.html
deleted file mode 100644
index 66720946d4b..00000000000
--- a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-license-events.https.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>Encrypted Media Extensions: Successful Playback, persistent-license session with Clear Key, mp4, event sequence</title>
-    <link rel="help" href="https://w3c.github.io/encrypted-media/">
-
-    <!-- Web Platform Test Harness scripts -->
-    <script src=/resources/testharness.js></script>
-    <script src=/resources/testharnessreport.js></script>
-
-    <!-- Helper scripts for Encrypted Media Extensions tests  -->
-    <script src=/encrypted-media/util/utils.js></script>
-    <script src=/encrypted-media/util/testmediasource.js></script>
-    <script src=/encrypted-media/util/utf8.js></script>
-
-    <!-- Content metadata -->
-    <script src=/encrypted-media/content/content-metadata.js></script>
-
-    <!-- Message handler for Clear Key keysystem -->
-    <script src=/encrypted-media/util/clearkey-messagehandler.js></script>
-
-    <!-- The script for this specific test -->
-    <script src=/encrypted-media/scripts/playback-persistent-license-events.js></script>
-
-  </head>
-  <body>
-    <div id='log'></div>
-
-    <div id='video'>
-      <video id="videoelement" width="200px"></video>
-    </div>
-
-    <script>
-        var contentitem = content['mp4-basic'],
-            handler = new MessageHandler( 'org.w3.clearkey', contentitem ),
-            config = {  video:              document.getElementById('videoelement'),
-                        keysystem:          'org.w3.clearkey',
-                        messagehandler:     handler.messagehandler,
-                        audioPath:          contentitem.audio.path,
-                        videoPath:          contentitem.video.path,
-                        audioType:          contentitem.audio.type,
-                        videoType:          contentitem.video.type,
-                        initDataType:       'keyids',
-                        initData:           getInitData(contentitem,'keyids')
-                    };
-
-        runTest(config);
-    </script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-license.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-license.https.html
deleted file mode 100644
index b65cf5337ff..00000000000
--- a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-license.https.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>Encrypted Media Extensions: Successful Playback, persistent-license session with Clear Key, mp4</title>
-    <link rel="help" href="https://w3c.github.io/encrypted-media/">
-
-    <!-- Web Platform Test Harness scripts -->
-    <script src=/resources/testharness.js></script>
-    <script src=/resources/testharnessreport.js></script>
-
-    <!-- Helper scripts for Encrypted Media Extensions tests  -->
-    <script src=/encrypted-media/util/utils.js></script>
-    <script src=/encrypted-media/util/testmediasource.js></script>
-    <script src=/encrypted-media/util/utf8.js></script>
-
-    <!-- Content metadata -->
-    <script src=/encrypted-media/content/content-metadata.js></script>
-
-    <!-- Message handler for Clear Key keysystem -->
-    <script src=/encrypted-media/util/clearkey-messagehandler.js></script>
-
-    <!-- The script for this specific test -->
-    <script src=/encrypted-media/scripts/playback-persistent-license.js></script>
-
-  </head>
-  <body>
-    <div id='log'></div>
-
-    <div id='video'>
-      <video id="videoelement" width="200px"></video>
-    </div>
-
-    <script>
-        var contentitem = content['mp4-basic'],
-            handler = new MessageHandler( 'org.w3.clearkey', contentitem ),
-            config = {  video:              document.getElementById('videoelement'),
-                        keysystem:          'org.w3.clearkey',
-                        messagehandler:     handler.messagehandler,
-                        audioPath:          contentitem.audio.path,
-                        videoPath:          contentitem.video.path,
-                        audioType:          contentitem.audio.type,
-                        videoType:          contentitem.video.type,
-                        initDataType:       'keyids',
-                        initData:           getInitData(contentitem,'keyids')
-                       };
-
-        runTest(config);
-    </script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-usage-record-events.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-usage-record-events.https.html
deleted file mode 100644
index 11b3e8f15ce..00000000000
--- a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-usage-record-events.https.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>Encrypted Media Extensions: Successful Playback, persistent-usage-record session with Clear Key, mp4, event sequence</title>
-    <link rel="help" href="https://w3c.github.io/encrypted-media/">
-
-    <!-- Web Platform Test Harness scripts -->
-    <script src=/resources/testharness.js></script>
-    <script src=/resources/testharnessreport.js></script>
-
-    <!-- Helper scripts for Encrypted Media Extensions tests  -->
-    <script src=/encrypted-media/util/utils.js></script>
-    <script src=/encrypted-media/util/testmediasource.js></script>
-    <script src=/encrypted-media/util/utf8.js></script>
-
-    <!-- Content metadata -->
-    <script src=/encrypted-media/content/content-metadata.js></script>
-
-    <!-- Message handler for Clear Key keysystem -->
-    <script src=/encrypted-media/util/clearkey-messagehandler.js></script>
-
-    <!-- The script for this specific test -->
-    <script src=/encrypted-media/scripts/playback-persistent-usage-record-events.js></script>
-
-  </head>
-  <body>
-    <div id='log'></div>
-
-    <div id='video'>
-      <video id="videoelement" width="200px"></video>
-    </div>
-
-    <script>
-        var contentitem = content['mp4-basic'],
-            handler = new MessageHandler( 'org.w3.clearkey', contentitem ),
-            config = {  video:              document.getElementById('videoelement'),
-                        keysystem:          'org.w3.clearkey',
-                        messagehandler:     handler.messagehandler,
-                        audioPath:          contentitem.audio.path,
-                        videoPath:          contentitem.video.path,
-                        audioType:          contentitem.audio.type,
-                        videoType:          contentitem.video.type,
-                        initDataType:       'keyids',
-                        initData:           getInitData(contentitem,'keyids')
-                      };
-
-        runTest(config);
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-usage-record.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-usage-record.https.html
deleted file mode 100644
index 3f0d55e4138..00000000000
--- a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-usage-record.https.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>Encrypted Media Extensions: Successful Playback, persistent-usage-record session with Clear Key, mp4, event sequence</title>
-    <link rel="help" href="https://w3c.github.io/encrypted-media/">
-
-    <!-- Web Platform Test Harness scripts -->
-    <script src=/resources/testharness.js></script>
-    <script src=/resources/testharnessreport.js></script>
-
-    <!-- Helper scripts for Encrypted Media Extensions tests  -->
-    <script src=/encrypted-media/util/utils.js></script>
-    <script src=/encrypted-media/util/testmediasource.js></script>
-    <script src=/encrypted-media/util/utf8.js></script>
-
-    <!-- Content metadata -->
-    <script src=/encrypted-media/content/content-metadata.js></script>
-
-    <!-- Message handler for Clear Key keysystem -->
-    <script src=/encrypted-media/util/clearkey-messagehandler.js></script>
-
-    <!-- The script for this specific test -->
-    <script src=/encrypted-media/scripts/playback-persistent-usage-record.js></script>
-
-  </head>
-  <body>
-    <div id='log'></div>
-
-    <div id='video'>
-      <video id="videoelement" width="200px"></video>
-    </div>
-
-    <script>
-        var contentitem = content['mp4-basic'],
-            handler = new MessageHandler( 'org.w3.clearkey', contentitem ),
-            config = {  video:              document.getElementById('videoelement'),
-                        keysystem:          'org.w3.clearkey',
-                        messagehandler:     handler.messagehandler,
-                        audioPath:          contentitem.audio.path,
-                        videoPath:          contentitem.video.path,
-                        audioType:          contentitem.audio.type,
-                        videoType:          contentitem.video.type,
-                        initDataType:       'keyids',
-                        initData:           getInitData(contentitem,'keyids')
-                       };
-
-        runTest(config);
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-retrieve-destroy-persistent-license.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-retrieve-destroy-persistent-license.https.html
deleted file mode 100644
index c8838d2b7dc..00000000000
--- a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-retrieve-destroy-persistent-license.https.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>Encrypted Media Extensions: persistent-license, playback, retrieve, playback and destroy with Clear Key, mp4</title>
-    <link rel="help" href="https://w3c.github.io/encrypted-media/">
-
-    <!-- Web Platform Test Harness scripts -->
-    <script src=/resources/testharness.js></script>
-    <script src=/resources/testharnessreport.js></script>
-
-    <!-- Helper scripts for Encrypted Media Extensions tests  -->
-    <script src=/encrypted-media/util/utils.js></script>
-    <script src=/encrypted-media/util/testmediasource.js></script>
-    <script src=/encrypted-media/util/utf8.js></script>
-
-    <!-- Content metadata -->
-    <script src=/encrypted-media/content/content-metadata.js></script>
-
-    <!-- Message handler for Clear Key keysystem -->
-    <script src=/encrypted-media/util/clearkey-messagehandler.js></script>
-
-    <!-- The script for this specific test -->
-    <script src=/encrypted-media/scripts/playback-retrieve-persistent-license.js></script>
-
-  </head>
-  <body>
-    <div id='log'></div>
-
-    <div id='video'>
-      <video id="videoelement" width="200px"></video>
-    </div>
-
-    <script>
-        var contentitem = content['mp4-basic'],
-            handler = new MessageHandler( 'org.w3.clearkey', contentitem ),
-            config = {  video:              document.getElementById('videoelement'),
-                        keysystem:          'org.w3.clearkey',
-                        messagehandler:     handler.messagehandler,
-                        audioPath:          contentitem.audio.path,
-                        videoPath:          contentitem.video.path,
-                        audioType:          contentitem.audio.type,
-                        videoType:          contentitem.video.type,
-                        initDataType:       'keyids',
-                        initData:           getInitData(contentitem,'keyids'),
-                        windowscript:       'resources/clearkey-retrieve-destroy-persistent-license.html',
-                        testcase:           'playback, retrieve, playback and destroy' };
-
-        runTest(config);
-    </script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.https.html
deleted file mode 100644
index 072b885d21e..00000000000
--- a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.https.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>Encrypted Media Extensions: persistent-license playback, retrieve and playback with Clear Key, mp4</title>
-    <link rel="help" href="https://w3c.github.io/encrypted-media/">
-
-    <!-- Web Platform Test Harness scripts -->
-    <script src=/resources/testharness.js></script>
-    <script src=/resources/testharnessreport.js></script>
-
-    <!-- Helper scripts for Encrypted Media Extensions tests  -->
-    <script src=/encrypted-media/util/utils.js></script>
-    <script src=/encrypted-media/util/testmediasource.js></script>
-    <script src=/encrypted-media/util/utf8.js></script>
-
-    <!-- Content metadata -->
-    <script src=/encrypted-media/content/content-metadata.js></script>
-
-    <!-- Message handler for Clear Key keysystem -->
-    <script src=/encrypted-media/util/clearkey-messagehandler.js></script>
-
-    <!-- The script for this specific test -->
-    <script src=/encrypted-media/scripts/playback-retrieve-persistent-license.js></script>
-
-  </head>
-  <body>
-    <div id='log'></div>
-
-    <div id='video'>
-      <video id="videoelement" width="200px"></video>
-    </div>
-
-    <script>
-        var contentitem = content['mp4-basic'],
-            handler = new MessageHandler( 'org.w3.clearkey', contentitem ),
-            config = {  video:              document.getElementById('videoelement'),
-                        keysystem:          'org.w3.clearkey',
-                        messagehandler:     handler.messagehandler,
-                        audioPath:          contentitem.audio.path,
-                        videoPath:          contentitem.video.path,
-                        audioType:          contentitem.audio.type,
-                        videoType:          contentitem.video.type,
-                        initDataType:       'keyids',
-                        initData:           getInitData(contentitem,'keyids'),
-                        windowscript:       'resources/clearkey-retrieve-persistent-license.html',
-                        testcase:           'playback, retrieve and playback' };
-
-        runTest(config);
-    </script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-usage-record.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-usage-record.https.html
deleted file mode 100644
index 63e792c2987..00000000000
--- a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-usage-record.https.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>Encrypted Media Extensions: persistent-usage-record, playback and retrieve record in new window, Clear Key, mp4</title>
-    <link rel="help" href="https://w3c.github.io/encrypted-media/">
-
-    <!-- Web Platform Test Harness scripts -->
-    <script src=/resources/testharness.js></script>
-    <script src=/resources/testharnessreport.js></script>
-
-    <!-- Helper scripts for Encrypted Media Extensions tests  -->
-    <script src=/encrypted-media/util/utils.js></script>
-    <script src=/encrypted-media/util/testmediasource.js></script>
-    <script src=/encrypted-media/util/utf8.js></script>
-
-    <!-- Content metadata -->
-    <script src=/encrypted-media/content/content-metadata.js></script>
-
-    <!-- Message handler for Clear Key keysystem -->
-    <script src=/encrypted-media/util/clearkey-messagehandler.js></script>
-
-    <!-- The script for this specific test -->
-    <script src=/encrypted-media/scripts/playback-retrieve-persistent-usage-record.js></script>
-
-  </head>
-  <body>
-    <div id='log'></div>
-
-    <div id='video'>
-      <video id="videoelement" width="200px"></video>
-    </div>
-
-    <script>
-        var contentitem = content['mp4-basic'],
-            handler = new MessageHandler( 'org.w3.clearkey', contentitem ),
-            config = {  video:              document.getElementById('videoelement'),
-                        keysystem:          'org.w3.clearkey',
-                        messagehandler:     handler.messagehandler,
-                        audioPath:          contentitem.audio.path,
-                        videoPath:          contentitem.video.path,
-                        audioType:          contentitem.audio.type,
-                        videoType:          contentitem.video.type,
-                        initDataType:       'keyids',
-                        initData:           getInitData(contentitem,'keyids'),
-                        windowscript:       'resources/retrieve-persistent-usage-record.html' };
-
-        runTest(config);
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-multisession.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-multisession.https.html
index b64befda178..bbf7777ade8 100644
--- a/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-multisession.https.html
+++ b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-multisession.https.html
@@ -2,6 +2,7 @@
 <html>
   <head>
     <meta charset=utf-8>
+    <meta name="timeout" content="long">
     <title>Encrypted Media Extensions: Successful Playback, Temporary session with Clear Key, mp4, multiple keys in sequence</title>
     <link rel="help" href="https://w3c.github.io/encrypted-media/">
 
diff --git a/tests/wpt/tests/encrypted-media/drm-mp4-playback-persistent-usage-record-events.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-persistent-usage-record-events.https.html
deleted file mode 100644
index 5cbb8021b07..00000000000
--- a/tests/wpt/tests/encrypted-media/drm-mp4-playback-persistent-usage-record-events.https.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <meta name="timeout" content="long">
-    <title>Encrypted Media Extensions: Successful Playback, persistent-usage-record session with DRM, mp4, event sequence</title>
-    <link rel="help" href="https://w3c.github.io/encrypted-media/">
-
-    <!-- Web Platform Test Harness scripts -->
-    <script src=/resources/testharness.js></script>
-    <script src=/resources/testharnessreport.js></script>
-
-    <!-- Helper scripts for Encrypted Media Extensions tests  -->
-    <script src=/encrypted-media/util/utils.js></script>
-    <script src=/encrypted-media/util/testmediasource.js></script>
-    <script src=/encrypted-media/util/utf8.js></script>
-
-    <!-- Content metadata -->
-    <script src=/encrypted-media/content/content-metadata.js></script>
-
-    <!-- Message handler for DRM servers -->
-    <script src=/encrypted-media/util/drm-messagehandler.js></script>
-
-    <!-- The script for this specific test -->
-    <script src=/encrypted-media/scripts/playback-persistent-usage-record-events.js></script>
-
-  </head>
-  <body>
-    <div id='log'></div>
-
-    <div id='video'>
-      <video id="videoelement" width="200px"></video>
-    </div>
-
-    <script>
-        var keysystem = getSupportedKeySystem(),
-            contentitem = content['mp4-basic'],
-            handler = new MessageHandler( keysystem, contentitem, 'persistent-usage-record' ),
-            config = {  video:                  document.getElementById('videoelement'),
-                        keysystem:              keysystem,
-                        messagehandler:         handler.messagehandler,
-                        audioPath:              contentitem.audio.path,
-                        videoPath:              contentitem.video.path,
-                        audioType:              contentitem.audio.type,
-                        videoType:              contentitem.video.type,
-                        initDataType:           contentitem.initDataType,
-                        servercertificate:      handler.servercertificate
-                      };
-
-        runTest(config);
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/tests/encrypted-media/drm-mp4-playback-persistent-usage-record.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-persistent-usage-record.https.html
deleted file mode 100644
index 69876be9892..00000000000
--- a/tests/wpt/tests/encrypted-media/drm-mp4-playback-persistent-usage-record.https.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <meta name="timeout" content="long">
-    <title>Encrypted Media Extensions: Successful Playback, persistent-usage-record session with DRM, mp4</title>
-    <link rel="help" href="https://w3c.github.io/encrypted-media/">
-
-    <!-- Web Platform Test Harness scripts -->
-    <script src=/resources/testharness.js></script>
-    <script src=/resources/testharnessreport.js></script>
-
-    <!-- Helper scripts for Encrypted Media Extensions tests  -->
-    <script src=/encrypted-media/util/utils.js></script>
-    <script src=/encrypted-media/util/testmediasource.js></script>
-    <script src=/encrypted-media/util/utf8.js></script>
-
-    <!-- Content metadata -->
-    <script src=/encrypted-media/content/content-metadata.js></script>
-
-    <!-- Message handler for DRM servers -->
-    <script src=/encrypted-media/util/drm-messagehandler.js></script>
-
-    <!-- The script for this specific test -->
-    <script src=/encrypted-media/scripts/playback-persistent-usage-record.js></script>
-
-  </head>
-  <body>
-    <div id='log'></div>
-
-    <div id='video'>
-      <video id="videoelement" width="200px"></video>
-    </div>
-
-    <script>
-        var keysystem = getSupportedKeySystem(),
-            contentitem = content['mp4-basic'],
-            handler = new MessageHandler( keysystem, contentitem, 'persistent-usage-record' ),
-            config = {  video:                  document.getElementById('videoelement'),
-                        keysystem:              keysystem,
-                        messagehandler:         handler.messagehandler,
-                        audioPath:              contentitem.audio.path,
-                        videoPath:              contentitem.video.path,
-                        audioType:              contentitem.audio.type,
-                        videoType:              contentitem.video.type,
-                        initDataType:           contentitem.initDataType,
-                        servercertificate:      handler.servercertificate
-                      };
-
-        runTest(config);
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/tests/encrypted-media/drm-mp4-playback-retrieve-persistent-usage-record.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-retrieve-persistent-usage-record.https.html
deleted file mode 100644
index 4059bff0cfc..00000000000
--- a/tests/wpt/tests/encrypted-media/drm-mp4-playback-retrieve-persistent-usage-record.https.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <meta name="timeout" content="long">
-    <title>Encrypted Media Extensions: persistent-usage-record, playback and retrieve record in new window,  DRM, mp4</title>
-    <link rel="help" href="https://w3c.github.io/encrypted-media/">
-
-    <!-- Web Platform Test Harness scripts -->
-    <script src=/resources/testharness.js></script>
-    <script src=/resources/testharnessreport.js></script>
-
-    <!-- Helper scripts for Encrypted Media Extensions tests  -->
-    <script src=/encrypted-media/util/utils.js></script>
-    <script src=/encrypted-media/util/testmediasource.js></script>
-    <script src=/encrypted-media/util/utf8.js></script>
-
-    <!-- Content metadata -->
-    <script src=/encrypted-media/content/content-metadata.js></script>
-
-    <!-- Message handler for DRM server -->
-    <script src=/encrypted-media/util/drm-messagehandler.js></script>
-
-    <!-- The script for this specific test -->
-    <script src=/encrypted-media/scripts/playback-retrieve-persistent-usage-record.js></script>
-
-  </head>
-  <body>
-    <div id='log'></div>
-
-    <div id='video'>
-      <video id="videoelement" width="200px"></video>
-    </div>
-
-    <script>
-        var keysystem = getSupportedKeySystem(),
-            contentitem = content['mp4-basic'],
-            handler = new MessageHandler( keysystem, contentitem, 'persistent-usage-record' ),
-            config = {  video:                  document.getElementById('videoelement'),
-                        keysystem:              keysystem,
-                        messagehandler:         handler.messagehandler,
-                        audioPath:              contentitem.audio.path,
-                        videoPath:              contentitem.video.path,
-                        audioType:              contentitem.audio.type,
-                        videoType:              contentitem.video.type,
-                        initDataType:           contentitem.initDataType,
-                        servercertificate:      handler.servercertificate,
-                        windowscript:           'resources/drm-retrieve-persistent-usage-record.html' };
-
-        runTest(config);
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-playduration-keystatus.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-playduration-keystatus.https.html
similarity index 100%
rename from tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-playduration-keystatus.html
rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-playduration-keystatus.https.html
diff --git a/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-playduration.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-playduration.https.html
similarity index 100%
rename from tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-playduration.html
rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-playduration.https.html
diff --git a/tests/wpt/tests/encrypted-media/polyfill/cast-polyfill.js b/tests/wpt/tests/encrypted-media/polyfill/cast-polyfill.js
index 576e0ad0406..0c6b47b5cd0 100644
--- a/tests/wpt/tests/encrypted-media/polyfill/cast-polyfill.js
+++ b/tests/wpt/tests/encrypted-media/polyfill/cast-polyfill.js
@@ -29,13 +29,8 @@
             return this._mediaKeys.setServerCertificate( certificate );
         };
 
-        MediaKeys.prototype.createSession = function createSession( sessionType ) {
-
-            if ( sessionType === 'persistent-usage-record' )
-            {
-                return cast.receiver.eme.KeySession.createSession( this._mediaKeys, 'persistent-release-message' );
-            }
-
+        MediaKeys.prototype.createSession = function createSession( sessionType )
+        {
             return this._mediaKeys.createSession( sessionType );
         };
 
diff --git a/tests/wpt/tests/encrypted-media/polyfill/clearkey-polyfill.js b/tests/wpt/tests/encrypted-media/polyfill/clearkey-polyfill.js
index 057ea3e0301..c21a4e8becf 100644
--- a/tests/wpt/tests/encrypted-media/polyfill/clearkey-polyfill.js
+++ b/tests/wpt/tests/encrypted-media/polyfill/clearkey-polyfill.js
@@ -79,38 +79,16 @@
         this._mediaKeys = mediaKeys;
         this._sessions = [ ];
         this._videoelement = undefined;
-        this._onTimeUpdateListener = MediaKeysProxy.prototype._onTimeUpdate.bind( this );
     }
 
     MediaKeysProxy.prototype._setVideoElement = function _setVideoElement( videoElement )
     {
         if ( videoElement !== this._videoelement )
         {
-            if ( this._videoelement )
-            {
-                this._videoelement.removeEventListener( 'timeupdate', this._onTimeUpdateListener );
-            }
-
             this._videoelement = videoElement;
-
-            if ( this._videoelement )
-            {
-                this._videoelement.addEventListener( 'timeupdate', this._onTimeUpdateListener );
-            }
         }
     };
 
-    MediaKeysProxy.prototype._onTimeUpdate = function( event )
-    {
-        this._sessions.forEach( function( session  ) {
-
-            if ( session._sessionType === 'persistent-usage-record' )
-            {
-                session._onTimeUpdate( event );
-            }
-
-        } );
-    };
 
     MediaKeysProxy.prototype._removeSession = function _removeSession( session )
     {
@@ -209,13 +187,6 @@
         }
     };
 
-    MediaKeySessionProxy.prototype._onTimeUpdate = function _onTimeUpdate( event )
-    {
-        if ( !this._firstTime ) this._firstTime = Date.now();
-        this._latestTime = Date.now();
-        this._store();
-    };
-
     MediaKeySessionProxy.prototype._queueMessage = function _queueMessage( messageType, message )
     {
         setTimeout( function() {
@@ -234,18 +205,7 @@
 
     MediaKeySessionProxy.prototype._store = function _store()
     {
-        var data;
-
-        if ( this._sessionType === 'persistent-usage-record' )
-        {
-            data = { kids: this._kids };
-            if ( this._firstTime ) data.firstTime = this._firstTime;
-            if ( this._latestTime ) data.latestTime = this._latestTime;
-        }
-        else
-        {
-            data = { keys: this._keys };
-        }
+        var data = { keys: this._keys };
 
         window.localStorage.setItem( _storageKey( this._sessionId ), JSON.stringify( data ) );
     };
@@ -260,18 +220,8 @@
             return false;
         }
 
-        if ( data.kids )
-        {
-            this._sessionType = 'persistent-usage-record';
-            this._keys = data.kids.map( function( kid ) { return { kid: kid }; } );
-            if ( data.firstTime ) this._firstTime = data.firstTime;
-            if ( data.latestTime ) this._latestTime = data.latestTime;
-        }
-        else
-        {
-            this._sessionType = 'persistent-license';
-            this._keys = data.keys;
-        }
+        this._sessionType = 'persistent-license';
+        this._keys = data.keys;
 
         return true;
     };
@@ -312,30 +262,16 @@
 
                 this._sessionId = sessionId;
 
-                if ( this._sessionType === 'persistent-usage-record' )
-                {
-                    var msg = { kids: this._kids };
-                    if ( this._firstTime ) msg.firstTime = this._firstTime;
-                    if ( this._latestTime ) msg.latestTime = this._latestTime;
 
-                    this._queueMessage( 'license-release', msg );
+                this._createSession();
 
-                    this._state = 'removing';
+                this._state = 'loading';
+                this._loaded = resolve;
+                this._loadfailed = reject;
 
-                    resolve( true );
-                }
-                else
-                {
-                    this._createSession();
+                var initData = { kids: this._kids };
 
-                    this._state = 'loading';
-                    this._loaded = resolve;
-                    this._loadfailed = reject;
-
-                    var initData = { kids: this._kids };
-
-                    this._session.generateRequest( 'keyids', toUtf8( initData ) );
-                }
+                this._session.generateRequest( 'keyids', toUtf8( initData ) );
             }
             catch( error )
             {
@@ -417,12 +353,6 @@
 
             var msg = { kids: this._kids };
 
-            if ( this._sessionType === 'persistent-usage-record' )
-            {
-                if ( this._firstTime ) msg.firstTime = this._firstTime;
-                if ( this._latestTime ) msg.latestTime = this._latestTime;
-            }
-
             this._queueMessage( 'license-release', msg );
 
         }.bind( this ) )
@@ -496,8 +426,7 @@
     function is_persistent_configuration( configuration )
     {
         return configuration.sessionTypes &&
-                ( configuration.sessionTypes.indexOf( 'persistent-usage-record' ) !== -1
-                || configuration.sessionTypes.indexOf( 'persistent-license' ) !== -1 );
+                ( configuration.sessionTypes.indexOf( 'persistent-license' ) !== -1 );
     }
 
     function copy_configuration( src )
diff --git a/tests/wpt/tests/encrypted-media/polyfill/edge-persistent-usage-record.js b/tests/wpt/tests/encrypted-media/polyfill/edge-persistent-usage-record.js
deleted file mode 100644
index 7f86f0c0589..00000000000
--- a/tests/wpt/tests/encrypted-media/polyfill/edge-persistent-usage-record.js
+++ /dev/null
@@ -1,193 +0,0 @@
-(function() {
-
-    // This polyfill fixes the following problems with Edge browser
-    // (1) To retrieve a persisted usage record, you must use session type 'persistent-release-message' instead of 'persistent-usage-record'
-    // (2) To retrieve a persisted usage record, you must call remove() after calling load()
-    // (3) On providing a license release acknowledgement, the session does not automatically close as is should
-    // (4) Retrieval of the usage record at the end of an active session is not supported
-
-    if ( navigator.userAgent.toLowerCase().indexOf('edge') > -1 ) {
-
-        var _mediaKeySystemAccessCreateMediaKeys = MediaKeySystemAccess.prototype.createMediaKeys;
-            _mediaKeysCreateSession = MediaKeys.prototype.createSession;
-
-        // MediaKeySession proxy
-        function MediaKeySession( mediaKeys, session )
-        {
-            EventTarget.call( this );
-
-            this._mediaKeys = mediaKeys;
-            this._session = session;
-            this._sessionId = undefined;
-            this._removing = false;
-
-            session.addEventListener( 'message', this.dispatchEvent.bind( this ) );
-            session.addEventListener( 'keystatuseschange', this.dispatchEvent.bind( this ) );
-            session.closed.then( function() { if ( !this._removing ) this._resolveClosed(); }.bind ( this ) );
-
-            this._closed = new Promise( function( resolve ) { this._resolveClosed = resolve; }.bind( this ) );
-        }
-
-        MediaKeySession.prototype = Object.create( EventTarget.prototype );
-
-        Object.defineProperties( MediaKeySession.prototype, {
-            sessionId:  { get: function() { return this._sessionId ? this._sessionId : this._session.sessionId; } },
-            expiration: { get: function() { return this._session.expiration; } },
-            closed:     { get: function() { return this._closed; } },
-            keyStatuses:{ get: function() { return this._session.keyStatuses; } }
-        });
-
-        // load()
-        //
-        // Use a surrogate 'persistent-release-message' session to obtain the release message
-        //
-        MediaKeySession.prototype.load = function load( sessionId )
-        {
-            if ( this.sessionId ) return Promise.reject( new DOMException('InvalidAccessError') );
-
-            this._surrogate = this._mediaKeys.createSession( 'persistent-release-message' );
-            this._surrogate.addEventListener( 'message', this.dispatchEvent.bind( this ) );
-
-            return this._surrogate.load( sessionId ).then( function( success ) {
-                if (!success) return false;
-
-                this._sessionId = sessionId;
-                this._removing = true;
-                this._session.close();
-
-                return this._surrogate.remove().then( function() { return true; } );
-            }.bind( this ) );
-        };
-
-        // remove()
-        //
-        // On an existing session, use a surrogate 'persistent-release-message' session to obtain the release message
-        //
-        MediaKeySession.prototype.remove = function remove()
-        {
-            if ( this._sessionId !== undefined ) return Promise.reject( new DOMException('InvalidAccessError') );
-            if ( this.sessionId === undefined ) return Promise.reject( new DOMException('InvalidAccessError') );
-
-            this._surrogate = this._mediaKeys.createSession( 'persistent-release-message' );
-            this._surrogate.addEventListener( 'message', this.dispatchEvent.bind( this ) );
-            this._removing = true;
-            this._sessionId = this._session.sessionId;
-
-            var self = this;
-
-            return Promise.all( [ self._session.close(), self._session.closed ] ).then( function() {
-                return self._surrogate.load( self._sessionId );
-            }).then( function( success ) {
-                if ( !success ) {
-                    throw new DOMException('InvalidAccessError');
-                }
-
-                return self._surrogate.remove();
-            }).then( function() { return true; } );
-        }
-
-        // update()
-        //
-        // For a normal session, pass through, otherwise update the surrogate and close the proxy
-        MediaKeySession.prototype.update = function update( message )
-        {
-            if ( !this._removing ) return this._session.update( message );
-
-            return this._surrogate.update( message ).then( function() {
-                this._sessionId = undefined;
-                this._resolveClosed();
-            }.bind( this ) );
-        };
-
-        // close() - pass through
-        //
-        MediaKeySession.prototype.close = function close()
-        {
-            if ( !this._removing ) return this._session.close();
-            this._resolveClosed();
-            return Promise.resolve();
-        };
-
-        // generateRequest() - pass through
-        //
-        MediaKeySession.prototype.generateRequest = function generateRequest( initDataType, initData )
-        {
-            if ( this.sessionId ) Promise.reject( new DOMException('InvalidAccessError') );
-            return this._session.generateRequest( initDataType, initData );
-        };
-
-        // Wrap PlayReady persistent-usage-record sessions in our Proxy
-        MediaKeys.prototype.createSession = function createSession( sessionType ) {
-
-            var session = _mediaKeysCreateSession.call( this, sessionType );
-            if ( this._keySystem !== 'com.microsoft.playready' || sessionType !== 'persistent-usage-record' )
-            {
-                return session;
-            }
-
-            return new MediaKeySession( this, session );
-
-        };
-
-        //
-        // Annotation polyfills - annotate not otherwise available data
-        //
-
-        // Annotate MediaKeys with the keysystem
-        MediaKeySystemAccess.prototype.createMediaKeys = function createMediaKeys()
-        {
-            return _mediaKeySystemAccessCreateMediaKeys.call( this ).then( function( mediaKeys ) {
-                mediaKeys._keySystem = this.keySystem;
-                return mediaKeys;
-            }.bind( this ) );
-        };
-
-        //
-        // Utilities
-        //
-
-        // Allow us to modify the target of Events
-        Object.defineProperties( Event.prototype, {
-            target: {   get: function() { return this._target || this.currentTarget; },
-                        set: function( newtarget ) { this._target = newtarget; } }
-        } );
-
-        // Make an EventTarget base class
-        function EventTarget(){
-            this.listeners = {};
-        };
-
-        EventTarget.prototype.listeners = null;
-
-        EventTarget.prototype.addEventListener = function(type, callback){
-            if(!(type in this.listeners)) {
-            this.listeners[type] = [];
-            }
-            this.listeners[type].push(callback);
-        };
-
-        EventTarget.prototype.removeEventListener = function(type, callback){
-            if(!(type in this.listeners)) {
-                return;
-            }
-            var stack = this.listeners[type];
-            for(var i = 0, l = stack.length; i < l; i++){
-                if(stack[i] === callback){
-                    stack.splice(i, 1);
-                    return this.removeEventListener(type, callback);
-                }
-            }
-        };
-
-        EventTarget.prototype.dispatchEvent = function(event){
-            if(!(event.type in this.listeners)) {
-                return;
-            }
-            var stack = this.listeners[event.type];
-            event.target = this;
-            for(var i = 0, l = stack.length; i < l; i++) {
-                stack[i].call(this, event);
-            }
-        };
-    }
-})();
diff --git a/tests/wpt/tests/encrypted-media/polyfill/make-polyfill-tests.py b/tests/wpt/tests/encrypted-media/polyfill/make-polyfill-tests.py
index 97c6fc74e93..7773cf9a21f 100644
--- a/tests/wpt/tests/encrypted-media/polyfill/make-polyfill-tests.py
+++ b/tests/wpt/tests/encrypted-media/polyfill/make-polyfill-tests.py
@@ -9,7 +9,6 @@ scripts = '''
     <!-- Polyfill files (NOTE: These are added by auto-generation script) -->
     <script src=/encrypted-media/polyfill/chrome-polyfill.js></script>
     <script src=/encrypted-media/polyfill/firefox-polyfill.js></script>
-    <script src=/encrypted-media/polyfill/edge-persistent-usage-record.js></script>
     <script src=/encrypted-media/polyfill/edge-keystatuses.js></script>
     <script src=/encrypted-media/polyfill/clearkey-polyfill.js></script>'''
 
diff --git a/tests/wpt/tests/encrypted-media/resources/drm-retrieve-persistent-usage-record.html b/tests/wpt/tests/encrypted-media/resources/drm-retrieve-persistent-usage-record.html
deleted file mode 100644
index d1b3e0c6949..00000000000
--- a/tests/wpt/tests/encrypted-media/resources/drm-retrieve-persistent-usage-record.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>Encrypted Media Extensions: Retrieve stored persistent-usage-record</title>
-    <link rel="help" href="https://w3c.github.io/encrypted-media/">
-
-    <!-- Helper scripts for Encrypted Media Extensions tests  -->
-    <script src=/encrypted-media/util/utils.js></script>
-    <script src=/encrypted-media/util/utf8.js></script>
-
-    <!-- Message handler for Clear Key keysystem -->
-    <script src=/encrypted-media/util/drm-messagehandler.js></script>
-
-  </head>
-  <body>
-    <div id='log'></div>
-
-    <script>
-    window.addEventListener( 'message', function( event ) {
-
-        var config = event.data.config,
-            configuration = {   initDataTypes: [ config.initDataType ],
-                                audioCapabilities: [ { contentType: config.audioType } ],
-                                videoCapabilities: [ { contentType: config.videoType } ],
-                                sessionTypes: [ 'persistent-usage-record' ] },
-            assertions = [ ],
-            _mediaKeys,
-            _mediaKeySession;
-
-            config.messagehandler = (new MessageHandler( config.keysystem, undefined, 'persistent-usage-record' ) ).messagehandler;
-
-        function onFailure(error) {
-            assertions.push( { actual: false, expected: true, message: error } );
-            window.opener.postMessage({ testResult: assertions }, '*');
-        }
-
-        function onMessage( event )
-        {
-            assertions.push( { expected: true, actual: event instanceof window.MediaKeyMessageEvent, message: "event is of correct class" } );
-            assertions.push( { expected: 'message', actual: event.type, message: "event type is message" } );
-            assertions.push( { expected: 'license-release', actual: event.messageType, message: "message type is license-release" } );
-
-            config.messagehandler( event.messageType, event.message ).then( function( response ) {
-                event.target.update( response ).catch( onFailure );
-            });
-        }
-
-        navigator.requestMediaKeySystemAccess(config.keysystem, [ configuration ] ).then(function(access) {
-            return access.createMediaKeys();
-        }).then(function(mediaKeys) {
-            _mediaKeys = mediaKeys;
-            return config.servercertificate ? _mediaKeys.setServerCertificate( config.servercertificate ) : true;
-        }).then( function( success ) {
-            _mediaKeySession = _mediaKeys.createSession( 'persistent-usage-record' );
-            _mediaKeySession.addEventListener( 'message', onMessage );
-            _mediaKeySession.closed.then( function() {
-                window.opener.postMessage({ testResult: assertions }, '*');
-            });
-            return _mediaKeySession.load( event.data.sessionId );
-        }).then(function( success ) {
-            if ( !success ) {
-                assertions.push( { actual: success, expected: true, message: "Error loading session" } );
-                window.opener.postMessage({ testResult: assertions }, '*');
-            }
-        }).catch( onFailure );
-    });
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/tests/encrypted-media/resources/retrieve-persistent-usage-record.html b/tests/wpt/tests/encrypted-media/resources/retrieve-persistent-usage-record.html
deleted file mode 100644
index c09134b5469..00000000000
--- a/tests/wpt/tests/encrypted-media/resources/retrieve-persistent-usage-record.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>Encrypted Media Extensions: Retrieve stored persistent-usage-record</title>
-    <link rel="help" href="https://w3c.github.io/encrypted-media/">
-
-    <!-- Helper scripts for Encrypted Media Extensions tests  -->
-    <script src=/encrypted-media/util/utils.js></script>
-    <script src=/encrypted-media/util/utf8.js></script>
-
-    <!-- Message handler for Clear Key keysystem -->
-    <script src=/encrypted-media/util/clearkey-messagehandler.js></script>
-
-  </head>
-  <body>
-    <div id='log'></div>
-
-    <script>
-
-    window.addEventListener( 'message', function( event ) {
-
-        var config = event.data.config,
-            configuration = {   initDataTypes: [ config.initDataType ],
-                                audioCapabilities: [ { contentType: config.audioType } ],
-                                videoCapabilities: [ { contentType: config.videoType } ],
-                                sessionTypes: [ 'persistent-usage-record' ] },
-            assertions = [ ];
-
-            config.messagehandler = (new MessageHandler('org.w3.keysystem')).messagehandler;
-
-        function onMessage( event )
-        {
-            assertions.push( { expected: true, actual: event instanceof window.MediaKeyMessageEvent, message: "event is of correct class" } );
-            assertions.push( { expected: 'message', actual: event.type, message: "event type is message" } );
-            assertions.push( { expected: 'license-release', actual: event.messageType, message: "message type is license-release" } );
-
-            var release = fromUtf8( event.message );
-
-            consoleWrite( JSON.stringify( release ) );
-
-            assertions.push( { expected: 1, actual: release.kids.length, message: "release message contains a single key" } );
-            assertions.push( { expected: true, actual: ( typeof release.firstTime === 'number' ), message: "firstTime is a number" } );
-            assertions.push( { expected: true, actual: ( typeof release.latestTime === 'number' ), message: "latestTime is a number" } );
-
-            var duration = release.latestTime - release.firstTime;
-            assertions.push( { expected: true, actual: ( duration >= 2000 ), message: "duration >= 2s" } );
-            assertions.push( { expected: true, actual: ( duration < 4000 ), message: "duration < 4s" } );
-
-            config.messagehandler( event.messageType, event.message )
-            .then( function( response ) {
-
-                event.target.update( response ).catch(function(error) {
-
-                    assertions.push( { actual: false, expected: true, message: error } );
-
-                    window.opener.postMessage({ testResult: assertions }, '*');
-                });
-            });
-        }
-
-        navigator.requestMediaKeySystemAccess(config.keysystem, [ configuration ] ).then(function(access) {
-
-            return access.createMediaKeys();
-
-        }).then(function(mediaKeys) {
-
-            var mediaKeySession = mediaKeys.createSession( 'persistent-usage-record' );
-
-            mediaKeySession.addEventListener( 'message', onMessage );
-            mediaKeySession.closed.then( function() {
-
-                window.opener.postMessage({ testResult: assertions }, '*');
-
-            });
-
-            return mediaKeySession.load( event.data.sessionId );
-
-        }).catch(function(error) {
-
-            assertions.push( { actual: false, expected: true, message: error.toString() } );
-
-            window.opener.postMessage({ testResult: assertions }, '*');
-
-        });
-
-
-    } );
-
-    </script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/encrypted-media/scripts/playback-destroy-persistent-license.js b/tests/wpt/tests/encrypted-media/scripts/playback-destroy-persistent-license.js
index 8a6cacedb40..ce3ede67b65 100644
--- a/tests/wpt/tests/encrypted-media/scripts/playback-destroy-persistent-license.js
+++ b/tests/wpt/tests/encrypted-media/scripts/playback-destroy-persistent-license.js
@@ -90,6 +90,15 @@ function runTest(config,qualifier) {
             return source.done;
         }).then(function(){
             _video.play();
-        }).catch(onFailure);
+        }).catch(function (error) {
+            if (error && error.name === 'NotSupportedError') {
+                // If persistent license is not supported, skip test as
+                // key systems are not required to support this session
+                // type.
+                test.done();
+            } else {
+                onFailure(error);
+            }
+        });
     }, testname);
 }
diff --git a/tests/wpt/tests/encrypted-media/scripts/playback-persistent-license-events.js b/tests/wpt/tests/encrypted-media/scripts/playback-persistent-license-events.js
index 2d99f679f4c..7a381bb2f9d 100644
--- a/tests/wpt/tests/encrypted-media/scripts/playback-persistent-license-events.js
+++ b/tests/wpt/tests/encrypted-media/scripts/playback-persistent-license-events.js
@@ -153,6 +153,15 @@ function runTest(config,qualifier) {
             return source.done;
         }).then(function(){
             _video.play();
-        }).catch(onFailure);
+        }).catch(function (error) {
+            if (error && error.name === 'NotSupportedError') {
+                // If persistent license is not supported, skip test as
+                // key systems are not required to support this session
+                // type.
+                test.done();
+            } else {
+                onFailure(error);
+            }
+        });
     }, testname);
 }
diff --git a/tests/wpt/tests/encrypted-media/scripts/playback-persistent-license.js b/tests/wpt/tests/encrypted-media/scripts/playback-persistent-license.js
index c7e56e3aeaf..9b1f9da4cdd 100644
--- a/tests/wpt/tests/encrypted-media/scripts/playback-persistent-license.js
+++ b/tests/wpt/tests/encrypted-media/scripts/playback-persistent-license.js
@@ -72,6 +72,15 @@ function runTest(config,qualifier) {
             return source.done;
         }).then(function(){
             _video.play();
-        }).catch(onFailure);
+        }).catch(function (error) {
+            if (error && error.name === 'NotSupportedError') {
+                // If persistent license is not supported, skip test as
+                // key systems are not required to support this session
+                // type.
+                test.done();
+            } else {
+                onFailure(error);
+            }
+        });
     }, testname);
 }
diff --git a/tests/wpt/tests/encrypted-media/scripts/playback-persistent-usage-record-events.js b/tests/wpt/tests/encrypted-media/scripts/playback-persistent-usage-record-events.js
deleted file mode 100644
index e8e1e54790b..00000000000
--- a/tests/wpt/tests/encrypted-media/scripts/playback-persistent-usage-record-events.js
+++ /dev/null
@@ -1,109 +0,0 @@
-function runTest(config,qualifier) {
-
-    var testname = testnamePrefix(qualifier, config.keysystem)
-                                    + ', persistent-usage-record, '
-                                    + /video\/([^;]*)/.exec(config.videoType)[1]
-                                    + ', playback, check events';
-
-    var configuration = {   initDataTypes: [config.initDataType ],
-                            audioCapabilities: [{contentType: config.audioType}],
-                            videoCapabilities: [{contentType: config.videoType}],
-                            sessionTypes: ['persistent-usage-record']};
-
-
-    async_test(function(test) {
-        var _video = config.video,
-            _mediaKeys,
-            _mediaKeySession,
-            _sessionId,
-            _timeupdateEvent = false,
-            _events = [ ];
-
-        function recordEventFunc(eventType) {
-            return function() { _events.push(eventType); };
-        }
-
-        function onFailure(error) {
-            forceTestFailureFromPromise(test, error);
-        }
-
-        function onMessage(event) {
-            assert_equals(event.target, _mediaKeySession);
-            assert_true(event instanceof window.MediaKeyMessageEvent);
-            assert_equals(event.type, 'message');
-
-            if (event.messageType !== 'individualization-request') {
-                _events.push(event.messageType);
-            }
-
-            config.messagehandler(event.messageType, event.message).then(function(response) {
-                _events.push(event.messageType + '-response');
-                return _mediaKeySession.update(response);
-            }).then(test.step_func(function() {
-                _events.push('update-resolved');
-                if (event.messageType === 'license-release') {
-                    checkEventSequence( _events,
-                                    ['encrypted','generaterequest-done',
-                                        ['license-request', 'license-request-response', 'update-resolved'], // potentially repeating
-                                        'keystatuseschange',
-                                        'playing',
-                                        'remove-resolved',
-                                        'keystatuseschange',
-                                        'license-release',
-                                        'license-release-response',
-                                        'closed-attribute-resolved',
-                                        'update-resolved' ]);
-                    test.done();
-                }
-
-                if ( event.messageType === 'license-request' ) {
-                    _video.setMediaKeys(_mediaKeys);
-                }
-            })).catch(onFailure);
-        }
-
-        function onEncrypted(event) {
-            assert_equals(event.target, _video);
-            assert_true(event instanceof window.MediaEncryptedEvent);
-            _events.push(event.type);
-            _mediaKeySession.generateRequest(   config.initDataType || event.initDataType,
-                                                config.initData || event.initData ).then( function() {
-                _events.push( 'generaterequest-done' );
-                _sessionId = _mediaKeySession.sessionId;
-            }).catch(onFailure);
-        }
-
-        function onTimeupdate(event) {
-            if (_video.currentTime > (config.duration || 1) && !_timeupdateEvent) {
-                _timeupdateEvent = true;
-                _video.pause();
-                _mediaKeySession.remove().then(recordEventFunc('remove-resolved')).catch(onFailure);
-            }
-        }
-
-        navigator.requestMediaKeySystemAccess(config.keysystem, [configuration]).then(function(access) {
-            return access.createMediaKeys();
-        }).then(function(mediaKeys) {
-            _mediaKeys = mediaKeys;
-            waitForEventAndRunStep('encrypted', _video, onEncrypted, test);
-            waitForEventAndRunStep('playing', _video, recordEventFunc('playing'), test);
-
-            // Not using waitForEventAndRunStep() to avoid too many
-            // EVENT(onTimeUpdate) logs.
-            _video.addEventListener('timeupdate', onTimeupdate, true);
-
-            _mediaKeySession = _mediaKeys.createSession( 'persistent-usage-record' );
-            waitForEventAndRunStep('message', _mediaKeySession, onMessage, test);
-            waitForEventAndRunStep('keystatuseschange', _mediaKeySession, recordEventFunc('keystatuseschange'), test);
-            _mediaKeySession.closed.then(recordEventFunc('closed-attribute-resolved'));
-            return config.servercertificate ? _mediaKeys.setServerCertificate(config.servercertificate) : true;
-        }).then(function( success ) {
-            return testmediasource(config);
-        }).then(function(source) {
-            _video.src = URL.createObjectURL(source);
-            return source.done;
-        }).then(function(){
-            _video.play();
-        }).catch(onFailure);
-    }, testname);
-}
diff --git a/tests/wpt/tests/encrypted-media/scripts/playback-persistent-usage-record.js b/tests/wpt/tests/encrypted-media/scripts/playback-persistent-usage-record.js
deleted file mode 100644
index 1772b4bd5f3..00000000000
--- a/tests/wpt/tests/encrypted-media/scripts/playback-persistent-usage-record.js
+++ /dev/null
@@ -1,104 +0,0 @@
-function runTest(config,qualifier) {
-
-    var testname = testnamePrefix(qualifier, config.keysystem)
-                                    + ', persistent-usage-record, '
-                                    + /video\/([^;]*)/.exec(config.videoType)[1]
-                                    + 'playback';
-
-    var configuration = {   initDataTypes: [ config.initDataType ],
-                            audioCapabilities: [ { contentType: config.audioType } ],
-                            videoCapabilities: [ { contentType: config.videoType } ],
-                            sessionTypes: [ 'persistent-usage-record' ] };
-
-
-    async_test(function(test) {
-        var _video = config.video,
-            _mediaKeys,
-            _mediaKeySession,
-            _mediaSource,
-            _releaseSequence = false;
-
-        function onFailure(error) {
-            forceTestFailureFromPromise(test, error);
-        }
-
-        function onMessage(event) {
-            assert_equals(event.target, _mediaKeySession);
-            // event instance verification failing on CastTV
-            // assert_true( event instanceof window.MediaKeyMessageEvent );
-            assert_equals(event.type, 'message');
-
-            if (!_releaseSequence)
-            {
-                assert_in_array(event.messageType, ['license-request', 'individualization-request']);
-            }
-            else
-            {
-                assert_equals(event.messageType, 'license-release');
-            }
-
-            config.messagehandler(event.messageType, event.message).then(function(response) {
-                return _mediaKeySession.update(response);
-            }).then(function() {
-                if(event.messageType === 'license-request') {
-                    return _video.setMediaKeys(_mediaKeys);
-                } else if(event.messageType === 'license-release') {
-                    test.done();
-                }
-            }).catch(onFailure);
-        }
-
-        function onEncrypted(event) {
-            assert_equals(event.target, _video);
-            assert_true(event instanceof window.MediaEncryptedEvent);
-            assert_equals(event.type, 'encrypted');
-
-            waitForEventAndRunStep('message', _mediaKeySession, onMessage, test);
-            _mediaKeySession.generateRequest(   config.initData ? config.initDataType : event.initDataType,
-                                                config.initData || event.initData )
-            .catch(onFailure);
-        }
-
-        function onClosed(event) {
-            _video.src = "";
-            _video.setMediaKeys( null );
-        }
-
-        function onTimeupdate(event) {
-            if (_video.currentTime > ( config.duration || 1) && !_releaseSequence) {
-                _video.removeEventListener('timeupdate', onTimeupdate );
-                _video.pause();
-                _releaseSequence = true;
-
-                _mediaKeySession.closed.then(test.step_func(onClosed));
-                _mediaKeySession.remove().catch(onFailure);
-
-                _video.removeEventListener('timeupdate', onTimeupdate);
-            }
-        }
-
-        function onPlaying(event) {
-            // Not using waitForEventAndRunStep() to avoid too many
-            // EVENT(onTimeUpdate) logs.
-            _video.addEventListener('timeupdate', onTimeupdate, true);
-        }
-
-        navigator.requestMediaKeySystemAccess(config.keysystem, [ configuration ]).then(function(access) {
-            return access.createMediaKeys();
-        }).then(function(mediaKeys) {
-            _mediaKeys = mediaKeys;
-            _mediaKeySession = _mediaKeys.createSession('persistent-usage-record');
-            waitForEventAndRunStep('encrypted', _video, onEncrypted, test);
-            waitForEventAndRunStep('playing', _video, onPlaying, test);
-            return config.servercertificate ? _mediaKeys.setServerCertificate(config.servercertificate) : true;
-        }).then(function(success) {
-            return testmediasource(config);
-        }).then(function(source) {
-            _mediaSource = source;
-            _video.src = URL.createObjectURL(_mediaSource);
-            return source.done;
-        }).then(function(){
-            _video.play();
-        }).catch(onFailure);
-    }, testname);
-}
diff --git a/tests/wpt/tests/encrypted-media/scripts/playback-retrieve-persistent-license.js b/tests/wpt/tests/encrypted-media/scripts/playback-retrieve-persistent-license.js
index 83cba34028e..ad9728e01ad 100644
--- a/tests/wpt/tests/encrypted-media/scripts/playback-retrieve-persistent-license.js
+++ b/tests/wpt/tests/encrypted-media/scripts/playback-retrieve-persistent-license.js
@@ -110,6 +110,15 @@ function runTest(config,qualifier) {
             return source.done;
         }).then(function(){
             _video.play();
-        }).catch(onFailure);
+        }).catch(function (error) {
+            if (error && error.name === 'NotSupportedError') {
+                // If persistent license is not supported, skip test as
+                // key systems are not required to support this session
+                // type.
+                test.done();
+            } else {
+                onFailure(error);
+            }
+        });
     }, testname);
 }
diff --git a/tests/wpt/tests/encrypted-media/scripts/playback-retrieve-persistent-usage-record.js b/tests/wpt/tests/encrypted-media/scripts/playback-retrieve-persistent-usage-record.js
deleted file mode 100644
index a04f97d2ca9..00000000000
--- a/tests/wpt/tests/encrypted-media/scripts/playback-retrieve-persistent-usage-record.js
+++ /dev/null
@@ -1,114 +0,0 @@
-function runTest(config,qualifier) {
-
-    var testname = testnamePrefix(qualifier, config.keysystem)
-                                    + ', persistent-usage-record, '
-                                    + /video\/([^;]*)/.exec(config.videoType)[1]
-                                    + ', playback, retrieve in new window';
-
-    var configuration = {   initDataTypes: [ config.initDataType ],
-                            audioCapabilities: [ { contentType: config.audioType } ],
-                            videoCapabilities: [ { contentType: config.videoType } ],
-                            sessionTypes: [ 'persistent-usage-record' ] };
-
-
-    async_test( function( test ) {
-        var _video = config.video,
-            _mediaKeys,
-            _mediaKeySession,
-            _mediaSource,
-            _sessionId,
-            _isClosing = false;
-
-        function onFailure(error) {
-            forceTestFailureFromPromise(test, error);
-        }
-
-        function onEncrypted(event) {
-            assert_equals(event.target, _video);
-            assert_true(event instanceof window.MediaEncryptedEvent);
-            assert_equals(event.type, 'encrypted');
-
-            waitForEventAndRunStep('message', _mediaKeySession, onMessage, test);
-            _mediaKeySession.generateRequest(   config.initDataType || event.initDataType,
-                                                config.initData || event.initData ).then( function() {
-                _sessionId = _mediaKeySession.sessionId;
-            }).catch(onFailure);
-        }
-
-        function onMessage(event) {
-            assert_equals(event.target, _mediaKeySession);
-            assert_true(event instanceof window.MediaKeyMessageEvent);
-            assert_equals(event.type, 'message');
-
-            assert_in_array(  event.messageType,['license-request', 'individualization-request']);
-
-            config.messagehandler( event.messageType, event.message ).then(function(response) {
-                return _mediaKeySession.update(response);
-            }).then(function() {
-                return _video.setMediaKeys(_mediaKeys);
-            }).catch(onFailure);
-        }
-
-        function onPlaying(event) {
-            // Not using waitForEventAndRunStep() to avoid too many
-            // EVENT(onTimeUpdate) logs.
-            _video.addEventListener('timeupdate', onTimeupdate, true);
-        }
-
-        function onTimeupdate(event) {
-            if (!_isClosing && _video.currentTime > (config.duration || 1)) {
-                _isClosing = true;
-                _video.removeEventListener('timeupdate', onTimeupdate);
-                _video.pause();
-                _mediaKeySession.closed.then( test.step_func(onClosed));
-                _mediaKeySession.close();
-            }
-        }
-
-        function onClosed(event) {
-            _video.src = "";
-            _video.setMediaKeys( null );
-
-            var win = window.open(config.windowscript);
-            assert_not_equals(win, null, "Popup windows not allowed?");
-
-            window.addEventListener('message', test.step_func(function(event) {
-                if (event.data.testResult) {
-                    event.data.testResult.forEach(test.step_func(function(assertion) {
-                        assert_equals(assertion.actual, assertion.expected, assertion.message);
-                    }));
-
-                    win.close();
-                    test.done();
-                }
-            }));
-
-            delete config.video;
-            delete config.messagehandler;
-
-            win.onload = function() {
-                win.postMessage({ config: config, sessionId: _sessionId }, '*');
-            }
-        }
-
-        navigator.requestMediaKeySystemAccess(config.keysystem, [configuration]).then(function(access) {
-            return access.createMediaKeys();
-        }).then(function(mediaKeys) {
-            _mediaKeys = mediaKeys;
-            return _video.setMediaKeys(mediaKeys);
-        }).then(function(){
-            _mediaKeySession = _mediaKeys.createSession( 'persistent-usage-record' );
-            waitForEventAndRunStep('encrypted', _video, onEncrypted, test);
-            waitForEventAndRunStep('playing', _video, onPlaying, test);
-            return config.servercertificate ? _mediaKeys.setServerCertificate(config.servercertificate) : true;
-        }).then(function(success) {
-            return testmediasource(config);
-        }).then(function(source) {
-            _mediaSource = source;
-            _video.src = URL.createObjectURL(_mediaSource);
-            return source.done;
-        }).then(function(){
-            _video.play();
-        }).catch(onFailure);
-    }, testname);
-}
diff --git a/tests/wpt/tests/encrypted-media/scripts/playback-temporary-events.js b/tests/wpt/tests/encrypted-media/scripts/playback-temporary-events.js
index d8dac4463df..1d81cf26071 100644
--- a/tests/wpt/tests/encrypted-media/scripts/playback-temporary-events.js
+++ b/tests/wpt/tests/encrypted-media/scripts/playback-temporary-events.js
@@ -111,7 +111,7 @@ function runTest(config,qualifier) {
                 closeMethodPromise.then(onClosed);
 
                 Promise.all([ closedAttributePromise, closeMethodPromise ]).then(function() {
-                    test.step_func(onAllClosed);
+                    test.step_func(onAllClosed)();
                 }).catch(onFailure);
             }
         }
diff --git a/tests/wpt/tests/encrypted-media/scripts/playback-temporary-expired.js b/tests/wpt/tests/encrypted-media/scripts/playback-temporary-expired.js
index 3d1bd9591db..16b6e7da2e8 100644
--- a/tests/wpt/tests/encrypted-media/scripts/playback-temporary-expired.js
+++ b/tests/wpt/tests/encrypted-media/scripts/playback-temporary-expired.js
@@ -44,10 +44,10 @@ function runTest(config,qualifier) {
 
             assert_in_array(event.messageType, ['license-request', 'individualization-request']);
 
-            // Generate a license that expires 1 second from now.
-            var expiration = Date.now().valueOf() + 1000;
+            // Generate a license that expires 2 seconds from now.
+            var expiration = Date.now().valueOf() + 2000;
             config.messagehandler(event.messageType, event.message, { expiration: expiration }).then(function(response) {
-                // Wait 2 seconds before calling update() to ensure that the
+                // Wait 4 seconds before calling update() to ensure that the
                 // license has really expired. This is to avoid problems
                 // where the browser starts buffering frames as soon as a
                 // valid license is received.
@@ -59,10 +59,10 @@ function runTest(config,qualifier) {
                                              "expiration attribute should equal provided expiration time");
                         assert_greater_than(Date.now().valueOf(), expiration, "Starting play before license expired");
                         _video.play();
-                        // Wait 2 seconds to ensure that the video does not play.
-                        test.step_timeout(function() { test.done(); }, 2000);
+                        // Wait 4 seconds to ensure that the video does not play.
+                        test.step_timeout(function() { test.done(); }, 4000);
                     }).catch(onFailure);
-                }, 2000);
+                }, 4000);
             }).catch(onFailure);
         }
 
diff --git a/tests/wpt/tests/encrypted-media/scripts/temporary-license-type.js b/tests/wpt/tests/encrypted-media/scripts/temporary-license-type.js
index 44c9f158085..367e2e5aaf1 100644
--- a/tests/wpt/tests/encrypted-media/scripts/temporary-license-type.js
+++ b/tests/wpt/tests/encrypted-media/scripts/temporary-license-type.js
@@ -8,6 +8,22 @@ function runTest(config,qualifier) {
         configuration.initDataTypes = [config.initDataType];
     }
 
+    // Check if DRM server for key system config supports persistent license.
+    var supportsPersistentLicense = false;
+    if (drmconfig[config.keysystem]) {
+        supportsPersistentLicense = drmconfig[config.keysystem].some(function(cfg) {
+            return cfg.sessionTypes !== undefined && cfg.sessionTypes.indexOf('persistent-license') !== -1;
+        });
+    }
+
+    // Skip test if persistent license is not supported.
+    if (!supportsPersistentLicense) {
+        test(function() {
+            assert_true(true, "DRM server for key system not configured for persistent license, test skipped");
+        }, testname);
+        return;
+    }
+
     async_test(function(test)
     {
         var initDataType;
diff --git a/tests/wpt/tests/encrypted-media/util/drm-messagehandler.js b/tests/wpt/tests/encrypted-media/util/drm-messagehandler.js
index b1565c12cb0..0af63be0686 100644
--- a/tests/wpt/tests/encrypted-media/util/drm-messagehandler.js
+++ b/tests/wpt/tests/encrypted-media/util/drm-messagehandler.js
@@ -18,21 +18,9 @@ drmconfig = {
         "secret" : drmtodaysecret
     } ],
     "com.microsoft.playready": [ {
-        "serverURL": "http://playready-testserver.azurewebsites.net/rightsmanager.asmx",
-        "servertype": "microsoft",
-        "sessionTypes" : [ "persistent-usage-record" ],
-        "certificate" : "Q0hBSQAAAAEAAAUEAAAAAAAAAAJDRVJUAAAAAQAAAfQAAAFkAAEAAQAAAFjt9G6KdSncCkrjbTQPN+/2AAAAAAAAAAAAAAAJIPbrW9dj0qydQFIomYFHOwbhGZVGP2ZsPwcvjh+NFkP/////AAAAAAAAAAAAAAAAAAAAAAABAAoAAABYxw6TjIuUUmvdCcl00t4RBAAAADpodHRwOi8vcGxheXJlYWR5LmRpcmVjdHRhcHMubmV0L3ByL3N2Yy9yaWdodHNtYW5hZ2VyLmFzbXgAAAAAAQAFAAAADAAAAAAAAQAGAAAAXAAAAAEAAQIAAAAAADBRmRRpqV4cfRLcWz9WoXIGZ5qzD9xxJe0CSI2mXJQdPHEFZltrTkZtdmurwVaEI2etJY0OesCeOCzCqmEtTkcAAAABAAAAAgAAAAcAAAA8AAAAAAAAAAVEVEFQAAAAAAAAABVNZXRlcmluZyBDZXJ0aWZpY2F0ZQAAAAAAAAABAAAAAAABAAgAAACQAAEAQGHic/IPbmLCKXxc/MH20X/RtjhXH4jfowBWsQE1QWgUUBPFId7HH65YuQJ5fxbQJCT6Hw0iHqKzaTkefrhIpOoAAAIAW+uRUsdaChtq/AMUI4qPlK2Bi4bwOyjJcSQWz16LAFfwibn5yHVDEgNA4cQ9lt3kS4drx7pCC+FR/YLlHBAV7ENFUlQAAAABAAAC/AAAAmwAAQABAAAAWMk5Z0ovo2X0b2C9K5PbFX8AAAAAAAAAAAAAAARTYd1EkpFovPAZUjOj2doDLnHiRSfYc89Fs7gosBfar/////8AAAAAAAAAAAAAAAAAAAAAAAEABQAAAAwAAAAAAAEABgAAAGAAAAABAAECAAAAAABb65FSx1oKG2r8AxQjio+UrYGLhvA7KMlxJBbPXosAV/CJufnIdUMSA0DhxD2W3eRLh2vHukIL4VH9guUcEBXsAAAAAgAAAAEAAAAMAAAABwAAAZgAAAAAAAAAgE1pY3Jvc29mdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgFBsYXlSZWFkeSBTTDAgTWV0ZXJpbmcgUm9vdCBDQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgDEuMC4wLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACAAAAJAAAQBArAKJsEIDWNG5ulOgLvSUb8I2zZ0c5lZGYvpIO56Z0UNk/uC4Mq3jwXQUUN6m/48V5J/vuLDhWu740aRQc1dDDAAAAgCGTWHP8iVuQixWizwoABz7PhUnZYWEugUht5sYKNk23h2Cao/D5uf6epDVyilG8fZKLvufXc/+fkNOtEKT+sWr"
-    },
-    {
-        "serverURL": "http://playready.directtaps.net/pr/svc/rightsmanager.asmx",
-        "servertype": "microsoft",
-        "sessionTypes" : [ "persistent-usage-record" ],
-        "certificate" : "Q0hBSQAAAAEAAAUEAAAAAAAAAAJDRVJUAAAAAQAAAfQAAAFkAAEAAQAAAFjt9G6KdSncCkrjbTQPN+/2AAAAAAAAAAAAAAAJIPbrW9dj0qydQFIomYFHOwbhGZVGP2ZsPwcvjh+NFkP/////AAAAAAAAAAAAAAAAAAAAAAABAAoAAABYxw6TjIuUUmvdCcl00t4RBAAAADpodHRwOi8vcGxheXJlYWR5LmRpcmVjdHRhcHMubmV0L3ByL3N2Yy9yaWdodHNtYW5hZ2VyLmFzbXgAAAAAAQAFAAAADAAAAAAAAQAGAAAAXAAAAAEAAQIAAAAAADBRmRRpqV4cfRLcWz9WoXIGZ5qzD9xxJe0CSI2mXJQdPHEFZltrTkZtdmurwVaEI2etJY0OesCeOCzCqmEtTkcAAAABAAAAAgAAAAcAAAA8AAAAAAAAAAVEVEFQAAAAAAAAABVNZXRlcmluZyBDZXJ0aWZpY2F0ZQAAAAAAAAABAAAAAAABAAgAAACQAAEAQGHic/IPbmLCKXxc/MH20X/RtjhXH4jfowBWsQE1QWgUUBPFId7HH65YuQJ5fxbQJCT6Hw0iHqKzaTkefrhIpOoAAAIAW+uRUsdaChtq/AMUI4qPlK2Bi4bwOyjJcSQWz16LAFfwibn5yHVDEgNA4cQ9lt3kS4drx7pCC+FR/YLlHBAV7ENFUlQAAAABAAAC/AAAAmwAAQABAAAAWMk5Z0ovo2X0b2C9K5PbFX8AAAAAAAAAAAAAAARTYd1EkpFovPAZUjOj2doDLnHiRSfYc89Fs7gosBfar/////8AAAAAAAAAAAAAAAAAAAAAAAEABQAAAAwAAAAAAAEABgAAAGAAAAABAAECAAAAAABb65FSx1oKG2r8AxQjio+UrYGLhvA7KMlxJBbPXosAV/CJufnIdUMSA0DhxD2W3eRLh2vHukIL4VH9guUcEBXsAAAAAgAAAAEAAAAMAAAABwAAAZgAAAAAAAAAgE1pY3Jvc29mdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgFBsYXlSZWFkeSBTTDAgTWV0ZXJpbmcgUm9vdCBDQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgDEuMC4wLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACAAAAJAAAQBArAKJsEIDWNG5ulOgLvSUb8I2zZ0c5lZGYvpIO56Z0UNk/uC4Mq3jwXQUUN6m/48V5J/vuLDhWu740aRQc1dDDAAAAgCGTWHP8iVuQixWizwoABz7PhUnZYWEugUht5sYKNk23h2Cao/D5uf6epDVyilG8fZKLvufXc/+fkNOtEKT+sWr"
-    },
-    {
         "serverURL": "https://lic.staging.drmtoday.com/license-proxy-headerauth/drmtoday/RightsManager.asmx",
         "servertype" : "drmtoday",
-        "sessionTypes" : [ "temporary", "persistent-usage-record", "persistent-license" ],
+        "sessionTypes" : [ "temporary", "persistent-license" ],
         "merchant" : "w3c-eme-test",
         "secret" : drmtodaysecret
     } ],
@@ -148,12 +136,9 @@ const requestConstructors = {
         var url = config.serverURL;
         if (messageType === 'license-request') {
             url += "?";
-            if (sessionType === 'temporary' || sessionType === 'persistent-usage-record') {
+            if (sessionType === 'temporary') {
                 url += "UseSimpleNonPersistentLicense=1&";
             }
-            if (sessionType === 'persistent-usage-record') {
-                url += "SecureStop=1&";
-            }
             url += "PlayEnablers=B621D91F-EDCC-4035-8D4B-DC71760D43E9&";    // disable output protection
             url += "ContentKey=" + btoa(String.fromCharCode.apply(null, content.key));
         }
diff --git a/tests/wpt/tests/event-timing/WEB_FEATURES.yml b/tests/wpt/tests/event-timing/WEB_FEATURES.yml
new file mode 100644
index 00000000000..b20102ff2a3
--- /dev/null
+++ b/tests/wpt/tests/event-timing/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: event-timing
+  files: "**"
diff --git a/tests/wpt/tests/event-timing/interactionid-keyboard-event-simulated-click-button-space.html b/tests/wpt/tests/event-timing/interactionid-keyboard-event-simulated-click-button-space.html
index d3ab5437f8e..b7a7675f324 100644
--- a/tests/wpt/tests/event-timing/interactionid-keyboard-event-simulated-click-button-space.html
+++ b/tests/wpt/tests/event-timing/interactionid-keyboard-event-simulated-click-button-space.html
@@ -13,7 +13,7 @@
 
 <script>
   promise_test(async t => {
-
+    assert_implements(window.PerformanceEventTiming, 'Event Timing is not supported.');
     let map = new Map();
 
     const button = document.getElementById('button');
diff --git a/tests/wpt/tests/event-timing/interactionid-keyboard-event-simulated-click-checkbox-space.html b/tests/wpt/tests/event-timing/interactionid-keyboard-event-simulated-click-checkbox-space.html
index 3dd8e21e784..e2582259e15 100644
--- a/tests/wpt/tests/event-timing/interactionid-keyboard-event-simulated-click-checkbox-space.html
+++ b/tests/wpt/tests/event-timing/interactionid-keyboard-event-simulated-click-checkbox-space.html
@@ -13,7 +13,7 @@
 
 <script>
   promise_test(async t => {
-
+    assert_implements(window.PerformanceEventTiming, 'Event Timing is not supported.');
     let map = new Map();
 
     const checkbox = document.querySelector('input[type="checkbox"]');
diff --git a/tests/wpt/tests/event-timing/interactionid-keyboard-event-simulated-click-link-enter.html b/tests/wpt/tests/event-timing/interactionid-keyboard-event-simulated-click-link-enter.html
index 6945d2ff771..9e1f4ee3761 100644
--- a/tests/wpt/tests/event-timing/interactionid-keyboard-event-simulated-click-link-enter.html
+++ b/tests/wpt/tests/event-timing/interactionid-keyboard-event-simulated-click-link-enter.html
@@ -13,7 +13,7 @@
 
 <script>
   promise_test(async t => {
-
+    assert_implements(window.PerformanceEventTiming, 'Event Timing is not supported.');
     let map = new Map();
 
     const link = document.getElementById('lnk');
diff --git a/tests/wpt/tests/event-timing/interactionid-orphan-pointerup.html b/tests/wpt/tests/event-timing/interactionid-orphan-pointerup.html
index 9c4a0ecf584..e08142f11bc 100644
--- a/tests/wpt/tests/event-timing/interactionid-orphan-pointerup.html
+++ b/tests/wpt/tests/event-timing/interactionid-orphan-pointerup.html
@@ -13,7 +13,8 @@
 <script>
   let observedEntries = [];
   const map = new Map();
-  const events = ['pointerup'];
+  // keydown is being sent right after a pointerup to see if pointerup is present.
+  const events = ['pointerup', 'keydown'];
 
   promise_test(async t => {
     assert_implements(window.PerformanceEventTiming, 'Event Timing is not supported.');
@@ -23,9 +24,13 @@
     const observerPromise = createPerformanceObserverPromise(['event'], callback, readyToResolve);
 
     await interactAndObserve('orphan-pointerup', document.getElementById('testButtonId'), observerPromise);
-    assert_equals(map.get('pointerup'), 0, 'Should have a trivial interactionId for orphan pointerup event.');
+
+    // This test passes when either:
+    // - There is no orphan pointerup triggered by the browser.
+    // - The orphan pointerup doesn't have an interactionId.
+    assert_true(!map.has('pointerup') || map.get('pointerup') === 0, 'Should either have no triggered orphan pointerup event or have a trivial interactionId for orphan pointerup event.');
   }, "Event Timing: Orphan pointerup should not be measured as an interaction.");
 
 </script>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/tests/event-timing/orphan-keydown.html b/tests/wpt/tests/event-timing/orphan-keydown.html
new file mode 100644
index 00000000000..0ab105d4d72
--- /dev/null
+++ b/tests/wpt/tests/event-timing/orphan-keydown.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<meta charset=utf-8 />
+<title>Event Timing: orphan keydown.</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/resources/testdriver.js></script>
+<script src=/resources/testdriver-actions.js></script>
+<script src=/resources/testdriver-vendor.js></script>
+<script src=resources/event-timing-test-utils.js></script>
+
+<body>
+  <button id='target'>Click me</button>
+
+  <script>
+    let observedEntries = [];
+    const map = new Map();
+    const events = ['keydown'];
+
+    promise_test(async t => {
+      assert_implements(window.PerformanceEventTiming, 'Event Timing is not supported.');
+
+      const callback = (entryList) => {observedEntries = observedEntries.concat(entryList.getEntries().filter(filterAndAddToMap(events, map))); };
+      const readyToResolve = () => { return observedEntries.length >= 1; };
+      const observerPromise = createPerformanceObserverPromise(['event'], callback, readyToResolve);
+
+      await interactAndObserve('orphan-keydown', document.getElementById('target'), observerPromise);
+
+      assert_equals(observedEntries.length, 1, "Keydown without a keyup should be fired properly.");
+      assert_greater_than(map.get('keydown'), 0, "Should have a non-trivial interactionId.")
+    }, "Event Timing: Orphan keydown should be measured as an interaction.");
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/event-timing/resources/event-timing-test-utils.js b/tests/wpt/tests/event-timing/resources/event-timing-test-utils.js
index 7bd9782000f..afad67bb6fc 100644
--- a/tests/wpt/tests/event-timing/resources/event-timing-test-utils.js
+++ b/tests/wpt/tests/event-timing/resources/event-timing-test-utils.js
@@ -357,13 +357,20 @@ async function pointerdown(target) {
     .send();
 }
 
-async function pointerup(target) {
+async function orphanPointerup(target) {
   const actions = new test_driver.Actions();
-  return actions.addPointer("mousePointer", "mouse")
+  await actions.addPointer("mousePointer", "mouse")
     .pointerMove(0, 0, { origin: target })
     .pointerUp()
     .send();
+
+  // Orphan pointerup doesn't get triggered in some browsers. Sending a
+  // non-pointer related event to make sure that at least an event gets handled.
+  // If a browsers sends an orphan pointerup, it will always be before the
+  // keydown, so the test will correctly handle it.
+  await pressKey(target, 'a');
 }
+
 async function auxPointerdown(target) {
   const actions = new test_driver.Actions();
   return actions.addPointer("mousePointer", "mouse")
@@ -525,8 +532,8 @@ async function interactAndObserve(interactionType, target, observerPromise, key
       break;
     }
     case 'orphan-pointerup': {
-      addListeners(target, ['pointerup']);
-      interactionPromise = pointerup(target);
+      addListeners(target, ['pointerup', 'keydown']);
+      interactionPromise = orphanPointerup(target);
       break;
     }
     case 'space-key-simulated-click': {
@@ -547,6 +554,17 @@ async function interactAndObserve(interactionType, target, observerPromise, key
       interactionPromise = textSelectionAndBlockMain(target, 30);
       break;
     }
+    case 'orphan-keydown': {
+      addListeners(target, ['keydown']);
+      interactionPromise = new test_driver.Actions()
+        .pointerMove(0, 0, {origin: target})
+        .pointerDown()
+        .pointerUp()
+        .addTick()
+        .keyDown('a')
+        .send();
+      break;
+    }
   }
   return Promise.all([interactionPromise, observerPromise]);
 }
diff --git a/tests/wpt/tests/feature-policy/experimental-features/trust-token-redemption-supported-by-feature-policy.tentative.html b/tests/wpt/tests/feature-policy/experimental-features/trust-token-redemption-supported-by-feature-policy.tentative.html
index e349eadc5d1..646f8eee548 100644
--- a/tests/wpt/tests/feature-policy/experimental-features/trust-token-redemption-supported-by-feature-policy.tentative.html
+++ b/tests/wpt/tests/feature-policy/experimental-features/trust-token-redemption-supported-by-feature-policy.tentative.html
@@ -4,6 +4,8 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
   test(() => {
-    assert_in_array('trust-token-redemption', document.featurePolicy.features());
+    assert_true(
+        document.featurePolicy.features().includes('trust-token-redemption'),
+        'trust token redemption should be in document.featurePolicy.features()');
   }, 'document.featurePolicy.features should advertise trust token redemption.');
 </script>
diff --git a/tests/wpt/tests/fedcm/alternative-identifiers/fedcm-single-identifier.https.html b/tests/wpt/tests/fedcm/alternative-identifiers/fedcm-single-identifier.https.html
new file mode 100644
index 00000000000..3167a2c88af
--- /dev/null
+++ b/tests/wpt/tests/fedcm/alternative-identifiers/fedcm-single-identifier.https.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API alternative identifier tests.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<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>
+
+<body>
+
+<script type="module">
+import {fedcm_test,
+        request_options_with_mediation_required,
+        select_manifest,
+        fedcm_get_dialog_type_promise,
+        fedcm_select_account_promise} from '../support/fedcm-helper.sub.js';
+
+fedcm_test(async t => {
+  let test_options = request_options_with_mediation_required("manifest_with_single_identifier.json");
+  await select_manifest(t, test_options);
+
+  const cred_promise = navigator.credentials.get(test_options);
+
+  // Wait for the dialog to appear.
+  const type = await fedcm_get_dialog_type_promise(t);
+  assert_equals(type, "AccountChooser");
+
+  const accounts = await window.test_driver.get_fedcm_account_list();
+  assert_equals(accounts.length, 2);
+
+  fedcm_select_account_promise(t, 0);
+
+  const cred = await cred_promise;
+  assert_equals(cred.token, "account_id=john_doe");
+  assert_equals(cred.isAutoSelected, false);
+}, "Accounts that only have a phone number or only a username should not cause failure.");
+
+</script>
diff --git a/tests/wpt/tests/fedcm/fedcm-disconnect.sub.https.html b/tests/wpt/tests/fedcm/fedcm-disconnect.sub.https.html
index 2ea2d4a2599..04fcd272dcf 100644
--- a/tests/wpt/tests/fedcm/fedcm-disconnect.sub.https.html
+++ b/tests/wpt/tests/fedcm/fedcm-disconnect.sub.https.html
@@ -13,6 +13,7 @@ import {fedcm_test,
         mark_signed_in,
         disconnect_options,
         fedcm_get_and_select_first_account,
+        fedcm_select_account_promise,
         request_options_with_mediation_required,
         alt_manifest_origin,
         alt_request_options_with_mediation_required,
@@ -82,4 +83,20 @@ fedcm_test(async t => {
   await IdentityCredential.disconnect(disconnect_options("1"));
   return IdentityCredential.disconnect(alt_disconnect_options("2"));
 }, 'Disconnect is bound to each IDP');
+
+fedcm_test(async t => {
+  await mark_signed_in(alt_manifest_origin);
+  // Get at least one connected account that can be disconnected.
+  await fedcm_get_and_select_first_account(t, alt_request_options_with_mediation_required());
+
+  // Pending get request.
+  const credentialPromise = navigator.credentials.get(alt_request_options_with_mediation_required());
+
+  // Disconnect the one connected account.
+  await IdentityCredential.disconnect(alt_disconnect_options("1234"));
+
+  // Select an account to resolve the pending get request.
+  fedcm_select_account_promise(t, 0);
+  return credentialPromise;
+}, 'Test that disconnect succeeds when there is a pending get request and the get request succeeds after the disconnect');
 </script>
diff --git a/tests/wpt/tests/fedcm/fedcm-multi-idp/fedcm-too-many-idps.https.html b/tests/wpt/tests/fedcm/fedcm-multi-idp/fedcm-too-many-idps.https.html
new file mode 100644
index 00000000000..ad646910b64
--- /dev/null
+++ b/tests/wpt/tests/fedcm/fedcm-multi-idp/fedcm-too-many-idps.https.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API: too many IDPs requested.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<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>
+
+<body>
+
+<script type="module">
+import {fedcm_test,
+        manifest_origin,
+        default_manifest_path} from '../support/fedcm-helper.sub.js';
+
+fedcm_test(async t => {
+  let providers = [];
+  for (let i = 0; i < 11; i++) {
+    providers.push({
+      configURL: `${manifest_origin}${default_manifest_path}?i=${i}`,
+      clientId: '1',
+      nonce: '2'
+    });
+  }
+  assert_throws_js(TypeError, navigator.credentials.get({
+    identity: {
+      providers: providers,
+    }
+  }));
+}, "Multi IDP FedCM call fails when too many IDPs are requested.");
+
+</script>
diff --git a/tests/wpt/tests/fedcm/support/manifest_with_single_identifier.json b/tests/wpt/tests/fedcm/support/manifest_with_single_identifier.json
new file mode 100644
index 00000000000..76984065d21
--- /dev/null
+++ b/tests/wpt/tests/fedcm/support/manifest_with_single_identifier.json
@@ -0,0 +1,6 @@
+{
+  "accounts_endpoint": "single_identifier_accounts.py",
+  "client_metadata_endpoint": "client_metadata.py",
+  "id_assertion_endpoint": "token_with_account_id.py",
+  "login_url": "login.html"
+}
diff --git a/tests/wpt/tests/fedcm/support/manifest_with_variable_accounts.json b/tests/wpt/tests/fedcm/support/manifest_with_variable_accounts.json
index b3161e5f286..b0fa2bbcc15 100644
--- a/tests/wpt/tests/fedcm/support/manifest_with_variable_accounts.json
+++ b/tests/wpt/tests/fedcm/support/manifest_with_variable_accounts.json
@@ -3,12 +3,5 @@
   "client_metadata_endpoint": "client_metadata.py",
   "id_assertion_endpoint": "token_with_account_id.py",
   "login_url": "login.html",
-  "modes": {
-    "active": {
-      "supports_use_other_account": true
-    },
-    "passive": {
-      "supports_use_other_account": true
-    }
-  }
+  "supports_use_other_account": true
 }
diff --git a/tests/wpt/tests/fedcm/support/single_identifier_accounts.py b/tests/wpt/tests/fedcm/support/single_identifier_accounts.py
new file mode 100644
index 00000000000..38eff8c3571
--- /dev/null
+++ b/tests/wpt/tests/fedcm/support/single_identifier_accounts.py
@@ -0,0 +1,24 @@
+import importlib
+error_checker = importlib.import_module("fedcm.support.request-params-check")
+
+def main(request, response):
+  request_error = error_checker.accountsCheck(request)
+  if (request_error):
+    return request_error
+
+  response.headers.set(b"Content-Type", b"application/json")
+
+  return """
+{
+ "accounts": [
+  {
+   "id": "john_doe",
+   "username": "john_doe"
+  },
+  {
+   "id": "john_doe2",
+   "tel": "+1 (416) 000-0000"
+  }
+  ]
+}
+"""
diff --git a/tests/wpt/tests/fenced-frame/history-length-outer-page-navigation-not-reflected-in-fenced-nested-iframe.https.html b/tests/wpt/tests/fenced-frame/history-length-outer-page-navigation-not-reflected-in-fenced-nested-iframe.https.html
new file mode 100644
index 00000000000..5bb727a34a7
--- /dev/null
+++ b/tests/wpt/tests/fenced-frame/history-length-outer-page-navigation-not-reflected-in-fenced-nested-iframe.https.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+<script src="resources/history-length-test-helper.js"></script>
+<script src="/common/utils.js"></script>
+<title>Test iframes in fenced frames can't see outer page history length</title>
+
+<body>
+<script>
+promise_test(async () => {
+  const kAssertionDesc =  "history.length Should never reflect the length " +
+                          "of joint session history that occured outside " +
+                          "of the fenced frame tree. history.length will " +
+                          "always return 1."
+
+  maybeNavigateForHistory();
+
+  const fenced_history_length_key = token();
+  const outer_page_ready_for_next_navigation_key = token();
+
+  // Append an iframe to the outer page for subsequent navigations within
+  // the iframe
+  const iframe = document.createElement('iframe');
+  const embed_scope_iframe = "outer_page::iframe";
+  iframe.src = generateURL("resources/history-length-outer-page-navigation-" +
+      "not-reflected-in-fenced-inner.html",
+      [fenced_history_length_key, outer_page_ready_for_next_navigation_key,
+       embed_scope_iframe, null]);
+  document.body.append(iframe);
+
+  await nextValueFromServer(outer_page_ready_for_next_navigation_key);
+
+  // Append a fenced frame to observe 'history.length' and report it back
+  // to the outer page
+  const embed_scope_fenced_frame = "outer_page::fenced_frame";
+  attachFencedFrame(generateURL(
+      "resources/history-length-outer-page-navigation-" +
+      "not-reflected-in-fenced-inner.html",
+      [fenced_history_length_key, outer_page_ready_for_next_navigation_key,
+       embed_scope_fenced_frame, "outer_page::fenced_frame::iframe"])
+  );
+
+  // Wait for the fenced frame to report 'history.length'
+  let result = await nextValueFromServer(fenced_history_length_key);
+  assert_equals(result, "PASS > " + " history.length: 1", kAssertionDesc);
+}, "history.length should not reflect navigations within outer page in " +
+  "an iframe nested within a fenced frame");
+</script>
+</body>
diff --git a/tests/wpt/tests/fenced-frame/history-length-outer-page-navigation-not-reflected-in-fenced.https.html b/tests/wpt/tests/fenced-frame/history-length-outer-page-navigation-not-reflected-in-fenced.https.html
index da643040316..818ed5f795a 100644
--- a/tests/wpt/tests/fenced-frame/history-length-outer-page-navigation-not-reflected-in-fenced.https.html
+++ b/tests/wpt/tests/fenced-frame/history-length-outer-page-navigation-not-reflected-in-fenced.https.html
@@ -2,41 +2,22 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/utils.js"></script>
+<script src="resources/history-length-test-helper.js"></script>
 <script src="/common/utils.js"></script>
-<title>history-length-outer-page-navigation-not-reflected-in-fenced</title>
+<title>Test fenced frames can't see outer page history length</title>
 
 <body>
 <script>
-const fenced_history_length_key = token();
-const outer_page_ready_for_next_navigation_key = token();
-
-async function runTest(embed_scope_reporting) {
+promise_test(async () => {
   const kAssertionDesc =  "history.length Should never reflect the length " +
                           "of joint session history that occured outside " +
                           "of the fenced frame tree. history.length will " +
                           "always return 1."
 
-  ////////////// BEGIN NAVIGATIONS
-  // This block performs a sequence of 'kNavigationLimit' navigations in:
-  // -- the outer page
-  const kNavigationLimit = 5
+  maybeNavigateForHistory();
 
-  const url = new URL(location.href);
-
-  // First, perform some real navigations as well as history.pushState to this
-  // same page. Normally this would increase `history.length`.
-  if (url.searchParams.get("navigationCount") == null)
-    url.searchParams.append("navigationCount", 1);
-
-  let navigationCount = parseInt(url.searchParams.get("navigationCount"));
-
-  if (navigationCount <= kNavigationLimit) {
-    url.searchParams.set('navigationCount', ++navigationCount);
-    location.href = url;
-    history.pushState({} , "");
-    return;
-  }
-  ////////////// END
+  const fenced_history_length_key = token();
+  const outer_page_ready_for_next_navigation_key = token();
 
   // Append an iframe to the outer page for subsequent navigations within
   // the iframe
@@ -57,22 +38,13 @@ async function runTest(embed_scope_reporting) {
       "resources/history-length-outer-page-navigation-" +
       "not-reflected-in-fenced-inner.html",
       [fenced_history_length_key, outer_page_ready_for_next_navigation_key,
-       embed_scope_fenced_frame, embed_scope_reporting])
+       embed_scope_fenced_frame, "outer_page::fenced_frame"])
   );
 
-  // Wait for the 'embed_scope_reporting' to report 'history.length'
+  // Wait for the fenced frame to report 'history.length'
   let result = await nextValueFromServer(fenced_history_length_key);
   assert_equals(result, "PASS > " + " history.length: 1", kAssertionDesc);
-}
-
-promise_test(async () => {
-  await runTest("outer_page::fenced_frame");
 }, "history.length should not reflect navigations within outer page in " +
   "fenced frame");
-
-promise_test(async () => {
-  await runTest("outer_page::fenced_frame::iframe");
-}, "history.length should not reflect navigations within outer page in " +
-  "fenced frame nexted iframe");
 </script>
 </body>
diff --git a/tests/wpt/tests/fenced-frame/resources/history-length-test-helper.js b/tests/wpt/tests/fenced-frame/resources/history-length-test-helper.js
new file mode 100644
index 00000000000..0dc2e37db9c
--- /dev/null
+++ b/tests/wpt/tests/fenced-frame/resources/history-length-test-helper.js
@@ -0,0 +1,23 @@
+// Perform real navigations as well as history.pushState navigations to the
+// loaded page until we reach the specified navigation limit. This will be the
+// first function that runs in the test, and will result in the test
+// reloading/restarting until we reach the desired history length.
+function maybeNavigateForHistory() {
+  const kNavigationLimit = 5
+
+  const url = new URL(location.href);
+
+  // First, perform some real navigations as well as history.pushState to this
+  // same page. Normally this would increase `history.length`.
+  if (url.searchParams.get("navigationCount") == null)
+    url.searchParams.append("navigationCount", 1);
+
+  let navigationCount = parseInt(url.searchParams.get("navigationCount"));
+
+  if (navigationCount <= kNavigationLimit) {
+    url.searchParams.set('navigationCount', ++navigationCount);
+    location.href = url;
+    history.pushState({} , "");
+    return;
+  }
+}
diff --git a/tests/wpt/tests/fetch/api/basic/WEB_FEATURES.yml b/tests/wpt/tests/fetch/api/basic/WEB_FEATURES.yml
new file mode 100644
index 00000000000..d6cd4adaeff
--- /dev/null
+++ b/tests/wpt/tests/fetch/api/basic/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: fetch-request-streams
+  files:
+  - request-upload*
diff --git a/tests/wpt/tests/fetch/api/body/mime-type.any.js b/tests/wpt/tests/fetch/api/body/mime-type.any.js
index 67c9af7da2d..ed19309bdb2 100644
--- a/tests/wpt/tests/fetch/api/body/mime-type.any.js
+++ b/tests/wpt/tests/fetch/api/body/mime-type.any.js
@@ -87,7 +87,7 @@
 
 [
   () => new Request("about:blank", { method: "POST", body: new Blob([""], { type: "Text/Plain" }), headers: [["Content-Type", "Text/Html"]] }),
-  () => new Response(new Blob([""], { type: "Text/Plain" }, { headers: [["Content-Type", "Text/Html"]] }))
+  () => new Response(new Blob([""], { type: "Text/Plain" }), { headers: [["Content-Type", "Text/Html"]] })
 ].forEach(bodyContainerCreator => {
   const bodyContainer = bodyContainerCreator();
   const cloned = bodyContainer.clone();
diff --git a/tests/wpt/tests/fetch/api/request/WEB_FEATURES.yml b/tests/wpt/tests/fetch/api/request/WEB_FEATURES.yml
new file mode 100644
index 00000000000..69b2ea582a2
--- /dev/null
+++ b/tests/wpt/tests/fetch/api/request/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: fetch-priority
+  files:
+  - request-init-priority.any.js
diff --git a/tests/wpt/tests/fetch/api/resources/keepalive-helper.js b/tests/wpt/tests/fetch/api/resources/keepalive-helper.js
index 1e75c060aea..ad0e9bfa06c 100644
--- a/tests/wpt/tests/fetch/api/resources/keepalive-helper.js
+++ b/tests/wpt/tests/fetch/api/resources/keepalive-helper.js
@@ -117,7 +117,7 @@ function assertStashedTokenAsync(
  *
  * `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
+ * different from `keepaliveRedirectInUnloadTest()` in that the latter
  * performs fetch() call directly in `unload` event handler, while this test
  * does it in `load`.
  */
diff --git a/tests/wpt/tests/fetch/content-encoding/zstd/WEB_FEATURES.yml b/tests/wpt/tests/fetch/content-encoding/zstd/WEB_FEATURES.yml
new file mode 100644
index 00000000000..b5d970fdb14
--- /dev/null
+++ b/tests/wpt/tests/fetch/content-encoding/zstd/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: zstd
+  files: "**"
diff --git a/tests/wpt/tests/fetch/http-cache/README.md b/tests/wpt/tests/fetch/http-cache/README.md
index 512c422e108..f3815aabfd9 100644
--- a/tests/wpt/tests/fetch/http-cache/README.md
+++ b/tests/wpt/tests/fetch/http-cache/README.md
@@ -62,6 +62,7 @@ Possible members of a request object:
 - expected_response_headers - An array of `[header_name_string, header_value_string]` representing
                               headers to check the response for. See also response_headers.
 - expected_response_text - A string to check the response body against. If not present, `response_body` will be checked if present and non-null; otherwise the response body will be checked for the test uuid (unless the status code disallows a body). Set to `null` to disable all response body checking.
+- url_params - A string of url parameters that will be appended to the end of the url, separated by "&" and without leading "&".
 
 Some headers in `response_headers` are treated specially:
 
@@ -69,4 +70,3 @@ Some headers in `response_headers` are treated specially:
 * For URL-carrying headers, the value will be appended as a query parameter for `target`.
 
 See the source for exact details.
-
diff --git a/tests/wpt/tests/fetch/http-cache/heuristic.any.js b/tests/wpt/tests/fetch/http-cache/heuristic.any.js
index d8461318882..2bec1aa4c64 100644
--- a/tests/wpt/tests/fetch/http-cache/heuristic.any.js
+++ b/tests/wpt/tests/fetch/http-cache/heuristic.any.js
@@ -32,10 +32,33 @@ var tests = [
         ],
       },
       {
-        expected_type: "not_cached"
+        expected_type: "not_cached",
       }
     ]
-  }
+  },
+  {
+    name: "HTTP cache does not reuse a redirected response with no max-age and no Last-Modified header",
+    requests: [
+      {
+        response_status: [301, "Moved Permanently"],
+        response_headers: [
+          ["Cache-Control", "private"],
+          ["Location", "redirect_target"]
+        ],
+      },
+      { skip: true}, // Response to first redirect
+      {
+        response_status: [301, "Moved Permanently"],
+        response_headers: [
+          ["Cache-Control", "private"],
+          ["Location", "redirect_target"]
+        ],
+        expected_type: "not_cached",
+      },
+      { skip: true}, // response to second redirect
+    ],
+    check_count: true,
+  },
 ];
 
 function check_status(status) {
diff --git a/tests/wpt/tests/fetch/http-cache/http-cache.js b/tests/wpt/tests/fetch/http-cache/http-cache.js
index 19f1ca9b2bc..e2234736910 100644
--- a/tests/wpt/tests/fetch/http-cache/http-cache.js
+++ b/tests/wpt/tests/fetch/http-cache/http-cache.js
@@ -43,17 +43,25 @@ function makeTest (test) {
     var uuid = token()
     var requests = expandTemplates(test)
     var fetchFunctions = makeFetchFunctions(requests, uuid)
-    return runTest(fetchFunctions, requests, uuid)
+    return runTest(fetchFunctions, test, requests, uuid)
   }
 }
 
 function makeFetchFunctions(requests, uuid) {
     var fetchFunctions = []
     for (let i = 0; i < requests.length; ++i) {
+      var config = requests[i];
+      if (config.skip) {
+        // Skip request are ones that we expect the browser to make in
+        // response to a redirect. We don't fetch them again, but
+        // the server needs them in the config to be able to respond to
+        // them.
+        continue;
+      }
       fetchFunctions.push({
         code: function (idx) {
           var config = requests[idx]
-          var url = makeTestUrl(uuid, config)
+          var url = makeTestUrl(uuid, config);
           var init = fetchInit(requests, config)
           return fetch(url, init)
             .then(makeCheckResponse(idx, config))
@@ -71,7 +79,7 @@ function makeFetchFunctions(requests, uuid) {
     return fetchFunctions
 }
 
-function runTest(fetchFunctions, requests, uuid) {
+function runTest(fetchFunctions, test, requests, uuid) {
     var idx = 0
     function runNextStep () {
       if (fetchFunctions.length) {
@@ -93,7 +101,7 @@ function runTest(fetchFunctions, requests, uuid) {
       .then(function () {
         return getServerState(uuid)
       }).then(function (testState) {
-        checkRequests(requests, testState)
+        checkRequests(test, requests, testState)
         return Promise.resolve()
       })
 }
@@ -153,7 +161,7 @@ function makeCheckResponse (idx, config) {
     if ('expected_status' in config) {
       assert_equals(response.status, config.expected_status,
         `Response ${reqNum} status is ${response.status}, not ${config.expected_status}`)
-    } else if ('response_status' in config) {
+    } else if ('response_status' in config && config.response_status[0] != 301) {
       assert_equals(response.status, config.response_status[0],
         `Response ${reqNum} status is ${response.status}, not ${config.response_status[0]}`)
     } else {
@@ -197,7 +205,7 @@ function makeCheckResponseBody (config, uuid) {
   }
 }
 
-function checkRequests (requests, testState) {
+function checkRequests (test, requests, testState) {
   var testIdx = 0
   for (let i = 0; i < requests.length; ++i) {
     var expectedValidatingHeaders = []
@@ -225,6 +233,9 @@ function checkRequests (requests, testState) {
       })
     }
   }
+  if (test?.check_count && testState) {
+    assert_equals(requests.length, testState.length);
+  }
 }
 
 function pause () {
@@ -244,6 +255,9 @@ function makeTestUrl (uuid, config) {
   if ('query_arg' in config) {
     arg = `&target=${config.query_arg}`
   }
+  if ('url_params' in config) {
+    arg = `${arg}&${config.url_params}`
+  }
   return `${base_url}resources/http-cache.py?dispatch=test&uuid=${uuid}${arg}`
 }
 
diff --git a/tests/wpt/tests/fetch/http-cache/no-vary-search.tentative.any.js b/tests/wpt/tests/fetch/http-cache/no-vary-search.tentative.any.js
new file mode 100644
index 00000000000..6c5a714e287
--- /dev/null
+++ b/tests/wpt/tests/fetch/http-cache/no-vary-search.tentative.any.js
@@ -0,0 +1,91 @@
+// META: global=window,worker
+// META: title=NoVarySearch HTTP Cache
+// META: timeout=long
+// META: script=/common/utils.js
+// META: script=/common/get-host-info.sub.js
+// META: script=http-cache.js
+/*
+NOTE for testing No-Vary-Search-Header:
+- If `params` is set to true, `expect=("dispatch" "uuid")` must be specified.
+  Otherwise:
+  - The same HTTP Cache will be used by other tests, which are supposed
+    to be distinguished by uuid.
+  - The test utility cannot get the server's states because UA will use the HTTP
+    Cache instead of sending a new request to server to ask for the latest state.
+- Do not test not_cached cases and cached cases within one test. Test infra
+  checks the number of requests and responses without considering if the
+  previous responses should be served from cache or not.
+*/
+var tests = [
+  {
+    name: "When params is set to true, URL differs only by their parameters (other than `dispatch` and `uuid`) should not be cached as different entries.",
+    requests: [
+      {
+        url_params: "a=1&b=2",
+        response_headers: [
+          ["Cache-Control", "max-age=10000"],
+          ["No-Vary-Search", "params, except=(\"dispatch\" \"uuid\")"],
+        ],
+      },
+      {
+        expected_type: "cached"
+      }
+    ]
+  },
+  {
+    name: "Ground truth: When key-order is not set, URLs should be compared in an order-sensitive way.",
+    requests: [
+      {
+        url_params: "a=1&b=2",
+        response_headers: [
+          ["Cache-Control", "max-age=10000"],
+        ],
+      },
+      {
+        url_params: "b=2&a=1",
+        expected_type: "not_cached"
+      }
+    ]
+  },
+  {
+    name: "When key-order is set , URLs should be compared in an order-insensitive way. Matched cases:",
+    requests: [
+      {
+        url_params: "a=1&b=2",
+        response_headers: [
+          ["Cache-Control", "max-age=10000"],
+          ["No-Vary-Search", "key-order"],
+        ],
+      },
+      {
+        url_params: "b=2&a=1",
+        expected_type: "cached"
+      }
+    ]
+  },
+  {
+    name: "When key-order is set , URLs should be compared in an order-insensitive way. Not matched cases",
+    requests: [
+      {
+        url_params: "a=1&b=2",
+        response_headers: [
+          ["Cache-Control", "max-age=10000"],
+          ["No-Vary-Search", "key-order"],
+        ],
+      },
+      {
+        url_params: "b=2",
+        expected_type: "not_cached"
+      },
+      {
+        url_params: "a=2&b=2",
+        expected_type: "not_cached"
+      },
+      {
+        url_params: "a=1&b=2&c=3",
+        expected_type: "not_cached"
+      }
+    ]
+  }
+];
+run_tests(tests);
diff --git a/tests/wpt/tests/fetch/http-cache/pragma-no-cache-with-cache-control.html b/tests/wpt/tests/fetch/http-cache/pragma-no-cache-with-cache-control.html
new file mode 100644
index 00000000000..19a80fe5edc
--- /dev/null
+++ b/tests/wpt/tests/fetch/http-cache/pragma-no-cache-with-cache-control.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTTP Cache: Cache-Control with Pragma: no-cache</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+promise_test(async t => {
+  // According to https://www.rfc-editor.org/rfc/rfc9111.html#name-pragma
+  // the pragma header is deprecated.
+  // When there's a mismatch between pragma and Cache-Control then the latter
+  // should be respected, and the resource should be cached.
+  const url = 'resources/cached_pragma_rand.py'
+
+  // First fetch to populate the cache
+  const response1 = await fetch(url, { cache: 'default' });
+  assert_true(response1.ok, 'First fetch should succeed');
+  const text1 = await response1.text();
+
+  // Second fetch should be served from cache
+  const response2 = await fetch(url, { cache: 'default' });
+  assert_true(response2.ok, 'Second fetch should succeed');
+  const text2 = await response2.text();
+
+  assert_equals(text1, text2, 'Responses should be identical, indicating caching');
+}, 'Response with Cache-Control: max-age=2592000, public and Pragma: no-cache should be cached');
+</script>
+</body>
diff --git a/tests/wpt/tests/fetch/http-cache/resources/cached_pragma_rand.py b/tests/wpt/tests/fetch/http-cache/resources/cached_pragma_rand.py
new file mode 100644
index 00000000000..18c7d25159f
--- /dev/null
+++ b/tests/wpt/tests/fetch/http-cache/resources/cached_pragma_rand.py
@@ -0,0 +1,14 @@
+def main(request, response):
+    # Disable non-standard XSS protection
+    response.headers.set(b"X-XSS-Protection", b"0")
+    response.headers.set(b"Content-Type", b"text/html")
+
+    # Set caching headers
+    # According to rfc9111 Pragma: no-cache is deprecated, so we expect
+    # Cache-Control to take precedence when there's a mismatch.
+    response.headers.set(b"Cache-Control", b"max-age=2592000, public")
+    response.headers.set(b"Pragma", b"no-cache")
+
+    # Include a timestamp to verify caching behavior
+    import time
+    response.content = f"Timestamp: {time.time()}".encode('utf-8')
diff --git a/tests/wpt/tests/fetch/http-cache/split-cache.html b/tests/wpt/tests/fetch/http-cache/split-cache.html
index fe93d2e3400..c822abba3ac 100644
--- a/tests/wpt/tests/fetch/http-cache/split-cache.html
+++ b/tests/wpt/tests/fetch/http-cache/split-cache.html
@@ -128,7 +128,7 @@ function performFullTest(is_cross_site_test, load_resource_in_iframe, name) {
   function check_server_info() {
     return getServerState(uuid)
       .then(function (testState) {
-        checkRequests(local_requests, testState)
+        checkRequests(undefined, local_requests, testState)
         return Promise.resolve()
       })
   }
diff --git a/tests/wpt/tests/fetch/local-network-access/META.yml b/tests/wpt/tests/fetch/local-network-access/META.yml
new file mode 100644
index 00000000000..4c5c6983ed0
--- /dev/null
+++ b/tests/wpt/tests/fetch/local-network-access/META.yml
@@ -0,0 +1,5 @@
+spec: https://wicg.github.io/local-network-access/
+suggested_reviewers:
+  - cthomp
+  - camillelamy
+  - hchao
diff --git a/tests/wpt/tests/fetch/local-network-access/README.md b/tests/wpt/tests/fetch/local-network-access/README.md
new file mode 100644
index 00000000000..95066cdcd0b
--- /dev/null
+++ b/tests/wpt/tests/fetch/local-network-access/README.md
@@ -0,0 +1,11 @@
+# Local Network Access tests
+
+This directory contains tests for Local Network Access' integration with
+the Fetch specification.
+
+See also:
+
+* [Explainer](https://github.com/explainers-by-googlers/local-network-access)
+
+Local Network Access replaced [Private Network
+Access](https://wicg.github.io/local-network-access/).
diff --git a/tests/wpt/tests/fetch/local-network-access/fetch.tentative.https.html b/tests/wpt/tests/fetch/local-network-access/fetch.tentative.https.html
new file mode 100644
index 00000000000..9c591f309b7
--- /dev/null
+++ b/tests/wpt/tests/fetch/local-network-access/fetch.tentative.https.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>LNA Fetch tests: HTTPS </title>
+<body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/support.sub.js"></script>
+<script>
+  "use strict";
+
+  promise_test(t => {
+    const sourceUrl = resolveUrl("resources/fetch-private.html",
+        sourceResolveOptions({ server: Server.HTTPS_PUBLIC }));
+
+    function checkResult(evt) {
+      checkTestResult(evt.data, FetchTestResult.SUCCESS);
+      t.done();
+    }
+
+    const promise = new Promise((resolve) => {
+                      window.addEventListener('message', resolve, {once: true});
+                    }).then(checkResult);
+    const popup = window.open(sourceUrl);
+    t.add_cleanup(() => popup.close());
+
+    return promise;
+  }, 'LNA Public to private with permission');
+
+  promise_test(t => {
+    // TODO(crbug.com/406991278): consider moving permission url param into
+    // options
+    const sourceUrl = resolveUrl("resources/fetch-private.html?permission=denied",
+        sourceResolveOptions({ server: Server.HTTPS_PUBLIC }));
+
+    function checkResult(evt) {
+      checkTestResult(evt.data, FetchTestResult.FAILURE);
+      t.done();
+    }
+
+    const promise = new Promise((resolve) => {
+                      window.addEventListener('message', resolve, {once: true});
+                    }).then(checkResult);
+    const popup = window.open(sourceUrl);
+    t.add_cleanup(() => popup.close());
+
+    return promise;
+  }, 'LNA Public to private with permission denied');
+</script>
+</body>
diff --git a/tests/wpt/tests/fetch/local-network-access/resources/fetch-private.html b/tests/wpt/tests/fetch/local-network-access/resources/fetch-private.html
new file mode 100644
index 00000000000..b96a207ec33
--- /dev/null
+++ b/tests/wpt/tests/fetch/local-network-access/resources/fetch-private.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Fetch Private resource</title>
+
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="support.sub.js"></script>
+<script>
+"use strict";
+
+// Set the 'local-network-access' permission then attempt to fetch a resource
+// in the private address space.
+//
+// By default, 'local-network-access' permission is set to 'granted'. This can
+// be changed by passing in a different value via the 'permission' URL parameter.
+// Valid values:
+//
+//    * granted
+//    * denied
+//    * prompt
+Promise.resolve().then(async () => {
+
+  const window_url = new URL(window.location.href);
+  let permission_value = 'granted';
+  if (window_url.searchParams.has('permission')) {
+     permission_value = window_url.searchParams.get('permission');
+  }
+
+  test_driver.set_test_context(opener);
+  await test_driver.set_permission({ name: 'local-network-access' }, permission_value);
+
+  const target = {
+    server: Server.HTTPS_PRIVATE,
+    behavior: { response: ResponseBehavior.allowCrossOrigin() },
+  };
+  const targetUrl = resolveTargetUrl(target);
+
+  fetch(targetUrl)
+      .then(async function(response) {
+        const body = await response.text();
+        const message = {
+          ok: response.ok,
+          type: response.type,
+          body: body,
+        };
+        opener.postMessage(message, "*");
+      })
+      .catch(error => {
+        opener.postMessage({ error: error.toString() }, "*");
+      });
+});
+</script>
diff --git a/tests/wpt/tests/fetch/local-network-access/resources/support.sub.js b/tests/wpt/tests/fetch/local-network-access/resources/support.sub.js
new file mode 100644
index 00000000000..774e34d0a6f
--- /dev/null
+++ b/tests/wpt/tests/fetch/local-network-access/resources/support.sub.js
@@ -0,0 +1,186 @@
+// Maps protocol (without the trailing colon) and address space to port.
+const SERVER_PORTS = {
+  "http": {
+    "local": {{ports[http][0]}},
+    "private": {{ports[http-private][0]}},
+    "public": {{ports[http-public][0]}},
+  },
+  "https": {
+    "local": {{ports[https][0]}},
+    "other-local": {{ports[https][1]}},
+    "private": {{ports[https-private][0]}},
+    "public": {{ports[https-public][0]}},
+  },
+  "ws": {
+    "local": {{ports[ws][0]}},
+  },
+  "wss": {
+    "local": {{ports[wss][0]}},
+  },
+};
+
+// A `Server` is a web server accessible by tests. It has the following shape:
+//
+// {
+//   addressSpace: the IP address space of the server ("local", "private" or
+//     "public"),
+//   name: a human-readable name for the server,
+//   port: the port on which the server listens for connections,
+//   protocol: the protocol (including trailing colon) spoken by the server,
+// }
+//
+// Constants below define the available servers, which can also be accessed
+// programmatically with `get()`.
+class Server {
+  // Maps the given `protocol` (without a trailing colon) and `addressSpace` to
+  // a server. Returns null if no such server exists.
+  static get(protocol, addressSpace) {
+    const ports = SERVER_PORTS[protocol];
+    if (ports === undefined) {
+      return null;
+    }
+
+    const port = ports[addressSpace];
+    if (port === undefined) {
+      return null;
+    }
+
+    return {
+      addressSpace,
+      name: `${protocol}-${addressSpace}`,
+      port,
+      protocol: protocol + ':',
+    };
+  }
+
+  static HTTP_LOCAL = Server.get("http", "local");
+  static HTTP_PRIVATE = Server.get("http", "private");
+  static HTTP_PUBLIC = Server.get("http", "public");
+  static HTTPS_LOCAL = Server.get("https", "local");
+  static OTHER_HTTPS_LOCAL = Server.get("https", "other-local");
+  static HTTPS_PRIVATE = Server.get("https", "private");
+  static HTTPS_PUBLIC = Server.get("https", "public");
+  static WS_LOCAL = Server.get("ws", "local");
+  static WSS_LOCAL = Server.get("wss", "local");
+};
+
+// Resolves a URL relative to the current location, returning an absolute URL.
+//
+// `url` specifies the relative URL, e.g. "foo.html" or "http://foo.example".
+// `options`, if defined, should have the following shape:
+//
+//   {
+//     // Optional. Overrides the protocol of the returned URL.
+//     protocol,
+//
+//     // Optional. Overrides the port of the returned URL.
+//     port,
+//
+//     // Extra headers.
+//     headers,
+//
+//     // Extra search params.
+//     searchParams,
+//   }
+//
+function resolveUrl(url, options) {
+  const result = new URL(url, window.location);
+  if (options === undefined) {
+    return result;
+  }
+
+  const { port, protocol, headers, searchParams } = options;
+  if (port !== undefined) {
+    result.port = port;
+  }
+  if (protocol !== undefined) {
+    result.protocol = protocol;
+  }
+  if (headers !== undefined) {
+    const pipes = [];
+    for (key in headers) {
+      pipes.push(`header(${key},${headers[key]})`);
+    }
+    result.searchParams.append("pipe", pipes.join("|"));
+  }
+  if (searchParams !== undefined) {
+    for (key in searchParams) {
+      result.searchParams.append(key, searchParams[key]);
+    }
+  }
+
+  return result;
+}
+
+// Computes options to pass to `resolveUrl()` for a source document's URL.
+//
+// `server` identifies the server from which to load the document.
+// `treatAsPublic`, if set to true, specifies that the source document should
+// be artificially placed in the `public` address space using CSP.
+function sourceResolveOptions({ server, treatAsPublic }) {
+  const options = {...server};
+  if (treatAsPublic) {
+    options.headers = { "Content-Security-Policy": "treat-as-public-address" };
+  }
+  return options;
+}
+
+// Computes the URL of a target handler configured with the given options.
+//
+// `server` identifies the server from which to load the resource.
+// `behavior` specifies the behavior of the target server. It may contain:
+//   - `response`: The result of calling one of `ResponseBehavior`'s methods.
+//   - `redirect`: A URL to which the target should redirect GET requests.
+function resolveTargetUrl({ server, behavior }) {
+  if (server === undefined) {
+    throw new Error("no server specified.");
+  }
+  const options = {...server};
+  if (behavior) {
+    const { response, redirect } = behavior;
+    options.searchParams = {
+      ...response,
+    };
+    if (redirect !== undefined) {
+      options.searchParams.redirect = redirect;
+    }
+  }
+
+  return resolveUrl("target.py", options);
+}
+
+// Methods generate behavior specifications for how `resources/target.py`
+// should behave upon receiving a regular (non-preflight) request.
+const ResponseBehavior = {
+  // The response should succeed without CORS headers.
+  default: () => ({}),
+
+  // The response should succeed with CORS headers.
+  allowCrossOrigin: () => ({ "final-headers": "cors" }),
+};
+
+const FetchTestResult = {
+  SUCCESS: {
+    ok: true,
+    body: "success",
+  },
+  OPAQUE: {
+    ok: false,
+    type: "opaque",
+    body: "",
+  },
+  FAILURE: {
+    error: "TypeError: Failed to fetch",
+  },
+};
+
+// Helper function for checking results from fetch tests.
+function checkTestResult(actual, expected) {
+  assert_equals(actual.error, expected.error, "error mismatch");
+  assert_equals(actual.ok, expected.ok, "response ok mismatch");
+  assert_equals(actual.body, expected.body, "response body mismatch");
+
+  if (expected.type !== undefined) {
+    assert_equals(type, expected.type, "response type mismatch");
+  }
+}
diff --git a/tests/wpt/tests/fetch/local-network-access/resources/target.py b/tests/wpt/tests/fetch/local-network-access/resources/target.py
new file mode 100644
index 00000000000..eabcdd47517
--- /dev/null
+++ b/tests/wpt/tests/fetch/local-network-access/resources/target.py
@@ -0,0 +1,105 @@
+# This endpoint responds to requests for a target of a (possible) LNA request.
+#
+# Its behavior can be configured with various search/GET parameters, all of
+# which are optional:
+#
+# - final-headers: Valid values are:
+#   - cors: this endpoint responds with valid CORS headers to CORS-enabled
+#     non-preflight requests. These should be sufficient for non-preflighted
+#     CORS-enabled requests to succeed.
+#   - sw: this endpoint responds with a valid Service-Worker header to allow
+#     for the request to serve as a Service worker script resource. This is
+#     only valid in conjunction with the cors value above.
+#   - unspecified: this endpoint responds with no CORS headers to non-preflight
+#     requests. This should fail CORS-enabled requests, but be sufficient for
+#     no-CORS requests.
+#
+# The following parameters only affect non-preflight responses:
+#
+# - redirect: If set, the response code is set to 301 and the `Location`
+#   response header is set to this value.
+# - mime-type: If set, the `Content-Type` response header is set to this value.
+# - file: Specifies a path (relative to this file's directory) to a file. If
+#   set, the response body is copied from this file.
+# - random-js-prefix: If set to any value, the response body is prefixed with
+#   a Javascript comment line containing a random value. This is useful in
+#   service worker tests, since service workers are only updated if the new
+#   script is not byte-for-byte identical with the old script.
+# - body: If set and `file` is not, the response body is set to this value.
+#
+
+import os
+import random
+
+from wptserve.utils import isomorphic_encode
+
+_ACAO = ("Access-Control-Allow-Origin", "*")
+_ACAH = ("Access-Control-Allow-Headers", "Service-Worker")
+
+def _get_response_headers(method, mode, origin):
+  acam = ("Access-Control-Allow-Methods", method)
+
+  if mode == b"cors":
+    return [acam, _ACAO]
+
+  if mode == b"cors+sw":
+    return [acam, _ACAO, _ACAH]
+
+  if mode == b"navigation":
+    return [
+        acam,
+        ("Access-Control-Allow-Origin", origin),
+        ("Access-Control-Allow-Credentials", "true"),
+    ]
+
+  return []
+
+
+def _is_loaded_in_fenced_frame(request):
+  return request.GET.get(b"is-loaded-in-fenced-frame")
+
+def _final_response_body(request):
+  file_name = None
+  if file_name is None:
+    file_name = request.GET.get(b"file")
+  if file_name is None:
+    return request.GET.get(b"body") or "success"
+
+  prefix = b""
+  if request.GET.get(b"random-js-prefix"):
+    value = random.randint(0, 1000000000)
+    prefix = isomorphic_encode("// Random value: {}\n\n".format(value))
+
+  path = os.path.join(os.path.dirname(isomorphic_encode(__file__)), file_name)
+  with open(path, 'rb') as f:
+    contents = f.read()
+
+  return prefix + contents
+
+def _handle_final_request(request, response):
+  mode = request.GET.get(b"final-headers")
+  origin = request.headers.get("Origin")
+  headers = _get_response_headers(request.method, mode, origin)
+
+  redirect = request.GET.get(b"redirect")
+  if redirect is not None:
+    headers.append(("Location", redirect))
+    return (301, headers, b"")
+
+  mime_type = request.GET.get(b"mime-type")
+  if mime_type is not None:
+    headers.append(("Content-Type", mime_type),)
+
+  if _is_loaded_in_fenced_frame(request):
+    headers.append(("Supports-Loading-Mode", "fenced-frame"))
+
+  body = _final_response_body(request)
+  return (headers, body)
+
+
+def main(request, response):
+  try:
+    return _handle_final_request(request, response)
+  except BaseException as e:
+    # Surface exceptions to the client, where they show up as assertion errors.
+    return (500, [("X-exception", str(e))], "exception: {}".format(e))
diff --git a/tests/wpt/tests/fetch/private-network-access/README.md b/tests/wpt/tests/fetch/private-network-access/README.md
index a69aab48723..cbb5b85b74d 100644
--- a/tests/wpt/tests/fetch/private-network-access/README.md
+++ b/tests/wpt/tests/fetch/private-network-access/README.md
@@ -8,3 +8,6 @@ See also:
 * [The specification](https://wicg.github.io/private-network-access/)
 * [The repository](https://github.com/WICG/private-network-access/)
 * [Open issues](https://github.com/WICG/private-network-access/issues/)
+
+Private Network Access is deprecated and will eventually be replaced by [Local
+Network Access](https://github.com/explainers-by-googlers/local-network-access).
diff --git a/tests/wpt/tests/fetch/private-network-access/fenced-frame-no-preflight-required.tentative.https.window.js b/tests/wpt/tests/fetch/private-network-access/fenced-frame-no-preflight-required.tentative.https.window.js
deleted file mode 100644
index 33e94d57f1a..00000000000
--- a/tests/wpt/tests/fetch/private-network-access/fenced-frame-no-preflight-required.tentative.https.window.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// META: script=/common/dispatcher/dispatcher.js
-// META: script=/common/utils.js
-// META: script=resources/support.sub.js
-// META: script=/fenced-frame/resources/utils.js
-// META: timeout=long
-//
-// Spec: https://wicg.github.io/private-network-access/#integration-fetch
-//
-// These tests verify that contexts can navigate fenced frames to more-public or
-// same address spaces without private network access preflight request header.
-
-setup(() => {
-  assert_true(window.isSecureContext);
-});
-
-// Source: secure local context.
-//
-// All fetches unaffected by Private Network Access.
-
-promise_test(
-    t => fencedFrameTest(t, {
-      source: {server: Server.HTTPS_LOCAL},
-      target: {server: Server.HTTPS_LOCAL},
-      expected: FrameTestResult.SUCCESS,
-    }),
-    'local to local: no preflight required.');
-
-promise_test(
-    t => fencedFrameTest(t, {
-      source: {server: Server.HTTPS_LOCAL},
-      target: {server: Server.HTTPS_PRIVATE},
-      expected: FrameTestResult.SUCCESS,
-    }),
-    'local to private: no preflight required.');
-
-promise_test(
-    t => fencedFrameTest(t, {
-      source: {server: Server.HTTPS_LOCAL},
-      target: {server: Server.HTTPS_PUBLIC},
-      expected: FrameTestResult.SUCCESS,
-    }),
-    'local to public: no preflight required.');
-
-promise_test(
-    t => fencedFrameTest(t, {
-      source: {server: Server.HTTPS_PRIVATE},
-      target: {server: Server.HTTPS_PRIVATE},
-      expected: FrameTestResult.SUCCESS,
-    }),
-    'private to private: no preflight required.');
-
-promise_test(
-    t => fencedFrameTest(t, {
-      source: {server: Server.HTTPS_PRIVATE},
-      target: {server: Server.HTTPS_PUBLIC},
-      expected: FrameTestResult.SUCCESS,
-    }),
-    'private to public: no preflight required.');
-
-promise_test(
-    t => fencedFrameTest(t, {
-      source: {server: Server.HTTPS_PUBLIC},
-      target: {server: Server.HTTPS_PUBLIC},
-      expected: FrameTestResult.SUCCESS,
-    }),
-    'public to public: no preflight required.');
-
-promise_test(
-    t => fencedFrameTest(t, {
-      source: {
-        server: Server.HTTPS_LOCAL,
-        treatAsPublic: true,
-      },
-      target: {server: Server.HTTPS_PUBLIC},
-      expected: FrameTestResult.SUCCESS,
-    }),
-    'treat-as-public-address to public: no preflight required.');
-
-promise_test(
-    t => fencedFrameTest(t, {
-      source: {
-        server: Server.HTTPS_LOCAL,
-        treatAsPublic: true,
-      },
-      target: {
-        server: Server.HTTPS_PUBLIC,
-        behavior: {preflight: PreflightBehavior.optionalSuccess(token())}
-      },
-      expected: FrameTestResult.SUCCESS,
-    }),
-    'treat-as-public-address to local: optional preflight');
diff --git a/tests/wpt/tests/fetch/private-network-access/fenced-frame-subresource-fetch.tentative.https.window.js b/tests/wpt/tests/fetch/private-network-access/fenced-frame-subresource-fetch.tentative.https.window.js
deleted file mode 100644
index 2dff325e3e1..00000000000
--- a/tests/wpt/tests/fetch/private-network-access/fenced-frame-subresource-fetch.tentative.https.window.js
+++ /dev/null
@@ -1,330 +0,0 @@
-// META: script=/common/subset-tests-by-key.js
-// META: script=/common/utils.js
-// META: script=resources/support.sub.js
-// META: script=/fenced-frame/resources/utils.js
-// META: variant=?include=baseline
-// META: variant=?include=from-local
-// META: variant=?include=from-private
-// META: variant=?include=from-public
-// META: timeout=long
-//
-// Spec: https://wicg.github.io/private-network-access/#integration-fetch
-//
-// These tests verify that secure contexts can fetch subresources in fenced
-// frames from all address spaces, provided that the target server, if more
-// private than the initiator, respond affirmatively to preflight requests.
-//
-
-setup(() => {
-  // Making sure we are in a secure context, as expected.
-  assert_true(window.isSecureContext);
-});
-
-// Source: secure local context.
-//
-// All fetches unaffected by Private Network Access.
-
-subsetTestByKey(
-    'from-local', promise_test, t => fencedFrameFetchTest(t, {
-                                  source: {server: Server.HTTPS_LOCAL},
-                                  target: {server: Server.HTTPS_LOCAL},
-                                  fetchOptions: {method: 'GET', mode: 'cors'},
-                                  expected: FetchTestResult.SUCCESS,
-                                }),
-    'local to local: no preflight required.');
-
-subsetTestByKey(
-    'from-local', promise_test,
-    t => fencedFrameFetchTest(t, {
-      source: {server: Server.HTTPS_LOCAL},
-      target: {
-        server: Server.HTTPS_PRIVATE,
-        behavior: {response: ResponseBehavior.allowCrossOrigin()},
-      },
-      fetchOptions: {method: 'GET', mode: 'cors'},
-      expected: FetchTestResult.SUCCESS,
-    }),
-    'local to private: no preflight required.');
-
-
-subsetTestByKey(
-    'from-local', promise_test,
-    t => fencedFrameFetchTest(t, {
-      source: {server: Server.HTTPS_LOCAL},
-      target: {
-        server: Server.HTTPS_PUBLIC,
-        behavior: {response: ResponseBehavior.allowCrossOrigin()},
-      },
-      fetchOptions: {method: 'GET', mode: 'cors'},
-      expected: FetchTestResult.SUCCESS,
-    }),
-    'local to public: no preflight required.');
-
-// Strictly speaking, the following two tests do not exercise PNA-specific
-// logic, but they serve as a baseline for comparison, ensuring that non-PNA
-// preflight requests are sent and handled as expected.
-
-subsetTestByKey(
-    'baseline', promise_test,
-    t => fencedFrameFetchTest(t, {
-      source: {server: Server.HTTPS_LOCAL},
-      target: {
-        server: Server.HTTPS_PUBLIC,
-        behavior: {
-          preflight: PreflightBehavior.failure(),
-          response: ResponseBehavior.allowCrossOrigin(),
-        },
-      },
-      fetchOptions: {method: 'PUT', mode: 'cors'},
-      expected: FetchTestResult.FAILURE,
-    }),
-    'local to public: PUT preflight failure.');
-
-subsetTestByKey(
-    'baseline', promise_test,
-    t => fencedFrameFetchTest(t, {
-      source: {server: Server.HTTPS_LOCAL},
-      target: {
-        server: Server.HTTPS_PUBLIC,
-        behavior: {
-          preflight: PreflightBehavior.success(token()),
-          response: ResponseBehavior.allowCrossOrigin(),
-        }
-      },
-      fetchOptions: {method: 'PUT', mode: 'cors'},
-      expected: FetchTestResult.SUCCESS,
-    }),
-    'local to public: PUT preflight success.');
-
-// Generates tests of preflight behavior for a single (source, target) pair.
-//
-// Scenarios:
-//
-//  - cors mode:
-//    - preflight response has non-2xx HTTP code
-//    - preflight response is missing CORS headers
-//    - preflight response is missing the PNA-specific `Access-Control` header
-//    - final response is missing CORS headers
-//    - success
-//    - success with PUT method (non-"simple" request)
-//  - no-cors mode:
-//    - 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({
-  subsetKey,
-  source,
-  sourceDescription,
-  targetServer,
-  targetDescription,
-}) {
-  const prefix = `${sourceDescription} to ${targetDescription}: `;
-
-  subsetTestByKey(
-      subsetKey, promise_test,
-      t => fencedFrameFetchTest(t, {
-        source,
-        target: {
-          server: targetServer,
-          behavior: {
-            preflight: PreflightBehavior.failure(),
-            response: ResponseBehavior.allowCrossOrigin(),
-          },
-        },
-        fetchOptions: {method: 'GET', mode: 'cors'},
-        expected: FetchTestResult.FAILURE,
-      }),
-      prefix + 'failed preflight.');
-
-  subsetTestByKey(
-      subsetKey, promise_test,
-      t => fencedFrameFetchTest(t, {
-        source,
-        target: {
-          server: targetServer,
-          behavior: {
-            preflight: PreflightBehavior.noCorsHeader(token()),
-            response: ResponseBehavior.allowCrossOrigin(),
-          },
-        },
-        fetchOptions: {method: 'GET', mode: 'cors'},
-        expected: FetchTestResult.FAILURE,
-      }),
-      prefix + 'missing CORS headers on preflight response.');
-
-  subsetTestByKey(
-      subsetKey, promise_test,
-      t => fencedFrameFetchTest(t, {
-        source,
-        target: {
-          server: targetServer,
-          behavior: {
-            preflight: PreflightBehavior.noPnaHeader(token()),
-            response: ResponseBehavior.allowCrossOrigin(),
-          },
-        },
-        fetchOptions: {method: 'GET', mode: 'cors'},
-        expected: FetchTestResult.FAILURE,
-      }),
-      prefix + 'missing PNA header on preflight response.');
-
-  subsetTestByKey(
-      subsetKey, promise_test,
-      t => fencedFrameFetchTest(t, {
-        source,
-        target: {
-          server: targetServer,
-          behavior: {preflight: PreflightBehavior.success(token())},
-        },
-        fetchOptions: {method: 'GET', mode: 'cors'},
-        expected: FetchTestResult.FAILURE,
-      }),
-      prefix + 'missing CORS headers on final response.');
-
-  subsetTestByKey(
-      subsetKey, promise_test,
-      t => fencedFrameFetchTest(t, {
-        source,
-        target: {
-          server: targetServer,
-          behavior: {
-            preflight: PreflightBehavior.success(token()),
-            response: ResponseBehavior.allowCrossOrigin(),
-          },
-        },
-        fetchOptions: {method: 'GET', mode: 'cors'},
-        expected: FetchTestResult.SUCCESS,
-      }),
-      prefix + 'success.');
-
-  subsetTestByKey(
-      subsetKey, promise_test,
-      t => fencedFrameFetchTest(t, {
-        source,
-        target: {
-          server: targetServer,
-          behavior: {
-            preflight: PreflightBehavior.success(token()),
-            response: ResponseBehavior.allowCrossOrigin(),
-          },
-        },
-        fetchOptions: {method: 'PUT', mode: 'cors'},
-        expected: FetchTestResult.SUCCESS,
-      }),
-      prefix + 'PUT success.');
-
-  subsetTestByKey(
-      subsetKey, promise_test, t => fencedFrameFetchTest(t, {
-                                 source,
-                                 target: {server: targetServer},
-                                 fetchOptions: {method: 'GET', mode: 'no-cors'},
-                                 expected: FetchTestResult.FAILURE,
-                               }),
-      prefix + 'no-CORS mode failed preflight.');
-
-  subsetTestByKey(
-      subsetKey, promise_test,
-      t => fencedFrameFetchTest(t, {
-        source,
-        target: {
-          server: targetServer,
-          behavior: {preflight: PreflightBehavior.noCorsHeader(token())},
-        },
-        fetchOptions: {method: 'GET', mode: 'no-cors'},
-        expected: FetchTestResult.FAILURE,
-      }),
-      prefix + 'no-CORS mode missing CORS headers on preflight response.');
-
-  subsetTestByKey(
-      subsetKey, promise_test,
-      t => fencedFrameFetchTest(t, {
-        source,
-        target: {
-          server: targetServer,
-          behavior: {preflight: PreflightBehavior.noPnaHeader(token())},
-        },
-        fetchOptions: {method: 'GET', mode: 'no-cors'},
-        expected: FetchTestResult.FAILURE,
-      }),
-      prefix + 'no-CORS mode missing PNA header on preflight response.');
-
-  subsetTestByKey(
-      subsetKey, promise_test,
-      t => fencedFrameFetchTest(t, {
-        source,
-        target: {
-          server: targetServer,
-          behavior: {preflight: PreflightBehavior.success(token())},
-        },
-        fetchOptions: {method: 'GET', mode: 'no-cors'},
-        expected: FetchTestResult.OPAQUE,
-      }),
-      prefix + 'no-CORS mode success.');
-}
-
-// Source: private secure context.
-//
-// Fetches to the local address space require a successful preflight response
-// carrying a PNA-specific header.
-
-makePreflightTests({
-  subsetKey: 'from-private',
-  source: {server: Server.HTTPS_PRIVATE},
-  sourceDescription: 'private',
-  targetServer: Server.HTTPS_LOCAL,
-  targetDescription: 'local',
-});
-
-subsetTestByKey(
-    'from-private', promise_test, t => fencedFrameFetchTest(t, {
-                                    source: {server: Server.HTTPS_PRIVATE},
-                                    target: {server: Server.HTTPS_PRIVATE},
-                                    fetchOptions: {method: 'GET', mode: 'cors'},
-                                    expected: FetchTestResult.SUCCESS,
-                                  }),
-    'private to private: no preflight required.');
-
-subsetTestByKey(
-    'from-private', promise_test,
-    t => fencedFrameFetchTest(t, {
-      source: {server: Server.HTTPS_PRIVATE},
-      target: {
-        server: Server.HTTPS_PRIVATE,
-        behavior: {response: ResponseBehavior.allowCrossOrigin()},
-      },
-      fetchOptions: {method: 'GET', mode: 'cors'},
-      expected: FetchTestResult.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({
-  subsetKey: 'from-public',
-  source: {server: Server.HTTPS_PUBLIC},
-  sourceDescription: 'public',
-  targetServer: Server.HTTPS_LOCAL,
-  targetDescription: 'local',
-});
-
-makePreflightTests({
-  subsetKey: 'from-public',
-  source: {server: Server.HTTPS_PUBLIC},
-  sourceDescription: 'public',
-  targetServer: Server.HTTPS_PRIVATE,
-  targetDescription: 'private',
-});
-
-subsetTestByKey(
-    'from-public', promise_test, t => fencedFrameFetchTest(t, {
-                                   source: {server: Server.HTTPS_PUBLIC},
-                                   target: {server: Server.HTTPS_PUBLIC},
-                                   fetchOptions: {method: 'GET', mode: 'cors'},
-                                   expected: FetchTestResult.SUCCESS,
-                                 }),
-    'public to public: no preflight required.');
diff --git a/tests/wpt/tests/fetch/private-network-access/fenced-frame.tentative.https.window.js b/tests/wpt/tests/fetch/private-network-access/fenced-frame.tentative.https.window.js
deleted file mode 100644
index 370cc9fbe9d..00000000000
--- a/tests/wpt/tests/fetch/private-network-access/fenced-frame.tentative.https.window.js
+++ /dev/null
@@ -1,150 +0,0 @@
-// META: script=/common/dispatcher/dispatcher.js
-// META: script=/common/utils.js
-// META: script=resources/support.sub.js
-// META: script=/fenced-frame/resources/utils.js
-// META: timeout=long
-//
-// Spec: https://wicg.github.io/private-network-access/#integration-fetch
-//
-// These tests verify that contexts can navigate fenced frames to less-public
-// address spaces iff the target server responds affirmatively to preflight
-// requests.
-
-setup(() => {
-  assert_true(window.isSecureContext);
-});
-
-// 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
-//   - preflight response has the required PNA related headers, but still fails
-//     because of the limitation of fenced frame that subjects to PNA checks.
-//
-function makePreflightTests({
-  sourceName,
-  sourceServer,
-  sourceTreatAsPublic,
-  targetName,
-  targetServer,
-}) {
-  const prefix = `${sourceName} to ${targetName}: `;
-
-  const source = {
-    server: sourceServer,
-    treatAsPublic: sourceTreatAsPublic,
-  };
-
-  promise_test_parallel(
-      t => fencedFrameTest(t, {
-        source,
-        target: {
-          server: targetServer,
-          behavior: {preflight: PreflightBehavior.failure()},
-        },
-        expected: FrameTestResult.FAILURE,
-      }),
-      prefix + 'failed preflight.');
-
-  promise_test_parallel(
-      t => fencedFrameTest(t, {
-        source,
-        target: {
-          server: targetServer,
-          behavior: {preflight: PreflightBehavior.noCorsHeader(token())},
-        },
-        expected: FrameTestResult.FAILURE,
-      }),
-      prefix + 'missing CORS headers.');
-
-  promise_test_parallel(
-      t => fencedFrameTest(t, {
-        source,
-        target: {
-          server: targetServer,
-          behavior: {preflight: PreflightBehavior.noPnaHeader(token())},
-        },
-        expected: FrameTestResult.FAILURE,
-      }),
-      prefix + 'missing PNA header.');
-
-  promise_test_parallel(
-      t => fencedFrameTest(t, {
-        source,
-        target: {
-          server: targetServer,
-          behavior: {
-            preflight: PreflightBehavior.success(token()),
-            response: ResponseBehavior.allowCrossOrigin()
-          },
-        },
-        expected: FrameTestResult.FAILURE,
-      }),
-      prefix + 'failed because fenced frames are incompatible with PNA.');
-}
-
-// 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',
-});
-
-// 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',
-});
-
-// 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 => fencedFrameTest(t, {
-      source: {
-        server: Server.HTTPS_LOCAL,
-        treatAsPublic: true,
-      },
-      target: {server: Server.HTTPS_LOCAL},
-      expected: FrameTestResult.FAILURE,
-    }),
-    'treat-as-public-address to local (same-origin): fenced frame embedder ' +
-    'initiated navigation has opaque origin.');
-
-makePreflightTests({
-  sourceServer: Server.HTTPS_LOCAL,
-  sourceTreatAsPublic: true,
-  sourceName: 'treat-as-public-address',
-  targetServer: Server.HTTPS_PRIVATE,
-  targetName: 'private',
-});
diff --git a/tests/wpt/tests/fetch/security/dangling-markup/dangling-markup-mitigation-allowed-apis.https.html b/tests/wpt/tests/fetch/security/dangling-markup/dangling-markup-mitigation-allowed-apis.https.html
new file mode 100644
index 00000000000..62804283075
--- /dev/null
+++ b/tests/wpt/tests/fetch/security/dangling-markup/dangling-markup-mitigation-allowed-apis.https.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  const blank = 'about:blank';
+  const dangling_url = 'resources/empty.html?\n<';
+  const navigation_api_calls = [
+    `window.open(\`${dangling_url}\`,'_self')`,
+    `location.replace(\`${dangling_url}\`)`,
+  ];
+
+  function get_requests(test, worker, expected) {
+    return new Promise((resolve, reject) => {
+      let didTimeout = false;
+      test.step_timeout(() => {
+        didTimeout = true;
+        reject("get_requests timed out");
+      }, 1000);
+      navigator.serviceWorker.addEventListener('message', function onMsg(evt) {
+        if (evt.data.size >= expected) {
+          navigator.serviceWorker.removeEventListener('message', onMsg);
+          resolve(evt.data);
+        } else if (!didTimeout) {
+          worker.postMessage("");
+        }
+      });
+      worker.postMessage("");
+    });
+  }
+
+  navigation_api_calls.forEach(call => {
+    async_test(t => {
+      const iframe =
+        document.body.appendChild(document.createElement('iframe'));
+      t.step(() => {
+        iframe.contentWindow.eval(call);
+        t.step_timeout(() => {
+          assert_false(iframe.contentWindow.location.href.endsWith(blank));
+          t.done();
+        }, 500);
+      });
+    }, `Does not block ${call}`);
+  });
+
+  const dangling_resource = "404?type=text/javascript&\n<"
+  const dangling_resource_expected = "404?type=text/javascript&%3C"
+  const api_calls = [
+    [`const xhr = new XMLHttpRequest();
+     xhr.open("GET", \`${"xhr" + dangling_resource}\`);
+     xhr.send(null);`, "xhr"],
+    [`new EventSource(\`${"EventSource" + dangling_resource}\`)`,"EventSource"],
+    [`fetch(\`${"fetch" + dangling_resource}\`).catch(()=>{})`, "fetch"],
+    [`new Worker(\`${"Worker" + dangling_resource}\`)`, "Worker"],
+    [`let text = \`try{importScripts(\\\`${location.href + "/../importScripts" + dangling_resource}\\\`)}catch(e){}\`;
+     let blob = new Blob([text], {type : 'text/javascript'});
+     let url = URL.createObjectURL(blob);
+     new Worker(url)`, "importScripts"],
+
+  ];
+
+  let iframe, registration;
+  promise_test(async t => {
+    iframe = document.createElement('iframe');
+    iframe.src = "resources/empty.html";
+    document.body.appendChild(iframe);
+    await new Promise(resolve => iframe.onload = resolve);
+    registration = await navigator.serviceWorker.register('service-worker.js');
+    if (!iframe.contentWindow.navigator.serviceWorker.controller)
+      await new Promise(resolve => iframe.contentWindow.navigator.serviceWorker.oncontrollerchange = resolve);
+  }, "Setup controlled frame");
+
+  let number_api_calls = 0;
+  api_calls.forEach(call => {
+    promise_test(async t => {
+      iframe.contentWindow.eval(call[0]);
+      const requests = await get_requests(t, registration.active, number_api_calls + 1);
+      assert_equals(Array.from(requests)[number_api_calls], call[1] + dangling_resource_expected);
+      number_api_calls++;
+    }, `Does not block ${call[1]}`);
+  });
+  promise_test(async () => {
+    iframe.remove();
+    registration.unregister();
+  }, "Clean up iframe");
+
+  async_test(t => {
+    let url = new URL(location.origin + "/" + dangling_url);
+    // Newlines are removed by the URL parser.
+    assert_true(url.href.endsWith(encodeURI(dangling_url.replace("\n",""))));
+    t.done();
+  }, `Does not block new URL()`);
+</script>
diff --git a/tests/wpt/tests/fetch/security/dangling-markup/dangling-markup-mitigation-allowed-apis.tentative.https.html b/tests/wpt/tests/fetch/security/dangling-markup/dangling-markup-mitigation-allowed-apis.tentative.https.html
deleted file mode 100644
index 428decfc583..00000000000
--- a/tests/wpt/tests/fetch/security/dangling-markup/dangling-markup-mitigation-allowed-apis.tentative.https.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html>
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-<script>
-  const blank = 'about:blank';
-  const dangling_url = 'resources/empty.html?\n<';
-  const navigation_api_calls = [
-    `window.open(\`${dangling_url}\`,'_self')`,
-    `location.replace(\`${dangling_url}\`)`,
-  ];
-
-  function get_requests(worker, expected) {
-    return new Promise(resolve => {
-      navigator.serviceWorker.addEventListener('message', function onMsg(evt) {
-        if (evt.data.size >= expected) {
-          navigator.serviceWorker.removeEventListener('message', onMsg);
-          resolve(evt.data);
-        } else {
-          worker.postMessage("");
-        }
-      });
-      worker.postMessage("");
-    });
-  }
-
-  navigation_api_calls.forEach(call => {
-    async_test(t => {
-      const iframe =
-        document.body.appendChild(document.createElement('iframe'));
-      t.step(() => {
-        iframe.contentWindow.eval(call);
-        t.step_timeout(() => {
-          assert_false(iframe.contentWindow.location.href.endsWith(blank));
-          t.done();
-        }, 500);
-      });
-    }, `Does not block ${call}`);
-  });
-
-  const dangling_resource = "404?type=text/javascript&\n<"
-  const api_calls = [
-    [`const xhr = new XMLHttpRequest();
-     xhr.open("GET", \`${"xhr" + dangling_resource}\`);
-     xhr.send(null);`, "xhr"],
-    [`new EventSource(\`${"EventSource" + dangling_resource}\`)`,"EventSource"],
-    [`fetch(\`${"fetch" + dangling_resource}\`).catch(()=>{})`, "fetch"],
-    [`new Worker(\`${"Worker" + dangling_resource}\`)`, "Worker"],
-    [`let text = \`try{importScripts(\\\`${location.href + "/../importScripts" + dangling_resource}\\\`)}catch(e){}\`;
-     let blob = new Blob([text], {type : 'text/javascript'});
-     let url = URL.createObjectURL(blob);
-     new Worker(url)`, "importScripts"],
-
-  ];
-
-  navigator.serviceWorker.register('service-worker.js');
-  const iframe = document.createElement('iframe');
-  iframe.src = "resources/empty.html";
-  document.body.appendChild(iframe);
-  api_calls.forEach(call => {
-    promise_test(t => {
-      return new Promise(resolve => {
-        navigator.serviceWorker.ready.then(t.step_func(registration => {
-          iframe.contentWindow.eval(call[0]);
-          get_requests(registration.active, 0).then(t.step_func(requests => {
-            resolve(assert_true(requests.has(call[1] + dangling_resource)));
-          }));
-        }));
-      });
-    }, `Does not block ${call[1]}`);
-  });
-
-  async_test(t => {
-    let url = new URL(location.origin + "/" + dangling_url);
-    // Newlines are removed by the URL parser.
-    assert_true(url.href.endsWith(encodeURI(dangling_url.replace("\n",""))));
-    t.done();
-  }, `Does not block new URL()`);
-</script>
diff --git a/tests/wpt/tests/file-system-access/WEB_FEATURES.yml b/tests/wpt/tests/file-system-access/WEB_FEATURES.yml
new file mode 100644
index 00000000000..7faf67952b5
--- /dev/null
+++ b/tests/wpt/tests/file-system-access/WEB_FEATURES.yml
@@ -0,0 +1,7 @@
+features:
+- name: file-system-access
+  files: "**"
+- name: origin-private-file-system
+  files:
+  - getDirectory.https.any.js
+  - opaque-origin.https.window.js
diff --git a/tests/wpt/tests/fledge/tentative/abort.https.window.js b/tests/wpt/tests/fledge/tentative/abort.https.window.js
index db6aae46045..e4a3189a30c 100644
--- a/tests/wpt/tests/fledge/tentative/abort.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/abort.https.window.js
@@ -4,7 +4,7 @@
 // META: script=resources/fledge-util.sub.js
 // META: timeout=long
 
-"use strict;"
+"use strict";
 
 promise_test(async test => {
   const uuid = generateUuid(test);
diff --git a/tests/wpt/tests/fledge/tentative/additional-bids.https.window.js b/tests/wpt/tests/fledge/tentative/additional-bids.https.window.js
index edacb05512e..384a9e62030 100644
--- a/tests/wpt/tests/fledge/tentative/additional-bids.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/additional-bids.https.window.js
@@ -6,7 +6,7 @@
 // META: timeout=long
 // META: variant=?1-last
 
-"use strict;"
+"use strict";
 
 // This file contains tests for additional bids and negative targeting.
 //
diff --git a/tests/wpt/tests/fledge/tentative/auction-config-passed-to-worklets.https.window.js b/tests/wpt/tests/fledge/tentative/auction-config-passed-to-worklets.https.window.js
index dec49b80a96..1fb59972b58 100644
--- a/tests/wpt/tests/fledge/tentative/auction-config-passed-to-worklets.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/auction-config-passed-to-worklets.https.window.js
@@ -12,7 +12,7 @@
 // META: variant=?26-30
 // META: variant=?30-35
 
-"use strict;"
+"use strict";
 
 // These tests focus on making sure AuctionConfig fields are passed to seller worklets,
 // and are normalized if necessary. This test does not check the behaviors of the
diff --git a/tests/wpt/tests/fledge/tentative/auction-config.https.window.js b/tests/wpt/tests/fledge/tentative/auction-config.https.window.js
index 50b9cb9e9e6..e0e27d23db2 100644
--- a/tests/wpt/tests/fledge/tentative/auction-config.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/auction-config.https.window.js
@@ -19,7 +19,7 @@
 // META: variant=?61-65
 // META: variant=?66-last
 
-"use strict;"
+"use strict";
 
 // The tests in this file focus on calls to runAdAuction with various
 // auctionConfigs.
@@ -601,12 +601,16 @@ subsetTest(promise_test, async test => {
     })
   };
 
-  // In the first auction, browserSignals.forDebuggingOnlyInCooldownOrLockout in
-  // generateBid() and scoreAd() should both be false. After the auction,
-  // lockout and cooldowns should be updated.
   await runBasicFledgeAuctionAndNavigate(test, uuid, auctionConfigOverrides);
-  await waitForObservedRequestsIgnoreDebugOnlyReports(
-      uuid, [bidderReportURL2, sellerReportURL2]);
+  // TODO(crbug.com/337186761) this causes the test being flaky.
+  // Note: In the first auction,
+  // browserSignals.forDebuggingOnlyInCooldownOrLockout in generateBid() and
+  // scoreAd() should both be false. But due to currently there's no way to
+  // clean up the lockout/cooldown DB tables after a test, so a rerun of this
+  // test will break this, and other tests that writes to these tables may also
+  // affect this test. So we cannot reliably check the signals being false.
+  // await waitForObservedRequestsIgnoreDebugOnlyReports(
+  //     uuid, [bidderReportURL2, sellerReportURL2]);
 
   // In the second auction, browserSignals.forDebuggingOnlyInCooldownOrLockout
   // in generateBid() and scoreAd() should both be true, since both the buyer
diff --git a/tests/wpt/tests/fledge/tentative/clear-origin-joined-ad-interest-groups.https.window.js b/tests/wpt/tests/fledge/tentative/clear-origin-joined-ad-interest-groups.https.window.js
index 097978a7858..9f0818da2c4 100644
--- a/tests/wpt/tests/fledge/tentative/clear-origin-joined-ad-interest-groups.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/clear-origin-joined-ad-interest-groups.https.window.js
@@ -9,7 +9,7 @@
 // META: variant=?9-12
 // META: variant=?13-last
 
-"use strict;"
+"use strict";
 
 ///////////////////////////////////////////////////////////////////////////////
 // Basic tests with no interest groups joined.
diff --git a/tests/wpt/tests/fledge/tentative/component-ads.https.window.js b/tests/wpt/tests/fledge/tentative/component-ads.https.window.js
index 6fec80102bb..9e3e6e8878d 100644
--- a/tests/wpt/tests/fledge/tentative/component-ads.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/component-ads.https.window.js
@@ -169,15 +169,14 @@ subsetTest(promise_test, async test => {
      window.fence.reportEvent({eventType: "beacon",
                                eventData: status,
                                destination: ["buyer"]});`);
-  await joinInterestGroup(
-      test, uuid,
-      { biddingLogicURL:
-          createBiddingScriptURL({
-              generateBid:
-                  'if (interestGroup.componentAds !== undefined) throw "unexpected componentAds"',
-              reportWin:
-                  `registerAdBeacon({beacon: "${createBidderBeaconURL(uuid)}"});` }),
-        ads: [{renderUrl: renderURL}]});
+  await joinInterestGroup(test, uuid, {
+    biddingLogicURL: createBiddingScriptURL({
+      generateBid:
+          'if (interestGroup.componentAds !== undefined) throw "unexpected componentAds"',
+      reportWin: `registerAdBeacon({beacon: "${createBidderBeaconURL(uuid)}"});`
+    }),
+    ads: [{renderURL: renderURL}]
+  });
   await runBasicFledgeAuctionAndNavigate(
       test, uuid,
       {decisionLogicURL: createDecisionScriptURL(
diff --git a/tests/wpt/tests/fledge/tentative/cross-origin-embedder-policy.https.window.js b/tests/wpt/tests/fledge/tentative/cross-origin-embedder-policy.https.window.js
new file mode 100644
index 00000000000..09a89e2009d
--- /dev/null
+++ b/tests/wpt/tests/fledge/tentative/cross-origin-embedder-policy.https.window.js
@@ -0,0 +1,39 @@
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/common/utils.js
+// META: script=resources/fledge-util.sub.js
+// META: timeout=long
+
+"use strict";
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+
+  let otherWindow = await createTopLevelWindow(test, OTHER_ORIGIN1);
+
+  // Join a cross-origin InterestGroup in a top-level window navigated to its origin.
+  // Has to be top-level to avoid being subject to the Cross-Origin-Embedder-Policy
+  // of this page.
+  await runInFrame(test, otherWindow,
+      `await joinInterestGroup(test_instance, "${uuid}");`);
+
+  // Run an auction in this frame using the other origin as a bidder. The bidding
+  // script load should not be blocked by the COEP that blocks cross-origin
+  // resources.
+  await runBasicFledgeTestExpectingWinner(
+    test, uuid,
+    { interestGroupBuyers: [OTHER_ORIGIN1] });
+}, 'COEP does not block bidder scripts.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+
+  // Run an auction with a cross-origin seller script, it should not be blocked
+  // by COEP.
+  await joinGroupAndRunBasicFledgeTestExpectingWinner(
+    test,
+    { uuid,
+      auctionConfigOverrides : {seller: OTHER_ORIGIN1,
+        decisionLogicURL: createDecisionScriptURL(uuid, { origin: OTHER_ORIGIN1 })
+    }});
+}, 'COEP does not block seller scripts.');
diff --git a/tests/wpt/tests/fledge/tentative/cross-origin-embedder-policy.https.window.js.headers b/tests/wpt/tests/fledge/tentative/cross-origin-embedder-policy.https.window.js.headers
new file mode 100644
index 00000000000..20319c1b02d
--- /dev/null
+++ b/tests/wpt/tests/fledge/tentative/cross-origin-embedder-policy.https.window.js.headers
@@ -0,0 +1 @@
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff --git a/tests/wpt/tests/fledge/tentative/cross-origin.https.window.js b/tests/wpt/tests/fledge/tentative/cross-origin.https.window.js
index 9669f2790bc..c1119a94d59 100644
--- a/tests/wpt/tests/fledge/tentative/cross-origin.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/cross-origin.https.window.js
@@ -9,7 +9,7 @@
 // META: variant=?9-12
 // META: variant=?13-last
 
-"use strict;"
+"use strict";
 
 ////////////////////////////////////////////////////////////////////////////////
 // Join interest group in iframe tests.
@@ -132,7 +132,7 @@ subsetTest(promise_test, async test => {
 
 subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  // Join an interest group owned by the the main frame's origin.
+  // Join an interest group owned by the main frame's origin.
   await joinInterestGroup(test, uuid);
 
   let iframe = await createIframe(test, OTHER_ORIGIN1);
@@ -147,7 +147,7 @@ subsetTest(promise_test, async test => {
 
 subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  // Join an interest group owned by the the main frame's origin.
+  // Join an interest group owned by the main frame's origin.
   await joinInterestGroup(test, uuid);
 
   let iframe = await createIframe(test, OTHER_ORIGIN1, "run-ad-auction");
@@ -183,7 +183,7 @@ subsetTest(promise_test, async test => {
 
 subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  // Join an interest group owned by the the main frame's origin.
+  // Join an interest group owned by the main frame's origin.
   await joinInterestGroup(test, uuid);
 
   let iframe = await createIframe(test, OTHER_ORIGIN1, `run-ad-auction ${OTHER_ORIGIN1}`);
diff --git a/tests/wpt/tests/fledge/tentative/currency.https.window.js b/tests/wpt/tests/fledge/tentative/currency.https.window.js
index f1b2bba8734..b65dea5820a 100644
--- a/tests/wpt/tests/fledge/tentative/currency.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/currency.https.window.js
@@ -14,7 +14,7 @@
 // META: variant=?29-32
 // META: variant=?33-last
 
-'use strict;'
+'use strict';
 
 const ORIGIN = window.location.origin;
 
diff --git a/tests/wpt/tests/fledge/tentative/deprecated-render-url-replacements.https.window.js b/tests/wpt/tests/fledge/tentative/deprecated-render-url-replacements.https.window.js
index 75377ca7aa3..51daaf27797 100644
--- a/tests/wpt/tests/fledge/tentative/deprecated-render-url-replacements.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/deprecated-render-url-replacements.https.window.js
@@ -10,7 +10,7 @@
 // META: variant=?16-last
 
 
-"use strict;"
+"use strict";
 
 // This test ensures proper handling of deprecatedRenderURLReplacements within auctionConfigOverrides.
 // It validates that these replacements are correctly applied to the winning bid's renderURL by
diff --git a/tests/wpt/tests/fledge/tentative/direct-from-seller-signals.https.window.js b/tests/wpt/tests/fledge/tentative/direct-from-seller-signals.https.window.js
index 3f58b2c8ad5..a4e6911491d 100644
--- a/tests/wpt/tests/fledge/tentative/direct-from-seller-signals.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/direct-from-seller-signals.https.window.js
@@ -14,7 +14,7 @@
 // META: variant=?29-32
 // META: variant=?33-36
 
-"use strict;"
+"use strict";
 
 subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
diff --git a/tests/wpt/tests/fledge/tentative/generate-bid-browser-signals.https.window.js b/tests/wpt/tests/fledge/tentative/generate-bid-browser-signals.https.window.js
index 00c4bfdcc31..ee0cdd84efa 100644
--- a/tests/wpt/tests/fledge/tentative/generate-bid-browser-signals.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/generate-bid-browser-signals.https.window.js
@@ -11,9 +11,11 @@
 // META: variant=?17-20
 // META: variant=?21-24
 // META: variant=?25-28
-// META: variant=?29-last
+// META: variant=?29-32
+// META: variant=?33-36
+// META: variant=?37-last
 
-"use strict;"
+"use strict";
 
 // These tests focus on the browserSignals argument passed to generateBid().
 // Note that "topLevelSeller" is covered by component auction tests,
@@ -35,7 +37,21 @@ subsetTest(promise_test, async test => {
     'bidCount': 0,
     'multiBidLimit': 1,
     'prevWinsMs': [],
-    'forDebuggingOnlySampling': false
+    'forDebuggingOnlySampling': false,
+    'viewCounts': {
+      'pastHour': 0,
+      'pastDay': 0,
+      'pastWeek': 0,
+      'past30Days': 0,
+      'past90Days': 0
+    },
+    'clickCounts': {
+      'pastHour': 0,
+      'pastDay': 0,
+      'pastWeek': 0,
+      'past30Days': 0,
+      'past90Days': 0
+    }
   };
   let biddingLogicURL = createBiddingScriptURL({
     generateBid:
@@ -48,6 +64,17 @@ subsetTest(promise_test, async test => {
           expectedBrowserSignals.forDebuggingOnlyInCooldownOrLockout =
               browserSignals.forDebuggingOnlyInCooldownOrLockout;
 
+          // Don't check exact values of view/click reports.
+          function zeroCounts(object) {
+            object.pastHour = 0;
+            object.pastDay = 0;
+            object.pastWeek = 0;
+            object.past30Days = 0;
+            object.past90Days = 0;
+          }
+          zeroCounts(browserSignals.viewCounts);
+          zeroCounts(browserSignals.clickCounts);
+
           // Remove deprecated field, if present.
           delete browserSignals.prevWins;
 
@@ -947,3 +974,253 @@ subsetTest(promise_test, async test => {
       }
     });
 }, 'browserSignals.wasmHelper.');
+
+
+// Generates 0 or 1 clicks, dependent on `produceAttributionSrc` &
+// `produceUserAction`, and `numViews` views for `igOwner`, provided by
+// `viewClickProvider`.
+async function generateViewsAndClicks(
+    test, uuid, viewClickProvider, igOwner, numViews, produceAttributionSrc,
+    produceUserAction) {
+  let iframe = await createIframe(test, viewClickProvider);
+  let script = `
+    // We use a wrapper iframe here so the original remains in communication.
+    let frame = document.createElement('iframe');
+    document.body.appendChild(frame);
+    let frameDocument = frame.contentDocument;
+    let a = frameDocument.createElement('a');
+    a.href = '${RESOURCE_PATH}/record-click.py?' +
+        'eligible_origin=${igOwner}&num_views=${numViews}';
+    if (${produceAttributionSrc}) {
+      a.attributionSrc = '';
+    }
+    a.target = '_self';
+    a.appendChild(frameDocument.createTextNode('Click me'));
+    frameDocument.body.appendChild(a);
+
+    if (${produceUserAction}) {
+      // Note: test_driver.click() seems to not work well with Chrome's
+      // content_shell; while .bless() does... unreliably.
+      // headless_shell/chrome path seems to work reliably. User activation
+      // is used sparingly to work around content_shell flakiness.
+      await test_driver.bless('User-initiated click', () => { a.click() });
+    } else {
+      a.click();
+    }
+  `;
+
+  await runInFrame(test, iframe, script);
+}
+
+// Keep running a basic auction with an interest group in
+// `interestGroupOverrides` until it succeeds; joining and leaving the
+// IG every time to bypass caching which is permitted to provide stale
+// view/click counts.
+async function keepTryingAuctionUntilWinBypassCaching(
+    test, uuid, interestGroupOverrides) {
+  while (true) {
+    await joinInterestGroup(test, uuid, interestGroupOverrides);
+    let result = await runBasicFledgeAuction(test, uuid);
+    if (result !== null) {  // Got a winner.
+      break;
+    }
+    await leaveInterestGroup(interestGroupOverrides);
+  }
+}
+
+// Like keepTryingAuctionUntilWinBypassCaching but for auctions with
+// cross-origin interest group, owned by `igOwner`.
+async function crossOriginKeepTryingAuctionUntilWinBypassCaching(
+    test, uuid, igOwner, interestGroupOverrides) {
+  while (true) {
+    await joinCrossOriginInterestGroup(
+        test, uuid, igOwner, interestGroupOverrides);
+    const auctionConfigOverrides = {interestGroupBuyers: [igOwner]};
+    let result =
+        await runBasicFledgeAuction(test, uuid, auctionConfigOverrides);
+    if (result !== null) {  // Got a winner.
+      break;
+    }
+    await leaveCrossOriginInterestGroup(
+        test, uuid, igOwner, interestGroupOverrides);
+  }
+}
+
+// Generates `numViews` views and 0 or 1 clicks based on `produceAttributionSrc`
+// and `produceUserAction`, by `viewClickProvider` available to `igOwner`, then
+// creates an interest group for `igOwner` with given
+// `viewAndClickCountsProviders`, and runs an auction
+// to make sure the events are eventually available.
+async function testClickiness(
+    test, igOwner, viewClickProvider, numViews, produceAttributionSrc,
+    produceUserAction, viewAndClickCountsProviders = undefined) {
+  const uuid = generateUuid(test);
+
+  await generateViewsAndClicks(
+      test, uuid, viewClickProvider, igOwner, numViews, produceAttributionSrc,
+      produceUserAction);
+
+  // For clicks to be recorded, both attributionsrc attribution must exist
+  // and a user action must be used. If we don't expect clicks, we can expect
+  // that the number is exactly 0 since re-running the test won't break that.
+  //
+  // This is relying on all tests using Ad-Auction-Record-Event using distinct
+  // `viewClickProvider`s.
+  let clicksBadTest =
+      produceAttributionSrc && produceUserAction ? '< 1' : ' !== 0';
+
+  let viewsBadTest = (numViews > 0) ? `< ${numViews}` : ' !== 0';
+
+  // Join an IG to read view/click info back. We use a UUID for a name to make
+  // sure nothing old is cached, since view/clicks are permitted to be a bit
+  // stale.
+  let interestGroupOverrides = {
+    owner: igOwner,
+    name: uuid,
+    biddingLogicURL: createBiddingScriptURL({
+      origin: igOwner,
+      generateBid: `
+        // We should see at least one click and numViews views the test injects.
+        if (browserSignals.clickCounts.pastHour ${clicksBadTest} ||
+            browserSignals.clickCounts.pastDay ${clicksBadTest} ||
+            browserSignals.clickCounts.pastWeek ${clicksBadTest} ||
+            browserSignals.clickCounts.past30Days ${clicksBadTest} ||
+            browserSignals.clickCounts.past90Days ${clicksBadTest} ||
+            browserSignals.viewCounts.pastHour ${viewsBadTest} ||
+            browserSignals.viewCounts.pastDay ${viewsBadTest} ||
+            browserSignals.viewCounts.pastWeek ${viewsBadTest} ||
+            browserSignals.viewCounts.past30Days ${viewsBadTest} ||
+            browserSignals.viewCounts.past90Days ${viewsBadTest}) {
+          return -1;
+        }
+    `
+    })
+  };
+
+  if (viewAndClickCountsProviders) {
+    interestGroupOverrides.viewAndClickCountsProviders =
+        viewAndClickCountsProviders;
+  }
+
+  await crossOriginKeepTryingAuctionUntilWinBypassCaching(
+      test, uuid, igOwner, interestGroupOverrides);
+}
+
+subsetTest(promise_test, async test => {
+  const IG_OWNER = OTHER_ORIGIN5;
+  const VIEW_CLICK_PROVIDER = OTHER_ORIGIN6;
+  await testClickiness(
+      test, IG_OWNER, VIEW_CLICK_PROVIDER, /*numViews=*/ 2,
+      /*produceAttributionSrc=*/ true,
+      /*produceUserAction=*/ true, [VIEW_CLICK_PROVIDER]);
+}, 'browserSignals for clickiness.');
+
+subsetTest(promise_test, async test => {
+  const IG_OWNER = OTHER_ORIGIN5;
+  const VIEW_CLICK_PROVIDER = OTHER_ORIGIN5;
+
+  await testClickiness(
+      test, IG_OWNER, VIEW_CLICK_PROVIDER, /*numViews=*/ 4,
+      /*produceAttributionSrc=*/ false,
+      /*produceUserAction=*/ false);
+}, 'IG owner is default clickiness provider if nothing is specified');
+
+subsetTest(promise_test, async test => {
+  const IG_OWNER = OTHER_ORIGIN4;
+  const VIEW_CLICK_PROVIDER = OTHER_ORIGIN4;
+
+  await testClickiness(
+      test, IG_OWNER, VIEW_CLICK_PROVIDER, /*numViews=*/ 6,
+      /*produceAttributionSrc=*/ true,
+      /*produceUserAction=*/ true, []);
+}, 'IG owner is default clickiness provider if empty list provided');
+
+subsetTest(promise_test, async test => {
+  const IG_OWNER = OTHER_ORIGIN3;
+  const VIEW_CLICK_PROVIDER = OTHER_ORIGIN3;
+
+  await testClickiness(
+      test, IG_OWNER, VIEW_CLICK_PROVIDER, /*numViews=*/ 0,
+      /*produceAttributionSrc=*/ true,
+      /*produceUserAction=*/ true, []);
+}, 'browserSignals for clickiness --- just a click');
+
+subsetTest(promise_test, async test => {
+  const IG_OWNER = OTHER_ORIGIN2;
+  const VIEW_CLICK_PROVIDER = OTHER_ORIGIN2;
+
+  await testClickiness(
+      test, IG_OWNER, VIEW_CLICK_PROVIDER, /*numViews=*/ 1,
+      /*produceAttributionSrc=*/ true,
+      /*produceUserAction=*/ false, [VIEW_CLICK_PROVIDER]);
+}, 'browserSignals for clickiness --- no click report w/o user action');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const IG_OWNER = window.location.origin;
+  const VIEW_CLICK_PROVIDER1 = OTHER_ORIGIN1;
+  const VIEW_CLICK_PROVIDER2 = window.location.origin;
+
+  // From provider 1 have click, no views.
+  // From provider 2 have views, no clicks;
+  await generateViewsAndClicks(
+      test, uuid, VIEW_CLICK_PROVIDER1, IG_OWNER,
+      /*numViews=*/ 0, /*produceAttributionSrc=*/ true,
+      /*produceUserAction=*/ true);
+  await generateViewsAndClicks(
+      test, uuid, VIEW_CLICK_PROVIDER2, IG_OWNER,
+      /*numViews=*/ 2, /*produceAttributionSrc=*/ false,
+      /*produceUserAction=*/ false);
+
+  // Create an IG that subscribes only to provider 2 --- it should only see
+  // the views.
+  let interestGroupOverrides = {
+    name: uuid,
+    viewAndClickCountsProviders: [VIEW_CLICK_PROVIDER2],
+    biddingLogicURL: createBiddingScriptURL({
+      generateBid: `
+        if (browserSignals.clickCounts.pastHour !== 0 ||
+            browserSignals.viewCounts.pastHour < 2) {
+          throw JSON.stringify(browserSignals);
+        }
+    `
+    })
+  };
+
+  await keepTryingAuctionUntilWinBypassCaching(
+      test, uuid, interestGroupOverrides);
+
+  // Now see that subscribing only to 1 provides only the click.
+  interestGroupOverrides = {
+    name: uuid,
+    viewAndClickCountsProviders: [VIEW_CLICK_PROVIDER1],
+    biddingLogicURL: createBiddingScriptURL({
+      generateBid: `
+        if (browserSignals.clickCounts.pastHour < 1 ||
+            browserSignals.viewCounts.pastHour !== 0) {
+          throw JSON.stringify(browserSignals);
+        }
+    `
+    })
+  };
+
+  await keepTryingAuctionUntilWinBypassCaching(
+      test, uuid, interestGroupOverrides);
+
+  // Now subscribe to both.
+  interestGroupOverrides = {
+    name: uuid,
+    viewAndClickCountsProviders: [VIEW_CLICK_PROVIDER1, VIEW_CLICK_PROVIDER2],
+    biddingLogicURL: createBiddingScriptURL({
+      generateBid: `
+        if (browserSignals.clickCounts.pastHour < 1 ||
+            browserSignals.viewCounts.pastHour < 2) {
+          throw JSON.stringify(browserSignals);
+        }
+    `
+    })
+  };
+
+  await keepTryingAuctionUntilWinBypassCaching(
+      test, uuid, interestGroupOverrides);
+}, 'browserSignals for clickiness --- viewAndClickCountsProviders works.');
diff --git a/tests/wpt/tests/fledge/tentative/get-interest-group-auction-data.https.window.js b/tests/wpt/tests/fledge/tentative/get-interest-group-auction-data.https.window.js
index 855e6b5a075..2f2fb390dec 100644
--- a/tests/wpt/tests/fledge/tentative/get-interest-group-auction-data.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/get-interest-group-auction-data.https.window.js
@@ -12,6 +12,8 @@
 // META: variant=?13-16
 // META: variant=?17-last
 
+"use strict";
+
 // These tests focus on the navigator.getInterestGroupAdAuctionData() method.
 
 // Checks various fields for decoded InterestGroupAdAuctionData that's
@@ -571,6 +573,55 @@ subsetTest(promise_test, async test => {
   assert_equals(decoded.message.interestGroups[OTHER_ORIGIN4][0].name, 'o4');
 }, 'getInterestGroupAdAuctionData() with multiple buyers');
 
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+
+  let renderURL = createRenderURL(uuid);
+  let bidderDebugReportURL =
+      createBidderReportURL(uuid, /*id=*/ 'forDebuggingOnly');
+
+  let biddingLogicURL = createBiddingScriptURL({
+    generateBid: `
+        forDebuggingOnly.reportAdAuctionWin('${bidderDebugReportURL}');
+        return {bid: 1, render: '${renderURL}'};`
+  });
+
+  await Promise.all([
+    joinInterestGroup(
+        test, uuid,
+        {name: 'o1', ads: [{renderURL: renderURL}], biddingLogicURL}),
+    joinInterestGroup(
+        test, uuid,
+        {name: 'o2', ads: [{renderURL: renderURL}], biddingLogicURL})
+  ]);
+
+  // Run an auction to put the origin to cooldown, or lockout.
+  await runBasicFledgeAuctionAndNavigate(test, uuid);
+
+  const result = await navigator.getInterestGroupAdAuctionData({
+    coordinatorOrigin: await BA.configureCoordinator(),
+    seller: window.location.origin
+  });
+  assert_true(result.requestId !== null);
+  assert_true(result.request.length > 0);
+
+  let decoded = await BA.decodeInterestGroupData(result.request);
+  assert_equals(decoded.message.version, 0);
+  assert_equals(decoded.message.publisher, window.location.hostname);
+  assert_equals(typeof decoded.message.generationId, 'string');
+
+  assert_equals(
+      decoded.message.interestGroups[window.location.origin].length, 2);
+  assert_equals(
+      decoded.message.interestGroups[window.location.origin][0]
+          .inCooldownOrLockout,
+      true);
+  assert_equals(
+      decoded.message.interestGroups[window.location.origin][1]
+          .inCooldownOrLockout,
+      true);
+}, 'getInterestGroupAdAuctionData() InCooldownOrLockout in each IG');
+
 subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
 
@@ -659,7 +710,7 @@ subsetTest(promise_test, async test => {
   assert_true(result.requestId !== null);
   assert_own_property(result, 'requests');
   assert_equals(result.requests.length, 1);
-  validateForSeller(result.requests[0], window.location.origin);
+  await validateForSeller(result.requests[0], window.location.origin);
 }, 'getInterestGroupAdAuctionData() multi-seller with single seller');
 
 subsetTest(promise_test, async test => {
diff --git a/tests/wpt/tests/fledge/tentative/interest-group-passed-to-generate-bid.https.window.js b/tests/wpt/tests/fledge/tentative/interest-group-passed-to-generate-bid.https.window.js
index 172cbab4664..6b5602158ff 100644
--- a/tests/wpt/tests/fledge/tentative/interest-group-passed-to-generate-bid.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/interest-group-passed-to-generate-bid.https.window.js
@@ -22,7 +22,7 @@
 // META: variant=?76-80
 // META: variant=?81-85
 
-"use strict;"
+"use strict";
 
 // These tests focus on making sure InterestGroup fields are passed to generateBid(),
 // and are normalized if necessary. This test does not check the behaviors of the
diff --git a/tests/wpt/tests/fledge/tentative/interest-group-update.https.window.js b/tests/wpt/tests/fledge/tentative/interest-group-update.https.window.js
index ceac2c79a6e..24d814cf091 100644
--- a/tests/wpt/tests/fledge/tentative/interest-group-update.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/interest-group-update.https.window.js
@@ -10,7 +10,7 @@
 // META: variant=?15-19
 // META: variant=?20-last
 
-"use strict;"
+"use strict";
 
 // This test repeatedly runs auctions to verify an update. A modified bidding script
 // continuously throws errors until it detects the expected change in the interest group
@@ -32,7 +32,7 @@ const makeTestForUpdate = ({
 }) => {
   subsetTest(promise_test, async test => {
     const uuid = generateUuid(test);
-    extraBiddingLogic = ``;
+    let extraBiddingLogic = ``;
 
     let replacePlaceholders = (ads) => ads.forEach(element => {
       element.renderURL = element.renderURL.replace(`UUID-PLACEHOLDER`, uuid);
@@ -81,6 +81,12 @@ const makeTestForUpdate = ({
     };
     interestGroupOverrides.updateURL = createUpdateURL(updateParams);
     await joinInterestGroup(test, uuid, interestGroupOverrides);
+    if (interestGroupFieldName === `ads`) {
+      let interestGroup = createInterestGroupForOrigin(
+          uuid, window.location.origin, interestGroupOverrides);
+      interestGroup.ads = responseOverride;
+      await makeInterestGroupKAnonymous(interestGroup);
+    }
 
     // Run an auction until there's a winner, which means update occurred.
     let auctionResult = await runBasicFledgeAuction(test, uuid, auctionConfigOverrides);
@@ -404,4 +410,3 @@ makeTestForNoUpdate({
     trustedBiddingSignalsKeys: ['key'],
   },
 });
-
diff --git a/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group-in-fenced-frame.https.window.js b/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group-in-fenced-frame.https.window.js
index 1e2824666cc..2939d384784 100644
--- a/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group-in-fenced-frame.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group-in-fenced-frame.https.window.js
@@ -8,7 +8,7 @@
 // META: variant=?5-8
 // META: variant=?9-last
 
-"use strict;"
+"use strict";
 
 // These are separate from the other join-leave tests because these all create
 // and navigate fenced frames, which is much slower than just joining/leaving
diff --git a/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group.https.window.js b/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group.https.window.js
index 68a4e9d09c9..5e004ed1dc5 100644
--- a/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group.https.window.js
@@ -14,7 +14,7 @@
 // META: variant=?71-80
 // META: variant=?81-last
 
-"use strict;"
+"use strict";
 
 // These tests are focused on joinAdInterestGroup() and leaveAdInterestGroup().
 // Most join tests do not run auctions, but instead only check the result of
@@ -460,7 +460,7 @@ const SIMPLE_JOIN_LEAVE_TEST_CASES = [
   },
 ];
 
-for (testCase of SIMPLE_JOIN_LEAVE_TEST_CASES) {
+for (let testCase of SIMPLE_JOIN_LEAVE_TEST_CASES) {
   var test_name = 'Join and leave interest group: ';
   if ('testCaseName' in testCase) {
     test_name += testCase.testCaseName;
diff --git a/tests/wpt/tests/fledge/tentative/kanon-status-below-threshold.https.window.js b/tests/wpt/tests/fledge/tentative/kanon-status-below-threshold.https.window.js
index 6f3c2f572a1..12e8747af0b 100644
--- a/tests/wpt/tests/fledge/tentative/kanon-status-below-threshold.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/kanon-status-below-threshold.https.window.js
@@ -4,18 +4,37 @@
 // META: script=resources/fledge-util.sub.js
 // META: script=/common/subset-tests.js
 
-"use strict;"
+"use strict";
 
-subsetTest(promise_test, async test => {
-    const uuid = generateUuid(test);
-    await runReportTest(
-        test, uuid,
-        { reportWinSuccessCondition:
-            `browserSignals.kAnonStatus === "belowThreshold"`,
-          reportWin:
-            `sendReportTo('${createBidderReportURL(uuid)}');` },
-        // expectedReportURLs:
-        [createBidderReportURL(uuid)]);
+subsetTest(
+    promise_test,
+    async test => {
+      const uuid = generateUuid(test);
+
+      let reportWin = `
+      if (browserSignals.kAnonStatus !== "belowThreshold") {
+        sendReportTo('${createBidderReportURL(uuid, 'error')}');
+        return false;
+      }
+      sendReportTo('${createBidderReportURL(uuid)}');
+    `;
+      let interestGroupOverrides = {
+        biddingLogicURL: createBiddingScriptURL({reportWin: reportWin})
+      };
+      let interestGroup = createInterestGroupForOrigin(
+          uuid, window.location.origin, interestGroupOverrides);
+      await joinInterestGroupWithoutDefaults(test, interestGroup);
+
+      // Make the interest group not k-anonymous.
+      await test_driver.set_protected_audience_k_anonymity(
+          interestGroup.owner, interestGroup.name, []);
+
+      let auctionConfigOverrides = {
+        decisionLogicURL: createDecisionScriptURL(uuid, {})
+      };
+      await runBasicFledgeAuctionAndNavigate(
+          test, uuid, auctionConfigOverrides);
+      await waitForObservedRequests(uuid, [createBidderReportURL(uuid)]);
     },
     'Check kAnonStatus is "belowThreshold" when FledgeConsiderKAnonymity' +
-    'is enabled and FledgeEnforceKAnonymity is disabled');
+        'is enabled and FledgeEnforceKAnonymity is disabled');
diff --git a/tests/wpt/tests/fledge/tentative/kanon-status-not-calculated.https.window.js b/tests/wpt/tests/fledge/tentative/kanon-status-not-calculated.https.window.js
deleted file mode 100644
index 87a66c106fb..00000000000
--- a/tests/wpt/tests/fledge/tentative/kanon-status-not-calculated.https.window.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// META: script=/resources/testdriver.js
-// META: script=/resources/testdriver-vendor.js
-// META: script=/common/utils.js
-// META: script=resources/fledge-util.sub.js
-// META: script=/common/subset-tests.js
-
-"use strict;"
-
-subsetTest(promise_test, async test => {
-    const uuid = generateUuid(test);
-    await runReportTest(
-        test, uuid,
-        { reportWinSuccessCondition:
-            `browserSignals.kAnonStatus === "notCalculated"`,
-          reportWin:
-            `sendReportTo('${createBidderReportURL(uuid)}');` },
-        // expectedReportURLs:
-        [createBidderReportURL(uuid)]);
-    },
-    'Check kAnonStatus is "notCalculated" when FledgeConsiderKAnonymity' +
-    'and FledgeEnforceKAnonymity are both disabled');
diff --git a/tests/wpt/tests/fledge/tentative/no-winner.https.window.js b/tests/wpt/tests/fledge/tentative/no-winner.https.window.js
index 2632a95deee..cfa0704dbc4 100644
--- a/tests/wpt/tests/fledge/tentative/no-winner.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/no-winner.https.window.js
@@ -15,7 +15,7 @@
 // META: variant=?41-45
 // META: variant=?46-last
 
-"use strict;"
+"use strict";
 
 // The tests in this file focus on simple auctions (one bidder, one seller, one
 // origin, one frame) which have no winning bid, either due to errors or due to
@@ -76,7 +76,7 @@ const BIDDING_WASM_HELPER_ERRORS = [
   'error=not-wasm'
 ];
 
-for (error of BIDDING_LOGIC_SCRIPT_ERRORS) {
+for (let error of BIDDING_LOGIC_SCRIPT_ERRORS) {
   subsetTest(promise_test, (async (error, test) => {
     let biddingLogicURL = `${BASE_URL}resources/bidding-logic.sub.py?${error}`;
     await joinGroupAndRunBasicFledgeTestExpectingNoWinner(
@@ -86,7 +86,7 @@ for (error of BIDDING_LOGIC_SCRIPT_ERRORS) {
   }).bind(undefined, error), `Bidding logic script: ${error}`);
 }
 
-for (error of DECISION_LOGIC_SCRIPT_ERRORS) {
+for (let error of DECISION_LOGIC_SCRIPT_ERRORS) {
   subsetTest(promise_test, (async (error, test) => {
     let decisionLogicURL =
         `${BASE_URL}resources/decision-logic.sub.py?${error}`;
@@ -96,7 +96,7 @@ for (error of DECISION_LOGIC_SCRIPT_ERRORS) {
   }).bind(undefined, error), `Decision logic script: ${error}`);
 }
 
-for (error of BIDDING_WASM_HELPER_ERRORS) {
+for (let error of BIDDING_WASM_HELPER_ERRORS) {
   subsetTest(promise_test, (async (error, test) => {
     let biddingWasmHelperURL =
         `${BASE_URL}resources/wasm-helper.py?${error}`;
diff --git a/tests/wpt/tests/fledge/tentative/private-aggregation.https.window.js b/tests/wpt/tests/fledge/tentative/private-aggregation.https.window.js
index a1c261b6291..474bf4ced76 100644
--- a/tests/wpt/tests/fledge/tentative/private-aggregation.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/private-aggregation.https.window.js
@@ -10,7 +10,7 @@
 // META: variant=?11-15
 // META: variant=?16-20
 
-'use strict;'
+'use strict';
 
 // To better isolate from private aggregation tests run in parallel,
 // don't use the usual origin here.
diff --git a/tests/wpt/tests/fledge/tentative/real-time-reporting.https.window.js b/tests/wpt/tests/fledge/tentative/real-time-reporting.https.window.js
index 5ebd20d19ae..84dce53844f 100644
--- a/tests/wpt/tests/fledge/tentative/real-time-reporting.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/real-time-reporting.https.window.js
@@ -8,7 +8,7 @@
 // META: variant=?1-5
 // META: variant=?6-last
 
-'use strict;'
+'use strict';
 
 // The tests in this file focus on real time reporting.
 
diff --git a/tests/wpt/tests/fledge/tentative/register-ad-beacon.https.window.js b/tests/wpt/tests/fledge/tentative/register-ad-beacon.https.window.js
index d74f0dab5e5..98b6a75c42f 100644
--- a/tests/wpt/tests/fledge/tentative/register-ad-beacon.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/register-ad-beacon.https.window.js
@@ -8,7 +8,7 @@
 // META: variant=?6-10
 // META: variant=?11-last
 
-"use strict;"
+"use strict";
 
 subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
diff --git a/tests/wpt/tests/fledge/tentative/reporting-arguments.https.window.js b/tests/wpt/tests/fledge/tentative/reporting-arguments.https.window.js
index a3b546f5964..04af8ebc643 100644
--- a/tests/wpt/tests/fledge/tentative/reporting-arguments.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/reporting-arguments.https.window.js
@@ -9,7 +9,7 @@
 // META: variant=?11-15
 // META: variant=?16-last
 
-"use strict;"
+"use strict";
 
 // Simplified version of reportTest() for validating arguments to reporting
 // methods. Only takes expressions to check in reporting methods. "uuid" is
diff --git a/tests/wpt/tests/fledge/tentative/reporting-ids.https.window.js b/tests/wpt/tests/fledge/tentative/reporting-ids.https.window.js
index 43c78987f1e..0019393008b 100644
--- a/tests/wpt/tests/fledge/tentative/reporting-ids.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/reporting-ids.https.window.js
@@ -8,7 +8,7 @@
 // META: variant=?6-last
 
 
-"use strict;"
+"use strict";
 
 const makeTest = ({
   // Name of the test.
diff --git a/tests/wpt/tests/fledge/tentative/resources/additional-bids.py b/tests/wpt/tests/fledge/tentative/resources/additional-bids.py
index 8a947533307..89a47c0e0d0 100644
--- a/tests/wpt/tests/fledge/tentative/resources/additional-bids.py
+++ b/tests/wpt/tests/fledge/tentative/resources/additional-bids.py
@@ -23,7 +23,7 @@ class BadRequestError(Exception):
 
 def main(request, response):
   try:
-    if fledge_http_server_util.handle_cors_headers_and_preflight(request, response):
+    if fledge_http_server_util.handle_cors_headers_fail_if_preflight(request, response):
       return
 
     # Verify that Sec-Ad-Auction-Fetch is present
diff --git a/tests/wpt/tests/fledge/tentative/resources/ba-fledge-util.sub.js b/tests/wpt/tests/fledge/tentative/resources/ba-fledge-util.sub.js
index 3371813feee..8fa4eb1e351 100644
--- a/tests/wpt/tests/fledge/tentative/resources/ba-fledge-util.sub.js
+++ b/tests/wpt/tests/fledge/tentative/resources/ba-fledge-util.sub.js
@@ -1,4 +1,4 @@
-'use strict;'
+'use strict';
 
 let BA = {};
 
diff --git a/tests/wpt/tests/fledge/tentative/resources/bidding-logic.sub.py b/tests/wpt/tests/fledge/tentative/resources/bidding-logic.sub.py
index 8c0539d43c8..97d2d80343c 100644
--- a/tests/wpt/tests/fledge/tentative/resources/bidding-logic.sub.py
+++ b/tests/wpt/tests/fledge/tentative/resources/bidding-logic.sub.py
@@ -8,7 +8,7 @@ from fledge.tentative.resources import fledge_http_server_util
 # injected in them. generateBid() will by default return a bid of 9 for the
 # first ad.
 def main(request, response):
-  if fledge_http_server_util.handle_cors_headers_and_preflight(request, response):
+  if fledge_http_server_util.handle_cors_headers_fail_if_preflight(request, response):
     return
 
   error = request.GET.first(b"error", None)
diff --git a/tests/wpt/tests/fledge/tentative/resources/fledge-util.sub.js b/tests/wpt/tests/fledge/tentative/resources/fledge-util.sub.js
index ebd2b44b992..49ebfd1c596 100644
--- a/tests/wpt/tests/fledge/tentative/resources/fledge-util.sub.js
+++ b/tests/wpt/tests/fledge/tentative/resources/fledge-util.sub.js
@@ -1,10 +1,10 @@
-"use strict;"
+"use strict";
 
 const BASE_URL = document.baseURI.substring(0, document.baseURI.lastIndexOf('/') + 1);
 const BASE_PATH = (new URL(BASE_URL)).pathname;
 
 // Allow overriding to allow other repositories to use these utility functions.
-RESOURCE_PATH = `${BASE_PATH}resources/`
+let RESOURCE_PATH = `${BASE_PATH}resources/`
 
 const DEFAULT_INTEREST_GROUP_NAME = 'default name';
 
@@ -288,6 +288,7 @@ function createInterestGroupForOrigin(uuid, origin,
 async function joinInterestGroupWithoutDefaults(test, interestGroup,
                                                 durationSeconds = 60) {
   await navigator.joinAdInterestGroup(interestGroup, durationSeconds);
+  await makeInterestGroupKAnonymous(interestGroup);
   test.add_cleanup(
     async () => { await navigator.leaveAdInterestGroup(interestGroup); });
 }
@@ -694,6 +695,16 @@ async function joinCrossOriginInterestGroup(test, uuid, origin, interestGroupOve
                    `await joinInterestGroup(test_instance, "${uuid}", ${interestGroup})`);
 }
 
+// Leaves a cross-origin interest group, by running a leave in an iframe.
+async function leaveCrossOriginInterestGroup(test, uuid, origin, interestGroupOverrides = {}) {
+  let interestGroup = JSON.stringify(
+      createInterestGroupForOrigin(uuid, origin, interestGroupOverrides));
+
+  let iframe = await createIframe(test, origin, 'join-ad-interest-group');
+  await runInFrame(test, iframe,
+                   `await leaveInterestGroup(${interestGroup})`);
+}
+
 // Joins an interest group in a top-level window, which has the same origin
 // as the joined interest group.
 async function joinInterestGroupInTopLevelWindow(
@@ -969,7 +980,7 @@ let additionalBidHelper = function() {
   // not be reused in a future call to `fetchAdditionalBids()`, since this
   // mothod consumes and destroys their `testMetadata` field.
   async function fetchAdditionalBids(seller, additionalBids) {
-    additionalBidHeaderValues = await Promise.all(additionalBids.map(
+    let additionalBidHeaderValues = await Promise.all(additionalBids.map(
         async additionalBid =>
             await _convertAdditionalBidToResponseHeader(additionalBid)));
 
@@ -1030,3 +1041,107 @@ async function setCookie(test) {
   document.cookie = 'cookie=cookie; path=/'
   test.add_cleanup(deleteAllCookies);
 }
+
+async function makeInterestGroupKAnonymous(passedInterestGroup) {
+  // Make a copy so we can sanitize fields without affecting the tests.
+  let interestGroup = structuredClone(passedInterestGroup);
+  const ownerURL = new URL(interestGroup.owner);
+  interestGroup.owner = ownerURL.origin;
+  interestGroup.name = String(interestGroup.name).toWellFormed();
+  interestGroup.biddingLogicURL =
+      (new URL(interestGroup.biddingLogicURL, BASE_URL)).toString();
+
+  function b64(array) {
+    return btoa(String.fromCharCode.apply(null, array));
+  }
+  let hashes = [];
+  if (Array.isArray(interestGroup.ads)) {
+    for (const ad of interestGroup.ads) {
+      hashes.push(b64(await computeKeyHashOfAd(interestGroup, ad)));
+      hashes.push(
+          b64(await computeKeyHashOfReportingId(interestGroup, ad, null)));
+      if (Array.isArray(ad.selectableBuyerAndSellerReportingIds)) {
+        for (const id of ad.selectableBuyerAndSellerReportingIds) {
+          hashes.push(
+              b64(await computeKeyHashOfReportingId(interestGroup, ad, id)));
+        }
+      }
+    }
+  }
+  if (Array.isArray(interestGroup.adComponents)) {
+    for (const ad of interestGroup.adComponents) {
+      hashes.push(b64(await computeKeyHashOfComponentAd(interestGroup, ad)));
+    }
+  }
+  await test_driver.set_protected_audience_k_anonymity(
+      interestGroup.owner, interestGroup.name, hashes);
+}
+
+async function computeKeyHashOfAd(ig, ad) {
+  const encoder = new TextEncoder();
+  const kAnonKey = encoder.encode(
+      `AdBid\n${ig.owner}/\n${ig.biddingLogicURL}\n${ad.renderURL}`);
+  return new Uint8Array(await window.crypto.subtle.digest('SHA-256', kAnonKey));
+}
+
+async function computeKeyHashOfReportingId(ig, ad, selectedReportingId = null) {
+  const encoder = new TextEncoder();
+  let kAnonKey = null;
+  if (!selectedReportingId) {
+    if (ad.buyerAndSellerReportingId) {
+      kAnonKey = encoder.encode(
+          `BuyerAndSellerReportId\n${ig.owner}/\n${ig.biddingLogicURL}\n${
+              ad.renderURL}\n${ad.buyerAndSellerReportingId}`);
+    } else if (ad.buyerReportingId) {
+      kAnonKey = encoder.encode(`BuyerReportId\n${ig.owner}/\n${
+          ig.biddingLogicURL}\n${ad.renderURL}\n${ad.buyerReportingId}`);
+    } else {
+      kAnonKey = encoder.encode(`NameReport\n${ig.owner}/\n${
+          ig.biddingLogicURL}\n${ad.renderURL}\n${ig.name}`);
+    }
+  } else {
+    function encodeKeyPartInto(part, array) {
+      array[0] = 0x0a;
+      if (!part) {
+        for (let i = 1; i < 6; i++) {
+          array[i] = 0x00;
+        }
+        return 6;
+      }
+      const len = part.length;
+      array[1] = 0x01;
+      array[2] = (len >> 24) % 256
+      array[3] = (len >> 16) % 256
+      array[4] = (len >> 8) % 256
+      array[5] = len % 256;
+      encoder.encodeInto(part, array.subarray(6));
+      return 1 + 5 + len;
+    }
+    const baseText = `SelectedBuyerAndSellerReportId\n${ig.owner}/\n${
+        ig.biddingLogicURL}\n${ad.renderURL}`;
+    const selectedReportingIdLen =
+        1 + 5 + (selectedReportingId ? selectedReportingId.length : 0);
+    const buyerAndSellerReportingIdLen = 1 + 5 +
+        (ad.buyerAndSellerReportingId ? ad.buyerAndSellerReportingId.length : 0)
+    const buyerReportingIdLen =
+        1 + 5 + (ad.buyerReportingId ? ad.buyerReportingId.length : 0)
+    const expectedLen = baseText.length + selectedReportingIdLen +
+        buyerAndSellerReportingIdLen + buyerReportingIdLen;
+    kAnonKey = new Uint8Array(expectedLen);
+    let actualLen = 0;
+    actualLen += encoder.encodeInto(baseText, kAnonKey).written;
+    actualLen +=
+        encodeKeyPartInto(selectedReportingId, kAnonKey.subarray(actualLen));
+    actualLen += encodeKeyPartInto(
+        ad.buyerAndSellerReportingId, kAnonKey.subarray(actualLen));
+    actualLen +=
+        encodeKeyPartInto(ad.buyerReportingId, kAnonKey.subarray(actualLen));
+  }
+  return new Uint8Array(await window.crypto.subtle.digest('SHA-256', kAnonKey));
+}
+
+async function computeKeyHashOfComponentAd(ig, ad) {
+  const encoder = new TextEncoder();
+  const kAnonKey = encoder.encode(`ComponentBid\n${ad.renderURL}`);
+  return new Uint8Array(await window.crypto.subtle.digest('SHA-256', kAnonKey));
+}
diff --git a/tests/wpt/tests/fledge/tentative/resources/fledge_http_server_util.py b/tests/wpt/tests/fledge/tentative/resources/fledge_http_server_util.py
index 179262d3392..30889d92d4f 100644
--- a/tests/wpt/tests/fledge/tentative/resources/fledge_http_server_util.py
+++ b/tests/wpt/tests/fledge/tentative/resources/fledge_http_server_util.py
@@ -2,6 +2,17 @@
 from collections import namedtuple
 from urllib.parse import unquote_plus, urlparse
 
+def fail(response, body):
+    """Sets up response to fail with the provided response body.
+
+    Args:
+      response: the wptserve Response that was passed to main
+      body: the HTTP response body to use
+    """
+    response.status = (400, "Bad Request")
+    response.headers.set(b"Content-Type", b"text/plain")
+    response.content = body
+
 def headers_to_ascii(headers):
   """Converts a header map with binary values to one with ASCII values.
 
@@ -22,18 +33,15 @@ def headers_to_ascii(headers):
       header_map[pair[0].decode("ASCII")] = values
   return header_map
 
-
-def handle_cors_headers_and_preflight(request, response):
-  """Applies CORS logic common to many entrypoints.
+def attach_origin_and_credentials_headers(request, response):
+  """Attaches Access-Control-Allow-Origin and Access-Control-Allow-Credentials
+  response headers to a response, if the request indicates they're needed.
+  Only intended for internal use.
 
   Args:
     request: the wptserve Request that was passed to main
     response: the wptserve Response that was passed to main
-
-  Returns True if the request is a CORS preflight, which is entirely handled by
-  this function, so that the calling function should immediately return.
   """
-  # Append CORS headers if needed
   if b"origin" in request.headers:
     response.headers.set(b"Access-Control-Allow-Origin",
                         request.headers.get(b"origin"))
@@ -42,20 +50,50 @@ def handle_cors_headers_and_preflight(request, response):
     response.headers.set(b"Access-Control-Allow-Credentials",
                         request.headers.get(b"credentials"))
 
+def handle_cors_headers_fail_if_preflight(request, response):
+  """Adds CORS headers if necessary. In the case of CORS preflights, generates
+  a failure response. To be used when CORS preflights are not expected.
+
+  Args:
+    request: the wptserve Request that was passed to main
+    response: the wptserve Response that was passed to main
+
+  Returns True if the request is a CORS preflight, in which case the calling
+  function should immediately return.
+  """
+  # Handle CORS preflight requests.
+  if request.method == u"OPTIONS":
+    fail(response, "CORS preflight unexpectedly received.")
+    return True
+
+  # Append CORS headers if needed
+  attach_origin_and_credentials_headers(request, response)
+  return False
+
+def handle_cors_headers_and_preflight(request, response):
+  """Applies CORS logic, either adding CORS headers to response or generating
+  an entire response to preflights.
+
+  Args:
+    request: the wptserve Request that was passed to main
+    response: the wptserve Response that was passed to main
+
+  Returns True if the request is a CORS preflight, in which case the calling
+  function should immediately return.
+  """
+  # Append CORS headers if needed
+  attach_origin_and_credentials_headers(request, response)
+
   # Handle CORS preflight requests.
   if not request.method == u"OPTIONS":
     return False
 
   if not b"Access-Control-Request-Method" in request.headers:
-    response.status = (400, b"Bad Request")
-    response.headers.set(b"Content-Type", b"text/plain")
-    response.content = "Failed to get access-control-request-method in preflight!"
+    fail(response, "Failed to get access-control-request-method in preflight!")
     return True
 
   if not b"Access-Control-Request-Headers" in request.headers:
-    response.status = (400, b"Bad Request")
-    response.headers.set(b"Content-Type", b"text/plain")
-    response.content = "Failed to get access-control-request-headers in preflight!"
+    fail(response, "Failed to get access-control-request-headers in preflight!")
     return True
 
   response.headers.set(b"Access-Control-Allow-Methods",
diff --git a/tests/wpt/tests/fledge/tentative/resources/permissions.py b/tests/wpt/tests/fledge/tentative/resources/permissions.py
index eed93c42756..f66e28bb27b 100644
--- a/tests/wpt/tests/fledge/tentative/resources/permissions.py
+++ b/tests/wpt/tests/fledge/tentative/resources/permissions.py
@@ -35,7 +35,7 @@ def get_permissions(request, response):
   - 天気の良い日 / élève: allow both join and leave
   - anything else (including no subdomain): returns a 404
   """
-  if fledge_http_server_util.handle_cors_headers_and_preflight(request, response):
+  if fledge_http_server_util.handle_cors_headers_fail_if_preflight(request, response):
     return
 
   first_domain_label = re.search(r"[^.]*", request.url_parts.netloc).group(0)
diff --git a/tests/wpt/tests/fledge/tentative/resources/record-click.py b/tests/wpt/tests/fledge/tentative/resources/record-click.py
new file mode 100644
index 00000000000..b4e76873d9b
--- /dev/null
+++ b/tests/wpt/tests/fledge/tentative/resources/record-click.py
@@ -0,0 +1,21 @@
+# This responds with a page reporting a click event to the origin provided in
+# the `eligible_origin` query param. The pages loads `num_views` copies of
+# record-view.py as images in a clickiness-eligible way; with them reporting
+# view events.
+def main(request, response):
+    eligible_origin = request.GET.get(b"eligible_origin")
+    num_views = int(request.GET.get(b"num_views"))
+    response.status = (200, b"OK")
+    response.headers.set(b"Content-Type", b"text/html")
+    response.headers.set(
+        b"Ad-Auction-Record-Event",
+        b"type=\"click\", eligible-origins=(\"%s\")" % eligible_origin)
+
+    result = b"<!DOCTYPE html>"
+    img_template = b"<img src=\"record-view.py?i=%d&eligible_origin=%s\"" + \
+                   b" attributionsrc>"
+    for i in range(0, num_views):
+      view = img_template % (i, eligible_origin)
+      result = result + view
+    return result.decode("utf-8")
+
diff --git a/tests/wpt/tests/fledge/tentative/resources/record-view.py b/tests/wpt/tests/fledge/tentative/resources/record-view.py
new file mode 100644
index 00000000000..d423b2d9c72
--- /dev/null
+++ b/tests/wpt/tests/fledge/tentative/resources/record-view.py
@@ -0,0 +1,19 @@
+# This responds with an image reporting a view event to the origin provided in
+# the `eligible_origin` query param.
+def main(request, response):
+    eligible_origin = request.GET.get(b"eligible_origin")
+    response.status = (200, b"OK")
+    response.headers.set(b"Content-Type", b"image/png")
+    response.headers.set(
+        b"Ad-Auction-Record-Event",
+        b"type=\"view\", eligible-origins=(\"%s\")" % eligible_origin)
+    png = b"\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" + \
+      b"\x49\x48\x44\x52\x00\x00\x00\x05\x00\x00\x00\x05" + \
+      b"\x08\x06\x00\x00\x00\x8d\x6f\x26\xe5\x00\x00\x00" + \
+      b"\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e" + \
+      b"\xc4\x01\x95\x2b\x0e\x1b\x00\x00\x00\x15\x49\x44" + \
+      b"\x41\x54\x08\x99\x63\x64\xf8\xcf\xf0\x9f\x01\x0d" + \
+      b"\x30\xa1\x0b\x50\x41\x10\x00\xcd\xaa\x02\x08\x0f" + \
+      b"\x23\x6b\x59\x00\x00\x00\x00\x49\x45\x4e\x44\xae" + \
+      b"\x42\x60\x82"
+    return png
diff --git a/tests/wpt/tests/fledge/tentative/resources/service-worker-helper.js b/tests/wpt/tests/fledge/tentative/resources/service-worker-helper.js
index cc001813597..2b94dc60e01 100644
--- a/tests/wpt/tests/fledge/tentative/resources/service-worker-helper.js
+++ b/tests/wpt/tests/fledge/tentative/resources/service-worker-helper.js
@@ -1,4 +1,4 @@
-"use strict;"
+"use strict";
 
 // Service workers, once activated, will use 'clients.claim()'
 // so that clients loaded in the same scope do not need to be reloaded
@@ -18,4 +18,4 @@ self.addEventListener('fetch', (event) => {
     url: url,
     message: "Service worker saw this URL: " + url
   });
-});
\ No newline at end of file
+});
diff --git a/tests/wpt/tests/fledge/tentative/resources/trusted-bidding-signals.py b/tests/wpt/tests/fledge/tentative/resources/trusted-bidding-signals.py
index 5a89e3b6025..e6e7d660525 100644
--- a/tests/wpt/tests/fledge/tentative/resources/trusted-bidding-signals.py
+++ b/tests/wpt/tests/fledge/tentative/resources/trusted-bidding-signals.py
@@ -20,10 +20,12 @@ def main(request, response):
     for param in request.url_parts.query.split("&"):
         pair = param.split("=", 1)
         if len(pair) != 2:
-            return fail(response, "Bad query parameter: " + param)
+            fail(response, "Bad query parameter: " + param)
+            return
         # Browsers should escape query params consistently.
         if "%20" in pair[1]:
-            return fail(response, "Query parameter should escape using '+': " + param)
+            fail(response, "Query parameter should escape using '+': " + param)
+            return
 
         # Hostname can't be empty. The empty string can be a key or interest group name, though.
         if pair[0] == "hostname" and hostname == None and len(pair[1]) > 0:
@@ -37,20 +39,22 @@ def main(request, response):
             continue
         if pair[0] == "slotSize" or pair[0] == "allSlotsRequestedSizes":
             continue
-        return fail(response, "Unexpected query parameter: " + param)
+        fail(response, "Unexpected query parameter: " + param)
+        return
 
     # If trusted signal keys are passed in, and one of them is "cors",
-    # add appropriate Access-Control-* headers to normal requests, and handle
-    # CORS preflights.
-    if keys and "cors" in keys and fledge_http_server_util.handle_cors_headers_and_preflight(
+    # add appropriate Access-Control-* headers to normal requests.
+    if keys and "cors" in keys and fledge_http_server_util.handle_cors_headers_fail_if_preflight(
             request, response):
         return
 
     # "interestGroupNames" and "hostname" are mandatory.
     if not hostname:
-        return fail(response, "hostname missing")
+        fail(response, "hostname missing")
+        return
     if not interestGroupNames:
-        return fail(response, "interestGroupNames missing")
+        fail(response, "interestGroupNames missing")
+        return
 
     response.status = (200, b"OK")
 
@@ -153,8 +157,3 @@ def main(request, response):
     if body != None:
         return body
     return json.dumps(responseBody)
-
-def fail(response, body):
-    response.status = (400, "Bad Request")
-    response.headers.set(b"Content-Type", b"text/plain")
-    return body
diff --git a/tests/wpt/tests/fledge/tentative/resources/trusted-scoring-signals.py b/tests/wpt/tests/fledge/tentative/resources/trusted-scoring-signals.py
index 934d2e9129d..bfd23b124cb 100644
--- a/tests/wpt/tests/fledge/tentative/resources/trusted-scoring-signals.py
+++ b/tests/wpt/tests/fledge/tentative/resources/trusted-scoring-signals.py
@@ -13,7 +13,8 @@ def main(request, response):
     try:
         params = fledge_http_server_util.decode_trusted_scoring_signals_params(request)
     except ValueError as ve:
-        return fail(response, str(ve))
+        fail(response, str(ve))
+        return
 
     response.status = (200, b"OK")
 
@@ -36,7 +37,8 @@ def main(request, response):
             try:
                 signalsParams = fledge_http_server_util.decode_render_url_signals_params(renderUrl)
             except ValueError as ve:
-                return fail(response, str(ve))
+                fail(response, str(ve))
+                return
 
             for signalsParam in signalsParams:
                 if signalsParam == "close-connection":
@@ -92,8 +94,8 @@ def main(request, response):
                 responseBody[urlList["type"]][renderUrl] = value
 
     # If the signalsParam embedded inside a render URL calls for CORS, add
-    # appropriate response headers, and fully handle preflights.
-    if cors and fledge_http_server_util.handle_cors_headers_and_preflight(
+    # appropriate response headers.
+    if cors and fledge_http_server_util.handle_cors_headers_fail_if_preflight(
             request, response):
         return
 
@@ -107,8 +109,3 @@ def main(request, response):
     if body != None:
         return body
     return json.dumps(responseBody)
-
-def fail(response, body):
-    response.status = (400, "Bad Request")
-    response.headers.set(b"Content-Type", b"text/plain")
-    return body
diff --git a/tests/wpt/tests/fledge/tentative/round-a-value.https.window.js b/tests/wpt/tests/fledge/tentative/round-a-value.https.window.js
index 2195b45ea5f..21bbf295726 100644
--- a/tests/wpt/tests/fledge/tentative/round-a-value.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/round-a-value.https.window.js
@@ -4,7 +4,7 @@
 // META: script=resources/fledge-util.sub.js
 // META: timeout=long
 
-"use strict;"
+"use strict";
 
 promise_test(async test => {
   const uuid = generateUuid(test);
diff --git a/tests/wpt/tests/fledge/tentative/score-ad-browser-signals.https.window.js b/tests/wpt/tests/fledge/tentative/score-ad-browser-signals.https.window.js
index 23fee313af5..9acf994cf9f 100644
--- a/tests/wpt/tests/fledge/tentative/score-ad-browser-signals.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/score-ad-browser-signals.https.window.js
@@ -6,7 +6,7 @@
 // META: timeout=long
 // META: variant=?1-last
 
-"use strict;"
+"use strict";
 
 // These tests focus on the browserSignals argument passed to scoreAd().
 
diff --git a/tests/wpt/tests/fledge/tentative/send-report-to.https.window.js b/tests/wpt/tests/fledge/tentative/send-report-to.https.window.js
index 163443cb76d..fa0f01ccfe8 100644
--- a/tests/wpt/tests/fledge/tentative/send-report-to.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/send-report-to.https.window.js
@@ -7,7 +7,7 @@
 // META: variant=?1-5
 // META: variant=?6-last
 
-"use strict;"
+"use strict";
 
 subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
diff --git a/tests/wpt/tests/fledge/tentative/server-response-for-debugging-only.https.window.js b/tests/wpt/tests/fledge/tentative/server-response-for-debugging-only.https.window.js
index 1b4edc66a89..e6787e8a2d9 100644
--- a/tests/wpt/tests/fledge/tentative/server-response-for-debugging-only.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/server-response-for-debugging-only.https.window.js
@@ -9,6 +9,8 @@
 // META: timeout=long
 // META: variant=?1-last
 
+"use strict";
+
 // These tests focus on the debugReports field in AuctionConfig's
 // serverResponse, i.e. auctions involving forDebuggingOnly reports.
 // NOTE: Due to DB's fDO lockout/cooldown tables are not cleaned after each run
diff --git a/tests/wpt/tests/fledge/tentative/server-response-private-aggregation.https.window.js b/tests/wpt/tests/fledge/tentative/server-response-private-aggregation.https.window.js
index d7f21e16cf0..6d9a8a88770 100644
--- a/tests/wpt/tests/fledge/tentative/server-response-private-aggregation.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/server-response-private-aggregation.https.window.js
@@ -10,6 +10,8 @@
 // META: variant=?1-6
 // META: variant=?7-last
 
+"use strict";
+
 // These tests focus on the paggResponse field in AuctionConfig's
 // serverResponse, i.e. auctions involving private aggregation reporting. NOTE:
 // Due to debug mode being disabled for B&A's Private Aggregation reports, these
diff --git a/tests/wpt/tests/fledge/tentative/server-response.https.window.js b/tests/wpt/tests/fledge/tentative/server-response.https.window.js
index d4eaf0d2512..4241cc8e1c9 100644
--- a/tests/wpt/tests/fledge/tentative/server-response.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/server-response.https.window.js
@@ -24,6 +24,8 @@
 // META: variant=?63-66
 // META: variant=?67-70
 
+"use strict";
+
 // These tests focus on the serverResponse field in AuctionConfig, e.g.
 // auctions involving bidding and auction services.
 
diff --git a/tests/wpt/tests/fledge/tentative/service-worker-request-visibility.https.window.js b/tests/wpt/tests/fledge/tentative/service-worker-request-visibility.https.window.js
index 8b8618420e5..41ebf839600 100644
--- a/tests/wpt/tests/fledge/tentative/service-worker-request-visibility.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/service-worker-request-visibility.https.window.js
@@ -6,7 +6,7 @@
 // META: timeout=long
 // META: variant=?1-last
 
-"use strict;"
+"use strict";
 
 const SERVICE_WORKER_SCRIPT = "resources/service-worker-helper.js";
 
diff --git a/tests/wpt/tests/fledge/tentative/tie.https.window.js b/tests/wpt/tests/fledge/tentative/tie.https.window.js
index f528df8fb02..21be690c92e 100644
--- a/tests/wpt/tests/fledge/tentative/tie.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/tie.https.window.js
@@ -4,12 +4,12 @@
 // META: script=resources/fledge-util.sub.js
 // META: timeout=long
 
-"use strict;"
+"use strict";
 
 // Runs one auction at a time using `auctionConfigOverrides` until the auction
 // has a winner.
 async function runAuctionsUntilWinner(test, uuid, auctionConfigOverrides) {
-  fencedFrameConfig = null;
+  let fencedFrameConfig = null;
   while (!fencedFrameConfig) {
     fencedFrameConfig =
         await runBasicFledgeAuction(test, uuid, auctionConfigOverrides);
diff --git a/tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.window.js b/tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.window.js
index ea820d3acf5..df613facaad 100644
--- a/tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.window.js
@@ -1023,12 +1023,12 @@ subsetTest(promise_test, async test => {
     }],
     adComponents: [
       {
-        renderUrl: componentURL1,
+        renderURL: componentURL1,
         sizeGroup: 'flexible',
         creativeScanningMetadata: 'c1'
       },
       {
-        renderUrl: componentURL2,
+        renderURL: componentURL2,
         sizeGroup: 'flexible',
         creativeScanningMetadata: 'c2'
       }
diff --git a/tests/wpt/tests/fledge/tentative/utf8-helpers.https.window.js b/tests/wpt/tests/fledge/tentative/utf8-helpers.https.window.js
index 4a712bf6269..9d8d0836419 100644
--- a/tests/wpt/tests/fledge/tentative/utf8-helpers.https.window.js
+++ b/tests/wpt/tests/fledge/tentative/utf8-helpers.https.window.js
@@ -8,7 +8,7 @@
 // META: variant=?6-10
 // META: variant=?11-15
 
-'use strict;'
+'use strict';
 
 // These tests cover encodeUtf8 and decodeUtf8.
 
diff --git a/tests/wpt/tests/focus/focus-double-sync-calls.html b/tests/wpt/tests/focus/focus-double-sync-calls.html
new file mode 100644
index 00000000000..8d5f5c8a79f
--- /dev/null
+++ b/tests/wpt/tests/focus/focus-double-sync-calls.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<head>
+  <meta charset=utf-8>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <title>Test calling focus() in "focus" event listener when focus has moved away</title>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+</head>
+<body>
+  <input id="input1" placeholder="input1"/>
+  <input id="input2" placeholder="input2"/>
+</body>
+<script>
+// This test tests calling focus() in the "focus" event
+// listener on the element again when the focus has
+// moved away.
+
+// This is for https://github.com/whatwg/html/pull/11182
+async_test((t) => {
+  let previouslyCalled = false;
+  let counter = 0;
+
+  input1.addEventListener("focus", function(e) {
+    counter++;
+    if (!previouslyCalled) {
+      input2.focus();
+      previouslyCalled = true;
+    }
+
+    input1.focus();
+
+    if (counter !== 2) {
+      // If `lock-for-focus` is implemented, the above input1.focus()
+      // shouldn't work, so the counter should never be 2.
+      assert_unreached();
+    }
+    t.done();
+  });
+
+  input1.focus();
+}, "Element.focus() in focus listener when focus has moved away");
+</script>
diff --git a/tests/wpt/tests/focus/focus-element-crash.html b/tests/wpt/tests/focus/focus-element-crash.html
new file mode 100644
index 00000000000..27df1c0b130
--- /dev/null
+++ b/tests/wpt/tests/focus/focus-element-crash.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<meta name="assert" content="focus element adopted or remounted shouldn't crash.">
+
+<body>
+
+<!--focus element remounted test case-->
+<audio onloadstart="select.focus()" src=""></audio>
+<iframe id="iframe"></iframe>
+<table id="table">
+    <td>
+        <select id="select" onblur=";"></select>
+    </td>
+</table>
+<script>
+    window.addEventListener("load", _ => iframe.appendChild(table));
+</script>
+
+<!--focus element adopted test case-->
+<input id="username" type="text" placeholder="username">
+<input id="password" type="text" placeholder="password">
+</body>
+<script>
+    let search = document.getElementById("search");
+    let username = document.getElementById("username");
+    username.focus();
+    window.onload = () => document.adoptNode(username);
+    username.addEventListener("blur", function (e) {
+        document.body.append(`event:${e.type} fire.`)
+    });
+</script>
+</html>
diff --git a/tests/wpt/tests/focus/nested-focus-within-iframe-focus-event.html b/tests/wpt/tests/focus/nested-focus-within-iframe-focus-event.html
new file mode 100644
index 00000000000..e0daf56386e
--- /dev/null
+++ b/tests/wpt/tests/focus/nested-focus-within-iframe-focus-event.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<head>
+  <meta charset=utf-8>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <title>Test calling dialog focusing steps in navigable's focus handler</title>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+</head>
+<body>
+  <iframe id="iframe" srcdoc="<dialog>Hello</dialog>"></iframe>
+</body>
+<script>
+// https://github.com/whatwg/html/pull/11182
+window.onload = function() {
+  async_test((t) => {
+    iframe.addEventListener("focus", function() {
+      const dialog = iframe.contentDocument.body.querySelector("dialog");
+      dialog.showModal();
+      // If `lock-for-focus` is implemented, showModal() can't
+      // trigger the dialog-focusing-steps, hence the activeElement
+      // shouldn't be the dialog.
+      assert_equals(iframe.contentDocument.activeElement, dialog);
+      t.done();
+    })
+
+    iframe.focus();
+  }, "dialog.focus() in navigable's focus handler");
+}
+</script>
diff --git a/tests/wpt/tests/css/css-fonts/support/fonts/Lato-Medium-Liga.ttf b/tests/wpt/tests/fonts/Lato-Medium-Liga.ttf
similarity index 100%
rename from tests/wpt/tests/css/css-fonts/support/fonts/Lato-Medium-Liga.ttf
rename to tests/wpt/tests/fonts/Lato-Medium-Liga.ttf
diff --git a/tests/wpt/tests/css/css-fonts/support/fonts/Lato-Medium.ttf b/tests/wpt/tests/fonts/Lato-Medium.ttf
similarity index 100%
rename from tests/wpt/tests/css/css-fonts/support/fonts/Lato-Medium.ttf
rename to tests/wpt/tests/fonts/Lato-Medium.ttf
diff --git a/tests/wpt/tests/fonts/adobe-fonts/LICENSE b/tests/wpt/tests/fonts/adobe-fonts/LICENSE
index ac5f0b04320..4cbddfbc646 100644
--- a/tests/wpt/tests/fonts/adobe-fonts/LICENSE
+++ b/tests/wpt/tests/fonts/adobe-fonts/LICENSE
@@ -1,4 +1,4 @@
-CSS Half-Width Orientation Test and CSS Full-Width Orientation Test are released under the SIL Open Font License - please read it carefully and do not download the fonts unless you agree to the the terms of the license:
+CSS Half-Width Orientation Test and CSS Full-Width Orientation Test are released under the SIL Open Font License - please read it carefully and do not download the fonts unless you agree to the terms of the license:
 Copyright © 2013 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Names CSS Half-Width Orientation Test and CSS Full-Width Orientation Test
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
diff --git a/tests/wpt/tests/fonts/math/css-units.woff b/tests/wpt/tests/fonts/math/css-units.woff
new file mode 100644
index 00000000000..0957a2fc973
Binary files /dev/null and b/tests/wpt/tests/fonts/math/css-units.woff differ
diff --git a/tests/wpt/tests/fonts/math/largeop-displayoperatorminheight3000-2AFF-axisheight1000.woff b/tests/wpt/tests/fonts/math/largeop-displayoperatorminheight3000-2AFF-axisheight1000.woff
new file mode 100644
index 00000000000..13d3e4ad4ed
Binary files /dev/null and b/tests/wpt/tests/fonts/math/largeop-displayoperatorminheight3000-2AFF-axisheight1000.woff differ
diff --git a/tests/wpt/tests/forced-colors-mode/forced-colors-mode-55-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-55-ref.html
new file mode 100644
index 00000000000..55ecd284b70
--- /dev/null
+++ b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-55-ref.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - outline and column color reference.</title>
+<style>
+  .grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 10px;
+    height: 320px;
+    width: 320px;
+    forced-color-adjust: none;
+    row-rule-color: CanvasText;
+    row-rule-style: dotted;
+    column-rule-color: CanvasText;
+    column-rule-style: solid;
+  }
+  .grid-item {
+    width: 100px;
+    height: 100px;
+  }
+</style>
+<p>
+  The grid's column-rule-color and row-rule-color should be blue
+  when forced colors mode is off and CanvasText in forced colors mode.
+</p>
+<div class="grid">
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+</div>
diff --git a/tests/wpt/tests/forced-colors-mode/forced-colors-mode-55.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-55.html
new file mode 100644
index 00000000000..db457fb0cfe
--- /dev/null
+++ b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-55.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - grid column-rule-color and row-rule-color.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-55-ref.html">
+<style>
+  .grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 10px;
+    height: 320px;
+    width: 320px;
+    row-rule-style: dotted;
+    column-rule-style: solid;
+    row-rule-color: rgb(0, 0, 255);
+    column-rule-color: rgb(0, 0, 255);
+  }
+
+  .grid-item {
+    width: 100px;
+    height: 100px;
+  }
+</style>
+<p>
+    The grid's column-rule-color and row-rule-color should be blue
+    when forced colors mode is off and CanvasText in forced colors mode.
+</p>
+<div class="grid">
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+</div>
diff --git a/tests/wpt/tests/forced-colors-mode/forced-colors-mode-56-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-56-ref.html
new file mode 100644
index 00000000000..d3a90b8c87f
--- /dev/null
+++ b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-56-ref.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - grid column and row color with sys colors.</title>
+<style>
+  .grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 10px;
+    height: 320px;
+    width: 320px;
+    forced-color-adjust: none;
+    row-rule-color: LinkText;
+    row-rule-style: dotted;
+    column-rule-color: LinkText;
+    column-rule-style: solid;
+  }
+
+  .grid-item {
+    width: 100px;
+    height: 100px;
+  }
+</style>
+<p>
+  The grid's column-rule-color and row-rule-color should be LinkText when
+  forced colors mode is enabled.
+</p>
+<div class="grid">
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+</div>
diff --git a/tests/wpt/tests/forced-colors-mode/forced-colors-mode-56.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-56.html
new file mode 100644
index 00000000000..632a6c7bd03
--- /dev/null
+++ b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-56.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - grid column and row color with sys colors.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-56-ref.html">
+<style>
+  :root {
+    --hc-color: LinkText;
+  }
+
+  .grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 10px;
+    height: 320px;
+    width: 320px;
+    row-rule-style: dotted;
+    column-rule-style: solid;
+    row-rule-color: var(--hc-color);
+    column-rule-color: var(--hc-color);
+  }
+  .grid-item {
+    width: 100px;
+    height: 100px;
+  }
+</style>
+<p>
+  The grid's column-rule-color and row-rule-color should be LinkText when
+  forced colors mode is enabled.
+</p>
+<div class="grid">
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+  <div class="grid-item"></div>
+</div>
diff --git a/tests/wpt/tests/geolocation/watchposition-timeout.https.window.js b/tests/wpt/tests/geolocation/watchposition-timeout.https.window.js
new file mode 100644
index 00000000000..fc1edd6ea95
--- /dev/null
+++ b/tests/wpt/tests/geolocation/watchposition-timeout.https.window.js
@@ -0,0 +1,22 @@
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+
+promise_setup(async () => {
+  await test_driver.set_permission({ name: "geolocation" }, "granted");
+});
+
+promise_test(async (t) => {
+  let timeoutCount = 0;
+
+  // This may still succeed without timeout in case there's a cache.
+  const watchId = navigator.geolocation.watchPosition(() => {}, (error) => {
+    if (error.code === GeolocationPositionError.TIMEOUT) {
+      ++timeoutCount;
+    }
+  }, { timeout: 1 });
+  t.add_cleanup(() => navigator.geolocation.clearWatch(watchId));
+
+  await new Promise(r => setTimeout(r, 100));
+
+  assert_true(timeoutCount < 2, "At most one timeout should have been seen");
+}, "Passing timeout=1 should not cause multiple timeout errors");
diff --git a/tests/wpt/tests/graphics-aam/META.yml b/tests/wpt/tests/graphics-aam/META.yml
index 197263836e7..c51c6e1b186 100644
--- a/tests/wpt/tests/graphics-aam/META.yml
+++ b/tests/wpt/tests/graphics-aam/META.yml
@@ -1,3 +1,4 @@
 spec: https://w3c.github.io/graphics-aam/
 suggested_reviewers:
   - spectranaut
+  - sideshowbarker
diff --git a/tests/wpt/tests/html-aam/META.yml b/tests/wpt/tests/html-aam/META.yml
index 212cae7fa52..bfca09eadfa 100644
--- a/tests/wpt/tests/html-aam/META.yml
+++ b/tests/wpt/tests/html-aam/META.yml
@@ -2,3 +2,4 @@ spec: https://w3c.github.io/html-aam/
 suggested_reviewers:
   - cookiecrook
   - scottaohara
+  - sideshowbarker
diff --git a/tests/wpt/tests/html-aam/figure-name-no-figcaption.tentative.html b/tests/wpt/tests/html-aam/figure-name-no-figcaption.tentative.html
new file mode 100644
index 00000000000..f75074efb6b
--- /dev/null
+++ b/tests/wpt/tests/html-aam/figure-name-no-figcaption.tentative.html
@@ -0,0 +1,75 @@
+<!doctype html>
+<html>
+<head>
+  <title>HTML-AAM Figure Element Accessible Name From Author Tests</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<body>
+
+
+<p>Tests the accName for elements defined in <a href="https://w3c.github.io/html-aam/#accessible-name-and-description-computation">HTML-AAM: Accessible Name Computations By HTML Element</a>.
+  These tests are meant to show whether an element returns a name per the naming mechanism used. See <a href="https://wpt.fyi/results/accname">wpt: accname</a> for expanded accName testing.</p>
+
+
+<!--
+The following test can be added to names.html along with the other figure naming tests when the file is no longer considered tentative.
+-->
+
+<h2>figure element</h2>
+<figure data-testname="figure with figcaption - no name" data-expectedlabel="" class="ex">
+  x
+  <figcaption>y</figcaption>
+</figure>
+
+<figure data-testname="figure with figcaption and aria-label" aria-label="label" data-expectedlabel="label" class="ex">
+  x
+  <figcaption>y</figcaption>
+</figure>
+
+<figure data-testname="figure with figcaption and aria-labelledby pointing to another element" aria-labelledby="labelledby" data-expectedlabel="labelledby" class="ex">
+  x
+  <figcaption>y</figcaption>
+</figure>
+
+<figure data-testname="figure with aria-labelledby pointing to figcaption" aria-labelledby="fctest" data-expectedlabel="figcaption text" class="ex">
+  x
+  <figcaption id=fctest>figcaption text</figcaption>
+</figure>
+
+<figure data-testname="figure with figcaption and title" title="title" data-expectedlabel="title" class="ex">
+  x
+  <figcaption>y</figcaption>
+</figure>
+
+<figure data-testname="figure with figcaption and img without alt" data-expectedlabel="" class="ex">
+  <img src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" data-testname="img without alt within a figure with figcaption" data-expectedlabel="figcaption" class="ex">
+  <figcaption>figcaption</figcaption>
+</figure>
+
+<figure>
+  <img src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" data-testname="img without alt but with title within a figure with figcaption" title="title" data-expectedlabel="title" class="ex">
+  <figcaption>figcaption</figcaption>
+</figure>
+
+<!-- as there is content in the figure beyond just the img without alt and whitespace, then the figcaption applies to all content and not just the img, so it does not become the img's accname -->
+<figure>
+  <img src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" data-testname="img without alt within a figure with figcaption, and with other flow content within the figure" data-expectedlabel="" class="ex">
+  other content
+  <figcaption>figcaption</figcaption>
+</figure>
+
+
+<!-- element to reference for aria-labelledby tests -->
+<div id="labelledby">labelledby</div>
+
+<script>
+AriaUtils.verifyLabelsBySelector(".ex");
+</script>
+
+</body>
+</html>
diff --git a/tests/wpt/tests/html-aam/roles-contextual.html b/tests/wpt/tests/html-aam/roles-contextual.html
index 793bdf1f413..e1f343cd074 100644
--- a/tests/wpt/tests/html-aam/roles-contextual.html
+++ b/tests/wpt/tests/html-aam/roles-contextual.html
@@ -81,7 +81,7 @@
 <img data-testname="el-img-empty-alt-aria-labelledby-non-existing" class="ex-generic" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" alt aria-labelledby="non-existing">
 <img data-testname="el-img-empty-alt-aria-labelledby-empty" class="ex-generic" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" alt aria-labelledby="empty">
 <img data-testname="el-img-empty-alt-aria-labelledby-whitespace" class="ex-generic" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" alt aria-labelledby="space">
-<img data-testname="el-img-empty-alt-title" data-expectedrole="image" class="ex" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" alt title="x">
+<img data-testname="el-img-empty-alt-title" class="ex-generic" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" alt title="x">
 <img data-testname="el-img-empty-alt-title-empty" class="ex-generic" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" alt title="">
 <img data-testname="el-img-empty-alt-title-whitespace" class="ex-generic" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" alt title=" ">
 
@@ -110,4 +110,4 @@ AriaUtils.verifyGenericRolesBySelector(".ex-generic");
 </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/tests/html-aam/roles-contextual.tentative.html b/tests/wpt/tests/html-aam/roles-contextual.tentative.html
index 0f918b24c70..e3b5f4e925b 100644
--- a/tests/wpt/tests/html-aam/roles-contextual.tentative.html
+++ b/tests/wpt/tests/html-aam/roles-contextual.tentative.html
@@ -16,7 +16,7 @@
   See https://github.com/w3c/aria/pull/1931
 -->
 <nav>
-  <footer data-testname="el-footer" aria-label="x" data-expectedrole="sectionfooter" class="ex">x</aside>
+  <footer data-testname="el-footer" aria-label="x" data-expectedrole="sectionfooter" class="ex">x</footer>
 </nav>
 <main>
   <footer data-testname="el-footer-ancestormain" data-expectedrole="sectionfooter" class="ex">x</footer>
@@ -33,4 +33,4 @@ AriaUtils.verifyRolesBySelector(".ex");
 </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/tests/html/anonymous-iframe/fenced-frame-bypass.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/fenced-frame-bypass.tentative.https.window.js
index e5d12397a9a..b84dffb9aa4 100644
--- a/tests/wpt/tests/html/anonymous-iframe/fenced-frame-bypass.tentative.https.window.js
+++ b/tests/wpt/tests/html/anonymous-iframe/fenced-frame-bypass.tentative.https.window.js
@@ -26,7 +26,7 @@ promise_test(async test => {
   const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
   const msg_queue = token();
 
-  // Create the the 3 actors.
+  // Create the 3 actors.
   const iframe_credentialless_1 = newIframeCredentialless(cross_origin);
   const fenced_frame = await newFencedFrame(cross_origin);
   send(fenced_frame, `
diff --git a/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/helper.sub.js b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/helper.sub.js
index a1d18d108e8..7df1a30549a 100644
--- a/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/helper.sub.js
+++ b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/helper.sub.js
@@ -105,7 +105,7 @@ function runEventTest(params, description) {
   runBfcacheTest(params, description);
 }
 
-async function navigateAndThenBack(pageA, pageB, urlB,
+async function navigateAndThenBack(pageA, pageB, urlB, scripts = [],
                                    funcBeforeBackNavigation,
                                    argsBeforeBackNavigation) {
   await pageA.execute_script(
@@ -118,6 +118,16 @@ async function navigateAndThenBack(pageA, pageB, urlB,
   );
 
   await pageB.execute_script(waitForPageShow);
+
+  for (const src of scripts) {
+    await pageB.execute_script((src) => {
+      const script = document.createElement("script");
+      script.src = src;
+      document.head.append(script);
+      return new Promise(resolve => script.onload = resolve);
+    }, [src]);
+  }
+
   if (funcBeforeBackNavigation) {
     await pageB.execute_script(funcBeforeBackNavigation,
                                argsBeforeBackNavigation);
@@ -172,7 +182,7 @@ function runBfcacheTest(params, description) {
 
     await pageA.execute_script(params.funcBeforeNavigation,
                                params.argsBeforeNavigation);
-    await navigateAndThenBack(pageA, pageB, urlB,
+    await navigateAndThenBack(pageA, pageB, urlB, params.scripts,
                               params.funcBeforeBackNavigation,
                               params.argsBeforeBackNavigation);
 
diff --git a/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/pagereveal/order-in-bfcache-restore.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/pagereveal/order-in-bfcache-restore.html
index f453c80a2ae..fae06df00f6 100644
--- a/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/pagereveal/order-in-bfcache-restore.html
+++ b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/pagereveal/order-in-bfcache-restore.html
@@ -15,7 +15,7 @@ runBfcacheTest({
   funcBeforeNavigation: async () => {
     // This function executes in pageA
 
-    // Wait for an animation frame to ensure the the initial-load
+    // Wait for an animation frame to ensure the initial-load
     // `pagereveal` has already been fired so it doesn't get recorded
     // below.
     const raf = new Promise(resolve => requestAnimationFrame(resolve));
diff --git a/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/pagereveal/order-in-prerender-activation.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/pagereveal/order-in-prerender-activation.https.html
similarity index 100%
rename from tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/pagereveal/order-in-prerender-activation.html
rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/pagereveal/order-in-prerender-activation.https.html
diff --git a/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html
index c081513b7c8..21096519503 100644
--- a/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html
+++ b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html
@@ -131,7 +131,7 @@ promise_test(async t => {
   // This indicates a weird state where the grandparent's immediate child fired
   // its load event in response to navigation cancelation (see the assertions
   // above), but the grandparent itself is still blocked on the grandchild
-  // loading. If this is the case, the the postMessage() (that sets
+  // loading. If this is the case, the postMessage() (that sets
   // `grandchild_iframe_load_fired = true`) is received by the grandparent just
   // before the grandparent's load event is unblocked and fired. Therefore we
   // can detect this situation by checking `grandchild_iframe_load_fired`.
diff --git a/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/004-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/004-1.html
index a3ca82f520a..5391f933f9a 100644
--- a/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/004-1.html
+++ b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/004-1.html
@@ -23,6 +23,6 @@ onload = function() {
 }
 </script>
 // child frame with no onbeforeunload listener. Should leave the parent as unsalvageable.
-// Adding the iframe prevents potential implementation bugs where the the recursive steps of #prompt-to-unload-a-document
+// Adding the iframe prevents potential implementation bugs where the recursive steps of #prompt-to-unload-a-document
 // would overwrite the salvageable state of the parent.
 <iframe></iframe>
diff --git a/tests/wpt/tests/html/browsers/history/the-history-interface/history_pushstate_too_many_calls.optional.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_pushstate_too_many_calls.optional.html
new file mode 100644
index 00000000000..4242ab488ca
--- /dev/null
+++ b/tests/wpt/tests/html/browsers/history/the-history-interface/history_pushstate_too_many_calls.optional.html
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <title>history pushState too many calls</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <div id="log"></div>
+    <script>
+    test(function () {
+      assert_throws_dom("SecurityError", function () {
+        for (let i = 0; i < 500; i++) {
+          window.history.pushState(null, null, i);
+        }
+      });
+    });
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/browsers/history/the-history-interface/history_replacestate_too_many_calls.optional.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_replacestate_too_many_calls.optional.html
new file mode 100644
index 00000000000..d412983270c
--- /dev/null
+++ b/tests/wpt/tests/html/browsers/history/the-history-interface/history_replacestate_too_many_calls.optional.html
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <title>history replaceState too many calls</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <div id="log"></div>
+    <script>
+    test(function () {
+      assert_throws_dom("SecurityError", function () {
+        for (let i = 0; i < 500; i++) {
+          window.history.replaceState(null, null, i);
+        }
+      });
+    });
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/browsers/history/the-location-interface/location_hash_set_empty_string.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_hash_set_empty_string.html
index bfde4e63829..8eef392e611 100644
--- a/tests/wpt/tests/html/browsers/history/the-location-interface/location_hash_set_empty_string.html
+++ b/tests/wpt/tests/html/browsers/history/the-location-interface/location_hash_set_empty_string.html
@@ -12,6 +12,6 @@ window.location.hash = '';
 
 test(() => {
     assert_true(window.location.hash === '');
-    assert_true(window.location.href === orig_location + '#');
+    assert_true(window.location.href === orig_location);
 }, 'window.location.hash is an empty string');
 </script>
diff --git a/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/regression-1399759.https.sub.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/regression-1399759.https.sub.html
index d0b09f335db..a960fb87020 100644
--- a/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/regression-1399759.https.sub.html
+++ b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/regression-1399759.https.sub.html
@@ -14,7 +14,7 @@
 </body>
 <script>
 // Regression test for crbug.com/1399759. This is mainly based on
-// html/infrastructure/urls/terminology-0/document-base-url-initiated-grand-parent.https.window.html,
+// external/wpt/html/infrastructure/urls/base-url/document-base-url-initiated-grand-parent.https.window.js
 // but restricts itself to the exact error condition.
 //
 // This test is run in two variants which differ in the Origin-Agent-Cluster
diff --git a/tests/wpt/tests/html/browsers/the-window-object/open-close/close_noopener_beforeunload-1.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/close_noopener_beforeunload-1.html
deleted file mode 100644
index fc114bc443e..00000000000
--- a/tests/wpt/tests/html/browsers/the-window-object/open-close/close_noopener_beforeunload-1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-let chan = new BroadcastChannel("close_noopener_beforeunload" + location.search);
-onload = function() { window.close(); };
-onbeforeunload = function() {
-  chan.postMessage({ name: "beforeunload", history: history.length });
-}
-</script>
diff --git a/tests/wpt/tests/html/browsers/the-window-object/open-close/close_noopener_beforeunload-2.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/close_noopener_beforeunload-2.html
deleted file mode 100644
index 4cce1e2e6f7..00000000000
--- a/tests/wpt/tests/html/browsers/the-window-object/open-close/close_noopener_beforeunload-2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!doctype html>
-<script>
-onload = function() {
-  setTimeout(() => window.location = "close_noopener_beforeunload-1.html" + location.search, 0);
-}
-</script>
diff --git a/tests/wpt/tests/html/browsers/the-window-object/open-close/close_noopener_beforeunload.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/close_noopener_beforeunload.html
index 6862a70b8c1..4db39fcb7c7 100644
--- a/tests/wpt/tests/html/browsers/the-window-object/open-close/close_noopener_beforeunload.html
+++ b/tests/wpt/tests/html/browsers/the-window-object/open-close/close_noopener_beforeunload.html
@@ -4,21 +4,31 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
-async_test(t => {
-  window.open("close_noopener_beforeunload-2.html?2", "", "noopener");
-  let chan = new BroadcastChannel("close_noopener_beforeunload?2");
-  chan.onmessage = t.step_func_done(function(event) {
-    assert_equals(event.data.name, "beforeunload", "correct message received");
-    assert_equals(event.data.history, 2, "session history has multiple entries");
+function waitForMessage(channel, name) {
+  return new Promise(resolve => {
+    function listener({ data }) {
+      if (data.name === name) {
+        channel.removeEventListener("message", listener);
+        resolve(data);
+      }
+    };
+    channel.addEventListener("message", listener);
   });
+}
+
+async_test(t => {
+  let chan = new BroadcastChannel("close_noopener_beforeunload2");
+  waitForMessage(chan, "beforeunload").then(t.step_func_done(data => {
+    assert_equals(data.history, 2, "session history has multiple entries");
+  }));
+  window.open("self-close.html?navs=1&channel=close_noopener_beforeunload2", "", "noopener");
 }, "closing noopener window with 2 entries");
 
 async_test(t => {
-  window.open("close_noopener_beforeunload-1.html?1", "", "noopener");
-  let chan = new BroadcastChannel("close_noopener_beforeunload?1");
-  chan.onmessage = t.step_func_done(function(event) {
-    assert_equals(event.data.name, "beforeunload", "correct message received");
-    assert_equals(event.data.history, 1, "session history has a single entry");
-  });
+  let chan = new BroadcastChannel("close_noopener_beforeunload1");
+  waitForMessage(chan, "beforeunload").then(t.step_func_done(data => {
+    assert_equals(data.history, 1, "session history has a single entry");
+  }));
+  window.open("self-close.html?navs=0&channel=close_noopener_beforeunload1", "", "noopener");
 }, "closing noopener window with 1 entry");
 </script>
diff --git a/tests/wpt/tests/html/browsers/the-window-object/open-close/open_initial_size.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open_initial_size.html
new file mode 100644
index 00000000000..a3a82d76468
--- /dev/null
+++ b/tests/wpt/tests/html/browsers/the-window-object/open-close/open_initial_size.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML: window.open: window geometry immediately after open</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#apis-for-creating-and-navigating-browsing-contexts-by-name">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/PrefixedPostMessage.js"></script>
+<script>
+var windowURL = 'resources/message-opener.html';
+
+async_test(t => {
+  var prefixedMessage = new PrefixedMessageTest();
+  var initialWidth, initialHeight, initialLeft, initialTop;
+  prefixedMessage.onMessage(t.step_func_done((data, e) => {
+    e.source.close();
+    assert_equals(initialWidth, data.width);
+    assert_equals(initialHeight, data.height);
+    assert_equals(initialLeft, data.left);
+    assert_equals(initialTop, data.top);
+  }));
+  var win = window.open(prefixedMessage.url(windowURL), '');
+  initialWidth = win.innerWidth;
+  initialHeight = win.innerHeight;
+  initialLeft = win.screenX;
+  initialTop = win.screenY;
+}, "Window geometry is available in opener context immediately");
+</script>
diff --git a/tests/wpt/tests/html/browsers/the-window-object/open-close/script-closable.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/script-closable.html
new file mode 100644
index 00000000000..2a7278c2ce8
--- /dev/null
+++ b/tests/wpt/tests/html/browsers/the-window-object/open-close/script-closable.html
@@ -0,0 +1,85 @@
+<!doctype html>
+<title>Test whether a window is script-closable</title>
+<link rel="help" href="https://html.spec.whatwg.org/#script-closable"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+
+<script>
+let uid = 0;
+
+async function withChannel(createWindow) {
+    const channel_name = `channel_${++uid}`;
+    const channel = new BroadcastChannel(channel_name);
+
+    const closedPromise = new Promise(resolve => {
+        channel.addEventListener("message", ({data}) => {
+            if (data.name === 'load') {
+                assert_true(true, 'window was loaded');
+            } else {
+                assert_not_equals(data.history, 1, "If script-closable, then not due to history length");
+                resolve(data.closed);
+            }
+        });
+    });
+
+    await createWindow(channel_name);
+    return closedPromise;
+}
+
+const Actions = {
+    async form(noopener) {
+        return withChannel((channel_name) => {
+            const form = document.createElement("form");
+            form.action = "self-close.html";
+            form.target = '_blank';
+            if (noopener) {
+                form.rel = "noopener";
+            }
+            // ?navs=1
+            const inp1 = document.createElement("input");
+            inp1.name = "navs";
+            inp1.value = "1";
+            form.appendChild(inp1);
+            // ?channel=channel_name
+            const inp2 = document.createElement("input");
+            inp2.name = "channel";
+            inp2.value = channel_name;
+            form.appendChild(inp2);
+            document.body.appendChild(form);
+
+            form.submit();
+            form.remove();
+        });
+    },
+    async link(noopener) {
+        return withChannel((channel_name) => {
+            const anchor = document.createElement("a");
+            anchor.href = `self-close.html?navs=1&channel=${channel_name}`;
+            anchor.target = '_blank';
+            if (noopener) {
+                anchor.rel = "noopener";
+            }
+            document.body.appendChild(anchor);
+
+            anchor.click();
+
+            anchor.remove();
+        });
+    },
+    async script(noopener) {
+        return withChannel((channel_name) => {
+            const url = `self-close.html?navs=1&channel=${channel_name}`;
+            window.open(url, "_blank", noopener ? 'noopener' : '');
+        });
+    }
+}
+
+for (const action of [Actions.form, Actions.link, Actions.script]) {
+    for (const noopener of [false, true])
+    promise_test(async () => {
+        const closed = await action(noopener);
+        assert_true(closed, "window closed");
+    }, `Window created by ${action.name} with ${noopener ? 'noopener' : 'opener'} is script-closable`);
+}
+</script>
diff --git a/tests/wpt/tests/html/browsers/the-window-object/open-close/self-close.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/self-close.html
new file mode 100644
index 00000000000..d409e9f423d
--- /dev/null
+++ b/tests/wpt/tests/html/browsers/the-window-object/open-close/self-close.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<p>self-close.html?navs=n&channel=name will navigate n times, then close and notify the channel.</p>
+
+<script>
+window.onload = setTimeout(() => {
+  const urlParams = new URLSearchParams(window.location.search);
+  let n = parseInt(urlParams.get('navs')) || 0;
+
+  const channel = new BroadcastChannel(urlParams.get('channel'));
+
+  channel.postMessage({ name: 'load', href: window.location.href });
+
+  if (n > 0) {
+    urlParams.set('navs', n-1);
+    window.location.href = `${window.location.pathname}?${urlParams.toString()}#${n}`;
+  } else {
+    window.onbeforeunload = () => {
+        channel.postMessage({ name: 'beforeunload', history: history.length, closed: true });
+    }
+    window.close();
+    if (!window.closed) {
+        channel.postMessage({ name: 'close failed', history: history.length, closed: false });
+    }
+  }
+}, 0);
+</script>
diff --git a/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/named-lookup-noopener.html b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/named-lookup-noopener.html
new file mode 100644
index 00000000000..91cf6ae6ee2
--- /dev/null
+++ b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/named-lookup-noopener.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<title>Named lookup does not work with noopener</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+<link rel="help" href="https://github.com/whatwg/html/issues/11291">
+
+<body>
+<script>
+
+promise_test(async t => {
+  const windowName = 'named-window';
+
+  const rcHelper = new RemoteContextHelper();
+  const rcPopup1 = await rcHelper.addWindow(undefined, { target: windowName, features: 'noopener' });
+  const rcPopup2 = await rcHelper.addWindow(undefined, { target: windowName, features: 'noopener' });
+
+  // If both scripts execute, then the windows are separate, and the test passes.
+  // If the window is reused, then rcPopup1 will not be able to execute script, and so the test will timeout.
+
+  assert_equals(await rcPopup1.executeScript(() => window.name), windowName);
+  assert_equals(await rcPopup2.executeScript(() => window.name), windowName);
+}, 'Two noopener window.open() calls create separate windows');
+
+promise_test(async t => {
+  const windowName = 'named-window-2';
+
+  function executorCreator(url) {
+    const a = document.createElement("a");
+    a.href = url;
+    a.rel = 'noopener';
+    a.target = windowName;
+    document.body.append(a);
+    a.click();
+  }
+
+  const rcHelper = new RemoteContextHelper();
+  const rcPopup1 = await rcHelper.createContext({ executorCreator });
+  const rcPopup2 = await rcHelper.createContext({ executorCreator });
+
+  // If both scripts execute, then the windows are separate, and the test passes.
+  // If the window is reused, then rcPopup1 will not be able to execute script, and so the test will timeout.
+
+  assert_equals(await rcPopup1.executeScript(() => window.name), windowName);
+  assert_equals(await rcPopup2.executeScript(() => window.name), windowName);
+}, 'Two rel=noopener <a href> clicks create separate windows');
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/WEB_FEATURES.yml b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/WEB_FEATURES.yml
new file mode 100644
index 00000000000..319b5b8e04c
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: canvas-createconicgradient
+  files:
+  - 2d.gradient.conic.*
diff --git a/tests/wpt/tests/html/canvas/element/manual/fill-and-stroke-styles/WEB_FEATURES.yml b/tests/wpt/tests/html/canvas/element/manual/fill-and-stroke-styles/WEB_FEATURES.yml
new file mode 100644
index 00000000000..5d9106c1cd6
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/manual/fill-and-stroke-styles/WEB_FEATURES.yml
@@ -0,0 +1,5 @@
+features:
+- name: canvas-createconicgradient
+  files:
+  - conic-gradient.html
+  - conic-gradient-rotation.html
diff --git a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang-ref.html b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang-ref.html
index 6bb9238a74a..f20533fc471 100644
--- a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang-ref.html
+++ b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang-ref.html
@@ -1,46 +1,50 @@
 <!doctype HTML>
-<meta charset="utf-8">
-<title>HTML5 Canvas Test Reference: The lang attribute.</title>
-<link rel="author" href="mailto:schenney@chromium.org"/>
-<style>
-  #canvas-en {
-    position: absolute;
-    top: 10px;
-    left: 10px;
-  }
-  #canvas-tr {
-    position: absolute;
-    top: 120px;
-    left: 10px;
-  }
-</style>
-<script>
-  function drawText(language) {
-    var canvas = document.getElementById('canvas-' + language);
-    var ctx = canvas.getContext('2d');
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>HTML5 Canvas Test Reference: The lang attribute.</title>
+  <link rel="author" href="mailto:schenney@chromium.org"/>
+  <script src="/common/reftest-wait.js"></script>
+  <style>
+    #canvas-en {
+      position: absolute;
+      top: 10px;
+      left: 10px;
+    }
+    #canvas-tr {
+      position: absolute;
+      top: 120px;
+      left: 10px;
+    }
+  </style>
+  <script>
+    function drawText(language) {
+      var canvas = document.getElementById('canvas-' + language);
+      var ctx = canvas.getContext('2d');
 
-    ctx.font = '25px Lato-Medium';
-    ctx.fillText('fi', 5, 50);
-  }
-  function generateReference() {
-    let test_font = new FontFace(
-      // Lato-Medium is a font with language specific ligatures.
-      "Lato-Medium",
-      "url(/fonts/Lato-Medium.ttf)"
-    );
+      ctx.font = '25px Lato-Medium';
+      ctx.fillText('fi', 5, 50);
+    }
+    function generateReference() {
+      let test_font = new FontFace(
+        // Lato-Medium is a font with language specific ligatures.
+        "Lato-Medium",
+        "url(/fonts/Lato-Medium.ttf)"
+      );
 
-    test_font.load().then((font) => {
-      document.fonts.add(font);
-      drawText('tr');
-      drawText('en');
-    });
-  }
-</script>
-<body onload="generateReference()">
-  <canvas lang="en" id="canvas-tr" width="300" height="100">
-    Browser does not support HTML5 Canvas.
-  </canvas>
-  <canvas lang="tr" id="canvas-en" width="300" height="100">
-    Browser does not support HTML5 Canvas.
-  </canvas>
-</body>
+      test_font.load().then((font) => {
+        document.fonts.add(font);
+        drawText('tr');
+        drawText('en');
+        takeScreenshot();
+      });
+    }
+  </script>
+  <body onload="generateReference()">
+    <canvas lang="en" id="canvas-tr" width="300" height="100">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+    <canvas lang="tr" id="canvas-en" width="300" height="100">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.dynamic-ref.html b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.dynamic-ref.html
index 177bddb1794..0262f588978 100644
--- a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.dynamic-ref.html
+++ b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.dynamic-ref.html
@@ -1,72 +1,76 @@
 <!doctype HTML>
-<meta charset="utf-8">
-<title>HTML5 Canvas Test Reference:  The lang attribute.</title>
-<link rel="author" href="mailto:schenney@chromium.org"/>
-<style>
-  #canvas1 {
-    position: absolute;
-    left: 0px;
-    top: 0px;
-  }
-  #canvas2 {
-    position: absolute;
-    left: 0px;
-    top: 50px;
-  }
-  #canvas3 {
-    position: absolute;
-    left: 0px;
-    top: 100px;
-  }
-  #canvas4 {
-    position: absolute;
-    left: 0px;
-    top: 150px;
-  }
-</style>
-<script>
-  function generateReference() {
-    let test_font = new FontFace(
-      // Lato-Medium is a font with language specific ligatures.
-      "Lato-Medium",
-      "url(/fonts/Lato-Medium.ttf)"
-    );
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>HTML5 Canvas Test Reference:  The lang attribute.</title>
+  <link rel="author" href="mailto:schenney@chromium.org"/>
+  <script src="/common/reftest-wait.js"></script>
+  <style>
+    #canvas1 {
+      position: absolute;
+      left: 0px;
+      top: 0px;
+    }
+    #canvas2 {
+      position: absolute;
+      left: 0px;
+      top: 50px;
+    }
+    #canvas3 {
+      position: absolute;
+      left: 0px;
+      top: 100px;
+    }
+    #canvas4 {
+      position: absolute;
+      left: 0px;
+      top: 150px;
+    }
+  </style>
+  <script>
+    function generateReference() {
+      let test_font = new FontFace(
+        // Lato-Medium is a font with language specific ligatures.
+        "Lato-Medium",
+        "url(/fonts/Lato-Medium.ttf)"
+      );
 
-    test_font.load().then((font) => {
-      document.fonts.add(font);
-      var canvas1 = document.getElementById('canvas1');
-      var ctx1 = canvas1.getContext('2d');
-      ctx1.font = '25px Lato-Medium';
-      ctx1.fillText('fi', 60, 30);
+      test_font.load().then((font) => {
+        document.fonts.add(font);
+        var canvas1 = document.getElementById('canvas1');
+        var ctx1 = canvas1.getContext('2d');
+        ctx1.font = '25px Lato-Medium';
+        ctx1.fillText('fi', 60, 30);
 
-      var canvas2 = document.getElementById('canvas2');
-      var ctx2 = canvas2.getContext('2d');
-      ctx2.font = '25px Lato-Medium';
-      ctx2.fillText('fi', 60, 30);
+        var canvas2 = document.getElementById('canvas2');
+        var ctx2 = canvas2.getContext('2d');
+        ctx2.font = '25px Lato-Medium';
+        ctx2.fillText('fi', 60, 30);
 
-      var canvas3 = document.getElementById('canvas3');
-      var ctx3 = canvas3.getContext('2d');
-      ctx3.font = '25px Lato-Medium';
-      ctx3.fillText('fi', 60, 30);
+        var canvas3 = document.getElementById('canvas3');
+        var ctx3 = canvas3.getContext('2d');
+        ctx3.font = '25px Lato-Medium';
+        ctx3.fillText('fi', 60, 30);
 
-      var canvas4 = document.getElementById('canvas4');
-      var ctx4 = canvas4.getContext('2d');
-      ctx4.font = '25px Lato-Medium';
-      ctx4.fillText('fi', 60, 30);
-    });
-  }
-</script>
-<body onload="generateReference()">
-  <canvas id="canvas1" lang="en" width="300" height="50">
-    Browser does not support HTML5 Canvas.
-  </canvas>
-  <canvas id="canvas2" lang="tr" width="300" height="50">
-    Browser does not support HTML5 Canvas.
-  </canvas>
-  <canvas id="canvas3" lang="en" width="300" height="50">
-    Browser does not support HTML5 Canvas.
-  </canvas>
-  <canvas id="canvas4" lang="tr" width="300" height="50">
-    Browser does not support HTML5 Canvas.
-  </canvas>
-</body>
+        var canvas4 = document.getElementById('canvas4');
+        var ctx4 = canvas4.getContext('2d');
+        ctx4.font = '25px Lato-Medium';
+        ctx4.fillText('fi', 60, 30);
+        takeScreenshot();
+      });
+    }
+  </script>
+  <body onload="generateReference()">
+    <canvas id="canvas1" lang="en" width="300" height="50">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+    <canvas id="canvas2" lang="tr" width="300" height="50">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+    <canvas id="canvas3" lang="en" width="300" height="50">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+    <canvas id="canvas4" lang="tr" width="300" height="50">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.dynamic.html b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.dynamic.html
index 225fcaa7ba1..02fb530baef 100644
--- a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.dynamic.html
+++ b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.dynamic.html
@@ -1,47 +1,51 @@
 <!doctype HTML>
-<meta charset="utf-8">
-<title>HTML5 Canvas Test: The lang attribute dynamically updates</title>
-<link rel="match" href="canvas.2d.lang.dynamic-ref.html"/>
-<link rel="author" href="mailto:schenney@chromium.org"/>
-<link rel="help"
-  href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
-<meta name="assert" content="Verify that a text lang change is applied."/>
-<style>
-  canvas {
-    position: absolute;
-    left: 0px;
-    top: 0px;
-  }
-</style>
-<script type="text/javascript">
-  function runTest() {
-    let test_font = new FontFace(
-      // Lato-Medium is a font with language specific ligatures.
-      "Lato-Medium",
-      "url(/fonts/Lato-Medium.ttf)"
-    );
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>HTML5 Canvas Test: The lang attribute dynamically updates</title>
+  <link rel="match" href="canvas.2d.lang.dynamic-ref.html"/>
+  <link rel="author" href="mailto:schenney@chromium.org"/>
+  <link rel="help"
+    href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
+  <meta name="assert" content="Verify that a text lang change is applied."/>
+  <script src="/common/reftest-wait.js"></script>
+  <style>
+    canvas {
+      position: absolute;
+      left: 0px;
+      top: 0px;
+    }
+  </style>
+  <script type="text/javascript">
+    function runTest() {
+      let test_font = new FontFace(
+        // Lato-Medium is a font with language specific ligatures.
+        "Lato-Medium",
+        "url(/fonts/Lato-Medium.ttf)"
+      );
 
-    test_font.load().then((font) => {
-      document.fonts.add(font);
-      var canvas = document.getElementById('canvas1');
-      var ctx = canvas.getContext('2d');
+      test_font.load().then((font) => {
+        document.fonts.add(font);
+        var canvas = document.getElementById('canvas1');
+        var ctx = canvas.getContext('2d');
 
-      ctx.font = '25px Lato-Medium';
-      ctx.fillText('fi', 60, 30);
+        ctx.font = '25px Lato-Medium';
+        ctx.fillText('fi', 60, 30);
 
-      canvas.setAttribute('lang', 'tr');
-      ctx.fillText('fi', 60, 80);
+        canvas.setAttribute('lang', 'tr');
+        ctx.fillText('fi', 60, 80);
 
-      ctx.lang = 'en';
-      ctx.fillText('fi', 60, 130);
+        ctx.lang = 'en';
+        ctx.fillText('fi', 60, 130);
 
-      ctx.lang = 'inherit';
-      ctx.fillText('fi', 60, 180);
-    });
-  }
-</script>
-<body onload="runTest()">
-  <canvas lang="en" id="canvas1" width="300" height="200">
-    Browser does not support HTML5 Canvas.
-  </canvas>
-</body>
+        ctx.lang = 'inherit';
+        ctx.fillText('fi', 60, 180);
+        takeScreenshot();
+      });
+    }
+  </script>
+  <body onload="runTest()">
+    <canvas lang="en" id="canvas1" width="300" height="200">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.empty-ref.html b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.empty-ref.html
index 258ebf6298e..7fa4dacd6e4 100644
--- a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.empty-ref.html
+++ b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.empty-ref.html
@@ -1,29 +1,33 @@
 <!doctype HTML>
-<meta charset="utf-8">
-<title>HTML5 Canvas Test Reference:  The lang attribute.</title>
-<link rel="author" href="mailto:schenney@chromium.org"/>
-<script>
-  function generateReference() {
-    let test_font = new FontFace(
-      // Lato-Medium is a font with language specific ligatures.
-      "Lato-Medium",
-      "url(/fonts/Lato-Medium.ttf)"
-    );
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>HTML5 Canvas Test Reference:  The lang attribute.</title>
+  <link rel="author" href="mailto:schenney@chromium.org"/>
+  <script src="/common/reftest-wait.js"></script>
+  <script>
+    function generateReference() {
+      let test_font = new FontFace(
+        // Lato-Medium is a font with language specific ligatures.
+        "Lato-Medium",
+        "url(/fonts/Lato-Medium.ttf)"
+      );
 
-    test_font.load().then((font) => {
-      document.fonts.add(font);
-      var canvas = document.getElementById('canvas1');
-      var ctx = canvas.getContext('2d');
+      test_font.load().then((font) => {
+        document.fonts.add(font);
+        var canvas = document.getElementById('canvas1');
+        var ctx = canvas.getContext('2d');
 
-      // With no lang defined anywhere, this reference will use the unknown
-      // language, whatever that might produce on the platform.
-      ctx.font = '25px Lato-Medium';
-      ctx.fillText('fi', 5, 50);
-    });
-  }
-</script>
-<body onload="generateReference()">
-  <canvas id="canvas1" width="300" height="150">
-    Browser does not support HTML5 Canvas.
-  </canvas>
-</body>
+        // With no lang defined anywhere, this reference will use the unknown
+        // language, whatever that might produce on the platform.
+        ctx.font = '25px Lato-Medium';
+        ctx.fillText('fi', 5, 50);
+        takeScreenshot();
+      });
+    }
+  </script>
+  <body onload="generateReference()">
+    <canvas id="canvas1" width="300" height="150">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.empty.canvas.html b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.empty.canvas.html
index 099081de379..9c5eb3f96b2 100644
--- a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.empty.canvas.html
+++ b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.empty.canvas.html
@@ -1,11 +1,12 @@
 <!doctype HTML>
-<html>
+<html class="reftest-wait">
   <meta charset="utf-8">
   <title>HTML5 Canvas Test: The empty string lang attribute uses the unknown language</title>
   <link rel="match" href="canvas.2d.lang.empty-ref.html" />
   <link rel="author" href="mailto:schenney@chromium.org"/>
   <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
   <meta name="assert" content="When the lang attribute is the empty string, use the unknown language." />
+  <script src="/common/reftest-wait.js"></script>
   <script type="text/javascript">
     function runTest() {
       let test_font = new FontFace(
@@ -24,6 +25,7 @@
         ctx.font = '25px Lato-Medium';
         ctx.lang = '';
         ctx.fillText('fi', 5, 50);
+        takeScreenshot();
       });
     }
   </script>
diff --git a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.html b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.html
index b8fca4dd5e7..e078eaa1235 100644
--- a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.html
+++ b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.html
@@ -1,11 +1,12 @@
 <!doctype HTML>
-<html lang="en-US">
+<html lang="en-US" class="reftest-wait">
   <meta charset="utf-8">
   <title>HTML5 Canvas Test:  The lang attribute is respected.</title>
   <link rel="match" href="canvas.2d.lang-ref.html" />
   <link rel="author" href="mailto:schenney@chromium.org"/>
   <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
   <meta name="assert" content="When the canvas context has a lang attribute, override the document." />
+  <script src="/common/reftest-wait.js"></script>
   <style>
     #canvas-tr {
       position: absolute;
@@ -38,6 +39,7 @@
         document.fonts.add(font);
         drawText('tr');
         drawText('en');
+        takeScreenshot();
       });
     }
   </script>
diff --git a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.inherit.disconnected.canvas.html b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.inherit.disconnected.canvas.html
index 0af5f20d6f5..83854b9b377 100644
--- a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.inherit.disconnected.canvas.html
+++ b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.inherit.disconnected.canvas.html
@@ -1,5 +1,5 @@
 <!doctype HTML>
-<html lang="en-US">
+<html lang="en-US" class="reftest-wait">
   <meta charset="utf-8">
   <title>HTML5 Canvas Test: The lang attribute inherits from a disconnected canvas element</title>
   <link rel="match" href="canvas.2d.lang-ref.html"/>
@@ -7,6 +7,7 @@
   <link rel="help"
     href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
   <meta name="assert" content="Verify that a disconnected canvas uses the canvas lang."/>
+  <script src="/common/reftest-wait.js"></script>
   <style>
     #canvas-tr {
       position: absolute;
@@ -46,6 +47,7 @@
         document.fonts.add(font);
         drawText('tr');
         drawText('en');
+        takeScreenshot();
       });
     </script>
   </body>
diff --git a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.inherit.disconnected.canvas.no.lang.html b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.inherit.disconnected.canvas.no.lang.html
index 6b06ae5df96..87fc358af9e 100644
--- a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.inherit.disconnected.canvas.no.lang.html
+++ b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.inherit.disconnected.canvas.no.lang.html
@@ -1,5 +1,5 @@
 <!doctype HTML>
-<html lang="tr">
+<html lang="tr" class="reftest-wait">
   <meta charset="utf-8">
   <title>HTML5 Canvas Test: The lang attribute inherits the unknown lang when disconnected and no lang attribute</title>
   <link rel="match" href="canvas.2d.unknown.lang-ref.html"/>
@@ -7,6 +7,7 @@
   <link rel="help"
     href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
   <meta name="assert" content="Verify that a disconnected canvas with no lang attribute uses the unknown lang."/>
+  <script src="/common/reftest-wait.js"></script>
   <style>
     #canvas-tr {
       position: absolute;
@@ -46,7 +47,8 @@
         drawText('tr');
         document.documentElement.setAttribute('lang', 'en');
         drawText('en');
+        takeScreenshot();
       });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.inherit.html b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.inherit.html
index 845880f20d8..06e97745ddb 100644
--- a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.inherit.html
+++ b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.lang.inherit.html
@@ -1,11 +1,12 @@
 <!doctype HTML>
-<html lang="en">
+<html lang="en" class="reftest-wait">
   <meta charset="utf-8">
   <title>HTML5 Canvas Test:  The lang attribute inherits from the canvas rather than the document</title>
   <link rel="match" href="canvas.2d.lang-ref.html" />
   <link rel="author" href="mailto:schenney@chromium.org"/>
   <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
   <meta name="assert" content="When the canvas element has a lang attribute, override the document." />
+  <script src="/common/reftest-wait.js"></script>
   <style>
     #canvas-tr {
       position: absolute;
@@ -41,6 +42,7 @@
 
         ctxEN.font = '25px Lato-Medium';
         ctxEN.fillText('fi', 5, 50);
+        takeScreenshot();
       });
     }
   </script>
diff --git a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.unknown.lang-ref.html b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.unknown.lang-ref.html
index 9d12ba0d695..d48f9286da5 100644
--- a/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.unknown.lang-ref.html
+++ b/tests/wpt/tests/html/canvas/element/manual/text/canvas.2d.unknown.lang-ref.html
@@ -1,47 +1,51 @@
 <!doctype HTML>
-<meta charset="utf-8">
-<title>HTML5 Canvas Test Reference: The lang attribute.</title>
-<link rel="author" href="mailto:schenney@chromium.org"/>
-<style>
-  #canvas-en {
-    position: absolute;
-    top: 10px;
-    left: 10px;
-  }
-  #canvas-tr {
-    position: absolute;
-    top: 120px;
-    left: 10px;
-  }
-</style>
-<script>
-  function drawText(language) {
-    var canvas = document.getElementById('canvas-' + language);
-    var ctx = canvas.getContext('2d');
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>HTML5 Canvas Test Reference: The lang attribute.</title>
+  <link rel="author" href="mailto:schenney@chromium.org"/>
+  <script src="/common/reftest-wait.js"></script>
+  <style>
+    #canvas-en {
+      position: absolute;
+      top: 10px;
+      left: 10px;
+    }
+    #canvas-tr {
+      position: absolute;
+      top: 120px;
+      left: 10px;
+    }
+  </style>
+  <script>
+    function drawText(language) {
+      var canvas = document.getElementById('canvas-' + language);
+      var ctx = canvas.getContext('2d');
 
-    // With no lang attribute anywhere, this will use the unknown language.
-    ctx.font = '25px Lato-Medium';
-    ctx.fillText('fi', 5, 50);
-  }
-  function generateReference() {
-    let test_font = new FontFace(
-      // Lato-Medium is a font with language specific ligatures.
-      "Lato-Medium",
-      "url(/fonts/Lato-Medium.ttf)"
-    );
+      // With no lang attribute anywhere, this will use the unknown language.
+      ctx.font = '25px Lato-Medium';
+      ctx.fillText('fi', 5, 50);
+    }
+    function generateReference() {
+      let test_font = new FontFace(
+        // Lato-Medium is a font with language specific ligatures.
+        "Lato-Medium",
+        "url(/fonts/Lato-Medium.ttf)"
+      );
 
-    test_font.load().then((font) => {
-      document.fonts.add(font);
-      drawText('tr');
-      drawText('en');
-    });
-  }
-</script>
-<body onload="generateReference()">
-  <canvas id="canvas-tr" width="300" height="100">
-    Browser does not support HTML5 Canvas.
-  </canvas>
-  <canvas id="canvas-en" width="300" height="100">
-    Browser does not support HTML5 Canvas.
-  </canvas>
-</body>
+      test_font.load().then((font) => {
+        document.fonts.add(font);
+        drawText('tr');
+        drawText('en');
+        takeScreenshot();
+      });
+    }
+  </script>
+  <body onload="generateReference()">
+    <canvas id="canvas-tr" width="300" height="100">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+    <canvas id="canvas-en" width="300" height="100">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/WEB_FEATURES.yml b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/WEB_FEATURES.yml
new file mode 100644
index 00000000000..b4d11212a6c
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: canvas-2d-color-management
+  files: "**"
diff --git a/tests/wpt/tests/html/canvas/element/path-objects/WEB_FEATURES.yml b/tests/wpt/tests/html/canvas/element/path-objects/WEB_FEATURES.yml
new file mode 100644
index 00000000000..1bbef5e88d6
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/path-objects/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: canvas-roundrect
+  files:
+  - 2d.path.roundrect.*
diff --git a/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.html
new file mode 100644
index 00000000000..09d12ff82bc
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>Canvas test: 2d.imageData.createImageBitmap.p3.rgba.unorm8</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.imageData.createImageBitmap.p3.rgba.unorm8</h1>
+<p class="desc">Verify round-trip of 8-bit P3 data ImageData through ImageBitmap</p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d', {colorSpace: "srgb", colorType:"float16"});
+
+  const expectedColor = [ 255, 0, 0, 255 ];
+  var imageData = new ImageData(10, 10, {colorSpace:"display-p3", pixelFormat:"rgba-unorm8"});
+  for (let y = 0; y < imageData.height; ++y) {
+    for (let x = 0; x < imageData.width; ++x) {
+      for (let c = 0; c < 4; ++c) {
+        imageData.data[4*(x + y*imageData.width) + c] = expectedColor[c];
+      }
+    }
+  }
+  var bitmap = await createImageBitmap(imageData);
+  ctx.drawImage(bitmap, 0, 0);
+  var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"display-p3", pixelFormat:"rgba-unorm8"});
+  for (let c = 0; c < 4; ++c) {
+    assert_approx_equals(pixel.data[c], expectedColor[c], 2);
+  }
+
+}, "Verify round-trip of 8-bit P3 data ImageData through ImageBitmap");
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.html
new file mode 100644
index 00000000000..61519ebce98
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>Canvas test: 2d.imageData.createImageBitmap.srgb.rgba.float16</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.imageData.createImageBitmap.srgb.rgba.float16</h1>
+<p class="desc">Verify round-trip of 16-bit float sRGB data ImageData through ImageBitmap</p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d', {colorSpace: "srgb", colorType:"float16"});
+
+  const expectedColor = [ 1.0, 2.0, -1.0, 1.0 ];
+  var imageData = new ImageData(10, 10, {colorSpace:"srgb", pixelFormat:"rgba-float16"});
+  for (let y = 0; y < imageData.height; ++y) {
+    for (let x = 0; x < imageData.width; ++x) {
+      for (let c = 0; c < 4; ++c) {
+        imageData.data[4*(x + y*imageData.width) + c] = expectedColor[c];
+      }
+    }
+  }
+  var bitmap = await createImageBitmap(imageData);
+  ctx.drawImage(bitmap, 0, 0);
+  var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"srgb", pixelFormat:"rgba-float16"});
+  for (let c = 0; c < 4; ++c) {
+    assert_approx_equals(pixel.data[c], expectedColor[c], 0.01);
+  }
+
+}, "Verify round-trip of 16-bit float sRGB data ImageData through ImageBitmap");
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.html
new file mode 100644
index 00000000000..eee3846cf5a
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>Canvas test: 2d.imageData.createImageBitmap.srgb.rgba.unorm8</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.imageData.createImageBitmap.srgb.rgba.unorm8</h1>
+<p class="desc">Verify round-trip of 8-bit sRGB data ImageData through ImageBitmap</p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d', {colorSpace: "srgb", colorType:"float16"});
+
+  const expectedColor = [ 32, 64, 128, 255 ];
+  var imageData = new ImageData(10, 10, {colorSpace:"srgb", pixelFormat:"rgba-unorm8"});
+  for (let y = 0; y < imageData.height; ++y) {
+    for (let x = 0; x < imageData.width; ++x) {
+      for (let c = 0; c < 4; ++c) {
+        imageData.data[4*(x + y*imageData.width) + c] = expectedColor[c];
+      }
+    }
+  }
+  var bitmap = await createImageBitmap(imageData);
+  ctx.drawImage(bitmap, 0, 0);
+  var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"srgb", pixelFormat:"rgba-unorm8"});
+  for (let c = 0; c < 4; ++c) {
+    assert_approx_equals(pixel.data[c], expectedColor[c], 2);
+  }
+
+}, "Verify round-trip of 8-bit sRGB data ImageData through ImageBitmap");
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.pixelFormat.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.pixelFormat.html
new file mode 100644
index 00000000000..9d4c4ccc7ee
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.pixelFormat.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>Canvas test: 2d.imageData.object.ctor.pixelFormat</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.imageData.object.ctor.pixelFormat</h1>
+<p class="desc">Testing ImageData constructor pixelFormat behaviors</p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("Testing ImageData constructor pixelFormat behaviors");
+_addTest(function(canvas, ctx) {
+
+  function setRGBA(imageData, i, rgba)
+  {
+      var s = i * 4;
+      imageData[s] = rgba[0];
+      imageData[s + 1] = rgba[1];
+      imageData[s + 2] = rgba[2];
+      imageData[s + 3] = rgba[3];
+  }
+
+  function getRGBA(imageData, i)
+  {
+      var result = [];
+      var s = i * 4;
+      for (var j = 0; j < 4; j++) {
+          result[j] = imageData[s + j];
+      }
+      return result;
+  }
+
+  function assertArrayEquals(actual, expected)
+  {
+      _assertSame(typeof actual, "object", "typeof actual", "\"object\"");
+      _assertDifferent(actual, null, "actual", "null");
+      _assertSame("length" in actual, true, "\"length\" in actual", "true");
+      _assertSame(actual.length, expected.length, "actual.length", "expected.length");
+      for (var i = 0; i < actual.length; i++) {
+          _assertSame(actual.hasOwnProperty(i), expected.hasOwnProperty(i), "actual.hasOwnProperty(i)", "expected.hasOwnProperty(i)");
+          _assertSame(actual[i], expected[i], "actual[\""+(i)+"\"]", "expected[\""+(i)+"\"]");
+      }
+  }
+
+  _assertDifferent(ImageData, undefined, "ImageData", "undefined");
+  imageData = new ImageData(100, 50);
+  _assertSame(imageData.pixelFormat, "rgba-unorm8", "imageData.pixelFormat", "\"rgba-unorm8\"");
+
+  imageData = new ImageData(100, 50, {pixelFormat:"rgba-float16"});
+  _assertSame(imageData.pixelFormat, "rgba-float16", "imageData.pixelFormat", "\"rgba-float16\"");
+  var testColor = [0, -1, 0.5, 1024];
+  setRGBA(imageData.data, 4, testColor);
+  assertArrayEquals(getRGBA(imageData.data, 4), testColor);
+
+  data = new Float16Array(200);
+  imageData = new ImageData(data, 10, 5, {pixelFormat:"rgba-float16"});
+  _assertSame(imageData.pixelFormat, "rgba-float16", "imageData.pixelFormat", "\"rgba-float16\"");
+  _assertSame(imageData.data, data, "imageData.data", "data");
+  assert_throws_dom("INVALID_STATE_ERR", function() { new ImageData(data, 10, 5, {pixelFormat:"rgba-unorm8"}); });
+  assert_throws_dom("INVALID_STATE_ERR", function() { new ImageData(data, 10, 5); });
+
+  data = new Uint8ClampedArray(200);
+  imageData = new ImageData(data, 10, 5);
+  _assertSame(imageData.pixelFormat, "rgba-unorm8", "imageData.pixelFormat", "\"rgba-unorm8\"");
+  _assertSame(imageData.data, data, "imageData.data", "data");
+  assert_throws_dom("INVALID_STATE_ERR", function() { new ImageData(data, 10, 5, {pixelFormat:"rgba-float16"}); });
+
+  assert_throws_js(TypeError, function() { new ImageData(data, 10, 5, {pixelFormat:"unorm8"}); });
+  assert_throws_js(TypeError, function() { new ImageData(data, 10, 5, {pixelFormat:"float16"}); });
+  assert_throws_js(TypeError, function() { new ImageData(data, 10, 5, {pixelFormat:"rgba8unorm"}); });
+  assert_throws_js(TypeError, function() { new ImageData(data, 10, 5, {pixelFormat:"rgba16float"}); });
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.properties.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.properties.html
index de586fda3ff..72f314bf660 100644
--- a/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.properties.html
+++ b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.properties.html
@@ -24,6 +24,8 @@ _addTest(function(canvas, ctx) {
   _assertSame(typeof(imgdata.width), 'number', "typeof(imgdata.width)", "'number'");
   _assertSame(typeof(imgdata.height), 'number', "typeof(imgdata.height)", "'number'");
   _assertSame(typeof(imgdata.data), 'object', "typeof(imgdata.data)", "'object'");
+  _assertSame(typeof(imgdata.colorSpace), 'string', "typeof(imgdata.colorSpace)", "'string'");
+  _assertSame(typeof(imgdata.pixelFormat), 'string', "typeof(imgdata.pixelFormat)", "'string'");
 
 });
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.basic.rgba.float16.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.basic.rgba.float16.html
new file mode 100644
index 00000000000..8307f7fda46
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.basic.rgba.float16.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>Canvas test: 2d.imageData.put.basic.rgba.float16</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.imageData.put.basic.rgba.float16</h1>
+<p class="desc">putImageData() puts 16-bit floating point image data from getImageData() onto the canvas</p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("putImageData() puts 16-bit floating point image data from getImageData() onto the canvas");
+_addTest(function(canvas, ctx) {
+
+  ctx.fillStyle = 'color(display-p3 1 0 0)';
+  ctx.fillRect(0, 0, 100, 50)
+  var imgdata = ctx.getImageData(0, 0, 100, 50, {colorSpace:"srgb", pixelFormat:"rgba-float16"});
+  ctx.fillStyle = '#f00';
+  ctx.fillRect(0, 0, 100, 50)
+  ctx.putImageData(imgdata, 0, 0);
+  var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"display-p3", pixelFormat:"rgba-float16"});
+  assert_approx_equals(pixel.data[0], 1, 0.01);
+  assert_approx_equals(pixel.data[1], 0, 0.01);
+  assert_approx_equals(pixel.data[2], 0, 0.01);
+  assert_approx_equals(pixel.data[3], 1, 0.01);
+
+}, {colorSpace: "srgb", colorType: "float16"});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.lang.html b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.lang.html
new file mode 100644
index 00000000000..a11e838799c
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.lang.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>Canvas test: 2d.text.measure.lang</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<style>
+@font-face {
+  font-family: Lato-Medium;
+  src: url("/fonts/Lato-Medium.ttf");
+}
+</style>
+<body class="show_output">
+
+<h1>2d.text.measure.lang</h1>
+<p class="desc">Testing the lang attribute</p>
+
+
+<span style="font-family: Lato-Medium; position: absolute; visibility: hidden">A</span>
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  await document.fonts.ready;
+
+  ctx.font = '50px Lato-Medium';
+  ctx.lang = 'tr';
+  const text = 'fi';
+  const tm_tr = ctx.measureText(text);
+  const tr_width = tm_tr.width;
+
+  ctx.lang = 'en';
+  const tm_en = ctx.measureText(text);
+  const en_width = tm_en.width;
+
+  _assert(tr_width > en_width, "tr_width > en_width");
+
+}, "Testing the lang attribute");
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.lang.inherit.html b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.lang.inherit.html
new file mode 100644
index 00000000000..565308a895b
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.lang.inherit.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>Canvas test: 2d.text.measure.lang.inherit</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<style>
+@font-face {
+  font-family: Lato-Medium;
+  src: url("/fonts/Lato-Medium.ttf");
+}
+</style>
+<body class="show_output">
+
+<h1>2d.text.measure.lang.inherit</h1>
+<p class="desc">Testing the lang attribute</p>
+
+
+<span style="font-family: Lato-Medium; position: absolute; visibility: hidden">A</span>
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"lang="tr"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  await document.fonts.ready;
+
+  ctx.font = '50px Lato-Medium';
+  ctx.lang = 'inherit';
+  const text = 'fi';
+  const tm_tr = ctx.measureText(text);
+  const tr_width = tm_tr.width;
+
+  ctx.lang = 'en';
+  const tm_en = ctx.measureText(text);
+  const en_width = tm_en.width;
+
+  _assert(tr_width > en_width, "tr_width > en_width");
+
+}, "Testing the lang attribute");
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.selection-rects-baselines.tentative.html b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.selection-rects-baselines.tentative.html
index 8ef5e83199c..5e8c7bcc73d 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.selection-rects-baselines.tentative.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.selection-rects-baselines.tentative.html
@@ -36,8 +36,8 @@ _addTest(function(canvas, ctx) {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (const text of kTexts) {
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.selection-rects.tentative.html b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.selection-rects.tentative.html
index 4cde3807fd6..ee9ad76cdcb 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.selection-rects.tentative.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.selection-rects.tentative.html
@@ -87,8 +87,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -201,8 +201,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -315,8 +315,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -429,8 +429,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -543,8 +543,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -657,8 +657,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -771,8 +771,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -885,8 +885,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -999,8 +999,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1113,8 +1113,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1227,8 +1227,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1341,8 +1341,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1466,8 +1466,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1592,8 +1592,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1718,8 +1718,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1844,8 +1844,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1970,8 +1970,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -2096,8 +2096,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -2222,8 +2222,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -2348,8 +2348,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -2474,8 +2474,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -2600,8 +2600,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -2726,8 +2726,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -2852,8 +2852,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
diff --git a/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.to.srgb.html b/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.to.srgb.html
index 8320a294851..abfda62cb52 100644
--- a/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.to.srgb.html
+++ b/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.to.srgb.html
@@ -9,7 +9,7 @@
 <body class="show_output">
 
 <h1>2d.color.space.p3.to.srgb</h1>
-<p class="desc">test getImageData with srsb and uint8 from display p3 uint8 canvas</p>
+<p class="desc">test getImageData with srgb and uint8 from display p3 uint8 canvas</p>
 
 
 <p class="output">Actual output:</p>
@@ -17,7 +17,7 @@
 
 <ul id="d"></ul>
 <script>
-var t = async_test("test getImageData with srsb and uint8 from display p3 uint8 canvas");
+var t = async_test("test getImageData with srgb and uint8 from display p3 uint8 canvas");
 _addTest(function(canvas, ctx) {
 
   var color_style = 'rgb(50, 100, 150)';
diff --git a/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/WEB_FEATURES.yml b/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/WEB_FEATURES.yml
new file mode 100644
index 00000000000..b4d11212a6c
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: canvas-2d-color-management
+  files: "**"
diff --git a/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/WEB_FEATURES.yml b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/WEB_FEATURES.yml
new file mode 100644
index 00000000000..319b5b8e04c
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: canvas-createconicgradient
+  files:
+  - 2d.gradient.conic.*
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang-ref.html b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang-ref.html
index 51eff356b8e..d3a4a4089e0 100644
--- a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang-ref.html
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang-ref.html
@@ -1,46 +1,50 @@
 <!doctype HTML>
-<meta charset="utf-8">
-<title>HTML5 Canvas Test Reference: The lang attribute in an offscreen canvas</title>
-<link rel="author" href="mailto:schenney@chromium.org"/>
-<style>
-  #canvas-tr {
-    position: absolute;
-    top: 10px;
-    left: 10px;
-  }
-  #canvas-en {
-    position: absolute;
-    top: 120px;
-    left: 10px;
-  }
-</style>
-<script>
-  function drawText(language) {
-    var canvas = document.getElementById('canvas-' + language);
-    var ctx = canvas.getContext('2d');
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>HTML5 Canvas Test Reference: The lang attribute in an offscreen canvas</title>
+  <link rel="author" href="mailto:schenney@chromium.org"/>
+  <script src="/common/reftest-wait.js"></script>
+  <style>
+    #canvas-tr {
+      position: absolute;
+      top: 10px;
+      left: 10px;
+    }
+    #canvas-en {
+      position: absolute;
+      top: 120px;
+      left: 10px;
+    }
+  </style>
+  <script>
+    function drawText(language) {
+      var canvas = document.getElementById('canvas-' + language);
+      var ctx = canvas.getContext('2d');
 
-    ctx.font = '25px Lato-Medium';
-    ctx.fillText('fi', 5, 50);
-  }
-  function generateReference() {
-    let test_font = new FontFace(
-      // Lato-Medium is a font with language specific ligatures.
-      "Lato-Medium",
-      "url(/fonts/Lato-Medium.ttf)"
-    );
+      ctx.font = '25px Lato-Medium';
+      ctx.fillText('fi', 5, 50);
+    }
+    function generateReference() {
+      let test_font = new FontFace(
+        // Lato-Medium is a font with language specific ligatures.
+        "Lato-Medium",
+        "url(/fonts/Lato-Medium.ttf)"
+      );
 
-    test_font.load().then((font) => {
-      document.fonts.add(font);
-      drawText('tr');
-      drawText('en');
-    });
-  }
-</script>
-<body onload="generateReference()">
-  <canvas lang="tr" id="canvas-tr" width="300" height="100">
-    Browser does not support HTML5 Canvas.
-  </canvas>
-  <canvas lang="en" id="canvas-en" width="300" height="100">
-    Browser does not support HTML5 Canvas.
-  </canvas>
-</body>
+      test_font.load().then((font) => {
+        document.fonts.add(font);
+        drawText('tr');
+        drawText('en');
+        takeScreenshot();
+      });
+    }
+  </script>
+  <body onload="generateReference()">
+    <canvas lang="tr" id="canvas-tr" width="300" height="100">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+    <canvas lang="en" id="canvas-en" width="300" height="100">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang.html b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang.html
index c3c6b36901d..d1d9bc0998d 100644
--- a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang.html
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang.html
@@ -1,11 +1,12 @@
 <!doctype HTML>
-<html lang="en-US">
+<html lang="en-US" class="reftest-wait">
   <meta charset="utf-8">
   <title>HTML5 Canvas Test:  The lang attribute is respected in offscreen canvas</title>
   <link rel="match" href="canvas.2d.offscreen.lang-ref.html" />
   <link rel="author" href="mailto:schenney@chromium.org"/>
   <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
   <meta name="assert" content="An offscreen canvas respects the lang text attribute." />
+  <script src="/common/reftest-wait.js"></script>
   <style>
     #canvas-tr {
       position: absolute;
@@ -45,6 +46,7 @@
         document.fonts.add(font);
         drawText('tr');
         drawText('en');
+        takeScreenshot();
       });
     }
   </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang.inherit.html b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang.inherit.html
index 63b6854cd78..05849f419ff 100644
--- a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang.inherit.html
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.lang.inherit.html
@@ -1,11 +1,12 @@
 <!doctype HTML>
-<html lang="tr">
+<html lang="tr" class="reftest-wait">
   <meta charset="utf-8">
   <title>HTML5 Canvas Test:  The lang attribute is inherited from the document in offscreen canvas</title>
   <link rel="match" href="canvas.2d.offscreen.lang-ref.html" />
   <link rel="author" href="mailto:schenney@chromium.org"/>
   <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
   <meta name="assert" content="An offscreen canvas inherits the lang from the document." />
+  <script src="/common/reftest-wait.js"></script>
   <style>
     #canvas-tr {
       position: absolute;
@@ -45,6 +46,7 @@
         drawText('tr');
         document.documentElement.setAttribute('lang', 'en');
         drawText('en');
+        takeScreenshot();
       });
     }
   </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.html b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.html
index 06c0db121d0..a6a908b1d18 100644
--- a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.html
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.html
@@ -1,11 +1,12 @@
 <!doctype HTML>
-<html lang="en-US">
+<html lang="en-US" class="reftest-wait">
   <meta charset="utf-8">
   <title>HTML5 Canvas Test: The lang attribute functions in a transferred offscreen</title>
   <link rel="match" href="canvas.2d.offscreen.lang-ref.html" />
   <link rel="author" href="mailto:schenney@chromium.org"/>
   <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
   <meta name="assert" content="Verify that setting lang in a transferred offscreen works." />
+  <script src="/common/reftest-wait.js"></script>
   <style>
     #canvas-tr {
       position: absolute;
@@ -39,6 +40,7 @@
         document.fonts.add(font);
         drawText('tr');
         drawText('en');
+        takeScreenshot();
       });
     }
   </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.inherit.document.html b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.inherit.document.html
index a7561ddd855..3146d078eba 100644
--- a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.inherit.document.html
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.inherit.document.html
@@ -1,11 +1,12 @@
 <!doctype HTML>
-<html lang="tr">
+<html lang="tr" class="reftest-wait">
   <meta charset="utf-8">
   <title>HTML5 Canvas Test:  The lang attribute inherits from the canvas in a transferred offscreen</title>
   <link rel="match" href="canvas.2d.offscreen.lang-ref.html" />
   <link rel="author" href="mailto:schenney@chromium.org"/>
   <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
   <meta name="assert" content="An offscreen transferred from a canvas inherits the document language." />
+  <script src="/common/reftest-wait.js"></script>
   <style>
     #canvas-tr {
       position: absolute;
@@ -40,6 +41,7 @@
         drawText('tr');
         document.documentElement.setAttribute('lang', 'en');
         drawText('en');
+        takeScreenshot();
       });
     }
   </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.inherit.html b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.inherit.html
index 72aab773a5e..1a9b7ec63e1 100644
--- a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.inherit.html
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.transferred.lang.inherit.html
@@ -1,11 +1,12 @@
 <!doctype HTML>
-<html lang="en-US">
+<html lang="en-US" class="reftest-wait">
   <meta charset="utf-8">
   <title>HTML5 Canvas Test: The lang attribute inherits from the canvas in a transferred offscreen</title>
   <link rel="match" href="canvas.2d.offscreen.lang-ref.html" />
   <link rel="author" href="mailto:schenney@chromium.org"/>
   <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#text-styles"/>
   <meta name="assert" content="An offscreen transferred from a canvas element inherits the canvas language." />
+  <script src="/common/reftest-wait.js"></script>
   <style>
     #canvas-tr {
       position: absolute;
@@ -38,6 +39,7 @@
         document.fonts.add(font);
         drawText('tr');
         drawText('en');
+        takeScreenshot();
       });
     }
   </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.lang-ref.html b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.lang-ref.html
index 35c87f8c69e..1c2228a7acc 100644
--- a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.lang-ref.html
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.lang-ref.html
@@ -1,49 +1,53 @@
 <!doctype HTML>
-<meta charset="utf-8">
-<title>HTML5 Canvas Test Reference: The lang attribute in an offscreen worker</title>
-<link rel="author" href="mailto:schenney@chromium.org"/>
-<style>
-  #canvas-en {
-    position: absolute;
-    top: 10px;
-    left: 10px;
-  }
-  #canvas-tr {
-    position: absolute;
-    top: 120px;
-    left: 10px;
-  }
-</style>
-<script>
-  function drawText(language) {
-    var canvas = document.getElementById('canvas-' + language);
-    var ctx = canvas.getContext('2d');
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>HTML5 Canvas Test Reference: The lang attribute in an offscreen worker</title>
+  <link rel="author" href="mailto:schenney@chromium.org"/>
+  <script src="/common/reftest-wait.js"></script>
+  <style>
+    #canvas-en {
+      position: absolute;
+      top: 10px;
+      left: 10px;
+    }
+    #canvas-tr {
+      position: absolute;
+      top: 120px;
+      left: 10px;
+    }
+  </style>
+  <script>
+    function drawText(language) {
+      var canvas = document.getElementById('canvas-' + language);
+      var ctx = canvas.getContext('2d');
 
-    ctx.font = '25px Lato-Medium';
-    ctx.fillText('fi', 5, 50);
+      ctx.font = '25px Lato-Medium';
+      ctx.fillText('fi', 5, 50);
 
-    ctx.fillStyle = '#0f0';
-    ctx.fillRect(0, 0, 1, 1);
-  }
-  function generateReference() {
-    let test_font = new FontFace(
-      // Lato-Medium is a font with language specific ligatures.
-      "Lato-Medium",
-      "url(/fonts/Lato-Medium.ttf)"
-    );
+      ctx.fillStyle = '#0f0';
+      ctx.fillRect(0, 0, 1, 1);
+    }
+    function generateReference() {
+      let test_font = new FontFace(
+        // Lato-Medium is a font with language specific ligatures.
+        "Lato-Medium",
+        "url(/fonts/Lato-Medium.ttf)"
+      );
 
-    test_font.load().then((font) => {
-      document.fonts.add(font);
-      drawText('tr');
-      drawText('en');
-    });
-  }
-</script>
-<body onload="generateReference()">
-  <canvas lang="en" id="canvas-tr" width="300" height="100">
-    Browser does not support HTML5 Canvas.
-  </canvas>
-  <canvas lang="tr" id="canvas-en" width="300" height="100">
-    Browser does not support HTML5 Canvas.
-  </canvas>
-</body>
+      test_font.load().then((font) => {
+        document.fonts.add(font);
+        drawText('tr');
+        drawText('en');
+        takeScreenshot();
+      });
+    }
+  </script>
+  <body onload="generateReference()">
+    <canvas lang="en" id="canvas-tr" width="300" height="100">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+    <canvas lang="tr" id="canvas-en" width="300" height="100">
+      Browser does not support HTML5 Canvas.
+    </canvas>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.lang.html b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.lang.html
index 8ed884a1775..3cd2ec4f42c 100644
--- a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.lang.html
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.lang.html
@@ -20,42 +20,49 @@
     }
   </style>
   <script type="text/javascript">
+    function createWorker(language) {
+      const placeholder_canvas = document.createElement('canvas');
+      placeholder_canvas.setAttribute('width', '300');
+      placeholder_canvas.setAttribute('height', '100');
+      const offscreen = placeholder_canvas.transferControlToOffscreen();
+
+      const worker = new Worker('text-lang-worker-' + language + '.js');
+      worker.postMessage({canvas: offscreen}, [offscreen]);
+
+      return placeholder_canvas;
+    }
+
     function runTest() {
-      const placeholder_canvas_tr = document.createElement('canvas');
-      placeholder_canvas_tr.setAttribute('width', '300');
-      placeholder_canvas_tr.setAttribute('height', '100');
-      const offscreen_tr = placeholder_canvas_tr.transferControlToOffscreen();
-
-      const worker_tr = new Worker('text-lang-worker-tr.js');
-      worker_tr.postMessage({canvas: offscreen_tr}, [offscreen_tr]);
-
-      const placeholder_canvas_en = document.createElement('canvas');
-      placeholder_canvas_en.setAttribute('width', '300');
-      placeholder_canvas_en.setAttribute('height', '100');
-      const offscreen_en = placeholder_canvas_en.transferControlToOffscreen();
-
-      const worker_en = new Worker('text-lang-worker-en.js');
-      worker_en.postMessage({canvas: offscreen_en}, [offscreen_en]);
-
+      const placeholder_canvas_tr = createWorker('tr');
       const canvas_tr = document.getElementById('canvas-tr');
       const ctx_tr = canvas_tr.getContext('2d', {willReadFrequently: true});
-      const canvas_en = document.getElementById('canvas-en');
-      const ctx_en = canvas_en.getContext('2d', {willReadFrequently: true});
-      function checkResult() {
+      function checkFirstResult() {
         // Wait until frame propagates.
         ctx_tr.drawImage(placeholder_canvas_tr, 0, 0);
         const pixel_tr = ctx_tr.getImageData(0, 0, 1, 1).data;
-        ctx_en.drawImage(placeholder_canvas_en, 0, 0);
-        const pixel_en = ctx_en.getImageData(0, 0, 1, 1).data;
 
-        if (pixel_tr[3] == 0 || pixel_en[3] == 0) {
+        if (pixel_tr[3] == 0) {
           // Results not available, wait longer.
-          requestAnimationFrame(checkResult);
+          requestAnimationFrame(checkFirstResult);
         } else {
-          takeScreenshot();
+          const placeholder_canvas_en = createWorker('en');
+          const canvas_en = document.getElementById('canvas-en');
+          const ctx_en = canvas_en.getContext('2d', {willReadFrequently: true});
+          function checkSecondResult() {
+            ctx_en.drawImage(placeholder_canvas_en, 0, 0);
+            const pixel_en = ctx_en.getImageData(0, 0, 1, 1).data;
+
+            if (pixel_en[3] == 0) {
+              // Results not available, wait longer.
+              requestAnimationFrame(checkSecondResult);
+            } else {
+              takeScreenshot();
+            }
+          }
+          requestAnimationFrame(checkSecondResult);
         }
       }
-      requestAnimationFrame(checkResult);
+      requestAnimationFrame(checkFirstResult);
     }
   </script>
   <body onload="runTest()">
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.lang.inherit.html b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.lang.inherit.html
index 43157d54d2b..ce437887bc4 100644
--- a/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.lang.inherit.html
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/text/canvas.2d.offscreen.worker.lang.inherit.html
@@ -20,44 +20,50 @@
     }
   </style>
   <script type="text/javascript">
+    function createWorker(language) {
+      const placeholder_canvas = document.createElement('canvas');
+      placeholder_canvas.setAttribute('width', '300');
+      placeholder_canvas.setAttribute('height', '100');
+      placeholder_canvas.setAttribute('lang', language);
+      const offscreen = placeholder_canvas.transferControlToOffscreen();
+
+      const worker = new Worker('text-lang-worker-inherit.js');
+      worker.postMessage({canvas: offscreen}, [offscreen]);
+
+      return placeholder_canvas;
+    }
+
     function runTest() {
-      const placeholder_canvas_tr = document.createElement('canvas');
-      placeholder_canvas_tr.setAttribute('width', '300');
-      placeholder_canvas_tr.setAttribute('height', '100');
-      placeholder_canvas_tr.setAttribute('lang', 'tr');
-      const offscreen_tr = placeholder_canvas_tr.transferControlToOffscreen();
-
-      const worker_tr = new Worker('text-lang-worker-inherit.js');
-      worker_tr.postMessage({canvas: offscreen_tr}, [offscreen_tr]);
-
-      const placeholder_canvas_en = document.createElement('canvas');
-      placeholder_canvas_en.setAttribute('width', '300');
-      placeholder_canvas_en.setAttribute('height', '100');
-      placeholder_canvas_en.setAttribute('lang', 'en');
-      const offscreen_en = placeholder_canvas_en.transferControlToOffscreen();
-
-      const worker_en = new Worker('text-lang-worker-inherit.js');
-      worker_en.postMessage({canvas: offscreen_en}, [offscreen_en]);
-
+      const placeholder_canvas_tr = createWorker('tr');
       const canvas_tr = document.getElementById('canvas-tr');
       const ctx_tr = canvas_tr.getContext('2d', {willReadFrequently: true});
-      const canvas_en = document.getElementById('canvas-en');
-      const ctx_en = canvas_en.getContext('2d', {willReadFrequently: true});
-      function checkResult() {
+      function checkFirstResult() {
         // Wait until frame propagates.
         ctx_tr.drawImage(placeholder_canvas_tr, 0, 0);
         const pixel_tr = ctx_tr.getImageData(0, 0, 1, 1).data;
-        ctx_en.drawImage(placeholder_canvas_en, 0, 0);
-        const pixel_en = ctx_en.getImageData(0, 0, 1, 1).data;
 
-        if (pixel_tr[3] == 0 || pixel_en[3] == 0) {
+        if (pixel_tr[3] == 0) {
           // Results not available, wait longer.
-          requestAnimationFrame(checkResult);
+          requestAnimationFrame(checkFirstResult);
         } else {
-          takeScreenshot();
+          const placeholder_canvas_en = createWorker('en');
+          const canvas_en = document.getElementById('canvas-en');
+          const ctx_en = canvas_en.getContext('2d', {willReadFrequently: true});
+          function checkSecondResult() {
+            ctx_en.drawImage(placeholder_canvas_en, 0, 0);
+            const pixel_en = ctx_en.getImageData(0, 0, 1, 1).data;
+
+            if (pixel_en[3] == 0) {
+              // Results not available, wait longer.
+              requestAnimationFrame(checkSecondResult);
+            } else {
+              takeScreenshot();
+            }
+          }
+          requestAnimationFrame(checkSecondResult);
         }
       }
-      requestAnimationFrame(checkResult);
+      requestAnimationFrame(checkFirstResult);
     }
   </script>
   <body onload="runTest()">
diff --git a/tests/wpt/tests/html/canvas/offscreen/manual/wide-gamut-canvas/WEB_FEATURES.yml b/tests/wpt/tests/html/canvas/offscreen/manual/wide-gamut-canvas/WEB_FEATURES.yml
new file mode 100644
index 00000000000..b4d11212a6c
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/manual/wide-gamut-canvas/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: canvas-2d-color-management
+  files: "**"
diff --git a/tests/wpt/tests/html/canvas/offscreen/path-objects/WEB_FEATURES.yml b/tests/wpt/tests/html/canvas/offscreen/path-objects/WEB_FEATURES.yml
new file mode 100644
index 00000000000..1bbef5e88d6
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/path-objects/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: canvas-roundrect
+  files:
+  - 2d.path.roundrect.*
diff --git a/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.html
new file mode 100644
index 00000000000..4712a13acfd
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>OffscreenCanvas test: 2d.imageData.createImageBitmap.p3.rgba.unorm8</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.imageData.createImageBitmap.p3.rgba.unorm8</h1>
+<p class="desc">Verify round-trip of 8-bit P3 data ImageData through ImageBitmap</p>
+
+
+<script>
+promise_test(async t => {
+
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d', {colorSpace: "srgb", colorType:"float16"});
+
+  const expectedColor = [ 255, 0, 0, 255 ];
+  var imageData = new ImageData(10, 10, {colorSpace:"display-p3", pixelFormat:"rgba-unorm8"});
+  for (let y = 0; y < imageData.height; ++y) {
+    for (let x = 0; x < imageData.width; ++x) {
+      for (let c = 0; c < 4; ++c) {
+        imageData.data[4*(x + y*imageData.width) + c] = expectedColor[c];
+      }
+    }
+  }
+  var bitmap = await createImageBitmap(imageData);
+  ctx.drawImage(bitmap, 0, 0);
+  var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"display-p3", pixelFormat:"rgba-unorm8"});
+  for (let c = 0; c < 4; ++c) {
+    assert_approx_equals(pixel.data[c], expectedColor[c], 2);
+  }
+
+}, "Verify round-trip of 8-bit P3 data ImageData through ImageBitmap");
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.worker.js
new file mode 100644
index 00000000000..51034aad72c
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.p3.rgba.unorm8.worker.js
@@ -0,0 +1,29 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.imageData.createImageBitmap.p3.rgba.unorm8
+// Description:Verify round-trip of 8-bit P3 data ImageData through ImageBitmap
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+promise_test(async t => {
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d', {colorSpace: "srgb", colorType:"float16"});
+
+  const expectedColor = [ 255, 0, 0, 255 ];
+  var imageData = new ImageData(10, 10, {colorSpace:"display-p3", pixelFormat:"rgba-unorm8"});
+  for (let y = 0; y < imageData.height; ++y) {
+    for (let x = 0; x < imageData.width; ++x) {
+      for (let c = 0; c < 4; ++c) {
+        imageData.data[4*(x + y*imageData.width) + c] = expectedColor[c];
+      }
+    }
+  }
+  var bitmap = await createImageBitmap(imageData);
+  ctx.drawImage(bitmap, 0, 0);
+  var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"display-p3", pixelFormat:"rgba-unorm8"});
+  for (let c = 0; c < 4; ++c) {
+    assert_approx_equals(pixel.data[c], expectedColor[c], 2);
+  }
+}, "Verify round-trip of 8-bit P3 data ImageData through ImageBitmap");
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.html
new file mode 100644
index 00000000000..3b31076d7c7
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>OffscreenCanvas test: 2d.imageData.createImageBitmap.srgb.rgba.float16</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.imageData.createImageBitmap.srgb.rgba.float16</h1>
+<p class="desc">Verify round-trip of 16-bit float sRGB data ImageData through ImageBitmap</p>
+
+
+<script>
+promise_test(async t => {
+
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d', {colorSpace: "srgb", colorType:"float16"});
+
+  const expectedColor = [ 1.0, 2.0, -1.0, 1.0 ];
+  var imageData = new ImageData(10, 10, {colorSpace:"srgb", pixelFormat:"rgba-float16"});
+  for (let y = 0; y < imageData.height; ++y) {
+    for (let x = 0; x < imageData.width; ++x) {
+      for (let c = 0; c < 4; ++c) {
+        imageData.data[4*(x + y*imageData.width) + c] = expectedColor[c];
+      }
+    }
+  }
+  var bitmap = await createImageBitmap(imageData);
+  ctx.drawImage(bitmap, 0, 0);
+  var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"srgb", pixelFormat:"rgba-float16"});
+  for (let c = 0; c < 4; ++c) {
+    assert_approx_equals(pixel.data[c], expectedColor[c], 0.01);
+  }
+
+}, "Verify round-trip of 16-bit float sRGB data ImageData through ImageBitmap");
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.worker.js
new file mode 100644
index 00000000000..c0e2b265600
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.float16.worker.js
@@ -0,0 +1,29 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.imageData.createImageBitmap.srgb.rgba.float16
+// Description:Verify round-trip of 16-bit float sRGB data ImageData through ImageBitmap
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+promise_test(async t => {
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d', {colorSpace: "srgb", colorType:"float16"});
+
+  const expectedColor = [ 1.0, 2.0, -1.0, 1.0 ];
+  var imageData = new ImageData(10, 10, {colorSpace:"srgb", pixelFormat:"rgba-float16"});
+  for (let y = 0; y < imageData.height; ++y) {
+    for (let x = 0; x < imageData.width; ++x) {
+      for (let c = 0; c < 4; ++c) {
+        imageData.data[4*(x + y*imageData.width) + c] = expectedColor[c];
+      }
+    }
+  }
+  var bitmap = await createImageBitmap(imageData);
+  ctx.drawImage(bitmap, 0, 0);
+  var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"srgb", pixelFormat:"rgba-float16"});
+  for (let c = 0; c < 4; ++c) {
+    assert_approx_equals(pixel.data[c], expectedColor[c], 0.01);
+  }
+}, "Verify round-trip of 16-bit float sRGB data ImageData through ImageBitmap");
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.html
new file mode 100644
index 00000000000..687ffc2a29e
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>OffscreenCanvas test: 2d.imageData.createImageBitmap.srgb.rgba.unorm8</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.imageData.createImageBitmap.srgb.rgba.unorm8</h1>
+<p class="desc">Verify round-trip of 8-bit sRGB data ImageData through ImageBitmap</p>
+
+
+<script>
+promise_test(async t => {
+
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d', {colorSpace: "srgb", colorType:"float16"});
+
+  const expectedColor = [ 32, 64, 128, 255 ];
+  var imageData = new ImageData(10, 10, {colorSpace:"srgb", pixelFormat:"rgba-unorm8"});
+  for (let y = 0; y < imageData.height; ++y) {
+    for (let x = 0; x < imageData.width; ++x) {
+      for (let c = 0; c < 4; ++c) {
+        imageData.data[4*(x + y*imageData.width) + c] = expectedColor[c];
+      }
+    }
+  }
+  var bitmap = await createImageBitmap(imageData);
+  ctx.drawImage(bitmap, 0, 0);
+  var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"srgb", pixelFormat:"rgba-unorm8"});
+  for (let c = 0; c < 4; ++c) {
+    assert_approx_equals(pixel.data[c], expectedColor[c], 2);
+  }
+
+}, "Verify round-trip of 8-bit sRGB data ImageData through ImageBitmap");
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.worker.js
new file mode 100644
index 00000000000..77993c46b4c
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.createImageBitmap.srgb.rgba.unorm8.worker.js
@@ -0,0 +1,29 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.imageData.createImageBitmap.srgb.rgba.unorm8
+// Description:Verify round-trip of 8-bit sRGB data ImageData through ImageBitmap
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+promise_test(async t => {
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d', {colorSpace: "srgb", colorType:"float16"});
+
+  const expectedColor = [ 32, 64, 128, 255 ];
+  var imageData = new ImageData(10, 10, {colorSpace:"srgb", pixelFormat:"rgba-unorm8"});
+  for (let y = 0; y < imageData.height; ++y) {
+    for (let x = 0; x < imageData.width; ++x) {
+      for (let c = 0; c < 4; ++c) {
+        imageData.data[4*(x + y*imageData.width) + c] = expectedColor[c];
+      }
+    }
+  }
+  var bitmap = await createImageBitmap(imageData);
+  ctx.drawImage(bitmap, 0, 0);
+  var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"srgb", pixelFormat:"rgba-unorm8"});
+  for (let c = 0; c < 4; ++c) {
+    assert_approx_equals(pixel.data[c], expectedColor[c], 2);
+  }
+}, "Verify round-trip of 8-bit sRGB data ImageData through ImageBitmap");
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html
index f936938b7fc..5c334ceb301 100644
--- a/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html
+++ b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html
@@ -25,6 +25,8 @@ t.step(function() {
   _assertSame(typeof(imgdata.width), 'number', "typeof(imgdata.width)", "'number'");
   _assertSame(typeof(imgdata.height), 'number', "typeof(imgdata.height)", "'number'");
   _assertSame(typeof(imgdata.data), 'object', "typeof(imgdata.data)", "'object'");
+  _assertSame(typeof(imgdata.colorSpace), 'string', "typeof(imgdata.colorSpace)", "'string'");
+  _assertSame(typeof(imgdata.pixelFormat), 'string', "typeof(imgdata.pixelFormat)", "'string'");
   t.done();
 
 });
diff --git a/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.js
index e428e0d4fce..6c2026c8eae 100644
--- a/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.js
@@ -20,6 +20,8 @@ t.step(function() {
   _assertSame(typeof(imgdata.width), 'number', "typeof(imgdata.width)", "'number'");
   _assertSame(typeof(imgdata.height), 'number', "typeof(imgdata.height)", "'number'");
   _assertSame(typeof(imgdata.data), 'object', "typeof(imgdata.data)", "'object'");
+  _assertSame(typeof(imgdata.colorSpace), 'string', "typeof(imgdata.colorSpace)", "'string'");
+  _assertSame(typeof(imgdata.pixelFormat), 'string', "typeof(imgdata.pixelFormat)", "'string'");
   t.done();
 });
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.rgba.float16.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.rgba.float16.html
new file mode 100644
index 00000000000..f8bd9ad8a73
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.rgba.float16.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>OffscreenCanvas test: 2d.imageData.put.basic.rgba.float16</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.imageData.put.basic.rgba.float16</h1>
+<p class="desc">putImageData() puts 16-bit floating point image data from getImageData() onto the canvas</p>
+
+
+<script>
+var t = async_test("putImageData() puts 16-bit floating point image data from getImageData() onto the canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
+t.step(function() {
+
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d', {colorSpace: "srgb", colorType: "float16"});
+
+  ctx.fillStyle = 'color(display-p3 1 0 0)';
+  ctx.fillRect(0, 0, 100, 50)
+  var imgdata = ctx.getImageData(0, 0, 100, 50, {colorSpace:"srgb", pixelFormat:"rgba-float16"});
+  ctx.fillStyle = '#f00';
+  ctx.fillRect(0, 0, 100, 50)
+  ctx.putImageData(imgdata, 0, 0);
+  var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"display-p3", pixelFormat:"rgba-float16"});
+  assert_approx_equals(pixel.data[0], 1, 0.01);
+  assert_approx_equals(pixel.data[1], 0, 0.01);
+  assert_approx_equals(pixel.data[2], 0, 0.01);
+  assert_approx_equals(pixel.data[3], 1, 0.01);
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.rgba.float16.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.rgba.float16.worker.js
new file mode 100644
index 00000000000..06496eae05f
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.rgba.float16.worker.js
@@ -0,0 +1,32 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.imageData.put.basic.rgba.float16
+// Description:putImageData() puts 16-bit floating point image data from getImageData() onto the canvas
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("putImageData() puts 16-bit floating point image data from getImageData() onto the canvas");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
+t.step(function() {
+
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d', {colorSpace: "srgb", colorType: "float16"});
+
+  ctx.fillStyle = 'color(display-p3 1 0 0)';
+  ctx.fillRect(0, 0, 100, 50)
+  var imgdata = ctx.getImageData(0, 0, 100, 50, {colorSpace:"srgb", pixelFormat:"rgba-float16"});
+  ctx.fillStyle = '#f00';
+  ctx.fillRect(0, 0, 100, 50)
+  ctx.putImageData(imgdata, 0, 0);
+  var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"display-p3", pixelFormat:"rgba-float16"});
+  assert_approx_equals(pixel.data[0], 1, 0.01);
+  assert_approx_equals(pixel.data[1], 0, 0.01);
+  assert_approx_equals(pixel.data[2], 0, 0.01);
+  assert_approx_equals(pixel.data[3], 1, 0.01);
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.lang.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.lang.html
new file mode 100644
index 00000000000..22183f94342
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.lang.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>OffscreenCanvas test: 2d.text.measure.lang</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.text.measure.lang</h1>
+<p class="desc">Testing the lang attribute</p>
+
+
+<script>
+promise_test(async t => {
+
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d');
+
+  var f = new FontFace("Lato-Medium", "url('/fonts/Lato-Medium.ttf')");
+  f.load();
+  document.fonts.add(f);
+  await document.fonts.ready;
+
+  ctx.font = '50px Lato-Medium';
+  ctx.lang = 'tr';
+  const text = 'fi';
+  const tm_tr = ctx.measureText(text);
+  const tr_width = tm_tr.width;
+
+  ctx.lang = 'en';
+  const tm_en = ctx.measureText(text);
+  const en_width = tm_en.width;
+
+  _assert(tr_width > en_width, "tr_width > en_width");
+
+}, "Testing the lang attribute");
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.lang.inherit.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.lang.inherit.html
new file mode 100644
index 00000000000..8b630794e1d
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.lang.inherit.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>OffscreenCanvas test: 2d.text.measure.lang.inherit</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.text.measure.lang.inherit</h1>
+<p class="desc">Testing the lang attribute</p>
+
+
+<script>
+promise_test(async t => {
+
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d');
+
+  document.documentElement.setAttribute('lang','tr');
+  var f = new FontFace("Lato-Medium", "url('/fonts/Lato-Medium.ttf')");
+  f.load();
+  document.fonts.add(f);
+  await document.fonts.ready;
+
+  ctx.font = '50px Lato-Medium';
+  ctx.lang = 'inherit';
+  const text = 'fi';
+  const tm_tr = ctx.measureText(text);
+  const tr_width = tm_tr.width;
+
+  ctx.lang = 'en';
+  const tm_en = ctx.measureText(text);
+  const en_width = tm_en.width;
+
+  _assert(tr_width > en_width, "tr_width > en_width");
+
+}, "Testing the lang attribute");
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.lang.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.lang.worker.js
new file mode 100644
index 00000000000..5bbb2317f24
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.lang.worker.js
@@ -0,0 +1,30 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.text.measure.lang
+// Description:Testing the lang attribute
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+promise_test(async t => {
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d');
+
+  var f = new FontFace("Lato-Medium", "url('/fonts/Lato-Medium.ttf')");
+  f.load();
+  self.fonts.add(f);
+  await self.fonts.ready;
+
+  ctx.font = '50px Lato-Medium';
+  ctx.lang = 'tr';
+  const text = 'fi';
+  const tm_tr = ctx.measureText(text);
+  const tr_width = tm_tr.width;
+
+  ctx.lang = 'en';
+  const tm_en = ctx.measureText(text);
+  const en_width = tm_en.width;
+
+  _assert(tr_width > en_width, "tr_width > en_width");
+}, "Testing the lang attribute");
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.selection-rects-baselines.tentative.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.selection-rects-baselines.tentative.html
index fc1683bcce1..60c3e66b55b 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.selection-rects-baselines.tentative.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.selection-rects-baselines.tentative.html
@@ -37,8 +37,8 @@ t.step(function() {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (const text of kTexts) {
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.selection-rects-baselines.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.selection-rects-baselines.tentative.worker.js
index bdd015eef82..d270e1dcfd8 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.selection-rects-baselines.tentative.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.selection-rects-baselines.tentative.worker.js
@@ -32,8 +32,8 @@ t.step(function() {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (const text of kTexts) {
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.selection-rects.tentative.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.selection-rects.tentative.html
index 95a8c8b4955..c194c860d8f 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.selection-rects.tentative.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.selection-rects.tentative.html
@@ -86,8 +86,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -200,8 +200,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -314,8 +314,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -428,8 +428,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -542,8 +542,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -656,8 +656,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -770,8 +770,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -884,8 +884,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -998,8 +998,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1112,8 +1112,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1226,8 +1226,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1340,8 +1340,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1465,8 +1465,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1591,8 +1591,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1717,8 +1717,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1843,8 +1843,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -1969,8 +1969,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -2095,8 +2095,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -2221,8 +2221,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -2347,8 +2347,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -2473,8 +2473,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -2599,8 +2599,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -2725,8 +2725,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
@@ -2851,8 +2851,8 @@ test(t => {
     '🏁🎶🏁',
     '）（あ）（',
     '-abcd_',
-    'اين المكتبة؟',
-    'bidiالرياضيات'
+    'איפה הספרייה?',
+    'bidiמתמטיקה'
   ]
 
   for (text of kTexts) {
diff --git a/tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.html b/tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.html
index 0197c10ad28..7d22528bc5b 100644
--- a/tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.html
+++ b/tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.html
@@ -7,11 +7,11 @@
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
 <h1>2d.color.space.p3.to.srgb</h1>
-<p class="desc">test getImageData with srsb and uint8 from display p3 uint8 canvas</p>
+<p class="desc">test getImageData with srgb and uint8 from display p3 uint8 canvas</p>
 
 
 <script>
-var t = async_test("test getImageData with srsb and uint8 from display p3 uint8 canvas");
+var t = async_test("test getImageData with srgb and uint8 from display p3 uint8 canvas");
 var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
diff --git a/tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.worker.js b/tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.worker.js
index da84a683bcf..13ee21933db 100644
--- a/tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.worker.js
@@ -1,12 +1,12 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.color.space.p3.to.srgb
-// Description:test getImageData with srsb and uint8 from display p3 uint8 canvas
+// Description:test getImageData with srgb and uint8 from display p3 uint8 canvas
 // Note:
 
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
 
-var t = async_test("test getImageData with srsb and uint8 from display p3 uint8 canvas");
+var t = async_test("test getImageData with srgb and uint8 from display p3 uint8 canvas");
 var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
diff --git a/tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/WEB_FEATURES.yml b/tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/WEB_FEATURES.yml
new file mode 100644
index 00000000000..b4d11212a6c
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: canvas-2d-color-management
+  files: "**"
diff --git a/tests/wpt/tests/html/canvas/resources/canvas-promise-test-worker.js b/tests/wpt/tests/html/canvas/resources/canvas-promise-test-worker.js
index f5410efca5b..2cb50c322f7 100644
--- a/tests/wpt/tests/html/canvas/resources/canvas-promise-test-worker.js
+++ b/tests/wpt/tests/html/canvas/resources/canvas-promise-test-worker.js
@@ -9,7 +9,8 @@ function canvasPromiseTest(
     testBody, description,
     {testTypes = Object.values(CanvasTestType)} = {}) {
   if (testTypes.includes(CanvasTestType.WORKER)) {
-    promise_test(() => testBody(new OffscreenCanvas(300, 150)),
+    promise_test(() => testBody(new OffscreenCanvas(300, 150),
+                                {canvasType: CanvasTestType.WORKER}),
                 'Worker: ' + description);
   }
 }
diff --git a/tests/wpt/tests/html/canvas/resources/canvas-promise-test.js b/tests/wpt/tests/html/canvas/resources/canvas-promise-test.js
index 1b2e2b3a584..afcbec9a6d5 100644
--- a/tests/wpt/tests/html/canvas/resources/canvas-promise-test.js
+++ b/tests/wpt/tests/html/canvas/resources/canvas-promise-test.js
@@ -19,10 +19,11 @@
  * Enum listing all test types emitted by `canvasPromiseTest()`.
  */
 const CanvasTestType = Object.freeze({
-  HTML:   Symbol("html"),
-  DETACHED_HTML:   Symbol("detached_html"),
-  OFFSCREEN:  Symbol("offscreen"),
-  WORKER: Symbol("worker")
+  HTML:   Symbol('html'),
+  DETACHED_HTML:   Symbol('detached_html'),
+  OFFSCREEN:  Symbol('offscreen'),
+  PLACEHOLDER: Symbol('placeholder'),
+  WORKER: Symbol('worker')
 });
 
 ALL_CANVAS_TEST_TYPES = Object.values(CanvasTestType);
@@ -43,6 +44,7 @@ MAIN_THREAD_CANVAS_TEST_TYPES = [
     CanvasTestType.HTML,
     CanvasTestType.DETACHED_HTML,
     CanvasTestType.OFFSCREEN,
+    CanvasTestType.PLACEHOLDER,
 ];
 WORKER_CANVAS_TEST_TYPES = [
     CanvasTestType.WORKER,
@@ -83,20 +85,34 @@ function canvasPromiseTest(
       }
       const canvas = document.createElement('canvas');
       document.body.appendChild(canvas);
-      await testBody(canvas);
+      await testBody(canvas, {canvasType: CanvasTestType.HTML});
       document.body.removeChild(canvas);
     }, 'HTMLCanvasElement: ' + description);
   }
 
   if (testTypes.includes(CanvasTestType.DETACHED_HTML)) {
-    promise_test(() => testBody(document.createElement('canvas')),
+    promise_test(() => testBody(document.createElement('canvas'),
+                                {canvasType: CanvasTestType.DETACHED_HTML}),
                  'Detached HTMLCanvasElement: ' + description);
   }
 
   if (testTypes.includes(CanvasTestType.OFFSCREEN)) {
-    promise_test(() => testBody(new OffscreenCanvas(300, 150)),
+    promise_test(() => testBody(new OffscreenCanvas(300, 150),
+                                {canvasType: CanvasTestType.OFFSCREEN}),
                  'OffscreenCanvas: ' + description);
   }
+
+  if (testTypes.includes(CanvasTestType.PLACEHOLDER)) {
+    promise_test(async () => {
+      if (!document.body) {
+        document.documentElement.appendChild(document.createElement("body"));
+      }
+      const placeholder = document.createElement('canvas');
+      document.body.appendChild(placeholder);
+      await testBody(placeholder.transferControlToOffscreen(),
+                     {canvasType: CanvasTestType.PLACEHOLDER});
+    }, 'PlaceholderCanvas: ' + description);
+  }
 }
 
 /**
diff --git a/tests/wpt/tests/html/canvas/tools/yaml/color_space.yaml b/tests/wpt/tests/html/canvas/tools/yaml/color_space.yaml
index 0582f495347..118ca1e4d38 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml/color_space.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml/color_space.yaml
@@ -17,7 +17,7 @@
     assert_approx_equals(pixel[3], pixel_expected[3], 2);
 
 - name: 2d.color.space.p3.to.srgb
-  desc: test getImageData with srsb and uint8 from display p3 uint8 canvas
+  desc: test getImageData with srgb and uint8 from display p3 uint8 canvas
   attributes: '{colorSpace: "display-p3"}'
   code: |
     var color_style = 'rgb(50, 100, 150)';
diff --git a/tests/wpt/tests/html/canvas/tools/yaml/pixel-manipulation.yaml b/tests/wpt/tests/html/canvas/tools/yaml/pixel-manipulation.yaml
index 6721f5ffde5..0dfa9a4329e 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml/pixel-manipulation.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml/pixel-manipulation.yaml
@@ -158,6 +158,69 @@
     @assert imgdata1.width === imgdata2.width;
     @assert imgdata1.height === imgdata2.height;
 
+- name: 2d.imageData.createImageBitmap.srgb.rgba.unorm8
+  desc: Verify round-trip of 8-bit sRGB data ImageData through ImageBitmap
+  attributes: '{colorSpace: "srgb", colorType:"float16"}'
+  test_type: promise
+  code: |
+    const expectedColor = [ 32, 64, 128, 255 ];
+    var imageData = new ImageData(10, 10, {colorSpace:"srgb", pixelFormat:"rgba-unorm8"});
+    for (let y = 0; y < imageData.height; ++y) {
+      for (let x = 0; x < imageData.width; ++x) {
+        for (let c = 0; c < 4; ++c) {
+          imageData.data[4*(x + y*imageData.width) + c] = expectedColor[c];
+        }
+      }
+    }
+    var bitmap = await createImageBitmap(imageData);
+    ctx.drawImage(bitmap, 0, 0);
+    var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"srgb", pixelFormat:"rgba-unorm8"});
+    for (let c = 0; c < 4; ++c) {
+      assert_approx_equals(pixel.data[c], expectedColor[c], 2);
+    }
+
+- name: 2d.imageData.createImageBitmap.srgb.rgba.float16
+  desc: Verify round-trip of 16-bit float sRGB data ImageData through ImageBitmap
+  attributes: '{colorSpace: "srgb", colorType:"float16"}'
+  test_type: promise
+  code: |
+    const expectedColor = [ 1.0, 2.0, -1.0, 1.0 ];
+    var imageData = new ImageData(10, 10, {colorSpace:"srgb", pixelFormat:"rgba-float16"});
+    for (let y = 0; y < imageData.height; ++y) {
+      for (let x = 0; x < imageData.width; ++x) {
+        for (let c = 0; c < 4; ++c) {
+          imageData.data[4*(x + y*imageData.width) + c] = expectedColor[c];
+        }
+      }
+    }
+    var bitmap = await createImageBitmap(imageData);
+    ctx.drawImage(bitmap, 0, 0);
+    var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"srgb", pixelFormat:"rgba-float16"});
+    for (let c = 0; c < 4; ++c) {
+      assert_approx_equals(pixel.data[c], expectedColor[c], 0.01);
+    }
+
+- name: 2d.imageData.createImageBitmap.p3.rgba.unorm8
+  desc: Verify round-trip of 8-bit P3 data ImageData through ImageBitmap
+  attributes: '{colorSpace: "srgb", colorType:"float16"}'
+  test_type: promise
+  code: |
+    const expectedColor = [ 255, 0, 0, 255 ];
+    var imageData = new ImageData(10, 10, {colorSpace:"display-p3", pixelFormat:"rgba-unorm8"});
+    for (let y = 0; y < imageData.height; ++y) {
+      for (let x = 0; x < imageData.width; ++x) {
+        for (let c = 0; c < 4; ++c) {
+          imageData.data[4*(x + y*imageData.width) + c] = expectedColor[c];
+        }
+      }
+    }
+    var bitmap = await createImageBitmap(imageData);
+    ctx.drawImage(bitmap, 0, 0);
+    var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"display-p3", pixelFormat:"rgba-unorm8"});
+    for (let c = 0; c < 4; ++c) {
+      assert_approx_equals(pixel.data[c], expectedColor[c], 2);
+    }
+
 - name: 2d.imageData.create.and.resize
   desc: Verify no crash when resizing an image bitmap to zero.
   canvas_types: ['HtmlCanvas']
@@ -482,6 +545,8 @@
     @assert typeof(imgdata.width) === 'number';
     @assert typeof(imgdata.height) === 'number';
     @assert typeof(imgdata.data) === 'object';
+    @assert typeof(imgdata.colorSpace) === 'string';
+    @assert typeof(imgdata.pixelFormat) === 'string';
 
 - name: 2d.imageData.object.readonly
   desc: ImageData objects properties are read-only
@@ -606,6 +671,69 @@
         @assert throws TypeError new ImageData(new Uint16Array(new SharedArrayBuffer(32)), 4, 2);
     }
 
+- name: 2d.imageData.object.ctor.pixelFormat
+  canvas_types: ['HtmlCanvas']
+  desc: Testing ImageData constructor pixelFormat behaviors
+  code: |
+    function setRGBA(imageData, i, rgba)
+    {
+        var s = i * 4;
+        imageData[s] = rgba[0];
+        imageData[s + 1] = rgba[1];
+        imageData[s + 2] = rgba[2];
+        imageData[s + 3] = rgba[3];
+    }
+
+    function getRGBA(imageData, i)
+    {
+        var result = [];
+        var s = i * 4;
+        for (var j = 0; j < 4; j++) {
+            result[j] = imageData[s + j];
+        }
+        return result;
+    }
+
+    function assertArrayEquals(actual, expected)
+    {
+        @assert typeof actual === "object";
+        @assert actual !== null;
+        @assert "length" in actual === true;
+        @assert actual.length === expected.length;
+        for (var i = 0; i < actual.length; i++) {
+            @assert actual.hasOwnProperty(i) === expected.hasOwnProperty(i);
+            @assert actual[i] === expected[i];
+        }
+    }
+
+    @assert ImageData !== undefined;
+    imageData = new ImageData(100, 50);
+    @assert imageData.pixelFormat === "rgba-unorm8";
+
+    imageData = new ImageData(100, 50, {pixelFormat:"rgba-float16"});
+    @assert imageData.pixelFormat === "rgba-float16";
+    var testColor = [0, -1, 0.5, 1024];
+    setRGBA(imageData.data, 4, testColor);
+    assertArrayEquals(getRGBA(imageData.data, 4), testColor);
+
+    data = new Float16Array(200);
+    imageData = new ImageData(data, 10, 5, {pixelFormat:"rgba-float16"});
+    @assert imageData.pixelFormat === "rgba-float16";
+    @assert imageData.data === data;
+    @assert throws INVALID_STATE_ERR new ImageData(data, 10, 5, {pixelFormat:"rgba-unorm8"});
+    @assert throws INVALID_STATE_ERR new ImageData(data, 10, 5);
+
+    data = new Uint8ClampedArray(200);
+    imageData = new ImageData(data, 10, 5);
+    @assert imageData.pixelFormat === "rgba-unorm8";
+    @assert imageData.data === data;
+    @assert throws INVALID_STATE_ERR new ImageData(data, 10, 5, {pixelFormat:"rgba-float16"});
+
+    @assert throws TypeError new ImageData(data, 10, 5, {pixelFormat:"unorm8"});
+    @assert throws TypeError new ImageData(data, 10, 5, {pixelFormat:"float16"});
+    @assert throws TypeError new ImageData(data, 10, 5, {pixelFormat:"rgba8unorm"});
+    @assert throws TypeError new ImageData(data, 10, 5, {pixelFormat:"rgba16float"});
+
 - name: 2d.imageData.object.ctor.array
   desc: ImageData has a usable constructor
   canvas_types: ['HtmlCanvas']
@@ -776,6 +904,22 @@
     @assert pixel 50,25 ==~ 0,255,0,255;
   expected: green
 
+- name: 2d.imageData.put.basic.rgba.float16
+  desc: putImageData() puts 16-bit floating point image data from getImageData() onto the canvas
+  attributes: '{colorSpace: "srgb", colorType: "float16"}'
+  code: |
+    ctx.fillStyle = 'color(display-p3 1 0 0)';
+    ctx.fillRect(0, 0, 100, 50)
+    var imgdata = ctx.getImageData(0, 0, 100, 50, {colorSpace:"srgb", pixelFormat:"rgba-float16"});
+    ctx.fillStyle = '#f00';
+    ctx.fillRect(0, 0, 100, 50)
+    ctx.putImageData(imgdata, 0, 0);
+    var pixel = ctx.getImageData(0, 0, 1, 1, {colorSpace:"display-p3", pixelFormat:"rgba-float16"});
+    assert_approx_equals(pixel.data[0], 1, 0.01);
+    assert_approx_equals(pixel.data[1], 0, 0.01);
+    assert_approx_equals(pixel.data[2], 0, 0.01);
+    assert_approx_equals(pixel.data[3], 1, 0.01);
+
 - name: 2d.imageData.put.created
   desc: putImageData() puts image data from createImageData() onto the canvas
   code: |
diff --git a/tests/wpt/tests/html/canvas/tools/yaml/text.yaml b/tests/wpt/tests/html/canvas/tools/yaml/text.yaml
index 48a0429f267..0a8e5413577 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml/text.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml/text.yaml
@@ -1408,8 +1408,8 @@
       '🏁🎶🏁',
       '）（あ）（',
       '-abcd_',
-      'اين المكتبة؟',
-      'bidiالرياضيات'
+      'איפה הספרייה?',
+      'bidiמתמטיקה'
     ]
 
     for (text of kTexts) {
@@ -1489,8 +1489,8 @@
       '🏁🎶🏁',
       '）（あ）（',
       '-abcd_',
-      'اين المكتبة؟',
-      'bidiالرياضيات'
+      'איפה הספרייה?',
+      'bidiמתמטיקה'
     ]
 
     for (const text of kTexts) {
@@ -2718,6 +2718,67 @@
     @assert ctx.letterSpacing === '1px';
     @assert ctx.wordSpacing === '10px';
 
+- name: 2d.text.measure.lang
+  desc: Testing the lang attribute
+  test_type: promise
+  fonts:
+  - Lato-Medium
+  code: |
+    {{ load_font }}
+
+    ctx.font = '50px Lato-Medium';
+    ctx.lang = 'tr';
+    const text = 'fi';
+    const tm_tr = ctx.measureText(text);
+    const tr_width = tm_tr.width;
+
+    ctx.lang = 'en';
+    const tm_en = ctx.measureText(text);
+    const en_width = tm_en.width;
+
+    @assert tr_width > en_width;
+  variants:
+  - *load-font-variant-definition
+
+- name: 2d.text.measure.lang.inherit
+  desc: Testing the lang attribute
+  test_type: promise
+  canvas_types: ['HtmlCanvas', 'OffscreenCanvas']
+  fonts:
+  - Lato-Medium
+  canvas: 'lang="tr"'
+  code: |
+    {{ load_font }}
+
+    ctx.font = '50px Lato-Medium';
+    ctx.lang = 'inherit';
+    const text = 'fi';
+    const tm_tr = ctx.measureText(text);
+    const tr_width = tm_tr.width;
+
+    ctx.lang = 'en';
+    const tm_en = ctx.measureText(text);
+    const en_width = tm_en.width;
+
+    @assert tr_width > en_width;
+  variants:
+  - &load-font-variant-definitio-and-set-lang
+    HtmlCanvas:
+      append_variants_to_name: false
+      canvas_types: ['HtmlCanvas']
+      load_font: |-
+        await document.fonts.ready;
+    OffscreenCanvas:
+      append_variants_to_name: false
+      canvas_types: ['OffscreenCanvas']
+      load_font: |-
+        document.documentElement.setAttribute('lang','tr');
+        var f = new FontFace("{{ fonts[0] }}", "url('/fonts/{{ fonts[0] }}.ttf')");
+        f.load();
+        {% set root = 'self' if canvas_type == 'Worker' else 'document' %}
+        {{ root }}.fonts.add(f);
+        await {{ root }}.fonts.ready;
+
 - name: 2d.text.drawing.style.font-relative.spacing
   desc: Testing letter spacing and word spacing with font-relative length
   code: |
diff --git a/tests/wpt/tests/html/cross-origin-embedder-policy/blob.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/blob.https.html
index ce72f247ef7..e27b281a11d 100644
--- a/tests/wpt/tests/html/cross-origin-embedder-policy/blob.https.html
+++ b/tests/wpt/tests/html/cross-origin-embedder-policy/blob.https.html
@@ -2,6 +2,7 @@
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
 <div id=log></div>
@@ -22,6 +23,14 @@ const origins = get_host_info();
   }
 ].forEach(({ origin, crossOrigin }) => {
   ["subframe", "navigate", "popup"].forEach(variant => {
+    // Due to `noopener` being enforced on Blob URLs where the corresponding
+    // origin is cross-site to the opening context's top-level site, require
+    // dispatcher.js to pass information back after window.open().
+    if (origin === origins.HTTPS_NOTSAMESITE_ORIGIN &&
+        crossOrigin === origins.HTTPS_ORIGIN &&
+        variant === "popup") {
+      return;
+    }
     async_test(t => {
       const id = token();
       const frame = document.createElement("iframe");
@@ -41,4 +50,29 @@ const origins = get_host_info();
     }, `Cross-Origin-Embedder-Policy and blob: URL from ${origin} in subframe via ${variant}`);
   });
 });
+
+// New test for the specific case using dispatcher.js for popups.
+promise_test(async t => {
+  const origin = origins.HTTPS_NOTSAMESITE_ORIGIN;
+  const crossOrigin = origins.HTTPS_ORIGIN;
+  const variant = "popup-dispatch";
+  const id = token();
+
+  const frame = document.createElement("iframe");
+  t.add_cleanup(() => { frame.remove(); });
+
+  const path = new URL("resources/blob-url-factory.html", window.location).pathname;
+  frame.src = `${origin}${path}?id=${id}&variant=${variant}&crossOrigin=${crossOrigin}`;
+  document.body.append(frame);
+
+  // Use dispatcher to wait for the message.
+  const message = await receive(id);
+  const data = JSON.parse(message);
+
+  assert_equals(data.origin, origin, "Message origin should match test origin");
+  assert_true(data.sameOriginNoCORPSuccess, "Same-origin fetch without CORP should succeed");
+  assert_true(data.crossOriginNoCORPFailure, "Cross-origin fetch without CORP should fail");
+
+}, `Cross-Origin-Embedder-Policy and blob: URL from ${origins.HTTPS_NOTSAMESITE_ORIGIN} in popup (using dispatcher)`);
+
 </script>
diff --git a/tests/wpt/tests/html/cross-origin-embedder-policy/resources/blob-url-factory.html b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/blob-url-factory.html
index 928d404672d..98937a2501d 100644
--- a/tests/wpt/tests/html/cross-origin-embedder-policy/resources/blob-url-factory.html
+++ b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/blob-url-factory.html
@@ -1,22 +1,37 @@
 <body>
+<script src="/common/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
 <script src="script-factory.js"></script>
 <script>
 const query = new URLSearchParams(window.location.search);
 const id = query.get("id");
 const variant = query.get("variant");
 let parent = "parent";
+let useDispatcher = false;
+
 if (variant === "subframe") {
   parent = "parent.parent";
 } else if (variant === "popup") {
   parent = "opener.parent";
+} else if (variant === "popup-dispatch") {
+  useDispatcher = true;
 }
-const blob = new Blob([`<script>${createScript(window.origin, query.get("crossOrigin"), parent, id)}<\/script>`], { type: "text/html" });
+
+const blobContent = `
+  <!doctype html>
+  <base href="${window.location.href}">
+  <script src="/common/utils.js"><\/script>
+  <script src="/common/dispatcher/dispatcher.js"><\/script>
+
+  <script>${createScript(window.origin, query.get("crossOrigin"), parent, id, useDispatcher)}<\/script>
+`;
+const blob = new Blob([blobContent], { type: "text/html" });
 const blobURL = URL.createObjectURL(blob);
 if (variant === "subframe") {
   const frame = document.createElement("iframe");
   frame.src = blobURL;
   document.body.append(frame);
-} else if (variant === "popup") {
+} else if (variant === "popup" || variant === "popup-dispatch") {
   window.open(blobURL);
 } else {
   window.location = blobURL;
diff --git a/tests/wpt/tests/html/cross-origin-embedder-policy/resources/script-factory.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/script-factory.js
index ac7a1fda06f..e57449abac4 100644
--- a/tests/wpt/tests/html/cross-origin-embedder-policy/resources/script-factory.js
+++ b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/script-factory.js
@@ -1,6 +1,5 @@
 // This creates a serialized <script> element that is useful for blob/data/srcdoc-style tests.
-
-function createScript(sameOrigin, crossOrigin, type="parent", id="") {
+function createScript(sameOrigin, crossOrigin, type="parent", id="", useDispatcher=false) {
   return `const data = { id: "${id}",
                opener: !!window.opener,
                origin: window.origin,
@@ -23,6 +22,8 @@ Promise.all(records).then(() => {
   if ("${type}" === "channel") {
     const bc = new BroadcastChannel("${id}");
     bc.postMessage(data);
+  } else if (${useDispatcher}) {
+    send("${id}", JSON.stringify(data));
   } else {
     window.${type}.postMessage(data, "*");
   }
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/resource-popup.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/resource-popup.https.html
index 481cceb72f0..ec2f7af28fe 100644
--- a/tests/wpt/tests/html/cross-origin-opener-policy/resource-popup.https.html
+++ b/tests/wpt/tests/html/cross-origin-opener-policy/resource-popup.https.html
@@ -40,7 +40,7 @@ const coop_resource_test = ({parentCoop, resourceCoop, resource, resourceName, v
       // redirected to the HTML document.
       bc.postMessage(null);
       // Prepare to close the "child" popup in the case that it has not yet
-      // redirected to the the HTML document.
+      // redirected to the HTML document.
       bc.onmessage = () => bc.postMessage(null);
     });
   }, `${resource} - parent COOP: "${parentCoop}"; child COOP: "${resourceCoop}"`);
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/README.md b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/README.md
deleted file mode 100644
index b3c24c3f82d..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Because this test suite is run as a virtual suite and it's quite deep in the
-folders, we have to use abbreviations for the test names to not run over 200
-characters, which is problematic on Windows.
-
-* unspecified -> "u"
-* unsafe-none -> "un"
-* same-origin -> "so"
-* same-origin-allow-popups -> "soap"
-* restrict-properties -> omitted
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-closed.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-closed.https.html
deleted file mode 100644
index 1c315b35d7f..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-closed.https.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!doctype html>
-<title> Check openee.closed access is allowed for COOP: restrict-properties</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/common/get-host-info.sub.js></script>
-<script src="/common/utils.js"></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/html/cross-origin-opener-policy/reporting/resources/reporting-common.js"></script>
-<script src="/html/cross-origin-opener-policy/reporting/resources/test-access-property.js"></script>
-<script>
-
-testAccessProperty(
-  "closed",
-  w => w.closed,
-  expectReport = false,
-  use_restrict_properties = true
-);
-
-</script>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-openee-rp-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-openee-rp-ro.https.html
deleted file mode 100644
index 7a96f4f5762..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-openee-rp-ro.https.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!doctype html>
-<title>
-  COOP reports are sent to the openee when the openee used COOP-RO:
-  restrict-properties and its same-origin opener tries to access it.
-</title>
-<meta name=timeout content=long>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/common/get-host-info.sub.js></script>
-<script src="/common/utils.js"></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/html/cross-origin-opener-policy/reporting/resources/reporting-common.js"></script>
-<script src="/html/cross-origin-opener-policy/reporting/resources/try-access.js"></script>
-<script>
-
-const directory = "/html/cross-origin-opener-policy";
-const same_origin = get_host_info().HTTPS_ORIGIN;
-
-promise_test(async t => {
-  const report_token = token();
-  const openee_token = token();
-  const opener_token = token(); // The current test window.
-
-  const opener_url = location.href;
-
-  const reportTo = reportToHeaders(report_token);
-  const openee_url = same_origin + executor_path + reportTo.header +
-    reportTo.coopReportOnlyRestrictPropertiesHeader +
-    `&uuid=${openee_token}`;
-
-  const openee = window.open(openee_url);
-  t.add_cleanup(() => send(openee_token, "window.close()"))
-
-  // 1. Make sure the new document to be loaded.
-  send(openee_token, `
-    send("${opener_token}", "Ready");
-  `);
-  let reply = await receive(opener_token);
-  assert_equals(reply, "Ready");
-
-  // 2. Try to access the openee. A report is sent, because of COOP-RO:
-  // restrict-properties.
-  tryAccess(openee);
-
-  // 3. Check a report is sent to the openee.
-  let report =
-    await receiveReport(report_token, "access-to-coop-page-from-opener");
-  assert_equals(report.type, "coop");
-  assert_equals(report.url, openee_url.replace(/"/g, '%22'));
-  assert_equals(report.body.disposition, "reporting");
-  assert_equals(report.body.effectivePolicy, "restrict-properties");
-  assert_equals(report.body.property, "blur");
-  assert_source_location_missing(report);
-  assert_equals(report.body.openerURL, opener_url);
-  assert_equals(report.body.openeeURL, undefined);
-  assert_equals(report.body.otherDocumentURL, undefined);
-  assert_equals(report.body.referrer, opener_url);
-  assert_equals(report.body.initialPopupURL, undefined);
-}, "access-reporting-openee-rp-ro");
-
-</script>
-
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-opener-rp-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-opener-rp-ro.https.html
deleted file mode 100644
index 9e1e85b16a5..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-opener-rp-ro.https.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!doctype html>
-<title>
-  COOP reports are sent to the opener when the opener used COOP-RO:
-  restrict-properties and its same-origin openee tries to access it.
-</title>
-<meta name=timeout content=long>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/common/get-host-info.sub.js></script>
-<script src="/common/utils.js"></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/html/cross-origin-opener-policy/resources/common.js"></script>
-<script src="/html/cross-origin-opener-policy/reporting/resources/reporting-common.js"></script>
-<script src="/html/cross-origin-opener-policy/reporting/resources/try-access.js"></script>
-<script>
-
-const directory = "/html/cross-origin-opener-policy";
-const same_origin = get_host_info().HTTPS_ORIGIN;
-
-promise_test(async t => {
-  // The test window.
-  const this_window_token = token();
-
-  // The "opener" window. This has COOP and a reporter.
-  const opener_report_token= token();
-  const opener_token = token();
-  const opener_reportTo = reportToHeaders(opener_report_token);
-  const opener_url = same_origin + executor_path + opener_reportTo.header +
-    opener_reportTo.coopReportOnlyRestrictPropertiesHeader +
-    `&uuid=${opener_token}`;
-
-  // The "openee" window. This is same origin with the "opener".
-  const openee_report_token= token();
-  const openee_token = token();
-  const openee_url = same_origin + executor_path + `&uuid=${openee_token}`;
-
-  // 1. Create the opener window.
-  let opener_window_proxy = window.open(opener_url);
-  t.add_cleanup(() => send(opener_token, "window.close()"));
-
-  // 2. The opener opens its openee.
-  send(opener_token, `
-    openee = window.open("${openee_url}");
-    send("${this_window_token}", "ACK 1");
-  `);
-  assert_equals("ACK 1", await receive(this_window_token));
-  t.add_cleanup(() => send(openee_token, "window.close()"));
-
-  // 3. The openee tries to access its opener.
-  send(openee_token, addScriptAndTriggerOnload(
-    directory + "/reporting/resources/try-access.js",
-    "tryAccess(opener);")
-  );
-
-  // 4. Check a report sent to the opener.
-  let report =
-    await receiveReport(opener_report_token, "access-to-coop-page-from-openee");
-  assert_equals(report.type, "coop");
-  assert_equals(report.url, opener_url.replace(/"/g, '%22'));
-  assert_equals(report.body.disposition, "reporting");
-  assert_equals(report.body.effectivePolicy, "restrict-properties");
-  assert_equals(report.body.property, "blur");
-  assert_source_location_missing(report);
-  assert_equals(report.body.openerURL, undefined);
-  assert_equals(report.body.openeeURL, openee_url);
-  assert_equals(report.body.otherDocumentURL, undefined);
-  assert_equals(report.body.referrer, undefined);
-  assert_equals(report.body.initialPopupURL, openee_url);
-}, "access-reporting-opener-rp-ro");
-
-</script>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-post-message.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-post-message.https.html
deleted file mode 100644
index 5bc718e2a89..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-post-message.https.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!doctype html>
-<title> Check openee.postMessage() access is allowed for COOP: restrict-properties</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/common/get-host-info.sub.js></script>
-<script src="/common/utils.js"></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/html/cross-origin-opener-policy/reporting/resources/reporting-common.js"></script>
-<script src="/html/cross-origin-opener-policy/reporting/resources/test-access-property.js"></script>
-<script>
-
-testAccessProperty(
-  "postMessage",
-  w => w.postMessage("message", "*"),
-  expectReport = false,
-  use_restrict_properties = true
-);
-
-</script>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/coop-rp-in-navigation-chain.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/coop-rp-in-navigation-chain.https.html
deleted file mode 100644
index e5c87751748..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/coop-rp-in-navigation-chain.https.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<meta name=timeout content=long>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/common/utils.js"></script>
-<script src="../../resources/common.js"></script>
-<script src="../../resources/popup-test.js"></script>
-<script>
-
-promise_test(async t => {
-    const popup_token = token();
-    const second_popup_token = token();
-    const reply_token = token();
-
-    const unsafe_none_url = getExecutorPath(
-          popup_token,
-          SAME_ORIGIN.origin,
-          { coop: "unsafe-none"});
-
-    const restrict_properties_url = getExecutorPath(
-          second_popup_token,
-          SAME_ORIGIN.origin,
-          { coop: "restrict-properties"});
-
-    // We open popup and then ping it, it will respond after loading.
-    const popup = window.open(unsafe_none_url);
-    send(popup_token, `send('${reply_token}', 'Popup loaded');`);
-    assert_equals(await receive(reply_token), 'Popup loaded');
-
-    // Make sure the popup will be closed once the test has run, keeping a clean
-    // state.
-    t.add_cleanup(() => {
-      send(popup_token, `close()`);
-    });
-
-    // Now navigate this popup to a restrict-properties page.
-    send(popup_token, `document.location = '${restrict_properties_url}'`);
-    send(second_popup_token, `send('${reply_token}', 'Popup loaded');`);
-    assert_equals(await receive(reply_token), 'Popup loaded');
-
-    // Navigate again to the original page.
-    send(second_popup_token, `document.location = '${unsafe_none_url}'`);
-    send(popup_token, `send('${reply_token}', 'Popup loaded');`);
-    assert_equals(await receive(reply_token), 'Popup loaded');
-
-    // Give some time for things to settle across processes etc. before
-    // proceeding with verifications.
-    await new Promise(resolve => { t.step_timeout(resolve, 500); });
-
-    // Verify that we have full access to the popup.
-    assert_false(popup.closed, 'Popup is closed from opener?');
-    assert_true(await getPopupHasOpener(popup_token) === "true",
-                    'Popup has nulled opener?');
-    assert_true(canAccessProperty(popup, "document"),
-                      'Main page has dom access to the popup?');
-    assert_true(canAccessProperty(popup, "frames"),
-                    'Main page has cross origin access to the popup?');
-
-}, "COOP: restrict-properties has no impact in a navigation chain between " +
-   "multiple unsafe-none pages.");
-
-</script>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/coop-rp-in-navigation-chain.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/coop-rp-in-navigation-chain.https.html.headers
deleted file mode 100644
index 073ce7adfbd..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/coop-rp-in-navigation-chain.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Cross-Origin-Opener-Policy: unsafe-none
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js
deleted file mode 100644
index 1247400a4e3..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js
+++ /dev/null
@@ -1,144 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-// META: script=/common/utils.js
-// META: script=/common/dispatcher/dispatcher.js
-
-const executor_path = '/common/dispatcher/executor.html?pipe=';
-const cross_origin = get_host_info().OTHER_ORIGIN;
-const same_origin = get_host_info().ORIGIN;
-const coep_require_corp_header =
-    '|header(Cross-Origin-Embedder-Policy,require-corp)';
-const corp_cross_origin_header =
-    '|header(Cross-Origin-Resource-Policy,cross-origin)';
-const coop_restrict_properties_header =
-    '|header(Cross-Origin-Opener-Policy,restrict-properties)';
-
-function iframePopupAboutBlankTest(
-    origin, {expectedCrossOriginIsolated}, description) {
-  promise_test(async t => {
-    assert_true(crossOriginIsolated, 'Is main frame crossOriginIsolated?');
-    assert_true(
-        'SharedArrayBuffer' in globalThis,
-        'Is SharedArrayBuffer defined in main frame?');
-
-    const reply_token = token();
-    const iframe_token = token();
-
-    const iframe = document.createElement('iframe');
-    iframe.src = origin + executor_path + coep_require_corp_header +
-        corp_cross_origin_header + `&uuid=${iframe_token}`;
-    document.body.appendChild(iframe);
-
-    send(iframe_token, `send('${reply_token}', 'Iframe loaded');`);
-    assert_equals(await receive(reply_token), 'Iframe loaded');
-
-    send(iframe_token, `
-        window.popup = window.open();
-        send('${reply_token}', popup === null);
-      `);
-    assert_equals(await receive(reply_token), 'false', 'Is popup handle null?');
-
-    send(
-        iframe_token,
-        `send('${reply_token}', popup.window.crossOriginIsolated);`);
-    assert_equals(
-        await receive(reply_token), `${expectedCrossOriginIsolated}`,
-        'Is popup crossOriginIsolated?');
-
-    send(iframe_token, `
-        send('${reply_token}', 'SharedArrayBuffer' in popup.window.globalThis);
-    `);
-    assert_equals(
-        await receive(reply_token), `${expectedCrossOriginIsolated}`,
-        'Is SharedArrayBuffer defined in popup?');
-
-    // Test whether the popup's subframe is crossOriginIsolated
-    const popup_iframe_token = token();
-    const popup_iframe_src = origin + executor_path + coep_require_corp_header +
-        corp_cross_origin_header + `&uuid=${popup_iframe_token}`;
-    send(iframe_token, `
-        const iframe = window.popup.document.createElement('iframe');
-        iframe.src = '${popup_iframe_src}';
-        popup.document.body.appendChild(iframe);
-    `);
-
-    send(popup_iframe_token, `
-        send('${reply_token}', 'Iframe in popup loaded');
-    `);
-    assert_equals(await receive(reply_token), 'Iframe in popup loaded');
-
-    send(popup_iframe_token, `
-        send('${reply_token}', crossOriginIsolated);
-    `);
-    assert_equals(
-        await receive(reply_token), `${expectedCrossOriginIsolated}`,
-        'Is iframe in popup crossOriginIsolated?');
-
-    send(popup_iframe_token, `
-        send('${reply_token}', 'SharedArrayBuffer' in globalThis);
-    `);
-    assert_equals(
-        await receive(reply_token), `${expectedCrossOriginIsolated}`,
-        'Is SharedArrayBuffer defined in iframe in popup?');
-
-    // Test whether a nested iframe is crossOriginIsolated
-    const popup_nested_iframe_token = token();
-    const popup_nested_iframe_src = origin + executor_path +
-        coep_require_corp_header + corp_cross_origin_header +
-        `&uuid=${popup_nested_iframe_token}`;
-    send(iframe_token, `
-        blank_iframe = popup.document.createElement('iframe');
-        blank_iframe.src = '';
-        popup.document.body.appendChild(blank_iframe);
-        nested_iframe =
-            blank_iframe.contentDocument.createElement('iframe');
-        nested_iframe.src = '${popup_nested_iframe_src}';
-        blank_iframe.contentDocument.body.appendChild(nested_iframe);
-    `);
-
-    send(popup_nested_iframe_token, `
-        send('${reply_token}', 'Nested iframe in popup loaded');
-    `);
-    assert_equals(await receive(reply_token), 'Nested iframe in popup loaded');
-
-    send(popup_nested_iframe_token, `
-        send('${reply_token}', crossOriginIsolated);
-    `);
-    assert_equals(
-        await receive(reply_token), `${expectedCrossOriginIsolated}`,
-        'Is nested iframe in popup crossOriginIsolated?');
-
-    send(popup_nested_iframe_token, `
-        send('${reply_token}', 'SharedArrayBuffer' in globalThis);
-    `);
-    assert_equals(
-        await receive(reply_token), `${expectedCrossOriginIsolated}`,
-        'Is SharedArrayBuffer defined in nested iframe in popup?');
-
-    // Navigate the popup out of the initial empty document, with COOP:RP and
-    // COEP: require-corp. Expect to be crossOriginIsolated.
-    const popup_token = token();
-    const popup_src = origin + executor_path + coop_restrict_properties_header +
-        coep_require_corp_header + `&uuid=${popup_token}`;
-    send(iframe_token, `popup.window.location = '${popup_src}';`);
-
-    send(popup_token, `send('${reply_token}', 'Popup loaded');`);
-    assert_equals(await receive(reply_token), 'Popup loaded');
-
-    send(popup_token, `send('${reply_token}', crossOriginIsolated);`);
-    assert_equals(
-        await receive(reply_token), 'true',
-        'Is popup crossOriginIsolated after navigation?');
-
-    send(popup_token, `
-        send('${reply_token}', 'SharedArrayBuffer' in globalThis);
-    `);
-    assert_equals(
-        await receive(reply_token), 'true',
-        'Is SharedArrayBuffer defined in popup after navigation?');
-  }, description);
-}
-
-iframePopupAboutBlankTest(
-    cross_origin, {expectedCrossOriginIsolated: false}, 'Cross-origin iframe');
-iframePopupAboutBlankTest(
-    same_origin, {expectedCrossOriginIsolated: true}, 'Same-origin iframe');
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js.headers
deleted file mode 100644
index 19d0dbe4e18..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Cross-Origin-Opener-Policy: restrict-properties
-Cross-Origin-Embedder-Policy: require-corp
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html
deleted file mode 100644
index 8cf2679e190..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<meta name=timeout content=long>
-<meta name="variant" content="?1-1">
-<meta name="variant" content="?2-2">
-<meta name="variant" content="?3-3">
-<meta name="variant" content="?4-4">
-<meta name="variant" content="?5-5">
-<meta name="variant" content="?6-6">
-<meta name="variant" content="?7-7">
-<meta name="variant" content="?8-8">
-<meta name="variant" content="?9-last">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/common/dispatcher/dispatcher.js></script>
-<script src=/common/get-host-info.sub.js></script>
-<script src=/common/subset-tests.js></script>
-<script src=/common/utils.js></script>
-<script src="../../resources/common.js"></script>
-<script src="../../resources/iframe-test.js"></script>
-
-<body>
-<script>
-
-// This document has COOP: restrict-properties. The popup has COOP: same-origin.
-// Opening from an iframe should not be different from opening from the main
-// frame and the opener should be severed.
-[
-  {
-    "title": "same origin iframe, same origin popup",
-    "iframeOrigin": SAME_ORIGIN,
-    "popupOrigin": SAME_ORIGIN,
-    "opener": "severed"
-  },
-  {
-    "title": "same site iframe, same origin popup",
-    "iframeOrigin": SAME_SITE,
-    "popupOrigin": SAME_ORIGIN,
-    "opener": "severed"
-  },
-  {
-    "title": "cross origin iframe, same origin popup",
-    "iframeOrigin": CROSS_ORIGIN,
-    "popupOrigin": SAME_ORIGIN,
-    "opener": "severed"
-  },
-  {
-    "title": "same origin iframe, same site popup",
-    "iframeOrigin": SAME_ORIGIN,
-    "popupOrigin": SAME_SITE,
-    "opener": "severed"
-  },
-  {
-    "title": "same site iframe, same site popup",
-    "iframeOrigin": SAME_SITE,
-    "popupOrigin": SAME_SITE,
-    "opener": "severed"
-  },
-  {
-    "title": "cross origin iframe, same site popup",
-    "iframeOrigin": CROSS_ORIGIN,
-    "popupOrigin": SAME_SITE,
-    "opener": "severed"
-  },
-  {
-    "title": "same origin iframe, cross origin popup",
-    "iframeOrigin": SAME_ORIGIN,
-    "popupOrigin": CROSS_ORIGIN,
-    "opener": "severed"
-  },
-  {
-    "title": "same site iframe, cross origin popup",
-    "iframeOrigin": SAME_SITE,
-    "popupOrigin": CROSS_ORIGIN,
-    "opener": "severed"
-  },
-  {
-    "title": "cross origin iframe, cross origin popup",
-    "iframeOrigin": CROSS_ORIGIN,
-    "popupOrigin": CROSS_ORIGIN,
-    "opener": "severed"
-  }
-].forEach(variant => {
-  subsetTest(
-    iframe_test,
-    `COOP: restrict-properties to popup COOP: same-origin via an iframe, ` +
-    `with ${variant.title}`,
-    variant.iframeOrigin,
-    variant.popupOrigin,
-    { coop: 'same-origin' },
-    variant.opener);
-});
-</script>
-</body>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html.headers
deleted file mode 100644
index d5c99062d2b..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Cross-Origin-Opener-Policy: restrict-properties
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html
deleted file mode 100644
index f3af3ca7db1..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<meta name=timeout content=long>
-<meta name="variant" content="?1-2">
-<meta name="variant" content="?3-4">
-<meta name="variant" content="?5-6">
-<meta name="variant" content="?7-8">
-<meta name="variant" content="?9-last">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/common/dispatcher/dispatcher.js></script>
-<script src=/common/get-host-info.sub.js></script>
-<script src=/common/subset-tests.js></script>
-<script src=/common/utils.js></script>
-<script src="../../resources/common.js"></script>
-<script src="../../resources/iframe-test.js"></script>
-
-<body>
-<script>
-
-
-// This document has COOP: restrict-properties. The popup has COOP:
-// same-origin-allow-popups. Opening from an iframe should not be different from
-// opening from the main frame and the opener should be severed.
-[
-  {
-      "title": "same origin iframe, same origin popup",
-      "iframeOrigin": SAME_ORIGIN,
-      "popupOrigin": SAME_ORIGIN,
-      "opener": "severed"
-  },
-  {
-      "title": "same site iframe, same origin popup",
-      "iframeOrigin": SAME_SITE,
-      "popupOrigin": SAME_ORIGIN,
-      "opener": "severed"
-  },
-  {
-      "title": "cross origin iframe, same origin popup",
-      "iframeOrigin": CROSS_ORIGIN,
-      "popupOrigin": SAME_ORIGIN,
-      "opener": "severed"
-  },
-  {
-      "title": "same origin iframe, same site popup",
-      "iframeOrigin": SAME_ORIGIN,
-      "popupOrigin": SAME_SITE,
-      "opener": "severed"
-  },
-  {
-      "title": "same site iframe, same site popup",
-      "iframeOrigin": SAME_SITE,
-      "popupOrigin": SAME_SITE,
-      "opener": "severed"
-  },
-  {
-      "title": "cross origin iframe, same site popup",
-      "iframeOrigin": CROSS_ORIGIN,
-      "popupOrigin": SAME_SITE,
-      "opener": "severed"
-  },
-  {
-      "title": "same origin iframe, cross origin popup",
-      "iframeOrigin": SAME_ORIGIN,
-      "popupOrigin": CROSS_ORIGIN,
-      "opener": "severed"
-  },
-  {
-      "title": "same site iframe, cross origin popup",
-      "iframeOrigin": SAME_SITE,
-      "popupOrigin": CROSS_ORIGIN,
-      "opener": "severed"
-  },
-  {
-      "title": "cross origin iframe, cross origin popup",
-      "iframeOrigin": CROSS_ORIGIN,
-      "popupOrigin": CROSS_ORIGIN,
-      "opener": "severed"
-  }
-].forEach(variant => {
-    subsetTest(
-        iframe_test,
-        `COOP: restrict-properties to popup COOP: same-origin-allow-popups ` +
-        `via an iframe, with ${variant.title}`,
-        variant.iframeOrigin,
-        variant.popupOrigin,
-        { coop: 'same-origin-allow-popups' },
-        variant.opener);
-});
-</script>
-</body>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html.headers
deleted file mode 100644
index d5c99062d2b..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Cross-Origin-Opener-Policy: restrict-properties
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html
deleted file mode 100644
index 560dfd90511..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<meta name=timeout content=long>
-<meta name="variant" content="?1-2">
-<meta name="variant" content="?3-4">
-<meta name="variant" content="?5-6">
-<meta name="variant" content="?7-8">
-<meta name="variant" content="?9-last">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/common/dispatcher/dispatcher.js></script>
-<script src=/common/get-host-info.sub.js></script>
-<script src=/common/subset-tests.js></script>
-<script src=/common/utils.js></script>
-<script src="../../resources/common.js"></script>
-<script src="../../resources/iframe-test.js"></script>
-
-<body>
-<script>
-
-// This document has COOP: restrict-properties. The popup has COOP: unsafe-none.
-// Opening from an iframe should not be different from opening from the main
-// frame and the opener should be severed.
-[
-  {
-    "title": "same origin iframe, same origin popup",
-    "iframeOrigin": SAME_ORIGIN,
-    "popupOrigin": SAME_ORIGIN,
-    "opener": "restricted"
-  },
-  {
-    "title": "same site iframe, same origin popup",
-    "iframeOrigin": SAME_SITE,
-    "popupOrigin": SAME_ORIGIN,
-    "opener": "restricted"
-  },
-  {
-    "title": "cross origin iframe, same origin popup",
-    "iframeOrigin": CROSS_ORIGIN,
-    "popupOrigin": SAME_ORIGIN,
-    "opener": "restricted"
-  },
-  {
-    "title": "same origin iframe, same site popup",
-    "iframeOrigin": SAME_ORIGIN,
-    "popupOrigin": SAME_SITE,
-    "opener": "restricted"
-  },
-  {
-    "title": "same site iframe, same site popup",
-    "iframeOrigin": SAME_SITE,
-    "popupOrigin": SAME_SITE,
-    "opener": "restricted"
-  },
-  {
-    "title": "cross origin iframe, same site popup",
-    "iframeOrigin": CROSS_ORIGIN,
-    "popupOrigin": SAME_SITE,
-    "opener": "restricted"
-  },
-  {
-    "title": "same origin iframe, cross origin popup",
-    "iframeOrigin": SAME_ORIGIN,
-    "popupOrigin": CROSS_ORIGIN,
-    "opener": "restricted"
-  },
-  {
-    "title": "same site iframe, cross origin popup",
-    "iframeOrigin": SAME_SITE,
-    "popupOrigin": CROSS_ORIGIN,
-    "opener": "restricted"
-  },
-  {
-    "title": "cross origin iframe, cross origin popup",
-    "iframeOrigin": CROSS_ORIGIN,
-    "popupOrigin": CROSS_ORIGIN,
-    "opener": "restricted"
-  }
-].forEach(variant => {
-  subsetTest(
-    iframe_test,
-    `COOP: restrict-properties to popup COOP: unsafe-none via an iframe, ` +
-    `with ${variant.title}`,
-    variant.iframeOrigin,
-    variant.popupOrigin,
-    { coop: 'unsafe-none' },
-    variant.opener);
-});
-</script>
-</body>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html.headers
deleted file mode 100644
index d5c99062d2b..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Cross-Origin-Opener-Policy: restrict-properties
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html
deleted file mode 100644
index 17840724d9e..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<meta name=timeout content=long>
-<meta name="variant" content="?1-2">
-<meta name="variant" content="?3-4">
-<meta name="variant" content="?5-6">
-<meta name="variant" content="?7-8">
-<meta name="variant" content="?9-last">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/common/dispatcher/dispatcher.js></script>
-<script src=/common/get-host-info.sub.js></script>
-<script src=/common/subset-tests.js></script>
-<script src=/common/utils.js></script>
-<script src="../../resources/common.js"></script>
-<script src="../../resources/iframe-test.js"></script>
-
-<body>
-<script>
-
-// This document has COOP: restrict-properties. The popup has COOP:
-// restrict-properties. Opening from an iframe should not be different from
-// opening from the main frame and the opener should be restricted if
-// cross-origin.
-[
-  {
-    "title": "same origin iframe, same origin popup",
-    "iframeOrigin": SAME_ORIGIN,
-    "popupOrigin": SAME_ORIGIN,
-    "opener": "preserved"
-  },
-  {
-    "title": "same site iframe, same origin popup",
-    "iframeOrigin": SAME_SITE,
-    "popupOrigin": SAME_ORIGIN,
-    "opener": "preserved"
-  },
-  {
-    "title": "cross origin iframe, same origin popup",
-    "iframeOrigin": CROSS_ORIGIN,
-    "popupOrigin": SAME_ORIGIN,
-    "opener": "preserved"
-  },
-  {
-    "title": "same origin iframe, same site popup",
-    "iframeOrigin": SAME_ORIGIN,
-    "popupOrigin": SAME_SITE,
-    "opener": "restricted"
-  },
-  {
-    "title": "same site iframe, same site popup",
-    "iframeOrigin": SAME_SITE,
-    "popupOrigin": SAME_SITE,
-    "opener": "restricted"
-  },
-  {
-    "title": "cross origin iframe, same site popup",
-    "iframeOrigin": CROSS_ORIGIN,
-    "popupOrigin": SAME_SITE,
-    "opener": "restricted"
-  },
-  {
-    "title": "same origin iframe, cross origin popup",
-    "iframeOrigin": SAME_ORIGIN,
-    "popupOrigin": CROSS_ORIGIN,
-    "opener": "restricted"
-  },
-  {
-    "title": "same site iframe, cross origin popup",
-    "iframeOrigin": SAME_SITE,
-    "popupOrigin": CROSS_ORIGIN,
-    "opener": "restricted"
-  },
-  {
-    "title": "cross origin iframe, cross origin popup",
-    "iframeOrigin": CROSS_ORIGIN,
-    "popupOrigin": CROSS_ORIGIN,
-    "opener": "restricted"
-  }
-].forEach(variant => {
-  subsetTest(
-    iframe_test,
-    `COOP: restrict-properties to popup COOP: restrict-properties via an ` +
-    `iframe, with ${variant.title}`,
-    variant.iframeOrigin,
-    variant.popupOrigin,
-    { coop: 'restrict-properties' },
-    variant.opener);
-});
-</script>
-</body>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html.headers
deleted file mode 100644
index d5c99062d2b..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Cross-Origin-Opener-Policy: restrict-properties
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/named_targeting.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/named_targeting.https.html
deleted file mode 100644
index 10929847ee6..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/named_targeting.https.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/common/utils.js"></script>
-<script src="../../resources/common.js"></script>
-
-<script>
-
-async function createCoopRestrictPropertiesPopup(popupToken, name) {
-  const url = SAME_ORIGIN.origin + '/common/dispatcher/executor.html' +
-    `?uuid=${popupToken}` +
-    '&pipe=|header(Cross-Origin-Opener-Policy, restrict-properties)';
-  const popup = window.open(url, name);
-  add_completion_callback(() => popup.close());
-
-  // Wait for the popup to be loaded.
-  const replyToken = token();
-  send(popupToken, `send('${replyToken}', 'Done loading')`);
-  assert_equals(await receive(replyToken), 'Done loading');
-
-  return popup;
-}
-
-promise_test(async t => {
-  // Start by opening a first COOP: restrict-properties popup. No name is set to
-  // begin with.
-  const popupToken1 = token();
-  const popup1 = await createCoopRestrictPropertiesPopup(popupToken1, '');
-
-  // Once the popup is live, explicitly set a name.
-  const name = token();
-  send(popupToken1, `window.name = '${name}'`);
-
-  // To make sure this name has been propagated to other processes, send a dummy
-  // message from the popup to the main page, and wait for it to be received.
-  // It should be delivered after the name change is replicated.
-  const message_waiter = new Promise(resolve => {
-    onmessage = (event) => {
-      if (event.data == 'Waited enough') { resolve(); }
-    }
-  });
-  send(popupToken1, `opener.postMessage('Waited enough', '*')`);
-  await message_waiter;
-
-  // Finally, call window.open with the same name. This should not resolve
-  // across browsing context groups, and create a brand new popup.
-  const popupToken2 = token();
-  const popup2 = await createCoopRestrictPropertiesPopup(popupToken2, name);
-  assert_not_equals(popup1, popup2,
-    'Named targeting resolved across isolation boundaries');
-
-}, 'Verify that named targeting does not work across isolation boundaries.');
-
-</script>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html
deleted file mode 100644
index e5313a6e222..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<meta name=timeout content=long>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/common/utils.js"></script>
-<script src="../../resources/common.js"></script>
-<script src="../../resources/popup-test.js"></script>
-<script>
-
-[
-  {
-    "title": "popup with coop restrict-properties",
-    "coop": "restrict-properties",
-    "opener": "severed",
-    "origin": SAME_ORIGIN
-  },
-  {
-    "title": "popup with coop restrict-properties",
-    "coop": "restrict-properties",
-    "opener": "severed",
-    "origin": SAME_SITE
-  },
-  {
-    "title": "popup with coop restrict-properties",
-    "coop": "restrict-properties",
-    "opener": "severed",
-    "origin": CROSS_ORIGIN
-  }
-].forEach(variant => {
-  popup_test(`${variant.origin.name} ${variant.title}`, variant.origin,
-    { coop: variant.coop }, variant.opener);
-});
-
-</script>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html.headers
deleted file mode 100644
index 46ad58d83bf..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Cross-Origin-Opener-Policy: same-origin
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html
deleted file mode 100644
index 595a10a84bb..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<meta name=timeout content=long>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/common/utils.js"></script>
-<script src="../../resources/common.js"></script>
-<script src="../../resources/popup-test.js"></script>
-<script>
-
-[
-  {
-    "title": "popup with coop restrict-properties",
-    "coop": "restrict-properties",
-    "opener": "restricted",
-    "origin": SAME_ORIGIN
-  },
-  {
-    "title": "popup with coop restrict-properties",
-    "coop": "restrict-properties",
-    "opener": "restricted",
-    "origin": SAME_SITE
-  },
-  {
-    "title": "popup with coop restrict-properties",
-    "coop": "restrict-properties",
-    "opener": "restricted",
-    "origin": CROSS_ORIGIN
-  }
-].forEach(variant => {
-  popup_test(`${variant.origin.name} ${variant.title}`, variant.origin,
-    { coop: variant.coop }, variant.opener);
-});
-
-</script>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.headers
deleted file mode 100644
index d83ed86fb9b..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Cross-Origin-Opener-Policy: same-origin-allow-popups
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-u.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-u.https.html
deleted file mode 100644
index 595a10a84bb..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-u.https.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<meta name=timeout content=long>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/common/utils.js"></script>
-<script src="../../resources/common.js"></script>
-<script src="../../resources/popup-test.js"></script>
-<script>
-
-[
-  {
-    "title": "popup with coop restrict-properties",
-    "coop": "restrict-properties",
-    "opener": "restricted",
-    "origin": SAME_ORIGIN
-  },
-  {
-    "title": "popup with coop restrict-properties",
-    "coop": "restrict-properties",
-    "opener": "restricted",
-    "origin": SAME_SITE
-  },
-  {
-    "title": "popup with coop restrict-properties",
-    "coop": "restrict-properties",
-    "opener": "restricted",
-    "origin": CROSS_ORIGIN
-  }
-].forEach(variant => {
-  popup_test(`${variant.origin.name} ${variant.title}`, variant.origin,
-    { coop: variant.coop }, variant.opener);
-});
-
-</script>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-un.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-un.https.html
deleted file mode 100644
index 595a10a84bb..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-un.https.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<meta name=timeout content=long>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/common/utils.js"></script>
-<script src="../../resources/common.js"></script>
-<script src="../../resources/popup-test.js"></script>
-<script>
-
-[
-  {
-    "title": "popup with coop restrict-properties",
-    "coop": "restrict-properties",
-    "opener": "restricted",
-    "origin": SAME_ORIGIN
-  },
-  {
-    "title": "popup with coop restrict-properties",
-    "coop": "restrict-properties",
-    "opener": "restricted",
-    "origin": SAME_SITE
-  },
-  {
-    "title": "popup with coop restrict-properties",
-    "coop": "restrict-properties",
-    "opener": "restricted",
-    "origin": CROSS_ORIGIN
-  }
-].forEach(variant => {
-  popup_test(`${variant.origin.name} ${variant.title}`, variant.origin,
-    { coop: variant.coop }, variant.opener);
-});
-
-</script>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-un.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-un.https.html.headers
deleted file mode 100644
index 073ce7adfbd..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-un.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Cross-Origin-Opener-Policy: unsafe-none
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html
deleted file mode 100644
index a84d52584e9..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<meta name=timeout content=long>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/common/utils.js"></script>
-<script src="../../resources/common.js"></script>
-<script src="../../resources/popup-test.js"></script>
-<script>
-
-[
-  {
-    "title": "popup with empty coop",
-    "coop": "",
-    "opener": "restricted"
-  },
-  {
-    "title": "popup with coop unsafe-none",
-    "coop": "unsafe-none",
-    "opener": "restricted"
-  },
-  {
-    "title": "popup with coop same-origin",
-    "coop": "same-origin",
-    "opener": "severed"
-  },
-  {
-    "title": "popup with coop same-origin-allow-popups",
-    "coop": "same-origin-allow-popups",
-    "opener": "severed"
-  },
-  {
-    "title": "popup with coop restrict-properties",
-    "coop": "restrict-properties",
-    "opener": "restricted"
-  }
-].forEach(variant => {
-  popup_test(`Cross-origin ${variant.title}`, CROSS_ORIGIN,
-    { coop: variant.coop }, variant.opener);
-});
-
-</script>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html.headers
deleted file mode 100644
index d5c99062d2b..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Cross-Origin-Opener-Policy: restrict-properties
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html
deleted file mode 100644
index c0020fa23a4..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<meta name=timeout content=long>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/common/utils.js"></script>
-<script src="../../resources/common.js"></script>
-<script src="../../resources/popup-test.js"></script>
-<script>
-
-[
-  {
-    "title": "popup with empty coop",
-    "coop": "",
-    "opener": "restricted"
-  },
-  {
-    "title": "popup with coop unsafe-none",
-    "coop": "unsafe-none",
-    "opener": "restricted"
-  },
-  {
-    "title": "popup with coop same-origin",
-    "coop": "same-origin",
-    "opener": "severed"
-  },
-  {
-    "title": "popup with coop same-origin-allow-popups",
-    "coop": "same-origin-allow-popups",
-    "opener": "severed"
-  },
-  {
-    "title": "popup with coop restrict-properties",
-    "coop": "restrict-properties",
-    "opener": "preserved"
-  }
-].forEach(variant => {
-  popup_test(`Same-origin ${variant.title}`, SAME_ORIGIN,
-    { coop: variant.coop }, variant.opener);
-});
-
-</script>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html.headers
deleted file mode 100644
index d5c99062d2b..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Cross-Origin-Opener-Policy: restrict-properties
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html
deleted file mode 100644
index 7d115ac7e63..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<meta name=timeout content=long>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/common/utils.js"></script>
-<script src="../../resources/common.js"></script>
-<script src="../../resources/popup-test.js"></script>
-<script>
-
-[
-  {
-    "title": "popup with empty coop",
-    "coop": "",
-    "opener": "restricted"
-  },
-  {
-    "title": "popup with coop unsafe-none",
-    "coop": "unsafe-none",
-    "opener": "restricted"
-  },
-  {
-    "title": "popup with coop same-origin",
-    "coop": "same-origin",
-    "opener": "severed"
-  },
-  {
-    "title": "popup with coop same-origin-allow-popups",
-    "coop": "same-origin-allow-popups",
-    "opener": "severed"
-  },
-  {
-    "title": "popup with coop restrict-properties",
-    "coop": "restrict-properties",
-    "opener": "restricted"
-  }
-].forEach(variant => {
-  popup_test(`Same-site ${variant.title}`, SAME_SITE,
-    { coop: variant.coop }, variant.opener);
-});
-
-</script>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html.headers
deleted file mode 100644
index d5c99062d2b..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Cross-Origin-Opener-Policy: restrict-properties
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-bcg-reuse.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-bcg-reuse.https.html
deleted file mode 100644
index 9bc171a269c..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-bcg-reuse.https.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!doctype html>
-<title>
-  Verify that we consider browsing context group reuse for COOP reporting.
-</title>
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/common/utils.js"></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/html/cross-origin-opener-policy/reporting/resources/try-access.js"></script>
-<script src="/html/cross-origin-opener-policy/resources/common.js"></script>
-<script
-  src="/html/cross-origin-opener-policy/reporting/resources/reporting-common.js?pipe=sub&report_id=f1e361ab5854f2dcfe0224b19bc53199&report_only_id=b6fe666b74547291d52d72790adde05c"></script>
-<script>
-
-const same_origin = get_host_info().HTTPS_ORIGIN;
-const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
-
-promise_test(async test => {
-  // To receive reports use the same hard-coded value as the one passed in the
-  // headers and to "reporting-common.js".
-  const report_token = "b6fe666b74547291d52d72790adde05c";
-  const reportTo = reportToHeaders(report_token);
-
-  // 1. Open a popup without any COOP. It should be in a
-  // different virtual browsing context group.
-  const opener_token = token(); // For this window.
-  const initial_openee_token = token();
-  const initial_openee_url = cross_origin + executor_path +
-      `&uuid=${initial_openee_token}`;
-  let openee = window.open(initial_openee_url);
-
-  // 2. Navigate the openee to a COOP-RO: restrict-properties page. If the
-  // policy was enforced, it would live in the same browsing context group as
-  // this page. The virtual browsing context group should similarly be equal.
-  // Note: We omit the reporting endpoint header, because it is not possible to
-  // easily escape it. Since it is not necessary in this test, we skip it.
-  const final_openee_token = token();
-  const final_openee_url = same_origin + executor_path +
-      reportTo.coopReportOnlyRestrictPropertiesHeader +
-      `&uuid=${final_openee_token}`;
-
-  send(initial_openee_token, `location.href = '${final_openee_url}';`);
-  test.add_cleanup(() => send(final_openee_token, "window.close()"));
-
-  // Wait for the final openee to load.
-  send(final_openee_token,
-    `send("${opener_token}", "Ready");
-  `);
-  assert_equals(await receive(opener_token), "Ready");
-
-  // 3. Try to access the openee from the opener. No report should be sent.
-  tryAccess(openee);
-
-  let report =
-    await receiveReport(report_token, "access-from-coop-page-to-openee")
-  assert_equals(report, "timeout");
-
-}, "access-reporting-browsing-context-group-reuse");
-
-</script>
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-bcg-reuse.https.html.sub.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-bcg-reuse.https.html.sub.headers
deleted file mode 100644
index 33abadd83dd..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-bcg-reuse.https.html.sub.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Cross-Origin-Opener-Policy-Report-Only: restrict-properties; report-to="coop-report-only-endpoint"
-Reporting-Endpoints: coop-report-endpoint="https://{{host}}:{{ports[https][0]}}/reporting/resources/report.py?reportID=f1e361ab5854f2dcfe0224b19bc53199", coop-report-only-endpoint="https://{{host}}:{{ports[https][0]}}/reporting/resources/report.py?reportID=b6fe666b74547291d52d72790adde05c"
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp-ro.https.html
deleted file mode 100644
index b89030f218f..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp-ro.https.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!doctype html>
-<meta name=timeout content=long>
-<title>Opening a restrict-properties</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/common/utils.js"></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/html/cross-origin-opener-policy/resources/common.js"></script>
-<script
-  src="/html/cross-origin-opener-policy/reporting/resources/reporting-common.js?pipe=sub&report_id=fb054dadb3a9ec17b5cd5c0152d2a7dd&report_only_id=c265b07fbb3bffa2cd2a5179d686ced2"></script>
-
-<script>
-
-let tests = [
-  // popup origin, popup COOP, popup COEP, popup COOP report-only, popup COEP report-only, expected reports
-
-  // Open a same-origin popup with COOP unsafe-none, which mismatches with the
-  // current document (opener) COOP report-only (restrict-properties) values.
-  [
-    SAME_ORIGIN,
-    "unsafe-none",
-    "",
-    "",
-    "",
-    []
-  ],
-
-  // Open a cross-origin popup with COOP unsafe-none, which mismatches with the
-  // current document (opener) COOP report-only (restrict-properties) values.
-  [
-    CROSS_ORIGIN,
-    "unsafe-none",
-    "",
-    "",
-    "",
-    []
-  ],
-
-  // Open a same-origin popup with COOP restrict-properties, which matches with
-  // the current document (opener) COOP report-only (restrict-properties) value.
-  [
-    SAME_ORIGIN,
-    "restrict-properties",
-    "",
-    "",
-    "",
-    []
-  ],
-];
-
-runNavigationReportingTests(document.title, tests);
-
-</script>
-
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp-ro.https.html.sub.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp-ro.https.html.sub.headers
deleted file mode 100644
index 07ecad96f24..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp-ro.https.html.sub.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Cross-Origin-Opener-Policy-Report-Only: restrict-properties; report-to="coop-report-only-endpoint"
-Reporting-Endpoints: coop-report-endpoint="https://{{host}}:{{ports[https][0]}}/reporting/resources/report.py?reportID=fb054dadb3a9ec17b5cd5c0152d2a7dd", coop-report-only-endpoint="https://{{host}}:{{ports[https][0]}}/reporting/resources/report.py?reportID=c265b07fbb3bffa2cd2a5179d686ced2"
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp.https.html
deleted file mode 100644
index 6b31f7e0098..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp.https.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!doctype html>
-<meta name=timeout content=long>
-<title>Opening a restrict-properties</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/common/utils.js"></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/html/cross-origin-opener-policy/resources/common.js"></script>
-<script
-  src="/html/cross-origin-opener-policy/reporting/resources/reporting-common.js?pipe=sub&report_id=ed5a8be35e4e21c2ba960e6574e0a32c&report_only_id=fa22ddc676642edae42c75defb82ba2e"></script>
-
-<script>
-
-let tests = [
-  // popup origin, popup COOP, popup COEP, popup COOP report-only, popup COEP report-only, expected reports
-
-  // Open a same-origin popup with COOP unsafe-none, which mismatches
-  // with the current document (opener) COOP (restrict-properties) values.
-  [
-    SAME_ORIGIN,
-    "unsafe-none",
-    "",
-    "",
-    "",
-    []
-  ],
-
-  // Open a cross-origin popup with COOP unsafe-none, which mismatches
-  // with the current document (opener) COOP (restrict-properties) values.
-  [
-    CROSS_ORIGIN,
-    "unsafe-none",
-    "",
-    "",
-    "",
-    []
-  ],
-
-  // Open a same-origin popup with COOP restrict-properties, which matches with
-  // the current document (opener) COOP (restrict-properties) value.
-  [
-    SAME_ORIGIN,
-    "restrict-properties",
-    "",
-    "",
-    "",
-    []
-  ],
-];
-
-runNavigationReportingTests(document.title, tests);
-
-</script>
-
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp.https.html.sub.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp.https.html.sub.headers
deleted file mode 100644
index a61e2919c8a..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp.https.html.sub.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Cross-Origin-Opener-Policy: restrict-properties; report-to="coop-report-endpoint"
-Reporting-Endpoints: coop-report-endpoint="https://{{host}}:{{ports[https][0]}}/reporting/resources/report.py?reportID=ed5a8be35e4e21c2ba960e6574e0a32c", coop-report-only-endpoint="https://{{host}}:{{ports[https][0]}}/reporting/resources/report.py?reportID=fa22ddc676642edae42c75defb82ba2e"
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp-ro.https.html
deleted file mode 100644
index c47e59cd8f1..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp-ro.https.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!doctype html>
-<meta name=timeout content=long>
-<title>reporting same origin with report-to</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/common/utils.js"></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/html/cross-origin-opener-policy/resources/common.js"></script>
-<script src="/html/cross-origin-opener-policy/reporting/resources/reporting-common.js"></script>
-
-<script>
-
-let tests = [
-  // popup origin, popup COOP, popup COEP, popup COOP report-only, popup COEP report-only, expected reports
-
-  // Open a same-origin popup with COOP report-only restrict-properties, which
-  // mismatches with the current document (opener) COOP (unsafe-none).
-  [
-    SAME_ORIGIN,
-    "",
-    "",
-    `restrict-properties; report-to="${popupReportOnlyEndpoint.name}"`,
-    "",
-    []
-  ],
-
-  // Open a cross-origin popup with COOP report-only restrict-properties, which
-  // mismatches with the current document (opener) COOP (unsafe-none).
-  [
-    CROSS_ORIGIN,
-    "",
-    "",
-    `restrict-properties; report-to="${popupReportOnlyEndpoint.name}"`,
-    "",
-    []
-  ],
-];
-
-runNavigationReportingTests(document.title, tests);
-
-</script>
-
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp-ro.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp-ro.https.html.headers
deleted file mode 100644
index 16903320bb5..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp-ro.https.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Cross-Origin-Opener-Policy: unsafe-none
-Referrer-Policy: origin
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp.https.html
deleted file mode 100644
index ff60e8c5afd..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp.https.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!doctype html>
-<meta name=timeout content=long>
-<title>reporting same origin with report-to</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/common/utils.js"></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/html/cross-origin-opener-policy/resources/common.js"></script>
-<script src="/html/cross-origin-opener-policy/reporting/resources/reporting-common.js"></script>
-
-<script>
-
-let tests = [
-  // popup origin, popup COOP, popup COEP, popup COOP report-only, popup COEP report-only, expected reports
-
-  // Open a same-origin popup with COOP report-only restrict-properties, which
-  // mismatches with the current document (opener) COOP (unsafe-none).
-  [
-    SAME_ORIGIN,
-    `restrict-properties; report-to="${popupReportEndpoint.name}"`,
-    "",
-    "",
-    "",
-    []
-  ],
-
-  // Open a cross-origin popup with COOP report-only restrict-properties, which
-  // mismatches with the current document (opener) COOP (unsafe-none).
-  [
-    CROSS_ORIGIN,
-    `restrict-properties; report-to="${popupReportEndpoint.name}"`,
-    "",
-    "",
-    "",
-    []
-  ],
-];
-
-runNavigationReportingTests(document.title, tests);
-
-</script>
-
diff --git a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp.https.html.headers
deleted file mode 100644
index 16903320bb5..00000000000
--- a/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp.https.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Cross-Origin-Opener-Policy: unsafe-none
-Referrer-Policy: origin
diff --git a/tests/wpt/tests/html/document-isolation-policy/credentialless-cache-storage-from-credentialless.https.tentative.window.js b/tests/wpt/tests/html/document-isolation-policy/credentialless-cache-storage-from-credentialless.https.tentative.window.js
new file mode 100644
index 00000000000..cae480526b8
--- /dev/null
+++ b/tests/wpt/tests/html/document-isolation-policy/credentialless-cache-storage-from-credentialless.https.tentative.window.js
@@ -0,0 +1,90 @@
+// META: timeout=long
+// META: variant=?document
+// META: variant=?dedicated_worker
+// META: variant=?shared_worker
+// META: variant=?service_worker
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/common/dispatcher/dispatcher.js
+// META: script=/service-workers/service-worker/resources/test-helpers.sub.js
+// META: script=./resources/common.js
+
+// Fetch a resource and store it into CacheStorage from |storer| context. Then
+// check if it can be retrieved via CacheStorage.match from |retriever| context.
+const cacheStorageTest = (
+  description,
+  dip_storer,
+  dip_retriever,
+  resource_headers,
+  request_credential_mode,
+  expectation
+) => {
+  promise_test(async test => {
+    const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
+    const resource_url = cross_origin + "/common/square.png?pipe=" + resource_headers;
+
+    // Create the storer and retriever contexts.
+    const storage_token = await getTokenFromEnvironment(test, environment, dip_storer);
+    const storage_context = new RemoteContext(storage_token);
+    const retriever_token = await getTokenFromEnvironment(test, environment, dip_retriever);
+    const retriever_context = new RemoteContext(retriever_token);
+
+    // Fetch a request from the storer. Store the opaque response into
+    // CacheStorage.
+    const stored = await storage_context.execute_script(
+      async (url, credential_mode) => {
+        const cache = await caches.open('v1');
+        const fetch_request = new Request(url, {
+          mode: 'no-cors',
+          credentials: credential_mode
+        });
+        const fetch_response = await fetch(fetch_request);
+        await cache.put(fetch_request, fetch_response);
+        return true;
+      }, [resource_url, request_credential_mode]);
+    assert_equals(stored, true);
+
+    // Retrieved it from |retriever|.
+    const was_retrieved = await retriever_context.execute_script(
+      async (url) => {
+        const cache = await caches.open('v1');
+         try {
+           const response = await cache.match(url);
+           return "retrieved";
+         } catch (error) {
+           return "error";
+         }
+      }, [resource_url]);
+    assert_equals(was_retrieved, expectation);
+  }, description);
+};
+
+// Execute the same set of tests for every type of execution contexts:
+// Documents, DedicatedWorkers, SharedWorkers, and ServiceWorkers. The results
+// should be independent of the context.
+const environment = location.search.substr(1);
+
+cacheStorageTest(`[${environment}] isolate-and-credentialless => none`,
+  dip_credentialless,
+  dip_none,
+  "",
+  "include",
+  "retrieved");
+cacheStorageTest(`[${environment}] isolate-and-credentialless => isolate-and-credentialless`,
+  dip_credentialless,
+  dip_credentialless,
+  "",
+  "include",
+  "retrieved");
+cacheStorageTest(`[${environment}] isolate-and-credentialless => isolate-and-require-corp`,
+  dip_credentialless,
+  dip_require_corp,
+  "",
+  "include",
+  "error");
+cacheStorageTest(`[${environment}] isolate-and-credentialless => isolate-and-require-corp + CORP`,
+  dip_credentialless,
+  dip_require_corp,
+  corp_cross_origin,
+  "include",
+  "retrieved");
diff --git a/tests/wpt/tests/html/document-isolation-policy/credentialless-cache-storage-from-none.https.tentative.window.js b/tests/wpt/tests/html/document-isolation-policy/credentialless-cache-storage-from-none.https.tentative.window.js
new file mode 100644
index 00000000000..e2478abeed2
--- /dev/null
+++ b/tests/wpt/tests/html/document-isolation-policy/credentialless-cache-storage-from-none.https.tentative.window.js
@@ -0,0 +1,108 @@
+// META: timeout=long
+// META: variant=?document
+// META: variant=?dedicated_worker
+// META: variant=?shared_worker
+// META: variant=?service_worker
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/common/dispatcher/dispatcher.js
+// META: script=/service-workers/service-worker/resources/test-helpers.sub.js
+// META: script=./resources/common.js
+
+// Fetch a resource and store it into CacheStorage from |storer| context. Then
+// check if it can be retrieved via CacheStorage.match from |retriever| context.
+const cacheStorageTest = (
+  description,
+  dip_storer,
+  dip_retriever,
+  resource_headers,
+  request_credential_mode,
+  expectation
+) => {
+  promise_test(async test => {
+    const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
+    const resource_url = cross_origin + "/common/square.png?pipe=" + resource_headers;
+
+    // Create the storer and retriever contexts.
+    const storage_token = await getTokenFromEnvironment(test, environment, dip_storer);
+    const storage_context = new RemoteContext(storage_token);
+    const retriever_token = await getTokenFromEnvironment(test, environment, dip_retriever);
+    const retriever_context = new RemoteContext(retriever_token);
+
+    // Fetch a request from the storer. Store the opaque response into
+    // CacheStorage.
+    const stored = await storage_context.execute_script(
+      async (url, credential_mode) => {
+        const cache = await caches.open('v1');
+        const fetch_request = new Request(url, {
+          mode: 'no-cors',
+          credentials: credential_mode
+        });
+        const fetch_response = await fetch(fetch_request);
+        await cache.put(fetch_request, fetch_response);
+        return true;
+      }, [resource_url, request_credential_mode]);
+    assert_equals(stored, true);
+
+    // Retrieved it from |retriever|.
+    const was_retrieved = await retriever_context.execute_script(
+      async (url) => {
+        const cache = await caches.open('v1');
+         try {
+           const response = await cache.match(url);
+           return "retrieved";
+         } catch (error) {
+           return "error";
+         }
+      }, [resource_url]);
+    assert_equals(was_retrieved, expectation);
+  }, description);
+};
+
+// Execute the same set of tests for every type of execution contexts:
+// Documents, DedicatedWorkers, SharedWorkers, and ServiceWorkers. The results
+// should be independent of the context.
+const environment = location.search.substr(1);
+
+cacheStorageTest(`[${environment}] none => none`,
+  dip_none,
+  dip_none,
+  "",
+  "include",
+  "retrieved");
+cacheStorageTest(`[${environment}] none => isolate-and-credentialless`,
+  dip_none,
+  dip_credentialless,
+  "",
+  "include",
+  "error");
+cacheStorageTest(`[${environment}] none => isolate-and-credentialless (omit)`,
+  dip_none,
+  dip_credentialless,
+  "",
+  "omit",
+  "retrieved");
+cacheStorageTest(`[${environment}] none => isolate-and-credentialless + CORP`,
+  dip_none,
+  dip_credentialless,
+  corp_cross_origin,
+  "include",
+  "retrieved");
+cacheStorageTest(`[${environment}] none => isolate-and-require-corp`,
+  dip_none,
+  dip_require_corp,
+  "",
+  "include",
+  "error");
+cacheStorageTest(`[${environment}] none => isolate-and-require-corp (omit)`,
+  dip_none,
+  dip_require_corp,
+  "",
+  "include",
+  "error");
+cacheStorageTest(`[${environment}] none => isolate-and-require-corp + CORP`,
+  dip_none,
+  dip_require_corp,
+  corp_cross_origin,
+  "include",
+  "retrieved");
diff --git a/tests/wpt/tests/html/document-isolation-policy/credentialless-cache-storage-from-require-corp.https.tentative.window.js b/tests/wpt/tests/html/document-isolation-policy/credentialless-cache-storage-from-require-corp.https.tentative.window.js
new file mode 100644
index 00000000000..720fa6a987a
--- /dev/null
+++ b/tests/wpt/tests/html/document-isolation-policy/credentialless-cache-storage-from-require-corp.https.tentative.window.js
@@ -0,0 +1,84 @@
+// META: timeout=long
+// META: variant=?document
+// META: variant=?dedicated_worker
+// META: variant=?shared_worker
+// META: variant=?service_worker
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/common/dispatcher/dispatcher.js
+// META: script=/service-workers/service-worker/resources/test-helpers.sub.js
+// META: script=./resources/common.js
+
+// Fetch a resource and store it into CacheStorage from |storer| context. Then
+// check if it can be retrieved via CacheStorage.match from |retriever| context.
+const cacheStorageTest = (
+  description,
+  dip_storer,
+  dip_retriever,
+  resource_headers,
+  request_credential_mode,
+  expectation
+) => {
+  promise_test(async test => {
+    const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
+    const resource_url = cross_origin + "/common/square.png?pipe=" + resource_headers;
+
+    // Create the storer and retriever contexts.
+    const storage_token = await getTokenFromEnvironment(test, environment, dip_storer);
+    const storage_context = new RemoteContext(storage_token);
+    const retriever_token = await getTokenFromEnvironment(test, environment, dip_retriever);
+    const retriever_context = new RemoteContext(retriever_token);
+
+    // Fetch a request from the storer. Store the opaque response into
+    // CacheStorage.
+    const stored = await storage_context.execute_script(
+      async (url, credential_mode) => {
+        const cache = await caches.open('v1');
+        const fetch_request = new Request(url, {
+          mode: 'no-cors',
+          credentials: credential_mode
+        });
+        const fetch_response = await fetch(fetch_request);
+        await cache.put(fetch_request, fetch_response);
+        return true;
+      }, [resource_url, request_credential_mode]);
+    assert_equals(stored, true);
+
+    // Retrieved it from |retriever|.
+    const was_retrieved = await retriever_context.execute_script(
+      async (url) => {
+        const cache = await caches.open('v1');
+         try {
+           const response = await cache.match(url);
+           return "retrieved";
+         } catch (error) {
+           return "error";
+         }
+      }, [resource_url]);
+    assert_equals(was_retrieved, expectation);
+  }, description);
+};
+
+// Execute the same set of tests for every type of execution contexts:
+// Documents, DedicatedWorkers, SharedWorkers, and ServiceWorkers. The results
+// should be independent of the context.
+const environment = location.search.substr(1);
+
+cacheStorageTest(`[${environment}] isolate-and-require-corp => none`,
+  dip_require_corp,
+  dip_none,
+  corp_cross_origin,
+  "include",
+  "retrieved");
+cacheStorageTest(`[${environment}] isolate-and-require-corp => isolate-and-credentialless`,
+  dip_require_corp,
+  dip_credentialless,
+  corp_cross_origin,
+  "include",
+  "retrieved");
+cacheStorageTest(`[${environment}] isolate-and-require-corp => isolate-and-require-corp`,
+  dip_require_corp,
+  dip_require_corp,
+  corp_cross_origin,
+  "include",
+  "retrieved");
diff --git a/tests/wpt/tests/html/document-isolation-policy/credentialless-cache-storage.https.tentative.window.js b/tests/wpt/tests/html/document-isolation-policy/credentialless-cache-storage.https.tentative.window.js
deleted file mode 100644
index cb4b174e945..00000000000
--- a/tests/wpt/tests/html/document-isolation-policy/credentialless-cache-storage.https.tentative.window.js
+++ /dev/null
@@ -1,150 +0,0 @@
-// META: timeout=long
-// META: variant=?document
-// META: variant=?dedicated_worker
-// META: variant=?shared_worker
-// META: variant=?service_worker
-// META: script=/common/get-host-info.sub.js
-// META: script=/common/utils.js
-// META: script=/common/dispatcher/dispatcher.js
-// META: script=./resources/common.js
-
-// Fetch a resource and store it into CacheStorage from |storer| context. Then
-// check if it can be retrieved via CacheStorage.match from |retriever| context.
-const cacheStorageTest = (
-  description,
-  storer,
-  retriever,
-  resource_headers,
-  request_credential_mode,
-  expectation
-) => {
-  promise_test_parallel(async test => {
-    const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
-    const url = cross_origin + "/common/square.png?pipe=" + resource_headers +
-      `&${token()}`;
-    const this_token = token();
-
-    // Fetch a request from |stored|. Store the opaque response into
-    // CacheStorage.
-    send(storer, `
-      const cache = await caches.open("v1");
-      const fetch_request = new Request("${url}", {
-        mode: 'no-cors',
-        credentials: '${request_credential_mode}'
-      });
-      const fetch_response = await fetch(fetch_request);
-      await cache.put(fetch_request, fetch_response);
-      send("${this_token}", "stored");
-    `);
-    assert_equals(await receive(this_token), "stored");
-
-    // Retrieved it from |retriever|.
-    send(retriever, `
-      const cache = await caches.open("v1");
-      try {
-        const response = await cache.match("${url}");
-        send("${this_token}", "retrieved");
-      } catch (error) {
-        send("${this_token}", "error");
-      }
-    `);
-    assert_equals(await receive(this_token), expectation);
-  }, description);
-};
-
-// Execute the same set of tests for every type of execution contexts:
-// Documents, DedicatedWorkers, SharedWorkers, and ServiceWorkers. The results
-// should be independent of the context.
-const environment = location.search.substr(1);
-const constructor = environments[environment];
-
-const context_none = constructor(coep_none)[0];
-const context_credentialless = constructor(dip_credentialless)[0];
-const context_require_corp = constructor(dip_require_corp)[0];
-
-cacheStorageTest(`[${environment}] none => none`,
-  context_none,
-  context_none,
-  "",
-  "include",
-  "retrieved");
-cacheStorageTest(`[${environment}] none => isolate-and-credentialless`,
-  context_none,
-  context_credentialless,
-  "",
-  "include",
-  "error");
-cacheStorageTest(`[${environment}] none => isolate-and-credentialless (omit)`,
-  context_none,
-  context_credentialless,
-  "",
-  "omit",
-  "retrieved");
-cacheStorageTest(`[${environment}] none => isolate-and-credentialless + CORP`,
-  context_none,
-  context_credentialless,
-  corp_cross_origin,
-  "include",
-  "retrieved");
-cacheStorageTest(`[${environment}] none => isolate-and-require-corp`,
-  context_none,
-  context_require_corp,
-  "",
-  "include",
-  "error");
-cacheStorageTest(`[${environment}] none => isolate-and-require-corp (omit)`,
-  context_none,
-  context_require_corp,
-  "",
-  "include",
-  "error");
-cacheStorageTest(`[${environment}] none => isolate-and-require-corp + CORP`,
-  context_none,
-  context_require_corp,
-  corp_cross_origin,
-  "include",
-  "retrieved");
-
-cacheStorageTest(`[${environment}] isolate-and-credentialless => none`,
-  context_credentialless,
-  context_none,
-  "",
-  "include",
-  "retrieved");
-cacheStorageTest(`[${environment}] isolate-and-credentialless => isolate-and-credentialless`,
-  context_credentialless,
-  context_credentialless,
-  "",
-  "include",
-  "retrieved");
-cacheStorageTest(`[${environment}] isolate-and-credentialless => isolate-and-require-corp`,
-  context_credentialless,
-  context_require_corp,
-  "",
-  "include",
-  "error");
-cacheStorageTest(`[${environment}] isolate-and-credentialless => isolate-and-require-corp + CORP`,
-  context_credentialless,
-  context_require_corp,
-  corp_cross_origin,
-  "include",
-  "retrieved");
-
-cacheStorageTest(`[${environment}] isolate-and-require-corp => none`,
-  context_require_corp,
-  context_none,
-  corp_cross_origin,
-  "include",
-  "retrieved");
-cacheStorageTest(`[${environment}] isolate-and-require-corp => isolate-and-credentialless`,
-  context_require_corp,
-  context_credentialless,
-  corp_cross_origin,
-  "include",
-  "retrieved");
-cacheStorageTest(`[${environment}] isolate-and-require-corp => isolate-and-require-corp`,
-  context_require_corp,
-  context_require_corp,
-  corp_cross_origin,
-  "include",
-  "retrieved");
diff --git a/tests/wpt/tests/html/document-isolation-policy/credentialless-cache.tentative.window.js b/tests/wpt/tests/html/document-isolation-policy/credentialless-cache.tentative.window.js
index 99a0f077102..0c52d6ced32 100644
--- a/tests/wpt/tests/html/document-isolation-policy/credentialless-cache.tentative.window.js
+++ b/tests/wpt/tests/html/document-isolation-policy/credentialless-cache.tentative.window.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 // META: script=/common/get-host-info.sub.js
 // META: script=/common/utils.js
 // META: script=/common/dispatcher/dispatcher.js
diff --git a/tests/wpt/tests/html/document-isolation-policy/credentialless-dedicated-worker.https.tentative.window.js b/tests/wpt/tests/html/document-isolation-policy/credentialless-dedicated-worker.https.tentative.window.js
index 748130dfdc2..539ed0a6955 100644
--- a/tests/wpt/tests/html/document-isolation-policy/credentialless-dedicated-worker.https.tentative.window.js
+++ b/tests/wpt/tests/html/document-isolation-policy/credentialless-dedicated-worker.https.tentative.window.js
@@ -2,6 +2,7 @@
 // META: script=/common/get-host-info.sub.js
 // META: script=/common/utils.js
 // META: script=/common/dispatcher/dispatcher.js
+// META: script=/service-workers/service-worker/resources/test-helpers.sub.js
 // META: script=./resources/common.js
 
 const same_origin = get_host_info().HTTPS_ORIGIN;
@@ -19,112 +20,63 @@ promise_test(async test => {
       cookie_same_site_none),
   ]);
 
-  // One window with DIP:none. (control)
-  const w_control_token = token();
-  const w_control_url = same_origin + executor_path +
-    coep_none + `&uuid=${w_control_token}`
-  const w_control = window.open(w_control_url);
-  add_completion_callback(() => w_control.close());
-
-  // One window with DIP:isolate-and-credentialless. (experiment)
-  const w_credentialless_token = token();
-  const w_credentialless_url = same_origin + executor_path +
-    dip_credentialless + `&uuid=${w_credentialless_token}`;
-  const w_credentialless = window.open(w_credentialless_url);
-  add_completion_callback(() => w_credentialless.close());
-
   let GetCookie = (response) => {
     const headers_credentialless = JSON.parse(response);
     return parseCookies(headers_credentialless)[cookie_key];
   }
 
+  async function fetchInRemoteContext(ctx, request_url) {
+    // The fail might fail in when a DedicatedWorker with DIP
+    // isolate-and-require-corp tries to fetch a cross-origin resource. Silently
+    // catch the error as we're only interested in whether the cookies were sent
+    // with the fetch in the first place.
+    try {
+    await ctx.execute_script(
+        async (url) => {
+          await fetch(url, {mode: 'no-cors', credentials: 'include'});
+        }, [request_url]);
+    } catch(error) {}
+  }
+
   const dedicatedWorkerTest = function(
-    description, origin, coep_for_worker,
-    expected_cookies_control,
-    expected_cookies_credentialless) {
+    description, origin, dip_for_worker,
+    expected_cookies) {
     promise_test_parallel(async t => {
-      // Create workers for both window.
-      const worker_token_1 = token();
-      const worker_token_2 = token();
+      // Create one iframe with the specified DIP isolate-and-credentialless.
+      // Then start a DedicatedWorker. The DedicatedWorker will inherit the DIP
+      // of its creator.
+      const worker = await createDedicatedWorkerContext(test, same_origin, dip_for_worker);
+      const worker_context = new RemoteContext(worker[0]);
 
-      // Used to check for errors creating the DedicatedWorker.
-      const worker_error = token();
+      // Fetch resources with the worker.
+      const request_token = token();
+      const request_url = showRequestHeaders(origin, request_token);
 
-      const w_worker_src_1 = same_origin + executor_worker_path +
-        coep_for_worker + `&uuid=${worker_token_1}`;
-      send(w_control_token, `
-        const worker = new Worker("${w_worker_src_1}", {});
-      `);
-
-      const w_worker_src_2 = same_origin + executor_worker_path +
-        coep_for_worker + `&uuid=${worker_token_2}`;
-      send(w_credentialless_token, `
-        const worker = new Worker("${w_worker_src_2}", {});
-        worker.onerror = () => {
-          send("${worker_error}", "Worker blocked");
-        }
-      `);
-
-      // Fetch resources with the workers.
-      const request_token_1 = token();
-      const request_token_2 = token();
-      const request_url_1 = showRequestHeaders(origin, request_token_1);
-      const request_url_2 = showRequestHeaders(origin, request_token_2);
-
-      send(worker_token_1, `
-        fetch("${request_url_1}", {mode: 'no-cors', credentials: 'include'})
-      `);
-      send(worker_token_2, `
-        fetch("${request_url_2}", {mode: 'no-cors', credentials: 'include'});
-      `);
-
-      const response_control = await receive(request_token_1).then(GetCookie);
-      assert_equals(response_control,
-        expected_cookies_control,
-        "coep:none => ");
-
-      const response_credentialless = await Promise.race([
-        receive(worker_error),
-        receive(request_token_2).then(GetCookie)
-      ]);
-      assert_equals(response_credentialless,
-        expected_cookies_credentialless,
-        "coep:credentialless => ");
+      await fetchInRemoteContext(worker_context, request_url);
+      const response_worker = await receive(request_token).then(GetCookie);
+      assert_equals(response_worker,
+        expected_cookies,
+        "dip => ");
     }, `fetch ${description}`)
   };
 
   dedicatedWorkerTest("same-origin + credentialless worker",
     same_origin, dip_credentialless,
-    cookie_same_origin,
     cookie_same_origin);
 
   dedicatedWorkerTest("same-origin + require_corp worker",
     same_origin, dip_require_corp,
-    cookie_same_origin,
     cookie_same_origin);
 
-  dedicatedWorkerTest("same-origin",
-    same_origin, dip_none,
-    cookie_same_origin,
-    "Worker blocked");
-
-  dedicatedWorkerTest("cross-origin",
-    cross_origin, dip_none,
-    cookie_cross_origin,
-    "Worker blocked" // Owner's policy is credentialless, so we can't
-                     // create a worker with coep_none.
-  );
-
   dedicatedWorkerTest("cross-origin + credentialless worker",
     cross_origin, dip_credentialless,
-    undefined, // Worker created successfully with credentialless, and fetch doesn't get credentials
     undefined // Worker created successfully with credentialless, and fetch doesn't get credentials
   );
 
   dedicatedWorkerTest("cross-origin + require_corp worker",
     cross_origin, dip_require_corp,
-    cookie_cross_origin,
-    cookie_cross_origin // The worker's policy is require_corp and doing a
-                        // fetch within it has nothing to do with the Owner's policy.
+    cookie_cross_origin // The worker's policy is require_corp, so the resource will be requested with cookies
+                        // but the load will fail because the response does not
+                        // have CORP cross-origin.
   );
 })
diff --git a/tests/wpt/tests/html/document-isolation-policy/reporting-cache-storage-corp.tentative.https.html b/tests/wpt/tests/html/document-isolation-policy/reporting-cache-storage-corp.tentative.https.html
index 934c87b2abc..0b7c12ac514 100644
--- a/tests/wpt/tests/html/document-isolation-policy/reporting-cache-storage-corp.tentative.https.html
+++ b/tests/wpt/tests/html/document-isolation-policy/reporting-cache-storage-corp.tentative.https.html
@@ -8,22 +8,12 @@
 <script src="/common/utils.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+<script src="./resources/common.js"></script>
 <script>
 const {ORIGIN, REMOTE_ORIGIN} = get_host_info();
 
-const REMOTE_EXECUTOR =
-  `${ORIGIN}/common/dispatcher/remote-executor.html?pipe=`;
-const REMOTE_EXECUTOR_WORKER =
-  `${ORIGIN}/common/dispatcher/remote-executor-worker.js?pipe=`;
-
 const header = (name, value) => `|header(${name},${value})`;
-
-const FRAME_URL = REMOTE_EXECUTOR +
-  header("document-isolation-policy", "isolate-and-require-corp") +
-  header("document-isolation-policy-report-only", "isolate-and-require-corp");
-
-const WORKER_URL = REMOTE_EXECUTOR_WORKER +
-  header("document-isolation-policy", "isolate-and-require-corp") +
+const dip_reporting_header = header("document-isolation-policy", "isolate-and-require-corp") +
   header("document-isolation-policy-report-only", "isolate-and-require-corp");
 
 async function putInCache(resourceUrl) {
@@ -89,56 +79,26 @@ async function runRemoteContextTest(uuid, expected_count, check, context_url, re
 
 async function runIFrameTest(t, check, resource_url, expected_count) {
   // Load an iframe with DocumentIsolationPolicy reporting.
-  const uuid = token();
-  const frame_url = FRAME_URL + '&uuid=' + uuid;
-  const frame = await with_iframe(frame_url);
-  t.add_cleanup(() => frame.remove());
-
-  await runRemoteContextTest(uuid, expected_count, check, frame_url, resource_url);
+  const context = await createIframeContext(t, `${ORIGIN}`, dip_reporting_header);
+  await runRemoteContextTest(context[0], expected_count, check, context[1], resource_url);
 }
 
 async function runDedicatedWorkerTest(t, check, resource_url, expected_count) {
-  // Create a worker with DocumentIsolationPolicy reporting.
-  const uuid = token();
-  const worker_url = WORKER_URL + '&uuid=' + uuid;
-  const worker = new Worker(worker_url);
-  worker.addEventListener('error', t.unreached_func('Worker.onerror'));
-  t.add_cleanup(() => worker.terminate());
-
-  await runRemoteContextTest(uuid, expected_count, check, worker_url, resource_url);
+  // Create a worker which will inherit DocumentIsolationPolicy reporting from its creator.
+  const context = await createDedicatedWorkerContext(t, `${ORIGIN}`, dip_reporting_header);
+  await runRemoteContextTest(context[0], expected_count, check, context[1], resource_url);
 }
 
 async function runSharedWorkerTest(t, check, resource_url, expected_count) {
   // Create a shared worker with DocumentIsolationPolicy reporting.
-  const uuid = token();
-  const worker_url = WORKER_URL +
-    '&uuid=' + uuid;
-  const worker = new SharedWorker(worker_url);
-  worker.addEventListener('error', t.unreached_func('Worker.onerror'));
-
-  await runRemoteContextTest(uuid, expected_count, check, worker_url, resource_url);
+  const context = await createSharedWorkerContext(t, `${ORIGIN}`, dip_reporting_header);
+  await runRemoteContextTest(context[0], expected_count, check, context[1], resource_url);
 }
 
 async function runIFrameWithServiceWorkerTest(t, check, resource_url, expected_count) {
-  // Here we use a Service Worker without DIP.
-  const SERVICE_WORKER_URL = `${ORIGIN}/common/dispatcher/executor-service-worker.js`;
-  const reg = await service_worker_unregister_and_register(
-    t, SERVICE_WORKER_URL, FRAME_URL);
-  const worker = reg.installing || reg.waiting || reg.active;
-  worker.addEventListener('error', t.unreached_func('Worker.onerror'));
-
-  // Load an iframe with DocumentIsolationPolicy reporting.
-  const uuid = token();
-  const frame_url = FRAME_URL +
-    '&uuid=' + uuid;
-  const frame = await with_iframe(frame_url);
-
-  t.add_cleanup(() => {
-    reg.unregister();
-    frame.remove();
-  });
-
-  await runRemoteContextTest(uuid, expected_count, check, frame_url, resource_url);
+  // Create an iframe with DocumentIsolationPolicy reporting and a ServiceWorker.
+  const context = await createIframeWithSWContext(t, `${ORIGIN}`, dip_reporting_header);
+  await runRemoteContextTest(context[0], expected_count, check, context[1], resource_url);
 }
 
 // We want to test several URLs in various environments (document,
diff --git a/tests/wpt/tests/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html b/tests/wpt/tests/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html
index 6be3c35ad7a..013eb34d106 100644
--- a/tests/wpt/tests/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html
+++ b/tests/wpt/tests/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html
@@ -4,44 +4,17 @@
 <body>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
 <script src="/common/utils.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+<script src="./resources/common.js"></script>
 <script>
 const {ORIGIN, REMOTE_ORIGIN} = get_host_info();
-const BASE = new URL("resources", location).pathname
-const FRAME_URL = `${ORIGIN}/common/blank.html` +
-  '?pipe=header(document-isolation-policy,isolate-and-require-corp)' +
-  `|header(document-isolation-policy-report-only,isolate-and-require-corp)`;
-const WORKER_URL = `${ORIGIN}${BASE}/reporting-worker.js` +
-  '?pipe=header(document-isolation-policy,isolate-and-require-corp)' +
-  `|header(document-isolation-policy-report-only,isolate-and-require-corp)`;
-const REPORTING_FRAME_URL = `${ORIGIN}${BASE}/reporting-empty-frame.html` +
-  '?pipe=header(document-isolation-policy,isolate-and-require-corp)' +
-  `|header(document-isolation-policy-report-only,isolate-and-require-corp)`;
 
-async function observeReports(global, expected_count) {
-  const reports = [];
-  const receivedEveryReports = new Promise(resolve => {
-    if (expected_count == 0)
-      resolve();
-
-    const observer = new global.ReportingObserver((rs) => {
-      for (const r of rs) {
-        reports.push(r.toJSON());
-      }
-      if (expected_count <= reports.length)
-        resolve();
-    });
-    observer.observe();
-
-  });
-
-  await receivedEveryReports;
-  // Wait 500ms more to catch additionnal unexpected reports.
-  await new Promise(r => step_timeout(r, 500));
-  return reports;
-}
+const header = (name, value) => `|header(${name},${value})`;
+const dip_reporting_header = header("document-isolation-policy", "isolate-and-require-corp") +
+  header("document-isolation-policy-report-only", "isolate-and-require-corp");
 
 function checkReport(report, contextUrl, blockedUrl, disposition, destination) {
   assert_equals(report.type, 'dip');
@@ -52,42 +25,68 @@ function checkReport(report, contextUrl, blockedUrl, disposition, destination) {
   assert_equals(report.body.destination, destination);
 }
 
-async function fetchInFrame(t, frameUrl, url, expected_count) {
-  const frame = await with_iframe(frameUrl);
-  t.add_cleanup(() => frame.remove());
-
-  const init = { mode: 'no-cors', cache: 'no-store' };
-  let future_reports = observeReports(frame.contentWindow, expected_count);
-  await frame.contentWindow.fetch(url, init).catch(() => {});
-
-  return await future_reports;
+function validateReports(reports, expected_count, check, context_url, resource_url) {
+  assert_equals(reports.length, expected_count);
+  check(reports, context_url, resource_url);
 }
 
-async function fetchInWorker(workerOrPort, url, expected_count) {
-  const reports = [];
-  const script =
-    `fetch('${url}', {mode: 'no-cors', cache: 'no-store'}).catch(() => {});`;
-  const mc = new MessageChannel();
+async function runRemoteContextTest(uuid, expected_count, check, context_url, resource_url) {
+  // Have the remote context load the resource and wait for the expected number
+  // of reports.
+  const ctx = new RemoteContext(uuid);
+  const reports = await ctx.execute_script(
+    async (url, count) => {
+      const reports_received = [];
 
-  const receivedEveryReports = new Promise(resolve => {
-    if (expected_count == 0)
-      resolve();
+      // Register an observer that will wait for reports.
+      const receivedEveryReports = new Promise(resolve => {
+        if (count == 0)
+          resolve();
 
-    mc.port1.onmessage = (event) => {
-      reports.push(event.data);
-      if (expected_count <= reports.length)
-        resolve();
-    };
-  });
+        const observer = new ReportingObserver((rs) => {
+          for (const r of rs) {
+            reports_received.push(r.toJSON());
+          }
+          if (count <= reports_received.length)
+            resolve();
+        });
+        observer.observe();
 
-  // Have the worker execute the script.
-  workerOrPort.postMessage({script, port: mc.port2}, [mc.port2]);
+      });
 
-  await receivedEveryReports;
-  // Wait 500ms more to catch additionnal unexpected reports.
-  await new Promise(r => step_timeout(r, 500));
+      // Try to fetch the resource. This might be blocked by DocumentIsolationPolicy.
+      try {
+        const response = await fetch(url, {mode: 'no-cors', cache: 'no-store'});
+      } catch(error) {}
 
-  return reports;
+      await receivedEveryReports;
+      return reports_received;
+    }, [resource_url, expected_count]);
+  validateReports(reports, expected_count, check, context_url, resource_url);
+}
+
+async function runIFrameTest(t, check, resource_url, expected_count) {
+  // Load an iframe with DocumentIsolationPolicy reporting.
+  const context = await createIframeContext(t, `${ORIGIN}`, dip_reporting_header);
+  await runRemoteContextTest(context[0], expected_count, check, context[1], resource_url);
+}
+
+async function runDedicatedWorkerTest(t, check, resource_url, expected_count) {
+  // Create a worker which will inherit DocumentIsolationPolicy reporting from its creator.
+  const context = await createDedicatedWorkerContext(t, `${ORIGIN}`, dip_reporting_header);
+  await runRemoteContextTest(context[0], expected_count, check, context[1], resource_url);
+}
+
+async function runSharedWorkerTest(t, check, resource_url, expected_count) {
+  // Create a shared worker with DocumentIsolationPolicy reporting.
+  const context = await createSharedWorkerContext(t, `${ORIGIN}`, dip_reporting_header);
+  await runRemoteContextTest(context[0], expected_count, check, context[1], resource_url);
+}
+
+async function runIFrameWithServiceWorkerTest(t, check, resource_url, expected_count) {
+  // Create an iframe with DocumentIsolationPolicy reporting and a ServiceWorker.
+  const context = await createIframeWithSWContext(t, `${ORIGIN}`, dip_reporting_header);
+  await runRemoteContextTest(context[0], expected_count, check, context[1], resource_url);
 }
 
 // We want to test several URLs in various environments (document,
@@ -97,7 +96,6 @@ async function fetchInWorker(workerOrPort, url, expected_count) {
 //
 // ENVIRONMENTS is a list of dictionaries. Each dictionary consists of:
 //  - tag: the name of the environment
-//  - contextUrl: the URL of the environment settings object
 //  - run: an async function which generates reports
 //    - test: a testharness Test object
 //    - url: the URL for a test case (see below)
@@ -111,102 +109,48 @@ async function fetchInWorker(workerOrPort, url, expected_count) {
 //    - contextUrl: the URL of the environment settings object (see
 //                  ENVORONMENTS)
 
-const ENVIRONMENTS = [{
-  tag: 'document',
-  contextUrl: FRAME_URL,
-  run: async (test, url, expected_count) => {
-    return await fetchInFrame(test, FRAME_URL, url, expected_count);
-  },
-}, {
-  tag: 'dedicated worker',
-  contextUrl: WORKER_URL,
-  run: async (test, url, expected_count) => {
-    const worker = new Worker(WORKER_URL);
-    worker.addEventListener('error', test.unreached_func('Worker.onerror'));
-    test.add_cleanup(() => worker.terminate());
-    return await fetchInWorker(worker, url, expected_count);
-  },
-}, {
-  tag: 'shared worker',
-  contextUrl: WORKER_URL,
-  run: async (test, url, expected_count) => {
-    const worker = new SharedWorker(WORKER_URL);
-    worker.addEventListener('error', test.unreached_func('Worker.onerror'));
-    return await fetchInWorker(worker.port, url, expected_count);
-  },
-}, {
-  tag: 'between service worker and page',
-  contextUrl: REPORTING_FRAME_URL,
-  run: async (test, url, expected_count) => {
-    // Here we use a Service Worker without COEP.
-    const WORKER_URL = `${ORIGIN}${BASE}/sw.js`;
-    const reg = await service_worker_unregister_and_register(
-      test, WORKER_URL, REPORTING_FRAME_URL);
-    test.add_cleanup(() => reg.unregister());
-    const worker = reg.installing || reg.waiting || reg.active;
-    worker.addEventListener('error', test.unreached_func('Worker.onerror'));
-    return await fetchInFrame(
-      test, REPORTING_FRAME_URL, url, expected_count);
-  },
-}];
+const ENVIRONMENTS = {
+  "document": runIFrameTest,
+  "dedicated worker": runDedicatedWorkerTest,
+  "shared worker": runSharedWorkerTest,
+  "document with service worker": runIFrameWithServiceWorkerTest,
+};
 
-const CASES = [{
-  name: 'same-origin',
-  url: '/common/text-plain.txt',
-  expected_count: 0,
-  check: (reports, url, contextUrl) => {}
-}, {
-  name: 'blocked by CORP: same-origin',
-  url: `${REMOTE_ORIGIN}/common/blank.html?pipe=` +
-`header(cross-origin-resource-policy, same-origin)`,
-  expected_count: 0,
-  check: (reports, url, contextUrl) => {}
-}, {
-  name: 'blocked due to DIP',
-  url: `${REMOTE_ORIGIN}/common/text-plain.txt`,
-  expected_count: 2,
-  check: (reports, contextUrl, url) => {
-    checkReport(reports[0], contextUrl, url, 'reporting', '');
-    checkReport(reports[1], contextUrl, url, 'enforce', '');
+const CASES = [
+  {
+    name: 'same-origin',
+    url: '/common/square.png',
+    expected_count: 0,
+    check: (reports, url, contextUrl) => {}
+  },
+  {
+    name: 'blocked due to DIP',
+    url: `${REMOTE_ORIGIN}/common/square.png`,
+    expected_count: 2,
+    check: (reports, contextUrl, url) => {
+      checkReport(reports[0], contextUrl, url, 'reporting', '');
+      checkReport(reports[1], contextUrl, url, 'enforce', '');
+    }
+  },
+  {
+    name: 'blocked during redirect',
+    url: `${ORIGIN}/common/redirect.py?location=` +
+      encodeURIComponent(`${REMOTE_ORIGIN}/common/square.png`),
+    expected_count: 2,
+    check: (reports, contextUrl, url) => {
+      checkReport(reports[0], contextUrl, url, 'reporting', '');
+      checkReport(reports[1], contextUrl, url, 'enforce', '');
+    },
   }
-}, {
-  name: 'blocked during redirect',
-  url: `${ORIGIN}/common/redirect.py?location=` +
-    encodeURIComponent(`${REMOTE_ORIGIN}/common/text-plain.txt`),
-  expected_count: 2,
-  check: (reports, contextUrl, url) => {
-    checkReport(reports[0], contextUrl, url, 'reporting', '');
-    checkReport(reports[1], contextUrl, url, 'enforce', '');
-  },
-}];
+];
 
-for (const env of ENVIRONMENTS) {
+for (const [tag, run] of Object.entries(ENVIRONMENTS)) {
   for (const testcase of CASES) {
     promise_test(async (t) => {
-      const reports = await env.run(
-        t, testcase.url, testcase.expected_count);
-
-      assert_equals(reports.length, testcase.expected_count);
-      testcase.check(reports, env.contextUrl, testcase.url);
-    }, `[${env.tag}] ${testcase.name}`);
+      const reports =
+        await run(t, testcase.check, testcase.url, testcase.expected_count);
+    }, `[${tag}] ${testcase.name}`);
   }
 }
 
-// A test for a non-empty destination.
-promise_test(async (t) => {
-  const frame = await with_iframe(FRAME_URL);
-  t.add_cleanup(() => frame.remove());
-
-  const url = `${REMOTE_ORIGIN}/common/utils.js`;
-  const script = frame.contentDocument.createElement('script');
-  script.src = url;
-  const future_reports = observeReports(frame.contentWindow, 2);
-  frame.contentDocument.body.appendChild(script);
-
-  const reports = await future_reports;
-  assert_equals(reports.length, 2);
-  checkReport(reports[0], FRAME_URL, url, 'reporting', 'script');
-  checkReport(reports[1], FRAME_URL, url, 'enforce', 'script');
-}, 'destination: script');
-
 </script>
diff --git a/tests/wpt/tests/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html.headers b/tests/wpt/tests/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html.headers
deleted file mode 100644
index bcc6f0734d5..00000000000
--- a/tests/wpt/tests/html/document-isolation-policy/reporting-subresource-corp.tentative.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Document-Isolation-Policy: isolate-and-require-corp
diff --git a/tests/wpt/tests/html/document-isolation-policy/resources/common.js b/tests/wpt/tests/html/document-isolation-policy/resources/common.js
index df4bfcfc7d5..64c1f8df416 100644
--- a/tests/wpt/tests/html/document-isolation-policy/resources/common.js
+++ b/tests/wpt/tests/html/document-isolation-policy/resources/common.js
@@ -1,5 +1,8 @@
+
 const executor_path = '/common/dispatcher/executor.html?pipe=';
+const remote_executor_path = '/common/dispatcher/remote-executor.html?pipe=';
 const executor_worker_path = '/common/dispatcher/executor-worker.js?pipe=';
+const remote_executor_worker_path = '/common/dispatcher/remote-executor-worker.js?pipe=';
 const executor_service_worker_path = '/common/dispatcher/executor-service-worker.js?pipe=';
 
 // COEP
@@ -93,6 +96,79 @@ const newCredentiallessIframe = (parent_token, child_origin) => {
   return sub_document_token;
 };
 
+// The following functions create remote execution contexts with the matching
+// origins and headers. The first return value is the uuid that can be used
+// to instantiate a RemoteContext object. The second return value is the URL of
+// the context that was created.
+async function createIframeContext(t, origin, header) {
+  const uuid = token();
+  const frame_url = origin + remote_executor_path + header + '&uuid=' + uuid;
+  const frame = await with_iframe(frame_url);
+  t.add_cleanup(() => frame.remove());
+  return [uuid, frame_url];
+}
+
+async function createDedicatedWorkerContext(t, origin, header) {
+  const iframe_uuid = token();
+  const frame_url = origin + remote_executor_path + header + '&uuid=' + iframe_uuid;
+  const frame = await with_iframe(frame_url);
+  t.add_cleanup(() => frame.remove());
+
+  const uuid = token();
+  const worker_url = origin + remote_executor_worker_path + '&uuid=' + uuid;
+  const ctx = new RemoteContext(iframe_uuid);
+  await ctx.execute_script(
+    (url) => {
+      const worker = new Worker(url);
+    }, [worker_url]);
+  return [uuid, worker_url];
+}
+
+async function createSharedWorkerContext(t, origin, header) {
+  const uuid = token();
+  const worker_url = origin + remote_executor_worker_path + header + '&uuid=' + uuid;
+  const worker = new SharedWorker(worker_url);
+  worker.addEventListener('error', t.unreached_func('Worker.onerror'));
+  return [uuid, worker_url];
+}
+
+async function createIframeWithSWContext(t, origin, header) {
+  // Register a service worker with no headers.
+  const uuid = token();
+  const frame_url = origin + remote_executor_path + header + '&uuid=' + uuid;
+  const service_worker_url = origin + executor_service_worker_path;
+  const reg = await service_worker_unregister_and_register(
+    t, service_worker_url, frame_url);
+  const worker = reg.installing || reg.waiting || reg.active;
+  worker.addEventListener('error', t.unreached_func('Worker.onerror'));
+
+  const frame = await with_iframe(frame_url);
+  t.add_cleanup(() => {
+    reg.unregister();
+    frame.remove();
+  });
+  return [uuid, frame_url];
+}
+
+// A common interface for building the 4 type of execution contexts. Outputs the
+// token needed to create the RemoteContext.
+async function getTokenFromEnvironment(t,  environment, headers) {
+  switch(environment) {
+    case "document":
+      const iframe_context = await createIframeContext(t, window.origin, headers);
+      return iframe_context[0];
+    case "dedicated_worker":
+      const dedicated_worker_context = await createDedicatedWorkerContext(t, window.origin, headers);
+      return dedicated_worker_context[0];
+    case "shared_worker":
+      const shared_worker_context = await createSharedWorkerContext(t, window.origin, headers);
+      return shared_worker_context[0];
+    case "service_worker":
+      const sw_context = await createIframeWithSWContext(t, window.origin, headers);
+      return sw_context[0];
+  }
+}
+
 // A common interface for building the 4 type of execution contexts:
 // It outputs: [
 //   - The token to communicate with the environment.
diff --git a/tests/wpt/tests/html/document-isolation-policy/resources/report.py b/tests/wpt/tests/html/document-isolation-policy/resources/report.py
new file mode 100644
index 00000000000..3b677a91fdd
--- /dev/null
+++ b/tests/wpt/tests/html/document-isolation-policy/resources/report.py
@@ -0,0 +1,42 @@
+import json
+
+def main(request, response):
+    response.headers.set(b'Access-Control-Allow-Origin', b'*')
+    response.headers.set(b'Access-Control-Allow-Methods', b'OPTIONS, GET, POST')
+    response.headers.set(b'Access-Control-Allow-Headers', b'Content-Type')
+    response.headers.set(b'Cache-Control', b'no-cache, no-store, must-revalidate')
+    response.headers.set(b'Cross-Origin-Resource-Policy', b'cross-origin')
+
+    # CORS preflight
+    if request.method == u'OPTIONS':
+        return u''
+
+    uuidMap = {
+        b'endpoint': b'01234567-0123-0123-0123-0123456789AB',
+        b'report-only-endpoint': b'01234567-0123-0123-0123-0123456789CD'
+    }
+    key = 0
+    if b'endpoint' in request.GET:
+        key = uuidMap.get(request.GET[b'endpoint'], 0)
+
+    if b'key' in request.GET:
+        key = request.GET[b'key']
+
+    if key == 0:
+        response.status = 400
+        return u'invalid endpoint'
+
+    path = u'/'.join(request.url_parts.path.split(u'/')[:-1]) + u'/'
+    if request.method == u'POST':
+        reports = request.server.stash.take(key, path) or []
+        for report in json.loads(request.body):
+            reports.append(report)
+        request.server.stash.put(key, reports, path)
+        return u'done'
+
+    if request.method == u'GET':
+        response.headers.set(b'Content-Type', b'application/json')
+        return json.dumps(request.server.stash.take(key, path) or [])
+
+    response.status = 400
+    return u'invalid method'
diff --git a/tests/wpt/tests/html/document-isolation-policy/shared-workers.tentative.https.html b/tests/wpt/tests/html/document-isolation-policy/shared-workers.tentative.https.html
index d0a186f45e7..0403ba3e61b 100644
--- a/tests/wpt/tests/html/document-isolation-policy/shared-workers.tentative.https.html
+++ b/tests/wpt/tests/html/document-isolation-policy/shared-workers.tentative.https.html
@@ -1,11 +1,16 @@
 <!doctype html>
 <html>
 <meta charset="utf-8">
+<meta name="timeout" content="long">
 <title>COEP - policy derivation for Shared Workers</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
+<script src="/common/utils.js"></script>
+<script src="resources/common.js"></script>
 <script src="resources/worker-support.js"></script>
+<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <body>
 <p>Verify the Document Isolation Policy for Shared Workers by performing a
 cross-origin "fetch" request for a resource that does not specify CORP. Only
@@ -19,59 +24,49 @@ function makeWorkerUrl(options) {
 }
 
 /**
- * Create a Shared Worker within an iframe
+ * Create a Shared Worker within an iframe and insrtuct it to fetch from a
+ * specified URL and report on the success of the operation.
  *
  * @param {object} t - a testharness.js subtest instance (used to reset global
  *                     state)
  * @param {string} url - the URL from which the Shared Worker should be
  *                       created
- * @param {string} options.ownerDip - the Document Isolation Policy of the
+ * @param {string} ownerDip - the Document Isolation Policy of the
                                        iframe
  */
-async function createWorker(t, url, options) {
-  const { ownerDip } = options || {};
-  const frameUrl = resolveUrl("/common/blank.html", { dip: ownerDip });
-
-  const iframe = await withIframe(t, frameUrl);
-
-  const sw = new iframe.contentWindow.SharedWorker(url);
-  sw.onerror = t.unreached_func('SharedWorker.onerror should not be called');
-
-  await new Promise((resolve) => {
-    sw.port.addEventListener('message', resolve, { once: true });
-    sw.port.start();
-  });
-
-  return sw;
+async function fetchFromWorker(t, url, ownerDip) {
+  const uuid = await createIframeContext(t, get_host_info().HTTPS_ORIGIN, ownerDip);
+  const ctx = new RemoteContext(uuid[0]);
+  const resourceUrl =
+   get_host_info().HTTPS_REMOTE_ORIGIN+"/html/document-isolation-policy/resources/nothing-no-corp.js";
+  const result = await ctx.execute_script(
+    async (workerUrl, fetchUrl) => {
+      try {
+        const worker = new SharedWorker(workerUrl);
+        worker.onerror = (event) => {throw new Error("Worker.onerror should not be called");};
+        await new Promise((resolve) => {
+          worker.port.addEventListener('message', resolve, { once: true });
+          worker.port.start();
+        });
+        return await new Promise((resolve) => {
+          worker.port.postMessage(fetchUrl);
+          worker.port.addEventListener(
+          'message', (event) => resolve(event.data), { once: true });
+        });
+      } catch (error) {
+        return error;
+      }
+    }, [url, resourceUrl]);
+  return result;
 }
 
-/**
- * Instruct a Shared Worker to fetch from a specified URL and report on the
- * success of the operation.
- *
- * @param {SharedWorker} worker
- * @param {string} url - the URL that the worker should fetch
- */
-function fetchFromWorker(worker, url) {
-  return new Promise((resolve) => {
-    worker.port.postMessage(url);
-    worker.port.addEventListener(
-      'message', (event) => resolve(event.data), { once: true }
-    );
-  });
-};
-
 promise_test(async (t) => {
-  const worker = await createWorker(t, makeWorkerUrl());
-  const result = await fetchFromWorker(worker,
-   get_host_info().HTTPS_REMOTE_ORIGIN+"/html/document-isolation-policy/resources/nothing-no-corp.js");
+  const result = await fetchFromWorker(t, makeWorkerUrl(), dip_none);
   assert_equals(result, 'success');
 }, 'default policy (derived from response)');
 
 promise_test(async (t) => {
-  const worker = await createWorker(t, makeWorkerUrl({ dip: 'isolate-and-require-corp' }));
-  const result = await fetchFromWorker(worker,
-   get_host_info().HTTPS_REMOTE_ORIGIN+"/html/document-isolation-policy/resources/nothing-no-corp.js");
+  const result = await fetchFromWorker(t, makeWorkerUrl({ dip: 'isolate-and-require-corp' }), dip_none);
   assert_equals(result, 'failure');
 }, '"isolate-and-require-corp" (derived from response)');
 
@@ -80,15 +75,7 @@ promise_test(async (t) => {
     url: makeWorkerUrl(),
     scheme: "blob",
   });
-
-  const workers = await Promise.all([
-    createWorker(t, blobUrl),
-    createWorker(t, blobUrl),
-    createWorker(t, blobUrl),
-  ]);
-
-  const result = await fetchFromWorker(workers[0],
-   get_host_info().HTTPS_REMOTE_ORIGIN+"/html/document-isolation-policy/resources/nothing-no-corp.js");
+  const result = await fetchFromWorker(t, blobUrl, dip_none);
   assert_equals(result, 'success');
 }, 'default policy (derived from owner set due to use of local scheme - blob URL)');
 
@@ -98,15 +85,7 @@ promise_test(async (t) => {
     creatorDip: "isolate-and-require-corp",
     scheme: "blob",
   });
-
-  const workers = await Promise.all([
-    createWorker(t, blobUrl),
-    createWorker(t, blobUrl),
-    createWorker(t, blobUrl),
-  ]);
-
-  const result = await fetchFromWorker(workers[0],
-   get_host_info().HTTPS_REMOTE_ORIGIN+"/html/document-isolation-policy/resources/nothing-no-corp.js");
+  const result = await fetchFromWorker(t, blobUrl, dip_none);
   assert_equals(result, 'failure');
 }, 'isolate-and-require-corp (derived from blob URL creator)');
 
@@ -115,15 +94,7 @@ promise_test(async (t) => {
     url: makeWorkerUrl(),
     scheme: "blob",
   });
-
-  const workers = await Promise.all([
-    createWorker(t, blobUrl),
-    createWorker(t, blobUrl, { ownerDip: 'isolate-and-require-corp' }),
-    createWorker(t, blobUrl),
-  ]);
-
-  const result = await fetchFromWorker(workers[0],
-   get_host_info().HTTPS_REMOTE_ORIGIN+"/html/document-isolation-policy/resources/nothing-no-corp.js");
+  const result = await fetchFromWorker(t, blobUrl, dip_require_corp);
   assert_equals(result, 'failure');
 }, '"isolate-and-require-corp" (derived from owner set due to use of local scheme - blob URL)');
 
@@ -132,15 +103,7 @@ promise_test(async (t) => {
     url: makeWorkerUrl(),
     scheme: "data",
   });
-
-  const workers = await Promise.all([
-    createWorker(t, dataUrl),
-    createWorker(t, dataUrl),
-    createWorker(t, dataUrl),
-  ]);
-
-  const result = await fetchFromWorker(workers[0],
-   get_host_info().HTTPS_REMOTE_ORIGIN+"/html/document-isolation-policy/resources/nothing-no-corp.js");
+  const result = await fetchFromWorker(t, dataUrl, dip_none);
   assert_equals(result, 'success');
 }, 'default policy (derived from owner set due to use of local scheme - data URL)');
 
@@ -150,15 +113,7 @@ promise_test(async (t) => {
     creatorDip: "isolate-and-require-corp",
     scheme: "data",
   });
-
-  const workers = await Promise.all([
-    createWorker(t, dataUrl),
-    createWorker(t, dataUrl),
-    createWorker(t, dataUrl),
-  ]);
-
-  const result = await fetchFromWorker(workers[0],
-   get_host_info().HTTPS_REMOTE_ORIGIN+"/html/document-isolation-policy/resources/nothing-no-corp.js");
+  const result = await fetchFromWorker(t, dataUrl, dip_none);
   assert_equals(result, 'success');
 }, 'default policy (not derived from data URL creator)');
 
@@ -167,69 +122,9 @@ promise_test(async (t) => {
     url: makeWorkerUrl(),
     scheme: "data",
   });
-
-  const workers = await Promise.all([
-    createWorker(t, dataUrl),
-    createWorker(t, dataUrl, { ownerdip: 'isolate-and-require-corp' }),
-    createWorker(t, dataUrl),
-  ]);
-
-  const result = await fetchFromWorker(workers[0],
-   get_host_info().HTTPS_REMOTE_ORIGIN+"/html/document-isolation-policy/resources/nothing-no-corp.js");
+  const result = await fetchFromWorker(t, dataUrl, dip_require_corp);
   assert_equals(result, 'failure');
 }, '"isolate-and-require-corp" (derived from owner set due to use of local scheme - data URL)');
-
-promise_test(async (t) => {
-  const filesystemUrl = await createLocalUrl(t, {
-    url: makeWorkerUrl(),
-    scheme: "filesystem",
-  });
-
-  const workers = await Promise.all([
-    createWorker(t, filesystemUrl),
-    createWorker(t, filesystemUrl),
-    createWorker(t, filesystemUrl),
-  ]);
-
-  const result = await fetchFromWorker(workers[0],
-   get_host_info().HTTPS_REMOTE_ORIGIN+"/html/document-isolation-policy/resources/nothing-no-corp.js");
-  assert_equals(result, 'success');
-}, 'default policy (derived from owner set due to use of local scheme - filesystem URL)');
-
-promise_test(async (t) => {
-  const filesystemUrl = await createLocalUrl(t, {
-    url: makeWorkerUrl(),
-    creatorDip: "isolate-and-require-corp",
-    scheme: "filesystem",
-  });
-
-  const workers = await Promise.all([
-    createWorker(t, filesystemUrl),
-    createWorker(t, filesystemUrl),
-    createWorker(t, filesystemUrl),
-  ]);
-
-  const result = await fetchFromWorker(workers[0],
-   get_host_info().HTTPS_REMOTE_ORIGIN+"/html/document-isolation-policy/resources/nothing-no-corp.js");
-  assert_equals(result, 'failure');
-}, 'isolate-and-require-corp (derived from filesystem URL creator)');
-
-promise_test(async (t) => {
-  const filesystemUrl = await createLocalUrl(t, {
-    url: makeWorkerUrl(),
-    scheme: "filesystem",
-  });
-
-  const workers = await Promise.all([
-    createWorker(t, filesystemUrl),
-    createWorker(t, filesystemUrl, { ownerDip: 'isolate-and-require-corp' }),
-    createWorker(t, filesystemUrl),
-  ]);
-
-  const result = await fetchFromWorker(workers[0],
-   get_host_info().HTTPS_REMOTE_ORIGIN+"/html/document-isolation-policy/resources/nothing-no-corp.js");
-  assert_equals(result, 'failure');
-}, '"isolate-and-require-corp" (derived from owner set due to use of local scheme - filesystem URL)');
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-01.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-01.html
index 2b428aa65bd..2caeed7dd00 100644
--- a/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-01.html
+++ b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-01.html
@@ -8,12 +8,111 @@
 <div id="log"></div>
 <div id="test">
 <img id="a" name="b">
+<img id="test" name="test">
+<img id="test2a" name="test2b">
+<img id="test3a" name="test3b">
+<img id="test4a" name="test4b">
+<img id="test5a" name="test5b">
+<img id="test6a" name="test6b">
 </div>
 <script>
 test(function() {
-  assert_equals(document.a, document.getElementsByTagName("img")[0]);
-  assert_equals(document['a'], document.getElementsByTagName("img")[0]);
-  assert_equals(document.b, document.getElementsByTagName("img")[0]);
-  assert_equals(document['b'], document.getElementsByTagName("img")[0]);
+  let img = document.getElementsByTagName("img")[0];
+  assert_equals(document.a, img);
+  assert_equals(document['a'], img);
+  assert_equals(document.b, img);
+  assert_equals(document['b'], img);
 }, "img elements that have a name and id attribute, should be accessible by both values.");
+
+test(function() {
+  let img = document.getElementsByTagName("img")[1];
+  assert_equals(document.test, img);
+  assert_equals(document['test'], img);
+}, "img elements that have a name and id attribute with same value.");
+
+test(function() {
+  let img = document.getElementsByTagName("img")[2];
+  assert_equals(document.test2a, img);
+  assert_equals(document['test2a'], img);
+  assert_equals(document.test2b, img);
+  assert_equals(document['test2b'], img);
+
+  img.removeAttribute("name");
+  assert_equals(document.test2a, undefined);
+  assert_equals(document['test2a'], undefined);
+  assert_equals(document.test2b, undefined);
+  assert_equals(document['test2b'], undefined);
+}, "Dynamically removing the name attribute from img elements, should not be accessible.");
+
+test(function() {
+  let img = document.getElementsByTagName("img")[3];
+  assert_equals(document.test3a, img);
+  assert_equals(document['test3a'], img);
+  assert_equals(document.test3b, img);
+  assert_equals(document['test3b'], img);
+
+  img.removeAttribute("id");
+  assert_equals(document.test3a, undefined);
+  assert_equals(document['test3a'], undefined);
+  assert_equals(document.test3b, img);
+  assert_equals(document['test3b'], img);
+}, "Dynamically removing the id attribute from img elements, should still be accessible by name value.");
+
+test(function() {
+  let img = document.getElementsByTagName("img")[4];
+  assert_equals(document.test4a, img);
+  assert_equals(document['test4a'], img);
+  assert_equals(document.test4b, img);
+  assert_equals(document['test4b'], img);
+
+  img.name = 'test4a';
+  assert_equals(document.test4a, img);
+  assert_equals(document['test4a'], img);
+  assert_equals(document.test4b, undefined);
+  assert_equals(document['test4b'], undefined);
+
+  img.name = 'test4c';
+  assert_equals(document.test4a, img);
+  assert_equals(document['test4a'], img);
+  assert_equals(document.test4b, undefined);
+  assert_equals(document['test4b'], undefined);
+  assert_equals(document.test4c, img);
+  assert_equals(document['test4c'], img);
+}, "Dynamically updating the name attribute from img elements, should be accessible by values.");
+
+test(function() {
+  let img = document.getElementsByTagName("img")[5];
+  assert_equals(document.test5a, img);
+  assert_equals(document['test5a'], img);
+  assert_equals(document.test5b, img);
+  assert_equals(document['test5b'], img);
+
+  img.id = 'test5b';
+  assert_equals(document.test5a, undefined);
+  assert_equals(document['test5a'], undefined);
+  assert_equals(document.test5b, img);
+  assert_equals(document['test5b'], img);
+
+  img.id = 'test5c';
+  assert_equals(document.test5a, undefined);
+  assert_equals(document['test5a'], undefined);
+  assert_equals(document.test5b, img);
+  assert_equals(document['test5b'], img);
+  assert_equals(document.test5c, img);
+  assert_equals(document['test5c'], img);
+}, "Dynamically updating the id attribute from img elements, should be accessible by values.");
+
+test(function() {
+  let img = document.getElementsByTagName("img")[6];
+  assert_equals(document.test6a, img);
+  assert_equals(document['test6a'], img);
+  assert_equals(document.test6b, img);
+  assert_equals(document['test6b'], img);
+
+  img.remove();
+  assert_equals(document.test6a, undefined);
+  assert_equals(document['test6a'], undefined);
+  assert_equals(document.test6b, undefined);
+  assert_equals(document['test6b'], undefined);
+}, "img elements that is removed, should not be accessible.");
 </script>
diff --git a/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-02.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-02.html
index 8c3155e7e4c..84cf64c1ffc 100644
--- a/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-02.html
+++ b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-02.html
@@ -25,6 +25,14 @@
 <iframe name="fail" id="test7"></iframe>
 
 <iframe name="42"></iframe>
+
+<iframe name="test9" id="test9"></iframe>
+
+<iframe></iframe>
+
+<iframe name="test11a"></iframe>
+
+<iframe name="test12"></iframe>
 </div>
 <script>
 test(function() {
@@ -96,4 +104,71 @@ test(function() {
   assert_true(42 in document, '42 in document should be true');
   assert_equals(document[42], iframe.contentWindow);
 }, "An iframe whose name looks like an array index should work.");
+
+test(function() {
+  var iframe = document.getElementsByTagName("iframe")[9];
+  assert_equals(iframe.name, "test9");
+
+  assert_true("test9" in document, 'test9 in document should be true');
+  assert_equals(document["test9"], iframe.contentWindow);
+  assert_equals(document.test9, iframe.contentWindow);
+
+  iframe.removeAttribute("name");
+  assert_false("test9" in document, 'test9 in document should be false');
+  assert_equals(document["test9"], undefined);
+  assert_equals(document.test9, undefined);
+}, "Dynamically removing the name attribute from iframe elements, should not be accessible.");
+
+test(function() {
+  var iframe = document.getElementsByTagName("iframe")[10];
+  iframe.setAttribute("name", "test10a");
+
+  assert_true("test10a" in document, 'test10a in document should be true');
+  assert_equals(document["test10a"], iframe.contentWindow);
+  assert_equals(document.test10a, iframe.contentWindow);
+
+  iframe.setAttribute("name", "test10b");
+  assert_false("test10a" in document, 'test10a in document should be false');
+  assert_equals(document["test10a"], undefined);
+  assert_equals(document.test10a, undefined);
+  assert_true("test10b" in document, 'test10b in document should be true');
+  assert_equals(document["test10b"], iframe.contentWindow);
+  assert_equals(document.test10b, iframe.contentWindow);
+}, "Dynamically updating the name attribute from iframe elements, should be accessible by its name.");
+
+test(function() {
+  var iframe = document.getElementsByTagName("iframe")[11];
+  assert_equals(iframe.name, "test11a");
+
+  assert_true("test11a" in document, 'test11a in document should be true');
+  assert_equals(document["test11a"], iframe.contentWindow);
+  assert_equals(document.test11a, iframe.contentWindow);
+
+  iframe.setAttribute("id", "test11a");
+  assert_true("test11a" in document, 'test11a in document should be true');
+  assert_equals(document["test11a"], iframe.contentWindow);
+  assert_equals(document.test11a, iframe.contentWindow);
+
+  iframe.setAttribute("id", "test11b");
+  assert_true("test11a" in document, 'test11a in document should be true');
+  assert_equals(document["test11a"], iframe.contentWindow);
+  assert_equals(document.test11a, iframe.contentWindow);
+  assert_false("test11b" in document, 'test11b in document should be false');
+  assert_equals(document["test11b"], undefined);
+  assert_equals(document.test11b, undefined);
+}, "Dynamically updating the id attribute from iframe elements, should be accessible only by its name.");
+
+test(function() {
+  var iframe = document.getElementsByTagName("iframe")[12];
+  assert_equals(iframe.name, "test12");
+
+  assert_true("test12" in document, 'test12 in document should be true');
+  assert_equals(document["test12"], iframe.contentWindow);
+  assert_equals(document.test12, iframe.contentWindow);
+
+  iframe.remove();
+  assert_false("test12" in document, 'test12 in document should be false');
+  assert_equals(document["test12"], undefined);
+  assert_equals(document.test12, undefined);
+}, "iframe elements that is removed, should not be accessible.");
 </script>
diff --git a/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-04.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-04.html
index b7c3ef8e9bb..2b4a3c55b71 100644
--- a/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-04.html
+++ b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-04.html
@@ -26,6 +26,14 @@
 <form id=test7 name=fail></form>
 
 <form name=test8 id=fail></form>
+
+<form name=test9 id=test9></form>
+
+<form></form>
+
+<form name="test11a"></form>
+
+<form name="test12"></form>
 </div>
 <script>
 test(function() {
@@ -101,4 +109,71 @@ test(function() {
   assert_true("test8" in document, '"test8" in document should be true');
   assert_equals(document.test8, form);
 }, "An id shouldn't affect getting an form by name");
+
+test(function() {
+  var form = document.getElementsByTagName("form")[12];
+  assert_equals(form.name, "test9");
+
+  assert_true("test9" in document, 'test9 in document should be true');
+  assert_equals(document["test9"], form);
+  assert_equals(document.test9, form);
+
+  form.removeAttribute("name");
+  assert_false("test9" in document, 'test9 in document should be false');
+  assert_equals(document["test9"], undefined);
+  assert_equals(document.test9, undefined);
+}, "Dynamically removing the name attribute from form elements, should not be accessible.");
+
+test(function() {
+  var form = document.getElementsByTagName("form")[13];
+  form.setAttribute("name", "test10a");
+
+  assert_true("test10a" in document, 'test10a in document should be true');
+  assert_equals(document["test10a"], form);
+  assert_equals(document.test10a, form);
+
+  form.setAttribute("name", "test10b");
+  assert_false("test10a" in document, 'test10a in document should be false');
+  assert_equals(document["test10a"], undefined);
+  assert_equals(document.test10a, undefined);
+  assert_true("test10b" in document, 'test10b in document should be true');
+  assert_equals(document["test10b"], form);
+  assert_equals(document.test10b, form);
+}, "Dynamically updating the name attribute from form elements, should be accessible by its name.");
+
+test(function() {
+  var form = document.getElementsByTagName("form")[14];
+  assert_equals(form.name, "test11a");
+
+  assert_true("test11a" in document, 'test11a in document should be true');
+  assert_equals(document["test11a"], form);
+  assert_equals(document.test11a, form);
+
+  form.setAttribute("id", "test11a");
+  assert_true("test11a" in document, 'test11a in document should be true');
+  assert_equals(document["test11a"], form);
+  assert_equals(document.test11a, form);
+
+  form.setAttribute("id", "test11b");
+  assert_true("test11a" in document, 'test11a in document should be true');
+  assert_equals(document["test11a"], form);
+  assert_equals(document.test11a, form);
+  assert_false("test11b" in document, 'test11b in document should be false');
+  assert_equals(document["test11b"], undefined);
+  assert_equals(document.test11b, undefined);
+}, "Dynamically updating the id attribute from form elements, should be accessible only by its name.");
+
+test(function() {
+  var form = document.getElementsByTagName("form")[15];
+  assert_equals(form.name, "test12");
+
+  assert_true("test12" in document, 'test12 in document should be true');
+  assert_equals(document["test12"], form);
+  assert_equals(document.test12, form);
+
+  form.remove();
+  assert_false("test12" in document, 'test12 in document should be false');
+  assert_equals(document["test12"], undefined);
+  assert_equals(document.test12, undefined);
+}, "form elements that is removed, should not be accessible.");
 </script>
diff --git a/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-05.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-05.html
index 843ce357962..b38872498b6 100644
--- a/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-05.html
+++ b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-05.html
@@ -26,6 +26,14 @@
 <embed id=test7 name=fail></embed>
 
 <embed name=test8 id=fail></embed>
+
+<embed name="test9" id="test9"></embed>
+
+<embed></embed>
+
+<embed name="test11a"></embed>
+
+<embed name="test12"></embed>
 </div>
 <script>
 test(function() {
@@ -101,4 +109,71 @@ test(function() {
   assert_true("test8" in document, '"test8" in document should be true');
   assert_equals(document.test8, embed);
 }, "An id shouldn't affect getting an embed by name");
+
+test(function() {
+  var embed = document.getElementsByTagName("embed")[12];
+  assert_equals(embed.name, "test9");
+
+  assert_true("test9" in document, 'test9 in document should be true');
+  assert_equals(document["test9"], embed);
+  assert_equals(document.test9, embed);
+
+  embed.removeAttribute("name");
+  assert_false("test9" in document, 'test9 in document should be false');
+  assert_equals(document["test9"], undefined);
+  assert_equals(document.test9, undefined);
+}, "Dynamically removing the name attribute from embed elements, should not be accessible.");
+
+test(function() {
+  var embed = document.getElementsByTagName("embed")[13];
+  embed.setAttribute("name", "test10a");
+
+  assert_true("test10a" in document, 'test10a in document should be true');
+  assert_equals(document["test10a"], embed);
+  assert_equals(document.test10a, embed);
+
+  embed.setAttribute("name", "test10b");
+  assert_false("test10a" in document, 'test10a in document should be false');
+  assert_equals(document["test10a"], undefined);
+  assert_equals(document.test10a, undefined);
+  assert_true("test10b" in document, 'test10b in document should be true');
+  assert_equals(document["test10b"], embed);
+  assert_equals(document.test10b, embed);
+}, "Dynamically updating the name attribute from embed elements, should be accessible by its name.");
+
+test(function() {
+  var embed = document.getElementsByTagName("embed")[14];
+  assert_equals(embed.name, "test11a");
+
+  assert_true("test11a" in document, 'test11a in document should be true');
+  assert_equals(document["test11a"], embed);
+  assert_equals(document.test11a, embed);
+
+  embed.setAttribute("id", "test11a");
+  assert_true("test11a" in document, 'test11a in document should be true');
+  assert_equals(document["test11a"], embed);
+  assert_equals(document.test11a, embed);
+
+  embed.setAttribute("id", "test11b");
+  assert_true("test11a" in document, 'test11a in document should be true');
+  assert_equals(document["test11a"], embed);
+  assert_equals(document.test11a, embed);
+  assert_false("test11b" in document, 'test11b in document should be false');
+  assert_equals(document["test11b"], undefined);
+  assert_equals(document.test11b, undefined);
+}, "Dynamically updating the id attribute from embed elements, should be accessible only by its name.");
+
+test(function() {
+  var embed = document.getElementsByTagName("embed")[15];
+  assert_equals(embed.name, "test12");
+
+  assert_true("test12" in document, 'test12 in document should be true');
+  assert_equals(document["test12"], embed);
+  assert_equals(document.test12, embed);
+
+  embed.remove();
+  assert_false("test12" in document, 'test12 in document should be false');
+  assert_equals(document["test12"], undefined);
+  assert_equals(document.test12, undefined);
+}, "embed elements that is removed, should not be accessible.");
 </script>
diff --git a/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-06.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-06.html
index 15a72b5f6ba..592535f0d6a 100644
--- a/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-06.html
+++ b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-06.html
@@ -23,9 +23,11 @@
 <img id=test6>
 <img name=test6>
 
-<img id=test7 name=fail>
+<img name="test7">
 
-<img name=test8 id=fail>
+<img>
+
+<img name="test9">
 </div>
 <script>
 test(function() {
@@ -88,17 +90,46 @@ test(function() {
 
 test(function() {
   var img = document.getElementsByTagName("img")[10];
-  assert_equals(img.id, "test7");
+  assert_equals(img.name, "test7");
 
-  assert_true("test7" in document, '"test7" in document should be true');
+  assert_true("test7" in document, 'test7 in document should be true');
+  assert_equals(document["test7"], img);
   assert_equals(document.test7, img);
-}, "A name should affect getting an img by id");
+
+  img.removeAttribute("name");
+  assert_false("test7" in document, 'test7 in document should be false');
+  assert_equals(document["test7"], undefined);
+  assert_equals(document.test7, undefined);
+}, "Dynamically removing the name attribute from img elements, should not be accessible.");
 
 test(function() {
   var img = document.getElementsByTagName("img")[11];
-  assert_equals(img.name, "test8");
+  img.setAttribute("name", "test8a");
 
-  assert_true("test8" in document, '"test8" in document should be true');
-  assert_equals(document.test8, img);
-}, "An id shouldn't affect getting an img by name");
+  assert_true("test8a" in document, 'test8a in document should be true');
+  assert_equals(document["test8a"], img);
+  assert_equals(document.test8a, img);
+
+  img.setAttribute("name", "test8b");
+  assert_false("test8a" in document, 'test8a in document should be false');
+  assert_equals(document["test8a"], undefined);
+  assert_equals(document.test8a, undefined);
+  assert_true("test8b" in document, 'test8b in document should be true');
+  assert_equals(document["test8b"], img);
+  assert_equals(document.test8b, img);
+}, "Dynamically updating the name attribute from img elements, should be accessible by its name.");
+
+test(function() {
+  var img = document.getElementsByTagName("img")[12];
+  assert_equals(img.name, "test9");
+
+  assert_true("test9" in document, 'test9 in document should be true');
+  assert_equals(document["test9"], img);
+  assert_equals(document.test9, img);
+
+  img.remove();
+  assert_false("test9" in document, 'test9 in document should be false');
+  assert_equals(document["test9"], undefined);
+  assert_equals(document.test9, undefined);
+}, "img elements that is removed, should not be accessible.");
 </script>
diff --git a/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-07.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-07.html
index fc3f06c01b9..69a3bb0f09a 100644
--- a/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-07.html
+++ b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-07.html
@@ -22,9 +22,15 @@
 <object id=test6></object>
 <object name=test6></object>
 
-<object id=test7 name=fail></object>
+<object name=test7></object>
 
-<object name=test8 id=fail></object>
+<object id=test8></object>
+
+<object id=test9a></object>
+
+<object name=test10a></object>
+
+<object name=test11a id=test11b></object>
 </div>
 <script>
 test(function() {
@@ -93,17 +99,114 @@ test(function() {
 
 test(function() {
   var object = document.getElementsByTagName("object")[10];
-  assert_equals(object.id, "test7");
+  assert_equals(object.name, "test7");
 
-  assert_true("test7" in document, '"test7" in document should be true');
+  assert_true("test7" in document, 'test7 in document should be true');
+  assert_equals(document["test7"], object);
   assert_equals(document.test7, object);
-}, "A name shouldn't affect getting an object by id");
+
+  object.removeAttribute("name");
+  assert_false("test7" in document, 'test7 in document should be false');
+  assert_equals(document["test7"], undefined);
+  assert_equals(document.test7, undefined);
+}, "Dynamically removing the name attribute from object elements, should not be accessible.");
 
 test(function() {
   var object = document.getElementsByTagName("object")[11];
-  assert_equals(object.name, "test8");
+  assert_equals(object.id, "test8");
 
-  assert_true("test8" in document, '"test8" in document should be true');
+  assert_true("test8" in document, 'test8 in document should be true');
+  assert_equals(document["test8"], object);
   assert_equals(document.test8, object);
-}, "An id shouldn't affect getting an object by name");
+
+  object.removeAttribute("id");
+  assert_false("test8" in document, 'test8 in document should be false');
+  assert_equals(document["test8"], undefined);
+  assert_equals(document.test8, undefined);
+}, "Dynamically removing the id attribute from object elements, should not be accessible.");
+
+test(function() {
+  var object = document.getElementsByTagName("object")[12];
+  assert_equals(object.id, "test9a");
+  assert_true("test9a" in document, 'test9a in document should be true');
+  assert_equals(document["test9a"], object);
+  assert_equals(document.test9a, object);
+
+  object.setAttribute("name", "test9a");
+  assert_true("test9a" in document, 'test9a in document should be true');
+  assert_equals(document["test9a"], object);
+  assert_equals(document.test9a, object);
+
+  object.setAttribute("name", "test9b");
+  assert_true("test9a" in document, 'test9a in document should be true');
+  assert_equals(document["test9a"], object);
+  assert_equals(document.test9a, object);
+  assert_true("test9b" in document, 'test9b in document should be true');
+  assert_equals(document["test9b"], object);
+  assert_equals(document.test9b, object);
+
+  object.setAttribute("name", "test9c");
+  assert_true("test9a" in document, 'test9a in document should be true');
+  assert_equals(document["test9a"], object);
+  assert_equals(document.test9a, object);
+  assert_false("test9b" in document, 'test9b in document should be false');
+  assert_equals(document["test9b"], undefined);
+  assert_equals(document.test9b, undefined);
+  assert_true("test9c" in document, 'test9c in document should be true');
+  assert_equals(document["test9c"], object);
+  assert_equals(document.test9c, object);
+}, "Dynamically updating the name attribute from object elements, should be accessible by its name and id.");
+
+test(function() {
+  var object = document.getElementsByTagName("object")[13];
+  assert_equals(object.name, "test10a");
+  assert_true("test10a" in document, 'test11a in document should be true');
+  assert_equals(document["test10a"], object);
+  assert_equals(document.test10a, object);
+
+  object.setAttribute("id", "test10a");
+  assert_true("test10a" in document, 'test10a in document should be true');
+  assert_equals(document["test10a"], object);
+  assert_equals(document.test10a, object);
+
+  object.setAttribute("id", "test10b");
+  assert_true("test10a" in document, 'test10a in document should be true');
+  assert_equals(document["test10a"], object);
+  assert_equals(document.test10a, object);
+  assert_true("test10b" in document, 'test10b in document should be false');
+  assert_equals(document["test10b"], object);
+  assert_equals(document.test10b, object);
+
+  object.setAttribute("id", "test10c");
+  assert_true("test10a" in document, 'test10a in document should be true');
+  assert_equals(document["test10a"], object);
+  assert_equals(document.test10a, object);
+  assert_false("test10b" in document, 'test10b in document should be false');
+  assert_equals(document["test10b"], undefined);
+  assert_equals(document.test10b, undefined);
+  assert_true("test10c" in document, 'test10b in document should be false');
+  assert_equals(document["test10c"], object);
+  assert_equals(document.test10c, object);
+}, "Dynamically updating the id attribute from object elements, should be accessible by its name and id.");
+
+test(function() {
+  var object = document.getElementsByTagName("object")[14];
+  assert_equals(object.name, "test11a");
+  assert_equals(object.id, "test11b");
+
+  assert_true("test11a" in document, 'test11a in document should be true');
+  assert_equals(document["test11a"], object);
+  assert_equals(document.test11a, object);
+  assert_true("test11b" in document, 'test11b in document should be true');
+  assert_equals(document["test11b"], object);
+  assert_equals(document.test11b, object);
+
+  object.remove();
+  assert_false("test11a" in document, 'test11a in document should be false');
+  assert_equals(document["test11a"], undefined);
+  assert_equals(document.test11a, undefined);
+  assert_false("test11b" in document, 'test11b in document should be false');
+  assert_equals(document["test11b"], undefined);
+  assert_equals(document.test11b, undefined);
+}, "object elements that is removed, should not be accessible.");
 </script>
diff --git a/tests/wpt/tests/html/dom/reflection.js b/tests/wpt/tests/html/dom/reflection.js
index b2c3b30aae3..eeecd450fca 100644
--- a/tests/wpt/tests/html/dom/reflection.js
+++ b/tests/wpt/tests/html/dom/reflection.js
@@ -967,6 +967,7 @@ ReflectionTests.reflects = function(data, idlName, idlObj, domName, domObj) {
                                                "previous value", "getAttribute()");
                 ReflectionHarness.assertEquals(idlObj[idlName], previousIdl, "IDL get");
             } else {
+                var previousValue = domObj.getAttribute(domName);
                 idlObj[idlName] = idlTests[i];
                 if (data.type == "boolean") {
                     // Special case yay
@@ -976,6 +977,11 @@ ReflectionTests.reflects = function(data, idlName, idlObj, domName, domObj) {
                     var expected = idlDomExpected[i] + "";
                     if (data.isNullable && idlDomExpected[i] === null) {
                         expected = null;
+                    } else if (idlName == "nonce") {
+                        // nonce doesn't reflect the value, as per /content-security-policy/nonce-hiding/
+                        // tests that confirm that retrieving the nonce value post IDL change does not
+                        // reflect back to the attribute (for security reasons)
+                        expected = previousValue;
                     }
                     ReflectionHarness.assertEquals(domObj.getAttribute(domName), expected,
                                                    "getAttribute()");
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-040.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-040.html
new file mode 100644
index 00000000000..3ef1fefc4f8
--- /dev/null
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-040.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/utils.js"></script>
+<title>`link rel=expect` is unblocked for dynamically inserted element</title>
+
+<link rel=expect href="#target" blocking="render">
+<script>
+async_test((t) => {
+  requestAnimationFrame(() => {
+    t.step(() => assert_true(!!document.getElementById("target"), "The target element should be present when rendering is unblocked"));
+    t.step(() => assert_false(!!document.getElementById("last"), "the target element should unblock rendering"));
+    t.done();
+  });
+}, "blocking defers frames until full parsing");
+</script>
+</head>
+<body>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
+  <script>
+    generateParserDelay();
+  </script>
+  <a id="fold">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </a>
+  <script>
+    const target = document.createElement("div");
+    target.id = "target";
+    document.body.append(target);
+  </script>
+  <script>
+    generateParserDelay();
+  </script>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
+</body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-041.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-041.html
new file mode 100644
index 00000000000..c6d87710f7e
--- /dev/null
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-041.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/utils.js"></script>
+<title>`link rel=expect` is unblocked for dynamically inserted anchor with name</title>
+
+<link rel=expect href="#target" blocking="render">
+<script>
+async_test((t) => {
+  requestAnimationFrame(() => {
+    t.step(() => assert_equals(document.getElementsByName("target").length, 1, "The target element should be present when rendering is unblocked"));
+    t.step(() => assert_equals(document.getElementById("last"), null, "the target element should unblock rendering"));
+    t.done();
+  });
+}, "blocking defers frames until full parsing");
+</script>
+</head>
+<body>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
+  <script>
+    generateParserDelay();
+  </script>
+  <a id="fold">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </a>
+  <script>
+    const target = document.createElement("a");
+    target.name = "target";
+    document.body.append(target);
+  </script>
+  <script>
+    generateParserDelay();
+  </script>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
+</body>
diff --git a/tests/wpt/tests/html/editing/dnd/platform/mousedown-move-inner-when-dragging.html b/tests/wpt/tests/html/editing/dnd/platform/mousedown-move-inner-when-dragging-1.html
similarity index 100%
rename from tests/wpt/tests/html/editing/dnd/platform/mousedown-move-inner-when-dragging.html
rename to tests/wpt/tests/html/editing/dnd/platform/mousedown-move-inner-when-dragging-1.html
diff --git a/tests/wpt/tests/html/editing/dnd/platform/mousedown-move-inner-when-dragging-2.html b/tests/wpt/tests/html/editing/dnd/platform/mousedown-move-inner-when-dragging-2.html
new file mode 100644
index 00000000000..1cabc554923
--- /dev/null
+++ b/tests/wpt/tests/html/editing/dnd/platform/mousedown-move-inner-when-dragging-2.html
@@ -0,0 +1,47 @@
+<!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="/resources/testdriver-actions.js"></script>
+<head>
+<title>Test dragging still occurs when mousedown moves the inner element</title>
+</head>
+<body>
+<div id="container">
+  <template shadowrootmode="open">
+    <div id="element" draggable="true" style="width: 40px; height: 40px; background-color:red;">
+      <slot id="slot"></slot>
+    </div>
+    <div id="element2"></div>
+  </template>
+  <div id="inner" style="width: 30px; height: 30px; background-color:black;"></div>
+</div>
+<script>
+
+promise_test(function() {
+  return new Promise(r => {
+    const element = container.shadowRoot.getElementById("element");
+
+    element.addEventListener("dragstart", function(e) {
+      assert_equals(e.target, element);
+      r();
+    });
+
+    element.addEventListener("mousedown", function() {
+      const element2 = container.shadowRoot.getElementById("element2");
+      const slot = container.shadowRoot.getElementById("slot");
+      element2.appendChild(slot);
+    });
+
+    new test_driver.Actions()
+    .pointerMove(0, 0, {origin: inner})
+    .pointerDown()
+    .pointerMove(10, 10, {origin:inner})
+    .pointerUp()
+    .send();
+  });
+}, "dragstart should still fire when the mousedown event moves the container of the inner element around");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/html/editing/dnd/platform/pointerdown-add-display-none.html b/tests/wpt/tests/html/editing/dnd/platform/pointerdown-add-display-none.html
new file mode 100644
index 00000000000..653944e155b
--- /dev/null
+++ b/tests/wpt/tests/html/editing/dnd/platform/pointerdown-add-display-none.html
@@ -0,0 +1,65 @@
+<!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="/resources/testdriver-actions.js"></script>
+<head>
+<title>Test dragging still occurs when pointerdown adds display:none to the dragged element</title>
+<style>
+.dragging {
+  display: none;
+}
+
+#dragBox {
+  width: 200px;
+  height: 200px;
+  background-color: #4CAF50;
+  color: white;
+  border-radius: 8px;
+  cursor: grab;
+  user-select: none;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.inner {
+  background: rgba(255, 255, 255, 0.2);
+  padding: 10px;
+  margin-top: 10px;
+  border-radius: 4px;
+}
+</style>
+</head>
+<body>
+<div id="dragBox" draggable="true">
+  Drag me
+  <div class="inner" id="innerButton">Click or press here</div>
+</div>
+<script>
+
+promise_test(function() {
+  return new Promise(r => {
+    innerButton.addEventListener("pointerdown", function() {
+      innerButton.classList.add("dragging");
+    });
+
+    dragBox.addEventListener("dragstart", function(e) {
+      assert_equals(e.target, dragBox);
+      r();
+    });
+
+    const buttonRect = innerButton.getBoundingClientRect();
+    new test_driver.Actions()
+    .pointerMove(0, 0, {origin: innerButton})
+    .pointerDown()
+    .pointerMove(buttonRect.left + 10, buttonRect.top + 10)
+    .pointerUp()
+    .send();
+  });
+}, "dragstart should still fire when the dragged element gets display:none in its pointerdown");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/html/editing/dnd/platform/pointerdown-add-overflow-hidden.html b/tests/wpt/tests/html/editing/dnd/platform/pointerdown-add-overflow-hidden.html
new file mode 100644
index 00000000000..ac953adfd87
--- /dev/null
+++ b/tests/wpt/tests/html/editing/dnd/platform/pointerdown-add-overflow-hidden.html
@@ -0,0 +1,42 @@
+<!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="/resources/testdriver-actions.js"></script>
+<head>
+<title>Test dragging still occurs when pointerdown adds overflow:hidden to the dragged element</title>
+<style>
+.dragging {
+  overflow: hidden;
+}
+</style>
+</head>
+<body>
+<li id="item" draggable="true">
+  Item 1
+</li>
+<script>
+
+promise_test(function() {
+  return new Promise(r => {
+    item.addEventListener("pointerdown", function() {
+      item.classList.add("dragging");
+    });
+
+    item.addEventListener("dragstart", function(e) {
+      assert_equals(e.target, item);
+      r();
+    });
+
+    new test_driver.Actions()
+    .pointerMove(0, 0, {origin: item})
+    .pointerDown()
+    .pointerMove(10, 10, {origin: item})
+    .pointerUp()
+    .send();
+  });
+}, "dragstart should still fire when the dragged element gets overflow:hidden in its pointerdown");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/html/editing/editing-0/writing-suggestions/WEB_FEATURES.yml b/tests/wpt/tests/html/editing/editing-0/writing-suggestions/WEB_FEATURES.yml
new file mode 100644
index 00000000000..4700eca4a12
--- /dev/null
+++ b/tests/wpt/tests/html/editing/editing-0/writing-suggestions/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: writingsuggestions
+  files: "**"
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/beforematch-element-fragment-navigation.html b/tests/wpt/tests/html/editing/the-hidden-attribute/beforematch-element-fragment-navigation.html
index 812a55f3187..96f5c8e77b2 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/beforematch-element-fragment-navigation.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/beforematch-element-fragment-navigation.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <link rel="author" title="Joey Arhar" href="mailto:jarhar@chromium.org">
-<link rel="help" href="https://github.com/WICG/display-locking">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/interaction.html#the-hidden-attribute:event-beforematch">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
@@ -197,4 +197,21 @@ test(t => {
   div.addEventListener('beforematch', t.unreached_func('beforematch should not be fired without hidden=until-found.'));
   window.location.hash = '#target';
 }, 'Verifies that the beforematch event is not fired on elements without hidden=until-found.');
+
+test(t => {
+  window.location.hash = '';
+  const div = document.createElement('div');
+  div.id = 'target';
+  div.textContent = 'target';
+  div.hidden = 'until-found';
+  document.body.appendChild(div);
+  t.add_cleanup(() => div.remove());
+
+  let hiddenAttributeSet = false;
+  div.addEventListener('beforematch', () => {
+    hiddenAttributeSet = div.hasAttribute('hidden');
+  });
+  window.location.hash = '#target';
+  assert_true(hiddenAttributeSet);
+}, 'The hidden attribute should still be set inside the beforematch event handler.');
 </script>
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/beforematch-scroll-to-text-fragment.html b/tests/wpt/tests/html/editing/the-hidden-attribute/beforematch-scroll-to-text-fragment.html
index dddab4c6ba8..d7bdcff755c 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/beforematch-scroll-to-text-fragment.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/beforematch-scroll-to-text-fragment.html
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
+<meta name=timeout content=long>
 <title>beforematch fired on ScrollToTextFragment</title>
 <link rel="author" title="Joey Arhar" href="mailto:jarhar@chromium.org">
-<link rel="help" href="https://github.com/WICG/display-locking">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/interaction.html#the-hidden-attribute:event-beforematch">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
@@ -12,57 +13,65 @@
 <script src="/scroll-to-text-fragment/stash.js"></script>
 
 <script>
-promise_test(t => new Promise((resolve, reject) => {
-  const key = token();
-  test_driver.bless('Open a scroll to text fragment URL', () => {
-    window.open(
-      `resources/beforematch-scroll-to-text-fragment-basic.html?key=${key}#:~:text=foo`,
-      '_blank',
-      'noopener');
+async function fetchResultsNoResolver(key) {
+  return new Promise((resolve, reject) => {
+    fetchResults(key, resolve, reject);
   });
-  fetchResults(key, resolve, reject);
-}).then(results => {
-  assert_equals(results.pageYOffsetDuringBeforematch, 0,
-    'Scrolling should happen after beforematch is fired.');
+}
+
+promise_test(async () => {
+  const key = token();
+  await test_driver.bless('Open a scroll to text fragment URL');
+  window.open(
+    `resources/beforematch-scroll-to-text-fragment-basic.html?key=${key}#:~:text=foo`,
+    '_blank',
+    'noopener');
+  const results = await fetchResultsNoResolver(key);
   assert_true(results.beforematchFiredOnFoo,
     'Foo was searched for, so it should get a beforematch event.');
   assert_false(results.beforematchFiredOnBar,
     'Bar was not searched for, so it should not get a beforematch event.');
+  assert_equals(results.pageYOffsetDuringBeforematch, 0,
+    'Scrolling should happen after beforematch is fired.');
   assert_true(results.pageYOffsetAfterRaf > 0,
     'The page should be scrolled down to foo.');
-}), 'Verifies that the beforematch event is fired on the matching element of a ScrollToTextFragment navigation.');
+  assert_true(results.beforematchHiddenAttributePresent,
+    'The hidden attribute should be set inside the beforematch event handler.');
+}, 'Verifies that the beforematch event is fired on the matching element of a ScrollToTextFragment navigation.');
 
-promise_test(t => new Promise((resolve, reject) => {
+promise_test(async () => {
   const key = token();
-  test_driver.bless('Open a scroll to text fragment URL', () => {
-    window.open(
-      `resources/beforematch-scroll-to-text-fragment-with-anchor.html?key=${key}#:~:text=foo`,
-      '_blank',
-      'noopener');
-  });
-  fetchResults(key, resolve, reject);
-}).then(results => {
+  await test_driver.bless('Open a scroll to text fragment URL');
+  window.open(
+    `resources/beforematch-scroll-to-text-fragment-with-anchor.html?key=${key}#bar:~:text=foo`,
+    '_blank',
+    'noopener');
+  const results = await fetchResultsNoResolver(key);
+  assert_true(results.fooHasHiddenAttribute,
+    'hidden=until-found revealing should not happen until after the script tag loads.');
   assert_true(results.beforematchFiredOnFoo,
     'foo was searched for, so it should get the beforematch event.');
   assert_false(results.beforematchFiredOnBar,
     'bar should not get the beforematch event despite being the target of an element fragment due to the text fragment.');
-}), 'Verifies that beforematch is only fired on elements targeted by a text fragment when there is both a text fragment and an element fragment.');
+  assert_equals(results.pageYOffsetDuringBeforematch, 0,
+    'Scrolling should happen after beforematch is fired.');
+  assert_true(results.pageYOffsetAfterRaf > 0,
+    'The page should be scrolled down to foo.');
+}, 'Verifies that beforematch is only fired on elements targeted by a text fragment when there is both a text fragment and an element fragment.');
 
-promise_test(t => new Promise((resolve, reject) => {
+promise_test(async () => {
   const key = token();
-  test_driver.bless('Open a scroll to text fragment URL', () => {
-    window.open(
-      `resources/beforematch-scroll-to-text-fragment-bubble.html?key=${key}#:~:text=foo`,
-      '_blank',
-      'noopener');
-  });
-  fetchResults(key, resolve, reject);
-}).then(results => {
+  await test_driver.bless('Open a scroll to text fragment URL');
+  window.open(
+    `resources/beforematch-scroll-to-text-fragment-bubble.html?key=${key}#:~:text=foo`,
+    '_blank',
+    'noopener');
+  const results = await fetchResultsNoResolver(key);
   assert_true(results.beforematchFiredOnChild,
     'The element containing the searched text should have beforematch fired on it.');
   assert_true(results.beforematchFiredOnParent,
     'The parent element of the element containing the matching text should have the beforematch event fired on it because the event should bubble.');
-}), 'Verifies that the beforematch event bubbles with scroll to text fragment.');
+}, 'Verifies that the beforematch event bubbles with scroll to text fragment.');
 
 // TODO(jarhar): Write more tests here once we decide on a behavior here: https://github.com/WICG/display-locking/issues/150
 </script>
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-ua-stylesheet.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-ua-stylesheet.html
index 913ecc037cf..0fde9ea753f 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-ua-stylesheet.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-ua-stylesheet.html
@@ -28,7 +28,10 @@ function testCVHidden(description) {
         `${description} should not affect the div's display property.`);
     assert_equals(getComputedStyle(div).contentVisibility, 'hidden',
         `${description} should make the div content-visibility:hidden.`);
+    assert_equals(div.hidden, "until-found",
+      `${description} should make the div hidden=until-found.`);
   }, description);
+
 }
 
 function testNormal(description) {
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-001.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-001.html
index 3c87b985dcc..0fa46f523cd 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-001.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-001.html
@@ -4,7 +4,7 @@
 <meta charset="utf8">
 <title>content-visibility changes after a delay</title>
 <link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://github.com/WICG/display-locking">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/interaction.html#attr-hidden-until-found">
 <link rel="match" href="./resources/container-ref.html">
 <meta name="assert" content="scrollIntoView has no effect on hidden=until-found">
 <script src="/common/reftest-wait.js"></script>
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-002.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-002.html
index a454e3a0091..0f3dcb1ffb2 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-002.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-002.html
@@ -2,7 +2,7 @@
 <meta charset="utf8">
 <title>Content Visibility: tab order navigation ignores hidden=until-found subtrees</title>
 <link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://github.com/WICG/display-locking">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/interaction.html#attr-hidden-until-found">
 <meta name="assert" content="tab order navigation ignores hidden=until-found subtrees.">
 
 <script src="/resources/testharness.js"></script>
@@ -21,7 +21,7 @@
 
 <script>
 async_test((t) => {
-  const tab = "\t";
+  const tab = "\ue004";
   async function step1() {
     await test_driver.send_keys(document.body, tab);
     t.step(() => {
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-004.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-004.html
index 3ca6feb7a3d..2c0c643c307 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-004.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-004.html
@@ -3,7 +3,7 @@
 <meta charset="utf8">
 <title>hidden=until-found does not paint</title>
 <link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://github.com/WICG/display-locking">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/interaction.html#attr-hidden-until-found">
 <link rel="match" href="./resources/container-ref.html">
 <meta name="assert" content="content-visibility subtrees are not painted">
 
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-005-ref.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-005-ref.html
index 0ca77849a46..e128e1e7139 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-005-ref.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-005-ref.html
@@ -3,7 +3,7 @@
 <meta charset="utf8">
 <title>Content Visibility: hidden-matchable and size contained (reference)</title>
 <link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://github.com/WICG/display-locking">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/interaction.html#attr-hidden-until-found">
 
 <style>
 div {
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-005.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-005.html
index fabf636ec94..2c4df955aee 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-005.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-005.html
@@ -3,7 +3,7 @@
 <meta charset="utf8">
 <title>hidden=until-found and size contained</title>
 <link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://github.com/WICG/display-locking">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/interaction.html#attr-hidden-until-found">
 <link rel="match" href="hidden-until-found-005-ref.html">
 <meta name="assert" content="hidden=until-found puts in size containment">
 
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-006-ref.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-006-ref.html
index e14ba82c278..d8b9761694c 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-006-ref.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-006-ref.html
@@ -3,7 +3,7 @@
 <meta charset="utf8">
 <title>content-visibility hidden-matchable + scrollIntoView (reference)</title>
 <link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://github.com/WICG/display-locking">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/interaction.html#attr-hidden-until-found">
 
 <style>
 .spacer {
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-007.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-007.html
index 7b11a92cc93..64c39c4153a 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-007.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-007.html
@@ -4,7 +4,7 @@
 <meta charset="utf8">
 <title>hidden=until-found + focus</title>
 <link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://github.com/WICG/display-locking">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/interaction.html#attr-hidden-until-found">
 <link rel="match" href="./resources/spacer-and-container-ref.html">
 <meta name="assert" content="focus does not scroll or focus element under hidden=until-found">
 <script src="/common/reftest-wait.js"></script>
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-text-fragment.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-text-fragment.html
index 05220f7ce11..aa8a989509f 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-text-fragment.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-until-found-text-fragment.html
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>beforematch fired on ScrollToTextFragment</title>
 <link rel="author" title="Joey Arhar" href="mailto:jarhar@chromium.org">
-<link rel="help" href="https://github.com/WICG/display-locking">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/interaction.html#attr-hidden-until-found">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/resources/beforematch-scroll-to-text-fragment-basic.html b/tests/wpt/tests/html/editing/the-hidden-attribute/resources/beforematch-scroll-to-text-fragment-basic.html
index 884e9a67fae..9918b7c29f8 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/resources/beforematch-scroll-to-text-fragment-basic.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/resources/beforematch-scroll-to-text-fragment-basic.html
@@ -3,46 +3,61 @@
 
 <!-- This test is navigated to with the fragment #:~:text=foo -->
 
-<body>
-  <div style="height: 4000px;">spacer</div>
-  <script>
-    const results = {};
+<div style="height: 4000px;">spacer</div>
 
-    const foo = document.createElement('div');
-    foo.textContent = 'foo';
-    foo.hidden = 'until-found';
-    document.body.appendChild(foo);
-    window.beforematchFiredOnFoo = false;
-    foo.addEventListener('beforematch', () => {
-      // This should be zero. Scrolling should happen after beforematch is
-      // fired.
-      results.pageYOffsetDuringBeforematch = window.pageYOffset;
-      window.beforematchFiredOnFoo = true;
-    });
+<script>
+(async () => {
+  const results = {};
+  const key = (new URLSearchParams(window.location.search)).get('key');
 
-    const bar = document.createElement('div');
-    bar.textContent = 'bar';
-    document.body.appendChild(bar);
-    window.beforematchFiredOnBar = false;
-    bar.addEventListener('beforematch', () => {
-      window.beforematchFiredOnBar = true;
-    });
+  // This test adds the elements from JS
+  // (unlike beforematch-scroll-to-text-fragment-with-anchor.html,
+  // which uses parser-created elements)
+  const foo = document.createElement('div');
+  foo.hidden = 'until-found';
+  foo.textContent = 'foo';
+  document.body.appendChild(foo);
 
-    requestAnimationFrame(() => {
-      requestAnimationFrame(async () => {
-        // This should be true. Foo was searched for, so it should get a
-        // beforematch event.
-        results.beforematchFiredOnFoo = window.beforematchFiredOnFoo;
-        // This should be false. Bar was not searched for, so it should not get
-        // a beforematch event.
-        results.beforematchFiredOnBar = window.beforematchFiredOnBar;
-        // This should be greater than zero. The page should be scrolled down
-        // to foo.
-        results.pageYOffsetAfterRaf = window.pageYOffset;
+  let beforematchResolver = null;
+  const beforematchPromise = new Promise(resolve => {
+    beforematchResolver = resolve;
+  });
 
-        params = new URLSearchParams(window.location.search);
-        stashResultsThenClose(params.get('key'), results);
-      });
-    });
-  </script>
-</body>
+  // This should be true. Foo was searched for, so it should get a
+  // beforematch event.
+  results.beforematchFiredOnFoo = false;
+  // This should be true. the hidden attribute should not be removed until
+  // after beforematch is fired.
+  results.beforematchHiddenAttributePresent = false;
+  foo.addEventListener('beforematch', () => {
+    results.beforematchFiredOnFoo = true;
+    results.beforematchHiddenAttributePresent = foo.hasAttribute('hidden');
+    // This should be zero. Scrolling should happen after beforematch is
+    // fired.
+    results.pageYOffsetDuringBeforematch = window.pageYOffset;
+    beforematchResolver();
+  });
+
+  const bar = document.createElement('div');
+  bar.hidden = 'until-found';
+  bar.textContent = 'bar';
+  document.body.appendChild(bar);
+  // This should be false. Bar was not searched for, so it should not get
+  // a beforematch event.
+  results.beforematchFiredOnBar = false;
+  bar.addEventListener('beforematch', () => {
+    // this handler should never run. If it does,
+    // send back the message immediately to make the test fail.
+    results.beforematchFiredOnBar = true;
+    stashResultsThenClose(key, results);
+  });
+
+  await beforematchPromise;
+  await new Promise(requestAnimationFrame);
+  await new Promise(requestAnimationFrame);
+  // This should be greater than zero. The page should be scrolled down
+  // to foo.
+  results.pageYOffsetAfterRaf = window.pageYOffset;
+  stashResultsThenClose(key, results);
+})();
+</script>
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/resources/beforematch-scroll-to-text-fragment-bubble.html b/tests/wpt/tests/html/editing/the-hidden-attribute/resources/beforematch-scroll-to-text-fragment-bubble.html
index abfe8ddd544..3b196cd887a 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/resources/beforematch-scroll-to-text-fragment-bubble.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/resources/beforematch-scroll-to-text-fragment-bubble.html
@@ -8,23 +8,30 @@
 </div>
 
 <script>
+(async () => {
   const results = {
     beforematchFiredOnChild: false,
     beforematchFiredOnParent: false
   };
 
+  let beforematchResolver = null;
+  const beforematchPromise = new Promise(resolve => {
+    beforematchResolver = resolve;
+  });
+
   childid.addEventListener('beforematch', () => {
     results.beforematchFiredOnChild = true;
+    beforematchResolver();
   });
 
   parentid.addEventListener('beforematch', () => {
     results.beforematchFiredOnParent = true;
   });
 
-  requestAnimationFrame(() => {
-    requestAnimationFrame(() => {
-      const params = new URLSearchParams(window.location.search);
-      stashResultsThenClose(params.get('key'), results);
-    });
-  });
+  await beforematchPromise;
+  await new Promise(requestAnimationFrame);
+  await new Promise(requestAnimationFrame);
+  const params = new URLSearchParams(window.location.search);
+  stashResultsThenClose(params.get('key'), results);
+})();
 </script>
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/resources/beforematch-scroll-to-text-fragment-with-anchor.html b/tests/wpt/tests/html/editing/the-hidden-attribute/resources/beforematch-scroll-to-text-fragment-with-anchor.html
index 3506c6e60ca..fd000d41199 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/resources/beforematch-scroll-to-text-fragment-with-anchor.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/resources/beforematch-scroll-to-text-fragment-with-anchor.html
@@ -3,34 +3,59 @@
 
 <!-- This test is navigated to with the fragment #bar:~:text=foo -->
 
-<body>
-  <div id=foo hidden=until-found>foo</div>
-  <div id=bar hidden=until-found>bar</div>
-  <script>
-    window.beforematchFiredOnFoo = false;
-    foo.addEventListener('beforematch', () => {
-      window.beforematchFiredOnFoo = true;
-    });
+<!-- This test uses parser-created elements,
+  unlike beforematch-scroll-to-text-fragment-basic.html,
+  which adds them from JS -->
+<div style="height:10000px"></div>
+<div id=foo hidden=until-found>foo</div>
+<div id=bar hidden=until-found>bar</div>
 
-    window.beforematchFiredOnBar = false;
-    bar.addEventListener('beforematch', () => {
-      window.beforematchFiredOnBar = true;
-    });
+<script>
+(async () => {
+  const results = {};
+  const key = (new URLSearchParams(window.location.search)).get('key');
 
-    requestAnimationFrame(() => {
-      requestAnimationFrame(() => {
-        const results = {};
-        // This should be true. Foo was searched for, so it should get the
-        // beforematch event.
-        results.beforematchFiredOnFoo = window.beforematchFiredOnFoo;
-        // This should be false. Bar should not get the beforematch event
-        // despite being the target of an element fragment due to the text
-        // fragment.
-        results.beforematchFiredOnBar = window.beforematchFiredOnBar;
+  // This should be true. hidden=until-found revealing should not happen until
+  // after the script tag loads.
+  results.fooHasHiddenAttribute = foo.hasAttribute('hidden');
 
-        params = new URLSearchParams(window.location.search);
-        stashResultsThenClose(params.get('key'), results);
-      });
-    });
-  </script>
-</body>
+  let beforematchResolver = null;
+  const beforematchPromise = new Promise(resolve => {
+    beforematchResolver = resolve;
+  });
+
+  // This should be true. Foo was searched for, so it should get the
+  // beforematch event.
+  results.beforematchFiredOnFoo = false;
+  foo.addEventListener('beforematch', () => {
+    results.beforematchFiredOnFoo = true;
+    // This should be zero. Scrolling should happen after beforematch is fired.
+    results.pageYOffsetDuringBeforematch = window.pageYOffset;
+    beforematchResolver();
+  });
+
+  // This should be false. Bar should not get the beforematch event
+  // despite being the target of an element fragment due to the text
+  // fragment.
+  results.beforematchFiredOnBar = false;
+  bar.addEventListener('beforematch', () => {
+    // this handler should never run. If it does,
+    // send back the message immediately to make the test fail.
+    results.beforematchFiredOnBar = true;
+    stashResultsThenClose(key, results);
+  });
+
+  if (!results.fooHasHiddenAttribute) {
+    // No need to wait for the beforematch event if it will never come.
+    stashResultsThenClose(key, results);
+  } else {
+    await beforematchPromise;
+    await new Promise(requestAnimationFrame);
+    await new Promise(requestAnimationFrame);
+    // This should be greater than zero. Scrolling should happen after the
+    // beforematch event handler.
+    results.pageYOffsetAfterRaf = window.pageYOffset;
+    stashResultsThenClose(key, results);
+  }
+})();
+</script>
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/resources/container-ref.html b/tests/wpt/tests/html/editing/the-hidden-attribute/resources/container-ref.html
index e2df59014b0..53986abdd1f 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/resources/container-ref.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/resources/container-ref.html
@@ -3,7 +3,7 @@
 <meta charset="utf8">
 <title>CSS Content Visibility: container (reference)</title>
 <link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://github.com/WICG/display-locking">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/interaction.html#attr-hidden-until-found">
 
 <style>
 #container {
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/resources/hidden-until-found-text-fragment.html b/tests/wpt/tests/html/editing/the-hidden-attribute/resources/hidden-until-found-text-fragment.html
index fe89b407e65..b765c07f277 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/resources/hidden-until-found-text-fragment.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/resources/hidden-until-found-text-fragment.html
@@ -7,19 +7,28 @@
   <div style="height: 4000px;">spacer</div>
   <div id=target hidden=until-found>foo</div>
   <script>
-    requestAnimationFrame(() => {
+    // scroll-to-text-fragment may delay scrolling for an
+    // arbitrary amount of time for security reasons.
+    // This test would time out if beforematch is not fired, but since the
+    // test file only has one test, this is not shadowing other test results.
+    target.onbeforematch = () => {
+      // Adding two additional requestAnimationFrames ensures
+      // that scrolling has happened after beforematch has fired.
       requestAnimationFrame(() => {
-        const results = {};
-        // This should be false. The hidden=until-found attribute should be
-        // removed in response to ScrollToTextFragment.
-        results.targetHasHiddenAttribute = document.getElementById('target').hasAttribute('hidden');
-        // This should be greater than zero. The page should be scrolled down
-        // to foo.
-        results.pageYOffsetAfterRaf = window.pageYOffset;
+        requestAnimationFrame(() => {
+          const results = {};
+          // This should be false. The hidden=until-found attribute should be
+          // removed in response to ScrollToTextFragment.
+          results.targetHasHiddenAttribute = document.getElementById('target').hasAttribute('hidden');
+          // This should be greater than zero. The page should be scrolled down
+          // to foo.
+          results.pageYOffsetAfterRaf = window.pageYOffset;
 
-        params = new URLSearchParams(window.location.search);
-        stashResultsThenClose(params.get('key'), results);
+          params = new URLSearchParams(window.location.search);
+          stashResultsThenClose(params.get('key'), results);
+
+        });
       });
-    });
+    };
   </script>
 </body>
diff --git a/tests/wpt/tests/html/editing/the-hidden-attribute/resources/spacer-and-container-ref.html b/tests/wpt/tests/html/editing/the-hidden-attribute/resources/spacer-and-container-ref.html
index 816a6c9a9d8..474da707083 100644
--- a/tests/wpt/tests/html/editing/the-hidden-attribute/resources/spacer-and-container-ref.html
+++ b/tests/wpt/tests/html/editing/the-hidden-attribute/resources/spacer-and-container-ref.html
@@ -3,7 +3,7 @@
 <meta charset="utf8">
 <title>Content Visibility: spacer and a container (reference)</title>
 <link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://github.com/WICG/display-locking">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/interaction.html#attr-hidden-until-found">
 
 <style>
 .spacer {
diff --git a/tests/wpt/tests/html/embedded-content/the-img-element/WEB_FEATURES.yml b/tests/wpt/tests/html/embedded-content/the-img-element/WEB_FEATURES.yml
new file mode 100644
index 00000000000..5716baa5def
--- /dev/null
+++ b/tests/wpt/tests/html/embedded-content/the-img-element/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: fetch-priority
+  files:
+  - attr-img-fetchpriority.html
diff --git a/tests/wpt/tests/html/interaction/focus/tab-table-caption.html b/tests/wpt/tests/html/interaction/focus/tab-table-caption.html
new file mode 100644
index 00000000000..a26c8f0e7ed
--- /dev/null
+++ b/tests/wpt/tests/html/interaction/focus/tab-table-caption.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<meta charset="utf-8">
+<meta name="variant" content="?caption-side=top">
+<meta name="variant" content="?caption-side=bottom">
+<title>Tab navigation around table with caption</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script>
+  "use strict";
+
+  const searchParams = new URLSearchParams(document.location.search);
+  const captionSide = searchParams.get("caption-side");
+
+  addEventListener("DOMContentLoaded", () => {
+    document.querySelector("table").style.captionSide = captionSide;
+    const tabKey = "\uE004";
+    const shiftKey = "\uE008";
+    const firstTabbable = document.querySelector("body > span");
+    const lastTabbable = document.querySelector("table ~ span");
+    const tabbableInCaption = document.querySelector("caption > span");
+    const tabbableInCell = document.querySelector("td > span");
+    for (const data of [
+      {init: firstTabbable, prev: null, next: tabbableInCell },
+      {init: tabbableInCaption, prev: tabbableInCell, next: lastTabbable },
+      {init: tabbableInCell, prev: firstTabbable, next: tabbableInCaption },
+      {init: lastTabbable, prev: tabbableInCaption, next: null},
+    ]) {
+      if (data.prev) {
+        promise_test(async () => {
+          data.init.focus();
+          await new test_driver.Actions().keyDown(shiftKey).keyDown(tabKey).keyUp(tabKey).keyUp(shiftKey).send();
+          assert_equals(document.activeElement, data.prev);
+        }, `Shift+Tab on ${data.init.outerHTML} should move focus to ${data.prev.outerHTML}`);
+      }
+      if (data.next) {
+        promise_test(async () => {
+          data.init.focus();
+          await new test_driver.Actions().keyDown(tabKey).keyUp(tabKey).send();
+          assert_equals(document.activeElement, data.next);
+        }, `Tab on ${data.init.outerHTML} should move focus to ${data.next.outerHTML}`);
+      }
+    }
+  });
+</script>
+<span tabindex="0">First tabbable span</span>
+<table>
+  <tbody>
+    <tr>
+      <td><span tabindex="0">Tabbable in cell<span></td>
+    </tr>
+  </tbody>
+  <caption><span tabindex="0">Tabbable in caption</span></caption>
+</table>
+<span tabindex="0">Last tabbable span</span>
diff --git a/tests/wpt/tests/html/links/stylesheet/quirk-origin-check-positive.html b/tests/wpt/tests/html/links/stylesheet/quirk-origin-check-positive.html
new file mode 100644
index 00000000000..02ab832cbe2
--- /dev/null
+++ b/tests/wpt/tests/html/links/stylesheet/quirk-origin-check-positive.html
@@ -0,0 +1,18 @@
+<!-- quirks -->
+<title>Same-origin stylesheet with non-CSS MIME type quirk</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#link-type-stylesheet">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="stylesheet" href="resources/quirk-stylesheet.css.txt">
+<p class="test">This text should be green.</p>
+<script>
+setup({ single_test: true });
+onload = () => {
+  assert_equals(
+    getComputedStyle(document.querySelector('.test')).color,
+    'rgb(0, 128, 0)',
+    "Same-origin stylesheet with non-CSS MIME type should be applied in quirks mode"
+  );
+  done();
+};
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/links/stylesheet/resources/quirk-stylesheet.css.txt b/tests/wpt/tests/html/links/stylesheet/resources/quirk-stylesheet.css.txt
new file mode 100644
index 00000000000..d2ae3825831
--- /dev/null
+++ b/tests/wpt/tests/html/links/stylesheet/resources/quirk-stylesheet.css.txt
@@ -0,0 +1 @@
+.test { color: green; }
\ No newline at end of file
diff --git a/tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-applets.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-applets.html
new file mode 100644
index 00000000000..493e75262e6
--- /dev/null
+++ b/tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-applets.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>document.applets</title>
+<link rel="help" href="https://html.spec.whatwg.org/C/#dom-document-applets">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<object></object>
+<object type="application/x-java-applet"></object>
+<object type="application/x-java-bean"></object>
+<object type="application/x-java-vm"></object>
+<object><param name="type" value="application/x-java-applet" /></object>
+<object><param name="type" value="application/x-java-bean" /></object>
+<object><param name="type" value="application/x-java-vm" /></object>
+
+<script>
+test(() => {
+  const collection = document.applets;
+  assert_true(collection instanceof HTMLCollection);
+  assert_equals(collection.length, 0, 'The collection should be empty.');
+}, 'document.applets should return an empty collection.');
+</script>
diff --git a/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-with-trusted-types-ref.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-with-trusted-types-ref.html
new file mode 100644
index 00000000000..5042557212e
--- /dev/null
+++ b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-with-trusted-types-ref.html
@@ -0,0 +1,8 @@
+<!doctype html>
+<html>
+<body>
+<div style="vertical-align: text-bottom; display: inline-block;">
+  <div style="width: 10px; height: 10px; background-color: green;"></div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-with-trusted-types.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-with-trusted-types.html
new file mode 100644
index 00000000000..f16c58bb85d
--- /dev/null
+++ b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-with-trusted-types.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+<head>
+  <meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'">
+  <link rel="match" href="marquee-with-trusted-types-ref.html">
+</head>
+<body>
+<marquee scrollamount="0">
+  <div style="width: 10px; height: 10px; background-color: green;"></div>
+</marquee>
+</body>
+</html>
diff --git a/tests/wpt/tests/html/rendering/non-replaced-elements/lists/lists-styles-quirks.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/lists-styles-quirks.html
new file mode 100644
index 00000000000..ba3d8241f0f
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/lists-styles-quirks.html
@@ -0,0 +1,238 @@
+<!-- This file is the same as lists-styles.html except:
+- no doctype
+- different title
+- added quirks mode styles
+-->
+<title>quirks mode - default styles and preshints for ol, ul, menu, li, dir, dl, dt, dd</title>
+<meta name="viewport" content="width=device-width">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/rendering/support/test-ua-stylesheet.js"></script>
+<style>
+/* Specify this bogus namespace, so the rules in this stylesheet only apply to the `fakeClone`d elements in #refs, not the HTML elements in #tests. */
+@namespace url(urn:not-html);
+
+dir, dd, dl, dt, menu, ol, ul { display: block; }
+li { display: list-item; text-align: match-parent; }
+
+dir, dl, menu, ol, ul { margin-block-start: 1em; margin-block-end: 1em; }
+
+:is(dir, dl, menu, ol, ul) :is(dir, dl, menu, ol, ul) {
+  margin-block-start: 0; margin-block-end: 0;
+}
+
+dd { margin-inline-start: 40px; }
+dir, menu, ol, ul { padding-inline-start: 40px; }
+
+ol, ul, menu { counter-reset: list-item; }
+ol { list-style-type: decimal; }
+
+dir, menu, ul {
+  list-style-type: disc;
+}
+:is(dir, menu, ol, ul) :is(dir, menu, ul) {
+  list-style-type: circle;
+}
+:is(dir, menu, ol, ul) :is(dir, menu, ol, ul) :is(dir, menu, ul) {
+  list-style-type: square;
+}
+
+/* preshints */
+ol[type="1"], li[type="1"] { list-style-type: decimal; }
+/* use classes due to lack of support for "s" annotation */
+ol[class=type-a], li[class=type-a] { list-style-type: lower-alpha; }
+ol[class=type-A], li[class=type-A] { list-style-type: upper-alpha; }
+ol[class=type-i], li[class=type-i] { list-style-type: lower-roman; }
+ol[class=type-I], li[class=type-I] { list-style-type: upper-roman; }
+ul[type=none i], li[type=none i] { list-style-type: none; }
+ul[type=disc i], li[type=disc i] { list-style-type: disc; }
+ul[type=circle i], li[type=circle i] { list-style-type: circle; }
+ul[type=square i], li[type=square i] { list-style-type: square; }
+
+li[value="10"], li[value="10xyz"], li[value="10e10"] { counter-set: list-item 10; }
+ol[start="10"], ol[start="10xyz"], ol[start="10e10"] { counter-reset: list-item 9; }
+ol[reversed] { counter-reset: reversed(list-item); }
+ol[reversed][start="20"], ol[reversed][start="20xyz"], ol[reversed][start="20e10"] { counter-reset: reversed(list-item) 21; }
+
+/* dir="" */
+[dir=ltr] { direction: ltr; }
+[dir=rtl] { direction: rtl; }
+
+/* quirks mode styles */
+li { list-style-position: inside; }
+li :is(dir, menu, ol, ul) { list-style-position: outside; }
+:is(dir, menu, ol, ul) :is(dir, menu, ol, ul, li) { list-style-position: unset; }
+</style>
+
+<div id="log"></div>
+
+<div id="tests">
+  <li></li>
+  <dir>
+   <li></li>
+  </dir>
+  <dt></dt>
+  <dd></dd>
+  <dl>
+   <dt></dt>
+   <dd></dd>
+  </dl>
+  <menu>
+   <li></li>
+  </menu>
+  <ol>
+   <li></li>
+  </ol>
+  <ul>
+   <li></li>
+  </ul>
+  <dir data-skip><dir></dir></dir>
+  <dir data-skip><menu></menu></dir>
+  <dir data-skip><ul></ul></dir>
+  <menu data-skip><dir></dir></menu>
+  <menu data-skip><menu></menu></menu>
+  <menu data-skip><ul></ul></menu>
+  <ol data-skip><dir></dir></ol>
+  <ol data-skip><menu></menu></ol>
+  <ol data-skip><ul></ul></ol>
+  <ul data-skip><dir></dir></ul>
+  <ul data-skip><menu></menu></ul>
+  <ul data-skip><ul></ul></ul>
+
+  <dir data-skip><dir data-skip><dir></dir></dir></dir>
+  <dir data-skip><dir data-skip><menu></menu></dir></dir>
+  <dir data-skip><dir data-skip><ul></ul></dir></dir>
+  <dir data-skip><menu data-skip><dir></dir></menu></dir>
+  <dir data-skip><menu data-skip><menu></menu></menu></dir>
+  <dir data-skip><menu data-skip><ul></ul></menu></dir>
+  <dir data-skip><ol data-skip><dir></dir></ol></dir>
+  <dir data-skip><ol data-skip><menu></menu></ol></dir>
+  <dir data-skip><ol data-skip><ul></ul></ol></dir>
+  <dir data-skip><ul data-skip><dir></dir></ul></dir>
+  <dir data-skip><ul data-skip><menu></menu></ul></dir>
+  <dir data-skip><ul data-skip><ul></ul></ul></dir>
+
+  <menu data-skip><dir data-skip><dir></dir></dir></menu>
+  <menu data-skip><dir data-skip><menu></menu></dir></menu>
+  <menu data-skip><dir data-skip><ul></ul></dir></menu>
+  <menu data-skip><menu data-skip><dir></dir></menu></menu>
+  <menu data-skip><menu data-skip><menu></menu></menu></menu>
+  <menu data-skip><menu data-skip><ul></ul></menu></menu>
+  <menu data-skip><ol data-skip><dir></dir></ol></menu>
+  <menu data-skip><ol data-skip><menu></menu></ol></menu>
+  <menu data-skip><ol data-skip><ul></ul></ol></menu>
+  <menu data-skip><ul data-skip><dir></dir></ul></menu>
+  <menu data-skip><ul data-skip><menu></menu></ul></menu>
+  <menu data-skip><ul data-skip><ul></ul></ul></menu>
+
+  <ol data-skip><dir data-skip><dir></dir></dir></ol>
+  <ol data-skip><dir data-skip><menu></menu></dir></ol>
+  <ol data-skip><dir data-skip><ul></ul></dir></ol>
+  <ol data-skip><menu data-skip><dir></dir></menu></ol>
+  <ol data-skip><menu data-skip><menu></menu></menu></ol>
+  <ol data-skip><menu data-skip><ul></ul></menu></ol>
+  <ol data-skip><ol data-skip><dir></dir></ol></ol>
+  <ol data-skip><ol data-skip><menu></menu></ol></ol>
+  <ol data-skip><ol data-skip><ul></ul></ol></ol>
+  <ol data-skip><ul data-skip><dir></dir></ul></ol>
+  <ol data-skip><ul data-skip><menu></menu></ul></ol>
+  <ol data-skip><ul data-skip><ul></ul></ul></ol>
+
+  <ul data-skip><dir data-skip><dir></dir></dir></ul>
+  <ul data-skip><dir data-skip><menu></menu></dir></ul>
+  <ul data-skip><dir data-skip><ul></ul></dir></ul>
+  <ul data-skip><menu data-skip><dir></dir></menu></ul>
+  <ul data-skip><menu data-skip><menu></menu></menu></ul>
+  <ul data-skip><menu data-skip><ul></ul></menu></ul>
+  <ul data-skip><ol data-skip><dir></dir></ol></ul>
+  <ul data-skip><ol data-skip><menu></menu></ol></ul>
+  <ul data-skip><ol data-skip><ul></ul></ol></ul>
+  <ul data-skip><ul data-skip><dir></dir></ul></ul>
+  <ul data-skip><ul data-skip><menu></menu></ul></ul>
+  <ul data-skip><ul data-skip><ul></ul></ul></ul>
+
+  <ol type="1"></ol>
+  <ul type="1"></ul>
+  <li type="1"></li>
+  <ol type="a" class="type-a"></ol>
+  <ul type="a" class="type-a"></ul>
+  <li type="a" class="type-a"></li>
+  <ol type="A" class="type-A"></ol>
+  <ul type="A" class="type-A"></ul>
+  <li type="A" class="type-A"></li>
+  <ol type="i" class="type-i"></ol>
+  <ul type="i" class="type-i"></ul>
+  <li type="i" class="type-i"></li>
+  <ol type="I" class="type-I"></ol>
+  <ul type="I" class="type-I"></ul>
+  <li type="I" class="type-I"></li>
+  <ol type="none"></ol>
+  <ul type="none"></ul>
+  <li type="none"></li>
+  <ol type="NONE"></ol>
+  <ul type="NONE"></ul>
+  <li type="NONE"></li>
+  <ol type="disc"></ol>
+  <ul type="disc"></ul>
+  <li type="disc"></li>
+  <ol type="DISC"></ol>
+  <ul type="DISC"></ul>
+  <li type="DISC"></li>
+  <ol type="circle"></ol>
+  <ul type="circle"></ul>
+  <li type="circle"></li>
+  <ol type="CIRCLE"></ol>
+  <ul type="CIRCLE"></ul>
+  <li type="CIRCLE"></li>
+  <ol type="square"></ol>
+  <ul type="square"></ul>
+  <li type="square"></li>
+  <ol type="SQUARE"></ol>
+  <ul type="SQUARE"></ul>
+  <li type="SQUARE"></li>
+
+  <ol>
+    <li value="10"></li>
+    <li value="10xyz"></li>
+    <li value="10e10"></li>
+    <li value="xyz"></li>
+  </ol>
+
+  <ol start="10"><li></li></ol>
+  <ol start="10xyz"><li></li></ol>
+  <ol start="10e10"><li></li></ol>
+  <ol start="xyz"><li></li></ol>
+  <ol reversed><li></li></ol>
+  <ol reversed start="20"><li></li></ol>
+  <ol reversed start="20xyz"><li></li></ol>
+  <ol reversed start="20e10"><li></li></ol>
+  <ol reversed start="xyz"><li></li></ol>
+
+  <ul data-skip dir="rtl"><li dir="ltr"></li></ul>
+  <ul data-skip dir="ltr"><li dir="rtl"></li></ul>
+
+</div>
+
+<div id="refs"></div>
+
+<script>
+  const props = [
+    'display',
+    'margin-top',
+    'margin-right',
+    'margin-bottom',
+    'margin-left',
+    'padding-top',
+    'padding-right',
+    'padding-bottom',
+    'padding-left',
+    'list-style-type',
+    'counter-set',
+    'counter-reset',
+    'counter-increment',
+    'text-align',
+    'list-style-position',
+  ];
+  runUAStyleTests(props);
+
+</script>
diff --git a/tests/wpt/tests/html/rendering/non-replaced-elements/lists/lists-styles.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/lists-styles.html
index a5f011cecc1..6c2500b7eed 100644
--- a/tests/wpt/tests/html/rendering/non-replaced-elements/lists/lists-styles.html
+++ b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/lists-styles.html
@@ -222,6 +222,7 @@ ol[reversed][start="20"], ol[reversed][start="20xyz"], ol[reversed][start="20e10
     'counter-reset',
     'counter-increment',
     'text-align',
+    'list-style-position',
   ];
   runUAStyleTests(props);
 
diff --git a/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-background-print-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-background-print-ref.html
index 3aa0abd3207..a386cbb7e32 100644
--- a/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-background-print-ref.html
+++ b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-background-print-ref.html
@@ -1,5 +1,10 @@
 <!DOCTYPE HTML>
 <html>
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <body>
 <table style="background-image: url('resources/aqua-yellow-32x32.png')">
   <thead style="background-image: url('resources/blue-16x20-green-16x20.png')">
diff --git a/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-background-print.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-background-print.html
index 0cbaca60192..05fdef0a860 100644
--- a/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-background-print.html
+++ b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-background-print.html
@@ -4,6 +4,11 @@
 <link rel="help" href="https://html.spec.whatwg.org/multipage/rendering.html#tables-2">
 <link rel="help" href="https://drafts.csswg.org/css-break/">
 <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=816498">
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <body>
 <table background="resources/aqua-yellow-32x32.png">
   <thead background="resources/blue-16x20-green-16x20.png">
diff --git a/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print-ref.html
index 2aa94109ad6..b78f9d3bf8a 100644
--- a/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print-ref.html
+++ b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print-ref.html
@@ -6,6 +6,7 @@
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
 html,body {
+  print-color-adjust: exact;
   color:black;
   background-color:white;
   font-size:16px;
diff --git a/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print.html
index 3a14558a8b2..751a445a87b 100644
--- a/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print.html
+++ b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print.html
@@ -10,6 +10,7 @@
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
 html,body {
+  print-color-adjust: exact;
   color:black;
   background-color:white;
   font-size:16px;
diff --git a/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol-column-height.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol-column-height.html
new file mode 100644
index 00000000000..afd2425221f
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol-column-height.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<title>fieldset multicol with auto count, non-auto width</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/rendering.html#the-fieldset-and-legend-elements">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#ch">
+<link rel="help" href="https://drafts.csswg.org/css-multicol-2/#cwr">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+ #test { margin: 0; padding: 0; border: none }
+ #test, #ref { columns:3; column-height:1.5em; column-wrap:wrap; gap:20px; }
+ p { margin: 0 }
+</style>
+<fieldset id="test">
+  <p>1</p>
+  <p>2</p>
+  <p>3</p>
+  <p>4</p>
+  <p>5</p>
+</fieldset>
+<div id="ref">
+  <p>1</p>
+  <p>2</p>
+  <p>3</p>
+  <p>4</p>
+  <p>5</p>
+</div>
+<script>
+  test(() => {
+    assert_equals(getComputedStyle(document.getElementById('test')).height,
+                  getComputedStyle(document.getElementById('ref')).height);
+  });
+</script>
diff --git a/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol-only-column-count.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol-only-column-count.html
new file mode 100644
index 00000000000..9f794007a47
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol-only-column-count.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<title>fieldset multicol with auto count, non-auto width</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/rendering.html#the-fieldset-and-legend-elements">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+ #test { margin: 0; padding: 0; border: none }
+ #test, #ref { width:min-content; column-count:4; }
+ p { margin: 0 }
+</style>
+<fieldset id="test">
+  <p>1</p>
+  <p>2</p>
+  <p>3</p>
+  <p>4</p>
+  <p>5</p>
+</fieldset>
+<div id="ref">
+  <p>1</p>
+  <p>2</p>
+  <p>3</p>
+  <p>4</p>
+  <p>5</p>
+</div>
+<script>
+  test(() => {
+    assert_equals(getComputedStyle(document.getElementById('test')).height,
+                  getComputedStyle(document.getElementById('ref')).height);
+  });
+</script>
diff --git a/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol-only-column-width.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol-only-column-width.html
new file mode 100644
index 00000000000..e3fd552439a
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol-only-column-width.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<title>fieldset multicol with auto count, non-auto width</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/rendering.html#the-fieldset-and-legend-elements">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+ #test { margin: 0; padding: 0; border: none }
+ #test, #ref { width:500px; column-width:100px; }
+ p { margin: 0 }
+</style>
+<fieldset id="test">
+  <p>1</p>
+  <p>2</p>
+  <p>3</p>
+  <p>4</p>
+  <p>5</p>
+</fieldset>
+<div id="ref">
+  <p>1</p>
+  <p>2</p>
+  <p>3</p>
+  <p>4</p>
+  <p>5</p>
+</div>
+<script>
+  test(() => {
+    assert_equals(getComputedStyle(document.getElementById('test')).height,
+                  getComputedStyle(document.getElementById('ref')).height);
+  });
+</script>
diff --git a/tests/wpt/tests/html/rendering/replaced-elements/the-option-element/option-label-whitespace-2-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/the-option-element/option-label-whitespace-2-ref.html
new file mode 100644
index 00000000000..b0567c2b4e3
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/replaced-elements/the-option-element/option-label-whitespace-2-ref.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<select>
+  <option></option>
+</select>
diff --git a/tests/wpt/tests/html/rendering/replaced-elements/the-option-element/option-label-whitespace-2.html b/tests/wpt/tests/html/rendering/replaced-elements/the-option-element/option-label-whitespace-2.html
new file mode 100644
index 00000000000..95b3a3c73db
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/replaced-elements/the-option-element/option-label-whitespace-2.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/10955">
+<link rel=mismatch href="option-label-whitespace-2-ref.html">
+
+<select>
+  <option label="  "></option>
+</select>
diff --git a/tests/wpt/tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/pre-margin-block-ref.html b/tests/wpt/tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/pre-margin-block-ref.html
new file mode 100644
index 00000000000..b66f6980cec
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/pre-margin-block-ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<style>
+html {
+  writing-mode: vertical-rl;
+}
+blockquote, figure, listing, p, plaintext, pre, xmp {
+  margin-block: 1em;
+}
+</style>
+
+<pre>pre</pre>
+<xmp>xmp</xmp>
+<listing>listing</listing>
+<blockquote>blockquote</blockquote>
+<figure>figure</figure>
+<p>p</p>
+<plaintext>plaintext
diff --git a/tests/wpt/tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/pre-margin-block.html b/tests/wpt/tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/pre-margin-block.html
new file mode 100644
index 00000000000..c880bbda68a
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/pre-margin-block.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://html.spec.whatwg.org/multipage/rendering.html#the-css-user-agent-style-sheet-and-presentational-hints">
+<link rel=help href="https://issues.chromium.org/issues/407315792">
+<link rel=match href="pre-margin-block-ref.html">
+
+<!--
+This is a test for the following UA style rule in the HTML spec:
+
+blockquote, figure, listing, p, plaintext, pre, xmp {
+  margin-block: 1em;
+}
+-->
+
+<style>
+html {
+  writing-mode: vertical-rl;
+}
+</style>
+
+<pre>pre</pre>
+<xmp>xmp</xmp>
+<listing>listing</listing>
+<blockquote>blockquote</blockquote>
+<figure>figure</figure>
+<p>p</p>
+<plaintext>plaintext
diff --git a/tests/wpt/tests/html/rendering/the-details-element/auto-expand-details-text-fragment.html b/tests/wpt/tests/html/rendering/the-details-element/auto-expand-details-text-fragment.html
index 321d82c02d0..b2416c942b6 100644
--- a/tests/wpt/tests/html/rendering/the-details-element/auto-expand-details-text-fragment.html
+++ b/tests/wpt/tests/html/rendering/the-details-element/auto-expand-details-text-fragment.html
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>beforematch fired on ScrollToTextFragment</title>
 <link rel="author" title="Joey Arhar" href="mailto:jarhar@chromium.org">
-<link rel="help" href="https://github.com/WICG/display-locking">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/interactive-elements.html#the-details-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
@@ -26,5 +26,5 @@ promise_test(t => new Promise((resolve, reject) => {
     'The matching closed details element should be open.');
   assert_true(results.pageYOffsetAfterRaf > 0,
     'The page should be scrolled down to the match.');
-}), 'Verifies that the beforematch event is fired on the matching element of a ScrollToTextFragment navigation.');
+}), 'Verifies that the target page has scrolled as a result of a ScrollToTextFragment navigation.');
 </script>
diff --git a/tests/wpt/tests/html/rendering/the-details-element/resources/auto-expand-details-text-fragment.html b/tests/wpt/tests/html/rendering/the-details-element/resources/auto-expand-details-text-fragment.html
index b95459fe5c0..102e4aebd95 100644
--- a/tests/wpt/tests/html/rendering/the-details-element/resources/auto-expand-details-text-fragment.html
+++ b/tests/wpt/tests/html/rendering/the-details-element/resources/auto-expand-details-text-fragment.html
@@ -9,19 +9,18 @@
     <div>foo</div>
   </details>
   <script>
-    requestAnimationFrame(() => {
-      requestAnimationFrame(() => {
-        const results = {};
-        // This should be true. The details element should be opened by
-        // ScrollToTextFragment because it has matching text.
-        results.detailsHasOpenAttribute = document.querySelector('details').hasAttribute('open');
-        // This should be greater than zero. The page should be scrolled down
-        // to the matching target.
-        results.pageYOffsetAfterRaf = window.pageYOffset;
+    const details = document.querySelector("details");
+    details.ontoggle = () => {
+      const results = {};
+      // This should be true. The details element should be opened by
+      // ScrollToTextFragment because it has matching text.
+      results.detailsHasOpenAttribute = document.querySelector('details').hasAttribute('open');
+      // This should be greater than zero. The page should be scrolled down
+      // to the matching target.
+      results.pageYOffsetAfterRaf = window.pageYOffset;
 
-        params = new URLSearchParams(window.location.search);
-        stashResultsThenClose(params.get('key'), results);
-      });
-    });
+      params = new URLSearchParams(window.location.search);
+      stashResultsThenClose(params.get('key'), results);
+    };
   </script>
 </body>
diff --git a/tests/wpt/tests/html/rendering/widgets/field-sizing-textarea-relayout.html b/tests/wpt/tests/html/rendering/widgets/field-sizing-textarea-relayout.html
index 1e18bd20703..579462ca2f5 100644
--- a/tests/wpt/tests/html/rendering/widgets/field-sizing-textarea-relayout.html
+++ b/tests/wpt/tests/html/rendering/widgets/field-sizing-textarea-relayout.html
@@ -2,7 +2,7 @@
 <html class="reftest-wait">
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#field-sizing">
 <link rel=match href="field-sizing-textarea-relayout-ref.html">
-<meta name="fuzzy" content="maxDifference=153; totalPixels=2" />
+<meta name="fuzzy" content="maxDifference=0-153; totalPixels=0-2" />
 <script src="/common/reftest-wait.js"></script>
 <body>
 <textarea id="textarea" style="field-sizing: content"></textarea><textarea></textarea>
diff --git a/tests/wpt/tests/html/rendering/widgets/the-select-element/option-add-label-quirks.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/option-add-label-quirks.html
index 2c3c8093e25..f91609afc50 100644
--- a/tests/wpt/tests/html/rendering/widgets/the-select-element/option-add-label-quirks.html
+++ b/tests/wpt/tests/html/rendering/widgets/the-select-element/option-add-label-quirks.html
@@ -2,7 +2,7 @@
 <title>OPTION's label attribute in SELECT -- Adding a label (quirks)</title>
 <link rel="help" href="https://html.spec.whatwg.org/multipage/rendering.html#the-select-element-2">
 <link rel="match" href="option-label-ref.html">
-<meta name="assert" content="An option element is expected to be rendered by displaying the element's label.">
+<meta name="assert" content="An option element is expected to be rendered by displaying the element's label when the document is in quirks mode">
 
 <select>
   <option>Element Text</option>
diff --git a/tests/wpt/tests/html/scripting/the-script-element/WEB_FEATURES.yml b/tests/wpt/tests/html/scripting/the-script-element/WEB_FEATURES.yml
new file mode 100644
index 00000000000..864bd3398ee
--- /dev/null
+++ b/tests/wpt/tests/html/scripting/the-script-element/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: fetch-priority
+  files:
+  - attr-script-fetchpriority.html
diff --git a/tests/wpt/tests/html/semantics/embedded-content/media-elements/error-sequence.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/error-sequence.html
new file mode 100644
index 00000000000..e2cf4123111
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/embedded-content/media-elements/error-sequence.html
@@ -0,0 +1,353 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Test sequence of effects of errors
+</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/media-source/mediasource-util.js"></script>
+</head>
+<body>
+</body>
+<script>
+'use strict';
+
+function create_audio(t) {
+  const audio = document.createElement('audio');
+  audio.controls = true;
+  audio.watcher = new EventWatcher(
+    t, audio,
+    [
+      'loadstart',
+      'waiting',
+      'error',
+      'ended',
+      'loadedmetadata',
+      'canplay',
+      'volumechange',
+      'playing',
+      'pause',
+    ]);
+  document.body.appendChild(audio);
+  return audio;
+}
+
+promise_test(async t => {
+  const audio = create_audio(t);
+  audio.src = '';
+  assert_equals(audio.error, null, 'initial error attribute');
+  // Queue a volumechange event on the media element task source.
+  audio.volume = 0;
+  // The dedicated media source failure steps are described as queued, but
+  // browsers do not make state changes asynchronously.
+  // https://github.com/whatwg/html/issues/11155
+  audio.onvolumechange = t.step_func(() => {
+    assert_equals(audio.error?.code, MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED,
+                  'error code');
+    // Queue a second volumechange.  This arrives after the error event
+    // because the error event is queued immediately after the resource
+    // selection algorithm synchronous steps.
+    audio.volume = 1;
+  });
+  await audio.watcher.wait_for(
+    ['volumechange', 'loadstart', 'error', 'volumechange']);
+}, 'empty src attribute');
+
+promise_test(async t => {
+  const audio = create_audio(t);
+  // src is such that "the result of encoding-parsing a URL" is failure.
+  audio.src = 'https://#fragment';
+  assert_equals(audio.error, null, 'initial error attribute');
+  // Queue a volumechange event on the media element task source.
+  audio.volume = 0;
+  // The dedicated media source failure steps are described as queued from
+  // parallel steps in the resource selection algorithm, but browsers do not
+  // make state changes asynchronously, and they queue the error event
+  // immediately after the resource selection algorithm synchronous steps.
+  // https://github.com/whatwg/html/issues/11155
+  audio.onvolumechange = t.step_func(() => {
+    assert_equals(audio.error?.code, MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED,
+                  'error code');
+    audio.volume = 1;
+  });
+  await audio.watcher.wait_for(
+    ['volumechange', 'loadstart', 'error', 'volumechange']);
+}, 'urlRecord failure');
+
+let resource;
+promise_test(async t => {
+  resource = await MediaSourceUtil.fetchResourceOfManifest(
+    t,
+    '/media-source/webm/test-a-128k-44100Hz-1ch-manifest.json');
+}, 'fetch resource');
+
+async function create_audio_with_source_buffer(t) {
+  const audio = create_audio(t);
+
+  audio.source = new MediaSource();
+  audio.source.watcher = new EventWatcher(t, audio.source, ['sourceopen']);
+  audio.src = URL.createObjectURL(audio.source);
+  await audio.watcher.wait_for('loadstart');
+  await audio.source.watcher.wait_for('sourceopen');
+
+  assert_implements_optional(MediaSource.isTypeSupported(resource.type),
+                             `${resource.type} supported`);
+
+  audio.buffer = audio.source.addSourceBuffer(resource.type);
+  assert_equals(audio.buffer.mode, 'segments',
+                `${resource.type} buffer.mode`);
+  audio.buffer.watcher =
+    new EventWatcher(t, audio.buffer, ['updateend']);
+  return audio;
+}
+
+// While different browsers pass different HAVE_NOTHING subtests, the four
+// subtests are helpful to identify the different interactions.
+
+promise_test(async t => {
+  const audio = await create_audio_with_source_buffer(t);
+  assert_equals(audio.readyState, audio.HAVE_NOTHING, 'readyState');
+
+  // Queue a volumechange event on the media element task source to check that
+  // the event named 'error' is fired from the same task source.
+  audio.volume = 0;
+  audio.source.endOfStream("decode");
+  audio.volume = 1;
+  await audio.watcher.wait_for(['volumechange', 'error', 'volumechange']);
+}, 'error event while HAVE_NOTHING');
+
+// This subtest is arranged to demonstrate that the specification does not
+// describe what browsers do.  Please do not adjust implementations to make
+// this pass as https://github.com/whatwg/html/issues/11155 proposes changing
+// the spec.
+promise_test(async t => {
+  const audio = await create_audio_with_source_buffer(t);
+  assert_equals(audio.readyState, audio.HAVE_NOTHING, 'readyState');
+
+  // Queue a volumechange event on the media element task source
+  audio.volume = 0;
+  audio.source.endOfStream("decode");
+  // The dedicated media source failure steps are described as queued so state
+  // would not change until the task runs.
+  await audio.watcher.wait_for('volumechange');
+  assert_equals(audio.error, null, 'error attribute');
+  await audio.watcher.wait_for('error');
+  assert_equals(audio.error?.code, MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED,
+                'error code');
+}, 'error attribute while HAVE_NOTHING');
+
+// This subtest is arranged to demonstrate that the specification does not
+// describe what browsers do.  Please do not adjust implementations to make
+// this pass as https://github.com/whatwg/html/issues/11155 proposes changing
+// the spec.
+promise_test(async t => {
+  const audio = await create_audio_with_source_buffer(t);
+  assert_equals(audio.readyState, audio.HAVE_NOTHING, 'readyState');
+
+  const play_promise = audio.play();
+  await audio.watcher.wait_for('waiting');
+  assert_false(audio.paused, 'paused attribute');
+
+  // 'error event while HAVE_NOTHING' checks the order of events.
+  audio.watcher.stop_watching();
+
+  // Queue a volumechange event on the media element task source to see
+  // whether the play promise is rejected from a task on same task source.
+  audio.volume = 0;
+  audio.source.endOfStream("decode");
+  audio.volume = 1;
+  const sequence = [];
+  const events_promise = new Promise(resolve => {
+    audio.onvolumechange = t.step_func(() => {
+      sequence.push('volumechange');
+      if (sequence.filter(_ => _ == 'volumechange').length == 2) {
+        resolve();
+      }
+    });
+  });
+  try {
+    await play_promise;
+    assert_unreached('promise should reject');
+  } catch {
+    sequence.push('rejection');
+  }
+  await events_promise;
+  assert_array_equals(sequence, ['volumechange', 'rejection', 'volumechange'],
+                      'sequence');
+}, 'play() promise while HAVE_NOTHING');
+
+// This subtest is arranged to demonstrate inconsistencies between
+// implementations.  Please do not adjust implementations to make this pass as
+// https://github.com/whatwg/html/issues/11155 proposes changing the spec.
+promise_test(async t => {
+  const audio = await create_audio_with_source_buffer(t);
+  assert_equals(audio.readyState, audio.HAVE_NOTHING, 'readyState');
+
+  const play_promise = audio.play();
+  await audio.watcher.wait_for('waiting');
+  assert_false(audio.paused, 'paused attribute');
+
+  // 'error event while HAVE_NOTHING' checks the order of events.
+  audio.watcher.stop_watching();
+
+  // The resource selection algorithm describes the dedicated media source
+  // failure steps as queued and the event named "error" as fired
+  // synchronously from those steps.
+  // https://html.spec.whatwg.org/multipage/media.html#concept-media-load-algorithm
+  // That is not what browsers do, but, as described, the error event would
+  // arrive before the pending play promise rejection.
+  audio.source.endOfStream("decode");
+  const sequence = [];
+  const event_promise = new Promise(resolve => {
+    audio.onerror = t.step_func(() => {
+      sequence.push('event');
+      assert_equals(audio.error?.code, MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED,
+                    'error code on event');
+      resolve();
+    });
+  });
+  try {
+    await play_promise;
+    assert_unreached('promise should reject');
+  } catch {
+    sequence.push('rejection');
+  }
+  assert_equals(audio.error?.code, MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED,
+                'error code on rejection');
+  await event_promise;
+  assert_array_equals(sequence, ['event', 'rejection'], 'sequence');
+}, 'play() promise after error event while HAVE_NOTHING');
+
+promise_test(async t => {
+  const audio = await create_audio_with_source_buffer(t);
+  // Truncate at the end of the metadata.
+  audio.buffer.appendBuffer(
+    resource.data.subarray(0, resource.cluster_start[0]));
+  await Promise.all([
+    audio.watcher.wait_for('loadedmetadata'),
+    audio.buffer.watcher.wait_for('updateend'),
+  ]);
+  assert_equals(audio.readyState, audio.HAVE_METADATA, 'loadedmetadata');
+
+  const play_promise1 = audio.play();
+  await audio.watcher.wait_for('waiting');
+  assert_false(audio.paused, 'paused attribute');
+
+  let settled = 'NOT SETTLED';
+  play_promise1.catch(_ => _).then(_ => settled = _);
+
+  assert_equals(audio.error, null, 'error attribute');
+  // Trigger "If the media data is corrupted" in the media data processing
+  // steps list.
+  // https://html.spec.whatwg.org/multipage/media.html#media-data-processing-steps-list
+  audio.source.endOfStream("decode");
+  // The error event is described as firing synchronously during endOfStream(),
+  // but no browsers do this.  https://github.com/whatwg/html/issues/11155
+  await audio.watcher.wait_for('error');
+  // The error attribute should be set synchronously, but this checked late
+  // just for Blink.
+  assert_equals(audio.error?.code, MediaError.MEDIA_ERR_DECODE, 'error code');
+  // The end of stream algorithm does not change duration on error
+  // https://w3c.github.io/media-source/#dfn-end-of-stream
+  assert_equals(audio.duration, 2.023, 'duration');
+  // MEDIA_ERR_DECODE does not reject the pending play promise
+  // https://github.com/whatwg/html/issues/505#issuecomment-178046408
+  // because playback is sometimes possible after such errors,
+  // https://github.com/whatwg/html/pull/509#issuecomment-174967812
+  // as in the 'error after HAVE_FUTURE_DATA' subtest below.
+  // Trigger volumechange for media element task source tasks.
+  // Await 2 tasks to check that the play() promise is not about to be
+  // rejected.
+  // 2 is the number of tasks necessary to wait for the spurious promise
+  // rejection with Blink.
+  for (const i of Array(2).keys()) {
+    audio.volume = i % 2;
+    await audio.watcher.wait_for('volumechange');
+  }
+  assert_equals(settled, 'NOT SETTLED', 'play(() promise should not settle');
+
+  // Check that the promise is rejected when appropriate.
+  audio.pause();
+  const sequence = [];
+  const play_promise2 = new Promise(resolve => {
+    audio.onpause = () => {
+      sequence.push('pause');
+      if (sequence.filter(_ => _ == 'pause').length == 2) {
+        audio.onpause = null;
+        return;
+      }
+      resolve(audio.play());
+      audio.pause();
+    }
+  });
+  audio.onwaiting = () => {
+    sequence.push('waiting');
+  }
+  assert_true(audio.paused, 'paused attribute');
+  await Promise.all([
+    audio.watcher.wait_for(['pause', 'waiting', 'pause']),
+    play_promise1.catch(() => sequence.push('promise1')),
+    play_promise2.catch(() => sequence.push('promise2')),
+  ]);
+  assert_array_equals(sequence,
+                      ['pause', 'promise1', 'waiting', 'pause', 'promise2'],
+                      'sequence');
+  promise_rejects_dom(
+    t, 'AbortError', play_promise1, 'play promise rejection');
+}, 'error event while HAVE_METADATA');
+
+async function create_audio_with_full_resource(t) {
+  const audio = await create_audio_with_source_buffer(t);
+  // Just to reduce sound impacts
+  audio.volume = 0;
+  audio.buffer.appendBuffer(resource.data);
+  await Promise.all([
+    audio.watcher.wait_for(['volumechange', 'loadedmetadata', 'canplay']),
+    audio.buffer.watcher.wait_for('updateend'),
+  ]);
+  assert_greater_than(audio.readyState, audio.HAVE_CURRENT_DATA,
+                      'readyState');
+
+  assert_equals(audio.error, null, 'error attribute');
+  return audio;
+}
+
+promise_test(async t => {
+  const audio = await create_audio_with_full_resource(t);
+  audio.source.endOfStream("decode");
+  // The error event is specified to fire synchronously during endOfStream(),
+  // but no browsers do this.  https://github.com/whatwg/html/issues/11155
+  await audio.watcher.wait_for('error');
+  // The error attribute should be set synchronously, but this is checked late
+  // just for Blink.  It is checked synchronously in the 'error attribute
+  // after DECODE_ERROR' subtest below.
+  assert_equals(audio.error?.code, MediaError.MEDIA_ERR_DECODE, 'error code');
+
+  const sequence = [];
+  const play_promise1 = audio.play().then(() => sequence.push('promise1'));
+  const play_promise2 = new Promise(resolve => {
+    audio.onplaying = () => {
+      sequence.push('event');
+      resolve(audio.play().then(() => sequence.push('promise2')));
+    };
+  });
+  assert_false(audio.paused, 'paused attribute');
+  await Promise.all([
+    audio.watcher.wait_for('playing'),
+    play_promise1,
+    play_promise2,
+  ]);
+  assert_array_equals(sequence, ['event', 'promise1', 'promise2'], 'sequence');
+}, 'error event after HAVE_FUTURE_DATA');
+
+// This subtest could be merged into 'error event after HAVE_FUTURE_DATA' and
+// 'error event while HAVE_METADATA' if/when Blink conforms with the synchronous
+// attribute change.
+promise_test(async t => {
+  const audio = await create_audio_with_full_resource(t);
+  audio.source.endOfStream("decode");
+  // The error attribute is set synchronously.
+  assert_equals(audio.error?.code, MediaError.MEDIA_ERR_DECODE, 'error code');
+}, 'error attribute after DECODE_ERROR');
+</script>
+</html>
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/imagedata.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/imagedata.html
index e124f8ff6ea..123654a528a 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/imagedata.html
+++ b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/imagedata.html
@@ -42,12 +42,6 @@ test(function() {
     });
 }, "ImageData(buffer, w, h), buffer.length == 4 * w * h must be true");
 
-test(function() {
-    assert_throws_js(TypeError, function() {
-        new ImageData(new Int8Array(1), 1);
-    });
-}, "ImageData(buffer, w, opt h), Uint8ClampedArray argument type check");
-
 test(function() {
     var imageData = new ImageData(new Uint8ClampedArray(24), 2);
     assert_equals(imageData.width, 2);
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-hit-test-during-load-event-crash.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-hit-test-during-load-event-crash.html
new file mode 100644
index 00000000000..f668fc51573
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-hit-test-during-load-event-crash.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<div style="visibility: hidden;">
+  <iframe id="iframe"></iframe>
+</div>
+<script>
+  window.addEventListener("load", _ =>
+    iframe.contentDocument.elementFromPoint(0, 0)
+  );
+</script>
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-img-element/responsive-image-select-print-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/responsive-image-select-print-ref.html
index 7189a576427..e6d50908706 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-img-element/responsive-image-select-print-ref.html
+++ b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/responsive-image-select-print-ref.html
@@ -1,4 +1,9 @@
 <!DOCTYPE html>
+<style>
+  :root {
+    print-color-adjust: exact;
+  }
+</style>
 <body>
   <div style="width: 200px; height: 200px; background-color: green;"></div>
 </body>
diff --git a/tests/wpt/tests/html/semantics/forms/constraints/radio-group-valueMissing.html b/tests/wpt/tests/html/semantics/forms/constraints/radio-group-valueMissing.html
new file mode 100644
index 00000000000..5f14c0b82e1
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/constraints/radio-group-valueMissing.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>
+  The constraint validation API Test: element.validity.valueMissing for radio
+  group
+</title>
+<link rel="author" title="Emmanuel Elom" href="mailto:elomemmanuel007@gmail.com">
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/#dom-validitystate-valuemissing"
+/>
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/#the-constraint-validation-api"
+/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/validator.js"></script>
+<div id="log"></div>
+
+<input type="radio" id="first" required name="group" />
+<input type="radio" id="second" checked name="group" />
+<input type="radio" id="third" required name="group1" />
+<input type="radio" id="fourth" name="group1" />
+
+<script>
+  const first = document.getElementById("first");
+  const second = document.getElementById("second");
+  const third = document.getElementById("third");
+  const fourth = document.getElementById("fourth");
+
+  test(() => {
+    assert_equals(first.validity.valueMissing, false);
+    assert_equals(second.validity.valueMissing, false);
+    second.remove();
+    assert_equals(first.validity.valueMissing, true);
+  }, "valueMissing is true for all group members when checked group member is removed");
+
+  test(() => {
+    assert_equals(third.validity.valueMissing, true);
+    assert_equals(fourth.validity.valueMissing, true);
+    fourth.click();
+    assert_equals(third.validity.valueMissing, false);
+    assert_equals(fourth.validity.valueMissing, false);
+  }, "valueMissing is false for all group members when any group member is checked");
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-form-element/form-controls-id-removal-crash.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-controls-id-removal-crash.html
new file mode 100644
index 00000000000..2b1ef87774f
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-form-element/form-controls-id-removal-crash.html
@@ -0,0 +1,29 @@
+<script>
+document.addEventListener("DOMContentLoaded" , () => {
+  c.beginElement()
+  document.onselectstart = fuzz_01
+  document.execCommand("selectAll", false, null)
+})
+function fuzz_01() {
+  document.execCommand("underline", false, null)
+  c.onend = fuzz_01
+  document.designMode = "on"
+}
+function fuzz_02() {
+  d.insertAdjacentElement("beforebegin", b)
+  a.appendChild(c)
+  h.clientTop
+  b.insertAdjacentHTML("afterend", f.innerHTML)
+}
+</script>
+<svg>
+<path id="a">
+<polygon id="b">
+<set id="c" onbegin="fuzz_02()" max="2s">
+<strong>
+<style id="d">
+</style>
+</strong>
+<time id="f">
+<form id="g">
+<output id="h" form="g">
diff --git a/tests/wpt/tests/html/semantics/forms/the-input-element/date-time-with-trusted-types-ref.html b/tests/wpt/tests/html/semantics/forms/the-input-element/date-time-with-trusted-types-ref.html
new file mode 100644
index 00000000000..8cea76c7f0e
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-input-element/date-time-with-trusted-types-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<body>
+<input type="date"><br>
+<input type="month"><br>
+<input type="week"><br>
+<input type="time"><br>
+<input type="datetime-local"><br>
+</body>
+</html>
diff --git a/tests/wpt/tests/html/semantics/forms/the-input-element/date-time-with-trusted-types.html b/tests/wpt/tests/html/semantics/forms/the-input-element/date-time-with-trusted-types.html
new file mode 100644
index 00000000000..d510225bce5
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-input-element/date-time-with-trusted-types.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="match" href="date-time-with-trusted-types-ref.html">
+<meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'">
+</head>
+<body>
+<input type="date"><br>
+<input type="month"><br>
+<input type="week"><br>
+<input type="time"><br>
+<input type="datetime-local"><br>
+</body>
+</html>
diff --git a/tests/wpt/tests/html/semantics/forms/the-input-element/radio-input-cancel.html b/tests/wpt/tests/html/semantics/forms/the-input-element/radio-input-cancel.html
index fc2796b0415..bccd70cac30 100644
--- a/tests/wpt/tests/html/semantics/forms/the-input-element/radio-input-cancel.html
+++ b/tests/wpt/tests/html/semantics/forms/the-input-element/radio-input-cancel.html
@@ -38,4 +38,42 @@ test(() => {
   assert_array_equals(events, ["click"]);
 
 }, "radio input cancel behavior reverts state");
+
+test(() => {
+  const form = document.createElement("form");
+  form.innerHTML = `
+    <input id="radio1" type="radio" name="radiogroup" checked>
+    <input id="radio2" type="radio" name="radiogroup">
+  `;
+  document.body.appendChild(form);
+
+  const inputs = form.querySelectorAll("input[type=radio]");
+  const events = [];
+
+  inputs.forEach(input => {
+    input.addEventListener("change", () => {
+      events.push(`${input.id} change`);
+    });
+    input.addEventListener("click", e => {
+      // cancel click event
+      e.preventDefault();
+      events.push(`${input.id} click`);
+    });
+    input.addEventListener("input", () => {
+      events.push(`${input.id} input`);
+    });
+  });
+
+  assert_true(inputs[0].checked);
+  assert_false(inputs[1].checked);
+
+  inputs[1].click();
+
+  assert_true(inputs[0].checked);
+  assert_false(inputs[1].checked);
+
+  // only click event called
+  assert_array_equals(events, ["radio2 click"]);
+
+}, "radio input cancel behavior reverts previous selected radio input state");
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-appearance-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-appearance-ref.html
new file mode 100644
index 00000000000..57ea51e367c
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-appearance-ref.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-in-page.css">
+<link rel=stylesheet href="../customizable-select/resources/customizable-select-styles.css">
+<script src="resources/customizable-select-in-page.js"></script>
+
+<div class=customizable-select-in-page size=4>
+  <div class="customizable-select-option selected">select multiple</div>
+  <div class=customizable-select-option>two</div>
+  <div class=customizable-select-option>three</div>
+</div>
+
+<div class=customizable-select-in-page size=4>
+  <div class="customizable-select-option selected">select size=4</div>
+  <div class=customizable-select-option>two</div>
+  <div class=customizable-select-option>three</div>
+</div>
+
+<div class="customizable-select-in-page disabled" size=4>
+  <div class="customizable-select-option selected">select disabled</div>
+  <div class=customizable-select-option>two</div>
+  <div class=customizable-select-option>three</div>
+  <div class=customizable-select-option>disabled</div>
+</div>
+
+<!-- TODO(crbug.com/407801061): Fix padding and remove this div. -->
+<div style="position: absolute; top: 150px">
+
+<div class=customizable-select-in-page size=4>
+  <div class="customizable-select-option selected">with disabled option</div>
+  <div class=customizable-select-option>two</div>
+  <div class=customizable-select-option>three</div>
+  <div class="customizable-select-option disabled">disabled</div>
+</div>
+
+<div class=customizable-select-in-page size=4>
+  <div class=customizable-select-legend>optgroup</div>
+  <div class=customizable-select-option>option in optgroup</div>
+  <div class=customizable-select-option>option out of optgroup</div>
+</div>
+
+<div class=customizable-select-in-page size=4>
+  <div class="customizable-select-legend disabled">disabled optgroup</div>
+  <div class="customizable-select-option disabled">option in optgroup</div>
+  <div class=customizable-select-option>option out of optgroup</div>
+</div>
+
+<script>
+updateCustomizableSelectInPageSize();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-appearance.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-appearance.tentative.html
new file mode 100644
index 00000000000..b3bf75eb0ff
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-appearance.tentative.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://issues.chromium.org/issues/357649033">
+<link rel=match href="customizable-select-in-page-appearance-ref.html">
+
+<style>
+select {
+  appearance: base-select;
+}
+</style>
+
+<select multiple>
+  <option selected>select multiple</option>
+  <option>two</option>
+  <option>three</option>
+</select>
+
+<select size=4>
+  <option selected>select size=4</option>
+  <option>two</option>
+  <option>three</option>
+</select>
+
+<select size=4 disabled>
+  <option selected>select disabled</option>
+  <option>two</option>
+  <option>three</option>
+  <option disabled>disabled</option>
+</select>
+
+<!-- TODO(crbug.com/407801061): Fix padding and remove this div. -->
+<div style="position: absolute; top: 150px">
+
+<select size=4>
+  <option selected>with disabled option</option>
+  <option>two</option>
+  <option>three</option>
+  <option disabled>disabled</option>
+</select>
+
+<select size=4>
+  <optgroup>
+    <legend>optgroup</legend>
+    <option>option in optgroup</option>
+  </optgroup>
+  <option>option out of optgroup</option>
+</select>
+
+<select size=4>
+  <optgroup disabled>
+    <legend>disabled optgroup</legend>
+    <option>option in optgroup</option>
+  </optgroup>
+  <option>option out of optgroup</option>
+</select>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-keyboard-behavior.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-keyboard-behavior.tentative.html
new file mode 100644
index 00000000000..7040105c096
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-keyboard-behavior.tentative.html
@@ -0,0 +1,213 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://issues.chromium.org/issues/357649033">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+
+<style>
+select {
+  appearance: base-select;
+}
+</style>
+
+<button id=beforemultiple>button before multiple</button>
+<select multiple>
+  <option class=one>one</option>
+  <option class=two>two</option>
+  <option class=disabled disabled>disabled</option>
+</select>
+
+<button id=beforesize>button before size=4</button>
+<select size=4>
+  <option class=one>one</option>
+  <option class=two>two</option>
+  <option class=disabled disabled>disabled</option>
+</select>
+
+<button id=aftersize>button after size=4</button>
+
+<select multiple disabled>
+  <option>one</option>
+  <option>two</option>
+</select>
+
+<button id=afterdisabled>button after select disabled</button>
+
+<script>
+const tabKey = '\uE004';
+const enterKey = '\uE007';
+const spaceKey = '\uE00D';
+const arrowUp = '\uE013';
+const arrowDown = '\uE015';
+function pressKey(keyCode) {
+  return (new test_driver.Actions()
+    .keyDown(keyCode)
+    .keyUp(keyCode))
+    .send();
+}
+
+promise_test(async () => {
+  const select = document.querySelector('select[multiple]');
+  const optionOne = select.querySelector('.one');
+  const optionTwo = select.querySelector('.two');
+  assert_equals(select.selectedOptions.length, 0,
+    'No options should be selected at the start of the test.');
+
+  beforemultiple.focus();
+  await pressKey(tabKey);
+  assert_equals(document.activeElement, optionOne,
+    'The first option should get focus when keyboard focusing into a select.');
+
+  await pressKey(spaceKey);
+  assert_equals(document.activeElement, optionOne,
+    'Focus should not be moved after pressing space.');
+  assert_equals(select.selectedOptions.length, 1,
+    'One option should be selected after the first space.');
+  assert_equals(select.selectedOptions[0], optionOne,
+    'First option should be selected after the first space.');
+
+  await pressKey(arrowDown);
+  assert_equals(document.activeElement, optionTwo,
+    'Second option should be focused after arrow down.');
+
+  await pressKey(arrowDown);
+  assert_equals(document.activeElement, optionTwo,
+    'Disabled option should not be focusable.');
+
+  await pressKey(spaceKey);
+  assert_equals(document.activeElement, optionTwo,
+    'Second option should be focused after second space.');
+  assert_equals(select.selectedOptions.length, 2,
+    'Two options should be selected after second space.');
+  assert_equals(select.selectedOptions[0], optionOne,
+    'First option should stay selected after second space.');
+  assert_equals(select.selectedOptions[1], optionTwo,
+    'Second option should be selected after second space.');
+
+  await pressKey(spaceKey);
+  assert_equals(document.activeElement, optionTwo,
+    'Second option should be focused after third space.');
+  assert_equals(select.selectedOptions.length, 1,
+    'One option should be selected after third space.');
+  assert_equals(select.selectedOptions[0], optionOne,
+    'First option should stay selected after third space.');
+
+  await pressKey(enterKey);
+  assert_equals(document.activeElement, optionTwo,
+    'Second option should be focused after first enter.');
+  assert_equals(select.selectedOptions.length, 2,
+    'Two options should be selected after first enter.');
+  assert_equals(select.selectedOptions[0], optionOne,
+    'First option should stay selected after first enter.');
+  assert_equals(select.selectedOptions[1], optionTwo,
+    'Second option should be selected after first enter.');
+
+  await pressKey(enterKey);
+  assert_equals(document.activeElement, optionTwo,
+    'Second option should be focused after second enter.');
+  assert_equals(select.selectedOptions.length, 1,
+    'One option should be selected after second enter.');
+  assert_equals(select.selectedOptions[0], optionOne,
+    'First option should stay selected after second enter.');
+
+  await pressKey(arrowUp);
+  assert_equals(document.activeElement, optionOne,
+    'First option should be focused after arrow up.');
+  assert_equals(select.selectedOptions.length, 1,
+    'One option should be selected after arrow up.');
+  assert_equals(select.selectedOptions[0], optionOne,
+    'First option should stay selected after arrow up.');
+
+  await pressKey(tabKey);
+  assert_equals(document.activeElement, beforesize,
+    'Pressing tab key should focus the next element after <select>.');
+}, 'Keyboard behavior for base appearance <select multiple>');
+
+promise_test(async () => {
+  const select = document.querySelector('select[size]');
+  const optionOne = select.querySelector('.one');
+  const optionTwo = select.querySelector('.two');
+  assert_equals(select.selectedOptions.length, 0,
+    'No options should be selected at the start of the test.');
+
+  beforesize.focus();
+  await pressKey(tabKey);
+  assert_equals(document.activeElement, optionOne,
+    'The first option should get focus when keyboard focusing into a select.');
+
+  await pressKey(spaceKey);
+  assert_equals(document.activeElement, optionOne,
+    'Focus should not be moved after pressing space.');
+  assert_equals(select.selectedOptions.length, 1,
+    'One option should be selected after the first space.');
+  assert_equals(select.selectedOptions[0], optionOne,
+    'First option should be selected after the first space.');
+
+  await pressKey(arrowDown);
+  assert_equals(document.activeElement, optionTwo,
+    'Second option should be focused after arrow down.');
+
+  await pressKey(arrowDown);
+  assert_equals(document.activeElement, optionTwo,
+    'Disabled option should not be focusable.');
+
+  await pressKey(spaceKey);
+  assert_equals(document.activeElement, optionTwo,
+    'Second option should be focused after second space.');
+  assert_equals(select.selectedOptions.length, 1,
+    'One options should be selected after second space.');
+  assert_equals(select.selectedOptions[0], optionTwo,
+    'Second option should be selected after second space.');
+
+  await pressKey(spaceKey);
+  assert_equals(document.activeElement, optionTwo,
+    'Second option should be focused after third space.');
+  assert_equals(select.selectedOptions.length, 0,
+    'No options should be selected after third space.');
+
+  await pressKey(enterKey);
+  assert_equals(document.activeElement, optionTwo,
+    'Second option should be focused after first enter.');
+  assert_equals(select.selectedOptions.length, 1,
+    'One option should be selected after first enter.');
+  assert_equals(select.selectedOptions[0], optionTwo,
+    'Second option should be selected after first enter.');
+
+  await pressKey(enterKey);
+  assert_equals(document.activeElement, optionTwo,
+    'Second option should be focused after second enter.');
+  assert_equals(select.selectedOptions.length, 0,
+    'No options should be selected after second enter.');
+
+  await pressKey(arrowUp);
+  assert_equals(document.activeElement, optionOne,
+    'First option should be focused after arrow up.');
+  assert_equals(select.selectedOptions.length, 0,
+    'No options should be selected after arrow up.');
+
+  await pressKey(tabKey);
+  assert_equals(document.activeElement, aftersize,
+    'Pressing tab should focus the next element after <select>.');
+
+  await pressKey(tabKey);
+  assert_equals(document.activeElement, afterdisabled,
+    'Pressing tab key should skip over <select disabled>.');
+}, 'Keyboard behavior for base appearance <select size=4>');
+
+promise_test(async () => {
+  document.body.focus();
+
+  const selectMultiple = document.querySelector('select[multiple]');
+  selectMultiple.focus();
+  assert_not_equals(document.activeElement, selectMultiple, '<select multiple>');
+
+  const selectSize = document.querySelector('select[size]');
+  selectSize.focus();
+  assert_not_equals(document.activeElement, selectSize, '<select size=4>');
+}, 'Base appearance in-page selects should not be focusable.');
+
+// TODO(crbug.com/357649033): Test tab key while focused on an option after deciding behavior.
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-mouse-behavior.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-mouse-behavior.tentative.html
new file mode 100644
index 00000000000..d5b93693cf7
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/customizable-select-in-page-mouse-behavior.tentative.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://issues.chromium.org/issues/357649033">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+
+<style>
+select {
+  appearance: base-select;
+}
+</style>
+
+<select multiple>
+  <option class=one>one</option>
+  <option class=two>two</option>
+  <option class=disabled disabled>disabled</option>
+</select>
+
+<select size=4>
+  <option class=one>one</option>
+  <option class=two>two</option>
+  <option class=disabled disabled>disabled</option>
+</select>
+
+<script>
+function click(element) {
+  return (new test_driver.Actions()
+    .pointerMove(1, 1, {origin: element})
+    .pointerDown()
+    .pointerUp())
+    .send();
+}
+
+function touch(element) {
+  return (new test_driver.Actions()
+    .addPointer('finger', 'touch')
+    .pointerMove(1, 1, {origin: element, sourceName: 'finger'})
+    .pointerDown({sourceName: 'finger'})
+    .pointerUp({sourceName: 'finger'}))
+    .send();
+}
+
+['mouse', 'touch'].forEach(inputType => {
+  const activate = inputType == 'touch' ? touch : click;
+
+  promise_test(async () => {
+    const select = document.querySelector('select[multiple]');
+    select.value = null;
+    select.removeAttribute('disabled');
+    const optionOne = select.querySelector('.one');
+    const optionTwo = select.querySelector('.two');
+    const disabledOption = select.querySelector('.disabled');
+    assert_equals(select.selectedOptions.length, 0,
+      'No options should be selected at the start of the test.');
+
+    await activate(optionOne);
+    assert_equals(select.selectedOptions.length, 1,
+      'There should be one selected option after first click.');
+    assert_equals(select.selectedOptions[0], optionOne,
+      'Option one should be selected after first click.');
+
+    await activate(optionTwo);
+    assert_equals(select.selectedOptions.length, 2,
+      'There should be two selected options after second click.');
+    assert_equals(select.selectedOptions[0], optionOne,
+      'Option one should stay selected after second click.');
+    assert_equals(select.selectedOptions[1], optionTwo,
+      'Option two should be seleted after second click.');
+
+    await activate(optionTwo);
+    assert_equals(select.selectedOptions.length, 1,
+      'There should be one selected option after third click.');
+    assert_equals(select.selectedOptions[0], optionOne,
+      'Option one should stay selected after third click.');
+
+    await activate(disabledOption);
+    assert_equals(select.selectedOptions.length, 1,
+      'Disabled option should not be checkable.');
+    assert_equals(select.selectedOptions[0], optionOne,
+      'Disabled option should not be checkable.');
+
+    select.setAttribute('disabled', '');
+    await activate(optionTwo);
+    assert_equals(select.selectedOptions.length, 1,
+      'Disabled select should not have checkable options.');
+    assert_equals(select.selectedOptions[0], optionOne,
+      'Disabled select should not have checkable options.');
+  }, `${inputType}: input behavior for base appearance <select multiple>`);
+
+  promise_test(async () => {
+    const select = document.querySelector('select[size]');
+    select.value = null;
+    select.removeAttribute('disabled');
+    const optionOne = select.querySelector('.one');
+    const optionTwo = select.querySelector('.two');
+    const disabledOption = select.querySelector('.disabled');
+    assert_equals(select.selectedOptions.length, 0,
+      'No options should be selected at the start of the test.');
+
+    await activate(optionOne);
+    assert_equals(select.selectedOptions.length, 1,
+      'There should be one selected option after first click.');
+    assert_equals(select.selectedOptions[0], optionOne,
+      'Option one should be selected after first click.');
+
+    await activate(optionTwo);
+    assert_equals(select.selectedOptions.length, 1,
+      'There should be one selected option after second click.');
+    assert_equals(select.selectedOptions[0], optionTwo,
+      'Option two should be selected after second click.');
+
+    await activate(optionTwo);
+    assert_equals(select.selectedOptions.length, 0,
+      'There should be no selected options after third click.');
+
+    await activate(disabledOption);
+    assert_equals(select.selectedOptions.length, 0,
+      'Disabled option should not be checkable.');
+
+    select.setAttribute('disabled', '');
+    await activate(optionTwo);
+    assert_equals(select.selectedOptions.length, 0,
+      'Disabled select should not have checkable options.');
+  }, `${inputType}: input behavior for base appearance <select size=4>`);
+});
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/resources/customizable-select-in-page.css b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/resources/customizable-select-in-page.css
new file mode 100644
index 00000000000..deb080b4756
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/resources/customizable-select-in-page.css
@@ -0,0 +1,14 @@
+.customizable-select-in-page {
+  display: inline-block;
+  border: 1px solid;
+  overflow-inline: hidden;
+  overflow-block: scroll;
+}
+
+.customizable-select-in-page.disabled {
+  color: color-mix(in lab, currentColor 50%, transparent);
+}
+
+.customizable-select-in-page:not(.disabled) .customizable-select-legend.disabled {
+  color: color-mix(in lab, currentColor 50%, transparent);
+}
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/resources/customizable-select-in-page.js b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/resources/customizable-select-in-page.js
new file mode 100644
index 00000000000..13230943321
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select-in-page/resources/customizable-select-in-page.js
@@ -0,0 +1,13 @@
+function updateCustomizableSelectInPageSize() {
+  document.querySelectorAll('.customizable-select-in-page').forEach(select => {
+    const size = Number(select.getAttribute('size'));
+    if (size) {
+      let optionHeight = 0;
+      select.querySelectorAll('.customizable-select-option').forEach(option => {
+        const rect = option.getBoundingClientRect();
+        optionHeight = Math.max(optionHeight, rect.height);
+      });
+      select.style.height = (optionHeight * size) + 'px';
+    }
+  });
+}
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/option-color-inheritance.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/option-color-inheritance.html
new file mode 100644
index 00000000000..d96124d008c
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/option-color-inheritance.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://issues.chromium.org/issues/404464591">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<select>
+  <option>option</option>
+</select>
+<style>
+select {
+  color: rgb(12, 34, 56);
+}
+</style>
+
+<script>
+test(() => {
+  const style = getComputedStyle(document.querySelector('option'));
+  assert_equals(style.color, 'rgb(12, 34, 56)', 'color');
+}, 'option elements should inherit color from their parent select element.');
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/option-computed-style.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/option-computed-style.tentative.html
deleted file mode 100644
index ba2861a5c61..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/option-computed-style.tentative.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<link rel=author href="mailto:jarhar@chromium.org">
-<link rel=help href="https://github.com/openui/open-ui/issues/863#issuecomment-1769004174">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<select style="appearance:base-select">
-  <option>option</option>
-</select>
-
-<script>
-test(() => {
-  assert_equals(
-    getComputedStyle(document.querySelector('option'), '::checkmark').content,
-    `"\u2713" / ""`);
-}, 'appearance:base-select options should have a checkmark with empty alt text.');
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/customizable-select-styles.css b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/customizable-select-styles.css
index 13a500a6197..acf84493d5c 100644
--- a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/customizable-select-styles.css
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/customizable-select-styles.css
@@ -70,8 +70,10 @@
   /* min-size rules ensure that we meet accessibility guidelines for minimum target size.
    * https://github.com/openui/open-ui/issues/1026
    * https://www.w3.org/WAI/WCAG22/Understanding/target-size-minimum.html */
-  min-inline-size: 24px;
-  min-block-size: max(24px, 1lh);
+  min-inline-size: 24px; /* fallback for lack of calc-size() support */
+  min-inline-size: calc-size(auto, max(size, 24px));
+  min-block-size: max(24px, 1lh); /* fallback for lack of calc-size() support */
+  min-block-size: calc-size(auto, max(size, 24px, 1lh));
 }
 
 .customizable-select-button.disabled {
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-sizing-in-flex-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-sizing-in-flex-ref.html
new file mode 100644
index 00000000000..66b27ea686e
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-sizing-in-flex-ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<title>Test of sizing customizable select inside of flex</title>
+<link rel=author href="mailto:dbaron@chromium.org">
+
+<style>
+  .container > * {
+    display: inline-block;
+    vertical-align: top;
+    white-space: nowrap;
+  }
+
+  select {
+    appearance: base-select;
+  }
+</style>
+
+<div class="container">
+  <select>
+    <option>First Option</option>
+    <option>Second Option</option>
+  </select
+  ><div class="after">The content after the select.</div>
+</div>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-sizing-in-flex.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-sizing-in-flex.tentative.html
new file mode 100644
index 00000000000..563cf72b5f3
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-sizing-in-flex.tentative.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<title>Test of sizing customizable select inside of flex</title>
+<link rel=author href="mailto:dbaron@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=help href="https://github.com/w3c/csswg-drafts/issues/12085">
+<link rel=match href="select-appearance-sizing-in-flex-ref.html">
+<meta name="assert" content="The min-content size of a customizable select is a function of its content.">
+
+<style>
+  .container {
+    display: inline-flex;
+    width: 15em;
+  }
+
+  select {
+    appearance: base-select;
+  }
+
+  select, .after {
+    white-space: nowrap;
+  }
+</style>
+
+<div class="container">
+  <select>
+    <option>First Option</option>
+    <option>Second Option</option>
+  </select>
+  <div class="after">The content after the select.</div>
+</div>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-input-keyboard-behavior.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-input-keyboard-behavior.tentative.html
new file mode 100644
index 00000000000..bf3fbab9d18
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-input-keyboard-behavior.tentative.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://issues.chromium.org/issues/402429384">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+
+<style>
+select, ::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <div id=inputwrapper></div>
+  <option class=one>one</option>
+  <option class=two>two</option>
+</select>
+
+<script>
+const select = document.querySelector('select');
+const optionOne = select.querySelector('option.one');
+const optionTwo = select.querySelector('option.two');
+const input = document.createElement('input');
+document.getElementById('inputwrapper').appendChild(input);
+
+function pressKey(key) {
+  return (new test_driver.Actions()
+    .keyDown(key)
+    .keyUp(key))
+    .send();
+}
+const spaceKey = '\uE00D';
+const arrowDown = '\uE015';
+const arrowUp = '\uE013';
+
+promise_test(async () => {
+  assert_equals(getComputedStyle(select).appearance, 'base-select',
+    'appearance: base-select must be supported for this test to run.');
+
+  select.focus();
+  await pressKey(spaceKey);
+  assert_true(select.matches(':open'),
+    'select should be open after pressing space.');
+  assert_equals(document.activeElement, input,
+    'input should be focused after opening select.');
+
+  await pressKey(arrowDown);
+  assert_equals(document.activeElement, optionOne,
+    'first option should be focused after arrow down from input.');
+
+  await pressKey(arrowUp);
+  assert_equals(document.activeElement, input,
+    'input should be focused after arrow up from first option.');
+}, 'Keyboard behavior of <input> in <select>.');
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-iterate-before-beginning.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-iterate-before-beginning.tentative.html
index 5ccaa111499..0e8c16f8fda 100644
--- a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-iterate-before-beginning.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-iterate-before-beginning.tentative.html
@@ -12,18 +12,26 @@ select, ::picker(select) {
 }
 </style>
 
-<select>
+<select id=s1>
   <button>button</button>
   <option class=one>one</option>
   <option>two</option>
 </select>
 
-<script>
-promise_test(async () => {
-  const select = document.querySelector('select');
-  const firstOption = document.querySelector('option.one');
-  const arrowUp = '\uE013';
+<select id=s2>
+  <option class=one>one</option>
+  <hr>
+  <optgroup></optgroup>
+  <option class=two>two</option>
+</select>
 
+<script>
+const arrowUp = '\uE013';
+const arrowDown = '\uE015';
+
+promise_test(async () => {
+  const select = document.getElementById('s1');
+  const firstOption = select.querySelector('option.one');
   assert_equals(getComputedStyle(select).appearance, 'base-select',
     'appearance:base-select must be supported in order to run this test.');
 
@@ -38,5 +46,37 @@ promise_test(async () => {
     assert_equals(document.activeElement, firstOption,
       'The first option should remain focused after pressing ArrowUp.');
   }
+
+  // close select for the next test
+  await test_driver.click(select);
+  assert_false(select.matches(':open'),
+    'select should be closed at the end of the test.');
 }, 'Attempting to focus the previous option while focused on the first option should not crash.');
+
+promise_test(async () => {
+  const select = document.getElementById('s2');
+  const firstOption = select.querySelector('option.one');
+  const secondOption = select.querySelector('option.two');
+  assert_equals(getComputedStyle(select).appearance, 'base-select',
+    'appearance:base-select must be supported in order to run this test.');
+
+  await test_driver.click(select);
+  assert_true(select.matches(':open'),
+    'select should open after clicking it.');
+
+  assert_equals(document.activeElement, firstOption,
+    'first option should be focused after opening select.');
+
+  await test_driver.send_keys(document.activeElement, arrowDown);
+  assert_equals(document.activeElement, secondOption,
+    'second option should be focused after arrow down.');
+
+  await test_driver.send_keys(document.activeElement, arrowUp);
+  assert_equals(document.activeElement, firstOption,
+    'first option should be focused after arrow up.');
+
+  await test_driver.click(select);
+  assert_false(select.matches(':open'),
+    'select should be closed at the end of the test.');
+}, 'Keyboard navigating backwards over an <hr> and <optgroup> should not crash.');
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance-ref.html
deleted file mode 100644
index 45a74da7559..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance-ref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<select multiple>
-  <option>one</option>
-  <option>two div button</option>
-</select>
-
-<select multiple size=2>
-  <option>one</option>
-  <option>two</option>
-  <option>three</option>
-  <option>four</option>
-</select>
-
-<select multiple>
-  <option selected>option</option>
-</select>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance.html
deleted file mode 100644
index 48673b446bc..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html class=reftest-wait>
-<link rel=author href="mailto:jarhar@chromium.org">
-<link rel=match href="select-multiple-base-appearance-ref.html">
-
-<style>
-select, ::picker(select) {
-  appearance: base-select;
-}
-</style>
-
-<select multiple>
-  <option>one</option>
-  <option>
-    two
-    <div>div</div>
-    <button>button</button>
-  </option>
-</select>
-
-<select multiple size=2>
-  <option>one</option>
-  <option>two</option>
-  <option>three</option>
-  <option>four</option>
-</select>
-
-<select id=needsmultiple>
-  <option selected>option</option>
-</select>
-
-<script>
-requestAnimationFrame(() => {
-  document.getElementById('needsmultiple').setAttribute('multiple', '');
-  requestAnimationFrame(() => {
-    document.documentElement.classList.remove('reftest-wait');
-  });
-});
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html
index cc6596b42fe..0c6972bcab5 100644
--- a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-parsing.tentative.html
@@ -96,6 +96,14 @@
     <textarea></textarea>
 </select>
 
+<select class=test
+    data-description='Input tags should parse inside select if nested in another tag'
+    data-expect='<div><input></div>'>
+  <div>
+    <input>
+  </div>
+</select>
+
 <div id=afterlast>
   keep this div after the last test case
 </div>
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-closedby-bounds-clicking.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-closedby-bounds-clicking.html
new file mode 100644
index 00000000000..584d4b30644
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-closedby-bounds-clicking.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<meta name="timeout" content="long">
+<link rel="author" href="mailto:wpt@keithcirkel.co.uk">
+<link rel=help href="https://html.spec.whatwg.org/multipage/interactive-elements.html#dialog-light-dismiss">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<dialog id="dialog">
+  <div id="box"></div>
+</dialog>
+
+<style>
+  dialog { inset: 0 auto auto 0; width: 100px; height: 100px; overflow: visible; }
+  #box { height:200px; width:200px; margin:20px; background:blue; }
+</style>
+
+<script>
+for (const method of ['show', 'showModal']) {
+  promise_test(async (t) => {
+    dialog.setAttribute('closedby','any');
+    dialog[method]();
+    const actions = new test_driver.Actions();
+    await actions.pointerMove(1, 1, {origin:"viewport"})
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_true(dialog.open, "Dialog should be open after clicking 1px-1px");
+  },`Dialog ${method} will not light dismiss if clicked inside of the dialog bounds`);
+
+  promise_test(async (t) => {
+    dialog.setAttribute('closedby','any');
+    dialog[method]();
+    const actions = new test_driver.Actions();
+    await actions.pointerMove(99, 99, {origin:"viewport"})
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_true(dialog.open, "Dialog should be open after clicking 99px-99px");
+  },`Dialog ${method} will not light dismiss if clicked inside of the dialog bounds (bottom right)`);
+
+  promise_test(async (t) => {
+    dialog.setAttribute('closedby','any');
+    dialog[method]();
+    const actions = new test_driver.Actions();
+    await actions.pointerMove(150, 150, {origin:"viewport"})
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_true(dialog.open, "Dialog should be open after clicking 150px-150px");
+  },`Dialog ${method} will not light dismiss if clicked inside the overflowing div bounds (center)`);
+
+  promise_test(async (t) => {
+    dialog.setAttribute('closedby','any');
+    dialog[method]();
+    const actions = new test_driver.Actions();
+    await actions.pointerMove(199, 199, {origin:"viewport"})
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_true(dialog.open, "Dialog should be open after clicking 199px-199px");
+  },`Dialog ${method} will not light dismiss if clicked inside the overflowing div bounds (bottom right)`);
+
+  promise_test(async (t) => {
+    dialog.setAttribute('closedby','any');
+    dialog[method]();
+    const actions = new test_driver.Actions();
+    await actions.pointerMove(250, 250, {origin:"viewport"})
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_false(dialog.open, "Dialog should be closed after clicking 250px-250px");
+  },`Dialog ${method} light dismisses when clicked outside of the bounds of both the dialog and the div`);
+
+  promise_test(async (t) => {
+    dialog.setAttribute('closedby','any');
+    dialog[method]();
+    const actions = new test_driver.Actions();
+    await actions.pointerMove(150, 1, {origin:"viewport"})
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_false(dialog.open, "Dialog should be closed after clicking 150px-1px");
+  },`Dialog ${method} light dismisses when clicked outside of the bounds of the dialog - where the Y direction is in-line with the div still`);
+
+  promise_test(async (t) => {
+    dialog.setAttribute('closedby','any');
+    dialog[method]();
+    const actions = new test_driver.Actions();
+    await actions.pointerMove(1, 150, {origin:"viewport"})
+      .pointerDown()
+      .pointerUp()
+      .send();
+    assert_false(dialog.open, "Dialog should be closed after clicking 1px-150px");
+  },`Dialog ${method} light dismisses when clicked outside of the bounds of the dialog - where the X direction is in-line with the div still`);
+}
+</script>
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-closedby-corner-cases.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-closedby-corner-cases.html
index e25b9533b90..06a90844154 100644
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-closedby-corner-cases.html
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-closedby-corner-cases.html
@@ -14,7 +14,7 @@
 
 <script>
   const dialog = document.getElementById('dialog');
-  async function openDialog(openMethod) {
+  function openDialog(openMethod) {
     dialog.close();
     if (!dialog.open) {
       assert_false(dialog.matches(':open'),'Should be closed to start');
@@ -32,7 +32,6 @@
           assert_unreached('Invalid open method');
       }
     }
-    await waitForRender();
     assert_true(dialog.open,'Should be open now');
     assert_true(dialog.matches(':open'),'Should be open now (pseudo)');
   }
@@ -122,18 +121,25 @@
       const expectResponds = changeMethod.setup(openMethod,controller.signal) ?? true;
 
       // Open the dialog
-      await openDialog(openMethod);
+      openDialog(openMethod);
 
       // Try hitting ESC
       const ESC = '\uE00C';
+      const close_fired = new Promise(resolve => {
+        dialog.addEventListener('close', resolve, { once: true })
+      });
       await test_driver.send_keys(document.documentElement,ESC);
-      await waitForRender();
+      if (expectResponds) {
+        await close_fired;
+      } else {
+        await waitForRender();
+      }
       const respondsToEsc = !dialog.open;
       assert_equals(!dialog.matches(':open'),respondsToEsc,':open should match dialog.open');
       dialog.close();
 
       // Try clicking outside
-      await openDialog(openMethod);
+      openDialog(openMethod);
       await clickOn(outside);
       const respondsToLightDismiss = !dialog.open;
       assert_equals(!dialog.matches(':open'),respondsToLightDismiss,':open should match dialog.open');
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-closedby.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-closedby.html
index 50d600219d2..b67bc80765a 100644
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-closedby.html
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-closedby.html
@@ -29,7 +29,7 @@
 <dialog data-behavior="auto"></dialog>
 
 <script>
-  async function openDialog(dialog,openMethod) {
+  function openDialog(dialog,openMethod) {
     assert_false(dialog.open,'Should be closed to start');
     assert_equals(dialog.matches(':open'),dialog.open,':open should match .open');
     switch (openMethod) {
@@ -45,7 +45,6 @@
       default:
         assert_unreached('Invalid open method');
     }
-    await waitForRender();
     assert_true(dialog.open,'Should be open now');
     assert_equals(dialog.matches(':open'),dialog.open,':open should match .open');
   }
@@ -99,22 +98,30 @@
       assert_false(dialog.open,'setup');
       assert_false(dialog.matches(':open'));
       t.add_cleanup(() => dialog.close());
+      let expectations = getDefaultExpectations(dialog.dataset.behavior, openMethod);
 
       // Open the dialog
-      await openDialog(dialog,openMethod);
+      openDialog(dialog,openMethod);
       assert_equals(dialog.matches(':modal'),openMethod === 'modal',':modal incorrect');
       const closedByReflectionWhileOpen = dialog.closedBy;
 
       // Try hitting ESC
       const ESC = '\uE00C';
+      const close_fired = new Promise(resolve => {
+        dialog.addEventListener('close', resolve, { once: true })
+      });
       await test_driver.send_keys(document.documentElement,ESC);
-      await waitForRender();
+      if (expectations.respondsToEsc) {
+        await close_fired;
+      } else {
+        await waitForRender();
+      }
       const respondsToEsc = !dialog.open;
       assert_equals(!dialog.matches(':open'),respondsToEsc,':open should match dialog.open');
       dialog.close();
 
       // Try clicking outside
-      await openDialog(dialog,openMethod);
+      openDialog(dialog,openMethod);
       assert_equals(dialog.matches(':modal'),openMethod === 'modal',':modal incorrect');
       await clickOn(outside);
       const respondsToLightDismiss = !dialog.open;
@@ -122,7 +129,6 @@
       dialog.close();
 
       // See if expectations match
-      let expectations = getDefaultExpectations(dialog.dataset.behavior, openMethod);
       assert_equals(respondsToEsc,expectations.respondsToEsc,`Dialog ${expectations.respondsToEsc ? "should" : "should NOT"} respond to ESC`);
       assert_equals(respondsToLightDismiss,expectations.respondsToLightDismiss,`Dialog ${expectations.respondsToLightDismiss ? "should" : "should NOT"} respond to light dismiss`);
       assert_equals(closedByReflectionWhileOpen,expectations.expectedReflectionWhileOpen,'Reflection should be limited to known values (open)');
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusability.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusability.html
index 1e000866099..5afb407640b 100644
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusability.html
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusability.html
@@ -48,11 +48,9 @@
     }
   }
 
-  async_test((t) => {
-    window.onload = async () => {
-      await assert_focus_order([before,within1,after1,dialog2,within2,after2,
-        within3,after3,dialog4,within4,after4]);
-      t.done();
-    };
+  promise_test(async () => {
+    await new Promise(resolve => window.onload = resolve);
+    await assert_focus_order([before,within1,after1,dialog2,within2,after2,
+      within3,after3,dialog4,within4,after4]);
   }, "The dialog element itself should not be keyboard focusable.");
 </script>
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose-2-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose-2-crash.html
new file mode 100644
index 00000000000..a6ddac7e09c
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose-2-crash.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<link rel="author" href="mailto:wpt@keithcirkel.co.uk" />
+<link rel="help" href="https://html.spec.whatwg.org/#dom-dialog-requestclose" />
+
+<!-- This test passes if it does not crash. -->
+
+<script>
+  const dialog = document.createElement("dialog");
+  dialog.setAttribute("open", "");
+  dialog.requestClose();
+</script>
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose-3-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose-3-crash.html
new file mode 100644
index 00000000000..121e8645597
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose-3-crash.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<link rel="author" href="mailto:wpt@keithcirkel.co.uk" />
+<link rel="help" href="https://html.spec.whatwg.org/#dom-dialog-requestclose" />
+
+<!-- This test passes if it does not crash. -->
+
+<script>
+  const doc = document.implementation.createHTMLDocument("");
+  const dialog = doc.createElement("dialog");
+  doc.body.append(dialog);
+  dialog.setAttribute("open", "");
+  dialog.requestClose();
+</script>
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose-4-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose-4-crash.html
new file mode 100644
index 00000000000..a6b0268cb90
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose-4-crash.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<link rel="author" href="mailto:wpt@keithcirkel.co.uk" />
+<link rel="help" href="https://html.spec.whatwg.org/#dom-dialog-requestclose" />
+
+<!-- This test passes if it does not crash. -->
+
+<script>
+  const doc = document.implementation.createHTMLDocument("");
+  const dialog = doc.createElement("dialog");
+  dialog.setAttribute("open", "");
+  doc.body.append(dialog);
+  dialog.requestClose();
+</script>
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose.html
index f63bc91ab47..6555f1b43bd 100644
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose.html
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose.html
@@ -10,6 +10,10 @@
 <dialog>Dialog</dialog>
 
 <script>
+function waitForRender() {
+  return new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve)));
+}
+
 const dialog = document.querySelector('dialog');
 function openDialog(openMethod) {
   assert_false(dialog.open);
@@ -31,14 +35,8 @@ function openDialog(openMethod) {
   assert_true(dialog.matches(':open'));
   assert_equals(dialog.matches(':modal'),openMethod === 'modal');
 }
-function getSignal(t) {
-  const controller = new AbortController();
-  const signal = controller.signal;
-  t.add_cleanup(() => controller.abort());
-  return signal;
-}
 
-async function setup(t,closedby) {
+function setup(t,closedby) {
   t.add_cleanup(() => {
     dialog.close();
     dialog.removeAttribute('closedby');
@@ -48,16 +46,14 @@ async function setup(t,closedby) {
   if (closedby) {
     dialog.setAttribute('closedby',closedby);
   }
-  // Be sure any pending close events get fired.
-  await new Promise(resolve => requestAnimationFrame(resolve));
-  return getSignal(t);
+  return t.get_signal();
 }
 
 ['modeless','modal','open'].forEach(openMethod => {
   [null,'any','closedrequest','none'].forEach(closedby => {
     const testDescription = `for ${openMethod} dialog with closedby=${closedby}`;
     promise_test(async (t) => {
-      await setup(t,closedby);
+      setup(t,closedby);
       openDialog(openMethod);
       dialog.requestClose();
       assert_false(dialog.open);
@@ -65,25 +61,35 @@ async function setup(t,closedby) {
     },`requestClose basic behavior ${testDescription}`);
 
     promise_test(async (t) => {
-      const signal = await setup(t,closedby);
+      const signal = setup(t,closedby);
       let events = [];
+      const { promise: untilFullyClosed, resolve: hasClosed } = Promise.withResolvers();
       dialog.addEventListener('cancel',() => events.push('cancel'),{signal});
-      dialog.addEventListener('close',() => events.push('close'),{signal});
+      dialog.addEventListener('close',() => {
+        events.push('close');
+        hasClosed();
+      },{signal});
       openDialog(openMethod);
       assert_array_equals(events,[]);
       dialog.requestClose();
       assert_false(dialog.open);
       assert_false(dialog.matches(':open'));
       assert_array_equals(events,['cancel'],'close is scheduled');
-      await new Promise(resolve => requestAnimationFrame(resolve));
+      await untilFullyClosed;
       assert_array_equals(events,['cancel','close']);
     },`requestClose fires both cancel and close ${testDescription}`);
 
     promise_test(async (t) => {
-      const signal = await setup(t,'none');
+      const signal = setup(t,'none');
       let events = [];
+      const { promise: untilFullyClosed, resolve: hasClosed } = Promise.withResolvers();
+      const { promise: untilFullyClosedAgain, resolve: hasClosedAgain } = Promise.withResolvers();
+      const closeResolvers = [hasClosed, hasClosedAgain];
       dialog.addEventListener('cancel',() => events.push('cancel'),{signal});
-      dialog.addEventListener('close',() => events.push('close'),{signal});
+      dialog.addEventListener('close',() => {
+        events.push('close');
+        closeResolvers.shift()();
+      },{signal});
       openDialog(openMethod);
       dialog.setAttribute('closedby',closedby);
       assert_array_equals(events,[]);
@@ -91,6 +97,7 @@ async function setup(t,closedby) {
       assert_false(dialog.open,'Adding closedby after dialog is open');
       assert_false(dialog.matches(':open'));
       assert_array_equals(events,['cancel']);
+      await untilFullyClosed;
       events=[];
       openDialog(openMethod);
       dialog.removeAttribute('closedby');
@@ -98,11 +105,13 @@ async function setup(t,closedby) {
       dialog.requestClose();
       assert_false(dialog.open,'Removing closedby after dialog is open');
       assert_array_equals(events,['cancel']);
+      await untilFullyClosedAgain;
+      assert_array_equals(events,['cancel', 'close']);
     },`closedby has no effect on dialog.requestClose() ${testDescription}`);
 
-    if (dialog.closedBy != "none") {
+    if (closedby != "none") {
       promise_test(async (t) => {
-        const signal = await setup(t,closedby);
+        const signal = setup(t,closedby);
         let shouldPreventDefault = true;
         dialog.addEventListener('cancel',(e) => {
           if (shouldPreventDefault) {
@@ -120,7 +129,7 @@ async function setup(t,closedby) {
       },`requestClose can be cancelled ${testDescription}`);
 
       promise_test(async (t) => {
-        const signal = await setup(t,closedby);
+        const signal = setup(t,closedby);
         dialog.addEventListener('cancel',(e) => e.preventDefault(),{signal});
         openDialog(openMethod);
         // No user activation here.
@@ -132,7 +141,7 @@ async function setup(t,closedby) {
       },`requestClose avoids abuse prevention logic ${testDescription}`);
 
       promise_test(async (t) => {
-        await setup(t,closedby);
+        setup(t,closedby);
         openDialog(openMethod);
         assert_equals(dialog.returnValue,'','Return value starts out empty');
         const returnValue = 'The return value';
@@ -149,7 +158,7 @@ async function setup(t,closedby) {
       },`requestClose(returnValue) passes along the return value ${testDescription}`);
 
       promise_test(async (t) => {
-        await setup(t,closedby);
+        setup(t,closedby);
         dialog.addEventListener('cancel',(e) => e.preventDefault(),{once:true});
         openDialog(openMethod);
         dialog.returnValue = 'foo';
@@ -164,23 +173,27 @@ async function setup(t,closedby) {
 });
 
 promise_test(async (t) => {
-  await setup(t);
+  setup(t);
   dialog.open = true;
   dialog.requestClose();
   assert_false(dialog.open);
 },`requestClose basic behavior when dialog is open via attribute`);
 
 promise_test(async (t) => {
-  const signal = await setup(t);
+  const signal = setup(t);
   let events = [];
+  const { promise: untilFullyClosed, resolve: hasClosed } = Promise.withResolvers();
   dialog.addEventListener('cancel',() => events.push('cancel'),{signal});
-  dialog.addEventListener('close',() => events.push('close'),{signal});
+  dialog.addEventListener('close',() => {
+    events.push('close')
+    hasClosed();
+  },{signal});
   dialog.open = true;
   assert_array_equals(events,[]);
   dialog.requestClose();
   assert_false(dialog.open);
   assert_array_equals(events,['cancel'],'close is scheduled');
-  await new Promise(resolve => requestAnimationFrame(resolve));
+  await untilFullyClosed;
   assert_array_equals(events,['cancel','close']);
 },`requestClose fires cancel and close when dialog is open via attribute`);
 
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/focus-after-close.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/focus-after-close.html
index 93baf65cf60..7137edcd1a1 100644
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/focus-after-close.html
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/focus-after-close.html
@@ -167,7 +167,12 @@ async function test_move_focus_dont_scroll_viewport(showModal) {
   document.body.appendChild(outViewPortButton);
 
   await new Promise(resolve => {
-    document.addEventListener("scroll", resolve, { once: true });
+    document.addEventListener("scroll", () => {
+      if (resolve && document.documentElement.scrollTop) {
+        resolve();
+        resolve = null;
+      }
+    });
     outViewPortButton.focus();
   });
 
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/toggle-events.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/toggle-events.html
index 555dc03b019..ba04b7cc391 100644
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/toggle-events.html
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/toggle-events.html
@@ -324,17 +324,23 @@
       } else {
         assert_equals(toggleEventCounter, 0, "toggle event not fired");
       }
+      // Clean up for the next test.
+      document.body.prepend(mydialog);
+      mydialog.close();
+      await waitForTick();
     }, `dialog.${methodName}() should not open if beforetoggle removes`);
 
     promise_test(async (t) => {
+      assert_true(document.body.contains(mydialog),'still in the document');
+      assert_false(mydialog.open,'initially closed');
       const abortController = new AbortController();
       const signal = abortController.signal;
-      t.add_cleanup(async () => {
+      t.add_cleanup(() => {
         try { mydialog.hidePopover(); } catch {}
         try { mydialog.close(); } catch {}
         mydialog.removeAttribute('popover');
         abortController.abort();
-        await waitForTick();
+        waitForTick(); // Note that cleanups can't await
       });
       mydialog.setAttribute('popover', '');
       mydialog.addEventListener("beforetoggle", () => {
@@ -362,6 +368,9 @@
       } else {
         assert_equals(toggleEventCounter, 1, "toggle event was fired for showPopover");
       }
+      // Clean up for the next test.
+      mydialog.close();
+      await waitForTick();
     }, `dialog.${methodName}() should not open if beforetoggle calls showPopover`);
   });
 </script>
diff --git a/tests/wpt/tests/html/semantics/permission-element/bounded-css-properties-reftest-ref.html b/tests/wpt/tests/html/semantics/permission-element/bounded-css-properties-reftest-ref.html
index c62ff5b24d6..2fb0c1f4e95 100644
--- a/tests/wpt/tests/html/semantics/permission-element/bounded-css-properties-reftest-ref.html
+++ b/tests/wpt/tests/html/semantics/permission-element/bounded-css-properties-reftest-ref.html
@@ -30,6 +30,6 @@
   }
 </style>
 
-<permission id="id1" type="geolocation">
-<permission id="id2" type="camera">
+<permission id="id1" type="geolocation"></permission>
+<permission id="id2" type="camera"></permission>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/bounded-css-properties-reftest.tentative.html b/tests/wpt/tests/html/semantics/permission-element/bounded-css-properties-reftest.tentative.html
index ad6986f52b4..4d27b23eb51 100644
--- a/tests/wpt/tests/html/semantics/permission-element/bounded-css-properties-reftest.tentative.html
+++ b/tests/wpt/tests/html/semantics/permission-element/bounded-css-properties-reftest.tentative.html
@@ -32,6 +32,6 @@
   }
 </style>
 
-<permission id="id1" type="geolocation">
-<permission id="id2" type="camera">
+<permission id="id1" type="geolocation"></permission>
+<permission id="id2" type="camera"></permission>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/bounded-css-properties.tentative.html b/tests/wpt/tests/html/semantics/permission-element/bounded-css-properties.tentative.html
index c0f0fe34542..9678286179a 100644
--- a/tests/wpt/tests/html/semantics/permission-element/bounded-css-properties.tentative.html
+++ b/tests/wpt/tests/html/semantics/permission-element/bounded-css-properties.tentative.html
@@ -33,9 +33,9 @@
 </style>
 
 
-<permission id="id-over-bounds" type="geolocation">
-<permission id="id-under-bounds" type="camera">
-<permission id="id-within-bounds" type="microphone">
+<permission id="id-over-bounds" type="geolocation"></permission>
+<permission id="id-under-bounds" type="camera"></permission>
+<permission id="id-within-bounds" type="microphone"></permission>
 
 <script>
   test(function(){
diff --git a/tests/wpt/tests/html/semantics/permission-element/bounded-sizes-reftest-ref.html b/tests/wpt/tests/html/semantics/permission-element/bounded-sizes-reftest-ref.html
index c0782ce9cd5..462f346edf5 100644
--- a/tests/wpt/tests/html/semantics/permission-element/bounded-sizes-reftest-ref.html
+++ b/tests/wpt/tests/html/semantics/permission-element/bounded-sizes-reftest-ref.html
@@ -40,9 +40,9 @@
     }
   </style>
 
-  <div><permission id="id1" type="geolocation"></div>
-  <div><permission id="id2" type="camera"></div>
-  <div><permission id="id3" type="microphone"></div>
+  <div><permission id="id1" type="geolocation"></permission></div>
+  <div><permission id="id2" type="camera"></permission></div>
+  <div><permission id="id3" type="microphone"></permission></div>
 
 <script>
   let el = document.getElementById("id1");
diff --git a/tests/wpt/tests/html/semantics/permission-element/bounded-sizes-reftest.tentative.html b/tests/wpt/tests/html/semantics/permission-element/bounded-sizes-reftest.tentative.html
index 376fb2dcb3f..3c3a2d5b5b9 100644
--- a/tests/wpt/tests/html/semantics/permission-element/bounded-sizes-reftest.tentative.html
+++ b/tests/wpt/tests/html/semantics/permission-element/bounded-sizes-reftest.tentative.html
@@ -66,7 +66,7 @@
   }
 </style>
 
-<div><permission id="id1" type="geolocation"></div>
-<div><permission id="id2" type="camera"></div>
-<div><permission id="id3" type="microphone"></div>
+<div><permission id="id1" type="geolocation"></permission></div>
+<div><permission id="id2" type="camera"></permission></div>
+<div><permission id="id3" type="microphone"></permission></div>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/bounded-sizes.tentative.html b/tests/wpt/tests/html/semantics/permission-element/bounded-sizes.tentative.html
index dbeaebe04de..7a620c2652b 100644
--- a/tests/wpt/tests/html/semantics/permission-element/bounded-sizes.tentative.html
+++ b/tests/wpt/tests/html/semantics/permission-element/bounded-sizes.tentative.html
@@ -55,9 +55,9 @@
 </style>
 
 
-<permission id="el_outside_bounds" type="geolocation">
-<permission id="el_inside_bounds" type="camera">
-<permission id="el_large_min_size" type="microphone">
+<permission id="el_outside_bounds" type="geolocation"></permission>
+<permission id="el_inside_bounds" type="camera"></permission>
+<permission id="el_large_min_size" type="microphone"></permission>
 
 <script>
   test(function(){
diff --git a/tests/wpt/tests/html/semantics/permission-element/display-css-property-reftest-ref.html b/tests/wpt/tests/html/semantics/permission-element/display-css-property-reftest-ref.html
index 6a04c94c037..aa5ffe07a95 100644
--- a/tests/wpt/tests/html/semantics/permission-element/display-css-property-reftest-ref.html
+++ b/tests/wpt/tests/html/semantics/permission-element/display-css-property-reftest-ref.html
@@ -11,6 +11,6 @@
   }
 </style>
 
-<permission id="id1" type="geolocation">
+<permission id="id1" type="geolocation"></permission>
 <span>After element</span>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/display-css-property-reftest.tentative.html b/tests/wpt/tests/html/semantics/permission-element/display-css-property-reftest.tentative.html
index e83786373d5..e4288cae3b2 100644
--- a/tests/wpt/tests/html/semantics/permission-element/display-css-property-reftest.tentative.html
+++ b/tests/wpt/tests/html/semantics/permission-element/display-css-property-reftest.tentative.html
@@ -16,7 +16,7 @@
   }
 </style>
 
-<permission id="id1" type="geolocation">
-<permission id="id2" type="camera">
+<permission id="id1" type="geolocation"></permission>
+<permission id="id2" type="camera"></permission>
 <span>After element</span>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/display-css-property.tentative.html b/tests/wpt/tests/html/semantics/permission-element/display-css-property.tentative.html
index 7aa22ef4a2b..b87b6aa9e04 100644
--- a/tests/wpt/tests/html/semantics/permission-element/display-css-property.tentative.html
+++ b/tests/wpt/tests/html/semantics/permission-element/display-css-property.tentative.html
@@ -20,9 +20,9 @@
 </style>
 
 
-<permission id="id1" type="geolocation">
-<permission id="id2" type="camera">
-<permission id="id3" type="microphone">
+<permission id="id1" type="geolocation"></permission>
+<permission id="id2" type="camera"></permission>
+<permission id="id3" type="microphone"></permission>
 
 <script>
   test(function(){
diff --git a/tests/wpt/tests/html/semantics/permission-element/granted-selector.html b/tests/wpt/tests/html/semantics/permission-element/granted-selector.html
index 3ce1ad728e0..9fd00114bdf 100644
--- a/tests/wpt/tests/html/semantics/permission-element/granted-selector.html
+++ b/tests/wpt/tests/html/semantics/permission-element/granted-selector.html
@@ -8,7 +8,7 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <body>
 
-<permission id="permission_element" type="camera">
+<permission id="permission_element" type="camera"></permission>
 
 <script>
   promise_test(async() => {
diff --git a/tests/wpt/tests/html/semantics/permission-element/invalid-css-properties.tentative.html b/tests/wpt/tests/html/semantics/permission-element/invalid-css-properties.tentative.html
index 162eba7d679..f8dd5b68116 100644
--- a/tests/wpt/tests/html/semantics/permission-element/invalid-css-properties.tentative.html
+++ b/tests/wpt/tests/html/semantics/permission-element/invalid-css-properties.tentative.html
@@ -17,10 +17,11 @@
     width: 200px;
     transform: rotate(10);
     border: 0px;
+    cursor: none;
   }
 </style>
 
-<permission id="id1" type="geolocation">
+<permission id="id1" type="geolocation"></permission>
 
 <script>
   test(function(){
@@ -32,6 +33,7 @@
     assert_equals(getComputedStyle(el_with_negatives).mask, "none", "mask");
     assert_equals(getComputedStyle(el_with_negatives).paddingLeft, "0px", "padding-left");
     assert_equals(getComputedStyle(el_with_negatives).transform, "none", "transform");
+    assert_equals(getComputedStyle(el_with_negatives).cursor, "pointer", "cursor");
   }, "None of the listed properties should be applied");
 </script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/invalid-type-reftest-ref.html b/tests/wpt/tests/html/semantics/permission-element/invalid-type-reftest-ref.html
new file mode 100644
index 00000000000..359872ea613
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/permission-element/invalid-type-reftest-ref.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<body>
+  <div>
+    The permission element behaves the same as an unknown element.
+  </div>
+
+<style>
+  #id1 {
+    background-color: hsla(210, 70%, 60%, 0.3); /* Semi-transparent blue */
+    border-radius: 5px;
+    padding: 2px 5px;
+    border: solid 1px #767676;
+
+    box-sizing: content-box;
+    display: inline-block;
+  }
+  #id2 {
+    background-color: azure;
+    border: 1px dashed #ccc;
+    padding: 3px;
+    border-radius: 3px;
+
+    box-sizing: content-box;
+    display: inline-block;
+  }
+  button {
+    font-family: "Comic Sans MS", cursive, sans-serif; /* Just for fun! */
+    font-style: italic;
+    font-weight: bold;
+    color: #800080; /* Purple */
+    text-decoration: underline dotted hotpink;
+  }
+</style>
+
+<div>
+  <foobar id="id1">This is some contents</foobar>
+</div>
+<div>
+  <foobar id="id2">
+    <button>A button</button>
+    <span>
+      <li>
+        <ul>1</ul>
+        <ul>2</ul>
+      </li>
+      Some text
+    </span>
+  </foobar>
+</div>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/invalid-type-reftest.tentative.html b/tests/wpt/tests/html/semantics/permission-element/invalid-type-reftest.tentative.html
new file mode 100644
index 00000000000..80f3e793e11
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/permission-element/invalid-type-reftest.tentative.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<link rel="match" href="invalid-type-reftest-ref.html">
+<body>
+  <div>
+    The permission element behaves the same as an unknown element.
+  </div>
+
+<style>
+  #id1 {
+    background-color: hsla(210, 70%, 60%, 0.3); /* Semi-transparent blue */
+    border-radius: 5px;
+    padding: 2px 5px;
+    border: solid 1px #767676;
+
+    box-sizing: content-box;
+    display: inline-block;
+  }
+  #id2 {
+    background-color: azure;
+    border: 1px dashed #ccc;
+    padding: 3px;
+    border-radius: 3px;
+
+    box-sizing: content-box;
+    display: inline-block;
+  }
+  button {
+    font-family: "Comic Sans MS", cursive, sans-serif; /* Just for fun! */
+    font-style: italic;
+    font-weight: bold;
+    color: #800080; /* Purple */
+    text-decoration: underline dotted hotpink;
+  }
+</style>
+
+<div>
+  <permission id="id1" type="not-a-valid-type">This is some contents</permission>
+</div>
+<div>
+  <permission id="id2" type>
+    <button>A button</button>
+    <span>
+      <li>
+        <ul>1</ul>
+        <ul>2</ul>
+      </li>
+      Some text
+    </span>
+  </permission>
+</div>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/lang-attribute-update.html b/tests/wpt/tests/html/semantics/permission-element/lang-attribute-update.html
index cd470337e78..bca110aabc6 100644
--- a/tests/wpt/tests/html/semantics/permission-element/lang-attribute-update.html
+++ b/tests/wpt/tests/html/semantics/permission-element/lang-attribute-update.html
@@ -11,7 +11,7 @@
   <div id="el1" lang="en">
     <div id="el2" lang="en">
       <div>
-        <permission id="permission-element" type="geolocation" style="width:fit-content"/>
+        <permission id="permission-element" type="geolocation" style="width:fit-content"></permission>
       </div>
     </div>
   </div>
diff --git a/tests/wpt/tests/html/semantics/permission-element/large-min-size-reftest-ref.html b/tests/wpt/tests/html/semantics/permission-element/large-min-size-reftest-ref.html
index 6c0b7a73f0c..8b48bb93feb 100644
--- a/tests/wpt/tests/html/semantics/permission-element/large-min-size-reftest-ref.html
+++ b/tests/wpt/tests/html/semantics/permission-element/large-min-size-reftest-ref.html
@@ -24,8 +24,8 @@
   }
 </style>
 
-<div><permission id="id1" type="geolocation"></div>
-<div><permission id="id2" type="camera"></div>
+<div><permission id="id1" type="geolocation"></permission></div>
+<div><permission id="id2" type="camera"></permission></div>
 <script>
   el = document.getElementById("id1");
   let w = getComputedStyle(el).width;
diff --git a/tests/wpt/tests/html/semantics/permission-element/large-min-size-reftest.tentative.html b/tests/wpt/tests/html/semantics/permission-element/large-min-size-reftest.tentative.html
index c61346c3526..2e2b3791fd0 100644
--- a/tests/wpt/tests/html/semantics/permission-element/large-min-size-reftest.tentative.html
+++ b/tests/wpt/tests/html/semantics/permission-element/large-min-size-reftest.tentative.html
@@ -29,6 +29,6 @@
   }
 </style>
 
-<div><permission id="id1" type="geolocation"></div>
-<div><permission id="id2" type="camera"></div>
+<div><permission id="id1" type="geolocation"></permission></div>
+<div><permission id="id2" type="camera"></permission></div>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/negative-offset-and-margin.tentative.html b/tests/wpt/tests/html/semantics/permission-element/negative-offset-and-margin.tentative.html
index 7d6be1a3bc8..0b3d8dc9881 100644
--- a/tests/wpt/tests/html/semantics/permission-element/negative-offset-and-margin.tentative.html
+++ b/tests/wpt/tests/html/semantics/permission-element/negative-offset-and-margin.tentative.html
@@ -33,9 +33,9 @@
 </style>
 
 
-<permission id="id1" type="geolocation">
-<permission id="id2" type="camera">
-<permission id="id3" type="microphone">
+<permission id="id1" type="geolocation"></permission>
+<permission id="id2" type="camera"></permission>
+<permission id="id3" type="microphone"></permission>
 
 <script>
   test(function(){
diff --git a/tests/wpt/tests/html/semantics/permission-element/no-children-rendered.tentative.html b/tests/wpt/tests/html/semantics/permission-element/no-children-rendered.tentative.html
new file mode 100644
index 00000000000..70166104af8
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/permission-element/no-children-rendered.tentative.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<link rel="help" href="https://github.com/WICG/PEPC/blob/main/explainer.md#locking-the-pepc-style">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<!-- The permission element is not a void element. Its children do not render. -->
+
+<!-- This tests for implementations that used to have no end tag for the permission element
+ In those implementations there would be 2 permission elements in this div. -->
+<div id="permission-element-div">
+  <permission type="geolocation">
+  <permission type="camera">
+</div>
+
+<permission id="mic" type="microphone">This is some text</permission>
+
+<!-- The permission element does not automatically close <p> tags -->
+<p id="paragraph">Foo <permission>bar</permission> baz</p>
+
+<script>
+  test(function(){
+    assert_equals(1, document.getElementById("permission-element-div").childElementCount);
+    assert_equals('', document.getElementById("mic").innerText);
+    assert_equals('This is some text', document.getElementById("mic").textContent);
+    assert_equals('This is some text', document.getElementById("mic").innerHTML);
+    assert_equals(4, document.body.childElementCount); //div, permission, script, p
+    assert_equals('Foo bar baz', document.getElementById("paragraph").textContent);
+  }, "The permission element should have no end tag or contents");
+</script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/no-end-tag-no-contents.tentative.html b/tests/wpt/tests/html/semantics/permission-element/no-end-tag-no-contents.tentative.html
deleted file mode 100644
index bea3d7102ca..00000000000
--- a/tests/wpt/tests/html/semantics/permission-element/no-end-tag-no-contents.tentative.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<link rel="help" href="https://github.com/WICG/PEPC/blob/main/explainer.md#locking-the-pepc-style">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-<!--The permission element should have no end tag or content.
-    Therefore the parsing should stop after the beginning tag, and the following
-    element and text will become part of the 'body' element's contents.
--->
-<permission type="geolocation"><span>this is some text</span></permission>
-
-<script>
-  test(function(){
-    assert_equals(3, document.body.childElementCount); // permission, span, script
-    assert_equals(document.body.innerText, "this is some text", "The text should be part of the 'body' element's text");
-
-    assert_true(document.body.children[0] instanceof HTMLPermissionElement, "First element should be a permission element");
-    var permission = document.body.children[0];
-    assert_equals(permission.innerText, "", "The permission element should have no text");
-    assert_equals(permission.childElementCount, 0, "The permission element should have no children");
-
-    assert_true(document.body.children[1] instanceof HTMLSpanElement, "Second element should be a span element");
-    var span = document.body.children[1];
-    assert_equals(span.innerText, "this is some text", "The span element should contain the text");
-  }, "The permission element should have no end tag or contents");
-</script>
-</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/no-focus.tentative.html b/tests/wpt/tests/html/semantics/permission-element/no-focus.tentative.html
index 6e81a20962c..96467885183 100644
--- a/tests/wpt/tests/html/semantics/permission-element/no-focus.tentative.html
+++ b/tests/wpt/tests/html/semantics/permission-element/no-focus.tentative.html
@@ -9,12 +9,12 @@
 <body>
 <!-- The permission element should not be focusable by script.
 -->
-<permission tabindex="0" id="valid_permission_element" type="geolocation">
+<permission tabindex="0" id="valid_permission_element" type="geolocation"></permission>
 
 <span tabindex="0" id="focusable_span">This is some text</span>
 
 <!-- style needed to allow the invalid element to have a width -->
-<permission style="width: auto; padding-left: 10px" tabindex="0" id="invalid_permission_element" type="invalid">
+<permission style="width: auto; padding-left: 10px" tabindex="0" id="invalid_permission_element" type="invalid"></permission>
 
 <script>
   promise_test(async() => {
@@ -45,9 +45,8 @@
        .addTick();
     await actions.send();
 
-    assert_equals(document.activeElement, document.body,
-      "Invalid permission element should not be focusable even by user.\
-      Instead the parent elements gets focus.");
+    assert_equals(document.activeElement, invalid_permission_element,
+      "Permission elements with an invalid-type can be focused like any other HTML element");
 }, "Permission element is not focusable by script");
 </script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/pseudo-elements-in-div-ref.html b/tests/wpt/tests/html/semantics/permission-element/pseudo-elements-in-div-ref.html
index 38d0cc25a52..8e6267f9aa3 100644
--- a/tests/wpt/tests/html/semantics/permission-element/pseudo-elements-in-div-ref.html
+++ b/tests/wpt/tests/html/semantics/permission-element/pseudo-elements-in-div-ref.html
@@ -18,7 +18,7 @@
 
   <div>
     <div class="inner"></div>
-    <permission type="camera">
+    <permission type="camera"></permission>
   </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/pseudo-elements-in-div.tentative.html b/tests/wpt/tests/html/semantics/permission-element/pseudo-elements-in-div.tentative.html
index e9080708021..24a2be07fab 100644
--- a/tests/wpt/tests/html/semantics/permission-element/pseudo-elements-in-div.tentative.html
+++ b/tests/wpt/tests/html/semantics/permission-element/pseudo-elements-in-div.tentative.html
@@ -25,7 +25,7 @@
      all implementation. -->
   <div class="outer">
     <div></div>
-    <permission type="camera">
+    <permission type="camera"></permission>
   </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/pseudo-elements-ref.html b/tests/wpt/tests/html/semantics/permission-element/pseudo-elements-ref.html
index ca7ad2daa89..a9d8d865595 100644
--- a/tests/wpt/tests/html/semantics/permission-element/pseudo-elements-ref.html
+++ b/tests/wpt/tests/html/semantics/permission-element/pseudo-elements-ref.html
@@ -8,6 +8,6 @@
 
   <p>You should not see the word FAIL below.</p>
 
-  <permission type="camera">
+  <permission type="camera"></permission>
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/pseudo-elements.tentative.html b/tests/wpt/tests/html/semantics/permission-element/pseudo-elements.tentative.html
index e0faefeb55d..3e553e01bcf 100644
--- a/tests/wpt/tests/html/semantics/permission-element/pseudo-elements.tentative.html
+++ b/tests/wpt/tests/html/semantics/permission-element/pseudo-elements.tentative.html
@@ -13,6 +13,6 @@
 
   <p>You should not see the word FAIL below.</p>
 
-  <permission type="camera">
+  <permission type="camera"></permission>
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/permission-element/quirks-mode-no-height-is-still-bounded-ref.html b/tests/wpt/tests/html/semantics/permission-element/quirks-mode-no-height-is-still-bounded-ref.html
index a97003d82f0..738dc95f8eb 100644
--- a/tests/wpt/tests/html/semantics/permission-element/quirks-mode-no-height-is-still-bounded-ref.html
+++ b/tests/wpt/tests/html/semantics/permission-element/quirks-mode-no-height-is-still-bounded-ref.html
@@ -8,7 +8,7 @@
   }
 </style>
 <body>
-  <permission id="permission" type="camera">
+  <permission id="permission" type="camera"></permission>
   <script>
     let el = document.getElementById("permission");
     el.style.height = (el.clientHeight + 20) + "px";
diff --git a/tests/wpt/tests/html/semantics/permission-element/quirks-mode-no-height-is-still-bounded.tentative.html b/tests/wpt/tests/html/semantics/permission-element/quirks-mode-no-height-is-still-bounded.tentative.html
index cca12c5fb72..78bd4f2555a 100644
--- a/tests/wpt/tests/html/semantics/permission-element/quirks-mode-no-height-is-still-bounded.tentative.html
+++ b/tests/wpt/tests/html/semantics/permission-element/quirks-mode-no-height-is-still-bounded.tentative.html
@@ -10,6 +10,6 @@
   }
 </style>
 <body>
-  <permission type="camera">
+  <permission type="camera"></permission>
 </body>
 </html>
diff --git a/tests/wpt/tests/html/semantics/permission-element/type-supported-feature-detect.tentative.html b/tests/wpt/tests/html/semantics/permission-element/type-supported-feature-detect.tentative.html
new file mode 100644
index 00000000000..fb06f57672e
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/permission-element/type-supported-feature-detect.tentative.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Permission Element: Feature detection</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+  test(() => {
+    assert_not_equals(typeof HTMLPermissionElement, undefined,
+        `HTMLPermissionElement should not be "undefined"`);
+    assert_equals(typeof HTMLPermissionElement.isTypeSupported, "function",
+        `The type of the isTypeSupported should be "function"`);
+  }, "Test HTMLPermissionElement and isTypeSupported existence");
+
+  [
+    "geolocation",
+    "camera",
+    "microphone",
+    " camera  microphone ",
+    " microphone  camera   ",
+    " camera camera microphone",
+    "microphone microphone camera "
+  ].forEach((type) => {
+    test(() => {
+      assert_true(HTMLPermissionElement.isTypeSupported(type));
+    }, `Test HTMLPermissionElement should support type ${type}`);
+  });
+
+  [
+    "invalid",
+    "cameraa",
+    "microphone geolocation",
+    "camera geolocation",
+    "camera geolocation microphone",
+  ].forEach((type) => {
+    test(() => {
+      assert_false(HTMLPermissionElement.isTypeSupported(type));
+    }, `Test HTMLPermissionElement should not support type ${type}`);
+  });
+</script>
+</body>
diff --git a/tests/wpt/tests/html/semantics/permission-element/unbounded-width-with-border-reftest-ref.html b/tests/wpt/tests/html/semantics/permission-element/unbounded-width-with-border-reftest-ref.html
index 8219b9a7420..0753b313e88 100644
--- a/tests/wpt/tests/html/semantics/permission-element/unbounded-width-with-border-reftest-ref.html
+++ b/tests/wpt/tests/html/semantics/permission-element/unbounded-width-with-border-reftest-ref.html
@@ -51,11 +51,11 @@ width: fit-content;
     }
   </style>
 
-<div><permission id="unlimited-width" type="geolocation"></div>
-<div><permission id="no-border-width" type="camera"></div>
-<div><permission id="no-contrast" type="microphone"></div>
-<div><permission id="transparent" type="microphone camera"></div>
-<div><permission id="top-no-contrast" type="geolocation"></div>
+<div><permission id="unlimited-width" type="geolocation"></permission></div>
+<div><permission id="no-border-width" type="camera"></permission></div>
+<div><permission id="no-contrast" type="microphone"></permission></div>
+<div><permission id="transparent" type="microphone camera"></permission></div>
+<div><permission id="top-no-contrast" type="geolocation"></permission></div>
 
 <script>
   function setWidthToMax(el) {
diff --git a/tests/wpt/tests/html/semantics/permission-element/unbounded-width-with-border-reftest.tentative.html b/tests/wpt/tests/html/semantics/permission-element/unbounded-width-with-border-reftest.tentative.html
index 8de1876b210..39c9b107ae6 100644
--- a/tests/wpt/tests/html/semantics/permission-element/unbounded-width-with-border-reftest.tentative.html
+++ b/tests/wpt/tests/html/semantics/permission-element/unbounded-width-with-border-reftest.tentative.html
@@ -48,10 +48,10 @@
   }
 </style>
 
-<div><permission id="unlimited-width" type="geolocation"></div>
-<div><permission id="no-border-width" type="camera"></div>
-<div><permission id="no-contrast" type="microphone"></div>
-<div><permission id="transparent" type="microphone camera"></div>
-<div><permission id="top-no-contrast" type="geolocation"></div>
+<div><permission id="unlimited-width" type="geolocation"></permission></div>
+<div><permission id="no-border-width" type="camera"></permission></div>
+<div><permission id="no-contrast" type="microphone"></permission></div>
+<div><permission id="transparent" type="microphone camera"></permission></div>
+<div><permission id="top-no-contrast" type="geolocation"></permission></div>
 
 </body>
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-focus-2.html b/tests/wpt/tests/html/semantics/popovers/popover-focus-2.html
index 6f361698f54..9cacd2b8757 100644
--- a/tests/wpt/tests/html/semantics/popovers/popover-focus-2.html
+++ b/tests/wpt/tests/html/semantics/popovers/popover-focus-2.html
@@ -2,7 +2,6 @@
 <meta charset="utf-8" />
 <title>Popover focus behaviors</title>
 <meta name="timeout" content="long">
-<link rel="author" href="mailto:masonf@chromium.org">
 <link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com">
 <link rel=help href="https://open-ui.org/components/popover.research.explainer">
 <script src="/resources/testharness.js"></script>
@@ -11,6 +10,11 @@
 <script src="/resources/testdriver-actions.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/popover-utils.js"></script>
+
+<meta name=variant content=?test1>
+<meta name=variant content=?test2>
+<meta name=variant content=?test3>
+
 <div id=fixup>
   <button id=button1 tabindex="0">Button1</button>
   <div popover id=popover0  tabindex="0" style="top:300px">
@@ -40,19 +44,6 @@
   }
 </style>
 <script>
-async function verifyFocusOrder(order,description) {
-  order[0].focus();
-  for(let i=0;i<order.length;++i) {
-    const control = order[i];
-    assert_equals(document.activeElement,control,`${description}: Step ${i+1}`);
-    await sendTab();
-  }
-  for(let i=order.length-1;i>=0;--i) {
-    const control = order[i];
-    await sendShiftTab();
-    assert_equals(document.activeElement,control,`${description}: Step ${i+1} (backwards)`);
-  }
-}
 async function testPopoverFocusNavigation() {
   button1.focus();
   assert_equals(document.activeElement,button1);
@@ -109,355 +100,75 @@ async function testPopoverFocusNavigation() {
   button1.focus();
   await verifyFocusOrder([button1, button2, invoker0, invoker1, inside_popover1, invoker2, inside_popover3, invoker3, inside_popover2, button3, button4],'set 2');
 }
-promise_test(async t => {
-  invoker0.setAttribute('popovertarget', 'popover0');
-  invoker1.setAttribute('popovertarget', 'popover1');
-  invoker2.setAttribute('popovertarget', 'popover2');
-  invoker3.setAttribute('popovertarget', 'popover3');
-  t.add_cleanup(() => {
-    invoker0.removeAttribute('popovertarget');
-    invoker1.removeAttribute('popovertarget');
-    invoker2.removeAttribute('popovertarget');
-    invoker3.removeAttribute('popovertarget');
-  });
-  await testPopoverFocusNavigation();
-}, "Popover focus navigation with popovertarget invocation");
-promise_test(async t => {
-  invoker0.setAttribute('commandfor', 'popover0');
-  invoker1.setAttribute('commandfor', 'popover1');
-  invoker2.setAttribute('commandfor', 'popover2');
-  invoker3.setAttribute('commandfor', 'popover3');
-  invoker0.setAttribute('command', 'toggle-popover');
-  invoker1.setAttribute('command', 'toggle-popover');
-  invoker2.setAttribute('command', 'toggle-popover');
-  invoker3.setAttribute('command', 'toggle-popover');
-  t.add_cleanup(() => {
-    invoker0.removeAttribute('commandfor');
-    invoker1.removeAttribute('commandfor');
-    invoker2.removeAttribute('commandfor');
-    invoker3.removeAttribute('commandfor');
-    invoker0.removeAttribute('command');
-    invoker1.removeAttribute('command');
-    invoker2.removeAttribute('command');
-    invoker3.removeAttribute('command');
-  });
-  await testPopoverFocusNavigation();
-}, "Popover focus navigation with command/commandfor invocation");
-promise_test(async t => {
-  const invoker0Click = () => {
-    popover0.togglePopover({ source: invoker0 });
-  };
-  invoker0.addEventListener('click', invoker0Click);
-  const invoker1Click = () => {
-    popover1.togglePopover({ source: invoker1 });
-  };
-  invoker1.addEventListener('click', invoker1Click);
-  const invoker2Click = () => {
-    popover2.togglePopover({ source: invoker2 });
-  };
-  invoker2.addEventListener('click', invoker2Click);
-  const invoker3Click = () => {
-    popover3.togglePopover({ source: invoker3 });
-  };
-  invoker3.addEventListener('click', invoker3Click);
-  t.add_cleanup(() => {
-    invoker0.removeEventListener('click', invoker0Click);
-    invoker1.removeEventListener('click', invoker1Click);
-    invoker2.removeEventListener('click', invoker2Click);
-    invoker3.removeEventListener('click', invoker3Click);
-  });
-  await testPopoverFocusNavigation()
-}, "Popover focus navigation with imperative invocation");
-</script>
-<button id=circular0 tabindex="0">Invoker</button>
-<div id=popover4 popover>
-  <button id=circular1 autofocus tabindex="0"></button>
-  <button id=circular2 tabindex="0"></button>
-  <button id=circular3 tabindex="0"></button>
-</div>
-<button id=circular4 tabindex="0">after</button>
-<script>
-async function testCircularReferenceTabNavigation() {
-  circular0.focus();
-  await sendEnter(); // Activate the invoker
-  await verifyFocusOrder([circular0, circular1, circular2, circular3, circular4],'circular reference');
-  popover4.hidePopover();
+
+// This test is very slow. Variants are used to split it into pieces.
+switch (window.location.search.substring(1)) {
+  case 'test1':
+    promise_test(async t => {
+      invoker0.setAttribute('popovertarget', 'popover0');
+      invoker1.setAttribute('popovertarget', 'popover1');
+      invoker2.setAttribute('popovertarget', 'popover2');
+      invoker3.setAttribute('popovertarget', 'popover3');
+      t.add_cleanup(() => {
+        invoker0.removeAttribute('popovertarget');
+        invoker1.removeAttribute('popovertarget');
+        invoker2.removeAttribute('popovertarget');
+        invoker3.removeAttribute('popovertarget');
+      });
+      await testPopoverFocusNavigation();
+    }, "Popover focus navigation with popovertarget invocation");
+    break;
+  case 'test2':
+    promise_test(async t => {
+      invoker0.setAttribute('commandfor', 'popover0');
+      invoker1.setAttribute('commandfor', 'popover1');
+      invoker2.setAttribute('commandfor', 'popover2');
+      invoker3.setAttribute('commandfor', 'popover3');
+      invoker0.setAttribute('command', 'toggle-popover');
+      invoker1.setAttribute('command', 'toggle-popover');
+      invoker2.setAttribute('command', 'toggle-popover');
+      invoker3.setAttribute('command', 'toggle-popover');
+      t.add_cleanup(() => {
+        invoker0.removeAttribute('commandfor');
+        invoker1.removeAttribute('commandfor');
+        invoker2.removeAttribute('commandfor');
+        invoker3.removeAttribute('commandfor');
+        invoker0.removeAttribute('command');
+        invoker1.removeAttribute('command');
+        invoker2.removeAttribute('command');
+        invoker3.removeAttribute('command');
+      });
+      await testPopoverFocusNavigation();
+    }, "Popover focus navigation with command/commandfor invocation");
+    break;
+  case 'test3':
+    promise_test(async t => {
+      const invoker0Click = () => {
+        popover0.togglePopover({ source: invoker0 });
+      };
+      invoker0.addEventListener('click', invoker0Click);
+      const invoker1Click = () => {
+        popover1.togglePopover({ source: invoker1 });
+      };
+      invoker1.addEventListener('click', invoker1Click);
+      const invoker2Click = () => {
+        popover2.togglePopover({ source: invoker2 });
+      };
+      invoker2.addEventListener('click', invoker2Click);
+      const invoker3Click = () => {
+        popover3.togglePopover({ source: invoker3 });
+      };
+      invoker3.addEventListener('click', invoker3Click);
+      t.add_cleanup(() => {
+        invoker0.removeEventListener('click', invoker0Click);
+        invoker1.removeEventListener('click', invoker1Click);
+        invoker2.removeEventListener('click', invoker2Click);
+        invoker3.removeEventListener('click', invoker3Click);
+      });
+      await testPopoverFocusNavigation()
+    }, "Popover focus navigation with imperative invocation");
+    break;
+  default:
+    assert_unreached('Invalid variant');
 }
-promise_test(async t => {
-  circular0.setAttribute('popovertarget', 'popover4');
-  circular1.setAttribute('popovertarget', 'popover4');
-  circular1.setAttribute('popovertargetaction', 'hide');
-  circular2.setAttribute('popovertarget', 'popover4');
-  circular2.setAttribute('popovertargetaction', 'show');
-  circular3.setAttribute('popovertarget', 'popover4');
-  t.add_cleanup(() => {
-    circular0.removeAttribute('popovertarget');
-    circular1.removeAttribute('popovertarget');
-    circular1.removeAttribute('popovertargetaction');
-    circular2.removeAttribute('popovertarget');
-    circular2.removeAttribute('popovertargetaction');
-    circular3.removeAttribute('popovertarget');
-  });
-  await testCircularReferenceTabNavigation();
-}, "Circular reference tab navigation with popovertarget invocation");
-promise_test(async t => {
-  circular0.setAttribute('commandfor', 'popover4');
-  circular1.setAttribute('commandfor', 'popover4');
-  circular2.setAttribute('commandfor', 'popover4');
-  circular3.setAttribute('commandfor', 'popover4');
-  circular0.setAttribute('command', 'toggle-popover');
-  circular1.setAttribute('command', 'hide-popover');
-  circular2.setAttribute('command', 'show-popover');
-  circular3.setAttribute('command', 'toggle-popover');
-  t.add_cleanup(() => {
-    circular0.removeAttribute('commandfor');
-    circular1.removeAttribute('commandfor');
-    circular2.removeAttribute('commandfor');
-    circular3.removeAttribute('commandfor');
-    circular0.removeAttribute('command');
-    circular1.removeAttribute('command');
-    circular2.removeAttribute('command');
-    circular3.removeAttribute('command');
-  });
-  await testCircularReferenceTabNavigation();
-}, "Circular reference tab navigation with command/commandfor invocation");
-promise_test(async t => {
-  const circular0Click = () => {
-    popover4.togglePopover({ source: circular0 });
-  };
-  circular0.addEventListener('click', circular0Click);
-  const circular1Click = () => {
-    popover4.hidePopover();
-  };
-  circular1.addEventListener('click', circular1Click);
-  const circular2Click = () => {
-    popover4.showPopover({ source: circular2 });
-  };
-  circular2.addEventListener('click', circular2Click);
-  const circular3Click = () => {
-    popover4.togglePopover({ source: circular3 });
-  };
-  circular3.addEventListener('click', circular3Click);
-  t.add_cleanup(() => {
-    circular0.removeEventListener('click', circular0Click);
-    circular1.removeEventListener('click', circular1Click);
-    circular2.removeEventListener('click', circular2Click);
-    circular3.removeEventListener('click', circular3Click);
-  });
-  await testCircularReferenceTabNavigation();
-}, "Circular reference tab navigation with imperative invocation");
-</script>
-<div id=focus-return1>
-  <button tabindex="0">Show popover</button>
-  <div popover id=focus-return1-p>
-    <button autofocus tabindex="0">Hide popover</button>
-  </div>
-</div>
-<script>
-async function testPopoverFocusReturn1() {
-  const invoker = document.querySelector('#focus-return1>button');
-  const popover = document.querySelector('#focus-return1>[popover]');
-  const hideButton = popover.querySelector('button');
-  invoker.focus(); // Make sure button is focused.
-  assert_equals(document.activeElement,invoker);
-  await sendEnter(); // Activate the invoker
-  assert_true(popover.matches(':popover-open'), 'popover should be invoked by invoker');
-  assert_equals(document.activeElement,hideButton,'Hide button should be focused due to autofocus attribute');
-  await sendEnter(); // Activate the hide invoker
-  assert_false(popover.matches(':popover-open'), 'popover should be hidden by invoker');
-  assert_equals(document.activeElement,invoker,'Focus should be returned to the invoker');
-}
-promise_test(async t => {
-  const invoker = document.querySelector('#focus-return1>button');
-  const popover = document.querySelector('#focus-return1>[popover]');
-  const hideButton = popover.querySelector('button');
-  invoker.setAttribute('popovertarget', 'focus-return1-p');
-  invoker.setAttribute('popovertargetaction', 'show');
-  hideButton.setAttribute('popovertarget', 'focus-return1-p');
-  hideButton.setAttribute('popovertargetaction', 'hide');
-  t.add_cleanup(() => {
-    invoker.removeAttribute('popovertarget');
-    invoker.removeAttribute('popovertargetaction');
-    hideButton.removeAttribute('popovertarget');
-    hideButton.removeAttribute('popovertargetaction');
-  });
-  await testPopoverFocusReturn1();
-}, "Popover focus returns when popover is hidden by invoker with popovertarget invocation");
-promise_test(async t => {
-  const invoker = document.querySelector('#focus-return1>button');
-  const popover = document.querySelector('#focus-return1>[popover]');
-  const hideButton = popover.querySelector('button');
-  invoker.setAttribute('commandfor', 'focus-return1-p');
-  invoker.setAttribute('command', 'show-popover');
-  hideButton.setAttribute('commandfor', 'focus-return1-p');
-  hideButton.setAttribute('command', 'hide-popover');
-  t.add_cleanup(() => {
-    invoker.removeAttribute('commandfor');
-    invoker.removeAttribute('command');
-    hideButton.removeAttribute('commandfor');
-    hideButton.removeAttribute('command');
-  });
-  await testPopoverFocusReturn1();
-}, "Popover focus returns when popover is hidden by invoker with commandfor invocation");
-promise_test(async t => {
-  const invoker = document.querySelector('#focus-return1>button');
-  const popover = document.querySelector('#focus-return1>[popover]');
-  const hideButton = popover.querySelector('button');
-  const invokerClick = () => {
-    popover.showPopover({ source: invoker });
-  };
-  invoker.addEventListener('click', invokerClick);
-  const hideButtonClick = () => {
-    popover.hidePopover();
-  };
-  hideButton.addEventListener('click', hideButtonClick);
-  t.add_cleanup(() => {
-    invoker.removeEventListener('click', invokerClick);
-    hideButton.removeEventListener('click', hideButtonClick);
-  });
-  await testPopoverFocusReturn1();
-}, "Popover focus returns when popover is hidden by invoker with imperative invocation");
-</script>
-<div id=focus-return2>
-  <button tabindex="0">Toggle popover</button>
-  <div popover id=focus-return2-p>Popover with <button tabindex="0">focusable element</button></div>
-  <span tabindex=0>Other focusable element</span>
-</div>
-<script>
-async function testPopoverFocusReturn2() {
-  const invoker = document.querySelector('#focus-return2>button');
-  const popover = document.querySelector('#focus-return2>[popover]');
-  const otherElement = document.querySelector('#focus-return2>span');
-  invoker.focus(); // Make sure button is focused.
-  assert_equals(document.activeElement,invoker);
-  invoker.click(); // Activate the invoker
-  assert_true(popover.matches(':popover-open'), 'popover should be invoked by invoker');
-  assert_equals(document.activeElement,invoker,'invoker should still be focused');
-  await sendTab();
-  assert_equals(document.activeElement,popover.querySelector('button'),'next up is the popover');
-  await sendTab();
-  assert_equals(document.activeElement,otherElement,'next focus stop is outside the popover');
-  await sendEscape(); // Close the popover via ESC
-  assert_false(popover.matches(':popover-open'), 'popover should be hidden');
-  assert_equals(document.activeElement,otherElement,'focus does not move because it was not inside the popover');
-}
-promise_test(async t => {
-  const invoker = document.querySelector('#focus-return2>button');
-  invoker.setAttribute('popovertarget', 'focus-return2-p');
-  t.add_cleanup(() => {
-    invoker.removeAttribute('popovertarget');
-  });
-  await testPopoverFocusReturn2();
-}, "Popover focus only returns to invoker when focus is within the popover with popovertarget invocation");
-promise_test(async t => {
-  const invoker = document.querySelector('#focus-return2>button');
-  invoker.setAttribute('command', 'toggle-popover');
-  invoker.setAttribute('commandfor', 'focus-return2-p');
-  t.add_cleanup(() => {
-    invoker.removeAttribute('command');
-    invoker.removeAttribute('commandfor');
-  });
-  await testPopoverFocusReturn2();
-}, "Popover focus only returns to invoker when focus is within the popover with command/commandfor invocation");
-promise_test(async t => {
-  const invoker = document.querySelector('#focus-return2>button');
-  const popover = document.querySelector('#focus-return2>[popover]');
-  const invokerClick = () => {
-    popover.togglePopover({ source: invoker });
-  };
-  invoker.addEventListener('click', invokerClick);
-  t.add_cleanup(() => {
-    invoker.removeEventListener('click', invokerClick);
-  });
-  await testPopoverFocusReturn2();
-}, "Popover focus only returns to invoker when focus is within the popover with imperative invocation");
-</script>
-<div id=no-focus-candidate>
-  <button tabindex="0">Toggle popover</button>
-  <div popover id=no-focus-candidate-p>
-    Popover with <button tabindex="0">focusable element</button>
-    <div popover id=no-focus-candidate-p2>Nested popover with <button tabindex="0">focusable element</button></div>
-  </div>
-</div>
-<script>
-async function testNoFocusCandidate() {
-  const invoker = document.querySelector('#no-focus-candidate>button');
-  const popover = document.querySelector('#no-focus-candidate>[popover]');
-  const nestedPopover = document.querySelector('#no-focus-candidate>[popover]>[popover]');
-  invoker.focus(); // Make sure button is focused.
-  assert_equals(document.activeElement,invoker);
-  invoker.click(); // Activate the invoker
-  assert_true(popover.matches(':popover-open'), 'popover should be invoked by invoker');
-  assert_equals(document.activeElement,invoker, 'invoker should still be focused');
-  await sendTab();
-  assert_equals(document.activeElement,popover.querySelector('button'),'next up is the popover');
-  await sendEnter(); // Show nested popover
-  assert_true(nestedPopover.matches(':popover-open'), 'nested popover should be invoked by invoker');
-  await sendTab();
-  assert_equals(document.activeElement, nestedPopover.querySelector('button'), 'focus on the nested popover button');
-  popover.querySelector('button').disabled = true; // Make the invoker no longer a focus candidate.
-  await sendShiftTab();
-  assert_equals(document.activeElement, invoker, 'initial invoker should be focused, nested popover invoker is skipped since it is disabled');
-  nestedPopover.querySelector('button').focus();
-  await sendTab();
-  assert_equals(document.activeElement, document.body, 'no more focusable elements after the button');
-}
-promise_test(async t => {
-  const invoker = document.querySelector('#no-focus-candidate>button');
-  const popover = document.querySelector('#no-focus-candidate>[popover]');
-  const nestedButton = popover.querySelector('button');
-  const nestedPopover = document.querySelector('#no-focus-candidate>[popover]>[popover]');
-  invoker.setAttribute('popovertarget', 'no-focus-candidate-p');
-  nestedButton.setAttribute('popovertarget', 'no-focus-candidate-p2');
-  t.add_cleanup(() => {
-    invoker.removeAttribute('popovertarget');
-    nestedButton.removeAttribute('popovertarget');
-    nestedButton.disabled = false;
-    popover.hidePopover();
-    nestedPopover.hidePopover();
-  });
-  await testNoFocusCandidate();
-}, "Cases where the next focus candidate isn't in the direct parent scope with popovertarget invocation");
-promise_test(async t => {
-  const invoker = document.querySelector('#no-focus-candidate>button');
-  const popover = document.querySelector('#no-focus-candidate>[popover]');
-  const nestedButton = popover.querySelector('button');
-  const nestedPopover = document.querySelector('#no-focus-candidate>[popover]>[popover]');
-  invoker.setAttribute('commandfor', 'no-focus-candidate-p');
-  invoker.setAttribute('command', 'toggle-popover');
-  nestedButton.setAttribute('commandfor', 'no-focus-candidate-p2');
-  nestedButton.setAttribute('command', 'toggle-popover');
-  t.add_cleanup(() => {
-    invoker.removeAttribute('command');
-    invoker.removeAttribute('commandfor');
-    nestedButton.removeAttribute('command');
-    nestedButton.removeAttribute('commandfor');
-    nestedButton.disabled = false;
-    popover.hidePopover();
-    nestedPopover.hidePopover();
-  });
-  await testNoFocusCandidate();
-}, "Cases where the next focus candidate isn't in the direct parent scope with command/commandfor invocation");
-promise_test(async t => {
-  const invoker = document.querySelector('#no-focus-candidate>button');
-  const popover = document.querySelector('#no-focus-candidate>[popover]');
-  const nestedButton = popover.querySelector('button');
-  const nestedPopover = document.querySelector('#no-focus-candidate>[popover]>[popover]');
-  const invokerClick = () => {
-    popover.togglePopover({ source: invoker });
-  };
-  invoker.addEventListener('click', invokerClick);
-  const nestedButtonClick = () => {
-    nestedPopover.togglePopover({ source: nestedButton });
-  };
-  nestedButton.addEventListener('click', nestedButtonClick);
-  t.add_cleanup(() => {
-    invoker.removeEventListener('click', invokerClick);
-    nestedButton.removeEventListener('click', nestedButtonClick);
-    nestedButton.disabled = false;
-    popover.hidePopover();
-    nestedPopover.hidePopover();
-  });
-  await testNoFocusCandidate();
-}, "Cases where the next focus candidate isn't in the direct parent scope with imperative invocation");
 </script>
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-focus-3.html b/tests/wpt/tests/html/semantics/popovers/popover-focus-3.html
new file mode 100644
index 00000000000..bcf49cb19e3
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/popovers/popover-focus-3.html
@@ -0,0 +1,219 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>Popover focus behaviors</title>
+<meta name="timeout" content="long">
+<link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com">
+<link rel=help href="https://open-ui.org/components/popover.research.explainer">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/popover-utils.js"></script>
+
+<button id=circular0 tabindex="0">Invoker</button>
+<div id=popover4 popover>
+  <button id=circular1 autofocus tabindex="0"></button>
+  <button id=circular2 tabindex="0"></button>
+  <button id=circular3 tabindex="0"></button>
+</div>
+<button id=circular4 tabindex="0">after</button>
+<script>
+async function testCircularReferenceTabNavigation() {
+  circular0.focus();
+  await sendEnter(); // Activate the invoker
+  await verifyFocusOrder([circular0, circular1, circular2, circular3, circular4],'circular reference');
+  popover4.hidePopover();
+}
+promise_test(async t => {
+  circular0.setAttribute('popovertarget', 'popover4');
+  circular1.setAttribute('popovertarget', 'popover4');
+  circular1.setAttribute('popovertargetaction', 'hide');
+  circular2.setAttribute('popovertarget', 'popover4');
+  circular2.setAttribute('popovertargetaction', 'show');
+  circular3.setAttribute('popovertarget', 'popover4');
+  t.add_cleanup(() => {
+    circular0.removeAttribute('popovertarget');
+    circular1.removeAttribute('popovertarget');
+    circular1.removeAttribute('popovertargetaction');
+    circular2.removeAttribute('popovertarget');
+    circular2.removeAttribute('popovertargetaction');
+    circular3.removeAttribute('popovertarget');
+  });
+  await testCircularReferenceTabNavigation();
+}, "Circular reference tab navigation with popovertarget invocation");
+promise_test(async t => {
+  circular0.setAttribute('commandfor', 'popover4');
+  circular1.setAttribute('commandfor', 'popover4');
+  circular2.setAttribute('commandfor', 'popover4');
+  circular3.setAttribute('commandfor', 'popover4');
+  circular0.setAttribute('command', 'toggle-popover');
+  circular1.setAttribute('command', 'hide-popover');
+  circular2.setAttribute('command', 'show-popover');
+  circular3.setAttribute('command', 'toggle-popover');
+  t.add_cleanup(() => {
+    circular0.removeAttribute('commandfor');
+    circular1.removeAttribute('commandfor');
+    circular2.removeAttribute('commandfor');
+    circular3.removeAttribute('commandfor');
+    circular0.removeAttribute('command');
+    circular1.removeAttribute('command');
+    circular2.removeAttribute('command');
+    circular3.removeAttribute('command');
+  });
+  await testCircularReferenceTabNavigation();
+}, "Circular reference tab navigation with command/commandfor invocation");
+promise_test(async t => {
+  const circular0Click = () => {
+    popover4.togglePopover({ source: circular0 });
+  };
+  circular0.addEventListener('click', circular0Click);
+  const circular1Click = () => {
+    popover4.hidePopover();
+  };
+  circular1.addEventListener('click', circular1Click);
+  const circular2Click = () => {
+    popover4.showPopover({ source: circular2 });
+  };
+  circular2.addEventListener('click', circular2Click);
+  const circular3Click = () => {
+    popover4.togglePopover({ source: circular3 });
+  };
+  circular3.addEventListener('click', circular3Click);
+  t.add_cleanup(() => {
+    circular0.removeEventListener('click', circular0Click);
+    circular1.removeEventListener('click', circular1Click);
+    circular2.removeEventListener('click', circular2Click);
+    circular3.removeEventListener('click', circular3Click);
+  });
+  await testCircularReferenceTabNavigation();
+}, "Circular reference tab navigation with imperative invocation");
+</script>
+
+<div id=focus-return1>
+  <button tabindex="0">Show popover</button>
+  <div popover id=focus-return1-p>
+    <button autofocus tabindex="0">Hide popover</button>
+  </div>
+</div>
+<script>
+async function testPopoverFocusReturn1() {
+  const invoker = document.querySelector('#focus-return1>button');
+  const popover = document.querySelector('#focus-return1>[popover]');
+  const hideButton = popover.querySelector('button');
+  invoker.focus(); // Make sure button is focused.
+  assert_equals(document.activeElement,invoker);
+  await sendEnter(); // Activate the invoker
+  assert_true(popover.matches(':popover-open'), 'popover should be invoked by invoker');
+  assert_equals(document.activeElement,hideButton,'Hide button should be focused due to autofocus attribute');
+  await sendEnter(); // Activate the hide invoker
+  assert_false(popover.matches(':popover-open'), 'popover should be hidden by invoker');
+  assert_equals(document.activeElement,invoker,'Focus should be returned to the invoker');
+}
+promise_test(async t => {
+  const invoker = document.querySelector('#focus-return1>button');
+  const popover = document.querySelector('#focus-return1>[popover]');
+  const hideButton = popover.querySelector('button');
+  invoker.setAttribute('popovertarget', 'focus-return1-p');
+  invoker.setAttribute('popovertargetaction', 'show');
+  hideButton.setAttribute('popovertarget', 'focus-return1-p');
+  hideButton.setAttribute('popovertargetaction', 'hide');
+  t.add_cleanup(() => {
+    invoker.removeAttribute('popovertarget');
+    invoker.removeAttribute('popovertargetaction');
+    hideButton.removeAttribute('popovertarget');
+    hideButton.removeAttribute('popovertargetaction');
+  });
+  await testPopoverFocusReturn1();
+}, "Popover focus returns when popover is hidden by invoker with popovertarget invocation");
+promise_test(async t => {
+  const invoker = document.querySelector('#focus-return1>button');
+  const popover = document.querySelector('#focus-return1>[popover]');
+  const hideButton = popover.querySelector('button');
+  invoker.setAttribute('commandfor', 'focus-return1-p');
+  invoker.setAttribute('command', 'show-popover');
+  hideButton.setAttribute('commandfor', 'focus-return1-p');
+  hideButton.setAttribute('command', 'hide-popover');
+  t.add_cleanup(() => {
+    invoker.removeAttribute('commandfor');
+    invoker.removeAttribute('command');
+    hideButton.removeAttribute('commandfor');
+    hideButton.removeAttribute('command');
+  });
+  await testPopoverFocusReturn1();
+}, "Popover focus returns when popover is hidden by invoker with commandfor invocation");
+promise_test(async t => {
+  const invoker = document.querySelector('#focus-return1>button');
+  const popover = document.querySelector('#focus-return1>[popover]');
+  const hideButton = popover.querySelector('button');
+  const invokerClick = () => {
+    popover.showPopover({ source: invoker });
+  };
+  invoker.addEventListener('click', invokerClick);
+  const hideButtonClick = () => {
+    popover.hidePopover();
+  };
+  hideButton.addEventListener('click', hideButtonClick);
+  t.add_cleanup(() => {
+    invoker.removeEventListener('click', invokerClick);
+    hideButton.removeEventListener('click', hideButtonClick);
+  });
+  await testPopoverFocusReturn1();
+}, "Popover focus returns when popover is hidden by invoker with imperative invocation");
+</script>
+
+<div id=focus-return2>
+  <button tabindex="0">Toggle popover</button>
+  <div popover id=focus-return2-p>Popover with <button tabindex="0">focusable element</button></div>
+  <span tabindex=0>Other focusable element</span>
+</div>
+<script>
+async function testPopoverFocusReturn2() {
+  const invoker = document.querySelector('#focus-return2>button');
+  const popover = document.querySelector('#focus-return2>[popover]');
+  const otherElement = document.querySelector('#focus-return2>span');
+  invoker.focus(); // Make sure button is focused.
+  assert_equals(document.activeElement,invoker);
+  invoker.click(); // Activate the invoker
+  assert_true(popover.matches(':popover-open'), 'popover should be invoked by invoker');
+  assert_equals(document.activeElement,invoker,'invoker should still be focused');
+  await sendTab();
+  assert_equals(document.activeElement,popover.querySelector('button'),'next up is the popover');
+  await sendTab();
+  assert_equals(document.activeElement,otherElement,'next focus stop is outside the popover');
+  await sendEscape(); // Close the popover via ESC
+  assert_false(popover.matches(':popover-open'), 'popover should be hidden');
+  assert_equals(document.activeElement,otherElement,'focus does not move because it was not inside the popover');
+}
+promise_test(async t => {
+  const invoker = document.querySelector('#focus-return2>button');
+  invoker.setAttribute('popovertarget', 'focus-return2-p');
+  t.add_cleanup(() => {
+    invoker.removeAttribute('popovertarget');
+  });
+  await testPopoverFocusReturn2();
+}, "Popover focus only returns to invoker when focus is within the popover with popovertarget invocation");
+promise_test(async t => {
+  const invoker = document.querySelector('#focus-return2>button');
+  invoker.setAttribute('command', 'toggle-popover');
+  invoker.setAttribute('commandfor', 'focus-return2-p');
+  t.add_cleanup(() => {
+    invoker.removeAttribute('command');
+    invoker.removeAttribute('commandfor');
+  });
+  await testPopoverFocusReturn2();
+}, "Popover focus only returns to invoker when focus is within the popover with command/commandfor invocation");
+promise_test(async t => {
+  const invoker = document.querySelector('#focus-return2>button');
+  const popover = document.querySelector('#focus-return2>[popover]');
+  const invokerClick = () => {
+    popover.togglePopover({ source: invoker });
+  };
+  invoker.addEventListener('click', invokerClick);
+  t.add_cleanup(() => {
+    invoker.removeEventListener('click', invokerClick);
+  });
+  await testPopoverFocusReturn2();
+}, "Popover focus only returns to invoker when focus is within the popover with imperative invocation");
+</script>
+
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-focus-4.html b/tests/wpt/tests/html/semantics/popovers/popover-focus-4.html
new file mode 100644
index 00000000000..81a2f26e3b3
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/popovers/popover-focus-4.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>Popover focus behaviors</title>
+<meta name="timeout" content="long">
+<link rel="author" title="Luke Warlow" href="mailto:lwarlow@igalia.com">
+<link rel=help href="https://open-ui.org/components/popover.research.explainer">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/popover-utils.js"></script>
+
+<div id=no-focus-candidate>
+  <button tabindex="0">Toggle popover</button>
+  <div popover id=no-focus-candidate-p>
+    Popover with <button tabindex="0">focusable element</button>
+    <div popover id=no-focus-candidate-p2>Nested popover with <button tabindex="0">focusable element</button></div>
+  </div>
+</div>
+<button id="after"></button>
+
+<script>
+async function testNoFocusCandidate() {
+  const invoker = document.querySelector('#no-focus-candidate>button');
+  const popover = document.querySelector('#no-focus-candidate>[popover]');
+  const nestedPopover = document.querySelector('#no-focus-candidate>[popover]>[popover]');
+  invoker.focus(); // Make sure button is focused.
+  assert_equals(document.activeElement,invoker);
+  invoker.click(); // Activate the invoker
+  assert_true(popover.matches(':popover-open'), 'popover should be invoked by invoker');
+  assert_equals(document.activeElement,invoker, 'invoker should still be focused');
+  await sendTab();
+  assert_equals(document.activeElement,popover.querySelector('button'),'next up is the popover');
+  await sendEnter(); // Show nested popover
+  assert_true(nestedPopover.matches(':popover-open'), 'nested popover should be invoked by invoker');
+  await sendTab();
+  assert_equals(document.activeElement, nestedPopover.querySelector('button'), 'focus on the nested popover button');
+  popover.querySelector('button').disabled = true; // Make the invoker no longer a focus candidate.
+  await sendShiftTab();
+  assert_equals(document.activeElement, invoker, 'initial invoker should be focused, nested popover invoker is skipped since it is disabled');
+  nestedPopover.querySelector('button').focus();
+  await sendTab();
+  assert_equals(document.activeElement,after,'no more focusable elements after the button');
+}
+promise_test(async t => {
+  const invoker = document.querySelector('#no-focus-candidate>button');
+  const popover = document.querySelector('#no-focus-candidate>[popover]');
+  const nestedButton = popover.querySelector('button');
+  const nestedPopover = document.querySelector('#no-focus-candidate>[popover]>[popover]');
+  invoker.setAttribute('popovertarget', 'no-focus-candidate-p');
+  nestedButton.setAttribute('popovertarget', 'no-focus-candidate-p2');
+  t.add_cleanup(() => {
+    invoker.removeAttribute('popovertarget');
+    nestedButton.removeAttribute('popovertarget');
+    nestedButton.disabled = false;
+    popover.hidePopover();
+    nestedPopover.hidePopover();
+  });
+  await testNoFocusCandidate();
+}, "Cases where the next focus candidate isn't in the direct parent scope with popovertarget invocation");
+promise_test(async t => {
+  const invoker = document.querySelector('#no-focus-candidate>button');
+  const popover = document.querySelector('#no-focus-candidate>[popover]');
+  const nestedButton = popover.querySelector('button');
+  const nestedPopover = document.querySelector('#no-focus-candidate>[popover]>[popover]');
+  invoker.setAttribute('commandfor', 'no-focus-candidate-p');
+  invoker.setAttribute('command', 'toggle-popover');
+  nestedButton.setAttribute('commandfor', 'no-focus-candidate-p2');
+  nestedButton.setAttribute('command', 'toggle-popover');
+  t.add_cleanup(() => {
+    invoker.removeAttribute('command');
+    invoker.removeAttribute('commandfor');
+    nestedButton.removeAttribute('command');
+    nestedButton.removeAttribute('commandfor');
+    nestedButton.disabled = false;
+    popover.hidePopover();
+    nestedPopover.hidePopover();
+  });
+  await testNoFocusCandidate();
+}, "Cases where the next focus candidate isn't in the direct parent scope with command/commandfor invocation");
+promise_test(async t => {
+  const invoker = document.querySelector('#no-focus-candidate>button');
+  const popover = document.querySelector('#no-focus-candidate>[popover]');
+  const nestedButton = popover.querySelector('button');
+  const nestedPopover = document.querySelector('#no-focus-candidate>[popover]>[popover]');
+  const invokerClick = () => {
+    popover.togglePopover({ source: invoker });
+  };
+  invoker.addEventListener('click', invokerClick);
+  const nestedButtonClick = () => {
+    nestedPopover.togglePopover({ source: nestedButton });
+  };
+  nestedButton.addEventListener('click', nestedButtonClick);
+  t.add_cleanup(() => {
+    invoker.removeEventListener('click', invokerClick);
+    nestedButton.removeEventListener('click', nestedButtonClick);
+    nestedButton.disabled = false;
+    popover.hidePopover();
+    nestedPopover.hidePopover();
+  });
+  await testNoFocusCandidate();
+}, "Cases where the next focus candidate isn't in the direct parent scope with imperative invocation");
+</script>
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-focus-tabindex.html b/tests/wpt/tests/html/semantics/popovers/popover-focus-tabindex.html
new file mode 100644
index 00000000000..f9c2342ba5e
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/popovers/popover-focus-tabindex.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>Popover focus behaviors</title>
+<meta name="timeout" content="long">
+<link rel="author" title="Edgar Chen" href="mailto:echen@mozilla.com">
+<link rel=help href="https://html.spec.whatwg.org/#flattened-tabindex-ordered-focus-navigation-scope">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/popover-utils.js"></script>
+
+<div id=focus-tabindex>
+  <span tabindex=0>First other focusable element</span>
+  <button popovertarget=focus-tabindex-p tabindex="1">Toggle popover</button>
+  <div popover id=focus-tabindex-p>
+    Popover with <button tabindex="0">focusable element</button>
+  </div>
+  <span tabindex=0>Second other focusable element</span>
+</div>
+<script>
+promise_test(async t => {
+  const popover = document.querySelector('#focus-tabindex>[popover]');
+  t.add_cleanup(() => {
+    popover.hidePopover();
+  });
+
+  const invoker = document.querySelector('#focus-tabindex>button');
+  const others = document.querySelectorAll('#focus-tabindex>span');
+  invoker.focus(); // Make sure button is focused.
+  assert_equals(document.activeElement, invoker);
+  invoker.click(); // Activate the invoker
+  assert_true(popover.matches(':popover-open'), 'Popover should be invoked by invoker');
+  assert_equals(document.activeElement, invoker, 'Invoker should still be focused');
+  others[1].focus();
+  assert_equals(document.activeElement, others[1], "Second focused element should be focused");
+  await sendShiftTab();
+  assert_equals(document.activeElement, others[0], 'Popover should be skipped since its invoker has different tabindex');
+}, "Cases where the popover invoker has different tabindex");
+</script>
diff --git a/tests/wpt/tests/html/semantics/popovers/resources/popover-utils.js b/tests/wpt/tests/html/semantics/popovers/resources/popover-utils.js
index 544ec843152..7878b125f2f 100644
--- a/tests/wpt/tests/html/semantics/popovers/resources/popover-utils.js
+++ b/tests/wpt/tests/html/semantics/popovers/resources/popover-utils.js
@@ -2,10 +2,6 @@ function waitForRender() {
   return new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve)));
 }
 
-function waitForTick() {
-  return new Promise(resolve => step_timeout(resolve, 0));
-}
-
 async function clickOn(element) {
   await waitForRender();
   let rect = element.getBoundingClientRect();
@@ -143,3 +139,17 @@ function assertNotAPopover(nonPopover) {
   assert_throws_dom("NotSupportedError",() => nonPopover.togglePopover(),'Calling togglePopover on a non-popover should throw NotSupported');
   assertPopoverVisibility(nonPopover, /*isPopover*/false, expectVisible, 'Calling togglePopover on a non-popover should leave it visible');
 }
+
+async function verifyFocusOrder(order,description) {
+  order[0].focus();
+  for(let i=0;i<order.length;++i) {
+    const control = order[i];
+    assert_equals(document.activeElement,control,`${description}: Step ${i+1}`);
+    await sendTab();
+  }
+  for(let i=order.length-1;i>=0;--i) {
+    const control = order[i];
+    await sendShiftTab();
+    assert_equals(document.activeElement,control,`${description}: Step ${i+1} (backwards)`);
+  }
+}
diff --git a/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/parse-error-location.tentative.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/parse-error-location.tentative.html
new file mode 100644
index 00000000000..5c8dda80cd5
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/parse-error-location.tentative.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>JSON modules: parse error file location</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+setup({
+  allow_uncaught_exception: true,
+});
+async_test(t => {
+  window.addEventListener("error", t.step_func_done(e => {
+    // The specific values of these properties are implementation-defined
+    // per https://html.spec.whatwg.org/#report-an-exception
+    // and https://html.spec.whatwg.org/#extract-error,
+    // but it's preferable if implementations provide the
+    // correct file location.
+    assert_equals(e.filename, new URL("parse-error.json", location).href);
+  }));
+});
+</script>
+<script type="module">
+import v from "./parse-error.json" with { type: "json" };
+</script>
diff --git a/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/parse-error.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/parse-error.html
index 88fb23a00d9..3c079f0654b 100644
--- a/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/parse-error.html
+++ b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/parse-error.html
@@ -11,8 +11,16 @@ setup({
 async_test(t => {
   window.addEventListener("error", t.step_func_done(e => {
     assert_true(e instanceof ErrorEvent, "ErrorEvent");
-    assert_equals(e.filename, new URL("parse-error.json", location).href);
     assert_true(e.error instanceof SyntaxError, "SyntaxError");
+
+    // The specific values of these properties are implementation-defined
+    // per https://html.spec.whatwg.org/#report-an-exception
+    // and https://html.spec.whatwg.org/#extract-error.
+    // But, we can at least check that they exist.
+    assert_not_equals(e.message, undefined);
+    assert_not_equals(e.filename, undefined);
+    assert_not_equals(e.lineno, undefined);
+    assert_not_equals(e.colno, undefined);
   }));
 });
 </script>
diff --git a/tests/wpt/tests/html/semantics/tabular-data/processing-model-1/col-span-limits.html b/tests/wpt/tests/html/semantics/tabular-data/processing-model-1/col-span-limits.html
index a4a425b9c1f..2a1ac80e65a 100644
--- a/tests/wpt/tests/html/semantics/tabular-data/processing-model-1/col-span-limits.html
+++ b/tests/wpt/tests/html/semantics/tabular-data/processing-model-1/col-span-limits.html
@@ -39,12 +39,21 @@ These two must look the same, each having 2 cells in one row:
 </table>
 <br>
 <table id=table3>
-  <col span=1001>
+  <col id="colspan-3" span=1001>
   <tr>
     <td colspan=1000><div class="square"></div></td>
     <td><div class="square"></div></td>
   </tr>
 </table>
+<table>
+    <tr>
+        <td id="colspan-limit-test1" colspan=5></td>
+        <td id="colspan-limit-test2" colspan=0></td>
+        <td id="colspan-limit-test3" colspan=1000></td>
+        <td id="colspan-limit-test4" colspan=1001></td>
+        <td id="colspan-limit-test5" colspan=5555555></td>
+    </tr>
+</table>
 </main>
 
 <script>
@@ -56,4 +65,48 @@ test(() => {
     assert_equals(table2.offsetWidth, 51, "table2 width");
     assert_equals(table3.offsetWidth, 51, "table3 width");
 }, "col span of 1001 must be treated as 1000");
+
+test(() => {
+    let td = document.createElement("td");
+    td.colSpan = 5;
+    assert_equals(td.colSpan, 5);
+
+    td.colSpan = 0;
+    assert_equals(td.colSpan, 1);
+
+    td.colSpan = 1000;
+    assert_equals(td.colSpan, 1000);
+
+    td.colSpan = 1001;
+    assert_equals(td.colSpan, 1000);
+
+    td.colSpan = 555555;
+    assert_equals(td.colSpan, 1000);
+}, "colspan must be clamped to [1, 1000] when set via script");
+
+test(() => {
+    assert_equals(document.getElementById("colspan-limit-test1").colSpan, 5);
+    assert_equals(document.getElementById("colspan-limit-test2").colSpan, 1);
+    assert_equals(document.getElementById("colspan-limit-test3").colSpan, 1000);
+    assert_equals(document.getElementById("colspan-limit-test4").colSpan, 1000);
+    assert_equals(document.getElementById("colspan-limit-test5").colSpan, 1000);
+}, "colspan must be clamped to [1, 1000] when parsing attributes");
+
+test(() => {
+    let column = document.getElementById("colspan-3");
+    column.span = 5;
+    assert_equals(column.span, 5);
+
+    column.span = 0;
+    assert_equals(column.span, 1);
+
+    column.span = 1000;
+    assert_equals(column.span, 1000);
+
+    column.span = 1001;
+    assert_equals(column.span, 1000);
+
+    column.span = 555555;
+    assert_equals(column.span, 1000);
+}, "column span must be clamped to [1, 1000] when set via script");
 </script>
diff --git a/tests/wpt/tests/html/semantics/tabular-data/processing-model-1/span-limits.html b/tests/wpt/tests/html/semantics/tabular-data/processing-model-1/span-limits.html
index cdfa61bbcdc..798639b3875 100644
--- a/tests/wpt/tests/html/semantics/tabular-data/processing-model-1/span-limits.html
+++ b/tests/wpt/tests/html/semantics/tabular-data/processing-model-1/span-limits.html
@@ -29,6 +29,17 @@
   <!-- We'll add another 65534 rows later -->
 </table>
 
+<table>
+    <tr>
+        <td id="rowspan-limit-test1" rowspan=5></td>
+        <td id="rowspan-limit-test2" rowspan=0></td>
+        <td id="rowspan-limit-test3" rowspan=1000></td>
+        <td id="rowspan-limit-test4" rowspan=65534></td>
+        <td id="rowspan-limit-test5" rowspan=65535></td>
+        <td id="rowspan-limit-test6" rowspan=5555555></td>
+    </tr>
+</table>
+
 <script>
 var $ = document.querySelector.bind(document);
 
@@ -63,4 +74,34 @@ test(() => {
     assert_equals($("#d1").getBoundingClientRect().bottom,
                   $("#d2").getBoundingClientRect().bottom);
 }, "rowspan of 65535 must be treated as 65534");
+
+test(() => {
+    let td = document.createElement("td");
+    td.rowSpan = 5;
+    assert_equals(td.rowSpan, 5);
+
+    td.rowSpan = 0;
+    assert_equals(td.rowSpan, 0);
+
+    td.rowSpan = 1000;
+    assert_equals(td.rowSpan, 1000);
+
+    td.rowSpan = 65534;
+    assert_equals(td.rowSpan, 65534);
+
+    td.rowSpan = 65535;
+    assert_equals(td.rowSpan, 65534);
+
+    td.rowSpan = 555555;
+    assert_equals(td.rowSpan, 65534);
+}, "rowspan must be clamped to [0, 65534] when set via script");
+
+test(() => {
+    assert_equals(document.getElementById("rowspan-limit-test1").rowSpan, 5);
+    assert_equals(document.getElementById("rowspan-limit-test2").rowSpan, 0);
+    assert_equals(document.getElementById("rowspan-limit-test3").rowSpan, 1000);
+    assert_equals(document.getElementById("rowspan-limit-test4").rowSpan, 65534);
+    assert_equals(document.getElementById("rowspan-limit-test5").rowSpan, 65534);
+    assert_equals(document.getElementById("rowspan-limit-test6").rowSpan, 65534);
+}, "rowspan must be clamped to [0, 65534] when parsing attributes");
 </script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/command-and-commandfor/on-popover-behavior.html b/tests/wpt/tests/html/semantics/the-button-element/command-and-commandfor/on-popover-behavior.html
index 77325b5f0f6..44496e9b386 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/command-and-commandfor/on-popover-behavior.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/command-and-commandfor/on-popover-behavior.html
@@ -12,6 +12,13 @@
 </div>
 <button id="invokerbutton" commandfor="invokee" command="toggle-popover"></button>
 
+<style>
+#invokee {
+  margin: 0;
+  position-area: block-end span-all;
+}
+</style>
+
 <script>
   function resetState() {
     invokerbutton.setAttribute("commandfor", "invokee");
@@ -149,4 +156,16 @@
     invokerbutton.click();
     assert_false(invokee.matches(":popover-open"));
   }, "invoking (as hide-popover) closed popover is noop");
+
+
+  test(function (t) {
+    t.add_cleanup(resetState);
+    invokerbutton.setAttribute("command", "show-popover");
+    invokerbutton.click();
+    assert_true(invokee.matches(":popover-open"),
+      ":popover-open should match after calling invokerbutton.click()");
+    const rect = invokee.getBoundingClientRect();
+    assert_not_equals(rect.y, 0,
+      "popover should not be at the top of the window because it is anchor positioned.");
+  }, "invoking (as show-popover) should create an implicit anchor reference for anchor positioning.");
 </script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-css-properties.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-css-properties.tentative.html
index 8e918b0434c..0aa45a41b3b 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-css-properties.tentative.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-css-properties.tentative.html
@@ -25,6 +25,7 @@ function testprop(prop) {
   test_valid_value(prop, '32s');
   test_valid_value(prop, '123ms');
   test_valid_value(prop, 'inherit');
+  test_valid_value(prop, 'calc(2s * sibling-index())');
 
   // Invalid values:
   test_invalid_value(prop, '0', '0s');
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-has-interest-pseudo.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-has-interest-pseudo.tentative.html
deleted file mode 100644
index 2ace6fdcd44..00000000000
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-has-interest-pseudo.tentative.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<link rel="author" href="mailto:masonf@chromium.org">
-<link rel="help" href="https://open-ui.org/components/interest-invokers.explainer">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-actions.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="resources/invoker-utils.js"></script>
-
-<div id=unrelated>Unrelated</div>
-<button id=button interesttarget=target>Button</button>
-<div id=target>Target</div>
-<style>
-  button {
-    interest-target-delay: 0s;
-  }
-</style>
-<script>
-promise_test(async (t) => {
-  let hasInterest = false;
-  target.addEventListener('interest',() => (hasInterest=true));
-  target.addEventListener('loseinterest',() => (hasInterest=false));
-  assert_false(button.matches(':has-interest'));
-  assert_false(target.matches(':has-interest'));
-  assert_false(hasInterest);
-  await hoverOver(button);
-  assert_true(button.matches(':has-interest'),'hovering button shows interest');
-  assert_false(target.matches(':has-interest'),'target never matches the pseudo class');
-  assert_true(hasInterest,'event was fired');
-  await hoverOver(target);
-  assert_true(button.matches(':has-interest'),'hovering the target maintains interest');
-  assert_false(target.matches(':has-interest'),'target never matches the pseudo class');
-  assert_true(hasInterest,'loseinterest event was not yet fired');
-  await hoverOver(unrelated);
-  assert_false(button.matches(':has-interest'),'hovering unrelated loses interest');
-  assert_false(target.matches(':has-interest'),'target never matches the pseudo class');
-  assert_false(hasInterest,'loseinterest event was fired');
-},'The :has-interest pseudo class matches when an element has interest');
-
-const invokerDelayMs = 100; // The CSS delay setting.
-const hoverWaitTime = 200; // How long to wait to cover the delay for sure.
-promise_test(async (t) => {
-  t.add_cleanup(() => button.removeAttribute('style'));
-  button.setAttribute('style',`interest-target-delay: ${invokerDelayMs}ms`);
-  assert_false(button.matches(':has-interest'));
-  const token1 = await mouseOverAndRecord(t,button);
-  const immediate_result = button.matches(':has-interest');
-  if (msSinceMouseOver(token1) < invokerDelayMs) {
-    assert_false(immediate_result,':has-interest should not match before the show delay elapses');
-  }
-  await waitForHoverTime(hoverWaitTime);
-  assert_true(button.matches(':has-interest'),':has-interest should match after hover delay');
-  const token2 = await mouseOverAndRecord(t,unrelated);
-  const immediate_result2 = button.matches(':has-interest');
-  if (msSinceMouseOver(token2) < invokerDelayMs) {
-    assert_true(immediate_result2,':has-interest should still match before the hide delay elapses');
-  }
-  await waitForHoverTime(hoverWaitTime);
-  assert_false(button.matches(':has-interest'),':has-interest should not match after de-hover delay');
-},'The :has-interest pseudo class only matches after delays, once interest is shown');
-</script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-hide-delay.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-hide-delay.tentative.html
index 9ec1c229c01..8828d879cac 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-hide-delay.tentative.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-hide-delay.tentative.html
@@ -10,8 +10,17 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/invoker-utils.js"></script>
 
+<meta name=variant content=?method=hover>
+<meta name=variant content=?method=focus>
+
 <body>
 <script>
+// The invokerMethod parameter is provided by variants, to
+// effectively split this (slow) test into multiple runs.
+const urlParams = new URLSearchParams(window.location.search);
+invokerMethod = urlParams.get('method');
+description = `method ${invokerMethod}`;
+
 // NOTE about testing methodology:
 // This test uses popovers as an invoker target, and checks whether they are
 // hidden *after* the appropriate de-hover delay. The delay used for testing is
@@ -29,19 +38,19 @@ async function makeTestParts(t) {
   // This ensures the tests in this file don't succeed sometimes, due to the above NOTE.
   assert_true(HTMLAnchorElement.prototype.hasOwnProperty('interestTargetElement'),'interesttarget is not supported');
   let {popover, invoker, unrelated} = await createPopoverAndInvokerForHoverTests(t, /*showdelayMs*/ 0, invokerHideDelay);
-  let mouseOverInvoker;
+  let specificInvokerElement;
   invoker.innerHTML = '<span><span>Click me</span></span>';
-  mouseOverInvoker = invoker.firstElementChild.firstElementChild;
-  assert_true(!!mouseOverInvoker);
-  assert_false(popover.matches(':popover-open'));
-  await hoverOver(invoker); // Always start with the mouse over the invoker, which will invoke the popover immediately
-  assert_true(popover.matches(':popover-open'));
-  return {popover, invoker, unrelated, mouseOverInvoker};
+  specificInvokerElement = invoker.firstElementChild.firstElementChild;
+  assert_true(!!specificInvokerElement,'invalid');
+  assert_false(popover.matches(':popover-open'),'popover should start closed');
+  await hoverOrFocus(invokerMethod,invoker); // Always start with the focus/mouse over the invoker, which will invoke the popover immediately
+  assert_true(popover.matches(':popover-open'),'popover should be open');
+  return {popover, invoker, unrelated, specificInvokerElement};
 }
 
 promise_test(async (t) => {
   const {popover,invoker} = await makeTestParts(t);
-  const token = await mouseOverAndRecord(t,invoker);
+  const token = await mouseOverOrFocusAndRecord(t,invokerMethod,invoker);
   await waitForHoverTime(hoverWaitTime);
   assert_true(msSinceMouseOver(token) >= hoverWaitTime,'waitForHoverTime should wait the specified time');
   assert_true(hoverWaitTime > invokerHideDelay,'invokerHideDelay is the value from CSS, hoverWaitTime should be longer than that');
@@ -49,41 +58,55 @@ promise_test(async (t) => {
 
 promise_test(async (t) => {
   const {popover,invoker,unrelated} = await makeTestParts(t);
-  const token = await mouseOverAndRecord(t,unrelated);
+  const token = await mouseOverOrFocusAndRecord(t,invokerMethod,unrelated);
   let showing = popover.matches(':popover-open');
   if (msSinceMouseOver(token) < invokerHideDelay) {
     // Only check if the WPT runner wasn't too slow.
     assert_true(showing,'interest shouldn\'t be immediately lost');
   }
-  await hoverOver(unrelated);
+  await hoverOrFocus(invokerMethod,unrelated);
   await waitForHoverTime(hoverWaitTime);
   assert_false(popover.matches(':popover-open'),'interest should be lost after delay');
-},`The interest-target-hide-delay causes interest to be lost after a delay`);
+},`The interest-target-hide-delay causes interest to be lost after a delay, ${description}`);
 
 promise_test(async (t) => {
   const {popover,invoker,unrelated} = await makeTestParts(t);
-  await hoverOver(popover);
+  // First hover/focus unrelated.
+  const token = await mouseOverOrFocusAndRecord(t,invokerMethod,unrelated);
+  // Then immediately re-hover/focus the invoker.
+  await hoverOrFocus(invokerMethod,invoker);
+  if (msSinceMouseOver(token) >= invokerHideDelay)
+    return; // The WPT runner was too slow.
+  let showing1 = popover.matches(':popover-open');
+  await waitForHoverTime(hoverWaitTime);
+  let showing2 = popover.matches(':popover-open');
+  assert_true(showing1 && showing2,'interest should not be lost');
+},`Hide delay is cancelled if hover/focus returns, ${description}`);
+
+promise_test(async (t) => {
+  const {popover,invoker,unrelated} = await makeTestParts(t);
+  await hoverOrFocus(invokerMethod,popover);
   await waitForHoverTime(hoverWaitTime);
   assert_true(popover.matches(':popover-open'),'hovering the interest target element should keep it showing');
-  const token = await mouseOverAndRecord(t,unrelated);
+  const token = await mouseOverOrFocusAndRecord(t,invokerMethod,unrelated);
   let showing = popover.matches(':popover-open');
   if (msSinceMouseOver(token) >= invokerHideDelay)
     return; // The WPT runner was too slow.
   assert_true(showing,'subsequently hovering unrelated element shouldn\'t immediately cause interest lost');
-  await hoverOver(unrelated);
+  await hoverOrFocus(invokerMethod,unrelated);
   await waitForHoverTime(hoverWaitTime);
   assert_false(popover.matches(':popover-open'),'hovering unrelated element should cause interest lost after delay');
-},`hovering the interest target element keeps the invoker from losing interest`);
+},`hovering/focusing the interest target element keeps the invoker from losing interest, ${description}`);
 
 promise_test(async (t) => {
-  const {popover,invoker,unrelated,mouseOverInvoker} = await makeTestParts(t);
-  await hoverOver(popover);
+  const {popover,invoker,unrelated,specificInvokerElement} = await makeTestParts(t);
+  await hoverOrFocus(invokerMethod,popover);
   await waitForHoverTime(hoverWaitTime);
-  await hoverOver(mouseOverInvoker);
+  await hoverOrFocus(invokerMethod,specificInvokerElement);
   await waitForHoverTime(hoverWaitTime);
   assert_true(popover.matches(':popover-open'),'Moving hover between invoker and target should not cause interest lost');
-  await hoverOver(unrelated);
+  await hoverOrFocus(invokerMethod,unrelated);
   await waitForHoverTime(hoverWaitTime);
   assert_false(popover.matches(':popover-open'),'Moving hover to unrelated should cause interest lost');
-},`moving hover between the invoker and the target prevents interest lost`);
+},`moving hover/focus between the invoker and the target prevents interest lost, ${description}`);
 </script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-keyboard-behavior.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-keyboard-behavior.tentative.html
index 93930140b3d..7040019e750 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-keyboard-behavior.tentative.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-keyboard-behavior.tentative.html
@@ -9,6 +9,7 @@
 <script src="/resources/testdriver-actions.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/invoker-utils.js"></script>
+<script src="/html/semantics/popovers/resources/popover-utils.js"></script>
 
 <div id="examples">
   <button id="<button>" interesttarget=target>Button</button>
@@ -33,74 +34,78 @@
   [interesttarget] {
     interest-target-delay: 0s;
   }
+  [interesttarget].longhide {
+    interest-target-hide-delay: 10000s;
+  }
 </style>
 
 <script>
-const kShift = "\uE008";
-const kMeta = "\uE03d";
-const kControl = "\uE009";
-const kAlt = "\uE00A";
-const kArrowUp = '\uE013';
-const kEscape = '\uE00C';
-function sendLoseInterestHotkey() {
-  return new test_driver.Actions()
-    .keyDown(kEscape)
-    .keyUp(kEscape)
-    .send();
-}
-function sendShowInterestHotkey(extra_modifier) {
-  assert_not_equals(extra_modifier,kAlt);
-  let actions = new test_driver.Actions();
-  if (extra_modifier) {
-    actions.keyDown(extra_modifier);
-  }
-  actions.keyDown(kAlt)
-    .keyDown(kArrowUp)
-    .keyUp(kArrowUp)
-    .keyUp(kAlt);
-  if (extra_modifier) {
-    actions.keyUp(extra_modifier);
-  }
-  return actions.send();
-}
 const allInterestTargetElements = document.querySelectorAll('#examples [interesttarget]');
-function verifyInterest(onlyElement,description) {
+function verifyInterest(onlyElements,description) {
+  if (!(onlyElements instanceof Array)) {
+    onlyElements = [onlyElements];
+  }
   [...allInterestTargetElements, another].forEach(el => {
-    const expectInterest = el == onlyElement;
+    const expectInterest = onlyElements.includes(el);
     assert_equals(el.matches(':has-interest'),expectInterest,`${description}, element ${el.id} should ${expectInterest ? "" : "NOT "}have interest`);
   })
 }
 allInterestTargetElements.forEach(el => {
   const description = `${el.id}`;
   promise_test(async function (t) {
+    t.add_cleanup(() => otherbutton.focus());
     target.hidePopover(); // Just in case
-    el.focus();
+    await focusOn(el);
     assert_equals(document.activeElement,el,'Elements should all be focusable');
-    assert_false(target.matches(':popover-open'),'focusing does not trigger interest');
-    await sendShowInterestHotkey();
-    assert_true(target.matches(':popover-open'),'Pressing the hot key should trigger interest');
+    assert_true(target.matches(':popover-open'),'Focusing should trigger interest');
+    verifyInterest(el,`After show interest in ${el.id}`);
+    await focusOn(otherbutton);
+    assert_not_equals(document.activeElement,el);
+    assert_false(target.matches(':popover-open'),'Blurring should trigger lose interest');
+    verifyInterest(undefined,`After lose interest in ${el.id}`);
+  },`Basic keyboard focus behavior, ${description}`);
+
+  promise_test(async function (t) {
+    t.add_cleanup(() => otherbutton.focus());
+    target.hidePopover(); // Just in case
+    await focusOn(el);
+    assert_true(target.matches(':popover-open'),'Focusing should trigger interest');
     verifyInterest(el,`After show interest in ${el.id}`);
     await sendLoseInterestHotkey();
     assert_false(target.matches(':popover-open'),'Pressing lose interest hot key should trigger lose interest');
     verifyInterest(undefined,`After lose interest in ${el.id}`);
-  },`Basic keyboard behavior, ${description}`);
-
-  for (const key of ['Shift','Control','Meta']) {
-    extra_key = eval('k' + key);
-    promise_test(async function (t) {
-      target.hidePopover(); // Just in case
-      el.focus();
-      await sendShowInterestHotkey(extra_key);
-      assert_false(target.matches(':popover-open'),'Pressing the hot key with extra modifiers should not trigger interest');
-    },`Extra ${key} modifier on the gain interest hot key, ${description}`);
-  }
+    await focusOn(otherbutton);
+    assert_not_equals(document.activeElement,el);
+    assert_false(target.matches(':popover-open'),'Blurring should do nothing at this point');
+    verifyInterest(undefined,`After blurring ${el.id}`);
+  },`Lose interest hot key behavior, ${description}`);
 
   promise_test(async function (t) {
+    t.add_cleanup(() => otherbutton.focus());
+    // Ensure blurring doesn't immediately lose interest:
+    el.classList.add('longhide');
+    t.add_cleanup(() => (el.classList.remove('longhide')));
+    target.hidePopover(); // Just in case
+    await focusOn(el);
+    assert_true(target.matches(':popover-open'),'Focusing should trigger interest');
+    verifyInterest(el,`After show interest in ${el.id}`);
+    await focusOn(otherbutton);
+    assert_not_equals(document.activeElement,el);
+    assert_true(target.matches(':popover-open'),'Blurring should not immediately lose interest');
+    verifyInterest(el,`After blurring ${el.id}`);
+    // Send lose interest hot key to the other button (not the invoker):
+    await sendLoseInterestHotkey();
+    assert_false(target.matches(':popover-open'),'Pressing lose interest hot key should trigger lose interest');
+    verifyInterest(undefined,`After lose interest in ${el.id}`);
+  },`Lose interest hot key behavior with element not focused, ${description}`);
+
+  promise_test(async function (t) {
+    t.add_cleanup(() => otherbutton.focus());
     target.hidePopover(); // Just in case
     target.addEventListener('interest', (e) => e.preventDefault(), {once: true});
-    el.focus();
-    await sendShowInterestHotkey();
+    await focusOn(el);
     assert_false(target.matches(':popover-open'));
+    verifyInterest(undefined,`Nothing has interest, ${el.id}`);
   }, `canceling the interest event stops behavior, ${description}`);
 
   let events = [];
@@ -112,19 +117,16 @@ allInterestTargetElements.forEach(el => {
     element.addEventListener('loseinterest',(e) => events.push(`${e.target.id} loseinterest`),{signal});
   }
   promise_test(async function (t) {
+    t.add_cleanup(() => otherbutton.focus());
     target.hidePopover(); // Just in case
     anothertarget.hidePopover(); // Just in case
     events = [];
     addListeners(t,target);
     addListeners(t,anothertarget);
-    el.focus();
-    await sendShowInterestHotkey();
+    await focusOn(el);
     assert_array_equals(events,['target interest'],'first hotkey');
     verifyInterest(el,`After show interest in ${el.id}`);
-    another.focus();
-    assert_array_equals(events,['target interest'],'focusing another element does not change interest');
-    verifyInterest(el,`After focus on ${another.id}`);
-    await sendShowInterestHotkey();
+    await focusOn(another);
     assert_array_equals(events,['target interest','target loseinterest','anothertarget interest'],
         'showing interest in another trigger should lose interest in the first, then gain interest in second');
     verifyInterest(another,`After show interest in ${another.id}`);
@@ -136,27 +138,31 @@ allInterestTargetElements.forEach(el => {
   }, `Showing interest in a second element loses interest in the first, ${description}`);
 
   promise_test(async function (t) {
+    t.add_cleanup(() => otherbutton.focus());
     target.hidePopover(); // Just in case
     anothertarget.hidePopover(); // Just in case
     events = [];
     addListeners(t,target);
     addListeners(t,anothertarget);
-    el.focus();
-    await sendShowInterestHotkey();
-    another.focus();
+    await focusOn(el);
     assert_array_equals(events,['target interest'],'setup');
     verifyInterest(el,`After show interest in ${el.id}`);
     target.addEventListener('loseinterest',(e) => e.preventDefault(),{once: true});
-    await sendShowInterestHotkey();
-    assert_array_equals(events,['target interest','target loseinterest'],
-        'the loseinterest listener should fire, but anothertarget should not get interest');
-    verifyInterest(el,`After show interest in ${another.id}`);
-    el.focus();
+    await focusOn(another);
+    assert_array_equals(events,['target interest','target loseinterest','anothertarget interest'],
+        'the loseinterest listener should fire, and anothertarget should still get interest');
+    events = [];
+    verifyInterest([el,another],`${el.id} should still have interest because loseinterest was cancelled`);
+    assert_false(target.matches(':popover-open'),'anothertarget popover opens, closing target');
+    assert_true(anothertarget.matches(':popover-open'));
     await sendLoseInterestHotkey();
-    assert_array_equals(events,['target interest','target loseinterest','target loseinterest'],'Another event fired');
+    assert_array_equals(events,['anothertarget loseinterest'],'Lose interest hot key on focused element loses just interest in that element');
     assert_false(target.matches(':popover-open'));
     assert_false(anothertarget.matches(':popover-open'));
-    verifyInterest(undefined,`After lose interest in ${el.id}`);
+    await focusOn(el);
+    await sendLoseInterestHotkey();
+    assert_array_equals(events,['anothertarget loseinterest','target loseinterest'],'Now both lost interest');
+    verifyInterest(undefined,`Nothing has interest now`);
   }, `Cancelling loseinterest caused by keyboard-gained interest cancels interest, ${description}`);
 });
 </script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-keyboard-invalidation-ref.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-keyboard-invalidation-ref.html
index 76424374fb8..9d520943d5f 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-keyboard-invalidation-ref.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-keyboard-invalidation-ref.html
@@ -7,18 +7,24 @@
 <button id=hasinterest>Button</button>
 <button class=otherselector>Button</button>
 <button class=otherselector>Button</button>
-<div>Target</div>
+<div popover id=target>Target</div>
 
 <style>
   #hasinterest {
-    background-color: red;
-    outline: solid 3px -webkit-focus-ring-color;
+    background-color: purple;
   }
   .otherselector {
     background-color: green;
   }
+  #target {
+    background-color: yellow;
+    inset:auto;
+    top:50px;
+    left:0;
+  }
 </style>
 
 <script>
+  target.showPopover();
   hasinterest.focus();
 </script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-keyboard-invalidation.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-keyboard-invalidation.tentative.html
index a7b9724d9c8..b6d0ff10932 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-keyboard-invalidation.tentative.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-keyboard-invalidation.tentative.html
@@ -13,36 +13,40 @@
 <button id=b3 interesttarget=target>Button</button>
 <button id=b4>Button</button>
 <button id=b5>Button</button>
-<div id=target>Target</div>
+<div popover id=target>Target</div>
 
 <style>
   :has-interest {
+    background-color: purple;
+  }
+  :has-interest:has-partial-interest {
     background-color: red;
   }
+  /* Test complicated combinators: */
   :has-interest + button {
     background-color: green;
   }
   :root:has(:has-interest) #b5 {
     background-color: green;
   }
+  :target-of-interest {
+    background-color: yellow;
+  }
+  [interesttarget] {
+    interest-target-delay: 0s;
+  }
+  #target {
+    inset:auto;
+    top:50px;
+    left:0;
+  }
 </style>
 
 <script>
-const kAlt = "\uE00A";
-const kArrowUp = '\uE013';
-function keyboardActivate() {
-  return new test_driver.Actions()
-    .keyDown(kAlt)
-    .keyDown(kArrowUp)
-    .keyUp(kArrowUp)
-    .keyUp(kAlt)
-    .send();
-}
 buttons = Array.from(document.querySelectorAll('[interesttarget]'));
 async function runTest() {
   for (const b of buttons) {
     b.focus();
-    await keyboardActivate();
   }
   document.documentElement.classList.remove("reftest-wait");
 }
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-outline-appearance-ref.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-outline-appearance-ref.html
deleted file mode 100644
index 33b0cf66858..00000000000
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-outline-appearance-ref.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<link rel="author" href="mailto:masonf@chromium.org">
-
-<button id=non_interesttarget_button>Interesttarget Button</button>
-
-<script>
-  document.querySelector('#non_interesttarget_button').focus();
-</script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-outline-appearance.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-outline-appearance.tentative.html
deleted file mode 100644
index 28cb2052a8d..00000000000
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-outline-appearance.tentative.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<link rel="author" href="mailto:masonf@chromium.org">
-<link rel="help" href="https://open-ui.org/components/interest-invokers.explainer/" />
-<link rel="mismatch" href="interesttarget-outline-appearance-ref.html">
-
-<button interesttarget=target>Interesttarget Button</button>
-
-<style>
-  /* Outline style should apply even when the element doesn't have interest. */
-  :has-interest { background-color: red; }
-</style>
-
-<script>
-  document.querySelector('[interesttarget]').focus();
-</script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-partial-interest.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-partial-interest.tentative.html
new file mode 100644
index 00000000000..bc7184d42d2
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-partial-interest.tentative.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<link rel="author" href="mailto:masonf@chromium.org">
+<link rel="help" href="https://open-ui.org/components/interest-invokers.explainer/" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/invoker-utils.js"></script>
+
+<button id=invoker interesttarget=target>Button</button>
+<div id=target popover>Popover with <button id=contained>button</button></div>
+
+<style>
+  [interesttarget] {
+    interest-target-delay: 0s;
+  }
+</style>
+
+<script>
+  let expectInterest;
+  let expectPartial;
+  let eventCount = 0;
+  function checkInterest(e) {
+    const notStr = expectInterest ? "" : "not ";
+    const event = e instanceof Event ? `${e.type} event` : e;
+    assert_equals(invoker.matches(':has-interest'),expectInterest,`target should ${notStr}gain interest (${event})`);
+    assert_equals(invoker.matches(':has-partial-interest'),expectInterest&&expectPartial,`Interest should ${expectPartial ? "" : "not "}be partial (${event})`);
+    assert_equals(target.matches(':popover-open'),expectInterest,`popover should ${notStr}be open (${event})`);
+    ++eventCount;
+  }
+
+  promise_test(async function (t) {
+    invoker.addEventListener('focus',checkInterest);
+    target.addEventListener('interest',(e) => {
+      checkInterest(e);
+      expectInterest = true;
+      expectPartial = true;
+    });
+
+    expectInterest = false;
+    expectPartial = false;
+    await focusOn(invoker);
+    assert_equals(eventCount,2,'focus and interest should both have fired');
+    assert_true(expectInterest,'the interest event should set this');
+    checkInterest('before hot key');
+    await sendShowInterestHotkey();
+    expectPartial = false;
+    checkInterest('after hot key');
+  },'Partial interest timing should not be observable');
+</script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-popover-focus.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-popover-focus.tentative.html
new file mode 100644
index 00000000000..9dfc39a37a6
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-popover-focus.tentative.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<link rel="author" href="mailto:masonf@chromium.org">
+<link rel="help" href="https://open-ui.org/components/interest-invokers.explainer/" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/invoker-utils.js"></script>
+<script src="/html/semantics/popovers/resources/popover-utils.js"></script>
+
+<button id=el interesttarget=target>Button</button>
+<div id=target popover>Popover with <button id=contained>button</button></div>
+<button id=otherbutton>Other button</button>
+
+<style>
+  [interesttarget] {
+    interest-target-delay: 0s;
+  }
+</style>
+
+<script>
+  promise_test(async function (t) {
+    let interestCount = 0;
+    let loseInterestCount = 0;
+    target.addEventListener('interest',(e) => ++interestCount);
+    target.addEventListener('loseinterest',(e) => ++loseInterestCount);
+    assert_false(target.matches(':popover-open'));
+    await focusOn(el);
+    assert_equals(document.activeElement,el);
+    assert_true(target.matches(':popover-open'),'Focusing should trigger interest');
+    assert_equals(interestCount,1);
+    assert_equals(loseInterestCount,0);
+    await sendShowInterestHotkey();
+    assert_equals(document.activeElement,contained);
+    assert_true(target.matches(':popover-open'),'Moving focus into popover should not lose interest');
+    assert_equals(interestCount,1);
+    assert_equals(loseInterestCount,0);
+    await sendTab();
+    assert_equals(document.activeElement,otherbutton);
+    assert_false(target.matches(':popover-open'),'Moving focus out of popover and invoker should lose interest');
+    assert_equals(interestCount,1);
+    assert_equals(loseInterestCount,1);
+  },'It should be possible to move focus into target popover');
+</script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-pseudo-classes.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-pseudo-classes.tentative.html
new file mode 100644
index 00000000000..7cd50ebfe20
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-pseudo-classes.tentative.html
@@ -0,0 +1,182 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<meta name="timeout" content="long">
+<link rel="author" href="mailto:masonf@chromium.org">
+<link rel="help" href="https://open-ui.org/components/interest-invokers.explainer">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/invoker-utils.js"></script>
+<script src="/html/semantics/popovers/resources/popover-utils.js"></script>
+
+<div id=unrelated tabindex=0>Unrelated</div>
+<button id=invoker interesttarget=target>Invoker</button>
+<div id=target popover>Target popover with all kinds of focusable things
+  <button id=target_button>contained button</button>
+  <button id=target_button_2>contained button 2</button>
+  <a href=foo>Link</a>
+  <dialog open>Dialog</dialog>
+  <textarea></textarea>
+  <input type=text>
+  <input type=checkbox>
+  <input type=radio>
+  <input type=button>
+  <input type=range>
+  <map name="mymap">
+    <area shape="circle" coords="75,75,75" href=foo>
+  </map>
+  <img usemap="#mymap" src="../../embedded-content/the-img-element/resources/green.png">
+  <div tabindex=0>tabindex=0</div>
+</div>
+<button id=after>Button after</button>
+<style>
+  button {
+    interest-target-delay: 0s;
+  }
+</style>
+<script>
+function checkPseudos(invoker,target,expectHasPartialInterest,expectHasInterest,expectTargetHasPartialInterest,expectTargetHasInterest,msg) {
+  msg = msg ?? 'Error';
+  assert_true(!expectHasPartialInterest || expectHasInterest,'Partial interest can\'t be true without full interest');
+  assert_true(!expectTargetHasPartialInterest || expectTargetHasInterest,'Partial interest can\'t be true without full interest (target)');
+  assert_equals(invoker.matches(':has-interest'),expectHasInterest,`${msg}: :has-interest mismatch`);
+  assert_equals(invoker.matches(':has-partial-interest'),expectHasPartialInterest,`${msg}: :has-partial-interest mismatch`);
+  assert_equals(target.matches(':target-of-interest'),expectTargetHasInterest,`${msg}: :target-of-partial-interest mismatch`);
+  assert_equals(target.matches(':target-of-partial-interest'),expectTargetHasPartialInterest,`${msg}: :target-of-partial-interest mismatch`);
+  assert_false(invoker.matches(':target-of-interest'),'invoker should never match :target-of-interest');
+  assert_false(invoker.matches(':target-of-partial-interest'),'invoker should never match :target-of-partial-interest');
+  assert_false(target.matches(':has-interest'),'target should never match :has-interest');
+  assert_false(target.matches(':has-partial-interest'),'target should never match :has-partial-interest');
+  assert_equals(target.matches(':popover-open'),expectTargetHasInterest,'Popover should be open if target has interest');
+}
+// Note that add_cleanup does not wait for async functions.
+async function do_cleanup(t) {
+  invoker.removeAttribute('style');
+  await focusOn(unrelated);
+  await hoverOver(unrelated);
+  await sendLoseInterestHotkey();
+  target.hidePopover();
+  await waitForRender();
+}
+
+promise_test(async (t) => {
+  let hasInterest = false;
+  target.addEventListener('interest',() => (hasInterest=true));
+  target.addEventListener('loseinterest',() => (hasInterest=false));
+  checkPseudos(invoker,target,false,false,false,false,'initial');
+  assert_false(hasInterest);
+  await hoverOver(invoker);
+  checkPseudos(invoker,target,false,true,false,true,'hovering invoker shows full interest (and not partial interest)');
+  assert_true(hasInterest,'event was fired');
+  await hoverOver(target);
+  checkPseudos(invoker,target,false,true,false,true,'hovering the target maintains interest');
+  assert_true(hasInterest,'loseinterest event was not yet fired');
+  await hoverOver(unrelated);
+  checkPseudos(invoker,target,false,false,false,false,'hovering unrelated loses interest');
+  assert_false(hasInterest,'loseinterest event was fired');
+  await do_cleanup();
+},'Basic pseudo class function, with mouse hover triggering');
+
+promise_test(async (t) => {
+  let hasInterest = false;
+  target.addEventListener('interest',() => (hasInterest=true));
+  target.addEventListener('loseinterest',() => (hasInterest=false));
+  checkPseudos(invoker,target,false,false,false,false,'initial');
+  assert_false(hasInterest);
+  await focusOn(invoker);
+  checkPseudos(invoker,target,true,true,true,true,'focusing invoker shows partial interest (and therefore also interest)');
+  assert_true(hasInterest,'event was fired');
+  // Partial interest does not affect programmatic focusability:
+  await focusOn(target_button);
+  checkPseudos(invoker,target,false,true,false,true,'focusing the target upgrades to full interest (no longer partial interest)');
+  assert_true(hasInterest,'loseinterest event was not yet fired');
+  await focusOn(invoker);
+  checkPseudos(invoker,target,false,true,false,true,'focusing back on invoker keeps full interest');
+  assert_true(hasInterest,'loseinterest event was not yet fired');
+  await focusOn(unrelated);
+  checkPseudos(invoker,target,false,false,false,false,'focusing unrelated loses interest');
+  assert_false(hasInterest,'loseinterest event was fired');
+  await do_cleanup();
+},'Basic pseudo class function, with keyboard focus triggering');
+
+promise_test(async (t) => {
+  checkPseudos(invoker,target,false,false,false,false,'initial');
+  await focusOn(invoker);
+  checkPseudos(invoker,target,true,true,true,true,'focusing invoker shows partial interest');
+  assert_equals(document.activeElement,invoker);
+  // Tab once, which should skip over the button in the popover, to the button
+  // that comes after it.
+  await sendTab();
+  assert_equals(document.activeElement,after,'focus should be on the button after the popover');
+  checkPseudos(invoker,target,false,false,false,false,'interest was lost, due to blur of the invoker');
+  await do_cleanup();
+},'Keyboard-triggered partial focus keeps contents from being keyboard focusable');
+
+promise_test(async (t) => {
+  checkPseudos(invoker,target,false,false,false,false,'initial');
+  await focusOn(invoker);
+  checkPseudos(invoker,target,true,true,true,true,'focusing invoker shows partial interest');
+  invoker.setAttribute('style',`interest-target-delay: 10000s`);
+  await sendShowInterestHotkey();
+  checkPseudos(invoker,target,false,true,false,true,'invoker now has full interest');
+  assert_equals(document.activeElement,target_button,'focus moves to the target automatically');
+  await do_cleanup();
+},'Show interest hotkey confers "full interest", without any delays');
+
+promise_test(async (t) => {
+  checkPseudos(invoker,target,false,false,false,false,'initial');
+  await focusOn(invoker);
+  await sendShowInterestHotkey();
+  checkPseudos(invoker,target,false,true,false,true,'invoker now has full interest');
+  await sendTab();
+  assert_equals(document.activeElement,target_button_2,'focus should now be able to move within the target');
+  await sendShiftTab();
+  assert_equals(document.activeElement,target_button,'focus should now be able to move within the target (backwards)');
+  await sendShiftTab();
+  assert_equals(document.activeElement,invoker,'focus should go back to invoker');
+  checkPseudos(invoker,target,false,true,false,true,'focusing back on invoker keeps full interest');
+  await focusOn(unrelated);
+  checkPseudos(invoker,target,false,false,false,false,'focusing unrelated loses interest');
+  await do_cleanup();
+},'With full interest, contents are keyboard focusable');
+
+promise_test(async (t) => {
+  checkPseudos(invoker,target,false,false,false,false,'initial');
+  await focusOn(invoker);
+  checkPseudos(invoker,target,true,true,true,true,'focusing invoker shows partial interest');
+  invoker.setAttribute('style',`interest-target-delay: 10000s`);
+  await sendLoseInterestHotkey();
+  checkPseudos(invoker,target,false,false,false,false,'Hot key loses interest immediately (no delays)');
+  await do_cleanup();
+},`Lose interest hotkey works`);
+
+const invokerDelayMs = 100; // The CSS delay setting.
+const hoverWaitTime = 200; // How long to wait to cover the delay for sure.
+promise_test(async (t) => {
+  invoker.setAttribute('style',`interest-target-delay: ${invokerDelayMs}ms`);
+  checkPseudos(invoker,target,false,false,false,false,'initial');
+  const token1 = await mouseOverAndRecord(t,invoker);
+  const immediate_result = invoker.matches(':has-interest') ||
+      invoker.matches(':has-partial-interest') ||
+      target.matches(':target-of-interest') ||
+      target.matches(':target-of-partial-interest');
+  if (msSinceMouseOver(token1) < invokerDelayMs) {
+    assert_false(immediate_result,'No pseudos should match before the show delay elapses');
+  }
+  await waitForHoverTime(hoverWaitTime);
+  checkPseudos(invoker,target,false,true,false,true,'full interest pseudos (but not partial interest) should match after hover delay');
+  const token2 = await mouseOverAndRecord(t,unrelated);
+  const immediate_result2 =  invoker.matches(':has-interest') &&
+      !invoker.matches(':has-partial-interest') &&
+      target.matches(':target-of-interest') &&
+      !target.matches(':target-of-partial-interest');
+  if (msSinceMouseOver(token2) < invokerDelayMs) {
+    assert_true(immediate_result2,'all pseudos should still represent full interest before the hide delay elapses');
+  }
+  await waitForHoverTime(hoverWaitTime);
+  checkPseudos(invoker,target,false,false,false,false,'no pseudos should match after de-hover delay');
+  await do_cleanup();
+},'The pseudo classes only match after delays, once interest is shown');
+</script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-show-delay.tentative.html b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-show-delay.tentative.html
index ca47c0f237d..8d7b78de7fc 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-show-delay.tentative.html
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/interesttarget-show-delay.tentative.html
@@ -10,27 +10,41 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/invoker-utils.js"></script>
 
+<meta name=variant content=?layout=plain&method=hover>
+<meta name=variant content=?layout=nested&method=hover>
+<meta name=variant content=?layout=nested-offset&method=hover>
+<meta name=variant content=?layout=plain&method=focus>
+<meta name=variant content=?layout=nested&method=focus>
+<meta name=variant content=?layout=nested-offset&method=focus>
+
 <body>
 <script>
+// The invokerLayout and invokerMethod parameters are provided by variants, to
+// effectively split this (slow) test into multiple runs.
+const urlParams = new URLSearchParams(window.location.search);
+invokerLayout = urlParams.get('layout');
+invokerMethod = urlParams.get('method');
+description = `layout ${invokerLayout}, method ${invokerMethod}`;
+
 // NOTE about testing methodology:
 // This test uses popovers as an invoker target, and checks whether they are
-// triggered *after* the appropriate hover delay. The delay used for testing is
-// kept low, to avoid this test taking too long, but that means that sometimes
-// on a slow bot/client, the hover delay can elapse before we are able to check
-// the popover status. And that can make this test flaky. To avoid that, the
-// msSinceMouseOver() function is used to check that not-too-much time has
-// passed, and if it has, the test is simply skipped. Because of this
+// triggered *after* the appropriate hover/focus delay. The delay used for
+// testing is kept low, to avoid this test taking too long, but that means that
+// sometimes on a slow bot/client, the hover delay can elapse before we are able
+// to check the popover status. And that can make this test flaky. To avoid
+// that, the msSinceMouseOver() function is used to check that not-too-much time
+// has passed, and if it has, the test is simply skipped. Because of this
 // methodology, many/most of these tests will pass on browsers that do not
 // implement `interesttarget`. See the `interesttarget-basic-delays` test.
 
-const invokerShowDelay = 100; // The CSS delay setting.
-const hoverWaitTime = 200; // How long to wait to cover the delay for sure.
+const invokerShowDelayMs = 100; // The CSS delay setting.
+const hoverFocusWaitTimeMs = 200; // How long to wait to cover the delay for sure.
 
 async function makePopoverAndInvoker(test, invokerLayout, showdelayMs) {
   // This ensures the tests in this file don't succeed sometimes, due to the above NOTE.
   assert_true(HTMLAnchorElement.prototype.hasOwnProperty('interestTargetElement'),'interesttarget is not supported');
   if (showdelayMs === undefined) {
-    showdelayMs = invokerShowDelay;
+    showdelayMs = invokerShowDelayMs;
   }
   let {popover, invoker, unrelated} = await createPopoverAndInvokerForHoverTests(test, showdelayMs, /*hidedelayMs*/10000000);
   invoker.setAttribute('class','invoker');
@@ -53,131 +67,142 @@ async function makePopoverAndInvoker(test, invokerLayout, showdelayMs) {
       // Reassign invoker to the child:
       invoker = invoker.appendChild(document.createElement('div'));
       invoker.textContent = 'Invoker child';
+      invoker.tabIndex = 0;
       invoker.setAttribute('style','position:relative; top:300px; left:300px;');
       break;
     default:
       assert_unreached(`Invalid invokerLayout ${invokerLayout}`);
   }
-  test.add_cleanup(async () => {
+  test.add_cleanup(() => {
     originalInvoker.remove();
-    await waitForRender();
   });
-  await hoverOver(unrelated); // Start by mousing over the unrelated element
-  await waitForRender();
   assert_false(popover.matches(':popover-open'),'Popover should start out closed');
   return {popover,invoker,unrelated,reassignInvokerTargetFn};
 }
 
-["plain","nested","nested-offset"].forEach(invokerLayout => {
-  promise_test(async (t) => {
-    const {popover,invoker} = await makePopoverAndInvoker(t,invokerLayout);
-    const token = await mouseOverAndRecord(t,invoker);
-    let showing = popover.matches(':popover-open');
-    // See NOTE above.
-    if (msSinceMouseOver(token) < invokerShowDelay)
-      assert_false(showing,'interest should not be shown immediately');
-    await waitForHoverTime(hoverWaitTime);
-    assert_true(msSinceMouseOver(token) >= hoverWaitTime,'waitForHoverTime should wait the specified time');
-    assert_true(popover.matches(':popover-open'),'interest should be shown after the delay');
-    assert_true(hoverWaitTime > invokerShowDelay,'invokerShowDelay is the CSS setting, hoverWaitTime should be longer than that');
-  },`interesttarget fires after a delay, invokerLayout=${invokerLayout}`);
+promise_test(async (t) => {
+  const {popover,invoker} = await makePopoverAndInvoker(t,invokerLayout);
+  const token = await mouseOverOrFocusAndRecord(t,invokerMethod,invoker);
+  let showing = popover.matches(':popover-open');
+  // See NOTE above.
+  if (msSinceMouseOver(token) < invokerShowDelayMs)
+    assert_false(showing,'interest should not be shown immediately');
+  await waitForHoverTime(hoverFocusWaitTimeMs);
+  assert_true(msSinceMouseOver(token) >= hoverFocusWaitTimeMs,'waitForHoverTime should wait the specified time');
+  assert_true(popover.matches(':popover-open'),'interest should be shown after the delay');
+  assert_true(hoverFocusWaitTimeMs > invokerShowDelayMs,'invokerShowDelayMs is the CSS setting, hoverFocusWaitTimeMs should be longer than that');
+},`interesttarget fires after a delay, ${description}`);
 
-  promise_test(async (t) => {
-    const {popover,invoker} = await makePopoverAndInvoker(t,invokerLayout);
-    assert_false(popover.matches(':popover-open'));
-    invoker.click(); // Click the invoker
-    assert_false(popover.matches(':popover-open'),'Clicking the invoker should not "show interest"');
-  },`interesttarget should not trigger via mouse click, invokerLayout=${invokerLayout}`);
+promise_test(async (t) => {
+  const {popover,invoker} = await makePopoverAndInvoker(t,invokerLayout);
+  assert_false(popover.matches(':popover-open'));
+  invoker.click(); // Click the invoker
+  assert_false(popover.matches(':popover-open'),'Clicking the invoker should not "show interest"');
+},`interesttarget should not trigger via mouse click, ${description}`);
 
-  promise_test(async (t) => {
-    const longerHoverDelay = hoverWaitTime*2;
-    const {popover,invoker} = await makePopoverAndInvoker(t,invokerLayout,longerHoverDelay);
-    const token = await mouseOverAndRecord(t,invoker);
-    await waitForHoverTime(hoverWaitTime);
-    showing = popover.matches(':popover-open');
-    if (msSinceMouseOver(token) >= longerHoverDelay)
-      return; // The WPT runner was too slow.
-    assert_false(showing,'interesttarget should respect CSS setting');
-  },`interesttarget interest-target-show-delay is respected, invokerLayout=${invokerLayout}`);
+promise_test(async (t) => {
+  const longerHoverDelay = hoverFocusWaitTimeMs*2;
+  const {popover,invoker} = await makePopoverAndInvoker(t,invokerLayout,longerHoverDelay);
+  const token = await mouseOverOrFocusAndRecord(t,invokerMethod,invoker);
+  await waitForHoverTime(hoverFocusWaitTimeMs);
+  showing = popover.matches(':popover-open');
+  if (msSinceMouseOver(token) >= longerHoverDelay)
+    return; // The WPT runner was too slow.
+  assert_false(showing,'interesttarget should respect CSS setting');
+},`interesttarget interest-target-show-delay is respected, ${description}`);
 
-  promise_test(async (t) => {
-    const {popover,invoker} = await makePopoverAndInvoker(t,invokerLayout);
-    popover.showPopover();
-    assert_true(popover.matches(':popover-open'));
-    let gotInterest = false;
-    popover.addEventListener('interest',() => (gotInterest=true),{once:true});
-    await hoverOver(invoker);
-    const stillOpen = popover.matches(':popover-open');
-    await waitForHoverTime(hoverWaitTime);
-    assert_true(popover.matches(':popover-open'),'popover should stay showing after delay');
-    assert_true(stillOpen,'popover should have been open before the delay also');
-    assert_true(gotInterest,'interest event should still be fired');
-  },`interesttarget does not close an already-open popover, invokerLayout=${invokerLayout}`);
+promise_test(async (t) => {
+  const longerHoverDelay = hoverFocusWaitTimeMs*4;
+  const {popover,invoker,unrelated} = await makePopoverAndInvoker(t,invokerLayout,longerHoverDelay);
+  const token = await mouseOverOrFocusAndRecord(t,invokerMethod,invoker);
+  await waitForHoverTime(hoverFocusWaitTimeMs);
+  showing1 = popover.matches(':popover-open');
+  await hoverOrFocus(invokerMethod,unrelated);
+  if (msSinceMouseOver(token) >= longerHoverDelay)
+    return; // The WPT runner was too slow.
+  await waitForHoverTime(longerHoverDelay);
+  showing2 = popover.matches(':popover-open');
+  assert_false(showing1,'interest shouldn\'t be shown immediately');
+  assert_false(showing2,'because target was de-hovered/de-focused before the delay elapsed, interest should never be shown');
+},`Show delay is cancelled if hover/focus changes, ${description}`);
 
-  promise_test(async (t) => {
-    const {popover,invoker} = await makePopoverAndInvoker(t,invokerLayout);
-    popover.remove(); // Remove from the document
-    let gotInterest = false;
-    popover.addEventListener('interest',() => (gotInterest=true),{once:true});
-    await hoverOver(invoker);
-    await waitForHoverTime(hoverWaitTime);
-    assert_false(gotInterest,'interest should not be shown if the target is removed');
-    // Now put it back in the document and make sure it doesn't trigger.
-    document.body.appendChild(popover);
-    await waitForHoverTime(hoverWaitTime);
-    assert_false(gotInterest,'interest should not be shown even when returned to the document');
-  },`interesttarget does nothing when the target is moved out of the document, invokerLayout=${invokerLayout}`);
+promise_test(async (t) => {
+  const {popover,invoker} = await makePopoverAndInvoker(t,invokerLayout);
+  popover.showPopover();
+  assert_true(popover.matches(':popover-open'));
+  let gotInterest = false;
+  popover.addEventListener('interest',() => (gotInterest=true),{once:true});
+  await hoverOrFocus(invokerMethod,invoker);
+  const stillOpen = popover.matches(':popover-open');
+  await waitForHoverTime(hoverFocusWaitTimeMs);
+  assert_true(popover.matches(':popover-open'),'popover should stay showing after delay');
+  assert_true(stillOpen,'popover should have been open before the delay also');
+  assert_true(gotInterest,'interest event should still be fired');
+},`interesttarget does not close an already-open popover, ${description}`);
 
-  promise_test(async (t) => {
-    const {popover,invoker,reassignInvokerTargetFn} = await makePopoverAndInvoker(t,invokerLayout);
-    const popover2 = document.createElement('div');
-    popover2.popover = 'auto';
-    document.body.appendChild(popover2);
-    t.add_cleanup(() => popover2.remove());
-    const token = await mouseOverAndRecord(t,invoker);
-    let eitherShowing = popover.matches(':popover-open') || popover2.matches(':popover-open');
-    reassignInvokerTargetFn(popover2);
-    // See NOTE above.
-    if (msSinceMouseOver(token) >= invokerShowDelay)
-      return; // The WPT runner was too slow.
-    assert_false(eitherShowing,'interest should should not be shown immediately');
-    await waitForHoverTime(hoverWaitTime);
-    assert_false(popover.matches(':popover-open'),'old target should not receive interest, since interesttarget was reassigned');
-    assert_false(popover2.matches(':popover-open'),'new target should not receive interest, since interesttarget was reassigned');
-  },`interesttarget does nothing when the target changes, invokerLayout=${invokerLayout}`);
+promise_test(async (t) => {
+  const {popover,invoker} = await makePopoverAndInvoker(t,invokerLayout);
+  popover.remove(); // Remove from the document
+  let gotInterest = false;
+  popover.addEventListener('interest',() => (gotInterest=true),{once:true});
+  await hoverOrFocus(invokerMethod,invoker);
+  await waitForHoverTime(hoverFocusWaitTimeMs);
+  assert_false(gotInterest,'interest should not be shown if the target is removed');
+  // Now put it back in the document and make sure it doesn't trigger.
+  document.body.appendChild(popover);
+  await waitForHoverTime(hoverFocusWaitTimeMs);
+  assert_false(gotInterest,'interest should not be shown even when returned to the document');
+},`interesttarget does nothing when the target is moved out of the document, ${description}`);
 
-  promise_test(async (t) => {
-    const {popover,invoker,unrelated} = await makePopoverAndInvoker(t,invokerLayout,/*showdelayMs*/0);
-    const invoker2 = document.createElement('button');
-    invoker2.interestTargetElement = popover;
-    document.body.appendChild(invoker2);
-    t.add_cleanup(() => invoker2.remove());
-    invoker2.setAttribute('style',`
-      interest-target-show-delay: 0s;
-      interest-target-hide-delay: 10000s;
-      position:fixed;
-      top:300px;
-    `);
-    invoker2.innerText = 'Invoker 2';
-    let events = [];
-    popover.addEventListener('interest',() => events.push('interest'));
-    popover.addEventListener('loseinterest',() => events.push('lose interest'));
-    popover.addEventListener('beforetoggle',(e) => events.push(e.newState));
-    assert_array_equals(events,[]);
-    await hoverOver(invoker);
-    assert_array_equals(events,['interest','open']);
-    // Different invoker for same target - should first (immediately) lose interest on old invoker.
-    await hoverOver(invoker2);
-    assert_array_equals(events,['interest','open','lose interest','closed','interest','open']);
-    // Lose interest delays are long, so nothing happens here.
-    events = [];
-    await hoverOver(unrelated);
-    assert_array_equals(events,[]);
-    // Back to the same invoker - shouldn't re-fire events.
-    await hoverOver(invoker2);
-    assert_array_equals(events,[]);
-    assert_true(popover.matches(':popover-open'));
-    popover.hidePopover();
-  },`moving hover between two invokers for the same target does the right thing, invokerLayout=${invokerLayout}`);
-});
+promise_test(async (t) => {
+  const {popover,invoker,reassignInvokerTargetFn} = await makePopoverAndInvoker(t,invokerLayout);
+  const popover2 = document.createElement('div');
+  popover2.popover = 'auto';
+  document.body.appendChild(popover2);
+  t.add_cleanup(() => popover2.remove());
+  const token = await mouseOverOrFocusAndRecord(t,invokerMethod,invoker);
+  let eitherShowing = popover.matches(':popover-open') || popover2.matches(':popover-open');
+  reassignInvokerTargetFn(popover2);
+  // See NOTE above.
+  if (msSinceMouseOver(token) >= invokerShowDelayMs)
+    return; // The WPT runner was too slow.
+  assert_false(eitherShowing,'interest should should not be shown immediately');
+  await waitForHoverTime(hoverFocusWaitTimeMs);
+  assert_false(popover.matches(':popover-open'),'old target should not receive interest, since interesttarget was reassigned');
+  assert_false(popover2.matches(':popover-open'),'new target should not receive interest, since interesttarget was reassigned');
+},`interesttarget does nothing when the target changes, ${description}`);
+
+promise_test(async (t) => {
+  const {popover,invoker,unrelated} = await makePopoverAndInvoker(t,invokerLayout,/*showdelayMs*/0);
+  const invoker2 = document.createElement('button');
+  invoker2.interestTargetElement = popover;
+  document.body.appendChild(invoker2);
+  t.add_cleanup(() => invoker2.remove());
+  invoker2.setAttribute('style',`
+    interest-target-show-delay: 0s;
+    interest-target-hide-delay: 10000s;
+    position:fixed;
+    top:300px;
+  `);
+  invoker2.innerText = 'Invoker 2';
+  let events = [];
+  popover.addEventListener('interest',() => events.push('interest'));
+  popover.addEventListener('loseinterest',() => events.push('lose interest'));
+  popover.addEventListener('beforetoggle',(e) => events.push(e.newState));
+  assert_array_equals(events,[]);
+  await hoverOrFocus(invokerMethod,invoker);
+  assert_array_equals(events,['interest','open']);
+  // Different invoker for same target - should first (immediately) lose interest on old invoker.
+  await hoverOrFocus(invokerMethod,invoker2);
+  assert_array_equals(events,['interest','open','lose interest','closed','interest','open']);
+  // Lose interest delays are long, so nothing happens here.
+  events = [];
+  await hoverOrFocus(invokerMethod,unrelated);
+  assert_array_equals(events,[]);
+  // Back to the same invoker - shouldn't re-fire events.
+  await hoverOrFocus(invokerMethod,invoker2);
+  assert_array_equals(events,[]);
+  assert_true(popover.matches(':popover-open'));
+  popover.hidePopover();
+},`moving hover/focus between two invokers for the same target does the right thing, ${description}`);
 </script>
diff --git a/tests/wpt/tests/html/semantics/the-button-element/interest-target/resources/invoker-utils.js b/tests/wpt/tests/html/semantics/the-button-element/interest-target/resources/invoker-utils.js
index b89a14ee16c..bc43e738c34 100644
--- a/tests/wpt/tests/html/semantics/the-button-element/interest-target/resources/invoker-utils.js
+++ b/tests/wpt/tests/html/semantics/the-button-element/interest-target/resources/invoker-utils.js
@@ -14,6 +14,11 @@ async function clickOn(element) {
       .send();
   await waitForRender();
 }
+async function focusOn(element) {
+  element.focus();
+  await waitForRender();
+  assert_equals(document.activeElement,element,'focus should be on element');
+}
 async function hoverOver(element) {
   await waitForRender();
   let rect = element.getBoundingClientRect();
@@ -26,23 +31,41 @@ async function hoverOver(element) {
   await waitForRender();
 }
 function mouseOverAndRecord(t,element) {
-  let mouseMoveInfo;
-  t.add_cleanup(() => mouseMoveInfo?.controller.abort());
-  const controller = new AbortController();
-  mouseMoveInfo = {element, controller, moved: false, started: performance.now()};
-  document.addEventListener("mousemove", (e) => {mouseMoveInfo.moved = true;}, {signal: controller.signal});
+  let timingInfo = {element, started: performance.now()};
   return (new test_driver.Actions())
       .pointerMove(0, 0, {origin: element})
       .send()
-      .then(() => mouseMoveInfo);
+      .then(() => timingInfo);
+}
+function focusAndRecord(t,element) {
+  let timingInfo = {element, started: performance.now()};
+  element.focus();
+  return timingInfo;
+}
+async function hoverOrFocus(invokerMethod,element) {
+  if (invokerMethod === 'hover') {
+    await hoverOver(element);
+  } else {
+    assert_equals(invokerMethod,'focus');
+    element.focus();
+    await waitForRender();
+  }
+}
+async function mouseOverOrFocusAndRecord(t,invokerMethod,element) {
+  if (invokerMethod === 'hover') {
+    return await mouseOverAndRecord(t,element);
+  } else {
+    assert_equals(invokerMethod,'focus');
+    return focusAndRecord(t,element);
+  }
 }
 // Note that this may err on the side of being too large (reporting a number
 // that is larger than the actual time since the mouseover happened), due to how
-// `mousemoveInfo.started` is initialized, on first mouse move. However, this
+// `timingInfo.started` is initialized, on first mouse move. However, this
 // function is intended to be used as a detector for the test harness taking too
 // long for some tests, so it's ok to be conservative.
-function msSinceMouseOver(mouseMoveInfo) {
-  return performance.now() - mouseMoveInfo.started;
+function msSinceMouseOver(timingInfo) {
+  return performance.now() - timingInfo.started;
 }
 async function waitForHoverTime(hoverWaitTimeMs) {
   await new Promise(resolve => step_timeout(resolve,hoverWaitTimeMs));
@@ -51,10 +74,12 @@ async function waitForHoverTime(hoverWaitTimeMs) {
 
 async function createPopoverAndInvokerForHoverTests(test, showdelayMs, hideDelayMs) {
   const unrelated = document.createElement('div');
+  unrelated.tabIndex = 0;
   document.body.appendChild(unrelated);
   unrelated.textContent = 'Unrelated';
   unrelated.setAttribute('style','position:fixed; top:0;');
-  // Ensure we never hover over an active interesttarget element.
+  // Ensure we never hover over or focus on an active interesttarget element.
+  unrelated.focus();
   await hoverOver(unrelated);
   const popover = document.createElement('div');
   popover.popover = 'auto';
@@ -77,12 +102,30 @@ async function createPopoverAndInvokerForHoverTests(test, showdelayMs, hideDelay
   assert_equals(actualShowDelay,showdelayMs,'interest-target-show-delay is incorrect');
   const actualHideDelay = Number(getComputedStyle(invoker).interestTargetHideDelay.slice(0,-1))*1000;
   assert_equals(actualHideDelay,hideDelayMs,'interest-target-hide-delay is incorrect');
-  test.add_cleanup(async () => {
+  test.add_cleanup(() => {
     popover.remove();
     invoker.remove();
     unrelated.remove();
-    await waitForRender();
   });
   assert_false(popover.matches(':popover-open'),'The popover should start out closed');
   return {popover, invoker, unrelated};
 }
+async function sendLoseInterestHotkey() {
+  const kEscape = '\uE00C';
+  await new test_driver.Actions()
+    .keyDown(kEscape)
+    .keyUp(kEscape)
+    .send();
+  await waitForRender();
+}
+async function sendShowInterestHotkey() {
+  const kAlt = "\uE00A";
+  const kArrowUp = '\uE013';
+  await new test_driver.Actions()
+    .keyDown(kAlt)
+    .keyDown(kArrowUp)
+    .keyUp(kArrowUp)
+    .keyUp(kAlt)
+    .send();
+  await waitForRender();
+}
diff --git a/tests/wpt/tests/html/semantics/the-link-element/WEB_FEATURES.yml b/tests/wpt/tests/html/semantics/the-link-element/WEB_FEATURES.yml
new file mode 100644
index 00000000000..6a444ee171a
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/the-link-element/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: fetch-priority
+  files:
+  - attr-link-fetchpriority.html
diff --git a/tests/wpt/tests/html/syntax/serializing-html-fragments/serializing-cdata-in-html-document.html b/tests/wpt/tests/html/syntax/serializing-html-fragments/serializing-cdata-in-html-document.html
new file mode 100644
index 00000000000..b2366285a41
--- /dev/null
+++ b/tests/wpt/tests/html/syntax/serializing-html-fragments/serializing-cdata-in-html-document.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<title>Serializing CDATA in an HTML document</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/parsing.html#serialising-html-fragments">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(t => {
+  const doc = new DOMParser().parseFromString('<svg xmlns="http://www.w3.org/2000/svg"><![CDATA[<img>]]></svg>', 'application/xml');
+  const el = document.adoptNode(doc.documentElement);
+  assert_equals(el.outerHTML, '<svg xmlns="http://www.w3.org/2000/svg">&lt;img&gt;</svg>');
+});
+</script>
diff --git a/tests/wpt/tests/html/syntax/serializing-html-fragments/serializing-lt-gt.tentative.html b/tests/wpt/tests/html/syntax/serializing-html-fragments/serializing-lt-gt.tentative.html
new file mode 100644
index 00000000000..6c74b443a83
--- /dev/null
+++ b/tests/wpt/tests/html/syntax/serializing-html-fragments/serializing-lt-gt.tentative.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<title>Escape "&lt;" and ">" in attribute values when serializing</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+
+<span id="test"><a b="<>"></a></span>
+
+<script>
+const test_el = document.getElementById("test");
+
+test(() => {
+  assert_equals(test_el.innerHTML, "<a b=\"&lt;&gt;\"></a>");
+}, "innerHTML");
+
+test(() => {
+  assert_equals(test_el.outerHTML, "<span id=\"test\"><a b=\"&lt;&gt;\"></a></span>");
+}, "outerHTML");
+</script>
diff --git a/tests/wpt/tests/html/webappapis/scripting/event-loops/new-scroll-event-dispatched-at-next-updating-rendering-time.html b/tests/wpt/tests/html/webappapis/scripting/event-loops/new-scroll-event-dispatched-at-next-updating-rendering-time.html
new file mode 100644
index 00000000000..a858c205d05
--- /dev/null
+++ b/tests/wpt/tests/html/webappapis/scripting/event-loops/new-scroll-event-dispatched-at-next-updating-rendering-time.html
@@ -0,0 +1,116 @@
+<!doctype html>
+<meta charset="utf-8">
+<link rel="help" href="https://html.spec.whatwg.org/#event-loop-processing-model">
+<link rel="help" href="https://issues.chromium.org/issues/397737222">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+</style>
+<iframe width="300" height="300" srcdoc="
+  <style>
+    html {
+      transition: color 1s step-start;
+    }
+    .scroller {
+      overflow: auto;
+      width: 100%;
+      height: 100px;
+    }
+    .spacer {
+      height: 500px;
+    }
+  </style>
+  <div class='scroller'>
+    <div class='spacer'></div>
+  </div>
+  <div class='scroller'>
+    <div class='spacer'></div>
+  </div>
+  "></iframe>
+<script>
+promise_test(async function() {
+  await new Promise(resolve => window.addEventListener("load", resolve, { once: true }));
+
+  const iframe = document.querySelector("iframe");
+  const mql = iframe.contentWindow.matchMedia("(max-width: 300px)");
+  assert_true(mql.matches, "");
+
+  // Set up a MQL change event listener to receive the event in between
+  // scroll and transitionrun events.
+  let timeOnMQLChange = null;
+  iframe.width = "400";
+  const mqlChangeEvent = new Promise(resolve => {
+    mql.addEventListener("change", () => {
+      timeOnMQLChange = performance.now();
+      resolve();
+    }, { once: true });
+  });
+
+  // There are two scroll containers, setup a scroll event listener for one
+  // of them.
+  const scrollers = iframe.contentDocument.querySelectorAll(".scroller");
+  let timeOnScrollEventOnAnotherScroller = null;
+  scrollers[1].addEventListener("scroll", () => {
+    timeOnScrollEventOnAnotherScroller = performance.now();
+  }, { once: true });
+
+  // Setup another scroll event listener for the other scroll container.
+  const scrollEventPromise = new Promise(resolve => {
+    scrollers[0].addEventListener("scroll", resolve, { once: true });
+  });
+  // And scroll the scroller.
+  scrollers[0].scrollTop = 10;
+
+  // Await the scroll event.
+  await scrollEventPromise;
+
+  const timeOnScrollEvent = performance.now();
+
+  // Scroll the other scroller.
+  scrollers[1].scrollTop = 10;
+
+  assert_equals(timeOnScrollEventOnAnotherScroller, null,
+    "The new scroll event should not yet have been dispatched");
+
+  // Trigger a CSS transition.
+  let timeOnTransitionRun = null;
+  const transitionrunEventPromise = new Promise(resolve => {
+    iframe.contentDocument.documentElement.addEventListener("transitionrun", () => {
+      timeOnTransitionRun = performance.now();
+      resolve();
+    }, { once: true });
+  });
+  iframe.contentDocument.documentElement.style.color = "blue";
+  getComputedStyle(iframe.contentDocument.documentElement).color;
+
+  // Now it's time to receive the MQL change event.
+  await mqlChangeEvent;
+  assert_less_than(timeOnScrollEvent, timeOnMQLChange,
+    "The MQL change event should have been dispatched after the first scroll event");
+  assert_equals(timeOnScrollEventOnAnotherScroller, null,
+    "The new scroll event should not yet have been dispatched");
+
+  // Await the transitionrun event.
+  await transitionrunEventPromise;
+
+  assert_less_than(timeOnScrollEvent, timeOnTransitionRun,
+    "The transitionrun event should have been dispatched after the first scroll event");
+  assert_equals(timeOnScrollEventOnAnotherScroller, null,
+    "The new scroll event should not yet have been dispatched");
+
+  // Await a requestAnimationFrame callback.
+  await new Promise(resolve => requestAnimationFrame(resolve));
+
+  assert_equals(timeOnScrollEventOnAnotherScroller, null,
+    "The new scroll event should not yet have been dispatched");
+
+  // Await one more requestAnimationFrame callback.
+  await new Promise(resolve => requestAnimationFrame(resolve));
+
+  assert_not_equals(timeOnScrollEventOnAnotherScroller, null,
+    "The new scroll event should now have been dispatched");
+  assert_less_than(timeOnTransitionRun, timeOnScrollEventOnAnotherScroller,
+    "The new scroll event should have been dispatched after the transitionrun event");
+});
+</script>
diff --git a/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/WEB_FEATURES.yml b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/WEB_FEATURES.yml
new file mode 100644
index 00000000000..a1af3e21a48
--- /dev/null
+++ b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: pdf-viewer
+  files:
+  - plugins-and-mimetypes.html
diff --git a/tests/wpt/tests/html/webappapis/update-rendering/child-document-raf-order.html b/tests/wpt/tests/html/webappapis/update-rendering/child-document-raf-order.html
index 222c1af444e..eccc1bde7fb 100644
--- a/tests/wpt/tests/html/webappapis/update-rendering/child-document-raf-order.html
+++ b/tests/wpt/tests/html/webappapis/update-rendering/child-document-raf-order.html
@@ -47,6 +47,17 @@ callbacks for each.
 
 <script>
 
+// Split array into chunks of len.
+function chunk (arr, len) {
+  var chunks = [],
+    i = 0,
+    n = arr.length;
+  while (i < n) {
+    chunks.push(arr.slice(i, i += len));
+  }
+  return chunks;
+}
+
 async_test(function (t) {
   step_timeout(setup, 0);
 
@@ -108,9 +119,20 @@ async_test(function (t) {
   });
 
   let finish = t.step_func(function() {
-    assert_array_equals(notification_sequence,
-                        ["parent_raf", "first_child_raf", "second_child_raf"],
-                        "expected order of notifications");
+
+    // The test requests rafs recursively,
+    // but since all three rafs run as part of the same "update the rendering" task,
+    // they should always come in a triplet.
+    assert_equals(notification_sequence.length % 3, 0);
+
+    let chunks = chunk(notification_sequence, 3);
+    for (var i = 0; i < chunks.length; i++) {
+      // Assert correct ordering per triplet of rafs.
+      assert_array_equals(chunks[i],
+                          ["parent_raf", "first_child_raf", "second_child_raf"],
+                          "expected order of notifications");
+    }
+
     t.done();
   });
 });
diff --git a/tests/wpt/tests/inert/inert-node-is-uneditable.html b/tests/wpt/tests/inert/inert-node-is-uneditable.html
index ecb69695793..18cc079ea4e 100644
--- a/tests/wpt/tests/inert/inert-node-is-uneditable.html
+++ b/tests/wpt/tests/inert/inert-node-is-uneditable.html
@@ -14,7 +14,7 @@
 <span inert id="not-editable" contenteditable>I'm not editable.</span>
 <span id="editable" contenteditable>I'm editable.</span>
 <span inert>
-  <span id="editable-interactivity" style="interactivity:auto" contenteditable>I'm editable.</span>
+  <span id="editable-interactivity" style="interactivity:auto" contenteditable>I'm not editable.</span>
 </span>
 <script>
 var notEditable = document.querySelector('#not-editable');
@@ -47,10 +47,10 @@ promise_test(async () => {
 promise_test(async () => {
     editableInteractivity.focus();
     var oldValue = editableInteractivity.textContent;
-    assert_equals(oldValue, "I'm editable.");
+    assert_equals(oldValue, "I'm not editable.");
     await sendKey('a');
-    assert_not_equals(editableInteractivity.textContent, oldValue);
-}, "Can edit interactivity:auto contenteditable inside inert");
+    assert_equals(editableInteractivity.textContent, oldValue);
+}, "Can't edit interactivity:auto contenteditable inside inert");
 
 </script>
 </body>
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/ahem.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/ahem.html.ini
index 8587775d8fc..ada156a59f5 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/ahem.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/ahem.html.ini
@@ -1,3 +1,3 @@
 [ahem.html]
   expected:
-    if product == "safari": FAIL # system fonts not loaded since macOS Mojave
+    if product == "safari": [FAIL, CRASH] # system fonts not loaded since macOS Mojave
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/allowed-to-play.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/allowed-to-play.html.ini
index 6891cbe24e3..17ceac0d26d 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/allowed-to-play.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/allowed-to-play.html.ini
@@ -1,6 +1,4 @@
 [allowed-to-play.html]
-  disabled:
-    if product == "firefox": https://bugzilla.mozilla.org/show_bug.cgi?id=1607802
   expected:
     if product == "safari": ERROR # https://bugs.webkit.org/show_bug.cgi?id=190775
 
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/canvas-background.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/canvas-background.html.ini
new file mode 100644
index 00000000000..198b67c43cd
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/canvas-background.html.ini
@@ -0,0 +1,3 @@
+[canvas-background.html]
+  expected:
+    if product == "safari": [ERROR, CRASH]
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest.www.sub.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest.www.sub.html.ini
new file mode 100644
index 00000000000..b6066673120
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest.www.sub.html.ini
@@ -0,0 +1,3 @@
+[reftest.www.sub.html]
+  expected:
+    if product == "safari": ERROR
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/testdriver-in-ref.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/testdriver-in-ref.html.ini
index 05850761b16..5dbd6945aa0 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/testdriver-in-ref.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/testdriver-in-ref.html.ini
@@ -1,5 +1,5 @@
 [testdriver-in-ref.html]
-  disabled:
+  expected:
     # https://github.com/web-platform-tests/wpt/issues/13183
-    if product == "firefox" or product == "firefox_android":
-      "marionette executor doesn't currently implement testdriver for reftests"
+    # marionette executor doesn't currently implement testdriver for reftests
+    if product == "firefox" or product == "firefox_android": TIMEOUT
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/bluetooth/handle_request_device_prompt.https.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/bluetooth/handle_request_device_prompt.https.html.ini
index 1a5ac47c67d..fd44ded394b 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/bluetooth/handle_request_device_prompt.https.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/bluetooth/handle_request_device_prompt.https.html.ini
@@ -1,2 +1,3 @@
-disabled:
-  if product != "chrome": @True
+[handle_request_device_prompt.https.html]
+  expected:
+    if product != "chrome": ERROR
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/bluetooth/simulate_adapter.https.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/bluetooth/simulate_adapter.https.html.ini
index 1a5ac47c67d..feaf5ceae7a 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/bluetooth/simulate_adapter.https.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/bluetooth/simulate_adapter.https.html.ini
@@ -1,2 +1,3 @@
-disabled:
-  if product != "chrome": @True
+[simulate_adapter.https.html]
+  expected:
+    if product != "chrome": ERROR
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/bluetooth/simulate_preconnected_peripheral.https.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/bluetooth/simulate_preconnected_peripheral.https.html.ini
index 1a5ac47c67d..b2c823097f6 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/bluetooth/simulate_preconnected_peripheral.https.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/bluetooth/simulate_preconnected_peripheral.https.html.ini
@@ -1,2 +1,3 @@
-disabled:
-  if product != "chrome": @True
+[simulate_preconnected_peripheral.https.html]
+  expected:
+    if product != "chrome": ERROR
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/emulation/set_geolocation_override.https.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/emulation/set_geolocation_override.https.html.ini
new file mode 100644
index 00000000000..7de34991442
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/emulation/set_geolocation_override.https.html.ini
@@ -0,0 +1,3 @@
+[set_geolocation_override.https.html]
+  expected:
+    if product != "chrome": ERROR
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/permissions/set_permission.https.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/permissions/set_permission.https.html.ini
index 1a5ac47c67d..2101196fa2f 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/permissions/set_permission.https.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/bidi/permissions/set_permission.https.html.ini
@@ -1,2 +1,3 @@
-disabled:
-  if product != "chrome": @True
+[set_permission.https.html]
+  expected:
+    if product != "chrome": ERROR
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/file_upload.sub.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/file_upload.sub.html.ini
index 8b7c0f25e6a..ce88c728e03 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/file_upload.sub.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/file_upload.sub.html.ini
@@ -5,3 +5,4 @@
     expected:
       if (product == "epiphany") or (product == "webkit"): FAIL
       if product == "firefox_android": FAIL
+      if product == "safari": FAIL
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/get_all_cookies.sub.https.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/get_all_cookies.sub.https.html.ini
new file mode 100644
index 00000000000..ede46b74c64
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/get_all_cookies.sub.https.html.ini
@@ -0,0 +1,5 @@
+[get_all_cookies.sub.https.html]
+  [Get all HTTPS cookies]
+    expected:
+      # WPT CI uses a `firefox` version that doesn't support partitioned cookies
+      if product == "firefox" or product == "firefox_android": FAIL
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/get_named_cookie.sub.https.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/get_named_cookie.sub.https.html.ini
new file mode 100644
index 00000000000..05352bf82a1
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/get_named_cookie.sub.https.html.ini
@@ -0,0 +1,5 @@
+[get_named_cookie.sub.https.html]
+  [Get Named HTTPS cookie]
+    expected:
+      # WPT CI uses a `firefox` version that doesn't support partitioned cookies
+      if product == "firefox" or product == "firefox_android": FAIL
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/webdriver/bidi/subscription.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/webdriver/bidi/subscription.html.ini
index 1a5ac47c67d..2d828266f10 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/webdriver/bidi/subscription.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/webdriver/bidi/subscription.html.ini
@@ -1,2 +1,3 @@
-disabled:
-  if product != "chrome": @True
+[subscription.html]
+  expected:
+    if product != "chrome": ERROR
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/webdriver/bidi/subscription.window.js.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/webdriver/bidi/subscription.window.js.ini
index 1a5ac47c67d..1acf3eb9819 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/webdriver/bidi/subscription.window.js.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/webdriver/bidi/subscription.window.js.ini
@@ -1,2 +1,3 @@
-disabled:
-  if product != "chrome": @True
+[subscription.window.html]
+  expected:
+    if product != "chrome": ERROR
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/webdriver/tests/test_load_file.py.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/webdriver/tests/test_load_file.py.ini
deleted file mode 100644
index 7e6ef522c9b..00000000000
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/webdriver/tests/test_load_file.py.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled:
-  if product == "firefox": @True
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/window/minimize-1.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/window/minimize-1.html.ini
new file mode 100644
index 00000000000..2e3ac5190f3
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/window/minimize-1.html.ini
@@ -0,0 +1,4 @@
+[minimize-1.html]
+  [Minimize a window]
+    expected:
+      if os == "android": FAIL
diff --git a/tests/wpt/tests/infrastructure/reftest/green.html b/tests/wpt/tests/infrastructure/reftest/green.html
index 38167bb58d5..0c9676a7fdc 100644
--- a/tests/wpt/tests/infrastructure/reftest/green.html
+++ b/tests/wpt/tests/infrastructure/reftest/green.html
@@ -1,3 +1,6 @@
 <style>
-:root {background-color:green}
-</style>
\ No newline at end of file
+:root {
+  print-color-adjust: exact;
+  background-color: green;
+}
+</style>
diff --git a/tests/wpt/tests/infrastructure/reftest/reftest_wait_0-print.html b/tests/wpt/tests/infrastructure/reftest/reftest_wait_0-print.html
index fec62a3cae0..5cbca7a30a4 100644
--- a/tests/wpt/tests/infrastructure/reftest/reftest_wait_0-print.html
+++ b/tests/wpt/tests/infrastructure/reftest/reftest_wait_0-print.html
@@ -2,7 +2,10 @@
 <title>Test with reftest-wait</title>
 <link rel=match href=green.html>
 <style>
-:root {background-color:red}
+  :root {
+    print-color-adjust: exact;
+    background-color:red
+  }
 </style>
 <script>
 setTimeout(function() {
diff --git a/tests/wpt/tests/infrastructure/testdriver/bidi/emulation/set_geolocation_override.https.html b/tests/wpt/tests/infrastructure/testdriver/bidi/emulation/set_geolocation_override.https.html
new file mode 100644
index 00000000000..e339f39dcd8
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/testdriver/bidi/emulation/set_geolocation_override.https.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<title>TestDriver bidi.emulation.set_geolocation_override method</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js?feature=bidi"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script>
+    promise_setup(async () => {
+        // Ensure permission is granted before proceeding.
+        await test_driver.bidi.permissions.set_permission({
+            descriptor: {name: "geolocation"},
+            state: "granted",
+        });
+    });
+
+    /** Get the current geolocation or error */
+    function get_current_geolocation() {
+        return new Promise(
+            resolve => window.navigator.geolocation.getCurrentPosition(
+                position => resolve(position.coords.toJSON()),
+                error => resolve({code: error.code}),
+                // Fail fast if geolocation is not available.
+                {timeout: 500}
+            ))
+    }
+
+    /** Asserts that coordinate or error matches the expected value */
+    function assert_coordinates_match(actual, expected) {
+        for (const key in expected) {
+            assert_equals(actual[key], expected[key],
+                `"${key}" should match the expected value ${expected[key]}`);
+        }
+    }
+
+    const SOME_COORDINATES = {
+        latitude: 52.51,
+        longitude: 13.39,
+        accuracy: 0.5,
+        altitude: 34,
+        altitudeAccuracy: 0.75,
+        heading: 180,
+        speed: 2.77
+    };
+
+    promise_test(async (t) => {
+        t.add_cleanup(async () => {
+            await test_driver.bidi.emulation.set_geolocation_override(
+                {coordinates: null});
+        });
+
+        // Get the initial geolocation (might be error).
+        const initial_coords = await get_current_geolocation();
+
+        // Set the geolocation override
+        await test_driver.bidi.emulation.set_geolocation_override({
+            coordinates: SOME_COORDINATES
+        });
+
+        // Get the geolocation after setting the override.
+        const coords = await get_current_geolocation();
+        // Assert the coordinates match the override.
+        assert_coordinates_match(coords, SOME_COORDINATES);
+
+        // Clear the geolocation override.
+        await test_driver.bidi.emulation.set_geolocation_override(
+            {coordinates: null});
+        // Assert coordinates are set to the original value.
+        assert_coordinates_match(await get_current_geolocation(),
+            initial_coords);
+    }, "emulate geolocation and clear override");
+
+    promise_test(async (t) => {
+        // Emulate position unavailable.
+        await test_driver.bidi.emulation.set_geolocation_override({
+            error: {type: 'positionUnavailable'},
+        });
+
+        // Get the geolocation after setting the override.
+        const error = await get_current_geolocation();
+
+        assert_equals(error.code, 2,
+            `Geolocation should be unavailable with code POSITION_UNAVAILABLE = 2`);
+    }, "emulate geolocation position unavailable");
+
+    promise_test(async (t) => {
+        assert_throws_js(Error,
+            () => test_driver.bidi.emulation.set_geolocation_override({
+                error: {type: 'positionUnavailable'},
+                coordinates: SOME_COORDINATES
+            }), "Setting both `coordinates` and `error` should fail");
+    }, "cannot set `coordinates` and `error` simultaneously");
+</script>
diff --git a/tests/wpt/tests/infrastructure/testdriver/get_all_cookies.sub.https.html b/tests/wpt/tests/infrastructure/testdriver/get_all_cookies.sub.https.html
index e94167133b3..70a4ff77333 100644
--- a/tests/wpt/tests/infrastructure/testdriver/get_all_cookies.sub.https.html
+++ b/tests/wpt/tests/infrastructure/testdriver/get_all_cookies.sub.https.html
@@ -17,8 +17,9 @@ promise_test(async t => {
   document.cookie = "test5=5; SameSite=Strict";
   document.cookie = "test6=6; SameSite=None; Secure";
   document.cookie = "test7=7; SameSite=Lax";
+  document.cookie = "test8=8; Secure; Partitioned; SameSite=None";
   const cookies = await test_driver.get_all_cookies();
-  assert_equals(cookies.length, 8);
+  assert_equals(cookies.length, 9);
   let cookieMap = new Map();
   for (const cookie of cookies) {
     cookieMap.set(cookie["name"], cookie);
@@ -108,5 +109,15 @@ promise_test(async t => {
   assert_equals(cookieMap.get("test7")["httpOnly"], false);
   assert_equals(cookieMap.get("test7")["expiry"], undefined);
   assert_equals(cookieMap.get("test7")["sameSite"], "Lax");
+
+  // test8 [Partitioned]
+  assert_equals(cookieMap.get("test8")["name"], "test8");
+  assert_equals(cookieMap.get("test8")["value"], "8");
+  assert_equals(cookieMap.get("test8")["path"], "/infrastructure/testdriver");
+  assert_equals(cookieMap.get("test8")["domain"], "{{host}}");
+  assert_equals(cookieMap.get("test8")["secure"], true);
+  assert_equals(cookieMap.get("test8")["httpOnly"], false);
+  assert_equals(cookieMap.get("test8")["expiry"], undefined);
+  assert_equals(cookieMap.get("test8")["sameSite"], "None");
 }, "Get all HTTPS cookies");
 </script>
diff --git a/tests/wpt/tests/infrastructure/testdriver/get_named_cookie.sub.https.html b/tests/wpt/tests/infrastructure/testdriver/get_named_cookie.sub.https.html
index 8e8f4433812..32b3bed459e 100644
--- a/tests/wpt/tests/infrastructure/testdriver/get_named_cookie.sub.https.html
+++ b/tests/wpt/tests/infrastructure/testdriver/get_named_cookie.sub.https.html
@@ -17,6 +17,7 @@ promise_test(async t => {
   document.cookie = "test5=5; SameSite=Strict";
   document.cookie = "test6=6; SameSite=None; Secure";
   document.cookie = "test7=7; SameSite=Lax";
+  document.cookie = "test8=8; Secure; Partitioned; SameSite=None";
 
   // test0
   let cookie = await test_driver.get_named_cookie("test0");
@@ -110,5 +111,17 @@ promise_test(async t => {
   assert_equals(cookie["httpOnly"], false);
   assert_equals(cookie["expiry"], undefined);
   assert_equals(cookie["sameSite"], "Lax");
+
+  // test8 [Partitioned]
+  cookie = await test_driver.get_named_cookie("test8");
+  assert_equals(cookie["name"], "test8");
+  assert_equals(cookie["value"], "8");
+  assert_equals(cookie["path"], "/infrastructure/testdriver");
+  assert_equals(cookie["domain"], "{{host}}");
+  assert_equals(cookie["secure"], true);
+  assert_equals(cookie["httpOnly"], false);
+  assert_equals(cookie["expiry"], undefined);
+  assert_equals(cookie["sameSite"], "None");
+
 }, "Get Named HTTPS cookie");
 </script>
diff --git a/tests/wpt/tests/infrastructure/window/minimize-1.html b/tests/wpt/tests/infrastructure/window/minimize-1.html
new file mode 100644
index 00000000000..3b6d46874b3
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/window/minimize-1.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Use testdriver to minimize the window</title>
+<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>
+<!-- This is really setup for the actual test which is test2.html which checks the harness restores the window -->
+<script>
+promise_test(async () => {
+  await test_driver.minimize_window()
+  assert_true(document.hidden);
+  // And no cleanup
+}, "Minimize a window");
+</script>
diff --git a/tests/wpt/tests/infrastructure/window/minimize-2.html b/tests/wpt/tests/infrastructure/window/minimize-2.html
new file mode 100644
index 00000000000..279f01b7b73
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/window/minimize-2.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Use testdriver to check window is not minimized</title>
+<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>
+<!-- This only checks something meaningful when run after test1.html -->
+<script>
+promise_test(async () => {
+  assert_false(document.hidden);
+}), "Test window is not minimized";
+</script>
diff --git a/tests/wpt/tests/input-events/input-events-spin-button-click-on-number-input-delete-document.html b/tests/wpt/tests/input-events/input-events-spin-button-click-on-number-input-delete-document.html
index fb3655398db..9e5d9b9ef99 100644
--- a/tests/wpt/tests/input-events/input-events-spin-button-click-on-number-input-delete-document.html
+++ b/tests/wpt/tests/input-events/input-events-spin-button-click-on-number-input-delete-document.html
@@ -21,7 +21,7 @@
 
   promise_test(async function () {
     await loadIframe(
-      "<input type='number' style='width: 100px; height: 20px'>"
+      "<input type='number' style='width: 100px; height: 20px' value='5'>"
     );
     const inputElement = frame.contentDocument.querySelector("input");
 
@@ -38,12 +38,14 @@
       events.push("change");
     });
 
+    assert_equals(inputElement.value, "5", "Original value should be 5");
+
     // Roughly get the offset to the spin up arrow button's center point within
     // the iframe's viewport. Note that this is fragile and might need specific
     // coordinates for each browser and maybe platform.
     const rect = inputElement.getBoundingClientRect();
-    const x = rect.x + rect.width - 10;
-    const y = rect.y + Math.round(rect.height / 4);
+    const x = Math.round(rect.x + rect.width - 5);
+    const y = Math.round(rect.y + (3 * rect.height) / 4);
 
     const actions = new test_driver.Actions()
       .setContext(frame.contentWindow)
@@ -52,6 +54,7 @@
       .pointerUp();
     await actions.send();
 
+    assert_equals(inputElement.value, "6", "Value should increase after clicking the up arrow");
     assert_array_equals(events, ['beforeinput']);
     assert_false(document.body.contains(frame));
   }, "Number input should not crash and not fire subsequent events when event handler removes document");
diff --git a/tests/wpt/tests/interfaces/dom.idl b/tests/wpt/tests/interfaces/dom.idl
index 7b4fcb920e2..253e7bf913e 100644
--- a/tests/wpt/tests/interfaces/dom.idl
+++ b/tests/wpt/tests/interfaces/dom.idl
@@ -110,6 +110,7 @@ Document includes NonElementParentNode;
 DocumentFragment includes NonElementParentNode;
 
 interface mixin DocumentOrShadowRoot {
+  readonly attribute CustomElementRegistry? customElementRegistry;
 };
 Document includes DocumentOrShadowRoot;
 ShadowRoot includes DocumentOrShadowRoot;
@@ -293,7 +294,7 @@ interface Document : Node {
   [NewObject] Comment createComment(DOMString data);
   [NewObject] ProcessingInstruction createProcessingInstruction(DOMString target, DOMString data);
 
-  [CEReactions, NewObject] Node importNode(Node node, optional boolean subtree = false);
+  [CEReactions, NewObject] Node importNode(Node node, optional (boolean or ImportNodeOptions) options = false);
   [CEReactions] Node adoptNode(Node node);
 
   [NewObject] Attr createAttribute(DOMString localName);
@@ -312,9 +313,15 @@ interface Document : Node {
 interface XMLDocument : Document {};
 
 dictionary ElementCreationOptions {
+  CustomElementRegistry customElementRegistry;
   DOMString is;
 };
 
+dictionary ImportNodeOptions {
+  CustomElementRegistry customElementRegistry;
+  boolean selfOnly = false;
+};
+
 [Exposed=Window]
 interface DOMImplementation {
   [NewObject] DocumentType createDocumentType(DOMString qualifiedName, DOMString publicId, DOMString systemId);
@@ -344,6 +351,7 @@ interface ShadowRoot : DocumentFragment {
   readonly attribute boolean clonable;
   readonly attribute boolean serializable;
   readonly attribute Element host;
+
   attribute EventHandler onslotchange;
 };
 
@@ -384,6 +392,8 @@ interface Element : Node {
   ShadowRoot attachShadow(ShadowRootInit init);
   readonly attribute ShadowRoot? shadowRoot;
 
+  readonly attribute CustomElementRegistry? customElementRegistry;
+
   Element? closest(DOMString selectors);
   boolean matches(DOMString selectors);
   boolean webkitMatchesSelector(DOMString selectors); // legacy alias of .matches
@@ -402,6 +412,7 @@ dictionary ShadowRootInit {
   SlotAssignmentMode slotAssignment = "named";
   boolean clonable = false;
   boolean serializable = false;
+  CustomElementRegistry customElementRegistry;
 };
 
 [Exposed=Window,
diff --git a/tests/wpt/tests/interfaces/fedcm.idl b/tests/wpt/tests/interfaces/fedcm.idl
index f7038a6fee1..5ce2d260f11 100644
--- a/tests/wpt/tests/interfaces/fedcm.idl
+++ b/tests/wpt/tests/interfaces/fedcm.idl
@@ -12,6 +12,7 @@ interface IdentityCredential : Credential {
   static Promise<undefined> disconnect(IdentityCredentialDisconnectOptions options);
   readonly attribute USVString? token;
   readonly attribute boolean isAutoSelected;
+  readonly attribute USVString configURL;
 };
 
 dictionary DisconnectedAccount {
@@ -73,22 +74,26 @@ dictionary IdentityProviderBranding {
 
 dictionary IdentityProviderAPIConfig {
   required USVString accounts_endpoint;
-  required USVString client_metadata_endpoint;
+  USVString client_metadata_endpoint;
   required USVString id_assertion_endpoint;
   required USVString login_url;
   USVString disconnect_endpoint;
   IdentityProviderBranding branding;
+  USVString account_label;
 };
 
 dictionary IdentityProviderAccount {
   required USVString id;
-  required USVString name;
-  required USVString email;
+  USVString name;
+  USVString email;
+  USVString tel;
+  USVString username;
   USVString given_name;
   USVString picture;
   sequence<USVString> approved_clients;
   sequence<DOMString> login_hints;
   sequence<DOMString> domain_hints;
+  sequence<DOMString> label_hints;
 };
 dictionary IdentityProviderAccountList {
   sequence<IdentityProviderAccount> accounts;
diff --git a/tests/wpt/tests/interfaces/html.idl b/tests/wpt/tests/interfaces/html.idl
index 97fabdf80fa..102149c4dfa 100644
--- a/tests/wpt/tests/interfaces/html.idl
+++ b/tests/wpt/tests/interfaces/html.idl
@@ -1261,6 +1261,7 @@ interface HTMLTemplateElement : HTMLElement {
   [CEReactions] attribute boolean shadowRootDelegatesFocus;
   [CEReactions] attribute boolean shadowRootClonable;
   [CEReactions] attribute boolean shadowRootSerializable;
+  [CEReactions] attribute DOMString shadowRootCustomElementRegistry;
 };
 
 [Exposed=Window]
@@ -1541,19 +1542,25 @@ interface TextMetrics {
   readonly attribute double ideographicBaseline;
 };
 
+typedef (Uint8ClampedArray or Float16Array) ImageDataArray;
+
+enum ImageDataPixelFormat { "rgba-unorm8", "rgba-float16" };
+
 dictionary ImageDataSettings {
   PredefinedColorSpace colorSpace;
+  ImageDataPixelFormat pixelFormat = "rgba-unorm8";
 };
 
 [Exposed=(Window,Worker),
  Serializable]
 interface ImageData {
   constructor(unsigned long sw, unsigned long sh, optional ImageDataSettings settings = {});
-  constructor(Uint8ClampedArray data, unsigned long sw, optional unsigned long sh, optional ImageDataSettings settings = {});
+  constructor(ImageDataArray data, unsigned long sw, optional unsigned long sh, optional ImageDataSettings settings = {});
 
   readonly attribute unsigned long width;
   readonly attribute unsigned long height;
-  readonly attribute Uint8ClampedArray data;
+  readonly attribute ImageDataArray data;
+  readonly attribute ImageDataPixelFormat pixelFormat;
   readonly attribute PredefinedColorSpace colorSpace;
 };
 
@@ -1623,11 +1630,14 @@ OffscreenCanvasRenderingContext2D includes CanvasPath;
 
 [Exposed=Window]
 interface CustomElementRegistry {
+  constructor();
+
   [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);
+  undefined initialize(Node root);
 };
 
 callback CustomElementConstructor = HTMLElement ();
diff --git a/tests/wpt/tests/interfaces/image-capture.idl b/tests/wpt/tests/interfaces/image-capture.idl
index 21e03d4db82..26cc7fab5cd 100644
--- a/tests/wpt/tests/interfaces/image-capture.idl
+++ b/tests/wpt/tests/interfaces/image-capture.idl
@@ -3,7 +3,7 @@
 // (https://github.com/w3c/webref)
 // Source: MediaStream Image Capture (https://w3c.github.io/mediacapture-image/)
 
-[Exposed=Window]
+[Exposed=Window, SecureContext]
 interface ImageCapture {
    constructor(MediaStreamTrack videoTrack);
    Promise<Blob>              takePhoto(optional PhotoSettings photoSettings = {});
diff --git a/tests/wpt/tests/interfaces/largest-contentful-paint.idl b/tests/wpt/tests/interfaces/largest-contentful-paint.idl
index 872ba552b0d..d1630cc7daa 100644
--- a/tests/wpt/tests/interfaces/largest-contentful-paint.idl
+++ b/tests/wpt/tests/interfaces/largest-contentful-paint.idl
@@ -5,7 +5,6 @@
 
 [Exposed=Window]
 interface LargestContentfulPaint : PerformanceEntry {
-    readonly attribute DOMHighResTimeStamp renderTime;
     readonly attribute DOMHighResTimeStamp loadTime;
     readonly attribute unsigned long size;
     readonly attribute DOMString id;
@@ -13,3 +12,5 @@ interface LargestContentfulPaint : PerformanceEntry {
     readonly attribute Element? element;
     [Default] object toJSON();
 };
+
+LargestContentfulPaint includes PaintTimingMixin;
diff --git a/tests/wpt/tests/interfaces/mediastream-recording.idl b/tests/wpt/tests/interfaces/mediastream-recording.idl
index 496bfcf2e27..68c891cdc91 100644
--- a/tests/wpt/tests/interfaces/mediastream-recording.idl
+++ b/tests/wpt/tests/interfaces/mediastream-recording.idl
@@ -56,7 +56,7 @@ interface BlobEvent : Event {
   readonly attribute DOMHighResTimeStamp timecode;
 };
 
-dictionary BlobEventInit {
+dictionary BlobEventInit : EventInit {
   required Blob data;
   DOMHighResTimeStamp timecode;
 };
diff --git a/tests/wpt/tests/interfaces/ppa.idl b/tests/wpt/tests/interfaces/ppa.idl
index ef3eb360bdf..3524d503c18 100644
--- a/tests/wpt/tests/interfaces/ppa.idl
+++ b/tests/wpt/tests/interfaces/ppa.idl
@@ -51,6 +51,10 @@ dictionary PrivateAttributionConversionOptions {
   unsigned long maxValue = 1;
 };
 
+enum PrivateAttributionLogic {
+  "last-touch",
+};
+
 dictionary PrivateAttributionConversionResult {
   required Uint8Array report;
 };
@@ -59,7 +63,3 @@ dictionary PrivateAttributionConversionResult {
 partial interface PrivateAttribution {
   Promise<PrivateAttributionConversionResult> measureConversion(PrivateAttributionConversionOptions options);
 };
-
-enum PrivateAttributionLogic {
-  "last-touch",
-};
diff --git a/tests/wpt/tests/interfaces/scoped-custom-elements-registry.tentative.idl b/tests/wpt/tests/interfaces/scoped-custom-elements-registry.tentative.idl
new file mode 100644
index 00000000000..46ca2d6b9c4
--- /dev/null
+++ b/tests/wpt/tests/interfaces/scoped-custom-elements-registry.tentative.idl
@@ -0,0 +1,38 @@
+[Exposed=Window]
+partial interface CustomElementRegistry {
+  constructor();
+  undefined initialize(Node root);
+};
+
+[Exposed=Window]
+partial interface HTMLTemplateElement {
+  [CEReactions] attribute DOMString shadowRootCustomElementRegistry;
+};
+
+[Exposed=Window]
+partial interface Document {
+  readonly attribute CustomElementRegistry? customElementRegistry;
+};
+
+[Exposed=Window]
+partial interface Element {
+  readonly attribute CustomElementRegistry? customElementRegistry;
+};
+
+[Exposed=Window]
+partial interface ShadowRoot {
+  readonly attribute CustomElementRegistry? customElementRegistry;
+};
+
+dictionary ImportNodeOptions {
+  CustomElementRegistry customElementRegistry;
+  boolean selfOnly = false;
+};
+
+partial dictionary ShadowRootInit {
+  CustomElementRegistry customElementRegistry;
+};
+
+partial dictionary ElementCreationOptions {
+  CustomElementRegistry customElementRegistry;
+};
diff --git a/tests/wpt/tests/interfaces/screen-capture.idl b/tests/wpt/tests/interfaces/screen-capture.idl
index 45fd0dd72c5..db9282ce0a5 100644
--- a/tests/wpt/tests/interfaces/screen-capture.idl
+++ b/tests/wpt/tests/interfaces/screen-capture.idl
@@ -71,6 +71,7 @@ partial dictionary MediaTrackSettings {
   DOMString cursor;
   boolean restrictOwnAudio;
   boolean suppressLocalAudioPlayback;
+  double screenPixelRatio;
 };
 
 partial dictionary MediaTrackCapabilities {
diff --git a/tests/wpt/tests/interfaces/secure-payment-confirmation.idl b/tests/wpt/tests/interfaces/secure-payment-confirmation.idl
index bec599d7a23..5b67ca62678 100644
--- a/tests/wpt/tests/interfaces/secure-payment-confirmation.idl
+++ b/tests/wpt/tests/interfaces/secure-payment-confirmation.idl
@@ -16,8 +16,16 @@ dictionary SecurePaymentConfirmationRequest {
     boolean showOptOut;
 };
 
+enum SecurePaymentConfirmationAvailability {
+  "available",
+  "unavailable-unknown-reason",
+  "unavailable-feature-not-enabled",
+  "unavailable-no-permission-policy",
+  "unavailable-no-user-verifying-platform-authenticator",
+};
+
 partial interface PaymentRequest {
-    static Promise<boolean> isSecurePaymentConfirmationAvailable();
+    static Promise<SecurePaymentConfirmationAvailability> securePaymentConfirmationAvailability();
 };
 
 partial dictionary AuthenticationExtensionsClientInputs {
diff --git a/tests/wpt/tests/interfaces/service-workers.idl b/tests/wpt/tests/interfaces/service-workers.idl
index d9ff2f651f8..34af3372401 100644
--- a/tests/wpt/tests/interfaces/service-workers.idl
+++ b/tests/wpt/tests/interfaces/service-workers.idl
@@ -34,7 +34,7 @@ interface ServiceWorkerRegistration : EventTarget {
   readonly attribute USVString scope;
   readonly attribute ServiceWorkerUpdateViaCache updateViaCache;
 
-  [NewObject] Promise<undefined> update();
+  [NewObject] Promise<ServiceWorkerRegistration> update();
   [NewObject] Promise<boolean> unregister();
 
   // event
diff --git a/tests/wpt/tests/interfaces/speech-api.idl b/tests/wpt/tests/interfaces/speech-api.idl
index bc0635fa3f2..0e07b4619a5 100644
--- a/tests/wpt/tests/interfaces/speech-api.idl
+++ b/tests/wpt/tests/interfaces/speech-api.idl
@@ -13,13 +13,14 @@ interface SpeechRecognition : EventTarget {
     attribute boolean interimResults;
     attribute unsigned long maxAlternatives;
     attribute SpeechRecognitionMode mode;
+    attribute SpeechRecognitionPhraseList phrases;
 
     // methods to drive the speech interaction
     undefined start();
     undefined start(MediaStreamTrack audioTrack);
     undefined stop();
     undefined abort();
-    static Promise<boolean> availableOnDevice(DOMString lang);
+    static Promise<AvailabilityStatus> availableOnDevice(DOMString lang);
     static Promise<boolean> installOnDevice(DOMString lang);
 
     // event methods
@@ -43,7 +44,8 @@ enum SpeechRecognitionErrorCode {
     "network",
     "not-allowed",
     "service-not-allowed",
-    "language-not-supported"
+    "language-not-supported",
+    "phrases-not-supported"
 };
 
 enum SpeechRecognitionMode {
@@ -52,6 +54,13 @@ enum SpeechRecognitionMode {
     "cloud-only", // Cloud speech recognition only.
 };
 
+enum AvailabilityStatus {
+    "unavailable",
+    "downloadable",
+    "downloading",
+    "available"
+};
+
 [Exposed=Window]
 interface SpeechRecognitionErrorEvent : Event {
     constructor(DOMString type, SpeechRecognitionErrorEventInit eventInitDict);
@@ -99,6 +108,24 @@ dictionary SpeechRecognitionEventInit : EventInit {
     required SpeechRecognitionResultList results;
 };
 
+// The object representing a phrase for contextual biasing.
+[Exposed=Window]
+interface SpeechRecognitionPhrase {
+    constructor(DOMString phrase, optional float boost = 1.0);
+    readonly attribute DOMString phrase;
+    readonly attribute float boost;
+};
+
+// The object representing a list of phrases for contextual biasing.
+[Exposed=Window]
+interface SpeechRecognitionPhraseList {
+    constructor(sequence<SpeechRecognitionPhrase> phrases);
+    readonly attribute unsigned long length;
+    SpeechRecognitionPhrase item(unsigned long index);
+    undefined addItem(SpeechRecognitionPhrase item);
+    undefined removeItem(unsigned long index);
+};
+
 [Exposed=Window]
 interface SpeechSynthesis : EventTarget {
     readonly attribute boolean pending;
diff --git a/tests/wpt/tests/interfaces/turtledove.idl b/tests/wpt/tests/interfaces/turtledove.idl
index b9f50d47885..7f11cdc3790 100644
--- a/tests/wpt/tests/interfaces/turtledove.idl
+++ b/tests/wpt/tests/interfaces/turtledove.idl
@@ -206,6 +206,7 @@ partial interface Navigator {
 [Exposed=InterestGroupScriptRunnerGlobalScope]
 interface InterestGroupScriptRunnerGlobalScope {
   readonly attribute PrivateAggregation? privateAggregation;
+  readonly attribute ProtectedAudienceUtilities protectedAudience;
 };
 
 dictionary PASignalValue {
@@ -220,6 +221,12 @@ dictionary PAExtendedHistogramContribution {
   bigint filteringId = 0;
 };
 
+[Exposed=InterestGroupScriptRunnerGlobalScope]
+interface ProtectedAudienceUtilities {
+  Uint8Array encodeUtf8(USVString input);
+  USVString decodeUtf8(Uint8Array bytes);
+};
+
 [Exposed=InterestGroupBiddingAndScoringScriptRunnerGlobalScope]
 interface ForDebuggingOnly {
   undefined reportAdAuctionWin(USVString url);
diff --git a/tests/wpt/tests/interfaces/webaudio.idl b/tests/wpt/tests/interfaces/webaudio.idl
index 3b351f4d9e9..286aeba4069 100644
--- a/tests/wpt/tests/interfaces/webaudio.idl
+++ b/tests/wpt/tests/interfaces/webaudio.idl
@@ -6,7 +6,8 @@
 enum AudioContextState {
     "suspended",
     "running",
-    "closed"
+    "closed",
+    "interrupted"
 };
 
 enum AudioContextRenderSizeCategory {
diff --git a/tests/wpt/tests/interfaces/webauthn.idl b/tests/wpt/tests/interfaces/webauthn.idl
index a33c85e7bad..7fbe55e6765 100644
--- a/tests/wpt/tests/interfaces/webauthn.idl
+++ b/tests/wpt/tests/interfaces/webauthn.idl
@@ -311,22 +311,37 @@ enum PublicKeyCredentialHint {
 partial dictionary AuthenticationExtensionsClientInputs {
   DOMString appid;
 };
+partial dictionary AuthenticationExtensionsClientInputsJSON {
+  DOMString appid;
+};
 
 partial dictionary AuthenticationExtensionsClientOutputs {
   boolean appid;
 };
+partial dictionary AuthenticationExtensionsClientOutputsJSON {
+  boolean appid;
+};
 
 partial dictionary AuthenticationExtensionsClientInputs {
   DOMString appidExclude;
 };
+partial dictionary AuthenticationExtensionsClientInputsJSON {
+  DOMString appidExclude;
+};
 
 partial dictionary AuthenticationExtensionsClientOutputs {
   boolean appidExclude;
 };
+partial dictionary AuthenticationExtensionsClientOutputsJSON {
+  boolean appidExclude;
+};
 
 partial dictionary AuthenticationExtensionsClientInputs {
     boolean credProps;
 };
+partial dictionary AuthenticationExtensionsClientInputsJSON {
+    boolean credProps;
+};
 
 dictionary CredentialPropertiesOutput {
     boolean rk;
@@ -335,33 +350,57 @@ dictionary CredentialPropertiesOutput {
 partial dictionary AuthenticationExtensionsClientOutputs {
     CredentialPropertiesOutput credProps;
 };
+partial dictionary AuthenticationExtensionsClientOutputsJSON {
+    CredentialPropertiesOutput credProps;
+};
 
 dictionary AuthenticationExtensionsPRFValues {
     required BufferSource first;
     BufferSource second;
 };
+dictionary AuthenticationExtensionsPRFValuesJSON {
+    required Base64URLString first;
+    Base64URLString second;
+};
 
 dictionary AuthenticationExtensionsPRFInputs {
     AuthenticationExtensionsPRFValues eval;
     record<DOMString, AuthenticationExtensionsPRFValues> evalByCredential;
 };
+dictionary AuthenticationExtensionsPRFInputsJSON {
+    AuthenticationExtensionsPRFValuesJSON eval;
+    record<DOMString, AuthenticationExtensionsPRFValuesJSON> evalByCredential;
+};
 
 partial dictionary AuthenticationExtensionsClientInputs {
     AuthenticationExtensionsPRFInputs prf;
 };
+partial dictionary AuthenticationExtensionsClientInputsJSON {
+    AuthenticationExtensionsPRFInputsJSON prf;
+};
 
 dictionary AuthenticationExtensionsPRFOutputs {
     boolean enabled;
     AuthenticationExtensionsPRFValues results;
 };
+dictionary AuthenticationExtensionsPRFOutputsJSON {
+    boolean enabled;
+    AuthenticationExtensionsPRFValuesJSON results;
+};
 
 partial dictionary AuthenticationExtensionsClientOutputs {
     AuthenticationExtensionsPRFOutputs prf;
 };
+partial dictionary AuthenticationExtensionsClientOutputsJSON {
+    AuthenticationExtensionsPRFOutputsJSON prf;
+};
 
 partial dictionary AuthenticationExtensionsClientInputs {
     AuthenticationExtensionsLargeBlobInputs largeBlob;
 };
+partial dictionary AuthenticationExtensionsClientInputsJSON {
+    AuthenticationExtensionsLargeBlobInputsJSON largeBlob;
+};
 
 enum LargeBlobSupport {
   "required",
@@ -373,13 +412,26 @@ dictionary AuthenticationExtensionsLargeBlobInputs {
     boolean read;
     BufferSource write;
 };
+dictionary AuthenticationExtensionsLargeBlobInputsJSON {
+    DOMString support;
+    boolean read;
+    Base64URLString write;
+};
 
 partial dictionary AuthenticationExtensionsClientOutputs {
     AuthenticationExtensionsLargeBlobOutputs largeBlob;
 };
+partial dictionary AuthenticationExtensionsClientOutputsJSON {
+    AuthenticationExtensionsLargeBlobOutputsJSON largeBlob;
+};
 
 dictionary AuthenticationExtensionsLargeBlobOutputs {
     boolean supported;
     ArrayBuffer blob;
     boolean written;
 };
+dictionary AuthenticationExtensionsLargeBlobOutputsJSON {
+    boolean supported;
+    Base64URLString blob;
+    boolean written;
+};
diff --git a/tests/wpt/tests/interfaces/webcodecs.idl b/tests/wpt/tests/interfaces/webcodecs.idl
index 274ef96578a..3d4db1ed49d 100644
--- a/tests/wpt/tests/interfaces/webcodecs.idl
+++ b/tests/wpt/tests/interfaces/webcodecs.idl
@@ -141,7 +141,7 @@ dictionary AudioDecoderConfig {
   required DOMString codec;
   [EnforceRange] required unsigned long sampleRate;
   [EnforceRange] required unsigned long numberOfChannels;
-  BufferSource description;
+  AllowSharedBufferSource description;
 };
 
 dictionary VideoDecoderConfig {
diff --git a/tests/wpt/tests/interfaces/WebCryptoAPI.idl b/tests/wpt/tests/interfaces/webcrypto.idl
similarity index 100%
rename from tests/wpt/tests/interfaces/WebCryptoAPI.idl
rename to tests/wpt/tests/interfaces/webcrypto.idl
diff --git a/tests/wpt/tests/interfaces/webgpu.idl b/tests/wpt/tests/interfaces/webgpu.idl
index d91a6a710b1..4fec46a2557 100644
--- a/tests/wpt/tests/interfaces/webgpu.idl
+++ b/tests/wpt/tests/interfaces/webgpu.idl
@@ -64,6 +64,7 @@ interface GPUAdapterInfo {
     readonly attribute DOMString description;
     readonly attribute unsigned long subgroupMinSize;
     readonly attribute unsigned long subgroupMaxSize;
+    readonly attribute boolean isFallbackAdapter;
 };
 
 interface mixin NavigatorGPU {
@@ -96,7 +97,6 @@ interface GPUAdapter {
     [SameObject] readonly attribute GPUSupportedFeatures features;
     [SameObject] readonly attribute GPUSupportedLimits limits;
     [SameObject] readonly attribute GPUAdapterInfo info;
-    readonly attribute boolean isFallbackAdapter;
 
     Promise<GPUDevice> requestDevice(optional GPUDeviceDescriptor descriptor = {});
 };
@@ -109,6 +109,7 @@ dictionary GPUDeviceDescriptor
 };
 
 enum GPUFeatureName {
+    "core-features-and-limits",
     "depth-clip-control",
     "depth32float-stencil8",
     "texture-compression-bc",
@@ -936,12 +937,16 @@ interface GPUCommandEncoder {
     GPURenderPassEncoder beginRenderPass(GPURenderPassDescriptor descriptor);
     GPUComputePassEncoder beginComputePass(optional GPUComputePassDescriptor descriptor = {});
 
+    undefined copyBufferToBuffer(
+        GPUBuffer source,
+        GPUBuffer destination,
+        optional GPUSize64 size);
     undefined copyBufferToBuffer(
         GPUBuffer source,
         GPUSize64 sourceOffset,
         GPUBuffer destination,
         GPUSize64 destinationOffset,
-        GPUSize64 size);
+        optional GPUSize64 size);
 
     undefined copyBufferToTexture(
         GPUTexelCopyBufferInfo source,
diff --git a/tests/wpt/tests/interfaces/webnn.idl b/tests/wpt/tests/interfaces/webnn.idl
index 8dc3a0ebc14..37fcc32501e 100644
--- a/tests/wpt/tests/interfaces/webnn.idl
+++ b/tests/wpt/tests/interfaces/webnn.idl
@@ -36,6 +36,8 @@ interface MLContext {
   undefined dispatch(MLGraph graph, MLNamedTensors inputs, MLNamedTensors outputs);
 
   Promise<MLTensor> createTensor(MLTensorDescriptor descriptor);
+  Promise<MLTensor> createConstantTensor(
+    MLOperandDescriptor descriptor, AllowSharedBufferSource inputData);
 
   Promise<ArrayBuffer> readTensor(MLTensor tensor);
   Promise<undefined> readTensor(MLTensor tensor, AllowSharedBufferSource outputData);
@@ -51,24 +53,37 @@ interface MLContext {
 
 dictionary MLOpSupportLimits {
   MLInputOperandLayout preferredInputLayout;
-  MLSupportLimits input;
-  MLSupportLimits constant;
-  MLSupportLimits output;
+  [EnforceRange] unsigned long long maxTensorByteLength;
+  MLDataTypeLimits input;
+  MLDataTypeLimits constant;
+  MLDataTypeLimits output;
 };
 
-dictionary MLSupportLimits {
-  sequence<MLOperandDataType> dataTypes;
+typedef sequence<MLOperandDataType> MLDataTypeList;
+
+dictionary MLDataTypeLimits {
+  MLDataTypeList dataTypes;
+};
+
+dictionary MLRankRange {
+  unsigned long min;
+  unsigned long max;
+};
+
+dictionary MLTensorLimits {
+  MLDataTypeList dataTypes;
+  MLRankRange rankRange;
 };
 
 dictionary MLBinarySupportLimits {
-  MLSupportLimits a;
-  MLSupportLimits b;
-  MLSupportLimits output;
+  MLTensorLimits a;
+  MLTensorLimits b;
+  MLDataTypeLimits output;
 };
 
 dictionary MLSingleInputSupportLimits {
-  MLSupportLimits input;
-  MLSupportLimits output;
+  MLTensorLimits input;
+  MLDataTypeLimits output;
 };
 
 [SecureContext, Exposed=(Window, Worker)]
@@ -120,6 +135,7 @@ interface MLTensor {
   readonly attribute FrozenArray<unsigned long> shape;
   readonly attribute boolean readable;
   readonly attribute boolean writable;
+  readonly attribute boolean constant;
 
   undefined destroy();
 };
@@ -141,6 +157,9 @@ interface MLGraphBuilder {
   // Create a scalar operand from the specified number of the specified type.
   MLOperand constant(MLOperandDataType type, MLNumber value);
 
+  // Create an operand from a specified constant tensor.
+  MLOperand constant(MLTensor tensor);
+
   // Compile the graph up to the specified output operands asynchronously.
   Promise<MLGraph> build(MLNamedOperands outputs);
 };
@@ -175,12 +194,12 @@ partial interface MLGraphBuilder {
 };
 
 dictionary MLBatchNormalizationSupportLimits {
-  MLSupportLimits input;
-  MLSupportLimits mean;
-  MLSupportLimits variance;
-  MLSupportLimits scale;
-  MLSupportLimits bias;
-  MLSupportLimits output;
+  MLTensorLimits input;
+  MLTensorLimits mean;
+  MLTensorLimits variance;
+  MLTensorLimits scale;
+  MLTensorLimits bias;
+  MLDataTypeLimits output;
 };
 
 partial dictionary MLOpSupportLimits {
@@ -217,8 +236,8 @@ partial interface MLGraphBuilder {
 };
 
 dictionary MLConcatSupportLimits {
-  MLSupportLimits inputs;
-  MLSupportLimits output;
+  MLTensorLimits inputs;
+  MLDataTypeLimits output;
 };
 
 partial dictionary MLOpSupportLimits {
@@ -249,10 +268,10 @@ partial interface MLGraphBuilder {
 };
 
 dictionary MLConv2dSupportLimits {
-  MLSupportLimits input;
-  MLSupportLimits filter;
-  MLSupportLimits bias;
-  MLSupportLimits output;
+  MLTensorLimits input;
+  MLTensorLimits filter;
+  MLTensorLimits bias;
+  MLDataTypeLimits output;
 };
 
 partial dictionary MLOpSupportLimits {
@@ -353,8 +372,8 @@ partial interface MLGraphBuilder {
 };
 
 dictionary MLLogicalNotSupportLimits {
-  MLSupportLimits a;
-  MLSupportLimits output;
+  MLTensorLimits a;
+  MLDataTypeLimits output;
 };
 
 partial dictionary MLOpSupportLimits {
@@ -411,15 +430,15 @@ partial interface MLGraphBuilder {
                              optional MLOperatorOptions options = {});
 };
 
-dictionary MLQuantizationSupportLimits {
-  MLSupportLimits input;
-  MLSupportLimits scale;
-  MLSupportLimits zeroPoint;
-  MLSupportLimits output;
+dictionary MLQuantizeDequantizeLinearSupportLimits {
+  MLTensorLimits input;
+  MLTensorLimits scale;
+  MLTensorLimits zeroPoint;
+  MLDataTypeLimits output;
 };
 
 partial dictionary MLOpSupportLimits {
-  MLQuantizationSupportLimits dequantizeLinear;
+  MLQuantizeDequantizeLinearSupportLimits dequantizeLinear;
 };
 
 partial interface MLGraphBuilder {
@@ -430,7 +449,7 @@ partial interface MLGraphBuilder {
 };
 
 partial dictionary MLOpSupportLimits {
-  MLQuantizationSupportLimits quantizeLinear;
+  MLQuantizeDequantizeLinearSupportLimits quantizeLinear;
 };
 
 dictionary MLEluOptions : MLOperatorOptions {
@@ -466,9 +485,9 @@ partial interface MLGraphBuilder {
 };
 
 dictionary MLGatherSupportLimits {
-  MLSupportLimits input;
-  MLSupportLimits indices;
-  MLSupportLimits output;
+  MLTensorLimits input;
+  MLTensorLimits indices;
+  MLDataTypeLimits output;
 };
 
 partial dictionary MLOpSupportLimits {
@@ -516,10 +535,10 @@ partial interface MLGraphBuilder {
 };
 
 dictionary MLGemmSupportLimits {
-  MLSupportLimits a;
-  MLSupportLimits b;
-  MLSupportLimits c;
-  MLSupportLimits output;
+  MLTensorLimits a;
+  MLTensorLimits b;
+  MLTensorLimits c;
+  MLDataTypeLimits output;
 };
 
 partial dictionary MLOpSupportLimits {
@@ -564,13 +583,13 @@ partial interface MLGraphBuilder {
 };
 
 dictionary MLGruSupportLimits {
-  MLSupportLimits input;
-  MLSupportLimits weight;
-  MLSupportLimits recurrentWeight;
-  MLSupportLimits bias;
-  MLSupportLimits recurrentBias;
-  MLSupportLimits initialHiddenState;
-  MLSupportLimits outputs;
+  MLTensorLimits input;
+  MLTensorLimits weight;
+  MLTensorLimits recurrentWeight;
+  MLTensorLimits bias;
+  MLTensorLimits recurrentBias;
+  MLTensorLimits initialHiddenState;
+  MLDataTypeLimits outputs;
 };
 
 partial dictionary MLOpSupportLimits {
@@ -595,13 +614,13 @@ partial interface MLGraphBuilder {
 };
 
 dictionary MLGruCellSupportLimits {
-  MLSupportLimits input;
-  MLSupportLimits weight;
-  MLSupportLimits recurrentWeight;
-  MLSupportLimits hiddenState;
-  MLSupportLimits bias;
-  MLSupportLimits recurrentBias;
-  MLSupportLimits output;
+  MLTensorLimits input;
+  MLTensorLimits weight;
+  MLTensorLimits recurrentWeight;
+  MLTensorLimits hiddenState;
+  MLTensorLimits bias;
+  MLTensorLimits recurrentBias;
+  MLDataTypeLimits output;
 };
 
 partial dictionary MLOpSupportLimits {
@@ -642,10 +661,10 @@ partial interface MLGraphBuilder {
 };
 
 dictionary MLNormalizationSupportLimits {
-  MLSupportLimits input;
-  MLSupportLimits scale;
-  MLSupportLimits bias;
-  MLSupportLimits output;
+  MLTensorLimits input;
+  MLTensorLimits scale;
+  MLTensorLimits bias;
+  MLDataTypeLimits output;
 };
 
 partial dictionary MLOpSupportLimits {
@@ -720,15 +739,15 @@ partial interface MLGraphBuilder {
 };
 
 dictionary MLLstmSupportLimits {
-  MLSupportLimits input;
-  MLSupportLimits weight;
-  MLSupportLimits recurrentWeight;
-  MLSupportLimits bias;
-  MLSupportLimits recurrentBias;
-  MLSupportLimits peepholeWeight;
-  MLSupportLimits initialHiddenState;
-  MLSupportLimits initialCellState;
-  MLSupportLimits outputs;
+  MLTensorLimits input;
+  MLTensorLimits weight;
+  MLTensorLimits recurrentWeight;
+  MLTensorLimits bias;
+  MLTensorLimits recurrentBias;
+  MLTensorLimits peepholeWeight;
+  MLTensorLimits initialHiddenState;
+  MLTensorLimits initialCellState;
+  MLDataTypeLimits outputs;
 };
 
 partial dictionary MLOpSupportLimits {
@@ -754,15 +773,15 @@ partial interface MLGraphBuilder {
 };
 
 dictionary MLLstmCellSupportLimits {
-  MLSupportLimits input;
-  MLSupportLimits weight;
-  MLSupportLimits recurrentWeight;
-  MLSupportLimits hiddenState;
-  MLSupportLimits cellState;
-  MLSupportLimits bias;
-  MLSupportLimits recurrentBias;
-  MLSupportLimits peepholeWeight;
-  MLSupportLimits outputs;
+  MLTensorLimits input;
+  MLTensorLimits weight;
+  MLTensorLimits recurrentWeight;
+  MLTensorLimits hiddenState;
+  MLTensorLimits cellState;
+  MLTensorLimits bias;
+  MLTensorLimits recurrentBias;
+  MLTensorLimits peepholeWeight;
+  MLDataTypeLimits outputs;
 };
 
 partial dictionary MLOpSupportLimits {
@@ -834,9 +853,9 @@ partial interface MLGraphBuilder {
 };
 
 dictionary MLPreluSupportLimits {
-  MLSupportLimits input;
-  MLSupportLimits slope;
-  MLSupportLimits output;
+  MLTensorLimits input;
+  MLTensorLimits slope;
+  MLDataTypeLimits output;
 };
 
 partial dictionary MLOpSupportLimits {
@@ -936,10 +955,10 @@ partial interface MLGraphBuilder {
 };
 
 dictionary MLScatterSupportLimits {
-  MLSupportLimits input;
-  MLSupportLimits indices;
-  MLSupportLimits updates;
-  MLSupportLimits output;
+  MLTensorLimits input;
+  MLTensorLimits indices;
+  MLTensorLimits updates;
+  MLDataTypeLimits output;
 };
 
 partial dictionary MLOpSupportLimits {
@@ -1018,8 +1037,8 @@ partial interface MLGraphBuilder {
 };
 
 dictionary MLSplitSupportLimits {
-  MLSupportLimits input;
-  MLSupportLimits outputs;
+  MLTensorLimits input;
+  MLDataTypeLimits outputs;
 };
 
 partial dictionary MLOpSupportLimits {
@@ -1077,10 +1096,10 @@ partial interface MLGraphBuilder {
 };
 
 dictionary MLWhereSupportLimits {
-  MLSupportLimits condition;
-  MLSupportLimits trueValue;
-  MLSupportLimits falseValue;
-  MLSupportLimits output;
+  MLTensorLimits condition;
+  MLTensorLimits trueValue;
+  MLTensorLimits falseValue;
+  MLDataTypeLimits output;
 };
 
 partial dictionary MLOpSupportLimits {
diff --git a/tests/wpt/tests/interfaces/webrtc-stats.idl b/tests/wpt/tests/interfaces/webrtc-stats.idl
index ac820c7c9dc..1e7a2648bbb 100644
--- a/tests/wpt/tests/interfaces/webrtc-stats.idl
+++ b/tests/wpt/tests/interfaces/webrtc-stats.idl
@@ -38,6 +38,10 @@ dictionary RTCCodecStats : RTCStats {
 
 dictionary RTCReceivedRtpStreamStats : RTCRtpStreamStats {
              unsigned long long   packetsReceived;
+             unsigned long long   packetsReceivedWithEct1;
+             unsigned long long   packetsReceivedWithCe;
+             unsigned long long   packetsReportedAsLost;
+             unsigned long long   packetsReportedAsLostButRecovered;
              long long            packetsLost;
              double               jitter;
 };
@@ -107,11 +111,13 @@ dictionary RTCRemoteInboundRtpStreamStats : RTCReceivedRtpStreamStats {
              double               totalRoundTripTime;
              double               fractionLost;
              unsigned long long   roundTripTimeMeasurements;
+             unsigned long long   packetsWithBleachedEct1Marking;
 };
 
 dictionary RTCSentRtpStreamStats : RTCRtpStreamStats {
-             unsigned long long packetsSent;
-             unsigned long long bytesSent;
+            unsigned long long packetsSent;
+            unsigned long long bytesSent;
+            unsigned long long packetsSentWithEct1;
 };
 
 dictionary RTCOutboundRtpStreamStats : RTCSentRtpStreamStats {
@@ -119,6 +125,7 @@ dictionary RTCOutboundRtpStreamStats : RTCSentRtpStreamStats {
              DOMString            mediaSourceId;
              DOMString            remoteId;
              DOMString            rid;
+             unsigned long        encodingIndex;
              unsigned long long   headerBytesSent;
              unsigned long long   retransmittedPacketsSent;
              unsigned long long   retransmittedBytesSent;
@@ -225,6 +232,8 @@ dictionary RTCTransportStats : RTCStats {
              RTCDtlsRole           dtlsRole;
              DOMString             srtpCipher;
              unsigned long         selectedCandidatePairChanges;
+             unsigned long         ccfbMessagesSent;
+       unsigned long         ccfbMessagesReceived;
 };
 
 enum RTCDtlsRole {
diff --git a/tests/wpt/tests/interfaces/webrtc.idl b/tests/wpt/tests/interfaces/webrtc.idl
index 174ead6261c..4a651551f14 100644
--- a/tests/wpt/tests/interfaces/webrtc.idl
+++ b/tests/wpt/tests/interfaces/webrtc.idl
@@ -13,7 +13,7 @@ dictionary RTCConfiguration {
 };
 
 dictionary RTCIceServer {
-  required (DOMString or sequence<DOMString>) urls;
+  required (USVString or sequence<USVString>) urls;
   DOMString username;
   DOMString credential;
 };
@@ -163,7 +163,7 @@ dictionary RTCLocalSessionDescriptionInit {
 
 [Exposed=Window]
 interface RTCIceCandidate {
-  constructor(optional RTCIceCandidateInit candidateInitDict = {});
+  constructor(optional RTCLocalIceCandidateInit candidateInitDict = {});
   readonly attribute DOMString candidate;
   readonly attribute DOMString? sdpMid;
   readonly attribute unsigned short? sdpMLineIndex;
@@ -179,7 +179,7 @@ interface RTCIceCandidate {
   readonly attribute unsigned short? relatedPort;
   readonly attribute DOMString? usernameFragment;
   readonly attribute RTCIceServerTransportProtocol? relayProtocol;
-  readonly attribute DOMString? url;
+  readonly attribute USVString? url;
   RTCIceCandidateInit toJSON();
 };
 
@@ -190,6 +190,11 @@ dictionary RTCIceCandidateInit {
   DOMString? usernameFragment = null;
 };
 
+dictionary RTCLocalIceCandidateInit : RTCIceCandidateInit {
+  RTCIceServerTransportProtocol? relayProtocol = null;
+  USVString? url = null;
+};
+
 enum RTCIceProtocol {
   "udp",
   "tcp"
@@ -218,12 +223,12 @@ enum RTCIceServerTransportProtocol {
 interface RTCPeerConnectionIceEvent : Event {
   constructor(DOMString type, optional RTCPeerConnectionIceEventInit eventInitDict = {});
   readonly attribute RTCIceCandidate? candidate;
-  readonly attribute DOMString? url;
+  readonly attribute USVString? url;
 };
 
 dictionary RTCPeerConnectionIceEventInit : EventInit {
   RTCIceCandidate? candidate;
-  DOMString? url;
+  USVString? url;
 };
 
 [Exposed=Window]
@@ -231,7 +236,7 @@ interface RTCPeerConnectionIceErrorEvent : Event {
   constructor(DOMString type, RTCPeerConnectionIceErrorEventInit eventInitDict);
   readonly attribute DOMString? address;
   readonly attribute unsigned short? port;
-  readonly attribute DOMString url;
+  readonly attribute USVString url;
   readonly attribute unsigned short errorCode;
   readonly attribute USVString errorText;
 };
@@ -239,7 +244,7 @@ interface RTCPeerConnectionIceErrorEvent : Event {
 dictionary RTCPeerConnectionIceErrorEventInit : EventInit {
   DOMString? address;
   unsigned short? port;
-  DOMString url;
+  USVString url;
   required unsigned short errorCode;
   USVString errorText;
 };
diff --git a/tests/wpt/tests/interfaces/webtransport.idl b/tests/wpt/tests/interfaces/webtransport.idl
index eb456336081..87da2a77303 100644
--- a/tests/wpt/tests/interfaces/webtransport.idl
+++ b/tests/wpt/tests/interfaces/webtransport.idl
@@ -14,7 +14,6 @@ interface WebTransportDatagramDuplexStream {
   WebTransportDatagramsWritable createWritable(
       optional WebTransportSendOptions options = {});
   readonly attribute ReadableStream readable;
-  readonly attribute WebTransportDatagramsWritable writable;
 
   readonly attribute unsigned long maxDatagramSize;
   attribute unrestricted double? incomingMaxAge;
diff --git a/tests/wpt/tests/interfaces/webxr-depth-sensing.idl b/tests/wpt/tests/interfaces/webxr-depth-sensing.idl
index b77b59c0ce6..7ddbec7cc97 100644
--- a/tests/wpt/tests/interfaces/webxr-depth-sensing.idl
+++ b/tests/wpt/tests/interfaces/webxr-depth-sensing.idl
@@ -3,6 +3,11 @@
 // (https://github.com/w3c/webref)
 // Source: WebXR Depth Sensing Module (https://immersive-web.github.io/depth-sensing/)
 
+enum XRDepthType {
+  "raw",
+  "smooth",
+};
+
 enum XRDepthUsage {
   "cpu-optimized",
   "gpu-optimized",
@@ -17,6 +22,8 @@ enum XRDepthDataFormat {
 dictionary XRDepthStateInit {
   required sequence<XRDepthUsage> usagePreference;
   required sequence<XRDepthDataFormat> dataFormatPreference;
+  sequence<XRDepthType> depthTypeRequest;
+  boolean matchDepthView = true;
 };
 
 partial dictionary XRSessionInit {
@@ -26,6 +33,11 @@ partial dictionary XRSessionInit {
 partial interface XRSession {
   readonly attribute XRDepthUsage depthUsage;
   readonly attribute XRDepthDataFormat depthDataFormat;
+  readonly attribute XRDepthType? depthType;
+  readonly attribute boolean? depthActive;
+
+  undefined pauseDepthSensing();
+  undefined resumeDepthSensing();
 };
 
 [SecureContext, Exposed=Window]
@@ -37,6 +49,8 @@ interface XRDepthInformation {
   readonly attribute float rawValueToMeters;
 };
 
+XRDepthInformation includes XRViewGeometry;
+
 [Exposed=Window]
 interface XRCPUDepthInformation : XRDepthInformation {
   [SameObject] readonly attribute ArrayBuffer data;
diff --git a/tests/wpt/tests/interfaces/webxr.idl b/tests/wpt/tests/interfaces/webxr.idl
index dea448d7440..874994086a2 100644
--- a/tests/wpt/tests/interfaces/webxr.idl
+++ b/tests/wpt/tests/interfaces/webxr.idl
@@ -70,6 +70,7 @@ enum XRVisibilityState {
 dictionary XRRenderStateInit {
   double depthNear;
   double depthFar;
+  boolean passthroughFullyObscured;
   double inlineVerticalFieldOfView;
   XRWebGLLayer? baseLayer;
   sequence<XRLayer>? layers;
@@ -78,6 +79,7 @@ dictionary XRRenderStateInit {
 [SecureContext, Exposed=Window] interface XRRenderState {
   readonly attribute double depthNear;
   readonly attribute double depthFar;
+  readonly attribute boolean? passthroughFullyObscured;
   readonly attribute double? inlineVerticalFieldOfView;
   readonly attribute XRWebGLLayer? baseLayer;
 };
@@ -116,6 +118,11 @@ interface XRBoundedReferenceSpace : XRReferenceSpace {
   readonly attribute FrozenArray<DOMPointReadOnly> boundsGeometry;
 };
 
+[SecureContext, Exposed=Window] interface mixin XRViewGeometry {
+  readonly attribute Float32Array projectionMatrix;
+  [SameObject] readonly attribute XRRigidTransform transform;
+};
+
 enum XREye {
   "none",
   "left",
@@ -124,13 +131,13 @@ enum XREye {
 
 [SecureContext, Exposed=Window] interface XRView {
   readonly attribute XREye eye;
-  readonly attribute Float32Array projectionMatrix;
-  [SameObject] readonly attribute XRRigidTransform transform;
   readonly attribute double? recommendedViewportScale;
 
   undefined requestViewportScale(double? scale);
 };
 
+XRView includes XRViewGeometry;
+
 [SecureContext, Exposed=Window] interface XRViewport {
   readonly attribute long x;
   readonly attribute long y;
diff --git a/tests/wpt/tests/interfaces/webxrlayers.idl b/tests/wpt/tests/interfaces/webxrlayers.idl
index c8b3a71c699..b99bef707fb 100644
--- a/tests/wpt/tests/interfaces/webxrlayers.idl
+++ b/tests/wpt/tests/interfaces/webxrlayers.idl
@@ -170,6 +170,8 @@ dictionary XRCubeLayerInit : XRLayerInit {
 
   XRWebGLSubImage getSubImage(XRCompositionLayer layer, XRFrame frame, optional XREye eye = "none");
   XRWebGLSubImage getViewSubImage(XRProjectionLayer layer, XRView view);
+
+  undefined foveateBoundTexture(GLenum target, float fixed_foveation);
 };
 
 dictionary XRMediaLayerInit {
diff --git a/tests/wpt/tests/interfaces/writing-assistance-apis.idl b/tests/wpt/tests/interfaces/writing-assistance-apis.idl
new file mode 100644
index 00000000000..916daee754e
--- /dev/null
+++ b/tests/wpt/tests/interfaces/writing-assistance-apis.idl
@@ -0,0 +1,193 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: Writing Assistance APIs (https://webmachinelearning.github.io/writing-assistance-apis/)
+
+[Exposed=Window, SecureContext]
+interface Summarizer {
+  static Promise<Summarizer> create(optional SummarizerCreateOptions options = {});
+  static Promise<Availability> availability(optional SummarizerCreateCoreOptions options = {});
+
+  Promise<DOMString> summarize(
+    DOMString input,
+    optional SummarizerSummarizeOptions options = {}
+  );
+  ReadableStream summarizeStreaming(
+    DOMString input,
+    optional SummarizerSummarizeOptions options = {}
+  );
+
+  readonly attribute DOMString sharedContext;
+  readonly attribute SummarizerType type;
+  readonly attribute SummarizerFormat format;
+  readonly attribute SummarizerLength length;
+
+  readonly attribute FrozenArray<DOMString>? expectedInputLanguages;
+  readonly attribute FrozenArray<DOMString>? expectedContextLanguages;
+  readonly attribute DOMString? outputLanguage;
+
+  Promise<double> measureInputUsage(
+    DOMString input,
+    optional SummarizerSummarizeOptions options = {}
+  );
+  readonly attribute unrestricted double inputQuota;
+};
+Summarizer includes DestroyableModel;
+
+dictionary SummarizerCreateCoreOptions {
+  SummarizerType type = "key-points";
+  SummarizerFormat format = "markdown";
+  SummarizerLength length = "short";
+
+  sequence<DOMString> expectedInputLanguages;
+  sequence<DOMString> expectedContextLanguages;
+  DOMString outputLanguage;
+};
+
+dictionary SummarizerCreateOptions : SummarizerCreateCoreOptions {
+  AbortSignal signal;
+  CreateMonitorCallback monitor;
+
+  DOMString sharedContext;
+};
+
+dictionary SummarizerSummarizeOptions {
+  AbortSignal signal;
+  DOMString context;
+};
+
+enum SummarizerType { "tl;dr", "teaser", "key-points", "headline" };
+enum SummarizerFormat { "plain-text", "markdown" };
+enum SummarizerLength { "short", "medium", "long" };
+
+[Exposed=Window, SecureContext]
+interface Writer {
+  static Promise<Writer> create(optional WriterCreateOptions options = {});
+  static Promise<Availability> availability(optional WriterCreateCoreOptions options = {});
+
+  Promise<DOMString> write(
+    DOMString input,
+    optional WriterWriteOptions options = {}
+  );
+  ReadableStream writeStreaming(
+    DOMString input,
+    optional WriterWriteOptions options = {}
+  );
+
+  readonly attribute DOMString sharedContext;
+  readonly attribute WriterTone tone;
+  readonly attribute WriterFormat format;
+  readonly attribute WriterLength length;
+
+  readonly attribute FrozenArray<DOMString>? expectedInputLanguages;
+  readonly attribute FrozenArray<DOMString>? expectedContextLanguages;
+  readonly attribute DOMString? outputLanguage;
+
+  Promise<double> measureInputUsage(
+    DOMString input,
+    optional WriterWriteOptions options = {}
+  );
+  readonly attribute unrestricted double inputQuota;
+};
+Writer includes DestroyableModel;
+
+dictionary WriterCreateCoreOptions {
+  WriterTone tone = "neutral";
+  WriterFormat format = "markdown";
+  WriterLength length = "short";
+
+  sequence<DOMString> expectedInputLanguages;
+  sequence<DOMString> expectedContextLanguages;
+  DOMString outputLanguage;
+};
+
+dictionary WriterCreateOptions : WriterCreateCoreOptions {
+  AbortSignal signal;
+  CreateMonitorCallback monitor;
+
+  DOMString sharedContext;
+};
+
+dictionary WriterWriteOptions {
+  DOMString context;
+  AbortSignal signal;
+};
+
+enum WriterTone { "formal", "neutral", "casual" };
+enum WriterFormat { "plain-text", "markdown" };
+enum WriterLength { "short", "medium", "long" };
+
+[Exposed=Window, SecureContext]
+interface Rewriter {
+  static Promise<Rewriter> create(optional RewriterCreateOptions options = {});
+  static Promise<Availability> availability(optional RewriterCreateCoreOptions options = {});
+
+  Promise<DOMString> rewrite(
+    DOMString input,
+    optional RewriterRewriteOptions options = {}
+  );
+  ReadableStream rewriteStreaming(
+    DOMString input,
+    optional RewriterRewriteOptions options = {}
+  );
+
+  readonly attribute DOMString sharedContext;
+  readonly attribute RewriterTone tone;
+  readonly attribute RewriterFormat format;
+  readonly attribute RewriterLength length;
+
+  readonly attribute FrozenArray<DOMString>? expectedInputLanguages;
+  readonly attribute FrozenArray<DOMString>? expectedContextLanguages;
+  readonly attribute DOMString? outputLanguage;
+
+  Promise<double> measureInputUsage(
+    DOMString input,
+    optional RewriterRewriteOptions options = {}
+  );
+  readonly attribute unrestricted double inputQuota;
+};
+Rewriter includes DestroyableModel;
+
+dictionary RewriterCreateCoreOptions {
+  RewriterTone tone = "as-is";
+  RewriterFormat format = "as-is";
+  RewriterLength length = "as-is";
+
+  sequence<DOMString> expectedInputLanguages;
+  sequence<DOMString> expectedContextLanguages;
+  DOMString outputLanguage;
+};
+
+dictionary RewriterCreateOptions : RewriterCreateCoreOptions {
+  AbortSignal signal;
+  CreateMonitorCallback monitor;
+
+  DOMString sharedContext;
+};
+
+dictionary RewriterRewriteOptions {
+  DOMString context;
+  AbortSignal signal;
+};
+
+enum RewriterTone { "as-is", "more-formal", "more-casual" };
+enum RewriterFormat { "as-is", "plain-text", "markdown" };
+enum RewriterLength { "as-is", "shorter", "longer" };
+
+[Exposed=Window, SecureContext]
+interface CreateMonitor : EventTarget {
+  attribute EventHandler ondownloadprogress;
+};
+
+callback CreateMonitorCallback = undefined (CreateMonitor monitor);
+
+enum Availability {
+  "unavailable",
+  "downloadable",
+  "downloading",
+  "available"
+};
+
+interface mixin DestroyableModel {
+  undefined destroy();
+};
diff --git a/tests/wpt/tests/largest-contentful-paint/WEB_FEATURES.yml b/tests/wpt/tests/largest-contentful-paint/WEB_FEATURES.yml
new file mode 100644
index 00000000000..fbd4cc58df9
--- /dev/null
+++ b/tests/wpt/tests/largest-contentful-paint/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: largest-contentful-paint
+  files: "**"
diff --git a/tests/wpt/tests/largest-contentful-paint/animated/observe-cross-origin-animated-image.tentative.html b/tests/wpt/tests/largest-contentful-paint/animated/observe-cross-origin-animated-image.tentative.html
index 49207f9d690..8ef198dac68 100644
--- a/tests/wpt/tests/largest-contentful-paint/animated/observe-cross-origin-animated-image.tentative.html
+++ b/tests/wpt/tests/largest-contentful-paint/animated/observe-cross-origin-animated-image.tentative.html
@@ -14,12 +14,26 @@
       assert_implements(window.LargestContentfulPaint,
                         "LargestContentfulPaint is not implemented");
       const beforeLoad = performance.now();
-      // 262 is the size of the animated PNG up until the first frame,
-      // including the chunk that starts the second frame (indicating that
-      //the first frame data is done).
+      // Offsets inside `anim-gr.png`:
+      //   IHDR: 8..33
+      //   acTL: 33..53
+      //   fcTL (1st frame): 53..91
+      //   IDAT (1st frame): 91..254
+      //   fcTL (2nd frame): 254..292
+      //      fcTL payload starts at offset 262
+      //   fdAT (2nd frame): 292..448
+      //      fdAT payload starts at offset 304
+      //
+      // The HTTP request below will stall for 2 seconds after all pixels of
+      // the 1st frame are available, but before any 2nd frame pixels are
+      // available.  The test will verify that LargestContentfulPaint fires
+      // "immediately", without waiting for the rest of the bytes.
+      //
+      // See https://crbug.com/393205780 why this offset (and not an earlier
+      // one) is used in the test.
       const {REMOTE_ORIGIN} = get_host_info();
       const url = REMOTE_ORIGIN +
-                  '/images/anim-gr.png?pipe=trickle(262:d1)';
+                  '/images/anim-gr.png?pipe=trickle(304:d1)';
       const entry = await load_and_observe(url);
       // anim-gr.png is 100 by 50.
       const size = 100 * 50;
diff --git a/tests/wpt/tests/largest-contentful-paint/animated/observe-cross-origin-tao-animated-image.tentative.html b/tests/wpt/tests/largest-contentful-paint/animated/observe-cross-origin-tao-animated-image.tentative.html
index 137dde66383..13181670c16 100644
--- a/tests/wpt/tests/largest-contentful-paint/animated/observe-cross-origin-tao-animated-image.tentative.html
+++ b/tests/wpt/tests/largest-contentful-paint/animated/observe-cross-origin-tao-animated-image.tentative.html
@@ -14,12 +14,26 @@
       assert_implements(window.LargestContentfulPaint,
                         "LargestContentfulPaint is not implemented");
       const beforeLoad = performance.now();
-      // 262 is the size of the animated PNG up until the first frame,
-      // including the chunk that starts the second frame (indicating that
-      //the first frame data is done).
+      // Offsets inside `anim-gr.png`:
+      //   IHDR: 8..33
+      //   acTL: 33..53
+      //   fcTL (1st frame): 53..91
+      //   IDAT (1st frame): 91..254
+      //   fcTL (2nd frame): 254..292
+      //      fcTL payload starts at offset 262
+      //   fdAT (2nd frame): 292..448
+      //      fdAT payload starts at offset 304
+      //
+      // The HTTP request below will stall for 2 seconds after all pixels of
+      // the 1st frame are available, but before any 2nd frame pixels are
+      // available.  The test will verify that LargestContentfulPaint fires
+      // "immediately", without waiting for the rest of the bytes.
+      //
+      // See https://crbug.com/393205780 why this offset (and not an earlier
+      // one) is used in the test.
       const {REMOTE_ORIGIN} = get_host_info();
       const url = REMOTE_ORIGIN +
-                  '/images/anim-tao.png?pipe=trickle(262:d1)';
+                  '/images/anim-tao.png?pipe=trickle(304:d1)';
       const entry = await load_and_observe(url);
       // anim-gr.png is 100 by 50.
       const size = 100 * 50;
diff --git a/tests/wpt/tests/largest-contentful-paint/idlharness.html b/tests/wpt/tests/largest-contentful-paint/idlharness.html
index 5f5d286b356..0dd006e711c 100644
--- a/tests/wpt/tests/largest-contentful-paint/idlharness.html
+++ b/tests/wpt/tests/largest-contentful-paint/idlharness.html
@@ -10,7 +10,7 @@
 
 idl_test(
   ['largest-contentful-paint'],
-  ['performance-timeline', 'dom', 'hr-time'],
+  ['performance-timeline', 'dom', 'hr-time', 'paint-timing'],
   async (idl_array, t) => {
     idl_array.add_objects({
       LargestContentfulPaint: ['lcp']
diff --git a/tests/wpt/tests/largest-contentful-paint/observe-text.html b/tests/wpt/tests/largest-contentful-paint/observe-text.html
index 0724a0bb92b..d029d500aa1 100644
--- a/tests/wpt/tests/largest-contentful-paint/observe-text.html
+++ b/tests/wpt/tests/largest-contentful-paint/observe-text.html
@@ -26,7 +26,7 @@ p {
         // PaintTimingMixin
         assert_greater_than_equal(entry.paintTime, beforeRender, 'paintTime should represent the time when the UA started painting');
 
-        if ("presentationTime" in entry) {
+        if ("presentationTime" in entry && entry.presentationTime !== null) {
           assert_greater_than(entry.presentationTime, entry.paintTime);
           assert_equals(entry.presentationTime, entry.renderTime);
         } else {
diff --git a/tests/wpt/tests/largest-contentful-paint/resources/largest-contentful-paint-helpers.js b/tests/wpt/tests/largest-contentful-paint/resources/largest-contentful-paint-helpers.js
index a01080c0088..99916f5c5d3 100644
--- a/tests/wpt/tests/largest-contentful-paint/resources/largest-contentful-paint-helpers.js
+++ b/tests/wpt/tests/largest-contentful-paint/resources/largest-contentful-paint-helpers.js
@@ -55,7 +55,7 @@ function checkImage(entry, expectedUrl, expectedID, expectedSize, timeLowerBound
   assert_greater_than_equal(entry.paintTime, timeLowerBound, 'paintTime should represent the time when the UA started painting');
 
   // PaintTimingMixin
-  if ("presentationTime" in entry) {
+  if ("presentationTime" in entry && entry.presentationTime !== null) {
     assert_greater_than(entry.presentationTime, entry.paintTime);
     assert_equals(entry.presentationTime, entry.renderTime);
   } else {
diff --git a/tests/wpt/tests/largest-contentful-paint/transparent-text-with-shadow.html b/tests/wpt/tests/largest-contentful-paint/transparent-text-with-shadow.html
index 8231ed9ff11..2c4cdb80c47 100644
--- a/tests/wpt/tests/largest-contentful-paint/transparent-text-with-shadow.html
+++ b/tests/wpt/tests/largest-contentful-paint/transparent-text-with-shadow.html
@@ -40,8 +40,8 @@
 
       lcpEntries = await LcpEntryPromise('larger_text');
 
-      assert_equals(lcpEntries.length, 1,
-        "Transparent texts with shadow decoration are should not be excluded from LCP.");
+      assert_equals(lcpEntries[lcpEntries.length - 1].id, 'larger_text',
+        "Transparent text with shadow decoration was included in LCP but not at correct place in timeline.");
     }, "Transparent text with shadow decoration should not be excluded from LCP.")
   </script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/largest-contentful-paint/transparent-text-with-text-stroke.html b/tests/wpt/tests/largest-contentful-paint/transparent-text-with-text-stroke.html
index 2c81ff8aad7..6434c172836 100644
--- a/tests/wpt/tests/largest-contentful-paint/transparent-text-with-text-stroke.html
+++ b/tests/wpt/tests/largest-contentful-paint/transparent-text-with-text-stroke.html
@@ -40,8 +40,8 @@
 
       lcpEntries = await LcpEntryPromise('larger_text');
 
-      assert_equals(lcpEntries.length, 1,
-        "Transparent texts with text stroke decoration are should not be excluded from LCP.");
+      assert_equals(lcpEntries[lcpEntries.length - 1].id, 'larger_text',
+        "Transparent text with text stroke decoration was included in LCP but not at correct place in timeline.");
     }, "Transparent text with text stroke decoration should not be excluded from LCP.")
   </script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/lint.ignore b/tests/wpt/tests/lint.ignore
index 65e22dccbc1..955e5df4907 100644
--- a/tests/wpt/tests/lint.ignore
+++ b/tests/wpt/tests/lint.ignore
@@ -287,6 +287,9 @@ SET TIMEOUT: shadow-dom/scroll-to-the-fragment-in-shadow-tree.html
 SET TIMEOUT: shadow-dom/slotchange-event.html
 SET TIMEOUT: trusted-types/support/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.js
 SET TIMEOUT: trusted-types/support/DOMWindowTimers-setTimeout-setInterval.js
+SET TIMEOUT: trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-multiple-violations.js
+SET TIMEOUT: trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-location.js
+SET TIMEOUT: trusted-types/support/trusted-types-reporting-check-report-sink-mismatch.js
 SET TIMEOUT: trusted-types/support/trusted-types-reporting-for-DOMWindowTimers-setTimeout-setInterval.js
 SET TIMEOUT: user-timing/*
 SET TIMEOUT: web-animations/crashtests/reparent-animating-element-002.html
@@ -390,6 +393,7 @@ SET TIMEOUT: css/css-fonts/font-display/font-display-preload.html
 SET TIMEOUT: css/css-view-transitions/no-painting-while-render-blocked.html
 SET TIMEOUT: document-policy/font-display/override-to-optional.tentative.html
 SET TIMEOUT: feature-policy/experimental-features/resources/focus-without-user-activation-iframe-tentative.html
+SET TIMEOUT: geolocation/watchposition-timeout.https.window.js
 SET TIMEOUT: permissions-policy/experimental-features/resources/focus-without-user-activation-iframe-tentative.html
 SET TIMEOUT: html/browsers/windows/auxiliary-browsing-contexts/resources/close-opener.html
 SET TIMEOUT: html/cross-origin-embedder-policy/resources/reporting-worker.js
diff --git a/tests/wpt/tests/mathml/presentation-markup/operators/symmetric-largeop.html b/tests/wpt/tests/mathml/presentation-markup/operators/symmetric-largeop.html
new file mode 100644
index 00000000000..b93ed5214e2
--- /dev/null
+++ b/tests/wpt/tests/mathml/presentation-markup/operators/symmetric-largeop.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Test placement of non-stretchy symmetric/non-symmetric largeops with a block-direction intrinsic stretch axis</title>
+<link rel="help" href="https://issues.chromium.org/issues/40889877">
+<link rel="help" href="https://github.com/w3c/mathml-core/issues/250">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/mathml/support/feature-detection.js"></script>
+<script src="/mathml/support/fonts.js"></script>
+<style>
+@font-face {
+  font-family: TestFont;
+  src: url("/fonts/math/largeop-displayoperatorminheight3000-2AFF-axisheight1000.woff");
+}
+math {
+  font-family: TestFont;
+  font-size: 30px;
+  margin-bottom: 15px; /* to distinguish the tests visually */
+}
+mspace {
+  background-color: green;
+}
+</style>
+<script>
+  setup({ explicit_done: true });
+  window.addEventListener("load", () => { loadAllFonts().then(runTests); });
+
+  // U+2AFF has intrinsic block stretch axis and the symmetric, largeop and movablelimits properties.
+  //
+  // We compare the operator top to the mspace bottom (which will always be the alphabetic baseline).
+  //
+  // The operator should center around the math axis for symmetric largeops.
+  // The ascent of the largeop is:
+  //   largeop height / 2 (= 1.5em)
+  // + AxisHeight         (= 1em)
+  // = 2.5em (75px).
+  //
+  // The operator should place on the baseline for non-symmetric largeops,
+  // so the ascent of the largeop = 3em (90px).
+
+  function runTests() {
+    test(function() {
+      const container = document.getElementById("container");
+      [
+        [ 75, "symmetric largeop is centered around the math axis" ],
+        [ 90, "non-symmetric largeop is placed on the baseline" ],
+      ].forEach(([ spacing, desc ], i) => {
+        const mrow = container.children[i].firstElementChild;
+        let opBbox = mrow.firstElementChild.getBoundingClientRect();
+        let spaceBbox = mrow.lastElementChild.getBoundingClientRect();
+        assert_equals(spaceBbox.bottom - opBbox.top, spacing, desc);
+      })
+    }, "Placement of operators");
+    done();
+  }
+</script>
+</head>
+<body>
+  <div id="container">
+    <math display="block">
+      <mrow>
+          <mo symmetric="true" largeop="true">&#x2AFF;</mo>
+          <mspace height="1em" width="1em"></mspace>
+      </mrow>
+    </math>
+    <math display="block">
+      <mrow>
+          <mo symmetric="false" largeop="true">&#x2AFF;</mo>
+          <mspace height="1em" width="1em"></mspace>
+      </mrow>
+    </math>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/tests/mathml/relations/css-styling/lengths-1-ref.html b/tests/wpt/tests/mathml/relations/css-styling/lengths-1-ref.html
index 9fca6f49632..74c1397ce62 100644
--- a/tests/wpt/tests/mathml/relations/css-styling/lengths-1-ref.html
+++ b/tests/wpt/tests/mathml/relations/css-styling/lengths-1-ref.html
@@ -3,11 +3,16 @@
 <head>
 <meta charset="utf-8"/>
 <title>MathML lengths (reference)</title>
+<style>
+  html {
+    line-height: 17px;
+  }
+</style>
 </head>
 <body>
   <p>Test passes if there is a green square and no red.</p>
   <div>
-    <div id="red" style="position: absolute; width: 200px; height: 200px; background: green;">
+    <div id="red" style="position: absolute; width: 340px; height: 340px; background: green;">
     </div>
   </div>
 </body>
diff --git a/tests/wpt/tests/mathml/relations/css-styling/lengths-1.html b/tests/wpt/tests/mathml/relations/css-styling/lengths-1.html
index 896f08d1119..224bedc1efc 100644
--- a/tests/wpt/tests/mathml/relations/css-styling/lengths-1.html
+++ b/tests/wpt/tests/mathml/relations/css-styling/lengths-1.html
@@ -7,12 +7,13 @@
 <link rel="help" href="https://w3c.github.io/mathml-core/#types-for-mathml-attribute-values">
 <link rel="help" href="https://w3c.github.io/mathml-core/#legacy-mathml-style-attributes">
 <link rel="help" href="https://w3c.github.io/mathml-core/#space-mspace">
+<link rel="help" href="https://www.w3.org/TR/css-values-4/#relative-lengths">
 <link rel="match" href="lengths-1-ref.html"/>
 <meta name="assert" content="Verify whether the different units are accepted for MathML lengths.">
 <style>
   @font-face {
     font-family: TestFont;
-    src: url("/fonts/math/xheight500.woff");
+    src: url("/fonts/math/css-units.woff");
   }
   span, math {
     font-family: TestFont;
@@ -29,12 +30,18 @@
   #green > span {
     background: green;
   }
+  /* For lh and rlh. */
+  html {
+    line-height: 17px;
+  }
 </style>
 </head>
 <body>
   <p>Test passes if there is a green square and no red.</p>
+
+  <!-- Omitted units: vw, vh, vi, vb, vmin, vmax -->
   <div>
-    <div id="red" style="position: absolute; width: 200px; height: 200px; background: green;">
+    <div id="red" style="position: absolute; width: 340px; height: 340px; background: green;">
       <!-- px -->
       <span style="top: 0px"><math><mspace width="200px"/></math></span>
       <span style="top: 10px; width: 200px"></span>
@@ -71,12 +78,40 @@
       <span style="top: 160px"><math><mstyle mathsize="2000%"><mspace width="1em"/></mstyle></math></span>
       <span style="top: 170px; width: 200px"></span>
 
+      <!-- q -->
+      <span style="top: 180px"><math><mspace width="203.2q"/></math></span>
+      <span style="top: 190px; width: 192px"></span>
+
+      <!-- ch -->
+      <span style="top: 200px"><math><mspace width="20ch"/></math></span>
+      <span style="top: 210px; width: 20ch"></span>
+
+      <!-- cap -->
+      <span style="top: 220px"><math><mspace width="30cap"/></math></span>
+      <span style="top: 230px; width: 30cap"></span>
+
+      <!-- ic -->
+      <span style="top: 240px"><math><mspace width="20ic"/></math></span>
+      <span style="top: 250px; width: 200px"></span>
+
+      <!-- rem -->
+      <span style="top: 260px"><math><mspace width="10rem"/></math></span>
+      <span style="top: 270px; width: 160px"></span>
+
+      <!-- lh -->
+      <span style="top: 280px"><math><mspace width="13lh" style="line-height: 15px;"/></math></span>
+      <span style="top: 290px; width: 195px"></span>
+
+      <!-- rlh -->
+      <span style="top: 300px"><math><mspace width="11rlh"/></math></span>
+      <span style="top: 310px; width: 187px"></span>
+
       <!-- unitless nonzero values should be ignored -->
-      <span style="top: 180px"><math><mstyle mathsize="20.0"><mspace width="1em"/></mstyle></math></span>
-      <span style="top: 190px; width: 10px"></span>
+      <span style="top: 320px"><math><mstyle mathsize="20.0"><mspace width="1em"/></mstyle></math></span>
+      <span style="top: 330px; width: 10px"></span>
     </div>
 
-    <div id="green" style="position: absolute; width: 200px; height: 200px;">
+    <div id="green" style="position: absolute; width: 340px; height: 340px;">
       <!-- px -->
       <span style="top: 10px"><math><mspace width="200px"/></math></span>
       <span style="top: 0px; width: 200px"></span>
@@ -113,9 +148,37 @@
       <span style="top: 170px"><math><mstyle mathsize="2000%"><mspace width="1em"/></mstyle></math></span>
       <span style="top: 160px; width: 200px"></span>
 
+      <!-- q -->
+      <span style="top: 190px"><math><mspace width="203.2q"/></math></span>
+      <span style="top: 180px; width: 192px"></span>
+
+      <!-- ch -->
+      <span style="top: 210px"><math><mspace width="20ch"/></math></span>
+      <span style="top: 200px; width: 20ch"></span>
+
+      <!-- cap -->
+      <span style="top: 230px"><math><mspace width="30cap"/></math></span>
+      <span style="top: 220px; width: 30cap"></span>
+
+      <!-- ic -->
+      <span style="top: 250px"><math><mspace width="20ic"/></math></span>
+      <span style="top: 240px; width: 200px"></span>
+
+      <!-- rem -->
+      <span style="top: 270px"><math><mspace width="10rem"/></math></span>
+      <span style="top: 260px; width: 160px"></span>
+
+      <!-- lh -->
+      <span style="top: 290px"><math><mspace width="13lh" style="line-height: 15px;"/></math></span>
+      <span style="top: 280px; width: 195px"></span>
+
+      <!-- rlh -->
+      <span style="top: 310px"><math><mspace width="11rlh"/></math></span>
+      <span style="top: 300px; width: 187px"></span>
+
       <!-- unitless nonzero values should be ignored -->
-      <span style="top: 190px"><math><mstyle mathsize="20.0"><mspace width="1em"/></mstyle></math></span>
-      <span style="top: 180px; width: 10px"></span>
+      <span style="top: 330px"><math><mstyle mathsize="20.0"><mspace width="1em"/></mstyle></math></span>
+      <span style="top: 320px; width: 10px"></span>
     </div>
   </div>
 </body>
diff --git a/tests/wpt/tests/mathml/relations/css-styling/lengths-2.html b/tests/wpt/tests/mathml/relations/css-styling/lengths-2.html
index 942611a8dad..af5cae13688 100644
--- a/tests/wpt/tests/mathml/relations/css-styling/lengths-2.html
+++ b/tests/wpt/tests/mathml/relations/css-styling/lengths-2.html
@@ -7,6 +7,7 @@
 <link rel="help" href="https://w3c.github.io/mathml-core/#types-for-mathml-attribute-values">
 <link rel="help" href="https://w3c.github.io/mathml-core/#legacy-mathml-style-attributes">
 <link rel="help" href="https://w3c.github.io/mathml-core/#space-mspace">
+<link rel="help" href="https://www.w3.org/TR/css-values-4/#relative-lengths">
 <meta name="assert" content="Verify various cases of the MathML length syntax.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -15,14 +16,20 @@
 <style>
   @font-face {
     font-family: TestFont;
-    src: url("/fonts/math/xheight500.woff");
+    src: url("/fonts/math/css-units.woff");
   }
   math {
     font-family: TestFont;
     font-size: 10px;
   }
+  /* For rlh. */
+  html {
+    line-height: 17px;
+  }
 </style>
 <script>
+  // Omitted units: vi, vb
+
   var epsilon = .5;
 
   function getBox(aId) {
@@ -44,6 +51,17 @@
       assert_equals(getBox("unitPercentage").width, 60, "%");
       assert_equals(getBox("unitPt").width, 96, "pt");
       assert_equals(getBox("unitPx").width, 123, "px");
+      assert_equals(getBox("unitQ").width, 192, "q");
+      assert_equals(getBox("unitCh").width, 100, "ch");
+      assert_equals(getBox("unitCap").width, 140, "cap");
+      assert_equals(getBox("unitIc").width, 90, "ic");
+      assert_approx_equals(getBox("unitVw").width, window.innerWidth*0.35, epsilon, "vw");
+      assert_approx_equals(getBox("unitVh").width, window.innerHeight*0.54, epsilon, "vh");
+      assert_approx_equals(getBox("unitVmin").width, Math.min(window.innerWidth, window.innerHeight)*0.27, epsilon, "vmin");
+      assert_approx_equals(getBox("unitVmax").width, Math.max(window.innerWidth, window.innerHeight)*0.34, epsilon, "vmax");
+      assert_equals(getBox("unitRem").width, 128, "rem");
+      assert_equals(getBox("unitLh").width, 60, "lh");
+      assert_equals(getBox("unitRlh").width, 102, "rlh");
     }, "Units");
 
     test(function() {
@@ -57,6 +75,17 @@
       assert_equals(getBox("spacePercentage").width, 60, "%");
       assert_equals(getBox("spacePt").width, 96, "pt");
       assert_equals(getBox("spacePx").width, 123, "px");
+      assert_equals(getBox("spaceQ").width, 192, "q");
+      assert_equals(getBox("spaceCh").width, 100, "ch");
+      assert_equals(getBox("spaceCap").width, 140, "cap");
+      assert_equals(getBox("spaceIc").width, 90, "ic");
+      assert_approx_equals(getBox("spaceVw").width, window.innerWidth*0.35, epsilon, "vw");
+      assert_approx_equals(getBox("spaceVh").width, window.innerHeight*0.54, epsilon, "vh");
+      assert_approx_equals(getBox("spaceVmin").width, Math.min(window.innerWidth, window.innerHeight)*0.27, epsilon, "vmin");
+      assert_approx_equals(getBox("spaceVmax").width, Math.max(window.innerWidth, window.innerHeight)*0.34, epsilon, "vmax");
+      assert_equals(getBox("spaceRem").width, 128, "rem");
+      assert_equals(getBox("spaceLh").width, 60, "lh");
+      assert_equals(getBox("spaceRlh").width, 102, "rlh");
     }, "Trimming of space");
 
     test(function() {
@@ -139,6 +168,19 @@
       <mstyle mathsize="200%"><mspace id="unitPercentage" width="3em"/></mstyle>
       <mspace id="unitPt" width="72pt"/>
       <mspace id="unitPx" width="123px"/>
+      <mspace id="unitQ" width="203.2q"/>
+      <mspace id="unitCh" width="10ch"/>
+      <mspace id="unitCap" width="14ch"/>
+      <mspace id="unitIc" width="9ic"/>
+      <mspace id="unitVw" width="35vw"/>
+      <mspace id="unitVh" width="54vh"/>
+      <mspace id="unitVi" width="11vi"/>
+      <mspace id="unitVb" width="4vb"/>
+      <mspace id="unitVmin" width="27vmin"/>
+      <mspace id="unitVmax" width="34vmax"/>
+      <mspace id="unitRem" width="8rem" style="font-size: 3px;"/>
+      <mspace id="unitLh" width="5lh" style="line-height: 12px;"/>
+      <mspace id="unitRlh" width="6rlh" style="line-height: 12px;"/>
       <mstyle mathsize="5"><mspace id="unitNone" width="3em"/></mstyle>
     </math>
   </p>
@@ -153,6 +195,19 @@
       <mstyle mathsize="200%"><mspace id="spacePercentage" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;3em&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;"/></mstyle>
       <mspace id="spacePt" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;72pt&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;"/>
       <mspace id="spacePx" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;123px&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;"/>
+      <mspace id="spaceQ" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;203.2q&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;"/>
+      <mspace id="spaceCh" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;10ch&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;"/>
+      <mspace id="spaceCap" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;14ch&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;"/>
+      <mspace id="spaceIc" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;9ic&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;"/>
+      <mspace id="spaceVw" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;35vw&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;"/>
+      <mspace id="spaceVh" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;54vh&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;"/>
+      <mspace id="spaceVi" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;11vi&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;"/>
+      <mspace id="spaceVb" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;4vb&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;"/>
+      <mspace id="spaceVmin" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;27vmin&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;"/>
+      <mspace id="spaceVmax" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;34vmax&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;"/>
+      <mspace id="spaceRem" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;8rem&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;" style="font-size: 3px;"/>
+      <mspace id="spaceLh" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;5lh&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;" style="line-height: 12px;"/>
+      <mspace id="spaceRlh" width="&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;6rlh&#x20;&#x9;&#xA;&#xD;&#x20;&#x9;&#xA;&#xD;" style="line-height: 12px;"/>
     </math>
   </p>
   <p>
diff --git a/tests/wpt/tests/mathml/relations/css-styling/lengths-vi-vb-units.html b/tests/wpt/tests/mathml/relations/css-styling/lengths-vi-vb-units.html
new file mode 100644
index 00000000000..a01fd13b98f
--- /dev/null
+++ b/tests/wpt/tests/mathml/relations/css-styling/lengths-vi-vb-units.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>MathML lengths (vi, vb)</title>
+<link rel="help" href="https://w3c.github.io/mathml-core/#css-styling">
+<link rel="help" href="https://w3c.github.io/mathml-core/#types-for-mathml-attribute-values">
+<link rel="help" href="https://www.w3.org/TR/css-values-4/#relative-lengths">
+<link rel="help" href="https://www.w3.org/TR/css-values-4/#viewport-relative-units">
+<meta name="assert" content="Verify that vi and vb correctly take this element's inline and block axes/writing mode into consideration in MathML.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/mathml/support/feature-detection.js"></script>
+</head>
+<body>
+  <div id="log"></div>
+  <iframe id="iframe" width="800" height="500"></iframe>
+  <script>
+    const epsilon = 0.5;
+    const percent = 8;
+
+    const doc = document.querySelector("#iframe").contentDocument;
+    const win = document.querySelector("#iframe").contentWindow;
+    const vw = win.innerWidth*percent*0.01;
+    const vh = win.innerHeight*percent*0.01;
+    ["horizontal-tb", "vertical-rl"].forEach(wm => {
+      test(function(t) {
+        t.add_cleanup(() => { doc.body.innerHTML = ""; });
+        doc.body.innerHTML = `
+          <style>html { writing-mode: ${wm}; }</style>
+          <math>
+            <mspace id="unitVi" width="${percent}vi"/>
+            <mspace id="unitVb" width="${percent}vb"/>
+          </math>
+        `.trim();
+        const vi = doc.querySelector("#unitVi").getBoundingClientRect().width;
+        const vb = doc.querySelector("#unitVb").getBoundingClientRect().width;
+
+        if (wm === "horizontal-tb") {
+          assert_approx_equals(vi, vw, epsilon, "vi in horizontal writing modes");
+          assert_approx_equals(vb, vh, epsilon, "vb in horizontal writing modes");
+        } else if (wm === "vertical-rl") {
+          assert_approx_equals(vi, vh, epsilon, "vi in vertical writing modes");
+          assert_approx_equals(vb, vw, epsilon, "vb in vertical writing modes");
+        }
+      }, `vi/vb in ${wm} writing modes`);
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/mathml/tools/css-units.py b/tests/wpt/tests/mathml/tools/css-units.py
new file mode 100644
index 00000000000..cdf06bb7744
--- /dev/null
+++ b/tests/wpt/tests/mathml/tools/css-units.py
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+from utils import mathfont
+
+# Create a font with glyphs for all the font-relative CSS units
+# (so that they all have length 1em).
+# See https://drafts.csswg.org/css-values-4/#lengths
+f = mathfont.create("css-units",
+                    "Copyright (c) 2025 Igalia S.L.")
+
+mathfont.drawRectangleGlyph(f.createChar(ord("x")), mathfont.em, mathfont.em // 2) # ex = 0.5em
+mathfont.createSquareGlyph(f, ord("O")) # cap = 1em
+mathfont.createSquareGlyph(f, ord("0")) # ch = 1em
+mathfont.createSquareGlyph(f, ord("水")) # ic = 1em
+
+assert f.capHeight == 1000
+assert f.xHeight == 500
+
+mathfont.save(f)
diff --git a/tests/wpt/tests/mathml/tools/largeop.py b/tests/wpt/tests/mathml/tools/largeop.py
index 9832ff0039c..62515751948 100755
--- a/tests/wpt/tests/mathml/tools/largeop.py
+++ b/tests/wpt/tests/mathml/tools/largeop.py
@@ -14,6 +14,25 @@ mathfont.drawRectangleGlyph(g, mathfont.em, v1, 0)
 f[nAryWhiteVerticalBarCodePoint].verticalVariants = "uni2AFF uni2AFF.display"
 mathfont.save(f)
 
+v1 = 3 * mathfont.em
+v2 = mathfont.em
+f = mathfont.create("largeop-displayoperatorminheight%d-2AFF-axisheight%d" % (v1, v2),
+                    "Copyright (c) 2025 Igalia S.L.")
+f.math.DisplayOperatorMinHeight = v1
+f.math.AxisHeight = v2
+mathfont.createSquareGlyph(f, nAryWhiteVerticalBarCodePoint)
+g = f.createChar(-1, "uni2AFF.display")
+p = g.glyphPen()
+p.moveTo(0, 0)
+p.lineTo(0, v1)
+p.lineTo(mathfont.em, v1)
+p.lineTo(mathfont.em, 0)
+p.closePath()
+g.width = mathfont.em
+g.italicCorrection = 0
+f[nAryWhiteVerticalBarCodePoint].verticalVariants = "uni2AFF uni2AFF.display"
+mathfont.save(f)
+
 v1 = 2 * mathfont.em
 v2 = 3 * mathfont.em
 f = mathfont.create("largeop-displayoperatorminheight%d-2AFF-italiccorrection%d" % (v1, v2),
diff --git a/tests/wpt/tests/media-capabilities/decodingInfo-webrtc.any.js b/tests/wpt/tests/media-capabilities/decodingInfo-webrtc.any.js
index 0f3a4fa0f2d..34ce5fb2921 100644
--- a/tests/wpt/tests/media-capabilities/decodingInfo-webrtc.any.js
+++ b/tests/wpt/tests/media-capabilities/decodingInfo-webrtc.any.js
@@ -19,6 +19,17 @@ const minimalAudioConfiguration = {
   contentType: 'audio/opus',
 };
 
+const videoConfigurationWithDynamicRange = {
+  contentType: 'video/webm; codecs="vp09.00.10.08.00.09.16.09.00"',
+  width: 800,
+  height: 600,
+  bitrate: 3000,
+  framerate: 24,
+  hdrMetadataType: 'smpteSt2086',
+  colorGamut: 'rec2020',
+  transferFunction: 'pq',
+};
+
 promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
     type: 'webrtc',
@@ -90,6 +101,19 @@ promise_test(t => {
   }));
 }, "Test that decodingInfo rejects if the video configuration contentType isn't of type video");
 
+promise_test(t => {
+  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
+    type: 'webrtc',
+    video: {
+      contentType: 'application/ogg; codecs=vorbis',
+      width: 800,
+      height: 600,
+      bitrate: 3000,
+      framerate: 24,
+    },
+  }));
+}, "Test that decodingInfo rejects if the video configuration contentType is of type audio");
+
 promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
     type: 'webrtc',
@@ -104,6 +128,49 @@ promise_test(t => {
   }));
 }, "Test that decodingInfo rejects if the audio configuration contentType isn't of type audio");
 
+promise_test(t => {
+  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
+    type: 'webrtc',
+    audio: {
+      contentType: 'application/ogg; codecs=theora',
+      channels: 2,
+    },
+  }));
+}, "Test that decodingInfo rejects if the audio configuration contentType is of type video");
+
+promise_test(t => {
+  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
+    type: 'webrtc',
+    video: {
+      contentType: 'video/webm; codecs="vp09.00.10.08"; foo="bar"',
+      width: 800,
+      height: 600,
+      bitrate: 3000,
+      framerate: 24,
+    },
+  }));
+}, "Test that decodingInfo rejects if the video configuration contentType has more than one parameter");
+
+promise_test(t => {
+  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
+    type: 'webrtc',
+    video: {
+      contentType: 'video/webm; foo="bar"',
+      width: 800,
+      height: 600,
+      bitrate: 3000,
+      framerate: 24,
+    },
+  }));
+}, "Test that decodingInfo rejects if the video configuration contentType has one parameter that isn't codecs");
+
+promise_test(t => {
+  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
+    type: 'webrtc',
+    audio: { contentType: 'fgeoa' },
+  }));
+}, "Test that decodingInfo rejects if the audio configuration contenType doesn't parse");
+
 promise_test(t => {
   return navigator.mediaCapabilities.decodingInfo({
     type: 'webrtc',
@@ -225,3 +292,26 @@ validVideoCodecs.forEach(codec => {
 }, "Test that decodingInfo returns supported true for the codec " + codec + (isWorkerEnvironment ? "" : " returned by RTCRtpReceiver.getCapabilities()"))}
 );
 
+promise_test(t => {
+  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
+    type: 'webrtc',
+    audio: { contentType: 'audio/webm; codecs="opus"; foo="bar"' },
+  }));
+}, "Test that decodingInfo rejects if the audio configuration contentType has more than one parameters");
+
+promise_test(t => {
+  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
+    type: 'webrtc',
+    audio: { contentType: 'audio/webm; foo="bar"' },
+  }));
+}, "Test that decodingInfo rejects if the audio configuration contentType has one parameter that isn't codecs");
+
+promise_test(t => {
+  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
+        type: 'webrtc',
+        video: videoConfigurationWithDynamicRange,
+      }));
+}, "Test that decodingInfo rejects for type 'webrtc' if HDR members are set");
+
+
+
diff --git a/tests/wpt/tests/media-capabilities/decodingInfo.any.js b/tests/wpt/tests/media-capabilities/decodingInfo.any.js
index 2fd3743b442..510a59d9d78 100644
--- a/tests/wpt/tests/media-capabilities/decodingInfo.any.js
+++ b/tests/wpt/tests/media-capabilities/decodingInfo.any.js
@@ -141,7 +141,7 @@ promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
     type: 'file',
     video: {
-      contentType: 'application/ogg; codec=vorbis',
+      contentType: 'application/ogg; codecs=vorbis',
       width: 800,
       height: 600,
       bitrate: 3000,
@@ -154,7 +154,7 @@ promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
     type: 'file',
     audio: {
-      contentType: 'application/ogg; codec=theora',
+      contentType: 'application/ogg; codecs=theora',
       channels: 2,
     },
   }));
@@ -225,97 +225,6 @@ promise_test(t => {
   }));
 }, "Test that decodingInfo rejects if the video configuration contentType has a codecs parameter that indicates both an audio and a video codec");
 
-promise_test(t => {
-  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
-    type: 'file',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '24000/1001',
-    }
-  }));
-}, "Test that decodingInfo rejects framerate in the form of x/y");
-
-promise_test(t => {
-  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
-    type: 'file',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '24000/0',
-    }
-  }));
-}, "Test that decodingInfo rejects framerate in the form of x/0");
-
-promise_test(t => {
-  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
-    type: 'file',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '0/10001',
-    }
-  }));
-}, "Test that decodingInfo rejects framerate in the form of 0/y");
-
-promise_test(t => {
-  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
-    type: 'file',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '-24000/10001',
-    }
-  }));
-}, "Test that decodingInfo rejects framerate in the form of -x/y");
-
-promise_test(t => {
-  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
-    type: 'file',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '24000/-10001',
-    }
-  }));
-}, "Test that decodingInfo rejects framerate in the form of x/-y");
-
-promise_test(t => {
-  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
-    type: 'file',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '24000/',
-    }
-  }));
-}, "Test that decodingInfo rejects framerate in the form of x/");
-
-promise_test(t => {
-  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
-    type: 'file',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '1/3x',
-    }
-  }));
-}, "Test that decodingInfo rejects framerate with trailing unallowed characters");
-
 promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
     type: 'file',
diff --git a/tests/wpt/tests/media-capabilities/decodingInfoEncryptedMedia.http.html b/tests/wpt/tests/media-capabilities/decodingInfoEncryptedMedia.http.html
index 267b23431b7..5c4dc43fc9b 100644
--- a/tests/wpt/tests/media-capabilities/decodingInfoEncryptedMedia.http.html
+++ b/tests/wpt/tests/media-capabilities/decodingInfoEncryptedMedia.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<title>MediaCapabilities.decodingInfo() for encrypted media (non-secure context)</title>
+<title>MediaCapabilities.decodingInfo for encrypted media (non-secure context)</title>
 <script src=/resources/testharness.js></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
@@ -26,6 +26,6 @@ promise_test(t => {
     video: minimalVideoConfiguration,
     keySystemConfiguration: minimalKeySystemConfiguration,
   }));
-}, "Test that decodingInfo() with a keySystemConfiguration fails on a non-secure context.");
+}, "Test that decodingInfo with a keySystemConfiguration fails on a non-secure context.");
 
 </script>
diff --git a/tests/wpt/tests/media-capabilities/decodingInfoEncryptedMedia.https.html b/tests/wpt/tests/media-capabilities/decodingInfoEncryptedMedia.https.html
index 7ac914de89d..2d671b3ce83 100644
--- a/tests/wpt/tests/media-capabilities/decodingInfoEncryptedMedia.https.html
+++ b/tests/wpt/tests/media-capabilities/decodingInfoEncryptedMedia.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<title>MediaCapabilities.decodingInfo() for encrypted media</title>
+<title>MediaCapabilities.decodingInfo for encrypted media</title>
 <meta name="timeout" content="long">
 <script src=/resources/testharness.js></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -38,7 +38,7 @@ promise_test(t => {
     video: minimalVideoConfiguration,
     keySystemConfiguration: minimalKeySystemConfiguration,
   });
-}, "Test that decodingInfo() accepts a stub key system configuration (w/video).");
+}, "Test that decodingInfo accepts a stub key system configuration (w/video).");
 
 promise_test(t => {
   return navigator.mediaCapabilities.decodingInfo({
@@ -46,7 +46,7 @@ promise_test(t => {
     audio: minimalAudioConfiguration,
     keySystemConfiguration: minimalKeySystemConfiguration,
   });
-}, "Test that decodingInfo() accepts a stub key system configuration (w/audio).");
+}, "Test that decodingInfo accepts a stub key system configuration (w/audio).");
 
 promise_test(t => {
   return navigator.mediaCapabilities.decodingInfo({
@@ -59,7 +59,7 @@ promise_test(t => {
       },
     },
   });
-}, "Test that decodingInfo() accepts a key system configuration with video info.");
+}, "Test that decodingInfo accepts a key system configuration with video info.");
 
 promise_test(t => {
   return navigator.mediaCapabilities.decodingInfo({
@@ -72,7 +72,7 @@ promise_test(t => {
       },
     },
   });
-}, "Test that decodingInfo() accepts a key system configuration with audio info.");
+}, "Test that decodingInfo accepts a key system configuration with audio info.");
 
 promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
@@ -85,7 +85,7 @@ promise_test(t => {
       },
     },
   }));
-}, "Test that decodingInfo() rejects if robustness and configuration do not match (1).");
+}, "Test that decodingInfo rejects if robustness and configuration do not match (1).");
 
 promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
@@ -98,7 +98,7 @@ promise_test(t => {
       },
     },
   }));
-}, "Test that decodingInfo() rejects if robustness and configuration do not match (2).");
+}, "Test that decodingInfo rejects if robustness and configuration do not match (2).");
 
 promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
@@ -114,7 +114,7 @@ promise_test(t => {
       },
     },
   }));
-}, "Test that decodingInfo() rejects if robustness and configuration do not match (3).");
+}, "Test that decodingInfo rejects if robustness and configuration do not match (3).");
 
 promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
@@ -132,7 +132,7 @@ promise_test(t => {
       persistentState: "foobar",
     },
   }));
-}, "Test that decodingInfo() rejects if persistentState isn't valid.");
+}, "Test that decodingInfo rejects if persistentState isn't valid.");
 
 promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
@@ -150,7 +150,7 @@ promise_test(t => {
       distinctiveIdentifier: "foobar",
     },
   }));
-}, "Test that decodingInfo() rejects if distinctiveIdentifier isn't valid.");
+}, "Test that decodingInfo rejects if distinctiveIdentifier isn't valid.");
 
 promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
@@ -168,7 +168,7 @@ promise_test(t => {
       sessionTypes: "foobar",
     },
   }));
-}, "Test that decodingInfo() rejects if sessionTypes isn't a sequence.");
+}, "Test that decodingInfo rejects if sessionTypes isn't a sequence.");
 
 promise_test(t => {
   return navigator.mediaCapabilities.decodingInfo({
@@ -186,7 +186,7 @@ promise_test(t => {
       },
     },
   });
-}, "Test that decodingInfo() does not reject when properties are set to unexpected values.");
+}, "Test that decodingInfo does not reject when properties are set to unexpected values.");
 
 promise_test(t => {
   return navigator.mediaCapabilities.decodingInfo({
@@ -257,6 +257,6 @@ promise_test(t => {
     video: minimalVideoConfiguration,
     keySystemConfiguration: minimalKeySystemConfiguration,
   }));
-}, "Test that decodingInfo() with type webrtc rejects key system configuration.");
+}, "Test that decodingInfo with type webrtc rejects key system configuration.");
 
 </script>
diff --git a/tests/wpt/tests/media-capabilities/encodingInfo-webrtc.any.js b/tests/wpt/tests/media-capabilities/encodingInfo-webrtc.any.js
index 635801c9f1a..1369941a0a5 100644
--- a/tests/wpt/tests/media-capabilities/encodingInfo-webrtc.any.js
+++ b/tests/wpt/tests/media-capabilities/encodingInfo-webrtc.any.js
@@ -97,6 +97,32 @@ promise_test(t => {
   }));
 }, "Test that encodingInfo rejects if the audio configuration contentType doesn't parse");
 
+promise_test(t => {
+  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.encodingInfo({
+    type: 'webrtc',
+    video: {
+      contentType: 'video/webm; codecs="vp09.00.10.08"; foo="bar"',
+      width: 800,
+      height: 600,
+      bitrate: 3000,
+      framerate: 24,
+    },
+  }));
+}, "Test that encodingInfo rejects if the video configuration contentType has more than one parameter");
+
+promise_test(t => {
+  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.encodingInfo({
+    type: 'webrtc',
+    video: {
+      contentType: 'video/webm; foo="bar"',
+      width: 800,
+      height: 600,
+      bitrate: 3000,
+      framerate: 24,
+    },
+  }));
+}, "Test that encodingInfo rejects if the video configuration contentType has one parameter that isn't codecs");
+
 promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.encodingInfo({
     type: 'webrtc',
@@ -104,6 +130,20 @@ promise_test(t => {
   }));
 }, "Test that encodingInfo rejects if the audio configuration contentType isn't of type audio");
 
+promise_test(t => {
+  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.encodingInfo({
+    type: 'webrtc',
+    audio: { contentType: 'audio/webm; codecs="opus"; foo="bar"' },
+  }));
+}, "Test that encodingInfo rejects if the audio configuration contentType has more than one parameters");
+
+promise_test(t => {
+  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.encodingInfo({
+    type: 'webrtc',
+    audio: { contentType: 'audio/webm; foo="bar"' },
+  }));
+}, "Test that encodingInfo rejects if the audio configuration contentType has one parameter that isn't codecs");
+
 promise_test(t => {
   return navigator.mediaCapabilities.encodingInfo({
     type: 'webrtc',
diff --git a/tests/wpt/tests/media-capabilities/encodingInfo.any.js b/tests/wpt/tests/media-capabilities/encodingInfo.any.js
index 14612238e60..97b6c196f09 100644
--- a/tests/wpt/tests/media-capabilities/encodingInfo.any.js
+++ b/tests/wpt/tests/media-capabilities/encodingInfo.any.js
@@ -195,97 +195,6 @@ promise_test(t => {
   }));
 }, "Test that encodingInfo rejects if the video configuration contentType has a codecs parameter that indicates both an audio and a video codec");
 
-promise_test(t => {
-  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.encodingInfo({
-    type: 'record',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '24000/1001',
-    }
-  }));
-}, "Test that encodingInfo rejects framerate in the form of x/y");
-
-promise_test(t => {
-  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.encodingInfo({
-    type: 'record',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '24000/0',
-    }
-  }));
-}, "Test that encodingInfo rejects framerate in the form of x/0");
-
-promise_test(t => {
-  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.encodingInfo({
-    type: 'record',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '0/10001',
-    }
-  }));
-}, "Test that encodingInfo rejects framerate in the form of 0/y");
-
-promise_test(t => {
-  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.encodingInfo({
-    type: 'record',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '-24000/10001',
-    }
-  }));
-}, "Test that encodingInfo rejects framerate in the form of -x/y");
-
-promise_test(t => {
-  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.encodingInfo({
-    type: 'record',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '24000/-10001',
-    }
-  }));
-}, "Test that encodingInfo rejects framerate in the form of x/-y");
-
-promise_test(t => {
-  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.encodingInfo({
-    type: 'record',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '24000/',
-    }
-  }));
-}, "Test that encodingInfo rejects framerate in the form of x/");
-
-promise_test(t => {
-  return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.encodingInfo({
-    type: 'record',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '1/3x',
-    }
-  }));
-}, "Test that encodingInfo rejects framerate with trailing unallowed characters");
-
 promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.encodingInfo({
     type: 'record',
diff --git a/tests/wpt/tests/media-source/mediasource-util.js b/tests/wpt/tests/media-source/mediasource-util.js
index 0bbb6a73863..00105238e6b 100644
--- a/tests/wpt/tests/media-source/mediasource-util.js
+++ b/tests/wpt/tests/media-source/mediasource-util.js
@@ -161,24 +161,37 @@
         loadData_(test, url, callback, true);
     };
 
-    MediaSourceUtil.fetchManifestAndData = function(test, manifestFilename, callback)
+    /**
+     * Return a promise that resolves to an object having the properties
+     * specified in the manifest plus a 'data' property with the media data.
+     */
+    MediaSourceUtil.fetchResourceOfManifest = function(test, manifestFilename)
     {
         var baseURL = '';
         var manifestURL = baseURL + manifestFilename;
-        MediaSourceUtil.loadTextData(test, manifestURL, function(manifestText)
-        {
-            var manifest = JSON.parse(manifestText);
-
-            assert_true(MediaSource.isTypeSupported(manifest.type), manifest.type + " is supported.");
-
-            var mediaURL = baseURL + manifest.url;
-            MediaSourceUtil.loadBinaryData(test, mediaURL, function(mediaData)
+        return new Promise(resolve => {
+            MediaSourceUtil.loadTextData(test, manifestURL, function(manifestText)
             {
-                callback(manifest.type, mediaData);
+                 var manifest = JSON.parse(manifestText);
+
+                 assert_true(MediaSource.isTypeSupported(manifest.type), manifest.type + " is supported.");
+
+                 var mediaURL = manifest.url;
+                 MediaSourceUtil.loadBinaryData(test, mediaURL, function(mediaData)
+                 {
+                     manifest.data = mediaData;
+                     resolve(manifest);
+                 });
             });
         });
     };
 
+    MediaSourceUtil.fetchManifestAndData = async function(test, manifestFilename, callback)
+    {
+        const resource = await MediaSourceUtil.fetchResourceOfManifest(test, manifestFilename);
+        test.step(() => callback(resource.type, resource.data));
+    };
+
     MediaSourceUtil.extractSegmentData = function(mediaData, info)
     {
         var start = info.offset;
diff --git a/tests/wpt/tests/media-source/mp4/test-a-128k-44100Hz-1ch-manifest.json b/tests/wpt/tests/media-source/mp4/test-a-128k-44100Hz-1ch-manifest.json
index f3caa460e9f..9e448d16f0a 100644
--- a/tests/wpt/tests/media-source/mp4/test-a-128k-44100Hz-1ch-manifest.json
+++ b/tests/wpt/tests/media-source/mp4/test-a-128k-44100Hz-1ch-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "mp4/test-a-128k-44100Hz-1ch.mp4",
+    "url": "/media-source/mp4/test-a-128k-44100Hz-1ch.mp4",
     "type": "audio/mp4;codecs=\"mp4a.40.2\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/mp4/test-a-192k-44100Hz-1ch-manifest.json b/tests/wpt/tests/media-source/mp4/test-a-192k-44100Hz-1ch-manifest.json
index 41a6f339b79..1cfeddb8d7d 100644
--- a/tests/wpt/tests/media-source/mp4/test-a-192k-44100Hz-1ch-manifest.json
+++ b/tests/wpt/tests/media-source/mp4/test-a-192k-44100Hz-1ch-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "mp4/test-a-192k-44100Hz-1ch.mp4",
+    "url": "/media-source/mp4/test-a-192k-44100Hz-1ch.mp4",
     "type": "audio/mp4;codecs=\"mp4a.40.2\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json
index 7731e3170e5..642eae99f22 100644
--- a/tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json
+++ b/tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.mp4",
+    "url": "/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.mp4",
     "type": "video/mp4;codecs=\"avc1.4D4001,mp4a.40.2\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
index 78ded611f68..6d7d53878d5 100644
--- a/tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
+++ b/tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.mp4",
+    "url": "/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.mp4",
     "type": "video/mp4;codecs=\"avc1.4D4001,mp4a.40.2\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
index ba46349f93e..7b2972b7e04 100644
--- a/tests/wpt/tests/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
+++ b/tests/wpt/tests/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.mp4",
+    "url": "/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.mp4",
     "type": "video/mp4;codecs=\"avc1.4D4001,mp4a.40.2\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
index 24da9b4ce3f..c04d4d895fb 100644
--- a/tests/wpt/tests/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
+++ b/tests/wpt/tests/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.mp4",
+    "url": "/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.mp4",
     "type": "video/mp4;codecs=\"avc1.4D4001,mp4a.40.2\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/mp4/test-v-128k-320x240-24fps-8kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-v-128k-320x240-24fps-8kfr-manifest.json
index a31b6d0245b..1fd4d416017 100644
--- a/tests/wpt/tests/media-source/mp4/test-v-128k-320x240-24fps-8kfr-manifest.json
+++ b/tests/wpt/tests/media-source/mp4/test-v-128k-320x240-24fps-8kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "mp4/test-v-128k-320x240-24fps-8kfr.mp4",
+    "url": "/media-source/mp4/test-v-128k-320x240-24fps-8kfr.mp4",
     "type": "video/mp4;codecs=\"avc1.4D4001\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/mp4/test-v-128k-320x240-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-v-128k-320x240-30fps-10kfr-manifest.json
index 3e02844105b..14eef16f6a6 100644
--- a/tests/wpt/tests/media-source/mp4/test-v-128k-320x240-30fps-10kfr-manifest.json
+++ b/tests/wpt/tests/media-source/mp4/test-v-128k-320x240-30fps-10kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "mp4/test-v-128k-320x240-30fps-10kfr.mp4",
+    "url": "/media-source/mp4/test-v-128k-320x240-30fps-10kfr.mp4",
     "type": "video/mp4;codecs=\"avc1.4D4001\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/mp4/test-v-128k-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-v-128k-640x480-30fps-10kfr-manifest.json
index 10c4f4bcbdf..75351790503 100644
--- a/tests/wpt/tests/media-source/mp4/test-v-128k-640x480-30fps-10kfr-manifest.json
+++ b/tests/wpt/tests/media-source/mp4/test-v-128k-640x480-30fps-10kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "mp4/test-v-128k-640x480-30fps-10kfr.mp4",
+    "url": "/media-source/mp4/test-v-128k-640x480-30fps-10kfr.mp4",
     "type": "video/mp4;codecs=\"avc1.4D4001\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/mp4/test-v-256k-320x240-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-v-256k-320x240-30fps-10kfr-manifest.json
index 42d3e1e524e..5143782ba69 100644
--- a/tests/wpt/tests/media-source/mp4/test-v-256k-320x240-30fps-10kfr-manifest.json
+++ b/tests/wpt/tests/media-source/mp4/test-v-256k-320x240-30fps-10kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "mp4/test-v-256k-320x240-30fps-10kfr.mp4",
+    "url": "/media-source/mp4/test-v-256k-320x240-30fps-10kfr.mp4",
     "type": "video/mp4;codecs=\"avc1.4D4001\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/webm/test-a-128k-44100Hz-1ch-manifest.json b/tests/wpt/tests/media-source/webm/test-a-128k-44100Hz-1ch-manifest.json
index 524da8149fe..8c70ccde4bb 100644
--- a/tests/wpt/tests/media-source/webm/test-a-128k-44100Hz-1ch-manifest.json
+++ b/tests/wpt/tests/media-source/webm/test-a-128k-44100Hz-1ch-manifest.json
@@ -1,4 +1,14 @@
 {
-    "url": "webm/test-a-128k-44100Hz-1ch.webm",
-    "type": "audio/webm;codecs=\"vorbis\""
-}
\ No newline at end of file
+    "url": "/media-source/webm/test-a-128k-44100Hz-1ch.webm",
+    "type": "audio/webm;codecs=\"vorbis\"",
+    "cluster_start" : [
+        "0x0F8F",
+        "0x12BD",
+        "0x1545",
+        "0x17D1",
+        "0x1A55",
+        "0x1CE1",
+        "0x1F6B",
+        "0x21F1"
+    ]
+}
diff --git a/tests/wpt/tests/media-source/webm/test-a-192k-44100Hz-1ch-manifest.json b/tests/wpt/tests/media-source/webm/test-a-192k-44100Hz-1ch-manifest.json
index 7f2fa1e8c33..1b09316e492 100644
--- a/tests/wpt/tests/media-source/webm/test-a-192k-44100Hz-1ch-manifest.json
+++ b/tests/wpt/tests/media-source/webm/test-a-192k-44100Hz-1ch-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "webm/test-a-192k-44100Hz-1ch.webm",
+    "url": "/media-source/webm/test-a-192k-44100Hz-1ch.webm",
     "type": "audio/webm;codecs=\"vorbis\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json
index af9f07af15d..3aa25b78f8b 100644
--- a/tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json
+++ b/tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.webm",
+    "url": "/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.webm",
     "type": "video/webm;codecs=\"vp8,vorbis\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
index f7ec86b3db9..58d9fb0e248 100644
--- a/tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
+++ b/tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.webm",
+    "url": "/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.webm",
     "type": "video/webm;codecs=\"vp8,vorbis\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
index 96a59db586e..43aa1b8755d 100644
--- a/tests/wpt/tests/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
+++ b/tests/wpt/tests/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.webm",
+    "url": "/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.webm",
     "type": "video/webm;codecs=\"vp8,vorbis\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
index 86723b34a81..9b0b98c2051 100644
--- a/tests/wpt/tests/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
+++ b/tests/wpt/tests/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.webm",
+    "url": "/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.webm",
     "type": "video/webm;codecs=\"vp8,vorbis\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/webm/test-v-128k-320x240-24fps-8kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-v-128k-320x240-24fps-8kfr-manifest.json
index 00e103aca9b..abc3026c158 100644
--- a/tests/wpt/tests/media-source/webm/test-v-128k-320x240-24fps-8kfr-manifest.json
+++ b/tests/wpt/tests/media-source/webm/test-v-128k-320x240-24fps-8kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "webm/test-v-128k-320x240-24fps-8kfr.webm",
+    "url": "/media-source/webm/test-v-128k-320x240-24fps-8kfr.webm",
     "type": "video/webm;codecs=\"vp8\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/webm/test-v-128k-320x240-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-v-128k-320x240-30fps-10kfr-manifest.json
index fdeeb401d96..8b52e095c29 100644
--- a/tests/wpt/tests/media-source/webm/test-v-128k-320x240-30fps-10kfr-manifest.json
+++ b/tests/wpt/tests/media-source/webm/test-v-128k-320x240-30fps-10kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "webm/test-v-128k-320x240-30fps-10kfr.webm",
+    "url": "/media-source/webm/test-v-128k-320x240-30fps-10kfr.webm",
     "type": "video/webm;codecs=\"vp8\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/webm/test-v-128k-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-v-128k-640x480-30fps-10kfr-manifest.json
index 4e304606678..12926ceb8f0 100644
--- a/tests/wpt/tests/media-source/webm/test-v-128k-640x480-30fps-10kfr-manifest.json
+++ b/tests/wpt/tests/media-source/webm/test-v-128k-640x480-30fps-10kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "webm/test-v-128k-640x480-30fps-10kfr.webm",
+    "url": "/media-source/webm/test-v-128k-640x480-30fps-10kfr.webm",
     "type": "video/webm;codecs=\"vp8\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/media-source/webm/test-v-256k-320x240-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-v-256k-320x240-30fps-10kfr-manifest.json
index 3470674bff5..7a437e5f84c 100644
--- a/tests/wpt/tests/media-source/webm/test-v-256k-320x240-30fps-10kfr-manifest.json
+++ b/tests/wpt/tests/media-source/webm/test-v-256k-320x240-30fps-10kfr-manifest.json
@@ -1,4 +1,4 @@
 {
-    "url": "webm/test-v-256k-320x240-30fps-10kfr.webm",
+    "url": "/media-source/webm/test-v-256k-320x240-30fps-10kfr.webm",
     "type": "video/webm;codecs=\"vp8\""
 }
\ No newline at end of file
diff --git a/tests/wpt/tests/mediacapture-image/ImageCapture-grabFrame-crash.html b/tests/wpt/tests/mediacapture-image/ImageCapture-grabFrame-crash.https.html
similarity index 100%
rename from tests/wpt/tests/mediacapture-image/ImageCapture-grabFrame-crash.html
rename to tests/wpt/tests/mediacapture-image/ImageCapture-grabFrame-crash.https.html
diff --git a/tests/wpt/tests/mediacapture-image/ImageCapture-grabFrame.html b/tests/wpt/tests/mediacapture-image/ImageCapture-grabFrame.https.html
similarity index 100%
rename from tests/wpt/tests/mediacapture-image/ImageCapture-grabFrame.html
rename to tests/wpt/tests/mediacapture-image/ImageCapture-grabFrame.https.html
diff --git a/tests/wpt/tests/mediacapture-image/ImageCapture-track.html b/tests/wpt/tests/mediacapture-image/ImageCapture-track.https.html
similarity index 100%
rename from tests/wpt/tests/mediacapture-image/ImageCapture-track.html
rename to tests/wpt/tests/mediacapture-image/ImageCapture-track.https.html
diff --git a/tests/wpt/tests/mediacapture-image/getPhotoCapabilities.html b/tests/wpt/tests/mediacapture-image/getPhotoCapabilities.https.html
similarity index 100%
rename from tests/wpt/tests/mediacapture-image/getPhotoCapabilities.html
rename to tests/wpt/tests/mediacapture-image/getPhotoCapabilities.https.html
diff --git a/tests/wpt/tests/mediacapture-image/getPhotoSettings.html b/tests/wpt/tests/mediacapture-image/getPhotoSettings.https.html
similarity index 100%
rename from tests/wpt/tests/mediacapture-image/getPhotoSettings.html
rename to tests/wpt/tests/mediacapture-image/getPhotoSettings.https.html
diff --git a/tests/wpt/tests/mediacapture-image/idlharness.window.js b/tests/wpt/tests/mediacapture-image/idlharness.https.window.js
similarity index 100%
rename from tests/wpt/tests/mediacapture-image/idlharness.window.js
rename to tests/wpt/tests/mediacapture-image/idlharness.https.window.js
diff --git a/tests/wpt/tests/mediacapture-image/takePhoto-reject.html b/tests/wpt/tests/mediacapture-image/takePhoto-reject.html
deleted file mode 100644
index fff36e1a3b8..00000000000
--- a/tests/wpt/tests/mediacapture-image/takePhoto-reject.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/mediacapture-image/resources/imagecapture-helpers.js"></script>
-<body>
-<canvas id='canvas' width=10 height=10></canvas>
-</body>
-<script>
-
-let canvas = document.getElementById('canvas');
-let context = canvas.getContext('2d');
-context.fillStyle = 'red';
-context.fillRect(0, 0, 10, 10);
-
-// This test verifies that ImageCapture.takePhoto() rejects if any passed
-// option is unsupported or outside its allowed range.
-function makePromiseTest(getOption) {
-  image_capture_test(async (t, imageCaptureTest) => {
-    imageCaptureTest.mockImageCapture().state().redEyeReduction = 0;
-
-    let stream = canvas.captureStream();
-    let capturer = new ImageCapture(stream.getVideoTracks()[0]);
-    await capturer.getPhotoCapabilities();
-    const options = getOption(imageCaptureTest.mockImageCapture().state());
-
-    try {
-      await capturer.takePhoto(options);
-      assert_unreached('expected takePhoto to reject');
-    } catch (error) {
-      assert_equals(error.name, 'NotSupportedError');
-    }
-  });
-}
-
-const optionsGenerators = [
-  capabilities => ({ redEyeReduction: true }),
-  capabilities => ({ imageHeight: capabilities.height.max + 1 }),
-  capabilities => ({ imageHeight: capabilities.height.min - 1 }),
-  capabilities => ({ imageWidth: capabilities.width.max + 1 }),
-  capabilities => ({ imageWidth: capabilities.width.min - 1 }),
-  capabilities => ({ fillLightMode: 'off' }),
-];
-
-for (key in optionsGenerators) {
-  generate_tests(
-      makePromiseTest,
-      [[ 'ImageCapture.takePhoto(options) rejects with bad options, #' + key,
-         optionsGenerators[key] ]]);
-}
-
-</script>
diff --git a/tests/wpt/tests/mediacapture-image/takePhoto-reject.https.html b/tests/wpt/tests/mediacapture-image/takePhoto-reject.https.html
new file mode 100644
index 00000000000..669512ca516
--- /dev/null
+++ b/tests/wpt/tests/mediacapture-image/takePhoto-reject.https.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/mediacapture-image/resources/imagecapture-helpers.js"></script>
+<body>
+<canvas id='canvas' width=10 height=10></canvas>
+</body>
+<script>
+
+let canvas = document.getElementById('canvas');
+let context = canvas.getContext('2d');
+context.fillStyle = 'red';
+context.fillRect(0, 0, 10, 10);
+
+// This test verifies that ImageCapture.takePhoto() rejects if any passed
+// option is unsupported or outside its allowed range.
+function makePromiseTest(getOption, name) {
+  image_capture_test(async (t, imageCaptureTest) => {
+    imageCaptureTest.mockImageCapture().state().redEyeReduction = 0;
+
+    let stream = canvas.captureStream();
+    let capturer = new ImageCapture(stream.getVideoTracks()[0]);
+    await capturer.getPhotoCapabilities();
+    const options = getOption(imageCaptureTest.mockImageCapture().state());
+
+    try {
+      await capturer.takePhoto(options);
+      assert_unreached('expected takePhoto to reject');
+    } catch (error) {
+      assert_equals(error.name, 'NotSupportedError');
+    }
+  }, name);
+}
+
+const optionsGenerators = [
+  capabilities => ({ redEyeReduction: true }),
+  capabilities => ({ imageHeight: capabilities.height.max + 1 }),
+  capabilities => ({ imageHeight: capabilities.height.min - 1 }),
+  capabilities => ({ imageWidth: capabilities.width.max + 1 }),
+  capabilities => ({ imageWidth: capabilities.width.min - 1 }),
+  capabilities => ({ fillLightMode: 'off' }),
+];
+
+optionsGenerators.forEach((optionsGenerator, key) => {
+  makePromiseTest(
+      optionsGenerator,
+      `ImageCapture.takePhoto(options) rejects with bad options, #${key}`);
+});
+</script>
diff --git a/tests/wpt/tests/mediacapture-image/takePhoto-with-PhotoSettings.html b/tests/wpt/tests/mediacapture-image/takePhoto-with-PhotoSettings.https.html
similarity index 100%
rename from tests/wpt/tests/mediacapture-image/takePhoto-with-PhotoSettings.html
rename to tests/wpt/tests/mediacapture-image/takePhoto-with-PhotoSettings.https.html
diff --git a/tests/wpt/tests/mediacapture-image/takePhoto.html b/tests/wpt/tests/mediacapture-image/takePhoto.https.html
similarity index 100%
rename from tests/wpt/tests/mediacapture-image/takePhoto.html
rename to tests/wpt/tests/mediacapture-image/takePhoto.https.html
diff --git a/tests/wpt/tests/mediacapture-record/META.yml b/tests/wpt/tests/mediacapture-record/META.yml
index d59e5e30845..6a5b5839b61 100644
--- a/tests/wpt/tests/mediacapture-record/META.yml
+++ b/tests/wpt/tests/mediacapture-record/META.yml
@@ -1,3 +1,7 @@
 spec: https://w3c.github.io/mediacapture-record/
 suggested_reviewers:
+  - guidou
+  - jan-ivar
+  - jyavenard
   - yellowdoge
+  - youennf
diff --git a/tests/wpt/tests/mediacapture-record/MediaRecorder-canvas-media-source.https.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-canvas-media-source.https.html
index 0c5f47f0ef8..0339c18df42 100644
--- a/tests/wpt/tests/mediacapture-record/MediaRecorder-canvas-media-source.https.html
+++ b/tests/wpt/tests/mediacapture-record/MediaRecorder-canvas-media-source.https.html
@@ -30,8 +30,15 @@
 </head>
 
 <body>
-  <canvas id="canvas"></canvas>
   <script>
+async function createWorker(script) {
+  script += "self.postMessage('ready');";
+  const blob = new Blob([script], { type: 'text/javascript' });
+  const url = URL.createObjectURL(blob);
+  const worker = new Worker(url);
+  await new Promise(resolve => worker.onmessage = resolve);
+  return worker;
+}
 
 async_test(test => {
   const CANVAS_WIDTH = 256;
@@ -100,49 +107,61 @@ async_test(test => {
     return;
   }
 
-  const canvas = document.querySelector("canvas");
-  const ctx = canvas.getContext("2d", {
-    alpha: false,
-  });
-
-  canvas.width = CANVAS_WIDTH;
-  canvas.height = CANVAS_HEIGHT;
-
   const {startCamera, stopCamera} = useUserMedia(CAMERA_CONSTRAINTS);
   startCamera().then(async stream => {
     const videoTrack = stream.getVideoTracks()[0];
-    const { readable: readableStream } = new MediaStreamTrackProcessor({
-      track: videoTrack
-    });
+    const worker = await createWorker(`
+      const CANVAS_WIDTH = ${CANVAS_WIDTH};
+      const CANVAS_HEIGHT = ${CANVAS_HEIGHT};
+      onmessage = e => {
+        const videoTrack = e.data;
+        const { readable: readableStream } = new MediaStreamTrackProcessor({
+          track: videoTrack
+        });
 
-    const composedTrackGenerator = new MediaStreamTrackGenerator({
-      kind: "video"
-    });
-    const sink = composedTrackGenerator.writable;
+        const composedTrackGenerator = new VideoTrackGenerator();
+        const sink = composedTrackGenerator.writable;
 
-    ctx.fillStyle = "#333";
-    ctx.fillRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT);
+        const canvas = new OffscreenCanvas(CANVAS_WIDTH, CANVAS_HEIGHT);
+        const ctx = canvas.getContext("2d", {
+          alpha: false,
+        });
+        ctx.fillStyle = "#333";
+        ctx.fillRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT);
 
-    const transformer = new TransformStream({
-      async transform(cameraFrame, controller) {
-        if (cameraFrame && cameraFrame?.codedWidth > 0) {
-          const leftPos = (CANVAS_WIDTH - cameraFrame.displayWidth) / 2;
-          const topPos = (CANVAS_HEIGHT - cameraFrame.displayHeight) / 2;
+        const transformer = new TransformStream({
+          async transform(cameraFrame, controller) {
+            if (cameraFrame && cameraFrame?.codedWidth > 0) {
+              const leftPos = (CANVAS_WIDTH - cameraFrame.displayWidth) / 2;
+              const topPos = (CANVAS_HEIGHT - cameraFrame.displayHeight) / 2;
 
-          ctx.drawImage(cameraFrame, leftPos, topPos);
+              ctx.drawImage(cameraFrame, leftPos, topPos);
 
-          const newFrame = new VideoFrame(canvas, {
-            timestamp: cameraFrame.timestamp
-          });
-          cameraFrame.close();
-          controller.enqueue(newFrame);
-        }
+              const newFrame = new VideoFrame(canvas, {
+                timestamp: cameraFrame.timestamp
+              });
+              cameraFrame.close();
+              controller.enqueue(newFrame);
+            }
+          }
+        });
+
+        readableStream.pipeThrough(transformer).pipeTo(sink);
+        self.postMessage(composedTrackGenerator.track, [composedTrackGenerator.track]);
       }
+    `);
+    try {
+      worker.postMessage(videoTrack, [videoTrack]);
+    } catch(e) {
+      test.step_func_done(() => {
+         assert_unreached("MediaStreamTrack transfer not supported");
+      })();
+    }
+    const composedTrack = await new Promise((resolve, reject) => {
+      worker.onmessage = e => resolve(e.data);
+      test.step_timeout(() => reject("unable to get composited track"), 2000);
     });
-
-    readableStream.pipeThrough(transformer).pipeTo(sink);
-
-    const compositedMediaStream = new MediaStream([composedTrackGenerator]);
+    const compositedMediaStream = new MediaStream([composedTrack]);
 
     useMediaRecorder(compositedMediaStream, mimeType, (size => {
       if (size > THRESHOLD_FOR_EMPTY_FRAMES) {
@@ -153,7 +172,6 @@ async_test(test => {
     }));
   });
 }, "MediaRecorder returns frames containing video content");
-
   </script>
 </body>
 
diff --git a/tests/wpt/tests/mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html b/tests/wpt/tests/mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html
new file mode 100644
index 00000000000..bcfc2af2737
--- /dev/null
+++ b/tests/wpt/tests/mediacapture-record/legacy/MediaRecorder-canvas-media-source-legacy.https.html
@@ -0,0 +1,165 @@
+<!doctype html>
+<html>
+<meta name="timeout" content="long">
+
+<head>
+  <title>MediaRecorder canvas media source</title>
+  <meta name=variant content="?mimeType=''">
+  <meta name=variant content="?mimeType=video/webm;codecs=vp8,opus">
+  <meta name=variant content="?mimeType=video/webm;codecs=vp9,opus">
+  <meta name=variant content="?mimeType=video/webm;codecs=av1,opus">
+  <meta name=variant content="?mimeType=video/mp4;codecs=avc1.64003E,mp4a.40.2">
+  <meta name=variant content="?mimeType=video/mp4;codecs=avc3.64003E,mp4a.40.2">
+  <meta name=variant content="?mimeType=video/mp4;codecs=vp9,opus">
+  <meta name=variant content="?mimeType=video/mp4;codecs=av01,opus">
+  <meta name=variant content="?mimeType=video/mp4;codecs=av01,mp4a.40.2">
+  <meta name=variant content="?mimeType=video/mp4;codecs=hvc1.1.6.L186.B0,opus">
+  <meta name=variant content="?mimeType=video/mp4;codecs=hev1.1.6.L186.B0,opus">
+  <meta name=variant content="?mimeType=video/mp4;codecs=hvc1.1.6.L186.B0,mp4a.40.2">
+  <meta name=variant content="?mimeType=video/mp4;codecs=hev1.1.6.L186.B0,mp4a.40.2">
+  <meta name=variant content="?mimeType=video/x-matroska;codecs=hvc1.1.6.L186.B0,opus">
+  <meta name=variant content="?mimeType=video/x-matroska;codecs=hev1.1.6.L186.B0,opus">
+  <meta name=variant content="?mimeType=video/mp4">
+  <link rel="help"
+        href="https://w3c.github.io/mediacapture-record/MediaRecorder.html#dom-mediarecorder-mimeType">
+  <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="../../mediacapture-streams/permission-helper.js"></script>
+</head>
+
+<body>
+  <canvas id="canvas"></canvas>
+  <script>
+
+async_test(test => {
+  const CANVAS_WIDTH = 256;
+  const CANVAS_HEIGHT = 144;
+
+  let large_size_data_available = false;
+
+  // Empty video frames from this resolution consistently have ~750 bytes in my
+  // tests, while valid video frames usually contain 7-8KB. A threshold of
+  // 1.5KB consistently fails when video frames are empty but passes when video
+  // frames are non-empty.
+  const THRESHOLD_FOR_EMPTY_FRAMES = 1500;
+
+  const CAMERA_CONSTRAINTS = {
+    video: {
+      width: { ideal: CANVAS_WIDTH },
+      height: { ideal: CANVAS_HEIGHT }
+    }
+  };
+
+  function useUserMedia(constraints) {
+    let activeStream = null;
+
+    function startCamera() {
+      return navigator.mediaDevices.getUserMedia(constraints).then(
+        (stream) => {
+          activeStream = stream;
+          return stream;
+        }
+      );
+    }
+
+    function stopCamera() {
+      activeStream?.getTracks().forEach((track) => track.stop());
+    }
+
+    return { startCamera, stopCamera };
+  }
+
+  function useMediaRecorder(stream, mimeType, frameSizeCallback) {
+    const mediaRecorder = new MediaRecorder(
+      stream, { mimeType }
+    );
+
+    mediaRecorder.ondataavailable = event => {
+      const {size} = event.data;
+      frameSizeCallback(size);
+
+      if (mediaRecorder.state !== "inactive") {
+        mediaRecorder.stop();
+      }
+    };
+
+    mediaRecorder.onstop = event => {
+      assert_equals(large_size_data_available, true),
+          "onstop is called after valid data is available";
+    };
+
+    mediaRecorder.start(1000);
+  }
+
+  const params = new URLSearchParams(window.location.search);
+  const mimeType = params.get('mimeType');
+  if (mimeType && !MediaRecorder.isTypeSupported(mimeType)) {
+    test.done();
+    return;
+  }
+
+  if (!window.MediaStreamTrackProcessor) {
+    test.done();
+    return;
+  }
+
+  const canvas = document.querySelector("canvas");
+  const ctx = canvas.getContext("2d", {
+    alpha: false,
+  });
+
+  canvas.width = CANVAS_WIDTH;
+  canvas.height = CANVAS_HEIGHT;
+
+  const {startCamera, stopCamera} = useUserMedia(CAMERA_CONSTRAINTS);
+  startCamera().then(async stream => {
+    const videoTrack = stream.getVideoTracks()[0];
+    const { readable: readableStream } = new MediaStreamTrackProcessor({
+      track: videoTrack
+    });
+
+    const composedTrackGenerator = new MediaStreamTrackGenerator({
+      kind: "video"
+    });
+    const sink = composedTrackGenerator.writable;
+
+    ctx.fillStyle = "#333";
+    ctx.fillRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT);
+
+    const transformer = new TransformStream({
+      async transform(cameraFrame, controller) {
+        if (cameraFrame && cameraFrame?.codedWidth > 0) {
+          const leftPos = (CANVAS_WIDTH - cameraFrame.displayWidth) / 2;
+          const topPos = (CANVAS_HEIGHT - cameraFrame.displayHeight) / 2;
+
+          ctx.drawImage(cameraFrame, leftPos, topPos);
+
+          const newFrame = new VideoFrame(canvas, {
+            timestamp: cameraFrame.timestamp
+          });
+          cameraFrame.close();
+          controller.enqueue(newFrame);
+        }
+      }
+    });
+
+    readableStream.pipeThrough(transformer).pipeTo(sink);
+
+    const compositedMediaStream = new MediaStream([composedTrackGenerator]);
+
+    useMediaRecorder(compositedMediaStream, mimeType, (size => {
+      if (size > THRESHOLD_FOR_EMPTY_FRAMES) {
+        large_size_data_available = true;
+        stopCamera();
+        test.done();
+      }
+    }));
+  });
+}, "MediaRecorder returns frames containing video content");
+
+  </script>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-per-origin-ids.sub.https.html b/tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-per-origin-ids.sub.https.html
index 714355f5c1c..467cf5d50c7 100644
--- a/tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-per-origin-ids.sub.https.html
+++ b/tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-per-origin-ids.sub.https.html
@@ -9,8 +9,8 @@
 <script src=permission-helper.js></script>
 </head>
 <body>
-  <iframe allow="camera 'src';microphone 'src'" id=same src="/mediacapture-streams/iframe-enumerate.html"></iframe>
-<iframe allow="camera 'src';microphone 'src'" id=cross src="https://{{hosts[][www1]}}:{{ports[https][0]}}/mediacapture-streams/iframe-enumerate.html"></iframe>
+  <iframe allow="camera 'src';microphone 'src';speaker-selection 'src'" id=same src="/mediacapture-streams/iframe-enumerate.html"></iframe>
+<iframe allow="camera 'src';microphone 'src';speaker-selection 'src'" id=cross src="https://{{hosts[][www1]}}:{{ports[https][0]}}/mediacapture-streams/iframe-enumerate.html"></iframe>
 <script>
 
   let deviceList;
diff --git a/tests/wpt/tests/mediasession/media-session-artwork-fetch-service-worker.js b/tests/wpt/tests/mediasession/media-session-artwork-fetch-service-worker.js
new file mode 100644
index 00000000000..e62b9b44862
--- /dev/null
+++ b/tests/wpt/tests/mediasession/media-session-artwork-fetch-service-worker.js
@@ -0,0 +1,21 @@
+let port;
+onmessage = async e => {
+    await self.clients.claim();
+
+    port = e.data.port;
+    port.postMessage("Ready");
+}
+
+onfetch = e => {
+    const request = e.request;
+    if (port && request.url.endsWith(".jpg")) {
+       port.postMessage({ type: "fetch", info: {
+            url : request.url,
+            destination : request.destination,
+            mode : request.mode,
+            redirect : request.redirect,
+            referrerPolicy : request.referrerPolicy,
+            credentials : request.credentials
+       }});
+    }
+}
diff --git a/tests/wpt/tests/mediasession/media-session-artwork-fetch.https.html b/tests/wpt/tests/mediasession/media-session-artwork-fetch.https.html
new file mode 100644
index 00000000000..758446160ae
--- /dev/null
+++ b/tests/wpt/tests/mediasession/media-session-artwork-fetch.https.html
@@ -0,0 +1,102 @@
+<!doctype html>
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src=/resources/testdriver.js></script>
+<script src=/resources/testdriver-vendor.js></script>
+<script src="/common/get-host-info.sub.js"></script>
+</head>
+<body>
+<audio controls loop id=audio></audio>
+<script>
+let port;
+
+function waitForState(test, worker, state)
+{
+    if (!worker || worker.state == undefined)
+        return Promise.reject(new Error('waitForState must be passed a ServiceWorker'));
+
+    if (worker.state === state)
+        return Promise.resolve(state);
+
+    return new Promise(function(resolve, reject) {
+      worker.addEventListener('statechange', function() {
+          if (worker.state === state)
+            resolve(state);
+        });
+        test.step_timeout(() => reject("waitForState timed out, worker state is " + worker.state), 5000);
+    });
+}
+
+promise_test(async test => {
+    let registration = await navigator.serviceWorker.getRegistration("");
+    let worker;
+    if (!registration) {
+       registration = await navigator.serviceWorker.register("media-session-artwork-fetch-service-worker.js", { scope: "" });
+       worker = registration.installing;
+       await waitForState(test, worker, "activated");
+    } else
+        worker = registration.active;
+
+    const channel = new MessageChannel();
+    worker.postMessage({ port: channel.port1 }, [channel.port1]);
+    port = channel.port2;
+
+    const result = await new Promise(resolve => port.onmessage = e => resolve(e.data));
+    assert_equals(result, "Ready");
+}, "Setup service worker");
+
+promise_test(async test => {
+    audio.src = "/media/sound_5.mp3";
+    if (window.testRunner && window.test_driver) {
+       let promise;
+       test_driver.bless("audio playback", () => {
+           promise = audio.play();
+       });
+       await promise;
+    } else
+       await audio.play();
+}, "Play some audio");
+
+const artworkResource = "/media/2048x1360-random.jpg";
+
+promise_test(async test => {
+    navigator.mediaSession.metadata = new MediaMetadata({title: "title", artist: "artist", album: "album", artwork: [{src: artworkResource}]});
+    const message = await new Promise(resolve => port.onmessage = e => resolve(e.data));
+
+    assert_equals(message.type, "fetch");
+
+    const request = message.info;
+    assert_equals(request.destination, "image");
+    assert_equals(request.mode, "no-cors");
+    assert_equals(request.redirect, "follow");
+    assert_equals(request.referrerPolicy, "strict-origin-when-cross-origin");
+    assert_equals(request.credentials, "include");
+
+    const url = new URL(artworkResource, window.location.href);
+    assert_equals(request.url, url + "");
+}, "Set same origin media metadata");
+
+promise_test(async test => {
+    // We make sure the previous test artwork is not loaded again.
+    navigator.mediaSession.metadata = new MediaMetadata({title: "title", artist: "artist", album: "album"});
+    await new Promise(resolve => test.step_timeout(resolve, 100));
+
+    const artworkSrc = get_host_info().HTTPS_REMOTE_ORIGIN + artworkResource;
+    navigator.mediaSession.metadata = new MediaMetadata({title: "title", artist: "artist", album: "album", artwork: [{src: artworkSrc}]});
+    const message = await new Promise(resolve => port.onmessage = e => resolve(e.data));
+
+    assert_equals(message.type, "fetch");
+
+    const request = message.info;
+    assert_equals(request.destination, "image");
+    assert_equals(request.mode, "no-cors");
+    assert_equals(request.redirect, "follow");
+    assert_equals(request.referrerPolicy, "strict-origin-when-cross-origin");
+    assert_equals(request.credentials, "include");
+    assert_equals(request.url, artworkSrc);
+}, "Set cross origin media metadata");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/nav-tracking-mitigations/META.yml b/tests/wpt/tests/nav-tracking-mitigations/META.yml
index 00a8c7b72a1..9e7ffe47ba9 100644
--- a/tests/wpt/tests/nav-tracking-mitigations/META.yml
+++ b/tests/wpt/tests/nav-tracking-mitigations/META.yml
@@ -2,8 +2,9 @@ spec: https://privacycg.github.io/nav-tracking-mitigations/
 suggested_reviewers:
   - amaliev
   - bvandersloot-mozilla
+  - g-ortuno
   - hoodjoshua
+  - MrPickles
   - njeunje
-  - rtarpine-google
+  - svendlarsen
   - Trikolon
-  - wanderview
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-new-navigation-before-commit.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-new-navigation-before-commit.html
deleted file mode 100644
index 2d09d40dc95..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-new-navigation-before-commit.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../navigation-methods/return-value/resources/helpers.js"></script>
-<body>
-<script>
-promise_test(async t => {
-  navigation.addEventListener("navigate", e => e.intercept({ commit: "after-transition" }), { once: "true" });
-
-  let navigateerror_called = false;
-  navigation.onnavigateerror = t.step_func(() => {
-    navigateerror_called = true;
-    assert_equals(location.hash, "");
-  });
-
-  let promises_should_not_commit = navigation.navigate("#ShouldNotCommit");
-  let promises_fulfilled = navigation.navigate("#1");
-  await assertBothRejectDOM(t, promises_should_not_commit, "AbortError");
-  await assertBothFulfill(t, promises_fulfilled, navigation.currentEntry);
-
-  assert_equals(location.hash, "#1");
-  assert_true(navigateerror_called);
-}, "Cancel a { commit: 'after-transition' } navigation before commit() by starting a new navigation");
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-push.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-push.html
deleted file mode 100644
index 34bdcf7cac7..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-push.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../navigation-methods/return-value/resources/helpers.js"></script>
-<script src="resources/after-transition-commit-helpers.js"></script>
-<body>
-<script>
-let tests = [
-  { mode: "rejectBeforeCommit",      description: "{ commit: 'after-transition' } for a push navigation, reject before commit" },
-  { mode: "rejectAfterCommit",       description: "{ commit: 'after-transition' } for a push navigation, reject after commit" },
-  { mode: "successExplicitCommit",   description: "{ commit: 'after-transition' } for a push navigation, explicit commit()" },
-  { mode: "successNoExplicitCommit", description: "{ commit: 'after-transition' } for a push navigation, commit when handler resolves" }
-];
-
-let onload_promise = new Promise(resolve => window.onload = resolve);
-for (let test of tests) {
-  promise_test(async t => {
-    await onload_promise;
-    await testAfterTransitionCommit(t, "push", test.mode);
-  }, test.description);
-}
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-redirect-explicit-commit.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-redirect-explicit-commit.html
deleted file mode 100644
index 7fa35676087..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-redirect-explicit-commit.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-<script>
-promise_test(async t => {
-  // Wait for after the load event so that the navigation doesn't get converted
-  // into a replace navigation.
-  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-
-  let start_length = navigation.entries().length;
-  let start_hash = location.hash;
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({
-      handler: t.step_func(() => {
-        assert_equals(location.hash, start_hash);
-        assert_equals(new URL(e.destination.url).hash, "#push");
-
-        e.redirect("#redirect1");
-        assert_equals(location.hash, start_hash);
-        assert_equals(new URL(e.destination.url).hash, "#redirect1");
-
-        e.redirect("#redirect2");
-        assert_equals(location.hash, start_hash);
-        assert_equals(new URL(e.destination.url).hash, "#redirect2");
-
-        e.commit();
-        assert_equals(location.hash, "#redirect2");
-        assert_equals(new URL(e.destination.url).hash, "#redirect2");
-      }),
-      commit: "after-transition"
-    });
-  });
-  await navigation.navigate("#push").committed;
-  assert_equals(location.hash, "#redirect2");
-  assert_equals(navigation.entries().length, start_length + 1);
-}, "redirect() then commit()");
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-redirect-push.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-redirect-push.html
deleted file mode 100644
index 79b46ea4750..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-redirect-push.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-<script>
-promise_test(async t => {
-  // Wait for after the load event so that the navigation doesn't get converted
-  // into a replace navigation.
-  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-
-  let start_length = navigation.entries().length;
-  let start_hash = location.hash;
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({
-      handler: t.step_func(() => {
-        assert_equals(location.hash, start_hash);
-        assert_equals(new URL(e.destination.url).hash, "#push");
-
-        e.redirect("#redirect1");
-        assert_equals(location.hash, start_hash);
-        assert_equals(new URL(e.destination.url).hash, "#redirect1");
-
-        e.redirect("#redirect2");
-        assert_equals(location.hash, start_hash);
-        assert_equals(new URL(e.destination.url).hash, "#redirect2");
-      }),
-      commit: "after-transition"
-    });
-  });
-  await navigation.navigate("#push").committed;
-  assert_equals(location.hash, "#redirect2");
-  assert_equals(navigation.entries().length, start_length + 1);
-}, "redirect() push");
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-redirect-replace.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-redirect-replace.html
deleted file mode 100644
index e31f5884a27..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-redirect-replace.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-<script>
-promise_test(async t => {
-  // Wait for after the load event so that the navigation doesn't get converted
-  // into a replace navigation.
-  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-
-  let start_length = navigation.entries().length;
-  let start_hash = location.hash;
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({
-      handler: t.step_func(() => {
-        assert_equals(location.hash, start_hash);
-        assert_equals(new URL(e.destination.url).hash, "#replace");
-
-        e.redirect("#redirect1");
-        assert_equals(location.hash, start_hash);
-        assert_equals(new URL(e.destination.url).hash, "#redirect1");
-
-        e.redirect("#redirect2");
-        assert_equals(location.hash, start_hash);
-        assert_equals(new URL(e.destination.url).hash, "#redirect2");
-      }),
-      commit: "after-transition"
-    });
-  });
-  await navigation.navigate("#replace", { history: "replace" }).committed;
-  assert_equals(location.hash, "#redirect2");
-  assert_equals(navigation.entries().length, start_length);
-}, "redirect() replace");
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-reload.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-reload.html
deleted file mode 100644
index 203150eb051..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-reload.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../navigation-methods/return-value/resources/helpers.js"></script>
-<script src="resources/after-transition-commit-helpers.js"></script>
-<body>
-<script>
-let tests = [
-  { mode: "rejectBeforeCommit",      description: "{ commit: 'after-transition' } for a reload navigation, reject before commit" },
-  { mode: "rejectAfterCommit",       description: "{ commit: 'after-transition' } for a reload navigation, reject after commit" },
-  { mode: "successExplicitCommit",   description: "{ commit: 'after-transition' } for a reload navigation, explicit commit()" },
-  { mode: "successNoExplicitCommit", description: "{ commit: 'after-transition' } for a reload navigation, commit when handler resolves" }
-];
-
-for (let test of tests) {
-  promise_test(t => testAfterTransitionCommit(t, "reload", test.mode), test.description);
-}
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-replace.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-replace.html
deleted file mode 100644
index 2fd48736a34..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-replace.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../navigation-methods/return-value/resources/helpers.js"></script>
-<script src="resources/after-transition-commit-helpers.js"></script>
-<body>
-<script>
-let tests = [
-  { mode: "rejectBeforeCommit",      description: "{ commit: 'after-transition' } for a replace navigation, reject before commit" },
-  { mode: "rejectAfterCommit",       description: "{ commit: 'after-transition' } for a replace navigation, reject after commit" },
-  { mode: "successExplicitCommit",   description: "{ commit: 'after-transition' } for a replace navigation, explicit commit()" },
-  { mode: "successNoExplicitCommit", description: "{ commit: 'after-transition' } for a replace navigation, commit when handler resolves" }
-];
-
-for (let test of tests) {
-  promise_test(t => testAfterTransitionCommit(t, "replace", test.mode), test.description);
-}
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-traversal-commit-new-navigation-before-commit.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-traversal-commit-new-navigation-before-commit.html
deleted file mode 100644
index 9e74e10676d..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-traversal-commit-new-navigation-before-commit.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../navigation-methods/return-value/resources/helpers.js"></script>
-<body>
-<script>
-promise_test(async t => {
-  // Wait for after the load event so that the navigation doesn't get converted
-  // into a replace navigation.
-  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-
-  await navigation.navigate("#1").finished;
-
-  let navigateerror_called = false;
-  navigation.onnavigateerror = t.step_func(() => {
-    navigateerror_called = true;
-    assert_equals(location.hash, "#1");
-  });
-
-  // Go back and wait for the navigate event to fire. This traversal will be deferred.
-  let promises_should_not_commit = assertBothRejectDOM(t, navigation.back(), "AbortError");
-  navigation.addEventListener("navigate", e => e.intercept({ commit: "after-transition", handler: () => new Promise(r => t.step_timeout(r, 1000)) }), { once: "true" });
-  await new Promise(resolve => navigation.addEventListener("navigate", resolve, { once: "true" }));
-
-  // While the traversal is deferred, start a new navigation and commit immediately.
-  navigation.addEventListener("navigate", e => e.intercept(), { once: "true" });
-  let promises_fulfilled = navigation.navigate("#2");
-
-  await promises_should_not_commit;
-  await assertBothFulfill(t, promises_fulfilled, navigation.currentEntry);
-
-  assert_equals(location.hash, "#2");
-  assert_true(navigateerror_called);
-}, "Cancel a { commit: 'after-transition' } traversal before commit() by starting a new navigation");
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-traversal-window-stop-before-commit.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-traversal-window-stop-before-commit.html
deleted file mode 100644
index 282f806f4d3..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-traversal-window-stop-before-commit.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../navigation-methods/return-value/resources/helpers.js"></script>
-<body>
-<script>
-promise_test(async t => {
-  // Wait for after the load event because window.stop() hangs the test harness
-  // if called before the load event.
-  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-
-  let start_length = navigation.entries().length;
-  let start_index = navigation.currentEntry.index;
-
-  await navigation.navigate("#1").finished;
-  await navigation.navigate("#2").finished;
-  assert_equals(navigation.entries().length, start_length + 2);
-  assert_equals(navigation.currentEntry.index, start_index + 2);
-
-  let stopped_first_traverse = false;
-  navigation.onnavigate = t.step_func(e => {
-    if (!stopped_first_traverse) {
-      stopped_first_traverse = true;
-      t.step_timeout(() => window.stop(), 0);
-    }
-    e.intercept({ commit: "after-transition",
-                  handler: () => new Promise(r => t.step_timeout(r, 10)) });
-  });
-
-  let navigatesuccess_called = false;
-  let navigateerror_called = false;
-  navigation.onnavigatesuccess = t.step_func(() => {
-    navigatesuccess_called = true;
-    assert_equals(location.hash, "#1");
-  });
-  navigation.onnavigateerror = t.step_func(() => {
-    navigateerror_called = true;
-    assert_equals(location.hash, "#2");
-  });
-
-  await assertBothRejectDOM(t, navigation.back(), "AbortError");
-
-  assert_equals(navigation.currentEntry.index, start_index + 2);
-  assert_equals(location.hash, "#2");
-  assert_true(navigateerror_called);
-  assert_false(navigatesuccess_called);
-
-  // Ensure navigation.entries() remains in sync with the session history in
-  // spite of the window.stop(), and navigation.back() does not skip over #1.
-  await navigation.back().finished;
-
-  assert_equals(navigation.currentEntry.index, start_index + 1);
-  assert_equals(location.hash, "#1");
-  assert_true(navigatesuccess_called);
-}, " { commit: 'after-transition' } traverse with window.stop() before commit");
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-traverse.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-traverse.html
deleted file mode 100644
index d348a218ac4..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-traverse.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../navigation-methods/return-value/resources/helpers.js"></script>
-<script src="resources/after-transition-commit-helpers.js"></script>
-<body>
-<script>
-let start_index = navigation.currentEntry.index;
-
-let tests = [
-  { mode: "rejectBeforeCommit",      destinationIndex: start_index, description: "{ commit: 'after-transition' } for a traverse navigation, reject before commit" },
-  { mode: "rejectAfterCommit",       destinationIndex: start_index + 1, description: "{ commit: 'after-transition' } for a traverse navigation, reject after commit" },
-  { mode: "successExplicitCommit",   destinationIndex: start_index + 2, description: "{ commit: 'after-transition' } for a traverse navigation, explicit commit()" },
-  { mode: "successNoExplicitCommit", destinationIndex: start_index + 3, description: "{ commit: 'after-transition' } for a traverse navigation, commit when handler resolves" }
-];
-
-// Push a bunch of history entries so each test case can target a unique entry.
-history.pushState("", "", "#1");
-history.pushState("", "", "#2");
-history.pushState("", "", "#3");
-history.pushState("", "", "#4");
-
-let onload_promise = new Promise(resolve => window.onload = resolve);
-for (let test of tests) {
-  promise_test(async t => {
-    await onload_promise;
-    await testAfterTransitionCommit(t, "traverse", test.mode, test.destinationIndex);
-  }, test.description);
-}
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-uncancelable.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-uncancelable.html
deleted file mode 100644
index 45bde9f0900..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-uncancelable.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<iframe id="i" src="/common/blank.html"></iframe>
-<body>
-<script>
-promise_test(async t => {
-  // Wait for after the load event so that the navigation doesn't get converted
-  // into a replace navigation.
-  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-
-  await i.contentWindow.navigation.navigate("#1").finished;
-
-  i.contentWindow.navigation.onnavigate = t.step_func(e => {
-    assert_false(e.cancelable);
-    // intercept() should throw with commit: "after-transition" because e.cancelable is false.
-    let iframe_constructor = i.contentWindow.DOMException;
-    assert_throws_dom("InvalidStateError", iframe_constructor, () => e.intercept({ commit: "after-transition" }));
-  });
-  await i.contentWindow.navigation.back().finished;
-}, "{ commit: 'after-transition' } for an uncancelable traverse navigation");
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-window-stop-before-commit.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-window-stop-before-commit.html
deleted file mode 100644
index 0f5e57d5b66..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/after-transition-window-stop-before-commit.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../navigation-methods/return-value/resources/helpers.js"></script>
-<body>
-<script>
-promise_test(async t => {
-  // Wait for after the load event because window.stop() hangs the test harness
-  // if called before the load event.
-  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-
-  navigation.onnavigate = e => {
-    e.intercept({ commit: "after-transition" });
-  };
-
-  navigation.onnavigatesuccess = t.unreached_func("navigatesuccess must not fire");
-  let navigateerror_called = false;
-  navigation.onnavigateerror = t.step_func(() => {
-    navigateerror_called = true;
-    assert_equals(location.hash, "");
-  });
-
-  let promises = navigation.navigate("#ShouldNotCommit");
-  assert_equals(location.hash, "");
-
-  window.stop();
-  await assertBothRejectDOM(t, promises, "AbortError");
-
-  assert_equals(location.hash, "");
-  assert_true(navigateerror_called);
-}, " { commit: 'after-transition' } with window.stop() before commit");
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/commit-throws.html b/tests/wpt/tests/navigation-api/commit-behavior/commit-throws.html
deleted file mode 100644
index 54abdbfd0fb..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/commit-throws.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-<script>
-promise_test(async t => {
-  navigation.onnavigate = t.step_func(e => {
-    assert_throws_dom("InvalidStateError", () => e.commit());
-  });
-  await navigation.navigate("#").finished;
-}, "commit() before intercept()");
-
-promise_test(async t => {
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({ handler: t.step_func(() => {
-      assert_throws_dom("InvalidStateError", () => e.commit());
-    }) });
-  });
-  await navigation.navigate("#").finished;
-}, "commit() without commit behavior specified");
-
-promise_test(async t => {
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({
-      handler: t.step_func(() => {
-        assert_throws_dom("InvalidStateError", () => e.commit());
-      }),
-      commit: "immediate"
-    });
-  });
-  await navigation.navigate("#").finished;
-}, "commit() with { commit: immediate }");
-
-promise_test(async t => {
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({ commit: "after-transition" });
-    assert_throws_dom("InvalidStateError", () => e.commit());
-  });
-  await navigation.navigate("#").finished;
-}, "commit() during event dispatch");
-
-promise_test(async t => {
-  let navigate_event;
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({ commit: "after-transition" });
-    navigate_event = e;
-  });
-  await navigation.navigate("#").finished;
-  assert_throws_dom("InvalidStateError", () => navigate_event.commit());
-}, "commit() after finish");
-
-promise_test(async t => {
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({
-      handler: t.step_func(() => {
-        e.commit();
-        assert_throws_dom("InvalidStateError", () => e.commit());
-      }),
-      commit: "after-transition"
-    });
-  });
-  await navigation.navigate("#").finished;
-}, "commit() twice");
-
-promise_test(async t => {
-  // We need to grab an NavigationDestination to construct the event.
-  navigation.onnavigate = t.step_func(e => {
-    const event = new NavigateEvent("navigate", {
-      destination: e.destination,
-      signal: (new AbortController()).signal
-    });
-
-    assert_throws_dom("SecurityError", () => event.commit());
-  });
-  await navigation.navigate("#").finished;
-}, "commit() on synthetic NavigateEvent");
-
-promise_test(async t => {
-  let i = document.createElement("iframe");
-  i.src = "about:blank";
-  document.body.appendChild(i);
-  i.contentWindow.navigation.onnavigate = t.step_func(e => {
-    e.intercept({
-      handler: t.step_func(() => {
-        let iframe_constructor = i.contentWindow.DOMException;
-        i.remove();
-        assert_throws_dom("InvalidStateError", iframe_constructor, () => e.commit());
-      }),
-      commit: "after-transition"
-    });
-  });
-  i.contentWindow.navigation.navigate("#");
-}, "commit() in detached iframe");
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/multiple-intercept.html b/tests/wpt/tests/navigation-api/commit-behavior/multiple-intercept.html
deleted file mode 100644
index 848af6a65d8..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/multiple-intercept.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-<div style="height: 1000px; width: 1000px;"></div>
-<div id="frag"></div>
-<script>
-let i = 0;
-async function urlDidChangeImmediately(listener, expected) {
-  navigation.addEventListener("navigate", listener, { once: true });
-  let expected_hash = "#" + ++i;
-  assert_not_equals(location.hash, expected_hash);
-  let finished = navigation.navigate(expected_hash).finished;
-  assert_equals(location.hash === expected_hash, expected);
-  await finished;
-  assert_equals(location.hash, expected_hash);
-}
-
-async function testUrlDidChangeImmediately(listener) {
-  await urlDidChangeImmediately(listener, true);
-}
-
-async function testUrlDidNotChangeImmediately(listener) {
-  await urlDidChangeImmediately(listener, false);
-}
-
-promise_test(async t => {
-  await testUrlDidNotChangeImmediately(e => {
-    e.intercept({ commit: "after-transition" });
-    e.intercept({ commit: "after-transition" });
-  });
-}, "after-transition + after-transition");
-
-promise_test(async t => {
-  await testUrlDidNotChangeImmediately(e => {
-    e.intercept({ commit: "after-transition" });
-    e.intercept();
-  });
-}, "after-transition + (not provided)");
-
-promise_test(async t => {
-  await testUrlDidChangeImmediately(e => {
-    e.intercept({ commit: "after-transition" });
-    e.intercept({ commit: "immediate" });
-  });
-}, "after-transition + immediate");
-
-promise_test(async t => {
-  await testUrlDidNotChangeImmediately(e => {
-    e.intercept({ commit: "immediate" });
-    e.intercept({ commit: "after-transition" });
-  });
-}, "immediate + after-transition");
-
-promise_test(async t => {
-  await testUrlDidChangeImmediately(e => {
-    e.intercept({ commit: "immediate" });
-    e.intercept();
-  });
-}, "immediate + (not provided)");
-
-promise_test(async t => {
-  await testUrlDidChangeImmediately(e => {
-    e.intercept({ commit: "immediate" });
-    e.intercept({ commit: "immediate" });
-  });
-}, "immediate + immediate");
-
-promise_test(async t => {
-  await testUrlDidNotChangeImmediately(e => {
-    e.intercept();
-    e.intercept({ commit: "after-transition" });
-  });
-}, "(not provided) + after-transition");
-
-promise_test(async t => {
-  await testUrlDidChangeImmediately(e => {
-    e.intercept();
-    e.intercept({ commit: "immediate" });
-  });
-}, "(not provided) + immediate");
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/redirect-throws.html b/tests/wpt/tests/navigation-api/commit-behavior/redirect-throws.html
deleted file mode 100644
index 4bb6f966071..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/redirect-throws.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-<script>
-promise_test(async t => {
-  navigation.onnavigate = t.step_func(e => {
-    assert_throws_dom("InvalidStateError", () => e.redirect("#"));
-  });
-  await navigation.navigate("#").finished;
-}, "redirect() before intercept()");
-
-promise_test(async t => {
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({ handler: t.step_func(() => {
-      assert_throws_dom("InvalidStateError", () => e.redirect("#"));
-    }) });
-  });
-  await navigation.navigate("#").finished;
-}, "redirect() without commit behavior specified");
-
-promise_test(async t => {
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({
-      handler: t.step_func(() => {
-        assert_throws_dom("InvalidStateError", () => e.redirect("#"));
-      }),
-      commit: "immediate"
-    });
-  });
-  await navigation.navigate("#").finished;
-}, "redirect() with { commit: immediate }");
-
-promise_test(async t => {
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({ commit: "after-transition" });
-    assert_throws_dom("InvalidStateError", () => e.redirect("#"));
-  });
-  await navigation.navigate("#").finished;
-}, "redirect() during event dispatch");
-
-promise_test(async t => {
-  let navigate_event;
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({ commit: "after-transition" });
-    navigate_event = e;
-  });
-  await navigation.navigate("#").finished;
-  assert_throws_dom("InvalidStateError", () => navigate_event.redirect("#"));
-}, "redirect() after finish");
-
-promise_test(async t => {
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({
-      handler: t.step_func(() => {
-        e.commit();
-        assert_throws_dom("InvalidStateError", () => e.redirect("#"));
-      }),
-      commit: "after-transition"
-    });
-  });
-  await navigation.navigate("#").finished;
-}, "redirect() after commit()");
-
-promise_test(async t => {
-  // We need to grab an NavigationDestination to construct the event.
-  navigation.onnavigate = t.step_func(e => {
-    const event = new NavigateEvent("navigate", {
-      destination: e.destination,
-      signal: (new AbortController()).signal
-    });
-
-    assert_throws_dom("SecurityError", () => event.redirect("#"));
-  });
-  await navigation.navigate("#").finished;
-}, "redirect() on synthetic NavigateEvent");
-
-promise_test(async t => {
-  let i = document.createElement("iframe");
-  i.src = "about:blank";
-  document.body.appendChild(i);
-  i.contentWindow.navigation.onnavigate = t.step_func(e => {
-    e.intercept({
-      handler: t.step_func(() => {
-        let iframe_constructor = i.contentWindow.DOMException;
-        i.remove();
-        assert_throws_dom("InvalidStateError", iframe_constructor, () => e.redirect("#"));
-      }),
-      commit: "after-transition"
-    });
-  });
-  i.contentWindow.navigation.navigate("#");
-}, "redirect() in detached iframe");
-
-promise_test(async t => {
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({ handler: t.step_func(() => {
-      assert_throws_dom("SyntaxError", () => e.redirect("https://example.com\u0000mozilla.org"));
-    }),
-    commit: "after-transition" });
-  });
-  await navigation.navigate("#").finished;
-}, "redirect() to invalid url");
-
-promise_test(async t => {
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({ handler: t.step_func(() => {
-      assert_throws_dom("SecurityError", () => e.redirect("https://example.com"));
-    }),
-    commit: "after-transition" });
-  });
-  await navigation.navigate("#").finished;
-}, "redirect() to cross-origin url");
-
-promise_test(async t => {
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({ handler: t.step_func(() => {
-      assert_throws_dom("InvalidStateError", () => e.redirect("#"));
-    }),
-    commit: "after-transition" });
-  });
-  await navigation.reload().finished;
-}, "redirect() reload");
-
-promise_test(async t => {
-  // Wait for after the load event so that the navigation doesn't get converted
-  // into a replace navigation.
-  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-
-  await navigation.navigate("#forward").finished;
-
-  navigation.onnavigate = t.step_func(e => {
-    e.intercept({ handler: t.step_func(() => {
-      assert_throws_dom("InvalidStateError", () => e.redirect("#"));
-    }),
-    commit: "after-transition" });
-  });
-  await navigation.back().finished;
-}, "redirect() traverse");
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/commit-behavior/resources/after-transition-commit-helpers.js b/tests/wpt/tests/navigation-api/commit-behavior/resources/after-transition-commit-helpers.js
deleted file mode 100644
index 2be6a03bac8..00000000000
--- a/tests/wpt/tests/navigation-api/commit-behavior/resources/after-transition-commit-helpers.js
+++ /dev/null
@@ -1,90 +0,0 @@
-window.testAfterTransitionCommit = async (t, navigationType, mode, destinationIndex = 0) => {
-  let startHash = location.hash;
-  let destinationHash;
-  const err = new Error("boo!");
-
-  let popstate_fired = false;
-  window.addEventListener("popstate", () => popstate_fired = true, { once : true });
-  let navigatesuccess_fired = false;
-  navigation.addEventListener("navigatesuccess", () => navigatesuccess_fired = true, { once : true });
-  let navigateerror_fired = false;
-  navigation.addEventListener("navigateerror", () => navigateerror_fired = true, { once : true });
-
-  // mode-specific logic for the navigate event handler
-  let navigate_helpers = {
-    rejectBeforeCommit : async (e) => {
-      return Promise.reject(err);
-    },
-    rejectAfterCommit : async (e) => {
-      e.commit();
-      assert_equals(location.hash, destinationHash, "hash after commit");
-      assert_equals(navigationType == "traverse", popstate_fired, "popstate fired after commit");
-      await new Promise(resolve => t.step_timeout(resolve, 0));
-      return Promise.reject(err);
-    },
-    successExplicitCommit : async (e) => {
-      e.commit();
-      assert_equals(location.hash, destinationHash, "hash after commit");
-      assert_equals(navigationType == "traverse", popstate_fired, "popstate fired after commit");
-      return new Promise(resolve => t.step_timeout(resolve, 0));
-    },
-    successNoExplicitCommit : async (e) => {
-      assert_equals(location.hash, startHash, "start has after first async step");
-      assert_false(popstate_fired, "popstate fired after first async step");
-      await new Promise(resolve => t.step_timeout(resolve, 0));
-      assert_equals(location.hash, startHash, "start has after second async step");
-      assert_false(popstate_fired, "popstate fired after second async step");
-      return new Promise(resolve => t.step_timeout(resolve, 0));
-    }
-  }
-
-  navigation.addEventListener("navigate", e => {
-    e.intercept({ commit: "after-transition",
-                  handler: t.step_func(async () => {
-                    assert_equals(e.navigationType, navigationType);
-                    assert_equals(location.hash, startHash, "start hash");
-                    assert_false(popstate_fired, "popstate fired at handler start");
-
-                    await new Promise(resolve => t.step_timeout(resolve, 0));
-                    assert_equals(location.hash, startHash, "hash after first async step");
-                    assert_false(popstate_fired, "popstate fired after first async step");
-
-                    return navigate_helpers[mode](e);
-                  })});
-  }, { once: true });
-
-  let promises;
-  if (navigationType === "push" || navigationType === "replace") {
-    destinationHash = (startHash === "" ? "#" : startHash) + "a";
-    promises = navigation.navigate(destinationHash, { history: navigationType });
-  } else if (navigationType === "reload") {
-    destinationHash = startHash;
-    promises = navigation.reload();
-  } else if (navigationType === "traverse") {
-    let destinationEntry = navigation.entries()[destinationIndex];
-    destinationHash = new URL(destinationEntry.url).hash;
-    promises = navigation.traverseTo(destinationEntry.key);
-  }
-
-  if (mode === "rejectBeforeCommit") {
-    await assertBothRejectExactly(t, promises, err);
-    assert_equals(location.hash, startHash, "hash after promise resolution");
-    assert_false(popstate_fired, "popstate fired after promise resolution");
-    assert_false(navigatesuccess_fired, "navigatesuccess fired");
-    assert_true(navigateerror_fired, "navigateerror fired");
-  } else if (mode === "rejectAfterCommit") {
-    await promises.committed;
-    await assertCommittedFulfillsFinishedRejectsExactly(t, promises, navigation.currentEntry, err);
-    assert_equals(location.hash, destinationHash, "hash after promise resolution");
-    assert_equals(navigationType == "traverse", popstate_fired, "popstate fired after promise resolution");
-    assert_false(navigatesuccess_fired, "navigatesuccess fired");
-    assert_true(navigateerror_fired, "navigateerror fired");
-  } else {
-    await promises.committed;
-    await assertBothFulfill(t, promises, navigation.currentEntry);
-    assert_equals(location.hash, destinationHash, "hash after promise resolution");
-    assert_equals(navigationType == "traverse", popstate_fired, "popstate fired after promise resolution");
-    assert_true(navigatesuccess_fired, "navigatesuccess fired");
-    assert_false(navigateerror_fired, "navigateerror fired");
-  }
-}
diff --git a/tests/wpt/tests/navigation-api/navigate-event/defaultPrevented-window-stop-after-dispatch.html b/tests/wpt/tests/navigation-api/navigate-event/defaultPrevented-window-stop-after-dispatch.html
index da5de10ddd8..889179603b8 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/defaultPrevented-window-stop-after-dispatch.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/defaultPrevented-window-stop-after-dispatch.html
@@ -6,11 +6,12 @@ async_test(t => {
   window.onload = t.step_func_done(() => {
     let navigateEvent;
     navigation.onnavigate = e => navigateEvent = e;
-    navigation.navigate("?1");
+    let committed_promise = navigation.navigate("?1").committed;
     assert_false(navigateEvent.defaultPrevented);
 
     window.stop();
     assert_false(navigateEvent.defaultPrevented);
+    promise_rejects_dom(t, "AbortError", committed_promise);
   });
 }, "window.stop() doesn't affect navigateEvent.defaultPrevented after dispatch");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigate-event/replaceState-in-unload-then-remove-iframe.html b/tests/wpt/tests/navigation-api/navigate-event/replaceState-in-unload-then-remove-iframe.html
deleted file mode 100644
index e97b72b1571..00000000000
--- a/tests/wpt/tests/navigation-api/navigate-event/replaceState-in-unload-then-remove-iframe.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<iframe id="i" src="/common/blank.html"></iframe>
-<script>
-async_test(t => {
-  window.onload = t.step_func(() => {
-    i.contentWindow.onunload = t.step_func(() => {
-      i.contentWindow.history.replaceState(null, "", "#");
-      i.remove();
-      t.step_timeout(t.step_func_done(), 0);
-    });
-    i.contentWindow.location = "/common/blank.html?1";
-  });
-}, "reacting to the navigate event doesn't crash when replaceState is called in onunload");
-</script>
diff --git a/tests/wpt/tests/navigation-api/navigate-event/signal-abort-window-stop.html b/tests/wpt/tests/navigation-api/navigate-event/signal-abort-window-stop.html
index 43e005e8b41..cd3bb7431a3 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/signal-abort-window-stop.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/signal-abort-window-stop.html
@@ -11,10 +11,11 @@ async_test(t => {
       abort_signal = e.signal;
       abort_signal.onabort = () => onabort_called = true;
     });
-    navigation.navigate("?1");
+    let committed_promise = navigation.navigate("?1").committed;
     window.stop();
     assert_true(abort_signal.aborted);
     assert_true(onabort_called);
+    promise_rejects_dom(t, "AbortError", committed_promise);
     // Complete the test asynchronously to ensure that onnavigatesuccess
     // didn't fire on a microtask.
     t.step_timeout(t.step_func_done(() => {}), 0);
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/intercept-async.html b/tests/wpt/tests/navigation-api/ordering-and-transition/intercept-async.html
index d402340b068..4fa7c88833e 100644
--- a/tests/wpt/tests/navigation-api/ordering-and-transition/intercept-async.html
+++ b/tests/wpt/tests/navigation-api/ordering-and-transition/intercept-async.html
@@ -45,6 +45,7 @@ promise_test(async t => {
     ["handler sync", "#1", { from, navigationType: "push" }],
     ["handler after microtask", "#1", { from, navigationType: "push" }],
     ["committed fulfilled", "#1", { from, navigationType: "push" }],
+    ["transition.committed fulfilled", "#1", { from, navigationType: "push" }],
     ["promise microtask", "#1", { from, navigationType: "push" }],
     ["handler after setTimeout", "#1", { from, navigationType: "push" }],
     ["navigatesuccess", "#1", { from, navigationType: "push" }],
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-commit-after-transition-intercept-with-redirect.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-commit-after-transition-intercept-with-redirect.html
deleted file mode 100644
index 1d7c47b5e73..00000000000
--- a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-commit-after-transition-intercept-with-redirect.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<meta name="variant" content="?no-currententrychange">
-<meta name="variant" content="?currententrychange">
-
-<script type="module">
-import { Recorder, hasVariant } from "./resources/helpers.mjs";
-
-promise_test(async t => {
-  // Wait for after the load event so that the navigation doesn't get converted
-  // into a replace navigation.
-  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-
-  const from = navigation.currentEntry;
-
-  const recorder = new Recorder({
-    skipCurrentChange: !hasVariant("currententrychange"),
-    finalExpectedEvent: "transition.finished fulfilled"
-  });
-
-  recorder.setUpNavigationAPIListeners();
-
-  navigation.addEventListener("navigate", e => {
-    e.intercept({ commit: "after-transition",
-                  async handler() {
-                    recorder.record("handler start");
-                    await new Promise(r => t.step_timeout(r, 0));
-                    recorder.record("handler async step 1a");
-                    e.redirect("#2");
-                    recorder.record("handler async step 1b");
-                    await new Promise(r => t.step_timeout(r, 0));
-                    recorder.record("handler async step 2a");
-                    e.commit();
-                    recorder.record("handler async step 2b");
-                    await new Promise(r => t.step_timeout(r, 0));
-                    recorder.record("handler async step 3");
-                  }
-                });
-  });
-
-  const result = navigation.navigate("#1");
-  recorder.setUpResultListeners(result);
-
-  Promise.resolve().then(() => recorder.record("promise microtask"));
-
-  await recorder.readyToAssert;
-
-  recorder.assert([
-    /* event name, location.hash value, navigation.transition properties */
-    ["navigate", "", null],
-    ["handler start", "", { from, navigationType: "push" }],
-    ["promise microtask", "", { from, navigationType: "push" }],
-    ["handler async step 1a", "", { from, navigationType: "push" }],
-    ["handler async step 1b", "", { from, navigationType: "push" }],
-    ["handler async step 2a", "", { from, navigationType: "push" }],
-    ["currententrychange", "#2", { from, navigationType: "push" }],
-    ["handler async step 2b", "#2", { from, navigationType: "push" }],
-    ["committed fulfilled", "#2", { from, navigationType: "push" }],
-    ["handler async step 3", "#2", { from, navigationType: "push" }],
-    ["navigatesuccess", "#2", { from, navigationType: "push" }],
-    ["finished fulfilled", "#2", null],
-    ["transition.finished fulfilled", "#2", null],
-  ]);
-}, "event and promise ordering for same-document navigation.navigate() intercepted by intercept() with { commit: 'after-transition' } and a redirect()");
-</script>
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-commit-after-transition-intercept.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-commit-after-transition-intercept.html
deleted file mode 100644
index 16c8796d6f4..00000000000
--- a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-commit-after-transition-intercept.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<meta name="variant" content="?no-currententrychange">
-<meta name="variant" content="?currententrychange">
-
-<script type="module">
-import { Recorder, hasVariant } from "./resources/helpers.mjs";
-
-promise_test(async t => {
-  // Wait for after the load event so that the navigation doesn't get converted
-  // into a replace navigation.
-  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-
-  const from = navigation.currentEntry;
-
-  const recorder = new Recorder({
-    skipCurrentChange: !hasVariant("currententrychange"),
-    finalExpectedEvent: "transition.finished fulfilled"
-  });
-
-  recorder.setUpNavigationAPIListeners();
-
-  navigation.addEventListener("navigate", e => {
-    e.intercept({ commit: "after-transition",
-                  async handler() {
-                    recorder.record("handler start");
-                    await new Promise(r => t.step_timeout(r, 0));
-                    recorder.record("handler async step 1a");
-                    e.commit();
-                    recorder.record("handler async step 1b");
-                    await new Promise(r => t.step_timeout(r, 0));
-                    recorder.record("handler async step 2");
-                  }
-                });
-  });
-
-  const result = navigation.navigate("#1");
-  recorder.setUpResultListeners(result);
-
-  Promise.resolve().then(() => recorder.record("promise microtask"));
-
-  await recorder.readyToAssert;
-
-  recorder.assert([
-    /* event name, location.hash value, navigation.transition properties */
-    ["navigate", "", null],
-    ["handler start", "", { from, navigationType: "push" }],
-    ["promise microtask", "", { from, navigationType: "push" }],
-    ["handler async step 1a", "", { from, navigationType: "push" }],
-    ["currententrychange", "#1", { from, navigationType: "push" }],
-    ["handler async step 1b", "#1", { from, navigationType: "push" }],
-    ["committed fulfilled", "#1", { from, navigationType: "push" }],
-    ["handler async step 2", "#1", { from, navigationType: "push" }],
-    ["navigatesuccess", "#1", { from, navigationType: "push" }],
-    ["finished fulfilled", "#1", null],
-    ["transition.finished fulfilled", "#1", null],
-  ]);
-}, "event and promise ordering for same-document navigation.navigate() intercepted by intercept() with { commit: 'after-transition' }");
-</script>
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-double-intercept.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-double-intercept.html
index 8baea7bf1ea..0598fb554e0 100644
--- a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-double-intercept.html
+++ b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-double-intercept.html
@@ -54,9 +54,11 @@ promise_test(async t => {
     ["currententrychange", "#2", { from: fromHash1, navigationType: "push" }],
     ["handler run", "#2", { from: fromHash1, navigationType: "push" }],
     ["committed fulfilled 1", "#2", { from: fromHash1, navigationType: "push" }],
+    ["transition.committed fulfilled 1", "#2", { from: fromHash1, navigationType: "push" }],
     ["finished rejected 1", "#2", { from: fromHash1, navigationType: "push" }],
     ["transition.finished rejected", "#2", { from: fromHash1, navigationType: "push" }],
     ["committed fulfilled 2", "#2", { from: fromHash1, navigationType: "push" }],
+    ["transition.committed fulfilled 2", "#2", { from: fromHash1, navigationType: "push" }],
     ["promise microtask", "#2", { from: fromHash1, navigationType: "push" }],
     ["navigatesuccess", "#2", { from: fromHash1, navigationType: "push" }],
     ["finished fulfilled 2", "#2", null],
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-in-transition-finished.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-in-transition-finished.html
index 6f8b667ce31..8b3811dd36f 100644
--- a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-in-transition-finished.html
+++ b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-in-transition-finished.html
@@ -52,6 +52,7 @@ promise_test(async t => {
     ["currententrychange", "#1", { from: fromStart, navigationType: "push" }],
     ["handler run", "#1", { from: fromStart, navigationType: "push" }],
     ["committed fulfilled 1", "#1", { from: fromStart, navigationType: "push" }],
+    ["transition.committed fulfilled 1", "#1", { from: fromStart, navigationType: "push" }],
     ["promise microtask", "#1", { from: fromStart, navigationType: "push" }],
     ["navigatesuccess", "#1", { from: fromStart, navigationType: "push" }],
     ["finished fulfilled 1", "#1", null],
@@ -61,6 +62,7 @@ promise_test(async t => {
     ["currententrychange", "#2", { from: fromHash1, navigationType: "push" }],
     ["handler run", "#2", { from: fromHash1, navigationType: "push" }],
     ["committed fulfilled 2", "#2", { from: fromHash1, navigationType: "push" }],
+    ["transition.committed fulfilled 2", "#2", { from: fromHash1, navigationType: "push" }],
     ["navigatesuccess", "#2", { from: fromHash1, navigationType: "push" }],
     ["finished fulfilled 2", "#2", null],
     ["transition.finished fulfilled", "#2", null]
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept-precommitHandler-redirect.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept-precommitHandler-redirect.html
new file mode 100644
index 00000000000..2f60bfd749d
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept-precommitHandler-redirect.html
@@ -0,0 +1,64 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<meta name="variant" content="?no-currententrychange">
+<meta name="variant" content="?currententrychange">
+
+<script type="module">
+import { Recorder, hasVariant } from "./resources/helpers.mjs";
+
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  const from = navigation.currentEntry;
+
+  const recorder = new Recorder({
+    skipCurrentChange: !hasVariant("currententrychange"),
+    finalExpectedEvent: "transition.finished fulfilled"
+  });
+
+  recorder.setUpNavigationAPIListeners();
+
+  navigation.addEventListener("navigate", e => {
+    e.intercept({ async precommitHandler(controller) {
+                    recorder.record("precommitHandler start");
+                    await new Promise(r => t.step_timeout(r, 0));
+                    recorder.record("precommitHandler async step 1a");
+                    controller.redirect("#2");
+                    recorder.record("precommitHandler async step 1b");
+                  },
+                  async handler() {
+                    recorder.record("handler start");
+                    await new Promise(r => t.step_timeout(r, 0));
+                    recorder.record("handler async step 1");
+                  }
+                });
+  });
+
+  const result = navigation.navigate("#1");
+  recorder.setUpResultListeners(result);
+
+  Promise.resolve().then(() => recorder.record("promise microtask"));
+
+  await recorder.readyToAssert;
+
+  recorder.assert([
+    /* event name, location.hash value, navigation.transition properties */
+    ["navigate", "", null],
+    ["precommitHandler start", "", { from, navigationType: "push" }],
+    ["promise microtask", "", { from, navigationType: "push" }],
+    ["precommitHandler async step 1a", "", { from, navigationType: "push" }],
+    ["precommitHandler async step 1b", "", { from, navigationType: "push" }],
+    ["currententrychange", "#2", { from, navigationType: "push" }],
+    ["handler start", "#2", { from, navigationType: "push" }],
+    ["committed fulfilled", "#2", { from, navigationType: "push" }],
+    ["transition.committed fulfilled", "#2", { from, navigationType: "push" }],
+    ["handler async step 1", "#2", { from, navigationType: "push" }],
+    ["navigatesuccess", "#2", { from, navigationType: "push" }],
+    ["finished fulfilled", "#2", null],
+    ["transition.finished fulfilled", "#2", null],
+  ]);
+}, "event and promise ordering for same-document navigation.navigate() intercepted by intercept() with a precommitHandler that redirects");
+</script>
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept-precommitHandler-reject.tentative.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept-precommitHandler-reject.tentative.html
new file mode 100644
index 00000000000..6d19614f743
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept-precommitHandler-reject.tentative.html
@@ -0,0 +1,52 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<meta name="variant" content="?no-currententrychange">
+<meta name="variant" content="?currententrychange">
+
+<script type="module">
+import { Recorder, hasVariant } from "./resources/helpers.mjs";
+
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  const from = navigation.currentEntry;
+
+  const recorder = new Recorder({
+    skipCurrentChange: !hasVariant("currententrychange"),
+    finalExpectedEvent: "transition.finished rejected"
+  });
+
+  recorder.setUpNavigationAPIListeners();
+
+  navigation.addEventListener("navigate", e => {
+    e.intercept({ async precommitHandler() {
+                    recorder.record("precommitHandler start");
+                    return Promise.reject();
+                  },
+                  async handler() { recorder.record("handler should not run"); }
+                });
+  });
+
+  const result = navigation.navigate("#1");
+  recorder.setUpResultListeners(result);
+
+  Promise.resolve().then(() => recorder.record("promise microtask"));
+
+  await recorder.readyToAssert;
+
+  recorder.assert([
+    /* event name, location.hash value, navigation.transition properties */
+    ["navigate", "", null],
+    ["precommitHandler start", "", { from, navigationType: "push" }],
+    ["promise microtask", "", { from, navigationType: "push" }],
+    ["navigateerror", "", { from, navigationType: "push" }],
+    ["committed rejected", "", null],
+    ["finished rejected", "", null],
+    ["transition.committed rejected", "", null],
+    ["transition.finished rejected", "", null],
+  ]);
+}, "event and promise ordering for same-document navigation.navigate() intercepted by intercept() with a precommitHandler");
+</script>
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept-precommitHandler.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept-precommitHandler.html
new file mode 100644
index 00000000000..8257e56d44e
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept-precommitHandler.html
@@ -0,0 +1,61 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<meta name="variant" content="?no-currententrychange">
+<meta name="variant" content="?currententrychange">
+
+<script type="module">
+import { Recorder, hasVariant } from "./resources/helpers.mjs";
+
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  const from = navigation.currentEntry;
+
+  const recorder = new Recorder({
+    skipCurrentChange: !hasVariant("currententrychange"),
+    finalExpectedEvent: "transition.finished fulfilled"
+  });
+
+  recorder.setUpNavigationAPIListeners();
+
+  navigation.addEventListener("navigate", e => {
+    e.intercept({ async precommitHandler() {
+                    recorder.record("precommitHandler start");
+                    await new Promise(r => t.step_timeout(r, 0));
+                    recorder.record("precommitHandler async step");
+                  },
+                  async handler() {
+                    recorder.record("handler start");
+                    await new Promise(r => t.step_timeout(r, 0));
+                    recorder.record("handler async step");
+                  }
+                });
+  });
+
+  const result = navigation.navigate("#1");
+  recorder.setUpResultListeners(result);
+
+  Promise.resolve().then(() => recorder.record("promise microtask"));
+
+  await recorder.readyToAssert;
+
+  recorder.assert([
+    /* event name, location.hash value, navigation.transition properties */
+    ["navigate", "", null],
+    ["precommitHandler start", "", { from, navigationType: "push" }],
+    ["promise microtask", "", { from, navigationType: "push" }],
+    ["precommitHandler async step", "", { from, navigationType: "push" }],
+    ["currententrychange", "#1", { from, navigationType: "push" }],
+    ["handler start", "#1", { from, navigationType: "push" }],
+    ["committed fulfilled", "#1", { from, navigationType: "push" }],
+    ["transition.committed fulfilled", "#1", { from, navigationType: "push" }],
+    ["handler async step", "#1", { from, navigationType: "push" }],
+    ["navigatesuccess", "#1", { from, navigationType: "push" }],
+    ["finished fulfilled", "#1", null],
+    ["transition.finished fulfilled", "#1", null],
+  ]);
+}, "event and promise ordering for same-document navigation.navigate() intercepted by intercept() with a precommitHandler");
+</script>
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept-stop.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept-stop.html
index 189475d5de1..1a7faa4e0ee 100644
--- a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept-stop.html
+++ b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept-stop.html
@@ -42,6 +42,7 @@ promise_test(async t => {
     ["AbortSignal abort", "#1", { from, navigationType: "push" }],
     ["navigateerror", "#1", { from, navigationType: "push" }],
     ["committed fulfilled", "#1", null],
+    ["transition.committed fulfilled", "#1", null],
     ["promise microtask", "#1", null],
     ["finished rejected", "#1", null],
     ["transition.finished rejected", "#1", null],
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept.html
index cdbd8f6ef66..eec9d3ca119 100644
--- a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept.html
+++ b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept.html
@@ -38,6 +38,7 @@ promise_test(async t => {
     ["currententrychange", "#1", { from, navigationType: "push" }],
     ["handler run", "#1", { from, navigationType: "push" }],
     ["committed fulfilled", "#1", { from, navigationType: "push" }],
+    ["transition.committed fulfilled", "#1", { from, navigationType: "push" }],
     ["promise microtask", "#1", { from, navigationType: "push" }],
     ["navigatesuccess", "#1", { from, navigationType: "push" }],
     ["finished fulfilled", "#1", null],
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reentrant.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reentrant.html
index 0106e997c9f..88715fda355 100644
--- a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reentrant.html
+++ b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reentrant.html
@@ -53,8 +53,20 @@ promise_test(async t => {
     ["currententrychange", "#2", { from, navigationType: "push" }],
     ["handler run", "#2", { from, navigationType: "push" }],
     ["committed fulfilled 2", "#2", { from, navigationType: "push" }],
+    ["transition.committed fulfilled 2", "#2", { from, navigationType: "push" }],
     ["committed rejected 1", "#2", { from, navigationType: "push" }],
     ["finished rejected 1", "#2", { from, navigationType: "push" }],
+    // Because of the reentrant nature of this test,
+    // "transition.committed fulfilled 1" and "transition.committed fulfilled 2"
+    // are for the same transition.committed promise: the one for the second
+    // navigation that interrupted the first. The first navigation never
+    // was aborted during navigate event dispatch, so there was never a
+    // transition.committed for it. But by the time
+    // recorder.setUpResultListeners(result1, " 1") runs, the second
+    // navigation's transition.committed had been installed, so we attached a
+    // listener to log it with the "1" label (in addition to the previous
+    // listener to log it with the "2" label).
+    ["transition.committed fulfilled 1", "#2", { from, navigationType: "push" }],
     ["promise microtask", "#2", { from, navigationType: "push" }],
     ["navigatesuccess", "#2", { from, navigationType: "push" }],
     ["finished fulfilled 2", "#2", null],
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reject.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reject.html
index 6713edca2d9..05f295177a0 100644
--- a/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reject.html
+++ b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reject.html
@@ -42,6 +42,7 @@ promise_test(async t => {
     ["currententrychange", "#1", { from, navigationType: "push" }],
     ["handler run", "#1", { from, navigationType: "push" }],
     ["committed fulfilled", "#1", { from, navigationType: "push" }],
+    ["transition.committed fulfilled", "#1", { from, navigationType: "push" }],
     ["promise microtask", "#1", { from, navigationType: "push" }],
     ["navigateerror", "#1", { from, navigationType: "push" }],
     ["finished rejected", "#1", null],
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/reload-intercept-reject.html b/tests/wpt/tests/navigation-api/ordering-and-transition/reload-intercept-reject.html
index 7394ce4d17a..96833f314f4 100644
--- a/tests/wpt/tests/navigation-api/ordering-and-transition/reload-intercept-reject.html
+++ b/tests/wpt/tests/navigation-api/ordering-and-transition/reload-intercept-reject.html
@@ -42,6 +42,7 @@ promise_test(async t => {
     ["currententrychange", "", { from, navigationType: "reload" }],
     ["handler run", "", { from, navigationType: "reload" }],
     ["committed fulfilled", "", { from, navigationType: "reload" }],
+    ["transition.committed fulfilled", "", { from, navigationType: "reload" }],
     ["promise microtask", "", { from, navigationType: "reload" }],
     ["navigateerror", "", { from, navigationType: "reload" }],
     ["finished rejected", "", null],
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/reload-intercept.html b/tests/wpt/tests/navigation-api/ordering-and-transition/reload-intercept.html
index 18ff6191c0d..1494136e199 100644
--- a/tests/wpt/tests/navigation-api/ordering-and-transition/reload-intercept.html
+++ b/tests/wpt/tests/navigation-api/ordering-and-transition/reload-intercept.html
@@ -38,6 +38,7 @@ promise_test(async t => {
     ["currententrychange", "", { from, navigationType: "reload" }],
     ["handler run", "", { from, navigationType: "reload" }],
     ["committed fulfilled", "", { from, navigationType: "reload" }],
+    ["transition.committed fulfilled", "", { from, navigationType: "reload" }],
     ["promise microtask", "", { from, navigationType: "reload" }],
     ["navigatesuccess", "", { from, navigationType: "reload" }],
     ["finished fulfilled", "", null],
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/reload-no-popstate.html b/tests/wpt/tests/navigation-api/ordering-and-transition/reload-no-popstate.html
index 9c1186344dc..6c4592b67cc 100644
--- a/tests/wpt/tests/navigation-api/ordering-and-transition/reload-no-popstate.html
+++ b/tests/wpt/tests/navigation-api/ordering-and-transition/reload-no-popstate.html
@@ -37,6 +37,7 @@ promise_test(async t => {
     ["currententrychange", "", { from, navigationType: "reload" }],
     ["handler run", "", { from, navigationType: "reload" }],
     ["committed fulfilled", "", { from, navigationType: "reload" }],
+    ["transition.committed fulfilled", "", { from, navigationType: "reload" }],
     ["promise microtask", "", { from, navigationType: "reload" }],
     ["navigatesuccess", "", { from, navigationType: "reload" }],
     ["finished fulfilled", "", null],
diff --git a/tests/wpt/tests/navigation-api/ordering-and-transition/resources/helpers.mjs b/tests/wpt/tests/navigation-api/ordering-and-transition/resources/helpers.mjs
index 341befc1056..22752e4cfed 100644
--- a/tests/wpt/tests/navigation-api/ordering-and-transition/resources/helpers.mjs
+++ b/tests/wpt/tests/navigation-api/ordering-and-transition/resources/helpers.mjs
@@ -63,6 +63,7 @@ export class Recorder {
   }
 
   setUpResultListeners(result, suffix = "") {
+
     result.committed.then(
       () => this.record(`committed fulfilled${suffix}`),
       err => this.recordWithError(`committed rejected${suffix}`, err)
@@ -72,6 +73,11 @@ export class Recorder {
       () => this.record(`finished fulfilled${suffix}`),
       err => this.recordWithError(`finished rejected${suffix}`, err)
     );
+
+    this.#navigationAPI.transition?.committed?.then(
+      () => this.record(`transition.committed fulfilled${suffix}`),
+      err => this.recordWithError(`transition.committed rejected${suffix}`, err)
+    );
   }
 
   record(name) {
@@ -114,6 +120,13 @@ export class Recorder {
     if (this.#skipCurrentChange) {
       expectedAsArray = expectedAsArray.filter(expected => expected[0] !== "currententrychange");
     }
+    // TODO: Remove once https://github.com/whatwg/html/pull/10919 is merged.
+    if (!('committed' in NavigationTransition.prototype)) {
+      expectedAsArray = expectedAsArray.filter(expected => {
+         return !expected[0].includes("transition.committed fulfilled") &&
+                !expected[0].includes("transition.committed rejected")
+      });
+    }
 
     // Doing this up front gives nicer error messages because
     // assert_array_equals is nice.
diff --git a/tests/wpt/tests/navigation-api/precommit-handler/multiple-intercept.html b/tests/wpt/tests/navigation-api/precommit-handler/multiple-intercept.html
new file mode 100644
index 00000000000..b7fd9109bd5
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/precommit-handler/multiple-intercept.html
@@ -0,0 +1,83 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<div style="height: 1000px; width: 1000px;"></div>
+<div id="frag"></div>
+<script>
+let i = 0;
+async function urlDidChangeImmediately(listener, expected) {
+  navigation.addEventListener("navigate", listener, { once: true });
+  let expected_hash = "#" + ++i;
+  assert_not_equals(location.hash, expected_hash);
+  let finished = navigation.navigate(expected_hash).finished;
+  assert_equals(location.hash === expected_hash, expected);
+  await finished;
+  assert_equals(location.hash, expected_hash);
+}
+
+async function testUrlDidChangeImmediately(listener) {
+  await urlDidChangeImmediately(listener, true);
+}
+
+async function testUrlDidNotChangeImmediately(listener) {
+  await urlDidChangeImmediately(listener, false);
+}
+
+promise_test(async t => {
+  await testUrlDidNotChangeImmediately(e => {
+    e.intercept({ precommitHandler: async () => {} });
+    e.intercept({ precommitHandler: async () => {} });
+  });
+}, "precommitHandler + precommitHandler");
+
+promise_test(async t => {
+  await testUrlDidNotChangeImmediately(e => {
+    e.intercept({ precommitHandler: async () => {} });
+    e.intercept();
+  });
+}, "precommitHandler + (not provided)");
+
+promise_test(async t => {
+  await testUrlDidNotChangeImmediately(e => {
+    e.intercept({ precommitHandler: async () => {} });
+    e.intercept({ handler: async () => {} });
+  });
+}, "precommitHandler + handler");
+
+promise_test(async t => {
+  await testUrlDidNotChangeImmediately(e => {
+    e.intercept({ handler: async () => {} });
+    e.intercept({ precommitHandler: async () => {} });
+  });
+}, "handler + precommitHandler");
+
+promise_test(async t => {
+  await testUrlDidChangeImmediately(e => {
+    e.intercept({ handler: async () => {} });
+    e.intercept();
+  });
+}, "handler + (not provided)");
+
+promise_test(async t => {
+  await testUrlDidChangeImmediately(e => {
+    e.intercept({ handler: async () => {} });
+    e.intercept({ handler: async () => {} });
+  });
+}, "handler + handler");
+
+promise_test(async t => {
+  await testUrlDidNotChangeImmediately(e => {
+    e.intercept();
+    e.intercept({ precommitHandler: async () => {} });
+  });
+}, "(not provided) + precommitHandler");
+
+promise_test(async t => {
+  await testUrlDidChangeImmediately(e => {
+    e.intercept();
+    e.intercept({ handler: async () => {} });
+  });
+}, "(not provided) + handler");
+</script>
+</body>
diff --git a/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-new-navigation-before-commit.html b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-new-navigation-before-commit.html
new file mode 100644
index 00000000000..89e9895534f
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-new-navigation-before-commit.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../navigation-methods/return-value/resources/helpers.js"></script>
+<body>
+<script>
+promise_test(async t => {
+  navigation.addEventListener("navigate", e => e.intercept({ precommitHandler: async () => {} }), { once: "true" });
+
+  let navigateerror_called = false;
+  navigation.onnavigateerror = t.step_func(() => {
+    navigateerror_called = true;
+    assert_equals(location.hash, "");
+  });
+
+  let promises_should_not_commit = navigation.navigate("#ShouldNotCommit");
+  let promises_fulfilled = navigation.navigate("#1");
+  await assertBothRejectDOM(t, promises_should_not_commit, "AbortError");
+  await assertBothFulfill(t, promises_fulfilled, navigation.currentEntry);
+
+  assert_equals(location.hash, "#1");
+  assert_true(navigateerror_called);
+}, "Cancel a navigation with a precommitHandler before commit by starting a new navigation");
+</script>
+</body>
diff --git a/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-push.html b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-push.html
new file mode 100644
index 00000000000..41856ed6c43
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-push.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../navigation-methods/return-value/resources/helpers.js"></script>
+<script src="resources/precommitHandler-helpers.js"></script>
+<body>
+<script>
+let tests = [
+  { mode: "rejectBeforeCommit", description: "precommitHandler for a push navigation, reject before commit" },
+  { mode: "rejectAfterCommit",  description: "precommitHandler for a push navigation, reject after commit" },
+  { mode: "success",            description: "precommitHandler for a push navigation, success" },
+];
+
+let onload_promise = new Promise(resolve => window.onload = resolve);
+for (let test of tests) {
+  promise_test(async t => {
+    await onload_promise;
+    await testDeferredCommit(t, "push", test.mode);
+  }, test.description);
+}
+</script>
+</body>
diff --git a/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-redirect-options.html b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-redirect-options.html
new file mode 100644
index 00000000000..06542d7e084
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-redirect-options.html
@@ -0,0 +1,81 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  let start_length = navigation.entries().length;
+  let start_hash = location.hash;
+
+  let navInfo0 = { nav : "info0" };
+  let navState0 = { statevar: "state0" };
+
+  let navInfo1 = { nav : "info1" };
+  let navState1 = { statevar: "state1" };
+
+  let navInfo2 = { nav : "info2" };
+  let navState2 = { statevar: "state2" };
+
+  navigation.onnavigate = t.step_func(e => {
+    e.intercept({
+      precommitHandler: t.step_func(controller => {
+        assert_equals(location.hash, start_hash);
+        assert_equals(new URL(e.destination.url).hash, "#push");
+        assert_equals(e.info, navInfo0);
+        assert_not_equals(e.destination.getState(), navState0);
+        assert_equals(e.destination.getState().statevar, navState0.statevar);
+
+        // Redirect without options should not overwrite the original options.
+        controller.redirect("#redirect0");
+        assert_equals(location.hash, start_hash);
+        assert_equals(new URL(e.destination.url).hash, "#redirect0");
+        assert_equals(e.info, navInfo0);
+        assert_not_equals(e.destination.getState(), navState0);
+        assert_equals(e.destination.getState().statevar, navState0.statevar);
+
+        // Update both info and state.
+        controller.redirect("#redirect1", { info: navInfo1, state: navState1});
+        assert_equals(location.hash, start_hash);
+        assert_equals(new URL(e.destination.url).hash, "#redirect1");
+        assert_equals(e.info, navInfo1);
+        assert_not_equals(e.destination.getState(), navState1);
+        assert_equals(e.destination.getState().statevar, navState1.statevar);
+
+        // Update just info
+        controller.redirect("#redirect2", { info: navInfo2 });
+        assert_equals(location.hash, start_hash);
+        assert_equals(new URL(e.destination.url).hash, "#redirect2");
+        assert_equals(e.info, navInfo2);
+        assert_not_equals(e.destination.getState(), navState1);
+        assert_equals(e.destination.getState().statevar, navState1.statevar);
+
+        // Update just state - this also tests the case where the url does
+        // not change.
+        controller.redirect("#redirect2", { state: navState2 });
+        assert_equals(location.hash, start_hash);
+        assert_equals(new URL(e.destination.url).hash, "#redirect2");
+        assert_equals(e.info, navInfo2);
+        assert_not_equals(e.destination.getState(), navState2);
+        assert_equals(e.destination.getState().statevar, navState2.statevar);
+
+        // Explicit undefined is treated as absent.
+        controller.redirect("#redirect2", { info: undefined, state: undefined });
+        assert_equals(location.hash, start_hash);
+        assert_equals(new URL(e.destination.url).hash, "#redirect2");
+        assert_equals(e.info, navInfo2);
+        assert_not_equals(e.destination.getState(), navState2);
+        assert_equals(e.destination.getState().statevar, navState2.statevar);
+      }),
+    });
+  });
+  await navigation.navigate("#push", { info: navInfo0, state: navState0 }).committed;
+  assert_equals(location.hash, "#redirect2");
+  assert_equals(navigation.entries().length, start_length + 1);
+  assert_equals(navigation.currentEntry.getState().statevar, navState2.statevar);
+}, "precommitHandler redirect() with options dictionary");
+</script>
+</body>
diff --git a/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-redirect-push.html b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-redirect-push.html
new file mode 100644
index 00000000000..de75198d975
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-redirect-push.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  let start_length = navigation.entries().length;
+  let start_hash = location.hash;
+  navigation.onnavigate = t.step_func(e => {
+    e.intercept({
+      precommitHandler: t.step_func(controller => {
+        assert_equals(location.hash, start_hash);
+        assert_equals(new URL(e.destination.url).hash, "#push");
+
+        controller.redirect("#redirect1");
+        assert_equals(location.hash, start_hash);
+        assert_equals(new URL(e.destination.url).hash, "#redirect1");
+
+        controller.redirect("#redirect2");
+        assert_equals(location.hash, start_hash);
+        assert_equals(new URL(e.destination.url).hash, "#redirect2");
+      }),
+    });
+  });
+  await navigation.navigate("#push").committed;
+  assert_equals(location.hash, "#redirect2");
+  assert_equals(navigation.entries().length, start_length + 1);
+}, "precommitHandler redirect() push");
+</script>
+</body>
diff --git a/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-redirect-replace.html b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-redirect-replace.html
new file mode 100644
index 00000000000..049909fefde
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-redirect-replace.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  let start_length = navigation.entries().length;
+  let start_hash = location.hash;
+  navigation.onnavigate = t.step_func(e => {
+    e.intercept({
+      precommitHandler: t.step_func(controller => {
+        assert_equals(location.hash, start_hash);
+        assert_equals(new URL(e.destination.url).hash, "#replace");
+
+        controller.redirect("#redirect1");
+        assert_equals(location.hash, start_hash);
+        assert_equals(new URL(e.destination.url).hash, "#redirect1");
+
+        controller.redirect("#redirect2");
+        assert_equals(location.hash, start_hash);
+        assert_equals(new URL(e.destination.url).hash, "#redirect2");
+      }),
+    });
+  });
+  await navigation.navigate("#replace", { history: "replace" }).committed;
+  assert_equals(location.hash, "#redirect2");
+  assert_equals(navigation.entries().length, start_length);
+}, "precommitHandler redirect() replace");
+</script>
+</body>
diff --git a/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-redirect-throws.html b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-redirect-throws.html
new file mode 100644
index 00000000000..b4592712010
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-redirect-throws.html
@@ -0,0 +1,101 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+
+promise_test(async t => {
+  let precommit_controller;
+  navigation.onnavigate = t.step_func(e => {
+    e.intercept({ precommitHandler: async controller => precommit_controller = controller });
+  });
+  await navigation.navigate("#").finished;
+  assert_throws_dom("InvalidStateError", () => precommit_controller.redirect("#"));
+}, "redirect() after finish");
+
+promise_test(async t => {
+  let precommit_controller;
+  navigation.onnavigate = t.step_func(e => {
+    e.intercept({
+      precommitHandler: async controller => precommit_controller = controller,
+      handler: t.step_func(async () => {
+        assert_throws_dom("InvalidStateError", () => precommit_controller.redirect("#"));
+      })
+    });
+  });
+  await navigation.navigate("#").finished;
+}, "redirect() after commit");
+
+promise_test(async t => {
+  let i = document.createElement("iframe");
+  i.src = "about:blank";
+  document.body.appendChild(i);
+  i.contentWindow.navigation.onnavigate = t.step_func(e => {
+    e.intercept({
+      precommitHandler: t.step_func(controller => {
+        let iframe_constructor = i.contentWindow.DOMException;
+        i.remove();
+        assert_throws_dom("InvalidStateError", iframe_constructor, () => controller.redirect("#"));
+      })
+    });
+  });
+  i.contentWindow.navigation.navigate("#");
+}, "redirect() in detached iframe");
+
+promise_test(async t => {
+  navigation.onnavigate = t.step_func(e => {
+    e.intercept({ precommitHandler: t.step_func(controller => {
+      assert_throws_dom("SyntaxError", () => controller.redirect("https://example.com\u0000mozilla.org"));
+    })});
+  });
+  await navigation.navigate("#").finished;
+}, "redirect() to invalid url");
+
+promise_test(async t => {
+  navigation.onnavigate = t.step_func(e => {
+    e.intercept({ precommitHandler: t.step_func(controller => {
+      assert_throws_dom("SecurityError", () => controller.redirect("https://example.com"));
+    })});
+  });
+  await navigation.navigate("#").finished;
+}, "redirect() to cross-origin url");
+
+promise_test(async t => {
+  // See https://github.com/whatwg/html/issues/5380 for why not `new SharedArrayBuffer()`
+  const buffer = new WebAssembly.Memory({ shared:true, initial:1, maximum:1 }).buffer;
+
+  navigation.onnavigate = t.step_func(e => {
+    e.intercept({ precommitHandler: t.step_func(controller => {
+      assert_throws_dom("DataCloneError", () => {
+        controller.redirect(location.href, { state: buffer });
+      });
+    })});
+  });
+  await navigation.navigate("#").finished;
+}, "redirect() with an unserializable state object");
+
+promise_test(async t => {
+  navigation.onnavigate = t.step_func(e => {
+    e.intercept({ precommitHandler: t.step_func(controller => {
+      assert_throws_dom("InvalidStateError", () => controller.redirect("#"));
+    })});
+  });
+  await navigation.reload().finished;
+}, "redirect() reload");
+
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  await navigation.navigate("#forward").finished;
+
+  navigation.onnavigate = t.step_func(e => {
+    e.intercept({ precommitHandler: t.step_func(controller => {
+      assert_throws_dom("InvalidStateError", () => controller.redirect("#"));
+    })});
+  });
+  await navigation.back().finished;
+}, "redirect() traverse");
+</script>
+</body>
diff --git a/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-reload.html b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-reload.html
new file mode 100644
index 00000000000..0fd5da33e4c
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-reload.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../navigation-methods/return-value/resources/helpers.js"></script>
+<script src="resources/precommitHandler-helpers.js"></script>
+<body>
+<script>
+let tests = [
+  { mode: "rejectBeforeCommit", description: "precommitHandler for a reload navigation, reject before commit" },
+  { mode: "rejectAfterCommit",  description: "precommitHandler for a reload navigation, reject after commit" },
+  { mode: "success",            description: "precommitHandler for a reload navigation, success" },
+];
+
+for (let test of tests) {
+  promise_test(t => testDeferredCommit(t, "reload", test.mode), test.description);
+}
+</script>
+</body>
diff --git a/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-replace.html b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-replace.html
new file mode 100644
index 00000000000..7c28c99af1e
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-replace.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../navigation-methods/return-value/resources/helpers.js"></script>
+<script src="resources/precommitHandler-helpers.js"></script>
+<body>
+<script>
+let tests = [
+  { mode: "rejectBeforeCommit", description: "precommitHandler for a replace navigation, reject before commit" },
+  { mode: "rejectAfterCommit",  description: "precommitHandler for a replace navigation, reject after commit" },
+  { mode: "success",            description: "precommitHandler for a replace navigation, success" },
+];
+
+for (let test of tests) {
+  promise_test(t => testDeferredCommit(t, "replace", test.mode), test.description);
+}
+</script>
+</body>
diff --git a/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-traversal-commit-new-navigation-before-commit.html b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-traversal-commit-new-navigation-before-commit.html
new file mode 100644
index 00000000000..226f332e421
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-traversal-commit-new-navigation-before-commit.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../navigation-methods/return-value/resources/helpers.js"></script>
+<body>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  await navigation.navigate("#1").finished;
+
+  let navigateerror_called = false;
+  navigation.onnavigateerror = t.step_func(() => {
+    navigateerror_called = true;
+    assert_equals(location.hash, "#1");
+  });
+
+  // Go back and wait for the navigate event to fire. This traversal will be deferred.
+  let promises_should_not_commit = assertBothRejectDOM(t, navigation.back(), "AbortError");
+  navigation.addEventListener("navigate", e => e.intercept({ precommitHandler: () => new Promise(r => t.step_timeout(r, 1000)) }), { once: "true" });
+  await new Promise(resolve => navigation.addEventListener("navigate", resolve, { once: "true" }));
+
+  // While the traversal is deferred, start a new navigation and commit immediately.
+  navigation.addEventListener("navigate", e => e.intercept(), { once: "true" });
+  let promises_fulfilled = navigation.navigate("#2");
+
+  await promises_should_not_commit;
+  await assertBothFulfill(t, promises_fulfilled, navigation.currentEntry);
+
+  assert_equals(location.hash, "#2");
+  assert_true(navigateerror_called);
+}, "Cancel a precommitHandler traversal before commit by starting a new navigation");
+</script>
+</body>
diff --git a/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-traversal-window-stop-before-commit.html b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-traversal-window-stop-before-commit.html
new file mode 100644
index 00000000000..c45f8268f2a
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-traversal-window-stop-before-commit.html
@@ -0,0 +1,56 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../navigation-methods/return-value/resources/helpers.js"></script>
+<body>
+<script>
+promise_test(async t => {
+  // Wait for after the load event because window.stop() hangs the test harness
+  // if called before the load event.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
+
+  await navigation.navigate("#1").finished;
+  await navigation.navigate("#2").finished;
+  assert_equals(navigation.entries().length, start_length + 2);
+  assert_equals(navigation.currentEntry.index, start_index + 2);
+
+  let stopped_first_traverse = false;
+  navigation.onnavigate = t.step_func(e => {
+    if (!stopped_first_traverse) {
+      stopped_first_traverse = true;
+      t.step_timeout(() => window.stop(), 0);
+    }
+    e.intercept({ precommitHandler: () => new Promise(r => t.step_timeout(r, 10)) });
+  });
+
+  let navigatesuccess_called = false;
+  let navigateerror_called = false;
+  navigation.onnavigatesuccess = t.step_func(() => {
+    navigatesuccess_called = true;
+    assert_equals(location.hash, "#1");
+  });
+  navigation.onnavigateerror = t.step_func(() => {
+    navigateerror_called = true;
+    assert_equals(location.hash, "#2");
+  });
+
+  await assertBothRejectDOM(t, navigation.back(), "AbortError");
+
+  assert_equals(navigation.currentEntry.index, start_index + 2);
+  assert_equals(location.hash, "#2");
+  assert_true(navigateerror_called);
+  assert_false(navigatesuccess_called);
+
+  // Ensure navigation.entries() remains in sync with the session history in
+  // spite of the window.stop(), and navigation.back() does not skip over #1.
+  await navigation.back().finished;
+
+  assert_equals(navigation.currentEntry.index, start_index + 1);
+  assert_equals(location.hash, "#1");
+  assert_true(navigatesuccess_called);
+}, " precommitHandler traverse with window.stop() before commit");
+</script>
+</body>
diff --git a/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-traverse.html b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-traverse.html
new file mode 100644
index 00000000000..f152129ce26
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-traverse.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../navigation-methods/return-value/resources/helpers.js"></script>
+<script src="resources/precommitHandler-helpers.js"></script>
+<body>
+<script>
+let start_index = navigation.currentEntry.index;
+
+// Note that `destinationIndex` is chosen relative to `start_index`, and the
+// tests begin at `start_index` + 4. So:
+// * "rejectBeforeCommit" will try to go back 4 steps and fail.
+// * "rejectAfterCommit" will go back 3 steps, then reject after commit.
+// * "success" will go forward 2 steps
+let tests = [
+  { mode: "rejectBeforeCommit", destinationIndex: start_index, description: "precommitHandler for a traverse navigation, reject before commit" },
+  { mode: "rejectAfterCommit",  destinationIndex: start_index + 1, description: "precommitHandler for a traverse navigation, reject after commit" },
+  { mode: "success",            destinationIndex: start_index + 3, description: "precommitHandler for a traverse navigation, success" }
+];
+
+// Push a bunch of history entries so each test case can target a unique entry.
+history.pushState("", "", "#1");
+history.pushState("", "", "#2");
+history.pushState("", "", "#3");
+history.pushState("", "", "#4");
+
+let onload_promise = new Promise(resolve => window.onload = resolve);
+for (let test of tests) {
+  promise_test(async t => {
+    await onload_promise;
+    await testDeferredCommit(t, "traverse", test.mode, test.destinationIndex);
+  }, test.description);
+}
+</script>
+</body>
diff --git a/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-uncancelable.html b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-uncancelable.html
new file mode 100644
index 00000000000..af320b4e32c
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-uncancelable.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<iframe id="i" src="/common/blank.html"></iframe>
+<body>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  await i.contentWindow.navigation.navigate("#1").finished;
+
+  i.contentWindow.navigation.onnavigate = t.step_func(e => {
+    assert_false(e.cancelable);
+    // intercept() with a precommitHandler is forbidden because e.cancelable is false.
+    let iframe_constructor = i.contentWindow.DOMException;
+    assert_throws_dom("InvalidStateError", iframe_constructor,
+                      () => e.intercept({ precommitHandler: async () => {} }));
+  });
+  await i.contentWindow.navigation.back().finished;
+}, "precommitHandler for an uncancelable traverse navigation");
+</script>
+</body>
diff --git a/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-window-stop-before-commit.html b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-window-stop-before-commit.html
new file mode 100644
index 00000000000..857a21ed3a9
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/precommit-handler/precommitHandler-window-stop-before-commit.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../navigation-methods/return-value/resources/helpers.js"></script>
+<body>
+<script>
+promise_test(async t => {
+  // Wait for after the load event because window.stop() hangs the test harness
+  // if called before the load event.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  navigation.onnavigate = e => {
+    e.intercept({ precommitHandler: async () => {} });
+  };
+
+  navigation.onnavigatesuccess = t.unreached_func("navigatesuccess must not fire");
+  let navigateerror_called = false;
+  navigation.onnavigateerror = t.step_func(() => {
+    navigateerror_called = true;
+    assert_equals(location.hash, "");
+  });
+
+  let promises = navigation.navigate("#ShouldNotCommit");
+  assert_equals(location.hash, "");
+
+  window.stop();
+  await assertBothRejectDOM(t, promises, "AbortError");
+
+  assert_equals(location.hash, "");
+  assert_true(navigateerror_called);
+}, " precommitHandler with window.stop() before commit");
+</script>
+</body>
diff --git a/tests/wpt/tests/navigation-api/precommit-handler/resources/precommitHandler-helpers.js b/tests/wpt/tests/navigation-api/precommit-handler/resources/precommitHandler-helpers.js
new file mode 100644
index 00000000000..1338617681f
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/precommit-handler/resources/precommitHandler-helpers.js
@@ -0,0 +1,93 @@
+window.testDeferredCommit = async (t, navigationType, mode, destinationIndex = 0) => {
+  let startHash = location.hash;
+  let destinationHash;
+  const err = new Error("boo!");
+
+  let popstate_fired = false;
+  window.addEventListener("popstate", () => popstate_fired = true, { once : true });
+  let navigatesuccess_fired = false;
+  navigation.addEventListener("navigatesuccess", () => navigatesuccess_fired = true, { once : true });
+  let navigateerror_fired = false;
+  navigation.addEventListener("navigateerror", () => navigateerror_fired = true, { once : true });
+
+  // mode-specific logic for the navigate event handler
+  let navigate_helpers = {
+    rejectBeforeCommit : async (e) => { return Promise.reject("Should never run") },
+    rejectAfterCommit : async (e) => {
+      assert_equals(location.hash, destinationHash, "hash after commit");
+      assert_equals(false, popstate_fired, "popstate before handler starts");
+      await new Promise(resolve => t.step_timeout(resolve, 0));
+      assert_equals(navigationType == "traverse", popstate_fired, "popstate fired after handler async step");
+      return Promise.reject(err);
+    },
+    success : async (e) => {
+      assert_equals(location.hash, destinationHash, "hash after commit");
+      assert_equals(false, popstate_fired, "popstate before handler starts");
+      await new Promise(resolve => t.step_timeout(resolve, 0));
+      assert_equals(navigationType == "traverse", popstate_fired, "popstate fired after handler async step");
+      return new Promise(resolve => t.step_timeout(resolve, 0));
+    },
+  }
+
+  navigation.addEventListener("navigate", e => {
+    e.intercept({ precommitHandler: t.step_func(async () => {
+                    assert_equals(e.navigationType, navigationType);
+                    assert_equals(location.hash, startHash, "start hash");
+                    assert_false(popstate_fired, "popstate fired at handler start");
+
+                    await new Promise(resolve => t.step_timeout(resolve, 0));
+                    assert_equals(location.hash, startHash, "hash after first async step");
+                    assert_false(popstate_fired, "popstate fired after first async step");
+
+                    if (mode == "rejectBeforeCommit")
+                      return Promise.reject(err);
+                  }),
+                  handler: t.step_func(navigate_helpers[mode])
+                });
+  }, { once: true });
+
+  let startingIndex = navigation.currentEntry.index;
+  let expectedIndexOnCommit;
+
+  let promises;
+  if (navigationType === "push" || navigationType === "replace") {
+    destinationHash = (startHash === "" ? "#" : startHash) + "a";
+    promises = navigation.navigate(destinationHash, { history: navigationType });
+    expectedIndexOnCommit = (navigationType === "push") ? startingIndex + 1
+                                                        : startingIndex;
+  } else if (navigationType === "reload") {
+    destinationHash = startHash;
+    promises = navigation.reload();
+    expectedIndexOnCommit = startingIndex;
+  } else if (navigationType === "traverse") {
+    let destinationEntry = navigation.entries()[destinationIndex];
+    destinationHash = new URL(destinationEntry.url).hash;
+    promises = navigation.traverseTo(destinationEntry.key);
+    expectedIndexOnCommit = destinationIndex;
+  }
+
+  if (mode === "rejectBeforeCommit") {
+    await assertBothRejectExactly(t, promises, err);
+    assert_equals(location.hash, startHash, "hash after promise resolution");
+    assert_false(popstate_fired, "popstate fired after promise resolution");
+    assert_false(navigatesuccess_fired, "navigatesuccess fired");
+    assert_true(navigateerror_fired, "navigateerror fired");
+    assert_equals(navigation.currentEntry.index, startingIndex);
+  } else if (mode === "rejectAfterCommit") {
+    await promises.committed;
+    await assertCommittedFulfillsFinishedRejectsExactly(t, promises, navigation.currentEntry, err);
+    assert_equals(location.hash, destinationHash, "hash after promise resolution");
+    assert_equals(navigationType == "traverse", popstate_fired, "popstate fired after promise resolution");
+    assert_false(navigatesuccess_fired, "navigatesuccess fired");
+    assert_true(navigateerror_fired, "navigateerror fired");
+    assert_equals(navigation.currentEntry.index, expectedIndexOnCommit);
+  } else {
+    await promises.committed;
+    await assertBothFulfill(t, promises, navigation.currentEntry);
+    assert_equals(location.hash, destinationHash, "hash after promise resolution");
+    assert_equals(navigationType == "traverse", popstate_fired, "popstate fired after promise resolution");
+    assert_true(navigatesuccess_fired, "navigatesuccess fired");
+    assert_false(navigateerror_fired, "navigateerror fired");
+    assert_equals(navigation.currentEntry.index, expectedIndexOnCommit);
+  }
+}
diff --git a/tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-before-after-transition-commit.html b/tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-before-after-transition-commit.html
deleted file mode 100644
index 3b32e72bb11..00000000000
--- a/tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-before-after-transition-commit.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-<div style="height: 1000px; width: 1000px;"></div>
-<div id="frag"></div>
-<script>
-promise_test(async t => {
-  // Wait for after the load event so that the navigation doesn't get converted
-  // into a replace navigation.
-  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-  assert_equals(window.scrollY, 0);
-  await navigation.navigate("#frag").finished;
-  assert_not_equals(window.scrollY, 0);
-  navigation.onnavigate = e => {
-    e.intercept({
-      scroll: "manual",
-      commit: "after-transition",
-      handler: t.step_func(() => {
-        assert_throws_dom("InvalidStateError", () => e.scroll());
-        assert_not_equals(window.scrollY, 0);
-        e.commit();
-        e.scroll();
-        assert_equals(window.scrollY, 0);
-      })
-    });
-  }
-  await navigation.back().finished;
-  assert_equals(window.scrollY, 0);
-}, "scroll: scroll() before commit()");
-</script>
-</body>
diff --git a/tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-in-precommit-handler.html b/tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-in-precommit-handler.html
new file mode 100644
index 00000000000..3f92b5276a3
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-in-precommit-handler.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<div style="height: 1000px; width: 1000px;"></div>
+<div id="frag"></div>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+  assert_equals(window.scrollY, 0);
+  await navigation.navigate("#frag").finished;
+  assert_not_equals(window.scrollY, 0);
+  navigation.onnavigate = e => {
+    e.intercept({
+      scroll: "manual",
+      precommitHandler: t.step_func(() => {
+        assert_throws_dom("InvalidStateError", () => e.scroll());
+        assert_not_equals(window.scrollY, 0);
+      }),
+      handler: t.step_func(() => {
+        e.scroll();
+        assert_equals(window.scrollY, 0);
+      })
+    });
+  }
+  await navigation.back().finished;
+  assert_equals(window.scrollY, 0);
+}, "scroll: scroll() in precommitHandler throws");
+</script>
+</body>
diff --git a/tests/wpt/tests/paint-timing/paint-timing-mixin.html b/tests/wpt/tests/paint-timing/paint-timing-mixin.html
index 65c1062a059..048c985c7c7 100644
--- a/tests/wpt/tests/paint-timing/paint-timing-mixin.html
+++ b/tests/wpt/tests/paint-timing/paint-timing-mixin.html
@@ -26,8 +26,12 @@
     });
     const entry = await performance_entry_promise;
     assert_greater_than(entry.paintTime, reference_time);
-    assert_greater_than(entry.presentationTime, entry.paintTime);
-    assert_equals(entry.presentationTime, entry.startTime);
+    if ("presentationTime" in entry && entry.presentationTime !== null) {
+      assert_greater_than(entry.presentationTime, entry.paintTime);
+      assert_equals(entry.presentationTime, entry.startTime);
+    } else {
+      assert_equals(entry.paintTime, entry.startTime);
+    }
 }, "Paint timing entries should expose paintTime and presentationTime");
 </script>
 </body>
diff --git a/tests/wpt/tests/paint-timing/resources/utils.js b/tests/wpt/tests/paint-timing/resources/utils.js
index ed58c957c97..41c76d68266 100644
--- a/tests/wpt/tests/paint-timing/resources/utils.js
+++ b/tests/wpt/tests/paint-timing/resources/utils.js
@@ -51,7 +51,7 @@ async function test_fcp(label, before_assert_fcp_func) {
     main.className = 'contentful';
     const entry = await assertFirstContentfulPaint(t);
     if ("paintTime" in entry) {
-      if ("presentationTime" in entry) {
+      if ("presentationTime" in entry && entry.presentationTime !== null) {
         assert_greater_than(entry.presentationTime, entry.paintTime);
         assert_equals(entry.startTime, entry.presentationTime);
       } else {
diff --git a/tests/wpt/tests/permissions-policy/resources/digital-credentials-create.html b/tests/wpt/tests/permissions-policy/resources/digital-credentials-create.html
new file mode 100644
index 00000000000..aafd436282e
--- /dev/null
+++ b/tests/wpt/tests/permissions-policy/resources/digital-credentials-create.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script type="module">
+    import { makeCreateOptions } from "/digital-credentials/support/helper.js";
+    const type = "availability-result";
+    async function notify() {
+        if (!navigator.userActivation.isActive) {
+            await test_driver.bless("user activation", null, window);
+        }
+        let enabled = undefined;
+        try {
+            await navigator.credentials.create(makeCreateOptions([]));
+        } catch (e) {
+            switch (e.name) {
+                case "NotAllowedError":
+                    enabled = false;
+                    break;
+                case "TypeError":
+                    enabled = true;
+                    break;
+                default:
+                    throw e;
+            }
+        } finally {
+            window.parent.postMessage({ type, enabled }, "*");
+        }
+    }
+    test_driver.set_test_context(parent);
+    window.onload = notify;
+</script>
+<body>
+    <h1>Digital Credentials iframe</h1>
+</body>
diff --git a/tests/wpt/tests/png/apng/manual/fcTL-delay-zero-num-manual.html b/tests/wpt/tests/png/apng/manual/fcTL-delay-zero-num-manual.html
index 561d01e4db4..130500d24db 100644
--- a/tests/wpt/tests/png/apng/manual/fcTL-delay-zero-num-manual.html
+++ b/tests/wpt/tests/png/apng/manual/fcTL-delay-zero-num-manual.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://www.w3.org/TR/png-3/#apng-frame-based-animation">
 <link rel="help" href="https://www.w3.org/TR/png-3/#fcTL-chunk">
-<meta name="assert" content="If the the value of the numerator is 0 the decoder should render the next frame as quickly as possible, though viewers may impose a reasonable lower bound.">
+<meta name="assert" content="If the value of the numerator is 0 the decoder should render the next frame as quickly as possible, though viewers may impose a reasonable lower bound.">
 <style>
     .test {
         width: 128px;
diff --git a/tests/wpt/tests/png/apng/resources/source.html b/tests/wpt/tests/png/apng/resources/source.html
index cca7063cff4..56c34fc8814 100644
--- a/tests/wpt/tests/png/apng/resources/source.html
+++ b/tests/wpt/tests/png/apng/resources/source.html
@@ -527,7 +527,7 @@ IEND => [],
 
 <div class="case">
 <p>Zero numerator.
-<blockquote cite="#apng"><p>If the the value of the numerator is 0 the decoder should render the next frame as quickly as possible, though viewers may impose a reasonable lower bound.</blockquote>
+<blockquote cite="#apng"><p>If the value of the numerator is 0 the decoder should render the next frame as quickly as possible, though viewers may impose a reasonable lower bound.</blockquote>
 <p>This should flash cyan for a short period of time (perhaps zero), then magenta for the same short period of time, then blue for half a second, then yellow for one second, then repeat.
 <png>
 IHDR => [W, H],
diff --git a/tests/wpt/tests/pointerevents/pointerevent_boundary_events_before_pointerrawupdate.https.html b/tests/wpt/tests/pointerevents/pointerevent_boundary_events_before_pointerrawupdate.https.html
new file mode 100644
index 00000000000..4de52758126
--- /dev/null
+++ b/tests/wpt/tests/pointerevents/pointerevent_boundary_events_before_pointerrawupdate.https.html
@@ -0,0 +1,76 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale:1">
+<title>Pointer boundary events should be fired before `pointerrawupdate`</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script>
+"use strict";
+
+/**
+ * "fire a pointer event" defines as:
+ * > Before firing this event, the user agent SHOULD treat the target as if the
+ * > pointing device has moved over it from the previousTarget for the purpose
+ * > of ensuring event ordering [UIEVENTS]. If the needsOverEvent flag is set,
+ * > a pointerover event is needed even if the target element is the same.
+ *
+ * Thus, pointer boundary events should be fired before `pointerrawupdate`
+ * event if they are required.  This test checks that.
+ */
+
+addEventListener("DOMContentLoaded", () => {
+  promise_test(async () => {
+    let events = [];
+    function logEvent(event) {
+      events.push(event.type);
+    }
+    const initialDiv = document.getElementById("init");
+    await new test_driver.Actions()
+      .pointerMove(0, 0, {origin: initialDiv})
+      .send();
+    const target = document.getElementById("target");
+    for (const type of ["pointerrawupdate", "pointermove",
+                        "pointerenter", "pointerover",
+                        "pointerleave", "pointerout",
+                        "mouseover", "mouseenter"]) {
+      target.addEventListener(type, logEvent);
+    }
+    // Neither "mouseover" nor "mouseenter" should be fired before
+    // "pointerrawupdate", they should be fired after "pointerrawupdate"
+    // at least.
+    target.addEventListener("pointerrawupdate", () => {
+      for (const type of ["mouseover", "mouseenter"]) {
+        target.removeEventListener(type, logEvent);
+      }
+    }, {once: true});
+    await new test_driver.Actions()
+      .pointerMove(0, 0, {origin: target})
+      .send();
+    assert_equals(
+      events.join(", "),
+      [
+        "pointerover",
+        "pointerenter",
+        "pointerrawupdate",
+        "pointermove",
+      ].join(", ")
+    );
+  });
+}, {once: true});
+</script>
+<style>
+div {
+  width: 64px;
+  height: 64px;
+}
+</style>
+<body>
+  <div id="init"></div>
+  <div id="target"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/pointerevents/pointerevent_click_on_chorded_mouse_button.tentative.html b/tests/wpt/tests/pointerevents/pointerevent_click_on_chorded_mouse_button.tentative.html
index 4c643175107..096802d50ee 100644
--- a/tests/wpt/tests/pointerevents/pointerevent_click_on_chorded_mouse_button.tentative.html
+++ b/tests/wpt/tests/pointerevents/pointerevent_click_on_chorded_mouse_button.tentative.html
@@ -21,71 +21,76 @@
     user-select: none;
   }
 </style>
-<body onload="run()">
+<body>
   <div id="target"></div>
   <div id="done"></div>
 </body>
 <script>
   "use strict";
 
+  let target = null;
+  let done = null;
   let event_log = [];
 
   function eventLogger(e) {
-    event_log.push(e.type);
+    event_log.push(`{type: ${e.type}, button: ${e.button}, buttons: ${e.buttons}}`);
   }
 
-  function run() {
-    var target = document.getElementById("target");
-    var done = document.getElementById("done");
-
+  promise_setup(async () => {
+    await new Promise((resolve) => {
+      window.addEventListener('load', resolve, { once: true });
+    });
+    target = document.getElementById("target");
+    done = document.getElementById("done");
     ["click", "auxclick"].forEach(ename => {
       target.addEventListener(ename, eventLogger);
     });
+  });
 
-    promise_test(async test => {
-      event_log = [];
+  promise_test(async test => {
+    event_log = [];
 
-      let done_click_promise = getEvent("click", done);
+    let done_click_promise = getEvent("click", done);
 
-      let actions = new test_driver.Actions();
-      actions = actions
-          .pointerMove(0,0, {origin:target})
-          .pointerDown({button:actions.ButtonType.LEFT})
-          .pointerDown({button:actions.ButtonType.MIDDLE})
-          .pointerUp({button:actions.ButtonType.MIDDLE})
-          .pointerUp({button:actions.ButtonType.LEFT})
-          .pointerMove(0,0, {origin:done})
-          .pointerDown()
-          .pointerUp();
+    let actions = new test_driver.Actions();
+    actions = actions
+        .pointerMove(0,0, {origin:target})
+        .pointerDown({button:actions.ButtonType.LEFT})
+        .pointerDown({button:actions.ButtonType.MIDDLE})
+        .pointerUp({button:actions.ButtonType.MIDDLE})
+        .pointerUp({button:actions.ButtonType.LEFT})
+        .pointerMove(0,0, {origin:done})
+        .pointerDown()
+        .pointerUp();
 
-      await actions.send();
-      await done_click_promise;
+    await actions.send();
+    await done_click_promise;
 
-      assert_equals(event_log.toString(), "auxclick,click",
-          "received click-like events");
-    }, "Chorded button sequence L-down M-down M-up L-up");
+    assert_equals(event_log.toString(), "{type: auxclick, button: 1, buttons: 1},{type: click, button: 0, buttons: 0}",
+        "received click-like events");
+  }, "Chorded button sequence L-down M-down M-up L-up");
 
-    promise_test(async test => {
-      event_log = [];
+  promise_test(async test => {
+    event_log = [];
 
-      let done_click_promise = getEvent("click", done);
+    let done_click_promise = getEvent("click", done);
 
-      let actions = new test_driver.Actions();
-      actions = actions
-          .pointerMove(0,0, {origin:target})
-          .pointerDown({button:actions.ButtonType.MIDDLE})
-          .pointerDown({button:actions.ButtonType.LEFT})
-          .pointerUp({button:actions.ButtonType.LEFT})
-          .pointerUp({button:actions.ButtonType.MIDDLE})
-          .pointerMove(0,0, {origin:done})
-          .pointerDown()
-          .pointerUp();
+    let actions = new test_driver.Actions();
+    actions = actions
+        .pointerMove(0,0, {origin:target})
+        .pointerDown({button:actions.ButtonType.MIDDLE})
+        .pointerDown({button:actions.ButtonType.LEFT})
+        .pointerUp({button:actions.ButtonType.LEFT})
+        .pointerUp({button:actions.ButtonType.MIDDLE})
+        .pointerMove(0,0, {origin:done})
+        .pointerDown()
+        .pointerUp();
 
-      await actions.send();
-      await done_click_promise;
+    await actions.send();
+    await done_click_promise;
+
+    assert_equals(event_log.toString(), "{type: click, button: 0, buttons: 4},{type: auxclick, button: 1, buttons: 0}",
+        "received click-like events");
+  }, "Chorded button sequence M-down L-down L-up M-up");
 
-      assert_equals(event_log.toString(), "click,auxclick",
-          "received click-like events");
-    }, "Chorded button sequence M-down L-down L-up M-up");
-  }
 </script>
diff --git a/tests/wpt/tests/pointerevents/pointerevent_pointerout_no_pointer_movement.html b/tests/wpt/tests/pointerevents/pointerevent_pointerout_no_pointer_movement.html
index 856f2ce37ce..1af16659326 100644
--- a/tests/wpt/tests/pointerevents/pointerevent_pointerout_no_pointer_movement.html
+++ b/tests/wpt/tests/pointerevents/pointerevent_pointerout_no_pointer_movement.html
@@ -1,85 +1,62 @@
 <!doctype html>
-<html>
-<head>
-<title>The pointerout event should not be fired if the pointer doesn't move</title>
+<title>
+  Layout change under a stationary pointer fires boundary events and no pointermove event
+</title>
 <meta name="viewport" content="width=device-width">
-<link rel="help" href="https://github.com/w3c/pointerevents/issues/457">
+<link rel="help"
+  href="https://w3c.github.io/pointerevents/#boundary-events-caused-by-layout-changes">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-actions.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
+<script src="pointerevent_support.js"></script>
 <style>
-#target{
-  width:100px;
-  height:100px;
-  background-color:red;
-}
+  div {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 50px;
+    height: 50px;
+  }
 
-#overlay{
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background-color: rgba(0,0,0,0.2);
-  z-index: 1000;
-  text-align: center;
-  display:none;
-}
+  #overlay {
+    z-index: 1000;
+    display: none;
+  }
 </style>
-</head>
-<body>
-<h1>The pointerout event should not be fired if the pointer doesn't move</h1>
-<h4>
-  Test Description: This test checks if the pointerout event dispatched unexpectedly.
-  <ol>
-    <li>Click on the black rectangle.
-    <li>Don't move mouse after clicking.
-  </ol>
-</h4>
-<p>
 <div id="target"></div>
 <div id="overlay"></div>
-<div id="log"></div>
 <script>
-function waitForAnimationFrame() {
-  return new Promise(resolve => {
-    requestAnimationFrame(() => {
-      requestAnimationFrame(resolve);
-    });
-  });
-}
+  "use strict";
 
-promise_test(async () => {
   const target = document.getElementById("target");
+  const overlay = document.getElementById("overlay");
 
-  let out_event_count = 0;
-  target.addEventListener("pointerout", function() {
-    out_event_count++;
+  let logging_active = false;
+  let num_pointermoves = 0;
+
+  target.addEventListener("click", () => logging_active = true);
+  target.addEventListener("pointermove", () => {
+    if (logging_active) num_pointermoves++;
   });
 
-  // Wait for the click event on target element and update display style on
-  // overlay element.
-  const promise = new Promise(resolve => {
-    target.addEventListener("click", async function() {
-      const overlay = document.getElementById("overlay");
-      overlay.style.display= 'block';
-      await waitForAnimationFrame();
+  promise_test(async t => {
+    await test_driver.click(target);
 
-      overlay.style.display= 'none'
-      await waitForAnimationFrame();
+    let pointerout_promise = getEvent("pointerout", target);
+    overlay.style.display = "block";
+    await pointerout_promise;
 
-      resolve();
-    }, { once: true });
-  });
+    let pointerover_promise = getEvent("pointerover", target);
+    overlay.style.display = "none";
+    await waitForAnimationFrames(2);
+    // Why does Chrome time out at the next line w/o the redundant wait above?
+    // Does chrome require something to request a main frame in order to detect
+    // the new pointer target after the style update to generate the event?
+    // https://crbug.com/413595088
+    await pointerover_promise;
 
-  // Click target.
-  test_driver.click(target);
-  await promise;
-
-  assert_equals(out_event_count, 0, "The pointerout event should not be fired");
-}, "The pointerout event should not be fired if the pointer doesn't move");
+    assert_equals(num_pointermoves, 0, "no pointermove events are expected");
+  }, "Layout change under a stationary pointer fires boundary events and no pointermove event");
 </script>
-</body>
-</html>
diff --git a/tests/wpt/tests/pointerevents/pointerevent_pointerrawupdate_after_adoption_from_child.https.html b/tests/wpt/tests/pointerevents/pointerevent_pointerrawupdate_after_adoption_from_child.https.html
new file mode 100644
index 00000000000..9b67f776d04
--- /dev/null
+++ b/tests/wpt/tests/pointerevents/pointerevent_pointerrawupdate_after_adoption_from_child.https.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale:1">
+<title>`pointerrawupdate` events should be fired after the element is moved from the parent doc to a child doc</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script>
+"use strict";
+
+addEventListener("load", () => {
+  promise_test(async () => {
+    const iframe = document.querySelector("iframe");
+    const div = iframe.contentDocument.createElement("div");
+    div.style.width = "100px";
+    div.style.height = "100px";
+    iframe.contentDocument.body.appendChild(div);
+    let pointerrawupdateEvent;
+    div.addEventListener(
+      "pointerrawupdate",
+      event => pointerrawupdateEvent = event,
+      {once: true}
+    );
+    document.body.appendChild(div);
+    div.getBoundingClientRect();
+    await new test_driver.Actions()
+      .pointerMove(0, 0, {origin: div})
+      .pointerMove(1, 1, {origin: div})
+      .send();
+    assert_true(pointerrawupdateEvent !== undefined);
+  });
+}, {once: true});
+</script>
+</head>
+<body>
+  <iframe srcdoc=""></iframe>
+</body>
+</html>
diff --git a/tests/wpt/tests/pointerevents/pointerevent_pointerrawupdate_after_adoption_from_parent.https.html b/tests/wpt/tests/pointerevents/pointerevent_pointerrawupdate_after_adoption_from_parent.https.html
new file mode 100644
index 00000000000..132be023178
--- /dev/null
+++ b/tests/wpt/tests/pointerevents/pointerevent_pointerrawupdate_after_adoption_from_parent.https.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale:1">
+<title>`pointerrawupdate` events should be fired after the element is moved from a child doc to the parent doc</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script>
+"use strict";
+
+addEventListener("load", () => {
+  promise_test(async () => {
+    const iframe = document.querySelector("iframe");
+    const div = document.createElement("div");
+    div.style.width = "100px";
+    div.style.height = "100px";
+    document.body.appendChild(div);
+    let pointerrawupdateEvent;
+    div.addEventListener(
+      "pointerrawupdate",
+      event => pointerrawupdateEvent = event,
+      {once: true}
+    );
+    iframe.contentDocument.body.appendChild(div);
+    div.getBoundingClientRect();
+    await new test_driver.Actions()
+      .pointerMove(0, 0, {origin: div})
+      .pointerMove(1, 1, {origin: div})
+      .send();
+    assert_true(pointerrawupdateEvent !== undefined);
+  });
+}, {once: true});
+</script>
+</head>
+<body>
+  <iframe srcdoc=""></iframe>
+</body>
+</html>
diff --git a/tests/wpt/tests/pointerevents/pointerevent_pointerrawupdate_flush_pointercapture.https.html b/tests/wpt/tests/pointerevents/pointerevent_pointerrawupdate_flush_pointercapture.https.html
new file mode 100644
index 00000000000..1d444c75097
--- /dev/null
+++ b/tests/wpt/tests/pointerevents/pointerevent_pointerrawupdate_flush_pointercapture.https.html
@@ -0,0 +1,78 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale:1">
+<title>Pointer capture state should be updated before `pointerrawupdate`</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script>
+"use strict";
+
+/**
+ * "fire a pointer event" defines:
+ * > If the event is not a gotpointercapture, lostpointercapture, click,
+ * > auxclick or contextmenu event, run the process pending pointer capture
+ * > steps for this PointerEvent.
+ *
+ * This test checks whether `pointerrawupdate` event dispatcher processes
+ * the pending pointer capture state.
+ */
+
+addEventListener("DOMContentLoaded", () => {
+  promise_test(async () => {
+    let events = [];
+    function logEvent(event) {
+      events.push(`${event.type}@${event.target.id ? event.target.id : event.target.nodeName}`);
+    }
+    const initialDiv = document.getElementById("init");
+    await new test_driver.Actions()
+      .pointerMove(0, 0, {origin: initialDiv})
+      .send();
+    const target = document.getElementById("target");
+    const dest = document.getElementById("dest");
+    for (const type of ["pointerdown", "pointerup", "pointermove",
+                        "pointerrawupdate",
+                        "gotpointercapture", "lostpointercapture"]) {
+      target.addEventListener(type, logEvent);
+      dest.addEventListener(type, logEvent);
+    }
+    dest.addEventListener("pointerover", logEvent);
+    target.addEventListener("pointerdown", event => {
+      event.target.setPointerCapture(event.pointerId);
+    });
+    await new test_driver.Actions()
+      .pointerMove(0, 0, {origin: target})
+      .pointerDown()
+      .pointerMove(0, 0, {origin: dest})
+      .pointerUp()
+      .send();
+    assert_equals(
+      events.join(", "),
+      [
+        "pointerrawupdate@target", "pointermove@target", "pointerdown@target",
+        // "gotpointercapture" should be fired before "pointerrawupdate"
+        "gotpointercapture@target", "pointerrawupdate@target", "pointermove@target",
+        "pointerup@target", "lostpointercapture@target",
+        // Finally, "pointerover" should be fired on the destination
+        "pointerover@dest",
+      ].join(", ")
+    );
+  });
+}, {once: true});
+</script>
+<style>
+div {
+  min-height: 64px;
+}
+</style>
+</head>
+<body>
+  <div id="init"></div>
+  <div id="target"></div>
+  <div id="dest"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/pointerevents/pointerevent_pointerrawupdate_remove_target.https.html b/tests/wpt/tests/pointerevents/pointerevent_pointerrawupdate_remove_target.https.html
new file mode 100644
index 00000000000..2a7af77af0d
--- /dev/null
+++ b/tests/wpt/tests/pointerevents/pointerevent_pointerrawupdate_remove_target.https.html
@@ -0,0 +1,149 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale:1">
+<title>If a `pointerrawupdate` listener removes the target, `pointermove` should be fired its connected ancestor</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script>
+"use strict";
+
+/**
+ * `pointerrawupdate` is defined as:
+ * > The target of pointerrawupdate events might be different from the
+ * > pointermove events due to the fact that pointermove events might get
+ * > delayed or coalesced, and the final position of the event which is used
+ * > for finding the target could be different from its coalesced events.
+ *
+ * This checks whether `pointermove` is fired on the latest element underneath
+ * the pointer when the `pointerrawupdate` event listener removes its target.
+ */
+
+addEventListener("DOMContentLoaded", () => {
+  const testContainer = document.getElementById("testContainer");
+  let events = [];
+  function logEvent(event) {
+    if (event.eventPhase != Event.AT_TARGET) {
+      return;
+    }
+    events.push(`${event.type}@${event.target.id ? event.target.id : `<${event.target.nodeName}>`}`);
+  }
+  promise_test(async () => {
+    testContainer.innerHTML = "<div id=container><div id=init></div><div id=target></div></div>";
+    const initialDiv = document.getElementById("init");
+    await new test_driver.Actions()
+      .pointerMove(0, 0, {origin: initialDiv})
+      .send();
+    const target = document.getElementById("target");
+    for (const type of ["pointerrawupdate", "pointermove", "pointerover"]) {
+      target.addEventListener(type, logEvent);
+    }
+    const container = document.getElementById("container");
+    for (const type of ["pointerrawupdate", "pointermove", "pointerover"]) {
+      container.addEventListener(type, logEvent);
+    }
+    target.addEventListener("pointerrawupdate", () => {
+      target.remove();
+    }, {once: true});
+    events = [];
+    await new test_driver.Actions()
+      .pointerMove(0, 0, {origin: target})
+      .send();
+    assert_equals(
+      events.join(","),
+      [
+        "pointerover@target",
+        "pointerrawupdate@target",
+        "pointerover@container",
+        "pointermove@container",
+      ].join(",")
+    );
+  }, `"pointermove" and its preceding boundary events should be fired on parent if "pointerrawupdate" event listener removes its target`);
+
+  promise_test(async () => {
+    testContainer.innerHTML =
+      "<div id=container><div id=container2><div id=init></div><div id=target></div></div></div>";
+    const initialDiv = document.getElementById("init");
+    await new test_driver.Actions()
+      .pointerMove(0, 0, {origin: initialDiv})
+      .send();
+    const target = document.getElementById("target");
+    for (const type of ["pointerrawupdate", "pointermove", "pointerover"]) {
+      target.addEventListener(type, logEvent);
+    }
+    const container = document.getElementById("container");
+    for (const type of ["pointerrawupdate", "pointermove", "pointerover"]) {
+      container.addEventListener(type, logEvent);
+    }
+    target.addEventListener("pointerrawupdate", () => {
+      target.parentNode.remove();
+    }, {once: true});
+    events = [];
+    await new test_driver.Actions()
+      .pointerMove(0, 0, {origin: target})
+      .send();
+    assert_equals(
+      events.join(","),
+      [
+        "pointerover@target",
+        "pointerrawupdate@target",
+        "pointerover@container",
+        "pointermove@container",
+      ].join(",")
+    );
+  }, `"pointermove" and its preceding boundary events should be fired on ancestor if "pointerrawupdate" event listener removes its target parent`);
+
+  promise_test(async () => {
+    testContainer.innerHTML =
+      "<div id=container><div id=init></div><iframe srcdoc='<div id=target style=height:64px></div>'></iframe></div>";
+    const iframe = document.querySelector("iframe");
+    if (iframe.contentDocument.readyState != "complete") {
+      await new Promise(resolve => iframe.addEventListener("load", resolve, {once: true}));
+    }
+    const initialDiv = document.getElementById("init");
+    await new test_driver.Actions()
+      .pointerMove(0, 0, {origin: initialDiv})
+      .send();
+    const target = iframe.contentDocument.getElementById("target");
+    for (const type of ["pointerrawupdate", "pointermove", "pointerover"]) {
+      target.addEventListener(type, logEvent);
+    }
+    const container = document.getElementById("container");
+    for (const type of ["pointerrawupdate", "pointermove", "pointerover"]) {
+      container.addEventListener(type, logEvent);
+    }
+    target.addEventListener("pointerrawupdate", () => {
+      iframe.remove();
+    }, {once: true});
+    events = [];
+    await new test_driver.Actions()
+      .pointerMove(0, 0, {origin: target})
+      .send();
+    assert_equals(
+      events.join(", "),
+      [
+        "pointerover@target",
+        "pointerrawupdate@target",
+        "pointerover@container",
+        "pointermove@container",
+      ].join(", ")
+    );
+  }, `"pointermove" and its preceding boundary events should be fired on parent if "pointerrawupdate" event listener removes its document`);
+}, {once: true});
+</script>
+<style>
+#container, #container2 {
+  min-height: 200px;
+}
+#target, #init {
+  width: 64px;
+  height: 64px;
+}
+
+</style>
+<body><div id="testContainer"></div></body>
+</html>
diff --git a/tests/wpt/tests/pointerevents/pointerevent_range_input.html b/tests/wpt/tests/pointerevents/pointerevent_range_input.html
new file mode 100644
index 00000000000..4a67f4dd653
--- /dev/null
+++ b/tests/wpt/tests/pointerevents/pointerevent_range_input.html
@@ -0,0 +1,178 @@
+<!DOCTYPE html>
+<!-- TODO(crbug.com/40275057) Fix test for pointer-event-range-input.html?pen.
+-->
+<title>Pointer dragging behavior on input type='range' </title>
+<meta name="variant" content="?touch">
+<meta name="variant" content="?mouse">
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<script src='/resources/testdriver.js'></script>
+<script src='/resources/testdriver-actions.js'></script>
+<script src='/resources/testdriver-vendor.js'></script>
+<style type='text/css'>
+  body {
+    margin: 0;
+  }
+</style>
+
+<div><input type='range' id='slider1' min='0' max='100' step='10'></div>
+<div><input type='range' id='slider2' min='0' max='100' step='10' style='touch-action:none;'></div>
+<div><input type='range' id='slider3' min='0' max='100' step='10' style='writing-mode:vertical-lr; direction:rtl;'></div>
+
+<script>
+"use strict";
+const pointerType = location.search.substring(1);
+
+function isMouse() {
+  return pointerType === 'mouse';
+}
+function isTouch() {
+  return pointerType === 'touch';
+}
+
+// Verify that a point is on screen.
+// (x,y) is relative to the center of the origin element.
+function assert_point_within_viewport(x, y, origin) {
+  const rect = origin.getBoundingClientRect();
+  const center_point = {
+    x: rect.x + rect.width / 2,
+    y: rect.y + rect.height / 2
+  };
+  const viewport_point = {
+    x: (center_point.x - visualViewport.offsetLeft) * visualViewport.scale,
+    y: (center_point.y - visualViewport.offsetTop) * visualViewport.scale
+  };
+  x += viewport_point.x;
+  y += viewport_point.y;
+  assert_true(x >= 0 && x <= window.innerWidth,
+              'x coordinate outside viewport');
+  assert_true(y >= 0 && y <= window.innerHeight,
+              'y coordinate outside viewport');
+}
+
+// The deltas are relative to the center of the target.
+function smoothDrag(delta_x, delta_y, target) {
+  const eventTarget = document;
+  const prevent_fling_pause_ms = isTouch() ? 100 : 0;
+
+  const x = 0;
+  const y = 0;
+  const end_x = Math.round(delta_x);
+  const end_y = Math.round(delta_y);
+  assert_point_within_viewport(end_x, end_y, target);
+
+  // Expect a pointerup or pointercancel event depending on whether scrolling
+  // actually took place.
+  return new Promise(resolve => {
+    const pointerPromise = new Promise(resolve => {
+      const pointerListener = (event) => {
+        eventTarget.removeEventListener('pointerup', pointerListener);
+        eventTarget.removeEventListener('pointercancel', pointerListener);
+        resolve(event.type);
+      };
+      eventTarget.addEventListener('pointerup', pointerListener);
+      eventTarget.addEventListener('pointercancel', pointerListener);
+    });
+    const actionPromise = new test_driver.Actions()
+      .addPointer("pointer1", pointerType)
+      .pointerMove(x, y, { origin: target })
+      .pointerDown({button: 0/*Left*/})
+      .pointerMove(end_x, end_y, { origin: target })
+      .pause(prevent_fling_pause_ms)
+      .pointerUp({button: 0 /*Left*/})
+      .send();
+    Promise.all([actionPromise, pointerPromise]).then(responses => {
+      resolve(responses[1]);
+    });
+  });
+}
+
+function forceLayoutUpdate() {
+   document.body.offsetTop;
+}
+
+const slider1 = document.getElementById('slider1');
+const slider2 = document.getElementById('slider2');
+const slider3 = document.getElementById('slider3');
+
+function resetPage() {
+  slider1.value = 50;
+  slider2.value = 50;
+  slider3.value = 50;
+}
+
+const isMac = navigator.platform.indexOf('Mac') == 0;
+if (isMac && isTouch()) {
+  // Mac devices do not support touch.
+  testNothing();
+} else {
+  forceLayoutUpdate();
+
+  promise_test(async t => {
+    resetPage();
+    assert_equals(parseInt(slider1.value), 50, "Slider1's initial value");
+    // Perform a left drag from the center of the slider.
+    const gestureCompletionEventType =
+                  await smoothDrag(-slider1.clientWidth / 2, 0, slider1);
+    assert_equals(gestureCompletionEventType, 'pointerup',
+                                  "The gesture is completed with 'pointerup'");
+    assert_equals(parseInt(slider1.value), 0,
+                                  "Should set slider1's value to 0");
+  }, 'Horizontal drag on a horizontal slider.');
+
+  promise_test(async t => {
+    resetPage();
+    assert_equals(parseInt(slider1.value), 50, "Slider1's initial value");
+    // Perform a down drag from the center of the slider.
+    const gestureCompletionEventType =
+                  await smoothDrag(0, slider1.clientWidth, slider1);
+    assert_equals(parseInt(slider1.value), 50,
+                                    "Should not change slider1's value.");
+    // Don't assert gestureCompletionEventType value. Depending on the UA, the
+    // gesture may result in scroll. In this case gestureCompletionEventType
+    // is 'pointercancel'.
+  }, 'Vertical drag on a horizontal slider.');
+
+  promise_test(async t => {
+    resetPage();
+    assert_equals(parseInt(slider2.value), 50, "Slider2's initial value");
+    // Perform a down drag from the center of the slider.
+    const gestureCompletionEventType =
+                       await smoothDrag(0, slider2.clientWidth, slider2);
+    assert_equals(gestureCompletionEventType, 'pointerup',
+                                  "The gesture is completed with 'pointerup'");
+    assert_equals(parseInt(slider2.value), 50,
+                                   "Should not change slider2's value.");
+
+  }, 'Vertical drag on a horizontal slider with touch-action:none.');
+
+  promise_test(async t => {
+    resetPage();
+    assert_equals(parseInt(slider3.value), 50, "Slider3's initial value.");
+    // Perform an up drag from the center of the slider.
+    const gestureCompletionEventType =
+                await smoothDrag(0, -slider3.clientHeight / 2, slider3);
+    assert_equals(gestureCompletionEventType, 'pointerup',
+                                  "The gesture is completed with 'pointerup'");
+    assert_equals(parseInt(slider3.value), 100,
+                                    "Should set slider3' value to 100.");
+  }, 'Vertical drag on a vertical slider.');
+
+  promise_test(async t => {
+    resetPage();
+    assert_equals(parseInt(slider3.value), 50, "Slider3's initial value.");
+    // Perform a right drag from the center of the slider.
+    const gestureCompletionEventType =
+                     await smoothDrag(slider3.clientHeight, 0, slider3);
+    assert_equals(parseInt(slider3.value), 50,
+                     "Should not change slider3' value.");
+    // Don't assert gestureCompletionEventType value. Depending on the UA, the
+    // gesture may result in scroll. In this case gestureCompletionEventType
+    // is 'pointercancel'.
+  }, 'Horizontal drag on a vertical slider.');
+}
+
+function testNothing() {
+    test(() => {}, 'Empty test for MacOS.');
+}
+</script>
diff --git a/tests/wpt/tests/private-aggregation/shared-storage-surface-context-id.https.html b/tests/wpt/tests/private-aggregation/shared-storage-surface-context-id.https.html
index 3b0e1b3d740..f51f3960550 100644
--- a/tests/wpt/tests/private-aggregation/shared-storage-surface-context-id.https.html
+++ b/tests/wpt/tests/private-aggregation/shared-storage-surface-context-id.https.html
@@ -11,7 +11,7 @@
 'use strict';
 
 promise_test(async () => {
-  await addModuleOnce("/private-aggregation/resources/private-aggregation-helper-module.js");
+  await addModuleOnce("/private-aggregation/resources/shared-storage-helper-module.js");
 
   const data = {
     contributions: [{bucket: 1n, value: 2}]
@@ -25,7 +25,7 @@ promise_test(async () => {
 }, 'set context ID');
 
 promise_test(async () => {
-  await addModuleOnce("/private-aggregation/resources/private-aggregation-helper-module.js");
+  await addModuleOnce("/private-aggregation/resources/shared-storage-helper-module.js");
 
   const data = {
     contributions: [{bucket: 1n, value: 2}]
@@ -39,7 +39,7 @@ promise_test(async () => {
 }, 'set empty context ID');
 
 promise_test(async () => {
-  await addModuleOnce("/private-aggregation/resources/private-aggregation-helper-module.js");
+  await addModuleOnce("/private-aggregation/resources/shared-storage-helper-module.js");
 
   const data = {
     contributions: [{bucket: 1n, value: 2}]
@@ -53,7 +53,7 @@ promise_test(async () => {
 }, 'set max length context ID');
 
 promise_test(async (test) => {
-  await addModuleOnce("/private-aggregation/resources/private-aggregation-helper-module.js");
+  await addModuleOnce("/private-aggregation/resources/shared-storage-helper-module.js");
 
   const data = {
     contributions: [{bucket: 1n, value: 2}]
diff --git a/tests/wpt/tests/private-aggregation/shared-storage-surface-filtering-id.https.html b/tests/wpt/tests/private-aggregation/shared-storage-surface-filtering-id.https.html
index 53ed3a109bc..e79634b7391 100644
--- a/tests/wpt/tests/private-aggregation/shared-storage-surface-filtering-id.https.html
+++ b/tests/wpt/tests/private-aggregation/shared-storage-surface-filtering-id.https.html
@@ -11,7 +11,7 @@
 'use strict';
 
 promise_test(async () => {
-  await addModuleOnce("/private-aggregation/resources/private-aggregation-helper-module.js");
+  await addModuleOnce("/private-aggregation/resources/shared-storage-helper-module.js");
 
   const privateAggregationConfig = {};
 
@@ -20,7 +20,7 @@ promise_test(async () => {
 }, 'no filtering ID max bytes');
 
 promise_test(async () => {
-  await addModuleOnce("/private-aggregation/resources/private-aggregation-helper-module.js");
+  await addModuleOnce("/private-aggregation/resources/shared-storage-helper-module.js");
 
   const privateAggregationConfig = {
     filteringIdMaxBytes: 1,
@@ -31,7 +31,7 @@ promise_test(async () => {
 }, 'explicit default filtering ID max bytes');
 
 promise_test(async () => {
-  await addModuleOnce("/private-aggregation/resources/private-aggregation-helper-module.js");
+  await addModuleOnce("/private-aggregation/resources/shared-storage-helper-module.js");
 
   const privateAggregationConfig = {
     filteringIdMaxBytes: 8,
@@ -42,7 +42,7 @@ promise_test(async () => {
 }, 'max filtering ID max bytes');
 
 promise_test(async (test) => {
-  await addModuleOnce("/private-aggregation/resources/private-aggregation-helper-module.js");
+  await addModuleOnce("/private-aggregation/resources/shared-storage-helper-module.js");
 
   const privateAggregationConfig = {
     filteringIdMaxBytes: 9,
@@ -55,7 +55,7 @@ promise_test(async (test) => {
 }, 'too big filtering ID max bytes');
 
 promise_test(async (test) => {
-  await addModuleOnce("/private-aggregation/resources/private-aggregation-helper-module.js");
+  await addModuleOnce("/private-aggregation/resources/shared-storage-helper-module.js");
 
   const privateAggregationConfig = {
     filteringIdMaxBytes: 0,
@@ -68,7 +68,7 @@ promise_test(async (test) => {
 }, 'zero filtering ID max bytes');
 
 promise_test(async (test) => {
-  await addModuleOnce("/private-aggregation/resources/private-aggregation-helper-module.js");
+  await addModuleOnce("/private-aggregation/resources/shared-storage-helper-module.js");
 
   const privateAggregationConfig = {
     filteringIdMaxBytes: -1,
@@ -81,7 +81,7 @@ promise_test(async (test) => {
 }, 'negative filtering ID max bytes');
 
 promise_test(async (test) => {
-  await addModuleOnce("/private-aggregation/resources/private-aggregation-helper-module.js");
+  await addModuleOnce("/private-aggregation/resources/shared-storage-helper-module.js");
 
   const privateAggregationConfig = {
     filteringIdMaxBytes: 3n,
diff --git a/tests/wpt/tests/quirks/body-fill-html-quirk-intrinsic-crash.html b/tests/wpt/tests/quirks/body-fill-html-quirk-intrinsic-crash.html
new file mode 100644
index 00000000000..aadb6037f34
--- /dev/null
+++ b/tests/wpt/tests/quirks/body-fill-html-quirk-intrinsic-crash.html
@@ -0,0 +1,4 @@
+<!-- quirks-mode -->
+<body style="width: fit-content;">
+  <div style="aspect-ratio: 1;"></div>
+</body>
diff --git a/tests/wpt/tests/remote-playback/WEB_FEATURES.yml b/tests/wpt/tests/remote-playback/WEB_FEATURES.yml
new file mode 100644
index 00000000000..f59321971a7
--- /dev/null
+++ b/tests/wpt/tests/remote-playback/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: remote-playback
+  files: "**"
diff --git a/tests/wpt/tests/reporting/resources/report-helper.js b/tests/wpt/tests/reporting/resources/report-helper.js
index 5b5438903de..216da22eae8 100644
--- a/tests/wpt/tests/reporting/resources/report-helper.js
+++ b/tests/wpt/tests/reporting/resources/report-helper.js
@@ -40,7 +40,9 @@ function checkReportExists(reports, type, url) {
 function getReport(reports, type, document_url, subresource_url) {
   for (const report of reports) {
     if (report.type !== type) continue;
-    if (report.body.documentURL === document_url && report.body.subresourceURL == subresource_url) return report;
+    if (report.body.documentURL === document_url
+        && (report.body.subresourceURL == subresource_url
+           || report.body.blockedURL == subresource_url)) return report;
   }
   return null;
 }
diff --git a/tests/wpt/tests/requestidlecallback/callback-iframe-different-origin.html b/tests/wpt/tests/requestidlecallback/callback-iframe-different-origin.html
new file mode 100644
index 00000000000..5e66b36d712
--- /dev/null
+++ b/tests/wpt/tests/requestidlecallback/callback-iframe-different-origin.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<title>window.requestIdleCallback in a cross-origin iframe.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+async_test(t => {
+  onload = function() {
+    const iframe = document.createElement('iframe');
+    iframe.src = location.href.replace('://', '://www1.')
+        .replace('callback-iframe-different-origin', 'resources/child');
+    document.body.appendChild(iframe);
+  };
+
+  onmessage = function(e) {
+    assert_equals(e.data, 'done');
+    t.done();
+  }
+}, 'Check that idle tasks run in a cross-origin iframe');
+</script>
diff --git a/tests/wpt/tests/requestidlecallback/resources/child.html b/tests/wpt/tests/requestidlecallback/resources/child.html
new file mode 100644
index 00000000000..4d6895125a2
--- /dev/null
+++ b/tests/wpt/tests/requestidlecallback/resources/child.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<h2>Child Frame</h2>
+<script>
+onload = () => {
+  let count = 0;
+  const loop = () => {
+    if (++count < 10) {
+      requestIdleCallback(loop);
+    } else {
+      const target = location.href.replace('www1.', '')
+          .replace('resources/child.html', '');
+      window.parent.postMessage('done', target);
+    }
+  };
+  requestIdleCallback(loop);
+}
+</script>
diff --git a/tests/wpt/tests/resources/chromium/webxr-test.js b/tests/wpt/tests/resources/chromium/webxr-test.js
index 15d015debb1..ce2503b1bbc 100644
--- a/tests/wpt/tests/resources/chromium/webxr-test.js
+++ b/tests/wpt/tests/resources/chromium/webxr-test.js
@@ -757,30 +757,34 @@ class MockRuntime {
     const viewport_size = 20;
     return [{
         eye: vrMojom.XREye.kLeft,
-        fieldOfView: {
-          upDegrees: 48.316,
-          downDegrees: 50.099,
-          leftDegrees: 50.899,
-          rightDegrees: 35.197
+        geometry: {
+          fieldOfView: {
+            upDegrees: 48.316,
+            downDegrees: 50.099,
+            leftDegrees: 50.899,
+            rightDegrees: 35.197
+          },
+          mojoFromView: this._getMojoFromViewerWithOffset(composeGFXTransform({
+            position: [-0.032, 0, 0],
+            orientation: [0, 0, 0, 1]
+          }))
         },
-        mojoFromView: this._getMojoFromViewerWithOffset(composeGFXTransform({
-          position: [-0.032, 0, 0],
-          orientation: [0, 0, 0, 1]
-        })),
         viewport: { x: 0, y: 0, width: viewport_size, height: viewport_size }
       },
       {
         eye: vrMojom.XREye.kRight,
-        fieldOfView: {
-          upDegrees: 48.316,
-          downDegrees: 50.099,
-          leftDegrees: 50.899,
-          rightDegrees: 35.197
+        geometry: {
+          fieldOfView: {
+            upDegrees: 48.316,
+            downDegrees: 50.099,
+            leftDegrees: 50.899,
+            rightDegrees: 35.197
+          },
+          mojoFromView: this._getMojoFromViewerWithOffset(composeGFXTransform({
+            position: [0.032, 0, 0],
+            orientation: [0, 0, 0, 1]
+          }))
         },
-        mojoFromView: this._getMojoFromViewerWithOffset(composeGFXTransform({
-          position: [0.032, 0, 0],
-          orientation: [0, 0, 0, 1]
-        })),
         viewport: { x: viewport_size, y: 0, width: viewport_size, height: viewport_size }
       }];
   }
@@ -835,13 +839,15 @@ class MockRuntime {
 
     return {
       eye: viewEye,
-      fieldOfView: fov,
-      mojoFromView: this._getMojoFromViewerWithOffset(composeGFXTransform(fakeXRViewInit.viewOffset)),
+      geometry: {
+        fieldOfView: fov,
+        mojoFromView: this._getMojoFromViewerWithOffset(composeGFXTransform(fakeXRViewInit.viewOffset))
+      },
       viewport: {
         x: xOffset,
-        y: 0,
-        width: fakeXRViewInit.resolution.width,
-        height: fakeXRViewInit.resolution.height
+      y: 0,
+      width: fakeXRViewInit.resolution.width,
+      height: fakeXRViewInit.resolution.height
       },
       isFirstPersonObserver: fakeXRViewInit.isFirstPersonObserver ? true : false,
       viewOffset: composeGFXTransform(fakeXRViewInit.viewOffset)
@@ -915,12 +921,12 @@ class MockRuntime {
 
         let frame_views = this.primaryViews_;
         for (let i = 0; i < this.primaryViews_.length; i++) {
-          this.primaryViews_[i].mojoFromView =
+          this.primaryViews_[i].geometry.mojoFromView =
             this._getMojoFromViewerWithOffset(this.primaryViews_[i].viewOffset);
         }
         if (this.enabledFeatures_.includes(xrSessionMojom.XRSessionFeature.SECONDARY_VIEWS)) {
           for (let i = 0; i < this.secondaryViews_.length; i++) {
-            this.secondaryViews_[i].mojoFromView =
+            this.secondaryViews_[i].geometry.mojoFromView =
               this._getMojoFromViewerWithOffset(this.secondaryViews_[i].viewOffset);
           }
 
@@ -956,7 +962,9 @@ class MockRuntime {
 
         this._calculateAnchorInformation(frameData);
 
-        this._calculateDepthInformation(frameData);
+        if (options.depthActive) {
+          this._calculateDepthInformation(frameData);
+        }
 
         this._injectAdditionalFrameData(options, frameData);
 
@@ -1207,6 +1215,11 @@ class MockRuntime {
 
         this.enabledFeatures_ = enabled_features;
 
+        let selectedDepthType;
+        if (sessionOptions.depthOptions && sessionOptions.depthOptions.depthTypeRequest.length != 0) {
+          selectedDepthType = sessionOptions.depthOptions.depthTypeRequest[0];
+        }
+
         return Promise.resolve({
           session: {
             submitFrameSink: submit_frame_sink,
@@ -1219,9 +1232,12 @@ class MockRuntime {
               depthConfiguration: enabled_features.includes(
                                       xrSessionMojom.XRSessionFeature.DEPTH) ?
                   {
+                    // TODO(https://crbug.com/409806803): Update support via
+                    // a webxr-test-api method.
                     depthUsage: xrSessionMojom.XRDepthUsage.kCPUOptimized,
                     depthDataFormat:
                         xrSessionMojom.XRDepthDataFormat.kLuminanceAlpha,
+                    depthType: selectedDepthType,
                   } :
                   null,
               views: this._getDefaultViews(),
@@ -1251,6 +1267,7 @@ class MockRuntime {
     switch (feature) {
       case xrSessionMojom.XRSessionFeature.DEPTH:
         // This matches what Chrome can currently support.
+        // TODO(https://crbug.com/409806803): Add a webxr-test-api for this.
         return options.depthOptions &&
                (options.depthOptions.usagePreferences.length == 0 ||
                 options.depthOptions.usagePreferences.includes(
diff --git a/tests/wpt/tests/resources/test/conftest.py b/tests/wpt/tests/resources/test/conftest.py
index 723087d3184..1301e7a9f77 100644
--- a/tests/wpt/tests/resources/test/conftest.py
+++ b/tests/wpt/tests/resources/test/conftest.py
@@ -263,4 +263,4 @@ class HTMLItem(pytest.Item):
     @staticmethod
     def _assert_sequence(nums):
         if nums and len(nums) > 0:
-            assert nums == list(range(1, nums[-1] + 1))
+            assert nums == list(range(nums[-1] + 1))
diff --git a/tests/wpt/tests/resources/test/tests/functional/api-tests-1.html b/tests/wpt/tests/resources/test/tests/functional/api-tests-1.html
index 9de875b0f12..6ec396c221b 100644
--- a/tests/wpt/tests/resources/test/tests/functional/api-tests-1.html
+++ b/tests/wpt/tests/resources/test/tests/functional/api-tests-1.html
@@ -132,7 +132,13 @@
     {
         assert_less_than(10, 11, "10 is less than 11")
     }
-    test(basicAssertApproxEquals, "basic assert_less_than test");
+    test(basicAssertLessThan, "basic assert_less_than test");
+
+    function bigintAssertLessThan()
+    {
+        assert_less_than(10n, 11n, "10n is less than 11n")
+    }
+    test(bigintAssertLessThan, "bigint assert_less_than test");
 
     function basicAssertGreaterThan()
     {
@@ -140,12 +146,24 @@
     }
     test(basicAssertGreaterThan, "assert_greater_than expected to fail");
 
+    function bigintAssertGreaterThan()
+    {
+        assert_greater_than(10n, 11n, "10n is not greater than 11n");
+    }
+    test(bigintAssertGreaterThan, "bigint assert_greater_than expected to fail");
+
     function basicAssertGreaterThanEqual()
     {
         assert_greater_than_equal(10, 10, "10 is greater than or equal to 10")
     }
     test(basicAssertGreaterThanEqual, "basic assert_greater_than_equal test");
 
+    function bigintAssertGreaterThanEqual()
+    {
+        assert_greater_than_equal(10n, 10n, "10n is greater than or equal to 10n")
+    }
+    test(bigintAssertGreaterThanEqual, "bigint assert_greater_than_equal test");
+
     function basicAssertLessThanEqual()
     {
         assert_greater_than_equal('10', 10, "'10' is not a number")
@@ -462,6 +480,12 @@
       "message": "assert_greater_than: 10 is not greater than 11 expected a number greater than 11 but got 10",
       "properties": {}
     },
+    {
+      "status_string": "FAIL",
+      "name": "bigint assert_greater_than expected to fail",
+      "message": "assert_greater_than: 10n is not greater than 11n expected a number greater than 11n but got 10n",
+      "properties": {}
+    },
     {
       "status_string": "FAIL",
       "name": "assert_less_than_equal expected to fail",
@@ -516,12 +540,24 @@
       "message": null,
       "properties": {}
     },
+    {
+      "status_string": "PASS",
+      "name": "bigint assert_greater_than_equal test",
+      "message": null,
+      "properties": {}
+    },
     {
       "status_string": "PASS",
       "name": "basic assert_less_than test",
       "message": null,
       "properties": {}
     },
+    {
+      "status_string": "PASS",
+      "name": "bigint assert_less_than test",
+      "message": null,
+      "properties": {}
+    },
     {
       "status_string": "PASS",
       "name": "body element fires the onload event set from the attribute",
@@ -745,13 +781,22 @@
       "status": 0
     },
     {
-      "assert_name": "assert_approx_equals",
+      "assert_name": "assert_less_than",
       "test": "basic assert_less_than test",
       "args": [
         "10",
         "11",
-        "1",
-        "\"10 is approximately (+/- 1) 11\""
+        "\"10 is less than 11\""
+      ],
+      "status": 0
+    },
+    {
+      "assert_name": "assert_less_than",
+      "test": "bigint assert_less_than test",
+      "args": [
+        "10n",
+        "11n",
+        "\"10n is less than 11n\""
       ],
       "status": 0
     },
@@ -765,6 +810,16 @@
       ],
       "status": 1
     },
+    {
+      "assert_name": "assert_greater_than",
+      "test": "bigint assert_greater_than expected to fail",
+      "args": [
+        "10n",
+        "11n",
+        "\"10n is not greater than 11n\""
+      ],
+      "status": 1
+    },
     {
       "assert_name": "assert_greater_than_equal",
       "test": "basic assert_greater_than_equal test",
@@ -775,6 +830,16 @@
       ],
       "status": 0
     },
+    {
+      "assert_name": "assert_greater_than_equal",
+      "test": "bigint assert_greater_than_equal test",
+      "args": [
+        "10n",
+        "10n",
+        "\"10n is greater than or equal to 10n\""
+      ],
+      "status": 0
+    },
     {
       "assert_name": "assert_greater_than_equal",
       "test": "assert_less_than_equal expected to fail",
diff --git a/tests/wpt/tests/resources/testdriver.js b/tests/wpt/tests/resources/testdriver.js
index 05301bf5589..992b9e3ab2c 100644
--- a/tests/wpt/tests/resources/testdriver.js
+++ b/tests/wpt/tests/resources/testdriver.js
@@ -254,12 +254,63 @@
                 }
             },
             /**
-             * `log <https://w3c.github.io/webdriver-bidi/#module-log>`_ module.
+             * `emulation <https://www.w3.org/TR/webdriver-bidi/#module-emulation>`_ module.
+             */
+            emulation: {
+                /**
+                 * Overrides the geolocation coordinates for the specified
+                 * browsing contexts.
+                 * Matches the `emulation.setGeolocationOverride
+                 * <https://w3c.github.io/webdriver-bidi/#command-emulation-setGeolocationOverride>`_
+                 * WebDriver BiDi command.
+                 *
+                 * @example
+                 * await test_driver.bidi.emulation.set_geolocation_override({
+                 *     coordinates: {
+                 *         latitude: 52.51,
+                 *         longitude: 13.39,
+                 *         accuracy: 0.5,
+                 *         altitude: 34,
+                 *         altitudeAccuracy: 0.75,
+                 *         heading: 180,
+                 *         speed: 2.77
+                 *     }
+                 * });
+                 *
+                 * @param {object} params - Parameters for the command.
+                 * @param {null|object} params.coordinates - The optional
+                 * geolocation coordinates to set. Matches the
+                 * `emulation.GeolocationCoordinates <https://w3c.github.io/webdriver-bidi/#commands-emulationsetgeolocationoverride>`_
+                 * value. If null or omitted and the `params.error` is set, the
+                 * emulation will be removed. Mutually exclusive with
+                 * `params.error`.
+                 * @param {object} params.error - The optional
+                 * geolocation error to emulate. Matches the
+                 * `emulation.GeolocationPositionError <https://w3c.github.io/webdriver-bidi/#commands-emulationsetgeolocationoverride>`_
+                 * value. Mutually exclusive with `params.coordinates`.
+                 * @param {null|Array.<(Context)>} [params.contexts] The
+                 * optional contexts parameter specifies which browsing contexts
+                 * to set the geolocation override on. It should be either an
+                 * array of Context objects (window or browsing context id), or
+                 * null. If null or omitted, the override will be set on the
+                 * current browsing context.
+                 * @returns {Promise<void>} Resolves when the geolocation
+                 * override is successfully set.
+                 */
+                set_geolocation_override: function (params) {
+                    // Ensure the bidi feature is enabled before calling the internal method
+                    assertBidiIsEnabled();
+                    return window.test_driver_internal.bidi.emulation.set_geolocation_override(
+                        params);
+                },
+            },
+            /**
+             * `log <https://www.w3.org/TR/webdriver-bidi/#module-log>`_ module.
              */
             log: {
                 entry_added: {
                     /**
-                     * @typedef {object} LogEntryAdded `log.entryAdded <https://w3c.github.io/webdriver-bidi/#event-log-entryAdded>`_ event.
+                     * @typedef {object} LogEntryAdded `log.entryAdded <https://www.w3.org/TR/webdriver-bidi/#event-log-entryAdded>`_ event.
                      */
 
                     /**
@@ -629,7 +680,7 @@
         /**
          * Minimizes the browser window.
          *
-         * Matches the the behaviour of the `Minimize
+         * Matches the behaviour of the `Minimize
          * <https://www.w3.org/TR/webdriver/#minimize-window>`_
          * WebDriver command
          *
@@ -1428,7 +1479,7 @@
          * Causes a virtual pressure source to report a new reading.
          *
          * Matches the `Update virtual pressure source
-         * <https://w3c.github.io/compute-pressure/#update-virtual-pressure-source>`_
+         * <https://w3c.github.io/compute-pressure/?experimental=1#update-virtual-pressure-source>`_
          * WebDriver command.
          *
          * @param {String} source_type - A `virtual pressure source type
@@ -1437,6 +1488,8 @@
          * @param {String} sample - A `virtual pressure state
          *                          <https://w3c.github.io/compute-pressure/#dom-pressurestate>`_
          *                          such as "critical".
+         * @param {number} own_contribution_estimate - Optional, A `virtual own contribution estimate`
+         *                          <https://w3c.github.io/compute-pressure/?experimental=1#the-owncontributionestimate-attribute>`_
          * @param {WindowProxy} [context=null] - Browsing context in which to
          *                                       run the call, or null for the
          *                                       current browsing context.
@@ -1447,8 +1500,8 @@
          *                    virtual pressure source of the given type does not
          *                    exist).
          */
-        update_virtual_pressure_source: function(source_type, sample, context=null) {
-            return window.test_driver_internal.update_virtual_pressure_source(source_type, sample, context);
+        update_virtual_pressure_source: function(source_type, sample, own_contribution_estimate, context=null) {
+            return window.test_driver_internal.update_virtual_pressure_source(source_type, sample, own_contribution_estimate, context);
         },
 
         /**
@@ -1472,6 +1525,71 @@
          */
         remove_virtual_pressure_source: function(source_type, context=null) {
             return window.test_driver_internal.remove_virtual_pressure_source(source_type, context);
+        },
+
+        /**
+         * Sets which hashes are considered k-anonymous for the Protected
+         * Audience interest group with specified `owner` and `name`.
+         *
+         * Matches the `Set Protected Audience K-Anonymity
+         * <https://wicg.github.io/turtledove/#sctn-automation-set-protected-audience-k-anonymity>
+         * WebDriver command.
+         *
+         *  @param {String} owner - Origin of the owner of the interest group
+         *                          to modify
+         *  @param {String} name -  Name of the interest group to modify
+         *  @param {Array} hashes - An array of strings, each of which is a
+         *                          base64 ecoded hash to consider k-anonymous.
+         *
+         *  @returns {Promise} Fulfilled after the k-anonymity status for the
+         *                     specified Protected Audience interest group has
+         *                     been updated.
+         *
+         */
+        set_protected_audience_k_anonymity: function(owner, name, hashes, context = null) {
+            return window.test_driver_internal.set_protected_audience_k_anonymity(owner, name, hashes, context);
+        },
+
+        /**
+         * Overrides the display features provided by the hardware so the viewport segments
+         * can be emulated.
+         *
+         * Matches the `Set display features
+         * <https://drafts.csswg.org/css-viewport/#set-display-features>`_
+         * WebDriver command.
+         *
+         * @param {Array} features - An array of `DisplayFeatureOverride
+         *                           <https://drafts.csswg.org/css-viewport/#display-feature-override>`.
+         * @param {WindowProxy} [context=null] - Browsing context in which to
+         *                                       run the call, or null for the
+         *                                       current browsing context.
+         *
+         * @returns {Promise} Fulfilled when the display features are set.
+         *                    Rejected in case the WebDriver command errors out
+         *                    (including if the array is malformed).
+         */
+        set_display_features: function(features, context=null) {
+            return window.test_driver_internal.set_display_features(features, context);
+        },
+
+        /**
+         * Removes display features override and returns the control
+         * back to hardware.
+         *
+         * Matches the `Clear display features
+         * <https://drafts.csswg.org/css-viewport/#clear-display-features>`_
+         * WebDriver command.
+         *
+         * @param {WindowProxy} [context=null] - Browsing context in which to
+         *                                       run the call, or null for the
+         *                                       current browsing context.
+         *
+         * @returns {Promise} Fulfilled after the display features override has
+         *                    been removed. Rejected in case the WebDriver
+         *                    command errors out.
+         */
+        clear_display_features: function(context=null) {
+            return window.test_driver_internal.clear_display_features(context);
         }
     };
 
@@ -1509,6 +1627,12 @@
                     }
                 }
             },
+            emulation: {
+                set_geolocation_override: function (params) {
+                    throw new Error(
+                        "bidi.emulation.set_geolocation_override is not implemented by testdriver-vendor.js");
+                }
+            },
             log: {
                 entry_added: {
                     async subscribe() {
@@ -1723,12 +1847,24 @@
             throw new Error("create_virtual_pressure_source() is not implemented by testdriver-vendor.js");
         },
 
-        async update_virtual_pressure_source(source_type, sample, context=null) {
+        async update_virtual_pressure_source(source_type, sample, own_contribution_estimate, context=null) {
             throw new Error("update_virtual_pressure_source() is not implemented by testdriver-vendor.js");
         },
 
         async remove_virtual_pressure_source(source_type, context=null) {
             throw new Error("remove_virtual_pressure_source() is not implemented by testdriver-vendor.js");
+        },
+
+        async set_protected_audience_k_anonymity(owner, name, hashes, context=null) {
+            throw new Error("set_protected_audience_k_anonymity() is not implemented by testdriver-vendor.js");
+        },
+
+        async set_display_features(features, context=null) {
+            throw new Error("set_display_features() is not implemented by testdriver-vendor.js");
+        },
+
+        async clear_display_features(context=null) {
+            throw new Error("clear_display_features() is not implemented by testdriver-vendor.js");
         }
     };
 })();
diff --git a/tests/wpt/tests/resources/testharness.js b/tests/wpt/tests/resources/testharness.js
index bd668be20f8..6ccede34483 100644
--- a/tests/wpt/tests/resources/testharness.js
+++ b/tests/wpt/tests/resources/testharness.js
@@ -88,7 +88,7 @@
                                                  status: harness_status.structured_clone(),
                                                  asserts: asserts.map(assert => assert.structured_clone())});
                          }]
-        }
+        };
 
         on_event(window, 'load', function() {
           setTimeout(() => {
@@ -203,7 +203,7 @@
             }
         });
         this.message_events = new_events;
-    }
+    };
 
     WindowTestEnvironment.prototype.next_default_test_name = function() {
         var suffix = this.name_counter > 0 ? " " + this.name_counter : "";
@@ -225,8 +225,8 @@
     WindowTestEnvironment.prototype.test_timeout = function() {
         var metas = document.getElementsByTagName("meta");
         for (var i = 0; i < metas.length; i++) {
-            if (metas[i].name == "timeout") {
-                if (metas[i].content == "long") {
+            if (metas[i].name === "timeout") {
+                if (metas[i].content === "long") {
                     return settings.harness_timeout.long;
                 }
                 break;
@@ -487,7 +487,7 @@
         this.all_loaded = false;
         this.on_loaded_callback = null;
         Promise.resolve().then(function() {
-            this.all_loaded = true
+            this.all_loaded = true;
             if (this.on_loaded_callback) {
                 this.on_loaded_callback();
             }
@@ -563,7 +563,7 @@
         // The worker object may be from another execution context,
         // so do not use instanceof here.
         return 'ServiceWorker' in global_scope &&
-            Object.prototype.toString.call(worker) == '[object ServiceWorker]';
+            Object.prototype.toString.call(worker) === '[object ServiceWorker]';
     }
 
     var seen_func_name = Object.create(null);
@@ -810,7 +810,7 @@
         return bring_promise_to_current_realm(promise)
             .then(test.unreached_func("Should have rejected: " + description))
             .catch(function(e) {
-                assert_throws_js_impl(constructor, function() { throw e },
+                assert_throws_js_impl(constructor, function() { throw e; },
                                       description, "promise_rejects_js");
             });
     }
@@ -862,7 +862,7 @@
         return bring_promise_to_current_realm(promise)
             .then(test.unreached_func("Should have rejected: " + description))
             .catch(function(e) {
-                assert_throws_dom_impl(type, function() { throw e }, description,
+                assert_throws_dom_impl(type, function() { throw e; }, description,
                                        "promise_rejects_dom", constructor);
             });
     }
@@ -881,7 +881,7 @@
         return bring_promise_to_current_realm(promise)
             .then(test.unreached_func("Should have rejected: " + description))
             .catch(function(e) {
-                assert_throws_exactly_impl(exception, function() { throw e },
+                assert_throws_exactly_impl(exception, function() { throw e; },
                                            description, "promise_rejects_exactly");
             });
     }
@@ -907,7 +907,7 @@
      */
     function EventWatcher(test, watchedNode, eventTypes, timeoutPromise)
     {
-        if (typeof eventTypes == 'string') {
+        if (typeof eventTypes === 'string') {
             eventTypes = [eventTypes];
         }
 
@@ -972,7 +972,7 @@
             if (waitingFor) {
                 return Promise.reject('Already waiting for an event or events');
             }
-            if (typeof types == 'string') {
+            if (typeof types === 'string') {
                 types = [types];
             }
             if (options && options.record && options.record === 'all') {
@@ -987,7 +987,7 @@
 
                     // This should always fail, otherwise we should have
                     // resolved the promise.
-                    assert_true(waitingFor.types.length == 0,
+                    assert_true(waitingFor.types.length === 0,
                                 'Timed out waiting for ' + waitingFor.types.join(', '));
                     var result = recordedEvents;
                     recordedEvents = null;
@@ -1011,13 +1011,13 @@
         /**
          * Stop listening for events
          */
-        function stop_watching() {
+        this.stop_watching = function() {
             for (var i = 0; i < eventTypes.length; i++) {
                 watchedNode.removeEventListener(eventTypes[i], eventHandler, false);
             }
         };
 
-        test._add_cleanup(stop_watching);
+        test._add_cleanup(this.stop_watching);
 
         return this;
     }
@@ -1400,6 +1400,8 @@
                 return "-0";
             }
             return String(val);
+        case "bigint":
+            return String(val) + 'n';
         case "object":
             if (val === null) {
                 return "null";
@@ -1423,11 +1425,11 @@
                 case Node.COMMENT_NODE:
                     return "Comment node <!--" + truncate(val.data, 60) + "-->";
                 case Node.DOCUMENT_NODE:
-                    return "Document node with " + val.childNodes.length + (val.childNodes.length == 1 ? " child" : " children");
+                    return "Document node with " + val.childNodes.length + (val.childNodes.length === 1 ? " child" : " children");
                 case Node.DOCUMENT_TYPE_NODE:
                     return "DocumentType node";
                 case Node.DOCUMENT_FRAGMENT_NODE:
-                    return "DocumentFragment node with " + val.childNodes.length + (val.childNodes.length == 1 ? " child" : " children");
+                    return "DocumentFragment node with " + val.childNodes.length + (val.childNodes.length === 1 ? " child" : " children");
                 default:
                     return "Node object of unknown type";
                 }
@@ -1771,20 +1773,25 @@
     /**
      * Assert that ``actual`` is a number less than ``expected``.
      *
-     * @param {number} actual - Test value.
-     * @param {number} expected - Number that ``actual`` must be less than.
+     * @param {number|bigint} actual - Test value.
+     * @param {number|bigint} expected - Value that ``actual`` must be less than.
      * @param {string} [description] - Description of the condition being tested.
      */
     function assert_less_than(actual, expected, description)
     {
         /*
-         * Test if a primitive number is less than another
+         * Test if a primitive number (or bigint) is less than another
          */
-        assert(typeof actual === "number",
+        assert(typeof actual === "number" || typeof actual === "bigint",
                "assert_less_than", description,
                "expected a number but got a ${type_actual}",
                {type_actual:typeof actual});
 
+        assert(typeof actual === typeof expected,
+               "assert_less_than", description,
+               "expected a ${type_expected} but got a ${type_actual}",
+               {type_expected:typeof expected, type_actual:typeof actual});
+
         assert(actual < expected,
                "assert_less_than", description,
                "expected a number less than ${expected} but got ${actual}",
@@ -1795,20 +1802,25 @@
     /**
      * Assert that ``actual`` is a number greater than ``expected``.
      *
-     * @param {number} actual - Test value.
-     * @param {number} expected - Number that ``actual`` must be greater than.
+     * @param {number|bigint} actual - Test value.
+     * @param {number|bigint} expected - Value that ``actual`` must be greater than.
      * @param {string} [description] - Description of the condition being tested.
      */
     function assert_greater_than(actual, expected, description)
     {
         /*
-         * Test if a primitive number is greater than another
+         * Test if a primitive number (or bigint) is greater than another
          */
-        assert(typeof actual === "number",
+        assert(typeof actual === "number" || typeof actual === "bigint",
                "assert_greater_than", description,
                "expected a number but got a ${type_actual}",
                {type_actual:typeof actual});
 
+        assert(typeof actual === typeof expected,
+               "assert_greater_than", description,
+               "expected a ${type_expected} but got a ${type_actual}",
+               {type_expected:typeof expected, type_actual:typeof actual});
+
         assert(actual > expected,
                "assert_greater_than", description,
                "expected a number greater than ${expected} but got ${actual}",
@@ -1820,21 +1832,31 @@
      * Assert that ``actual`` is a number greater than ``lower`` and less
      * than ``upper`` but not equal to either.
      *
-     * @param {number} actual - Test value.
-     * @param {number} lower - Number that ``actual`` must be greater than.
-     * @param {number} upper - Number that ``actual`` must be less than.
+     * @param {number|bigint} actual - Test value.
+     * @param {number|bigint} lower - Value that ``actual`` must be greater than.
+     * @param {number|bigint} upper - Value that ``actual`` must be less than.
      * @param {string} [description] - Description of the condition being tested.
      */
     function assert_between_exclusive(actual, lower, upper, description)
     {
         /*
-         * Test if a primitive number is between two others
+         * Test if a primitive number (or bigint) is between two others
          */
-        assert(typeof actual === "number",
+        assert(typeof lower === typeof upper,
+               "assert_between_exclusive", description,
+               "expected lower (${type_lower}) and upper (${type_upper}) types to match (test error)",
+               {type_lower:typeof lower, type_upper:typeof upper});
+
+        assert(typeof actual === "number" || typeof actual === "bigint",
                "assert_between_exclusive", description,
                "expected a number but got a ${type_actual}",
                {type_actual:typeof actual});
 
+        assert(typeof actual === typeof lower,
+               "assert_between_exclusive", description,
+               "expected a ${type_lower} but got a ${type_actual}",
+               {type_lower:typeof lower, type_actual:typeof actual});
+
         assert(actual > lower && actual < upper,
                "assert_between_exclusive", description,
                "expected a number greater than ${lower} " +
@@ -1846,21 +1868,26 @@
     /**
      * Assert that ``actual`` is a number less than or equal to ``expected``.
      *
-     * @param {number} actual - Test value.
-     * @param {number} expected - Number that ``actual`` must be less
+     * @param {number|bigint} actual - Test value.
+     * @param {number|bigint} expected - Value that ``actual`` must be less
      * than or equal to.
      * @param {string} [description] - Description of the condition being tested.
      */
     function assert_less_than_equal(actual, expected, description)
     {
         /*
-         * Test if a primitive number is less than or equal to another
+         * Test if a primitive number (or bigint) is less than or equal to another
          */
-        assert(typeof actual === "number",
+        assert(typeof actual === "number" || typeof actual === "bigint",
                "assert_less_than_equal", description,
                "expected a number but got a ${type_actual}",
                {type_actual:typeof actual});
 
+        assert(typeof actual === typeof expected,
+               "assert_less_than_equal", description,
+               "expected a ${type_expected} but got a ${type_actual}",
+               {type_expected:typeof expected, type_actual:typeof actual});
+
         assert(actual <= expected,
                "assert_less_than_equal", description,
                "expected a number less than or equal to ${expected} but got ${actual}",
@@ -1871,21 +1898,26 @@
     /**
      * Assert that ``actual`` is a number greater than or equal to ``expected``.
      *
-     * @param {number} actual - Test value.
-     * @param {number} expected - Number that ``actual`` must be greater
+     * @param {number|bigint} actual - Test value.
+     * @param {number|bigint} expected - Value that ``actual`` must be greater
      * than or equal to.
      * @param {string} [description] - Description of the condition being tested.
      */
     function assert_greater_than_equal(actual, expected, description)
     {
         /*
-         * Test if a primitive number is greater than or equal to another
+         * Test if a primitive number (or bigint) is greater than or equal to another
          */
-        assert(typeof actual === "number",
+        assert(typeof actual === "number" || typeof actual === "bigint",
                "assert_greater_than_equal", description,
                "expected a number but got a ${type_actual}",
                {type_actual:typeof actual});
 
+        assert(typeof actual === typeof expected,
+               "assert_greater_than_equal", description,
+               "expected a ${type_expected} but got a ${type_actual}",
+               {type_expected:typeof expected, type_actual:typeof actual});
+
         assert(actual >= expected,
                "assert_greater_than_equal", description,
                "expected a number greater than or equal to ${expected} but got ${actual}",
@@ -1897,21 +1929,31 @@
      * Assert that ``actual`` is a number greater than or equal to ``lower`` and less
      * than or equal to ``upper``.
      *
-     * @param {number} actual - Test value.
-     * @param {number} lower - Number that ``actual`` must be greater than or equal to.
-     * @param {number} upper - Number that ``actual`` must be less than or equal to.
+     * @param {number|bigint} actual - Test value.
+     * @param {number|bigint} lower - Value that ``actual`` must be greater than or equal to.
+     * @param {number|bigint} upper - Value that ``actual`` must be less than or equal to.
      * @param {string} [description] - Description of the condition being tested.
      */
     function assert_between_inclusive(actual, lower, upper, description)
     {
         /*
-         * Test if a primitive number is between to two others or equal to either of them
+         * Test if a primitive number (or bigint) is between to two others or equal to either of them
          */
-        assert(typeof actual === "number",
+        assert(typeof lower === typeof upper,
+               "assert_between_inclusive", description,
+               "expected lower (${type_lower}) and upper (${type_upper}) types to match (test error)",
+               {type_lower:typeof lower, type_upper:typeof upper});
+
+        assert(typeof actual === "number" || typeof actual === "bigint",
                "assert_between_inclusive", description,
                "expected a number but got a ${type_actual}",
                {type_actual:typeof actual});
 
+        assert(typeof actual === typeof lower,
+               "assert_between_inclusive", description,
+               "expected a ${type_lower} but got a ${type_actual}",
+               {type_lower:typeof lower, type_actual:typeof actual});
+
         assert(actual >= lower && actual <= upper,
                "assert_between_inclusive", description,
                "expected a number greater than or equal to ${lower} " +
@@ -2121,7 +2163,7 @@
                    {func:func});
 
             // Basic sanity-check on the passed-in constructor
-            assert(typeof constructor == "function",
+            assert(typeof constructor === "function",
                    assertion_type, description,
                    "${constructor} is not a constructor",
                    {constructor:constructor});
@@ -2196,7 +2238,7 @@
             assert(maybeDescription === undefined,
                    "Too many args passed to no-constructor version of assert_throws_dom, or accidentally explicitly passed undefined");
         }
-        assert_throws_dom_impl(type, func, description, "assert_throws_dom", constructor)
+        assert_throws_dom_impl(type, func, description, "assert_throws_dom", constructor);
     }
     expose_assert(assert_throws_dom, "assert_throws_dom");
 
@@ -2229,8 +2271,8 @@
                    {func:func});
 
             // Sanity-check our type
-            assert(typeof type == "number" ||
-                   typeof type == "string",
+            assert(typeof type === "number" ||
+                   typeof type === "string",
                    assertion_type, description,
                    "${type} is not a number or string",
                    {type:type});
@@ -2459,7 +2501,7 @@
     function assert_implements(condition, description) {
         assert(!!condition, "assert_implements", description);
     }
-    expose_assert(assert_implements, "assert_implements")
+    expose_assert(assert_implements, "assert_implements");
 
     /**
      * Assert that an optional feature is implemented, based on a 'truthy' condition.
@@ -2573,11 +2615,11 @@
         2: "Timeout",
         3: "Not Run",
         4: "Optional Feature Unsupported",
-    }
+    };
 
     Test.prototype.format_status = function() {
         return this.status_formats[this.status];
-    }
+    };
 
     Test.prototype.structured_clone = function()
     {
@@ -2887,7 +2929,7 @@
         return new Promise(resolve => {
             this.step_wait_func(cond, resolve, description, timeout, interval);
         });
-    }
+    };
 
     /*
      * Private method for registering cleanup functions. `testharness.js`
@@ -3120,7 +3162,7 @@
             throw new Error("AbortController is not supported in this browser");
         }
         return this._abortController.signal;
-    }
+    };
 
     /**
      * A RemoteTest object mirrors a Test object on a remote worker. The
@@ -3196,11 +3238,11 @@
                 function(callback) {
                     callback();
                 });
-    }
+    };
 
     RemoteTest.prototype.format_status = function() {
         return Test.prototype.status_formats[this.status];
-    }
+    };
 
     /*
      * A RemoteContext listens for test events from a remote test context, such
@@ -3472,7 +3514,7 @@
         this.all_done_callbacks = [];
 
         this.hide_test_state = false;
-        this.pending_remotes = [];
+        this.remotes = [];
 
         this.current_test = null;
         this.asserts_run = [];
@@ -3514,26 +3556,26 @@
         for (var p in properties) {
             if (properties.hasOwnProperty(p)) {
                 var value = properties[p];
-                if (p == "allow_uncaught_exception") {
+                if (p === "allow_uncaught_exception") {
                     this.allow_uncaught_exception = value;
-                } else if (p == "explicit_done" && value) {
+                } else if (p === "explicit_done" && value) {
                     this.wait_for_finish = true;
-                } else if (p == "explicit_timeout" && value) {
+                } else if (p === "explicit_timeout" && value) {
                     this.timeout_length = null;
                     if (this.timeout_id)
                     {
                         clearTimeout(this.timeout_id);
                     }
-                } else if (p == "single_test" && value) {
+                } else if (p === "single_test" && value) {
                     this.set_file_is_test();
-                } else if (p == "timeout_multiplier") {
+                } else if (p === "timeout_multiplier") {
                     this.timeout_multiplier = value;
                     if (this.timeout_length) {
                          this.timeout_length *= this.timeout_multiplier;
                     }
-                } else if (p == "hide_test_state") {
+                } else if (p === "hide_test_state") {
                     this.hide_test_state = value;
-                } else if (p == "output") {
+                } else if (p === "output") {
                     this.output = value;
                 } else if (p === "debug") {
                     settings.debug = value;
@@ -3626,11 +3668,14 @@
 
     Tests.prototype.push = function(test)
     {
+        if (this.phase === this.phases.COMPLETE) {
+            return;
+        }
         if (this.phase < this.phases.HAVE_TESTS) {
             this.start();
         }
         this.num_pending++;
-        test.index = this.tests.push(test);
+        test.index = this.tests.push(test) - 1;
         this.notify_test_state(test);
     };
 
@@ -3643,11 +3688,11 @@
     };
 
     Tests.prototype.all_done = function() {
-        return (this.tests.length > 0 || this.pending_remotes.length > 0) &&
+        return (this.tests.length > 0 || this.remotes.length > 0) &&
                 test_environment.all_loaded &&
                 (this.num_pending === 0 || this.is_aborted) && !this.wait_for_finish &&
                 !this.processing_callbacks &&
-                !this.pending_remotes.some(function(w) { return w.running; });
+                !this.remotes.some(function(w) { return w.running; });
     };
 
     Tests.prototype.start = function() {
@@ -3716,7 +3761,8 @@
                   function(test, testDone)
                   {
                       if (test.phase === test.phases.INITIAL) {
-                          test.phase = test.phases.COMPLETE;
+                          test.phase = test.phases.HAS_RESULT;
+                          test.done();
                           testDone();
                       } else {
                           add_test_done_callback(test, testDone);
@@ -3727,14 +3773,14 @@
     };
 
     Tests.prototype.set_assert = function(assert_name, args) {
-        this.asserts_run.push(new AssertRecord(this.current_test, assert_name, args))
-    }
+        this.asserts_run.push(new AssertRecord(this.current_test, assert_name, args));
+    };
 
     Tests.prototype.set_assert_status = function(index, status, stack) {
         let assert_record = this.asserts_run[index];
         assert_record.status = status;
         assert_record.stack = stack;
-    }
+    };
 
     /**
      * Update the harness status to reflect an unrecoverable harness error that
@@ -3876,7 +3922,7 @@
         }
 
         var remoteContext = this.create_remote_worker(worker);
-        this.pending_remotes.push(remoteContext);
+        this.remotes.push(remoteContext);
         return remoteContext.done;
     };
 
@@ -3899,7 +3945,7 @@
         }
 
         var remoteContext = this.create_remote_window(remote);
-        this.pending_remotes.push(remoteContext);
+        this.remotes.push(remoteContext);
         return remoteContext.done;
     };
 
@@ -4111,8 +4157,8 @@
             } else {
                 var root = output_document.documentElement;
                 var is_html = (root &&
-                               root.namespaceURI == "http://www.w3.org/1999/xhtml" &&
-                               root.localName == "html");
+                               root.namespaceURI === "http://www.w3.org/1999/xhtml" &&
+                               root.localName === "html");
                 var is_svg = (output_document.defaultView &&
                               "SVGSVGElement" in output_document.defaultView &&
                               root instanceof output_document.defaultView.SVGSVGElement);
@@ -4557,7 +4603,7 @@
      */
     function AssertionError(message)
     {
-        if (typeof message == "string") {
+        if (typeof message === "string") {
             message = sanitize_unpaired_surrogates(message);
         }
         this.message = message;
@@ -4603,7 +4649,7 @@
         }
 
         return lines.slice(i).join("\n");
-    }
+    };
 
     function OptionalFeatureUnsupportedError(message)
     {
diff --git a/tests/wpt/tests/sanitizer-api/sanitizer-basic-filtering.tentative.html b/tests/wpt/tests/sanitizer-api/sanitizer-basic-filtering.tentative.html
index 0b6924b0980..38c764ae181 100644
--- a/tests/wpt/tests/sanitizer-api/sanitizer-basic-filtering.tentative.html
+++ b/tests/wpt/tests/sanitizer-api/sanitizer-basic-filtering.tentative.html
@@ -273,6 +273,15 @@ for(const group of
       div.setHTMLUnsafe(testcase.data, config);
       assert_testcase(div, testcase);
     }, `setHTMLUnsafe testcase ${group.id}/${index}, "${testcase.data}"`);
+
+    // parseHTML and parseHTMLUnsafe need to allow "html" and "body" for these
+    // tests to be useful. Update the config, if necessary.
+    if (config && config["sanitizer"] && config["sanitizer"]["elements"]) {
+      config["sanitizer"] = new Sanitizer(config["sanitizer"]);
+      config["sanitizer"].allowElement("body");
+      config["sanitizer"].allowElement("html");
+    }
+
     test(_ => {
       assert_testcase(
         Document.parseHTML(testcase.data, config).body, testcase);
diff --git a/tests/wpt/tests/sanitizer-api/sanitizer-config.tentative.html b/tests/wpt/tests/sanitizer-api/sanitizer-config.tentative.html
index 438e1db7ead..a782b5a7e07 100644
--- a/tests/wpt/tests/sanitizer-api/sanitizer-config.tentative.html
+++ b/tests/wpt/tests/sanitizer-api/sanitizer-config.tentative.html
@@ -81,6 +81,12 @@ for (key of ["elements", "removeElements", "replaceWithChildrenElements"]) {
   test_normalization(key,
     {name: "b"},
     {name: "b", namespace: "http://www.w3.org/1999/xhtml"});
+  test_normalization(key,
+    {name: "b", namespace: null},
+    {name: "b", namespace: null});
+  test_normalization(key,
+    {name: "b", namespace: ""},
+    {name: "b", namespace: null});
   test_normalization(key,
     {name: "p", namespace: "http://www.w3.org/1999/xhtml"},
     {name: "p", namespace: "http://www.w3.org/1999/xhtml"});
@@ -95,9 +101,10 @@ for (key of ["attributes", "removeAttributes"]) {
   test_normalization(key,
     {name: "href", namespace: null},
     {name: "href", namespace: null});
+  // https://wicg.github.io/sanitizer-api/#canonicalize-a-sanitizer-name, step 5
   test_normalization(key,
     {name: "href", namespace: ""},
-    {name: "href", namespace: null});  // ??? Is this correct?
+    {name: "href", namespace: null});
   test_normalization(key,
     {name: "href", namespace: "https://www.w3.org/1999/xlink"},
     {name: "href", namespace: "https://www.w3.org/1999/xlink"});
diff --git a/tests/wpt/tests/sanitizer-api/sanitizer-parseHTML.tentative.html b/tests/wpt/tests/sanitizer-api/sanitizer-parseHTML.tentative.html
new file mode 100644
index 00000000000..c4a31e2eb03
--- /dev/null
+++ b/tests/wpt/tests/sanitizer-api/sanitizer-parseHTML.tentative.html
@@ -0,0 +1,145 @@
+<!DOCTYPE html>
+<head>
+<title>Testcases for parseHTML and parseHTMLUnsafe</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/html5lib-testcase-support.js"></script>
+<!--
+  This is a set of basic Sanitizer test cases using the parseHTML and
+  parseHTMLUnsafe methods.
+-->
+<script id="all" type="html5lib-testcases">
+#data
+text
+#document
+| <html>
+|   <head>
+|   <body>
+|     "text"
+
+#data
+<div>text
+#config
+{ "elements": ["html", "body", "div"] }
+#document
+| <html>
+|   <body>
+|     <div>
+|       "text"
+
+#data
+<div>text
+#config
+{ "elements": ["body", "div"] }
+#document
+
+#data
+<div>text
+#config
+{ "elements": ["html", "div"] }
+#document
+| <html>
+
+</script>
+<script id="safe" type="html5lib-testcases">
+#data
+<script>hello
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<html onload="2+2"><body onload="3+3"><div>hello
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "hello"
+
+</script>
+<script id="unsafe" type="html5lib-testcases">
+#data
+<script>hello
+#document
+| <html>
+|   <head>
+|     <script>
+|       "hello"
+|   <body>
+
+#data
+<html onload="2+2"><body onload="3+3"><div>hello
+#document
+| <html>
+|   onload="2+2"
+|   <head>
+|   <body>
+|     onload="3+3"
+|     <div>
+|       "hello"
+
+</script>
+<script id="document" type="html5lib-testcases">
+#data
+<!DOCTYPE html>
+text
+#document
+| <!DOCTYPE html "" "">
+| <html>
+|   <head>
+|   <body>
+|     "text"
+
+</script>
+<script>
+function test_safe(testcase, index) {
+  let config = undefined;
+  try {
+    config = { sanitizer: JSON.parse(testcase.config) };
+  } catch { /* config remains undefined */ }
+  test(_ => {
+    assert_testcase(Document.parseHTML(testcase.data, config), testcase);
+  }, `parseHTML testcase ${index}, "${testcase.data}"`);
+}
+function test_unsafe(testcase, index) {
+  let config = undefined;
+  try {
+    config = { sanitizer: JSON.parse(testcase.config) };
+  } catch { /* config remains undefined */ }
+  test(_ => {
+    assert_testcase(Document.parseHTMLUnsafe(testcase.data, config), testcase);
+  }, `parseHTMLUnsafe testcase ${index}, "${testcase.data}"`);
+}
+
+const all = parse_html5lib_testcases(
+    document.getElementById("all").textContent);
+const safe = parse_html5lib_testcases(
+    document.getElementById("safe").textContent);
+const unsafe = parse_html5lib_testcases(
+    document.getElementById("unsafe").textContent);
+all.forEach(test_safe);
+all.forEach(test_unsafe);
+safe.forEach(test_safe);
+unsafe.forEach(test_unsafe);
+
+
+// DOM only supports Document Type Declarations as children of documents. This
+// trips up the assert_testcase implementation, so we'll handle that seperately.
+parse_html5lib_testcases(
+    document.getElementById("document").textContent).
+    forEach((testcase, index) => {
+  test(_ => {
+    const tree = build_node_tree(new Document(), testcase.document);
+    assert_subtree_equals(Document.parseHTMLUnsafe(testcase.data, {}), tree);
+  }, `parseHTMLUnsafe full document testcase ${index}, "${testcase.data}"`);
+  test(_ => {
+    const tree = build_node_tree(new Document(), testcase.document);
+    assert_subtree_equals(Document.parseHTML(testcase.data, {}), tree);
+  }, `parseHTML full document testcase ${index}, "${testcase.data}"`);
+});
+</script>
+</head>
+<body>
+</body>
diff --git a/tests/wpt/tests/sanitizer-api/sethtml-safety.sub.dat b/tests/wpt/tests/sanitizer-api/sethtml-safety.sub.dat
index 6969835d66d..314d5ac37b1 100644
--- a/tests/wpt/tests/sanitizer-api/sethtml-safety.sub.dat
+++ b/tests/wpt/tests/sanitizer-api/sethtml-safety.sub.dat
@@ -34,10 +34,19 @@ script
 |   "xxx"
 
 #data
-<img src="https://{{host}}/test-image" onclick="2+2" one="two">
+<a href="https://{{host}}/" onclick="2+2" one="two">
 #document
-| <img>
-|   src="https://{{host}}/test-image"
+| <a>
+|   href="https://{{host}}/"
+
+#data
+<a href="https://{{host}}/" onclick="2+2" one="two">
+#config
+{ "elements": ["a"], "attributes": ["href", "onclick", "one"]}
+#document
+| <a>
+|   href="https://{{host}}/"
+|   one="two"
 
 #data
 <img src="https://{{host}}/test-image" onclick="2+2" one="two">
diff --git a/tests/wpt/tests/sanitizer-api/sethtml-tree-construction.sub.dat b/tests/wpt/tests/sanitizer-api/sethtml-tree-construction.sub.dat
index 47cc159df1f..cfbc74d1128 100644
--- a/tests/wpt/tests/sanitizer-api/sethtml-tree-construction.sub.dat
+++ b/tests/wpt/tests/sanitizer-api/sethtml-tree-construction.sub.dat
@@ -595,6 +595,16 @@ test<div>p</div>tt<p>div</p><test>test</test>
 | <div>
 |   <b>
 
+#data
+<table><div><td>
+#config
+{ "replaceWithChildrenElements": ["table"] }
+#document
+| <div>
+| <tbody>
+|   <tr>
+|     <td>
+
 #data
 <template><div>Hello</div></template>
 #config
diff --git a/tests/wpt/tests/sanitizer-api/sethtml-unsafety.sub.dat b/tests/wpt/tests/sanitizer-api/sethtml-unsafety.sub.dat
index bc162c04e5f..3b132a254ca 100644
--- a/tests/wpt/tests/sanitizer-api/sethtml-unsafety.sub.dat
+++ b/tests/wpt/tests/sanitizer-api/sethtml-unsafety.sub.dat
@@ -42,12 +42,22 @@ script
 |   "xxx"
 
 #data
-<img src="https://{{host}}/test-image" onclick="2+2" one="two">
+<a href="https://{{host}}/" onclick="2+2" one="two">
 #document
-| <img>
+| <a>
+|   href="https://{{host}}/"
+|   one="two"
+|   onclick="2+2"
+
+#data
+<a href="https://{{host}}/" onclick="2+2" one="two">
+#config
+{ "elements": ["a"], "attributes": ["href", "onclick", "one"]}
+#document
+| <a>
+|   href="https://{{host}}/"
 |   onclick="2+2"
 |   one="two"
-|   src="https://{{host}}/test-image"
 
 #data
 <img src="https://{{host}}/test-image" onclick="2+2" one="two">
diff --git a/tests/wpt/tests/sanitizer-api/sethtml-xml-document.html b/tests/wpt/tests/sanitizer-api/sethtml-xml-document.html
new file mode 100644
index 00000000000..73b1deb1abf
--- /dev/null
+++ b/tests/wpt/tests/sanitizer-api/sethtml-xml-document.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Test that setHTML parses as HTML even in an XML document</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/html5lib-testcase-support.js"></script>
+</head>
+<body>
+<script type="html5lib-tests">
+#data
+Hello!
+#document
+| "Hello!"
+
+#data
+<br>
+#document
+| <br>
+
+#data
+<p>Hi</p>
+#document
+| <p>
+|   "Hi"
+
+#data
+<iframe></iframe><p>text</p>
+#document
+| <p>
+|   "text"
+
+</script>
+<script>
+html5lib_testcases_from_script().forEach((testcase, index) => {
+  test(_ => {
+    const doc = document.implementation.createDocument("application/xml", "xml");
+    const context = doc.documentElement;
+    context.setHTML(testcase.data);
+    assert_testcase(context, testcase);
+  }, `Testcase #${index} with xmlDoc.setHTML("${testcase.data}")`);
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/scheduler/post-task-multiple-scheduler-order.window.js b/tests/wpt/tests/scheduler/post-task-multiple-scheduler-order.window.js
new file mode 100644
index 00000000000..14c7013d526
--- /dev/null
+++ b/tests/wpt/tests/scheduler/post-task-multiple-scheduler-order.window.js
@@ -0,0 +1,37 @@
+// META: title=Scheduler: Tasks run order when multiple scheduler interfere the same event loop
+promise_test(async t => {
+
+  const iframe = document.createElement("iframe");
+
+  iframe.onload = async function() {
+    const runOrder = [];
+    const tasks = [];
+
+    tasks.push(window.scheduler.postTask(function(){runOrder.push("outer")}));
+    tasks.push(iframe.contentWindow.scheduler.postTask(function(){runOrder.push("inner")}));
+
+    await Promise.all(tasks);
+
+    assert_equals(runOrder.toString(),'outer,inner');
+  }
+
+  document.body.appendChild(iframe);
+}, 'Test scheduler.postTask() from two different schedulers with the same priority will run based on their enqueue order.');
+
+promise_test(async t => {
+  const iframe = document.createElement("iframe");
+
+  iframe.onload = async function() {
+    const runOrder = [];
+    const tasks = [];
+
+    tasks.push(window.scheduler.postTask(function(){runOrder.push("outer")}));
+    tasks.push(iframe.contentWindow.scheduler.postTask(function(){runOrder.push("inner")}, {priority: "user-blocking"}));
+
+    await Promise.all(tasks);
+
+    assert_equals(runOrder.toString(),'inner,outer');
+  }
+
+  document.body.appendChild(iframe);
+}, 'Test scheduler.postTask() from two different schedulers with different priorities will run based on their priorities');
diff --git a/tests/wpt/tests/scheduler/tentative/yield/yield-abort.any.js b/tests/wpt/tests/scheduler/tentative/yield/yield-abort.any.js
index 94a8b2cb2b8..d5119b1c163 100644
--- a/tests/wpt/tests/scheduler/tentative/yield/yield-abort.any.js
+++ b/tests/wpt/tests/scheduler/tentative/yield/yield-abort.any.js
@@ -20,4 +20,15 @@ promise_test(t => {
     const p = scheduler.yield();
     await promise_rejects_dom(t, 'AbortError', p);
   }, {signal});
-}, 'yield() aborted in a separate task');
+}, 'yield() aborted by TaskController in a separate task');
+
+promise_test(t => {
+  const controller = new AbortController();
+  const signal = controller.signal;
+  return scheduler.postTask(async () => {
+    scheduler.postTask(async () => {controller.abort();}, {priority: 'user-blocking'});
+    t.step(() => assert_false(signal.aborted));
+    const p = scheduler.yield();
+    await promise_rejects_dom(t, 'AbortError', p);
+  }, {signal});
+}, 'yield() aborted by AbortController in a separate task');
diff --git a/tests/wpt/tests/screen-capture/getallscreensmedia-exposure.tentative.https.window.js b/tests/wpt/tests/screen-capture/getallscreensmedia-exposure.tentative.https.window.js
index 9be2fa07dd6..983fd6fbc9a 100644
--- a/tests/wpt/tests/screen-capture/getallscreensmedia-exposure.tentative.https.window.js
+++ b/tests/wpt/tests/screen-capture/getallscreensmedia-exposure.tentative.https.window.js
@@ -12,8 +12,7 @@ async_test(t => {
   i.src = "/content-security-policy/support/echo-policy.py?policy=" +
           encodeURIComponent("script-src 'none'; object-src 'none'; base-uri 'none'; require-trusted-types-for 'script'");
   i.onload = t.step_func_done(_ => {
-    assert_equals("function", typeof i.contentWindow.navigator.mediaDevices.getAllScreensMedia);
+    assert_equals("undefined", typeof i.contentWindow.navigator.mediaDevices.getAllScreensMedia);
   });
   document.body.appendChild(i);
-}, "Strict CSP + TT, exposure.");
-
+}, "Strict CSP + TT, no exposure.");
diff --git a/tests/wpt/tests/screen-capture/tentative/getdisplaymedia-captured-surface-resolution.https.html b/tests/wpt/tests/screen-capture/tentative/getdisplaymedia-captured-surface-resolution.https.html
index a1e7997ca69..31b62943eb1 100644
--- a/tests/wpt/tests/screen-capture/tentative/getdisplaymedia-captured-surface-resolution.https.html
+++ b/tests/wpt/tests/screen-capture/tentative/getdisplaymedia-captured-surface-resolution.https.html
@@ -35,16 +35,12 @@
       assert_not_equals(video.srcObject, null);
       let settings = track.getSettings();
       let capabilities = track.getCapabilities();
-      assert_greater_than(settings.physicalWidth, 0);
-      assert_greater_than(settings.physicalHeight, 0);
-      assert_equals(settings.physicalWidth / screenDetails.screens[0].devicePixelRatio, settings.logicalWidth);
-      assert_equals(settings.physicalHeight / screenDetails.screens[0].devicePixelRatio, settings.logicalHeight);
-      assert_equals(screenDetails.screens[0].devicePixelRatio, settings.pixelRatio);
-      assert_equals(capabilities.width.max, settings.physicalWidth);
-      assert_equals(capabilities.height.max, settings.physicalHeight);
+      assert_greater_than(capabilities.width.max, 0);
+      assert_greater_than(capabilities.height.max, 0);
+      assert_equals(screenDetails.screens[0].devicePixelRatio, settings.screenPixelRatio);
     };
     setTimeout(() => { video.requestVideoFrameCallback(onFrame); }, 100);
-  }, "getDisplayMedia() and resolution for captured surface type monitor");
+  }, "getDisplayMedia() and screenPixelRatio for captured surface type monitor");
 
   promise_test(async t => {
     var video = document.createElement("video");
@@ -60,16 +56,12 @@
       assert_not_equals(video.srcObject, null);
       let settings = track.getSettings();
       let capabilities = track.getCapabilities();
-      assert_greater_than(settings.physicalWidth, 0);
-      assert_greater_than(settings.physicalHeight, 0);
-      assert_equals(settings.physicalWidth / screenDetails.screens[0].devicePixelRatio, settings.logicalWidth);
-      assert_equals(settings.physicalHeight / screenDetails.screens[0].devicePixelRatio, settings.logicalHeight);
-      assert_equals(screenDetails.screens[0].devicePixelRatio, settings.pixelRatio);
-      assert_equals(capabilities.width.max, settings.physicalWidth);
-      assert_equals(capabilities.height.max, settings.physicalHeight);
+      assert_greater_than(capabilities.width.max, 0);
+      assert_greater_than(capabilities.height.max, 0);
+      assert_equals(screenDetails.screens[0].devicePixelRatio, settings.screenPixelRatio);
     };
     setTimeout(() => { video.requestVideoFrameCallback(onFrame); }, 100);
-  }, "getDisplayMedia() and resolution for captured surface type window");
+  }, "getDisplayMedia() and screenPixelRatio for captured surface type window");
 
   promise_test(async t => {
     var video = document.createElement("video");
@@ -83,16 +75,12 @@
       assert_not_equals(video.srcObject, null);
       let settings = track.getSettings();
       let capabilities = track.getCapabilities();
-      assert_greater_than(settings.physicalWidth, 0);
-      assert_greater_than(settings.physicalHeight, 0);
-      assert_equals(settings.physicalWidth / window.devicePixelRatio, settings.logicalWidth);
-      assert_equals(settings.physicalHeight / window.devicePixelRatio, settings.logicalHeight);
-      assert_equals(window.devicePixelRatio, settings.pixelRatio);
-      assert_equals(capabilities.width.max, settings.physicalWidth);
-      assert_equals(capabilities.height.max, settings.physicalHeight);
+      assert_greater_than(capabilities.width.max, 0);
+      assert_greater_than(capabilities.height.max, 0);
+      assert_equals(window.devicePixelRatio, settings.screenPixelRatio);
     };
     setTimeout(() => { video.requestVideoFrameCallback(onFrame); }, 100);
-  }, "getDisplayMedia() and resolution for captured surface type browser");
+  }, "getDisplayMedia() and screenPixelRatio for captured surface type browser");
 
   promise_test(async t => {
     var video = document.createElement("video");
@@ -110,8 +98,8 @@
       let capabilities = track.getCapabilities();
       let oldWidth = settings.width;
       let oldHeight = settings.height;
-      let oldPhysicalWidth = settings.physicalWidth;
-      let oldPhysicalHeight = settings.physicalHeight;
+      let oldCapbilitiesWidth = capabilities.width.max;
+      let oldCapabilitiesHeight = capabilities.height.max;
       assert_greater_than(settings.width, 0);
       assert_greater_than(settings.height, 0);
 
@@ -119,16 +107,12 @@
       settings = track.getSettings();
       assert_less_than_equal(settings.width, oldWidth);
       assert_less_than_equal(settings.height, oldHeight);
-      assert_equals(oldPhysicalWidth, settings.physicalWidth);
-      assert_equals(oldPhysicalHeight, settings.physicalHeight);
-      assert_equals(oldPhysicalWidth / screenDetails.screens[0].devicePixelRatio, settings.logicalWidth);
-      assert_equals(oldPhysicalHeight / screenDetails.screens[0].devicePixelRatio, settings.logicalHeight);
-      assert_equals(screenDetails.screens[0].devicePixelRatio, settings.pixelRatio);
-      assert_equals(capabilities.width.max, settings.physicalWidth);
-      assert_equals(capabilities.height.max, settings.physicalHeight);
+      assert_equals(screenDetails.screens[0].devicePixelRatio, settings.screenPixelRatio);
+      assert_equals(capabilities.width.max, oldCapbilitiesWidth);
+      assert_equals(capabilities.height.max, oldCapabilitiesHeight);
     };
     setTimeout(() => { video.requestVideoFrameCallback(onFrame); }, 100);
-  }, "applyConstraints() should not change the physical and logical size of captured surface type monitor");
+  }, "applyConstraints() should not change the capabilities resolution and screenPixelRatio of captured surface type monitor");
 
   promise_test(async t => {
     var video = document.createElement("video");
@@ -146,8 +130,8 @@
       let capabilities = track.getCapabilities();
       let oldWidth = settings.width;
       let oldHeight = settings.height;
-      let oldPhysicalWidth = settings.physicalWidth;
-      let oldPhysicalHeight = settings.physicalHeight;
+      let oldCapbilitiesWidth = capabilities.width.max;
+      let oldCapabilitiesHeight = capabilities.height.max;
       assert_greater_than(settings.width, 0);
       assert_greater_than(settings.height, 0);
 
@@ -155,16 +139,12 @@
       settings = track.getSettings();
       assert_less_than_equal(settings.width, oldWidth);
       assert_less_than_equal(settings.height, oldHeight);
-      assert_equals(oldPhysicalWidth, settings.physicalWidth);
-      assert_equals(oldPhysicalHeight, settings.physicalHeight);
-      assert_equals(oldPhysicalWidth / screenDetails.screens[0].devicePixelRatio, settings.logicalWidth);
-      assert_equals(oldPhysicalHeight / screenDetails.screens[0].devicePixelRatio, settings.logicalHeight);
-      assert_equals(screenDetails.screens[0].devicePixelRatio, settings.pixelRatio);
-      assert_equals(capabilities.width.max, settings.physicalWidth);
-      assert_equals(capabilities.height.max, settings.physicalHeight);
+      assert_equals(screenDetails.screens[0].devicePixelRatio, settings.screenPixelRatio);
+      assert_equals(capabilities.width.max, oldCapbilitiesWidth);
+      assert_equals(capabilities.height.max, oldCapabilitiesHeight);
     };
     setTimeout(() => { video.requestVideoFrameCallback(onFrame); }, 100);
-  }, "applyConstraints() should not change the physical and logical size of captured surface type window");
+  }, "applyConstraints() should not change the capabilities resolution and screenPixelRatio of captured surface type window");
 
   promise_test(async t => {
     var video = document.createElement("video");
@@ -180,8 +160,8 @@
       let capabilities = track.getCapabilities();
       let oldWidth = settings.width;
       let oldHeight = settings.height;
-      let oldPhysicalWidth = settings.physicalWidth;
-      let oldPhysicalHeight = settings.physicalHeight;
+      let oldCapbilitiesWidth = capabilities.width.max;
+      let oldCapabilitiesHeight = capabilities.height.max;
       assert_greater_than(settings.width, 0);
       assert_greater_than(settings.height, 0);
 
@@ -189,16 +169,12 @@
       settings = track.getSettings();
       assert_less_than_equal(settings.width, oldWidth);
       assert_less_than_equal(settings.height, oldHeight);
-      assert_equals(oldPhysicalWidth, settings.physicalWidth);
-      assert_equals(oldPhysicalHeight, settings.physicalHeight);
-      assert_equals(oldPhysicalWidth / window.devicePixelRatio, settings.logicalWidth);
-      assert_equals(oldPhysicalHeight / window.devicePixelRatio, settings.logicalHeight);
-      assert_equals(window.devicePixelRatio, settings.pixelRatio);
-      assert_equals(capabilities.width.max, settings.physicalWidth);
-      assert_equals(capabilities.height.max, settings.physicalHeight);
+      assert_equals(screenDetails.screens[0].devicePixelRatio, settings.screenPixelRatio);
+      assert_equals(capabilities.width.max, oldCapbilitiesWidth);
+      assert_equals(capabilities.height.max, oldCapabilitiesHeight);
     };
     setTimeout(() => { video.requestVideoFrameCallback(onFrame); }, 100);
-  }, "applyConstraints() should not change the physical and logical size of captured surface type browser");
+  }, "applyConstraints() should not change the capabilities resolution and screenPixelRatio of captured surface type browser");
 
 
 </script>
\ No newline at end of file
diff --git a/tests/wpt/tests/screen-orientation/lock-sandboxed-iframe.html b/tests/wpt/tests/screen-orientation/lock-sandboxed-iframe.html
index ab954f04b4c..f78d7d72d53 100644
--- a/tests/wpt/tests/screen-orientation/lock-sandboxed-iframe.html
+++ b/tests/wpt/tests/screen-orientation/lock-sandboxed-iframe.html
@@ -18,14 +18,13 @@
             resolve(evt.data.orientation);
             break;
           case "errored":
-            resolve(evt.data.name);
+            resolve(evt.data);
             break;
           default:
             assert_unreached(`Unexpected message: ${evt.data.result}`);
             return;
         }
         window.removeEventListener("message", callback);
-        resolve(evt.data.msg);
       }
       window.addEventListener("message", callback);
     });
@@ -38,10 +37,15 @@
     });
     const message = await wait_result();
     assert_equals(
-      message,
+      message.lock_name,
       "SecurityError",
       "screen.lockOrientation() throws a SecurityError"
     );
+    assert_equals(
+      message.unlock_name,
+      "SecurityError",
+      "screen.orientation.unlock() throws a SecurityError"
+    );
   }, "Test without 'allow-orientation-lock' sandboxing directive");
 
   promise_test(async (t) => {
diff --git a/tests/wpt/tests/screen-orientation/resources/sandboxed-iframe-locking.html b/tests/wpt/tests/screen-orientation/resources/sandboxed-iframe-locking.html
index 436c67f5b53..f4773535dbc 100644
--- a/tests/wpt/tests/screen-orientation/resources/sandboxed-iframe-locking.html
+++ b/tests/wpt/tests/screen-orientation/resources/sandboxed-iframe-locking.html
@@ -4,9 +4,6 @@
 <script>
 test_driver.set_test_context(parent);
 
-// At first, run simple unlock test without lock.
-screen.orientation?.unlock();
-
 test_driver.bless("request full screen", async () => {
   const data = {};
   try {
@@ -16,15 +13,22 @@ test_driver.bless("request full screen", async () => {
     data.orientation = screen.orientation.type;
   } catch (error) {
     data.result = "errored";
-    data.name = error.name;
+    data.lock_name = error.name;
+  }
+
+  // Common safety check test for unlock().
+  try {
+    screen.orientation.unlock();
+  } catch (error) {
+    data.result = "errored";
+    data.unlock_name = error.name;
   }
 
-  screen.orientation.unlock();
   try {
     await document.exitFullscreen();
   } catch (error) {
     data.result = "errored";
-    data.name = error.name;
+    data.exit_name = error.name;
   }
 
   parent.window.postMessage(data, "*");
diff --git a/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-alternate.tentative.html b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-alternate.tentative.html
new file mode 100644
index 00000000000..aa92e32c562
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-alternate.tentative.html
@@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="help" src="https://drafts.csswg.org/css-animations-2/#animation-trigger">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/web-animations/testcommon.js"></script>
+    <script src="/dom/events/scrolling/scroll_support.js"></script>
+    <script src="support/support.js"></script>
+  </head>
+  <body>
+    <style>
+      @keyframes myAnim {
+        from { transform: scaleX(1); }
+        to { transform: scaleX(5); }
+      }
+      .subject, .target {
+        height: 50px;
+        width: 50px;
+        background-color: red;
+      }
+      .target {
+        animation: myAnim linear 0.5s both;
+        animation-trigger: alternate;
+        animation-trigger-range: 150px 200px;
+      }
+      .scroll {
+        animation-trigger-timeline: scroll();
+      }
+      .view {
+        animation-trigger-timeline: view();
+      }
+      .deferred {
+        animation-trigger-timeline: --viewtimeline;
+      }
+      .deferred.subject {
+        view-timeline: --viewtimeline;
+      }
+      .scroller {
+        overflow-y: scroll;
+        height: 500px;
+        width: 500px;
+        border: solid 1px;
+        position: relative;
+      }
+      #wrapper {
+        timeline-scope: --viewtimeline;
+      }
+      #space {
+        width: 50px;
+        height: 600px;
+      }
+    </style>
+    <div id="wrapper">
+      <div id="scroll_scroller" class="scroller">
+        <div id="space"></div>
+        <div id="scroll_target" class="scroll subject target" tabindex="0"></div>
+        <div id="space"></div>
+      </div>
+      <div id="view_scroller" class="scroller">
+        <div id="space"></div>
+        <div id="view_target" class="view subject target" tabindex="0"></div>
+        <div id="space"></div>
+      </div>
+      <div id="deferred_scroller" class="scroller">
+        <div id="space"></div>
+        <div id="deferred_subject" class="deferred subject" tabindex="0"></div>
+        <div id="space"></div>
+      </div>
+      <div id="deferred_target" class="deferred target" tabindex="0"></div>
+    </div>
+    <script>
+      async function testAlternateAnimationTrigger(test, rangeBoundaries) {
+        // Just short of the trigger range start, no trigger action expected.
+        await testAnimationTrigger(test, () => {
+            return rangeBoundaries.exitTriggerRangeAbove();
+          }, target, ["animationstart", "animationend"], [false, false]);
+
+        // This skips the trigger range and should not play the animation.
+        await testAnimationTrigger(test, () => {
+            return rangeBoundaries.exitTriggerRangeBelow();
+          }, target, ["animationstart", "animationend"], [false, false]);
+
+        const initial_transform = getComputedStyle(target).transform;
+        // This enters the trigger range and should play the animation.
+        await testAnimationTrigger(test, () => {
+            return rangeBoundaries.enterTriggerRange();
+          }, target, ["animationstart", "animationend"], [true, true]);
+
+        const final_transform = getComputedStyle(target).transform;
+        // This is an alternate trigger, exiting the exit range reverses the
+        // animation.
+        await testAnimationTrigger(test, () => {
+            return rangeBoundaries.exitExitRangeAbove();
+          }, target, ["animationstart", "animationend", "animationcancel"],
+          [true, true, false]);
+        assert_equals(getComputedStyle(target).transform, initial_transform,
+          "animation reversed after reaching end");
+
+        // This is an alternate trigger, re-entering plays the animation.
+        await testAnimationTrigger(test, async () => {
+            // Enter the range.
+            await rangeBoundaries.enterTriggerRange();
+            await waitForAnimationFrames(5);
+            // Expect some but not all progress.
+            const current_transform = getComputedStyle(target).transform;
+            assert_not_equals(current_transform, initial_transform);
+            assert_not_equals(current_transform, final_transform);
+            // Exit the range.
+            return rangeBoundaries.exitExitRangeBelow();
+          }, target,
+          ["animationstart", "animationend", "animationcancel"],
+          [true, true, false]);
+        assert_equals(getComputedStyle(target).transform, initial_transform,
+          "animation reverse mid-animation");
+      }
+
+      // The trigger and exit ranges are the same for this test.
+      const CSS_TRIGGER_START_PX = 150;
+      const CSS_TRIGGER_END_PX = 200;
+
+      promise_test(async (test) => {
+        scroller = scroll_scroller;
+        target = scroll_target;
+
+        const rangeBoundaries = getRangeBoundariesForTest(CSS_TRIGGER_START_PX,
+                                                           CSS_TRIGGER_END_PX,
+                                                           CSS_TRIGGER_START_PX,
+                                                           CSS_TRIGGER_END_PX,
+                                                           scroller);
+        await testAlternateAnimationTrigger(test, rangeBoundaries);
+      }, "once animation triggered via scroll() timeline.");
+
+      promise_test(async (test) => {
+        scroller = view_scroller;
+        target = view_target;
+
+        const COVER_START_OFFSET = 100;
+
+        const rangeBoundaries = getRangeBoundariesForTest(
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      scroller);
+        await testAlternateAnimationTrigger(test, rangeBoundaries);
+      }, "once animation triggered via view() timeline.");
+
+      promise_test(async (test) => {
+        scroller = deferred_scroller;
+        target = deferred_target;
+
+        const COVER_START_OFFSET = 100;
+
+        const rangeBoundaries = getRangeBoundariesForTest(
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      scroller);
+        await testAlternateAnimationTrigger(test, rangeBoundaries);
+      }, "once animation triggered via deferred (view) timeline.");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-fill-mode-both-ref.html b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-fill-mode-both-ref.html
new file mode 100644
index 00000000000..62b74fb778f
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-fill-mode-both-ref.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="help" href="https://drafts.csswg.org/web-animations-2/#animation-trigger">
+  </head>
+  <body>
+    <style>
+      .scroller {
+        overflow-y: scroll;
+        border: solid 1px;
+        place-self: center;
+        height: 300px;
+        width: 200px;
+        position: relative;
+      }
+      .target {
+        height: 100px;
+        width: 100%;
+        background-color: blue;
+        position: absolute;
+        left: -50px;
+      }
+      .space {
+        height: 250px;
+        width: 50%;
+      }
+    </style>
+    <div id="scroller" class="scroller">
+      <div class="space"></div>
+      <div id="target" class="target"></div>
+      <div class="space"></div>
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-fill-mode-both.tentative.html b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-fill-mode-both.tentative.html
new file mode 100644
index 00000000000..237bbb99670
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-fill-mode-both.tentative.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="help" href="https://drafts.csswg.org/web-animations-2#animation-trigger">
+    <link rel="match" href="animation-trigger-fill-mode-both-ref.html">
+  </head>
+  <body>
+    <style>
+      .scroller {
+        overflow-y: scroll;
+        border: solid 1px;
+        place-self: center;
+        height: 300px;
+        width: 200px;
+        position: relative;
+      }
+      @keyframes slide-in {
+        from {
+          transform: translateX(-50px);
+        }
+      }
+      .target {
+        height: 100px;
+        width: 100%;
+        background-color: blue;
+        animation: slide-in 0.3s both;
+        animation-trigger: view() alternate contain 0% contain 100%;
+        position: absolute;
+      }
+      .space {
+        height: 250px;
+        width: 50%;
+      }
+
+    </style>
+    <div id="scroller" class="scroller">
+      <div class="space"></div>
+      <div id="target" class="target"></div>
+      <div class="space"></div>
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-fill-mode-none-ref.html b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-fill-mode-none-ref.html
new file mode 100644
index 00000000000..229a31dec90
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-fill-mode-none-ref.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <style>
+      .scroller {
+        overflow-y: scroll;
+        border: solid 1px;
+        place-self: center;
+        height: 300px;
+        width: 200px;
+        position: relative;
+      }
+      .target {
+        height: 100px;
+        width: 100%;
+        background-color: blue;
+      }
+      .space {
+        height: 250px;
+        width: 50%;
+      }
+
+    </style>
+    <div id="scroller" class="scroller">
+      <div class="space"></div>
+      <div id="target" class="target"></div>
+      <div class="space"></div>
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-fill-mode-none.tentative.html b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-fill-mode-none.tentative.html
new file mode 100644
index 00000000000..81dae8a2f72
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-fill-mode-none.tentative.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="help" href="https://drafts.csswg.org/web-animations-2#animation-trigger">
+    <link rel="match" href="animation-trigger-fill-mode-none-ref.html">
+  </head>
+  <body>
+    <style>
+      .scroller {
+        overflow-y: scroll;
+        border: solid 1px;
+        place-self: center;
+        height: 300px;
+        width: 200px;
+      }
+      @keyframes slide-in {
+        from {
+          transform: translateX(-50px);
+        }
+      }
+      .target {
+        height: 100px;
+        width: 100%;
+        background-color: blue;
+        animation: slide-in 3s none;
+        animation-trigger: view() alternate contain 0% contain 100%;
+      }
+      .space {
+        height: 250px;
+        width: 50%;
+      }
+
+    </style>
+    <div id="scroller" class="scroller">
+      <div class="space"></div>
+      <div id="target" class="target"></div>
+      <div class="space"></div>
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-getanimations.tentative.html b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-getanimations.tentative.html
new file mode 100644
index 00000000000..08d509d8cb2
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-getanimations.tentative.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="help" href="https://drafts.csswg.org/web-animations-2#animation-trigger">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <style>
+      .scroller {
+        overflow-y: scroll;
+        border: solid 1px;
+        place-self: center;
+        height: 300px;
+        width: 200px;
+      }
+      @keyframes slide-in {
+        from {
+          transform: translateX(-50px);
+        }
+      }
+      .target {
+        height: 100px;
+        width: 100%;
+        background-color: blue;
+        animation: slide-in 3s;
+        animation-trigger: view() alternate contain 0% contain 100%;
+      }
+      .target {
+        height: 100px;
+        width: 100%;
+        background-color: blue;
+      }
+      .space {
+        height: 250px;
+        width: 50%;
+      }
+
+      .active {
+        animation-fill-mode: both;
+      }
+      .idle {
+        animation-fill-mode: none;
+      }
+
+    </style>
+    <div id="scroller" class="scroller">
+      <div class="space"></div>
+      <div id="subject"></div>
+      <div class="space"></div>
+      <div id="active_target" class="active target"></div>
+      <div id="idle_target" class="idle target"></div>
+    </div>
+    <script>
+      promise_test(async () => {
+        assert_equals(idle_target.getAnimations().length, 1,
+        "idle target has an animation");
+      }, "getAnimations includes an untriggered " +
+         "'fill-mode: none' animation.");
+
+      promise_test(async () => {
+        assert_equals(active_target.getAnimations().length, 1,
+          "active target has an animation");
+      }, "getAnimations does include an untriggered " +
+          "'fill-mode: both' animation.");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-late-attached-timeline.tentative.html b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-late-attached-timeline.tentative.html
new file mode 100644
index 00000000000..e8b85b44220
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-late-attached-timeline.tentative.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="help" src="https://drafts.csswg.org/css-animations-2/#animation-trigger">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/web-animations/testcommon.js"></script>
+    <script src="/dom/events/scrolling/scroll_support.js"></script>
+    <script src="support/support.js"></script>
+  </head>
+  <body>
+    <style>
+      @keyframes myAnim {
+        from { transform: scaleX(1); }
+        to { transform: scaleX(5); }
+      }
+      .subject, .target {
+        height: 50px;
+        width: 50px;
+        background-color: red;
+      }
+      .target {
+        animation: myAnim linear 0.5s forwards;
+        animation-trigger: once 150px 200px;
+      }
+      .deferred.subject {
+        view-timeline: --viewtimeline;
+      }
+      .scroller {
+        overflow-y: scroll;
+        height: 500px;
+        width: 500px;
+        border: solid 1px;
+        position: relative;
+      }
+      #wrapper {
+        timeline-scope: --viewtimeline;
+      }
+      #space {
+        width: 50px;
+        height: 600px;
+      }
+    </style>
+    <div id="wrapper">
+      <div id="scroller" class="scroller">
+        <div id="space"></div>
+        <div id="deferred_subject" class="deferred subject"></div>
+        <div id="space"></div>
+      </div>
+      <div id="target" class="target"></div>
+    </div>
+    <script>
+      // The trigger and exit ranges are the same for this test.
+      const CSS_TRIGGER_START_PX = 150;
+      const CSS_TRIGGER_END_PX = 200;
+
+      promise_test(async (test) => {
+        const COVER_START_OFFSET = 100;
+
+        const rangeBoundaries = getRangeBoundariesForTest(
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      scroller);
+        const animation = target.getAnimations()[0];
+        await waitForAnimationFrames(5);
+        // The animation is currently associated with the document timeline and
+        // would automatically run. Cancel it.
+        animation.cancel();
+
+        // Enter the trigger range. Since it is not yet associated with the
+        // view timeline, this should have no effect.
+        await rangeBoundaries.enterTriggerRange();
+        await waitForAnimationFrames(5);
+
+        // Now attach a view timeline. Since we are in the trigger range, we
+        // should trigger.
+        await testAnimationTrigger(test, async () => {
+          target.style.animationTriggerTimeline = "--viewtimeline";
+          await waitForAnimationFrames(5);
+        }, target, ["animationstart", "animationend", "animationcancel"],
+           [true, true, false]);
+
+        assert_equals(animation.playState, "finished",
+           "animation was run when its trigger was attached to a view " +
+           " timeline inside the trigger range.");
+
+        // TODO: Add a test which switches the timeline of the trigger.
+      }, "late-attached trigger timeline plays animation");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-once-play-state.tentative.html b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-once-play-state.tentative.html
new file mode 100644
index 00000000000..23c6aa8ce9f
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-once-play-state.tentative.html
@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="help" src="https://drafts.csswg.org/css-animations-2/#animation-trigger">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/web-animations/testcommon.js"></script>
+    <script src="/dom/events/scrolling/scroll_support.js"></script>
+    <script src="support/support.js"></script>
+  </head>
+  <body>
+    <style>
+      @keyframes myAnim {
+        from { transform: scaleX(1); }
+        to { transform: scaleX(5); }
+      }
+      .subject, .target {
+        height: 50px;
+        width: 50px;
+        background-color: red;
+      }
+      .subject {
+        view-timeline: --viewtimeline;
+      }
+      .target {
+        animation: myAnim linear 0.5s forwards;
+        animation-trigger: once --viewtimeline 150px 200px;
+      }
+      .scroller {
+        overflow-y: scroll;
+        height: 500px;
+        width: 500px;
+        border: solid 1px;
+        position: relative;
+      }
+      #wrapper {
+        timeline-scope: --viewtimeline;
+      }
+      #space {
+        width: 50px;
+        height: 600px;
+      }
+    </style>
+    <div id="wrapper">
+      <div id="scroller" class="scroller">
+        <div id="space"></div>
+        <div id="subject" class="subject"></div>
+        <div id="space"></div>
+      </div>
+      <div id="target" class="target"></div>
+    </div>
+    <script>
+      target = document.getElementById("target");
+
+      function changePlayStateTo(state) {
+        target.style.animationPlayState = state;
+      }
+
+      // The trigger and exit ranges are the same for this test.
+      const CSS_TRIGGER_START_PX = 150;
+      const CSS_TRIGGER_END_PX = 200;
+
+      async function testPlayStateChange(test, rangeBoundaries) {
+        const initial_transform = getComputedStyle(target).transform;
+        // This enters the trigger range and should play the animation. Changing
+        // animation-play-state to "paused" should pause the animation, so we
+        // should not see an animationend event.
+        await testAnimationTrigger(test, async () => {
+            await rangeBoundaries.enterTriggerRange();
+            // Make a little progess.
+            await waitForAnimationFrames(5);
+            changePlayStateTo("paused");
+          }, target, ["animationstart", "animationend"], [true, false]);
+        await waitForAnimationFrames(5);
+        const partial_transform = getComputedStyle(target).transform;
+        assert_not_equals(partial_transform, initial_transform,
+          "animation made progress before pause.");
+
+        await waitForAnimationFrames(5);
+        assert_equals(getComputedStyle(target).transform, partial_transform,
+          "animation is paused and progress is not being made.");
+
+        await testAnimationTrigger(test, async () => {
+            await rangeBoundaries.exitExitRangeAbove();
+            await waitForAnimationFrames(5);
+            // check that exiting the exit range did not affect the animation.
+            assert_equals(getComputedStyle(target).transform, partial_transform,
+              "animation still paused after exiting the exit range.");
+            changePlayStateTo("running");
+          }, target, ["animationstart", "animationend"], [false, true]);
+
+        const final_transform = getComputedStyle(target).transform;
+        assert_not_equals(final_transform, initial_transform,
+          "animation is at the end, not the start");
+        assert_not_equals(final_transform, partial_transform,
+          "animation is at the end, beyond partial progress.");
+      }
+
+      promise_test(async (test) => {
+        scroller = document.getElementById("scroller");
+        target = document.getElementById("target");
+
+        const COVER_START_OFFSET = 100;
+        const rangeBoundaries = getRangeBoundariesForTest(
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      scroller);
+        await testPlayStateChange(test, rangeBoundaries);
+      }, "once trigger respects animation-play-state.");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-once.tentative.html b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-once.tentative.html
new file mode 100644
index 00000000000..e7603b458bc
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-once.tentative.html
@@ -0,0 +1,148 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="help" src="https://drafts.csswg.org/css-animations-2/#animation-trigger">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/web-animations/testcommon.js"></script>
+    <script src="/dom/events/scrolling/scroll_support.js"></script>
+    <script src="support/support.js"></script>
+  </head>
+  <body>
+    <style>
+      @keyframes myAnim {
+        from { transform: scaleX(1); }
+        to { transform: scaleX(5); }
+      }
+      .subject, .target {
+        height: 50px;
+        width: 50px;
+        background-color: red;
+      }
+      .target {
+        animation: myAnim linear 0.5s forwards;
+        animation-trigger: once;
+        animation-trigger-range: 150px 200px;
+      }
+      .scroll {
+        animation-trigger-timeline: scroll();
+      }
+      .view {
+        animation-trigger-timeline: view();
+      }
+      .deferred {
+        animation-trigger-timeline: --viewtimeline;
+      }
+      .deferred.subject {
+        view-timeline: --viewtimeline;
+      }
+      .scroller {
+        overflow-y: scroll;
+        height: 500px;
+        width: 500px;
+        border: solid 1px;
+        position: relative;
+      }
+      #wrapper {
+        timeline-scope: --viewtimeline;
+      }
+      #space {
+        width: 50px;
+        height: 600px;
+      }
+    </style>
+    <div id="wrapper">
+      <div id="scroll_scroller" class="scroller">
+        <div id="space"></div>
+        <div id="scroll_target" class="scroll subject target" tabindex="0"></div>
+        <div id="space"></div>
+      </div>
+      <div id="view_scroller" class="scroller">
+        <div id="space"></div>
+        <div id="view_target" class="view subject target" tabindex="0"></div>
+        <div id="space"></div>
+      </div>
+      <div id="deferred_scroller" class="scroller">
+        <div id="space"></div>
+        <div id="deferred_subject" class="deferred subject" tabindex="0"></div>
+        <div id="space"></div>
+      </div>
+      <div id="deferred_target" class="deferred target" tabindex="0"></div>
+    </div>
+    <script>
+      async function testOnceAnimationTrigger(test, rangeBoundaries) {
+        // Just short of the trigger range start, no trigger action expected.
+        await testAnimationTrigger(test, () => {
+            return rangeBoundaries.exitTriggerRangeAbove();
+          }, target, ["animationstart", "animationend"],
+          [false, false]);
+
+        // This skips the trigger range and should not play the animation.
+        await testAnimationTrigger(test, () => {
+            return rangeBoundaries.exitTriggerRangeBelow();
+          }, target, ["animationstart", "animationend"], [false, false]);
+
+        // This enters the trigger range and should play the animation.
+        await testAnimationTrigger(test, () => {
+            return rangeBoundaries.enterTriggerRange();
+          }, target, ["animationstart", "animationend"], [true, true]);
+
+        // This is a once trigger, exiting the exit range has no effect.
+        await testAnimationTrigger(test, () => {
+            return rangeBoundaries.exitExitRangeAbove();
+          }, target, ["animationcancel", "animationend"], [false, false]);
+
+        // This is a once trigger, re-entering range has no effect.
+        await testAnimationTrigger(test, () => {
+          return rangeBoundaries.enterTriggerRange();
+          }, target, ["animationstart", "animationend"], [false, false]);
+      }
+
+      // The trigger and exit ranges are the same for this test.
+      const CSS_TRIGGER_START_PX = 150;
+      const CSS_TRIGGER_END_PX = 200;
+
+      promise_test(async (test) => {
+        scroller = scroll_scroller;
+        target = scroll_target;
+
+        const rangeBoundaries = getRangeBoundariesForTest(CSS_TRIGGER_START_PX,
+                                                          CSS_TRIGGER_END_PX,
+                                                          CSS_TRIGGER_START_PX,
+                                                          CSS_TRIGGER_END_PX,
+                                                          scroller);
+        await testOnceAnimationTrigger(test, rangeBoundaries);
+      }, "once animation triggered via scroll() timeline.");
+
+      promise_test(async (test) => {
+        scroller = view_scroller;
+        target = view_target;
+
+        const COVER_START_OFFSET = 100;
+
+        const rangeBoundaries = getRangeBoundariesForTest(
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      scroller);
+        await testOnceAnimationTrigger(test, rangeBoundaries);
+      }, "once animation triggered via view() timeline.");
+
+      promise_test(async (test) => {
+        scroller = deferred_scroller;
+        target = deferred_target;
+
+        const COVER_START_OFFSET = 100;
+
+        const rangeBoundaries = getRangeBoundariesForTest(
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      scroller);
+        await testOnceAnimationTrigger(test, rangeBoundaries);
+      }, "once animation triggered via deferred (view) timeline.");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-repeat.tentative.html b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-repeat.tentative.html
new file mode 100644
index 00000000000..cfbe9d3c933
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-repeat.tentative.html
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="help" src="https://drafts.csswg.org/css-animations-2/#animation-trigger">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/web-animations/testcommon.js"></script>
+    <script src="/dom/events/scrolling/scroll_support.js"></script>
+    <script src="support/support.js"></script>
+  </head>
+  <body>
+    <style>
+      @keyframes myAnim {
+        from { transform: scaleX(1); }
+        to { transform: scaleX(5); }
+      }
+      .subject, .target {
+        height: 50px;
+        width: 50px;
+        background-color: red;
+      }
+      .target {
+        animation: myAnim linear 0.5s both;
+        animation-trigger: repeat;
+        animation-trigger-range: 250px 300px;
+        animation-trigger-exit-range: 200px 350px;
+      }
+      .scroll {
+        animation-trigger-timeline: scroll();
+      }
+      .view {
+        animation-trigger-timeline: view();
+      }
+      .deferred {
+        animation-trigger-timeline: --viewtimeline;
+      }
+      .deferred.subject {
+        view-timeline: --viewtimeline;
+      }
+      .scroller {
+        overflow-y: scroll;
+        height: 500px;
+        width: 500px;
+        border: solid 1px;
+        position: relative;
+      }
+      #wrapper {
+        timeline-scope: --viewtimeline;
+      }
+      #space {
+        width: 50px;
+        height: 600px;
+      }
+    </style>
+    <div id="wrapper">
+      <div id="scroll_scroller" class="scroller">
+        <div id="space"></div>
+        <div id="scroll_target" class="scroll subject target" tabindex="0"></div>
+        <div id="space"></div>
+      </div>
+      <div id="view_scroller" class="scroller">
+        <div id="space"></div>
+        <div id="view_target" class="view subject target" tabindex="0"></div>
+        <div id="space"></div>
+      </div>
+      <div id="deferred_scroller" class="scroller">
+        <div id="space"></div>
+        <div id="deferred_subject" class="deferred subject" tabindex="0"></div>
+        <div id="space"></div>
+      </div>
+      <div id="deferred_target" class="deferred target" tabindex="0"></div>
+    </div>
+    <script>
+      // // Each test case sets these.
+      // let scroller;
+      // let target;
+
+      async function testRepeatAnimationTrigger(test,  rangeBoundaries) {
+        // Just short of the trigger range start, no trigger action expected.
+        await testAnimationTrigger(test, () => {
+            return rangeBoundaries.exitTriggerRangeAbove();
+          }, target, ["animationstart", "animationend"], [false, false]);
+
+        // This skips the trigger range and should not play the animation.
+        await testAnimationTrigger(test, () => {
+          return rangeBoundaries.exitTriggerRangeBelow();
+          }, target, ["animationstart", "animationend"], [false, false]);
+
+        // This enters the trigger range and should play the animation.
+        await testAnimationTrigger(test, () => {
+            return rangeBoundaries.enterTriggerRange();
+          }, target, ["animationstart", "animationend"], [true, true]);
+
+        // This is a repeat trigger, exiting the exit range resets the animation.
+        // We waited for an animationend event in the previous step so we won't
+        // see an animationcancel event here. But, by inspecting
+        // style.transform, we should see that the animation was reset.
+        await testAnimationTrigger(test, () => {
+            return rangeBoundaries.exitExitRangeAbove();
+          }, target, ["animationstart", "animationend", "animationcancel"],
+          [false, false, false]);
+        assert_equals(getComputedStyle(target).transform, "none");
+
+        // This is a repeat trigger, re-entering plays the animation.
+        await testAnimationTrigger(test, async () => {
+            // Enter the range.
+            await rangeBoundaries.enterTriggerRange();
+            await waitForAnimationFrames(5);
+            // Exit the range.
+            return rangeBoundaries.exitExitRangeBelow();
+          }, target, ["animationstart", "animationend", "animationcancel"],
+          [true, false, true]);
+      }
+
+      const CSS_TRIGGER_START_PX = 250;
+      const CSS_TRIGGER_END_PX = 300;
+      const CSS_EXIT_START_PX = 200;
+      const CSS_EXIT_END_PX = 350;
+
+      promise_test(async (test) => {
+        scroller = scroll_scroller;
+        target = scroll_target;
+
+        const rangeBoundaries = getRangeBoundariesForTest(CSS_TRIGGER_START_PX,
+                                                         CSS_TRIGGER_END_PX,
+                                                         CSS_EXIT_START_PX,
+                                                         CSS_EXIT_END_PX,
+                                                         scroller);
+        await testRepeatAnimationTrigger(test, rangeBoundaries);
+      }, "once animation triggered via scroll() timeline.");
+
+      promise_test(async (test) => {
+        scroller = view_scroller;
+        target = view_target;
+
+        const COVER_START_OFFSET = 100;
+
+        const rangeBoundaries = getRangeBoundariesForTest(
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      COVER_START_OFFSET + CSS_EXIT_START_PX,
+                                      COVER_START_OFFSET + CSS_EXIT_END_PX,
+                                      scroller);
+        await testRepeatAnimationTrigger(test, rangeBoundaries);
+      }, "once animation triggered via view() timeline.");
+
+      promise_test(async (test) => {
+        scroller = deferred_scroller;
+        target = deferred_target;
+
+        const COVER_START_OFFSET = 100;
+
+        const rangeBoundaries = getRangeBoundariesForTest(
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      COVER_START_OFFSET + CSS_EXIT_START_PX,
+                                      COVER_START_OFFSET + CSS_EXIT_END_PX,
+                                      scroller);
+        await testRepeatAnimationTrigger(test, rangeBoundaries);
+      }, "once animation triggered via deferred (view) timeline.");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-state.tentative.html b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-state.tentative.html
new file mode 100644
index 00000000000..a9d58ae4c32
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger-state.tentative.html
@@ -0,0 +1,182 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="help" src="https://drafts.csswg.org/css-animations-2/#animation-trigger">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/web-animations/testcommon.js"></script>
+    <script src="/dom/events/scrolling/scroll_support.js"></script>
+    <script src="support/support.js"></script>
+  </head>
+  <body>
+    <style>
+      @keyframes myAnim {
+        from { transform: scaleX(1); }
+        to { transform: scaleX(5); }
+      }
+      .subject, .target {
+        height: 50px;
+        width: 50px;
+        background-color: red;
+      }
+      .target {
+        animation: myAnim linear 0.5s both;
+        animation-trigger: state;
+        animation-trigger-range: 150px 200px;
+      }
+      .scroll {
+        animation-trigger-timeline: scroll();
+      }
+      .view {
+        animation-trigger-timeline: view();
+      }
+      .deferred {
+        animation-trigger-timeline: --viewtimeline;
+      }
+      .deferred.subject {
+        view-timeline: --viewtimeline;
+      }
+      .scroller {
+        overflow-y: scroll;
+        height: 500px;
+        width: 500px;
+        border: solid 1px;
+        position: relative;
+      }
+      #wrapper {
+        timeline-scope: --viewtimeline;
+      }
+      #space {
+        width: 50px;
+        height: 600px;
+      }
+    </style>
+    <div id="wrapper">
+      <div id="scroll_scroller" class="scroller">
+        <div id="space"></div>
+        <div id="scroll_target" class="scroll subject target" tabindex="0"></div>
+        <div id="space"></div>
+      </div>
+      <div id="view_scroller" class="scroller">
+        <div id="space"></div>
+        <div id="view_target" class="view subject target" tabindex="0"></div>
+        <div id="space"></div>
+      </div>
+      <div id="deferred_scroller" class="scroller">
+        <div id="space"></div>
+        <div id="deferred_subject" class="deferred subject" tabindex="0"></div>
+        <div id="space"></div>
+      </div>
+      <div id="deferred_target" class="deferred target" tabindex="0"></div>
+    </div>
+    <script>
+      async function testStateAnimationTrigger(test, rangeBoundaries) {
+        // Just short of the trigger range start, no trigger action expected.
+        await testAnimationTrigger(test, () => {
+            return rangeBoundaries.exitTriggerRangeAbove();
+          }, target, ["animationstart", "animationend"], [false, false]);
+
+        // This skips the trigger range and should not play the animation.
+        await testAnimationTrigger(test, () => {
+            return rangeBoundaries.exitTriggerRangeBelow();
+          }, target, ["animationstart", "animationend"], [false, false]);
+
+        const initial_transform = getComputedStyle(target).transform;
+        // This is a state trigger, entering the trigger range plays the
+        // animation.
+        await testAnimationTrigger(test, async () => {
+            // Enter the range.
+            await rangeBoundaries.enterTriggerRange();
+            await waitForAnimationFrames(5);
+            // Expect some progress.
+            assert_not_equals(getComputedStyle(target).transform,
+              initial_transform);
+            // Exit the range, which should pause the animation.
+            return rangeBoundaries.exitExitRangeBelow();
+          }, target, ["animationstart", "animationend", "animationcancel"],
+          [true, false, false]);
+        let partial_transform = getComputedStyle(target).transform;
+
+        // Wait a few frames, then check that the animation is still paused.
+        await waitForAnimationFrames(5);
+        assert_equals(getComputedStyle(target).transform, partial_transform);
+
+        // This enters the trigger range and should continue the animation.
+        // Let it play till the end.
+        await testAnimationTrigger(test, () => {
+            return rangeBoundaries.enterTriggerRange();
+          }, target, ["animationstart", "animationend"], [false, true]);
+        let final_transform = getComputedStyle(target).transform;
+
+        // Exit the range. This should have no effect as the animation has
+        // already finished.
+        await testAnimationTrigger(test, async () => {
+            return rangeBoundaries.exitExitRangeAbove();
+          }, target, ["animationstart", "animationend", "animationcancel"],
+          [false, false, false]);
+
+        // Wait a few frames. Exiting the animation should make no difference;
+        // the animation is already finished.
+        await waitForAnimationFrames(5);
+        assert_equals(getComputedStyle(target).transform, final_transform);
+
+        // Enter the range again. This should make no difference. The animation
+        // is already finished.
+        await testAnimationTrigger(test, async () => {
+            return rangeBoundaries.enterTriggerRange();
+          }, target, ["animationstart", "animationend", "animationcancel"],
+          [false, false, false]);
+
+        // Wait a few frames. Check the animation is still at the end.
+        await waitForAnimationFrames(5);
+        assert_equals(getComputedStyle(target).transform, final_transform);
+      }
+
+      // The trigger and exit ranges are the same for this test.
+      const CSS_TRIGGER_START_PX = 150;
+      const CSS_TRIGGER_END_PX = 200;
+
+      promise_test(async (test) => {
+        scroller = scroll_scroller;
+        target = scroll_target;
+
+        const rangeBoundaries = getRangeBoundariesForTest(CSS_TRIGGER_START_PX,
+                                                          CSS_TRIGGER_END_PX,
+                                                          CSS_TRIGGER_START_PX,
+                                                          CSS_TRIGGER_END_PX,
+                                                          scroller);
+        await testStateAnimationTrigger(test, rangeBoundaries);
+      }, "once animation triggered via scroll() timeline.");
+
+      promise_test(async (test) => {
+        scroller = view_scroller;
+        target = view_target;
+
+        const COVER_START_OFFSET = 100;
+
+        const rangeBoundaries = getRangeBoundariesForTest(
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      scroller);
+        await testStateAnimationTrigger(test, rangeBoundaries);
+      }, "once animation triggered via view() timeline.");
+
+      promise_test(async (test) => {
+        scroller = deferred_scroller;
+        target = deferred_target;
+
+        const COVER_START_OFFSET = 100;
+
+        const rangeBoundaries = getRangeBoundariesForTest(
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_START_PX,
+                                      COVER_START_OFFSET + CSS_TRIGGER_END_PX,
+                                      scroller);
+        await testStateAnimationTrigger(test, rangeBoundaries);
+      }, "once animation triggered via deferred (view) timeline.");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger.html b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger.html
new file mode 100644
index 00000000000..7506fb05829
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/animation-trigger/animation-trigger.html
@@ -0,0 +1,169 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="help" src="https://drafts.csswg.org/css-animations-2/#animation-trigger">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/web-animations/testcommon.js"></script>
+    <script src="/css/css-typed-om/resources/testhelper.js"></script>
+  </head>
+  <body>
+    <style>
+      @keyframes myAnim {
+        from { transform: scaleX(1); }
+        to { transform: scaleX(5); }
+      }
+      .subject, .target {
+        height: 50px;
+        width: 50px;
+        background-color: red;
+      }
+      .subject {
+        view-timeline: --viewtimeline;
+      }
+      .target {
+        animation: myAnim linear 0.5s forwards;
+      }
+      #scroll_target {
+        animation-trigger: repeat scroll(inline) 150px 200px 100px 250px;
+      }
+      #view_target {
+        animation-trigger: state view(x) contain 10% contain 90% cover 10% cover 90%;
+      }
+      #deferred_target {
+        animation-trigger: alternate --viewtimeline contain 5% contain 80% cover 5% cover 80%;
+      }
+      .scroller {
+        overflow-y: scroll;
+        height: 500px;
+        width: 500px;
+        border: solid 1px;
+        position: relative;
+      }
+      #wrapper {
+        timeline-scope: --viewtimeline;
+      }
+      #space {
+        width: 50px;
+        height: 600px;
+      }
+    </style>
+    <div id="wrapper">
+      <div id="default_target" class="target"></div>
+      <div id="scroller" class="scroller">
+        <div id="space"></div>
+        <div id="scroll_target" class="target"></div>
+        <div id="space"></div>
+        <div id="view_target" class="target"></div>
+        <div id="space"></div>
+        <div id="deferred_subject" class="subject"></div>
+        <div id="space"></div>
+      </div>
+      <div id="deferred_target" class="target"></div>
+    </div>
+    <script>
+      function assert_timeline_offset(actual, expected, errorMessage) {
+        assert_equals(actual.rangeName, expected.rangeName, errorMessage);
+        assert_style_value_equals(actual.offset, expected.offset);
+      }
+
+      function testTrigger(trigger, expectation) {
+        assert_equals(trigger.type, expectation.type, "trigger type matches");
+        assert_timeline_offset(trigger.rangeStart, expectation.rangeStart,
+          "trigger rangeStart matches");
+        assert_timeline_offset(trigger.rangeEnd, expectation.rangeEnd,
+          "trigger rangeEnd matches");
+        assert_timeline_offset(trigger.exitRangeStart, expectation.exitRangeStart,
+          "trigger exitRangeStart matches");
+        assert_timeline_offset(trigger.exitRangeEnd, expectation.exitRangeEnd,
+          "trigger exitRangeEnd matches");
+        if (expectation.timeline === document.timeline) {
+          assert_equals(trigger.timeline, document.timeline, "timeline matches");
+        } else {
+          assert_equals(trigger.timeline.source, expectation.timelineSource,
+            "trigger timeline source matches");
+          assert_equals(trigger.timeline.axis, expectation.timelineAxis,
+            "trigger timeline axis matches");
+          assert_equals(trigger.timeline.subject, expectation.timelineSubject,
+            "trigger timeline subject matches");
+        }
+      }
+
+      promise_test(async() => {
+        await waitForNextFrame();
+        const animation = default_target.getAnimations()[0];
+        const trigger = animation.trigger;
+
+        const expectation = {
+          type: "once",
+          rangeStart: "normal",
+          rangeEnd: "normal",
+          exitRangeStart: "normal",
+          exitRangeEnd: "normal",
+          timeline: document.timeline
+        };
+
+        testTrigger(trigger, expectation);
+      }, "Default AnimationTrigger for CSS Animation");
+
+      promise_test(async() => {
+        await waitForNextFrame();
+        const animation = scroll_target.getAnimations()[0];
+        const trigger = animation.trigger;
+        await waitForNextFrame();
+
+        const expectation = {
+          type: "repeat",
+          rangeStart: { rangeName: "none", offset: CSS.px(150) },
+          rangeEnd: { rangeName: "none", offset: CSS.px(200) },
+          exitRangeStart: { rangeName: "none", offset: CSS.px(100) },
+          exitRangeEnd: { rangeName: "none", offset: CSS.px(250) },
+          timelineSource: scroller,
+          timelineAxis: "inline"
+        };
+
+        testTrigger(trigger, expectation);
+      }, "AnimationTrigger for CSS Animation with scroll() timeline");
+
+      promise_test(async() => {
+        await waitForNextFrame();
+        const animation = view_target.getAnimations()[0];
+        const trigger = animation.trigger;
+        await waitForNextFrame();
+
+        const expectation = {
+          type: "state",
+          rangeStart: { rangeName: 'contain', offset: CSS.percent(10) },
+          rangeEnd: { rangeName: 'contain', offset: CSS.percent(90) },
+          exitRangeStart: { rangeName: 'cover', offset: CSS.percent(10) },
+          exitRangeEnd: { rangeName: 'cover', offset: CSS.percent(90) },
+          timelineSource: scroller,
+          timelineAxis: "x",
+          timelineSubject: view_target
+        };
+
+        testTrigger(trigger, expectation);
+      }, "AnimationTrigger for CSS Animation with view() timeline");
+
+      promise_test(async() => {
+        await waitForNextFrame();
+        const animation = deferred_target.getAnimations()[0];
+        const trigger = animation.trigger;
+        await waitForNextFrame();
+
+        const expectation = {
+          type: "alternate",
+          rangeStart: { rangeName: 'contain', offset: CSS.percent(5) },
+          rangeEnd: { rangeName: 'contain', offset: CSS.percent(80) },
+          exitRangeStart: { rangeName: 'cover', offset: CSS.percent(5) },
+          exitRangeEnd: { rangeName: 'cover', offset: CSS.percent(80) },
+          timelineSource: scroller,
+          timelineAxis: "block",
+          timelineSubject: deferred_subject
+        };
+
+        testTrigger(trigger, expectation);
+      }, "AnimationTrigger for CSS Animation with deferred timeline");
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/scroll-animations/animation-trigger/support/support.js b/tests/wpt/tests/scroll-animations/animation-trigger/support/support.js
new file mode 100644
index 00000000000..f5aa18e82f1
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/animation-trigger/support/support.js
@@ -0,0 +1,86 @@
+
+// Assert that the user agent under test supports AnimationTrigger.
+// AnimationTrigger tests should do this sanity check before proceeding.
+function assertAnimationTriggerSupport() {
+  assert_true(document.documentElement.style.animationTrigger !== undefined);
+}
+
+const setScrollTop = (scroller, y) => {
+  const scrollend_promise =
+    waitForScrollEndFallbackToDelayWithoutScrollEvent(scroller);
+  scroller.scrollTop = y;
+  return scrollend_promise;
+}
+
+function getRangeBoundariesForTest(trigger_start, trigger_end,
+                                   exit_start, exit_end, scroller) {
+  let rangeBoundaries = {
+    scroller: scroller,
+    offsetWithinTriggerRange: (trigger_start + trigger_end) / 2,
+    offsetAboveTriggerRange: trigger_start - 10,
+    offsetBelowTriggerRange: trigger_end + 10,
+    offsetAboveExitRange: exit_start - 10,
+    offsetBelowExitRange: exit_end + 10,
+  };
+
+  rangeBoundaries.enterTriggerRange = async () => {
+    return setScrollTop(rangeBoundaries.scroller,
+                        rangeBoundaries.offsetWithinTriggerRange);
+  };
+  rangeBoundaries.exitTriggerRangeAbove = async () => {
+    return setScrollTop(rangeBoundaries.scroller,
+                        rangeBoundaries.offsetAboveTriggerRange);
+  };
+  rangeBoundaries.exitTriggerRangeBelow = async () => {
+    return setScrollTop(rangeBoundaries.scroller,
+                        rangeBoundaries.offsetBelowTriggerRange);
+  };
+  rangeBoundaries.exitExitRangeAbove = async () => {
+    return setScrollTop(rangeBoundaries.scroller,
+                        rangeBoundaries.offsetAboveExitRange);
+  };
+  rangeBoundaries.exitExitRangeBelow = async () => {
+    return setScrollTop(rangeBoundaries.scroller,
+                        rangeBoundaries.offsetBelowExitRange);
+  };
+
+  return rangeBoundaries;
+}
+
+// Helper function for animation-trigger tests. Aims to perform a scroll and
+// observe the animation events indicated by |events_of_interest| and
+// |events_should_fire|
+async function testAnimationTrigger(test, scroll_fn, target,
+                                    events_of_interest,  events_should_fire) {
+  assertAnimationTriggerSupport();
+
+  let evt_promises = [];
+  for (let idx = 0; idx < events_of_interest.length; idx++) {
+    const evt = events_of_interest[idx];
+    const animationevent_promise = new Promise((resolve) => {
+      const watcher_func = () => {
+        if (!events_should_fire[idx]) {
+          test.unreached_func(`received unexpected event: ${evt}.`)();
+        }
+        resolve();
+      }
+
+      target.addEventListener(evt, watcher_func,
+        { once: true });
+
+      // If we are not expecting the event, just wait for 3 frames before
+      // continuing the test.
+      if (!events_should_fire[idx]) {
+        waitForAnimationFrames(3).then(() => {
+          target.removeEventListener(evt, watcher_func);
+          resolve();
+        });
+      }
+    });
+
+    evt_promises.push(animationevent_promise);
+  }
+
+  await scroll_fn();
+  await Promise.all(evt_promises);
+}
diff --git a/tests/wpt/tests/scroll-animations/css/printing/animation-timeline-none-with-progress-print.tentative.html b/tests/wpt/tests/scroll-animations/css/printing/animation-timeline-none-with-progress-print.tentative.html
index 54f629dafac..c250b99d6d4 100644
--- a/tests/wpt/tests/scroll-animations/css/printing/animation-timeline-none-with-progress-print.tentative.html
+++ b/tests/wpt/tests/scroll-animations/css/printing/animation-timeline-none-with-progress-print.tentative.html
@@ -10,6 +10,9 @@
     from { transform: translateX(0px); }
     to { transform: translateX(100px); }
   }
+  :root {
+    print-color-adjust: exact;
+  }
 
   #scroller {
     scroll-timeline: --timeline;
diff --git a/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-iframe-print.html b/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-iframe-print.html
index 0e0d42b0084..187d9deffe4 100644
--- a/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-iframe-print.html
+++ b/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-iframe-print.html
@@ -30,6 +30,7 @@
       to { transform: translateY(200px); }
     }
     html {
+      print-color-adjust: exact;
       min-height: 100%;
       padding-bottom: 100px;
     }
diff --git a/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-print-ref.html b/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-print-ref.html
index 6610f7a5a7e..fa8371a5f1e 100644
--- a/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-print-ref.html
+++ b/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-print-ref.html
@@ -2,6 +2,7 @@
 <title>Reference for default scroll() timeline</title>
 <style>
   html {
+    print-color-adjust: exact;
     min-height: 100%;
     padding-bottom: 100px;
   }
diff --git a/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-print.tentative.html b/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-print.tentative.html
index 3f25cc93dba..0c0e744e55a 100644
--- a/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-print.tentative.html
+++ b/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-print.tentative.html
@@ -13,6 +13,7 @@
   }
 
   html {
+    print-color-adjust: exact;
     min-height: 100%;
     padding-bottom: 100px;
   }
diff --git a/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-specified-scroller-print.html b/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-specified-scroller-print.html
index dd4add49b0f..53905d752a2 100644
--- a/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-specified-scroller-print.html
+++ b/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-specified-scroller-print.html
@@ -12,6 +12,10 @@
     to { transform: translateX(100px); }
   }
 
+  :root {
+    print-color-adjust: exact;
+  }
+
   #scroller {
     scroll-timeline: --timeline;
     overflow: scroll;
diff --git a/tests/wpt/tests/scroll-animations/css/scroll-timeline-default-iframe-ref.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-default-iframe-ref.html
index 1ab5646c8bd..e1c48f67ec8 100644
--- a/tests/wpt/tests/scroll-animations/css/scroll-timeline-default-iframe-ref.html
+++ b/tests/wpt/tests/scroll-animations/css/scroll-timeline-default-iframe-ref.html
@@ -4,6 +4,7 @@
   <html>
   <style>
     html {
+      print-color-adjust: exact;
       min-height: 100%;
       padding-bottom: 100px;
     }
diff --git a/tests/wpt/tests/scroll-animations/css/view-timeline-range-animation.html b/tests/wpt/tests/scroll-animations/css/view-timeline-range-animation.html
index 9e5993b63a8..0998a9909f9 100644
--- a/tests/wpt/tests/scroll-animations/css/view-timeline-range-animation.html
+++ b/tests/wpt/tests/scroll-animations/css/view-timeline-range-animation.html
@@ -229,4 +229,11 @@
     endOffset: 880
   }, template_with_scope, '(scoped)');
 
+  test_animation_range({
+    rangeStart: 'scroll 100px',
+    rangeEnd: 'scroll 800px',
+    startOffset: 100,
+    endOffset: 800
+  });
+
 </script>
diff --git a/tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-transform.html b/tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-transform.html
index f741cc634d7..323d984c989 100644
--- a/tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-transform.html
+++ b/tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-transform.html
@@ -21,7 +21,7 @@
   }
 
   #scroller {
-    overflow: auto;
+    overflow: hidden;
     height: 100px;
     width: 100px;
     will-change: transform; /* force compositing */
diff --git a/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-animation.html b/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-animation.html
index e3544762f60..cca59eff056 100644
--- a/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-animation.html
+++ b/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-animation.html
@@ -133,6 +133,10 @@ promise_test(async t => {
     scroller.scrollTop =  maxScroll;
     await animation.finished;
 
+    // Wait for the next animation frame for the previous "finish"
+    // event to have dispatched.
+    await waitForNextFrame();
+
     var sent_finish_event = false;
     animation.onfinish = function() {
       sent_finish_event = true;
diff --git a/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-timeline-invalidation.html b/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-timeline-invalidation.html
index a26500989ed..a0d33c28e08 100644
--- a/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-timeline-invalidation.html
+++ b/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-timeline-invalidation.html
@@ -123,6 +123,15 @@ promise_test(async t => {
   // makes the scroll timeline stale.
   // https://github.com/w3c/csswg-drafts/issues/8694
 
+  // runAndWaitForFrameUpdate will yield after the requestAnimationFrame callbacks
+  // have been serviced, which is prior to when stale timelines are updated.
+  // https://github.com/w3c/csswg-drafts/issues/12120
+  assert_approx_equals(timeline.currentTime.value, 60, 0.1);
+
+  // Now wait another beat such that the rest of the HTML Processing Model event loop
+  // has run and we can check whether stale timelines have been updated.
+  await new Promise(setTimeout);
+
   // With a single layout, timeline current time would be at 60%, but the
   // timeline would be stale.
   const expected_progress = 60 * maxScroll / (maxScroll + 1000);
diff --git a/tests/wpt/tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline-cancel-one.html b/tests/wpt/tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline-cancel-one.html
index ed8e8337a65..28973d2d185 100644
--- a/tests/wpt/tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline-cancel-one.html
+++ b/tests/wpt/tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline-cancel-one.html
@@ -22,7 +22,7 @@
   }
 
   #scroller {
-    overflow: auto;
+    overflow: hidden;
     height: 100px;
     width: 100px;
     will-change: transform; /* force compositing */
diff --git a/tests/wpt/tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline.html b/tests/wpt/tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline.html
index de50599fbaf..45ba3f99ccd 100644
--- a/tests/wpt/tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline.html
+++ b/tests/wpt/tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline.html
@@ -22,7 +22,7 @@ drive two animations">
   }
 
   #scroller {
-    overflow: auto;
+    overflow: hidden;
     height: 100px;
     width: 100px;
     will-change: transform; /* force compositing */
diff --git a/tests/wpt/tests/scroll-animations/view-timelines/fieldset-source.html b/tests/wpt/tests/scroll-animations/view-timelines/fieldset-source.html
index d75f30e664e..cdd2e0be40c 100644
--- a/tests/wpt/tests/scroll-animations/view-timelines/fieldset-source.html
+++ b/tests/wpt/tests/scroll-animations/view-timelines/fieldset-source.html
@@ -87,7 +87,7 @@
           parseFloat(getComputedStyle(fieldset).borderBottom);
 
       // Validate the start and end offsets for each view timeline.
-      anims.forEach(async (anim) => {
+      for (let anim of anims) {
         assert_equals(anim.timeline.source.id, 'fieldset');
         assert_equals(anim.timeline.subject.tagName, 'INPUT');
         const bounds = anim.effect.target.getBoundingClientRect();
@@ -96,13 +96,13 @@
         const expectedEndOffset = bounds.bottom - fieldsetContentTop;
         assert_approx_equals(
             parseFloat(anim.timeline.startOffset),
-            expectedStartOffset, 0.1,
+            expectedStartOffset, 0.5,
             `Unexpected start offset for ${anim.effect.target.id}`);
         assert_approx_equals(
             parseFloat(anim.timeline.endOffset),
-            expectedEndOffset, 0.1,
+            expectedEndOffset, 0.5,
             `Unexpected end offset for ${anim.effect.target.id}`);
-      });
+      };
     }, 'Fieldset is a valid source for a view timeline');
   }
 
diff --git a/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-get-current-time-range-name.tentative.html b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-get-current-time-range-name.tentative.html
index 25e477e1a97..c6920143ee1 100644
--- a/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-get-current-time-range-name.tentative.html
+++ b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-get-current-time-range-name.tentative.html
@@ -59,6 +59,10 @@
                                            });
     let timeline = anim.timeline;
 
+    assert_percents_approx_equal(
+      timeline.getCurrentTime('scroll'), 0, MAX_SCROLL,
+      'Scroll aligned with scroll start');
+
     container.scrollLeft = 600;
     await waitForNextFrame();
 
@@ -69,12 +73,20 @@
     assert_percents_approx_equal(timeline.getCurrentTime(), 0,
                                  MAX_SCROLL,
                                  'Scroll aligned with timeline start offset');
+    let scroll_pct = (600 / MAX_SCROLL) * 100;
+    assert_percents_approx_equal(
+      timeline.getCurrentTime('scroll'), scroll_pct, MAX_SCROLL,
+      'getCurrentTime for "scroll" range scrollLeft=600');
 
     container.scrollLeft = 650;
     await waitForNextFrame();
 
     assert_percents_approx_equal(timeline.getCurrentTime('entry'), 50,
                                  MAX_SCROLL, 'Scroll at entry midpoint');
+    scroll_pct = (650 / MAX_SCROLL) * 100;
+    assert_percents_approx_equal(
+      timeline.getCurrentTime('scroll'), scroll_pct, MAX_SCROLL,
+      'getCurrentTime for "scroll" range scrollLeft=650');
 
     container.scrollLeft = 700;
     await waitForNextFrame();
@@ -115,10 +127,20 @@
                                  MAX_SCROLL, 'Scroll at cover end');
     assert_percents_approx_equal(timeline.getCurrentTime(), 100,
                                  MAX_SCROLL, 'Scroll at end of timeline');
+    scroll_pct = (900 / MAX_SCROLL) * 100;
+    assert_percents_approx_equal(
+      timeline.getCurrentTime('scroll'), scroll_pct, MAX_SCROLL,
+      'getCurrentTime for "scroll" range scrollLeft=900');
 
     assert_equals(timeline.getCurrentTime('gibberish'), null,
                   'No current time for unknown named range');
 
+    container.scrollLeft = MAX_SCROLL;
+    await waitForNextFrame();
+    assert_percents_approx_equal(
+      timeline.getCurrentTime('scroll'), 100, MAX_SCROLL,
+      'getCurrentTime for "scroll" range at max scroll offset');
+
     // Add insets to force the start and end offsets to align. This forces
     // the timeline to become inactive.
     // start_offset = target_offset - viewport_size + end_side_inset
diff --git a/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-get-set-range.html b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-get-set-range.html
index 94660abcf27..7bf4516700c 100644
--- a/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-get-set-range.html
+++ b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-get-set-range.html
@@ -122,6 +122,25 @@
         'rangeEnd set to contain 100%');
     assert_equals(getComputedStyle(target).opacity, '0.75',
                   'opacity with range set to [normal, contain 100%]');
+
+    // scroll 10% @ 160px
+    // scroll 90% @ 1440px
+    // expected opacity = (750 - 160) / (1440 - 160) = 0.4609375
+    await runAndWaitForFrameUpdate(() => {
+      anim.rangeStart = "scroll 10%";
+      anim.rangeEnd = "scroll 90%";
+    });
+    assert_timeline_offset(
+        anim.rangeStart,
+        { rangeName: 'scroll', offset: CSS.percent(10) },
+        'rangeStart set to scroll 10%');
+    assert_timeline_offset(
+        anim.rangeEnd,
+        { rangeName: 'scroll', offset: CSS.percent(90) },
+        'rangeEnd set to scroll 90%');
+    assert_approx_equals(
+        parseFloat(getComputedStyle(target).opacity), 0.4609375, 1e-6,
+        'opacity with range set to [scroll 10%, scroll 90%]');
   }, 'Getting and setting the animation range');
 </script>
 </html>
diff --git a/tests/wpt/tests/selection/caret/move-around-generated-content.html b/tests/wpt/tests/selection/caret/move-around-generated-content.html
new file mode 100644
index 00000000000..ea22a399ae8
--- /dev/null
+++ b/tests/wpt/tests/selection/caret/move-around-generated-content.html
@@ -0,0 +1,260 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Test for caret movement around generated content</title>
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1958985">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script>
+"use strict";
+
+function getRangeDescription(range) {
+  function getNodeDescription(node) {
+    if (!node) {
+      return "null";
+    }
+    switch (node.nodeType) {
+      case Node.TEXT_NODE:
+        return `${node.nodeName} "${node.data}"`;
+      case Node.ELEMENT_NODE:
+        return `<${node.nodeName.toLowerCase()}>`;
+      default:
+        return `${node.nodeName}`;
+    }
+  }
+  if (range === null) {
+    return "null";
+  }
+  if (range === undefined) {
+    return "undefined";
+  }
+  return range.startContainer == range.endContainer &&
+    range.startOffset == range.endOffset
+    ? `(${getNodeDescription(range.startContainer)}, ${range.startOffset})`
+    : `(${getNodeDescription(range.startContainer)}, ${
+        range.startOffset
+      }) - (${getNodeDescription(range.endContainer)}, ${range.endOffset})`;
+}
+
+const kArrowLeft = "\uE012";
+const kArrowUp = "\uE013";
+const kArrowRight = "\uE014";
+const kArrowDown = "\uE015";
+
+function sendKey(k) {
+  return new test_driver.Actions().keyDown(k).keyUp(k).send();
+}
+
+promise_test(async () => {
+  await new Promise(resolve => {
+    addEventListener("load", resolve, {once: true});
+  });
+}, "Initializing tests");
+
+promise_test(async t => {
+  const editingHost = document.querySelector("#test1");
+  editingHost.focus();
+  const p = editingHost.querySelector("#a");
+
+  test(() => {
+    assert_equals(
+      getRangeDescription(getSelection().getRangeAt(0)),
+      getRangeDescription({
+        startContainer: editingHost.querySelector("#a").firstChild,
+        startOffset: 0,
+        endContainer: editingHost.querySelector("#a").firstChild,
+        endOffset: 0,
+      }),
+    );
+  }, `${t.name}: caret should start at the beginning of the first line`);
+
+  await sendKey(kArrowDown);
+  test(() => {
+    assert_equals(
+      getRangeDescription(getSelection().getRangeAt(0)),
+      getRangeDescription({
+        startContainer: editingHost.querySelector("#one").firstChild,
+        startOffset: 0,
+        endContainer: editingHost.querySelector("#one").firstChild,
+        endOffset: 0,
+      }),
+    );
+  }, `${t.name}: arrow-down should move the caret to the start of the first list item`);
+
+  await sendKey(kArrowDown);
+  test(() => {
+    assert_equals(
+      getRangeDescription(getSelection().getRangeAt(0)),
+      getRangeDescription({
+        startContainer: editingHost.querySelector("#two"),
+        startOffset: 0,
+        endContainer: editingHost.querySelector("#two"),
+        endOffset: 0,
+      }),
+    );
+  }, `${t.name}: arrow-down should move the caret to the second list item`);
+
+  await sendKey(kArrowDown);
+  test(() => {
+    assert_equals(
+      getRangeDescription(getSelection().getRangeAt(0)),
+      getRangeDescription({
+        startContainer: editingHost.querySelector("#three").firstChild,
+        startOffset: 0,
+        endContainer: editingHost.querySelector("#three").firstChild,
+        endOffset: 0,
+      }),
+    );
+  }, `${t.name}: arrow-down should move the caret to the third list item`);
+
+  await sendKey(kArrowDown);
+  test(() => {
+    assert_equals(
+      getRangeDescription(getSelection().getRangeAt(0)),
+      getRangeDescription({
+        startContainer: editingHost.querySelector("#z").firstChild,
+        startOffset: 0,
+        endContainer: editingHost.querySelector("#z").firstChild,
+        endOffset: 0,
+      }),
+    );
+  }, `${t.name}: arrow-down should move the caret to the final paragraph`);
+}, "Moving caret between list items using arrow keys");
+
+promise_test(async t => {
+  const editingHost = document.querySelector("#test2");
+  editingHost.focus();
+  const p = editingHost.querySelector("#before");
+
+  test(() => {
+    assert_equals(
+      getRangeDescription(getSelection().getRangeAt(0)),
+      getRangeDescription({
+        startContainer: editingHost.querySelector("#before").firstChild,
+        startOffset: 0,
+        endContainer: editingHost.querySelector("#before").firstChild,
+        endOffset: 0,
+      }),
+    );
+  }, `${t.name}: caret should start at the beginning of the first line`);
+
+  await sendKey(kArrowDown);
+  test(() => {
+    assert_equals(
+      getRangeDescription(getSelection().getRangeAt(0)),
+      getRangeDescription({
+        startContainer: editingHost.querySelector("#quote").firstChild,
+        startOffset: 0,
+        endContainer: editingHost.querySelector("#quote").firstChild,
+        endOffset: 0,
+      }),
+    );
+  }, `${t.name}: arrow-down should move the caret to the start of the block quote`);
+
+  await sendKey(kArrowDown);
+  test(() => {
+    assert_equals(
+      getRangeDescription(getSelection().getRangeAt(0)),
+      getRangeDescription({
+        startContainer: editingHost.querySelector("#after").firstChild,
+        startOffset: 0,
+        endContainer: editingHost.querySelector("#after").firstChild,
+        endOffset: 0,
+      }),
+    );
+  }, `${t.name}: arrow-down should move the caret to the final paragraph`);
+
+  await sendKey(kArrowLeft);
+  test(() => {
+    assert_equals(
+      getRangeDescription(getSelection().getRangeAt(0)),
+      getRangeDescription({
+        startContainer: editingHost.querySelector("#quote").firstChild,
+        startOffset: 5,
+        endContainer: editingHost.querySelector("#quote").firstChild,
+        endOffset: 5,
+      }),
+    );
+  }, `${t.name}: arrow-left should move the caret to the end of the quote`);
+
+  await sendKey(kArrowUp);
+  test(() => {
+    assert_equals(
+      getRangeDescription(getSelection().getRangeAt(0)),
+      getRangeDescription({
+        startContainer: editingHost.querySelector("#before").firstChild,
+        startOffset: 10,
+        endContainer: editingHost.querySelector("#before").firstChild,
+        endOffset: 10,
+      }),
+    );
+  }, `${t.name}: arrow-up should move the caret to into the first line`);
+
+  await sendKey(kArrowRight);
+  test(() => {
+    assert_equals(
+      getRangeDescription(getSelection().getRangeAt(0)),
+      getRangeDescription({
+        startContainer: editingHost.querySelector("#before").firstChild,
+        startOffset: 11,
+        endContainer: editingHost.querySelector("#before").firstChild,
+        endOffset: 11,
+      }),
+    );
+  }, `${t.name}: arrow-right should move the caret forward by one character`);
+
+  await sendKey(kArrowDown);
+  test(() => {
+    assert_equals(
+      getRangeDescription(getSelection().getRangeAt(0)),
+      getRangeDescription({
+        startContainer: editingHost.querySelector("#quote").firstChild,
+        startOffset: 5,
+        endContainer: editingHost.querySelector("#quote").firstChild,
+        endOffset: 5,
+      }),
+    );
+  }, `${t.name}: arrow-down should move the caret to the end of the quote`);
+}, "Moving caret past the block-quote using arrow keys");
+</script>
+<style>
+div {
+  font-family: monospace;
+}
+ul {
+  list-style-type: none;
+}
+li::before {
+  content: "*\00a0";
+  display: inline-block;
+}
+blockquote {
+  margin-inline-start: 5ch;
+}
+blockquote::after {
+  content: "\00a0*";
+  display: inline-block;
+}
+</style>
+</head>
+<body>
+<div id=test1 contenteditable>
+  <p id=a>abc</p>
+  <ul>
+    <li id=one>one</li>
+    <li id=two><br></li>
+    <li id=three>three</li>
+  </ul>
+  <p id=z>xyz</p>
+</div>
+<div id=test2 contenteditable>
+  <p id=before>paragraph before the blockquote</p>
+  <blockquote id=quote>quote</blockquote>
+  <p id=after>after the blockquote</p>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/selection/move-by-word-with-symbol.html b/tests/wpt/tests/selection/move-by-word-with-symbol.html
new file mode 100644
index 00000000000..7a0f9048960
--- /dev/null
+++ b/tests/wpt/tests/selection/move-by-word-with-symbol.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Include symbols while moving forward/backward by word</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="../editing/include/editor-test-utils.js"></script>
+
+<div contenteditable id="target">~>>>>>p+++</div>
+<textarea id="textareaTarget">$$$$q~~~</textarea>
+<input id="inputTarget" value="||||r=====">
+
+<script>
+  const selection = getSelection();
+  const textNode = document.getElementById("target").childNodes[0];
+  const textareaNode = document.getElementById("textareaTarget");
+  const inputNode = document.getElementById("inputTarget");
+
+  test(() => {
+    selection.collapse(textNode, 6); // Start just before 'p'
+    selection.modify("move", "backward", "word");
+    assert_equals(selection.focusNode, textNode);
+    assert_equals(selection.focusOffset, 0, "Caret should move to the beginning");
+  }, "Symbols should be included while moving backward by word");
+
+  test(() => {
+    selection.collapse(textNode, 7); // Start just after 'p'
+    selection.modify("move", "forward", "word");
+    assert_equals(selection.focusNode, textNode);
+    assert_equals(selection.focusOffset, 10, "Caret should move to the end");
+  }, "Symbols should be included while moving forward by word");
+
+  promise_test(async () => {
+    textareaNode.focus();
+    textareaNode.setSelectionRange(4, 4); // Start just before 'q'
+    const utils = new EditorTestUtils(textareaNode);
+    await utils.sendMoveWordLeftKey();
+    assert_equals(textareaNode.selectionStart, 0, "Caret should move to the beginning");
+  }, "Symbols should be included while moving backward by word in textarea element");
+
+  promise_test(async () => {
+    textareaNode.focus();
+    textareaNode.setSelectionRange(5, 5); // Start just after 'q'
+    const utils = new EditorTestUtils(textareaNode);
+    await utils.sendMoveWordRightKey();
+    assert_equals(textareaNode.selectionStart, 8, "Caret should move to the end");
+  }, "Symbols should be included while moving forward by word in textarea element");
+
+  promise_test(async () => {
+    inputNode.focus();
+    inputNode.setSelectionRange(4, 4); // Start just before 'r'
+    const utils = new EditorTestUtils(inputNode);
+    await utils.sendMoveWordLeftKey();
+    assert_equals(inputNode.selectionStart, 0, "Caret should move to the beginning");
+  }, "Symbols should be included while moving backward by word in input element");
+
+  promise_test(async () => {
+    inputNode.focus();
+    inputNode.setSelectionRange(5, 5); // Start just after 'r'
+    const utils = new EditorTestUtils(inputNode);
+    await utils.sendMoveWordRightKey();
+    assert_equals(inputNode.selectionStart, 10, "Caret should move to the end");
+  }, "Symbols should be included while moving forward by word in input element");
+
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html b/tests/wpt/tests/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html
index 15f07305b0d..2e54b328f02 100644
--- a/tests/wpt/tests/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html
+++ b/tests/wpt/tests/selection/shadow-dom/tentative/Selection-getComposedRanges-range-update.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <body>
-<meta name="assert" content="Selection's getComposedRanges should be updated when its associated live range changes">
+<meta name="assert" content="Selection's composed range should be updated when its associated legacy uncomposed range changes">
 <link rel="help" href="https://w3c.github.io/selection-api/#dom-selection-getcomposedranges">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -17,6 +17,7 @@
   </div>
 </template>
 </div>
+<div id="lightEnd">End outside shadow DOM</div>
 
 <script>
 
@@ -27,48 +28,150 @@ const innerHost = outerRoot.getElementById('innerHost');
 const innerRoot = innerHost.shadowRoot;
 
 test(() => {
-  // Step 1: Setting a composed live range that crosses boundaries
+  // Setting a selction crossing to shadow tree
   selection.setBaseAndExtent(light.firstChild, 10, innerHost.firstChild, 5);
-  const liveRange = selection.getRangeAt(0);
-  const composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+  assert_throws_dom("INDEX_SIZE_ERR", function () { selection.getRangeAt(0) });
+}, 'If selection crosses shadow boundaries, getRangeAt(0) should throw an IndexSizeError because the end is not in the document tree.');
 
+test(() => {
+  // Setting a selection within light tree
+  selection.setBaseAndExtent(light.firstChild, 10, lightEnd.firstChild, 20);
+  const liveRange = selection.getRangeAt(0);
+  const newSpan = document.createElement("span");
+  liveRange.setStart(newSpan, 0);
+
+  assert_true(liveRange.collapsed);
+  assert_equals(liveRange.startContainer, newSpan);
+  assert_equals(liveRange.startOffset, 0);
+
+  assert_true(selection.isCollapsed);
+  assert_equals(selection.anchorNode, null);
+  assert_equals(selection.anchorOffset, 0);
+
+  assert_throws_dom("INDEX_SIZE_ERR", function () { selection.getRangeAt(0) });
+  assert_equals(selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] }).length, 0);
+
+}, 'modify getRangeAt() range: setStart() to disconnected node will collapse and remove the live range from the selection.');
+
+test(() => {
+  // Setting a selection within light tree
+  selection.setBaseAndExtent(light.firstChild, 10, light.firstChild, 20);
+  const liveRange = selection.getRangeAt(0);
+  let composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+
+  assert_equals(liveRange.startContainer, light.firstChild);
+  assert_equals(liveRange.startOffset, 10);
+  assert_equals(liveRange.endContainer, light.firstChild);
+  assert_equals(liveRange.endOffset, 20);
+
+  assert_equals(selection.anchorNode, light.firstChild);
+  assert_equals(selection.anchorOffset, 10);
+  assert_equals(selection.focusNode, light.firstChild);
+  assert_equals(selection.focusOffset, 20);
+
+  assert_equals(composedRange.startContainer, light.firstChild);
+  assert_equals(composedRange.startOffset, 10);
+  assert_equals(composedRange.endContainer, light.firstChild);
+  assert_equals(composedRange.endOffset, 20);
+
+  liveRange.setEnd(innerHost.firstChild, 5);
+  composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+
+  assert_true(liveRange.collapsed);
   assert_equals(liveRange.startContainer, innerHost.firstChild);
   assert_equals(liveRange.startOffset, 5);
-  assert_equals(liveRange.endContainer, innerHost.firstChild);
-  assert_equals(liveRange.endOffset, 5);
 
+  assert_true(selection.isCollapsed);
   assert_equals(selection.anchorNode, innerHost.firstChild);
   assert_equals(selection.anchorOffset, 5);
-  assert_equals(selection.focusNode, innerHost.firstChild);
-  assert_equals(selection.focusOffset, 5);
 
   assert_equals(composedRange.startContainer, light.firstChild);
   assert_equals(composedRange.startOffset, 10);
   assert_equals(composedRange.endContainer, innerHost.firstChild);
   assert_equals(composedRange.endOffset, 5);
+}, 'modify getRangeAt() range: setEnd() crosses shadow boundary into the shadow DOM and after start, which collapses live range. Composed selection range is not collapsed.');
 
-  // Step 2: Update the live range only using setEnd
-  liveRange.setEnd(innerHost.firstChild, 6);
-  const composedRange2 = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+test(() => {
+  // Setting a selection within light tree
+  selection.setBaseAndExtent(lightEnd.firstChild, 10, lightEnd.firstChild, 20);
+  const liveRange = selection.getRangeAt(0);
+  let composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
 
+  assert_equals(liveRange.startContainer, lightEnd.firstChild);
+  assert_equals(liveRange.startOffset, 10);
+  assert_equals(liveRange.endContainer, lightEnd.firstChild);
+  assert_equals(liveRange.endOffset, 20);
+
+  assert_equals(selection.anchorNode, lightEnd.firstChild);
+  assert_equals(selection.anchorOffset, 10);
+  assert_equals(selection.focusNode, lightEnd.firstChild);
+  assert_equals(selection.focusOffset, 20);
+
+  assert_equals(composedRange.startContainer, lightEnd.firstChild);
+  assert_equals(composedRange.startOffset, 10);
+  assert_equals(composedRange.endContainer, lightEnd.firstChild);
+  assert_equals(composedRange.endOffset, 20);
+
+  liveRange.setStart(innerHost.firstChild, 5);
+  composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+
+  assert_true(liveRange.collapsed);
   assert_equals(liveRange.startContainer, innerHost.firstChild);
   assert_equals(liveRange.startOffset, 5);
-  assert_equals(liveRange.endContainer, innerHost.firstChild);
-  assert_equals(liveRange.endOffset, 6);
 
+  assert_true(selection.isCollapsed);
   assert_equals(selection.anchorNode, innerHost.firstChild);
   assert_equals(selection.anchorOffset, 5);
-  assert_equals(selection.focusNode, innerHost.firstChild);
-  assert_equals(selection.focusOffset, 6);
 
-  assert_equals(composedRange2.startContainer, light.firstChild);
-  assert_equals(composedRange2.startOffset, 10);
-  assert_equals(composedRange2.endContainer, innerHost.firstChild);
-  assert_equals(composedRange2.endOffset, 6);
+  assert_equals(composedRange.startContainer, innerHost.firstChild);
+  assert_equals(composedRange.startOffset, 5);
+  assert_equals(composedRange.endContainer, lightEnd.firstChild);
+  assert_equals(composedRange.endOffset, 20);
+}, 'modify getRangeAt() range: setStart() crosses shadow boundary into the shadow DOM and before end, which collapses live range. Composed selection range is not collapsed.');
 
-  // Step 3: selectNode() calls both setStart/setEnd
+test(() => {
+  // Setting a selection within light tree
+  selection.setBaseAndExtent(light.firstChild, 10, light.firstChild, 20);
+  const liveRange = selection.getRangeAt(0);
+  let composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+
+  assert_equals(liveRange.startContainer, light.firstChild);
+  assert_equals(liveRange.startOffset, 10);
+  assert_equals(liveRange.endContainer, light.firstChild);
+  assert_equals(liveRange.endOffset, 20);
+
+  assert_equals(selection.anchorNode, light.firstChild);
+  assert_equals(selection.anchorOffset, 10);
+  assert_equals(selection.focusNode, light.firstChild);
+  assert_equals(selection.focusOffset, 20);
+
+  assert_equals(composedRange.startContainer, light.firstChild);
+  assert_equals(composedRange.startOffset, 10);
+  assert_equals(composedRange.endContainer, light.firstChild);
+  assert_equals(composedRange.endOffset, 20);
+
+  liveRange.setStart(innerHost.firstChild, 5);
+  composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+
+  assert_true(liveRange.collapsed);
+  assert_equals(liveRange.startContainer, innerHost.firstChild);
+  assert_equals(liveRange.startOffset, 5);
+
+  assert_true(selection.isCollapsed);
+  assert_equals(selection.anchorNode, innerHost.firstChild);
+  assert_equals(selection.anchorOffset, 5);
+
+  assert_true(composedRange.collapsed);
+  assert_equals(composedRange.startContainer, innerHost.firstChild);
+  assert_equals(composedRange.startOffset, 5);
+}, 'modify getRangeAt() range: setStart() crosses shadow boundary into the shadow DOM and after end, which collapses both live range and composed selection range.');
+
+test(() => {
+  // Setting a selection within light tree
+  selection.setBaseAndExtent(light.firstChild, 10, lightEnd.firstChild, 20);
+  const liveRange = selection.getRangeAt(0);
   liveRange.selectNode(innerHost);
-  const composedRange3 = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+  const composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
 
   assert_equals(liveRange.startContainer, outerRoot);
   assert_equals(liveRange.startOffset, 3);
@@ -80,30 +183,31 @@ test(() => {
   assert_equals(selection.focusNode, outerRoot);
   assert_equals(selection.focusOffset, 4);
 
-  assert_equals(composedRange3.startContainer, outerRoot);
-  assert_equals(composedRange3.startOffset, 3);
-  assert_equals(composedRange3.endContainer, outerRoot);
-  assert_equals(composedRange3.endOffset, 4);
+  assert_equals(composedRange.startContainer, outerRoot);
+  assert_equals(composedRange.startOffset, 3);
+  assert_equals(composedRange.endContainer, outerRoot);
+  assert_equals(composedRange.endOffset, 4);
+}, 'modify getRangeAt() range: selectNode() innerHost for all ranges.');
 
-  // Step 4: collapse(false) calls setEnd only
+test(() => {
+  // Setting a selection within light tree
+  selection.setBaseAndExtent(light.firstChild, 10, lightEnd.firstChild, 20);
+  const liveRange = selection.getRangeAt(0);
   liveRange.collapse();
-  const composedRange4 = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+  const composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
 
-  assert_equals(liveRange.startContainer, outerRoot);
-  assert_equals(liveRange.startOffset, 4);
-  assert_equals(liveRange.endContainer, outerRoot);
-  assert_equals(liveRange.endOffset, 4);
+  assert_true(liveRange.collapsed);
+  assert_equals(liveRange.startContainer, lightEnd.firstChild);
+  assert_equals(liveRange.startOffset, 20);
 
-  assert_equals(selection.anchorNode, outerRoot);
-  assert_equals(selection.anchorOffset, 4);
-  assert_equals(selection.focusNode, outerRoot);
-  assert_equals(selection.focusOffset, 4);
+  assert_true(selection.isCollapsed);
+  assert_equals(selection.anchorNode, lightEnd.firstChild);
+  assert_equals(selection.anchorOffset, 20);
 
-  assert_equals(composedRange4.startContainer, outerRoot);
-  assert_equals(composedRange4.startOffset, 4);
-  assert_equals(composedRange4.endContainer, outerRoot);
-  assert_equals(composedRange4.endOffset, 4);
-}, 'modify getRangeAt() range.');
+  assert_true(composedRange.collapsed);
+  assert_equals(composedRange.startContainer, lightEnd.firstChild);
+  assert_equals(composedRange.startOffset, 20);
+ }, 'modify getRangeAt() range: collapse() collapses all ranges.');
 
 test(() => {
   // Step 1: Creating a live range and only setting its end/anchor
@@ -112,37 +216,32 @@ test(() => {
   liveRange.setEnd(innerHost.firstChild, 5);
   const composedRanges = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] });
 
+  assert_true(liveRange.collapsed);
   assert_equals(liveRange.startContainer, innerHost.firstChild);
   assert_equals(liveRange.startOffset, 5);
-  assert_equals(liveRange.endContainer, innerHost.firstChild);
-  assert_equals(liveRange.endOffset, 5);
 
+  assert_true(selection.isCollapsed);
   assert_equals(selection.anchorNode, null);
   assert_equals(selection.anchorOffset, 0);
-  assert_equals(selection.focusNode, null);
-  assert_equals(selection.focusOffset, 0);
 
-  assert_equals(composedRanges.length, 0);
+  assert_equals(composedRanges.length, 0, 'range is not added to selection yet.');
 
   // Step 2: Add range to selection so range API updates will change selection
   selection.addRange(liveRange);
   const composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
 
-  assert_equals(liveRange.startContainer, innerHost.firstChild);
-  assert_equals(liveRange.startOffset, 5);
+  assert_true(liveRange.collapsed);
   assert_equals(liveRange.endContainer, innerHost.firstChild);
   assert_equals(liveRange.endOffset, 5);
 
+  assert_true(selection.isCollapsed);
   assert_equals(selection.anchorNode, innerHost.firstChild);
   assert_equals(selection.anchorOffset, 5);
-  assert_equals(selection.focusNode, innerHost.firstChild);
-  assert_equals(selection.focusOffset, 5);
 
+  assert_true(composedRange.collapsed);
   assert_equals(composedRange.startContainer, innerHost.firstChild);
   assert_equals(composedRange.startOffset, 5);
-  assert_equals(composedRange.endContainer, innerHost.firstChild);
-  assert_equals(composedRange.endOffset, 5);
-}, 'modify createRange() range added to selection after setEnd call.');
+}, 'modify createRange() range: adding to selection sets the selection');
 
 test(() => {
   // Step 1: Creating a live range and only setting its end/anchor
@@ -151,17 +250,15 @@ test(() => {
   // Add range to selection so range API updates will change selection
   selection.addRange(liveRange);
   liveRange.setEnd(innerHost.firstChild, 5);
-  const composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+  let composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
 
+  assert_true(liveRange.collapsed);
   assert_equals(liveRange.startContainer, innerHost.firstChild);
   assert_equals(liveRange.startOffset, 5);
-  assert_equals(liveRange.endContainer, innerHost.firstChild);
-  assert_equals(liveRange.endOffset, 5);
 
+  assert_true(selection.isCollapsed);
   assert_equals(selection.anchorNode, innerHost.firstChild);
   assert_equals(selection.anchorOffset, 5);
-  assert_equals(selection.focusNode, innerHost.firstChild);
-  assert_equals(selection.focusOffset, 5);
 
   assert_equals(composedRange.startContainer, document);
   assert_equals(composedRange.startOffset, 0);
@@ -170,21 +267,19 @@ test(() => {
 
   // Step 2: Update the live range by setting its start/focus
   liveRange.setStart(light.firstChild, 10);
-  const composedRangeAfter = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
+  composedRange = selection.getComposedRanges({ shadowRoots: [outerRoot, innerRoot] })[0];
 
+  assert_true(liveRange.collapsed);
   assert_equals(liveRange.startContainer, light.firstChild);
   assert_equals(liveRange.startOffset, 10);
-  assert_equals(liveRange.endContainer, light.firstChild);
-  assert_equals(liveRange.endOffset, 10);
 
+  assert_true(selection.isCollapsed);
   assert_equals(selection.anchorNode, light.firstChild);
   assert_equals(selection.anchorOffset, 10);
-  assert_equals(selection.focusNode, light.firstChild);
-  assert_equals(selection.focusOffset, 10);
 
-  assert_equals(composedRangeAfter.startContainer, light.firstChild);
-  assert_equals(composedRangeAfter.startOffset, 10);
-  assert_equals(composedRangeAfter.endContainer, innerHost.firstChild);
-  assert_equals(composedRangeAfter.endOffset, 5);
-}, 'modify createRange() range added to selection before setStart/setEnd calls.');
+  assert_equals(composedRange.startContainer, light.firstChild);
+  assert_equals(composedRange.startOffset, 10);
+  assert_equals(composedRange.endContainer, innerHost.firstChild);
+  assert_equals(composedRange.endOffset, 5);
+}, 'modify createRange() range: added to selection before setStart/setEnd calls.');
 </script>
diff --git a/tests/wpt/tests/service-workers/service-worker/claim-using-registration.https.html b/tests/wpt/tests/service-workers/service-worker/claim-using-registration.https.html
index 8a2a6ff25c8..a02f8e9ca6f 100644
--- a/tests/wpt/tests/service-workers/service-worker/claim-using-registration.https.html
+++ b/tests/wpt/tests/service-workers/service-worker/claim-using-registration.https.html
@@ -97,7 +97,7 @@ promise_test(function(t) {
       .then(function() {
           frame.remove();
         });
-  }, 'Test for the waiting worker claims a client which is using the the ' +
+  }, 'Test for the waiting worker claims a client which is using the ' +
      'same registration');
 
 </script>
diff --git a/tests/wpt/tests/service-workers/service-worker/client-url-creation-url.https.html b/tests/wpt/tests/service-workers/service-worker/client-url-creation-url.https.html
new file mode 100644
index 00000000000..ba597d893d3
--- /dev/null
+++ b/tests/wpt/tests/service-workers/service-worker/client-url-creation-url.https.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<title>Service Worker: Client.url is Window creation URL tests</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/test-helpers.sub.js"></script>
+<script>
+// These tests all validate that the Service Worker's Client.url property is
+// correct for different types of Window client navigations.
+// All test cases involve an iframe navigating in some manner and then
+// the service worker validating that the Client.url property is correct.
+
+// Waits for and returns the next postMessage from `frame` to this window.
+function wait_for_message_from_frame(frame) {
+  return new Promise(resolve => {
+    const message_handler = e => {
+      if (e.source === frame.contentWindow) {
+        frame.removeEventListener('message', message_handler);
+        resolve(e.data);
+      }
+    };
+    window.addEventListener('message', message_handler);
+  });
+}
+
+// Returns a promise to get a client URL under the ServiceWorker's
+// (client-url-creation-url-sw.js) control. `target` should be an active
+// ServiceWorker to post message.  We expect it to send back the client URL
+// via the given channel.
+function post_message_and_wait_for_response(
+    target, data) {
+  return new Promise(resolve => {
+    const channel = new MessageChannel();
+    channel.port1.onmessage = e => {
+      resolve(e.data);
+    };
+    target.postMessage(
+        {message: data, port: channel.port2},
+        [channel.port2]);
+  });
+}
+
+const SCOPE = 'resources/client-url-creation-url';
+const IFRAME_URL = SCOPE + '-iframe.html?step=1';
+
+// The test helper function implements a test case by
+// using an iframe to navigate in various ways described by `navigation_kinds`
+// and then validates the ServiceWorker Client.url property of the iframe
+// against the provided `expected_client_url`.
+// `navigation_kinds` is an array of strings each of which is one of the
+// navigation actions supported by client-url-creation-url-iframe.html.
+async function test_client_url_helper(
+    t, navigation_kinds, expected_client_url) {
+  const registration = await service_worker_unregister_and_register(
+      t, 'resources/client-url-creation-url-sw.js', SCOPE);
+  t.add_cleanup(_ => registration.unregister());
+  await wait_for_state(t, registration.installing, 'activated');
+
+  const frame = await with_iframe(IFRAME_URL);
+  t.add_cleanup(_ => frame.remove());
+  const message = await wait_for_message_from_frame(frame);
+  assert_equals(message, 'done', 'iframe loaded successfully');
+
+  for (let navigation_kind_idx = 0;
+      navigation_kind_idx < navigation_kinds.length;
+      ++navigation_kind_idx) {
+    const navigation_kind = navigation_kinds[navigation_kind_idx];
+
+    frame.contentWindow.postMessage(navigation_kind);
+    const result = await wait_for_message_from_frame(frame);
+    assert_equals(result, 'done', 'iframe navigation successfully completed');
+  }
+
+  const actual_client_url = await post_message_and_wait_for_response(
+      registration.active, "get_client_url");
+
+  assert_equals(
+      actual_client_url, expected_client_url, 'Client.url should match');
+}
+
+const EXPECTED_URL_STEP_1 = new URL(
+    './resources/client-url-creation-url-iframe.html?step=1', location).href;
+const EXPECTED_URL_STEP_2 = new URL(
+    './resources/client-url-creation-url-iframe.html?step=2', location).href;
+
+// Tests that perform navigations that don't create a new document
+promise_test(async t => {
+  await test_client_url_helper(t, [], EXPECTED_URL_STEP_1);
+}, 'No navigation creation URL is same as window URL');
+
+promise_test(async t => {
+  await test_client_url_helper(t, ['fragment'], EXPECTED_URL_STEP_1);
+}, 'Fragment only navigation doesn\'t change creation URL');
+
+promise_test(async t => {
+  await test_client_url_helper(t, ['pushstate'], EXPECTED_URL_STEP_1);
+}, 'Pushstate doesn\'t change creation URL');
+
+promise_test(async t => {
+  await test_client_url_helper(t, ['replacestate'], EXPECTED_URL_STEP_1);
+}, 'Replacestate doesn\'t change creation URL');
+
+promise_test(async t => {
+  await test_client_url_helper(
+      t, ['pushstate', 'pushstate', 'back-within-same-document'], EXPECTED_URL_STEP_1);
+}, 'Going back over pushstate to other pushstate via back');
+
+// Tests that perform navigations that create new document(s)
+promise_test(async t => {
+  await test_client_url_helper(t, ['query'], EXPECTED_URL_STEP_2);
+}, 'Query navigation changes creation URL');
+
+promise_test(async t => {
+  await test_client_url_helper(t, ['reload'], EXPECTED_URL_STEP_1);
+}, 'Reloading doesn\'t change creation URL');
+
+promise_test(async t => {
+  await test_client_url_helper(t, ['pushstate', 'reload'], EXPECTED_URL_STEP_2);
+}, 'Reloading pushstate URL changes creation URL');
+
+promise_test(async t => {
+  await test_client_url_helper(
+      t, ['query', 'pushstate', 'back-within-same-document'], EXPECTED_URL_STEP_2);
+}, 'Going back over pushstate to creation URL');
+
+promise_test(async t => {
+  await test_client_url_helper(
+      t, ['query', 'query', 'back-cross-document'], EXPECTED_URL_STEP_2);
+}, 'Going back to new document changes creation URL');
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/service-workers/service-worker/resources/client-url-creation-url-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/client-url-creation-url-iframe.html
new file mode 100644
index 00000000000..db2b9e5bbd9
--- /dev/null
+++ b/tests/wpt/tests/service-workers/service-worker/resources/client-url-creation-url-iframe.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<title>Service Worker: Client.url is Window creation URL iframe resource</title>
+<script>
+// This is the iframe resource for the Client.url Window creation URL test.
+// It supports the test page telling it to navigate in various ways, and then
+// the iframe will post back that its done.
+
+// Turn the next time an event is raised into a promise.
+function wait_for_next_event(event_target, event_name) {
+  return new Promise(resolve => {
+    const event_handler = event => {
+      event_target.removeEventListener(event_name, event_handler);
+      resolve(event);
+    };
+    event_target.addEventListener(event_name, event_handler);
+  });
+}
+
+// Perform the navigation step sent to the iframe by the test page.
+async function perform_navigation(navigation_kind) {
+  // This is true if the navigation results in a new document instance.
+  // For example, history.pushState() doesn't create a new document, but
+  // navigating to a URL with a different query does. We need to keep
+  // track of this so we can post a message back to the test page when the
+  // navigation completes without loading a new document.
+  let cross_document_navigation = false;
+
+  const query_params = new URLSearchParams(location.search.substring(1));
+  const step = parseInt(query_params.get('step'), 10);
+
+  const next_url = `?step=${step + 1}`;
+
+  if (navigation_kind === 'pushstate') {
+    history.pushState({}, '', next_url);
+  } else if (navigation_kind === 'replacestate') {
+    history.replaceState({}, '', next_url);
+  } else if (navigation_kind === 'back-within-same-document') {
+    history.back();
+  } else if (navigation_kind === 'fragment') {
+    location.href = '#fragment';
+    await wait_for_next_event(window, 'hashchange');
+  } else if (navigation_kind === 'back-cross-document') {
+    // Note there are two back navigation_kinds. Both call history.back(),
+    // but 'back-cross-document' is for when we go back to a different
+    // document instance and the new document will postMessage the parent
+    // that the navigation is done, and and 'back-within-same-document' is for
+    // when we go back but remain in the same document and so need to
+    // postMessage the parent that the navigation is done from this document.
+    history.back();
+    cross_document_navigation = true;
+  } else if (navigation_kind === 'query') {
+    location.href = next_url;
+    cross_document_navigation = true;
+  } else if (navigation_kind === 'reload') {
+    location.reload();
+    cross_document_navigation = true;
+  } else {
+    throw new Error('Unknown navigation kind: ' + navigation_kind);
+  }
+  return cross_document_navigation;
+}
+
+window.addEventListener('message', async message_event => {
+  try {
+    const navigation_kind = message_event.data;
+
+    // If its a cross document navigation, then we need to send the done
+    // message back to the test page when the navigation has started the
+    // new document.
+    const cross_document_navigation = await perform_navigation(navigation_kind);
+    if (!cross_document_navigation ) {
+      window.parent.postMessage('done');
+    }
+  } catch (error) {
+    window.parent.postMessage('error: ' + error.message);
+  }
+});
+
+// Navigation steps either result in a new document instance or not. The
+// iframe needs to post a message back to the test page when the navigation
+// completes regardless. If the navigation does create a new document, then
+// the following postMessage informs the test page that the cross document
+// navigation has completed.
+window.parent.postMessage('done');
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/service-workers/service-worker/resources/client-url-creation-url-sw.js b/tests/wpt/tests/service-workers/service-worker/resources/client-url-creation-url-sw.js
new file mode 100644
index 00000000000..013d9be4cae
--- /dev/null
+++ b/tests/wpt/tests/service-workers/service-worker/resources/client-url-creation-url-sw.js
@@ -0,0 +1,24 @@
+// This is a service worker script used by the client-url-creation-url test.
+// It exists only to look up the client URL of the test iframe and send it back
+// to the test page.
+addEventListener('message', message_event => {
+  const port = message_event.data.port;
+
+  const async_work = async () => {
+    try {
+      const clients = await self.clients.matchAll();
+
+      // In our test there should be exactly one client that is our test
+      // navigation iframe.
+      if (clients.length == 1) {
+        const client = clients[0];
+        port.postMessage(client.url);
+      } else {
+        port.postMessage(`error: expected 1 client, not ${clients.length}`);
+      }
+    } catch (error) {
+      port.postMessage(`error: ${error.message}`);
+    }
+  };
+  message_event.waitUntil(async_work());
+});
\ No newline at end of file
diff --git a/tests/wpt/tests/service-workers/service-worker/resources/testharness-helpers.js b/tests/wpt/tests/service-workers/service-worker/resources/testharness-helpers.js
index b1a5b960e06..5f93a25438a 100644
--- a/tests/wpt/tests/service-workers/service-worker/resources/testharness-helpers.js
+++ b/tests/wpt/tests/service-workers/service-worker/resources/testharness-helpers.js
@@ -14,7 +14,7 @@
 //     2.1 |a.p| is weakly equal to |b.p| for all own properties |p| of |a|.
 //     2.2 Every own property of |b| is an own property of |a|.
 //
-// This is a replacement for the the version of assert_object_equals() in
+// This is a replacement for the version of assert_object_equals() in
 // testharness.js. The latter doesn't handle own properties correctly. I.e. if
 // |a.p| is not an own property, it still requires that |b.p| be an own
 // property.
diff --git a/tests/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-resource-timing.https.html b/tests/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-resource-timing.https.html
index e32436da41b..f554bf7c2ec 100644
--- a/tests/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-resource-timing.https.html
+++ b/tests/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-resource-timing.https.html
@@ -56,10 +56,12 @@ function test_resource_timing(options) {
       assert_equals(entry.workerStart, 0, description);
       assert_equals(entry.workerCacheLookupStart, 0, description);
       assert_less_than_equal(entry.workerRouterEvaluationStart, entry.fetchStart, description);
+      assert_greater_than(entry.encodedBodySize, 0, description);
       break;
     case 'cache':
       assert_equals(entry.workerStart, 0, description);
       assert_greater_than_equal(entry.workerCacheLookupStart, entry.workerRouterEvaluationStart, description);
+      assert_greater_than(entry.encodedBodySize, 0, description);
       if (entry.workerFinalSourceType === 'cache') {
         assert_equals(entry.fetchStart, entry.responseStart, description);
         assert_less_than_equal(entry.workerCacheLookupStart, entry.responseStart, description);
@@ -68,8 +70,9 @@ function test_resource_timing(options) {
         assert_less_than_equal(entry.workerCacheLookupStart, entry.fetchStart, description);
       }
       break;
-    case 'race-network-and-fetch':
+    case 'race-network-and-fetch-handler':
       assert_equals(entry.workerCacheLookupStart, 0, description);
+      assert_greater_than(entry.encodedBodySize, 0, description);
       if (entry.workerFinalSourceType === 'network') {
         assert_equals(entry.workerStart, 0, description);
         assert_less_than_equal(entry.workerRouterEvaluationStart, entry.fetchStart, description);
@@ -79,6 +82,8 @@ function test_resource_timing(options) {
       }
       break;
     case 'fetch-event':
+      assert_greater_than(entry.encodedBodySize, 0, description);
+      break;
     case '':  // i.e. no matching rules
       assert_equals(entry.workerCacheLookupStart, 0, description);
       assert_greater_than_equal(entry.workerStart, entry.workerRouterEvaluationStart, description);
@@ -261,7 +266,7 @@ promise_test(async t => {
   test_resource_timing({
     performance: iframe.contentWindow.performance,
     url: url,
-    matched_source_type: 'race-network-and-fetch',
+    matched_source_type: 'race-network-and-fetch-handler',
     final_source_type: 'fetch-event',
     description: "race as source on main resource, and fetch-event wins"
   });
@@ -280,7 +285,7 @@ promise_test(async t => {
   test_resource_timing({
     performance: iframe.contentWindow.performance,
     url: url,
-    matched_source_type: 'race-network-and-fetch',
+    matched_source_type: 'race-network-and-fetch-handler',
     final_source_type: 'network',
     description: "race as source on main resource, and network wins"
   });
@@ -301,7 +306,7 @@ promise_test(async t => {
   test_resource_timing({
     performance: iframe.contentWindow.performance,
     url: `${RACE_ROUTE}${subresource}`,
-    matched_source_type: 'race-network-and-fetch',
+    matched_source_type: 'race-network-and-fetch-handler',
     final_source_type: 'fetch-event',
     description: "race as source on subresource and fetch wins"
   });
@@ -323,7 +328,7 @@ promise_test(async t => {
   test_resource_timing({
     performance: iframe.contentWindow.performance,
     url: `${RACE_ROUTE}${subresource}`,
-    matched_source_type: 'race-network-and-fetch',
+    matched_source_type: 'race-network-and-fetch-handler',
     final_source_type: 'network',
     description: "race as source on subresource and network wins"
   });
diff --git a/tests/wpt/tests/service-workers/service-worker/unregister-immediately-before-installed.https.html b/tests/wpt/tests/service-workers/service-worker/unregister-immediately-before-installed.https.html
index 79cdaf062dc..c56674c0fb1 100644
--- a/tests/wpt/tests/service-workers/service-worker/unregister-immediately-before-installed.https.html
+++ b/tests/wpt/tests/service-workers/service-worker/unregister-immediately-before-installed.https.html
@@ -16,7 +16,7 @@
 // worker's state to 'redundant'.
 
 promise_test(async test => {
-  // This test keeps the the service worker in the 'parsed' state by using a
+  // This test keeps the service worker in the 'parsed' state by using a
   // script with an infinite loop.
   const script_url = 'resources/onparse-infiniteloop-worker.js';
   const scope_url =
@@ -34,7 +34,7 @@ promise_test(async test => {
  }, 'Clear-Site-Data must abort service worker registration.');
 
 promise_test(async test => {
-  // This test keeps the the service worker in the 'installing' state by using a
+  // This test keeps the service worker in the 'installing' state by using a
   // script with an install event waitUntil() promise that never resolves.
   const script_url = 'resources/oninstall-waituntil-forever.js';
   const scope_url =
diff --git a/tests/wpt/tests/service-workers/service-worker/unregister-immediately.https.html b/tests/wpt/tests/service-workers/service-worker/unregister-immediately.https.html
index 54be40a5452..c6a91f8e235 100644
--- a/tests/wpt/tests/service-workers/service-worker/unregister-immediately.https.html
+++ b/tests/wpt/tests/service-workers/service-worker/unregister-immediately.https.html
@@ -16,7 +16,7 @@
 // active worker's controlled clients to unload.
 
 promise_test(async test => {
-  // This test keeps the the service worker in the 'activating' state by using a
+  // This test keeps the service worker in the 'activating' state by using a
   // script with an activate event waitUntil() promise that never resolves.
   const script_url = 'resources/onactivate-waituntil-forever.js';
   const scope_url =
diff --git a/tests/wpt/tests/shadow-dom/WEB_FEATURES.yml b/tests/wpt/tests/shadow-dom/WEB_FEATURES.yml
index dcb21f38716..9bdf694256b 100644
--- a/tests/wpt/tests/shadow-dom/WEB_FEATURES.yml
+++ b/tests/wpt/tests/shadow-dom/WEB_FEATURES.yml
@@ -4,3 +4,6 @@ features:
 - name: slot-assign
   files:
   - imperative-slot-*
+- name: document-caretpositionfrompoint
+  files:
+  - Document-caretPositionFromPoint.tentative.html
diff --git a/tests/wpt/tests/shadow-dom/declarative/WEB_FEATURES.yml b/tests/wpt/tests/shadow-dom/declarative/WEB_FEATURES.yml
index 4e31ed49627..e5a15eb0231 100644
--- a/tests/wpt/tests/shadow-dom/declarative/WEB_FEATURES.yml
+++ b/tests/wpt/tests/shadow-dom/declarative/WEB_FEATURES.yml
@@ -1,3 +1,6 @@
 features:
 - name: declarative-shadow-dom
   files: "**"
+- name: gethtml
+  files:
+  - gethtml*
diff --git a/tests/wpt/tests/shadow-dom/event-post-dispatch.html b/tests/wpt/tests/shadow-dom/event-post-dispatch.html
index 98157a69b9c..0cab1fcc6b4 100644
--- a/tests/wpt/tests/shadow-dom/event-post-dispatch.html
+++ b/tests/wpt/tests/shadow-dom/event-post-dispatch.html
@@ -138,7 +138,7 @@ document.body.removeChild(n4.test4);
 let n5 = createTestTree(test5);
 document.body.appendChild(n5.test5);
 test(() => {
-  let log = dispatchEventWithEventLog(n5, n5.target, new MouseEvent('my-event', {bubbles: true, compoesed: true, relatedTarget: n5.relatedTarget}));
+  let log = dispatchEventWithEventLog(n5, n5.target, new MouseEvent('my-event', {bubbles: true, composed: true, relatedTarget: n5.relatedTarget}));
   assert_equals(log.event.target, null);
   assert_equals(log.event.relatedTarget, null);
   assert_equals(log.event.eventPhase, 0);
@@ -147,7 +147,7 @@ test(() => {
 }, 'Event properties post dispatch with relatedTarget in the same shadow tree. (composed: true)');
 
 test(() => {
-  let log = dispatchEventWithEventLog(n5, n5.target, new MouseEvent('my-event', {bubbles: true, compoesed: false, relatedTarget: n5.relatedTarget}));
+  let log = dispatchEventWithEventLog(n5, n5.target, new MouseEvent('my-event', {bubbles: true, composed: false, relatedTarget: n5.relatedTarget}));
   assert_equals(log.event.target, null);
   assert_equals(log.event.relatedTarget, null);
   assert_equals(log.event.eventPhase, 0);
@@ -278,5 +278,5 @@ test(t => {
   assert_equals(event.eventPhase, 0);
   assert_equals(event.currentTarget, null);
   assert_equals(event.composedPath().length, 0);
-}, 'Event properties post dispatch when target get moved into the the shadow tree by event listener');
+}, 'Event properties post dispatch when target get moved into the shadow tree by event listener');
 </script>
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/reading-flow/tentative/carousel-grid-order.html b/tests/wpt/tests/shadow-dom/focus-navigation/reading-flow/tentative/carousel-grid-order.html
new file mode 100644
index 00000000000..89b3f8dd928
--- /dev/null
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/reading-flow/tentative/carousel-grid-order.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<meta name="timeout" content="long">
+<title>CSS Display: reading-flow with value flex-flow on carousel container</title>
+<link rel="help" href="https://drafts.csswg.org/css-display-4/#reading-flow">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-5/#scroll-marker-next-focus">
+<link rel="author" title="Di Zhang" href="mailto:dizhangg@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src='../../resources/shadow-dom.js'></script>
+<script src="../../resources/focus-utils.js"></script>
+
+<style>
+  #scroller {
+    width: 120px;
+    height: 100px;
+    overflow-x: auto;
+    scroll-marker-group: before;
+    white-space: nowrap;
+    display: grid;
+    grid-auto-flow: column;
+    reading-flow: grid-order;
+  }
+
+  #scroller div {
+    display: inline-block;
+    width: 100px;
+    height: 100px;
+  }
+
+  #scroller div::scroll-marker {
+    content: "#";
+    background: white;
+  }
+
+</style>
+
+
+
+<div class="test-case" data-expect="scroller,C,A,B"
+      data-description="Grid items in carousel should follow grid-order reading flow">
+  <div id="scroller">
+    <div id="A" tabindex="0" style="order: 2; background: red"></div>
+    <div id="B" tabindex="0" style="order: 3; background: yellow"></div>
+    <div id="C" tabindex="0" style="order: 1; background: blue"></div>
+  </div>
+</div>
+
+<script>
+runFocusTestCases();
+</script>
diff --git a/tests/wpt/tests/shadow-dom/focus/text-selection-with-delegatesFocus-text-control.html b/tests/wpt/tests/shadow-dom/focus/text-selection-with-delegatesFocus-text-control.html
new file mode 100644
index 00000000000..6474729b8b4
--- /dev/null
+++ b/tests/wpt/tests/shadow-dom/focus/text-selection-with-delegatesFocus-text-control.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<body>
+    <x-shadow id="xShadow"></x-shadow>
+</body>
+
+<script>
+'use strict';
+
+/**
+ * command to select text in shadow-root
+ */
+function selectText(element, start, end) {
+    getSelection().empty();
+    const actions = new test_driver.Actions();
+    actions.pointerMove(start, 0, {origin: element});
+    actions.pointerDown();
+    actions.pointerMove(end, 0, {origin: element});
+    actions.pointerUp();
+    return actions.send();
+}
+
+/**
+ * command to type foo.
+ */
+ function typeFoo() {
+    const actions = new test_driver.Actions();
+    actions.keyDown("F");
+    actions.keyUp("F");
+    actions.keyDown("O");
+    actions.keyUp("O");
+    actions.keyDown("O");
+    actions.keyUp("O");
+    return actions.send();
+}
+
+promise_test(async () => {
+    const xShadow = document.getElementById('xShadow');
+    const root = xShadow.attachShadow({ mode: 'open', delegatesFocus: true });
+    const span = document.createElement('span');
+    span.textContent = 'Example Text to Select ';
+    const br = document.createElement('br');
+    const input = document.createElement('input');
+    root.append(span, br, input);
+
+    await selectText(xShadow, 0, 0);
+    assert_equals(document.activeElement, xShadow);
+    assert_equals(xShadow.shadowRoot.activeElement, input, "click on shadow host with delegatesFocus focuses the input element.");
+
+    await typeFoo();
+    assert_equals(input.value, 'FOO', "keyboard typing will update the input value.");
+
+    await selectText(xShadow, 0, 50);
+    const s = getSelection();
+    assert_greater_than(s.toString().length, 0, "drag text will update selection.");
+}, 'shadow root has selectable text when focus is delegated. Selection goes to text control if it is the delegated focusable area.');
+
+</script>
diff --git a/tests/wpt/tests/shadow-dom/reference-target/tentative/form.html b/tests/wpt/tests/shadow-dom/reference-target/tentative/form.html
new file mode 100644
index 00000000000..5ab144b05ed
--- /dev/null
+++ b/tests/wpt/tests/shadow-dom/reference-target/tentative/form.html
@@ -0,0 +1,172 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+</head>
+
+<body>
+  <div>
+    <template shadowrootmode="open">
+      <!-- This button shouldn't link to the real form in fancy-form-1 as it's in a different tree scope -->
+      <button id="button-in-shadow" form="fancy-form-1"></button>
+    </template>
+  </div>
+
+  <button id="reset-button-1" type="reset" form="fancy-form-1"></button>
+  <fancy-form-1 id="fancy-form-1">
+    <template shadowrootmode="open" shadowrootreferencetarget="real-form">
+      <form id="real-form">
+        <input type="text" value="default value">
+      </form>
+    </template>
+  </fancy-form-1>
+
+  <button id="reset-button-2" type="reset" form="fancy-form-2"></button>
+  <fancy-form-2 id="fancy-form-2"></fancy-form-2>
+  <script>
+    const fancyForm2 = document.querySelector('fancy-form-2');
+    fancyForm2.attachShadow({ mode: 'open', referenceTarget: 'real-form' });
+    fancyForm2.shadowRoot.innerHTML = '<form id="real-form"><input type="text" value="default value"></form>';
+  </script>
+
+  <button id="reset-button-3" type="reset"></button>
+  <fancy-form-3 id="fancy-form-3">
+    <template shadowrootmode="open" shadowrootreferencetarget="real-form">
+      <form id="real-form">
+        <input type="text" value="default value">
+      </form>
+    </template>
+  </fancy-form-3>
+
+  <script>
+    function testFormWithReferenceTarget(formId, resetButtonId, name) {
+      test(function () {
+        const fancyForm = document.getElementById(formId);
+        const realForm = fancyForm.shadowRoot.getElementById("real-form");
+        const input = realForm.firstElementChild;
+
+        input.value = "new value";
+        const resetButton = document.getElementById(resetButtonId);
+        assert_equals(realForm.elements.length, 2, "The .elements property should have 2 elements.");
+        assert_equals(realForm.elements[0], resetButton, "The first element should be the referencing element.");
+        assert_equals(realForm.elements[1], input, "The 2nd element should be the input inside the real form.");
+        assert_equals(input.value, "new value", "The input value should be updated to the new value.");
+        resetButton.click();
+        assert_equals(input.value, "default value", "The input value should be reset to the default value.");
+      }, name);
+    }
+
+    testFormWithReferenceTarget('fancy-form-1', 'reset-button-1', "Reference target works with form attribute.");
+    testFormWithReferenceTarget('fancy-form-2', 'reset-button-2', "Reference target works with form attribute via options.");
+
+    document.getElementById('reset-button-3').setAttribute('form', "fancy-form-3");
+    testFormWithReferenceTarget('fancy-form-3', 'reset-button-3', "Reference target works with setAttribute('form')");
+  </script>
+
+  <form-associated-custom-button id="custom-button" form="fancy-form-4"></form-associated-custom-button>
+  <fancy-form-4 id="fancy-form-4">
+    <template shadowrootmode="open" shadowrootreferencetarget="real-form">
+      <form id="real-form">
+        <input type="text" value="default value">
+        <!-- The internal button of the custom button below shouldn't be associated with real-form -->
+        <form-associated-custom-button id="custom-button-in-shadow"></form-associated-custom-button>
+      </form>
+    </template>
+  </fancy-form-4>
+  <script>
+    class FormAssociatedCustomButton extends HTMLElement {
+      static formAssociated = true;
+      constructor() {
+        super();
+        this.internals_ = this.attachInternals();
+        const shadow = this.attachShadow({ mode: 'open' });
+        shadow.innerHTML = `<button>fancy button</button>`;
+      }
+    }
+    window.customElements.define("form-associated-custom-button", FormAssociatedCustomButton);
+    test(function () {
+        const customElement = document.getElementById("custom-button");
+        const fancyForm = document.getElementById("fancy-form-4");
+        const realForm = fancyForm.shadowRoot.getElementById("real-form");
+        const customElementInShadow = fancyForm.shadowRoot.getElementById("custom-button-in-shadow");
+        const input = realForm.firstElementChild;
+
+        assert_equals(realForm.elements.length, 3, "The .elements property should have 3 elements.");
+        assert_equals(realForm.elements[0], customElement, "The first element should be the form-associated custom element.");
+        assert_equals(realForm.elements[1], input, "The 2nd element should be the input inside the real form.");
+        assert_equals(realForm.elements[2], customElementInShadow, "The 3rd element should be the custom element inside the real form.");
+
+        // Swap the input and the custom element in real-form.
+        realForm.moveBefore(customElementInShadow, input);
+        assert_equals(realForm.elements.length, 3, "The .elements property should have 3 elements.");
+        assert_equals(realForm.elements[0], customElement, "The first element should be the form-associated custom element.");
+        assert_equals(realForm.elements[1], customElementInShadow, "The 2nd element should be the custom element inside the real form.");
+        assert_equals(realForm.elements[2], input, "The 3rd element should be the input inside the real form.");
+
+        // Swap the referencing element and the fancy form
+        customElement.parentNode.moveBefore(fancyForm, customElement);
+        assert_equals(realForm.elements.length, 3, "The .elements property should have 3 elements.");
+        assert_equals(realForm.elements[0], customElementInShadow, "The first element should be the custom element inside the real form.");
+        assert_equals(realForm.elements[1], input, "The 2nd element should be the input inside the real form.");
+        assert_equals(realForm.elements[2], customElement, "The 3rd element should be the form-associated custom element.");
+      }, "Reference target works with form-associated custom element.");
+  </script>
+
+  <button id="reset-button-5" type="reset" form="fancy-form-5"></button>
+  <fancy-form-5 id="fancy-form-5">
+    <template shadowrootmode="open" shadowrootreferencetarget="nested-element">
+      <nested-element id="nested-element">
+        <template shadowrootmode="open" shadowrootreferencetarget="real-form">
+          <form id="real-form">
+            <input type="text" value="default value">
+          </form>
+        </template>
+      </nested-element>
+      <button id="button-in-shadow" form="nested-element"></button>
+      <div>
+        <template shadowrootmode="open">
+          <!-- This button shouldn't link to the real form in nested-element as it's in a different tree scope -->
+          <button id="button-in-different-shadow" form="nested-element"></button>
+        </template>
+      </div>
+    </template>
+  </fancy-form-5>
+  <script>
+      test(function () {
+        const fancyForm = document.getElementById("fancy-form-5");
+        const nestedElement = fancyForm.shadowRoot.getElementById("nested-element");
+        const buttonInShadow = fancyForm.shadowRoot.getElementById("button-in-shadow");
+        const realForm = nestedElement.shadowRoot.getElementById("real-form");
+        const input = realForm.firstElementChild;
+
+        input.value = "new value";
+        const resetButton = document.getElementById("reset-button-5");
+        assert_equals(realForm.elements.length, 3, "The .elements property should have 3 elements.");
+        // The elements in .elements property should be in tree order (preorder, depth-first).
+        assert_equals(realForm.elements[0], resetButton, "The first element should be the referencing element.");
+        assert_equals(realForm.elements[1], input, "The 2nd element should be the input inside the real form.");
+        assert_equals(realForm.elements[2], buttonInShadow, "The 3rd element should be the button in the shadow dom.");
+        assert_equals(input.value, "new value", "The input value should be updated to the new value.");
+        resetButton.click();
+        assert_equals(input.value, "default value", "The input value should be reset to the default value.");
+
+        // Remove the button that's using reference target in the 1st level shadow.
+        buttonInShadow.remove();
+        assert_equals(realForm.elements.length, 2, "The .elements property should have 2 elements after removing the button.");
+
+        // Add a new button using reference target in the 1st level shadow.
+        const newButtonInShadow = document.createElement("button");
+        newButtonInShadow.setAttribute("form", "nested-element");
+        nestedElement.parentNode.insertBefore(newButtonInShadow, nestedElement);
+        assert_equals(realForm.elements.length, 3, "The .elements property should have 3 elements after a new button is inserted.");
+        assert_equals(realForm.elements[0], resetButton, "The first element should be the referencing element.");
+        assert_equals(realForm.elements[1], newButtonInShadow, "The 2nd element should be the button in the shadow dom.");
+        assert_equals(realForm.elements[2], input, "The 3rd element should be the input inside the real form.");
+      }, "Reference target works with nested shadow trees.");
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/shadow-dom/reference-target/tentative/property-reflection-idl-setters.html b/tests/wpt/tests/shadow-dom/reference-target/tentative/property-reflection-idl-setters.html
new file mode 100644
index 00000000000..74f2e670915
--- /dev/null
+++ b/tests/wpt/tests/shadow-dom/reference-target/tentative/property-reflection-idl-setters.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script src="/html/resources/common.js"></script>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/wai-aria/scripts/aria-utils.js"></script>
+  <script src="resources/property-reflection-helper.js"></script>
+</head>
+<body>
+  <div id="host-container"></div>
+  <script>
+    function append_test_declaratively_with_invalid_ref_target(host_container, referenced_element_type) {
+      host_container.setHTMLUnsafe(`
+      <div id="host-id">
+        <template shadowrootmode="open" shadowrootreferencetarget="invalid">
+          <${referenced_element_type} id="target"></${referenced_element_type}>
+        </template>
+      </div>`);
+      const host = host_container.firstElementChild;
+      return host;
+    }
+
+    run_test_for_all_reflecting_properties(append_test_declaratively_with_invalid_ref_target, test_idl_setter, "");
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/shadow-dom/reference-target/tentative/property-reflection-imperative-setup.html b/tests/wpt/tests/shadow-dom/reference-target/tentative/property-reflection-imperative-setup.html
new file mode 100644
index 00000000000..44039295169
--- /dev/null
+++ b/tests/wpt/tests/shadow-dom/reference-target/tentative/property-reflection-imperative-setup.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script src="/html/resources/common.js"></script>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/wai-aria/scripts/aria-utils.js"></script>
+  <script src="resources/property-reflection-helper.js"></script>
+</head>
+<body>
+  <div id="host-container"></div>
+  <script>
+    function append_test_imperatively(host_container, referenced_element_type) {
+      host_container.setHTMLUnsafe('<div id="host-id"></div>');
+      const host = host_container.firstElementChild;
+      host.attachShadow({ mode: 'open', referenceTarget: 'target' });
+      host.shadowRoot.innerHTML = `<${referenced_element_type} id="target"></${referenced_element_type}>`;
+      return host;
+    }
+
+    run_test_for_all_reflecting_properties(append_test_imperatively, test_property_reflection, " with imperative setup");
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/shadow-dom/reference-target/tentative/property-reflection.html b/tests/wpt/tests/shadow-dom/reference-target/tentative/property-reflection.html
index a44baeaf4a3..3054d8eb391 100644
--- a/tests/wpt/tests/shadow-dom/reference-target/tentative/property-reflection.html
+++ b/tests/wpt/tests/shadow-dom/reference-target/tentative/property-reflection.html
@@ -8,118 +8,26 @@
   <script src="/resources/testdriver-vendor.js"></script>
   <script src="/resources/testdriver-actions.js"></script>
   <script src="/wai-aria/scripts/aria-utils.js"></script>
+  <script src="resources/property-reflection-helper.js"></script>
 </head>
 <body>
   <div id="host-container"></div>
   <script>
-    const Behavior = Object.freeze({
-      ReflectsHost: 'ReflectsHost',
-      ReflectsHostInArray: 'ReflectsHostInArray',
-      IsNull: 'IsNull',
-      ReflectsHostID: 'ReflectsHostID',
-      ReflectsHostIDInDOMTokenList: 'ReflectsHostIDInDOMTokenList',
-    });
-
-    function test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, attribute, reflected_property, expected_behavior) {
-      // There's nothing to test if the referencing element type doesn't have the reflecting
-      // property.
-      if (!(reflected_property in document.createElement(referencing_element_type))) {
-        return;
-      }
-
-      test(function () {
-        const referencing_element = document.createElement(referencing_element_type);
-        document.body.appendChild(referencing_element);
-        referencing_element.setAttribute(attribute, "host-id");
-        const host_container = document.querySelector("#host-container");
-        const host = element_creation_method(host_container, referenced_element_type);
-        if (expected_behavior === Behavior.ReflectsHost) {
-          assert_equals(referencing_element[reflected_property], host);
-        } else if (expected_behavior === Behavior.ReflectsHostInArray) {
-          assert_array_equals(referencing_element[reflected_property], [host]);
-        } else if (expected_behavior === Behavior.IsNull) {
-          assert_equals(referencing_element[reflected_property], null);
-        } else if (expected_behavior === Behavior.ReflectsHostID) {
-          assert_equals(referencing_element[reflected_property], "host-id");
-        } else if (expected_behavior === Behavior.ReflectsHostIDInDOMTokenList) {
-          assert_true(referencing_element[reflected_property] instanceof DOMTokenList);
-          assert_array_equals(Array.from(referencing_element[reflected_property]), ["host-id"]);
-        }
-        referencing_element.remove();
-        host_container.setHTMLUnsafe("");
-      }, `${referencing_element_type}.${reflected_property} has reflection behavior ${expected_behavior} when pointing to ${referenced_element_type} with reference target${element_creation_method.method_name}`);
+    function append_test_declaratively(host_container, referenced_element_type) {
+      host_container.setHTMLUnsafe(`
+      <div id="host-id">
+        <template shadowrootmode="open" shadowrootreferencetarget="target">
+          <${referenced_element_type} id="target"></${referenced_element_type}>
+        </template>
+      </div>`);
+      const host = host_container.firstElementChild;
+      return host;
     }
 
-    function appendTestDeclaratively(host_container, referenced_element_type) {
-        host_container.setHTMLUnsafe(`
-        <div id="host-id">
-          <template shadowrootmode="open" shadowrootreferencetarget="target">
-            <${referenced_element_type} id="target"></${referenced_element_type}>
-          </template>
-        </div>`);
-        const host = host_container.firstElementChild;
-        return host;
-    }
-    function appendTestWithOptions(host_container, referenced_element_type) {
-        host_container.setHTMLUnsafe('<div id="host-id"></div>');
-        const host = host_container.firstElementChild;
-        host.attachShadow({ mode: 'open', referenceTarget: 'target' });
-        host.shadowRoot.innerHTML = `<${referenced_element_type} id="target"></${referenced_element_type}>`;
-        return host;
-    }
-    const element_creation_methods = [
-      appendTestDeclaratively,
-      appendTestWithOptions,
-    ];
-    element_creation_methods[0].method_name = '';
-    element_creation_methods[1].method_name = ' via options';
-    // We want to test types of elements that are associated with properties that can reflect other
-    // elements and can therefore interact with reference target in interesting ways.
-    // The HTML5_LABELABLE_ELEMENTS are defined in https://html.spec.whatwg.org/#category-label,
-    // while non_labelable_element_types is a manually curated list of other elements with
-    // reflecting properties (plus div as representative of more "normal" elements).
-    // We'll test all permutations of these element types being both the referencing element
-    // pointing into the reference target shadow host, and being the referenced element inside
-    // the shadow.
-    const non_labelable_element_types = ["div", "object", "label", "fieldset", "legend", "option", "datalist", "form"];
-    const element_types = HTML5_LABELABLE_ELEMENTS.concat(non_labelable_element_types);
-
-    for(let element_creation_method of element_creation_methods) {
-      for(let referencing_element_type of element_types) {
-        for(let referenced_element_type of element_types) {
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "aria-controls", "ariaControlsElements", Behavior.ReflectsHostInArray);
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "aria-activedescendant", "ariaActiveDescendantElement", Behavior.ReflectsHost);
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "aria-describedby", "ariaDescribedByElements", Behavior.ReflectsHostInArray);
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "aria-details", "ariaDetailsElements", Behavior.ReflectsHostInArray);
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "aria-errormessage", "ariaErrorMessageElements", Behavior.ReflectsHostInArray);
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "aria-flowto", "ariaFlowToElements", Behavior.ReflectsHostInArray);
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "aria-labelledby", "ariaLabelledByElements", Behavior.ReflectsHostInArray);
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "aria-owns", "ariaOwnsElements", Behavior.ReflectsHostInArray);
-
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "anchor", "anchorElement", Behavior.ReflectsHost);
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "commandfor", "commandForElement", Behavior.ReflectsHost);
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "popovertarget", "popoverTargetElement", Behavior.ReflectsHost);
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "interesttarget", "interestTargetElement", Behavior.ReflectsHost);
-
-          const expected_htmlFor_property_behavior = (referencing_element_type == "output") ? Behavior.ReflectsHostIDInDOMTokenList : Behavior.ReflectsHostID;
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "for", "htmlFor", expected_htmlFor_property_behavior);
-
-          // It's unclear whether `form` and `list` should return null or should return the
-          // shadow host. See https://github.com/WICG/webcomponents/issues/1072.
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "form", "form", Behavior.IsNull);
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "list", "list", Behavior.IsNull);
-
-          // It's unclear whether this should always reflect the host even if the underlying
-          // referenced element isn't labelable. See
-          // https://github.com/WICG/webcomponents/issues/1072#issuecomment-2305875929
-          const expected_control_property_behavior = HTML5_LABELABLE_ELEMENTS.includes(referenced_element_type) ? Behavior.ReflectsHost : Behavior.IsNull;
-          test_property_reflection(element_creation_method, referencing_element_type, referenced_element_type, "for", "control", expected_control_property_behavior);
-        }
-      }
-    }
+    run_test_for_all_reflecting_properties(append_test_declaratively, test_property_reflection, "");
 
     // Test that the corresponding properties return null when the reference target has invalid ID.
-    function appendTestDeclarativelyWithInvalidID(host_container, referenced_element_type) {
+    function append_test_declaratively_with_invalid_id(host_container, referenced_element_type) {
       host_container.setHTMLUnsafe(`
       <div id="host-id">
         <template shadowrootmode="open" shadowrootreferencetarget="invalid-id">
@@ -131,9 +39,9 @@
     }
     for(let referencing_element_type of element_types) {
       for(let referenced_element_type of element_types) {
-        test_property_reflection(appendTestDeclarativelyWithInvalidID, referencing_element_type, referenced_element_type, "form", "form", Behavior.IsNull);
-        test_property_reflection(appendTestDeclarativelyWithInvalidID, referencing_element_type, referenced_element_type, "list", "list", Behavior.IsNull);
-        test_property_reflection(appendTestDeclarativelyWithInvalidID, referencing_element_type, referenced_element_type, "for", "control", Behavior.IsNull);
+        test_property_reflection(append_test_declaratively_with_invalid_id, referencing_element_type, referenced_element_type, "form", "form", Behavior.IsNull);
+        test_property_reflection(append_test_declaratively_with_invalid_id, referencing_element_type, referenced_element_type, "list", "list", Behavior.IsNull);
+        test_property_reflection(append_test_declaratively_with_invalid_id, referencing_element_type, referenced_element_type, "for", "control", Behavior.IsNull);
       }
     }
 
@@ -142,7 +50,7 @@
       document.body.appendChild(referencing_element);
       referencing_element.setAttribute('for', "host-id");
       const host_container = document.querySelector("#host-container");
-      const host = appendTestDeclaratively(host_container, 'input');
+      const host = append_test_declaratively(host_container, 'input');
       const referenced_element = host.shadowRoot.getElementById('target');
       assert_array_equals(Array.from(referenced_element['labels']), [referencing_element]);
       referencing_element.remove();
@@ -150,5 +58,4 @@
     }, `The .labels property of the referenced input element should point to the referencing label element`);
   </script>
 </body>
-
 </html>
diff --git a/tests/wpt/tests/shadow-dom/reference-target/tentative/resources/property-reflection-helper.js b/tests/wpt/tests/shadow-dom/reference-target/tentative/resources/property-reflection-helper.js
new file mode 100644
index 00000000000..88b7f743831
--- /dev/null
+++ b/tests/wpt/tests/shadow-dom/reference-target/tentative/resources/property-reflection-helper.js
@@ -0,0 +1,163 @@
+const Behavior = Object.freeze({
+  ReflectsHost: 'ReflectsHost',
+  ReflectsHostReadOnly: 'ReflectsHostReadOnly',
+  ReflectsHostInArray: 'ReflectsHostInArray',
+  IsNull: 'IsNull',
+  ReflectsHostID: 'ReflectsHostID',
+  ReflectsHostIDInDOMTokenList: 'ReflectsHostIDInDOMTokenList',
+});
+
+// We want to test types of elements that are associated with properties that can reflect other
+// elements and can therefore interact with reference target in interesting ways.
+// The HTML5_LABELABLE_ELEMENTS are defined in https://html.spec.whatwg.org/#category-label,
+// while non_labelable_element_types is a manually curated list of other elements with
+// reflecting properties (plus div as representative of more "normal" elements).
+// We'll test all permutations of these element types being both the referencing element
+// pointing into the reference target shadow host, and being the referenced element inside
+// the shadow.
+const non_labelable_element_types = ["div", "object", "label", "fieldset", "legend", "option", "datalist", "form"];
+const element_types = HTML5_LABELABLE_ELEMENTS.concat(non_labelable_element_types);
+
+function test_property_reflection(element_creation_method, test_name_suffix, referencing_element_type, referenced_element_type, attribute, reflected_property, expected_behavior) {
+  // There's nothing to test if the referencing element type doesn't have the reflecting
+  // property.
+  if (!(reflected_property in document.createElement(referencing_element_type))) {
+    return;
+  }
+
+  test(function () {
+    const referencing_element = document.createElement(referencing_element_type);
+    document.body.appendChild(referencing_element);
+    referencing_element.setAttribute(attribute, "host-id");
+    const host_container = document.querySelector("#host-container");
+    const host = element_creation_method(host_container, referenced_element_type);
+    if (expected_behavior === Behavior.ReflectsHost || expected_behavior === Behavior.ReflectsHostReadOnly) {
+      assert_equals(referencing_element[reflected_property], host);
+    } else if (expected_behavior === Behavior.ReflectsHostInArray) {
+      assert_array_equals(referencing_element[reflected_property], [host]);
+    } else if (expected_behavior === Behavior.IsNull) {
+      assert_equals(referencing_element[reflected_property], null);
+    } else if (expected_behavior === Behavior.ReflectsHostID) {
+      assert_equals(referencing_element[reflected_property], "host-id");
+    } else if (expected_behavior === Behavior.ReflectsHostIDInDOMTokenList) {
+      assert_true(referencing_element[reflected_property] instanceof DOMTokenList);
+      assert_array_equals(Array.from(referencing_element[reflected_property]), ["host-id"]);
+    }
+    referencing_element.remove();
+    host_container.setHTMLUnsafe("");
+  }, `${referencing_element_type}.${reflected_property} has reflection behavior ${expected_behavior} when pointing to ${referenced_element_type} with reference target${test_name_suffix}`);
+}
+
+function test_idl_setter(element_creation_method, test_name_suffix, referencing_element_type, referenced_element_type, attribute, reflected_property, expected_behavior) {
+  // There's nothing to test if the referencing element type doesn't have the reflecting
+  // property.
+  if (!(reflected_property in document.createElement(referencing_element_type))) {
+    return;
+  }
+
+  test(function () {
+     const referencing_element = document.createElement(referencing_element_type);
+     document.body.appendChild(referencing_element);
+    const host_container = document.querySelector("#host-container");
+    const host = element_creation_method(host_container, referenced_element_type);
+
+    if (reflected_property === "ariaOwnsElements") {
+      // It's undetermined whether reference target should work with aria-owns or not; see
+      // https://github.com/WICG/webcomponents/issues/1091 and
+      // https://github.com/w3c/aria/issues/2266
+      return;
+    }
+
+    if (expected_behavior === Behavior.ReflectsHost) {
+      referencing_element[reflected_property] = host;
+      // For element reflecting properties, the IDL getter should return null when the explicitly
+      // set element has an invalid reference target.
+      assert_equals(referencing_element[reflected_property], null);
+    } else if (expected_behavior === Behavior.ReflectsHostReadOnly) {
+      referencing_element[reflected_property] = host;
+      // Setting a read-only property has no effect.
+      assert_equals(referencing_element[reflected_property], null);
+    } else if (expected_behavior === Behavior.ReflectsHostInArray) {
+      referencing_element[reflected_property] = [ host ];
+      // For element reflecting properties, the IDL getter should not return explicitly set elements
+      // if they have an invalid reference target.
+      assert_array_equals(referencing_element[reflected_property], []);
+    } else if (expected_behavior === Behavior.IsNull) {
+      referencing_element[reflected_property] = host;
+      assert_equals(referencing_element[reflected_property], null);
+    } else if (expected_behavior === Behavior.ReflectsHostID) {
+      referencing_element[reflected_property] = "host-id";
+      // Properties reflecting the host ID return the ID even if it points to an element with
+      // an invalid reference target.
+      assert_equals(referencing_element[reflected_property], "host-id");
+    } else if (expected_behavior === Behavior.ReflectsHostIDInDOMTokenList) {
+      // Properties reflecting a DOMTokenList of IDs returns the IDs even if they point to an
+      // element with an invalid reference target.
+      referencing_element[reflected_property] = [ "host-id" ];
+      assert_true(referencing_element[reflected_property] instanceof DOMTokenList);
+      assert_array_equals(Array.from(referencing_element[reflected_property]), [ "host-id" ]);
+    }
+
+    // Set the reference target to a valid value.
+    host.shadowRoot.referenceTarget = host.shadowRoot.querySelector(referenced_element_type).id;
+
+    if (expected_behavior === Behavior.ReflectsHost) {
+      // For element reflecting properties, if the reference target becomes valid for the explicitly
+      // set element, we should start returning that element.
+      assert_equals(referencing_element[reflected_property], host);
+    } else if (expected_behavior === Behavior.ReflectsHostReadOnly) {
+      assert_equals(referencing_element[reflected_property], null);
+    } else if (expected_behavior === Behavior.ReflectsHostInArray) {
+      // For element reflecting properties, if the reference target becomes valid for any of the
+      // explicitly set elements, we should start returning that element.
+      assert_array_equals(referencing_element[reflected_property], [host]);
+    } else if (expected_behavior === Behavior.IsNull) {
+      assert_equals(referencing_element[reflected_property], null);
+    } else if (expected_behavior === Behavior.ReflectsHostID) {
+      assert_equals(referencing_element[reflected_property], "host-id");
+    } else if (expected_behavior === Behavior.ReflectsHostIDInDOMTokenList) {
+      assert_array_equals(Array.from(referencing_element[reflected_property]), [ "host-id" ]);
+    }
+
+     referencing_element.remove();
+     host_container.setHTMLUnsafe("");
+  }, `${referencing_element_type}.${reflected_property} has IDL setter behavior ${expected_behavior} when pointing to ${referenced_element_type} with reference target${test_name_suffix}`);
+}
+
+function run_test_for_all_reflecting_properties(setup_function, test_function, test_name_suffix) {
+  for(let referencing_element_type of element_types) {
+    for(let referenced_element_type of element_types) {
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "aria-controls", "ariaControlsElements", Behavior.ReflectsHostInArray);
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "aria-activedescendant", "ariaActiveDescendantElement", Behavior.ReflectsHost);
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "aria-describedby", "ariaDescribedByElements", Behavior.ReflectsHostInArray);
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "aria-details", "ariaDetailsElements", Behavior.ReflectsHostInArray);
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "aria-errormessage", "ariaErrorMessageElements", Behavior.ReflectsHostInArray);
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "aria-flowto", "ariaFlowToElements", Behavior.ReflectsHostInArray);
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "aria-labelledby", "ariaLabelledByElements", Behavior.ReflectsHostInArray);
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "aria-owns", "ariaOwnsElements", Behavior.ReflectsHostInArray);
+
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "anchor", "anchorElement", Behavior.ReflectsHost);
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "commandfor", "commandForElement", Behavior.ReflectsHost);
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "popovertarget", "popoverTargetElement", Behavior.ReflectsHost);
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "interesttarget", "interestTargetElement", Behavior.ReflectsHost);
+
+      const expected_htmlFor_property_behavior = (referencing_element_type == "output") ? Behavior.ReflectsHostIDInDOMTokenList : Behavior.ReflectsHostID;
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "for", "htmlFor", expected_htmlFor_property_behavior);
+
+      // The form property of <label>, <legend>, and <option> reflects the form property of the associated labelable element,
+      // the associated <fieldset>, and the associated <select>, respectively. Here since we don't have those associated elements,
+      // the form property would return null.
+      const expected_form_property_behavior = (referenced_element_type == 'form' &&
+                                              referencing_element_type != "label" &&
+                                              referencing_element_type != "legend" &&
+                                              referencing_element_type != "option") ? Behavior.ReflectsHostReadOnly : Behavior.IsNull;
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "form", "form", expected_form_property_behavior);
+
+      const expected_list_property_behavior = (referenced_element_type == 'datalist') ? Behavior.ReflectsHostReadOnly : Behavior.IsNull;
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "list", "list", expected_list_property_behavior);
+
+      const expected_control_property_behavior = HTML5_LABELABLE_ELEMENTS.includes(referenced_element_type) ? Behavior.ReflectsHostReadOnly : Behavior.IsNull;
+      test_function(setup_function, test_name_suffix, referencing_element_type, referenced_element_type, "for", "control", expected_control_property_behavior);
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/wpt/tests/shadow-dom/scroll-restore-shadow.html b/tests/wpt/tests/shadow-dom/scroll-restore-shadow.html
new file mode 100644
index 00000000000..254940ebfb5
--- /dev/null
+++ b/tests/wpt/tests/shadow-dom/scroll-restore-shadow.html
@@ -0,0 +1,79 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Scroll position restore on shadow tree</title>
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://mozilla.org" title="Mozilla">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  scroll-box {
+    display: block;
+    width: 100px;
+    height: 100px;
+    margin: 10px;
+    border: 1px solid;
+
+    &::part(box) {
+      width: 100px;
+      height: 100px;
+      overflow: auto;
+    }
+
+    > .content {
+      height: 500px;
+      background-image: linear-gradient(blue, green);
+    }
+  }
+  #wrapper {
+    position: relative;
+    display: inline-block;
+    border: 1px solid;
+    &.change {
+      /* Changing display rebuilds the layout tree */
+      display: block;
+      position: absolute;
+    }
+  }
+</style>
+<!-- It's important that the shadow trees below are the same -->
+<div id="wrapper">
+  <scroll-box>
+    <template shadowrootmode="open">
+      <div part="box"><slot></slot></div>
+    </template>
+    <div class="content"></div>
+  </scroll-box>
+  <scroll-box>
+    <template shadowrootmode="open">
+      <div part="box"><slot></slot></div>
+    </template>
+    <div class="content"></div>
+  </scroll-box>
+</div>
+<script>
+promise_test(async function() {
+  let wrapper = document.getElementById("wrapper");
+  let [sb1, sb2] = wrapper.querySelectorAll("scroll-box");
+  sb1 = sb1.shadowRoot.querySelector("div[part=box]");
+  sb2 = sb2.shadowRoot.querySelector("div[part=box]");
+
+  sb1.scrollTop = 100;
+  sb2.scrollTop = 200;
+
+  assert_equals(sb1.scrollTop, 100, "scrollTop 1 is reasonable");
+  assert_equals(sb2.scrollTop, 200, "scrollTop 2 is reasonable");
+
+  wrapper.classList.add("change");
+
+  assert_equals(sb1.scrollTop, 100, "scrollTop 1 hasn't changed");
+  assert_equals(sb2.scrollTop, 200, "scrollTop 2 hasn't changed");
+
+  await new Promise(r => {
+    requestAnimationFrame(() => requestAnimationFrame(r));
+  });
+
+  // For good measure
+  assert_equals(sb1.scrollTop, 100, "scrollTop 1 hasn't changed after rAF");
+  assert_equals(sb2.scrollTop, 200, "scrollTop 2 hasn't changed after rAF");
+});
+</script>
diff --git a/tests/wpt/tests/shared-storage/batch-update-inner-method-lock-not-allowed.tentative.https.sub.html b/tests/wpt/tests/shared-storage/batch-update-inner-method-lock-not-allowed.tentative.https.sub.html
new file mode 100644
index 00000000000..2b445c805d0
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/batch-update-inner-method-lock-not-allowed.tentative.https.sub.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<body>
+<script>
+'use strict';
+
+promise_test(async t => {
+  return promise_rejects_dom(t, "DataError",
+    sharedStorage.batchUpdate([
+      new SharedStorageSetMethod("key0", "value0", {withLock: "lock1"})
+    ]));
+}, 'batchUpdate() with a set method that specifies the \'withLock\' option');
+
+</script>
+</body>
diff --git a/tests/wpt/tests/shared-storage/setters.tentative.https.sub.html b/tests/wpt/tests/shared-storage/setters.tentative.https.sub.html
index c5380f8dd85..c3cd19c0bdb 100644
--- a/tests/wpt/tests/shared-storage/setters.tentative.https.sub.html
+++ b/tests/wpt/tests/shared-storage/setters.tentative.https.sub.html
@@ -106,10 +106,10 @@ test(() => {
 
 promise_test(() => {
   return sharedStorage.batchUpdate([
-    new SharedStorageSetMethod("key0", "value0", {withLock: "lock1"}),
+    new SharedStorageSetMethod("key0", "value0"),
     new SharedStorageAppendMethod("key1", "value1"),
     new SharedStorageDeleteMethod("key2"),
-    new SharedStorageClearMethod({withLock: "lock2"})
+    new SharedStorageClearMethod()
   ], {withLock: "lock3"});
 }, 'sharedStorage.batchUpdate');
 
diff --git a/tests/wpt/tests/shared-storage/web-locks-header-modifier-method.tentative.https.sub.html b/tests/wpt/tests/shared-storage/web-locks-header-modifier-method.tentative.https.sub.html
deleted file mode 100644
index 05ec7bf82bd..00000000000
--- a/tests/wpt/tests/shared-storage/web-locks-header-modifier-method.tentative.https.sub.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/utils.js"></script>
-<script src="/shared-storage/resources/util.js"></script>
-<script src="/fenced-frame/resources/utils.js"></script>
-
-<body>
-<script>
-'use strict';
-
-promise_test(async t => {
-  let worklet = await sharedStorage.createWorklet('resources/simple-module.js');
-
-  const ancestor_key = token();
-  let url0 = generateURL("/shared-storage/resources/frame0.html",
-                         [ancestor_key]);
-  let url1 = generateURL("/shared-storage/resources/frame1.html",
-                         [ancestor_key]);
-
-  // Invoke `selectURL()` to perform the following steps:
-  // 1. Acquires the lock.
-  // 2. Reads the current value at the given key.
-  // 3. Waits for 500ms.
-  // 4. Sets the shared storage value to the read value appended with the given letter.
-  // 5. Releases the lock.
-  //
-  // After 100ms, send a fetch() request. The response triggers the `append`
-  // method with the same lock and the same letter.
-  //
-  // Expected behavior: After both of them finish, the value at the given key
-  // should contain the letter repeated twice.
-  //
-  // This demonstrates that the `withLock` option is effective, preventing the
-  // `append` method interfering with the "get and set" operation. If the lock
-  // were not used, the final value would likely be a single letter.
-  //
-  // Note: This test remains valid even if the header `append` happens outside
-  // the critical section protected by the lock within the worklet. The test
-  // effectively demonstrates mutual exclusion as long as there's a reasonable
-  // chance for `append` to occur while the worklet is still running.
-  let select_url_result = await worklet.selectURL(
-      "get-wait-set-within-lock",
-      [{url: url0}, {url: url1}],
-      {data: {'key': 'key',
-              'lock_name': 'lock1',
-              'append_letter': 'a'},
-      resolveToConfig: true});
-
-  // Busy wait for 100ms.
-  const startWaitTime = Date.now();
-  while (Date.now() - startWaitTime < 100) {}
-
-  // Send a fetch() request. The response triggers the `append` method with the
-  // same lock and the same letter.
-  const rawUpdatesHeader = 'append;key=key;value=a;with_lock=lock1';
-  const updatesHeader = encodeURIComponent(rawUpdatesHeader);
-  const updatesUrl =
-    `/shared-storage/resources/shared-storage-write.py?write=${updatesHeader}`;
-
-  let response = await fetch(updatesUrl, {sharedStorageWritable: true});
-  let sharedStorageWritableHeader = await response.text();
-  assert_equals(sharedStorageWritableHeader, "?1");
-
-  attachFencedFrame(select_url_result, 'opaque-ads');
-  const result = await nextValueFromServer(ancestor_key);
-  assert_equals(result, "frame1_loaded");
-
-  await verifyKeyValueForOrigin('key', 'aa', location.origin);
-
-  await deleteKeyForOrigin('key', location.origin);
-}, 'Test for withLock option in the Shared-Storage-Write response header');
-
-</script>
-</body>
diff --git a/tests/wpt/tests/soft-navigation-heuristics/innertext.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/innertext.tentative.html
index d40b6047924..7716488f25a 100644
--- a/tests/wpt/tests/soft-navigation-heuristics/innertext.tentative.html
+++ b/tests/wpt/tests/soft-navigation-heuristics/innertext.tentative.html
@@ -20,13 +20,18 @@
     const link = document.getElementById("link");
     testSoftNavigation({
       addContent: async () => {
-        document.getElementById("softnav-content").innerText =
-          "Lorem Ipsum dolor sit amet";
+          document.getElementById("softnav-content").innerText =
+              'Lorem ipsum dolor sit amet, consectetur adipiscing elit, ' +
+              'sed do eiusmod tempor incididunt ut labore et dolore magna ' +
+              'aliqua. Ut enim ad minim veniam, quis nostrud exercitation ' +
+              'ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis ' +
+              'aute irure dolor in reprehenderit in voluptate velit esse ' +
+              'cillum dolore eu fugiat nulla pariatur. Excepteur sint ' +
+              'occaecat cupidatat non proident, sunt in culpa qui officia ' +
+              'deserunt mollit anim id est laborum.';
       },
       link: link,
       test: "Soft navigation when only innerText was modified"});
   </script>
 </body>
 </html>
-
-
diff --git a/tests/wpt/tests/soft-navigation-heuristics/interaction-with-paint-before-back.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/interaction-with-paint-before-back.tentative.html
index b5874119913..5961a6ebcdf 100644
--- a/tests/wpt/tests/soft-navigation-heuristics/interaction-with-paint-before-back.tentative.html
+++ b/tests/wpt/tests/soft-navigation-heuristics/interaction-with-paint-before-back.tentative.html
@@ -1,76 +1,93 @@
-<!DOCTYPE HTML>
+<!doctype html>
 <html>
-<head>
-<meta charset="utf-8">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="resources/soft-navigation-helper.js"></script>
-</head>
-<body>
-  <main id=main>
-    <div>
-      <a id=link><img src="/images/lcp-256x256.png" id="img"></a>
-      <a id=not_nav><img src="/images/lcp-16x16.png"></a>
+  <head>
+    <meta charset="utf-8" />
+    <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>
+  </head>
+  <body>
+    <div id="main">
+      <div id="almost_soft_nav_div">
+        A click will almost initiate a soft nav, by (1) mutating the DOM by adding an image; (2)
+        causing the image to be painted.
+      </div>
+      <div id="soft_nav_div">
+        A click will initiate a soft nav, by (1) mutating the DOM by adding an image; (2) causing
+        the image to be painted; (3) updating the URL via history.back(), but without causing a hard
+        navigation.
+      </div>
     </div>
-  </main>
-  <script>
-    // Push state a couple of times
-    history.pushState({}, "", "foobar.html");
-    history.pushState({}, "", "anotherOne.html");
-
-    (async () => {
-      const link = document.getElementById("link");
-      // Trigger a user interaction that doesn't result in a soft navigation, but
-      // does paint.
-      await (async () => {
-        const not_nav = document.getElementById("not_nav");
-        let non_soft_nav_click;
-        const non_soft_nav_click_promise =
-          new Promise(r => { non_soft_nav_click = r; });
-        not_nav.addEventListener("click", () => {
-          addImageToMain("lcp-133x106.png", "not_soft_nav_image");
-          (new PerformanceObserver(non_soft_nav_click)).observe({type: "element"});
-        });
-        if (test_driver) {
-          test_driver.click(not_nav);
-        }
-        await non_soft_nav_click_promise;
-      })();
-      const url = URL + "?" + counter;
-      link.addEventListener("click", () => {
-        // Add an LCP element.
-        const img = new Image();
-        img.src = '/images/lcp-100x500.png' + "?" + Math.random();
-        document.getElementById("main").appendChild(img);
-        history.back();
-      });
-      promise_test(async t => {
-        if (test_driver) {
-          test_driver.click(link);
-        }
-        await waitOnSoftNav();
-        assert_equals(
-            document.softNavigations, 1,
-            'Single Soft Navigation detected');
-        const [entries, options] = await new Promise(resolve => {
-          (new PerformanceObserver((list, obs, options) => resolve(
-            [list.getEntries(), options]))).observe(
-            {type: 'soft-navigation', buffered: true});
+    <script>
+      promise_test(
+        async (t) => {
+          // Setup a click handler for 'almost_soft_nav_div', which adds a
+          // specific, identifiable image 'almost_soft_nav_img' to the document.
+          document.getElementById("almost_soft_nav_div").addEventListener("click", () => {
+            const img = new Image();
+            img.src = "/images/lcp-133x106.png";
+            img.elementTiming = "almost_soft_nav_img";
+            document.getElementById("main").appendChild(img);
           });
 
-        assert_equals(entries.length, 1,
-                      "Performance observer got an entry");
-      }, "Ensure that soft navigation entry emitted through a synchronous " +
-         "event that modified DOM and committed a same document navigation, " +
-         "and that was preceded by a user intreaction that resulted in a " +
-         "contentful paint is properly detected.");
-    })();
-  </script>
-</body>
+          // Also set up a click handler for 'soft_nav_div', for adding
+          // another image, but in addition to what we do for the almost soft nav
+          // above, also let the handler change the URL, by invoking
+          // history.back(). We prepare with pushState for the history.back()
+          // invocation, to avoid triggering a hard navigation.
+          const test_origin = new URL(location.href).origin;
+          history.pushState({}, "", "/foo.html"); // We will observe this below.
+          history.pushState({}, "", "/bar.html"); // Prep for history.back().
+          document.getElementById("soft_nav_div").addEventListener("click", () => {
+            const img = new Image();
+            img.src = "/images/lcp-133x106.png";
+            document.getElementById("main").appendChild(img);
+            history.back(); // URL change triggering the soft nav
+          });
+
+          // Now, click almost_soft_nav_div, and observe that time image
+          // was rendered but no soft nav was triggered.
+          {
+            const element_timing_promise = new Promise((resolve) => {
+              new PerformanceObserver(resolve).observe({ type: "element", buffered: true });
+            });
+            if (test_driver) {
+              test_driver.click(almost_soft_nav_div);
+            }
+            // Returns entries of type PerformanceElementTiming, see
+            // https://developer.mozilla.org/en-US/docs/Web/API/PerformanceElementTiming.
+            const entries = (await element_timing_promise).getEntries();
+            assert_equals(entries.length, 1);
+            assert_equals(
+              entries[0].identifier,
+              "almost_soft_nav_img",
+              "Image based on the user interaction was painted.",
+            );
+            assert_equals(document.softNavigations, 0, "No soft navigation detected.");
+          }
+
+          // Now, click soft_nav_div, and observe the detected soft navigation.
+          {
+            const soft_nav_promise = new Promise((resolve) => {
+              new PerformanceObserver(resolve).observe({ type: "soft-navigation", buffered: true });
+            });
+            if (test_driver) {
+              test_driver.click(soft_nav_div);
+            }
+            // Returns entries of type SoftNavigationEntry, see
+            // https://github.com/WICG/soft-navigations/
+            const entries = (await soft_nav_promise).getEntries();
+            assert_equals(document.softNavigations, 1, "Single soft navigation detected");
+            assert_equals(entries.length, 1, "Performance observer got an entry");
+            assert_equals(entries[0].name, test_origin + "/foo.html");
+          }
+        },
+        "Ensure that soft navigation entry emitted through a synchronous " +
+          "event that modified DOM and committed a same document navigation, " +
+          "and that was preceded by a user interaction that resulted in a " +
+          "contentful paint is properly detected.",
+      );
+    </script>
+  </body>
 </html>
-
-
-
-
diff --git a/tests/wpt/tests/soft-navigation-heuristics/navigation-api-after-transition-commit.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/navigation-api-after-transition-commit.tentative.html
deleted file mode 100644
index ae17db7d59f..00000000000
--- a/tests/wpt/tests/soft-navigation-heuristics/navigation-api-after-transition-commit.tentative.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-<meta charset="utf-8">
-<title>Detect intercepted navigate event with after-transition commit.</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="resources/soft-navigation-helper.js"></script>
-</head>
-<body>
-  <main id=main>
-  <a href="foobar.html" id=link>Click me!</a>
-  </main>
-  <script>
-    const link = document.getElementById("link");
-    testNavigationApi("Test soft navigation when navigate event intecepts with { commit: 'after-transition' }", e => {
-        e.intercept({commit: "after-transition", handler: async () => {
-          await addImageToMain();
-          e.commit();
-        }});
-        timestamps[counter]["eventEnd"] = performance.now();
-      }, link);
-  </script>
-</body>
-</html>
-
diff --git a/tests/wpt/tests/soft-navigation-heuristics/navigation-api-precommit.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/navigation-api-precommit.tentative.html
new file mode 100644
index 00000000000..b5d6077e13d
--- /dev/null
+++ b/tests/wpt/tests/soft-navigation-heuristics/navigation-api-precommit.tentative.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Detect intercepted navigate event with after-transition commit.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/soft-navigation-helper.js"></script>
+</head>
+<body>
+  <main id=main>
+  <a href="foobar.html" id=link>Click me!</a>
+  </main>
+  <script>
+    const link = document.getElementById("link");
+    testNavigationApi("Test soft navigation when navigate event intecepts with a precommit handler", e => {
+        e.intercept({precommitHandler: async () => addImageToMain() });
+        timestamps[counter]["eventEnd"] = performance.now();
+      }, link);
+  </script>
+</body>
+</html>
+
diff --git a/tests/wpt/tests/soft-navigation-heuristics/resources/soft-navigation-helper.js b/tests/wpt/tests/soft-navigation-heuristics/resources/soft-navigation-helper.js
index d405adb4e7e..a29978c8760 100644
--- a/tests/wpt/tests/soft-navigation-heuristics/resources/soft-navigation-helper.js
+++ b/tests/wpt/tests/soft-navigation-heuristics/resources/soft-navigation-helper.js
@@ -33,9 +33,10 @@ const testSoftNavigation =
           let paint_entries_promise =
               waitOnPaintEntriesPromise(firstClick);
           interacted = false;
+          const soft_nav_promise = waitOnSoftNav();
           interact(link, interactionFunc);
 
-          const navigation_id = await waitOnSoftNav();
+          const navigation_id = await soft_nav_promise;
           if (!first_navigation_id) {
             first_navigation_id = navigation_id;
           }
@@ -63,8 +64,9 @@ const testNavigationApi = (testName, navigateEventHandler, link) => {
     await waitInitialLCP();
     const preClickLcp = await getLcpEntries();
     let paint_entries_promise = waitOnPaintEntriesPromise();
+    const soft_nav_promise = waitOnSoftNav();
     interact(link);
-    const first_navigation_id = await waitOnSoftNav();
+    const first_navigation_id = await soft_nav_promise;
     await navigated;
     await paint_entries_promise;
     assert_equals(document.softNavigations, 1, 'Soft Navigation detected');
diff --git a/tests/wpt/tests/soft-navigation-heuristics/smoke/tentative/basic.html b/tests/wpt/tests/soft-navigation-heuristics/smoke/tentative/basic.html
new file mode 100644
index 00000000000..9bfedf09b19
--- /dev/null
+++ b/tests/wpt/tests/soft-navigation-heuristics/smoke/tentative/basic.html
@@ -0,0 +1,67 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>Soft Navigation Detection: The Basics.</title>
+    <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>
+      // The click handler is triggered by user interaction; it modifies
+      // the DOM, causing a paint, and also changes the URL.
+      // This constitutes a soft navigation.
+      function clickHandler() {
+        const greeting = document.createElement("div");
+        greeting.textContent = "Hello, World.";
+        document.body.appendChild(greeting);
+        history.pushState({}, "", "/greeting.html");
+      }
+    </script>
+  </head>
+  <body>
+    <div id="click-target" onclick="clickHandler()">Click here!</div>
+
+    <script>
+      test(() => {
+        const observer = new PerformanceObserver(() => {});
+        observer.observe({ type: "soft-navigation", buffered: true });
+        const records = observer.takeRecords();
+        observer.disconnect();
+        assert_equals(records.length, 0, "Expecting empty list.");
+      }, "No soft navigation detection without user interaction.");
+
+      promise_test(async (t) => {
+        const test_origin = new URL(location.href).origin;
+
+        let entries;
+        new PerformanceObserver((list, observer) => {
+          entries = list.getEntries();
+          observer.disconnect();
+        }).observe({ type: "soft-navigation" });
+
+        // Initiate the user interaction to trigger the soft navigation.
+        if (test_driver) {
+          test_driver.click(document.getElementById("click-target"));
+        }
+
+        await t.step_wait(
+          () => entries !== undefined,
+          "Waiting for entries from PerformanceObserver.",
+        );
+
+        // Now check there's one entry, and it's fields.
+        // The SoftNavigationEntry instance is spec'd in
+        // https://github.com/WICG/soft-navigations/
+        assert_equals(entries.length, 1, "Expecting one soft navigation entry.");
+
+        const expected_url = new URL("/greeting.html", test_origin);
+        assert_equals(
+          entries[0].name,
+          expected_url.toString(),
+          "Soft navigation should record destination URL as its name.",
+        );
+      }, "Detect soft navigation after a click.");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/soft-navigation-heuristics/text-lcp-followed-by-anim-image-softnav-lcp.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/text-lcp-followed-by-anim-image-softnav-lcp.tentative.html
index 0615b513e61..b34a6e81a58 100644
--- a/tests/wpt/tests/soft-navigation-heuristics/text-lcp-followed-by-anim-image-softnav-lcp.tentative.html
+++ b/tests/wpt/tests/soft-navigation-heuristics/text-lcp-followed-by-anim-image-softnav-lcp.tentative.html
@@ -21,12 +21,15 @@
       addContent: async () => {
         const main = document.getElementById("main");
         main.removeChild(document.getElementsByTagName("div")[0]);
-        await addImageToMain("anim-gr.png");
+        const img = new Image(500, 500);
+        img.src = "/images/anim-gr.png?" + Math.random();
+        img.id = "imagelcp";
+        img.setAttribute("elementtiming", "imagelcp");
+        main.appendChild(img);
       },
       link: link,
-      test: "Test that a text LCP followup by a smaller soft navigation image"
-        + " LCP properly queues an LCP entry"});
+      test: "Test that a text LCP followup by an animaged image "
+        + " properly queues a soft navigation entry"});
   </script>
 </body>
 </html>
-
diff --git a/tests/wpt/tests/soft-navigation-heuristics/visited-link.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/visited-link.tentative.html
index 0bb149f00e9..0bb31aaac15 100644
--- a/tests/wpt/tests/soft-navigation-heuristics/visited-link.tentative.html
+++ b/tests/wpt/tests/soft-navigation-heuristics/visited-link.tentative.html
@@ -24,7 +24,15 @@
       }));
       const main = document.getElementById("main");
       const div = document.createElement("div");
-      const text = document.createTextNode("Lorem Ipsum");
+      const text = document.createTextNode(
+          'Lorem ipsum dolor sit amet, consectetur adipiscing elit, ' +
+          'sed do eiusmod tempor incididunt ut labore et dolore magna ' +
+          'aliqua. Ut enim ad minim veniam, quis nostrud exercitation ' +
+          'ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis ' +
+          'aute irure dolor in reprehenderit in voluptate velit esse ' +
+          'cillum dolore eu fugiat nulla pariatur. Excepteur sint ' +
+          'occaecat cupidatat non proident, sunt in culpa qui officia ' +
+          'deserunt mollit anim id est laborum.');
       div.appendChild(text);
       main.appendChild(div);
     }
diff --git a/tests/wpt/tests/speculation-rules/prefetch/anonymous-client.https.html b/tests/wpt/tests/speculation-rules/prefetch/anonymous-client.https.html
index bf5896b2dd0..902724cdb0e 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/anonymous-client.https.html
+++ b/tests/wpt/tests/speculation-rules/prefetch/anonymous-client.https.html
@@ -15,7 +15,6 @@
     await agent.navigate(nextUrl);
 
     let requestHeaders = await agent.getRequestHeaders();
-    assert_in_array(requestHeaders.purpose, ["", "prefetch"], "The vendor-specific header Purpose, if present, must be 'prefetch'.");
-    assert_equals(requestHeaders.sec_purpose, "prefetch;anonymous-client-ip");
+    assert_prefetched_anonymous_client_ip(requestHeaders);
   }, "test anonymous-client url prefetch for cross origin pages");
 </script>
diff --git a/tests/wpt/tests/speculation-rules/prefetch/clear-prefetch-cache-after-clear-site-data-cache.https.html b/tests/wpt/tests/speculation-rules/prefetch/clear-prefetch-cache-after-clear-site-data-cache.https.html
deleted file mode 100644
index c5796e48b76..00000000000
--- a/tests/wpt/tests/speculation-rules/prefetch/clear-prefetch-cache-after-clear-site-data-cache.https.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/common/utils.js"></script>
-<script src="../resources/utils.js"></script>
-<script src="resources/utils.sub.js"></script>
-<script>
-  setup(() => assertSpeculationRulesIsSupported());
-
-  promise_test(async t => {
-    let agent = await spawnWindow(t, { protocol: 'https' });
-    let nextUrl = agent.getExecutorURL({protocol: 'https', page: 2 });
-    await agent.forceSinglePrefetch(nextUrl);
-
-    // Open new window with url to clear cache data through Clear-Site-Data header.
-    // Ensure that the cache is cleared before the navigation.
-    const gotMessage = new Promise(resolve => {
-      window.addEventListener('message', e => {
-        resolve(e.data);
-      }, {
-        once: true
-      });
-    });
-    let cache_helper = "cache_helper=" + token() + "&";
-    window.open("../../clear-site-data/support/clear-site-data-cache.py?" + cache_helper + "response=single_html&cache&clear_first=all");    await gotMessage;
-    await gotMessage;
-
-    await agent.navigate(nextUrl);
-    // Because Clear-Site-Data response header is sent, prefetches are expected
-    // to be evicted.
-    // The navigation to nextURL is not expected to use the prefetch cache.
-    assert_not_prefetched(await agent.getRequestHeaders());
-  }, "clear-site-data cache headers should prevent it from being fetched");
-</script>
diff --git a/tests/wpt/tests/speculation-rules/prefetch/clear-prefetch-cache-after-clear-site-data-cache.tentative.https.html b/tests/wpt/tests/speculation-rules/prefetch/clear-prefetch-cache-after-clear-site-data-cache.tentative.https.html
new file mode 100644
index 00000000000..48f6264e852
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/prefetch/clear-prefetch-cache-after-clear-site-data-cache.tentative.https.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<!--
+This file is marked as "tentative" until:
+* The feature flag ClearSiteDataPrefetchPrerenderCache is enabled and
+  https://github.com/WICG/nav-speculation/issues/357 is added to the specification.
+-->
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/common/utils.js"></script>
+<script src="../resources/utils.js"></script>
+<script src="resources/utils.sub.js"></script>
+<script>
+  setup(() => assertSpeculationRulesIsSupported());
+
+  // Test that Clear-Site-Data header value "prefetchCache" clears prefetch cache
+  promise_test(async t => {
+    let agent = await spawnWindow(t, { protocol: 'https' });
+    let nextUrl = agent.getExecutorURL({protocol: 'https', page: 2 });
+    await agent.forceSinglePrefetch(nextUrl);
+
+    // Open new window with url to clear cache data through Clear-Site-Data header.
+    // Ensure that the cache is cleared before the navigation.
+    const gotMessage = new Promise(resolve => {
+      window.addEventListener('message', e => {
+        resolve(e.data);
+      }, {
+        once: true
+      });
+    });
+    window.open("/../../clear-site-data/support/clear-site-data-prefetchCache.py");
+    await gotMessage;
+
+    await agent.navigate(nextUrl);
+    // Because Clear-Site-Data response header is sent, prefetches are expected
+    // to be evicted.
+    // The navigation to nextURL is not expected to use the prefetch cache.
+    assert_not_prefetched(await agent.getRequestHeaders());
+  }, "clear-site-data prefetchCache headers should prevent it from being fetched");
+
+    // Test that Clear-Site-Data header value "cache" clears prefetch cache
+  promise_test(async t => {
+    let agent = await spawnWindow(t, { protocol: 'https' });
+    let nextUrl = agent.getExecutorURL({protocol: 'https', page: 2 });
+    await agent.forceSinglePrefetch(nextUrl);
+
+    // Open new window with url to clear cache data through Clear-Site-Data header.
+    // Ensure that the cache is cleared before the navigation.
+    const gotMessage = new Promise(resolve => {
+      window.addEventListener('message', e => {
+        resolve(e.data);
+      }, {
+        once: true
+      });
+    });
+    let cache_helper = "cache_helper=" + self.crypto.randomUUID() + "&";
+    window.open("/../../clear-site-data/support/clear-site-data-cache.py?" + cache_helper + "response=single_html&cache&clear_first=all");
+    await gotMessage;
+
+    await agent.navigate(nextUrl);
+    // Because Clear-Site-Data response header is sent, prefetches are expected
+    // to be evicted.
+    // The navigation to nextURL is not expected to use the prefetch cache.
+    assert_not_prefetched(await agent.getRequestHeaders());
+  }, "clear-site-data cache headers should prevent it from being fetched");
+</script>
diff --git a/tests/wpt/tests/speculation-rules/prefetch/cross-origin-cookies.https.html b/tests/wpt/tests/speculation-rules/prefetch/cross-origin-cookies.https.html
index a16872fcef9..95c95197a70 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/cross-origin-cookies.https.html
+++ b/tests/wpt/tests/speculation-rules/prefetch/cross-origin-cookies.https.html
@@ -36,6 +36,6 @@
     assert_equals(response_cookies["type"], "prefetch");
 
     let requestHeaders = await agent.getRequestHeaders();
-    assert_equals(requestHeaders.sec_purpose, "prefetch;anonymous-client-ip");
+    assert_prefetched_anonymous_client_ip(requestHeaders);
   }, "speculation rules based prefetch should not use cookies for cross origin urls.");
 </script>
diff --git a/tests/wpt/tests/speculation-rules/prefetch/prefetch-uses-cache.sub.https.html b/tests/wpt/tests/speculation-rules/prefetch/prefetch-uses-cache.sub.https.html
index c0e9e73c75e..59071c82021 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/prefetch-uses-cache.sub.https.html
+++ b/tests/wpt/tests/speculation-rules/prefetch/prefetch-uses-cache.sub.https.html
@@ -18,13 +18,13 @@ promise_test(async t => {
   const initiator = await spawnWindow(t);
   const url1 = initiator.getExecutorURL({
     hostname: is_same_site ? undefined : '{{hosts[alt][www]}}',
-    executor: 'cacheable-executor.sub.html',
-    page: 1
+    page: 1,
+    pipe: 'header(Cache-Control,private\\,max-age=604800)'
   });
   const url2 = initiator.getExecutorURL({
     hostname: is_same_site ? undefined : '{{hosts[][]}}',
-    executor: 'cacheable-executor.sub.html',
-    page: 2
+    page: 2,
+    pipe: 'header(Cache-Control,private\\,max-age=604800)'
   });
 
   await initiator.forceSinglePrefetch(url1);
diff --git a/tests/wpt/tests/speculation-rules/prefetch/referrer-policy-from-rules.https.html b/tests/wpt/tests/speculation-rules/prefetch/referrer-policy-from-rules.https.html
index 5024052eb46..f877bd84824 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/referrer-policy-from-rules.https.html
+++ b/tests/wpt/tests/speculation-rules/prefetch/referrer-policy-from-rules.https.html
@@ -67,7 +67,7 @@ subsetTest(promise_test, async t => {
   // rule allows for prefetching.
   const headers = await agent.getRequestHeaders();
   assert_prefetched(headers, "must be prefetched");
-  assert_equals(headers.referer, '', "must send no referrer");
+  assert_equals(headers.referer, undefined, "must send no referrer");
 }, 'with "no-referrer" referrer policy in rule set overriding "unsafe-url" of cross-site referring page');
 
 subsetTest(promise_test, async t => {
diff --git a/tests/wpt/tests/speculation-rules/prefetch/referrer-policy.https.html b/tests/wpt/tests/speculation-rules/prefetch/referrer-policy.https.html
index 8eb24c45815..a1d2aa4b188 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/referrer-policy.https.html
+++ b/tests/wpt/tests/speculation-rules/prefetch/referrer-policy.https.html
@@ -57,7 +57,7 @@ subsetTest(promise_test, async t => {
 
   const headers = await agent.getRequestHeaders();
   assert_prefetched(headers, "must be prefetched");
-  assert_equals(headers.referer, '', "must send no referrer");
+  assert_equals(headers.referer, undefined, "must send no referrer");
 }, 'with "no-referrer" referrer policy');
 
 subsetTest(promise_test, async t => {
diff --git a/tests/wpt/tests/speculation-rules/prefetch/resources/authenticate.py b/tests/wpt/tests/speculation-rules/prefetch/resources/authenticate.py
index 8820781709d..b2ca9c450e0 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/resources/authenticate.py
+++ b/tests/wpt/tests/speculation-rules/prefetch/resources/authenticate.py
@@ -1,9 +1,11 @@
+# TODO(https://crbug.com/406819294): Simplify relative import for util.
+import importlib
+util = importlib.import_module("speculation-rules.prefetch.resources.util")
 
 def main(request, response):
   def fmt(x):
     return f'"{x.decode("utf-8")}"' if x is not None else "undefined"
 
-  purpose = request.headers.get("Purpose", b"").decode("utf-8")
   sec_purpose = request.headers.get("Sec-Purpose", b"").decode("utf-8")
 
   headers = [
@@ -14,23 +16,12 @@ def main(request, response):
   status = 200 if request.auth.username is not None or sec_purpose.startswith(
       "prefetch") else 401
 
-  content = f'''
-  <!DOCTYPE html>
-  <script src="/common/dispatcher/dispatcher.js"></script>
-  <script src="utils.sub.js"></script>
-  <script>
-  window.requestHeaders = {{
-    purpose: "{purpose}",
-    sec_purpose: "{sec_purpose}"
-  }};
+  content = util.get_executor_html(
+    request,
+    f'''window.requestCredentials = {{
+        username: {fmt(request.auth.username)},
+        password: {fmt(request.auth.password)}
+      }};
+    ''')
 
-  window.requestCredentials = {{
-    username: {fmt(request.auth.username)},
-    password: {fmt(request.auth.password)}
-  }};
-
-  const uuid = new URLSearchParams(location.search).get('uuid');
-  window.executor = new Executor(uuid);
-  </script>
-  '''
   return status, headers, content
diff --git a/tests/wpt/tests/speculation-rules/prefetch/resources/basic-service-worker.js b/tests/wpt/tests/speculation-rules/prefetch/resources/basic-service-worker.js
index 07beb37d660..59d7d8bae9e 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/resources/basic-service-worker.js
+++ b/tests/wpt/tests/speculation-rules/prefetch/resources/basic-service-worker.js
@@ -1,9 +1,54 @@
 const swOption = new URL(location.href).searchParams.get('sw');
 
+const interceptedRequests = [];
+
+self.addEventListener('message', event => {
+  if (event.data === 'getInterceptedRequests') {
+    event.source.postMessage(interceptedRequests);
+  }
+});
+
 if (swOption !== 'no-fetch-handler') {
   self.addEventListener('fetch', event => {
+
+    // Intercept the prefetched and navigated URLs only (e.g. do not intercept
+    // subresource requests related to `/common/dispatcher/dispatcher.js`).
+    if (!event.request.url.includes('counting-executor.py')) {
+      return;
+    }
+
+    const headers = {};
+    event.request.headers.forEach((value, key) => {
+      headers[key] = value;
+    });
+    interceptedRequests.push({
+      request: {
+        url: event.request.url,
+        headers: headers,
+      },
+      clientId: event.clientId,
+      resultingClientId: event.resultingClientId
+    });
+
     if (swOption === 'fetch-handler') {
       event.respondWith(fetch(event.request));
+    } else if (swOption === 'fetch-handler-synthetic') {
+      const finalUrl = new URL(event.request.url).searchParams.get('location');
+      if (finalUrl) {
+        event.respondWith(Response.redirect(finalUrl));
+      } else {
+        // Fallback to the network.
+      }
+    } else if (swOption === 'fetch-handler-modify-url') {
+      // The "Sec-Purpose: prefetch" header is dropped in fetch-handler-modify-*
+      // cases in Step 33 of // https://fetch.spec.whatwg.org/#dom-request
+      // because it's a https://fetch.spec.whatwg.org/#forbidden-request-header
+      const url = new URL(event.request.url);
+      url.searchParams.set('intercepted', 'true');
+      event.respondWith(fetch(url, {headers: event.request.headers}));
+    } else if (swOption === 'fetch-handler-modify-referrer') {
+      event.respondWith(fetch(event.request,
+          {referrer: new URL('/intercepted', location.href).href}));
     } else {
       // Do nothing to fallback to the network.
     }
diff --git a/tests/wpt/tests/speculation-rules/prefetch/resources/cacheable-executor.sub.html b/tests/wpt/tests/speculation-rules/prefetch/resources/cacheable-executor.sub.html
deleted file mode 100644
index ba1b3acb0c1..00000000000
--- a/tests/wpt/tests/speculation-rules/prefetch/resources/cacheable-executor.sub.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="utils.sub.js"></script>
-<script>
-window.requestHeaders = {
-  purpose: "{{header_or_default(Purpose, )}}",
-  sec_purpose: "{{header_or_default(Sec-Purpose, )}}",
-  referer: "{{header_or_default(Referer, )}}",
-};
-
-const uuid = new URLSearchParams(location.search).get('uuid');
-window.executor = new Executor(uuid);
-</script>
diff --git a/tests/wpt/tests/speculation-rules/prefetch/resources/cacheable-executor.sub.html.headers b/tests/wpt/tests/speculation-rules/prefetch/resources/cacheable-executor.sub.html.headers
deleted file mode 100644
index 0ee6ec2ab10..00000000000
--- a/tests/wpt/tests/speculation-rules/prefetch/resources/cacheable-executor.sub.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Cache-Control: private, max-age=604800
diff --git a/tests/wpt/tests/speculation-rules/prefetch/resources/cookies.py b/tests/wpt/tests/speculation-rules/prefetch/resources/cookies.py
index 304f999570b..1b56c674c0b 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/resources/cookies.py
+++ b/tests/wpt/tests/speculation-rules/prefetch/resources/cookies.py
@@ -1,12 +1,15 @@
 import json
 
+# TODO(https://crbug.com/406819294): Simplify relative import for util.
+import importlib
+util = importlib.import_module("speculation-rules.prefetch.resources.util")
+
 def main(request, response):
   cookies = json.dumps({
       key.decode("utf-8"): request.cookies[key].value.decode("utf-8")
       for key in request.cookies
   })
 
-  purpose = request.headers.get("Purpose", b"").decode("utf-8")
   sec_purpose = request.headers.get("Sec-Purpose", b"").decode("utf-8")
 
   cookie_count = int(
@@ -21,20 +24,8 @@ def main(request, response):
   if b"cookieindices" in request.GET:
     headers.extend([(b"Vary", b"Cookie"), (b"Cookie-Indices", b"\"vary1\", \"vary2\"")])
 
-  content = f'''
-  <!DOCTYPE html>
-  <script src="/common/dispatcher/dispatcher.js"></script>
-  <script src="utils.sub.js"></script>
-  <script>
-  window.requestHeaders = {{
-    purpose: "{purpose}",
-    sec_purpose: "{sec_purpose}"
-  }};
+  content = util.get_executor_html(
+    request,
+    f'window.requestCookies = {cookies};')
 
-  window.requestCookies = {cookies};
-
-  const uuid = new URLSearchParams(location.search).get('uuid');
-  window.executor = new Executor(uuid);
-  </script>
-  '''
   return headers, content
diff --git a/tests/wpt/tests/speculation-rules/prefetch/resources/counting-executor.py b/tests/wpt/tests/speculation-rules/prefetch/resources/counting-executor.py
index cbcbc8eccb9..3511fe4905e 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/resources/counting-executor.py
+++ b/tests/wpt/tests/speculation-rules/prefetch/resources/counting-executor.py
@@ -21,6 +21,11 @@ def main(request, response):
   request_count["prefetch" if prefetch else "nonPrefetch"] += 1
   request.server.stash.put(uuid, request_count)
 
+  if b"location" in request.GET:
+    response.status = 302
+    response.headers.set(b"Location", request.GET[b"location"])
+    return
+
   response.content = template(
     request,
     open(os.path.join(os.path.dirname(__file__), "executor.sub.html"), "rb").read())
diff --git a/tests/wpt/tests/speculation-rules/prefetch/resources/executor.sub.html b/tests/wpt/tests/speculation-rules/prefetch/resources/executor.sub.html
index 24fef916bb3..975a3e5092e 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/resources/executor.sub.html
+++ b/tests/wpt/tests/speculation-rules/prefetch/resources/executor.sub.html
@@ -1,14 +1,89 @@
 <!DOCTYPE html>
 <script src="/common/dispatcher/dispatcher.js" nonce="abc"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
 <script src="utils.sub.js" nonce="abc"></script>
 <script nonce="abc">
+// For a given string `str` that is escaped by WPT's `.sub.html` or
+// `pipe=sub(html)` functionality, return the original unescaped string.
+//
+// Concretely, for `str` as the result of `html.escape(x, quote=True)`,
+// return the original unescaped string `x`.
+// See `/tools/wptserve/wptserve/pipes.py` and
+// https://docs.python.org/3/library/html.html#html.escape.
+//
+// See https://crbug.com/404573971 for fixing the escaping issue.
+function reverse_html_escape(str) {
+  str = str.replaceAll('&lt;', '<');
+  str = str.replaceAll('&gt;', '>');
+  str = str.replaceAll('&quot;', '"');
+  str = str.replaceAll('&#x27;', "'");
+  str = str.replaceAll('&amp;', '&');
+  return str;
+}
+
+// To be consistent with https://fetch.spec.whatwg.org/#headers-class
+// (accessed via iterable),
+// - The keys are lower-cased header names, and
+// - The entries are removed when the corresponding headers are non-existent.
 window.requestHeaders = {
-  purpose: "{{header_or_default(Purpose, )}}",
-  sec_purpose: "{{header_or_default(Sec-Purpose, )}}",
-  referer: "{{header_or_default(Referer, )}}",
-  sec_fetch_dest: "{{header_or_default(Sec-Fetch-Dest, )}}",
-  sec_fetch_mode: "{{header_or_default(Sec-Fetch-Mode, )}}",
+  "purpose": "{{header_or_default(Purpose, NONEXISTENT)}}",
+  "sec-purpose": "{{header_or_default(Sec-Purpose, NONEXISTENT)}}",
+  "referer": "{{header_or_default(Referer, NONEXISTENT)}}",
+  "sec-fetch-dest": "{{header_or_default(Sec-Fetch-Dest, NONEXISTENT)}}",
+  "sec-fetch-mode": "{{header_or_default(Sec-Fetch-Mode, NONEXISTENT)}}",
+  // Convert to the raw string to avoid backslashes from being processed as
+  // escape sequences.
+  // TODO(crbug.com/404573971): Remove `header_or_default` to reflect
+  // `__no_tags__` properly.
+  sec_speculation_tags:
+      String.raw`{{header_or_default(Sec-Speculation-Tags, __no_tags__)}}`,
 };
+Object.keys(requestHeaders).forEach(key => {
+  if (requestHeaders[key] === "NONEXISTENT") {
+    delete requestHeaders[key];
+  } else {
+    requestHeaders[key] = reverse_html_escape(requestHeaders[key]);
+  }
+});
+
+// Add a link to the page in order to use during the test
+function add_link(id, url) {
+  const link_element = document.createElement("a");
+  const link_text = document.createTextNode(url);
+  link_element.setAttribute("href", url);
+  link_element.setAttribute("id", id);
+  link_element.appendChild(link_text);
+  document.body.appendChild(link_element);
+}
+
+// "id" is the id of the link that we need to hover on in order
+// to start the prefetch
+async function start_non_eager_prefetch_on_hover(id) {
+  let target = document.getElementById(id);
+
+  test_driver.set_test_context(window.opener);
+  // Inject the inputs to run this test.
+  await new test_driver.Actions().addPointer("mouse").pointerMove(0, 0, {origin: target}).send();
+}
+
+// "id" is the id of the link that we need to press on in order
+// to start the prefetch
+async function start_non_eager_prefetch_on_pointerdown(id) {
+  let target = document.getElementById(id);
+
+  test_driver.set_test_context(window.opener);
+  // Inject the inputs to run this test.
+  // Move mouse pointer outside of the anchor so that we don't start the
+  // navigation before making sure the prefetch request started server-side.
+  await new test_driver.Actions().addPointer("mouse").pointerMove(0, 0, {origin: target}).pointerDown().pointerMove(0, 0).pointerUp().send();
+}
+
+
+// The fetch request's URL sent to the server.
+window.requestUrl = reverse_html_escape(
+    "{{location[server]}}{{location[path]}}{{location[query]}}");
 
 const uuid = new URLSearchParams(location.search).get('uuid');
 window.executor = new Executor(uuid);
diff --git a/tests/wpt/tests/speculation-rules/prefetch/resources/prefetch_nvs_hint.py b/tests/wpt/tests/speculation-rules/prefetch/resources/prefetch_nvs_hint.py
index d912eff90a5..f4ecb004bc1 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/resources/prefetch_nvs_hint.py
+++ b/tests/wpt/tests/speculation-rules/prefetch/resources/prefetch_nvs_hint.py
@@ -1,5 +1,9 @@
 import time
 
+# TODO(https://crbug.com/406819294): Simplify relative import for util.
+import importlib
+util = importlib.import_module("speculation-rules.prefetch.resources.util")
+
 def main(request, response):
   response.headers.set("Cache-Control", "no-store")
   uuid = request.GET[b"uuid"]
@@ -33,17 +37,4 @@ def main(request, response):
       time.sleep(0.1)
       nvswait = request.server.stash.take(uuid)
 
-  content = (f'<!DOCTYPE html>\n'
-             f'<script src="/common/dispatcher/dispatcher.js"></script>\n'
-             f'<script src="utils.sub.js"></script>\n'
-             f'<script>\n'
-             f'  window.requestHeaders = {{\n'
-             f'    purpose: "{request.headers.get("Purpose", b"").decode("utf-8")}",\n'
-             f'    sec_purpose: "{request.headers.get("Sec-Purpose", b"").decode("utf-8")}",\n'
-             f'    referer: "{request.headers.get("Referer", b"").decode("utf-8")}",\n'
-             f'  }};\n'
-             f'  const uuid = new URLSearchParams(location.search).get("uuid");\n'
-             f'  window.executor = new Executor(uuid);\n'
-             f'</script>\n')
-
-  return content
+  return util.get_executor_html(request, '')
diff --git a/tests/wpt/tests/speculation-rules/prefetch/resources/util.py b/tests/wpt/tests/speculation-rules/prefetch/resources/util.py
new file mode 100644
index 00000000000..1ef6778badf
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/prefetch/resources/util.py
@@ -0,0 +1,16 @@
+import os
+from wptserve.pipes import template
+
+# Returns the executor HTML (as bytes).
+# `additional_script` (str) is inserted to the JavaScript before the executor.
+def get_executor_html(request, additional_script):
+  content = template(
+    request,
+    open(os.path.join(os.path.dirname(__file__), "executor.sub.html"), "rb").read())
+
+  # Insert an additional script at the head of script before Executor.
+  content = content.replace(
+      b'<script nonce="abc">',
+      b'<script nonce="abc">' + additional_script.encode('utf-8'))
+
+  return content
diff --git a/tests/wpt/tests/speculation-rules/prefetch/resources/utils.sub.js b/tests/wpt/tests/speculation-rules/prefetch/resources/utils.sub.js
index 0ab3f1ac341..d4efc2dc7dc 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/resources/utils.sub.js
+++ b/tests/wpt/tests/speculation-rules/prefetch/resources/utils.sub.js
@@ -42,9 +42,16 @@ class PrefetchAgent extends RemoteContext {
   // occur despite heuristic matching, etc., and await the completion of the
   // prefetch.
   async forceSinglePrefetch(url, extra = {}, wait_for_completion = true) {
-    await this.execute_script((url, extra) => {
-      insertSpeculationRules({ prefetch: [{source: 'list', urls: [url], ...extra}] });
-    }, [url, extra]);
+    return this.forceSpeculationRules(
+      {
+        prefetch: [{source: 'list', urls: [url], ...extra}]
+      }, wait_for_completion);
+  }
+
+  async forceSpeculationRules(rules, wait_for_completion = true) {
+    await this.execute_script((rules) => {
+      insertSpeculationRules(rules);
+    }, [rules]);
     if (!wait_for_completion) {
       return Promise.resolve();
     }
@@ -179,14 +186,56 @@ function insertDocumentRule(predicate, extra_options={}) {
 }
 
 function assert_prefetched (requestHeaders, description) {
-  assert_in_array(requestHeaders.purpose, ["", "prefetch"], "The vendor-specific header Purpose, if present, must be 'prefetch'.");
-  assert_in_array(requestHeaders.sec_purpose,
+  assert_in_array(requestHeaders.purpose, [undefined, "prefetch"], "The vendor-specific header Purpose, if present, must be 'prefetch'.");
+  assert_in_array(requestHeaders['sec-purpose'],
                   ["prefetch", "prefetch;anonymous-client-ip"], description);
 }
 
+function assert_prefetched_anonymous_client_ip(requestHeaders, description) {
+  assert_in_array(requestHeaders.purpose, [undefined, "prefetch"], "The vendor-specific header Purpose, if present, must be 'prefetch'.");
+  assert_equals(requestHeaders['sec-purpose'],
+                "prefetch;anonymous-client-ip",
+                description);
+}
+
 function assert_not_prefetched (requestHeaders, description){
-  assert_equals(requestHeaders.purpose, "", description);
-  assert_equals(requestHeaders.sec_purpose, "", description);
+  assert_equals(requestHeaders.purpose, undefined, description);
+  assert_equals(requestHeaders['sec-purpose'], undefined, description);
+}
+
+// If the prefetch request is intercepted and modified by ServiceWorker,
+// - "Sec-Purpose: prefetch" header is dropped in Step 33 of
+//   https://fetch.spec.whatwg.org/#dom-request
+//   because it's a https://fetch.spec.whatwg.org/#forbidden-request-header.
+// - "Purpose: prefetch" can still be sent.
+// Note that this check passes also for non-prefetch requests, so additional
+// checks are needed to distinguish from non-prefetch requests.
+function assert_prefetched_without_sec_purpose(requestHeaders, description) {
+  assert_in_array(requestHeaders.purpose, [undefined, "prefetch"],
+      "The vendor-specific header Purpose, if present, must be 'prefetch'.");
+  assert_equals(requestHeaders['sec-purpose'], undefined, description);
+}
+
+// For ServiceWorker tests.
+// `interceptedRequest` is an element of `interceptedRequests` in
+// `resources/basic-service-worker.js`.
+
+// The ServiceWorker fetch handler intercepted a prefetching request.
+function assert_intercept_prefetch(interceptedRequest, expectedUrl) {
+  assert_equals(interceptedRequest.request.url, expectedUrl.toString(),
+      "intercepted request URL.");
+
+  assert_prefetched(interceptedRequest.request.headers,
+      "Prefetch request should be intercepted.");
+}
+
+// The ServiceWorker fetch handler intercepted a non-prefetching request.
+function assert_intercept_non_prefetch(interceptedRequest, expectedUrl) {
+  assert_equals(interceptedRequest.request.url, expectedUrl.toString(),
+      "intercepted request URL.");
+
+  assert_not_prefetched(interceptedRequest.request.headers,
+      "Non-prefetch request should be intercepted.");
 }
 
 // Use nvs_header query parameter to ask the wpt server
diff --git a/tests/wpt/tests/speculation-rules/prefetch/sec-fetch-headers.https.html b/tests/wpt/tests/speculation-rules/prefetch/sec-fetch-headers.https.html
index 730f0720995..3d1d1770d78 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/sec-fetch-headers.https.html
+++ b/tests/wpt/tests/speculation-rules/prefetch/sec-fetch-headers.https.html
@@ -23,7 +23,7 @@ promise_test(async t => {
 
   const headers = await agent.getRequestHeaders();
   assert_prefetched(headers, "must be prefetched");
-  assert_equals(headers.sec_fetch_dest, "document", "Sec-Fetch-Dest");
+  assert_equals(headers['sec-fetch-dest'], "document", "Sec-Fetch-Dest");
 }, 'Sec-Fetch-Dest');
 
 promise_test(async t => {
@@ -34,7 +34,7 @@ promise_test(async t => {
 
   const headers = await agent.getRequestHeaders();
   assert_prefetched(headers, "must be prefetched");
-  assert_equals(headers.sec_fetch_mode, "navigate", "Sec-Fetch-Mode");
+  assert_equals(headers['sec-fetch-mode'], "navigate", "Sec-Fetch-Mode");
 }, 'Sec-Fetch-Mode');
 
 promise_test(async t => {
@@ -47,7 +47,7 @@ promise_test(async t => {
 
   const headers = await agent.getRequestHeaders();
   assert_prefetched(headers, "must be prefetched");
-  assert_equals(headers.sec_fetch_dest, "document", "Sec-Fetch-Dest");
+  assert_equals(headers['sec-fetch-dest'], "document", "Sec-Fetch-Dest");
 }, 'Sec-Fetch-Dest with redirects');
 
 promise_test(async t => {
@@ -60,6 +60,6 @@ promise_test(async t => {
 
   const headers = await agent.getRequestHeaders();
   assert_prefetched(headers, "must be prefetched");
-  assert_equals(headers.sec_fetch_mode, "navigate", "Sec-Fetch-Mode");
+  assert_equals(headers['sec-fetch-mode'], "navigate", "Sec-Fetch-Mode");
 }, 'Sec-Fetch-Mode with redirects');
 </script>
diff --git a/tests/wpt/tests/speculation-rules/prefetch/tentative/service-worker/basic.sub.https.html b/tests/wpt/tests/speculation-rules/prefetch/tentative/service-worker/basic.sub.https.html
index e4c103535cc..98e089bcc66 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/tentative/service-worker/basic.sub.https.html
+++ b/tests/wpt/tests/speculation-rules/prefetch/tentative/service-worker/basic.sub.https.html
@@ -10,6 +10,8 @@
 
 <meta name="variant" content="?origin=same-site&sw=fetch-handler">
 <meta name="variant" content="?origin=same-site&sw=fetch-handler-to-fallback">
+<meta name="variant" content="?origin=same-site&sw=fetch-handler-modify-url">
+<meta name="variant" content="?origin=same-site&sw=fetch-handler-modify-referrer">
 <meta name="variant" content="?origin=same-site&sw=no-fetch-handler">
 <meta name="variant" content="?origin=same-site&sw=no-controller">
 
@@ -21,6 +23,8 @@
 <script>
 setup(() => assertSpeculationRulesIsSupported());
 
+// TODO(https://crbug.com/404573972): Rename "same-site" tests to
+// "same-origin", and add same-site cross-origin tests.
 const originOption = new URL(location.href).searchParams.get('origin');
 const swOption = new URL(location.href).searchParams.get('sw');
 
@@ -30,7 +34,7 @@ promise_test(async t => {
   const win = await spawnWindow(t, { protocol: 'https', hostname: hostname });
   const nextUrl = win.getExecutorURL({ executor: 'counting-executor.py', protocol: 'https', page: 2 });
 
-  const swUrl = '../../resources/basic-service-worker.js?sw=' + swOption;
+  const swUrl = new URL('../../resources/basic-service-worker.js?sw=' + swOption, location.href).href;
 
   // Register a SW not controlling any pages below, just to confirm such
   // unrelated SWs in the same-origin doesn't affect the behavior.
@@ -43,8 +47,8 @@ promise_test(async t => {
   if (swOption !== 'no-controller') {
     const reg = await service_worker_unregister_and_register(
         t, swUrl, nextUrl);
-    await wait_for_state(t, reg.installing, 'activated');
     sw = reg.installing;
+    await wait_for_state(t, sw, 'activated');
   }
 
   // Start speculation rules prefetch and navigate to the URL.
@@ -58,24 +62,98 @@ promise_test(async t => {
     return requestHeaders;
   }, []);
 
+  const controllerUrl = await win.execute_script(() => {
+    return navigator.serviceWorker.controller?.scriptURL;
+  }, []);
+
+  if (swOption === 'no-controller') {
+    assert_equals(controllerUrl, undefined);
+  } else {
+    // The navigated page should be controlled by the ServiceWorker,
+    // regardless of whether prefetch is performed/used.
+    assert_equals(controllerUrl, swUrl);
+  }
+
+  let interceptedRequests = [];
+  if (sw) {
+    const messagePromise = new Promise(resolve => {
+      navigator.serviceWorker.addEventListener('message', (event) => {
+        resolve(event.data);
+      }, {once: true});
+    });
+    sw.postMessage('getInterceptedRequests');
+    interceptedRequests = await messagePromise;
+  }
+
   // Current Chromium's expected behavior:
   // prefetch works when
   // - there are no controlling service worker, or
-  // - same-origin prefetches with controlling service worker.
+  // - same-site prefetches with controlling service worker.
   if (swOption === 'no-controller' ||
-      originOption === 'same-site') {
+      (originOption === 'same-site' &&
+          (swOption === 'fetch-handler' ||
+           swOption === 'fetch-handler-to-fallback' ||
+           swOption === 'no-fetch-handler'))) {
     assert_prefetched(headers, "Prefetched result should be served.");
     assert_equals(requestCount.prefetch, 1,
         'a prefetch request should be sent to the server.');
     assert_equals(requestCount.nonPrefetch, 0,
         'non-prefetch requests should not be sent to the server.');
     assert_prefetched(headers, "Prefetched result should be served.");
+
+    if (swOption === 'no-controller' || swOption === 'no-fetch-handler') {
+      assert_equals(interceptedRequests.length, 0);
+    } else {
+      assert_equals(interceptedRequests.length, 1);
+      assert_intercept_prefetch(interceptedRequests[0], nextUrl);
+    }
+  } else if (originOption === 'same-site' &&
+             (swOption === 'fetch-handler-modify-url' ||
+              swOption === 'fetch-handler-modify-referrer')) {
+    // When the ServiceWorker modifies the prefetch request
+    // (`fetch-handler-modify-*` cases below), still prefetch can work and be
+    // served, but Sec-Purpose header is dropped
+    // because it's a https://fetch.spec.whatwg.org/#forbidden-request-header
+    assert_prefetched_without_sec_purpose(headers,
+        "Prefetched result should be served without Sec-Purpose.");
+    // `requestCount` checks the Sec-Purpose header so the prefetch request
+    // without Sec-Prefetch is counted as nonPrefetch here.
+    assert_equals(requestCount.nonPrefetch, 1,
+        'a prefetch request without Sec-Purpose should be sent to the server.');
+    assert_equals(requestCount.prefetch, 0,
+        'Other requests with Sec-Prefetch should not be sent to the server.');
+
+    // Check the modified URL/referrer to check if the prefetched and
+    // ServiceWorker-modified response is actually served.
+    if (swOption === 'fetch-handler-modify-url') {
+      assert_equals(
+          await win.execute_script(() => { return requestUrl; }, []),
+          nextUrl + '&intercepted=true',
+          'URL should be modified by ServiceWorker');
+    }
+    if (swOption === 'fetch-handler-modify-referrer') {
+      assert_equals(
+          headers.referer,
+          new URL('/intercepted', location.href).href,
+          'Referrer should be modified by ServiceWorker');
+    }
+
+    assert_equals(interceptedRequests.length, 1);
+    assert_intercept_prefetch(interceptedRequests[0], nextUrl);
   } else {
     assert_not_prefetched(headers, "Prefetched result should not be served.");
     assert_equals(requestCount.nonPrefetch, 1,
         'a non-prefetch request should be sent to the server.');
     assert_equals(requestCount.prefetch, 0,
         'prefetch requests should not be sent to the server.');
+
+    if (swOption === 'no-fetch-handler') {
+      assert_equals(interceptedRequests.length, 0);
+    } else {
+      assert_equals(interceptedRequests.length, 1);
+      assert_intercept_non_prefetch(interceptedRequests[0], nextUrl);
+    }
   }
+
 }, "Prefetch with ServiceWorker (" + swOption + ")");
 </script>
diff --git a/tests/wpt/tests/speculation-rules/prefetch/tentative/service-worker/redirect.sub.https.html b/tests/wpt/tests/speculation-rules/prefetch/tentative/service-worker/redirect.sub.https.html
new file mode 100644
index 00000000000..f56f6bf09b9
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/prefetch/tentative/service-worker/redirect.sub.https.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="../../../resources/utils.js"></script>
+<script src="../../resources/utils.sub.js"></script>
+<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+
+<meta name="variant" content="?origin=same-site&sc=in-in&sw=fetch-handler">
+<meta name="variant" content="?origin=same-site&sc=in-in&sw=fetch-handler-to-fallback">
+<meta name="variant" content="?origin=same-site&sc=in-in&sw=fetch-handler-synthetic">
+<meta name="variant" content="?origin=same-site&sc=in-in&sw=no-fetch-handler">
+
+<meta name="variant" content="?origin=same-site&sc=in-out&sw=fetch-handler">
+<meta name="variant" content="?origin=same-site&sc=in-out&sw=fetch-handler-to-fallback">
+<meta name="variant" content="?origin=same-site&sc=in-out&sw=fetch-handler-synthetic">
+<meta name="variant" content="?origin=same-site&sc=in-out&sw=no-fetch-handler">
+
+<meta name="variant" content="?origin=same-site&sc=out-in&sw=fetch-handler">
+<meta name="variant" content="?origin=same-site&sc=out-in&sw=fetch-handler-to-fallback">
+<meta name="variant" content="?origin=same-site&sc=out-in&sw=no-fetch-handler">
+
+<script>
+setup(() => assertSpeculationRulesIsSupported());
+
+const originOption = new URL(location.href).searchParams.get('origin');
+const swOption = new URL(location.href).searchParams.get('sw');
+
+// We use a short name `sc` to avoid long file names https://crbug.com/40469687
+const scopeOption = new URL(location.href).searchParams.get('sc');
+
+promise_test(async t => {
+  const hostname = originOption === 'cross-site' ? '{{hosts[alt][www]}}'
+                                                 : undefined;
+  const win = await spawnWindow(t, { protocol: 'https', hostname: hostname });
+
+  const finalUrl = win.getExecutorURL({ executor: 'counting-executor.py', protocol: 'https', page: 2 });
+  const initialUrl = new URL('../../resources/counting-executor.py', location.href);
+  // Assign a different UUID to track the number of requests to server
+  // separately for the initialUrl and finalUrl.
+  initialUrl.searchParams.set('uuid', token());
+  initialUrl.searchParams.set('location', finalUrl);
+
+  const swUrl = new URL('../../resources/basic-service-worker.js?sw=' + swOption, location.href).href;
+
+  let sw1;
+  if (scopeOption === 'in-in' || scopeOption === 'in-out') {
+    // Register a SW for `initialUrl`.
+    const reg = await service_worker_unregister_and_register(
+        t, swUrl + '&sw1', initialUrl);
+    sw1 = reg.installing;
+    await wait_for_state(t, reg.installing, 'activated');
+  }
+
+  let sw2;
+  if (scopeOption === 'in-in' || scopeOption === 'out-in') {
+    // Register a SW for `finalUrl`.
+    const reg = await service_worker_unregister_and_register(
+        t, swUrl + '&sw2', finalUrl);
+    sw2 = reg.installing;
+    await wait_for_state(t, reg.installing, 'activated');
+  }
+
+  // Start speculation rules prefetch and navigate to the URL.
+  await win.forceSinglePrefetch(initialUrl);
+
+  await win.navigate(initialUrl, {expectedDestinationUrl: finalUrl});
+
+  const initialRequestCount = await (await fetch(initialUrl + '&check')).json();
+  const finalRequestCount = await (await fetch(finalUrl + '&check')).json();
+
+  const headers = await win.execute_script(() => {
+    return requestHeaders;
+  }, []);
+
+  const controllerUrl = await win.execute_script(() => {
+    return navigator.serviceWorker.controller ?
+           navigator.serviceWorker.controller.scriptURL :
+           undefined;
+  }, []);
+
+  if (sw2) {
+    // The navigated page should be controlled by the ServiceWorker,
+    // regardless of whether prefetch is performed/used.
+    assert_equals(controllerUrl, swUrl + '&sw2');
+  } else {
+    assert_equals(controllerUrl, undefined);
+  }
+
+  // In any cases prefetch + redirects + ServiceWorker fails and prefetched
+  // results aren't served.
+  assert_not_prefetched(headers, "Prefetched result should not be served.");
+
+  if (swOption === 'fetch-handler-synthetic') {
+    // Synthetic redirect response from ServiceWorker prevents the initial
+    // prefetch/non-prefetch requests to the server.
+    assert_equals(initialRequestCount.prefetch, 0,
+        'prefetch requests to initial URL should not be sent to the server.');
+    assert_equals(initialRequestCount.nonPrefetch, 0,
+        'a non-prefetch requests to initial URL should not be sent to the server.');
+  } else {
+    // Otherwise, the initial prefetch request (either with or without
+    // ServiceWorker interception) anyway reaches the server, and then
+    // re-requested as a non-prefetch request on navigation.
+    assert_equals(initialRequestCount.prefetch, 1,
+        'prefetch requests to initial URL should be sent to the server.');
+    assert_equals(initialRequestCount.nonPrefetch, 1,
+        'a non-prefetch requests to initial URL should be sent to the server.');
+  }
+
+  // Prefetch requests to the URL after redirects shouldn't be sent to server
+  // because prefetch should fail immediately on receiving redirects.
+  assert_equals(finalRequestCount.prefetch, 0,
+      'prefetch requests should not be sent to the server.');
+  // Instead, a single non-prefetch request should be sent.
+  assert_equals(finalRequestCount.nonPrefetch, 1,
+      'a non-prefetch request should be sent to the server.');
+
+}, "Prefetch with ServiceWorker (" + swOption + ")");
+</script>
diff --git a/tests/wpt/tests/speculation-rules/prefetch/user-pass.https.html b/tests/wpt/tests/speculation-rules/prefetch/user-pass.https.html
index 011e6137e61..c6cc51bdb04 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/user-pass.https.html
+++ b/tests/wpt/tests/speculation-rules/prefetch/user-pass.https.html
@@ -33,8 +33,7 @@
       assert_equals(request_credentials.username, undefined);
       assert_equals(request_credentials.password, undefined);
 
-      assert_in_array(requestHeaders.purpose, ["", "prefetch"]);
-      assert_equals(requestHeaders.sec_purpose, "prefetch;anonymous-client-ip");
+      assert_prefetched_anonymous_client_ip(requestHeaders);
     }
     else {
       assert_equals(request_credentials.username, credentials.username);
diff --git a/tests/wpt/tests/speculation-rules/prerender/about-blank-iframes.html b/tests/wpt/tests/speculation-rules/prerender/about-blank-iframes.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/about-blank-iframes.html
rename to tests/wpt/tests/speculation-rules/prerender/about-blank-iframes.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/activation-start.html b/tests/wpt/tests/speculation-rules/prerender/activation-start.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/activation-start.html
rename to tests/wpt/tests/speculation-rules/prerender/activation-start.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/blob_object_url.html b/tests/wpt/tests/speculation-rules/prerender/blob_object_url.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/blob_object_url.html
rename to tests/wpt/tests/speculation-rules/prerender/blob_object_url.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/cancel-prerendering-after-clear-site-data-cache-different-origins.tentative.https.html b/tests/wpt/tests/speculation-rules/prerender/cancel-prerendering-after-clear-site-data-cache-different-origins.tentative.https.html
new file mode 100644
index 00000000000..db52e758750
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/prerender/cancel-prerendering-after-clear-site-data-cache-different-origins.tentative.https.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<!--
+This file is marked as "tentative" until:
+* The feature flag ClearSiteDataPrefetchPrerenderCache is enabled and
+  https://github.com/WICG/nav-speculation/issues/357 is added to the specification.
+-->
+<title>clear-site-data-cache cancels prerenders</title>
+<meta name="timeout" content="long">
+<body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/speculation-rules/resources/utils.js"></script>
+<script src="/speculation-rules/prerender/resources/utils.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+<script>
+setup(() => assertSpeculationRulesIsSupported());
+
+promise_test(async t => {
+
+  const rcHelper = new RemoteContextHelper();
+  const referrerRC = await rcHelper.addWindow({
+    origin: 'HTTPS_ORIGIN'
+  }, {
+    features: 'noopener'
+  });
+  const prerenderedRC = await addPrerenderRC(referrerRC, {
+    origin: 'HTTPS_REMOTE_ORIGIN',
+    headers: [
+      ['Supports-Loading-Mode', 'credentialed-prerender']
+    ]
+  });
+
+  const differentOrigin = get_host_info().HTTPS_REMOTE_ORIGIN;
+
+  // Open new window with different origin to clear cache data through
+  // Clear-Site-Data header.
+  // Ensure that the cache is cleared before the navigation.
+  const gotMessage = new Promise(resolve => {
+    window.addEventListener('message', e => {
+      resolve(e.data);
+    }, {
+      once: true
+    });
+  });
+  window.open(differentOrigin + "/../../clear-site-data/support/clear-site-data-prerenderCache.py");
+  await gotMessage;
+
+  // Because Clear-Site-Data response header is sent on a different origin than
+  // the initiator origin, the existing prerender is not expected to be
+  // canceled.
+  // And the prerender is expected to be activated.
+  await activatePrerenderRC(referrerRC, prerenderedRC);
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/speculation-rules/prerender/cancel-prerendering-after-clear-site-data-cache-same-origin.tentative.https.html b/tests/wpt/tests/speculation-rules/prerender/cancel-prerendering-after-clear-site-data-cache-same-origin.tentative.https.html
new file mode 100644
index 00000000000..23d862c5130
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/prerender/cancel-prerendering-after-clear-site-data-cache-same-origin.tentative.https.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<!--
+This file is marked as "tentative" until:
+* The feature flag ClearSiteDataPrefetchPrerenderCache is enabled and
+  https://github.com/WICG/nav-speculation/issues/357 is added to the specification.
+-->
+<title>clear-site-data-cache cancels prerenders</title>
+<meta name="timeout" content="long">
+<body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/speculation-rules/resources/utils.js"></script>
+<script src="/speculation-rules/prerender/resources/utils.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+<script>
+setup(() => assertSpeculationRulesIsSupported());
+
+// Test that Clear-Site-Data header value "prerenderCache" clears prerender cache
+promise_test(async t => {
+
+  const rcHelper = new RemoteContextHelper();
+  const referrerRC = await rcHelper.addWindow({
+    origin: 'HTTPS_ORIGIN'
+  }, {
+    features: 'noopener'
+  });
+  const prerenderedRC = await addPrerenderRC(referrerRC, {
+    origin: 'HTTPS_ORIGIN'
+  });
+
+  const sameOrigin = get_host_info().HTTPS_ORIGIN;
+
+  // Open new window with url to clear cache data through Clear-Site-Data header.
+  // Ensure that the cache is cleared before the navigation.
+  const gotMessage = new Promise(resolve => {
+    window.addEventListener('message', e => {
+      resolve(e.data);
+    }, {
+      once: true
+    });
+  });
+  window.open(sameOrigin + "/../../clear-site-data/support/clear-site-data-prerenderCache.py");
+  await gotMessage;
+
+  // Because Clear-Site-Data response header is sent, the existing prerender
+  // is expected to be canceled.
+  // And the navigation is expected to create another page instead of activation.
+  referrerRC.navigateTo(prerenderedRC.url);
+  assert_equals(await getActivationStart(prerenderedRC), 0);
+}, "clear-site-data prerenderCache headers should prevent it from being activated");
+
+// Test that Clear-Site-Data header value "cache" clears prerender cache
+promise_test(async t => {
+
+  const rcHelper = new RemoteContextHelper();
+  const referrerRC = await rcHelper.addWindow({
+    origin: 'HTTPS_ORIGIN'
+  }, {
+    features: 'noopener'
+  });
+  const prerenderedRC = await addPrerenderRC(referrerRC, {
+    origin: 'HTTPS_ORIGIN'
+  });
+
+  const sameOrigin = get_host_info().HTTPS_ORIGIN;
+
+  // Open new window with url to clear cache data through Clear-Site-Data header.
+  // Ensure that the cache is cleared before the navigation.
+  const gotMessage = new Promise(resolve => {
+    window.addEventListener('message', e => {
+      resolve(e.data);
+    }, {
+      once: true
+    });
+  });
+  let cache_helper = "cache_helper=" + self.crypto.randomUUID() + "&";
+  window.open(sameOrigin + "/../../clear-site-data/support/clear-site-data-cache.py?" + cache_helper + "response=single_html&cache&clear_first=all");
+  await gotMessage;
+
+  // Because Clear-Site-Data response header is sent, the existing prerender
+  // is expected to be canceled.
+  // And the navigation is expected to create another page instead of activation.
+  referrerRC.navigateTo(prerenderedRC.url);
+  assert_equals(await getActivationStart(prerenderedRC), 0);
+}, "clear-site-data cache headers should prevent it from being activated");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/speculation-rules/prerender/cancel-prerendering-after-clear-site-data-cache.https.html b/tests/wpt/tests/speculation-rules/prerender/cancel-prerendering-after-clear-site-data-cache.https.html
deleted file mode 100644
index a31046d34b2..00000000000
--- a/tests/wpt/tests/speculation-rules/prerender/cancel-prerendering-after-clear-site-data-cache.https.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<title>clear-site-data-cache cancels prerenders</title>
-<meta name="timeout" content="long">
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/speculation-rules/resources/utils.js"></script>
-<script src="/speculation-rules/prerender/resources/utils.js"></script>
-<script src="/common/utils.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
-<script>
-setup(() => assertSpeculationRulesIsSupported());
-
-promise_test(async t => {
-
-  const rcHelper = new RemoteContextHelper();
-  const referrerRC = await rcHelper.addWindow({
-    origin: 'HTTPS_ORIGIN'
-  }, {
-    features: 'noopener'
-  });
-  const prerenderedRC = await addPrerenderRC(referrerRC, {
-    origin: 'HTTPS_REMOTE_ORIGIN',
-    headers: [
-      ['Supports-Loading-Mode', 'credentialed-prerender']
-    ]
-  });
-
-  // Open new window with url to clear cache data through Clear-Site-Data header.
-  // Ensure that the cache is cleared before the navigation.
-  const gotMessage = new Promise(resolve => {
-    window.addEventListener('message', e => {
-      resolve(e.data);
-    }, {
-      once: true
-    });
-  });
-  let cache_helper = "cache_helper=" + self.crypto.randomUUID() + "&";
-  new_window = window.open("../../clear-site-data/support/clear-site-data-cache.py?" + cache_helper + "response=single_html&cache&clear_first=all");
-  await gotMessage;
-
-  // Because Clear-Site-Data response header is sent, the existing prerender
-  // is expected to be canceled.
-  // And the navigation is expected to create another page instead of activation.
-  referrerRC.navigateTo(prerenderedRC.url);
-  assert_equals(await getActivationStart(prerenderedRC), 0);
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/speculation-rules/prerender/credentialed-prerender-not-opt-in.html b/tests/wpt/tests/speculation-rules/prerender/credentialed-prerender-not-opt-in.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/credentialed-prerender-not-opt-in.html
rename to tests/wpt/tests/speculation-rules/prerender/credentialed-prerender-not-opt-in.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/credentialed-prerender-opt-in.html b/tests/wpt/tests/speculation-rules/prerender/credentialed-prerender-opt-in.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/credentialed-prerender-opt-in.html
rename to tests/wpt/tests/speculation-rules/prerender/credentialed-prerender-opt-in.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/cross-origin-iframe.html b/tests/wpt/tests/speculation-rules/prerender/cross-origin-iframe.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/cross-origin-iframe.html
rename to tests/wpt/tests/speculation-rules/prerender/cross-origin-iframe.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/csp-script-src-elem-inline-speculation-rules.html b/tests/wpt/tests/speculation-rules/prerender/csp-script-src-elem-inline-speculation-rules.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/csp-script-src-elem-inline-speculation-rules.html
rename to tests/wpt/tests/speculation-rules/prerender/csp-script-src-elem-inline-speculation-rules.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/csp-script-src-inline-speculation-rules.html b/tests/wpt/tests/speculation-rules/prerender/csp-script-src-inline-speculation-rules.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/csp-script-src-inline-speculation-rules.html
rename to tests/wpt/tests/speculation-rules/prerender/csp-script-src-inline-speculation-rules.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/csp-script-src-self.html b/tests/wpt/tests/speculation-rules/prerender/csp-script-src-self.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/csp-script-src-self.html
rename to tests/wpt/tests/speculation-rules/prerender/csp-script-src-self.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/csp-script-src-strict-dynamic.html b/tests/wpt/tests/speculation-rules/prerender/csp-script-src-strict-dynamic.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/csp-script-src-strict-dynamic.html
rename to tests/wpt/tests/speculation-rules/prerender/csp-script-src-strict-dynamic.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/csp-script-src-unsafe-inline.html b/tests/wpt/tests/speculation-rules/prerender/csp-script-src-unsafe-inline.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/csp-script-src-unsafe-inline.html
rename to tests/wpt/tests/speculation-rules/prerender/csp-script-src-unsafe-inline.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/fetch-blob.html b/tests/wpt/tests/speculation-rules/prerender/fetch-blob.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/fetch-blob.html
rename to tests/wpt/tests/speculation-rules/prerender/fetch-blob.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/iframe-added-post-activation.html b/tests/wpt/tests/speculation-rules/prerender/iframe-added-post-activation.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/iframe-added-post-activation.html
rename to tests/wpt/tests/speculation-rules/prerender/iframe-added-post-activation.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/indexeddb.html b/tests/wpt/tests/speculation-rules/prerender/indexeddb.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/indexeddb.html
rename to tests/wpt/tests/speculation-rules/prerender/indexeddb.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/local-storage.html b/tests/wpt/tests/speculation-rules/prerender/local-storage.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/local-storage.html
rename to tests/wpt/tests/speculation-rules/prerender/local-storage.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/media-autoplay.html b/tests/wpt/tests/speculation-rules/prerender/media-autoplay.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/media-autoplay.html
rename to tests/wpt/tests/speculation-rules/prerender/media-autoplay.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/navigation-api-location-replace.html b/tests/wpt/tests/speculation-rules/prerender/navigation-api-location-replace.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/navigation-api-location-replace.html
rename to tests/wpt/tests/speculation-rules/prerender/navigation-api-location-replace.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/navigation-api-multiple-entries.html b/tests/wpt/tests/speculation-rules/prerender/navigation-api-multiple-entries.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/navigation-api-multiple-entries.html
rename to tests/wpt/tests/speculation-rules/prerender/navigation-api-multiple-entries.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/navigation-api.html b/tests/wpt/tests/speculation-rules/prerender/navigation-api.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/navigation-api.html
rename to tests/wpt/tests/speculation-rules/prerender/navigation-api.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/navigator-plugins.html b/tests/wpt/tests/speculation-rules/prerender/navigator-plugins.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/navigator-plugins.html
rename to tests/wpt/tests/speculation-rules/prerender/navigator-plugins.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/prerender-while-prerender.html b/tests/wpt/tests/speculation-rules/prerender/prerender-while-prerender.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/prerender-while-prerender.html
rename to tests/wpt/tests/speculation-rules/prerender/prerender-while-prerender.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/protocol-handler-register.https.html b/tests/wpt/tests/speculation-rules/prerender/protocol-handler-register.https.html
new file mode 100644
index 00000000000..af2df0f12ab
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/prerender/protocol-handler-register.https.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="../resources/utils.js"></script>
+<script src="resources/utils.js"></script>
+<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+
+<script>
+function getNextWindowMessageFromFrame(frame) {
+  return new Promise(resolve => {
+    window.addEventListener('message', event => {
+      if (event.source === frame.contentWindow) {
+        resolve(event.data);
+      }
+    });
+  });
+}
+
+promise_setup(async () => {
+  assertSpeculationRulesIsSupported()
+  await test_driver.set_rph_registration_mode('autoAccept');
+  await test_driver.bless('handler registration');
+});
+
+// The overall idea for this test is:
+// 1. Register a protocol handler for a custom URI scheme to target 1 (initial).
+// 2. Create a prerendered page that registers the same custom URI scheme to
+// target 2 (modified). But the registration will defer until after activation.
+// 3. Navigate an iframe to the custom URI scheme. It should go to target 1,
+// because the deferred registration hasn't yet been applied.
+// 4. Activate the prerendered page. This should run the deferred registration.
+// 5. Navigate the iframe to the custom URI scheme again. It should go to
+// target 2.
+promise_test(async t => {
+  const customUrlScheme = 'web+wptrphtest';
+  function getProtocolHandlerUrlTemplate(id) {
+    return new URL(
+        `resources/protocol-handler.html?id=${id}&s=%s`, location.href).href;
+  }
+
+  const initialUrlTemplate = getProtocolHandlerUrlTemplate('initial');
+  const modifiedUrlTemplate = getProtocolHandlerUrlTemplate('modified');
+
+  // To start we register the initial protocol handler. When there is nothing
+  // registered for a custom URI scheme, and we navigate to it, there's no
+  // good event to tell us that the navigation failed. So instead we
+  // have an initial handler so we can tell that the modified protocol handler
+  // hasn't been registered yet.
+  t.add_cleanup(() => {
+    navigator.unregisterProtocolHandler(
+        customUrlScheme, initialUrlTemplate);
+  });
+  navigator.registerProtocolHandler(customUrlScheme, initialUrlTemplate);
+
+  // Create a prerender page that attempts to register an invalid scheme.
+  const {exec, activate} = await create_prerendered_page(t);
+
+  t.add_cleanup(() => {
+    navigator.unregisterProtocolHandler(
+      customUrlScheme, modifiedUrlTemplate);
+  });
+  // First register protocol handler during prerender
+  const result = await exec(
+      (customUrlScheme, modifiedUrlTemplate) => {
+        try {
+          navigator.registerProtocolHandler(
+            customUrlScheme, modifiedUrlTemplate);
+        } catch (registerProtocolHandlerException) {
+          return 'registerProtocolHandler failed with \''
+              + registerProtocolHandlerException.name + '\'';
+        }
+        return 'success';
+  }, [customUrlScheme, modifiedUrlTemplate]);
+
+  assert_equals(result, 'success',
+    'registerProtocolHandler should succeed.');
+
+  // Next create the iframe that we will navigate to the custom URI scheme so
+  // we can validate that the prerenderer registration hasn't yet been applied.
+  const frame = await with_iframe('about:blank');
+
+  // Navigate to the custom URI scheme. Even though the prerendered page
+  // registered a handler, registration shouldn't happen until after activation.
+  // So this navigation should go to the initial handler.
+  const beforeActivationMessagePromise = getNextWindowMessageFromFrame(frame);
+  frame.src = `${customUrlScheme}:1`;
+  assert_equals((await beforeActivationMessagePromise).id, 'initial',
+    'Until activation, the initial handler should be registered.');
+
+  // Activate the prerendered page. This should run the deferred registration.
+  await activate();
+
+  // Now we listen for messages and again navigate to the custom URI scheme
+  // and by now the prerenderer registration should have applied and we should
+  // get the modified handler's id.
+  const afterActivationMessagePromise = getNextWindowMessageFromFrame(frame);
+  frame.src = `${customUrlScheme}:2`;
+  assert_equals((await afterActivationMessagePromise).id, 'modified',
+    'After activation, the modified handler should be registered.');
+}, 'prerendering page registerProtocolHandler call defers registration until activation.');
+
+</script>
diff --git a/tests/wpt/tests/speculation-rules/prerender/protocol-handler-unregister.https.html b/tests/wpt/tests/speculation-rules/prerender/protocol-handler-unregister.https.html
new file mode 100644
index 00000000000..586ce433854
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/prerender/protocol-handler-unregister.https.html
@@ -0,0 +1,140 @@
+<!DOCTYPE html>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="../resources/utils.js"></script>
+<script src="resources/utils.js"></script>
+<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+
+<script>
+
+function getNextWindowMessageFromFrame(frame) {
+  return new Promise(resolve => {
+    window.addEventListener('message', event => {
+      if (event.source === frame.contentWindow) {
+        resolve(event.data);
+      }
+    });
+  });
+}
+
+function getNextMessageFromServiceWorker(serviceWorker) {
+  return new Promise(resolve => {
+    serviceWorker.addEventListener('message', event => {
+      resolve(event.data);
+    }, {once: true});
+  });
+}
+
+promise_setup(async () => {
+  assertSpeculationRulesIsSupported()
+  await test_driver.set_rph_registration_mode('autoAccept');
+  await test_driver.bless('handler registration');
+});
+
+// The overall idea for this test is:
+// 1. Register a protocol handler for a custom URI scheme.
+// 2. Create a prerendered page that unregisters the protocol handler.
+// 3. Navigate an iframe to the custom URI scheme. It should navigate
+// successfully.
+// 4. Activate the prerendered page. This should run the deferred unregistration
+// work.
+// 5. Navigate the iframe to the custom URI scheme again. It should fail to
+// navigate.
+// To detect the navigation failure, we use a service worker to perform the
+// navigation via client.navigate and report the result back to
+// the test. This is because the service worker's client.navigate method
+// actually reports if the navigation failed, unlike other mechanisms which
+// tell us nothing in this case.
+promise_test(async t => {
+  const customUrlScheme = 'web+wptrphtest';
+  function getProtocolHandlerUrlTemplate(id) {
+    return new URL(
+        `resources/protocol-handler.html?id=${id}&s=%s`, location.href).href;
+  }
+
+  const urlTemplate = getProtocolHandlerUrlTemplate('unregister');
+
+  t.add_cleanup(() => {
+    navigator.unregisterProtocolHandler(
+        customUrlScheme, urlTemplate);
+  });
+  navigator.registerProtocolHandler(customUrlScheme, urlTemplate);
+
+  const {exec, activate} = await create_prerendered_page(t);
+
+  const result = await exec(
+      (customUrlScheme, urlTemplate) => {
+        try {
+          navigator.unregisterProtocolHandler(
+              customUrlScheme, urlTemplate);
+        } catch (registerProtocolHandlerException) {
+          return 'registerProtocolHandler failed with \'' +
+              registerProtocolHandlerException.name + '\'';
+        }
+        return 'success';
+  }, [customUrlScheme, urlTemplate]);
+  assert_equals(result, 'success', 'unregisterProtocolHandler should succeed.');
+
+  const frame1 = await with_iframe('about:blank');
+
+  const frame1MessagePromise = getNextWindowMessageFromFrame(frame1);
+  frame1.src = `${customUrlScheme}:1`;
+  assert_equals((await frame1MessagePromise).id, 'unregister',
+    'Until activation, the initial handler should be registered.');
+
+  frame1.remove();
+
+  // Activate the prerendered page.
+  await activate();
+
+  // At this point the deferred unregistration work has run during activation
+  // and the protocol handler is no longer registered.
+  // We use Service Worker client.navigate to detect the failed navigation since
+  // it is well supported and reliably reports error for unknown URL schemes.
+  const serviceWorkerScope =
+      'resources/protocol-handler.html?service_worker_client';
+  const frame2Url = serviceWorkerScope + '&id=communication';
+  const frame3Url = serviceWorkerScope + '&id=nav_target';
+  const serviceWorkerUrl = 'resources/protocol-handler-service-worker.js';
+  const serviceWorkerRegistration =
+      await service_worker_unregister_and_register(
+          t, serviceWorkerUrl, serviceWorkerScope);
+
+  t.add_cleanup(async () => {
+    await serviceWorkerRegistration.unregister();
+  });
+
+  await wait_for_state(t, serviceWorkerRegistration.installing, 'activated');
+
+  // We use frame2 to communicate with the service worker.
+  const frame2 = await with_iframe(frame2Url);
+
+  // Frame3 is used by the service worker to attempt navigation.
+  const frame3 = await with_iframe(frame3Url);
+
+  const serviceWorkerMessagePromise = getNextMessageFromServiceWorker(
+      frame2.contentWindow.navigator.serviceWorker);
+
+  // Post message via frame2 to the service worker to tell it to navigate frame3
+  // to the custom URI.
+  frame2.contentWindow.navigator.serviceWorker.controller.postMessage(
+      {clientUrlMatch: new URL(frame3Url, location.href).href,
+       navigationUrl: `${customUrlScheme}:3`});
+
+  // The service worker will post message back the result of the navigation.
+  const navigationResult = await serviceWorkerMessagePromise;
+
+  frame2.remove();
+  frame3.remove();
+
+  assert_false(navigationResult.success, 'Navigation to unregistered URI should fail');
+  assert_equals(navigationResult.message, 'navigate failure: TypeError',
+      'unregisterProtocolHandler should have completed.');
+}, 'prerendering page unregisterProtocolHandler call defers registration until activation.');
+
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/speculation-rules/prerender/protocol-handler-validation.https.html b/tests/wpt/tests/speculation-rules/prerender/protocol-handler-validation.https.html
new file mode 100644
index 00000000000..613b9bfad08
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/prerender/protocol-handler-validation.https.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<title>prerendered page calls to registerProtocolHandler should validate input synchronously</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="../resources/utils.js"></script>
+<script src="resources/utils.js"></script>
+
+<script>
+// Create a prerender page that attempts to use either registerProtocolHandler
+// or unregisterProtocolHandler with either an invalid scheme or an invalid
+// URL template. Validation of invalid parameters for both should happen
+// synchronously in prerendered pages.
+async function registerProtocolHandlerTestHelper(
+    t, fn_name, scheme, url_template, expected_result) {
+  const {exec} = await create_prerendered_page(t);
+
+  const result = await exec((fn_name, scheme, url_template) => {
+    try {
+      navigator[fn_name](scheme, url_template);
+    } catch (registerProtocolHandlerException) {
+      return `failed with '${registerProtocolHandlerException.name}'`;
+    }
+    return 'success';
+  }, [fn_name, scheme, url_template]);
+
+  assert_equals(result, expected_result);
+}
+
+setup(() => assertSpeculationRulesIsSupported());
+
+promise_test(async t => {
+  await registerProtocolHandlerTestHelper(
+      t, 'registerProtocolHandler', 'notallowed', 'https://example.com/?%s',
+      'failed with \'SecurityError\'');
+}, 'prerendering page registerProtocolHandler calls with invalid URI scheme should fail synchronously.');
+
+promise_test(async t => {
+  await registerProtocolHandlerTestHelper(
+      t, 'registerProtocolHandler', 'news', 'https://example.com/?',
+      'failed with \'SyntaxError\'');
+}, 'prerendering page registerProtocolHandler calls with invalid URI template should fail synchronously.');
+
+promise_test(async t => {
+  await registerProtocolHandlerTestHelper(
+      t, 'unregisterProtocolHandler', 'notallowed', 'https://example.com/?%s',
+      'failed with \'SecurityError\'');
+}, 'prerendering page unregisterProtocolHandler calls with invalid URI scheme should fail synchronously.');
+
+promise_test(async t => {
+  await registerProtocolHandlerTestHelper(
+      t, 'unregisterProtocolHandler', 'news', 'https://example.com/?',
+      'failed with \'SyntaxError\'');
+}, 'prerendering page unregisterProtocolHandler calls with invalid URI template should fail synchronously.');
+</script>
diff --git a/tests/wpt/tests/speculation-rules/prerender/referrer-policy-from-rules.html b/tests/wpt/tests/speculation-rules/prerender/referrer-policy-from-rules.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/referrer-policy-from-rules.html
rename to tests/wpt/tests/speculation-rules/prerender/referrer-policy-from-rules.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/referrer-policy-mismatch.html b/tests/wpt/tests/speculation-rules/prerender/referrer-policy-mismatch.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/referrer-policy-mismatch.html
rename to tests/wpt/tests/speculation-rules/prerender/referrer-policy-mismatch.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/referrer-policy-no-referrer.html b/tests/wpt/tests/speculation-rules/prerender/referrer-policy-no-referrer.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/referrer-policy-no-referrer.html
rename to tests/wpt/tests/speculation-rules/prerender/referrer-policy-no-referrer.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/referrer-policy-origin.html b/tests/wpt/tests/speculation-rules/prerender/referrer-policy-origin.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/referrer-policy-origin.html
rename to tests/wpt/tests/speculation-rules/prerender/referrer-policy-origin.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/referrer-policy-strict-origin.html b/tests/wpt/tests/speculation-rules/prerender/referrer-policy-strict-origin.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/referrer-policy-strict-origin.html
rename to tests/wpt/tests/speculation-rules/prerender/referrer-policy-strict-origin.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/referrer.html b/tests/wpt/tests/speculation-rules/prerender/referrer.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/referrer.html
rename to tests/wpt/tests/speculation-rules/prerender/referrer.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/remove-script-element.html b/tests/wpt/tests/speculation-rules/prerender/remove-script-element.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/remove-script-element.html
rename to tests/wpt/tests/speculation-rules/prerender/remove-script-element.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/resources/protocol-handler-service-worker.js b/tests/wpt/tests/speculation-rules/prerender/resources/protocol-handler-service-worker.js
new file mode 100644
index 00000000000..cb6142db0e3
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/prerender/resources/protocol-handler-service-worker.js
@@ -0,0 +1,28 @@
+// This service worker script should be used by the
+// protocol-handler-unregister.https.html test to detect unregistered URL
+// schemes.
+self.addEventListener('message', async eventInfo => {
+  let success = false;
+  let message = null;
+
+  try {
+    const {clientUrlMatch, navigationUrl} = eventInfo.data;
+    const client = (await clients.matchAll()).find(
+        client => client.url === clientUrlMatch);
+
+    if (client) {
+      try {
+        await client.navigate(navigationUrl);
+        success = true;
+      } catch (navigateException) {
+        message = `navigate failure: ${navigateException.name}`;
+      }
+    } else {
+      message = `no client found matching ${clientUrlMatch}`;
+    }
+  } catch (otherException) {
+    message = `other failure: ${otherException.name}`;
+  }
+
+  eventInfo.source.postMessage({success, message});
+});
\ No newline at end of file
diff --git a/tests/wpt/tests/speculation-rules/prerender/resources/protocol-handler.html b/tests/wpt/tests/speculation-rules/prerender/resources/protocol-handler.html
new file mode 100644
index 00000000000..210b23aae21
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/prerender/resources/protocol-handler.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<title>Prerendering custom protocol handler</title>
+<script>
+  // This page should be used by the protocol-handler-*register.https.html
+  // tests as the handler for their test custom protocols.
+
+  // Get URL parameters
+  const urlParams = new URLSearchParams(window.location.search);
+  const id = urlParams.get('id');
+  const s = urlParams.get('s');
+  // This page will be hosted in an iframe. Post message to parent window.
+  window.parent.postMessage({id: id, s: s}, '*');
+</script>
diff --git a/tests/wpt/tests/speculation-rules/prerender/resources/shared-storage-worklet.js b/tests/wpt/tests/speculation-rules/prerender/resources/shared-storage-worklet.js
new file mode 100644
index 00000000000..22dfc537701
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/prerender/resources/shared-storage-worklet.js
@@ -0,0 +1,14 @@
+class WriteOperation {
+  async run() {
+    return this.sharedStorage.set("prerender", true);
+  }
+}
+
+class SelectURLOperation {
+  async run() {
+    return 0;
+  }
+}
+
+register('test-prerender', WriteOperation);
+register('test-prerender-selection', SelectURLOperation);
diff --git a/tests/wpt/tests/speculation-rules/prerender/resources/shared-storage.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/shared-storage.https.html
index 53edf109698..bf316658141 100644
--- a/tests/wpt/tests/speculation-rules/prerender/resources/shared-storage.https.html
+++ b/tests/wpt/tests/speculation-rules/prerender/resources/shared-storage.https.html
@@ -5,7 +5,6 @@
 <script src="/speculation-rules/prerender/resources/deferred-promise-utils.js"></script>
 <body>
 
-
 <script>
 
 const params = new URLSearchParams(location.search);
@@ -19,10 +18,46 @@ if (!isPrerendering) {
   loadInitiatorPage();
 } else {
   const prerenderEventCollector = new PrerenderEventCollector();
-  prerenderEventCollector.start(
-    window.sharedStorage.set('prerender', 'yes'), 'window.sharedStorage.set');
+  const test_type = params.get('type');
+  let add_module_promise = null;
+  switch (test_type) {
+    case 'add_module':
+      add_module_promise = window.sharedStorage.worklet.addModule(
+        "shared-storage-worklet.js");
+
+      prerenderEventCollector.start(
+        add_module_promise, 'add_module');
+      break;
+    case 'run':
+      add_module_promise = window.sharedStorage.worklet.addModule(
+        "shared-storage-worklet.js");
+      prerenderEventCollector.start(
+        window.sharedStorage.run("test-prerender"), 'run');
+      break;
+    case 'select_url':
+      add_module_promise = window.sharedStorage.worklet.addModule(
+        "shared-storage-worklet.js");
+      // Run the URL selection operation
+      const fenced_frame_promise = window.sharedStorage.selectURL(
+        "test-prerender-selection",
+        [{
+            url: "/resources/blank.html?a=1"
+          },
+          {
+            url: "/resources/blank.html?a=2"
+          },
+        ], {
+          resolveToConfig: true,
+        },
+      );
+      prerenderEventCollector.start(
+        fenced_frame_promise, 'select_url');
+      break;
+    default:
+      prerenderEventCollector.start(
+        window.sharedStorage.set('prerender', 'yes'),
+        'window.sharedStorage.set');
   }
-
+}
 </script>
-
 </body>
diff --git a/tests/wpt/tests/speculation-rules/prerender/response-code-non-successful.html b/tests/wpt/tests/speculation-rules/prerender/response-code-non-successful.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/response-code-non-successful.html
rename to tests/wpt/tests/speculation-rules/prerender/response-code-non-successful.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/response-code-successful.html b/tests/wpt/tests/speculation-rules/prerender/response-code-successful.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/response-code-successful.html
rename to tests/wpt/tests/speculation-rules/prerender/response-code-successful.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/restriction-audio-setSinkId-with-invalid-sinkId.https.tentative.html b/tests/wpt/tests/speculation-rules/prerender/restriction-audio-setSinkId-with-invalid-sinkId.https.tentative.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/restriction-audio-setSinkId-with-invalid-sinkId.https.tentative.html
rename to tests/wpt/tests/speculation-rules/prerender/restriction-audio-setSinkId-with-invalid-sinkId.https.tentative.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/restriction-audio-setSinkId.https.tentative.html b/tests/wpt/tests/speculation-rules/prerender/restriction-audio-setSinkId.https.tentative.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/restriction-audio-setSinkId.https.tentative.html
rename to tests/wpt/tests/speculation-rules/prerender/restriction-audio-setSinkId.https.tentative.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/restriction-broadcast-channel.html b/tests/wpt/tests/speculation-rules/prerender/restriction-broadcast-channel.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/restriction-broadcast-channel.html
rename to tests/wpt/tests/speculation-rules/prerender/restriction-broadcast-channel.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/restriction-focus.html b/tests/wpt/tests/speculation-rules/prerender/restriction-focus.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/restriction-focus.html
rename to tests/wpt/tests/speculation-rules/prerender/restriction-focus.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/restriction-media-auto-play-attribute.html b/tests/wpt/tests/speculation-rules/prerender/restriction-media-auto-play-attribute.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/restriction-media-auto-play-attribute.html
rename to tests/wpt/tests/speculation-rules/prerender/restriction-media-auto-play-attribute.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/restriction-media-play.html b/tests/wpt/tests/speculation-rules/prerender/restriction-media-play.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/restriction-media-play.html
rename to tests/wpt/tests/speculation-rules/prerender/restriction-media-play.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/restriction-message-boxes.html b/tests/wpt/tests/speculation-rules/prerender/restriction-message-boxes.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/restriction-message-boxes.html
rename to tests/wpt/tests/speculation-rules/prerender/restriction-message-boxes.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/restriction-prompt-by-before-unload.html b/tests/wpt/tests/speculation-rules/prerender/restriction-prompt-by-before-unload.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/restriction-prompt-by-before-unload.html
rename to tests/wpt/tests/speculation-rules/prerender/restriction-prompt-by-before-unload.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/restriction-request-picture-in-picture.html b/tests/wpt/tests/speculation-rules/prerender/restriction-request-picture-in-picture.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/restriction-request-picture-in-picture.html
rename to tests/wpt/tests/speculation-rules/prerender/restriction-request-picture-in-picture.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/restriction-speech-synthesis.html b/tests/wpt/tests/speculation-rules/prerender/restriction-speech-synthesis.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/restriction-speech-synthesis.html
rename to tests/wpt/tests/speculation-rules/prerender/restriction-speech-synthesis.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/restriction-window-move.html b/tests/wpt/tests/speculation-rules/prerender/restriction-window-move.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/restriction-window-move.html
rename to tests/wpt/tests/speculation-rules/prerender/restriction-window-move.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/restriction-window-open.html b/tests/wpt/tests/speculation-rules/prerender/restriction-window-open.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/restriction-window-open.html
rename to tests/wpt/tests/speculation-rules/prerender/restriction-window-open.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/restriction-window-resize.html b/tests/wpt/tests/speculation-rules/prerender/restriction-window-resize.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/restriction-window-resize.html
rename to tests/wpt/tests/speculation-rules/prerender/restriction-window-resize.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/restrictions.html b/tests/wpt/tests/speculation-rules/prerender/restrictions.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/restrictions.html
rename to tests/wpt/tests/speculation-rules/prerender/restrictions.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/restrictions_shared_storage_worklet.https.html b/tests/wpt/tests/speculation-rules/prerender/restrictions_shared_storage_worklet.https.html
new file mode 100644
index 00000000000..ef6a3031f04
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/prerender/restrictions_shared_storage_worklet.https.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<title>Worklet operations to Shared Storage API is deferred</title>
+<meta name="timeout" content="long">
+<meta name="variant" content="?type=add_module">
+<meta name="variant" content="?type=select_url">
+<meta name="variant" content="?type=run">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="../resources/utils.js"></script>
+<script src="resources/utils.js"></script>
+
+<body>
+<script>
+setup(() => assertSpeculationRulesIsSupported());
+promise_test(async t => {
+    const uid = token();
+    const bc = new PrerenderChannel('test-channel', uid);
+
+    const gotMessage = new Promise(resolve => {
+      bc.addEventListener('message', e => {
+        resolve(e.data);
+      }, {
+        once: true
+      });
+    });
+
+    const params = new URLSearchParams(location.search);
+    const test_type = params.get('type');
+    const url =
+      `resources/shared-storage.https.html?uid=${uid}&type=${test_type}`;
+    window.open(url, '_blank', 'noopener');
+
+    const result = await gotMessage;
+    const expected = [{
+        event: `started waiting ${test_type}`,
+        prerendering: true
+      },
+      {
+        event: 'prerendering change',
+        prerendering: false
+      },
+      {
+        event: `finished waiting ${test_type}`,
+        prerendering: false
+      }
+    ];
+    assert_equals(result.length, expected.length);
+    for (let i = 0; i < result.length; i++) {
+      assert_equals(result[i].event, expected[i].event,
+        `event[${i}]`);
+      assert_equals(result[i].prerendering, expected[i].prerendering,
+        `prerendering[${i}]`);
+    }
+    bc.close();
+
+    // Send a close signal to PrerenderEventCollector on the prerendered page.
+    new PrerenderChannel('close', uid).postMessage('');
+  },
+  `Worklet operations the Shared Storage API should
+   be deferred until the prerendered page is activated`);
+</script>
diff --git a/tests/wpt/tests/speculation-rules/prerender/sandbox-iframe.html b/tests/wpt/tests/speculation-rules/prerender/sandbox-iframe.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/sandbox-iframe.html
rename to tests/wpt/tests/speculation-rules/prerender/sandbox-iframe.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/script-supports-speculationrules.html b/tests/wpt/tests/speculation-rules/prerender/script-supports-speculationrules.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/script-supports-speculationrules.html
rename to tests/wpt/tests/speculation-rules/prerender/script-supports-speculationrules.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/send-beacon.html b/tests/wpt/tests/speculation-rules/prerender/send-beacon.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/send-beacon.html
rename to tests/wpt/tests/speculation-rules/prerender/send-beacon.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/session-storage.tentative.html b/tests/wpt/tests/speculation-rules/prerender/session-storage.tentative.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/session-storage.tentative.html
rename to tests/wpt/tests/speculation-rules/prerender/session-storage.tentative.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/state-and-event.html b/tests/wpt/tests/speculation-rules/prerender/state-and-event.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/state-and-event.html
rename to tests/wpt/tests/speculation-rules/prerender/state-and-event.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/visibility-state.html b/tests/wpt/tests/speculation-rules/prerender/visibility-state.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/visibility-state.html
rename to tests/wpt/tests/speculation-rules/prerender/visibility-state.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/workers-in-cross-origin-iframe.html b/tests/wpt/tests/speculation-rules/prerender/workers-in-cross-origin-iframe.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/workers-in-cross-origin-iframe.html
rename to tests/wpt/tests/speculation-rules/prerender/workers-in-cross-origin-iframe.https.html
diff --git a/tests/wpt/tests/speculation-rules/prerender/workers.html b/tests/wpt/tests/speculation-rules/prerender/workers.https.html
similarity index 100%
rename from tests/wpt/tests/speculation-rules/prerender/workers.html
rename to tests/wpt/tests/speculation-rules/prerender/workers.https.html
diff --git a/tests/wpt/tests/speculation-rules/speculation-tags/README b/tests/wpt/tests/speculation-rules/speculation-tags/README
new file mode 100644
index 00000000000..b69880c01c2
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/speculation-tags/README
@@ -0,0 +1,8 @@
+Web Platform Tests for Speculation Rules tags.
+
+Explainer:
+https://github.com/WICG/nav-speculation/blob/main/speculation-rules-tags.md
+
+Spec:
+https://wicg.github.io/nav-speculation/speculation-rules.html#collect-tags-for-matching-speculative-load-candidates
+https://wicg.github.io/nav-speculation/prefetch.html#sec-speculation-tags-header
diff --git a/tests/wpt/tests/speculation-rules/speculation-tags/cross-site-prefetch.https.html b/tests/wpt/tests/speculation-rules/speculation-tags/cross-site-prefetch.https.html
new file mode 100644
index 00000000000..b10aecf4035
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/speculation-tags/cross-site-prefetch.https.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<title>Cross-site prefetch attempts with speculation tags</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+<script src="/speculation-rules/prerender/resources/utils.js"></script>
+<script src="/speculation-rules/resources/utils.js"></script>
+<script src="/speculation-rules/prefetch/resources/utils.sub.js"></script>
+
+<script>
+"use strict";
+
+setup(() => assertSpeculationRulesIsSupported());
+
+promise_test(async t => {
+  const agent = await spawnWindow(t);
+
+  const nextUrl = agent.getExecutorURL({ hostname: PREFETCH_PROXY_BYPASS_HOST, page: 2 });
+  await agent.forceSpeculationRules({
+      tag: 'tag1',
+      prefetch: [{source: "list", urls: [nextUrl]}]
+  });
+  await agent.navigate(nextUrl);
+
+  const headers = await agent.getRequestHeaders();
+  assert_prefetched(headers, "must be prefetched");
+  assert_equals(headers["sec_speculation_tags"], '__no_tags__');
+}, "cross-site prefetch should not have Sec-Speculation-Tags be sent");
+
+</script>
diff --git a/tests/wpt/tests/speculation-rules/speculation-tags/cross-site-to-same-site-redirection-prefetch.https.html b/tests/wpt/tests/speculation-rules/speculation-tags/cross-site-to-same-site-redirection-prefetch.https.html
new file mode 100644
index 00000000000..e264572c2f9
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/speculation-tags/cross-site-to-same-site-redirection-prefetch.https.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<title>Cross-site prefetch attempts with speculation tags</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+<script src="/speculation-rules/prerender/resources/utils.js"></script>
+<script src="/speculation-rules/resources/utils.js"></script>
+<script src="/speculation-rules/prefetch/resources/utils.sub.js"></script>
+
+<script>
+"use strict";
+
+setup(() => assertSpeculationRulesIsSupported());
+
+promise_test(async t => {
+  const agent = await spawnWindow(t);
+
+  const finalUrl = agent.getExecutorURL({ page: 2 });
+  const nextUrl = new URL("/common/redirect.py?location=" + encodeURIComponent(finalUrl),
+                          agent.getExecutorURL({ hostname: PREFETCH_PROXY_BYPASS_HOST }));
+  await agent.forceSpeculationRules({
+      tag: 'tag1',
+      prefetch: [{source: "list", urls: [nextUrl]}]
+  });
+  await agent.navigate(nextUrl, {expectedDestinationUrl: finalUrl});
+
+  const headers = await agent.getRequestHeaders();
+  assert_prefetched(headers, "must be prefetched");
+  assert_equals(headers["sec_speculation_tags"], '"tag1"');
+}, "same-site redirection prefetch should have Sec-Speculation-Tags even if cross-site url in the redirection chain");
+
+</script>
diff --git a/tests/wpt/tests/speculation-rules/speculation-tags/deduped-and-sorted-tags.https.html b/tests/wpt/tests/speculation-rules/speculation-tags/deduped-and-sorted-tags.https.html
new file mode 100644
index 00000000000..3d1baaf1907
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/speculation-tags/deduped-and-sorted-tags.https.html
@@ -0,0 +1,281 @@
+<!DOCTYPE html>
+<title>Sec-Speculation-Tags request headers</title>
+<meta name="variant" content="?type=prefetch">
+<meta name="variant" content="?type=prerender">
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+<script src="/speculation-rules/resources/utils.js"></script>
+<script src="resources/speculation-tags-utils.js"></script>
+<script>
+"use strict";
+
+setup(() => assertSpeculationRulesIsSupported());
+
+function constructSpeculationRule(preloadingType, url, rulesetTag, ruleTags) {
+  // Construct rules.
+  const rules = [];
+  for (const tag of ruleTags) {
+    rules.push({tag, source: "list", urls: [url]});
+  }
+
+  // Construct the ruleset.
+  return JSON.stringify({
+      tag: rulesetTag,
+      [preloadingType]: rules
+  });
+}
+
+// Test the case where multiple tags (including duplicate tags, invalid tags,
+// and no tags) specified on both the ruleset level and the rule level. These
+// should be deduped and sorted before sent as the header.
+promise_test(async t => {
+    const params = new URLSearchParams(window.location.search);
+    const preloadingType = params.get('type');
+
+    // Inputs and expectations:
+    // "def" is duplicate. "\x19" is invalid. "undefined" indicates no tag.
+    const rulesetTag = "def";
+    const ruleTags = ["def", "jkl", "def", "null", "\x19", "abc", undefined, "ghi"];
+    // "def" should be deduped.
+    // "\x19" and "undefined" should be ignored (should not send null tag).
+    const expectedTags = '"abc", "def", "ghi", "jkl", "null"';
+
+    const rcHelper = new RemoteContextHelper();
+    const referrerRC = await rcHelper.addWindow(undefined, { features: 'noopener' });
+
+    const extraConfig = {};
+    const preloadedRC = await referrerRC.helper.createContext({
+        executorCreator(url) {
+          const speculationRule = constructSpeculationRule(
+              preloadingType, url, rulesetTag, ruleTags);
+          return referrerRC.executeScript((speculationRule) => {
+              const script = document.createElement("script");
+              script.type = "speculationrules";
+              script.textContent = speculationRule;
+              document.head.append(script);
+          }, [speculationRule]);
+        }, extraConfig
+    });
+
+    // Navigate to the preloaded page.
+    await referrerRC.navigateTo(preloadedRC.url);
+
+    const headers = await preloadedRC.getRequestHeaders();
+    // Make sure the page is preloaded.
+    assert_equals(
+      headers.get("sec-purpose"),
+      preloadingType === "prefetch" ? "prefetch" : "prefetch;prerender");
+    assert_equals(headers.get("sec-speculation-tags"), expectedTags);
+}, "Sec-Speculation-Tags: deduped and sorted tags");
+
+// Test the case where multiple tags (including duplicate tags, invalid tags,
+// and no tags) specified only on the rule level. These should be deduped and
+// sorted before sent as the header. Unlike the previous test, no tag on the
+// rule should result in the null tag.
+promise_test(async t => {
+    const params = new URLSearchParams(window.location.search);
+    const preloadingType = params.get('type');
+
+    // Inputs and expectations:
+    // No ruleset level tag.
+    const rulesetTag = undefined;
+    // "def" is duplicate. "\x19" is invalid. "undefined" indicates no tag.
+    const ruleTags = ["def", "jkl", "def", "null", "\x19", "abc", undefined, "ghi"];
+    // 5 rules are (no ruleset level tag) + (rule level tag) =
+    //     "abc" only, "def" only, "ghi" only, "jkl" only, "null" only.
+    // 1 rule is (no ruleset level tag) + (no rule level tag) = null only.
+    // 2 rule are duplicate or invalid.
+    //
+    // All 6 effective rules, including the null rule, get combined to match
+    // expectedTags.
+    const expectedTags = 'null, "abc", "def", "ghi", "jkl", "null"';
+
+    const rcHelper = new RemoteContextHelper();
+    const referrerRC = await rcHelper.addWindow(undefined, { features: 'noopener' });
+
+    const extraConfig = {};
+    const preloadedRC = await referrerRC.helper.createContext({
+        executorCreator(url) {
+          const speculationRule = constructSpeculationRule(
+              preloadingType, url, rulesetTag, ruleTags);
+          return referrerRC.executeScript((speculationRule) => {
+              const script = document.createElement("script");
+              script.type = "speculationrules";
+              script.textContent = speculationRule;
+              document.head.append(script);
+          }, [speculationRule]);
+        }, extraConfig
+    });
+
+    // Navigate to the preloaded page.
+    await referrerRC.navigateTo(preloadedRC.url);
+
+    const headers = await preloadedRC.getRequestHeaders();
+    // Make sure the page is preloaded.
+    assert_equals(
+      headers.get("sec-purpose"),
+      preloadingType === "prefetch" ? "prefetch" : "prefetch;prerender");
+    assert_equals(headers.get("sec-speculation-tags"), expectedTags);
+}, "Sec-Speculation-Tags: deduped and sorted tags within rules");
+
+// Test the case where multiple tags specified on multiple rulesets. These
+// should be deduped and sorted before sent as the header.
+promise_test(async t => {
+    const params = new URLSearchParams(window.location.search);
+    const preloadingType = params.get('type');
+
+    // Inputs and expectations:
+    // "def" and "jkl" are duplicate.
+    const rulesetTag1 = "def";
+    const ruleTags1 = ["jkl", "abc"];
+    const rulesetTag2 = "jkl";
+    const ruleTags2 = ["def", "ghi"];
+    // "def" and "jkl" should be deduped.
+    const expectedTags = '"abc", "def", "ghi", "jkl"';
+
+    const rcHelper = new RemoteContextHelper();
+    const referrerRC = await rcHelper.addWindow(undefined, { features: 'noopener' });
+
+    const extraConfig = {};
+    const preloadedRC = await referrerRC.helper.createContext({
+        executorCreator(url) {
+          const speculationRules = [
+            constructSpeculationRule(
+              preloadingType, url, rulesetTag1, ruleTags1),
+            constructSpeculationRule(
+              preloadingType, url, rulesetTag2, ruleTags2)
+          ];
+          return referrerRC.executeScript((speculationRules) => {
+              for (const ruleText of speculationRules) {
+                const script = document.createElement("script");
+                script.type = "speculationrules";
+                script.textContent = ruleText;
+                document.head.append(script);
+              }
+          }, [speculationRules]);
+        }, extraConfig
+    });
+
+    // Navigate to the preloaded page.
+    await referrerRC.navigateTo(preloadedRC.url);
+
+    const headers = await preloadedRC.getRequestHeaders();
+    // Make sure the page is preloaded.
+    assert_equals(
+      headers.get("sec-purpose"),
+      preloadingType === "prefetch" ? "prefetch" : "prefetch;prerender");
+    assert_equals(headers.get("sec-speculation-tags"), expectedTags);
+}, "Sec-Speculation-Tags: deduped and sorted tags within multiple rulesets");
+
+// Test the case where multiple "null" tags and no tags specified on multiple
+// rulesets. These should be deduped and sorted before sent as the header.
+promise_test(async t => {
+    const params = new URLSearchParams(window.location.search);
+    const preloadingType = params.get('type');
+
+    // Inputs and expectations:
+    const rulesetTag1 = undefined;
+    const ruleTags1 = [undefined, "null", "abc"];
+    const rulesetTag2 = undefined;
+    const ruleTags2 = ["def", undefined, "null"];
+    // 4 rules are (no ruleset level tag) + (rule level tag) =
+    //     "abc" only, "def" only, "null" only.
+    // 2 rules are (no ruleset level tag) + (no rule level tag) = null only.
+    //
+    // All rules, including the null rules, get combined to match expectedTags.
+    const expectedTags = 'null, "abc", "def", "null"';
+
+    const rcHelper = new RemoteContextHelper();
+    const referrerRC = await rcHelper.addWindow(undefined, { features: 'noopener' });
+
+    const extraConfig = {};
+    const preloadedRC = await referrerRC.helper.createContext({
+        executorCreator(url) {
+          const speculationRules = [
+            constructSpeculationRule(
+              preloadingType, url, rulesetTag1, ruleTags1),
+            constructSpeculationRule(
+              preloadingType, url, rulesetTag2, ruleTags2)
+          ];
+          return referrerRC.executeScript((speculationRules) => {
+              for (const ruleText of speculationRules) {
+                const script = document.createElement("script");
+                script.type = "speculationrules";
+                script.textContent = ruleText;
+                document.head.append(script);
+              }
+          }, [speculationRules]);
+        }, extraConfig
+    });
+
+    // Navigate to the preloaded page.
+    await referrerRC.navigateTo(preloadedRC.url);
+
+    const headers = await preloadedRC.getRequestHeaders();
+    // Make sure the page is preloaded.
+    assert_equals(
+      headers.get("sec-purpose"),
+      preloadingType === "prefetch" ? "prefetch" : "prefetch;prerender");
+    assert_equals(headers.get("sec-speculation-tags"), expectedTags);
+}, "Sec-Speculation-Tags: 'null' tags and no tags within multiple rulesets");
+
+// Test the case where 2 rulesets are added but the first ruleset is immediately
+// removed before they are processed. Only tags specified on the second ruleset
+// should be sent.
+promise_test(async t => {
+    const params = new URLSearchParams(window.location.search);
+    const preloadingType = params.get('type');
+
+    // Inputs and expectations:
+    // Only the first ruleset includes "abc".
+    const rulesetTag1 = "def";
+    const ruleTags1 = ["jkl", "abc"];
+    const rulesetTag2 = "jkl";
+    const ruleTags2 = ["def", "ghi"];
+    // "abc" should not be sent, as the first ruleset is removed. The other
+    // common tags should be sent regardless of the removal.
+    const expectedTags = '"def", "ghi", "jkl"';
+
+    const rcHelper = new RemoteContextHelper();
+    const referrerRC = await rcHelper.addWindow(undefined, { features: 'noopener' });
+
+    const extraConfig = {};
+    const preloadedRC = await referrerRC.helper.createContext({
+        executorCreator(url) {
+          const speculationRules = [
+            constructSpeculationRule(
+              preloadingType, url, rulesetTag1, ruleTags1),
+            constructSpeculationRule(
+              preloadingType, url, rulesetTag2, ruleTags2)
+          ];
+          return referrerRC.executeScript((speculationRules) => {
+              const scripts = [];
+              for (const ruleText of speculationRules) {
+                const script = document.createElement("script");
+                script.type = "speculationrules";
+                script.textContent = ruleText;
+                document.head.append(script);
+                scripts.push(script);
+              }
+              // Remove the first ruleset.
+              scripts[0].remove();
+          }, [speculationRules]);
+        }, extraConfig
+    });
+
+    // Navigate to the preloaded page.
+    await referrerRC.navigateTo(preloadedRC.url);
+
+    const headers = await preloadedRC.getRequestHeaders();
+    // Make sure the page is preloaded.
+    assert_equals(
+      headers.get("sec-purpose"),
+      preloadingType === "prefetch" ? "prefetch" : "prefetch;prerender");
+    assert_equals(headers.get("sec-speculation-tags"), expectedTags);
+}, "Sec-Speculation-Tags: removed ruleset");
+
+</script>
diff --git a/tests/wpt/tests/speculation-rules/speculation-tags/invalid-tags.https.html b/tests/wpt/tests/speculation-rules/speculation-tags/invalid-tags.https.html
new file mode 100644
index 00000000000..fce1a2a539d
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/speculation-tags/invalid-tags.https.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<title>Sec-Speculation-Tags request headers</title>
+<meta name="variant" content="?tag-level=ruleset&type=prefetch">
+<meta name="variant" content="?tag-level=ruleset&type=prerender">
+<meta name="variant" content="?tag-level=rule&type=prefetch">
+<meta name="variant" content="?tag-level=rule&type=prerender">
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+<script src="/speculation-rules/resources/utils.js"></script>
+<script src="resources/speculation-tags-utils.js"></script>
+<script>
+"use strict";
+
+setup(() => assertSpeculationRulesIsSupported());
+
+// Invalid (null) tag cases.
+testInvalidTag(123, "integer tag");
+testInvalidTag({a: "1"}, "object tag");
+testInvalidTag(null, "null value tag");
+testInvalidTag('\n', "non-printable character tag");
+testInvalidTag('my\nrules', "string with non-printable character tag");
+testInvalidTag('マイルール', "non-ascii string tag");
+
+// Boundary checks: the tag allows only printable ascii characters between 0x20
+// and 0x7E, inclusive.
+testInvalidTag('\x19', "0x19 tag");
+testTag('\x20', '" "', "0x20 tag");
+testTag('\x7E', '"~"', "0x7E tag");
+testInvalidTag('\x7F', "0x7F tag");
+</script>
diff --git a/tests/wpt/tests/speculation-rules/speculation-tags/no-tags.https.html b/tests/wpt/tests/speculation-rules/speculation-tags/no-tags.https.html
new file mode 100644
index 00000000000..176b3d20bb2
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/speculation-tags/no-tags.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<title>Sec-Speculation-Tags request headers</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+<script src="/speculation-rules/prerender/resources/utils.js"></script>
+<script src="/speculation-rules/resources/utils.js"></script>
+<script src="/speculation-rules/prefetch/resources/utils.sub.js"></script>
+<script src="resources/speculation-tags-utils.js"></script>
+<script>
+"use strict";
+
+setup(() => assertSpeculationRulesIsSupported());
+
+// No tags case.
+promise_test(async t => {
+  const agent = await spawnWindow(t);
+  const nextUrl = agent.getExecutorURL({ page: 2 });
+  await agent.forceSpeculationRules({
+      prefetch: [{source: "list", urls: [nextUrl]}]
+  });
+  await agent.navigate(nextUrl);
+
+  const headers = await agent.getRequestHeaders();
+  assert_prefetched(headers, "must be prefetched");
+  assert_equals(headers.sec_speculation_tags, "null", "Sec-Speculation-Tags");
+}, "Sec-Speculation-Tags: no tags (prefetch)");
+
+promise_test(async t => {
+  const rcHelper = new RemoteContextHelper();
+  const referrerRC = await rcHelper.addWindow(undefined, { features: 'noopener' });
+
+  const prerenderedRC = await addPrerenderRC(referrerRC);
+  const headers = await prerenderedRC.getRequestHeaders();
+  assert_equals(headers.get("sec-purpose"), "prefetch;prerender");
+  assert_equals(headers.get("sec-speculation-tags"), "null");
+}, "Sec-Speculation-Tags: no tags (prerender)");
+
+</script>
diff --git a/tests/wpt/tests/speculation-rules/speculation-tags/prefetch-eagerness-pointer-down.https.html b/tests/wpt/tests/speculation-rules/speculation-tags/prefetch-eagerness-pointer-down.https.html
new file mode 100644
index 00000000000..cbf69cefba6
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/speculation-tags/prefetch-eagerness-pointer-down.https.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<title>Sec-Speculation-Tags request headers</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+<script src="/speculation-rules/prerender/resources/utils.js"></script>
+<script src="/speculation-rules/resources/utils.js"></script>
+<script src="/speculation-rules/prefetch/resources/utils.sub.js"></script>
+<script>
+"use strict";
+
+setup(() => assertSpeculationRulesIsSupported());
+
+promise_test(async t => {
+  const agent = await spawnWindow(t);
+  const nextUrl = agent.getExecutorURL({ page: 2 });
+  await agent.forceSpeculationRules({
+      prefetch: [
+        {source: "list", "tag": "conservative",
+          "eagerness": "conservative", urls: [nextUrl]},
+        {source: "list", "tag": "moderate",
+          "eagerness": "moderate", urls: [nextUrl]}
+      ]
+  });
+
+  const linkId = 'target';
+  await agent.execute_script(async (linkId, nextUrl) => {
+    add_link(linkId, nextUrl);
+  }, [linkId, nextUrl]);
+
+  await agent.execute_script(async (linkId) => {
+    await start_non_eager_prefetch_on_pointerdown(linkId);
+  }, [linkId]);
+  await agent.navigate(nextUrl);
+
+  const headers = await agent.getRequestHeaders();
+  assert_prefetched(headers, "must be prefetched");
+  assert_equals(headers.sec_speculation_tags, "\"conservative\", \"moderate\"", "Sec-Speculation-Tags");
+}, "Sec-Speculation-Tags prefetch with eagerness triggered by point down");
+
+</script>
diff --git a/tests/wpt/tests/speculation-rules/speculation-tags/prefetch-eagerness-pointer-hover.https.html b/tests/wpt/tests/speculation-rules/speculation-tags/prefetch-eagerness-pointer-hover.https.html
new file mode 100644
index 00000000000..f5e749b9c6f
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/speculation-tags/prefetch-eagerness-pointer-hover.https.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<title>Sec-Speculation-Tags request headers</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+<script src="/speculation-rules/prerender/resources/utils.js"></script>
+<script src="/speculation-rules/resources/utils.js"></script>
+<script src="/speculation-rules/prefetch/resources/utils.sub.js"></script>
+<script>
+"use strict";
+
+setup(() => assertSpeculationRulesIsSupported());
+
+promise_test(async t => {
+  const agent = await spawnWindow(t);
+  const nextUrl = agent.getExecutorURL({ page: 2 });
+  await agent.forceSpeculationRules({
+      prefetch: [
+        {source: "list", "tag": "conservative",
+          "eagerness": "conservative", urls: [nextUrl]},
+        {source: "list", "tag": "moderate",
+          "eagerness": "moderate", urls: [nextUrl]}
+      ]
+  });
+
+  const linkId = 'target';
+  await agent.execute_script(async (linkId, nextUrl) => {
+    add_link(linkId, nextUrl);
+  }, [linkId, nextUrl]);
+
+  await agent.execute_script(async (linkId) => {
+    await start_non_eager_prefetch_on_hover(linkId);
+  }, [linkId]);
+
+  // TODO(crbug.com/381687257): Remove this when 0ms hover trigger is supported.
+  // Wait for longer than 200 ms for the onhover trigger to fire.
+  await new Promise(resolve => t.step_timeout(resolve, 500));
+  await agent.navigate(nextUrl);
+
+  const headers = await agent.getRequestHeaders();
+  assert_prefetched(headers, "must be prefetched");
+  assert_equals(headers.sec_speculation_tags, "\"moderate\"", "Sec-Speculation-Tags");
+}, "Sec-Speculation-Tags prefetch with eagerness triggered by point hover");
+
+</script>
diff --git a/tests/wpt/tests/speculation-rules/speculation-tags/prerender-target-hint.https.html b/tests/wpt/tests/speculation-rules/speculation-tags/prerender-target-hint.https.html
new file mode 100644
index 00000000000..cab8f4586c5
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/speculation-tags/prerender-target-hint.https.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<title>Sec-Speculation-Tags request headers</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+<script src="/speculation-rules/resources/utils.js"></script>
+<script src="resources/speculation-tags-utils.js"></script>
+<script>
+"use strict";
+
+setup(() => assertSpeculationRulesIsSupported());
+
+// Test that tags are sent for prerendering with target_hint.
+promise_test(async t => {
+    // Inputs and expectations:
+    const rulesetTag = "def";
+    const ruleTags = ["abc", "ghi"];
+    const expectedTags = '"abc", "def", "ghi"';
+
+    const rcHelper = new RemoteContextHelper();
+    const referrerRC = await rcHelper.addWindow(undefined, { features: 'noopener' });
+
+    const extraConfig = {};
+    const preloadedRC = await referrerRC.helper.createContext({
+        executorCreator(url) {
+          return referrerRC.executeScript((url, rulesetTag, ruleTags) => {
+              const script = document.createElement("script");
+              script.type = "speculationrules";
+              script.textContent = JSON.stringify({
+                  tag:rulesetTag,
+                  prerender: [
+                    {
+                      tag: ruleTags[0],
+                      target_hint: "_blank",
+                      source: "list",
+                      urls: [url]
+                    },
+                    {
+                      tag: ruleTags[1],
+                      target_hint: "_blank",
+                      source: "list",
+                      urls: [url]
+                    }
+                  ]
+              });
+              document.head.append(script);
+          }, [url, rulesetTag, ruleTags]);
+        }, extraConfig
+    });
+
+    // Open the prerendered page in a new tab.
+    await referrerRC.navigate((url) => {
+        window.open(url, "_blank", "noopener");
+    }, [preloadedRC.url]);
+
+    const headers = await preloadedRC.getRequestHeaders();
+    // Make sure the page is prerendered.
+    assert_equals(headers.get("sec-purpose"), "prefetch;prerender");
+    assert_equals(headers.get("sec-speculation-tags"), expectedTags);
+}, "Sec-Speculation-Tags: tags with prerender target hint");
+
+</script>
diff --git a/tests/wpt/tests/speculation-rules/speculation-tags/resources/speculation-tags-utils.js b/tests/wpt/tests/speculation-rules/speculation-tags/resources/speculation-tags-utils.js
new file mode 100644
index 00000000000..17f36f1f7c4
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/speculation-tags/resources/speculation-tags-utils.js
@@ -0,0 +1,133 @@
+// Utilities for speculation tags tests.
+
+{
+  // Retrieves a tag level variant from URLSearchParams of the current window and
+  // returns it. Throw an Error if it doesn't have the valid tag level param.
+  function getTagLevel() {
+    const params = new URLSearchParams(window.location.search);
+    const level = params.get('tag-level');
+    if (level === null)
+      throw new Error('window.location does not have a tag-level param');
+    if (level !== 'ruleset' && level !== 'rule')
+      throw new Error('window.location does not have a valid tag-level param');
+    return level;
+  }
+
+  // Retrieves a preloading type variant from URLSearchParams of the current
+  // window and returns it. Throw an Error if it doesn't have the valid
+  // preloading type param.
+  function getPreloadingType() {
+    const params = new URLSearchParams(window.location.search);
+    const type = params.get('type');
+    if (type === null)
+      throw new Error('window.location does not have a preloading type param');
+    if (type !== 'prefetch' && type !== 'prerender')
+      throw new Error('window.location does not have a valid preloading type param');
+    return type;
+  }
+
+  function testRulesetTag(tag, expectedTag, description) {
+    promise_test(async t => {
+        const rcHelper = new RemoteContextHelper();
+        const referrerRC = await rcHelper.addWindow(undefined, { features: 'noopener' });
+
+        const extraConfig = {};
+        const preloadingType = getPreloadingType();
+        const preloadedRC = await referrerRC.helper.createContext({
+            executorCreator(url) {
+              return referrerRC.executeScript((preloadingType, tag, url) => {
+                  const script = document.createElement("script");
+                  script.type = "speculationrules";
+                  script.textContent = JSON.stringify({
+                      tag,
+                      [preloadingType]: [
+                        {
+                          source: "list",
+                          urls: [url]
+                        }
+                      ]
+                  });
+                  document.head.append(script);
+              }, [preloadingType, tag, url]);
+            }, extraConfig
+        });
+
+        // Navigate to the preloaded page.
+        referrerRC.navigateTo(preloadedRC.url);
+
+        const headers = await preloadedRC.getRequestHeaders();
+        // Make sure the page is preloaded.
+        assert_equals(
+          headers.get("sec-purpose"),
+          preloadingType === "prefetch" ? "prefetch" : "prefetch;prerender");
+        assert_equals(headers.get("sec-speculation-tags"), expectedTag);
+    }, "Sec-Speculation-Tags [ruleset-based]: " + description);
+  }
+
+  function testRuleTag(tag, expectedTag, description) {
+    promise_test(async t => {
+        const rcHelper = new RemoteContextHelper();
+        const referrerRC = await rcHelper.addWindow(undefined, { features: 'noopener' });
+
+        const extraConfig = {};
+        const preloadingType = getPreloadingType();
+        const preloadedRC = await referrerRC.helper.createContext({
+            executorCreator(url) {
+              return referrerRC.executeScript((preloadingType, tag, url) => {
+                  const script = document.createElement("script");
+                  script.type = "speculationrules";
+                  script.textContent = JSON.stringify({
+                      [preloadingType]: [
+                        {
+                          tag,
+                          source: "list",
+                          urls: [url]
+                        }
+                      ]
+                  });
+                  document.head.append(script);
+              }, [preloadingType, tag, url]);
+            }, extraConfig
+        });
+
+        // Navigate to the preloaded page.
+        referrerRC.navigateTo(preloadedRC.url);
+
+        const headers = await preloadedRC.getRequestHeaders();
+
+        if (expectedTag === undefined) {
+          // If `tag` on the rule level is invalid, preloading should not be
+          // triggered, and the navigation should fall back to network. Confirm
+          // this behavior by checking the request headers.
+          assert_false(headers.has("sec-purpose"));
+          assert_false(headers.has("sec-speculation-tags"));
+        } else {
+          // Make sure the page is preloaded.
+          assert_equals(
+            headers.get("sec-purpose"),
+            preloadingType === "prefetch" ? "prefetch" : "prefetch;prerender");
+          assert_equals(headers.get("sec-speculation-tags"), expectedTag);
+        }
+
+    }, "Sec-Speculation-Tags [rule-based]: " + description);
+  }
+
+  // Runs the test function for valid tag cases based on the tag level.
+  globalThis.testTag = (tag, expectedTag, description) => {
+    if (getTagLevel() === 'ruleset') {
+      testRulesetTag(tag, expectedTag, description);
+    } else {
+      testRuleTag(tag, expectedTag, description);
+    }
+  };
+
+  // Runs the test function for invalid tag cases based on the tag level.
+  globalThis.testInvalidTag = (tag, description) => {
+    if (getTagLevel() === 'ruleset') {
+      testRulesetTag(tag, 'null', description);
+    } else {
+      // Pass `undefined` to indicate this preloading is expected to fail.
+      testRuleTag(tag, undefined, description);
+    }
+  };
+}
diff --git a/tests/wpt/tests/speculation-rules/speculation-tags/same-site-to-cross-site-redirection-prefetch.https.html b/tests/wpt/tests/speculation-rules/speculation-tags/same-site-to-cross-site-redirection-prefetch.https.html
new file mode 100644
index 00000000000..27ece0cfde1
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/speculation-tags/same-site-to-cross-site-redirection-prefetch.https.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<title>Cross-site prefetch attempts with speculation tags</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+<script src="/speculation-rules/prerender/resources/utils.js"></script>
+<script src="/speculation-rules/resources/utils.js"></script>
+<script src="/speculation-rules/prefetch/resources/utils.sub.js"></script>
+
+<script>
+"use strict";
+
+setup(() => assertSpeculationRulesIsSupported());
+
+promise_test(async t => {
+  const agent = await spawnWindow(t);
+
+  const finalUrl = agent.getExecutorURL({  hostname: PREFETCH_PROXY_BYPASS_HOST, page: 2 });
+  const nextUrl = new URL("/common/redirect.py?location=" + encodeURIComponent(finalUrl), document.baseURI);
+  await agent.forceSpeculationRules({
+      tag: 'tag1',
+      prefetch: [{source: "list", urls: [nextUrl]}]
+  });
+  await agent.navigate(nextUrl, {expectedDestinationUrl: finalUrl});
+
+  const headers = await agent.getRequestHeaders();
+  assert_prefetched(headers, "must be prefetched");
+  assert_equals(headers["sec_speculation_tags"], '__no_tags__');
+}, "same-site to cross-site redirection prefetch should not have Sec-Speculation-Tags be sent");
+
+</script>
diff --git a/tests/wpt/tests/speculation-rules/speculation-tags/valid-tags.https.html b/tests/wpt/tests/speculation-rules/speculation-tags/valid-tags.https.html
new file mode 100644
index 00000000000..f39c2d80235
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/speculation-tags/valid-tags.https.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<title>Sec-Speculation-Tags request headers</title>
+<meta name="variant" content="?tag-level=ruleset&type=prefetch">
+<meta name="variant" content="?tag-level=ruleset&type=prerender">
+<meta name="variant" content="?tag-level=rule&type=prefetch">
+<meta name="variant" content="?tag-level=rule&type=prerender">
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+<script src="/speculation-rules/resources/utils.js"></script>
+<script src="resources/speculation-tags-utils.js"></script>
+<script>
+"use strict";
+
+setup(() => assertSpeculationRulesIsSupported());
+
+const R = String.raw;
+
+// Valid tag cases.
+testTag('my-rules', '"my-rules"', "string tag");
+testTag('null', '"null"', "'null' string tag");
+testTag('', '""', "empty string tag");
+testTag(' ', '" "', "single space tag");
+testTag('"', R`"\""`, "double quote tag");
+testTag('"""', R`"\"\"\""`, "double quotes tag");
+testTag('\\', R`"\\"`, "backslash tag");
+testTag('\\\\\\', R`"\\\\\\"`, "backslashes tag");
+</script>
diff --git a/tests/wpt/tests/speech-api/SpeechRecognition-basics.https.html b/tests/wpt/tests/speech-api/SpeechRecognition-basics.https.html
index 16c22e7c95f..827844096f6 100644
--- a/tests/wpt/tests/speech-api/SpeechRecognition-basics.https.html
+++ b/tests/wpt/tests/speech-api/SpeechRecognition-basics.https.html
@@ -12,6 +12,6 @@ test(function() {
   assert_false(reco.interimResults, 'SpeechRecognition.interimResults');
   assert_equals(reco.maxAlternatives, 1, 'SpeechRecognition.maxAlternatives');
   assert_equals(reco.mode, 'ondevice-preferred', 'SpeechRecognition.mode');
-  assert_equals(reco.context, null, 'SpeechRecognition.context');
+  assert_equals(reco.phrases, null, 'SpeechRecognition.phrases');
 });
 </script>
diff --git a/tests/wpt/tests/speech-api/SpeechRecognition-installOnDevice.https.html b/tests/wpt/tests/speech-api/SpeechRecognition-installOnDevice.https.html
index 08d370d5dc2..2f5b359c571 100644
--- a/tests/wpt/tests/speech-api/SpeechRecognition-installOnDevice.https.html
+++ b/tests/wpt/tests/speech-api/SpeechRecognition-installOnDevice.https.html
@@ -2,17 +2,39 @@
 <title>SpeechRecognition installOnDevice</title>
 <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>
 promise_test(async (t) => {
   const validLang = "en-US";
   const invalidLang = "invalid language code";
-  window.SpeechRecognition = window.SpeechRecognition || window.webkitSpeechRecognition;
+  const validDownloadableLang = "fr-FR";
+  window.SpeechRecognition =
+    window.SpeechRecognition || window.webkitSpeechRecognition;
 
-  // Test that it returns a promise.
-  const validResultPromise = SpeechRecognition.installOnDevice(validLang);
+  // Attempt to call installOnDevice directly, without a user gesture with a
+  // language that is downloadable but not installed.
+  const installWithoutUserGesturePromise =
+    SpeechRecognition.installOnDevice(validDownloadableLang);
+
+  // Assert that the promise rejects with NotAllowedError.
+  await promise_rejects_dom(
+    t,
+    "NotAllowedError",
+    window.DOMException,
+    installWithoutUserGesturePromise,
+    "SpeechRecognition.installOnDevice() must reject with NotAllowedError if " +
+      "called without a user gesture."
+  );
+
+  // Test that it returns a promise when called with a valid language.
+  const validResultPromise = test_driver.bless(
+    "Call SpeechRecognition.installOnDevice with a valid language",
+    () => SpeechRecognition.installOnDevice(validLang)
+  );
   assert_true(
     validResultPromise instanceof Promise,
-    "installOnDevice should return a Promise."
+    "installOnDevice (with gesture) should return a Promise."
   );
 
   // Verify the resolved value is a boolean.
@@ -22,22 +44,80 @@ promise_test(async (t) => {
     "The resolved value of the installOnDevice promise should be a boolean."
   );
 
-  // Verify that the method returns true when called with a supported language code.
+  // Verify that the method returns true when called with a supported language.
   assert_equals(
     validResult,
     true,
-    "installOnDevice should resolve with `true` when called with a supported language code."
+    "installOnDevice should resolve with `true` when called with a " +
+      "supported language code."
   );
 
-  // Test that it returns a promise.
-  const invalidResultPromise = SpeechRecognition.installOnDevice(invalidLang);
+  // Verify that the newly installed language pack is available.
+  const availableOnDeviceResultPromise =
+    SpeechRecognition.availableOnDevice(validLang);
+  assert_true(
+    availableOnDeviceResultPromise instanceof Promise,
+    "availableOnDevice should return a Promise."
+  );
+
+  const availableOnDeviceResult = await availableOnDeviceResultPromise;
+  assert_true(
+    typeof availableOnDeviceResult === "string",
+    "The resolved value of the availableOnDevice promise should be a string."
+  );
+
+  assert_true(
+    availableOnDeviceResult === "available",
+    "The resolved value of the availableOnDevice promise should be 'available'."
+  );
+
+  // Verify that installing an already installed language resolves to true.
+  const secondResultPromise = test_driver.bless(
+    "Call SpeechRecognition.installOnDevice for an already installed language",
+    () => SpeechRecognition.installOnDevice(validLang)
+  );
+  assert_true(
+    secondResultPromise instanceof Promise,
+    "installOnDevice (with gesture, for already installed language) should " +
+      "return a Promise."
+  );
+  const secondResult = await secondResultPromise;
+  assert_true(
+    typeof secondResult === "boolean",
+    "The resolved value of the second installOnDevice promise should be a " +
+      "boolean."
+  );
+  assert_equals(
+    secondResult,
+    true,
+    "installOnDevice should resolve with `true` if the language is already " +
+      "installed."
+  );
+
+  // Test that it returns a promise and resolves to false for unsupported lang.
+  const invalidResultPromise = test_driver.bless(
+    "Call SpeechRecognition.installOnDevice with an unsupported language code",
+    () => SpeechRecognition.installOnDevice(invalidLang)
+  );
+  assert_true(
+    invalidResultPromise instanceof Promise,
+    "installOnDevice (with gesture, for unsupported language) should return " +
+      "a Promise."
+  );
   const invalidResult = await invalidResultPromise;
+  assert_true(
+    typeof invalidResult === "boolean",
+    "The resolved value of the installOnDevice promise (unsupported language) " +
+      "should be a boolean."
+  );
   assert_equals(
     invalidResult,
     false,
-    "installOnDevice should resolve with `false` when called with an unsupported language code."
+    "installOnDevice should resolve with `false` when called with an " +
+      "unsupported language code."
   );
-}, "SpeechRecognition.installOnDevice resolves with a boolean value.");
+}, "SpeechRecognition.installOnDevice resolves with a boolean value " +
+   "(with user gesture).");
 
 promise_test(async (t) => {
   const iframe = document.createElement("iframe");
@@ -52,7 +132,13 @@ promise_test(async (t) => {
     t,
     "InvalidStateError",
     frameDOMException,
-    frameSpeechRecognition.installOnDevice("en-US"),
+    test_driver.bless(
+      "Call SpeechRecognition.installOnDevice in a detached frame context",
+      () => {
+        return frameSpeechRecognition.installOnDevice("en-US");
+      }
+    )
   );
-}, "SpeechRecognition.installOnDevice rejects in a detached context.");
+}, "SpeechRecognition.installOnDevice rejects in a detached context " +
+   "(with user gesture).");
 </script>
diff --git a/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-fetch.sub.https.tentative.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-fetch.sub.https.window.js
similarity index 100%
rename from tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-fetch.sub.https.tentative.window.js
rename to tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-fetch.sub.https.window.js
diff --git a/tests/wpt/tests/storage-access-api/resources/blob-url-creation.html b/tests/wpt/tests/storage-access-api/resources/blob-url-creation.html
new file mode 100644
index 00000000000..fe3e169b5c4
--- /dev/null
+++ b/tests/wpt/tests/storage-access-api/resources/blob-url-creation.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<body>
+  <script>
+    'use strict';
+
+    // Create a blob and get its URL.
+    const blob = new Blob(["TEST"], { type: "text/plain" });
+    const blob_url = URL.createObjectURL(blob);
+
+    // Send the blob URL back to the opener.
+    window.parent.postMessage({ type: "blobURL", message: blob_url }, "*");
+  </script>
+</body>
diff --git a/tests/wpt/tests/storage-access-api/resources/iframe-creation.sub.html b/tests/wpt/tests/storage-access-api/resources/iframe-creation.sub.html
new file mode 100644
index 00000000000..2927866bdf1
--- /dev/null
+++ b/tests/wpt/tests/storage-access-api/resources/iframe-creation.sub.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<body>
+  <script>
+    'use strict';
+
+    const iframe = document.createElement("iframe");
+    iframe.src = "https://{{hosts[][]}}:{{ports[https][0]}}/storage-access-api/resources/blob-url-creation.html";
+    document.body.appendChild(iframe);
+
+    // Send the blob URL back to the opener.
+    window.addEventListener("message", async e => {
+      if (e.data.type !== "blobURL") {
+        return;
+      }
+      const blob_url = e.data.message;
+      window.opener.postMessage({ type: "blobURL", message: blob_url }, "*");
+    });
+ </script>
+</body>
diff --git a/tests/wpt/tests/storage-access-api/resources/storage-access-beyond-cookies-iframe-iframe.html b/tests/wpt/tests/storage-access-api/resources/storage-access-beyond-cookies-iframe-iframe.html
index 44ac9cd8986..09eef3fe52f 100644
--- a/tests/wpt/tests/storage-access-api/resources/storage-access-beyond-cookies-iframe-iframe.html
+++ b/tests/wpt/tests/storage-access-api/resources/storage-access-beyond-cookies-iframe-iframe.html
@@ -310,6 +310,138 @@
         handle_shared_worker.port.postMessage("Same-origin handle access");
         break;
       }
+      case "BlobURLDedicatedWorker": {
+        const fetch_unsuccessful_response = "fetch_unsuccessful";
+        const fetch_successful_response = "fetch_successful";
+
+        const can_blob_url_be_fetched_js = `
+          onmessage = async (e) => {
+            const blob_url = e.data;
+            try {
+              const blob = await fetch(blob_url).then(response => response.blob());
+              await blob.text();
+              postMessage("${fetch_successful_response}");
+            } catch(e) {
+              postMessage("${fetch_unsuccessful_response}");
+            }
+          };
+        `;
+
+        // case 1: create dedicated worker w/o granting storage access
+        const worker_blob_url = new Blob([can_blob_url_be_fetched_js], { type: 'text/javascript' });
+        const third_party_blob_url = URL.createObjectURL(worker_blob_url);
+
+        const worker_1 = new Worker(third_party_blob_url);
+
+        await MaybeSetStorageAccess("*", "*", "allowed");
+        const handle = await test_driver.bless("fake user interaction", () => document.requestStorageAccess({all: true}));
+
+        const worker_blob = new Blob(["potato"]);
+        const first_party_blob_url = handle.createObjectURL(worker_blob);
+
+        const worker_response_promise = new Promise((resolve) => {
+          worker_1.onmessage = (e) => { resolve(e.data) };
+          worker_1.postMessage(first_party_blob_url);
+        });
+
+        const worker_response = await worker_response_promise;
+        if (worker_response === fetch_unsuccessful_response) {
+          message = "Dedicated worker expectedly failed fetching first-party blob URL from a third-party context without granting storage access.";
+        } else if (worker_response === fetch_successful_response) {
+          message = "Dedicated worker unexpectedly fetched first-party blob URL from a third-party context without granting storage access.";
+          break;
+        }
+
+        // case 2: create dedicated worker after storage access is granted
+        const worker_2 = new Worker(third_party_blob_url);
+        const worker_response_promise2 = new Promise((resolve) => {
+          worker_2.onmessage = (e) => { resolve(e.data) };
+          worker_2.postMessage(first_party_blob_url);
+        });
+        const worker_response2 = await worker_response_promise2;
+
+        URL.revokeObjectURL(third_party_blob_url);
+        handle.revokeObjectURL(first_party_blob_url);
+        worker_2.terminate();
+
+        if (worker_response2 === fetch_unsuccessful_response) {
+          message = "Dedicated worker unexpectedly failed fetching first-party blob URL from a third-party context with granting storage access.";
+          break;
+        } else if (worker_response2 === fetch_successful_response) {
+          message = "Blob URL DedicatedWorker tests completed successfully.";
+        }
+        break;
+      }
+      case "ThirdPartyBlobURL": {
+        await MaybeSetStorageAccess("*", "*", "allowed");
+        const handle = await test_driver.bless("fake user interaction", () => document.requestStorageAccess({all: true}));
+        try {
+          const blob = await fetch(atob(id)).then(response => response.blob());
+          await blob.text();
+        } catch (e) {
+          message = "Third Party Blob URL tests completed successfully.";
+          break;
+        }
+        message = "Cross-partition third-party blob URL was accessible after granting storage access";
+        break;
+      }
+      case "BlobURLSharedWorker": {
+        const handle = await test_driver.bless("fake user interaction", () => document.requestStorageAccess({createObjectURL: true, revokeObjectURL: true, SharedWorker: true}));
+        const workerScript = await fetch('/storage-access-api/resources/shared-worker-relay.js').then(response => response.text());
+        const workerBlob = new Blob([workerScript], { type: 'text/javascript' });
+
+        const firstPartyBlobUrl = handle.createObjectURL(workerBlob);
+        const thirdPartyWorker = new SharedWorker(firstPartyBlobUrl);
+        var workerCreated = true;
+        await new Promise((resolve) => {
+          thirdPartyWorker.onerror = (event) => {
+            message = "Third-party SharedWorker not created from first-party blob URL unexpectedly.";
+            workerCreated = false;
+            resolve();
+          }
+          thirdPartyWorker.port.onmessage = (event) => {
+            message = "Third-party SharedWorker created from first-party blob URL.";
+            resolve();
+          }
+          thirdPartyWorker.port.postMessage("ping");
+        });
+        if (!workerCreated) {
+          break;
+        }
+
+        const firstPartyWorker = handle.SharedWorker(firstPartyBlobUrl);
+        await new Promise((resolve) => {
+          firstPartyWorker.onerror = (event) => {
+            message = "First-party SharedWorker not created from first-party blob URL unexpectedly.";
+            workerCreated = false;
+            resolve();
+          }
+          firstPartyWorker.port.onmessage = (event) => {
+            message = "First-party SharedWorker created from first-party blob URL.";
+            resolve();
+          }
+          firstPartyWorker.port.postMessage("ping");
+        });
+        if (!workerCreated) {
+          break;
+        }
+
+        const thirdPartyBlobUrl = URL.createObjectURL(workerBlob);
+        const worker = handle.SharedWorker(thirdPartyBlobUrl);
+        await new Promise((resolve) => {
+          worker.onerror = (event) => {
+            message = "Blob URL SharedWorker tests completed successfully.";
+            workerCreated = false;
+            resolve();
+          };
+          worker.port.onmessage = (event) => {
+            message = "First-party SharedWorker created from third-party blob URL unexpectedly.";
+            resolve();
+          }
+          worker.port.postMessage("ping");
+        });
+        break;
+      }
       case "unpartitioned": {
         await MaybeSetStorageAccess("*", "*", "allowed");
         await test_driver.set_permission({ name: 'storage-access' }, 'denied');
diff --git a/tests/wpt/tests/storage-access-api/resources/storage-access-beyond-cookies-iframe.sub.html b/tests/wpt/tests/storage-access-api/resources/storage-access-beyond-cookies-iframe.sub.html
index 7d43a06bc7e..2e10d1cae15 100644
--- a/tests/wpt/tests/storage-access-api/resources/storage-access-beyond-cookies-iframe.sub.html
+++ b/tests/wpt/tests/storage-access-api/resources/storage-access-beyond-cookies-iframe.sub.html
@@ -133,12 +133,21 @@ window.addEventListener("message", async (e) => {
         shared_worker.port.postMessage("Cross-origin handle access");
         break;
       }
+      case "BlobURLDedicatedWorker": {
+        break;
+      }
+      case "ThirdPartyBlobURL": {
+        break;
+      }
       case "unpartitioned": {
         const channel = handle.BroadcastChannel(id);
         channel.postMessage("Cross-origin handle access");
         channel.close();
         break;
       }
+      case "BlobURLSharedWorker": {
+        break;
+      }
       default: {
         message = "Unexpected type " + type;
         break;
diff --git a/tests/wpt/tests/storage-access-api/storage-access-beyond-cookies.BlobURLDedicatedWorker.sub.https.tentative.window.js b/tests/wpt/tests/storage-access-api/storage-access-beyond-cookies.BlobURLDedicatedWorker.sub.https.tentative.window.js
new file mode 100644
index 00000000000..2d04c2ee405
--- /dev/null
+++ b/tests/wpt/tests/storage-access-api/storage-access-beyond-cookies.BlobURLDedicatedWorker.sub.https.tentative.window.js
@@ -0,0 +1,22 @@
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+
+'use strict';
+
+async_test(t => {
+  // Set up a message listener that simply calls t.done() when a message is received.
+  window.addEventListener("message", t.step_func(e => {
+    if (e.data.type != "result") {
+      return;
+    }
+    assert_equals(e.data.message, "Blob URL DedicatedWorker tests completed successfully.");
+    t.done();
+  }));
+
+  // Create an iframe that's cross-site with top-frame.
+  const id = Date.now();
+  let iframe = document.createElement("iframe");
+  iframe.src = "https://{{hosts[alt][]}}:{{ports[https][0]}}/storage-access-api/resources/storage-access-beyond-cookies-iframe.sub.html?type=BlobURLDedicatedWorker&id=" + id;
+  document.body.appendChild(iframe);
+
+}, "Verify that if the third-party context creates a blob URL using the StorageAccessHandle and sends it to the dedicated worker, the dedicated worker fetch succeeds.");
\ No newline at end of file
diff --git a/tests/wpt/tests/storage-access-api/storage-access-beyond-cookies.BlobURLSharedWorker.sub.https.tentative.window.js b/tests/wpt/tests/storage-access-api/storage-access-beyond-cookies.BlobURLSharedWorker.sub.https.tentative.window.js
new file mode 100644
index 00000000000..f0559984230
--- /dev/null
+++ b/tests/wpt/tests/storage-access-api/storage-access-beyond-cookies.BlobURLSharedWorker.sub.https.tentative.window.js
@@ -0,0 +1,22 @@
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+
+'use strict';
+
+async_test(t => {
+  // Set up a message listener that simply calls t.done() when a message is received.
+  window.addEventListener("message", t.step_func(e => {
+    if (e.data.type != "result") {
+      return;
+    }
+    assert_equals(e.data.message, "Blob URL SharedWorker tests completed successfully.");
+    t.done();
+  }));
+
+  // Create an iframe that's cross-site with top-frame.
+  const id = Date.now();
+  let iframe = document.createElement("iframe");
+  iframe.src = "https://{{hosts[alt][]}}:{{ports[https][0]}}/storage-access-api/resources/storage-access-beyond-cookies-iframe.sub.html?type=BlobURLSharedWorker&id=" + id;
+  document.body.appendChild(iframe);
+
+}, "Verify a blob URL created via URL.createObjectURL from the third-party context shouldn't be useable as the shared worker script when it's passed to saa_handle.SharedWorker.");
diff --git a/tests/wpt/tests/storage-access-api/storage-access-beyond-cookies.thirdPartyBlobStorage.sub.https.window.js b/tests/wpt/tests/storage-access-api/storage-access-beyond-cookies.thirdPartyBlobStorage.sub.https.window.js
new file mode 100644
index 00000000000..5dc67f0c7f1
--- /dev/null
+++ b/tests/wpt/tests/storage-access-api/storage-access-beyond-cookies.thirdPartyBlobStorage.sub.https.window.js
@@ -0,0 +1,33 @@
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+
+'use strict';
+
+async_test(t => {
+  window.addEventListener("message", t.step_func(async e => {
+    if (e.data.type !== "blobURL") {
+      return;
+    }
+    const blob_url = e.data.message;
+
+    // Create an iframe and pass the blob URL to it.
+    const id = btoa(blob_url);
+    const iframe = document.createElement("iframe");
+    iframe.src = "https://{{hosts[alt][]}}:{{ports[https][0]}}/storage-access-api/resources/storage-access-beyond-cookies-iframe.sub.html?type=ThirdPartyBlobURL&id=" + id;
+    document.body.appendChild(iframe);
+
+    // Set up a second message listener to receive the result from the iframe.
+    window.addEventListener("message", t.step_func(e => {
+      if (e.data.type !== "result") {
+        return;
+      }
+      assert_equals(e.data.message, "Third Party Blob URL tests completed successfully.");
+      popup.close();
+      t.done();
+    }));
+  }));
+
+  // Open a popup to create the blob URL.
+  const popup = window.open("https://{{hosts[alt][]}}:{{ports[https][0]}}/storage-access-api/resources/iframe-creation.sub.html");
+
+}, "Verify StorageAccessAPIBeyondCookies for third-party context accessing first-party Blob URLs");
diff --git a/tests/wpt/tests/streams/WEB_FEATURES.yml b/tests/wpt/tests/streams/WEB_FEATURES.yml
new file mode 100644
index 00000000000..d10bbe4a7d7
--- /dev/null
+++ b/tests/wpt/tests/streams/WEB_FEATURES.yml
@@ -0,0 +1,5 @@
+features:
+- name: streams
+  files:
+    # Top-level only. Subdirectories have their own mapping.
+    - "*"
diff --git a/tests/wpt/tests/streams/piping/WEB_FEATURES.yml b/tests/wpt/tests/streams/piping/WEB_FEATURES.yml
new file mode 100644
index 00000000000..8cf3517baf0
--- /dev/null
+++ b/tests/wpt/tests/streams/piping/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: streams
+  files: "**"
diff --git a/tests/wpt/tests/streams/readable-byte-streams/WEB_FEATURES.yml b/tests/wpt/tests/streams/readable-byte-streams/WEB_FEATURES.yml
new file mode 100644
index 00000000000..a35508fc0dc
--- /dev/null
+++ b/tests/wpt/tests/streams/readable-byte-streams/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: readable-byte-streams
+  files: "**"
diff --git a/tests/wpt/tests/streams/readable-streams/WEB_FEATURES.yml b/tests/wpt/tests/streams/readable-streams/WEB_FEATURES.yml
new file mode 100644
index 00000000000..ad2cb549631
--- /dev/null
+++ b/tests/wpt/tests/streams/readable-streams/WEB_FEATURES.yml
@@ -0,0 +1,14 @@
+features:
+- name: streams
+  files:
+    - "*"
+    - "!async-iterator.any.js"
+    - "!from.any.js"
+    # 'owning' type is not yet standardized
+    - "!owning-type*"
+- name: async-iterable-streams
+  files:
+    - async-iterator.any.js
+- name: readablestream-from
+  files:
+    - from.any.js
diff --git a/tests/wpt/tests/streams/readable-streams/crashtests/WEB_FEATURES.yml b/tests/wpt/tests/streams/readable-streams/crashtests/WEB_FEATURES.yml
new file mode 100644
index 00000000000..b5dbd1ff419
--- /dev/null
+++ b/tests/wpt/tests/streams/readable-streams/crashtests/WEB_FEATURES.yml
@@ -0,0 +1,7 @@
+features:
+- name: streams
+  files:
+    - strategy-worker.js
+- name: readablestream-from
+  files:
+    - from-cross-realm.https.html
diff --git a/tests/wpt/tests/streams/readable-streams/crashtests/garbage-collection.any.js b/tests/wpt/tests/streams/readable-streams/crashtests/garbage-collection.any.js
new file mode 100644
index 00000000000..6e9d80c4142
--- /dev/null
+++ b/tests/wpt/tests/streams/readable-streams/crashtests/garbage-collection.any.js
@@ -0,0 +1,38 @@
+// META: global=window,worker
+// META: script=/common/gc.js
+'use strict';
+
+// See https://crbug.com/335506658 for details.
+promise_test(async () => {
+  const closed = new ReadableStream({
+      pull(controller) {
+        controller.enqueue('is there anybody in there?');
+      }
+  }).getReader().closed;
+  // 3 GCs are actually required to trigger the bug at time of writing.
+  for (let i = 0; i < 5; ++i)
+    await garbageCollect();
+}, 'Garbage-collecting a stream along with its reader should not crash');
+
+promise_test(async () => {
+  let reader = new ReadableStream({
+      pull() { }
+  }).getReader();
+  const promise = reader.read();
+  reader = null;
+  for (let i = 0; i < 5; ++i)
+    await garbageCollect();
+}, 'Garbage-collecting a stream with a pending read should not crash');
+
+promise_test(async () => {
+  let reader = new ReadableStream({
+      type: "bytes",
+      pull() { return new Promise(resolve => {}); }
+  }).getReader({mode: "byob"});
+  const promise = reader.read(new Uint8Array(42));
+  reader = null;
+  for (let i = 0; i < 5; ++i)
+    await garbageCollect();
+}, 'Garbage-collecting a stream with a pending BYOB read should not crash');
+
+
diff --git a/tests/wpt/tests/streams/transferable/WEB_FEATURES.yml b/tests/wpt/tests/streams/transferable/WEB_FEATURES.yml
new file mode 100644
index 00000000000..4ecacf5edbc
--- /dev/null
+++ b/tests/wpt/tests/streams/transferable/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: transferable-streams
+  files: "**"
diff --git a/tests/wpt/tests/streams/transform-streams/WEB_FEATURES.yml b/tests/wpt/tests/streams/transform-streams/WEB_FEATURES.yml
new file mode 100644
index 00000000000..f39dc16de4c
--- /dev/null
+++ b/tests/wpt/tests/streams/transform-streams/WEB_FEATURES.yml
@@ -0,0 +1,8 @@
+features:
+- name: streams
+  files:
+    - "*"
+    - "!cancel.any.js"
+- name: transformstream-transformer-cancel
+  files:
+    - cancel.any.js
diff --git a/tests/wpt/tests/streams/writable-streams/WEB_FEATURES.yml b/tests/wpt/tests/streams/writable-streams/WEB_FEATURES.yml
new file mode 100644
index 00000000000..8cf3517baf0
--- /dev/null
+++ b/tests/wpt/tests/streams/writable-streams/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: streams
+  files: "**"
diff --git a/tests/wpt/tests/streams/writable-streams/close.any.js b/tests/wpt/tests/streams/writable-streams/close.any.js
index 45261e7ca7e..3b2c07cc3bf 100644
--- a/tests/wpt/tests/streams/writable-streams/close.any.js
+++ b/tests/wpt/tests/streams/writable-streams/close.any.js
@@ -468,3 +468,14 @@ promise_test(t => {
 
   return promise_rejects_js(t, TypeError, ws.close(), 'close should reject');
 }, 'close() on a stream with a pending close should reject');
+
+// See https://github.com/whatwg/streams/issues/1341.
+promise_test(async t => {
+  const ws = new WritableStream();
+  const writer = ws.getWriter();
+
+  await writer.write(1);
+  await writer.close();
+
+  return promise_rejects_js(t, TypeError, writer.write(2), 'write should reject');
+}, 'write() on a closed stream should reject');
diff --git a/tests/wpt/tests/streams/writable-streams/crashtests/garbage-collection.any.js b/tests/wpt/tests/streams/writable-streams/crashtests/garbage-collection.any.js
new file mode 100644
index 00000000000..a3796881c9f
--- /dev/null
+++ b/tests/wpt/tests/streams/writable-streams/crashtests/garbage-collection.any.js
@@ -0,0 +1,43 @@
+// META: global=window,worker
+// META: script=/common/gc.js
+'use strict';
+
+// See https://crbug.com/390646657 for details.
+promise_test(async () => {
+  const written = new WritableStream({
+    write(chunk) {
+      return new Promise(resolve => {});
+    }
+  }).getWriter().write('just nod if you can hear me');
+  for (let i = 0; i < 5; ++i)
+    await garbageCollect();
+}, 'Garbage-collecting a stream writer with a pending write should not crash');
+
+promise_test(async () => {
+  const closed = new WritableStream({
+    write(chunk) { }
+  }).getWriter().closed;
+  for (let i = 0; i < 5; ++i)
+    await garbageCollect();
+}, 'Garbage-collecting a stream writer should not crash with closed promise is retained');
+
+promise_test(async () => {
+  let writer = new WritableStream({
+    write(chunk) { return new Promise(resolve => {}); },
+    close() { return new Promise(resolve => {}); }
+  }).getWriter();
+  writer.write('is there anyone home?');
+  writer.close();
+  writer = null;
+  for (let i = 0; i < 5; ++i)
+    await garbageCollect();
+}, 'Garbage-collecting a stream writer should not crash with close promise pending');
+
+promise_test(async () => {
+  const ready = new WritableStream({
+    write(chunk) { }
+  }, {highWaterMark: 0}).getWriter().ready;
+  for (let i = 0; i < 5; ++i)
+    await garbageCollect();
+}, 'Garbage-collecting a stream writer should not crash when backpressure is being applied');
+
diff --git a/tests/wpt/tests/subresource-integrity/signatures/tentative/accept-signature.window.js b/tests/wpt/tests/subresource-integrity/signatures/tentative/accept-signature.window.js
index efcbf0cdad6..97e817e328c 100644
--- a/tests/wpt/tests/subresource-integrity/signatures/tentative/accept-signature.window.js
+++ b/tests/wpt/tests/subresource-integrity/signatures/tentative/accept-signature.window.js
@@ -12,16 +12,30 @@ let test_cases = [
     integrity: `ed25519-${kValidKeys['rfc']} malformed-thing`,
     header: `sig0=("unencoded-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri"`,
   },
+  {
+    integrity: `ed25519-${kValidKeys['rfc']} ed25519-${kValidKeys['rfc']}`,
+    header: `sig0=("unencoded-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri"`,
+  },
   {
     integrity: `ed25519-${kValidKeys['arbitrary']} ed25519-${kValidKeys['rfc']}`,
     header: `sig0=("unencoded-digest";sf);keyid="${kValidKeys['arbitrary']}";tag="sri", ` +
             `sig1=("unencoded-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri"`,
   },
+  {
+    integrity: `ed25519-${kValidKeys['rfc']} ed25519-${kValidKeys['arbitrary']}`,
+    header: `sig0=("unencoded-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri", ` +
+            `sig1=("unencoded-digest";sf);keyid="${kValidKeys['arbitrary']}";tag="sri"`,
+  },
   {
     integrity: `ed25519-${kValidKeys['arbitrary']} malformed-thing ed25519-${kValidKeys['rfc']}`,
     header: `sig0=("unencoded-digest";sf);keyid="${kValidKeys['arbitrary']}";tag="sri", ` +
             `sig1=("unencoded-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri"`,
   },
+  {
+    integrity: `ed25519-${kValidKeys['rfc']} malformed-thing ed25519-${kValidKeys['arbitrary']}`,
+    header: `sig0=("unencoded-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri", ` +
+            `sig1=("unencoded-digest";sf);keyid="${kValidKeys['arbitrary']}";tag="sri"`,
+  },
 ];
 
 let test_counter = 0;
diff --git a/tests/wpt/tests/subresource-integrity/signatures/tentative/client-initiated.cross-origin.window.js b/tests/wpt/tests/subresource-integrity/signatures/tentative/client-initiated.cross-origin.window.js
index ce7b817f7e8..26e1a3090eb 100644
--- a/tests/wpt/tests/subresource-integrity/signatures/tentative/client-initiated.cross-origin.window.js
+++ b/tests/wpt/tests/subresource-integrity/signatures/tentative/client-initiated.cross-origin.window.js
@@ -26,14 +26,14 @@
 // Unsigned responses are blocked when integrity is asserted:
 generate_fetch_test({},
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       integrity: `ed25519-${kValidKeys['rfc']}`,
                     },
                     EXPECT_BLOCKED,
                     "No signature, valid integrity check, w/o cors: blocked.");
 generate_fetch_test({ cors: true },
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       mode: 'cors',
                       integrity: `ed25519-${kValidKeys['rfc']}`,
                     },
@@ -51,7 +51,7 @@ const kRequestWithValidSignature = {
 };
 generate_fetch_test(kRequestWithValidSignature,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       integrity: `ed25519-${kValidKeys['rfc']}`,
                     },
                     EXPECT_BLOCKED,
@@ -59,7 +59,7 @@ generate_fetch_test(kRequestWithValidSignature,
 
 generate_fetch_test(kRequestWithValidSignature,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       integrity: `ed25519-${kInvalidKey}`,
                     },
                     EXPECT_BLOCKED,
@@ -67,7 +67,7 @@ generate_fetch_test(kRequestWithValidSignature,
 
 generate_fetch_test(kRequestWithValidSignature,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       integrity:`ed25519-${kValidKeys['rfc']} ed25519-${kInvalidKey}`
                     },
                     EXPECT_BLOCKED,
@@ -83,7 +83,7 @@ const kRequestWithValidSignatureAndCORS = {
 };
 generate_fetch_test(kRequestWithValidSignatureAndCORS,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       mode: "cors",
                       integrity: `ed25519-${kValidKeys['rfc']}`,
                     },
@@ -92,7 +92,7 @@ generate_fetch_test(kRequestWithValidSignatureAndCORS,
 
 generate_fetch_test(kRequestWithValidSignatureAndCORS,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       mode: "cors",
                       integrity: `ed25519-${kInvalidKey}`,
                     },
@@ -101,7 +101,7 @@ generate_fetch_test(kRequestWithValidSignatureAndCORS,
 
 generate_fetch_test(kRequestWithValidSignatureAndCORS,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       mode: "cors",
                       integrity:`ed25519-${kValidKeys['rfc']} ed25519-${kInvalidKey}`
                     },
@@ -118,7 +118,7 @@ const kRequestWithInvalidSignature = {
 };
 generate_fetch_test(kRequestWithInvalidSignature,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       integrity: `ed25519-${kValidKeys['rfc']}`,
                     },
                     EXPECT_BLOCKED,
@@ -126,7 +126,7 @@ generate_fetch_test(kRequestWithInvalidSignature,
 
 generate_fetch_test(kRequestWithInvalidSignature,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       integrity: `ed25519-${kInvalidKey}`,
                     },
                     EXPECT_BLOCKED,
@@ -134,7 +134,7 @@ generate_fetch_test(kRequestWithInvalidSignature,
 
 generate_fetch_test(kRequestWithInvalidSignature,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       integrity:`ed25519-${kValidKeys['rfc']} ed25519-${kInvalidKey}`
                     },
                     EXPECT_BLOCKED,
@@ -149,7 +149,7 @@ const kRequestWithInvalidSignatureAndCORS = {
 };
 generate_fetch_test(kRequestWithInvalidSignatureAndCORS,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       integrity: `ed25519-${kValidKeys['rfc']}`,
                       mode: "cors",
                     },
@@ -158,7 +158,7 @@ generate_fetch_test(kRequestWithInvalidSignatureAndCORS,
 
 generate_fetch_test(kRequestWithInvalidSignatureAndCORS,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       integrity: `ed25519-${kInvalidKey}`,
                       mode: "cors",
                     },
@@ -167,7 +167,7 @@ generate_fetch_test(kRequestWithInvalidSignatureAndCORS,
 
 generate_fetch_test(kRequestWithInvalidSignatureAndCORS,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       integrity:`ed25519-${kValidKeys['rfc']} ed25519-${kInvalidKey}`,
                       mode: "cors",
                     },
diff --git a/tests/wpt/tests/subresource-integrity/signatures/tentative/helper.js b/tests/wpt/tests/subresource-integrity/signatures/tentative/helper.js
index e5e00ec7b53..c5b7de60747 100644
--- a/tests/wpt/tests/subresource-integrity/signatures/tentative/helper.js
+++ b/tests/wpt/tests/subresource-integrity/signatures/tentative/helper.js
@@ -53,15 +53,12 @@ const kAcceptSignature = "accept-signature";
 // Given `{ digest: "...", body: "...", cors: true, type: "..." }`, generates
 // the URL to a script resource that has the given characteristics.
 let counter = 0;
-function resourceURL(data, host) {
+function resourceURL(data, server_origin) {
   counter++;
   data.type ??= "application/javascript";
   data.counter = counter;
   let params = new URLSearchParams(data);
-  let result = new URL("/subresource-integrity/signatures/resource.py?" + params.toString(), self.location);
-  if (host) {
-    result.host = host;
-  }
+  let result = new URL("/subresource-integrity/signatures/resource.py?" + params.toString(), server_origin ?? self.location.origin);
   return result.href;
 }
 
@@ -92,10 +89,12 @@ async function signSignatureBase(signatureBase, privateKeyJWK) {
 
 function generate_fetch_test(request_data, options, expectation, description) {
   promise_test(test => {
-    const url = resourceURL(request_data, options.host);
+    const url = resourceURL(request_data, options.origin);
     let fetch_options = {};
     if (options.mode) {
       fetch_options.mode = options.mode;
+    } else if (options.origin) {
+      fetch_options.mode = "cors";
     }
     if (options.integrity) {
       fetch_options.integrity = options.integrity;
@@ -112,7 +111,7 @@ function generate_fetch_test(request_data, options, expectation, description) {
         // in the header.
         if (options.integrity?.includes(`ed25519-${kInvalidKey}`)) {
           assert_equals(r.headers.get(kAcceptSignature),
-                        `sig0=("unencoded-digest";sf);keyid="${kInvalidKey}";tag="sri", sig1=("unencoded-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri"`,
+                        `sig0=("unencoded-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri", sig1=("unencoded-digest";sf);keyid="${kInvalidKey}";tag="sri"`,
                         "`accept-signature` was set.");
         } else if (options.integrity?.includes(`ed25519-${kValidKeys['rfc']}`)) {
           assert_equals(r.headers.get(kAcceptSignature),
diff --git a/tests/wpt/tests/subresource-integrity/signatures/tentative/scheme.window.js b/tests/wpt/tests/subresource-integrity/signatures/tentative/scheme.window.js
new file mode 100644
index 00000000000..69ff21de3c7
--- /dev/null
+++ b/tests/wpt/tests/subresource-integrity/signatures/tentative/scheme.window.js
@@ -0,0 +1,73 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=helper.js
+
+// The following tests validate the behavior of the `@scheme` derived component.
+// They'll all be rooted in the following response, generated using the steps at
+// https://wicg.github.io/signature-based-sri/#examples, relying on the test
+// key from https://www.rfc-editor.org/rfc/rfc9421.html#name-example-ed25519-test-key:
+//
+// ```
+// NOTE: '\' line wrapping per RFC 8792
+//
+// HTTP/1.1 200 OK
+// Date: Tue, 20 Apr 2021 02:07:56 GMT
+// Content-Type: application/json
+// Unencoded-Digest: sha-256=:PZJ+9CdAAIacg7wfUe4t/RkDQJVKM0mCZ2K7qiRhHFc=:
+// Content-Length: 18
+// Signature-Input: signature=("unencoded-digest";sf "@scheme";req); \
+//                  keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";       \
+//                  tag="sri"
+// Signature: signature=:oVQ+s/OqXLAVdfvgZ3HaPiyzkpNXZSit9l6e1FB/gOOL3t8FOrIRDV \
+//                       CkcIEcJjd3MA1mROn39/WQShTmnKmlDg==:
+//
+//
+// window.hello = `world`;
+// ```
+
+const test_cases = [
+  // ```
+  // "unencoded-digest";sf: sha-256=:PZJ+9CdAAIacg7wfUe4t/RkDQJVKM0mCZ2K7qiRhHFc=:
+  // "@scheme";req: http
+  // "@signature-params": ("unencoded-digest";sf "@scheme";req);keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri"
+  // ```
+  {
+    origin: get_host_info().HTTP_REMOTE_ORIGIN,
+    signature: `signature=:WZp87p7X3ELfgIKL/qxsY/CT6XArMvZRaxcJ3uy1QklEcLf0c8tol2+W2pvaXX4jnd7hGevFVkzWE77rCOIzAA==:`,
+  },
+  // ```
+  // "unencoded-digest";sf: sha-256=:PZJ+9CdAAIacg7wfUe4t/RkDQJVKM0mCZ2K7qiRhHFc=:
+  // "@scheme";req: https
+  // "@signature-params": ("unencoded-digest";sf "@scheme";req);keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri"
+  // ```
+  {
+    origin: get_host_info().HTTPS_REMOTE_ORIGIN,
+    signature: `signature=:lMzR8lIXYG0Iz0MmTXcRTcBfNw6TgBAPfaNLAU1LzsxWC5dlez8SNe7aCW7avHTWKgaqTGBCMW1LgxkHlijgDA==:`,
+  }
+]
+
+// Valid signatures depend upon integrity checks.
+//
+// We're testing our handling of malformed and multiple keys generally in
+// the broader `client-initiated.*` tests. Here we'll just focus on ensuring
+// that responses with `@scheme` components load at all (no integrity check),
+// load when integrity checks match, and fail when integrity checks mismatch.
+for (const test_case of test_cases) {
+    const request = {
+      cors: true,
+      body: "window.hello = `world`;",
+      digest: "sha-256=:PZJ+9CdAAIacg7wfUe4t/RkDQJVKM0mCZ2K7qiRhHFc=:",
+      signatureInput: `signature=("unencoded-digest";sf "@scheme";req);keyid="${kValidKeys['rfc']}";tag="sri"`,
+      signature: test_case.signature
+    };
+
+    // fetch():
+    generate_fetch_test(request, {origin: test_case.origin}, EXPECT_LOADED,
+                        `Valid signature (${request.signature}), no integrity check: loads.`);
+    generate_fetch_test(request, {origin: test_case.origin,
+                                  integrity:`ed25519-${kValidKeys['rfc']}`}, EXPECT_LOADED,
+                        `Valid signature (${request.signature}), matching integrity check: loads.`);
+
+    generate_fetch_test(request, {origin: test_case.origin,
+                                  integrity:`ed25519-${kInvalidKey}`}, EXPECT_BLOCKED,
+                        `Valid signature (${request.signature}), mismatched integrity check: blocked.`);
+}
diff --git a/tests/wpt/tests/subresource-integrity/signatures/tentative/server-initiated.window.js b/tests/wpt/tests/subresource-integrity/signatures/tentative/server-initiated.window.js
index e2b3e78ac11..8dec3daaded 100644
--- a/tests/wpt/tests/subresource-integrity/signatures/tentative/server-initiated.window.js
+++ b/tests/wpt/tests/subresource-integrity/signatures/tentative/server-initiated.window.js
@@ -38,14 +38,14 @@ generate_fetch_test(kRequestWithValidSignature,
                     "Valid signature, same-origin: loads.");
 generate_fetch_test(kRequestWithValidSignature,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       mode: "no-cors",
                     },
                     EXPECT_LOADED,
                     "Valid signature, cross-origin w/o cors, mode: no-cors: loads.");
 generate_fetch_test(kRequestWithValidSignature,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       mode: "cors",
                     },
                     EXPECT_BLOCKED,
@@ -65,14 +65,14 @@ generate_fetch_test(kRequestWithValidSignatureAndCORS,
                     "Valid signature, same-origin w/ cors: loads.");
 generate_fetch_test(kRequestWithValidSignatureAndCORS,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       mode: "no-cors",
                     },
                     EXPECT_LOADED,
                     "Valid signature, cross-origin w/ cors, mode: no-cors: loads.");
 generate_fetch_test(kRequestWithValidSignatureAndCORS,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       mode: "cors",
                     },
                     EXPECT_LOADED,
@@ -91,14 +91,14 @@ generate_fetch_test(kRequestWithInvalidSignature,
                     "Invalid signature, same-origin: blocked.");
 generate_fetch_test(kRequestWithInvalidSignature,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       mode: "no-cors",
                     },
                     EXPECT_BLOCKED,
                     "Invalid signature, cross-origin w/o cors, mode: no-cors: blocked.");
 generate_fetch_test(kRequestWithInvalidSignature,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       mode: "cors",
                     },
                     EXPECT_BLOCKED,
@@ -118,14 +118,14 @@ generate_fetch_test(kRequestWithInvalidSignatureAndCORS,
                     "Invalid signature, same-origin w/ cors: blocked.");
 generate_fetch_test(kRequestWithInvalidSignatureAndCORS,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       mode: "no-cors",
                     },
                     EXPECT_BLOCKED,
                     "Invalid signature, cross-origin w/ cors, mode: no-cors: blocked.");
 generate_fetch_test(kRequestWithInvalidSignatureAndCORS,
                     {
-                      host: get_host_info().REMOTE_HOST,
+                      origin: get_host_info().REMOTE_ORIGIN,
                       mode: "cors",
                     },
                     EXPECT_BLOCKED,
diff --git a/tests/wpt/tests/subresource-integrity/signatures/tentative/unknown-parameter.window.js b/tests/wpt/tests/subresource-integrity/signatures/tentative/unknown-parameter.window.js
new file mode 100644
index 00000000000..2b4df54c6ed
--- /dev/null
+++ b/tests/wpt/tests/subresource-integrity/signatures/tentative/unknown-parameter.window.js
@@ -0,0 +1,73 @@
+// META: script=helper.js
+
+// The following tests validate the behavior of unknown signature parameters.
+// They'll all be rooted in the following response, generated using the steps at
+// https://wicg.github.io/signature-based-sri/#examples, relying on the test
+// key from https://www.rfc-editor.org/rfc/rfc9421.html#name-example-ed25519-test-key:
+//
+// ```
+// NOTE: '\' line wrapping per RFC 8792
+//
+// HTTP/1.1 200 OK
+// Date: Tue, 20 Apr 2021 02:07:56 GMT
+// Content-Type: application/json
+// Unencoded-Digest: sha-256=:X48E9qOokqqrvdts8nOJRJN3OWDUoyWxBf7kbu9DBPE=:
+// Content-Length: 18
+// Signature-Input: signature=("unencoded-digest";sf "@status"); \
+//                  keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";       \
+//                  tag="sri"
+// Signature: signature=:oVQ+s/OqXLAVdfvgZ3HaPiyzkpNXZSit9l6e1FB/gOOL3t8FOrIRDV \
+//                       CkcIEcJjd3MA1mROn39/WQShTmnKmlDg==:
+//
+//
+// {"hello": "world"}
+// ```
+
+// Metadata from the response above:
+const kRequestsWithValidSignature = [
+  // ```
+  // "unencoded-digest";sf: sha-256=:PZJ+9CdAAIacg7wfUe4t/RkDQJVKM0mCZ2K7qiRhHFc=:
+  // "@signature-params": ("unencoded-digest";sf "@status");keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri";unknown=1
+  // ```
+  {
+    body: "window.hello = `world`;",
+    digest: "sha-256=:PZJ+9CdAAIacg7wfUe4t/RkDQJVKM0mCZ2K7qiRhHFc=:",
+    signature: `signature=:eZ2DGIHUsTNMxFReOMkbOrTmn+CqDckCZ5/635x1Apl2ws0nA+qZcHqZFMdjBvcGw0WElh3zYD0ynkQ+cHiWCA==:`,
+    signatureInput: `signature=("unencoded-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri";unknown=1`
+  },
+  // ```
+  // "unencoded-digest";sf: sha-256=:PZJ+9CdAAIacg7wfUe4t/RkDQJVKM0mCZ2K7qiRhHFc=:
+  // "@signature-params": ("unencoded-digest";sf "@status");unknown=1;keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri"
+  // ```
+  {
+    body: "window.hello = `world`;",
+    digest: "sha-256=:PZJ+9CdAAIacg7wfUe4t/RkDQJVKM0mCZ2K7qiRhHFc=:",
+    signature: `signature=:YXQH8lkKBcGOMNSFbS56j3d5nK3j15HbFPIdsljzQVGFFd93T6FmXb2cLsoINYQbnMUOQBSROIzFZpgUQTBTBA==:`,
+    signatureInput: `signature=("unencoded-digest";sf);unknown=1;keyid="${kValidKeys['rfc']}";tag="sri"`
+  },
+];
+
+// Valid signatures depend upon integrity checks.
+//
+// We're testing our handling of malformed and multiple keys generally in
+// the broader `client-initiated.*` tests. Here we'll just focus on ensuring
+// that responses with unknown parameters load at all (no integrity check),
+// load when integrity checks match, and fail when integrity checks mismatch.
+for (const request of kRequestsWithValidSignature) {
+    // fetch():
+    generate_fetch_test(request, {}, EXPECT_LOADED,
+                        `Valid signature (${request.signature}), no integrity check: loads.`);
+    generate_fetch_test(request, {integrity:`ed25519-${kValidKeys['rfc']}`}, EXPECT_LOADED,
+                        `Valid signature (${request.signature}), matching integrity check: loads.`);
+
+    generate_fetch_test(request, {integrity:`ed25519-${kInvalidKey}`}, EXPECT_BLOCKED,
+                        `Valid signature (${request.signature}), mismatched integrity check: blocked.`);
+
+    // <script>:
+    generate_script_test(request, "", EXPECT_LOADED,
+                        `Valid signature (${request.signature}), no integrity check: loads.`);
+    generate_script_test(request, `ed25519-${kValidKeys['rfc']}`, EXPECT_LOADED,
+                        `Valid signature (${request.signature}), matching integrity check: loads.`);
+    generate_script_test(request, `ed25519-${kInvalidKey}`, EXPECT_BLOCKED,
+                        `Valid signature (${request.signature}), mismatched integrity check: blocked.`);
+}
diff --git a/tests/wpt/tests/subresource-integrity/tentative/integrity-policy/parsing.https.html b/tests/wpt/tests/subresource-integrity/tentative/integrity-policy/parsing.https.html
new file mode 100644
index 00000000000..205854419a7
--- /dev/null
+++ b/tests/wpt/tests/subresource-integrity/tentative/integrity-policy/parsing.https.html
@@ -0,0 +1,119 @@
+<!doctype html>
+<head>
+  <meta name="timeout" content="long">
+  <meta name="variant" content="?type=enforce">
+  <meta name="variant" content="?type=report">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/dispatcher/dispatcher.js"></script>
+  <script src="/common/utils.js"></script>
+  <script src="/reporting/resources/report-helper.js"></script>
+</head>
+<body>
+<script>
+
+  const run_test = (test_case) => {
+    promise_test(async () => {
+      const REMOTE_EXECUTOR =
+        `/common/dispatcher/remote-executor.html?pipe=`;
+
+      let header_name = "Integrity-Policy";
+      const params = new URLSearchParams(location.search);
+      if (params.get('type') === "report") {
+        if (test_case.expected.blocked) {
+          return;
+        }
+        header_name += "-Report-Only";
+      }
+      const iframe_uuid = token();
+      const header =
+        `header(${header_name},${test_case.header_value})`;
+      const iframe_url =
+        `${REMOTE_EXECUTOR}${encodeURIComponent(header)}&uuid=${iframe_uuid}`;
+
+      const iframe = document.createElement('iframe');
+      iframe.src = iframe_url;
+      document.body.appendChild(iframe);
+
+      // Execute code directly from the iframe.
+      const ctx = new RemoteContext(iframe_uuid);
+      const result = await ctx.execute_script(async (test_case) => {
+        const resource_url = "/content-security-policy/resources/ran.js";
+        let report_observed_promise;
+
+        // Load a script with no integrity. If there's a policy in place, it
+        // would be blocked.
+        const loaded = await new Promise(resolve => {
+          const script = document.createElement('script');
+          script.onload = () => { resolve(true); };
+          script.onerror = () => { resolve(false); };
+          script.src = resource_url;
+          document.body.appendChild(script);
+        });
+        return { blocked: !loaded, ran: window.ran };
+      }, [test_case]);
+      assert_equals(!result.blocked, !!result.ran);
+      assert_equals(result.blocked, test_case.expected.blocked);
+    }, test_case.description);
+  };
+
+  const test_cases = [
+    {
+      description: "Ensure that test is working with a valid destination",
+      header_value: "blocked-destinations=\\(script\\)",
+      expected: {blocked: true},
+    },
+    {
+      description: "Ensure that test is working with a valid destination and source",
+      header_value: "blocked-destinations=\\(script\\)\\, sources=\\(inline\\)",
+      expected: {blocked: true},
+    },
+    {
+      description: "Ensure that an empty header does not block",
+      header_value: "",
+      expected: {blocked: false},
+    },
+    {
+      description: "Ensure that a destination header with a token value does not parse",
+      header_value: "blocked-destinations=script",
+      expected: {blocked: false},
+    },
+    {
+      description: "Ensure that a destination header with an inner list of strings does not parse",
+      header_value: 'blocked-destinations=\\("script"\\)',
+      expected: {blocked: false},
+    },
+    {
+      description: "Ensure that a destination header with an inner list of single-quote strings does not parse",
+      header_value: "blocked-destinations=\\('script'\\)",
+      expected: {blocked: false},
+    },
+    {
+      description: "Ensure that a destination header with an unclosed inner list does not parse",
+      header_value: "blocked-destinations=\\(script",
+      expected: {blocked: false},
+    },
+    {
+      description: "Ensure that a destination header with a malformed inner list does not parse",
+      header_value: "blocked-destinations=\\(script\\,style\\)",
+      expected: {blocked: false},
+    },
+    {
+      description: "Ensure that an unknown destination does not enforce a policy",
+      header_value: "blocked-destinations=\\(style\\)",
+      expected: {blocked: false},
+    },
+    {
+      description: "Ensure that an unknown source causes the policy to not be enforced",
+      header_value: "blocked-destinations=\\(script\\)\\, sources=\\(telepathy\\)",
+      expected: {blocked: false},
+    },
+    {
+      description: "Ensure that an invalid source causes the policy to not be enforced",
+      header_value: "blocked-destinations=\\(script\\)\\, sources=\\(invalid",
+      expected: {blocked: false},
+    },
+  ];
+  test_cases.map(run_test);
+</script>
+
diff --git a/tests/wpt/tests/subresource-integrity/tentative/integrity-policy/script.https.html b/tests/wpt/tests/subresource-integrity/tentative/integrity-policy/script.https.html
new file mode 100644
index 00000000000..783374db920
--- /dev/null
+++ b/tests/wpt/tests/subresource-integrity/tentative/integrity-policy/script.https.html
@@ -0,0 +1,239 @@
+<!doctype html>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/reporting/resources/report-helper.js"></script>
+
+<body>
+<script>
+  const {ORIGIN} = get_host_info();
+  const getAbsoluteUrl = url => {
+    return new URL(url, window.location.href).href;
+  }
+
+  const check_report = async (reporting_endpoint, reporting_uuid, iframe_url, url, report_only) => {
+    const reports = await pollReports(reporting_endpoint, reporting_uuid);
+    const abs_iframe_url = getAbsoluteUrl(iframe_url);
+    checkReportExists(reports, 'integrity-violation', abs_iframe_url);
+    const abs_blocked_url = getAbsoluteUrl(url);
+    const report = getReport(reports, 'integrity-violation', abs_iframe_url, abs_blocked_url);
+    assert_not_equals(report, null);
+    assert_equals(report.body.documentURL, abs_iframe_url);
+    assert_equals(report.body.blockedURL, abs_blocked_url);
+    assert_equals(report.body.destination, "script");
+    assert_equals(report.body.reportOnly, report_only);
+  };
+  const blob = new Blob([`window.ran=true;`],
+                        { type: 'application/javascript' });
+
+  const blob_url = URL.createObjectURL(blob);
+
+  // Generated using https://sha2.it/ed25519.html (In Chrome Canary, with Experimental Web Platform Features enabled)
+  const signature = encodeURIComponent(
+    'header(Unencoded-Digest, sha-384=:tqyFpeo21WFM8HDeUtLqH20GUq\/q3D1R6mqTzW3RtyTZ3dAYZJhC1wUcnkgOE2ak:)' +
+    '|header(Signature-Input, signature=\\("unencoded-digest";sf\\); keyid="JrQLj5P\/89iXES9+vFgrIy29clF9CC\/oPPsw3c5D0bs="; tag="sri")' +
+    '|header(Signature, signature=:qM19uLskHm2TQG5LJcH/hY0n0BWWzYOJztVWYlwk0cZb3u0JdgUMre1J4Jn8Tma0x2u5/kPBfbXRMbB+X+vTBw==:)');
+
+  const test_cases = [
+    {
+      description: "Ensure that a script without integrity did not run",
+      url: "/content-security-policy/resources/ran.js",
+      cross_origin: true,
+      integrity: "",
+      policy_violation: true,
+      block: true,
+      endpoints: true,
+      expected: {blocked: ORIGIN + "/content-security-policy/resources/ran.js", ran: false },
+    },
+    {
+      description: "Ensure that a script with unknown integrity algorithm did not run",
+      url: "/content-security-policy/resources/ran.js",
+      cross_origin: true,
+      integrity: "foobar-AAAAAAAAAAAAAAAAAAAa",
+      policy_violation: true,
+      block: true,
+      endpoints: true,
+      expected: {blocked: ORIGIN + "/content-security-policy/resources/ran.js", ran: false },
+    },
+    {
+      description: "Ensure that a script without integrity algorithm runs and gets reported in report-only mode",
+      url: "/content-security-policy/resources/ran.js",
+      cross_origin: true,
+      integrity: "",
+      policy_violation: true,
+      block: false,
+      endpoints: true,
+      expected: {blocked: ORIGIN + "/content-security-policy/resources/ran.js", ran: true },
+    },
+    {
+      description: "Ensure that a no-cors script gets blocked",
+      url: "/content-security-policy/resources/ran.js",
+      cross_origin: false,
+      integrity: "sha384-tqyFpeo21WFM8HDeUtLqH20GUq/q3D1R6mqTzW3RtyTZ3dAYZJhC1wUcnkgOE2ak",
+      policy_violation: true,
+      block: true,
+      endpoints: true,
+      expected: {blocked: ORIGIN + "/content-security-policy/resources/ran.js", ran: false },
+    },
+    {
+      description: "Ensure that ReportingObserver gets called without endpoints",
+      url: "/content-security-policy/resources/ran.js",
+      cross_origin: false,
+      integrity: "sha384-tqyFpeo21WFM8HDeUtLqH20GUq/q3D1R6mqTzW3RtyTZ3dAYZJhC1wUcnkgOE2ak",
+      policy_violation: true,
+      block: true,
+      endpoints: false,
+      expected: {blocked: ORIGIN + "/content-security-policy/resources/ran.js", ran: false },
+    },
+    {
+      description: "Ensure that a script with integrity runs",
+      url: "/content-security-policy/resources/ran.js",
+      cross_origin: true,
+      integrity: "sha384-tqyFpeo21WFM8HDeUtLqH20GUq/q3D1R6mqTzW3RtyTZ3dAYZJhC1wUcnkgOE2ak",
+      policy_violation: false,
+      block: true,
+      endpoints: true,
+      expected: {blocked: "", ran: true },
+    },
+    {
+      description: "Ensure that a script with signature integrity runs",
+      url: "/content-security-policy/resources/ran.js?pipe=" + signature,
+      cross_origin: true,
+      integrity: "ed25519-JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=",
+      policy_violation: false,
+      block: true,
+      endpoints: true,
+      expected: {blocked: "", ran: true },
+    },
+    {
+      description: "Ensure that a data URI script with no integrity runs",
+      url: "data:application/javascript,window.ran=true",
+      cross_origin: true,
+      integrity: "",
+      policy_violation: false,
+      block: true,
+      endpoints: true,
+      expected: {blocked: "", ran: true },
+    },
+    {
+      description: "Ensure that a no-CORS data URI script with no integrity runs",
+      url: "data:application/javascript,window.ran=true",
+      cross_origin: false,
+      integrity: "",
+      policy_violation: false,
+      block: true,
+      endpoints: true,
+      expected: {blocked: "", ran: true },
+    },
+    {
+      description: "Ensure that a blob URL script with no integrity runs",
+      url: blob_url,
+      cross_origin: true,
+      integrity: "",
+      policy_violation: false,
+      block: true,
+      endpoints: true,
+      expected: {blocked: "", ran: true },
+    },
+    {
+      description: "Ensure that a no-CORS blob URL script with no integrity runs",
+      url: blob_url,
+      cross_origin: false,
+      integrity: "",
+      policy_violation: false,
+      block: true,
+      endpoints: true,
+      expected: {blocked: "", ran: true },
+    }
+  ];
+  test_cases.map(test_case => {
+    promise_test(async () => {
+      const REMOTE_EXECUTOR =
+        `/common/dispatcher/remote-executor.html?pipe=`;
+      const iframe_uuid = token();
+
+      const params = new URLSearchParams(location.search);
+      if (params.get('type') === "report") {
+        if (test_case.expected.blocked) {
+          return;
+        }
+        header_name += "-Report-Only";
+      }
+      const reporting_uuid_1 = token();
+      const reporting_uuid_2 = token();
+      const reporting_uuid_3 = token();
+      const reporting_endpoint = `${ORIGIN}/reporting/resources/report.py`;
+      let header = "";
+      if (test_case.block) {
+        header +=
+          `header(Integrity-Policy,blocked-destinations=\\(script\\)\\, endpoints=\\(integrity-endpoint-1 integrity-endpoint-2\\))`;
+      }
+      header +=
+        `|header(Integrity-Policy-Report-Only,blocked-destinations=\\(script\\)\\, endpoints=\\(integrity-endpoint-3\\))`;
+      if (test_case.endpoints) {
+        header +=
+          `|header(Reporting-Endpoints, integrity-endpoint-1=\"${reporting_endpoint}?reportID=${reporting_uuid_1}\"\\, ` +
+          `integrity-endpoint-2=\"${reporting_endpoint}?reportID=${reporting_uuid_2}\"\\, ` +
+          `integrity-endpoint-3=\"${reporting_endpoint}?reportID=${reporting_uuid_3}\")`;
+      }
+      const iframe_url = `${REMOTE_EXECUTOR}${encodeURIComponent(header)}&uuid=${iframe_uuid}`;
+
+      const iframe = document.createElement('iframe');
+      iframe.src = iframe_url;
+      document.body.appendChild(iframe);
+
+      // Execute code directly from the iframe.
+      const ctx = new RemoteContext(iframe_uuid);
+      const result = await ctx.execute_script(async (test_case) => {
+        window.ran = false;
+        let report_observed_promise;
+        if (test_case.policy_violation) {
+           report_observed_promise = new Promise(r => {
+            (new ReportingObserver((reports, observer) => {
+              reports.forEach(report => {
+                if (report.body.blockedURL.endsWith(test_case.url)) {
+                  r(report.body);
+                  observer.disconnect();
+                }
+              });
+            })).observe('integrity-violation');
+          });
+        }
+
+        // Load the script
+        await new Promise(resolve => {
+          const script = document.createElement('script');
+          if (test_case.cross_origin) {
+            script.crossOrigin="anonymous";
+          }
+          if (test_case.integrity) {
+            script.integrity = test_case.integrity;
+          }
+          script.onload = resolve;
+          script.onerror = resolve;
+          script.src = test_case.url;
+          document.body.appendChild(script);
+        });
+        const report_body = await report_observed_promise;
+        return { body: report_body, ran: window.ran };
+      }, [test_case]);
+      assert_equals(result.ran, test_case.expected.ran);
+      if (test_case.policy_violation) {
+        assert_equals(result.body.blockedURL, test_case.expected.blocked);
+        assert_true(result.body.documentURL.endsWith(iframe_url));
+        assert_equals(result.body.destination, "script");
+        assert_equals(result.body.reportOnly, !test_case.block);
+      }
+      if (test_case.endpoints && test_case.policy_violation) {
+        if (test_case.block) {
+          await check_report(reporting_endpoint, reporting_uuid_1, iframe_url, test_case.url, !test_case.block);
+          await check_report(reporting_endpoint, reporting_uuid_2, iframe_url, test_case.url, !test_case.block);
+        }
+        await check_report(reporting_endpoint, reporting_uuid_3, iframe_url, test_case.url, true);
+      }
+    }, test_case.description);
+  });
+</script>
diff --git a/tests/wpt/tests/svg-aam/META.yml b/tests/wpt/tests/svg-aam/META.yml
index b0a59c18030..c55d09e15c2 100644
--- a/tests/wpt/tests/svg-aam/META.yml
+++ b/tests/wpt/tests/svg-aam/META.yml
@@ -1,3 +1,4 @@
 spec: https://w3c.github.io/svg-aam/
 suggested_reviewers:
   - cookiecrook
+  - sideshowbarker
diff --git a/tests/wpt/tests/svg/animations/discard-check-removal-order.html b/tests/wpt/tests/svg/animations/discard-check-removal-order.html
deleted file mode 100644
index 2935a69adda..00000000000
--- a/tests/wpt/tests/svg/animations/discard-check-removal-order.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<title>This tests for the remove order of discard elements.</title>
-<link rel="help" href="https://svgwg.org/specs/animations/#DiscardElement">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/SVGAnimationTestCase-testharness.js"></script>
-
-<body>
-  <div id="removeOrder"></div>
-  <svg id="svg" width="400" height="400">
-    <rect id="rect" width="100" height="100" fill="green" />
-    <animate id="animate" href="#rect" attributeName="x" from="0" to="300" dur="10s" />
-  </svg>
-  <script>
-    const rootSVGElement = document.querySelector('svg');
-
-    let removedNodes = new Array();
-    let callback = function(mutations) {
-      mutations.forEach(function(mutation) {
-        let nodeList = mutation.removedNodes;
-        for (let i = 0; i < nodeList.length; ++i) {
-          removedNodes.push(nodeList[i].nodeName);
-        }
-      });
-    };
-    let observer = new MutationObserver(callback);
-    observer.observe(rootSVGElement, { 'childList': true, 'subtree': true });
-
-    function checkRemovedNodes(array) {
-      assert_array_equals(removedNodes, array, 'removed nodes');
-    }
-
-    function discardElement(id) {
-      let discard = createSVGElement("discard");
-      discard.setAttribute("href", "#" + id);
-      rootSVGElement.appendChild(discard);
-    }
-
-    discardElement("animate");
-    discardElement("rect");
-
-    smil_async_test(t => {
-      runAnimationTest(t, [
-        // [animationId, time, sampleCallback]
-        ['anim', 1, checkRemovedNodes.bind(this, ['animate', 'discard', 'rect', 'discard'])],
-      ]);
-    });
-    window.animationStartsImmediately = true;
-  </script>
-</body>
-</html>
diff --git a/tests/wpt/tests/svg/animations/historical.html b/tests/wpt/tests/svg/animations/historical.html
new file mode 100644
index 00000000000..2a807125296
--- /dev/null
+++ b/tests/wpt/tests/svg/animations/historical.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>Historical features of SVG Animation</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<svg width="100" height="100" id="test-discard">
+  <rect x="0" y="0" width="50" height="50" fill="black" transform="translate(0, 0)">
+    <animateTransform attributeName="transform" begin="0s" dur="0.1s" from="0, 0" to="50, 50"/>
+    <discard begin="0.1s"/>
+  </rect>
+</svg>
+
+<script>
+async_test(t => {
+  const testDiscardEl = document.getElementById('test-discard');
+  t.step_timeout(() => {
+    for (const tag of ["rect", "animateTransform", "discard"]) {
+      assert_not_equals(testDiscardEl.querySelector(tag), null, tag);
+    }
+    t.done();
+  }, 500);
+}, 'discard element');
+
+test(() => {
+  assert_equals(window.SVGDiscardElement, undefined);
+}, 'SVGDiscardElement');
+</script>
diff --git a/tests/wpt/tests/svg/animations/reftests/discard-check-remove-duplicate.svg b/tests/wpt/tests/svg/animations/reftests/discard-check-remove-duplicate.svg
deleted file mode 100644
index e99e7b0e577..00000000000
--- a/tests/wpt/tests/svg/animations/reftests/discard-check-remove-duplicate.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<svg onload="startTest()" xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml" class="reftest-wait">
-  <title>discard element removes the element it references and itself</title>
-  <h:link rel="help" href="https://svgwg.org/specs/animations/#DiscardElement"/>
-  <h:link rel="match" href="reference/green-100x100.svg"/>
-  <h:script src="/common/rendering-utils.js"/>
-  <h:script src="/common/reftest-wait.js"/>
-
-  <rect id="r1" width="100" height="100" fill="green"/>
-  <rect id="r2" width="100" height="100" fill="red" />
-  <discard id="discard1" href="#r2" begin="2s"/>
-  <discard id="discard2" href="#r2" begin="2s"/>
-  <set attributeName="display" to="inline" begin="2.01s" dur="1s" fill="freeze" onbegin="checkDelete()"/>
-
-  <script>
-    function startTest() {
-      document.documentElement.setCurrentTime(2);
-    }
-
-    function checkDelete() {
-      let d1 = document.getElementById("discard1");
-      let d2 = document.getElementById("discard2");
-      let r2 = document.getElementById("r2");
-
-      if (d1 || d2 || r2) {
-        document.getElementById("r1").setAttribute("fill", "orange");
-      }
-      takeScreenshot();
-    }
-  </script>
-</svg>
diff --git a/tests/wpt/tests/svg/animations/reftests/discard-check-remove-duplicate2.svg b/tests/wpt/tests/svg/animations/reftests/discard-check-remove-duplicate2.svg
deleted file mode 100644
index aae13b64988..00000000000
--- a/tests/wpt/tests/svg/animations/reftests/discard-check-remove-duplicate2.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<svg onload="startTest()" xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml" class="reftest-wait">
-  <title>discard element removes the element it references and itself</title>
-  <h:link rel="help" href="https://svgwg.org/specs/animations/#DiscardElement"/>
-  <h:link rel="match" href="reference/green-100x100.svg"/>
-  <h:script src="/common/rendering-utils.js"/>
-  <h:script src="/common/reftest-wait.js"/>
-
-  <rect id="r1" width="100" height="100" fill="yellow"/>
-  <rect id="r2" width="100" height="100" fill="red" />
-  <rect id="r2" x="0" width="100" height="100" fill="red" />
-  <discard id="discard1" href="#r2" begin="2s"/>
-  <discard id="discard2" href="#r2" begin="2s"/>
-  <set attributeName="display" to="inline" begin="2.01s" dur="1s" fill="freeze" onbegin="checkDelete()"/>
-
-  <script><![CDATA[
-    function startTest() {
-      document.documentElement.setCurrentTime(2);
-    }
-
-    function checkDelete() {
-      let d1 = document.getElementById("discard1");
-      let d2 = document.getElementById("discard2");
-      let r2 = document.getElementById("r2");
-
-      if (d1 || d2) {
-        document.getElementById("r1").setAttribute("fill", "orange");
-      }
-      if (r2 && r2.hasAttribute("x")) {
-        document.getElementById("r2").setAttribute("fill", "green");
-      }
-      takeScreenshot();
-    }
-  ]]></script>
-</svg>
diff --git a/tests/wpt/tests/svg/animations/reftests/discard-check-remove-replace.svg b/tests/wpt/tests/svg/animations/reftests/discard-check-remove-replace.svg
deleted file mode 100644
index efca35c1368..00000000000
--- a/tests/wpt/tests/svg/animations/reftests/discard-check-remove-replace.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<svg onload="startTest()" xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml" class="reftest-wait">
-  <title>discard element removes the element it references and itself</title>
-  <h:link rel="help" href="https://svgwg.org/specs/animations/#DiscardElement"/>
-  <h:link rel="match" href="reference/green-100x100.svg"/>
-  <h:script src="/common/rendering-utils.js"/>
-  <h:script src="/common/reftest-wait.js"/>
-
-  <rect id="r1" width="100" height="100" fill="orange"/>
-  <rect id="r2" width="100" height="100" fill="red" />
-  <discard href="#r2" begin="2s"/>
-  <set attributeName="display" to="inline" begin="2.01s" dur="1s" fill="freeze" onbegin="checkDelete()"/>
-
-  <script>
-    let r2 = document.getElementById("r2");
-
-    function startTest() {
-      document.documentElement.setCurrentTime(2);
-    }
-
-    function checkDelete() {
-      document.documentElement.appendChild(r2);
-      r2.setAttribute("fill", "green");
-      takeScreenshot();
-    }
-  </script>
-</svg>
diff --git a/tests/wpt/tests/svg/animations/reftests/discard-check-remove-replace2.svg b/tests/wpt/tests/svg/animations/reftests/discard-check-remove-replace2.svg
deleted file mode 100644
index 20c61bb985c..00000000000
--- a/tests/wpt/tests/svg/animations/reftests/discard-check-remove-replace2.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<svg onload="startTest()" xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml" class="reftest-wait">
-  <title>discard element removes the element it references and itself</title>
-  <h:link rel="help" href="https://svgwg.org/specs/animations/#DiscardElement"/>
-  <h:link rel="match" href="reference/green-100x100.svg"/>
-  <h:script src="/common/rendering-utils.js"/>
-  <h:script src="/common/reftest-wait.js"/>
-
-  <rect id="r1" width="100" height="100" fill="green"/>
-  <rect id="r2" width="100" height="100" fill="red" />
-  <discard id="discard" href="#r2" begin="2s"/>
-  <set attributeName="display" to="inline" begin="2.01s" dur="1s" fill="freeze" onbegin="undelete()"/>
-  <set attributeName="display" to="inline" begin="2.02s" dur="1s" fill="freeze" onbegin="checkDelete()"/>
-
-  <script>
-    let r2 = document.getElementById("r2");
-    let discard = document.getElementById("discard");
-
-    function startTest() {
-      document.documentElement.setCurrentTime(2);
-    }
-
-    function undelete() {
-      document.documentElement.appendChild(r2);
-      document.documentElement.appendChild(discard);
-    }
-
-    function checkDelete() {
-      takeScreenshot();
-    }
-  </script>
-</svg>
diff --git a/tests/wpt/tests/svg/animations/reftests/discard-check-remove.svg b/tests/wpt/tests/svg/animations/reftests/discard-check-remove.svg
deleted file mode 100644
index a63eee29c93..00000000000
--- a/tests/wpt/tests/svg/animations/reftests/discard-check-remove.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<svg onload="startTest()" xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml" class="reftest-wait">
-  <title>discard element removes the element it references and itself</title>
-  <h:link rel="help" href="https://svgwg.org/specs/animations/#DiscardElement"/>
-  <h:link rel="match" href="reference/green-100x100.svg"/>
-  <h:script src="/common/rendering-utils.js"/>
-  <h:script src="/common/reftest-wait.js"/>
-
-  <rect id="r1" width="100" height="100" fill="green"/>
-  <rect id="r2" width="100" height="100" fill="red" />
-  <discard id="discard1" href="#r2" begin="2s"/>
-  <set attributeName="display" to="inline" begin="2.01s" dur="1s" fill="freeze" onbegin="checkDelete()"/>
-
-  <script>
-    function startTest() {
-      document.documentElement.setCurrentTime(2);
-    }
-
-    function checkDelete() {
-      let d1 = document.getElementById("discard1");
-      let r2 = document.getElementById("r2");
-
-      if (d1 || r2) {
-        document.getElementById("r1").setAttribute("fill", "orange");
-      }
-      takeScreenshot();
-    }
-  </script>
-</svg>
diff --git a/tests/wpt/tests/svg/animations/reftests/discard-check-remove2.html b/tests/wpt/tests/svg/animations/reftests/discard-check-remove2.html
deleted file mode 100644
index 92ecaec9d21..00000000000
--- a/tests/wpt/tests/svg/animations/reftests/discard-check-remove2.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!doctype html>
-<html class="reftest-wait">
-<head>
-  <meta charset="utf-8">
-  <title>discard element removes the element it references and itself</title>
-  <script src="/common/rendering-utils.js"></script>
-  <script src="/common/reftest-wait.js"></script>
-  <link rel="help" href="https://svgwg.org/specs/animations/#DiscardElement">
-  <link rel="match" href="reference/green-100x100.svg">
-</head>
-<body>
-  <style>
-    html, body, svg {
-      padding: 0;
-      margin: 0;
-    }
-  </style>
-  <svg onload="startTest()">
-    <rect id="r1" width="100" height="100" fill="green"/>
-    <rect id="r2" width="100" height="100" fill="red" />
-    <discard id="discard1" href="#r2" begin="2s"/>
-    <set attributeName="display" to="inline" begin="2.01s" dur="1s" fill="freeze" onbegin="checkDelete()"/>
-
-    <script>
-      function startTest() {
-        document.documentElement.setCurrentTime(2);
-      }
-
-      function checkDelete() {
-        let d1 = document.getElementById("discard1");
-        let r2 = document.getElementById("r2");
-
-        if (d1 || r2) {
-          document.getElementById("r1").setAttribute("fill", "orange");
-        }
-        takeScreenshot();
-      }
-    </script>
-  </svg>
-</body>
-</html>
diff --git a/tests/wpt/tests/svg/animations/reftests/discard-rect-as-child.svg b/tests/wpt/tests/svg/animations/reftests/discard-rect-as-child.svg
deleted file mode 100644
index 93e14c0d73e..00000000000
--- a/tests/wpt/tests/svg/animations/reftests/discard-rect-as-child.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<svg onload="startTest()" xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml" class="reftest-wait">
-  <title>discard element removes its parent by default</title>
-  <h:link rel="help" href="https://svgwg.org/specs/animations/#DiscardElement"/>
-  <h:link rel="match" href="reference/green-100x100.svg"/>
-  <h:script src="/common/rendering-utils.js"/>
-  <h:script src="/common/reftest-wait.js"/>
-  <rect width="100" height="100" fill="green"/>
-  <rect width="100" height="100" fill="red">
-    <discard begin="2s"/>
-  </rect>
-  <script>
-    function startTest() {
-      document.documentElement.setCurrentTime(4);
-      takeScreenshot();
-    }
-  </script>
-</svg>
diff --git a/tests/wpt/tests/svg/animations/reftests/discard-rect-as-href.svg b/tests/wpt/tests/svg/animations/reftests/discard-rect-as-href.svg
deleted file mode 100644
index e9cf560991e..00000000000
--- a/tests/wpt/tests/svg/animations/reftests/discard-rect-as-href.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<svg onload="startTest()" xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml" class="reftest-wait">
-  <title>discard element removes the element it references</title>
-  <h:link rel="help" href="https://svgwg.org/specs/animations/#DiscardElement"/>
-  <h:link rel="match" href="reference/green-100x100.svg"/>
-  <h:script src="/common/rendering-utils.js"/>
-  <h:script src="/common/reftest-wait.js"/>
-  <rect width="100" height="100" fill="green"/>
-  <rect id="r2" width="100" height="100" fill="red"/>
-  <discard id="discard1" href="#r2" begin="2s"/>
-  <script>
-    function startTest() {
-      document.documentElement.setCurrentTime(4);
-      takeScreenshot();
-    }
-  </script>
-</svg>
diff --git a/tests/wpt/tests/svg/animations/reftests/discard-rect-with-anim-child-a.svg b/tests/wpt/tests/svg/animations/reftests/discard-rect-with-anim-child-a.svg
deleted file mode 100644
index 57e6cb2d442..00000000000
--- a/tests/wpt/tests/svg/animations/reftests/discard-rect-with-anim-child-a.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<svg onload="startTest()" xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml" class="reftest-wait">
-  <title>discard element removes its parent by default</title>
-  <h:link rel="help" href="https://svgwg.org/specs/animations/#DiscardElement"/>
-  <h:link rel="match" href="reference/green-100x100.svg"/>
-  <h:script src="/common/rendering-utils.js"/>
-  <h:script src="/common/reftest-wait.js"/>
-  <rect width="100" height="100" fill="green"/>
-  <rect width="100" height="100" fill="blue">
-    <set attributeName="fill" to="red" begin="2s" fill="freeze" />
-    <discard id="discard1" begin="4s"/>
-  </rect>
-  <script>
-    function startTest() {
-      document.documentElement.setCurrentTime(4);
-      takeScreenshot();
-    }
-  </script>
-</svg>
diff --git a/tests/wpt/tests/svg/animations/reftests/discard-rect-with-anim-child-b.svg b/tests/wpt/tests/svg/animations/reftests/discard-rect-with-anim-child-b.svg
deleted file mode 100644
index 5b1fc113c4f..00000000000
--- a/tests/wpt/tests/svg/animations/reftests/discard-rect-with-anim-child-b.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<svg onload="startTest()" xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml" class="reftest-wait">
-  <title>discard element removes its parent by default</title>
-  <h:link rel="help" href="https://svgwg.org/specs/animations/#DiscardElement"/>
-  <h:link rel="match" href="reference/green-100x100.svg"/>
-  <h:script src="/common/rendering-utils.js"/>
-  <h:script src="/common/reftest-wait.js"/>
-  <rect width="100" height="100" fill="green"/>
-  <rect width="100" height="100" fill="blue">
-    <set attributeName="fill" to="red" begin="4s" fill="freeze" />
-    <discard begin="2s"/>
-  </rect>
-  <script>
-    function startTest() {
-      document.documentElement.setCurrentTime(4);
-      takeScreenshot();
-    }
-  </script>
-</svg>
diff --git a/tests/wpt/tests/svg/coordinate-systems/viewBox-synthesized-in-img-001-ref.html b/tests/wpt/tests/svg/coordinate-systems/viewBox-synthesized-in-img-001-ref.html
new file mode 100644
index 00000000000..306b4f6b191
--- /dev/null
+++ b/tests/wpt/tests/svg/coordinate-systems/viewBox-synthesized-in-img-001-ref.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Reference Case</title>
+<link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+<style>
+  div.img-mockup {
+    border: 1px solid black;
+    margin: 2px;
+    vertical-align: top;
+    display: inline-block;
+  }
+</style>
+<body>
+<script>
+  // This is the <rect> width and height in the testcase's data URI.
+  const RECT_SIZE = 6;
+  // This is the <rect> x/y position in the testcase's data URI.
+  const RECT_POS = 2;
+
+  // Determines the scale factor that we expect to apply to our SVG in a given
+  // axis, based on the specified size (width or height) of the SVG element and
+  // the img element in that axis, and based on whether we expect a viewBox to
+  // be synthesized at all.
+  function getExpectedScaleInAxis(svgSize, imgSize, shouldSynthesizeViewBox) {
+    if (shouldSynthesizeViewBox && svgSize == 10) {
+      // We'll be synthesizing a viewBox, and it'll be scaling our SVG content
+      // in this axis to fit the image size, so we need to scale up the size
+      // that we'll use for our mockup.
+      return imgSize / svgSize;
+    }
+    // Otherwise, we expect to render the SVG content at a 1.0 scale in this
+    // axis.
+    return 1.0;
+  }
+  function makeRectMockup(svgWidth, svgHeight,
+                          imgWidth, imgHeight) {
+    let fakeRect = document.createElement("div");
+    fakeRect.style.backgroundColor = "blue";
+
+    // Size/position the rect based on the scale that we expect the SVG
+    // content to be rendered at in each axis.  To inform that expectation,
+    // first decide whether we expect a synthesized viewBox: we expect
+    // the testcase's SVG-as-an-image document to synthesize a viewBox from
+    // the width and/or height *unless* that viewBox would be empty
+    // (zero-sized) in some axis.
+    let shouldSynthesizeViewBox = svgWidth != 0 && svgHeight != 0;
+
+    // Now compute the expected scale in each axis using a helper function:
+    let horizScale = getExpectedScaleInAxis(svgWidth, imgWidth,
+                                            shouldSynthesizeViewBox);
+    let vertScale = getExpectedScaleInAxis(svgHeight, imgHeight,
+                                           shouldSynthesizeViewBox);
+
+    fakeRect.style.width = `${RECT_SIZE * horizScale}px`;
+    fakeRect.style.height = `${RECT_SIZE * vertScale}px`;
+    fakeRect.style.marginLeft = `${RECT_POS * horizScale}px`;
+    fakeRect.style.marginTop = `${RECT_POS * vertScale}px`;
+    return fakeRect;
+  }
+
+  // To make the logic simpler, we just use 0 here for all of the testcase's
+  // sizes that we expect to behave like 0 (e.g. 0%, -5, -5%).
+  const SVG_SIZE_VALS_TO_TEST = [ null, 0, 0, 0, 0, 10 ];
+  const IMG_SIZE_VALS_TO_TEST = [ 20, 30 ];
+
+  function go() {
+    // We group our elements into rows with a particular number of items,
+    // to make sure things fit nicely/predictably into the WPT viewport:
+    const NUM_ELEMS_PER_ROW = 12;
+    let elemIdx = 0;
+    let container;
+
+    for (iw of IMG_SIZE_VALS_TO_TEST) {
+      for (ih of IMG_SIZE_VALS_TO_TEST) {
+        for (sw of SVG_SIZE_VALS_TO_TEST) {
+          for (sh of SVG_SIZE_VALS_TO_TEST) {
+            // Generate a new container element at the start and every N elems:
+            if (elemIdx % NUM_ELEMS_PER_ROW == 0) {
+              container = document.createElement("div");
+              document.body.appendChild(container);
+            }
+            elemIdx++;
+
+            // Mockup for the img element:
+            const fakeImg = document.createElement("div");
+            fakeImg.classList.add("img-mockup");
+            fakeImg.style.width = `${iw}px`;
+            fakeImg.style.height = `${ih}px`;
+
+            // Add the mockup for the blue rect inside of the img:
+            fakeImg.appendChild(makeRectMockup(sw, sh, iw, ih));
+
+            container.appendChild(fakeImg);
+          }
+        }
+      }
+    }
+  }
+  go();
+</script>
+</body>
diff --git a/tests/wpt/tests/svg/coordinate-systems/viewBox-synthesized-in-img-001.tentative.html b/tests/wpt/tests/svg/coordinate-systems/viewBox-synthesized-in-img-001.tentative.html
new file mode 100644
index 00000000000..4496be9a5c2
--- /dev/null
+++ b/tests/wpt/tests/svg/coordinate-systems/viewBox-synthesized-in-img-001.tentative.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<meta name="timeout" content="long">
+<title>Testcase for SVG viewBox synthesis when SVG is used as an image</title>
+<link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+<link rel="help" href="https://www.w3.org/TR/SVG/coords.html#ViewBoxAttribute">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1916030">
+<link rel="match" href="viewBox-synthesized-in-img-001-ref.html">
+<style>
+  img {
+    border: 1px solid black;
+    margin: 2px;
+    vertical-align: top;
+  }
+</style>
+<body>
+<script>
+  function makeDataURI(width, height) {
+    let uri = "data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'";
+    if (width != "") {
+      uri += ` width='${width}'`;
+    }
+    if (height != "") {
+      uri += ` height='${height}'`;
+    }
+    uri += "><rect fill='blue' x='2' y='2' height='6' width='6'/></svg>";
+    return uri;
+  }
+
+  // Note: negative numbers here are equivalent to 0, for the purposes of
+  // what we're testing here. We test both for robustness.
+  const SVG_SIZE_VALS_TO_TEST = [ "", "0", "0%", "-5", "-5%", "10" ];
+  const IMG_SIZE_VALS_TO_TEST = [ "20", "30" ];
+  function go() {
+    // We group our elements into rows with a particular number of items,
+    // to make sure things fit nicely/predictably into the WPT viewport:
+    const NUM_ELEMS_PER_ROW = 12;
+    let elemIdx = 0;
+    let container;
+
+    for (iw of IMG_SIZE_VALS_TO_TEST) {
+      for (ih of IMG_SIZE_VALS_TO_TEST) {
+        for (sw of SVG_SIZE_VALS_TO_TEST) {
+          for (sh of SVG_SIZE_VALS_TO_TEST) {
+            // Generate a new container element at the start and every N elems:
+            if (elemIdx % NUM_ELEMS_PER_ROW == 0) {
+              container = document.createElement("div");
+              document.body.appendChild(container);
+            }
+            elemIdx++;
+
+            const img = document.createElement("img");
+            img.setAttribute("width", iw);
+            img.setAttribute("height", ih);
+
+            const dataURI = makeDataURI(sw, sh);
+            img.setAttribute("src", dataURI);
+
+            container.appendChild(img);
+          }
+        }
+      }
+    }
+  }
+  go();
+</script>
+</body>
diff --git a/tests/wpt/tests/svg/embedded/WEB_FEATURES.yml b/tests/wpt/tests/svg/embedded/WEB_FEATURES.yml
new file mode 100644
index 00000000000..8482e555584
--- /dev/null
+++ b/tests/wpt/tests/svg/embedded/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: fetch-priority
+  files:
+  - attr-image-fetchpriority.html
diff --git a/tests/wpt/tests/svg/embedded/attr-image-fetchpriority.html b/tests/wpt/tests/svg/embedded/attr-image-fetchpriority.html
new file mode 100644
index 00000000000..b083538a8b8
--- /dev/null
+++ b/tests/wpt/tests/svg/embedded/attr-image-fetchpriority.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<title>Fetch Priority - SVG Image element</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<svg>
+<image id=image1 fetchpriority="high"/>
+<image id=image2 fetchpriority="low"/>
+<image id=image3 fetchpriority="auto"/>
+<image id=image4 fetchpriority="xyz"/>
+<image id=image5 />
+</svg>
+
+<script>
+  test(() => {
+    assert_equals(image1.fetchPriority, "high", "high fetchPriority is a valid IDL value on the image element");
+    assert_equals(image2.fetchPriority, "low", "low fetchPriority is a valid IDL value on the image element");
+    assert_equals(image3.fetchPriority, "auto", "auto fetchPriority is a valid IDL value on the image element");
+    assert_equals(image4.fetchPriority, "auto", "invalid fetchPriority reflects as 'auto' IDL attribute on the image element");
+    assert_equals(image5.fetchPriority, "auto", "missing fetchPriority reflects as 'auto' IDL attribute on the image element");
+  }, "fetchpriority attribute on <image> elements should reflect valid IDL values");
+
+  test(() => {
+    const image = document.createElementNS("http://www.w3.org/2000/svg", "image");
+    assert_equals(image.fetchPriority, "auto");
+  }, "default fetchpriority attribute on <image> elements should be 'auto'");
+</script>
diff --git a/tests/wpt/tests/svg/embedded/image-embedding-nested-data-url-from-canvas-post-window-load.html b/tests/wpt/tests/svg/embedded/image-embedding-nested-data-url-from-canvas-post-window-load.html
new file mode 100644
index 00000000000..92883dc21be
--- /dev/null
+++ b/tests/wpt/tests/svg/embedded/image-embedding-nested-data-url-from-canvas-post-window-load.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<html class=reftest-wait>
+<title>Drawing SVG image with data: URL subresources (after window load event)</title>
+<link rel="match" href="reference/image-with-nested-rects.html">
+<style>
+img {
+  width: 200px;
+  height: 200px;
+  background-color: red;
+}
+</style>
+<img id="result" src="">
+<script>
+const canvas = document.createElement('canvas');
+canvas.width = 200;
+canvas.height = 200;
+const context = canvas.getContext('2d');
+
+context.fillStyle = "red";
+context.fillRect(0, 0, canvas.width, canvas.height);
+
+window.onload = () => {
+  const image = new Image();
+  image.src = "support/image-with-nested-data-url-images.svg?" + Math.random().toString();
+  image.onload = () => {
+    context.drawImage(image, 0, 0, canvas.width, canvas.height);
+    const resultImage = document.getElementById("result");
+    resultImage.src = canvas.toDataURL();
+    resultImage.onload = () => document.documentElement.className = "";
+  }
+};
+</script>
diff --git a/tests/wpt/tests/svg/embedded/image-embedding-nested-data-url-from-canvas-window-load.html b/tests/wpt/tests/svg/embedded/image-embedding-nested-data-url-from-canvas-window-load.html
new file mode 100644
index 00000000000..a86cb251901
--- /dev/null
+++ b/tests/wpt/tests/svg/embedded/image-embedding-nested-data-url-from-canvas-window-load.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<html class=reftest-wait>
+<title>Drawing SVG image with data: URL subresources (window load event)</title>
+<link rel="match" href="reference/image-with-nested-rects.html">
+<style>
+img {
+  width: 200px;
+  height: 200px;
+  background-color: red;
+}
+</style>
+<img id="result" src="">
+<script>
+const canvas = document.createElement('canvas');
+canvas.width = 200;
+canvas.height = 200;
+const context = canvas.getContext('2d');
+
+context.fillStyle = "red";
+context.fillRect(0, 0, canvas.width, canvas.height);
+
+const image = new Image();
+image.src = "support/image-with-nested-data-url-images.svg?" + Math.random().toString();
+
+window.onload = () => {
+  context.drawImage(image, 0, 0, canvas.width, canvas.height);
+  const resultImage = document.getElementById("result");
+  resultImage.src = canvas.toDataURL();
+  resultImage.onload = () => document.documentElement.className = "";
+};
+</script>
diff --git a/tests/wpt/tests/svg/embedded/image-embedding-nested-data-url-from-canvas.html b/tests/wpt/tests/svg/embedded/image-embedding-nested-data-url-from-canvas.html
new file mode 100644
index 00000000000..c935e3eaa9c
--- /dev/null
+++ b/tests/wpt/tests/svg/embedded/image-embedding-nested-data-url-from-canvas.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<html class=reftest-wait>
+<title>Drawing SVG image with data: URL subresources (image load event)</title>
+<link rel="match" href="reference/image-with-nested-rects.html">
+<style>
+img {
+  width: 200px;
+  height: 200px;
+  background-color: red;
+}
+</style>
+<img id="result" src="">
+<script>
+const canvas = document.createElement('canvas');
+canvas.width = 200;
+canvas.height = 200;
+const context = canvas.getContext('2d');
+
+context.fillStyle = "red";
+context.fillRect(0, 0, canvas.width, canvas.height);
+
+const image = new Image();
+image.src = "support/image-with-nested-data-url-images.svg?" + Math.random().toString();
+
+image.onload = () => {
+  context.drawImage(image, 0, 0, canvas.width, canvas.height);
+  const resultImage = document.getElementById("result");
+  resultImage.src = canvas.toDataURL();
+  resultImage.onload = () => document.documentElement.className = "";
+};
+</script>
diff --git a/tests/wpt/tests/svg/embedded/image-embedding-nested-data-url-png.html b/tests/wpt/tests/svg/embedded/image-embedding-nested-data-url-png.html
new file mode 100644
index 00000000000..ff54e38b1a4
--- /dev/null
+++ b/tests/wpt/tests/svg/embedded/image-embedding-nested-data-url-png.html
@@ -0,0 +1,8 @@
+<!doctype html>
+<title>SVG image that uses a PNG data: URL</title>
+<link rel="match" href="../struct/reftests/reference/green-100x100.html">
+<img src="data:image/svg+xml,
+  <svg xmlns='http://www.w3.org/2000/svg' width='100' height='100'>
+    <image href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAZKADAAQAAAABAAAAZAAAAAAvu95BAAABbElEQVR4Ae3TUQ0AIAzE0IFynEOCivfRKWja3ZozdzrGwGZIAvkGCoI9QkEKghnAcFpIQTADGE4LKQhmAMNpIQXBDGA4LaQgmAEMp4UUBDOA4bSQgmAGMJwWUhDMAIbTQgqCGcBwWkhBMAMYTgspCGYAw2khBcEMYDgtpCCYAQynhRQEM4DhtJCCYAYwnBZSEMwAhtNCCoIZwHBaSEEwAxhOCykIZgDDaSEFwQxgOC2kIJgBDKeFFAQzgOG0kIJgBjCcFlIQzACG00IKghnAcFpIQTADGE4LKQhmAMNpIQXBDGA4LaQgmAEMp4UUBDOA4bSQgmAGMJwWUhDMAIbTQgqCGcBwWkhBMAMYTgspCGYAw2khBcEMYDgtpCCYAQynhRQEM4DhtJCCYAYwnBZSEMwAhtNCCoIZwHBaSEEwAxhOCykIZgDDaSEFwQxgOC2kIJgBDKeFFAQzgOG0kIJgBjCcFlIQzACG00KwIA8ybAJHOjWoiwAAAABJRU5ErkJggg=='/>
+  </svg>
+">
diff --git a/tests/wpt/tests/svg/embedded/image-embedding-nested-data-url.html b/tests/wpt/tests/svg/embedded/image-embedding-nested-data-url.html
new file mode 100644
index 00000000000..7e58c3e7e10
--- /dev/null
+++ b/tests/wpt/tests/svg/embedded/image-embedding-nested-data-url.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<title>SVG image that uses a data: URL</title>
+<link rel="match" href="../struct/reftests/reference/green-100x100.html">
+<img src="data:image/svg+xml,
+  <svg xmlns='http://www.w3.org/2000/svg' width='100' height='100'>
+    <image href='data:image/svg+xml,
+      &amp;lt;svg xmlns=&quot;http://www.w3.org/2000/svg&quot;>
+        &amp;lt;rect width=&quot;100&quot; height=&quot;100&quot; fill=&quot;green&quot;/>
+      &amp;lt;/svg>
+    '/>
+  </svg>
+">
diff --git a/tests/wpt/tests/svg/embedded/image-embedding-nested-external-data-url-png.html b/tests/wpt/tests/svg/embedded/image-embedding-nested-external-data-url-png.html
new file mode 100644
index 00000000000..0935507c045
--- /dev/null
+++ b/tests/wpt/tests/svg/embedded/image-embedding-nested-external-data-url-png.html
@@ -0,0 +1,4 @@
+<!doctype html>
+<title>SVG image that uses a PNG data: URL</title>
+<link rel="match" href="../struct/reftests/reference/green-100x100.html">
+<img src="support/external-with-data-url.svg">
diff --git a/tests/wpt/tests/svg/embedded/image-embedding-nested-http-url.sub.html b/tests/wpt/tests/svg/embedded/image-embedding-nested-http-url.sub.html
new file mode 100644
index 00000000000..f3d8a79b999
--- /dev/null
+++ b/tests/wpt/tests/svg/embedded/image-embedding-nested-http-url.sub.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<title>SVG image that uses an HTTP URL</title>
+<link rel="mismatch" href="../struct/reftests/reference/green-100x100.html">
+<!-- Even better would be a blank page expected match. -->
+<img src="data:image/svg+xml,
+  <svg xmlns='http://www.w3.org/2000/svg' width='100' height='100'>
+    <image href='{{location[scheme]}}://{{location[host]}}/svg/embedded/reference/green-rect-100x100.svg'/>
+  </svg>
+">
diff --git a/tests/wpt/tests/svg/embedded/image-embedding-nesteder-data-url.html b/tests/wpt/tests/svg/embedded/image-embedding-nesteder-data-url.html
new file mode 100644
index 00000000000..48fb4fa48b7
--- /dev/null
+++ b/tests/wpt/tests/svg/embedded/image-embedding-nesteder-data-url.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<title>SVG image that uses a data: URL and then again</title>
+<link rel="match" href="../struct/reftests/reference/green-100x100.html">
+<img src="data:image/svg+xml,
+  <svg xmlns='http://www.w3.org/2000/svg' width='100' height='100'>
+    <image href='data:image/svg+xml,
+      &amp;lt;svg xmlns=&quot;http://www.w3.org/2000/svg&quot;>
+        &amp;lt;image href=&quot;data:image/svg+xml,
+          &amp;amp;lt;svg xmlns=&amp;amp;quot;http://www.w3.org/2000/svg&amp;amp;quot;>
+            &amp;amp;lt;rect width=&amp;amp;quot;100&amp;amp;quot; height=&amp;amp;quot;100&amp;amp;quot; fill=&amp;amp;quot;green&amp;amp;quot;/>
+          &amp;amp;lt;/svg>
+        &quot;/>
+      &amp;lt;/svg>
+    '/>
+  </svg>
+">
diff --git a/tests/wpt/tests/svg/embedded/reference/image-with-nested-rects.html b/tests/wpt/tests/svg/embedded/reference/image-with-nested-rects.html
new file mode 100644
index 00000000000..a9aa379d1aa
--- /dev/null
+++ b/tests/wpt/tests/svg/embedded/reference/image-with-nested-rects.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<style>
+img {
+  width: 200px;
+  height: 200px;
+  background-color: red;
+}
+</style>
+<img src="../support/image-with-nested-rects.svg">
diff --git a/tests/wpt/tests/svg/embedded/support/external-with-data-url.svg b/tests/wpt/tests/svg/embedded/support/external-with-data-url.svg
new file mode 100644
index 00000000000..e5f707c7980
--- /dev/null
+++ b/tests/wpt/tests/svg/embedded/support/external-with-data-url.svg
@@ -0,0 +1,15 @@
+<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <g clip-path="url(#clip)">
+    <rect width="100" height="100" fill="white"/>
+    <rect width="100" height="100" fill="url(#pattern)"/>
+  </g>
+  <defs>
+    <pattern id="pattern" patternContentUnits="objectBoundingBox" width="1" height="1">
+      <use xlink:href="#img" transform="scale(0.005)"/>
+    </pattern>
+    <clipPath id="clip">
+      <rect width="100" height="100" fill="white"/>
+    </clipPath>
+    <image id="img" width="200" height="200" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAZKADAAQAAAABAAAAZAAAAAAvu95BAAABbElEQVR4Ae3TUQ0AIAzE0IFynEOCivfRKWja3ZozdzrGwGZIAvkGCoI9QkEKghnAcFpIQTADGE4LKQhmAMNpIQXBDGA4LaQgmAEMp4UUBDOA4bSQgmAGMJwWUhDMAIbTQgqCGcBwWkhBMAMYTgspCGYAw2khBcEMYDgtpCCYAQynhRQEM4DhtJCCYAYwnBZSEMwAhtNCCoIZwHBaSEEwAxhOCykIZgDDaSEFwQxgOC2kIJgBDKeFFAQzgOG0kIJgBjCcFlIQzACG00IKghnAcFpIQTADGE4LKQhmAMNpIQXBDGA4LaQgmAEMp4UUBDOA4bSQgmAGMJwWUhDMAIbTQgqCGcBwWkhBMAMYTgspCGYAw2khBcEMYDgtpCCYAQynhRQEM4DhtJCCYAYwnBZSEMwAhtNCCoIZwHBaSEEwAxhOCykIZgDDaSEFwQxgOC2kIJgBDKeFFAQzgOG0kIJgBjCcFlIQzACG00KwIA8ybAJHOjWoiwAAAABJRU5ErkJggg=="/>
+  </defs>
+</svg>
diff --git a/tests/wpt/tests/svg/embedded/support/image-with-nested-data-url-images.svg b/tests/wpt/tests/svg/embedded/support/image-with-nested-data-url-images.svg
new file mode 100644
index 00000000000..fee32936011
--- /dev/null
+++ b/tests/wpt/tests/svg/embedded/support/image-with-nested-data-url-images.svg
@@ -0,0 +1,63 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200">
+  <defs>
+    <g id="nested-images">
+    <rect x="20" y="20" width="100%" height="100%" fill="red"/>
+      <image x="20" y="20" width="100%" height="100%"
+        xlink:href="data:image/svg+xml;base64,
+        PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRw
+        Oi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIg
+        aGVpZ2h0PSIxMDAlIiBmaWxsPSJMaWdodFNlYUdyZWVuIi8+PHJlY3QgeD0iMjAiIHk9IjIwIiB3
+        aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJyZWQiLz48aW1hZ2UgeD0iMjAiIHk9IjIw
+        IiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiB4bGluazpocmVmPSJkYXRhOmltYWdlL3N2Zyt4
+        bWw7YmFzZTY0LFBITjJaeUI0Yld4dWN6MGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM5
+        emRtY2lJSGh0Ykc1ek9uaHNhVzVyUFNKb2RIUncNCk9pOHZkM2QzTG5jekxtOXlaeTh4T1RrNUwz
+        aHNhVzVySWo0OGNtVmpkQ0I0UFNJd0lpQjVQU0l3SWlCM2FXUjBhRDBpTVRBd0pTSWcNCmFHVnBa
+        MmgwUFNJeE1EQWxJaUJtYVd4c1BTSm5jbVZsYmlJdlBqeHlaV04wSUhnOUlqSXdJaUI1UFNJeU1D
+        SWdkMmxrZEdnOUlqRXcNCk1DVWlJR2hsYVdkb2REMGlNVEF3SlNJZ1ptbHNiRDBpY21Wa0lpOCtQ
+        R2x0WVdkbElIZzlJakl3SWlCNVBTSXlNQ0lnZDJsa2RHZzkNCklqRXdNQ1VpSUdobGFXZG9kRDBp
+        TVRBd0pTSWdlR3hwYm1zNmFISmxaajBpWkdGMFlUcHBiV0ZuWlM5emRtY3JlRzFzTzJKaGMyVTIN
+        Ck5DeFFTRTR5V25sQ05HSlhlSFZqZWpCcFlVaFNNR05FYjNaTU0yUXpaSGsxTTAxNU5YWmpiV04y
+        VFdwQmQwMURPWHBrYldOcFNVaG8NCmRHSkhOWHBQYm1oellWYzFjbEJUU205a1NGSjNEUXBQYVRo
+        MlpETmtNMHh1WTNwTWJUbDVXbms0ZUU5VWF6Vk1NMmh6WVZjMWNrbHENCk5EaGpiVlpxWkVOQ05G
+        QlRTWGRKYVVJMVVGTkpkMGxwUWpOaFYxSXdZVVF3YVUxVVFYZEtVMGxuRFFwaFIxWndXakpvTUZC
+        VFNYaE4NClJFRnNTV2xDYldGWGVITlFVMHB6WVZka2IyUkZaSGxhVjFaMVNXazRLMUJJU214Wk0x
+        Rm5aVVF3YVUxcVFXbEpTR3M1U1dwSmQwbHANClFqTmhWMUl3RFFwaFJEQnBUVlJCZDBwVFNXZGhS
+        MVp3V2pKb01GQlRTWGhOUkVGc1NXbENiV0ZYZUhOUVUwcDVXbGRSYVV4Nk5EaGgNClZ6Rm9XakpW
+        WjJWRU1HbE5ha0ZwU1Vock9VbHFTWGRKYVVJekRRcGhWMUl3WVVRd2FVMVVRWGRLVTBsbllVZFdj
+        Rm95YURCUVUwbDQNClRVUkJiRWxwUWpSaVIyeDFZWHB3YjJOdFZtMVFVMHByV1ZoU2FFOXRiSFJa
+        VjJSc1RETk9NbHA1ZERSaVYzYzNEUXBaYlVaNldsUloNCk1FeEdRa2xVYWtwaFpWVkpNRmxzWkRS
+        a1YwNDJUVWRzYUZOR1NYZFpNRkoyWkd0M2VscEVUbXRsVkZWNlZGaHJNV1J0VG5SWk0xcE8NCllX
+        dEdNMVJWVFRWbGJWSjBEUXBaTW14S1UwZG9NRmxyWXpGbGF6bDFZVWhPYUZaNlZubFZSazVMWWpK
+        U1NWVnVZMDVEYXpsd1QwaGENCmEwMHlVWHBVUnpWcVpXdDRkRTlZYkdGbFZHZzBWREZTY2s1VmQz
+        cGhTRTVvRFFwV2VsWjVVMWR2TUU5SFRuUldiWEJyVVRCSk1GVkcNClRrcGtNR3h3VVdwV1VWVXdi
+        RE5UVjJ4RFRUSkdXRlZxUW1oU1JFSndWRlpTUW1Rd2NGUlRWMk5PUTIxR1NGWnVRbUZOYldkM0RR
+        cFYNClJrNUtaVVV4UlZGWGVFcGhWVXAwV1Zaa05HTXhRbFJUYms1b1ZucEdjMVZxVGt0aVJuQllU
+        a2RzVFdWcVVUUlpNakZYWVcxU1JGRnENClVsRlZNR3cxVkZWT1Nsb3lWbFZOUjJ4T0RRcGhhMFp3
+        VTFWb2EyTkdjRWxWYlRoT1EyeENWRk5ZYUU1U1JVWnpVMWRzUTJJeGNGaGkNClJ6Vm9VMFpGTlZO
+        WGNFWmtNREZFVmxkc1NsSXhjSGRaYTJRelQxVnNkVk50ZUdGUk1Hd3lEUXBWUjNBMFkwZEtXRkp0
+        TldGVk1Fa3cNClZVWk9TbVZWTVVSVFYyUnNWa1JDY0ZSWGNFSmhWV3hKV2toQlRrTnNjRWxWYlRs
+        UlZUQnNORlJWVWtKaVJXeHdVVzA1WVZZeWVIVloNClZXaFNEUXBQVld4eFVsaGtUbEV4Vm5CVFZX
+        aHZZekpHV0U1WVNsQmlWMmcxVjJ4a1drOVZiSFJWYldoclVqQlZNbGxXWTNoaFJtOTUNClZsaGFh
+        bEo2Vm5WVWVrcExZVWROZVZaVVNVNURhelZFRFFwbFNFSlhZVEJ3VVZaWE5XcGtNVTEzV2tjMWFV
+        MUZXa05WVmxaSFZERlYNCmVGWnRPVk5XYkZwMVZWWldSMUZzU1hoU2EwcFNWbFZhUkZsVVFrOVJi
+        R1JXVW10S1VsWlZiM3BVYTJoRERRcFdNVnBXVW10S1VsWlYNCldrTldNRlV4VmtaV2NWRnJiMDVE
+        YkVaWlUyNXdUMUl3TUhsV1ZsWkhVV3hHVm1SRmRGUmlSWEJIVlcxNFYySkdVblZUYWtKT1VtdGEN
+        ClIxWkhkRWRSYkVaV0RRcGlSRTVQVFVVMVJsZHRjRzVPVm05NVdYcEdVbUY2YTNwWmEyaEhXVlph
+        Um1GR1VtbFhSa3AxVlZSQ2MySnMNClJsWlNiRTFPUTJ4S1ZsUnJTbEpOUlZwNVZsZDBSMkpzUmxo
+        aVJYQmhEUXBOUlZwRFZsZDBWMUpHUmxaVWEwcG9UVlZ3UTFkcVFrZGoNClJrNVlXa1ZLVWxacmNF
+        ZFZWRUpIVWtaR1dHUkdUbEpXTWxKRFdWWldjMkpzUmxaU2JFNVRWbFUxUTFWVVFrZGpiRlp5RFFw
+        U2JUUk8NClEyeEdXR0pGY0dGTlJWcERWbGQwVjFKR1JsWlVhMHBvVFZWd1ExZHFRa2RqUms1WVdr
+        VktVbFpyY0VkVlZFSkhVa1pHV0dSR1RsSlcNCk1sSkRXVlpXYzJKc1JsWlNiRTVURFFwV1ZUVkRW
+        VlJDUjJOc1ZuSlNiVFZTVmpKNFMxZHFRa2RSYkZaeVZtdFJUa05zUmxaVWEwcG8NClRWVndRMWRx
+        UWtkalJrNVlXa1ZLVWxacmNFZFZWRUpIVWtaR1dHUkdUbEpXTWxKRERRcFpWbFp6WW14R1ZsSnNU
+        bE5XVlRWRFZWUkMNClIyTnNWbkpTYlRWU1ZqSlNTMVZzVmtkU2JGWnlWbXRTVWxaVk5VTlpWRVpM
+        VVcxU2RWTnRNRTVEYlU1elZXeEtWVkpYVW05Vk1GSlANCkRRcGxSbXh5VW10S1VsWlZXa05WVjNS
+        M1ZURmFWVlpyV21waVdGSk1WMnBLYTJKc1FsVk5SMnhSWVc1a01sbFdZM2hoUm05NVZsTjANClVW
+        RjZiRFphUnpGcVN6QlNVbUl3TlVSYWVqQTVEUXBKYWpRNFRESnNkRmxYWkd4UWFuZDJZek5hYmxC
+        blBUMGlQand2YVcxaFoyVSsNClBDOXpkbWMrIj48L2ltYWdlPjwvc3ZnPg==">
+      </image>
+    </g>
+  </defs>
+  <rect x="0" y="0" width="100%" height="100%" fill="DarkGreen"/>
+  <use xlink:href='#nested-images'/>
+</svg>
diff --git a/tests/wpt/tests/svg/embedded/support/image-with-nested-rects.svg b/tests/wpt/tests/svg/embedded/support/image-with-nested-rects.svg
new file mode 100644
index 00000000000..571ff921f13
--- /dev/null
+++ b/tests/wpt/tests/svg/embedded/support/image-with-nested-rects.svg
@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200">
+  <rect x="0" y="0" width="100%" height="100%" fill="DarkGreen"/>
+  <g transform="translate(20,20)">
+    <rect x="0" y="0" width="100%" height="100%" fill="LightSeaGreen"/>
+    <g transform="translate(20,20)">
+      <rect x="0" y="0" width="100%" height="100%" fill="Green"/>
+      <g transform="translate(20,20)">
+        <rect x="0" y="0" width="100%" height="100%" fill="LightGreen"/>
+        <g transform="translate(20,20)">
+          <rect x="0" y="0" width="100%" height="100%" fill="LimeGreen"/>
+          <g transform="translate(20,20)">
+            <rect x="0" y="0" width="100%" height="100%" fill="Lime"/>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/tests/wpt/tests/svg/fonts/zero-font-size-adjust-no-glyphs-font.html b/tests/wpt/tests/svg/fonts/zero-font-size-adjust-no-glyphs-font.html
new file mode 100644
index 00000000000..b1783af474c
--- /dev/null
+++ b/tests/wpt/tests/svg/fonts/zero-font-size-adjust-no-glyphs-font.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<title>Verify effect of font-size-adjust: 0 on a SVG Font without glyphs</title>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-5/#font-size-adjust-prop">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  pre { font-size-adjust: 0; font-family: CustomMonospace }
+</style>
+<svg>
+  <font>
+    <font-face font-family="CustomMonospace"/>
+  </font>
+</svg>
+<pre id="pre">Text
+</pre>
+<script>
+  test((t) => {
+    assert_equals(pre.getBoundingClientRect().height, 0);
+  }, "Verify effect of font-size-adjust: 0 on no glyphs SVG Font");
+</script>
diff --git a/tests/wpt/tests/svg/fonts/zero-font-size-adjust-no-glyphs-zero-height-font.html b/tests/wpt/tests/svg/fonts/zero-font-size-adjust-no-glyphs-zero-height-font.html
new file mode 100644
index 00000000000..25839e0ef5f
--- /dev/null
+++ b/tests/wpt/tests/svg/fonts/zero-font-size-adjust-no-glyphs-zero-height-font.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<title>Verify effect of font-size-adjust: 0 on a zero height no glyphs SVG Font</title>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-5/#font-size-adjust-prop">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  pre { font-size-adjust: 0; font-family: CustomMonospace }
+</style>
+<svg>
+  <font>
+    <font-face font-family="CustomMonospace" ascent="0"/>
+  </font>
+</svg>
+<pre id="pre">Text
+</pre>
+<script>
+  test((t) => {
+    assert_equals(pre.getBoundingClientRect().height, 0);
+  }, "Verify effect of font-size-adjust: 0 on zero height no glyphs SVG Font");
+</script>
diff --git a/tests/wpt/tests/svg/fonts/zero-font-size-adjust.html b/tests/wpt/tests/svg/fonts/zero-font-size-adjust.html
new file mode 100644
index 00000000000..7e7a226c6b3
--- /dev/null
+++ b/tests/wpt/tests/svg/fonts/zero-font-size-adjust.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>Verify effect of font-size-adjust: 0 on a SVG Font</title>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-5/#font-size-adjust-prop">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  pre { font-size-adjust: 0; font-family: CustomMonospace }
+</style>
+<svg>
+  <font>
+    <font-face font-family="CustomMonospace"/>
+    <glyph unicode="e" glyph-name="e" horiz-adv-x="530" d="M500 192V227Q500 296 480 346T428 427T354 474T271 489Q221 489 178 470T101 418T49 340T30 243Q30 204 43 161T87 83T171 24T303 0H482V94H298Q250 94 217 108T165 144T137 192T128 244Q128 276 139 303T171 351T218 383T275 395Q301 395 322 386T360 362T386 327T402 286H277Q253 286 240 272T226 239Q226 223 237 208T277 192H500Z"/>
+  </font>
+</svg>
+<pre id="pre">Text
+</pre>
+<script>
+  test((t) => {
+    assert_equals(pre.getBoundingClientRect().height, 0);
+  }, "Verify effect of font-size-adjust: 0 on normal size SVG Font");
+</script>
diff --git a/tests/wpt/tests/svg/geometry/reftests/circle-calc-dynamic-viewport-ref.html b/tests/wpt/tests/svg/geometry/reftests/circle-calc-dynamic-viewport-ref.html
new file mode 100644
index 00000000000..dfd1f609496
--- /dev/null
+++ b/tests/wpt/tests/svg/geometry/reftests/circle-calc-dynamic-viewport-ref.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<title>Changing container size of SVG with calc() cx/cy/r on &lt;circle> (reference)</title>
+<div id="hcontainer" style="width: 100px; height: 100px; position: absolute">
+  <svg width="100" height="100">
+    <circle cy="50" r="100"/>
+  </svg>
+  <svg width="100" height="100">
+    <circle cx="50" cy="50" r="50"/>
+  </svg>
+</div>
+<div id="vcontainer" style="width: 100px; height: 100px; position: absolute; left: 116px">
+  <svg width="100" height="100">
+    <circle cx="50" r="100"/>
+  </svg>
+  <svg width="100" height="100">
+    <circle cy="50" cy="50" r="50"/>
+  </svg>
+</div>
diff --git a/tests/wpt/tests/svg/geometry/reftests/circle-calc-dynamic-viewport.html b/tests/wpt/tests/svg/geometry/reftests/circle-calc-dynamic-viewport.html
new file mode 100644
index 00000000000..cff8915d6f0
--- /dev/null
+++ b/tests/wpt/tests/svg/geometry/reftests/circle-calc-dynamic-viewport.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Changing container size of SVG with calc() cx/cy/r on &lt;circle></title>
+<link rel="match" href="circle-calc-dynamic-viewport-ref.html">
+<script src="/common/rendering-utils.js"></script>
+<script src="/common/reftest-wait.js"></script>
+<div id="hcontainer" style="width: 50px; height: 100px; position: absolute">
+  <svg width="100%" height="100%">
+    <circle cy="50" style="r: calc(50% + 50px)"/>
+  </svg>
+  <svg width="100%" height="100%">
+    <circle style="cx: calc(25% + 25px)" cy="50" r="50"/>
+  </svg>
+</div>
+<div id="vcontainer" style="width: 100px; height: 50px; position: absolute; left: 116px">
+  <svg width="100%" height="100%">
+    <circle cx="50" style="r: calc(50% + 50px)"/>
+  </svg>
+  <svg width="100%" height="100%">
+    <circle cy="50" style="cy: calc(25% + 25px)" r="50"/>
+  </svg>
+</div>
+<script>
+  waitForAtLeastOneFrame().then(() => {
+    document.getElementById('hcontainer').style.width = '100px';
+    document.getElementById('vcontainer').style.height = '100px';
+    takeScreenshot();
+  });
+</script>
diff --git a/tests/wpt/tests/svg/geometry/reftests/ellipse-calc-dynamic-viewport-ref.html b/tests/wpt/tests/svg/geometry/reftests/ellipse-calc-dynamic-viewport-ref.html
new file mode 100644
index 00000000000..70576349bc0
--- /dev/null
+++ b/tests/wpt/tests/svg/geometry/reftests/ellipse-calc-dynamic-viewport-ref.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<title>Changing container size of SVG with calc() cx/cy/rx/ry on &lt;ellipse> (reference)</title>
+<div id="hcontainer" style="width: 100px; height: 100px; position: absolute">
+  <svg width="100" height="100">
+    <ellipse cy="50" rx="100" ry="50"/>
+  </svg>
+  <svg width="100" height="100">
+    <ellipse cx="50" cy="50" rx="50" ry="50"/>
+  </svg>
+</div>
+<div id="vcontainer" style="width: 100px; height: 100px; position: absolute; left: 116px">
+  <svg width="100" height="100">
+    <ellipse cx="50" rx="50" ry="100"/>
+  </svg>
+  <svg width="100%" height="100%">
+    <ellipse cx="50" cy="50" rx="50" ry="50"/>
+  </svg>
+</div>
diff --git a/tests/wpt/tests/svg/geometry/reftests/ellipse-calc-dynamic-viewport.html b/tests/wpt/tests/svg/geometry/reftests/ellipse-calc-dynamic-viewport.html
new file mode 100644
index 00000000000..d817b788246
--- /dev/null
+++ b/tests/wpt/tests/svg/geometry/reftests/ellipse-calc-dynamic-viewport.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Changing container size of SVG with calc() cx/cy/rx/ry on &lt;ellipse></title>
+<link rel="match" href="ellipse-calc-dynamic-viewport-ref.html">
+<script src="/common/rendering-utils.js"></script>
+<script src="/common/reftest-wait.js"></script>
+<div id="hcontainer" style="width: 50px; height: 100px; position: absolute">
+  <svg width="100%" height="100%">
+    <ellipse cy="50" style="rx: calc(50% + 50px)" ry="50"/>
+  </svg>
+  <svg width="100%" height="100%">
+    <ellipse style="cx: calc(25% + 25px)" cy="50" rx="50" ry="50"/>
+  </svg>
+</div>
+<div id="vcontainer" style="width: 100px; height: 50px; position: absolute; left: 116px">
+  <svg width="100%" height="100%">
+    <ellipse cx="50" rx="50" style="ry: calc(50% + 50px)"/>
+  </svg>
+  <svg width="100%" height="100%">
+    <ellipse cx="50" style="cy: calc(25% + 25px)" rx="50" ry="50"/>
+  </svg>
+</div>
+<script>
+  waitForAtLeastOneFrame().then(() => {
+    document.getElementById('hcontainer').style.width = '100px';
+    document.getElementById('vcontainer').style.height = '100px';
+    takeScreenshot();
+  });
+</script>
diff --git a/tests/wpt/tests/svg/geometry/reftests/rect-calc-dynamic-viewport-ref.html b/tests/wpt/tests/svg/geometry/reftests/rect-calc-dynamic-viewport-ref.html
new file mode 100644
index 00000000000..84971d4b811
--- /dev/null
+++ b/tests/wpt/tests/svg/geometry/reftests/rect-calc-dynamic-viewport-ref.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<title>Changing container size of SVG with calc() width/height/x/y/rx/ry on &lt;rect> (reference)</title>
+<div id="hcontainer" style="width: 100px; height: 100px; position: absolute">
+  <svg width="100" height="100">
+    <rect width="100" height="100"/>
+  </svg>
+  <svg width="100" height="100">
+    <rect width="100" height="100" x="50"/>
+  </svg>
+  <svg width="100" height="100">
+    <rect width="100" height="100" rx="50"/>
+  </svg>
+</div>
+<div id="vcontainer" style="width: 100px; height: 100px; position: absolute; left: 116px">
+  <svg width="100" height="100">
+    <rect width="100" height="100"/>
+  </svg>
+  <svg width="100" height="100">
+    <rect width="100" height="100" y="50"/>
+  </svg>
+  <svg width="100" height="100">
+    <rect width="100" height="100" ry="50"/>
+  </svg>
+</div>
diff --git a/tests/wpt/tests/svg/geometry/reftests/rect-calc-dynamic-viewport.html b/tests/wpt/tests/svg/geometry/reftests/rect-calc-dynamic-viewport.html
new file mode 100644
index 00000000000..6fe39012511
--- /dev/null
+++ b/tests/wpt/tests/svg/geometry/reftests/rect-calc-dynamic-viewport.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Changing container size of SVG with calc() width/height/x/y/rx/ry on &lt;rect></title>
+<link rel="match" href="rect-calc-dynamic-viewport-ref.html">
+<script src="/common/rendering-utils.js"></script>
+<script src="/common/reftest-wait.js"></script>
+<div id="hcontainer" style="width: 50px; height: 100px; position: absolute">
+  <svg width="100%" height="100%">
+    <rect style="width: calc(50% + 50px)" height="100"/>
+  </svg>
+  <svg width="100%" height="100%">
+    <rect width="100" height="100" style="x: calc(25% + 25px)"/>
+  </svg>
+  <svg width="100%" height="100%">
+    <rect width="100" height="100" style="rx: calc(25% + 25px)"/>
+  </svg>
+</div>
+<div id="vcontainer" style="width: 100px; height: 50px; position: absolute; left: 116px">
+  <svg width="100%" height="100%">
+    <rect width="100" style="height: calc(50% + 50px)"/>
+  </svg>
+  <svg width="100%" height="100%">
+    <rect width="100" height="100" style="y: calc(25% + 25px)"/>
+  </svg>
+  <svg width="100%" height="100%">
+    <rect width="100" height="100" style="ry: calc(25% + 25px)"/>
+  </svg>
+</div>
+<script>
+  waitForAtLeastOneFrame().then(() => {
+    document.getElementById('hcontainer').style.width = '100px';
+    document.getElementById('vcontainer').style.height = '100px';
+    takeScreenshot();
+  });
+</script>
diff --git a/tests/wpt/tests/svg/idlharness.window.js b/tests/wpt/tests/svg/idlharness.window.js
index b363128c25a..57beca77fd4 100644
--- a/tests/wpt/tests/svg/idlharness.window.js
+++ b/tests/wpt/tests/svg/idlharness.window.js
@@ -42,7 +42,6 @@ const elements = [
   'script',
   'animate',
   'set',
-  'discard',
   'animateMotion',
   'mpath',
   'animateTransform',
@@ -111,7 +110,6 @@ idl_test(
       SVGGElement: ['objects.g'],
       SVGDefsElement: ['objects.defs'],
       SVGDescElement: ['objects.desc'],
-      SVGDiscardElement: ['objects.discard'],
       SVGTitleElement: ['objects.title'],
       SVGSymbolElement: ['objects.symbol'],
       SVGUseElement: ['objects.use'],
@@ -168,7 +166,6 @@ idl_test(
       SVGViewElement: ['objects.view'],
       SVGScriptElement: ['objects.script'],
       SVGAnimateElement: ['objects.animate'],
-      SVGDiscardElement: ['objects.discard'],
       SVGSetElement: ['objects.set'],
       SVGAnimateMotionElement: ['objects.animateMotion'],
       SVGMPathElement: ['objects.mpath'],
diff --git a/tests/wpt/tests/svg/import/interact-dom-01-b-manual.svg b/tests/wpt/tests/svg/import/interact-dom-01-b-manual.svg
index 32cf2f546c7..a16c2545033 100644
--- a/tests/wpt/tests/svg/import/interact-dom-01-b-manual.svg
+++ b/tests/wpt/tests/svg/import/interact-dom-01-b-manual.svg
@@ -24,7 +24,7 @@
       </p>
       <p>
         At the end of the test, the start test button is changed to green,
-        and the click event listener is removed from the the start button.
+        and the click event listener is removed from the start button.
       </p>
       <p>
         Subsequent clicks on the start button should cause no effect if
diff --git a/tests/wpt/tests/svg/interact/focus-inside-hidden-svg-containers-01.html b/tests/wpt/tests/svg/interact/focus-inside-hidden-svg-containers-01.html
new file mode 100644
index 00000000000..25765c5b93e
--- /dev/null
+++ b/tests/wpt/tests/svg/interact/focus-inside-hidden-svg-containers-01.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Tabbing through Non-Rendered SVG elements</title>
+<link rel="author" title="Divyansh Mangal" href="mailto:dmangal@microsoft.com">
+<link rel="help" href="https://svgwg.org/svg2-draft/single-page.html#interact-Focus">
+<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>
+
+<svg xmlns="http://www.w3.org/2000/svg">
+  <text tabindex='1' id="start" x="10" y="10">start</text>
+  <g x="30" y="10" style="display: none;">
+    <text tabindex='2' id="middle" x="30" y="10">middle</text>
+  </g>
+  <text tabindex='3' id="end" x="50" y="10">end</text>
+</svg>
+
+<script>
+  promise_test(async t => {
+    const start = document.getElementById('start');
+    const end = document.getElementById('end');
+
+    start.focus();
+    assert_equals(document.activeElement, start, "Start element should be focused initially");
+
+    // Simulate pressing the Tab key
+    await test_driver.send_keys(start, '\uE004'); // '\uE004' is the WebDriver key code for Tab
+
+    // Verify that the focus moved to the end element and middle element is skipped
+    assert_equals(document.activeElement, end, "End element should be focused after pressing Tab");
+  }, "Hidden SVG Tab focus test");
+</script>
diff --git a/tests/wpt/tests/svg/interact/focus-inside-hidden-svg-containers-02.html b/tests/wpt/tests/svg/interact/focus-inside-hidden-svg-containers-02.html
new file mode 100644
index 00000000000..fd9fd34275d
--- /dev/null
+++ b/tests/wpt/tests/svg/interact/focus-inside-hidden-svg-containers-02.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Tabbing through Non-Rendered SVG elements</title>
+<link rel="author" title="Divyansh Mangal" href="mailto:dmangal@microsoft.com">
+<link rel="help" href="https://svgwg.org/svg2-draft/single-page.html#interact-Focus">
+<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>
+
+<svg xmlns="http://www.w3.org/2000/svg">
+  <a href="#void" id="start">
+    <text tabindex='-1' x="10" y="10">start</text>
+  </a>
+  <g x="30" y="10" style="display: none;">
+    <a href="#void" id="middle">
+      <text tabindex='-1' x="30" y="10">middle</text>
+    </a>
+  </g>
+  <a href="#void" id="end">
+    <text tabindex='-1' x="50" y="10">end</text>
+  </a>
+</svg>
+
+<script>
+  promise_test(async t => {
+    const start = document.getElementById('start');
+    const end = document.getElementById('end');
+
+    start.focus();
+    assert_equals(document.activeElement, start, "Start element should be focused initially");
+
+    // Simulate pressing the Tab key
+    await test_driver.send_keys(start, '\uE004'); // '\uE004' is the WebDriver key code for Tab
+
+    // Verify that the focus moved to the end element and middle element is skipped
+    assert_equals(document.activeElement, end, "End element should be focused after pressing Tab");
+  }, "Hidden SVG Tab focus test");
+</script>
diff --git a/tests/wpt/tests/svg/interact/focus-inside-hidden-svg-containers-03.html b/tests/wpt/tests/svg/interact/focus-inside-hidden-svg-containers-03.html
new file mode 100644
index 00000000000..097cff57b5a
--- /dev/null
+++ b/tests/wpt/tests/svg/interact/focus-inside-hidden-svg-containers-03.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Tabbing through Non-Rendered SVG elements</title>
+<link rel="author" title="Divyansh Mangal" href="mailto:dmangal@microsoft.com">
+<link rel="help" href="https://svgwg.org/svg2-draft/single-page.html#interact-Focus">
+<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>
+
+<svg xmlns="http://www.w3.org/2000/svg">
+  <text tabindex='1' id="start" x="10" y="10">start</text>
+  <defs>
+    <text tabindex='2' id="middle" x="30" y="10">middle</text>
+  </defs>
+  <text tabindex='3' id="end" x="50" y="10">end</text>
+</svg>
+
+<script>
+  promise_test(async t => {
+    const start = document.getElementById('start');
+    const end = document.getElementById('end');
+
+    start.focus();
+    assert_equals(document.activeElement, start, "Start element should be focused initially");
+
+    // Simulate pressing the Tab key
+    await test_driver.send_keys(start, '\uE004'); // '\uE004' is the WebDriver key code for Tab
+
+    // Verify that the focus moved to the end element and middle element is skipped
+    assert_equals(document.activeElement, end, "End element should be focused after pressing Tab");
+  }, "Hidden SVG Tab focus test");
+</script>
diff --git a/tests/wpt/tests/svg/interact/script-content.svg b/tests/wpt/tests/svg/interact/script-content.svg
index 94836f7c033..b882160b4e6 100644
--- a/tests/wpt/tests/svg/interact/script-content.svg
+++ b/tests/wpt/tests/svg/interact/script-content.svg
@@ -46,11 +46,9 @@
   <script>function s10() { return s11(); }</script>
 </desc>
 
-<!-- Becomes https://svgwg.org/svg2-draft/struct.html#UnknownElement
-     if the implementation does not support <discard> -->
-<discard>
+<unknown>
   <script>function s11() { return s12(); }</script>
-</discard>
+</unknown>
 
 <ellipse>
   <script>function s12() { return s13(); }</script>
diff --git a/tests/wpt/tests/svg/painting/reftests/WEB_FEATURES.yml b/tests/wpt/tests/svg/painting/reftests/WEB_FEATURES.yml
new file mode 100644
index 00000000000..123f8c0419a
--- /dev/null
+++ b/tests/wpt/tests/svg/painting/reftests/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: context-fill-stroke
+  files:
+  - paint-context-*
diff --git a/tests/wpt/tests/svg/painting/scripted/SVGMarkerElement-orientType-synchronization.html b/tests/wpt/tests/svg/painting/scripted/SVGMarkerElement-orientType-synchronization.html
index 04142128310..a409183189a 100644
--- a/tests/wpt/tests/svg/painting/scripted/SVGMarkerElement-orientType-synchronization.html
+++ b/tests/wpt/tests/svg/painting/scripted/SVGMarkerElement-orientType-synchronization.html
@@ -26,4 +26,17 @@ test(function() {
   assert_equals(marker.getAttribute('orient'), '1');
   assert_equals(marker.orientType.baseVal, SVGMarkerElement.SVG_MARKER_ORIENT_ANGLE);
 }, `${document.title}, setting orientAngle using valueInSpecifiedUnits`);
+
+test(function() {
+  const marker = document.createElementNS('http://www.w3.org/2000/svg', 'marker');
+  assert_false(marker.hasAttribute('orient'));
+
+  marker.setOrientToAuto();
+  assert_equals(marker.getAttribute('orient'), 'auto');
+
+  marker.orientAngle.baseVal.convertToSpecifiedUnits(SVGAngle.SVG_ANGLETYPE_UNSPECIFIED);
+  assert_true(marker.hasAttribute('orient'));
+  assert_equals(marker.getAttribute('orient'), '0');
+  assert_equals(marker.orientType.baseVal, SVGMarkerElement.SVG_MARKER_ORIENT_ANGLE);
+}, `${document.title}, setting orientAngle using convertToSpecifiedUnits`);
 </script>
diff --git a/tests/wpt/tests/svg/painting/svg-percent-stroke-width-viewbox-update-ref.html b/tests/wpt/tests/svg/painting/svg-percent-stroke-width-viewbox-update-ref.html
new file mode 100644
index 00000000000..6e7c2b23af6
--- /dev/null
+++ b/tests/wpt/tests/svg/painting/svg-percent-stroke-width-viewbox-update-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+
+<svg height="100" width="100" viewBox="40 40 20 20">
+  <polyline stroke-width="10%" stroke="gold" points="20,20 80,80"></polyline>
+</svg>
+<svg height="100" width="100" viewBox="40 40 20 20">
+  <polyline stroke-width="calc(5% + 5px)" stroke="gold" points="20,20 80,80"></polyline>
+</svg>
+<svg height="100" width="100" viewBox="40 40 20 20">
+  <circle stroke-width="10%" stroke="gold" cx="50" cy="50" r="10" fill="none"></circle>
+</svg>
+<svg height="100" width="100" viewBox="40 40 20 20">
+  <rect stroke-width="10%" stroke="gold" x="40" y="40" width="20" height="10" fill="none"></rect>
+</svg>
diff --git a/tests/wpt/tests/svg/painting/svg-percent-stroke-width-viewbox-update.html b/tests/wpt/tests/svg/painting/svg-percent-stroke-width-viewbox-update.html
new file mode 100644
index 00000000000..cc88e9276f2
--- /dev/null
+++ b/tests/wpt/tests/svg/painting/svg-percent-stroke-width-viewbox-update.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  A percentage stroke-width is updated when the viewport (viewBox) is updated.
+</title>
+<link rel="help" href="http://crbug.com/384605094">
+<link rel="help" href="https://www.w3.org/TR/SVG/painting.html#StrokeWidth">
+<link rel="help" href="https://www.w3.org/TR/SVG/coords.html#Units">
+<link rel="match" href="svg-percent-stroke-width-viewbox-update-ref.html">
+<script src="/common/rendering-utils.js"></script>
+
+<svg id="svgPolyRoot" height="100" width="100" viewBox="30 30 40 40">
+  <polyline stroke-width="10%" stroke="gold" points="20,20 80,80"></polyline>
+</svg>
+<svg id="svgPolyWithCalcStrokeWidthRoot" height="100" width="100" viewBox="30 30 40 40">
+  <polyline stroke-width="calc(5% + 5px)" stroke="gold" points="20,20 80,80"></polyline>
+</svg>
+<svg id="svgCircleRoot" height="100" width="100" viewBox="30 30 40 40">
+  <circle stroke-width="10%" stroke="gold" cx="50" cy="50" r="10" fill="none"></circle>
+</svg>
+<svg id="svgRectRoot" height="100" width="100" viewBox="30 30 40 40">
+  <rect stroke-width="10%" stroke="gold" x="40" y="40" width="20" height="10" fill="none"></rect>
+</svg>
+
+<script>
+  waitForAtLeastOneFrame().then(() => {
+    document.getElementById("svgPolyRoot").setAttribute("viewBox", "40 40 20 20");
+    document.getElementById("svgPolyWithCalcStrokeWidthRoot").setAttribute("viewBox", "40 40 20 20");
+    document.getElementById("svgCircleRoot").setAttribute("viewBox", "40 40 20 20");
+    document.getElementById("svgRectRoot").setAttribute("viewBox", "40 40 20 20");
+  });
+</script>
diff --git a/tests/wpt/tests/svg/path/reftests/path-zoom-ref.html b/tests/wpt/tests/svg/path/reftests/path-zoom-ref.html
new file mode 100644
index 00000000000..4b09749e2c2
--- /dev/null
+++ b/tests/wpt/tests/svg/path/reftests/path-zoom-ref.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html>
+<style type="text/css">
+  path {
+    stroke-width: 10px;
+    stroke: blue;
+    fill: lime;
+  }
+  svg {
+    width: 100px;
+    height: 100px;
+    border: 1px solid black;
+    background: red;
+    zoom: 400%;
+  }
+</style>
+<body>
+<svg>
+  <path d="m 5 5 h90 v90 h-90 z"></path>
+</svg>
+</body>
+</html>
diff --git a/tests/wpt/tests/svg/path/reftests/path-zoom.html b/tests/wpt/tests/svg/path/reftests/path-zoom.html
new file mode 100644
index 00000000000..281124334a2
--- /dev/null
+++ b/tests/wpt/tests/svg/path/reftests/path-zoom.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Test of dynamic zoom on path.</title>
+<link rel="help"
+      href="https://www.w3.org/TR/SVG2/paths.html#PathElement">
+<link rel="match"  href="path-zoom-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/rendering-utils.js"></script>
+<style type="text/css">
+  path {
+    stroke-width: 10px;
+    stroke: blue;
+    fill: lime;
+  }
+  svg {
+    width: 100px;
+    height: 100px;
+    border: 1px solid black;
+    background: red;
+  }
+</style>
+<script>
+function Zoom() {
+  document.getElementById("changeMyZoom").style.zoom = "400%";
+  takeScreenshot();
+}
+</script>
+<body onload="waitForAtLeastOneFrame().then(Zoom)">
+<svg id="changeMyZoom">
+  <path d="m 5 5 h90 v90 h-90 z"></path>
+</svg>
+</body>
+</html>
diff --git a/tests/wpt/tests/svg/scripted/WEB_FEATURES.yml b/tests/wpt/tests/svg/scripted/WEB_FEATURES.yml
new file mode 100644
index 00000000000..864bd3398ee
--- /dev/null
+++ b/tests/wpt/tests/svg/scripted/WEB_FEATURES.yml
@@ -0,0 +1,4 @@
+features:
+- name: fetch-priority
+  files:
+  - attr-script-fetchpriority.html
diff --git a/tests/wpt/tests/svg/scripted/attr-script-fetchpriority.html b/tests/wpt/tests/svg/scripted/attr-script-fetchpriority.html
new file mode 100644
index 00000000000..2f73e1e59a8
--- /dev/null
+++ b/tests/wpt/tests/svg/scripted/attr-script-fetchpriority.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<title>Fetch Priority - SVG Script element</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<svg>
+<script id=script1 href="resources/script.js" fetchpriority="high"></script>
+<script id=script2 href="resources/script.js" fetchpriority="low"></script>
+<script id=script3 href="resources/script.js" fetchpriority="auto"></script>
+<script id=script4 href="resources/script.js" fetchpriority="xyz"></script>
+<script id=script5 href="resources/script.js"></script>
+</svg>
+
+<script>
+  test(() => {
+    assert_equals(script1.fetchPriority, "high", "high fetchPriority is a valid IDL value on the script element");
+    assert_equals(script2.fetchPriority, "low", "low fetchPriority is a valid IDL value on the script element");
+    assert_equals(script3.fetchPriority, "auto", "auto fetchPriority is a valid IDL value on the script element");
+    assert_equals(script4.fetchPriority, "auto", "invalid fetchPriority reflects as 'auto' IDL attribute on the script element");
+    assert_equals(script5.fetchPriority, "auto", "missing fetchPriority reflects as 'auto' IDL attribute on the script element");
+  }, "fetchpriority attribute on SVG <script> elements should reflect valid IDL values");
+
+  test(() => {
+    const script = document.createElementNS("http://www.w3.org/2000/svg", "script");
+    assert_equals(script.fetchPriority, "auto");
+  }, "default fetchpriority attribute on SVG <script> elements should be 'auto'");
+</script>
diff --git a/tests/wpt/tests/svg/struct/reftests/inner-svg-css-transform.svg b/tests/wpt/tests/svg/struct/reftests/inner-svg-css-transform.svg
new file mode 100644
index 00000000000..9187b0098fa
--- /dev/null
+++ b/tests/wpt/tests/svg/struct/reftests/inner-svg-css-transform.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:html="http://www.w3.org/1999/xhtml">
+  <html:link rel="help" href="https://www.w3.org/TR/SVG2/struct.html#SVGElement"/>
+  <html:link rel="match" href="reference/inner-svg-transform-ref.svg"/>
+  <title>Test that transforms the inner svg element using css</title>
+  <svg width="50" height="50" style="transform: translate(100px, 50px) scale(2);">
+    <rect width="50" height="50" fill="green"/>
+  </svg>
+</svg>
diff --git a/tests/wpt/tests/svg/struct/reftests/inner-svg-rotate-transform.svg b/tests/wpt/tests/svg/struct/reftests/inner-svg-rotate-transform.svg
new file mode 100644
index 00000000000..c8a7c2c612e
--- /dev/null
+++ b/tests/wpt/tests/svg/struct/reftests/inner-svg-rotate-transform.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:html="http://www.w3.org/1999/xhtml">
+  <html:link rel="help" href="https://www.w3.org/TR/SVG2/struct.html#SVGElement"/>
+  <html:link rel="help" href="https://www.w3.org/TR/SVG2/coords.html#TransformProperty"/>
+  <html:link rel="match" href="reference/inner-svg-rotate-transform-ref.svg"/>
+  <title>Test that rotates the inner svg element</title>
+  <svg width="50" height="50" transform="rotate(45)">
+    <rect width="50" height="50" fill="green"/>
+  </svg>
+</svg>
diff --git a/tests/wpt/tests/svg/struct/reftests/inner-svg-transform-and-viewbox.svg b/tests/wpt/tests/svg/struct/reftests/inner-svg-transform-and-viewbox.svg
new file mode 100644
index 00000000000..3b96cef3d93
--- /dev/null
+++ b/tests/wpt/tests/svg/struct/reftests/inner-svg-transform-and-viewbox.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:html="http://www.w3.org/1999/xhtml">
+  <html:link rel="help" href="https://www.w3.org/TR/SVG2/struct.html#SVGElement"/>
+  <html:link rel="help" href="https://www.w3.org/TR/SVG2/coords.html#TransformProperty"/>
+  <html:link rel="help" href="https://www.w3.org/TR/SVG2/coords.html#ViewBoxAttribute"/>
+  <html:link rel="match" href="reference/inner-svg-transform-and-viewbox-ref.svg"/>
+  <title>Test that transforms the inner svg element with viewBox specified</title>
+  <svg width="50" height="50" transform="translate(100,50)" viewBox="0 0 40 40">
+    <rect width="50" height="50" fill="green"/>
+    <circle cx="25" cy="25" r="6"/>
+  </svg>
+</svg>
diff --git a/tests/wpt/tests/svg/struct/reftests/inner-svg-transform.svg b/tests/wpt/tests/svg/struct/reftests/inner-svg-transform.svg
new file mode 100644
index 00000000000..31b2c613c6a
--- /dev/null
+++ b/tests/wpt/tests/svg/struct/reftests/inner-svg-transform.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:html="http://www.w3.org/1999/xhtml">
+  <html:link rel="help" href="https://www.w3.org/TR/SVG2/struct.html#SVGElement"/>
+  <html:link rel="help" href="https://www.w3.org/TR/SVG2/coords.html#TransformProperty"/>
+  <html:link rel="match" href="reference/inner-svg-transform-ref.svg"/>
+  <title>Test that transforms the inner svg element</title>
+  <svg width="50" height="50" transform="translate(100,50) scale(2)">
+    <rect width="50" height="50" fill="green"/>
+  </svg>
+</svg>
diff --git a/tests/wpt/tests/svg/struct/reftests/outer-svg-transform.svg b/tests/wpt/tests/svg/struct/reftests/outer-svg-transform.svg
new file mode 100644
index 00000000000..743ced136fa
--- /dev/null
+++ b/tests/wpt/tests/svg/struct/reftests/outer-svg-transform.svg
@@ -0,0 +1,9 @@
+<svg width="400" height="400"  transform="translate(100,0)" xmlns="http://www.w3.org/2000/svg" xmlns:html="http://www.w3.org/1999/xhtml">
+  <html:link rel="help" href="https://www.w3.org/TR/SVG2/struct.html#SVGElement"/>
+  <html:link rel="help" href="https://www.w3.org/TR/SVG2/coords.html#TransformProperty"/>
+  <html:link rel="match" href="reference/outer-svg-transform-ref.svg"/>
+  <title>Test that transforms the outer svg element"</title>
+  <svg width="50" height="50">
+    <rect width="50" height="50" fill="green"/>
+  </svg>
+</svg>
diff --git a/tests/wpt/tests/svg/struct/reftests/reference/inner-svg-rotate-transform-ref.svg b/tests/wpt/tests/svg/struct/reftests/reference/inner-svg-rotate-transform-ref.svg
new file mode 100644
index 00000000000..6c09ab219c6
--- /dev/null
+++ b/tests/wpt/tests/svg/struct/reftests/reference/inner-svg-rotate-transform-ref.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g transform="rotate(45)">
+    <svg width="50" height="50">
+      <rect width="50" height="50" fill="green"/>
+    </svg>
+  </g>
+</svg>
diff --git a/tests/wpt/tests/svg/struct/reftests/reference/inner-svg-transform-and-viewbox-ref.svg b/tests/wpt/tests/svg/struct/reftests/reference/inner-svg-transform-and-viewbox-ref.svg
new file mode 100644
index 00000000000..b6d245fd4da
--- /dev/null
+++ b/tests/wpt/tests/svg/struct/reftests/reference/inner-svg-transform-and-viewbox-ref.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g transform="translate(100,50)">
+    <svg width="50" height="50" viewBox="0 0 40 40">
+      <rect width="50" height="50" fill="green"/>
+      <circle cx="25" cy="25" r="6"/>
+    </svg>
+  </g>
+</svg>
diff --git a/tests/wpt/tests/svg/struct/reftests/reference/inner-svg-transform-ref.svg b/tests/wpt/tests/svg/struct/reftests/reference/inner-svg-transform-ref.svg
new file mode 100644
index 00000000000..c717788d91a
--- /dev/null
+++ b/tests/wpt/tests/svg/struct/reftests/reference/inner-svg-transform-ref.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g transform="translate(100,50) scale(2)">
+    <svg width="50" height="50">
+      <rect width="50" height="50" fill="green"/>
+    </svg>
+  </g>
+</svg>
diff --git a/tests/wpt/tests/svg/struct/reftests/reference/outer-svg-transform-ref.svg b/tests/wpt/tests/svg/struct/reftests/reference/outer-svg-transform-ref.svg
new file mode 100644
index 00000000000..55a74fe29d2
--- /dev/null
+++ b/tests/wpt/tests/svg/struct/reftests/reference/outer-svg-transform-ref.svg
@@ -0,0 +1,5 @@
+<svg width="400" height="400" xmlns="http://www.w3.org/2000/svg">
+  <svg x="100" y="0" width="50" height="50">
+    <rect width="50" height="50" fill="green"/>
+  </svg>
+</svg>
diff --git a/tests/wpt/tests/svg/animations/reftests/reference/green-100x100.svg b/tests/wpt/tests/svg/struct/reftests/support/sprites-without-id.svg
similarity index 100%
rename from tests/wpt/tests/svg/animations/reftests/reference/green-100x100.svg
rename to tests/wpt/tests/svg/struct/reftests/support/sprites-without-id.svg
diff --git a/tests/wpt/tests/svg/struct/reftests/use-external-svg-resource-no-fragment-id.html b/tests/wpt/tests/svg/struct/reftests/use-external-svg-resource-no-fragment-id.html
new file mode 100644
index 00000000000..37bcd3f370a
--- /dev/null
+++ b/tests/wpt/tests/svg/struct/reftests/use-external-svg-resource-no-fragment-id.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<title>Allow use to reference an external document's root element by omitting the fragment.</title>
+<link rel="help" href="https://svgwg.org/svg2-draft/struct.html#UseElement">
+<link rel="match" href="reference/green-100x100.html">
+<svg>
+  <use href="support/sprites-without-id.svg"/>
+</svg>
diff --git a/tests/wpt/tests/svg/styling/cx-sibling-index-crash.html b/tests/wpt/tests/svg/styling/cx-sibling-index-crash.html
new file mode 100644
index 00000000000..9fe97b12d77
--- /dev/null
+++ b/tests/wpt/tests/svg/styling/cx-sibling-index-crash.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<title>SVG Test: sibling-index() as cx property value should not crash</title>
+<link rel="help" href="https://crbug.com/407890255">
+<style>circle { cx: sibling-index(); }</style>
+<p>Pass if loading this page does not crash</p>
diff --git a/tests/wpt/tests/svg/styling/presentation-attributes-special-cases.html b/tests/wpt/tests/svg/styling/presentation-attributes-special-cases.html
index 7bfa001030a..9a5da751ce1 100644
--- a/tests/wpt/tests/svg/styling/presentation-attributes-special-cases.html
+++ b/tests/wpt/tests/svg/styling/presentation-attributes-special-cases.html
@@ -98,7 +98,7 @@ if (CSS.supports("d", "initial")) {
 // animation elements.
 
 if (CSS.supports("fill", "initial")) {
-  for (let e of ["animate", "animateMotion", "animateTransform", "discard", "set"]) {
+  for (let e of ["animate", "animateMotion", "animateTransform", "set"]) {
     test(function() {
       assertPresentationAttributeIsNotSupported(e, "fill", "blue", "fill");
     }, `fill presentation attribute not supported on ${e}`);
diff --git a/tests/wpt/tests/svg/types/scripted/SVGGraphicsElement-padding.svg b/tests/wpt/tests/svg/types/scripted/SVGGraphicsElement-padding.svg
new file mode 100644
index 00000000000..7bf47767a52
--- /dev/null
+++ b/tests/wpt/tests/svg/types/scripted/SVGGraphicsElement-padding.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:h="http://www.w3.org/1999/xhtml">
+  <title>SVGGraphicsElement with padding</title>
+  <metadata>
+    <h:link rel="help" href="https://svgwg.org/svg2-draft/types.html#InterfaceSVGGraphicsElement"/>
+  </metadata>
+  <h:script src="/resources/testharness.js"/>
+  <h:script src="/resources/testharnessreport.js"/>
+
+  <foreignObject width="100px" height="100px">
+    <svg id="svg" width="100px" height="100px">
+      <circle cx="50" cy="0" r="44"
+            fill="blue"></circle>
+    </svg>
+  </foreignObject>
+
+  <script><![CDATA[
+    test(function() {
+        let svg = document.getElementById("svg");
+        svg.setAttribute("style", "padding-left: 12px; transform: rotate(180deg);");
+        let ctm = svg.getScreenCTM();
+        let pt = DOMPoint.fromPoint({x: 50, y: 50});
+        let transformedPoint = pt.matrixTransform(ctm.inverse());
+        svg.removeAttribute("style");
+        assert_equals(transformedPoint.x, pt.x);
+        assert_equals(transformedPoint.y, pt.y);
+    }, 'getScreenCTM with padding-left and rotation');
+
+    test(function() {
+        let svg = document.getElementById("svg");
+        svg.setAttribute("style", "padding-top: 12px; transform: rotate(180deg);");
+        let ctm = svg.getScreenCTM();
+        let pt = DOMPoint.fromPoint({x: 50, y: 50});
+        let transformedPoint = pt.matrixTransform(ctm.inverse());
+        svg.removeAttribute("style");
+        assert_equals(transformedPoint.x, pt.x);
+        assert_equals(transformedPoint.y, pt.y);
+    }, 'getScreenCTM with padding-top and rotation');
+
+    test(function() {
+        let svg = document.getElementById("svg");
+        svg.setAttribute("style", "padding-right: 12px; transform: rotate(180deg);");
+        let ctm = svg.getScreenCTM();
+        let pt = DOMPoint.fromPoint({x: 50, y: 50});
+        let transformedPoint = pt.matrixTransform(ctm.inverse());
+        svg.removeAttribute("style");
+        assert_equals(transformedPoint.x, pt.x + 12);
+        assert_equals(transformedPoint.y, pt.y);
+    }, 'getScreenCTM with padding-right and rotation');
+
+    test(function() {
+        let svg = document.getElementById("svg");
+        svg.setAttribute("style", "padding-left: 12px; transform: rotate(180deg); transform-box: content-box");
+        let ctm = svg.getScreenCTM();
+        let pt = DOMPoint.fromPoint({x: 50, y: 50});
+        let transformedPoint = pt.matrixTransform(ctm.inverse());
+        svg.removeAttribute("style");
+        assert_equals(transformedPoint.x, pt.x + 12);
+        assert_equals(transformedPoint.y, pt.y);
+    }, 'getScreenCTM with padding-left, rotation and content-box');
+
+  ]]></script>
+</svg>
diff --git a/tests/wpt/tests/tools/certs/cacert.key b/tests/wpt/tests/tools/certs/cacert.key
index dd47af3f939..26e5b3577da 100644
--- a/tests/wpt/tests/tools/certs/cacert.key
+++ b/tests/wpt/tests/tools/certs/cacert.key
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIQ5KidoYVfxkCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMn0jRuVwL1yBIIEyP+RfjlPlBdC
-KpYXU3bQMGIXnYeQLoaaGjVGtsOsTs5qtvFVMkU2dbSmJHS81n4s8F2fDO0R8QiR
-EICZJsD8/A16teQrxBy29ZSlpKNZQyGJkaJSoyPgLHBTMWJDvYKlu407xzoxXnx6
-FDVdTrVNmza0tdG2MN9r/hAuZoobWYyjJrazELB5yTTm2ZFNT7H9gF+K2eTDa/g5
-1cTeUBDNoC7ejtILyJALBNcN6eGnXZeeQLg1Dx93aUObSUpiYrqn9Q4zhzOUkaYw
-jvErFMQvU9YW0HFN/J2YVbvlC/jsk6l3rFFObiWHkwhKJc2+pXu9z6Hhv/o1i7uu
-XlXcNPD+poqsmrhOvEjmTK4Og8QvEcoR/lOUWBBhgLqtkD88SHJrqBb5JStaAStH
-c/Q+oYnox3VAhMU0sB8thg2KQ+piTGLQP/2aD1NJvNul2JEB9zAcVAoCSCz1mc8P
-yGyvoZKGBmvqEskX0JMCnx6sLKOlKtqFF2/9Uair/6vrQND8MLU/ksjzzUncb24n
-jokua7HbmrBw7GKQH+75/0nJWOMusTZtrwxCVKWJL3M6LQ9N4NaP0nbvfj54lyVy
-lGBD6W9fXB3/4FjmIFEqd9T+ltgmJlHSUUox3avXS3PAuGfaIFYZ4Tjoik1uYIt4
-S3NMwH6ysI+4UrU1D/1UJl+7/KSLo/k+hq0hH/0D0XEva8FDq4/4HrX843awR0Em
-BUVE7MVIF0hHpbpZ/znV5LFY4czXlgpp3B32ac07i4iJCDk8KCclyCjyMWEFQ87O
-zIMk8h/BjiP1Uzyr0wGFjyYP2gu7nmuzjrBAkIlWQ9xU9aiTfwQkEkMo7RJA4M1b
-DC9Vdt4Mfzv603UdwAF8BVozgWxONV37VLbAu4r0ENw0C2rf9ZGxO1D9KITjVVF8
-xcSWsm7n0VATqd5MB6sUyzc7AuyQbewQ1AMsTNv5baxLooka/NZTcfqXQmD08C7O
-pXJP3kUJweNXw6lUsjtR0VYe0MJOeo2oe/CLoDv+xej4Ez5xTPDAdzIJEk6K8Y7C
-jCcIhTz2WOiTA2MDE1UmY8lZJzaWNjNfetGcfIBh00YYcsmSVByr/YbKgh7KN1Rb
-Qek2k0l390jLOG64t1MM6QaNCDX11bq+pS2hSVyivfE7olrrWjxdjHFOlFqcHRVE
-8+lMewf6RfO8iYZtHNgcVFYZcTyo/wbf9fEN5YAuoG++3U6vTITtWhXp9GoRGZ/i
-EBfJzvuFt2FU5GbBub9n3fC/d+iOUeVl8jtZ3+xK5MAHdbTs1E4+AW9goU8pSXcF
-JEJcF4AAj76XbKH0U+jC2umrkFOlVXP/hnuPxZcKDhaHVBB0Z8xSHo6RClUc/+rP
-pgfeMvFf4tnEdGPdj2ZUc808nilzJ63jB+cVuZJB7lnGQCPMH8k+pnBSFkJmk+To
-vk2HckfrW1d3rZ59jHBPySEbv8a7wLm+adSJGtG1CK8wHKhhGyXbgpE1OTtLWUec
-n//yDEvVhs/p8HDmRvARBdc93CLWhM/YhPLzSrItCFuPWOMuOTXINZGb4KqQixcN
-yb6GjBGNwNnXjDlpj23vlxUBYS3iRnOit84aPH1JdAxElTc8oI63siwjc5LoUhQZ
-cY5MQqTzu2MhIeEwgqlXmQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIpUw2O6vqIOICAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECC/kCOUsjFG4BIIEyNaOHDPpzWlg
+eUKbue3TpEf8QbSVYwfviTNTCV+cOPzoY3FndudWC4TNyJDZkzj4x1CAWhk6tsE2
+hrP2XqDsdzeVgHpP8x3728N0PWZWvh8dSZ9cnTnQ235J89ji85yGgXzMcFULi70z
+DsusD5MZcV8l58zQCoREOeQMiyLX8qN+QvYjgtGkuSAtcFnOrlMMnW+TI0UTYXnQ
+ifN2KoyQ9HX2S4P/vV1x0SAtwYoS1+T8l0PElrjAYGKyKWS/O0dgEx82vuX9Xfbg
+kHELMtEWl6bplfKfXoKDNg5wSc46giKa5VsyZ+qTRHoeUiTsX6YQtRMB7iaHyQlt
+lja0FAm2QQqC9oXfW+a+vGD4O/RvBkfuHyRbXfjdcwlKT9FgczEY8iDTCNXeYTwM
+pBosgMvKAuIDvplQlyrmbRpCFdIqg6LvWW2IJ7a42DtvbKGeV/iyvMbj4XLFyKov
+2RG51rFBXXejFRspn+10YuV9X9Q3YeJwB9riLAF3oy/rYeFCVwM8k3fjWRgop2/W
+XzD1Us0/GuDr7Fe1mABWgawCc/a6Hp5tmLG60ly08lw3A9DGuqIHXxexyD749xMa
+baT99DlCjmRsr3i8XVBCvblj03rXIdLwVzqWM2+a6Rkp3DDqrY2Vk8Q4zIryRo3w
+5U+u7pqiyTEzy+SFRCuEIUncg+HeOsnvYIUGo4FAY7tmzTh2s1GBUK/+pSI5tJUa
+57/trW6nazO2ry0e1V54RKn2OZQau8RYlFQMDuMdpSwEa/jp7Xh9XQS2vstf8Ed5
+J8YFJIsrkE17xX+tiIUis3ZIO4SGZNH8w+Mdt693c2mnbaVeqKxjoV7i0YhDbXz8
+NdYGLrmRaMqB8r6BzsMJn8/D2fuVbuOFQn+gg8iRYyVmqsbih4IpD1GO/bQr9H8A
+re2MR7Mohh4KJKfsykvtWs7wxdd0vWkNqXo6QdNrayy9H1qlpC7NxUYH7DvjZCgh
+k7XPaZnfmCcOmGJ/hnUHUZynzKlZbz5lvVKuAUJ5bLvQyfpgdJYOm3tXp4bwpM2I
+AhLqUISPQwpdpi9EFQrbyRCAPrYDcdWSGiEwAMKt5cILwW2gsqhnc6MQn0EQA/uT
+NZwSD/Q3q4lqWOqWiezQ0zupt4eq7aOgYtvO4qfscTDSSUiO/LRvZ0vaqmjPE1Ix
+5fJ1zY2DVp/NFRTRgjzjPyZXjVI1xIx9NgBRlzBMXVrbcMN4kgLoRwt7DSrH1UjU
+rwKuFHbQj75lG/EQ2L4mEqPCQywkIoZYzGGsQ5TqFH9KZyOkUUEbfQXs9hvw2+E5
+qC+2zxF9yp7Fj0+lhlE6P/zHcx5TNfmPL/lXr36jsqlOHl5YAGPvJiR19MqH893o
+p1J0wRIRGgPPe9zKGkyyH3KrathyvpbtxRHxzZnWnk0FE+rWp67YG2pg0vrRItY6
+jy9KW+U+0bBZWkxVJ9c26LYFb+g5jkvMHiJTFIluXIcjU0Eysvh8iOMwuUVLIEQ5
+8CgOwhHv9+Ct7nGC0tOOP5oZMvnKfbuuLpDU22zbksVcEBWoHDOTlDObnveQR0Lg
+trcoyMDQyJnlufs1I67cIcEMBzx8j3wxsvVf7whWm9mGpdE6DHdnLOKOdvF+A45N
+eofAWq/S0TFkNBX7I6FZUw==
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/wpt/tests/tools/certs/cacert.pem b/tests/wpt/tests/tools/certs/cacert.pem
index 7b3fb3da14d..18255d04961 100644
--- a/tests/wpt/tests/tools/certs/cacert.pem
+++ b/tests/wpt/tests/tools/certs/cacert.pem
@@ -1,125 +1,125 @@
 -----BEGIN CERTIFICATE-----
-MIIW5TCCFc2gAwIBAgICBIIwDQYJKoZIhvcNAQELBQAwHTEbMBkGA1UEAwwSd2Vi
-LXBsYXRmb3JtLXRlc3RzMB4XDTI0MTAxMjAxMDQ0NloXDTI1MTAxMjAxMDQ0Nlow
-HTEbMBkGA1UEAwwSd2ViLXBsYXRmb3JtLXRlc3RzMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA03kHWKuFeT1xtYw3M/hYmoGe9ZM26J2WIPIVD0SOU86w
-g+2L5JwllOH5L4i6vSz4qV2NAYnpSCUNNIGk7F8YLWFXP8O8GDMgjg1V/JDYCPj5
-KFa6bAjLhHD9tLKVcRn7h6L7Y7FYWkYm6LWNOctg5UTbZVUEcCq0xeZKJXGJFguV
-RK9CTz5wWUxYN3LvdAnW2XyryPqyUZSHcF55zYJBLDNUxkdPjI7nLS/y+WryIK89
-47RhiwbI9yI26Ir3IcFy2xLjs5+qo1DJcfCVC/m/8+86tgiSqmJwTJUW/cAVSd51
-F5X0P2SSP2YZctEXSInSUDMFmdQMecpxQBZV2pWNjQIDAQABo4IULTCCFCkwDAYD
-VR0TBAUwAwEB/zAdBgNVHQ4EFgQUyWVn3/hgxfvg9xXR7Vttc+Jz1OcwRgYDVR0j
-BD8wPYAUyWVn3/hgxfvg9xXR7Vttc+Jz1OehIaQfMB0xGzAZBgNVBAMMEndlYi1w
-bGF0Zm9ybS10ZXN0c4ICBIIwCwYDVR0PBAQDAgIEMIIKBQYDVR0eBIIJ/DCCCfig
-ggn0MBOCEXdlYi1wbGF0Zm9ybS50ZXN0MBeCFXd3dy53ZWItcGxhdGZvcm0udGVz
-dDAXghVub3Qtd2ViLXBsYXRmb3JtLnRlc3QwGIIWd3d3MS53ZWItcGxhdGZvcm0u
-dGVzdDAYghZ3d3cyLndlYi1wbGF0Zm9ybS50ZXN0MBuCGXd3dy53d3cud2ViLXBs
-YXRmb3JtLnRlc3QwG4IZd3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdDAcghp3d3cy
-Lnd3dy53ZWItcGxhdGZvcm0udGVzdDAcghp3d3cxLm5vdC13ZWItcGxhdGZvcm0u
-dGVzdDAcghp3d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdDAcghp3d3cud3d3MS53
-ZWItcGxhdGZvcm0udGVzdDAcghp3d3cud3d3Mi53ZWItcGxhdGZvcm0udGVzdDAc
-ghp3d3cxLnd3dy53ZWItcGxhdGZvcm0udGVzdDAdght3d3cyLnd3dzIud2ViLXBs
-YXRmb3JtLnRlc3QwHYIbd3d3MS53d3cxLndlYi1wbGF0Zm9ybS50ZXN0MB2CG3d3
-dzIud3d3MS53ZWItcGxhdGZvcm0udGVzdDAdght3d3cxLnd3dzIud2ViLXBsYXRm
-b3JtLnRlc3QwH4Idd3d3Lnd3dy5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwIIIed3d3
-Lnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCCCHnd3dzIud3d3Lm5vdC13ZWIt
-cGxhdGZvcm0udGVzdDAggh53d3cud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3Qw
-IIIeeG4tLWx2ZS02bGFkLndlYi1wbGF0Zm9ybS50ZXN0MCCCHnd3dzEud3d3Lm5v
-dC13ZWItcGxhdGZvcm0udGVzdDAhgh93d3cxLnd3dzIubm90LXdlYi1wbGF0Zm9y
-bS50ZXN0MCGCH3d3dzIud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwIYIfd3d3
-Mi53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdDAhgh93d3cxLnd3dzEubm90LXdl
-Yi1wbGF0Zm9ybS50ZXN0MCSCInhuLS1sdmUtNmxhZC53d3cud2ViLXBsYXRmb3Jt
-LnRlc3QwJIIid3d3LnhuLS1sdmUtNmxhZC53ZWItcGxhdGZvcm0udGVzdDAkgiJ4
-bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCWCI3d3dzEueG4tLWx2
-ZS02bGFkLndlYi1wbGF0Zm9ybS50ZXN0MCWCI3huLS1sdmUtNmxhZC53d3cxLndl
-Yi1wbGF0Zm9ybS50ZXN0MCWCI3d3dzIueG4tLWx2ZS02bGFkLndlYi1wbGF0Zm9y
-bS50ZXN0MCWCI3huLS1sdmUtNmxhZC53d3cyLndlYi1wbGF0Zm9ybS50ZXN0MCiC
-Jnd3dy54bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCiCJnhuLS1s
-dmUtNmxhZC53d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCmCJ3d3dzIueG4tLWx2
-ZS02bGFkLm5vdC13ZWItcGxhdGZvcm0udGVzdDApgid4bi0tbHZlLTZsYWQud3d3
-MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwKYIneG4tLWx2ZS02bGFkLnd3dzIubm90
-LXdlYi1wbGF0Zm9ybS50ZXN0MCmCJ3d3dzEueG4tLWx2ZS02bGFkLm5vdC13ZWIt
-cGxhdGZvcm0udGVzdDArgil4bi0tbjhqNmRzNTNsd3drcnFodjI4YS53ZWItcGxh
-dGZvcm0udGVzdDAtgit4bi0tbHZlLTZsYWQueG4tLWx2ZS02bGFkLndlYi1wbGF0
-Zm9ybS50ZXN0MC+CLXd3dy54bi0tbjhqNmRzNTNsd3drcnFodjI4YS53ZWItcGxh
-dGZvcm0udGVzdDAvgi14bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cud2ViLXBs
-YXRmb3JtLnRlc3QwL4IteG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdlYi1w
-bGF0Zm9ybS50ZXN0MDCCLnd3dzEueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2Vi
-LXBsYXRmb3JtLnRlc3QwMIIueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud3d3MS53
-ZWItcGxhdGZvcm0udGVzdDAwgi54bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cy
-LndlYi1wbGF0Zm9ybS50ZXN0MDCCLnd3dzIueG4tLW44ajZkczUzbHd3a3JxaHYy
-OGEud2ViLXBsYXRmb3JtLnRlc3QwMYIveG4tLWx2ZS02bGFkLnhuLS1sdmUtNmxh
-ZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwM4Ixd3d3LnhuLS1uOGo2ZHM1M2x3d2ty
-cWh2MjhhLm5vdC13ZWItcGxhdGZvcm0udGVzdDAzgjF4bi0tbjhqNmRzNTNsd3dr
-cnFodjI4YS53d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0MDSCMnd3dzEueG4tLW44
-ajZkczUzbHd3a3JxaHYyOGEubm90LXdlYi1wbGF0Zm9ybS50ZXN0MDSCMnhuLS1u
-OGo2ZHM1M2x3d2tycWh2MjhhLnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0MDSC
-Mnd3dzIueG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdlYi1wbGF0Zm9ybS50
-ZXN0MDSCMnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dzIubm90LXdlYi1wbGF0
-Zm9ybS50ZXN0MDiCNnhuLS1sdmUtNmxhZC54bi0tbjhqNmRzNTNsd3drcnFodjI4
-YS53ZWItcGxhdGZvcm0udGVzdDA4gjZ4bi0tbjhqNmRzNTNsd3drcnFodjI4YS54
-bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3QwPII6eG4tLWx2ZS02bGFkLnhu
-LS1uOGo2ZHM1M2x3d2tycWh2MjhhLm5vdC13ZWItcGxhdGZvcm0udGVzdDA8gjp4
-bi0tbjhqNmRzNTNsd3drcnFodjI4YS54bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0
-Zm9ybS50ZXN0MEOCQXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnhuLS1uOGo2ZHM1
-M2x3d2tycWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0MEeCRXhuLS1uOGo2ZHM1M2x3
-d2tycWh2MjhhLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLm5vdC13ZWItcGxhdGZv
-cm0udGVzdDATBgNVHSUEDDAKBggrBgEFBQcDATCCCYUGA1UdEQSCCXwwggl4ghF3
-ZWItcGxhdGZvcm0udGVzdIIVd3d3LndlYi1wbGF0Zm9ybS50ZXN0ghVub3Qtd2Vi
-LXBsYXRmb3JtLnRlc3SCFnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCFnd3dzIud2Vi
-LXBsYXRmb3JtLnRlc3SCGXd3dy53d3cud2ViLXBsYXRmb3JtLnRlc3SCGXd3dy5u
-b3Qtd2ViLXBsYXRmb3JtLnRlc3SCGnd3dzIud3d3LndlYi1wbGF0Zm9ybS50ZXN0
-ghp3d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIad3d3Mi5ub3Qtd2ViLXBsYXRm
-b3JtLnRlc3SCGnd3dy53d3cxLndlYi1wbGF0Zm9ybS50ZXN0ghp3d3cud3d3Mi53
-ZWItcGxhdGZvcm0udGVzdIIad3d3MS53d3cud2ViLXBsYXRmb3JtLnRlc3SCG3d3
-dzIud3d3Mi53ZWItcGxhdGZvcm0udGVzdIIbd3d3MS53d3cxLndlYi1wbGF0Zm9y
-bS50ZXN0ght3d3cyLnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCG3d3dzEud3d3Mi53
-ZWItcGxhdGZvcm0udGVzdIIdd3d3Lnd3dy5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SC
-Hnd3dy53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdIIed3d3Mi53d3cubm90LXdl
-Yi1wbGF0Zm9ybS50ZXN0gh53d3cud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SC
-HnhuLS1sdmUtNmxhZC53ZWItcGxhdGZvcm0udGVzdIIed3d3MS53d3cubm90LXdl
-Yi1wbGF0Zm9ybS50ZXN0gh93d3cxLnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0
-gh93d3cyLnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0gh93d3cyLnd3dzIubm90
-LXdlYi1wbGF0Zm9ybS50ZXN0gh93d3cxLnd3dzEubm90LXdlYi1wbGF0Zm9ybS50
-ZXN0giJ4bi0tbHZlLTZsYWQud3d3LndlYi1wbGF0Zm9ybS50ZXN0giJ3d3cueG4t
-LWx2ZS02bGFkLndlYi1wbGF0Zm9ybS50ZXN0giJ4bi0tbHZlLTZsYWQubm90LXdl
-Yi1wbGF0Zm9ybS50ZXN0giN3d3cxLnhuLS1sdmUtNmxhZC53ZWItcGxhdGZvcm0u
-dGVzdIIjeG4tLWx2ZS02bGFkLnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCI3d3dzIu
-eG4tLWx2ZS02bGFkLndlYi1wbGF0Zm9ybS50ZXN0giN4bi0tbHZlLTZsYWQud3d3
-Mi53ZWItcGxhdGZvcm0udGVzdIImd3d3LnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBs
-YXRmb3JtLnRlc3SCJnhuLS1sdmUtNmxhZC53d3cubm90LXdlYi1wbGF0Zm9ybS50
-ZXN0gid3d3cyLnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCJ3hu
-LS1sdmUtNmxhZC53d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIneG4tLWx2ZS02
-bGFkLnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0gid3d3cxLnhuLS1sdmUtNmxh
-ZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCKXhuLS1uOGo2ZHM1M2x3d2tycWh2Mjhh
-LndlYi1wbGF0Zm9ybS50ZXN0git4bi0tbHZlLTZsYWQueG4tLWx2ZS02bGFkLndl
-Yi1wbGF0Zm9ybS50ZXN0gi13d3cueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2Vi
-LXBsYXRmb3JtLnRlc3SCLXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dy53ZWIt
-cGxhdGZvcm0udGVzdIIteG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdlYi1w
-bGF0Zm9ybS50ZXN0gi53d3cxLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1w
-bGF0Zm9ybS50ZXN0gi54bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cxLndlYi1w
-bGF0Zm9ybS50ZXN0gi54bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cyLndlYi1w
-bGF0Zm9ybS50ZXN0gi53d3cyLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1w
-bGF0Zm9ybS50ZXN0gi94bi0tbHZlLTZsYWQueG4tLWx2ZS02bGFkLm5vdC13ZWIt
-cGxhdGZvcm0udGVzdIIxd3d3LnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLm5vdC13
-ZWItcGxhdGZvcm0udGVzdIIxeG4tLW44ajZkczUzbHd3a3JxaHYyOGEud3d3Lm5v
-dC13ZWItcGxhdGZvcm0udGVzdIIyd3d3MS54bi0tbjhqNmRzNTNsd3drcnFodjI4
-YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCMnhuLS1uOGo2ZHM1M2x3d2tycWh2Mjhh
-Lnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0gjJ3d3cyLnhuLS1uOGo2ZHM1M2x3
-d2tycWh2MjhhLm5vdC13ZWItcGxhdGZvcm0udGVzdIIyeG4tLW44ajZkczUzbHd3
-a3JxaHYyOGEud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCNnhuLS1sdmUtNmxh
-ZC54bi0tbjhqNmRzNTNsd3drcnFodjI4YS53ZWItcGxhdGZvcm0udGVzdII2eG4t
-LW44ajZkczUzbHd3a3JxaHYyOGEueG4tLWx2ZS02bGFkLndlYi1wbGF0Zm9ybS50
-ZXN0gjp4bi0tbHZlLTZsYWQueG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdl
-Yi1wbGF0Zm9ybS50ZXN0gjp4bi0tbjhqNmRzNTNsd3drcnFodjI4YS54bi0tbHZl
-LTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0gkF4bi0tbjhqNmRzNTNsd3drcnFo
-djI4YS54bi0tbjhqNmRzNTNsd3drcnFodjI4YS53ZWItcGxhdGZvcm0udGVzdIJF
-eG4tLW44ajZkczUzbHd3a3JxaHYyOGEueG4tLW44ajZkczUzbHd3a3JxaHYyOGEu
-bm90LXdlYi1wbGF0Zm9ybS50ZXN0MA0GCSqGSIb3DQEBCwUAA4IBAQBifqUfZhtG
-pcQJgQ86u/1+uO39IfQ7gpLcBVc6YBmZ9NBBkk7Du8+JJ1eDBw+U47usXPkc1oqu
-Nv7k9Gg2Ln0I5mVVVcBUP84z0pxKCc6KKhJXcjSu9dMFBxT/pjDpPQ1WVzPJVmNw
-ywuRlVHQxk5Pc3dXKUAZoti7GoX1yd1xMH8Rz2vL9f7QLW+uVvRbhSp6DcTq8BPJ
-RLni1DQ9J02nHhD/JULUoxp/2HLDdPt/++145Eoy5GlycNcqw7VVraongsVAuG6h
-7zZYthFwc6+81dxaGmsgOG7baljBN4k4Jdjkt6P+0QVodn/+5Sto+Gb1TzoYjYpY
-J9G36zcLRJyc
+MIIW5zCCFc+gAwIBAgIDASwmMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
+Yi1wbGF0Zm9ybS10ZXN0czAeFw0yNTA0MTIwMTExNTlaFw0yNjA0MTIwMTExNTla
+MB0xGzAZBgNVBAMMEndlYi1wbGF0Zm9ybS10ZXN0czCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAJvUl2G2W4ugGe6jB1pcU00qxeDvhVEbty5zTYUsl/ME
+9hgeLJkmmlyt2ldMxFLeBrpIqs67Sv0q4jS06ZDn3oycWOkcxGMuADOsFXzPGEFy
+AXAF/bT5+dVjX2H7KehAK8C0wZvpzPUroz2NDyi1aTKQJ09qkBZDKL9tzK+597fB
+Ae9hUih3JwCkNJjmTR8PRQ45UdNeX6Uk1doy5FWM+FKp4EWq2N/eLdHnO6NOpeke
+hV/Npet1iI+zuEbgH/CbTQ/ZugsRW9ClaDrxAVu6UE5KY1FlOXgXV0GRpbBYFsTu
+Oi2ipbAlCh7xIhkmc1OeEAVWPKZLCHm2ueCoqRAh/wUCAwEAAaOCFC4wghQqMAwG
+A1UdEwQFMAMBAf8wHQYDVR0OBBYEFEEdWMtu+JqcUoL0qryS5lajMQyrMEcGA1Ud
+IwRAMD6AFEEdWMtu+JqcUoL0qryS5lajMQyroSGkHzAdMRswGQYDVQQDDBJ3ZWIt
+cGxhdGZvcm0tdGVzdHOCAwEsJjALBgNVHQ8EBAMCAgQwggoFBgNVHR4Eggn8MIIJ
++KCCCfQwE4IRd2ViLXBsYXRmb3JtLnRlc3QwF4IVbm90LXdlYi1wbGF0Zm9ybS50
+ZXN0MBeCFXd3dy53ZWItcGxhdGZvcm0udGVzdDAYghZ3d3cxLndlYi1wbGF0Zm9y
+bS50ZXN0MBiCFnd3dzIud2ViLXBsYXRmb3JtLnRlc3QwG4IZd3d3Lm5vdC13ZWIt
+cGxhdGZvcm0udGVzdDAbghl3d3cud3d3LndlYi1wbGF0Zm9ybS50ZXN0MByCGnd3
+dy53d3cxLndlYi1wbGF0Zm9ybS50ZXN0MByCGnd3dzEubm90LXdlYi1wbGF0Zm9y
+bS50ZXN0MByCGnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0MByCGnd3dy53d3cy
+LndlYi1wbGF0Zm9ybS50ZXN0MByCGnd3dzEud3d3LndlYi1wbGF0Zm9ybS50ZXN0
+MByCGnd3dzIud3d3LndlYi1wbGF0Zm9ybS50ZXN0MB2CG3d3dzIud3d3Mi53ZWIt
+cGxhdGZvcm0udGVzdDAdght3d3cxLnd3dzEud2ViLXBsYXRmb3JtLnRlc3QwHYIb
+d3d3MS53d3cyLndlYi1wbGF0Zm9ybS50ZXN0MB2CG3d3dzIud3d3MS53ZWItcGxh
+dGZvcm0udGVzdDAfgh13d3cud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdDAggh54
+bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3QwIIIed3d3Lnd3dzIubm90LXdl
+Yi1wbGF0Zm9ybS50ZXN0MCCCHnd3dzIud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVz
+dDAggh53d3cud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwIIIed3d3MS53d3cu
+bm90LXdlYi1wbGF0Zm9ybS50ZXN0MCGCH3d3dzEud3d3MS5ub3Qtd2ViLXBsYXRm
+b3JtLnRlc3QwIYIfd3d3Mi53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdDAhgh93
+d3cyLnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCGCH3d3dzEud3d3Mi5ub3Qt
+d2ViLXBsYXRmb3JtLnRlc3QwJIIieG4tLWx2ZS02bGFkLnd3dy53ZWItcGxhdGZv
+cm0udGVzdDAkgiJ3d3cueG4tLWx2ZS02bGFkLndlYi1wbGF0Zm9ybS50ZXN0MCSC
+InhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwJYIjeG4tLWx2ZS02
+bGFkLnd3dzEud2ViLXBsYXRmb3JtLnRlc3QwJYIjd3d3MS54bi0tbHZlLTZsYWQu
+d2ViLXBsYXRmb3JtLnRlc3QwJYIjd3d3Mi54bi0tbHZlLTZsYWQud2ViLXBsYXRm
+b3JtLnRlc3QwJYIjeG4tLWx2ZS02bGFkLnd3dzIud2ViLXBsYXRmb3JtLnRlc3Qw
+KIImeG4tLWx2ZS02bGFkLnd3dy5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwKIImd3d3
+LnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwKYIneG4tLWx2ZS02
+bGFkLnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCmCJ3huLS1sdmUtNmxhZC53
+d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdDApgid3d3cxLnhuLS1sdmUtNmxhZC5u
+b3Qtd2ViLXBsYXRmb3JtLnRlc3QwKYInd3d3Mi54bi0tbHZlLTZsYWQubm90LXdl
+Yi1wbGF0Zm9ybS50ZXN0MCuCKXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1w
+bGF0Zm9ybS50ZXN0MC2CK3huLS1sdmUtNmxhZC54bi0tbHZlLTZsYWQud2ViLXBs
+YXRmb3JtLnRlc3QwL4Itd3d3LnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1w
+bGF0Zm9ybS50ZXN0MC+CLXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dy53ZWIt
+cGxhdGZvcm0udGVzdDAvgi14bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2Vi
+LXBsYXRmb3JtLnRlc3QwMIIueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud3d3Mi53
+ZWItcGxhdGZvcm0udGVzdDAwgi53d3cyLnhuLS1uOGo2ZHM1M2x3d2tycWh2Mjhh
+LndlYi1wbGF0Zm9ybS50ZXN0MDCCLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3
+dzEud2ViLXBsYXRmb3JtLnRlc3QwMIIud3d3MS54bi0tbjhqNmRzNTNsd3drcnFo
+djI4YS53ZWItcGxhdGZvcm0udGVzdDAxgi94bi0tbHZlLTZsYWQueG4tLWx2ZS02
+bGFkLm5vdC13ZWItcGxhdGZvcm0udGVzdDAzgjF4bi0tbjhqNmRzNTNsd3drcnFo
+djI4YS53d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0MDOCMXd3dy54bi0tbjhqNmRz
+NTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwNIIyeG4tLW44ajZk
+czUzbHd3a3JxaHYyOGEud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwNIIyd3d3
+MS54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3Qw
+NIIyeG4tLW44ajZkczUzbHd3a3JxaHYyOGEud3d3Mi5ub3Qtd2ViLXBsYXRmb3Jt
+LnRlc3QwNIIyd3d3Mi54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBs
+YXRmb3JtLnRlc3QwOII2eG4tLWx2ZS02bGFkLnhuLS1uOGo2ZHM1M2x3d2tycWh2
+MjhhLndlYi1wbGF0Zm9ybS50ZXN0MDiCNnhuLS1uOGo2ZHM1M2x3d2tycWh2Mjhh
+LnhuLS1sdmUtNmxhZC53ZWItcGxhdGZvcm0udGVzdDA8gjp4bi0tbjhqNmRzNTNs
+d3drcnFodjI4YS54bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0MDyC
+OnhuLS1sdmUtNmxhZC54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBs
+YXRmb3JtLnRlc3QwQ4JBeG4tLW44ajZkczUzbHd3a3JxaHYyOGEueG4tLW44ajZk
+czUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3QwR4JFeG4tLW44ajZkczUz
+bHd3a3JxaHYyOGEueG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdlYi1wbGF0
+Zm9ybS50ZXN0MBMGA1UdJQQMMAoGCCsGAQUFBwMBMIIJhQYDVR0RBIIJfDCCCXiC
+EXdlYi1wbGF0Zm9ybS50ZXN0ghVub3Qtd2ViLXBsYXRmb3JtLnRlc3SCFXd3dy53
+ZWItcGxhdGZvcm0udGVzdIIWd3d3MS53ZWItcGxhdGZvcm0udGVzdIIWd3d3Mi53
+ZWItcGxhdGZvcm0udGVzdIIZd3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIZd3d3
+Lnd3dy53ZWItcGxhdGZvcm0udGVzdIIad3d3Lnd3dzEud2ViLXBsYXRmb3JtLnRl
+c3SCGnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0ghp3d3cyLm5vdC13ZWItcGxh
+dGZvcm0udGVzdIIad3d3Lnd3dzIud2ViLXBsYXRmb3JtLnRlc3SCGnd3dzEud3d3
+LndlYi1wbGF0Zm9ybS50ZXN0ghp3d3cyLnd3dy53ZWItcGxhdGZvcm0udGVzdIIb
+d3d3Mi53d3cyLndlYi1wbGF0Zm9ybS50ZXN0ght3d3cxLnd3dzEud2ViLXBsYXRm
+b3JtLnRlc3SCG3d3dzEud3d3Mi53ZWItcGxhdGZvcm0udGVzdIIbd3d3Mi53d3cx
+LndlYi1wbGF0Zm9ybS50ZXN0gh13d3cud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVz
+dIIeeG4tLWx2ZS02bGFkLndlYi1wbGF0Zm9ybS50ZXN0gh53d3cud3d3Mi5ub3Qt
+d2ViLXBsYXRmb3JtLnRlc3SCHnd3dzIud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVz
+dIIed3d3Lnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0gh53d3cxLnd3dy5ub3Qt
+d2ViLXBsYXRmb3JtLnRlc3SCH3d3dzEud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRl
+c3SCH3d3dzIud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3dzIud3d3MS5u
+b3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3dzEud3d3Mi5ub3Qtd2ViLXBsYXRmb3Jt
+LnRlc3SCInhuLS1sdmUtNmxhZC53d3cud2ViLXBsYXRmb3JtLnRlc3SCInd3dy54
+bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCInhuLS1sdmUtNmxhZC5ub3Qt
+d2ViLXBsYXRmb3JtLnRlc3SCI3huLS1sdmUtNmxhZC53d3cxLndlYi1wbGF0Zm9y
+bS50ZXN0giN3d3cxLnhuLS1sdmUtNmxhZC53ZWItcGxhdGZvcm0udGVzdIIjd3d3
+Mi54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCI3huLS1sdmUtNmxhZC53
+d3cyLndlYi1wbGF0Zm9ybS50ZXN0giZ4bi0tbHZlLTZsYWQud3d3Lm5vdC13ZWIt
+cGxhdGZvcm0udGVzdIImd3d3LnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3Jt
+LnRlc3SCJ3huLS1sdmUtNmxhZC53d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIn
+eG4tLWx2ZS02bGFkLnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0gid3d3cxLnhu
+LS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCJ3d3dzIueG4tLWx2ZS02
+bGFkLm5vdC13ZWItcGxhdGZvcm0udGVzdIIpeG4tLW44ajZkczUzbHd3a3JxaHYy
+OGEud2ViLXBsYXRmb3JtLnRlc3SCK3huLS1sdmUtNmxhZC54bi0tbHZlLTZsYWQu
+d2ViLXBsYXRmb3JtLnRlc3SCLXd3dy54bi0tbjhqNmRzNTNsd3drcnFodjI4YS53
+ZWItcGxhdGZvcm0udGVzdIIteG4tLW44ajZkczUzbHd3a3JxaHYyOGEud3d3Lndl
+Yi1wbGF0Zm9ybS50ZXN0gi14bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2Vi
+LXBsYXRmb3JtLnRlc3SCLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dzIud2Vi
+LXBsYXRmb3JtLnRlc3SCLnd3dzIueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2Vi
+LXBsYXRmb3JtLnRlc3SCLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dzEud2Vi
+LXBsYXRmb3JtLnRlc3SCLnd3dzEueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2Vi
+LXBsYXRmb3JtLnRlc3SCL3huLS1sdmUtNmxhZC54bi0tbHZlLTZsYWQubm90LXdl
+Yi1wbGF0Zm9ybS50ZXN0gjF4bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cubm90
+LXdlYi1wbGF0Zm9ybS50ZXN0gjF3d3cueG4tLW44ajZkczUzbHd3a3JxaHYyOGEu
+bm90LXdlYi1wbGF0Zm9ybS50ZXN0gjJ4bi0tbjhqNmRzNTNsd3drcnFodjI4YS53
+d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIyd3d3MS54bi0tbjhqNmRzNTNsd3dr
+cnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCMnhuLS1uOGo2ZHM1M2x3d2ty
+cWh2MjhhLnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0gjJ3d3cyLnhuLS1uOGo2
+ZHM1M2x3d2tycWh2MjhhLm5vdC13ZWItcGxhdGZvcm0udGVzdII2eG4tLWx2ZS02
+bGFkLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0gjZ4
+bi0tbjhqNmRzNTNsd3drcnFodjI4YS54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3Jt
+LnRlc3SCOnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnhuLS1sdmUtNmxhZC5ub3Qt
+d2ViLXBsYXRmb3JtLnRlc3SCOnhuLS1sdmUtNmxhZC54bi0tbjhqNmRzNTNsd3dr
+cnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCQXhuLS1uOGo2ZHM1M2x3d2ty
+cWh2MjhhLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0
+gkV4bi0tbjhqNmRzNTNsd3drcnFodjI4YS54bi0tbjhqNmRzNTNsd3drcnFodjI4
+YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwDQYJKoZIhvcNAQELBQADggEBAGScyqdj
+uxMwU2CgtFG8+oQK0sWMb2yQibpyvfhZ2PSnfsTNNNyfQRSK2mnPWizjE2Ocx63S
+TEIjsA/veH/kfWdxxXie93VFyacy/LTyETEb40a5UMJA6Im9LkT2Fpp/SLSxAapA
+Hj7fCIaVBpuCVbPDkKxa+zZj9mc7p6Z6o1dwtbzkR4NqoCElcHwjwYo0zlqNq1jc
+BLHeoDASFi0RD1x0mNlVmDIg/hJqdN8jbPm+LOxKVgey1Fq7tsz29MJR6Hbf9kYT
+A6kIiYuDODSXWIxWYRlWgJaaI35FJqWeRtpBZaDLSontIN4X3cnTChYJREVNmFGx
+xmf4NMjFPYpIFUE=
 -----END CERTIFICATE-----
diff --git a/tests/wpt/tests/tools/certs/web-platform.test.key b/tests/wpt/tests/tools/certs/web-platform.test.key
index 4f68bb3caa0..2516ae74593 100644
--- a/tests/wpt/tests/tools/certs/web-platform.test.key
+++ b/tests/wpt/tests/tools/certs/web-platform.test.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDg/mIE/8f6jTVz
-bI2TZwmA+tIws6+TpSuhuot9JbArcIf1JSicQl2itKgDFqM1iktbHeLfYChZw3TS
-QZUyhalfCG3aphUwH1bjGbRAuBHIOS3ncCl/aCvqbIrU3PRpCIVTMfz5OtDlT5CR
-ynwg9qLlxacpiyj9nw2ASEoN3liLWbQOROhuPtvmRKwaFRm7OY669oFwaQqoeDrC
-B9LPlEJiYjWjBZIghnsE1Y0DSV7lz+m7cKYG+PnZKNYfKg7/MV2g5PqWXqEziJBG
-FoicL4Dbsk7X+wvG+T9NwKrQKE0t1sE+oIsRdLLXvp0k++um57IN1KuvK1xV/Mg9
-TeVx/zlpAgMBAAECggEASFMdmTPLygvYcckkXYzSrkZyiLtKJnEC7JM1wb36uowK
-+E/AlTJ0PRhLpeqB/nT9MkYSJvIXJnvBMtFoL3xt7KGeBpo612RLnuclXWSOOsm+
-qtYQUOdgrpPDsRdx7c2SZiL8ifVRL1V7SJJJgqMlzCzURnN4csbNJT6Xp4ug9PH/
-sn8kWgZyEPW2MdkbY0APykbkWzXvkyJQ4l9qm3Z1sbWQLHkvyD3aP0fS4EGtOoY7
-shgufnXmkGRkSl3oSg/JT7+z/W0lExyN28O53Wm9kBlHxmSguHpmH8ihQTpuLy8K
-16Xv9k5z+5qJMEg4oC8/VAHGnlV5gCAFayjfypoLnQKBgQDzVDJZPXNS9OUYCJJE
-sOoAHfBul03uili9ThGtwg6rRBzClsd9ldmjqfBEdPF85o/fnRF8Hhp6IAGjP7wv
-JCY0KKUkIl5KweWCfCtYkVzT6d7q0tMaIx/lL69F6XR0aK3GtMH5zfM6tOb+MVs5
-KxGdkQPEYIDNF2UtNbHeRFkNbwKBgQDstcK2WoCOy4kfifSCL4OKpdZrSXT/pTcA
-3YUMjnNcX/XVNXgHU9z+FLf63oN3D0KvmLqPyz0NEX8ew77FxCxU5LcfPYLtDI0o
-J3F7DZYQKk8MSe4HCbQDwMhDw+RHSE+JJICm0V8yrR9UpW0v7tqLrjk+HiSyx+yp
-MkhgVGDqpwKBgQCSuHkngDsykUI2bKytyLNAYM0iEg/GvxrlAtb8G+A2evqQhtRB
-MIMsAYND8/PM6UVlg1MQsSIr83KpWfwBvN1gZAW3tRWAJExckrycSgJcMU/d7kOm
-JfnMeyVHlY5HxvrJryKrmviHtJ74NRCZdxPHG7LWzY28nNfAG/llWXcM9wKBgF+b
-Eifg6efC4YFxkOY8Fp8bWD1BEBZpPowE7MYjiwiWYY5Z6D7danbdG2oiEWs3KLIP
-t9p4NhJfLL7aROVP1K/9KNFfYNApr6G2PKl81U12KTNHcPI6wxB4/uoP5tW7qRQ1
-QBkgm5i2P99KaY1gpbihB9HFDwF+qmG0Q3NU4UglAoGBAI9fosEAe8SthkTZvUxQ
-cqytj++mWX9Yz2ZKthORFwI6Q3FGYBUx1I67Lu7qiWe69frcw3pN2Yt65jc08w10
-TOEorKsvYnZx5vaPNiFicmW+bpgqfAkL/j7GdDrgddDL9NYVbVGDLHWPRqmtBEfa
-fH90hyluwXFzzgKqYmg+GzKu
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCt6FXDpHkmyFOj
+ZJkJRgmCvTwlEb01AE7qLz0+ScHH3d1a2HJMAkz/rEkZ/XYtdpXNclkuF5pFvzg3
+99C3sa42K6SK5u2VLURaC5L7a4laIYJC/FHmQhupw4CP9oSw+lr/4AY0gadIw1p7
+nzHJmC7zj67bcwKXVGlznBfQkRwTDrfynHjq3e/oqveTamzW2ifxfggcOJcNPZ90
+F7jkPgP2HoJWM8TLP0EPvOtKoyaJET1+qtxAg2IN96o/8bQo/RYJm4U8RZ7vabXy
+44+KFhNOIzmF3iMRESUAPyaOV1T5rgNguHQ2eztudw0A1N3WpA1bp/AE+0zh0T0t
+AikZSBPbAgMBAAECggEAKZLYJdwExluveukKmKfwkBuS7D2wYKJBO0StvF0/gPst
+9pC1yivmolxaYWcxQC8QIrwKS7WCwNe0pdSNRcypG/QU8su/0iCvLWOE8KvFexF1
+pXPSVFxLZqsA6emB0RkYdgDlGto/1mo1EEZ/TXUfDES2BWoaHXkleGjBXK/D6V3/
+cCk3IV5g0wQVpN2V+vmCFAJEJ2Y379CEyBja9i3/mor4uLrsib5mi5o0jDMtEPgE
+qHu0Zy48GtNhAoTBf2TdxGJJt1nqErc11s3ItVcitEKlxmkXrKFXH4uCGBEC204z
+x7p1B4YlNl2E8KJddmE+auYD18o5bPsYElgtIYf5qQKBgQDbV1BTERBH4sT/3O9E
+kwYgTHOz7aLXr/PPCI0vr+0F4TECTVKJgjf8TV7R9nj4zyYnHxsBwfZt9kDvTXrT
+X1/9DToYNNm4VkomDZ4CGo6uI0OAvcX+hNdivLtWIz0ywjaBZ1oMJf9by/gI/AP0
+bMzIcBQcz+mxmZ1H+hXA2lXD/wKBgQDK+RyLYOURinNUyWYt3EXviN1K/Ove3hb4
+bUd1f2ZR4ZPrZNTK2shrgGPyPJctzjpHCszNyJwYmGqrfbflHX9nsSI0WeVZgfLM
+LIVFOhETcbwuem6c8ivO9jt7hbO3Hl4UxkT8PIza79Jgtqw+OP0mGbso6gi2y54i
+gLbrGh1AJQKBgQC2XKnT5mP64HeZoz7rbLGzON0Zw4GYghnbD+kStNoEAW6V02PE
+IBgcFNe5CYsakl/ONvZlR7ZzRkJGs8xi4PEVm2Gproc108hiSwAMD7iA36DH8QAk
+1J2e4ft/alz/TqmyfRNI9m6RC8x069L97Vd1bnnKWrKZjnZN2YcsiFq2UQKBgDk6
+T5AEu9FcRfRL7KFVj+pfnnU8Jozp9XQJ67H3P7Qqc/hUr6KaWRPmWUe9SarCkK/j
+HaePvmM45iqAAc95p6hmywwTpJS+DOUAUHsaSiI/WR2Jq5JYvX1W86J6KhehWkll
+NaIguF4qbBiUqK/KhaWub5Szl81iT63OuMRE0qZ5AoGAX0M1yGNcCgJ0V7gDSjXG
+JNq5AH9Qo/aF7EAz9oLZBs3NRsuz61x40fVNurc7BoRTnjKSM9GF/U0i+0j2sWth
+Pw7Zl0bfJK3oslO8qqqt730X6KjGXNlqoalWfsMTcBTvO8kzJhyF6zcKyGAJISuW
+W6PveJHKQ5L8SwwxyN4LkoQ=
 -----END PRIVATE KEY-----
diff --git a/tests/wpt/tests/tools/certs/web-platform.test.pem b/tests/wpt/tests/tools/certs/web-platform.test.pem
index 02a2d94e935..ad77f3e9e14 100644
--- a/tests/wpt/tests/tools/certs/web-platform.test.pem
+++ b/tests/wpt/tests/tools/certs/web-platform.test.pem
@@ -1,133 +1,133 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 1155 (0x483)
+        Serial Number: 76839 (0x12c27)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=web-platform-tests
         Validity
-            Not Before: Oct 12 01:04:46 2024 GMT
-            Not After : Oct 12 01:04:46 2025 GMT
+            Not Before: Apr 12 01:11:59 2025 GMT
+            Not After : Apr 12 01:11:59 2026 GMT
         Subject: CN=web-platform.test
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (2048 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:e0:fe:62:04:ff:c7:fa:8d:35:73:6c:8d:93:67:
-                    09:80:fa:d2:30:b3:af:93:a5:2b:a1:ba:8b:7d:25:
-                    b0:2b:70:87:f5:25:28:9c:42:5d:a2:b4:a8:03:16:
-                    a3:35:8a:4b:5b:1d:e2:df:60:28:59:c3:74:d2:41:
-                    95:32:85:a9:5f:08:6d:da:a6:15:30:1f:56:e3:19:
-                    b4:40:b8:11:c8:39:2d:e7:70:29:7f:68:2b:ea:6c:
-                    8a:d4:dc:f4:69:08:85:53:31:fc:f9:3a:d0:e5:4f:
-                    90:91:ca:7c:20:f6:a2:e5:c5:a7:29:8b:28:fd:9f:
-                    0d:80:48:4a:0d:de:58:8b:59:b4:0e:44:e8:6e:3e:
-                    db:e6:44:ac:1a:15:19:bb:39:8e:ba:f6:81:70:69:
-                    0a:a8:78:3a:c2:07:d2:cf:94:42:62:62:35:a3:05:
-                    92:20:86:7b:04:d5:8d:03:49:5e:e5:cf:e9:bb:70:
-                    a6:06:f8:f9:d9:28:d6:1f:2a:0e:ff:31:5d:a0:e4:
-                    fa:96:5e:a1:33:88:90:46:16:88:9c:2f:80:db:b2:
-                    4e:d7:fb:0b:c6:f9:3f:4d:c0:aa:d0:28:4d:2d:d6:
-                    c1:3e:a0:8b:11:74:b2:d7:be:9d:24:fb:eb:a6:e7:
-                    b2:0d:d4:ab:af:2b:5c:55:fc:c8:3d:4d:e5:71:ff:
-                    39:69
+                    00:ad:e8:55:c3:a4:79:26:c8:53:a3:64:99:09:46:
+                    09:82:bd:3c:25:11:bd:35:00:4e:ea:2f:3d:3e:49:
+                    c1:c7:dd:dd:5a:d8:72:4c:02:4c:ff:ac:49:19:fd:
+                    76:2d:76:95:cd:72:59:2e:17:9a:45:bf:38:37:f7:
+                    d0:b7:b1:ae:36:2b:a4:8a:e6:ed:95:2d:44:5a:0b:
+                    92:fb:6b:89:5a:21:82:42:fc:51:e6:42:1b:a9:c3:
+                    80:8f:f6:84:b0:fa:5a:ff:e0:06:34:81:a7:48:c3:
+                    5a:7b:9f:31:c9:98:2e:f3:8f:ae:db:73:02:97:54:
+                    69:73:9c:17:d0:91:1c:13:0e:b7:f2:9c:78:ea:dd:
+                    ef:e8:aa:f7:93:6a:6c:d6:da:27:f1:7e:08:1c:38:
+                    97:0d:3d:9f:74:17:b8:e4:3e:03:f6:1e:82:56:33:
+                    c4:cb:3f:41:0f:bc:eb:4a:a3:26:89:11:3d:7e:aa:
+                    dc:40:83:62:0d:f7:aa:3f:f1:b4:28:fd:16:09:9b:
+                    85:3c:45:9e:ef:69:b5:f2:e3:8f:8a:16:13:4e:23:
+                    39:85:de:23:11:11:25:00:3f:26:8e:57:54:f9:ae:
+                    03:60:b8:74:36:7b:3b:6e:77:0d:00:d4:dd:d6:a4:
+                    0d:5b:a7:f0:04:fb:4c:e1:d1:3d:2d:02:29:19:48:
+                    13:db
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                6D:E6:53:45:A0:4B:96:3B:B6:C1:D8:5B:E8:C4:E2:2A:9D:9B:A2:BA
+                7C:BC:FA:E4:3E:89:B6:48:D0:26:6C:18:26:E2:CC:74:5E:76:5E:C3
             X509v3 Authority Key Identifier: 
-                keyid:C9:65:67:DF:F8:60:C5:FB:E0:F7:15:D1:ED:5B:6D:73:E2:73:D4:E7
-
+                41:1D:58:CB:6E:F8:9A:9C:52:82:F4:AA:BC:92:E6:56:A3:31:0C:AB
             X509v3 Key Usage: 
                 Digital Signature, Non Repudiation, Key Encipherment
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
             X509v3 Subject Alternative Name: 
-                DNS:web-platform.test, DNS:www.web-platform.test, DNS:not-web-platform.test, DNS:www1.web-platform.test, DNS:www2.web-platform.test, DNS:www.www.web-platform.test, DNS:www.not-web-platform.test, DNS:www2.www.web-platform.test, DNS:www1.not-web-platform.test, DNS:www2.not-web-platform.test, DNS:www.www1.web-platform.test, DNS:www.www2.web-platform.test, DNS:www1.www.web-platform.test, DNS:www2.www2.web-platform.test, DNS:www1.www1.web-platform.test, DNS:www2.www1.web-platform.test, DNS:www1.www2.web-platform.test, DNS:www.www.not-web-platform.test, DNS:www.www2.not-web-platform.test, DNS:www2.www.not-web-platform.test, DNS:www.www1.not-web-platform.test, DNS:xn--lve-6lad.web-platform.test, DNS:www1.www.not-web-platform.test, DNS:www1.www2.not-web-platform.test, DNS:www2.www1.not-web-platform.test, DNS:www2.www2.not-web-platform.test, DNS:www1.www1.not-web-platform.test, DNS:xn--lve-6lad.www.web-platform.test, DNS:www.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.not-web-platform.test, DNS:www1.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www1.web-platform.test, DNS:www2.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www2.web-platform.test, DNS:www.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.www.not-web-platform.test, DNS:www2.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.www1.not-web-platform.test, DNS:xn--lve-6lad.www2.not-web-platform.test, DNS:www1.xn--lve-6lad.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.not-web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.not-web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.not-web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.not-web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test
+                DNS:web-platform.test, DNS:not-web-platform.test, DNS:www.web-platform.test, DNS:www1.web-platform.test, DNS:www2.web-platform.test, DNS:www.not-web-platform.test, DNS:www.www.web-platform.test, DNS:www.www1.web-platform.test, DNS:www1.not-web-platform.test, DNS:www2.not-web-platform.test, DNS:www.www2.web-platform.test, DNS:www1.www.web-platform.test, DNS:www2.www.web-platform.test, DNS:www2.www2.web-platform.test, DNS:www1.www1.web-platform.test, DNS:www1.www2.web-platform.test, DNS:www2.www1.web-platform.test, DNS:www.www.not-web-platform.test, DNS:xn--lve-6lad.web-platform.test, DNS:www.www2.not-web-platform.test, DNS:www2.www.not-web-platform.test, DNS:www.www1.not-web-platform.test, DNS:www1.www.not-web-platform.test, DNS:www1.www1.not-web-platform.test, DNS:www2.www2.not-web-platform.test, DNS:www2.www1.not-web-platform.test, DNS:www1.www2.not-web-platform.test, DNS:xn--lve-6lad.www.web-platform.test, DNS:www.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.www1.web-platform.test, DNS:www1.xn--lve-6lad.web-platform.test, DNS:www2.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www2.web-platform.test, DNS:xn--lve-6lad.www.not-web-platform.test, DNS:www.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.www1.not-web-platform.test, DNS:xn--lve-6lad.www2.not-web-platform.test, DNS:www1.xn--lve-6lad.not-web-platform.test, DNS:www2.xn--lve-6lad.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.not-web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.not-web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.not-web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test
     Signature Algorithm: sha256WithRSAEncryption
-         41:30:c3:35:8a:8c:3c:5d:5d:a3:d7:10:28:81:59:c7:cd:b0:
-         a8:73:8f:1a:d1:36:be:40:86:3c:63:cb:1c:a9:41:26:a0:0c:
-         6a:cf:b7:cf:76:3f:64:fa:ea:e5:74:9b:57:1d:b2:dd:92:ce:
-         ed:c1:32:ec:65:eb:7d:c2:73:ab:8d:95:33:b3:a3:d2:b0:6d:
-         81:0d:3f:31:c3:89:23:49:39:da:6f:22:b5:1d:12:97:6e:cc:
-         20:43:5a:ca:f4:d5:3e:01:be:90:03:b2:4e:f7:9c:e2:97:21:
-         39:a3:33:8c:45:a4:6c:e9:3a:eb:87:2d:1d:39:e6:d8:bb:b2:
-         15:01:a4:8f:70:25:61:4f:0f:5f:35:8d:9c:c6:fb:81:3b:52:
-         15:94:90:e4:ee:d7:3b:b2:b7:68:45:46:bb:56:06:7f:83:73:
-         d9:a8:1c:0d:17:fb:ce:81:5d:1c:0a:4f:0c:75:68:a2:70:64:
-         6d:de:ad:cf:ac:10:e5:e5:04:1f:e8:12:8d:59:27:e2:9a:76:
-         dd:30:89:bc:2e:22:ac:97:12:86:a0:45:9e:2f:e2:3f:c3:0a:
-         fe:14:6c:2a:28:a6:a3:00:81:d0:53:e2:4d:66:9c:13:9e:e5:
-         25:02:27:b3:05:62:73:08:49:43:6e:15:74:0d:ed:dc:71:47:
-         6c:79:53:1d
+    Signature Value:
+        62:c7:66:39:0f:01:0e:9e:52:15:2f:74:09:4a:d8:33:d4:21:
+        64:69:d7:4a:68:9e:84:39:be:d1:f7:4d:73:aa:62:06:b1:30:
+        2b:4b:a0:9c:56:8d:a2:18:62:d6:5a:03:12:1a:ac:ed:c5:be:
+        01:5b:d7:1a:e3:5c:46:35:47:88:95:af:a9:53:69:94:c8:0e:
+        09:df:79:d8:6e:ce:44:27:df:b6:70:76:7f:ab:20:0b:fd:ef:
+        23:9a:b2:19:3f:ae:1e:74:79:17:ed:bf:1a:14:44:43:f9:6a:
+        ad:f7:c6:e7:bb:16:3a:1f:70:a9:e6:22:c8:29:89:cf:05:ef:
+        95:32:f9:a2:fe:55:3f:59:da:b8:d6:84:81:e8:86:e2:7a:2d:
+        37:ac:89:46:cc:08:82:9e:27:2d:ac:92:0e:27:63:69:77:f6:
+        42:e3:bd:87:f8:ef:72:e3:87:43:e5:ea:e3:e8:57:b0:f6:c2:
+        08:e4:e7:b4:27:59:c9:6c:4c:96:b0:a6:02:27:82:24:ce:58:
+        c8:aa:50:48:de:dd:3e:8e:da:ec:42:94:55:37:68:8e:8a:5a:
+        f4:44:8e:f8:8e:81:51:31:c8:eb:04:43:78:b6:89:a4:76:09:
+        c1:7b:53:58:41:96:c6:ae:91:ca:a8:45:02:d9:e4:bc:eb:d4:
+        b0:5b:a3:be
 -----BEGIN CERTIFICATE-----
-MIIMsTCCC5mgAwIBAgICBIMwDQYJKoZIhvcNAQELBQAwHTEbMBkGA1UEAwwSd2Vi
-LXBsYXRmb3JtLXRlc3RzMB4XDTI0MTAxMjAxMDQ0NloXDTI1MTAxMjAxMDQ0Nlow
-HDEaMBgGA1UEAwwRd2ViLXBsYXRmb3JtLnRlc3QwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDg/mIE/8f6jTVzbI2TZwmA+tIws6+TpSuhuot9JbArcIf1
-JSicQl2itKgDFqM1iktbHeLfYChZw3TSQZUyhalfCG3aphUwH1bjGbRAuBHIOS3n
-cCl/aCvqbIrU3PRpCIVTMfz5OtDlT5CRynwg9qLlxacpiyj9nw2ASEoN3liLWbQO
-ROhuPtvmRKwaFRm7OY669oFwaQqoeDrCB9LPlEJiYjWjBZIghnsE1Y0DSV7lz+m7
-cKYG+PnZKNYfKg7/MV2g5PqWXqEziJBGFoicL4Dbsk7X+wvG+T9NwKrQKE0t1sE+
-oIsRdLLXvp0k++um57IN1KuvK1xV/Mg9TeVx/zlpAgMBAAGjggn6MIIJ9jAJBgNV
-HRMEAjAAMB0GA1UdDgQWBBRt5lNFoEuWO7bB2FvoxOIqnZuiujAfBgNVHSMEGDAW
-gBTJZWff+GDF++D3FdHtW21z4nPU5zALBgNVHQ8EBAMCBeAwEwYDVR0lBAwwCgYI
-KwYBBQUHAwEwggmFBgNVHREEggl8MIIJeIIRd2ViLXBsYXRmb3JtLnRlc3SCFXd3
-dy53ZWItcGxhdGZvcm0udGVzdIIVbm90LXdlYi1wbGF0Zm9ybS50ZXN0ghZ3d3cx
-LndlYi1wbGF0Zm9ybS50ZXN0ghZ3d3cyLndlYi1wbGF0Zm9ybS50ZXN0ghl3d3cu
-d3d3LndlYi1wbGF0Zm9ybS50ZXN0ghl3d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0
-ghp3d3cyLnd3dy53ZWItcGxhdGZvcm0udGVzdIIad3d3MS5ub3Qtd2ViLXBsYXRm
-b3JtLnRlc3SCGnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0ghp3d3cud3d3MS53
-ZWItcGxhdGZvcm0udGVzdIIad3d3Lnd3dzIud2ViLXBsYXRmb3JtLnRlc3SCGnd3
-dzEud3d3LndlYi1wbGF0Zm9ybS50ZXN0ght3d3cyLnd3dzIud2ViLXBsYXRmb3Jt
-LnRlc3SCG3d3dzEud3d3MS53ZWItcGxhdGZvcm0udGVzdIIbd3d3Mi53d3cxLndl
-Yi1wbGF0Zm9ybS50ZXN0ght3d3cxLnd3dzIud2ViLXBsYXRmb3JtLnRlc3SCHXd3
-dy53d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0gh53d3cud3d3Mi5ub3Qtd2ViLXBs
-YXRmb3JtLnRlc3SCHnd3dzIud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIed3d3
-Lnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0gh54bi0tbHZlLTZsYWQud2ViLXBs
-YXRmb3JtLnRlc3SCHnd3dzEud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIfd3d3
-MS53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdIIfd3d3Mi53d3cxLm5vdC13ZWIt
-cGxhdGZvcm0udGVzdIIfd3d3Mi53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdIIf
-d3d3MS53d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIieG4tLWx2ZS02bGFkLnd3
-dy53ZWItcGxhdGZvcm0udGVzdIIid3d3LnhuLS1sdmUtNmxhZC53ZWItcGxhdGZv
-cm0udGVzdIIieG4tLWx2ZS02bGFkLm5vdC13ZWItcGxhdGZvcm0udGVzdIIjd3d3
-MS54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCI3huLS1sdmUtNmxhZC53
-d3cxLndlYi1wbGF0Zm9ybS50ZXN0giN3d3cyLnhuLS1sdmUtNmxhZC53ZWItcGxh
-dGZvcm0udGVzdIIjeG4tLWx2ZS02bGFkLnd3dzIud2ViLXBsYXRmb3JtLnRlc3SC
-Jnd3dy54bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0giZ4bi0tbHZl
-LTZsYWQud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIInd3d3Mi54bi0tbHZlLTZs
-YWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0gid4bi0tbHZlLTZsYWQud3d3MS5ub3Qt
-d2ViLXBsYXRmb3JtLnRlc3SCJ3huLS1sdmUtNmxhZC53d3cyLm5vdC13ZWItcGxh
-dGZvcm0udGVzdIInd3d3MS54bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50
-ZXN0gil4bi0tbjhqNmRzNTNsd3drcnFodjI4YS53ZWItcGxhdGZvcm0udGVzdIIr
-eG4tLWx2ZS02bGFkLnhuLS1sdmUtNmxhZC53ZWItcGxhdGZvcm0udGVzdIItd3d3
-LnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0gi14bi0t
-bjhqNmRzNTNsd3drcnFodjI4YS53d3cud2ViLXBsYXRmb3JtLnRlc3SCLXhuLS1u
-OGo2ZHM1M2x3d2tycWh2MjhhLm5vdC13ZWItcGxhdGZvcm0udGVzdIIud3d3MS54
-bi0tbjhqNmRzNTNsd3drcnFodjI4YS53ZWItcGxhdGZvcm0udGVzdIIueG4tLW44
-ajZkczUzbHd3a3JxaHYyOGEud3d3MS53ZWItcGxhdGZvcm0udGVzdIIueG4tLW44
-ajZkczUzbHd3a3JxaHYyOGEud3d3Mi53ZWItcGxhdGZvcm0udGVzdIIud3d3Mi54
-bi0tbjhqNmRzNTNsd3drcnFodjI4YS53ZWItcGxhdGZvcm0udGVzdIIveG4tLWx2
-ZS02bGFkLnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCMXd3dy54
-bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCMXhu
-LS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dy5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SC
-Mnd3dzEueG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdlYi1wbGF0Zm9ybS50
-ZXN0gjJ4bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cxLm5vdC13ZWItcGxhdGZv
-cm0udGVzdIIyd3d3Mi54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBs
-YXRmb3JtLnRlc3SCMnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dzIubm90LXdl
-Yi1wbGF0Zm9ybS50ZXN0gjZ4bi0tbHZlLTZsYWQueG4tLW44ajZkczUzbHd3a3Jx
-aHYyOGEud2ViLXBsYXRmb3JtLnRlc3SCNnhuLS1uOGo2ZHM1M2x3d2tycWh2Mjhh
-LnhuLS1sdmUtNmxhZC53ZWItcGxhdGZvcm0udGVzdII6eG4tLWx2ZS02bGFkLnhu
-LS1uOGo2ZHM1M2x3d2tycWh2MjhhLm5vdC13ZWItcGxhdGZvcm0udGVzdII6eG4t
-LW44ajZkczUzbHd3a3JxaHYyOGEueG4tLWx2ZS02bGFkLm5vdC13ZWItcGxhdGZv
-cm0udGVzdIJBeG4tLW44ajZkczUzbHd3a3JxaHYyOGEueG4tLW44ajZkczUzbHd3
-a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SCRXhuLS1uOGo2ZHM1M2x3d2tycWh2
-MjhhLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLm5vdC13ZWItcGxhdGZvcm0udGVz
-dDANBgkqhkiG9w0BAQsFAAOCAQEAQTDDNYqMPF1do9cQKIFZx82wqHOPGtE2vkCG
-PGPLHKlBJqAMas+3z3Y/ZPrq5XSbVx2y3ZLO7cEy7GXrfcJzq42VM7Oj0rBtgQ0/
-McOJI0k52m8itR0Sl27MIENayvTVPgG+kAOyTvec4pchOaMzjEWkbOk664ctHTnm
-2LuyFQGkj3AlYU8PXzWNnMb7gTtSFZSQ5O7XO7K3aEVGu1YGf4Nz2agcDRf7zoFd
-HApPDHVoonBkbd6tz6wQ5eUEH+gSjVkn4pp23TCJvC4irJcShqBFni/iP8MK/hRs
-KiimowCB0FPiTWacE57lJQInswVicwhJQ24VdA3t3HFHbHlTHQ==
+MIIMsjCCC5qgAwIBAgIDASwnMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
+Yi1wbGF0Zm9ybS10ZXN0czAeFw0yNTA0MTIwMTExNTlaFw0yNjA0MTIwMTExNTla
+MBwxGjAYBgNVBAMMEXdlYi1wbGF0Zm9ybS50ZXN0MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArehVw6R5JshTo2SZCUYJgr08JRG9NQBO6i89PknBx93d
+WthyTAJM/6xJGf12LXaVzXJZLheaRb84N/fQt7GuNiukiubtlS1EWguS+2uJWiGC
+QvxR5kIbqcOAj/aEsPpa/+AGNIGnSMNae58xyZgu84+u23MCl1Rpc5wX0JEcEw63
+8px46t3v6Kr3k2ps1ton8X4IHDiXDT2fdBe45D4D9h6CVjPEyz9BD7zrSqMmiRE9
+fqrcQINiDfeqP/G0KP0WCZuFPEWe72m18uOPihYTTiM5hd4jERElAD8mjldU+a4D
+YLh0Nns7bncNANTd1qQNW6fwBPtM4dE9LQIpGUgT2wIDAQABo4IJ+jCCCfYwCQYD
+VR0TBAIwADAdBgNVHQ4EFgQUfLz65D6JtkjQJmwYJuLMdF52XsMwHwYDVR0jBBgw
+FoAUQR1Yy274mpxSgvSqvJLmVqMxDKswCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMIIJhQYDVR0RBIIJfDCCCXiCEXdlYi1wbGF0Zm9ybS50ZXN0ghVu
+b3Qtd2ViLXBsYXRmb3JtLnRlc3SCFXd3dy53ZWItcGxhdGZvcm0udGVzdIIWd3d3
+MS53ZWItcGxhdGZvcm0udGVzdIIWd3d3Mi53ZWItcGxhdGZvcm0udGVzdIIZd3d3
+Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIZd3d3Lnd3dy53ZWItcGxhdGZvcm0udGVz
+dIIad3d3Lnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCGnd3dzEubm90LXdlYi1wbGF0
+Zm9ybS50ZXN0ghp3d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdIIad3d3Lnd3dzIu
+d2ViLXBsYXRmb3JtLnRlc3SCGnd3dzEud3d3LndlYi1wbGF0Zm9ybS50ZXN0ghp3
+d3cyLnd3dy53ZWItcGxhdGZvcm0udGVzdIIbd3d3Mi53d3cyLndlYi1wbGF0Zm9y
+bS50ZXN0ght3d3cxLnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCG3d3dzEud3d3Mi53
+ZWItcGxhdGZvcm0udGVzdIIbd3d3Mi53d3cxLndlYi1wbGF0Zm9ybS50ZXN0gh13
+d3cud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIeeG4tLWx2ZS02bGFkLndlYi1w
+bGF0Zm9ybS50ZXN0gh53d3cud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCHnd3
+dzIud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIed3d3Lnd3dzEubm90LXdlYi1w
+bGF0Zm9ybS50ZXN0gh53d3cxLnd3dy5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3
+dzEud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3dzIud3d3Mi5ub3Qtd2Vi
+LXBsYXRmb3JtLnRlc3SCH3d3dzIud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SC
+H3d3dzEud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCInhuLS1sdmUtNmxhZC53
+d3cud2ViLXBsYXRmb3JtLnRlc3SCInd3dy54bi0tbHZlLTZsYWQud2ViLXBsYXRm
+b3JtLnRlc3SCInhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCI3hu
+LS1sdmUtNmxhZC53d3cxLndlYi1wbGF0Zm9ybS50ZXN0giN3d3cxLnhuLS1sdmUt
+NmxhZC53ZWItcGxhdGZvcm0udGVzdIIjd3d3Mi54bi0tbHZlLTZsYWQud2ViLXBs
+YXRmb3JtLnRlc3SCI3huLS1sdmUtNmxhZC53d3cyLndlYi1wbGF0Zm9ybS50ZXN0
+giZ4bi0tbHZlLTZsYWQud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIImd3d3Lnhu
+LS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCJ3huLS1sdmUtNmxhZC53
+d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIneG4tLWx2ZS02bGFkLnd3dzIubm90
+LXdlYi1wbGF0Zm9ybS50ZXN0gid3d3cxLnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBs
+YXRmb3JtLnRlc3SCJ3d3dzIueG4tLWx2ZS02bGFkLm5vdC13ZWItcGxhdGZvcm0u
+dGVzdIIpeG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SC
+K3huLS1sdmUtNmxhZC54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCLXd3
+dy54bi0tbjhqNmRzNTNsd3drcnFodjI4YS53ZWItcGxhdGZvcm0udGVzdIIteG4t
+LW44ajZkczUzbHd3a3JxaHYyOGEud3d3LndlYi1wbGF0Zm9ybS50ZXN0gi14bi0t
+bjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCLnhuLS1u
+OGo2ZHM1M2x3d2tycWh2MjhhLnd3dzIud2ViLXBsYXRmb3JtLnRlc3SCLnd3dzIu
+eG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SCLnhuLS1u
+OGo2ZHM1M2x3d2tycWh2MjhhLnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCLnd3dzEu
+eG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SCL3huLS1s
+dmUtNmxhZC54bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0gjF4bi0t
+bjhqNmRzNTNsd3drcnFodjI4YS53d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0gjF3
+d3cueG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdlYi1wbGF0Zm9ybS50ZXN0
+gjJ4bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cxLm5vdC13ZWItcGxhdGZvcm0u
+dGVzdIIyd3d3MS54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRm
+b3JtLnRlc3SCMnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dzIubm90LXdlYi1w
+bGF0Zm9ybS50ZXN0gjJ3d3cyLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLm5vdC13
+ZWItcGxhdGZvcm0udGVzdII2eG4tLWx2ZS02bGFkLnhuLS1uOGo2ZHM1M2x3d2ty
+cWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0gjZ4bi0tbjhqNmRzNTNsd3drcnFodjI4
+YS54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCOnhuLS1uOGo2ZHM1M2x3
+d2tycWh2MjhhLnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCOnhu
+LS1sdmUtNmxhZC54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRm
+b3JtLnRlc3SCQXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnhuLS1uOGo2ZHM1M2x3
+d2tycWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0gkV4bi0tbjhqNmRzNTNsd3drcnFo
+djI4YS54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRl
+c3QwDQYJKoZIhvcNAQELBQADggEBAGLHZjkPAQ6eUhUvdAlK2DPUIWRp10ponoQ5
+vtH3TXOqYgaxMCtLoJxWjaIYYtZaAxIarO3FvgFb1xrjXEY1R4iVr6lTaZTIDgnf
+edhuzkQn37Zwdn+rIAv97yOashk/rh50eRftvxoUREP5aq33xue7FjofcKnmIsgp
+ic8F75Uy+aL+VT9Z2rjWhIHohuJ6LTesiUbMCIKeJy2skg4nY2l39kLjvYf473Lj
+h0Pl6uPoV7D2wgjk57QnWclsTJawpgIngiTOWMiqUEje3T6O2uxClFU3aI6KWvRE
+jviOgVExyOsEQ3i2iaR2CcF7U1hBlsaukcqoRQLZ5Lzr1LBbo74=
 -----END CERTIFICATE-----
diff --git a/tests/wpt/tests/tools/ci/azure/fyi_hook.yml b/tests/wpt/tests/tools/ci/azure/fyi_hook.yml
index df92ce10664..8e541e14d86 100644
--- a/tests/wpt/tests/tools/ci/azure/fyi_hook.yml
+++ b/tests/wpt/tests/tools/ci/azure/fyi_hook.yml
@@ -10,7 +10,7 @@ jobs:
   displayName: 'wpt.fyi hook: ${{ parameters.artifactName }}'
   dependsOn: ${{ parameters.dependsOn }}
   pool:
-    vmImage: 'ubuntu-20.04'
+    vmImage: 'ubuntu-24.04'
   steps:
   - checkout: none
   - script: |
diff --git a/tests/wpt/tests/tools/ci/commands.json b/tests/wpt/tests/tools/ci/commands.json
index f26baddacad..7c54fb72cbf 100644
--- a/tests/wpt/tests/tools/ci/commands.json
+++ b/tests/wpt/tests/tools/ci/commands.json
@@ -78,5 +78,15 @@
     "requirements": [
       "requirements_tc.txt"
     ]
+  },
+  "update-codeowners": {
+    "path": "update_codeowners.py",
+    "parser": "get_parser",
+    "script": "run_update_codeowners",
+    "help": "Update CODEOWNERS file",
+    "virtualenv": true,
+    "requirements": [
+      "../wpt/requirements_metadata.txt"
+    ]
   }
 }
diff --git a/tests/wpt/tests/tools/ci/requirements_build.txt b/tests/wpt/tests/tools/ci/requirements_build.txt
index e74e4e5302d..60c09170a98 100644
--- a/tests/wpt/tests/tools/ci/requirements_build.txt
+++ b/tests/wpt/tests/tools/ci/requirements_build.txt
@@ -1,5 +1,5 @@
 cairocffi==1.7.0
 fonttools==4.51.0
 genshi==0.7.7
-jinja2==3.1.4
+jinja2==3.1.6
 pyyaml==6.0.1
diff --git a/tests/wpt/tests/tools/ci/requirements_macos_color_profile.txt b/tests/wpt/tests/tools/ci/requirements_macos_color_profile.txt
index cd3e785aa47..5b95e3357b8 100644
--- a/tests/wpt/tests/tools/ci/requirements_macos_color_profile.txt
+++ b/tests/wpt/tests/tools/ci/requirements_macos_color_profile.txt
@@ -1,4 +1,14 @@
-pyobjc-core==10.3.1
-pyobjc-framework-Cocoa==9.2
-pyobjc-framework-ColorSync==9.2
-pyobjc-framework-Quartz==9.2
+--only-binary pyobjc-core
+--only-binary pyobjc-framework-cocoa
+--only-binary pyobjc-framework-colorsync
+--only-binary pyobjc-framework-quartz
+
+pyobjc-core==10.3.2 ; python_full_version < '3.9'
+pyobjc-framework-cocoa==10.3.2 ; python_full_version < '3.9'
+pyobjc-framework-colorsync==10.3.2 ; python_full_version < '3.9'
+pyobjc-framework-quartz==10.3.2 ; python_full_version < '3.9'
+
+pyobjc-core==11.0 ; python_full_version >= '3.9'
+pyobjc-framework-cocoa==11.0 ; python_full_version >= '3.9'
+pyobjc-framework-colorsync==11.0 ; python_full_version >= '3.9'
+pyobjc-framework-quartz==11.0 ; python_full_version >= '3.9'
diff --git a/tests/wpt/tests/tools/ci/requirements_tc.txt b/tests/wpt/tests/tools/ci/requirements_tc.txt
index a7021667970..ada75c2f761 100644
--- a/tests/wpt/tests/tools/ci/requirements_tc.txt
+++ b/tests/wpt/tests/tools/ci/requirements_tc.txt
@@ -1,4 +1,4 @@
 pygithub==2.6.1
 pyyaml==6.0.1
 requests==2.32.3
-taskcluster==68.0.4
+taskcluster==83.5.8
diff --git a/tests/wpt/tests/tools/ci/tc/tasks/test.yml b/tests/wpt/tests/tools/ci/tc/tasks/test.yml
index 54cf522ebd8..c96082cfa03 100644
--- a/tests/wpt/tests/tools/ci/tc/tasks/test.yml
+++ b/tests/wpt/tests/tools/ci/tc/tasks/test.yml
@@ -4,7 +4,7 @@ components:
     workerType: ci
     schedulerId: taskcluster-github
     deadline: "24 hours"
-    image: ghcr.io/web-platform-tests/wpt:1
+    image: ghcr.io/web-platform-tests/wpt:2
     maxRunTime: 7200
     artifacts:
       public/results:
diff --git a/tests/wpt/tests/tools/ci/update_codeowners.py b/tests/wpt/tests/tools/ci/update_codeowners.py
new file mode 100644
index 00000000000..4e36e2679bf
--- /dev/null
+++ b/tests/wpt/tests/tools/ci/update_codeowners.py
@@ -0,0 +1,80 @@
+import argparse
+import os
+from typing import Optional, Set
+
+import requests
+
+from ..manifest import manifest
+from ..wpt import metadata, virtualenv
+
+here = os.path.dirname(__file__)
+wpt_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir))
+
+
+def get_parser() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--manifest", dest="manifest_path", help="Path to MANIFEST.json")
+    parser.add_argument("metadata_path", help="Path to wpt metadata repository")
+    return parser
+
+
+def get_labels(interop_year: int = 2025) -> Set[str]:
+    data_url = "https://raw.githubusercontent.com/web-platform-tests/wpt.fyi/refs/heads/main/webapp/static/interop-data.json"
+    resp = requests.get(data_url)
+    resp.raise_for_status()
+    data = resp.json()
+    focus_areas = data[str(interop_year)]["focus_areas"]
+    labels = set()
+    for focus_area in focus_areas.values():
+        labels |= set(focus_area["labels"])
+
+    return labels
+
+
+def run_update_codeowners(venv: virtualenv.Virtualenv,
+                          metadata_path: str,
+                          manifest_path: Optional[str],
+                          interop_year: int = 2025,
+                          reviewer: Optional[str] = "@web-platform-tests/interop") -> int:
+    if manifest_path is None:
+        manifest_path = os.path.join(wpt_root, "MANIFEST.json")
+    wpt_manifest = manifest.load_and_update(wpt_root, manifest_path, "/")
+
+    labels = get_labels(interop_year)
+    metadata_map = metadata.load_metadata_map(metadata_path)
+    tests_by_label = metadata.get_labelled_tests(metadata_map,
+                                                 list(labels))
+    all_labelled_tests = set()
+    for labelled_tests in tests_by_label.values():
+        all_labelled_tests |= set(labelled_tests)
+
+    test_lines = []
+    for _test_type, rel_path, tests in wpt_manifest:
+        if any(test.id in all_labelled_tests for test in tests):
+            test_lines.append(f"{rel_path} {reviewer}\n")
+
+    output = []
+    start_line = "# GENERATED: interop-tests"
+    end_line = "# END GENERATED"
+    in_generated = False
+    found_generated = False
+    with open(os.path.join(wpt_root, "CODEOWNERS")) as f:
+        for line in f:
+            if not in_generated:
+                if line.strip() == start_line:
+                    output.append(line)
+                    found_generated = True
+                    in_generated = True
+                    output.extend(test_lines)
+                else:
+                    output.append(line)
+            else:
+                if line.strip() == end_line:
+                    in_generated = False
+                    output.append(line)
+    if not found_generated:
+        output.extend(["\n", start_line + "\n"] + test_lines + [end_line + "\n"])
+    with open(os.path.join(wpt_root, "CODEOWNERS"), "w") as f:
+        f.writelines(output)
+
+    return 0
diff --git a/tests/wpt/tests/tools/lint/tests/test_file_lints.py b/tests/wpt/tests/tools/lint/tests/test_file_lints.py
index 92270e38a69..f6311043293 100644
--- a/tests/wpt/tests/tools/lint/tests/test_file_lints.py
+++ b/tests/wpt/tests/tools/lint/tests/test_file_lints.py
@@ -1236,6 +1236,34 @@ def test_invalid_web_features_file():
     assert errors == []
 
 
+def test_duplicate_keys_invalid_web_features_file():
+    code = b"""\
+features:
+- name: feature1
+  files:
+  - feature1-*
+features:
+- name: feature2
+  files:
+  - "feature2-*"
+"""
+    # Check when the value is named correctly. It should find the error.
+    errors = check_file_contents("", "css/WEB_FEATURES.yml", io.BytesIO(code))
+    check_errors(errors)
+
+    assert errors == [
+        ('INVALID-WEB-FEATURES-FILE',
+         'The WEB_FEATURES.yml file contains an invalid structure',
+         "css/WEB_FEATURES.yml",
+         None),
+    ]
+
+    # Check when the value is named incorrectly. It should not find the error.
+    errors = check_file_contents("", "css/OTHER_WEB_FEATURES.yml", io.BytesIO(code))
+    check_errors(errors)
+
+    assert errors == []
+
 def test_css_missing_file_manual():
     errors = check_file_contents("", "css/foo/bar-manual.html", io.BytesIO(b""))
     check_errors(errors)
diff --git a/tests/wpt/tests/tools/metadata/yaml/load.py b/tests/wpt/tests/tools/metadata/yaml/load.py
index 831f7e8fff1..c6813f23392 100644
--- a/tests/wpt/tests/tools/metadata/yaml/load.py
+++ b/tests/wpt/tests/tools/metadata/yaml/load.py
@@ -3,9 +3,24 @@ from ..meta.schema import SchemaValue
 
 import yaml
 
+# PyYaml does not currently handle unique keys.
+# https://github.com/yaml/pyyaml/issues/165#issuecomment-430074049
+# In that issue, there are workarounds to it.
+# https://gist.github.com/pypt/94d747fe5180851196eb?permalink_comment_id=4015118#gistcomment-4015118
+
+class UniqueKeyLoader(yaml.SafeLoader):
+    def construct_mapping(self, node: yaml.MappingNode, deep: bool = False) -> Dict[Any, Any]:
+        mapping = set()
+        for key_node, value_node in node.value:
+            key = self.construct_object(key_node, deep=deep)  # type: ignore
+            if key in mapping:
+                raise ValueError(f"Duplicate {key!r} key found in YAML.")
+            mapping.add(key)
+        return super().construct_mapping(node, deep)
+
 def load_data_to_dict(f: IO[bytes]) -> Dict[str, Any]:
     try:
-        raw_data = yaml.safe_load(f)
+        raw_data = yaml.load(f, Loader=UniqueKeyLoader)
         return SchemaValue.from_dict(raw_data)
     except Exception as e:
         raise e
diff --git a/tests/wpt/tests/tools/requirements_mypy.txt b/tests/wpt/tests/tools/requirements_mypy.txt
index 06fb778ea66..5edf2d9614d 100644
--- a/tests/wpt/tests/tools/requirements_mypy.txt
+++ b/tests/wpt/tests/tools/requirements_mypy.txt
@@ -1,5 +1,6 @@
 mypy==1.14.0
 mypy-extensions==1.0.0
+pydantic==2.10.6
 toml==0.10.2
 tomli==2.0.1
 types-atomicwrites==1.4.5.1
diff --git a/tests/wpt/tests/tools/requirements_tests.txt b/tests/wpt/tests/tools/requirements_tests.txt
index 9bb2dceafe4..ca00b8f1f98 100644
--- a/tests/wpt/tests/tools/requirements_tests.txt
+++ b/tests/wpt/tests/tools/requirements_tests.txt
@@ -2,5 +2,5 @@ httpx[http2]==0.27.2
 json-e==4.7.0
 jsonschema==4.17.3
 pyyaml==6.0.1
-taskcluster==68.0.4
+taskcluster==83.5.8
 mozterm==1.0.0
diff --git a/tests/wpt/tests/tools/webdriver/webdriver/__init__.py b/tests/wpt/tests/tools/webdriver/webdriver/__init__.py
index eb031849746..53e53b9ac26 100644
--- a/tests/wpt/tests/tools/webdriver/webdriver/__init__.py
+++ b/tests/wpt/tests/tools/webdriver/webdriver/__init__.py
@@ -1,7 +1,6 @@
 # flake8: noqa
 
 from .client import (
-    Cookies,
     Find,
     Session,
     ShadowRoot,
diff --git a/tests/wpt/tests/tools/webdriver/webdriver/bidi/client.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/client.py
index a2ed903c577..1f4647cf174 100644
--- a/tests/wpt/tests/tools/webdriver/webdriver/bidi/client.py
+++ b/tests/wpt/tests/tools/webdriver/webdriver/bidi/client.py
@@ -93,6 +93,7 @@ class BidiSession:
         self.bluetooth = modules.Bluetooth(self)
         self.browser = modules.Browser(self)
         self.browsing_context = modules.BrowsingContext(self)
+        self.emulation = modules.Emulation(self)
         self.input = modules.Input(self)
         self.network = modules.Network(self)
         self.permissions = modules.Permissions(self)
@@ -197,7 +198,9 @@ class BidiSession:
                 exception = from_error_details(data["error"],
                                                data["message"],
                                                data.get("stacktrace"))
-                future.set_exception(exception)
+                # Only set the exception if the future is not cancelled.
+                if future.cancelled() is not True:
+                    future.set_exception(exception)
         elif data["type"] == "event":
             # This is an event
             assert isinstance(data["method"], str)
diff --git a/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/__init__.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/__init__.py
index ff76f69ba75..3ed98e25998 100644
--- a/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/__init__.py
+++ b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/__init__.py
@@ -3,6 +3,7 @@
 from .bluetooth import Bluetooth
 from .browser import Browser
 from .browsing_context import BrowsingContext
+from .emulation import Emulation
 from .input import Input
 from .network import Network
 from .permissions import Permissions
diff --git a/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/emulation.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/emulation.py
new file mode 100644
index 00000000000..fd5cf733ab7
--- /dev/null
+++ b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/emulation.py
@@ -0,0 +1,53 @@
+from typing import Any, Dict, List, Mapping, MutableMapping, Optional, Union
+
+from ._module import BidiModule, command
+from ..undefined import UNDEFINED, Undefined
+
+
+class CoordinatesOptions(Dict[str, Any]):
+    def __init__(
+        self,
+        latitude: float,
+        longitude: float,
+        accuracy: Optional[float] = None,
+        altitude: Optional[float] = None,
+        altitude_accuracy: Optional[float] = None,
+        heading: Optional[float] = None,
+        speed: Optional[float] = None,
+    ):
+        self["latitude"] = latitude
+        self["longitude"] = longitude
+
+        if accuracy is not None:
+            self["accuracy"] = accuracy
+        if altitude is not None:
+            self["altitude"] = altitude
+        if altitude_accuracy is not None:
+            self["altitudeAccuracy"] = altitude_accuracy
+        if heading is not None:
+            self["heading"] = heading
+        if speed is not None:
+            self["speed"] = speed
+
+
+class Emulation(BidiModule):
+    @command
+    def set_geolocation_override(
+        self,
+        coordinates: Union[CoordinatesOptions, Undefined] = UNDEFINED,
+        error: Optional[Dict[str, Any]] = None,
+        contexts: Optional[List[str]] = None,
+        user_contexts: Optional[List[str]] = None,
+    ) -> Mapping[str, Any]:
+        params: MutableMapping[str, Any] = {}
+
+        if coordinates is not UNDEFINED:
+            params["coordinates"] = coordinates
+        if error is not None:
+            params["error"] = error
+        if contexts is not None:
+            params["contexts"] = contexts
+        if user_contexts is not None:
+            params["userContexts"] = user_contexts
+
+        return params
diff --git a/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/web_extension.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/web_extension.py
index 70572a126f2..d313e416d75 100644
--- a/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/web_extension.py
+++ b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/web_extension.py
@@ -4,8 +4,16 @@ from ._module import BidiModule, command
 
 class WebExtension(BidiModule):
     @command
-    def install(self, extension_data: Mapping[str, Any]) -> Mapping[str, Any]:
+    def install(
+        self,
+        extension_data: Mapping[str, Any],
+        **kwargs: Mapping[str, Any]
+    ) -> Mapping[str, Any]:
         params: MutableMapping[str, Any] = {"extensionData": extension_data}
+
+        # Allow vendor specific parameters
+        params.update(**kwargs)
+
         return params
 
     @install.result
diff --git a/tests/wpt/tests/tools/webdriver/webdriver/client.py b/tests/wpt/tests/tools/webdriver/webdriver/client.py
index 97b29c64bcd..5a54bf66ac6 100644
--- a/tests/wpt/tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/tests/tools/webdriver/webdriver/client.py
@@ -387,24 +387,6 @@ class Find:
         return self.session.send_session_command("POST", route, body)
 
 
-class Cookies:
-    def __init__(self, session):
-        self.session = session
-
-    def __getitem__(self, name):
-        self.session.send_session_command("GET", "cookie/%s" % name, {})
-
-    def __setitem__(self, name, value):
-        cookie = {"name": name,
-                  "value": None}
-
-        if isinstance(name, str):
-            cookie["value"] = value
-        elif hasattr(value, "value"):
-            cookie["value"] = value.value
-        self.session.send_session_command("POST", "cookie/%s" % name, {})
-
-
 class UserPrompt:
     def __init__(self, session):
         self.session = session
@@ -525,6 +507,9 @@ class Session:
         if self.session_id is None:
             return
 
+        if not isinstance(self.session_id, str):
+            raise TypeError("Session.session_id must be a str or None")
+
         try:
             self.send_command("DELETE", "session/%s" % self.session_id)
         except (OSError, error.InvalidSessionIdException):
@@ -599,6 +584,9 @@ class Session:
         :raises error.WebDriverException: If the remote end returns
             an error.
         """
+        if not isinstance(self.session_id, str):
+            raise TypeError("Session.session_id must be a str to send a session command")
+
         url = urlparse.urljoin("session/%s/" % self.session_id, uri)
         return self.send_command(method, url, body, timeout)
 
@@ -679,8 +667,10 @@ class Session:
     def cookies(self, name=None):
         if name is None:
             url = "cookie"
-        else:
+        elif isinstance(name, str):
             url = "cookie/%s" % name
+        else:
+            raise TypeError("cookie name must be a str or None")
         return self.send_session_command("GET", url, {})
 
     @command
@@ -706,8 +696,10 @@ class Session:
     def delete_cookie(self, name=None):
         if name is None:
             url = "cookie"
-        else:
+        elif isinstance(name, str):
             url = "cookie/%s" % name
+        else:
+            raise TypeError("cookie name must be a str or None")
         self.send_session_command("DELETE", url, {})
 
     #[...]
@@ -784,6 +776,12 @@ class ShadowRoot:
         return cls(session, uuid)
 
     def send_shadow_command(self, method, uri, body=None):
+        if not isinstance(self.id, str):
+            raise TypeError("self.id must be a str")
+
+        if not isinstance(uri, str):
+            raise TypeError("uri must be a str")
+
         url = f"shadow/{self.id}/{uri}"
         return self.session.send_session_command(method, url, body)
 
@@ -832,6 +830,12 @@ class WebElement:
         return cls(session, uuid)
 
     def send_element_command(self, method, uri, body=None):
+        if not isinstance(self.id, str):
+            raise TypeError("WebElement.id must be a str")
+
+        if not isinstance(uri, str):
+            raise TypeError("uri must be a str")
+
         url = "element/%s/%s" % (self.id, uri)
         return self.session.send_session_command(method, url, body)
 
@@ -869,6 +873,9 @@ class WebElement:
 
     @command
     def style(self, property_name):
+        if not isinstance(property_name, str):
+            raise TypeError("property_name must be a str")
+
         return self.send_element_command("GET", "css/%s" % property_name)
 
     @property
@@ -892,6 +899,9 @@ class WebElement:
 
     @command
     def attribute(self, name):
+        if not isinstance(name, str):
+            raise TypeError("name must be a str")
+
         return self.send_element_command("GET", "attribute/%s" % name)
 
     @command
@@ -906,6 +916,9 @@ class WebElement:
     # will be overridden by this.
     @command
     def property(self, name):
+        if not isinstance(name, str):
+            raise TypeError("name must be a str")
+
         return self.send_element_command("GET", "property/%s" % name)
 
 
diff --git a/tests/wpt/tests/tools/wpt/android.py b/tests/wpt/tests/tools/wpt/android.py
index b4720ada41b..cbde92b8d5c 100644
--- a/tests/wpt/tests/tools/wpt/android.py
+++ b/tests/wpt/tests/tools/wpt/android.py
@@ -288,8 +288,8 @@ def install(logger, dest=None, reinstall=False, prompt=True):
 
         if new_install:
             packages = ["platform-tools",
-                        "build-tools;35.0.0",
-                        "platforms;android-35",
+                        "build-tools;36.0.0",
+                        "platforms;android-36",
                         "emulator"]
 
             install_android_packages(logger, paths, packages, prompt=prompt)
diff --git a/tests/wpt/tests/tools/wpt/commands.json b/tests/wpt/tests/tools/wpt/commands.json
index de825c79b76..72e1ec7d423 100644
--- a/tests/wpt/tests/tools/wpt/commands.json
+++ b/tests/wpt/tests/tools/wpt/commands.json
@@ -91,5 +91,25 @@
       "requirements.txt",
       "requirements_android.txt"
     ]
+  },
+  "metadata-validate": {
+    "path": "metadata.py",
+    "script": "run_validate",
+    "parser": "get_parser_validate",
+    "help": "Validate metadata from wpt-metadata",
+    "virtualenv": true,
+    "requirements": [
+      "requirements_metadata.txt"
+    ]
+  },
+  "metadata-list": {
+    "path": "metadata.py",
+    "script": "run_list",
+    "parser": "get_parser_list",
+    "help": "List metadata with given labels from wpt-metadata",
+    "virtualenv": true,
+    "requirements": [
+      "requirements_metadata.txt"
+    ]
   }
 }
diff --git a/tests/wpt/tests/tools/wpt/metadata.py b/tests/wpt/tests/tools/wpt/metadata.py
new file mode 100644
index 00000000000..2e91da7c658
--- /dev/null
+++ b/tests/wpt/tests/tools/wpt/metadata.py
@@ -0,0 +1,158 @@
+import argparse
+import logging
+import os
+import re
+from typing import Any, Dict, List, Optional, Mapping, Sequence, Set, Union
+
+import pydantic
+import yaml
+from pydantic import BaseModel
+
+
+from ..manifest import manifest
+from .virtualenv import Virtualenv
+
+here = os.path.dirname(__file__)
+wpt_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir))
+
+class UrlResultsModel(BaseModel):
+    model_config = pydantic.ConfigDict(extra='forbid')
+
+    test: str
+    subtest: Optional[str] = None
+    status: Optional[str] = None
+
+
+class UrlLinkModel(BaseModel):
+    model_config = pydantic.ConfigDict(extra='forbid')
+
+    url: str
+    results: List[UrlResultsModel]
+    product: Optional[str] = None
+
+
+class LabelResultsModel(BaseModel):
+    test: str
+
+
+class LabelLinkModel(BaseModel):
+    label: str
+    results: List[LabelResultsModel]
+
+
+class MetadataModel(BaseModel):
+    links: List[Union[LabelLinkModel, UrlLinkModel]]
+
+
+def load_metadata_map(src_dir: str) -> Mapping[str, MetadataModel]:
+    rv = {}
+    for dir_path, dir_names, file_names in os.walk(src_dir):
+        if "META.yml" not in file_names:
+            continue
+
+        id_prefix = os.path.relpath(dir_path, src_dir).replace(os.path.sep, "/") + "/"
+        if id_prefix[0] != "/":
+            id_prefix = "/" + id_prefix
+        meta_path = os.path.join(dir_path, "META.yml")
+
+        with open(meta_path) as f:
+            data = yaml.safe_load(f)
+        try:
+            rv[id_prefix] = MetadataModel.model_validate(data)
+        except Exception as e:
+            logging.critical(f"Error validating metadata {meta_path}")
+            raise e
+    return rv
+
+
+def get_all_tests(metadata_map: Mapping[str, MetadataModel]) -> Set[str]:
+    rv = set()
+
+    for id_prefix, metadata in metadata_map.items():
+        for link in metadata.links:
+            for result in link.results:
+                if result.test != "*":
+                    test_id = id_prefix + result.test
+                    rv.add(test_id)
+    return rv
+
+
+def get_labelled_tests(
+        metadata_map: Mapping[str, MetadataModel],
+        label_patterns: Sequence[Union[str, re.Pattern[Any]]]
+) -> Mapping[str, Set[str]]:
+    rv: Dict[str, Set[str]] = {}
+    for id_prefix, metadata in metadata_map.items():
+        for link in metadata.links:
+            if isinstance(link, LabelLinkModel):
+                for label in label_patterns:
+                    if (isinstance(label, str) and link.label == label or
+                        isinstance(label, re.Pattern) and label.match(link.label) is not None):
+                        if link.label not in rv:
+                            rv[link.label] = set()
+
+                        for result in link.results:
+                            rv[link.label].add(id_prefix + result.test)
+                        break
+    return rv
+
+
+def get_parser_validate() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--manifest", dest="manifest_path", help="Path to MANIFEST.json")
+    parser.add_argument("metadata_path", help="Path to wpt metadata repository")
+    return parser
+
+
+def run_validate(venv: Virtualenv, metadata_path: str, manifest_path: Optional[str] = None) -> int:
+    if manifest_path is None:
+        manifest_path = os.path.join(wpt_root, "MANIFEST.json")
+    wpt_manifest = manifest.load_and_update(wpt_root, manifest_path, "/")
+    metadata_map = load_metadata_map(metadata_path)
+
+    metadata_tests = get_all_tests(metadata_map)
+    for _type, _rel_path, tests in wpt_manifest:
+        for test in tests:
+            metadata_tests.discard(test.id)
+
+    if metadata_tests:
+        tests_str = "\n".join(metadata_map)
+        logging.error(f"The following tests were in metadata but not in the manifest:\n{tests_str}")
+        return 1
+
+    return 0
+
+
+def get_parser_list() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--manifest", dest="manifest_path", help="Path to MANIFEST.json")
+    parser.add_argument("metadata_path", help="Path to wpt metadata repository")
+    parser.add_argument("labels", nargs="+", help="Regexp representing test labels to list")
+    return parser
+
+
+def run_list(venv: Virtualenv, metadata_path: str, labels: List[str], manifest_path: Optional[str] = None) -> int:
+    if manifest_path is None:
+        manifest_path = os.path.join(wpt_root, "MANIFEST.json")
+    wpt_manifest = manifest.load_and_update(wpt_root, manifest_path, "/")
+
+    metadata_map = load_metadata_map(metadata_path)
+    label_patterns = [re.compile(item) for item in labels]
+    tests_by_label = get_labelled_tests(metadata_map, label_patterns)
+    all_labelled_tests = set()
+    tests_by_id = {}
+    for labelled_tests in tests_by_label.values():
+        all_labelled_tests |= set(labelled_tests)
+
+    for test_type, _rel_path, tests in wpt_manifest:
+        for test in tests:
+            if test.id in all_labelled_tests:
+                tests_by_id[test.id] = (test_type, test)
+
+
+    for label in sorted(tests_by_label):
+        labelled_tests = tests_by_label[label]
+        print(f"{label}\t{len(labelled_tests)}")
+        for test in sorted(tests, key=lambda x:x.id):
+            print(f"  {test}\t{tests_by_id[test.id][0]}")
+    return 0
diff --git a/tests/wpt/tests/tools/wpt/requirements_install.txt b/tests/wpt/tests/tools/wpt/requirements_install.txt
index f7df06548c9..9da7570da49 100644
--- a/tests/wpt/tests/tools/wpt/requirements_install.txt
+++ b/tests/wpt/tests/tools/wpt/requirements_install.txt
@@ -1,2 +1,2 @@
 mozinstall==2.1.0
-packaging==24.0
+packaging==25.0
diff --git a/tests/wpt/tests/tools/wpt/revlist.py b/tests/wpt/tests/tools/wpt/revlist.py
index e9fea305220..ef8dbf043fe 100644
--- a/tests/wpt/tests/tools/wpt/revlist.py
+++ b/tests/wpt/tests/tools/wpt/revlist.py
@@ -43,7 +43,7 @@ def get_tagged_revisions(pattern: str) -> Iterator[Tuple[str, str, int]]:
 
 
 def get_epoch_revisions(epoch: int, until: int, max_count: int) -> Iterator[str]:
-    # Set an offset to start to count the the weekly epoch from
+    # Set an offset to start to count the weekly epoch from
     # Monday 00:00:00. This is particularly important for the weekly epoch
     # because fix the start of the epoch to Monday. This offset is calculated
     # from Thursday, 1 January 1970 0:00:00 to Monday, 5 January 1970 0:00:00
diff --git a/tests/wpt/tests/tools/wpt/tests/test_wpt.py b/tests/wpt/tests/tools/wpt/tests/test_wpt.py
index c977b9a873f..cea4122dc9e 100644
--- a/tests/wpt/tests/tools/wpt/tests/test_wpt.py
+++ b/tests/wpt/tests/tools/wpt/tests/test_wpt.py
@@ -1,6 +1,7 @@
 # mypy: allow-untyped-defs
 
 import errno
+import logging
 import os
 import shutil
 import socket
@@ -8,14 +9,14 @@ import subprocess
 import sys
 import tempfile
 import time
-
 from urllib.request import urlopen
 from urllib.error import URLError
 
 import pytest
 
+from tools.wpt import browser, utils, wpt
+
 here = os.path.abspath(os.path.dirname(__file__))
-from tools.wpt import utils, wpt
 
 
 def is_port_8000_in_use():
@@ -57,6 +58,19 @@ def manifest_dir():
         utils.rmtree(path)
 
 
+@pytest.fixture(scope="module")
+def download_firefox():
+    try:
+        logger = logging.getLogger("download_firefox")
+        path = tempfile.mkdtemp()
+        firefox = browser.Firefox(logger)
+        bin_path = firefox.install(dest=path)
+        assert os.path.exists(bin_path) and os.path.isfile(bin_path)
+        yield bin_path
+    finally:
+        utils.rmtree(path)
+
+
 @pytest.fixture
 def temp_test():
     os.makedirs("../../.tools-tests")
@@ -120,7 +134,8 @@ def test_list_tests(manifest_dir):
 
 
 @pytest.mark.slow
-def test_list_tests_missing_manifest(manifest_dir):
+@pytest.mark.remote_network
+def test_list_tests_missing_manifest(manifest_dir, download_firefox):
     """The `--list-tests` option should not produce an error in the absence of
     a test manifest file."""
 
@@ -135,17 +150,20 @@ def test_list_tests_missing_manifest(manifest_dir):
                        # drastically reduces the time to execute the test.
                        "--tests", here,
                        "--metadata", manifest_dir,
+                       "--log-mach", "-",
                        "--list-tests",
                        "--yes",
                        # WebTransport server is not needed (web-platform-tests/wpt#41675).
                        "--no-enable-webtransport-h3",
+                       "--binary", download_firefox,
                        "firefox", "/dom/nodes/Element-tagName.html"])
 
     assert excinfo.value.code == 0
 
 
 @pytest.mark.slow
-def test_list_tests_invalid_manifest(manifest_dir):
+@pytest.mark.remote_network
+def test_list_tests_invalid_manifest(manifest_dir, download_firefox):
     """The `--list-tests` option should not produce an error in the presence of
     a malformed test manifest file."""
 
@@ -165,10 +183,12 @@ def test_list_tests_invalid_manifest(manifest_dir):
                        # drastically reduces the time to execute the test.
                        "--tests", here,
                        "--metadata", manifest_dir,
+                       "--log-mach", "-",
                        "--list-tests",
                        "--yes",
                        # WebTransport server is not needed (web-platform-tests/wpt#41675).
                        "--no-enable-webtransport-h3",
+                       "--binary", download_firefox,
                        "firefox", "/dom/nodes/Element-tagName.html"])
 
     assert excinfo.value.code == 0
diff --git a/tests/wpt/tests/tools/wptrunner/requirements.txt b/tests/wpt/tests/tools/wptrunner/requirements.txt
index 4074b20618a..97b56937955 100644
--- a/tests/wpt/tests/tools/wptrunner/requirements.txt
+++ b/tests/wpt/tests/tools/wptrunner/requirements.txt
@@ -3,7 +3,7 @@ mozdebug==0.3.1
 mozinfo==1.2.3  # https://bugzilla.mozilla.org/show_bug.cgi?id=1621226
 mozlog==8.0.0
 mozprocess==1.3.1
-packaging==24.0
+packaging==25.0
 pillow==10.4.0; python_version < '3.9'
 pillow==11.1.0; python_version >= '3.9'
 requests==2.32.3
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/android_webview.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/android_webview.py
index 0e02d3c02cd..c796be18a73 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/android_webview.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/android_webview.py
@@ -88,7 +88,6 @@ class SystemWebViewShell(ChromeAndroidBrowserBase):
 
     def __init__(self, logger, binary, webdriver_binary="chromedriver",
                  adb_binary=None,
-                 remote_queue=None,
                  device_serial=None,
                  webdriver_args=None,
                  stackwalk_binary=None,
@@ -96,7 +95,7 @@ class SystemWebViewShell(ChromeAndroidBrowserBase):
         """Creates a new representation of Chrome.  The `binary` argument gives
         the browser binary to use for testing."""
         super().__init__(logger,
-                         webdriver_binary, adb_binary, remote_queue,
+                         webdriver_binary, adb_binary,
                          device_serial, webdriver_args, stackwalk_binary,
                          symbols_path)
         self.binary = binary
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome.py
index 76bc652075e..24723734211 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome.py
@@ -158,12 +158,15 @@ def executor_kwargs(logger, test_type, test_environment, run_info_data, subsuite
         chrome_options["args"].append(
             "--ip-address-space-overrides=" + address_space_overrides_arg)
 
-    # Always disable antialiasing on the Ahem font.
-    blink_features = ['DisableAhemAntialias']
+    # Disable overlay scrollbar animations to prevent flaky wpt screenshots based on timing.
+    chrome_options["args"].append("--disable-features=ScrollbarAnimations")
+
+    # Always enable ViewTransitions long callback timeout to avoid erroneous
+    # failures due to implicit timeout within the API.
+    blink_features = ['ViewTransitionLongCallbackTimeoutForTesting']
 
     if kwargs["enable_mojojs"]:
-        blink_features.append('MojoJS')
-        blink_features.append('MojoJSTest')
+        blink_features.extend(['MojoJS', 'MojoJSTest'])
 
     chrome_options["args"].append("--enable-blink-features=" + ','.join(blink_features))
 
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_android.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_android.py
index 820323e615a..4ed7707c3be 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_android.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_android.py
@@ -3,7 +3,7 @@
 import mozprocess
 import subprocess
 
-from .base import cmd_arg, require_arg
+from .base import OutputHandler, cmd_arg, require_arg
 from .base import get_timeout_multiplier   # noqa: F401
 from .base import WebDriverBrowser  # noqa: F401
 from .chrome import executor_kwargs as chrome_executor_kwargs
@@ -79,10 +79,9 @@ def env_options():
 
 
 class LogcatRunner:
-    def __init__(self, logger, browser, remote_queue):
+    def __init__(self, logger, browser):
         self.logger = logger
         self.browser = browser
-        self.remote_queue = remote_queue
 
     def start(self):
         try:
@@ -99,43 +98,31 @@ class LogcatRunner:
             self.logger.error("Failed to clear logcat buffer")
 
         self._cmd = self.browser.logcat_cmd()
+        self._output_handler = OutputHandler(self.logger, self._cmd)
         self._proc = mozprocess.ProcessHandler(
             self._cmd,
-            processOutputLine=self.on_output,
+            processOutputLine=self._output_handler,
             storeOutput=False)
         self._proc.run()
-
-    def _send_message(self, command, *args):
-        try:
-            self.remote_queue.put((command, args))
-        except AssertionError:
-            self.logger.warning("Error when send to remote queue")
+        self._output_handler.after_process_start(self._proc.pid)
+        self._output_handler.start()
 
     def stop(self, force=False):
         if self.is_alive():
             kill_result = self._proc.kill()
             if force and kill_result != 0:
                 self._proc.kill(9)
+        self._output_handler.after_process_stop()
 
     def is_alive(self):
         return hasattr(self._proc, "proc") and self._proc.poll() is None
 
-    def on_output(self, line):
-        data = {
-            "action": "process_output",
-            "process": "LOGCAT",
-            "command": "logcat",
-            "data": line
-        }
-        self._send_message("log", data)
-
 
 class ChromeAndroidBrowserBase(WebDriverBrowser):
     def __init__(self,
                  logger,
                  webdriver_binary="chromedriver",
                  adb_binary=None,
-                 remote_queue=None,
                  device_serial=None,
                  webdriver_args=None,
                  stackwalk_binary=None,
@@ -148,15 +135,11 @@ class ChromeAndroidBrowserBase(WebDriverBrowser):
         self.device_serial = device_serial
         self.stackwalk_binary = stackwalk_binary
         self.symbols_path = symbols_path
-        self.remote_queue = remote_queue
-
-        if self.remote_queue is not None:
-            self.logcat_runner = LogcatRunner(self.logger, self, self.remote_queue)
+        self.logcat_runner = LogcatRunner(self.logger, self)
 
     def setup(self):
         self.setup_adb_reverse()
-        if self.remote_queue is not None:
-            self.logcat_runner.start()
+        self.logcat_runner.start()
 
     def _adb_run(self, args):
         cmd = [self.adb_binary]
@@ -176,8 +159,7 @@ class ChromeAndroidBrowserBase(WebDriverBrowser):
         super().cleanup()
         self._adb_run(['forward', '--remove-all'])
         self._adb_run(['reverse', '--remove-all'])
-        if self.remote_queue is not None:
-            self.logcat_runner.stop(force=True)
+        self.logcat_runner.stop(force=True)
 
     def executor_browser(self):
         cls, kwargs = super().executor_browser()
@@ -231,13 +213,12 @@ class ChromeAndroidBrowser(ChromeAndroidBrowserBase):
     def __init__(self, logger, package_name,
                  webdriver_binary="chromedriver",
                  adb_binary=None,
-                 remote_queue = None,
                  device_serial=None,
                  webdriver_args=None,
                  stackwalk_binary=None,
                  symbols_path=None):
         super().__init__(logger,
-                         webdriver_binary, adb_binary, remote_queue,
+                         webdriver_binary, adb_binary,
                          device_serial, webdriver_args, stackwalk_binary,
                          symbols_path)
         self.package_name = package_name
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
index 875ae3ea4a7..f1e7df1d4c7 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
@@ -2,7 +2,7 @@
 # DO NOT EDIT MANUALLY.
 
 # tools/certs/web-platform.test.pem
-WPT_FINGERPRINT = '9cAz+9IkfB5eNjE005taHs+0OZkHahOazSQq3xQqQHo='
+WPT_FINGERPRINT = 'w8nmBfff+kNkigb6RX+eQYKYR50daj4tOqmfn3haN6o='
 
 # signed-exchange/resources/127.0.0.1.sxg.pem
 SXG_WPT_FINGERPRINT = '0Rt4mT6SJXojEMHTnKnlJ/hBKMBcI4kteBlhR1eTTdk='
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py
index 42311d9f4d6..c63bfa2ceeb 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -220,7 +220,7 @@ def run_info_extras(logger, default_prefs=None, **kwargs):
                                      not bool_pref("fission.disableSessionHistoryInParent")),
           "swgl": bool_pref("gfx.webrender.software"),
           "privateBrowsing": bool_pref("browser.privatebrowsing.autostart"),
-          "remoteAsyncEvents": bool_pref("remote.events.async.enabled"),
+          "remoteAsyncEvents": bool_pref("remote.events.async.wheel.enabled"),
           "incOriginInit": os.environ.get("MOZ_ENABLE_INC_ORIGIN_INIT") == "1",
           }
     rv.update(run_info_browser_version(**kwargs))
@@ -377,7 +377,8 @@ class FirefoxInstanceManager:
                           self.e10s)
 
         args = self.binary_args[:] if self.binary_args else []
-        args += [cmd_arg("marionette"), "about:blank"]
+        args += [cmd_arg("marionette"),
+                 cmd_arg("remote-allow-system-access"), "about:blank"]
 
         debug_args, cmd = browser_command(self.binary,
                                           args,
@@ -751,6 +752,9 @@ class ProfileCreator:
 
         if self.test_type == "wdspec":
             profile.set_preferences({"remote.prefs.recommended": True})
+            profile.set_preferences({
+                "geo.provider.network.url": "https://web-platform.test:8444/webdriver/tests/support/http_handlers/geolocation_override.py"
+            })
 
         if self.debug_test:
             profile.set_preferences({"devtools.console.stdout.content": True})
@@ -906,7 +910,8 @@ class FirefoxBrowser(Browser):
             extensions.append(self.specialpowers_path)
         return ExecutorBrowser, {"marionette_port": self.instance.marionette_port,
                                  "extensions": extensions,
-                                 "supports_devtools": True}
+                                 "supports_devtools": True,
+                                 "supports_window_resize": True}
 
     def check_crash(self, process, test):
         return log_gecko_crashes(self.logger,
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
index 5ad270ef114..32a82d7ccc4 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
@@ -280,10 +280,12 @@ class FirefoxAndroidBrowser(Browser):
 
         self.leak_report_file = None
 
-        debug_args, cmd = browser_command(self.package_name,
-                                          self.binary_args if self.binary_args else [] +
-                                          [cmd_arg("marionette"), "about:blank"],
-                                          self.debug_info)
+        args = self.binary_args[:] if self.binary_args else []
+        args += [cmd_arg("marionette"),
+                 cmd_arg("remote-allow-system-access"), "about:blank"]
+
+        debug_args, cmd = browser_command(
+            self.package_name, args, self.debug_info)
 
         env = get_environ(self.chaos_mode_flags, self.env_extras)
 
@@ -354,7 +356,8 @@ class FirefoxAndroidBrowser(Browser):
                                  # We never want marionette to install extensions because
                                  # that doesn't work on Android; instead they are in the profile
                                  "extensions": [],
-                                 "supports_devtools": False}
+                                 "supports_devtools": False,
+                                 "supports_window_resize": False}
 
     def check_crash(self, process, test):
         if not os.environ.get("MINIDUMP_STACKWALK", "") and self.stackwalk_binary:
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/servo.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/servo.py
index d0bf0a38ea3..00d7eac0dfd 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/servo.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/servo.py
@@ -113,6 +113,9 @@ class ServoWdspecBrowser(WebDriverBrowser):
         command = [self.binary,
                    f"--webdriver={self.port}",
                    "--hard-fail",
+                   # See https://github.com/servo/servo/issues/30080.
+                   # For some reason rustls does not like the certificate generated by the WPT tooling.
+                   "--ignore-certificate-errors",
                    "--headless"] + self.webdriver_args
         if self.binary_args:
             command += self.binary_args
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/servodriver.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/servodriver.py
index bd16d7987e5..7121e1dafcc 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/servodriver.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/servodriver.py
@@ -101,7 +101,7 @@ class ServoWebDriverBrowser(WebDriverBrowser):
             # For some reason rustls does not like the certificate generated by the WPT tooling.
             "--ignore-certificate-errors",
             "--window-size", "800x600",
-            "data:,",
+            "about:blank",
         ]
 
         ca_cert_path = server_config.ssl_config["ca_cert_path"]
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/actions.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/actions.py
index 859ce8f4fa6..b093b0355d3 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/actions.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/actions.py
@@ -498,7 +498,8 @@ class UpdateVirtualPressureSourceAction:
     def __call__(self, payload):
         source_type = payload["source_type"]
         sample = payload["sample"]
-        return self.protocol.pressure.update_virtual_pressure_source(source_type, sample)
+        own_contribution_estimate = payload["own_contribution_estimate"]
+        return self.protocol.pressure.update_virtual_pressure_source(source_type, sample, own_contribution_estimate)
 
 class RemoveVirtualPressureSourceAction:
     name = "remove_virtual_pressure_source"
@@ -511,6 +512,38 @@ class RemoveVirtualPressureSourceAction:
         source_type = payload["source_type"]
         return self.protocol.pressure.remove_virtual_pressure_source(source_type)
 
+class SetProtectedAudienceKAnonymityAction:
+    name = "set_protected_audience_k_anonymity"
+
+    def __init__(self, logger, protocol):
+        self.logger = logger
+        self.protocol = protocol
+
+    def __call__(self, payload):
+        owner, name, hashes = payload["owner"], payload["name"], payload["hashes"]
+        return self.protocol.protected_audience.set_k_anonymity(owner, name, hashes)
+
+class SetDisplayFeaturesAction:
+    name = "set_display_features"
+
+    def __init__(self, logger, protocol):
+        self.logger = logger
+        self.protocol = protocol
+
+    def __call__(self, payload):
+        features = payload["features"]
+        return self.protocol.display_features.set_display_features(features)
+
+class ClearDisplayFeaturesAction:
+    name = "clear_display_features"
+
+    def __init__(self, logger, protocol):
+        self.logger = logger
+        self.protocol = protocol
+
+    def __call__(self, payload):
+        return self.protocol.display_features.clear_display_features()
+
 actions = [ClickAction,
            DeleteAllCookiesAction,
            GetAllCookiesAction,
@@ -550,4 +583,7 @@ actions = [ClickAction,
            RunBounceTrackingMitigationsAction,
            CreateVirtualPressureSourceAction,
            UpdateVirtualPressureSourceAction,
-           RemoveVirtualPressureSourceAction]
+           RemoveVirtualPressureSourceAction,
+           SetProtectedAudienceKAnonymityAction,
+           SetDisplayFeaturesAction,
+           ClearDisplayFeaturesAction]
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/asyncactions.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/asyncactions.py
index 71187ee76d7..8397d7838a3 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/asyncactions.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/asyncactions.py
@@ -1,4 +1,5 @@
 # mypy: allow-untyped-defs
+from webdriver.bidi.undefined import UNDEFINED
 
 webdriver = None
 
@@ -7,6 +8,22 @@ def do_delayed_imports():
     global webdriver
     import webdriver
 
+
+def get_browsing_context_id(context):
+    """
+    :param context: Either a string representing the browsing context id, or a
+    BiDi serialized window proxy object. In the latter case, the value is
+    extracted from the serialized object.
+    :return: The browsing context id.
+    """
+    if isinstance(context, str):
+        return context
+    elif isinstance(context, webdriver.bidi.protocol.BidiWindow):
+        # Context can be a serialized WindowProxy.
+        return context.browsing_context
+    raise ValueError("Unexpected context type: %s" % context)
+
+
 class BidiBluetoothHandleRequestDevicePrompt:
     name = "bidi.bluetooth.handle_request_device_prompt"
 
@@ -16,18 +33,10 @@ class BidiBluetoothHandleRequestDevicePrompt:
         self.protocol = protocol
 
     async def __call__(self, payload):
-        if payload["context"] is None:
+        if "context" not in payload:
             raise ValueError("Missing required parameter: context")
 
-        context = payload["context"]
-        if isinstance(context, str):
-            pass
-        elif isinstance(context, webdriver.bidi.protocol.BidiWindow):
-            # Context can be a serialized WindowProxy.
-            context = context.browsing_context
-        else:
-            raise ValueError("Unexpected context type: %s" % context)
-
+        context = get_browsing_context_id(payload["context"])
         prompt = payload["prompt"]
         accept = payload["accept"]
         device = payload["device"]
@@ -42,17 +51,10 @@ class BidiBluetoothSimulateAdapterAction:
         self.protocol = protocol
 
     async def __call__(self, payload):
-        if payload["context"] is None:
+        if "context" not in payload:
             raise ValueError("Missing required parameter: context")
 
-        context = payload["context"]
-        if isinstance(context, str):
-            pass
-        elif isinstance(context, webdriver.bidi.protocol.BidiWindow):
-            # Context can be a serialized WindowProxy.
-            context = context.browsing_context
-        else:
-            raise ValueError("Unexpected context type: %s" % context)
+        context = get_browsing_context_id(payload["context"])
 
         state = payload["state"]
         return await self.protocol.bidi_bluetooth.simulate_adapter(context,
@@ -68,17 +70,9 @@ class BidiBluetoothSimulatePreconnectedPeripheralAction:
         self.protocol = protocol
 
     async def __call__(self, payload):
-        if payload["context"] is None:
+        if "context" not in payload:
             raise ValueError("Missing required parameter: context")
-
-        context = payload["context"]
-        if isinstance(context, str):
-            pass
-        elif isinstance(context, webdriver.bidi.protocol.BidiWindow):
-            # Context can be a serialized WindowProxy.
-            context = context.browsing_context
-        else:
-            raise ValueError("Unexpected context type: %s" % context)
+        context = get_browsing_context_id(payload["context"])
 
         address = payload["address"]
         name = payload["name"]
@@ -87,6 +81,41 @@ class BidiBluetoothSimulatePreconnectedPeripheralAction:
         return await self.protocol.bidi_bluetooth.simulate_preconnected_peripheral(
             context, address, name, manufacturer_data, known_service_uuids)
 
+
+class BidiEmulationSetGeolocationOverrideAction:
+    name = "bidi.emulation.set_geolocation_override"
+
+    def __init__(self, logger, protocol):
+        do_delayed_imports()
+        self.logger = logger
+        self.protocol = protocol
+
+    async def __call__(self, payload):
+        if "error" in payload and "coordinates" in payload:
+            raise ValueError(
+                "Params `error` and `coordinates` are mutually exclusive")
+
+        # If `error` is present, set it. Otherwise, do not pass it (error: None).
+        # Note, unlike `coordinates`, `error` cannot be `UNDEFINED`. It's either
+        # `None` and it's not passed, or some dict value which is passed.
+        error = payload['error'] if 'error' in payload else None
+        # If `error` is present, do not pass `coordinates` (coordinates: UNDEFINED).
+        # Otherwise, remove emulation (coordinates: None).
+        coordinates = payload['coordinates'] if 'coordinates' in payload else (
+            None if error is None else UNDEFINED)
+
+        if "contexts" not in payload:
+            raise ValueError("Missing required parameter: contexts")
+        contexts = []
+        for context in payload["contexts"]:
+            contexts.append(get_browsing_context_id(context))
+        if len(contexts) == 0:
+            raise ValueError("At least one context must be provided")
+
+        return await self.protocol.bidi_emulation.set_geolocation_override(
+            coordinates, error, contexts)
+
+
 class BidiSessionSubscribeAction:
     name = "bidi.session.subscribe"
 
@@ -98,17 +127,10 @@ class BidiSessionSubscribeAction:
     async def __call__(self, payload):
         events = payload["events"]
         contexts = None
-        if payload["contexts"] is not None:
+        if "contexts" in payload and payload["contexts"] is not None:
             contexts = []
             for context in payload["contexts"]:
-                # Context can be either a browsing context id, or a BiDi serialized window. In the latter case, the
-                # value is extracted from the serialized object.
-                if isinstance(context, str):
-                    contexts.append(context)
-                elif isinstance(context, webdriver.bidi.protocol.BidiWindow):
-                    contexts.append(context.browsing_context)
-                else:
-                    raise ValueError("Unexpected context type: %s" % context)
+                contexts.append(get_browsing_context_id(context))
         return await self.protocol.bidi_events.subscribe(events, contexts)
 
 
@@ -133,5 +155,6 @@ async_actions = [
     BidiBluetoothHandleRequestDevicePrompt,
     BidiBluetoothSimulateAdapterAction,
     BidiBluetoothSimulatePreconnectedPeripheralAction,
+    BidiEmulationSetGeolocationOverrideAction,
     BidiPermissionsSetPermissionAction,
     BidiSessionSubscribeAction]
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
index ebc4a4a5656..08bc02cbc3c 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -46,6 +46,7 @@ from .protocol import (AccessibilityProtocolPart,
                        VirtualSensorProtocolPart,
                        DevicePostureProtocolPart,
                        VirtualPressureSourceProtocolPart,
+                       DisplayFeaturesProtocolPart,
                        merge_dicts)
 
 
@@ -721,12 +722,21 @@ class MarionetteVirtualPressureSourceProtocolPart(VirtualPressureSourceProtocolP
     def create_virtual_pressure_source(self, source_type, metadata):
         raise NotImplementedError("create_virtual_pressure_source not yet implemented")
 
-    def update_virtual_pressure_source(self, source_type, sample):
+    def update_virtual_pressure_source(self, source_type, sample, own_contribution_estimate):
         raise NotImplementedError("update_virtual_pressure_source not yet implemented")
 
     def remove_virtual_pressure_source(self, source_type):
         raise NotImplementedError("remove_virtual_pressure_source not yet implemented")
 
+class MarionetteDisplayFeaturesProtocolPart(DisplayFeaturesProtocolPart):
+    def setup(self):
+        self.marionette = self.parent.marionette
+
+    def set_display_features(self, features):
+        raise NotImplementedError("set_display_features not yet implemented")
+
+    def clear_display_features(self):
+        raise NotImplementedError("clear_display_features not yet implemented")
 
 class MarionetteProtocol(Protocol):
     implements = [MarionetteBaseProtocolPart,
@@ -750,7 +760,8 @@ class MarionetteProtocol(Protocol):
                   MarionetteAccessibilityProtocolPart,
                   MarionetteVirtualSensorProtocolPart,
                   MarionetteDevicePostureProtocolPart,
-                  MarionetteVirtualPressureSourceProtocolPart]
+                  MarionetteVirtualPressureSourceProtocolPart,
+                  MarionetteDisplayFeaturesProtocolPart]
 
     def __init__(self, executor, browser, capabilities=None, timeout_multiplier=1, e10s=True, ccov=False):
         do_delayed_imports()
@@ -914,6 +925,7 @@ class MarionetteTestharnessExecutor(TestharnessExecutor):
         self.debug_test = debug_test
 
         self.install_extensions = browser.extensions
+        self.initial_window_size = None
 
         self.original_pref_values = {}
 
@@ -928,6 +940,10 @@ class MarionetteTestharnessExecutor(TestharnessExecutor):
             addons.install(extension_path)
 
         self.protocol.testharness.load_runner(self.last_environment["protocol"])
+        try:
+            self.initial_window_size = self.protocol.window.get_rect()
+        except Exception:
+            pass
 
     def is_alive(self):
         return self.protocol.is_alive()
@@ -974,6 +990,9 @@ class MarionetteTestharnessExecutor(TestharnessExecutor):
 
         test_window = protocol.base.create_window()
         self.protocol.base.set_window(test_window)
+        # Restore the window to the initial position
+        if self.browser.supports_window_resize and self.initial_window_size:
+            self.protocol.window.set_rect(self.initial_window_size)
 
         if self.debug_test and self.browser.supports_devtools:
             self.protocol.debug.load_devtools()
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorservo.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorservo.py
index e3369d24ebc..7b0a64a6048 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorservo.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorservo.py
@@ -86,6 +86,7 @@ class ServoExecutor(ProcessTestExecutor):
             # See https://github.com/servo/servo/issues/30080.
             # For some reason rustls does not like the certificate generated by the WPT tooling.
             "--ignore-certificate-errors",
+            "--enable-experimental-web-platform-features",
             "-z", self.test_url(test),
         ]
         for stylesheet in self.browser.user_stylesheets:
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
index 95667480afe..7ca46a05a7b 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
@@ -39,12 +39,15 @@ from .protocol import (BaseProtocolPart,
                        VirtualSensorProtocolPart,
                        BidiBluetoothProtocolPart,
                        BidiBrowsingContextProtocolPart,
+                       BidiEmulationProtocolPart,
                        BidiEventsProtocolPart,
                        BidiPermissionsProtocolPart,
                        BidiScriptProtocolPart,
                        DevicePostureProtocolPart,
                        StorageProtocolPart,
                        VirtualPressureSourceProtocolPart,
+                       ProtectedAudienceProtocolPart,
+                       DisplayFeaturesProtocolPart,
                        merge_dicts)
 
 from typing import Any, List, Optional, Tuple
@@ -261,6 +264,19 @@ class WebDriverBidiScriptProtocolPart(BidiScriptProtocolPart):
             await_promise=True)
 
 
+class WebDriverBidiEmulationProtocolPart(BidiEmulationProtocolPart):
+    def __init__(self, parent):
+        super().__init__(parent)
+        self.webdriver = None
+
+    def setup(self):
+        self.webdriver = self.parent.webdriver
+
+    async def set_geolocation_override(self, coordinates, error, contexts):
+        return await self.webdriver.bidi_session.emulation.set_geolocation_override(
+            coordinates=coordinates, error=error, contexts=contexts)
+
+
 class WebDriverBidiPermissionsProtocolPart(BidiPermissionsProtocolPart):
     def __init__(self, parent):
         super().__init__(parent)
@@ -684,13 +700,31 @@ class WebDriverVirtualPressureSourceProtocolPart(VirtualPressureSourceProtocolPa
         body.update(metadata)
         return self.webdriver.send_session_command("POST", "pressuresource", body)
 
-    def update_virtual_pressure_source(self, source_type, sample):
-        body = {"sample": sample}
+    def update_virtual_pressure_source(self, source_type, sample, own_contribution_estimate):
+        body = {"sample": sample, "own_contribution_estimate": own_contribution_estimate}
         return self.webdriver.send_session_command("POST", "pressuresource/%s" % source_type, body)
 
     def remove_virtual_pressure_source(self, source_type):
         return self.webdriver.send_session_command("DELETE", "pressuresource/%s" % source_type)
 
+class WebDriverProtectedAudienceProtocolPart(ProtectedAudienceProtocolPart):
+    def setup(self):
+        self.webdriver = self.parent.webdriver
+
+    def set_k_anonymity(self, owner, name, hashes):
+        body = {"owner": owner, "name": name, "hashes": hashes}
+        return self.webdriver.send_session_command("POST", "protected_audience/set_k_anonymity", body)
+
+class WebDriverDisplayFeaturesProtocolPart(DisplayFeaturesProtocolPart):
+    def setup(self):
+        self.webdriver = self.parent.webdriver
+
+    def set_display_features(self, features):
+        body = {"features": features}
+        return self.webdriver.send_session_command("POST", "displayfeatures", body)
+
+    def clear_display_features(self):
+        return self.webdriver.send_session_command("DELETE", "displayfeatures")
 
 class WebDriverProtocol(Protocol):
     enable_bidi = False
@@ -715,7 +749,9 @@ class WebDriverProtocol(Protocol):
                   WebDriverVirtualSensorPart,
                   WebDriverDevicePostureProtocolPart,
                   WebDriverStorageProtocolPart,
-                  WebDriverVirtualPressureSourceProtocolPart]
+                  WebDriverVirtualPressureSourceProtocolPart,
+                  WebDriverProtectedAudienceProtocolPart,
+                  WebDriverDisplayFeaturesProtocolPart]
 
     def __init__(self, executor, browser, capabilities, **kwargs):
         super().__init__(executor, browser)
@@ -788,6 +824,7 @@ class WebDriverBidiProtocol(WebDriverProtocol):
     enable_bidi = True
     implements = [WebDriverBidiBluetoothProtocolPart,
                   WebDriverBidiBrowsingContextProtocolPart,
+                  WebDriverBidiEmulationProtocolPart,
                   WebDriverBidiEventsProtocolPart,
                   WebDriverBidiPermissionsProtocolPart,
                   WebDriverBidiScriptProtocolPart,
@@ -987,6 +1024,14 @@ class WebDriverTestharnessExecutor(TestharnessExecutor, TestDriverExecutorMixin)
 
         self.close_after_done = close_after_done
         self.cleanup_after_test = cleanup_after_test
+        self.initial_window_size = None
+
+    def setup(self, runner, protocol=None):
+        super().setup(runner, protocol)
+        try:
+            self.initial_window_size = self.protocol.window.get_rect()
+        except Exception:
+            pass
 
     def on_environment_change(self, new_environment):
         if new_environment["protocol"] != self.last_environment["protocol"]:
@@ -1016,6 +1061,13 @@ class WebDriverTestharnessExecutor(TestharnessExecutor, TestDriverExecutorMixin)
             # The previous test may not have closed its old windows (if something
             # went wrong or if cleanup_after_test was False), so clean up here.
             protocol.testharness.close_old_windows()
+            # Restore the window to the initial position
+            if self.initial_window_size:
+                try:
+                    self.protocol.window.set_rect(self.initial_window_size)
+                except Exception:
+                    pass
+
             raw_results = self.run_testdriver(protocol, url, timeout)
             extra = {}
             if counters := self._check_for_leaks(protocol):
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/protocol.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/protocol.py
index 0940e87cdbd..16eb3cbb4a5 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/protocol.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/protocol.py
@@ -5,7 +5,10 @@ import traceback
 from http.client import HTTPConnection
 
 from abc import ABCMeta, abstractmethod
-from typing import Any, Awaitable, Callable, ClassVar, List, Mapping, Optional, Tuple, Type
+from typing import Any, Awaitable, Callable, ClassVar, List, Mapping, Optional, \
+    Tuple, Type, Union
+
+from webdriver.bidi.undefined import Undefined
 
 
 def merge_dicts(target, source):
@@ -445,6 +448,19 @@ class BidiPermissionsProtocolPart(ProtocolPart):
         pass
 
 
+class BidiEmulationProtocolPart(ProtocolPart):
+    """Protocol part for emulation"""
+    __metaclass__ = ABCMeta
+    name = "bidi_emulation"
+
+    @abstractmethod
+    async def set_geolocation_override(self,
+            coordinates: Optional[Union[Mapping[str, Any], Undefined]],
+            error: Optional[Mapping[str, Any]],
+            contexts: List[str]) -> None:
+        pass
+
+
 class BidiScriptProtocolPart(ProtocolPart):
     """Protocol part for executing BiDi scripts"""
     __metaclass__ = ABCMeta
@@ -1009,9 +1025,33 @@ class VirtualPressureSourceProtocolPart(ProtocolPart):
         pass
 
     @abstractmethod
-    def update_virtual_pressure_source(self, source_type, sample):
+    def update_virtual_pressure_source(self, source_type, sample, own_contribution_estimate):
         pass
 
     @abstractmethod
     def remove_virtual_pressure_source(self, source_type):
         pass
+
+class ProtectedAudienceProtocolPart(ProtocolPart):
+    """Protocol part for Protected Audience"""
+    __metaclass__ = ABCMeta
+
+    name = "protected_audience"
+
+    @abstractmethod
+    def set_k_anonymity(self, owner, name, hashes):
+        pass
+
+class DisplayFeaturesProtocolPart(ProtocolPart):
+    """Protocol part for Display Features/Viewport Segments"""
+    __metaclass__ = ABCMeta
+
+    name = "display_features"
+
+    @abstractmethod
+    def set_display_features(self, features):
+        pass
+
+    @abstractmethod
+    def clear_display_features(self):
+        pass
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/chromium.py b/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/chromium.py
deleted file mode 100644
index 95f53011bfc..00000000000
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/chromium.py
+++ /dev/null
@@ -1,338 +0,0 @@
-# mypy: allow-untyped-defs
-
-import functools
-import json
-import time
-
-from collections import defaultdict
-from mozlog.formatters import base
-
-from wptrunner.wptmanifest import serializer
-
-_escape_heading = functools.partial(serializer.escape, extras="]")
-
-
-class ChromiumFormatter(base.BaseFormatter):  # type: ignore
-    """Formatter to produce results matching the Chromium JSON Test Results format.
-    https://chromium.googlesource.com/chromium/src/+/master/docs/testing/json_test_results_format.md
-
-    Notably, each test has an "artifacts" field that is a dict consisting of
-        "log": a list of strings (one per subtest + one for harness status, see
-            _append_test_message for the format)
-        "screenshots": a list of strings in the format of "url: base64"
-
-    """
-
-    def __init__(self):
-        # Whether the run was interrupted, either by the test runner or user.
-        self.interrupted = False
-
-        # A map of test status to the number of tests that had that status.
-        self.num_failures_by_status = defaultdict(int)
-
-        # Start time, expressed as offset since UNIX epoch in seconds. Measured
-        # from the first `suite_start` event.
-        self.start_timestamp_seconds = None
-
-        # A map of test names to test start timestamps, expressed in seconds
-        # since UNIX epoch. Only contains tests that are currently running
-        # (i.e., have not received the `test_end` event).
-        self.test_starts = {}
-
-        # Trie of test results. Each directory in the test name is a node in
-        # the trie and the leaf contains the dict of per-test data.
-        self.tests = {}
-
-        # Two dictionaries keyed by test name. Values are lists of strings:
-        # actual metadata content and other messages, respectively.
-        # See _append_test_message for examples.
-        self.actual_metadata = defaultdict(list)
-        self.messages = defaultdict(list)
-
-        # List of tests that have failing subtests.
-        self.tests_with_subtest_fails = set()
-
-        # Browser log for the current test under execution.
-        # These logs are from ChromeDriver's stdout/err, so we cannot say for
-        # sure which test a message is from, but instead we correlate them based
-        # on timing.
-        self.browser_log = []
-
-    def _append_test_message(self, test, subtest, wpt_actual_status, message):
-        r"""
-        Appends the message data for a test or subtest.
-
-        :param str test: the name of the test
-        :param str subtest: the name of the subtest with the message. Will be
-                            None if this is called for a test.
-        :param str wpt_actual_status: the test status as reported by WPT
-        :param str message: the string to append to the message for this test
-
-        Example actual_metadata of a test with a subtest:
-            "[test_name]\n  expected: OK\n"
-            "  [subtest_name]\n    expected: FAIL\n"
-
-        NOTE: throughout this function we output a key called "expected" but
-        fill it in with the actual status. This is by design. The goal of this
-        output is to look exactly like WPT's expectation metadata so that it
-        can be easily diff-ed.
-
-        Messages are appended verbatim to self.messages[test].
-        """
-        if subtest:
-            result = "  [%s]\n    expected: %s\n" % (_escape_heading(subtest),
-                                                     wpt_actual_status)
-            self.actual_metadata[test].append(result)
-            if message:
-                self.messages[test].append("%s: %s\n" % (subtest, message))
-        else:
-            # No subtest, so this is the top-level test. The result must be
-            # prepended to the list, so that it comes before any subtest.
-            test_name_last_part = test.split("/")[-1]
-            result = "[%s]\n  expected: %s\n" % (
-                _escape_heading(test_name_last_part), wpt_actual_status)
-            self.actual_metadata[test].insert(0, result)
-            if message:
-                self.messages[test].insert(0, "Harness: %s\n" % message)
-
-    def _append_artifact(self, cur_dict, artifact_name, artifact_value):
-        """
-        Appends artifacts to the specified dictionary.
-        :param dict cur_dict: the test leaf dictionary to append to
-        :param str artifact_name: the name of the artifact
-        :param str artifact_value: the value of the artifact
-        """
-        assert isinstance(artifact_value, str), "artifact_value must be a str"
-        if "artifacts" not in cur_dict.keys():
-            cur_dict["artifacts"] = defaultdict(list)
-        cur_dict["artifacts"][artifact_name].append(artifact_value)
-
-    def _store_test_result(self, name, actual, expected, actual_metadata,
-                           messages, wpt_actual, subtest_failure,
-                           duration=None, reftest_screenshots=None):
-        """
-        Stores the result of a single test in |self.tests|
-
-        :param str name: name of the test.
-        :param str actual: actual status of the test.
-        :param str expected: expected statuses of the test.
-        :param list actual_metadata: a list of metadata items.
-        :param list messages: a list of test messages.
-        :param str wpt_actual: actual status reported by wpt, may differ from |actual|.
-        :param bool subtest_failure: whether this test failed because of subtests.
-        :param Optional[float] duration: time it took in seconds to run this test.
-        :param Optional[list] reftest_screenshots: see executors/base.py for definition.
-        """
-        # The test name can contain a leading / which will produce an empty
-        # string in the first position of the list returned by split. We use
-        # filter(None) to remove such entries.
-        name_parts = filter(None, name.split("/"))
-        cur_dict = self.tests
-        for name_part in name_parts:
-            cur_dict = cur_dict.setdefault(name_part, {})
-        # Splitting and joining the list of statuses here avoids the need for
-        # recursively postprocessing the |tests| trie at shutdown. We assume the
-        # number of repetitions is typically small enough for the quadratic
-        # runtime to not matter.
-        statuses = cur_dict.get("actual", "").split()
-        statuses.append(actual)
-        cur_dict["actual"] = " ".join(statuses)
-        cur_dict["expected"] = expected
-        if duration is not None:
-            # Record the time to run the first invocation only.
-            cur_dict.setdefault("time", duration)
-            durations = cur_dict.setdefault("times", [])
-            durations.append(duration)
-        if subtest_failure:
-            self._append_artifact(cur_dict, "wpt_subtest_failure", "true")
-        if wpt_actual != actual:
-            self._append_artifact(cur_dict, "wpt_actual_status", wpt_actual)
-        if wpt_actual == 'CRASH':
-            for line in self.browser_log:
-                self._append_artifact(cur_dict, "wpt_crash_log", line)
-        for metadata in actual_metadata:
-            self._append_artifact(cur_dict, "wpt_actual_metadata", metadata)
-        for message in messages:
-            self._append_artifact(cur_dict, "wpt_log", message)
-
-        # Store screenshots (if any).
-        for item in reftest_screenshots or []:
-            if not isinstance(item, dict):
-                # Skip the relation string.
-                continue
-            data = "%s: %s" % (item["url"], item["screenshot"])
-            self._append_artifact(cur_dict, "screenshots", data)
-
-        # Figure out if there was a regression, unexpected status, or flake.
-        # This only happens for tests that were run
-        if actual != "SKIP":
-            if actual not in expected:
-                cur_dict["is_unexpected"] = True
-                if actual != "PASS":
-                    cur_dict["is_regression"] = True
-            if len(set(statuses)) > 1:
-                cur_dict["is_flaky"] = True
-
-        # Update the count of how many tests ran with each status. Only includes
-        # the first invocation's result in the totals.
-        if len(statuses) == 1:
-            self.num_failures_by_status[actual] += 1
-
-    def _map_status_name(self, status):
-        """
-        Maps a WPT status to a Chromium status.
-
-        Chromium has five main statuses that we have to map to:
-        CRASH: the test harness crashed
-        FAIL: the test did not run as expected
-        PASS: the test ran as expected
-        SKIP: the test was not run
-        TIMEOUT: the did not finish in time and was aborted
-
-        :param str status: the string status of a test from WPT
-        :return: a corresponding string status for Chromium
-        """
-        if status == "OK":
-            return "PASS"
-        if status == "NOTRUN":
-            return "SKIP"
-        if status == "EXTERNAL-TIMEOUT":
-            return "TIMEOUT"
-        if status in ("ERROR", "PRECONDITION_FAILED"):
-            return "FAIL"
-        if status == "INTERNAL-ERROR":
-            return "CRASH"
-        # Any other status just gets returned as-is.
-        return status
-
-    def _get_expected_status_from_data(self, actual_status, data):
-        """
-        Gets the expected statuses from a |data| dictionary.
-
-        If there is no expected status in data, the actual status is returned.
-        This is because mozlog will delete "expected" from |data| if it is the
-        same as "status". So the presence of "expected" implies that "status" is
-        unexpected. Conversely, the absence of "expected" implies the "status"
-        is expected. So we use the "expected" status if it's there or fall back
-        to the actual status if it's not.
-
-        If the test has multiple statuses, it will have other statuses listed as
-        "known_intermittent" in |data|. If these exist, they will be added to
-        the returned status with spaced in between.
-
-        :param str actual_status: the actual status of the test
-        :param data: a data dictionary to extract expected status from
-        :return str: the expected statuses as a string
-        """
-        expected_statuses = self._map_status_name(data["expected"]) if "expected" in data else actual_status
-        if data.get("known_intermittent"):
-            all_statsues = {self._map_status_name(other_status) for other_status in data["known_intermittent"]}
-            all_statsues.add(expected_statuses)
-            expected_statuses = " ".join(sorted(all_statsues))
-        return expected_statuses
-
-    def _get_time(self, data):
-        """Get the timestamp of a message in seconds since the UNIX epoch."""
-        maybe_timestamp_millis = data.get("time")
-        if maybe_timestamp_millis is not None:
-            return float(maybe_timestamp_millis) / 1000
-        return time.time()
-
-    def _time_test(self, test_name, data):
-        """Time how long a test took to run.
-
-        :param str test_name: the name of the test to time
-        :param data: a data dictionary to extract the test end timestamp from
-        :return Optional[float]: a nonnegative duration in seconds or None if
-                                 the measurement is unavailable or invalid
-        """
-        test_start = self.test_starts.pop(test_name, None)
-        if test_start is not None:
-            # The |data| dictionary only provides millisecond resolution
-            # anyway, so further nonzero digits are unlikely to be meaningful.
-            duration = round(self._get_time(data) - test_start, 3)
-            if duration >= 0:
-                return duration
-        return None
-
-    def suite_start(self, data):
-        if self.start_timestamp_seconds is None:
-            self.start_timestamp_seconds = self._get_time(data)
-        if 'run_info' in data:
-            self.flag_specific = data['run_info'].get('flag_specific', '')
-
-    def test_start(self, data):
-        test_name = data["test"]
-        self.test_starts[test_name] = self._get_time(data)
-
-    def test_status(self, data):
-        test_name = data["test"]
-        wpt_actual_status = data["status"]
-        actual_status = self._map_status_name(wpt_actual_status)
-        expected_statuses = self._get_expected_status_from_data(actual_status, data)
-
-        is_unexpected = actual_status not in expected_statuses
-        if is_unexpected and test_name not in self.tests_with_subtest_fails:
-            self.tests_with_subtest_fails.add(test_name)
-        # We should always get a subtest in the data dict, but it's technically
-        # possible that it's missing. Be resilient here.
-        subtest_name = data.get("subtest", "UNKNOWN SUBTEST")
-        self._append_test_message(test_name, subtest_name,
-                                  wpt_actual_status, data.get("message", ""))
-
-    def test_end(self, data):
-        test_name = data["test"]
-        # Save the status reported by WPT since we might change it when
-        # reporting to Chromium.
-        wpt_actual_status = data["status"]
-        actual_status = self._map_status_name(wpt_actual_status)
-        expected_statuses = self._get_expected_status_from_data(actual_status, data)
-        duration = self._time_test(test_name, data)
-        subtest_failure = False
-        if test_name in self.tests_with_subtest_fails:
-            subtest_failure = True
-            # Clean up the test list to avoid accumulating too many.
-            self.tests_with_subtest_fails.remove(test_name)
-            # This test passed but it has failing subtests. Since we can only
-            # report a single status to Chromium, we choose FAIL to indicate
-            # that something about this test did not run correctly.
-            if actual_status == "PASS":
-                actual_status = "FAIL"
-
-        self._append_test_message(test_name, None, wpt_actual_status,
-                                  data.get("message", ""))
-        self._store_test_result(test_name,
-                                actual_status,
-                                expected_statuses,
-                                self.actual_metadata[test_name],
-                                self.messages[test_name],
-                                wpt_actual_status,
-                                subtest_failure,
-                                duration,
-                                data.get("extra", {}).get("reftest_screenshots"))
-
-        # Remove the test from dicts to avoid accumulating too many.
-        self.actual_metadata.pop(test_name)
-        self.messages.pop(test_name)
-
-        # New test, new browser logs.
-        self.browser_log = []
-
-    def shutdown(self, data):
-        # Create the final result dictionary
-        final_result = {
-            # There are some required fields that we just hard-code.
-            "interrupted": False,
-            "path_delimiter": "/",
-            "version": 3,
-            "seconds_since_epoch": self.start_timestamp_seconds,
-            "num_failures_by_type": self.num_failures_by_status,
-            "flag_name": self.flag_specific,
-            "tests": self.tests
-        }
-        return json.dumps(final_result)
-
-    def process_output(self, data):
-        cmd = data.get("command", "")
-        if any(c in cmd for c in ["chromedriver", "logcat"]):
-            self.browser_log.append(data['data'])
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/tests/test_chromium.py b/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/tests/test_chromium.py
deleted file mode 100644
index bf815d5dc76..00000000000
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/tests/test_chromium.py
+++ /dev/null
@@ -1,828 +0,0 @@
-# mypy: ignore-errors
-
-import json
-import sys
-from os.path import dirname, join
-from io import StringIO
-
-from mozlog import handlers, structuredlog
-import pytest
-
-sys.path.insert(0, join(dirname(__file__), "..", ".."))
-from formatters.chromium import ChromiumFormatter
-
-
-@pytest.fixture
-def logger():
-    test_logger = structuredlog.StructuredLogger("test_a")
-    try:
-        yield test_logger
-    finally:
-        # Loggers of the same name share state globally:
-        #   https://searchfox.org/mozilla-central/rev/1c54648c082efdeb08cf6a5e3a8187e83f7549b9/testing/mozbase/mozlog/mozlog/structuredlog.py#195-196
-        #
-        # Resetting the state here ensures the logger will not be shut down in
-        # the next test.
-        test_logger.reset_state()
-
-
-def test_chromium_required_fields(logger, capfd):
-    # Test that the test results contain a handful of required fields.
-
-    # Set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    # output a bunch of stuff
-    logger.suite_start(["test-id-1"], run_info={}, time=123)
-    logger.test_start("test-id-1")
-    logger.test_end("test-id-1", status="PASS", expected="PASS")
-    logger.suite_end()
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_obj = json.load(output)
-
-    # Check for existence of required fields
-    assert "interrupted" in output_obj
-    assert "path_delimiter" in output_obj
-    assert "version" in output_obj
-    assert "num_failures_by_type" in output_obj
-    assert "tests" in output_obj
-
-    test_obj = output_obj["tests"]["test-id-1"]
-    assert "actual" in test_obj
-    assert "expected" in test_obj
-
-
-def test_time_per_test(logger, capfd):
-    # Test that the formatter measures time per test correctly.
-
-    # Set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    logger.suite_start(["test-id-1", "test-id-2"], run_info={}, time=50)
-    logger.test_start("test-id-1", time=100)
-    logger.test_start("test-id-2", time=200)
-    logger.test_end("test-id-1", status="PASS", expected="PASS", time=300)
-    logger.test_end("test-id-2", status="PASS", expected="PASS", time=199)
-    logger.suite_end()
-
-    logger.suite_start(["test-id-1"], run_info={}, time=400)
-    logger.test_start("test-id-1", time=500)
-    logger.test_end("test-id-1", status="PASS", expected="PASS", time=600)
-    logger.suite_end()
-
-    # Write the final results.
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_obj = json.load(output)
-
-    test1_obj = output_obj["tests"]["test-id-1"]
-    test2_obj = output_obj["tests"]["test-id-2"]
-    # Test 1 run 1: 300ms - 100ms = 0.2s
-    # Test 1 run 2: 600ms - 500ms = 0.1s
-    assert test1_obj["time"] == pytest.approx(0.2)
-    assert len(test1_obj["times"]) == 2
-    assert test1_obj["times"][0] == pytest.approx(0.2)
-    assert test1_obj["times"][1] == pytest.approx(0.1)
-    assert "time" not in test2_obj
-    assert "times" not in test2_obj
-
-
-def test_chromium_test_name_trie(logger, capfd):
-    # Ensure test names are broken into directories and stored in a trie with
-    # test results at the leaves.
-
-    # Set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    # output a bunch of stuff
-    logger.suite_start(["/foo/bar/test-id-1", "/foo/test-id-2"], run_info={},
-                       time=123)
-    logger.test_start("/foo/bar/test-id-1")
-    logger.test_end("/foo/bar/test-id-1", status="TIMEOUT", expected="FAIL")
-    logger.test_start("/foo/test-id-2")
-    logger.test_end("/foo/test-id-2", status="ERROR", expected="TIMEOUT")
-    logger.suite_end()
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_obj = json.load(output)
-
-    # Ensure that the test names are broken up by directory name and that the
-    # results are stored at the leaves.
-    test_obj = output_obj["tests"]["foo"]["bar"]["test-id-1"]
-    assert test_obj["actual"] == "TIMEOUT"
-    assert test_obj["expected"] == "FAIL"
-
-    test_obj = output_obj["tests"]["foo"]["test-id-2"]
-    # The ERROR status is mapped to FAIL for Chromium
-    assert test_obj["actual"] == "FAIL"
-    assert test_obj["expected"] == "TIMEOUT"
-
-
-def test_num_failures_by_type(logger, capfd):
-    # Test that the number of failures by status type is correctly calculated.
-
-    # Set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    # Run some tests with different statuses: 3 passes, 1 timeout
-    logger.suite_start(["t1", "t2", "t3", "t4"], run_info={}, time=123)
-    logger.test_start("t1")
-    logger.test_end("t1", status="PASS", expected="PASS")
-    logger.test_start("t2")
-    logger.test_end("t2", status="PASS", expected="PASS")
-    logger.test_start("t3")
-    logger.test_end("t3", status="PASS", expected="FAIL")
-    logger.test_start("t4")
-    logger.test_end("t4", status="TIMEOUT", expected="CRASH")
-    logger.suite_end()
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    num_failures_by_type = json.load(output)["num_failures_by_type"]
-
-    # We expect 3 passes and 1 timeout, nothing else.
-    assert sorted(num_failures_by_type.keys()) == ["PASS", "TIMEOUT"]
-    assert num_failures_by_type["PASS"] == 3
-    assert num_failures_by_type["TIMEOUT"] == 1
-
-
-def test_subtest_messages(logger, capfd):
-    # Tests accumulation of test output
-
-    # Set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    # Run two tests with subtest messages. The subtest name should be included
-    # in the output. We should also tolerate missing messages and subtest names
-    # with unusual characters.
-    logger.suite_start(["t1", "t2"], run_info={}, time=123)
-    logger.test_start("t1")
-    logger.test_status("t1", status="FAIL", subtest="t1_a",
-                       message="t1_a_message")
-    # Subtest name includes a backslash and two closing square brackets.
-    logger.test_status("t1", status="PASS", subtest=r"t1_\[]]b",
-                       message="t1_b_message")
-    logger.test_end("t1", status="PASS", expected="PASS")
-    logger.test_start("t2")
-    # Subtests with empty messages should not be ignored.
-    logger.test_status("t2", status="PASS", subtest="t2_a")
-    # A test-level message will also be appended
-    logger.test_end("t2", status="TIMEOUT", expected="PASS",
-                    message="t2_message")
-    logger.suite_end()
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_json = json.load(output)
-
-    t1_artifacts = output_json["tests"]["t1"]["artifacts"]
-    assert t1_artifacts["wpt_actual_metadata"] == [
-        "[t1]\n  expected: PASS\n",
-        "  [t1_a]\n    expected: FAIL\n",
-        "  [t1_\\\\[\\]\\]b]\n    expected: PASS\n",
-    ]
-    assert t1_artifacts["wpt_log"] == [
-        "t1_a: t1_a_message\n",
-        # Only humans will read the log, so there's no need to escape
-        # characters here.
-        "t1_\\[]]b: t1_b_message\n",
-    ]
-    assert t1_artifacts["wpt_subtest_failure"] == ["true"]
-    t2_artifacts = output_json["tests"]["t2"]["artifacts"]
-    assert t2_artifacts["wpt_actual_metadata"] == [
-        "[t2]\n  expected: TIMEOUT\n",
-        "  [t2_a]\n    expected: PASS\n",
-    ]
-    assert t2_artifacts["wpt_log"] == [
-        "Harness: t2_message\n"
-    ]
-    assert "wpt_subtest_failure" not in t2_artifacts.keys()
-
-
-def test_subtest_failure(logger, capfd):
-    # Tests that a test fails if a subtest fails
-
-    # Set up the handler.
-    output = StringIO()
-    formatter = ChromiumFormatter()
-    logger.add_handler(handlers.StreamHandler(output, formatter))
-
-    # Run a test with some subtest failures.
-    logger.suite_start(["t1"], run_info={}, time=123)
-    logger.test_start("t1")
-    logger.test_status("t1", status="FAIL", subtest="t1_a",
-                       message="t1_a_message")
-    logger.test_status("t1", status="PASS", subtest="t1_b",
-                       message="t1_b_message")
-    logger.test_status("t1", status="TIMEOUT", subtest="t1_c",
-                       message="t1_c_message")
-
-    # Make sure the test name was added to the set of tests with subtest fails
-    assert "t1" in formatter.tests_with_subtest_fails
-
-    # The test status is reported as a pass here because the harness was able to
-    # run the test to completion.
-    logger.test_end("t1", status="PASS", expected="PASS", message="top_message")
-    logger.suite_end()
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_json = json.load(output)
-
-    test_obj = output_json["tests"]["t1"]
-    t1_artifacts = test_obj["artifacts"]
-    assert t1_artifacts["wpt_actual_metadata"] == [
-        "[t1]\n  expected: PASS\n",
-        "  [t1_a]\n    expected: FAIL\n",
-        "  [t1_b]\n    expected: PASS\n",
-        "  [t1_c]\n    expected: TIMEOUT\n",
-    ]
-    assert t1_artifacts["wpt_log"] == [
-        "Harness: top_message\n",
-        "t1_a: t1_a_message\n",
-        "t1_b: t1_b_message\n",
-        "t1_c: t1_c_message\n",
-    ]
-    assert t1_artifacts["wpt_subtest_failure"] == ["true"]
-    # The status of the test in the output is a failure because subtests failed,
-    # despite the harness reporting that the test passed. But the harness status
-    # is logged as an artifact.
-    assert t1_artifacts["wpt_actual_status"] == ["PASS"]
-    assert test_obj["actual"] == "FAIL"
-    assert test_obj["expected"] == "PASS"
-    # Also ensure that the formatter cleaned up its internal state
-    assert "t1" not in formatter.tests_with_subtest_fails
-
-
-def test_expected_subtest_failure(logger, capfd):
-    # Tests that an expected subtest failure does not cause the test to fail
-
-    # Set up the handler.
-    output = StringIO()
-    formatter = ChromiumFormatter()
-    logger.add_handler(handlers.StreamHandler(output, formatter))
-
-    # Run a test with some expected subtest failures.
-    logger.suite_start(["t1"], run_info={}, time=123)
-    logger.test_start("t1")
-    logger.test_status("t1", status="FAIL", expected="FAIL", subtest="t1_a",
-                       message="t1_a_message")
-    logger.test_status("t1", status="PASS", subtest="t1_b",
-                       message="t1_b_message")
-    logger.test_status("t1", status="TIMEOUT", expected="TIMEOUT", subtest="t1_c",
-                       message="t1_c_message")
-
-    # The subtest failures are all expected so this test should not be added to
-    # the set of tests with subtest failures.
-    assert "t1" not in formatter.tests_with_subtest_fails
-
-    # The test status is reported as a pass here because the harness was able to
-    # run the test to completion.
-    logger.test_end("t1", status="OK", expected="OK")
-    logger.suite_end()
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_json = json.load(output)
-
-    test_obj = output_json["tests"]["t1"]
-    assert test_obj["artifacts"]["wpt_actual_metadata"] == [
-        "[t1]\n  expected: OK\n",
-        "  [t1_a]\n    expected: FAIL\n",
-        "  [t1_b]\n    expected: PASS\n",
-        "  [t1_c]\n    expected: TIMEOUT\n",
-    ]
-    assert test_obj["artifacts"]["wpt_log"] == [
-        "t1_a: t1_a_message\n",
-        "t1_b: t1_b_message\n",
-        "t1_c: t1_c_message\n",
-    ]
-    # The status of the test in the output is a pass because the subtest
-    # failures were all expected.
-    assert test_obj["actual"] == "PASS"
-    assert test_obj["expected"] == "PASS"
-
-
-def test_unexpected_subtest_pass(logger, capfd):
-    # A subtest that unexpectedly passes is considered a failure condition.
-
-    # Set up the handler.
-    output = StringIO()
-    formatter = ChromiumFormatter()
-    logger.add_handler(handlers.StreamHandler(output, formatter))
-
-    # Run a test with a subtest that is expected to fail but passes.
-    logger.suite_start(["t1"], run_info={}, time=123)
-    logger.test_start("t1")
-    logger.test_status("t1", status="PASS", expected="FAIL", subtest="t1_a",
-                       message="t1_a_message")
-
-    # Since the subtest behaviour is unexpected, it's considered a failure, so
-    # the test should be added to the set of tests with subtest failures.
-    assert "t1" in formatter.tests_with_subtest_fails
-
-    # The test status is reported as a pass here because the harness was able to
-    # run the test to completion.
-    logger.test_end("t1", status="PASS", expected="PASS")
-    logger.suite_end()
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_json = json.load(output)
-
-    test_obj = output_json["tests"]["t1"]
-    t1_artifacts = test_obj["artifacts"]
-    assert t1_artifacts["wpt_actual_metadata"] == [
-        "[t1]\n  expected: PASS\n",
-        "  [t1_a]\n    expected: PASS\n",
-    ]
-    assert t1_artifacts["wpt_log"] == [
-        "t1_a: t1_a_message\n",
-    ]
-    assert t1_artifacts["wpt_subtest_failure"] == ["true"]
-    # Since the subtest status is unexpected, we fail the test. But we report
-    # wpt_actual_status as an artifact
-    assert t1_artifacts["wpt_actual_status"] == ["PASS"]
-    assert test_obj["actual"] == "FAIL"
-    assert test_obj["expected"] == "PASS"
-    # Also ensure that the formatter cleaned up its internal state
-    assert "t1" not in formatter.tests_with_subtest_fails
-
-
-def test_expected_test_fail(logger, capfd):
-    # Check that an expected test-level failure is treated as a Pass
-
-    # Set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    # Run some tests with different statuses: 3 passes, 1 timeout
-    logger.suite_start(["t1"], run_info={}, time=123)
-    logger.test_start("t1")
-    logger.test_end("t1", status="ERROR", expected="ERROR")
-    logger.suite_end()
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_json = json.load(output)
-
-    test_obj = output_json["tests"]["t1"]
-    # The test's actual and expected status should map from "ERROR" to "FAIL"
-    assert test_obj["actual"] == "FAIL"
-    assert test_obj["expected"] == "FAIL"
-    # ..and this test should not be a regression nor unexpected
-    assert "is_regression" not in test_obj
-    assert "is_unexpected" not in test_obj
-
-
-def test_unexpected_test_fail(logger, capfd):
-    # Check that an unexpected test-level failure is marked as unexpected and
-    # as a regression.
-
-    # Set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    # Run some tests with different statuses: 3 passes, 1 timeout
-    logger.suite_start(["t1"], run_info={}, time=123)
-    logger.test_start("t1")
-    logger.test_end("t1", status="ERROR", expected="OK")
-    logger.suite_end()
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_json = json.load(output)
-
-    test_obj = output_json["tests"]["t1"]
-    # The test's actual and expected status should be mapped, ERROR->FAIL and
-    # OK->PASS
-    assert test_obj["actual"] == "FAIL"
-    assert test_obj["expected"] == "PASS"
-    # ..and this test should be a regression and unexpected
-    assert test_obj["is_regression"] is True
-    assert test_obj["is_unexpected"] is True
-
-
-def test_flaky_test_expected(logger, capfd):
-    # Check that a flaky test with multiple possible statuses is seen as
-    # expected if its actual status is one of the possible ones.
-
-    # set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    # Run a test that is known to be flaky
-    logger.suite_start(["t1"], run_info={}, time=123)
-    logger.test_start("t1")
-    logger.test_end("t1", status="ERROR", expected="OK", known_intermittent=["ERROR", "TIMEOUT"])
-    logger.suite_end()
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_json = json.load(output)
-
-    test_obj = output_json["tests"]["t1"]
-    # The test's statuses are all mapped, changing ERROR->FAIL and OK->PASS
-    assert test_obj["actual"] == "FAIL"
-    # All the possible statuses are merged and sorted together into expected.
-    assert test_obj["expected"] == "FAIL PASS TIMEOUT"
-    # ...this is not a regression or unexpected because the actual status is one
-    # of the expected ones
-    assert "is_regression" not in test_obj
-    assert "is_unexpected" not in test_obj
-
-
-def test_flaky_test_unexpected(logger, capfd):
-    # Check that a flaky test with multiple possible statuses is seen as
-    # unexpected if its actual status is NOT one of the possible ones.
-
-    # set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    # Run a test that is known to be flaky
-    logger.suite_start(["t1"], run_info={}, time=123)
-    logger.test_start("t1")
-    logger.test_end("t1", status="ERROR", expected="OK", known_intermittent=["TIMEOUT"])
-    logger.suite_end()
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_json = json.load(output)
-
-    test_obj = output_json["tests"]["t1"]
-    # The test's statuses are all mapped, changing ERROR->FAIL and OK->PASS
-    assert test_obj["actual"] == "FAIL"
-    # All the possible statuses are merged and sorted together into expected.
-    assert test_obj["expected"] == "PASS TIMEOUT"
-    # ...this is a regression and unexpected because the actual status is not
-    # one of the expected ones
-    assert test_obj["is_regression"] is True
-    assert test_obj["is_unexpected"] is True
-
-
-def test_precondition_failed(logger, capfd):
-    # Check that a failed precondition gets properly handled.
-
-    # set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    # Run a test with a precondition failure
-    logger.suite_start(["t1"], run_info={}, time=123)
-    logger.test_start("t1")
-    logger.test_end("t1", status="PRECONDITION_FAILED", expected="OK")
-    logger.suite_end()
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_json = json.load(output)
-
-    test_obj = output_json["tests"]["t1"]
-    # The precondition failure should map to FAIL status, but we should also
-    # have an artifact containing the original PRECONDITION_FAILED status.
-    assert test_obj["actual"] == "FAIL"
-    assert test_obj["artifacts"]["wpt_actual_status"] == ["PRECONDITION_FAILED"]
-    # ...this is an unexpected regression because we expected a pass but failed
-    assert test_obj["is_regression"] is True
-    assert test_obj["is_unexpected"] is True
-
-
-def test_repeated_test_statuses(logger, capfd):
-    # Check that the logger outputs all statuses from multiple runs of a test.
-
-    # Set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    # Run a test suite for the first time.
-    logger.suite_start(["t1"], run_info={}, time=123)
-    logger.test_start("t1")
-    logger.test_end("t1", status="PASS", expected="PASS", known_intermittent=[])
-    logger.suite_end()
-
-    # Run the test suite for the second time.
-    logger.suite_start(["t1"], run_info={}, time=456)
-    logger.test_start("t1")
-    logger.test_end("t1", status="FAIL", expected="PASS", known_intermittent=[])
-    logger.suite_end()
-
-    # Write the final results.
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_json = json.load(output)
-
-    status_totals = output_json["num_failures_by_type"]
-    assert status_totals["PASS"] == 1
-    # A missing result type is the same as being present and set to zero (0).
-    assert status_totals.get("FAIL", 0) == 0
-
-    # The actual statuses are accumulated in a ordered space-separated list.
-    test_obj = output_json["tests"]["t1"]
-    assert test_obj["actual"] == "PASS FAIL"
-    assert test_obj["expected"] == "PASS"
-
-
-def test_flaky_test_detection(logger, capfd):
-    # Check that the logger detects flakiness for a test run multiple times.
-
-    # Set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    logger.suite_start(["t1", "t2"], run_info={})
-    logger.test_start("t1")
-    logger.test_start("t2")
-    logger.test_end("t1", status="FAIL", expected="PASS")
-    logger.test_end("t2", status="FAIL", expected="FAIL")
-    logger.suite_end()
-
-    logger.suite_start(["t1", "t2"], run_info={})
-    logger.test_start("t1")
-    logger.test_start("t2")
-    logger.test_end("t1", status="PASS", expected="PASS")
-    logger.test_end("t2", status="FAIL", expected="FAIL")
-    logger.suite_end()
-
-    # Write the final results.
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_json = json.load(output)
-
-    # We consider a test flaky if it runs multiple times and produces more than
-    # one kind of result.
-    test1_obj = output_json["tests"]["t1"]
-    test2_obj = output_json["tests"]["t2"]
-    assert test1_obj["is_flaky"] is True
-    assert "is_flaky" not in test2_obj
-
-
-def test_known_intermittent_empty(logger, capfd):
-    # If the known_intermittent list is empty, we want to ensure we don't append
-    # any extraneous characters to the output.
-
-    # set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    # Run a test and include an empty known_intermittent list
-    logger.suite_start(["t1"], run_info={}, time=123)
-    logger.test_start("t1")
-    logger.test_end("t1", status="OK", expected="OK", known_intermittent=[])
-    logger.suite_end()
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_json = json.load(output)
-
-    test_obj = output_json["tests"]["t1"]
-    # Both actual and expected statuses get mapped to Pass. No extra whitespace
-    # anywhere.
-    assert test_obj["actual"] == "PASS"
-    assert test_obj["expected"] == "PASS"
-
-
-def test_known_intermittent_duplicate(logger, capfd):
-    # We don't want to have duplicate statuses in the final "expected" field.
-
-    # Set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    # There are two duplications in this input:
-    # 1. known_intermittent already contains expected;
-    # 2. both statuses in known_intermittent map to FAIL in Chromium.
-    # In the end, we should only get one FAIL in Chromium "expected".
-    logger.suite_start(["t1"], run_info={}, time=123)
-    logger.test_start("t1")
-    logger.test_end("t1", status="ERROR", expected="ERROR", known_intermittent=["FAIL", "ERROR"])
-    logger.suite_end()
-    logger.shutdown()
-
-    # Check nothing got output to stdout/stderr.
-    # (Note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # Check the actual output of the formatter.
-    output.seek(0)
-    output_json = json.load(output)
-
-    test_obj = output_json["tests"]["t1"]
-    assert test_obj["actual"] == "FAIL"
-    # No duplicate "FAIL" in "expected".
-    assert test_obj["expected"] == "FAIL"
-
-
-def test_reftest_screenshots(logger, capfd):
-    # reftest_screenshots, if present, should be plumbed into artifacts.
-
-    # Set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    # Run a reftest with reftest_screenshots.
-    logger.suite_start(["t1"], run_info={}, time=123)
-    logger.test_start("t1")
-    logger.test_end("t1", status="FAIL", expected="PASS", extra={
-        "reftest_screenshots": [
-            {"url": "foo.html", "hash": "HASH1", "screenshot": "DATA1"},
-            "!=",
-            {"url": "foo-ref.html", "hash": "HASH2", "screenshot": "DATA2"},
-        ]
-    })
-    logger.suite_end()
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_json = json.load(output)
-
-    test_obj = output_json["tests"]["t1"]
-    assert test_obj["artifacts"]["screenshots"] == [
-        "foo.html: DATA1",
-        "foo-ref.html: DATA2",
-    ]
-
-
-def test_process_output_crashing_test(logger, capfd):
-    """Test that chromedriver logs are preserved for crashing tests"""
-
-    # Set up the handler.
-    output = StringIO()
-    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
-
-    logger.suite_start(["t1", "t2", "t3"], run_info={}, time=123)
-
-    logger.test_start("t1")
-    logger.process_output(100, "This message should be recorded", "/some/path/to/chromedriver --some-flag")
-    logger.process_output(101, "This message should not be recorded", "/some/other/process --another-flag")
-    logger.process_output(100, "This message should also be recorded", "/some/path/to/chromedriver --some-flag")
-    logger.test_end("t1", status="CRASH", expected="CRASH")
-
-    logger.test_start("t2")
-    logger.process_output(100, "Another message for the second test", "/some/path/to/chromedriver --some-flag")
-    logger.test_end("t2", status="CRASH", expected="PASS")
-
-    logger.test_start("t3")
-    logger.process_output(100, "This test fails", "/some/path/to/chromedriver --some-flag")
-    logger.process_output(100, "But the output should not be captured", "/some/path/to/chromedriver --some-flag")
-    logger.process_output(100, "Because it does not crash", "/some/path/to/chromedriver --some-flag")
-    logger.test_end("t3", status="FAIL", expected="PASS")
-
-    logger.suite_end()
-    logger.shutdown()
-
-    # check nothing got output to stdout/stderr
-    # (note that mozlog outputs exceptions during handling to stderr!)
-    captured = capfd.readouterr()
-    assert captured.out == ""
-    assert captured.err == ""
-
-    # check the actual output of the formatter
-    output.seek(0)
-    output_json = json.load(output)
-
-    test_obj = output_json["tests"]["t1"]
-    assert test_obj["artifacts"]["wpt_crash_log"] == [
-        "This message should be recorded",
-        "This message should also be recorded"
-    ]
-
-    test_obj = output_json["tests"]["t2"]
-    assert test_obj["artifacts"]["wpt_crash_log"] == [
-        "Another message for the second test"
-    ]
-
-    test_obj = output_json["tests"]["t3"]
-    assert "wpt_crash_log" not in test_obj["artifacts"]
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js b/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js
index 9ddbe2e8df5..3c2dd8b42dd 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js
@@ -261,6 +261,20 @@
                     'bluetooth.requestDevicePromptUpdated', on_event);
     };
 
+    window.test_driver_internal.bidi.emulation.set_geolocation_override =
+        function (params) {
+            if ('coordinates' in params && 'error' in params) {
+                throw new Error(
+                    "`coordinates` and `error` are mutually exclusive in set_geolocation_override");
+            }
+
+            return create_action("bidi.emulation.set_geolocation_override", {
+                // Default to the current window.
+                contexts: [window],
+                ...(params ?? {})
+            });
+        }
+
     window.test_driver_internal.bidi.log.entry_added.subscribe =
         function (params) {
             return subscribe({
@@ -468,11 +482,25 @@
         return create_context_action("create_virtual_pressure_source", context, {source_type, metadata});
     };
 
-    window.test_driver_internal.update_virtual_pressure_source = function(source_type, sample, context=null) {
-        return create_context_action("update_virtual_pressure_source", context, {source_type, sample});
+    window.test_driver_internal.update_virtual_pressure_source = function(source_type, sample, own_contribution_estimate, context=null) {
+        return create_context_action("update_virtual_pressure_source", context, {source_type, sample, own_contribution_estimate});
     };
 
     window.test_driver_internal.remove_virtual_pressure_source = function(source_type, context=null) {
         return create_context_action("remove_virtual_pressure_source", context, {source_type});
     };
+
+    window.test_driver_internal.set_protected_audience_k_anonymity = function(
+        owner, name, hashes, context=null) {
+      return create_context_action(
+          'set_protected_audience_k_anonymity', context, {owner, name, hashes});
+    };
+
+    window.test_driver_internal.set_display_features = function(features, context=null) {
+        return create_context_action("set_display_features", context, {features});
+    };
+
+    window.test_driver_internal.clear_display_features = function(context=null) {
+        return create_context_action("clear_display_features", context, {});
+    }
 })();
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py b/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py
index 64668fc470b..2c2da790e90 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py
@@ -601,7 +601,7 @@ class TestRunnerManager(threading.Thread):
                 assert self.browser.browser is not None
                 self.browser.browser.cleanup()
             impl = self.test_implementations[(self.state.subsuite, self.state.test_type)]
-            browser = impl.browser_cls(self.logger, remote_queue=self.command_queue,
+            browser = impl.browser_cls(self.logger,
                                        **impl.browser_kwargs)
             browser.setup()
             self.browser = BrowserManager(self.logger,
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py
index 647cc7f21b1..7bfeef31717 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -11,7 +11,7 @@ from typing import Mapping, Optional
 from . import config
 from . import products
 from . import wpttest
-from .formatters import chromium, wptreport, wptscreenshot
+from .formatters import wptreport, wptscreenshot
 
 
 def abs_path(path):
@@ -418,7 +418,6 @@ scheme host and port.""")
                                       "Cache API (default: %s)" % wptscreenshot.DEFAULT_API,
                                       {"wptscreenshot"}, "store")
 
-    commandline.log_formatters["chromium"] = (chromium.ChromiumFormatter, "Chromium Layout Tests format")
     commandline.log_formatters["wptreport"] = (wptreport.WptreportFormatter, "wptreport format")
     commandline.log_formatters["wptscreenshot"] = (wptscreenshot.WptscreenshotFormatter, "wpt.fyi screenshots")
 
diff --git a/tests/wpt/tests/tools/wptserve/tests/functional/base.py b/tests/wpt/tests/tools/wptserve/tests/functional/base.py
index f47308d88df..1897d224761 100644
--- a/tests/wpt/tests/tools/wptserve/tests/functional/base.py
+++ b/tests/wpt/tests/tools/wptserve/tests/functional/base.py
@@ -92,7 +92,7 @@ class TestUsingH2Server:
         self.server.start()
 
         self.client = httpx.Client(base_url=f'https://{self.server.host}:{self.server.port}',
-                                   http2=True, verify=False)
+                                   http2=True, verify=False, timeout=30)
 
     def teardown_method(self, test_method):
         self.client.close()
diff --git a/tests/wpt/tests/trusted-types/ServiceWorkerContainer-register-from-ServiceWorker.https.html b/tests/wpt/tests/trusted-types/ServiceWorkerContainer-register-from-ServiceWorker.https.html
index 7bc1ee7469d..23020096383 100644
--- a/tests/wpt/tests/trusted-types/ServiceWorkerContainer-register-from-ServiceWorker.https.html
+++ b/tests/wpt/tests/trusted-types/ServiceWorkerContainer-register-from-ServiceWorker.https.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <html>
 <head>
+  <meta name="timeout" content="long">
   <meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script';">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/tests/trusted-types/TrustedTypePolicy-createXXX.html b/tests/wpt/tests/trusted-types/TrustedTypePolicy-createXXX.html
index 4cd91aa2a2b..f51f51d9845 100644
--- a/tests/wpt/tests/trusted-types/TrustedTypePolicy-createXXX.html
+++ b/tests/wpt/tests/trusted-types/TrustedTypePolicy-createXXX.html
@@ -50,11 +50,18 @@
   function anotherGlobalFunction(s) { return s + "#" + this.foo; }
   var foo = "a global var named foo";
 
+  class WrappingClass {
+    callback_to_capture_this(s) {
+      return String(this);
+    }
+  }
+
   const stringTestCases = [
     [ s => s, "whatever" ],
     [ s => null, "" ],
     [ s => "well, " + s, "well, whatever" ],
     [ s => { throw new Error() }, Error ],
+    [ new WrappingClass().callback_to_capture_this, "null"],
     [ s => { aGlobalVarForSideEffectTesting = s; return s }, "whatever" ],
     [ s => aGlobalVarForSideEffectTesting + s, "whateverwhatever" ],
     [ aGlobalFunction.bind(aGlobalObject), "well, whatever" ],
@@ -66,6 +73,7 @@
     [ s => null, "" ],
     [ s => s + "#duck", INPUTS.SCRIPTURL + "#duck" ],
     [ s => { throw new Error() }, Error ],
+    [ new WrappingClass().callback_to_capture_this, "null"],
     [ s => s + "#" + aGlobalVarForSideEffectTesting,
       INPUTS.SCRIPTURL + "#global" ],
     [ anotherGlobalFunction.bind(aGlobalObject), INPUTS.SCRIPTURL + "#well," ],
diff --git a/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-non-tt-policy-name.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-non-tt-policy-name.html
new file mode 100644
index 00000000000..2530b33d290
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-non-tt-policy-name.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js" ></script>
+<script src="/resources/testharnessreport.js"></script>
+<meta charset="UTF-8">
+<link rel="help" href="https://w3c.github.io/trusted-types/dist/spec/#dom-trustedtypepolicyfactory-createpolicy">
+<link rel="help" href="https://w3c.github.io/trusted-types/dist/spec/#tt-policy-name">
+<link rel="help" href="https://github.com/w3c/trusted-types/issues/466">
+<link rel="help" href="https://github.com/w3c/trusted-types/issues/504">
+<body>
+<script>
+  function is_tt_policy_name(aName) {
+    // tt-policy-name = 1*( ALPHA / DIGIT / "-" / "#" / "=" / "_" / "/" / "@" / "." / "%")
+    return /^([A-Za-z0-9\-\#\=\_\/\@$\.\%]+)$/.test(aName);
+  }
+
+  function tryCreatePolicy(aName) {
+    return window.trustedTypes.createPolicy(aName, { createHTML: s => s } );
+  }
+
+  test(() => {
+    assert_false(is_tt_policy_name(""));
+    assert_equals(tryCreatePolicy("").name, "");
+  }, "Creating an empty policy name works.");
+
+  test(() => {
+    for (let codePoint = 0; codePoint < 0x80; codePoint++) {
+      let policyName = String.fromCharCode(codePoint);
+      assert_equals(tryCreatePolicy(policyName).name, policyName);
+    }
+  }, "Creating policy names made of a single ASCII character works.");
+
+  test(() => {
+    for (let codePoint = 0; codePoint < 0x80; codePoint++) {
+      let policyName = `policy${String.fromCharCode(codePoint)}name`;
+      assert_equals(tryCreatePolicy(policyName).name, policyName);
+    }
+  }, "Creating policy names made of multiple ASCII characters works.");
+
+  test(() => {
+    // C1 Controls and Latin-1 Supplement
+    for (let codePoint = 0x80; codePoint <= 0xFF; codePoint++) {
+      let policyName = `policy${String.fromCharCode(codePoint)}name`;
+      assert_false(is_tt_policy_name(policyName));
+      assert_equals(tryCreatePolicy(policyName).name, policyName);
+    }
+
+    // Try U+1000, U+2000, U+3000, ..., U+F000.
+    for (let i = 0x1; i <= 0xF; i++) {
+      let codePoint = i * 0x1000;
+      let policyName = `policy${String.fromCharCode(codePoint)}name`;
+      assert_false(is_tt_policy_name(policyName));
+      assert_equals(tryCreatePolicy(policyName).name, policyName);
+    }
+  }, "Creating policy names containing a non-ASCII BMP character works.");
+
+  test(() => {
+    // Try U+1000, U+2000, U+3000, ..., U+1F000.
+    for (let i = 0x10; i <= 0x1F; i++) {
+      let codePoint = i * 0x1000;
+      let policyName = `policy${String.fromCharCode(codePoint)}name`;
+      assert_false(is_tt_policy_name(policyName));
+      assert_equals(tryCreatePolicy(policyName).name, policyName);
+    }
+  }, "Creating policy names containing a non-BMP character works.");
+
+</script>
diff --git a/tests/wpt/tests/trusted-types/block-string-assignment-to-Document-write.html b/tests/wpt/tests/trusted-types/block-string-assignment-to-Document-write.html
index 0b16a9c4910..c774dca4390 100644
--- a/tests/wpt/tests/trusted-types/block-string-assignment-to-Document-write.html
+++ b/tests/wpt/tests/trusted-types/block-string-assignment-to-Document-write.html
@@ -124,6 +124,9 @@
                 assert_equals(sink, "Document write");
               } else if (html === "assertSinkEqualsDocumentWriteLn") {
                 assert_equals(sink, "Document writeln");
+              } else if (html === "assertSinkEqualsDocumentWriteLn\n") {
+                // Ensure that new line characters aren't incorrectly added prior to processing
+                assert_unreached(`Should not process any other HTML, but got "${html}"`);
               }
 
               return html.replace("Hi", "Quack")
diff --git a/tests/wpt/tests/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-001.html b/tests/wpt/tests/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-001.html
index 5662c64ac4e..a920f5240d7 100644
--- a/tests/wpt/tests/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-001.html
+++ b/tests/wpt/tests/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-001.html
@@ -100,20 +100,30 @@ header(Content-Security-Policy-Report-Only,require-trusted-types-for 'script',Tr
     assert_equals(violations[5].policy, "require-trusted-types-for 'script'")
   }, `Mixing enforce and report-only require-trusted-types-for directives.`);
 
-  promise_test(async t => {
-    let results = await trySendingPlainStringToTrustedTypeSink(
-      ["script"],
-      "header(Content-Security-Policy,require-trusted-types-for 'script'%09'script'%0A'script'%0C'script'%0D'script'%20'script',True)",
-    );
-    assert_equals(results.length, 1);
-    assert_true(results[0].exception instanceof TypeError);
-    assert_equals(results[0].violatedPolicies.length, 1);
-  }, `directive "require-trusted-types-for 'script'%09'script'%0A'script'%0C'script'%0D'script'%20'script'" (required-ascii-whitespace)`);
+  // trusted-types-sink-group-keyword can be separated by any ASCII whitespace
+  // per the spec's ABNF:
+  // https://www.w3.org/TR/trusted-types/#require-trusted-types-for-csp-directive
+  // https://w3c.github.io/webappsec-csp/#grammardef-required-ascii-whitespace
+  // U+00A LF breaks the header field value into two lines so make sure that
+  // "the continuation line begins with a space or horizontal tab" in accordance
+  // with https://www.rfc-editor.org/rfc/rfc2616
+  ["%09", "%0A%20", "%0C", "%0D", "%20"].forEach(whitespace => {
+    let directive = `require-trusted-types-for 'invalid'${whitespace}'script'`;
+    promise_test(async t => {
+      let results = await trySendingPlainStringToTrustedTypeSink(
+        ["script"],
+        `header(Content-Security-Policy,${directive},True)`,
+      );
+      assert_equals(results.length, 1);
+      assert_true(results[0].exception instanceof TypeError);
+      assert_equals(results[0].violatedPolicies.length, 1);
+    }, `directive "${directive}" (required-ascii-whitespace)`);
+  });
 
   promise_test(async t => {
     let results = await trySendingPlainStringToTrustedTypeSink(
       ["script"],
-      "header(Content-Security-Policy,require-trusted-types-for 'script''script' 'script',True)",
+      "header(Content-Security-Policy,require-trusted-types-for 'script''script',True)",
     );
     assert_equals(results.length, 1);
     assert_equals(results[0].exception, null);
@@ -130,4 +140,35 @@ header(Content-Security-Policy-Report-Only,require-trusted-types-for 'script',Tr
     assert_true(results[0].exception instanceof TypeError);
     assert_equals(results[0].violatedPolicies.length, 1);
   }, `directive "require-trusted-types-for 'script' 'invalid'" (unknown sink group)`);
+
+  promise_test(async t => {
+    let results = await trySendingPlainStringToTrustedTypeSink(
+      ["script"],
+      "header(Content-Security-Policy,require-trusted-types-for 'invalid' 'script',True)",
+    );
+    assert_equals(results.length, 1);
+    assert_true(results[0].exception instanceof TypeError);
+    assert_equals(results[0].violatedPolicies.length, 1);
+  }, `directive "require-trusted-types-for 'invalid' 'script'" (unknown sink group)`);
+
+  promise_test(async t => {
+    let results = await trySendingPlainStringToTrustedTypeSink(
+      ["script"],
+      "header(Content-Security-Policy,require-trusted-types-for 'invalid' 'script' 'also-invalid',True)",
+    );
+    assert_equals(results.length, 1);
+    assert_true(results[0].exception instanceof TypeError);
+    assert_equals(results[0].violatedPolicies.length, 1);
+  }, `directive "require-trusted-types-for 'invalid' 'script' 'also-invalid" (unknown sink group)`);
+
+  promise_test(async t => {
+    let results = await trySendingPlainStringToTrustedTypeSink(
+      ["script"],
+      "header(Content-Security-Policy,require-trusted-types-for unquoted-invalid 'script' also-unquoted-invalid,True)",
+    );
+    assert_equals(results.length, 1);
+    assert_true(results[0].exception instanceof TypeError);
+    assert_equals(results[0].violatedPolicies.length, 1);
+  }, `directive "require-trusted-types-for unquoted-invalid 'script' also-unquoted-invalid (unknown sink group)`);
+
 </script>
diff --git a/tests/wpt/tests/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker.html b/tests/wpt/tests/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker.html
new file mode 100644
index 00000000000..55e4c57bdeb
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  // WebKit test runner assumes the tests always run in the same order, so make
+  // sure fetch_tests_from_worker tests run sequentially.
+  setup({explicit_done: true});
+  (async function() {
+    await fetch_tests_from_worker(new Worker(
+      "support/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-multiple-violations.js"
+    ));
+    await fetch_tests_from_worker(new Worker(
+      "support/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-location.js"
+    ));
+    done();
+  })();
+</script>
diff --git a/tests/wpt/tests/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-003.html b/tests/wpt/tests/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-003.html
new file mode 100644
index 00000000000..d5bbf704443
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-003.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./support/csp-violations.js"></script>
+<script src="./support/should-sink-type-mismatch-violation-be-blocked-by-csp-location.js"></script>
diff --git a/tests/wpt/tests/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-003.html.headers b/tests/wpt/tests/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-003.html.headers
new file mode 100644
index 00000000000..b48df2b0ccc
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/should-sink-type-mismatch-violation-be-blocked-by-csp-003.html.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: connect-src 'none'
+Content-Security-Policy: require-trusted-types-for 'script'
diff --git a/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-001.html b/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-001.html
index 6e51bd5ef19..1816a34746f 100644
--- a/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-001.html
+++ b/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-001.html
@@ -345,4 +345,19 @@
     });
   }, `single report-only policy with directive "trusted-type tt-policy-name1 tt-policy-name2 tt-policy-name3"`);
 
+  // Verify unquoted none is treated as a tt-policy-names.
+  ['none', 'allow-duplicates'].forEach(unquoted_keyword => {
+    promise_test(async t => {
+      let results = await tryCreatingTrustedTypePoliciesWithCSP(
+        [unquoted_keyword, "other-tt-policy-name"],
+        `header(Content-Security-Policy,trusted-types ${unquoted_keyword},True)`
+      );
+      assert_equals(results.length, 2);
+      assert_equals(results[0].exception, null);
+      assert_equals(results[0].violatedPolicies.length, 0);
+      assert_true(results[1].exception instanceof TypeError);
+      assert_equals(results[1].violatedPolicies.length, 1);
+    }, `Single enforce policy with directive "trusted-type ${unquoted_keyword}"`);
+  });
+
 </script>
diff --git a/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-002.html b/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-002.html
index ef1a4bde378..abf24276372 100644
--- a/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-002.html
+++ b/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-002.html
@@ -50,7 +50,6 @@
     "policy$name",
     "policy?name",
     "policy!name",
-    "política",
   ];
   invalidTrustedTypePolicyNames.forEach(trustedTypePolicyName => {
     promise_test(async t => {
@@ -64,23 +63,48 @@
       // https://w3c.github.io/trusted-types/dist/spec/#should-block-create-policy
       assert_true(results[0].exception instanceof TypeError, "createPolicy() should throw a TypeError.");
       assert_equals(results[0].violatedPolicies.length, 1, "createPolicy() should trigger a violation report.");
+      assert_equals(results[0].violatedPolicies[0].disposition, "enforce");
+      assert_equals(results[0].violatedPolicies[0].policy, `trusted-types ${trustedTypePolicyName}`);
     }, `invalid tt-policy-name name "${trustedTypePolicyName}"`);
   });
 
-  // tt-expressions can separated by any ASCII whitespace per the spec's ABNF:
+  // If a trusted-types directive is non-ASCII then the CSP parser will discard
+  // it per https://w3c.github.io/webappsec-csp/#parse-serialized-policy
+  const nonASCIITrustedTypePolicyNames = [
+    "política",
+    // "ポリシー", https://github.com/web-platform-tests/wpt/issues/51928
+  ];
+  nonASCIITrustedTypePolicyNames.forEach(trustedTypePolicyName => {
+    promise_test(async t => {
+      let results = await tryCreatingTrustedTypePoliciesWithCSP(
+        [trustedTypePolicyName],
+        `header(Content-Security-Policy,trusted-types ${encodeURIComponent(trustedTypePolicyName)},True)`
+      );
+      assert_equals(results.length, 1);
+      assert_equals(results[0].name, trustedTypePolicyName);
+      assert_equals(results[0].exception, null);
+      assert_equals(results[0].violatedPolicies.length, 0);
+    }, `non-ASCII trusted-types directives are discarded ("${trustedTypePolicyName}")`);
+  });
+
+  // tt-expressions can be separated by any ASCII whitespace per the spec's
+  // ABNF:
   // https://w3c.github.io/trusted-types/dist/spec/#serialized-tt-configuration
   // https://w3c.github.io/webappsec-csp/#grammardef-required-ascii-whitespace
+  // U+00A LF breaks the header field value into two lines so make sure that
+  // "the continuation line begins with a space or horizontal tab" in accordance
+  // with https://www.rfc-editor.org/rfc/rfc2616
   promise_test(async t => {
     let results = await tryCreatingTrustedTypePoliciesWithCSP(
       ["_TTP1_", "_TTP2_", "_TTP3_", "_TTP4_", "_TTP5_", "_TTP6_"],
-      "header(Content-Security-Policy,trusted-types _TTP1_%09_TTP2_%0A_TTP3_%0C_TTP4_%0D_TTP5_%20_TTP6_,True)"
+      "header(Content-Security-Policy,trusted-types _TTP1_%09_TTP2_%0A%20_TTP3_%0C_TTP4_%0D_TTP5_%20_TTP6_,True)"
     );
     assert_equals(results.length, 6);
     results.forEach((result, index) => {
       assert_equals(result.exception, null);
       assert_equals(result.violatedPolicies.length, 0);
     });
-  }, `directive "trusted-type _TTP1_%09_TTP2_%0A_TTP3_%0C_TTP4_%0D_TTP5_%20_TTP6_" (required-ascii-whitespace)`);
+  }, `directive "trusted-type _TTP1_%09_TTP2_%0A%20_TTP3_%0C_TTP4_%0D_TTP5_%20_TTP6_" (required-ascii-whitespace)`);
 
   // tt-expressions must be separated by a required-ascii-whitespace:
   promise_test(async t => {
@@ -91,5 +115,7 @@
     assert_equals(results.length, 1);
     assert_true(results[0].exception instanceof TypeError);
     assert_equals(results[0].violatedPolicies.length, 1);
+    assert_equals(results[0].violatedPolicies[0].disposition, "enforce");
+    assert_equals(results[0].violatedPolicies[0].policy, `trusted-types _TTP_*`);
   }, `invalid directive "trusted-type _TTP" (no ascii whitespace)`);
 </script>
diff --git a/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-003.html b/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-003.html
index 55f1479e3db..052fbb8cbfb 100644
--- a/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-003.html
+++ b/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-003.html
@@ -16,10 +16,10 @@ header(Content-Security-Policy,trusted-types tt-policy-name tt-policy-name,True)
 header(Content-Security-Policy,trusted-types tt-policy-name *,True)|\
 header(Content-Security-Policy,trusted-types * tt-policy-name,True)|\
 header(Content-Security-Policy,trusted-types * *,True)|\
-header(Content-Security-Policy,trusted-types tt-policy-name none,True)|\
-header(Content-Security-Policy,trusted-types none tt-policy-name,True)|\
-header(Content-Security-Policy,trusted-types * none,True)|\
-header(Content-Security-Policy,trusted-types none *,True)|\
+header(Content-Security-Policy,trusted-types tt-policy-name 'none',True)|\
+header(Content-Security-Policy,trusted-types 'none' tt-policy-name,True)|\
+header(Content-Security-Policy,trusted-types * 'none',True)|\
+header(Content-Security-Policy,trusted-types 'none' *,True)|\
 `
     );
     assert_equals(results.length, 1);
diff --git a/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker.html b/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker.html
new file mode 100644
index 00000000000..5726db94bf3
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<meta name="timeout" content="long">
+<link rel="help" href="https://w3c.github.io/trusted-types/dist/spec/#should-block-create-policy">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  // WebKit test runner assumes the tests always run in the same order, so make
+  // sure fetch_tests_from_worker tests run sequentially.
+  setup({explicit_done: true});
+  (async function() {
+    await fetch_tests_from_worker(new Worker(
+    "support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name.js"
+    ));
+    await fetch_tests_from_worker(new Worker(
+      "support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-none.js"
+    ));
+    await fetch_tests_from_worker(new Worker(
+      "support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-none.js"
+    ));
+    await fetch_tests_from_worker(new Worker(
+      "support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-wildcard.js"
+    ));
+    await fetch_tests_from_worker(new Worker(
+      "support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-allow-duplicates.js"
+    ));
+    await fetch_tests_from_worker(new Worker(
+      "support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-allow-duplicates-tt-policy-name.js"
+    ));
+    await fetch_tests_from_worker(new Worker(
+      "support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-multiple-violations.js"
+    ));
+    await fetch_tests_from_worker(new Worker(
+      "support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-location.js"
+    ));
+    done();
+  })();
+</script>
diff --git a/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-005.html b/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-005.html
new file mode 100644
index 00000000000..8d10bcb3013
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-005.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<meta name="timeout" content="long">
+<link rel="help" href="https://w3c.github.io/trusted-types/dist/spec/#should-block-create-policy">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./support/csp-violations.js"></script>
+<script src="./support/should-trusted-type-policy-creation-be-blocked-by-csp-location.js"></script>
diff --git a/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-005.html.headers b/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-005.html.headers
new file mode 100644
index 00000000000..7e28a4dbc8e
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-005.html.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: connect-src 'none'
+Content-Security-Policy: trusted-types 'none'
diff --git a/tests/wpt/tests/trusted-types/support/csp-violations.js b/tests/wpt/tests/trusted-types/support/csp-violations.js
index 49649f45cd6..46c2ca1b30f 100644
--- a/tests/wpt/tests/trusted-types/support/csp-violations.js
+++ b/tests/wpt/tests/trusted-types/support/csp-violations.js
@@ -15,7 +15,7 @@ const cspDirectives = [
 // the CSP directive connect-src 'none' and that fn is not itself triggering
 // a "connect-src" violation report.
 function trusted_type_violations_and_exception_for(fn) {
-  return new Promise((resolve, reject) => {
+  return new Promise(async (resolve, reject) => {
     // Listen for security policy violations.
     let result = { violations: [], exception: null };
     let handler = e => {
@@ -33,7 +33,7 @@ function trusted_type_violations_and_exception_for(fn) {
 
     // Run the specified function and record any exception.
     try {
-      fn();
+      await fn();
     } catch(e) {
       result.exception = e;
     }
diff --git a/tests/wpt/tests/trusted-types/support/navigation-report-only-support.html b/tests/wpt/tests/trusted-types/support/navigation-report-only-support.html
index 791559f7a19..d4e4ded7daa 100644
--- a/tests/wpt/tests/trusted-types/support/navigation-report-only-support.html
+++ b/tests/wpt/tests/trusted-types/support/navigation-report-only-support.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <head>
+  <script src="csp-violations.js"></script>
   <script src="navigation-support.js"></script>
 </head>
 <body>
diff --git a/tests/wpt/tests/trusted-types/support/navigation-report-only-support.html.headers b/tests/wpt/tests/trusted-types/support/navigation-report-only-support.html.headers
index 4c1ff15e167..e9e9a92f766 100644
--- a/tests/wpt/tests/trusted-types/support/navigation-report-only-support.html.headers
+++ b/tests/wpt/tests/trusted-types/support/navigation-report-only-support.html.headers
@@ -1 +1,2 @@
+Content-Security-Policy: connect-src 'none'
 Content-Security-Policy-Report-Only: require-trusted-types-for 'script';
diff --git a/tests/wpt/tests/trusted-types/support/navigation-support.html b/tests/wpt/tests/trusted-types/support/navigation-support.html
index 47f33c9fb64..306cc0e84f7 100644
--- a/tests/wpt/tests/trusted-types/support/navigation-support.html
+++ b/tests/wpt/tests/trusted-types/support/navigation-support.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <head>
+  <script src="csp-violations.js"></script>
   <script src="navigation-support.js"></script>
 </head>
 <body>
diff --git a/tests/wpt/tests/trusted-types/support/navigation-support.html.headers b/tests/wpt/tests/trusted-types/support/navigation-support.html.headers
index 604e765da46..cd8c4c6d24a 100644
--- a/tests/wpt/tests/trusted-types/support/navigation-support.html.headers
+++ b/tests/wpt/tests/trusted-types/support/navigation-support.html.headers
@@ -1 +1,2 @@
+Content-Security-Policy: connect-src 'none'
 Content-Security-Policy: require-trusted-types-for 'script';
diff --git a/tests/wpt/tests/trusted-types/support/navigation-support.js b/tests/wpt/tests/trusted-types/support/navigation-support.js
index 41dce761def..8449dd202b6 100644
--- a/tests/wpt/tests/trusted-types/support/navigation-support.js
+++ b/tests/wpt/tests/trusted-types/support/navigation-support.js
@@ -1,7 +1,5 @@
-const kNavigationAttempted = "navigationattempted=1";
-
 function navigateToJavascriptURL(reportOnly) {
-    let params = new URLSearchParams(location.search);
+    const params = new URLSearchParams(location.search);
 
     if (!!params.get("defaultpolicy")) {
         trustedTypes.createPolicy("default", {
@@ -26,20 +24,24 @@ function navigateToJavascriptURL(reportOnly) {
     // loaded frame to through DOMContentLoaded. In either case there should be
     // _some_ event that we can expect.
     document.addEventListener("DOMContentLoaded", bounceEventToOpener);
-    document.addEventListener("securitypolicyviolation", bounceEventToOpener);
-
-    let target_script;
-    if (reportOnly) {
-        // Navigate to the non-report-only version of the test. That has the same
-        // event listening setup as this, but is a different target URI.
-        target_script = `location.href='${location.href.replace("-report-only", "") +
-            (location.href.endsWith(".html") ? "?" : "&") + kNavigationAttempted + "&continue"}';`;
-    } else {
-        // We'll use a javascript:-url to navigate to ourselves, so that we can
-        // re-use the messageing mechanisms above.
-        target_script = `location.href='${location.href + "&" + kNavigationAttempted}&continue';`;
+    // Prevent loops.
+    if (params.has("navigationattempted")) {
+      return;
     }
 
+    let url = new URL(
+      reportOnly ?
+      // Navigate to the non-report-only version of the test. That has the same
+      // event listening setup as this, but is a different target URI.
+      location.href.replace("-report-only", "") :
+      // We'll use a javascript:-url to navigate to ourselves, so that we can
+      // re-use the messageing mechanisms above.
+      location.href
+    );
+    url.searchParams.set("navigationattempted", 1);
+    url.searchParams.set("continue", 1);
+    let target_script = `location.href='${url.toString()}';`;
+
     function getAndPreparareNavigationElement(javaScriptURL) {
         let target = "_self";
         if (!!params.get("frame")) {
@@ -67,9 +69,12 @@ function navigateToJavascriptURL(reportOnly) {
     }
 
     const navigationElement = getAndPreparareNavigationElement(`javascript:${target_script}`);
-
-    // Prevent loops.
-    if (!location.search.includes(kNavigationAttempted)) {
-       document.addEventListener("DOMContentLoaded", _ => navigationElement.click());
-    }
+    document.addEventListener("DOMContentLoaded", async _ => {
+      let {violations, exception} =
+        await trusted_type_violations_and_exception_for(_ => navigationElement.click());
+      violations.forEach(violationEvent => bounceEventToOpener(violationEvent));
+      if (!params.get("defaultpolicy") && violations.length == 0) {
+        window.opener.postMessage("No securitypolicyviolation reported!", "*");
+      }
+    });
 }
diff --git a/tests/wpt/tests/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-location.js b/tests/wpt/tests/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-location.js
new file mode 100644
index 00000000000..ff0e26bbc3a
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-location.js
@@ -0,0 +1,12 @@
+const testSetupPolicy = trustedTypes.createPolicy("testSetupPolicy", {
+  createScriptURL: s => s });
+
+importScripts(testSetupPolicy.createScriptURL("/resources/testharness.js"));
+importScripts(testSetupPolicy.createScriptURL("csp-violations.js"));
+
+// For CSP applying to this file, please refer to
+// should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-location.js.headers
+
+importScripts(testSetupPolicy.createScriptURL("should-sink-type-mismatch-violation-be-blocked-by-csp-location.js"));
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-location.js.headers b/tests/wpt/tests/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-location.js.headers
new file mode 100644
index 00000000000..b48df2b0ccc
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-location.js.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: connect-src 'none'
+Content-Security-Policy: require-trusted-types-for 'script'
diff --git a/tests/wpt/tests/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-multiple-violations.js b/tests/wpt/tests/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-multiple-violations.js
new file mode 100644
index 00000000000..4979b7fc51e
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-multiple-violations.js
@@ -0,0 +1,35 @@
+const testSetupPolicy = trustedTypes.createPolicy("testSetupPolicy", {
+  createScriptURL: s => s });
+
+importScripts(testSetupPolicy.createScriptURL("/resources/testharness.js"));
+importScripts(testSetupPolicy.createScriptURL("csp-violations.js"));
+
+// For CSP applying to this file, please refer to
+// should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-multiple-violations.js.headers
+
+promise_test(async () => {
+  let {violations, exception} = await trusted_type_violations_and_exception_for(_ => setTimeout(";;;;;"));
+
+  // An exception is thrown for the violated enforced policies.
+  assert_true(exception instanceof TypeError, "TypeError is thrown");
+
+  // This violates all 'script' directives.
+  let sorted_violations = violations.map(v => {
+    return { policy: v.originalPolicy, disposition: v.disposition};
+  }).sort();
+  assert_equals(sorted_violations.length, 6);
+  assert_equals(sorted_violations[0].policy, "require-trusted-types-for 'script'");
+  assert_equals(sorted_violations[0].disposition, "enforce");
+  assert_equals(sorted_violations[1].policy, "require-trusted-types-for 'script' 'invalid'");
+  assert_equals(sorted_violations[1].disposition, "enforce");
+  assert_equals(sorted_violations[2].policy, "require-trusted-types-for 'invalid' 'script'");
+  assert_equals(sorted_violations[2].disposition, "enforce");
+  assert_equals(sorted_violations[3].policy, "require-trusted-types-for 'script'");
+  assert_equals(sorted_violations[3].disposition, "report");
+  assert_equals(sorted_violations[4].policy, "require-trusted-types-for 'script' 'invalid'");
+  assert_equals(sorted_violations[4].disposition, "report");
+  assert_equals(sorted_violations[5].policy, "require-trusted-types-for 'invalid' 'script'");
+  assert_equals(sorted_violations[5].disposition, "report");
+}, "Checking reported violations for setTimeout(';;;;;') from DedicatedWorker");
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-multiple-violations.js.headers b/tests/wpt/tests/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-multiple-violations.js.headers
new file mode 100644
index 00000000000..c17d57d19ae
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-002-worker-multiple-violations.js.headers
@@ -0,0 +1,7 @@
+Content-Security-Policy: connect-src 'none'
+Content-Security-Policy: require-trusted-types-for 'script'
+Content-Security-Policy-Report-Only: require-trusted-types-for 'script'
+Content-Security-Policy: require-trusted-types-for 'script' 'invalid'
+Content-Security-Policy-Report-Only: require-trusted-types-for 'script' 'invalid'
+Content-Security-Policy: require-trusted-types-for 'invalid' 'script'
+Content-Security-Policy-Report-Only: require-trusted-types-for 'invalid' 'script'
diff --git a/tests/wpt/tests/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-location.js b/tests/wpt/tests/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-location.js
new file mode 100644
index 00000000000..8568b960aa3
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-location.js
@@ -0,0 +1,21 @@
+function passPlainStringToTrustedTypeSink() {       // 1
+  return trusted_type_violation_for(TypeError, _ => // 2
+    setTimeout    (";;;;;;;;;;;;;;;;;;;;;;;;;;;;;") //_3
+/*  |
+12345678901234567890
+*/
+  );
+}
+
+promise_test(async () => {
+  let violation = await passPlainStringToTrustedTypeSink();
+  let baseURL = (new URL(location.href)).origin;
+  let sourceFile = new URL("/trusted-types/support/should-sink-type-mismatch-violation-be-blocked-by-csp-location.js", baseURL).toString();
+  assert_equals(violation.sourceFile, sourceFile, "source file");
+  assert_equals(violation.lineNumber, 3, "line number");
+  // https://w3c.github.io/webappsec-csp/#create-violation-for-global does not
+  // say how to determine the location and browsers provide inconsistent values
+  // for column number, so just check it's at least the offset of the 's'
+  // character of setTimeout.
+  assert_greater_than_equal(violation.columnNumber, 5, "column number");
+} , `Location of required-trusted-types-for violations.`);
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-allow-duplicates-tt-policy-name.js b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-allow-duplicates-tt-policy-name.js
new file mode 100644
index 00000000000..59d9711f122
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-allow-duplicates-tt-policy-name.js
@@ -0,0 +1,20 @@
+importScripts("/resources/testharness.js");
+importScripts("csp-violations.js");
+
+// For CSP applying to this file, please refer to
+// should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-allow-duplicates-tt-policy-name.js.headers
+const tt_directive = `'allow-duplicates' tt-policy-name`;
+
+promise_test(async () => {
+  await no_trusted_type_violation_for(_ => trustedTypes.createPolicy("tt-policy-name"));
+} , `No violation/exception for allowed policy name (${tt_directive}).`);
+
+promise_test(async () => {
+  await no_trusted_type_violation_for(_ => trustedTypes.createPolicy("tt-policy-name"));
+} , `No violation/exception for duplicate policy name (${tt_directive}).`);
+
+promise_test(async () => {
+  await trusted_type_violation_for(TypeError, _ => trustedTypes.createPolicy("duplicate"));
+}, `Violation and exception for forbidden policy name 'duplicate' ${tt_directive}.`);
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-allow-duplicates-tt-policy-name.js.headers b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-allow-duplicates-tt-policy-name.js.headers
new file mode 100644
index 00000000000..9fa44d4200b
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-allow-duplicates-tt-policy-name.js.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: connect-src 'none'
+Content-Security-Policy: trusted-types 'allow-duplicates' tt-policy-name
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-location.js b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-location.js
new file mode 100644
index 00000000000..fc4773f9238
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-location.js
@@ -0,0 +1,9 @@
+importScripts("/resources/testharness.js");
+importScripts("csp-violations.js");
+
+// For CSP applying to this file, please refer to
+// should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-location.js.headers
+
+importScripts("should-trusted-type-policy-creation-be-blocked-by-csp-location.js");
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-location.js.headers b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-location.js.headers
new file mode 100644
index 00000000000..7e28a4dbc8e
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-location.js.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: connect-src 'none'
+Content-Security-Policy: trusted-types 'none'
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-multiple-violations.js b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-multiple-violations.js
new file mode 100644
index 00000000000..74d4429c394
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-multiple-violations.js
@@ -0,0 +1,28 @@
+importScripts("/resources/testharness.js");
+importScripts("csp-violations.js");
+
+// For CSP applying to this file, please refer to
+// should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-multiple-violation.js.headers
+
+promise_test(async () => {
+  let {violations, exception} = await trusted_type_violations_and_exception_for(_ => trustedTypes.createPolicy("tt-policy-name"));
+
+  // An exception is thrown for the violated enforced policies.
+  assert_true(exception instanceof TypeError, "TypeError is thrown");
+
+  // This violates other-policy-name and none directives.
+  let sorted_violations = violations.map(v => {
+    return { policy: v.originalPolicy, disposition: v.disposition};
+  }).sort();
+  assert_equals(sorted_violations.length, 4);
+  assert_equals(sorted_violations[0].policy, "trusted-types other-policy-name");
+  assert_equals(sorted_violations[0].disposition, "enforce");
+  assert_equals(sorted_violations[1].policy, "trusted-types 'none'");
+  assert_equals(sorted_violations[1].disposition, "enforce");
+  assert_equals(sorted_violations[2].policy, "trusted-types other-policy-name");
+  assert_equals(sorted_violations[2].disposition, "report");
+  assert_equals(sorted_violations[3].policy, "trusted-types 'none'");
+  assert_equals(sorted_violations[3].disposition, "report");
+}, "Exception and violations for CSP with multiple enforce and report-only policies.");
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-multiple-violations.js.headers b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-multiple-violations.js.headers
new file mode 100644
index 00000000000..5edaafc1ff6
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-multiple-violations.js.headers
@@ -0,0 +1,9 @@
+Content-Security-Policy: connect-src 'none'
+Content-Security-Policy: trusted-types tt-policy-name
+Content-Security-Policy-Report-Only: trusted-types tt-policy-name
+Content-Security-Policy: trusted-types other-policy-name
+Content-Security-Policy-Report-Only: trusted-types other-policy-name
+Content-Security-Policy: trusted-types *
+Content-Security-Policy-Report-Only: trusted-types *
+Content-Security-Policy: trusted-types 'none'
+Content-Security-Policy-Report-Only: trusted-types 'none'
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-none.js b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-none.js
new file mode 100644
index 00000000000..8d0ba3da646
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-none.js
@@ -0,0 +1,16 @@
+importScripts("/resources/testharness.js");
+importScripts("csp-violations.js");
+
+// For CSP applying to this file, please refer to
+// should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-none.js.headers
+const tt_directive = `'none'`;
+
+promise_test(async () => {
+  await trusted_type_violation_for(TypeError, _ => trustedTypes.createPolicy("tt-policy-name"));
+} , `Violation and exception for policy name "tt-policy-name" (${tt_directive}).`);
+
+promise_test(async () => {
+  await trusted_type_violation_for(TypeError, _ => trustedTypes.createPolicy("none"));
+} , `Violation and exception for policy name "none" (${tt_directive}).`);
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-none.js.headers b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-none.js.headers
new file mode 100644
index 00000000000..7e28a4dbc8e
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-none.js.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: connect-src 'none'
+Content-Security-Policy: trusted-types 'none'
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-allow-duplicates.js b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-allow-duplicates.js
new file mode 100644
index 00000000000..ed3524005ea
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-allow-duplicates.js
@@ -0,0 +1,23 @@
+importScripts("/resources/testharness.js");
+importScripts("csp-violations.js");
+
+// This test is similar to allow-duplicates-tt-policy-name.js but with a
+// different ordering of tt-expressions.
+
+// For CSP applying to this file, please refer to
+// should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-allow-duplicates.js.headers
+const tt_directive = `tt-policy-name 'allow-duplicates'`;
+
+promise_test(async () => {
+  await no_trusted_type_violation_for(_ => trustedTypes.createPolicy("tt-policy-name"));
+} , `No violation/exception for allowed policy name (${tt_directive}).`);
+
+promise_test(async () => {
+  await no_trusted_type_violation_for(_ => trustedTypes.createPolicy("tt-policy-name"));
+} , `No violation/exception for duplicate policy name (${tt_directive}).`);
+
+promise_test(async () => {
+  await trusted_type_violation_for(TypeError, _ => trustedTypes.createPolicy("duplicate"));
+}, `Violation and exception for forbidden policy name 'duplicate' ${tt_directive}.`);
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-allow-duplicates.js.headers b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-allow-duplicates.js.headers
new file mode 100644
index 00000000000..673b3270862
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-allow-duplicates.js.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: connect-src 'none'
+Content-Security-Policy: trusted-types tt-policy-name 'allow-duplicates'
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-none.js b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-none.js
new file mode 100644
index 00000000000..d34bd04eaeb
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-none.js
@@ -0,0 +1,19 @@
+importScripts("/resources/testharness.js");
+importScripts("csp-violations.js");
+
+// This test verifies that 'none' keyword is ignored if other tt-expression is
+// present.
+
+// For CSP applying to this file, please refer to
+// should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-none.js.headers
+const tt_directive = `tt-policy-name 'none'`;
+
+promise_test(async () => {
+  await no_trusted_type_violation_for(_ => trustedTypes.createPolicy("tt-policy-name"));
+} , `No violation/exception for allowed policy names (${tt_directive}).`);
+
+promise_test(async () => {
+  await trusted_type_violation_for(TypeError, _ => trustedTypes.createPolicy("other-policy-name"));
+}, `Violation and exception for forbidden policy name (${tt_directive}).`);
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-none.js.headers b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-none.js.headers
new file mode 100644
index 00000000000..55cf94e10e6
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name-none.js.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: connect-src 'none'
+Content-Security-Policy: trusted-types tt-policy-name 'none'
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name.js b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name.js
new file mode 100644
index 00000000000..985ee43e833
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name.js
@@ -0,0 +1,24 @@
+importScripts("/resources/testharness.js");
+importScripts("csp-violations.js");
+
+// For CSP applying to this file, please refer to
+// should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name.js.headers
+const tt_directive = `tt-policy-name-1 tt-policy-name-2 tt-policy-name-3`;
+
+promise_test(async () => {
+  await no_trusted_type_violation_for(_ => trustedTypes.createPolicy("tt-policy-name-1"));
+  await no_trusted_type_violation_for(_ => trustedTypes.createPolicy("tt-policy-name-2"));
+  await no_trusted_type_violation_for(_ => trustedTypes.createPolicy("tt-policy-name-3"));
+} , `No violation/exception for allowed policy names (${tt_directive}).`);
+
+promise_test(async () => {
+  await trusted_type_violation_for(TypeError, _ => trustedTypes.createPolicy("tt-policy-name-1"));
+  await trusted_type_violation_for(TypeError, _ => trustedTypes.createPolicy("tt-policy-name-2"));
+  await trusted_type_violation_for(TypeError, _ => trustedTypes.createPolicy("tt-policy-name-3"));
+}, `Violation and exception for duplicate policy names (${tt_directive}).`);
+
+promise_test(async () => {
+  await trusted_type_violation_for(TypeError, _ => trustedTypes.createPolicy("tt-policy-name-4"));
+}, `Violation and exception for forbidden policy name (${tt_directive}).`);
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name.js.headers b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name.js.headers
new file mode 100644
index 00000000000..96b79d71c5d
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-tt-policy-name.js.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: connect-src 'none'
+Content-Security-Policy: trusted-types tt-policy-name-1 tt-policy-name-2 tt-policy-name-3
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-wildcard.js b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-wildcard.js
new file mode 100644
index 00000000000..004530def32
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-wildcard.js
@@ -0,0 +1,15 @@
+importScripts("/resources/testharness.js");
+importScripts("csp-violations.js");
+
+// For CSP applying to this file, please refer to
+// should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-wildcard.js.headers
+const tt_directive = `tt-policy-name-1 * tt-policy-name-3`;
+
+promise_test(async () => {
+  await no_trusted_type_violation_for(TypeError, _ => trustedTypes.createPolicy("tt-policy-name-1"));
+  await no_trusted_type_violation_for(TypeError, _ => trustedTypes.createPolicy("tt-policy-name-2"));
+  await no_trusted_type_violation_for(TypeError, _ => trustedTypes.createPolicy("tt-policy-name-3"));
+  await no_trusted_type_violation_for(TypeError, _ => trustedTypes.createPolicy("other-policy-name"));
+} , `No violation and exception for allowed policy names (${tt_directive}).`);
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-wildcard.js.headers b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-wildcard.js.headers
new file mode 100644
index 00000000000..b93b85d4a35
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-004-worker-wildcard.js.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: connect-src 'none'
+Content-Security-Policy: trusted-types tt-policy-name-1 * tt-policy-name-3
diff --git a/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-location.js b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-location.js
new file mode 100644
index 00000000000..11390a63184
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-location.js
@@ -0,0 +1,22 @@
+function createForbiddenPolicy() {                  // 1
+  return trusted_type_violation_for(TypeError, _ => // 2
+    trustedTypes.                                   // 3
+      createPolicy      ("tt-policy-name")          //_4
+/*    |
+1234567890123456789012345
+*/
+  );
+}
+
+promise_test(async () => {
+  let violation = await createForbiddenPolicy();
+  let baseURL = (new URL(location.href)).origin;
+  let sourceFile = new URL("/trusted-types/support/should-trusted-type-policy-creation-be-blocked-by-csp-location.js", baseURL).toString();
+  assert_equals(violation.sourceFile, sourceFile, "source file");
+  assert_equals(violation.lineNumber, 4, "line number");
+  // https://w3c.github.io/webappsec-csp/#create-violation-for-global does not
+  // say how to determine the location and browsers provide inconsistent values
+  // for column number, so just check it's at least the offset of the 'c'
+  // character of createPolicy.
+  assert_greater_than_equal(violation.columnNumber, 7, "column number");
+} , `Location of trusted-types violations.`);
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-create-policy-worker.js b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-create-policy-worker.js
new file mode 100644
index 00000000000..6bb346e3195
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-create-policy-worker.js
@@ -0,0 +1,5 @@
+importScripts("/resources/testharness.js");
+
+importScripts("trusted-types-reporting-check-report-create-policy.js");
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-create-policy-worker.js.sub.headers b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-create-policy-worker.js.sub.headers
new file mode 100644
index 00000000000..58beda24183
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-create-policy-worker.js.sub.headers
@@ -0,0 +1,6 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Cache-Control: post-check=0, pre-check=0, false
+Pragma: no-cache
+Set-Cookie: trusted-types-reporting-check-report-DedicatedWorker-create-policy={{$id:uuid()}}; Path=/trusted-types/
+Content-Security-Policy-Report-Only: trusted-types one two; report-uri /reporting/resources/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-create-policy.js b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-create-policy.js
new file mode 100644
index 00000000000..5d96829727b
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-create-policy.js
@@ -0,0 +1,15 @@
+test(() => {
+  const p1 = trustedTypes.createPolicy("one", {}); // allowed policy name
+  assert_equals(p1.name, "one");
+
+  const p2 = trustedTypes.createPolicy("two", {}); // allowed policy name
+  assert_equals(p2.name, "two");
+}, "Creating policy works for policy in the allowlist.");
+
+test(() => {
+  const p3 = trustedTypes.createPolicy("three", {}); // forbidden policy name
+  assert_equals(p3.name, "three");
+
+  const p4 = trustedTypes.createPolicy("four", {}); // forbidden policy name
+  assert_equals(p4.name, "four");
+}, "Creating policy works for policy in the blocklist, since it's report-only.");
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-sink-mismatch-worker.js b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-sink-mismatch-worker.js
new file mode 100644
index 00000000000..85910e2e926
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-sink-mismatch-worker.js
@@ -0,0 +1,7 @@
+const testSetupPolicy = trustedTypes.createPolicy("p", { createScriptURL: s => s });
+
+importScripts(testSetupPolicy.createScriptURL("/resources/testharness.js"));
+
+importScripts(testSetupPolicy.createScriptURL("trusted-types-reporting-check-report-sink-mismatch.js"));
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-sink-mismatch-worker.js.sub.headers b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-sink-mismatch-worker.js.sub.headers
new file mode 100644
index 00000000000..5fcdf6ccbfc
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-sink-mismatch-worker.js.sub.headers
@@ -0,0 +1,7 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Cache-Control: post-check=0, pre-check=0, false
+Pragma: no-cache
+Set-Cookie: trusted-types-reporting-check-report-DedicatedWorker-sink-mismatch={{$id:uuid()}}; Path=/trusted-types/
+Content-Security-Policy: script-src http: https:
+Content-Security-Policy-Report-Only: require-trusted-types-for 'script'; report-uri /reporting/resources/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-sink-mismatch.js b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-sink-mismatch.js
new file mode 100644
index 00000000000..96ad9c116b4
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-check-report-sink-mismatch.js
@@ -0,0 +1,13 @@
+test(() => {
+  setTimeout(";"); // violation reported
+  setTimeout(";;"); // another violation reported
+}, "Passing a plain string to setTimeout works since it's report-only.");
+
+test(() => {
+  let p = trustedTypes.createPolicy("dummy", {createScript: x => x});
+  setTimeout(p.createScript(";;;")); // no violation reported
+}, "Passing a TrustedScript to setTimeout works.");
+
+test(_ => {
+  assert_throws_js(EvalError, _ => eval(";;;;")); // violation reported
+}, "Passing a plain string to eval throws.");
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-DedicatedWorker-constructor-worker.js b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-DedicatedWorker-constructor-worker.js
new file mode 100644
index 00000000000..e5b09eb3707
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-DedicatedWorker-constructor-worker.js
@@ -0,0 +1,11 @@
+const testSetupPolicy = trustedTypes.createPolicy("p", { createScriptURL: s => s });
+
+importScripts(testSetupPolicy.createScriptURL("/resources/testharness.js"));
+importScripts(testSetupPolicy.createScriptURL("helper.sub.js"));
+importScripts(testSetupPolicy.createScriptURL("csp-violations.js"));
+
+importScripts(testSetupPolicy.createScriptURL(
+    "trusted-types-reporting-for-DedicatedWorker-constructor.js"
+));
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-DedicatedWorker-constructor-worker.js.headers b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-DedicatedWorker-constructor-worker.js.headers
new file mode 100644
index 00000000000..54d8b1d4c12
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-DedicatedWorker-constructor-worker.js.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: require-trusted-types-for 'script';
+Content-Security-Policy: connect-src 'none'
\ No newline at end of file
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-DedicatedWorker-constructor.js b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-DedicatedWorker-constructor.js
new file mode 100644
index 00000000000..cb5ae4c8e2c
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-DedicatedWorker-constructor.js
@@ -0,0 +1,16 @@
+const policy = trustedTypes.createPolicy("dummy", { createScriptURL: x => x });
+const input = `data:text/javascript,${';'.repeat(100)}`;
+
+promise_test(async t => {
+  await no_trusted_type_violation_for(_ =>
+    new Worker(policy.createScriptURL(input))
+  );
+}, "No violation reported for Worker constructor with TrustedScriptURL.");
+
+promise_test(async t => {
+  let violation = await trusted_type_violation_for(TypeError, _ =>
+    new Worker(input)
+  );
+  assert_equals(violation.blockedURI, "trusted-types-sink");
+  assert_equals(violation.sample, `Worker constructor|${clipSampleIfNeeded(input)}`);
+}, "Violation report for Worker constructor with plain string.");
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-ServiceWorkerContainer-register-worker.https.js b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-ServiceWorkerContainer-register-worker.https.js
new file mode 100644
index 00000000000..cce29cb2f7b
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-ServiceWorkerContainer-register-worker.https.js
@@ -0,0 +1,11 @@
+const testSetupPolicy = trustedTypes.createPolicy("p", { createScriptURL: s => s });
+
+importScripts(testSetupPolicy.createScriptURL("/resources/testharness.js"));
+importScripts(testSetupPolicy.createScriptURL("helper.sub.js"));
+importScripts(testSetupPolicy.createScriptURL("csp-violations.js"));
+
+importScripts(testSetupPolicy.createScriptURL(
+    "trusted-types-reporting-for-ServiceWorkerContainer-register.https.js"
+));
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-ServiceWorkerContainer-register-worker.https.js.headers b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-ServiceWorkerContainer-register-worker.https.js.headers
new file mode 100644
index 00000000000..54d8b1d4c12
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-ServiceWorkerContainer-register-worker.https.js.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: require-trusted-types-for 'script';
+Content-Security-Policy: connect-src 'none'
\ No newline at end of file
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-ServiceWorkerContainer-register.https.js b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-ServiceWorkerContainer-register.https.js
new file mode 100644
index 00000000000..f59799d4776
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-ServiceWorkerContainer-register.https.js
@@ -0,0 +1,27 @@
+const policy = trustedTypes.createPolicy("dummy", { createScriptURL: x => x });
+let worker_url = "worker.https.js";
+let scope = `scope1/`;
+
+if (getGlobalThisStr().includes("Window")) {
+  worker_url = `support/${worker_url}`;
+  scope = `support/${scope}`;
+}
+
+promise_test(async t => {
+  await no_trusted_type_violation_for(async _ => {
+    let reg = await self.navigator.serviceWorker.getRegistration(scope);
+    if (reg) await reg.unregister();
+    reg = await self.navigator.serviceWorker.register(policy.createScriptURL(worker_url), {scope});
+    await new Promise(r => reg.addEventListener("updatefound", r));
+  });
+}, "No violation reported for ServiceWorkerContainer register with TrustedScriptURL.");
+
+promise_test(async t => {
+  let violation = await trusted_type_violation_for(TypeError, async _ => {
+    let reg = await self.navigator.serviceWorker.getRegistration(scope);
+    if (reg) await reg.unregister();
+    await self.navigator.serviceWorker.register(worker_url, {scope});
+  });
+  assert_equals(violation.blockedURI, "trusted-types-sink");
+  assert_equals(violation.sample, `ServiceWorkerContainer register|${clipSampleIfNeeded(worker_url)}`);
+}, "Violation report for ServiceWorkerContainer register with plain string.");
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-SharedWorker-constructor.js b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-SharedWorker-constructor.js
new file mode 100644
index 00000000000..a65731a2f9c
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-SharedWorker-constructor.js
@@ -0,0 +1,16 @@
+const policy = trustedTypes.createPolicy("dummy", { createScriptURL: x => x });
+const input = `data:text/javascript,${';'.repeat(100)}`;
+
+promise_test(async t => {
+  await no_trusted_type_violation_for(_ =>
+    new SharedWorker(policy.createScriptURL(input))
+  );
+}, "No violation reported for SharedWorker constructor with TrustedScriptURL.");
+
+promise_test(async t => {
+  let violation = await trusted_type_violation_for(TypeError, _ =>
+    new SharedWorker(input)
+  );
+  assert_equals(violation.blockedURI, "trusted-types-sink");
+  assert_equals(violation.sample, `SharedWorker constructor|${clipSampleIfNeeded(input)}`);
+}, "Violation report for SharedWorker constructor with plain string.");
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-eval-worker.js b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-eval-worker.js
new file mode 100644
index 00000000000..2a4780dcbad
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-eval-worker.js
@@ -0,0 +1,11 @@
+const testSetupPolicy = trustedTypes.createPolicy("p", { createScriptURL: s => s });
+
+importScripts(testSetupPolicy.createScriptURL("/resources/testharness.js"));
+importScripts(testSetupPolicy.createScriptURL("helper.sub.js"));
+importScripts(testSetupPolicy.createScriptURL("csp-violations.js"));
+
+importScripts(testSetupPolicy.createScriptURL(
+  "trusted-types-reporting-for-eval.js"
+));
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-eval-worker.js.headers b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-eval-worker.js.headers
new file mode 100644
index 00000000000..54d8b1d4c12
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-eval-worker.js.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: require-trusted-types-for 'script';
+Content-Security-Policy: connect-src 'none'
\ No newline at end of file
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-eval.js b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-eval.js
new file mode 100644
index 00000000000..0f8120a7a1f
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-eval.js
@@ -0,0 +1,21 @@
+const policy = trustedTypes.createPolicy("dummy", { createScript: x => x });
+
+promise_test(async t => {
+  let beacon = 'never_overwritten2';
+  await no_trusted_type_violation_for(_ =>
+    eval(policy.createScript('beacon="i ran"'))
+  );
+  assert_equals(beacon, 'i ran');
+}, "No violation reported for eval with TrustedScript.");
+
+promise_test(async t => {
+  const input = 'beacon="should not run"';
+  let beacon = 'never_overwritten';
+  let violation = await trusted_type_violation_for(EvalError, _ =>
+    eval(input)
+  );
+  assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+  assert_equals(violation.blockedURI, "trusted-types-sink");
+  assert_equals(violation.sample, `eval|${clipSampleIfNeeded(input)}`);
+  assert_equals(beacon, 'never_overwritten');
+}, "Violation report for eval with plain string.");
\ No newline at end of file
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-function-constructor-worker.js b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-function-constructor-worker.js
new file mode 100644
index 00000000000..ce73b913689
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-function-constructor-worker.js
@@ -0,0 +1,11 @@
+const testSetupPolicy = trustedTypes.createPolicy("p", { createScriptURL: s => s });
+
+importScripts(testSetupPolicy.createScriptURL("/resources/testharness.js"));
+importScripts(testSetupPolicy.createScriptURL("helper.sub.js"));
+importScripts(testSetupPolicy.createScriptURL("csp-violations.js"));
+
+importScripts(testSetupPolicy.createScriptURL(
+  "trusted-types-reporting-for-function-constructor.js"
+));
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-function-constructor-worker.js.headers b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-function-constructor-worker.js.headers
new file mode 100644
index 00000000000..54d8b1d4c12
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-function-constructor-worker.js.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: require-trusted-types-for 'script';
+Content-Security-Policy: connect-src 'none'
\ No newline at end of file
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-function-constructor.js b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-function-constructor.js
new file mode 100644
index 00000000000..51d04b661f4
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-function-constructor.js
@@ -0,0 +1,29 @@
+const policy = trustedTypes.createPolicy("dummy", { createScript: x => x });
+
+const AsyncFunction = async function() {}.constructor;
+const GeneratorFunction = function*() {}.constructor;
+const AsyncGeneratorFunction = async function*() {}.constructor;
+
+const input = `return${';'.repeat(100)}`;
+[Function, AsyncFunction, GeneratorFunction, AsyncGeneratorFunction].forEach(functionConstructor => {
+  promise_test(async t => {
+    await no_trusted_type_violation_for(_ =>
+      new functionConstructor(policy.createScript(input))
+    );
+  }, `No violation reported for ${functionConstructor.name} with TrustedScript.`);
+
+  promise_test(async t => {
+    await no_trusted_type_violation_for(_ =>
+      new functionConstructor(policy.createScript('a'), policy.createScript(input))
+    );
+  }, `No violation reported for ${functionConstructor.name} with multiple TrustedScript args.`);
+
+  promise_test(async t => {
+    let violation = await trusted_type_violation_for(EvalError, _ =>
+      new functionConstructor(input)
+    );
+    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
+    assert_equals(violation.blockedURI, "trusted-types-sink");
+    assert_equals(violation.sample, `Function|${clipSampleIfNeeded(`(\n) {\n${input}\n}`)}`);
+  }, `Violation report for ${functionConstructor.name} with plain string.`);
+});
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-importScripts.js b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-importScripts.js
new file mode 100644
index 00000000000..c03c29a4e9e
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-importScripts.js
@@ -0,0 +1,24 @@
+const testSetupPolicy = trustedTypes.createPolicy("p", { createScriptURL: s => s });
+
+importScripts(testSetupPolicy.createScriptURL("/resources/testharness.js"));
+importScripts(testSetupPolicy.createScriptURL("helper.sub.js"));
+importScripts(testSetupPolicy.createScriptURL("csp-violations.js"));
+
+const policy = trustedTypes.createPolicy("dummy", { createScriptURL: x => x });
+const input = `./namespaces.js?${'A'.repeat(100)}`;
+
+promise_test(async t => {
+  await no_trusted_type_violation_for(_ =>
+    importScripts(policy.createScriptURL(input))
+  );
+}, "No violation reported for importScripts with TrustedScriptURL.");
+
+promise_test(async t => {
+  let violation = await trusted_type_violation_for(TypeError, _ =>
+    importScripts(input)
+  );
+  assert_equals(violation.blockedURI, "trusted-types-sink");
+  assert_equals(violation.sample, `WorkerGlobalScope importScripts|${clipSampleIfNeeded(input)}`);
+}, "Violation report for importScripts with plain string.");
+
+done();
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-importScripts.js.headers b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-importScripts.js.headers
new file mode 100644
index 00000000000..54d8b1d4c12
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-reporting-for-importScripts.js.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: require-trusted-types-for 'script';
+Content-Security-Policy: connect-src 'none'
\ No newline at end of file
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-sandbox-no-allow-scripts.html b/tests/wpt/tests/trusted-types/support/trusted-types-sandbox-no-allow-scripts.html
new file mode 100644
index 00000000000..11967a4d97f
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-sandbox-no-allow-scripts.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<!-- The CSP spec says a sandbox directive in a <meta> tag is ignored, so we set
+     it and other rules in the .headers file. Please refer to that file. -->
+<p>Sandboxed frame without allow-scripts</p>
+<script>
+  parent.postMessage("I can execute scripts", "*");
+</script>
diff --git a/tests/wpt/tests/trusted-types/support/trusted-types-sandbox-no-allow-scripts.html.headers b/tests/wpt/tests/trusted-types/support/trusted-types-sandbox-no-allow-scripts.html.headers
new file mode 100644
index 00000000000..da0823c6bc5
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/support/trusted-types-sandbox-no-allow-scripts.html.headers
@@ -0,0 +1,3 @@
+Content-Security-Policy: sandbox;
+Content-Security-Policy: trusted-types AllowedPolicyName default;
+Content-Security-Policy: require-trusted-types-for 'script';
diff --git a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.html b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.html
index 69b5bf3c1d1..27bd4644496 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.html
+++ b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.html
@@ -3,24 +3,12 @@
   <script nonce="123" src="/resources/testharness.js"></script>
   <script nonce="123"src="/resources/testharnessreport.js"></script>
   <script src="./support/csp-violations.js"></script>
+  <meta http-equiv="Content-Security-Policy" content="script-src http: https: 'nonce-123' 'report-sample'">
+  <meta http-equiv="Content-Security-Policy" content="connect-src 'none'">
+  <meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'">
 </head>
 <body>
   <script nonce="123">
-  // CSP insists the "trusted-types: ..." directives are deliverd as headers
-  // (rather than as "<meta http-equiv" tags). This test assumes the following
-  // headers are set in the .headers file:
-  //
-  //   Content-Security-Policy: script-src 'unsafe-inline'; report-uri ...
-  //   Content-Security-Policy: connect-src 'none'
-  //   Content-Security-Policy: require-trusted-types-for 'script'
-  //
-  // The second rule is there so we can provoke a CSP violation report at will.
-  // The intent is that in order to test that a violation has *not* been thrown
-  // (and without resorting to abominations like timeouts), we force a *another*
-  // CSP violation (by violating the connect-src rule) and when that event is
-  // processed we can we sure that an earlier event - if it indeed occurred -
-  // must have already been processed.
-
   // A sample policy we use to test trustedTypes.createPolicy behaviour.
   const id = x => x;
   const a_policy = {
diff --git a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.html.headers b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.html.headers
deleted file mode 100644
index 72cebc03552..00000000000
--- a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.html.headers
+++ /dev/null
@@ -1,3 +0,0 @@
-Content-Security-Policy: script-src http: https: 'nonce-123' 'report-sample'
-Content-Security-Policy: connect-src 'none'
-Content-Security-Policy: require-trusted-types-for 'script'
diff --git a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-report-only.html b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-report-only.html
index a9e14f09e4a..09b2f1c2585 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-report-only.html
+++ b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-report-only.html
@@ -3,23 +3,13 @@
   <script nonce="123" src="/resources/testharness.js"></script>
   <script nonce="123" src="/resources/testharnessreport.js"></script>
   <script nonce="123" src="./support/csp-violations.js"></script>
+  <!-- Content-Security-Policy-Report-Only directives are not supported on meta
+       tags per https://www.w3.org/TR/CSP3/#cspro-header. This test sets at
+       least one such directive in a .headers file. Please refer to that file
+       for the complete set of CSP rules that apply to this test. -->
 </head>
 <body>
   <script nonce="123">
-  // CSP insists the "trusted-types: ..." directives are delivered as headers
-  // (rather than as "<meta http-equiv" tags). This test assumes the following
-  // headers are set in the .headers file:
-  //
-  //   Content-Security-Policy: script-src 'unsafe-inline' 'unsafe-eval'; report-uri ...
-  //   Content-Security-Policy: connect-src 'none'
-  //   Content-Security-Policy-Report-Only: require-trusted-types-for 'script'
-  //
-  // The last rule is there so we can provoke a CSP violation report at will.
-  // The intent is that in order to test that a violation has *not* been thrown
-  // (and without resorting to abominations like timeouts), we force a *another*
-  // CSP violation (by violating the img-src rule) and when that event is
-  // processed we can we sure that an earlier event - if it indeed occurred -
-  // must have already been processed.
 
   // A sample policy we use to test trustedTypes.createPolicy behaviour.
   const id = x => x;
diff --git a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting.html b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting.html
deleted file mode 100644
index d037c058d9b..00000000000
--- a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<head>
-  <script nonce="123" src="/resources/testharness.js"></script>
-  <script nonce="123" src="/resources/testharnessreport.js"></script>
-  <script nonce="123" src="./support/csp-violations.js"></script>
-</head>
-<body>
-  <script nonce="123">
-  // CSP insists the "trusted-types: ..." directives are delivered as headers
-  // (rather than as "<meta http-equiv" tags). This test assumes the following
-  // headers are set in the .headers file:
-  //
-  //   Content-Security-Policy: script-src 'unsafe-inline' 'unsafe-eval'; report-uri ...
-  //   Content-Security-Policy: connect-src 'none'
-  //   Content-Security-Policy: require-trusted-types-for 'script'
-  //
-  // The last rule is there so we can provoke a CSP violation report at will.
-  // The intent is that in order to test that a violation has *not* been thrown
-  // (and without resorting to abominations like timeouts), we force a *another*
-  // CSP violation (by violating the img-src rule) and when that event is
-  // processed we can we sure that an earlier event - if it indeed occurred -
-  // must have already been processed.
-
-  // A sample policy we use to test trustedTypes.createPolicy behaviour.
-  const id = x => x;
-  const a_policy = {
-    createHTML: id,
-    createScriptURL: id,
-    createScript: id,
-  };
-  const scriptyPolicy = trustedTypes.createPolicy('allowEval', a_policy);
-
-  promise_test(async t => {
-    const input = 'beacon="should not run"';
-    let beacon = 'never_overwritten';
-    let violation = await trusted_type_violation_for(EvalError, _ =>
-      eval(input)
-    );
-    assert_true(violation.originalPolicy.includes("require-trusted-types-for 'script'"));
-    assert_equals(violation.sample, `eval|${clipSampleIfNeeded(input)}`);
-    assert_equals(beacon, 'never_overwritten');
-  }, "Trusted Type violation report: evaluating a string.");
-
-  promise_test(async t => {
-    let beacon = 'never_overwritten2';
-    await no_trusted_type_violation_for(_ =>
-      eval(scriptyPolicy.createScript('beacon="i ran"'))
-    );
-    assert_equals(beacon, 'i ran');
-  }, "Trusted Type violation report: evaluating a Trusted Script.");
-
-  </script>
-</body>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting.html.headers b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting.html.headers
deleted file mode 100644
index 1e57f8bf585..00000000000
--- a/tests/wpt/tests/trusted-types/trusted-types-eval-reporting.html.headers
+++ /dev/null
@@ -1,4 +0,0 @@
-Content-Security-Policy: script-src http: https: 'nonce-123' 'unsafe-eval'
-Content-Security-Policy: connect-src 'none'
-Content-Security-Policy: require-trusted-types-for 'script'
-
diff --git a/tests/wpt/tests/trusted-types/trusted-types-navigation.html b/tests/wpt/tests/trusted-types/trusted-types-navigation.html
index 74a25fa3480..f29405651f1 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-navigation.html
+++ b/tests/wpt/tests/trusted-types/trusted-types-navigation.html
@@ -8,21 +8,8 @@
 <script>
   "use strict";
 
-  function expectMessage(filter) {
-    return new Promise(resolve => {
-
-      function listener(e) {
-        if (filter(e)) {
-          window.removeEventListener("message", listener);
-          resolve();
-        }
-      }
-      window.addEventListener("message", listener);
-    });
-  }
-
-  function expectViolationAsMessage(sample) {
-    const filter = e => {
+  function violationMessage(sample) {
+    return e => {
       const result = (e.data.effectiveDirective == "require-trusted-types-for" &&
                          (!sample || e.data.sample.startsWith(sample)));
       if (result) {
@@ -30,26 +17,57 @@
       }
 
       return result;
-    }
-    return new expectMessage(filter);
+    };
   }
 
-  function expectLoadedAsMessage(uri) {
-    const filter = e => {
-      const result = (e.data.type == "DOMContentLoaded" &&
-                        (!uri || e.data.uri.endsWith(uri)));
-      if (result) {
-        assert_true(true, "Expected loaded as message: " + uri);
+  function loadedMessage(searchParams, originAndPathName) {
+    return e => {
+      if (e.data.type != "DOMContentLoaded") {
+        return false;
+      }
+      let url = new URL(e.data.uri);
+      if (!url.pathname.endsWith(originAndPathName)) {
+        return false;
+      }
+      let keys = Object.keys(searchParams);
+      if (url.searchParams.size != keys.length ||
+          !keys.every(key =>
+            url.searchParams.get(key) === searchParams[key].toString())) {
+        return false;
       }
 
-      return result;
-    }
-    return new expectMessage(filter);
+      assert_true(true, `Expected loaded as message: ${joinToHref(searchParams, originAndPathName)}`);
+      return true;
+    };
   }
 
-  function openWindow(test, uri) {
+  function openWindowAndWaitMessages(test, uri, expectedMessages) {
     const win = window.open(uri);
-    test.add_cleanup(_ => win.close());
+    let messageSeen = (new Array(expectedMessages.length)).fill(false);
+    return new Promise((resolve, reject) => {
+      function listener(e) {
+        let receivedUnexpectedMessage = true;
+        expectedMessages.forEach((message, index) => {
+          if (message(e)) {
+            receivedUnexpectedMessage = false;
+            if (!messageSeen[index]) {
+              messageSeen[index] = true;
+              if (messageSeen.every(seen => seen)) {
+                resolve();
+              }
+            }
+          }
+        });
+        if (receivedUnexpectedMessage) {
+          reject(`Unexpected message received: ${JSON.stringify(e.data)}`);
+        }
+      }
+      test.add_cleanup(_ => {
+        window.removeEventListener("message", listener);
+        win.close();
+      });
+      window.addEventListener("message", listener);
+    });
   }
 
   const kFormSubmission = "form-submission";
@@ -61,105 +79,89 @@
   ];
 
   function maybeAddFormSubmissionToSearchParams(navigationElement, searchParams) {
-    return (navigationElement == kFormSubmission) ?
-      [kFormSubmission + "=1", ...searchParams] : searchParams;
+    return Object.assign(
+      navigationElement == kFormSubmission ? {kFormSubmission: 1} : {},
+      searchParams);
   }
 
   function joinToHref(searchParams, originAndPathName) {
-    if (searchParams.length > 0) {
-      return originAndPathName + "?" + searchParams.join("&");
+    let urlSearchParams = new URLSearchParams(searchParams);
+    if (urlSearchParams.size > 0) {
+      return originAndPathName + "?" + urlSearchParams.toString();
     }
 
     return originAndPathName;
   }
 
+  const kNavigationSupport = "navigation-support.html";
+  const kNavigationSupportReportOnly = "navigation-report-only-support.html";
+
   for (const navigationElement of kNavigationElements) {
     promise_test(t => {
-      const page = joinToHref(maybeAddFormSubmissionToSearchParams(navigationElement, []),
-        "navigation-support.html");
-      openWindow(t, `support/${page}`);
-      return Promise.all([
-        expectLoadedAsMessage(page),
-        expectViolationAsMessage("Location href"),
+      const params = maybeAddFormSubmissionToSearchParams(navigationElement, {});
+      return openWindowAndWaitMessages(t, `support/${joinToHref(params, kNavigationSupport)}`, [
+        loadedMessage(params, kNavigationSupport),
+        violationMessage("Location href"),
       ]);
     }, `Navigate a window via ${navigationElement} with javascript:-urls in enforcing mode.`);
 
     promise_test(t => {
-      const page = joinToHref(maybeAddFormSubmissionToSearchParams(navigationElement, ["defaultpolicy=1"]),
-        "navigation-support.html");
-      openWindow(t, `support/${page}`);
-      return Promise.all([
-        expectLoadedAsMessage(page),
-        expectLoadedAsMessage(page + "&" + kNavigationAttempted + "&defaultpolicywashere"),
+      const params = maybeAddFormSubmissionToSearchParams(navigationElement, {defaultpolicy: 1});
+      return openWindowAndWaitMessages(t, `support/${joinToHref(params, kNavigationSupport)}`, [
+        loadedMessage(params, kNavigationSupport),
+        loadedMessage(Object.assign({navigationattempted: 1, defaultpolicywashere: 1}, params), kNavigationSupport),
       ]);
     }, `Navigate a window via ${navigationElement} with javascript:-urls w/ default policy in enforcing mode.`);
 
     promise_test(t => {
-      const page = joinToHref(maybeAddFormSubmissionToSearchParams(navigationElement, []),
-        "navigation-report-only-support.html");
-      openWindow(t, `support/${page}`);
-      return Promise.all([
-        expectLoadedAsMessage(page),
-        expectLoadedAsMessage(joinToHref(maybeAddFormSubmissionToSearchParams(navigationElement,
-          [kNavigationAttempted, "continue"]), "navigation-support.html")),
+      const params = maybeAddFormSubmissionToSearchParams(navigationElement, {});
+      return openWindowAndWaitMessages(t, `support/${joinToHref(params, kNavigationSupportReportOnly)}`, [
+        loadedMessage(params, kNavigationSupportReportOnly),
+        violationMessage("Location href"),
+        loadedMessage(Object.assign({navigationattempted: 1, continue: 1}, params), kNavigationSupport),
       ]);
     }, `Navigate a window via ${navigationElement} with javascript:-urls in report-only mode.`);
 
     promise_test(t => {
-      const page = joinToHref(maybeAddFormSubmissionToSearchParams(navigationElement, ["defaultpolicy=1"]),
-        "navigation-report-only-support.html");
-      openWindow(t, `support/${page}`);
-      return Promise.all([
-        expectLoadedAsMessage(page),
-        expectLoadedAsMessage(joinToHref(maybeAddFormSubmissionToSearchParams(navigationElement,
-            ["defaultpolicy=1", kNavigationAttempted, "defaultpolicywashere"]),
-          "navigation-support.html")),
+      const params = maybeAddFormSubmissionToSearchParams(navigationElement, {defaultpolicy: 1});
+      return openWindowAndWaitMessages(t, `support/${joinToHref(params, kNavigationSupportReportOnly)}`, [
+        loadedMessage(params, kNavigationSupportReportOnly),
+        loadedMessage(Object.assign({navigationattempted: 1, defaultpolicywashere: 1}, params), kNavigationSupport),
       ]);
     }, `Navigate a window via ${navigationElement} with javascript:-urls w/ default policy in report-only mode.`);
 
     promise_test(t => {
-      const page = joinToHref(maybeAddFormSubmissionToSearchParams(navigationElement, ["frame=1"]),
-        "navigation-support.html");
-      openWindow(t, `support/${page}`);
-      return Promise.all([
-        expectLoadedAsMessage(page),
-        expectViolationAsMessage("Location href"),
+      const params = maybeAddFormSubmissionToSearchParams(navigationElement, {frame: 1});
+      return openWindowAndWaitMessages(t, `support/${joinToHref(params, kNavigationSupport)}`, [
+        loadedMessage(params, kNavigationSupport),
+        violationMessage("Location href"),
       ]);
     }, `Navigate a frame via ${navigationElement} with javascript:-urls in enforcing mode.`);
 
     promise_test(t => {
-      const page = joinToHref(maybeAddFormSubmissionToSearchParams(navigationElement,
-          ["defaultpolicy=1", "frame=1"]),
-        "navigation-support.html");
-      openWindow(t, `support/${page}`);
-      return Promise.all([
-        expectLoadedAsMessage(page),
-        expectLoadedAsMessage(page + "&" + kNavigationAttempted + "&defaultpolicywashere"),
+      const params = maybeAddFormSubmissionToSearchParams(navigationElement,
+        {defaultpolicy: 1, frame: 1});
+      return openWindowAndWaitMessages(t, `support/${joinToHref(params, kNavigationSupport)}`, [
+        loadedMessage(params, kNavigationSupport),
+        loadedMessage(Object.assign({navigationattempted: 1, defaultpolicywashere: 1}, params), kNavigationSupport),
       ]);
     }, `Navigate a frame via ${navigationElement} with javascript:-urls w/ default policy in enforcing mode.`);
 
     promise_test(t => {
-      const page = joinToHref(maybeAddFormSubmissionToSearchParams(navigationElement, ["frame=1"]),
-        "navigation-report-only-support.html");
-      openWindow(t, `support/${page}`);
-      return Promise.all([
-        expectLoadedAsMessage(page),
-        expectLoadedAsMessage(joinToHref(maybeAddFormSubmissionToSearchParams(navigationElement,
-            ["frame=1", kNavigationAttempted, "continue"]),
-          "navigation-support.html")),
+      const params = maybeAddFormSubmissionToSearchParams(navigationElement, {frame: 1})
+      return openWindowAndWaitMessages(t, `support/${joinToHref(params, kNavigationSupportReportOnly)}`, [
+        loadedMessage(params, kNavigationSupportReportOnly),
+        violationMessage("Location href"),
+        loadedMessage(Object.assign({navigationattempted: 1, continue: 1}, params), kNavigationSupport),
       ]);
     }, `Navigate a frame via ${navigationElement} with javascript:-urls in report-only mode.`);
 
     promise_test(t => {
-      const page = joinToHref(maybeAddFormSubmissionToSearchParams(navigationElement,
-          ["defaultpolicy=1", "frame=1"]),
-          "navigation-report-only-support.html");
-      openWindow(t, `support/${page}`);
-      return Promise.all([
-        expectLoadedAsMessage(page),
-        expectLoadedAsMessage(joinToHref(maybeAddFormSubmissionToSearchParams(navigationElement,
-            ["defaultpolicy=1", "frame=1", kNavigationAttempted, "defaultpolicywashere"]),
-          "navigation-support.html")),
+      const params = maybeAddFormSubmissionToSearchParams(navigationElement,
+                                                          {defaultpolicy: 1, frame: 1});
+      return openWindowAndWaitMessages(t, `support/${joinToHref(params, kNavigationSupportReportOnly)}`, [
+        loadedMessage(params, kNavigationSupportReportOnly),
+        loadedMessage(Object.assign({navigationattempted: 1, defaultpolicywashere: 1}, params), kNavigationSupport),
       ]);
     }, `Navigate a frame via ${navigationElement} with javascript:-urls w/ default policy in report-only mode.`);
   }
diff --git a/tests/wpt/tests/trusted-types/trusted-types-report-only.html b/tests/wpt/tests/trusted-types/trusted-types-report-only.html
index f4386f832f4..7b1a9c7e302 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-report-only.html
+++ b/tests/wpt/tests/trusted-types/trusted-types-report-only.html
@@ -3,7 +3,11 @@
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="/content-security-policy/support/testharness-helper.js"></script>
-<script src="./support/csp-violations.js"></script>
+  <script src="./support/csp-violations.js"></script>
+  <!-- Content-Security-Policy-Report-Only directives are not supported on meta
+       tags per https://www.w3.org/TR/CSP3/#cspro-header. This test sets at
+       least one such directive in a .headers file. Please refer to that file
+       for the complete set of CSP rules that apply to this test. -->
 </head>
 <body>
 
@@ -14,12 +18,6 @@
   <script id="script2"></script>
 
   <script>
-  // CSP insists the "trusted-types: ..." directives are delivered as headers
-  // (rather than as "meta http-equiv" tags). This test assumes the following
-  // headers are set in the .headers file:
-  //
-  //   Content-Security-Policy-Report-Only: trusted-types ...; report-uri ...
-
   // A sample policy we use to test trustedTypes.createPolicy behaviour.
   const id = x => x;
   const policy = trustedTypes.createPolicy("two", {
@@ -30,10 +28,10 @@
 
   promise_test(async t => {
     let violation = await trusted_type_violation_without_exception_for(_ =>
-      document.getElementById("script").src = "// #abc"
+      document.getElementById("script").src = "support/namespaces.js#abc"
     );
     assert_true(violation.originalPolicy.includes("trusted-types two"));
-    assert_true(document.getElementById("script").src.endsWith("// #abc"));
+    assert_true(document.getElementById("script").src.endsWith("#abc"));
   }, "Trusted Type violation report-only: assign string to script url");
 
   promise_test(async t => {
diff --git a/tests/wpt/tests/trusted-types/trusted-types-report-only.html.headers b/tests/wpt/tests/trusted-types/trusted-types-report-only.html.headers
index 602186027d0..096c0b40195 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-report-only.html.headers
+++ b/tests/wpt/tests/trusted-types/trusted-types-report-only.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy-Report-Only: trusted-types two; report-uri /content-security-policy/resources/dummy-report.php; require-trusted-types-for 'script';
+Content-Security-Policy-Report-Only: trusted-types two; require-trusted-types-for 'script';
 Content-Security-Policy: connect-src 'none'
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-DedicatedWorker-create-policy.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-DedicatedWorker-create-policy.html
new file mode 100644
index 00000000000..71576c4ecc1
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-DedicatedWorker-create-policy.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <title>Check Trusted Type violation reports (DedicatedWorker, createPolicy)</title>
+
+<!-- We assume these HTTP headers are set on the request:
+
+  Set-Cookie: trusted-types-reporting-check-report-DedicatedWorker-create-policy={{$id:uuid()}}; Path=/trusted-types/
+  Content-Security-Policy-Report-Only: \
+     trusted-types one two; \
+     report-uri /reporting/resources/report.py?op=put&reportID={{$id}}
+-->
+</head>
+<body>
+  <script>
+    // Make sure checkReport.sub.js tests are executed after the worker tests,
+    // otherwise the violation reports may not have been sent yet.
+    setup({explicit_done: true});
+    fetch_tests_from_worker(new Worker(
+      "support/trusted-types-reporting-check-report-create-policy-worker.js"
+    )).then(() => {
+      let script = document.createElement("script");
+      script.src='../content-security-policy/support/checkReport.sub.js?reportField=violated-directive&reportValue=trusted-types&testName=Test report-uri works with trusted-types violation.&reportCount=2';
+      script.onload = done;
+      document.body.appendChild(script);
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-DedicatedWorker-sink-mismatch.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-DedicatedWorker-sink-mismatch.html
new file mode 100644
index 00000000000..72354a99eed
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-DedicatedWorker-sink-mismatch.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <title>Check Trusted Type violation reports (DedicatedWorker, sink mismatch)</title>
+
+<!-- We assume these HTTP headers are set on the request:
+
+  Set-Cookie: trusted-types-reporting-check-report-DedicatedWorker-sink-mismatch={{$id:uuid()}}; Path=/trusted-types/
+  Content-Security-Policy-Report-Only: \
+     require-trusted-type-for 'script'; \
+     report-uri /reporting/resources/report.py?op=put&reportID={{$id}}
+-->
+</head>
+<body>
+  <script>
+    // Make sure checkReport.sub.js tests are executed after the worker tests,
+    // otherwise the violation reports may not have been sent yet.
+    setup({explicit_done: true});
+    fetch_tests_from_worker(new Worker(
+      "support/trusted-types-reporting-check-report-sink-mismatch-worker.js"
+    )).then(() => {
+      let script = document.createElement("script");
+      script.src='../content-security-policy/support/checkReport.sub.js?reportField=violated-directive&reportValue=require-trusted-types-for&testName=Test report-uri works with require-trusted-types-for violation.&reportCount=3';
+      script.onload = done;
+      document.body.appendChild(script);
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-Window-create-policy.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-Window-create-policy.html
new file mode 100644
index 00000000000..4c9506c5b43
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-Window-create-policy.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <title>Check Trusted Type violation reports (Window, createPolicy)</title>
+
+<!-- We assume these HTTP headers are set on the request:
+
+  Set-Cookie: trusted-types-reporting-check-report-Window-create-policy={{$id:uuid()}}; Path=/trusted-types/
+  Content-Security-Policy-Report-Only: \
+     trusted-types one two; \
+     report-uri /reporting/resources/report.py?op=put&reportID={{$id}}
+-->
+</head>
+<body>
+  <script src="support/trusted-types-reporting-check-report-create-policy.js"></script>
+  <script async defer src='../content-security-policy/support/checkReport.sub.js?reportField=violated-directive&reportValue=trusted-types&testName=Test report-uri works with trusted-types violation.&reportCount=2'></script>
+</body>
+</html>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-Window-create-policy.html.sub.headers b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-Window-create-policy.html.sub.headers
new file mode 100644
index 00000000000..4653c9d7031
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-Window-create-policy.html.sub.headers
@@ -0,0 +1,6 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Cache-Control: post-check=0, pre-check=0, false
+Pragma: no-cache
+Set-Cookie: trusted-types-reporting-check-report-Window-create-policy={{$id:uuid()}}; Path=/trusted-types/
+Content-Security-Policy-Report-Only: trusted-types one two; report-uri /reporting/resources/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-Window-sink-mismatch.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-Window-sink-mismatch.html
new file mode 100644
index 00000000000..ad855dfb2f1
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-Window-sink-mismatch.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <title>Check Trusted Type violation reports (DedicatedWorker, sink mismatch)</title>
+
+<!-- We assume these HTTP headers are set on the request:
+
+  Set-Cookie: trusted-types-reporting-check-report-Window-sink-mismatch={{$id:uuid()}}; Path=/trusted-types/
+  Content-Security-Policy-Report-Only: \
+     require-trusted-type-for 'script'; \
+     report-uri /reporting/resources/report.py?op=put&reportID={{$id}}
+-->
+</head>
+<body>
+  <script nonce="123" src="support/trusted-types-reporting-check-report-sink-mismatch.js"></script>
+  <script async defer src='../content-security-policy/support/checkReport.sub.js?reportField=violated-directive&reportValue=require-trusted-types-for&testName=Test report-uri works with require-trusted-types-for violation.&reportCount=3'></script>
+</body>
+</html>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-Window-sink-mismatch.html.sub.headers b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-Window-sink-mismatch.html.sub.headers
new file mode 100644
index 00000000000..62a0c13f0a3
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report-Window-sink-mismatch.html.sub.headers
@@ -0,0 +1,7 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Cache-Control: post-check=0, pre-check=0, false
+Pragma: no-cache
+Set-Cookie: trusted-types-reporting-check-report-Window-sink-mismatch={{$id:uuid()}}; Path=/trusted-types/
+Content-Security-Policy: script-src http: https: 'nonce-123'
+Content-Security-Policy-Report-Only: require-trusted-types-for 'script'; report-uri /reporting/resources/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report.html
deleted file mode 100644
index ae5ac25052d..00000000000
--- a/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <title>Check Trusted Type violation reports</title>
-
-<!-- We assume these HTTP headers are set on the request:
-
-  Set-Cookie: trusted-types-reporting-check-report={{$id:uuid()}}; Path=/trusted-types/
-  Content-Security-Policy-Report-Only: \
-     trusted-types one two; \
-     report-uri /reporting/resources/report.py?op=put&reportID={{$id}}
--->
-</head>
-<body>
-  <script>
-    trustedTypes.createPolicy("three", {});
-  </script>
-  <script async defer src='../content-security-policy/support/checkReport.sub.js?reportField=violated-directive&reportValue=trusted-types'></script>
-</body>
-</html>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report.html.sub.headers b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report.html.sub.headers
deleted file mode 100644
index c055bdc6563..00000000000
--- a/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: trusted-types-reporting-check-report={{$id:uuid()}}; Path=/trusted-types/
-Content-Security-Policy-Report-Only: trusted-types one two; report-uri /reporting/resources/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-clipping-of-sample.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-clipping-of-sample.html
new file mode 100644
index 00000000000..1e4a8470ad1
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-clipping-of-sample.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<script src="/resources/testharness.js" ></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./support/csp-violations.js"></script>
+<meta http-equiv="Content-Security-Policy" content="trusted-types 'none'">
+<meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'">
+<meta http-equiv="Content-Security-Policy" content="connect-src 'none'">
+<body>
+<script>
+  const clippedSampleLength = 40;
+  [
+    // Strings with ASCII characters.
+    'A'.repeat(clippedSampleLength - 1),
+    'B'.repeat(clippedSampleLength),
+    'C'.repeat(clippedSampleLength + 1),
+
+    // Strings with non-ASCII BMP characters.
+    'Ð'.repeat(clippedSampleLength - 1),
+    'É'.repeat(clippedSampleLength),
+    '℉'.repeat(clippedSampleLength + 1),
+  ].forEach(input => {
+    promise_test(async t => {
+      let violation = await trusted_type_violation_for(TypeError, _ =>
+        window.trustedTypes.createPolicy(input, { createHTML: s => s } )
+      );
+      assert_equals(violation.originalPolicy, "trusted-types 'none'");
+      assert_equals(violation.sample, clipSampleIfNeeded(input));
+    }, `Clipping of violation sample for createPolicy(${input})`);
+
+    promise_test(async t => {
+      let violation = await trusted_type_violation_for(TypeError, _ =>
+        document.createElement("div").innerHTML = input
+      );
+      assert_equals(violation.originalPolicy, "require-trusted-types-for 'script'");
+      assert_equals(violation.sample, `Element innerHTML|${clipSampleIfNeeded(input)}`);
+    }, `Clipping of violation sample for Element.innerHTML = "${input}"`);
+  });
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-clipping-of-sample.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-clipping-of-sample.tentative.html
new file mode 100644
index 00000000000..203cff86110
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-clipping-of-sample.tentative.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<script src="/resources/testharness.js" ></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./support/csp-violations.js"></script>
+<meta http-equiv="Content-Security-Policy" content="trusted-types 'none'">
+<meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'">
+<meta http-equiv="Content-Security-Policy" content="connect-src 'none'">
+<body>
+<script>
+  const clippedSampleLength = 40;
+  const inputAndClippedInput = [
+    // Strings with surrogate pairs
+    // We use Firefox's behavior as expectations i.e. clip the source as UTF-16
+    // string of length 40 ; or of length 41 if the last character is a
+    // surrogate pair). See https://github.com/w3c/webappsec-csp/issues/704
+    ['𝐆'.repeat(clippedSampleLength / 2), '𝐆'.repeat(clippedSampleLength / 2)],
+    [`H${'𝐇'.repeat(clippedSampleLength / 2)}`, `H${'𝐇'.repeat(clippedSampleLength / 2)}`],
+    [`${'𝐈'.repeat(clippedSampleLength / 2)}I`, `${'𝐈'.repeat(clippedSampleLength / 2)}`],
+    ['𝐉'.repeat(clippedSampleLength / 2 + 1), '𝐉'.repeat(clippedSampleLength / 2)],
+  ];
+
+  for (const [input, clippedInput] of inputAndClippedInput) {
+    promise_test(async t => {
+      let violation = await trusted_type_violation_for(TypeError, _ =>
+        window.trustedTypes.createPolicy(input, { createHTML: s => s } )
+      );
+      assert_equals(violation.originalPolicy, "trusted-types 'none'");
+      assert_equals(violation.sample, clippedInput);
+    }, `Clipping of violation sample for createPolicy(${input})`);
+
+    promise_test(async t => {
+      let violation = await trusted_type_violation_for(TypeError, _ =>
+        document.createElement("div").innerHTML = input
+      );
+      assert_equals(violation.originalPolicy, "require-trusted-types-for 'script'");
+      assert_equals(violation.sample, `Element innerHTML|${clippedInput}`);
+    }, `Clipping of violation sample for Element.innerHTML = "${input}"`);
+  }
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-DedicatedWorker-DedicatedWorker-constructor.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-DedicatedWorker-DedicatedWorker-constructor.html
new file mode 100644
index 00000000000..b70a074fc7f
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-DedicatedWorker-DedicatedWorker-constructor.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  fetch_tests_from_worker(new Worker(
+    "support/trusted-types-reporting-for-DedicatedWorker-constructor-worker.js"
+  ));
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-DedicatedWorker-ServiceWorkerContainer-register.https.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-DedicatedWorker-ServiceWorkerContainer-register.https.html
new file mode 100644
index 00000000000..9db187a2f91
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-DedicatedWorker-ServiceWorkerContainer-register.https.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  fetch_tests_from_worker(new Worker(
+    "support/trusted-types-reporting-for-ServiceWorkerContainer-register-worker.https.js"
+  ));
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-DedicatedWorker-eval.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-DedicatedWorker-eval.html
new file mode 100644
index 00000000000..184bc8ad333
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-DedicatedWorker-eval.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  fetch_tests_from_worker(new Worker(
+    "support/trusted-types-reporting-for-eval-worker.js"
+  ));
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-DedicatedWorker-function-constructor.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-DedicatedWorker-function-constructor.html
new file mode 100644
index 00000000000..26d4e54634a
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-DedicatedWorker-function-constructor.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  fetch_tests_from_worker(new Worker(
+    "support/trusted-types-reporting-for-function-constructor-worker.js"
+  ));
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-DedicatedWorker-importScripts.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-DedicatedWorker-importScripts.html
new file mode 100644
index 00000000000..5db284f715c
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-DedicatedWorker-importScripts.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  fetch_tests_from_worker(new Worker(
+    "support/trusted-types-reporting-for-importScripts.js"
+  ));
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-ServiceWorker-ServiceWorkerContainer-register.https.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-ServiceWorker-ServiceWorkerContainer-register.https.html
new file mode 100644
index 00000000000..ac853cd8f6e
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-ServiceWorker-ServiceWorkerContainer-register.https.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  // Cargo-culted from code generated from "META: worker".
+  (async function() {
+    const scope = 'support/some/scope/for/this/test';
+    let reg = await navigator.serviceWorker.getRegistration(scope);
+    if (reg) await reg.unregister();
+    reg = await navigator.serviceWorker.register(
+      "support/trusted-types-reporting-for-ServiceWorkerContainer-register-worker.https.js", {scope});
+    fetch_tests_from_worker(reg.installing);
+  })();
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-ServiceWorker-eval.https.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-ServiceWorker-eval.https.html
new file mode 100644
index 00000000000..2d0b6315fb9
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-ServiceWorker-eval.https.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  // Cargo-culted from code generated from "META: worker".
+  (async function() {
+    const scope = 'support/some/scope/for/this/test';
+    let reg = await navigator.serviceWorker.getRegistration(scope);
+    if (reg) await reg.unregister();
+    reg = await navigator.serviceWorker.register(
+      "support/trusted-types-reporting-for-eval-worker.js", {scope});
+    fetch_tests_from_worker(reg.installing);
+  })();
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-ServiceWorker-function-constructor.https.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-ServiceWorker-function-constructor.https.html
new file mode 100644
index 00000000000..791663dfc79
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-ServiceWorker-function-constructor.https.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  // Cargo-culted from code generated from "META: worker".
+  (async function() {
+    const scope = 'support/some/scope/for/this/test';
+    let reg = await navigator.serviceWorker.getRegistration(scope);
+    if (reg) await reg.unregister();
+    reg = await navigator.serviceWorker.register(
+      "support/trusted-types-reporting-for-function-constructor-worker.js", {scope});
+    fetch_tests_from_worker(reg.installing);
+  })();
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-ServiceWorker-importScripts.https.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-ServiceWorker-importScripts.https.html
new file mode 100644
index 00000000000..865409aca1b
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-ServiceWorker-importScripts.https.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  // Cargo-culted from code generated from "META: worker".
+  (async function() {
+    const scope = 'support/some/scope/for/this/test';
+    let reg = await navigator.serviceWorker.getRegistration(scope);
+    if (reg) await reg.unregister();
+    reg = await navigator.serviceWorker.register("support/trusted-types-reporting-for-importScripts.js", {scope});
+    fetch_tests_from_worker(reg.installing);
+  })();
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-ServiceWorker-setTimeout-setInterval.https.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-ServiceWorker-setTimeout-setInterval.https.html
new file mode 100644
index 00000000000..34b962df085
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-ServiceWorker-setTimeout-setInterval.https.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  // Cargo-culted from code generated from "META: worker".
+  (async function() {
+    const scope = 'support/some/scope/for/this/test';
+    let reg = await navigator.serviceWorker.getRegistration(scope);
+    if (reg) await reg.unregister();
+    reg = await navigator.serviceWorker.register("support/trusted-types-reporting-for-setTimeout-setInterval-worker.js", {scope});
+    fetch_tests_from_worker(reg.installing);
+  })();
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-SharedWorker-DedicatedWorker-constructor.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-SharedWorker-DedicatedWorker-constructor.html
new file mode 100644
index 00000000000..3b382d8774a
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-SharedWorker-DedicatedWorker-constructor.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  fetch_tests_from_worker(new SharedWorker(
+    "support/trusted-types-reporting-for-DedicatedWorker-constructor-worker.js"
+  ));
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-SharedWorker-ServiceWorkerContainer-register.https.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-SharedWorker-ServiceWorkerContainer-register.https.html
new file mode 100644
index 00000000000..00e9a75dfb0
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-SharedWorker-ServiceWorkerContainer-register.https.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  fetch_tests_from_worker(new SharedWorker(
+    "support/trusted-types-reporting-for-ServiceWorkerContainer-register-worker.https.js"
+  ));
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-SharedWorker-eval.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-SharedWorker-eval.html
new file mode 100644
index 00000000000..6ae0f60351f
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-SharedWorker-eval.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  fetch_tests_from_worker(new SharedWorker(
+    "support/trusted-types-reporting-for-eval-worker.js"
+  ));
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-SharedWorker-function-constructor.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-SharedWorker-function-constructor.html
new file mode 100644
index 00000000000..dc77be79640
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-SharedWorker-function-constructor.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  fetch_tests_from_worker(new SharedWorker(
+    "support/trusted-types-reporting-for-function-constructor-worker.js"
+  ));
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-SharedWorker-importScripts.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-SharedWorker-importScripts.html
new file mode 100644
index 00000000000..fb01333dd46
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-SharedWorker-importScripts.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  fetch_tests_from_worker(new SharedWorker(
+    "support/trusted-types-reporting-for-importScripts.js"
+  ));
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-Window-DedicatedWorker-constructor.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-Window-DedicatedWorker-constructor.html
new file mode 100644
index 00000000000..3d2a91d74ca
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-Window-DedicatedWorker-constructor.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/helper.sub.js"></script>
+<script src="support/csp-violations.js"></script>
+
+<meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'; connect-src 'none';">
+<body>
+<script src="support/trusted-types-reporting-for-DedicatedWorker-constructor.js">
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-Window-ServiceWorkerContainer-register.https.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-Window-ServiceWorkerContainer-register.https.html
new file mode 100644
index 00000000000..482b9c333e3
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-Window-ServiceWorkerContainer-register.https.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/helper.sub.js"></script>
+<script src="support/csp-violations.js"></script>
+
+<meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'; connect-src 'none';">
+<body>
+<script src="support/trusted-types-reporting-for-ServiceWorkerContainer-register.https.js">
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-Window-SharedWorker-constructor.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-Window-SharedWorker-constructor.html
new file mode 100644
index 00000000000..a03dd21be97
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-Window-SharedWorker-constructor.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/helper.sub.js"></script>
+<script src="support/csp-violations.js"></script>
+
+<meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'; connect-src 'none';">
+<body>
+<script src="support/trusted-types-reporting-for-SharedWorker-constructor.js">
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-Window-eval.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-Window-eval.html
new file mode 100644
index 00000000000..7f4772aed14
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-Window-eval.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/helper.sub.js"></script>
+<script src="support/csp-violations.js"></script>
+
+<meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'; connect-src 'none';">
+<body>
+<script src="support/trusted-types-reporting-for-eval.js">
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting-for-Window-function-constructor.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-Window-function-constructor.html
new file mode 100644
index 00000000000..9b9617a9b5d
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting-for-Window-function-constructor.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/helper.sub.js"></script>
+<script src="support/csp-violations.js"></script>
+
+<meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'; connect-src 'none';">
+<body>
+<script src="support/trusted-types-reporting-for-function-constructor.js">
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting.html b/tests/wpt/tests/trusted-types/trusted-types-reporting.html
index 5e7930382ad..7432d3bded8 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-reporting.html
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting.html
@@ -4,30 +4,18 @@
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="./support/csp-violations.js"></script>
+  <!-- Content-Security-Policy-Report-Only directives are not supported on meta
+       tags per https://www.w3.org/TR/CSP3/#cspro-header. This test sets at
+       least one such directive in a .headers file. It also sets a default-src
+       rule to allow all scripting except 'unsafe-eval', so we can also test
+       reporting of this case. Please refer to that file for the complete set of
+       CSP rules that apply to this test. -->
 </head>
 <body>
   <!-- Some elements for the tests to act on. -->
   <script id="customscript" is="custom-script" src="a"></script>
   <svg><script id="svgscript"></script></svg>
   <script>
-  // CSP insists the "trusted-types: ..." directives are delivered as headers
-  // (rather than as "<meta http-equiv" tags). This test assumes the following
-  // headers are set in the .headers file:
-  //
-  //   Content-Security-Policy: trusted-types one
-  //   Content-Security-Policy-Report-Only: trusted-types two; report-uri ...
-  //   Content-Security-Policy: connect-src 'none'
-  //   Content-Security-Policy: default-src * 'unsafe-inline'
-  //
-  // The third rule is there so we can provoke a CSP violation report at will.
-  // The intent is that in order to test that a violation has *not* been thrown
-  // (and without resorting to abominations like timeouts), we force a *another*
-  // CSP violation (by violating the connect-src rule) and when that event is
-  // processed we can we sure that an earlier event - if it indeed occurred -
-  // must have already been processed.
-  //
-  // The last rule allows all scripting except 'unsafe-eval', so we can also
-  // test reporting of this case.
 
   const url = "" + document.location;
 
diff --git a/tests/wpt/tests/trusted-types/trusted-types-reporting.html.headers b/tests/wpt/tests/trusted-types/trusted-types-reporting.html.headers
index 7076f4106f7..5809a919913 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-reporting.html.headers
+++ b/tests/wpt/tests/trusted-types/trusted-types-reporting.html.headers
@@ -1,5 +1,5 @@
 Content-Security-Policy: trusted-types one
-Content-Security-Policy-Report-Only: trusted-types two; report-uri /content-security-policy/resources/dummy-report.php
+Content-Security-Policy-Report-Only: trusted-types two;
 Content-Security-Policy: connect-src 'none'
 Content-Security-Policy: default-src * 'unsafe-inline'
 Content-Security-Policy: require-trusted-types-for 'script'
diff --git a/tests/wpt/tests/trusted-types/trusted-types-sandbox-allow-scripts.html b/tests/wpt/tests/trusted-types/trusted-types-sandbox-allow-scripts.html
new file mode 100644
index 00000000000..b89cb567102
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-sandbox-allow-scripts.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js" ></script>
+<script src="/resources/testharnessreport.js"></script>
+<!-- The CSP spec says a sandbox directive in a <meta> tag is ignored, so we set
+     it and other rules in the .headers file. Please refer to that file. -->
+<link rel="help" href="https://github.com/w3c/trusted-types/issues/513">
+<script>
+  test(_ => {
+    assert_throws_js(TypeError, _ => {
+      window.trustedTypes.createPolicy("ForbiddenPolicyName",
+                                       { createHTML: x => x});
+    });
+    let p = window.trustedTypes.createPolicy("AllowedPolicyName",
+                                             { createHTML: x => `[${x}]`});
+    assert_equals(p.name, "AllowedPolicyName");
+    assert_equals(p.createHTML("Hello World!").toString(), "[Hello World!]");
+  }, "window.trustedTypes.createPolicy() in a sandboxed page with allow-scripts.");
+
+  test(_ => {
+    let div = document.createElement("div");
+    assert_throws_js(TypeError, _ => div.innerHTML = "abcd");
+    window.trustedTypes.createPolicy("default",
+                                     { createHTML: x => x.toUpperCase()});
+    div.innerHTML = "abcd";
+    assert_equals(div.innerHTML, "ABCD");
+  }, "Default Trusted Types policy in a sandboxed page with allow-scripts.");
+</script>
diff --git a/tests/wpt/tests/trusted-types/trusted-types-sandbox-allow-scripts.html.headers b/tests/wpt/tests/trusted-types/trusted-types-sandbox-allow-scripts.html.headers
new file mode 100644
index 00000000000..6bd66164613
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-sandbox-allow-scripts.html.headers
@@ -0,0 +1,3 @@
+Content-Security-Policy: sandbox allow-scripts;
+Content-Security-Policy: trusted-types AllowedPolicyName default;
+Content-Security-Policy: require-trusted-types-for 'script';
diff --git a/tests/wpt/tests/trusted-types/trusted-types-sandbox-no-allow-scripts.html b/tests/wpt/tests/trusted-types/trusted-types-sandbox-no-allow-scripts.html
new file mode 100644
index 00000000000..c4e4683934e
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/trusted-types-sandbox-no-allow-scripts.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js" ></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://github.com/w3c/trusted-types/issues/513">
+<script>
+  let scriptExecutedInSubFrame = false;
+  window.addEventListener("message", _ => {
+    scriptExecutedInSubFrame = true
+  });
+</script>
+<iframe id="sandboxedFrame"
+        src="support/trusted-types-sandbox-no-allow-scripts.html"></iframe>
+<script>
+  promise_test(async () => {
+    await new Promise(resolve => window.addEventListener("load", resolve));
+    assert_equals(scriptExecutedInSubFrame, false);
+  }, "Trusted Types CSP directives don't affect the behavior of sandboxed page without allow-scripts.");
+</script>
diff --git a/tests/wpt/tests/ua-client-hints/useragentdata.https.tentative.any.js b/tests/wpt/tests/ua-client-hints/useragentdata.https.tentative.any.js
new file mode 100644
index 00000000000..3af48ee416a
--- /dev/null
+++ b/tests/wpt/tests/ua-client-hints/useragentdata.https.tentative.any.js
@@ -0,0 +1,12 @@
+// META: title=tests for navigator.userAgentData on Linux
+
+promise_test(() => {
+  return navigator.userAgentData.getHighEntropyValues(["platformVersion", "wow64"]).then(
+    hints => {
+      if (navigator.userAgentData.platform === "Linux") {
+        assert_true(hints.platformVersion === "");
+        assert_equals(hints.wow64, false);
+      }
+    }
+  );
+}, "Platform version and wow64-ness on Linux should be fixed values");
diff --git a/tests/wpt/tests/urlpattern/resources/urlpatterntestdata.json b/tests/wpt/tests/urlpattern/resources/urlpatterntestdata.json
index f92ab76b71d..a613b6a74b5 100644
--- a/tests/wpt/tests/urlpattern/resources/urlpatterntestdata.json
+++ b/tests/wpt/tests/urlpattern/resources/urlpatterntestdata.json
@@ -1202,10 +1202,11 @@
   {
     "pattern": [{ "protocol": "http", "port": "80 " }],
     "inputs": [{ "protocol": "http", "port": "80" }],
-    "exactly_empty_components": ["port"],
-    "expected_match": {
-      "protocol": { "input": "http", "groups": {} }
-    }
+    "expected_obj": {
+      "protocol": "http",
+      "port": "80"
+    },
+    "expected_match": null
   },
   {
     "pattern": [{ "protocol": "http", "port": "100000" }],
@@ -1229,6 +1230,34 @@
       "port": { "input": "80", "groups": {}}
     }
   },
+  {
+    "pattern": [{ "port": "80" }],
+    "inputs": [{ "port": "8\t0" }],
+    "expected_match": {
+      "port": { "input": "80", "groups": {}}
+    }
+  },
+  {
+    "pattern": [{ "port": "80" }],
+    "inputs": [{ "port": "80x" }],
+    "expected_match": {
+      "port": { "input": "80", "groups": {}}
+    }
+  },
+  {
+    "pattern": [{ "port": "80" }],
+    "inputs": [{ "port": "80?x" }],
+    "expected_match": {
+      "port": { "input": "80", "groups": {}}
+    }
+  },
+  {
+    "pattern": [{ "port": "80" }],
+    "inputs": [{ "port": "80\\x" }],
+    "expected_match": {
+      "port": { "input": "80", "groups": {}}
+    }
+  },
   {
     "pattern": [{ "port": "(.*)" }],
     "inputs": [{ "port": "invalid80" }],
@@ -1874,7 +1903,17 @@
   {
     "pattern": [ "https://{sub.}?example{.com/}foo" ],
     "inputs": [ "https://example.com/foo" ],
-    "expected_obj": "error"
+    "exactly_empty_components": [ "port" ],
+    "expected_obj": {
+      "protocol": "https",
+      "hostname": "{sub.}?example.com",
+      "pathname": "*"
+    },
+    "expected_match": {
+      "protocol": { "input": "https", "groups": {} },
+      "hostname": { "input": "example.com", "groups": {} },
+      "pathname": { "input": "/foo", "groups": { "0": "/foo" } }
+    }
   },
   {
     "pattern": [ "{https://}example.com/foo" ],
diff --git a/tests/wpt/tests/user-timing/measure-l3.any.js b/tests/wpt/tests/user-timing/measure-l3.any.js
index 642b55ab635..13511dfbf49 100644
--- a/tests/wpt/tests/user-timing/measure-l3.any.js
+++ b/tests/wpt/tests/user-timing/measure-l3.any.js
@@ -32,4 +32,4 @@ test(function() {
   const measureEntry = performance.measure("A", "mark", "mark");
   assert_equals(endTime(measureEntry), markEntry.startTime);
   assert_equals(measureEntry.startTime, markEntry.startTime);
-}, "When start and end mark are both given, the start time and end time of the measure entry should be the the marks' time, repectively");
+}, "When start and end mark are both given, the start time and end time of the measure entry should be the marks' time, repectively");
diff --git a/tests/wpt/tests/video-rvfc/request-video-frame-callback-during-xr-session.https.html b/tests/wpt/tests/video-rvfc/request-video-frame-callback-during-xr-session.https.html
index d5f69ec285c..0c881472547 100644
--- a/tests/wpt/tests/video-rvfc/request-video-frame-callback-during-xr-session.https.html
+++ b/tests/wpt/tests/video-rvfc/request-video-frame-callback-during-xr-session.https.html
@@ -16,7 +16,7 @@ let testFunction = async function(session, fakeDeviceController, t) {
     let eventWatcher = new EventWatcher(t, session, ["end", "watcherdone"]);
     let eventPromise = eventWatcher.wait_for(["end", "watcherdone"]);
 
-    // Start the video.rVFC callbacks while we are in the the XR Session.
+    // Start the video.rVFC callbacks while we are in the XR Session.
     let video = document.createElement('video');
     video.muted = true;
     video.src = getVideoURI('/media/movie_5');
diff --git a/tests/wpt/tests/viewport-segments/META.yml b/tests/wpt/tests/viewport-segments/META.yml
new file mode 100644
index 00000000000..38eb8c0cb93
--- /dev/null
+++ b/tests/wpt/tests/viewport-segments/META.yml
@@ -0,0 +1,4 @@
+spec: https://drafts.csswg.org/css-viewport-1/
+suggested_reviewers:
+  - bokand
+  - chrishtr
diff --git a/tests/wpt/tests/viewport-segments/README.md b/tests/wpt/tests/viewport-segments/README.md
new file mode 100644
index 00000000000..50e724bd711
--- /dev/null
+++ b/tests/wpt/tests/viewport-segments/README.md
@@ -0,0 +1,2 @@
+This directory contains (tentative) tests for the
+[Viewport Segments CSS](https://www.w3.org/TR/mediaqueries-5/#mf-horizontal-viewport-segments) specification and the [Viewport Segments JavaScript](https://drafts.csswg.org/css-viewport/#segments) specification.
diff --git a/tests/wpt/tests/viewport-segments/WEB_FEATURES.yml b/tests/wpt/tests/viewport-segments/WEB_FEATURES.yml
new file mode 100644
index 00000000000..ebb7d6a73d3
--- /dev/null
+++ b/tests/wpt/tests/viewport-segments/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: viewport-segments
+  files: "**"
diff --git a/tests/wpt/tests/viewport-segments/viewport-segments-change-event.https.html b/tests/wpt/tests/viewport-segments/viewport-segments-change-event.https.html
new file mode 100644
index 00000000000..f039d5514d0
--- /dev/null
+++ b/tests/wpt/tests/viewport-segments/viewport-segments-change-event.https.html
@@ -0,0 +1,51 @@
+<!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>
+'use strict';
+
+promise_test(async (t) => {
+  t.add_cleanup(async () => {
+    await test_driver.clear_display_features();
+  });
+
+  // There is always one segment the dimension of the viewport.
+  assert_true(matchMedia('(horizontal-viewport-segments: 1)').matches);
+  assert_true(matchMedia('(vertical-viewport-segments: 1)').matches);
+
+  assert_false(matchMedia('(horizontal-viewport-segments: 2)').matches);
+  assert_false(matchMedia('(vertical-viewport-segments: 2)').matches);
+
+  const horizontalViewportSegmentsMQL = window.matchMedia('(horizontal-viewport-segments: 2)');
+  const verticalViewportSegmentsMQL = window.matchMedia('(vertical-viewport-segments: 2)');
+  let promise = new Promise(resolve => {
+    horizontalViewportSegmentsMQL.addEventListener(
+      'change',
+      () => { resolve(horizontalViewportSegmentsMQL.matches); },
+      { once: true }
+    );
+  });
+  await test_driver.set_display_features([{
+    orientation: 'vertical', maskLength: 20, offset: 20
+  }]);
+  assert_true(await promise, 'The horizontal viewport segments media query should match.');
+
+  promise = new Promise(resolve => {
+    verticalViewportSegmentsMQL.addEventListener(
+      'change',
+      () => { resolve(verticalViewportSegmentsMQL.matches); },
+      { once: true }
+    );
+  });
+  await test_driver.set_display_features([{
+    orientation: 'horizontal', maskLength: 20, offset: 20
+  }]);
+  assert_true(await promise, 'The vertical viewport segments media query should match.');
+}, 'Tests the Viewport Segments Media Query change event handler.');
+</script>
+</head>
+<body>
+</body>
+</html>
diff --git a/tests/wpt/tests/viewport-segments/viewport-segments-env-variables.https.html b/tests/wpt/tests/viewport-segments/viewport-segments-env-variables.https.html
new file mode 100644
index 00000000000..dce6757d49a
--- /dev/null
+++ b/tests/wpt/tests/viewport-segments/viewport-segments-env-variables.https.html
@@ -0,0 +1,143 @@
+<!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>
+<style>
+  /* The following styles set the margin top/left/bottom/right to the
+    values where the display feature between segments is, and the width and
+    height of the div to the width and height of the display feature */
+  @media (horizontal-viewport-segments: 2) {
+    div {
+      margin: env(viewport-segment-top 0 0, 10px)
+              env(viewport-segment-left 1 0, 10px)
+              env(viewport-segment-bottom 0 0, 10px)
+              env(viewport-segment-right 0 0, 10px);
+      width: calc(env(viewport-segment-left 1 0, 10px) -
+                  env(viewport-segment-right 0 0, 0px));
+      height: env(viewport-segment-height 0 0, 10px);
+    }
+  }
+
+  @media (vertical-viewport-segments: 2) {
+    div {
+      margin: env(viewport-segment-bottom 0 0, 11px)
+              env(viewport-segment-right 0 1, 11px)
+              env(viewport-segment-top 0 1, 11px)
+              env(viewport-segment-left 0 0, 11px);
+      width: env(viewport-segment-width 0 0, 11px);
+      height: calc(env(viewport-segment-top 0 1, 11px) -
+                    env(viewport-segment-bottom 0 0, 0px));
+    }
+  }
+
+  @media (horizontal-viewport-segments: 1) and
+          (vertical-viewport-segments: 1) {
+    div { opacity: 0.1; margin: 1px; width: 1px; height: 1px; }
+  }
+
+  @media (horizontal-viewport-segments: 2) and
+          (vertical-viewport-segments: 1) {
+    div { opacity: 0.2; }
+  }
+
+  @media (horizontal-viewport-segments: 1) and
+          (vertical-viewport-segments: 2) {
+    div { opacity: 0.3; }
+  }
+</style>
+</head>
+<body>
+  <div id='target'></div>
+</body>
+<script>
+'use strict';
+
+promise_test(async (t) => {
+  t.add_cleanup(async () => {
+    await test_driver.clear_display_features();
+  });
+
+  const displayFeatureLength = 10;
+  const target = document.querySelector('#target');
+  const targetComputedStyle = window.getComputedStyle(target);
+  assert_equals(targetComputedStyle.marginTop, '1px');
+  assert_equals(targetComputedStyle.marginRight,'1px');
+  assert_equals(targetComputedStyle.marginBottom,'1px');
+  assert_equals(targetComputedStyle.marginLeft, '1px');
+  assert_equals(targetComputedStyle.width, '1px');
+  assert_equals(targetComputedStyle.height, '1px');
+  assert_equals(targetComputedStyle.opacity, '0.1');
+
+  const horizontalViewportSegmentsMQL = window.matchMedia('(horizontal-viewport-segments: 2)');
+  let promise = new Promise(resolve => {
+    horizontalViewportSegmentsMQL.addEventListener(
+      'change',
+      () => { resolve(horizontalViewportSegmentsMQL.matches); },
+      { once: true }
+    );
+  });
+  const leftOffset =
+    Math.round(window.innerWidth / 2 - displayFeatureLength / 2);
+  await test_driver.set_display_features([{
+    orientation: 'vertical',
+    maskLength: displayFeatureLength,
+    offset: leftOffset
+  }]);
+  assert_true(await promise);
+  assert_equals(targetComputedStyle.marginTop, '0px');
+  assert_equals(targetComputedStyle.marginRight,
+    Math.round(window.innerWidth / 2 + displayFeatureLength / 2) + 'px');
+  assert_equals(targetComputedStyle.marginBottom, window.innerHeight + 'px');
+  assert_equals(targetComputedStyle.marginLeft, leftOffset + 'px');
+  assert_equals(targetComputedStyle.width, displayFeatureLength + 'px');
+  assert_equals(targetComputedStyle.height, window.innerHeight + 'px');
+  assert_equals(targetComputedStyle.opacity, '0.2');
+
+
+  const verticalViewportSegmentsMQL = window.matchMedia('(vertical-viewport-segments: 2)');
+  promise = new Promise(resolve => {
+    verticalViewportSegmentsMQL.addEventListener(
+      'change',
+      () => { resolve(verticalViewportSegmentsMQL.matches); },
+      { once: true }
+    );
+  });
+  const topOffset =
+    Math.round(window.innerHeight / 2 - displayFeatureLength / 2);
+  await test_driver.set_display_features([{
+    orientation: 'horizontal',
+    maskLength: displayFeatureLength,
+    offset: topOffset
+  }]);
+  assert_true(await promise);
+  assert_equals(targetComputedStyle.marginTop, topOffset + 'px');
+  assert_equals(targetComputedStyle.marginRight, window.innerWidth + 'px');
+  assert_equals(targetComputedStyle.marginBottom,
+    Math.round(window.innerHeight / 2 + displayFeatureLength / 2) + 'px');
+  assert_equals(targetComputedStyle.marginLeft, '0px');
+  assert_equals(targetComputedStyle.width, window.innerWidth + 'px');
+  assert_equals(targetComputedStyle.height, displayFeatureLength + 'px');
+  assert_equals(targetComputedStyle.opacity, '0.3');
+
+  const oneSegmentMQL = window.matchMedia('(vertical-viewport-segments: 1)');
+  promise = new Promise(resolve => {
+    oneSegmentMQL.addEventListener(
+      'change',
+      () => { resolve(oneSegmentMQL.matches); },
+      { once: true }
+    );
+  });
+  await test_driver.clear_display_features();
+  assert_true(await promise);
+  assert_equals(targetComputedStyle.marginTop, '1px');
+  assert_equals(targetComputedStyle.marginRight,'1px');
+  assert_equals(targetComputedStyle.marginBottom,'1px');
+  assert_equals(targetComputedStyle.marginLeft, '1px');
+  assert_equals(targetComputedStyle.width, '1px');
+  assert_equals(targetComputedStyle.height, '1px');
+  assert_equals(targetComputedStyle.opacity, '0.1');
+
+}, 'Tests the Viewport Segments Media Query change event handler.');
+</script>
+</html>
diff --git a/tests/wpt/tests/viewport-segments/viewport-segments-segments-property.https.html b/tests/wpt/tests/viewport-segments/viewport-segments-segments-property.https.html
new file mode 100644
index 00000000000..653e2bcb253
--- /dev/null
+++ b/tests/wpt/tests/viewport-segments/viewport-segments-segments-property.https.html
@@ -0,0 +1,114 @@
+<!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>
+</head>
+<body>
+<iframe src="about:blank"></iframe>
+</body>
+<script>
+'use strict';
+
+promise_test(async (t) => {
+  t.add_cleanup(async () => {
+    await test_driver.clear_display_features();
+  });
+
+  // When the viewport is not divided the segments property should return an
+  // array with one segment, the size of the viewport.
+  assert_equals(viewport.segments.length, 1);
+  let segment = viewport.segments[0];
+  assert_equals(segment.x, 0);
+  assert_equals(segment.y, 0);
+  assert_equals(segment.width, window.innerWidth);
+  assert_equals(segment.height,  window.innerHeight);
+  // iframes do not receive segments information.
+  assert_equals(window.frames[0].viewport.segments, null);
+
+  const displayFeatureLength = 10;
+  const horizontalViewportSegmentsMQL = window.matchMedia('(horizontal-viewport-segments: 2)');
+  let promise = new Promise(resolve => {
+    horizontalViewportSegmentsMQL.addEventListener(
+      'change',
+      () => { resolve(horizontalViewportSegmentsMQL.matches); },
+      { once: true }
+    );
+  });
+  const leftOffset =
+    Math.round(window.innerWidth / 2 - displayFeatureLength / 2);
+  await test_driver.set_display_features([{
+    orientation: 'vertical',
+    maskLength: displayFeatureLength,
+    offset: leftOffset
+  }]);
+  assert_true(await promise);
+  assert_equals(viewport.segments.length, 2);
+  const segmentLeft = viewport.segments[0];
+  const epsilon = 1;
+  assert_equals(segmentLeft.x, 0);
+  assert_equals(segmentLeft.y, 0);
+  assert_approx_equals(segmentLeft.width, leftOffset, epsilon);
+  assert_equals(segmentLeft.height,  window.innerHeight);
+  const segmentRight = viewport.segments[1];
+  assert_approx_equals(segmentRight.x,
+    Math.round(window.innerWidth / 2 + displayFeatureLength / 2), epsilon);
+  assert_equals(segmentRight.y, 0);
+  assert_approx_equals(segmentRight.width, leftOffset, epsilon);
+  assert_equals(segmentRight.height,  window.innerHeight);
+  // iframes do not receive segments information.
+  assert_equals(window.frames[0].viewport.segments, null);
+
+
+  const verticalViewportSegmentsMQL = window.matchMedia('(vertical-viewport-segments: 2)');
+  promise = new Promise(resolve => {
+    verticalViewportSegmentsMQL.addEventListener(
+      'change',
+      () => { resolve(verticalViewportSegmentsMQL.matches); },
+      { once: true }
+    );
+  });
+  const topOffset =
+    Math.round(window.innerHeight / 2 - displayFeatureLength / 2);
+  await test_driver.set_display_features([{
+    orientation: 'horizontal',
+    maskLength: displayFeatureLength,
+    offset: topOffset
+  }]);
+  assert_true(await promise);
+  assert_equals(viewport.segments.length, 2);
+  const segmentTop = viewport.segments[0];
+  assert_equals(segmentTop.x, 0);
+  assert_equals(segmentTop.y, 0);
+  assert_equals(segmentTop.width, window.innerWidth);
+  assert_approx_equals(segmentTop.height, topOffset, epsilon);
+  const segmentBottom = viewport.segments[1];
+  assert_equals(segmentBottom.x, 0);
+  assert_approx_equals(segmentBottom.y,
+    Math.round(window.innerHeight / 2 + displayFeatureLength / 2), epsilon);
+  assert_equals(segmentBottom.width, window.innerWidth);
+  assert_approx_equals(segmentBottom.height,  topOffset, epsilon);
+  // iframes do not receive segments information.
+  assert_equals(window.frames[0].viewport.segments, null);
+
+  const oneSegmentMQL = window.matchMedia('(vertical-viewport-segments: 1)');
+  promise = new Promise(resolve => {
+    oneSegmentMQL.addEventListener(
+      'change',
+      () => { resolve(oneSegmentMQL.matches); },
+      { once: true }
+    );
+  });
+  await test_driver.clear_display_features();
+  assert_true(await promise);
+  segment = viewport.segments[0];
+  assert_equals(segment.x, 0);
+  assert_equals(segment.y, 0);
+  assert_equals(segment.width, window.innerWidth);
+  assert_equals(segment.height,  window.innerHeight);
+  // iframes do not receive segments information.
+  assert_equals(window.frames[0].viewport.segments, null);
+
+}, 'Tests the Viewport Segments Media Query change event handler.');
+</script>
+</html>
diff --git a/tests/wpt/tests/viewport/viewport-segments.html b/tests/wpt/tests/viewport/viewport-segments.html
index 64f0eb9caef..cd24f2bd230 100644
--- a/tests/wpt/tests/viewport/viewport-segments.html
+++ b/tests/wpt/tests/viewport/viewport-segments.html
@@ -9,6 +9,9 @@
 
 test(() => {
   assert_true('segments' in viewport, "`segments` must be a property of viewport.");
-  assert_equals(viewport.segments, null, "For a viewport not segmented, no segments must be exposed.");
+  assert_equals(viewport.segments[0].innerWidth, viewport.innerWidth,
+    "For a viewport not segmented, there should only one segment with the viewport size.");
+    assert_equals(viewport.segments[0].innerHeight, viewport.innerHeight,
+    "For a viewport not segmented, there should only one segment with the viewport size.");
 });
 </script>
diff --git a/tests/wpt/tests/wai-aria/scripts/ATTAcomm.js b/tests/wpt/tests/wai-aria/scripts/ATTAcomm.js
index b748233fc22..61ce6e5e6f1 100644
--- a/tests/wpt/tests/wai-aria/scripts/ATTAcomm.js
+++ b/tests/wpt/tests/wai-aria/scripts/ATTAcomm.js
@@ -192,7 +192,7 @@ ATTAcomm.prototype = {
 
         /* Loop strategy...
          *
-         * If the the step is a 'test' then push it into the pending queue as a promise
+         * If the step is a 'test' then push it into the pending queue as a promise
          *
          * If the step is anything else, then if there is anything in pending, wait on it
          * Once it resolves, clear the queue and then execute the other step.
diff --git a/tests/wpt/tests/wasm/core/js/harness/testharness.js b/tests/wpt/tests/wasm/core/js/harness/testharness.js
index fdd87e8fc2a..7c1ded21d0e 100644
--- a/tests/wpt/tests/wasm/core/js/harness/testharness.js
+++ b/tests/wpt/tests/wasm/core/js/harness/testharness.js
@@ -132,7 +132,7 @@ policies and contribution forms [3].
     };
 
     WindowTestEnvironment.prototype._forEach_windows = function(callback) {
-        // Iterate of the the windows [self ... top, opener]. The callback is passed
+        // Iterate of the windows [self ... top, opener]. The callback is passed
         // two objects, the first one is the windows object itself, the second one
         // is a boolean indicating whether or not its on the same origin as the
         // current window.
diff --git a/tests/wpt/tests/wasm/core/js/simd/simd_select.wast.js b/tests/wpt/tests/wasm/core/js/simd/simd_select.wast.js
new file mode 100644
index 00000000000..e997d81f75a
--- /dev/null
+++ b/tests/wpt/tests/wasm/core/js/simd/simd_select.wast.js
@@ -0,0 +1,24 @@
+(function simd_select_wast_js() {
+
+// simd_select.wast:3
+let $1 = instance("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x88\x80\x80\x80\x00\x01\x60\x03\x7b\x7b\x7f\x01\x7b\x03\x82\x80\x80\x80\x00\x01\x00\x07\x93\x80\x80\x80\x00\x01\x0f\x73\x65\x6c\x65\x63\x74\x5f\x76\x31\x32\x38\x5f\x69\x33\x32\x00\x00\x0a\x8f\x80\x80\x80\x00\x01\x89\x80\x80\x80\x00\x00\x20\x00\x20\x01\x20\x02\x1b\x0b");
+
+// simd_select.wast:9
+run(() => call(instance("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\xa6\x80\x80\x80\x00\x07\x60\x00\x00\x60\x01\x7f\x01\x6f\x60\x01\x6f\x01\x7f\x60\x01\x70\x01\x7f\x60\x02\x6f\x6f\x01\x7f\x60\x02\x70\x70\x01\x7f\x60\x03\x7b\x7b\x7f\x01\x7b\x02\x8b\x81\x80\x80\x00\x06\x06\x6d\x6f\x64\x75\x6c\x65\x0f\x73\x65\x6c\x65\x63\x74\x5f\x76\x31\x32\x38\x5f\x69\x33\x32\x00\x06\x08\x73\x70\x65\x63\x74\x65\x73\x74\x09\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x01\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0c\x69\x73\x5f\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x02\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0a\x69\x73\x5f\x66\x75\x6e\x63\x72\x65\x66\x00\x03\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0c\x65\x71\x5f\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x04\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0a\x65\x71\x5f\x66\x75\x6e\x63\x72\x65\x66\x00\x05\x03\x82\x80\x80\x80\x00\x01\x00\x07\x87\x80\x80\x80\x00\x01\x03\x72\x75\x6e\x00\x06\x0a\xe2\x80\x80\x80\x00\x01\xdc\x80\x80\x80\x00\x00\x02\x40\xfd\x0c\x01\x00\x00\x00\x02\x00\x00\x00\x03\x00\x00\x00\x04\x00\x00\x00\xfd\x0c\x05\x00\x00\x00\x06\x00\x00\x00\x07\x00\x00\x00\x08\x00\x00\x00\x41\x01\x10\x00\xfd\x0c\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfd\x4e\xfd\x0c\x01\x00\x00\x00\x02\x00\x00\x00\x03\x00\x00\x00\x04\x00\x00\x00\xfd\x23\xfd\x63\x45\x0d\x00\x0f\x0b\x00\x0b", exports($1)),  "run", []));  // assert_return(() => call($1, "select_v128_i32", [v128("1 2 3 4"), v128("5 6 7 8"), 1]), v128("1 2 3 4"))
+
+// simd_select.wast:18
+run(() => call(instance("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\xa6\x80\x80\x80\x00\x07\x60\x00\x00\x60\x01\x7f\x01\x6f\x60\x01\x6f\x01\x7f\x60\x01\x70\x01\x7f\x60\x02\x6f\x6f\x01\x7f\x60\x02\x70\x70\x01\x7f\x60\x03\x7b\x7b\x7f\x01\x7b\x02\x8b\x81\x80\x80\x00\x06\x06\x6d\x6f\x64\x75\x6c\x65\x0f\x73\x65\x6c\x65\x63\x74\x5f\x76\x31\x32\x38\x5f\x69\x33\x32\x00\x06\x08\x73\x70\x65\x63\x74\x65\x73\x74\x09\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x01\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0c\x69\x73\x5f\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x02\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0a\x69\x73\x5f\x66\x75\x6e\x63\x72\x65\x66\x00\x03\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0c\x65\x71\x5f\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x04\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0a\x65\x71\x5f\x66\x75\x6e\x63\x72\x65\x66\x00\x05\x03\x82\x80\x80\x80\x00\x01\x00\x07\x87\x80\x80\x80\x00\x01\x03\x72\x75\x6e\x00\x06\x0a\xe2\x80\x80\x80\x00\x01\xdc\x80\x80\x80\x00\x00\x02\x40\xfd\x0c\x01\x00\x00\x00\x02\x00\x00\x00\x03\x00\x00\x00\x04\x00\x00\x00\xfd\x0c\x05\x00\x00\x00\x06\x00\x00\x00\x07\x00\x00\x00\x08\x00\x00\x00\x41\x00\x10\x00\xfd\x0c\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfd\x4e\xfd\x0c\x05\x00\x00\x00\x06\x00\x00\x00\x07\x00\x00\x00\x08\x00\x00\x00\xfd\x23\xfd\x63\x45\x0d\x00\x0f\x0b\x00\x0b", exports($1)),  "run", []));  // assert_return(() => call($1, "select_v128_i32", [v128("1 2 3 4"), v128("5 6 7 8"), 0]), v128("5 6 7 8"))
+
+// simd_select.wast:27
+run(() => call(instance("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\xa6\x80\x80\x80\x00\x07\x60\x00\x00\x60\x01\x7f\x01\x6f\x60\x01\x6f\x01\x7f\x60\x01\x70\x01\x7f\x60\x02\x6f\x6f\x01\x7f\x60\x02\x70\x70\x01\x7f\x60\x03\x7b\x7b\x7f\x01\x7b\x02\x8b\x81\x80\x80\x00\x06\x06\x6d\x6f\x64\x75\x6c\x65\x0f\x73\x65\x6c\x65\x63\x74\x5f\x76\x31\x32\x38\x5f\x69\x33\x32\x00\x06\x08\x73\x70\x65\x63\x74\x65\x73\x74\x09\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x01\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0c\x69\x73\x5f\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x02\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0a\x69\x73\x5f\x66\x75\x6e\x63\x72\x65\x66\x00\x03\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0c\x65\x71\x5f\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x04\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0a\x65\x71\x5f\x66\x75\x6e\x63\x72\x65\x66\x00\x05\x03\x82\x80\x80\x80\x00\x01\x00\x07\x87\x80\x80\x80\x00\x01\x03\x72\x75\x6e\x00\x06\x0a\xe2\x80\x80\x80\x00\x01\xdc\x80\x80\x80\x00\x00\x02\x40\xfd\x0c\x00\x00\x80\x3f\x00\x00\x00\x40\x00\x00\x40\x40\x00\x00\x80\x40\xfd\x0c\x00\x00\xa0\x40\x00\x00\xc0\x40\x00\x00\xe0\x40\x00\x00\x00\x41\x41\x7f\x10\x00\xfd\x0c\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfd\x4e\xfd\x0c\x00\x00\x80\x3f\x00\x00\x00\x40\x00\x00\x40\x40\x00\x00\x80\x40\xfd\x23\xfd\x63\x45\x0d\x00\x0f\x0b\x00\x0b", exports($1)),  "run", []));  // assert_return(() => call($1, "select_v128_i32", [v128("1_065_353_216 1_073_741_824 1_077_936_128 1_082_130_432"), v128("1_084_227_584 1_086_324_736 1_088_421_888 1_090_519_040"), -1]), v128("1. 2. 3. 4."))
+
+// simd_select.wast:36
+run(() => call(instance("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\xa6\x80\x80\x80\x00\x07\x60\x00\x00\x60\x01\x7f\x01\x6f\x60\x01\x6f\x01\x7f\x60\x01\x70\x01\x7f\x60\x02\x6f\x6f\x01\x7f\x60\x02\x70\x70\x01\x7f\x60\x03\x7b\x7b\x7f\x01\x7b\x02\x8b\x81\x80\x80\x00\x06\x06\x6d\x6f\x64\x75\x6c\x65\x0f\x73\x65\x6c\x65\x63\x74\x5f\x76\x31\x32\x38\x5f\x69\x33\x32\x00\x06\x08\x73\x70\x65\x63\x74\x65\x73\x74\x09\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x01\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0c\x69\x73\x5f\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x02\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0a\x69\x73\x5f\x66\x75\x6e\x63\x72\x65\x66\x00\x03\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0c\x65\x71\x5f\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x04\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0a\x65\x71\x5f\x66\x75\x6e\x63\x72\x65\x66\x00\x05\x03\x82\x80\x80\x80\x00\x01\x00\x07\x87\x80\x80\x80\x00\x01\x03\x72\x75\x6e\x00\x06\x0a\xe2\x80\x80\x80\x00\x01\xdc\x80\x80\x80\x00\x00\x02\x40\xfd\x0c\x00\x00\xc0\xbf\x00\x00\x20\xc0\x00\x00\x60\xc0\x00\x00\x90\xc0\xfd\x0c\x00\x00\x18\x41\x00\x00\x08\x41\x00\x00\xf0\x40\x00\x00\xd0\x40\x41\x00\x10\x00\xfd\x0c\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfd\x4e\xfd\x0c\x00\x00\x18\x41\x00\x00\x08\x41\x00\x00\xf0\x40\x00\x00\xd0\x40\xfd\x23\xfd\x63\x45\x0d\x00\x0f\x0b\x00\x0b", exports($1)),  "run", []));  // assert_return(() => call($1, "select_v128_i32", [v128("-1_077_936_128 -1_071_644_672 -1_067_450_368 -1_064_304_640"), v128("1_092_091_904 1_091_043_328 1_089_470_464 1_087_373_312"), 0]), v128("9.5 8.5 7.5 6.5"))
+
+// simd_select.wast:45
+run(() => call(instance("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\xa6\x80\x80\x80\x00\x07\x60\x00\x00\x60\x01\x7f\x01\x6f\x60\x01\x6f\x01\x7f\x60\x01\x70\x01\x7f\x60\x02\x6f\x6f\x01\x7f\x60\x02\x70\x70\x01\x7f\x60\x03\x7b\x7b\x7f\x01\x7b\x02\x8b\x81\x80\x80\x00\x06\x06\x6d\x6f\x64\x75\x6c\x65\x0f\x73\x65\x6c\x65\x63\x74\x5f\x76\x31\x32\x38\x5f\x69\x33\x32\x00\x06\x08\x73\x70\x65\x63\x74\x65\x73\x74\x09\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x01\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0c\x69\x73\x5f\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x02\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0a\x69\x73\x5f\x66\x75\x6e\x63\x72\x65\x66\x00\x03\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0c\x65\x71\x5f\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x04\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0a\x65\x71\x5f\x66\x75\x6e\x63\x72\x65\x66\x00\x05\x03\x82\x80\x80\x80\x00\x01\x00\x07\x87\x80\x80\x80\x00\x01\x03\x72\x75\x6e\x00\x06\x0a\xe3\x80\x80\x80\x00\x01\xdd\x80\x80\x80\x00\x00\x02\x40\xfd\x0c\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\xfd\x0c\x10\x0f\x0e\x0d\x0c\x0b\x0a\x09\x08\x07\x06\x05\x04\x03\x02\x01\x41\xfb\x00\x10\x00\xfd\x0c\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfd\x4e\xfd\x0c\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\xfd\x23\xfd\x63\x45\x0d\x00\x0f\x0b\x00\x0b", exports($1)),  "run", []));  // assert_return(() => call($1, "select_v128_i32", [v128("67_305_985 134_678_021 202_050_057 269_422_093"), v128("219_025_168 151_653_132 84_281_096 16_909_060"), 123]), v128("1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16"))
+
+// simd_select.wast:54
+run(() => call(instance("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\xa6\x80\x80\x80\x00\x07\x60\x00\x00\x60\x01\x7f\x01\x6f\x60\x01\x6f\x01\x7f\x60\x01\x70\x01\x7f\x60\x02\x6f\x6f\x01\x7f\x60\x02\x70\x70\x01\x7f\x60\x03\x7b\x7b\x7f\x01\x7b\x02\x8b\x81\x80\x80\x00\x06\x06\x6d\x6f\x64\x75\x6c\x65\x0f\x73\x65\x6c\x65\x63\x74\x5f\x76\x31\x32\x38\x5f\x69\x33\x32\x00\x06\x08\x73\x70\x65\x63\x74\x65\x73\x74\x09\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x01\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0c\x69\x73\x5f\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x02\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0a\x69\x73\x5f\x66\x75\x6e\x63\x72\x65\x66\x00\x03\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0c\x65\x71\x5f\x65\x78\x74\x65\x72\x6e\x72\x65\x66\x00\x04\x08\x73\x70\x65\x63\x74\x65\x73\x74\x0a\x65\x71\x5f\x66\x75\x6e\x63\x72\x65\x66\x00\x05\x03\x82\x80\x80\x80\x00\x01\x00\x07\x87\x80\x80\x80\x00\x01\x03\x72\x75\x6e\x00\x06\x0a\xe2\x80\x80\x80\x00\x01\xdc\x80\x80\x80\x00\x00\x02\x40\xfd\x0c\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xfd\x0c\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x41\x00\x10\x00\xfd\x0c\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfd\x4e\xfd\x0c\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x23\xfd\x63\x45\x0d\x00\x0f\x0b\x00\x0b", exports($1)),  "run", []));  // assert_return(() => call($1, "select_v128_i32", [v128("16_843_009 16_843_009 16_843_009 16_843_009"), v128("0 0 0 0"), 0]), v128("0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0"))
+reinitializeRegistry();
+})();
diff --git a/tests/wpt/tests/wasm/core/simd/simd_select.wast.js.html b/tests/wpt/tests/wasm/core/simd/simd_select.wast.js.html
new file mode 100644
index 00000000000..5d50138374b
--- /dev/null
+++ b/tests/wpt/tests/wasm/core/simd/simd_select.wast.js.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html>
+    <head>
+        <meta charset="UTF-8">
+        <title>WebAssembly Web Platform Test</title>
+    </head>
+    <body>
+
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="../js/harness/async_index.js"></script>
+
+        <div id=log></div>
+        <script src="../js/simd/simd_select.wast.js"></script>
+    </body>
+</html>
diff --git a/tests/wpt/tests/web-animations/README.md b/tests/wpt/tests/web-animations/README.md
index c41e0e048ef..7526978c1f8 100644
--- a/tests/wpt/tests/web-animations/README.md
+++ b/tests/wpt/tests/web-animations/README.md
@@ -92,7 +92,7 @@ Guidelines for writing tests
     the test should be at least 100s in length.
 
 *   Avoid using `GLOBAL_CONSTS` that make the test harder to read.
-    It's fine to repeat the the same parameter values like `100 * MS_PER_SEC`
+    It's fine to repeat the same parameter values like `100 * MS_PER_SEC`
     over and over again since it makes it easy to read and debug a test in
     isolation.
     Remember, even if we do need to make all tests take, say 200s each, text
diff --git a/tests/wpt/tests/web-animations/animation-model/animation-types/property-list.js b/tests/wpt/tests/web-animations/animation-model/animation-types/property-list.js
index f31ee8e4ccf..21f39b1fc18 100644
--- a/tests/wpt/tests/web-animations/animation-model/animation-types/property-list.js
+++ b/tests/wpt/tests/web-animations/animation-model/animation-types/property-list.js
@@ -25,6 +25,12 @@ const gCSSProperties1 = {
       { type: 'discrete', options: [ [ 'flex-start', 'flex-end' ] ] }
     ]
   },
+  'anchor-name': {
+    // https://drafts.csswg.org/css-anchor-position-1/#name
+    types: [
+      { type: 'discrete', options: [ [ 'none', '--anchor' ] ] }
+    ]
+  },
   'anchor-scope': {
     // https://drafts.csswg.org/css-anchor-position-1/#anchor-scope
     types: [
@@ -439,6 +445,12 @@ const gCSSProperties1 = {
       { type: 'discrete', options: [ [ 'auto', 'balance' ] ] }
     ]
   },
+  'column-wrap': {
+    // https://drafts.csswg.org/css-multicol-2/#cwr
+    types: [
+      { type: 'discrete', options: [ [ 'nowrap', 'wrap' ] ] }
+    ]
+  },
   'column-rule-style': {
     // https://drafts.csswg.org/css-multicol/#propdef-column-rule-style
     types: [
@@ -460,6 +472,12 @@ const gCSSProperties1 = {
       { type: 'discrete', options: [ [ 'auto', '1px' ] ] }
     ]
   },
+  'column-height': {
+    // https://drafts.csswg.org/css-multicol-2/#ch
+    types: [ 'length',
+      { type: 'discrete', options: [ [ 'auto', '1px' ] ] }
+    ]
+  },
   'counter-increment': {
     // https://drafts.csswg.org/css-lists-3/#propdef-counter-increment
     types: [
@@ -1267,6 +1285,30 @@ const gCSSProperties2 = {
       { type: 'discrete', options: [ [ 'absolute', 'fixed' ] ] }
     ]
   },
+  'position-anchor': {
+    // https://drafts.csswg.org/css-anchor-position-1/#position-anchor
+    types: [
+      { type: 'discrete', options: [ [ 'auto', '--anchor' ] ] }
+    ]
+  },
+  'position-visibility': {
+    // https://drafts.csswg.org/css-anchor-position-1/#position-visibility
+    types: [
+      { type: 'discrete', options: [ [ 'always', 'anchors-valid' ] ] }
+    ]
+  },
+  'position-try-fallbacks': {
+    // https://drafts.csswg.org/css-anchor-position-1/#position-try-fallbacks
+    types: [
+      { type: 'discrete', options: [ [ 'none', 'flip-block' ] ] }
+    ]
+  },
+  'position-try-order': {
+    // https://drafts.csswg.org/css-anchor-position-1/#position-try-order-property
+    types: [
+      { type: 'discrete', options: [ [ 'normal', 'most-width' ] ] }
+    ]
+  },
   'quotes': {
     // https://drafts.csswg.org/css-content-3/#propdef-quotes
     types: [
diff --git a/tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-context-filling.html b/tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-context-filling.html
index fcb7f131266..499a779b87f 100644
--- a/tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-context-filling.html
+++ b/tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-context-filling.html
@@ -134,7 +134,7 @@ test(t => {
     '300px',
     'Effect value after updating the animation'
   );
-}, 'Filling effect values reflect changes to the the animation\'s keyframes');
+}, 'Filling effect values reflect changes to the animation\'s keyframes');
 
 test(t => {
   const div = createDiv(t);
@@ -157,7 +157,7 @@ test(t => {
     '300px',
     'Effect value after updating the composite mode'
   );
-}, 'Filling effect values reflect changes to the the animation\'s composite mode');
+}, 'Filling effect values reflect changes to the animation\'s composite mode');
 
 test(t => {
   const div = createDiv(t);
@@ -179,7 +179,7 @@ test(t => {
     '200px',
     'Effect value after updating the iteration composite mode'
   );
-}, 'Filling effect values reflect changes to the the animation\'s iteration composite mode');
+}, 'Filling effect values reflect changes to the animation\'s iteration composite mode');
 
 test(t => {
   const div = createDiv(t);
diff --git a/tests/wpt/tests/web-animations/crashtests/sibling-index-offset-crash.html b/tests/wpt/tests/web-animations/crashtests/sibling-index-offset-crash.html
new file mode 100644
index 00000000000..812a7952738
--- /dev/null
+++ b/tests/wpt/tests/web-animations/crashtests/sibling-index-offset-crash.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<link rel="help" href="https://crbug.com/414645284">
+<div id="target"></div>
+<script>
+  target.animate([
+    { offset: "calc(20% * sibling-index())" },
+  ], 2000);
+</script>
diff --git a/tests/wpt/tests/web-animations/interfaces/Animation/commitStyles.html b/tests/wpt/tests/web-animations/interfaces/Animation/commitStyles.html
index 9a7dbea8b86..26c8342e6f2 100644
--- a/tests/wpt/tests/web-animations/interfaces/Animation/commitStyles.html
+++ b/tests/wpt/tests/web-animations/interfaces/Animation/commitStyles.html
@@ -24,431 +24,31 @@ function assert_numeric_style_equals(opacity, expected, description) {
   );
 }
 
-test(t => {
-  const div = createDiv(t);
-  div.style.opacity = '0.1';
-
-  const animation = div.animate(
-    { opacity: 0.2 },
-    { duration: 1, fill: 'forwards' }
-  );
-  animation.finish();
-
-  animation.commitStyles();
-
-  // Cancel the animation so we can inspect the underlying style
-  animation.cancel();
-
-  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.2);
-}, 'Commits styles');
+// -------------------------
+// Tests covering elements not capable of having a style attribute
+// --------------------
 
 test(t => {
-  const div = createDiv(t);
-  div.style.translate = '100px';
-  div.style.rotate = '45deg';
-  div.style.scale = '2';
-
-  const animation = div.animate(
-    { translate: '200px',
-      rotate: '90deg',
-      scale: 3 },
-    { duration: 1, fill: 'forwards' }
-  );
-  animation.finish();
-
-  animation.commitStyles();
-
-  // Cancel the animation so we can inspect the underlying style
-  animation.cancel();
-
-  assert_equals(getComputedStyle(div).translate, '200px');
-  assert_equals(getComputedStyle(div).rotate, '90deg');
-  assert_numeric_style_equals(getComputedStyle(div).scale, 3);
-}, 'Commits styles for individual transform properties');
-
-promise_test(async t => {
-  const div = createDiv(t);
-  div.style.opacity = '0.1';
-
-  const animA = div.animate(
-    { opacity: 0.2 },
-    { duration: 1, fill: 'forwards' }
-  );
-  const animB = div.animate(
-    { opacity: 0.3 },
+  const animation = createDiv(t).animate(
+    { opacity: 0 },
     { duration: 1, fill: 'forwards' }
   );
 
-  await animA.finished;
-
-  animB.cancel();
-
-  animA.commitStyles();
-
-  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.2);
-}, 'Commits styles for an animation that has been removed');
-
-test(t => {
-  const div = createDiv(t);
-  div.style.margin = '10px';
-
-  const animation = div.animate(
-    { margin: '20px' },
-    { duration: 1, fill: 'forwards' }
+  const nonStyleElement = document.createElementNS(
+    'http://example.org/test',
+    'test'
   );
-  animation.finish();
+  document.body.appendChild(nonStyleElement);
+  animation.effect.target = nonStyleElement;
 
-  animation.commitStyles();
-
-  animation.cancel();
-
-  assert_equals(div.style.marginLeft, '20px');
-}, 'Commits shorthand styles');
-
-test(t => {
-  const div = createDiv(t);
-  div.style.marginLeft = '10px';
-
-  const animation = div.animate(
-    { marginInlineStart: '20px' },
-    { duration: 1, fill: 'forwards' }
-  );
-  animation.finish();
-
-  animation.commitStyles();
-
-  animation.cancel();
-
-  assert_equals(getComputedStyle(div).marginLeft, '20px');
-}, 'Commits logical properties');
-
-test(t => {
-  const div = createDiv(t);
-  div.style.marginLeft = '10px';
-
-  const animation = div.animate(
-    { marginInlineStart: '20px' },
-    { duration: 1, fill: 'forwards' }
-  );
-  animation.finish();
-
-  animation.commitStyles();
-
-  animation.cancel();
-
-  assert_equals(div.style.marginLeft, '20px');
-}, 'Commits logical properties as physical properties');
-
-test(t => {
-  const div = createDiv(t);
-  div.style.marginLeft = '10px';
-
-  const animation = div.animate({ opacity: [0.2, 0.7] }, 1000);
-  animation.currentTime = 500;
-  animation.commitStyles();
-  animation.cancel();
-
-  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.45);
-}, 'Commits values calculated mid-interval');
-
-test(t => {
-  const div = createDiv(t);
-  div.style.setProperty('--target', '0.5');
-
-  const animation = div.animate(
-    { opacity: 'var(--target)' },
-    { duration: 1, fill: 'forwards' }
-  );
-  animation.finish();
-  animation.commitStyles();
-  animation.cancel();
-
-  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.5);
-
-  // Changes to the variable should have no effect
-  div.style.setProperty('--target', '1');
-
-  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.5);
-}, 'Commits variable references as their computed values');
-
-
-test(t => {
-  const div = createDiv(t);
-  div.style.setProperty('--target', '0.5');
-  div.style.opacity = 'var(--target)';
-  const animation = div.animate(
-    { '--target': 0.8 },
-    { duration: 1, fill: 'forwards' }
-  );
-  animation.finish();
-  animation.commitStyles();
-  animation.cancel();
-
-  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.8);
-}, 'Commits custom variables');
-
-test(t => {
-  const div = createDiv(t);
-  div.style.fontSize = '10px';
-
-  const animation = div.animate(
-    { width: '10em' },
-    { duration: 1, fill: 'forwards' }
-  );
-  animation.finish();
-  animation.commitStyles();
-  animation.cancel();
-
-  assert_numeric_style_equals(getComputedStyle(div).width, 100);
-
-  div.style.fontSize = '20px';
-  assert_numeric_style_equals(getComputedStyle(div).width, 100,
-      "Changes to the font-size should have no effect");
-}, 'Commits em units as pixel values');
-
-test(t => {
-  const div = createDiv(t);
-  div.style.fontSize = '10px';
-
-  const animation = div.animate(
-    { lineHeight: '1.5' },
-    { duration: 1, fill: 'forwards' }
-  );
-  animation.finish();
-  animation.commitStyles();
-  animation.cancel();
-
-  assert_numeric_style_equals(getComputedStyle(div).lineHeight, 15);
-  assert_equals(div.style.lineHeight, "1.5", "line-height is committed as a relative value");
-
-  div.style.fontSize = '20px';
-  assert_numeric_style_equals(getComputedStyle(div).lineHeight, 30,
-      "Changes to the font-size should affect the committed line-height");
-
-}, 'Commits relative line-height');
-
-test(t => {
-  const div = createDiv(t);
-  const animation = div.animate(
-    { transform: 'translate(20px, 20px)' },
-    { duration: 1, fill: 'forwards' }
-  );
-  animation.finish();
-  animation.commitStyles();
-  animation.cancel();
-  assert_equals(getComputedStyle(div).transform, 'matrix(1, 0, 0, 1, 20, 20)');
-}, 'Commits transforms');
-
-test(t => {
-  const div = createDiv(t);
-  const animation = div.animate(
-    { transform: 'translate(20px, 20px)' },
-    { duration: 1, fill: 'forwards' }
-  );
-  animation.finish();
-  animation.commitStyles();
-  animation.cancel();
-  assert_equals(div.style.transform, 'translate(20px, 20px)');
-}, 'Commits transforms as a transform list');
-
-test(t => {
-  const div = createDiv(t);
-  div.style.width = '200px';
-  div.style.height = '200px';
-
-  const animation = div.animate({ transform: ["translate(100%, 0%)", "scale(3)"] }, 1000);
-  animation.currentTime = 500;
-  animation.commitStyles();
-  animation.cancel();
-
-  // TODO(https://github.com/w3c/csswg-drafts/issues/2854):
-  // We can't check the committed value directly since it is not specced yet in this case,
-  // but it should still produce the correct resolved value.
-  assert_equals(getComputedStyle(div).transform, "matrix(2, 0, 0, 2, 100, 0)",
-      "Resolved transform is correct after commit.");
-}, 'Commits matrix-interpolated relative transforms');
-
-test(t => {
-  const div = createDiv(t);
-  div.style.width = '200px';
-  div.style.height = '200px';
-
-  const animation = div.animate({ transform: ["none", "none"] }, 1000);
-  animation.currentTime = 500;
-  animation.commitStyles();
-  animation.cancel();
-
-  assert_equals(div.style.transform, "none",
-      "Resolved transform is correct after commit.");
-}, 'Commits "none" transform');
-
-promise_test(async t => {
-  const div = createDiv(t);
-  div.style.opacity = '0.1';
-
-  const animA = div.animate(
-    { opacity: '0.2' },
-    { duration: 1, fill: 'forwards' }
-  );
-  const animB = div.animate(
-    { opacity: '0.2', composite: 'add' },
-    { duration: 1, fill: 'forwards' }
-  );
-  const animC = div.animate(
-    { opacity: '0.3', composite: 'add' },
-    { duration: 1, fill: 'forwards' }
-  );
-
-  animA.persist();
-  animB.persist();
-
-  await animB.finished;
-
-  // The values above have been chosen such that various error conditions
-  // produce results that all differ from the desired result:
-  //
-  //  Expected result:
-  //
-  //    animA + animB = 0.4
-  //
-  //  Likely error results:
-  //
-  //    <underlying> = 0.1
-  //    (Commit didn't work at all)
-  //
-  //    animB = 0.2
-  //    (Didn't add at all when resolving)
-  //
-  //    <underlying> + animB = 0.3
-  //    (Added to the underlying value instead of lower-priority animations when
-  //    resolving)
-  //
-  //    <underlying> + animA + animB = 0.5
-  //    (Didn't respect the composite mode of lower-priority animations)
-  //
-  //    animA + animB + animC = 0.7
-  //    (Resolved the whole stack, not just up to the target effect)
-  //
-
-  animB.commitStyles();
-
-  animA.cancel();
-  animB.cancel();
-  animC.cancel();
-
-  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.4);
-}, 'Commits the intermediate value of an animation in the middle of stack');
-
-promise_test(async t => {
-  const div = createDiv(t);
-  div.style.opacity = '0.1';
-
-  const animA = div.animate(
-    { opacity: '0.2', composite: 'add' },
-    { duration: 1, fill: 'forwards' }
-  );
-  const animB = div.animate(
-    { opacity: '0.2', composite: 'add' },
-    { duration: 1, fill: 'forwards' }
-  );
-  const animC = div.animate(
-    { opacity: '0.3', composite: 'add' },
-    { duration: 1, fill: 'forwards' }
-  );
-
-  animA.persist();
-  animB.persist();
-  await animB.finished;
-
-  // The error cases are similar to the above test with one additional case;
-  // verifying that the animations composite on top of the correct underlying
-  // base style.
-  //
-  //  Expected result:
-  //
-  //  <underlying> + animA + animB = 0.5
-  //
-  //  Additional error results:
-  //
-  //    <underlying> + animA + animB + animC + animA + animB = 1.0 (saturates)
-  //    (Added to the computed value instead of underlying value when
-  //    resolving)
-  //
-  //    animA + animB = 0.4
-  //    Failed to composite on top of underlying value.
-  //
-
-  animB.commitStyles();
-
-  animA.cancel();
-  animB.cancel();
-  animC.cancel();
-
-  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.5);
-}, 'Commit composites on top of the underlying value');
-
-promise_test(async t => {
-  const div = createDiv(t);
-  div.style.opacity = '0.1';
-
-  // Setup animation
-  const animation = div.animate(
-    { opacity: 0.2 },
-    { duration: 1, fill: 'forwards' }
-  );
-  animation.finish();
-
-  // Setup observer
-  const mutationRecords = [];
-  const observer = new MutationObserver(mutations => {
-    mutationRecords.push(...mutations);
+  assert_throws_dom('NoModificationAllowedError', () => {
+    animation.commitStyles();
   });
-  observer.observe(div, { attributes: true, attributeOldValue: true });
 
-  animation.commitStyles();
-
-  // Wait for mutation records to be dispatched
-  await Promise.resolve();
-
-  assert_equals(mutationRecords.length, 1, 'Should have one mutation record');
-
-  const mutation = mutationRecords[0];
-  assert_equals(mutation.type, 'attributes');
-  assert_equals(mutation.oldValue, 'opacity: 0.1;');
-
-  observer.disconnect();
-}, 'Triggers mutation observers when updating style');
-
-promise_test(async t => {
-  const div = createDiv(t);
-  div.style.opacity = '0.2';
-
-  // Setup animation
-  const animation = div.animate(
-    { opacity: 0.2 },
-    { duration: 1, fill: 'forwards' }
-  );
-  animation.finish();
-
-  // Setup observer
-  const mutationRecords = [];
-  const observer = new MutationObserver(mutations => {
-    mutationRecords.push(...mutations);
-  });
-  observer.observe(div, { attributes: true });
-
-  animation.commitStyles();
-
-  // Wait for mutation records to be dispatched
-  await Promise.resolve();
-
-  assert_equals(mutationRecords.length, 0, 'Should have no mutation records');
-
-  observer.disconnect();
-}, 'Does NOT trigger mutation observers when the change to style is redundant');
+  nonStyleElement.remove();
+}, 'Throws if the target element is not something with a style attribute');
 
 test(t => {
-
   const div = createDiv(t);
   div.classList.add('pseudo');
   const animation = div.animate(
@@ -462,22 +62,37 @@ test(t => {
 }, 'Throws if the target element is a pseudo element');
 
 test(t => {
-  const animation = createDiv(t).animate(
+  const div = createDiv(t);
+  div.classList.add('pseudo');
+  const animation = div.animate(
     { opacity: 0 },
-    { duration: 1, fill: 'forwards' }
+    { duration: 1, fill: 'forwards', pseudoElement: '::before' }
   );
 
-  const nonStyleElement
-    = document.createElementNS('http://example.org/test', 'test');
-  document.body.appendChild(nonStyleElement);
-  animation.effect.target = nonStyleElement;
+  div.remove();
 
   assert_throws_dom('NoModificationAllowedError', () => {
     animation.commitStyles();
   });
+}, 'Checks the pseudo element condition before the not rendered condition');
 
-  nonStyleElement.remove();
-}, 'Throws if the target element is not something with a style attribute');
+// -------------------------
+// Tests covering elements that are not being rendered
+// -------------------------
+
+test(t => {
+  const div = createDiv(t);
+  const animation = div.animate(
+    { opacity: 0 },
+    { duration: 1, fill: 'forwards' }
+  );
+
+  div.remove();
+
+  assert_throws_dom('InvalidStateError', () => {
+    animation.commitStyles();
+  });
+}, 'Throws if the target effect is disconnected');
 
 test(t => {
   const div = createDiv(t);
@@ -544,34 +159,472 @@ test(t => {
   });
 }, 'Treats display:contents in a display:none subtree as not rendered');
 
+// -------------------------
+// Tests covering various parts of the active interval
+// -------------------------
+
 test(t => {
   const div = createDiv(t);
+  div.style.opacity = '0.1';
+
   const animation = div.animate(
-    { opacity: 0 },
+    { opacity: 0.2 },
+    { duration: 1, fill: 'forwards' }
+  );
+  animation.finish();
+
+  animation.commitStyles();
+
+  // Cancel the animation so we can inspect the underlying style
+  animation.cancel();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.2);
+}, 'Commits styles');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.marginLeft = '10px';
+
+  const animation = div.animate({ opacity: [0.2, 0.7] }, 1000);
+  animation.currentTime = 500;
+  animation.commitStyles();
+  animation.cancel();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.45);
+}, 'Commits values calculated mid-interval');
+
+// -------------------------
+// Tests covering various parts of the stack
+// -------------------------
+
+promise_test(async t => {
+  const div = createDiv(t);
+  div.style.opacity = '0.1';
+
+  const animA = div.animate(
+    { opacity: '0.2' },
+    { duration: 1, fill: 'forwards' }
+  );
+  const animB = div.animate(
+    { opacity: '0.2', composite: 'add' },
+    { duration: 1, fill: 'forwards' }
+  );
+  const animC = div.animate(
+    { opacity: '0.3', composite: 'add' },
     { duration: 1, fill: 'forwards' }
   );
 
-  div.remove();
+  animA.persist();
+  animB.persist();
 
-  assert_throws_dom('InvalidStateError', () => {
-    animation.commitStyles();
-  });
-}, 'Throws if the target effect is disconnected');
+  await animB.finished;
+
+  // The values above have been chosen such that various error conditions
+  // produce results that all differ from the desired result:
+  //
+  //  Expected result:
+  //
+  //    animA + animB = 0.4
+  //
+  //  Likely error results:
+  //
+  //    <underlying> = 0.1
+  //    (Commit didn't work at all)
+  //
+  //    animB = 0.2
+  //    (Didn't add at all when resolving)
+  //
+  //    <underlying> + animB = 0.3
+  //    (Added to the underlying value instead of lower-priority animations when
+  //    resolving)
+  //
+  //    <underlying> + animA + animB = 0.5
+  //    (Didn't respect the composite mode of lower-priority animations)
+  //
+  //    animA + animB + animC = 0.7
+  //    (Resolved the whole stack, not just up to the target effect)
+  //
+
+  animB.commitStyles();
+
+  animA.cancel();
+  animB.cancel();
+  animC.cancel();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.4);
+}, 'Commits the intermediate value of an animation in the middle of stack');
+
+promise_test(async t => {
+  const div = createDiv(t);
+  div.style.opacity = '0.1';
+
+  const animA = div.animate(
+    { opacity: 0.2 },
+    { duration: 1, fill: 'forwards' }
+  );
+  const animB = div.animate(
+    { opacity: 0.3 },
+    { duration: 1, fill: 'forwards' }
+  );
+
+  await animA.finished;
+
+  animB.cancel();
+
+  animA.commitStyles();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.2);
+}, 'Commits styles for an animation that has been removed');
+
+promise_test(async t => {
+  const div = createDiv(t);
+  div.style.opacity = '0.1';
+
+  const animA = div.animate(
+    { opacity: '0.2', composite: 'add' },
+    { duration: 1, fill: 'forwards' }
+  );
+  const animB = div.animate(
+    { opacity: '0.2', composite: 'add' },
+    { duration: 1, fill: 'forwards' }
+  );
+  const animC = div.animate(
+    { opacity: '0.3', composite: 'add' },
+    { duration: 1, fill: 'forwards' }
+  );
+
+  animA.persist();
+  animB.persist();
+  await animB.finished;
+
+  // The error cases are similar to the above test with one additional case;
+  // verifying that the animations composite on top of the correct underlying
+  // base style.
+  //
+  //  Expected result:
+  //
+  //  <underlying> + animA + animB = 0.5
+  //
+  //  Additional error results:
+  //
+  //    <underlying> + animA + animB + animC + animA + animB = 1.0 (saturates)
+  //    (Added to the computed value instead of underlying value when
+  //    resolving)
+  //
+  //    animA + animB = 0.4
+  //    Failed to composite on top of underlying value.
+  //
+
+  animB.commitStyles();
+
+  animA.cancel();
+  animB.cancel();
+  animC.cancel();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.5);
+}, 'Commit composites on top of the underlying value');
+
+// -------------------------
+// Tests covering handling of logical properties
+// -------------------------
 
 test(t => {
   const div = createDiv(t);
-  div.classList.add('pseudo');
+  div.style.marginLeft = '10px';
+
   const animation = div.animate(
-    { opacity: 0 },
-    { duration: 1, fill: 'forwards', pseudoElement: '::before' }
+    { marginInlineStart: '20px' },
+    { duration: 1, fill: 'forwards' }
+  );
+  animation.finish();
+
+  animation.commitStyles();
+
+  animation.cancel();
+
+  assert_equals(getComputedStyle(div).marginLeft, '20px');
+}, 'Commits logical properties');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.marginLeft = '10px';
+
+  const animation = div.animate(
+    { marginInlineStart: '20px' },
+    { duration: 1, fill: 'forwards' }
+  );
+  animation.finish();
+
+  animation.commitStyles();
+
+  animation.cancel();
+
+  assert_equals(div.style.marginLeft, '20px');
+}, 'Commits logical properties as physical properties');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.fontSize = '10px';
+
+  const animation = div.animate(
+    { width: '10em' },
+    { duration: 1, fill: 'forwards' }
+  );
+  animation.finish();
+  animation.commitStyles();
+  animation.cancel();
+
+  assert_numeric_style_equals(getComputedStyle(div).width, 100);
+
+  div.style.fontSize = '20px';
+  assert_numeric_style_equals(
+    getComputedStyle(div).width,
+    100,
+    'Changes to the font-size should have no effect'
+  );
+}, 'Commits em units as pixel values');
+
+// -------------------------
+// Tests covering CSS variables
+// -------------------------
+
+test(t => {
+  const div = createDiv(t);
+  div.style.setProperty('--target', '0.5');
+  div.style.opacity = 'var(--target)';
+  const animation = div.animate(
+    { '--target': 0.8 },
+    { duration: 1, fill: 'forwards' }
+  );
+  animation.finish();
+  animation.commitStyles();
+  animation.cancel();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.8);
+}, 'Commits custom variables');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.setProperty('--target', '0.5');
+
+  const animation = div.animate(
+    { opacity: 'var(--target)' },
+    { duration: 1, fill: 'forwards' }
+  );
+  animation.finish();
+  animation.commitStyles();
+  animation.cancel();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.5);
+
+  // Changes to the variable should have no effect
+  div.style.setProperty('--target', '1');
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.5);
+}, 'Commits variable references as their computed values');
+
+// -------------------------
+// Tests covering the composition of specific properties
+// (e.g. line-height, transforms)
+// -------------------------
+
+test(t => {
+  const div = createDiv(t);
+  div.style.fontSize = '10px';
+
+  const animation = div.animate(
+    { lineHeight: '1.5' },
+    { duration: 1, fill: 'forwards' }
+  );
+  animation.finish();
+  animation.commitStyles();
+  animation.cancel();
+
+  assert_numeric_style_equals(getComputedStyle(div).lineHeight, 15);
+  assert_equals(
+    div.style.lineHeight,
+    '1.5',
+    'line-height is committed as a relative value'
   );
 
-  div.remove();
+  div.style.fontSize = '20px';
+  assert_numeric_style_equals(
+    getComputedStyle(div).lineHeight,
+    30,
+    'Changes to the font-size should affect the committed line-height'
+  );
+}, 'Commits relative line-height');
 
-  assert_throws_dom('NoModificationAllowedError', () => {
-    animation.commitStyles();
+test(t => {
+  const div = createDiv(t);
+  const animation = div.animate(
+    { transform: 'translate(20px, 20px)' },
+    { duration: 1, fill: 'forwards' }
+  );
+  animation.finish();
+  animation.commitStyles();
+  animation.cancel();
+  assert_equals(
+    getComputedStyle(div).transform,
+    'matrix(1, 0, 0, 1, 20, 20)'
+  );
+}, 'Commits transforms');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.translate = '100px';
+  div.style.rotate = '45deg';
+  div.style.scale = '2';
+
+  const animation = div.animate(
+    { translate: '200px', rotate: '90deg', scale: 3 },
+    { duration: 1, fill: 'forwards' }
+  );
+  animation.finish();
+
+  animation.commitStyles();
+
+  // Cancel the animation so we can inspect the underlying style
+  animation.cancel();
+
+  assert_equals(getComputedStyle(div).translate, '200px');
+  assert_equals(getComputedStyle(div).rotate, '90deg');
+  assert_numeric_style_equals(getComputedStyle(div).scale, 3);
+}, 'Commits styles for individual transform properties');
+
+test(t => {
+  const div = createDiv(t);
+  const animation = div.animate(
+    { transform: 'translate(20px, 20px)' },
+    { duration: 1, fill: 'forwards' }
+  );
+  animation.finish();
+  animation.commitStyles();
+  animation.cancel();
+  assert_equals(div.style.transform, 'translate(20px, 20px)');
+}, 'Commits transforms as a transform list');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.width = '200px';
+  div.style.height = '200px';
+
+  const animation = div.animate(
+    { transform: ['translate(100%, 0%)', 'scale(3)'] },
+    1000
+  );
+  animation.currentTime = 500;
+  animation.commitStyles();
+  animation.cancel();
+
+  // TODO(https://github.com/w3c/csswg-drafts/issues/2854):
+  // We can't check the committed value directly since it is not specced yet in this case,
+  // but it should still produce the correct resolved value.
+  assert_equals(
+    getComputedStyle(div).transform,
+    'matrix(2, 0, 0, 2, 100, 0)',
+    'Resolved transform is correct after commit.'
+  );
+}, 'Commits matrix-interpolated relative transforms');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.width = '200px';
+  div.style.height = '200px';
+
+  const animation = div.animate({ transform: ['none', 'none'] }, 1000);
+  animation.currentTime = 500;
+  animation.commitStyles();
+  animation.cancel();
+
+  assert_equals(
+    div.style.transform,
+    'none',
+    'Resolved transform is correct after commit.'
+  );
+}, "Commits 'none' transform");
+
+test(t => {
+  const div = createDiv(t);
+  div.style.margin = '10px';
+
+  const animation = div.animate(
+    { margin: '20px' },
+    { duration: 1, fill: 'forwards' }
+  );
+  animation.finish();
+
+  animation.commitStyles();
+
+  animation.cancel();
+
+  assert_equals(div.style.marginLeft, '20px');
+}, 'Commits shorthand styles');
+
+// -------------------------
+// Tests related to setting the style attributes
+// (e.g. mutation observer related ones)
+// -------------------------
+
+promise_test(async t => {
+  const div = createDiv(t);
+  div.style.opacity = '0.1';
+
+  // Setup animation
+  const animation = div.animate(
+    { opacity: 0.2 },
+    { duration: 1, fill: 'forwards' }
+  );
+  animation.finish();
+
+  // Setup observer
+  const mutationRecords = [];
+  const observer = new MutationObserver(mutations => {
+    mutationRecords.push(...mutations);
   });
-}, 'Checks the pseudo element condition before the not rendered condition');
+  observer.observe(div, { attributes: true, attributeOldValue: true });
+
+  animation.commitStyles();
+
+  // Wait for mutation records to be dispatched
+  await Promise.resolve();
+
+  assert_equals(mutationRecords.length, 1, 'Should have one mutation record');
+
+  const mutation = mutationRecords[0];
+  assert_equals(mutation.type, 'attributes');
+  assert_equals(mutation.oldValue, 'opacity: 0.1;');
+
+  observer.disconnect();
+}, 'Triggers mutation observers when updating style');
+
+promise_test(async t => {
+  const div = createDiv(t);
+  div.style.opacity = '0.2';
+
+  // Setup animation
+  const animation = div.animate(
+    { opacity: 0.2 },
+    { duration: 1, fill: 'forwards' }
+  );
+  animation.finish();
+
+  // Setup observer
+  const mutationRecords = [];
+  const observer = new MutationObserver(mutations => {
+    mutationRecords.push(...mutations);
+  });
+  observer.observe(div, { attributes: true });
+
+  animation.commitStyles();
+
+  // Wait for mutation records to be dispatched
+  await Promise.resolve();
+
+  assert_equals(mutationRecords.length, 0, 'Should have no mutation records');
+
+  observer.disconnect();
+}, 'Does NOT trigger mutation observers when the change to style is redundant');
 
 </script>
 </body>
diff --git a/tests/wpt/tests/web-animations/interfaces/Animation/commitStyles.tentative.html b/tests/wpt/tests/web-animations/interfaces/Animation/commitStyles.tentative.html
new file mode 100644
index 00000000000..8b7d089ae34
--- /dev/null
+++ b/tests/wpt/tests/web-animations/interfaces/Animation/commitStyles.tentative.html
@@ -0,0 +1,717 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Animation.commitStyles</title>
+<link rel="help" href="https://drafts.csswg.org/web-animations/#dom-animation-commitstyles">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../testcommon.js"></script>
+<style>
+.pseudo::before {content: '';}
+.pseudo::after {content: '';}
+.pseudo::marker {content: '';}
+</style>
+<body>
+<div id="log"></div>
+<script>
+
+// This file tests the proposed updated behavior of `Animation.commitStyles`.
+//
+// See: https://github.com/w3c/csswg-drafts/issues/5394
+//
+// If that proposal is merged into the spec, this file should replace the
+// existing `./commitStyles.html`.
+
+'use strict';
+
+function assert_numeric_style_equals(opacity, expected, description) {
+  return assert_approx_equals(
+    parseFloat(opacity),
+    expected,
+    0.0001,
+    description
+  );
+}
+
+// -------------------------
+// Tests covering elements not capable of having a style attribute
+// --------------------
+
+test(t => {
+  const animation = createDiv(t).animate(
+    { opacity: 0 },
+    { duration: 1 }
+  );
+
+  const nonStyleElement = document.createElementNS(
+    'http://example.org/test',
+    'test'
+  );
+  document.body.appendChild(nonStyleElement);
+  animation.effect.target = nonStyleElement;
+
+  assert_throws_dom('NoModificationAllowedError', () => {
+    animation.commitStyles();
+  });
+
+  nonStyleElement.remove();
+}, 'Throws if the target element is not something with a style attribute');
+
+test(t => {
+  const div = createDiv(t);
+  div.classList.add('pseudo');
+  const animation = div.animate(
+    { opacity: 0 },
+    { duration: 1, pseudoElement: '::before' }
+  );
+
+  assert_throws_dom('NoModificationAllowedError', () => {
+    animation.commitStyles();
+  });
+}, 'Throws if the target element is a pseudo element');
+
+test(t => {
+  const div = createDiv(t);
+  div.classList.add('pseudo');
+  const animation = div.animate(
+    { opacity: 0 },
+    { duration: 1, pseudoElement: '::before' }
+  );
+
+  div.remove();
+
+  assert_throws_dom('NoModificationAllowedError', () => {
+    animation.commitStyles();
+  });
+}, 'Checks the pseudo element condition before the not rendered condition');
+
+// -------------------------
+// Tests covering elements that are not being rendered
+// -------------------------
+
+test(t => {
+  const div = createDiv(t);
+  const animation = div.animate(
+    { opacity: 0 },
+    { duration: 1 }
+  );
+
+  div.remove();
+
+  assert_throws_dom('InvalidStateError', () => {
+    animation.commitStyles();
+  });
+}, 'Throws if the target effect is disconnected');
+
+test(t => {
+  const div = createDiv(t);
+  const animation = div.animate(
+    { opacity: 0 },
+    { duration: 1 }
+  );
+
+  div.style.display = 'none';
+
+  assert_throws_dom('InvalidStateError', () => {
+    animation.commitStyles();
+  });
+}, 'Throws if the target effect is display:none');
+
+test(t => {
+  const container = createDiv(t);
+  const div = createDiv(t);
+  container.append(div);
+
+  const animation = div.animate(
+    { opacity: 0 },
+    { duration: 1 }
+  );
+
+  container.style.display = 'none';
+
+  assert_throws_dom('InvalidStateError', () => {
+    animation.commitStyles();
+  });
+}, "Throws if the target effect's ancestor is display:none");
+
+test(t => {
+  const container = createDiv(t);
+  const div = createDiv(t);
+  container.append(div);
+
+  const animation = div.animate(
+    { opacity: 0 },
+    { duration: 1 }
+  );
+
+  container.style.display = 'contents';
+
+  // Should NOT throw
+  animation.commitStyles();
+}, 'Treats display:contents as rendered');
+
+test(t => {
+  const container = createDiv(t);
+  const div = createDiv(t);
+  container.append(div);
+
+  const animation = div.animate(
+    { opacity: 0 },
+    { duration: 1 }
+  );
+
+  div.style.display = 'contents';
+  container.style.display = 'none';
+
+  assert_throws_dom('InvalidStateError', () => {
+    animation.commitStyles();
+  });
+}, 'Treats display:contents in a display:none subtree as not rendered');
+
+// -------------------------
+// Tests covering various parts of the active interval
+// -------------------------
+
+test(t => {
+  const div = createDiv(t);
+  div.style.opacity = '0.1';
+
+  const animation = div.animate(
+    { opacity: 0.2 },
+    { duration: 1 }
+  );
+  animation.finish();
+
+  animation.commitStyles();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.2);
+}, 'Commits styles');
+
+test(t => {
+    const div = createDiv(t);
+    div.style.opacity = '0.1';
+
+    const animation = div.animate(
+        { opacity: [0.5, 1] },
+        { duration: 1 }
+    );
+    animation.playbackRate = -1;
+    animation.finish();
+
+    animation.commitStyles();
+
+    assert_numeric_style_equals(getComputedStyle(div).opacity, 0.5);
+}, 'Commits styles for backwards animation');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.marginLeft = '10px';
+
+  const animation = div.animate({ opacity: [0.2, 0.7] }, 1000);
+  animation.currentTime = 500;
+  animation.commitStyles();
+  animation.cancel();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.45);
+}, 'Commits values calculated mid-interval');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.opacity = '0';
+
+  const animation = div.animate(
+    { opacity: 1 },
+    { duration: 1000, delay: 1000 }
+  );
+  animation.currentTime = 500;
+  animation.commitStyles();
+  animation.cancel();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0);
+}, 'Commits values during the start delay');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.opacity = '0';
+
+  const animation = div.animate(
+    { opacity: 1 },
+    { duration: 1000, delay: 1000 }
+  );
+  animation.currentTime = 2100;
+  animation.commitStyles();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0);
+}, 'Commits value after the active interval');
+
+// -------------------------
+// Tests covering various parts of the stack
+// -------------------------
+
+promise_test(async t => {
+  const div = createDiv(t);
+  div.style.opacity = '0.1';
+
+  const animA = div.animate(
+    { opacity: '0.2' },
+    { duration: 1, fill: 'forwards' }
+  );
+  const animB = div.animate(
+    { opacity: '0.2', composite: 'add' },
+    { duration: 1 }
+  );
+  const animC = div.animate(
+    { opacity: '0.3', composite: 'add' },
+    { duration: 1 }
+  );
+
+  animA.persist();
+  animB.persist();
+
+  await animB.finished;
+
+  // The values above have been chosen such that various error conditions
+  // produce results that all differ from the desired result:
+  //
+  //  Expected result:
+  //
+  //    animA + animB = 0.4
+  //
+  //  Likely error results:
+  //
+  //    <underlying> = 0.1
+  //    (Commit didn't work at all)
+  //
+  //    animB = 0.2
+  //    (Didn't add at all when resolving)
+  //
+  //    <underlying> + animB = 0.3
+  //    (Added to the underlying value instead of lower-priority animations when
+  //    resolving)
+  //
+  //    <underlying> + animA + animB = 0.5
+  //    (Didn't respect the composite mode of lower-priority animations)
+  //
+  //    animA + animB + animC = 0.7
+  //    (Resolved the whole stack, not just up to the target effect)
+  //
+
+  animB.commitStyles();
+
+  animA.cancel();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.4);
+}, 'Commits the intermediate value of an animation in the middle of stack');
+
+promise_test(async t => {
+  const div = createDiv(t);
+  div.style.opacity = '0.1';
+
+  const animA = div.animate(
+    { opacity: '0.2' },
+    { duration: 1 }
+  );
+  const animB = div.animate(
+    { opacity: '0.2', composite: 'add' },
+    { duration: 1 }
+  );
+  const animC = div.animate(
+    { opacity: '0.3', composite: 'add' },
+    { duration: 1 }
+  );
+
+  animA.persist();
+  animB.persist();
+
+  await animB.finished;
+
+  // The values above have been chosen such that various error conditions
+  // produce results that all differ from the desired result:
+  //
+  //  Expected result:
+  //
+  //    animA + animB = 0.4
+  //
+  //  Likely error results:
+  //
+  //    <underlying> = 0.1
+  //    (Commit didn't work at all)
+  //
+  //    animB = 0.2
+  //    (Didn't add at all when resolving)
+  //
+  //    <underlying> + animB = 0.3
+  //    (Added to the underlying value instead of lower-priority animations when
+  //    resolving)
+  //
+  //    <underlying> + animA + animB = 0.5
+  //    (Didn't respect the composite mode of lower-priority animations)
+  //
+  //    animA + animB + animC = 0.7
+  //    (Resolved the whole stack, not just up to the target effect)
+  //
+
+  animA.commitStyles();
+  animB.commitStyles();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.4);
+}, 'Commits the intermediate value of an animation up to the middle of the stack');
+
+promise_test(async t => {
+  const div = createDiv(t);
+  div.style.opacity = '0.1';
+
+  const animA = div.animate(
+    { opacity: 0.2 },
+    { duration: 1 }
+  );
+  const animB = div.animate(
+    { opacity: 0.3 },
+    { duration: 1 }
+  );
+
+  await animA.finished;
+
+  animB.cancel();
+
+  animA.commitStyles();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.2);
+}, 'Commits styles for an animation that has been removed');
+
+promise_test(async t => {
+  const div = createDiv(t);
+  div.style.opacity = '0.1';
+
+  const animA = div.animate(
+    { opacity: '0.2', composite: 'add' },
+    { duration: 1, fill: 'forwards' }
+  );
+  const animB = div.animate(
+    { opacity: '0.2', composite: 'add' },
+    { duration: 1 }
+  );
+  const animC = div.animate(
+    { opacity: '0.3', composite: 'add' },
+    { duration: 1 }
+  );
+
+  animA.persist();
+  animB.persist();
+  await animB.finished;
+
+  // The error cases are similar to the above test with one additional case;
+  // verifying that the animations composite on top of the correct underlying
+  // base style.
+  //
+  //  Expected result:
+  //
+  //  <underlying> + animA + animB = 0.5
+  //
+  //  Additional error results:
+  //
+  //    <underlying> + animA + animB + animC + animA + animB = 1.0 (saturates)
+  //    (Added to the computed value instead of underlying value when
+  //    resolving)
+  //
+  //    animA + animB = 0.4
+  //    Failed to composite on top of underlying value.
+  //
+
+  animB.commitStyles();
+
+  animA.cancel();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.5);
+}, 'Commit composites on top of the underlying value');
+
+// -------------------------
+// Tests covering handling of logical properties
+// -------------------------
+
+test(t => {
+  const div = createDiv(t);
+  div.style.marginLeft = '10px';
+
+  const animation = div.animate(
+    { marginInlineStart: '20px' },
+    { duration: 1 }
+  );
+  animation.finish();
+
+  animation.commitStyles();
+
+  assert_equals(getComputedStyle(div).marginLeft, '20px');
+}, 'Commits logical properties');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.marginLeft = '10px';
+
+  const animation = div.animate(
+    { marginInlineStart: '20px' },
+    { duration: 1 }
+  );
+  animation.finish();
+
+  animation.commitStyles();
+
+  assert_equals(div.style.marginLeft, '20px');
+}, 'Commits logical properties as physical properties');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.fontSize = '10px';
+
+  const animation = div.animate(
+    { width: '10em' },
+    { duration: 1 }
+  );
+  animation.finish();
+  animation.commitStyles();
+
+  assert_numeric_style_equals(getComputedStyle(div).width, 100);
+
+  div.style.fontSize = '20px';
+  assert_numeric_style_equals(
+    getComputedStyle(div).width,
+    100,
+    'Changes to the font-size should have no effect'
+  );
+}, 'Commits em units as pixel values');
+
+// -------------------------
+// Tests covering CSS variables
+// -------------------------
+
+test(t => {
+  const div = createDiv(t);
+  div.style.setProperty('--target', '0.5');
+  div.style.opacity = 'var(--target)';
+  const animation = div.animate(
+    { '--target': 0.8 },
+    { duration: 1 }
+  );
+  animation.finish();
+  animation.commitStyles();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.8);
+}, 'Commits custom variables');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.setProperty('--target', '0.5');
+
+  const animation = div.animate(
+    { opacity: 'var(--target)' },
+    { duration: 1 }
+  );
+  animation.finish();
+  animation.commitStyles();
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.5);
+
+  // Changes to the variable should have no effect
+  div.style.setProperty('--target', '1');
+
+  assert_numeric_style_equals(getComputedStyle(div).opacity, 0.5);
+}, 'Commits variable references as their computed values');
+
+// -------------------------
+// Tests covering the composition of specific properties
+// (e.g. line-height, transforms)
+// -------------------------
+
+test(t => {
+  const div = createDiv(t);
+  div.style.fontSize = '10px';
+
+  const animation = div.animate(
+    { lineHeight: '1.5' },
+    { duration: 1 }
+  );
+  animation.finish();
+  animation.commitStyles();
+
+  assert_numeric_style_equals(getComputedStyle(div).lineHeight, 15);
+  assert_equals(
+    div.style.lineHeight,
+    '1.5',
+    'line-height is committed as a relative value'
+  );
+
+  div.style.fontSize = '20px';
+  assert_numeric_style_equals(
+    getComputedStyle(div).lineHeight,
+    30,
+    'Changes to the font-size should affect the committed line-height'
+  );
+}, 'Commits relative line-height');
+
+test(t => {
+  const div = createDiv(t);
+  const animation = div.animate(
+    { transform: 'translate(20px, 20px)' },
+    { duration: 1 }
+  );
+  animation.finish();
+  animation.commitStyles();
+
+  assert_equals(
+    getComputedStyle(div).transform,
+    'matrix(1, 0, 0, 1, 20, 20)'
+  );
+}, 'Commits transforms');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.translate = '100px';
+  div.style.rotate = '45deg';
+  div.style.scale = '2';
+
+  const animation = div.animate(
+    { translate: '200px', rotate: '90deg', scale: 3 },
+    { duration: 1 }
+  );
+  animation.finish();
+
+  animation.commitStyles();
+
+  assert_equals(getComputedStyle(div).translate, '200px');
+  assert_equals(getComputedStyle(div).rotate, '90deg');
+  assert_numeric_style_equals(getComputedStyle(div).scale, 3);
+}, 'Commits styles for individual transform properties');
+
+test(t => {
+  const div = createDiv(t);
+  const animation = div.animate(
+    { transform: 'translate(20px, 20px)' },
+    { duration: 1 }
+  );
+  animation.finish();
+  animation.commitStyles();
+
+  assert_equals(div.style.transform, 'translate(20px, 20px)');
+}, 'Commits transforms as a transform list');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.width = '200px';
+  div.style.height = '200px';
+
+  const animation = div.animate(
+    { transform: ['translate(100%, 0%)', 'scale(3)'] },
+    1000
+  );
+  animation.currentTime = 500;
+  animation.commitStyles();
+  animation.cancel();
+
+  // TODO(https://github.com/w3c/csswg-drafts/issues/2854):
+  // We can't check the committed value directly since it is not specced yet in this case,
+  // but it should still produce the correct resolved value.
+  assert_equals(
+    getComputedStyle(div).transform,
+    'matrix(2, 0, 0, 2, 100, 0)',
+    'Resolved transform is correct after commit.'
+  );
+}, 'Commits matrix-interpolated relative transforms');
+
+test(t => {
+  const div = createDiv(t);
+  div.style.width = '200px';
+  div.style.height = '200px';
+
+  const animation = div.animate({ transform: ['none', 'none'] }, 1000);
+  animation.currentTime = 500;
+  animation.commitStyles();
+  animation.cancel();
+
+  assert_equals(
+    div.style.transform,
+    'none',
+    'Resolved transform is correct after commit.'
+  );
+}, "Commits 'none' transform");
+
+test(t => {
+  const div = createDiv(t);
+  div.style.margin = '10px';
+
+  const animation = div.animate(
+    { margin: '20px' },
+    { duration: 1 }
+  );
+  animation.finish();
+
+  animation.commitStyles();
+
+  assert_equals(div.style.marginLeft, '20px');
+}, 'Commits shorthand styles');
+
+// -------------------------
+// Tests related to setting the style attributes
+// (e.g. mutation observer related ones)
+// -------------------------
+
+promise_test(async t => {
+  const div = createDiv(t);
+  div.style.opacity = '0.1';
+
+  // Setup animation
+  const animation = div.animate(
+    { opacity: 0.2 },
+    { duration: 1 }
+  );
+  animation.finish();
+
+  // Setup observer
+  const mutationRecords = [];
+  const observer = new MutationObserver(mutations => {
+    mutationRecords.push(...mutations);
+  });
+  observer.observe(div, { attributes: true, attributeOldValue: true });
+
+  animation.commitStyles();
+
+  // Wait for mutation records to be dispatched
+  await Promise.resolve();
+
+  assert_equals(mutationRecords.length, 1, 'Should have one mutation record');
+
+  const mutation = mutationRecords[0];
+  assert_equals(mutation.type, 'attributes');
+  assert_equals(mutation.oldValue, 'opacity: 0.1;');
+
+  observer.disconnect();
+}, 'Triggers mutation observers when updating style');
+
+promise_test(async t => {
+  const div = createDiv(t);
+  div.style.opacity = '0.2';
+
+  // Setup animation
+  const animation = div.animate(
+    { opacity: 0.2 },
+    { duration: 1 }
+  );
+  animation.finish();
+
+  // Setup observer
+  const mutationRecords = [];
+  const observer = new MutationObserver(mutations => {
+    mutationRecords.push(...mutations);
+  });
+  observer.observe(div, { attributes: true });
+
+  animation.commitStyles();
+
+  // Wait for mutation records to be dispatched
+  await Promise.resolve();
+
+  assert_equals(mutationRecords.length, 0, 'Should have no mutation records');
+
+  observer.disconnect();
+}, 'Does NOT trigger mutation observers when the change to style is redundant');
+
+</script>
+</body>
diff --git a/tests/wpt/tests/web-animations/interfaces/Animation/style-change-events.html b/tests/wpt/tests/web-animations/interfaces/Animation/style-change-events.html
index d1c1c96f7b0..c64400e869d 100644
--- a/tests/wpt/tests/web-animations/interfaces/Animation/style-change-events.html
+++ b/tests/wpt/tests/web-animations/interfaces/Animation/style-change-events.html
@@ -306,6 +306,13 @@ const tests = {
         ),
     });
   },
+  trigger: UsePropertyTest(animation => {
+    // Get the trigger property.
+    animation.trigger;
+
+    // Set the trigger property.
+    animation.trigger = new AnimationTrigger();
+  })
 };
 
 // Check that each enumerable property and the constructor follow the
diff --git a/tests/wpt/tests/web-animations/interfaces/AnimationTrigger/constructor.html b/tests/wpt/tests/web-animations/interfaces/AnimationTrigger/constructor.html
index 3429c5b1877..8b59b9fc637 100644
--- a/tests/wpt/tests/web-animations/interfaces/AnimationTrigger/constructor.html
+++ b/tests/wpt/tests/web-animations/interfaces/AnimationTrigger/constructor.html
@@ -16,9 +16,9 @@
       "default timeline is document.timeline.");
     assert_equals(trigger.rangeStart, "normal", "default rangeStart is normal");
     assert_equals(trigger.rangeEnd, "normal", "default rangeEnd is normal");
-    assert_equals(trigger.exitRangeStart, "normal",
+    assert_equals(trigger.exitRangeStart, "auto",
       "default exitRangeStart is normal");
-    assert_equals(trigger.exitRangeStart, "normal",
+    assert_equals(trigger.exitRangeStart, "auto",
       "default exitRangeEnd is normal");
   }, "Default values when no property bag is supplied");
 
@@ -29,9 +29,9 @@
       "default timeline is document.timeline.");
     assert_equals(trigger.rangeStart, "normal", "default rangeStart is normal");
     assert_equals(trigger.rangeEnd, "normal", "default rangeEnd is normal");
-    assert_equals(trigger.exitRangeStart, "normal",
+    assert_equals(trigger.exitRangeStart, "auto",
       "default exitRangeStart is normal");
-    assert_equals(trigger.exitRangeEnd, "normal",
+    assert_equals(trigger.exitRangeEnd, "auto",
       "default exitRangeEnd is normal");
   }, "Default values when an empty property bag is supplied.");
 
diff --git a/tests/wpt/tests/web-animations/resources/keyframe-tests.js b/tests/wpt/tests/web-animations/resources/keyframe-tests.js
index 2bcce1ecf47..34a84f45b20 100644
--- a/tests/wpt/tests/web-animations/resources/keyframe-tests.js
+++ b/tests/wpt/tests/web-animations/resources/keyframe-tests.js
@@ -540,11 +540,6 @@ const gKeyframesTests = [
     input:  [{ offset: 'calc(0.5)', left: '10px' }],
     output: [keyframe(offset(0.5), { left: '10px' })],
   },
-  {
-    desc:   'a single keyframe sequence with a complex calc() offset',
-    input:  [{ offset: 'calc(0.5 + 0.25 * sign(100em - 1px))', left: '10px' }],
-    output: [keyframe(offset(0.75), { left: '10px' })],
-  },
   {
     desc:   'a one property keyframe sequence with some omitted offsets',
     input:  [{ offset: 0.00, left: '10px' },
diff --git a/tests/wpt/tests/web-animations/timing-model/animations/finishing-an-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/finishing-an-animation.html
index fbf6558f781..d4f36becea4 100644
--- a/tests/wpt/tests/web-animations/timing-model/animations/finishing-an-animation.html
+++ b/tests/wpt/tests/web-animations/timing-model/animations/finishing-an-animation.html
@@ -326,5 +326,13 @@ promise_test(async t => {
 
 }, 'Finishing a canceled animation sets the current and start times');
 
+promise_test(async t => {
+  const animation = createDiv(t).animate(null, 1);
+  await animation.finished;
+  const eventWatcher = new EventWatcher(t, animation, 'finish', waitForNextFrame);
+  await eventWatcher.wait_for('finish');
+}, 'Finishing an animation fires finish event when a finish event listener is '
+  + 'added as the finished promise resolves');
+
 </script>
 </body>
diff --git a/tests/wpt/tests/webaudio/resources/audionodeoptions.js b/tests/wpt/tests/webaudio/resources/audionodeoptions.js
index 3b7867cabf1..ef2dab672b3 100644
--- a/tests/wpt/tests/webaudio/resources/audionodeoptions.js
+++ b/tests/wpt/tests/webaudio/resources/audionodeoptions.js
@@ -104,7 +104,7 @@ function testAudioNodeOptions(should, context, nodeName, expectedNodeOptions) {
             .throw(DOMException,
                    expectedNodeOptions.channelCountMode.exceptionType);
       } else {
-        // Test that explicitly setting the the fixed value is allowed.
+        // Test that explicitly setting the fixed value is allowed.
         should(
             () => {
               node = new window[nodeName](
diff --git a/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-constructor.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-constructor.https.html
index d2dc54aee6a..6e1bdb22d52 100644
--- a/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-constructor.https.html
+++ b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-constructor.https.html
@@ -28,9 +28,12 @@ navigator.mediaDevices.getUserMedia({audio: true}).then(() => {
     async_test(t => testAudioSinkOptions(t),
                'Setting sinkId with an AudioSinkOptions at construction ' +
                'should succeed.');
-    async_test(t => testExceptions(t),
-               'Invalid sinkId arguments should throw an appropriate ' +
-               'exception.')
+    async_test(t => testOnErrorWrongType(t),
+               'Invalid sinkId argument with a wrong type should throw '+
+               'an appropriate exception.');
+    async_test(t => testOnErrorWrongId(t),
+               'Invalid sinkId argument with a wrong ID should dispatch ' +
+               'an onerror event.')
   });
 });
 
@@ -92,35 +95,38 @@ const testAudioSinkOptions = (t) => {
 // https://webaudio.github.io/web-audio-api/#validating-sink-identifier
 
 // Step 3. If document is not allowed to use the feature identified by
-// "speaker-selection", return a new DOMException whose name is
-// "NotAllowedError".
+// "speaker-selection", return false.
 // TODO(https://crbug.com/1380872): Due to the lack of "speaker-selection"
 // implementation, a test for such step does not exist yet.
 
-const testExceptions = (t) => {
+const testOnErrorWrongType = (t) => {
   t.step(() => {
-    // The wrong AudioSinkOption.type should cause a TypeError.
+    // The wrong AudioSinkOption.type should cause a TypeError. This exception
+    // is thrown at the IDL validation level.
     assert_throws_js(TypeError, () => {
       const audioContext = new AudioContext({sinkId: {type: 'something_else'}});
       audioContext.close();
     }, 'An invalid AudioSinkOptions.type value should throw a TypeError ' +
-       'exception.');
-  });
-
-  t.step(() => {
-    // Step 4. If sinkIdArg is a type of DOMString but it is not equal to the
-    // empty string or it does not match any audio output device identified by
-    // the result that would be provided by enumerateDevices(), return a new
-    // DOMException whose name is "NotFoundError".
-    // TODO(https://crbug.com/1439947): This does not throw in Chromium because
-    // the logic automatically fallbacks to the default device when a given ID
-    // is invalid.
-    assert_throws_dom('NotFoundError', () => {
-      const audioContext = new AudioContext({sinkId: 'some_random_device_id'});
-      audioContext.close();
-    }, 'An invalid device identifier should throw a NotFoundError exception.');
+     'exception.');
   });
   t.done();
 };
+
+// Step 4. If sinkIdArg is a type of DOMString but it is not equal to the
+// empty string or it does not match any audio output device identified by
+// the result that would be provided by enumerateDevices(), return false.
+//
+// When validation returns a false value, the context dispatches an onerror
+// event.
+const testOnErrorWrongId = (t) => {
+  // An invalid device ID should dispatch an onerror event.
+  const audioContext = new AudioContext({sinkId: 'some_random_device_id'});
+  audioContext.addEventListener('error', () => {
+    audioContext.close();
+    t.done();
+  }, {once: true});
+  t.step_timeout(t.unreached_func('onerror not fired on invalid device ID'),
+                 100);
+};
 </script>
 </html>
diff --git a/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/automation-rate-testing.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/automation-rate-testing.js
index 43279f91d68..e06a1d45614 100644
--- a/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/automation-rate-testing.js
+++ b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/automation-rate-testing.js
@@ -40,7 +40,7 @@
 // channel 3, the difference between the outputs.
 //
 // Success is declared if the difference signal is not exactly zero.  This means
-// the the automations did different things, as expected.
+// the automations did different things, as expected.
 //
 // The promise from |startRendering| is returned.
 function doTest(context, should, options) {
diff --git a/tests/wpt/tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html b/tests/wpt/tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html
index 56d0787b767..1099ee8d244 100644
--- a/tests/wpt/tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html
+++ b/tests/wpt/tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html
@@ -3,7 +3,7 @@
 <!--
 Tests that a create MediaElementSourceNode that is passed through
 a script processor passes the stream data.
-The the script processor saves the input buffers it gets to a temporary
+The script processor saves the input buffers it gets to a temporary
 array, and after the playback has stopped, the contents are compared
 to those of a loaded AudioBuffer with the same source.
 
diff --git a/tests/wpt/tests/webcodecs/audio-data.any.js b/tests/wpt/tests/webcodecs/audio-data.any.js
index c18606e2b70..dd199c485fb 100644
--- a/tests/wpt/tests/webcodecs/audio-data.any.js
+++ b/tests/wpt/tests/webcodecs/audio-data.any.js
@@ -86,6 +86,15 @@ test(t => {
 
 }, 'Verify AudioData constructors');
 
+test(t => {
+  let data = createDefaultAudioData();
+  data.close();
+  assert_equals(data.sampleRate, 0);
+  assert_equals(data.numberOfFrames, 0);
+  assert_equals(data.numberOfChannels, 0);
+  assert_equals(data.format, null);
+}, 'AudioData close');
+
 test(t => {
   let data = createDefaultAudioData();
 
diff --git a/tests/wpt/tests/webcodecs/audioDecoder-codec-specific.https.any.js b/tests/wpt/tests/webcodecs/audioDecoder-codec-specific.https.any.js
index 32eb6598c66..b0791813f21 100644
--- a/tests/wpt/tests/webcodecs/audioDecoder-codec-specific.https.any.js
+++ b/tests/wpt/tests/webcodecs/audioDecoder-codec-specific.https.any.js
@@ -356,6 +356,9 @@ promise_test(async t => {
 
   let outputs = 0;
   callbacks.output = frame => {
+    if (outputs === 0) {
+      assert_equals(frame.timestamp, -42);
+    }
     outputs++;
     frame.close();
   };
@@ -368,7 +371,30 @@ promise_test(async t => {
 
   await decoder.flush();
   assert_equals(outputs, CONFIG.codec === 'vorbis' ? 1 : 2, 'outputs');
-}, 'Test decoding a with negative timestamp');
+}, 'Test decoding a with a negative timestamp');
+
+promise_test(async t => {
+  const callbacks = {};
+  const decoder = createAudioDecoder(t, callbacks);
+
+  let outputs = 0;
+  callbacks.output = frame => {
+    if (outputs === 0) {
+      assert_equals(frame.timestamp, 42);
+    }
+    outputs++;
+    frame.close();
+  };
+
+  decoder.configure(CONFIG);
+  decoder.decode(new EncodedAudioChunk(
+      {type: 'key', timestamp: 42, data: CHUNK_DATA[0]}));
+  decoder.decode(new EncodedAudioChunk(
+      {type: 'key', timestamp: CHUNKS[0].duration + 42, data: CHUNK_DATA[1]}));
+
+  await decoder.flush();
+  assert_equals(outputs, CONFIG.codec === 'vorbis' ? 1 : 2, 'outputs');
+}, 'Test decoding a with a positive timestamp');
 
 promise_test(async t => {
   const callbacks = {};
diff --git a/tests/wpt/tests/webcodecs/image-decoder.https.any.js b/tests/wpt/tests/webcodecs/image-decoder.https.any.js
index 1b3fabbfc4a..9ca28e49c4a 100644
--- a/tests/wpt/tests/webcodecs/image-decoder.https.any.js
+++ b/tests/wpt/tests/webcodecs/image-decoder.https.any.js
@@ -310,7 +310,7 @@ promise_test(t => {
           assert_equals(result.image.displayHeight, 240);
           assert_equals(result.image.timestamp, 0);
 
-          // Swap to the the other track.
+          // Swap to the other track.
           let newIndex = (decoder.tracks.selectedIndex + 1) % 2;
           decoder.tracks[newIndex].selected = true;
           return decoder.decode()
diff --git a/tests/wpt/tests/webcodecs/video-decoder-no-size-in-configure.https.any.js b/tests/wpt/tests/webcodecs/video-decoder-no-size-in-configure.https.any.js
index 3481b465f9e..2ad7040e08b 100644
--- a/tests/wpt/tests/webcodecs/video-decoder-no-size-in-configure.https.any.js
+++ b/tests/wpt/tests/webcodecs/video-decoder-no-size-in-configure.https.any.js
@@ -72,6 +72,11 @@ promise_test(async t => {
   decoder.decode(encodedResult.chunk);
   await decoder.flush();
 
-  assert_equals(decodedResult.codedWidth, encoderConfig.width, 'decoded frame width');
-  assert_equals(decodedResult.codedHeight, encoderConfig.height, 'decoded frame height');
+  // Note: Coded size may vary based on decoder requirements.
+  assert_equals(
+      decodedResult.visibleRect.width, encoderConfig.width,
+      'decoded frame width');
+  assert_equals(
+      decodedResult.visibleRect.height, encoderConfig.height,
+      'decoded frame height');
 }, 'Test configure() without setting width and height');
diff --git a/tests/wpt/tests/webcodecs/video-encoder-orientation.https.any.js b/tests/wpt/tests/webcodecs/video-encoder-orientation.https.any.js
new file mode 100644
index 00000000000..de687f11498
--- /dev/null
+++ b/tests/wpt/tests/webcodecs/video-encoder-orientation.https.any.js
@@ -0,0 +1,107 @@
+// META: global=window,dedicatedworker
+// META: script=/common/media.js
+// META: script=/webcodecs/utils.js
+// META: script=/webcodecs/video-encoder-utils.js
+
+const defaultConfig = {
+  codec: 'vp8',
+  width: 640,
+  height: 480
+};
+
+promise_test(async t => {
+  let output_chunks = [];
+  let codecInit = getDefaultCodecInit(t);
+  let decoderConfig = null;
+  codecInit.output = (chunk, metadata) => {
+    assert_not_equals(metadata, null);
+    if (metadata.decoderConfig)
+      decoderConfig = metadata.decoderConfig;
+    output_chunks.push(chunk);
+  }
+
+  let encoder = new VideoEncoder(codecInit);
+  let config = defaultConfig;
+  encoder.configure(config);
+
+  let frame = createFrame(640, 480, 0, {rotation: 90, flip: true});
+  encoder.encode(frame);
+  frame.close();
+  await encoder.flush();
+  encoder.close();
+  assert_equals(output_chunks.length, 1);
+  assert_equals(decoderConfig.rotation, 90);
+  assert_equals(decoderConfig.flip, true);
+}, 'Encode video frame with orientation');
+
+promise_test(async t => {
+  let output_chunks = [];
+  let codecInit = getDefaultCodecInit(t);
+  let decoderConfig = null;
+  codecInit.output = (chunk, metadata) => {
+    assert_not_equals(metadata, null);
+    if (metadata.decoderConfig)
+      decoderConfig = metadata.decoderConfig;
+    output_chunks.push(chunk);
+  }
+
+  let encoder = new VideoEncoder(codecInit);
+  let config = defaultConfig;
+  encoder.configure(config);
+
+  let frame1 = createFrame(640, 480, 0, {rotation: 90, flip: true});
+  let frame2 = createFrame(640, 480, 33333, {rotation: 90, flip: false});
+  let frame3 = createFrame(640, 480, 66666, {rotation: 180, flip: true});
+  let frame4 = createFrame(640, 480, 99999, {rotation: 90, flip: true});
+
+  encoder.encode(frame1);
+  assert_throws_dom('DataError', () => encoder.encode(frame2));
+  assert_throws_dom('DataError', () => encoder.encode(frame3));
+  encoder.encode(frame4);
+
+  frame1.close();
+  frame2.close();
+  frame3.close();
+  frame4.close();
+
+  await encoder.flush();
+  encoder.close();
+  assert_equals(output_chunks.length, 2);
+  assert_equals(decoderConfig.rotation, 90);
+  assert_equals(decoderConfig.flip, true);
+}, 'Encode video frames with different orientation has non-fatal failures');
+
+promise_test(async t => {
+  let output_chunks = [];
+  let codecInit = getDefaultCodecInit(t);
+  let decoderConfig = null;
+  codecInit.output = (chunk, metadata) => {
+    assert_not_equals(metadata, null);
+    if (metadata.decoderConfig)
+      decoderConfig = metadata.decoderConfig;
+    output_chunks.push(chunk);
+  }
+
+  let encoder = new VideoEncoder(codecInit);
+  let config = defaultConfig;
+  encoder.configure(config);
+
+  let frame = createFrame(640, 480, 0, {rotation: 90, flip: true});
+  encoder.encode(frame);
+  frame.close();
+  await encoder.flush();
+  assert_equals(output_chunks.length, 1);
+  assert_equals(decoderConfig.rotation, 90);
+  assert_equals(decoderConfig.flip, true);
+
+  encoder.configure(config);
+  frame = createFrame(640, 480, 0, {rotation: 270, flip: false});
+  encoder.encode(frame);
+  frame.close();
+  await encoder.flush();
+  assert_equals(output_chunks.length, 2);
+  assert_equals(decoderConfig.rotation, 270);
+  assert_equals(decoderConfig.flip, false);
+
+  encoder.close();
+}, 'Encode video frames with different orientations after reconfigure');
diff --git a/tests/wpt/tests/webcodecs/video-encoder-rescaling.https.any.js b/tests/wpt/tests/webcodecs/video-encoder-rescaling.https.any.js
index 70bafa04964..a7f89da67bc 100644
--- a/tests/wpt/tests/webcodecs/video-encoder-rescaling.https.any.js
+++ b/tests/wpt/tests/webcodecs/video-encoder-rescaling.https.any.js
@@ -216,10 +216,16 @@ for (const scale of scaleTests) {
 
       const error = testImageData(outputArrayBuffer, {
         channelOffsets: [offset, offset + 1, offset + 2],
-        channelWidths: [outputFrame.codedWidth, outputFrame.codedWidth, outputFrame.codedWidth],
+        channelWidths: [
+          outputFrame.visibleRect.width, outputFrame.visibleRect.width,
+          outputFrame.visibleRect.width
+        ],
         channelStrides: [stride, stride, stride],
         channelSteps: [4, 4, 4],
-        channelHeights: [outputFrame.codedHeight, outputFrame.codedHeight, outputFrame.codedHeight],
+        channelHeights: [
+          outputFrame.visibleRect.height, outputFrame.visibleRect.height,
+          outputFrame.visibleRect.height
+        ],
         channelFourColors: fourColors.map((col) => col)
       });
       outputFrame.close();
diff --git a/tests/wpt/tests/webcodecs/video-encoder-utils.js b/tests/wpt/tests/webcodecs/video-encoder-utils.js
index 916f995156e..5c8d17e5bfe 100644
--- a/tests/wpt/tests/webcodecs/video-encoder-utils.js
+++ b/tests/wpt/tests/webcodecs/video-encoder-utils.js
@@ -81,13 +81,21 @@ function validateBlackDots(frame, count) {
   return true;
 }
 
-function createFrame(width, height, ts = 0) {
+function createFrame(width, height, ts = 0, additionalOptions = {}) {
   let duration = 33333;  // 30fps
   let text = ts.toString();
   let cnv = new OffscreenCanvas(width, height);
   var ctx = cnv.getContext('2d');
   fourColorsFrame(ctx, width, height, text);
-  return new VideoFrame(cnv, { timestamp: ts, duration });
+
+  // Merge the default options with the provided additionalOptions
+  const videoFrameOptions = {
+    timestamp: ts,
+    duration,
+    ...additionalOptions, // Spread the additional options to merge them
+  };
+
+  return new VideoFrame(cnv, videoFrameOptions);
 }
 
 function createDottedFrame(width, height, dots, ts) {
diff --git a/tests/wpt/tests/webdriver/tests/bidi/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/__init__.py
index 8e45c0f7265..587dc91a938 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/__init__.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/__init__.py
@@ -68,6 +68,14 @@ def any_list_or_null(actual: Any) -> None:
         any_list(actual)
 
 
+def any_positive_int(actual):
+    def _(actual: Any) -> None:
+        any_int(actual)
+        assert actual > 0
+
+    return _
+
+
 def any_string(actual: Any) -> None:
     assert isinstance(actual, str)
 
@@ -124,7 +132,7 @@ def assert_handle(obj: Mapping[str, Any], should_contain_handle: bool) -> None:
         assert "handle" not in obj, f"Result should not contain `handle`. Actual: {obj}"
 
 
-async def create_console_api_message(bidi_session, context: str, text: str):
+async def create_console_api_message(bidi_session, context: Any, text: str):
     await bidi_session.script.call_function(
         function_declaration="""(text) => console.log(text)""",
         arguments=[{"type": "string", "value": text}],
@@ -134,7 +142,7 @@ async def create_console_api_message(bidi_session, context: str, text: str):
     return text
 
 
-async def get_device_pixel_ratio(bidi_session, context: str) -> float:
+async def get_device_pixel_ratio(bidi_session, context: Any) -> float:
     result = await bidi_session.script.call_function(
         function_declaration="""() => {
         return window.devicePixelRatio;
@@ -159,7 +167,7 @@ async def get_element_dimensions(bidi_session, context, element):
     return remote_mapping_to_dict(result["value"])
 
 
-async def get_viewport_dimensions(bidi_session, context: str,
+async def get_viewport_dimensions(bidi_session, context: Any,
       with_scrollbar: bool = True, quirk_mode: bool = False):
     if with_scrollbar:
         expression = """
@@ -190,7 +198,7 @@ async def get_viewport_dimensions(bidi_session, context: str,
     return remote_mapping_to_dict(result["value"])
 
 
-async def get_document_dimensions(bidi_session, context: str):
+async def get_document_dimensions(bidi_session, context: Any):
     expression = """
         ({
           height: document.documentElement.scrollHeight,
@@ -206,9 +214,20 @@ async def get_document_dimensions(bidi_session, context: str):
     return remote_mapping_to_dict(result["value"])
 
 
+async def get_context_origin(bidi_session, context: Mapping[str, Any]) -> str:
+    result = await bidi_session.script.call_function(
+        function_declaration="""() => {
+          return window.location.origin;
+        }""",
+        target=ContextTarget(context["context"]),
+        await_promise=False)
+    return result["value"]
+
+
 def remote_mapping_to_dict(js_object) -> Dict:
     obj = {}
     for key, value in js_object:
-        obj[key] = value["value"]
+        if value["type"] != "null":
+            obj[key] = value["value"]
 
     return obj
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/__init__.py
index 606ac071ed7..8987e12a967 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/__init__.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/__init__.py
@@ -19,6 +19,7 @@ def assert_browsing_context(
     parent=None,
     url=None,
     user_context="default",
+    client_window=None
 ):
     assert "children" in info
     if children is not None:
@@ -53,6 +54,8 @@ def assert_browsing_context(
     assert info["url"] == url
     assert info["userContext"] == user_context
     assert info["originalOpener"] == original_opener
+    if client_window is not None:
+        assert info["clientWindow"] == client_window
 
 
 async def assert_document_status(bidi_session, context, visible, focused):
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_created/context_created.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_created/context_created.py
index 152bcdb018b..2982f78d991 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_created/context_created.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_created/context_created.py
@@ -346,3 +346,23 @@ async def test_existing_context_via_user_context(bidi_session, create_user_conte
         parent=None,
         user_context=user_context
     )
+
+
+@pytest.mark.parametrize("type_hint", ["tab", "window"])
+async def test_client_window(bidi_session, wait_for_event, wait_for_future_safe, subscribe_events, type_hint):
+    await subscribe_events([CONTEXT_CREATED_EVENT])
+
+    on_entry = wait_for_event(CONTEXT_CREATED_EVENT)
+    top_level_context = await bidi_session.browsing_context.create(type_hint=type_hint)
+    context_info = await wait_for_future_safe(on_entry)
+    contexts = await bidi_session.browsing_context.get_tree(root=top_level_context["context"])
+
+    assert_browsing_context(
+        context_info,
+        top_level_context["context"],
+        children=None,
+        url="about:blank",
+        parent=None,
+        user_context="default",
+        client_window=contexts[0]["clientWindow"]
+    )
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_destroyed/context_destroyed.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_destroyed/context_destroyed.py
index 254708c725a..2fd0cd6bb47 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_destroyed/context_destroyed.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_destroyed/context_destroyed.py
@@ -363,3 +363,25 @@ async def test_with_user_context_subscription(
             parent=None,
             user_context=user_context,
         )
+
+
+@pytest.mark.parametrize("type_hint", ["tab", "window"])
+async def test_client_window(bidi_session, wait_for_event, wait_for_future_safe, subscribe_events, type_hint):
+    await subscribe_events([CONTEXT_DESTROYED_EVENT])
+
+    on_entry = wait_for_event(CONTEXT_DESTROYED_EVENT)
+    top_level_context = await bidi_session.browsing_context.create(type_hint=type_hint)
+    contexts = await bidi_session.browsing_context.get_tree(root=top_level_context["context"])
+
+    await bidi_session.browsing_context.close(context=top_level_context["context"])
+    context_info = await wait_for_future_safe(on_entry)
+
+    assert_browsing_context(
+        context_info,
+        top_level_context["context"],
+        children=0,
+        url="about:blank",
+        parent=None,
+        user_context="default",
+        client_window=contexts[0]["clientWindow"]
+    )
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/download_will_begin/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/download_will_begin/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/download_will_begin/download_will_begin.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/download_will_begin/download_will_begin.py
new file mode 100644
index 00000000000..7e402783aad
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/download_will_begin/download_will_begin.py
@@ -0,0 +1,78 @@
+import pytest
+from tests.support.sync import AsyncPoll
+from webdriver.bidi.modules.script import ContextTarget
+from webdriver.error import TimeoutException
+
+from ... import (any_int, any_string, recursive_compare)
+
+pytestmark = pytest.mark.asyncio
+
+DOWNLOAD_WILL_BEGIN = "browsingContext.downloadWillBegin"
+
+
+async def test_unsubscribe(bidi_session, inline, new_tab, wait_for_event,
+        wait_for_future_safe):
+    filename = 'some_file_name.txt'
+    download_link = "data:text/plain;charset=utf-8,"
+    url = inline(
+        f"""<a id="download_link" href="{download_link}" download="{filename}">download</a>""")
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=url, wait="complete"
+    )
+
+    await bidi_session.session.subscribe(events=[DOWNLOAD_WILL_BEGIN])
+    await bidi_session.session.unsubscribe(events=[DOWNLOAD_WILL_BEGIN])
+
+    # Track all received events in the events array
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(DOWNLOAD_WILL_BEGIN,
+                                                      on_event)
+
+    await bidi_session.script.evaluate(
+        expression=
+        "download_link.click()",
+        target=ContextTarget(new_tab["context"]),
+        await_promise=True,
+        user_activation=True)
+
+    wait = AsyncPoll(bidi_session, timeout=0.5)
+    with pytest.raises(TimeoutException):
+        await wait.until(lambda _: len(events) > 0)
+
+    remove_listener()
+
+
+async def test_subscribe(bidi_session, subscribe_events, new_tab, inline,
+        wait_for_event, wait_for_future_safe):
+    filename = 'some_file_name.txt'
+    download_link = "data:text/plain;charset=utf-8,"
+    url = inline(
+        f"""<a id="download_link" href="{download_link}" download="{filename}">download</a>""")
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=url, wait="complete"
+    )
+
+    await bidi_session.session.subscribe(events=[DOWNLOAD_WILL_BEGIN])
+    on_entry = wait_for_event(DOWNLOAD_WILL_BEGIN)
+
+    await bidi_session.script.evaluate(
+        expression=
+        "download_link.click()",
+        target=ContextTarget(new_tab["context"]),
+        await_promise=True,
+        user_activation=True)
+
+    event = await wait_for_future_safe(on_entry)
+    recursive_compare({
+        'context': new_tab["context"],
+        'navigation': any_string,
+        'suggestedFilename': filename,
+        'timestamp': any_int,
+        'url': download_link,
+    }, event)
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/frames.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/frames.py
index 4fd220ed8fc..df4ff899e90 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/frames.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/frames.py
@@ -29,6 +29,7 @@ async def test_multiple_frames(
         children=2,
         parent=None,
         url=test_page_multiple_frames,
+        client_window=top_context["clientWindow"],
     )
 
     child1_info = root_info["children"][0]
@@ -39,6 +40,7 @@ async def test_multiple_frames(
         parent_expected=False,
         parent=None,
         url=test_page,
+        client_window=top_context["clientWindow"],
     )
     assert child1_info["context"] != root_info["context"]
 
@@ -50,6 +52,7 @@ async def test_multiple_frames(
         parent_expected=False,
         parent=None,
         url=test_page2,
+        client_window=top_context["clientWindow"],
     )
     assert child2_info["context"] != root_info["context"]
     assert child2_info["context"] != child1_info["context"]
@@ -77,6 +80,7 @@ async def test_cross_origin(
         children=1,
         parent=None,
         url=test_page_cross_origin_frame,
+        client_window=top_context["clientWindow"],
     )
 
     child1_info = root_info["children"][0]
@@ -87,6 +91,7 @@ async def test_cross_origin(
         parent_expected=False,
         parent=None,
         url=test_page_cross_origin,
+        client_window=top_context["clientWindow"],
     )
     assert child1_info["context"] != root_info["context"]
 
@@ -98,11 +103,12 @@ async def test_user_context(
     create_user_context,
     subscribe_events,
     wait_for_event,
+    wait_for_future_safe,
     inline,
     user_context,
     domain,
 ):
-    await subscribe_events(["browsingContext.load"])
+    await subscribe_events(["browsingContext.contextCreated", "browsingContext.load"])
 
     user_context_id = (
         await create_user_context() if user_context == "new" else user_context
@@ -114,9 +120,11 @@ async def test_user_context(
         f"<iframe src='{iframe_url_1}'></iframe><iframe src='{iframe_url_2}'></iframe>"
     )
 
+    on_context_created = wait_for_event("browsingContext.contextCreated")
     context = await bidi_session.browsing_context.create(
         type_hint="tab", user_context=user_context_id
     )
+    context_info = await wait_for_future_safe(on_context_created)
 
     # Record all load events.
     events = []
@@ -146,6 +154,7 @@ async def test_user_context(
         parent=None,
         url=page_url,
         user_context=user_context_id,
+        client_window=context_info["clientWindow"],
     )
 
     # The contexts can be returned in any order, find the info matching iframe_url_1
@@ -162,6 +171,7 @@ async def test_user_context(
         parent=None,
         url=iframe_url_1,
         user_context=user_context_id,
+        client_window=context_info["clientWindow"],
     )
     assert child1_info["context"] != root_info["context"]
 
@@ -178,6 +188,7 @@ async def test_user_context(
         parent=None,
         url=iframe_url_2,
         user_context=user_context_id,
+        client_window=context_info["clientWindow"],
     )
     assert child2_info["context"] != root_info["context"]
     assert child2_info["context"] != child1_info["context"]
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/max_depth.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/max_depth.py
index b855b8e7eba..9f7130f59c9 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/max_depth.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/max_depth.py
@@ -33,6 +33,7 @@ async def test_null(
         children=1,
         parent=None,
         url=test_page_nested_frames,
+        client_window=top_context["clientWindow"],
     )
 
     child1_info = root_info["children"][0]
@@ -43,6 +44,7 @@ async def test_null(
         parent_expected=False,
         parent=None,
         url=test_page_same_origin_frame,
+        client_window=top_context["clientWindow"],
     )
     assert child1_info["context"] != root_info["context"]
 
@@ -54,6 +56,7 @@ async def test_null(
         parent_expected=False,
         parent=None,
         url=test_page,
+        client_window=top_context["clientWindow"],
     )
     assert child2_info["context"] != root_info["context"]
     assert child2_info["context"] != child1_info["context"]
@@ -79,6 +82,7 @@ async def test_top_level_only(bidi_session, top_context, test_page_nested_frames
         children=None,
         parent=None,
         url=test_page_nested_frames,
+        client_window=top_context["clientWindow"],
     )
 
 
@@ -107,6 +111,7 @@ async def test_top_level_and_one_child(
         children=1,
         parent=None,
         url=test_page_nested_frames,
+        client_window=top_context["clientWindow"],
     )
 
     child1_info = root_info["children"][0]
@@ -117,5 +122,6 @@ async def test_top_level_and_one_child(
         parent_expected=False,
         parent=None,
         url=test_page_same_origin_frame,
+        client_window=top_context["clientWindow"],
     )
     assert child1_info["context"] != root_info["context"]
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/root.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/root.py
index 40e9f8ac93b..171cc0eb607 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/root.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/root.py
@@ -6,13 +6,17 @@ pytestmark = pytest.mark.asyncio
 
 
 @pytest.mark.parametrize("type_hint", ["tab", "window"])
-async def test_null(bidi_session, top_context, test_page, type_hint):
+async def test_null(bidi_session, top_context, test_page, wait_for_event, wait_for_future_safe, subscribe_events, type_hint):
+    await subscribe_events(["browsingContext.contextCreated"])
+
     await bidi_session.browsing_context.navigate(
         context=top_context["context"], url=test_page, wait="complete"
     )
 
     current_top_level_context_id = top_context["context"]
+    on_context_created = wait_for_event("browsingContext.contextCreated")
     other_top_level_context = await bidi_session.browsing_context.create(type_hint=type_hint)
+    context_info = await wait_for_future_safe(on_context_created)
     other_top_level_context_id = other_top_level_context["context"]
 
     # Retrieve all top-level browsing contexts
@@ -32,6 +36,7 @@ async def test_null(bidi_session, top_context, test_page, type_hint):
         children=0,
         parent=None,
         url=test_page,
+        client_window=top_context["clientWindow"],
     )
 
     assert_browsing_context(
@@ -40,16 +45,22 @@ async def test_null(bidi_session, top_context, test_page, type_hint):
         children=0,
         parent=None,
         url="about:blank",
+        client_window=context_info["clientWindow"],
     )
 
 
 @pytest.mark.parametrize("type_hint", ["tab", "window"])
-async def test_top_level_context(bidi_session, top_context, test_page, type_hint):
+async def test_top_level_context(bidi_session, top_context, test_page, wait_for_event, wait_for_future_safe, subscribe_events, type_hint):
+
+    await subscribe_events(["browsingContext.contextCreated"])
+
     await bidi_session.browsing_context.navigate(
         context=top_context["context"], url=test_page, wait="complete"
     )
 
+    on_context_created = wait_for_event("browsingContext.contextCreated")
     other_top_level_context = await bidi_session.browsing_context.create(type_hint=type_hint)
+    context_info = await wait_for_future_safe(on_context_created)
     other_top_level_context_id = other_top_level_context["context"]
     # Retrieve all browsing contexts of the newly opened tab/window
     contexts = await bidi_session.browsing_context.get_tree(root=other_top_level_context_id)
@@ -61,6 +72,7 @@ async def test_top_level_context(bidi_session, top_context, test_page, type_hint
         children=0,
         parent=None,
         url="about:blank",
+        client_window=context_info["clientWindow"],
     )
 
 
@@ -86,6 +98,7 @@ async def test_child_context(
         children=1,
         parent=None,
         url=test_page_nested_frames,
+        client_window=top_context["clientWindow"],
     )
 
     child1_info = root_info["children"][0]
@@ -96,6 +109,7 @@ async def test_child_context(
         parent_expected=False,
         parent=None,
         url=test_page_same_origin_frame,
+        client_window=top_context["clientWindow"],
     )
 
     # Now retrieve all browsing contexts for the first browsing context child
@@ -108,6 +122,7 @@ async def test_child_context(
         children=1,
         parent=root_info["context"],
         url=test_page_same_origin_frame,
+        client_window=top_context["clientWindow"],
     )
 
     assert child1_info["children"][0] == child_contexts[0]["children"][0]
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/set_viewport/user_contexts.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/set_viewport/user_contexts.py
index 64c26163734..fa1e748d6b2 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/set_viewport/user_contexts.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/set_viewport/user_contexts.py
@@ -1,11 +1,13 @@
 import pytest
+from webdriver.bidi.modules.script import ContextTarget
 from webdriver.bidi.undefined import UNDEFINED
 
 from ... import get_device_pixel_ratio, get_viewport_dimensions
 
-
 pytestmark = pytest.mark.asyncio
 
+CONTEXT_LOAD_EVENT = "browsingContext.load"
+
 
 async def test_set_to_user_context(bidi_session, new_tab, create_user_context):
     user_context = await create_user_context()
@@ -55,6 +57,48 @@ async def test_set_to_user_context(bidi_session, new_tab, create_user_context):
     )
 
 
+async def test_set_to_user_context_window_open(
+    bidi_session,
+    new_tab,
+    create_user_context,
+    inline,
+    subscribe_events,
+    wait_for_event,
+    wait_for_future_safe,
+):
+    user_context = await create_user_context()
+    context_in_user_context_1 = await bidi_session.browsing_context.create(
+        user_context=user_context, type_hint="tab"
+    )
+
+    test_viewport = {"width": 250, "height": 300}
+    await bidi_session.browsing_context.set_viewport(
+        user_contexts=[user_context], viewport=test_viewport
+    )
+    assert (
+        await get_viewport_dimensions(bidi_session, context_in_user_context_1)
+        == test_viewport
+    )
+
+    await subscribe_events(events=[CONTEXT_LOAD_EVENT])
+
+    # Assert that tabs opened via window.open in the same user context
+    # successfully load and have the right viewport set.
+    on_load = wait_for_event(CONTEXT_LOAD_EVENT)
+    result = await bidi_session.script.evaluate(
+        await_promise=False,
+        expression=f"""window.open('{inline("popup")}')""",
+        target=ContextTarget(context_in_user_context_1["context"]),
+    )
+    event = await wait_for_future_safe(on_load)
+
+    contexts = await bidi_session.browsing_context.get_tree(root=event["context"])
+    assert len(contexts) == 1
+    popup_context = contexts[0]
+
+    assert await get_viewport_dimensions(bidi_session, popup_context) == test_viewport
+
+
 async def test_set_to_default_user_context(bidi_session, new_tab, create_user_context):
     user_context = await create_user_context()
     context_in_user_context_1 = await bidi_session.browsing_context.create(
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_closed/beforeunload.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_closed/beforeunload.py
index ab16526fdb1..bfc857168cb 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_closed/beforeunload.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_closed/beforeunload.py
@@ -1,7 +1,8 @@
+import asyncio
 import pytest
-from webdriver.error import TimeoutException
 
-from tests.support.sync import AsyncPoll
+import webdriver.bidi.error as error
+
 
 pytestmark = pytest.mark.asyncio
 
@@ -26,12 +27,12 @@ async def test_beforeunload(
 
     on_entry = wait_for_event(USER_PROMPT_OPENED_EVENT)
 
-    await bidi_session.send_command(
-        "browsingContext.navigate",
-        {
-            "context": new_tab["context"],
-            "url": url("/webdriver/tests/support/html/default.html"),
-        },
+    navigated_future = asyncio.create_task(
+        bidi_session.browsing_context.navigate(
+            context=new_tab["context"],
+            url=url("/webdriver/tests/support/html/default.html"),
+            wait="none"
+        )
     )
 
     # Wait for prompt to appear.
@@ -50,3 +51,10 @@ async def test_beforeunload(
         "accepted": accept,
         "type": "beforeunload",
     }
+
+    # Wait for the navigation to finish or fail.
+    if accept:
+        await navigated_future
+    else:
+        with pytest.raises(error.UnknownErrorException):
+            await wait_for_future_safe(navigated_future)
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_closed/user_prompt_closed.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_closed/user_prompt_closed.py
index fdb9e8b3ca7..8322829ebaf 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_closed/user_prompt_closed.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_closed/user_prompt_closed.py
@@ -318,7 +318,7 @@ async def test_iframe(
     event = await wait_for_future_safe(on_prompt_closed)
 
     assert event == {
-        "context": new_tab["context"],
+        "context": frame["context"],
         "accepted": True,
         "type": "alert",
     }
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_opened/beforeunload.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_opened/beforeunload.py
index 782cc766507..4b0346cde83 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_opened/beforeunload.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_opened/beforeunload.py
@@ -1,3 +1,4 @@
+import asyncio
 import pytest
 
 from .. import (
@@ -25,12 +26,12 @@ async def test_beforeunload(
 
     await setup_beforeunload_page(new_tab)
 
-    await bidi_session.send_command(
-        "browsingContext.navigate",
-        {
-            "context": new_tab["context"],
-            "url": url("/webdriver/tests/support/html/default.html"),
-        },
+    navigation_future = asyncio.create_task(
+        bidi_session.browsing_context.navigate(
+            context=new_tab["context"],
+            url=url("/webdriver/tests/support/html/default.html"),
+            wait="none"
+        )
     )
 
     event = await wait_for_future_safe(on_entry)
@@ -43,3 +44,6 @@ async def test_beforeunload(
         },
         event,
     )
+
+    # Cancel the navigation future to avoid pending task failures.
+    navigation_future.cancel()
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_opened/user_prompt_opened.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_opened/user_prompt_opened.py
index c24128004f7..a9051f662c8 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_opened/user_prompt_opened.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_opened/user_prompt_opened.py
@@ -197,7 +197,7 @@ async def test_iframe(
     event = await wait_for_future_safe(on_entry)
 
     assert event == {
-        "context": new_tab["context"],
+        "context": frame["context"],
         "type": "alert",
         "handler": "dismiss",
         "message": "in iframe",
diff --git a/tests/wpt/tests/webdriver/tests/bidi/emulation/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/emulation/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/__init__.py
new file mode 100644
index 00000000000..5e1fd1aa863
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/__init__.py
@@ -0,0 +1 @@
+TEST_COORDINATES = {"latitude": 10, "longitude": 15, "accuracy": 0.5}
diff --git a/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/conftest.py b/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/conftest.py
new file mode 100644
index 00000000000..5fb9451f0a2
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/conftest.py
@@ -0,0 +1,63 @@
+import pytest_asyncio
+
+from webdriver.bidi.modules.script import ContextTarget
+
+from ... import get_context_origin, remote_mapping_to_dict
+
+
+@pytest_asyncio.fixture
+async def get_current_geolocation(bidi_session, configuration):
+    async def get_current_geolocation(context):
+        # Per geolocation spec, the geolocation coordinates are returned
+        # only for an active browsing context. It might be required to
+        # re-activate the previously active tab in the test.
+        await bidi_session.browsing_context.activate(context=context["context"])
+
+        result = await bidi_session.script.call_function(
+            function_declaration="""(multiplier) =>
+                new Promise(
+                    resolve => window.navigator.geolocation.getCurrentPosition(
+                        position => resolve(position.coords.toJSON()),
+                        error => resolve({code: error.code}),
+                        {timeout: 500 * multiplier}
+                ))
+            """,
+            arguments=[{"type": "number", "value": configuration["timeout_multiplier"]}],
+            target=ContextTarget(context["context"]),
+            await_promise=True,
+        )
+
+        return remote_mapping_to_dict(result["value"])
+
+    return get_current_geolocation
+
+
+@pytest_asyncio.fixture
+async def set_geolocation_permission(bidi_session):
+    data_to_cleanup = {}
+
+    async def set_geolocation_permission(context, user_context="default"):
+        nonlocal data_to_cleanup
+
+        origin = await get_context_origin(bidi_session, context)
+
+        data_to_cleanup = {
+            "origin": origin,
+            "user_context": user_context,
+        }
+
+        await bidi_session.permissions.set_permission(
+            descriptor={"name": "geolocation"},
+            state="granted",
+            origin=origin,
+            user_context=user_context,
+        )
+
+    yield set_geolocation_permission
+
+    await bidi_session.permissions.set_permission(
+        descriptor={"name": "geolocation"},
+        state="prompt",
+        origin=data_to_cleanup["origin"],
+        user_context=data_to_cleanup["user_context"],
+    )
diff --git a/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/contexts.py b/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/contexts.py
new file mode 100644
index 00000000000..068bb804e73
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/contexts.py
@@ -0,0 +1,97 @@
+import pytest
+
+from webdriver.bidi.modules.emulation import CoordinatesOptions
+
+from . import TEST_COORDINATES
+
+
+pytestmark = pytest.mark.asyncio
+
+
+async def test_contexts(
+    bidi_session, new_tab, top_context, url, get_current_geolocation, set_geolocation_permission
+):
+    test_url = url("/common/blank.html")
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await set_geolocation_permission(new_tab)
+
+    default_coordinates = await get_current_geolocation(new_tab)
+
+    assert default_coordinates != TEST_COORDINATES
+    assert await get_current_geolocation(top_context) == default_coordinates
+
+    # Set geolocation override.
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[new_tab["context"]],
+        coordinates=CoordinatesOptions(
+            latitude=TEST_COORDINATES["latitude"],
+            longitude=TEST_COORDINATES["longitude"],
+            accuracy=TEST_COORDINATES["accuracy"],
+        ),
+    )
+
+    assert await get_current_geolocation(new_tab) == TEST_COORDINATES
+    assert await get_current_geolocation(top_context) == default_coordinates
+
+    # Reset geolocation override.
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[new_tab["context"]], coordinates=None
+    )
+
+    assert await get_current_geolocation(new_tab) == default_coordinates
+    assert await get_current_geolocation(top_context) == default_coordinates
+
+
+async def test_multiple_contexts(
+    bidi_session, new_tab, url, get_current_geolocation, set_geolocation_permission
+):
+    new_context = await bidi_session.browsing_context.create(type_hint="tab")
+    test_url = url("/common/blank.html")
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await bidi_session.browsing_context.navigate(
+        context=new_context["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await set_geolocation_permission(new_tab)
+
+    default_coordinates = await get_current_geolocation(new_tab)
+
+    assert default_coordinates != TEST_COORDINATES
+    assert await get_current_geolocation(new_context) == default_coordinates
+
+    # Set geolocation override.
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[new_tab["context"], new_context["context"]],
+        coordinates=CoordinatesOptions(
+            latitude=TEST_COORDINATES["latitude"],
+            longitude=TEST_COORDINATES["longitude"],
+            accuracy=TEST_COORDINATES["accuracy"],
+        ),
+    )
+
+    assert await get_current_geolocation(new_tab) == TEST_COORDINATES
+    assert await get_current_geolocation(new_context) == TEST_COORDINATES
+
+    # Reset geolocation override.
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[new_tab["context"], new_context["context"]], coordinates=None
+    )
+
+    # The new coordinates can be different from the initial ones if the position
+    # was not available at the beginning.
+    assert await get_current_geolocation(new_tab) != TEST_COORDINATES
+    assert await get_current_geolocation(new_context) != TEST_COORDINATES
diff --git a/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/coordinates.py b/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/coordinates.py
new file mode 100644
index 00000000000..ea4fe643c3e
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/coordinates.py
@@ -0,0 +1,219 @@
+import pytest
+
+from webdriver.bidi.modules.emulation import CoordinatesOptions
+from webdriver.bidi.modules.script import ContextTarget
+
+from ... import remote_mapping_to_dict
+
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest.mark.parametrize(
+    "test_coordinates",
+    [
+        ({"latitude": 4, "longitude": 2}),
+        ({"latitude": 4, "longitude": 2, "accuracy": 0.5}),
+        ({"latitude": 4, "longitude": 2, "altitude": 2}),
+        ({"latitude": 4, "longitude": 2, "altitude": 2, "altitudeAccuracy": 3}),
+        ({"latitude": 4, "longitude": 2, "speed": 7}),
+        ({"latitude": 4, "longitude": 2, "heading": 8}),
+    ],
+)
+async def test_get_current_position(
+    bidi_session,
+    new_tab,
+    url,
+    get_current_geolocation,
+    set_geolocation_permission,
+    test_coordinates,
+):
+    test_url = url("/common/blank.html")
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await set_geolocation_permission(new_tab)
+
+    default_coordinates = await get_current_geolocation(new_tab)
+
+    # Set default accuracy value.
+    if "accuracy" not in test_coordinates:
+        test_coordinates["accuracy"] = 1
+
+    assert default_coordinates != test_coordinates
+
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[new_tab["context"]], coordinates=test_coordinates
+    )
+
+    assert await get_current_geolocation(new_tab) == test_coordinates
+
+
+async def test_watch_position(
+    bidi_session,
+    new_tab,
+    url,
+    subscribe_events,
+    wait_for_event,
+    wait_for_future_safe,
+    set_geolocation_permission,
+):
+    await subscribe_events(["script.message"])
+
+    test_url = url("/common/blank.html")
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await set_geolocation_permission(new_tab)
+
+    test_override_1 = {"latitude": 0, "longitude": 0, "accuracy": 1}
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[new_tab["context"]],
+        coordinates=CoordinatesOptions(
+            latitude=test_override_1["latitude"],
+            longitude=test_override_1["longitude"],
+            accuracy=test_override_1["accuracy"],
+        ),
+    )
+
+    on_script_message = wait_for_event("script.message")
+    await bidi_session.browsing_context.activate(context=new_tab["context"])
+    watch_id = await bidi_session.script.call_function(
+        arguments=[{"type": "channel", "value": {"channel": "channel_name"}}],
+        function_declaration="""(channel) =>
+            window.navigator.geolocation.watchPosition(
+                (result) => channel(result.coords.toJSON())
+            )
+        """,
+        target=ContextTarget(new_tab["context"]),
+        await_promise=False,
+    )
+    event_data = await wait_for_future_safe(on_script_message)
+
+    assert remote_mapping_to_dict(event_data["data"]["value"]) == test_override_1
+
+    test_override_2 = {"latitude": 10, "longitude": 10, "accuracy": 3}
+    on_script_message = wait_for_event("script.message")
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[new_tab["context"]],
+        coordinates=CoordinatesOptions(
+            latitude=test_override_2["latitude"],
+            longitude=test_override_2["longitude"],
+            accuracy=test_override_2["accuracy"],
+        ),
+    )
+    event_data = await wait_for_future_safe(on_script_message)
+
+    assert remote_mapping_to_dict(event_data["data"]["value"]) == test_override_2
+
+    test_override_3 = {"latitude": 20, "longitude": 10, "accuracy": 1}
+    on_script_message = wait_for_event("script.message")
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[new_tab["context"]],
+        coordinates=CoordinatesOptions(
+            latitude=test_override_3["latitude"],
+            longitude=test_override_3["longitude"],
+            accuracy=test_override_3["accuracy"],
+        ),
+    )
+    event_data = await wait_for_future_safe(on_script_message)
+
+    assert remote_mapping_to_dict(event_data["data"]["value"]) == test_override_3
+
+    # Clear the geolocation watcher.
+    await bidi_session.script.call_function(
+        arguments=[{"type": "number", "value": watch_id["value"]}],
+        function_declaration="""(watchId) =>
+            window.navigator.geolocation.clearWatch(watchId)
+        """,
+        target=ContextTarget(new_tab["context"]),
+        await_promise=False,
+    )
+
+
+async def test_persists_on_reload(
+    bidi_session, url, new_tab, get_current_geolocation, set_geolocation_permission
+):
+    test_url = url("/common/blank.html")
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await set_geolocation_permission(new_tab)
+    test_coordinates = {"latitude": 4, "longitude": 2, "accuracy": 3}
+
+    # Set geolocation override.
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[new_tab["context"]],
+        coordinates=CoordinatesOptions(
+            latitude=test_coordinates["latitude"],
+            longitude=test_coordinates["longitude"],
+            accuracy=test_coordinates["accuracy"],
+        ),
+    )
+
+    assert await get_current_geolocation(new_tab) == test_coordinates
+
+    await bidi_session.browsing_context.reload(
+        context=new_tab["context"], wait="complete"
+    )
+
+    assert await get_current_geolocation(new_tab) == test_coordinates
+
+
+async def test_persists_on_navigation(
+    bidi_session, url, new_tab, get_current_geolocation, set_geolocation_permission
+):
+    test_url = url("/common/blank.html")
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await set_geolocation_permission(new_tab)
+    test_coordinates = {"latitude": 4, "longitude": 2, "accuracy": 3}
+
+    # Set geolocation override.
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[new_tab["context"]],
+        coordinates=CoordinatesOptions(
+            latitude=test_coordinates["latitude"],
+            longitude=test_coordinates["longitude"],
+            accuracy=test_coordinates["accuracy"],
+        ),
+    )
+
+    assert await get_current_geolocation(new_tab) == test_coordinates
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=url("/webdriver/tests/support/html/default.html"),
+        wait="complete",
+    )
+
+    assert await get_current_geolocation(new_tab) == test_coordinates
+
+
+async def test_reset_without_override(
+    bidi_session, new_tab, url, get_current_geolocation, set_geolocation_permission
+):
+    test_url = url("/common/blank.html")
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await set_geolocation_permission(new_tab)
+
+    default_coordinates = await get_current_geolocation(new_tab)
+
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[new_tab["context"]], coordinates=None
+    )
+
+    assert await get_current_geolocation(new_tab) == default_coordinates
diff --git a/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/error.py b/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/error.py
new file mode 100644
index 00000000000..27c23dc7811
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/error.py
@@ -0,0 +1,123 @@
+import pytest
+
+from webdriver.bidi.modules.script import ContextTarget
+
+from ... import remote_mapping_to_dict
+
+pytestmark = pytest.mark.asyncio
+
+ERROR = {"type": "positionUnavailable"}
+EXPECTED_ERROR = {"code": 2}
+
+
+async def test_get_current_position(bidi_session, new_tab, url,
+        get_current_geolocation, set_geolocation_permission):
+    test_url = url("/common/blank.html")
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await set_geolocation_permission(new_tab)
+
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[new_tab["context"]], error=ERROR
+    )
+
+    assert await get_current_geolocation(new_tab) == EXPECTED_ERROR
+
+
+async def test_watch_position(
+        bidi_session,
+        new_tab,
+        url,
+        subscribe_events,
+        wait_for_event,
+        wait_for_future_safe,
+        set_geolocation_permission,
+):
+    await subscribe_events(["script.message"])
+
+    test_url = url("/common/blank.html")
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await set_geolocation_permission(new_tab)
+
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[new_tab["context"]],
+        error=ERROR
+    )
+
+    on_script_message = wait_for_event("script.message")
+    await bidi_session.browsing_context.activate(context=new_tab["context"])
+    await bidi_session.script.call_function(
+        arguments=[{"type": "channel", "value": {"channel": "channel_name"}}],
+        function_declaration="""(channel) =>
+            window.navigator.geolocation.watchPosition(
+                (result) => channel("unexpected result"),
+                (error) => channel({code: error.code})
+            )
+        """,
+        target=ContextTarget(new_tab["context"]),
+        await_promise=False,
+    )
+    event_data = await wait_for_future_safe(on_script_message)
+
+    assert remote_mapping_to_dict(event_data["data"]["value"]) == EXPECTED_ERROR
+
+
+async def test_persists_on_reload(
+        bidi_session, url, new_tab, get_current_geolocation, set_geolocation_permission
+):
+    test_url = url("/common/blank.html")
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await set_geolocation_permission(new_tab)
+
+    # Set geolocation override.
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[new_tab["context"]],
+        error=ERROR,
+    )
+
+    assert await get_current_geolocation(new_tab) == EXPECTED_ERROR
+
+    await bidi_session.browsing_context.reload(
+        context=new_tab["context"], wait="complete"
+    )
+
+    assert await get_current_geolocation(new_tab) == EXPECTED_ERROR
+
+
+async def test_persists_on_navigation(
+        bidi_session, url, new_tab, get_current_geolocation, set_geolocation_permission
+):
+    test_url = url("/common/blank.html")
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await set_geolocation_permission(new_tab)
+
+    # Set geolocation override.
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[new_tab["context"]],
+        error=ERROR,
+    )
+
+    assert await get_current_geolocation(new_tab) == EXPECTED_ERROR
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=url("/webdriver/tests/support/html/default.html"),
+        wait="complete",
+    )
+
+    assert await get_current_geolocation(new_tab) == EXPECTED_ERROR
diff --git a/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/invalid.py
new file mode 100644
index 00000000000..2334d37517d
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/invalid.py
@@ -0,0 +1,391 @@
+import pytest
+
+import webdriver.bidi.error as error
+from webdriver.bidi.modules.emulation import CoordinatesOptions
+
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest.mark.parametrize("value", [False, 42, "foo", {}])
+async def test_params_contexts_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=value,
+            coordinates={
+                "latitude": 10,
+                "longitude": 10,
+            },
+        )
+
+
+async def test_params_contexts_empty_list(bidi_session):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[],
+            coordinates={
+                "latitude": 10,
+                "longitude": 10,
+            },
+        )
+
+
+@pytest.mark.parametrize("value", [None, False, 42, [], {}])
+async def test_params_contexts_context_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[value],
+            coordinates={
+                "latitude": 10,
+                "longitude": 10,
+            },
+        )
+
+
+async def test_params_contexts_entry_invalid_value(bidi_session):
+    with pytest.raises(error.NoSuchFrameException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=["_invalid_"],
+            coordinates={
+                "latitude": 10,
+                "longitude": 10,
+            },
+        )
+
+
+async def test_params_contexts_iframe(bidi_session, new_tab, get_test_page):
+    url = get_test_page(as_frame=True)
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=url, wait="complete"
+    )
+
+    contexts = await bidi_session.browsing_context.get_tree(root=new_tab["context"])
+    assert len(contexts) == 1
+    frames = contexts[0]["children"]
+    assert len(frames) == 1
+
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[frames[0]["context"]],
+            coordinates={
+                "latitude": 10,
+                "longitude": 10,
+            },
+        )
+
+
+@pytest.mark.parametrize("value", [False, 42, "foo", []])
+async def test_params_coordinates_invalid_type(bidi_session, top_context, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates=value,
+        )
+
+
+async def test_params_coordinates_empty_object(bidi_session, top_context):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates={},
+        )
+
+
+async def test_params_coordinates_latitude_missing(bidi_session, top_context):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates={
+                "longitude": 10,
+            },
+        )
+
+
+@pytest.mark.parametrize("value", [None, False, "foo", [], {}])
+async def test_params_coordinates_latitude_invalid_type(bidi_session, top_context, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates=CoordinatesOptions(
+                latitude=value,
+                longitude=10,
+            ),
+        )
+
+
+@pytest.mark.parametrize("value", [-90.1, 90.1])
+async def test_params_coordinates_latitude_invalid_value(bidi_session, top_context, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates=CoordinatesOptions(
+                latitude=value,
+                longitude=10,
+            ),
+        )
+
+
+async def test_params_coordinates_longitude_missing(bidi_session, top_context):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates={
+                "latitude": 10,
+            },
+        )
+
+
+@pytest.mark.parametrize("value", [None, False, "foo", [], {}])
+async def test_params_coordinates_longitude_invalid_type(bidi_session, top_context, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates=CoordinatesOptions(
+                latitude=10,
+                longitude=value,
+            ),
+        )
+
+
+@pytest.mark.parametrize("value", [-180.5, 180.5])
+async def test_params_coordinates_longitude_invalid_value(bidi_session, top_context, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates=CoordinatesOptions(
+                latitude=10,
+                longitude=value,
+            ),
+        )
+
+
+@pytest.mark.parametrize("value", [False, "foo", [], {}])
+async def test_params_coordinates_accuracy_invalid_type(bidi_session, top_context, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates=CoordinatesOptions(
+                latitude=10,
+                longitude=10,
+                accuracy=value,
+            ),
+        )
+
+
+async def test_params_coordinates_accuracy_invalid_value(bidi_session, top_context):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates=CoordinatesOptions(
+                latitude=10,
+                longitude=10,
+                accuracy=-1,
+            ),
+        )
+
+
+@pytest.mark.parametrize("value", [False, "foo", [], {}])
+async def test_params_coordinates_altitude_invalid_type(bidi_session, top_context, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates=CoordinatesOptions(
+                latitude=10,
+                longitude=10,
+                altitude=value,
+            ),
+        )
+
+
+@pytest.mark.parametrize("value", [False, "foo", [], {}])
+async def test_params_coordinates_altitude_accuracy_invalid_type(bidi_session, top_context, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates=CoordinatesOptions(
+                latitude=10,
+                longitude=10,
+                altitude=10,
+                altitude_accuracy=value,
+            ),
+        )
+
+
+async def test_params_coordinates_altitude_accuracy_invalid_value(bidi_session, top_context):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates=CoordinatesOptions(
+                latitude=10,
+                longitude=10,
+                altitude=10,
+                altitude_accuracy=-1,
+            ),
+        )
+
+
+async def test_params_coordinates_altitude_accuracy_without_altitude(bidi_session, top_context):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates=CoordinatesOptions(
+                latitude=10,
+                longitude=10,
+                altitude_accuracy=10,
+            ),
+        )
+
+
+@pytest.mark.parametrize("value", [False, "foo", [], {}])
+async def test_params_coordinates_heading_invalid_type(bidi_session, top_context, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates=CoordinatesOptions(
+                latitude=10,
+                longitude=10,
+                heading=value,
+            ),
+        )
+
+
+@pytest.mark.parametrize("value", [-0.5, 360, 360.5])
+async def test_params_coordinates_heading_invalid_value(bidi_session, top_context, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates=CoordinatesOptions(
+                latitude=10,
+                longitude=10,
+                heading=value,
+            ),
+        )
+
+
+@pytest.mark.parametrize("value", [False, "foo", [], {}])
+async def test_params_coordinates_speed_invalid_type(bidi_session, top_context, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates=CoordinatesOptions(
+                latitude=10,
+                longitude=10,
+                speed=value,
+            ),
+        )
+
+
+async def test_params_coordinates_speed_invalid_value(bidi_session, top_context):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates=CoordinatesOptions(
+                latitude=10,
+                longitude=10,
+                speed=-1.5,
+            ),
+        )
+
+
+@pytest.mark.parametrize("value", [True, "foo", 42, {}])
+async def test_params_user_contexts_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            coordinates={
+                "latitude": 10,
+                "longitude": 10,
+            },
+            user_contexts=value,
+        )
+
+
+async def test_params_user_contexts_empty_list(bidi_session):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            coordinates={
+                "latitude": 10,
+                "longitude": 10,
+            },
+            user_contexts=[],
+        )
+
+
+@pytest.mark.parametrize("value", [None, False, 42, {}, []])
+async def test_params_user_contexts_entry_invalid_type(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            coordinates={
+                "latitude": 10,
+                "longitude": 10,
+            },
+            user_contexts=[value],
+        )
+
+
+@pytest.mark.parametrize("value", ["", "somestring"])
+async def test_params_user_contexts_entry_invalid_value(bidi_session, value):
+    with pytest.raises(error.NoSuchUserContextException):
+        await bidi_session.emulation.set_geolocation_override(
+            coordinates={
+                "latitude": 10,
+                "longitude": 10,
+            },
+            user_contexts=[value],
+        )
+
+
+async def test_params_coordinates_and_error(bidi_session, top_context):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            coordinates={
+                "latitude": 10,
+                "longitude": 10,
+            },
+            error={"type": "positionUnavailable"}
+        )
+
+
+async def test_params_no_coordinates_no_error(bidi_session, top_context):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+        )
+
+
+@pytest.mark.parametrize("value", [False, 42, "foo", []])
+async def test_params_error_invalid_type(bidi_session, top_context, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            error=value,
+        )
+
+
+async def test_params_error_empty_object(bidi_session, top_context):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            error={},
+        )
+
+
+@pytest.mark.parametrize("value", [None, False, 42, {}, []])
+async def test_params_error_type_invalid_type(bidi_session, top_context, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            error={
+                "type": value
+            },
+        )
+
+
+async def test_params_error_type_invalid_value(bidi_session, top_context):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.emulation.set_geolocation_override(
+            contexts=[top_context["context"]],
+            error={
+                "type": "unknownError",
+            },
+        )
diff --git a/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/user_contexts.py b/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/user_contexts.py
new file mode 100644
index 00000000000..b3038bb5958
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/emulation/set_geolocation_override/user_contexts.py
@@ -0,0 +1,260 @@
+import pytest
+
+from webdriver.bidi.modules.emulation import CoordinatesOptions
+
+from . import TEST_COORDINATES
+
+
+pytestmark = pytest.mark.asyncio
+
+
+async def test_user_contexts(
+    bidi_session,
+    url,
+    create_user_context,
+    new_tab,
+    get_current_geolocation,
+    set_geolocation_permission,
+):
+    user_context = await create_user_context()
+    context_in_user_context_1 = await bidi_session.browsing_context.create(
+        user_context=user_context, type_hint="tab"
+    )
+    test_url = url("/common/blank.html")
+    await bidi_session.browsing_context.navigate(
+        context=context_in_user_context_1["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await set_geolocation_permission(new_tab)
+    await set_geolocation_permission(new_tab, user_context)
+
+    default_coordinates = await get_current_geolocation(context_in_user_context_1)
+
+    assert default_coordinates != TEST_COORDINATES
+    assert await get_current_geolocation(new_tab) == default_coordinates
+
+    # Set geolocation override.
+    await bidi_session.emulation.set_geolocation_override(
+        user_contexts=[user_context],
+        coordinates=CoordinatesOptions(
+            latitude=TEST_COORDINATES["latitude"],
+            longitude=TEST_COORDINATES["longitude"],
+            accuracy=TEST_COORDINATES["accuracy"],
+        ),
+    )
+
+    assert await get_current_geolocation(context_in_user_context_1) == TEST_COORDINATES
+    assert await get_current_geolocation(new_tab) == default_coordinates
+
+    # Create a new context in the user context.
+    context_in_user_context_2 = await bidi_session.browsing_context.create(
+        user_context=user_context, type_hint="tab"
+    )
+    await bidi_session.browsing_context.navigate(
+        context=context_in_user_context_2["context"],
+        url=test_url,
+        wait="complete",
+    )
+
+    assert await get_current_geolocation(context_in_user_context_2) == TEST_COORDINATES
+
+
+async def test_set_to_default_user_context(
+    bidi_session,
+    new_tab,
+    create_user_context,
+    url,
+    get_current_geolocation,
+    set_geolocation_permission,
+):
+    user_context = await create_user_context()
+    context_in_user_context_1 = await bidi_session.browsing_context.create(
+        user_context=user_context, type_hint="tab"
+    )
+    test_url = url("/common/blank.html")
+    await bidi_session.browsing_context.navigate(
+        context=context_in_user_context_1["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await set_geolocation_permission(new_tab)
+    await set_geolocation_permission(new_tab, user_context)
+
+    default_coordinates = await get_current_geolocation(new_tab)
+    assert default_coordinates != TEST_COORDINATES
+
+    await bidi_session.emulation.set_geolocation_override(
+        user_contexts=["default"],
+        coordinates=CoordinatesOptions(
+            latitude=TEST_COORDINATES["latitude"],
+            longitude=TEST_COORDINATES["longitude"],
+            accuracy=TEST_COORDINATES["accuracy"],
+        ),
+    )
+
+    # Make sure that the geolocation changes are only applied to the context associated with default user context.
+    assert (
+        await get_current_geolocation(context_in_user_context_1) == default_coordinates
+    )
+    assert await get_current_geolocation(new_tab) == TEST_COORDINATES
+
+    # Create a new context in the default context.
+    context_in_default_context_2 = await bidi_session.browsing_context.create(
+        type_hint="tab"
+    )
+
+    await bidi_session.browsing_context.navigate(
+        context=context_in_default_context_2["context"],
+        url=test_url,
+        wait="complete",
+    )
+
+    assert (
+        await get_current_geolocation(context_in_default_context_2) == TEST_COORDINATES
+    )
+
+    # Reset geolocation override.
+    await bidi_session.emulation.set_geolocation_override(
+        user_contexts=["default"], coordinates=None
+    )
+
+
+async def test_set_to_multiple_user_contexts(
+    bidi_session,
+    create_user_context,
+    url,
+    get_current_geolocation,
+    set_geolocation_permission,
+):
+    user_context_1 = await create_user_context()
+    context_in_user_context_1 = await bidi_session.browsing_context.create(
+        user_context=user_context_1, type_hint="tab"
+    )
+    user_context_2 = await create_user_context()
+    context_in_user_context_2 = await bidi_session.browsing_context.create(
+        user_context=user_context_2, type_hint="tab"
+    )
+    test_url = url("/common/blank.html")
+    await bidi_session.browsing_context.navigate(
+        context=context_in_user_context_1["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await bidi_session.browsing_context.navigate(
+        context=context_in_user_context_2["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await set_geolocation_permission(context_in_user_context_1, user_context_1)
+    await set_geolocation_permission(context_in_user_context_2, user_context_2)
+
+    await bidi_session.emulation.set_geolocation_override(
+        user_contexts=[user_context_1, user_context_2],
+        coordinates=CoordinatesOptions(
+            latitude=TEST_COORDINATES["latitude"],
+            longitude=TEST_COORDINATES["longitude"],
+            accuracy=TEST_COORDINATES["accuracy"],
+        ),
+    )
+
+    assert await get_current_geolocation(context_in_user_context_1) == TEST_COORDINATES
+    assert await get_current_geolocation(context_in_user_context_2) == TEST_COORDINATES
+
+
+async def test_set_to_user_context_and_then_to_context(
+    bidi_session,
+    create_user_context,
+    url,
+    new_tab,
+    get_current_geolocation,
+    set_geolocation_permission,
+):
+    user_context = await create_user_context()
+    context_in_user_context_1 = await bidi_session.browsing_context.create(
+        user_context=user_context, type_hint="tab"
+    )
+    test_url = url("/common/blank.html")
+    await bidi_session.browsing_context.navigate(
+        context=context_in_user_context_1["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=test_url,
+        wait="complete",
+    )
+    await set_geolocation_permission(new_tab)
+    await set_geolocation_permission(new_tab, user_context)
+
+    default_coordinates = await get_current_geolocation(context_in_user_context_1)
+
+    assert default_coordinates != TEST_COORDINATES
+
+    # Apply geolocation override to the user context.
+    await bidi_session.emulation.set_geolocation_override(
+        user_contexts=[user_context],
+        coordinates=CoordinatesOptions(
+            latitude=TEST_COORDINATES["latitude"],
+            longitude=TEST_COORDINATES["longitude"],
+            accuracy=TEST_COORDINATES["accuracy"],
+        ),
+    )
+
+    new_geolocation_coordinates = {"latitude": 30, "longitude": 20, "accuracy": 3}
+    # Apply geolocation override now only to the context.
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[context_in_user_context_1["context"]],
+        coordinates=CoordinatesOptions(
+            latitude=new_geolocation_coordinates["latitude"],
+            longitude=new_geolocation_coordinates["longitude"],
+            accuracy=new_geolocation_coordinates["accuracy"],
+        ),
+    )
+    assert (
+        await get_current_geolocation(context_in_user_context_1)
+        == new_geolocation_coordinates
+    )
+
+    await bidi_session.browsing_context.reload(
+        context=context_in_user_context_1["context"], wait="complete"
+    )
+
+    # Make sure that after reload the geolocation is still updated.
+    assert (
+        await get_current_geolocation(context_in_user_context_1)
+        == new_geolocation_coordinates
+    )
+
+    # Create a new context in the user context.
+    context_in_user_context_2 = await bidi_session.browsing_context.create(
+        user_context=user_context, type_hint="tab"
+    )
+    await bidi_session.browsing_context.navigate(
+        context=context_in_user_context_2["context"],
+        url=test_url,
+        wait="complete",
+    )
+    # Make sure that the geolocation override for the user context is applied.
+    assert await get_current_geolocation(context_in_user_context_2) == TEST_COORDINATES
+
+    await bidi_session.emulation.set_geolocation_override(
+        contexts=[context_in_user_context_1["context"]],
+        coordinates=None,
+    )
+
+    # Make sure that the geolocation override was reset.
+    assert (
+        await get_current_geolocation(context_in_user_context_1) == default_coordinates
+    )
diff --git a/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/__init__.py
index b8f6358d617..86c8ade30a8 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/__init__.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/__init__.py
@@ -11,13 +11,3 @@ async def get_permission_state(bidi_session, context: Mapping[str, Any], name: s
         target=ContextTarget(context["context"]),
         await_promise=True)
     return result["value"]
-
-
-async def get_context_origin(bidi_session, context: Mapping[str, Any]) -> str:
-    result = await bidi_session.script.call_function(
-        function_declaration="""() => {
-          return window.location.origin;
-        }""",
-        target=ContextTarget(context["context"]),
-        await_promise=False)
-    return result["value"]
diff --git a/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/set_permission.py b/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/set_permission.py
index 574f2149841..5edb3caee7c 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/set_permission.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/set_permission.py
@@ -1,6 +1,7 @@
 import pytest
 
-from . import get_context_origin, get_permission_state
+from .... import get_context_origin
+from . import get_permission_state
 
 pytestmark = pytest.mark.asyncio
 
diff --git a/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/user_context.py b/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/user_context.py
index b45ddb12b7e..7b621d7ec67 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/user_context.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/user_context.py
@@ -1,6 +1,7 @@
 import pytest
 
-from . import get_context_origin, get_permission_state
+from .... import get_context_origin
+from . import get_permission_state
 
 pytestmark = pytest.mark.asyncio
 
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py
index 840b8086d13..46146d52eb9 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py
@@ -350,6 +350,16 @@ def get_network_event_timerange(start, end, bidi_session):
     return number_interval(start - 1, end + 1)
 
 
+def get_next_event_for_url(network_events, url):
+    """
+    Retrieve the next network event in the network_events list matching the
+    provided url.
+    """
+    return next(
+        e for e in network_events if e["request"]["url"] == url
+    )
+
+
 # Array of status and status text expected to be available in network events
 HTTP_STATUS_AND_STATUS_TEXT = [
     (101, "Switching Protocols"),
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent_cached.py b/tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent_cached.py
index 9483a707eab..e8119d29d9e 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent_cached.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent_cached.py
@@ -396,7 +396,7 @@ async def test_page_with_cached_script_javascript(
 
 
 @pytest.mark.asyncio
-async def tst_page_with_cached_javascript_module(
+async def test_page_with_cached_javascript_module(
     bidi_session,
     url,
     inline,
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed.py b/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed.py
index 127416d8de4..6f53572a341 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed.py
@@ -1,4 +1,5 @@
 import asyncio
+import random
 from urllib.parse import quote
 
 import pytest
@@ -23,6 +24,8 @@ from .. import (
     RESPONSE_COMPLETED_EVENT,
 )
 
+from ... import any_positive_int
+
 
 @pytest.mark.asyncio
 async def test_subscribe_status(bidi_session, subscribe_events, top_context, wait_for_event, wait_for_future_safe, url, fetch):
@@ -212,7 +215,7 @@ async def test_response_status(
     wait_for_event, wait_for_future_safe, url, fetch, setup_network_test, status, status_text
 ):
     status_url = url(
-        f"/webdriver/tests/support/http_handlers/status.py?status={status}&nocache={RESPONSE_COMPLETED_EVENT}"
+        f"/webdriver/tests/support/http_handlers/status.py?status={status}&nocache={random.random()}"
     )
 
     network_events = await setup_network_test(events=[RESPONSE_COMPLETED_EVENT])
@@ -240,6 +243,37 @@ async def test_response_status(
     )
 
 
+@pytest.mark.asyncio
+async def test_content_size(
+    wait_for_event, wait_for_future_safe, inline, fetch, setup_network_test
+):
+    url = f"{inline('<div>bar</div>')}&pipe=gzip"
+
+    network_events = await setup_network_test(events=[RESPONSE_COMPLETED_EVENT])
+    events = network_events[RESPONSE_COMPLETED_EVENT]
+
+    on_response_completed = wait_for_event(RESPONSE_COMPLETED_EVENT)
+    await fetch(url)
+    await wait_for_future_safe(on_response_completed)
+
+    assert len(events) == 1
+    expected_request = {"method": "GET", "url": url}
+    expected_response = {
+        "url": url,
+        "content": {
+            # TODO: At the moment, only Firefox returns a non-zero size here.
+            # Once other implementations start supporting this we should update
+            # to compare to a specific value if possible.
+            "size": any_positive_int
+        },
+    }
+    assert_response_event(
+        events[0],
+        expected_request=expected_request,
+        expected_response=expected_response,
+        redirect_count=0,
+    )
+
 @pytest.mark.asyncio
 async def test_response_headers(wait_for_event, wait_for_future_safe, url, fetch, setup_network_test):
     headers_url = url(
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed_cached.py b/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed_cached.py
index 5b1e3592e09..2c7ea02d601 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed_cached.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed_cached.py
@@ -6,6 +6,7 @@ from tests.support.sync import AsyncPoll
 from .. import (
     assert_response_event,
     get_cached_url,
+    get_next_event_for_url,
     IMAGE_RESPONSE_BODY,
     PAGE_EMPTY_TEXT,
     RESPONSE_COMPLETED_EVENT,
@@ -255,13 +256,16 @@ async def test_page_with_cached_link_stylesheet(
     await wait.until(lambda _: len(events) >= 4)
     assert len(events) == 4
 
+    # Assert only cached events after reload.
+    cached_events = events[2:]
+
     assert_response_event(
-        events[2],
+        get_next_event_for_url(cached_events, page_with_cached_css),
         expected_request={"method": "GET", "url": page_with_cached_css},
         expected_response={"url": page_with_cached_css, "fromCache": False},
     )
     assert_response_event(
-        events[3],
+        get_next_event_for_url(cached_events, cached_link_css_url),
         expected_request={"method": "GET", "url": cached_link_css_url},
         expected_response={"url": cached_link_css_url, "fromCache": True},
     )
@@ -327,13 +331,16 @@ async def test_page_with_cached_import_stylesheet(
     await wait.until(lambda _: len(events) >= 4)
     assert len(events) == 4
 
+    # Assert only cached events after reload.
+    cached_events = events[2:]
+
     assert_response_event(
-        events[2],
+        get_next_event_for_url(cached_events, page_with_cached_css),
         expected_request={"method": "GET", "url": page_with_cached_css},
         expected_response={"url": page_with_cached_css, "fromCache": False},
     )
     assert_response_event(
-        events[3],
+        get_next_event_for_url(cached_events, cached_import_css_url),
         expected_request={"method": "GET", "url": cached_import_css_url},
         expected_response={"url": cached_import_css_url, "fromCache": True},
     )
@@ -398,20 +405,14 @@ async def test_page_with_cached_duplicated_stylesheets(
         expected_response={"url": page_with_cached_css, "fromCache": False},
     )
 
-    link_css_event = next(
-        e for e in events if cached_link_css_url == e["request"]["url"]
-    )
     assert_response_event(
-        link_css_event,
+        get_next_event_for_url(events, cached_link_css_url),
         expected_request={"method": "GET", "url": cached_link_css_url},
         expected_response={"url": cached_link_css_url, "fromCache": False},
     )
 
-    import_css_event = next(
-        e for e in events if cached_import_css_url == e["request"]["url"]
-    )
     assert_response_event(
-        import_css_event,
+        get_next_event_for_url(events, cached_import_css_url),
         expected_request={"method": "GET", "url": cached_import_css_url},
         expected_response={"url": cached_import_css_url, "fromCache": False},
     )
@@ -428,23 +429,17 @@ async def test_page_with_cached_duplicated_stylesheets(
     cached_events = events[3:]
 
     assert_response_event(
-        cached_events[0],
+        get_next_event_for_url(cached_events, page_with_cached_css),
         expected_request={"method": "GET", "url": page_with_cached_css},
         expected_response={"url": page_with_cached_css, "fromCache": False},
     )
-    cached_link_css_event = next(
-        e for e in cached_events if cached_link_css_url == e["request"]["url"]
-    )
     assert_response_event(
-        cached_link_css_event,
+        get_next_event_for_url(cached_events, cached_link_css_url),
         expected_request={"method": "GET", "url": cached_link_css_url},
         expected_response={"url": cached_link_css_url, "fromCache": True},
     )
-    cached_import_css_event = next(
-        e for e in cached_events if cached_import_css_url == e["request"]["url"]
-    )
     assert_response_event(
-        cached_import_css_event,
+        get_next_event_for_url(cached_events, cached_import_css_url),
         expected_request={"method": "GET", "url": cached_import_css_url},
         expected_response={"url": cached_import_css_url, "fromCache": True},
     )
@@ -503,13 +498,17 @@ async def test_page_with_cached_script_javascript(
     await wait.until(lambda _: len(events) >= 4)
     assert len(events) == 4
 
+    # Assert only cached events after reload.
+    cached_events = events[2:]
+
     assert_response_event(
-        events[2],
+        get_next_event_for_url(cached_events, page_with_cached_js),
         expected_request={"method": "GET", "url": page_with_cached_js},
         expected_response={"url": page_with_cached_js, "fromCache": False},
     )
+
     assert_response_event(
-        events[3],
+        get_next_event_for_url(cached_events, cached_script_js_url),
         expected_request={"method": "GET", "url": cached_script_js_url},
         expected_response={"url": cached_script_js_url, "fromCache": True},
     )
@@ -541,23 +540,35 @@ async def test_page_with_cached_script_javascript(
     cached_events = events[4:]
 
     assert_response_event(
-        cached_events[0],
+        get_next_event_for_url(cached_events, page_with_2_cached_js),
         expected_request={"method": "GET", "url": page_with_2_cached_js},
         expected_response={"url": page_with_2_cached_js, "fromCache": False},
     )
+
+    cached_script_js_events = list(
+        e for e in cached_events if cached_script_js_url == e["request"]["url"]
+    )
     assert_response_event(
-        cached_events[1],
+        cached_script_js_events[0],
         expected_request={"method": "GET", "url": cached_script_js_url},
         expected_response={"url": cached_script_js_url, "fromCache": True},
     )
-    if len(events) > 6:
+    if len(cached_script_js_events) > 1:
         assert_response_event(
-            cached_events[2],
+            cached_script_js_events[1],
             expected_request={"method": "GET", "url": cached_script_js_url},
             expected_response={"url": cached_script_js_url, "fromCache": True},
         )
 
 
+@pytest.mark.parametrize(
+    "kind, module_template",
+    [
+        ("top-level", """<script type="module" src="{url}">"""),
+        ("statically-imported", """<script type="module">import foo from "{url}"; foo();</script>"""),
+        ("dynamically-imported", """<script type="module">const ns = await import("{url}"); ns.default();</script>"""),
+    ]
+)
 @pytest.mark.asyncio
 async def test_page_with_cached_javascript_module(
     bidi_session,
@@ -565,6 +576,8 @@ async def test_page_with_cached_javascript_module(
     inline,
     setup_network_test,
     top_context,
+    kind,
+    module_template,
 ):
     network_events = await setup_network_test(
         events=[
@@ -576,14 +589,12 @@ async def test_page_with_cached_javascript_module(
     cached_js_module_url = url(
         get_cached_url("text/javascript", SCRIPT_CONSOLE_LOG_IN_MODULE)
     )
+    module_script_tag = module_template.format(url=cached_js_module_url)
     page_with_cached_js_module = inline(
         f"""
         <body>
-            test page with cached js module
-            <script type="module">
-                import foo from "{cached_js_module_url}";
-                foo();
-            </script>
+            test page with cached {kind} js module
+            {module_script_tag}
         </body>
         """,
     )
@@ -618,13 +629,16 @@ async def test_page_with_cached_javascript_module(
     await wait.until(lambda _: len(events) >= 4)
     assert len(events) == 4
 
+    # Assert only cached events after reload.
+    cached_events = events[2:]
+
     assert_response_event(
-        events[2],
+        get_next_event_for_url(cached_events, page_with_cached_js_module),
         expected_request={"method": "GET", "url": page_with_cached_js_module},
         expected_response={"url": page_with_cached_js_module, "fromCache": False},
     )
     assert_response_event(
-        events[3],
+        get_next_event_for_url(cached_events, cached_js_module_url),
         expected_request={"method": "GET", "url": cached_js_module_url},
         expected_response={"url": cached_js_module_url, "fromCache": True},
     )
@@ -632,15 +646,9 @@ async def test_page_with_cached_javascript_module(
     page_with_2_cached_js_modules = inline(
         f"""
         <body>
-            test page with 2 cached javascript modules
-            <script type="module">
-                import foo from "{cached_js_module_url}";
-                foo();
-            </script>
-            <script type="module">
-                import foo from "{cached_js_module_url}";
-                foo();
-            </script>
+            test page with 2 cached {kind} js modules
+            {module_script_tag}
+            {module_script_tag}
         </body>
         """,
     )
@@ -660,12 +668,12 @@ async def test_page_with_cached_javascript_module(
     cached_events = events[4:]
 
     assert_response_event(
-        cached_events[0],
+        get_next_event_for_url(cached_events, page_with_2_cached_js_modules),
         expected_request={"method": "GET", "url": page_with_2_cached_js_modules},
         expected_response={"url": page_with_2_cached_js_modules, "fromCache": False},
     )
     assert_response_event(
-        cached_events[1],
+        get_next_event_for_url(cached_events, cached_js_module_url),
         expected_request={"method": "GET", "url": cached_js_module_url},
         expected_response={"url": cached_js_module_url, "fromCache": True},
     )
@@ -726,13 +734,16 @@ async def test_page_with_cached_image(
     await wait.until(lambda _: len(events) >= 4)
     assert len(events) == 4
 
+     # Assert only cached events after reload.
+    cached_events = events[2:]
+
     assert_response_event(
-        events[2],
+        get_next_event_for_url(cached_events, page_with_cached_image),
         expected_request={"method": "GET", "url": page_with_cached_image},
         expected_response={"url": page_with_cached_image, "fromCache": False},
     )
     assert_response_event(
-        events[3],
+        get_next_event_for_url(cached_events, cached_image_url),
         expected_request={"method": "GET", "url": cached_image_url},
         expected_response={"url": cached_image_url, "fromCache": True},
     )
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started.py b/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started.py
index 6ab3e1c3cac..324105197f0 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started.py
@@ -1,6 +1,7 @@
 import asyncio
 
 import pytest
+import random
 
 from webdriver.bidi.modules.script import ContextTarget
 
@@ -216,7 +217,7 @@ async def test_response_status(
     wait_for_event, wait_for_future_safe, url, fetch, setup_network_test, status, status_text
 ):
     status_url = url(
-        f"/webdriver/tests/support/http_handlers/status.py?status={status}&nocache={RESPONSE_STARTED_EVENT}"
+        f"/webdriver/tests/support/http_handlers/status.py?status={status}&nocache={random.random()}"
     )
 
     network_events = await setup_network_test(events=[RESPONSE_STARTED_EVENT])
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started_cached.py b/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started_cached.py
index 57db04a3afe..db34035fca1 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started_cached.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started_cached.py
@@ -568,6 +568,14 @@ async def test_page_with_cached_script_javascript(
         )
 
 
+@pytest.mark.parametrize(
+    "kind, module_template",
+    [
+        ("top-level", """<script type="module" src="{url}">"""),
+        ("statically-imported", """<script type="module">import foo from "{url}"; foo();</script>"""),
+        ("dynamically-imported", """<script type="module">const ns = await import("{url}"); ns.default();</script>"""),
+    ]
+)
 @pytest.mark.asyncio
 async def test_page_with_cached_javascript_module(
     bidi_session,
@@ -575,6 +583,8 @@ async def test_page_with_cached_javascript_module(
     inline,
     setup_network_test,
     top_context,
+    kind,
+    module_template,
 ):
     network_events = await setup_network_test(
         events=[
@@ -586,14 +596,12 @@ async def test_page_with_cached_javascript_module(
     cached_js_module_url = url(
         get_cached_url("text/javascript", SCRIPT_CONSOLE_LOG_IN_MODULE)
     )
+    module_script_tag = module_template.format(url=cached_js_module_url)
     page_with_cached_js_module = inline(
         f"""
         <body>
-            test page with cached js module
-            <script type="module">
-                import foo from "{cached_js_module_url}";
-                foo();
-            </script>
+            test page with cached {kind} js module
+            {module_script_tag}
         </body>
         """,
     )
@@ -642,15 +650,9 @@ async def test_page_with_cached_javascript_module(
     page_with_2_cached_js_modules = inline(
         f"""
         <body>
-            test page with 2 cached javascript modules
-            <script type="module">
-                import foo from "{cached_js_module_url}";
-                foo();
-            </script>
-            <script type="module">
-                import foo from "{cached_js_module_url}";
-                foo();
-            </script>
+            test page with 2 cached {kind} js modules
+            {module_script_tag}
+            {module_script_tag}
         </body>
         """,
     )
diff --git a/tests/wpt/tests/webdriver/tests/bidi/web_extension/conftest.py b/tests/wpt/tests/webdriver/tests/bidi/web_extension/conftest.py
deleted file mode 100644
index e59af399b07..00000000000
--- a/tests/wpt/tests/webdriver/tests/bidi/web_extension/conftest.py
+++ /dev/null
@@ -1,27 +0,0 @@
-import pytest
-from tests.support.helpers import get_extension_path, get_base64_for_extension_file
-
-
-EXTENSION_DATA = {
-    "firefox": {
-        "id": "1FC7D53C-0B0A-49E7-A8C0-47E77496A919@web-platform-tests.org",
-        "path": get_extension_path("firefox/unpacked/"),
-        "archivePath": get_extension_path("firefox/signed.xpi"),
-        "archivePathInvalid": get_extension_path("firefox/invalid.xpi"),
-        "base64": get_base64_for_extension_file("firefox/signed.xpi"),
-    },
-    "chrome": {
-        "id": None,
-        "path": get_extension_path("chrome/unpacked/"),
-        "archivePath": get_extension_path("chrome/packed.crx"),
-        "archivePathInvalid": get_extension_path("chrome/invalid"),
-        "base64": get_base64_for_extension_file("chrome/packed.crx"),
-    }
-}
-
-
-@pytest.fixture
-def extension_data(current_session):
-    browser_name = current_session.capabilities["browserName"]
-
-    return EXTENSION_DATA[browser_name]
diff --git a/tests/wpt/tests/webdriver/tests/bidi/web_extension/uninstall/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/web_extension/uninstall/invalid.py
index 54fbb22cf5e..228f0e57e52 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/web_extension/uninstall/invalid.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/web_extension/uninstall/invalid.py
@@ -6,21 +6,16 @@ pytestmark = pytest.mark.asyncio
 
 async def test_uninstall_missing_extension(bidi_session):
     with pytest.raises(error.NoSuchWebExtensionException):
-        await bidi_session.web_extension.uninstall(
-            extension="test"
-        )
+        await bidi_session.web_extension.uninstall(extension="test")
 
 
 @pytest.mark.parametrize("value", [None, False, 42, {}, []])
 async def test_params_extension_invalid_type(bidi_session, value):
     with pytest.raises(error.InvalidArgumentException):
-        await bidi_session.web_extension.uninstall(
-            extension=value
-        )
+        await bidi_session.web_extension.uninstall(extension=value)
 
 
-async def test_params_extension_invalid_value(bidi_session):
+@pytest.mark.parametrize("value", ["", "unknown-ext"], ids=["empty", "unknown"])
+async def test_params_extension_invalid_value(bidi_session, value):
     with pytest.raises(error.NoSuchWebExtensionException):
-        await bidi_session.web_extension.uninstall(
-            extension=""
-        )
+        await bidi_session.web_extension.uninstall(extension=value)
diff --git a/tests/wpt/tests/webdriver/tests/support/fixtures.py b/tests/wpt/tests/webdriver/tests/support/fixtures.py
index a8f1f2959d4..6ccf394f27c 100644
--- a/tests/wpt/tests/webdriver/tests/support/fixtures.py
+++ b/tests/wpt/tests/webdriver/tests/support/fixtures.py
@@ -10,6 +10,7 @@ from urllib.parse import urlunsplit
 
 from tests.support import defaults
 from tests.support.helpers import cleanup_session, deep_update
+from tests.support.web_extension import EXTENSION_DATA
 from tests.support.inline import build_inline
 from tests.support.http_request import HTTPRequest
 from tests.support.keys import Keys
@@ -41,16 +42,24 @@ def pytest_sessionfinish():
 
 
 @pytest.fixture
-def capabilities():
+def default_capabilities():
     """Default capabilities to use for a new WebDriver session."""
     return {}
 
 
-def pytest_generate_tests(metafunc):
-    if "capabilities" in metafunc.fixturenames:
-        marker = metafunc.definition.get_closest_marker(name="capabilities")
-        if marker:
-            metafunc.parametrize("capabilities", marker.args, ids=None)
+@pytest.fixture
+def capabilities(request, default_capabilities):
+    """Merges default capabilities with any test-specific capabilities from a marker."""
+    marker = request.node.get_closest_marker("capabilities")
+    if marker and marker.args:
+        # Ensure the first positional argument is a dictionary
+        assert isinstance(
+            marker.args[0], dict), "capabilities marker must use a dictionary"
+        caps = copy.deepcopy(default_capabilities)
+        deep_update(caps, marker.args[0])
+        return caps
+
+    return default_capabilities  # Use defaults if no marker is present
 
 
 @pytest.fixture
@@ -288,6 +297,13 @@ def inline(url):
     return inline
 
 
+@pytest.fixture
+def extension_data(current_session):
+    browser_name = current_session.capabilities["browserName"]
+
+    return EXTENSION_DATA[browser_name]
+
+
 @pytest.fixture
 def iframe(inline):
     """Inline document extract as the source document of an <iframe>."""
diff --git a/tests/wpt/tests/webdriver/tests/support/fixtures_bidi.py b/tests/wpt/tests/webdriver/tests/support/fixtures_bidi.py
index c391f2b5a41..0996821cfef 100644
--- a/tests/wpt/tests/webdriver/tests/support/fixtures_bidi.py
+++ b/tests/wpt/tests/webdriver/tests/support/fixtures_bidi.py
@@ -207,6 +207,9 @@ def wait_for_future_safe(configuration):
                 timeout=timeout * configuration["timeout_multiplier"],
             )
         except asyncio.TimeoutError:
+            # Cancel the original future.
+            future.cancel()
+
             raise TimeoutException("Future did not resolve within the given timeout")
 
     return wait_for_future_safe
diff --git a/tests/wpt/tests/webdriver/tests/support/helpers.py b/tests/wpt/tests/webdriver/tests/support/helpers.py
index 8baa895adf2..f4763deca14 100644
--- a/tests/wpt/tests/webdriver/tests/support/helpers.py
+++ b/tests/wpt/tests/webdriver/tests/support/helpers.py
@@ -80,6 +80,10 @@ def cleanup_session(session):
 
         session.window_handle = current_window
 
+    # Do not try to clean up already ended session.
+    if session.session_id is None:
+        return
+
     _restore_timeouts(session)
     _ensure_valid_window(session)
     _dismiss_user_prompts(session)
@@ -119,10 +123,13 @@ def deep_update(source, overrides):
     """
     for key, value in overrides.items():
         if isinstance(value, collections.abc.Mapping) and value:
-            returned = deep_update(source.get(key, {}), value)
-            source[key] = returned
+            source[key] = deep_update(source.get(key, {}), value)
+        elif isinstance(value, list) and isinstance(source.get(key), list) and value:
+            # Concatenate lists, ensuring all elements are kept without duplicates
+            source[key] = list(dict.fromkeys(source[key] + value))
         else:
-            source[key] = overrides[key]
+            source[key] = value
+
     return source
 
 
diff --git a/tests/wpt/tests/webdriver/tests/support/http_handlers/geolocation_override.py b/tests/wpt/tests/webdriver/tests/support/http_handlers/geolocation_override.py
new file mode 100644
index 00000000000..038e947f7aa
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/support/http_handlers/geolocation_override.py
@@ -0,0 +1,16 @@
+import json
+
+
+def main(request, response):
+    response.headers.set(b"Content-Type", b"application/json")
+    response.headers.set(b"Cache-Control", b"no-cache")
+    response.content = json.dumps(
+        {
+            "status": "OK",
+            "location": {
+                "lat": 37.41857,
+                "lng": -122.08769,
+            },
+            "accuracy": 42,
+        }
+    ).encode("utf-8")
diff --git a/tests/wpt/tests/webdriver/tests/support/web_extension.py b/tests/wpt/tests/webdriver/tests/support/web_extension.py
new file mode 100644
index 00000000000..ba9473a7947
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/support/web_extension.py
@@ -0,0 +1,20 @@
+import pytest
+from tests.support.helpers import get_extension_path, get_base64_for_extension_file
+
+
+EXTENSION_DATA = {
+    "firefox": {
+        "id": "1FC7D53C-0B0A-49E7-A8C0-47E77496A919@web-platform-tests.org",
+        "path": get_extension_path("firefox/unpacked/"),
+        "archivePath": get_extension_path("firefox/signed.xpi"),
+        "archivePathInvalid": get_extension_path("firefox/invalid.xpi"),
+        "base64": get_base64_for_extension_file("firefox/signed.xpi"),
+    },
+    "chrome": {
+        "id": None,
+        "path": get_extension_path("chrome/unpacked/"),
+        "archivePath": get_extension_path("chrome/packed.crx"),
+        "archivePathInvalid": get_extension_path("chrome/invalid"),
+        "base64": get_base64_for_extension_file("chrome/packed.crx"),
+    }
+}
diff --git a/tests/wpt/tests/webmessaging/WEB_FEATURES.yml b/tests/wpt/tests/webmessaging/WEB_FEATURES.yml
new file mode 100644
index 00000000000..0aacecad892
--- /dev/null
+++ b/tests/wpt/tests/webmessaging/WEB_FEATURES.yml
@@ -0,0 +1,5 @@
+features:
+- name: messageerror
+  files:
+  - messageerror.html
+  - postMessage_CryptoKey_insecure.sub.html
diff --git a/tests/wpt/tests/webmessaging/message-channels/close-event/explicitly-closed.tentative.window.js b/tests/wpt/tests/webmessaging/message-channels/close-event/explicitly-closed.tentative.window.js
index 612003d58ea..12bfa0bd73e 100644
--- a/tests/wpt/tests/webmessaging/message-channels/close-event/explicitly-closed.tentative.window.js
+++ b/tests/wpt/tests/webmessaging/message-channels/close-event/explicitly-closed.tentative.window.js
@@ -33,3 +33,13 @@ promise_test(async t => {
   });
   await closeEventPromise;
 }, 'Close event on port2 is fired when port1, which is in a different window, is explicitly closed.')
+
+promise_test(async t => {
+  const rc = await addWindow();
+  const waitForPort = expectMessagePortFromWindowWithoutStartingIt(window);
+  await createMessageChannelAndSendPortFollowedByClose(rc);
+  const port = await waitForPort;
+  const closeEventPromise = createCloseEventPromise(port);
+  port.start();
+  await closeEventPromise;
+}, 'Close event on port2 is fired when port1, in a different window, is closed during the transfer of port2.')
diff --git a/tests/wpt/tests/webmessaging/message-channels/close-event/resources/helper.js b/tests/wpt/tests/webmessaging/message-channels/close-event/resources/helper.js
index cb9ea9fe981..48744ac1c5b 100644
--- a/tests/wpt/tests/webmessaging/message-channels/close-event/resources/helper.js
+++ b/tests/wpt/tests/webmessaging/message-channels/close-event/resources/helper.js
@@ -21,6 +21,44 @@ function expectMessagePortFromWindow(window) {
   });
 }
 
+/**
+ * Create a new promise that resolves when the window receives
+ * the MessagePort and does not start it.
+ *
+ * @param {Window} window - The window to wait for the MessagePort.
+ * @returns {Promise<MessagePort>} A promise you should await to ensure the
+ *     window
+ * receives the MessagePort.
+ */
+function expectMessagePortFromWindowWithoutStartingIt(window) {
+  return new Promise(resolve => {
+    window.onmessage = e => {
+      try {
+        assert_true(e.ports[0] instanceof window.MessagePort);
+        resolve(e.ports[0]);
+      } catch (e) {
+        reject(e);
+      }
+    };
+  });
+}
+
+/**
+ * Create a new MessageChannel and transfers one of the ports to
+ * the window which opened the window with a remote context provided
+ * as an argument, and immediately closes the entangled port.
+ *
+ * @param {RemoteContextWrapper} remoteContextWrapper
+ */
+async function createMessageChannelAndSendPortFollowedByClose(remoteContextWrapper) {
+  await remoteContextWrapper.executeScript(() => {
+    const {port1, port2} = new MessageChannel();
+    port1.start();
+    window.opener.postMessage({}, '*', [port2]);
+    port1.close();
+  });
+}
+
 /**
  * Create a new MessageChannel and transfers one of the ports to
  * the window which opened the window with a remote context provided
diff --git a/tests/wpt/tests/webnn/conformance_tests/abs.https.any.js b/tests/wpt/tests/webnn/conformance_tests/abs.https.any.js
index fcf144200f6..de6a5761df4 100644
--- a/tests/wpt/tests/webnn/conformance_tests/abs.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/abs.https.any.js
@@ -14,11 +14,8 @@
 // MLOperand abs(MLOperand input);
 
 
-const getAbsPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 0, float16: 0};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
+const getAbsPrecisionTolerance = () => {
+  return {metricType: 'ULP', value: 0};
 };
 
 const absTests = [
@@ -538,6 +535,62 @@ const absTests = [
         }
       }
     }
+  },
+
+  // int8 tests
+  {
+    'name': 'abs int8 4D tensor',
+    'graph': {
+      'inputs': {
+        'absInput': {
+          'data': [
+            // int8 range: [/* -(2**7) */ -128, /* 2**7 - 1 */ 127]
+            // abs(-128) would overflow when data type is int8
+            -127, 0, 126, 127
+          ],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'int8'}
+        }
+      },
+      'operators': [{
+        'name': 'abs',
+        'arguments': [{'input': 'absInput'}],
+        'outputs': 'absOutput'
+      }],
+      'expectedOutputs': {
+        'absOutput': {
+          'data': [127, 0, 126, 127],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'int8'}
+        }
+      }
+    }
+  },
+
+  // int32 tests
+  {
+    'name': 'abs int32 4D tensor',
+    'graph': {
+      'inputs': {
+        'absInput': {
+          'data': [
+            // int32 range: [/* -(2**31) */ -2147483648, /* 2**31 - 1 */ 2147483647]
+            // abs(-2147483648) would overflow when data type is int32
+            -2147483647, 0, 2147483646, 2147483647
+          ],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'int32'}
+        }
+      },
+      'operators': [{
+        'name': 'abs',
+        'arguments': [{'input': 'absInput'}],
+        'outputs': 'absOutput'
+      }],
+      'expectedOutputs': {
+        'absOutput': {
+          'data': [2147483647, 0, 2147483646, 2147483647],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'int32'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/add.https.any.js b/tests/wpt/tests/webnn/conformance_tests/add.https.any.js
index ad1df74b65a..be82df1dc28 100644
--- a/tests/wpt/tests/webnn/conformance_tests/add.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/add.https.any.js
@@ -576,6 +576,433 @@ const addTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'add float16 1D constant tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -43.34375, -67.875,   26.46875,   36.75,      -65.1875, -87.6875,
+            65.25,     -74.0625,  -13.828125, 6.98046875, 99.8125,  55.8125,
+            -75.5625,  11.5,      17.109375,  95.8125,    57.4375,  -57.1875,
+            27.71875,  -18.21875, 52.65625,   -70,        39.8125,  -29.984375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        },
+        'inputB': {
+          'data': [
+            -59.75,    -44.8125,  -87.9375,   1.884765625, 84.875,
+            47.5625,   85.625,    43.03125,   -60.25,      15.609375,
+            70.625,    -7.453125, -30.203125, -97.6875,    -0.0098419189453125,
+            -77.6875,  30.203125, -59.1875,   89.375,      28.6875,
+            -29.71875, -90.625,   28.28125,   27.65625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'add',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -103.125, -112.6875, -61.46875, 38.625,   19.6875, -40.125,
+            150.875,  -31.03125, -74.0625,  22.59375, 170.5,   48.375,
+            -105.75,  -86.1875,  17.09375,  18.125,   87.625,  -116.375,
+            117.125,  10.46875,  22.9375,   -160.625, 68.125,  -2.328125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'add float16 1D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -43.34375, -67.875,   26.46875,   36.75,      -65.1875, -87.6875,
+            65.25,     -74.0625,  -13.828125, 6.98046875, 99.8125,  55.8125,
+            -75.5625,  11.5,      17.109375,  95.8125,    57.4375,  -57.1875,
+            27.71875,  -18.21875, 52.65625,   -70,        39.8125,  -29.984375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -59.75,    -44.8125,  -87.9375,   1.884765625, 84.875,
+            47.5625,   85.625,    43.03125,   -60.25,      15.609375,
+            70.625,    -7.453125, -30.203125, -97.6875,    -0.0098419189453125,
+            -77.6875,  30.203125, -59.1875,   89.375,      28.6875,
+            -29.71875, -90.625,   28.28125,   27.65625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'add',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -103.125, -112.6875, -61.46875, 38.625,   19.6875, -40.125,
+            150.875,  -31.03125, -74.0625,  22.59375, 170.5,   48.375,
+            -105.75,  -86.1875,  17.09375,  18.125,   87.625,  -116.375,
+            117.125,  10.46875,  22.9375,   -160.625, 68.125,  -2.328125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'add float16 2D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -43.34375, -67.875,   26.46875,   36.75,      -65.1875, -87.6875,
+            65.25,     -74.0625,  -13.828125, 6.98046875, 99.8125,  55.8125,
+            -75.5625,  11.5,      17.109375,  95.8125,    57.4375,  -57.1875,
+            27.71875,  -18.21875, 52.65625,   -70,        39.8125,  -29.984375
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -59.75,    -44.8125,  -87.9375,   1.884765625, 84.875,
+            47.5625,   85.625,    43.03125,   -60.25,      15.609375,
+            70.625,    -7.453125, -30.203125, -97.6875,    -0.0098419189453125,
+            -77.6875,  30.203125, -59.1875,   89.375,      28.6875,
+            -29.71875, -90.625,   28.28125,   27.65625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'add',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -103.125, -112.6875, -61.46875, 38.625,   19.6875, -40.125,
+            150.875,  -31.03125, -74.0625,  22.59375, 170.5,   48.375,
+            -105.75,  -86.1875,  17.09375,  18.125,   87.625,  -116.375,
+            117.125,  10.46875,  22.9375,   -160.625, 68.125,  -2.328125
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'add float16 3D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -43.34375, -67.875,   26.46875,   36.75,      -65.1875, -87.6875,
+            65.25,     -74.0625,  -13.828125, 6.98046875, 99.8125,  55.8125,
+            -75.5625,  11.5,      17.109375,  95.8125,    57.4375,  -57.1875,
+            27.71875,  -18.21875, 52.65625,   -70,        39.8125,  -29.984375
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -59.75,    -44.8125,  -87.9375,   1.884765625, 84.875,
+            47.5625,   85.625,    43.03125,   -60.25,      15.609375,
+            70.625,    -7.453125, -30.203125, -97.6875,    -0.0098419189453125,
+            -77.6875,  30.203125, -59.1875,   89.375,      28.6875,
+            -29.71875, -90.625,   28.28125,   27.65625
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'add',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -103.125, -112.6875, -61.46875, 38.625,   19.6875, -40.125,
+            150.875,  -31.03125, -74.0625,  22.59375, 170.5,   48.375,
+            -105.75,  -86.1875,  17.09375,  18.125,   87.625,  -116.375,
+            117.125,  10.46875,  22.9375,   -160.625, 68.125,  -2.328125
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'add float16 4D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -43.34375, -67.875,   26.46875,   36.75,      -65.1875, -87.6875,
+            65.25,     -74.0625,  -13.828125, 6.98046875, 99.8125,  55.8125,
+            -75.5625,  11.5,      17.109375,  95.8125,    57.4375,  -57.1875,
+            27.71875,  -18.21875, 52.65625,   -70,        39.8125,  -29.984375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -59.75,    -44.8125,  -87.9375,   1.884765625, 84.875,
+            47.5625,   85.625,    43.03125,   -60.25,      15.609375,
+            70.625,    -7.453125, -30.203125, -97.6875,    -0.0098419189453125,
+            -77.6875,  30.203125, -59.1875,   89.375,      28.6875,
+            -29.71875, -90.625,   28.28125,   27.65625
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'add',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -103.125, -112.6875, -61.46875, 38.625,   19.6875, -40.125,
+            150.875,  -31.03125, -74.0625,  22.59375, 170.5,   48.375,
+            -105.75,  -86.1875,  17.09375,  18.125,   87.625,  -116.375,
+            117.125,  10.46875,  22.9375,   -160.625, 68.125,  -2.328125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'add float16 5D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -43.34375, -67.875,   26.46875,   36.75,      -65.1875, -87.6875,
+            65.25,     -74.0625,  -13.828125, 6.98046875, 99.8125,  55.8125,
+            -75.5625,  11.5,      17.109375,  95.8125,    57.4375,  -57.1875,
+            27.71875,  -18.21875, 52.65625,   -70,        39.8125,  -29.984375
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -59.75,    -44.8125,  -87.9375,   1.884765625, 84.875,
+            47.5625,   85.625,    43.03125,   -60.25,      15.609375,
+            70.625,    -7.453125, -30.203125, -97.6875,    -0.0098419189453125,
+            -77.6875,  30.203125, -59.1875,   89.375,      28.6875,
+            -29.71875, -90.625,   28.28125,   27.65625
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'add',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -103.125, -112.6875, -61.46875, 38.625,   19.6875, -40.125,
+            150.875,  -31.03125, -74.0625,  22.59375, 170.5,   48.375,
+            -105.75,  -86.1875,  17.09375,  18.125,   87.625,  -116.375,
+            117.125,  10.46875,  22.9375,   -160.625, 68.125,  -2.328125
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'add float16 broadcast 1D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [-59.375],
+          'descriptor': {shape: [1], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -43.34375, -67.875,   26.46875,   36.75,      -65.1875, -87.6875,
+            65.25,     -74.0625,  -13.828125, 6.98046875, 99.8125,  55.8125,
+            -75.5625,  11.5,      17.109375,  95.8125,    57.4375,  -57.1875,
+            27.71875,  -18.21875, 52.65625,   -70,        39.8125,  -29.984375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'add',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -102.75,   -127.25, -32.90625, -22.625,   -124.5625, -147,
+            5.875,     -133.5,  -73.1875,  -52.40625, 40.4375,   -3.5625,
+            -135,      -47.875, -42.25,    36.4375,   -1.9375,   -116.5625,
+            -31.65625, -77.625, -6.71875,  -129.375,  -19.5625,  -89.375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'add float16 broadcast 2D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -43.34375, -67.875,   26.46875,   36.75,      -65.1875, -87.6875,
+            65.25,     -74.0625,  -13.828125, 6.98046875, 99.8125,  55.8125,
+            -75.5625,  11.5,      17.109375,  95.8125,    57.4375,  -57.1875,
+            27.71875,  -18.21875, 52.65625,   -70,        39.8125,  -29.984375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [-17.984375, -70.4375, -12.765625, 24.25, -68.125, 30.625],
+          'descriptor': {shape: [2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'add',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -61.3125, -138.25,  13.703125, 61,        -133.25,  -57.0625,
+            47.25,    -144.5,   -26.59375, 31.234375, 31.6875,  86.4375,
+            -93.5625, -58.9375, 4.34375,   120.0625,  -10.6875, -26.5625,
+            9.734375, -88.625,  39.875,    -45.75,    -28.3125, 0.640625
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'add float16 broadcast 3D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -43.34375, -67.875,   26.46875,   36.75,      -65.1875, -87.6875,
+            65.25,     -74.0625,  -13.828125, 6.98046875, 99.8125,  55.8125,
+            -75.5625,  11.5,      17.109375,  95.8125,    57.4375,  -57.1875,
+            27.71875,  -18.21875, 52.65625,   -70,        39.8125,  -29.984375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [-32.34375, 43.125, 78.6875, -54.5],
+          'descriptor': {shape: [2, 2, 1], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'add',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -75.6875, -100.25,   -5.875,     79.875,    -22.0625, -44.5625,
+            144,      4.625,     64.875,     -47.53125, 45.3125,  1.3125,
+            -107.875, -20.84375, -15.234375, 139,       100.5625, -14.0625,
+            106.375,  60.46875,  131.375,    -124.5,    -14.6875, -84.5
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'add float16 broadcast 4D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [-59.375],
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -43.34375, -67.875,   26.46875,   36.75,      -65.1875, -87.6875,
+            65.25,     -74.0625,  -13.828125, 6.98046875, 99.8125,  55.8125,
+            -75.5625,  11.5,      17.109375,  95.8125,    57.4375,  -57.1875,
+            27.71875,  -18.21875, 52.65625,   -70,        39.8125,  -29.984375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'add',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -102.75,   -127.25, -32.90625, -22.625,   -124.5625, -147,
+            5.875,     -133.5,  -73.1875,  -52.40625, 40.4375,   -3.5625,
+            -135,      -47.875, -42.25,    36.4375,   -1.9375,   -116.5625,
+            -31.65625, -77.625, -6.71875,  -129.375,  -19.5625,  -89.375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'add float16 large inputs',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': 89.3125,
+          'descriptor': {shape: [6000, 6000], dataType: 'float16'},
+          'constant': true
+        },
+        'inputB': {
+          'data': 77.25,
+          'descriptor': {shape: [6000, 6000], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'add',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': 166.5,
+          'descriptor': {shape: [6000, 6000], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/batch_normalization.https.any.js b/tests/wpt/tests/webnn/conformance_tests/batch_normalization.https.any.js
index b8fa3f026bc..1da85777342 100644
--- a/tests/wpt/tests/webnn/conformance_tests/batch_normalization.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/batch_normalization.https.any.js
@@ -81,7 +81,7 @@ const batchNormTests = [
     }
   },
   {
-    'name': 'batchNormalization float32 2D constant tensor default options',
+    'name': 'batchNormalization float32 2D constant tensors default options',
     'graph': {
       'inputs': {
         'bnInput': {
@@ -697,6 +697,590 @@ const batchNormTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name':
+        'batchNormalization float16 2D tensor (mean and variance are non-constant) default options',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.3125, 64.0625,   -63.375,        -46.78125, 83,
+            -80.0625, -62.15625, -0.10009765625, -40.90625, 56.96875,
+            37.375,   57.03125,  82.0625,        -86.125,   76.875,
+            97.0625,  -21.34375, -96.9375,       -9.359375, 80.1875,
+            -85.375,  62.34375,  -68.5,          -12.109375
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        },
+        'bnMean': {
+          'data': [-7.8125, -95.625, 38.15625, -55.9375, -87.875, -41.625],
+          'descriptor': {shape: [6], dataType: 'float16'}
+        },
+        'bnVariance': {
+          'data': [60.3125, 26.4375, 53.28125, 40.15625, 59.40625, 36],
+          'descriptor': {shape: [6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'batchNormalization',
+        'arguments': [
+          {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+        ],
+        'outputs': 'bnOutput'
+      }],
+      'expectedOutputs': {
+        'bnOutput': {
+          'data': [
+            -4.3125,    31.0625,     -13.90625,   1.4453125,   22.171875,
+            -6.40625,   -6.99609375, 18.578125,   -10.828125,  17.8125,
+            16.25,      16.4375,     11.5703125,  1.84765625,  5.3046875,
+            24.140625,  8.6328125,   -9.21875,    -0.19921875, 34.1875,
+            -16.921875, 18.671875,   2.513671875, 4.91796875
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization float16 2D constant tensors default options',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.3125, 64.0625,   -63.375,        -46.78125, 83,
+            -80.0625, -62.15625, -0.10009765625, -40.90625, 56.96875,
+            37.375,   57.03125,  82.0625,        -86.125,   76.875,
+            97.0625,  -21.34375, -96.9375,       -9.359375, 80.1875,
+            -85.375,  62.34375,  -68.5,          -12.109375
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'},
+          'constant': true
+        },
+        'bnMean': {
+          'data': [-7.8125, -95.625, 38.15625, -55.9375, -87.875, -41.625],
+          'descriptor': {shape: [6], dataType: 'float16'},
+          'constant': true
+        },
+        'bnVariance': {
+          'data': [60.3125, 26.4375, 53.28125, 40.15625, 59.40625, 36],
+          'descriptor': {shape: [6], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'batchNormalization',
+        'arguments': [
+          {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+        ],
+        'outputs': 'bnOutput'
+      }],
+      'expectedOutputs': {
+        'bnOutput': {
+          'data': [
+            -4.3125,    31.0625,     -13.90625,   1.4453125,   22.171875,
+            -6.40625,   -6.99609375, 18.578125,   -10.828125,  17.8125,
+            16.25,      16.4375,     11.5703125,  1.84765625,  5.3046875,
+            24.140625,  8.6328125,   -9.21875,    -0.19921875, 34.1875,
+            -16.921875, 18.671875,   2.513671875, 4.91796875
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization float16 2D tensor default options',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.3125, 64.0625,   -63.375,        -46.78125, 83,
+            -80.0625, -62.15625, -0.10009765625, -40.90625, 56.96875,
+            37.375,   57.03125,  82.0625,        -86.125,   76.875,
+            97.0625,  -21.34375, -96.9375,       -9.359375, 80.1875,
+            -85.375,  62.34375,  -68.5,          -12.109375
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        },
+        'bnMean': {
+          'data': [-7.8125, -95.625, 38.15625, -55.9375, -87.875, -41.625],
+          'descriptor': {shape: [6], dataType: 'float16'},
+          'constant': true
+        },
+        'bnVariance': {
+          'data': [60.3125, 26.4375, 53.28125, 40.15625, 59.40625, 36],
+          'descriptor': {shape: [6], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'batchNormalization',
+        'arguments': [
+          {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+        ],
+        'outputs': 'bnOutput'
+      }],
+      'expectedOutputs': {
+        'bnOutput': {
+          'data': [
+            -4.3125,    31.0625,     -13.90625,   1.4453125,   22.171875,
+            -6.40625,   -6.99609375, 18.578125,   -10.828125,  17.8125,
+            16.25,      16.4375,     11.5703125,  1.84765625,  5.3046875,
+            24.140625,  8.6328125,   -9.21875,    -0.19921875, 34.1875,
+            -16.921875, 18.671875,   2.513671875, 4.91796875
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization float16 3D tensor default options',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.3125, 64.0625,   -63.375,        -46.78125, 83,
+            -80.0625, -62.15625, -0.10009765625, -40.90625, 56.96875,
+            37.375,   57.03125,  82.0625,        -86.125,   76.875,
+            97.0625,  -21.34375, -96.9375,       -9.359375, 80.1875,
+            -85.375,  62.34375,  -68.5,          -12.109375
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        },
+        'bnMean': {
+          'data': [12.8125, 63.125, -61.625],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        },
+        'bnVariance': {
+          'data': [18.359375, 41.84375, 16.125],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'batchNormalization',
+        'arguments': [
+          {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+        ],
+        'outputs': 'bnOutput'
+      }],
+      'expectedOutputs': {
+        'bnOutput': {
+          'data': [
+            -12.6328125, 11.9609375,  -17.78125,     -13.90625,  3.072265625,
+            -22.140625,  -19.375,     -9.7734375,    5.16015625, 29.53125,
+            24.65625,    29.546875,   16.15625,      -23.09375,  14.953125,
+            19.65625,    -13.0546875, -24.75,        -11.203125, 2.638671875,
+            -5.9140625,  30.875,      -1.7119140625, 12.328125
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization float16 4D tensor default options',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.3125, 64.0625,   -63.375,        -46.78125, 83,
+            -80.0625, -62.15625, -0.10009765625, -40.90625, 56.96875,
+            37.375,   57.03125,  82.0625,        -86.125,   76.875,
+            97.0625,  -21.34375, -96.9375,       -9.359375, 80.1875,
+            -85.375,  62.34375,  -68.5,          -12.109375
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        },
+        'bnMean': {
+          'data': [51.625, 99.375, -96.125],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        },
+        'bnVariance': {
+          'data': [30.453125, 86.375, 73.875],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'batchNormalization',
+        'arguments': [
+          {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+        ],
+        'outputs': 'bnOutput'
+      }],
+      'expectedOutputs': {
+        'bnOutput': {
+          'data': [
+            -16.84375,    2.25390625,  -20.84375,  -17.828125, -1.76171875,
+            -19.3125,     -17.375,     -10.703125, 6.42578125, 17.8125,
+            15.53125,     17.8125,     5.515625,   -24.96875,  4.57421875,
+            8.234375,     -12.9921875, -21.125,    -11.703125, -2.064453125,
+            1.2509765625, 18.4375,     3.21484375, 9.7734375
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization float16 5D tensor default options',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.3125, 64.0625,   -63.375,        -46.78125, 83,
+            -80.0625, -62.15625, -0.10009765625, -40.90625, 56.96875,
+            37.375,   57.03125,  82.0625,        -86.125,   76.875,
+            97.0625,  -21.34375, -96.9375,       -9.359375, 80.1875,
+            -85.375,  62.34375,  -68.5,          -12.109375
+          ],
+          'descriptor': {shape: [6, 1, 1, 2, 2], dataType: 'float16'}
+        },
+        'bnMean': {
+          'data': [35.40625],
+          'descriptor': {shape: [1], dataType: 'float16'},
+          'constant': true
+        },
+        'bnVariance': {
+          'data': [40.9375],
+          'descriptor': {shape: [1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'batchNormalization',
+        'arguments': [
+          {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'}
+        ],
+        'outputs': 'bnOutput'
+      }],
+      'expectedOutputs': {
+        'bnOutput': {
+          'data': [
+            -11.9921875,  4.48046875, -15.4375,    -12.84375,   7.4375,
+            -18.046875,   -15.25,     -5.55078125, -11.9296875, 3.369140625,
+            0.3076171875, 3.37890625, 7.29296875,  -19,         6.48046875,
+            9.6328125,    -8.8671875, -20.6875,    -6.99609375, 7,
+            -18.875,      4.2109375,  -16.234375,  -7.42578125
+          ],
+          'descriptor': {shape: [6, 1, 1, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization float16 4D NCHW tensor options.axis=1',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.3125, 64.0625,   -63.375,        -46.78125, 83,
+            -80.0625, -62.15625, -0.10009765625, -40.90625, 56.96875,
+            37.375,   57.03125,  82.0625,        -86.125,   76.875,
+            97.0625,  -21.34375, -96.9375,       -9.359375, 80.1875,
+            -85.375,  62.34375,  -68.5,          -12.109375
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        },
+        'bnMean': {
+          'data': [51.625, 99.375, -96.125],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        },
+        'bnVariance': {
+          'data': [30.453125, 86.375, 73.875],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'batchNormalization',
+        'arguments': [
+          {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'},
+          {'options': {'axis': 1}}
+        ],
+        'outputs': 'bnOutput'
+      }],
+      'expectedOutputs': {
+        'bnOutput': {
+          'data': [
+            -16.84375,    2.25390625,  -20.84375,  -17.828125, -1.76171875,
+            -19.3125,     -17.375,     -10.703125, 6.42578125, 17.8125,
+            15.53125,     17.8125,     5.515625,   -24.96875,  4.57421875,
+            8.234375,     -12.9921875, -21.125,    -11.703125, -2.064453125,
+            1.2509765625, 18.4375,     3.21484375, 9.7734375
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization float16 4D NHWC tensor options.axis=3',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.3125,       83,       -40.90625, 64.0625,   -80.0625,
+            56.96875,       -63.375,  -62.15625, 37.375,    -46.78125,
+            -0.10009765625, 57.03125, 82.0625,   -21.34375, -85.375,
+            -86.125,        -96.9375, 62.34375,  76.875,    -9.359375,
+            -68.5,          97.0625,  80.1875,   -12.109375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'bnMean': {
+          'data': [51.625, 99.375, -96.125],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        },
+        'bnVariance': {
+          'data': [30.453125, 86.375, 73.875],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'batchNormalization',
+        'arguments': [
+          {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'},
+          {'options': {'axis': 3}}
+        ],
+        'outputs': 'bnOutput'
+      }],
+      'expectedOutputs': {
+        'bnOutput': {
+          'data': [
+            -16.84375,  -1.76171875, 6.42578125,   2.25390625,  -19.3125,
+            17.8125,    -20.84375,   -17.375,      15.53125,    -17.828125,
+            -10.703125, 17.8125,     5.515625,     -12.9921875, 1.2509765625,
+            -24.96875,  -21.125,     18.4375,      4.57421875,  -11.703125,
+            3.21484375, 8.234375,    -2.064453125, 9.7734375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization float16 4D NCHW tensor options.scale',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.3125, 64.0625,   -63.375,        -46.78125, 83,
+            -80.0625, -62.15625, -0.10009765625, -40.90625, 56.96875,
+            37.375,   57.03125,  82.0625,        -86.125,   76.875,
+            97.0625,  -21.34375, -96.9375,       -9.359375, 80.1875,
+            -85.375,  62.34375,  -68.5,          -12.109375
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        },
+        'bnMean': {
+          'data': [51.625, 99.375, -96.125],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        },
+        'bnVariance': {
+          'data': [30.453125, 86.375, 73.875],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        },
+        'bnScale': {
+          'data': [65.5, -71, -5.5703125],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'batchNormalization',
+        'arguments': [
+          {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'},
+          {'options': {'scale': 'bnScale'}}
+        ],
+        'outputs': 'bnOutput'
+      }],
+      'expectedOutputs': {
+        'bnOutput': {
+          'data': [
+            -1103,  147.625, -1365,     -1168,     125.125,   1371,
+            1234,   760,     -35.78125, -99.1875,  -86.5,     -99.25,
+            361.25, -1635,   299.75,    539.5,     922,       1500,
+            830.5,  146.625, -6.96875,  -102.6875, -17.90625, -54.4375
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization float16 4D NCHW tensor options.bias',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.3125, 64.0625,   -63.375,        -46.78125, 83,
+            -80.0625, -62.15625, -0.10009765625, -40.90625, 56.96875,
+            37.375,   57.03125,  82.0625,        -86.125,   76.875,
+            97.0625,  -21.34375, -96.9375,       -9.359375, 80.1875,
+            -85.375,  62.34375,  -68.5,          -12.109375
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        },
+        'bnMean': {
+          'data': [51.625, 99.375, -96.125],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        },
+        'bnVariance': {
+          'data': [30.453125, 86.375, 73.875],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        },
+        'bnBias': {
+          'data': [64.1875, 75.3125, -84.5625],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'batchNormalization',
+        'arguments': [
+          {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'},
+          {'options': {'bias': 'bnBias'}}
+        ],
+        'outputs': 'bnOutput'
+      }],
+      'expectedOutputs': {
+        'bnOutput': {
+          'data': [
+            47.34375, 66.4375,  43.34375, 46.34375, 73.5625, 56,
+            57.9375,  64.625,   -78.125,  -66.75,   -69,     -66.75,
+            69.6875,  39.21875, 68.75,    72.4375,  62.3125, 54.1875,
+            63.625,   73.25,    -83.3125, -66.125,  -81.375, -74.8125
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization float16 4D NCHW tensor options.epsilon',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.3125, 64.0625,   -63.375,        -46.78125, 83,
+            -80.0625, -62.15625, -0.10009765625, -40.90625, 56.96875,
+            37.375,   57.03125,  82.0625,        -86.125,   76.875,
+            97.0625,  -21.34375, -96.9375,       -9.359375, 80.1875,
+            -85.375,  62.34375,  -68.5,          -12.109375
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        },
+        'bnMean': {
+          'data': [51.625, 99.375, -96.125],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        },
+        'bnVariance': {
+          'data': [30.453125, 86.375, 73.875],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'batchNormalization',
+        'arguments': [
+          {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'},
+          {'options': {'epsilon': 0.000001}}
+        ],
+        'outputs': 'bnOutput'
+      }],
+      'expectedOutputs': {
+        'bnOutput': {
+          'data': [
+            -16.84375,    2.25390625,  -20.84375,  -17.828125, -1.76171875,
+            -19.3125,     -17.375,     -10.703125, 6.42578125, 17.8125,
+            15.53125,     17.8125,     5.515625,   -24.96875,  4.57421875,
+            8.234375,     -12.9921875, -21.125,    -11.703125, -2.064453125,
+            1.2509765625, 18.4375,     3.21484375, 9.7734375
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'batchNormalization float16 4D NHWC tensor all options',
+    'graph': {
+      'inputs': {
+        'bnInput': {
+          'data': [
+            -41.3125,       83,       -40.90625, 64.0625,   -80.0625,
+            56.96875,       -63.375,  -62.15625, 37.375,    -46.78125,
+            -0.10009765625, 57.03125, 82.0625,   -21.34375, -85.375,
+            -86.125,        -96.9375, 62.34375,  76.875,    -9.359375,
+            -68.5,          97.0625,  80.1875,   -12.109375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'bnMean': {
+          'data': [51.625, 99.375, -96.125],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        },
+        'bnVariance': {
+          'data': [30.453125, 86.375, 73.875],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        },
+        'bnScale': {
+          'data': [65.5, -71, -5.5703125],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        },
+        'bnBias': {
+          'data': [64.1875, 75.3125, -84.5625],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'batchNormalization',
+        'arguments': [
+          {'input': 'bnInput'}, {'mean': 'bnMean'}, {'variance': 'bnVariance'},
+          {
+            'options': {
+              'scale': 'bnScale',
+              'bias': 'bnBias',
+              'axis': 3,
+              'epsilon': 0.000001
+            }
+          }
+        ],
+        'outputs': 'bnOutput'
+      }],
+      'expectedOutputs': {
+        'bnOutput': {
+          'data': [
+            -1039, 200.375, -120.375,  211.75, 1446,    -183.75,
+            -1301, 1309,    -171.125,  -1104,  835.5,   -183.875,
+            425.5, 997.5,   -91.5,     -1571,  1575,    -187.25,
+            364,   906,     -102.4375, 603.5,  221.875, -139
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/ceil.https.any.js b/tests/wpt/tests/webnn/conformance_tests/ceil.https.any.js
index 7f31a80ce7a..7d487dd65fa 100644
--- a/tests/wpt/tests/webnn/conformance_tests/ceil.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/ceil.https.any.js
@@ -57,7 +57,8 @@ const ceilTests = [
             69.71428680419922,   5.0031023025512695,  84.36833953857422,
             -9.390542030334473,  -27.856616973876953, -34.895931243896484
           ],
-          'descriptor': {shape: [24], dataType: 'float32'}
+          'descriptor': {shape: [24], dataType: 'float32'},
+          'constant': true
         }
       },
       'operators': [{
@@ -278,7 +279,8 @@ const ceilTests = [
             -5.6171875, 61.53125,  -87.8125,   69.6875,   5.00390625,
             84.375,     -9.390625, -27.859375, -34.90625
           ],
-          'descriptor': {shape: [24], dataType: 'float16'}
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
         }
       },
       'operators': [{
diff --git a/tests/wpt/tests/webnn/conformance_tests/clamp.https.any.js b/tests/wpt/tests/webnn/conformance_tests/clamp.https.any.js
index d6fa68eb19d..b3ccdcddca3 100644
--- a/tests/wpt/tests/webnn/conformance_tests/clamp.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/clamp.https.any.js
@@ -123,28 +123,6 @@ const clampTests = [
       }
     }
   },
-  {
-    'name': 'clamp float16 1D tensor',
-    'graph': {
-      'inputs': {
-        'clampInput': {
-          'data': [NaN, -Infinity, Infinity, -64000, 64000, -2, 1, 0],
-          'descriptor': {shape: [8], dataType: 'float16'}
-        }
-      },
-      'operators': [{
-        'name': 'clamp',
-        'arguments': [{'input': 'clampInput'}, {'options': {'minValue': -2}}],
-        'outputs': 'clampOutput'
-      }],
-      'expectedOutputs': {
-        'clampOutput': {
-          'data': [NaN, -2, Infinity, -2, 64000, -2, 1, 0],
-          'descriptor': {shape: [8], dataType: 'float16'}
-        }
-      }
-    }
-  },
   {
     'name': 'clamp int8 1D tensor',
     'graph': {
@@ -1090,6 +1068,660 @@ const clampTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'clamp float16 0D tensor default options',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [-9.8203125],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [{'input': 'clampInput'}],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [-9.8203125],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'clamp float16 1D tensor',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [NaN, -Infinity, Infinity, -64000, 64000, -2, 1, 0],
+          'descriptor': {shape: [8], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [{'input': 'clampInput'}, {'options': {'minValue': -2}}],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [NaN, -2, Infinity, -2, 64000, -2, 1, 0],
+          'descriptor': {shape: [8], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'clamp float16 1D constant tensor default options',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [{'input': 'clampInput'}],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'clamp float16 1D tensor default options',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [{'input': 'clampInput'}],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'clamp float16 2D tensor default options',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [{'input': 'clampInput'}],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'clamp float16 3D tensor default options',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [{'input': 'clampInput'}],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'clamp float16 4D tensor default options',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [3, 2, 2, 2], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [{'input': 'clampInput'}],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [3, 2, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'clamp float16 5D tensor default options',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [4, 1, 1, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [{'input': 'clampInput'}],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [4, 1, 1, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'clamp float16 4D tensor default options.maxValue and specified negative options.minValue',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [{'input': 'clampInput'}, {'options': {'minValue': -1}}],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            -1,         -1,          -1,         -1,         -1,
+            9.5234375,  3.728515625, 6.48046875, -1,         -1,
+            7.87890625, -1,          6.34375,    5.52734375, 0.84326171875,
+            -1,         -1,          9.28125,    -1,         9.546875,
+            5.7890625,  5.55078125,  7.41015625, -1
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'clamp float16 3D tensor default options.maxValue and specified options.minValue=0.0',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [6, 2, 2], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [{'input': 'clampInput'}, {'options': {'minValue': 0}}],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            0,          0,           0,          0,          0,
+            9.5234375,  3.728515625, 6.48046875, 0,          0,
+            7.87890625, 0,           6.34375,    5.52734375, 0.84326171875,
+            0,          0,           9.28125,    0,          9.546875,
+            5.7890625,  5.55078125,  7.41015625, 0
+          ],
+          'descriptor': {shape: [6, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'clamp float16 2D tensor default options.maxValue and specified positive options.minValue',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [3, 8], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [{'input': 'clampInput'}, {'options': {'minValue': 1}}],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            1,          1,          1, 1,          1, 9.5234375, 3.728515625,
+            6.48046875, 1,          1, 7.87890625, 1, 6.34375,   5.52734375,
+            1,          1,          1, 9.28125,    1, 9.546875,  5.7890625,
+            5.55078125, 7.41015625, 1
+          ],
+          'descriptor': {shape: [3, 8], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'clamp float16 5D tensor default options.minValue and specified negative options.maxValue',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [{'input': 'clampInput'}, {'options': {'maxValue': -2}}],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875, -7.75390625,
+            -2,         -2,           -2,          -2,          -7.34375,
+            -2,         -2.056640625, -2,          -2,          -2,
+            -8.203125,  -7.78515625,  -2,          -2.3125,     -2,
+            -2,         -2,           -2,          -2.123046875
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'clamp float16 1D tensor default options.minValue and specified options.maxValue=0.0',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [{'input': 'clampInput'}, {'options': {'maxValue': 0}}],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            -9.8203125,  -6.0234375,  -4.07421875,
+            -6.57421875, -7.75390625, 0,
+            0,           0,           -1.537109375,
+            -7.34375,    0,           -2.056640625,
+            0,           0,           0,
+            -8.203125,   -7.78515625, 0,
+            -2.3125,     0,           0,
+            0,           0,           -2.123046875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'clamp float16 3D tensor default options.minValue and specified positive options.maxValue',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [3, 4, 2], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [{'input': 'clampInput'}, {'options': {'maxValue': 3}}],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            -9.8203125,  -6.0234375,  -4.07421875,
+            -6.57421875, -7.75390625, 3,
+            3,           3,           -1.537109375,
+            -7.34375,    3,           -2.056640625,
+            3,           3,           0.84326171875,
+            -8.203125,   -7.78515625, 3,
+            -2.3125,     3,           3,
+            3,           3,           -2.123046875
+          ],
+          'descriptor': {shape: [3, 4, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'clamp float16 5D tensor specified both negative options.minValue and options.maxValue',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [3, 2, 1, 1, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [
+          {'input': 'clampInput'}, {'options': {'minValue': -8, 'maxValue': -1}}
+        ],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            -8, -6.0234375,   -4.07421875, -6.57421875, -7.75390625,  -1, -1,
+            -1, -1.537109375, -7.34375,    -1,          -2.056640625, -1, -1,
+            -1, -8,           -7.78515625, -1,          -2.3125,      -1, -1,
+            -1, -1,           -2.123046875
+          ],
+          'descriptor': {shape: [3, 2, 1, 1, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'clamp float16 4D tensor specified negative options.minValue and options.maxValue=0.0',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [1, 4, 3, 2], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [
+          {'input': 'clampInput'}, {'options': {'minValue': -6, 'maxValue': 0}}
+        ],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            -6,      -6, -4.07421875,
+            -6,      -6, 0,
+            0,       0,  -1.537109375,
+            -6,      0,  -2.056640625,
+            0,       0,  0,
+            -6,      -6, 0,
+            -2.3125, 0,  0,
+            0,       0,  -2.123046875
+          ],
+          'descriptor': {shape: [1, 4, 3, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'clamp float16 3D tensor specified negative options.minValue and positive options.maxValue',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [2, 6, 2], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [
+          {'input': 'clampInput'}, {'options': {'minValue': -3, 'maxValue': 4}}
+        ],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            -3,          -3, -3,
+            -3,          -3, 4,
+            3.728515625, 4,  -1.537109375,
+            -3,          4,  -2.056640625,
+            4,           4,  0.84326171875,
+            -3,          -3, 4,
+            -2.3125,     4,  4,
+            4,           4,  -2.123046875
+          ],
+          'descriptor': {shape: [2, 6, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'clamp float16 2D tensor specified options.minValue=0.0 and positive options.maxValue',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [6, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [
+          {'input': 'clampInput'}, {'options': {'minValue': 0, 'maxValue': 6}}
+        ],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            0,         0,           0, 0,          0,
+            6,         3.728515625, 6, 0,          0,
+            6,         0,           6, 5.52734375, 0.84326171875,
+            0,         0,           6, 0,          6,
+            5.7890625, 5.55078125,  6, 0
+          ],
+          'descriptor': {shape: [6, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'clamp float16 1D tensor specified both positive options.minValue and options.maxValue',
+    'graph': {
+      'inputs': {
+        'clampInput': {
+          'data': [
+            -9.8203125, -6.0234375,   -4.07421875, -6.57421875,  -7.75390625,
+            9.5234375,  3.728515625,  6.48046875,  -1.537109375, -7.34375,
+            7.87890625, -2.056640625, 6.34375,     5.52734375,   0.84326171875,
+            -8.203125,  -7.78515625,  9.28125,     -2.3125,      9.546875,
+            5.7890625,  5.55078125,   7.41015625,  -2.123046875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'clamp',
+        'arguments': [
+          {'input': 'clampInput'}, {'options': {'minValue': 2, 'maxValue': 7}}
+        ],
+        'outputs': 'clampOutput'
+      }],
+      'expectedOutputs': {
+        'clampOutput': {
+          'data': [
+            2, 2, 2, 2, 2,         7,          3.728515625, 6.48046875,
+            2, 2, 7, 2, 6.34375,   5.52734375, 2,           2,
+            2, 7, 2, 7, 5.7890625, 5.55078125, 7,           2
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/concat.https.any.js b/tests/wpt/tests/webnn/conformance_tests/concat.https.any.js
index 0208e2ec605..d4192172046 100644
--- a/tests/wpt/tests/webnn/conformance_tests/concat.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/concat.https.any.js
@@ -22,50 +22,6 @@ const getConcatPrecisionTolerance = (graphResources) => {
   return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
 };
 
-const buildAndExecuteGraphWithConcat =
-    async (context, builder, graphResources) => {
-  const graphInputs = graphResources.inputs;
-  const operator = graphResources.operators[0];
-
-  const inputOperands = [];
-  const inputNameArray =
-      operator.arguments[0][Object.keys(operator.arguments[0])[0]];
-  for (const inputName of inputNameArray) {
-    const operand =
-        createOperand(context, builder, inputName, graphInputs[inputName]);
-    inputOperands.push(operand);
-  }
-
-  let outputOperand = builder[operator.name](
-      inputOperands,
-      operator.arguments[1][Object.keys(operator.arguments[1])[0]]);
-  const outputOperandName = Object.keys(graphResources.expectedOutputs)[0];
-  const expectedDescriptor =
-      graphResources.expectedOutputs[outputOperandName].descriptor;
-  if (!context.opSupportLimits().output.dataTypes.includes(
-          expectedDescriptor.dataType)) {
-    const compatibleType = findCompatibleType(
-        expectedDescriptor.dataType,
-        context.opSupportLimits().output.dataTypes);
-    outputOperand = builder.cast(outputOperand, compatibleType);
-    expectedDescriptor.castedType = compatibleType;
-  }
-
-  assertDescriptorsEquals(outputOperand, expectedDescriptor);
-
-  const namedOutputOperand = {};
-  namedOutputOperand[outputOperandName] = outputOperand;
-
-  // Compile the constructed graph.
-  const graph = await builder.build(namedOutputOperand);
-
-  // Execute the compiled graph.
-  const result = await computeGraph(
-      context, graph, graphInputs, graphResources.expectedOutputs);
-
-  return {result, namedOutputOperand};
-};
-
 const concatTests = [
   {
     'name': 'concat two float32 1D constant tensors of same shape along axis 0',
@@ -2428,7 +2384,7 @@ const concatTests = [
 if (navigator.ml) {
   concatTests.forEach((test) => {
     webnn_conformance_test(
-        buildAndExecuteGraphWithConcat, getConcatPrecisionTolerance, test);
+      buildAndExecuteGraph, getConcatPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/constant-reshape-optimization.https.any.js b/tests/wpt/tests/webnn/conformance_tests/constant-reshape-optimization.https.any.js
new file mode 100644
index 00000000000..eaa232b7413
--- /dev/null
+++ b/tests/wpt/tests/webnn/conformance_tests/constant-reshape-optimization.https.any.js
@@ -0,0 +1,96 @@
+// META: title=test constant reshape optimization
+// META: global=window
+// META: variant=?cpu
+// META: variant=?gpu
+// META: variant=?npu
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+const tests = [{
+  'name': 'reshape + reshape + reshape + instanceNormalization float32',
+  'graph': {
+    'inputs': {
+      'originalInput': {
+        'data': [
+          -97.949951171875,    29.44037628173828,  -73.92131042480469,
+          -38.11185836791992,  41.33772659301758,  -59.77853012084961,
+          -74.66901397705078,  -68.16508483886719, 35.82481384277344,
+          -6.948329448699951,  54.42462158203125,  47.53074645996094,
+          66.93562316894531,   76.74034881591797,  5.6758809089660645,
+          25.68659210205078,   37.37651062011719,  56.252689361572266,
+          -16.574905395507812, 42.949893951416016, 73.8739242553711,
+          -99.00035095214844,  -33.11322784423828, -17.380685806274414
+        ],
+        'descriptor': {shape: [3, 8], dataType: 'float32'},
+        'constant': true
+      },
+      'originalScale': {
+        'data': [-94.42772674560547, 66.69620513916016, -98.56572723388672],
+        'descriptor': {shape: [1, 3, 1, 1], dataType: 'float32'},
+        'constant': true
+      },
+      'originalBias': {
+        'data': [-33.048641204833984, 4.511423587799072, -37.93617248535156],
+        'descriptor': {shape: [1, 3, 1, 1], dataType: 'float32'},
+        'constant': true
+      },
+    },
+    'operators': [
+      {
+        'name': 'reshape',
+        'arguments': [{'input': 'originalInput'}, {'newShape': [2, 3, 2, 2]}],
+        'outputs': 'reshapedInput'
+      },
+      {
+        'name': 'reshape',
+        'arguments': [{'input': 'originalScale'}, {'newShape': [3]}],
+        'outputs': 'reshapedScale'
+      },
+      {
+        'name': 'reshape',
+        'arguments': [{'input': 'originalBias'}, {'newShape': [3]}],
+        'outputs': 'reshapedBias'
+      },
+      {
+        'name': 'instanceNormalization',
+        'arguments': [
+          {'input': 'reshapedInput'}, {
+            'options': {
+              'scale': 'reshapedScale',
+              'bias': 'reshapedBias',
+              'epsilon': 0.000001,
+              'layout': 'nchw'
+            }
+          }
+        ],
+        'outputs': 'instanceNormOutput'
+      }
+    ],
+    'expectedOutputs': {
+      'instanceNormOutput': {
+        'data': [
+          70.77738189697266,   -179.65554809570312, 23.540178298950195,
+          -46.8565788269043,   119.31526184082031,  -22.847837448120117,
+          -43.782920837402344, -34.6388053894043,   -50.821895599365234,
+          126.01134490966797,  -127.71744537353516, -99.2166976928711,
+          -108.09159851074219, -139.83889770507812, 90.26488494873047,
+          25.471038818359375,  22.237276077270508,  67.60342407226562,
+          -107.4271011352539,  35.6320915222168,    -186.15142822265625,
+          90.01669311523438,   -15.238543510437012, -40.37141418457031
+        ],
+        'descriptor': {shape: [2, 3, 2, 2], dataType: 'float32'}
+      }
+    }
+  }
+}];
+
+if (navigator.ml) {
+  tests.forEach((test) => {
+    webnn_conformance_test(
+        buildAndExecuteGraph, getInstanceNormPrecisionTolerance, test);
+  });
+} else {
+  test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
+}
diff --git a/tests/wpt/tests/webnn/conformance_tests/conv2d.https.any.js b/tests/wpt/tests/webnn/conformance_tests/conv2d.https.any.js
index 9fe246c9395..45fecb2b40c 100644
--- a/tests/wpt/tests/webnn/conformance_tests/conv2d.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/conv2d.https.any.js
@@ -1105,6 +1105,1011 @@ const conv2dTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name':
+        'conv2d float16 4D both input and filter non-constant tensors default options',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6123046875,    0.8857421875,      0.13671875,
+            0.564453125,     0.896484375,       0.367919921875,
+            0.68115234375,   0.047943115234375, 0.33349609375,
+            0.1988525390625, 0.41162109375,     0.079345703125,
+            0.42724609375,   0.53564453125,     0.59130859375,
+            0.2841796875,    0.414794921875,    0.0269012451171875,
+            0.362060546875,  0.99462890625,     0.07183837890625,
+            0.1220703125,    0.84228515625,     0.453857421875,
+            0.21533203125
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.38037109375, 0.52783203125, 0.219482421875, 0.366943359375,
+            0.33984375, 0.419921875, 0.380615234375, 0.1944580078125,
+            0.56884765625
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            1.5322265625, 1.357421875, 1.3642578125, 1.0712890625, 1.1259765625,
+            1.4716796875, 1.0791015625, 1.1552734375, 1.6572265625
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'conv2d float16 4D both input and filter constant tensors default options',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6123046875,    0.8857421875,      0.13671875,
+            0.564453125,     0.896484375,       0.367919921875,
+            0.68115234375,   0.047943115234375, 0.33349609375,
+            0.1988525390625, 0.41162109375,     0.079345703125,
+            0.42724609375,   0.53564453125,     0.59130859375,
+            0.2841796875,    0.414794921875,    0.0269012451171875,
+            0.362060546875,  0.99462890625,     0.07183837890625,
+            0.1220703125,    0.84228515625,     0.453857421875,
+            0.21533203125
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float16'},
+          'constant': true
+        },
+        'conv2dFilter': {
+          'data': [
+            0.38037109375, 0.52783203125, 0.219482421875, 0.366943359375,
+            0.33984375, 0.419921875, 0.380615234375, 0.1944580078125,
+            0.56884765625
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            1.5322265625, 1.357421875, 1.3642578125, 1.0712890625, 1.1259765625,
+            1.4716796875, 1.0791015625, 1.1552734375, 1.6572265625
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d float16 4D input and filter tensors default options',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6123046875,    0.8857421875,      0.13671875,
+            0.564453125,     0.896484375,       0.367919921875,
+            0.68115234375,   0.047943115234375, 0.33349609375,
+            0.1988525390625, 0.41162109375,     0.079345703125,
+            0.42724609375,   0.53564453125,     0.59130859375,
+            0.2841796875,    0.414794921875,    0.0269012451171875,
+            0.362060546875,  0.99462890625,     0.07183837890625,
+            0.1220703125,    0.84228515625,     0.453857421875,
+            0.21533203125
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.38037109375, 0.52783203125, 0.219482421875, 0.366943359375,
+            0.33984375, 0.419921875, 0.380615234375, 0.1944580078125,
+            0.56884765625
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [{'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            1.5322265625, 1.357421875, 1.3642578125, 1.0712890625, 1.1259765625,
+            1.4716796875, 1.0791015625, 1.1552734375, 1.6572265625
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d float16 4D input and filter tensors options.padding',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6123046875,    0.8857421875,      0.13671875,
+            0.564453125,     0.896484375,       0.367919921875,
+            0.68115234375,   0.047943115234375, 0.33349609375,
+            0.1988525390625, 0.41162109375,     0.079345703125,
+            0.42724609375,   0.53564453125,     0.59130859375,
+            0.2841796875,    0.414794921875,    0.0269012451171875,
+            0.362060546875,  0.99462890625,     0.07183837890625,
+            0.1220703125,    0.84228515625,     0.453857421875,
+            0.21533203125
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.38037109375, 0.52783203125, 0.219482421875, 0.366943359375,
+            0.33984375, 0.419921875, 0.380615234375, 0.1944580078125,
+            0.56884765625
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+          {'options': {'padding': [1, 1, 1, 1]}}
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            1.0390625,      0.8828125,     1.06640625,    0.814453125,
+            0.67724609375,  1.0537109375,  1.5322265625,  1.357421875,
+            1.3642578125,   1.1962890625,  0.80810546875, 1.0712890625,
+            1.1259765625,   1.4716796875,  0.96044921875, 0.5888671875,
+            1.0791015625,   1.1552734375,  1.6572265625,  1.201171875,
+            0.316650390625, 0.75439453125, 0.77294921875, 0.97314453125,
+            0.90234375
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d float16 4D input and filter tensors options.strides',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6123046875,    0.8857421875,      0.13671875,
+            0.564453125,     0.896484375,       0.367919921875,
+            0.68115234375,   0.047943115234375, 0.33349609375,
+            0.1988525390625, 0.41162109375,     0.079345703125,
+            0.42724609375,   0.53564453125,     0.59130859375,
+            0.2841796875,    0.414794921875,    0.0269012451171875,
+            0.362060546875,  0.99462890625,     0.07183837890625,
+            0.1220703125,    0.84228515625,     0.453857421875,
+            0.21533203125
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.38037109375, 0.52783203125, 0.219482421875, 0.366943359375,
+            0.33984375, 0.419921875, 0.380615234375, 0.1944580078125,
+            0.56884765625
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+          {'options': {'strides': [2, 2]}}
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [1.5322265625, 1.3642578125, 1.0791015625, 1.6572265625],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d float16 4D input and filter tensors options.dilations',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.6123046875,    0.8857421875,      0.13671875,
+            0.564453125,     0.896484375,       0.367919921875,
+            0.68115234375,   0.047943115234375, 0.33349609375,
+            0.1988525390625, 0.41162109375,     0.079345703125,
+            0.42724609375,   0.53564453125,     0.59130859375,
+            0.2841796875,    0.414794921875,    0.0269012451171875,
+            0.362060546875,  0.99462890625,     0.07183837890625,
+            0.1220703125,    0.84228515625,     0.453857421875,
+            0.21533203125
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.38037109375, 0.52783203125, 0.219482421875, 0.366943359375,
+            0.33984375, 0.419921875, 0.380615234375, 0.1944580078125,
+            0.56884765625
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+          {'options': {'dilations': [2, 2]}}
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [1.3603515625],
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'depthwise conv2d float16 4D input and filter tensors options.groups= input_channels',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.8447265625, 0.943359375, 0.65576171875, 0.6982421875,
+            0.99951171875, 0.2366943359375, 0.367431640625, 0.261962890625,
+            0.62548828125, 0.84033203125, 0.37841796875, 0.454345703125,
+            0.253173828125, 0.578125, 0.54150390625, 0.37841796875
+          ],
+          'descriptor': {shape: [1, 4, 2, 2], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.272216796875, 0.28125, 0.8544921875, 0.1796875, 0.7763671875,
+            0.51416015625, 0.63720703125, 0.1280517578125, 0.83740234375,
+            0.57275390625, 0.09857177734375, 0.5927734375, 0.58984375,
+            0.96923828125, 0.2318115234375, 0.1480712890625
+          ],
+          'descriptor': {shape: [4, 1, 2, 2], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+          {'options': {'groups': 4}}
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [1.1806640625, 1.1650390625, 1.3115234375, 0.89111328125],
+          'descriptor': {shape: [1, 4, 1, 1], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'conv2d float16 4D input and filter tensors options.inputLayout=\'nchw\'',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.7529296875, 0.751953125, 0.5947265625, 0.21630859375,
+            0.07586669921875, 0.151123046875, 0.12127685546875, 0.53662109375,
+            0.59375, 0.9912109375, 0.363037109375, 0.92919921875,
+            0.227294921875, 0.54150390625, 0.08447265625, 0.6767578125,
+            0.619140625, 0.392822265625
+          ],
+          'descriptor': {shape: [2, 1, 3, 3], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.1453857421875, 0.96728515625, 0.10833740234375, 0.3203125,
+            0.6953125, 0.50732421875, 0.0814208984375, 0.5302734375,
+            0.30712890625, 0.432373046875, 0.98486328125, 0.42822265625
+          ],
+          'descriptor': {shape: [3, 1, 2, 2], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+          {'options': {'inputLayout': 'nchw'}}
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            0.884765625,  0.7412109375,  0.289794921875, 0.405517578125,
+            0.962890625,  0.91064453125, 0.4833984375,   0.488037109375,
+            0.8017578125, 0.62744140625, 0.448486328125, 0.87158203125,
+            0.693359375,  1.037109375,   0.82861328125,  0.353271484375,
+            1.1787109375, 0.8125,        0.81640625,     0.67822265625,
+            0.9169921875, 1.0830078125,  1.2353515625,   0.98095703125
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'conv2d float16 4D input and filter tensors options.inputLayout=\'nhwc\'',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.7529296875, 0.751953125, 0.5947265625, 0.21630859375,
+            0.07586669921875, 0.151123046875, 0.12127685546875, 0.53662109375,
+            0.59375, 0.9912109375, 0.363037109375, 0.92919921875,
+            0.227294921875, 0.54150390625, 0.08447265625, 0.6767578125,
+            0.619140625, 0.392822265625
+          ],
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.1453857421875, 0.96728515625, 0.10833740234375, 0.3203125,
+            0.6953125, 0.50732421875, 0.0814208984375, 0.5302734375,
+            0.30712890625, 0.432373046875, 0.98486328125, 0.42822265625
+          ],
+          'descriptor': {shape: [3, 1, 2, 2], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+          {'options': {'inputLayout': 'nhwc'}}
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            0.884765625,    0.962890625,    0.8017578125,   0.7412109375,
+            0.91064453125,  0.62744140625,  0.289794921875, 0.4833984375,
+            0.448486328125, 0.405517578125, 0.488037109375, 0.87158203125,
+            0.693359375,    1.1787109375,   0.9169921875,   1.037109375,
+            0.8125,         1.0830078125,   0.82861328125,  0.81640625,
+            1.2353515625,   0.353271484375, 0.67822265625,  0.98095703125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'conv2d float16 4D input and filter tensors options.filterLayout=\'oihw\'',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.7529296875, 0.751953125, 0.5947265625, 0.21630859375,
+            0.07586669921875, 0.151123046875, 0.12127685546875, 0.53662109375,
+            0.59375, 0.9912109375, 0.363037109375, 0.92919921875,
+            0.227294921875, 0.54150390625, 0.08447265625, 0.6767578125,
+            0.619140625, 0.392822265625
+          ],
+          'descriptor': {shape: [2, 1, 3, 3], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.1453857421875, 0.96728515625, 0.10833740234375, 0.3203125,
+            0.6953125, 0.50732421875, 0.0814208984375, 0.5302734375,
+            0.30712890625, 0.432373046875, 0.98486328125, 0.42822265625
+          ],
+          'descriptor': {shape: [3, 1, 2, 2], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+          {'options': {'filterLayout': 'oihw'}}
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            0.884765625,  0.7412109375,  0.289794921875, 0.405517578125,
+            0.962890625,  0.91064453125, 0.4833984375,   0.488037109375,
+            0.8017578125, 0.62744140625, 0.448486328125, 0.87158203125,
+            0.693359375,  1.037109375,   0.82861328125,  0.353271484375,
+            1.1787109375, 0.8125,        0.81640625,     0.67822265625,
+            0.9169921875, 1.0830078125,  1.2353515625,   0.98095703125
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'conv2d float16 4D input and filter tensors options.filterLayout=\'hwio\'',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.7529296875, 0.751953125, 0.5947265625, 0.21630859375,
+            0.07586669921875, 0.151123046875, 0.12127685546875, 0.53662109375,
+            0.59375, 0.9912109375, 0.363037109375, 0.92919921875,
+            0.227294921875, 0.54150390625, 0.08447265625, 0.6767578125,
+            0.619140625, 0.392822265625
+          ],
+          'descriptor': {shape: [2, 1, 3, 3], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.1453857421875, 0.6953125, 0.30712890625, 0.96728515625,
+            0.50732421875, 0.432373046875, 0.10833740234375, 0.0814208984375,
+            0.98486328125, 0.3203125, 0.5302734375, 0.42822265625
+          ],
+          'descriptor': {shape: [2, 2, 1, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+          {'options': {'filterLayout': 'hwio'}}
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            0.884765625,  0.7412109375,  0.289794921875, 0.405517578125,
+            0.962890625,  0.91064453125, 0.4833984375,   0.488037109375,
+            0.8017578125, 0.62744140625, 0.448486328125, 0.87158203125,
+            0.693359375,  1.037109375,   0.82861328125,  0.353271484375,
+            1.1787109375, 0.8125,        0.81640625,     0.67822265625,
+            0.9169921875, 1.0830078125,  1.2353515625,   0.98095703125
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'conv2d float16 4D input and filter tensors options.filterLayout=\'ohwi\'',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.7529296875, 0.751953125, 0.5947265625, 0.21630859375,
+            0.07586669921875, 0.151123046875, 0.12127685546875, 0.53662109375,
+            0.59375, 0.9912109375, 0.363037109375, 0.92919921875,
+            0.227294921875, 0.54150390625, 0.08447265625, 0.6767578125,
+            0.619140625, 0.392822265625
+          ],
+          'descriptor': {shape: [2, 1, 3, 3], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.1453857421875, 0.96728515625, 0.10833740234375, 0.3203125,
+            0.6953125, 0.50732421875, 0.0814208984375, 0.5302734375,
+            0.30712890625, 0.432373046875, 0.98486328125, 0.42822265625
+          ],
+          'descriptor': {shape: [3, 2, 2, 1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+          {'options': {'filterLayout': 'ohwi'}}
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            0.884765625,  0.7412109375,  0.289794921875, 0.405517578125,
+            0.962890625,  0.91064453125, 0.4833984375,   0.488037109375,
+            0.8017578125, 0.62744140625, 0.448486328125, 0.87158203125,
+            0.693359375,  1.037109375,   0.82861328125,  0.353271484375,
+            1.1787109375, 0.8125,        0.81640625,     0.67822265625,
+            0.9169921875, 1.0830078125,  1.2353515625,   0.98095703125
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'conv2d float16 4D input and filter tensors options.filterLayout=\'ihwo\'',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.7529296875, 0.751953125, 0.5947265625, 0.21630859375,
+            0.07586669921875, 0.151123046875, 0.12127685546875, 0.53662109375,
+            0.59375, 0.9912109375, 0.363037109375, 0.92919921875,
+            0.227294921875, 0.54150390625, 0.08447265625, 0.6767578125,
+            0.619140625, 0.392822265625
+          ],
+          'descriptor': {shape: [2, 1, 3, 3], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.1453857421875, 0.6953125, 0.30712890625, 0.96728515625,
+            0.50732421875, 0.432373046875, 0.10833740234375, 0.0814208984375,
+            0.98486328125, 0.3203125, 0.5302734375, 0.42822265625
+          ],
+          'descriptor': {shape: [1, 2, 2, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+          {'options': {'filterLayout': 'ihwo'}}
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            0.884765625,  0.7412109375,  0.289794921875, 0.405517578125,
+            0.962890625,  0.91064453125, 0.4833984375,   0.488037109375,
+            0.8017578125, 0.62744140625, 0.448486328125, 0.87158203125,
+            0.693359375,  1.037109375,   0.82861328125,  0.353271484375,
+            1.1787109375, 0.8125,        0.81640625,     0.67822265625,
+            0.9169921875, 1.0830078125,  1.2353515625,   0.98095703125
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'conv2d float16 4D input and filter tensors options.inputLayout=\'nhwc\' and options.filterLayout=\'oihw\'',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.7529296875, 0.751953125, 0.5947265625, 0.21630859375,
+            0.07586669921875, 0.151123046875, 0.12127685546875, 0.53662109375,
+            0.59375, 0.9912109375, 0.363037109375, 0.92919921875,
+            0.227294921875, 0.54150390625, 0.08447265625, 0.6767578125,
+            0.619140625, 0.392822265625
+          ],
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.1453857421875, 0.96728515625, 0.10833740234375, 0.3203125,
+            0.6953125, 0.50732421875, 0.0814208984375, 0.5302734375,
+            0.30712890625, 0.432373046875, 0.98486328125, 0.42822265625
+          ],
+          'descriptor': {shape: [3, 1, 2, 2], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+          {'options': {'inputLayout': 'nhwc', 'filterLayout': 'oihw'}}
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            0.884765625,    0.962890625,    0.8017578125,   0.7412109375,
+            0.91064453125,  0.62744140625,  0.289794921875, 0.4833984375,
+            0.448486328125, 0.405517578125, 0.488037109375, 0.87158203125,
+            0.693359375,    1.1787109375,   0.9169921875,   1.037109375,
+            0.8125,         1.0830078125,   0.82861328125,  0.81640625,
+            1.2353515625,   0.353271484375, 0.67822265625,  0.98095703125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'conv2d float16 4D input and filter tensors options.inputLayout=\'nhwc\' and options.filterLayout=\'hwio\'',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.7529296875, 0.751953125, 0.5947265625, 0.21630859375,
+            0.07586669921875, 0.151123046875, 0.12127685546875, 0.53662109375,
+            0.59375, 0.9912109375, 0.363037109375, 0.92919921875,
+            0.227294921875, 0.54150390625, 0.08447265625, 0.6767578125,
+            0.619140625, 0.392822265625
+          ],
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.1453857421875, 0.6953125, 0.30712890625, 0.96728515625,
+            0.50732421875, 0.432373046875, 0.10833740234375, 0.0814208984375,
+            0.98486328125, 0.3203125, 0.5302734375, 0.42822265625
+          ],
+          'descriptor': {shape: [2, 2, 1, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+          {'options': {'inputLayout': 'nhwc', 'filterLayout': 'hwio'}}
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            0.884765625,    0.962890625,    0.8017578125,   0.7412109375,
+            0.91064453125,  0.62744140625,  0.289794921875, 0.4833984375,
+            0.448486328125, 0.405517578125, 0.488037109375, 0.87158203125,
+            0.693359375,    1.1787109375,   0.9169921875,   1.037109375,
+            0.8125,         1.0830078125,   0.82861328125,  0.81640625,
+            1.2353515625,   0.353271484375, 0.67822265625,  0.98095703125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'conv2d float16 4D input and filter tensors options.inputLayout=\'nhwc\' and options.filterLayout=\'ohwi\'',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.7529296875, 0.751953125, 0.5947265625, 0.21630859375,
+            0.07586669921875, 0.151123046875, 0.12127685546875, 0.53662109375,
+            0.59375, 0.9912109375, 0.363037109375, 0.92919921875,
+            0.227294921875, 0.54150390625, 0.08447265625, 0.6767578125,
+            0.619140625, 0.392822265625
+          ],
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.1453857421875, 0.96728515625, 0.10833740234375, 0.3203125,
+            0.6953125, 0.50732421875, 0.0814208984375, 0.5302734375,
+            0.30712890625, 0.432373046875, 0.98486328125, 0.42822265625
+          ],
+          'descriptor': {shape: [3, 2, 2, 1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+          {'options': {'inputLayout': 'nhwc', 'filterLayout': 'ohwi'}}
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            0.884765625,    0.962890625,    0.8017578125,   0.7412109375,
+            0.91064453125,  0.62744140625,  0.289794921875, 0.4833984375,
+            0.448486328125, 0.405517578125, 0.488037109375, 0.87158203125,
+            0.693359375,    1.1787109375,   0.9169921875,   1.037109375,
+            0.8125,         1.0830078125,   0.82861328125,  0.81640625,
+            1.2353515625,   0.353271484375, 0.67822265625,  0.98095703125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'conv2d float16 4D input and filter tensors options.inputLayout=\'nhwc\' and options.filterLayout=\'ihwo\'',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.7529296875, 0.751953125, 0.5947265625, 0.21630859375,
+            0.07586669921875, 0.151123046875, 0.12127685546875, 0.53662109375,
+            0.59375, 0.9912109375, 0.363037109375, 0.92919921875,
+            0.227294921875, 0.54150390625, 0.08447265625, 0.6767578125,
+            0.619140625, 0.392822265625
+          ],
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.1453857421875, 0.6953125, 0.30712890625, 0.96728515625,
+            0.50732421875, 0.432373046875, 0.10833740234375, 0.0814208984375,
+            0.98486328125, 0.3203125, 0.5302734375, 0.42822265625
+          ],
+          'descriptor': {shape: [1, 2, 2, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+          {'options': {'inputLayout': 'nhwc', 'filterLayout': 'ihwo'}}
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            0.884765625,    0.962890625,    0.8017578125,   0.7412109375,
+            0.91064453125,  0.62744140625,  0.289794921875, 0.4833984375,
+            0.448486328125, 0.405517578125, 0.488037109375, 0.87158203125,
+            0.693359375,    1.1787109375,   0.9169921875,   1.037109375,
+            0.8125,         1.0830078125,   0.82861328125,  0.81640625,
+            1.2353515625,   0.353271484375, 0.67822265625,  0.98095703125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d float16 4D input and filter tensors 1D options.bias',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.7529296875, 0.751953125, 0.5947265625, 0.21630859375,
+            0.07586669921875, 0.151123046875, 0.12127685546875, 0.53662109375,
+            0.59375, 0.9912109375, 0.363037109375, 0.92919921875,
+            0.227294921875, 0.54150390625, 0.08447265625, 0.6767578125,
+            0.619140625, 0.392822265625
+          ],
+          'descriptor': {shape: [2, 1, 3, 3], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.1453857421875, 0.96728515625, 0.10833740234375, 0.3203125,
+            0.6953125, 0.50732421875, 0.0814208984375, 0.5302734375,
+            0.30712890625, 0.432373046875, 0.98486328125, 0.42822265625
+          ],
+          'descriptor': {shape: [3, 1, 2, 2], dataType: 'float16'},
+          'constant': true
+        },
+        'conv2dBias': {
+          'data': [0.8134765625, 0.83935546875, 0.494384765625],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'},
+          {'options': {'bias': 'conv2dBias'}}
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            1.6982421875, 1.5546875,    1.103515625,   1.21875,
+            1.8017578125, 1.75,         1.322265625,   1.3271484375,
+            1.2958984375, 1.1220703125, 0.94287109375, 1.3662109375,
+            1.5068359375, 1.8505859375, 1.6416015625,  1.1669921875,
+            2.017578125,  1.65234375,   1.6552734375,  1.517578125,
+            1.4111328125, 1.5771484375, 1.7294921875,  1.4755859375
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'conv2d float16 4D input and filter tensors all options',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            0.0997314453125,    0.53759765625,    0.3056640625,
+            0.72216796875,      0.5068359375,     0.32373046875,
+            0.8720703125,       0.2098388671875,  0.50537109375,
+            0.0268707275390625, 0.5498046875,     0.0643310546875,
+            0.156005859375,     0.11968994140625, 0.0361328125,
+            0.414306640625,     0.24169921875,    0.67724609375,
+            0.208740234375,     0.10980224609375, 0.7451171875,
+            0.744140625,        0.787109375,      0.5888671875,
+            0.11016845703125,   0.904296875,      0.11724853515625,
+            0.85107421875,      0.424560546875,   0.0253753662109375,
+            0.74755859375,      0.464599609375,   0.0304107666015625,
+            0.42431640625,      0.384765625,      0.75830078125,
+            0.990234375,        0.03717041015625, 0.014495849609375,
+            0.826171875,        0.210693359375,   0.65673828125,
+            0.258544921875,     0.480224609375,   0.97021484375,
+            0.296875,           0.75244140625,    0.029632568359375,
+            0.09027099609375,   0.7783203125
+          ],
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.638671875, 0.07763671875, 0.129150390625, 0.456298828125,
+            0.404296875, 0.59423828125, 0.1424560546875, 0.90380859375
+          ],
+          'descriptor': {shape: [2, 2, 1, 2], dataType: 'float16'},
+          'constant': true
+        },
+        'conv2dBias': {
+          'data': [0.54248046875, 0.8408203125],
+          'descriptor': {shape: [2], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}, {
+            'options': {
+              'padding': [1, 0, 0, 1],
+              'strides': [1, 1],
+              'dilations': [1, 1],
+              'groups': 2,
+              'inputLayout': 'nchw',
+              'filterLayout': 'hwio',
+              'bias': 'conv2dBias'
+            }
+          }
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            0.6591796875,  0.80322265625, 0.76904296875, 0.90673828125,
+            0.74755859375, 0.9306640625,  1.3076171875,  0.98779296875,
+            1.27734375,    0.876953125,   1.09375,       1.1748046875,
+            0.82177734375, 0.92236328125, 0.57421875,    1.103515625,
+            0.7978515625,  0.9609375,     0.7236328125,  0.60986328125,
+            1.2451171875,  1.197265625,   1.404296875,   0.94384765625,
+            0.6572265625,  1.484375,      1.6796875,     1.73046875,
+            1.1162109375,  0.85595703125, 1.8291015625,  1.5419921875,
+            1.501953125,   1.4853515625,  1.0712890625,  2.45703125,
+            1.5126953125,  1.072265625,   1.8046875,     1.361328125,
+            2.0703125,     1.55859375,    1.4384765625,  2.380859375,
+            1.4814453125,  2.013671875,   1.4833984375,  1.1796875,
+            2.078125,      1.37890625
+          ],
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'conv2d float16 4D input and filter tensors, both negative input tensor and options.bias',
+    'graph': {
+      'inputs': {
+        'conv2dInput': {
+          'data': [
+            -0.80712890625,  -0.8837890625,     -0.77001953125,
+            -0.564453125,    -0.397216796875,   -0.1083984375,
+            -0.5517578125,   -0.3955078125,     -0.057586669921875,
+            -0.5146484375,   -0.2132568359375,  -0.95068359375,
+            -0.80419921875,  -0.86474609375,    -0.9609375,
+            -0.326416015625, -0.06884765625,    -0.3203125,
+            -0.269287109375, -0.343017578125,   -0.89892578125,
+            -0.90380859375,  -0.63671875,       -0.20068359375,
+            -0.787109375,    -0.3466796875,     -0.060028076171875,
+            -0.14990234375,  -0.6484375,        -0.8935546875,
+            -0.81494140625,  -0.642578125,      -0.032745361328125,
+            -0.6611328125,   -0.58447265625,    -0.09918212890625,
+            -0.166015625,    -0.95068359375,    -0.30517578125,
+            -0.62109375,     -0.5400390625,     -0.420166015625,
+            -0.188232421875, -0.35888671875,    -0.71142578125,
+            -0.375,          -0.7109375,        -0.360595703125,
+            -0.546875,       -0.032257080078125
+          ],
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float16'}
+        },
+        'conv2dFilter': {
+          'data': [
+            0.638671875, 0.07763671875, 0.129150390625, 0.456298828125,
+            0.404296875, 0.59423828125, 0.1424560546875, 0.90380859375
+          ],
+          'descriptor': {shape: [2, 2, 1, 2], dataType: 'float16'},
+          'constant': true
+        },
+        'conv2dBias': {
+          'data': [-0.375, -0.436279296875],
+          'descriptor': {shape: [2], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'conv2d',
+        'arguments': [
+          {'input': 'conv2dInput'}, {'filter': 'conv2dFilter'}, {
+            'options': {
+              'padding': [1, 0, 0, 1],
+              'groups': 2,
+              'filterLayout': 'hwio',
+              'bias': 'conv2dBias'
+            }
+          }
+        ],
+        'outputs': 'conv2dOutput'
+      }],
+      'expectedOutputs': {
+        'conv2dOutput': {
+          'data': [
+            -0.8271484375,  -0.841796875,   -0.7666015625,  -0.65966796875,
+            -0.53564453125, -1.126953125,   -1.318359375,   -1.107421875,
+            -0.88330078125, -0.8369140625,  -0.7373046875,  -1.27734375,
+            -1.0830078125,  -0.96484375,    -1.091796875,   -0.77587890625,
+            -1.1591796875,  -1.16796875,    -1.208984375,   -1.126953125,
+            -1.0849609375,  -0.91650390625, -0.900390625,   -0.78466796875,
+            -0.912109375,   -0.69677734375, -0.607421875,   -1.111328125,
+            -1.62890625,    -0.96728515625, -1.5556640625,  -0.9208984375,
+            -1.3603515625,  -1.8154296875,  -0.85302734375, -1.001953125,
+            -1.458984375,   -1.5810546875,  -1.4970703125,  -0.8505859375,
+            -1.220703125,   -1.302734375,   -1.0859375,     -1.599609375,
+            -0.9072265625,  -1.53515625,    -1.302734375,   -1.3232421875,
+            -1.142578125,   -0.5107421875
+          ],
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/conv_transpose2d.https.any.js b/tests/wpt/tests/webnn/conformance_tests/conv_transpose2d.https.any.js
index 3a2ac69effe..a17df911e44 100644
--- a/tests/wpt/tests/webnn/conformance_tests/conv_transpose2d.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/conv_transpose2d.https.any.js
@@ -1476,6 +1476,1772 @@ const convTranspose2dTests = [
         }
       }
     }
+  },
+  {
+    'name': 'convTranspose2d same output size different padding (padding=1, outputPadding=0))',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            1, 2, 3,
+            4, 5, 6,
+            7, 8, 9
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            1, 1, 1,
+            1, 1, 1,
+            1, 1, 1
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {
+            'strides': [3, 3],
+            'padding': [1, 1, 1, 1],
+            'outputPadding': [0, 0]
+          }}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            1, 1, 2, 2, 2, 3, 3,
+            1, 1, 2, 2, 2, 3, 3,
+            4, 4, 5, 5, 5, 6, 6,
+            4, 4, 5, 5, 5, 6, 6,
+            4, 4, 5, 5, 5, 6, 6,
+            7, 7, 8, 8, 8, 9, 9,
+            7, 7, 8, 8, 8, 9, 9
+          ],
+          'descriptor': {shape: [1, 1, 7, 7], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d same output size different padding (padding=2, outputPadding=2))',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            1, 2, 3,
+            4, 5, 6,
+            7, 8, 9
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            1, 1, 1,
+            1, 1, 1,
+            1, 1, 1
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {
+            'strides': [3, 3],
+            'padding': [2, 2, 2, 2],
+            'outputPadding': [2, 2]
+          }}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            1, 2, 2, 2, 3, 3, 3,
+            4, 5, 5, 5, 6, 6, 6,
+            4, 5, 5, 5, 6, 6, 6,
+            4, 5, 5, 5, 6, 6, 6,
+            7, 8, 8, 8, 9, 9, 9,
+            7, 8, 8, 8, 9, 9, 9,
+            7, 8, 8, 8, 9, 9, 9
+          ],
+          'descriptor': {shape: [1, 1, 7, 7], dataType: 'float32'}
+        }
+      }
+    }
+  },
+
+  // float16 tests
+  {
+    'name':
+        'convTranspose2d float16 4D both input and filter non-constant tensors default options',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.58740234375, 0.60791015625, 0.0172882080078125, 0.261474609375
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.329345703125, 0.5869140625, 0.297119140625, 0.003337860107421875
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'}, {'filter': 'convTranspose2dFilter'}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.1934814453125, 0.544921875, 0.356689453125, 0.18017578125,
+            0.27880859375, 0.155517578125, 0.005138397216796875,
+            0.0777587890625, 0.0008726119995117188
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D both input and filter constant tensors default options',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.58740234375, 0.60791015625, 0.0172882080078125, 0.261474609375
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float16'},
+          'constant': true
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.329345703125, 0.5869140625, 0.297119140625, 0.003337860107421875
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'}, {'filter': 'convTranspose2dFilter'}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.1934814453125, 0.544921875, 0.356689453125, 0.18017578125,
+            0.27880859375, 0.155517578125, 0.005138397216796875,
+            0.0777587890625, 0.0008726119995117188
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D input and filter tensors default options',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.58740234375, 0.60791015625, 0.0172882080078125, 0.261474609375
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.329345703125, 0.5869140625, 0.297119140625, 0.003337860107421875
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'}, {'filter': 'convTranspose2dFilter'}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.1934814453125, 0.544921875, 0.356689453125, 0.18017578125,
+            0.27880859375, 0.155517578125, 0.005138397216796875,
+            0.0777587890625, 0.0008726119995117188
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D input and filter tensors options.padding',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.58740234375, 0.60791015625, 0.0172882080078125, 0.261474609375
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.329345703125, 0.5869140625, 0.297119140625, 0.003337860107421875
+          ],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {'padding': [1, 1, 1, 1]}}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [0.27880859375],
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 input tensors options.padding is the same upper padding',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5],
+          'descriptor': {shape: [1, 3, 3, 1], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'}, {
+            'options': {
+              'outputSizes': [6, 6],
+              'groups': 1,
+              'strides': [2, 2],
+              'dilations': [1, 1],
+              'padding': [0, 1, 0, 1],
+              'filterLayout': 'ohwi',
+              'inputLayout': 'nhwc'
+            }
+          }
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.5, 0.5, 0.5, 0.5, 1, 1, 0.5, 0.5, 1, 1, 0.5, 0.5,
+            0.5, 0.5, 0.5, 0.5, 1, 1, 0.5, 0.5, 1, 1, 0.5, 0.5,
+            1,   1,   1,   1,   2, 2, 1,   1,   2, 2, 1,   1,
+            0.5, 0.5, 0.5, 0.5, 1, 1, 0.5, 0.5, 1, 1, 0.5, 0.5,
+            1,   1,   1,   1,   2, 2, 1,   1,   2, 2, 1,   1,
+            0.5, 0.5, 0.5, 0.5, 1, 1, 0.5, 0.5, 1, 1, 0.5, 0.5
+          ],
+          'descriptor': {shape: [1, 6, 6, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D input and filter tensors options.strides',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.056060791015625, 0.71142578125, 0.65283203125, 0.38623046875,
+            0.386962890625, 0.9462890625, 0.095703125, 0.92333984375,
+            0.63623046875
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.861328125, 0.626953125, 0.63671875, 0.83837890625,
+            0.11883544921875, 0.9921875, 0.32861328125, 0.8740234375,
+            0.720703125, 0.97998046875, 0.06170654296875, 0.322021484375, 0.75,
+            0.39306640625, 0.1380615234375, 0.283935546875, 0.423583984375,
+            0.1448974609375
+          ],
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'}, {'options': {'strides': [3, 2]}}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.04827880859375,
+            0.03515625,
+            0.6484375,
+            0.446044921875,
+            1.015625,
+            0.4091796875,
+            0.415771484375,
+            0.0469970703125,
+            0.00666046142578125,
+            0.65185546875,
+            0.08453369140625,
+            1.2529296875,
+            0.07757568359375,
+            0.64794921875,
+            0.0184173583984375,
+            0.04901123046875,
+            0.274169921875,
+            0.62158203125,
+            0.72705078125,
+            0.57080078125,
+            0.470458984375,
+            0.332763671875,
+            0.2421875,
+            0.5791015625,
+            0.2425537109375,
+            1.0615234375,
+            0.59326171875,
+            0.6025390625,
+            0.32373046875,
+            0.0458984375,
+            0.70751953125,
+            0.045989990234375,
+            1.177734375,
+            0.1124267578125,
+            0.93896484375,
+            0.126953125,
+            0.337646484375,
+            0.405517578125,
+            0.338134765625,
+            0.58984375,
+            0.8271484375,
+            0.68212890625,
+            0.08245849609375,
+            0.05999755859375,
+            0.8564453125,
+            0.5791015625,
+            1.1357421875,
+            0.39892578125,
+            0.405029296875,
+            0.08026123046875,
+            0.01137542724609375,
+            0.869140625,
+            0.1097412109375,
+            1.44921875,
+            0.07562255859375,
+            0.63134765625,
+            0.031463623046875,
+            0.0836181640625,
+            0.372314453125,
+            0.80712890625,
+            0.87451171875,
+            0.55615234375,
+            0.45849609375,
+            0.054931640625,
+            0.003459930419921875,
+            0.71533203125,
+            0.043914794921875,
+            0.86865234375,
+            0.040283203125,
+            0.210205078125,
+            0.04205322265625,
+            0.02203369140625,
+            0.54150390625,
+            0.279541015625,
+            0.587890625,
+            0.256591796875,
+            0.09014892578125,
+            0.0159149169921875,
+            0.02374267578125,
+            0.2100830078125,
+            0.30126953125,
+            0.288330078125,
+            0.276611328125,
+            0.0946044921875,
+            0.37841796875,
+            0.023834228515625,
+            0.50341796875,
+            0.0238800048828125,
+            1.0517578125,
+            0.058380126953125,
+            0.3046875,
+            0.28955078125,
+            0.15185546875,
+            0.343505859375,
+            0.152099609375,
+            0.76318359375,
+            0.3720703125,
+            0.130615234375,
+            0.10968017578125,
+            0.16357421875,
+            0.1658935546875,
+            0.1639404296875,
+            0.32470703125,
+            0.40087890625,
+            0.1370849609375,
+            0.09381103515625,
+            0.0059051513671875,
+            0.935546875,
+            0.056976318359375,
+            0.9208984375,
+            0.03924560546875,
+            0.204833984375,
+            0.07177734375,
+            0.037628173828125,
+            0.70556640625,
+            0.363037109375,
+            0.6044921875,
+            0.25,
+            0.08782958984375,
+            0.0271759033203125,
+            0.04052734375,
+            0.276123046875,
+            0.39111328125,
+            0.314453125,
+            0.26953125,
+            0.0921630859375
+          ],
+          'descriptor': {shape: [1, 2, 9, 7], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D input and filter tensors options.dilations',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.319580078125, 0.97607421875, 0.4130859375, 0.479736328125,
+            0.767578125, 0.908203125, 0.62060546875, 0.658203125, 0.6552734375
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [0.68359375, 0.96435546875, 0.8271484375, 0.5771484375],
+          'descriptor': {shape: [1, 1, 2, 2], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {'dilations': [2, 2]}}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.218505859375, 0.66748046875,  0.59033203125,  0.94140625,
+            0.3984375,      0.327880859375, 0.52490234375,  1.0830078125,
+            0.740234375,    0.8759765625,   0.6884765625,   1.2568359375,
+            1.572265625,    1.1982421875,   0.8701171875,   0.396728515625,
+            0.634765625,    1.0283203125,   0.443115234375, 0.52392578125,
+            0.51318359375,  0.54443359375,  0.900390625,    0.3798828125,
+            0.378173828125
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D input and filter tensors options.outputPadding',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.056060791015625, 0.71142578125, 0.65283203125, 0.38623046875,
+            0.386962890625, 0.9462890625, 0.095703125, 0.92333984375,
+            0.63623046875
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.861328125, 0.626953125, 0.63671875, 0.83837890625,
+            0.11883544921875, 0.9921875, 0.32861328125, 0.8740234375,
+            0.720703125, 0.97998046875, 0.06170654296875, 0.322021484375, 0.75,
+            0.39306640625, 0.1380615234375, 0.283935546875, 0.423583984375,
+            0.1448974609375
+          ],
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {'strides': [3, 2], 'outputPadding': [1, 1]}}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.04827880859375,
+            0.03515625,
+            0.6484375,
+            0.446044921875,
+            1.015625,
+            0.4091796875,
+            0.415771484375,
+            0,
+            0.0469970703125,
+            0.00666046142578125,
+            0.65185546875,
+            0.08453369140625,
+            1.2529296875,
+            0.07757568359375,
+            0.64794921875,
+            0,
+            0.0184173583984375,
+            0.04901123046875,
+            0.274169921875,
+            0.62158203125,
+            0.72705078125,
+            0.57080078125,
+            0.470458984375,
+            0,
+            0.332763671875,
+            0.2421875,
+            0.5791015625,
+            0.2425537109375,
+            1.0615234375,
+            0.59326171875,
+            0.6025390625,
+            0,
+            0.32373046875,
+            0.0458984375,
+            0.70751953125,
+            0.045989990234375,
+            1.177734375,
+            0.1124267578125,
+            0.93896484375,
+            0,
+            0.126953125,
+            0.337646484375,
+            0.405517578125,
+            0.338134765625,
+            0.58984375,
+            0.8271484375,
+            0.68212890625,
+            0,
+            0.08245849609375,
+            0.05999755859375,
+            0.8564453125,
+            0.5791015625,
+            1.1357421875,
+            0.39892578125,
+            0.405029296875,
+            0,
+            0.08026123046875,
+            0.01137542724609375,
+            0.869140625,
+            0.1097412109375,
+            1.44921875,
+            0.07562255859375,
+            0.63134765625,
+            0,
+            0.031463623046875,
+            0.0836181640625,
+            0.372314453125,
+            0.80712890625,
+            0.87451171875,
+            0.55615234375,
+            0.45849609375,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0.054931640625,
+            0.003459930419921875,
+            0.71533203125,
+            0.043914794921875,
+            0.86865234375,
+            0.040283203125,
+            0.210205078125,
+            0,
+            0.04205322265625,
+            0.02203369140625,
+            0.54150390625,
+            0.279541015625,
+            0.587890625,
+            0.256591796875,
+            0.09014892578125,
+            0,
+            0.0159149169921875,
+            0.02374267578125,
+            0.2100830078125,
+            0.30126953125,
+            0.288330078125,
+            0.276611328125,
+            0.0946044921875,
+            0,
+            0.37841796875,
+            0.023834228515625,
+            0.50341796875,
+            0.0238800048828125,
+            1.0517578125,
+            0.058380126953125,
+            0.3046875,
+            0,
+            0.28955078125,
+            0.15185546875,
+            0.343505859375,
+            0.152099609375,
+            0.76318359375,
+            0.3720703125,
+            0.130615234375,
+            0,
+            0.10968017578125,
+            0.16357421875,
+            0.1658935546875,
+            0.1639404296875,
+            0.32470703125,
+            0.40087890625,
+            0.1370849609375,
+            0,
+            0.09381103515625,
+            0.0059051513671875,
+            0.935546875,
+            0.056976318359375,
+            0.9208984375,
+            0.03924560546875,
+            0.204833984375,
+            0,
+            0.07177734375,
+            0.037628173828125,
+            0.70556640625,
+            0.363037109375,
+            0.6044921875,
+            0.25,
+            0.08782958984375,
+            0,
+            0.0271759033203125,
+            0.04052734375,
+            0.276123046875,
+            0.39111328125,
+            0.314453125,
+            0.26953125,
+            0.0921630859375,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0
+          ],
+          'descriptor': {shape: [1, 2, 10, 8], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D input and filter tensors options.outputSizes',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.056060791015625, 0.71142578125, 0.65283203125, 0.38623046875,
+            0.386962890625, 0.9462890625, 0.095703125, 0.92333984375,
+            0.63623046875
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.861328125, 0.626953125, 0.63671875, 0.83837890625,
+            0.11883544921875, 0.9921875, 0.32861328125, 0.8740234375,
+            0.720703125, 0.97998046875, 0.06170654296875, 0.322021484375, 0.75,
+            0.39306640625, 0.1380615234375, 0.283935546875, 0.423583984375,
+            0.1448974609375
+          ],
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {'strides': [3, 2], 'outputSizes': [10, 8]}}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.04827880859375,
+            0.03515625,
+            0.6484375,
+            0.446044921875,
+            1.015625,
+            0.4091796875,
+            0.415771484375,
+            0,
+            0.0469970703125,
+            0.00666046142578125,
+            0.65185546875,
+            0.08453369140625,
+            1.2529296875,
+            0.07757568359375,
+            0.64794921875,
+            0,
+            0.0184173583984375,
+            0.04901123046875,
+            0.274169921875,
+            0.62158203125,
+            0.72705078125,
+            0.57080078125,
+            0.470458984375,
+            0,
+            0.332763671875,
+            0.2421875,
+            0.5791015625,
+            0.2425537109375,
+            1.0615234375,
+            0.59326171875,
+            0.6025390625,
+            0,
+            0.32373046875,
+            0.0458984375,
+            0.70751953125,
+            0.045989990234375,
+            1.177734375,
+            0.1124267578125,
+            0.93896484375,
+            0,
+            0.126953125,
+            0.337646484375,
+            0.405517578125,
+            0.338134765625,
+            0.58984375,
+            0.8271484375,
+            0.68212890625,
+            0,
+            0.08245849609375,
+            0.05999755859375,
+            0.8564453125,
+            0.5791015625,
+            1.1357421875,
+            0.39892578125,
+            0.405029296875,
+            0,
+            0.08026123046875,
+            0.01137542724609375,
+            0.869140625,
+            0.1097412109375,
+            1.44921875,
+            0.07562255859375,
+            0.63134765625,
+            0,
+            0.031463623046875,
+            0.0836181640625,
+            0.372314453125,
+            0.80712890625,
+            0.87451171875,
+            0.55615234375,
+            0.45849609375,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0.054931640625,
+            0.003459930419921875,
+            0.71533203125,
+            0.043914794921875,
+            0.86865234375,
+            0.040283203125,
+            0.210205078125,
+            0,
+            0.04205322265625,
+            0.02203369140625,
+            0.54150390625,
+            0.279541015625,
+            0.587890625,
+            0.256591796875,
+            0.09014892578125,
+            0,
+            0.0159149169921875,
+            0.02374267578125,
+            0.2100830078125,
+            0.30126953125,
+            0.288330078125,
+            0.276611328125,
+            0.0946044921875,
+            0,
+            0.37841796875,
+            0.023834228515625,
+            0.50341796875,
+            0.0238800048828125,
+            1.0517578125,
+            0.058380126953125,
+            0.3046875,
+            0,
+            0.28955078125,
+            0.15185546875,
+            0.343505859375,
+            0.152099609375,
+            0.76318359375,
+            0.3720703125,
+            0.130615234375,
+            0,
+            0.10968017578125,
+            0.16357421875,
+            0.1658935546875,
+            0.1639404296875,
+            0.32470703125,
+            0.40087890625,
+            0.1370849609375,
+            0,
+            0.09381103515625,
+            0.0059051513671875,
+            0.935546875,
+            0.056976318359375,
+            0.9208984375,
+            0.03924560546875,
+            0.204833984375,
+            0,
+            0.07177734375,
+            0.037628173828125,
+            0.70556640625,
+            0.363037109375,
+            0.6044921875,
+            0.25,
+            0.08782958984375,
+            0,
+            0.0271759033203125,
+            0.04052734375,
+            0.276123046875,
+            0.39111328125,
+            0.314453125,
+            0.26953125,
+            0.0921630859375,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0
+          ],
+          'descriptor': {shape: [1, 2, 10, 8], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D input and filter tensors options.inputLayout=nchw',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.056060791015625, 0.71142578125, 0.65283203125, 0.38623046875,
+            0.386962890625, 0.9462890625, 0.095703125, 0.92333984375,
+            0.63623046875
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.861328125, 0.626953125, 0.63671875, 0.83837890625,
+            0.11883544921875, 0.9921875, 0.32861328125, 0.8740234375,
+            0.720703125, 0.97998046875, 0.06170654296875, 0.322021484375, 0.75,
+            0.39306640625, 0.1380615234375, 0.283935546875, 0.423583984375,
+            0.1448974609375
+          ],
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {'inputLayout': 'nchw'}}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.04827880859375,
+            0.64794921875,
+            1.0439453125,
+            0.8623046875,
+            0.415771484375,
+            0.379638671875,
+            1.1787109375,
+            1.9912109375,
+            1.623046875,
+            1.25,
+            0.424560546875,
+            1.5087890625,
+            3.287109375,
+            2.56640625,
+            1.814453125,
+            0.2071533203125,
+            1.25,
+            1.666015625,
+            2.09765625,
+            1.3134765625,
+            0.031463623046875,
+            0.386962890625,
+            1.0849609375,
+            1.2216796875,
+            0.45849609375,
+            0.054931640625,
+            0.70068359375,
+            0.70166015625,
+            0.269287109375,
+            0.210205078125,
+            0.420654296875,
+            0.95849609375,
+            1.8525390625,
+            0.53759765625,
+            0.394775390625,
+            0.3994140625,
+            1.578125,
+            2.12109375,
+            1.1416015625,
+            0.43017578125,
+            0.181396484375,
+            1.00390625,
+            1.341796875,
+            0.83447265625,
+            0.2249755859375,
+            0.0271759033203125,
+            0.302734375,
+            0.58544921875,
+            0.4033203125,
+            0.0921630859375
+          ],
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D input and filter tensors options.inputLayout=nhwc',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.056060791015625, 0.71142578125, 0.65283203125, 0.38623046875,
+            0.386962890625, 0.9462890625, 0.095703125, 0.92333984375,
+            0.63623046875
+          ],
+          'descriptor': {shape: [1, 3, 3, 1], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.861328125, 0.626953125, 0.63671875, 0.83837890625,
+            0.11883544921875, 0.9921875, 0.32861328125, 0.8740234375,
+            0.720703125, 0.97998046875, 0.06170654296875, 0.322021484375, 0.75,
+            0.39306640625, 0.1380615234375, 0.283935546875, 0.423583984375,
+            0.1448974609375
+          ],
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {'inputLayout': 'nhwc'}}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.04827880859375,
+            0.054931640625,
+            0.64794921875,
+            0.70068359375,
+            1.0439453125,
+            0.70166015625,
+            0.8623046875,
+            0.269287109375,
+            0.415771484375,
+            0.210205078125,
+            0.379638671875,
+            0.420654296875,
+            1.1787109375,
+            0.95849609375,
+            1.9912109375,
+            1.8525390625,
+            1.623046875,
+            0.53759765625,
+            1.25,
+            0.394775390625,
+            0.424560546875,
+            0.3994140625,
+            1.5087890625,
+            1.578125,
+            3.287109375,
+            2.12109375,
+            2.56640625,
+            1.1416015625,
+            1.814453125,
+            0.43017578125,
+            0.2071533203125,
+            0.181396484375,
+            1.25,
+            1.00390625,
+            1.666015625,
+            1.341796875,
+            2.09765625,
+            0.83447265625,
+            1.3134765625,
+            0.2249755859375,
+            0.031463623046875,
+            0.0271759033203125,
+            0.386962890625,
+            0.302734375,
+            1.0849609375,
+            0.58544921875,
+            1.2216796875,
+            0.4033203125,
+            0.45849609375,
+            0.0921630859375
+          ],
+          'descriptor': {shape: [1, 5, 5, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D input and filter tensors options.filterLayout=iohw',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.056060791015625, 0.71142578125, 0.65283203125, 0.38623046875,
+            0.386962890625, 0.9462890625, 0.095703125, 0.92333984375,
+            0.63623046875
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.861328125, 0.626953125, 0.63671875, 0.83837890625,
+            0.11883544921875, 0.9921875, 0.32861328125, 0.8740234375,
+            0.720703125, 0.97998046875, 0.06170654296875, 0.322021484375, 0.75,
+            0.39306640625, 0.1380615234375, 0.283935546875, 0.423583984375,
+            0.1448974609375
+          ],
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {'filterLayout': 'iohw'}}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.04827880859375,
+            0.64794921875,
+            1.0439453125,
+            0.8623046875,
+            0.415771484375,
+            0.379638671875,
+            1.1787109375,
+            1.9912109375,
+            1.623046875,
+            1.25,
+            0.424560546875,
+            1.5087890625,
+            3.287109375,
+            2.56640625,
+            1.814453125,
+            0.2071533203125,
+            1.25,
+            1.666015625,
+            2.09765625,
+            1.3134765625,
+            0.031463623046875,
+            0.386962890625,
+            1.0849609375,
+            1.2216796875,
+            0.45849609375,
+            0.054931640625,
+            0.70068359375,
+            0.70166015625,
+            0.269287109375,
+            0.210205078125,
+            0.420654296875,
+            0.95849609375,
+            1.8525390625,
+            0.53759765625,
+            0.394775390625,
+            0.3994140625,
+            1.578125,
+            2.12109375,
+            1.1416015625,
+            0.43017578125,
+            0.181396484375,
+            1.00390625,
+            1.341796875,
+            0.83447265625,
+            0.2249755859375,
+            0.0271759033203125,
+            0.302734375,
+            0.58544921875,
+            0.4033203125,
+            0.0921630859375
+          ],
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D input and filter tensors options.filterLayout=hwoi',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.056060791015625, 0.71142578125, 0.65283203125, 0.38623046875,
+            0.386962890625, 0.9462890625, 0.095703125, 0.92333984375,
+            0.63623046875
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.861328125, 0.97998046875, 0.626953125, 0.06170654296875,
+            0.63671875, 0.322021484375, 0.83837890625, 0.75, 0.11883544921875,
+            0.39306640625, 0.9921875, 0.1380615234375, 0.32861328125,
+            0.283935546875, 0.8740234375, 0.423583984375, 0.720703125,
+            0.1448974609375
+          ],
+          'descriptor': {shape: [3, 3, 2, 1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {'filterLayout': 'hwoi'}}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.04827880859375,
+            0.64794921875,
+            1.0439453125,
+            0.8623046875,
+            0.415771484375,
+            0.379638671875,
+            1.1787109375,
+            1.9912109375,
+            1.623046875,
+            1.25,
+            0.424560546875,
+            1.5087890625,
+            3.287109375,
+            2.56640625,
+            1.814453125,
+            0.2071533203125,
+            1.25,
+            1.666015625,
+            2.09765625,
+            1.3134765625,
+            0.031463623046875,
+            0.386962890625,
+            1.0849609375,
+            1.2216796875,
+            0.45849609375,
+            0.054931640625,
+            0.70068359375,
+            0.70166015625,
+            0.269287109375,
+            0.210205078125,
+            0.420654296875,
+            0.95849609375,
+            1.8525390625,
+            0.53759765625,
+            0.394775390625,
+            0.3994140625,
+            1.578125,
+            2.12109375,
+            1.1416015625,
+            0.43017578125,
+            0.181396484375,
+            1.00390625,
+            1.341796875,
+            0.83447265625,
+            0.2249755859375,
+            0.0271759033203125,
+            0.302734375,
+            0.58544921875,
+            0.4033203125,
+            0.0921630859375
+          ],
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D input and filter tensors options.filterLayout=ohwi',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.056060791015625, 0.71142578125, 0.65283203125, 0.38623046875,
+            0.386962890625, 0.9462890625, 0.095703125, 0.92333984375,
+            0.63623046875
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.861328125, 0.626953125, 0.63671875, 0.83837890625,
+            0.11883544921875, 0.9921875, 0.32861328125, 0.8740234375,
+            0.720703125, 0.97998046875, 0.06170654296875, 0.322021484375, 0.75,
+            0.39306640625, 0.1380615234375, 0.283935546875, 0.423583984375,
+            0.1448974609375
+          ],
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {'filterLayout': 'ohwi'}}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.04827880859375,
+            0.64794921875,
+            1.0439453125,
+            0.8623046875,
+            0.415771484375,
+            0.379638671875,
+            1.1787109375,
+            1.9912109375,
+            1.623046875,
+            1.25,
+            0.424560546875,
+            1.5087890625,
+            3.287109375,
+            2.56640625,
+            1.814453125,
+            0.2071533203125,
+            1.25,
+            1.666015625,
+            2.09765625,
+            1.3134765625,
+            0.031463623046875,
+            0.386962890625,
+            1.0849609375,
+            1.2216796875,
+            0.45849609375,
+            0.054931640625,
+            0.70068359375,
+            0.70166015625,
+            0.269287109375,
+            0.210205078125,
+            0.420654296875,
+            0.95849609375,
+            1.8525390625,
+            0.53759765625,
+            0.394775390625,
+            0.3994140625,
+            1.578125,
+            2.12109375,
+            1.1416015625,
+            0.43017578125,
+            0.181396484375,
+            1.00390625,
+            1.341796875,
+            0.83447265625,
+            0.2249755859375,
+            0.0271759033203125,
+            0.302734375,
+            0.58544921875,
+            0.4033203125,
+            0.0921630859375
+          ],
+          'descriptor': {shape: [1, 2, 5, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=iohw',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.056060791015625, 0.71142578125, 0.65283203125, 0.38623046875,
+            0.386962890625, 0.9462890625, 0.095703125, 0.92333984375,
+            0.63623046875
+          ],
+          'descriptor': {shape: [1, 3, 3, 1], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.861328125, 0.626953125, 0.63671875, 0.83837890625,
+            0.11883544921875, 0.9921875, 0.32861328125, 0.8740234375,
+            0.720703125, 0.97998046875, 0.06170654296875, 0.322021484375, 0.75,
+            0.39306640625, 0.1380615234375, 0.283935546875, 0.423583984375,
+            0.1448974609375
+          ],
+          'descriptor': {shape: [1, 2, 3, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {'inputLayout': 'nhwc', 'filterLayout': 'iohw'}}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.04827880859375,
+            0.054931640625,
+            0.64794921875,
+            0.70068359375,
+            1.0439453125,
+            0.70166015625,
+            0.8623046875,
+            0.269287109375,
+            0.415771484375,
+            0.210205078125,
+            0.379638671875,
+            0.420654296875,
+            1.1787109375,
+            0.95849609375,
+            1.9912109375,
+            1.8525390625,
+            1.623046875,
+            0.53759765625,
+            1.25,
+            0.394775390625,
+            0.424560546875,
+            0.3994140625,
+            1.5087890625,
+            1.578125,
+            3.287109375,
+            2.12109375,
+            2.56640625,
+            1.1416015625,
+            1.814453125,
+            0.43017578125,
+            0.2071533203125,
+            0.181396484375,
+            1.25,
+            1.00390625,
+            1.666015625,
+            1.341796875,
+            2.09765625,
+            0.83447265625,
+            1.3134765625,
+            0.2249755859375,
+            0.031463623046875,
+            0.0271759033203125,
+            0.386962890625,
+            0.302734375,
+            1.0849609375,
+            0.58544921875,
+            1.2216796875,
+            0.4033203125,
+            0.45849609375,
+            0.0921630859375
+          ],
+          'descriptor': {shape: [1, 5, 5, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=hwoi',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.056060791015625, 0.71142578125, 0.65283203125, 0.38623046875,
+            0.386962890625, 0.9462890625, 0.095703125, 0.92333984375,
+            0.63623046875
+          ],
+          'descriptor': {shape: [1, 3, 3, 1], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.861328125, 0.97998046875, 0.626953125, 0.06170654296875,
+            0.63671875, 0.322021484375, 0.83837890625, 0.75, 0.11883544921875,
+            0.39306640625, 0.9921875, 0.1380615234375, 0.32861328125,
+            0.283935546875, 0.8740234375, 0.423583984375, 0.720703125,
+            0.1448974609375
+          ],
+          'descriptor': {shape: [3, 3, 2, 1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {'inputLayout': 'nhwc', 'filterLayout': 'hwoi'}}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.04827880859375,
+            0.054931640625,
+            0.64794921875,
+            0.70068359375,
+            1.0439453125,
+            0.70166015625,
+            0.8623046875,
+            0.269287109375,
+            0.415771484375,
+            0.210205078125,
+            0.379638671875,
+            0.420654296875,
+            1.1787109375,
+            0.95849609375,
+            1.9912109375,
+            1.8525390625,
+            1.623046875,
+            0.53759765625,
+            1.25,
+            0.394775390625,
+            0.424560546875,
+            0.3994140625,
+            1.5087890625,
+            1.578125,
+            3.287109375,
+            2.12109375,
+            2.56640625,
+            1.1416015625,
+            1.814453125,
+            0.43017578125,
+            0.2071533203125,
+            0.181396484375,
+            1.25,
+            1.00390625,
+            1.666015625,
+            1.341796875,
+            2.09765625,
+            0.83447265625,
+            1.3134765625,
+            0.2249755859375,
+            0.031463623046875,
+            0.0271759033203125,
+            0.386962890625,
+            0.302734375,
+            1.0849609375,
+            0.58544921875,
+            1.2216796875,
+            0.4033203125,
+            0.45849609375,
+            0.0921630859375
+          ],
+          'descriptor': {shape: [1, 5, 5, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D input and filter tensors options.inputLayout=nhwc options.filterLayout=ohwi',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.056060791015625, 0.71142578125, 0.65283203125, 0.38623046875,
+            0.386962890625, 0.9462890625, 0.095703125, 0.92333984375,
+            0.63623046875
+          ],
+          'descriptor': {shape: [1, 3, 3, 1], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.861328125, 0.626953125, 0.63671875, 0.83837890625,
+            0.11883544921875, 0.9921875, 0.32861328125, 0.8740234375,
+            0.720703125, 0.97998046875, 0.06170654296875, 0.322021484375, 0.75,
+            0.39306640625, 0.1380615234375, 0.283935546875, 0.423583984375,
+            0.1448974609375
+          ],
+          'descriptor': {shape: [2, 3, 3, 1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {'inputLayout': 'nhwc', 'filterLayout': 'ohwi'}}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.04827880859375,
+            0.054931640625,
+            0.64794921875,
+            0.70068359375,
+            1.0439453125,
+            0.70166015625,
+            0.8623046875,
+            0.269287109375,
+            0.415771484375,
+            0.210205078125,
+            0.379638671875,
+            0.420654296875,
+            1.1787109375,
+            0.95849609375,
+            1.9912109375,
+            1.8525390625,
+            1.623046875,
+            0.53759765625,
+            1.25,
+            0.394775390625,
+            0.424560546875,
+            0.3994140625,
+            1.5087890625,
+            1.578125,
+            3.287109375,
+            2.12109375,
+            2.56640625,
+            1.1416015625,
+            1.814453125,
+            0.43017578125,
+            0.2071533203125,
+            0.181396484375,
+            1.25,
+            1.00390625,
+            1.666015625,
+            1.341796875,
+            2.09765625,
+            0.83447265625,
+            1.3134765625,
+            0.2249755859375,
+            0.031463623046875,
+            0.0271759033203125,
+            0.386962890625,
+            0.302734375,
+            1.0849609375,
+            0.58544921875,
+            1.2216796875,
+            0.4033203125,
+            0.45849609375,
+            0.0921630859375
+          ],
+          'descriptor': {shape: [1, 5, 5, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'convTranspose2d float16 4D input and filter tensors options.bias',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            0.1109619140625, 0.8681640625, 0.734375, 0.4306640625,
+            0.59814453125, 0.12322998046875, 0.1611328125, 0.08837890625,
+            0.291015625
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.6162109375, 0.26220703125, 0.794921875, 0.873046875, 0.8310546875,
+            0.85498046875, 0.55517578125, 0.84033203125, 0.85302734375
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'},
+          'constant': true
+        },
+        'convTranspose2dBias': {
+          'data': [0.45166015625],
+          'descriptor': {shape: [1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {'bias': 'convTranspose2dBias'}}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            0.52001953125, 1.015625,      1.2197265625,  1.333984375,
+            1.03515625,    0.81396484375, 1.783203125,   2.484375,
+            2.3125,        1.177734375,   0.98876953125, 2.00390625,
+            2.986328125,   2.5703125,     1.4150390625,  0.83154296875,
+            1.3564453125,  1.85546875,    1.3828125,     0.8056640625,
+            0.541015625,   0.63623046875, 0.82470703125, 0.771484375,
+            0.69970703125
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'convTranspose2d float16 4D input and filter tensors, both negative input tensor and options.bias',
+    'graph': {
+      'inputs': {
+        'convTranspose2dInput': {
+          'data': [
+            -0.10888671875, -0.298095703125, -0.390869140625, -0.5625,
+            -0.732421875, -0.84228515625, -0.305908203125, -0.9765625,
+            -0.01416015625
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'}
+        },
+        'convTranspose2dFilter': {
+          'data': [
+            0.6162109375, 0.26220703125, 0.794921875, 0.873046875, 0.8310546875,
+            0.85498046875, 0.55517578125, 0.84033203125, 0.85302734375
+          ],
+          'descriptor': {shape: [1, 1, 3, 3], dataType: 'float16'},
+          'constant': true
+        },
+        'convTranspose2dBias': {
+          'data': [-0.845703125],
+          'descriptor': {shape: [1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'convTranspose2d',
+        'arguments': [
+          {'input': 'convTranspose2dInput'},
+          {'filter': 'convTranspose2dFilter'},
+          {'options': {'bias': 'convTranspose2dBias'}}
+        ],
+        'outputs': 'convTranspose2dOutput'
+      }],
+      'expectedOutputs': {
+        'convTranspose2dOutput': {
+          'data': [
+            -0.91259765625, -1.0576171875, -1.2509765625, -1.185546875,
+            -1.15625,       -1.287109375,  -1.794921875,  -2.685546875,
+            -2.228515625,   -1.849609375,  -1.5859375,    -2.890625,
+            -3.73828125,    -3.53515625,   -1.91015625,   -1.4248046875,
+            -2.83203125,    -3.494140625,  -3.025390625,  -1.576171875,
+            -1.015625,      -1.64453125,   -1.935546875,  -1.6904296875,
+            -0.85791015625
+          ],
+          'descriptor': {shape: [1, 1, 5, 5], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/dequantizeLinear.https.any.js b/tests/wpt/tests/webnn/conformance_tests/dequantizeLinear.https.any.js
index 8642a964752..7f1ed15cc4a 100644
--- a/tests/wpt/tests/webnn/conformance_tests/dequantizeLinear.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/dequantizeLinear.https.any.js
@@ -619,6 +619,156 @@ const dequantizeLinearTests = [
       }
     }
   },
+  {
+    'name': 'dequantizeLinear int32 1D tensor with float32 scalar scale',
+    'graph': {
+      'inputs': {
+        'dequantizeLinearInput': {
+          'data': [12345, 23946213],
+          'descriptor': {shape: [2], dataType: 'int32'},
+          'constant': false
+        },
+        'dequantizeLinearScale': {
+          'data': [1.1202747821807861, 0.2800687253475189],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': true
+        },
+        'dequantizeLinearZeroPoint': {
+          'data': [32345, -2445234],
+          'descriptor': {shape: [2], dataType: 'int32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'dequantizeLinear',
+        'arguments': [
+          {'input': 'dequantizeLinearInput'},
+          {'scale': 'dequantizeLinearScale'},
+          {'zeroPoint': 'dequantizeLinearZeroPoint'}
+        ],
+        'outputs': 'dequantizeLinearOutput'
+      }],
+      'expectedOutputs': {
+        'dequantizeLinearOutput': {
+          'data': [-22405.495643615723, 7391418.921366602],
+          'descriptor': {shape: [2], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'dequantizeLinear as an intermediate node',
+    'graph': {
+      'inputs': {
+        'dequantizeLinearInput': {
+          'data': [34, 23],
+          'descriptor': {shape: [2, 1], dataType: 'int32'},
+          'constant': false
+        },
+        'dequantizeLinearScale': {
+          'data': [1.1202747821807861, 0.2800687253475189],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': true
+        },
+        'dequantizeLinearZeroPoint': {
+          'data': [35, -24],
+          'descriptor': {shape: [2], dataType: 'int32'},
+          'constant': true
+        }
+      },
+      'operators': [
+        {
+          'name': 'transpose',
+          'arguments': [
+            {'input': 'dequantizeLinearInput'}, {
+              'options': {
+                'permutation': [1, 0],
+              }
+            }
+          ],
+          'outputs': 'transposeOutput'
+        },
+        {
+          'name': 'reshape',
+          'arguments': [{'input': 'transposeOutput'}, {'newShape': [1, 1, 2]}],
+          'outputs': 'reshapeOutput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'reshapeOutput'}, {'scale': 'dequantizeLinearScale'},
+            {'zeroPoint': 'dequantizeLinearZeroPoint'}
+          ],
+          'outputs': 'dequantizeLinearOutput'
+        }
+      ],
+      'expectedOutputs': {
+        'dequantizeLinearOutput': {
+          'data': [-1.1202747821807861, 13.163229942321777],
+          'descriptor': {shape: [1, 1, 2], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  ,
+  {
+    'name':
+        'quantizeLinear then dequantizeLinear with different scale and zero_point',
+    'graph': {
+      'inputs': {
+        'quantizeLinearInput': {
+          'data': [-1.1202747821807861, 13.163229942321777],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': false
+        },
+        'quantizeLinearScale': {
+          'data': [0.1202747821807861, 1.2800687253475189],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': true
+        },
+        'quantizeLinearZeroPoint': {
+          'data': [12, -21],
+          'descriptor': {shape: [2], dataType: 'int8'},
+          'constant': true
+        },
+        'dequantizeLinearScale': {
+          'data': [1.1202747821807861, 0.2800687253475189],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': true
+        },
+        'dequantizeLinearZeroPoint': {
+          'data': [35, -24],
+          'descriptor': {shape: [2], dataType: 'int8'},
+          'constant': true
+        }
+      },
+      'operators': [
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'quantizeLinearInput'}, {'scale': 'quantizeLinearScale'},
+            {'zeroPoint': 'quantizeLinearZeroPoint'}
+          ],
+          'outputs': 'quantizeLinearOutput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizeLinearOutput'},
+            {'scale': 'dequantizeLinearScale'},
+            {'zeroPoint': 'dequantizeLinearZeroPoint'}
+          ],
+          'outputs': 'dequantizeLinearOutput'
+        }
+      ],
+      'expectedOutputs': {
+        'dequantizeLinearOutput': {
+          'data': [-35.848793029785156, 3.6408934593200684],
+          'descriptor': {shape: [2], dataType: 'float32'}
+        }
+      }
+    }
+  },
 ];
 
 if (navigator.ml) {
diff --git a/tests/wpt/tests/webnn/conformance_tests/div.https.any.js b/tests/wpt/tests/webnn/conformance_tests/div.https.any.js
index 1fb80fe17ed..1914c4829c4 100644
--- a/tests/wpt/tests/webnn/conformance_tests/div.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/div.https.any.js
@@ -522,6 +522,444 @@ const divTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'div float16 1D constant tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            60.4375,     -86.9375,     -19.5,     -15.1484375, 13.453125,
+            45.4375,     61.09375,     70.75,     -31.28125,   56.09375,
+            39,          -3.275390625, 32.28125,  -3.67578125, 88.4375,
+            14.3671875,  13.9453125,   16.859375, 4.81640625,  44.15625,
+            -13.0859375, 44.5625,      -34.90625, -74.125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        },
+        'inputB': {
+          'data': [
+            -95,      62.8125,  -85.3125, -68.1875,     79.4375,     -68.6875,
+            -94.4375, -10,      18.3125,  -3.623046875, -5.95703125, 89.5,
+            94.9375,  -79,      -79.875,  75,           25.859375,   91.5625,
+            81.625,   48.21875, 63.375,   10.625,       46.125,      77.25
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'div',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -0.63623046875,   -1.3837890625,     0.228515625,
+            0.22216796875,    0.1693115234375,   -0.66162109375,
+            -0.64697265625,   -7.07421875,       -1.7080078125,
+            -15.484375,       -6.546875,         -0.036590576171875,
+            0.340087890625,   0.046539306640625, -1.107421875,
+            0.1915283203125,  0.5390625,         0.18408203125,
+            0.05902099609375, 0.91552734375,     -0.20654296875,
+            4.1953125,        -0.7568359375,     -0.95947265625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'div float16 1D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            60.4375,     -86.9375,     -19.5,     -15.1484375, 13.453125,
+            45.4375,     61.09375,     70.75,     -31.28125,   56.09375,
+            39,          -3.275390625, 32.28125,  -3.67578125, 88.4375,
+            14.3671875,  13.9453125,   16.859375, 4.81640625,  44.15625,
+            -13.0859375, 44.5625,      -34.90625, -74.125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -95,      62.8125,  -85.3125, -68.1875,     79.4375,     -68.6875,
+            -94.4375, -10,      18.3125,  -3.623046875, -5.95703125, 89.5,
+            94.9375,  -79,      -79.875,  75,           25.859375,   91.5625,
+            81.625,   48.21875, 63.375,   10.625,       46.125,      77.25
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'div',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -0.63623046875,   -1.3837890625,     0.228515625,
+            0.22216796875,    0.1693115234375,   -0.66162109375,
+            -0.64697265625,   -7.07421875,       -1.7080078125,
+            -15.484375,       -6.546875,         -0.036590576171875,
+            0.340087890625,   0.046539306640625, -1.107421875,
+            0.1915283203125,  0.5390625,         0.18408203125,
+            0.05902099609375, 0.91552734375,     -0.20654296875,
+            4.1953125,        -0.7568359375,     -0.95947265625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'div float16 2D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            60.4375,     -86.9375,     -19.5,     -15.1484375, 13.453125,
+            45.4375,     61.09375,     70.75,     -31.28125,   56.09375,
+            39,          -3.275390625, 32.28125,  -3.67578125, 88.4375,
+            14.3671875,  13.9453125,   16.859375, 4.81640625,  44.15625,
+            -13.0859375, 44.5625,      -34.90625, -74.125
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -95,      62.8125,  -85.3125, -68.1875,     79.4375,     -68.6875,
+            -94.4375, -10,      18.3125,  -3.623046875, -5.95703125, 89.5,
+            94.9375,  -79,      -79.875,  75,           25.859375,   91.5625,
+            81.625,   48.21875, 63.375,   10.625,       46.125,      77.25
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'div',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -0.63623046875,   -1.3837890625,     0.228515625,
+            0.22216796875,    0.1693115234375,   -0.66162109375,
+            -0.64697265625,   -7.07421875,       -1.7080078125,
+            -15.484375,       -6.546875,         -0.036590576171875,
+            0.340087890625,   0.046539306640625, -1.107421875,
+            0.1915283203125,  0.5390625,         0.18408203125,
+            0.05902099609375, 0.91552734375,     -0.20654296875,
+            4.1953125,        -0.7568359375,     -0.95947265625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'div float16 3D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            60.4375,     -86.9375,     -19.5,     -15.1484375, 13.453125,
+            45.4375,     61.09375,     70.75,     -31.28125,   56.09375,
+            39,          -3.275390625, 32.28125,  -3.67578125, 88.4375,
+            14.3671875,  13.9453125,   16.859375, 4.81640625,  44.15625,
+            -13.0859375, 44.5625,      -34.90625, -74.125
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -95,      62.8125,  -85.3125, -68.1875,     79.4375,     -68.6875,
+            -94.4375, -10,      18.3125,  -3.623046875, -5.95703125, 89.5,
+            94.9375,  -79,      -79.875,  75,           25.859375,   91.5625,
+            81.625,   48.21875, 63.375,   10.625,       46.125,      77.25
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'div',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -0.63623046875,   -1.3837890625,     0.228515625,
+            0.22216796875,    0.1693115234375,   -0.66162109375,
+            -0.64697265625,   -7.07421875,       -1.7080078125,
+            -15.484375,       -6.546875,         -0.036590576171875,
+            0.340087890625,   0.046539306640625, -1.107421875,
+            0.1915283203125,  0.5390625,         0.18408203125,
+            0.05902099609375, 0.91552734375,     -0.20654296875,
+            4.1953125,        -0.7568359375,     -0.95947265625
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'div float16 4D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            60.4375,     -86.9375,     -19.5,     -15.1484375, 13.453125,
+            45.4375,     61.09375,     70.75,     -31.28125,   56.09375,
+            39,          -3.275390625, 32.28125,  -3.67578125, 88.4375,
+            14.3671875,  13.9453125,   16.859375, 4.81640625,  44.15625,
+            -13.0859375, 44.5625,      -34.90625, -74.125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -95,      62.8125,  -85.3125, -68.1875,     79.4375,     -68.6875,
+            -94.4375, -10,      18.3125,  -3.623046875, -5.95703125, 89.5,
+            94.9375,  -79,      -79.875,  75,           25.859375,   91.5625,
+            81.625,   48.21875, 63.375,   10.625,       46.125,      77.25
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'div',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -0.63623046875,   -1.3837890625,     0.228515625,
+            0.22216796875,    0.1693115234375,   -0.66162109375,
+            -0.64697265625,   -7.07421875,       -1.7080078125,
+            -15.484375,       -6.546875,         -0.036590576171875,
+            0.340087890625,   0.046539306640625, -1.107421875,
+            0.1915283203125,  0.5390625,         0.18408203125,
+            0.05902099609375, 0.91552734375,     -0.20654296875,
+            4.1953125,        -0.7568359375,     -0.95947265625
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'div float16 5D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            60.4375,     -86.9375,     -19.5,     -15.1484375, 13.453125,
+            45.4375,     61.09375,     70.75,     -31.28125,   56.09375,
+            39,          -3.275390625, 32.28125,  -3.67578125, 88.4375,
+            14.3671875,  13.9453125,   16.859375, 4.81640625,  44.15625,
+            -13.0859375, 44.5625,      -34.90625, -74.125
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -95,      62.8125,  -85.3125, -68.1875,     79.4375,     -68.6875,
+            -94.4375, -10,      18.3125,  -3.623046875, -5.95703125, 89.5,
+            94.9375,  -79,      -79.875,  75,           25.859375,   91.5625,
+            81.625,   48.21875, 63.375,   10.625,       46.125,      77.25
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'div',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -0.63623046875,   -1.3837890625,     0.228515625,
+            0.22216796875,    0.1693115234375,   -0.66162109375,
+            -0.64697265625,   -7.07421875,       -1.7080078125,
+            -15.484375,       -6.546875,         -0.036590576171875,
+            0.340087890625,   0.046539306640625, -1.107421875,
+            0.1915283203125,  0.5390625,         0.18408203125,
+            0.05902099609375, 0.91552734375,     -0.20654296875,
+            4.1953125,        -0.7568359375,     -0.95947265625
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'div float16 broadcast 1D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [-41.8125],
+          'descriptor': {shape: [1], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            60.4375,     -86.9375,     -19.5,     -15.1484375, 13.453125,
+            45.4375,     61.09375,     70.75,     -31.28125,   56.09375,
+            39,          -3.275390625, 32.28125,  -3.67578125, 88.4375,
+            14.3671875,  13.9453125,   16.859375, 4.81640625,  44.15625,
+            -13.0859375, 44.5625,      -34.90625, -74.125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'div',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -0.69189453125, 0.48095703125,  2.14453125,      2.759765625,
+            -3.107421875,   -0.92041015625, -0.6845703125,   -0.5908203125,
+            1.3369140625,   -0.74560546875, -1.072265625,    12.765625,
+            -1.294921875,   11.375,         -0.472900390625, -2.91015625,
+            -2.998046875,   -2.48046875,    -8.6796875,      -0.94677734375,
+            3.1953125,      -0.9384765625,  1.1982421875,    0.56396484375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'div float16 broadcast 2D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            60.4375,     -86.9375,     -19.5,     -15.1484375, 13.453125,
+            45.4375,     61.09375,     70.75,     -31.28125,   56.09375,
+            39,          -3.275390625, 32.28125,  -3.67578125, 88.4375,
+            14.3671875,  13.9453125,   16.859375, 4.81640625,  44.15625,
+            -13.0859375, 44.5625,      -34.90625, -74.125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [97.3125, 36.3125, 26.03125, 99.5, 10.3984375, -30.78125],
+          'descriptor': {shape: [2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'div',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.62109375,       -2.39453125,      -0.7490234375,
+            -0.1522216796875, 1.2939453125,     -1.4765625,
+            0.6279296875,     1.9482421875,     -1.2021484375,
+            0.56396484375,    3.75,             0.10638427734375,
+            0.331787109375,   -0.1011962890625, 3.396484375,
+            0.1444091796875,  1.3408203125,     -0.5478515625,
+            0.04949951171875, 1.2158203125,     -0.5029296875,
+            0.44775390625,    -3.357421875,     2.408203125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'div float16 broadcast 3D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            60.4375,     -86.9375,     -19.5,     -15.1484375, 13.453125,
+            45.4375,     61.09375,     70.75,     -31.28125,   56.09375,
+            39,          -3.275390625, 32.28125,  -3.67578125, 88.4375,
+            14.3671875,  13.9453125,   16.859375, 4.81640625,  44.15625,
+            -13.0859375, 44.5625,      -34.90625, -74.125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [75.0625, -46.21875, 15.765625, 8.921875],
+          'descriptor': {shape: [2, 2, 1], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'div',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.80517578125, -1.158203125,       -0.259765625,   0.32763671875,
+            -0.291015625,  -0.98291015625,     3.875,          4.48828125,
+            -1.984375,     6.2890625,          4.37109375,     -0.3671875,
+            0.43017578125, -0.048980712890625, 1.177734375,    -0.310791015625,
+            -0.3017578125, -0.36474609375,     0.305419921875, 2.80078125,
+            -0.830078125,  4.99609375,         -3.912109375,   -8.3046875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'div float16 broadcast 4D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [-41.8125],
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            60.4375,     -86.9375,     -19.5,     -15.1484375, 13.453125,
+            45.4375,     61.09375,     70.75,     -31.28125,   56.09375,
+            39,          -3.275390625, 32.28125,  -3.67578125, 88.4375,
+            14.3671875,  13.9453125,   16.859375, 4.81640625,  44.15625,
+            -13.0859375, 44.5625,      -34.90625, -74.125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'div',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -0.69189453125, 0.48095703125,  2.14453125,      2.759765625,
+            -3.107421875,   -0.92041015625, -0.6845703125,   -0.5908203125,
+            1.3369140625,   -0.74560546875, -1.072265625,    12.765625,
+            -1.294921875,   11.375,         -0.472900390625, -2.91015625,
+            -2.998046875,   -2.48046875,    -8.6796875,      -0.94677734375,
+            3.1953125,      -0.9384765625,  1.1982421875,    0.56396484375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/elu.https.any.js b/tests/wpt/tests/webnn/conformance_tests/elu.https.any.js
index 6b789e6308c..09cb0a99115 100644
--- a/tests/wpt/tests/webnn/conformance_tests/elu.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/elu.https.any.js
@@ -386,6 +386,345 @@ const eluTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'elu float16 positive 0D scalar default options',
+    'graph': {
+      'inputs': {
+        'eluInput': {
+          'data': [4.72265625],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'elu',
+        'arguments': [{'input': 'eluInput'}],
+        'outputs': 'eluOutput'
+      }],
+      'expectedOutputs': {
+        'eluOutput': {
+          'data': [4.72265625],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'elu float16 negative 0D scalar default options',
+    'graph': {
+      'inputs': {
+        'eluInput': {
+          'data': [-3.8671875],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'elu',
+        'arguments': [{'input': 'eluInput'}],
+        'outputs': 'eluOutput'
+      }],
+      'expectedOutputs': {
+        'eluOutput': {
+          'data': [-0.97900390625],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'elu float16 1D constant tensor default options',
+    'graph': {
+      'inputs': {
+        'eluInput': {
+          'data': [
+            4.72265625,        0.376953125,  1.4189453125, -3.8671875,
+            1.359375,          -3.86328125,  7.83984375,   -6.69140625,
+            0.54541015625,     5.77734375,   7.26171875,   -7.421875,
+            5.6640625,         -6.71484375,  -3.333984375, -1.2099609375,
+            7.25390625,        8.90625,      -4.01953125,  7.11328125,
+            -0.11212158203125, -3.689453125, 6.13671875,   -9.8984375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'elu',
+        'arguments': [{'input': 'eluInput'}],
+        'outputs': 'eluOutput'
+      }],
+      'expectedOutputs': {
+        'eluOutput': {
+          'data': [
+            4.72265625,       0.376953125,    1.4189453125,   -0.97900390625,
+            1.359375,         -0.97900390625, 7.83984375,     -0.99853515625,
+            0.54541015625,    5.77734375,     7.26171875,     -0.99951171875,
+            5.6640625,        -0.9990234375,  -0.96435546875, -0.70166015625,
+            7.25390625,       8.90625,        -0.98193359375, 7.11328125,
+            -0.1060791015625, -0.97509765625, 6.13671875,     -1
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'elu float16 1D tensor default options',
+    'graph': {
+      'inputs': {
+        'eluInput': {
+          'data': [
+            4.72265625,        0.376953125,  1.4189453125, -3.8671875,
+            1.359375,          -3.86328125,  7.83984375,   -6.69140625,
+            0.54541015625,     5.77734375,   7.26171875,   -7.421875,
+            5.6640625,         -6.71484375,  -3.333984375, -1.2099609375,
+            7.25390625,        8.90625,      -4.01953125,  7.11328125,
+            -0.11212158203125, -3.689453125, 6.13671875,   -9.8984375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'elu',
+        'arguments': [{'input': 'eluInput'}],
+        'outputs': 'eluOutput'
+      }],
+      'expectedOutputs': {
+        'eluOutput': {
+          'data': [
+            4.72265625,       0.376953125,    1.4189453125,   -0.97900390625,
+            1.359375,         -0.97900390625, 7.83984375,     -0.99853515625,
+            0.54541015625,    5.77734375,     7.26171875,     -0.99951171875,
+            5.6640625,        -0.9990234375,  -0.96435546875, -0.70166015625,
+            7.25390625,       8.90625,        -0.98193359375, 7.11328125,
+            -0.1060791015625, -0.97509765625, 6.13671875,     -1
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'elu float16 2D tensor default options',
+    'graph': {
+      'inputs': {
+        'eluInput': {
+          'data': [
+            4.72265625,        0.376953125,  1.4189453125, -3.8671875,
+            1.359375,          -3.86328125,  7.83984375,   -6.69140625,
+            0.54541015625,     5.77734375,   7.26171875,   -7.421875,
+            5.6640625,         -6.71484375,  -3.333984375, -1.2099609375,
+            7.25390625,        8.90625,      -4.01953125,  7.11328125,
+            -0.11212158203125, -3.689453125, 6.13671875,   -9.8984375
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'elu',
+        'arguments': [{'input': 'eluInput'}],
+        'outputs': 'eluOutput'
+      }],
+      'expectedOutputs': {
+        'eluOutput': {
+          'data': [
+            4.72265625,       0.376953125,    1.4189453125,   -0.97900390625,
+            1.359375,         -0.97900390625, 7.83984375,     -0.99853515625,
+            0.54541015625,    5.77734375,     7.26171875,     -0.99951171875,
+            5.6640625,        -0.9990234375,  -0.96435546875, -0.70166015625,
+            7.25390625,       8.90625,        -0.98193359375, 7.11328125,
+            -0.1060791015625, -0.97509765625, 6.13671875,     -1
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'elu float16 3D tensor default options',
+    'graph': {
+      'inputs': {
+        'eluInput': {
+          'data': [
+            4.72265625,        0.376953125,  1.4189453125, -3.8671875,
+            1.359375,          -3.86328125,  7.83984375,   -6.69140625,
+            0.54541015625,     5.77734375,   7.26171875,   -7.421875,
+            5.6640625,         -6.71484375,  -3.333984375, -1.2099609375,
+            7.25390625,        8.90625,      -4.01953125,  7.11328125,
+            -0.11212158203125, -3.689453125, 6.13671875,   -9.8984375
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'elu',
+        'arguments': [{'input': 'eluInput'}],
+        'outputs': 'eluOutput'
+      }],
+      'expectedOutputs': {
+        'eluOutput': {
+          'data': [
+            4.72265625,       0.376953125,    1.4189453125,   -0.97900390625,
+            1.359375,         -0.97900390625, 7.83984375,     -0.99853515625,
+            0.54541015625,    5.77734375,     7.26171875,     -0.99951171875,
+            5.6640625,        -0.9990234375,  -0.96435546875, -0.70166015625,
+            7.25390625,       8.90625,        -0.98193359375, 7.11328125,
+            -0.1060791015625, -0.97509765625, 6.13671875,     -1
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'elu float16 4D tensor default options',
+    'graph': {
+      'inputs': {
+        'eluInput': {
+          'data': [
+            4.72265625,        0.376953125,  1.4189453125, -3.8671875,
+            1.359375,          -3.86328125,  7.83984375,   -6.69140625,
+            0.54541015625,     5.77734375,   7.26171875,   -7.421875,
+            5.6640625,         -6.71484375,  -3.333984375, -1.2099609375,
+            7.25390625,        8.90625,      -4.01953125,  7.11328125,
+            -0.11212158203125, -3.689453125, 6.13671875,   -9.8984375
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'elu',
+        'arguments': [{'input': 'eluInput'}],
+        'outputs': 'eluOutput'
+      }],
+      'expectedOutputs': {
+        'eluOutput': {
+          'data': [
+            4.72265625,       0.376953125,    1.4189453125,   -0.97900390625,
+            1.359375,         -0.97900390625, 7.83984375,     -0.99853515625,
+            0.54541015625,    5.77734375,     7.26171875,     -0.99951171875,
+            5.6640625,        -0.9990234375,  -0.96435546875, -0.70166015625,
+            7.25390625,       8.90625,        -0.98193359375, 7.11328125,
+            -0.1060791015625, -0.97509765625, 6.13671875,     -1
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'elu float16 5D tensor default options',
+    'graph': {
+      'inputs': {
+        'eluInput': {
+          'data': [
+            4.72265625,        0.376953125,  1.4189453125, -3.8671875,
+            1.359375,          -3.86328125,  7.83984375,   -6.69140625,
+            0.54541015625,     5.77734375,   7.26171875,   -7.421875,
+            5.6640625,         -6.71484375,  -3.333984375, -1.2099609375,
+            7.25390625,        8.90625,      -4.01953125,  7.11328125,
+            -0.11212158203125, -3.689453125, 6.13671875,   -9.8984375
+          ],
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'elu',
+        'arguments': [{'input': 'eluInput'}],
+        'outputs': 'eluOutput'
+      }],
+      'expectedOutputs': {
+        'eluOutput': {
+          'data': [
+            4.72265625,       0.376953125,    1.4189453125,   -0.97900390625,
+            1.359375,         -0.97900390625, 7.83984375,     -0.99853515625,
+            0.54541015625,    5.77734375,     7.26171875,     -0.99951171875,
+            5.6640625,        -0.9990234375,  -0.96435546875, -0.70166015625,
+            7.25390625,       8.90625,        -0.98193359375, 7.11328125,
+            -0.1060791015625, -0.97509765625, 6.13671875,     -1
+          ],
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'elu float16 4D tensor positive options.alpha',
+    'graph': {
+      'inputs': {
+        'eluInput': {
+          'data': [
+            4.72265625,        0.376953125,  1.4189453125, -3.8671875,
+            1.359375,          -3.86328125,  7.83984375,   -6.69140625,
+            0.54541015625,     5.77734375,   7.26171875,   -7.421875,
+            5.6640625,         -6.71484375,  -3.333984375, -1.2099609375,
+            7.25390625,        8.90625,      -4.01953125,  7.11328125,
+            -0.11212158203125, -3.689453125, 6.13671875,   -9.8984375
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'elu',
+        'arguments':
+            [{'input': 'eluInput'}, {'options': {'alpha': 0.3607245505146506}}],
+        'outputs': 'eluOutput'
+      }],
+      'expectedOutputs': {
+        'eluOutput': {
+          'data': [
+            4.72265625,      0.376953125,   1.4189453125,
+            -0.353271484375, 1.359375,      -0.353271484375,
+            7.83984375,      -0.3603515625, 0.54541015625,
+            5.77734375,      7.26171875,    -0.360595703125,
+            5.6640625,       -0.3603515625, -0.347900390625,
+            -0.253173828125, 7.25390625,    8.90625,
+            -0.354248046875, 7.11328125,    -0.03826904296875,
+            -0.351806640625, 6.13671875,    -0.360595703125
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'elu float16 4D tensor negative options.alpha',
+    'graph': {
+      'inputs': {
+        'eluInput': {
+          'data': [
+            4.72265625,        0.376953125,  1.4189453125, -3.8671875,
+            1.359375,          -3.86328125,  7.83984375,   -6.69140625,
+            0.54541015625,     5.77734375,   7.26171875,   -7.421875,
+            5.6640625,         -6.71484375,  -3.333984375, -1.2099609375,
+            7.25390625,        8.90625,      -4.01953125,  7.11328125,
+            -0.11212158203125, -3.689453125, 6.13671875,   -9.8984375
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'elu',
+        'arguments':
+            [{'input': 'eluInput'}, {'options': {'alpha': -3.468180406374035}}],
+        'outputs': 'eluOutput'
+      }],
+      'expectedOutputs': {
+        'eluOutput': {
+          'data': [
+            4.72265625,     0.376953125, 1.4189453125, 3.396484375,
+            1.359375,       3.39453125,  7.83984375,   3.46484375,
+            0.54541015625,  5.77734375,  7.26171875,   3.466796875,
+            5.6640625,      3.46484375,  3.34375,      2.43359375,
+            7.25390625,     8.90625,     3.40625,      7.11328125,
+            0.367919921875, 3.380859375, 6.13671875,   3.46875
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/hard_sigmoid.https.any.js b/tests/wpt/tests/webnn/conformance_tests/hard_sigmoid.https.any.js
index cfa033ba4b0..b5f6fd0c97a 100644
--- a/tests/wpt/tests/webnn/conformance_tests/hard_sigmoid.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/hard_sigmoid.https.any.js
@@ -686,6 +686,660 @@ const hardSigmoidTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'hardSigmoid float16 positive 0D tensor default options',
+    'graph': {
+      'inputs': {
+        'hardSigmoidInput': {
+          'data': [0.05908203125],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSigmoid',
+        'arguments': [{'input': 'hardSigmoidInput'}],
+        'outputs': 'hardSigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'hardSigmoidOutput': {
+          'data': [0.51171875],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'hardSigmoid float16 positive 1D constant tensor default options',
+    'graph': {
+      'inputs': {
+        'hardSigmoidInput': {
+          'data': [
+            0.05908203125,    0.70751953125,       0.52294921875,
+            0.423095703125,   0.66455078125,       0.9501953125,
+            0.10919189453125, 0.01297760009765625, 0.4755859375,
+            0.5322265625,     0.68408203125,       0.46630859375,
+            0.304931640625,   0.802734375,         0.2486572265625,
+            0.66357421875,    0.5546875,           0.55419921875,
+            0.73095703125,    0.488037109375,      0.77685546875,
+            0.845703125,      0.55517578125,       0.560546875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSigmoid',
+        'arguments': [{'input': 'hardSigmoidInput'}],
+        'outputs': 'hardSigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'hardSigmoidOutput': {
+          'data': [
+            0.51171875,    0.6416015625,  0.6044921875,  0.58447265625,
+            0.6328125,     0.68994140625, 0.52197265625, 0.50244140625,
+            0.59521484375, 0.6064453125,  0.63671875,    0.59326171875,
+            0.56103515625, 0.66064453125, 0.5498046875,  0.6328125,
+            0.61083984375, 0.61083984375, 0.64599609375, 0.59765625,
+            0.6552734375,  0.6689453125,  0.61083984375, 0.6123046875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'hardSigmoid float16 positive 1D tensor default options',
+    'graph': {
+      'inputs': {
+        'hardSigmoidInput': {
+          'data': [
+            0.05908203125,    0.70751953125,       0.52294921875,
+            0.423095703125,   0.66455078125,       0.9501953125,
+            0.10919189453125, 0.01297760009765625, 0.4755859375,
+            0.5322265625,     0.68408203125,       0.46630859375,
+            0.304931640625,   0.802734375,         0.2486572265625,
+            0.66357421875,    0.5546875,           0.55419921875,
+            0.73095703125,    0.488037109375,      0.77685546875,
+            0.845703125,      0.55517578125,       0.560546875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSigmoid',
+        'arguments': [{'input': 'hardSigmoidInput'}],
+        'outputs': 'hardSigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'hardSigmoidOutput': {
+          'data': [
+            0.51171875,    0.6416015625,  0.6044921875,  0.58447265625,
+            0.6328125,     0.68994140625, 0.52197265625, 0.50244140625,
+            0.59521484375, 0.6064453125,  0.63671875,    0.59326171875,
+            0.56103515625, 0.66064453125, 0.5498046875,  0.6328125,
+            0.61083984375, 0.61083984375, 0.64599609375, 0.59765625,
+            0.6552734375,  0.6689453125,  0.61083984375, 0.6123046875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'hardSigmoid float16 positive 2D tensor default options',
+    'graph': {
+      'inputs': {
+        'hardSigmoidInput': {
+          'data': [
+            0.05908203125,    0.70751953125,       0.52294921875,
+            0.423095703125,   0.66455078125,       0.9501953125,
+            0.10919189453125, 0.01297760009765625, 0.4755859375,
+            0.5322265625,     0.68408203125,       0.46630859375,
+            0.304931640625,   0.802734375,         0.2486572265625,
+            0.66357421875,    0.5546875,           0.55419921875,
+            0.73095703125,    0.488037109375,      0.77685546875,
+            0.845703125,      0.55517578125,       0.560546875
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSigmoid',
+        'arguments': [{'input': 'hardSigmoidInput'}],
+        'outputs': 'hardSigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'hardSigmoidOutput': {
+          'data': [
+            0.51171875,    0.6416015625,  0.6044921875,  0.58447265625,
+            0.6328125,     0.68994140625, 0.52197265625, 0.50244140625,
+            0.59521484375, 0.6064453125,  0.63671875,    0.59326171875,
+            0.56103515625, 0.66064453125, 0.5498046875,  0.6328125,
+            0.61083984375, 0.61083984375, 0.64599609375, 0.59765625,
+            0.6552734375,  0.6689453125,  0.61083984375, 0.6123046875
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'hardSigmoid float16 positive 3D tensor default options',
+    'graph': {
+      'inputs': {
+        'hardSigmoidInput': {
+          'data': [
+            0.05908203125,    0.70751953125,       0.52294921875,
+            0.423095703125,   0.66455078125,       0.9501953125,
+            0.10919189453125, 0.01297760009765625, 0.4755859375,
+            0.5322265625,     0.68408203125,       0.46630859375,
+            0.304931640625,   0.802734375,         0.2486572265625,
+            0.66357421875,    0.5546875,           0.55419921875,
+            0.73095703125,    0.488037109375,      0.77685546875,
+            0.845703125,      0.55517578125,       0.560546875
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSigmoid',
+        'arguments': [{'input': 'hardSigmoidInput'}],
+        'outputs': 'hardSigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'hardSigmoidOutput': {
+          'data': [
+            0.51171875,    0.6416015625,  0.6044921875,  0.58447265625,
+            0.6328125,     0.68994140625, 0.52197265625, 0.50244140625,
+            0.59521484375, 0.6064453125,  0.63671875,    0.59326171875,
+            0.56103515625, 0.66064453125, 0.5498046875,  0.6328125,
+            0.61083984375, 0.61083984375, 0.64599609375, 0.59765625,
+            0.6552734375,  0.6689453125,  0.61083984375, 0.6123046875
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'hardSigmoid float16 positive 4D tensor default options',
+    'graph': {
+      'inputs': {
+        'hardSigmoidInput': {
+          'data': [
+            0.05908203125,    0.70751953125,       0.52294921875,
+            0.423095703125,   0.66455078125,       0.9501953125,
+            0.10919189453125, 0.01297760009765625, 0.4755859375,
+            0.5322265625,     0.68408203125,       0.46630859375,
+            0.304931640625,   0.802734375,         0.2486572265625,
+            0.66357421875,    0.5546875,           0.55419921875,
+            0.73095703125,    0.488037109375,      0.77685546875,
+            0.845703125,      0.55517578125,       0.560546875
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSigmoid',
+        'arguments': [{'input': 'hardSigmoidInput'}],
+        'outputs': 'hardSigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'hardSigmoidOutput': {
+          'data': [
+            0.51171875,    0.6416015625,  0.6044921875,  0.58447265625,
+            0.6328125,     0.68994140625, 0.52197265625, 0.50244140625,
+            0.59521484375, 0.6064453125,  0.63671875,    0.59326171875,
+            0.56103515625, 0.66064453125, 0.5498046875,  0.6328125,
+            0.61083984375, 0.61083984375, 0.64599609375, 0.59765625,
+            0.6552734375,  0.6689453125,  0.61083984375, 0.6123046875
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'hardSigmoid float16 positive 5D tensor default options',
+    'graph': {
+      'inputs': {
+        'hardSigmoidInput': {
+          'data': [
+            0.05908203125,    0.70751953125,       0.52294921875,
+            0.423095703125,   0.66455078125,       0.9501953125,
+            0.10919189453125, 0.01297760009765625, 0.4755859375,
+            0.5322265625,     0.68408203125,       0.46630859375,
+            0.304931640625,   0.802734375,         0.2486572265625,
+            0.66357421875,    0.5546875,           0.55419921875,
+            0.73095703125,    0.488037109375,      0.77685546875,
+            0.845703125,      0.55517578125,       0.560546875
+          ],
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSigmoid',
+        'arguments': [{'input': 'hardSigmoidInput'}],
+        'outputs': 'hardSigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'hardSigmoidOutput': {
+          'data': [
+            0.51171875,    0.6416015625,  0.6044921875,  0.58447265625,
+            0.6328125,     0.68994140625, 0.52197265625, 0.50244140625,
+            0.59521484375, 0.6064453125,  0.63671875,    0.59326171875,
+            0.56103515625, 0.66064453125, 0.5498046875,  0.6328125,
+            0.61083984375, 0.61083984375, 0.64599609375, 0.59765625,
+            0.6552734375,  0.6689453125,  0.61083984375, 0.6123046875
+          ],
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'hardSigmoid float16 positive 4D tensor specified positive options.alpha default options.beta',
+    'graph': {
+      'inputs': {
+        'hardSigmoidInput': {
+          'data': [
+            0.05908203125,    0.70751953125,       0.52294921875,
+            0.423095703125,   0.66455078125,       0.9501953125,
+            0.10919189453125, 0.01297760009765625, 0.4755859375,
+            0.5322265625,     0.68408203125,       0.46630859375,
+            0.304931640625,   0.802734375,         0.2486572265625,
+            0.66357421875,    0.5546875,           0.55419921875,
+            0.73095703125,    0.488037109375,      0.77685546875,
+            0.845703125,      0.55517578125,       0.560546875
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSigmoid',
+        'arguments': [
+          {'input': 'hardSigmoidInput'},
+          {'options': {'alpha': 0.7854232544278235}}
+        ],
+        'outputs': 'hardSigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'hardSigmoidOutput': {
+          'data': [
+            0.54638671875,
+            1,
+            0.91064453125,
+            0.83251953125,
+            1,
+            1,
+            0.5859375,
+            0.51025390625,
+            0.87353515625,
+            0.91796875,
+            1,
+            0.8662109375,
+            0.7392578125,
+            1,
+            0.6953125,
+            1,
+            0.935546875,
+            0.93505859375,
+            1,
+            0.88330078125,
+            1,
+            1,
+            0.93603515625,
+            0.9404296875
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'hardSigmoid float16 negative 4D tensor specified negative options.alpha default options.beta',
+    'graph': {
+      'inputs': {
+        'hardSigmoidInput': {
+          'data': [
+            -0.05908203125,    -0.70751953125,       -0.52294921875,
+            -0.423095703125,   -0.66455078125,       -0.9501953125,
+            -0.10919189453125, -0.01297760009765625, -0.4755859375,
+            -0.5322265625,     -0.68408203125,       -0.46630859375,
+            -0.304931640625,   -0.802734375,         -0.2486572265625,
+            -0.66357421875,    -0.5546875,           -0.55419921875,
+            -0.73095703125,    -0.488037109375,      -0.77685546875,
+            -0.845703125,      -0.55517578125,       -0.560546875
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSigmoid',
+        'arguments': [
+          {'input': 'hardSigmoidInput'},
+          {'options': {'alpha': -0.7854232544278235}}
+        ],
+        'outputs': 'hardSigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'hardSigmoidOutput': {
+          'data': [
+            0.54638671875,
+            1,
+            0.91064453125,
+            0.83251953125,
+            1,
+            1,
+            0.5859375,
+            0.51025390625,
+            0.87353515625,
+            0.91796875,
+            1,
+            0.8662109375,
+            0.7392578125,
+            1,
+            0.6953125,
+            1,
+            0.935546875,
+            0.93505859375,
+            1,
+            0.88330078125,
+            1,
+            1,
+            0.93603515625,
+            0.9404296875
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'hardSigmoid float16 positive 4D tensor specified positive options.beta default options.alpha',
+    'graph': {
+      'inputs': {
+        'hardSigmoidInput': {
+          'data': [
+            0.05908203125,    0.70751953125,       0.52294921875,
+            0.423095703125,   0.66455078125,       0.9501953125,
+            0.10919189453125, 0.01297760009765625, 0.4755859375,
+            0.5322265625,     0.68408203125,       0.46630859375,
+            0.304931640625,   0.802734375,         0.2486572265625,
+            0.66357421875,    0.5546875,           0.55419921875,
+            0.73095703125,    0.488037109375,      0.77685546875,
+            0.845703125,      0.55517578125,       0.560546875
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSigmoid',
+        'arguments': [
+          {'input': 'hardSigmoidInput'},
+          {'options': {'beta': 0.4361860418530341}}
+        ],
+        'outputs': 'hardSigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'hardSigmoidOutput': {
+          'data': [
+            0.447998046875, 0.57763671875, 0.541015625,   0.52099609375,
+            0.5693359375,   0.62646484375, 0.4580078125,  0.438720703125,
+            0.53125,        0.54248046875, 0.5732421875,  0.529296875,
+            0.4970703125,   0.5966796875,  0.48583984375, 0.56884765625,
+            0.54736328125,  0.546875,      0.58251953125, 0.53369140625,
+            0.591796875,    0.60546875,    0.54736328125, 0.54833984375
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'hardSigmoid float16 negative 4D tensor specified negative options.beta default options.alpha',
+    'graph': {
+      'inputs': {
+        'hardSigmoidInput': {
+          'data': [
+            -0.05908203125,    -0.70751953125,       -0.52294921875,
+            -0.423095703125,   -0.66455078125,       -0.9501953125,
+            -0.10919189453125, -0.01297760009765625, -0.4755859375,
+            -0.5322265625,     -0.68408203125,       -0.46630859375,
+            -0.304931640625,   -0.802734375,         -0.2486572265625,
+            -0.66357421875,    -0.5546875,           -0.55419921875,
+            -0.73095703125,    -0.488037109375,      -0.77685546875,
+            -0.845703125,      -0.55517578125,       -0.560546875
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSigmoid',
+        'arguments': [
+          {'input': 'hardSigmoidInput'},
+          {'options': {'beta': -0.436186041853034}}
+        ],
+        'outputs': 'hardSigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'hardSigmoidOutput': {
+          'data': [
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'hardSigmoid float16 positive 4D tensor specified all options (positive options.alpha and positive options.beta)',
+    'graph': {
+      'inputs': {
+        'hardSigmoidInput': {
+          'data': [
+            0.05908203125,    0.70751953125,       0.52294921875,
+            0.423095703125,   0.66455078125,       0.9501953125,
+            0.10919189453125, 0.01297760009765625, 0.4755859375,
+            0.5322265625,     0.68408203125,       0.46630859375,
+            0.304931640625,   0.802734375,         0.2486572265625,
+            0.66357421875,    0.5546875,           0.55419921875,
+            0.73095703125,    0.488037109375,      0.77685546875,
+            0.845703125,      0.55517578125,       0.560546875
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSigmoid',
+        'arguments': [
+          {'input': 'hardSigmoidInput'},
+          {'options': {'alpha': 0.7854232544278235, 'beta': 0.4361860418530341}}
+        ],
+        'outputs': 'hardSigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'hardSigmoidOutput': {
+          'data': [
+            0.482666015625,
+            0.99169921875,
+            0.8466796875,
+            0.7685546875,
+            0.9580078125,
+            1,
+            0.52197265625,
+            0.4462890625,
+            0.8095703125,
+            0.85400390625,
+            0.9736328125,
+            0.80224609375,
+            0.67578125,
+            1,
+            0.63134765625,
+            0.95751953125,
+            0.8720703125,
+            0.87158203125,
+            1,
+            0.8193359375,
+            1,
+            1,
+            0.8720703125,
+            0.87646484375
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'hardSigmoid float16 positive 4D tensor specified all options (negative options.alpha and negative options.beta)',
+    'graph': {
+      'inputs': {
+        'hardSigmoidInput': {
+          'data': [
+            0.05908203125,    0.70751953125,       0.52294921875,
+            0.423095703125,   0.66455078125,       0.9501953125,
+            0.10919189453125, 0.01297760009765625, 0.4755859375,
+            0.5322265625,     0.68408203125,       0.46630859375,
+            0.304931640625,   0.802734375,         0.2486572265625,
+            0.66357421875,    0.5546875,           0.55419921875,
+            0.73095703125,    0.488037109375,      0.77685546875,
+            0.845703125,      0.55517578125,       0.560546875
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSigmoid',
+        'arguments': [
+          {'input': 'hardSigmoidInput'}, {
+            'options':
+                {'alpha': -0.7854232544278235, 'beta': -0.4361860418530341}
+          }
+        ],
+        'outputs': 'hardSigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'hardSigmoidOutput': {
+          'data': [
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'hardSigmoid float16 negative 4D tensor all options (positive options.alpha and negative options.beta)',
+    'graph': {
+      'inputs': {
+        'hardSigmoidInput': {
+          'data': [
+            -0.05908203125,    -0.70751953125,       -0.52294921875,
+            -0.423095703125,   -0.66455078125,       -0.9501953125,
+            -0.10919189453125, -0.01297760009765625, -0.4755859375,
+            -0.5322265625,     -0.68408203125,       -0.46630859375,
+            -0.304931640625,   -0.802734375,         -0.2486572265625,
+            -0.66357421875,    -0.5546875,           -0.55419921875,
+            -0.73095703125,    -0.488037109375,      -0.77685546875,
+            -0.845703125,      -0.55517578125,       -0.560546875
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSigmoid',
+        'arguments': [
+          {'input': 'hardSigmoidInput'}, {
+            'options':
+                {'alpha': 0.7854232544278235, 'beta': -0.4361860418530341}
+          }
+        ],
+        'outputs': 'hardSigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'hardSigmoidOutput': {
+          'data': [
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'hardSigmoid float16 negative 4D tensor specified all options (negative options.alpha and positive options.beta)',
+    'graph': {
+      'inputs': {
+        'hardSigmoidInput': {
+          'data': [
+            -0.05908203125,    -0.70751953125,       -0.52294921875,
+            -0.423095703125,   -0.66455078125,       -0.9501953125,
+            -0.10919189453125, -0.01297760009765625, -0.4755859375,
+            -0.5322265625,     -0.68408203125,       -0.46630859375,
+            -0.304931640625,   -0.802734375,         -0.2486572265625,
+            -0.66357421875,    -0.5546875,           -0.55419921875,
+            -0.73095703125,    -0.488037109375,      -0.77685546875,
+            -0.845703125,      -0.55517578125,       -0.560546875
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSigmoid',
+        'arguments': [
+          {'input': 'hardSigmoidInput'}, {
+            'options':
+                {'alpha': -0.7854232544278235, 'beta': 0.4361860418530341}
+          }
+        ],
+        'outputs': 'hardSigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'hardSigmoidOutput': {
+          'data': [
+            0.482666015625,
+            0.99169921875,
+            0.8466796875,
+            0.7685546875,
+            0.9580078125,
+            1,
+            0.52197265625,
+            0.4462890625,
+            0.8095703125,
+            0.85400390625,
+            0.9736328125,
+            0.80224609375,
+            0.67578125,
+            1,
+            0.63134765625,
+            0.95751953125,
+            0.8720703125,
+            0.87158203125,
+            1,
+            0.8193359375,
+            1,
+            1,
+            0.8720703125,
+            0.87646484375
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/hard_swish.https.any.js b/tests/wpt/tests/webnn/conformance_tests/hard_swish.https.any.js
index 6bd054b326e..e49ea6fd719 100644
--- a/tests/wpt/tests/webnn/conformance_tests/hard_swish.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/hard_swish.https.any.js
@@ -373,6 +373,275 @@ const hardSwishTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'hardSwish float16 0D tensor',
+    'graph': {
+      'inputs': {
+        'hardSwishInput':
+            {'data': [0.734375], 'descriptor': {shape: [], dataType: 'float16'}}
+      },
+      'operators': [{
+        'name': 'hardSwish',
+        'arguments': [{'input': 'hardSwishInput'}],
+        'outputs': 'hardSwishOutput'
+      }],
+      'expectedOutputs': {
+        'hardSwishOutput': {
+          'data': [0.45703125],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'hardSwish float16 1D constant tensor',
+    'graph': {
+      'inputs': {
+        'hardSwishInput': {
+          'data': [
+            0.734375,    9.1171875,   3.544921875, 2.62109375,   -6.4453125,
+            -1.68359375, 5.5234375,   -5.95703125, -9.171875,    6.421875,
+            -3.29296875, 1.041015625, -7.24609375, -0.947265625, -5.77734375,
+            3.185546875, -7.26171875, 4.17578125,  3.779296875,  -6.0703125,
+            -9.90625,    -7.74609375, -8.2890625,  8.0859375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'hardSwish',
+        'arguments': [{'input': 'hardSwishInput'}],
+        'outputs': 'hardSwishOutput'
+      }],
+      'expectedOutputs': {
+        'hardSwishOutput': {
+          'data': [
+            0.45703125,  9.1171875,
+            3.544921875, 2.455078125,
+            0,           -0.369384765625,
+            5.5234375,   0,
+            0,           6.421875,
+            0,           0.701171875,
+            0,           -0.323974609375,
+            0,           3.185546875,
+            0,           4.17578125,
+            3.779296875, 0,
+            0,           0,
+            0,           8.0859375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'hardSwish float16 1D tensor',
+    'graph': {
+      'inputs': {
+        'hardSwishInput': {
+          'data': [
+            0.734375,    9.1171875,   3.544921875, 2.62109375,   -6.4453125,
+            -1.68359375, 5.5234375,   -5.95703125, -9.171875,    6.421875,
+            -3.29296875, 1.041015625, -7.24609375, -0.947265625, -5.77734375,
+            3.185546875, -7.26171875, 4.17578125,  3.779296875,  -6.0703125,
+            -9.90625,    -7.74609375, -8.2890625,  8.0859375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSwish',
+        'arguments': [{'input': 'hardSwishInput'}],
+        'outputs': 'hardSwishOutput'
+      }],
+      'expectedOutputs': {
+        'hardSwishOutput': {
+          'data': [
+            0.45703125,  9.1171875,
+            3.544921875, 2.455078125,
+            0,           -0.369384765625,
+            5.5234375,   0,
+            0,           6.421875,
+            0,           0.701171875,
+            0,           -0.323974609375,
+            0,           3.185546875,
+            0,           4.17578125,
+            3.779296875, 0,
+            0,           0,
+            0,           8.0859375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'hardSwish float16 2D tensor',
+    'graph': {
+      'inputs': {
+        'hardSwishInput': {
+          'data': [
+            0.734375,    9.1171875,   3.544921875, 2.62109375,   -6.4453125,
+            -1.68359375, 5.5234375,   -5.95703125, -9.171875,    6.421875,
+            -3.29296875, 1.041015625, -7.24609375, -0.947265625, -5.77734375,
+            3.185546875, -7.26171875, 4.17578125,  3.779296875,  -6.0703125,
+            -9.90625,    -7.74609375, -8.2890625,  8.0859375
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSwish',
+        'arguments': [{'input': 'hardSwishInput'}],
+        'outputs': 'hardSwishOutput'
+      }],
+      'expectedOutputs': {
+        'hardSwishOutput': {
+          'data': [
+            0.45703125,  9.1171875,
+            3.544921875, 2.455078125,
+            0,           -0.369384765625,
+            5.5234375,   0,
+            0,           6.421875,
+            0,           0.701171875,
+            0,           -0.323974609375,
+            0,           3.185546875,
+            0,           4.17578125,
+            3.779296875, 0,
+            0,           0,
+            0,           8.0859375
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'hardSwish float16 3D tensor',
+    'graph': {
+      'inputs': {
+        'hardSwishInput': {
+          'data': [
+            0.734375,    9.1171875,   3.544921875, 2.62109375,   -6.4453125,
+            -1.68359375, 5.5234375,   -5.95703125, -9.171875,    6.421875,
+            -3.29296875, 1.041015625, -7.24609375, -0.947265625, -5.77734375,
+            3.185546875, -7.26171875, 4.17578125,  3.779296875,  -6.0703125,
+            -9.90625,    -7.74609375, -8.2890625,  8.0859375
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSwish',
+        'arguments': [{'input': 'hardSwishInput'}],
+        'outputs': 'hardSwishOutput'
+      }],
+      'expectedOutputs': {
+        'hardSwishOutput': {
+          'data': [
+            0.45703125,  9.1171875,
+            3.544921875, 2.455078125,
+            0,           -0.369384765625,
+            5.5234375,   0,
+            0,           6.421875,
+            0,           0.701171875,
+            0,           -0.323974609375,
+            0,           3.185546875,
+            0,           4.17578125,
+            3.779296875, 0,
+            0,           0,
+            0,           8.0859375
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'hardSwish float16 4D tensor',
+    'graph': {
+      'inputs': {
+        'hardSwishInput': {
+          'data': [
+            0.734375,    9.1171875,   3.544921875, 2.62109375,   -6.4453125,
+            -1.68359375, 5.5234375,   -5.95703125, -9.171875,    6.421875,
+            -3.29296875, 1.041015625, -7.24609375, -0.947265625, -5.77734375,
+            3.185546875, -7.26171875, 4.17578125,  3.779296875,  -6.0703125,
+            -9.90625,    -7.74609375, -8.2890625,  8.0859375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSwish',
+        'arguments': [{'input': 'hardSwishInput'}],
+        'outputs': 'hardSwishOutput'
+      }],
+      'expectedOutputs': {
+        'hardSwishOutput': {
+          'data': [
+            0.45703125,  9.1171875,
+            3.544921875, 2.455078125,
+            0,           -0.369384765625,
+            5.5234375,   0,
+            0,           6.421875,
+            0,           0.701171875,
+            0,           -0.323974609375,
+            0,           3.185546875,
+            0,           4.17578125,
+            3.779296875, 0,
+            0,           0,
+            0,           8.0859375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'hardSwish float16 5D tensor',
+    'graph': {
+      'inputs': {
+        'hardSwishInput': {
+          'data': [
+            0.734375,    9.1171875,   3.544921875, 2.62109375,   -6.4453125,
+            -1.68359375, 5.5234375,   -5.95703125, -9.171875,    6.421875,
+            -3.29296875, 1.041015625, -7.24609375, -0.947265625, -5.77734375,
+            3.185546875, -7.26171875, 4.17578125,  3.779296875,  -6.0703125,
+            -9.90625,    -7.74609375, -8.2890625,  8.0859375
+          ],
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'hardSwish',
+        'arguments': [{'input': 'hardSwishInput'}],
+        'outputs': 'hardSwishOutput'
+      }],
+      'expectedOutputs': {
+        'hardSwishOutput': {
+          'data': [
+            0.45703125,  9.1171875,
+            3.544921875, 2.455078125,
+            0,           -0.369384765625,
+            5.5234375,   0,
+            0,           6.421875,
+            0,           0.701171875,
+            0,           -0.323974609375,
+            0,           3.185546875,
+            0,           4.17578125,
+            3.779296875, 0,
+            0,           0,
+            0,           8.0859375
+          ],
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/inputs-with-special-names.https.any.js b/tests/wpt/tests/webnn/conformance_tests/inputs-with-special-names.https.any.js
new file mode 100644
index 00000000000..2921cf1fe5e
--- /dev/null
+++ b/tests/wpt/tests/webnn/conformance_tests/inputs-with-special-names.https.any.js
@@ -0,0 +1,74 @@
+// META: title=test input with special character names
+// META: global=window
+// META: variant=?cpu
+// META: variant=?gpu
+// META: variant=?npu
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+// https://www.w3.org/TR/webnn/#api-mlgraphbuilder-input
+
+let mlContext;
+
+// Skip tests if WebNN is unimplemented.
+promise_setup(async () => {
+  assert_implements(navigator.ml, 'missing navigator.ml');
+  mlContext = await navigator.ml.createContext(contextOptions);
+});
+
+const specialNameArray = [
+  '12-L#!.☺',
+  '🤦🏼‍♂️124DS#!F',
+
+  // Escape Sequence
+  'hello\n\t\r\b\f\v\'\"\0\\webnn',
+
+  // Hexadecimal Escape Sequences
+  // '\x41'→ 'A'
+  '\x41\x41\x41',
+
+  // Unicode & Hexadecimal Characters
+  //   "\u00A9" → "©"
+  //   "\xA9" → "©"
+  //   "\u2665" → "♥"
+  //   "\u2026" → "…"
+  //   "\U0001F600" → 😀 (Grinning Face Emoji)
+  '\u00A9\xA9\u2665\u2026',
+  '\U0001F600'
+];
+
+specialNameArray.forEach((name) => {
+  promise_test(async () => {
+    const builder = new MLGraphBuilder(mlContext);
+    const inputOperand = builder.input(name, {dataType: 'float32', shape: [4]});
+    const outputOperand = builder.abs(inputOperand);
+
+    const [inputTensor, outputTensor, mlGraph] = await Promise.all([
+      mlContext.createTensor({
+        dataType: 'float32',
+        shape: [4],
+        readable: true,
+        writable: true,
+      }),
+      mlContext.createTensor({dataType: 'float32', shape: [4], readable: true}),
+      builder.build({'output': outputOperand})
+    ]);
+
+    const inputData = Float32Array.from([-2, -1, 1, 2]);
+    mlContext.writeTensor(inputTensor, inputData);
+
+    const inputs = {};
+    inputs[name] = inputTensor;
+
+    mlContext.dispatch(mlGraph, inputs, {'output': outputTensor});
+
+    // Wait for graph execution to complete.
+    await mlContext.readTensor(outputTensor);
+
+    assert_array_equals(
+        new Float32Array(await mlContext.readTensor(outputTensor)),
+        Float32Array.from([2, 1, 1, 2]));
+  }, `abs input with special character name '${name}'`);
+});
diff --git a/tests/wpt/tests/webnn/conformance_tests/instance_normalization.https.any.js b/tests/wpt/tests/webnn/conformance_tests/instance_normalization.https.any.js
index 26e0cd0aa93..2766f914b3d 100644
--- a/tests/wpt/tests/webnn/conformance_tests/instance_normalization.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/instance_normalization.https.any.js
@@ -21,16 +21,6 @@
 // MLOperand instanceNormalization(
 //     MLOperand input, optional MLInstanceNormalizationOptions options = {});
 
-
-const getInstanceNormPrecisionTolerance = (graphResources) => {
-  // according to
-  // https://github.com/web-platform-tests/wpt/pull/43891#discussion_r1457026316
-  const toleranceValueDict = {float32: 840, float16: 8400};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
-};
-
 const instanceNormTests = [
   {
     'name': 'instanceNormalization float32 4D tensor default options',
@@ -212,7 +202,7 @@ const instanceNormTests = [
   },
   {
     'name':
-        'instanceNormalization float32 4D tensor explict options.layout=\'nchw\'',
+        'instanceNormalization float32 4D tensor explicit options.layout=\'nchw\'',
     'graph': {
       'inputs': {
         'instanceNormInput': {
@@ -351,6 +341,290 @@ const instanceNormTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'instanceNormalization float16 4D tensor default options',
+    'graph': {
+      'inputs': {
+        'instanceNormInput': {
+          'data': [
+            -97.9375,   29.4375,  -73.9375,   -38.125,     41.34375, -59.78125,
+            -74.6875,   -68.1875, 35.8125,    -6.94921875, 54.4375,  47.53125,
+            66.9375,    76.75,    5.67578125, 25.6875,     37.375,   56.25,
+            -16.578125, 42.9375,  73.875,     -99,         -33.125,  -17.375
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'instanceNormalization',
+        'arguments': [{'input': 'instanceNormInput'}],
+        'outputs': 'instanceNormOutput'
+      }],
+      'expectedOutputs': {
+        'instanceNormOutput': {
+          'data': [
+            -1.099609375,    1.552734375,    -0.599609375,
+            0.1461181640625, 1.7216796875,   -0.409912109375,
+            -0.72412109375,  -0.5869140625,  0.1302490234375,
+            -1.6630859375,   0.9111328125,   0.62158203125,
+            0.79443359375,   1.130859375,    -1.3056640625,
+            -0.61962890625,  0.265869140625, 0.9462890625,
+            -1.6787109375,   0.46630859375,  1.50390625,
+            -1.2978515625,   -0.23046875,    0.024810791015625
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'instanceNormalization float16 4D tensor options.scale',
+    'graph': {
+      'inputs': {
+        'instanceNormInput': {
+          'data': [
+            -97.9375,   29.4375,  -73.9375,   -38.125,     41.34375, -59.78125,
+            -74.6875,   -68.1875, 35.8125,    -6.94921875, 54.4375,  47.53125,
+            66.9375,    76.75,    5.67578125, 25.6875,     37.375,   56.25,
+            -16.578125, 42.9375,  73.875,     -99,         -33.125,  -17.375
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        },
+        'instanceNormScale': {
+          'data': [-94.4375, 66.6875, -98.5625],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'instanceNormalization',
+        'arguments': [
+          {'input': 'instanceNormInput'},
+          {'options': {'scale': 'instanceNormScale'}}
+        ],
+        'outputs': 'instanceNormOutput'
+      }],
+      'expectedOutputs': {
+        'instanceNormOutput': {
+          'data': [
+            103.8125,  -146.625,  56.625,    -13.796875,  114.8125,
+            -27.34375, -48.28125, -39.15625, -12.8359375, 163.875,
+            -89.8125,  -61.28125, -75.0625,  -106.8125,   123.3125,
+            58.53125,  17.734375, 63.09375,  -111.9375,   31.09375,
+            -148.25,   127.9375,  22.71875,  -2.4453125
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'instanceNormalization float16 4D tensor options.bias',
+    'graph': {
+      'inputs': {
+        'instanceNormInput': {
+          'data': [
+            -97.9375,   29.4375,  -73.9375,   -38.125,     41.34375, -59.78125,
+            -74.6875,   -68.1875, 35.8125,    -6.94921875, 54.4375,  47.53125,
+            66.9375,    76.75,    5.67578125, 25.6875,     37.375,   56.25,
+            -16.578125, 42.9375,  73.875,     -99,         -33.125,  -17.375
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        },
+        'instanceNormBias': {
+          'data': [-33.0625, 4.51171875, -37.9375],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'instanceNormalization',
+        'arguments': [
+          {'input': 'instanceNormInput'},
+          {'options': {'bias': 'instanceNormBias'}}
+        ],
+        'outputs': 'instanceNormOutput'
+      }],
+      'expectedOutputs': {
+        'instanceNormOutput': {
+          'data': [
+            -34.15625, -31.515625,  -33.65625,   -32.90625,   6.234375,
+            4.1015625, 3.787109375, 3.923828125, -37.8125,    -39.59375,
+            -37.03125, -37.3125,    -32.28125,   -31.9375,    -34.375,
+            -33.6875,  4.77734375,  5.45703125,  2.833984375, 4.9765625,
+            -36.4375,  -39.25,      -38.15625,   -37.90625
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'instanceNormalization float16 4D tensor options.epsilon',
+    'graph': {
+      'inputs': {
+        'instanceNormInput': {
+          'data': [
+            -97.9375,   29.4375,  -73.9375,   -38.125,     41.34375, -59.78125,
+            -74.6875,   -68.1875, 35.8125,    -6.94921875, 54.4375,  47.53125,
+            66.9375,    76.75,    5.67578125, 25.6875,     37.375,   56.25,
+            -16.578125, 42.9375,  73.875,     -99,         -33.125,  -17.375
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'instanceNormalization',
+        'arguments': [
+          {'input': 'instanceNormInput'}, {'options': {'epsilon': 0.000001}}
+        ],
+        'outputs': 'instanceNormOutput'
+      }],
+      'expectedOutputs': {
+        'instanceNormOutput': {
+          'data': [
+            -1.099609375,    1.552734375,    -0.599609375,
+            0.1461181640625, 1.7216796875,   -0.409912109375,
+            -0.72412109375,  -0.5869140625,  0.1302490234375,
+            -1.6630859375,   0.9111328125,   0.62158203125,
+            0.79443359375,   1.130859375,    -1.3056640625,
+            -0.61962890625,  0.265869140625, 0.9462890625,
+            -1.6787109375,   0.46630859375,  1.50390625,
+            -1.2978515625,   -0.23046875,    0.024810791015625
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'instanceNormalization float16 4D tensor explicit options.layout=\'nchw\'',
+    'graph': {
+      'inputs': {
+        'instanceNormInput': {
+          'data': [
+            -97.9375,   29.4375,  -73.9375,   -38.125,     41.34375, -59.78125,
+            -74.6875,   -68.1875, 35.8125,    -6.94921875, 54.4375,  47.53125,
+            66.9375,    76.75,    5.67578125, 25.6875,     37.375,   56.25,
+            -16.578125, 42.9375,  73.875,     -99,         -33.125,  -17.375
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'instanceNormalization',
+        'arguments':
+            [{'input': 'instanceNormInput'}, {'options': {'layout': 'nchw'}}],
+        'outputs': 'instanceNormOutput'
+      }],
+      'expectedOutputs': {
+        'instanceNormOutput': {
+          'data': [
+            -1.099609375,    1.552734375,    -0.599609375,
+            0.1461181640625, 1.7216796875,   -0.409912109375,
+            -0.72412109375,  -0.5869140625,  0.1302490234375,
+            -1.6630859375,   0.9111328125,   0.62158203125,
+            0.79443359375,   1.130859375,    -1.3056640625,
+            -0.61962890625,  0.265869140625, 0.9462890625,
+            -1.6787109375,   0.46630859375,  1.50390625,
+            -1.2978515625,   -0.23046875,    0.024810791015625
+          ],
+          'descriptor': {shape: [2, 3, 2, 2], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'instanceNormalization float16 4D tensor options.layout=\'nhwc\'',
+    'graph': {
+      'inputs': {
+        'instanceNormInput': {
+          'data': [
+            -97.9375,   41.34375,   35.8125, 29.4375, -59.78125, -6.94921875,
+            -73.9375,   -74.6875,   54.4375, -38.125, -68.1875,  47.53125,
+            66.9375,    37.375,     73.875,  76.75,   56.25,     -99,
+            5.67578125, -16.578125, -33.125, 25.6875, 42.9375,   -17.375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'instanceNormalization',
+        'arguments':
+            [{'input': 'instanceNormInput'}, {'options': {'layout': 'nhwc'}}],
+        'outputs': 'instanceNormOutput'
+      }],
+      'expectedOutputs': {
+        'instanceNormOutput': {
+          'data': [
+            -1.099609375,    1.7216796875,    0.1302490234375,
+            1.552734375,     -0.409912109375, -1.6630859375,
+            -0.599609375,    -0.72412109375,  0.9111328125,
+            0.1461181640625, -0.5869140625,   0.62158203125,
+            0.79443359375,   0.265869140625,  1.50390625,
+            1.130859375,     0.9462890625,    -1.2978515625,
+            -1.3056640625,   -1.6787109375,   -0.23046875,
+            -0.61962890625,  0.46630859375,   0.024810791015625
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'instanceNormalization float16 4D tensor all options',
+    'graph': {
+      'inputs': {
+        'instanceNormInput': {
+          'data': [
+            -97.9375,   41.34375,   35.8125, 29.4375, -59.78125, -6.94921875,
+            -73.9375,   -74.6875,   54.4375, -38.125, -68.1875,  47.53125,
+            66.9375,    37.375,     73.875,  76.75,   56.25,     -99,
+            5.67578125, -16.578125, -33.125, 25.6875, 42.9375,   -17.375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'instanceNormScale': {
+          'data': [-94.4375, 66.6875, -98.5625],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        },
+        'instanceNormBias': {
+          'data': [-33.0625, 4.51171875, -37.9375],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'instanceNormalization',
+        'arguments': [
+          {'input': 'instanceNormInput'}, {
+            'options': {
+              'scale': 'instanceNormScale',
+              'bias': 'instanceNormBias',
+              'epsilon': 0.000001,
+              'layout': 'nhwc'
+            }
+          }
+        ],
+        'outputs': 'instanceNormOutput'
+      }],
+      'expectedOutputs': {
+        'instanceNormOutput': {
+          'data': [
+            70.75,    119.3125,  -50.78125,   -179.75,   -22.828125, 126,
+            23.5625,  -43.78125, -127.75,     -46.84375, -34.65625,  -99.1875,
+            -108.125, 22.25,     -186.125,    -139.875,  67.625,     90,
+            90.25,    -107.4375, -15.2265625, 25.46875,  35.625,     -40.375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/layer_normalization.https.any.js b/tests/wpt/tests/webnn/conformance_tests/layer_normalization.https.any.js
index 2d5e98ea09d..f22d0444cfa 100644
--- a/tests/wpt/tests/webnn/conformance_tests/layer_normalization.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/layer_normalization.https.any.js
@@ -22,11 +22,8 @@
 //     MLOperand input, optional MLLayerNormalizationOptions options = {});
 
 
-const getLayerNormPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 1 / 1024, float16: 1 / 512};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ATOL', value: toleranceValueDict[expectedDataType]};
+const getLayerNormPrecisionTolerance = () => {
+  return {metricType: 'ULP', value: 14};
 };
 
 const layerNormTests = [
@@ -56,14 +53,14 @@ const layerNormTests = [
       'inputs': {
         'layerNormInput': {
           'data': [
-            -35.51446533203125,  54.735408782958984,  19.659019470214844,
-            -15.882678031921387, 65.48657989501953,   25.818492889404297,
-            97.55302429199219,   -8.057161331176758,  62.9412956237793,
-            -48.91555404663086,  91.90644073486328,   46.67098617553711,
-            -74.85331726074219,  30.126361846923828,  26.13089370727539,
-            59.30270767211914,   -60.361995697021484, 18.55615234375,
-            -88.03730773925781,  -26.5667724609375,   70.81292724609375,
-            9.105611801147461,   56.66746139526367,   21.78444480895996
+            -5.712825298309326, 1.4681644439697266,     6.143280029296875,
+            9.427258491516113,  2.0522539615631104,     -8.829475402832031,
+            9.143593788146973,  -7.643154144287109,     -2.0325264930725098,
+            6.063992500305176,  4.094968318939209,      0.8910917043685913,
+            8.712732315063477,  -0.0006124831270426512, 5.505736827850342,
+            -9.155109405517578, -9.89109992980957,      1.0480059385299683,
+            -5.925083637237549, 7.741676330566406,      0.700584352016449,
+            -5.662013530731201, 1.3204102516174316,     2.7849292755126953
           ],
           'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
@@ -76,14 +73,14 @@ const layerNormTests = [
       'expectedOutputs': {
         'layerNormOutput': {
           'data': [
-            -1.5257738828659058,  0.997844934463501,   0.017018765211105347,
-            -0.9768186211585999,  1.2984753847122192,  0.18925349414348602,
-            1.0812907218933105,   -0.915019690990448,  0.4270379841327667,
-            -1.6873507499694824,  0.9745554327964783,  0.11948632448911667,
-            -1.5086692571640015,  0.6123882532119751,  0.5316619873046875,
-            1.2018805742263794,   -1.215880036354065,  0.378618448972702,
-            -1.795186161994934,   -0.6376377940177917, 1.1961140632629395,
-            0.034106940031051636, 0.9297415614128113,  0.2728613615036011
+            -1.0228718519210815, 0.11223962903022766, 0.8512431979179382,
+            1.3703473806381226,  0.20456767082214355, -1.5155260562896729,
+            1.3417094945907593,  -1.705802321434021,  -0.6872337460517883,
+            0.7826303243637085,  0.42516833543777466, -0.1564721316099167,
+            1.3518258333206177,  0.09107562154531479, 0.8877996206283569,
+            -1.2335057258605957, -1.3399975299835205, 0.2428021878004074,
+            -1.273769736289978,  1.58700692653656,    0.1131395623087883,
+            -1.2187029123306274, 0.2428838163614273,  0.5494423508644104
           ],
           'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
@@ -647,6 +644,459 @@ const layerNormTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'layerNormalization float16 2D tensor default options',
+    'graph': {
+      'inputs': {
+        'layerNormInput': {
+          'data': [
+            -5.7109375,    1.4677734375,
+            6.14453125,    9.4296875,
+            2.052734375,   -8.828125,
+            9.140625,      -7.64453125,
+            -2.033203125,  6.0625,
+            4.09375,       0.89111328125,
+            8.7109375,     -0.0006122589111328125,
+            5.50390625,    -9.15625,
+            -9.890625,     1.0478515625,
+            -5.92578125,   7.7421875,
+            0.70068359375, -5.66015625,
+            1.3203125,     2.78515625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'layerNormalization',
+        'arguments': [{'input': 'layerNormInput'}],
+        'outputs': 'layerNormOutput'
+      }],
+      'expectedOutputs': {
+        'layerNormOutput': {
+          'data': [
+            -1.0224609375,    0.11199951171875, 0.85107421875,   1.3701171875,
+            0.2044677734375,  -1.515625,        1.341796875,     -1.7060546875,
+            -0.68701171875,   0.78271484375,    0.42529296875,   -0.15625,
+            1.3515625,        0.0911865234375,  0.8876953125,    -1.2333984375,
+            -1.33984375,      0.242919921875,   -1.2744140625,   1.5869140625,
+            0.11309814453125, -1.21875,         0.2427978515625, 0.54931640625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'layerNormalization float16 3D tensor default options',
+    'graph': {
+      'inputs': {
+        'layerNormInput': {
+          'data': [
+            -35.5,    54.75,      19.65625, -15.8828125, 65.5,     25.8125,
+            97.5625,  -8.0546875, 62.9375,  -48.90625,   91.9375,  46.65625,
+            -74.875,  30.125,     26.125,   59.3125,     -60.375,  18.5625,
+            -88.0625, -26.5625,   70.8125,  9.109375,    56.65625, 21.78125
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'layerNormalization',
+        'arguments': [{'input': 'layerNormInput'}],
+        'outputs': 'layerNormOutput'
+      }],
+      'expectedOutputs': {
+        'layerNormOutput': {
+          'data': [
+            -1.4052734375, 0.5400390625,      -0.216552734375, -0.982421875,
+            0.771484375,   -0.08392333984375, 1.462890625,     -0.81396484375,
+            0.71630859375, -1.6943359375,     1.341796875,     0.365234375,
+            -1.5234375,    0.51611328125,     0.4384765625,    1.0830078125,
+            -1.2421875,    0.291748046875,    -1.7802734375,   -0.5849609375,
+            1.306640625,   0.10797119140625,  1.03125,         0.354248046875
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'layerNormalization float16 4D tensor default options',
+    'graph': {
+      'inputs': {
+        'layerNormInput': {
+          'data': [
+            -35.5,    54.75,      19.65625, -15.8828125, 65.5,     25.8125,
+            97.5625,  -8.0546875, 62.9375,  -48.90625,   91.9375,  46.65625,
+            -74.875,  30.125,     26.125,   59.3125,     -60.375,  18.5625,
+            -88.0625, -26.5625,   70.8125,  9.109375,    56.65625, 21.78125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'layerNormalization',
+        'arguments': [{'input': 'layerNormInput'}],
+        'outputs': 'layerNormOutput'
+      }],
+      'expectedOutputs': {
+        'layerNormOutput': {
+          'data': [
+            -1.4052734375, 0.5400390625,      -0.216552734375, -0.982421875,
+            0.771484375,   -0.08392333984375, 1.462890625,     -0.81396484375,
+            0.71630859375, -1.6943359375,     1.341796875,     0.365234375,
+            -1.5234375,    0.51611328125,     0.4384765625,    1.0830078125,
+            -1.2421875,    0.291748046875,    -1.7802734375,   -0.5849609375,
+            1.306640625,   0.10797119140625,  1.03125,         0.354248046875
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'layerNormalization float16 5D tensor default options',
+    'graph': {
+      'inputs': {
+        'layerNormInput': {
+          'data': [
+            -35.5,    54.75,      19.65625, -15.8828125, 65.5,     25.8125,
+            97.5625,  -8.0546875, 62.9375,  -48.90625,   91.9375,  46.65625,
+            -74.875,  30.125,     26.125,   59.3125,     -60.375,  18.5625,
+            -88.0625, -26.5625,   70.8125,  9.109375,    56.65625, 21.78125
+          ],
+          'descriptor': {shape: [2, 1, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'layerNormalization',
+        'arguments': [{'input': 'layerNormInput'}],
+        'outputs': 'layerNormOutput'
+      }],
+      'expectedOutputs': {
+        'layerNormOutput': {
+          'data': [
+            -1.4052734375, 0.5400390625,      -0.216552734375, -0.982421875,
+            0.771484375,   -0.08392333984375, 1.462890625,     -0.81396484375,
+            0.71630859375, -1.6943359375,     1.341796875,     0.365234375,
+            -1.5234375,    0.51611328125,     0.4384765625,    1.0830078125,
+            -1.2421875,    0.291748046875,    -1.7802734375,   -0.5849609375,
+            1.306640625,   0.10797119140625,  1.03125,         0.354248046875
+          ],
+          'descriptor': {shape: [2, 1, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'layerNormalization float16 4D tensor options.scale',
+    'graph': {
+      'inputs': {
+        'layerNormInput': {
+          'data': [
+            -35.5,    54.75,      19.65625, -15.8828125, 65.5,     25.8125,
+            97.5625,  -8.0546875, 62.9375,  -48.90625,   91.9375,  46.65625,
+            -74.875,  30.125,     26.125,   59.3125,     -60.375,  18.5625,
+            -88.0625, -26.5625,   70.8125,  9.109375,    56.65625, 21.78125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        },
+        'layerNormScale': {
+          'data': [
+            -3.822265625, -5.453125, 0.677734375, -4.02734375, -3.77734375,
+            -9.328125, 7.18359375, 1.505859375, 3.12109375, 0.521484375,
+            2.671875, -3.572265625
+          ],
+          'descriptor': {shape: [1, 4, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'layerNormalization',
+        'arguments': [
+          {'input': 'layerNormInput'}, {'options': {'scale': 'layerNormScale'}}
+        ],
+        'outputs': 'layerNormOutput'
+      }],
+      'expectedOutputs': {
+        'layerNormOutput': {
+          'data': [
+            5.37109375,  -2.943359375,      -0.1468505859375, 3.95703125,
+            -2.9140625,  0.78271484375,     10.5078125,       -1.2255859375,
+            2.236328125, -0.8837890625,     3.583984375,      -1.3046875,
+            5.82421875,  -2.814453125,      0.297119140625,   -4.36328125,
+            4.69140625,  -2.720703125,      -12.7890625,      -0.880859375,
+            4.078125,    0.056304931640625, 2.755859375,      -1.265625
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'layerNormalization float16 4D tensor options.bias',
+    'graph': {
+      'inputs': {
+        'layerNormInput': {
+          'data': [
+            -35.5,    54.75,      19.65625, -15.8828125, 65.5,     25.8125,
+            97.5625,  -8.0546875, 62.9375,  -48.90625,   91.9375,  46.65625,
+            -74.875,  30.125,     26.125,   59.3125,     -60.375,  18.5625,
+            -88.0625, -26.5625,   70.8125,  9.109375,    56.65625, 21.78125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        },
+        'layerNormBias': {
+          'data': [
+            7.86328125, -3.66015625, -6.95703125, -6.3984375, 3.26953125, -2.75,
+            -4.08203125, -7.13671875, 8.46875, 2.76171875, 0.8232421875,
+            -3.828125
+          ],
+          'descriptor': {shape: [1, 4, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'layerNormalization',
+        'arguments': [
+          {'input': 'layerNormInput'}, {'options': {'bias': 'layerNormBias'}}
+        ],
+        'outputs': 'layerNormOutput'
+      }],
+      'expectedOutputs': {
+        'layerNormOutput': {
+          'data': [
+            6.45703125,   -3.12109375,  -7.171875,    -7.3828125,  4.04296875,
+            -2.833984375, -2.619140625, -7.94921875,  9.1875,      1.0673828125,
+            2.1640625,    -3.462890625, 6.33984375,   -3.14453125, -6.51953125,
+            -5.31640625,  2.02734375,   -2.458984375, -5.86328125, -7.72265625,
+            9.7734375,    2.869140625,  1.8544921875, -3.474609375
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'layerNormalization float16 4D tensor options.axes=[2]',
+    'graph': {
+      'inputs': {
+        'layerNormInput': {
+          'data': [
+            -35.5,    54.75,      19.65625, -15.8828125, 65.5,     25.8125,
+            97.5625,  -8.0546875, 62.9375,  -48.90625,   91.9375,  46.65625,
+            -74.875,  30.125,     26.125,   59.3125,     -60.375,  18.5625,
+            -88.0625, -26.5625,   70.8125,  9.109375,    56.65625, 21.78125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'layerNormalization',
+        'arguments': [{'input': 'layerNormInput'}, {'options': {'axes': [2]}}],
+        'outputs': 'layerNormOutput'
+      }],
+      'expectedOutputs': {
+        'layerNormOutput': {
+          'data': [
+            -0.60107421875, 0.10125732421875, -1.11328125,   -0.262451171875,
+            0.394287109375, -0.75439453125,   1.6962890625,  -1.6103515625,
+            1.4072265625,   -0.83251953125,   1.1142578125,  0.45947265625,
+            -0.8447265625,  0.65576171875,    -0.3857421875, 1.3671875,
+            -1.3115234375,  -0.74169921875,   -1.0615234375, -0.57666015625,
+            1.7177734375,   0.53955078125,    1.232421875,   -0.59033203125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'layerNormalization float16 4D tensor options.epsilon',
+    'graph': {
+      'inputs': {
+        'layerNormInput': {
+          'data': [
+            -35.5,    54.75,      19.65625, -15.8828125, 65.5,     25.8125,
+            97.5625,  -8.0546875, 62.9375,  -48.90625,   91.9375,  46.65625,
+            -74.875,  30.125,     26.125,   59.3125,     -60.375,  18.5625,
+            -88.0625, -26.5625,   70.8125,  9.109375,    56.65625, 21.78125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'layerNormalization',
+        'arguments':
+            [{'input': 'layerNormInput'}, {'options': {'epsilon': 0.0001}}],
+        'outputs': 'layerNormOutput'
+      }],
+      'expectedOutputs': {
+        'layerNormOutput': {
+          'data': [
+            -1.4052734375, 0.5400390625,      -0.216552734375, -0.982421875,
+            0.771484375,   -0.08392333984375, 1.462890625,     -0.81396484375,
+            0.71630859375, -1.6943359375,     1.341796875,     0.365234375,
+            -1.5234375,    0.51611328125,     0.4384765625,    1.0830078125,
+            -1.2421875,    0.291748046875,    -1.7802734375,   -0.5849609375,
+            1.306640625,   0.10797119140625,  1.03125,         0.354248046875
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'layerNormalization float16 4D tensor options.scale and options.axes=[0, 2]',
+    'graph': {
+      'inputs': {
+        'layerNormInput': {
+          'data': [
+            -35.5,    54.75,      19.65625, -15.8828125, 65.5,     25.8125,
+            97.5625,  -8.0546875, 62.9375,  -48.90625,   91.9375,  46.65625,
+            -74.875,  30.125,     26.125,   59.3125,     -60.375,  18.5625,
+            -88.0625, -26.5625,   70.8125,  9.109375,    56.65625, 21.78125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        },
+        'layerNormScale': {
+          'data': [
+            8.7265625, -5.38671875, -6.8125, 4.70703125, -4.70703125,
+            -5.14453125, -1.111328125, 5.25
+          ],
+          'descriptor': {shape: [2, 4], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'layerNormalization',
+        'arguments': [
+          {'input': 'layerNormInput'},
+          {'options': {'scale': 'layerNormScale', 'axes': [0, 2]}}
+        ],
+        'outputs': 'layerNormOutput'
+      }],
+      'expectedOutputs': {
+        'layerNormOutput': {
+          'data': [
+            -3.37109375,  5.2265625,       -7.58203125, 0.332275390625,
+            -4.4140625,   2.97265625,      -12.375,     4.6796875,
+            -9.25,        -2.86328125,     6.40625,     2.44921875,
+            4.88671875,   -0.446044921875, 2.5234375,   -6.0859375,
+            9.046875,     4.7578125,       1.396484375, 1.1845703125,
+            -1.958984375, 1.84765625,      3.349609375, -3.986328125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'layerNormalization float16 4D tensor options.bias and options.axes=[3, 1, 2]',
+    'graph': {
+      'inputs': {
+        'layerNormInput': {
+          'data': [
+            -35.5,    54.75,      19.65625, -15.8828125, 65.5,     25.8125,
+            97.5625,  -8.0546875, 62.9375,  -48.90625,   91.9375,  46.65625,
+            -74.875,  30.125,     26.125,   59.3125,     -60.375,  18.5625,
+            -88.0625, -26.5625,   70.8125,  9.109375,    56.65625, 21.78125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        },
+        'layerNormBias': {
+          'data': [
+            -0.1396484375, -6.15625, 4.36328125, 8.859375, 9.7734375,
+            -3.462890625, 9.7421875, -0.39599609375, -8.5, 6.171875,
+            -2.892578125, 1.7216796875
+          ],
+          'descriptor': {shape: [3, 1, 4], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'layerNormalization',
+        'arguments': [
+          {'input': 'layerNormInput'},
+          {'options': {'bias': 'layerNormBias', 'axes': [3, 1, 2]}}
+        ],
+        'outputs': 'layerNormOutput'
+      }],
+      'expectedOutputs': {
+        'layerNormOutput': {
+          'data': [
+            -1.544921875, 10.3125,     -8.71875,      -7.140625,   -2.69140625,
+            6.08984375,   5.82421875,  8.9296875,     -2.17578125, 7.1640625,
+            0.9453125,    2.087890625, -1.6630859375, 10.2890625,  -8.0625,
+            -5.07421875,  -4.703125,   6.46484375,    2.583984375, 9.15625,
+            -1.5859375,   8.96875,     0.6357421875,  2.076171875
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'layerNormalization float16 4D tensor all options',
+    'graph': {
+      'inputs': {
+        'layerNormInput': {
+          'data': [
+            -35.5,    54.75,      19.65625, -15.8828125, 65.5,     25.8125,
+            97.5625,  -8.0546875, 62.9375,  -48.90625,   91.9375,  46.65625,
+            -74.875,  30.125,     26.125,   59.3125,     -60.375,  18.5625,
+            -88.0625, -26.5625,   70.8125,  9.109375,    56.65625, 21.78125
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        },
+        'layerNormScale': {
+          'data': [
+            7.71484375, 1.7373046875, 9.140625, 5.7578125, -2.8203125,
+            -0.6865234375
+          ],
+          'descriptor': {shape: [2, 3, 1], dataType: 'float16'},
+          'constant': true
+        },
+        'layerNormBias': {
+          'data': [
+            -8.7109375, -7.64453125, 4.9375, -2.1875, -4.06640625, -6.8359375
+          ],
+          'descriptor': {shape: [2, 3, 1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'layerNormalization',
+        'arguments': [
+          {'input': 'layerNormInput'}, {
+            'options': {
+              'scale': 'layerNormScale',
+              'bias': 'layerNormBias',
+              'axes': [0, 3, 1],
+              'epsilon': 0.0001
+            }
+          }
+        ],
+        'outputs': 'layerNormOutput'
+      }],
+      'expectedOutputs': {
+        'layerNormOutput': {
+          'data': [
+            -15.484375,  -5.62890625,   8.296875,    -14.296875,  -5.640625,
+            7.11328125,  0.775390625,   -8.3515625,  11.28125,    -22.5,
+            -5.17578125, 8.5,           -12.359375,  -5.76953125, -7.1875,
+            3.6328125,   0.86865234375, -6.8828125,  -11.6484375, -2.1171875,
+            -7.39453125, -4.8671875,    -5.80859375, -6.71484375
+          ],
+          'descriptor': {shape: [2, 1, 4, 3], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/leaky_relu.https.any.js b/tests/wpt/tests/webnn/conformance_tests/leaky_relu.https.any.js
index fe950c0ed4d..03c8985c6c6 100644
--- a/tests/wpt/tests/webnn/conformance_tests/leaky_relu.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/leaky_relu.https.any.js
@@ -425,6 +425,452 @@ const leakyReluTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'leakyRelu float16 1D constant tensor default options',
+    'graph': {
+      'inputs': {
+        'leakyReluInput': {
+          'data': [
+            -19.046875,   50.78125,   -69.5625,     -80.5625,  -90.375,
+            76,           66.3125,    -84.125,      -17.1875,  -87.5,
+            -3.416015625, -22.765625, -2.509765625, 18.9375,   98.625,
+            55.34375,     -33.1875,   -46.03125,    -61.46875, 64.25,
+            21.46875,     -31.515625, -41.28125,    -65.625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'leakyRelu',
+        'arguments': [{'input': 'leakyReluInput'}],
+        'outputs': 'leakyReluOutput'
+      }],
+      'expectedOutputs': {
+        'leakyReluOutput': {
+          'data': [
+            -0.1904296875,
+            50.78125,
+            -0.69580078125,
+            -0.8056640625,
+            -0.90380859375,
+            76,
+            66.3125,
+            -0.84130859375,
+            -0.171875,
+            -0.875,
+            -0.034149169921875,
+            -0.2276611328125,
+            -0.0251007080078125,
+            18.9375,
+            98.625,
+            55.34375,
+            -0.331787109375,
+            -0.460205078125,
+            -0.61474609375,
+            64.25,
+            21.46875,
+            -0.315185546875,
+            -0.412841796875,
+            -0.65625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'leakyRelu float16 0D tensor default options',
+    'graph': {
+      'inputs': {
+        'leakyReluInput': {
+          'data': [-19.046875],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'leakyRelu',
+        'arguments': [{'input': 'leakyReluInput'}],
+        'outputs': 'leakyReluOutput'
+      }],
+      'expectedOutputs': {
+        'leakyReluOutput': {
+          'data': [-0.1904296875],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'leakyRelu float16 1D tensor default options',
+    'graph': {
+      'inputs': {
+        'leakyReluInput': {
+          'data': [
+            -19.046875,   50.78125,   -69.5625,     -80.5625,  -90.375,
+            76,           66.3125,    -84.125,      -17.1875,  -87.5,
+            -3.416015625, -22.765625, -2.509765625, 18.9375,   98.625,
+            55.34375,     -33.1875,   -46.03125,    -61.46875, 64.25,
+            21.46875,     -31.515625, -41.28125,    -65.625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'leakyRelu',
+        'arguments': [{'input': 'leakyReluInput'}],
+        'outputs': 'leakyReluOutput'
+      }],
+      'expectedOutputs': {
+        'leakyReluOutput': {
+          'data': [
+            -0.1904296875,
+            50.78125,
+            -0.69580078125,
+            -0.8056640625,
+            -0.90380859375,
+            76,
+            66.3125,
+            -0.84130859375,
+            -0.171875,
+            -0.875,
+            -0.034149169921875,
+            -0.2276611328125,
+            -0.0251007080078125,
+            18.9375,
+            98.625,
+            55.34375,
+            -0.331787109375,
+            -0.460205078125,
+            -0.61474609375,
+            64.25,
+            21.46875,
+            -0.315185546875,
+            -0.412841796875,
+            -0.65625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'leakyRelu float16 2D tensor default options',
+    'graph': {
+      'inputs': {
+        'leakyReluInput': {
+          'data': [
+            -19.046875,   50.78125,   -69.5625,     -80.5625,  -90.375,
+            76,           66.3125,    -84.125,      -17.1875,  -87.5,
+            -3.416015625, -22.765625, -2.509765625, 18.9375,   98.625,
+            55.34375,     -33.1875,   -46.03125,    -61.46875, 64.25,
+            21.46875,     -31.515625, -41.28125,    -65.625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'leakyRelu',
+        'arguments': [{'input': 'leakyReluInput'}],
+        'outputs': 'leakyReluOutput'
+      }],
+      'expectedOutputs': {
+        'leakyReluOutput': {
+          'data': [
+            -0.1904296875,
+            50.78125,
+            -0.69580078125,
+            -0.8056640625,
+            -0.90380859375,
+            76,
+            66.3125,
+            -0.84130859375,
+            -0.171875,
+            -0.875,
+            -0.034149169921875,
+            -0.2276611328125,
+            -0.0251007080078125,
+            18.9375,
+            98.625,
+            55.34375,
+            -0.331787109375,
+            -0.460205078125,
+            -0.61474609375,
+            64.25,
+            21.46875,
+            -0.315185546875,
+            -0.412841796875,
+            -0.65625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'leakyRelu float16 3D tensor default options',
+    'graph': {
+      'inputs': {
+        'leakyReluInput': {
+          'data': [
+            -19.046875,   50.78125,   -69.5625,     -80.5625,  -90.375,
+            76,           66.3125,    -84.125,      -17.1875,  -87.5,
+            -3.416015625, -22.765625, -2.509765625, 18.9375,   98.625,
+            55.34375,     -33.1875,   -46.03125,    -61.46875, 64.25,
+            21.46875,     -31.515625, -41.28125,    -65.625
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'leakyRelu',
+        'arguments': [{'input': 'leakyReluInput'}],
+        'outputs': 'leakyReluOutput'
+      }],
+      'expectedOutputs': {
+        'leakyReluOutput': {
+          'data': [
+            -0.1904296875,
+            50.78125,
+            -0.69580078125,
+            -0.8056640625,
+            -0.90380859375,
+            76,
+            66.3125,
+            -0.84130859375,
+            -0.171875,
+            -0.875,
+            -0.034149169921875,
+            -0.2276611328125,
+            -0.0251007080078125,
+            18.9375,
+            98.625,
+            55.34375,
+            -0.331787109375,
+            -0.460205078125,
+            -0.61474609375,
+            64.25,
+            21.46875,
+            -0.315185546875,
+            -0.412841796875,
+            -0.65625
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'leakyRelu float16 4D tensor default options',
+    'graph': {
+      'inputs': {
+        'leakyReluInput': {
+          'data': [
+            -19.046875,   50.78125,   -69.5625,     -80.5625,  -90.375,
+            76,           66.3125,    -84.125,      -17.1875,  -87.5,
+            -3.416015625, -22.765625, -2.509765625, 18.9375,   98.625,
+            55.34375,     -33.1875,   -46.03125,    -61.46875, 64.25,
+            21.46875,     -31.515625, -41.28125,    -65.625
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'leakyRelu',
+        'arguments': [{'input': 'leakyReluInput'}],
+        'outputs': 'leakyReluOutput'
+      }],
+      'expectedOutputs': {
+        'leakyReluOutput': {
+          'data': [
+            -0.1904296875,
+            50.78125,
+            -0.69580078125,
+            -0.8056640625,
+            -0.90380859375,
+            76,
+            66.3125,
+            -0.84130859375,
+            -0.171875,
+            -0.875,
+            -0.034149169921875,
+            -0.2276611328125,
+            -0.0251007080078125,
+            18.9375,
+            98.625,
+            55.34375,
+            -0.331787109375,
+            -0.460205078125,
+            -0.61474609375,
+            64.25,
+            21.46875,
+            -0.315185546875,
+            -0.412841796875,
+            -0.65625
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'leakyRelu float16 5D tensor default options',
+    'graph': {
+      'inputs': {
+        'leakyReluInput': {
+          'data': [
+            -19.046875,   50.78125,   -69.5625,     -80.5625,  -90.375,
+            76,           66.3125,    -84.125,      -17.1875,  -87.5,
+            -3.416015625, -22.765625, -2.509765625, 18.9375,   98.625,
+            55.34375,     -33.1875,   -46.03125,    -61.46875, 64.25,
+            21.46875,     -31.515625, -41.28125,    -65.625
+          ],
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'leakyRelu',
+        'arguments': [{'input': 'leakyReluInput'}],
+        'outputs': 'leakyReluOutput'
+      }],
+      'expectedOutputs': {
+        'leakyReluOutput': {
+          'data': [
+            -0.1904296875,
+            50.78125,
+            -0.69580078125,
+            -0.8056640625,
+            -0.90380859375,
+            76,
+            66.3125,
+            -0.84130859375,
+            -0.171875,
+            -0.875,
+            -0.034149169921875,
+            -0.2276611328125,
+            -0.0251007080078125,
+            18.9375,
+            98.625,
+            55.34375,
+            -0.331787109375,
+            -0.460205078125,
+            -0.61474609375,
+            64.25,
+            21.46875,
+            -0.315185546875,
+            -0.412841796875,
+            -0.65625
+          ],
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'leakyRelu float16 1D tensor negative options.alpha',
+    'graph': {
+      'inputs': {
+        'leakyReluInput': {
+          'data': [
+            -19.046875,   50.78125,   -69.5625,     -80.5625,  -90.375,
+            76,           66.3125,    -84.125,      -17.1875,  -87.5,
+            -3.416015625, -22.765625, -2.509765625, 18.9375,   98.625,
+            55.34375,     -33.1875,   -46.03125,    -61.46875, 64.25,
+            21.46875,     -31.515625, -41.28125,    -65.625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'leakyRelu',
+        'arguments': [
+          {'input': 'leakyReluInput'},
+          {'options': {'alpha': -97.70109193608776}}
+        ],
+        'outputs': 'leakyReluOutput'
+      }],
+      'expectedOutputs': {
+        'leakyReluOutput': {
+          'data': [
+            1861, 50.78125, 6796,   7872,  8832,     76,      66.3125, 8216,
+            1679, 8552,     333.75, 2224,  245.25,   18.9375, 98.625,  55.34375,
+            3242, 4496,     6004,   64.25, 21.46875, 3080,    4034,    6412
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'leakyRelu float16 2D tensor positive options.alpha',
+    'graph': {
+      'inputs': {
+        'leakyReluInput': {
+          'data': [
+            -19.046875,   50.78125,   -69.5625,     -80.5625,  -90.375,
+            76,           66.3125,    -84.125,      -17.1875,  -87.5,
+            -3.416015625, -22.765625, -2.509765625, 18.9375,   98.625,
+            55.34375,     -33.1875,   -46.03125,    -61.46875, 64.25,
+            21.46875,     -31.515625, -41.28125,    -65.625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'leakyRelu',
+        'arguments': [
+          {'input': 'leakyReluInput'},
+          {'options': {'alpha': 35.799162942273234}}
+        ],
+        'outputs': 'leakyReluOutput'
+      }],
+      'expectedOutputs': {
+        'leakyReluOutput': {
+          'data': [
+            -682,    50.78125, -2490,    -2884,    -3236,     76,
+            66.3125, -3012,    -615.5,   -3132,    -122.3125, -815,
+            -89.875, 18.9375,  98.625,   55.34375, -1188,     -1648,
+            -2200,   64.25,    21.46875, -1128,    -1478,     -2350
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'leakyRelu float16 5D tensor options.alpha=0.0',
+    'graph': {
+      'inputs': {
+        'leakyReluInput': {
+          'data': [
+            -19.046875,   50.78125,   -69.5625,     -80.5625,  -90.375,
+            76,           66.3125,    -84.125,      -17.1875,  -87.5,
+            -3.416015625, -22.765625, -2.509765625, 18.9375,   98.625,
+            55.34375,     -33.1875,   -46.03125,    -61.46875, 64.25,
+            21.46875,     -31.515625, -41.28125,    -65.625
+          ],
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'leakyRelu',
+        'arguments': [{'input': 'leakyReluInput'}, {'options': {'alpha': 0}}],
+        'outputs': 'leakyReluOutput'
+      }],
+      'expectedOutputs': {
+        'leakyReluOutput': {
+          'data': [
+            0, 50.78125, 0, 0,     0,        76,      66.3125, 0,
+            0, 0,        0, 0,     0,        18.9375, 98.625,  55.34375,
+            0, 0,        0, 64.25, 21.46875, 0,       0,       0
+          ],
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/log.https.any.js b/tests/wpt/tests/webnn/conformance_tests/log.https.any.js
index 011beef53ac..8ed807b3401 100644
--- a/tests/wpt/tests/webnn/conformance_tests/log.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/log.https.any.js
@@ -14,11 +14,8 @@
 // MLOperand log(MLOperand input);
 
 
-const getLogPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 1 / 1024, float16: 1 / 1024};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ATOL', value: toleranceValueDict[expectedDataType]};
+const getLogPrecisionTolerance = () => {
+  return {metricType: 'ULP', value: 8};
 };
 
 const logTests = [
diff --git a/tests/wpt/tests/webnn/conformance_tests/max.https.any.js b/tests/wpt/tests/webnn/conformance_tests/max.https.any.js
index 9685572bcd7..2da14e1545a 100644
--- a/tests/wpt/tests/webnn/conformance_tests/max.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/max.https.any.js
@@ -522,6 +522,409 @@ const maxTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'max float16 1D constant tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.734375, 88.125,     -12.796875, 11.8203125, 19.515625, -62.875,
+            50.78125,  -56.90625,  50.5625,    -96,        50.21875,  20.59375,
+            -60.6875,  -96.8125,   57.25,      -56.28125,  73.6875,   21.34375,
+            79.875,    -22.921875, 1.23046875, 65.6875,    99.875,    -62.3125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        },
+        'inputB': {
+          'data': [
+            -34.5,          85.75,   25.8125,     -91.375,    87,
+            0.177490234375, 74.875,  -4.16796875, -73.75,     55.375,
+            -58.6875,       -67.625, -89.8125,    -8.2734375, 97.625,
+            -48.96875,      95.375,  -97.375,     -59.90625,  97.125,
+            -40.21875,      -61.5,   33.375,      12.6953125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'max',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            17.734375,      88.125,   25.8125,     11.8203125, 87,
+            0.177490234375, 74.875,   -4.16796875, 50.5625,    55.375,
+            50.21875,       20.59375, -60.6875,    -8.2734375, 97.625,
+            -48.96875,      95.375,   21.34375,    79.875,     97.125,
+            1.23046875,     65.6875,  99.875,      12.6953125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'max float16 1D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.734375, 88.125,     -12.796875, 11.8203125, 19.515625, -62.875,
+            50.78125,  -56.90625,  50.5625,    -96,        50.21875,  20.59375,
+            -60.6875,  -96.8125,   57.25,      -56.28125,  73.6875,   21.34375,
+            79.875,    -22.921875, 1.23046875, 65.6875,    99.875,    -62.3125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -34.5,          85.75,   25.8125,     -91.375,    87,
+            0.177490234375, 74.875,  -4.16796875, -73.75,     55.375,
+            -58.6875,       -67.625, -89.8125,    -8.2734375, 97.625,
+            -48.96875,      95.375,  -97.375,     -59.90625,  97.125,
+            -40.21875,      -61.5,   33.375,      12.6953125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'max',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            17.734375,      88.125,   25.8125,     11.8203125, 87,
+            0.177490234375, 74.875,   -4.16796875, 50.5625,    55.375,
+            50.21875,       20.59375, -60.6875,    -8.2734375, 97.625,
+            -48.96875,      95.375,   21.34375,    79.875,     97.125,
+            1.23046875,     65.6875,  99.875,      12.6953125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'max float16 2D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.734375, 88.125,     -12.796875, 11.8203125, 19.515625, -62.875,
+            50.78125,  -56.90625,  50.5625,    -96,        50.21875,  20.59375,
+            -60.6875,  -96.8125,   57.25,      -56.28125,  73.6875,   21.34375,
+            79.875,    -22.921875, 1.23046875, 65.6875,    99.875,    -62.3125
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -34.5,          85.75,   25.8125,     -91.375,    87,
+            0.177490234375, 74.875,  -4.16796875, -73.75,     55.375,
+            -58.6875,       -67.625, -89.8125,    -8.2734375, 97.625,
+            -48.96875,      95.375,  -97.375,     -59.90625,  97.125,
+            -40.21875,      -61.5,   33.375,      12.6953125
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'max',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            17.734375,      88.125,   25.8125,     11.8203125, 87,
+            0.177490234375, 74.875,   -4.16796875, 50.5625,    55.375,
+            50.21875,       20.59375, -60.6875,    -8.2734375, 97.625,
+            -48.96875,      95.375,   21.34375,    79.875,     97.125,
+            1.23046875,     65.6875,  99.875,      12.6953125
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'max float16 3D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.734375, 88.125,     -12.796875, 11.8203125, 19.515625, -62.875,
+            50.78125,  -56.90625,  50.5625,    -96,        50.21875,  20.59375,
+            -60.6875,  -96.8125,   57.25,      -56.28125,  73.6875,   21.34375,
+            79.875,    -22.921875, 1.23046875, 65.6875,    99.875,    -62.3125
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -34.5,          85.75,   25.8125,     -91.375,    87,
+            0.177490234375, 74.875,  -4.16796875, -73.75,     55.375,
+            -58.6875,       -67.625, -89.8125,    -8.2734375, 97.625,
+            -48.96875,      95.375,  -97.375,     -59.90625,  97.125,
+            -40.21875,      -61.5,   33.375,      12.6953125
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'max',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            17.734375,      88.125,   25.8125,     11.8203125, 87,
+            0.177490234375, 74.875,   -4.16796875, 50.5625,    55.375,
+            50.21875,       20.59375, -60.6875,    -8.2734375, 97.625,
+            -48.96875,      95.375,   21.34375,    79.875,     97.125,
+            1.23046875,     65.6875,  99.875,      12.6953125
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'max float16 4D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.734375, 88.125,     -12.796875, 11.8203125, 19.515625, -62.875,
+            50.78125,  -56.90625,  50.5625,    -96,        50.21875,  20.59375,
+            -60.6875,  -96.8125,   57.25,      -56.28125,  73.6875,   21.34375,
+            79.875,    -22.921875, 1.23046875, 65.6875,    99.875,    -62.3125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -34.5,          85.75,   25.8125,     -91.375,    87,
+            0.177490234375, 74.875,  -4.16796875, -73.75,     55.375,
+            -58.6875,       -67.625, -89.8125,    -8.2734375, 97.625,
+            -48.96875,      95.375,  -97.375,     -59.90625,  97.125,
+            -40.21875,      -61.5,   33.375,      12.6953125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'max',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            17.734375,      88.125,   25.8125,     11.8203125, 87,
+            0.177490234375, 74.875,   -4.16796875, 50.5625,    55.375,
+            50.21875,       20.59375, -60.6875,    -8.2734375, 97.625,
+            -48.96875,      95.375,   21.34375,    79.875,     97.125,
+            1.23046875,     65.6875,  99.875,      12.6953125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'max float16 5D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.734375, 88.125,     -12.796875, 11.8203125, 19.515625, -62.875,
+            50.78125,  -56.90625,  50.5625,    -96,        50.21875,  20.59375,
+            -60.6875,  -96.8125,   57.25,      -56.28125,  73.6875,   21.34375,
+            79.875,    -22.921875, 1.23046875, 65.6875,    99.875,    -62.3125
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -34.5,          85.75,   25.8125,     -91.375,    87,
+            0.177490234375, 74.875,  -4.16796875, -73.75,     55.375,
+            -58.6875,       -67.625, -89.8125,    -8.2734375, 97.625,
+            -48.96875,      95.375,  -97.375,     -59.90625,  97.125,
+            -40.21875,      -61.5,   33.375,      12.6953125
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'max',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            17.734375,      88.125,   25.8125,     11.8203125, 87,
+            0.177490234375, 74.875,   -4.16796875, 50.5625,    55.375,
+            50.21875,       20.59375, -60.6875,    -8.2734375, 97.625,
+            -48.96875,      95.375,   21.34375,    79.875,     97.125,
+            1.23046875,     65.6875,  99.875,      12.6953125
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'max float16 broadcast 1D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA':
+            {'data': [48.25], 'descriptor': {shape: [1], dataType: 'float16'}},
+        'inputB': {
+          'data': [
+            17.734375, 88.125,     -12.796875, 11.8203125, 19.515625, -62.875,
+            50.78125,  -56.90625,  50.5625,    -96,        50.21875,  20.59375,
+            -60.6875,  -96.8125,   57.25,      -56.28125,  73.6875,   21.34375,
+            79.875,    -22.921875, 1.23046875, 65.6875,    99.875,    -62.3125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'max',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            48.25,   88.125, 48.25,    48.25, 48.25, 48.25,   50.78125, 48.25,
+            50.5625, 48.25,  50.21875, 48.25, 48.25, 48.25,   57.25,    48.25,
+            73.6875, 48.25,  79.875,   48.25, 48.25, 65.6875, 99.875,   48.25
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'max float16 broadcast 2D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.734375, 88.125,     -12.796875, 11.8203125, 19.515625, -62.875,
+            50.78125,  -56.90625,  50.5625,    -96,        50.21875,  20.59375,
+            -60.6875,  -96.8125,   57.25,      -56.28125,  73.6875,   21.34375,
+            79.875,    -22.921875, 1.23046875, 65.6875,    99.875,    -62.3125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data':
+              [49.53125, -61.5625, -6.56640625, 93.3125, 3.310546875, -98.3125],
+          'descriptor': {shape: [2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'max',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            49.53125, 88.125,     -6.56640625, 93.3125, 19.515625, -62.875,
+            50.78125, -56.90625,  50.5625,     93.3125, 50.21875,  20.59375,
+            49.53125, -61.5625,   57.25,       93.3125, 73.6875,   21.34375,
+            79.875,   -22.921875, 1.23046875,  93.3125, 99.875,    -62.3125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'max float16 broadcast 3D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.734375, 88.125,     -12.796875, 11.8203125, 19.515625, -62.875,
+            50.78125,  -56.90625,  50.5625,    -96,        50.21875,  20.59375,
+            -60.6875,  -96.8125,   57.25,      -56.28125,  73.6875,   21.34375,
+            79.875,    -22.921875, 1.23046875, 65.6875,    99.875,    -62.3125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [39.3125, 44.53125, 58.03125, 84.125],
+          'descriptor': {shape: [2, 2, 1], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'max',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            39.3125,  88.125,   39.3125,  44.53125, 44.53125, 44.53125,
+            58.03125, 58.03125, 58.03125, 84.125,   84.125,   84.125,
+            39.3125,  39.3125,  57.25,    44.53125, 73.6875,  44.53125,
+            79.875,   58.03125, 58.03125, 84.125,   99.875,   84.125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'max float16 broadcast 4D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [48.25],
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            17.734375, 88.125,     -12.796875, 11.8203125, 19.515625, -62.875,
+            50.78125,  -56.90625,  50.5625,    -96,        50.21875,  20.59375,
+            -60.6875,  -96.8125,   57.25,      -56.28125,  73.6875,   21.34375,
+            79.875,    -22.921875, 1.23046875, 65.6875,    99.875,    -62.3125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'max',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            48.25,   88.125, 48.25,    48.25, 48.25, 48.25,   50.78125, 48.25,
+            50.5625, 48.25,  50.21875, 48.25, 48.25, 48.25,   57.25,    48.25,
+            73.6875, 48.25,  79.875,   48.25, 48.25, 65.6875, 99.875,   48.25
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/min.https.any.js b/tests/wpt/tests/webnn/conformance_tests/min.https.any.js
index e843b003a0b..5e324e412bf 100644
--- a/tests/wpt/tests/webnn/conformance_tests/min.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/min.https.any.js
@@ -522,6 +522,419 @@ const minTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'min float16 1D constant tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -36.0625,   -38.21875, 62.0625,    -16.609375,      66,
+            -17.765625, -76,       -69.5625,   53.59375,        -39.09375,
+            96.9375,    -40.40625, 74.125,     0.0328369140625, 38.8125,
+            -17.71875,  17.390625, -82.3125,   -80.5,           -31.390625,
+            -73.25,     -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        },
+        'inputB': {
+          'data': [
+            -40.09375, 86.25,      51.28125,   -57.65625, -97.5625, -28.875,
+            80.5,      46.65625,   62.8125,    49.8125,   -76.5,    84.625,
+            50.46875,  -18.015625, 5.19921875, -47.8125,  46.4375,  -71.25,
+            -69.875,   40.6875,    -18.703125, 20.15625,  41.9375,  23.484375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'min',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -40.09375, -38.21875, 51.28125,   -57.65625,  -97.5625,
+            -28.875,   -76,       -69.5625,   53.59375,   -39.09375,
+            -76.5,     -40.40625, 50.46875,   -18.015625, 5.19921875,
+            -47.8125,  17.390625, -82.3125,   -80.5,      -31.390625,
+            -73.25,    -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'min float16 1D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -36.0625,   -38.21875, 62.0625,    -16.609375,      66,
+            -17.765625, -76,       -69.5625,   53.59375,        -39.09375,
+            96.9375,    -40.40625, 74.125,     0.0328369140625, 38.8125,
+            -17.71875,  17.390625, -82.3125,   -80.5,           -31.390625,
+            -73.25,     -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -40.09375, 86.25,      51.28125,   -57.65625, -97.5625, -28.875,
+            80.5,      46.65625,   62.8125,    49.8125,   -76.5,    84.625,
+            50.46875,  -18.015625, 5.19921875, -47.8125,  46.4375,  -71.25,
+            -69.875,   40.6875,    -18.703125, 20.15625,  41.9375,  23.484375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'min',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -40.09375, -38.21875, 51.28125,   -57.65625,  -97.5625,
+            -28.875,   -76,       -69.5625,   53.59375,   -39.09375,
+            -76.5,     -40.40625, 50.46875,   -18.015625, 5.19921875,
+            -47.8125,  17.390625, -82.3125,   -80.5,      -31.390625,
+            -73.25,    -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'min float16 2D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -36.0625,   -38.21875, 62.0625,    -16.609375,      66,
+            -17.765625, -76,       -69.5625,   53.59375,        -39.09375,
+            96.9375,    -40.40625, 74.125,     0.0328369140625, 38.8125,
+            -17.71875,  17.390625, -82.3125,   -80.5,           -31.390625,
+            -73.25,     -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -40.09375, 86.25,      51.28125,   -57.65625, -97.5625, -28.875,
+            80.5,      46.65625,   62.8125,    49.8125,   -76.5,    84.625,
+            50.46875,  -18.015625, 5.19921875, -47.8125,  46.4375,  -71.25,
+            -69.875,   40.6875,    -18.703125, 20.15625,  41.9375,  23.484375
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'min',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -40.09375, -38.21875, 51.28125,   -57.65625,  -97.5625,
+            -28.875,   -76,       -69.5625,   53.59375,   -39.09375,
+            -76.5,     -40.40625, 50.46875,   -18.015625, 5.19921875,
+            -47.8125,  17.390625, -82.3125,   -80.5,      -31.390625,
+            -73.25,    -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'min float16 3D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -36.0625,   -38.21875, 62.0625,    -16.609375,      66,
+            -17.765625, -76,       -69.5625,   53.59375,        -39.09375,
+            96.9375,    -40.40625, 74.125,     0.0328369140625, 38.8125,
+            -17.71875,  17.390625, -82.3125,   -80.5,           -31.390625,
+            -73.25,     -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -40.09375, 86.25,      51.28125,   -57.65625, -97.5625, -28.875,
+            80.5,      46.65625,   62.8125,    49.8125,   -76.5,    84.625,
+            50.46875,  -18.015625, 5.19921875, -47.8125,  46.4375,  -71.25,
+            -69.875,   40.6875,    -18.703125, 20.15625,  41.9375,  23.484375
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'min',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -40.09375, -38.21875, 51.28125,   -57.65625,  -97.5625,
+            -28.875,   -76,       -69.5625,   53.59375,   -39.09375,
+            -76.5,     -40.40625, 50.46875,   -18.015625, 5.19921875,
+            -47.8125,  17.390625, -82.3125,   -80.5,      -31.390625,
+            -73.25,    -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'min float16 4D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -36.0625,   -38.21875, 62.0625,    -16.609375,      66,
+            -17.765625, -76,       -69.5625,   53.59375,        -39.09375,
+            96.9375,    -40.40625, 74.125,     0.0328369140625, 38.8125,
+            -17.71875,  17.390625, -82.3125,   -80.5,           -31.390625,
+            -73.25,     -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -40.09375, 86.25,      51.28125,   -57.65625, -97.5625, -28.875,
+            80.5,      46.65625,   62.8125,    49.8125,   -76.5,    84.625,
+            50.46875,  -18.015625, 5.19921875, -47.8125,  46.4375,  -71.25,
+            -69.875,   40.6875,    -18.703125, 20.15625,  41.9375,  23.484375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'min',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -40.09375, -38.21875, 51.28125,   -57.65625,  -97.5625,
+            -28.875,   -76,       -69.5625,   53.59375,   -39.09375,
+            -76.5,     -40.40625, 50.46875,   -18.015625, 5.19921875,
+            -47.8125,  17.390625, -82.3125,   -80.5,      -31.390625,
+            -73.25,    -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'min float16 5D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -36.0625,   -38.21875, 62.0625,    -16.609375,      66,
+            -17.765625, -76,       -69.5625,   53.59375,        -39.09375,
+            96.9375,    -40.40625, 74.125,     0.0328369140625, 38.8125,
+            -17.71875,  17.390625, -82.3125,   -80.5,           -31.390625,
+            -73.25,     -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -40.09375, 86.25,      51.28125,   -57.65625, -97.5625, -28.875,
+            80.5,      46.65625,   62.8125,    49.8125,   -76.5,    84.625,
+            50.46875,  -18.015625, 5.19921875, -47.8125,  46.4375,  -71.25,
+            -69.875,   40.6875,    -18.703125, 20.15625,  41.9375,  23.484375
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'min',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -40.09375, -38.21875, 51.28125,   -57.65625,  -97.5625,
+            -28.875,   -76,       -69.5625,   53.59375,   -39.09375,
+            -76.5,     -40.40625, 50.46875,   -18.015625, 5.19921875,
+            -47.8125,  17.390625, -82.3125,   -80.5,      -31.390625,
+            -73.25,    -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'min float16 broadcast 1D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [34.4375],
+          'descriptor': {shape: [1], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -36.0625,   -38.21875, 62.0625,    -16.609375,      66,
+            -17.765625, -76,       -69.5625,   53.59375,        -39.09375,
+            96.9375,    -40.40625, 74.125,     0.0328369140625, 38.8125,
+            -17.71875,  17.390625, -82.3125,   -80.5,           -31.390625,
+            -73.25,     -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'min',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -36.0625,   -38.21875, 34.4375,    -16.609375,      34.4375,
+            -17.765625, -76,       -69.5625,   34.4375,         -39.09375,
+            34.4375,    -40.40625, 34.4375,    0.0328369140625, 34.4375,
+            -17.71875,  17.390625, -82.3125,   -80.5,           -31.390625,
+            -73.25,     -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'min float16 broadcast 2D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -36.0625,   -38.21875, 62.0625,    -16.609375,      66,
+            -17.765625, -76,       -69.5625,   53.59375,        -39.09375,
+            96.9375,    -40.40625, 74.125,     0.0328369140625, 38.8125,
+            -17.71875,  17.390625, -82.3125,   -80.5,           -31.390625,
+            -73.25,     -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [-19.078125, -78.25, -13.4375, -93, -72.25, 63.15625],
+          'descriptor': {shape: [2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'min',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -36.0625,   -78.25, -13.4375, -93, -72.25, -17.765625,
+            -76,        -78.25, -13.4375, -93, -72.25, -40.40625,
+            -19.078125, -78.25, -13.4375, -93, -72.25, -82.3125,
+            -80.5,      -78.25, -73.25,   -93, -72.25, 4.9453125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'min float16 broadcast 3D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -36.0625,   -38.21875, 62.0625,    -16.609375,      66,
+            -17.765625, -76,       -69.5625,   53.59375,        -39.09375,
+            96.9375,    -40.40625, 74.125,     0.0328369140625, 38.8125,
+            -17.71875,  17.390625, -82.3125,   -80.5,           -31.390625,
+            -73.25,     -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [23.234375, 84.625, -83.3125, -22.828125],
+          'descriptor': {shape: [2, 2, 1], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'min',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -36.0625,   -38.21875, 23.234375,  -16.609375,      66,
+            -17.765625, -83.3125,  -83.3125,   -83.3125,        -39.09375,
+            -22.828125, -40.40625, 23.234375,  0.0328369140625, 23.234375,
+            -17.71875,  17.390625, -82.3125,   -83.3125,        -83.3125,
+            -83.3125,   -33.75,    -22.828125, -22.828125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'min float16 broadcast 4D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [34.4375],
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -36.0625,   -38.21875, 62.0625,    -16.609375,      66,
+            -17.765625, -76,       -69.5625,   53.59375,        -39.09375,
+            96.9375,    -40.40625, 74.125,     0.0328369140625, 38.8125,
+            -17.71875,  17.390625, -82.3125,   -80.5,           -31.390625,
+            -73.25,     -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'min',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -36.0625,   -38.21875, 34.4375,    -16.609375,      34.4375,
+            -17.765625, -76,       -69.5625,   34.4375,         -39.09375,
+            34.4375,    -40.40625, 34.4375,    0.0328369140625, 34.4375,
+            -17.71875,  17.390625, -82.3125,   -80.5,           -31.390625,
+            -73.25,     -33.75,    -21.703125, 4.9453125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/mul.https.any.js b/tests/wpt/tests/webnn/conformance_tests/mul.https.any.js
index e64a70d099a..277d3e2fa0d 100644
--- a/tests/wpt/tests/webnn/conformance_tests/mul.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/mul.https.any.js
@@ -526,6 +526,399 @@ const mulTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'mul float16 1D constant tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            49.125,            11.90625,   -21.109375,  70.75,    -94.5,
+            -93.8125,          11.1796875, -32.8125,    83.3125,  91.125,
+            -0.11236572265625, 15.3984375, -13.4609375, -50.625,  -31.171875,
+            -6.6171875,        21.734375,  22.03125,    -84,      -94.0625,
+            58.8125,           -63.0625,   3.30859375,  9.8828125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        },
+        'inputB': {
+          'data': [
+            74.9375,   -34.53125, -33.3125, 53.90625,  -83.6875,    19.78125,
+            36.28125,  -34.3125,  49.09375, -54.53125, 70.75,       -55.1875,
+            -93.9375,  60.09375,  -92.75,   87.625,    -8.8828125,  71.8125,
+            -26.15625, -18.9375,  34.65625, -60.96875, -11.1171875, 77.5
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'mul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            3682, -411.25, 703,         3814, 7908, -1856, 405.5,     1126,
+            4090, -4968,   -7.94921875, -850, 1264, -3042, 2892,      -580,
+            -193, 1582,    2198,        1781, 2038, 3844,  -36.78125, 766
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'mul float16 1D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            49.125,            11.90625,   -21.109375,  70.75,    -94.5,
+            -93.8125,          11.1796875, -32.8125,    83.3125,  91.125,
+            -0.11236572265625, 15.3984375, -13.4609375, -50.625,  -31.171875,
+            -6.6171875,        21.734375,  22.03125,    -84,      -94.0625,
+            58.8125,           -63.0625,   3.30859375,  9.8828125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            74.9375,   -34.53125, -33.3125, 53.90625,  -83.6875,    19.78125,
+            36.28125,  -34.3125,  49.09375, -54.53125, 70.75,       -55.1875,
+            -93.9375,  60.09375,  -92.75,   87.625,    -8.8828125,  71.8125,
+            -26.15625, -18.9375,  34.65625, -60.96875, -11.1171875, 77.5
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'mul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            3682, -411.25, 703,         3814, 7908, -1856, 405.5,     1126,
+            4090, -4968,   -7.94921875, -850, 1264, -3042, 2892,      -580,
+            -193, 1582,    2198,        1781, 2038, 3844,  -36.78125, 766
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'mul float16 2D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            49.125,            11.90625,   -21.109375,  70.75,    -94.5,
+            -93.8125,          11.1796875, -32.8125,    83.3125,  91.125,
+            -0.11236572265625, 15.3984375, -13.4609375, -50.625,  -31.171875,
+            -6.6171875,        21.734375,  22.03125,    -84,      -94.0625,
+            58.8125,           -63.0625,   3.30859375,  9.8828125
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            74.9375,   -34.53125, -33.3125, 53.90625,  -83.6875,    19.78125,
+            36.28125,  -34.3125,  49.09375, -54.53125, 70.75,       -55.1875,
+            -93.9375,  60.09375,  -92.75,   87.625,    -8.8828125,  71.8125,
+            -26.15625, -18.9375,  34.65625, -60.96875, -11.1171875, 77.5
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'mul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            3682, -411.25, 703,         3814, 7908, -1856, 405.5,     1126,
+            4090, -4968,   -7.94921875, -850, 1264, -3042, 2892,      -580,
+            -193, 1582,    2198,        1781, 2038, 3844,  -36.78125, 766
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'mul float16 3D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            49.125,            11.90625,   -21.109375,  70.75,    -94.5,
+            -93.8125,          11.1796875, -32.8125,    83.3125,  91.125,
+            -0.11236572265625, 15.3984375, -13.4609375, -50.625,  -31.171875,
+            -6.6171875,        21.734375,  22.03125,    -84,      -94.0625,
+            58.8125,           -63.0625,   3.30859375,  9.8828125
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            74.9375,   -34.53125, -33.3125, 53.90625,  -83.6875,    19.78125,
+            36.28125,  -34.3125,  49.09375, -54.53125, 70.75,       -55.1875,
+            -93.9375,  60.09375,  -92.75,   87.625,    -8.8828125,  71.8125,
+            -26.15625, -18.9375,  34.65625, -60.96875, -11.1171875, 77.5
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'mul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            3682, -411.25, 703,         3814, 7908, -1856, 405.5,     1126,
+            4090, -4968,   -7.94921875, -850, 1264, -3042, 2892,      -580,
+            -193, 1582,    2198,        1781, 2038, 3844,  -36.78125, 766
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'mul float16 4D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            49.125,            11.90625,   -21.109375,  70.75,    -94.5,
+            -93.8125,          11.1796875, -32.8125,    83.3125,  91.125,
+            -0.11236572265625, 15.3984375, -13.4609375, -50.625,  -31.171875,
+            -6.6171875,        21.734375,  22.03125,    -84,      -94.0625,
+            58.8125,           -63.0625,   3.30859375,  9.8828125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            74.9375,   -34.53125, -33.3125, 53.90625,  -83.6875,    19.78125,
+            36.28125,  -34.3125,  49.09375, -54.53125, 70.75,       -55.1875,
+            -93.9375,  60.09375,  -92.75,   87.625,    -8.8828125,  71.8125,
+            -26.15625, -18.9375,  34.65625, -60.96875, -11.1171875, 77.5
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'mul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            3682, -411.25, 703,         3814, 7908, -1856, 405.5,     1126,
+            4090, -4968,   -7.94921875, -850, 1264, -3042, 2892,      -580,
+            -193, 1582,    2198,        1781, 2038, 3844,  -36.78125, 766
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'mul float16 5D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            49.125,            11.90625,   -21.109375,  70.75,    -94.5,
+            -93.8125,          11.1796875, -32.8125,    83.3125,  91.125,
+            -0.11236572265625, 15.3984375, -13.4609375, -50.625,  -31.171875,
+            -6.6171875,        21.734375,  22.03125,    -84,      -94.0625,
+            58.8125,           -63.0625,   3.30859375,  9.8828125
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            74.9375,   -34.53125, -33.3125, 53.90625,  -83.6875,    19.78125,
+            36.28125,  -34.3125,  49.09375, -54.53125, 70.75,       -55.1875,
+            -93.9375,  60.09375,  -92.75,   87.625,    -8.8828125,  71.8125,
+            -26.15625, -18.9375,  34.65625, -60.96875, -11.1171875, 77.5
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'mul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            3682, -411.25, 703,         3814, 7908, -1856, 405.5,     1126,
+            4090, -4968,   -7.94921875, -850, 1264, -3042, 2892,      -580,
+            -193, 1582,    2198,        1781, 2038, 3844,  -36.78125, 766
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'mul float16 broadcast 1D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA':
+            {'data': [67.5], 'descriptor': {shape: [1], dataType: 'float16'}},
+        'inputB': {
+          'data': [
+            49.125,            11.90625,   -21.109375,  70.75,    -94.5,
+            -93.8125,          11.1796875, -32.8125,    83.3125,  91.125,
+            -0.11236572265625, 15.3984375, -13.4609375, -50.625,  -31.171875,
+            -6.6171875,        21.734375,  22.03125,    -84,      -94.0625,
+            58.8125,           -63.0625,   3.30859375,  9.8828125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'mul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            3316, 803.5, -1425,      4776,  -6380,  -6332, 754.5,   -2214,
+            5624, 6152,  -7.5859375, 1039,  -908.5, -3418, -2104,   -446.75,
+            1467, 1487,  -5672,      -6348, 3970,   -4256, 223.375, 667
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'mul float16 broadcast 2D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            49.125,            11.90625,   -21.109375,  70.75,    -94.5,
+            -93.8125,          11.1796875, -32.8125,    83.3125,  91.125,
+            -0.11236572265625, 15.3984375, -13.4609375, -50.625,  -31.171875,
+            -6.6171875,        21.734375,  22.03125,    -84,      -94.0625,
+            58.8125,           -63.0625,   3.30859375,  9.8828125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [-97.3125, -81.6875, -63.84375, -25.1875, 94.625, -20.375],
+          'descriptor': {shape: [2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'mul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -4780, -972.5, 1348,        -1782,   -8944, 1911, -1088, 2680,
+            -5320, -2296,  -10.6328125, -313.75, 1310,  4136, 1990,  166.625,
+            2056,  -449,   8176,        7684,    -3754, 1588, 313,   -201.375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'mul float16 broadcast 3D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            49.125,            11.90625,   -21.109375,  70.75,    -94.5,
+            -93.8125,          11.1796875, -32.8125,    83.3125,  91.125,
+            -0.11236572265625, 15.3984375, -13.4609375, -50.625,  -31.171875,
+            -6.6171875,        21.734375,  22.03125,    -84,      -94.0625,
+            58.8125,           -63.0625,   3.30859375,  9.8828125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [8.6953125, 48.375, 97.75, 62.21875],
+          'descriptor': {shape: [2, 2, 1], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'mul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            427.25,    103.5,   -183.5, 3422,  -4572,      -4540,
+            1093,      -3208,   8144,   5668,  -6.9921875, 958,
+            -117.0625, -440.25, -271,   -320,  1051,       1066,
+            -8208,     -9192,   5748,   -3924, 205.875,    615
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'mul float16 broadcast 4D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [67.5],
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            49.125,            11.90625,   -21.109375,  70.75,    -94.5,
+            -93.8125,          11.1796875, -32.8125,    83.3125,  91.125,
+            -0.11236572265625, 15.3984375, -13.4609375, -50.625,  -31.171875,
+            -6.6171875,        21.734375,  22.03125,    -84,      -94.0625,
+            58.8125,           -63.0625,   3.30859375,  9.8828125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'mul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            3316, 803.5, -1425,      4776,  -6380,  -6332, 754.5,   -2214,
+            5624, 6152,  -7.5859375, 1039,  -908.5, -3418, -2104,   -446.75,
+            1467, 1487,  -5672,      -6348, 3970,   -4256, 223.375, 667
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/neg.https.any.js b/tests/wpt/tests/webnn/conformance_tests/neg.https.any.js
index c03afc52516..8bc10475453 100644
--- a/tests/wpt/tests/webnn/conformance_tests/neg.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/neg.https.any.js
@@ -14,11 +14,8 @@
 // MLOperand neg(MLOperand input);
 
 
-const getNegPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 0, float16: 0};
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
+const getNegPrecisionTolerance = () => {
+  return {metricType: 'ULP', value: 0};
 };
 
 const negTests = [
@@ -551,6 +548,62 @@ const negTests = [
         }
       }
     }
+  },
+
+  // int8 tests
+  {
+    'name': 'neg int8 4D tensor',
+    'graph': {
+      'inputs': {
+        'negInput': {
+          'data': [
+            // int8 range: [/* -(2**7) */ -128, /* 2**7 - 1 */ 127]
+            // neg(-128) would overflow when data type is int8
+            -127, 0, 126, 127
+          ],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'int8'}
+        }
+      },
+      'operators': [{
+        'name': 'neg',
+        'arguments': [{'input': 'negInput'}],
+        'outputs': 'negOutput'
+      }],
+      'expectedOutputs': {
+        'negOutput': {
+          'data': [127, 0, -126, -127],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'int8'}
+        }
+      }
+    }
+  },
+
+  // int32 tests
+  {
+    'name': 'neg int32 4D tensor',
+    'graph': {
+      'inputs': {
+        'negInput': {
+          'data': [
+            // int32 range: [/* -(2**31) */ -2147483648, /* 2**31 - 1 */ 2147483647]
+            // neg(-2147483648) would overflow when data type is int32
+            -2147483647, 0, 2147483646, 2147483647
+          ],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'int32'}
+        }
+      },
+      'operators': [{
+        'name': 'neg',
+        'arguments': [{'input': 'negInput'}],
+        'outputs': 'negOutput'
+      }],
+      'expectedOutputs': {
+        'negOutput': {
+          'data': [2147483647, 0, -2147483646, -2147483647],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'int32'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/pooling.https.any.js b/tests/wpt/tests/webnn/conformance_tests/pooling.https.any.js
index cf62a0e95bc..8f81ff565d2 100644
--- a/tests/wpt/tests/webnn/conformance_tests/pooling.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/pooling.https.any.js
@@ -34,46 +34,6 @@
 // MLOperand maxPool2d(
 //     MLOperand input, optional MLPool2dOptions options = {});
 
-
-const getPoolingOperatorsPrecisionTolerance = (graphResources) => {
-  const args = graphResources.operators[0].arguments;
-  const inputShape =
-      graphResources.inputs[args[0][Object.keys(args[0])[0]]].descriptor.shape;
-  const options =
-      args.length === 2 ? {...args[1][Object.keys(args[1])[0]]} : {};
-  let height;
-  let width;
-
-  if (options.windowDimensions) {
-    height = options.windowDimensions[0];
-    width = options.windowDimensions[1];
-  } else {
-    // If not present, the window dimensions are assumed to be the height and
-    // width dimensions of the input shape
-    if (options.layout && options.layout === 'nhwc') {
-      height = inputShape[1];
-      width = inputShape[2];
-    } else {
-      // nhwc layout of input
-      height = inputShape[2];
-      width = inputShape[3];
-    }
-  }
-
-  const tolerance = height * width + 2;
-  const toleranceDict = {
-    averagePool2d: {float32: tolerance, float16: tolerance},
-    l2Pool2d: {float32: tolerance, float16: tolerance},
-    maxPool2d: {float32: 0, float16: 0},
-  };
-  const expectedDataType =
-      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
-  return {
-    metricType: 'ULP',
-    value: toleranceDict[graphResources.operators[0].name][expectedDataType]
-  };
-};
-
 const poolingOperatorsTests = [
   // averagePool2d tests
   {
@@ -1497,12 +1457,12 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'l2Pool2dOutput': {
           'data': [
-            171.5061492919922, 164.9919891357422, 8222.29296875,
+            171.5061492919922, 164.9919891357422, 90.6768569946289,
             160.0518341064453, 149.63897705078125, 65.15908813476562,
-            132.56260681152344, 139.84808349609375, 708.620849609375,
-            142.6990966796875, 139.51637268066406, 5245.4814453125,
+            132.56260681152344, 139.84808349609375, 26.61993408203125,
+            142.6990966796875, 139.51637268066406, 72.42569732666016,
             165.07762145996094, 161.11062622070312, 96.38701629638672,
-            150.1616668701172, 146.8201904296875, 8216.69921875
+            150.1616668701172, 146.8201904296875, 90.64601135253906
           ],
           'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'}
         }
@@ -1555,12 +1515,12 @@ const poolingOperatorsTests = [
       'expectedOutputs': {
         'l2Pool2dOutput': {
           'data': [
-            171.5061492919922, 164.9919891357422, 8222.29296875,
+            171.5061492919922, 164.9919891357422, 90.6768569946289,
             160.0518341064453, 149.63897705078125, 65.15908813476562,
-            132.56260681152344, 139.84808349609375, 708.620849609375,
-            142.6990966796875, 139.51637268066406, 5245.4814453125,
+            132.56260681152344, 139.84808349609375, 26.61993408203125,
+            142.6990966796875, 139.51637268066406, 72.42569732666016,
             165.07762145996094, 161.11062622070312, 96.38701629638672,
-            150.1616668701172, 146.8201904296875, 8216.69921875
+            150.1616668701172, 146.8201904296875, 90.64601135253906
           ],
           'descriptor': {shape: [1, 2, 3, 3], dataType: 'float32'}
         }
@@ -2345,8 +2305,7 @@ const poolingOperatorsTests = [
 
 if (navigator.ml) {
   poolingOperatorsTests.forEach((test) => {
-    webnn_conformance_test(
-        buildAndExecuteGraph, getPoolingOperatorsPrecisionTolerance, test);
+    webnn_conformance_test(buildAndExecuteGraph, getPrecisionTolerance, test);
   });
 } else {
   test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
diff --git a/tests/wpt/tests/webnn/conformance_tests/pow.https.any.js b/tests/wpt/tests/webnn/conformance_tests/pow.https.any.js
index ae3524f3376..f51feca4eac 100644
--- a/tests/wpt/tests/webnn/conformance_tests/pow.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/pow.https.any.js
@@ -57,30 +57,18 @@ const powTests = [
       'expectedOutputs': {
         'output': {
           'data': [
-            17.846010208129883,
-            6.316321332633379e-8,
-            -1.0973203501407625e-7,
-            21800822,
-            0.0033234376460313797,
-            11.862250328063965,
-            80273.3359375,
-            0.00005692423656000756,
-            0.12908191978931427,
-            -0.0000020299064544815337,
-            0.005799346603453159,
-            3880.540283203125,
-            2.7385585465999895e-10,
-            8.223764069725803e-8,
-            0.06714485585689545,
-            -0.008288968354463577,
-            -4.1750155416186985e-11,
-            1210.5478515625,
-            3.8231124932508465e-8,
-            -1667.201416015625,
-            -0.16149713099002838,
-            -0.00015812950732652098,
-            485079424,
-            3.584487018315485e-8
+            17.846010208129883,      6.316321332633379e-8,
+            -1.0973203501407625e-7,  21800822,
+            0.0033234376460313797,   11.862250328063965,
+            80273.3359375,           0.00005692423656000756,
+            0.12908191978931427,     -0.0000020299064544815337,
+            0.005799346603453159,    3880.540283203125,
+            2.7385585465999895e-10,  8.223764069725803e-8,
+            0.06714485585689545,     -0.008288968354463577,
+            -4.1750155416186985e-11, 1210.5478515625,
+            3.8231124932508465e-8,   -1667.201416015625,
+            -0.16149713099002838,    -0.00015812950732652098,
+            485079424,               3.584487018315485e-8
           ],
           'descriptor': {shape: [24], dataType: 'float32'}
         }
@@ -120,30 +108,18 @@ const powTests = [
       'expectedOutputs': {
         'output': {
           'data': [
-            17.846010208129883,
-            6.316321332633379e-8,
-            -1.0973203501407625e-7,
-            21800822,
-            0.0033234376460313797,
-            11.862250328063965,
-            80273.3359375,
-            0.00005692423656000756,
-            0.12908191978931427,
-            -0.0000020299064544815337,
-            0.005799346603453159,
-            3880.540283203125,
-            2.7385585465999895e-10,
-            8.223764069725803e-8,
-            0.06714485585689545,
-            -0.008288968354463577,
-            -4.1750155416186985e-11,
-            1210.5478515625,
-            3.8231124932508465e-8,
-            -1667.201416015625,
-            -0.16149713099002838,
-            -0.00015812950732652098,
-            485079424,
-            3.584487018315485e-8
+            17.846010208129883,      6.316321332633379e-8,
+            -1.0973203501407625e-7,  21800822,
+            0.0033234376460313797,   11.862250328063965,
+            80273.3359375,           0.00005692423656000756,
+            0.12908191978931427,     -0.0000020299064544815337,
+            0.005799346603453159,    3880.540283203125,
+            2.7385585465999895e-10,  8.223764069725803e-8,
+            0.06714485585689545,     -0.008288968354463577,
+            -4.1750155416186985e-11, 1210.5478515625,
+            3.8231124932508465e-8,   -1667.201416015625,
+            -0.16149713099002838,    -0.00015812950732652098,
+            485079424,               3.584487018315485e-8
           ],
           'descriptor': {shape: [24], dataType: 'float32'}
         }
@@ -183,30 +159,18 @@ const powTests = [
       'expectedOutputs': {
         'output': {
           'data': [
-            17.846010208129883,
-            6.316321332633379e-8,
-            -1.0973203501407625e-7,
-            21800822,
-            0.0033234376460313797,
-            11.862250328063965,
-            80273.3359375,
-            0.00005692423656000756,
-            0.12908191978931427,
-            -0.0000020299064544815337,
-            0.005799346603453159,
-            3880.540283203125,
-            2.7385585465999895e-10,
-            8.223764069725803e-8,
-            0.06714485585689545,
-            -0.008288968354463577,
-            -4.1750155416186985e-11,
-            1210.5478515625,
-            3.8231124932508465e-8,
-            -1667.201416015625,
-            -0.16149713099002838,
-            -0.00015812950732652098,
-            485079424,
-            3.584487018315485e-8
+            17.846010208129883,      6.316321332633379e-8,
+            -1.0973203501407625e-7,  21800822,
+            0.0033234376460313797,   11.862250328063965,
+            80273.3359375,           0.00005692423656000756,
+            0.12908191978931427,     -0.0000020299064544815337,
+            0.005799346603453159,    3880.540283203125,
+            2.7385585465999895e-10,  8.223764069725803e-8,
+            0.06714485585689545,     -0.008288968354463577,
+            -4.1750155416186985e-11, 1210.5478515625,
+            3.8231124932508465e-8,   -1667.201416015625,
+            -0.16149713099002838,    -0.00015812950732652098,
+            485079424,               3.584487018315485e-8
           ],
           'descriptor': {shape: [4, 6], dataType: 'float32'}
         }
@@ -246,30 +210,18 @@ const powTests = [
       'expectedOutputs': {
         'output': {
           'data': [
-            17.846010208129883,
-            6.316321332633379e-8,
-            -1.0973203501407625e-7,
-            21800822,
-            0.0033234376460313797,
-            11.862250328063965,
-            80273.3359375,
-            0.00005692423656000756,
-            0.12908191978931427,
-            -0.0000020299064544815337,
-            0.005799346603453159,
-            3880.540283203125,
-            2.7385585465999895e-10,
-            8.223764069725803e-8,
-            0.06714485585689545,
-            -0.008288968354463577,
-            -4.1750155416186985e-11,
-            1210.5478515625,
-            3.8231124932508465e-8,
-            -1667.201416015625,
-            -0.16149713099002838,
-            -0.00015812950732652098,
-            485079424,
-            3.584487018315485e-8
+            17.846010208129883,      6.316321332633379e-8,
+            -1.0973203501407625e-7,  21800822,
+            0.0033234376460313797,   11.862250328063965,
+            80273.3359375,           0.00005692423656000756,
+            0.12908191978931427,     -0.0000020299064544815337,
+            0.005799346603453159,    3880.540283203125,
+            2.7385585465999895e-10,  8.223764069725803e-8,
+            0.06714485585689545,     -0.008288968354463577,
+            -4.1750155416186985e-11, 1210.5478515625,
+            3.8231124932508465e-8,   -1667.201416015625,
+            -0.16149713099002838,    -0.00015812950732652098,
+            485079424,               3.584487018315485e-8
           ],
           'descriptor': {shape: [2, 3, 4], dataType: 'float32'}
         }
@@ -309,30 +261,18 @@ const powTests = [
       'expectedOutputs': {
         'output': {
           'data': [
-            17.846010208129883,
-            6.316321332633379e-8,
-            -1.0973203501407625e-7,
-            21800822,
-            0.0033234376460313797,
-            11.862250328063965,
-            80273.3359375,
-            0.00005692423656000756,
-            0.12908191978931427,
-            -0.0000020299064544815337,
-            0.005799346603453159,
-            3880.540283203125,
-            2.7385585465999895e-10,
-            8.223764069725803e-8,
-            0.06714485585689545,
-            -0.008288968354463577,
-            -4.1750155416186985e-11,
-            1210.5478515625,
-            3.8231124932508465e-8,
-            -1667.201416015625,
-            -0.16149713099002838,
-            -0.00015812950732652098,
-            485079424,
-            3.584487018315485e-8
+            17.846010208129883,      6.316321332633379e-8,
+            -1.0973203501407625e-7,  21800822,
+            0.0033234376460313797,   11.862250328063965,
+            80273.3359375,           0.00005692423656000756,
+            0.12908191978931427,     -0.0000020299064544815337,
+            0.005799346603453159,    3880.540283203125,
+            2.7385585465999895e-10,  8.223764069725803e-8,
+            0.06714485585689545,     -0.008288968354463577,
+            -4.1750155416186985e-11, 1210.5478515625,
+            3.8231124932508465e-8,   -1667.201416015625,
+            -0.16149713099002838,    -0.00015812950732652098,
+            485079424,               3.584487018315485e-8
           ],
           'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
@@ -372,30 +312,18 @@ const powTests = [
       'expectedOutputs': {
         'output': {
           'data': [
-            17.846010208129883,
-            6.316321332633379e-8,
-            -1.0973203501407625e-7,
-            21800822,
-            0.0033234376460313797,
-            11.862250328063965,
-            80273.3359375,
-            0.00005692423656000756,
-            0.12908191978931427,
-            -0.0000020299064544815337,
-            0.005799346603453159,
-            3880.540283203125,
-            2.7385585465999895e-10,
-            8.223764069725803e-8,
-            0.06714485585689545,
-            -0.008288968354463577,
-            -4.1750155416186985e-11,
-            1210.5478515625,
-            3.8231124932508465e-8,
-            -1667.201416015625,
-            -0.16149713099002838,
-            -0.00015812950732652098,
-            485079424,
-            3.584487018315485e-8
+            17.846010208129883,      6.316321332633379e-8,
+            -1.0973203501407625e-7,  21800822,
+            0.0033234376460313797,   11.862250328063965,
+            80273.3359375,           0.00005692423656000756,
+            0.12908191978931427,     -0.0000020299064544815337,
+            0.005799346603453159,    3880.540283203125,
+            2.7385585465999895e-10,  8.223764069725803e-8,
+            0.06714485585689545,     -0.008288968354463577,
+            -4.1750155416186985e-11, 1210.5478515625,
+            3.8231124932508465e-8,   -1667.201416015625,
+            -0.16149713099002838,    -0.00015812950732652098,
+            485079424,               3.584487018315485e-8
           ],
           'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float32'}
         }
@@ -565,35 +493,491 @@ const powTests = [
       'expectedOutputs': {
         'output': {
           'data': [
-            5.524516950572433e-7,
-            -999109.625,
-            -0.000010685862434911542,
-            3.284485530774539e-11,
-            4.0545030440680696e-13,
-            1.81271334748212e-11,
-            -108463955968,
-            6610.47265625,
-            -10025.4921875,
-            1.4756086841316574e-7,
-            1.9504606996179064e-7,
-            142.34274291992188,
-            -0.0000010554830396358739,
-            0.000008696333679836243,
-            0.0000013647832020069472,
-            1.1525726506533829e-7,
-            2.9335795945217846e-12,
-            0.000007272717084561009,
-            133774827520,
-            -13885.326171875,
-            -26.625843048095703,
-            0.000027467271138448268,
-            3.5893645389251105e-8,
-            3.584487018315485e-8
+            5.524516950572433e-7,      -999109.625,
+            -0.000010685862434911542,  3.284485530774539e-11,
+            4.0545030440680696e-13,    1.81271334748212e-11,
+            -108463955968,             6610.47265625,
+            -10025.4921875,            1.4756086841316574e-7,
+            1.9504606996179064e-7,     142.34274291992188,
+            -0.0000010554830396358739, 0.000008696333679836243,
+            0.0000013647832020069472,  1.1525726506533829e-7,
+            2.9335795945217846e-12,    0.000007272717084561009,
+            133774827520,              -13885.326171875,
+            -26.625843048095703,       0.000027467271138448268,
+            3.5893645389251105e-8,     3.584487018315485e-8
           ],
           'descriptor': {shape: [2, 2, 2, 3], dataType: 'float32'}
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name':
+        'pow float16 constant 1D base tensor and 1D integer exponent tensor',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.84375,      -0.0631103515625, -9.8671875, 11.1796875,
+            -17.34375,     11.859375,        -16.828125, 2.658203125,
+            -2.783203125,  -13.7578125,      13.1328125, -0.437744140625,
+            -15.6796875,   10.28125,         14.890625,  -4.94140625,
+            -14.234375,    3.263671875,      17.234375,  -2.88671875,
+            -1.4404296875, -5.7578125,       17.40625,   17.421875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        },
+        'inputB': {
+          'data': [
+            1,  3,  -7, 2,  -2, 1, 2,  -10, -2, -5, -2, -10,
+            -8, -7, -1, -3, -9, 2, -6, 3,   -5, -5, 2,  -6
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'pow',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            17.84375,               -0.0002512931823730469,
+            -1.1920928955078125e-7, 125,
+            0.0033245086669921875,  11.859375,
+            283.25,                 0.000056743621826171875,
+            0.129150390625,         -0.0000020265579223632812,
+            0.00579833984375,       3870,
+            0,                      5.960464477539063e-8,
+            0.067138671875,         -0.0082855224609375,
+            0,                      10.6484375,
+            5.960464477539063e-8,   -24.0625,
+            -0.1612548828125,       -0.00015807151794433594,
+            303,                    5.960464477539063e-8
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'pow float16 1D base tensor and 1D integer exponent tensor',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.84375,      -0.0631103515625, -9.8671875, 11.1796875,
+            -17.34375,     11.859375,        -16.828125, 2.658203125,
+            -2.783203125,  -13.7578125,      13.1328125, -0.437744140625,
+            -15.6796875,   10.28125,         14.890625,  -4.94140625,
+            -14.234375,    3.263671875,      17.234375,  -2.88671875,
+            -1.4404296875, -5.7578125,       17.40625,   17.421875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            1,  3,  -7, 2,  -2, 1, 2,  -10, -2, -5, -2, -10,
+            -8, -7, -1, -3, -9, 2, -6, 3,   -5, -5, 2,  -6
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'pow',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            17.84375,               -0.0002512931823730469,
+            -1.1920928955078125e-7, 125,
+            0.0033245086669921875,  11.859375,
+            283.25,                 0.000056743621826171875,
+            0.129150390625,         -0.0000020265579223632812,
+            0.00579833984375,       3870,
+            0,                      5.960464477539063e-8,
+            0.067138671875,         -0.0082855224609375,
+            0,                      10.6484375,
+            5.960464477539063e-8,   -24.0625,
+            -0.1612548828125,       -0.00015807151794433594,
+            303,                    5.960464477539063e-8
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'pow float16 2D base tensor and 2D integer exponent tensor',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.84375,      -0.0631103515625, -9.8671875, 11.1796875,
+            -17.34375,     11.859375,        -16.828125, 2.658203125,
+            -2.783203125,  -13.7578125,      13.1328125, -0.437744140625,
+            -15.6796875,   10.28125,         14.890625,  -4.94140625,
+            -14.234375,    3.263671875,      17.234375,  -2.88671875,
+            -1.4404296875, -5.7578125,       17.40625,   17.421875
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            1,  3,  -7, 2,  -2, 1, 2,  -10, -2, -5, -2, -10,
+            -8, -7, -1, -3, -9, 2, -6, 3,   -5, -5, 2,  -6
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'pow',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            17.84375,               -0.0002512931823730469,
+            -1.1920928955078125e-7, 125,
+            0.0033245086669921875,  11.859375,
+            283.25,                 0.000056743621826171875,
+            0.129150390625,         -0.0000020265579223632812,
+            0.00579833984375,       3870,
+            0,                      5.960464477539063e-8,
+            0.067138671875,         -0.0082855224609375,
+            0,                      10.6484375,
+            5.960464477539063e-8,   -24.0625,
+            -0.1612548828125,       -0.00015807151794433594,
+            303,                    5.960464477539063e-8
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'pow float16 3D base tensor and 3D integer exponent tensor',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.84375,      -0.0631103515625, -9.8671875, 11.1796875,
+            -17.34375,     11.859375,        -16.828125, 2.658203125,
+            -2.783203125,  -13.7578125,      13.1328125, -0.437744140625,
+            -15.6796875,   10.28125,         14.890625,  -4.94140625,
+            -14.234375,    3.263671875,      17.234375,  -2.88671875,
+            -1.4404296875, -5.7578125,       17.40625,   17.421875
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            1,  3,  -7, 2,  -2, 1, 2,  -10, -2, -5, -2, -10,
+            -8, -7, -1, -3, -9, 2, -6, 3,   -5, -5, 2,  -6
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'pow',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            17.84375,               -0.0002512931823730469,
+            -1.1920928955078125e-7, 125,
+            0.0033245086669921875,  11.859375,
+            283.25,                 0.000056743621826171875,
+            0.129150390625,         -0.0000020265579223632812,
+            0.00579833984375,       3870,
+            0,                      5.960464477539063e-8,
+            0.067138671875,         -0.0082855224609375,
+            0,                      10.6484375,
+            5.960464477539063e-8,   -24.0625,
+            -0.1612548828125,       -0.00015807151794433594,
+            303,                    5.960464477539063e-8
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'pow float16 4D base tensor and 4D integer exponent tensor',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.84375,      -0.0631103515625, -9.8671875, 11.1796875,
+            -17.34375,     11.859375,        -16.828125, 2.658203125,
+            -2.783203125,  -13.7578125,      13.1328125, -0.437744140625,
+            -15.6796875,   10.28125,         14.890625,  -4.94140625,
+            -14.234375,    3.263671875,      17.234375,  -2.88671875,
+            -1.4404296875, -5.7578125,       17.40625,   17.421875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            1,  3,  -7, 2,  -2, 1, 2,  -10, -2, -5, -2, -10,
+            -8, -7, -1, -3, -9, 2, -6, 3,   -5, -5, 2,  -6
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'pow',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            17.84375,               -0.0002512931823730469,
+            -1.1920928955078125e-7, 125,
+            0.0033245086669921875,  11.859375,
+            283.25,                 0.000056743621826171875,
+            0.129150390625,         -0.0000020265579223632812,
+            0.00579833984375,       3870,
+            0,                      5.960464477539063e-8,
+            0.067138671875,         -0.0082855224609375,
+            0,                      10.6484375,
+            5.960464477539063e-8,   -24.0625,
+            -0.1612548828125,       -0.00015807151794433594,
+            303,                    5.960464477539063e-8
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'pow float16 5D base tensor and 5D integer exponent tensor',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.84375,      -0.0631103515625, -9.8671875, 11.1796875,
+            -17.34375,     11.859375,        -16.828125, 2.658203125,
+            -2.783203125,  -13.7578125,      13.1328125, -0.437744140625,
+            -15.6796875,   10.28125,         14.890625,  -4.94140625,
+            -14.234375,    3.263671875,      17.234375,  -2.88671875,
+            -1.4404296875, -5.7578125,       17.40625,   17.421875
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            1,  3,  -7, 2,  -2, 1, 2,  -10, -2, -5, -2, -10,
+            -8, -7, -1, -3, -9, 2, -6, 3,   -5, -5, 2,  -6
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'pow',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            17.84375,               -0.0002512931823730469,
+            -1.1920928955078125e-7, 125,
+            0.0033245086669921875,  11.859375,
+            283.25,                 0.000056743621826171875,
+            0.129150390625,         -0.0000020265579223632812,
+            0.00579833984375,       3870,
+            0,                      5.960464477539063e-8,
+            0.067138671875,         -0.0082855224609375,
+            0,                      10.6484375,
+            5.960464477539063e-8,   -24.0625,
+            -0.1612548828125,       -0.00015807151794433594,
+            303,                    5.960464477539063e-8
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'pow (square) float16 4D base tensor and broadcastable 0D integer exponent scalar',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.84375,      -0.0631103515625, -9.8671875, 11.1796875,
+            -17.34375,     11.859375,        -16.828125, 2.658203125,
+            -2.783203125,  -13.7578125,      13.1328125, -0.437744140625,
+            -15.6796875,   10.28125,         14.890625,  -4.94140625,
+            -14.234375,    3.263671875,      17.234375,  -2.88671875,
+            -1.4404296875, -5.7578125,       17.40625,   17.421875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'},
+          'constant': true
+        },
+        'inputB': {'data': [2], 'descriptor': {shape: [], dataType: 'float16'}}
+      },
+      'operators': [{
+        'name': 'pow',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            318.5,      0.0039825439453125,
+            97.375,     125,
+            300.75,     140.625,
+            283.25,     7.06640625,
+            7.74609375, 189.25,
+            172.5,      0.191650390625,
+            245.875,    105.6875,
+            221.75,     24.421875,
+            202.625,    10.6484375,
+            297,        8.3359375,
+            2.07421875, 33.15625,
+            303,        303.5
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'pow (sqrt) float16 4D positive base tensor and broadcastable 0D integer exponent scalar',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            1.4189453125, 19.390625,   12.984375, 2.4609375, 7.81640625,
+            6.9453125,    12.1875,     17.90625,  11.359375, 8.921875,
+            17.640625,    11.5,        18.515625, 2.2578125, 2.232421875,
+            13.6328125,   17.546875,   0.5390625, 5.890625,  0.1280517578125,
+            19.65625,     3.412109375, 4.9453125, 4.4375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'},
+          'constant': true
+        },
+        'inputB':
+            {'data': [0.5], 'descriptor': {shape: [], dataType: 'float16'}}
+      },
+      'operators': [{
+        'name': 'pow',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            1.19140625,  4.40234375,  3.603515625, 1.568359375,  2.794921875,
+            2.634765625, 3.490234375, 4.23046875,  3.37109375,   2.986328125,
+            4.19921875,  3.390625,    4.3046875,   1.5029296875, 1.494140625,
+            3.69140625,  4.1875,      0.734375,    2.427734375,  0.35791015625,
+            4.43359375,  1.84765625,  2.224609375, 2.107421875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'pow float16 4D base tensor and broadcastable 2D integer exponent tensor',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.84375,      -0.0631103515625, -9.8671875, 11.1796875,
+            -17.34375,     11.859375,        -16.828125, 2.658203125,
+            -2.783203125,  -13.7578125,      13.1328125, -0.437744140625,
+            -15.6796875,   10.28125,         14.890625,  -4.94140625,
+            -14.234375,    3.263671875,      17.234375,  -2.88671875,
+            -1.4404296875, -5.7578125,       17.40625,   17.421875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [3, -2, -1, 2, -7, -5],
+          'descriptor': {shape: [2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'pow',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            5680,      251.125,          -0.101318359375,
+            125,       0,                0.000004291534423828125,
+            -4764,     0.1414794921875,  -0.359375,
+            189.25,    0,                -62.21875,
+            -3854,     0.00946044921875, 0.067138671875,
+            24.421875, 0,                0.0027008056640625,
+            5120,      0.1199951171875,  -0.6943359375,
+            33.15625,  0,                5.960464477539062e-7
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'pow float16 4D base tensor and broadcastable 3D integer exponent tensor',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            17.84375,      -0.0631103515625, -9.8671875, 11.1796875,
+            -17.34375,     11.859375,        -16.828125, 2.658203125,
+            -2.783203125,  -13.7578125,      13.1328125, -0.437744140625,
+            -15.6796875,   10.28125,         14.890625,  -4.94140625,
+            -14.234375,    3.263671875,      17.234375,  -2.88671875,
+            -1.4404296875, -5.7578125,       17.40625,   17.421875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [-1, 1, 3, -2],
+          'descriptor': {shape: [2, 2, 1], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'pow',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.0560302734375,      -15.84375,            -0.101318359375,
+            11.1796875,           -17.34375,            11.859375,
+            -4764,                18.78125,             -21.5625,
+            0.005283355712890625, 0.00579833984375,     5.21875,
+            -0.06378173828125,    0.0972900390625,      0.067138671875,
+            -4.94140625,          -14.234375,           3.263671875,
+            5120,                 -24.0625,             -2.98828125,
+            0.0301666259765625,   0.003299713134765625, 0.0032939910888671875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/prelu.https.any.js b/tests/wpt/tests/webnn/conformance_tests/prelu.https.any.js
index a3612715805..b89de832d3e 100644
--- a/tests/wpt/tests/webnn/conformance_tests/prelu.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/prelu.https.any.js
@@ -606,6 +606,531 @@ const preluTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'prelu float16 0D scalar',
+    'graph': {
+      'inputs': {
+        'preluInput': {
+          'data': [-4.79296875],
+          'descriptor': {shape: [], dataType: 'float16'},
+          'constant': true
+        },
+        'preluSlope': {
+          'data': [1.1201171875],
+          'descriptor': {shape: [], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'prelu',
+        'arguments': [{'input': 'preluInput'}, {'slope': 'preluSlope'}],
+        'outputs': 'preluOutput'
+      }],
+      'expectedOutputs': {
+        'preluOutput': {
+          'data': [-5.3671875],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'prelu float16 1D constant tensors',
+    'graph': {
+      'inputs': {
+        'preluInput': {
+          'data': [
+            -2.548828125, -4.79296875,    8.4140625,    6.109375,
+            -8.4921875,   3.314453125,    1.1689453125, -0.1417236328125,
+            -6.71484375,  5.7890625,      -3.755859375, -4.8984375,
+            7.328125,     -3.955078125,   7.06640625,   9.4375,
+            -2.55859375,  -8.65625,       8.4765625,    4.55078125,
+            -9.265625,    -0.26220703125, 1.326171875,  -7.41796875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        },
+        'preluSlope': {
+          'data': [
+            9.34375,       0.280029296875, -4.6171875,    1.1201171875,
+            -1.43359375,   -3.158203125,   -6.2890625,    -5.01171875,
+            -6.8984375,    3.572265625,    6.86328125,    -1.9619140625,
+            4.58203125,    2.6640625,      9.1953125,     -9.5546875,
+            -5.50390625,   -2.392578125,   3.58203125,    -2.322265625,
+            -1.9814453125, 4.15625,        -1.7998046875, 9.296875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'prelu',
+        'arguments': [{'input': 'preluInput'}, {'slope': 'preluSlope'}],
+        'outputs': 'preluOutput'
+      }],
+      'expectedOutputs': {
+        'preluOutput': {
+          'data': [
+            -23.8125,    -1.341796875, 8.4140625,     6.109375,    12.171875,
+            3.314453125, 1.1689453125, 0.71044921875, 46.3125,     5.7890625,
+            -25.78125,   9.609375,     7.328125,      -10.5390625, 7.06640625,
+            9.4375,      14.0859375,   20.703125,     8.4765625,   4.55078125,
+            18.359375,   -1.08984375,  1.326171875,   -68.9375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'prelu float16 1D tensors',
+    'graph': {
+      'inputs': {
+        'preluInput': {
+          'data': [
+            -2.548828125, -4.79296875,    8.4140625,    6.109375,
+            -8.4921875,   3.314453125,    1.1689453125, -0.1417236328125,
+            -6.71484375,  5.7890625,      -3.755859375, -4.8984375,
+            7.328125,     -3.955078125,   7.06640625,   9.4375,
+            -2.55859375,  -8.65625,       8.4765625,    4.55078125,
+            -9.265625,    -0.26220703125, 1.326171875,  -7.41796875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        },
+        'preluSlope': {
+          'data': [
+            9.34375,       0.280029296875, -4.6171875,    1.1201171875,
+            -1.43359375,   -3.158203125,   -6.2890625,    -5.01171875,
+            -6.8984375,    3.572265625,    6.86328125,    -1.9619140625,
+            4.58203125,    2.6640625,      9.1953125,     -9.5546875,
+            -5.50390625,   -2.392578125,   3.58203125,    -2.322265625,
+            -1.9814453125, 4.15625,        -1.7998046875, 9.296875
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'prelu',
+        'arguments': [{'input': 'preluInput'}, {'slope': 'preluSlope'}],
+        'outputs': 'preluOutput'
+      }],
+      'expectedOutputs': {
+        'preluOutput': {
+          'data': [
+            -23.8125,    -1.341796875, 8.4140625,     6.109375,    12.171875,
+            3.314453125, 1.1689453125, 0.71044921875, 46.3125,     5.7890625,
+            -25.78125,   9.609375,     7.328125,      -10.5390625, 7.06640625,
+            9.4375,      14.0859375,   20.703125,     8.4765625,   4.55078125,
+            18.359375,   -1.08984375,  1.326171875,   -68.9375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'prelu float16 2D tensors',
+    'graph': {
+      'inputs': {
+        'preluInput': {
+          'data': [
+            -2.548828125, -4.79296875,    8.4140625,    6.109375,
+            -8.4921875,   3.314453125,    1.1689453125, -0.1417236328125,
+            -6.71484375,  5.7890625,      -3.755859375, -4.8984375,
+            7.328125,     -3.955078125,   7.06640625,   9.4375,
+            -2.55859375,  -8.65625,       8.4765625,    4.55078125,
+            -9.265625,    -0.26220703125, 1.326171875,  -7.41796875
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'},
+          'constant': true
+        },
+        'preluSlope': {
+          'data': [
+            9.34375,       0.280029296875, -4.6171875,    1.1201171875,
+            -1.43359375,   -3.158203125,   -6.2890625,    -5.01171875,
+            -6.8984375,    3.572265625,    6.86328125,    -1.9619140625,
+            4.58203125,    2.6640625,      9.1953125,     -9.5546875,
+            -5.50390625,   -2.392578125,   3.58203125,    -2.322265625,
+            -1.9814453125, 4.15625,        -1.7998046875, 9.296875
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'prelu',
+        'arguments': [{'input': 'preluInput'}, {'slope': 'preluSlope'}],
+        'outputs': 'preluOutput'
+      }],
+      'expectedOutputs': {
+        'preluOutput': {
+          'data': [
+            -23.8125,    -1.341796875, 8.4140625,     6.109375,    12.171875,
+            3.314453125, 1.1689453125, 0.71044921875, 46.3125,     5.7890625,
+            -25.78125,   9.609375,     7.328125,      -10.5390625, 7.06640625,
+            9.4375,      14.0859375,   20.703125,     8.4765625,   4.55078125,
+            18.359375,   -1.08984375,  1.326171875,   -68.9375
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'prelu float16 3D tensors',
+    'graph': {
+      'inputs': {
+        'preluInput': {
+          'data': [
+            -2.548828125, -4.79296875,    8.4140625,    6.109375,
+            -8.4921875,   3.314453125,    1.1689453125, -0.1417236328125,
+            -6.71484375,  5.7890625,      -3.755859375, -4.8984375,
+            7.328125,     -3.955078125,   7.06640625,   9.4375,
+            -2.55859375,  -8.65625,       8.4765625,    4.55078125,
+            -9.265625,    -0.26220703125, 1.326171875,  -7.41796875
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'},
+          'constant': true
+        },
+        'preluSlope': {
+          'data': [
+            9.34375,       0.280029296875, -4.6171875,    1.1201171875,
+            -1.43359375,   -3.158203125,   -6.2890625,    -5.01171875,
+            -6.8984375,    3.572265625,    6.86328125,    -1.9619140625,
+            4.58203125,    2.6640625,      9.1953125,     -9.5546875,
+            -5.50390625,   -2.392578125,   3.58203125,    -2.322265625,
+            -1.9814453125, 4.15625,        -1.7998046875, 9.296875
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'prelu',
+        'arguments': [{'input': 'preluInput'}, {'slope': 'preluSlope'}],
+        'outputs': 'preluOutput'
+      }],
+      'expectedOutputs': {
+        'preluOutput': {
+          'data': [
+            -23.8125,    -1.341796875, 8.4140625,     6.109375,    12.171875,
+            3.314453125, 1.1689453125, 0.71044921875, 46.3125,     5.7890625,
+            -25.78125,   9.609375,     7.328125,      -10.5390625, 7.06640625,
+            9.4375,      14.0859375,   20.703125,     8.4765625,   4.55078125,
+            18.359375,   -1.08984375,  1.326171875,   -68.9375
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'prelu float16 4D tensors',
+    'graph': {
+      'inputs': {
+        'preluInput': {
+          'data': [
+            -2.548828125, -4.79296875,    8.4140625,    6.109375,
+            -8.4921875,   3.314453125,    1.1689453125, -0.1417236328125,
+            -6.71484375,  5.7890625,      -3.755859375, -4.8984375,
+            7.328125,     -3.955078125,   7.06640625,   9.4375,
+            -2.55859375,  -8.65625,       8.4765625,    4.55078125,
+            -9.265625,    -0.26220703125, 1.326171875,  -7.41796875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'},
+          'constant': true
+        },
+        'preluSlope': {
+          'data': [
+            9.34375,       0.280029296875, -4.6171875,    1.1201171875,
+            -1.43359375,   -3.158203125,   -6.2890625,    -5.01171875,
+            -6.8984375,    3.572265625,    6.86328125,    -1.9619140625,
+            4.58203125,    2.6640625,      9.1953125,     -9.5546875,
+            -5.50390625,   -2.392578125,   3.58203125,    -2.322265625,
+            -1.9814453125, 4.15625,        -1.7998046875, 9.296875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'prelu',
+        'arguments': [{'input': 'preluInput'}, {'slope': 'preluSlope'}],
+        'outputs': 'preluOutput'
+      }],
+      'expectedOutputs': {
+        'preluOutput': {
+          'data': [
+            -23.8125,    -1.341796875, 8.4140625,     6.109375,    12.171875,
+            3.314453125, 1.1689453125, 0.71044921875, 46.3125,     5.7890625,
+            -25.78125,   9.609375,     7.328125,      -10.5390625, 7.06640625,
+            9.4375,      14.0859375,   20.703125,     8.4765625,   4.55078125,
+            18.359375,   -1.08984375,  1.326171875,   -68.9375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'prelu float16 5D tensors',
+    'graph': {
+      'inputs': {
+        'preluInput': {
+          'data': [
+            -2.548828125, -4.79296875,    8.4140625,    6.109375,
+            -8.4921875,   3.314453125,    1.1689453125, -0.1417236328125,
+            -6.71484375,  5.7890625,      -3.755859375, -4.8984375,
+            7.328125,     -3.955078125,   7.06640625,   9.4375,
+            -2.55859375,  -8.65625,       8.4765625,    4.55078125,
+            -9.265625,    -0.26220703125, 1.326171875,  -7.41796875
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'},
+          'constant': true
+        },
+        'preluSlope': {
+          'data': [
+            9.34375,       0.280029296875, -4.6171875,    1.1201171875,
+            -1.43359375,   -3.158203125,   -6.2890625,    -5.01171875,
+            -6.8984375,    3.572265625,    6.86328125,    -1.9619140625,
+            4.58203125,    2.6640625,      9.1953125,     -9.5546875,
+            -5.50390625,   -2.392578125,   3.58203125,    -2.322265625,
+            -1.9814453125, 4.15625,        -1.7998046875, 9.296875
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'prelu',
+        'arguments': [{'input': 'preluInput'}, {'slope': 'preluSlope'}],
+        'outputs': 'preluOutput'
+      }],
+      'expectedOutputs': {
+        'preluOutput': {
+          'data': [
+            -23.8125,    -1.341796875, 8.4140625,     6.109375,    12.171875,
+            3.314453125, 1.1689453125, 0.71044921875, 46.3125,     5.7890625,
+            -25.78125,   9.609375,     7.328125,      -10.5390625, 7.06640625,
+            9.4375,      14.0859375,   20.703125,     8.4765625,   4.55078125,
+            18.359375,   -1.08984375,  1.326171875,   -68.9375
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'prelu float16 broadcast 4D x 1D slope',
+    'graph': {
+      'inputs': {
+        'preluInput': {
+          'data': [
+            -2.548828125, -4.79296875,    8.4140625,    6.109375,
+            -8.4921875,   3.314453125,    1.1689453125, -0.1417236328125,
+            -6.71484375,  5.7890625,      -3.755859375, -4.8984375,
+            7.328125,     -3.955078125,   7.06640625,   9.4375,
+            -2.55859375,  -8.65625,       8.4765625,    4.55078125,
+            -9.265625,    -0.26220703125, 1.326171875,  -7.41796875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'},
+          'constant': true
+        },
+        'preluSlope': {
+          'data': [5.07421875, 0.480712890625, -7.08984375],
+          'descriptor': {shape: [3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'prelu',
+        'arguments': [{'input': 'preluInput'}, {'slope': 'preluSlope'}],
+        'outputs': 'preluOutput'
+      }],
+      'expectedOutputs': {
+        'preluOutput': {
+          'data': [
+            -12.9296875,   -2.3046875,    8.4140625,     6.109375,
+            -4.08203125,   3.314453125,   1.1689453125,  -0.068115234375,
+            47.59375,      5.7890625,     -1.8056640625, 34.71875,
+            7.328125,      -1.9013671875, 7.06640625,    9.4375,
+            -1.2294921875, 61.375,        8.4765625,     4.55078125,
+            65.6875,       -1.330078125,  1.326171875,   52.59375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'prelu float16 broadcast 4D x 1D slope of shape [1]',
+    'graph': {
+      'inputs': {
+        'preluInput': {
+          'data': [
+            -2.548828125, -4.79296875,    8.4140625,    6.109375,
+            -8.4921875,   3.314453125,    1.1689453125, -0.1417236328125,
+            -6.71484375,  5.7890625,      -3.755859375, -4.8984375,
+            7.328125,     -3.955078125,   7.06640625,   9.4375,
+            -2.55859375,  -8.65625,       8.4765625,    4.55078125,
+            -9.265625,    -0.26220703125, 1.326171875,  -7.41796875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'},
+          'constant': true
+        },
+        'preluSlope': {
+          'data': [5.01171875],
+          'descriptor': {shape: [1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'prelu',
+        'arguments': [{'input': 'preluInput'}, {'slope': 'preluSlope'}],
+        'outputs': 'preluOutput'
+      }],
+      'expectedOutputs': {
+        'preluOutput': {
+          'data': [
+            -12.7734375, -24.015625,   8.4140625,      6.109375,   -42.5625,
+            3.314453125, 1.1689453125, -0.71044921875, -33.65625,  5.7890625,
+            -18.828125,  -24.546875,   7.328125,       -19.828125, 7.06640625,
+            9.4375,      -12.8203125,  -43.375,        8.4765625,  4.55078125,
+            -46.4375,    -1.314453125, 1.326171875,    -37.1875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'prelu float16 broadcast 4D x 2D slope',
+    'graph': {
+      'inputs': {
+        'preluInput': {
+          'data': [
+            -2.548828125, -4.79296875,    8.4140625,    6.109375,
+            -8.4921875,   3.314453125,    1.1689453125, -0.1417236328125,
+            -6.71484375,  5.7890625,      -3.755859375, -4.8984375,
+            7.328125,     -3.955078125,   7.06640625,   9.4375,
+            -2.55859375,  -8.65625,       8.4765625,    4.55078125,
+            -9.265625,    -0.26220703125, 1.326171875,  -7.41796875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'},
+          'constant': true
+        },
+        'preluSlope': {
+          'data': [4.875, -8.5, 1.181640625, -9.984375, -4.42578125, -6.65625],
+          'descriptor': {shape: [2, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'prelu',
+        'arguments': [{'input': 'preluInput'}, {'slope': 'preluSlope'}],
+        'outputs': 'preluOutput'
+      }],
+      'expectedOutputs': {
+        'preluOutput': {
+          'data': [
+            -12.421875,  40.75,        8.4140625,   6.109375,    37.59375,
+            3.314453125, 1.1689453125, 1.205078125, -7.93359375, 5.7890625,
+            16.625,      32.59375,     7.328125,    33.625,      7.06640625,
+            9.4375,      11.3203125,   57.625,      8.4765625,   4.55078125,
+            -10.9453125, 2.6171875,    1.326171875, 49.375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'prelu float16 broadcast 4D x 3D slope',
+    'graph': {
+      'inputs': {
+        'preluInput': {
+          'data': [
+            -2.548828125, -4.79296875,    8.4140625,    6.109375,
+            -8.4921875,   3.314453125,    1.1689453125, -0.1417236328125,
+            -6.71484375,  5.7890625,      -3.755859375, -4.8984375,
+            7.328125,     -3.955078125,   7.06640625,   9.4375,
+            -2.55859375,  -8.65625,       8.4765625,    4.55078125,
+            -9.265625,    -0.26220703125, 1.326171875,  -7.41796875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'},
+          'constant': true
+        },
+        'preluSlope': {
+          'data': [5.07421875, 0.480712890625, -7.08984375],
+          'descriptor': {shape: [1, 1, 3], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'prelu',
+        'arguments': [{'input': 'preluInput'}, {'slope': 'preluSlope'}],
+        'outputs': 'preluOutput'
+      }],
+      'expectedOutputs': {
+        'preluOutput': {
+          'data': [
+            -12.9296875,   -2.3046875,    8.4140625,     6.109375,
+            -4.08203125,   3.314453125,   1.1689453125,  -0.068115234375,
+            47.59375,      5.7890625,     -1.8056640625, 34.71875,
+            7.328125,      -1.9013671875, 7.06640625,    9.4375,
+            -1.2294921875, 61.375,        8.4765625,     4.55078125,
+            65.6875,       -1.330078125,  1.326171875,   52.59375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'prelu float16 broadcast 4D x 4D slope',
+    'graph': {
+      'inputs': {
+        'preluInput': {
+          'data': [
+            -2.548828125, -4.79296875,    8.4140625,    6.109375,
+            -8.4921875,   3.314453125,    1.1689453125, -0.1417236328125,
+            -6.71484375,  5.7890625,      -3.755859375, -4.8984375,
+            7.328125,     -3.955078125,   7.06640625,   9.4375,
+            -2.55859375,  -8.65625,       8.4765625,    4.55078125,
+            -9.265625,    -0.26220703125, 1.326171875,  -7.41796875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'},
+          'constant': true
+        },
+        'preluSlope': {
+          'data': [5.01171875],
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'prelu',
+        'arguments': [{'input': 'preluInput'}, {'slope': 'preluSlope'}],
+        'outputs': 'preluOutput'
+      }],
+      'expectedOutputs': {
+        'preluOutput': {
+          'data': [
+            -12.7734375, -24.015625,   8.4140625,      6.109375,   -42.5625,
+            3.314453125, 1.1689453125, -0.71044921875, -33.65625,  5.7890625,
+            -18.828125,  -24.546875,   7.328125,       -19.828125, 7.06640625,
+            9.4375,      -12.8203125,  -43.375,        8.4765625,  4.55078125,
+            -46.4375,    -1.314453125, 1.326171875,    -37.1875
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/qdq_subgraph.https.any.js b/tests/wpt/tests/webnn/conformance_tests/qdq_subgraph.https.any.js
new file mode 100644
index 00000000000..aa816cce7fb
--- /dev/null
+++ b/tests/wpt/tests/webnn/conformance_tests/qdq_subgraph.https.any.js
@@ -0,0 +1,1266 @@
+// META: title=test WebNN `dequantization -> operators -> quantization` subgraph
+// META: global=window,worker
+// META: variant=?cpu
+// META: variant=?gpu
+// META: variant=?npu
+// META: script=../resources/utils.js
+// META: timeout=long
+
+'use strict';
+
+const subgraphTests = [
+  {
+    'name': 'quantized conv2d',
+    'graph': {
+      'inputs': {
+        'input': {
+          'data': [0.05605664849281311, 0.7114229798316956, 0.6529743671417236],
+          'descriptor': {shape: [1, 1, 1, 3], dataType: 'float32'},
+          'constant': false
+        },
+        'inputScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputZeroPoint': {
+          'data': [-128],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'filter': {
+          'data': [2, 3, 4],
+          'descriptor': {shape: [1, 1, 1, 3], dataType: 'int8'},
+          'constant': true
+        },
+        'filterScale': {
+          'data': [0.023458752938762234],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'filterZeroPoint': {
+          'data': [0],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'bias': {
+          'data': [1],
+          'descriptor': {shape: [1], dataType: 'int32'},
+          'constant': true
+        },
+        'biasScale': {
+          'data': [0.000091995115004270],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'biasZeroPoint': {
+          'data': [0],
+          'descriptor': {shape: [1], dataType: 'int32'},
+          'constant': true
+        },
+        'outputScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'outputZeroPoint': {
+          'data': [0],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+      },
+      'operators': [
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'input'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'quantizedInput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedInput'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'dequantizedInput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'filter'},
+            {'scale': 'filterScale', 'zeroPoint': 'filterZeroPoint'}
+          ],
+          'outputs': 'dequantizedFilter'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'bias'},
+            {'scale': 'biasScale', 'zeroPoint': 'biasZeroPoint'}
+          ],
+          'outputs': 'dequantizedBias'
+        },
+        {
+          'name': 'conv2d',
+          'arguments': [
+            {'input': 'dequantizedInput'}, {'filter': 'dequantizedFilter'}, {
+              'options': {
+                'inputLayout': 'nhwc',
+                'bias': 'dequantizedBias',
+                'filterLayout': 'ohwi'
+              }
+            }
+          ],
+          'outputs': 'conv2dOutput'
+        },
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'conv2dOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'quantizedConv2dOutput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedConv2dOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [0.11372549831867218],
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'quantized element-wise binary add',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.41167140007019043,  0.0479511022567749,  0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+          ],
+          'descriptor': {shape: [1, 1, 2, 3], dataType: 'float32'},
+          'constant': false
+        },
+        'inputAScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputAZeroPoint': {
+          'data': [-128],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'inputB': {
+          'data': [
+            2,  7,  8, 11, 5, 23,
+          ],
+          'descriptor': {shape: [1, 1, 2, 3], dataType: 'int8'},
+          'constant': true
+        },
+        'inputBScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputBZeroPoint': {
+          'data': [-128],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'outputScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'outputZeroPoint': {
+          'data': [-128],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+      },
+      'operators': [
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'inputA'},
+            {'scale': 'inputAScale', 'zeroPoint': 'inputAZeroPoint'}
+          ],
+          'outputs': 'quantizedInputA'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedInputA'},
+            {'scale': 'inputAScale', 'zeroPoint': 'inputAZeroPoint'}
+          ],
+          'outputs': 'dequantizedInputA'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'inputB'},
+            {'scale': 'inputBScale', 'zeroPoint': 'inputBZeroPoint'}
+          ],
+          'outputs': 'dequantizedInputB'
+        },
+        {
+          'name': 'add',
+          'arguments': [
+            {'inputA': 'dequantizedInputA'}, {'inputB': 'dequantizedInputB'}
+          ],
+          'outputs': 'addOutput'
+        },
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'addOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'quantizedAddOutput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedAddOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.9215686917304993, 0.5764706134796143, 0.8666667342185974,
+            0.7450980544090271, 0.9333333969116211, 0.6705882549285889,
+          ],
+          'descriptor': {shape: [1, 1, 2, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'quantized element-wise binary sub',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            15.57776927947998, -62.7008056640625,
+            82.55709075927734, -74.90638732910156,
+          ],
+          'descriptor': {shape: [2, 2], dataType: 'float32'},
+          'constant': false
+        },
+        'inputAScale': {
+          'data': [0.617084980010986],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputAZeroPoint': {
+          'data': [120],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'inputB': {
+          'data': [
+            12, 9, 2, 43,
+          ],
+          'descriptor': {shape: [2, 2], dataType: 'int8'},
+          'constant': true
+        },
+        'inputBScale': {
+          'data': [0.617084980010986],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputBZeroPoint': {
+          'data': [120],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'outputScale': {
+          'data': [0.617084980010986],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'outputZeroPoint': {
+          'data': [120],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+      },
+      'operators': [
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'inputA'},
+            {'scale': 'inputAScale', 'zeroPoint': 'inputAZeroPoint'}
+          ],
+          'outputs': 'quantizedInputA'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedInputA'},
+            {'scale': 'inputAScale', 'zeroPoint': 'inputAZeroPoint'}
+          ],
+          'outputs': 'dequantizedInputA'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'inputB'},
+            {'scale': 'inputBScale', 'zeroPoint': 'inputBZeroPoint'}
+          ],
+          'outputs': 'dequantizedInputB'
+        },
+        {
+          'name': 'sub',
+          'arguments': [
+            {'inputA': 'dequantizedInputA'}, {'inputB': 'dequantizedInputB'}
+          ],
+          'outputs': 'subOutput'
+        },
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'subOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'quantizedSubOutput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedSubOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            4.319594860076904, 4.319594860076904, 4.319594860076904,
+            -27.1517391204834,
+          ],
+          'descriptor': {shape: [2, 2], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'quantized element-wise binary mul',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            49.1112174987793,    11.907459259033203,   21.115795135498047,
+            70.7490005493164,    94.51628112792969,   93.78905487060547,
+            11.178888320922852,  32.80592346191406,   83.31897735595703,
+            91.1207275390625,    0.11235756427049637, 15.397955894470215,
+          ],
+          'descriptor': {shape: [2, 3, 2], dataType: 'float32'},
+          'constant': false
+        },
+        'inputAScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputAZeroPoint': {
+          'data': [127],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'inputB': {
+          'data': [
+            2,  17, 38, 41, 5, 3, 2, 17, 38, 41, 5, 3,
+          ],
+          'descriptor': {shape: [2, 3, 2], dataType: 'int8'},
+          'constant': true
+        },
+        'inputBScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputBZeroPoint': {
+          'data': [127],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'outputScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'outputZeroPoint': {
+          'data': [127],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+      },
+      'operators': [
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'inputA'},
+            {'scale': 'inputAScale', 'zeroPoint': 'inputAZeroPoint'}
+          ],
+          'outputs': 'quantizedInputA'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedInputA'},
+            {'scale': 'inputAScale', 'zeroPoint': 'inputAZeroPoint'}
+          ],
+          'outputs': 'dequantizedInputA'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'inputB'},
+            {'scale': 'inputBScale', 'zeroPoint': 'inputBZeroPoint'}
+          ],
+          'outputs': 'dequantizedInputB'
+        },
+        {
+          'name': 'add',
+          'arguments': [
+            {'inputA': 'dequantizedInputA'}, {'inputB': 'dequantizedInputB'}
+          ],
+          'outputs': 'addOutput'
+        },
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'addOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'quantizedAddOutput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedAddOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -0.4901961088180542, -0.43137258291244507, -0.3490196168422699,
+            -0.33725491166114807, -0.4784314036369324, -0.4862745404243469,
+            -0.4901961088180542, -0.43137258291244507, -0.3490196168422699,
+            -0.33725491166114807, -0.4784314036369324, -0.4862745404243469,
+          ],
+          'descriptor': {shape: [2, 3, 2], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'quantized transpose',
+    'graph': {
+      'inputs': {
+        'input': {
+          'data': [
+            0.6811466217041016, 0.0479511022567749, 0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+          ],
+          'descriptor': {shape: [1, 1, 2, 3], dataType: 'float32'},
+          'constant': false
+        },
+        'inputScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputZeroPoint': {
+          'data': [-128],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'outputScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'outputZeroPoint': {
+          'data': [-128],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+      },
+      'operators': [
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'input'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'quantizedInput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedInput'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'dequantizedInput'
+        },
+        {
+          'name': 'transpose',
+          'arguments': [{'input': 'dequantizedInput'}],
+          'outputs': 'transposeOutput'
+        },
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'transposeOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'quantizedTransposeOutput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedTransposeOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.6823529601097107, 0.20000001788139343,
+            0.0470588281750679, 0.4117647409439087,
+            0.3333333432674408, 0.0784313753247261,
+          ],
+          'descriptor': {shape: [3, 2, 1, 1], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'quantized tanh',
+    'graph': {
+      'inputs': {
+        'input': {
+          'data': [
+            0.6811466217041016, 0.0479511022567749, 0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+          ],
+          'descriptor': {shape: [2, 3], dataType: 'float32'},
+          'constant': false
+        },
+        'inputScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputZeroPoint': {
+          'data': [-128],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'outputScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'outputZeroPoint': {
+          'data': [-128],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+      },
+      'operators': [
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'input'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'quantizedInput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedInput'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'dequantizedInput'
+        },
+        {
+          'name': 'tanh',
+          'arguments': [{'input': 'dequantizedInput'}],
+          'outputs': 'tanhOutput'
+        },
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'tanhOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'quantizedTanhOutput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedTanhOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.5921568870544434, 0.0470588281750679, 0.32156863808631897,
+            0.19607844948768616, 0.38823533058166504, 0.0784313753247261,
+          ],
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'quantized sigmoid',
+    'graph': {
+      'inputs': {
+        'input': {
+          'data': [
+            0.6811466217041016, 0.0479511022567749, 0.33355462551116943,
+            0.19882695376873016, 0.41167140007019043, 0.07934240251779556,
+          ],
+          'descriptor': {shape: [2, 3], dataType: 'float32'},
+          'constant': false
+        },
+        'inputScale': {
+          'data': [0.00390625],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputZeroPoint': {
+          'data': [-128],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'outputScale': {
+          'data': [0.00390625],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'outputZeroPoint': {
+          'data': [-128],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+      },
+      'operators': [
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'input'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'quantizedInput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedInput'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'dequantizedInput'
+        },
+        {
+          'name': 'sigmoid',
+          'arguments': [{'input': 'dequantizedInput'}],
+          'outputs': 'sigmoidOutput'
+        },
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'sigmoidOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'quantizedSigmoidOutput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedSigmoidOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.6640625, 0.51171875, 0.58203125,
+            0.55078125, 0.6015625, 0.51953125,
+          ],
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'quantized leaky relu',
+    'graph': {
+      'inputs': {
+        'input': {
+          'data': [
+            1.6811466217041016, 0.0479511022567749, 0.33355462551116943,
+            -0.1988269537687301, -0.0041167140007019, -0.0634240251779556,
+          ],
+          'descriptor': {shape: [2, 3], dataType: 'float32'},
+          'constant': false
+        },
+        'inputScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputZeroPoint': {
+          'data': [0],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'outputScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'outputZeroPoint': {
+          'data': [0],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+      },
+      'operators': [
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'input'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'quantizedInput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedInput'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'dequantizedInput'
+        },
+        {
+          'name': 'leakyRelu',
+          'arguments': [
+            {'input': 'dequantizedInput'},
+            {'options': {'alpha': 5.799162942273234}}
+          ],
+          'outputs': 'leakyReluOutput'
+        },
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'leakyReluOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'quantizedLeakyReluOutput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedLeakyReluOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.49803924560546875, 0.0470588281750679, 0.3333333432674408,
+            -0.501960813999176, -0.02352941408753395, -0.364705890417099,
+          ],
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'quantized concat',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            -0.990639865398407, -0.576785683631897, -0.32276400923728943,
+            -0.44735023379325867, -0.11028251051902771, -0.5945112705230713,
+          ],
+          'descriptor': {shape: [3, 2], dataType: 'float32'},
+          'constant': false
+        },
+        'inputAScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputAZeroPoint': {
+          'data': [127],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'inputB': {
+          'data': [
+            2, 27, 38,
+          ],
+          'descriptor': {shape: [3, 1], dataType: 'int8'},
+          'constant': true
+        },
+        'inputBScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputBZeroPoint': {
+          'data': [127],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'outputScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'outputZeroPoint': {
+          'data': [127],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+      },
+      'operators': [
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'inputA'},
+            {'scale': 'inputAScale', 'zeroPoint': 'inputAZeroPoint'}
+          ],
+          'outputs': 'quantizedInputA'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedInputA'},
+            {'scale': 'inputAScale', 'zeroPoint': 'inputAZeroPoint'}
+          ],
+          'outputs': 'dequantizedInputA'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'inputB'},
+            {'scale': 'inputBScale', 'zeroPoint': 'inputBZeroPoint'}
+          ],
+          'outputs': 'dequantizedInputB'
+        },
+        {
+          'name': 'concat',
+          'arguments': [
+            {
+              'inputs': ['dequantizedInputA', 'dequantizedInputB']
+            },
+            {'axis': 1}
+          ],
+          'outputs': 'concatOutput'
+        },
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'concatOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'quantizedConcatOutput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedConcatOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -0.9921569228172302, -0.5764706134796143, -0.4901961088180542,
+            -0.32156863808631897, -0.44705885648727417, -0.3921568989753723,
+            -0.1098039299249649, -0.5960784554481506, -0.3490196168422699,
+          ],
+          'descriptor': {shape: [3, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'quantized elu',
+    'graph': {
+      'inputs': {
+        'input': {
+          'data': [
+            1.6811466217041016, 0.0479511022567749, 0.33355462551116943,
+            -0.1988269537687301, -0.0041167140007019, -0.0634240251779556,
+          ],
+          'descriptor': {shape: [2, 3], dataType: 'float32'},
+          'constant': false
+        },
+        'inputScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputZeroPoint': {
+          'data': [0],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'outputScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'outputZeroPoint': {
+          'data': [0],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+      },
+      'operators': [
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'input'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'quantizedInput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedInput'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'dequantizedInput'
+        },
+        {
+          'name': 'elu',
+          'arguments': [{'input': 'dequantizedInput'}],
+          'outputs': 'eluOutput'
+        },
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'eluOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'quantizedEluOutput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedEluOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.49803924560546875, 0.0470588281750679, 0.3333333432674408,
+            -0.18039216101169586, -0.003921568859368563, -0.062745101749897,
+          ],
+          'descriptor': {shape: [2, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'quantized averagePool2d',
+    'graph': {
+      'inputs': {
+        'input': {
+          'data': [
+            -2.549168109893799, -4.794857501983643,
+            8.413617134094238, 6.108623504638672
+          ],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'float32'},
+          'constant': false
+        },
+        'inputScale': {
+          'data': [0.343092918395996],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputZeroPoint': {
+          'data': [-128],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'outputScale': {
+          'data': [0.343092918395996],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'outputZeroPoint': {
+          'data': [-128],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+      },
+      'operators': [
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'input'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'quantizedInput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedInput'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'dequantizedInput'
+        },
+        {
+          'name': 'averagePool2d',
+          'arguments': [{'input': 'dequantizedInput'}, {'options': {'layout': 'nhwc'}}],
+          'outputs': 'averagePool2dOutput'
+        },
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'averagePool2dOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'quantizedAveragePool2dOutput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedAveragePool2dOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            3.774022102355957,
+          ],
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'quantized maxPool2d',
+    'graph': {
+      'inputs': {
+        'input': {
+          'data': [
+            -2.549168109893799, -4.794857501983643,
+            8.413617134094238, 6.108623504638672
+          ],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'float32'},
+          'constant': false
+        },
+        'inputScale': {
+          'data': [0.343092918395996],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputZeroPoint': {
+          'data': [-128],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'outputScale': {
+          'data': [0.343092918395996],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'outputZeroPoint': {
+          'data': [-128],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+      },
+      'operators': [
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'input'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'quantizedInput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedInput'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'dequantizedInput'
+        },
+        {
+          'name': 'maxPool2d',
+          'arguments': [{'input': 'dequantizedInput'}, {'options': {'layout': 'nhwc'}}],
+          'outputs': 'maxPool2dOutput'
+        },
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'maxPool2dOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'quantizedMaxPool2dOutput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedMaxPool2dOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            8.577322959899902,
+          ],
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'quantized reshape',
+    'graph': {
+      'inputs': {
+        'input': {
+          'data': [
+            1.6811466217041016, 0.0479511022567749, 0.33355462551116943,
+            -0.1988269537687301, -0.0041167140007019, -0.0634240251779556,
+          ],
+          'descriptor': {shape: [2, 3], dataType: 'float32'},
+          'constant': false
+        },
+        'inputScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'inputZeroPoint': {
+          'data': [16],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+        'outputScale': {
+          'data': [0.003921568859368563],
+          'descriptor': {shape: [1], dataType: 'float32'},
+          'constant': true
+        },
+        'outputZeroPoint': {
+          'data': [16],
+          'descriptor': {shape: [1], dataType: 'int8'},
+          'constant': true
+        },
+      },
+      'operators': [
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'input'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'quantizedInput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedInput'},
+            {'scale': 'inputScale', 'zeroPoint': 'inputZeroPoint'}
+          ],
+          'outputs': 'dequantizedInput'
+        },
+        {
+          'name': 'reshape',
+          'arguments': [{'input': 'dequantizedInput'}, {'newShape': [3, 2]}],
+          'outputs': 'reshapeOutput'
+        },
+        {
+          'name': 'quantizeLinear',
+          'arguments': [
+            {'input': 'reshapeOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'quantizedReshapeOutput'
+        },
+        {
+          'name': 'dequantizeLinear',
+          'arguments': [
+            {'input': 'quantizedReshapeOutput'},
+            {'scale': 'outputScale', 'zeroPoint': 'outputZeroPoint'}
+          ],
+          'outputs': 'output'
+        }
+      ],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            0.43529415130615234, 0.0470588281750679,
+            0.3333333432674408, -0.20000001788139343,
+            -0.003921568859368563, -0.062745101749897,
+          ],
+          'descriptor': {shape: [3, 2], dataType: 'float32'}
+        }
+      }
+    }
+  },
+];
+
+if (navigator.ml) {
+  subgraphTests.forEach((test) => {
+    webnn_conformance_test(buildAndExecuteGraph, getPrecisionTolerance, test);
+  });
+} else {
+  test(() => assert_implements(navigator.ml, 'missing navigator.ml'));
+}
diff --git a/tests/wpt/tests/webnn/conformance_tests/quantizeLinear.https.any.js b/tests/wpt/tests/webnn/conformance_tests/quantizeLinear.https.any.js
index c25bdbaac60..af46c8945a3 100644
--- a/tests/wpt/tests/webnn/conformance_tests/quantizeLinear.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/quantizeLinear.https.any.js
@@ -18,7 +18,7 @@
 
 
 const getQuantizeLinearPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {int8: 1, uint8: 1, int4: 1, uint4: 1};
+  const toleranceValueDict = {int32: 1, int8: 1, uint8: 1, int4: 1, uint4: 1};
   const expectedDataType =
       getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
   return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
@@ -202,7 +202,7 @@ const quantizeLinearTests = [
           'constant': true
         },
         'quantizeLinearScale': {
-          'data': [0.2800687253475189, -4.617084980010986],
+          'data': [0.2800687253475189, 4.617084980010986],
           'descriptor': {shape: [2, 1], dataType: 'float32'},
           'constant': true
         },
@@ -222,7 +222,7 @@ const quantizeLinearTests = [
       }],
       'expectedOutputs': {
         'quantizeLinearOutput': {
-          'data': [119, 111, 126, 127],
+          'data': [119, 111, 130, 129],
           'descriptor': {shape: [1, 1, 2, 2], dataType: 'uint8'}
         }
       }
@@ -574,6 +574,44 @@ const quantizeLinearTests = [
         }
       }
     }
+  },
+
+  {
+    'name': 'quantizeLinear int32 1D tensor with float32 scalar scale',
+    'graph': {
+      'inputs': {
+        'quantizeLinearInput': {
+          'data': [-22405.495643615723, 7391418.921366602],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': false
+        },
+        'quantizeLinearScale': {
+          'data': [1.1202747821807861, 0.2800687253475189],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': true
+        },
+        'quantizeLinearZeroPoint': {
+          'data': [32345, -2445234],
+          'descriptor': {shape: [2], dataType: 'int32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'quantizeLinear',
+        'arguments': [
+          {'input': 'quantizeLinearInput'},
+          {'scale': 'quantizeLinearScale'},
+          {'zeroPoint': 'quantizeLinearZeroPoint'}
+        ],
+        'outputs': 'quantizeLinearOutput'
+      }],
+      'expectedOutputs': {
+        'quantizeLinearOutput': {
+          'data': [12345, 23946213],
+          'descriptor': {shape: [2], dataType: 'int32'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_l1.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_l1.https.any.js
index 63a6ab727cb..1e6b163cff3 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_l1.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_l1.https.any.js
@@ -73,6 +73,29 @@ const reduceL1Tests = [
       }
     }
   },
+  {
+    'name': 'reduceL1 float32 1D constant tensor empty axes',
+    'graph': {
+      'inputs': {
+        'reduceL1Input': {
+          'data': [-5.50882625579834, 5.50882625579833],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'reduceL1',
+        'arguments': [{'input': 'reduceL1Input'}, {'options': {'axes': []}}],
+        'outputs': 'reduceL1Output'
+      }],
+      'expectedOutputs': {
+        'reduceL1Output': {
+          'data': [5.50882625579834, 5.50882625579833],
+          'descriptor': {shape: [2], dataType: 'float32'}
+        }
+      }
+    }
+  },
   {
     'name': 'reduceL1 float32 1D constant tensor all positive default options',
     'graph': {
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_l2.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_l2.https.any.js
index 7358ee8a15c..0670a1d25c1 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_l2.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_l2.https.any.js
@@ -74,6 +74,29 @@ const reduceL2Tests = [
       }
     }
   },
+  {
+    'name': 'reduceL2 float32 1D constant tensor empty axes',
+    'graph': {
+      'inputs': {
+        'reduceL2Input': {
+          'data': [-4.860228061676025, 4.860228061676024],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'reduceL2',
+        'arguments': [{'input': 'reduceL2Input'}, {'options': {'axes': []}}],
+        'outputs': 'reduceL2Output'
+      }],
+      'expectedOutputs': {
+        'reduceL2Output': {
+          'data': [4.860228061676025, 4.860228061676024],
+          'descriptor': {shape: [2], dataType: 'float32'}
+        }
+      }
+    }
+  },
   {
     'name': 'reduceL2 float32 1D constant tensor all positive default options',
     'graph': {
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum.https.any.js
index 31e21dbd50a..9d30accb2cb 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum.https.any.js
@@ -75,6 +75,30 @@ const reduceLogSumTests = [
       }
     }
   },
+  {
+    'name': 'reduceLogSum float32 1D constant tensor empty axes',
+    'graph': {
+      'inputs': {
+        'reduceLogSumInput': {
+          'data': [64.54827117919922, 64.54827117919922],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'reduceLogSum',
+        'arguments':
+            [{'input': 'reduceLogSumInput'}, {'options': {'axes': []}}],
+        'outputs': 'reduceLogSumOutput'
+      }],
+      'expectedOutputs': {
+        'reduceLogSumOutput': {
+          'data': [4.167413234710693, 4.167413234710693],
+          'descriptor': {shape: [2], dataType: 'float32'}
+        }
+      }
+    }
+  },
   {
     'name':
         'reduceLogSum float32 1D constant tensor all non-negative default options',
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum_exp.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum_exp.https.any.js
index e60d6cfc892..e8026435017 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum_exp.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_log_sum_exp.https.any.js
@@ -75,6 +75,30 @@ const reduceLogSumExpTests = [
       }
     }
   },
+  {
+    'name': 'reduceLogSumExp float32 1D constant tensor empty axes',
+    'graph': {
+      'inputs': {
+        'reduceLogSumExpInput': {
+          'data': [0.7974132895469666, 0.7974132895469665],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'reduceLogSumExp',
+        'arguments':
+            [{'input': 'reduceLogSumExpInput'}, {'options': {'axes': []}}],
+        'outputs': 'reduceLogSumExpOutput'
+      }],
+      'expectedOutputs': {
+        'reduceLogSumExpOutput': {
+          'data': [0.7974132895469666, 0.7974132895469665],
+          'descriptor': {shape: [2], dataType: 'float32'}
+        }
+      }
+    }
+  },
   {
     'name':
         'reduceLogSumExp float32 1D constant tensor all positive default options',
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_max.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_max.https.any.js
index 03458a30470..784db3101b6 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_max.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_max.https.any.js
@@ -73,6 +73,29 @@ const reduceMaxTests = [
       }
     }
   },
+  {
+    'name': 'reduceMax float32 1D constant tensor empty axes',
+    'graph': {
+      'inputs': {
+        'reduceMaxInput': {
+          'data': [32.16658401489258, 32.16658401489257],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'reduceMax',
+        'arguments': [{'input': 'reduceMaxInput'}, {'options': {'axes': []}}],
+        'outputs': 'reduceMaxOutput'
+      }],
+      'expectedOutputs': {
+        'reduceMaxOutput': {
+          'data': [32.16658401489258, 32.16658401489257],
+          'descriptor': {shape: [2], dataType: 'float32'}
+        }
+      }
+    }
+  },
   {
     'name': 'reduceMax float32 1D constant tensor default options',
     'graph': {
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_mean.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_mean.https.any.js
index e9c9475088a..63566b011c0 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_mean.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_mean.https.any.js
@@ -73,6 +73,29 @@ const reduceMeanTests = [
       }
     }
   },
+  {
+    'name': 'reduceMean float32 1D constant tensor empty axes',
+    'graph': {
+      'inputs': {
+        'reduceMeanInput': {
+          'data': [-95.84498596191406, 95.84498596191405],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'reduceMean',
+        'arguments': [{'input': 'reduceMeanInput'}, {'options': {'axes': []}}],
+        'outputs': 'reduceMeanOutput'
+      }],
+      'expectedOutputs': {
+        'reduceMeanOutput': {
+          'data': [-95.84498596191406, 95.84498596191405],
+          'descriptor': {shape: [2], dataType: 'float32'}
+        }
+      }
+    }
+  },
   {
     'name':
         'reduceMean float32 1D constant tensor all positive default options',
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_min.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_min.https.any.js
index aca474d74ff..64cf8b7ee98 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_min.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_min.https.any.js
@@ -73,6 +73,29 @@ const reduceMinTests = [
       }
     }
   },
+  {
+    'name': 'reduceMin float32 1D constant tensor empty axes',
+    'graph': {
+      'inputs': {
+        'reduceMinInput': {
+          'data': [-58.76195526123047, 58.76195526123047],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'reduceMin',
+        'arguments': [{'input': 'reduceMinInput'}, {'options': {'axes': []}}],
+        'outputs': 'reduceMinOutput'
+      }],
+      'expectedOutputs': {
+        'reduceMinOutput': {
+          'data': [-58.76195526123047, 58.76195526123047],
+          'descriptor': {shape: [2], dataType: 'float32'}
+        }
+      }
+    }
+  },
   {
     'name': 'reduceMin float32 1D constant tensor default options',
     'graph': {
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_product.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_product.https.any.js
index 9534c5b92e5..6b4c1242d7f 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_product.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_product.https.any.js
@@ -75,6 +75,30 @@ const reduceProductTests = [
       }
     }
   },
+  {
+    'name': 'reduceProduct float32 1D constant tensor empty axes',
+    'graph': {
+      'inputs': {
+        'reduceProductInput': {
+          'data': [-68.75911712646484, -68.75911712646483],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'reduceProduct',
+        'arguments':
+            [{'input': 'reduceProductInput'}, {'options': {'axes': []}}],
+        'outputs': 'reduceProductOutput'
+      }],
+      'expectedOutputs': {
+        'reduceProductOutput': {
+          'data': [-68.75911712646484, -68.75911712646483],
+          'descriptor': {shape: [2], dataType: 'float32'}
+        }
+      }
+    }
+  },
   {
     'name': 'reduceProduct float32 1D constant tensor default options',
     'graph': {
diff --git a/tests/wpt/tests/webnn/conformance_tests/reduce_sum.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reduce_sum.https.any.js
index 687f8e5e7ee..d333f9fb5ad 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reduce_sum.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reduce_sum.https.any.js
@@ -73,6 +73,29 @@ const reduceSumTests = [
       }
     }
   },
+  {
+    'name': 'reduceSum float32 1D constant tensor empty axes',
+    'graph': {
+      'inputs': {
+        'reduceSumInput': {
+          'data': [69.6038589477539, 69.6038589477538],
+          'descriptor': {shape: [2], dataType: 'float32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'reduceSum',
+        'arguments': [{'input': 'reduceSumInput'}, {'options': {'axes': []}}],
+        'outputs': 'reduceSumOutput'
+      }],
+      'expectedOutputs': {
+        'reduceSumOutput': {
+          'data': [69.6038589477539, 69.6038589477538],
+          'descriptor': {shape: [2], dataType: 'float32'}
+        }
+      }
+    }
+  },
   {
     'name': 'reduceSum float32 1D constant tensor all positive default options',
     'graph': {
diff --git a/tests/wpt/tests/webnn/conformance_tests/relu.https.any.js b/tests/wpt/tests/webnn/conformance_tests/relu.https.any.js
index 30b797637db..63ef9fa9ff0 100644
--- a/tests/wpt/tests/webnn/conformance_tests/relu.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/relu.https.any.js
@@ -374,7 +374,268 @@ const reluTests = [
         }
       }
     }
-  }
+  },
+
+  // float16 tests
+  {
+    'name': 'relu float16 1D constant tensor',
+    'graph': {
+      'inputs': {
+        'reluInput': {
+          'data': [
+            79.0625,   2.25,      80.75,    63.90625,   77.6875,    -71.0625,
+            -82.75,    -26.8125,  -99.1875, -35.71875,  18.359375,  -37.375,
+            -52.84375, -10.40625, 60.59375, -13.640625, -76.5625,   -8.1328125,
+            51.5,      -51.625,   -64.5625, -5.09375,   15.3515625, 90.0625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'relu',
+        'arguments': [{'input': 'reluInput'}],
+        'outputs': 'reluOutput'
+      }],
+      'expectedOutputs': {
+        'reluOutput': {
+          'data': [
+            79.0625, 2.25,      80.75, 63.90625, 77.6875,    0,        0, 0, 0,
+            0,       18.359375, 0,     0,        0,          60.59375, 0, 0, 0,
+            51.5,    0,         0,     0,        15.3515625, 90.0625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'relu float16 0D tensor',
+    'graph': {
+      'inputs': {
+        'reluInput':
+            {'data': [79.0625], 'descriptor': {shape: [], dataType: 'float16'}}
+      },
+      'operators': [{
+        'name': 'relu',
+        'arguments': [{'input': 'reluInput'}],
+        'outputs': 'reluOutput'
+      }],
+      'expectedOutputs': {
+        'reluOutput':
+            {'data': [79.0625], 'descriptor': {shape: [], dataType: 'float16'}}
+      }
+    }
+  },
+  {
+    'name': 'relu float16 1D tensor',
+    'graph': {
+      'inputs': {
+        'reluInput': {
+          'data': [
+            79.0625,   2.25,      80.75,    63.90625,   77.6875,    -71.0625,
+            -82.75,    -26.8125,  -99.1875, -35.71875,  18.359375,  -37.375,
+            -52.84375, -10.40625, 60.59375, -13.640625, -76.5625,   -8.1328125,
+            51.5,      -51.625,   -64.5625, -5.09375,   15.3515625, 90.0625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'relu',
+        'arguments': [{'input': 'reluInput'}],
+        'outputs': 'reluOutput'
+      }],
+      'expectedOutputs': {
+        'reluOutput': {
+          'data': [
+            79.0625, 2.25,      80.75, 63.90625, 77.6875,    0,        0, 0, 0,
+            0,       18.359375, 0,     0,        0,          60.59375, 0, 0, 0,
+            51.5,    0,         0,     0,        15.3515625, 90.0625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'relu float16 2D tensor',
+    'graph': {
+      'inputs': {
+        'reluInput': {
+          'data': [
+            79.0625,   2.25,      80.75,    63.90625,   77.6875,    -71.0625,
+            -82.75,    -26.8125,  -99.1875, -35.71875,  18.359375,  -37.375,
+            -52.84375, -10.40625, 60.59375, -13.640625, -76.5625,   -8.1328125,
+            51.5,      -51.625,   -64.5625, -5.09375,   15.3515625, 90.0625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'relu',
+        'arguments': [{'input': 'reluInput'}],
+        'outputs': 'reluOutput'
+      }],
+      'expectedOutputs': {
+        'reluOutput': {
+          'data': [
+            79.0625, 2.25,      80.75, 63.90625, 77.6875,    0,        0, 0, 0,
+            0,       18.359375, 0,     0,        0,          60.59375, 0, 0, 0,
+            51.5,    0,         0,     0,        15.3515625, 90.0625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'relu float16 3D tensor',
+    'graph': {
+      'inputs': {
+        'reluInput': {
+          'data': [
+            79.0625,   2.25,      80.75,    63.90625,   77.6875,    -71.0625,
+            -82.75,    -26.8125,  -99.1875, -35.71875,  18.359375,  -37.375,
+            -52.84375, -10.40625, 60.59375, -13.640625, -76.5625,   -8.1328125,
+            51.5,      -51.625,   -64.5625, -5.09375,   15.3515625, 90.0625
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'relu',
+        'arguments': [{'input': 'reluInput'}],
+        'outputs': 'reluOutput'
+      }],
+      'expectedOutputs': {
+        'reluOutput': {
+          'data': [
+            79.0625, 2.25,      80.75, 63.90625, 77.6875,    0,        0, 0, 0,
+            0,       18.359375, 0,     0,        0,          60.59375, 0, 0, 0,
+            51.5,    0,         0,     0,        15.3515625, 90.0625
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'relu float16 4D tensor',
+    'graph': {
+      'inputs': {
+        'reluInput': {
+          'data': [
+            79.0625,   2.25,      80.75,    63.90625,   77.6875,    -71.0625,
+            -82.75,    -26.8125,  -99.1875, -35.71875,  18.359375,  -37.375,
+            -52.84375, -10.40625, 60.59375, -13.640625, -76.5625,   -8.1328125,
+            51.5,      -51.625,   -64.5625, -5.09375,   15.3515625, 90.0625
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'relu',
+        'arguments': [{'input': 'reluInput'}],
+        'outputs': 'reluOutput'
+      }],
+      'expectedOutputs': {
+        'reluOutput': {
+          'data': [
+            79.0625, 2.25,      80.75, 63.90625, 77.6875,    0,        0, 0, 0,
+            0,       18.359375, 0,     0,        0,          60.59375, 0, 0, 0,
+            51.5,    0,         0,     0,        15.3515625, 90.0625
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'relu float16 5D tensor',
+    'graph': {
+      'inputs': {
+        'reluInput': {
+          'data': [
+            79.0625,   2.25,      80.75,    63.90625,   77.6875,    -71.0625,
+            -82.75,    -26.8125,  -99.1875, -35.71875,  18.359375,  -37.375,
+            -52.84375, -10.40625, 60.59375, -13.640625, -76.5625,   -8.1328125,
+            51.5,      -51.625,   -64.5625, -5.09375,   15.3515625, 90.0625
+          ],
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'relu',
+        'arguments': [{'input': 'reluInput'}],
+        'outputs': 'reluOutput'
+      }],
+      'expectedOutputs': {
+        'reluOutput': {
+          'data': [
+            79.0625, 2.25,      80.75, 63.90625, 77.6875,    0,        0, 0, 0,
+            0,       18.359375, 0,     0,        0,          60.59375, 0, 0, 0,
+            51.5,    0,         0,     0,        15.3515625, 90.0625
+          ],
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+
+  // int8 tests
+  {
+    'name': 'relu int8 4D tensor',
+    'graph': {
+      'inputs': {
+        'reluInput': {
+          'data': [
+            // int8 range: [/* -(2**7) */ -128, /* 2**7 - 1 */ 127]
+            -128, 0, 126, 127
+          ],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'int8'}
+        }
+      },
+      'operators': [{
+        'name': 'relu',
+        'arguments': [{'input': 'reluInput'}],
+        'outputs': 'reluOutput'
+      }],
+      'expectedOutputs': {
+        'reluOutput': {
+          'data': [0, 0, 126, 127],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'int8'}
+        }
+      }
+    }
+  },
+
+  // int32 tests
+  {
+    'name': 'relu int32 4D tensor',
+    'graph': {
+      'inputs': {
+        'reluInput': {
+          'data': [
+            // int32 range: [/* -(2**31) */ -2147483648, /* 2**31 - 1 */ 2147483647]
+            -2147483648, 0, 2147483646, 2147483647
+          ],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'int32'}
+        }
+      },
+      'operators': [{
+        'name': 'relu',
+        'arguments': [{'input': 'reluInput'}],
+        'outputs': 'reluOutput'
+      }],
+      'expectedOutputs': {
+        'reluOutput': {
+          'data': [0, 0, 2147483646, 2147483647],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'int32'}
+        }
+      }
+    }
+  },
 ];
 
 if (navigator.ml) {
diff --git a/tests/wpt/tests/webnn/conformance_tests/reshape.https.any.js b/tests/wpt/tests/webnn/conformance_tests/reshape.https.any.js
index fe758193730..05b8ea21e67 100644
--- a/tests/wpt/tests/webnn/conformance_tests/reshape.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/reshape.https.any.js
@@ -56,6 +56,48 @@ const reshapeTests = [
       }
     }
   },
+  {
+    'name':
+        'reshape float32 constant tensor to a new shape (reorder all dimensions)',
+    'graph': {
+      'inputs': {
+        'reshapeInput': {
+          'data': [
+            -30.0561466217041,  99.56941986083984,   88.04620361328125,
+            -91.87507629394531, -23.7972354888916,   -91.28665161132812,
+            -63.15204620361328, 12.0669527053833,    -96.1172866821289,
+            -44.77365493774414, -80.08650970458984,  -64.43756866455078,
+            27.64195442199707,  -96.86306762695312,  83.6834716796875,
+            50.599483489990234, -20.18765640258789,  -1.3904608488082886,
+            -96.93603515625,    65.34143829345703,   34.835994720458984,
+            62.01485824584961,  -2.8698415756225586, 27.903749465942383
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float32'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'reshape',
+        'arguments': [{'input': 'reshapeInput'}, {'newShape': [4, 2, 3]}],
+        'outputs': 'reshapeOutput'
+      }],
+      'expectedOutputs': {
+        'reshapeOutput': {
+          'data': [
+            -30.0561466217041,  99.56941986083984,   88.04620361328125,
+            -91.87507629394531, -23.7972354888916,   -91.28665161132812,
+            -63.15204620361328, 12.0669527053833,    -96.1172866821289,
+            -44.77365493774414, -80.08650970458984,  -64.43756866455078,
+            27.64195442199707,  -96.86306762695312,  83.6834716796875,
+            50.599483489990234, -20.18765640258789,  -1.3904608488082886,
+            -96.93603515625,    65.34143829345703,   34.835994720458984,
+            62.01485824584961,  -2.8698415756225586, 27.903749465942383
+          ],
+          'descriptor': {shape: [4, 2, 3], dataType: 'float32'}
+        }
+      }
+    }
+  },
   {
     'name': 'reshape float32 tensor to a new shape (reduce dimensions)',
     'graph': {
diff --git a/tests/wpt/tests/webnn/conformance_tests/sigmoid.https.any.js b/tests/wpt/tests/webnn/conformance_tests/sigmoid.https.any.js
index a925f0c6110..287568a390a 100644
--- a/tests/wpt/tests/webnn/conformance_tests/sigmoid.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/sigmoid.https.any.js
@@ -277,6 +277,355 @@ const sigmoidTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'sigmoid float16 1D constant tensor',
+    'graph': {
+      'inputs': {
+        'sigmoidInput': {
+          'data': [
+            -0.376953125,  -0.68505859375, -5.98828125,  4.43359375,
+            -0.9384765625, 4.58984375,     -2.505859375, 1.5673828125,
+            -2.595703125,  -0.6474609375,  2.677734375,  -3.10546875,
+            2.2578125,     -0.28662109375, 4.640625,     1.060546875,
+            -3.537109375,  0.441162109375, 4.79296875,   2.07421875,
+            0.83544921875, -5.43359375,    -4.18359375,  -2.484375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'sigmoid',
+        'arguments': [{'input': 'sigmoidInput'}],
+        'outputs': 'sigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'sigmoidOutput': {
+          'data': [
+            0.406982421875,
+            0.335205078125,
+            0.00250244140625,
+            0.98828125,
+            0.28125,
+            0.98974609375,
+            0.075439453125,
+            0.82763671875,
+            0.06939697265625,
+            0.343505859375,
+            0.935546875,
+            0.042877197265625,
+            0.9052734375,
+            0.4287109375,
+            0.990234375,
+            0.74267578125,
+            0.0282745361328125,
+            0.6083984375,
+            0.99169921875,
+            0.88818359375,
+            0.697265625,
+            0.0043487548828125,
+            0.0150146484375,
+            0.07696533203125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'sigmoid float16 0D tensor',
+    'graph': {
+      'inputs': {
+        'sigmoidInput': {
+          'data': [-0.376953125],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'sigmoid',
+        'arguments': [{'input': 'sigmoidInput'}],
+        'outputs': 'sigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'sigmoidOutput': {
+          'data': [0.406982421875],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'sigmoid float16 1D tensor',
+    'graph': {
+      'inputs': {
+        'sigmoidInput': {
+          'data': [
+            -0.376953125,  -0.68505859375, -5.98828125,  4.43359375,
+            -0.9384765625, 4.58984375,     -2.505859375, 1.5673828125,
+            -2.595703125,  -0.6474609375,  2.677734375,  -3.10546875,
+            2.2578125,     -0.28662109375, 4.640625,     1.060546875,
+            -3.537109375,  0.441162109375, 4.79296875,   2.07421875,
+            0.83544921875, -5.43359375,    -4.18359375,  -2.484375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'sigmoid',
+        'arguments': [{'input': 'sigmoidInput'}],
+        'outputs': 'sigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'sigmoidOutput': {
+          'data': [
+            0.406982421875,
+            0.335205078125,
+            0.00250244140625,
+            0.98828125,
+            0.28125,
+            0.98974609375,
+            0.075439453125,
+            0.82763671875,
+            0.06939697265625,
+            0.343505859375,
+            0.935546875,
+            0.042877197265625,
+            0.9052734375,
+            0.4287109375,
+            0.990234375,
+            0.74267578125,
+            0.0282745361328125,
+            0.6083984375,
+            0.99169921875,
+            0.88818359375,
+            0.697265625,
+            0.0043487548828125,
+            0.0150146484375,
+            0.07696533203125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'sigmoid float16 2D tensor',
+    'graph': {
+      'inputs': {
+        'sigmoidInput': {
+          'data': [
+            -0.376953125,  -0.68505859375, -5.98828125,  4.43359375,
+            -0.9384765625, 4.58984375,     -2.505859375, 1.5673828125,
+            -2.595703125,  -0.6474609375,  2.677734375,  -3.10546875,
+            2.2578125,     -0.28662109375, 4.640625,     1.060546875,
+            -3.537109375,  0.441162109375, 4.79296875,   2.07421875,
+            0.83544921875, -5.43359375,    -4.18359375,  -2.484375
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'sigmoid',
+        'arguments': [{'input': 'sigmoidInput'}],
+        'outputs': 'sigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'sigmoidOutput': {
+          'data': [
+            0.406982421875,
+            0.335205078125,
+            0.00250244140625,
+            0.98828125,
+            0.28125,
+            0.98974609375,
+            0.075439453125,
+            0.82763671875,
+            0.06939697265625,
+            0.343505859375,
+            0.935546875,
+            0.042877197265625,
+            0.9052734375,
+            0.4287109375,
+            0.990234375,
+            0.74267578125,
+            0.0282745361328125,
+            0.6083984375,
+            0.99169921875,
+            0.88818359375,
+            0.697265625,
+            0.0043487548828125,
+            0.0150146484375,
+            0.07696533203125
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'sigmoid float16 3D tensor',
+    'graph': {
+      'inputs': {
+        'sigmoidInput': {
+          'data': [
+            -0.376953125,  -0.68505859375, -5.98828125,  4.43359375,
+            -0.9384765625, 4.58984375,     -2.505859375, 1.5673828125,
+            -2.595703125,  -0.6474609375,  2.677734375,  -3.10546875,
+            2.2578125,     -0.28662109375, 4.640625,     1.060546875,
+            -3.537109375,  0.441162109375, 4.79296875,   2.07421875,
+            0.83544921875, -5.43359375,    -4.18359375,  -2.484375
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'sigmoid',
+        'arguments': [{'input': 'sigmoidInput'}],
+        'outputs': 'sigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'sigmoidOutput': {
+          'data': [
+            0.406982421875,
+            0.335205078125,
+            0.00250244140625,
+            0.98828125,
+            0.28125,
+            0.98974609375,
+            0.075439453125,
+            0.82763671875,
+            0.06939697265625,
+            0.343505859375,
+            0.935546875,
+            0.042877197265625,
+            0.9052734375,
+            0.4287109375,
+            0.990234375,
+            0.74267578125,
+            0.0282745361328125,
+            0.6083984375,
+            0.99169921875,
+            0.88818359375,
+            0.697265625,
+            0.0043487548828125,
+            0.0150146484375,
+            0.07696533203125
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'sigmoid float16 4D tensor',
+    'graph': {
+      'inputs': {
+        'sigmoidInput': {
+          'data': [
+            -0.376953125,  -0.68505859375, -5.98828125,  4.43359375,
+            -0.9384765625, 4.58984375,     -2.505859375, 1.5673828125,
+            -2.595703125,  -0.6474609375,  2.677734375,  -3.10546875,
+            2.2578125,     -0.28662109375, 4.640625,     1.060546875,
+            -3.537109375,  0.441162109375, 4.79296875,   2.07421875,
+            0.83544921875, -5.43359375,    -4.18359375,  -2.484375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'sigmoid',
+        'arguments': [{'input': 'sigmoidInput'}],
+        'outputs': 'sigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'sigmoidOutput': {
+          'data': [
+            0.406982421875,
+            0.335205078125,
+            0.00250244140625,
+            0.98828125,
+            0.28125,
+            0.98974609375,
+            0.075439453125,
+            0.82763671875,
+            0.06939697265625,
+            0.343505859375,
+            0.935546875,
+            0.042877197265625,
+            0.9052734375,
+            0.4287109375,
+            0.990234375,
+            0.74267578125,
+            0.0282745361328125,
+            0.6083984375,
+            0.99169921875,
+            0.88818359375,
+            0.697265625,
+            0.0043487548828125,
+            0.0150146484375,
+            0.07696533203125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'sigmoid float16 5D tensor',
+    'graph': {
+      'inputs': {
+        'sigmoidInput': {
+          'data': [
+            -0.376953125,  -0.68505859375, -5.98828125,  4.43359375,
+            -0.9384765625, 4.58984375,     -2.505859375, 1.5673828125,
+            -2.595703125,  -0.6474609375,  2.677734375,  -3.10546875,
+            2.2578125,     -0.28662109375, 4.640625,     1.060546875,
+            -3.537109375,  0.441162109375, 4.79296875,   2.07421875,
+            0.83544921875, -5.43359375,    -4.18359375,  -2.484375
+          ],
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'sigmoid',
+        'arguments': [{'input': 'sigmoidInput'}],
+        'outputs': 'sigmoidOutput'
+      }],
+      'expectedOutputs': {
+        'sigmoidOutput': {
+          'data': [
+            0.406982421875,
+            0.335205078125,
+            0.00250244140625,
+            0.98828125,
+            0.28125,
+            0.98974609375,
+            0.075439453125,
+            0.82763671875,
+            0.06939697265625,
+            0.343505859375,
+            0.935546875,
+            0.042877197265625,
+            0.9052734375,
+            0.4287109375,
+            0.990234375,
+            0.74267578125,
+            0.0282745361328125,
+            0.6083984375,
+            0.99169921875,
+            0.88818359375,
+            0.697265625,
+            0.0043487548828125,
+            0.0150146484375,
+            0.07696533203125
+          ],
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/sign.https.any.js b/tests/wpt/tests/webnn/conformance_tests/sign.https.any.js
index 4c3a330f850..004c03bdf13 100644
--- a/tests/wpt/tests/webnn/conformance_tests/sign.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/sign.https.any.js
@@ -122,7 +122,8 @@ const signTests = [
     'graph': {
       'inputs': {
         'signInput': {
-          'data': [-1, 0, 1, 2],
+          // int32 range: [/* -(2**31) */ -2147483648, /* 2**31 - 1 */ 2147483647]
+          'data': [-2147483648, 0, 2147483646, 2147483647],
           'descriptor': {shape: [2, 2], dataType: 'int32'}
         }
       },
@@ -166,7 +167,8 @@ const signTests = [
     'graph': {
       'inputs': {
         'signInput': {
-          'data': [-1, 0, 1, 2, -2, -1, 0, 1],
+          // int8 range: [/* -(2**7) */ -128, /* 2**7 - 1 */ 127]
+          'data': [-128, 0, 1, 2, -2, -1, 0, 127],
           'descriptor': {shape: [1, 2, 2, 2], dataType: 'int8'}
         }
       },
diff --git a/tests/wpt/tests/webnn/conformance_tests/softmax.https.any.js b/tests/wpt/tests/webnn/conformance_tests/softmax.https.any.js
index f289f081b16..33c2e1db9ef 100644
--- a/tests/wpt/tests/webnn/conformance_tests/softmax.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/softmax.https.any.js
@@ -207,6 +207,160 @@ const softmaxTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'softmax float16 2D constant tensor all positive',
+    'graph': {
+      'inputs': {
+        'softmaxInput': {
+          'data': [
+            7.90234375,     6.359375,   4.83203125,   9.578125,
+            0.210693359375, 4.5546875,  7.1484375,    8.328125,
+            1.5361328125,   6.6328125,  1.4541015625, 0.21337890625,
+            5.2578125,      8.1953125,  8.1640625,    2.875,
+            8.953125,       6.11328125, 1.63671875,   0.2763671875,
+            5.02734375,     3.8984375,  2.896484375,  6.890625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'softmax',
+        'arguments': [{'input': 'softmaxInput'}],
+        'outputs': 'softmaxOutput'
+      }],
+      'expectedOutputs': {
+        'softmaxOutput': {
+          'data': [
+            0.150634765625,         0.032196044921875,
+            0.006988525390625,      0.8046875,
+            0.00006878376007080078, 0.005298614501953125,
+            0.205810546875,         0.66943359375,
+            0.0007519721984863281,  0.1229248046875,
+            0.0006923675537109375,  0.0002002716064453125,
+            0.01236724853515625,    0.2333984375,
+            0.2261962890625,        0.0011415481567382812,
+            0.497802734375,         0.0290985107421875,
+            0.00424957275390625,    0.0010900497436523438,
+            0.1260986328125,        0.040771484375,
+            0.01497650146484375,    0.81298828125
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softmax float16 2D tensor all positive',
+    'graph': {
+      'inputs': {
+        'softmaxInput': {
+          'data': [
+            7.90234375,     6.359375,   4.83203125,   9.578125,
+            0.210693359375, 4.5546875,  7.1484375,    8.328125,
+            1.5361328125,   6.6328125,  1.4541015625, 0.21337890625,
+            5.2578125,      8.1953125,  8.1640625,    2.875,
+            8.953125,       6.11328125, 1.63671875,   0.2763671875,
+            5.02734375,     3.8984375,  2.896484375,  6.890625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softmax',
+        'arguments': [{'input': 'softmaxInput'}],
+        'outputs': 'softmaxOutput'
+      }],
+      'expectedOutputs': {
+        'softmaxOutput': {
+          'data': [
+            0.150634765625,         0.032196044921875,
+            0.006988525390625,      0.8046875,
+            0.00006878376007080078, 0.005298614501953125,
+            0.205810546875,         0.66943359375,
+            0.0007519721984863281,  0.1229248046875,
+            0.0006923675537109375,  0.0002002716064453125,
+            0.01236724853515625,    0.2333984375,
+            0.2261962890625,        0.0011415481567382812,
+            0.497802734375,         0.0290985107421875,
+            0.00424957275390625,    0.0010900497436523438,
+            0.1260986328125,        0.040771484375,
+            0.01497650146484375,    0.81298828125
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softmax float16 2D tensor all negative',
+    'graph': {
+      'inputs': {
+        'softmaxInput': {
+          'data': [
+            -3.3125,     -3.33984375, -3.41015625,  -6.6953125,   -7.89453125,
+            -3.30859375, -3.23046875, -4.31640625,  -9.3125,      -3.923828125,
+            -3.78125,    -6.03515625, -3.919921875, -2.22265625,  -9.328125,
+            -1.48828125, -6.3046875,  -5.53125,     -1.841796875, -4.99609375,
+            -9.5234375,  -4.984375,   -8.421875,    -6.234375
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softmax',
+        'arguments': [{'input': 'softmaxInput'}],
+        'outputs': 'softmaxOutput'
+      }],
+      'expectedOutputs': {
+        'softmaxOutput': {
+          'data': [
+            0.254638671875,      0.2476806640625,       0.2308349609375,
+            0.00864410400390625, 0.002605438232421875,  0.255615234375,
+            0.40380859375,       0.1363525390625,       0.0009222030639648438,
+            0.2017822265625,     0.2327880859375,       0.024444580078125,
+            0.055145263671875,   0.301025390625,        0.00024700164794921875,
+            0.62744140625,       0.0050811767578125,    0.01100921630859375,
+            0.9091796875,        0.038787841796875,     0.00041937828063964844,
+            0.03924560546875,    0.0012617111206054688, 0.0112457275390625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softmax float16 4D tensor',
+    'graph': {
+      'inputs': {
+        'softmaxInput': {
+          'data': [
+            0.43017578125, 0.54736328125, -1.1640625, 0.1839599609375,
+            0.583984375, 0.173583984375, 0.53955078125, -0.95361328125,
+            -0.591796875, -0.1734619140625, 0.1439208984375, -0.379150390625
+          ],
+          'descriptor': {shape: [3, 4, 1, 1], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softmax',
+        'arguments': [{'input': 'softmaxInput'}, {'axis': 1}],
+        'outputs': 'softmaxOutput'
+      }],
+      'expectedOutputs': {
+        'softmaxOutput': {
+          'data': [
+            0.321533203125, 0.361572265625, 0.0653076171875, 0.25146484375,
+            0.352783203125, 0.2340087890625, 0.33740234375, 0.0758056640625,
+            0.171142578125, 0.260009765625, 0.357177734375, 0.211669921875
+          ],
+          'descriptor': {shape: [3, 4, 1, 1], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/softplus.https.any.js b/tests/wpt/tests/webnn/conformance_tests/softplus.https.any.js
index 52fce910dfe..36386c03378 100644
--- a/tests/wpt/tests/webnn/conformance_tests/softplus.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/softplus.https.any.js
@@ -277,6 +277,233 @@ const softplusTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'softplus float16 1D constant tensor',
+    'graph': {
+      'inputs': {
+        'softplusInput': {
+          'data': [
+            5.625,        5.16796875,  4.015625,    9.4765625,  9.9921875,
+            7.06640625,   2.1328125,   8.1875,      5.171875,   2.10546875,
+            3.5234375,    4.13671875,  1.7421875,   5.14453125, 5.015625,
+            0.0458984375, 2.95703125,  3.958984375, 5.51953125, 7.19140625,
+            8.765625,     1.373046875, 8.9296875,   8.6640625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'softplus',
+        'arguments': [{'input': 'softplusInput'}],
+        'outputs': 'softplusOutput'
+      }],
+      'expectedOutputs': {
+        'softplusOutput': {
+          'data': [
+            5.62890625,    5.171875,     4.03515625,   9.4765625,  9.9921875,
+            7.06640625,    2.244140625,  8.1875,       5.17578125, 2.220703125,
+            3.552734375,   4.15234375,   1.9033203125, 5.1484375,  5.0234375,
+            0.71630859375, 3.0078125,    3.978515625,  5.5234375,  7.19140625,
+            8.765625,      1.5986328125, 8.9296875,    8.6640625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softplus float16 0D tensor',
+    'graph': {
+      'inputs': {
+        'softplusInput':
+            {'data': [5.625], 'descriptor': {shape: [], dataType: 'float16'}}
+      },
+      'operators': [{
+        'name': 'softplus',
+        'arguments': [{'input': 'softplusInput'}],
+        'outputs': 'softplusOutput'
+      }],
+      'expectedOutputs': {
+        'softplusOutput': {
+          'data': [5.62890625],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softplus float16 1D tensor',
+    'graph': {
+      'inputs': {
+        'softplusInput': {
+          'data': [
+            5.625,        5.16796875,  4.015625,    9.4765625,  9.9921875,
+            7.06640625,   2.1328125,   8.1875,      5.171875,   2.10546875,
+            3.5234375,    4.13671875,  1.7421875,   5.14453125, 5.015625,
+            0.0458984375, 2.95703125,  3.958984375, 5.51953125, 7.19140625,
+            8.765625,     1.373046875, 8.9296875,   8.6640625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softplus',
+        'arguments': [{'input': 'softplusInput'}],
+        'outputs': 'softplusOutput'
+      }],
+      'expectedOutputs': {
+        'softplusOutput': {
+          'data': [
+            5.62890625,    5.171875,     4.03515625,   9.4765625,  9.9921875,
+            7.06640625,    2.244140625,  8.1875,       5.17578125, 2.220703125,
+            3.552734375,   4.15234375,   1.9033203125, 5.1484375,  5.0234375,
+            0.71630859375, 3.0078125,    3.978515625,  5.5234375,  7.19140625,
+            8.765625,      1.5986328125, 8.9296875,    8.6640625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softplus float16 2D tensor',
+    'graph': {
+      'inputs': {
+        'softplusInput': {
+          'data': [
+            5.625,        5.16796875,  4.015625,    9.4765625,  9.9921875,
+            7.06640625,   2.1328125,   8.1875,      5.171875,   2.10546875,
+            3.5234375,    4.13671875,  1.7421875,   5.14453125, 5.015625,
+            0.0458984375, 2.95703125,  3.958984375, 5.51953125, 7.19140625,
+            8.765625,     1.373046875, 8.9296875,   8.6640625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softplus',
+        'arguments': [{'input': 'softplusInput'}],
+        'outputs': 'softplusOutput'
+      }],
+      'expectedOutputs': {
+        'softplusOutput': {
+          'data': [
+            5.62890625,    5.171875,     4.03515625,   9.4765625,  9.9921875,
+            7.06640625,    2.244140625,  8.1875,       5.17578125, 2.220703125,
+            3.552734375,   4.15234375,   1.9033203125, 5.1484375,  5.0234375,
+            0.71630859375, 3.0078125,    3.978515625,  5.5234375,  7.19140625,
+            8.765625,      1.5986328125, 8.9296875,    8.6640625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softplus float16 3D tensor',
+    'graph': {
+      'inputs': {
+        'softplusInput': {
+          'data': [
+            5.625,        5.16796875,  4.015625,    9.4765625,  9.9921875,
+            7.06640625,   2.1328125,   8.1875,      5.171875,   2.10546875,
+            3.5234375,    4.13671875,  1.7421875,   5.14453125, 5.015625,
+            0.0458984375, 2.95703125,  3.958984375, 5.51953125, 7.19140625,
+            8.765625,     1.373046875, 8.9296875,   8.6640625
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softplus',
+        'arguments': [{'input': 'softplusInput'}],
+        'outputs': 'softplusOutput'
+      }],
+      'expectedOutputs': {
+        'softplusOutput': {
+          'data': [
+            5.62890625,    5.171875,     4.03515625,   9.4765625,  9.9921875,
+            7.06640625,    2.244140625,  8.1875,       5.17578125, 2.220703125,
+            3.552734375,   4.15234375,   1.9033203125, 5.1484375,  5.0234375,
+            0.71630859375, 3.0078125,    3.978515625,  5.5234375,  7.19140625,
+            8.765625,      1.5986328125, 8.9296875,    8.6640625
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softplus float16 4D tensor',
+    'graph': {
+      'inputs': {
+        'softplusInput': {
+          'data': [
+            5.625,        5.16796875,  4.015625,    9.4765625,  9.9921875,
+            7.06640625,   2.1328125,   8.1875,      5.171875,   2.10546875,
+            3.5234375,    4.13671875,  1.7421875,   5.14453125, 5.015625,
+            0.0458984375, 2.95703125,  3.958984375, 5.51953125, 7.19140625,
+            8.765625,     1.373046875, 8.9296875,   8.6640625
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softplus',
+        'arguments': [{'input': 'softplusInput'}],
+        'outputs': 'softplusOutput'
+      }],
+      'expectedOutputs': {
+        'softplusOutput': {
+          'data': [
+            5.62890625,    5.171875,     4.03515625,   9.4765625,  9.9921875,
+            7.06640625,    2.244140625,  8.1875,       5.17578125, 2.220703125,
+            3.552734375,   4.15234375,   1.9033203125, 5.1484375,  5.0234375,
+            0.71630859375, 3.0078125,    3.978515625,  5.5234375,  7.19140625,
+            8.765625,      1.5986328125, 8.9296875,    8.6640625
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softplus float16 5D tensor',
+    'graph': {
+      'inputs': {
+        'softplusInput': {
+          'data': [
+            5.625,        5.16796875,  4.015625,    9.4765625,  9.9921875,
+            7.06640625,   2.1328125,   8.1875,      5.171875,   2.10546875,
+            3.5234375,    4.13671875,  1.7421875,   5.14453125, 5.015625,
+            0.0458984375, 2.95703125,  3.958984375, 5.51953125, 7.19140625,
+            8.765625,     1.373046875, 8.9296875,   8.6640625
+          ],
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softplus',
+        'arguments': [{'input': 'softplusInput'}],
+        'outputs': 'softplusOutput'
+      }],
+      'expectedOutputs': {
+        'softplusOutput': {
+          'data': [
+            5.62890625,    5.171875,     4.03515625,   9.4765625,  9.9921875,
+            7.06640625,    2.244140625,  8.1875,       5.17578125, 2.220703125,
+            3.552734375,   4.15234375,   1.9033203125, 5.1484375,  5.0234375,
+            0.71630859375, 3.0078125,    3.978515625,  5.5234375,  7.19140625,
+            8.765625,      1.5986328125, 8.9296875,    8.6640625
+          ],
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/softsign.https.any.js b/tests/wpt/tests/webnn/conformance_tests/softsign.https.any.js
index 21eeb6c5d81..cf06bbc4fdb 100644
--- a/tests/wpt/tests/webnn/conformance_tests/softsign.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/softsign.https.any.js
@@ -339,6 +339,310 @@ const softsignTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'softsign positive float16 1D constant tensor',
+    'graph': {
+      'inputs': {
+        'softsignInput': {
+          'data': [
+            1.5830078125, 4.078125,     8.8828125, 8.0703125,   8.2109375,
+            2.455078125,  0.6533203125, 7.8671875, 3.123046875, 8.015625,
+            3.94140625,   1.8134765625, 2.390625,  1.3359375,   9.4140625,
+            0.443359375,  5.23828125,   9.421875,  7.81640625,  5.84765625,
+            8.78125,      5.12109375,   7.1171875, 4.59765625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'softsign',
+        'arguments': [{'input': 'softsignInput'}],
+        'outputs': 'softsignOutput'
+      }],
+      'expectedOutputs': {
+        'softsignOutput': {
+          'data': [
+            0.61279296875, 0.80322265625, 0.89892578125,  0.8896484375,
+            0.8916015625,  0.71044921875, 0.395263671875, 0.88720703125,
+            0.75732421875, 0.88916015625, 0.7978515625,   0.64453125,
+            0.705078125,   0.57177734375, 0.90380859375,  0.30712890625,
+            0.83984375,    0.90380859375, 0.88671875,     0.85400390625,
+            0.89794921875, 0.83642578125, 0.876953125,    0.8212890625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softsign positive float16 0D tensor',
+    'graph': {
+      'inputs': {
+        'softsignInput': {
+          'data': [1.5830078125],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softsign',
+        'arguments': [{'input': 'softsignInput'}],
+        'outputs': 'softsignOutput'
+      }],
+      'expectedOutputs': {
+        'softsignOutput': {
+          'data': [0.61279296875],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softsign negative float16 0D tensor',
+    'graph': {
+      'inputs': {
+        'softsignInput': {
+          'data': [-2.59765625],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softsign',
+        'arguments': [{'input': 'softsignInput'}],
+        'outputs': 'softsignOutput'
+      }],
+      'expectedOutputs': {
+        'softsignOutput': {
+          'data': [-0.72216796875],
+          'descriptor': {shape: [], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softsign positive float16 1D tensor',
+    'graph': {
+      'inputs': {
+        'softsignInput': {
+          'data': [
+            1.5830078125, 4.078125,     8.8828125, 8.0703125,   8.2109375,
+            2.455078125,  0.6533203125, 7.8671875, 3.123046875, 8.015625,
+            3.94140625,   1.8134765625, 2.390625,  1.3359375,   9.4140625,
+            0.443359375,  5.23828125,   9.421875,  7.81640625,  5.84765625,
+            8.78125,      5.12109375,   7.1171875, 4.59765625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softsign',
+        'arguments': [{'input': 'softsignInput'}],
+        'outputs': 'softsignOutput'
+      }],
+      'expectedOutputs': {
+        'softsignOutput': {
+          'data': [
+            0.61279296875, 0.80322265625, 0.89892578125,  0.8896484375,
+            0.8916015625,  0.71044921875, 0.395263671875, 0.88720703125,
+            0.75732421875, 0.88916015625, 0.7978515625,   0.64453125,
+            0.705078125,   0.57177734375, 0.90380859375,  0.30712890625,
+            0.83984375,    0.90380859375, 0.88671875,     0.85400390625,
+            0.89794921875, 0.83642578125, 0.876953125,    0.8212890625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softsign negative float16 1D tensor',
+    'graph': {
+      'inputs': {
+        'softsignInput': {
+          'data': [
+            -2.59765625, -0.445068359375, -9.09375,   -3.748046875, -1.38671875,
+            -8.21875,    -3.5390625,      -9.3671875, -6.28515625,  -5.00390625,
+            -8.2421875,  -3.775390625,    -4.0859375, -7.3828125,   -5.8828125,
+            -8.3359375,  -6.6015625,      -4.4921875, -3.525390625, -4.44140625,
+            -5.234375,   -1.5908203125,   -9.109375,  -8.5234375
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softsign',
+        'arguments': [{'input': 'softsignInput'}],
+        'outputs': 'softsignOutput'
+      }],
+      'expectedOutputs': {
+        'softsignOutput': {
+          'data': [
+            -0.72216796875, -0.30810546875, -0.90087890625, -0.78955078125,
+            -0.5810546875,  -0.8916015625,  -0.77978515625, -0.9033203125,
+            -0.86279296875, -0.83349609375, -0.8916015625,  -0.79052734375,
+            -0.80322265625, -0.880859375,   -0.8544921875,  -0.89306640625,
+            -0.86865234375, -0.81787109375, -0.77880859375, -0.81640625,
+            -0.83935546875, -0.6142578125,  -0.90087890625, -0.89501953125
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softsign float16 2D tensor',
+    'graph': {
+      'inputs': {
+        'softsignInput': {
+          'data': [
+            -8.34375,      -6.921875,    2.69921875,        -8.6640625,
+            -3.19140625,   7.65625,      6.6484375,         6.05859375,
+            0.66357421875, 5.8046875,    -0.328125,         1.2705078125,
+            -9.9453125,    6.90625,      -0.03106689453125, -3.96875,
+            6.26953125,    -2.638671875, 3.05078125,        7.42578125,
+            -8.453125,     7.13671875,   -4.984375,         -7.859375
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softsign',
+        'arguments': [{'input': 'softsignInput'}],
+        'outputs': 'softsignOutput'
+      }],
+      'expectedOutputs': {
+        'softsignOutput': {
+          'data': [
+            -0.89306640625, -0.87353515625, 0.7294921875,
+            -0.896484375,   -0.76123046875, 0.88427734375,
+            0.869140625,    0.8583984375,   0.39892578125,
+            0.85302734375,  -0.2470703125,  0.5595703125,
+            -0.90869140625, 0.87353515625,  -0.0301361083984375,
+            -0.798828125,   0.8623046875,   -0.72509765625,
+            0.7529296875,   0.88134765625,  -0.89404296875,
+            0.876953125,    -0.8330078125,  -0.88720703125
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softsign float16 3D tensor',
+    'graph': {
+      'inputs': {
+        'softsignInput': {
+          'data': [
+            -8.34375,      -6.921875,    2.69921875,        -8.6640625,
+            -3.19140625,   7.65625,      6.6484375,         6.05859375,
+            0.66357421875, 5.8046875,    -0.328125,         1.2705078125,
+            -9.9453125,    6.90625,      -0.03106689453125, -3.96875,
+            6.26953125,    -2.638671875, 3.05078125,        7.42578125,
+            -8.453125,     7.13671875,   -4.984375,         -7.859375
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softsign',
+        'arguments': [{'input': 'softsignInput'}],
+        'outputs': 'softsignOutput'
+      }],
+      'expectedOutputs': {
+        'softsignOutput': {
+          'data': [
+            -0.89306640625, -0.87353515625, 0.7294921875,
+            -0.896484375,   -0.76123046875, 0.88427734375,
+            0.869140625,    0.8583984375,   0.39892578125,
+            0.85302734375,  -0.2470703125,  0.5595703125,
+            -0.90869140625, 0.87353515625,  -0.0301361083984375,
+            -0.798828125,   0.8623046875,   -0.72509765625,
+            0.7529296875,   0.88134765625,  -0.89404296875,
+            0.876953125,    -0.8330078125,  -0.88720703125
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softsign float16 4D tensor',
+    'graph': {
+      'inputs': {
+        'softsignInput': {
+          'data': [
+            -8.34375,      -6.921875,    2.69921875,        -8.6640625,
+            -3.19140625,   7.65625,      6.6484375,         6.05859375,
+            0.66357421875, 5.8046875,    -0.328125,         1.2705078125,
+            -9.9453125,    6.90625,      -0.03106689453125, -3.96875,
+            6.26953125,    -2.638671875, 3.05078125,        7.42578125,
+            -8.453125,     7.13671875,   -4.984375,         -7.859375
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softsign',
+        'arguments': [{'input': 'softsignInput'}],
+        'outputs': 'softsignOutput'
+      }],
+      'expectedOutputs': {
+        'softsignOutput': {
+          'data': [
+            -0.89306640625, -0.87353515625, 0.7294921875,
+            -0.896484375,   -0.76123046875, 0.88427734375,
+            0.869140625,    0.8583984375,   0.39892578125,
+            0.85302734375,  -0.2470703125,  0.5595703125,
+            -0.90869140625, 0.87353515625,  -0.0301361083984375,
+            -0.798828125,   0.8623046875,   -0.72509765625,
+            0.7529296875,   0.88134765625,  -0.89404296875,
+            0.876953125,    -0.8330078125,  -0.88720703125
+          ],
+          'descriptor': {shape: [1, 2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'softsign float16 5D tensor',
+    'graph': {
+      'inputs': {
+        'softsignInput': {
+          'data': [
+            -8.34375,      -6.921875,    2.69921875,        -8.6640625,
+            -3.19140625,   7.65625,      6.6484375,         6.05859375,
+            0.66357421875, 5.8046875,    -0.328125,         1.2705078125,
+            -9.9453125,    6.90625,      -0.03106689453125, -3.96875,
+            6.26953125,    -2.638671875, 3.05078125,        7.42578125,
+            -8.453125,     7.13671875,   -4.984375,         -7.859375
+          ],
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'softsign',
+        'arguments': [{'input': 'softsignInput'}],
+        'outputs': 'softsignOutput'
+      }],
+      'expectedOutputs': {
+        'softsignOutput': {
+          'data': [
+            -0.89306640625, -0.87353515625, 0.7294921875,
+            -0.896484375,   -0.76123046875, 0.88427734375,
+            0.869140625,    0.8583984375,   0.39892578125,
+            0.85302734375,  -0.2470703125,  0.5595703125,
+            -0.90869140625, 0.87353515625,  -0.0301361083984375,
+            -0.798828125,   0.8623046875,   -0.72509765625,
+            0.7529296875,   0.88134765625,  -0.89404296875,
+            0.876953125,    -0.8330078125,  -0.88720703125
+          ],
+          'descriptor': {shape: [1, 2, 1, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/sub.https.any.js b/tests/wpt/tests/webnn/conformance_tests/sub.https.any.js
index 565f532c8f0..85b15f5a000 100644
--- a/tests/wpt/tests/webnn/conformance_tests/sub.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/sub.https.any.js
@@ -14,7 +14,16 @@
 
 
 const getSubPrecisionTolerance = (graphResources) => {
-  const toleranceValueDict = {float32: 1, float16: 1};
+  const toleranceValueDict = {
+    float32: 1,
+    float16: 1,
+    int8: 0,
+    uint8: 0,
+    int32: 0,
+    uint32: 0,
+    int64: 0,
+    uint64: 0
+  };
   const expectedDataType =
       getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
   return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
@@ -522,6 +531,602 @@ const subTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'sub float16 1D constant tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            73.5625,  14.484375, -69.375,   -52.03125, -75.8125, -2.2734375,
+            -83.3125, 15.578125, -62.6875,  32.96875,  82.5625,  -74.9375,
+            78.25,    48.40625,  -19.15625, -85.9375,  89.125,   22.875,
+            80.5625,  97.625,    52.75,     89.1875,   -20.5,    99.5
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        },
+        'inputB': {
+          'data': [
+            -49.125,   40.1875,  7.2265625, 89.25,     -81.4375,  59.625,
+            11.234375, 48.875,   85.25,     27.6875,   30.984375, -38.125,
+            -83.125,   -86.1875, 16.765625, 46.125,    -28.4375,  28.234375,
+            35.25,     -77.0625, -57.875,   -58.15625, 27.484375, 32
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            122.6875, -25.703125, -76.625,  -141.25, 5.625,    -61.90625,
+            -94.5625, -33.3125,   -148,     5.28125, 51.5625,  -36.8125,
+            161.375,  134.625,    -35.9375, -132,    117.5625, -5.359375,
+            45.3125,  174.75,     110.625,  147.375, -48,      67.5
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'sub float16 1D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            73.5625,  14.484375, -69.375,   -52.03125, -75.8125, -2.2734375,
+            -83.3125, 15.578125, -62.6875,  32.96875,  82.5625,  -74.9375,
+            78.25,    48.40625,  -19.15625, -85.9375,  89.125,   22.875,
+            80.5625,  97.625,    52.75,     89.1875,   -20.5,    99.5
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -49.125,   40.1875,  7.2265625, 89.25,     -81.4375,  59.625,
+            11.234375, 48.875,   85.25,     27.6875,   30.984375, -38.125,
+            -83.125,   -86.1875, 16.765625, 46.125,    -28.4375,  28.234375,
+            35.25,     -77.0625, -57.875,   -58.15625, 27.484375, 32
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            122.6875, -25.703125, -76.625,  -141.25, 5.625,    -61.90625,
+            -94.5625, -33.3125,   -148,     5.28125, 51.5625,  -36.8125,
+            161.375,  134.625,    -35.9375, -132,    117.5625, -5.359375,
+            45.3125,  174.75,     110.625,  147.375, -48,      67.5
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'sub float16 2D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            73.5625,  14.484375, -69.375,   -52.03125, -75.8125, -2.2734375,
+            -83.3125, 15.578125, -62.6875,  32.96875,  82.5625,  -74.9375,
+            78.25,    48.40625,  -19.15625, -85.9375,  89.125,   22.875,
+            80.5625,  97.625,    52.75,     89.1875,   -20.5,    99.5
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -49.125,   40.1875,  7.2265625, 89.25,     -81.4375,  59.625,
+            11.234375, 48.875,   85.25,     27.6875,   30.984375, -38.125,
+            -83.125,   -86.1875, 16.765625, 46.125,    -28.4375,  28.234375,
+            35.25,     -77.0625, -57.875,   -58.15625, 27.484375, 32
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            122.6875, -25.703125, -76.625,  -141.25, 5.625,    -61.90625,
+            -94.5625, -33.3125,   -148,     5.28125, 51.5625,  -36.8125,
+            161.375,  134.625,    -35.9375, -132,    117.5625, -5.359375,
+            45.3125,  174.75,     110.625,  147.375, -48,      67.5
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'sub float16 3D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            73.5625,  14.484375, -69.375,   -52.03125, -75.8125, -2.2734375,
+            -83.3125, 15.578125, -62.6875,  32.96875,  82.5625,  -74.9375,
+            78.25,    48.40625,  -19.15625, -85.9375,  89.125,   22.875,
+            80.5625,  97.625,    52.75,     89.1875,   -20.5,    99.5
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -49.125,   40.1875,  7.2265625, 89.25,     -81.4375,  59.625,
+            11.234375, 48.875,   85.25,     27.6875,   30.984375, -38.125,
+            -83.125,   -86.1875, 16.765625, 46.125,    -28.4375,  28.234375,
+            35.25,     -77.0625, -57.875,   -58.15625, 27.484375, 32
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            122.6875, -25.703125, -76.625,  -141.25, 5.625,    -61.90625,
+            -94.5625, -33.3125,   -148,     5.28125, 51.5625,  -36.8125,
+            161.375,  134.625,    -35.9375, -132,    117.5625, -5.359375,
+            45.3125,  174.75,     110.625,  147.375, -48,      67.5
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'sub float16 4D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            73.5625,  14.484375, -69.375,   -52.03125, -75.8125, -2.2734375,
+            -83.3125, 15.578125, -62.6875,  32.96875,  82.5625,  -74.9375,
+            78.25,    48.40625,  -19.15625, -85.9375,  89.125,   22.875,
+            80.5625,  97.625,    52.75,     89.1875,   -20.5,    99.5
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -49.125,   40.1875,  7.2265625, 89.25,     -81.4375,  59.625,
+            11.234375, 48.875,   85.25,     27.6875,   30.984375, -38.125,
+            -83.125,   -86.1875, 16.765625, 46.125,    -28.4375,  28.234375,
+            35.25,     -77.0625, -57.875,   -58.15625, 27.484375, 32
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            122.6875, -25.703125, -76.625,  -141.25, 5.625,    -61.90625,
+            -94.5625, -33.3125,   -148,     5.28125, 51.5625,  -36.8125,
+            161.375,  134.625,    -35.9375, -132,    117.5625, -5.359375,
+            45.3125,  174.75,     110.625,  147.375, -48,      67.5
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'sub float16 5D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            73.5625,  14.484375, -69.375,   -52.03125, -75.8125, -2.2734375,
+            -83.3125, 15.578125, -62.6875,  32.96875,  82.5625,  -74.9375,
+            78.25,    48.40625,  -19.15625, -85.9375,  89.125,   22.875,
+            80.5625,  97.625,    52.75,     89.1875,   -20.5,    99.5
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            -49.125,   40.1875,  7.2265625, 89.25,     -81.4375,  59.625,
+            11.234375, 48.875,   85.25,     27.6875,   30.984375, -38.125,
+            -83.125,   -86.1875, 16.765625, 46.125,    -28.4375,  28.234375,
+            35.25,     -77.0625, -57.875,   -58.15625, 27.484375, 32
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            122.6875, -25.703125, -76.625,  -141.25, 5.625,    -61.90625,
+            -94.5625, -33.3125,   -148,     5.28125, 51.5625,  -36.8125,
+            161.375,  134.625,    -35.9375, -132,    117.5625, -5.359375,
+            45.3125,  174.75,     110.625,  147.375, -48,      67.5
+          ],
+          'descriptor': {shape: [2, 2, 1, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'sub float16 broadcast 1D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [-97.0625],
+          'descriptor': {shape: [1], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            73.5625,  14.484375, -69.375,   -52.03125, -75.8125, -2.2734375,
+            -83.3125, 15.578125, -62.6875,  32.96875,  82.5625,  -74.9375,
+            78.25,    48.40625,  -19.15625, -85.9375,  89.125,   22.875,
+            80.5625,  97.625,    52.75,     89.1875,   -20.5,    99.5
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -170.625, -111.5625, -27.6875, -45.03125, -21.25,   -94.8125,
+            -13.75,   -112.625,  -34.375,  -130,      -179.625, -22.125,
+            -175.25,  -145.5,    -77.875,  -11.125,   -186.25,  -119.9375,
+            -177.625, -194.75,   -149.75,  -186.25,   -76.5625, -196.5
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'sub float16 broadcast 2D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            73.5625,  14.484375, -69.375,   -52.03125, -75.8125, -2.2734375,
+            -83.3125, 15.578125, -62.6875,  32.96875,  82.5625,  -74.9375,
+            78.25,    48.40625,  -19.15625, -85.9375,  89.125,   22.875,
+            80.5625,  97.625,    52.75,     89.1875,   -20.5,    99.5
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [10.765625, -90.25, 12.7890625, -62.4375, 32.1875, 20.359375],
+          'descriptor': {shape: [2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            62.8125,  104.75,   -82.1875, 10.40625, -108,     -22.625,
+            -94.0625, 105.8125, -75.5,    95.375,   50.375,   -95.3125,
+            67.5,     138.625,  -31.9375, -23.5,    56.9375,  2.515625,
+            69.8125,  187.875,  39.96875, 151.625,  -52.6875, 79.125
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'sub float16 broadcast 3D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            73.5625,  14.484375, -69.375,   -52.03125, -75.8125, -2.2734375,
+            -83.3125, 15.578125, -62.6875,  32.96875,  82.5625,  -74.9375,
+            78.25,    48.40625,  -19.15625, -85.9375,  89.125,   22.875,
+            80.5625,  97.625,    52.75,     89.1875,   -20.5,    99.5
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [-8.390625, 75.5625, -32.3125, 8.0859375],
+          'descriptor': {shape: [2, 2, 1], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            81.9375, 22.875,  -61,        -127.625, -151.375,  -77.8125,
+            -51,     47.875,  -30.375,    24.875,   74.5,      -83,
+            86.625,  56.8125, -10.765625, -161.5,   13.5625,   -52.6875,
+            112.875, 130,     85.0625,    81.125,   -28.59375, 91.4375
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'sub float16 broadcast 4D to 4D',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [-97.0625],
+          'descriptor': {shape: [1, 1, 1, 1], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            73.5625,  14.484375, -69.375,   -52.03125, -75.8125, -2.2734375,
+            -83.3125, 15.578125, -62.6875,  32.96875,  82.5625,  -74.9375,
+            78.25,    48.40625,  -19.15625, -85.9375,  89.125,   22.875,
+            80.5625,  97.625,    52.75,     89.1875,   -20.5,    99.5
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            -170.625, -111.5625, -27.6875, -45.03125, -21.25,   -94.8125,
+            -13.75,   -112.625,  -34.375,  -130,      -179.625, -22.125,
+            -175.25,  -145.5,    -77.875,  -11.125,   -186.25,  -119.9375,
+            -177.625, -194.75,   -149.75,  -186.25,   -76.5625, -196.5
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+
+  // int8 tests
+  {
+    'name': 'sub int8 4D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            73, 14, -69, -52, -75, -2, -83, 15, -62, 32, 82,  -74,
+            78, 48, -19, -85, 89,  22, 80,  97, 52,  89, -20, 99
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int8'}
+        },
+        'inputB': {
+          'data': [
+            -49, 40,  7,  76, -81, 59, 11, 48, 65,  27,  30, -38,
+            -49, -78, 16, 35, -28, 28, 35, -3, -57, -21, 27, 32
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int8'}
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          // the range of int8 result: [-128, 127]
+          'data': [
+            122, -26, -76, -128, 6,   -61, -94, -33, -127, 5,   52,  -36,
+            127, 126, -35, -120, 117, -6,  45,  100, 109,  110, -47, 67
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int8'}
+        }
+      }
+    }
+  },
+
+  // uint8 tests
+  {
+    'name': 'sub uint8 4D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [1, 10, 100, 255],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'uint8'}
+        },
+        'inputB': {
+          // b should be lesser than or equal to a, otherwise the result would
+          // overflow when testing uint8 data type
+          'data': [1, 8, 88, 254],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'uint8'}
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [0, 2, 12, 1],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'uint8'}
+        }
+      }
+    }
+  },
+
+  // int32 tests
+  {
+    'name': 'sub int32 4D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            73, 14, -69, -52, -75, -2, -83, 15, -62, 32, 82,  -74,
+            78, 48, -19, -85, 89,  22, 80,  97, 52,  89, -20, 99
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int32'}
+        },
+        'inputB': {
+          'data': [
+            -49, 40,  7,  89, -81, 59, 11, 48,  85,  27,  30, -38,
+            -83, -86, 16, 46, -28, 28, 35, -77, -57, -58, 27, 32
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int32'}
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            122, -26, -76, -141, 6,   -61, -94, -33, -147, 5,   52,  -36,
+            161, 134, -35, -131, 117, -6,  45,  174, 109,  147, -47, 67
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int32'}
+        }
+      }
+    }
+  },
+
+  // uint32 tests
+  {
+    'name': 'sub uint32 4D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [1, 10, 100, 1024],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'uint32'}
+        },
+        'inputB': {
+          // b should be lesser than or equal to a, otherwise the result would
+          // overflow when testing uint32 data type
+          'data': [1, 8, 88, 1000],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'uint32'}
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [0, 2, 12, 24],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'uint32'}
+        }
+      }
+    }
+  },
+
+  // int64 tests
+  {
+    'name': 'sub int64 4D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            73, 14, -69, -52, -75, -2, -83, 15, -62, 32, 82,  -74,
+            78, 48, -19, -85, 89,  22, 80,  97, 52,  89, -20, 99
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int64'}
+        },
+        'inputB': {
+          'data': [
+            -49, 40,  7,  89, -81, 59, 11, 48,  85,  27,  30, -38,
+            -83, -86, 16, 46, -28, 28, 35, -77, -57, -58, 27, 32
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int64'}
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            122, -26, -76, -141, 6,   -61, -94, -33, -147, 5,   52,  -36,
+            161, 134, -35, -131, 117, -6,  45,  174, 109,  147, -47, 67
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'int64'}
+        }
+      }
+    }
+  },
+
+  // uint64 tests
+  {
+    'name': 'sub uint64 4D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [1, 10, 100, 1024],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'uint64'}
+        },
+        'inputB': {
+          // b should be lesser than or equal to a, otherwise the result would
+          // overflow when testing uint64 data type
+          'data': [1, 8, 88, 1000],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'uint64'}
+        }
+      },
+      'operators': [{
+        'name': 'sub',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [0, 2, 12, 24],
+          'descriptor': {shape: [1, 2, 2, 1], dataType: 'uint64'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/tanh.https.any.js b/tests/wpt/tests/webnn/conformance_tests/tanh.https.any.js
index 1b38d7707e8..63b8668644a 100644
--- a/tests/wpt/tests/webnn/conformance_tests/tanh.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/tanh.https.any.js
@@ -262,6 +262,333 @@ const tanhTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'tanh float16 1D constant tensor',
+    'graph': {
+      'inputs': {
+        'tanhInput': {
+          'data': [
+            5.47265625,   -1.1533203125, 0.407470703125, 1.830078125,
+            2.869140625,  -4.5703125,    4.1484375,      -4.06640625,
+            -3.712890625, 0.90771484375, -0.11083984375, 5.95703125,
+            1.783203125,  4.0234375,     5.5859375,      -5.28125,
+            1.4150390625, -5.70703125,   -1.4443359375,  -1.9130859375,
+            2.75,         -0.7421875,    4.85546875,     -0.75634765625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'tanh',
+        'arguments': [{'input': 'tanhInput'}],
+        'outputs': 'tanhOutput'
+      }],
+      'expectedOutputs': {
+        'tanhOutput': {
+          'data': [
+            1,
+            -0.81884765625,
+            0.38623046875,
+            0.94970703125,
+            0.99365234375,
+            -1,
+            0.99951171875,
+            -0.99951171875,
+            -0.9990234375,
+            0.72021484375,
+            -0.11041259765625,
+            1,
+            0.94482421875,
+            0.99951171875,
+            1,
+            -1,
+            0.888671875,
+            -1,
+            -0.89453125,
+            -0.95751953125,
+            0.99169921875,
+            -0.63037109375,
+            1,
+            -0.63916015625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'tanh float16 1D tensor',
+    'graph': {
+      'inputs': {
+        'tanhInput': {
+          'data': [
+            5.47265625,   -1.1533203125, 0.407470703125, 1.830078125,
+            2.869140625,  -4.5703125,    4.1484375,      -4.06640625,
+            -3.712890625, 0.90771484375, -0.11083984375, 5.95703125,
+            1.783203125,  4.0234375,     5.5859375,      -5.28125,
+            1.4150390625, -5.70703125,   -1.4443359375,  -1.9130859375,
+            2.75,         -0.7421875,    4.85546875,     -0.75634765625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'tanh',
+        'arguments': [{'input': 'tanhInput'}],
+        'outputs': 'tanhOutput'
+      }],
+      'expectedOutputs': {
+        'tanhOutput': {
+          'data': [
+            1,
+            -0.81884765625,
+            0.38623046875,
+            0.94970703125,
+            0.99365234375,
+            -1,
+            0.99951171875,
+            -0.99951171875,
+            -0.9990234375,
+            0.72021484375,
+            -0.11041259765625,
+            1,
+            0.94482421875,
+            0.99951171875,
+            1,
+            -1,
+            0.888671875,
+            -1,
+            -0.89453125,
+            -0.95751953125,
+            0.99169921875,
+            -0.63037109375,
+            1,
+            -0.63916015625
+          ],
+          'descriptor': {shape: [24], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'tanh float16 2D tensor',
+    'graph': {
+      'inputs': {
+        'tanhInput': {
+          'data': [
+            5.47265625,   -1.1533203125, 0.407470703125, 1.830078125,
+            2.869140625,  -4.5703125,    4.1484375,      -4.06640625,
+            -3.712890625, 0.90771484375, -0.11083984375, 5.95703125,
+            1.783203125,  4.0234375,     5.5859375,      -5.28125,
+            1.4150390625, -5.70703125,   -1.4443359375,  -1.9130859375,
+            2.75,         -0.7421875,    4.85546875,     -0.75634765625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'tanh',
+        'arguments': [{'input': 'tanhInput'}],
+        'outputs': 'tanhOutput'
+      }],
+      'expectedOutputs': {
+        'tanhOutput': {
+          'data': [
+            1,
+            -0.81884765625,
+            0.38623046875,
+            0.94970703125,
+            0.99365234375,
+            -1,
+            0.99951171875,
+            -0.99951171875,
+            -0.9990234375,
+            0.72021484375,
+            -0.11041259765625,
+            1,
+            0.94482421875,
+            0.99951171875,
+            1,
+            -1,
+            0.888671875,
+            -1,
+            -0.89453125,
+            -0.95751953125,
+            0.99169921875,
+            -0.63037109375,
+            1,
+            -0.63916015625
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'tanh float16 3D tensor',
+    'graph': {
+      'inputs': {
+        'tanhInput': {
+          'data': [
+            5.47265625,   -1.1533203125, 0.407470703125, 1.830078125,
+            2.869140625,  -4.5703125,    4.1484375,      -4.06640625,
+            -3.712890625, 0.90771484375, -0.11083984375, 5.95703125,
+            1.783203125,  4.0234375,     5.5859375,      -5.28125,
+            1.4150390625, -5.70703125,   -1.4443359375,  -1.9130859375,
+            2.75,         -0.7421875,    4.85546875,     -0.75634765625
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'tanh',
+        'arguments': [{'input': 'tanhInput'}],
+        'outputs': 'tanhOutput'
+      }],
+      'expectedOutputs': {
+        'tanhOutput': {
+          'data': [
+            1,
+            -0.81884765625,
+            0.38623046875,
+            0.94970703125,
+            0.99365234375,
+            -1,
+            0.99951171875,
+            -0.99951171875,
+            -0.9990234375,
+            0.72021484375,
+            -0.11041259765625,
+            1,
+            0.94482421875,
+            0.99951171875,
+            1,
+            -1,
+            0.888671875,
+            -1,
+            -0.89453125,
+            -0.95751953125,
+            0.99169921875,
+            -0.63037109375,
+            1,
+            -0.63916015625
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'tanh float16 4D tensor',
+    'graph': {
+      'inputs': {
+        'tanhInput': {
+          'data': [
+            5.47265625,   -1.1533203125, 0.407470703125, 1.830078125,
+            2.869140625,  -4.5703125,    4.1484375,      -4.06640625,
+            -3.712890625, 0.90771484375, -0.11083984375, 5.95703125,
+            1.783203125,  4.0234375,     5.5859375,      -5.28125,
+            1.4150390625, -5.70703125,   -1.4443359375,  -1.9130859375,
+            2.75,         -0.7421875,    4.85546875,     -0.75634765625
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'tanh',
+        'arguments': [{'input': 'tanhInput'}],
+        'outputs': 'tanhOutput'
+      }],
+      'expectedOutputs': {
+        'tanhOutput': {
+          'data': [
+            1,
+            -0.81884765625,
+            0.38623046875,
+            0.94970703125,
+            0.99365234375,
+            -1,
+            0.99951171875,
+            -0.99951171875,
+            -0.9990234375,
+            0.72021484375,
+            -0.11041259765625,
+            1,
+            0.94482421875,
+            0.99951171875,
+            1,
+            -1,
+            0.888671875,
+            -1,
+            -0.89453125,
+            -0.95751953125,
+            0.99169921875,
+            -0.63037109375,
+            1,
+            -0.63916015625
+          ],
+          'descriptor': {shape: [2, 2, 2, 3], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'tanh float16 5D tensor',
+    'graph': {
+      'inputs': {
+        'tanhInput': {
+          'data': [
+            5.47265625,   -1.1533203125, 0.407470703125, 1.830078125,
+            2.869140625,  -4.5703125,    4.1484375,      -4.06640625,
+            -3.712890625, 0.90771484375, -0.11083984375, 5.95703125,
+            1.783203125,  4.0234375,     5.5859375,      -5.28125,
+            1.4150390625, -5.70703125,   -1.4443359375,  -1.9130859375,
+            2.75,         -0.7421875,    4.85546875,     -0.75634765625
+          ],
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'tanh',
+        'arguments': [{'input': 'tanhInput'}],
+        'outputs': 'tanhOutput'
+      }],
+      'expectedOutputs': {
+        'tanhOutput': {
+          'data': [
+            1,
+            -0.81884765625,
+            0.38623046875,
+            0.94970703125,
+            0.99365234375,
+            -1,
+            0.99951171875,
+            -0.99951171875,
+            -0.9990234375,
+            0.72021484375,
+            -0.11041259765625,
+            1,
+            0.94482421875,
+            0.99951171875,
+            1,
+            -1,
+            0.888671875,
+            -1,
+            -0.89453125,
+            -0.95751953125,
+            0.99169921875,
+            -0.63037109375,
+            1,
+            -0.63916015625
+          ],
+          'descriptor': {shape: [2, 1, 4, 1, 3], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/resources/utils.js b/tests/wpt/tests/webnn/resources/utils.js
index 7cecf29061f..9d5cfc70c10 100644
--- a/tests/wpt/tests/webnn/resources/utils.js
+++ b/tests/wpt/tests/webnn/resources/utils.js
@@ -7,12 +7,12 @@ const operatorToleranceDict = {
   gelu: {float32: 18, float16: 18},
   hardSigmoid: {float32: 2, float16: 2},
   hardSwish: {float32: 4, float16: 4},
-  leakyRelu: {float32: 1, float16: 1},
+  leakyRelu: {float32: 1, float16: 2},
   linear: {float32: 2, float16: 2},
   prelu: {float32: 1, float16: 1},
-  relu: {float32: 0, float16: 0},
+  relu: {float32: 0, float16: 0, int8: 0, int32: 0},
   reshape: {float32: 0, float16: 0},
-  sigmoid: {float32: 34, float16: 3},
+  sigmoid: {float32: 34, float16: 10},
   softplus: {float32: 18, float16: 18},
   softsign: {float32: 3, float16: 3},
 };
@@ -59,6 +59,13 @@ const getPrecisionTolerance = (graphResources, intermediateOperands) => {
                               op, graphResources, intermediateOperands)
                               .value;
         break;
+      case 'averagePool2d':
+      case 'maxPool2d':
+      case 'l2Pool2d':
+        toleranceValue += getPoolingOperatorsPrecisionTolerance(
+                              op, graphResources, intermediateOperands)
+                              .value;
+        break;
       default:
         const operatorTolerance =
             operatorToleranceDict[op.name]?.[expectedDataType];
@@ -204,7 +211,7 @@ const getTypedArrayData = (type, size, data) => {
     for (let i = 0; i < data.length; i++) {
       outData[i] = toHalf(data[i]);
     }
-  } else if (type === 'int64') {
+  } else if (type === 'int64' || type === 'uint64') {
     if (typeof (data) === 'number' && size > 1) {
       return new TypedArrayDict[type](size).fill(BigInt(data));
     }
@@ -285,11 +292,13 @@ const assert_array_approx_equals_ulp = (actual, expected, nulp, dataType, descri
   /*
     * Test if two primitive arrays are equal within acceptable ULP distance
     */
+  assert(
+      typeof nulp === 'number', `unexpected type for nulp: ${typeof nulp}`);
   assert_true(
       actual.length === expected.length,
       `assert_array_approx_equals_ulp: ${description} lengths differ, ` +
           `expected ${expected.length} but got ${actual.length}`);
-  let actualBitwise, expectedBitwise, distance;
+  let distance;
   for (let i = 0; i < actual.length; i++) {
     if (actual[i] === expected[i]) {
       continue;
@@ -303,7 +312,10 @@ const assert_array_approx_equals_ulp = (actual, expected, nulp, dataType, descri
         assert_true(
             false,
             `assert_array_approx_equals_ulp: ${description} actual ` +
-                `${actual[i]} should be close enough to expected ` +
+                `${
+                    dataType === 'float16' ?
+                        float16AsUint16ToNumber(actual[i]) :
+                        actual[i]} should be close enough to expected ` +
                 `${expected[i]} by the acceptable ${nulp} ULP distance, ` +
                 `but they have ${distance} ULP distance`);
       }
@@ -330,6 +342,14 @@ const ulpDistance = (a, b, dataType) => {
     aBitwise = a;
     // convert b data of Float16 to Uint16
     bBitwise = toHalf(b);
+
+    // Workaround to use mask to check returned special float16 value -0.0 which
+    // is 32768 (1000 0000 0000 0000) of uint16
+    const signExclusionMask = 0x00007FFF;
+    if ((aBitwise & signExclusionMask) === 0 &&
+        (bBitwise & signExclusionMask) === 0) {
+      return 0;
+    }
   } else if (dataType === 'int64' || dataType === 'uint64') {
     aBitwise = BigInt(a);
     bBitwise = BigInt(b);
@@ -690,6 +710,10 @@ function validateContextSupportsGraph(context, graph) {
             assert(
                 typeof inputName === 'string',
                 `the inputs' item of ${operatorName} should be a string.`);
+            if (!graph.inputs[inputName]) {
+              // intermediate input
+              continue;
+            }
             validateInputOrConstantDataType(
                 inputName, operatorSupportLimits, 'inputs');
           }
@@ -775,7 +799,21 @@ const buildAndExecuteGraph = async (context, builder, graphResources) => {
     for (const argument of operator.arguments) {
       for (const argumentName in argument) {
         if (argumentName !== 'options') {
-          if (graphInputs.hasOwnProperty(argument[argumentName])) {
+          if (operator.name === 'concat' && argumentName === 'inputs') {
+            const concatInputs = [];
+            for (const inputName of argument[argumentName]) {
+              if (graphInputs.hasOwnProperty(inputName)) {
+                const operandName = inputName;
+                const operand = createOperand(
+                    context, builder, operandName, graphInputs[operandName]);
+                concatInputs.push(operand);
+              } else if (intermediateOperands.hasOwnProperty(inputName)) {
+                concatInputs.push(intermediateOperands[inputName]);
+              }
+              // concatInputs.push(intermediateOperands[inputName]);
+            }
+            argumentArray.push(concatInputs);
+          } else if (graphInputs.hasOwnProperty(argument[argumentName])) {
             const operandName = argument[argumentName];
             const operand = createOperand(
                 context, builder, operandName, graphInputs[operandName]);
@@ -975,6 +1013,62 @@ const getConv2dPrecisionTolerance =
   return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
 };
 
+const getPoolingOperatorsPrecisionTolerance =
+    (op, graphResources, intermediateOperands) => {
+  const args = op.arguments;
+  const operatorName = op.name;
+  const {inputs} = graphResources;
+  let inputShape;
+  const inputIndex = args[0][Object.keys(args[0])[0]];
+  if (inputs[inputIndex]) {
+    inputShape = inputs[inputIndex].descriptor.shape;
+  } else {
+    inputShape = intermediateOperands[inputIndex].shape;
+  }
+  const options =
+      args.length === 2 ? {...args[1][Object.keys(args[1])[0]]} : {};
+  let height;
+  let width;
+
+  if (options.windowDimensions) {
+    height = options.windowDimensions[0];
+    width = options.windowDimensions[1];
+  } else {
+    // If not present, the window dimensions are assumed to be the height
+    // and width dimensions of the input shape
+    if (options.layout && options.layout === 'nhwc') {
+      height = inputShape[1];
+      width = inputShape[2];
+    } else {
+      // nhwc layout of input
+      height = inputShape[2];
+      width = inputShape[3];
+    }
+  }
+
+  const tolerance = height * width + 2;
+  const toleranceDict = {
+    averagePool2d: {float32: tolerance, float16: tolerance},
+    l2Pool2d: {float32: tolerance, float16: tolerance},
+    maxPool2d: {float32: 0, float16: 0},
+  };
+  const expectedDataType =
+      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
+  return {
+    metricType: 'ULP',
+    value: toleranceDict[operatorName][expectedDataType]
+  };
+};
+
+const getInstanceNormPrecisionTolerance = (graphResources) => {
+  // according to
+  // https://github.com/web-platform-tests/wpt/pull/43891#discussion_r1457026316
+  const toleranceValueDict = {float32: 840, float16: 8400};
+  const expectedDataType =
+      getExpectedDataTypeOfSingleOutput(graphResources.expectedOutputs);
+  return {metricType: 'ULP', value: toleranceValueDict[expectedDataType]};
+};
+
 const getExpectedDataTypeOfSingleOutput = (expectedOutput) => {
   const expectedDescriptor =
       expectedOutput[Object.keys(expectedOutput)[0]].descriptor;
diff --git a/tests/wpt/tests/webnn/validation_tests/createContext.https.any.js b/tests/wpt/tests/webnn/validation_tests/createContext.https.any.js
index 314f7e3e3c6..3f089a1de29 100644
--- a/tests/wpt/tests/webnn/validation_tests/createContext.https.any.js
+++ b/tests/wpt/tests/webnn/validation_tests/createContext.https.any.js
@@ -48,3 +48,20 @@ promise_test(async t => {
     const ml_context_options = { deviceType: 'cpu', powerPreference: 'high-performance' };
     await navigator.ml.createContext(ml_context_options);
 }, '[createContext] Test creating context with deviceType=cpu, powerPreference=high-performance.');
+
+promise_test(async t => {
+    // Skip the test if WebGPU or an adapter/device is not available.
+    if (!navigator.gpu) {
+        return;
+    }
+    const adapter = await navigator.gpu.requestAdapter();
+    if (!adapter) {
+        return;
+    }
+    const device = await adapter.requestDevice();
+    if (!device) {
+        return;
+    }
+
+    await navigator.ml.createContext(device);
+}, 'Create context with GPUDevice.');
diff --git a/tests/wpt/tests/webrtc-encoded-transform/WEB_FEATURES.yml b/tests/wpt/tests/webrtc-encoded-transform/WEB_FEATURES.yml
new file mode 100644
index 00000000000..0df5a2c40ef
--- /dev/null
+++ b/tests/wpt/tests/webrtc-encoded-transform/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: webrtc-encoded-transform
+  files: "**"
diff --git a/tests/wpt/tests/webrtc-encoded-transform/script-metadata-transform.https.html b/tests/wpt/tests/webrtc-encoded-transform/script-metadata-transform.https.html
index 11c88b46936..106593879c2 100644
--- a/tests/wpt/tests/webrtc-encoded-transform/script-metadata-transform.https.html
+++ b/tests/wpt/tests/webrtc-encoded-transform/script-metadata-transform.https.html
@@ -271,10 +271,11 @@ promise_test(async (test) => {
     assert_equals(data.senderBeforeWrite.metadata.frameId,
       data.senderAfterWrite.metadata.frameId,
       'frameId matches (for sender before and after write)');
-    assert_equals(data.senderBeforeWrite.metadata.frameId,
-      data.receiverBeforeWrite.metadata.frameId,
+
+    assert_true(data.senderBeforeWrite.metadata.frameId == data.receiverBeforeWrite.metadata.frameId ||
+      data.receiverBeforeWrite.metadata.frameId == undefined,
       'frameId matches (for sender and receiver)');
-    assert_equals(data.senderBeforeWrite.metadata.frameId,
+    assert_equals(data.receiverBeforeWrite.metadata.frameId,
       data.receiverAfterWrite.metadata.frameId,
       'frameId matches (for receiver before and after write)');
 }, 'video metadata: frameId');
diff --git a/tests/wpt/tests/webrtc-encoded-transform/script-transform-sendKeyFrameRequest.https.html b/tests/wpt/tests/webrtc-encoded-transform/script-transform-sendKeyFrameRequest.https.html
index 51b797eb683..9bc75bd7a0e 100644
--- a/tests/wpt/tests/webrtc-encoded-transform/script-transform-sendKeyFrameRequest.https.html
+++ b/tests/wpt/tests/webrtc-encoded-transform/script-transform-sendKeyFrameRequest.https.html
@@ -76,7 +76,7 @@ promise_test(async (test) => {
   await receiverPc.setLocalDescription();
   await senderPc.setRemoteDescription(receiverPc.localDescription);
 
-  assert_equals(await sendKeyFrameRequest(receiver.transform.port), 'failure: InvalidStateError');
+  assert_equals(await sendKeyFrameRequest(receiver.transform.port), 'success');
 
   senderPc.getTransceivers()[0].direction = 'sendonly';
   await senderPc.setLocalDescription();
@@ -85,7 +85,7 @@ promise_test(async (test) => {
   await senderPc.setRemoteDescription(receiverPc.localDescription);
 
   assert_equals(await sendKeyFrameRequest(receiver.transform.port), 'success');
-}, 'sendKeyFrameRequest rejects when the receiver is negotiated inactive, and resumes succeeding when negotiated back to active');
+}, 'sendKeyFrameRequest does not reject when the receiver is negotiated inactive, and resumes succeeding when negotiated back to active');
 
 promise_test(async (test) => {
   const {sender, receiver, senderPc, receiverPc} = await createConnectionWithTransform(test, 'script-transform-sendKeyFrameRequest.js', {video: true});
diff --git a/tests/wpt/tests/webrtc-encoded-transform/tentative/RTCEncodedAudioFrame-clone.https.html b/tests/wpt/tests/webrtc-encoded-transform/tentative/RTCEncodedAudioFrame-clone.https.html
index 9f07713d443..c93f8b3e541 100644
--- a/tests/wpt/tests/webrtc-encoded-transform/tentative/RTCEncodedAudioFrame-clone.https.html
+++ b/tests/wpt/tests/webrtc-encoded-transform/tentative/RTCEncodedAudioFrame-clone.https.html
@@ -37,7 +37,7 @@ promise_test(async t => {
       const original = result.value;
       let clone = structuredClone(original);
       assert_equals(original.timestamp, clone.timestamp);
-      assert_equals(original.getMetadata().absCaptureTime, clone.getMetadata().absCaptureTime);
+      assert_equals(original.getMetadata().captureTime, clone.getMetadata().captureTime);
       assert_array_equals(Array.from(original.data), Array.from(clone.data));
       await writer2.write(clone);
       resolve();
diff --git a/tests/wpt/tests/webrtc-encoded-transform/tentative/RTCEncodedAudioFrame-metadata.https.html b/tests/wpt/tests/webrtc-encoded-transform/tentative/RTCEncodedAudioFrame-metadata.https.html
index 435e1c06783..df4577c5614 100644
--- a/tests/wpt/tests/webrtc-encoded-transform/tentative/RTCEncodedAudioFrame-metadata.https.html
+++ b/tests/wpt/tests/webrtc-encoded-transform/tentative/RTCEncodedAudioFrame-metadata.https.html
@@ -39,7 +39,7 @@ promise_test(async t => {
       assert_true(original.getMetadata().hasOwnProperty('receiveTime'));
       assert_true(original.getMetadata().receiveTime > 0);
       assert_equals(original.getMetadata().rtpTimestamp, newFrame.getMetadata().rtpTimestamp);
-      assert_equals(original.getMetadata().absCaptureTime, newFrame.getMetadata().absCaptureTime);
+      assert_equals(original.getMetadata().captureTime, newFrame.getMetadata().captureTime);
       assert_equals(original.getMetadata().receiveTime, newFrame.getMetadata().receiveTime);
       assert_array_equals(Array.from(original.data), Array.from(newFrame.data));
       await writer2.write(newFrame);
@@ -83,7 +83,7 @@ promise_test(async t => {
       assert_not_equals(original.getMetadata().rtpTimestamp, newFrame.getMetadata().rtpTimestamp);
       assert_equals(newMetadata.rtpTimestamp, newFrame.getMetadata().rtpTimestamp);
       assert_equals(original.getMetadata().receiveTime, newFrame.getMetadata().receiveTime);
-      assert_equals(original.getMetadata().absCaptureTime, newFrame.getMetadata().absCaptureTime);
+      assert_equals(original.getMetadata().captureTime, newFrame.getMetadata().captureTime);
       assert_array_equals(Array.from(original.data), Array.from(newFrame.data));
       await writer2.write(newFrame);
       resolve();
diff --git a/tests/wpt/tests/webrtc-encoded-transform/tentative/RTCPeerConnection-insertable-streams.js b/tests/wpt/tests/webrtc-encoded-transform/tentative/RTCPeerConnection-insertable-streams.js
index 0bf820acde4..f3873e1de4b 100644
--- a/tests/wpt/tests/webrtc-encoded-transform/tentative/RTCPeerConnection-insertable-streams.js
+++ b/tests/wpt/tests/webrtc-encoded-transform/tentative/RTCPeerConnection-insertable-streams.js
@@ -30,7 +30,7 @@ function areMetadataEqual(metadata1, metadata2, type) {
           metadata1.payloadType == metadata2.payloadType &&
           areArraysEqual(
               metadata1.contributingSources, metadata2.contributingSources) &&
-          metadata1.absCaptureTime == metadata2.absCaptureTime &&
+          metadata1.captureTime == metadata2.captureTime &&
           metadata1.frameId === metadata2.frameId &&
           areArraysEqual(metadata1.dependencies, metadata2.dependencies) &&
           metadata1.spatialIndex === metadata2.spatialIndex &&
diff --git a/tests/wpt/tests/webrtc-stats/supported-stats.https.html b/tests/wpt/tests/webrtc-stats/supported-stats.https.html
index 677736f3cd8..81aef5f94b9 100644
--- a/tests/wpt/tests/webrtc-stats/supported-stats.https.html
+++ b/tests/wpt/tests/webrtc-stats/supported-stats.https.html
@@ -69,6 +69,7 @@ function isPropertyTestable(type, property) {
     ],
     'inbound-rtp': [
       'fecSsrc', // requires FlexFEC to be negotiated.
+      'fecBytesReceived', // requires FlexFEC to be negotiated.
     ],
     'media-source': [
       'echoReturnLoss', // requires gUM with an audio input device.
diff --git a/tests/wpt/tests/webrtc/RTCCertificate.html b/tests/wpt/tests/webrtc/RTCCertificate.html
index 6b7626c92e7..2662580c959 100644
--- a/tests/wpt/tests/webrtc/RTCCertificate.html
+++ b/tests/wpt/tests/webrtc/RTCCertificate.html
@@ -146,7 +146,7 @@
 
     5.5.1 The RTCDtlsFingerprint Dictionary
       algorithm of type DOMString
-        One of the the hash function algorithms defined in the 'Hash function
+        One of the hash function algorithms defined in the 'Hash function
         Textual Names' registry, initially specified in [RFC4572] Section 8.
         As noted in [JSEP] Section 5.2.1, the digest algorithm used for the
         fingerprint matches that used in the certificate signature.
diff --git a/tests/wpt/tests/webrtc/RTCConfiguration-iceServers.html b/tests/wpt/tests/webrtc/RTCConfiguration-iceServers.html
index aa66bfbb2bf..bc7831361ab 100644
--- a/tests/wpt/tests/webrtc/RTCConfiguration-iceServers.html
+++ b/tests/wpt/tests/webrtc/RTCConfiguration-iceServers.html
@@ -301,4 +301,28 @@
       }] }));
   }, `with empty urls should throw SyntaxError`);
 
+  test(() => {
+    const pc = new RTCPeerConnection({ iceServers: [{
+      urls: 'stun:stun1.example.net'
+    }] });
+    let config = pc.getConfiguration();
+    assert_equals(config.iceServers.length, 1);
+    pc.setConfiguration({});
+    config = pc.getConfiguration();
+    assert_equals(config.iceServers.length, 0);
+  }, `setConfiguration(config) - without iceServers removes ice servers`);
+
+  config_test(makePc => {
+    const pc = makePc({ iceServers: [...Array(32)].map((_, i) => ({
+      urls: `stun:stun${i+1}.example.net`
+    })) });
+
+    const { iceServers } = pc.getConfiguration();
+    assert_equals(iceServers.length, 32);
+
+    for (let i = 0; i < 32; i++) {
+      const server = iceServers[i];
+      assert_array_equals(server.urls, [`stun:stun${i+1}.example.net`]);
+    }
+  }, `with 32 ice servers must succeed`);
 </script>
diff --git a/tests/wpt/tests/webrtc/RTCIceCandidate-constructor.html b/tests/wpt/tests/webrtc/RTCIceCandidate-constructor.html
index b760c7b05a5..05c0849f7a0 100644
--- a/tests/wpt/tests/webrtc/RTCIceCandidate-constructor.html
+++ b/tests/wpt/tests/webrtc/RTCIceCandidate-constructor.html
@@ -151,12 +151,15 @@
     assert_equals(candidate.usernameFragment, null, 'usernameFragment');
   }, 'new RTCIceCandidate({ ... }) with invalid candidate string and sdpMid');
 
+["most", "all"].forEach(howMany => {
   test(t => {
     const candidate = new RTCIceCandidate({
       candidate: candidateString,
       sdpMid: 'video',
       sdpMLineIndex: 1,
-      usernameFragment: 'test'
+      usernameFragment: 'test',
+      relayProtocol: 'udp',
+      url: 'stun:stun.example.org'
     });
 
     assert_equals(candidate.candidate, candidateString, 'candidate');
@@ -175,14 +178,21 @@
     assert_equals(candidate.tcpType, null, 'tcpType');
     assert_equals(candidate.relatedAddress, null, 'relatedAddress');
     assert_equals(candidate.relatedPort, null, 'relatedPort');
-  }, 'new RTCIceCandidate({ ... }) with nondefault values for all fields');
+    // The remaining fields are newer, so test them seperately
+    if (howMany != "most") {
+      assert_equals(candidate.relayProtocol, 'udp', 'relayProtocol');
+      assert_equals(candidate.url, 'stun:stun.example.org', 'url');
+    }
+  }, `new RTCIceCandidate({ ... }) with nondefault values for ${howMany} fields`);
 
   test(t => {
     const candidate = new RTCIceCandidate({
       candidate: candidateString2,
       sdpMid: 'video',
       sdpMLineIndex: 1,
-      usernameFragment: 'user1'
+      usernameFragment: 'user1',
+      relayProtocol: 'tcp',
+      url: 'turn:turn.example.net'
     });
 
     assert_equals(candidate.candidate, candidateString2, 'candidate');
@@ -201,7 +211,28 @@
     assert_equals(candidate.tcpType, 'active', 'tcpType');
     assert_equals(candidate.relatedAddress, 'www.example.com', 'relatedAddress');
     assert_equals(candidate.relatedPort, 22222, 'relatedPort');
-  }, 'new RTCIceCandidate({ ... }) with nondefault values for all fields, tcp candidate');
+    // The remaining fields are newer, so test them seperately
+    if (howMany != "most") {
+      assert_equals(candidate.url, 'turn:turn.example.net', 'url');
+      assert_equals(candidate.relayProtocol, 'tcp', 'relayProtocol');
+    }
+  }, `new RTCIceCandidate({ ... }) with nondefault values for ${howMany} fields, tcp candidate`);
+});
+
+  test(t => {
+    let candidate = new RTCIceCandidate(new RTCIceCandidate({
+      sdpMid: 'video',
+      relayProtocol: 'tls',
+      url: 'turn:turn.example.net'
+    }));
+
+    assert_equals(candidate.relayProtocol, 'tls', 'relayProtocol cloned');
+    assert_equals(candidate.url, 'turn:turn.example.net', 'url cloned');
+
+    candidate = new RTCIceCandidate(JSON.parse(JSON.stringify(candidate)));
+    assert_equals(candidate.relayProtocol, null, 'relayProtocol not signaled');
+    assert_equals(candidate.url, null, 'url not signaled');
+  }, `new RTCIceCandidate({ relayProtocol, url }) cloned vs signaled`);
 
   test(t => {
     // sdpMid is not validated in RTCIceCandidate
diff --git a/tests/wpt/tests/webrtc/RTCIceTransport.html b/tests/wpt/tests/webrtc/RTCIceTransport.html
index 31504481f4b..f00af08e97c 100644
--- a/tests/wpt/tests/webrtc/RTCIceTransport.html
+++ b/tests/wpt/tests/webrtc/RTCIceTransport.html
@@ -125,6 +125,11 @@
     const pc2 = new RTCPeerConnection();
     t.add_cleanup(() => pc2.close());
 
+    const pc1Candidates = new Set();
+    const pc2Candidates = new Set();
+    pc1.addEventListener('icecandidate', e => { if (e.candidate) pc1Candidates.add(e.candidate.candidate); });
+    pc2.addEventListener('icecandidate', e => { if (e.candidate) pc2Candidates.add(e.candidate.candidate); });
+
     return createDataChannelPair(t, {}, pc1, pc2)
     .then(([channel1, channel2]) => {
       // Send a ping message and wait for it just to make sure
@@ -136,6 +141,22 @@
       const iceTransport1 = getIceTransportFromSctp(pc1);
       const iceTransport2 = getIceTransportFromSctp(pc2);
 
+      test(() => {
+          const candidatePair1 = iceTransport1.getSelectedCandidatePair();
+          const candidatePair2 = iceTransport2.getSelectedCandidatePair();
+
+          assert_equals(candidatePair1.local.candidate, candidatePair2.remote.candidate,
+              'Expect selected local candidate of one pc is the selected remote candidate or another');
+
+          assert_equals(candidatePair1.remote.candidate, candidatePair2.local.candidate,
+              'Expect selected local candidate of one pc is the selected remote candidate or another');
+
+          assert_true(pc1Candidates.has(candidatePair1.local.candidate), "pc1 selected local candidate in pc1 candidates");
+          assert_true(pc1Candidates.has(candidatePair2.remote.candidate), "pc2 selected remote candidate in pc1 candidates");
+          assert_true(pc2Candidates.has(candidatePair2.local.candidate), "pc2 selected local candidate in pc2 candidates");
+          assert_true(pc2Candidates.has(candidatePair1.remote.candidate), "pc1 selected remote candidate in pc2 candidates");
+      }, "Validate selected candidate pair");
+
       validateConnectedIceTransport(iceTransport1);
       validateConnectedIceTransport(iceTransport2);
 
@@ -149,15 +170,6 @@
         iceTransport2.getLocalCandidates().length,
         `Expect iceTransport1 to have same number of remote candidate as iceTransport2's local candidates`);
 
-      const candidatePair1 = iceTransport1.getSelectedCandidatePair();
-      const candidatePair2 = iceTransport2.getSelectedCandidatePair();
-
-      assert_equals(candidatePair1.local.candidate, candidatePair2.remote.candidate,
-        'Expect selected local candidate of one pc is the selected remote candidate or another');
-
-      assert_equals(candidatePair1.remote.candidate, candidatePair2.local.candidate,
-        'Expect selected local candidate of one pc is the selected remote candidate or another');
-
       assert_equals(iceTransport1.role, 'controlling',
         `Expect offerer's iceTransport to take the controlling role`);
 
diff --git a/tests/wpt/tests/webrtc/RTCPeerConnection-addIceCandidate.html b/tests/wpt/tests/webrtc/RTCPeerConnection-addIceCandidate.html
index 618ef7e33c6..4517554bc0b 100644
--- a/tests/wpt/tests/webrtc/RTCPeerConnection-addIceCandidate.html
+++ b/tests/wpt/tests/webrtc/RTCPeerConnection-addIceCandidate.html
@@ -641,4 +641,28 @@ a=rtcp-rsize
           usernameFragment: usernameFragment1
         })));
   }, 'Add candidate with sdpMid belonging to different usernameFragment should reject with OperationError');
+
+  promise_test(async t => {
+    const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
+    await pc.setRemoteDescription(sessionDesc);
+    const recognized = [];
+    await pc.addIceCandidate({
+      candidate: candidateStr1,
+      sdpMid: sdpMid1,
+      get relayProtocol() {
+        recognized.push("relayProtocol");
+        return null;
+      },
+      get url() {
+        recognized.push("url");
+        return null;
+      },
+      get usernameFragment() {
+        recognized.push("usernameFragment");
+        return null;
+      },
+    });
+    assert_array_equals(recognized, ['usernameFragment']);
+  }, 'addIceCandidate should not recognize relayProtocol or url');
 </script>
diff --git a/tests/wpt/tests/webrtc/RTCPeerConnection-addTransceiver.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-addTransceiver.https.html
index 3fd83a76fe2..62df4293067 100644
--- a/tests/wpt/tests/webrtc/RTCPeerConnection-addTransceiver.https.html
+++ b/tests/wpt/tests/webrtc/RTCPeerConnection-addTransceiver.https.html
@@ -319,18 +319,21 @@
           of 16 characters. If one of the RIDs does not meet these requirements,
           throw a TypeError.
    */
+
+["video", "audio"].forEach(kind => {
+
   test(t => {
     const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
     assert_idl_attribute(pc, 'addTransceiver');
 
     assert_throws_js(TypeError, () =>
-      pc.addTransceiver('video', {
+      pc.addTransceiver(kind, {
         sendEncodings: [{
           rid: '@Invalid!'
         }]
       }));
-  }, 'addTransceiver() with rid containing invalid non-alphanumeric characters should throw TypeError');
+  }, `addTransceiver("${kind}") with rid containing invalid non-alphanumeric characters should throw TypeError`);
 
   test(t => {
     const pc = new RTCPeerConnection();
@@ -338,22 +341,41 @@
     assert_idl_attribute(pc, 'addTransceiver');
 
     assert_throws_js(TypeError, () =>
-      pc.addTransceiver('audio', {
+      pc.addTransceiver(kind, {
         sendEncodings: [{
           rid: 'a'.repeat(17)
         }]
       }));
-  }, 'addTransceiver() with rid longer than 16 characters should throw TypeError');
+  }, `addTransceiver("${kind}") with rid longer than 16 characters should throw TypeError`);
 
   test(t => {
     const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
-    pc.addTransceiver('audio', {
+    assert_idl_attribute(pc, 'addTransceiver');
+
+    assert_throws_js(TypeError, () =>
+      pc.addTransceiver(kind, {
+        sendEncodings: [{rid: 'a'}, {rid: 'a'}]
+      }));
+  }, `addTransceiver("${kind}") with duplicate rids should throw TypeError`);
+
+  test(t => {
+    const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
+    pc.addTransceiver(kind, {
       sendEncodings: [{
         rid: 'foo'
       }]
     });
-  }, `addTransceiver() with valid rid value should succeed`);
+  }, `addTransceiver("${kind}") with valid rid value should succeed`);
+
+  test(t => {
+    const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
+    pc.addTransceiver('video', {
+      sendEncodings: [{rid: 'a'}, {rid: 'b'}]
+    });
+  }, `addTransceiver("${kind}") with multiple rid values should succeed`);
 
   test(t => {
     const pc = new RTCPeerConnection();
@@ -369,7 +391,8 @@
         rid: 'foo'
       }]
     });
-  }, `addTransceiver() with valid sendEncodings should succeed`);
+  }, `addTransceiver("${kind}") with valid sendEncodings should succeed`);
+});
 
   /*
     TODO
diff --git a/tests/wpt/tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html b/tests/wpt/tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html
index cb5336f3f35..de9ad184af0 100644
--- a/tests/wpt/tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html
+++ b/tests/wpt/tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html
@@ -100,14 +100,4 @@ promise_test(async t => {
   assert_less_than_equal(ssrc.audioLevel, 1);
 }, '[audio-only] RTCRtpSynchronizationSource.audioLevel is a number [0, 1]');
 
-// This test only passes if the implementation is sending the RFC 6464 extension
-// header and the "vad" extension attribute is not "off", otherwise
-// voiceActivityFlag is absent. TODO: Consider moving this test to an
-// optional-to-implement subfolder?
-promise_test(async t => {
-  const receiver = await initiateSingleTrackCallAndReturnReceiver(t, 'audio');
-  const [ssrc] = await listenForSSRCs(t, receiver);
-  assert_equals(typeof ssrc.voiceActivityFlag, 'boolean');
-}, '[audio-only] RTCRtpSynchronizationSource.voiceActivityFlag is a boolean');
-
 </script>
diff --git a/tests/wpt/tests/webrtc/outbound-rtp-encoding-index.https.html b/tests/wpt/tests/webrtc/outbound-rtp-encoding-index.https.html
new file mode 100644
index 00000000000..825fe6949c3
--- /dev/null
+++ b/tests/wpt/tests/webrtc/outbound-rtp-encoding-index.https.html
@@ -0,0 +1,97 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="third_party/sdp/sdp.js"></script>
+<script src="simulcast/simulcast.js"></script>
+<script>
+'use strict';
+
+async function pollUntilMultipleOutboundRtps(pc, kTimeoutMs = 10000) {
+  const t0 = performance.now();
+  while (performance.now() - t0 < kTimeoutMs) {
+    const report = await pc.getStats();
+    const outboundRtps = Array.from(
+        report.values().filter(s => s.type == 'outbound-rtp'));
+    if (outboundRtps.length > 1) {
+      return;
+    }
+  }
+  throw 'Timed out waiting for multple outbound-rtp stats objects';
+}
+
+promise_test(async t => {
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+  pc1.addTransceiver('video');
+
+  // O/A is needed to ensure outbound-rtp exists.
+  await pc1.setLocalDescription();
+  await pc2.setRemoteDescription(pc1.localDescription);
+  await pc2.setLocalDescription();
+  await pc1.setRemoteDescription(pc2.localDescription);
+
+  const report = await pc1.getStats();
+  const outboundRtp = report.values().find(s => s.type == 'outbound-rtp');
+  assert_not_equals(outboundRtp, undefined, 'outbound-rtp exists');
+
+  assert_equals(outboundRtp.encodingIndex, 0, 'encodingIndex is 0');
+}, `In singlecast, encodingIndex is 0`);
+
+promise_test(async t => {
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+
+  pc1.addTransceiver('video', {sendEncodings: [{rid: 'foo'}, {rid: 'bar'}]});
+  // O/A with tweaks to accept simulcast.
+  await doOfferToSendSimulcastAndAnswer(pc1, pc2, ['foo', 'bar']);
+
+  // Workaround to RTP stats lifetime bug: In some browsers it takes a little
+  // while before multiple outbound RTP stats objects appear in the report.
+  // TODO(https://crbug.com/406585888): Test coverage for this should be added
+  // to rtp-stats-lifetime.https.html. When that test passes, delete this
+  // workaround.
+  await pollUntilMultipleOutboundRtps(pc1);
+
+  const report = await pc1.getStats();
+  // The RTP stream for sendEncodings[0].
+  const outboundRtpFoo = report.values().find(
+      s => s.type == 'outbound-rtp' && s.rid == 'foo');
+  assert_not_equals(outboundRtpFoo, undefined,
+                    `outbound-rtp with rid:'foo' exists`);
+  assert_equals(outboundRtpFoo.encodingIndex, 0,
+                `outbound-rtp with rid:'foo' has encodingIndex 0`);
+  // The RTP stream for sendEncodings[1].
+  const outboundRtpBar = report.values().find(
+      s => s.type == 'outbound-rtp' && s.rid == 'bar');
+  assert_not_equals(outboundRtpBar, undefined,
+                    `outbound-rtp with rid:'bar' exists`);
+  assert_equals(outboundRtpBar.encodingIndex, 1,
+                `outbound-rtp with rid:'bar' has encodingIndex 1`);
+}, `In simulcast, encodingIndex reflects index of sendEncodings`);
+
+promise_test(async t => {
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+
+  pc1.addTransceiver('audio');
+  // O/A is needed to ensure outbound-rtp exists.
+  await pc1.setLocalDescription();
+  await pc2.setRemoteDescription(pc1.localDescription);
+  await pc2.setLocalDescription();
+  await pc1.setRemoteDescription(pc2.localDescription);
+
+  const report = await pc1.getStats();
+  const outboundRtp = report.values().find(s => s.type == 'outbound-rtp');
+  assert_not_equals(outboundRtp, undefined, 'outbound-rtp exists');
+
+  assert_equals(outboundRtp.encodingIndex, undefined,
+                'encodingIndex is undefined');
+}, `encodingIndex is undefined for audio streams`);
+</script>
diff --git a/tests/wpt/tests/webrtc/protocol/av1-profile-asymmetry.https.html b/tests/wpt/tests/webrtc/protocol/av1-profile-asymmetry.https.html
new file mode 100644
index 00000000000..f7d14ad6d86
--- /dev/null
+++ b/tests/wpt/tests/webrtc/protocol/av1-profile-asymmetry.https.html
@@ -0,0 +1,51 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../third_party/sdp/sdp.js"></script>
+<script>
+'use strict';
+
+promise_test(async t => {
+  const av1SendCodec = RTCRtpSender.getCapabilities('video').codecs.find(
+      codec => codec.mimeType == 'video/AV1');
+  assert_not_equals(av1SendCodec, undefined);
+
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+
+  const transceiver = pc1.addTransceiver('video');
+  transceiver.setCodecPreferences([av1SendCodec]);
+
+  await pc1.setLocalDescription();
+  await pc2.setRemoteDescription(pc1.localDescription);
+  await pc2.setLocalDescription();
+  await pc1.setRemoteDescription(pc2.localDescription);
+
+  // Modify the profile ID of `av1SendCodec` to ensure a strict codec comparison
+  // matcher would no longer consider them the same.
+  const sdpFmtpMap = SDPUtils.parseFmtp(av1SendCodec.sdpFmtpLine);
+  const profileId = Number(sdpFmtpMap['profile']);
+  av1SendCodec.sdpFmtpLine =
+      av1SendCodec.sdpFmtpLine.replace(`profile=${profileId}`,
+                                       `profile=${profileId + 1}`);
+
+  const sender = transceiver.sender;
+  let params = sender.getParameters();
+  params.encodings[0].codec = av1SendCodec;
+  // Set parameters should not reject because the codec dictionary match
+  // algorithm[1] is able to ignore asymmetrical parameters such as AV1's
+  // `profile` parameter, see [2].
+  //
+  // [1] https://w3c.github.io/webrtc-pc/#dfn-codec-dictionary-match
+  // [2] https://aomediacodec.github.io/av1-rtp-spec/#723-usage-with-the-sdp-offeranswer-model
+  await sender.setParameters(params);
+  // getParameters() returns `av1SendCodec` now.
+  params = sender.getParameters();
+  assert_equals(params.encodings[0].codec.mimeType, 'video/AV1');
+  assert_equals(params.encodings[0].codec.sdpFmtpLine,
+                av1SendCodec.sdpFmtpLine);
+}, `setParameters() ignores the asymmetrical AV1 parameter 'profile'`);
+</script>
diff --git a/tests/wpt/tests/webrtc/protocol/h265-loopback.https.html b/tests/wpt/tests/webrtc/protocol/h265-loopback.https.html
new file mode 100644
index 00000000000..c3a394ef8f4
--- /dev/null
+++ b/tests/wpt/tests/webrtc/protocol/h265-loopback.https.html
@@ -0,0 +1,76 @@
+<!doctype html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../RTCPeerConnection-helper.js"></script>
+<script>
+'use strict';
+
+async function pollGetStatsUntil(t, pc, condition, pollingMs = 100) {
+  while (true) {
+    const report = await pc.getStats();
+    for (const stats of report.values()) {
+      if (condition(report, stats) == true) {
+        // Condition satisfied, stop polling.
+        return;
+      }
+    }
+    await new Promise(r => t.step_timeout(r, pollingMs));
+  }
+}
+
+function isRtpWithCodec(report, stats, mimeType) {
+  if (stats.type != 'outbound-rtp' && stats.type != 'inbound-rtp') {
+    return false;  // Not an RTP stats object.
+  }
+  const codec = report.get(stats.codecId);
+  return codec && codec.mimeType == mimeType;
+}
+
+promise_test(async t => {
+  const sendCodec = RTCRtpSender.getCapabilities('video').codecs.find(
+      codec => codec.mimeType == 'video/H265');
+  const recvCodec = RTCRtpReceiver.getCapabilities('video').codecs.find(
+      codec => codec.mimeType == 'video/H265');
+  assert_implements_optional(
+      sendCodec != undefined && recvCodec != undefined,
+      'H265 not available for sending or receiving. Loopback requires both.');
+
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+  pc1.onicecandidate = (e) => pc2.addIceCandidate(e.candidate);
+  pc2.onicecandidate = (e) => pc1.addIceCandidate(e.candidate);
+
+  const stream = await getNoiseStream({video:{width:640, height:360}});
+  const [track] = stream.getVideoTracks();
+  t.add_cleanup(() => track.stop());
+
+  // Negotiate H265.
+  const transceiver = pc1.addTransceiver(track);
+  transceiver.setCodecPreferences([sendCodec]);
+  await pc1.setLocalDescription();
+  await pc2.setRemoteDescription(pc1.localDescription);
+  await pc2.setLocalDescription();
+  await pc1.setRemoteDescription(pc2.localDescription);
+
+  // Wait for H265 frames to be encoded and sent.
+  await pollGetStatsUntil(t, pc1, (report, stats) => {
+    if (!isRtpWithCodec(report, stats, 'video/H265')) {
+      return false;
+    }
+    assert_equals(stats.type, 'outbound-rtp');
+    return stats.framesEncoded > 0 && stats.framesSent > 0;
+  });
+  // Wait for H265 frames to be received and decoded.
+  await pollGetStatsUntil(t, pc2, (report, stats) => {
+    if (!isRtpWithCodec(report, stats, 'video/H265')) {
+      return false;
+    }
+    assert_equals(stats.type, 'inbound-rtp');
+    return stats.framesReceived > 0 && stats.framesDecoded > 0;
+  });
+}, `Negotiate H265 loopback and verify frames are flowing`);
+</script>
diff --git a/tests/wpt/tests/webrtc/protocol/video-codecs.https.html b/tests/wpt/tests/webrtc/protocol/video-codecs.https.html
index 2fbb4ae28f6..bf76e1b2e6a 100644
--- a/tests/wpt/tests/webrtc/protocol/video-codecs.https.html
+++ b/tests/wpt/tests/webrtc/protocol/video-codecs.https.html
@@ -63,10 +63,11 @@ function parseFmtp(fmtp) {
   const params = fmtp.split(';');
   return params.map(param => param.split('='));
 }
+
 promise_test(async t => {
   const params = await negotiateParameters();
   assert_true(!!params.codecs.find(codec => codec.mimeType.toLowerCase() === 'video/h264'));
-  assert_true(!!params.codecs.find(codec => codec.mimeType.toLowerCase() === 'video/vP8'));
+  assert_true(!!params.codecs.find(codec => codec.mimeType.toLowerCase() === 'video/vp8'));
 }, 'H.264 and VP8 should be negotiated after handshake');
 
 // TODO: Section 6: Recipients MUST be able to decode 320x240@20 fps
diff --git a/tests/wpt/tests/webrtc/rtp-stats-lifetime.https.html b/tests/wpt/tests/webrtc/rtp-stats-lifetime.https.html
new file mode 100644
index 00000000000..4ddd6ad4f16
--- /dev/null
+++ b/tests/wpt/tests/webrtc/rtp-stats-lifetime.https.html
@@ -0,0 +1,102 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="RTCPeerConnection-helper.js"></script>
+<script>
+'use strict';
+
+async function hasStats(pc, type) {
+  const report = await pc.getStats();
+  for (const stats of report.values()) {
+    if (stats.type == type) {
+      return true;
+    }
+  }
+  return false;
+}
+
+async function getInboundRtpPollUntilItExists(pc, kTimeoutMs = 10000) {
+  const t0 = performance.now();
+  while (performance.now() - t0 < kTimeoutMs) {
+    const report = await pc.getStats();
+    for (const stats of report.values()) {
+      if (stats.type == 'inbound-rtp') {
+        return stats;
+      }
+    }
+  }
+  return null;
+}
+
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+
+  pc.addTransceiver('video');
+  assert_false(await hasStats(pc, 'outbound-rtp'),
+               'outbound-rtp does not exist after addTransceiver');
+  await pc.setLocalDescription();
+  assert_false(await hasStats(pc, 'outbound-rtp'),
+              'outbound-rtp does not exist in have-local-offer');
+}, `RTCOutboundRtpStreamStats does not exist as early as have-local-offer`);
+
+// This test does not exchange ICE candidates, meaning no packets are sent.
+// We should still see outbound-rtp stats because they are created by the O/A.
+promise_test(async t => {
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+
+  // Offer to send. See previous test for assertions that the outbound-rtp is
+  // not created this early, which this test does not care about.
+  pc1.addTransceiver('video');
+  await pc1.setLocalDescription();
+
+  // Answer to send.
+  await pc2.setRemoteDescription(pc1.localDescription);
+  const [transceiver] = pc2.getTransceivers();
+  transceiver.direction = 'sendrecv';
+  assert_false(await hasStats(pc2, 'outbound-rtp'),
+               'outbound-rtp does not exist in has-remote-offer');
+  await pc2.setLocalDescription();
+  assert_true(await hasStats(pc2, 'outbound-rtp'),
+              'outbound-rtp exists after answerer returns to stable');
+
+  // Complete offerer negotiation.
+  await pc1.setRemoteDescription(pc2.localDescription);
+  assert_true(await hasStats(pc1, 'outbound-rtp'),
+              'outbound-rtp exists after offerer returns to stable');
+}, `RTCOutboundRtpStreamStats exists after returning to stable`);
+
+promise_test(async t => {
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  pc1.onicecandidate = e => pc2.addIceCandidate(e.candidate);
+  pc2.onicecandidate = e => pc1.addIceCandidate(e.candidate);
+
+  // Negotaite to send, but don't send anything yet (track is null).
+  const {sender} = pc1.addTransceiver('video');
+  await pc1.setLocalDescription();
+  await pc2.setRemoteDescription(pc1.localDescription);
+  await pc2.setLocalDescription();
+  await pc1.setRemoteDescription(pc2.localDescription);
+  assert_false(await hasStats(pc2, 'inbound-rtp'),
+               'inbound-rtp does not exist before packets are received');
+
+  // Start sending. This results in inbound-rtp being created.
+  const stream = await getNoiseStream({video:true});
+  const [track] = stream.getTracks();
+  await sender.replaceTrack(track);
+  const inboundRtp = await getInboundRtpPollUntilItExists(pc2);
+  assert_not_equals(
+      inboundRtp, null,
+      'inbound-rtp should be created in response to the sender having a track');
+  assert_greater_than(
+      inboundRtp.packetsReceived, 0,
+      'inbound-rtp must only exist after packets have been received');
+}, `RTCInboundRtpStreamStats are created by packet reception`);
+</script>
diff --git a/tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html b/tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html
index 92c20cecbf6..c6ac8c60b0a 100644
--- a/tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html
+++ b/tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html
@@ -15,7 +15,7 @@ const fakeDeviceInitParams = {
   supportedFeatures: ALL_FEATURES,
 };
 
-xr_session_promise_test("Ensures getDepthInformation() throws when not run in an active frame, `cpu-optimized`",
+xr_session_promise_test("Ensures appropriate depth methods and attributes throw when not run in an active frame, `cpu-optimized`",
   inactiveFrameTestFunctionGenerator(/*isCpuOptimized=*/true),
   fakeDeviceInitParams,
   'immersive-ar', {
diff --git a/tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_matchDepthViewIdentity.https.html b/tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_matchDepthViewIdentity.https.html
new file mode 100644
index 00000000000..f3256106e90
--- /dev/null
+++ b/tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_matchDepthViewIdentity.https.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/webxr_util.js"></script>
+<script src="../../resources/webxr_math_utils.js"></script>
+<script src="../../resources/webxr_test_constants.js"></script>
+<script src="../../resources/webxr_test_asserts.js"></script>
+<script src="../../resources/webxr_test_constants_fake_depth.js"></script>
+<script src="../matchDepthViewValues.js"></script>
+
+<script>
+
+const fakeDeviceInitParams = {
+  supportedModes: ["immersive-ar"],
+  views: VALID_VIEWS,
+  supportedFeatures: ALL_FEATURES,
+  depthSensingData: DEPTH_SENSING_DATA,
+};
+
+function matchDepthViewFalsePlaceholderTest(session) {
+  // Currently we just assert that we are able to get a session when
+  // matchDepthView is false. If we got to this point, we have a session.
+  return Promise.resolve();
+}
+
+xr_session_promise_test("Ensures XRViewGeometry values are identity when matchDepthView is unset, `cpu-optimized`",
+  depthViewGeometryTestGenerator(/*isCpuOptimized=*/true),
+  fakeDeviceInitParams,
+  'immersive-ar', {
+    requiredFeatures: ['depth-sensing'],
+    depthSensing: {
+      usagePreference: ['cpu-optimized'],
+      dataFormatPreference: [],
+    },
+  });
+
+xr_session_promise_test("Ensures XRViewGeometry values are identity when matchDepthView=true, `cpu-optimized`",
+  depthViewGeometryTestGenerator(/*isCpuOptimized=*/true),
+  fakeDeviceInitParams,
+  'immersive-ar', {
+    requiredFeatures: ['depth-sensing'],
+    depthSensing: {
+      usagePreference: ['cpu-optimized'],
+      dataFormatPreference: [],
+      matchDepthView: true,
+    },
+  });
+
+xr_session_promise_test("Ensures session can be created when matchDepthView=false, `cpu-optimized`",
+  matchDepthViewFalsePlaceholderTest,
+  fakeDeviceInitParams,
+  'immersive-ar', {
+    requiredFeatures: ['depth-sensing'],
+    depthSensing: {
+      usagePreference: ['cpu-optimized'],
+      dataFormatPreference: [],
+      matchDepthView: false,
+    },
+  });
+
+</script>
diff --git a/tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_pauseResume.https.html b/tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_pauseResume.https.html
new file mode 100644
index 00000000000..47469f4a0ea
--- /dev/null
+++ b/tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_pauseResume.https.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/webxr_util.js"></script>
+<script src="../../resources/webxr_test_asserts.js"></script>
+<script src="../../resources/webxr_test_constants.js"></script>
+<script src="../../resources/webxr_test_constants_fake_depth.js"></script>
+<script src="../pauseResumeTests.js"></script>
+
+<script>
+
+const fakeDeviceInitParams = {
+  supportedModes: ["immersive-ar"],
+  views: VALID_VIEWS,
+  supportedFeatures: ALL_FEATURES,
+  depthSensingData: DEPTH_SENSING_DATA,
+};
+
+xr_session_promise_test("Ensures appropriate data availability with (pause|resume)DepthSensing, `cpu-optimized`",
+  pauseResumeTestFunctionGenerator(/*isCpuOptimized=*/true),
+  fakeDeviceInitParams,
+  'immersive-ar', {
+    requiredFeatures: ['depth-sensing'],
+    depthSensing: VALID_DEPTH_CONFIG_CPU_USAGE,
+  });
+
+</script>
diff --git a/tests/wpt/tests/webxr/depth-sensing/depth_sensing_attributes_throw_not_enabled.https.html b/tests/wpt/tests/webxr/depth-sensing/depth_sensing_attributes_throw_not_enabled.https.html
new file mode 100644
index 00000000000..4e1f2e8c76d
--- /dev/null
+++ b/tests/wpt/tests/webxr/depth-sensing/depth_sensing_attributes_throw_not_enabled.https.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="../resources/webxr_util.js"></script>
+<script src="../resources/webxr_test_constants.js"></script>
+
+<script>
+
+const testFunctionDepthUsage = function (session, controller, t) {
+    t.step(() => {
+      assert_throws_dom("InvalidStateError", () => session.depthUsage,
+                        "session.depthUsage should throw when depth sensing is disabled");
+    });
+
+  return Promise.resolve();
+};
+
+const testFunctionDepthDataFormat = function (session, controller, t) {
+    t.step(() => {
+      assert_throws_dom("InvalidStateError", () => session.depthDataFormat,
+                        "session.depthDataFormat should throw when depth sensing is disabled");
+    });
+
+  return Promise.resolve();
+};
+
+const testFunctionDepthType = function (session, controller, t) {
+    t.step(() => {
+      assert_throws_dom("InvalidStateError", () => session.depthType,
+                        "session.depthType should throw when depth sensing is disabled");
+    });
+
+  return Promise.resolve();
+};
+
+const testFunctionDepthActive = function (session, controller, t) {
+    t.step(() => {
+      assert_throws_dom("InvalidStateError", () => session.depthActive,
+                        "session.depthActive should throw when depth sensing is disabled");
+    });
+
+  return Promise.resolve();
+};
+
+const testFunctionPauseDepthSensing = function (session, controller, t) {
+  let done = false;
+  session.requestAnimationFrame((time, frame) => {
+    t.step(() => {
+      assert_throws_dom("InvalidStateError", () => session.pauseDepthSensing(),
+                        "pauseDepthSensing() should thrown when depth sensing is disabled");
+    });
+  });
+
+  return t.step_wait(() => done);
+};
+
+const testFunctionResumeDepthSensing = function (session, controller, t) {
+  let done = false;
+  session.requestAnimationFrame((time, frame) => {
+    t.step(() => {
+      assert_throws_dom("InvalidStateError", () => session.resumeDepthSensing(),
+                        "resumeDepthSensing() should thrown when depth sensing is disabled");
+    });
+  });
+
+  return t.step_wait(() => done);
+};
+
+xr_session_promise_test(
+  "XRSession.depthUsage rejects if depth sensing is not enabled on a session",
+  testFunctionDepthUsage,
+  IMMERSIVE_AR_DEVICE,
+  'immersive-ar');
+
+xr_session_promise_test(
+  "XRSession.depthDataFormat rejects if depth sensing is not enabled on a session",
+  testFunctionDepthDataFormat,
+  IMMERSIVE_AR_DEVICE,
+  'immersive-ar');
+
+xr_session_promise_test(
+  "XRSession.depthType rejects if depth sensing is not enabled on a session",
+  testFunctionDepthType,
+  IMMERSIVE_AR_DEVICE,
+  'immersive-ar');
+
+</script>
diff --git a/tests/wpt/tests/webxr/depth-sensing/depth_type_request_respected.https.html b/tests/wpt/tests/webxr/depth-sensing/depth_type_request_respected.https.html
new file mode 100644
index 00000000000..2846c9ce10b
--- /dev/null
+++ b/tests/wpt/tests/webxr/depth-sensing/depth_type_request_respected.https.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="../resources/webxr_util.js"></script>
+<script src="../resources/webxr_test_constants.js"></script>
+
+<script>
+
+const depthTypeFunctionGenerator = function(expectedSessionDepthType) {
+  return (session, controller, t) => new Promise((resolve) => {
+    t.step(()=> {
+      assert_true(session.depthType === expectedSessionDepthType);
+    });
+
+    resolve();
+  });
+}
+
+xr_session_promise_test(
+  "Can grant sessions that request a raw depth type",
+  depthTypeFunctionGenerator("raw"),
+  IMMERSIVE_AR_DEVICE,
+  'immersive-ar',
+  {
+      'requiredFeatures': ['depth-sensing'],
+      depthSensing: {
+        usagePreference: [],
+        dataFormatPreference: [],
+        depthTypeRequest: ["raw", "smooth"],
+      },
+  });
+
+xr_session_promise_test(
+  "Can grant sessions that request a smooth depth type",
+  depthTypeFunctionGenerator("smooth"),
+  IMMERSIVE_AR_DEVICE,
+  'immersive-ar',
+  {
+      'requiredFeatures': ['depth-sensing'],
+      depthSensing: {
+        usagePreference: [],
+        dataFormatPreference: [],
+        depthTypeRequest: ["smooth", "raw"],
+      },
+  });
+
+xr_session_promise_test(
+  "Can grant sessions that request empty depth type",
+  depthTypeFunctionGenerator(null),
+  IMMERSIVE_AR_DEVICE,
+  'immersive-ar',
+  {
+      'requiredFeatures': ['depth-sensing'],
+      depthSensing: {
+        usagePreference: [],
+        dataFormatPreference: [],
+        depthTypeRequest: [],
+      },
+  });
+
+xr_session_promise_test(
+  "Can grant sessions that don't request depth type",
+  depthTypeFunctionGenerator(null),
+  IMMERSIVE_AR_DEVICE,
+  'immersive-ar',
+  {
+      'requiredFeatures': ['depth-sensing'],
+      depthSensing: {
+        usagePreference: [],
+        dataFormatPreference: []
+      },
+  });
+
+</script>
diff --git a/tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_inactiveFrame.https.html b/tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_inactiveFrame.https.html
index 6116f7a0414..8528b4f80d8 100644
--- a/tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_inactiveFrame.https.html
+++ b/tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_inactiveFrame.https.html
@@ -15,7 +15,7 @@ const fakeDeviceInitParams = {
   supportedFeatures: ALL_FEATURES,
 };
 
-xr_session_promise_test("Ensures getDepthInformation() throws when not run in an active frame, `gpu-optimized`",
+xr_session_promise_test("Ensures appropriate depth methods and attributes throw when not run in an active frame, `gpu-optimized`",
   testFunctionGenerator(/*isCpuOptimized=*/false),
   fakeDeviceInitParams,
   'immersive-ar', {
diff --git a/tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_matchDepthViewIdentity.https.html b/tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_matchDepthViewIdentity.https.html
new file mode 100644
index 00000000000..1813ddd449e
--- /dev/null
+++ b/tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_matchDepthViewIdentity.https.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/webxr_util.js"></script>
+<script src="../../resources/webxr_math_utils.js"></script>
+<script src="../../resources/webxr_test_constants.js"></script>
+<script src="../../resources/webxr_test_asserts.js"></script>
+<script src="../../resources/webxr_test_constants_fake_depth.js"></script>
+<script src="../matchDepthViewValues.js"></script>
+
+<script>
+
+const fakeDeviceInitParams = {
+  supportedModes: ["immersive-ar"],
+  views: VALID_VIEWS,
+  supportedFeatures: ALL_FEATURES,
+  depthSensingData: DEPTH_SENSING_DATA,
+};
+
+function matchDepthViewFalsePlaceholderTest(session) {
+  // Currently we just assert that we are able to get a session when
+  // matchDepthView is false. If we got to this point, we have a session.
+  return Promise.resolve();
+}
+
+xr_session_promise_test("Ensures XRViewGeometry values are identity when matchDepthView is unset, `gpu-optimized`",
+  depthViewGeometryTestGenerator(/*isCpuOptimized=*/false),
+  fakeDeviceInitParams,
+  'immersive-ar', {
+    requiredFeatures: ['depth-sensing'],
+    depthSensing: {
+      usagePreference: ['gpu-optimized'],
+      dataFormatPreference: [],
+    },
+  });
+
+xr_session_promise_test("Ensures XRViewGeometry values are identity when matchDepthView=true, `gpu-optimized`",
+  depthViewGeometryTestGenerator(/*isCpuOptimized=*/false),
+  fakeDeviceInitParams,
+  'immersive-ar', {
+    requiredFeatures: ['depth-sensing'],
+    depthSensing: {
+      usagePreference: ['gpu-optimized'],
+      dataFormatPreference: [],
+      matchDepthView: true,
+    },
+  });
+
+xr_session_promise_test("Ensures session can be created when matchDepthView=false, `gpu-optimized`",
+  matchDepthViewFalsePlaceholderTest,
+  fakeDeviceInitParams,
+  'immersive-ar', {
+    requiredFeatures: ['depth-sensing'],
+    depthSensing: {
+      usagePreference: ['gpu-optimized'],
+      dataFormatPreference: [],
+      matchDepthView: false,
+    },
+  });
+
+</script>
diff --git a/tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_pauseResume.https.html b/tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_pauseResume.https.html
new file mode 100644
index 00000000000..d51edb8cd3b
--- /dev/null
+++ b/tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_pauseResume.https.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../resources/webxr_util.js"></script>
+<script src="../../resources/webxr_test_asserts.js"></script>
+<script src="../../resources/webxr_test_constants.js"></script>
+<script src="../../resources/webxr_test_constants_fake_depth.js"></script>
+<script src="../pauseResumeTests.js"></script>
+
+<script>
+
+const fakeDeviceInitParams = {
+  supportedModes: ["immersive-ar"],
+  views: VALID_VIEWS,
+  supportedFeatures: ALL_FEATURES,
+  depthSensingData: DEPTH_SENSING_DATA,
+};
+
+xr_session_promise_test("Ensures appropriate data availability with (pause|resume)DepthSensing, `gpu-optimized`",
+  pauseResumeTestFunctionGenerator(/*isCpuOptimized=*/false),
+  fakeDeviceInitParams,
+  'immersive-ar', {
+    requiredFeatures: ['depth-sensing'],
+    depthSensing: VALID_DEPTH_CONFIG_GPU_USAGE,
+  });
+
+</script>
diff --git a/tests/wpt/tests/webxr/depth-sensing/inactiveFrameTests.js b/tests/wpt/tests/webxr/depth-sensing/inactiveFrameTests.js
index b310f01ef87..0cc42595537 100644
--- a/tests/wpt/tests/webxr/depth-sensing/inactiveFrameTests.js
+++ b/tests/wpt/tests/webxr/depth-sensing/inactiveFrameTests.js
@@ -17,6 +17,12 @@ const inactiveFrameTestFunctionGenerator = function(isCpuOptimized) {
                                 () => isCpuOptimized ? frame.getDepthInformation(view)
                                                      : glBinding.getDepthInformation(view),
                                 "getDepthInformation() should throw when ran outside RAF");
+              assert_throws_dom("InvalidStateError",
+                                () => session.pauseDepthSensing(),
+                                "pauseDepthSensing() should thrown when ran outside RAF");
+              assert_throws_dom("InvalidStateError",
+                                () => session.resumeDepthSensing(),
+                                "resumeDepthSensing() should thrown when ran outside RAF");
             });
             callbackCounter--;
           }
diff --git a/tests/wpt/tests/webxr/depth-sensing/matchDepthViewValues.js b/tests/wpt/tests/webxr/depth-sensing/matchDepthViewValues.js
new file mode 100644
index 00000000000..697f4deb8ff
--- /dev/null
+++ b/tests/wpt/tests/webxr/depth-sensing/matchDepthViewValues.js
@@ -0,0 +1,31 @@
+'use strict';
+
+// import * as XrConstants from 'resources/webxr_test_constants.js'
+// import * as XrAsserts from 'resources/webxr_test_asserts.js'
+
+// TODO: Expand the WebXrTestApi to specify a viewGeometry that this can validate
+// as well.
+const depthViewGeometryTestGenerator = function(isCpuOptimized) {
+  return (session, controller, t, sessionObjects) => {
+
+    return session.requestReferenceSpace('viewer').then((viewerSpace) => new Promise((resolve) => {
+
+      const glBinding = new XRWebGLBinding(session, sessionObjects.gl);
+
+      const rafCb = function(time, frame) {
+        const pose = frame.getViewerPose(viewerSpace);
+        for(const view of pose.views) {
+          const depthInformation = isCpuOptimized ? frame.getDepthInformation(view)
+                                                  : glBinding.getDepthInformation(view);
+          t.step(()=> {
+            assert_matrix_approx_equals(view.projectionMatrix, depthInformation.projectionMatrix);
+            assert_transform_approx_equals(view.transform, depthInformation.transform);
+          });
+        }
+        resolve();
+      }
+
+      session.requestAnimationFrame(rafCb);
+    })); // Promise
+  }; // Test Func
+};  // Generator Func
diff --git a/tests/wpt/tests/webxr/depth-sensing/pauseResumeTests.js b/tests/wpt/tests/webxr/depth-sensing/pauseResumeTests.js
new file mode 100644
index 00000000000..e7513ef61c1
--- /dev/null
+++ b/tests/wpt/tests/webxr/depth-sensing/pauseResumeTests.js
@@ -0,0 +1,116 @@
+'use strict';
+
+const TestStates = Object.freeze({
+  "ShouldSucceedPauseScheduleRAF": 1,
+  "ShouldFailResumeScheduleRAF": 2,
+  "ShouldSucceedTestDone": 3,
+});
+
+const framesToWait = 10;
+
+const pauseResumeTestFunctionGenerator = function(isCpuOptimized) {
+  return (session, controller, t, sessionObjects) => {
+    let state = TestStates.ShouldSucceedPauseScheduleRAF;
+
+    return session.requestReferenceSpace('viewer').then((viewerSpace) => {
+      let done = false;
+
+      const glBinding = new XRWebGLBinding(session, sessionObjects.gl);
+
+      let stepFrameCount = 0;
+      let advanceState = false;
+
+      const rafCb = function(time, frame) {
+        const pose = frame.getViewerPose(viewerSpace);
+        stepFrameCount++;
+        for(const view of pose.views) {
+          const depthInformation = isCpuOptimized ? frame.getDepthInformation(view)
+                                                  : glBinding.getDepthInformation(view);
+
+          if (state == TestStates.ShouldSucceedPauseScheduleRAF
+          || state == TestStates.ShouldSucceedTestDone) {
+            t.step(() => {
+              assert_true(session.depthActive);
+            });
+            // We have no guarantees about when data should start returning,
+            // so we need to potentially wait a few frames.
+
+            // Final chance. If we haven't advanced the state by now, fail the
+            // test if it doesn't pass this time.
+            if (stepFrameCount >= framesToWait) {
+              t.step(() => {
+                assert_not_equals(depthInformation, null);
+              });
+            }
+
+            // Either we have data, or we've waited long enough to keep moving.
+            if (depthInformation != null || stepFrameCount >= framesToWait) {
+              advanceState = true;
+            }
+          } else {
+            // Depth should stop being available immediately.
+            t.step(() => {
+              assert_false(session.depthActive);
+              assert_equals(depthInformation, null);
+            });
+            advanceState = true;
+          }
+        }
+
+        switch(state) {
+          case TestStates.ShouldSucceedPauseScheduleRAF:
+            if (advanceState) {
+              session.pauseDepthSensing();
+              for(const view of pose.views) {
+                const newDepthInformation = isCpuOptimized ? frame.getDepthInformation(view)
+                                                            : glBinding.getDepthInformation(view);
+                t.step(()=> {
+                  // depthActive state should update and stop returning depth info
+                  // immediately.
+                  assert_false(session.depthActive);
+                  assert_equals(newDepthInformation, null);
+                });
+              }
+              state = TestStates.ShouldFailResumeScheduleRAF;
+              stepFrameCount = 0;
+              advanceState = false;
+            }
+            session.requestAnimationFrame(rafCb);
+            break;
+          case TestStates.ShouldFailResumeScheduleRAF:
+            if (advanceState) {
+              session.resumeDepthSensing();
+              // In pausing depth sensing, any controller data may have been
+              // thrown away since the UA can "tear down" any depth controller.
+              // So attempt to repopulate the data once we've resumed it.
+              controller.setDepthSensingData(DEPTH_SENSING_DATA);
+            t.step(()=> {
+                // While depth data may not return for a few frames, depthActive
+                // should be updated immediately.
+                assert_true(session.depthActive);
+              });
+              state = TestStates.ShouldSucceedTestDone;
+              stepFrameCount = 0;
+              advanceState = false;
+            }
+            session.requestAnimationFrame(rafCb);
+            break;
+          case TestStates.ShouldSucceedTestDone:
+            // If we are advancing the state, we can stop pumping the rAF, but
+            // if we're still waiting for data to come back we need to keep it
+            // going.
+            if (advanceState) {
+              done = true;
+            } else {
+              session.requestAnimationFrame(rafCb);
+            }
+            break;
+        }
+      };
+
+      session.requestAnimationFrame(rafCb);
+
+      return t.step_wait(() => done);
+    });
+  };
+};
diff --git a/tests/wpt/tests/workers/WorkerNavigator_userAgentData.https.tentative.html b/tests/wpt/tests/workers/WorkerNavigator_userAgentData.https.tentative.html
new file mode 100644
index 00000000000..e4026e2ff06
--- /dev/null
+++ b/tests/wpt/tests/workers/WorkerNavigator_userAgentData.https.tentative.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title> WorkerNavigator.userAgentData </title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  promise_test(async () => {
+    const e = await new Promise((resolve) => {
+      const worker = new Worker("./support/WorkerNavigator.js");
+      worker.onmessage = resolve;
+    });
+    const highEntropyValues = await navigator.userAgentData.getHighEntropyValues([
+      "platformVersion", "wow64"
+    ]);
+
+    if (navigator.userAgentData.platform === "Linux") {
+      assert_true(e.data.platformVersion === "");
+      assert_equals(e.data.wow64, false);
+      assert_true(highEntropyValues.platformVersion === "");
+      assert_equals(highEntropyValues.wow64, false);
+    }
+  }, "Platform version and wow64-ness on Linux should contain fixed values");
+</script>
diff --git a/tests/wpt/tests/xhr/resources/redirect.py b/tests/wpt/tests/xhr/resources/redirect.py
index 3839b635e02..e2786b45031 100644
--- a/tests/wpt/tests/xhr/resources/redirect.py
+++ b/tests/wpt/tests/xhr/resources/redirect.py
@@ -1,10 +1,15 @@
 import time
+from urllib.parse import parse_qs
 
 from wptserve.utils import isomorphic_encode
 
 def main(request, response):
     code = int(request.GET.first(b"code", 302))
     location = request.GET.first(b"location", isomorphic_encode(request.url_parts.path + u"?followed"))
+    if location:
+        location = parse_qs(u"location=" + location.decode(u"UTF-8"))[u"location"][0]
+        if location.startswith(u"redirect.py"):
+            location += u"&code=" + str(code)
 
     if b"delay" in request.GET:
         delay = float(request.GET.first(b"delay"))
diff --git a/tests/wpt/tests/xhr/send-redirect.htm b/tests/wpt/tests/xhr/send-redirect.htm
index 7d73f0f64cc..de3899f5e5d 100644
--- a/tests/wpt/tests/xhr/send-redirect.htm
+++ b/tests/wpt/tests/xhr/send-redirect.htm
@@ -10,36 +10,73 @@
     <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} does ${redirect_codes.has(code)? "redirect": "not redirect"})`);
-        test.step(function() {
-          var client = new XMLHttpRequest();
-          client.onreadystatechange = function() {
-            test.step(function() {
-              if(client.readyState == 4) {
-                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);
+      const redirect_codes = new Set([301, 302, 303, 307, 308]);
+      function maybeRedirect(code, method="GET", redirectLocation="content.py") {
+        async_test(t => {
+          const client = new XMLHttpRequest();
+          client.onreadystatechange = t.step_func(() => {
+            if(client.readyState == 4) {
+              if (redirect_codes.has(code)) {
+                let expected_method = method;
+                let expected_content_type = "application/x-pony";
+                if ((method == "POST" && (code == "301" || code == "302")) ||
+                    (code == "303" && method != "GET" && method != "HEAD")) {
+                  expected_method = "GET";
+                  expected_content_type = "NO";
                 }
-                test.done();
+                assert_equals(client.getResponseHeader("x-request-method"), expected_method);
+                assert_equals(client.getResponseHeader("x-request-content-type"), expected_content_type);
+                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);
               }
-            })
-          }
-          client.open("GET", "resources/redirect.py?location=content.py&code=" + code);
+              t.done();
+            }
+          });
+          client.open(method, `resources/redirect.py?location=${redirectLocation}&code=${code}`);
           client.setRequestHeader("Content-Type", "application/x-pony");
           client.send(null);
-        })
+        }, `${document.title} (${code}, ${method}, ${redirectLocation})`);
       }
 
-      for (var number of [300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 350, 399]) {
-        redirect(number);
-      }
+      maybeRedirect(300);
+      maybeRedirect(301);
+      maybeRedirect(302);
+      maybeRedirect(303);
+      maybeRedirect(304);
+      maybeRedirect(305);
+      maybeRedirect(306);
+      maybeRedirect(307);
+      maybeRedirect(308);
+      maybeRedirect(309);
+      maybeRedirect(310);
+      maybeRedirect(350);
+      maybeRedirect(399);
+      maybeRedirect(301, "POST");
+      maybeRedirect(302, "POST");
+      maybeRedirect(303, "POST");
+      maybeRedirect(307, "POST");
+      maybeRedirect(301, "HEAD");
+      maybeRedirect(302, "HEAD");
+      maybeRedirect(303, "HEAD");
+      maybeRedirect(307, "HEAD");
+
+      const redirectedLocation = encodeURIComponent("redirect.py?location=content.py");
+      maybeRedirect(301, "GET", redirectedLocation);
+      maybeRedirect(302, "GET", redirectedLocation);
+      maybeRedirect(303, "GET", redirectedLocation);
+      maybeRedirect(307, "GET", redirectedLocation);
+      maybeRedirect(301, "POST", redirectedLocation);
+      maybeRedirect(302, "POST", redirectedLocation);
+      maybeRedirect(303, "POST", redirectedLocation);
+      maybeRedirect(307, "POST", redirectedLocation);
+      maybeRedirect(303, "CHICKEN", redirectedLocation);
+      maybeRedirect(301, "HEAD", redirectedLocation);
+      maybeRedirect(302, "HEAD", redirectedLocation);
+      maybeRedirect(303, "HEAD", redirectedLocation);
+      maybeRedirect(307, "HEAD", redirectedLocation);
     </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/xhr/setrequestheader-case-insensitive.htm b/tests/wpt/tests/xhr/setrequestheader-case-insensitive.htm
index 1aed30d1c2a..ce10482cad8 100644
--- a/tests/wpt/tests/xhr/setrequestheader-case-insensitive.htm
+++ b/tests/wpt/tests/xhr/setrequestheader-case-insensitive.htm
@@ -9,26 +9,28 @@
   <body>
     <div id="log"></div>
     <script>
-      test(function() {
-        var client = new XMLHttpRequest()
-        client.open("POST", "resources/inspect-headers.py?filter_value=t1, t2, t3", false)
-        client.setRequestHeader("x-test", "t1")
-        client.setRequestHeader("X-TEST", "t2")
-        client.setRequestHeader("X-teST", "t3")
-        client.send(null)
-        assert_equals(client.responseText, "x-test,")
-      })
+      test(() => {
+        const client = new XMLHttpRequest();
+        client.open("POST", "resources/inspect-headers.py?filter_value=t1, t2, t3", false);
+        client.setRequestHeader("x-test", "t1");
+        client.setRequestHeader("X-TEST", "t2");
+        client.setRequestHeader("X-teST", "t3");
+        client.send(null);
+        assert_equals(client.responseText, "x-test,");
+      });
 
       test(() => {
-        const client = new XMLHttpRequest
-        client.open("GET", "resources/echo-headers.py", false)
-        client.setRequestHeader("THIS-IS-A-TEST", "1")
-        client.setRequestHeader("THIS-is-A-test", "2")
-        client.setRequestHeader("content-TYPE", "x/x")
-        client.send()
-        assert_regexp_match(client.responseText, /content-TYPE/)
-        assert_regexp_match(client.responseText, /THIS-IS-A-TEST: 1, 2/)
-      })
+        const client = new XMLHttpRequest();
+        client.open("GET", "resources/echo-headers.py", false);
+        client.setRequestHeader("THIS-IS-A-TEST", "1");
+        client.setRequestHeader("THIS-is-A-test", "2");
+        client.setRequestHeader("content-TYPE", "x/x");
+        client.send();
+        const contentTypeHeader = client.responseText.match(/content-TYPE/gi);
+        const thisIsATestHeader = client.responseText.match(/THIS-IS-A-TEST: 1, 2/gi);
+        assert_array_equals(contentTypeHeader, ["content-TYPE"]);
+        assert_array_equals(thisIsATestHeader, ["THIS-IS-A-TEST: 1, 2"]);
+      });
     </script>
   </body>
 </html>
diff --git a/tests/wpt/webgl/meta/__dir__.ini b/tests/wpt/webgl/meta/__dir__.ini
deleted file mode 100644
index f2f09393f27..00000000000
--- a/tests/wpt/webgl/meta/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-prefs: ["dom_offscreen_canvas_enabled:true", "dom_imagebitmap_enabled:true", "dom_webgl2_enabled:true"]
diff --git a/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini b/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini
deleted file mode 100644
index 9afbf256abc..00000000000
--- a/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[premultiplyalpha-test.html]
-  bug: https://github.com/servo/servo/issues/21132
-  [WebGL test #13]
-    expected: FAIL
-
-  [WebGL test #20]
-    expected: FAIL
-
-  [WebGL test #27]
-    expected: FAIL
-
-  [WebGL test #48]
-    expected: FAIL
-
-  [WebGL test #55]
-    expected: FAIL
-
-  [WebGL test #6]
-    expected: FAIL
-
-  [WebGL test #62]
-    expected: FAIL
-
-  [WebGL test #69]
-    expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance/more/functions/copyTexSubImage2D.html.ini b/tests/wpt/webgl/meta/conformance/more/functions/copyTexSubImage2D.html.ini
deleted file mode 100644
index 22d4e847667..00000000000
--- a/tests/wpt/webgl/meta/conformance/more/functions/copyTexSubImage2D.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[copyTexSubImage2D.html]
-  [WebGL test #1]
-    expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance/textures/misc/tex-image-webgl.html.ini b/tests/wpt/webgl/meta/conformance/textures/misc/tex-image-webgl.html.ini
deleted file mode 100644
index 66ef4bda9ce..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/misc/tex-image-webgl.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[tex-image-webgl.html]
-  [WebGL test #2]
-    expected: FAIL
-
-  [WebGL test #3]
-    expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance/textures/misc/texture-upload-size.html.ini b/tests/wpt/webgl/meta/conformance/textures/misc/texture-upload-size.html.ini
index 2f1648b219b..435cfbe0d5c 100644
--- a/tests/wpt/webgl/meta/conformance/textures/misc/texture-upload-size.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/misc/texture-upload-size.html.ini
@@ -1,16 +1,4 @@
 [texture-upload-size.html]
-  [WebGL test #100]
-    expected: FAIL
-
-  [WebGL test #116]
-    expected: FAIL
-
-  [WebGL test #124]
-    expected: FAIL
-
-  [WebGL test #132]
-    expected: FAIL
-
   [WebGL test #156]
     expected: FAIL
 
@@ -23,17 +11,5 @@
   [WebGL test #236]
     expected: FAIL
 
-  [WebGL test #52]
-    expected: FAIL
-
   [WebGL test #588]
     expected: FAIL
-
-  [WebGL test #78]
-    expected: FAIL
-
-  [WebGL test #82]
-    expected: FAIL
-
-  [WebGL test #84]
-    expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
index f9e8abf7941..309ce090136 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
@@ -7,38 +7,74 @@
   [WebGL test #0]
     expected: FAIL
 
+  [WebGL test #6]
+    expected: FAIL
+
   [WebGL test #11]
     expected: FAIL
 
+  [WebGL test #12]
+    expected: FAIL
+
   [WebGL test #17]
     expected: FAIL
 
+  [WebGL test #18]
+    expected: FAIL
+
   [WebGL test #23]
     expected: FAIL
 
+  [WebGL test #24]
+    expected: FAIL
+
   [WebGL test #29]
     expected: FAIL
 
+  [WebGL test #30]
+    expected: FAIL
+
   [WebGL test #35]
     expected: FAIL
 
+  [WebGL test #36]
+    expected: FAIL
+
   [WebGL test #41]
     expected: FAIL
 
+  [WebGL test #42]
+    expected: FAIL
+
   [WebGL test #47]
     expected: FAIL
 
+  [WebGL test #48]
+    expected: FAIL
+
   [WebGL test #5]
     expected: FAIL
 
   [WebGL test #53]
     expected: FAIL
 
+  [WebGL test #54]
+    expected: FAIL
+
   [WebGL test #59]
     expected: FAIL
 
+  [WebGL test #60]
+    expected: FAIL
+
   [WebGL test #65]
     expected: FAIL
 
+  [WebGL test #66]
+    expected: FAIL
+
   [WebGL test #71]
     expected: FAIL
+
+  [WebGL test #72]
+    expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
index 1d2e7e6eb01..81efc8044b3 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
@@ -7,38 +7,74 @@
   [WebGL test #0]
     expected: FAIL
 
+  [WebGL test #6]
+    expected: FAIL
+
   [WebGL test #11]
     expected: FAIL
 
+  [WebGL test #12]
+    expected: FAIL
+
   [WebGL test #17]
     expected: FAIL
 
+  [WebGL test #18]
+    expected: FAIL
+
   [WebGL test #23]
     expected: FAIL
 
+  [WebGL test #24]
+    expected: FAIL
+
   [WebGL test #29]
     expected: FAIL
 
+  [WebGL test #30]
+    expected: FAIL
+
   [WebGL test #35]
     expected: FAIL
 
+  [WebGL test #36]
+    expected: FAIL
+
   [WebGL test #41]
     expected: FAIL
 
+  [WebGL test #42]
+    expected: FAIL
+
   [WebGL test #47]
     expected: FAIL
 
+  [WebGL test #48]
+    expected: FAIL
+
   [WebGL test #5]
     expected: FAIL
 
   [WebGL test #53]
     expected: FAIL
 
+  [WebGL test #54]
+    expected: FAIL
+
   [WebGL test #59]
     expected: FAIL
 
+  [WebGL test #60]
+    expected: FAIL
+
   [WebGL test #65]
     expected: FAIL
 
+  [WebGL test #66]
+    expected: FAIL
+
   [WebGL test #71]
     expected: FAIL
+
+  [WebGL test #72]
+    expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance2/offscreencanvas/__dir__.ini b/tests/wpt/webgl/meta/conformance2/offscreencanvas/__dir__.ini
deleted file mode 100644
index e0b3c7bf146..00000000000
--- a/tests/wpt/webgl/meta/conformance2/offscreencanvas/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-prefs: ["dom_offscreen_canvas_enabled:true"]
diff --git a/tests/wpt/webgpu/meta/MANIFEST.json b/tests/wpt/webgpu/meta/MANIFEST.json
index 7902f44b47d..e8d4eb96465 100644
--- a/tests/wpt/webgpu/meta/MANIFEST.json
+++ b/tests/wpt/webgpu/meta/MANIFEST.json
@@ -582,7 +582,7 @@
         []
        ],
        "test_case_recorder.js": [
-        "5b2a4e8b8ef259763c331bf7e4f8421d1eb43a70",
+        "a37c61a4a6bae52828c0e2747e3eacd0e1e6f03d",
         []
        ]
       },
diff --git a/tests/wpt/webgpu/meta/__dir__.ini b/tests/wpt/webgpu/meta/__dir__.ini
index 7992a6f4879..d1544797bff 100644
--- a/tests/wpt/webgpu/meta/__dir__.ini
+++ b/tests/wpt/webgpu/meta/__dir__.ini
@@ -1 +1,4 @@
-prefs: ["dom_webgpu_enabled:true"]
+prefs: [
+  "dom_serviceworker_enabled:false",
+  "dom_webgpu_enabled:true",
+]
\ No newline at end of file
diff --git a/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini b/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini
index f7a0246317a..1ef0696567f 100644
--- a/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini
+++ b/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini
@@ -773,8 +773,6 @@
   [:srcFormat="astc-8x8-unorm-srgb";dstFormat="astc-8x8-unorm-srgb";dimension="2d"]
 
   [:srcFormat="bc1-rgba-unorm";dstFormat="bc1-rgba-unorm";dimension="2d"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:srcFormat="bc1-rgba-unorm";dstFormat="bc1-rgba-unorm-srgb";dimension="2d"]
     expected:
@@ -5158,13 +5156,9 @@
 
 
 [cts.https.html?q=webgpu:api,operation,rendering,basic:large_draw:*]
-  [:indexed=false;indirect=false]
-
-  [:indexed=false;indirect=true]
-
-  [:indexed=true;indirect=false]
-
-  [:indexed=true;indirect=true]
+  disabled: true
+  expected:
+    if os == "linux" and not debug: SKIP
 
 
 [cts.https.html?q=webgpu:api,operation,rendering,color_target_state:blend_constant,initial:*]
@@ -10179,6 +10173,8 @@
 
 [cts.https.html?q=webgpu:api,validation,capability_checks,features,texture_formats:canvas_configuration:*]
   [:format="astc-10x10-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-10x10-unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10187,6 +10183,8 @@
   [:format="astc-10x10-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-10x10-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-10x10-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10195,6 +10193,8 @@
   [:format="astc-10x10-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-10x5-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-10x5-unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10203,6 +10203,8 @@
   [:format="astc-10x5-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-10x5-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-10x5-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10211,6 +10213,8 @@
   [:format="astc-10x5-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-10x6-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-10x6-unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10219,6 +10223,8 @@
   [:format="astc-10x6-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-10x6-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-10x6-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10227,6 +10233,8 @@
   [:format="astc-10x6-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-10x8-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-10x8-unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10235,6 +10243,8 @@
   [:format="astc-10x8-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-10x8-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-10x8-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10243,6 +10253,8 @@
   [:format="astc-10x8-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-12x10-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-12x10-unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10251,6 +10263,8 @@
   [:format="astc-12x10-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-12x10-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-12x10-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10259,6 +10273,8 @@
   [:format="astc-12x10-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-12x12-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-12x12-unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10267,6 +10283,8 @@
   [:format="astc-12x12-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-12x12-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-12x12-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10275,6 +10293,8 @@
   [:format="astc-12x12-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-4x4-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-4x4-unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10283,6 +10303,8 @@
   [:format="astc-4x4-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-4x4-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-4x4-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10291,6 +10313,8 @@
   [:format="astc-4x4-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-5x4-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-5x4-unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10299,6 +10323,8 @@
   [:format="astc-5x4-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-5x4-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-5x4-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10307,6 +10333,8 @@
   [:format="astc-5x4-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-5x5-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-5x5-unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10315,6 +10343,8 @@
   [:format="astc-5x5-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-5x5-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-5x5-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10323,6 +10353,8 @@
   [:format="astc-5x5-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-6x5-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-6x5-unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10331,6 +10363,8 @@
   [:format="astc-6x5-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-6x5-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-6x5-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10339,6 +10373,8 @@
   [:format="astc-6x5-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-6x6-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-6x6-unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10347,6 +10383,8 @@
   [:format="astc-6x6-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-6x6-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-6x6-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10355,6 +10393,8 @@
   [:format="astc-6x6-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-8x5-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-8x5-unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10363,6 +10403,8 @@
   [:format="astc-8x5-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-8x5-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-8x5-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10371,6 +10413,8 @@
   [:format="astc-8x5-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-8x6-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-8x6-unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10379,6 +10423,8 @@
   [:format="astc-8x6-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-8x6-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-8x6-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10387,6 +10433,8 @@
   [:format="astc-8x6-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-8x8-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-8x8-unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10395,6 +10443,8 @@
   [:format="astc-8x8-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="astc-8x8-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="astc-8x8-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10403,126 +10453,188 @@
   [:format="astc-8x8-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="bc1-rgba-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc1-rgba-unorm";canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc1-rgba-unorm";canvasType="onscreen";enable_required_feature=false]
 
   [:format="bc1-rgba-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="bc1-rgba-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc1-rgba-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc1-rgba-unorm-srgb";canvasType="onscreen";enable_required_feature=false]
 
   [:format="bc1-rgba-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="bc2-rgba-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc2-rgba-unorm";canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc2-rgba-unorm";canvasType="onscreen";enable_required_feature=false]
 
   [:format="bc2-rgba-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="bc2-rgba-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc2-rgba-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc2-rgba-unorm-srgb";canvasType="onscreen";enable_required_feature=false]
 
   [:format="bc2-rgba-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="bc3-rgba-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc3-rgba-unorm";canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc3-rgba-unorm";canvasType="onscreen";enable_required_feature=false]
 
   [:format="bc3-rgba-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="bc3-rgba-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc3-rgba-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc3-rgba-unorm-srgb";canvasType="onscreen";enable_required_feature=false]
 
   [:format="bc3-rgba-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="bc4-r-snorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc4-r-snorm";canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc4-r-snorm";canvasType="onscreen";enable_required_feature=false]
 
   [:format="bc4-r-snorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="bc4-r-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc4-r-unorm";canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc4-r-unorm";canvasType="onscreen";enable_required_feature=false]
 
   [:format="bc4-r-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="bc5-rg-snorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc5-rg-snorm";canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc5-rg-snorm";canvasType="onscreen";enable_required_feature=false]
 
   [:format="bc5-rg-snorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="bc5-rg-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc5-rg-unorm";canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc5-rg-unorm";canvasType="onscreen";enable_required_feature=false]
 
   [:format="bc5-rg-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="bc6h-rgb-float";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc6h-rgb-float";canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc6h-rgb-float";canvasType="onscreen";enable_required_feature=false]
 
   [:format="bc6h-rgb-float";canvasType="onscreen";enable_required_feature=true]
 
   [:format="bc6h-rgb-ufloat";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc6h-rgb-ufloat";canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc6h-rgb-ufloat";canvasType="onscreen";enable_required_feature=false]
 
   [:format="bc6h-rgb-ufloat";canvasType="onscreen";enable_required_feature=true]
 
   [:format="bc7-rgba-unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc7-rgba-unorm";canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc7-rgba-unorm";canvasType="onscreen";enable_required_feature=false]
 
   [:format="bc7-rgba-unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="bc7-rgba-unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc7-rgba-unorm-srgb";canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc7-rgba-unorm-srgb";canvasType="onscreen";enable_required_feature=false]
 
   [:format="bc7-rgba-unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="depth32float-stencil8";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="depth32float-stencil8";canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="depth32float-stencil8";canvasType="onscreen";enable_required_feature=false]
 
   [:format="depth32float-stencil8";canvasType="onscreen";enable_required_feature=true]
 
   [:format="eac-r11snorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="eac-r11snorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10531,6 +10643,8 @@
   [:format="eac-r11snorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="eac-r11unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="eac-r11unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10539,6 +10653,8 @@
   [:format="eac-r11unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="eac-rg11snorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="eac-rg11snorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10547,6 +10663,8 @@
   [:format="eac-rg11snorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="eac-rg11unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="eac-rg11unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10555,6 +10673,8 @@
   [:format="eac-rg11unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="etc2-rgb8a1unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="etc2-rgb8a1unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10563,6 +10683,8 @@
   [:format="etc2-rgb8a1unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="etc2-rgb8a1unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="etc2-rgb8a1unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10571,6 +10693,8 @@
   [:format="etc2-rgb8a1unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="etc2-rgb8unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="etc2-rgb8unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10579,6 +10703,8 @@
   [:format="etc2-rgb8unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="etc2-rgb8unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="etc2-rgb8unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10587,6 +10713,8 @@
   [:format="etc2-rgb8unorm-srgb";canvasType="onscreen";enable_required_feature=true]
 
   [:format="etc2-rgba8unorm";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="etc2-rgba8unorm";canvasType="offscreen";enable_required_feature=true]
 
@@ -10595,6 +10723,8 @@
   [:format="etc2-rgba8unorm";canvasType="onscreen";enable_required_feature=true]
 
   [:format="etc2-rgba8unorm-srgb";canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="etc2-rgba8unorm-srgb";canvasType="offscreen";enable_required_feature=true]
 
@@ -10605,6 +10735,8 @@
 
 [cts.https.html?q=webgpu:api,validation,capability_checks,features,texture_formats:canvas_configuration_view_formats:*]
   [:viewFormats=["astc-10x10-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-10x10-unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10613,6 +10745,8 @@
   [:viewFormats=["astc-10x10-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-10x10-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-10x10-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10621,6 +10755,8 @@
   [:viewFormats=["astc-10x10-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-10x5-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-10x5-unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10629,6 +10765,8 @@
   [:viewFormats=["astc-10x5-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-10x5-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-10x5-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10637,6 +10775,8 @@
   [:viewFormats=["astc-10x5-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-10x6-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-10x6-unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10645,6 +10785,8 @@
   [:viewFormats=["astc-10x6-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-10x6-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-10x6-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10653,6 +10795,8 @@
   [:viewFormats=["astc-10x6-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-10x8-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-10x8-unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10661,6 +10805,8 @@
   [:viewFormats=["astc-10x8-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-10x8-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-10x8-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10669,6 +10815,8 @@
   [:viewFormats=["astc-10x8-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-12x10-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-12x10-unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10677,6 +10825,8 @@
   [:viewFormats=["astc-12x10-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-12x10-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-12x10-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10685,6 +10835,8 @@
   [:viewFormats=["astc-12x10-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-12x12-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-12x12-unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10693,6 +10845,8 @@
   [:viewFormats=["astc-12x12-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-12x12-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-12x12-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10701,6 +10855,8 @@
   [:viewFormats=["astc-12x12-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-4x4-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-4x4-unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10709,6 +10865,8 @@
   [:viewFormats=["astc-4x4-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-4x4-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-4x4-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10717,6 +10875,8 @@
   [:viewFormats=["astc-4x4-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-5x4-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-5x4-unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10725,6 +10885,8 @@
   [:viewFormats=["astc-5x4-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-5x4-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-5x4-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10733,6 +10895,8 @@
   [:viewFormats=["astc-5x4-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-5x5-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-5x5-unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10741,6 +10905,8 @@
   [:viewFormats=["astc-5x5-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-5x5-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-5x5-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10749,6 +10915,8 @@
   [:viewFormats=["astc-5x5-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-6x5-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-6x5-unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10757,6 +10925,8 @@
   [:viewFormats=["astc-6x5-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-6x5-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-6x5-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10765,6 +10935,8 @@
   [:viewFormats=["astc-6x5-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-6x6-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-6x6-unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10773,6 +10945,8 @@
   [:viewFormats=["astc-6x6-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-6x6-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-6x6-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10781,6 +10955,8 @@
   [:viewFormats=["astc-6x6-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-8x5-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-8x5-unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10789,6 +10965,8 @@
   [:viewFormats=["astc-8x5-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-8x5-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-8x5-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10797,6 +10975,8 @@
   [:viewFormats=["astc-8x5-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-8x6-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-8x6-unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10805,6 +10985,8 @@
   [:viewFormats=["astc-8x6-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-8x6-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-8x6-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10813,6 +10995,8 @@
   [:viewFormats=["astc-8x6-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-8x8-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-8x8-unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10821,6 +11005,8 @@
   [:viewFormats=["astc-8x8-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["astc-8x8-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["astc-8x8-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10829,142 +11015,212 @@
   [:viewFormats=["astc-8x8-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bc1-rgba-unorm","bgra8unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc1-rgba-unorm","bgra8unorm"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc1-rgba-unorm","bgra8unorm"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bc1-rgba-unorm","bgra8unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bc1-rgba-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc1-rgba-unorm"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc1-rgba-unorm"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bc1-rgba-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bc1-rgba-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc1-rgba-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc1-rgba-unorm-srgb"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bc1-rgba-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bc2-rgba-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc2-rgba-unorm"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc2-rgba-unorm"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bc2-rgba-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bc2-rgba-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc2-rgba-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc2-rgba-unorm-srgb"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bc2-rgba-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bc3-rgba-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc3-rgba-unorm"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc3-rgba-unorm"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bc3-rgba-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bc3-rgba-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc3-rgba-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc3-rgba-unorm-srgb"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bc3-rgba-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bc4-r-snorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc4-r-snorm"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc4-r-snorm"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bc4-r-snorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bc4-r-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc4-r-unorm"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc4-r-unorm"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bc4-r-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bc5-rg-snorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc5-rg-snorm"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc5-rg-snorm"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bc5-rg-snorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bc5-rg-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc5-rg-unorm"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc5-rg-unorm"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bc5-rg-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bc6h-rgb-float"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc6h-rgb-float"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc6h-rgb-float"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bc6h-rgb-float"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bc6h-rgb-ufloat"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc6h-rgb-ufloat"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc6h-rgb-ufloat"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bc6h-rgb-ufloat"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bc7-rgba-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc7-rgba-unorm"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc7-rgba-unorm"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bc7-rgba-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bc7-rgba-unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc7-rgba-unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bc7-rgba-unorm-srgb"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bc7-rgba-unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["bgra8unorm","bc1-rgba-unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bgra8unorm","bc1-rgba-unorm"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["bgra8unorm","bc1-rgba-unorm"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["bgra8unorm","bc1-rgba-unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["depth32float-stencil8"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["depth32float-stencil8"\];canvasType="offscreen";enable_required_feature=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["depth32float-stencil8"\];canvasType="onscreen";enable_required_feature=false]
 
   [:viewFormats=["depth32float-stencil8"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["eac-r11snorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["eac-r11snorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10973,6 +11229,8 @@
   [:viewFormats=["eac-r11snorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["eac-r11unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["eac-r11unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10981,6 +11239,8 @@
   [:viewFormats=["eac-r11unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["eac-rg11snorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["eac-rg11snorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10989,6 +11249,8 @@
   [:viewFormats=["eac-rg11snorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["eac-rg11unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["eac-rg11unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -10997,6 +11259,8 @@
   [:viewFormats=["eac-rg11unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["etc2-rgb8a1unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["etc2-rgb8a1unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -11005,6 +11269,8 @@
   [:viewFormats=["etc2-rgb8a1unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["etc2-rgb8a1unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["etc2-rgb8a1unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -11013,6 +11279,8 @@
   [:viewFormats=["etc2-rgb8a1unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["etc2-rgb8unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["etc2-rgb8unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -11021,6 +11289,8 @@
   [:viewFormats=["etc2-rgb8unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["etc2-rgb8unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["etc2-rgb8unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -11029,6 +11299,8 @@
   [:viewFormats=["etc2-rgb8unorm-srgb"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["etc2-rgba8unorm"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["etc2-rgba8unorm"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -11037,6 +11309,8 @@
   [:viewFormats=["etc2-rgba8unorm"\];canvasType="onscreen";enable_required_feature=true]
 
   [:viewFormats=["etc2-rgba8unorm-srgb"\];canvasType="offscreen";enable_required_feature=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:viewFormats=["etc2-rgba8unorm-srgb"\];canvasType="offscreen";enable_required_feature=true]
 
@@ -17039,26 +17313,38 @@
 
 [cts.https.html?q=webgpu:api,validation,capability_checks,limits,maxTextureDimension2D:configure,at_over:*]
   [:limitTest="atDefault";testValueName="atLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="atDefault";testValueName="atLimit";canvasType="onscreen"]
 
   [:limitTest="atDefault";testValueName="overLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="atDefault";testValueName="overLimit";canvasType="onscreen"]
 
   [:limitTest="atMaximum";testValueName="atLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="atMaximum";testValueName="atLimit";canvasType="onscreen"]
 
   [:limitTest="atMaximum";testValueName="overLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="atMaximum";testValueName="overLimit";canvasType="onscreen"]
 
   [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";canvasType="onscreen"]
 
   [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";canvasType="onscreen"]
 
@@ -17071,10 +17357,14 @@
   [:limitTest="overMaximum";testValueName="overLimit";canvasType="onscreen"]
 
   [:limitTest="underDefault";testValueName="atLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="underDefault";testValueName="atLimit";canvasType="onscreen"]
 
   [:limitTest="underDefault";testValueName="overLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="underDefault";testValueName="overLimit";canvasType="onscreen"]
 
@@ -17103,26 +17393,38 @@
 
 [cts.https.html?q=webgpu:api,validation,capability_checks,limits,maxTextureDimension2D:getCurrentTexture,at_over:*]
   [:limitTest="atDefault";testValueName="atLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="atDefault";testValueName="atLimit";canvasType="onscreen"]
 
   [:limitTest="atDefault";testValueName="overLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="atDefault";testValueName="overLimit";canvasType="onscreen"]
 
   [:limitTest="atMaximum";testValueName="atLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="atMaximum";testValueName="atLimit";canvasType="onscreen"]
 
   [:limitTest="atMaximum";testValueName="overLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="atMaximum";testValueName="overLimit";canvasType="onscreen"]
 
   [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";canvasType="onscreen"]
 
   [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";canvasType="onscreen"]
 
@@ -17135,10 +17437,14 @@
   [:limitTest="overMaximum";testValueName="overLimit";canvasType="onscreen"]
 
   [:limitTest="underDefault";testValueName="atLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="underDefault";testValueName="atLimit";canvasType="onscreen"]
 
   [:limitTest="underDefault";testValueName="overLimit";canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:limitTest="underDefault";testValueName="overLimit";canvasType="onscreen"]
 
@@ -17182,9 +17488,2045 @@
 
 
 [cts.https.html?q=webgpu:api,validation,capability_checks,limits,maxUniformBuffersPerShaderStage:createPipeline,at_over:*]
-  disabled: true
   expected:
-    if os == "linux" and not debug: SKIP
+    if os == "linux" and not debug: TIMEOUT
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="atDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="atDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="atMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: TIMEOUT
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="betweenDefaultAndMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="overMaximum";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+    expected:
+      if os == "linux" and not debug: NOTRUN
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+
+  [:limitTest="underDefault";testValueName="atLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=false;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="compute";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="compute";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="compute";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="fragment";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="fragment";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="fragment";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertex";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertex";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertex";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleFragmentStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="backward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="forward";bindGroupTest="sameGroup"]
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="differentGroups"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:limitTest="underDefault";testValueName="overLimit";async=true;bindingCombination="vertexAndFragmentWithPossibleVertexStageOverflow";order="shiftByHalf";bindGroupTest="sameGroup"]
 
 
 [cts.https.html?q=webgpu:api,validation,capability_checks,limits,maxUniformBuffersPerShaderStage:createPipelineLayout,at_over:*]
@@ -29846,6 +32188,8 @@
 
 
 [cts.https.html?q=webgpu:api,validation,encoding,cmds,compute_pass:indirect_dispatch_buffer_state:*]
+  expected:
+    if os == "linux" and not debug: CRASH
   [:]
     expected:
       if os == "linux" and not debug: FAIL
@@ -31206,6 +33550,8 @@
 
 
 [cts.https.html?q=webgpu:api,validation,encoding,cmds,render,indirect_draw:indirect_buffer_state:*]
+  expected:
+    if os == "linux" and not debug: CRASH
   [:]
     expected:
       if os == "linux" and not debug: FAIL
@@ -31222,6 +33568,8 @@
 
 
 [cts.https.html?q=webgpu:api,validation,encoding,cmds,render,indirect_draw:indirect_offset_oob:*]
+  expected:
+    if os == "linux" and not debug: CRASH
   [:]
     expected:
       if os == "linux" and not debug: FAIL
@@ -48161,14 +50509,20 @@
 
 [cts.https.html?q=webgpu:api,validation,queue,copyToTexture,CopyExternalImageToTexture:OOB,destination:*]
   [:]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:api,validation,queue,copyToTexture,CopyExternalImageToTexture:OOB,source:*]
   [:]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:api,validation,queue,copyToTexture,CopyExternalImageToTexture:destination_texture,device_mismatch:*]
   [:]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:api,validation,queue,copyToTexture,CopyExternalImageToTexture:destination_texture,format:*]
@@ -48229,46 +50583,88 @@
   [:format="astc-8x8-unorm-srgb"]
 
   [:format="bc1-rgba-unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc1-rgba-unorm-srgb"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc2-rgba-unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc2-rgba-unorm-srgb"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc3-rgba-unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc3-rgba-unorm-srgb"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc4-r-snorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc4-r-unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc5-rg-snorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc5-rg-unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc6h-rgb-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc6h-rgb-ufloat"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc7-rgba-unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bc7-rgba-unorm-srgb"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm-srgb"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="depth16unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="depth24plus"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="depth24plus-stencil8"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="depth32float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="depth32float-stencil8"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="eac-r11snorm"]
 
@@ -48291,110 +50687,208 @@
   [:format="etc2-rgba8unorm-srgb"]
 
   [:format="r16float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="r16sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="r16uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="r32float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="r32sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="r32uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="r8sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="r8snorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="r8uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="r8unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rg11b10ufloat"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rg16float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rg16sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rg16uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rg32float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rg32sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rg32uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rg8sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rg8snorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rg8uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rg8unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgb10a2uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgb10a2unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgb9e5ufloat"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba32float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba32sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba32uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8snorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm-srgb"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="stencil8"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:api,validation,queue,copyToTexture,CopyExternalImageToTexture:destination_texture,mipLevel:*]
   [:mipLevel=0]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:mipLevel=5]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:mipLevel=6]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:api,validation,queue,copyToTexture,CopyExternalImageToTexture:destination_texture,sample_count:*]
   [:sampleCount=1]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:sampleCount=4]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:api,validation,queue,copyToTexture,CopyExternalImageToTexture:destination_texture,state:*]
   [:state="destroyed"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:state="invalid"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:state="valid"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:api,validation,queue,copyToTexture,CopyExternalImageToTexture:destination_texture,usage:*]
   [:usage=1]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:usage=16]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:usage=2]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:usage=4]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:usage=8]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:api,validation,queue,copyToTexture,CopyExternalImageToTexture:source_canvas,state:*]
@@ -48443,18 +50937,30 @@
 
 [cts.https.html?q=webgpu:api,validation,queue,copyToTexture,CopyExternalImageToTexture:source_imageBitmap,state:*]
   [:closed=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:closed=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:api,validation,queue,copyToTexture,CopyExternalImageToTexture:source_offscreenCanvas,state:*]
   [:state="detached-hascontext"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:state="detached-nocontext"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:state="nocontext"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:state="valid"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:api,validation,queue,destroyed,buffer:copyBufferToBuffer:*]
@@ -64664,127 +67170,127 @@
 [cts.https.html?q=webgpu:api,validation,render_pipeline,vertex_state:vertex_attribute_contained_in_stride:*]
   [:format="float16x2"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="float16x4"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="float32"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="float32x2"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="float32x3"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="float32x4"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="sint16x2"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="sint16x4"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="sint32"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="sint32x2"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="sint32x3"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="sint32x4"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="sint8x2"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="sint8x4"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="snorm16x2"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="snorm16x4"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="snorm8x2"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="snorm8x4"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="uint16x2"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="uint16x4"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="uint32"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="uint32x2"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="uint32x3"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="uint32x4"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="uint8x2"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="uint8x4"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="unorm10-10-10-2"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="unorm16x2"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="unorm16x4"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="unorm8x2"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
   [:format="unorm8x4"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL]
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:api,validation,render_pipeline,vertex_state:vertex_attribute_offset_alignment:*]
@@ -66717,6 +69223,8 @@
   [:usage0AccessibleInDispatch=true;usage1AccessibleInDispatch=false;dispatchBeforeUsage1=true]
 
   [:usage0AccessibleInDispatch=true;usage1AccessibleInDispatch=true;dispatchBeforeUsage1=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:api,validation,resource_usages,buffer,in_pass_encoder:subresources,buffer_usage_in_one_render_pass_with_no_draw:*]
@@ -72935,6 +75443,8 @@
   [:entry={"storageTexture":{"access":"write-only","format":"r32float"}};awaitLost=true]
 
   [:entry={"texture":{"multisampled":false,"sampleType":"unfilterable-float"}};awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:entry={"texture":{"multisampled":false,"sampleType":"unfilterable-float"}};awaitLost=true]
 
@@ -72979,12 +75489,16 @@
   [:usageType="INDIRECT";usageCopy="COPY_DST";awaitLost=false;mappedAtCreation=false]
 
   [:usageType="INDIRECT";usageCopy="COPY_DST";awaitLost=false;mappedAtCreation=true]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:usageType="INDIRECT";usageCopy="COPY_DST";awaitLost=true;mappedAtCreation=false]
 
   [:usageType="INDIRECT";usageCopy="COPY_DST";awaitLost=true;mappedAtCreation=true]
 
   [:usageType="INDIRECT";usageCopy="COPY_NONE";awaitLost=false;mappedAtCreation=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:usageType="INDIRECT";usageCopy="COPY_NONE";awaitLost=false;mappedAtCreation=true]
 
@@ -73017,6 +75531,8 @@
   [:usageType="MAP_READ";usageCopy="COPY_DST";awaitLost=true;mappedAtCreation=true]
 
   [:usageType="MAP_READ";usageCopy="COPY_NONE";awaitLost=false;mappedAtCreation=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:usageType="MAP_READ";usageCopy="COPY_NONE";awaitLost=false;mappedAtCreation=true]
 
@@ -73059,6 +75575,8 @@
   [:usageType="QUERY_RESOLVE";usageCopy="COPY_SRC";awaitLost=false;mappedAtCreation=false]
 
   [:usageType="QUERY_RESOLVE";usageCopy="COPY_SRC";awaitLost=false;mappedAtCreation=true]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:usageType="QUERY_RESOLVE";usageCopy="COPY_SRC";awaitLost=true;mappedAtCreation=false]
 
@@ -73097,6 +75615,8 @@
   [:usageType="STORAGE";usageCopy="COPY_SRC";awaitLost=true;mappedAtCreation=true]
 
   [:usageType="STORAGE";usageCopy="COPY_SRC_DST";awaitLost=false;mappedAtCreation=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:usageType="STORAGE";usageCopy="COPY_SRC_DST";awaitLost=false;mappedAtCreation=true]
 
@@ -73177,6 +75697,8 @@
 
 [cts.https.html?q=webgpu:api,validation,state,device_lost,destroy:createComputePipeline:*]
   [:awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:awaitLost=true]
 
@@ -73187,6 +75709,8 @@
       if os == "linux" and not debug: [PASS, FAIL]
 
   [:valid=false;awaitLost=true]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:valid=true;awaitLost=false]
 
@@ -73215,6 +75739,8 @@
   [:entry={"sampler":{"type":"filtering"}};awaitLost=true]
 
   [:entry={"sampler":{"type":"non-filtering"}};awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:entry={"sampler":{"type":"non-filtering"}};awaitLost=true]
 
@@ -73227,6 +75753,8 @@
   [:entry={"storageTexture":{"access":"read-write","format":"r32float"}};awaitLost=true]
 
   [:entry={"storageTexture":{"access":"write-only","format":"r32float"}};awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:entry={"storageTexture":{"access":"write-only","format":"r32float"}};awaitLost=true]
 
@@ -73389,6 +75917,8 @@
 
 [cts.https.html?q=webgpu:api,validation,state,device_lost,destroy:createRenderPipeline:*]
   [:awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:awaitLost=true]
 
@@ -73399,6 +75929,8 @@
       if os == "linux" and not debug: [PASS, FAIL]
 
   [:valid=false;awaitLost=true]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:valid=true;awaitLost=false]
 
@@ -73959,6 +76491,8 @@
   [:format="bc3-rgba-unorm-srgb";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="bc3-rgba-unorm-srgb";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bc3-rgba-unorm-srgb";usageType="texture";usageCopy="none";awaitLost=true]
 
@@ -73967,10 +76501,14 @@
   [:format="bc3-rgba-unorm-srgb";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="bc3-rgba-unorm-srgb";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bc3-rgba-unorm-srgb";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="bc4-r-snorm";usageType="texture";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bc4-r-snorm";usageType="texture";usageCopy="dst";awaitLost=true]
 
@@ -74023,6 +76561,8 @@
   [:format="bc5-rg-unorm";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="bc5-rg-unorm";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bc5-rg-unorm";usageType="texture";usageCopy="none";awaitLost=true]
 
@@ -74039,6 +76579,8 @@
   [:format="bc6h-rgb-float";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="bc6h-rgb-float";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bc6h-rgb-float";usageType="texture";usageCopy="none";awaitLost=true]
 
@@ -74095,6 +76637,8 @@
   [:format="bc7-rgba-unorm-srgb";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="bc7-rgba-unorm-srgb";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bc7-rgba-unorm-srgb";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
@@ -76099,6 +78643,8 @@
   [:format="bc1-rgba-unorm-srgb";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="bc1-rgba-unorm-srgb";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bc1-rgba-unorm-srgb";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
@@ -76195,6 +78741,8 @@
   [:format="bc4-r-unorm";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="bc4-r-unorm";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bc4-r-unorm";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
@@ -76211,6 +78759,8 @@
   [:format="bc5-rg-snorm";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="bc5-rg-snorm";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bc5-rg-snorm";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
@@ -76219,6 +78769,8 @@
   [:format="bc5-rg-unorm";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="bc5-rg-unorm";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bc5-rg-unorm";usageType="texture";usageCopy="none";awaitLost=true]
 
@@ -76227,6 +78779,8 @@
   [:format="bc5-rg-unorm";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="bc5-rg-unorm";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bc5-rg-unorm";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
@@ -76267,6 +78821,8 @@
   [:format="bc7-rgba-unorm";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="bc7-rgba-unorm";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bc7-rgba-unorm";usageType="texture";usageCopy="none";awaitLost=true]
 
@@ -76461,10 +79017,14 @@
   [:format="bgra8unorm";usageType="render";usageCopy="dst";awaitLost=true]
 
   [:format="bgra8unorm";usageType="render";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bgra8unorm";usageType="render";usageCopy="none";awaitLost=true]
 
   [:format="bgra8unorm";usageType="render";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bgra8unorm";usageType="render";usageCopy="src";awaitLost=true]
 
@@ -76481,6 +79041,8 @@
   [:format="bgra8unorm";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="bgra8unorm";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bgra8unorm";usageType="texture";usageCopy="src";awaitLost=true]
 
@@ -76489,6 +79051,8 @@
   [:format="bgra8unorm";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="bgra8unorm-srgb";usageType="render";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="bgra8unorm-srgb";usageType="render";usageCopy="dst";awaitLost=true]
 
@@ -76521,6 +79085,8 @@
   [:format="bgra8unorm-srgb";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="r16float";usageType="render";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r16float";usageType="render";usageCopy="dst";awaitLost=true]
 
@@ -76529,10 +79095,14 @@
   [:format="r16float";usageType="render";usageCopy="none";awaitLost=true]
 
   [:format="r16float";usageType="render";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r16float";usageType="render";usageCopy="src";awaitLost=true]
 
   [:format="r16float";usageType="render";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r16float";usageType="render";usageCopy="src-dest";awaitLost=true]
 
@@ -76541,22 +79111,32 @@
   [:format="r16float";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="r16float";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r16float";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="r16float";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r16float";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="r16float";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r16float";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="r16sint";usageType="render";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r16sint";usageType="render";usageCopy="dst";awaitLost=true]
 
   [:format="r16sint";usageType="render";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r16sint";usageType="render";usageCopy="none";awaitLost=true]
 
@@ -76565,6 +79145,8 @@
   [:format="r16sint";usageType="render";usageCopy="src";awaitLost=true]
 
   [:format="r16sint";usageType="render";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r16sint";usageType="render";usageCopy="src-dest";awaitLost=true]
 
@@ -76573,10 +79155,14 @@
   [:format="r16sint";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="r16sint";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r16sint";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="r16sint";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r16sint";usageType="texture";usageCopy="src";awaitLost=true]
 
@@ -76593,10 +79179,14 @@
   [:format="r16uint";usageType="render";usageCopy="none";awaitLost=true]
 
   [:format="r16uint";usageType="render";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r16uint";usageType="render";usageCopy="src";awaitLost=true]
 
   [:format="r16uint";usageType="render";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r16uint";usageType="render";usageCopy="src-dest";awaitLost=true]
 
@@ -76609,18 +79199,26 @@
   [:format="r16uint";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="r16uint";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r16uint";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="r16uint";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r16uint";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="r32float";usageType="render";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r32float";usageType="render";usageCopy="dst";awaitLost=true]
 
   [:format="r32float";usageType="render";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r32float";usageType="render";usageCopy="none";awaitLost=true]
 
@@ -76637,6 +79235,8 @@
   [:format="r32float";usageType="storage";usageCopy="dst";awaitLost=true]
 
   [:format="r32float";usageType="storage";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r32float";usageType="storage";usageCopy="none";awaitLost=true]
 
@@ -76645,6 +79245,8 @@
   [:format="r32float";usageType="storage";usageCopy="src";awaitLost=true]
 
   [:format="r32float";usageType="storage";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r32float";usageType="storage";usageCopy="src-dest";awaitLost=true]
 
@@ -76653,6 +79255,8 @@
   [:format="r32float";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="r32float";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r32float";usageType="texture";usageCopy="none";awaitLost=true]
 
@@ -76661,14 +79265,20 @@
   [:format="r32float";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="r32float";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r32float";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="r32sint";usageType="render";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r32sint";usageType="render";usageCopy="dst";awaitLost=true]
 
   [:format="r32sint";usageType="render";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r32sint";usageType="render";usageCopy="none";awaitLost=true]
 
@@ -76701,6 +79311,8 @@
   [:format="r32sint";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="r32sint";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r32sint";usageType="texture";usageCopy="none";awaitLost=true]
 
@@ -76709,6 +79321,8 @@
   [:format="r32sint";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="r32sint";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r32sint";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
@@ -76717,6 +79331,8 @@
   [:format="r32uint";usageType="render";usageCopy="dst";awaitLost=true]
 
   [:format="r32uint";usageType="render";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r32uint";usageType="render";usageCopy="none";awaitLost=true]
 
@@ -76725,6 +79341,8 @@
   [:format="r32uint";usageType="render";usageCopy="src";awaitLost=true]
 
   [:format="r32uint";usageType="render";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r32uint";usageType="render";usageCopy="src-dest";awaitLost=true]
 
@@ -76745,6 +79363,8 @@
   [:format="r32uint";usageType="storage";usageCopy="src-dest";awaitLost=true]
 
   [:format="r32uint";usageType="texture";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r32uint";usageType="texture";usageCopy="dst";awaitLost=true]
 
@@ -76753,10 +79373,14 @@
   [:format="r32uint";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="r32uint";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r32uint";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="r32uint";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r32uint";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
@@ -76765,6 +79389,8 @@
   [:format="r8sint";usageType="render";usageCopy="dst";awaitLost=true]
 
   [:format="r8sint";usageType="render";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r8sint";usageType="render";usageCopy="none";awaitLost=true]
 
@@ -76781,10 +79407,14 @@
   [:format="r8sint";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="r8sint";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r8sint";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="r8sint";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r8sint";usageType="texture";usageCopy="src";awaitLost=true]
 
@@ -76793,6 +79423,8 @@
   [:format="r8sint";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="r8snorm";usageType="texture";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r8snorm";usageType="texture";usageCopy="dst";awaitLost=true]
 
@@ -76865,6 +79497,8 @@
   [:format="r8unorm";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="r8unorm";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="r8unorm";usageType="texture";usageCopy="src";awaitLost=true]
 
@@ -76889,6 +79523,8 @@
   [:format="rg11b10ufloat";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="rg16float";usageType="render";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg16float";usageType="render";usageCopy="dst";awaitLost=true]
 
@@ -76897,6 +79533,8 @@
   [:format="rg16float";usageType="render";usageCopy="none";awaitLost=true]
 
   [:format="rg16float";usageType="render";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg16float";usageType="render";usageCopy="src";awaitLost=true]
 
@@ -76909,14 +79547,20 @@
   [:format="rg16float";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="rg16float";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg16float";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="rg16float";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg16float";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="rg16float";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg16float";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
@@ -76941,6 +79585,8 @@
   [:format="rg16sint";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="rg16sint";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg16sint";usageType="texture";usageCopy="none";awaitLost=true]
 
@@ -76949,6 +79595,8 @@
   [:format="rg16sint";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="rg16sint";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg16sint";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
@@ -76957,10 +79605,14 @@
   [:format="rg16uint";usageType="render";usageCopy="dst";awaitLost=true]
 
   [:format="rg16uint";usageType="render";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg16uint";usageType="render";usageCopy="none";awaitLost=true]
 
   [:format="rg16uint";usageType="render";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg16uint";usageType="render";usageCopy="src";awaitLost=true]
 
@@ -76977,6 +79629,8 @@
   [:format="rg16uint";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="rg16uint";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg16uint";usageType="texture";usageCopy="src";awaitLost=true]
 
@@ -76989,6 +79643,8 @@
   [:format="rg32float";usageType="render";usageCopy="dst";awaitLost=true]
 
   [:format="rg32float";usageType="render";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg32float";usageType="render";usageCopy="none";awaitLost=true]
 
@@ -77013,6 +79669,8 @@
   [:format="rg32float";usageType="storage";usageCopy="src";awaitLost=true]
 
   [:format="rg32float";usageType="storage";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg32float";usageType="storage";usageCopy="src-dest";awaitLost=true]
 
@@ -77033,6 +79691,8 @@
   [:format="rg32float";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="rg32sint";usageType="render";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg32sint";usageType="render";usageCopy="dst";awaitLost=true]
 
@@ -77045,6 +79705,8 @@
   [:format="rg32sint";usageType="render";usageCopy="src";awaitLost=true]
 
   [:format="rg32sint";usageType="render";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg32sint";usageType="render";usageCopy="src-dest";awaitLost=true]
 
@@ -77053,6 +79715,8 @@
   [:format="rg32sint";usageType="storage";usageCopy="dst";awaitLost=true]
 
   [:format="rg32sint";usageType="storage";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg32sint";usageType="storage";usageCopy="none";awaitLost=true]
 
@@ -77077,6 +79741,8 @@
   [:format="rg32sint";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="rg32sint";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg32sint";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
@@ -77085,6 +79751,8 @@
   [:format="rg32uint";usageType="render";usageCopy="dst";awaitLost=true]
 
   [:format="rg32uint";usageType="render";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg32uint";usageType="render";usageCopy="none";awaitLost=true]
 
@@ -77093,10 +79761,14 @@
   [:format="rg32uint";usageType="render";usageCopy="src";awaitLost=true]
 
   [:format="rg32uint";usageType="render";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg32uint";usageType="render";usageCopy="src-dest";awaitLost=true]
 
   [:format="rg32uint";usageType="storage";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg32uint";usageType="storage";usageCopy="dst";awaitLost=true]
 
@@ -77109,14 +79781,20 @@
   [:format="rg32uint";usageType="storage";usageCopy="src";awaitLost=true]
 
   [:format="rg32uint";usageType="storage";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg32uint";usageType="storage";usageCopy="src-dest";awaitLost=true]
 
   [:format="rg32uint";usageType="texture";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg32uint";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="rg32uint";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg32uint";usageType="texture";usageCopy="none";awaitLost=true]
 
@@ -77125,6 +79803,8 @@
   [:format="rg32uint";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="rg32uint";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rg32uint";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
@@ -77249,6 +79929,8 @@
   [:format="rgb10a2uint";usageType="render";usageCopy="none";awaitLost=true]
 
   [:format="rgb10a2uint";usageType="render";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgb10a2uint";usageType="render";usageCopy="src";awaitLost=true]
 
@@ -77257,14 +79939,20 @@
   [:format="rgb10a2uint";usageType="render";usageCopy="src-dest";awaitLost=true]
 
   [:format="rgb10a2uint";usageType="texture";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgb10a2uint";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="rgb10a2uint";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgb10a2uint";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="rgb10a2uint";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgb10a2uint";usageType="texture";usageCopy="src";awaitLost=true]
 
@@ -77273,6 +79961,8 @@
   [:format="rgb10a2uint";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="rgb10a2unorm";usageType="render";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgb10a2unorm";usageType="render";usageCopy="dst";awaitLost=true]
 
@@ -77281,6 +79971,8 @@
   [:format="rgb10a2unorm";usageType="render";usageCopy="none";awaitLost=true]
 
   [:format="rgb10a2unorm";usageType="render";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgb10a2unorm";usageType="render";usageCopy="src";awaitLost=true]
 
@@ -77313,14 +80005,20 @@
   [:format="rgb9e5ufloat";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="rgb9e5ufloat";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgb9e5ufloat";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="rgb9e5ufloat";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgb9e5ufloat";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="rgba16float";usageType="render";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16float";usageType="render";usageCopy="dst";awaitLost=true]
 
@@ -77341,10 +80039,14 @@
   [:format="rgba16float";usageType="storage";usageCopy="dst";awaitLost=true]
 
   [:format="rgba16float";usageType="storage";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16float";usageType="storage";usageCopy="none";awaitLost=true]
 
   [:format="rgba16float";usageType="storage";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16float";usageType="storage";usageCopy="src";awaitLost=true]
 
@@ -77353,6 +80055,8 @@
   [:format="rgba16float";usageType="storage";usageCopy="src-dest";awaitLost=true]
 
   [:format="rgba16float";usageType="texture";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16float";usageType="texture";usageCopy="dst";awaitLost=true]
 
@@ -77365,18 +80069,26 @@
   [:format="rgba16float";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="rgba16float";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16float";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="rgba16sint";usageType="render";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16sint";usageType="render";usageCopy="dst";awaitLost=true]
 
   [:format="rgba16sint";usageType="render";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16sint";usageType="render";usageCopy="none";awaitLost=true]
 
   [:format="rgba16sint";usageType="render";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16sint";usageType="render";usageCopy="src";awaitLost=true]
 
@@ -77385,10 +80097,14 @@
   [:format="rgba16sint";usageType="render";usageCopy="src-dest";awaitLost=true]
 
   [:format="rgba16sint";usageType="storage";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16sint";usageType="storage";usageCopy="dst";awaitLost=true]
 
   [:format="rgba16sint";usageType="storage";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16sint";usageType="storage";usageCopy="none";awaitLost=true]
 
@@ -77401,18 +80117,26 @@
   [:format="rgba16sint";usageType="storage";usageCopy="src-dest";awaitLost=true]
 
   [:format="rgba16sint";usageType="texture";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16sint";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="rgba16sint";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16sint";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="rgba16sint";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16sint";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="rgba16sint";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16sint";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
@@ -77441,6 +80165,8 @@
   [:format="rgba16uint";usageType="storage";usageCopy="none";awaitLost=true]
 
   [:format="rgba16uint";usageType="storage";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16uint";usageType="storage";usageCopy="src";awaitLost=true]
 
@@ -77457,14 +80183,20 @@
   [:format="rgba16uint";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="rgba16uint";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16uint";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="rgba16uint";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba16uint";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="rgba32float";usageType="render";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba32float";usageType="render";usageCopy="dst";awaitLost=true]
 
@@ -77485,10 +80217,14 @@
   [:format="rgba32float";usageType="storage";usageCopy="dst";awaitLost=true]
 
   [:format="rgba32float";usageType="storage";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba32float";usageType="storage";usageCopy="none";awaitLost=true]
 
   [:format="rgba32float";usageType="storage";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba32float";usageType="storage";usageCopy="src";awaitLost=true]
 
@@ -77497,22 +80233,32 @@
   [:format="rgba32float";usageType="storage";usageCopy="src-dest";awaitLost=true]
 
   [:format="rgba32float";usageType="texture";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba32float";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="rgba32float";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba32float";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="rgba32float";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba32float";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="rgba32float";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba32float";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="rgba32sint";usageType="render";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba32sint";usageType="render";usageCopy="dst";awaitLost=true]
 
@@ -77561,6 +80307,8 @@
   [:format="rgba32sint";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="rgba32uint";usageType="render";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba32uint";usageType="render";usageCopy="dst";awaitLost=true]
 
@@ -77577,6 +80325,8 @@
   [:format="rgba32uint";usageType="render";usageCopy="src-dest";awaitLost=true]
 
   [:format="rgba32uint";usageType="storage";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba32uint";usageType="storage";usageCopy="dst";awaitLost=true]
 
@@ -77593,6 +80343,8 @@
   [:format="rgba32uint";usageType="storage";usageCopy="src-dest";awaitLost=true]
 
   [:format="rgba32uint";usageType="texture";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba32uint";usageType="texture";usageCopy="dst";awaitLost=true]
 
@@ -77601,6 +80353,8 @@
   [:format="rgba32uint";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="rgba32uint";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba32uint";usageType="texture";usageCopy="src";awaitLost=true]
 
@@ -77613,10 +80367,14 @@
   [:format="rgba8sint";usageType="render";usageCopy="dst";awaitLost=true]
 
   [:format="rgba8sint";usageType="render";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba8sint";usageType="render";usageCopy="none";awaitLost=true]
 
   [:format="rgba8sint";usageType="render";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba8sint";usageType="render";usageCopy="src";awaitLost=true]
 
@@ -77629,6 +80387,8 @@
   [:format="rgba8sint";usageType="storage";usageCopy="dst";awaitLost=true]
 
   [:format="rgba8sint";usageType="storage";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba8sint";usageType="storage";usageCopy="none";awaitLost=true]
 
@@ -77645,14 +80405,20 @@
   [:format="rgba8sint";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="rgba8sint";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba8sint";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="rgba8sint";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba8sint";usageType="texture";usageCopy="src";awaitLost=true]
 
   [:format="rgba8sint";usageType="texture";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba8sint";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
@@ -77681,6 +80447,8 @@
   [:format="rgba8snorm";usageType="texture";usageCopy="none";awaitLost=true]
 
   [:format="rgba8snorm";usageType="texture";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba8snorm";usageType="texture";usageCopy="src";awaitLost=true]
 
@@ -77689,6 +80457,8 @@
   [:format="rgba8snorm";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="rgba8uint";usageType="render";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba8uint";usageType="render";usageCopy="dst";awaitLost=true]
 
@@ -77697,10 +80467,14 @@
   [:format="rgba8uint";usageType="render";usageCopy="none";awaitLost=true]
 
   [:format="rgba8uint";usageType="render";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba8uint";usageType="render";usageCopy="src";awaitLost=true]
 
   [:format="rgba8uint";usageType="render";usageCopy="src-dest";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba8uint";usageType="render";usageCopy="src-dest";awaitLost=true]
 
@@ -77713,6 +80487,8 @@
   [:format="rgba8uint";usageType="storage";usageCopy="none";awaitLost=true]
 
   [:format="rgba8uint";usageType="storage";usageCopy="src";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba8uint";usageType="storage";usageCopy="src";awaitLost=true]
 
@@ -77725,6 +80501,8 @@
   [:format="rgba8uint";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="rgba8uint";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba8uint";usageType="texture";usageCopy="none";awaitLost=true]
 
@@ -77773,6 +80551,8 @@
   [:format="rgba8unorm";usageType="texture";usageCopy="dst";awaitLost=true]
 
   [:format="rgba8unorm";usageType="texture";usageCopy="none";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba8unorm";usageType="texture";usageCopy="none";awaitLost=true]
 
@@ -77785,6 +80565,8 @@
   [:format="rgba8unorm";usageType="texture";usageCopy="src-dest";awaitLost=true]
 
   [:format="rgba8unorm-srgb";usageType="render";usageCopy="dst";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:format="rgba8unorm-srgb";usageType="render";usageCopy="dst";awaitLost=true]
 
@@ -77829,24 +80611,44 @@
 
 [cts.https.html?q=webgpu:api,validation,state,device_lost,destroy:queue,copyExternalImageToTexture,canvas:*]
   [:canvasType="offscreen";contextType="2d";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";contextType="2d";awaitLost=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";contextType="bitmaprenderer";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";contextType="bitmaprenderer";awaitLost=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";contextType="webgl";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";contextType="webgl";awaitLost=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";contextType="webgl2";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";contextType="webgl2";awaitLost=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";contextType="webgpu";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";contextType="webgpu";awaitLost=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen";contextType="2d";awaitLost=false]
     expected:
@@ -77869,8 +80671,12 @@
       if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen";contextType="webgl2";awaitLost=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen";contextType="webgl2";awaitLost=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen";contextType="webgpu";awaitLost=false]
     expected:
@@ -77883,8 +80689,12 @@
 
 [cts.https.html?q=webgpu:api,validation,state,device_lost,destroy:queue,copyExternalImageToTexture,imageBitmap:*]
   [:awaitLost=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:awaitLost=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:api,validation,state,device_lost,destroy:queue,writeBuffer:*]
@@ -77906,7 +80716,7 @@
 
   [:numElements=8;awaitLost=false]
     expected:
-      if os == "linux" and not debug: [PASS, NOTRUN]
+      if os == "linux" and not debug: [PASS, TIMEOUT]
 
   [:numElements=8;awaitLost=true]
     expected:
@@ -78275,12 +81085,16 @@
 
 [cts.https.html?q=webgpu:api,validation,texture,bgra8unorm_storage:configure_storage_usage_on_canvas_context_with_bgra8unorm_storage:*]
   [:canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen"]
 
 
 [cts.https.html?q=webgpu:api,validation,texture,bgra8unorm_storage:configure_storage_usage_on_canvas_context_without_bgra8unorm_storage:*]
   [:canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen"]
 
@@ -81228,12 +84042,16 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,af_addition:scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,af_addition:scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
     expected:
       if os == "linux" and not debug: [FAIL, TIMEOUT]
@@ -81248,6 +84066,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,af_addition:vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -81278,6 +84098,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,af_comparison:equals:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -81288,6 +84110,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,af_comparison:greater_equals:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -81332,6 +84156,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,af_comparison:not_equals:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -81350,6 +84176,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,af_division:scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -81364,6 +84192,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,af_division:vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -81378,6 +84208,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,af_division:vector_scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -81584,6 +84416,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,af_matrix_scalar_multiplication:scalar_matrix:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";cols=2;rows=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -81662,6 +84496,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,af_matrix_vector_multiplication:matrix_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";cols=2;rows=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -81700,6 +84536,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,af_matrix_vector_multiplication:vector_matrix:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";cols=2;rows=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -81738,6 +84576,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,af_multiplication:scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -81864,6 +84704,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,af_subtraction:vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -81894,126 +84736,78 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_arithmetic:addition:*]
-  expected:
-    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_arithmetic:addition_scalar_vector:*]
   expected:
     if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_rhs=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_rhs=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_rhs=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_arithmetic:addition_vector_scalar:*]
   expected:
     if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_lhs=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_lhs=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_lhs=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_arithmetic:division:*]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_arithmetic:division_scalar_vector:*]
   [:inputSource="const";vectorize_rhs=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_rhs=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_rhs=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_arithmetic:division_vector_scalar:*]
   expected:
     if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_lhs=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_lhs=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_lhs=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_arithmetic:multiplication:*]
   expected:
     if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_arithmetic:multiplication_scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_rhs=2]
     expected:
       if os == "linux" and not debug: [PASS, FAIL]
@@ -82029,108 +84823,68 @@
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_arithmetic:multiplication_vector_scalar:*]
   [:inputSource="const";vectorize_lhs=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_lhs=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_lhs=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_arithmetic:remainder:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_arithmetic:remainder_scalar_vector:*]
   [:inputSource="const";vectorize_rhs=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_rhs=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_rhs=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_arithmetic:remainder_vector_scalar:*]
   [:inputSource="const";vectorize_lhs=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_lhs=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_lhs=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_arithmetic:subtraction:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_arithmetic:subtraction_scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_rhs=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_rhs=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_rhs=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_arithmetic:subtraction_vector_scalar:*]
   [:inputSource="const";vectorize_lhs=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_lhs=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize_lhs=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,ai_comparison:equals:*]
@@ -82195,20 +84949,12 @@
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,bitwise:bitwise_and:*]
   [:type="abstract-int";inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="abstract-int";inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="abstract-int";inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="abstract-int";inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="abstract-int";inputSource="storage_r";vectorize="_undef_"]
 
@@ -82367,20 +85113,12 @@
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,bitwise:bitwise_exclusive_or:*]
   [:type="abstract-int";inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="abstract-int";inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="abstract-int";inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="abstract-int";inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="abstract-int";inputSource="storage_r";vectorize="_undef_"]
 
@@ -82539,20 +85277,12 @@
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,bitwise:bitwise_or:*]
   [:type="abstract-int";inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="abstract-int";inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="abstract-int";inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="abstract-int";inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="abstract-int";inputSource="storage_r";vectorize="_undef_"]
 
@@ -83190,6 +85920,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_addition:scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -83200,6 +85932,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_addition:scalar_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -83262,6 +85996,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_addition:vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize=2]
 
   [:inputSource="const";vectorize=3]
@@ -83288,6 +86024,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_addition:vector_scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -83314,6 +86052,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_addition:vector_scalar_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -83484,6 +86224,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_comparison:less_than:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -83628,6 +86370,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_division:vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize=2]
 
   [:inputSource="const";vectorize=3]
@@ -83682,6 +86426,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_division:vector_scalar_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -84152,6 +86898,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_matrix_scalar_multiplication:matrix_scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";cols=2;rows=2]
 
   [:inputSource="const";cols=2;rows=3]
@@ -84606,6 +87354,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_matrix_vector_multiplication:vector_matrix:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";cols=2;rows=2]
 
   [:inputSource="const";cols=2;rows=3]
@@ -84720,6 +87470,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_multiplication:scalar_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -84754,6 +87506,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_multiplication:scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -84780,6 +87534,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_multiplication:vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize=2]
 
   [:inputSource="const";vectorize=3]
@@ -84832,6 +87588,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_multiplication:vector_scalar_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -84858,6 +87616,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_remainder:scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -84868,6 +87628,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_remainder:scalar_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -84902,6 +87664,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_remainder:scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -84928,6 +87692,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_remainder:vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize=2]
 
   [:inputSource="const";vectorize=3]
@@ -84982,6 +87748,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_remainder:vector_scalar_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -85008,6 +87776,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_subtraction:scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -85054,6 +87824,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_subtraction:scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -85108,6 +87880,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_subtraction:vector_scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -85134,6 +87908,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f16_subtraction:vector_scalar_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -85236,6 +88012,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_addition:vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize=2]
 
   [:inputSource="const";vectorize=3]
@@ -85262,6 +88040,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_addition:vector_scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -85392,6 +88172,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_comparison:greater_than:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -85462,6 +88244,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_comparison:less_than:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -85532,6 +88316,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_division:scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -85542,6 +88328,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_division:scalar_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -85630,6 +88418,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_division:vector_scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -85684,6 +88474,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_matrix_addition:matrix:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";cols=2;rows=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -85850,6 +88642,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_matrix_matrix_multiplication:matrix_matrix:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";common_dim=2;x_rows=2;y_cols=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -86122,6 +88916,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_matrix_matrix_multiplication:matrix_matrix_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";common_dim=2;x_rows=2]
     expected:
       if os == "linux" and not debug: [PASS, FAIL]
@@ -86628,6 +89424,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_matrix_vector_multiplication:matrix_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";cols=2;rows=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -86814,6 +89612,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_matrix_vector_multiplication:vector_matrix_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -86840,6 +89640,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_multiplication:scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -87004,6 +89806,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_remainder:scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: [PASS, FAIL]
@@ -87016,6 +89820,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_remainder:scalar_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -87104,6 +89910,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_remainder:vector_scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -87206,6 +90014,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_subtraction:scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -87260,6 +90070,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,f32_subtraction:vector_scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";dim=2]
 
   [:inputSource="const";dim=3]
@@ -87312,6 +90124,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:addition:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -87346,6 +90160,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:addition_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -87380,6 +90196,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:addition_scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_rhs=2]
 
   [:inputSource="const";vectorize_rhs=3]
@@ -87406,6 +90224,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:addition_vector_scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_lhs=2]
 
   [:inputSource="const";vectorize_lhs=3]
@@ -87458,6 +90278,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:division:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -87492,6 +90314,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:division_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -87526,6 +90350,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:division_scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_rhs=2]
 
   [:inputSource="const";vectorize_rhs=3]
@@ -87552,6 +90378,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:division_vector_scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_lhs=2]
 
   [:inputSource="const";vectorize_lhs=3]
@@ -87578,6 +90406,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:division_vector_scalar_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_lhs=2]
 
   [:inputSource="const";vectorize_lhs=3]
@@ -87674,6 +90504,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:multiplication_scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_rhs=2]
 
   [:inputSource="const";vectorize_rhs=3]
@@ -87700,6 +90532,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:multiplication_vector_scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_lhs=2]
 
   [:inputSource="const";vectorize_lhs=3]
@@ -87754,6 +90588,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:remainder:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -87788,6 +90624,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:remainder_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -87822,6 +90660,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:remainder_scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_rhs=2]
 
   [:inputSource="const";vectorize_rhs=3]
@@ -87900,6 +90740,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:subtraction:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -87968,6 +90810,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:subtraction_scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_rhs=2]
 
   [:inputSource="const";vectorize_rhs=3]
@@ -88054,6 +90898,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_comparison:equals:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -88124,6 +90970,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_comparison:greater_than:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -88264,6 +91112,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:addition:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -88306,6 +91156,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:addition_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -88340,6 +91192,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:addition_scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_rhs=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -88372,6 +91226,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:addition_vector_scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_lhs=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -88404,32 +91260,14 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:addition_vector_scalar_compound:*]
-  [:inputSource="const";vectorize_lhs=2]
-
-  [:inputSource="const";vectorize_lhs=3]
-
-  [:inputSource="const";vectorize_lhs=4]
-
-  [:inputSource="storage_r";vectorize_lhs=2]
-
-  [:inputSource="storage_r";vectorize_lhs=3]
-
-  [:inputSource="storage_r";vectorize_lhs=4]
-
-  [:inputSource="storage_rw";vectorize_lhs=2]
-
-  [:inputSource="storage_rw";vectorize_lhs=3]
-
-  [:inputSource="storage_rw";vectorize_lhs=4]
-
-  [:inputSource="uniform";vectorize_lhs=2]
-
-  [:inputSource="uniform";vectorize_lhs=3]
-
-  [:inputSource="uniform";vectorize_lhs=4]
+  disabled: true
+  expected:
+    if os == "linux" and not debug: SKIP
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:division:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -88464,6 +91302,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:division_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -88524,6 +91364,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:division_vector_scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_lhs=2]
 
   [:inputSource="const";vectorize_lhs=3]
@@ -88550,6 +91392,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:division_vector_scalar_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_lhs=2]
 
   [:inputSource="const";vectorize_lhs=3]
@@ -88688,6 +91532,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:multiplication_vector_scalar:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_lhs=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -88720,6 +91566,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:multiplication_vector_scalar_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_lhs=2]
 
   [:inputSource="const";vectorize_lhs=3]
@@ -88746,6 +91594,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:remainder:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -88780,6 +91630,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:remainder_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -88814,6 +91666,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:remainder_scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_rhs=2]
 
   [:inputSource="const";vectorize_rhs=3]
@@ -88866,6 +91720,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:remainder_vector_scalar_compound:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_lhs=2]
 
   [:inputSource="const";vectorize_lhs=3]
@@ -88970,6 +91826,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:subtraction_scalar_vector:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize_rhs=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -89106,6 +91964,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_comparison:greater_equals:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -89140,6 +92000,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_comparison:greater_than:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -89216,6 +92078,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_comparison:less_than:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -89250,6 +92114,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_comparison:not_equals:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -89284,6 +92150,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,abs:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -89305,20 +92173,12 @@
   expected:
     if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="storage_r";vectorize="_undef_"]
 
@@ -89416,6 +92276,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,abs:i32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -89574,6 +92436,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,acos:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -89608,6 +92472,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,acosh:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -90520,6 +93386,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,asinh:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -90596,6 +93464,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,asinh:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -90638,6 +93508,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,atan2:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: [PASS, FAIL]
@@ -90680,6 +93552,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,atan2:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -90918,6 +93792,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,atanh:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -90952,6 +93828,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,atanh:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -95252,6 +98130,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,ceil:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -95366,6 +98246,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,clamp:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -95387,20 +98269,12 @@
   expected:
     if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="storage_r";vectorize="_undef_"]
 
@@ -95536,6 +98410,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,clamp:u32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -95730,6 +98606,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,cosh:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -95764,6 +98642,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,cosh:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: [PASS, FAIL]
@@ -96018,6 +98898,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,cross:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -96028,9 +98910,9 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,cross:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="storage_r"]
 
@@ -96060,6 +98942,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,degrees:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -96094,6 +98978,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,degrees:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -96270,6 +99156,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,distance:abstract_float_vec2:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -96300,6 +99188,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,distance:f16_vec2:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -96310,6 +99200,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,distance:f16_vec3:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -96320,8 +99212,6 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,distance:f16_vec4:*]
-  expected:
-    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -96339,22 +99229,22 @@
       if os == "linux" and not debug: FAIL
 
   [:inputSource="storage_r"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:inputSource="storage_rw"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:inputSource="uniform"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,distance:f32_vec2:*]
-  [:inputSource="const"]
-    expected:
-      if os == "linux" and not debug: [FAIL, TIMEOUT]
-
-  [:inputSource="storage_r"]
-
-  [:inputSource="storage_rw"]
-
-  [:inputSource="uniform"]
+  disabled: true
+  expected:
+    if os == "linux" and not debug: SKIP
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,distance:f32_vec3:*]
@@ -96372,6 +99262,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,distance:f32_vec4:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: [FAIL, TIMEOUT]
@@ -96420,12 +99312,16 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,dot:abstract_float_vec2:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,dot:abstract_float_vec3:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -96448,18 +99344,24 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,dot:abstract_int_vec3:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: [PASS, FAIL]
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,dot:abstract_int_vec4:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,dot:f16_vec2:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -96470,6 +99372,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,dot:f16_vec3:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -96492,8 +99396,6 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,dot:f32_vec2:*]
-  expected:
-    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -96520,6 +99422,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,dot:f32_vec4:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -96602,6 +99506,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,dot:u32_vec4:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -96838,6 +99744,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,dpdyCoarse:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -96888,6 +99796,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,dpdyFine:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -96982,6 +99892,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,exp2:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -97016,6 +99928,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,exp2:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -97478,6 +100392,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,floor:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -97588,6 +100504,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,fma:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -97622,6 +100540,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,fma:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -98066,38 +100986,6 @@
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,fwidthCoarse:f32:*]
   expected:
     if os == "linux" and not debug: [OK, CRASH]
-  [:inputSource="const";vectorize="_undef_"]
-
-  [:inputSource="const";vectorize=2]
-
-  [:inputSource="const";vectorize=3]
-
-  [:inputSource="const";vectorize=4]
-
-  [:inputSource="storage_r";vectorize="_undef_"]
-
-  [:inputSource="storage_r";vectorize=2]
-
-  [:inputSource="storage_r";vectorize=3]
-
-  [:inputSource="storage_r";vectorize=4]
-
-  [:inputSource="storage_rw";vectorize="_undef_"]
-
-  [:inputSource="storage_rw";vectorize=2]
-
-  [:inputSource="storage_rw";vectorize=3]
-
-  [:inputSource="storage_rw";vectorize=4]
-
-  [:inputSource="uniform";vectorize="_undef_"]
-
-  [:inputSource="uniform";vectorize=2]
-
-  [:inputSource="uniform";vectorize=3]
-
-  [:inputSource="uniform";vectorize=4]
-
   [:vectorize="_undef_";non_uniform_discard=false]
 
   [:vectorize="_undef_";non_uniform_discard=true]
@@ -98250,6 +101138,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,inversesqrt:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -98292,6 +101182,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,inversesqrt:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -98528,14 +101420,14 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,length:abstract_float_vec3:*]
+  disabled: true
   expected:
-    if os == "linux" and not debug: [OK, CRASH]
-  [:inputSource="const"]
-    expected:
-      if os == "linux" and not debug: FAIL
+    if os == "linux" and not debug: SKIP
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,length:abstract_float_vec4:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -98552,6 +101444,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,length:f16_vec2:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -98574,6 +101468,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,length:f16_vec4:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -98584,6 +101480,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,length:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -98624,6 +101522,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,length:f32_vec4:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -98636,6 +101536,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,log2:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -98792,6 +101694,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,log:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -98862,6 +101766,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,max:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -98883,20 +101789,12 @@
   expected:
     if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="storage_r";vectorize="_undef_"]
 
@@ -98924,6 +101822,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,max:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -99000,6 +101900,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,max:i32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: [PASS, FAIL]
@@ -99045,20 +101947,12 @@
   expected:
     if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: [PASS, FAIL]
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: [PASS, FAIL]
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: [PASS, FAIL]
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: [PASS, FAIL]
 
   [:inputSource="storage_r";vectorize="_undef_"]
 
@@ -99107,20 +102001,12 @@
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,min:abstract_int:*]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="storage_r";vectorize="_undef_"]
 
@@ -99148,6 +102034,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,min:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -99182,39 +102070,9 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,min:f32:*]
+  disabled: true
   expected:
-    if os == "linux" and not debug: [OK, CRASH]
-  [:inputSource="const";vectorize="_undef_"]
-
-  [:inputSource="const";vectorize=2]
-
-  [:inputSource="const";vectorize=3]
-
-  [:inputSource="const";vectorize=4]
-
-  [:inputSource="storage_r";vectorize="_undef_"]
-
-  [:inputSource="storage_r";vectorize=2]
-
-  [:inputSource="storage_r";vectorize=3]
-
-  [:inputSource="storage_r";vectorize=4]
-
-  [:inputSource="storage_rw";vectorize="_undef_"]
-
-  [:inputSource="storage_rw";vectorize=2]
-
-  [:inputSource="storage_rw";vectorize=3]
-
-  [:inputSource="storage_rw";vectorize=4]
-
-  [:inputSource="uniform";vectorize="_undef_"]
-
-  [:inputSource="uniform";vectorize=2]
-
-  [:inputSource="uniform";vectorize=3]
-
-  [:inputSource="uniform";vectorize=4]
+    if os == "linux" and not debug: SKIP
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,min:i32:*]
@@ -99290,6 +102148,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,mix:abstract_float_matching:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -99308,24 +102168,32 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,mix:abstract_float_nonmatching_vec2:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,mix:abstract_float_nonmatching_vec3:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,mix:abstract_float_nonmatching_vec4:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: [FAIL, TIMEOUT]
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,mix:f16_matching:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -99370,6 +102238,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,mix:f16_nonmatching_vec3:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -99434,6 +102304,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,mix:f32_nonmatching_vec2:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -99460,6 +102332,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,mix:f32_nonmatching_vec4:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -99472,24 +102346,32 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,modf:abstract_fract:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,modf:abstract_vec2_fract:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: [PASS, FAIL]
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,modf:abstract_vec2_whole:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,modf:abstract_vec3_fract:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -99504,12 +102386,16 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,modf:abstract_vec4_fract:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,modf:abstract_vec4_whole:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -99534,6 +102420,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,modf:f16_vec2_fract:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -99556,6 +102444,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,modf:f16_vec3_fract:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -99640,6 +102530,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,modf:f32_vec2_whole:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -99652,6 +102544,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,modf:f32_vec3_fract:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -99664,6 +102558,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,modf:f32_vec3_whole:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -99688,6 +102584,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,modf:f32_vec4_whole:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -99700,6 +102598,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,modf:f32_whole:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -99720,18 +102620,24 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,normalize:abstract_float_vec3:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,normalize:abstract_float_vec4:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,normalize:f16_vec2:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -99804,6 +102710,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,pack2x16float:pack:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -99924,6 +102832,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,pow:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -99966,6 +102876,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,pow:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -100448,6 +103360,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,quantizeToF16:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: [PASS, FAIL]
@@ -100514,6 +103428,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,radians:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -100532,6 +103448,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,radians:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -100610,18 +103528,24 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,reflect:abstract_float_vec3:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,reflect:abstract_float_vec4:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,reflect:f16_vec2:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -100632,6 +103556,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,reflect:f16_vec3:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -100654,6 +103580,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,reflect:f32_vec2:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -100666,6 +103594,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,reflect:f32_vec3:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -100708,12 +103638,16 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,refract:abstract_float_vec4:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: [PASS, FAIL]
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,refract:f16_vec2:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -100724,6 +103658,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,refract:f16_vec3:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
   [:inputSource="storage_r"]
@@ -100746,6 +103682,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,refract:f32_vec2:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -100772,6 +103710,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,refract:f32_vec4:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -101514,6 +104454,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,sign:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -101535,20 +104477,12 @@
   expected:
     if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="storage_r";vectorize="_undef_"]
 
@@ -101858,6 +104792,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,sinh:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -101892,6 +104828,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,sinh:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -101926,6 +104864,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,smoothstep:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -101968,6 +104908,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,smoothstep:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -102126,6 +105068,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,sqrt:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -118874,6 +121818,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,tan:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -192232,8 +195178,6 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,textureGatherCompare:array_2d_coords:*]
-  [:]
-
   [:stage="c";format="depth16unorm";filt="linear";modeU="c";modeV="c";offset=false]
     expected:
       if os == "linux" and not debug: FAIL
@@ -199054,8 +201998,6 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,textureSample:depth_3d_coords:*]
-  [:]
-
   [:format="depth16unorm";viewDimension="cube";filt="linear";mode="c"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -199302,8 +202244,6 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,textureSample:depth_array_3d_coords:*]
-  [:]
-
   [:format="depth16unorm";filt="linear";mode="c"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -235824,8 +238764,6 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,textureSampleBias:arrayed_2d_coords:*]
-  [:]
-
   [:format="astc-10x10-unorm";filt="linear";modeU="c";modeV="c";offset=false]
 
   [:format="astc-10x10-unorm";filt="linear";modeU="c";modeV="c";offset=true]
@@ -427236,6 +430174,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,textureSampleLevel:sampled_array_3d_coords:*]
+  expected:
+    if os == "linux" and not debug: [OK, TIMEOUT]
   [:]
 
   [:stage="c";format="astc-10x10-unorm";filt="linear";mode="c"]
@@ -429663,628 +432603,964 @@
       if os == "linux" and not debug: FAIL
 
   [:stage="v";format="astc-10x10-unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x10-unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x10-unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x10-unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x10-unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x10-unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x10-unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x10-unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x10-unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x10-unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x10-unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x10-unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x5-unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x5-unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x5-unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x5-unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x5-unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x5-unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x5-unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x5-unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x5-unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x5-unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x5-unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x5-unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x6-unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x6-unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x6-unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x6-unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x6-unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x6-unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x6-unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x6-unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x6-unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x6-unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x6-unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x6-unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x8-unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x8-unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x8-unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x8-unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x8-unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x8-unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x8-unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x8-unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x8-unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x8-unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x8-unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-10x8-unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x10-unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x10-unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x10-unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x10-unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x10-unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x10-unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x10-unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x10-unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x10-unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x10-unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x10-unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x10-unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x12-unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x12-unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x12-unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x12-unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x12-unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x12-unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x12-unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x12-unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x12-unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x12-unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x12-unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-12x12-unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-4x4-unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-4x4-unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-4x4-unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-4x4-unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-4x4-unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-4x4-unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-4x4-unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-4x4-unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-4x4-unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-4x4-unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-4x4-unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-4x4-unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x4-unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x4-unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x4-unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x4-unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x4-unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x4-unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x4-unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x4-unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x4-unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x4-unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x4-unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x4-unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x5-unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x5-unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x5-unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x5-unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x5-unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x5-unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x5-unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x5-unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x5-unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x5-unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x5-unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-5x5-unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x5-unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x5-unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x5-unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x5-unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x5-unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x5-unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x5-unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x5-unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x5-unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x5-unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x5-unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x5-unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x6-unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x6-unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x6-unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x6-unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x6-unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x6-unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x6-unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x6-unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x6-unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x6-unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x6-unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-6x6-unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x5-unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x5-unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x5-unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x5-unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x5-unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x5-unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x5-unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x5-unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x5-unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x5-unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x5-unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x5-unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x6-unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x6-unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x6-unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x6-unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x6-unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x6-unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x6-unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x6-unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x6-unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x6-unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x6-unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x6-unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x8-unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x8-unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x8-unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x8-unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x8-unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x8-unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x8-unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x8-unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x8-unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x8-unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x8-unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="astc-8x8-unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="bc1-rgba-unorm";filt="linear";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc1-rgba-unorm";filt="linear";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc1-rgba-unorm";filt="linear";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc1-rgba-unorm";filt="nearest";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc1-rgba-unorm";filt="nearest";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc1-rgba-unorm";filt="nearest";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc1-rgba-unorm-srgb";filt="linear";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc1-rgba-unorm-srgb";filt="linear";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc1-rgba-unorm-srgb";filt="linear";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc1-rgba-unorm-srgb";filt="nearest";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc1-rgba-unorm-srgb";filt="nearest";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc1-rgba-unorm-srgb";filt="nearest";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc2-rgba-unorm";filt="linear";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc2-rgba-unorm";filt="linear";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc2-rgba-unorm";filt="linear";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc2-rgba-unorm";filt="nearest";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc2-rgba-unorm";filt="nearest";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc2-rgba-unorm";filt="nearest";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc2-rgba-unorm-srgb";filt="linear";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc2-rgba-unorm-srgb";filt="linear";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc2-rgba-unorm-srgb";filt="linear";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc2-rgba-unorm-srgb";filt="nearest";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc2-rgba-unorm-srgb";filt="nearest";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc2-rgba-unorm-srgb";filt="nearest";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc3-rgba-unorm";filt="linear";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc3-rgba-unorm";filt="linear";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc3-rgba-unorm";filt="linear";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc3-rgba-unorm";filt="nearest";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc3-rgba-unorm";filt="nearest";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc3-rgba-unorm";filt="nearest";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc3-rgba-unorm-srgb";filt="linear";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc3-rgba-unorm-srgb";filt="linear";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc3-rgba-unorm-srgb";filt="linear";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc3-rgba-unorm-srgb";filt="nearest";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc3-rgba-unorm-srgb";filt="nearest";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc3-rgba-unorm-srgb";filt="nearest";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc4-r-snorm";filt="linear";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc4-r-snorm";filt="linear";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc4-r-snorm";filt="linear";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc4-r-snorm";filt="nearest";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc4-r-snorm";filt="nearest";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc4-r-snorm";filt="nearest";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc4-r-unorm";filt="linear";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc4-r-unorm";filt="linear";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc4-r-unorm";filt="linear";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc4-r-unorm";filt="nearest";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc4-r-unorm";filt="nearest";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc4-r-unorm";filt="nearest";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc5-rg-snorm";filt="linear";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc5-rg-snorm";filt="linear";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc5-rg-snorm";filt="linear";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc5-rg-snorm";filt="nearest";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc5-rg-snorm";filt="nearest";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc5-rg-snorm";filt="nearest";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc5-rg-unorm";filt="linear";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc5-rg-unorm";filt="linear";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc5-rg-unorm";filt="linear";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc5-rg-unorm";filt="nearest";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc5-rg-unorm";filt="nearest";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc5-rg-unorm";filt="nearest";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc7-rgba-unorm";filt="linear";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc7-rgba-unorm";filt="linear";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc7-rgba-unorm";filt="linear";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc7-rgba-unorm";filt="nearest";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc7-rgba-unorm";filt="nearest";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc7-rgba-unorm";filt="nearest";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc7-rgba-unorm-srgb";filt="linear";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc7-rgba-unorm-srgb";filt="linear";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc7-rgba-unorm-srgb";filt="linear";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc7-rgba-unorm-srgb";filt="nearest";mode="c"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc7-rgba-unorm-srgb";filt="nearest";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bc7-rgba-unorm-srgb";filt="nearest";mode="r"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, NOTRUN]
 
   [:stage="v";format="bgra8unorm";filt="linear";mode="c"]
     expected:
@@ -430353,10 +433629,16 @@
       if os == "linux" and not debug: FAIL
 
   [:stage="v";format="depth32float";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="depth32float";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="depth32float";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="depth32float";filt="nearest";mode="c"]
     expected:
@@ -430364,131 +433646,251 @@
 
   [:stage="v";format="depth32float";filt="nearest";mode="m"]
     expected:
-      if os == "linux" and not debug: FAIL
+      if os == "linux" and not debug: [FAIL, TIMEOUT]
 
   [:stage="v";format="depth32float";filt="nearest";mode="r"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:stage="v";format="eac-r11snorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-r11snorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-r11snorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-r11snorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-r11snorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-r11snorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-r11unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-r11unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-r11unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-r11unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-r11unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-r11unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-rg11snorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-rg11snorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-rg11snorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-rg11snorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-rg11snorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-rg11snorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-rg11unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-rg11unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-rg11unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-rg11unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-rg11unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="eac-rg11unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8a1unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8a1unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8a1unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8a1unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8a1unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8a1unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8a1unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8a1unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8a1unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8a1unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8a1unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8a1unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgb8unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgba8unorm";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgba8unorm";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgba8unorm";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgba8unorm";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgba8unorm";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgba8unorm";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgba8unorm-srgb";filt="linear";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgba8unorm-srgb";filt="linear";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgba8unorm-srgb";filt="linear";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgba8unorm-srgb";filt="nearest";mode="c"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgba8unorm-srgb";filt="nearest";mode="m"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="etc2-rgba8unorm-srgb";filt="nearest";mode="r"]
+    expected:
+      if os == "linux" and not debug: [PASS, NOTRUN]
 
   [:stage="v";format="r16float";filt="linear";mode="c"]
     expected:
@@ -430883,76 +434285,42 @@
   [:dim="1d";coords="i32";mipCount=1;mip=0]
 
   [:dim="1d";coords="u32";mipCount=1;mip=0]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="2d";coords="i32";mipCount=1;mip=0]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="2d";coords="i32";mipCount=2;mip=0]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="2d";coords="i32";mipCount=2;mip=1]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="2d";coords="i32";mipCount=3;mip=0]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="2d";coords="i32";mipCount=3;mip=1]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="2d";coords="i32";mipCount=3;mip=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="2d";coords="u32";mipCount=1;mip=0]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="2d";coords="u32";mipCount=2;mip=0]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="2d";coords="u32";mipCount=2;mip=1]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="2d";coords="u32";mipCount=3;mip=0]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="2d";coords="u32";mipCount=3;mip=1]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="2d";coords="u32";mipCount=3;mip=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="3d";coords="i32";mipCount=1;mip=0]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="3d";coords="i32";mipCount=2;mip=0]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="3d";coords="i32";mipCount=2;mip=1]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:dim="3d";coords="u32";mipCount=1;mip=0]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="3d";coords="u32";mipCount=2;mip=0]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:dim="3d";coords="u32";mipCount=2;mip=1]
     expected:
@@ -430969,44 +434337,24 @@
       if os == "linux" and not debug: FAIL
 
   [:baseLevel=0;arrayLevels=2;type="i32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:baseLevel=0;arrayLevels=2;type="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:baseLevel=0;arrayLevels=3;type="i32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:baseLevel=0;arrayLevels=3;type="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:baseLevel=0;arrayLevels=4;type="i32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:baseLevel=0;arrayLevels=4;type="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:baseLevel=1;arrayLevels=2;type="i32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:baseLevel=1;arrayLevels=2;type="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:baseLevel=1;arrayLevels=3;type="i32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:baseLevel=1;arrayLevels=3;type="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,textureStore:store_1d_coords:*]
@@ -431182,6 +434530,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,transpose:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";cols=2;rows=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -431220,6 +434570,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,transpose:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";cols=2;rows=2]
 
   [:inputSource="const";cols=2;rows=3]
@@ -431294,6 +434646,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,transpose:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";cols=2;rows=2]
     expected:
       if os == "linux" and not debug: FAIL
@@ -431386,6 +434740,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,trunc:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -431476,6 +434832,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,unpack2x16float:unpack:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -431552,15 +434910,9 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,unpack4xU8:basic:*]
-  [:inputSource="const"]
-    expected:
-      if os == "linux" and not debug: FAIL
-
-  [:inputSource="storage_r"]
-
-  [:inputSource="storage_rw"]
-
-  [:inputSource="uniform"]
+  disabled: true
+  expected:
+    if os == "linux" and not debug: SKIP
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,workgroupBarrier:barrier:*]
@@ -431577,20 +434929,12 @@
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,workgroupUniformLoad:types:*]
   [:type="ComplexStruct";wgsize=[1,128\]]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="ComplexStruct";wgsize=[1,1\]]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="ComplexStruct";wgsize=[16,16\]]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="ComplexStruct";wgsize=[3,7\]]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="SimpleStruct";wgsize=[1,128\]]
 
@@ -436521,40 +439865,22 @@
   [:type="f16";width=4]
 
   [:type="f32";width=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="f32";width=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="f32";width=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="i32";width=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="i32";width=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="i32";width=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="u32";width=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="u32";width=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="u32";width=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,precedence:precedence:*]
@@ -438474,31 +441800,25 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,af_assignment:f32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,ai_arithmetic:negation:*]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,ai_assignment:abstract:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,ai_assignment:i32:*]
@@ -438508,43 +441828,31 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,ai_assignment:u32:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const"]
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,ai_complement:complement:*]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,bool_conversion:bool:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: [PASS, FAIL]
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: [PASS, FAIL]
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: [PASS, FAIL]
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: [PASS, FAIL]
 
   [:inputSource="storage_r";vectorize="_undef_"]
 
@@ -438756,6 +442064,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,f16_arithmetic:negation:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -438800,6 +442110,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,f16_conversion:abstract_float_mat:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";cols=2;rows=2]
 
   [:inputSource="const";cols=2;rows=3]
@@ -438832,6 +442144,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,f16_conversion:bool:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -439012,6 +442326,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,f16_conversion:f32_mat:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";cols=2;rows=2]
 
   [:inputSource="const";cols=2;rows=3]
@@ -439158,6 +442474,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,f32_arithmetic:negation:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -439192,6 +442510,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,f32_conversion:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -439418,6 +442738,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,f32_conversion:f32_mat:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";cols=2;rows=2]
 
   [:inputSource="const";cols=2;rows=3]
@@ -439642,21 +442964,15 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,i32_conversion:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,i32_conversion:abstract_int:*]
@@ -439745,12 +443061,20 @@
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,i32_conversion:f32:*]
   [:inputSource="const";vectorize="_undef_"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=2]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=3]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=4]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:inputSource="storage_r";vectorize="_undef_"]
     expected:
@@ -439914,24 +443238,20 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,u32_conversion:abstract_float:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inputSource="const";vectorize=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,u32_conversion:abstract_int:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -440002,6 +443322,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,unary,u32_conversion:f16:*]
+  expected:
+    if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
 
   [:inputSource="const";vectorize=2]
@@ -440039,12 +443361,20 @@
   expected:
     if os == "linux" and not debug: [OK, CRASH]
   [:inputSource="const";vectorize="_undef_"]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:inputSource="const";vectorize=2]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:inputSource="const";vectorize=3]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:inputSource="const";vectorize=4]
+    expected:
+      if os == "linux" and not debug: [PASS, FAIL]
 
   [:inputSource="storage_r";vectorize="_undef_"]
     expected:
@@ -440893,8 +444223,6 @@
 
 [cts.https.html?q=webgpu:shader,execution,limits:nesting_depth_braces:*]
   [:]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,limits:nesting_depth_composite_array:*]
@@ -440927,8 +444255,6 @@
 
 [cts.https.html?q=webgpu:shader,execution,limits:switch_case_selectors:*]
   [:]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,limits:switch_case_selectors_same_clause:*]
@@ -440946,19 +444272,11 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,limits:workgroup_array_byte_size_override:*]
-  expected:
-    if os == "linux" and not debug: CRASH
   [:type="bool"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="vec4u"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,memory_layout:read_layout:*]
@@ -441026,6 +444344,8 @@
 
 
 [cts.https.html?q=webgpu:shader,execution,memory_model,barrier:workgroup_barrier_store_load:*]
+  expected:
+    if os == "linux" and not debug: [OK, TIMEOUT]
   [:accessValueType="f16";memType="non_atomic_storage";accessPair="wr";normalBarrier=false]
 
   [:accessValueType="f16";memType="non_atomic_storage";accessPair="wr";normalBarrier=true]
@@ -441970,10 +445290,6 @@
 
   [:nearFar=[0,1\];sampleCount=1;interpolation={"type":"flat","sampling":"first"}]
 
-  [:nearFar=[0,1\];sampleCount=1;interpolation={"type":"flat"}]
-    expected:
-      if os == "linux" and not debug: FAIL
-
   [:nearFar=[0,1\];sampleCount=1;interpolation={"type":"linear","sampling":"center"}]
 
   [:nearFar=[0,1\];sampleCount=1;interpolation={"type":"linear","sampling":"centroid"}]
@@ -441994,10 +445310,6 @@
     expected:
       if os == "linux" and not debug: FAIL
 
-  [:nearFar=[0,1\];sampleCount=4;interpolation={"type":"flat"}]
-    expected:
-      if os == "linux" and not debug: FAIL
-
   [:nearFar=[0,1\];sampleCount=4;interpolation={"type":"linear","sampling":"center"}]
     expected:
       if os == "linux" and not debug: FAIL
@@ -442026,10 +445338,6 @@
 
   [:nearFar=[0.25,0.75\];sampleCount=1;interpolation={"type":"flat","sampling":"first"}]
 
-  [:nearFar=[0.25,0.75\];sampleCount=1;interpolation={"type":"flat"}]
-    expected:
-      if os == "linux" and not debug: FAIL
-
   [:nearFar=[0.25,0.75\];sampleCount=1;interpolation={"type":"linear","sampling":"center"}]
 
   [:nearFar=[0.25,0.75\];sampleCount=1;interpolation={"type":"linear","sampling":"centroid"}]
@@ -442050,10 +445358,6 @@
     expected:
       if os == "linux" and not debug: FAIL
 
-  [:nearFar=[0.25,0.75\];sampleCount=4;interpolation={"type":"flat"}]
-    expected:
-      if os == "linux" and not debug: FAIL
-
   [:nearFar=[0.25,0.75\];sampleCount=4;interpolation={"type":"linear","sampling":"center"}]
     expected:
       if os == "linux" and not debug: FAIL
@@ -442277,8 +445581,6 @@
 
 [cts.https.html?q=webgpu:shader,execution,shadow:declaration:*]
   [:]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,shadow:for_loop:*]
@@ -442595,62 +445897,38 @@
 
 [cts.https.html?q=webgpu:shader,validation,const_assert,const_assert:constant_expression_assert:*]
   [:scope="function"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:scope="module"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,const_assert,const_assert:constant_expression_logical_and_assert:*]
   [:scope="function"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:scope="module"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,const_assert,const_assert:constant_expression_logical_and_no_assert:*]
   [:scope="function"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:scope="module"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,const_assert,const_assert:constant_expression_logical_or_assert:*]
   [:scope="function"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:scope="module"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,const_assert,const_assert:constant_expression_logical_or_no_assert:*]
   [:scope="function"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:scope="module"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,const_assert,const_assert:constant_expression_no_assert:*]
   [:scope="function"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:scope="module"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,const_assert,const_assert:evaluation_stage:*]
@@ -442789,16 +446067,10 @@
 
 [cts.https.html?q=webgpu:shader,validation,decl,const:type:*]
   [:case="abstract_float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="abstract_int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="array_abstract_int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="array_runtime"]
 
@@ -442829,8 +446101,6 @@
   [:case="vec4f"]
 
   [:case="vec_abstract_int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,decl,context_dependent_resolution:attribute_names:*]
@@ -443019,8 +446289,6 @@
   [:case="array_runtime"]
 
   [:case="array_sized"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="atomic"]
 
@@ -444839,20 +448107,14 @@
       if os == "linux" and not debug: FAIL
 
   [:case="override_oob_neg"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="override_oob_pos"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="runtime_array_const_oob_neg"]
 
   [:case="runtime_array_override_oob_neg"]
 
   [:case="runtime_in_bounds"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="runtime_oob_neg"]
     expected:
@@ -444977,20 +448239,14 @@
       if os == "linux" and not debug: FAIL
 
   [:case="override_oob_neg"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="override_oob_pos"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="runtime_array_const_oob_neg"]
 
   [:case="runtime_array_override_oob_neg"]
 
   [:case="runtime_in_bounds"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="runtime_oob_neg"]
     expected:
@@ -445073,14 +448329,10 @@
   [:vector_width=2;abstract_type="int";concrete_type="f16"]
 
   [:vector_width=2;abstract_type="int";concrete_type="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:vector_width=2;abstract_type="int";concrete_type="i32"]
 
   [:vector_width=2;abstract_type="int";concrete_type="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:vector_width=3;abstract_type="float";concrete_type="f16"]
 
@@ -445093,14 +448345,10 @@
   [:vector_width=3;abstract_type="int";concrete_type="f16"]
 
   [:vector_width=3;abstract_type="int";concrete_type="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:vector_width=3;abstract_type="int";concrete_type="i32"]
 
   [:vector_width=3;abstract_type="int";concrete_type="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:vector_width=4;abstract_type="float";concrete_type="f16"]
 
@@ -445113,14 +448361,10 @@
   [:vector_width=4;abstract_type="int";concrete_type="f16"]
 
   [:vector_width=4;abstract_type="int";concrete_type="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:vector_width=4;abstract_type="int";concrete_type="i32"]
 
   [:vector_width=4;abstract_type="int";concrete_type="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,access,vector:concrete:*]
@@ -445339,8 +448583,6 @@
   [:op="add";type="texture";control=false]
 
   [:op="add";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="mul";type="array";control=false]
 
@@ -445369,8 +448611,6 @@
   [:op="mul";type="texture";control=false]
 
   [:op="mul";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="sub";type="array";control=false]
 
@@ -445399,8 +448639,6 @@
   [:op="sub";type="texture";control=false]
 
   [:op="sub";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,binary,add_sub_mul:scalar_vector:*]
@@ -445409,8 +448647,6 @@
   [:lhs="abstract-float";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="abstract-float";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-float";rhs="abstract-int";compound_assignment=true]
 
@@ -445439,8 +448675,6 @@
   [:lhs="abstract-float";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="abstract-float";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-float";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
 
@@ -445465,8 +448699,6 @@
   [:lhs="abstract-float";rhs="vec2%3Cu32%3E";compound_assignment=true]
 
   [:lhs="abstract-int";rhs="abstract-float";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="abstract-float";compound_assignment=true]
 
@@ -445483,8 +448715,6 @@
   [:lhs="abstract-int";rhs="f16";compound_assignment=true]
 
   [:lhs="abstract-int";rhs="f32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="f32";compound_assignment=true]
 
@@ -445493,14 +448723,10 @@
   [:lhs="abstract-int";rhs="i32";compound_assignment=true]
 
   [:lhs="abstract-int";rhs="u32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="u32";compound_assignment=true]
 
   [:lhs="abstract-int";rhs="vec2%3Cabstract-float%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
@@ -445517,8 +448743,6 @@
   [:lhs="abstract-int";rhs="vec2%3Cf16%3E";compound_assignment=true]
 
   [:lhs="abstract-int";rhs="vec2%3Cf32%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="vec2%3Cf32%3E";compound_assignment=true]
 
@@ -445527,8 +448751,6 @@
   [:lhs="abstract-int";rhs="vec2%3Ci32%3E";compound_assignment=true]
 
   [:lhs="abstract-int";rhs="vec2%3Cu32%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="vec2%3Cu32%3E";compound_assignment=true]
 
@@ -445649,8 +448871,6 @@
   [:lhs="f32";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="f32";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="f32";rhs="abstract-int";compound_assignment=true]
 
@@ -445679,8 +448899,6 @@
   [:lhs="f32";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="f32";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="f32";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
 
@@ -445765,8 +448983,6 @@
   [:lhs="u32";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="u32";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="u32";rhs="abstract-int";compound_assignment=true]
 
@@ -445795,8 +449011,6 @@
   [:lhs="u32";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="u32";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="u32";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
 
@@ -445825,8 +449039,6 @@
   [:lhs="vec2%3Cabstract-float%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -445855,8 +449067,6 @@
   [:lhs="vec2%3Cabstract-float%3E";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
 
@@ -445881,8 +449091,6 @@
   [:lhs="vec2%3Cabstract-float%3E";rhs="vec2%3Cu32%3E";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="abstract-float";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="abstract-float";compound_assignment=true]
 
@@ -445899,8 +449107,6 @@
   [:lhs="vec2%3Cabstract-int%3E";rhs="f16";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="f32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="f32";compound_assignment=true]
 
@@ -445909,14 +449115,10 @@
   [:lhs="vec2%3Cabstract-int%3E";rhs="i32";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="u32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="u32";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cabstract-float%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
@@ -445933,8 +449135,6 @@
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cf16%3E";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cf32%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cf32%3E";compound_assignment=true]
 
@@ -445943,8 +449143,6 @@
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Ci32%3E";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cu32%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cu32%3E";compound_assignment=true]
 
@@ -446065,8 +449263,6 @@
   [:lhs="vec2%3Cf32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec2%3Cf32%3E";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cf32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -446095,8 +449291,6 @@
   [:lhs="vec2%3Cf32%3E";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="vec2%3Cf32%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cf32%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
 
@@ -446181,8 +449375,6 @@
   [:lhs="vec2%3Cu32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec2%3Cu32%3E";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cu32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -446211,8 +449403,6 @@
   [:lhs="vec2%3Cu32%3E";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="vec2%3Cu32%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cu32%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
 
@@ -446241,8 +449431,6 @@
   [:lhs="vec3%3Cabstract-float%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec3%3Cabstract-float%3E";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-float%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -446295,8 +449483,6 @@
   [:lhs="vec3%3Cabstract-float%3E";rhs="vec2%3Cu32%3E";compound_assignment=true]
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="abstract-float";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="abstract-float";compound_assignment=true]
 
@@ -446313,8 +449499,6 @@
   [:lhs="vec3%3Cabstract-int%3E";rhs="f16";compound_assignment=true]
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="f32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="f32";compound_assignment=true]
 
@@ -446323,8 +449507,6 @@
   [:lhs="vec3%3Cabstract-int%3E";rhs="i32";compound_assignment=true]
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="u32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="u32";compound_assignment=true]
 
@@ -446473,8 +449655,6 @@
   [:lhs="vec3%3Cf32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec3%3Cf32%3E";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cf32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -446587,8 +449767,6 @@
   [:lhs="vec3%3Cu32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec3%3Cu32%3E";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cu32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -446645,8 +449823,6 @@
   [:lhs="vec4%3Cabstract-float%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec4%3Cabstract-float%3E";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-float%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -446699,8 +449875,6 @@
   [:lhs="vec4%3Cabstract-float%3E";rhs="vec2%3Cu32%3E";compound_assignment=true]
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="abstract-float";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="abstract-float";compound_assignment=true]
 
@@ -446717,8 +449891,6 @@
   [:lhs="vec4%3Cabstract-int%3E";rhs="f16";compound_assignment=true]
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="f32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="f32";compound_assignment=true]
 
@@ -446727,8 +449899,6 @@
   [:lhs="vec4%3Cabstract-int%3E";rhs="i32";compound_assignment=true]
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="u32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="u32";compound_assignment=true]
 
@@ -446877,8 +450047,6 @@
   [:lhs="vec4%3Cf32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec4%3Cf32%3E";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cf32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -446991,8 +450159,6 @@
   [:lhs="vec4%3Cu32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec4%3Cu32%3E";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cu32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -447289,8 +450455,6 @@
   [:op="and";type="texture";control=false]
 
   [:op="and";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="or";type="array";control=false]
 
@@ -447323,8 +450487,6 @@
   [:op="or";type="texture";control=false]
 
   [:op="or";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="xor";type="array";control=false]
 
@@ -447357,8 +450519,6 @@
   [:op="xor";type="texture";control=false]
 
   [:op="xor";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,binary,and_or_xor:scalar_vector:*]
@@ -447443,8 +450603,6 @@
   [:lhs="abstract-int";rhs="i32";compound_assignment=true]
 
   [:lhs="abstract-int";rhs="u32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="u32";compound_assignment=true]
 
@@ -447477,6 +450635,8 @@
   [:lhs="abstract-int";rhs="vec2%3Ci32%3E";compound_assignment=true]
 
   [:lhs="abstract-int";rhs="vec2%3Cu32%3E";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="vec2%3Cu32%3E";compound_assignment=true]
 
@@ -447715,8 +450875,6 @@
   [:lhs="u32";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="u32";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="u32";rhs="abstract-int";compound_assignment=true]
 
@@ -447745,6 +450903,8 @@
   [:lhs="u32";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="u32";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="u32";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
 
@@ -447855,6 +451015,8 @@
   [:lhs="vec2%3Cabstract-int%3E";rhs="i32";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="u32";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="u32";compound_assignment=true]
 
@@ -447883,8 +451045,6 @@
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Ci32%3E";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cu32%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cu32%3E";compound_assignment=true]
 
@@ -448123,6 +451283,8 @@
   [:lhs="vec2%3Cu32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec2%3Cu32%3E";rhs="abstract-int";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cu32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -448153,8 +451315,6 @@
   [:lhs="vec2%3Cu32%3E";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="vec2%3Cu32%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cu32%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
 
@@ -448263,6 +451423,8 @@
   [:lhs="vec3%3Cabstract-int%3E";rhs="i32";compound_assignment=true]
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="u32";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="u32";compound_assignment=true]
 
@@ -448527,6 +451689,8 @@
   [:lhs="vec3%3Cu32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec3%3Cu32%3E";rhs="abstract-int";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cu32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -448665,6 +451829,8 @@
   [:lhs="vec4%3Cabstract-int%3E";rhs="i32";compound_assignment=true]
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="u32";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="u32";compound_assignment=true]
 
@@ -448929,6 +452095,8 @@
   [:lhs="vec4%3Cu32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec4%3Cu32%3E";rhs="abstract-int";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cu32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -449015,8 +452183,6 @@
   [:op="%3C%3C";type="texture";control=false]
 
   [:op="%3C%3C";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="%3E%3E";type="array";control=false]
 
@@ -449049,8 +452215,6 @@
   [:op="%3E%3E";type="texture";control=false]
 
   [:op="%3E%3E";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,binary,bitwise_shift:partial_eval_errors:*]
@@ -449133,8 +452297,6 @@
   [:lhs="abstract-int";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="abstract-int";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="abstract-int";compound_assignment=true]
 
@@ -449359,8 +452521,6 @@
   [:lhs="i32";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="i32";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="i32";rhs="abstract-int";compound_assignment=true]
 
@@ -449417,8 +452577,6 @@
   [:lhs="u32";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="u32";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="u32";rhs="abstract-int";compound_assignment=true]
 
@@ -449447,6 +452605,8 @@
   [:lhs="u32";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="u32";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="u32";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
 
@@ -449533,6 +452693,8 @@
   [:lhs="vec2%3Cabstract-int%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="abstract-int";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -449563,8 +452725,6 @@
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
 
@@ -449761,6 +452921,8 @@
   [:lhs="vec2%3Ci32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec2%3Ci32%3E";rhs="abstract-int";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Ci32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -449791,8 +452953,6 @@
   [:lhs="vec2%3Ci32%3E";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="vec2%3Ci32%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Ci32%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
 
@@ -449821,6 +452981,8 @@
   [:lhs="vec2%3Cu32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec2%3Cu32%3E";rhs="abstract-int";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cu32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -449851,8 +453013,6 @@
   [:lhs="vec2%3Cu32%3E";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="vec2%3Cu32%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cu32%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
 
@@ -449937,6 +453097,8 @@
   [:lhs="vec3%3Cabstract-int%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="abstract-int";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -450163,6 +453325,8 @@
   [:lhs="vec3%3Ci32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec3%3Ci32%3E";rhs="abstract-int";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Ci32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -450221,6 +453385,8 @@
   [:lhs="vec3%3Cu32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec3%3Cu32%3E";rhs="abstract-int";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cu32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -450335,6 +453501,8 @@
   [:lhs="vec4%3Cabstract-int%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="abstract-int";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -450561,6 +453729,8 @@
   [:lhs="vec4%3Ci32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec4%3Ci32%3E";rhs="abstract-int";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Ci32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -450619,6 +453789,8 @@
   [:lhs="vec4%3Cu32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec4%3Cu32%3E";rhs="abstract-int";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cu32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -450675,8 +453847,6 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,binary,bitwise_shift:shift_left_abstract:*]
   [:]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,binary,bitwise_shift:shift_left_concrete:*]
@@ -450907,8 +454077,6 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,binary,bitwise_shift:shift_right_abstract:*]
   [:]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,binary,bitwise_shift:shift_right_concrete:*]
@@ -451049,8 +454217,6 @@
   [:op="eq";type="texture";control=false]
 
   [:op="eq";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="ge";type="array";control=false]
 
@@ -451083,8 +454249,6 @@
   [:op="ge";type="texture";control=false]
 
   [:op="ge";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="gt";type="array";control=false]
 
@@ -451117,8 +454281,6 @@
   [:op="gt";type="texture";control=false]
 
   [:op="gt";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="le";type="array";control=false]
 
@@ -451151,8 +454313,6 @@
   [:op="le";type="texture";control=false]
 
   [:op="le";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="lt";type="array";control=false]
 
@@ -451185,8 +454345,6 @@
   [:op="lt";type="texture";control=false]
 
   [:op="lt";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="ne";type="array";control=false]
 
@@ -451219,8 +454377,6 @@
   [:op="ne";type="texture";control=false]
 
   [:op="ne";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,binary,comparison:scalar_vector:*]
@@ -451245,8 +454401,12 @@
       if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-float";rhs="vec2%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-float";rhs="vec2%3Cabstract-int%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-float";rhs="vec2%3Cbool%3E"]
     expected:
@@ -451277,8 +454437,12 @@
   [:lhs="abstract-int";rhs="u32"]
 
   [:lhs="abstract-int";rhs="vec2%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="vec2%3Cabstract-int%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="vec2%3Cbool%3E"]
     expected:
@@ -451319,8 +454483,12 @@
       if os == "linux" and not debug: FAIL
 
   [:lhs="bool";rhs="vec2%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="bool";rhs="vec2%3Cabstract-int%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="bool";rhs="vec2%3Cbool%3E"]
     expected:
@@ -451421,6 +454589,8 @@
       if os == "linux" and not debug: FAIL
 
   [:lhs="i32";rhs="vec2%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="i32";rhs="vec2%3Cabstract-int%3E"]
 
@@ -451459,6 +454629,8 @@
   [:lhs="u32";rhs="u32"]
 
   [:lhs="u32";rhs="vec2%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="u32";rhs="vec2%3Cabstract-int%3E"]
 
@@ -451475,18 +454647,28 @@
   [:lhs="u32";rhs="vec2%3Cu32%3E"]
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="abstract-int"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="bool"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="f16"]
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="f32"]
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="i32"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="u32"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="vec2%3Cabstract-float%3E"]
 
@@ -451509,10 +454691,16 @@
       if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="abstract-int"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="bool"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="f16"]
 
@@ -451725,18 +454913,28 @@
   [:lhs="vec2%3Cu32%3E";rhs="vec2%3Cu32%3E"]
 
   [:lhs="vec3%3Cabstract-float%3E";rhs="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-float%3E";rhs="abstract-int"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-float%3E";rhs="bool"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-float%3E";rhs="f16"]
 
   [:lhs="vec3%3Cabstract-float%3E";rhs="f32"]
 
   [:lhs="vec3%3Cabstract-float%3E";rhs="i32"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-float%3E";rhs="u32"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-float%3E";rhs="vec2%3Cabstract-float%3E"]
 
@@ -451753,10 +454951,16 @@
   [:lhs="vec3%3Cabstract-float%3E";rhs="vec2%3Cu32%3E"]
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="abstract-int"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="bool"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="f16"]
 
@@ -451933,18 +455137,28 @@
   [:lhs="vec3%3Cu32%3E";rhs="vec2%3Cu32%3E"]
 
   [:lhs="vec4%3Cabstract-float%3E";rhs="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-float%3E";rhs="abstract-int"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-float%3E";rhs="bool"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-float%3E";rhs="f16"]
 
   [:lhs="vec4%3Cabstract-float%3E";rhs="f32"]
 
   [:lhs="vec4%3Cabstract-float%3E";rhs="i32"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-float%3E";rhs="u32"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-float%3E";rhs="vec2%3Cabstract-float%3E"]
 
@@ -451961,10 +455175,16 @@
   [:lhs="vec4%3Cabstract-float%3E";rhs="vec2%3Cu32%3E"]
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="abstract-int"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="bool"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="f16"]
 
@@ -452169,8 +455389,6 @@
   [:op="div";type="texture";control=false]
 
   [:op="div";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="rem";type="array";control=false]
 
@@ -452199,12 +455417,12 @@
   [:op="rem";type="texture";control=false]
 
   [:op="rem";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,binary,div_rem:scalar_vector:*]
   [:lhs="abstract-float";rhs="abstract-float";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-float";rhs="abstract-float";compound_assignment=true]
 
@@ -452235,6 +455453,8 @@
   [:lhs="abstract-float";rhs="u32";compound_assignment=true]
 
   [:lhs="abstract-float";rhs="vec2%3Cabstract-float%3E";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-float";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
@@ -452285,8 +455505,6 @@
   [:lhs="abstract-int";rhs="f16";compound_assignment=true]
 
   [:lhs="abstract-int";rhs="f32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="f32";compound_assignment=true]
 
@@ -452297,8 +455515,6 @@
       if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="u32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="u32";compound_assignment=true]
 
@@ -452321,8 +455537,6 @@
   [:lhs="abstract-int";rhs="vec2%3Cf16%3E";compound_assignment=true]
 
   [:lhs="abstract-int";rhs="vec2%3Cf32%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="vec2%3Cf32%3E";compound_assignment=true]
 
@@ -452331,8 +455545,6 @@
   [:lhs="abstract-int";rhs="vec2%3Ci32%3E";compound_assignment=true]
 
   [:lhs="abstract-int";rhs="vec2%3Cu32%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="abstract-int";rhs="vec2%3Cu32%3E";compound_assignment=true]
 
@@ -452453,8 +455665,6 @@
   [:lhs="f32";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="f32";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="f32";rhs="abstract-int";compound_assignment=true]
 
@@ -452483,8 +455693,6 @@
   [:lhs="f32";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="f32";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="f32";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
 
@@ -452573,8 +455781,6 @@
   [:lhs="u32";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="u32";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="u32";rhs="abstract-int";compound_assignment=true]
     expected:
@@ -452607,8 +455813,6 @@
   [:lhs="u32";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="u32";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="u32";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
 
@@ -452633,6 +455837,8 @@
   [:lhs="u32";rhs="vec2%3Cu32%3E";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="abstract-float";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="abstract-float";compound_assignment=true]
 
@@ -452663,6 +455869,8 @@
   [:lhs="vec2%3Cabstract-float%3E";rhs="u32";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="vec2%3Cabstract-float%3E";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-float%3E";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
@@ -452713,8 +455921,6 @@
   [:lhs="vec2%3Cabstract-int%3E";rhs="f16";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="f32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="f32";compound_assignment=true]
 
@@ -452725,8 +455931,6 @@
       if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="u32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="u32";compound_assignment=true]
 
@@ -452751,8 +455955,6 @@
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cf16%3E";compound_assignment=true]
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cf32%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cf32%3E";compound_assignment=true]
 
@@ -452763,8 +455965,6 @@
       if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cu32%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cabstract-int%3E";rhs="vec2%3Cu32%3E";compound_assignment=true]
 
@@ -452885,8 +456085,6 @@
   [:lhs="vec2%3Cf32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec2%3Cf32%3E";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cf32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -452915,8 +456113,6 @@
   [:lhs="vec2%3Cf32%3E";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="vec2%3Cf32%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cf32%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
 
@@ -453009,8 +456205,6 @@
   [:lhs="vec2%3Cu32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec2%3Cu32%3E";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cu32%3E";rhs="abstract-int";compound_assignment=true]
     expected:
@@ -453043,8 +456237,6 @@
   [:lhs="vec2%3Cu32%3E";rhs="vec2%3Cabstract-float%3E";compound_assignment=true]
 
   [:lhs="vec2%3Cu32%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec2%3Cu32%3E";rhs="vec2%3Cabstract-int%3E";compound_assignment=true]
     expected:
@@ -453073,6 +456265,8 @@
       if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-float%3E";rhs="abstract-float";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-float%3E";rhs="abstract-float";compound_assignment=true]
 
@@ -453151,8 +456345,6 @@
   [:lhs="vec3%3Cabstract-int%3E";rhs="f16";compound_assignment=true]
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="f32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="f32";compound_assignment=true]
 
@@ -453163,8 +456355,6 @@
       if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="u32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cabstract-int%3E";rhs="u32";compound_assignment=true]
 
@@ -453313,8 +456503,6 @@
   [:lhs="vec3%3Cf32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec3%3Cf32%3E";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cf32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -453431,8 +456619,6 @@
   [:lhs="vec3%3Cu32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec3%3Cu32%3E";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec3%3Cu32%3E";rhs="abstract-int";compound_assignment=true]
     expected:
@@ -453489,6 +456675,8 @@
   [:lhs="vec3%3Cu32%3E";rhs="vec2%3Cu32%3E";compound_assignment=true]
 
   [:lhs="vec4%3Cabstract-float%3E";rhs="abstract-float";compound_assignment=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-float%3E";rhs="abstract-float";compound_assignment=true]
 
@@ -453567,8 +456755,6 @@
   [:lhs="vec4%3Cabstract-int%3E";rhs="f16";compound_assignment=true]
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="f32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="f32";compound_assignment=true]
 
@@ -453579,8 +456765,6 @@
       if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="u32";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cabstract-int%3E";rhs="u32";compound_assignment=true]
 
@@ -453729,8 +456913,6 @@
   [:lhs="vec4%3Cf32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec4%3Cf32%3E";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cf32%3E";rhs="abstract-int";compound_assignment=true]
 
@@ -453847,8 +457029,6 @@
   [:lhs="vec4%3Cu32%3E";rhs="abstract-float";compound_assignment=true]
 
   [:lhs="vec4%3Cu32%3E";rhs="abstract-int";compound_assignment=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:lhs="vec4%3Cu32%3E";rhs="abstract-int";compound_assignment=true]
     expected:
@@ -454121,8 +457301,6 @@
   [:op="%26%26";rhs="sqrt_neg1";control=false]
 
   [:op="%26%26";rhs="sqrt_neg1";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="%7C%7C";rhs="negative";control=false]
 
@@ -454135,8 +457313,6 @@
   [:op="%7C%7C";rhs="sqrt_neg1";control=false]
 
   [:op="%7C%7C";rhs="sqrt_neg1";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,binary,short_circuiting_and_or:invalid_rhs_const:*]
@@ -454209,8 +457385,6 @@
       if os == "linux" and not debug: FAIL
 
   [:op="%26%26";rhs="overflow";short_circuit=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="%26%26";rhs="overflow";short_circuit=true]
     expected:
@@ -454235,8 +457409,6 @@
       if os == "linux" and not debug: FAIL
 
   [:op="%7C%7C";rhs="overflow";short_circuit=false]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="%7C%7C";rhs="overflow";short_circuit=true]
     expected:
@@ -454273,8 +457445,6 @@
   [:op="%26%26";type="texture";control=false]
 
   [:op="%26%26";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="%7C%7C";type="array";control=false]
 
@@ -454305,8 +457475,6 @@
   [:op="%7C%7C";type="texture";control=false]
 
   [:op="%7C%7C";type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,binary,short_circuiting_and_or:scalar_vector:*]
@@ -454585,8 +457753,6 @@
   [:op="%26%26";lhs="vec2%3Cbool%3E";rhs="vec2%3Cabstract-int%3E"]
 
   [:op="%26%26";lhs="vec2%3Cbool%3E";rhs="vec2%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="%26%26";lhs="vec2%3Cbool%3E";rhs="vec2%3Cf16%3E"]
 
@@ -455379,8 +458545,6 @@
   [:op="%7C%7C";lhs="vec2%3Cbool%3E";rhs="vec2%3Cabstract-int%3E"]
 
   [:op="%7C%7C";lhs="vec2%3Cbool%3E";rhs="vec2%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:op="%7C%7C";lhs="vec2%3Cbool%3E";rhs="vec2%3Cf16%3E"]
 
@@ -455943,12 +459107,8 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,abs:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
@@ -455959,12 +459119,8 @@
   [:stage="constant";type="u32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
@@ -455975,12 +459131,8 @@
   [:stage="constant";type="vec2%3Cu32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
@@ -455991,12 +459143,8 @@
   [:stage="constant";type="vec3%3Cu32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -456081,6 +459229,8 @@
   [:test="matrix"]
 
   [:test="must_use"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:test="no_params"]
 
@@ -456101,8 +459251,6 @@
   [:test="u32"]
 
   [:test="valid"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:test="vec_bool"]
 
@@ -456115,6 +459263,8 @@
   expected:
     if os == "linux" and not debug: [OK, TIMEOUT]
   [:stage="constant";type="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
     expected:
@@ -456125,6 +459275,8 @@
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
     expected:
@@ -456135,6 +459287,8 @@
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
     expected:
@@ -456145,6 +459299,8 @@
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
     expected:
@@ -456211,6 +459367,8 @@
   [:test="matrix"]
 
   [:test="must_use"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:test="no_params"]
 
@@ -456231,8 +459389,6 @@
   [:test="u32"]
 
   [:test="valid"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:test="vec_bool"]
 
@@ -456711,6 +459867,8 @@
   [:test="matrix"]
 
   [:test="must_use"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:test="no_params"]
 
@@ -456731,8 +459889,6 @@
   [:test="u32"]
 
   [:test="valid"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:test="vec_bool"]
 
@@ -456743,6 +459899,8 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,asin:values:*]
   [:stage="constant";type="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
     expected:
@@ -456753,6 +459911,8 @@
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
     expected:
@@ -456763,6 +459923,8 @@
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
     expected:
@@ -456773,6 +459935,8 @@
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
     expected:
@@ -456837,6 +460001,8 @@
   [:test="matrix"]
 
   [:test="must_use"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:test="no_params"]
 
@@ -456857,8 +460023,6 @@
   [:test="u32"]
 
   [:test="valid"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:test="vec_bool"]
 
@@ -456869,12 +460033,8 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,asinh:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
@@ -456883,12 +460043,8 @@
       if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
@@ -456897,12 +460053,8 @@
       if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
@@ -456911,12 +460063,8 @@
       if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -457093,6 +460241,8 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,atan2:parameters:*]
   [:test="af"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:test="af_ai"]
     expected:
@@ -457113,8 +460263,6 @@
   [:test="ai_f16"]
 
   [:test="ai_f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:test="array"]
 
@@ -457135,8 +460283,6 @@
   [:test="f32_af"]
 
   [:test="f32_ai"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:test="f32_bool"]
 
@@ -457180,8 +460326,6 @@
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,atan2:values:*]
-  expected:
-    if os == "linux" and not debug: [OK, TIMEOUT]
   [:stage="constant";type="abstract-float"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -457285,6 +460429,8 @@
   [:test="matrix"]
 
   [:test="must_use"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:test="no_params"]
 
@@ -457305,8 +460451,6 @@
   [:test="u32"]
 
   [:test="valid"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:test="vec_bool"]
 
@@ -457317,48 +460461,32 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,atan:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -457459,6 +460587,8 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,atanh:values:*]
   [:stage="constant";type="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
     expected:
@@ -457469,6 +460599,8 @@
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
     expected:
@@ -457479,6 +460611,8 @@
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
     expected:
@@ -457489,6 +460623,8 @@
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
     expected:
@@ -458639,48 +461775,32 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,ceil:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -459133,84 +462253,52 @@
   expected:
     if os == "linux" and not debug: [OK, TIMEOUT]
   [:e="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:e="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:e="f16"]
 
   [:e="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:e="i32"]
 
   [:e="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:e="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:e="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:e="vec2%3Cf16%3E"]
 
   [:e="vec2%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:e="vec2%3Ci32%3E"]
 
   [:e="vec2%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:e="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:e="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:e="vec3%3Cf16%3E"]
 
   [:e="vec3%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:e="vec3%3Ci32%3E"]
 
   [:e="vec3%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:e="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:e="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:e="vec4%3Cf16%3E"]
 
   [:e="vec4%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:e="vec4%3Ci32%3E"]
 
   [:e="vec4%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,clamp:must_use:*]
@@ -459225,12 +462313,8 @@
   expected:
     if os == "linux" and not debug: [OK, TIMEOUT]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
@@ -459241,12 +462325,8 @@
   [:stage="constant";type="u32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
@@ -459257,12 +462337,8 @@
   [:stage="constant";type="vec2%3Cu32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
@@ -459273,12 +462349,8 @@
   [:stage="constant";type="vec3%3Cu32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -459373,48 +462445,32 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,cos:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -459479,6 +462535,8 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,cosh:values:*]
   [:stage="constant";type="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
     expected:
@@ -459489,6 +462547,8 @@
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
     expected:
@@ -459499,6 +462559,8 @@
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
     expected:
@@ -459509,6 +462571,8 @@
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
     expected:
@@ -459891,8 +462955,6 @@
   [:arg="bad_vec4"]
 
   [:arg="good"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,cross:must_use:*]
@@ -459901,8 +462963,6 @@
       if os == "linux" and not debug: FAIL
 
   [:use=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,cross:values:*]
@@ -459911,20 +462971,14 @@
       if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
   [:stage="constant";type="vec3%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="override";type="vec3%3Cf16%3E"]
 
   [:stage="override";type="vec3%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,degrees:args:*]
@@ -459983,8 +463037,6 @@
       if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
@@ -459995,8 +463047,6 @@
       if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
@@ -460007,8 +463057,6 @@
       if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
@@ -460019,8 +463067,6 @@
       if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -460625,6 +463671,8 @@
       if os == "linux" and not debug: FAIL
 
   [:use=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,distance:args:*]
@@ -460691,8 +463739,6 @@
       if os == "linux" and not debug: FAIL
 
   [:use=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,distance:values:*]
@@ -460939,6 +463985,8 @@
       if os == "linux" and not debug: FAIL
 
   [:use=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,dot:values:*]
@@ -461045,48 +464093,32 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,exp2:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -461467,8 +464499,6 @@
       if os == "linux" and not debug: FAIL
 
   [:use=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,faceForward:values:*]
@@ -461807,48 +464837,32 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,floor:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -461949,17 +464963,15 @@
   [:arg="bad_no_parens"]
 
   [:arg="good"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,fma:must_use:*]
   [:use=false]
-
-  [:use=true]
     expected:
       if os == "linux" and not debug: FAIL
 
+  [:use=true]
+
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,fma:values:*]
   expected:
@@ -461969,8 +464981,6 @@
       if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
@@ -461981,8 +464991,6 @@
       if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
@@ -461993,8 +465001,6 @@
       if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -462055,48 +465061,32 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,fract:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -462737,8 +465727,6 @@
       if os == "linux" and not debug: FAIL
 
   [:use=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,ldexp:partial_values:*]
@@ -463359,12 +466347,8 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,max:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
@@ -463375,12 +466359,8 @@
   [:stage="constant";type="u32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
@@ -463391,12 +466371,8 @@
   [:stage="constant";type="vec2%3Cu32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
@@ -463407,12 +466383,8 @@
   [:stage="constant";type="vec3%3Cu32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -463489,12 +466461,8 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,min:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
@@ -463505,12 +466473,8 @@
   [:stage="constant";type="u32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
@@ -463521,12 +466485,8 @@
   [:stage="constant";type="vec2%3Cu32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
@@ -463537,12 +466497,8 @@
   [:stage="constant";type="vec3%3Cu32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -464480,8 +467436,6 @@
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,pack4xI8Clamp:must_use:*]
-  [:]
-
   [:use=false]
 
   [:use=true]
@@ -469507,48 +472461,32 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,radians:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -469603,8 +472541,6 @@
       if os == "linux" and not debug: FAIL
 
   [:use=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,reflect:values:*]
@@ -469759,86 +472695,24 @@
       if os == "linux" and not debug: FAIL
 
   [:arg="vec2f";use=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:arg="vec3f";use=false]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:arg="vec3f";use=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:arg="vec4f";use=false]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:arg="vec4f";use=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,refract:return:*]
-  [:arg="vec2f";returnType="bool"]
-
-  [:arg="vec2f";returnType="f32"]
-
-  [:arg="vec2f";returnType="i32"]
-
-  [:arg="vec2f";returnType="u32"]
-
-  [:arg="vec2f";returnType="vec2f"]
-    expected:
-      if os == "linux" and not debug: FAIL
-
-  [:arg="vec2f";returnType="vec3f"]
-
-  [:arg="vec2f";returnType="vec3i"]
-
-  [:arg="vec2f";returnType="vec3u"]
-
-  [:arg="vec2f";returnType="vec4f"]
-
-  [:arg="vec3f";returnType="bool"]
-
-  [:arg="vec3f";returnType="f32"]
-
-  [:arg="vec3f";returnType="i32"]
-
-  [:arg="vec3f";returnType="u32"]
-
-  [:arg="vec3f";returnType="vec2f"]
-
-  [:arg="vec3f";returnType="vec3f"]
-    expected:
-      if os == "linux" and not debug: FAIL
-
-  [:arg="vec3f";returnType="vec3i"]
-
-  [:arg="vec3f";returnType="vec3u"]
-
-  [:arg="vec3f";returnType="vec4f"]
-
-  [:arg="vec4f";returnType="bool"]
-
-  [:arg="vec4f";returnType="f32"]
-
-  [:arg="vec4f";returnType="i32"]
-
-  [:arg="vec4f";returnType="u32"]
-
-  [:arg="vec4f";returnType="vec2f"]
-
-  [:arg="vec4f";returnType="vec3f"]
-
-  [:arg="vec4f";returnType="vec3i"]
-
-  [:arg="vec4f";returnType="vec3u"]
-
-  [:arg="vec4f";returnType="vec4f"]
-    expected:
-      if os == "linux" and not debug: FAIL
+  disabled: true
+  expected:
+    if os == "linux" and not debug: SKIP
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,refract:values:*]
@@ -470083,48 +472957,32 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,round:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -470215,48 +473073,32 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,saturate:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -472145,8 +474987,6 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,sign:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
@@ -472155,8 +474995,6 @@
   [:stage="constant";type="i32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
@@ -472165,8 +475003,6 @@
   [:stage="constant";type="vec2%3Ci32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
@@ -472175,8 +475011,6 @@
   [:stage="constant";type="vec3%3Ci32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -472261,48 +475095,32 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,sin:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -472367,6 +475185,8 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,sinh:values:*]
   [:stage="constant";type="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
     expected:
@@ -472377,6 +475197,8 @@
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
     expected:
@@ -472387,6 +475209,8 @@
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
     expected:
@@ -472397,6 +475221,8 @@
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
     expected:
@@ -472559,6 +475385,8 @@
   [:test="u32"]
 
   [:test="valid"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:test="vec_bool"]
 
@@ -473021,48 +475849,32 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,step:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -488339,48 +491151,32 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,tan:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -488445,48 +491241,32 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,tanh:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -488513,984 +491293,564 @@
   expected:
     if os == "linux" and not debug: [OK, TIMEOUT]
   [:textureType="texture_1d";levelType="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="abstract-int"]
 
   [:textureType="texture_1d";levelType="bool"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="f16"]
 
   [:textureType="texture_1d";levelType="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="i32"]
 
   [:textureType="texture_1d";levelType="u32"]
 
   [:textureType="texture_1d";levelType="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec2%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec2%3Cf16%3E"]
 
   [:textureType="texture_1d";levelType="vec2%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec2%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec3%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec3%3Cf16%3E"]
 
   [:textureType="texture_1d";levelType="vec3%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec3%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec4%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec4%3Cf16%3E"]
 
   [:textureType="texture_1d";levelType="vec4%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec4%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="abstract-int"]
 
   [:textureType="texture_2d";levelType="bool"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="f16"]
 
   [:textureType="texture_2d";levelType="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="i32"]
 
   [:textureType="texture_2d";levelType="u32"]
 
   [:textureType="texture_2d";levelType="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec2%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec2%3Cf16%3E"]
 
   [:textureType="texture_2d";levelType="vec2%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec2%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec3%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec3%3Cf16%3E"]
 
   [:textureType="texture_2d";levelType="vec3%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec3%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec4%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec4%3Cf16%3E"]
 
   [:textureType="texture_2d";levelType="vec4%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec4%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="abstract-int"]
 
   [:textureType="texture_2d_array";levelType="bool"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="f16"]
 
   [:textureType="texture_2d_array";levelType="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="i32"]
 
   [:textureType="texture_2d_array";levelType="u32"]
 
   [:textureType="texture_2d_array";levelType="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec2%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec2%3Cf16%3E"]
 
   [:textureType="texture_2d_array";levelType="vec2%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec2%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec3%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec3%3Cf16%3E"]
 
   [:textureType="texture_2d_array";levelType="vec3%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec3%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec4%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec4%3Cf16%3E"]
 
   [:textureType="texture_2d_array";levelType="vec4%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec4%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="abstract-int"]
 
   [:textureType="texture_3d";levelType="bool"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="f16"]
 
   [:textureType="texture_3d";levelType="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="i32"]
 
   [:textureType="texture_3d";levelType="u32"]
 
   [:textureType="texture_3d";levelType="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec2%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec2%3Cf16%3E"]
 
   [:textureType="texture_3d";levelType="vec2%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec2%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec3%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec3%3Cf16%3E"]
 
   [:textureType="texture_3d";levelType="vec3%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec3%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec4%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec4%3Cf16%3E"]
 
   [:textureType="texture_3d";levelType="vec4%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec4%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="abstract-int"]
 
   [:textureType="texture_cube";levelType="bool"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="f16"]
 
   [:textureType="texture_cube";levelType="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="i32"]
 
   [:textureType="texture_cube";levelType="u32"]
 
   [:textureType="texture_cube";levelType="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec2%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec2%3Cf16%3E"]
 
   [:textureType="texture_cube";levelType="vec2%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec2%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec3%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec3%3Cf16%3E"]
 
   [:textureType="texture_cube";levelType="vec3%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec3%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec4%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec4%3Cf16%3E"]
 
   [:textureType="texture_cube";levelType="vec4%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube";levelType="vec4%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="abstract-int"]
 
   [:textureType="texture_cube_array";levelType="bool"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="f16"]
 
   [:textureType="texture_cube_array";levelType="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="i32"]
 
   [:textureType="texture_cube_array";levelType="u32"]
 
   [:textureType="texture_cube_array";levelType="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec2%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec2%3Cf16%3E"]
 
   [:textureType="texture_cube_array";levelType="vec2%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec2%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec3%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec3%3Cf16%3E"]
 
   [:textureType="texture_cube_array";levelType="vec3%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec3%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec4%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec4%3Cf16%3E"]
 
   [:textureType="texture_cube_array";levelType="vec4%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_cube_array";levelType="vec4%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="abstract-int"]
 
   [:textureType="texture_depth_2d";levelType="bool"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="f16"]
 
   [:textureType="texture_depth_2d";levelType="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="i32"]
 
   [:textureType="texture_depth_2d";levelType="u32"]
 
   [:textureType="texture_depth_2d";levelType="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec2%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec2%3Cf16%3E"]
 
   [:textureType="texture_depth_2d";levelType="vec2%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec2%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec3%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec3%3Cf16%3E"]
 
   [:textureType="texture_depth_2d";levelType="vec3%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec3%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec4%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec4%3Cf16%3E"]
 
   [:textureType="texture_depth_2d";levelType="vec4%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec4%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="abstract-int"]
 
   [:textureType="texture_depth_2d_array";levelType="bool"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="f16"]
 
   [:textureType="texture_depth_2d_array";levelType="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="i32"]
 
   [:textureType="texture_depth_2d_array";levelType="u32"]
 
   [:textureType="texture_depth_2d_array";levelType="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec2%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec2%3Cf16%3E"]
 
   [:textureType="texture_depth_2d_array";levelType="vec2%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec2%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec3%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec3%3Cf16%3E"]
 
   [:textureType="texture_depth_2d_array";levelType="vec3%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec3%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec4%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec4%3Cf16%3E"]
 
   [:textureType="texture_depth_2d_array";levelType="vec4%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec4%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="abstract-int"]
 
   [:textureType="texture_depth_cube";levelType="bool"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="f16"]
 
   [:textureType="texture_depth_cube";levelType="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="i32"]
 
   [:textureType="texture_depth_cube";levelType="u32"]
 
   [:textureType="texture_depth_cube";levelType="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec2%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec2%3Cf16%3E"]
 
   [:textureType="texture_depth_cube";levelType="vec2%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec2%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec3%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec3%3Cf16%3E"]
 
   [:textureType="texture_depth_cube";levelType="vec3%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec3%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec4%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec4%3Cf16%3E"]
 
   [:textureType="texture_depth_cube";levelType="vec4%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube";levelType="vec4%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="abstract-int"]
 
   [:textureType="texture_depth_cube_array";levelType="bool"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="f16"]
 
   [:textureType="texture_depth_cube_array";levelType="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="i32"]
 
   [:textureType="texture_depth_cube_array";levelType="u32"]
 
   [:textureType="texture_depth_cube_array";levelType="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec2%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec2%3Cf16%3E"]
 
   [:textureType="texture_depth_cube_array";levelType="vec2%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec2%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec3%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec3%3Cf16%3E"]
 
   [:textureType="texture_depth_cube_array";levelType="vec3%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec3%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec4%3Cbool%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec4%3Cf16%3E"]
 
   [:textureType="texture_depth_cube_array";levelType="vec4%3Cf32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_cube_array";levelType="vec4%3Cu32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,textureDimensions:must_use:*]
@@ -492663,64 +495023,48 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,textureGather:offset_argument,non_const:*]
   [:textureType="texture_2d";sampleType="vec4%3Cf32%3E";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";sampleType="vec4%3Cf32%3E";varType="l"]
 
   [:textureType="texture_2d";sampleType="vec4%3Cf32%3E";varType="u"]
 
   [:textureType="texture_2d";sampleType="vec4%3Ci32%3E";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";sampleType="vec4%3Ci32%3E";varType="l"]
 
   [:textureType="texture_2d";sampleType="vec4%3Ci32%3E";varType="u"]
 
   [:textureType="texture_2d";sampleType="vec4%3Cu32%3E";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";sampleType="vec4%3Cu32%3E";varType="l"]
 
   [:textureType="texture_2d";sampleType="vec4%3Cu32%3E";varType="u"]
 
   [:textureType="texture_2d_array";sampleType="vec4%3Cf32%3E";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";sampleType="vec4%3Cf32%3E";varType="l"]
 
   [:textureType="texture_2d_array";sampleType="vec4%3Cf32%3E";varType="u"]
 
   [:textureType="texture_2d_array";sampleType="vec4%3Ci32%3E";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";sampleType="vec4%3Ci32%3E";varType="l"]
 
   [:textureType="texture_2d_array";sampleType="vec4%3Ci32%3E";varType="u"]
 
   [:textureType="texture_2d_array";sampleType="vec4%3Cu32%3E";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";sampleType="vec4%3Cu32%3E";varType="l"]
 
   [:textureType="texture_2d_array";sampleType="vec4%3Cu32%3E";varType="u"]
 
   [:textureType="texture_depth_2d";sampleType="vec4%3Cf32%3E";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";sampleType="vec4%3Cf32%3E";varType="l"]
 
   [:textureType="texture_depth_2d";sampleType="vec4%3Cf32%3E";varType="u"]
 
   [:textureType="texture_depth_2d_array";sampleType="vec4%3Cf32%3E";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";sampleType="vec4%3Cf32%3E";varType="l"]
 
@@ -497061,14 +499405,10 @@
   [:textureType="texture_1d";levelType="i32"]
 
   [:textureType="texture_1d";levelType="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec2%3Cabstract-float%3E"]
 
   [:textureType="texture_1d";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec2%3Cbool%3E"]
 
@@ -497077,16 +499417,12 @@
   [:textureType="texture_1d";levelType="vec2%3Cf32%3E"]
 
   [:textureType="texture_1d";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec2%3Cu32%3E"]
 
   [:textureType="texture_1d";levelType="vec3%3Cabstract-float%3E"]
 
   [:textureType="texture_1d";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec3%3Cbool%3E"]
 
@@ -497095,16 +499431,12 @@
   [:textureType="texture_1d";levelType="vec3%3Cf32%3E"]
 
   [:textureType="texture_1d";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec3%3Cu32%3E"]
 
   [:textureType="texture_1d";levelType="vec4%3Cabstract-float%3E"]
 
   [:textureType="texture_1d";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec4%3Cbool%3E"]
 
@@ -497113,8 +499445,6 @@
   [:textureType="texture_1d";levelType="vec4%3Cf32%3E"]
 
   [:textureType="texture_1d";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_1d";levelType="vec4%3Cu32%3E"]
 
@@ -497131,14 +499461,10 @@
   [:textureType="texture_2d";levelType="i32"]
 
   [:textureType="texture_2d";levelType="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec2%3Cabstract-float%3E"]
 
   [:textureType="texture_2d";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec2%3Cbool%3E"]
 
@@ -497147,16 +499473,12 @@
   [:textureType="texture_2d";levelType="vec2%3Cf32%3E"]
 
   [:textureType="texture_2d";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec2%3Cu32%3E"]
 
   [:textureType="texture_2d";levelType="vec3%3Cabstract-float%3E"]
 
   [:textureType="texture_2d";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec3%3Cbool%3E"]
 
@@ -497165,16 +499487,12 @@
   [:textureType="texture_2d";levelType="vec3%3Cf32%3E"]
 
   [:textureType="texture_2d";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec3%3Cu32%3E"]
 
   [:textureType="texture_2d";levelType="vec4%3Cabstract-float%3E"]
 
   [:textureType="texture_2d";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec4%3Cbool%3E"]
 
@@ -497183,8 +499501,6 @@
   [:textureType="texture_2d";levelType="vec4%3Cf32%3E"]
 
   [:textureType="texture_2d";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d";levelType="vec4%3Cu32%3E"]
 
@@ -497201,14 +499517,10 @@
   [:textureType="texture_2d_array";levelType="i32"]
 
   [:textureType="texture_2d_array";levelType="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec2%3Cabstract-float%3E"]
 
   [:textureType="texture_2d_array";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec2%3Cbool%3E"]
 
@@ -497217,16 +499529,12 @@
   [:textureType="texture_2d_array";levelType="vec2%3Cf32%3E"]
 
   [:textureType="texture_2d_array";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec2%3Cu32%3E"]
 
   [:textureType="texture_2d_array";levelType="vec3%3Cabstract-float%3E"]
 
   [:textureType="texture_2d_array";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec3%3Cbool%3E"]
 
@@ -497235,16 +499543,12 @@
   [:textureType="texture_2d_array";levelType="vec3%3Cf32%3E"]
 
   [:textureType="texture_2d_array";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec3%3Cu32%3E"]
 
   [:textureType="texture_2d_array";levelType="vec4%3Cabstract-float%3E"]
 
   [:textureType="texture_2d_array";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec4%3Cbool%3E"]
 
@@ -497253,8 +499557,6 @@
   [:textureType="texture_2d_array";levelType="vec4%3Cf32%3E"]
 
   [:textureType="texture_2d_array";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array";levelType="vec4%3Cu32%3E"]
 
@@ -497271,14 +499573,10 @@
   [:textureType="texture_3d";levelType="i32"]
 
   [:textureType="texture_3d";levelType="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec2%3Cabstract-float%3E"]
 
   [:textureType="texture_3d";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec2%3Cbool%3E"]
 
@@ -497287,16 +499585,12 @@
   [:textureType="texture_3d";levelType="vec2%3Cf32%3E"]
 
   [:textureType="texture_3d";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec2%3Cu32%3E"]
 
   [:textureType="texture_3d";levelType="vec3%3Cabstract-float%3E"]
 
   [:textureType="texture_3d";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec3%3Cbool%3E"]
 
@@ -497305,16 +499599,12 @@
   [:textureType="texture_3d";levelType="vec3%3Cf32%3E"]
 
   [:textureType="texture_3d";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec3%3Cu32%3E"]
 
   [:textureType="texture_3d";levelType="vec4%3Cabstract-float%3E"]
 
   [:textureType="texture_3d";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec4%3Cbool%3E"]
 
@@ -497323,8 +499613,6 @@
   [:textureType="texture_3d";levelType="vec4%3Cf32%3E"]
 
   [:textureType="texture_3d";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d";levelType="vec4%3Cu32%3E"]
 
@@ -497341,14 +499629,10 @@
   [:textureType="texture_depth_2d";levelType="i32"]
 
   [:textureType="texture_depth_2d";levelType="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec2%3Cabstract-float%3E"]
 
   [:textureType="texture_depth_2d";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec2%3Cbool%3E"]
 
@@ -497357,16 +499641,12 @@
   [:textureType="texture_depth_2d";levelType="vec2%3Cf32%3E"]
 
   [:textureType="texture_depth_2d";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec2%3Cu32%3E"]
 
   [:textureType="texture_depth_2d";levelType="vec3%3Cabstract-float%3E"]
 
   [:textureType="texture_depth_2d";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec3%3Cbool%3E"]
 
@@ -497375,16 +499655,12 @@
   [:textureType="texture_depth_2d";levelType="vec3%3Cf32%3E"]
 
   [:textureType="texture_depth_2d";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec3%3Cu32%3E"]
 
   [:textureType="texture_depth_2d";levelType="vec4%3Cabstract-float%3E"]
 
   [:textureType="texture_depth_2d";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec4%3Cbool%3E"]
 
@@ -497393,8 +499669,6 @@
   [:textureType="texture_depth_2d";levelType="vec4%3Cf32%3E"]
 
   [:textureType="texture_depth_2d";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";levelType="vec4%3Cu32%3E"]
 
@@ -497411,14 +499685,10 @@
   [:textureType="texture_depth_2d_array";levelType="i32"]
 
   [:textureType="texture_depth_2d_array";levelType="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec2%3Cabstract-float%3E"]
 
   [:textureType="texture_depth_2d_array";levelType="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec2%3Cbool%3E"]
 
@@ -497427,16 +499697,12 @@
   [:textureType="texture_depth_2d_array";levelType="vec2%3Cf32%3E"]
 
   [:textureType="texture_depth_2d_array";levelType="vec2%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec2%3Cu32%3E"]
 
   [:textureType="texture_depth_2d_array";levelType="vec3%3Cabstract-float%3E"]
 
   [:textureType="texture_depth_2d_array";levelType="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec3%3Cbool%3E"]
 
@@ -497445,16 +499711,12 @@
   [:textureType="texture_depth_2d_array";levelType="vec3%3Cf32%3E"]
 
   [:textureType="texture_depth_2d_array";levelType="vec3%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec3%3Cu32%3E"]
 
   [:textureType="texture_depth_2d_array";levelType="vec4%3Cabstract-float%3E"]
 
   [:textureType="texture_depth_2d_array";levelType="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec4%3Cbool%3E"]
 
@@ -497463,8 +499725,6 @@
   [:textureType="texture_depth_2d_array";levelType="vec4%3Cf32%3E"]
 
   [:textureType="texture_depth_2d_array";levelType="vec4%3Ci32%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";levelType="vec4%3Cu32%3E"]
 
@@ -500229,40 +502489,30 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,textureSample:offset_argument,non_const:*]
   [:textureType="texture_2d%3Cf32%3E";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d%3Cf32%3E";varType="l"]
 
   [:textureType="texture_2d%3Cf32%3E";varType="u"]
 
   [:textureType="texture_2d_array%3Cf32%3E";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array%3Cf32%3E";varType="l"]
 
   [:textureType="texture_2d_array%3Cf32%3E";varType="u"]
 
   [:textureType="texture_3d%3Cf32%3E";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d%3Cf32%3E";varType="l"]
 
   [:textureType="texture_3d%3Cf32%3E";varType="u"]
 
   [:textureType="texture_depth_2d";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";varType="l"]
 
   [:textureType="texture_depth_2d";varType="u"]
 
   [:textureType="texture_depth_2d_array";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";varType="l"]
 
@@ -507281,24 +509531,18 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,textureSampleGrad:offset_argument,non_const:*]
   [:textureType="texture_2d%3Cf32%3E";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d%3Cf32%3E";varType="l"]
 
   [:textureType="texture_2d%3Cf32%3E";varType="u"]
 
   [:textureType="texture_2d_array%3Cf32%3E";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_2d_array%3Cf32%3E";varType="l"]
 
   [:textureType="texture_2d_array%3Cf32%3E";varType="u"]
 
   [:textureType="texture_3d%3Cf32%3E";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_3d%3Cf32%3E";varType="l"]
 
@@ -509397,16 +511641,12 @@
   [:textureType="texture_3d%3Cf32%3E";varType="u"]
 
   [:textureType="texture_depth_2d";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d";varType="l"]
 
   [:textureType="texture_depth_2d";varType="u"]
 
   [:textureType="texture_depth_2d_array";varType="c"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:textureType="texture_depth_2d_array";varType="l"]
 
@@ -510923,6 +513163,8 @@
       if os == "linux" and not debug: FAIL
 
   [:use=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,transpose:return:*]
@@ -512087,48 +514329,32 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,trunc:values:*]
   [:stage="constant";type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="f16"]
 
   [:stage="constant";type="f32"]
 
   [:stage="constant";type="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec2%3Cf16%3E"]
 
   [:stage="constant";type="vec2%3Cf32%3E"]
 
   [:stage="constant";type="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec3%3Cf16%3E"]
 
   [:stage="constant";type="vec3%3Cf32%3E"]
 
   [:stage="constant";type="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:stage="constant";type="vec4%3Cf16%3E"]
 
@@ -512543,6 +514769,8 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,value_constructor:matrix_column:*]
   [:type1="abstract-float";type2="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:type1="abstract-float";type2="bool"]
 
@@ -512603,6 +514831,8 @@
   expected:
     if os == "linux" and not debug: [OK, TIMEOUT]
   [:type1="abstract-float";type2="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:type1="abstract-float";type2="bool"]
 
@@ -512791,8 +515021,6 @@
   [:ctor="vec2_0";use=false]
 
   [:ctor="vec2_0";use=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:ctor="vec2f";use=false]
 
@@ -512801,8 +515029,6 @@
   [:ctor="vec3_0";use=false]
 
   [:ctor="vec3_0";use=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:ctor="vec3_f16";use=false]
 
@@ -512815,8 +515041,6 @@
   [:ctor="vec4_0";use=false]
 
   [:ctor="vec4_0";use=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,value_constructor:partial_eval:*]
@@ -512945,8 +515169,6 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,value_constructor:scalar_zero_value:*]
   [:type="bool"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="f16"]
 
@@ -512973,8 +515195,6 @@
   [:case="valid_array"]
 
   [:case="vec3u"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,value_constructor:struct_zero_value:*]
@@ -513027,12 +515247,8 @@
   [:decl_type="abstract-int";value_type="u32"]
 
   [:decl_type="bool";value_type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:decl_type="bool";value_type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:decl_type="bool";value_type="bool"]
 
@@ -513073,8 +515289,6 @@
   [:decl_type="f32";value_type="u32"]
 
   [:decl_type="i32";value_type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:decl_type="i32";value_type="abstract-int"]
 
@@ -513089,8 +515303,6 @@
   [:decl_type="i32";value_type="u32"]
 
   [:decl_type="u32";value_type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:decl_type="u32";value_type="abstract-int"]
 
@@ -513411,8 +515623,12 @@
   [:type="abstract-int";ele_type="vec3f"]
 
   [:type="bool";ele_type="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:type="bool";ele_type="abstract-int"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:type="bool";ele_type="bool"]
 
@@ -513489,6 +515705,8 @@
   [:type="f32";ele_type="vec3f"]
 
   [:type="i32";ele_type="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:type="i32";ele_type="abstract-int"]
 
@@ -513517,6 +515735,8 @@
   [:type="i32";ele_type="vec3f"]
 
   [:type="u32";ele_type="abstract-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:type="u32";ele_type="abstract-int"]
 
@@ -513547,16 +515767,10 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,value_constructor:vector_zero_value:*]
   [:type="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="bool"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="f16"]
 
@@ -515095,8 +517309,12 @@
   [:op="left";rhs="1u";test="u32";swap=true]
 
   [:op="left";rhs="1u";test="vec";swap=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:op="left";rhs="1u";test="vec";swap=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:op="left";rhs="ai";test="af";swap=false]
 
@@ -515353,8 +517571,12 @@
   [:op="right";rhs="1u";test="u32";swap=true]
 
   [:op="right";rhs="1u";test="vec";swap=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:op="right";rhs="1u";test="vec";swap=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:op="right";rhs="ai";test="af";swap=false]
 
@@ -515550,6 +517772,8 @@
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,matrix,comparison:invalid:*]
+  expected:
+    if os == "linux" and not debug: [OK, TIMEOUT]
   [:op="eq";rhs="1i";test="af"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -517485,58 +519709,58 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,matrix,mul:overflow_scalar_abstract:*]
   [:rhs=1.7976931348623157e%2B308;c=2;r=2]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:rhs=1.7976931348623157e%2B308;c=2;r=3]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:rhs=1.7976931348623157e%2B308;c=2;r=4]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:rhs=1.7976931348623157e%2B308;c=3;r=2]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:rhs=1.7976931348623157e%2B308;c=3;r=3]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:rhs=1.7976931348623157e%2B308;c=3;r=4]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:rhs=1.7976931348623157e%2B308;c=4;r=2]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:rhs=1.7976931348623157e%2B308;c=4;r=3]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:rhs=1.7976931348623157e%2B308;c=4;r=4]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:rhs=1;c=2;r=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:rhs=1;c=2;r=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:rhs=1;c=2;r=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:rhs=1;c=3;r=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:rhs=1;c=3;r=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:rhs=1;c=3;r=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:rhs=1;c=4;r=2]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:rhs=1;c=4;r=3]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:rhs=1;c=4;r=4]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,matrix,mul:overflow_scalar_f16:*]
@@ -518009,12 +520233,8 @@
   [:case="vector_abstract_to_integer"]
 
   [:case="vector_default_ctor_abstract"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="vector_default_ctor_integer"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="vector_swizzle_abstract"]
 
@@ -518031,8 +520251,6 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,overload_resolution:overload_resolution:*]
   [:arg1="abstract-float";arg2="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:arg1="abstract-float";arg2="f16"]
 
@@ -518043,20 +520261,14 @@
   [:arg1="abstract-float";arg2="u32"]
 
   [:arg1="abstract-int";arg2="abstract-float"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:arg1="abstract-int";arg2="f16"]
 
   [:arg1="abstract-int";arg2="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:arg1="abstract-int";arg2="i32"]
 
   [:arg1="abstract-int";arg2="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:arg1="f16";arg2="abstract-float"]
 
@@ -518071,8 +520283,6 @@
   [:arg1="f32";arg2="abstract-float"]
 
   [:arg1="f32";arg2="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:arg1="f32";arg2="f16"]
 
@@ -518093,8 +520303,6 @@
   [:arg1="u32";arg2="abstract-float"]
 
   [:arg1="u32";arg2="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:arg1="u32";arg2="f16"]
 
@@ -518103,8 +520311,6 @@
   [:arg1="u32";arg2="i32"]
 
   [:arg1="vec2%3Cabstract-float%3E";arg2="vec2%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:arg1="vec2%3Cabstract-float%3E";arg2="vec4%3Cf32%3E"]
 
@@ -518113,8 +520319,6 @@
   [:arg1="vec2%3Cabstract-float%3E";arg2="vec4%3Cu32%3E"]
 
   [:arg1="vec2%3Cabstract-int%3E";arg2="vec2%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:arg1="vec2%3Cabstract-int%3E";arg2="vec4%3Cf32%3E"]
 
@@ -518141,12 +520345,8 @@
   [:arg1="vec2%3Cu32%3E";arg2="vec4%3Cf16%3E"]
 
   [:arg1="vec3%3Cabstract-float%3E";arg2="vec3%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:arg1="vec3%3Cabstract-int%3E";arg2="vec3%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:arg1="vec3%3Cf32%3E";arg2="vec3%3Ci32%3E"]
 
@@ -518161,12 +520361,8 @@
   [:arg1="vec3%3Cu32%3E";arg2="vec3%3Ci32%3E"]
 
   [:arg1="vec4%3Cabstract-float%3E";arg2="vec4%3Cabstract-int%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:arg1="vec4%3Cabstract-int%3E";arg2="vec4%3Cabstract-float%3E"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:arg1="vec4%3Cf16%3E";arg2="vec2%3Cf32%3E"]
 
@@ -518931,42 +521127,26 @@
 
 [cts.https.html?q=webgpu:shader,validation,expression,precedence:other:*]
   [:expr="addr_member"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:expr="and_addr"]
 
   [:expr="and_addr_paren"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:expr="comp_member"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:expr="deref_idx"]
 
   [:expr="deref_idx_paren"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:expr="deref_member"]
 
   [:expr="deref_member_paren"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:expr="log_and_member"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:expr="log_or_member"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:expr="neg_member"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,precedence:other_lhs:*]
@@ -519427,8 +521607,6 @@
   [:type="texture";control=false]
 
   [:type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,unary,arithmetic_negation:scalar_vector:*]
@@ -519521,8 +521699,6 @@
   [:type="texture";control=false]
 
   [:type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,unary,bitwise_complement:scalar_vector:*]
@@ -519613,8 +521789,6 @@
   [:type="texture";control=false]
 
   [:type="texture";control=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,expression,unary,logical_negation:parse:*]
@@ -519735,8 +521909,6 @@
   [:blendSrc0Type="f32";blendSrc1Type="f16"]
 
   [:blendSrc0Type="f32";blendSrc1Type="f32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:blendSrc0Type="f32";blendSrc1Type="i32"]
 
@@ -519771,8 +521943,6 @@
   [:blendSrc0Type="i32";blendSrc1Type="f32"]
 
   [:blendSrc0Type="i32";blendSrc1Type="i32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:blendSrc0Type="i32";blendSrc1Type="u32"]
 
@@ -519807,8 +521977,6 @@
   [:blendSrc0Type="u32";blendSrc1Type="i32"]
 
   [:blendSrc0Type="u32";blendSrc1Type="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:blendSrc0Type="u32";blendSrc1Type="vec2f"]
 
@@ -519843,8 +522011,6 @@
   [:blendSrc0Type="vec2f";blendSrc1Type="u32"]
 
   [:blendSrc0Type="vec2f";blendSrc1Type="vec2f"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:blendSrc0Type="vec2f";blendSrc1Type="vec2h"]
 
@@ -519913,8 +522079,6 @@
   [:blendSrc0Type="vec2i";blendSrc1Type="vec2h"]
 
   [:blendSrc0Type="vec2i";blendSrc1Type="vec2i"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:blendSrc0Type="vec2i";blendSrc1Type="vec2u"]
 
@@ -519949,8 +522113,6 @@
   [:blendSrc0Type="vec2u";blendSrc1Type="vec2i"]
 
   [:blendSrc0Type="vec2u";blendSrc1Type="vec2u"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:blendSrc0Type="vec2u";blendSrc1Type="vec3f"]
 
@@ -519985,8 +522147,6 @@
   [:blendSrc0Type="vec3f";blendSrc1Type="vec2u"]
 
   [:blendSrc0Type="vec3f";blendSrc1Type="vec3f"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:blendSrc0Type="vec3f";blendSrc1Type="vec3h"]
 
@@ -520055,8 +522215,6 @@
   [:blendSrc0Type="vec3i";blendSrc1Type="vec3h"]
 
   [:blendSrc0Type="vec3i";blendSrc1Type="vec3i"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:blendSrc0Type="vec3i";blendSrc1Type="vec3u"]
 
@@ -520091,8 +522249,6 @@
   [:blendSrc0Type="vec3u";blendSrc1Type="vec3i"]
 
   [:blendSrc0Type="vec3u";blendSrc1Type="vec3u"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:blendSrc0Type="vec3u";blendSrc1Type="vec4f"]
 
@@ -520127,8 +522283,6 @@
   [:blendSrc0Type="vec4f";blendSrc1Type="vec3u"]
 
   [:blendSrc0Type="vec4f";blendSrc1Type="vec4f"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:blendSrc0Type="vec4f";blendSrc1Type="vec4h"]
 
@@ -520197,8 +522351,6 @@
   [:blendSrc0Type="vec4i";blendSrc1Type="vec4h"]
 
   [:blendSrc0Type="vec4i";blendSrc1Type="vec4i"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:blendSrc0Type="vec4i";blendSrc1Type="vec4u"]
 
@@ -520233,16 +522385,12 @@
   [:blendSrc0Type="vec4u";blendSrc1Type="vec4i"]
 
   [:blendSrc0Type="vec4u";blendSrc1Type="vec4u"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,extension,dual_source_blending:blend_src_stage_input_output:*]
   [:attr="fragment_input"]
 
   [:attr="fragment_output"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:attr="vertex_input"]
 
@@ -520251,8 +522399,6 @@
 
 [cts.https.html?q=webgpu:shader,validation,extension,dual_source_blending:blend_src_syntax_validation:*]
   [:attr="comment"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:attr="duplicate"]
 
@@ -520271,12 +522417,8 @@
   [:attr="f32_literal"]
 
   [:attr="hex"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:attr="i32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:attr="invalid"]
 
@@ -520293,32 +522435,22 @@
   [:attr="negative"]
 
   [:attr="newline"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:attr="no_parens"]
 
   [:attr="no_parens_no_blend_src_0"]
 
   [:attr="one"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:attr="override_expr"]
 
   [:attr="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:attr="valid_const_expr"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:attr="vec"]
 
   [:attr="zero"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,extension,dual_source_blending:blend_src_usage:*]
@@ -520327,6 +522459,8 @@
   [:attr="entrypoint_input_non_struct"]
 
   [:attr="entrypoint_output_non_struct"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:attr="function_declaration"]
 
@@ -520339,36 +522473,46 @@
   [:attr="override"]
 
   [:attr="struct_member_blend_src_and_builtin"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:attr="struct_member_duplicate_blend_src_0"]
-
-  [:attr="struct_member_duplicate_blend_src_1"]
-
-  [:attr="struct_member_has_non_zero_location_blend_src_0"]
-
-  [:attr="struct_member_has_non_zero_location_blend_src_1"]
-
-  [:attr="struct_member_has_non_zero_location_no_blend_src"]
-
-  [:attr="struct_member_location_0_blend_src_0_blend_src_1"]
     expected:
       if os == "linux" and not debug: FAIL
 
+  [:attr="struct_member_duplicate_blend_src_1"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:attr="struct_member_has_non_zero_location_blend_src_0"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:attr="struct_member_has_non_zero_location_blend_src_1"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:attr="struct_member_has_non_zero_location_no_blend_src"]
+    expected:
+      if os == "linux" and not debug: FAIL
+
+  [:attr="struct_member_location_0_blend_src_0_blend_src_1"]
+
   [:attr="struct_member_no_location_blend_src_0"]
 
   [:attr="struct_member_no_location_blend_src_1"]
 
   [:attr="struct_member_no_location_no_blend_src"]
+
+  [:attr="struct_member_non_zero_location_blend_src_0_blend_src_1"]
     expected:
       if os == "linux" and not debug: FAIL
 
-  [:attr="struct_member_non_zero_location_blend_src_0_blend_src_1"]
-
   [:attr="struct_member_only_blend_src_0"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:attr="struct_member_only_blend_src_1"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:attr="var_function"]
 
@@ -520383,8 +522527,6 @@
   [:requireExtension=true;enableExtension=false]
 
   [:requireExtension=true;enableExtension=true]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,extension,pointer_composite_access:deref:*]
@@ -520449,6 +522591,8 @@
 
 [cts.https.html?q=webgpu:shader,validation,extension,readonly_and_readwrite_storage_textures:textureBarrier:*]
   [:]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,extension,readonly_and_readwrite_storage_textures:var_decl:*]
@@ -530465,12 +532609,8 @@
   [:inject="module"]
 
   [:inject="none"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:inject="sibling"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,parse,shadow_builtins:shadow_hides_builtin_f16:*]
@@ -533654,10 +535794,6 @@
 
   [:a_stage="compute";b_stage="vertex";a_kind="storage";b_kind="texture_3d";usage="transitive"]
 
-  [:a_stage="compute";b_stage="vertex";a_kind="storage";b_kind="texture_storage_1d";usage="direct"]
-
-  [:a_stage="compute";b_stage="vertex";a_kind="storage";b_kind="texture_storage_1d";usage="transitive"]
-
   [:a_stage="compute";b_stage="vertex";a_kind="storage";b_kind="uniform";usage="direct"]
 
   [:a_stage="compute";b_stage="vertex";a_kind="storage";b_kind="uniform";usage="transitive"]
@@ -533666,10 +535802,6 @@
 
   [:a_stage="compute";b_stage="vertex";a_kind="texture_2d";b_kind="texture_3d";usage="transitive"]
 
-  [:a_stage="compute";b_stage="vertex";a_kind="texture_2d";b_kind="texture_storage_1d";usage="direct"]
-
-  [:a_stage="compute";b_stage="vertex";a_kind="texture_2d";b_kind="texture_storage_1d";usage="transitive"]
-
   [:a_stage="compute";b_stage="vertex";a_kind="texture_2d";b_kind="uniform";usage="direct"]
 
   [:a_stage="compute";b_stage="vertex";a_kind="texture_2d";b_kind="uniform";usage="transitive"]
@@ -533682,14 +535814,6 @@
     expected:
       if os == "linux" and not debug: FAIL
 
-  [:a_stage="compute";b_stage="vertex";a_kind="texture_external";b_kind="texture_storage_1d";usage="direct"]
-    expected:
-      if os == "linux" and not debug: FAIL
-
-  [:a_stage="compute";b_stage="vertex";a_kind="texture_external";b_kind="texture_storage_1d";usage="transitive"]
-    expected:
-      if os == "linux" and not debug: FAIL
-
   [:a_stage="compute";b_stage="vertex";a_kind="texture_external";b_kind="uniform";usage="direct"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -533702,10 +535826,6 @@
 
   [:a_stage="compute";b_stage="vertex";a_kind="uniform";b_kind="texture_3d";usage="transitive"]
 
-  [:a_stage="compute";b_stage="vertex";a_kind="uniform";b_kind="texture_storage_1d";usage="direct"]
-
-  [:a_stage="compute";b_stage="vertex";a_kind="uniform";b_kind="texture_storage_1d";usage="transitive"]
-
   [:a_stage="compute";b_stage="vertex";a_kind="uniform";b_kind="uniform";usage="direct"]
 
   [:a_stage="compute";b_stage="vertex";a_kind="uniform";b_kind="uniform";usage="transitive"]
@@ -533834,10 +535954,6 @@
 
   [:a_stage="fragment";b_stage="vertex";a_kind="storage";b_kind="texture_3d";usage="transitive"]
 
-  [:a_stage="fragment";b_stage="vertex";a_kind="storage";b_kind="texture_storage_1d";usage="direct"]
-
-  [:a_stage="fragment";b_stage="vertex";a_kind="storage";b_kind="texture_storage_1d";usage="transitive"]
-
   [:a_stage="fragment";b_stage="vertex";a_kind="storage";b_kind="uniform";usage="direct"]
 
   [:a_stage="fragment";b_stage="vertex";a_kind="storage";b_kind="uniform";usage="transitive"]
@@ -533846,10 +535962,6 @@
 
   [:a_stage="fragment";b_stage="vertex";a_kind="texture_2d";b_kind="texture_3d";usage="transitive"]
 
-  [:a_stage="fragment";b_stage="vertex";a_kind="texture_2d";b_kind="texture_storage_1d";usage="direct"]
-
-  [:a_stage="fragment";b_stage="vertex";a_kind="texture_2d";b_kind="texture_storage_1d";usage="transitive"]
-
   [:a_stage="fragment";b_stage="vertex";a_kind="texture_2d";b_kind="uniform";usage="direct"]
 
   [:a_stage="fragment";b_stage="vertex";a_kind="texture_2d";b_kind="uniform";usage="transitive"]
@@ -533862,14 +535974,6 @@
     expected:
       if os == "linux" and not debug: FAIL
 
-  [:a_stage="fragment";b_stage="vertex";a_kind="texture_external";b_kind="texture_storage_1d";usage="direct"]
-    expected:
-      if os == "linux" and not debug: FAIL
-
-  [:a_stage="fragment";b_stage="vertex";a_kind="texture_external";b_kind="texture_storage_1d";usage="transitive"]
-    expected:
-      if os == "linux" and not debug: FAIL
-
   [:a_stage="fragment";b_stage="vertex";a_kind="texture_external";b_kind="uniform";usage="direct"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -533882,10 +535986,6 @@
 
   [:a_stage="fragment";b_stage="vertex";a_kind="uniform";b_kind="texture_3d";usage="transitive"]
 
-  [:a_stage="fragment";b_stage="vertex";a_kind="uniform";b_kind="texture_storage_1d";usage="direct"]
-
-  [:a_stage="fragment";b_stage="vertex";a_kind="uniform";b_kind="texture_storage_1d";usage="transitive"]
-
   [:a_stage="fragment";b_stage="vertex";a_kind="uniform";b_kind="uniform";usage="direct"]
 
   [:a_stage="fragment";b_stage="vertex";a_kind="uniform";b_kind="uniform";usage="transitive"]
@@ -534014,10 +536114,6 @@
 
   [:a_stage="vertex";b_stage="vertex";a_kind="storage";b_kind="texture_3d";usage="transitive"]
 
-  [:a_stage="vertex";b_stage="vertex";a_kind="storage";b_kind="texture_storage_1d";usage="direct"]
-
-  [:a_stage="vertex";b_stage="vertex";a_kind="storage";b_kind="texture_storage_1d";usage="transitive"]
-
   [:a_stage="vertex";b_stage="vertex";a_kind="storage";b_kind="uniform";usage="direct"]
 
   [:a_stage="vertex";b_stage="vertex";a_kind="storage";b_kind="uniform";usage="transitive"]
@@ -534026,10 +536122,6 @@
 
   [:a_stage="vertex";b_stage="vertex";a_kind="texture_2d";b_kind="texture_3d";usage="transitive"]
 
-  [:a_stage="vertex";b_stage="vertex";a_kind="texture_2d";b_kind="texture_storage_1d";usage="direct"]
-
-  [:a_stage="vertex";b_stage="vertex";a_kind="texture_2d";b_kind="texture_storage_1d";usage="transitive"]
-
   [:a_stage="vertex";b_stage="vertex";a_kind="texture_2d";b_kind="uniform";usage="direct"]
 
   [:a_stage="vertex";b_stage="vertex";a_kind="texture_2d";b_kind="uniform";usage="transitive"]
@@ -534042,14 +536134,6 @@
     expected:
       if os == "linux" and not debug: FAIL
 
-  [:a_stage="vertex";b_stage="vertex";a_kind="texture_external";b_kind="texture_storage_1d";usage="direct"]
-    expected:
-      if os == "linux" and not debug: FAIL
-
-  [:a_stage="vertex";b_stage="vertex";a_kind="texture_external";b_kind="texture_storage_1d";usage="transitive"]
-    expected:
-      if os == "linux" and not debug: FAIL
-
   [:a_stage="vertex";b_stage="vertex";a_kind="texture_external";b_kind="uniform";usage="direct"]
     expected:
       if os == "linux" and not debug: FAIL
@@ -534062,10 +536146,6 @@
 
   [:a_stage="vertex";b_stage="vertex";a_kind="uniform";b_kind="texture_3d";usage="transitive"]
 
-  [:a_stage="vertex";b_stage="vertex";a_kind="uniform";b_kind="texture_storage_1d";usage="direct"]
-
-  [:a_stage="vertex";b_stage="vertex";a_kind="uniform";b_kind="texture_storage_1d";usage="transitive"]
-
   [:a_stage="vertex";b_stage="vertex";a_kind="uniform";b_kind="uniform";usage="direct"]
 
   [:a_stage="vertex";b_stage="vertex";a_kind="uniform";b_kind="uniform";usage="transitive"]
@@ -537723,8 +539803,6 @@
   [:test="init_let"]
 
   [:test="init_let_type"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:test="init_phony"]
     expected:
@@ -537934,125 +540012,9 @@
 
 
 [cts.https.html?q=webgpu:shader,validation,statement,increment_decrement:component:*]
-  [:type="array";direction="down"]
-
-  [:type="array";direction="up"]
-
-  [:type="array_f";direction="down"]
-
-  [:type="array_f";direction="up"]
-
-  [:type="array_i";direction="down"]
-
-  [:type="array_i";direction="up"]
-
-  [:type="mat2x2f";direction="down"]
-
-  [:type="mat2x2f";direction="up"]
-
-  [:type="mat2x2h";direction="down"]
-
-  [:type="mat2x2h";direction="up"]
-
-  [:type="struct";direction="down"]
-
-  [:type="struct";direction="up"]
-
-  [:type="struct_field";direction="down"]
-
-  [:type="struct_field";direction="up"]
-
-  [:type="struct_var";direction="down"]
-
-  [:type="struct_var";direction="up"]
-
-  [:type="v2f_x";direction="down"]
-
-  [:type="v2f_x";direction="up"]
-
-  [:type="v2h_x";direction="down"]
-
-  [:type="v2h_x";direction="up"]
-
-  [:type="v2i_x";direction="down"]
-
-  [:type="v2i_x";direction="up"]
-
-  [:type="v2i_y";direction="down"]
-
-  [:type="v2i_y";direction="up"]
-
-  [:type="v2u_indexed";direction="down"]
-
-  [:type="v2u_indexed";direction="up"]
-
-  [:type="v2u_x";direction="down"]
-
-  [:type="v2u_x";direction="up"]
-
-  [:type="v2u_xx";direction="down"]
-
-  [:type="v2u_xx";direction="up"]
-
-  [:type="v2u_y";direction="down"]
-
-  [:type="v2u_y";direction="up"]
-
-  [:type="v3i_x";direction="down"]
-
-  [:type="v3i_x";direction="up"]
-
-  [:type="v3i_y";direction="down"]
-
-  [:type="v3i_y";direction="up"]
-
-  [:type="v3i_z";direction="down"]
-
-  [:type="v3i_z";direction="up"]
-
-  [:type="v3u_x";direction="down"]
-
-  [:type="v3u_x";direction="up"]
-
-  [:type="v3u_y";direction="down"]
-
-  [:type="v3u_y";direction="up"]
-
-  [:type="v3u_z";direction="down"]
-
-  [:type="v3u_z";direction="up"]
-
-  [:type="v4i_w";direction="down"]
-
-  [:type="v4i_w";direction="up"]
-
-  [:type="v4i_x";direction="down"]
-
-  [:type="v4i_x";direction="up"]
-
-  [:type="v4i_y";direction="down"]
-
-  [:type="v4i_y";direction="up"]
-
-  [:type="v4i_z";direction="down"]
-
-  [:type="v4i_z";direction="up"]
-
-  [:type="v4u_w";direction="down"]
-
-  [:type="v4u_w";direction="up"]
-
-  [:type="v4u_x";direction="down"]
-
-  [:type="v4u_x";direction="up"]
-
-  [:type="v4u_y";direction="down"]
-
-  [:type="v4u_y";direction="up"]
-
-  [:type="v4u_z";direction="down"]
-
-  [:type="v4u_z";direction="up"]
+  disabled: true
+  expected:
+    if os == "linux" and not debug: SKIP
 
 
 [cts.https.html?q=webgpu:shader,validation,statement,increment_decrement:parse:*]
@@ -539363,8 +541325,6 @@
   [:case_a_type="abstract-int";case_b_type="i32"]
 
   [:case_a_type="abstract-int";case_b_type="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case_a_type="i32";case_b_type="abstract-int"]
 
@@ -539373,14 +541333,10 @@
   [:case_a_type="i32";case_b_type="u32"]
 
   [:case_a_type="u32";case_b_type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case_a_type="u32";case_b_type="i32"]
 
   [:case_a_type="u32";case_b_type="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,statement,switch:condition_type:*]
@@ -539413,22 +541369,16 @@
   [:type="texture"]
 
   [:type="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="vec2af"]
 
   [:type="vec2ai"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="vec2f"]
 
   [:type="vec3af"]
 
   [:type="vec3ai"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="vec3b"]
 
@@ -539437,8 +541387,6 @@
   [:type="vec4af"]
 
   [:type="vec4ai"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:type="vec4u"]
 
@@ -539449,8 +541397,6 @@
   [:cond_type="abstract-int";case_type="i32"]
 
   [:cond_type="abstract-int";case_type="u32"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:cond_type="i32";case_type="abstract-int"]
 
@@ -539459,8 +541405,6 @@
   [:cond_type="i32";case_type="u32"]
 
   [:cond_type="u32";case_type="abstract-int"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:cond_type="u32";case_type="i32"]
 
@@ -539497,12 +541441,8 @@
   [:test="L_case_C1_case_C1_default"]
 
   [:test="L_case_C1_case_C2_default"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:test="L_case_C1_default"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:test="L_case_C2_case_expr_default"]
 
@@ -539977,12 +541917,8 @@
   [:case="struct"]
 
   [:case="trailing_comma1"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="trailing_comma2"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="u32"]
 
@@ -540393,8 +542329,6 @@
   [:case="shadow_mat4x4h"]
 
   [:case="trailing_comma"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,types,pointer:access_mode:*]
@@ -540425,20 +542359,18 @@
   [:aspace="storage";access="read";comma=""]
 
   [:aspace="storage";access="read";comma=","]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:aspace="storage";access="read_write";comma=""]
 
   [:aspace="storage";access="read_write";comma=","]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:aspace="storage";access="write";comma=""]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:aspace="storage";access="write";comma=","]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:aspace="uniform";access="read";comma=""]
 
@@ -540489,8 +542421,6 @@
   [:aspace="storage";comma=""]
 
   [:aspace="storage";comma=","]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:aspace="uniform";comma=""]
 
@@ -542883,8 +544813,6 @@
   [:case="no_bool_shortform"]
 
   [:case="trailing_comma"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="vec"]
 
@@ -543359,16 +545287,10 @@
   [:case="after_loop_with_uniform_breaks";init="uniform"]
 
   [:case="after_switch_all_uniform";init="no_init"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="after_switch_all_uniform";init="nonuniform"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="after_switch_all_uniform";init="uniform"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="after_switch_nonuniform";init="no_init"]
     expected:
@@ -543383,16 +545305,12 @@
       if os == "linux" and not debug: FAIL
 
   [:case="after_switch_some_assign";init="no_init"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="after_switch_some_assign";init="nonuniform"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:case="after_switch_some_assign";init="uniform"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="after_switch_with_break_nonuniform1";init="no_init"]
     expected:
@@ -543931,16 +545849,12 @@
       if os == "linux" and not debug: FAIL
 
   [:case="switch_uniform_case";init="no_init"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="switch_uniform_case";init="nonuniform"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:case="switch_uniform_case";init="uniform"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="unreachable_nonuniform";init="no_init"]
     expected:
@@ -544249,8 +546163,6 @@
       if os == "linux" and not debug: FAIL
 
   [:case="contents_rhs_pointer_swizzle_uniform"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:case="contents_scalar_alias_nonuniform1"]
     expected:
@@ -544575,6 +546487,8 @@
 
 [cts.https.html?q=webgpu:web_platform,canvas,configure:alpha_mode:*]
   [:canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen"]
     expected:
@@ -544583,6 +546497,8 @@
 
 [cts.https.html?q=webgpu:web_platform,canvas,configure:defaults:*]
   [:canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen"]
     expected:
@@ -544591,6 +546507,8 @@
 
 [cts.https.html?q=webgpu:web_platform,canvas,configure:device:*]
   [:canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen"]
     expected:
@@ -544655,46 +546573,88 @@
   [:canvasType="offscreen";format="astc-8x8-unorm-srgb"]
 
   [:canvasType="offscreen";format="bc1-rgba-unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bc1-rgba-unorm-srgb"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bc2-rgba-unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bc2-rgba-unorm-srgb"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bc3-rgba-unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bc3-rgba-unorm-srgb"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bc4-r-snorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bc4-r-unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bc5-rg-snorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bc5-rg-unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bc6h-rgb-float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bc6h-rgb-ufloat"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bc7-rgba-unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bc7-rgba-unorm-srgb"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bgra8unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bgra8unorm-srgb"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="depth16unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="depth24plus"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="depth24plus-stencil8"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="depth32float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="depth32float-stencil8"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="eac-r11snorm"]
 
@@ -544717,76 +546677,148 @@
   [:canvasType="offscreen";format="etc2-rgba8unorm-srgb"]
 
   [:canvasType="offscreen";format="r16float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="r16sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="r16uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="r32float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="r32sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="r32uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="r8sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="r8snorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="r8uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="r8unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rg11b10ufloat"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rg16float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rg16sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rg16uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rg32float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rg32sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rg32uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rg8sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rg8snorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rg8uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rg8unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgb10a2uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgb10a2unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgb9e5ufloat"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba16float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba16sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba16uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba32float"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba32sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba32uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba8sint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba8snorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba8uint"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba8unorm"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba8unorm-srgb"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="stencil8"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen";format="astc-10x10-unorm"]
 
@@ -544987,8 +547019,12 @@
 
 [cts.https.html?q=webgpu:web_platform,canvas,configure:size_zero_after_configure:*]
   [:canvasType="offscreen";zeroDimension="height"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";zeroDimension="width"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen";zeroDimension="height"]
 
@@ -544997,8 +547033,12 @@
 
 [cts.https.html?q=webgpu:web_platform,canvas,configure:size_zero_before_configure:*]
   [:canvasType="offscreen";zeroDimension="height"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";zeroDimension="width"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen";zeroDimension="height"]
 
@@ -545007,6 +547047,8 @@
 
 [cts.https.html?q=webgpu:web_platform,canvas,configure:usage:*]
   [:canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen"]
     expected:
@@ -545015,32 +547057,50 @@
 
 [cts.https.html?q=webgpu:web_platform,canvas,configure:viewFormats:*]
   [:canvasType="offscreen";format="bgra8unorm";viewFormatFeature="_undef_"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bgra8unorm";viewFormatFeature="depth32float-stencil8"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bgra8unorm";viewFormatFeature="texture-compression-astc"]
 
   [:canvasType="offscreen";format="bgra8unorm";viewFormatFeature="texture-compression-bc"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="bgra8unorm";viewFormatFeature="texture-compression-etc2"]
 
   [:canvasType="offscreen";format="rgba16float";viewFormatFeature="_undef_"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba16float";viewFormatFeature="depth32float-stencil8"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba16float";viewFormatFeature="texture-compression-astc"]
 
   [:canvasType="offscreen";format="rgba16float";viewFormatFeature="texture-compression-bc"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba16float";viewFormatFeature="texture-compression-etc2"]
 
   [:canvasType="offscreen";format="rgba8unorm";viewFormatFeature="_undef_"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba8unorm";viewFormatFeature="depth32float-stencil8"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba8unorm";viewFormatFeature="texture-compression-astc"]
 
   [:canvasType="offscreen";format="rgba8unorm";viewFormatFeature="texture-compression-bc"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";format="rgba8unorm";viewFormatFeature="texture-compression-etc2"]
 
@@ -545097,54 +547157,62 @@
   [:offscreen=false]
 
   [:offscreen=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:web_platform,canvas,getCurrentTexture:configured:*]
   [:canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen"]
 
 
 [cts.https.html?q=webgpu:web_platform,canvas,getCurrentTexture:expiry:*]
   [:canvasType="offscreen";prevFrameCallsite="requestAnimationFrame";getCurrentTextureAgain=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";prevFrameCallsite="requestAnimationFrame";getCurrentTextureAgain=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";prevFrameCallsite="runInNewCanvasFrame";getCurrentTextureAgain=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";prevFrameCallsite="runInNewCanvasFrame";getCurrentTextureAgain=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen";prevFrameCallsite="requestAnimationFrame";getCurrentTextureAgain=false]
 
   [:canvasType="onscreen";prevFrameCallsite="requestAnimationFrame";getCurrentTextureAgain=true]
-    expected:
-      if os == "linux" and not debug: [PASS, FAIL]
 
   [:canvasType="onscreen";prevFrameCallsite="runInNewCanvasFrame";getCurrentTextureAgain=false]
 
   [:canvasType="onscreen";prevFrameCallsite="runInNewCanvasFrame";getCurrentTextureAgain=true]
-    expected:
-      if os == "linux" and not debug: [PASS, FAIL]
 
 
 [cts.https.html?q=webgpu:web_platform,canvas,getCurrentTexture:multiple_frames:*]
   [:canvasType="offscreen"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen"]
-    expected:
-      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:web_platform,canvas,getCurrentTexture:resize:*]
   [:canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen"]
 
 
 [cts.https.html?q=webgpu:web_platform,canvas,getCurrentTexture:single_frames:*]
   [:canvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen"]
 
@@ -545155,48 +547223,76 @@
 
 [cts.https.html?q=webgpu:web_platform,canvas,readbackFromWebGPUCanvas:drawTo2DCanvas:*]
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="display-p3";webgpuCanvasType="offscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="display-p3";webgpuCanvasType="offscreen";canvas2DType="onscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="display-p3";webgpuCanvasType="onscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="display-p3";webgpuCanvasType="onscreen";canvas2DType="onscreen"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="srgb";webgpuCanvasType="offscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="srgb";webgpuCanvasType="offscreen";canvas2DType="onscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="srgb";webgpuCanvasType="onscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="srgb";webgpuCanvasType="onscreen";canvas2DType="onscreen"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="display-p3";webgpuCanvasType="offscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="display-p3";webgpuCanvasType="offscreen";canvas2DType="onscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="display-p3";webgpuCanvasType="onscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="display-p3";webgpuCanvasType="onscreen";canvas2DType="onscreen"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="srgb";webgpuCanvasType="offscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="srgb";webgpuCanvasType="offscreen";canvas2DType="onscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="srgb";webgpuCanvasType="onscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="srgb";webgpuCanvasType="onscreen";canvas2DType="onscreen"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="opaque";colorSpace="display-p3";webgpuCanvasType="offscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="opaque";colorSpace="display-p3";webgpuCanvasType="offscreen";canvas2DType="onscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="opaque";colorSpace="display-p3";webgpuCanvasType="onscreen";canvas2DType="offscreen"]
     expected:
@@ -545207,8 +547303,12 @@
       if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="opaque";colorSpace="srgb";webgpuCanvasType="offscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="opaque";colorSpace="srgb";webgpuCanvasType="offscreen";canvas2DType="onscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="opaque";colorSpace="srgb";webgpuCanvasType="onscreen";canvas2DType="offscreen"]
     expected:
@@ -545219,8 +547319,12 @@
       if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="premultiplied";colorSpace="display-p3";webgpuCanvasType="offscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="premultiplied";colorSpace="display-p3";webgpuCanvasType="offscreen";canvas2DType="onscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="premultiplied";colorSpace="display-p3";webgpuCanvasType="onscreen";canvas2DType="offscreen"]
     expected:
@@ -545231,8 +547335,12 @@
       if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="premultiplied";colorSpace="srgb";webgpuCanvasType="offscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="premultiplied";colorSpace="srgb";webgpuCanvasType="offscreen";canvas2DType="onscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="premultiplied";colorSpace="srgb";webgpuCanvasType="onscreen";canvas2DType="offscreen"]
     expected:
@@ -545243,40 +547351,64 @@
       if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="display-p3";webgpuCanvasType="offscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="display-p3";webgpuCanvasType="offscreen";canvas2DType="onscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="display-p3";webgpuCanvasType="onscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="display-p3";webgpuCanvasType="onscreen";canvas2DType="onscreen"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="srgb";webgpuCanvasType="offscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="srgb";webgpuCanvasType="offscreen";canvas2DType="onscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="srgb";webgpuCanvasType="onscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="srgb";webgpuCanvasType="onscreen";canvas2DType="onscreen"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="display-p3";webgpuCanvasType="offscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="display-p3";webgpuCanvasType="offscreen";canvas2DType="onscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="display-p3";webgpuCanvasType="onscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="display-p3";webgpuCanvasType="onscreen";canvas2DType="onscreen"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="srgb";webgpuCanvasType="offscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="srgb";webgpuCanvasType="offscreen";canvas2DType="onscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="srgb";webgpuCanvasType="onscreen";canvas2DType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="srgb";webgpuCanvasType="onscreen";canvas2DType="onscreen"]
     expected:
@@ -545285,76 +547417,148 @@
 
 [cts.https.html?q=webgpu:web_platform,canvas,readbackFromWebGPUCanvas:offscreenCanvas,snapshot:*]
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="display-p3";snapshotType="convertToBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="display-p3";snapshotType="imageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="display-p3";snapshotType="transferToImageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="srgb";snapshotType="convertToBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="srgb";snapshotType="imageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="srgb";snapshotType="transferToImageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="display-p3";snapshotType="convertToBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="display-p3";snapshotType="imageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="display-p3";snapshotType="transferToImageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="srgb";snapshotType="convertToBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="srgb";snapshotType="imageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="srgb";snapshotType="transferToImageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="opaque";colorSpace="display-p3";snapshotType="convertToBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="opaque";colorSpace="display-p3";snapshotType="imageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="opaque";colorSpace="display-p3";snapshotType="transferToImageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="opaque";colorSpace="srgb";snapshotType="convertToBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="opaque";colorSpace="srgb";snapshotType="imageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="opaque";colorSpace="srgb";snapshotType="transferToImageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="premultiplied";colorSpace="display-p3";snapshotType="convertToBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="premultiplied";colorSpace="display-p3";snapshotType="imageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="premultiplied";colorSpace="display-p3";snapshotType="transferToImageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="premultiplied";colorSpace="srgb";snapshotType="convertToBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="premultiplied";colorSpace="srgb";snapshotType="imageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="premultiplied";colorSpace="srgb";snapshotType="transferToImageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="display-p3";snapshotType="convertToBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="display-p3";snapshotType="imageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="display-p3";snapshotType="transferToImageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="srgb";snapshotType="convertToBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="srgb";snapshotType="imageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="srgb";snapshotType="transferToImageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="display-p3";snapshotType="convertToBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="display-p3";snapshotType="imageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="display-p3";snapshotType="transferToImageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="srgb";snapshotType="convertToBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="srgb";snapshotType="imageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="srgb";snapshotType="transferToImageBitmap"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:web_platform,canvas,readbackFromWebGPUCanvas:onscreenCanvas,snapshot:*]
@@ -545363,32 +547567,48 @@
       if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="display-p3";snapshotType="toBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="display-p3";snapshotType="toDataURL"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="srgb";snapshotType="imageBitmap"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="srgb";snapshotType="toBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";colorSpace="srgb";snapshotType="toDataURL"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="display-p3";snapshotType="imageBitmap"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="display-p3";snapshotType="toBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="display-p3";snapshotType="toDataURL"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="srgb";snapshotType="imageBitmap"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="srgb";snapshotType="toBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";colorSpace="srgb";snapshotType="toDataURL"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="opaque";colorSpace="display-p3";snapshotType="imageBitmap"]
     expected:
@@ -545443,32 +547663,48 @@
       if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="display-p3";snapshotType="toBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="display-p3";snapshotType="toDataURL"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="srgb";snapshotType="imageBitmap"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="srgb";snapshotType="toBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";colorSpace="srgb";snapshotType="toDataURL"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="display-p3";snapshotType="imageBitmap"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="display-p3";snapshotType="toBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="display-p3";snapshotType="toDataURL"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="srgb";snapshotType="imageBitmap"]
     expected:
       if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="srgb";snapshotType="toBlob"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";colorSpace="srgb";snapshotType="toDataURL"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:web_platform,canvas,readbackFromWebGPUCanvas:onscreenCanvas,uploadToWebGL:*]
@@ -545478,29 +547714,31 @@
 
   [:format="bgra8unorm";alphaMode="opaque";webgl="webgl";upload="texSubImage2D"]
     expected:
-      if os == "linux" and not debug: [FAIL, TIMEOUT]
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";webgl="webgl2";upload="texImage2D"]
     expected:
-      if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="opaque";webgl="webgl2";upload="texSubImage2D"]
     expected:
-      if os == "linux" and not debug: [PASS, NOTRUN]
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";webgl="webgl";upload="texImage2D"]
     expected:
-      if os == "linux" and not debug: [FAIL, NOTRUN]
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";webgl="webgl";upload="texSubImage2D"]
     expected:
-      if os == "linux" and not debug: [FAIL, NOTRUN]
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";webgl="webgl2";upload="texImage2D"]
     expected:
-      if os == "linux" and not debug: [PASS, FAIL, NOTRUN]
+      if os == "linux" and not debug: FAIL
 
   [:format="bgra8unorm";alphaMode="premultiplied";webgl="webgl2";upload="texSubImage2D"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba16float";alphaMode="opaque";webgl="webgl";upload="texImage2D"]
     expected:
@@ -545543,8 +547781,12 @@
       if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";webgl="webgl2";upload="texImage2D"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="opaque";webgl="webgl2";upload="texSubImage2D"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";webgl="webgl";upload="texImage2D"]
     expected:
@@ -545555,26 +547797,40 @@
       if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";webgl="webgl2";upload="texImage2D"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:format="rgba8unorm";alphaMode="premultiplied";webgl="webgl2";upload="texSubImage2D"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:web_platform,canvas,readbackFromWebGPUCanvas:transferToImageBitmap_huge_size:*]
   [:]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:web_platform,canvas,readbackFromWebGPUCanvas:transferToImageBitmap_unconfigured_nonzero_size:*]
   [:]
 
   [:readbackCanvasType="offscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:readbackCanvasType="onscreen"]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:web_platform,canvas,readbackFromWebGPUCanvas:transferToImageBitmap_zero_size:*]
   [:configure=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:configure=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
 
 [cts.https.html?q=webgpu:web_platform,copyToTexture,ImageBitmap:copy_subrect_from_2D_Canvas:*]
@@ -546229,108 +548485,212 @@
 
 [cts.https.html?q=webgpu:web_platform,copyToTexture,canvas:copy_contents_from_2d_context_canvas:*]
   [:canvasType="offscreen";dstColorFormat="bgra8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="bgra8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="bgra8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="bgra8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="bgra8unorm-srgb";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="bgra8unorm-srgb";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="bgra8unorm-srgb";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="bgra8unorm-srgb";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r16float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r16float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r16float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r16float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r32float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r32float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r32float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r32float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg16float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg16float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg16float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg16float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg32float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg32float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg32float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg32float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgb10a2unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgb10a2unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgb10a2unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgb10a2unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba16float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba16float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba16float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba16float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba32float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba32float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba32float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba32float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm-srgb";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm-srgb";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm-srgb";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm-srgb";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen";dstColorFormat="bgra8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
     expected:
@@ -546543,108 +548903,212 @@
 
 [cts.https.html?q=webgpu:web_platform,copyToTexture,canvas:copy_contents_from_bitmaprenderer_context_canvas:*]
   [:canvasType="offscreen";dstColorFormat="bgra8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="bgra8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="bgra8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="bgra8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="bgra8unorm-srgb";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="bgra8unorm-srgb";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="bgra8unorm-srgb";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="bgra8unorm-srgb";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r16float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r16float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r16float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r16float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r32float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r32float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r32float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r32float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="r8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg16float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg16float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg16float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg16float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg32float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg32float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg32float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg32float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rg8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgb10a2unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgb10a2unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgb10a2unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgb10a2unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba16float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba16float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba16float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba16float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba32float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba32float";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba32float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba32float";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm-srgb";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm-srgb";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm-srgb";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";dstColorFormat="rgba8unorm-srgb";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen";dstColorFormat="bgra8unorm";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
     expected:
@@ -546863,212 +549327,420 @@
 
 [cts.https.html?q=webgpu:web_platform,copyToTexture,canvas:copy_contents_from_gpu_context_canvas:*]
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="bgra8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="bgra8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="bgra8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="bgra8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="bgra8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="bgra8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="bgra8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="bgra8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="r16float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="r16float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="r16float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="r16float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="r32float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="r32float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="r32float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="r32float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="r8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="r8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="r8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="r8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rg16float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rg16float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rg16float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rg16float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rg32float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rg32float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rg32float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rg32float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rg8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rg8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rg8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rg8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgb10a2unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgb10a2unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgb10a2unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgb10a2unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba16float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba16float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba16float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba16float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba32float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba32float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba32float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba32float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="bgra8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="bgra8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="bgra8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="bgra8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="bgra8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="bgra8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="bgra8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="bgra8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="r16float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="r16float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="r16float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="r16float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="r32float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="r32float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="r32float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="r32float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="r8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="r8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="r8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="r8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rg16float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rg16float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rg16float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rg16float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rg32float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rg32float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rg32float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rg32float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rg8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rg8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rg8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rg8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgb10a2unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgb10a2unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgb10a2unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgb10a2unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba16float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba16float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba16float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba16float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba32float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba32float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba32float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba32float";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rgba8unorm-srgb";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "linux" and not debug: FAIL
 
   [:canvasType="onscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="bgra8unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
     expected:
diff --git a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_colorspace_rgba16float.https.html.ini b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_colorspace_rgba16float.https.html.ini
deleted file mode 100644
index 4849298b244..00000000000
--- a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_colorspace_rgba16float.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[canvas_colorspace_rgba16float.https.html]
-  expected:
-    if os == "linux" and not debug: FAIL
diff --git a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_copy.https.html.ini b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_copy.https.html.ini
index 0e582065c37..c2a1378c045 100644
--- a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_copy.https.html.ini
+++ b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_copy.https.html.ini
@@ -1,6 +1,3 @@
 [canvas_complex_rgba8unorm_copy.https.html]
   expected:
-    if os == "win": TIMEOUT
-    if os == "linux" and debug: TIMEOUT
     if os == "linux" and not debug: FAIL
-    if os == "mac": TIMEOUT
diff --git a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_store.https.html.ini b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_store.https.html.ini
index 3848337c5b5..f58c35f5777 100644
--- a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_store.https.html.ini
+++ b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_store.https.html.ini
@@ -1,3 +1,3 @@
 [canvas_complex_rgba8unorm_store.https.html]
   expected:
-    if os == "linux" and not debug: PASS
+    if os == "linux" and not debug: [PASS, FAIL]
diff --git a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_bgra8unorm_opaque_copy.https.html.ini b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_bgra8unorm_opaque_copy.https.html.ini
index 51d6acd04b6..6e592d5d2f6 100644
--- a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_bgra8unorm_opaque_copy.https.html.ini
+++ b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_bgra8unorm_opaque_copy.https.html.ini
@@ -1,3 +1,3 @@
 [canvas_composite_alpha_bgra8unorm_opaque_copy.https.html]
   expected:
-    if os == "linux" and not debug: PASS
+    if os == "linux" and not debug: [CRASH, PASS, FAIL]
diff --git a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_bgra8unorm_opaque_draw.https.html.ini b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_bgra8unorm_opaque_draw.https.html.ini
index f1d70f52d28..8e19b1c1250 100644
--- a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_bgra8unorm_opaque_draw.https.html.ini
+++ b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_bgra8unorm_opaque_draw.https.html.ini
@@ -1,2 +1,6 @@
 [canvas_composite_alpha_bgra8unorm_opaque_draw.https.html]
-  expected: PASS
+  expected:
+    if os == "win": PASS
+    if os == "linux" and debug: PASS
+    if os == "linux" and not debug: [PASS, FAIL]
+    if os == "mac": PASS
diff --git a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_opaque_draw.https.html.ini b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_opaque_draw.https.html.ini
index 5c94c840149..3684ca84a50 100644
--- a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_opaque_draw.https.html.ini
+++ b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_opaque_draw.https.html.ini
@@ -1,3 +1,3 @@
 [canvas_composite_alpha_rgba8unorm_opaque_draw.https.html]
   expected:
-    if os == "linux" and not debug: PASS
+    if os == "linux" and not debug: [PASS, FAIL]
diff --git a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_premultiplied_copy.https.html.ini b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_premultiplied_copy.https.html.ini
index b507806e922..38fc5fe0c46 100644
--- a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_premultiplied_copy.https.html.ini
+++ b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_premultiplied_copy.https.html.ini
@@ -1,3 +1,3 @@
 [canvas_composite_alpha_rgba8unorm_premultiplied_copy.https.html]
   expected:
-    if os == "linux" and not debug: [PASS, FAIL]
+    if os == "linux" and not debug: [CRASH, FAIL]
diff --git a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_premultiplied_draw.https.html.ini b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_premultiplied_draw.https.html.ini
index 962631ac692..680ef6a014b 100644
--- a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_premultiplied_draw.https.html.ini
+++ b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_premultiplied_draw.https.html.ini
@@ -1,3 +1,3 @@
 [canvas_composite_alpha_rgba8unorm_premultiplied_draw.https.html]
   expected:
-    if os == "linux" and not debug: [CRASH, PASS]
+    if os == "linux" and not debug: [CRASH, PASS, FAIL]
diff --git a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_image_rendering.https.html.ini b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_image_rendering.https.html.ini
index 1582f163f6d..0f8b1a56a6e 100644
--- a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_image_rendering.https.html.ini
+++ b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/canvas_image_rendering.https.html.ini
@@ -1,3 +1,3 @@
 [canvas_image_rendering.https.html]
   expected:
-    if os == "linux" and not debug: PASS
+    if os == "linux" and not debug: [CRASH, PASS]
diff --git a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/resize_observer.https.html.ini b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/resize_observer.https.html.ini
index 5a66398ad6c..259fb223468 100644
--- a/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/resize_observer.https.html.ini
+++ b/tests/wpt/webgpu/meta/webgpu/webgpu/web_platform/reftests/resize_observer.https.html.ini
@@ -1,6 +1,2 @@
 [resize_observer.https.html]
-  expected:
-    if os == "win": TIMEOUT
-    if os == "linux" and debug: TIMEOUT
-    if os == "linux" and not debug: PASS
-    if os == "mac": TIMEOUT
+  expected: TIMEOUT
diff --git a/tests/wpt/webgpu/tests/webgpu/common/internal/logging/test_case_recorder.js b/tests/wpt/webgpu/tests/webgpu/common/internal/logging/test_case_recorder.js
index 5b2a4e8b8ef..a37c61a4a6b 100644
--- a/tests/wpt/webgpu/tests/webgpu/common/internal/logging/test_case_recorder.js
+++ b/tests/wpt/webgpu/tests/webgpu/common/internal/logging/test_case_recorder.js
@@ -108,6 +108,7 @@ export class TestCaseRecorder {
   }
 
   info(ex) {
+    return;
     // We need this to use the lowest LogSeverity so it doesn't override the current severity for this test case.
     this.logImpl(LogSeverity.NotRun, 'INFO', ex);
   }
diff --git a/uv.toml b/uv.toml
new file mode 100644
index 00000000000..5af84e6cfda
--- /dev/null
+++ b/uv.toml
@@ -0,0 +1 @@
+native-tls = true